516 files changed, 129642 insertions, 189724 deletions

diff --git a/.cirrus.yml b/.cirrus.yml
index e114ffee1a..4860bebd32 100644
--- a/.cirrus.yml
+++ b/.cirrus.yml
@@ -9,7 +9,7 @@ freebsd_12_task:
     DEFAULT_TEST_TARGET: prove
     DEVELOPER: 1
   freebsd_instance:
-    image_family: freebsd-12-2
+    image_family: freebsd-12-3
     memory: 2G
   install_script:
     pkg install -y gettext gmake perl5
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index c35200defb..831f4df56c 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -119,8 +119,8 @@ jobs:
     - name: test
       shell: bash
       run: . /etc/profile && ci/run-test-slice.sh ${{matrix.nr}} 10
-    - name: ci/print-test-failures.sh
-      if: failure()
+    - name: print test failures
+      if: failure() && env.FAILED_TEST_ARTIFACTS != ''
       shell: bash
       run: ci/print-test-failures.sh
     - name: Upload failed tests' directories
@@ -204,8 +204,8 @@ jobs:
       env:
         NO_SVN_TESTS: 1
       run: . /etc/profile && ci/run-test-slice.sh ${{matrix.nr}} 10
-    - name: ci/print-test-failures.sh
-      if: failure()
+    - name: print test failures
+      if: failure() && env.FAILED_TEST_ARTIFACTS != ''
       shell: bash
       run: ci/print-test-failures.sh
     - name: Upload failed tests' directories
@@ -261,8 +261,10 @@ jobs:
     - uses: actions/checkout@v2
     - run: ci/install-dependencies.sh
     - run: ci/run-build-and-tests.sh
-    - run: ci/print-test-failures.sh
-      if: failure()
+    - name: print test failures
+      if: failure() && env.FAILED_TEST_ARTIFACTS != ''
+      shell: bash
+      run: ci/print-test-failures.sh
     - name: Upload failed tests' directories
       if: failure() && env.FAILED_TEST_ARTIFACTS != ''
       uses: actions/upload-artifact@v2
@@ -292,8 +294,10 @@ jobs:
     - uses: actions/checkout@v1
     - run: ci/install-docker-dependencies.sh
     - run: ci/run-build-and-tests.sh
-    - run: ci/print-test-failures.sh
-      if: failure()
+    - name: print test failures
+      if: failure() && env.FAILED_TEST_ARTIFACTS != ''
+      shell: bash
+      run: ci/print-test-failures.sh
     - name: Upload failed tests' directories
       if: failure() && env.FAILED_TEST_ARTIFACTS != ''
       uses: actions/upload-artifact@v1
@@ -305,7 +309,7 @@ jobs:
     if: needs.ci-config.outputs.enabled == 'yes'
     env:
       jobname: StaticAnalysis
-    runs-on: ubuntu-18.04
+    runs-on: ubuntu-22.04
     steps:
     - uses: actions/checkout@v2
     - run: ci/install-dependencies.sh
diff --git a/.gitignore b/.gitignore
index e81de1063a..a452215764 100644
--- a/.gitignore
+++ b/.gitignore
@@ -200,6 +200,7 @@
 *.[aos]
 *.o.json
 *.py[co]
+.build/
 .depend/
 *.gcda
 *.gcno
diff --git a/Documentation/CodingGuidelines b/Documentation/CodingGuidelines
index b20b2f94f1..4c756be517 100644
--- a/Documentation/CodingGuidelines
+++ b/Documentation/CodingGuidelines
@@ -43,7 +43,10 @@ the overall style of existing code. Modifications to existing
 code is expected to match the style the surrounding code already
 uses (even if it doesn't match the overall style of existing code).
 
-But if you must have a list of rules, here they are.
+But if you must have a list of rules, here are some language
+specific ones. Note that Documentation/ToolsForGit.txt document
+has a collection of tips to help you use some external tools
+to conform to these guidelines.
 
 For shell scripts specifically (not exhaustive):
 
@@ -492,17 +495,6 @@ For Perl programs:
 
  - Learn and use Git.pm if you need that functionality.
 
- - For Emacs, it's useful to put the following in
-   GIT_CHECKOUT/.dir-locals.el, assuming you use cperl-mode:
-
-    ;; note the first part is useful for C editing, too
-    ((nil . ((indent-tabs-mode . t)
-                  (tab-width . 8)
-                  (fill-column . 80)))
-     (cperl-mode . ((cperl-indent-level . 8)
-                    (cperl-extra-newline-before-brace . nil)
-                    (cperl-merge-trailing-else . t))))
-
 For Python scripts:
 
  - We follow PEP-8 (http://www.python.org/dev/peps/pep-0008/).
diff --git a/Documentation/Makefile b/Documentation/Makefile
index 44c080e3e5..4f801f4e4c 100644
--- a/Documentation/Makefile
+++ b/Documentation/Makefile
@@ -93,7 +93,10 @@ SP_ARTICLES += $(API_DOCS)
 TECH_DOCS += MyFirstContribution
 TECH_DOCS += MyFirstObjectWalk
 TECH_DOCS += SubmittingPatches
+TECH_DOCS += ToolsForGit
+TECH_DOCS += technical/bitmap-format
 TECH_DOCS += technical/bundle-format
+TECH_DOCS += technical/cruft-packs
 TECH_DOCS += technical/hash-function-transition
 TECH_DOCS += technical/http-protocol
 TECH_DOCS += technical/index-format
@@ -302,12 +305,12 @@ $(mergetools_txt): mergetools-list.made
 
 mergetools-list.made: ../git-mergetool--lib.sh $(wildcard ../mergetools/*)
 	$(QUIET_GEN) \
-	$(SHELL_PATH) -c 'MERGE_TOOLS_DIR=../mergetools && \
+	$(SHELL_PATH) -c 'MERGE_TOOLS_DIR=../mergetools && TOOL_MODE=diff && \
 		. ../git-mergetool--lib.sh && \
-		show_tool_names can_diff "* " || :' >mergetools-diff.txt && \
-	$(SHELL_PATH) -c 'MERGE_TOOLS_DIR=../mergetools && \
+		show_tool_names can_diff' | sed -e "s/\([a-z0-9]*\)/\`\1\`;;/" >mergetools-diff.txt && \
+	$(SHELL_PATH) -c 'MERGE_TOOLS_DIR=../mergetools && TOOL_MODE=merge && \
 		. ../git-mergetool--lib.sh && \
-		show_tool_names can_merge "* " || :' >mergetools-merge.txt && \
+		show_tool_names can_merge' | sed -e "s/\([a-z0-9]*\)/\`\1\`;;/" >mergetools-merge.txt && \
 	date >$@
 
 TRACK_ASCIIDOCFLAGS = $(subst ','\'',$(ASCIIDOC_COMMON):$(ASCIIDOC_HTML):$(ASCIIDOC_DOCBOOK))
diff --git a/Documentation/MyFirstContribution.txt b/Documentation/MyFirstContribution.txt
index 63a2ef5449..1da15d9ad4 100644
--- a/Documentation/MyFirstContribution.txt
+++ b/Documentation/MyFirstContribution.txt
@@ -710,13 +710,104 @@ dependencies. `prove` also makes the output nicer.
 Go ahead and commit this change, as well.
 
 [[ready-to-share]]
-== Getting Ready to Share
+== Getting Ready to Share: Anatomy of a Patch Series
 
 You may have noticed already that the Git project performs its code reviews via
 emailed patches, which are then applied by the maintainer when they are ready
-and approved by the community. The Git project does not accept patches from
+and approved by the community. The Git project does not accept contributions from
 pull requests, and the patches emailed for review need to be formatted a
-specific way. At this point the tutorial diverges, in order to demonstrate two
+specific way.
+
+:patch-series: https://lore.kernel.org/git/pull.1218.git.git.1645209647.gitgitgadget@gmail.com/
+:lore: https://lore.kernel.org/git/
+
+Before taking a look at how to convert your commits into emailed patches,
+let's analyze what the end result, a "patch series", looks like. Here is an
+{patch-series}[example] of the summary view for a patch series on the web interface of
+the {lore}[Git mailing list archive]:
+
+----
+2022-02-18 18:40 [PATCH 0/3] libify reflog John Cai via GitGitGadget
+2022-02-18 18:40 ` [PATCH 1/3] reflog: libify delete reflog function and helpers John Cai via GitGitGadget
+2022-02-18 19:10   ` Ævar Arnfjörð Bjarmason [this message]
+2022-02-18 19:39     ` Taylor Blau
+2022-02-18 19:48       ` Ævar Arnfjörð Bjarmason
+2022-02-18 19:35   ` Taylor Blau
+2022-02-21  1:43     ` John Cai
+2022-02-21  1:50       ` Taylor Blau
+2022-02-23 19:50         ` John Cai
+2022-02-18 20:00   ` // other replies ellided
+2022-02-18 18:40 ` [PATCH 2/3] reflog: call reflog_delete from reflog.c John Cai via GitGitGadget
+2022-02-18 19:15   ` Ævar Arnfjörð Bjarmason
+2022-02-18 20:26     ` Junio C Hamano
+2022-02-18 18:40 ` [PATCH 3/3] stash: call reflog_delete from reflog.c John Cai via GitGitGadget
+2022-02-18 19:20   ` Ævar Arnfjörð Bjarmason
+2022-02-19  0:21     ` Taylor Blau
+2022-02-22  2:36     ` John Cai
+2022-02-22 10:51       ` Ævar Arnfjörð Bjarmason
+2022-02-18 19:29 ` [PATCH 0/3] libify reflog Ævar Arnfjörð Bjarmason
+2022-02-22 18:30 ` [PATCH v2 0/3] libify reflog John Cai via GitGitGadget
+2022-02-22 18:30   ` [PATCH v2 1/3] stash: add test to ensure reflog --rewrite --updatref behavior John Cai via GitGitGadget
+2022-02-23  8:54     ` Ævar Arnfjörð Bjarmason
+2022-02-23 21:27       ` Junio C Hamano
+// continued
+----
+
+We can note a few things:
+
+- Each commit is sent as a separate email, with the commit message title as
+  subject, prefixed with "[PATCH _i_/_n_]" for the _i_-th commit of an
+  _n_-commit series.
+- Each patch is sent as a reply to an introductory email called the _cover
+  letter_ of the series, prefixed "[PATCH 0/_n_]".
+- Subsequent iterations of the patch series are labelled "PATCH v2", "PATCH
+  v3", etc. in place of "PATCH". For example, "[PATCH v2 1/3]" would be the first of
+  three patches in the second iteration. Each iteration is sent with a new cover
+  letter (like "[PATCH v2 0/3]" above), itself a reply to the cover letter of the
+  previous iteration (more on that below).
+
+NOTE: A single-patch topic is sent with "[PATCH]", "[PATCH v2]", etc. without
+_i_/_n_ numbering (in the above thread overview, no single-patch topic appears,
+though).
+
+[[cover-letter]]
+=== The cover letter
+
+In addition to an email per patch, the Git community also expects your patches
+to come with a cover letter. This is an important component of change
+submission as it explains to the community from a high level what you're trying
+to do, and why, in a way that's more apparent than just looking at your
+patches.
+
+The title of your cover letter should be something which succinctly covers the
+purpose of your entire topic branch. It's often in the imperative mood, just
+like our commit message titles. Here is how we'll title our series:
+
+---
+Add the 'psuh' command
+---
+
+The body of the cover letter is used to give additional context to reviewers.
+Be sure to explain anything your patches don't make clear on their own, but
+remember that since the cover letter is not recorded in the commit history,
+anything that might be useful to future readers of the repository's history
+should also be in your commit messages.
+
+Here's an example body for `psuh`:
+
+----
+Our internal metrics indicate widespread interest in the command
+git-psuh - that is, many users are trying to use it, but finding it is
+unavailable, using some unknown workaround instead.
+
+The following handful of patches add the psuh command and implement some
+handy features on top of it.
+
+This patchset is part of the MyFirstContribution tutorial and should not
+be merged.
+----
+
+At this point the tutorial diverges, in order to demonstrate two
 different methods of formatting your patchset and getting it reviewed.
 
 The first method to be covered is GitGitGadget, which is useful for those
@@ -808,8 +899,22 @@ https://github.com/gitgitgadget/git and open a PR either with the "New pull
 request" button or the convenient "Compare & pull request" button that may
 appear with the name of your newly pushed branch.
 
-Review the PR's title and description, as it's used by GitGitGadget as the cover
-letter for your change. When you're happy, submit your pull request.
+Review the PR's title and description, as they're used by GitGitGadget
+respectively as the subject and body of the cover letter for your change. Refer
+to <<cover-letter,"The cover letter">> above for advice on how to title your
+submission and what content to include in the description.
+
+NOTE: For single-patch contributions, your commit message should already be
+meaningful and explain at a high level the purpose (what is happening and why)
+of your patch, so you usually do not need any additional context. In that case,
+remove the PR description that GitHub automatically generates from your commit
+message (your PR description should be empty). If you do need to supply even
+more context, you can do so in that space and it will be appended to the email
+that GitGitGadget will send, between the three-dash line and the diffstat
+(see <<single-patch,Bonus Chapter: One-Patch Changes>> for how this looks once
+submitted).
+
+When you're happy, submit your pull request.
 
 [[run-ci-ggg]]
 === Running CI and Getting Ready to Send
@@ -952,49 +1057,29 @@ but want reviewers to look at what they have so far. You can add this flag with
 Check and make sure that your patches and cover letter template exist in the
 directory you specified - you're nearly ready to send out your review!
 
-[[cover-letter]]
+[[preparing-cover-letter]]
 === Preparing Email
 
-In addition to an email per patch, the Git community also expects your patches
-to come with a cover letter, typically with a subject line [PATCH 0/x] (where
-x is the number of patches you're sending). Since you invoked `format-patch`
-with `--cover-letter`, you've already got a template ready. Open it up in your
-favorite editor.
+Since you invoked `format-patch` with `--cover-letter`, you've already got a
+cover letter template ready. Open it up in your favorite editor.
 
 You should see a number of headers present already. Check that your `From:`
-header is correct. Then modify your `Subject:` to something which succinctly
-covers the purpose of your entire topic branch, for example:
+header is correct. Then modify your `Subject:` (see <<cover-letter,above>> for
+how to choose good title for your patch series):
 
 ----
-Subject: [PATCH 0/7] adding the 'psuh' command
+Subject: [PATCH 0/7] Add the 'psuh' command
 ----
 
 Make sure you retain the ``[PATCH 0/X]'' part; that's what indicates to the Git
-community that this email is the beginning of a review, and many reviewers
-filter their email for this type of flag.
+community that this email is the beginning of a patch series, and many
+reviewers filter their email for this type of flag.
 
 You'll need to add some extra parameters when you invoke `git send-email` to add
 the cover letter.
 
-Next you'll have to fill out the body of your cover letter. This is an important
-component of change submission as it explains to the community from a high level
-what you're trying to do, and why, in a way that's more apparent than just
-looking at your diff. Be sure to explain anything your diff doesn't make clear
-on its own.
-
-Here's an example body for `psuh`:
-
-----
-Our internal metrics indicate widespread interest in the command
-git-psuh - that is, many users are trying to use it, but finding it is
-unavailable, using some unknown workaround instead.
-
-The following handful of patches add the psuh command and implement some
-handy features on top of it.
-
-This patchset is part of the MyFirstContribution tutorial and should not
-be merged.
-----
+Next you'll have to fill out the body of your cover letter. Again, see
+<<cover-letter,above>> for what content to include.
 
 The template created by `git format-patch --cover-letter` includes a diffstat.
 This gives reviewers a summary of what they're in for when reviewing your topic.
diff --git a/Documentation/RelNotes/2.37.0.txt b/Documentation/RelNotes/2.37.0.txt
new file mode 100644
index 0000000000..99dc7e32f8
--- /dev/null
+++ b/Documentation/RelNotes/2.37.0.txt
@@ -0,0 +1,337 @@
+Git v2.37 Release Notes
+=======================
+
+UI, Workflows & Features
+
+ * "vimdiff[123]" mergetool drivers have been reimplemented with a
+   more generic layout mechanism.
+
+ * "git -v" and "git -h" are now understood as "git --version" and
+   "git --help".
+
+ * The temporary files fed to external diff command are now generated
+   inside a new temporary directory under the same basename.
+
+ * "git log --since=X" will stop traversal upon seeing a commit that
+   is older than X, but there may be commits behind it that is younger
+   than X when the commit was created with a faulty clock.  A new
+   option is added to keep digging without stopping, and instead
+   filter out commits with timestamp older than X.
+
+ * "git -c branch.autosetupmerge=simple branch $A $B" will set the $B
+   as $A's upstream only when $A and $B shares the same name, and "git
+   -c push.default=simple" on branch $A would push to update the
+   branch $A at the remote $B came from.  Also more places use the
+   sole remote, if exists, before defaulting to 'origin'.
+
+ * A new doc has been added that lists tips for tools to work with
+   Git's codebase.
+
+ * "git remote -v" now shows the list-objects-filter used during
+   fetching from the remote, if available.
+
+ * With the new http.curloptResolve configuration, the CURLOPT_RESOLVE
+   mechanism that allows cURL based applications to use pre-resolved
+   IP addresses for the requests is exposed to the scripts.
+
+ * "git add -i" was rewritten in C some time ago and has been in
+   testing; the reimplementation is now exposed to general public by
+   default.
+
+ * Deprecate non-cone mode of the sparse-checkout feature.
+
+ * Introduce a filesystem-dependent mechanism to optimize the way the
+   bits for many loose object files are ensured to hit the disk
+   platter.
+
+ * The "do not remove the directory the user started Git in" logic,
+   when Git cannot tell where that directory is, is disabled.  Earlier
+   we refused to run in such a case.
+
+ * A mechanism to pack unreachable objects into a "cruft pack",
+   instead of ejecting them into loose form to be reclaimed later, has
+   been introduced.
+
+ * Update the doctype written in gitweb output to xhtml5.
+
+ * The "transfer.credentialsInURL" configuration variable controls what
+   happens when a URL with embedded login credential is used on either
+   "fetch" or "push". Credentials are currently only detected in
+   `remote.<name>.url` config, not `remote.<name>.pushurl`.
+
+ * "git revert" learns "--reference" option to use more human-readable
+   reference to the commit it reverts in the message template it
+   prepares for the user.
+
+ * Various error messages that talk about the removal of
+   "--preserve-merges" in "rebase" have been strengthened, and "rebase
+   --abort" learned to get out of a state that was left by an earlier
+   use of the option.
+
+
+Performance, Internal Implementation, Development Support etc.
+
+ * The performance of the "untracked cache" feature has been improved
+   when "--untracked-files=<mode>" and "status.showUntrackedFiles"
+   are combined.
+
+ * "git stash" works better with sparse index entries.
+
+ * "git show :<path>" learned to work better with the sparse-index
+   feature.
+
+ * Introduce and apply coccinelle rule to discourage an explicit
+   comparison between a pointer and NULL, and applies the clean-up to
+   the maintenance track.
+
+ * Preliminary code refactoring around transport and bundle code.
+
+ * "sparse-checkout" learns to work better with the sparse-index
+   feature.
+
+ * A workflow change for translators are being proposed.  git.pot is
+   no longer version controlled and it is local responsibility of
+   translators to generate it.
+
+ * Plug the memory leaks from the trickiest API of all, the revision
+   walker.
+
+ * Rename .env_array member to .env in the child_process structure.
+
+  * The fsmonitor--daemon handles even more corner cases when
+    watching filesystem events.
+
+ * A new bug() and BUG_if_bug() API is introduced to make it easier to
+   uniformly log "detect multiple bugs and abort in the end" pattern.
+
+
+Fixes since v2.36
+-----------------
+
+ * "git submodule update" without pathspec should silently skip an
+   uninitialized submodule, but it started to become noisy by mistake.
+   (merge 4f1ccef87c gc/submodule-update-part2 later to maint).
+
+ * "diff-tree --stdin" has been broken for about a year, but 2.36
+   release broke it even worse by breaking running the command with
+   <pathspec>, which in turn broke "gitk" and got noticed.  This has
+   been corrected by aligning its behaviour to that of "log".
+   (merge f8781bfda3 jc/diff-tree-stdin-fix later to maint).
+
+ * Regression fix for 2.36 where "git name-rev" started to sometimes
+   reference strings after they are freed.
+   (merge 45a14f578e rs/name-rev-fix-free-after-use later to maint).
+
+ * "git show <commit1> <commit2>... -- <pathspec>" lost the pathspec
+   when showing the second and subsequent commits, which has been
+   corrected.
+   (merge 5cdb38458e jc/show-pathspec-fix later to maint).
+
+ * "git fast-export -- <pathspec>" lost the pathspec when showing the
+   second and subsequent commits, which has been corrected.
+   (merge d1c25272f5 rs/fast-export-pathspec-fix later to maint).
+
+ * "git format-patch <args> -- <pathspec>" lost the pathspec when
+   showing the second and subsequent commits, which has been
+   corrected.
+   (merge 91f8f7e46f rs/format-patch-pathspec-fix later to maint).
+
+ * "git clone --origin X" leaked piece of memory that held value read
+   from the clone.defaultRemoteName configuration variable, which has
+   been plugged.
+   (merge 6dfadc8981 jc/clone-remote-name-leak-fix later to maint).
+
+ * Get rid of a bogus and over-eager coccinelle rule.
+   (merge 08bdd3a185 jc/cocci-xstrdup-or-null-fix later to maint).
+
+ * The path taken by "git multi-pack-index" command from the end user
+   was compared with path internally prepared by the tool without first
+   normalizing, which lead to duplicated paths not being noticed,
+   which has been corrected.
+   (merge 11f9e8de3d ds/midx-normalize-pathname-before-comparison later to maint).
+
+ * Correct choices of C compilers used in various CI jobs.
+   (merge 3506cae04f ab/cc-package-fixes later to maint).
+
+ * Various cleanups to "git p4".
+   (merge 4ff0108d9e jh/p4-various-fixups later to maint).
+
+ * The progress meter of "git blame" was showing incorrect numbers
+   when processing only parts of the file.
+   (merge e5f5d7d42e ea/progress-partial-blame later to maint).
+
+ * "git rebase --keep-base <upstream> <branch-to-rebase>" computed the
+   commit to rebase onto incorrectly, which has been corrected.
+   (merge 9e5ebe9668 ah/rebase-keep-base-fix later to maint).
+
+ * Fix a leak of FILE * in an error codepath.
+   (merge c0befa0c03 kt/commit-graph-plug-fp-leak-on-error later to maint).
+
+ * Avoid problems from interaction between malloc_check and address
+   sanitizer.
+   (merge 067109a5e7 pw/test-malloc-with-sanitize-address later to maint).
+
+ * The commit summary shown after making a commit is matched to what
+   is given in "git status" not to use the break-rewrite heuristics.
+   (merge 84792322ed rs/commit-summary-wo-break-rewrite later to maint).
+
+ * Update a few end-user facing messages around EOL conversion.
+   (merge c970d30c2c ah/convert-warning-message later to maint).
+
+ * Trace2 documentation updates.
+   (merge a6c80c313c js/trace2-doc-fixes later to maint).
+
+ * Build procedure fixup.
+   (merge 1fbfd96f50 mg/detect-compiler-in-c-locale later to maint).
+
+ * "git pull" without "--recurse-submodules=<arg>" made
+   submodule.recurse take precedence over fetch.recurseSubmodules by
+   mistake, which has been corrected.
+   (merge 5819417365 gc/pull-recurse-submodules later to maint).
+
+ * "git bisect" was too silent before it is ready to start computing
+   the actual bisection, which has been corrected.
+   (merge f11046e6de cd/bisect-messages-from-pre-flight-states later to maint).
+
+ * macOS CI jobs have been occasionally flaky due to tentative version
+   skew between perforce and the homebrew packager.  Instead of
+   failing the whole CI job, just let it skip the p4 tests when this
+   happens.
+   (merge f15e00b463 cb/ci-make-p4-optional later to maint).
+
+ * A bit of test framework fixes with a few fixes to issues found by
+   valgrind.
+   (merge 7c898554d7 ab/valgrind-fixes later to maint).
+
+ * "git archive --add-file=<path>" picked up the raw permission bits
+   from the path and propagated to zip output in some cases, without
+   normalization, which has been corrected (tar output did not have
+   this issue).
+   (merge 6a61661967 jc/archive-add-file-normalize-mode later to maint).
+
+ * "make coverage-report" without first running "make coverage" did
+   not produce any meaningful result, which has been corrected.
+   (merge 96ddfecc5b ep/coverage-report-wants-test-to-have-run later to maint).
+
+ * The "--current" option of "git show-branch" should have been made
+   incompatible with the "--reflog" mode, but this was not enforced,
+   which has been corrected.
+   (merge 41c64ae0e7 jc/show-branch-g-current later to maint).
+
+ * "git fetch" unnecessarily failed when an unexpected optional
+   section appeared in the output, which has been corrected.
+   (merge 7709acf7be jt/fetch-peek-optional-section later to maint).
+
+ * The way "git fetch" without "--update-head-ok" ensures that HEAD in
+   no worktree points at any ref being updated was too wasteful, which
+   has been optimized a bit.
+   (merge f7400da800 os/fetch-check-not-current-branch later to maint).
+
+ * "git fetch --recurse-submodules" from multiple remotes (either from
+   a remote group, or "--all") used to make one extra "git fetch" in
+   the submodules, which has been corrected.
+   (merge 0353c68818 jc/avoid-redundant-submodule-fetch later to maint).
+
+ * With a recent update to refuse access to repositories of other
+   people by default, "sudo make install" and "sudo git describe"
+   stopped working, which has been corrected.
+   (merge 6b11e3d52e cb/path-owner-check-with-sudo-plus later to maint).
+
+ * The tests that ensured merges stop when interfering local changes
+   are present did not make sure that local changes are preserved; now
+   they do.
+   (merge 4b317450ce jc/t6424-failing-merge-preserve-local-changes later to maint).
+
+ * Some real problems noticed by gcc 12 have been fixed, while false
+   positives have been worked around.
+
+ * Update the version of FreeBSD image used in Cirrus CI.
+   (merge c58bebd4c6 pb/use-freebsd-12.3-in-cirrus-ci later to maint).
+
+ * The multi-pack-index code did not protect the packfile it is going
+   to depend on from getting removed while in use, which has been
+   corrected.
+   (merge 4090511e40 tb/midx-race-in-pack-objects later to maint).
+
+ * Teach "git repack --geometric" work better with "--keep-pack" and
+   avoid corrupting the repository when packsize limit is used.
+   (merge 66731ff921 tb/geom-repack-with-keep-and-max later to maint).
+
+ * The documentation on the interaction between "--add-file" and
+   "--prefix" options of "git archive" has been improved.
+   (merge a75910602a rs/document-archive-prefix later to maint).
+
+ * A git subcommand like "git add -p" spawns a separate git process
+   while relaying its command line arguments.  A pathspec with only
+   negative elements was mistakenly passed with an empty string, which
+   has been corrected.
+   (merge b02fdbc80a jc/all-negative-pathspec later to maint).
+
+ * With a more targeted workaround in http.c in another topic, we may
+   be able to lift this blanket "GCC12 dangling-pointer warning is
+   broken and unsalvageable" workaround.
+   (merge 419141e495 cb/buggy-gcc-12-workaround later to maint).
+
+ * A misconfigured 'branch..remote' led to a bug in configuration
+   parsing.
+   (merge f1dfbd9ee0 gc/zero-length-branch-config-fix later to maint).
+
+ * "git -c diff.submodule=log range-diff" did not show anything for
+   submodules that changed in the ranges being compared, and
+   "git -c diff.submodule=diff range-diff" did not work correctly.
+   Fix this by including the "--submodule=short" output
+   unconditionally to be compared.
+
+ * In Git 2.36 we revamped the way how hooks are invoked.  One change
+   that is end-user visible is that the output of a hook is no longer
+   directly connected to the standard output of "git" that spawns the
+   hook, which was noticed post release.  This is getting corrected.
+   (merge a082345372 ab/hooks-regression-fix later to maint).
+
+ * Updating the graft information invalidates the list of parents of
+   in-core commit objects that used to be in the graft file.
+
+ * "git show-ref --heads" (and "--tags") still iterated over all the
+   refs only to discard refs outside the specified area, which has
+   been corrected.
+   (merge c0c9d35e27 tb/show-ref-optim later to maint).
+
+ * Remove redundant copying (with index v3 and older) or possible
+   over-reading beyond end of mmapped memory (with index v4) has been
+   corrected.
+   (merge 6d858341d2 zh/read-cache-copy-name-entry-fix later to maint).
+
+ * Sample watchman interface hook sometimes failed to produce
+   correctly formatted JSON message, which has been corrected.
+   (merge 134047b500 sn/fsmonitor-missing-clock later to maint).
+
+ * Use-after-free (with another forget-to-free) fix.
+   (merge 323822c72b ab/remote-free-fix later to maint).
+
+ * Remove a coccinelle rule that is no longer relevant.
+   (merge b1299de4a1 jc/cocci-cleanup later to maint).
+
+ * Other code cleanup, docfix, build fix, etc.
+   (merge e6b2582da3 cm/reftable-0-length-memset later to maint).
+   (merge 0b75e5bf22 ab/misc-cleanup later to maint).
+   (merge 52e1ab8a76 ea/rebase-code-simplify later to maint).
+   (merge 756d15923b sg/safe-directory-tests-and-docs later to maint).
+   (merge d097a23bfa ds/do-not-call-bug-on-bad-refs later to maint).
+   (merge c36c27e75c rs/t7812-pcre2-ws-bug-test later to maint).
+   (merge 1da312742d gf/unused-includes later to maint).
+   (merge 465b30a92d pb/submodule-recurse-mode-enum later to maint).
+   (merge 82b28c4ed8 km/t3501-use-test-helpers later to maint).
+   (merge 72315e431b sa/t1011-use-helpers later to maint).
+   (merge 95b3002201 cg/vscode-with-gdb later to maint).
+   (merge fbe5f6b804 tk/p4-utf8-bom later to maint).
+   (merge 17f273ffba tk/p4-with-explicity-sync later to maint).
+   (merge 944db25c60 kf/p4-multiple-remotes later to maint).
+   (merge b014cee8de jc/update-ozlabs-url later to maint).
+   (merge 4ec5008062 pb/ggg-in-mfc-doc later to maint).
+   (merge af845a604d tb/receive-pack-code-cleanup later to maint).
+   (merge 2acf4cf001 js/ci-gcc-12-fixes later to maint).
+   (merge 05e280c0a6 jc/http-clear-finished-pointer later to maint).
+   (merge 8c49d704ef fh/transport-push-leakfix later to maint).
+   (merge 1d232d38bd tl/ls-tree-oid-only later to maint).
+   (merge db7961e6a6 gc/document-config-worktree-scope later to maint).
+   (merge ce18a30bb7 fs/ssh-default-key-command-doc later to maint).
diff --git a/Documentation/RelNotes/2.37.1.txt b/Documentation/RelNotes/2.37.1.txt
new file mode 100644
index 0000000000..84609327d1
--- /dev/null
+++ b/Documentation/RelNotes/2.37.1.txt
@@ -0,0 +1,17 @@
+Git 2.37.1 Release Notes
+========================
+
+This release merges up the fixes that appear in v2.30.5, v2.31.4,
+v2.32.3, v2.33.4, v2.34.4, v2.35.4, and v2.36.2 to address the
+security issue CVE-2022-29187; see the release notes for these
+versions for details.
+
+Fixes since Git 2.37
+--------------------
+
+ * Rewrite of "git add -i" in C that appeared in Git 2.25 didn't
+   correctly record a removed file to the index, which is an old
+   regression but has become widely known because the C version has
+   become the default in the latest release.
+
+ * Fix for CVS-2022-29187.
diff --git a/Documentation/RelNotes/2.37.2.txt b/Documentation/RelNotes/2.37.2.txt
new file mode 100644
index 0000000000..d82b29e014
--- /dev/null
+++ b/Documentation/RelNotes/2.37.2.txt
@@ -0,0 +1,88 @@
+Git 2.37.2 Release Notes
+========================
+
+This primarily is to backport various fixes accumulated on the 'master'
+front since 2.37.1.
+
+Fixes since v2.37.1
+-------------------
+
+ * "git shortlog -n" relied on the underlying qsort() to be stable,
+   which shouldn't have.  Fixed.
+
+ * Variable quoting fix in the vimdiff driver of "git mergetool".
+
+ * An earlier attempt to plug leaks placed a clean-up label to jump to
+   at a bogus place, which as been corrected.
+
+ * Fixes a long-standing corner case bug around directory renames in
+   the merge-ort strategy.
+
+ * Recent update to vimdiff layout code has been made more robust
+   against different end-user vim settings.
+
+ * In a non-bare repository, the behavior of Git when the
+   core.worktree configuration variable points at a directory that has
+   a repository as its subdirectory, regressed in Git 2.27 days.
+
+ * References to commands-to-be-typed-literally in "git rebase"
+   documentation mark-up have been corrected.
+
+ * Give _() markings to fatal/warning/usage: labels that are shown in
+   front of these messages.
+
+ * "git mktree --missing" lazily fetched objects that are missing from
+   the local object store, which was totally unnecessary for the purpose
+   of creating the tree object(s) from its input.
+
+ * Fixes for tests when the source directory has unusual characters in
+   its path, e.g. whitespaces, double-quotes, etc.
+
+ * Adjust technical/bitmap-format to be formatted by AsciiDoc, and
+   add some missing information to the documentation.
+
+ * Certain diff options are currently ignored when combined-diff is
+   shown; mark them as incompatible with the feature.
+
+ * "git clone" from a repository with some ref whose HEAD is unborn
+   did not set the HEAD in the resulting repository correctly, which
+   has been corrected.
+
+ * mkstemp() emulation on Windows has been improved.
+
+ * Add missing documentation for "include" and "includeIf" features in
+   "git config" file format, which incidentally teaches the command
+   line completion to include them in its offerings.
+
+ * Avoid "white/black-list" in documentation and code comments.
+
+ * Workaround for a compiler warning against use of die() in
+   osx-keychain (in contrib/).
+
+ * Workaround for a false positive compiler warning.
+
+ * The resolve-undo information in the index was not protected against
+   GC, which has been corrected.
+
+ * A corner case bug where lazily fetching objects from a promisor
+   remote resulted in infinite recursion has been corrected.
+
+ * "git p4" working on UTF-16 files on Windows did not implement
+   CRLF-to-LF conversion correctly, which has been corrected.
+
+ * "git p4" did not handle non-ASCII client name well, which has been
+   corrected.
+
+ * "rerere-train" script (in contrib/) used to honor commit.gpgSign
+   while recreating the throw-away merges.
+
+ * "git checkout" miscounted the paths it updated, which has been
+   corrected.
+
+ * Fix for a bug that makes write-tree to fail to write out a
+   non-existent index as a tree, introduced in 2.37.
+
+ * There was a bug in the codepath to upgrade generation information
+   in commit-graph from v1 to v2 format, which has been corrected.
+
+Also contains minor documentation updates and code clean-ups.
diff --git a/Documentation/RelNotes/2.37.3.txt b/Documentation/RelNotes/2.37.3.txt
new file mode 100644
index 0000000000..d66689e598
--- /dev/null
+++ b/Documentation/RelNotes/2.37.3.txt
@@ -0,0 +1,46 @@
+Git 2.37.3 Release Notes
+========================
+
+This primarily is to backport various fixes accumulated on the 'master'
+front since 2.37.2.
+
+Fixes since v2.37.2
+-------------------
+
+ * The build procedure for Windows that uses CMake has been updated to
+   pick up the shell interpreter from local installation location.
+
+ * Conditionally allow building Python interpreter on Windows
+
+ * Fix to lstat() emulation on Windows.
+
+ * Older gcc with -Wall complains about the universal zero initializer
+   "struct s = { 0 };" idiom, which makes developers' lives
+   inconvenient (as -Werror is enabled by DEVELOPER=YesPlease).  The
+   build procedure has been tweaked to help these compilers.
+
+ * Plug memory leaks in the failure code path in the "merge-ort" merge
+   strategy backend.
+
+ * Avoid repeatedly running getconf to ask libc version in the test
+   suite, and instead just as it once per script.
+
+ * Platform-specific code that determines if a directory is OK to use
+   as a repository has been taught to report more details, especially
+   on Windows.
+
+ * "vimdiff3" regression has been corrected.
+
+ * "git fsck" reads mode from tree objects but canonicalizes the mode
+   before passing it to the logic to check object sanity, which has
+   hid broken tree objects from the checking logic.  This has been
+   corrected, but to help exiting projects with broken tree objects
+   that they cannot fix retroactively, the severity of anomalies this
+   code detects has been demoted to "info" for now.
+
+ * Fixes to sparse index compatibility work for "reset" and "checkout"
+   commands.
+
+ * Documentation for "git add --renormalize" has been improved.
+
+Also contains other minor documentation updates and code clean-ups.
diff --git a/Documentation/RelNotes/2.37.4.txt b/Documentation/RelNotes/2.37.4.txt
new file mode 100644
index 0000000000..e42a5c1620
--- /dev/null
+++ b/Documentation/RelNotes/2.37.4.txt
@@ -0,0 +1,65 @@
+Git 2.37.4 Release Notes
+========================
+
+This primarily is to backport various fixes accumulated on the 'master'
+front since 2.37.3, and also includes the same security fixes as in
+v2.30.6.
+
+Fixes since v2.37.3
+-------------------
+
+ * CVE-2022-39253:
+   When relying on the `--local` clone optimization, Git dereferences
+   symbolic links in the source repository before creating hardlinks
+   (or copies) of the dereferenced link in the destination repository.
+   This can lead to surprising behavior where arbitrary files are
+   present in a repository's `$GIT_DIR` when cloning from a malicious
+   repository.
+
+   Git will no longer dereference symbolic links via the `--local`
+   clone mechanism, and will instead refuse to clone repositories that
+   have symbolic links present in the `$GIT_DIR/objects` directory.
+
+   Additionally, the value of `protocol.file.allow` is changed to be
+   "user" by default.
+
+   Credit for finding CVE-2022-39253 goes to Cory Snider of Mirantis.
+   The fix was authored by Taylor Blau, with help from Johannes
+   Schindelin.
+
+ * CVE-2022-39260:
+   An overly-long command string given to `git shell` can result in
+   overflow in `split_cmdline()`, leading to arbitrary heap writes and
+   remote code execution when `git shell` is exposed and the directory
+   `$HOME/git-shell-commands` exists.
+
+   `git shell` is taught to refuse interactive commands that are
+   longer than 4MiB in size. `split_cmdline()` is hardened to reject
+   inputs larger than 2GiB.
+
+   Credit for finding CVE-2022-39260 goes to Kevin Backhouse of
+   GitHub. The fix was authored by Kevin Backhouse, Jeff King, and
+   Taylor Blau.
+
+ * An earlier optimization discarded a tree-object buffer that is
+   still in use, which has been corrected.
+
+ * Fix deadlocks between main Git process and subprocess spawned via
+   the pipe_command() API, that can kill "git add -p" that was
+   reimplemented in C recently.
+
+ * xcalloc(), imitating calloc(), takes "number of elements of the
+   array", and "size of a single element", in this order.  A call that
+   does not follow this ordering has been corrected.
+
+ * The preload-index codepath made copies of pathspec to give to
+   multiple threads, which were left leaked.
+
+ * Update the version of Ubuntu used for GitHub Actions CI from 18.04
+   to 22.04.
+
+ * The auto-stashed local changes created by "git merge --autostash"
+   was mixed into a conflicted state left in the working tree, which
+   has been corrected.
+
+Also contains other minor documentation updates and code clean-ups.
diff --git a/Documentation/ToolsForGit.txt b/Documentation/ToolsForGit.txt
new file mode 100644
index 0000000000..5060d0d231
--- /dev/null
+++ b/Documentation/ToolsForGit.txt
@@ -0,0 +1,51 @@
+Tools for developing Git
+========================
+:sectanchors:
+
+[[summary]]
+== Summary
+
+This document gathers tips, scripts and configuration file to help people
+working on Git's codebase use their favorite tools while following Git's
+coding style.
+
+[[author]]
+=== Author
+
+The Git community.
+
+[[table_of_contents]]
+== Table of contents
+
+- <<vscode>>
+- <<emacs>>
+
+[[vscode]]
+=== Visual Studio Code (VS Code)
+
+The contrib/vscode/init.sh script creates configuration files that enable
+several valuable VS Code features. See contrib/vscode/README.md for more
+information on using the script.
+
+[[emacs]]
+=== Emacs
+
+This is adapted from Linux's suggestion in its CodingStyle document:
+
+- To follow rules of the CodingGuideline, it's useful to put the following in
+GIT_CHECKOUT/.dir-locals.el, assuming you use cperl-mode:
+----
+;; note the first part is useful for C editing, too
+((nil . ((indent-tabs-mode . t)
+	 (tab-width . 8)
+	 (fill-column . 80)))
+	 (cperl-mode . ((cperl-indent-level . 8)
+			(cperl-extra-newline-before-brace . nil)
+			(cperl-merge-trailing-else . t))))
+----
+
+For a more complete setup, since Git's codebase uses a coding style
+similar to the Linux kernel's style, tips given in Linux's CodingStyle
+document can be applied here too.
+
+==== https://www.kernel.org/doc/html/v4.10/process/coding-style.html#you-ve-made-a-mess-of-it
diff --git a/Documentation/config.txt b/Documentation/config.txt
index e284b042f2..5b5b976569 100644
--- a/Documentation/config.txt
+++ b/Documentation/config.txt
@@ -445,6 +445,8 @@ include::config/i18n.txt[]
 
 include::config/imap.txt[]
 
+include::config/includeif.txt[]
+
 include::config/index.txt[]
 
 include::config/init.txt[]
@@ -495,6 +497,8 @@ include::config/repack.txt[]
 
 include::config/rerere.txt[]
 
+include::config/revert.txt[]
+
 include::config/safe.txt[]
 
 include::config/sendemail.txt[]
diff --git a/Documentation/config/add.txt b/Documentation/config/add.txt
index c9f748f81c..3e859f3419 100644
--- a/Documentation/config/add.txt
+++ b/Documentation/config/add.txt
@@ -7,6 +7,6 @@ add.ignore-errors (deprecated)::
 	variables.
 
 add.interactive.useBuiltin::
-	[EXPERIMENTAL] Set to `true` to use the experimental built-in
-	implementation of the interactive version of linkgit:git-add[1]
-	instead of the Perl script version. Is `false` by default.
+	Set to `false` to fall back to the original Perl implementation of
+	the interactive version of linkgit:git-add[1] instead of the built-in
+	version. Is `true` by default.
diff --git a/Documentation/config/branch.txt b/Documentation/config/branch.txt
index 1e0c7af014..445341a906 100644
--- a/Documentation/config/branch.txt
+++ b/Documentation/config/branch.txt
@@ -9,7 +9,9 @@ branch.autoSetupMerge::
 	automatic setup is done when the starting point is either a
 	local branch or remote-tracking branch; `inherit` -- if the starting point
 	has a tracking configuration, it is copied to the new
-	branch. This option defaults to true.
+	branch; `simple` -- automatic setup is done only when the starting point
+	is a remote-tracking branch and the new branch has the same name as the
+	remote branch. This option defaults to true.
 
 branch.autoSetupRebase::
 	When a new branch is created with 'git branch', 'git switch' or 'git checkout'
@@ -38,8 +40,9 @@ branch.<name>.remote::
 	may be overridden with `remote.pushDefault` (for all branches).
 	The remote to push to, for the current branch, may be further
 	overridden by `branch.<name>.pushRemote`.  If no remote is
-	configured, or if you are not on any branch, it defaults to
-	`origin` for fetching and `remote.pushDefault` for pushing.
+	configured, or if you are not on any branch and there is more than
+	one remote defined in the repository, it defaults to `origin` for
+	fetching and `remote.pushDefault` for pushing.
 	Additionally, `.` (a period) is the current local repository
 	(a dot-repository), see `branch.<name>.merge`'s final note below.
 
diff --git a/Documentation/config/core.txt b/Documentation/config/core.txt
index e67392cc83..88bc799cf3 100644
--- a/Documentation/config/core.txt
+++ b/Documentation/config/core.txt
@@ -628,6 +628,14 @@ core.fsyncMethod::
 * `writeout-only` issues pagecache writeback requests, but depending on the
   filesystem and storage hardware, data added to the repository may not be
   durable in the event of a system crash. This is the default mode on macOS.
+* `batch` enables a mode that uses writeout-only flushes to stage multiple
+  updates in the disk writeback cache and then does a single full fsync of
+  a dummy file to trigger the disk cache flush at the end of the operation.
++
+Currently `batch` mode only applies to loose-object files. Other repository
+data is made durable as if `fsync` was specified. This mode is expected to
+be as safe as `fsync` on macOS for repos stored on HFS+ or APFS filesystems
+and on Windows for repos stored on NTFS or ReFS filesystems.
 
 core.fsyncObjectFiles::
 	This boolean will enable 'fsync()' when writing object files.
@@ -698,8 +706,10 @@ core.sparseCheckout::
 
 core.sparseCheckoutCone::
 	Enables the "cone mode" of the sparse checkout feature. When the
-	sparse-checkout file contains a limited set of patterns, then this
-	mode provides significant performance advantages. See
+	sparse-checkout file contains a limited set of patterns, this
+	mode provides significant performance advantages. The "non-cone
+	mode" can be requested to allow specifying more flexible
+	patterns by setting this variable to 'false'. See
 	linkgit:git-sparse-checkout[1] for more information.
 
 core.abbrev::
diff --git a/Documentation/config/gc.txt b/Documentation/config/gc.txt
index c834e07991..38fea076a2 100644
--- a/Documentation/config/gc.txt
+++ b/Documentation/config/gc.txt
@@ -81,14 +81,21 @@ gc.packRefs::
 	to enable it within all non-bare repos or it can be set to a
 	boolean value.  The default is `true`.
 
+gc.cruftPacks::
+	Store unreachable objects in a cruft pack (see
+	linkgit:git-repack[1]) instead of as loose objects. The default
+	is `false`.
+
 gc.pruneExpire::
-	When 'git gc' is run, it will call 'prune --expire 2.weeks.ago'.
-	Override the grace period with this config variable.  The value
-	"now" may be used to disable this grace period and always prune
-	unreachable objects immediately, or "never" may be used to
-	suppress pruning.  This feature helps prevent corruption when
-	'git gc' runs concurrently with another process writing to the
-	repository; see the "NOTES" section of linkgit:git-gc[1].
+	When 'git gc' is run, it will call 'prune --expire 2.weeks.ago'
+	(and 'repack --cruft --cruft-expiration 2.weeks.ago' if using
+	cruft packs via `gc.cruftPacks` or `--cruft`).  Override the
+	grace period with this config variable.  The value "now" may be
+	used to disable this grace period and always prune unreachable
+	objects immediately, or "never" may be used to suppress pruning.
+	This feature helps prevent corruption when 'git gc' runs
+	concurrently with another process writing to the repository; see
+	the "NOTES" section of linkgit:git-gc[1].
 
 gc.worktreePruneExpire::
 	When 'git gc' is run, it calls
diff --git a/Documentation/config/gpg.txt b/Documentation/config/gpg.txt
index 86892ada77..86f6308c4c 100644
--- a/Documentation/config/gpg.txt
+++ b/Documentation/config/gpg.txt
@@ -36,9 +36,12 @@ gpg.minTrustLevel::
 
 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".
+	signature is requested. On successful exit a valid ssh public key
+	prefixed with `key::` is expected in the first line of its output.
+	This allows for a script doing a dynamic lookup of the correct public
+	key when it is impractical to statically configure `user.signingKey`.
+	For example when keys or SSH Certificates are rotated frequently or
+	selection of the right key depends on external factors unknown to git.
 
 gpg.ssh.allowedSignersFile::
 	A file containing ssh public keys which you are willing to trust.
diff --git a/Documentation/config/http.txt b/Documentation/config/http.txt
index 7003661c0d..afeeccfbfa 100644
--- a/Documentation/config/http.txt
+++ b/Documentation/config/http.txt
@@ -98,6 +98,22 @@ http.version::
 	- HTTP/2
 	- HTTP/1.1
 
+http.curloptResolve::
+	Hostname resolution information that will be used first by
+	libcurl when sending HTTP requests.  This information should
+	be in one of the following formats:
+
+	- [+]HOST:PORT:ADDRESS[,ADDRESS]
+	- -HOST:PORT
+
++
+The first format redirects all requests to the given `HOST:PORT`
+to the provided `ADDRESS`(s). The second format clears all
+previous config values for that `HOST:PORT` combination.  To
+allow easy overriding of all the settings inherited from the
+system config, an empty value will reset all resolution
+information to the empty list.
+
 http.sslVersion::
 	The SSL version to use when negotiating an SSL connection, if you
 	want to force the default.  The available and default version
@@ -187,7 +203,7 @@ http.schannelUseSSLCAInfo::
 	when the `schannel` backend was configured via `http.sslBackend`,
 	unless `http.schannelUseSSLCAInfo` overrides this behavior.
 
-http.pinnedpubkey::
+http.pinnedPubkey::
 	Public key of the https service. It may either be the filename of
 	a PEM or DER encoded public key file or a string starting with
 	'sha256//' followed by the base64 encoded sha256 hash of the
diff --git a/Documentation/config/includeif.txt b/Documentation/config/includeif.txt
new file mode 100644
index 0000000000..82fe431c34
--- /dev/null
+++ b/Documentation/config/includeif.txt
@@ -0,0 +1,6 @@
+include.path::
+includeIf.<condition>.path::
+	Special variables to include other configuration files. See
+	the "CONFIGURATION FILE" section in the main
+	linkgit:git-config[1] documentation,
+	specifically the "Includes" and "Conditional Includes" subsections.
diff --git a/Documentation/config/mergetool.txt b/Documentation/config/mergetool.txt
index cafbbef46a..90b3809700 100644
--- a/Documentation/config/mergetool.txt
+++ b/Documentation/config/mergetool.txt
@@ -45,6 +45,15 @@ mergetool.meld.useAutoMerge::
 	value of `false` avoids using `--auto-merge` altogether, and is the
 	default value.
 
+mergetool.vimdiff.layout::
+	The vimdiff backend uses this variable to control how its split
+	windows look like. Applies even if you are using Neovim (`nvim`) or
+	gVim (`gvim`) as the merge tool. See BACKEND SPECIFIC HINTS section
+ifndef::git-mergetool[]
+	in linkgit:git-mergetool[1].
+endif::[]
+	for details.
+
 mergetool.hideResolved::
 	During a merge Git will automatically resolve as many conflicts as
 	possible and write the 'MERGED' file containing conflict markers around
diff --git a/Documentation/config/push.txt b/Documentation/config/push.txt
index 632033638c..e32801e6c9 100644
--- a/Documentation/config/push.txt
+++ b/Documentation/config/push.txt
@@ -1,3 +1,14 @@
+push.autoSetupRemote::
+	If set to "true" assume `--set-upstream` on default push when no
+	upstream tracking exists for the current branch; this option
+	takes effect with push.default options 'simple', 'upstream',
+	and 'current'. It is useful if by default you want new branches
+	to be pushed to the default remote (like the behavior of
+	'push.default=current') and you also want the upstream tracking
+	to be set. Workflows most likely to benefit from this option are
+	'simple' central workflows where all branches are expected to
+	have the same name on the remote.
+
 push.default::
 	Defines the action `git push` should take if no refspec is
 	given (whether from the command-line, config, or elsewhere).
diff --git a/Documentation/config/repack.txt b/Documentation/config/repack.txt
index 41ac6953c8..c79af6d7b8 100644
--- a/Documentation/config/repack.txt
+++ b/Documentation/config/repack.txt
@@ -30,3 +30,12 @@ repack.updateServerInfo::
 	If set to false, linkgit:git-repack[1] will not run
 	linkgit:git-update-server-info[1]. Defaults to true. Can be overridden
 	when true by the `-n` option of linkgit:git-repack[1].
+
+repack.cruftWindow::
+repack.cruftWindowMemory::
+repack.cruftDepth::
+repack.cruftThreads::
+	Parameters used by linkgit:git-pack-objects[1] when generating
+	a cruft pack and the respective parameters are not given over
+	the command line. See similarly named `pack.*` configuration
+	variables for defaults and meaning.
diff --git a/Documentation/config/revert.txt b/Documentation/config/revert.txt
new file mode 100644
index 0000000000..802d6faca2
--- /dev/null
+++ b/Documentation/config/revert.txt
@@ -0,0 +1,3 @@
+revert.reference::
+	Setting this variable to true makes `git revert` behave
+	as if the `--reference` option is given.
diff --git a/Documentation/config/safe.txt b/Documentation/config/safe.txt
index 74627c5e7c..fa02f3ccc5 100644
--- a/Documentation/config/safe.txt
+++ b/Documentation/config/safe.txt
@@ -13,8 +13,8 @@ override any such directories specified in the system config), add a
 `safe.directory` entry with an empty value.
 +
 This config setting is only respected when specified in a system or global
-config, not when it is specified in a repository config or via the command
-line option `-c safe.directory=<path>`.
+config, not when it is specified in a repository config, via the command
+line option `-c safe.directory=<path>`, or in environment variables.
 +
 The value of this setting is interpolated, i.e. `~/<path>` expands to a
 path relative to the home directory and `%(prefix)/<path>` expands to a
diff --git a/Documentation/config/transfer.txt b/Documentation/config/transfer.txt
index b49429eb4d..7ed917f5fc 100644
--- a/Documentation/config/transfer.txt
+++ b/Documentation/config/transfer.txt
@@ -1,3 +1,41 @@
+transfer.credentialsInUrl::
+	A configured URL can contain plaintext credentials in the form
+	`<protocol>://<user>:<password>@<domain>/<path>`. You may want
+	to warn or forbid the use of such configuration (in favor of
+	using linkgit:git-credential[1]). This will be used on
+	linkgit:git-clone[1], linkgit:git-fetch[1], linkgit:git-push[1],
+	and any other direct use of the configured URL.
++
+Note that this is currently limited to detecting credentials in
+`remote.<name>.url` configuration, it won't detect credentials in
+`remote.<name>.pushurl` configuration.
++
+You might want to enable this to prevent inadvertent credentials
+exposure, e.g. because:
++
+* The OS or system where you're running git may not provide way way or
+  otherwise allow you to configure the permissions of the
+  configuration file where the username and/or password are stored.
+* Even if it does, having such data stored "at rest" might expose you
+  in other ways, e.g. a backup process might copy the data to another
+  system.
+* The git programs will pass the full URL to one another as arguments
+  on the command-line, meaning the credentials will be exposed to other
+  users on OS's or systems that allow other users to see the full
+  process list of other users. On linux the "hidepid" setting
+  documented in procfs(5) allows for configuring this behavior.
++
+If such concerns don't apply to you then you probably don't need to be
+concerned about credentials exposure due to storing that sensitive
+data in git's configuration files. If you do want to use this, set
+`transfer.credentialsInUrl` to one of these values:
++
+* `allow` (default): Git will proceed with its activity without warning.
+* `warn`: Git will write a warning message to `stderr` when parsing a URL
+  with a plaintext credential.
+* `die`: Git will write a failure message to `stderr` when parsing a URL
+  with a plaintext credential.
+
 transfer.fsckObjects::
 	When `fetch.fsckObjects` or `receive.fsckObjects` are
 	not set, the value of this variable is used instead.
diff --git a/Documentation/diff-format.txt b/Documentation/diff-format.txt
index 7a9c3b6ff4..a3ae8747a2 100644
--- a/Documentation/diff-format.txt
+++ b/Documentation/diff-format.txt
@@ -43,7 +43,7 @@ That is, from the left to the right:
 . a space.
 . sha1 for "src"; 0\{40\} if creation or unmerged.
 . a space.
-. sha1 for "dst"; 0\{40\} if creation, unmerged or "look at work tree".
+. sha1 for "dst"; 0\{40\} if deletion, unmerged or "work tree out of sync with the index".
 . a space.
 . status, followed by optional "score" number.
 . a tab or a NUL when `-z` option is used.
@@ -69,8 +69,8 @@ percentage of similarity between the source and target of the move or
 copy).  Status letter M may be followed by a score (denoting the
 percentage of dissimilarity) for file rewrites.
 
-<sha1> is shown as all 0's if a file is new on the filesystem
-and it is out of sync with the index.
+The sha1 for "dst" is shown as all 0's if a file on the filesystem
+is out of sync with the index.
 
 Example:
 
diff --git a/Documentation/git-add.txt b/Documentation/git-add.txt
index 11eb70f16c..9b37f35654 100644
--- a/Documentation/git-add.txt
+++ b/Documentation/git-add.txt
@@ -188,7 +188,9 @@ for "git add --no-all <pathspec>...", i.e. ignored removed files.
 	forcibly add them again to the index.  This is useful after
 	changing `core.autocrlf` configuration or the `text` attribute
 	in order to correct files added with wrong CRLF/LF line endings.
-	This option implies `-u`.
+	This option implies `-u`. Lone CR characters are untouched, thus
+	while a CRLF cleans to LF, a CRCRLF sequence is only partially
+	cleaned to CRLF.
 
 --chmod=(+|-)x::
 	Override the executable bit of the added files.  The executable
diff --git a/Documentation/git-archive.txt b/Documentation/git-archive.txt
index bc4e76a783..56989a2f34 100644
--- a/Documentation/git-archive.txt
+++ b/Documentation/git-archive.txt
@@ -49,7 +49,9 @@ OPTIONS
 	Report progress to stderr.
 
 --prefix=<prefix>/::
-	Prepend <prefix>/ to each filename in the archive.
+	Prepend <prefix>/ to paths in the archive.  Can be repeated; its
+	rightmost value is used for all tracked files.  See below which
+	value gets used by `--add-file` and `--add-virtual-file`.
 
 -o <file>::
 --output=<file>::
@@ -57,9 +59,26 @@ OPTIONS
 
 --add-file=<file>::
 	Add a non-tracked file to the archive.  Can be repeated to add
+	multiple files.  The path of the file in the archive is built by
+	concatenating the value of the last `--prefix` option (if any)
+	before this `--add-file` and the basename of <file>.
+
+--add-virtual-file=<path>:<content>::
+	Add the specified contents to the archive.  Can be repeated to add
 	multiple files.  The path of the file in the archive is built
-	by concatenating the value for `--prefix` (if any) and the
-	basename of <file>.
+	by concatenating the value of the last `--prefix` option (if any)
+	before this `--add-virtual-file` and `<path>`.
++
+The `<path>` argument can start and end with a literal double-quote
+character; the contained file name is interpreted as a C-style string,
+i.e. the backslash is interpreted as escape character. The path must
+be quoted if it contains a colon, to avoid the colon from being
+misinterpreted as the separator between the path and the contents, or
+if the path begins or ends with a double-quote character.
++
+The file mode is limited to a regular file, and the option may be
+subject to platform-dependent command-line limits. For non-trivial
+cases, write an untracked file and use `--add-file` instead.
 
 --worktree-attributes::
 	Look for attributes in .gitattributes files in the working tree
@@ -194,6 +213,12 @@ EXAMPLES
 	commit on the current branch. Note that the output format is
 	inferred by the extension of the output file.
 
+`git archive -o latest.tar --prefix=build/ --add-file=configure --prefix= HEAD`::
+
+	Creates a tar archive that contains the contents of the latest
+	commit on the current branch with no prefix and the untracked
+	file 'configure' with the prefix 'build/'.
+
 `git config tar.tar.xz.command "xz -c"`::
 
 	Configure a "tar.xz" format for making LZMA-compressed tarfiles.
diff --git a/Documentation/git-branch.txt b/Documentation/git-branch.txt
index c8b4f9ce3c..ae82378349 100644
--- a/Documentation/git-branch.txt
+++ b/Documentation/git-branch.txt
@@ -221,13 +221,17 @@ The exact upstream branch is chosen depending on the optional argument:
 itself as the upstream; `--track=inherit` means to copy the upstream
 configuration of the start-point branch.
 +
-`--track=direct` is the default when the start point is a remote-tracking branch.
-Set the branch.autoSetupMerge configuration variable to `false` if you
-want `git switch`, `git checkout` and `git branch` to always behave as if `--no-track`
-were given. Set it to `always` if you want this behavior when the
-start-point is either a local or remote-tracking branch. Set it to
-`inherit` if you want to copy the tracking configuration from the
-branch point.
+The branch.autoSetupMerge configuration variable specifies how `git switch`,
+`git checkout` and `git branch` should behave when neither `--track` nor
+`--no-track` are specified:
++
+The default option, `true`, behaves as though `--track=direct`
+were given whenever the start-point is a remote-tracking branch.
+`false` behaves as if `--no-track` were given. `always` behaves as though
+`--track=direct` were given. `inherit` behaves as though `--track=inherit`
+were given. `simple` behaves as though `--track=direct` were given only when
+the start-point is a remote-tracking branch and the new branch has the same
+name as the remote branch.
 +
 See linkgit:git-pull[1] and linkgit:git-config[1] for additional discussion on
 how the `branch.<name>.remote` and `branch.<name>.merge` options are used.
diff --git a/Documentation/git-config.txt b/Documentation/git-config.txt
index bdcfd94b64..9376e39aef 100644
--- a/Documentation/git-config.txt
+++ b/Documentation/git-config.txt
@@ -248,7 +248,7 @@ Valid `<type>`'s include:
 --show-scope::
 	Similar to `--show-origin` in that it augments the output of
 	all queried config options with the scope of that value
-	(local, global, system, command).
+	(worktree, local, global, system, command).
 
 --get-colorbool <name> [<stdout-is-tty>]::
 
diff --git a/Documentation/git-cvsserver.txt b/Documentation/git-cvsserver.txt
index 4dc57ed254..53f111bc0a 100644
--- a/Documentation/git-cvsserver.txt
+++ b/Documentation/git-cvsserver.txt
@@ -63,11 +63,10 @@ Print version information and exit
 Print usage information and exit
 
 <directory>::
-You can specify a list of allowed directories. If no directories
-are given, all are allowed. This is an additional restriction, gitcvs
-access still needs to be enabled by the `gitcvs.enabled` config option
-unless `--export-all` was given, too.
-
+The remaining arguments provide a list of directories. If no directories
+are given, then all are allowed. Repositories within these directories
+still require the `gitcvs.enabled` config option, unless `--export-all`
+is specified.
 
 LIMITATIONS
 -----------
@@ -311,11 +310,13 @@ ENVIRONMENT
 These variables obviate the need for command-line options in some
 circumstances, allowing easier restricted usage through git-shell.
 
-GIT_CVSSERVER_BASE_PATH takes the place of the argument to --base-path.
+GIT_CVSSERVER_BASE_PATH::
+	This variable replaces the argument to --base-path.
 
-GIT_CVSSERVER_ROOT specifies a single-directory whitelist. The
-repository must still be configured to allow access through
-git-cvsserver, as described above.
+GIT_CVSSERVER_ROOT::
+	This variable specifies a single directory, replacing the
+	`<directory>...` argument list. The repository still requires the
+	`gitcvs.enabled` config option, unless `--export-all` is specified.
 
 When these environment variables are set, the corresponding
 command-line arguments may not be used.
diff --git a/Documentation/git-daemon.txt b/Documentation/git-daemon.txt
index fdc28c041c..236df516c7 100644
--- a/Documentation/git-daemon.txt
+++ b/Documentation/git-daemon.txt
@@ -32,8 +32,8 @@ that service if it is enabled.
 It verifies that the directory has the magic file "git-daemon-export-ok", and
 it will refuse to export any Git directory that hasn't explicitly been marked
 for export this way (unless the `--export-all` parameter is specified). If you
-pass some directory paths as 'git daemon' arguments, you can further restrict
-the offers to a whitelist comprising of those.
+pass some directory paths as 'git daemon' arguments, the offers are limited to
+repositories within those directories.
 
 By default, only `upload-pack` service is enabled, which serves
 'git fetch-pack' and 'git ls-remote' clients, which are invoked
@@ -50,7 +50,7 @@ OPTIONS
 	Match paths exactly (i.e. don't allow "/foo/repo" when the real path is
 	"/foo/repo.git" or "/foo/repo/.git") and don't do user-relative paths.
 	'git daemon' will refuse to start when this option is enabled and no
-	whitelist is specified.
+	directory arguments are provided.
 
 --base-path=<path>::
 	Remap all the path requests as relative to the given path.
@@ -73,7 +73,7 @@ OPTIONS
 	%IP for the server's IP address, %P for the port number,
 	and %D for the absolute path of the named repository.
 	After interpolation, the path is validated against the directory
-	whitelist.
+	list.
 
 --export-all::
 	Allow pulling from all directories that look like Git repositories
@@ -218,9 +218,11 @@ standard output to be sent to the requestor as an error message when
 it declines the service.
 
 <directory>::
-	A directory to add to the whitelist of allowed directories. Unless
-	--strict-paths is specified this will also include subdirectories
-	of each named directory.
+	The remaining arguments provide a list of directories. If any
+	directories are specified, then the `git-daemon` process will
+	serve a requested directory only if it is contained in one of
+	these directories. If `--strict-paths` is specified, then the
+	requested directory must match one of these directories exactly.
 
 SERVICES
 --------
@@ -264,9 +266,8 @@ git		9418/tcp		# Git Version Control System
 
 'git daemon' as inetd server::
 	To set up 'git daemon' as an inetd service that handles any
-	repository under the whitelisted set of directories, /pub/foo
-	and /pub/bar, place an entry like the following into
-	/etc/inetd all on one line:
+	repository within `/pub/foo` or `/pub/bar`, place an entry like
+	the following into `/etc/inetd` all on one line:
 +
 ------------------------------------------------
 	git stream tcp nowait nobody  /usr/bin/git
diff --git a/Documentation/git-diff-index.txt b/Documentation/git-diff-index.txt
index 679cae27d9..c30d8f0da8 100644
--- a/Documentation/git-diff-index.txt
+++ b/Documentation/git-diff-index.txt
@@ -69,8 +69,8 @@ done an `update-index` to make that effective in the index file.
 matches my working directory. But doing a 'git diff-index' does:
 
   torvalds@ppc970:~/git> git diff-index --cached HEAD
-  -100644 blob    4161aecc6700a2eb579e842af0b7f22b98443f74        commit.c
-  +100644 blob    4161aecc6700a2eb579e842af0b7f22b98443f74        git-commit.c
+  :100644 000000 4161aecc6700a2eb579e842af0b7f22b98443f74 0000000000000000000000000000000000000000 D	commit.c
+  :000000 100644 0000000000000000000000000000000000000000 4161aecc6700a2eb579e842af0b7f22b98443f74 A	git-commit.c
 
 You can see easily that the above is a rename.
 
@@ -103,7 +103,7 @@ have not actually done a 'git update-index' on it yet - there is no
 "object" associated with the new state, and you get:
 
   torvalds@ppc970:~/v2.6/linux> git diff-index --abbrev HEAD
-  :100644 100664 7476bb... 000000...      kernel/sched.c
+  :100644 100644 7476bb5ba 000000000 M	kernel/sched.c
 
 i.e., it shows that the tree has changed, and that `kernel/sched.c` is
 not up to date and may contain new stuff. The all-zero sha1 means that to
diff --git a/Documentation/git-gc.txt b/Documentation/git-gc.txt
index 853967dea0..0af7540a0c 100644
--- a/Documentation/git-gc.txt
+++ b/Documentation/git-gc.txt
@@ -54,6 +54,10 @@ other housekeeping tasks (e.g. rerere, working trees, reflog...) will
 be performed as well.
 
 
+--cruft::
+	When expiring unreachable objects, pack them separately into a
+	cruft pack instead of storing them as loose objects.
+
 --prune=<date>::
 	Prune loose objects older than date (default is 2 weeks ago,
 	overridable by the config variable `gc.pruneExpire`).
diff --git a/Documentation/git-mergetool.txt b/Documentation/git-mergetool.txt
index e587c7763a..f784027bc1 100644
--- a/Documentation/git-mergetool.txt
+++ b/Documentation/git-mergetool.txt
@@ -101,6 +101,7 @@ success of the resolution after the custom tool has exited.
 
 CONFIGURATION
 -------------
+:git-mergetool: 1
 include::config/mergetool.txt[]
 
 TEMPORARY FILES
@@ -113,6 +114,13 @@ Setting the `mergetool.keepBackup` configuration variable to `false`
 causes `git mergetool` to automatically remove the backup as files
 are successfully merged.
 
+BACKEND SPECIFIC HINTS
+----------------------
+
+vimdiff
+~~~~~~~
+include::mergetools/vimdiff.txt[]
+
 GIT
 ---
 Part of the linkgit:git[1] suite
diff --git a/Documentation/git-p4.txt b/Documentation/git-p4.txt
index e21fcd8f71..de5ee6748e 100644
--- a/Documentation/git-p4.txt
+++ b/Documentation/git-p4.txt
@@ -636,7 +636,42 @@ git-p4.pathEncoding::
 	Git expects paths encoded as UTF-8. Use this config to tell git-p4
 	what encoding Perforce had used for the paths. This encoding is used
 	to transcode the paths to UTF-8. As an example, Perforce on Windows
-	often uses "cp1252" to encode path names.
+	often uses "cp1252" to encode path names. If this option is passed
+	into a p4 clone request, it is persisted in the resulting new git
+	repo.
+
+git-p4.metadataDecodingStrategy::
+	Perforce keeps the encoding of a changelist descriptions and user
+	full names as stored by the client on a given OS. The p4v client
+	uses the OS-local encoding, and so different users can end up storing
+	different changelist descriptions or user full names in different
+	encodings, in the same depot.
+	Git tolerates inconsistent/incorrect encodings in commit messages
+	and author names, but expects them to be specified in utf-8.
+	git-p4 can use three different decoding strategies in handling the
+	encoding uncertainty in Perforce: 'passthrough' simply passes the
+	original bytes through from Perforce to git, creating usable but
+	incorrectly-encoded data when the Perforce data is encoded as
+	anything other than utf-8. 'strict' expects the Perforce data to be
+	encoded as utf-8, and fails to import when this is not true.
+	'fallback' attempts to interpret the data as utf-8, and otherwise
+	falls back to using a secondary encoding - by default the common
+	windows encoding 'cp-1252' - with upper-range bytes escaped if
+	decoding with the fallback encoding also fails.
+	Under python2 the default strategy is 'passthrough' for historical
+	reasons, and under python3 the default is 'fallback'.
+	When 'strict' is selected and decoding fails, the error message will
+	propose changing this config parameter as a workaround. If this
+	option is passed into a p4 clone request, it is persisted into the
+	resulting new git repo.
+
+git-p4.metadataFallbackEncoding::
+	Specify the fallback encoding to use when decoding Perforce author
+	names and changelists descriptions using the 'fallback' strategy
+	(see git-p4.metadataDecodingStrategy). The fallback encoding will
+	only be used when decoding as utf-8 fails. This option defaults to
+	cp1252, a common windows encoding. If this option is passed into a
+	p4 clone request, it is persisted into the resulting new git repo.
 
 git-p4.largeFileSystem::
 	Specify the system that is used for large (binary) files. Please note
diff --git a/Documentation/git-pack-objects.txt b/Documentation/git-pack-objects.txt
index f8344e1e5b..a9995a932c 100644
--- a/Documentation/git-pack-objects.txt
+++ b/Documentation/git-pack-objects.txt
@@ -13,6 +13,7 @@ SYNOPSIS
 	[--no-reuse-delta] [--delta-base-offset] [--non-empty]
 	[--local] [--incremental] [--window=<n>] [--depth=<n>]
 	[--revs [--unpacked | --all]] [--keep-pack=<pack-name>]
+	[--cruft] [--cruft-expiration=<time>]
 	[--stdout [--filter=<filter-spec>] | <base-name>]
 	[--shallow] [--keep-true-parents] [--[no-]sparse] < <object-list>
 
@@ -95,6 +96,35 @@ base-name::
 Incompatible with `--revs`, or options that imply `--revs` (such as
 `--all`), with the exception of `--unpacked`, which is compatible.
 
+--cruft::
+	Packs unreachable objects into a separate "cruft" pack, denoted
+	by the existence of a `.mtimes` file. Typically used by `git
+	repack --cruft`. Callers provide a list of pack names and
+	indicate which packs will remain in the repository, along with
+	which packs will be deleted (indicated by the `-` prefix). The
+	contents of the cruft pack are all objects not contained in the
+	surviving packs which have not exceeded the grace period (see
+	`--cruft-expiration` below), or which have exceeded the grace
+	period, but are reachable from an other object which hasn't.
++
+When the input lists a pack containing all reachable objects (and lists
+all other packs as pending deletion), the corresponding cruft pack will
+contain all unreachable objects (with mtime newer than the
+`--cruft-expiration`) along with any unreachable objects whose mtime is
+older than the `--cruft-expiration`, but are reachable from an
+unreachable object whose mtime is newer than the `--cruft-expiration`).
++
+Incompatible with `--unpack-unreachable`, `--keep-unreachable`,
+`--pack-loose-unreachable`, `--stdin-packs`, as well as any other
+options which imply `--revs`. Also incompatible with `--max-pack-size`;
+when this option is set, the maximum pack size is not inferred from
+`pack.packSizeLimit`.
+
+--cruft-expiration=<approxidate>::
+	If specified, objects are eliminated from the cruft pack if they
+	have an mtime older than `<approxidate>`. If unspecified (and
+	given `--cruft`), then no objects are eliminated.
+
 --window=<n>::
 --depth=<n>::
 	These two options affect how the objects contained in
diff --git a/Documentation/git-read-tree.txt b/Documentation/git-read-tree.txt
index a5356a230b..b9bfdc0a31 100644
--- a/Documentation/git-read-tree.txt
+++ b/Documentation/git-read-tree.txt
@@ -375,10 +375,13 @@ have finished your work-in-progress), attempt the merge again.
 SPARSE CHECKOUT
 ---------------
 
-Note: The `update-index` and `read-tree` primitives for supporting the
-skip-worktree bit predated the introduction of
-linkgit:git-sparse-checkout[1].  Users are encouraged to use
-`sparse-checkout` in preference to these low-level primitives.
+Note: The skip-worktree capabilities in linkgit:git-update-index[1]
+and `read-tree` predated the introduction of
+linkgit:git-sparse-checkout[1].  Users are encouraged to use the
+`sparse-checkout` command in preference to these plumbing commands for
+sparse-checkout/skip-worktree related needs.  However, the information
+below might be useful to users trying to understand the pattern style
+used in non-cone mode of the `sparse-checkout` command.
 
 "Sparse checkout" allows populating the working directory sparsely.
 It uses the skip-worktree bit (see linkgit:git-update-index[1]) to
diff --git a/Documentation/git-rebase.txt b/Documentation/git-rebase.txt
index 262fb01aec..a872ab0fbd 100644
--- a/Documentation/git-rebase.txt
+++ b/Documentation/git-rebase.txt
@@ -16,40 +16,40 @@ SYNOPSIS
 
 DESCRIPTION
 -----------
-If <branch> is specified, 'git rebase' will perform an automatic
+If `<branch>` is specified, `git rebase` will perform an automatic
 `git switch <branch>` before doing anything else.  Otherwise
 it remains on the current branch.
 
-If <upstream> is not specified, the upstream configured in
-branch.<name>.remote and branch.<name>.merge options will be used (see
+If `<upstream>` is not specified, the upstream configured in
+`branch.<name>.remote` and `branch.<name>.merge` options will be used (see
 linkgit:git-config[1] for details) and the `--fork-point` option is
 assumed.  If you are currently not on any branch or if the current
 branch does not have a configured upstream, the rebase will abort.
 
 All changes made by commits in the current branch but that are not
-in <upstream> are saved to a temporary area.  This is the same set
+in `<upstream>` are saved to a temporary area.  This is the same set
 of commits that would be shown by `git log <upstream>..HEAD`; or by
 `git log 'fork_point'..HEAD`, if `--fork-point` is active (see the
 description on `--fork-point` below); or by `git log HEAD`, if the
 `--root` option is specified.
 
-The current branch is reset to <upstream>, or <newbase> if the
---onto option was supplied.  This has the exact same effect as
-`git reset --hard <upstream>` (or <newbase>).  ORIG_HEAD is set
+The current branch is reset to `<upstream>` or `<newbase>` if the
+`--onto` option was supplied.  This has the exact same effect as
+`git reset --hard <upstream>` (or `<newbase>`). `ORIG_HEAD` is set
 to point at the tip of the branch before the reset.
 
 The commits that were previously saved into the temporary area are
 then reapplied to the current branch, one by one, in order. Note that
-any commits in HEAD which introduce the same textual changes as a commit
-in HEAD..<upstream> are omitted (i.e., a patch already accepted upstream
+any commits in `HEAD` which introduce the same textual changes as a commit
+in `HEAD..<upstream>` are omitted (i.e., a patch already accepted upstream
 with a different commit message or timestamp will be skipped).
 
 It is possible that a merge failure will prevent this process from being
 completely automatic.  You will have to resolve any such merge failure
 and run `git rebase --continue`.  Another option is to bypass the commit
 that caused the merge failure with `git rebase --skip`.  To check out the
-original <branch> and remove the .git/rebase-apply working files, use the
-command `git rebase --abort` instead.
+original `<branch>` and remove the `.git/rebase-apply` working files, use
+the command `git rebase --abort` instead.
 
 Assume the following history exists and the current branch is "topic":
 
@@ -79,7 +79,7 @@ remain the checked-out branch.
 
 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 and warnings will be issued (if the `merge` backend is
+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):
@@ -176,11 +176,11 @@ would result in the removal of commits F and G:
 ------------
 
 This is useful if F and G were flawed in some way, or should not be
-part of topicA.  Note that the argument to --onto and the <upstream>
+part of topicA.  Note that the argument to `--onto` and the `<upstream>`
 parameter can be any valid commit-ish.
 
-In case of conflict, 'git rebase' will stop at the first problematic commit
-and leave conflict markers in the tree.  You can use 'git diff' to locate
+In case of conflict, `git rebase` will stop at the first problematic commit
+and leave conflict markers in the tree.  You can use `git diff` to locate
 the markers (<<<<<<) and make edits to resolve the conflict.  For each
 file you edit, you need to tell Git that the conflict has been resolved,
 typically this would be done with
@@ -205,8 +205,8 @@ OPTIONS
 -------
 --onto <newbase>::
 	Starting point at which to create the new commits. If the
-	--onto option is not specified, the starting point is
-	<upstream>.  May be any valid commit, and not just an
+	`--onto` option is not specified, the starting point is
+	`<upstream>`.  May be any valid commit, and not just an
 	existing branch name.
 +
 As a special case, you may use "A\...B" as a shortcut for the
@@ -215,19 +215,19 @@ leave out at most one of A and B, in which case it defaults to HEAD.
 
 --keep-base::
 	Set the starting point at which to create the new commits to the
-	merge base of <upstream> and <branch>. Running
-	'git rebase --keep-base <upstream> <branch>' is equivalent to
+	merge base of `<upstream>` and `<branch>`. Running
+	`git rebase --keep-base <upstream> <branch>` is equivalent to
 	running
-	'git rebase --onto <upstream>...<branch> <upstream> <branch>'.
+	`git rebase --onto <upstream>...<branch> <upstream> <branch>`.
 +
 This option is useful in the case where one is developing a feature on
 top of an upstream branch. While the feature is being worked on, the
 upstream branch may advance and it may not be the best idea to keep
 rebasing on top of the upstream but to keep the base commit as-is.
 +
-Although both this option and --fork-point find the merge base between
-<upstream> and <branch>, this option uses the merge base as the _starting
-point_ on which new commits will be created, whereas --fork-point uses
+Although both this option and `--fork-point` find the merge base between
+`<upstream>` and `<branch>`, this option uses the merge base as the _starting
+point_ on which new commits will be created, whereas `--fork-point` uses
 the merge base to determine the _set of commits_ which will be rebased.
 +
 See also INCOMPATIBLE OPTIONS below.
@@ -238,23 +238,23 @@ See also INCOMPATIBLE OPTIONS below.
 	upstream for the current branch.
 
 <branch>::
-	Working branch; defaults to HEAD.
+	Working branch; defaults to `HEAD`.
 
 --continue::
 	Restart the rebasing process after having resolved a merge conflict.
 
 --abort::
 	Abort the rebase operation and reset HEAD to the original
-	branch. If <branch> was provided when the rebase operation was
-	started, then HEAD will be reset to <branch>. Otherwise HEAD
+	branch. If `<branch>` was provided when the rebase operation was
+	started, then `HEAD` will be reset to `<branch>`. Otherwise `HEAD`
 	will be reset to where it was when the rebase operation was
 	started.
 
 --quit::
-	Abort the rebase operation but HEAD is not reset back to the
+	Abort the rebase operation but `HEAD` is not reset back to the
 	original branch. The index and working tree are also left
 	unchanged as a result. If a temporary stash entry was created
-	using --autostash, it will be saved to the stash list.
+	using `--autostash`, it will be saved to the stash list.
 
 --apply::
 	Use applying strategies to rebase (calling `git-am`
@@ -269,16 +269,16 @@ See also INCOMPATIBLE OPTIONS below.
 	empty after rebasing (because they contain a subset of already
 	upstream changes).  With drop (the default), commits that
 	become empty are dropped.  With keep, such commits are kept.
-	With ask (implied by --interactive), the rebase will halt when
+	With ask (implied by `--interactive`), the rebase will halt when
 	an empty commit is applied allowing you to choose whether to
 	drop it, edit files more, or just commit the empty changes.
-	Other options, like --exec, will use the default of drop unless
-	-i/--interactive is explicitly specified.
+	Other options, like `--exec`, will use the default of drop unless
+	`-i`/`--interactive` is explicitly specified.
 +
-Note that commits which start empty are kept (unless --no-keep-empty
+Note that commits which start empty are kept (unless `--no-keep-empty`
 is specified), and commits which are clean cherry-picks (as determined
 by `git log --cherry-mark ...`) are detected and dropped as a
-preliminary step (unless --reapply-cherry-picks is passed).
+preliminary step (unless `--reapply-cherry-picks` is passed).
 +
 See also INCOMPATIBLE OPTIONS below.
 
@@ -287,7 +287,7 @@ See also INCOMPATIBLE OPTIONS below.
 	Do not keep commits that start empty before the rebase
 	(i.e. that do not change anything from its parent) in the
 	result.  The default is to keep commits which start empty,
-	since creating such commits requires passing the --allow-empty
+	since creating such commits requires passing the `--allow-empty`
 	override flag to `git commit`, signifying that a user is very
 	intentionally creating such a commit and thus wants to keep
 	it.
@@ -299,7 +299,7 @@ flag exists as a convenient shortcut, such as for cases where external
 tools generate many empty commits and you want them all removed.
 +
 For commits which do not start empty but become empty after rebasing,
-see the --empty flag.
+see the `--empty` flag.
 +
 See also INCOMPATIBLE OPTIONS below.
 
@@ -314,7 +314,7 @@ See also INCOMPATIBLE OPTIONS below.
 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.  When using the `merge`
+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]).
@@ -348,10 +348,10 @@ See also INCOMPATIBLE OPTIONS below.
 	Using merging strategies to rebase (default).
 +
 Note that a rebase merge works by replaying each commit from the working
-branch on top of the <upstream> branch.  Because of this, when a merge
+branch on top of the `<upstream>` branch.  Because of this, when a merge
 conflict happens, the side reported as 'ours' is the so-far rebased
-series, starting with <upstream>, and 'theirs' is the working branch.  In
-other words, the sides are swapped.
+series, starting with `<upstream>`, and 'theirs' is the working branch.
+In other words, the sides are swapped.
 +
 See also INCOMPATIBLE OPTIONS below.
 
@@ -360,9 +360,9 @@ See also INCOMPATIBLE OPTIONS below.
 	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
-the 'ours' strategy simply empties all patches from the <branch>,
+Because `git rebase` replays each commit from the working branch
+on top of the `<upstream>` branch using the given strategy, using
+the `ours` strategy simply empties all patches from the `<branch>`,
 which makes little sense.
 +
 See also INCOMPATIBLE OPTIONS below.
@@ -392,11 +392,11 @@ See also INCOMPATIBLE OPTIONS below.
 
 -q::
 --quiet::
-	Be quiet. Implies --no-stat.
+	Be quiet. Implies `--no-stat`.
 
 -v::
 --verbose::
-	Be verbose. Implies --stat.
+	Be verbose. Implies `--stat`.
 
 --stat::
 	Show a diffstat of what changed upstream since the last rebase. The
@@ -411,13 +411,13 @@ See also INCOMPATIBLE OPTIONS below.
 
 --verify::
 	Allows the pre-rebase hook to run, which is the default.  This option can
-	be used to override --no-verify.  See also linkgit:githooks[5].
+	be used to override `--no-verify`.  See also linkgit:githooks[5].
 
 -C<n>::
-	Ensure at least <n> lines of surrounding context match before
+	Ensure at least `<n>` lines of surrounding context match before
 	and after each change.  When fewer lines of surrounding
 	context exist they all must match.  By default no context is
-	ever ignored.  Implies --apply.
+	ever ignored.  Implies `--apply`.
 +
 See also INCOMPATIBLE OPTIONS below.
 
@@ -436,21 +436,21 @@ details).
 
 --fork-point::
 --no-fork-point::
-	Use reflog to find a better common ancestor between <upstream>
-	and <branch> when calculating which commits have been
-	introduced by <branch>.
+	Use reflog to find a better common ancestor between `<upstream>`
+	and `<branch>` when calculating which commits have been
+	introduced by `<branch>`.
 +
-When --fork-point is active, 'fork_point' will be used instead of
-<upstream> to calculate the set of commits to rebase, where
+When `--fork-point` is active, 'fork_point' will be used instead of
+`<upstream>` to calculate the set of commits to rebase, where
 'fork_point' is the result of `git merge-base --fork-point <upstream>
 <branch>` command (see linkgit:git-merge-base[1]).  If 'fork_point'
-ends up being empty, the <upstream> will be used as a fallback.
+ends up being empty, the `<upstream>` will be used as a fallback.
 +
-If <upstream> is given on the command line, then the default is
+If `<upstream>` is given on the command line, then the default is
 `--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
+If your branch was based on `<upstream>` but `<upstream>` was rewound and
 your branch contains commits which were dropped, this option can be used
 with `--keep-base` in order to drop those commits from your branch.
 +
@@ -458,24 +458,26 @@ See also INCOMPATIBLE OPTIONS below.
 
 --ignore-whitespace::
 	Ignore whitespace differences when trying to reconcile
-differences. Currently, each backend implements an approximation of
-this behavior:
+	differences. Currently, each backend implements an approximation of
+	this behavior:
 +
-apply backend: When applying a patch, ignore changes in whitespace in
-context lines. Unfortunately, this means that if the "old" lines being
-replaced by the patch differ only in whitespace from the existing
-file, you will get a merge conflict instead of a successful patch
-application.
+apply backend;;
+	When applying a patch, ignore changes in whitespace in context
+	lines. Unfortunately, this means that if the "old" lines being
+	replaced by the patch differ only in whitespace from the existing
+	file, you will get a merge conflict instead of a successful patch
+	application.
 +
-merge backend: Treat lines with only whitespace changes as unchanged
-when merging. Unfortunately, this means that any patch hunks that were
-intended to modify whitespace and nothing else will be dropped, even
-if the other side had no changes that conflicted.
+merge backend;;
+	Treat lines with only whitespace changes as unchanged when merging.
+	Unfortunately, this means that any patch hunks that were intended
+	to modify whitespace and nothing else will be dropped, even if the
+	other side had no changes that conflicted.
 
 --whitespace=<option>::
-	This flag is passed to the 'git apply' program
+	This flag is passed to the `git apply` program
 	(see linkgit:git-apply[1]) that applies the patch.
-	Implies --apply.
+	Implies `--apply`.
 +
 See also INCOMPATIBLE OPTIONS below.
 
@@ -537,7 +539,7 @@ See also REBASING MERGES and INCOMPATIBLE OPTIONS below.
 -x <cmd>::
 --exec <cmd>::
 	Append "exec <cmd>" after each line creating a commit in the
-	final history. <cmd> will be interpreted as one or more shell
+	final history. `<cmd>` will be interpreted as one or more shell
 	commands. Any command that fails will interrupt the rebase,
 	with exit code 1.
 +
@@ -550,7 +552,7 @@ or by giving more than one `--exec`:
 +
 	git rebase -i --exec "cmd1" --exec "cmd2" --exec ...
 +
-If `--autosquash` is used, "exec" lines will not be appended for
+If `--autosquash` is used, `exec` lines will not be appended for
 the intermediate commits, and will only appear at the end of each
 squash/fixup series.
 +
@@ -560,11 +562,12 @@ without an explicit `--interactive`.
 See also INCOMPATIBLE OPTIONS below.
 
 --root::
-	Rebase all commits reachable from <branch>, instead of
-	limiting them with an <upstream>.  This allows you to rebase
-	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.
+	Rebase all commits reachable from `<branch>`, instead of
+	limiting them with an `<upstream>`.  This allows you to rebase
+	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.
 +
 See also INCOMPATIBLE OPTIONS below.
 
@@ -643,9 +646,9 @@ In addition, the following pairs of options are incompatible:
 BEHAVIORAL DIFFERENCES
 -----------------------
 
-git rebase has two primary backends: apply and merge.  (The apply
+`git rebase` has two primary backends: 'apply' and 'merge'.  (The 'apply'
 backend used to be known as the 'am' backend, but the name led to
-confusion as it looks like a verb instead of a noun.  Also, the merge
+confusion as it looks like a verb instead of a noun.  Also, the 'merge'
 backend used to be known as the interactive backend, but it is now
 used for non-interactive cases as well.  Both were renamed based on
 lower-level functionality that underpinned each.) There are some
@@ -654,19 +657,19 @@ subtle differences in how these two backends behave:
 Empty commits
 ~~~~~~~~~~~~~
 
-The apply backend unfortunately drops intentionally empty commits, i.e.
+The 'apply' backend unfortunately drops intentionally empty commits, i.e.
 commits that started empty, though these are rare in practice.  It
 also drops commits that become empty and has no option for controlling
 this behavior.
 
-The merge backend keeps intentionally empty commits by default (though
-with -i they are marked as empty in the todo list editor, or they can
-be dropped automatically with --no-keep-empty).
+The 'merge' backend keeps intentionally empty commits by default (though
+with `-i` they are marked as empty in the todo list editor, or they can
+be dropped automatically with `--no-keep-empty`).
 
 Similar to the apply backend, by default the merge backend drops
-commits that become empty unless -i/--interactive is specified (in
+commits that become empty unless `-i`/`--interactive` is specified (in
 which case it stops and asks the user what to do).  The merge backend
-also has an --empty={drop,keep,ask} option for changing the behavior
+also has an `--empty={drop,keep,ask}` option for changing the behavior
 of handling commits that become empty.
 
 Directory rename detection
@@ -674,20 +677,20 @@ Directory rename detection
 
 Due to the lack of accurate tree information (arising from
 constructing fake ancestors with the limited information available in
-patches), directory rename detection is disabled in the apply backend.
+patches), directory rename detection is disabled in the 'apply' backend.
 Disabled directory rename detection means that if one side of history
 renames a directory and the other adds new files to the old directory,
 then the new files will be left behind in the old directory without
 any warning at the time of rebasing that you may want to move these
 files into the new directory.
 
-Directory rename detection works with the merge backend to provide you
+Directory rename detection works with the 'merge' backend to provide you
 warnings in such cases.
 
 Context
 ~~~~~~~
 
-The apply backend works by creating a sequence of patches (by calling
+The 'apply' backend works by creating a sequence of patches (by calling
 `format-patch` internally), and then applying the patches in sequence
 (calling `am` internally).  Patches are composed of multiple hunks,
 each with line numbers, a context region, and the actual changes.  The
@@ -698,11 +701,11 @@ order to apply the changes to the right lines.  However, if multiple
 areas of the code have the same surrounding lines of context, the
 wrong one can be picked.  There are real-world cases where this has
 caused commits to be reapplied incorrectly with no conflicts reported.
-Setting diff.context to a larger value may prevent such types of
+Setting `diff.context` to a larger value may prevent such types of
 problems, but increases the chance of spurious conflicts (since it
 will require more lines of matching context to apply).
 
-The merge backend works with a full copy of each relevant file,
+The 'merge' backend works with a full copy of each relevant file,
 insulating it from these types of problems.
 
 Labelling of conflicts markers
@@ -710,30 +713,30 @@ Labelling of conflicts markers
 
 When there are content conflicts, the merge machinery tries to
 annotate each side's conflict markers with the commits where the
-content came from.  Since the apply backend drops the original
+content came from.  Since the 'apply' backend drops the original
 information about the rebased commits and their parents (and instead
 generates new fake commits based off limited information in the
 generated patches), those commits cannot be identified; instead it has
-to fall back to a commit summary.  Also, when merge.conflictStyle is
-set to diff3 or zdiff3, the apply backend will use "constructed merge
+to fall back to a commit summary.  Also, when `merge.conflictStyle` is
+set to `diff3` or `zdiff3`, the 'apply' backend will use "constructed merge
 base" to label the content from the merge base, and thus provide no
 information about the merge base commit whatsoever.
 
-The merge backend works with the full commits on both sides of history
+The 'merge' backend works with the full commits on both sides of history
 and thus has no such limitations.
 
 Hooks
 ~~~~~
 
-The apply backend has not traditionally called the post-commit hook,
-while the merge backend has.  Both have called the post-checkout hook,
-though the merge backend has squelched its output.  Further, both
+The 'apply' backend has not traditionally called the post-commit hook,
+while the 'merge' backend has.  Both have called the post-checkout hook,
+though the 'merge' backend has squelched its output.  Further, both
 backends only call the post-checkout hook with the starting point
 commit of the rebase, not the intermediate commits nor the final
 commit.  In each case, the calling of these hooks was by accident of
 implementation rather than by design (both backends were originally
 implemented as shell scripts and happened to invoke other commands
-like 'git checkout' or 'git commit' that would call the hooks).  Both
+like `git checkout` or `git commit` that would call the hooks).  Both
 backends should have the same behavior, though it is not entirely
 clear which, if any, is correct.  We will likely make rebase stop
 calling either of these hooks in the future.
@@ -741,10 +744,10 @@ calling either of these hooks in the future.
 Interruptability
 ~~~~~~~~~~~~~~~~
 
-The apply backend has safety problems with an ill-timed interrupt; if
+The 'apply' backend has safety problems with an ill-timed interrupt; if
 the user presses Ctrl-C at the wrong time to try to abort the rebase,
 the rebase can enter a state where it cannot be aborted with a
-subsequent `git rebase --abort`.  The merge backend does not appear to
+subsequent `git rebase --abort`.  The 'merge' backend does not appear to
 suffer from the same shortcoming.  (See
 https://lore.kernel.org/git/20200207132152.GC2868@szeder.dev/ for
 details.)
@@ -756,8 +759,8 @@ When a conflict occurs while rebasing, rebase stops and asks the user
 to resolve.  Since the user may need to make notable changes while
 resolving conflicts, after conflicts are resolved and the user has run
 `git rebase --continue`, the rebase should open an editor and ask the
-user to update the commit message.  The merge backend does this, while
-the apply backend blindly applies the original commit message.
+user to update the commit message.  The 'merge' backend does this, while
+the 'apply' backend blindly applies the original commit message.
 
 Miscellaneous differences
 ~~~~~~~~~~~~~~~~~~~~~~~~~
@@ -777,23 +780,23 @@ completeness:
   them to stderr.
 
 * State directories: The two backends keep their state in different
-  directories under .git/
+  directories under `.git/`
 
 include::merge-strategies.txt[]
 
 NOTES
 -----
 
-You should understand the implications of using 'git rebase' on a
+You should understand the implications of using `git rebase` on a
 repository that you share.  See also RECOVERING FROM UPSTREAM REBASE
 below.
 
-When the git-rebase command is run, it will first execute a "pre-rebase"
-hook if one exists.  You can use this hook to do sanity checks and
-reject the rebase if it isn't appropriate.  Please see the template
-pre-rebase hook script for an example.
+When the rebase is run, it will first execute a `pre-rebase` hook if one
+exists.  You can use this hook to do sanity checks and reject the rebase
+if it isn't appropriate.  Please see the template `pre-rebase` hook script
+for an example.
 
-Upon completion, <branch> will be the current branch.
+Upon completion, `<branch>` will be the current branch.
 
 INTERACTIVE MODE
 ----------------
@@ -848,7 +851,7 @@ not look at them but at the commit names ("deadbee" and "fa1afe1" in this
 example), so do not delete or edit the names.
 
 By replacing the command "pick" with the command "edit", you can tell
-'git rebase' to stop after applying that commit, so that you can edit
+`git rebase` to stop after applying that commit, so that you can edit
 the files and/or the commit message, amend the commit, and continue
 rebasing.
 
@@ -876,14 +879,13 @@ commit, the message from the final one is used.  You can also use
 "fixup -C" to get the same behavior as "fixup -c" except without opening
 an editor.
 
-
-'git rebase' will stop when "pick" has been replaced with "edit" or
+`git rebase` will stop when "pick" has been replaced with "edit" or
 when a command fails due to merge errors. When you are done editing
 and/or resolving conflicts you can continue with `git rebase --continue`.
 
 For example, if you want to reorder the last 5 commits, such that what
-was HEAD~4 becomes the new HEAD. To achieve that, you would call
-'git rebase' like this:
+was `HEAD~4` becomes the new `HEAD`. To achieve that, you would call
+`git rebase` like this:
 
 ----------------------
 $ git rebase -i HEAD~5
@@ -903,7 +905,7 @@ like this:
 ------------------
 
 Suppose you want to rebase the side branch starting at "A" to "Q". Make
-sure that the current HEAD is "B", and call
+sure that the current `HEAD` is "B", and call
 
 -----------------------------
 $ git rebase -i -r --onto Q O
@@ -956,23 +958,23 @@ SPLITTING COMMITS
 -----------------
 
 In interactive mode, you can mark commits with the action "edit".  However,
-this does not necessarily mean that 'git rebase' expects the result of this
+this does not necessarily mean that `git rebase` expects the result of this
 edit to be exactly one commit.  Indeed, you can undo the commit, or you can
 add other commits.  This can be used to split a commit into two:
 
 - Start an interactive rebase with `git rebase -i <commit>^`, where
-  <commit> is the commit you want to split.  In fact, any commit range
+  `<commit>` is the commit you want to split.  In fact, any commit range
   will do, as long as it contains that commit.
 
 - Mark the commit you want to split with the action "edit".
 
 - When it comes to editing that commit, execute `git reset HEAD^`.  The
-  effect is that the HEAD is rewound by one, and the index follows suit.
+  effect is that the `HEAD` is rewound by one, and the index follows suit.
   However, the working tree stays the same.
 
 - Now add the changes to the index that you want to have in the first
   commit.  You can use `git add` (possibly interactively) or
-  'git gui' (or both) to do that.
+  `git gui` (or both) to do that.
 
 - Commit the now-current index with whatever commit message is appropriate
   now.
@@ -983,7 +985,7 @@ add other commits.  This can be used to split a commit into two:
 
 If you are not absolutely sure that the intermediate revisions are
 consistent (they compile, pass the testsuite, etc.) you should use
-'git stash' to stash away the not-yet-committed changes
+`git stash` to stash away the not-yet-committed changes
 after each commit, test, and amend the commit if fixes are necessary.
 
 
@@ -1087,12 +1089,12 @@ NOTE: While an "easy case recovery" sometimes appears to be successful
       example, a commit that was removed via `git rebase
       --interactive` will be **resurrected**!
 
-The idea is to manually tell 'git rebase' "where the old 'subsystem'
+The idea is to manually tell `git rebase` "where the old 'subsystem'
 ended and your 'topic' began", that is, what the old merge base
 between them was.  You will have to find a way to name the last commit
 of the old 'subsystem', for example:
 
-* With the 'subsystem' reflog: after 'git fetch', the old tip of
+* With the 'subsystem' reflog: after `git fetch`, the old tip of
   'subsystem' is at `subsystem@{1}`.  Subsequent fetches will
   increase the number.  (See linkgit:git-reflog[1].)
 
diff --git a/Documentation/git-reflog.txt b/Documentation/git-reflog.txt
index 5ced7ad4f8..db9d46edfa 100644
--- a/Documentation/git-reflog.txt
+++ b/Documentation/git-reflog.txt
@@ -22,7 +22,7 @@ depending on the subcommand:
 	[--rewrite] [--updateref] [--stale-fix]
 	[--dry-run | -n] [--verbose] [--all [--single-worktree] | <refs>...]
 'git reflog delete' [--rewrite] [--updateref]
-	[--dry-run | -n] [--verbose] <ref>@\{<specifier>\}...
+	[--dry-run | -n] [--verbose] <ref>@{<specifier>}...
 'git reflog exists' <ref>
 
 Reference logs, or "reflogs", record when the tips of branches and
diff --git a/Documentation/git-remote.txt b/Documentation/git-remote.txt
index cde9614e36..1dec314834 100644
--- a/Documentation/git-remote.txt
+++ b/Documentation/git-remote.txt
@@ -35,6 +35,8 @@ OPTIONS
 -v::
 --verbose::
 	Be a little more verbose and show remote url after name.
+	For promisor remotes, also show which filter (`blob:none` etc.)
+	are configured.
 	NOTE: This must be placed between `remote` and subcommand.
 
 
diff --git a/Documentation/git-repack.txt b/Documentation/git-repack.txt
index ee30edc178..0bf13893d8 100644
--- a/Documentation/git-repack.txt
+++ b/Documentation/git-repack.txt
@@ -63,6 +63,17 @@ to the new separate pack will be written.
 	Also run  'git prune-packed' to remove redundant
 	loose object files.
 
+--cruft::
+	Same as `-a`, unless `-d` is used. Then any unreachable objects
+	are packed into a separate cruft pack. Unreachable objects can
+	be pruned using the normal expiry rules with the next `git gc`
+	invocation (see linkgit:git-gc[1]). Incompatible with `-k`.
+
+--cruft-expiration=<approxidate>::
+	Expire unreachable objects older than `<approxidate>`
+	immediately instead of waiting for the next `git gc` invocation.
+	Only useful with `--cruft -d`.
+
 -l::
 	Pass the `--local` option to 'git pack-objects'. See
 	linkgit:git-pack-objects[1].
diff --git a/Documentation/git-revert.txt b/Documentation/git-revert.txt
index bb92a4a451..8463fe9cf7 100644
--- a/Documentation/git-revert.txt
+++ b/Documentation/git-revert.txt
@@ -117,6 +117,15 @@ effect to your index in a row.
 	Allow the rerere mechanism to update the index with the
 	result of auto-conflict resolution if possible.
 
+--reference::
+	Instead of starting the body of the log message with "This
+	reverts <full object name of the commit being reverted>.",
+	refer to the commit using "--pretty=reference" format
+	(cf. linkgit:git-log[1]).  The `revert.reference`
+	configuration variable can be used to enable this option by
+	default.
+
+
 SEQUENCER SUBCOMMANDS
 ---------------------
 include::sequencer.txt[]
diff --git a/Documentation/git-sparse-checkout.txt b/Documentation/git-sparse-checkout.txt
index 88e55f432f..3776705bf5 100644
--- a/Documentation/git-sparse-checkout.txt
+++ b/Documentation/git-sparse-checkout.txt
@@ -15,15 +15,15 @@ SYNOPSIS
 DESCRIPTION
 -----------
 
-This command is used to create sparse checkouts, which means that it
-changes the working tree from having all tracked files present, to only
-have a subset of them.  It can also switch which subset of files are
-present, or undo and go back to having all tracked files present in the
-working copy.
+This command is used to create sparse checkouts, which change the
+working tree from having all tracked files present to only having a
+subset of those files.  It can also switch which subset of files are
+present, or undo and go back to having all tracked files present in
+the working copy.
 
 The subset of files is chosen by providing a list of directories in
-cone mode (which is recommended), or by providing a list of patterns
-in non-cone mode.
+cone mode (the default), or by providing a list of patterns in
+non-cone mode.
 
 When in a sparse-checkout, other Git commands behave a bit differently.
 For example, switching branches will not update paths outside the
@@ -44,9 +44,9 @@ COMMANDS
 	Enable the necessary sparse-checkout config settings
 	(`core.sparseCheckout`, `core.sparseCheckoutCone`, and
 	`index.sparse`) if they are not already set to the desired values,
-	and write a set of patterns to the sparse-checkout file from the
-	list of arguments following the 'set' subcommand. Update the
-	working directory to match the new patterns.
+	populate the sparse-checkout file from the list of arguments
+	following the 'set' subcommand, and update the working directory to
+	match.
 +
 To ensure that adjusting the sparse-checkout settings within a worktree
 does not alter the sparse-checkout settings in other worktrees, the 'set'
@@ -60,22 +60,20 @@ When the `--stdin` option is provided, the directories or patterns are
 read from standard in as a newline-delimited list instead of from the
 arguments.
 +
-When `--cone` is passed or `core.sparseCheckoutCone` is enabled, the
-input list is considered a list of directories.  This allows for
-better performance with a limited set of patterns (see 'CONE PATTERN
-SET' below).  The input format matches the output of `git ls-tree
---name-only`.  This includes interpreting pathnames that begin with a
-double quote (") as C-style quoted strings.  Note that the set command
-will write patterns to the sparse-checkout file to include all files
-contained in those directories (recursively) as well as files that are
-siblings of ancestor directories. This may become the default in the
-future; --no-cone can be passed to request non-cone mode.
+By default, the input list is considered a list of directories, matching
+the output of `git ls-tree -d --name-only`.  This includes interpreting
+pathnames that begin with a double quote (") as C-style quoted strings.
+Note that all files under the specified directories (at any depth) will
+be included in the sparse checkout, as well as files that are siblings
+of either the given directory or any of its ancestors (see 'CONE PATTERN
+SET' below for more details).  In the past, this was not the default,
+and `--cone` needed to be specified or `core.sparseCheckoutCone` needed
+to be enabled.
 +
-When `--no-cone` is passed or `core.sparseCheckoutCone` is not enabled,
-the input list is considered a list of patterns.  This mode is harder
-to use and less performant, and is thus not recommended.  See the
-"Sparse Checkout" section of linkgit:git-read-tree[1] and the "Pattern
-Set" sections below for more details.
+When `--no-cone` is passed, the input list is considered a list of
+patterns.  This mode has a number of drawbacks, including not working
+with some options like `--sparse-index`.  As explained in the
+"Non-cone Problems" section below, we do not recommend using it.
 +
 Use the `--[no-]sparse-index` option to use a sparse index (the
 default is to not use it).  A sparse index reduces the size of the
@@ -137,8 +135,45 @@ paths to pass to a subsequent 'set' or 'add' command.  However,
 the disable command, so the easy restore of calling a plain `init`
 decreased in utility.
 
-SPARSE CHECKOUT
----------------
+EXAMPLES
+--------
+`git sparse-checkout set MY/DIR1 SUB/DIR2`::
+
+	Change to a sparse checkout with all files (at any depth) under
+	MY/DIR1/ and SUB/DIR2/ present in the working copy (plus all
+	files immediately under MY/ and SUB/ and the toplevel
+	directory).  If already in a sparse checkout, change which files
+	are present in the working copy to this new selection.  Note
+	that this command will also delete all ignored files in any
+	directory that no longer has either tracked or
+	non-ignored-untracked files present.
+
+`git sparse-checkout disable`::
+
+	Repopulate the working directory with all files, disabling sparse
+	checkouts.
+
+`git sparse-checkout add SOME/DIR/ECTORY`::
+
+	Add all files under SOME/DIR/ECTORY/ (at any depth) to the
+	sparse checkout, as well as all files immediately under
+	SOME/DIR/ and immediately under SOME/.  Must already be in a
+	sparse checkout before using this command.
+
+`git sparse-checkout reapply`::
+
+	It is possible for commands to update the working tree in a
+	way that does not respect the selected sparsity directories.
+	This can come from tools external to Git writing files, or
+	even affect Git commands because of either special cases (such
+	as hitting conflicts when merging/rebasing), or because some
+	commands didn't fully support sparse checkouts (e.g. the old
+	`recursive` merge backend had only limited support).  This
+	command reapplies the existing sparse directory specifications
+	to make the working directory match.
+
+INTERNALS -- SPARSE CHECKOUT
+----------------------------
 
 "Sparse checkout" allows populating the working directory sparsely.  It
 uses the skip-worktree bit (see linkgit:git-update-index[1]) to tell Git
@@ -155,64 +190,196 @@ directory, it updates the skip-worktree bits in the index based
 on this file. The files matching the patterns in the file will
 appear in the working directory, and the rest will not.
 
-To enable the sparse-checkout feature, run `git sparse-checkout set` to
-set the patterns you want to use.
+INTERNALS -- NON-CONE PROBLEMS
+------------------------------
+
+The `$GIT_DIR/info/sparse-checkout` file populated by the `set` and
+`add` subcommands is defined to be a bunch of patterns (one per line)
+using the same syntax as `.gitignore` files.  In cone mode, these
+patterns are restricted to matching directories (and users only ever
+need supply or see directory names), while in non-cone mode any
+gitignore-style pattern is permitted.  Using the full gitignore-style
+patterns in non-cone mode has a number of shortcomings:
+
+  * Fundamentally, it makes various worktree-updating processes (pull,
+    merge, rebase, switch, reset, checkout, etc.) require O(N*M) pattern
+    matches, where N is the number of patterns and M is the number of
+    paths in the index.  This scales poorly.
+
+  * Avoiding the scaling issue has to be done via limiting the number
+    of patterns via specifying leading directory name or glob.
+
+  * Passing globs on the command line is error-prone as users may
+    forget to quote the glob, causing the shell to expand it into all
+    matching files and pass them all individually along to
+    sparse-checkout set/add.  While this could also be a problem with
+    e.g. "git grep -- *.c", mistakes with grep/log/status appear in
+    the immediate output.  With sparse-checkout, the mistake gets
+    recorded at the time the sparse-checkout command is run and might
+    not be problematic until the user later switches branches or rebases
+    or merges, thus putting a delay between the user's error and when
+    they have a chance to catch/notice it.
+
+  * Related to the previous item, sparse-checkout has an 'add'
+    subcommand but no 'remove' subcommand.  Even if a 'remove'
+    subcommand were added, undoing an accidental unquoted glob runs
+    the risk of "removing too much", as it may remove entries that had
+    been included before the accidental add.
+
+  * Non-cone mode uses gitignore-style patterns to select what to
+    *include* (with the exception of negated patterns), while
+    .gitignore files use gitignore-style patterns to select what to
+    *exclude* (with the exception of negated patterns).  The
+    documentation on gitignore-style patterns usually does not talk in
+    terms of matching or non-matching, but on what the user wants to
+    "exclude".  This can cause confusion for users trying to learn how
+    to specify sparse-checkout patterns to get their desired behavior.
+
+  * Every other git subcommand that wants to provide "special path
+    pattern matching" of some sort uses pathspecs, but non-cone mode
+    for sparse-checkout uses gitignore patterns, which feels
+    inconsistent.
+
+  * It has edge cases where the "right" behavior is unclear.  Two examples:
+
+    First, two users are in a subdirectory, and the first runs
+       git sparse-checkout set '/toplevel-dir/*.c'
+    while the second runs
+       git sparse-checkout set relative-dir
+    Should those arguments be transliterated into
+       current/subdirectory/toplevel-dir/*.c
+    and
+       current/subdirectory/relative-dir
+    before inserting into the sparse-checkout file?  The user who typed
+    the first command is probably aware that arguments to set/add are
+    supposed to be patterns in non-cone mode, and probably would not be
+    happy with such a transliteration.  However, many gitignore-style
+    patterns are just paths, which might be what the user who typed the
+    second command was thinking, and they'd be upset if their argument
+    wasn't transliterated.
+
+    Second, what should bash-completion complete on for set/add commands
+    for non-cone users?  If it suggests paths, is it exacerbating the
+    problem above?  Also, if it suggests paths, what if the user has a
+    file or directory that begins with either a '!' or '#' or has a '*',
+    '\', '?', '[', or ']' in its name?  And if it suggests paths, will
+    it complete "/pro" to "/proc" (in the root filesytem) rather than to
+    "/progress.txt" in the current directory?  (Note that users are
+    likely to want to start paths with a leading '/' in non-cone mode,
+    for the same reason that .gitignore files often have one.)
+    Completing on files or directories might give nasty surprises in
+    all these cases.
+
+  * The excessive flexibility made other extensions essentially
+    impractical.  `--sparse-index` is likely impossible in non-cone
+    mode; even if it is somehow feasible, it would have been far more
+    work to implement and may have been too slow in practice.  Some
+    ideas for adding coupling between partial clones and sparse
+    checkouts are only practical with a more restricted set of paths
+    as well.
+
+For all these reasons, non-cone mode is deprecated.  Please switch to
+using cone mode.
+
+
+INTERNALS -- CONE MODE HANDLING
+-------------------------------
+
+The "cone mode", which is the default, lets you specify only what
+directories to include.  For any directory specified, all paths below
+that directory will be included, and any paths immediately under
+leading directories (including the toplevel directory) will also be
+included.  Thus, if you specified the directory
+    Documentation/technical/
+then your sparse checkout would contain:
+
+  * all files in the toplevel-directory
+  * all files immediately under Documentation/
+  * all files at any depth under Documentation/technical/
+
+Also, in cone mode, even if no directories are specified, then the
+files in the toplevel directory will be included.
 
-To repopulate the working directory with all files, use the
-`git sparse-checkout disable` command.
+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.
 
+See also the "Internals -- Cone Pattern Set" section to learn how the
+directories are transformed under the hood into a subset of the
+Full Pattern Set of sparse-checkout.
 
-FULL PATTERN SET
-----------------
 
-By default, the sparse-checkout file uses the same syntax as `.gitignore`
-files.
+INTERNALS -- FULL PATTERN SET
+-----------------------------
 
-While `$GIT_DIR/info/sparse-checkout` is usually used to specify what
-files are included, you can also specify what files are _not_ included,
-using negative patterns. For example, to remove the file `unwanted`:
+The full pattern set allows for arbitrary pattern matches and complicated
+inclusion/exclusion rules. These can result in O(N*M) pattern matches when
+updating the index, where N is the number of patterns and M is the number
+of paths in the index. To combat this performance issue, a more restricted
+pattern set is allowed when `core.sparseCheckoutCone` is enabled.
+
+The sparse-checkout file uses the same syntax as `.gitignore` files;
+see linkgit:gitignore[5] for details.  Here, though, the patterns are
+usually being used to select which files to include rather than which
+files to exclude.  (However, it can get a bit confusing since
+gitignore-style patterns have negations defined by patterns which
+begin with a '!', so you can also select files to _not_ include.)
+
+For example, to select everything, and then to remove the file
+`unwanted` (so that every file will appear in your working tree except
+the file named `unwanted`):
+
+    git sparse-checkout set --no-cone '/*' '!unwanted'
+
+These patterns are just placed into the
+`$GIT_DIR/info/sparse-checkout` as-is, so the contents of that file
+at this point would be
 
 ----------------
 /*
 !unwanted
 ----------------
 
+See also the "Sparse Checkout" section of linkgit:git-read-tree[1] to
+learn more about the gitignore-style patterns used in sparse
+checkouts.
 
-CONE PATTERN SET
-----------------
 
-The full pattern set allows for arbitrary pattern matches and complicated
-inclusion/exclusion rules. These can result in O(N*M) pattern matches when
-updating the index, where N is the number of patterns and M is the number
-of paths in the index. To combat this performance issue, a more restricted
-pattern set is allowed when `core.sparseCheckoutCone` is enabled.
+INTERNALS -- CONE PATTERN SET
+-----------------------------
 
-The accepted patterns in the cone pattern set are:
+In cone mode, only directories are accepted, but they are translated into
+the same gitignore-style patterns used in the full pattern set.  We refer
+to the particular patterns used in those mode as being of one of two types:
 
 1. *Recursive:* All paths inside a directory are included.
 
 2. *Parent:* All files immediately inside a directory are included.
 
-In addition to the above two patterns, we also expect that all files in the
-root directory are included. If a recursive pattern is added, then all
-leading directories are added as parent patterns.
-
-By default, when running `git sparse-checkout init`, the root directory is
-added as a parent pattern. At this point, the sparse-checkout file contains
-the following patterns:
+Since cone mode always includes files at the toplevel, when running
+`git sparse-checkout set` with no directories specified, the toplevel
+directory is added as a parent pattern.  At this point, the
+sparse-checkout file contains the following patterns:
 
 ----------------
 /*
 !/*/
 ----------------
 
-This says "include everything in root, but nothing two levels below root."
+This says "include everything immediately under the toplevel
+directory, but nothing at any level below that."
 
-When in cone mode, the `git sparse-checkout set` subcommand takes a list of
-directories instead of a list of sparse-checkout patterns. In this mode,
-the command `git sparse-checkout set A/B/C` sets the directory `A/B/C` as
-a recursive pattern, the directories `A` and `A/B` are added as parent
-patterns. The resulting sparse-checkout file is now
+When in cone mode, the `git sparse-checkout set` subcommand takes a
+list of directories.  The command `git sparse-checkout set A/B/C` sets
+the directory `A/B/C` as a recursive pattern, the directories `A` and
+`A/B` are added as parent patterns. The resulting sparse-checkout file
+is now
 
 ----------------
 /*
@@ -227,14 +394,18 @@ patterns. The resulting sparse-checkout file is now
 Here, order matters, so the negative patterns are overridden by the positive
 patterns that appear lower in the file.
 
-If `core.sparseCheckoutCone=true`, then Git will parse the sparse-checkout file
-expecting patterns of these types. Git will warn if the patterns do not match.
-If the patterns do match the expected format, then Git will use faster hash-
-based algorithms to compute inclusion in the sparse-checkout.
+Unless `core.sparseCheckoutCone` is explicitly set to `false`, Git will
+parse the sparse-checkout file expecting patterns of these types. Git will
+warn if the patterns do not match.  If the patterns do match the expected
+format, then Git will use faster hash-based algorithms to compute inclusion
+in the sparse-checkout.  If they do not match, git will behave as though
+`core.sparseCheckoutCone` was false, regardless of its setting.
 
-In the cone mode case, the `git sparse-checkout list` subcommand will list the
-directories that define the recursive patterns. For the example sparse-checkout
-file above, the output is as follows:
+In the cone mode case, despite the fact that full patterns are written
+to the $GIT_DIR/info/sparse-checkout file, the `git sparse-checkout
+list` subcommand will list the directories that define the recursive
+patterns. For the example sparse-checkout file above, the output is as
+follows:
 
 --------------------------
 $ git sparse-checkout list
@@ -246,19 +417,9 @@ case-insensitive check. This corrects for case mismatched filenames in the
 '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
-----------
+INTERNALS -- SUBMODULES
+-----------------------
 
 If your repository contains one or more submodules, then submodules
 are populated based on interactions with the `git submodule` command.
diff --git a/Documentation/git.txt b/Documentation/git.txt
index 13f83a2a3a..47a6095ff4 100644
--- a/Documentation/git.txt
+++ b/Documentation/git.txt
@@ -9,7 +9,7 @@ git - the stupid content tracker
 SYNOPSIS
 --------
 [verse]
-'git' [--version] [--help] [-C <path>] [-c <name>=<value>]
+'git' [-v | --version] [-h | --help] [-C <path>] [-c <name>=<value>]
     [--exec-path[=<path>]] [--html-path] [--man-path] [--info-path]
     [-p|--paginate|-P|--no-pager] [--no-replace-objects] [--bare]
     [--git-dir=<path>] [--work-tree=<path>] [--namespace=<name>]
@@ -39,6 +39,7 @@ or https://git-scm.com/docs.
 
 OPTIONS
 -------
+-v::
 --version::
 	Prints the Git suite version that the 'git' program came from.
 +
@@ -46,6 +47,7 @@ This option is internally converted to `git version ...` and accepts
 the same options as the linkgit:git-version[1] command. If `--help` is
 also given, it takes precedence over `--version`.
 
+-h::
 --help::
 	Prints the synopsis and a list of the most commonly used
 	commands. If the option `--all` or `-a` is given then all
@@ -883,9 +885,7 @@ for full details.
 	If set to a colon-separated list of protocols, behave as if
 	`protocol.allow` is set to `never`, and each of the listed
 	protocols has `protocol.<name>.allow` set to `always`
-	(overriding any existing configuration). In other words, any
-	protocol not mentioned will be disallowed (i.e., this is a
-	whitelist, not a blacklist). See the description of
+	(overriding any existing configuration). See the description of
 	`protocol.allow` in linkgit:git-config[1] for more details.
 
 `GIT_PROTOCOL_FROM_USER`::
diff --git a/Documentation/mergetools/vimdiff.txt b/Documentation/mergetools/vimdiff.txt
new file mode 100644
index 0000000000..2d631e9b1f
--- /dev/null
+++ b/Documentation/mergetools/vimdiff.txt
@@ -0,0 +1,194 @@
+Description
+^^^^^^^^^^^
+
+When specifying `--tool=vimdiff` in `git mergetool` Git will open Vim with a 4
+windows layout distributed in the following way:
+....
+------------------------------------------
+|             |           |              |
+|   LOCAL     |   BASE    |   REMOTE     |
+|             |           |              |
+------------------------------------------
+|                                        |
+|                MERGED                  |
+|                                        |
+------------------------------------------
+....
+`LOCAL`, `BASE` and `REMOTE` are read-only buffers showing the contents of the
+conflicting file in specific commits ("commit you are merging into", "common
+ancestor commit" and "commit you are merging from" respectively)
+
+`MERGED` is a writable buffer where you have to resolve the conflicts (using the
+other read-only buffers as a reference). Once you are done, save and exit Vim as
+usual (`:wq`) or, if you want to abort, exit using `:cq`.
+
+Layout configuration
+^^^^^^^^^^^^^^^^^^^^
+
+You can change the windows layout used by Vim by setting configuration variable
+`mergetool.vimdiff.layout` which accepts a string where the following separators
+have special meaning:
+
+  - `+` is used to "open a new tab"
+  - `,` is used to "open a new vertical split"
+  - `/` is used to "open a new horizontal split"
+  - `@` is used to indicate which is the file containing the final version after
+    solving the conflicts. If not present, `MERGED` will be used by default.
+
+The precedence of the operators is this one (you can use parentheses to change
+it):
+
+    `@` > `+` > `/` > `,`
+
+Let's see some examples to understand how it works:
+
+* `layout = "(LOCAL,BASE,REMOTE)/MERGED"`
++
+--
+This is exactly the same as the default layout we have already seen.
+
+Note that `/` has precedence over `,` and thus the parenthesis are not
+needed in this case. The next layout definition is equivalent:
+
+    layout = "LOCAL,BASE,REMOTE / MERGED"
+--
+* `layout = "LOCAL,MERGED,REMOTE"`
++
+--
+If, for some reason, we are not interested in the `BASE` buffer.
+....
+------------------------------------------
+|             |           |              |
+|             |           |              |
+|   LOCAL     |   MERGED  |   REMOTE     |
+|             |           |              |
+|             |           |              |
+------------------------------------------
+....
+--
+* `layout = "MERGED"`
++
+--
+Only the `MERGED` buffer will be shown. Note, however, that all the other
+ones are still loaded in vim, and you can access them with the "buffers"
+command.
+....
+------------------------------------------
+|                                        |
+|                                        |
+|                 MERGED                 |
+|                                        |
+|                                        |
+------------------------------------------
+....
+--
+* `layout = "@LOCAL,REMOTE"`
++
+--
+When `MERGED` is not present in the layout, you must "mark" one of the
+buffers with an asterisk. That will become the buffer you need to edit and
+save after resolving the conflicts.
+....
+------------------------------------------
+|                   |                    |
+|                   |                    |
+|                   |                    |
+|     LOCAL         |    REMOTE          |
+|                   |                    |
+|                   |                    |
+|                   |                    |
+------------------------------------------
+....
+--
+* `layout = "LOCAL,BASE,REMOTE / MERGED + BASE,LOCAL + BASE,REMOTE"`
++
+--
+Three tabs will open: the first one is a copy of the default layout, while
+the other two only show the differences between (`BASE` and `LOCAL`) and
+(`BASE` and `REMOTE`) respectively.
+....
+------------------------------------------
+| <TAB #1> |  TAB #2  |  TAB #3  |       |
+------------------------------------------
+|             |           |              |
+|   LOCAL     |   BASE    |   REMOTE     |
+|             |           |              |
+------------------------------------------
+|                                        |
+|                MERGED                  |
+|                                        |
+------------------------------------------
+....
+....
+------------------------------------------
+|  TAB #1  | <TAB #2> |  TAB #3  |       |
+------------------------------------------
+|                   |                    |
+|                   |                    |
+|                   |                    |
+|     BASE          |    LOCAL           |
+|                   |                    |
+|                   |                    |
+|                   |                    |
+------------------------------------------
+....
+....
+------------------------------------------
+|  TAB #1  |  TAB #2  | <TAB #3> |       |
+------------------------------------------
+|                   |                    |
+|                   |                    |
+|                   |                    |
+|     BASE          |    REMOTE          |
+|                   |                    |
+|                   |                    |
+|                   |                    |
+------------------------------------------
+....
+--
+* `layout = "LOCAL,BASE,REMOTE / MERGED + BASE,LOCAL + BASE,REMOTE + (LOCAL/BASE/REMOTE),MERGED"`
++
+--
+Same as the previous example, but adds a fourth tab with the same
+information as the first tab, with a different layout.
+....
+---------------------------------------------
+|  TAB #1  |  TAB #2  |  TAB #3  | <TAB #4> |
+---------------------------------------------
+|       LOCAL         |                     |
+|---------------------|                     |
+|       BASE          |        MERGED       |
+|---------------------|                     |
+|       REMOTE        |                     |
+---------------------------------------------
+....
+Note how in the third tab definition we need to use parenthesis to make `,`
+have precedence over `/`.
+--
+
+Variants
+^^^^^^^^
+
+Instead of `--tool=vimdiff`, you can also use one of these other variants:
+
+  * `--tool=gvimdiff`, to open gVim instead of Vim.
+
+  * `--tool=nvimdiff`, to open Neovim instead of Vim.
+
+When using these variants, in order to specify a custom layout you will have to
+set configuration variables `mergetool.gvimdiff.layout` and
+`mergetool.nvimdiff.layout` instead of `mergetool.vimdiff.layout`
+
+In addition, for backwards compatibility with previous Git versions, you can
+also append `1`, `2` or `3` to either `vimdiff` or any of the variants (ex:
+`vimdiff3`, `nvimdiff1`, etc...) to use a predefined layout.
+In other words, using `--tool=[g,n,]vimdiffx` is the same as using
+`--tool=[g,n,]vimdiff` and setting configuration variable
+`mergetool.[g,n,]vimdiff.layout` to...
+
+  * `x=1`: `"@LOCAL, REMOTE"`
+  * `x=2`: `"LOCAL, MERGED, REMOTE"`
+  * `x=3`: `"MERGED"`
+
+Example: using `--tool=gvimdiff2` will open `gvim` with three columns (LOCAL,
+MERGED and REMOTE).
diff --git a/Documentation/rev-list-options.txt b/Documentation/rev-list-options.txt
index fd4f4e26c9..195e74eec6 100644
--- a/Documentation/rev-list-options.txt
+++ b/Documentation/rev-list-options.txt
@@ -25,6 +25,11 @@ ordering and formatting options, such as `--reverse`.
 --after=<date>::
 	Show commits more recent than a specific date.
 
+--since-as-filter=<date>::
+	Show all commits more recent than a specific date. This visits
+	all commits in the range, rather than stopping at the first commit which
+	is older than a specific date.
+
 --until=<date>::
 --before=<date>::
 	Show commits older than a specific date.
diff --git a/Documentation/revisions.txt b/Documentation/revisions.txt
index f5f17b65a1..e3e350126d 100644
--- a/Documentation/revisions.txt
+++ b/Documentation/revisions.txt
@@ -96,19 +96,16 @@ some output processing may assume ref names in UTF-8.
   before the current one.
 
 '[<branchname>]@\{upstream\}', e.g. 'master@\{upstream\}', '@\{u\}'::
-  The suffix '@\{upstream\}' to a branchname (short form '<branchname>@\{u\}')
-  refers to the branch that the branch specified by branchname is set to build on
-  top of (configured with `branch.<name>.remote` and
-  `branch.<name>.merge`).  A missing branchname defaults to the
-  current one. These suffixes are also accepted when spelled in uppercase, and
-  they mean the same thing no matter the case.
+  A branch B may be set up to build on top of a branch X (configured with
+  `branch.<name>.merge`) at a remote R (configured with
+  `branch.<name>.remote`). B@{u} refers to the remote-tracking branch for
+  the branch X taken from remote R, typically found at `refs/remotes/R/X`.
 
 '[<branchname>]@\{push\}', e.g. 'master@\{push\}', '@\{push\}'::
   The suffix '@\{push}' reports the branch "where we would push to" if
   `git push` were run while `branchname` was checked out (or the current
-  `HEAD` if no branchname is specified). Since our push destination is
-  in a remote repository, of course, we report the local tracking branch
-  that corresponds to that branch (i.e., something in `refs/remotes/`).
+  `HEAD` if no branchname is specified). Like for '@\{upstream\}', we report
+  the remote-tracking branch that corresponds to that branch at the remote.
 +
 Here's an example to make it more clear:
 +
@@ -283,7 +280,7 @@ The '..' (two-dot) Range Notation::
  for commits that are reachable from r2 excluding those that are reachable
  from r1 by '{caret}r1 r2' and it can be written as 'r1..r2'.
 
-The '...' (three-dot) Symmetric Difference Notation::
+The '\...' (three-dot) Symmetric Difference Notation::
  A similar notation 'r1\...r2' is called symmetric difference
  of 'r1' and 'r2' and is defined as
  'r1 r2 --not $(git merge-base --all r1 r2)'.
diff --git a/Documentation/technical/api-error-handling.txt b/Documentation/technical/api-error-handling.txt
index 8be4f4d0d6..70bf1d3e52 100644
--- a/Documentation/technical/api-error-handling.txt
+++ b/Documentation/technical/api-error-handling.txt
@@ -1,12 +1,34 @@
 Error reporting in git
 ======================
 
-`BUG`, `die`, `usage`, `error`, and `warning` report errors of
+`BUG`, `bug`, `die`, `usage`, `error`, and `warning` report errors of
 various kinds.
 
 - `BUG` is for failed internal assertions that should never happen,
   i.e. a bug in git itself.
 
+- `bug` (lower-case, not `BUG`) is supposed to be used like `BUG` but
+  prints a "BUG" message instead of calling `abort()`.
++
+A call to `bug()` will then result in a "real" call to the `BUG()`
+function, either explicitly by invoking `BUG_if_bug()` after call(s)
+to `bug()`, or implicitly at `exit()` time where we'll check if we
+encountered any outstanding `bug()` invocations.
++
+If there were no prior calls to `bug()` before invoking `BUG_if_bug()`
+the latter is a NOOP. The `BUG_if_bug()` function takes the same
+arguments as `BUG()` itself. Calling `BUG_if_bug()` explicitly isn't
+necessary, but ensures that we die as soon as possible.
++
+If you know you had prior calls to `bug()` then calling `BUG()` itself
+is equivalent to calling `BUG_if_bug()`, the latter being a wrapper
+calling `BUG()` if we've set a flag indicating that we've called
+`bug()`.
++
+This is for the convenience of APIs who'd like to potentially report
+more than one "bug", such as the optbug() validation in
+parse-options.c.
+
 - `die` is for fatal application errors.  It prints a message to
   the user and exits with status 128.
 
diff --git a/Documentation/technical/api-trace2.txt b/Documentation/technical/api-trace2.txt
index bb13ca3db8..77a150b30e 100644
--- a/Documentation/technical/api-trace2.txt
+++ b/Documentation/technical/api-trace2.txt
@@ -5,7 +5,7 @@ information to stderr or a file.  The Trace2 feature is inactive unless
 explicitly enabled by enabling one or more Trace2 Targets.
 
 The Trace2 API is intended to replace the existing (Trace1)
-printf-style tracing provided by the existing `GIT_TRACE` and
+`printf()`-style tracing provided by the existing `GIT_TRACE` and
 `GIT_TRACE_PERFORMANCE` facilities.  During initial implementation,
 Trace2 and Trace1 may operate in parallel.
 
@@ -24,8 +24,8 @@ for example.
 
 Trace2 is controlled using `trace2.*` config values in the system and
 global config files and `GIT_TRACE2*` environment variables.  Trace2 does
-not read from repo local or worktree config files or respect `-c`
-command line config settings.
+not read from repo local or worktree config files, nor does it respect
+`-c` command line config settings.
 
 == Trace2 Targets
 
@@ -34,8 +34,8 @@ Format details are given in a later section.
 
 === The Normal Format Target
 
-The normal format target is a tradition printf format and similar
-to GIT_TRACE format.  This format is enabled with the `GIT_TRACE2`
+The normal format target is a traditional `printf()` format and similar
+to the `GIT_TRACE` format.  This format is enabled with the `GIT_TRACE2`
 environment variable or the `trace2.normalTarget` system or global
 config setting.
 
@@ -69,8 +69,8 @@ $ cat ~/log.normal
 === The Performance Format Target
 
 The performance format target (PERF) is a column-based format to
-replace GIT_TRACE_PERFORMANCE and is suitable for development and
-testing, possibly to complement tools like gprof.  This format is
+replace `GIT_TRACE_PERFORMANCE` and is suitable for development and
+testing, possibly to complement tools like `gprof`.  This format is
 enabled with the `GIT_TRACE2_PERF` environment variable or the
 `trace2.perfTarget` system or global config setting.
 
@@ -128,7 +128,7 @@ yields
 
 ------------
 $ 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":"3","exe":"2.20.1.155.g426c96fcdb"}
+{"event":"version","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}
@@ -170,9 +170,9 @@ Some functions have a `_va_fl()` suffix to indicate that they also
 take a `va_list` argument.
 
 Some functions have a `_printf_fl()` suffix to indicate that they also
-take a varargs argument.
+take a `printf()` style format with a variable number of arguments.
 
-There are CPP wrapper macros and ifdefs to hide most of these details.
+There are CPP wrapper macros and `#ifdef`s to hide most of these details.
 See `trace2.h` for more details.  The following discussion will only
 describe the simplified forms.
 
@@ -234,7 +234,7 @@ Events are written as lines of the form:
 	is the event name.
 
 `<event-message>`::
-	is a free-form printf message intended for human consumption.
+	is a free-form `printf()` message intended for human consumption.
 +
 Note that this may contain embedded LF or CRLF characters that are
 not escaped, so the event may spill across multiple lines.
@@ -300,7 +300,7 @@ This field is in anticipation of in-proc submodules in the future.
 	indicate a broad category, such as "index" or "status".
 
 `<perf-event-message>`::
-	is a free-form printf message intended for human consumption.
+	is a free-form `printf()` message intended for human consumption.
 
 ------------
 15:33:33.532712 wt-status.c:2310                  | d0 | main                     | region_enter | r1  |  0.126064 |           | status     | label:print
@@ -465,8 +465,8 @@ completed.)
 ------------
 
 `"error"`::
-	This event is emitted when one of the `BUG()`, `error()`, `die()`,
-	`warning()`, or `usage()` functions are called.
+	This event is emitted when one of the `BUG()`, `bug()`, `error()`,
+	`die()`, `warning()`, or `usage()` functions are called.
 +
 ------------
 {
@@ -533,7 +533,7 @@ these special values are used:
 ------------
 
 `"cmd_mode"`::
-	This event, when present, describes the command variant This
+	This event, when present, describes the command variant. This
 	event may be emitted more than once.
 +
 ------------
@@ -588,7 +588,7 @@ with "?".
 
 `"child_exit"`::
 	This event is generated after the current process has returned
-	from the waitpid() and collected the exit information from the
+	from the `waitpid()` and collected the exit information from the
 	child.
 +
 ------------
@@ -609,7 +609,7 @@ process may be a shell script which doesn't have a session-id.)
 +
 Note that the `t_rel` field contains the observed run time in seconds
 for the child process (starting before the fork/exec/spawn and
-stopping after the waitpid() and includes OS process creation overhead).
+stopping after the `waitpid()` and includes OS process creation overhead).
 So this time will be slightly larger than the atexit time reported by
 the child process itself.
 
@@ -635,7 +635,7 @@ 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"
+starts up normally 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".
@@ -949,7 +949,7 @@ atexit elapsed:3.868970 code:0
 
 Regions::
 
-	Regions can be use to time an interesting section of code.
+	Regions can be used to time an interesting section of code.
 +
 ----------------
 void wt_status_collect(struct wt_status *s)
@@ -1103,9 +1103,9 @@ Thread Events::
 
 	Thread messages added to a thread-proc.
 +
-For example, the multithreaded preload-index code can be
+For example, the multi-threaded preload-index code can be
 instrumented with a region around the thread pool and then
-per-thread start and exit events within the threadproc.
+per-thread start and exit events within the thread-proc.
 +
 ----------------
 static void *preload_thread(void *_data)
@@ -1214,11 +1214,11 @@ as each thread starts and allocates TLS storage.
 There are a few issues to resolve before we can completely
 switch to Trace2.
 
-* Updating existing tests that assume GIT_TRACE format messages.
+* Updating existing tests that assume `GIT_TRACE` format messages.
 
-* How to best handle custom GIT_TRACE_<key> messages?
+* How to best handle custom `GIT_TRACE_<key>` messages?
 
-** The GIT_TRACE_<key> mechanism allows each <key> to write to a
+** The `GIT_TRACE_<key>` mechanism allows each <key> to write to a
 different file (in addition to just stderr).
 
 ** Do we want to maintain that ability or simply write to the existing
diff --git a/Documentation/technical/bitmap-format.txt b/Documentation/technical/bitmap-format.txt
index 04b3ec2178..a85f58f515 100644
--- a/Documentation/technical/bitmap-format.txt
+++ b/Documentation/technical/bitmap-format.txt
@@ -25,9 +25,9 @@ An object is uniquely described by its bit position within a bitmap:
 	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 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
@@ -39,97 +39,108 @@ 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'}
-
-		2-byte version number (network byte order)
-			The current implementation only supports version 1
-			of the bitmap index (the same one as JGit).
-
-		2-byte flags (network byte order)
-
-			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 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/MIDX. The format and meaning of the name-hash is
-			described below.
-
-		4-byte entry count (network byte order)
-
-			The total count of entries (bitmapped commits) in this bitmap index.
-
-		20-byte checksum
-
-			The SHA1 checksum of the pack/MIDX this bitmap index
-			belongs to.
-
-	- 4 EWAH bitmaps that act as type indexes
-
-		Type indexes are serialized after the hash cache in the shape
-		of four EWAH bitmaps stored consecutively (see Appendix A for
-		the serialization format of an EWAH bitmap).
-
-		There is a bitmap for each Git object type, stored in the following
-		order:
-
-			- Commits
-			- Trees
-			- Blobs
-			- Tags
-
-		In each bitmap, the `n`th bit is set to true if the `n`th object
-		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
-		result in an empty bitmap (no bits set).
-
-	- N entries with compressed bitmaps, one for each indexed commit
-
-		Where `N` is the total amount of entries in this bitmap index.
-		Each entry contains the following:
-
-		- 4-byte object position (network byte order)
-			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
-			in position `x`, a XOR offset of `y` means that the actual
-			bitmap representing this commit is composed by XORing the
-			bitmap for this entry with the bitmap in entry `x-y` (i.e.
-			the bitmap `y` entries before this one).
-
-			Note that this compression can be recursive. In order to
-			XOR this entry with a previous one, the previous entry needs
-			to be decompressed first, and so on.
-
-			The hard-limit for this offset is 160 (an entry can only be
-			xor'ed against one of the 160 entries preceding it). This
-			number is always positive, and hence entries are always xor'ed
-			with **previous** bitmaps, not bitmaps that will come afterwards
-			in the index.
-
-		- 1-byte flags for this bitmap
-			At the moment the only available flag is `0x1`, which hints
-			that this bitmap can be re-used when rebuilding bitmap indexes
-			for the repository.
-
-		- The compressed bitmap itself, see Appendix A.
+    * A header appears at the beginning:
+
+	4-byte signature: :: {'B', 'I', 'T', 'M'}
+
+	2-byte version number (network byte order): ::
+
+	    The current implementation only supports version 1
+	    of the bitmap index (the same one as JGit).
+
+	2-byte flags (network byte order): ::
+
+	    The following flags are supported:
+
+	    ** {empty}
+	    BITMAP_OPT_FULL_DAG (0x1) REQUIRED: :::
+
+	    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.
+
+	    ** {empty}
+	    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/MIDX. The format and meaning of the name-hash is
+	    described below.
+
+	4-byte entry count (network byte order): ::
+	    The total count of entries (bitmapped commits) in this bitmap index.
+
+	20-byte checksum: ::
+	    The SHA1 checksum of the pack/MIDX this bitmap index
+	    belongs to.
+
+    * 4 EWAH bitmaps that act as type indexes
++
+Type indexes are serialized after the hash cache in the shape
+of four EWAH bitmaps stored consecutively (see Appendix A for
+the serialization format of an EWAH bitmap).
++
+There is a bitmap for each Git object type, stored in the following
+order:
++
+    - Commits
+    - Trees
+    - Blobs
+    - Tags
+
++
+In each bitmap, the `n`th bit is set to true if the `n`th object
+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
+result in an empty bitmap (no bits set).
+
+    * N entries with compressed bitmaps, one for each indexed commit
++
+Where `N` is the total amount of entries in this bitmap index.
+Each entry contains the following:
+
+	** {empty}
+	4-byte object position (network byte order): ::
+	    The position **in the index for the packfile or
+	    multi-pack index** where the bitmap for this commit is
+	    found.
+
+	** {empty}
+	1-byte XOR-offset: ::
+	    The xor offset used to compress this bitmap. For an entry
+	    in position `x`, a XOR offset of `y` means that the actual
+	    bitmap representing this commit is composed by XORing the
+	    bitmap for this entry with the bitmap in entry `x-y` (i.e.
+	    the bitmap `y` entries before this one).
++
+NOTE: This compression can be recursive. In order to
+XOR this entry with a previous one, the previous entry needs
+to be decompressed first, and so on.
++
+The hard-limit for this offset is 160 (an entry can only be
+xor'ed against one of the 160 entries preceding it). This
+number is always positive, and hence entries are always xor'ed
+with **previous** bitmaps, not bitmaps that will come afterwards
+in the index.
+
+	** {empty}
+	1-byte flags for this bitmap: ::
+	    At the moment the only available flag is `0x1`, which hints
+	    that this bitmap can be re-used when rebuilding bitmap indexes
+	    for the repository.
+
+	** The compressed bitmap itself, see Appendix A.
+
+	* {empty}
+	TRAILER: ::
+		Trailing checksum of the preceding contents.
 
 == Appendix A: Serialization format for an EWAH bitmap
 
@@ -142,8 +153,8 @@ implementation:
 	- 4-byte number of words of the COMPRESSED bitmap, when stored
 
 	- N x 8-byte words, as specified by the previous field
-
-		This is the actual content of the compressed bitmap.
++
+This is the actual content of the compressed bitmap.
 
 	- 4-byte position of the current RLW for the compressed
 		bitmap
diff --git a/Documentation/technical/cruft-packs.txt b/Documentation/technical/cruft-packs.txt
new file mode 100644
index 0000000000..d81f3a8982
--- /dev/null
+++ b/Documentation/technical/cruft-packs.txt
@@ -0,0 +1,123 @@
+= Cruft packs
+
+The cruft packs feature offer an alternative to Git's traditional mechanism of
+removing unreachable objects. This document provides an overview of Git's
+pruning mechanism, and how a cruft pack can be used instead to accomplish the
+same.
+
+== Background
+
+To remove unreachable objects from your repository, Git offers `git repack -Ad`
+(see linkgit:git-repack[1]). Quoting from the documentation:
+
+[quote]
+[...] unreachable objects in a previous pack become loose, unpacked objects,
+instead of being left in the old pack. [...] loose unreachable objects will be
+pruned according to normal expiry rules with the next 'git gc' invocation.
+
+Unreachable objects aren't removed immediately, since doing so could race with
+an incoming push which may reference an object which is about to be deleted.
+Instead, those unreachable objects are stored as loose objects and stay that way
+until they are older than the expiration window, at which point they are removed
+by linkgit:git-prune[1].
+
+Git must store these unreachable objects loose in order to keep track of their
+per-object mtimes. If these unreachable objects were written into one big pack,
+then either freshening that pack (because an object contained within it was
+re-written) or creating a new pack of unreachable objects would cause the pack's
+mtime to get updated, and the objects within it would never leave the expiration
+window. Instead, objects are stored loose in order to keep track of the
+individual object mtimes and avoid a situation where all cruft objects are
+freshened at once.
+
+This can lead to undesirable situations when a repository contains many
+unreachable objects which have not yet left the grace period. Having large
+directories in the shards of `.git/objects` can lead to decreased performance in
+the repository. But given enough unreachable objects, this can lead to inode
+starvation and degrade the performance of the whole system. Since we
+can never pack those objects, these repositories often take up a large amount of
+disk space, since we can only zlib compress them, but not store them in delta
+chains.
+
+== Cruft packs
+
+A cruft pack eliminates the need for storing unreachable objects in a loose
+state by including the per-object mtimes in a separate file alongside a single
+pack containing all loose objects.
+
+A cruft pack is written by `git repack --cruft` when generating a new pack.
+linkgit:git-pack-objects[1]'s `--cruft` option. Note that `git repack --cruft`
+is a classic all-into-one repack, meaning that everything in the resulting pack is
+reachable, and everything else is unreachable. Once written, the `--cruft`
+option instructs `git repack` to generate another pack containing only objects
+not packed in the previous step (which equates to packing all unreachable
+objects together). This progresses as follows:
+
+  1. Enumerate every object, marking any object which is (a) not contained in a
+     kept-pack, and (b) whose mtime is within the grace period as a traversal
+     tip.
+
+  2. Perform a reachability traversal based on the tips gathered in the previous
+     step, adding every object along the way to the pack.
+
+  3. Write the pack out, along with a `.mtimes` file that records the per-object
+     timestamps.
+
+This mode is invoked internally by linkgit:git-repack[1] when instructed to
+write a cruft pack. Crucially, the set of in-core kept packs is exactly the set
+of packs which will not be deleted by the repack; in other words, they contain
+all of the repository's reachable objects.
+
+When a repository already has a cruft pack, `git repack --cruft` typically only
+adds objects to it. An exception to this is when `git repack` is given the
+`--cruft-expiration` option, which allows the generated cruft pack to omit
+expired objects instead of waiting for linkgit:git-gc[1] to expire those objects
+later on.
+
+It is linkgit:git-gc[1] that is typically responsible for removing expired
+unreachable objects.
+
+== Caution for mixed-version environments
+
+Repositories that have cruft packs in them will continue to work with any older
+version of Git. Note, however, that previous versions of Git which do not
+understand the `.mtimes` file will use the cruft pack's mtime as the mtime for
+all of the objects in it. In other words, do not expect older (pre-cruft pack)
+versions of Git to interpret or even read the contents of the `.mtimes` file.
+
+Note that having mixed versions of Git GC-ing the same repository can lead to
+unreachable objects never being completely pruned. This can happen under the
+following circumstances:
+
+  - An older version of Git running GC explodes the contents of an existing
+    cruft pack loose, using the cruft pack's mtime.
+  - A newer version running GC collects those loose objects into a cruft pack,
+    where the .mtime file reflects the loose object's actual mtimes, but the
+    cruft pack mtime is "now".
+
+Repeating this process will lead to unreachable objects not getting pruned as a
+result of repeatedly resetting the objects' mtimes to the present time.
+
+If you are GC-ing repositories in a mixed version environment, consider omitting
+the `--cruft` option when using linkgit:git-repack[1] and linkgit:git-gc[1], and
+leaving the `gc.cruftPacks` configuration unset until all writers understand
+cruft packs.
+
+== Alternatives
+
+Notable alternatives to this design include:
+
+  - The location of the per-object mtime data, and
+  - Storing unreachable objects in multiple cruft packs.
+
+On the location of mtime data, a new auxiliary file tied to the pack was chosen
+to avoid complicating the `.idx` format. If the `.idx` format were ever to gain
+support for optional chunks of data, it may make sense to consolidate the
+`.mtimes` format into the `.idx` itself.
+
+Storing unreachable objects among multiple cruft packs (e.g., creating a new
+cruft pack during each repacking operation including only unreachable objects
+which aren't already stored in an earlier cruft pack) is significantly more
+complicated to construct, and so aren't pursued here. The obvious drawback to
+the current implementation is that the entire cruft pack must be re-written from
+scratch.
diff --git a/Documentation/technical/index-format.txt b/Documentation/technical/index-format.txt
index 65da0daaa5..f691c20ab0 100644
--- a/Documentation/technical/index-format.txt
+++ b/Documentation/technical/index-format.txt
@@ -26,8 +26,6 @@ Git index format
      Extensions are identified by signature. Optional extensions can
      be ignored if Git does not understand them.
 
-     Git currently supports cache tree and resolve undo extensions.
-
      4-byte extension signature. If the first byte is 'A'..'Z' the
      extension is optional and can be ignored.
 
diff --git a/Documentation/technical/pack-format.txt b/Documentation/technical/pack-format.txt
index 6d3efb7d16..b520aa9c45 100644
--- a/Documentation/technical/pack-format.txt
+++ b/Documentation/technical/pack-format.txt
@@ -294,6 +294,25 @@ Pack file entry: <+
 
 All 4-byte numbers are in network order.
 
+== pack-*.mtimes files have the format:
+
+All 4-byte numbers are in network byte order.
+
+  - A 4-byte magic number '0x4d544d45' ('MTME').
+
+  - A 4-byte version identifier (= 1).
+
+  - A 4-byte hash function identifier (= 1 for SHA-1, 2 for SHA-256).
+
+  - A table of 4-byte unsigned integers. The ith value is the
+    modification time (mtime) of the ith object in the corresponding
+    pack by lexicographic (index) order. The mtimes count standard
+    epoch seconds.
+
+  - A trailer, containing a checksum of the corresponding packfile,
+    and a checksum of all of the above (each having length according
+    to the specified hash function).
+
 == multi-pack-index (MIDX) files have the following format:
 
 The multi-pack-index files refer to multiple pack-files and loose objects.
diff --git a/GIT-VERSION-GEN b/GIT-VERSION-GEN
index 6f52323b5e..2b855b6cb7 100755
--- a/GIT-VERSION-GEN
+++ b/GIT-VERSION-GEN
@@ -1,7 +1,7 @@
 #!/bin/sh
 
 GVF=GIT-VERSION-FILE
-DEF_VER=v2.36.4
+DEF_VER=v2.37.4
 
 LF='
 '
diff --git a/Makefile b/Makefile
index 61aadf3ce8..17fdb16dd8 100644
--- a/Makefile
+++ b/Makefile
@@ -477,8 +477,14 @@ include shared.mak
 #
 # If your platform supports a built-in fsmonitor backend, set
 # FSMONITOR_DAEMON_BACKEND to the "<name>" of the corresponding
-# `compat/fsmonitor/fsm-listen-<name>.c` that implements the
-# `fsm_listen__*()` routines.
+# `compat/fsmonitor/fsm-listen-<name>.c` and
+# `compat/fsmonitor/fsm-health-<name>.c` files
+# that implement the `fsm_listen__*()` and `fsm_health__*()` routines.
+#
+# If your platform has OS-specific ways to tell if a repo is incompatible with
+# fsmonitor (whether the hook or IPC daemon version), set FSMONITOR_OS_SETTINGS
+# to the "<name>" of the corresponding `compat/fsmonitor/fsm-settings-<name>.c`
+# that implements the `fsm_os_settings__*()` routines.
 #
 # Define DEVELOPER to enable more compiler warnings. Compiler version
 # and family are auto detected, but could be overridden by defining
@@ -569,7 +575,9 @@ INSTALL = install
 TCL_PATH = tclsh
 TCLTK_PATH = wish
 XGETTEXT = xgettext
+MSGCAT = msgcat
 MSGFMT = msgfmt
+MSGMERGE = msgmerge
 CURL_CONFIG = curl-config
 GCOV = gcov
 STRIP = strip
@@ -728,6 +736,7 @@ TEST_BUILTINS_OBJS += test-getcwd.o
 TEST_BUILTINS_OBJS += test-hash-speed.o
 TEST_BUILTINS_OBJS += test-hash.o
 TEST_BUILTINS_OBJS += test-hashmap.o
+TEST_BUILTINS_OBJS += test-hexdump.o
 TEST_BUILTINS_OBJS += test-index-version.o
 TEST_BUILTINS_OBJS += test-json-writer.o
 TEST_BUILTINS_OBJS += test-lazy-init-name-hash.o
@@ -738,6 +747,7 @@ TEST_BUILTINS_OBJS += test-oid-array.o
 TEST_BUILTINS_OBJS += test-oidmap.o
 TEST_BUILTINS_OBJS += test-oidtree.o
 TEST_BUILTINS_OBJS += test-online-cpus.o
+TEST_BUILTINS_OBJS += test-pack-mtimes.o
 TEST_BUILTINS_OBJS += test-parse-options.o
 TEST_BUILTINS_OBJS += test-parse-pathspec-file.o
 TEST_BUILTINS_OBJS += test-partial-clone.o
@@ -844,7 +854,7 @@ generated-hdrs: $(GENERATED_H)
 ## Exhaustive lists of our source files, either dynamically generated,
 ## or hardcoded.
 SOURCES_CMD = ( \
-	git ls-files \
+	git ls-files --deduplicate \
 		'*.[hcS]' \
 		'*.sh' \
 		':!*[tp][0-9][0-9][0-9][0-9]*' \
@@ -855,12 +865,13 @@ SOURCES_CMD = ( \
 		-o \( -name '[tp][0-9][0-9][0-9][0-9]*' -prune \) \
 		-o \( -name contrib -type d -prune \) \
 		-o \( -name build -type d -prune \) \
+		-o \( -name .build -type d -prune \) \
 		-o \( -name 'trash*' -type d -prune \) \
 		-o \( -name '*.[hcS]' -type f -print \) \
 		-o \( -name '*.sh' -type f -print \) \
 		| sed -e 's|^\./||' \
 	)
-FOUND_SOURCE_FILES := $(shell $(SOURCES_CMD))
+FOUND_SOURCE_FILES := $(filter-out $(GENERATED_H),$(shell $(SOURCES_CMD)))
 
 FOUND_C_SOURCES = $(filter %.c,$(FOUND_SOURCE_FILES))
 FOUND_H_SOURCES = $(filter %.h,$(FOUND_SOURCE_FILES))
@@ -899,6 +910,7 @@ LIB_OBJS += combine-diff.o
 LIB_OBJS += commit-graph.o
 LIB_OBJS += commit-reach.o
 LIB_OBJS += commit.o
+LIB_OBJS += compat/nonblock.o
 LIB_OBJS += compat/obstack.o
 LIB_OBJS += compat/terminal.o
 LIB_OBJS += compat/zlib-uncompress2.o
@@ -993,6 +1005,7 @@ LIB_OBJS += oidtree.o
 LIB_OBJS += pack-bitmap-write.o
 LIB_OBJS += pack-bitmap.o
 LIB_OBJS += pack-check.o
+LIB_OBJS += pack-mtimes.o
 LIB_OBJS += pack-objects.o
 LIB_OBJS += pack-revindex.o
 LIB_OBJS += pack-write.o
@@ -2007,6 +2020,12 @@ endif
 ifdef FSMONITOR_DAEMON_BACKEND
 	COMPAT_CFLAGS += -DHAVE_FSMONITOR_DAEMON_BACKEND
 	COMPAT_OBJS += compat/fsmonitor/fsm-listen-$(FSMONITOR_DAEMON_BACKEND).o
+	COMPAT_OBJS += compat/fsmonitor/fsm-health-$(FSMONITOR_DAEMON_BACKEND).o
+endif
+
+ifdef FSMONITOR_OS_SETTINGS
+	COMPAT_CFLAGS += -DHAVE_FSMONITOR_OS_SETTINGS
+	COMPAT_OBJS += compat/fsmonitor/fsm-settings-$(FSMONITOR_OS_SETTINGS).o
 endif
 
 ifeq ($(TCLTK_PATH),)
@@ -2708,17 +2727,18 @@ XGETTEXT_FLAGS = \
 	--force-po \
 	--add-comments=TRANSLATORS: \
 	--msgid-bugs-address="Git Mailing List <git@vger.kernel.org>" \
-	--from-code=UTF-8
+	--package-name=Git
 XGETTEXT_FLAGS_C = $(XGETTEXT_FLAGS) --language=C \
 	--keyword=_ --keyword=N_ --keyword="Q_:1,2"
 XGETTEXT_FLAGS_SH = $(XGETTEXT_FLAGS) --language=Shell \
 	--keyword=gettextln --keyword=eval_gettextln
 XGETTEXT_FLAGS_PERL = $(XGETTEXT_FLAGS) --language=Perl \
 	--keyword=__ --keyword=N__ --keyword="__n:1,2"
-LOCALIZED_C = $(C_OBJ:o=c) $(LIB_H) $(GENERATED_H)
-LOCALIZED_SH = $(SCRIPT_SH)
-LOCALIZED_SH += git-sh-setup.sh
-LOCALIZED_PERL = $(SCRIPT_PERL)
+MSGMERGE_FLAGS = --add-location --backup=off --update
+LOCALIZED_C = $(sort $(FOUND_C_SOURCES) $(FOUND_H_SOURCES) $(SCALAR_SOURCES) \
+	        $(GENERATED_H))
+LOCALIZED_SH = $(sort $(SCRIPT_SH) git-sh-setup.sh)
+LOCALIZED_PERL = $(sort $(SCRIPT_PERL))
 
 ifdef XGETTEXT_INCLUDE_TESTS
 LOCALIZED_C += t/t0200/test.c
@@ -2726,38 +2746,129 @@ LOCALIZED_SH += t/t0200/test.sh
 LOCALIZED_PERL += t/t0200/test.perl
 endif
 
-## Note that this is meant to be run only by the localization coordinator
-## under a very controlled condition, i.e. (1) it is to be run in a
-## Git repository (not a tarball extract), (2) any local modifications
-## will be lost.
+## We generate intermediate .build/pot/po/%.po files containing a
+## extract of the translations we find in each file in the source
+## tree. We will assemble them using msgcat to create the final
+## "po/git.pot" file.
+LOCALIZED_ALL_GEN_PO =
+
+LOCALIZED_C_GEN_PO = $(LOCALIZED_C:%=.build/pot/po/%.po)
+LOCALIZED_ALL_GEN_PO += $(LOCALIZED_C_GEN_PO)
+
+LOCALIZED_SH_GEN_PO = $(LOCALIZED_SH:%=.build/pot/po/%.po)
+LOCALIZED_ALL_GEN_PO += $(LOCALIZED_SH_GEN_PO)
+
+LOCALIZED_PERL_GEN_PO = $(LOCALIZED_PERL:%=.build/pot/po/%.po)
+LOCALIZED_ALL_GEN_PO += $(LOCALIZED_PERL_GEN_PO)
+
 ## Gettext tools cannot work with our own custom PRItime type, so
 ## we replace PRItime with PRIuMAX.  We need to update this to
 ## PRIdMAX if we switch to a signed type later.
+$(LOCALIZED_C_GEN_PO): .build/pot/po/%.po: %
+	$(call mkdir_p_parent_template)
+	$(QUIET_XGETTEXT) \
+	    if grep -q PRItime $<; then \
+		(\
+			sed -e 's|PRItime|PRIuMAX|g' <$< \
+				>.build/pot/po/$< && \
+			cd .build/pot/po && \
+			$(XGETTEXT) --omit-header \
+				-o $(@:.build/pot/po/%=%) \
+				$(XGETTEXT_FLAGS_C) $< && \
+			rm $<; \
+		); \
+	    else \
+		$(XGETTEXT) --omit-header \
+			-o $@ $(XGETTEXT_FLAGS_C) $<; \
+	    fi
 
-po/git.pot: $(GENERATED_H) FORCE
-	# All modifications will be reverted at the end, so we do not
-	# want to have any local change.
-	git diff --quiet HEAD && git diff --quiet --cached
+$(LOCALIZED_SH_GEN_PO): .build/pot/po/%.po: %
+	$(call mkdir_p_parent_template)
+	$(QUIET_XGETTEXT)$(XGETTEXT) --omit-header \
+		-o$@ $(XGETTEXT_FLAGS_SH) $<
 
-	@for s in $(LOCALIZED_C) $(LOCALIZED_SH) $(LOCALIZED_PERL); \
-	do \
-		sed -e 's|PRItime|PRIuMAX|g' <"$$s" >"$$s+" && \
-		cat "$$s+" >"$$s" && rm "$$s+"; \
-	done
+$(LOCALIZED_PERL_GEN_PO): .build/pot/po/%.po: %
+	$(call mkdir_p_parent_template)
+	$(QUIET_XGETTEXT)$(XGETTEXT) --omit-header \
+		-o$@ $(XGETTEXT_FLAGS_PERL) $<
+
+define gen_pot_header
+$(XGETTEXT) $(XGETTEXT_FLAGS_C) \
+	-o - /dev/null | \
+sed -e 's|charset=CHARSET|charset=UTF-8|' \
+    -e 's|\(Last-Translator: \)FULL NAME <.*>|\1make by the Makefile|' \
+    -e 's|\(Language-Team: \)LANGUAGE <.*>|\1Git Mailing List <git@vger.kernel.org>|' \
+    >$@ && \
+echo '"Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\\n"' >>$@
+endef
 
-	$(QUIET_XGETTEXT)$(XGETTEXT) -o$@+ $(XGETTEXT_FLAGS_C) $(LOCALIZED_C)
-	$(QUIET_XGETTEXT)$(XGETTEXT) -o$@+ --join-existing $(XGETTEXT_FLAGS_SH) \
-		$(LOCALIZED_SH)
-	$(QUIET_XGETTEXT)$(XGETTEXT) -o$@+ --join-existing $(XGETTEXT_FLAGS_PERL) \
-		$(LOCALIZED_PERL)
+.build/pot/git.header: $(LOCALIZED_ALL_GEN_PO)
+	$(call mkdir_p_parent_template)
+	$(QUIET_GEN)$(gen_pot_header)
 
-	# Reverting the munged source, leaving only the updated $@
-	git reset --hard
-	mv $@+ $@
+po/git.pot: .build/pot/git.header $(LOCALIZED_ALL_GEN_PO)
+	$(QUIET_GEN)$(MSGCAT) $^ >$@
 
 .PHONY: pot
 pot: po/git.pot
 
+define check_po_file_envvar
+	$(if $(PO_FILE), \
+		$(if $(filter po/%.po,$(PO_FILE)), , \
+			$(error PO_FILE should match pattern: "po/%.po")), \
+		$(error PO_FILE is not defined))
+endef
+
+.PHONY: po-update
+po-update: po/git.pot
+	$(check_po_file_envvar)
+	@if test ! -e $(PO_FILE); then \
+		echo >&2 "error: $(PO_FILE) does not exist"; \
+		echo >&2 'To create an initial po file, use: "make po-init PO_FILE=po/XX.po"'; \
+		exit 1; \
+	fi
+	$(QUIET_MSGMERGE)$(MSGMERGE) $(MSGMERGE_FLAGS) $(PO_FILE) po/git.pot
+
+.PHONY: check-pot
+check-pot: $(LOCALIZED_ALL_GEN_PO)
+
+### TODO FIXME: Translating everything in these files is a bad
+### heuristic for "core", as we'll translate obscure error() messages
+### along with commonly seen i18n messages. A better heuristic would
+### be to e.g. use spatch to first remove error/die/warning
+### etc. messages.
+LOCALIZED_C_CORE =
+LOCALIZED_C_CORE += builtin/checkout.c
+LOCALIZED_C_CORE += builtin/clone.c
+LOCALIZED_C_CORE += builtin/index-pack.c
+LOCALIZED_C_CORE += builtin/push.c
+LOCALIZED_C_CORE += builtin/reset.c
+LOCALIZED_C_CORE += remote.c
+LOCALIZED_C_CORE += wt-status.c
+
+LOCALIZED_C_CORE_GEN_PO = $(LOCALIZED_C_CORE:%=.build/pot/po/%.po)
+
+.build/pot/git-core.header: $(LOCALIZED_C_CORE_GEN_PO)
+	$(call mkdir_p_parent_template)
+	$(QUIET_GEN)$(gen_pot_header)
+
+po/git-core.pot: .build/pot/git-core.header $(LOCALIZED_C_CORE_GEN_PO)
+	$(QUIET_GEN)$(MSGCAT) $^ >$@
+
+.PHONY: po-init
+po-init: po/git-core.pot
+	$(check_po_file_envvar)
+	@if test -e $(PO_FILE); then \
+		echo >&2 "error: $(PO_FILE) exists already"; \
+		exit 1; \
+	fi
+	$(QUIET_MSGINIT)msginit \
+		--input=$< \
+		--output=$(PO_FILE) \
+		--no-translator \
+		--locale=$(PO_FILE:po/%.po=%)
+
+## po/*.po files & their rules
 ifdef NO_GETTEXT
 POFILES :=
 MOFILES :=
@@ -2869,6 +2980,9 @@ GIT-BUILD-OPTIONS: FORCE
 ifdef FSMONITOR_DAEMON_BACKEND
 	@echo FSMONITOR_DAEMON_BACKEND=\''$(subst ','\'',$(subst ','\'',$(FSMONITOR_DAEMON_BACKEND)))'\' >>$@+
 endif
+ifdef FSMONITOR_OS_SETTINGS
+	@echo FSMONITOR_OS_SETTINGS=\''$(subst ','\'',$(subst ','\'',$(FSMONITOR_OS_SETTINGS)))'\' >>$@+
+endif
 ifdef TEST_OUTPUT_DIRECTORY
 	@echo TEST_OUTPUT_DIRECTORY=\''$(subst ','\'',$(subst ','\'',$(TEST_OUTPUT_DIRECTORY)))'\' >>$@+
 endif
@@ -3293,6 +3407,8 @@ cocciclean:
 	$(RM) contrib/coccinelle/*.cocci.patch*
 
 clean: profile-clean coverage-clean cocciclean
+	$(RM) -r .build
+	$(RM) po/git.pot po/git-core.pot
 	$(RM) *.res
 	$(RM) $(OBJECTS)
 	$(RM) $(LIB_FILE) $(XDIFF_LIB) $(REFTABLE_LIB) $(REFTABLE_TEST_LIB)
@@ -3410,6 +3526,7 @@ coverage-clean-results:
 	$(RM) coverage-untested-functions
 	$(RM) -r cover_db/
 	$(RM) -r cover_db_html/
+	$(RM) coverage-test.made
 
 coverage-clean: coverage-clean-results
 	$(RM) $(addsuffix *.gcno,$(object_dirs))
@@ -3424,13 +3541,17 @@ coverage-compile:
 coverage-test: coverage-clean-results coverage-compile
 	$(MAKE) CFLAGS="$(COVERAGE_CFLAGS)" LDFLAGS="$(COVERAGE_LDFLAGS)" \
 		DEFAULT_TEST_TARGET=test -j1 test
+	touch coverage-test.made
+
+coverage-test.made:
+	$(MAKE) coverage-test
 
 coverage-prove: coverage-clean-results coverage-compile
 	$(MAKE) CFLAGS="$(COVERAGE_CFLAGS)" LDFLAGS="$(COVERAGE_LDFLAGS)" \
 		DEFAULT_TEST_TARGET=prove GIT_PROVE_OPTS="$(GIT_PROVE_OPTS) -j1" \
 		-j1 test
 
-coverage-report:
+coverage-report: coverage-test.made
 	$(QUIET_GCOV)for dir in $(object_dirs); do \
 		$(GCOV) $(GCOVFLAGS) --object-directory=$$dir $$dir*.c || exit; \
 	done
diff --git a/RelNotes b/RelNotes
index 800f4e1b37..fcb45c8c04 120000
--- a/RelNotes
+++ b/RelNotes
@@ -1 +1 @@
-Documentation/RelNotes/2.36.4.txt
\ No newline at end of file
+Documentation/RelNotes/2.37.4.txt
\ No newline at end of file
diff --git a/add-interactive.c b/add-interactive.c
index 7247210301..22fcd3412c 100644
--- a/add-interactive.c
+++ b/add-interactive.c
@@ -568,8 +568,7 @@ static int get_modified_files(struct repository *r,
 			run_diff_files(&rev, 0);
 		}
 
-		if (ps)
-			clear_pathspec(&rev.prune_data);
+		release_revisions(&rev);
 	}
 	hashmap_clear_and_free(&s.file_map, struct pathname_entry, ent);
 	if (unmerged_count)
@@ -698,8 +697,16 @@ static int run_update(struct add_i_state *s, const struct pathspec *ps,
 
 	for (i = 0; i < files->items.nr; i++) {
 		const char *name = files->items.items[i].string;
-		if (files->selected[i] &&
-		    add_file_to_index(s->r->index, name, 0) < 0) {
+		struct stat st;
+
+		if (!files->selected[i])
+			continue;
+		if (lstat(name, &st) && is_missing_file_error(errno)) {
+			if (remove_file_from_index(s->r->index, name) < 0) {
+				res = error(_("could not stage '%s'"), name);
+				break;
+			}
+		} else if (add_file_to_index(s->r->index, name, 0) < 0) {
 			res = error(_("could not stage '%s'"), name);
 			break;
 		}
diff --git a/add-patch.c b/add-patch.c
index 55d719f784..509ca04456 100644
--- a/add-patch.c
+++ b/add-patch.c
@@ -305,7 +305,7 @@ static void setup_child_process(struct add_p_state *s,
 	va_end(ap);
 
 	cp->git_cmd = 1;
-	strvec_pushf(&cp->env_array,
+	strvec_pushf(&cp->env,
 		     INDEX_ENVIRONMENT "=%s", s->s.r->index_file);
 }
 
diff --git a/alloc.c b/alloc.c
index 957a0af362..27f697e4c8 100644
--- a/alloc.c
+++ b/alloc.c
@@ -27,7 +27,6 @@ union any_object {
 };
 
 struct alloc_state {
-	int count; /* total number of nodes allocated */
 	int nr;    /* number of nodes left in current allocation */
 	void *p;   /* first free node in current allocation */
 
@@ -63,7 +62,6 @@ static inline void *alloc_node(struct alloc_state *s, size_t node_size)
 		s->slabs[s->slab_nr++] = s->p;
 	}
 	s->nr--;
-	s->count++;
 	ret = s->p;
 	s->p = (char *)s->p + node_size;
 	memset(ret, 0, node_size);
@@ -122,22 +120,3 @@ void *alloc_commit_node(struct repository *r)
 	init_commit_node(c);
 	return c;
 }
-
-static void report(const char *name, unsigned int count, size_t size)
-{
-	fprintf(stderr, "%10s: %8u (%"PRIuMAX" kB)\n",
-			name, count, (uintmax_t) size);
-}
-
-#define REPORT(name, type)	\
-    report(#name, r->parsed_objects->name##_state->count, \
-		  r->parsed_objects->name##_state->count * sizeof(type) >> 10)
-
-void alloc_report(struct repository *r)
-{
-	REPORT(blob, struct blob);
-	REPORT(tree, struct tree);
-	REPORT(commit, struct commit);
-	REPORT(tag, struct tag);
-	REPORT(object, union any_object);
-}
diff --git a/alloc.h b/alloc.h
index 371d388b55..3f4a0ad310 100644
--- a/alloc.h
+++ b/alloc.h
@@ -13,7 +13,6 @@ void init_commit_node(struct commit *c);
 void *alloc_commit_node(struct repository *r);
 void *alloc_tag_node(struct repository *r);
 void *alloc_object_node(struct repository *r);
-void alloc_report(struct repository *r);
 
 struct alloc_state *allocate_alloc_state(void);
 void clear_alloc_state(struct alloc_state *s);
diff --git a/apply.c b/apply.c
index d19c26d332..2b7cd930ef 100644
--- a/apply.c
+++ b/apply.c
@@ -3274,11 +3274,11 @@ static struct patch *in_fn_table(struct apply_state *state, const char *name)
 {
 	struct string_list_item *item;
 
-	if (name == NULL)
+	if (!name)
 		return NULL;
 
 	item = string_list_lookup(&state->fn_table, name);
-	if (item != NULL)
+	if (item)
 		return (struct patch *)item->util;
 
 	return NULL;
@@ -3318,7 +3318,7 @@ static void add_to_fn_table(struct apply_state *state, struct patch *patch)
 	 * This should cover the cases for normal diffs,
 	 * file creations and copies
 	 */
-	if (patch->new_name != NULL) {
+	if (patch->new_name) {
 		item = string_list_insert(&state->fn_table, patch->new_name);
 		item->util = patch;
 	}
diff --git a/archive.c b/archive.c
index 12a08af531..d5109abb89 100644
--- a/archive.c
+++ b/archive.c
@@ -9,6 +9,7 @@
 #include "parse-options.h"
 #include "unpack-trees.h"
 #include "dir.h"
+#include "quote.h"
 
 static char const * const archive_usage[] = {
 	N_("git archive [<options>] <tree-ish> [<path>...]"),
@@ -263,6 +264,7 @@ static int queue_or_write_archive_entry(const struct object_id *oid,
 struct extra_file_info {
 	char *base;
 	struct stat stat;
+	void *content;
 };
 
 int write_archive_entries(struct archiver_args *args,
@@ -331,19 +333,27 @@ int write_archive_entries(struct archiver_args *args,
 
 		put_be64(fake_oid.hash, i + 1);
 
-		strbuf_reset(&path_in_archive);
-		if (info->base)
-			strbuf_addstr(&path_in_archive, info->base);
-		strbuf_addstr(&path_in_archive, basename(path));
-
-		strbuf_reset(&content);
-		if (strbuf_read_file(&content, path, info->stat.st_size) < 0)
-			err = error_errno(_("cannot read '%s'"), path);
-		else
-			err = write_entry(args, &fake_oid, path_in_archive.buf,
-					  path_in_archive.len,
+		if (!info->content) {
+			strbuf_reset(&path_in_archive);
+			if (info->base)
+				strbuf_addstr(&path_in_archive, info->base);
+			strbuf_addstr(&path_in_archive, basename(path));
+
+			strbuf_reset(&content);
+			if (strbuf_read_file(&content, path, info->stat.st_size) < 0)
+				err = error_errno(_("cannot read '%s'"), path);
+			else
+				err = write_entry(args, &fake_oid, path_in_archive.buf,
+						  path_in_archive.len,
+						  canon_mode(info->stat.st_mode),
+						  content.buf, content.len);
+		} else {
+			err = write_entry(args, &fake_oid,
+					  path, strlen(path),
 					  canon_mode(info->stat.st_mode),
-					  content.buf, content.len);
+					  info->content, info->stat.st_size);
+		}
+
 		if (err)
 			break;
 	}
@@ -465,7 +475,7 @@ static void parse_treeish_arg(const char **argv,
 	}
 
 	tree = parse_tree_indirect(&oid);
-	if (tree == NULL)
+	if (!tree)
 		die(_("not a tree object: %s"), oid_to_hex(&oid));
 
 	if (prefix) {
@@ -493,6 +503,7 @@ static void extra_file_info_clear(void *util, const char *str)
 {
 	struct extra_file_info *info = util;
 	free(info->base);
+	free(info->content);
 	free(info);
 }
 
@@ -514,14 +525,49 @@ static int add_file_cb(const struct option *opt, const char *arg, int unset)
 	if (!arg)
 		return -1;
 
-	path = prefix_filename(args->prefix, arg);
-	item = string_list_append_nodup(&args->extra_files, path);
-	item->util = info = xmalloc(sizeof(*info));
+	info = xmalloc(sizeof(*info));
 	info->base = xstrdup_or_null(base);
-	if (stat(path, &info->stat))
-		die(_("File not found: %s"), path);
-	if (!S_ISREG(info->stat.st_mode))
-		die(_("Not a regular file: %s"), path);
+
+	if (!strcmp(opt->long_name, "add-file")) {
+		path = prefix_filename(args->prefix, arg);
+		if (stat(path, &info->stat))
+			die(_("File not found: %s"), path);
+		if (!S_ISREG(info->stat.st_mode))
+			die(_("Not a regular file: %s"), path);
+		info->content = NULL; /* read the file later */
+	} else if (!strcmp(opt->long_name, "add-virtual-file")) {
+		struct strbuf buf = STRBUF_INIT;
+		const char *p = arg;
+
+		if (*p != '"')
+			p = strchr(p, ':');
+		else if (unquote_c_style(&buf, p, &p) < 0)
+			die(_("unclosed quote: '%s'"), arg);
+
+		if (!p || *p != ':')
+			die(_("missing colon: '%s'"), arg);
+
+		if (p == arg)
+			die(_("empty file name: '%s'"), arg);
+
+		path = buf.len ?
+			strbuf_detach(&buf, NULL) : xstrndup(arg, p - arg);
+
+		if (args->prefix) {
+			char *save = path;
+			path = prefix_filename(args->prefix, path);
+			free(save);
+		}
+		memset(&info->stat, 0, sizeof(info->stat));
+		info->stat.st_mode = S_IFREG | 0644;
+		info->content = xstrdup(p + 1);
+		info->stat.st_size = strlen(info->content);
+	} else {
+		BUG("add_file_cb() called for %s", opt->long_name);
+	}
+	item = string_list_append_nodup(&args->extra_files, path);
+	item->util = info;
+
 	return 0;
 }
 
@@ -554,6 +600,9 @@ static int parse_archive_args(int argc, const char **argv,
 		{ OPTION_CALLBACK, 0, "add-file", args, N_("file"),
 		  N_("add untracked file to archive"), 0, add_file_cb,
 		  (intptr_t)&base },
+		{ OPTION_CALLBACK, 0, "add-virtual-file", args,
+		  N_("path:content"), N_("add untracked file to archive"), 0,
+		  add_file_cb, (intptr_t)&base },
 		OPT_STRING('o', "output", &output, N_("file"),
 			N_("write the archive to this file")),
 		OPT_BOOL(0, "worktree-attributes", &worktree_attributes,
diff --git a/bisect.c b/bisect.c
index 9e6a2b7f20..b63669cc9d 100644
--- a/bisect.c
+++ b/bisect.c
@@ -884,6 +884,7 @@ static int check_ancestors(struct repository *r, int rev_nr,
 	/* Clean up objects used, as they will be reused. */
 	clear_commit_marks_many(rev_nr, rev, ALL_REV_FLAGS);
 
+	release_revisions(&revs);
 	return res;
 }
 
@@ -964,6 +965,7 @@ static void show_diff_tree(struct repository *r,
 
 	setup_revisions(ARRAY_SIZE(argv) - 1, argv, &opt, NULL);
 	log_tree_commit(&opt, commit);
+	release_revisions(&opt);
 }
 
 /*
@@ -1008,7 +1010,7 @@ void read_bisect_terms(const char **read_bad, const char **read_good)
  */
 enum bisect_error bisect_next_all(struct repository *r, const char *prefix)
 {
-	struct rev_info revs;
+	struct rev_info revs = REV_INFO_INIT;
 	struct commit_list *tried;
 	int reaches = 0, all = 0, nr, steps;
 	enum bisect_error res = BISECT_OK;
@@ -1033,7 +1035,7 @@ enum bisect_error bisect_next_all(struct repository *r, const char *prefix)
 
 	res = check_good_are_ancestors_of_bad(r, prefix, no_checkout);
 	if (res)
-		return res;
+		goto cleanup;
 
 	bisect_rev_setup(r, &revs, prefix, "%s", "^%s", 1);
 
@@ -1058,14 +1060,16 @@ enum bisect_error bisect_next_all(struct repository *r, const char *prefix)
 		       term_good,
 		       term_bad);
 
-		return BISECT_FAILED;
+		res = BISECT_FAILED;
+		goto cleanup;
 	}
 
 	if (!all) {
 		fprintf(stderr, _("No testable commit found.\n"
 			"Maybe you started with bad path arguments?\n"));
 
-		return BISECT_NO_TESTABLE_COMMIT;
+		res = BISECT_NO_TESTABLE_COMMIT;
+		goto cleanup;
 	}
 
 	bisect_rev = &revs.commits->item->object.oid;
@@ -1085,7 +1089,8 @@ enum bisect_error bisect_next_all(struct repository *r, const char *prefix)
 		 * for negative return values for early returns up
 		 * until the cmd_bisect__helper() caller.
 		 */
-		return BISECT_INTERNAL_SUCCESS_1ST_BAD_FOUND;
+		res = BISECT_INTERNAL_SUCCESS_1ST_BAD_FOUND;
+		goto cleanup;
 	}
 
 	nr = all - reaches - 1;
@@ -1104,7 +1109,10 @@ enum bisect_error bisect_next_all(struct repository *r, const char *prefix)
 	/* Clean up objects used, as they will be reused. */
 	repo_clear_commit_marks(r, ALL_REV_FLAGS);
 
-	return bisect_checkout(bisect_rev, no_checkout);
+	res = bisect_checkout(bisect_rev, no_checkout);
+cleanup:
+	release_revisions(&revs);
+	return res;
 }
 
 static inline int log2i(int n)
diff --git a/bisect.h b/bisect.h
index 1015aeb8ea..ee3fd65f3b 100644
--- a/bisect.h
+++ b/bisect.h
@@ -62,6 +62,15 @@ enum bisect_error {
 	BISECT_INTERNAL_SUCCESS_MERGE_BASE = -11
 };
 
+/*
+ * Stores how many good/bad commits we have stored for a bisect. nr_bad can
+ * only be 0 or 1.
+ */
+struct bisect_state {
+	unsigned int nr_good;
+	unsigned int nr_bad;
+};
+
 enum bisect_error bisect_next_all(struct repository *r, const char *prefix);
 
 int estimate_bisect_steps(int all);
diff --git a/blame.c b/blame.c
index 186ad96120..da1052ac94 100644
--- a/blame.c
+++ b/blame.c
@@ -1072,7 +1072,7 @@ static struct blame_entry *blame_merge(struct blame_entry *list1,
 	if (p1->s_lno <= p2->s_lno) {
 		do {
 			tail = &p1->next;
-			if ((p1 = *tail) == NULL) {
+			if (!(p1 = *tail)) {
 				*tail = p2;
 				return list1;
 			}
@@ -1082,7 +1082,7 @@ static struct blame_entry *blame_merge(struct blame_entry *list1,
 		*tail = p2;
 		do {
 			tail = &p2->next;
-			if ((p2 = *tail) == NULL)  {
+			if (!(p2 = *tail))  {
 				*tail = p1;
 				return list1;
 			}
@@ -1090,7 +1090,7 @@ static struct blame_entry *blame_merge(struct blame_entry *list1,
 		*tail = p1;
 		do {
 			tail = &p1->next;
-			if ((p1 = *tail) == NULL) {
+			if (!(p1 = *tail)) {
 				*tail = p2;
 				return list1;
 			}
diff --git a/bloom.c b/bloom.c
index 5e297038bb..816f063dca 100644
--- a/bloom.c
+++ b/bloom.c
@@ -30,10 +30,9 @@ static inline unsigned char get_bitmask(uint32_t pos)
 
 static int load_bloom_filter_from_graph(struct commit_graph *g,
 					struct bloom_filter *filter,
-					struct commit *c)
+					uint32_t graph_pos)
 {
 	uint32_t lex_pos, start_index, end_index;
-	uint32_t graph_pos = commit_graph_position(c);
 
 	while (graph_pos < g->num_commits_in_base)
 		g = g->base_graph;
@@ -203,9 +202,10 @@ struct bloom_filter *get_or_compute_bloom_filter(struct repository *r,
 	filter = bloom_filter_slab_at(&bloom_filters, c);
 
 	if (!filter->data) {
-		load_commit_graph_info(r, c);
-		if (commit_graph_position(c) != COMMIT_NOT_FROM_GRAPH)
-			load_bloom_filter_from_graph(r->objects->commit_graph, filter, c);
+		uint32_t graph_pos;
+		if (repo_find_commit_pos_in_graph(r, c, &graph_pos))
+			load_bloom_filter_from_graph(r->objects->commit_graph,
+						     filter, graph_pos);
 	}
 
 	if (filter->data && filter->len)
diff --git a/branch.c b/branch.c
index 01ecb816d5..4c8523c66a 100644
--- a/branch.c
+++ b/branch.c
@@ -44,9 +44,9 @@ static int find_tracked_branch(struct remote *remote, void *priv)
 			string_list_clear(tracking->srcs, 0);
 		break;
 		}
+		/* remote_find_tracking() searches by src if present */
 		tracking->spec.src = NULL;
 	}
-
 	return 0;
 }
 
@@ -264,15 +264,23 @@ static void setup_tracking(const char *new_ref, const char *orig_ref,
 
 	if (!tracking.matches)
 		switch (track) {
+		/* If ref is not remote, still use local */
 		case BRANCH_TRACK_ALWAYS:
 		case BRANCH_TRACK_EXPLICIT:
 		case BRANCH_TRACK_OVERRIDE:
+		/* Remote matches not evaluated */
 		case BRANCH_TRACK_INHERIT:
 			break;
+		/* Otherwise, if no remote don't track */
 		default:
 			goto cleanup;
 		}
 
+	/*
+	 * This check does not apply to BRANCH_TRACK_INHERIT;
+	 * that supports multiple entries in tracking_srcs but
+	 * leaves tracking.matches at 0.
+	 */
 	if (tracking.matches > 1) {
 		int status = die_message(_("not tracking: ambiguous information for ref '%s'"),
 					    orig_ref);
@@ -307,6 +315,21 @@ static void setup_tracking(const char *new_ref, const char *orig_ref,
 		exit(status);
 	}
 
+	if (track == BRANCH_TRACK_SIMPLE) {
+		/*
+		 * Only track if remote branch name matches.
+		 * Reaching into items[0].string is safe because
+		 * we know there is at least one and not more than
+		 * one entry (because only BRANCH_TRACK_INHERIT can
+		 * produce more than one entry).
+		 */
+		const char *tracked_branch;
+		if (!skip_prefix(tracking.srcs->items[0].string,
+				 "refs/heads/", &tracked_branch) ||
+		    strcmp(tracked_branch, new_ref))
+			return;
+	}
+
 	if (tracking.srcs->nr < 1)
 		string_list_append(tracking.srcs, orig_ref);
 	if (install_branch_config_multiple_remotes(config_flags, new_ref,
@@ -466,7 +489,7 @@ static void dwim_branch_start(struct repository *r, const char *start_name,
 		break;
 	}
 
-	if ((commit = lookup_commit_reference(r, &oid)) == NULL)
+	if (!(commit = lookup_commit_reference(r, &oid)))
 		die(_("not a valid branch point: '%s'"), start_name);
 	if (out_real_ref) {
 		*out_real_ref = real_ref;
@@ -564,7 +587,7 @@ static int submodule_create_branch(struct repository *r,
 	child.err = -1;
 	child.stdout_to_stderr = 1;
 
-	prepare_other_repo_env(&child.env_array, r->gitdir);
+	prepare_other_repo_env(&child.env, r->gitdir);
 	/*
 	 * submodule_create_branch() is indirectly invoked by "git
 	 * branch", but we cannot invoke "git branch" in the child
@@ -603,6 +626,8 @@ static int submodule_create_branch(struct repository *r,
 		/* Default for "git checkout". Do not pass --track. */
 	case BRANCH_TRACK_REMOTE:
 		/* Default for "git branch". Do not pass --track. */
+	case BRANCH_TRACK_SIMPLE:
+		/* Config-driven only. Do not pass --track. */
 		break;
 	}
 
@@ -653,7 +678,7 @@ void create_branches_recursively(struct repository *r, const char *name,
 	 * be created in every submodule.
 	 */
 	for (i = 0; i < submodule_entry_list.entry_nr; i++) {
-		if (submodule_entry_list.entries[i].repo == NULL) {
+		if (!submodule_entry_list.entries[i].repo) {
 			int code = die_message(
 				_("submodule '%s': unable to find submodule"),
 				submodule_entry_list.entries[i].submodule->name);
diff --git a/branch.h b/branch.h
index 04df2aa5b5..560b6b96a8 100644
--- a/branch.h
+++ b/branch.h
@@ -12,6 +12,7 @@ enum branch_track {
 	BRANCH_TRACK_EXPLICIT,
 	BRANCH_TRACK_OVERRIDE,
 	BRANCH_TRACK_INHERIT,
+	BRANCH_TRACK_SIMPLE,
 };
 
 extern enum branch_track git_branch_track;
diff --git a/builtin/add.c b/builtin/add.c
index 3ffb86a433..f84372964c 100644
--- a/builtin/add.c
+++ b/builtin/add.c
@@ -141,8 +141,17 @@ int add_files_to_cache(const char *prefix,
 	rev.diffopt.format_callback_data = &data;
 	rev.diffopt.flags.override_submodule_config = 1;
 	rev.max_count = 0; /* do not compare unmerged paths with stage #2 */
+
+	/*
+	 * Use an ODB transaction to optimize adding multiple objects.
+	 * This function is invoked from commands other than 'add', which
+	 * may not have their own transaction active.
+	 */
+	begin_odb_transaction();
 	run_diff_files(&rev, DIFF_RACY_IS_MODIFIED);
-	clear_pathspec(&rev.prune_data);
+	end_odb_transaction();
+
+	release_revisions(&rev);
 	return !!data.add_errors;
 }
 
@@ -236,17 +245,12 @@ int run_add_interactive(const char *revision, const char *patch_mode,
 	int use_builtin_add_i =
 		git_env_bool("GIT_TEST_ADD_I_USE_BUILTIN", -1);
 
-	if (use_builtin_add_i < 0) {
-		int experimental;
-		if (!git_config_get_bool("add.interactive.usebuiltin",
-					 &use_builtin_add_i))
-			; /* ok */
-		else if (!git_config_get_bool("feature.experimental", &experimental) &&
-			 experimental)
-			use_builtin_add_i = 1;
-	}
+	if (use_builtin_add_i < 0 &&
+	    git_config_get_bool("add.interactive.usebuiltin",
+				&use_builtin_add_i))
+		use_builtin_add_i = 1;
 
-	if (use_builtin_add_i == 1) {
+	if (use_builtin_add_i != 0) {
 		enum add_p_mode mode;
 
 		if (!patch_mode)
@@ -340,6 +344,7 @@ static int edit_patch(int argc, const char **argv, const char *prefix)
 
 	unlink(file);
 	free(file);
+	release_revisions(&rev);
 	return 0;
 }
 
@@ -670,7 +675,7 @@ int cmd_add(int argc, const char **argv, const char *prefix)
 		string_list_clear(&only_match_skip_worktree, 0);
 	}
 
-	plug_bulk_checkin();
+	begin_odb_transaction();
 
 	if (add_renormalize)
 		exit_status |= renormalize_tracked_files(&pathspec, flags);
@@ -682,7 +687,7 @@ int cmd_add(int argc, const char **argv, const char *prefix)
 
 	if (chmod_arg && pathspec.nr)
 		exit_status |= chmod_pathspec(&pathspec, chmod_arg[0], show_only);
-	unplug_bulk_checkin();
+	end_odb_transaction();
 
 finish:
 	if (write_locked_index(&the_index, &lock_file,
diff --git a/builtin/am.c b/builtin/am.c
index 0f4111bafa..93bec62afa 100644
--- a/builtin/am.c
+++ b/builtin/am.c
@@ -1397,6 +1397,7 @@ static void write_commit_patch(const struct am_state *state, struct commit *comm
 	add_pending_object(&rev_info, &commit->object, "");
 	diff_setup_done(&rev_info.diffopt);
 	log_tree_commit(&rev_info, commit);
+	release_revisions(&rev_info);
 }
 
 /**
@@ -1429,6 +1430,7 @@ static void write_index_patch(const struct am_state *state)
 	add_pending_object(&rev_info, &tree->object, "");
 	diff_setup_done(&rev_info.diffopt);
 	run_diff_index(&rev_info, 1);
+	release_revisions(&rev_info);
 }
 
 /**
@@ -1582,6 +1584,7 @@ static int fall_back_threeway(const struct am_state *state, const char *index_pa
 		add_pending_oid(&rev_info, "HEAD", &our_tree, 0);
 		diff_setup_done(&rev_info.diffopt);
 		run_diff_index(&rev_info, 1);
+		release_revisions(&rev_info);
 	}
 
 	if (run_apply(state, index_path))
diff --git a/builtin/apply.c b/builtin/apply.c
index 3f099b9605..555219de40 100644
--- a/builtin/apply.c
+++ b/builtin/apply.c
@@ -1,7 +1,6 @@
 #include "cache.h"
 #include "builtin.h"
 #include "parse-options.h"
-#include "lockfile.h"
 #include "apply.h"
 
 static const char * const apply_usage[] = {
diff --git a/builtin/bisect--helper.c b/builtin/bisect--helper.c
index 8b2b259ff0..8a052c7111 100644
--- a/builtin/bisect--helper.c
+++ b/builtin/bisect--helper.c
@@ -329,12 +329,12 @@ static int check_and_set_terms(struct bisect_terms *terms, const char *cmd)
 	return 0;
 }
 
-static int mark_good(const char *refname, const struct object_id *oid,
-		     int flag, void *cb_data)
+static int inc_nr(const char *refname, const struct object_id *oid,
+		  int flag, void *cb_data)
 {
-	int *m_good = (int *)cb_data;
-	*m_good = 0;
-	return 1;
+	unsigned int *nr = (unsigned int *)cb_data;
+	(*nr)++;
+	return 0;
 }
 
 static const char need_bad_and_good_revision_warning[] =
@@ -384,23 +384,64 @@ static int decide_next(const struct bisect_terms *terms,
 			     vocab_good, vocab_bad, vocab_good, vocab_bad);
 }
 
-static int bisect_next_check(const struct bisect_terms *terms,
-			     const char *current_term)
+static void bisect_status(struct bisect_state *state,
+			  const struct bisect_terms *terms)
 {
-	int missing_good = 1, missing_bad = 1;
 	char *bad_ref = xstrfmt("refs/bisect/%s", terms->term_bad);
 	char *good_glob = xstrfmt("%s-*", terms->term_good);
 
 	if (ref_exists(bad_ref))
-		missing_bad = 0;
+		state->nr_bad = 1;
 
-	for_each_glob_ref_in(mark_good, good_glob, "refs/bisect/",
-			     (void *) &missing_good);
+	for_each_glob_ref_in(inc_nr, good_glob, "refs/bisect/",
+			     (void *) &state->nr_good);
 
 	free(good_glob);
 	free(bad_ref);
+}
 
-	return decide_next(terms, current_term, missing_good, missing_bad);
+__attribute__((format (printf, 1, 2)))
+static void bisect_log_printf(const char *fmt, ...)
+{
+	struct strbuf buf = STRBUF_INIT;
+	va_list ap;
+
+	va_start(ap, fmt);
+	strbuf_vaddf(&buf, fmt, ap);
+	va_end(ap);
+
+	printf("%s", buf.buf);
+	append_to_file(git_path_bisect_log(), "# %s", buf.buf);
+
+	strbuf_release(&buf);
+}
+
+static void bisect_print_status(const struct bisect_terms *terms)
+{
+	struct bisect_state state = { 0 };
+
+	bisect_status(&state, terms);
+
+	/* If we had both, we'd already be started, and shouldn't get here. */
+	if (state.nr_good && state.nr_bad)
+		return;
+
+	if (!state.nr_good && !state.nr_bad)
+		bisect_log_printf(_("status: waiting for both good and bad commits\n"));
+	else if (state.nr_good)
+		bisect_log_printf(Q_("status: waiting for bad commit, %d good commit known\n",
+				     "status: waiting for bad commit, %d good commits known\n",
+				     state.nr_good), state.nr_good);
+	else
+		bisect_log_printf(_("status: waiting for good commit(s), bad commit known\n"));
+}
+
+static int bisect_next_check(const struct bisect_terms *terms,
+			     const char *current_term)
+{
+	struct bisect_state state = { 0 };
+	bisect_status(&state, terms);
+	return decide_next(terms, current_term, !state.nr_good, !state.nr_bad);
 }
 
 static int get_terms(struct bisect_terms *terms)
@@ -433,7 +474,7 @@ static int bisect_terms(struct bisect_terms *terms, const char *option)
 	if (get_terms(terms))
 		return error(_("no terms defined"));
 
-	if (option == NULL) {
+	if (!option) {
 		printf(_("Your current terms are %s for the old state\n"
 			 "and %s for the new state.\n"),
 		       terms->term_good, terms->term_bad);
@@ -555,6 +596,7 @@ static int bisect_skipped_commits(struct bisect_terms *terms)
 	reset_revision_walk();
 
 	strbuf_release(&commit_name);
+	release_revisions(&revs);
 	fclose(fp);
 	return 0;
 }
@@ -606,8 +648,10 @@ static enum bisect_error bisect_next(struct bisect_terms *terms, const char *pre
 
 static enum bisect_error bisect_auto_next(struct bisect_terms *terms, const char *prefix)
 {
-	if (bisect_next_check(terms, NULL))
+	if (bisect_next_check(terms, NULL)) {
+		bisect_print_status(terms);
 		return BISECT_OK;
+	}
 
 	return bisect_next(terms, prefix);
 }
@@ -1041,6 +1085,7 @@ static enum bisect_error bisect_skip(struct bisect_terms *terms, const char **ar
 						oid_to_hex(&commit->object.oid));
 
 			reset_revision_walk();
+			release_revisions(&revs);
 		} else {
 			strvec_push(&argv_state, argv[i]);
 		}
diff --git a/builtin/blame.c b/builtin/blame.c
index 8d15b68afc..02e39420b6 100644
--- a/builtin/blame.c
+++ b/builtin/blame.c
@@ -898,6 +898,7 @@ int cmd_blame(int argc, const char **argv, const char *prefix)
 	unsigned int range_i;
 	long anchor;
 	const int hexsz = the_hash_algo->hexsz;
+	long num_lines = 0;
 
 	setup_default_color_by_age();
 	git_config(git_blame_config, &output_option);
@@ -1129,7 +1130,10 @@ parse_done:
 	for (range_i = ranges.nr; range_i > 0; --range_i) {
 		const struct range *r = &ranges.ranges[range_i - 1];
 		ent = blame_entry_prepend(ent, r->start, r->end, o);
+		num_lines += (r->end - r->start);
 	}
+	if (!num_lines)
+		num_lines = sb.num_lines;
 
 	o->suspects = ent;
 	prio_queue_put(&sb.commits, o->commit);
@@ -1158,7 +1162,7 @@ parse_done:
 	sb.found_guilty_entry = &found_guilty_entry;
 	sb.found_guilty_entry_data = &pi;
 	if (show_progress)
-		pi.progress = start_delayed_progress(_("Blaming lines"), sb.num_lines);
+		pi.progress = start_delayed_progress(_("Blaming lines"), num_lines);
 
 	assign_blame(&sb, opt);
 
@@ -1167,7 +1171,7 @@ parse_done:
 	if (!incremental)
 		setup_pager();
 	else
-		return 0;
+		goto cleanup;
 
 	blame_sort_final(&sb);
 
@@ -1201,6 +1205,8 @@ parse_done:
 		printf("num commits: %d\n", sb.num_commits);
 	}
 
+cleanup:
 	cleanup_scoreboard(&sb);
+	release_revisions(&revs);
 	return 0;
 }
diff --git a/builtin/checkout.c b/builtin/checkout.c
index 797681481d..cdd96cd9c6 100644
--- a/builtin/checkout.c
+++ b/builtin/checkout.c
@@ -417,7 +417,7 @@ static int checkout_worktree(const struct checkout_opts *opts,
 	mem_pool_discard(&ce_mem_pool, should_validate_cache_entries());
 	remove_marked_cache_entries(&the_index, 1);
 	remove_scheduled_dirs();
-	errs |= finish_delayed_checkout(&state, &nr_checkouts, opts->show_progress);
+	errs |= finish_delayed_checkout(&state, opts->show_progress);
 
 	if (opts->count_checkout_paths) {
 		if (nr_unmerged)
@@ -626,10 +626,11 @@ static void show_local_changes(struct object *head,
 	repo_init_revisions(the_repository, &rev, NULL);
 	rev.diffopt.flags = opts->flags;
 	rev.diffopt.output_format |= DIFF_FORMAT_NAME_STATUS;
+	rev.diffopt.flags.recursive = 1;
 	diff_setup_done(&rev.diffopt);
 	add_pending_object(&rev, head, NULL);
 	run_diff_index(&rev, 0);
-	object_array_clear(&rev.pending);
+	release_revisions(&rev);
 }
 
 static void describe_detached_head(const char *msg, struct commit *commit)
@@ -834,7 +835,7 @@ static int merge_working_tree(const struct checkout_opts *opts,
 			if (ret)
 				return ret;
 			o.ancestor = old_branch_info->name;
-			if (old_branch_info->name == NULL) {
+			if (!old_branch_info->name) {
 				strbuf_add_unique_abbrev(&old_commit_shortname,
 							 &old_branch_info->commit->object.oid,
 							 DEFAULT_ABBREV);
@@ -1082,6 +1083,7 @@ static void orphaned_commit_warning(struct commit *old_commit, struct commit *ne
 
 	/* Clean up objects used, as they will be reused. */
 	repo_clear_commit_marks(the_repository, ALL_REV_FLAGS);
+	release_revisions(&revs);
 }
 
 static int switch_branches(const struct checkout_opts *opts,
diff --git a/builtin/clone.c b/builtin/clone.c
index 21e1ce5ac8..3af7dc01bd 100644
--- a/builtin/clone.c
+++ b/builtin/clone.c
@@ -608,7 +608,7 @@ static void update_remote_refs(const struct ref *refs,
 }
 
 static void update_head(const struct ref *our, const struct ref *remote,
-			const char *msg)
+			const char *unborn, const char *msg)
 {
 	const char *head;
 	if (our && skip_prefix(our->name, "refs/heads/", &head)) {
@@ -634,6 +634,15 @@ static void update_head(const struct ref *our, const struct ref *remote,
 		 */
 		update_ref(msg, "HEAD", &remote->old_oid, NULL, REF_NO_DEREF,
 			   UPDATE_REFS_DIE_ON_ERR);
+	} else if (unborn && skip_prefix(unborn, "refs/heads/", &head)) {
+		/*
+		 * Unborn head from remote; same as "our" case above except
+		 * that we have no ref to update.
+		 */
+		if (create_symref("HEAD", unborn, NULL) < 0)
+			die(_("unable to update HEAD"));
+		if (!option_bare)
+			install_branch_config(0, head, remote_name, unborn);
 	}
 }
 
@@ -674,7 +683,7 @@ static int checkout(int submodule_progress, int filter_submodules)
 	head = resolve_refdup("HEAD", RESOLVE_REF_READING, &oid, NULL);
 	if (!head) {
 		warning(_("remote HEAD refers to nonexistent ref, "
-			  "unable to checkout.\n"));
+			  "unable to checkout"));
 		return 0;
 	}
 	if (!strcmp(head, "HEAD")) {
@@ -878,6 +887,7 @@ int cmd_clone(int argc, const char **argv, const char *prefix)
 	const struct ref *refs, *remote_head;
 	struct ref *remote_head_points_at = NULL;
 	const struct ref *our_head_points_at;
+	char *unborn_head = NULL;
 	struct ref *mapped_refs = NULL;
 	const struct ref *ref;
 	struct strbuf key = STRBUF_INIT;
@@ -1108,12 +1118,12 @@ int cmd_clone(int argc, const char **argv, const char *prefix)
 	 * apply the remote name provided by --origin only after this second
 	 * call to git_config, to ensure it overrides all config-based values.
 	 */
-	if (option_origin != NULL) {
+	if (option_origin) {
 		free(remote_name);
 		remote_name = xstrdup(option_origin);
 	}
 
-	if (remote_name == NULL)
+	if (!remote_name)
 		remote_name = xstrdup("origin");
 
 	if (!valid_remote_name(remote_name))
@@ -1268,51 +1278,49 @@ int cmd_clone(int argc, const char **argv, const char *prefix)
 			if (transport_fetch_refs(transport, mapped_refs))
 				die(_("remote transport reported error"));
 		}
-
-		remote_head = find_ref_by_name(refs, "HEAD");
-		remote_head_points_at =
-			guess_remote_head(remote_head, mapped_refs, 0);
-
-		if (option_branch) {
-			our_head_points_at =
-				find_remote_branch(mapped_refs, option_branch);
-
-			if (!our_head_points_at)
-				die(_("Remote branch %s not found in upstream %s"),
-				    option_branch, remote_name);
-		}
-		else
-			our_head_points_at = remote_head_points_at;
 	}
-	else {
-		const char *branch;
-		const char *ref;
-		char *ref_free = NULL;
 
-		if (option_branch)
-			die(_("Remote branch %s not found in upstream %s"),
-					option_branch, remote_name);
+	remote_head = find_ref_by_name(refs, "HEAD");
+	remote_head_points_at = guess_remote_head(remote_head, mapped_refs, 0);
 
-		warning(_("You appear to have cloned an empty repository."));
+	if (option_branch) {
+		our_head_points_at = find_remote_branch(mapped_refs, option_branch);
+		if (!our_head_points_at)
+			die(_("Remote branch %s not found in upstream %s"),
+			    option_branch, remote_name);
+	} else if (remote_head_points_at) {
+		our_head_points_at = remote_head_points_at;
+	} else if (remote_head) {
 		our_head_points_at = NULL;
-		remote_head_points_at = NULL;
-		remote_head = NULL;
-		option_no_checkout = 1;
+	} else {
+		const char *branch;
+
+		if (!mapped_refs) {
+			warning(_("You appear to have cloned an empty repository."));
+			option_no_checkout = 1;
+		}
 
 		if (transport_ls_refs_options.unborn_head_target &&
 		    skip_prefix(transport_ls_refs_options.unborn_head_target,
 				"refs/heads/", &branch)) {
-			ref = transport_ls_refs_options.unborn_head_target;
-			create_symref("HEAD", ref, reflog_msg.buf);
+			unborn_head  = xstrdup(transport_ls_refs_options.unborn_head_target);
 		} else {
 			branch = git_default_branch_name(0);
-			ref_free = xstrfmt("refs/heads/%s", branch);
-			ref = ref_free;
+			unborn_head = xstrfmt("refs/heads/%s", branch);
 		}
 
-		if (!option_bare)
-			install_branch_config(0, branch, remote_name, ref);
-		free(ref_free);
+		/*
+		 * We may have selected a local default branch name "foo",
+		 * and even though the remote's HEAD does not point there,
+		 * it may still have a "foo" branch. If so, set it up so
+		 * that we can follow the usual checkout code later.
+		 *
+		 * Note that for an empty repo we'll already have set
+		 * option_no_checkout above, which would work against us here.
+		 * But for an empty repo, find_remote_branch() can never find
+		 * a match.
+		 */
+		our_head_points_at = find_remote_branch(mapped_refs, branch);
 	}
 
 	write_refspec_config(src_ref_prefix, our_head_points_at,
@@ -1332,7 +1340,7 @@ int cmd_clone(int argc, const char **argv, const char *prefix)
 			   branch_top.buf, reflog_msg.buf, transport,
 			   !is_local);
 
-	update_head(our_head_points_at, remote_head, reflog_msg.buf);
+	update_head(our_head_points_at, remote_head, unborn_head, reflog_msg.buf);
 
 	/*
 	 * We want to show progress for recursive submodule clones iff
@@ -1359,6 +1367,7 @@ int cmd_clone(int argc, const char **argv, const char *prefix)
 	strbuf_release(&key);
 	free_refs(mapped_refs);
 	free_refs(remote_head_points_at);
+	free(unborn_head);
 	free(dir);
 	free(path);
 	UNLEAK(repo);
diff --git a/builtin/commit.c b/builtin/commit.c
index 009a1de0a3..fcf9c85947 100644
--- a/builtin/commit.c
+++ b/builtin/commit.c
@@ -861,7 +861,7 @@ static int prepare_to_commit(const char *index_file, const char *prefix,
 	}
 
 	s->fp = fopen_for_writing(git_path_commit_editmsg());
-	if (s->fp == NULL)
+	if (!s->fp)
 		die_errno(_("could not open '%s'"), git_path_commit_editmsg());
 
 	/* Ignore status.displayCommentPrefix: we do need comments in COMMIT_EDITMSG. */
@@ -1100,7 +1100,6 @@ static const char *find_author_by_nickname(const char *name)
 	struct rev_info revs;
 	struct commit *commit;
 	struct strbuf buf = STRBUF_INIT;
-	struct string_list mailmap = STRING_LIST_INIT_NODUP;
 	const char *av[20];
 	int ac = 0;
 
@@ -1111,7 +1110,8 @@ static const char *find_author_by_nickname(const char *name)
 	av[++ac] = buf.buf;
 	av[++ac] = NULL;
 	setup_revisions(ac, av, &revs, NULL);
-	revs.mailmap = &mailmap;
+	revs.mailmap = xmalloc(sizeof(struct string_list));
+	string_list_init_nodup(revs.mailmap);
 	read_mailmap(revs.mailmap);
 
 	if (prepare_revision_walk(&revs))
@@ -1122,7 +1122,7 @@ static const char *find_author_by_nickname(const char *name)
 		ctx.date_mode.type = DATE_NORMAL;
 		strbuf_release(&buf);
 		format_commit_message(commit, "%aN <%aE>", &buf, &ctx);
-		clear_mailmap(&mailmap);
+		release_revisions(&revs);
 		return strbuf_detach(&buf, NULL);
 	}
 	die(_("--author '%s' is not 'Name <email>' and matches no existing author"), name);
@@ -1687,6 +1687,7 @@ int cmd_commit(int argc, const char **argv, const char *prefix)
 	struct commit *current_head = NULL;
 	struct commit_extra_header *extra = NULL;
 	struct strbuf err = STRBUF_INIT;
+	int ret = 0;
 
 	if (argc == 2 && !strcmp(argv[1], "-h"))
 		usage_with_options(builtin_commit_usage, builtin_commit_options);
@@ -1721,8 +1722,9 @@ int cmd_commit(int argc, const char **argv, const char *prefix)
 	   running hooks, writing the trees, and interacting with the user.  */
 	if (!prepare_to_commit(index_file, prefix,
 			       current_head, &s, &author_ident)) {
+		ret = 1;
 		rollback_index_files();
-		return 1;
+		goto cleanup;
 	}
 
 	/* Determine parents */
@@ -1820,7 +1822,6 @@ int cmd_commit(int argc, const char **argv, const char *prefix)
 		rollback_index_files();
 		die(_("failed to write commit object"));
 	}
-	strbuf_release(&author_ident);
 	free_commit_extra_headers(extra);
 
 	if (update_head_with_reflog(current_head, &oid, reflog_msg, &sb,
@@ -1862,7 +1863,9 @@ int cmd_commit(int argc, const char **argv, const char *prefix)
 
 	apply_autostash(git_path_merge_autostash(the_repository));
 
+cleanup:
+	UNLEAK(author_ident);
 	UNLEAK(err);
 	UNLEAK(sb);
-	return 0;
+	return ret;
 }
diff --git a/builtin/describe.c b/builtin/describe.c
index 42159cd26b..a76f1a1a7a 100644
--- a/builtin/describe.c
+++ b/builtin/describe.c
@@ -517,6 +517,7 @@ static void describe_blob(struct object_id oid, struct strbuf *dst)
 
 	traverse_commit_list(&revs, process_commit, process_object, &pcd);
 	reset_revision_walk();
+	release_revisions(&revs);
 }
 
 static void describe(const char *arg, int last_one)
@@ -667,6 +668,7 @@ int cmd_describe(int argc, const char **argv, const char *prefix)
 				suffix = NULL;
 			else
 				suffix = dirty;
+			release_revisions(&revs);
 		}
 		describe("HEAD", 1);
 	} else if (dirty) {
diff --git a/builtin/diff-files.c b/builtin/diff-files.c
index 70103c4095..92cf6e1e92 100644
--- a/builtin/diff-files.c
+++ b/builtin/diff-files.c
@@ -77,8 +77,12 @@ int cmd_diff_files(int argc, const char **argv, const char *prefix)
 
 	if (read_cache_preload(&rev.diffopt.pathspec) < 0) {
 		perror("read_cache_preload");
-		return -1;
+		result = -1;
+		goto cleanup;
 	}
 	result = run_diff_files(&rev, options);
-	return diff_result_code(&rev.diffopt, result);
+	result = diff_result_code(&rev.diffopt, result);
+cleanup:
+	release_revisions(&rev);
+	return result;
 }
diff --git a/builtin/diff-index.c b/builtin/diff-index.c
index 5fd23ab5b6..7d158af6b6 100644
--- a/builtin/diff-index.c
+++ b/builtin/diff-index.c
@@ -70,6 +70,7 @@ int cmd_diff_index(int argc, const char **argv, const char *prefix)
 		return -1;
 	}
 	result = run_diff_index(&rev, option);
-	UNLEAK(rev);
-	return diff_result_code(&rev.diffopt, result);
+	result = diff_result_code(&rev.diffopt, result);
+	release_revisions(&rev);
+	return result;
 }
diff --git a/builtin/diff.c b/builtin/diff.c
index bb7fafca61..54bb3de964 100644
--- a/builtin/diff.c
+++ b/builtin/diff.c
@@ -352,7 +352,7 @@ static void symdiff_prepare(struct rev_info *rev, struct symdiff *sym)
 			othercount++;
 			continue;
 		}
-		if (map == NULL)
+		if (!map)
 			map = bitmap_new();
 		bitmap_set(map, i);
 	}
@@ -594,7 +594,7 @@ int cmd_diff(int argc, const char **argv, const char *prefix)
 	result = diff_result_code(&rev.diffopt, result);
 	if (1 < rev.diffopt.skip_stat_unmatch)
 		refresh_index_quietly();
-	UNLEAK(rev);
+	release_revisions(&rev);
 	UNLEAK(ent);
 	UNLEAK(blob);
 	return result;
diff --git a/builtin/difftool.c b/builtin/difftool.c
index faa3507369..b3c509b8de 100644
--- a/builtin/difftool.c
+++ b/builtin/difftool.c
@@ -217,7 +217,7 @@ static void changed_files(struct hashmap *result, const char *index_path,
 	update_index.use_shell = 0;
 	update_index.clean_on_exit = 1;
 	update_index.dir = workdir;
-	strvec_pushf(&update_index.env_array, "GIT_INDEX_FILE=%s", index_path);
+	strvec_pushf(&update_index.env, "GIT_INDEX_FILE=%s", index_path);
 	/* Ignore any errors of update-index */
 	run_command(&update_index);
 
@@ -230,7 +230,7 @@ static void changed_files(struct hashmap *result, const char *index_path,
 	diff_files.clean_on_exit = 1;
 	diff_files.out = -1;
 	diff_files.dir = workdir;
-	strvec_pushf(&diff_files.env_array, "GIT_INDEX_FILE=%s", index_path);
+	strvec_pushf(&diff_files.env, "GIT_INDEX_FILE=%s", index_path);
 	if (start_command(&diff_files))
 		die("could not obtain raw diff");
 	fp = xfdopen(diff_files.out, "r");
@@ -675,7 +675,7 @@ static int run_file_diff(int prompt, const char *prefix,
 
 	child->git_cmd = 1;
 	child->dir = prefix;
-	strvec_pushv(&child->env_array, env);
+	strvec_pushv(&child->env, env);
 
 	return run_command(child);
 }
diff --git a/builtin/fast-export.c b/builtin/fast-export.c
index 1355b5a96d..e1748fb98b 100644
--- a/builtin/fast-export.c
+++ b/builtin/fast-export.c
@@ -1276,6 +1276,7 @@ int cmd_fast_export(int argc, const char **argv, const char *prefix)
 		printf("done\n");
 
 	refspec_clear(&refspecs);
+	release_revisions(&revs);
 
 	return 0;
 }
diff --git a/builtin/fast-import.c b/builtin/fast-import.c
index 28d3193c38..14113cfd82 100644
--- a/builtin/fast-import.c
+++ b/builtin/fast-import.c
@@ -3465,7 +3465,7 @@ static void git_pack_config(void)
 		pack_idx_opts.version = indexversion_value;
 		if (pack_idx_opts.version > 2)
 			git_die_config("pack.indexversion",
-					"bad pack.indexversion=%"PRIu32, pack_idx_opts.version);
+					"bad pack.indexVersion=%"PRIu32, pack_idx_opts.version);
 	}
 	if (!git_config_get_ulong("pack.packsizelimit", &packsizelimit_value))
 		max_packsize = packsizelimit_value;
diff --git a/builtin/fetch.c b/builtin/fetch.c
index e3791f09ed..ac29c2b1ae 100644
--- a/builtin/fetch.c
+++ b/builtin/fetch.c
@@ -1440,6 +1440,7 @@ static void check_not_current_branch(struct ref *ref_map,
 	const struct worktree *wt;
 	for (; ref_map; ref_map = ref_map->next)
 		if (ref_map->peer_ref &&
+		    starts_with(ref_map->peer_ref->name, "refs/heads/") &&
 		    (wt = find_shared_symref(worktrees, "HEAD",
 					     ref_map->peer_ref->name)) &&
 		    !wt->is_bare)
@@ -2187,6 +2188,10 @@ int cmd_fetch(int argc, const char **argv, const char *prefix)
 		else if (argc > 1)
 			die(_("fetch --all does not make sense with refspecs"));
 		(void) for_each_remote(get_one_remote_for_fetch, &list);
+
+		/* do not do fetch_multiple() of one */
+		if (list.nr == 1)
+			remote = remote_get(list.items[0].string);
 	} else if (argc == 0) {
 		/* No arguments -- use default remote */
 		remote = remote_get(NULL);
@@ -2261,7 +2266,17 @@ int cmd_fetch(int argc, const char **argv, const char *prefix)
 		result = fetch_multiple(&list, max_children);
 	}
 
-	if (!result && (recurse_submodules != RECURSE_SUBMODULES_OFF)) {
+
+	/*
+	 * This is only needed after fetch_one(), which does not fetch
+	 * submodules by itself.
+	 *
+	 * When we fetch from multiple remotes, fetch_multiple() has
+	 * already updated submodules to grab commits necessary for
+	 * the fetched history from each remote, so there is no need
+	 * to fetch submodules from here.
+	 */
+	if (!result && remote && (recurse_submodules != RECURSE_SUBMODULES_OFF)) {
 		struct strvec options = STRVEC_INIT;
 		int max_children = max_jobs;
 
diff --git a/builtin/fsck.c b/builtin/fsck.c
index 9e54892311..6c73092f10 100644
--- a/builtin/fsck.c
+++ b/builtin/fsck.c
@@ -19,6 +19,7 @@
 #include "decorate.h"
 #include "packfile.h"
 #include "object-store.h"
+#include "resolve-undo.h"
 #include "run-command.h"
 #include "worktree.h"
 
@@ -757,6 +758,43 @@ static int fsck_cache_tree(struct cache_tree *it)
 	return err;
 }
 
+static int fsck_resolve_undo(struct index_state *istate)
+{
+	struct string_list_item *item;
+	struct string_list *resolve_undo = istate->resolve_undo;
+
+	if (!resolve_undo)
+		return 0;
+
+	for_each_string_list_item(item, resolve_undo) {
+		const char *path = item->string;
+		struct resolve_undo_info *ru = item->util;
+		int i;
+
+		if (!ru)
+			continue;
+		for (i = 0; i < 3; i++) {
+			struct object *obj;
+
+			if (!ru->mode[i] || !S_ISREG(ru->mode[i]))
+				continue;
+
+			obj = parse_object(the_repository, &ru->oid[i]);
+			if (!obj) {
+				error(_("%s: invalid sha1 pointer in resolve-undo"),
+				      oid_to_hex(&ru->oid[i]));
+				errors_found |= ERROR_REFS;
+				continue;
+			}
+			obj->flags |= USED;
+			fsck_put_object_name(&fsck_walk_options, &ru->oid[i],
+					     ":(%d):%s", i, path);
+			mark_object_reachable(obj);
+		}
+	}
+	return 0;
+}
+
 static void mark_object_for_connectivity(const struct object_id *oid)
 {
 	struct object *obj = lookup_unknown_object(the_repository, oid);
@@ -938,6 +976,7 @@ int cmd_fsck(int argc, const char **argv, const char *prefix)
 		}
 		if (active_cache_tree)
 			fsck_cache_tree(active_cache_tree);
+		fsck_resolve_undo(&the_index);
 	}
 
 	check_connectivity();
diff --git a/builtin/fsmonitor--daemon.c b/builtin/fsmonitor--daemon.c
index 46be55a461..2c109cf8b3 100644
--- a/builtin/fsmonitor--daemon.c
+++ b/builtin/fsmonitor--daemon.c
@@ -3,6 +3,7 @@
 #include "parse-options.h"
 #include "fsmonitor.h"
 #include "fsmonitor-ipc.h"
+#include "compat/fsmonitor/fsm-health.h"
 #include "compat/fsmonitor/fsm-listen.h"
 #include "fsmonitor--daemon.h"
 #include "simple-ipc.h"
@@ -1136,6 +1137,18 @@ void fsmonitor_publish(struct fsmonitor_daemon_state *state,
 	pthread_mutex_unlock(&state->main_lock);
 }
 
+static void *fsm_health__thread_proc(void *_state)
+{
+	struct fsmonitor_daemon_state *state = _state;
+
+	trace2_thread_start("fsm-health");
+
+	fsm_health__loop(state);
+
+	trace2_thread_exit();
+	return NULL;
+}
+
 static void *fsm_listen__thread_proc(void *_state)
 {
 	struct fsmonitor_daemon_state *state = _state;
@@ -1174,6 +1187,9 @@ static int fsmonitor_run_daemon_1(struct fsmonitor_daemon_state *state)
 		 */
 		.uds_disallow_chdir = 0
 	};
+	int health_started = 0;
+	int listener_started = 0;
+	int err = 0;
 
 	/*
 	 * Start the IPC thread pool before the we've started the file
@@ -1181,11 +1197,11 @@ static int fsmonitor_run_daemon_1(struct fsmonitor_daemon_state *state)
 	 * before we need it.
 	 */
 	if (ipc_server_run_async(&state->ipc_server_data,
-				 fsmonitor_ipc__get_path(), &ipc_opts,
+				 state->path_ipc.buf, &ipc_opts,
 				 handle_client, state))
 		return error_errno(
 			_("could not start IPC thread pool on '%s'"),
-			fsmonitor_ipc__get_path());
+			state->path_ipc.buf);
 
 	/*
 	 * Start the fsmonitor listener thread to collect filesystem
@@ -1194,15 +1210,31 @@ static int fsmonitor_run_daemon_1(struct fsmonitor_daemon_state *state)
 	if (pthread_create(&state->listener_thread, NULL,
 			   fsm_listen__thread_proc, state) < 0) {
 		ipc_server_stop_async(state->ipc_server_data);
-		ipc_server_await(state->ipc_server_data);
+		err = error(_("could not start fsmonitor listener thread"));
+		goto cleanup;
+	}
+	listener_started = 1;
 
-		return error(_("could not start fsmonitor listener thread"));
+	/*
+	 * Start the health thread to watch over our process.
+	 */
+	if (pthread_create(&state->health_thread, NULL,
+			   fsm_health__thread_proc, state) < 0) {
+		ipc_server_stop_async(state->ipc_server_data);
+		err = error(_("could not start fsmonitor health thread"));
+		goto cleanup;
 	}
+	health_started = 1;
 
 	/*
 	 * The daemon is now fully functional in background threads.
+	 * Our primary thread should now just wait while the threads
+	 * do all the work.
+	 */
+cleanup:
+	/*
 	 * Wait for the IPC thread pool to shutdown (whether by client
-	 * request or from filesystem activity).
+	 * request, from filesystem activity, or an error).
 	 */
 	ipc_server_await(state->ipc_server_data);
 
@@ -1211,15 +1243,29 @@ static int fsmonitor_run_daemon_1(struct fsmonitor_daemon_state *state)
 	 * event from the IPC thread pool, but it doesn't hurt to tell
 	 * it again.  And wait for it to shutdown.
 	 */
-	fsm_listen__stop_async(state);
-	pthread_join(state->listener_thread, NULL);
+	if (listener_started) {
+		fsm_listen__stop_async(state);
+		pthread_join(state->listener_thread, NULL);
+	}
 
-	return state->error_code;
+	if (health_started) {
+		fsm_health__stop_async(state);
+		pthread_join(state->health_thread, NULL);
+	}
+
+	if (err)
+		return err;
+	if (state->listen_error_code)
+		return state->listen_error_code;
+	if (state->health_error_code)
+		return state->health_error_code;
+	return 0;
 }
 
 static int fsmonitor_run_daemon(void)
 {
 	struct fsmonitor_daemon_state state;
+	const char *home;
 	int err;
 
 	memset(&state, 0, sizeof(state));
@@ -1227,7 +1273,8 @@ static int fsmonitor_run_daemon(void)
 	hashmap_init(&state.cookies, cookies_cmp, NULL, 0);
 	pthread_mutex_init(&state.main_lock, NULL);
 	pthread_cond_init(&state.cookies_cond, NULL);
-	state.error_code = 0;
+	state.listen_error_code = 0;
+	state.health_error_code = 0;
 	state.current_token_data = fsmonitor_new_token_data();
 
 	/* Prepare to (recursively) watch the <worktree-root> directory. */
@@ -1290,6 +1337,15 @@ static int fsmonitor_run_daemon(void)
 	strbuf_addch(&state.path_cookie_prefix, '/');
 
 	/*
+	 * We create a named-pipe or unix domain socket inside of the
+	 * ".git" directory.  (Well, on Windows, we base our named
+	 * pipe in the NPFS on the absolute path of the git
+	 * directory.)
+	 */
+	strbuf_init(&state.path_ipc, 0);
+	strbuf_addstr(&state.path_ipc, absolute_path(fsmonitor_ipc__get_path()));
+
+	/*
 	 * Confirm that we can create platform-specific resources for the
 	 * filesystem listener before we bother starting all the threads.
 	 */
@@ -1298,18 +1354,42 @@ static int fsmonitor_run_daemon(void)
 		goto done;
 	}
 
+	if (fsm_health__ctor(&state)) {
+		err = error(_("could not initialize health thread"));
+		goto done;
+	}
+
+	/*
+	 * CD out of the worktree root directory.
+	 *
+	 * The common Git startup mechanism causes our CWD to be the
+	 * root of the worktree.  On Windows, this causes our process
+	 * to hold a locked handle on the CWD.  This prevents the
+	 * worktree from being moved or deleted while the daemon is
+	 * running.
+	 *
+	 * We assume that our FS and IPC listener threads have either
+	 * opened all of the handles that they need or will do
+	 * everything using absolute paths.
+	 */
+	home = getenv("HOME");
+	if (home && *home && chdir(home))
+		die_errno(_("could not cd home '%s'"), home);
+
 	err = fsmonitor_run_daemon_1(&state);
 
 done:
 	pthread_cond_destroy(&state.cookies_cond);
 	pthread_mutex_destroy(&state.main_lock);
 	fsm_listen__dtor(&state);
+	fsm_health__dtor(&state);
 
 	ipc_server_free(state.ipc_server_data);
 
 	strbuf_release(&state.path_worktree_watch);
 	strbuf_release(&state.path_gitdir_watch);
 	strbuf_release(&state.path_cookie_prefix);
+	strbuf_release(&state.path_ipc);
 
 	return err;
 }
@@ -1423,6 +1503,7 @@ static int try_to_start_background_daemon(void)
 int cmd_fsmonitor__daemon(int argc, const char **argv, const char *prefix)
 {
 	const char *subcmd;
+	enum fsmonitor_reason reason;
 	int detach_console = 0;
 
 	struct option options[] = {
@@ -1449,6 +1530,23 @@ int cmd_fsmonitor__daemon(int argc, const char **argv, const char *prefix)
 		die(_("invalid 'ipc-threads' value (%d)"),
 		    fsmonitor__ipc_threads);
 
+	prepare_repo_settings(the_repository);
+	/*
+	 * If the repo is fsmonitor-compatible, explicitly set IPC-mode
+	 * (without bothering to load the `core.fsmonitor` config settings).
+	 *
+	 * If the repo is not compatible, the repo-settings will be set to
+	 * incompatible rather than IPC, so we can use one of the __get
+	 * routines to detect the discrepancy.
+	 */
+	fsm_settings__set_ipc(the_repository);
+
+	reason = fsm_settings__get_reason(the_repository);
+	if (reason > FSMONITOR_REASON_OK)
+		die("%s",
+		    fsm_settings__get_incompatible_msg(the_repository,
+						       reason));
+
 	if (!strcmp(subcmd, "start"))
 		return !!try_to_start_background_daemon();
 
diff --git a/builtin/gc.c b/builtin/gc.c
index b335cffa33..021e9256ae 100644
--- a/builtin/gc.c
+++ b/builtin/gc.c
@@ -42,6 +42,7 @@ static const char * const builtin_gc_usage[] = {
 
 static int pack_refs = 1;
 static int prune_reflogs = 1;
+static int cruft_packs = 0;
 static int aggressive_depth = 50;
 static int aggressive_window = 250;
 static int gc_auto_threshold = 6700;
@@ -152,6 +153,7 @@ static void gc_config(void)
 	git_config_get_int("gc.auto", &gc_auto_threshold);
 	git_config_get_int("gc.autopacklimit", &gc_auto_pack_limit);
 	git_config_get_bool("gc.autodetach", &detach_auto);
+	git_config_get_bool("gc.cruftpacks", &cruft_packs);
 	git_config_get_expiry("gc.pruneexpire", &prune_expire);
 	git_config_get_expiry("gc.worktreepruneexpire", &prune_worktrees_expire);
 	git_config_get_expiry("gc.logexpiry", &gc_log_expire);
@@ -331,7 +333,11 @@ static void add_repack_all_option(struct string_list *keep_pack)
 {
 	if (prune_expire && !strcmp(prune_expire, "now"))
 		strvec_push(&repack, "-a");
-	else {
+	else if (cruft_packs) {
+		strvec_push(&repack, "--cruft");
+		if (prune_expire)
+			strvec_pushf(&repack, "--cruft-expiration=%s", prune_expire);
+	} else {
 		strvec_push(&repack, "-A");
 		if (prune_expire)
 			strvec_pushf(&repack, "--unpack-unreachable=%s", prune_expire);
@@ -446,7 +452,7 @@ static const char *lock_repo_for_gc(int force, pid_t* ret_pid)
 			fscanf(fp, scan_fmt, &pid, locking_host) == 2 &&
 			/* be gentle to concurrent "gc" on remote hosts */
 			(strcmp(locking_host, my_host) || !kill(pid, 0) || errno == EPERM);
-		if (fp != NULL)
+		if (fp)
 			fclose(fp);
 		if (should_exit) {
 			if (fd >= 0)
@@ -551,6 +557,7 @@ int cmd_gc(int argc, const char **argv, const char *prefix)
 		{ OPTION_STRING, 0, "prune", &prune_expire, N_("date"),
 			N_("prune unreferenced objects"),
 			PARSE_OPT_OPTARG, NULL, (intptr_t)prune_expire },
+		OPT_BOOL(0, "cruft", &cruft_packs, N_("pack unreferenced objects separately")),
 		OPT_BOOL(0, "aggressive", &aggressive, N_("be more thorough (increased runtime)")),
 		OPT_BOOL_F(0, "auto", &auto_gc, N_("enable auto-gc mode"),
 			   PARSE_OPT_NOCOMPLETE),
@@ -574,7 +581,7 @@ int cmd_gc(int argc, const char **argv, const char *prefix)
 	/* default expiry time, overwritten in gc_config */
 	gc_config();
 	if (parse_expiry_date(gc_log_expire, &gc_log_expire_time))
-		die(_("failed to parse gc.logexpiry value %s"), gc_log_expire);
+		die(_("failed to parse gc.logExpiry value %s"), gc_log_expire);
 
 	if (pack_refs < 0)
 		pack_refs = !is_bare_repository();
@@ -670,6 +677,7 @@ int cmd_gc(int argc, const char **argv, const char *prefix)
 			die(FAILED_RUN, repack.v[0]);
 
 		if (prune_expire) {
+			/* run `git prune` even if using cruft packs */
 			strvec_push(&prune, prune_expire);
 			if (quiet)
 				strvec_push(&prune, "--no-progress");
@@ -2238,7 +2246,7 @@ static int systemd_timer_write_unit_templates(const char *exec_path)
 		goto error;
 	}
 	file = fopen_or_warn(filename, "w");
-	if (file == NULL)
+	if (!file)
 		goto error;
 
 	unit = "# This file was created and is maintained by Git.\n"
@@ -2267,7 +2275,7 @@ static int systemd_timer_write_unit_templates(const char *exec_path)
 
 	filename = xdg_config_home_systemd("git-maintenance@.service");
 	file = fopen_or_warn(filename, "w");
-	if (file == NULL)
+	if (!file)
 		goto error;
 
 	unit = "# This file was created and is maintained by Git.\n"
diff --git a/builtin/index-pack.c b/builtin/index-pack.c
index 680b66b063..6648f2daef 100644
--- a/builtin/index-pack.c
+++ b/builtin/index-pack.c
@@ -1575,7 +1575,7 @@ static int git_index_pack_config(const char *k, const char *v, void *cb)
 	if (!strcmp(k, "pack.indexversion")) {
 		opts->version = git_config_int(k, v);
 		if (opts->version > 2)
-			die(_("bad pack.indexversion=%"PRIu32), opts->version);
+			die(_("bad pack.indexVersion=%"PRIu32), opts->version);
 		return 0;
 	}
 	if (!strcmp(k, "pack.threads")) {
@@ -1942,11 +1942,11 @@ int cmd_index_pack(int argc, const char **argv, const char *prefix)
 	free(objects);
 	strbuf_release(&index_name_buf);
 	strbuf_release(&rev_index_name_buf);
-	if (pack_name == NULL)
+	if (!pack_name)
 		free((void *) curr_pack);
-	if (index_name == NULL)
+	if (!index_name)
 		free((void *) curr_index);
-	if (rev_index_name == NULL)
+	if (!rev_index_name)
 		free((void *) curr_rev_index);
 
 	/*
diff --git a/builtin/log.c b/builtin/log.c
index 3ac479bec3..88a5e98875 100644
--- a/builtin/log.c
+++ b/builtin/log.c
@@ -231,7 +231,8 @@ static void cmd_log_init_finish(int argc, const char **argv, const char *prefix,
 	}
 
 	if (mailmap) {
-		rev->mailmap = xcalloc(1, sizeof(struct string_list));
+		rev->mailmap = xmalloc(sizeof(struct string_list));
+		string_list_init_nodup(rev->mailmap);
 		read_mailmap(rev->mailmap);
 	}
 
@@ -294,6 +295,12 @@ static void cmd_log_init(int argc, const char **argv, const char *prefix,
 	cmd_log_init_finish(argc, argv, prefix, rev, opt);
 }
 
+static int cmd_log_deinit(int ret, struct rev_info *rev)
+{
+	release_revisions(rev);
+	return ret;
+}
+
 /*
  * This gives a rough estimate for how many commits we
  * will print out in the list.
@@ -565,7 +572,7 @@ int cmd_whatchanged(int argc, const char **argv, const char *prefix)
 	cmd_log_init(argc, argv, prefix, &rev, &opt);
 	if (!rev.diffopt.output_format)
 		rev.diffopt.output_format = DIFF_FORMAT_RAW;
-	return cmd_log_walk(&rev);
+	return cmd_log_deinit(cmd_log_walk(&rev), &rev);
 }
 
 static void show_tagger(const char *buf, struct rev_info *rev)
@@ -669,6 +676,11 @@ int cmd_show(int argc, const char **argv, const char *prefix)
 	init_log_defaults();
 	git_config(git_log_config, NULL);
 
+	if (the_repository->gitdir) {
+		prepare_repo_settings(the_repository);
+		the_repository->settings.command_requires_full_index = 0;
+	}
+
 	memset(&match_all, 0, sizeof(match_all));
 	repo_init_revisions(the_repository, &rev, prefix);
 	git_config(grep_config, &rev.grep_filter);
@@ -684,7 +696,7 @@ int cmd_show(int argc, const char **argv, const char *prefix)
 	cmd_log_init(argc, argv, prefix, &rev, &opt);
 
 	if (!rev.no_walk)
-		return cmd_log_walk(&rev);
+		return cmd_log_deinit(cmd_log_walk(&rev), &rev);
 
 	count = rev.pending.nr;
 	objects = rev.pending.objects;
@@ -744,8 +756,7 @@ int cmd_show(int argc, const char **argv, const char *prefix)
 	rev.diffopt.no_free = 0;
 	diff_free(&rev.diffopt);
 
-	free(objects);
-	return ret;
+	return cmd_log_deinit(ret, &rev);
 }
 
 /*
@@ -773,7 +784,7 @@ int cmd_log_reflog(int argc, const char **argv, const char *prefix)
 	rev.always_show_header = 1;
 	cmd_log_init_finish(argc, argv, prefix, &rev, &opt);
 
-	return cmd_log_walk(&rev);
+	return cmd_log_deinit(cmd_log_walk(&rev), &rev);
 }
 
 static void log_setup_revisions_tweak(struct rev_info *rev,
@@ -804,7 +815,7 @@ int cmd_log(int argc, const char **argv, const char *prefix)
 	opt.revarg_opt = REVARG_COMMITTISH;
 	opt.tweak = log_setup_revisions_tweak;
 	cmd_log_init(argc, argv, prefix, &rev, &opt);
-	return cmd_log_walk(&rev);
+	return cmd_log_deinit(cmd_log_walk(&rev), &rev);
 }
 
 /* format-patch */
@@ -1025,7 +1036,7 @@ static int open_next_file(struct commit *commit, const char *subject,
 	if (!quiet)
 		printf("%s\n", filename.buf + outdir_offset);
 
-	if ((rev->diffopt.file = fopen(filename.buf, "w")) == NULL) {
+	if (!(rev->diffopt.file = fopen(filename.buf, "w"))) {
 		error_errno(_("cannot open patch file %s"), filename.buf);
 		strbuf_release(&filename);
 		return -1;
@@ -1759,6 +1770,7 @@ int cmd_format_patch(int argc, const char **argv, const char *prefix)
 	struct commit *commit;
 	struct commit **list = NULL;
 	struct rev_info rev;
+	char *to_free = NULL;
 	struct setup_revision_opt s_r_opt;
 	int nr = 0, total, i;
 	int use_stdout = 0;
@@ -1960,7 +1972,7 @@ int cmd_format_patch(int argc, const char **argv, const char *prefix)
 		strbuf_addch(&buf, '\n');
 	}
 
-	rev.extra_headers = strbuf_detach(&buf, NULL);
+	rev.extra_headers = to_free = strbuf_detach(&buf, NULL);
 
 	if (from) {
 		if (split_ident_line(&rev.from_ident, from, strlen(from)))
@@ -2181,8 +2193,10 @@ int cmd_format_patch(int argc, const char **argv, const char *prefix)
 		prepare_bases(&bases, base, list, nr);
 	}
 
-	if (in_reply_to || thread || cover_letter)
-		rev.ref_message_ids = xcalloc(1, sizeof(struct string_list));
+	if (in_reply_to || thread || cover_letter) {
+		rev.ref_message_ids = xmalloc(sizeof(*rev.ref_message_ids));
+		string_list_init_nodup(rev.ref_message_ids);
+	}
 	if (in_reply_to) {
 		const char *msgid = clean_message_id(in_reply_to);
 		string_list_append(rev.ref_message_ids, msgid);
@@ -2289,8 +2303,11 @@ done:
 	strbuf_release(&rdiff1);
 	strbuf_release(&rdiff2);
 	strbuf_release(&rdiff_title);
-	UNLEAK(rev);
-	return 0;
+	free(to_free);
+	if (rev.ref_message_ids)
+		string_list_clear(rev.ref_message_ids, 0);
+	free(rev.ref_message_ids);
+	return cmd_log_deinit(0, &rev);
 }
 
 static int add_pending_commit(const char *arg, struct rev_info *revs, int flags)
diff --git a/builtin/ls-remote.c b/builtin/ls-remote.c
index d856085e94..df44e5cc0d 100644
--- a/builtin/ls-remote.c
+++ b/builtin/ls-remote.c
@@ -114,7 +114,7 @@ int cmd_ls_remote(int argc, const char **argv, const char *prefix)
 	}
 
 	transport = transport_get(remote, NULL);
-	if (uploadpack != NULL)
+	if (uploadpack)
 		transport_set_option(transport, TRANS_OPT_UPLOADPACK, uploadpack);
 	if (server_options.nr)
 		transport->server_options = &server_options;
diff --git a/builtin/mailsplit.c b/builtin/mailsplit.c
index 30952353a3..73509f651b 100644
--- a/builtin/mailsplit.c
+++ b/builtin/mailsplit.c
@@ -120,7 +120,7 @@ static int populate_maildir_list(struct string_list *list, const char *path)
 	for (sub = subs; *sub; ++sub) {
 		free(name);
 		name = xstrfmt("%s/%s", path, *sub);
-		if ((dir = opendir(name)) == NULL) {
+		if (!(dir = opendir(name))) {
 			if (errno == ENOENT)
 				continue;
 			error_errno("cannot opendir %s", name);
diff --git a/builtin/merge.c b/builtin/merge.c
index f178f5a3ee..fcd87a2a09 100644
--- a/builtin/merge.c
+++ b/builtin/merge.c
@@ -443,6 +443,7 @@ static void squash_message(struct commit *commit, struct commit_list *remotehead
 	}
 	write_file_buf(git_path_squash_msg(the_repository), out.buf, out.len);
 	strbuf_release(&out);
+	release_revisions(&rev);
 }
 
 static void finish(struct commit *head_commit,
@@ -492,7 +493,8 @@ static void finish(struct commit *head_commit,
 	/* Run a post-merge hook */
 	run_hooks_l("post-merge", squash ? "1" : "0", NULL);
 
-	apply_autostash(git_path_merge_autostash(the_repository));
+	if (new_head)
+		apply_autostash(git_path_merge_autostash(the_repository));
 	strbuf_release(&reflog_message);
 }
 
@@ -998,6 +1000,7 @@ static int evaluate_result(void)
 	 */
 	cnt += count_unmerged_entries();
 
+	release_revisions(&rev);
 	return cnt;
 }
 
@@ -1754,6 +1757,8 @@ int cmd_merge(int argc, const char **argv, const char *prefix)
 			"stopped before committing as requested\n"));
 	else
 		ret = suggest_conflicts();
+	if (autostash)
+		printf(_("When finished, apply stashed changes with `git stash pop`\n"));
 
 done:
 	if (!automerge_was_ok) {
diff --git a/builtin/mktree.c b/builtin/mktree.c
index 902edba6d2..06d81400f5 100644
--- a/builtin/mktree.c
+++ b/builtin/mktree.c
@@ -74,6 +74,7 @@ static void mktree_line(char *buf, int nul_term_line, int allow_missing)
 	unsigned mode;
 	enum object_type mode_type; /* object type derived from mode */
 	enum object_type obj_type; /* object type derived from sha */
+	struct object_info oi = OBJECT_INFO_INIT;
 	char *path, *to_free = NULL;
 	struct object_id oid;
 
@@ -116,8 +117,14 @@ static void mktree_line(char *buf, int nul_term_line, int allow_missing)
 			path, ptr, type_name(mode_type));
 	}
 
-	/* Check the type of object identified by sha1 */
-	obj_type = oid_object_info(the_repository, &oid, NULL);
+	/* Check the type of object identified by oid without fetching objects */
+	oi.typep = &obj_type;
+	if (oid_object_info_extended(the_repository, &oid, &oi,
+				     OBJECT_INFO_LOOKUP_REPLACE |
+				     OBJECT_INFO_QUICK |
+				     OBJECT_INFO_SKIP_FETCH_OBJECT) < 0)
+		obj_type = -1;
+
 	if (obj_type < 0) {
 		if (allow_missing) {
 			; /* no problem - missing objects are presumed to be of the right type */
diff --git a/builtin/name-rev.c b/builtin/name-rev.c
index 02ea9d1633..580b1eb170 100644
--- a/builtin/name-rev.c
+++ b/builtin/name-rev.c
@@ -577,7 +577,7 @@ int cmd_name_rev(int argc, const char **argv, const char *prefix)
 				   N_("ignore refs matching <pattern>")),
 		OPT_GROUP(""),
 		OPT_BOOL(0, "all", &all, N_("list all commits reachable from all refs")),
-		OPT_BOOL(0, "stdin", &transform_stdin, N_("deprecated: use annotate-stdin instead")),
+		OPT_BOOL(0, "stdin", &transform_stdin, N_("deprecated: use --annotate-stdin instead")),
 		OPT_BOOL(0, "annotate-stdin", &annotate_stdin, N_("annotate text from stdin")),
 		OPT_BOOL(0, "undefined", &allow_undefined, N_("allow to print `undefined` names (default)")),
 		OPT_BOOL(0, "always",     &always,
diff --git a/builtin/pack-objects.c b/builtin/pack-objects.c
index 014dcd4bc9..39e28cfcaf 100644
--- a/builtin/pack-objects.c
+++ b/builtin/pack-objects.c
@@ -36,6 +36,7 @@
 #include "trace2.h"
 #include "shallow.h"
 #include "promisor-remote.h"
+#include "pack-mtimes.h"
 
 /*
  * Objects we are going to pack are collected in the `to_pack` structure.
@@ -194,6 +195,8 @@ static int reuse_delta = 1, reuse_object = 1;
 static int keep_unreachable, unpack_unreachable, include_tag;
 static timestamp_t unpack_unreachable_expiration;
 static int pack_loose_unreachable;
+static int cruft;
+static timestamp_t cruft_expiration;
 static int local;
 static int have_non_local_packs;
 static int incremental;
@@ -1260,9 +1263,13 @@ static void write_pack_file(void)
 					&to_pack, written_list, nr_written);
 			}
 
+			if (cruft)
+				pack_idx_opts.flags |= WRITE_MTIMES;
+
 			stage_tmp_packfiles(&tmpname, pack_tmp_name,
 					    written_list, nr_written,
-					    &pack_idx_opts, hash, &idx_tmp_name);
+					    &to_pack, &pack_idx_opts, hash,
+					    &idx_tmp_name);
 
 			if (write_bitmap_index) {
 				size_t tmpname_len = tmpname.len;
@@ -1357,6 +1364,9 @@ static int want_found_object(const struct object_id *oid, int exclude,
 	if (incremental)
 		return 0;
 
+	if (!is_pack_valid(p))
+		return -1;
+
 	/*
 	 * When asked to do --local (do not include an object that appears in a
 	 * pack we borrow from elsewhere) or --honor-pack-keep (do not include
@@ -1472,6 +1482,9 @@ static int want_object_in_pack(const struct object_id *oid,
 		want = want_found_object(oid, exclude, *found_pack);
 		if (want != -1)
 			return want;
+
+		*found_pack = NULL;
+		*found_offset = 0;
 	}
 
 	for (m = get_multi_pack_index(the_repository); m; m = m->next) {
@@ -1515,13 +1528,13 @@ static int want_object_in_pack(const struct object_id *oid,
 	return 1;
 }
 
-static void create_object_entry(const struct object_id *oid,
-				enum object_type type,
-				uint32_t hash,
-				int exclude,
-				int no_try_delta,
-				struct packed_git *found_pack,
-				off_t found_offset)
+static struct object_entry *create_object_entry(const struct object_id *oid,
+						enum object_type type,
+						uint32_t hash,
+						int exclude,
+						int no_try_delta,
+						struct packed_git *found_pack,
+						off_t found_offset)
 {
 	struct object_entry *entry;
 
@@ -1538,6 +1551,8 @@ static void create_object_entry(const struct object_id *oid,
 	}
 
 	entry->no_try_delta = no_try_delta;
+
+	return entry;
 }
 
 static const char no_closure_warning[] = N_(
@@ -3155,7 +3170,7 @@ static int git_pack_config(const char *k, const char *v, void *cb)
 	if (!strcmp(k, "pack.indexversion")) {
 		pack_idx_opts.version = git_config_int(k, v);
 		if (pack_idx_opts.version > 2)
-			die(_("bad pack.indexversion=%"PRIu32),
+			die(_("bad pack.indexVersion=%"PRIu32),
 			    pack_idx_opts.version);
 		return 0;
 	}
@@ -3201,10 +3216,8 @@ static int add_object_entry_from_pack(const struct object_id *oid,
 				      uint32_t pos,
 				      void *_data)
 {
-	struct rev_info *revs = _data;
-	struct object_info oi = OBJECT_INFO_INIT;
 	off_t ofs;
-	enum object_type type;
+	enum object_type type = OBJ_NONE;
 
 	display_progress(progress_state, ++nr_seen);
 
@@ -3215,19 +3228,24 @@ static int add_object_entry_from_pack(const struct object_id *oid,
 	if (!want_object_in_pack(oid, 0, &p, &ofs))
 		return 0;
 
-	oi.typep = &type;
-	if (packed_object_info(the_repository, p, ofs, &oi) < 0)
-		die(_("could not get type of object %s in pack %s"),
-		    oid_to_hex(oid), p->pack_name);
-	else if (type == OBJ_COMMIT) {
-		/*
-		 * commits in included packs are used as starting points for the
-		 * subsequent revision walk
-		 */
-		add_pending_oid(revs, NULL, oid, 0);
-	}
+	if (p) {
+		struct rev_info *revs = _data;
+		struct object_info oi = OBJECT_INFO_INIT;
 
-	stdin_packs_found_nr++;
+		oi.typep = &type;
+		if (packed_object_info(the_repository, p, ofs, &oi) < 0) {
+			die(_("could not get type of object %s in pack %s"),
+			    oid_to_hex(oid), p->pack_name);
+		} else if (type == OBJ_COMMIT) {
+			/*
+			 * commits in included packs are used as starting points for the
+			 * subsequent revision walk
+			 */
+			add_pending_oid(revs, NULL, oid, 0);
+		}
+
+		stdin_packs_found_nr++;
+	}
 
 	create_object_entry(oid, type, 0, 0, 0, p, ofs);
 
@@ -3346,6 +3364,8 @@ static void read_packs_list_from_stdin(void)
 		struct packed_git *p = item->util;
 		if (!p)
 			die(_("could not find pack '%s'"), item->string);
+		if (!is_pack_valid(p))
+			die(_("packfile %s cannot be accessed"), p->pack_name);
 	}
 
 	/*
@@ -3369,8 +3389,6 @@ static void read_packs_list_from_stdin(void)
 
 	for_each_string_list_item(item, &include_packs) {
 		struct packed_git *p = item->util;
-		if (!p)
-			die(_("could not find pack '%s'"), item->string);
 		for_each_object_in_pack(p,
 					add_object_entry_from_pack,
 					&revs,
@@ -3394,6 +3412,217 @@ static void read_packs_list_from_stdin(void)
 	string_list_clear(&exclude_packs, 0);
 }
 
+static void add_cruft_object_entry(const struct object_id *oid, enum object_type type,
+				   struct packed_git *pack, off_t offset,
+				   const char *name, uint32_t mtime)
+{
+	struct object_entry *entry;
+
+	display_progress(progress_state, ++nr_seen);
+
+	entry = packlist_find(&to_pack, oid);
+	if (entry) {
+		if (name) {
+			entry->hash = pack_name_hash(name);
+			entry->no_try_delta = no_try_delta(name);
+		}
+	} else {
+		if (!want_object_in_pack(oid, 0, &pack, &offset))
+			return;
+		if (!pack && type == OBJ_BLOB && !has_loose_object(oid)) {
+			/*
+			 * If a traversed tree has a missing blob then we want
+			 * to avoid adding that missing object to our pack.
+			 *
+			 * This only applies to missing blobs, not trees,
+			 * because the traversal needs to parse sub-trees but
+			 * not blobs.
+			 *
+			 * Note we only perform this check when we couldn't
+			 * already find the object in a pack, so we're really
+			 * limited to "ensure non-tip blobs which don't exist in
+			 * packs do exist via loose objects". Confused?
+			 */
+			return;
+		}
+
+		entry = create_object_entry(oid, type, pack_name_hash(name),
+					    0, name && no_try_delta(name),
+					    pack, offset);
+	}
+
+	if (mtime > oe_cruft_mtime(&to_pack, entry))
+		oe_set_cruft_mtime(&to_pack, entry, mtime);
+	return;
+}
+
+static void show_cruft_object(struct object *obj, const char *name, void *data)
+{
+	/*
+	 * if we did not record it earlier, it's at least as old as our
+	 * expiration value. Rather than find it exactly, just use that
+	 * value.  This may bump it forward from its real mtime, but it
+	 * will still be "too old" next time we run with the same
+	 * expiration.
+	 *
+	 * if obj does appear in the packing list, this call is a noop (or may
+	 * set the namehash).
+	 */
+	add_cruft_object_entry(&obj->oid, obj->type, NULL, 0, name, cruft_expiration);
+}
+
+static void show_cruft_commit(struct commit *commit, void *data)
+{
+	show_cruft_object((struct object*)commit, NULL, data);
+}
+
+static int cruft_include_check_obj(struct object *obj, void *data)
+{
+	return !has_object_kept_pack(&obj->oid, IN_CORE_KEEP_PACKS);
+}
+
+static int cruft_include_check(struct commit *commit, void *data)
+{
+	return cruft_include_check_obj((struct object*)commit, data);
+}
+
+static void set_cruft_mtime(const struct object *object,
+			    struct packed_git *pack,
+			    off_t offset, time_t mtime)
+{
+	add_cruft_object_entry(&object->oid, object->type, pack, offset, NULL,
+			       mtime);
+}
+
+static void mark_pack_kept_in_core(struct string_list *packs, unsigned keep)
+{
+	struct string_list_item *item = NULL;
+	for_each_string_list_item(item, packs) {
+		struct packed_git *p = item->util;
+		if (!p)
+			die(_("could not find pack '%s'"), item->string);
+		p->pack_keep_in_core = keep;
+	}
+}
+
+static void add_unreachable_loose_objects(void);
+static void add_objects_in_unpacked_packs(void);
+
+static void enumerate_cruft_objects(void)
+{
+	if (progress)
+		progress_state = start_progress(_("Enumerating cruft objects"), 0);
+
+	add_objects_in_unpacked_packs();
+	add_unreachable_loose_objects();
+
+	stop_progress(&progress_state);
+}
+
+static void enumerate_and_traverse_cruft_objects(struct string_list *fresh_packs)
+{
+	struct packed_git *p;
+	struct rev_info revs;
+	int ret;
+
+	repo_init_revisions(the_repository, &revs, NULL);
+
+	revs.tag_objects = 1;
+	revs.tree_objects = 1;
+	revs.blob_objects = 1;
+
+	revs.include_check = cruft_include_check;
+	revs.include_check_obj = cruft_include_check_obj;
+
+	revs.ignore_missing_links = 1;
+
+	if (progress)
+		progress_state = start_progress(_("Enumerating cruft objects"), 0);
+	ret = add_unseen_recent_objects_to_traversal(&revs, cruft_expiration,
+						     set_cruft_mtime, 1);
+	stop_progress(&progress_state);
+
+	if (ret)
+		die(_("unable to add cruft objects"));
+
+	/*
+	 * Re-mark only the fresh packs as kept so that objects in
+	 * unknown packs do not halt the reachability traversal early.
+	 */
+	for (p = get_all_packs(the_repository); p; p = p->next)
+		p->pack_keep_in_core = 0;
+	mark_pack_kept_in_core(fresh_packs, 1);
+
+	if (prepare_revision_walk(&revs))
+		die(_("revision walk setup failed"));
+	if (progress)
+		progress_state = start_progress(_("Traversing cruft objects"), 0);
+	nr_seen = 0;
+	traverse_commit_list(&revs, show_cruft_commit, show_cruft_object, NULL);
+
+	stop_progress(&progress_state);
+}
+
+static void read_cruft_objects(void)
+{
+	struct strbuf buf = STRBUF_INIT;
+	struct string_list discard_packs = STRING_LIST_INIT_DUP;
+	struct string_list fresh_packs = STRING_LIST_INIT_DUP;
+	struct packed_git *p;
+
+	ignore_packed_keep_in_core = 1;
+
+	while (strbuf_getline(&buf, stdin) != EOF) {
+		if (!buf.len)
+			continue;
+
+		if (*buf.buf == '-')
+			string_list_append(&discard_packs, buf.buf + 1);
+		else
+			string_list_append(&fresh_packs, buf.buf);
+		strbuf_reset(&buf);
+	}
+
+	string_list_sort(&discard_packs);
+	string_list_sort(&fresh_packs);
+
+	for (p = get_all_packs(the_repository); p; p = p->next) {
+		const char *pack_name = pack_basename(p);
+		struct string_list_item *item;
+
+		item = string_list_lookup(&fresh_packs, pack_name);
+		if (!item)
+			item = string_list_lookup(&discard_packs, pack_name);
+
+		if (item) {
+			item->util = p;
+		} else {
+			/*
+			 * This pack wasn't mentioned in either the "fresh" or
+			 * "discard" list, so the caller didn't know about it.
+			 *
+			 * Mark it as kept so that its objects are ignored by
+			 * add_unseen_recent_objects_to_traversal(). We'll
+			 * unmark it before starting the traversal so it doesn't
+			 * halt the traversal early.
+			 */
+			p->pack_keep_in_core = 1;
+		}
+	}
+
+	mark_pack_kept_in_core(&fresh_packs, 1);
+	mark_pack_kept_in_core(&discard_packs, 0);
+
+	if (cruft_expiration)
+		enumerate_and_traverse_cruft_objects(&fresh_packs);
+	else
+		enumerate_cruft_objects();
+
+	strbuf_release(&buf);
+	string_list_clear(&discard_packs, 0);
+	string_list_clear(&fresh_packs, 0);
+}
+
 static void read_object_list_from_stdin(void)
 {
 	char line[GIT_MAX_HEXSZ + 1 + PATH_MAX + 2];
@@ -3526,7 +3755,24 @@ static int add_object_in_unpacked_pack(const struct object_id *oid,
 				       uint32_t pos,
 				       void *_data)
 {
-	add_object_entry(oid, OBJ_NONE, "", 0);
+	if (cruft) {
+		off_t offset;
+		time_t mtime;
+
+		if (pack->is_cruft) {
+			if (load_pack_mtimes(pack) < 0)
+				die(_("could not load cruft pack .mtimes"));
+			mtime = nth_packed_mtime(pack, pos);
+		} else {
+			mtime = pack->mtime;
+		}
+		offset = nth_packed_object_offset(pack, pos);
+
+		add_cruft_object_entry(oid, OBJ_NONE, pack, offset,
+				       NULL, mtime);
+	} else {
+		add_object_entry(oid, OBJ_NONE, "", 0);
+	}
 	return 0;
 }
 
@@ -3550,7 +3796,19 @@ static int add_loose_object(const struct object_id *oid, const char *path,
 		return 0;
 	}
 
-	add_object_entry(oid, type, "", 0);
+	if (cruft) {
+		struct stat st;
+		if (stat(path, &st) < 0) {
+			if (errno == ENOENT)
+				return 0;
+			return error_errno("unable to stat %s", oid_to_hex(oid));
+		}
+
+		add_cruft_object_entry(oid, type, NULL, 0, NULL,
+				       st.st_mtime);
+	} else {
+		add_object_entry(oid, type, "", 0);
+	}
 	return 0;
 }
 
@@ -3790,7 +4048,7 @@ static void get_object_list(struct rev_info *revs, int ac, const char **av)
 	if (unpack_unreachable_expiration) {
 		revs->ignore_missing_links = 1;
 		if (add_unseen_recent_objects_to_traversal(revs,
-				unpack_unreachable_expiration))
+				unpack_unreachable_expiration, NULL, 0))
 			die(_("unable to add recent objects"));
 		if (prepare_revision_walk(revs))
 			die(_("revision walk setup failed"));
@@ -3867,6 +4125,20 @@ static int option_parse_unpack_unreachable(const struct option *opt,
 	return 0;
 }
 
+static int option_parse_cruft_expiration(const struct option *opt,
+					 const char *arg, int unset)
+{
+	if (unset) {
+		cruft = 0;
+		cruft_expiration = 0;
+	} else {
+		cruft = 1;
+		if (arg)
+			cruft_expiration = approxidate(arg);
+	}
+	return 0;
+}
+
 struct po_filter_data {
 	unsigned have_revs:1;
 	struct rev_info revs;
@@ -3956,6 +4228,10 @@ int cmd_pack_objects(int argc, const char **argv, const char *prefix)
 		OPT_CALLBACK_F(0, "unpack-unreachable", NULL, N_("time"),
 		  N_("unpack unreachable objects newer than <time>"),
 		  PARSE_OPT_OPTARG, option_parse_unpack_unreachable),
+		OPT_BOOL(0, "cruft", &cruft, N_("create a cruft pack")),
+		OPT_CALLBACK_F(0, "cruft-expiration", NULL, N_("time"),
+		  N_("expire cruft objects older than <time>"),
+		  PARSE_OPT_OPTARG, option_parse_cruft_expiration),
 		OPT_BOOL(0, "sparse", &sparse,
 			 N_("use the sparse reachability algorithm")),
 		OPT_BOOL(0, "thin", &thin,
@@ -4082,7 +4358,7 @@ int cmd_pack_objects(int argc, const char **argv, const char *prefix)
 
 	if (!HAVE_THREADS && delta_search_threads != 1)
 		warning(_("no threads support, ignoring --threads"));
-	if (!pack_to_stdout && !pack_size_limit)
+	if (!pack_to_stdout && !pack_size_limit && !cruft)
 		pack_size_limit = pack_size_limit_cfg;
 	if (pack_to_stdout && pack_size_limit)
 		die(_("--max-pack-size cannot be used to build a pack for transfer"));
@@ -4109,6 +4385,15 @@ int cmd_pack_objects(int argc, const char **argv, const char *prefix)
 	if (stdin_packs && use_internal_rev_list)
 		die(_("cannot use internal rev list with --stdin-packs"));
 
+	if (cruft) {
+		if (use_internal_rev_list)
+			die(_("cannot use internal rev list with --cruft"));
+		if (stdin_packs)
+			die(_("cannot use --stdin-packs with --cruft"));
+		if (pack_size_limit)
+			die(_("cannot use --max-pack-size with --cruft"));
+	}
+
 	/*
 	 * "soft" reasons not to use bitmaps - for on-disk repack by default we want
 	 *
@@ -4165,7 +4450,7 @@ int cmd_pack_objects(int argc, const char **argv, const char *prefix)
 			    the_repository);
 	prepare_packing_data(the_repository, &to_pack);
 
-	if (progress)
+	if (progress && !cruft)
 		progress_state = start_progress(_("Enumerating objects"), 0);
 	if (stdin_packs) {
 		/* avoids adding objects in excluded packs */
@@ -4173,15 +4458,19 @@ int cmd_pack_objects(int argc, const char **argv, const char *prefix)
 		read_packs_list_from_stdin();
 		if (rev_list_unpacked)
 			add_unreachable_loose_objects();
+	} else if (cruft) {
+		read_cruft_objects();
 	} else if (!use_internal_rev_list) {
 		read_object_list_from_stdin();
 	} else if (pfd.have_revs) {
 		get_object_list(&pfd.revs, rp.nr, rp.v);
+		release_revisions(&pfd.revs);
 	} else {
 		struct rev_info revs;
 
 		repo_init_revisions(the_repository, &revs, NULL);
 		get_object_list(&revs, rp.nr, rp.v);
+		release_revisions(&revs);
 	}
 	cleanup_preferred_base();
 	if (include_tag && nr_result)
diff --git a/builtin/pack-redundant.c b/builtin/pack-redundant.c
index 8bf5c0acad..ed9b9013a5 100644
--- a/builtin/pack-redundant.c
+++ b/builtin/pack-redundant.c
@@ -101,7 +101,7 @@ static inline struct llist_item *llist_insert(struct llist *list,
 	oidread(&new_item->oid, oid);
 	new_item->next = NULL;
 
-	if (after != NULL) {
+	if (after) {
 		new_item->next = after->next;
 		after->next = new_item;
 		if (after == list->back)
@@ -157,7 +157,7 @@ redo_from_start:
 		if (cmp > 0) /* not in list, since sorted */
 			return prev;
 		if (!cmp) { /* found */
-			if (prev == NULL) {
+			if (!prev) {
 				if (hint != NULL && hint != list->front) {
 					/* we don't know the previous element */
 					hint = NULL;
@@ -219,7 +219,7 @@ static struct pack_list * pack_list_difference(const struct pack_list *A,
 	struct pack_list *ret;
 	const struct pack_list *pl;
 
-	if (A == NULL)
+	if (!A)
 		return NULL;
 
 	pl = B;
@@ -317,7 +317,7 @@ static size_t get_pack_redundancy(struct pack_list *pl)
 	struct pack_list *subset;
 	size_t ret = 0;
 
-	if (pl == NULL)
+	if (!pl)
 		return 0;
 
 	while ((subset = pl->next)) {
@@ -611,7 +611,7 @@ int cmd_pack_redundant(int argc, const char **argv, const char *prefix)
 		while (*(argv + i) != NULL)
 			add_pack_file(*(argv + i++));
 
-	if (local_packs == NULL)
+	if (!local_packs)
 		die("Zero packs found!");
 
 	load_all_objects();
diff --git a/builtin/prune.c b/builtin/prune.c
index c2bcdc07db..df376b2ed1 100644
--- a/builtin/prune.c
+++ b/builtin/prune.c
@@ -196,5 +196,6 @@ int cmd_prune(int argc, const char **argv, const char *prefix)
 		prune_shallow(show_only ? PRUNE_SHOW_ONLY : 0);
 	}
 
+	release_revisions(&revs);
 	return 0;
 }
diff --git a/builtin/pull.c b/builtin/pull.c
index 4d667abc19..01155ba67b 100644
--- a/builtin/pull.c
+++ b/builtin/pull.c
@@ -72,6 +72,7 @@ static const char * const pull_usage[] = {
 static int opt_verbosity;
 static char *opt_progress;
 static int recurse_submodules = RECURSE_SUBMODULES_DEFAULT;
+static int recurse_submodules_cli = RECURSE_SUBMODULES_DEFAULT;
 
 /* Options passed to git-merge or git-rebase */
 static enum rebase_type opt_rebase = -1;
@@ -120,7 +121,7 @@ static struct option pull_options[] = {
 		N_("force progress reporting"),
 		PARSE_OPT_NOARG),
 	OPT_CALLBACK_F(0, "recurse-submodules",
-		   &recurse_submodules, N_("on-demand"),
+		   &recurse_submodules_cli, N_("on-demand"),
 		   N_("control for recursive fetching of submodules"),
 		   PARSE_OPT_OPTARG, option_fetch_parse_recurse_submodules),
 
@@ -536,8 +537,8 @@ static int run_fetch(const char *repo, const char **refspecs)
 		strvec_push(&args, opt_tags);
 	if (opt_prune)
 		strvec_push(&args, opt_prune);
-	if (recurse_submodules != RECURSE_SUBMODULES_DEFAULT)
-		switch (recurse_submodules) {
+	if (recurse_submodules_cli != RECURSE_SUBMODULES_DEFAULT)
+		switch (recurse_submodules_cli) {
 		case RECURSE_SUBMODULES_ON:
 			strvec_push(&args, "--recurse-submodules=on");
 			break;
@@ -1001,6 +1002,9 @@ int cmd_pull(int argc, const char **argv, const char *prefix)
 
 	argc = parse_options(argc, argv, prefix, pull_options, pull_usage, 0);
 
+	if (recurse_submodules_cli != RECURSE_SUBMODULES_DEFAULT)
+		recurse_submodules = recurse_submodules_cli;
+
 	if (cleanup_arg)
 		/*
 		 * this only checks the validity of cleanup_arg; we don't need
diff --git a/builtin/push.c b/builtin/push.c
index cad997965a..df0d68e599 100644
--- a/builtin/push.c
+++ b/builtin/push.c
@@ -2,6 +2,7 @@
  * "git push"
  */
 #include "cache.h"
+#include "branch.h"
 #include "config.h"
 #include "refs.h"
 #include "refspec.h"
@@ -151,7 +152,8 @@ static NORETURN void die_push_simple(struct branch *branch,
 	 * upstream to a non-branch, we should probably be showing
 	 * them the big ugly fully qualified ref.
 	 */
-	const char *advice_maybe = "";
+	const char *advice_pushdefault_maybe = "";
+	const char *advice_automergesimple_maybe = "";
 	const char *short_upstream = branch->merge[0]->src;
 
 	skip_prefix(short_upstream, "refs/heads/", &short_upstream);
@@ -161,9 +163,16 @@ static NORETURN void die_push_simple(struct branch *branch,
 	 * push.default.
 	 */
 	if (push_default == PUSH_DEFAULT_UNSPECIFIED)
-		advice_maybe = _("\n"
+		advice_pushdefault_maybe = _("\n"
 				 "To choose either option permanently, "
-				 "see push.default in 'git help config'.");
+				 "see push.default in 'git help config'.\n");
+	if (git_branch_track != BRANCH_TRACK_SIMPLE)
+		advice_automergesimple_maybe = _("\n"
+				 "To avoid automatically configuring "
+				 "upstream branches when their name\n"
+				 "doesn't match the local branch, see option "
+				 "'simple' of branch.autoSetupMerge\n"
+				 "in 'git help config'.\n");
 	die(_("The upstream branch of your current branch does not match\n"
 	      "the name of your current branch.  To push to the upstream branch\n"
 	      "on the remote, use\n"
@@ -173,9 +182,10 @@ static NORETURN void die_push_simple(struct branch *branch,
 	      "To push to the branch of the same name on the remote, use\n"
 	      "\n"
 	      "    git push %s HEAD\n"
-	      "%s"),
+	      "%s%s"),
 	    remote->name, short_upstream,
-	    remote->name, advice_maybe);
+	    remote->name, advice_pushdefault_maybe,
+	    advice_automergesimple_maybe);
 }
 
 static const char message_detached_head_die[] =
@@ -185,16 +195,32 @@ static const char message_detached_head_die[] =
 	   "\n"
 	   "    git push %s HEAD:<name-of-remote-branch>\n");
 
-static const char *get_upstream_ref(struct branch *branch, const char *remote_name)
+static const char *get_upstream_ref(int flags, struct branch *branch, const char *remote_name)
 {
-	if (!branch->merge_nr || !branch->merge || !branch->remote_name)
+	if (branch->merge_nr == 0 && (flags & TRANSPORT_PUSH_AUTO_UPSTREAM)) {
+		/* if missing, assume same; set_upstream will be defined later */
+		return branch->refname;
+	}
+
+	if (!branch->merge_nr || !branch->merge || !branch->remote_name) {
+		const char *advice_autosetup_maybe = "";
+		if (!(flags & TRANSPORT_PUSH_AUTO_UPSTREAM)) {
+			advice_autosetup_maybe = _("\n"
+					   "To have this happen automatically for "
+					   "branches without a tracking\n"
+					   "upstream, see 'push.autoSetupRemote' "
+					   "in 'git help config'.\n");
+		}
 		die(_("The current branch %s has no upstream branch.\n"
 		    "To push the current branch and set the remote as upstream, use\n"
 		    "\n"
-		    "    git push --set-upstream %s %s\n"),
+		    "    git push --set-upstream %s %s\n"
+		    "%s"),
 		    branch->name,
 		    remote_name,
-		    branch->name);
+		    branch->name,
+		    advice_autosetup_maybe);
+	}
 	if (branch->merge_nr != 1)
 		die(_("The current branch %s has multiple upstream branches, "
 		    "refusing to push."), branch->name);
@@ -202,7 +228,7 @@ static const char *get_upstream_ref(struct branch *branch, const char *remote_na
 	return branch->merge[0]->src;
 }
 
-static void setup_default_push_refspecs(struct remote *remote)
+static void setup_default_push_refspecs(int *flags, struct remote *remote)
 {
 	struct branch *branch;
 	const char *dst;
@@ -234,7 +260,7 @@ static void setup_default_push_refspecs(struct remote *remote)
 	case PUSH_DEFAULT_SIMPLE:
 		if (!same_remote)
 			break;
-		if (strcmp(branch->refname, get_upstream_ref(branch, remote->name)))
+		if (strcmp(branch->refname, get_upstream_ref(*flags, branch, remote->name)))
 			die_push_simple(branch, remote);
 		break;
 
@@ -244,13 +270,21 @@ static void setup_default_push_refspecs(struct remote *remote)
 			      "your current branch '%s', without telling me what to push\n"
 			      "to update which remote branch."),
 			    remote->name, branch->name);
-		dst = get_upstream_ref(branch, remote->name);
+		dst = get_upstream_ref(*flags, branch, remote->name);
 		break;
 
 	case PUSH_DEFAULT_CURRENT:
 		break;
 	}
 
+	/*
+	 * this is a default push - if auto-upstream is enabled and there is
+	 * no upstream defined, then set it (with options 'simple', 'upstream',
+	 * and 'current').
+	 */
+	if ((*flags & TRANSPORT_PUSH_AUTO_UPSTREAM) && branch->merge_nr == 0)
+		*flags |= TRANSPORT_PUSH_SET_UPSTREAM;
+
 	refspec_appendf(&rs, "%s:%s", branch->refname, dst);
 }
 
@@ -401,7 +435,7 @@ static int do_push(int flags,
 		if (remote->push.nr) {
 			push_refspec = &remote->push;
 		} else if (!(flags & TRANSPORT_PUSH_MIRROR))
-			setup_default_push_refspecs(remote);
+			setup_default_push_refspecs(&flags, remote);
 	}
 	errs = 0;
 	url_nr = push_url_of_remote(remote, &url);
@@ -472,6 +506,10 @@ static int git_push_config(const char *k, const char *v, void *cb)
 		else
 			*flags &= ~TRANSPORT_PUSH_FOLLOW_TAGS;
 		return 0;
+	} else if (!strcmp(k, "push.autosetupremote")) {
+		if (git_config_bool(k, v))
+			*flags |= TRANSPORT_PUSH_AUTO_UPSTREAM;
+		return 0;
 	} else if (!strcmp(k, "push.gpgsign")) {
 		const char *value;
 		if (!git_config_get_value("push.gpgsign", &value)) {
diff --git a/builtin/rebase.c b/builtin/rebase.c
index 7f3bffc0a2..70aa7c842f 100644
--- a/builtin/rebase.c
+++ b/builtin/rebase.c
@@ -1110,8 +1110,8 @@ int cmd_rebase(int argc, const char **argv, const char *prefix)
 			PARSE_OPT_NOARG | PARSE_OPT_NONEG,
 			parse_opt_interactive),
 		OPT_SET_INT_F('p', "preserve-merges", &preserve_merges_selected,
-			      N_("(DEPRECATED) try to recreate merges instead of "
-				 "ignoring them"),
+			      N_("(REMOVED) was: try to recreate merges "
+				 "instead of ignoring them"),
 			      1, PARSE_OPT_HIDDEN),
 		OPT_RERERE_AUTOUPDATE(&options.allow_rerere_autoupdate),
 		OPT_CALLBACK_F(0, "empty", &options, "{drop,keep,ask}",
@@ -1182,16 +1182,16 @@ int cmd_rebase(int argc, const char **argv, const char *prefix)
 	} else if (is_directory(merge_dir())) {
 		strbuf_reset(&buf);
 		strbuf_addf(&buf, "%s/rewritten", merge_dir());
-		if (is_directory(buf.buf)) {
-			die("`rebase -p` is no longer supported");
+		if (!(action == ACTION_ABORT) && is_directory(buf.buf)) {
+			die(_("`rebase --preserve-merges` (-p) is no longer supported.\n"
+			"Use `git rebase --abort` to terminate current rebase.\n"
+			"Or downgrade to v2.33, or earlier, to complete the rebase."));
 		} else {
 			strbuf_reset(&buf);
 			strbuf_addf(&buf, "%s/interactive", merge_dir());
-			if(file_exists(buf.buf)) {
-				options.type = REBASE_MERGE;
+			options.type = REBASE_MERGE;
+			if (file_exists(buf.buf))
 				options.flags |= REBASE_INTERACTIVE_EXPLICIT;
-			} else
-				options.type = REBASE_MERGE;
 		}
 		options.state_dir = merge_dir();
 	}
@@ -1205,7 +1205,9 @@ int cmd_rebase(int argc, const char **argv, const char *prefix)
 			     builtin_rebase_usage, 0);
 
 	if (preserve_merges_selected)
-		die(_("--preserve-merges was replaced by --rebase-merges"));
+		die(_("--preserve-merges was replaced by --rebase-merges\n"
+			"Note: Your `pull.rebase` configuration may also be set to 'preserve',\n"
+			"which is no longer supported; use 'merges' instead"));
 
 	if (action != ACTION_NONE && total_argc != 2) {
 		usage_with_options(builtin_rebase_usage,
diff --git a/builtin/receive-pack.c b/builtin/receive-pack.c
index 9aabffa1af..31b48e728b 100644
--- a/builtin/receive-pack.c
+++ b/builtin/receive-pack.c
@@ -764,23 +764,23 @@ static void prepare_push_cert_sha1(struct child_process *proc)
 		nonce_status = check_nonce(push_cert.buf, bogs);
 	}
 	if (!is_null_oid(&push_cert_oid)) {
-		strvec_pushf(&proc->env_array, "GIT_PUSH_CERT=%s",
+		strvec_pushf(&proc->env, "GIT_PUSH_CERT=%s",
 			     oid_to_hex(&push_cert_oid));
-		strvec_pushf(&proc->env_array, "GIT_PUSH_CERT_SIGNER=%s",
+		strvec_pushf(&proc->env, "GIT_PUSH_CERT_SIGNER=%s",
 			     sigcheck.signer ? sigcheck.signer : "");
-		strvec_pushf(&proc->env_array, "GIT_PUSH_CERT_KEY=%s",
+		strvec_pushf(&proc->env, "GIT_PUSH_CERT_KEY=%s",
 			     sigcheck.key ? sigcheck.key : "");
-		strvec_pushf(&proc->env_array, "GIT_PUSH_CERT_STATUS=%c",
+		strvec_pushf(&proc->env, "GIT_PUSH_CERT_STATUS=%c",
 			     sigcheck.result);
 		if (push_cert_nonce) {
-			strvec_pushf(&proc->env_array,
+			strvec_pushf(&proc->env,
 				     "GIT_PUSH_CERT_NONCE=%s",
 				     push_cert_nonce);
-			strvec_pushf(&proc->env_array,
+			strvec_pushf(&proc->env,
 				     "GIT_PUSH_CERT_NONCE_STATUS=%s",
 				     nonce_status);
 			if (nonce_status == NONCE_SLOP)
-				strvec_pushf(&proc->env_array,
+				strvec_pushf(&proc->env,
 					     "GIT_PUSH_CERT_NONCE_SLOP=%ld",
 					     nonce_stamp_slop);
 		}
@@ -815,17 +815,17 @@ static int run_and_feed_hook(const char *hook_name, feed_fn feed,
 	if (feed_state->push_options) {
 		size_t i;
 		for (i = 0; i < feed_state->push_options->nr; i++)
-			strvec_pushf(&proc.env_array,
+			strvec_pushf(&proc.env,
 				     "GIT_PUSH_OPTION_%"PRIuMAX"=%s",
 				     (uintmax_t)i,
 				     feed_state->push_options->items[i].string);
-		strvec_pushf(&proc.env_array, "GIT_PUSH_OPTION_COUNT=%"PRIuMAX"",
+		strvec_pushf(&proc.env, "GIT_PUSH_OPTION_COUNT=%"PRIuMAX"",
 			     (uintmax_t)feed_state->push_options->nr);
 	} else
-		strvec_pushf(&proc.env_array, "GIT_PUSH_OPTION_COUNT");
+		strvec_pushf(&proc.env, "GIT_PUSH_OPTION_COUNT");
 
 	if (tmp_objdir)
-		strvec_pushv(&proc.env_array, tmp_objdir_env(tmp_objdir));
+		strvec_pushv(&proc.env, tmp_objdir_env(tmp_objdir));
 
 	if (use_sideband) {
 		memset(&muxer, 0, sizeof(muxer));
@@ -1357,7 +1357,7 @@ static const char *push_to_deploy(unsigned char *sha1,
 
 	strvec_pushl(&child.args, "update-index", "-q", "--ignore-submodules",
 		     "--refresh", NULL);
-	strvec_pushv(&child.env_array, env->v);
+	strvec_pushv(&child.env, env->v);
 	child.dir = work_tree;
 	child.no_stdin = 1;
 	child.stdout_to_stderr = 1;
@@ -1369,7 +1369,7 @@ static const char *push_to_deploy(unsigned char *sha1,
 	child_process_init(&child);
 	strvec_pushl(&child.args, "diff-files", "--quiet",
 		     "--ignore-submodules", "--", NULL);
-	strvec_pushv(&child.env_array, env->v);
+	strvec_pushv(&child.env, env->v);
 	child.dir = work_tree;
 	child.no_stdin = 1;
 	child.stdout_to_stderr = 1;
@@ -1383,7 +1383,7 @@ static const char *push_to_deploy(unsigned char *sha1,
 		     /* diff-index with either HEAD or an empty tree */
 		     head_has_history() ? "HEAD" : empty_tree_oid_hex(),
 		     "--", NULL);
-	strvec_pushv(&child.env_array, env->v);
+	strvec_pushv(&child.env, env->v);
 	child.no_stdin = 1;
 	child.no_stdout = 1;
 	child.stdout_to_stderr = 0;
@@ -1394,7 +1394,7 @@ static const char *push_to_deploy(unsigned char *sha1,
 	child_process_init(&child);
 	strvec_pushl(&child.args, "read-tree", "-u", "-m", hash_to_hex(sha1),
 		     NULL);
-	strvec_pushv(&child.env_array, env->v);
+	strvec_pushv(&child.env, env->v);
 	child.dir = work_tree;
 	child.no_stdin = 1;
 	child.no_stdout = 1;
@@ -1664,7 +1664,7 @@ static void check_aliased_update_internal(struct command *cmd,
 	}
 	dst_name = strip_namespace(dst_name);
 
-	if ((item = string_list_lookup(list, dst_name)) == NULL)
+	if (!(item = string_list_lookup(list, dst_name)))
 		return;
 
 	cmd->skip_update = 1;
@@ -1810,21 +1810,17 @@ static int should_process_cmd(struct command *cmd)
 	return !cmd->error_string && !cmd->skip_update;
 }
 
-static void warn_if_skipped_connectivity_check(struct command *commands,
+static void BUG_if_skipped_connectivity_check(struct command *commands,
 					       struct shallow_info *si)
 {
 	struct command *cmd;
-	int checked_connectivity = 1;
 
 	for (cmd = commands; cmd; cmd = cmd->next) {
-		if (should_process_cmd(cmd) && si->shallow_ref[cmd->index]) {
-			error("BUG: connectivity check has not been run on ref %s",
-			      cmd->ref_name);
-			checked_connectivity = 0;
-		}
+		if (should_process_cmd(cmd) && si->shallow_ref[cmd->index])
+			bug("connectivity check has not been run on ref %s",
+			    cmd->ref_name);
 	}
-	if (!checked_connectivity)
-		BUG("connectivity check skipped???");
+	BUG_if_bug("connectivity check skipped???");
 }
 
 static void execute_commands_non_atomic(struct command *commands,
@@ -2005,7 +2001,7 @@ static void execute_commands(struct command *commands,
 		execute_commands_non_atomic(commands, si);
 
 	if (shallow_update)
-		warn_if_skipped_connectivity_check(commands, si);
+		BUG_if_skipped_connectivity_check(commands, si);
 }
 
 static struct command **queue_command(struct command **tail,
@@ -2214,8 +2210,7 @@ static const char *unpack(int err_fd, struct shallow_info *si)
 			close(err_fd);
 		return "unable to create temporary object directory";
 	}
-	if (tmp_objdir)
-		strvec_pushv(&child.env_array, tmp_objdir_env(tmp_objdir));
+	strvec_pushv(&child.env, tmp_objdir_env(tmp_objdir));
 
 	/*
 	 * Normally we just pass the tmp_objdir environment to the child
@@ -2538,7 +2533,7 @@ int cmd_receive_pack(int argc, const char **argv, const char *prefix)
 			   PACKET_READ_CHOMP_NEWLINE |
 			   PACKET_READ_DIE_ON_ERR_PACKET);
 
-	if ((commands = read_head_info(&reader, &shallow)) != NULL) {
+	if ((commands = read_head_info(&reader, &shallow))) {
 		const char *unpack_status = NULL;
 		struct string_list push_options = STRING_LIST_INIT_DUP;
 
diff --git a/builtin/reflog.c b/builtin/reflog.c
index c943c2aabe..4dd297dce8 100644
--- a/builtin/reflog.c
+++ b/builtin/reflog.c
@@ -293,6 +293,7 @@ static int cmd_reflog_expire(int argc, const char **argv, const char *prefix)
 		if (verbose)
 			printf(_("Marking reachable objects..."));
 		mark_reachable_objects(&revs, 0, 0, NULL);
+		release_revisions(&revs);
 		if (verbose)
 			putchar('\n');
 	}
diff --git a/builtin/remote.c b/builtin/remote.c
index 5f4cde9d78..a3a0c27d7a 100644
--- a/builtin/remote.c
+++ b/builtin/remote.c
@@ -1185,14 +1185,22 @@ static int show_push_info_item(struct string_list_item *item, void *cb_data)
 static int get_one_entry(struct remote *remote, void *priv)
 {
 	struct string_list *list = priv;
-	struct strbuf url_buf = STRBUF_INIT;
+	struct strbuf remote_info_buf = STRBUF_INIT;
 	const char **url;
 	int i, url_nr;
 
 	if (remote->url_nr > 0) {
-		strbuf_addf(&url_buf, "%s (fetch)", remote->url[0]);
+		struct strbuf promisor_config = STRBUF_INIT;
+		const char *partial_clone_filter = NULL;
+
+		strbuf_addf(&promisor_config, "remote.%s.partialclonefilter", remote->name);
+		strbuf_addf(&remote_info_buf, "%s (fetch)", remote->url[0]);
+		if (!git_config_get_string_tmp(promisor_config.buf, &partial_clone_filter))
+			strbuf_addf(&remote_info_buf, " [%s]", partial_clone_filter);
+
+		strbuf_release(&promisor_config);
 		string_list_append(list, remote->name)->util =
-				strbuf_detach(&url_buf, NULL);
+				strbuf_detach(&remote_info_buf, NULL);
 	} else
 		string_list_append(list, remote->name)->util = NULL;
 	if (remote->pushurl_nr) {
@@ -1204,9 +1212,9 @@ static int get_one_entry(struct remote *remote, void *priv)
 	}
 	for (i = 0; i < url_nr; i++)
 	{
-		strbuf_addf(&url_buf, "%s (push)", url[i]);
+		strbuf_addf(&remote_info_buf, "%s (push)", url[i]);
 		string_list_append(list, remote->name)->util =
-				strbuf_detach(&url_buf, NULL);
+				strbuf_detach(&remote_info_buf, NULL);
 	}
 
 	return 0;
@@ -1214,10 +1222,9 @@ static int get_one_entry(struct remote *remote, void *priv)
 
 static int show_all(void)
 {
-	struct string_list list = STRING_LIST_INIT_NODUP;
+	struct string_list list = STRING_LIST_INIT_DUP;
 	int result;
 
-	list.strdup_strings = 1;
 	result = for_each_remote(get_one_entry, &list);
 
 	if (!result) {
diff --git a/builtin/repack.c b/builtin/repack.c
index d1a563d5b6..4a7ae4cf48 100644
--- a/builtin/repack.c
+++ b/builtin/repack.c
@@ -18,12 +18,21 @@
 #include "pack-bitmap.h"
 #include "refs.h"
 
+#define ALL_INTO_ONE 1
+#define LOOSEN_UNREACHABLE 2
+#define PACK_CRUFT 4
+
+#define DELETE_PACK 1
+#define CRUFT_PACK 2
+
+static int pack_everything;
 static int delta_base_offset = 1;
 static int pack_kept_objects = -1;
 static int write_bitmaps = -1;
 static int use_delta_islands;
 static int run_update_server_info = 1;
 static char *packdir, *packtmp_name, *packtmp;
+static char *cruft_expiration;
 
 static const char *const git_repack_usage[] = {
 	N_("git repack [<options>]"),
@@ -32,12 +41,24 @@ static const char *const git_repack_usage[] = {
 
 static const char incremental_bitmap_conflict_error[] = N_(
 "Incremental repacks are incompatible with bitmap indexes.  Use\n"
-"--no-write-bitmap-index or disable the pack.writebitmaps configuration."
+"--no-write-bitmap-index or disable the pack.writeBitmaps configuration."
 );
 
+struct pack_objects_args {
+	const char *window;
+	const char *window_memory;
+	const char *depth;
+	const char *threads;
+	const char *max_pack_size;
+	int no_reuse_delta;
+	int no_reuse_object;
+	int quiet;
+	int local;
+};
 
 static int repack_config(const char *var, const char *value, void *cb)
 {
+	struct pack_objects_args *cruft_po_args = cb;
 	if (!strcmp(var, "repack.usedeltabaseoffset")) {
 		delta_base_offset = git_config_bool(var, value);
 		return 0;
@@ -59,6 +80,14 @@ static int repack_config(const char *var, const char *value, void *cb)
 		run_update_server_info = git_config_bool(var, value);
 		return 0;
 	}
+	if (!strcmp(var, "repack.cruftwindow"))
+		return git_config_string(&cruft_po_args->window, var, value);
+	if (!strcmp(var, "repack.cruftwindowmemory"))
+		return git_config_string(&cruft_po_args->window_memory, var, value);
+	if (!strcmp(var, "repack.cruftdepth"))
+		return git_config_string(&cruft_po_args->depth, var, value);
+	if (!strcmp(var, "repack.cruftthreads"))
+		return git_config_string(&cruft_po_args->threads, var, value);
 	return git_default_config(var, value, cb);
 }
 
@@ -131,12 +160,19 @@ static void collect_pack_filenames(struct string_list *fname_nonkept_list,
 		fname = xmemdupz(e->d_name, len);
 
 		if ((extra_keep->nr > 0 && i < extra_keep->nr) ||
-		    (file_exists(mkpath("%s/%s.keep", packdir, fname))))
+		    (file_exists(mkpath("%s/%s.keep", packdir, fname)))) {
 			string_list_append_nodup(fname_kept_list, fname);
-		else
-			string_list_append_nodup(fname_nonkept_list, fname);
+		} else {
+			struct string_list_item *item;
+			item = string_list_append_nodup(fname_nonkept_list,
+							fname);
+			if (file_exists(mkpath("%s/%s.mtimes", packdir, fname)))
+				item->util = (void*)(uintptr_t)CRUFT_PACK;
+		}
 	}
 	closedir(dir);
+
+	string_list_sort(fname_kept_list);
 }
 
 static void remove_redundant_pack(const char *dir_name, const char *base_name)
@@ -151,18 +187,6 @@ static void remove_redundant_pack(const char *dir_name, const char *base_name)
 	strbuf_release(&buf);
 }
 
-struct pack_objects_args {
-	const char *window;
-	const char *window_memory;
-	const char *depth;
-	const char *threads;
-	const char *max_pack_size;
-	int no_reuse_delta;
-	int no_reuse_object;
-	int quiet;
-	int local;
-};
-
 static void prepare_pack_objects(struct child_process *cmd,
 				 const struct pack_objects_args *args)
 {
@@ -217,6 +241,7 @@ static struct {
 } exts[] = {
 	{".pack"},
 	{".rev", 1},
+	{".mtimes", 1},
 	{".bitmap", 1},
 	{".promisor", 1},
 	{".idx"},
@@ -304,9 +329,6 @@ static void repack_promisor_objects(const struct pack_objects_args *args,
 		die(_("could not finish pack-objects to repack promisor objects"));
 }
 
-#define ALL_INTO_ONE 1
-#define LOOSEN_UNREACHABLE 2
-
 struct pack_geometry {
 	struct packed_git **pack;
 	uint32_t pack_nr, pack_alloc;
@@ -332,16 +354,39 @@ static int geometry_cmp(const void *va, const void *vb)
 	return 0;
 }
 
-static void init_pack_geometry(struct pack_geometry **geometry_p)
+static void init_pack_geometry(struct pack_geometry **geometry_p,
+			       struct string_list *existing_kept_packs)
 {
 	struct packed_git *p;
 	struct pack_geometry *geometry;
+	struct strbuf buf = STRBUF_INIT;
 
 	*geometry_p = xcalloc(1, sizeof(struct pack_geometry));
 	geometry = *geometry_p;
 
 	for (p = get_all_packs(the_repository); p; p = p->next) {
-		if (!pack_kept_objects && p->pack_keep)
+		if (!pack_kept_objects) {
+			/*
+			 * Any pack that has its pack_keep bit set will appear
+			 * in existing_kept_packs below, but this saves us from
+			 * doing a more expensive check.
+			 */
+			if (p->pack_keep)
+				continue;
+
+			/*
+			 * The pack may be kept via the --keep-pack option;
+			 * check 'existing_kept_packs' to determine whether to
+			 * ignore it.
+			 */
+			strbuf_reset(&buf);
+			strbuf_addstr(&buf, pack_basename(p));
+			strbuf_strip_suffix(&buf, ".pack");
+
+			if (string_list_has_string(existing_kept_packs, buf.buf))
+				continue;
+		}
+		if (p->is_cruft)
 			continue;
 
 		ALLOC_GROW(geometry->pack,
@@ -353,6 +398,7 @@ static void init_pack_geometry(struct pack_geometry **geometry_p)
 	}
 
 	QSORT(geometry->pack, geometry->pack_nr, geometry_cmp);
+	strbuf_release(&buf);
 }
 
 static void split_pack_geometry(struct pack_geometry *geometry, int factor)
@@ -548,9 +594,20 @@ static void midx_included_packs(struct string_list *include,
 
 			string_list_insert(include, strbuf_detach(&buf, NULL));
 		}
+
+		for_each_string_list_item(item, existing_nonkept_packs) {
+			if (!((uintptr_t)item->util & CRUFT_PACK)) {
+				/*
+				 * no need to check DELETE_PACK, since we're not
+				 * doing an ALL_INTO_ONE repack
+				 */
+				continue;
+			}
+			string_list_insert(include, xstrfmt("%s.idx", item->string));
+		}
 	} else {
 		for_each_string_list_item(item, existing_nonkept_packs) {
-			if (item->util)
+			if ((uintptr_t)item->util & DELETE_PACK)
 				continue;
 			string_list_insert(include, xstrfmt("%s.idx", item->string));
 		}
@@ -604,6 +661,67 @@ static int write_midx_included_packs(struct string_list *include,
 	return finish_command(&cmd);
 }
 
+static int write_cruft_pack(const struct pack_objects_args *args,
+			    const char *pack_prefix,
+			    struct string_list *names,
+			    struct string_list *existing_packs,
+			    struct string_list *existing_kept_packs)
+{
+	struct child_process cmd = CHILD_PROCESS_INIT;
+	struct strbuf line = STRBUF_INIT;
+	struct string_list_item *item;
+	FILE *in, *out;
+	int ret;
+
+	prepare_pack_objects(&cmd, args);
+
+	strvec_push(&cmd.args, "--cruft");
+	if (cruft_expiration)
+		strvec_pushf(&cmd.args, "--cruft-expiration=%s",
+			     cruft_expiration);
+
+	strvec_push(&cmd.args, "--honor-pack-keep");
+	strvec_push(&cmd.args, "--non-empty");
+	strvec_push(&cmd.args, "--max-pack-size=0");
+
+	cmd.in = -1;
+
+	ret = start_command(&cmd);
+	if (ret)
+		return ret;
+
+	/*
+	 * names has a confusing double use: it both provides the list
+	 * of just-written new packs, and accepts the name of the cruft
+	 * pack we are writing.
+	 *
+	 * By the time it is read here, it contains only the pack(s)
+	 * that were just written, which is exactly the set of packs we
+	 * want to consider kept.
+	 */
+	in = xfdopen(cmd.in, "w");
+	for_each_string_list_item(item, names)
+		fprintf(in, "%s-%s.pack\n", pack_prefix, item->string);
+	for_each_string_list_item(item, existing_packs)
+		fprintf(in, "-%s.pack\n", item->string);
+	for_each_string_list_item(item, existing_kept_packs)
+		fprintf(in, "%s.pack\n", item->string);
+	fclose(in);
+
+	out = xfdopen(cmd.out, "r");
+	while (strbuf_getline_lf(&line, out) != EOF) {
+		if (line.len != the_hash_algo->hexsz)
+			die(_("repack: Expecting full hex object ID lines only "
+			      "from pack-objects."));
+		string_list_append(names, line.buf);
+	}
+	fclose(out);
+
+	strbuf_release(&line);
+
+	return finish_command(&cmd);
+}
+
 int cmd_repack(int argc, const char **argv, const char *prefix)
 {
 	struct child_process cmd = CHILD_PROCESS_INIT;
@@ -620,12 +738,12 @@ int cmd_repack(int argc, const char **argv, const char *prefix)
 	int show_progress;
 
 	/* variables to be filled by option parsing */
-	int pack_everything = 0;
 	int delete_redundant = 0;
 	const char *unpack_unreachable = NULL;
 	int keep_unreachable = 0;
 	struct string_list keep_pack_list = STRING_LIST_INIT_NODUP;
 	struct pack_objects_args po_args = {NULL};
+	struct pack_objects_args cruft_po_args = {NULL};
 	int geometric_factor = 0;
 	int write_midx = 0;
 
@@ -635,6 +753,11 @@ int cmd_repack(int argc, const char **argv, const char *prefix)
 		OPT_BIT('A', NULL, &pack_everything,
 				N_("same as -a, and turn unreachable objects loose"),
 				   LOOSEN_UNREACHABLE | ALL_INTO_ONE),
+		OPT_BIT(0, "cruft", &pack_everything,
+				N_("same as -a, pack unreachable cruft objects separately"),
+				   PACK_CRUFT),
+		OPT_STRING(0, "cruft-expiration", &cruft_expiration, N_("approxidate"),
+				N_("with -C, expire objects older than this")),
 		OPT_BOOL('d', NULL, &delete_redundant,
 				N_("remove redundant packs, and run git-prune-packed")),
 		OPT_BOOL('f', NULL, &po_args.no_reuse_delta,
@@ -675,7 +798,7 @@ int cmd_repack(int argc, const char **argv, const char *prefix)
 		OPT_END()
 	};
 
-	git_config(repack_config, NULL);
+	git_config(repack_config, &cruft_po_args);
 
 	argc = parse_options(argc, argv, prefix, builtin_repack_options,
 				git_repack_usage, 0);
@@ -687,6 +810,15 @@ int cmd_repack(int argc, const char **argv, const char *prefix)
 	    (unpack_unreachable || (pack_everything & LOOSEN_UNREACHABLE)))
 		die(_("options '%s' and '%s' cannot be used together"), "--keep-unreachable", "-A");
 
+	if (pack_everything & PACK_CRUFT) {
+		pack_everything |= ALL_INTO_ONE;
+
+		if (unpack_unreachable || (pack_everything & LOOSEN_UNREACHABLE))
+			die(_("options '%s' and '%s' cannot be used together"), "--cruft", "-A");
+		if (keep_unreachable)
+			die(_("options '%s' and '%s' cannot be used together"), "--cruft", "-k");
+	}
+
 	if (write_bitmaps < 0) {
 		if (!write_midx &&
 		    (!(pack_everything & ALL_INTO_ONE) || !is_bare_repository()))
@@ -714,17 +846,20 @@ int cmd_repack(int argc, const char **argv, const char *prefix)
 		strbuf_release(&path);
 	}
 
+	packdir = mkpathdup("%s/pack", get_object_directory());
+	packtmp_name = xstrfmt(".tmp-%d-pack", (int)getpid());
+	packtmp = mkpathdup("%s/%s", packdir, packtmp_name);
+
+	collect_pack_filenames(&existing_nonkept_packs, &existing_kept_packs,
+			       &keep_pack_list);
+
 	if (geometric_factor) {
 		if (pack_everything)
 			die(_("options '%s' and '%s' cannot be used together"), "--geometric", "-A/-a");
-		init_pack_geometry(&geometry);
+		init_pack_geometry(&geometry, &existing_kept_packs);
 		split_pack_geometry(geometry, geometric_factor);
 	}
 
-	packdir = mkpathdup("%s/pack", get_object_directory());
-	packtmp_name = xstrfmt(".tmp-%d-pack", (int)getpid());
-	packtmp = mkpathdup("%s/%s", packdir, packtmp_name);
-
 	sigchain_push_common(remove_pack_on_signal);
 
 	prepare_pack_objects(&cmd, &po_args);
@@ -764,13 +899,11 @@ int cmd_repack(int argc, const char **argv, const char *prefix)
 	if (use_delta_islands)
 		strvec_push(&cmd.args, "--delta-islands");
 
-	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_nonkept_packs.nr && delete_redundant) {
+		if (existing_nonkept_packs.nr && delete_redundant &&
+		    !(pack_everything & PACK_CRUFT)) {
 			for_each_string_list_item(item, &names) {
 				strvec_pushf(&cmd.args, "--keep-pack=%s-%s.pack",
 					     packtmp_name, item->string);
@@ -832,6 +965,35 @@ int cmd_repack(int argc, const char **argv, const char *prefix)
 	if (!names.nr && !po_args.quiet)
 		printf_ln(_("Nothing new to pack."));
 
+	if (pack_everything & PACK_CRUFT) {
+		const char *pack_prefix;
+		if (!skip_prefix(packtmp, packdir, &pack_prefix))
+			die(_("pack prefix %s does not begin with objdir %s"),
+			    packtmp, packdir);
+		if (*pack_prefix == '/')
+			pack_prefix++;
+
+		if (!cruft_po_args.window)
+			cruft_po_args.window = po_args.window;
+		if (!cruft_po_args.window_memory)
+			cruft_po_args.window_memory = po_args.window_memory;
+		if (!cruft_po_args.depth)
+			cruft_po_args.depth = po_args.depth;
+		if (!cruft_po_args.threads)
+			cruft_po_args.threads = po_args.threads;
+
+		cruft_po_args.local = po_args.local;
+		cruft_po_args.quiet = po_args.quiet;
+
+		ret = write_cruft_pack(&cruft_po_args, pack_prefix, &names,
+				       &existing_nonkept_packs,
+				       &existing_kept_packs);
+		if (ret)
+			return ret;
+	}
+
+	string_list_sort(&names);
+
 	for_each_string_list_item(item, &names) {
 		item->util = (void *)(uintptr_t)populate_pack_exts(item->string);
 	}
@@ -872,7 +1034,6 @@ int cmd_repack(int argc, const char **argv, const char *prefix)
 
 	if (delete_redundant && pack_everything & ALL_INTO_ONE) {
 		const int hexsz = the_hash_algo->hexsz;
-		string_list_sort(&names);
 		for_each_string_list_item(item, &existing_nonkept_packs) {
 			char *sha1;
 			size_t len = strlen(item->string);
@@ -885,7 +1046,8 @@ int cmd_repack(int argc, const char **argv, const char *prefix)
 			 * 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 (!string_list_has_string(&names, sha1))
+				item->util = (void*)(uintptr_t)((size_t)item->util | DELETE_PACK);
 		}
 	}
 
@@ -909,7 +1071,7 @@ int cmd_repack(int argc, const char **argv, const char *prefix)
 	if (delete_redundant) {
 		int opts = 0;
 		for_each_string_list_item(item, &existing_nonkept_packs) {
-			if (!item->util)
+			if (!((uintptr_t)item->util & DELETE_PACK))
 				continue;
 			remove_redundant_pack(packdir, item->string);
 		}
diff --git a/builtin/replace.c b/builtin/replace.c
index 5068f4f0b2..583702a098 100644
--- a/builtin/replace.c
+++ b/builtin/replace.c
@@ -72,7 +72,7 @@ static int list_replace_refs(const char *pattern, const char *format)
 {
 	struct show_data data;
 
-	if (pattern == NULL)
+	if (!pattern)
 		pattern = "*";
 	data.pattern = pattern;
 
diff --git a/builtin/rev-list.c b/builtin/rev-list.c
index 572da1472e..30fd8e83ea 100644
--- a/builtin/rev-list.c
+++ b/builtin/rev-list.c
@@ -213,10 +213,8 @@ static void show_commit(struct commit *commit, void *data)
 
 static void finish_commit(struct commit *commit)
 {
-	if (commit->parents) {
-		free_commit_list(commit->parents);
-		commit->parents = NULL;
-	}
+	free_commit_list(commit->parents);
+	commit->parents = NULL;
 	free_commit_buffer(the_repository->parsed_objects,
 			   commit);
 }
@@ -502,6 +500,7 @@ int cmd_rev_list(int argc, const char **argv, const char *prefix)
 	int use_bitmap_index = 0;
 	int filter_provided_objects = 0;
 	const char *show_progress = NULL;
+	int ret = 0;
 
 	if (argc == 2 && !strcmp(argv[1], "-h"))
 		usage(rev_list_usage);
@@ -585,7 +584,7 @@ int cmd_rev_list(int argc, const char **argv, const char *prefix)
 		}
 		if (!strcmp(arg, "--test-bitmap")) {
 			test_bitmap_walk(&revs);
-			return 0;
+			goto cleanup;
 		}
 		if (skip_prefix(arg, "--progress=", &arg)) {
 			show_progress = arg;
@@ -674,11 +673,11 @@ int cmd_rev_list(int argc, const char **argv, const char *prefix)
 
 	if (use_bitmap_index) {
 		if (!try_bitmap_count(&revs, filter_provided_objects))
-			return 0;
+			goto cleanup;
 		if (!try_bitmap_disk_usage(&revs, filter_provided_objects))
-			return 0;
+			goto cleanup;
 		if (!try_bitmap_traversal(&revs, filter_provided_objects))
-			return 0;
+			goto cleanup;
 	}
 
 	if (prepare_revision_walk(&revs))
@@ -698,8 +697,10 @@ int cmd_rev_list(int argc, const char **argv, const char *prefix)
 
 		find_bisection(&revs.commits, &reaches, &all, bisect_flags);
 
-		if (bisect_show_vars)
-			return show_bisect_vars(&info, reaches, all);
+		if (bisect_show_vars) {
+			ret = show_bisect_vars(&info, reaches, all);
+			goto cleanup;
+		}
 	}
 
 	if (filter_provided_objects) {
@@ -754,5 +755,7 @@ int cmd_rev_list(int argc, const char **argv, const char *prefix)
 	if (show_disk_usage)
 		printf("%"PRIuMAX"\n", (uintmax_t)total_disk_usage);
 
-	return 0;
+cleanup:
+	release_revisions(&revs);
+	return ret;
 }
diff --git a/builtin/rev-parse.c b/builtin/rev-parse.c
index 8480a59f57..b259d8990a 100644
--- a/builtin/rev-parse.c
+++ b/builtin/rev-parse.c
@@ -476,7 +476,7 @@ static int cmd_parseopt(int argc, const char **argv, const char *prefix)
 
 		/* name(s) */
 		s = strpbrk(sb.buf, flag_chars);
-		if (s == NULL)
+		if (!s)
 			s = help;
 
 		if (s - sb.buf == 1) /* short option only */
@@ -723,6 +723,9 @@ int cmd_rev_parse(int argc, const char **argv, const char *prefix)
 			prefix = setup_git_directory();
 			git_config(git_default_config, NULL);
 			did_repo_setup = 1;
+
+			prepare_repo_settings(the_repository);
+			the_repository->settings.command_requires_full_index = 0;
 		}
 
 		if (!strcmp(arg, "--")) {
diff --git a/builtin/revert.c b/builtin/revert.c
index 51776abea6..f84c253f4c 100644
--- a/builtin/revert.c
+++ b/builtin/revert.c
@@ -130,6 +130,13 @@ static int run_sequencer(int argc, const char **argv, struct replay_opts *opts)
 			OPT_END(),
 		};
 		options = parse_options_concat(options, cp_extra);
+	} else if (opts->action == REPLAY_REVERT) {
+		struct option cp_extra[] = {
+			OPT_BOOL(0, "reference", &opts->commit_use_reference,
+				 N_("use the 'reference' format to refer to commits")),
+			OPT_END(),
+		};
+		options = parse_options_concat(options, cp_extra);
 	}
 
 	argc = parse_options(argc, argv, NULL, options, usage_str,
diff --git a/builtin/shortlog.c b/builtin/shortlog.c
index 26c5c0cf93..086dfee45a 100644
--- a/builtin/shortlog.c
+++ b/builtin/shortlog.c
@@ -81,8 +81,10 @@ static void insert_one_record(struct shortlog *log,
 		format_subject(&subject, oneline, " ");
 		buffer = strbuf_detach(&subject, NULL);
 
-		if (item->util == NULL)
-			item->util = xcalloc(1, sizeof(struct string_list));
+		if (!item->util) {
+			item->util = xmalloc(sizeof(struct string_list));
+			string_list_init_nodup(item->util);
+		}
 		string_list_append(item->util, buffer);
 	}
 }
@@ -420,6 +422,8 @@ parse_done:
 	else
 		get_from_rev(&rev, &log);
 
+	release_revisions(&rev);
+
 	shortlog_output(&log);
 	if (log.file != stdout)
 		fclose(log.file);
@@ -439,7 +443,7 @@ void shortlog_output(struct shortlog *log)
 	struct strbuf sb = STRBUF_INIT;
 
 	if (log->sort_by_number)
-		QSORT(log->list.items, log->list.nr,
+		STABLE_QSORT(log->list.items, log->list.nr,
 		      log->summary ? compare_by_counter : compare_by_list);
 	for (i = 0; i < log->list.nr; i++) {
 		const struct string_list_item *item = &log->list.items[i];
diff --git a/builtin/show-ref.c b/builtin/show-ref.c
index 7f8a5332f8..5fa207a044 100644
--- a/builtin/show-ref.c
+++ b/builtin/show-ref.c
@@ -52,14 +52,6 @@ static int show_ref(const char *refname, const struct object_id *oid,
 	if (show_head && !strcmp(refname, "HEAD"))
 		goto match;
 
-	if (tags_only || heads_only) {
-		int match;
-
-		match = heads_only && starts_with(refname, "refs/heads/");
-		match |= tags_only && starts_with(refname, "refs/tags/");
-		if (!match)
-			return 0;
-	}
 	if (pattern) {
 		int reflen = strlen(refname);
 		const char **p = pattern, *m;
@@ -216,7 +208,14 @@ int cmd_show_ref(int argc, const char **argv, const char *prefix)
 
 	if (show_head)
 		head_ref(show_ref, NULL);
-	for_each_ref(show_ref, NULL);
+	if (heads_only || tags_only) {
+		if (heads_only)
+			for_each_fullref_in("refs/heads/", show_ref, NULL);
+		if (tags_only)
+			for_each_fullref_in("refs/tags/", show_ref, NULL);
+	} else {
+		for_each_ref(show_ref, NULL);
+	}
 	if (!found_match) {
 		if (verify && !quiet)
 			die("No match");
diff --git a/builtin/sparse-checkout.c b/builtin/sparse-checkout.c
index 0217d44c5b..f91e29b56a 100644
--- a/builtin/sparse-checkout.c
+++ b/builtin/sparse-checkout.c
@@ -128,7 +128,7 @@ static void clean_tracked_sparse_directories(struct repository *r)
 	 * sparse index will not delete directories that contain
 	 * conflicted entries or submodules.
 	 */
-	if (!r->index->sparse_index) {
+	if (r->index->sparse_index == INDEX_EXPANDED) {
 		/*
 		 * If something, such as a merge conflict or other concern,
 		 * prevents us from converting to a sparse index, then do
@@ -395,7 +395,7 @@ static int update_modes(int *cone_mode, int *sparse_index)
 
 	/* Set cone/non-cone mode appropriately */
 	core_apply_sparse_checkout = 1;
-	if (*cone_mode == 1) {
+	if (*cone_mode == 1 || *cone_mode == -1) {
 		mode = MODE_CONE_PATTERNS;
 		core_sparse_checkout_cone = 1;
 	} else {
@@ -413,6 +413,9 @@ static int update_modes(int *cone_mode, int *sparse_index)
 		/* force an index rewrite */
 		repo_read_index(the_repository);
 		the_repository->index->updated_workdir = 1;
+
+		if (!*sparse_index)
+			ensure_full_index(the_repository->index);
 	}
 
 	return 0;
@@ -934,6 +937,9 @@ int cmd_sparse_checkout(int argc, const char **argv, const char *prefix)
 
 	git_config(git_default_config, NULL);
 
+	prepare_repo_settings(the_repository);
+	the_repository->settings.command_requires_full_index = 0;
+
 	if (argc > 0) {
 		if (!strcmp(argv[0], "list"))
 			return sparse_checkout_list(argc, argv);
diff --git a/builtin/stash.c b/builtin/stash.c
index 0c7b6a9588..30fa101460 100644
--- a/builtin/stash.c
+++ b/builtin/stash.c
@@ -7,6 +7,7 @@
 #include "cache-tree.h"
 #include "unpack-trees.h"
 #include "merge-recursive.h"
+#include "merge-ort-wrappers.h"
 #include "strvec.h"
 #include "run-command.h"
 #include "dir.h"
@@ -116,6 +117,10 @@ struct stash_info {
 	int has_u;
 };
 
+#define STASH_INFO_INIT { \
+	.revision = STRBUF_INIT, \
+}
+
 static void free_stash_info(struct stash_info *info)
 {
 	strbuf_release(&info->revision);
@@ -157,10 +162,8 @@ static int get_stash_info(struct stash_info *info, int argc, const char **argv)
 	if (argc == 1)
 		commit = argv[0];
 
-	strbuf_init(&info->revision, 0);
 	if (!commit) {
 		if (!ref_exists(ref_stash)) {
-			free_stash_info(info);
 			fprintf_ln(stderr, _("No stash entries found."));
 			return -1;
 		}
@@ -174,11 +177,8 @@ static int get_stash_info(struct stash_info *info, int argc, const char **argv)
 
 	revision = info->revision.buf;
 
-	if (get_oid(revision, &info->w_commit)) {
-		error(_("%s is not a valid reference"), revision);
-		free_stash_info(info);
-		return -1;
-	}
+	if (get_oid(revision, &info->w_commit))
+		return error(_("%s is not a valid reference"), revision);
 
 	assert_stash_like(info, revision);
 
@@ -197,7 +197,7 @@ static int get_stash_info(struct stash_info *info, int argc, const char **argv)
 		info->is_stash_ref = !strcmp(expanded_ref, ref_stash);
 		break;
 	default: /* Invalid or ambiguous */
-		free_stash_info(info);
+		break;
 	}
 
 	free(expanded_ref);
@@ -356,7 +356,7 @@ static int restore_untracked(struct object_id *u_tree)
 	cp.git_cmd = 1;
 	strvec_push(&cp.args, "read-tree");
 	strvec_push(&cp.args, oid_to_hex(u_tree));
-	strvec_pushf(&cp.env_array, "GIT_INDEX_FILE=%s",
+	strvec_pushf(&cp.env, "GIT_INDEX_FILE=%s",
 		     stash_index_path.buf);
 	if (run_command(&cp)) {
 		remove_path(stash_index_path.buf);
@@ -366,7 +366,7 @@ static int restore_untracked(struct object_id *u_tree)
 	child_process_init(&cp);
 	cp.git_cmd = 1;
 	strvec_pushl(&cp.args, "checkout-index", "--all", NULL);
-	strvec_pushf(&cp.env_array, "GIT_INDEX_FILE=%s",
+	strvec_pushf(&cp.env, "GIT_INDEX_FILE=%s",
 		     stash_index_path.buf);
 
 	res = run_command(&cp);
@@ -492,13 +492,13 @@ static void unstage_changes_unless_new(struct object_id *orig_tree)
 static int do_apply_stash(const char *prefix, struct stash_info *info,
 			  int index, int quiet)
 {
-	int ret;
+	int clean, ret;
 	int has_index = index;
 	struct merge_options o;
 	struct object_id c_tree;
 	struct object_id index_tree;
-	struct commit *result;
-	const struct object_id *bases[1];
+	struct tree *head, *merge, *merge_base;
+	struct lock_file lock = LOCK_INIT;
 
 	read_cache_preload(NULL);
 	if (refresh_and_write_cache(REFRESH_QUIET, 0, 0))
@@ -541,6 +541,7 @@ static int do_apply_stash(const char *prefix, struct stash_info *info,
 
 	o.branch1 = "Updated upstream";
 	o.branch2 = "Stashed changes";
+	o.ancestor = "Stash base";
 
 	if (oideq(&info->b_tree, &c_tree))
 		o.branch1 = "Version stash was based on";
@@ -551,10 +552,26 @@ static int do_apply_stash(const char *prefix, struct stash_info *info,
 	if (o.verbosity >= 3)
 		printf_ln(_("Merging %s with %s"), o.branch1, o.branch2);
 
-	bases[0] = &info->b_tree;
+	head = lookup_tree(o.repo, &c_tree);
+	merge = lookup_tree(o.repo, &info->w_tree);
+	merge_base = lookup_tree(o.repo, &info->b_tree);
+
+	repo_hold_locked_index(o.repo, &lock, LOCK_DIE_ON_ERROR);
+	clean = merge_ort_nonrecursive(&o, head, merge, merge_base);
+
+	/*
+	 * If 'clean' >= 0, reverse the value for 'ret' so 'ret' is 0 when the
+	 * merge was clean, and nonzero if the merge was unclean or encountered
+	 * an error.
+	 */
+	ret = clean >= 0 ? !clean : clean;
+
+	if (ret < 0)
+		rollback_lock_file(&lock);
+	else if (write_locked_index(o.repo->index, &lock,
+				      COMMIT_LOCK | SKIP_IF_UNCHANGED))
+		ret = error(_("could not write index"));
 
-	ret = merge_recursive_generic(&o, &c_tree, &info->w_tree, 1, bases,
-				      &result);
 	if (ret) {
 		rerere(0);
 
@@ -585,9 +602,9 @@ restore_untracked:
 		 */
 		cp.git_cmd = 1;
 		cp.dir = prefix;
-		strvec_pushf(&cp.env_array, GIT_WORK_TREE_ENVIRONMENT"=%s",
+		strvec_pushf(&cp.env, GIT_WORK_TREE_ENVIRONMENT"=%s",
 			     absolute_path(get_git_work_tree()));
-		strvec_pushf(&cp.env_array, GIT_DIR_ENVIRONMENT"=%s",
+		strvec_pushf(&cp.env, GIT_DIR_ENVIRONMENT"=%s",
 			     absolute_path(get_git_dir()));
 		strvec_push(&cp.args, "status");
 		run_command(&cp);
@@ -598,10 +615,10 @@ restore_untracked:
 
 static int apply_stash(int argc, const char **argv, const char *prefix)
 {
-	int ret;
+	int ret = -1;
 	int quiet = 0;
 	int index = 0;
-	struct stash_info info;
+	struct stash_info info = STASH_INFO_INIT;
 	struct option options[] = {
 		OPT__QUIET(&quiet, N_("be quiet, only report errors")),
 		OPT_BOOL(0, "index", &index,
@@ -613,9 +630,10 @@ static int apply_stash(int argc, const char **argv, const char *prefix)
 			     git_stash_apply_usage, 0);
 
 	if (get_stash_info(&info, argc, argv))
-		return -1;
+		goto cleanup;
 
 	ret = do_apply_stash(prefix, &info, index, quiet);
+cleanup:
 	free_stash_info(&info);
 	return ret;
 }
@@ -651,20 +669,25 @@ static int do_drop_stash(struct stash_info *info, int quiet)
 	return 0;
 }
 
-static void assert_stash_ref(struct stash_info *info)
+static int get_stash_info_assert(struct stash_info *info, int argc,
+				 const char **argv)
 {
-	if (!info->is_stash_ref) {
-		error(_("'%s' is not a stash reference"), info->revision.buf);
-		free_stash_info(info);
-		exit(1);
-	}
+	int ret = get_stash_info(info, argc, argv);
+
+	if (ret < 0)
+		return ret;
+
+	if (!info->is_stash_ref)
+		return error(_("'%s' is not a stash reference"), info->revision.buf);
+
+	return 0;
 }
 
 static int drop_stash(int argc, const char **argv, const char *prefix)
 {
-	int ret;
+	int ret = -1;
 	int quiet = 0;
-	struct stash_info info;
+	struct stash_info info = STASH_INFO_INIT;
 	struct option options[] = {
 		OPT__QUIET(&quiet, N_("be quiet, only report errors")),
 		OPT_END()
@@ -673,22 +696,21 @@ static int drop_stash(int argc, const char **argv, const char *prefix)
 	argc = parse_options(argc, argv, prefix, options,
 			     git_stash_drop_usage, 0);
 
-	if (get_stash_info(&info, argc, argv))
-		return -1;
-
-	assert_stash_ref(&info);
+	if (get_stash_info_assert(&info, argc, argv))
+		goto cleanup;
 
 	ret = do_drop_stash(&info, quiet);
+cleanup:
 	free_stash_info(&info);
 	return ret;
 }
 
 static int pop_stash(int argc, const char **argv, const char *prefix)
 {
-	int ret;
+	int ret = -1;
 	int index = 0;
 	int quiet = 0;
-	struct stash_info info;
+	struct stash_info info = STASH_INFO_INIT;
 	struct option options[] = {
 		OPT__QUIET(&quiet, N_("be quiet, only report errors")),
 		OPT_BOOL(0, "index", &index,
@@ -699,25 +721,25 @@ static int pop_stash(int argc, const char **argv, const char *prefix)
 	argc = parse_options(argc, argv, prefix, options,
 			     git_stash_pop_usage, 0);
 
-	if (get_stash_info(&info, argc, argv))
-		return -1;
+	if (get_stash_info_assert(&info, argc, argv))
+		goto cleanup;
 
-	assert_stash_ref(&info);
 	if ((ret = do_apply_stash(prefix, &info, index, quiet)))
 		printf_ln(_("The stash entry is kept in case "
 			    "you need it again."));
 	else
 		ret = do_drop_stash(&info, quiet);
 
+cleanup:
 	free_stash_info(&info);
 	return ret;
 }
 
 static int branch_stash(int argc, const char **argv, const char *prefix)
 {
-	int ret;
+	int ret = -1;
 	const char *branch = NULL;
-	struct stash_info info;
+	struct stash_info info = STASH_INFO_INIT;
 	struct child_process cp = CHILD_PROCESS_INIT;
 	struct option options[] = {
 		OPT_END()
@@ -734,7 +756,7 @@ static int branch_stash(int argc, const char **argv, const char *prefix)
 	branch = argv[0];
 
 	if (get_stash_info(&info, argc - 1, argv + 1))
-		return -1;
+		goto cleanup;
 
 	cp.git_cmd = 1;
 	strvec_pushl(&cp.args, "checkout", "-b", NULL);
@@ -746,8 +768,8 @@ static int branch_stash(int argc, const char **argv, const char *prefix)
 	if (!ret && info.is_stash_ref)
 		ret = do_drop_stash(&info, 0);
 
+cleanup:
 	free_stash_info(&info);
-
 	return ret;
 }
 
@@ -825,8 +847,8 @@ static void diff_include_untracked(const struct stash_info *info, struct diff_op
 static int show_stash(int argc, const char **argv, const char *prefix)
 {
 	int i;
-	int ret = 0;
-	struct stash_info info;
+	int ret = -1;
+	struct stash_info info = STASH_INFO_INIT;
 	struct rev_info rev;
 	struct strvec stash_args = STRVEC_INIT;
 	struct strvec revision_args = STRVEC_INIT;
@@ -844,6 +866,7 @@ static int show_stash(int argc, const char **argv, const char *prefix)
 			      UNTRACKED_ONLY, PARSE_OPT_NONEG),
 		OPT_END()
 	};
+	int do_usage = 0;
 
 	init_diff_ui_defaults();
 	git_config(git_diff_ui_config, NULL);
@@ -861,10 +884,8 @@ static int show_stash(int argc, const char **argv, const char *prefix)
 			strvec_push(&revision_args, argv[i]);
 	}
 
-	ret = get_stash_info(&info, stash_args.nr, stash_args.v);
-	strvec_clear(&stash_args);
-	if (ret)
-		return -1;
+	if (get_stash_info(&info, stash_args.nr, stash_args.v))
+		goto cleanup;
 
 	/*
 	 * The config settings are applied only if there are not passed
@@ -878,16 +899,14 @@ static int show_stash(int argc, const char **argv, const char *prefix)
 			rev.diffopt.output_format |= DIFF_FORMAT_PATCH;
 
 		if (!show_stat && !show_patch) {
-			free_stash_info(&info);
-			return 0;
+			ret = 0;
+			goto cleanup;
 		}
 	}
 
 	argc = setup_revisions(revision_args.nr, revision_args.v, &rev, NULL);
-	if (argc > 1) {
-		free_stash_info(&info);
-		usage_with_options(git_stash_show_usage, options);
-	}
+	if (argc > 1)
+		goto usage;
 	if (!rev.diffopt.output_format) {
 		rev.diffopt.output_format = DIFF_FORMAT_PATCH;
 		diff_setup_done(&rev.diffopt);
@@ -912,8 +931,17 @@ static int show_stash(int argc, const char **argv, const char *prefix)
 	}
 	log_tree_diff_flush(&rev);
 
+	ret = diff_result_code(&rev.diffopt, 0);
+cleanup:
+	strvec_clear(&stash_args);
 	free_stash_info(&info);
-	return diff_result_code(&rev.diffopt, 0);
+	release_revisions(&rev);
+	if (do_usage)
+		usage_with_options(git_stash_show_usage, options);
+	return ret;
+usage:
+	do_usage = 1;
+	goto cleanup;
 }
 
 static int do_store_stash(const struct object_id *w_commit, const char *stash_msg,
@@ -1047,7 +1075,6 @@ static int check_changes_tracked_files(const struct pathspec *ps)
 		goto done;
 	}
 
-	object_array_clear(&rev.pending);
 	result = run_diff_files(&rev, 0);
 	if (diff_result_code(&rev.diffopt, result)) {
 		ret = 1;
@@ -1055,7 +1082,7 @@ static int check_changes_tracked_files(const struct pathspec *ps)
 	}
 
 done:
-	clear_pathspec(&rev.prune_data);
+	release_revisions(&rev);
 	return ret;
 }
 
@@ -1088,7 +1115,7 @@ static int save_untracked_files(struct stash_info *info, struct strbuf *msg,
 	cp_upd_index.git_cmd = 1;
 	strvec_pushl(&cp_upd_index.args, "update-index", "-z", "--add",
 		     "--remove", "--stdin", NULL);
-	strvec_pushf(&cp_upd_index.env_array, "GIT_INDEX_FILE=%s",
+	strvec_pushf(&cp_upd_index.env, "GIT_INDEX_FILE=%s",
 			 stash_index_path.buf);
 
 	strbuf_addf(&untracked_msg, "untracked files on %s\n", msg->buf);
@@ -1162,7 +1189,7 @@ static int stash_patch(struct stash_info *info, const struct pathspec *ps,
 
 	cp_read_tree.git_cmd = 1;
 	strvec_pushl(&cp_read_tree.args, "read-tree", "HEAD", NULL);
-	strvec_pushf(&cp_read_tree.env_array, "GIT_INDEX_FILE=%s",
+	strvec_pushf(&cp_read_tree.env, "GIT_INDEX_FILE=%s",
 		     stash_index_path.buf);
 	if (run_command(&cp_read_tree)) {
 		ret = -1;
@@ -1249,7 +1276,7 @@ static int stash_working_tree(struct stash_info *info, const struct pathspec *ps
 	strvec_pushl(&cp_upd_index.args, "update-index",
 		     "--ignore-skip-worktree-entries",
 		     "-z", "--add", "--remove", "--stdin", NULL);
-	strvec_pushf(&cp_upd_index.env_array, "GIT_INDEX_FILE=%s",
+	strvec_pushf(&cp_upd_index.env, "GIT_INDEX_FILE=%s",
 		     stash_index_path.buf);
 
 	if (pipe_command(&cp_upd_index, diff_output.buf, diff_output.len,
@@ -1266,9 +1293,7 @@ static int stash_working_tree(struct stash_info *info, const struct pathspec *ps
 
 done:
 	discard_index(&istate);
-	UNLEAK(rev);
-	object_array_clear(&rev.pending);
-	clear_pathspec(&rev.prune_data);
+	release_revisions(&rev);
 	strbuf_release(&diff_output);
 	remove_path(stash_index_path.buf);
 	return ret;
@@ -1410,9 +1435,9 @@ done:
 
 static int create_stash(int argc, const char **argv, const char *prefix)
 {
-	int ret = 0;
+	int ret;
 	struct strbuf stash_msg_buf = STRBUF_INIT;
-	struct stash_info info;
+	struct stash_info info = STASH_INFO_INIT;
 	struct pathspec ps;
 
 	/* Starting with argv[1], since argv[0] is "create" */
@@ -1427,6 +1452,7 @@ static int create_stash(int argc, const char **argv, const char *prefix)
 	if (!ret)
 		printf_ln("%s", oid_to_hex(&info.w_commit));
 
+	free_stash_info(&info);
 	strbuf_release(&stash_msg_buf);
 	return ret;
 }
@@ -1435,7 +1461,7 @@ static int do_push_stash(const struct pathspec *ps, const char *stash_msg, int q
 			 int keep_index, int patch_mode, int include_untracked, int only_staged)
 {
 	int ret = 0;
-	struct stash_info info;
+	struct stash_info info = STASH_INFO_INIT;
 	struct strbuf patch = STRBUF_INIT;
 	struct strbuf stash_msg_buf = STRBUF_INIT;
 	struct strbuf untracked_files = STRBUF_INIT;
@@ -1525,7 +1551,7 @@ static int do_push_stash(const struct pathspec *ps, const char *stash_msg, int q
 			cp.git_cmd = 1;
 			if (startup_info->original_cwd) {
 				cp.dir = startup_info->original_cwd;
-				strvec_pushf(&cp.env_array, "%s=%s",
+				strvec_pushf(&cp.env, "%s=%s",
 					     GIT_WORK_TREE_ENVIRONMENT,
 					     the_repository->worktree);
 			}
@@ -1634,6 +1660,7 @@ static int do_push_stash(const struct pathspec *ps, const char *stash_msg, int q
 	}
 
 done:
+	free_stash_info(&info);
 	strbuf_release(&stash_msg_buf);
 	return ret;
 }
@@ -1770,6 +1797,9 @@ int cmd_stash(int argc, const char **argv, const char *prefix)
 	argc = parse_options(argc, argv, prefix, options, git_stash_usage,
 			     PARSE_OPT_KEEP_UNKNOWN | PARSE_OPT_KEEP_DASHDASH);
 
+	prepare_repo_settings(the_repository);
+	the_repository->settings.command_requires_full_index = 0;
+
 	index_file = get_index_file();
 	strbuf_addf(&stash_index_path, "%s.stash.%" PRIuMAX, index_file,
 		    (uintmax_t)pid);
diff --git a/builtin/submodule--helper.c b/builtin/submodule--helper.c
index 1a8e5d0621..c597df7528 100644
--- a/builtin/submodule--helper.c
+++ b/builtin/submodule--helper.c
@@ -72,135 +72,6 @@ static char *get_default_remote(void)
 	return repo_get_default_remote(the_repository);
 }
 
-static int starts_with_dot_slash(const char *str)
-{
-	return str[0] == '.' && is_dir_sep(str[1]);
-}
-
-static int starts_with_dot_dot_slash(const char *str)
-{
-	return str[0] == '.' && str[1] == '.' && is_dir_sep(str[2]);
-}
-
-/*
- * Returns 1 if it was the last chop before ':'.
- */
-static int chop_last_dir(char **remoteurl, int is_relative)
-{
-	char *rfind = find_last_dir_sep(*remoteurl);
-	if (rfind) {
-		*rfind = '\0';
-		return 0;
-	}
-
-	rfind = strrchr(*remoteurl, ':');
-	if (rfind) {
-		*rfind = '\0';
-		return 1;
-	}
-
-	if (is_relative || !strcmp(".", *remoteurl))
-		die(_("cannot strip one component off url '%s'"),
-			*remoteurl);
-
-	free(*remoteurl);
-	*remoteurl = xstrdup(".");
-	return 0;
-}
-
-/*
- * The `url` argument is the URL that navigates to the submodule origin
- * repo. When relative, this URL is relative to the superproject origin
- * URL repo. The `up_path` argument, if specified, is the relative
- * path that navigates from the submodule working tree to the superproject
- * working tree. Returns the origin URL of the submodule.
- *
- * Return either an absolute URL or filesystem path (if the superproject
- * origin URL is an absolute URL or filesystem path, respectively) or a
- * relative file system path (if the superproject origin URL is a relative
- * file system path).
- *
- * When the output is a relative file system path, the path is either
- * relative to the submodule working tree, if up_path is specified, or to
- * the superproject working tree otherwise.
- *
- * NEEDSWORK: This works incorrectly on the domain and protocol part.
- * remote_url      url              outcome          expectation
- * http://a.com/b  ../c             http://a.com/c   as is
- * http://a.com/b/ ../c             http://a.com/c   same as previous line, but
- *                                                   ignore trailing slash in url
- * http://a.com/b  ../../c          http://c         error out
- * http://a.com/b  ../../../c       http:/c          error out
- * http://a.com/b  ../../../../c    http:c           error out
- * http://a.com/b  ../../../../../c    .:c           error out
- * NEEDSWORK: Given how chop_last_dir() works, this function is broken
- * when a local part has a colon in its path component, too.
- */
-static char *relative_url(const char *remote_url,
-				const char *url,
-				const char *up_path)
-{
-	int is_relative = 0;
-	int colonsep = 0;
-	char *out;
-	char *remoteurl = xstrdup(remote_url);
-	struct strbuf sb = STRBUF_INIT;
-	size_t len = strlen(remoteurl);
-
-	if (is_dir_sep(remoteurl[len-1]))
-		remoteurl[len-1] = '\0';
-
-	if (!url_is_local_not_ssh(remoteurl) || is_absolute_path(remoteurl))
-		is_relative = 0;
-	else {
-		is_relative = 1;
-		/*
-		 * Prepend a './' to ensure all relative
-		 * remoteurls start with './' or '../'
-		 */
-		if (!starts_with_dot_slash(remoteurl) &&
-		    !starts_with_dot_dot_slash(remoteurl)) {
-			strbuf_reset(&sb);
-			strbuf_addf(&sb, "./%s", remoteurl);
-			free(remoteurl);
-			remoteurl = strbuf_detach(&sb, NULL);
-		}
-	}
-	/*
-	 * When the url starts with '../', remove that and the
-	 * last directory in remoteurl.
-	 */
-	while (url) {
-		if (starts_with_dot_dot_slash(url)) {
-			url += 3;
-			colonsep |= chop_last_dir(&remoteurl, is_relative);
-		} else if (starts_with_dot_slash(url))
-			url += 2;
-		else
-			break;
-	}
-	strbuf_reset(&sb);
-	strbuf_addf(&sb, "%s%s%s", remoteurl, colonsep ? ":" : "/", url);
-	if (ends_with(url, "/"))
-		strbuf_setlen(&sb, sb.len - 1);
-	free(remoteurl);
-
-	if (starts_with_dot_slash(sb.buf))
-		out = xstrdup(sb.buf + 2);
-	else
-		out = xstrdup(sb.buf);
-
-	if (!up_path || !is_relative) {
-		strbuf_release(&sb);
-		return out;
-	}
-
-	strbuf_reset(&sb);
-	strbuf_addf(&sb, "%s%s", up_path, out);
-	free(out);
-	return strbuf_detach(&sb, NULL);
-}
-
 static char *resolve_relative_url(const char *rel_url, const char *up_path, int quiet)
 {
 	char *remoteurl, *resolved_url;
@@ -292,7 +163,7 @@ static char *compute_rev_name(const char *sub_path, const char* object_id)
 
 	for (d = describe_argv; *d; d++) {
 		struct child_process cp = CHILD_PROCESS_INIT;
-		prepare_submodule_repo_env(&cp.env_array);
+		prepare_submodule_repo_env(&cp.env);
 		cp.dir = sub_path;
 		cp.git_cmd = 1;
 		cp.no_stderr = 1;
@@ -479,7 +350,7 @@ static void runcommand_in_submodule_cb(const struct cache_entry *list_item,
 	if (!is_submodule_populated_gently(path, NULL))
 		goto cleanup;
 
-	prepare_submodule_repo_env(&cp.env_array);
+	prepare_submodule_repo_env(&cp.env);
 
 	/*
 	 * For the purpose of executing <command> in the submodule,
@@ -499,12 +370,12 @@ static void runcommand_in_submodule_cb(const struct cache_entry *list_item,
 		char *toplevel = xgetcwd();
 		struct strbuf sb = STRBUF_INIT;
 
-		strvec_pushf(&cp.env_array, "name=%s", sub->name);
-		strvec_pushf(&cp.env_array, "sm_path=%s", path);
-		strvec_pushf(&cp.env_array, "displaypath=%s", displaypath);
-		strvec_pushf(&cp.env_array, "sha1=%s",
+		strvec_pushf(&cp.env, "name=%s", sub->name);
+		strvec_pushf(&cp.env, "sm_path=%s", path);
+		strvec_pushf(&cp.env, "displaypath=%s", displaypath);
+		strvec_pushf(&cp.env, "sha1=%s",
 			     oid_to_hex(ce_oid));
-		strvec_pushf(&cp.env_array, "toplevel=%s", toplevel);
+		strvec_pushf(&cp.env, "toplevel=%s", toplevel);
 
 		/*
 		 * Since the path variable was accessible from the script
@@ -513,7 +384,7 @@ static void runcommand_in_submodule_cb(const struct cache_entry *list_item,
 		 * on windows. And since environment variables are
 		 * case-insensitive in windows, it interferes with the
 		 * existing PATH variable. Hence, to avoid that, we expose
-		 * path via the args strvec and not via env_array.
+		 * path via the args strvec and not via env.
 		 */
 		sq_quote_buf(&sb, path);
 		strvec_pushf(&cp.args, "path=%s; %s",
@@ -536,7 +407,7 @@ static void runcommand_in_submodule_cb(const struct cache_entry *list_item,
 
 		cpr.git_cmd = 1;
 		cpr.dir = path;
-		prepare_submodule_repo_env(&cpr.env_array);
+		prepare_submodule_repo_env(&cpr.env);
 
 		strvec_pushl(&cpr.args, "--super-prefix", NULL);
 		strvec_pushf(&cpr.args, "%s/", displaypath);
@@ -592,6 +463,18 @@ static int module_foreach(int argc, const char **argv, const char *prefix)
 	return 0;
 }
 
+static int starts_with_dot_slash(const char *const path)
+{
+	return path_match_flags(path, PATH_MATCH_STARTS_WITH_DOT_SLASH |
+				PATH_MATCH_XPLATFORM);
+}
+
+static int starts_with_dot_dot_slash(const char *const path)
+{
+	return path_match_flags(path, PATH_MATCH_STARTS_WITH_DOT_DOT_SLASH |
+				PATH_MATCH_XPLATFORM);
+}
+
 struct init_cb {
 	const char *prefix;
 	const char *superprefix;
@@ -766,7 +649,7 @@ static void status_submodule(const char *path, const struct object_id *ce_oid,
 {
 	char *displaypath;
 	struct strvec diff_files_args = STRVEC_INIT;
-	struct rev_info rev;
+	struct rev_info rev = REV_INFO_INIT;
 	int diff_files_result;
 	struct strbuf buf = STRBUF_INIT;
 	const char *git_dir;
@@ -833,7 +716,7 @@ static void status_submodule(const char *path, const struct object_id *ce_oid,
 
 		cpr.git_cmd = 1;
 		cpr.dir = path;
-		prepare_submodule_repo_env(&cpr.env_array);
+		prepare_submodule_repo_env(&cpr.env);
 
 		strvec_push(&cpr.args, "--super-prefix");
 		strvec_pushf(&cpr.args, "%s/", displaypath);
@@ -853,6 +736,7 @@ static void status_submodule(const char *path, const struct object_id *ce_oid,
 cleanup:
 	strvec_clear(&diff_files_args);
 	free(displaypath);
+	release_revisions(&rev);
 }
 
 static void status_submodule_cb(const struct cache_entry *list_item,
@@ -955,7 +839,7 @@ static char *verify_submodule_committish(const char *sm_path,
 
 	cp_rev_parse.git_cmd = 1;
 	cp_rev_parse.dir = sm_path;
-	prepare_submodule_repo_env(&cp_rev_parse.env_array);
+	prepare_submodule_repo_env(&cp_rev_parse.env);
 	strvec_pushl(&cp_rev_parse.args, "rev-parse", "-q", "--short", NULL);
 	strvec_pushf(&cp_rev_parse.args, "%s^0", committish);
 	strvec_push(&cp_rev_parse.args, "--");
@@ -996,7 +880,7 @@ static void print_submodule_summary(struct summary_cb *info, char *errmsg,
 
 		cp_log.git_cmd = 1;
 		cp_log.dir = p->sm_path;
-		prepare_submodule_repo_env(&cp_log.env_array);
+		prepare_submodule_repo_env(&cp_log.env);
 		strvec_pushl(&cp_log.args, "log", NULL);
 
 		if (S_ISGITLINK(p->mod_src) && S_ISGITLINK(p->mod_dst)) {
@@ -1113,7 +997,7 @@ static void generate_submodule_summary(struct summary_cb *info,
 
 		cp_rev_list.git_cmd = 1;
 		cp_rev_list.dir = p->sm_path;
-		prepare_submodule_repo_env(&cp_rev_list.env_array);
+		prepare_submodule_repo_env(&cp_rev_list.env);
 
 		if (!capture_command(&cp_rev_list, &sb_rev_list, 0))
 			total_commits = atoi(sb_rev_list.buf);
@@ -1231,6 +1115,7 @@ static int compute_summary_module_list(struct object_id *head_oid,
 	struct strvec diff_args = STRVEC_INIT;
 	struct rev_info rev;
 	struct module_cb_list list = MODULE_CB_LIST_INIT;
+	int ret = 0;
 
 	strvec_push(&diff_args, get_diff_cmd(diff_cmd));
 	if (info->cached)
@@ -1256,11 +1141,13 @@ static int compute_summary_module_list(struct object_id *head_oid,
 			setup_work_tree();
 		if (read_cache_preload(&rev.diffopt.pathspec) < 0) {
 			perror("read_cache_preload");
-			return -1;
+			ret = -1;
+			goto cleanup;
 		}
 	} else if (read_cache() < 0) {
 		perror("read_cache");
-		return -1;
+		ret = -1;
+		goto cleanup;
 	}
 
 	if (diff_cmd == DIFF_INDEX)
@@ -1268,8 +1155,10 @@ static int compute_summary_module_list(struct object_id *head_oid,
 	else
 		run_diff_files(&rev, 0);
 	prepare_submodule_summary(info, &list);
+cleanup:
 	strvec_clear(&diff_args);
-	return 0;
+	release_revisions(&rev);
+	return ret;
 }
 
 static int module_summary(int argc, const char **argv, const char *prefix)
@@ -1414,7 +1303,7 @@ static void sync_submodule(const char *path, const char *prefix,
 
 		cpr.git_cmd = 1;
 		cpr.dir = path;
-		prepare_submodule_repo_env(&cpr.env_array);
+		prepare_submodule_repo_env(&cpr.env);
 
 		strvec_push(&cpr.args, "--super-prefix");
 		strvec_pushf(&cpr.args, "%s/", displaypath);
@@ -1819,7 +1708,7 @@ static int clone_submodule(struct module_clone_data *clone_data)
 		strvec_push(&cp.args, clone_data->path);
 
 		cp.git_cmd = 1;
-		prepare_submodule_repo_env(&cp.env_array);
+		prepare_submodule_repo_env(&cp.env);
 		cp.no_stdin = 1;
 
 		if(run_command(&cp))
@@ -2294,7 +2183,7 @@ static int is_tip_reachable(const char *path, struct object_id *oid)
 	cp.no_stderr = 1;
 	strvec_pushl(&cp.args, "rev-list", "-n", "1", hex, "--not", "--all", NULL);
 
-	prepare_submodule_repo_env(&cp.env_array);
+	prepare_submodule_repo_env(&cp.env);
 
 	if (capture_command(&cp, &rev, GIT_MAX_HEXSZ + 1) || rev.len)
 		return 0;
@@ -2306,7 +2195,7 @@ static int fetch_in_submodule(const char *module_path, int depth, int quiet, str
 {
 	struct child_process cp = CHILD_PROCESS_INIT;
 
-	prepare_submodule_repo_env(&cp.env_array);
+	prepare_submodule_repo_env(&cp.env);
 	cp.git_cmd = 1;
 	cp.dir = xstrdup(module_path);
 
@@ -2319,6 +2208,7 @@ static int fetch_in_submodule(const char *module_path, int depth, int quiet, str
 		char *hex = oid_to_hex(oid);
 		char *remote = get_default_remote();
 		strvec_pushl(&cp.args, remote, hex, NULL);
+		free(remote);
 	}
 
 	return run_command(&cp);
@@ -2363,7 +2253,7 @@ static int run_update_command(struct update_data *ud, int subforce)
 	strvec_push(&cp.args, oid);
 
 	cp.dir = xstrdup(ud->sm_path);
-	prepare_submodule_repo_env(&cp.env_array);
+	prepare_submodule_repo_env(&cp.env);
 	if (run_command(&cp)) {
 		switch (ud->update_strategy.type) {
 		case SM_UPDATE_CHECKOUT:
@@ -2629,7 +2519,7 @@ static int update_submodule(struct update_data *update_data)
 
 		cp.dir = update_data->sm_path;
 		cp.git_cmd = 1;
-		prepare_submodule_repo_env(&cp.env_array);
+		prepare_submodule_repo_env(&cp.env);
 		update_data_to_args(&next, &cp.args);
 
 		/* die() if child process die()'d */
@@ -3122,9 +3012,9 @@ static void append_fetch_remotes(struct strbuf *msg, const char *git_dir_path)
 	struct strbuf sb_remote_out = STRBUF_INIT;
 
 	cp_remote.git_cmd = 1;
-	strvec_pushf(&cp_remote.env_array,
+	strvec_pushf(&cp_remote.env,
 		     "GIT_DIR=%s", git_dir_path);
-	strvec_push(&cp_remote.env_array, "GIT_WORK_TREE=.");
+	strvec_push(&cp_remote.env, "GIT_WORK_TREE=.");
 	strvec_pushl(&cp_remote.args, "remote", "-v", NULL);
 	if (!capture_command(&cp_remote, &sb_remote_out, 0)) {
 		char *next_line;
@@ -3208,7 +3098,7 @@ static int add_submodule(const struct add_data *add_data)
 		if (clone_submodule(&clone_data))
 			return -1;
 
-		prepare_submodule_repo_env(&cp.env_array);
+		prepare_submodule_repo_env(&cp.env);
 		cp.git_cmd = 1;
 		cp.dir = add_data->sm_path;
 		/*
@@ -3377,7 +3267,7 @@ static int module_add(int argc, const char **argv, const char *prefix)
 			   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 "
+			   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()
diff --git a/builtin/tag.c b/builtin/tag.c
index e5a8f85693..75dece0e4f 100644
--- a/builtin/tag.c
+++ b/builtin/tag.c
@@ -364,7 +364,7 @@ static void create_reflog_msg(const struct object_id *oid, struct strbuf *sb)
 		strbuf_addstr(sb, "object of unknown type");
 		break;
 	case OBJ_COMMIT:
-		if ((buf = read_object_file(oid, &type, &size)) != NULL) {
+		if ((buf = read_object_file(oid, &type, &size))) {
 			subject_len = find_commit_subject(buf, &subject_start);
 			strbuf_insert(sb, sb->len, subject_start, subject_len);
 		} else {
@@ -372,7 +372,7 @@ static void create_reflog_msg(const struct object_id *oid, struct strbuf *sb)
 		}
 		free(buf);
 
-		if ((c = lookup_commit_reference(the_repository, oid)) != NULL)
+		if ((c = lookup_commit_reference(the_repository, oid)))
 			strbuf_addf(sb, ", %s", show_date(c->date, 0, DATE_MODE(SHORT)));
 		break;
 	case OBJ_TREE:
diff --git a/builtin/unpack-objects.c b/builtin/unpack-objects.c
index dbeb0680a5..56d05e2725 100644
--- a/builtin/unpack-objects.c
+++ b/builtin/unpack-objects.c
@@ -1,5 +1,6 @@
 #include "builtin.h"
 #include "cache.h"
+#include "bulk-checkin.h"
 #include "config.h"
 #include "object-store.h"
 #include "object.h"
@@ -503,10 +504,12 @@ static void unpack_all(void)
 	if (!quiet)
 		progress = start_progress(_("Unpacking objects"), nr_objects);
 	CALLOC_ARRAY(obj_list, nr_objects);
+	begin_odb_transaction();
 	for (i = 0; i < nr_objects; i++) {
 		unpack_one(i);
 		display_progress(progress, i + 1);
 	}
+	end_odb_transaction();
 	stop_progress(&progress);
 
 	if (delta_list)
diff --git a/builtin/update-index.c b/builtin/update-index.c
index 876112abb2..b62249905f 100644
--- a/builtin/update-index.c
+++ b/builtin/update-index.c
@@ -5,6 +5,7 @@
  */
 #define USE_THE_INDEX_COMPATIBILITY_MACROS
 #include "cache.h"
+#include "bulk-checkin.h"
 #include "config.h"
 #include "lockfile.h"
 #include "quote.h"
@@ -57,6 +58,14 @@ static void report(const char *fmt, ...)
 	if (!verbose)
 		return;
 
+	/*
+	 * It is possible, though unlikely, that a caller could use the verbose
+	 * output to synchronize with addition of objects to the object
+	 * database. The current implementation of ODB transactions leaves
+	 * objects invisible while a transaction is active, so flush the
+	 * transaction here before reporting a change made by update-index.
+	 */
+	flush_odb_transaction();
 	va_start(vp, fmt);
 	vprintf(fmt, vp);
 	putchar('\n');
@@ -1116,6 +1125,12 @@ int cmd_update_index(int argc, const char **argv, const char *prefix)
 	 */
 	parse_options_start(&ctx, argc, argv, prefix,
 			    options, PARSE_OPT_STOP_AT_NON_OPTION);
+
+	/*
+	 * Allow the object layer to optimize adding multiple objects in
+	 * a batch.
+	 */
+	begin_odb_transaction();
 	while (ctx.argc) {
 		if (parseopt_state != PARSE_OPT_DONE)
 			parseopt_state = parse_options_step(&ctx, options,
@@ -1190,6 +1205,11 @@ int cmd_update_index(int argc, const char **argv, const char *prefix)
 		strbuf_release(&buf);
 	}
 
+	/*
+	 * By now we have added all of the new objects
+	 */
+	end_odb_transaction();
+
 	if (split_index > 0) {
 		if (git_config_get_split_index() == 0)
 			warning(_("core.splitIndex is set to false; "
@@ -1237,6 +1257,22 @@ int cmd_update_index(int argc, const char **argv, const char *prefix)
 
 	if (fsmonitor > 0) {
 		enum fsmonitor_mode fsm_mode = fsm_settings__get_mode(r);
+		enum fsmonitor_reason reason = fsm_settings__get_reason(r);
+
+		/*
+		 * The user wants to turn on FSMonitor using the command
+		 * line argument.  (We don't know (or care) whether that
+		 * is the IPC or HOOK version.)
+		 *
+		 * Use one of the __get routines to force load the FSMonitor
+		 * config settings into the repo-settings.  That will detect
+		 * whether the file system is compatible so that we can stop
+		 * here with a nice error message.
+		 */
+		if (reason > FSMONITOR_REASON_OK)
+			die("%s",
+			    fsm_settings__get_incompatible_msg(r, reason));
+
 		if (fsm_mode == FSMONITOR_MODE_DISABLED) {
 			warning(_("core.fsmonitor is unset; "
 				"set it if you really want to "
diff --git a/builtin/worktree.c b/builtin/worktree.c
index 8b32cd1651..cd62eef240 100644
--- a/builtin/worktree.c
+++ b/builtin/worktree.c
@@ -301,7 +301,7 @@ static int checkout_worktree(const struct add_opts *opts,
 	strvec_pushl(&cp.args, "reset", "--hard", "--no-recurse-submodules", NULL);
 	if (opts->quiet)
 		strvec_push(&cp.args, "--quiet");
-	strvec_pushv(&cp.env_array, child_env->v);
+	strvec_pushv(&cp.env, child_env->v);
 	return run_command(&cp);
 }
 
@@ -433,7 +433,7 @@ static int add_worktree(const char *path, const char *refname,
 			strvec_push(&cp.args, "--quiet");
 	}
 
-	strvec_pushv(&cp.env_array, child_env.v);
+	strvec_pushv(&cp.env, child_env.v);
 	ret = run_command(&cp);
 	if (ret)
 		goto done;
@@ -989,9 +989,9 @@ static void check_clean_worktree(struct worktree *wt,
 	validate_no_submodules(wt);
 
 	child_process_init(&cp);
-	strvec_pushf(&cp.env_array, "%s=%s/.git",
+	strvec_pushf(&cp.env, "%s=%s/.git",
 		     GIT_DIR_ENVIRONMENT, wt->path);
-	strvec_pushf(&cp.env_array, "%s=%s",
+	strvec_pushf(&cp.env, "%s=%s",
 		     GIT_WORK_TREE_ENVIRONMENT, wt->path);
 	strvec_pushl(&cp.args, "status",
 		     "--porcelain", "--ignore-submodules=none",
diff --git a/bulk-checkin.c b/bulk-checkin.c
index 6d6c37171c..98ec893842 100644
--- a/bulk-checkin.c
+++ b/bulk-checkin.c
@@ -3,16 +3,21 @@
  */
 #include "cache.h"
 #include "bulk-checkin.h"
+#include "lockfile.h"
 #include "repository.h"
 #include "csum-file.h"
 #include "pack.h"
 #include "strbuf.h"
+#include "string-list.h"
+#include "tmp-objdir.h"
 #include "packfile.h"
 #include "object-store.h"
 
-static struct bulk_checkin_state {
-	unsigned plugged:1;
+static int odb_transaction_nesting;
 
+static struct tmp_objdir *bulk_fsync_objdir;
+
+static struct bulk_checkin_packfile {
 	char *pack_tmp_name;
 	struct hashfile *f;
 	off_t offset;
@@ -21,7 +26,7 @@ static struct bulk_checkin_state {
 	struct pack_idx_entry **written;
 	uint32_t alloc_written;
 	uint32_t nr_written;
-} state;
+} bulk_checkin_packfile;
 
 static void finish_tmp_packfile(struct strbuf *basename,
 				const char *pack_tmp_name,
@@ -33,13 +38,13 @@ static void finish_tmp_packfile(struct strbuf *basename,
 	char *idx_tmp_name = NULL;
 
 	stage_tmp_packfiles(basename, pack_tmp_name, written_list, nr_written,
-			    pack_idx_opts, hash, &idx_tmp_name);
+			    NULL, pack_idx_opts, hash, &idx_tmp_name);
 	rename_tmp_packfile_idx(basename, &idx_tmp_name);
 
 	free(idx_tmp_name);
 }
 
-static void finish_bulk_checkin(struct bulk_checkin_state *state)
+static void flush_bulk_checkin_packfile(struct bulk_checkin_packfile *state)
 {
 	unsigned char hash[GIT_MAX_RAWSZ];
 	struct strbuf packname = STRBUF_INIT;
@@ -80,7 +85,41 @@ clear_exit:
 	reprepare_packed_git(the_repository);
 }
 
-static int already_written(struct bulk_checkin_state *state, struct object_id *oid)
+/*
+ * Cleanup after batch-mode fsync_object_files.
+ */
+static void flush_batch_fsync(void)
+{
+	struct strbuf temp_path = STRBUF_INIT;
+	struct tempfile *temp;
+
+	if (!bulk_fsync_objdir)
+		return;
+
+	/*
+	 * Issue a full hardware flush against a temporary file to ensure
+	 * that all objects are durable before any renames occur. The code in
+	 * fsync_loose_object_bulk_checkin has already issued a writeout
+	 * request, but it has not flushed any writeback cache in the storage
+	 * hardware or any filesystem logs. This fsync call acts as a barrier
+	 * to ensure that the data in each new object file is durable before
+	 * the final name is visible.
+	 */
+	strbuf_addf(&temp_path, "%s/bulk_fsync_XXXXXX", get_object_directory());
+	temp = xmks_tempfile(temp_path.buf);
+	fsync_or_die(get_tempfile_fd(temp), get_tempfile_path(temp));
+	delete_tempfile(&temp);
+	strbuf_release(&temp_path);
+
+	/*
+	 * Make the object files visible in the primary ODB after their data is
+	 * fully durable.
+	 */
+	tmp_objdir_migrate(bulk_fsync_objdir);
+	bulk_fsync_objdir = NULL;
+}
+
+static int already_written(struct bulk_checkin_packfile *state, struct object_id *oid)
 {
 	int i;
 
@@ -112,7 +151,7 @@ static int already_written(struct bulk_checkin_state *state, struct object_id *o
  * status before calling us just in case we ask it to call us again
  * with a new pack.
  */
-static int stream_to_pack(struct bulk_checkin_state *state,
+static int stream_to_pack(struct bulk_checkin_packfile *state,
 			  git_hash_ctx *ctx, off_t *already_hashed_to,
 			  int fd, size_t size, enum object_type type,
 			  const char *path, unsigned flags)
@@ -189,7 +228,7 @@ static int stream_to_pack(struct bulk_checkin_state *state,
 }
 
 /* Lazily create backing packfile for the state */
-static void prepare_to_stream(struct bulk_checkin_state *state,
+static void prepare_to_stream(struct bulk_checkin_packfile *state,
 			      unsigned flags)
 {
 	if (!(flags & HASH_WRITE_OBJECT) || state->f)
@@ -204,7 +243,7 @@ static void prepare_to_stream(struct bulk_checkin_state *state,
 		die_errno("unable to write pack header");
 }
 
-static int deflate_to_pack(struct bulk_checkin_state *state,
+static int deflate_to_pack(struct bulk_checkin_packfile *state,
 			   struct object_id *result_oid,
 			   int fd, size_t size,
 			   enum object_type type, const char *path,
@@ -251,7 +290,7 @@ static int deflate_to_pack(struct bulk_checkin_state *state,
 			BUG("should not happen");
 		hashfile_truncate(state->f, &checkpoint);
 		state->offset = checkpoint.offset;
-		finish_bulk_checkin(state);
+		flush_bulk_checkin_packfile(state);
 		if (lseek(fd, seekback, SEEK_SET) == (off_t) -1)
 			return error("cannot seek back");
 	}
@@ -274,25 +313,67 @@ static int deflate_to_pack(struct bulk_checkin_state *state,
 	return 0;
 }
 
+void prepare_loose_object_bulk_checkin(void)
+{
+	/*
+	 * We lazily create the temporary object directory
+	 * the first time an object might be added, since
+	 * callers may not know whether any objects will be
+	 * added at the time they call begin_odb_transaction.
+	 */
+	if (!odb_transaction_nesting || bulk_fsync_objdir)
+		return;
+
+	bulk_fsync_objdir = tmp_objdir_create("bulk-fsync");
+	if (bulk_fsync_objdir)
+		tmp_objdir_replace_primary_odb(bulk_fsync_objdir, 0);
+}
+
+void fsync_loose_object_bulk_checkin(int fd, const char *filename)
+{
+	/*
+	 * If we have an active ODB transaction, we issue a call that
+	 * cleans the filesystem page cache but avoids a hardware flush
+	 * command. Later on we will issue a single hardware flush
+	 * before renaming the objects to their final names as part of
+	 * flush_batch_fsync.
+	 */
+	if (!bulk_fsync_objdir ||
+	    git_fsync(fd, FSYNC_WRITEOUT_ONLY) < 0) {
+		fsync_or_die(fd, filename);
+	}
+}
+
 int index_bulk_checkin(struct object_id *oid,
 		       int fd, size_t size, enum object_type type,
 		       const char *path, unsigned flags)
 {
-	int status = deflate_to_pack(&state, oid, fd, size, type,
+	int status = deflate_to_pack(&bulk_checkin_packfile, oid, fd, size, type,
 				     path, flags);
-	if (!state.plugged)
-		finish_bulk_checkin(&state);
+	if (!odb_transaction_nesting)
+		flush_bulk_checkin_packfile(&bulk_checkin_packfile);
 	return status;
 }
 
-void plug_bulk_checkin(void)
+void begin_odb_transaction(void)
 {
-	state.plugged = 1;
+	odb_transaction_nesting += 1;
 }
 
-void unplug_bulk_checkin(void)
+void flush_odb_transaction(void)
 {
-	state.plugged = 0;
-	if (state.f)
-		finish_bulk_checkin(&state);
+	flush_batch_fsync();
+	flush_bulk_checkin_packfile(&bulk_checkin_packfile);
+}
+
+void end_odb_transaction(void)
+{
+	odb_transaction_nesting -= 1;
+	if (odb_transaction_nesting < 0)
+		BUG("Unbalanced ODB transaction nesting");
+
+	if (odb_transaction_nesting)
+		return;
+
+	flush_odb_transaction();
 }
diff --git a/bulk-checkin.h b/bulk-checkin.h
index b26f3dc3b7..8281b9cb15 100644
--- a/bulk-checkin.h
+++ b/bulk-checkin.h
@@ -6,11 +6,34 @@
 
 #include "cache.h"
 
+void prepare_loose_object_bulk_checkin(void);
+void fsync_loose_object_bulk_checkin(int fd, const char *filename);
+
 int index_bulk_checkin(struct object_id *oid,
 		       int fd, size_t size, enum object_type type,
 		       const char *path, unsigned flags);
 
-void plug_bulk_checkin(void);
-void unplug_bulk_checkin(void);
+/*
+ * Tell the object database to optimize for adding
+ * multiple objects. end_odb_transaction must be called
+ * to make new objects visible. Transactions can be nested,
+ * and objects are only visible after the outermost transaction
+ * is complete or the transaction is flushed.
+ */
+void begin_odb_transaction(void);
+
+/*
+ * Make any objects that are currently part of a pending object
+ * database transaction visible. It is valid to call this function
+ * even if no transaction is active.
+ */
+void flush_odb_transaction(void);
+
+/*
+ * Tell the object database to make any objects from the
+ * current transaction visible if this is the final nested
+ * transaction.
+ */
+void end_odb_transaction(void);
 
 #endif
diff --git a/bundle.c b/bundle.c
index d50cfb5aa7..0208e6d90d 100644
--- a/bundle.c
+++ b/bundle.c
@@ -66,8 +66,8 @@ static int parse_bundle_signature(struct bundle_header *header, const char *line
 	return -1;
 }
 
-static int parse_bundle_header(int fd, struct bundle_header *header,
-			       const char *report_path)
+int read_bundle_header_fd(int fd, struct bundle_header *header,
+			  const char *report_path)
 {
 	struct strbuf buf = STRBUF_INIT;
 	int status = 0;
@@ -143,7 +143,7 @@ int read_bundle_header(const char *path, struct bundle_header *header)
 
 	if (fd < 0)
 		return error(_("could not open '%s'"), path);
-	return parse_bundle_header(fd, header, path);
+	return read_bundle_header_fd(fd, header, path);
 }
 
 int is_bundle(const char *path, int quiet)
@@ -153,7 +153,7 @@ int is_bundle(const char *path, int quiet)
 
 	if (fd < 0)
 		return 0;
-	fd = parse_bundle_header(fd, &header, quiet ? NULL : path);
+	fd = read_bundle_header_fd(fd, &header, quiet ? NULL : path);
 	if (fd >= 0)
 		close(fd);
 	bundle_header_release(&header);
@@ -196,14 +196,16 @@ int verify_bundle(struct repository *r,
 	 * to be verbose about the errors
 	 */
 	struct string_list *p = &header->prerequisites;
-	struct rev_info revs;
+	struct rev_info revs = REV_INFO_INIT;
 	const char *argv[] = {NULL, "--all", NULL};
 	struct commit *commit;
 	int i, ret = 0, req_nr;
 	const char *message = _("Repository lacks these prerequisite commits:");
 
-	if (!r || !r->objects || !r->objects->odb)
-		return error(_("need a repository to verify a bundle"));
+	if (!r || !r->objects || !r->objects->odb) {
+		ret = error(_("need a repository to verify a bundle"));
+		goto cleanup;
+	}
 
 	repo_init_revisions(r, &revs, NULL);
 	for (i = 0; i < p->nr; i++) {
@@ -221,7 +223,7 @@ int verify_bundle(struct repository *r,
 		error("%s %s", oid_to_hex(oid), name);
 	}
 	if (revs.pending.nr != p->nr)
-		return ret;
+		goto cleanup;
 	req_nr = revs.pending.nr;
 	setup_revisions(2, argv, &revs, NULL);
 
@@ -284,6 +286,8 @@ int verify_bundle(struct repository *r,
 			printf_ln("The bundle uses this filter: %s",
 				  list_objects_filter_spec(&header->filter));
 	}
+cleanup:
+	release_revisions(&revs);
 	return ret;
 }
 
diff --git a/bundle.h b/bundle.h
index 7fef2108f4..0c052f5496 100644
--- a/bundle.h
+++ b/bundle.h
@@ -24,6 +24,8 @@ void bundle_header_release(struct bundle_header *header);
 
 int is_bundle(const char *path, int quiet);
 int read_bundle_header(const char *path, struct bundle_header *header);
+int read_bundle_header_fd(int fd, struct bundle_header *header,
+			  const char *report_path);
 int create_bundle(struct repository *r, const char *path,
 		  int argc, const char **argv, struct strvec *pack_options,
 		  int version);
diff --git a/cache-tree.c b/cache-tree.c
index 6752f69d51..56db0b5026 100644
--- a/cache-tree.c
+++ b/cache-tree.c
@@ -3,6 +3,7 @@
 #include "tree.h"
 #include "tree-walk.h"
 #include "cache-tree.h"
+#include "bulk-checkin.h"
 #include "object-store.h"
 #include "replace-object.h"
 #include "promisor-remote.h"
@@ -474,8 +475,10 @@ int cache_tree_update(struct index_state *istate, int flags)
 
 	trace_performance_enter();
 	trace2_region_enter("cache_tree", "update", the_repository);
+	begin_odb_transaction();
 	i = update_one(istate->cache_tree, istate->cache, istate->cache_nr,
 		       "", 0, &skip, flags);
+	end_odb_transaction();
 	trace2_region_leave("cache_tree", "update", the_repository);
 	trace_performance_leave("cache_tree_update");
 	if (i < 0)
@@ -692,14 +695,14 @@ struct tree* write_in_core_index_as_tree(struct repository *repo) {
 	ret = write_index_as_tree_internal(&o, index_state, was_valid, 0, NULL);
 	if (ret == WRITE_TREE_UNMERGED_INDEX) {
 		int i;
-		fprintf(stderr, "BUG: There are unmerged index entries:\n");
+		bug("there are unmerged index entries:");
 		for (i = 0; i < index_state->cache_nr; i++) {
 			const struct cache_entry *ce = index_state->cache[i];
 			if (ce_stage(ce))
-				fprintf(stderr, "BUG: %d %.*s\n", ce_stage(ce),
-					(int)ce_namelen(ce), ce->name);
+				bug("%d %.*s", ce_stage(ce),
+				    (int)ce_namelen(ce), ce->name);
 		}
-		BUG("unmerged index entries when writing inmemory index");
+		BUG("unmerged index entries when writing in-core index");
 	}
 
 	return lookup_tree(repo, &index_state->cache_tree->oid);
diff --git a/cache.h b/cache.h
index 595582becc..33fc8337c6 100644
--- a/cache.h
+++ b/cache.h
@@ -310,6 +310,29 @@ struct untracked_cache;
 struct progress;
 struct pattern_list;
 
+enum sparse_index_mode {
+	/*
+	 * There are no sparse directories in the index at all.
+	 *
+	 * Repositories that don't use cone-mode sparse-checkout will
+	 * always have their indexes in this mode.
+	 */
+	INDEX_EXPANDED = 0,
+
+	/*
+	 * The index has already been collapsed to sparse directories
+	 * whereever possible.
+	 */
+	INDEX_COLLAPSED,
+
+	/*
+	 * The sparse directories that exist are outside the
+	 * sparse-checkout boundary, but it is possible that some file
+	 * entries could collapse to sparse directory entries.
+	 */
+	INDEX_PARTIALLY_SPARSE,
+};
+
 struct index_state {
 	struct cache_entry **cache;
 	unsigned int version;
@@ -323,14 +346,8 @@ struct index_state {
 		 drop_cache_tree : 1,
 		 updated_workdir : 1,
 		 updated_skipworktree : 1,
-		 fsmonitor_has_run_once : 1,
-
-		 /*
-		  * sparse_index == 1 when sparse-directory
-		  * entries exist. Requires sparse-checkout
-		  * in cone mode.
-		  */
-		 sparse_index : 1;
+		 fsmonitor_has_run_once : 1;
+	enum sparse_index_mode sparse_index;
 	struct hashmap name_hash;
 	struct hashmap dir_hash;
 	struct object_id oid;
@@ -814,6 +831,15 @@ struct cache_entry *index_file_exists(struct index_state *istate, const char *na
 int index_name_pos(struct index_state *, const char *name, int namelen);
 
 /*
+ * Like index_name_pos, returns the position of an entry of the given name in
+ * the index if one exists, otherwise returns a negative value where the negated
+ * value minus 1 is the position where the index entry would be inserted. Unlike
+ * index_name_pos, however, a sparse index is not expanded to find an entry
+ * inside a sparse directory.
+ */
+int index_name_pos_sparse(struct index_state *, const char *name, int namelen);
+
+/*
  * Determines whether an entry with the given name exists within the
  * given index. The return value is 1 if an exact match is found, otherwise
  * it is 0. Note that, unlike index_name_pos, this function does not expand
@@ -1031,6 +1057,10 @@ enum fsync_component {
 			      FSYNC_COMPONENT_INDEX | \
 			      FSYNC_COMPONENT_REFERENCE)
 
+#ifndef FSYNC_COMPONENTS_PLATFORM_DEFAULT
+#define FSYNC_COMPONENTS_PLATFORM_DEFAULT FSYNC_COMPONENTS_DEFAULT
+#endif
+
 /*
  * A bitmask indicating which components of the repo should be fsynced.
  */
@@ -1040,7 +1070,8 @@ extern int use_fsync;
 
 enum fsync_method {
 	FSYNC_METHOD_FSYNC,
-	FSYNC_METHOD_WRITEOUT_ONLY
+	FSYNC_METHOD_WRITEOUT_ONLY,
+	FSYNC_METHOD_BATCH,
 };
 
 extern enum fsync_method fsync_method;
@@ -1766,6 +1797,11 @@ void fsync_or_die(int fd, const char *);
 int fsync_component(enum fsync_component component, int fd);
 void fsync_component_or_die(enum fsync_component component, int fd, const char *msg);
 
+static inline int batch_fsync_enabled(enum fsync_component component)
+{
+	return (fsync_components & component) && (fsync_method == FSYNC_METHOD_BATCH);
+}
+
 ssize_t read_in_full(int fd, void *buf, size_t count);
 ssize_t write_in_full(int fd, const void *buf, size_t count);
 ssize_t pread_in_full(int fd, void *buf, size_t count, off_t offset);
diff --git a/chunk-format.c b/chunk-format.c
index 1c3dca62e2..0275b74a89 100644
--- a/chunk-format.c
+++ b/chunk-format.c
@@ -181,3 +181,15 @@ int read_chunk(struct chunkfile *cf,
 
 	return CHUNK_NOT_FOUND;
 }
+
+uint8_t oid_version(const struct git_hash_algo *algop)
+{
+	switch (hash_algo_by_ptr(algop)) {
+	case GIT_HASH_SHA1:
+		return 1;
+	case GIT_HASH_SHA256:
+		return 2;
+	default:
+		die(_("invalid hash version"));
+	}
+}
diff --git a/chunk-format.h b/chunk-format.h
index 9ccbe00377..7885aa0848 100644
--- a/chunk-format.h
+++ b/chunk-format.h
@@ -2,6 +2,7 @@
 #define CHUNK_FORMAT_H
 
 #include "git-compat-util.h"
+#include "hash.h"
 
 struct hashfile;
 struct chunkfile;
@@ -65,4 +66,6 @@ int read_chunk(struct chunkfile *cf,
 	       chunk_read_fn fn,
 	       void *data);
 
+uint8_t oid_version(const struct git_hash_algo *algop);
+
 #endif
diff --git a/ci/lib.sh b/ci/lib.sh
index 86e37da9bc..f095519f8d 100755
--- a/ci/lib.sh
+++ b/ci/lib.sh
@@ -1,5 +1,56 @@
 # Library of functions shared by all CI scripts
 
+if test true != "$GITHUB_ACTIONS"
+then
+	begin_group () { :; }
+	end_group () { :; }
+
+	group () {
+		shift
+		"$@"
+	}
+	set -x
+else
+	begin_group () {
+		need_to_end_group=t
+		echo "::group::$1" >&2
+		set -x
+	}
+
+	end_group () {
+		test -n "$need_to_end_group" || return 0
+		set +x
+		need_to_end_group=
+		echo '::endgroup::' >&2
+	}
+	trap end_group EXIT
+
+	group () {
+		set +x
+		begin_group "$1"
+		shift
+		# work around `dash` not supporting `set -o pipefail`
+		(
+			"$@" 2>&1
+			echo $? >exit.status
+		) |
+		sed 's/^\(\([^ ]*\):\([0-9]*\):\([0-9]*:\) \)\(error\|warning\): /::\5 file=\2,line=\3::\1/'
+		res=$(cat exit.status)
+		rm exit.status
+		end_group
+		return $res
+	}
+
+	begin_group "CI setup"
+fi
+
+# Set 'exit on error' for all CI scripts to let the caller know that
+# something went wrong.
+#
+# We already enabled tracing executed commands earlier. This helps by showing
+# how # environment variables are set and and dependencies are installed.
+set -e
+
 skip_branch_tip_with_tag () {
 	# Sometimes, a branch is pushed at the same time the tag that points
 	# at the same commit as the tip of the branch is pushed, and building
@@ -69,8 +120,7 @@ skip_good_tree () {
 	exit 0
 }
 
-check_unignored_build_artifacts ()
-{
+check_unignored_build_artifacts () {
 	! git ls-files --other --exclude-standard --error-unmatch \
 		-- ':/*' 2>/dev/null ||
 	{
@@ -79,18 +129,16 @@ check_unignored_build_artifacts ()
 	}
 }
 
+handle_failed_tests () {
+	return 1
+}
+
 # GitHub Action doesn't set TERM, which is required by tput
 export TERM=${TERM:-dumb}
 
 # Clear MAKEFLAGS that may come from the outside world.
 export MAKEFLAGS=
 
-# Set 'exit on error' for all CI scripts to let the caller know that
-# something went wrong.
-# Set tracing executed commands, primarily setting environment variables
-# and installing dependencies.
-set -ex
-
 if test -n "$SYSTEM_COLLECTIONURI" || test -n "$SYSTEM_TASKDEFINITIONSURI"
 then
 	CI_TYPE=azure-pipelines
@@ -124,11 +172,32 @@ then
 	CI_JOB_ID="$GITHUB_RUN_ID"
 	CC="${CC_PACKAGE:-${CC:-gcc}}"
 	DONT_SKIP_TAGS=t
+	handle_failed_tests () {
+		mkdir -p t/failed-test-artifacts
+		echo "FAILED_TEST_ARTIFACTS=t/failed-test-artifacts" >>$GITHUB_ENV
+
+		for test_exit in t/test-results/*.exit
+		do
+			test 0 != "$(cat "$test_exit")" || continue
+
+			test_name="${test_exit%.exit}"
+			test_name="${test_name##*/}"
+			printf "\\e[33m\\e[1m=== Failed test: ${test_name} ===\\e[m\\n"
+			echo "The full logs are in the 'print test failures' step below."
+			echo "See also the 'failed-tests-*' artifacts attached to this run."
+			cat "t/test-results/$test_name.markup"
+
+			trash_dir="t/trash directory.$test_name"
+			cp "t/test-results/$test_name.out" t/failed-test-artifacts/
+			tar czf t/failed-test-artifacts/"$test_name".trash.tar.gz "$trash_dir"
+		done
+		return 1
+	}
 
 	cache_dir="$HOME/none"
 
 	export GIT_PROVE_OPTS="--timer --jobs 10"
-	export GIT_TEST_OPTS="--verbose-log -x"
+	export GIT_TEST_OPTS="--verbose-log -x --github-workflow-markup"
 	MAKEFLAGS="$MAKEFLAGS --jobs=10"
 	test windows != "$CI_OS_NAME" ||
 	GIT_TEST_OPTS="--no-chain-lint --no-bin-wrappers $GIT_TEST_OPTS"
@@ -211,3 +280,6 @@ linux-leaks)
 esac
 
 MAKEFLAGS="$MAKEFLAGS CC=${CC:-cc}"
+
+end_group
+set -x
diff --git a/ci/make-test-artifacts.sh b/ci/make-test-artifacts.sh
index 646967481f..74141af0cc 100755
--- a/ci/make-test-artifacts.sh
+++ b/ci/make-test-artifacts.sh
@@ -7,6 +7,6 @@ mkdir -p "$1" # in case ci/lib.sh decides to quit early
 
 . ${0%/*}/lib.sh
 
-make artifacts-tar ARTIFACTS_DIRECTORY="$1"
+group Build make artifacts-tar ARTIFACTS_DIRECTORY="$1"
 
 check_unignored_build_artifacts
diff --git a/ci/run-build-and-tests.sh b/ci/run-build-and-tests.sh
index 280dda7d28..8ebff42596 100755
--- a/ci/run-build-and-tests.sh
+++ b/ci/run-build-and-tests.sh
@@ -10,7 +10,7 @@ windows*) cmd //c mklink //j t\\.prove "$(cygpath -aw "$cache_dir/.prove")";;
 *) ln -s "$cache_dir/.prove" t/.prove;;
 esac
 
-export MAKE_TARGETS="all test"
+run_tests=t
 
 case "$jobname" in
 linux-gcc)
@@ -26,7 +26,7 @@ linux-TEST-vars)
 	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_ADD_I_USE_BUILTIN=0
 	export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=master
 	export GIT_TEST_WRITE_REV_INDEX=1
 	export GIT_TEST_CHECKOUT_WORKERS=2
@@ -41,14 +41,16 @@ pedantic)
 	# Don't run the tests; we only care about whether Git can be
 	# built.
 	export DEVOPTS=pedantic
-	export MAKE_TARGETS=all
+	run_tests=
 	;;
 esac
 
-# Any new "test" targets should not go after this "make", but should
-# adjust $MAKE_TARGETS. Otherwise compilation-only targets above will
-# start running tests.
-make $MAKE_TARGETS
+group Build make
+if test -n "$run_tests"
+then
+	group "Run tests" make test ||
+	handle_failed_tests
+fi
 check_unignored_build_artifacts
 
 save_good_tree
diff --git a/ci/run-static-analysis.sh b/ci/run-static-analysis.sh
index 65bcebda41..0d51e5ce0e 100755
--- a/ci/run-static-analysis.sh
+++ b/ci/run-static-analysis.sh
@@ -29,4 +29,6 @@ fi
 make hdr-check ||
 exit 1
 
+make check-pot
+
 save_good_tree
diff --git a/ci/run-test-slice.sh b/ci/run-test-slice.sh
index f8c2c3106a..a3c67956a8 100755
--- a/ci/run-test-slice.sh
+++ b/ci/run-test-slice.sh
@@ -10,8 +10,9 @@ windows*) cmd //c mklink //j t\\.prove "$(cygpath -aw "$cache_dir/.prove")";;
 *) ln -s "$cache_dir/.prove" t/.prove;;
 esac
 
-make --quiet -C t T="$(cd t &&
+group "Run tests" make --quiet -C t T="$(cd t &&
 	./helper/test-tool path-utils slice-tests "$1" "$2" t[0-9]*.sh |
-	tr '\n' ' ')"
+	tr '\n' ' ')" ||
+handle_failed_tests
 
 check_unignored_build_artifacts
diff --git a/combine-diff.c b/combine-diff.c
index d93782daeb..b0ece95480 100644
--- a/combine-diff.c
+++ b/combine-diff.c
@@ -195,10 +195,10 @@ static struct lline *coalesce_lines(struct lline *base, int *lenbase,
 	struct lline *baseend, *newend = NULL;
 	int i, j, origbaselen = *lenbase;
 
-	if (newline == NULL)
+	if (!newline)
 		return base;
 
-	if (base == NULL) {
+	if (!base) {
 		*lenbase = lennew;
 		return newline;
 	}
@@ -1498,6 +1498,13 @@ void diff_tree_combined(const struct object_id *oid,
 	int i, num_paths, needsep, show_log_first, num_parent = parents->nr;
 	int need_generic_pathscan;
 
+	if (opt->ignore_regex_nr)
+		die("combined diff and '%s' cannot be used together",
+		    "--ignore-matching-lines");
+	if (opt->close_file)
+		die("combined diff and '%s' cannot be used together",
+		    "--output");
+
 	/* nothing to do, if no parents */
 	if (!num_parent)
 		return;
diff --git a/commit-graph.c b/commit-graph.c
index 2b52818731..a487d49c3e 100644
--- a/commit-graph.c
+++ b/commit-graph.c
@@ -193,18 +193,6 @@ char *get_commit_graph_chain_filename(struct object_directory *odb)
 	return xstrfmt("%s/info/commit-graphs/commit-graph-chain", odb->path);
 }
 
-static uint8_t oid_version(void)
-{
-	switch (hash_algo_by_ptr(the_hash_algo)) {
-	case GIT_HASH_SHA1:
-		return 1;
-	case GIT_HASH_SHA256:
-		return 2;
-	default:
-		die(_("invalid hash version"));
-	}
-}
-
 static struct commit_graph *alloc_commit_graph(void)
 {
 	struct commit_graph *g = xcalloc(1, sizeof(*g));
@@ -365,9 +353,9 @@ struct commit_graph *parse_commit_graph(struct repository *r,
 	}
 
 	hash_version = *(unsigned char*)(data + 5);
-	if (hash_version != oid_version()) {
+	if (hash_version != oid_version(the_hash_algo)) {
 		error(_("commit-graph hash version %X does not match version %X"),
-		      hash_version, oid_version());
+		      hash_version, oid_version(the_hash_algo));
 		return NULL;
 	}
 
@@ -523,10 +511,13 @@ static struct commit_graph *load_commit_graph_chain(struct repository *r,
 	stat_res = stat(chain_name, &st);
 	free(chain_name);
 
-	if (!fp ||
-	    stat_res ||
-	    st.st_size <= the_hash_algo->hexsz)
+	if (!fp)
+		return NULL;
+	if (stat_res ||
+	    st.st_size <= the_hash_algo->hexsz) {
+		fclose(fp);
 		return NULL;
+	}
 
 	count = st.st_size / (the_hash_algo->hexsz + 1);
 	CALLOC_ARRAY(oids, count);
@@ -898,6 +889,14 @@ static int find_commit_pos_in_graph(struct commit *item, struct commit_graph *g,
 	}
 }
 
+int repo_find_commit_pos_in_graph(struct repository *r, struct commit *c,
+				  uint32_t *pos)
+{
+	if (!prepare_commit_graph(r))
+		return 0;
+	return find_commit_pos_in_graph(c, r->objects->commit_graph, pos);
+}
+
 struct commit *lookup_commit_in_graph(struct repository *repo, const struct object_id *id)
 {
 	struct commit *commit;
@@ -907,7 +906,7 @@ struct commit *lookup_commit_in_graph(struct repository *repo, const struct obje
 		return NULL;
 	if (!search_commit_pos_in_graph(id, repo->objects->commit_graph, &pos))
 		return NULL;
-	if (!repo_has_object_file(repo, id))
+	if (!has_object(repo, id, 0))
 		return NULL;
 
 	commit = lookup_commit(repo, id);
@@ -955,9 +954,7 @@ int parse_commit_in_graph(struct repository *r, struct commit *item)
 void load_commit_graph_info(struct repository *r, struct commit *item)
 {
 	uint32_t pos;
-	if (!prepare_commit_graph(r))
-		return;
-	if (find_commit_pos_in_graph(item, r->objects->commit_graph, &pos))
+	if (repo_find_commit_pos_in_graph(r, item, &pos))
 		fill_commit_graph_info(item, r->objects->commit_graph, pos);
 }
 
@@ -1921,7 +1918,7 @@ static int write_commit_graph_file(struct write_commit_graph_context *ctx)
 	hashwrite_be32(f, GRAPH_SIGNATURE);
 
 	hashwrite_u8(f, GRAPH_VERSION);
-	hashwrite_u8(f, oid_version());
+	hashwrite_u8(f, oid_version(the_hash_algo));
 	hashwrite_u8(f, get_num_chunks(cf));
 	hashwrite_u8(f, ctx->num_commit_graphs_after - 1);
 
@@ -2569,7 +2566,7 @@ int verify_commit_graph(struct repository *r, struct commit_graph *g, int flags)
 		odb_parents = odb_commit->parents;
 
 		while (graph_parents) {
-			if (odb_parents == NULL) {
+			if (!odb_parents) {
 				graph_report(_("commit-graph parent list for commit %s is too long"),
 					     oid_to_hex(&cur_oid));
 				break;
@@ -2592,7 +2589,7 @@ int verify_commit_graph(struct repository *r, struct commit_graph *g, int flags)
 			odb_parents = odb_parents->next;
 		}
 
-		if (odb_parents != NULL)
+		if (odb_parents)
 			graph_report(_("commit-graph parent list for commit %s terminates early"),
 				     oid_to_hex(&cur_oid));
 
diff --git a/commit-graph.h b/commit-graph.h
index 2e3ac35237..f23b9e9026 100644
--- a/commit-graph.h
+++ b/commit-graph.h
@@ -41,6 +41,21 @@ int open_commit_graph(const char *graph_file, int *fd, struct stat *st);
 int parse_commit_in_graph(struct repository *r, struct commit *item);
 
 /*
+ * Fills `*pos` with the graph position of `c`, and returns 1 if `c` is
+ * found in the commit-graph belonging to `r`, or 0 otherwise.
+ * Initializes the commit-graph belonging to `r` if it hasn't been
+ * already.
+ *
+ * Note: this is a low-level helper that does not alter any slab data
+ * associated with `c`. Useful in circumstances where the slab data is
+ * already being modified (e.g., writing the commit-graph itself).
+ *
+ * In most cases, callers should use `parse_commit_in_graph()` instead.
+ */
+int repo_find_commit_pos_in_graph(struct repository *r, struct commit *c,
+				  uint32_t *pos);
+
+/*
  * 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
diff --git a/commit.c b/commit.c
index 59b6c3e455..1fb1b2ea90 100644
--- a/commit.c
+++ b/commit.c
@@ -120,6 +120,17 @@ int commit_graft_pos(struct repository *r, const struct object_id *oid)
 		       commit_graft_oid_access);
 }
 
+static void unparse_commit(struct repository *r, const struct object_id *oid)
+{
+	struct commit *c = lookup_commit(r, oid);
+
+	if (!c->object.parsed)
+		return;
+	free_commit_list(c->parents);
+	c->parents = NULL;
+	c->object.parsed = 0;
+}
+
 int register_commit_graft(struct repository *r, struct commit_graft *graft,
 			  int ignore_dups)
 {
@@ -145,6 +156,7 @@ int register_commit_graft(struct repository *r, struct commit_graft *graft,
 			(r->parsed_objects->grafts_nr - pos - 1) *
 			sizeof(*r->parsed_objects->grafts));
 	r->parsed_objects->grafts[pos] = graft;
+	unparse_commit(r, &graft->oid);
 	return 0;
 }
 
@@ -253,8 +265,10 @@ void reset_commit_grafts(struct repository *r)
 {
 	int i;
 
-	for (i = 0; i < r->parsed_objects->grafts_nr; i++)
+	for (i = 0; i < r->parsed_objects->grafts_nr; i++) {
+		unparse_commit(r, &r->parsed_objects->grafts[i]->oid);
 		free(r->parsed_objects->grafts[i]);
+	}
 	r->parsed_objects->grafts_nr = 0;
 	r->parsed_objects->commit_graft_prepared = 0;
 }
@@ -407,17 +421,14 @@ int parse_commit_buffer(struct repository *r, struct commit *item, const void *b
 
 	if (item->object.parsed)
 		return 0;
-
-	if (item->parents) {
-		/*
-		 * Presumably this is leftover from an earlier failed parse;
-		 * clear it out in preparation for us re-parsing (we'll hit the
-		 * same error, but that's good, since it lets our caller know
-		 * the result cannot be trusted.
-		 */
-		free_commit_list(item->parents);
-		item->parents = NULL;
-	}
+	/*
+	 * Presumably this is leftover from an earlier failed parse;
+	 * clear it out in preparation for us re-parsing (we'll hit the
+	 * same error, but that's good, since it lets our caller know
+	 * the result cannot be trusted.
+	 */
+	free_commit_list(item->parents);
+	item->parents = NULL;
 
 	tail += size;
 	if (tail <= bufptr + tree_entry_len + 1 || memcmp(bufptr, "tree ", 5) ||
@@ -1515,7 +1526,7 @@ static int verify_utf8(struct strbuf *buf)
 static const char commit_utf8_warn[] =
 N_("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"
-   "variable i18n.commitencoding to the encoding your project uses.\n");
+   "variable i18n.commitEncoding to the encoding your project uses.\n");
 
 int commit_tree_extended(const char *msg, size_t msg_len,
 			 const struct object_id *tree,
diff --git a/common-main.c b/common-main.c
index 29fb7452f8..c531372f3f 100644
--- a/common-main.c
+++ b/common-main.c
@@ -55,10 +55,30 @@ int main(int argc, const char **argv)
 
 	result = cmd_main(argc, argv);
 
+	/* Not exit(3), but a wrapper calling our common_exit() */
+	exit(result);
+}
+
+static void check_bug_if_BUG(void)
+{
+	if (!bug_called_must_BUG)
+		return;
+	BUG("on exit(): had bug() call(s) in this process without explicit BUG_if_bug()");
+}
+
+/* We wrap exit() to call common_exit() in git-compat-util.h */
+int common_exit(const char *file, int line, int code)
+{
 	/*
-	 * We define exit() to call trace2_cmd_exit_fl() in
-	 * git-compat-util.h. Whether we reach this or exit()
-	 * elsewhere we'll always run our trace2 exit handler.
+	 * For non-POSIX systems: Take the lowest 8 bits of the "code"
+	 * to e.g. turn -1 into 255. On a POSIX system this is
+	 * redundant, see exit(3) and wait(2), but as it doesn't harm
+	 * anything there we don't need to guard this with an "ifdef".
 	 */
-	exit(result);
+	code &= 0xff;
+
+	check_bug_if_BUG();
+	trace2_cmd_exit_fl(file, line, code);
+
+	return code;
 }
diff --git a/compat/fsmonitor/fsm-health-darwin.c b/compat/fsmonitor/fsm-health-darwin.c
new file mode 100644
index 0000000000..b9f709e854
--- /dev/null
+++ b/compat/fsmonitor/fsm-health-darwin.c
@@ -0,0 +1,24 @@
+#include "cache.h"
+#include "config.h"
+#include "fsmonitor.h"
+#include "fsm-health.h"
+#include "fsmonitor--daemon.h"
+
+int fsm_health__ctor(struct fsmonitor_daemon_state *state)
+{
+	return 0;
+}
+
+void fsm_health__dtor(struct fsmonitor_daemon_state *state)
+{
+	return;
+}
+
+void fsm_health__loop(struct fsmonitor_daemon_state *state)
+{
+	return;
+}
+
+void fsm_health__stop_async(struct fsmonitor_daemon_state *state)
+{
+}
diff --git a/compat/fsmonitor/fsm-health-win32.c b/compat/fsmonitor/fsm-health-win32.c
new file mode 100644
index 0000000000..2ea08c1d4e
--- /dev/null
+++ b/compat/fsmonitor/fsm-health-win32.c
@@ -0,0 +1,278 @@
+#include "cache.h"
+#include "config.h"
+#include "fsmonitor.h"
+#include "fsm-health.h"
+#include "fsmonitor--daemon.h"
+
+/*
+ * Every minute wake up and test our health.
+ */
+#define WAIT_FREQ_MS (60 * 1000)
+
+/*
+ * State machine states for each of the interval functions
+ * used for polling our health.
+ */
+enum interval_fn_ctx {
+	CTX_INIT = 0,
+	CTX_TERM,
+	CTX_TIMER
+};
+
+typedef int (interval_fn)(struct fsmonitor_daemon_state *state,
+			  enum interval_fn_ctx ctx);
+
+struct fsm_health_data
+{
+	HANDLE hEventShutdown;
+
+	HANDLE hHandles[1]; /* the array does not own these handles */
+#define HEALTH_SHUTDOWN 0
+	int nr_handles; /* number of active event handles */
+
+	struct wt_moved
+	{
+		wchar_t wpath[MAX_PATH + 1];
+		BY_HANDLE_FILE_INFORMATION bhfi;
+	} wt_moved;
+};
+
+/*
+ * Lookup the system unique ID for the path.  This is as close as
+ * we get to an inode number, but this also contains volume info,
+ * so it is a little stronger.
+ */
+static int lookup_bhfi(wchar_t *wpath,
+		       BY_HANDLE_FILE_INFORMATION *bhfi)
+{
+	DWORD desired_access = FILE_LIST_DIRECTORY;
+	DWORD share_mode =
+		FILE_SHARE_WRITE | FILE_SHARE_READ | FILE_SHARE_DELETE;
+	HANDLE hDir;
+
+	hDir = CreateFileW(wpath, desired_access, share_mode, NULL,
+			   OPEN_EXISTING, FILE_FLAG_BACKUP_SEMANTICS, NULL);
+	if (hDir == INVALID_HANDLE_VALUE) {
+		error(_("[GLE %ld] health thread could not open '%ls'"),
+		      GetLastError(), wpath);
+		return -1;
+	}
+
+	if (!GetFileInformationByHandle(hDir, bhfi)) {
+		error(_("[GLE %ld] health thread getting BHFI for '%ls'"),
+		      GetLastError(), wpath);
+		CloseHandle(hDir);
+		return -1;
+	}
+
+	CloseHandle(hDir);
+	return 0;
+}
+
+/*
+ * Compare the relevant fields from two system unique IDs.
+ * We use this to see if two different handles to the same
+ * path actually refer to the same *instance* of the file
+ * or directory.
+ */
+static int bhfi_eq(const BY_HANDLE_FILE_INFORMATION *bhfi_1,
+		   const BY_HANDLE_FILE_INFORMATION *bhfi_2)
+{
+	return (bhfi_1->dwVolumeSerialNumber == bhfi_2->dwVolumeSerialNumber &&
+		bhfi_1->nFileIndexHigh == bhfi_2->nFileIndexHigh &&
+		bhfi_1->nFileIndexLow == bhfi_2->nFileIndexLow);
+}
+
+/*
+ * Shutdown if the original worktree root directory been deleted,
+ * moved, or renamed?
+ *
+ * Since the main thread did a "chdir(getenv($HOME))" and our CWD
+ * is not in the worktree root directory and because the listener
+ * thread added FILE_SHARE_DELETE to the watch handle, it is possible
+ * for the root directory to be moved or deleted while we are still
+ * watching it.  We want to detect that here and force a shutdown.
+ *
+ * Granted, a delete MAY cause some operations to fail, such as
+ * GetOverlappedResult(), but it is not guaranteed.  And because
+ * ReadDirectoryChangesW() only reports on changes *WITHIN* the
+ * directory, not changes *ON* the directory, our watch will not
+ * receive a delete event for it.
+ *
+ * A move/rename of the worktree root will also not generate an event.
+ * And since the listener thread already has an open handle, it may
+ * continue to receive events for events within the directory.
+ * However, the pathname of the named-pipe was constructed using the
+ * original location of the worktree root.  (Remember named-pipes are
+ * stored in the NPFS and not in the actual file system.)  Clients
+ * trying to talk to the worktree after the move/rename will not
+ * reach our daemon process, since we're still listening on the
+ * pipe with original path.
+ *
+ * Furthermore, if the user does something like:
+ *
+ *   $ mv repo repo.old
+ *   $ git init repo
+ *
+ * A new daemon cannot be started in the new instance of "repo"
+ * because the named-pipe is still being used by the daemon on
+ * the original instance.
+ *
+ * So, detect move/rename/delete and shutdown.  This should also
+ * handle unsafe drive removal.
+ *
+ * We use the file system unique ID to distinguish the original
+ * directory instance from a new instance and force a shutdown
+ * if the unique ID changes.
+ *
+ * Since a worktree move/rename/delete/unmount doesn't happen
+ * that often (and we can't get an immediate event anyway), we
+ * use a timeout and periodically poll it.
+ */
+static int has_worktree_moved(struct fsmonitor_daemon_state *state,
+			      enum interval_fn_ctx ctx)
+{
+	struct fsm_health_data *data = state->health_data;
+	BY_HANDLE_FILE_INFORMATION bhfi;
+	int r;
+
+	switch (ctx) {
+	case CTX_TERM:
+		return 0;
+
+	case CTX_INIT:
+		if (xutftowcs_path(data->wt_moved.wpath,
+				   state->path_worktree_watch.buf) < 0) {
+			error(_("could not convert to wide characters: '%s'"),
+			      state->path_worktree_watch.buf);
+			return -1;
+		}
+
+		/*
+		 * On the first call we lookup the unique sequence ID for
+		 * the worktree root directory.
+		 */
+		return lookup_bhfi(data->wt_moved.wpath, &data->wt_moved.bhfi);
+
+	case CTX_TIMER:
+		r = lookup_bhfi(data->wt_moved.wpath, &bhfi);
+		if (r)
+			return r;
+		if (!bhfi_eq(&data->wt_moved.bhfi, &bhfi)) {
+			error(_("BHFI changed '%ls'"), data->wt_moved.wpath);
+			return -1;
+		}
+		return 0;
+
+	default:
+		die(_("unhandled case in 'has_worktree_moved': %d"),
+		    (int)ctx);
+	}
+
+	return 0;
+}
+
+
+int fsm_health__ctor(struct fsmonitor_daemon_state *state)
+{
+	struct fsm_health_data *data;
+
+	CALLOC_ARRAY(data, 1);
+
+	data->hEventShutdown = CreateEvent(NULL, TRUE, FALSE, NULL);
+
+	data->hHandles[HEALTH_SHUTDOWN] = data->hEventShutdown;
+	data->nr_handles++;
+
+	state->health_data = data;
+	return 0;
+}
+
+void fsm_health__dtor(struct fsmonitor_daemon_state *state)
+{
+	struct fsm_health_data *data;
+
+	if (!state || !state->health_data)
+		return;
+
+	data = state->health_data;
+
+	CloseHandle(data->hEventShutdown);
+
+	FREE_AND_NULL(state->health_data);
+}
+
+/*
+ * A table of the polling functions.
+ */
+static interval_fn *table[] = {
+	has_worktree_moved,
+	NULL, /* must be last */
+};
+
+/*
+ * Call all of the polling functions in the table.
+ * Shortcut and return first error.
+ *
+ * Return 0 if all succeeded.
+ */
+static int call_all(struct fsmonitor_daemon_state *state,
+		    enum interval_fn_ctx ctx)
+{
+	int k;
+
+	for (k = 0; table[k]; k++) {
+		int r = table[k](state, ctx);
+		if (r)
+			return r;
+	}
+
+	return 0;
+}
+
+void fsm_health__loop(struct fsmonitor_daemon_state *state)
+{
+	struct fsm_health_data *data = state->health_data;
+	int r;
+
+	r = call_all(state, CTX_INIT);
+	if (r < 0)
+		goto force_error_stop;
+	if (r > 0)
+		goto force_shutdown;
+
+	for (;;) {
+		DWORD dwWait = WaitForMultipleObjects(data->nr_handles,
+						      data->hHandles,
+						      FALSE, WAIT_FREQ_MS);
+
+		if (dwWait == WAIT_OBJECT_0 + HEALTH_SHUTDOWN)
+			goto clean_shutdown;
+
+		if (dwWait == WAIT_TIMEOUT) {
+			r = call_all(state, CTX_TIMER);
+			if (r < 0)
+				goto force_error_stop;
+			if (r > 0)
+				goto force_shutdown;
+			continue;
+		}
+
+		error(_("health thread wait failed [GLE %ld]"),
+		      GetLastError());
+		goto force_error_stop;
+	}
+
+force_error_stop:
+	state->health_error_code = -1;
+force_shutdown:
+	ipc_server_stop_async(state->ipc_server_data);
+clean_shutdown:
+	call_all(state, CTX_TERM);
+	return;
+}
+
+void fsm_health__stop_async(struct fsmonitor_daemon_state *state)
+{
+	SetEvent(state->health_data->hHandles[HEALTH_SHUTDOWN]);
+}
diff --git a/compat/fsmonitor/fsm-health.h b/compat/fsmonitor/fsm-health.h
new file mode 100644
index 0000000000..45547ba938
--- /dev/null
+++ b/compat/fsmonitor/fsm-health.h
@@ -0,0 +1,47 @@
+#ifndef FSM_HEALTH_H
+#define FSM_HEALTH_H
+
+/* This needs to be implemented by each backend */
+
+#ifdef HAVE_FSMONITOR_DAEMON_BACKEND
+
+struct fsmonitor_daemon_state;
+
+/*
+ * Initialize platform-specific data for the fsmonitor health thread.
+ * This will be called from the main thread PRIOR to staring the
+ * thread.
+ *
+ * Returns 0 if successful.
+ * Returns -1 otherwise.
+ */
+int fsm_health__ctor(struct fsmonitor_daemon_state *state);
+
+/*
+ * Cleanup platform-specific data for the health thread.
+ * This will be called from the main thread AFTER joining the thread.
+ */
+void fsm_health__dtor(struct fsmonitor_daemon_state *state);
+
+/*
+ * The main body of the platform-specific event loop to monitor the
+ * health of the daemon process.  This will run in the health thread.
+ *
+ * The health thread should call `ipc_server_stop_async()` if it needs
+ * to cause a shutdown.  (It should NOT do so if it receives a shutdown
+ * shutdown signal.)
+ *
+ * It should set `state->health_error_code` to -1 if the daemon should exit
+ * with an error.
+ */
+void fsm_health__loop(struct fsmonitor_daemon_state *state);
+
+/*
+ * Gently request that the health thread shutdown.
+ * It does not wait for it to stop.  The caller should do a JOIN
+ * to wait for it.
+ */
+void fsm_health__stop_async(struct fsmonitor_daemon_state *state);
+
+#endif /* HAVE_FSMONITOR_DAEMON_BACKEND */
+#endif /* FSM_HEALTH_H */
diff --git a/compat/fsmonitor/fsm-listen-darwin.c b/compat/fsmonitor/fsm-listen-darwin.c
index 0741fe834c..8e208e8289 100644
--- a/compat/fsmonitor/fsm-listen-darwin.c
+++ b/compat/fsmonitor/fsm-listen-darwin.c
@@ -27,7 +27,7 @@
 #include "fsm-listen.h"
 #include "fsmonitor--daemon.h"
 
-struct fsmonitor_daemon_backend_data
+struct fsm_listen_data
 {
 	CFStringRef cfsr_worktree_path;
 	CFStringRef cfsr_gitdir_path;
@@ -100,12 +100,17 @@ static void log_flags_set(const char *path, const FSEventStreamEventFlags flag)
 	if (flag & kFSEventStreamEventFlagItemCloned)
 		strbuf_addstr(&msg, "ItemCloned|");
 
-	trace_printf_key(&trace_fsmonitor, "fsevent: '%s', flags=%u %s",
+	trace_printf_key(&trace_fsmonitor, "fsevent: '%s', flags=0x%x %s",
 			 path, flag, msg.buf);
 
 	strbuf_release(&msg);
 }
 
+static int ef_is_root_changed(const FSEventStreamEventFlags ef)
+{
+	return (ef & kFSEventStreamEventFlagRootChanged);
+}
+
 static int ef_is_root_delete(const FSEventStreamEventFlags ef)
 {
 	return (ef & kFSEventStreamEventFlagItemIsDir &&
@@ -125,6 +130,60 @@ static int ef_is_dropped(const FSEventStreamEventFlags ef)
 		ef & kFSEventStreamEventFlagUserDropped);
 }
 
+/*
+ * If an `xattr` change is the only reason we received this event,
+ * then silently ignore it.  Git doesn't care about xattr's.  We
+ * have to be careful here because the kernel can combine multiple
+ * events for a single path.  And because events always have certain
+ * bits set, such as `ItemIsFile` or `ItemIsDir`.
+ *
+ * Return 1 if we should ignore it.
+ */
+static int ef_ignore_xattr(const FSEventStreamEventFlags ef)
+{
+	static const FSEventStreamEventFlags mask =
+		kFSEventStreamEventFlagItemChangeOwner |
+		kFSEventStreamEventFlagItemCreated |
+		kFSEventStreamEventFlagItemFinderInfoMod |
+		kFSEventStreamEventFlagItemInodeMetaMod |
+		kFSEventStreamEventFlagItemModified |
+		kFSEventStreamEventFlagItemRemoved |
+		kFSEventStreamEventFlagItemRenamed |
+		kFSEventStreamEventFlagItemXattrMod |
+		kFSEventStreamEventFlagItemCloned;
+
+	return ((ef & mask) == kFSEventStreamEventFlagItemXattrMod);
+}
+
+/*
+ * On MacOS we have to adjust for Unicode composition insensitivity
+ * (where NFC and NFD spellings are not respected).  The different
+ * spellings are essentially aliases regardless of how the path is
+ * actually stored on the disk.
+ *
+ * This is related to "core.precomposeUnicode" (which wants to try
+ * to hide NFD completely and treat everything as NFC).  Here, we
+ * don't know what the value the client has (or will have) for this
+ * config setting when they make a query, so assume the worst and
+ * emit both when the OS gives us an NFD path.
+ */
+static void my_add_path(struct fsmonitor_batch *batch, const char *path)
+{
+	char *composed;
+
+	/* add the NFC or NFD path as received from the OS */
+	fsmonitor_batch__add_path(batch, path);
+
+	/* if NFD, also add the corresponding NFC spelling */
+	composed = (char *)precompose_string_if_needed(path);
+	if (!composed || composed == path)
+		return;
+
+	fsmonitor_batch__add_path(batch, composed);
+	free(composed);
+}
+
+
 static void fsevent_callback(ConstFSEventStreamRef streamRef,
 			     void *ctx,
 			     size_t num_of_events,
@@ -133,7 +192,7 @@ static void fsevent_callback(ConstFSEventStreamRef streamRef,
 			     const FSEventStreamEventId event_ids[])
 {
 	struct fsmonitor_daemon_state *state = ctx;
-	struct fsmonitor_daemon_backend_data *data = state->backend_data;
+	struct fsm_listen_data *data = state->listen_data;
 	char **paths = (char **)event_paths;
 	struct fsmonitor_batch *batch = NULL;
 	struct string_list cookie_list = STRING_LIST_INIT_DUP;
@@ -190,6 +249,33 @@ static void fsevent_callback(ConstFSEventStreamRef streamRef,
 			continue;
 		}
 
+		if (ef_is_root_changed(event_flags[k])) {
+			/*
+			 * The spelling of the pathname of the root directory
+			 * has changed.  This includes the name of the root
+			 * directory itself or of any parent directory in the
+			 * path.
+			 *
+			 * (There may be other conditions that throw this,
+			 * but I couldn't find any information on it.)
+			 *
+			 * Force a shutdown now and avoid things getting
+			 * out of sync.  The Unix domain socket is inside
+			 * the .git directory and a spelling change will make
+			 * it hard for clients to rendezvous with us.
+			 */
+			trace_printf_key(&trace_fsmonitor,
+					 "event: root changed");
+			goto force_shutdown;
+		}
+
+		if (ef_ignore_xattr(event_flags[k])) {
+			trace_printf_key(&trace_fsmonitor,
+					 "ignore-xattr: '%s', flags=0x%x",
+					 path_k, event_flags[k]);
+			continue;
+		}
+
 		switch (fsmonitor_classify_path_absolute(state, path_k)) {
 
 		case IS_INSIDE_DOT_GIT_WITH_COOKIE_PREFIX:
@@ -248,7 +334,7 @@ static void fsevent_callback(ConstFSEventStreamRef streamRef,
 
 				if (!batch)
 					batch = fsmonitor_batch__new();
-				fsmonitor_batch__add_path(batch, rel);
+				my_add_path(batch, rel);
 			}
 
 			if (event_flags[k] & kFSEventStreamEventFlagItemIsDir) {
@@ -261,7 +347,7 @@ static void fsevent_callback(ConstFSEventStreamRef streamRef,
 
 				if (!batch)
 					batch = fsmonitor_batch__new();
-				fsmonitor_batch__add_path(batch, tmp.buf);
+				my_add_path(batch, tmp.buf);
 			}
 
 			break;
@@ -318,11 +404,11 @@ int fsm_listen__ctor(struct fsmonitor_daemon_state *state)
 		NULL,
 		NULL
 	};
-	struct fsmonitor_daemon_backend_data *data;
+	struct fsm_listen_data *data;
 	const void *dir_array[2];
 
 	CALLOC_ARRAY(data, 1);
-	state->backend_data = data;
+	state->listen_data = data;
 
 	data->cfsr_worktree_path = CFStringCreateWithCString(
 		NULL, state->path_worktree_watch.buf, kCFStringEncodingUTF8);
@@ -342,7 +428,7 @@ int fsm_listen__ctor(struct fsmonitor_daemon_state *state)
 					   data->cfar_paths_to_watch,
 					   kFSEventStreamEventIdSinceNow,
 					   0.001, flags);
-	if (data->stream == NULL)
+	if (!data->stream)
 		goto failed;
 
 	/*
@@ -354,18 +440,18 @@ int fsm_listen__ctor(struct fsmonitor_daemon_state *state)
 failed:
 	error(_("Unable to create FSEventStream."));
 
-	FREE_AND_NULL(state->backend_data);
+	FREE_AND_NULL(state->listen_data);
 	return -1;
 }
 
 void fsm_listen__dtor(struct fsmonitor_daemon_state *state)
 {
-	struct fsmonitor_daemon_backend_data *data;
+	struct fsm_listen_data *data;
 
-	if (!state || !state->backend_data)
+	if (!state || !state->listen_data)
 		return;
 
-	data = state->backend_data;
+	data = state->listen_data;
 
 	if (data->stream) {
 		if (data->stream_started)
@@ -375,14 +461,14 @@ void fsm_listen__dtor(struct fsmonitor_daemon_state *state)
 		FSEventStreamRelease(data->stream);
 	}
 
-	FREE_AND_NULL(state->backend_data);
+	FREE_AND_NULL(state->listen_data);
 }
 
 void fsm_listen__stop_async(struct fsmonitor_daemon_state *state)
 {
-	struct fsmonitor_daemon_backend_data *data;
+	struct fsm_listen_data *data;
 
-	data = state->backend_data;
+	data = state->listen_data;
 	data->shutdown_style = SHUTDOWN_EVENT;
 
 	CFRunLoopStop(data->rl);
@@ -390,9 +476,9 @@ void fsm_listen__stop_async(struct fsmonitor_daemon_state *state)
 
 void fsm_listen__loop(struct fsmonitor_daemon_state *state)
 {
-	struct fsmonitor_daemon_backend_data *data;
+	struct fsm_listen_data *data;
 
-	data = state->backend_data;
+	data = state->listen_data;
 
 	data->rl = CFRunLoopGetCurrent();
 
@@ -409,7 +495,7 @@ void fsm_listen__loop(struct fsmonitor_daemon_state *state)
 
 	switch (data->shutdown_style) {
 	case FORCE_ERROR_STOP:
-		state->error_code = -1;
+		state->listen_error_code = -1;
 		/* fall thru */
 	case FORCE_SHUTDOWN:
 		ipc_server_stop_async(state->ipc_server_data);
@@ -421,7 +507,7 @@ void fsm_listen__loop(struct fsmonitor_daemon_state *state)
 	return;
 
 force_error_stop_without_loop:
-	state->error_code = -1;
+	state->listen_error_code = -1;
 	ipc_server_stop_async(state->ipc_server_data);
 	return;
 }
diff --git a/compat/fsmonitor/fsm-listen-win32.c b/compat/fsmonitor/fsm-listen-win32.c
index 5b928ab66e..03df8d951b 100644
--- a/compat/fsmonitor/fsm-listen-win32.c
+++ b/compat/fsmonitor/fsm-listen-win32.c
@@ -25,6 +25,9 @@ struct one_watch
 	DWORD count;
 
 	struct strbuf path;
+	wchar_t wpath_longname[MAX_PATH + 1];
+	DWORD wpath_longname_len;
+
 	HANDLE hDir;
 	HANDLE hEvent;
 	OVERLAPPED overlapped;
@@ -34,9 +37,24 @@ struct one_watch
 	 * need to later call GetOverlappedResult() and possibly CancelIoEx().
 	 */
 	BOOL is_active;
+
+	/*
+	 * Are shortnames enabled on the containing drive?  This is
+	 * always true for "C:/" drives and usually never true for
+	 * other drives.
+	 *
+	 * We only set this for the worktree because we only need to
+	 * convert shortname paths to longname paths for items we send
+	 * to clients.  (We don't care about shortname expansion for
+	 * paths inside a GITDIR because we never send them to
+	 * clients.)
+	 */
+	BOOL has_shortnames;
+	BOOL has_tilde;
+	wchar_t dotgit_shortname[16]; /* for 8.3 name */
 };
 
-struct fsmonitor_daemon_backend_data
+struct fsm_listen_data
 {
 	struct one_watch *watch_worktree;
 	struct one_watch *watch_gitdir;
@@ -51,17 +69,18 @@ struct fsmonitor_daemon_backend_data
 };
 
 /*
- * Convert the WCHAR path from the notification into UTF8 and
- * then normalize it.
+ * Convert the WCHAR path from the event into UTF8 and normalize it.
+ *
+ * `wpath_len` is in WCHARS not bytes.
  */
-static int normalize_path_in_utf8(FILE_NOTIFY_INFORMATION *info,
+static int normalize_path_in_utf8(wchar_t *wpath, DWORD wpath_len,
 				  struct strbuf *normalized_path)
 {
 	int reserve;
 	int len = 0;
 
 	strbuf_reset(normalized_path);
-	if (!info->FileNameLength)
+	if (!wpath_len)
 		goto normalize;
 
 	/*
@@ -70,12 +89,12 @@ static int normalize_path_in_utf8(FILE_NOTIFY_INFORMATION *info,
 	 * sequence of 2 UTF8 characters.  That should let us
 	 * avoid ERROR_INSUFFICIENT_BUFFER 99.9+% of the time.
 	 */
-	reserve = info->FileNameLength + 1;
+	reserve = 2 * wpath_len + 1;
 	strbuf_grow(normalized_path, reserve);
 
 	for (;;) {
-		len = WideCharToMultiByte(CP_UTF8, 0, info->FileName,
-					  info->FileNameLength / sizeof(WCHAR),
+		len = WideCharToMultiByte(CP_UTF8, 0,
+					  wpath, wpath_len,
 					  normalized_path->buf,
 					  strbuf_avail(normalized_path) - 1,
 					  NULL, NULL);
@@ -83,9 +102,7 @@ static int normalize_path_in_utf8(FILE_NOTIFY_INFORMATION *info,
 			goto normalize;
 		if (GetLastError() != ERROR_INSUFFICIENT_BUFFER) {
 			error(_("[GLE %ld] could not convert path to UTF-8: '%.*ls'"),
-			      GetLastError(),
-			      (int)(info->FileNameLength / sizeof(WCHAR)),
-			      info->FileName);
+			      GetLastError(), (int)wpath_len, wpath);
 			return -1;
 		}
 
@@ -98,9 +115,176 @@ normalize:
 	return strbuf_normalize_path(normalized_path);
 }
 
+/*
+ * See if the worktree root directory has shortnames enabled.
+ * This will help us decide if we need to do an expensive shortname
+ * to longname conversion on every notification event.
+ *
+ * We do not want to create a file to test this, so we assume that the
+ * root directory contains a ".git" file or directory.  (Our caller
+ * only calls us for the worktree root, so this should be fine.)
+ *
+ * Remember the spelling of the shortname for ".git" if it exists.
+ */
+static void check_for_shortnames(struct one_watch *watch)
+{
+	wchar_t buf_in[MAX_PATH + 1];
+	wchar_t buf_out[MAX_PATH + 1];
+	wchar_t *last;
+	wchar_t *p;
+
+	/* build L"<wt-root-path>/.git" */
+	swprintf(buf_in, ARRAY_SIZE(buf_in) - 1, L"%ls.git",
+		 watch->wpath_longname);
+
+	if (!GetShortPathNameW(buf_in, buf_out, ARRAY_SIZE(buf_out)))
+		return;
+
+	/*
+	 * Get the final filename component of the shortpath.
+	 * We know that the path does not have a final slash.
+	 */
+	for (last = p = buf_out; *p; p++)
+		if (*p == L'/' || *p == '\\')
+			last = p + 1;
+
+	if (!wcscmp(last, L".git"))
+		return;
+
+	watch->has_shortnames = 1;
+	wcsncpy(watch->dotgit_shortname, last,
+		ARRAY_SIZE(watch->dotgit_shortname));
+
+	/*
+	 * The shortname for ".git" is usually of the form "GIT~1", so
+	 * we should be able to avoid shortname to longname mapping on
+	 * every notification event if the source string does not
+	 * contain a "~".
+	 *
+	 * However, the documentation for GetLongPathNameW() says
+	 * that there are filesystems that don't follow that pattern
+	 * and warns against this optimization.
+	 *
+	 * Lets test this.
+	 */
+	if (wcschr(watch->dotgit_shortname, L'~'))
+		watch->has_tilde = 1;
+}
+
+enum get_relative_result {
+	GRR_NO_CONVERSION_NEEDED,
+	GRR_HAVE_CONVERSION,
+	GRR_SHUTDOWN,
+};
+
+/*
+ * Info notification paths are relative to the root of the watch.
+ * If our CWD is still at the root, then we can use relative paths
+ * to convert from shortnames to longnames.  If our process has a
+ * different CWD, then we need to construct an absolute path, do
+ * the conversion, and then return the root-relative portion.
+ *
+ * We use the longname form of the root as our basis and assume that
+ * it already has a trailing slash.
+ *
+ * `wpath_len` is in WCHARS not bytes.
+ */
+static enum get_relative_result get_relative_longname(
+	struct one_watch *watch,
+	const wchar_t *wpath, DWORD wpath_len,
+	wchar_t *wpath_longname, size_t bufsize_wpath_longname)
+{
+	wchar_t buf_in[2 * MAX_PATH + 1];
+	wchar_t buf_out[MAX_PATH + 1];
+	DWORD root_len;
+	DWORD out_len;
+
+	/*
+	 * Build L"<wt-root-path>/<event-rel-path>"
+	 * Note that the <event-rel-path> might not be null terminated
+	 * so we avoid swprintf() constructions.
+	 */
+	root_len = watch->wpath_longname_len;
+	if (root_len + wpath_len >= ARRAY_SIZE(buf_in)) {
+		/*
+		 * This should not happen.  We cannot append the observed
+		 * relative path onto the end of the worktree root path
+		 * without overflowing the buffer.  Just give up.
+		 */
+		return GRR_SHUTDOWN;
+	}
+	wcsncpy(buf_in, watch->wpath_longname, root_len);
+	wcsncpy(buf_in + root_len, wpath, wpath_len);
+	buf_in[root_len + wpath_len] = 0;
+
+	/*
+	 * We don't actually know if the source pathname is a
+	 * shortname or a longname.  This Windows routine allows
+	 * either to be given as input.
+	 */
+	out_len = GetLongPathNameW(buf_in, buf_out, ARRAY_SIZE(buf_out));
+	if (!out_len) {
+		/*
+		 * The shortname to longname conversion can fail for
+		 * various reasons, for example if the file has been
+		 * deleted.  (That is, if we just received a
+		 * delete-file notification event and the file is
+		 * already gone, we can't ask the file system to
+		 * lookup the longname for it.  Likewise, for moves
+		 * and renames where we are given the old name.)
+		 *
+		 * Since deleting or moving a file or directory by its
+		 * shortname is rather obscure, I'm going ignore the
+		 * failure and ask the caller to report the original
+		 * relative path.  This seems kinder than failing here
+		 * and forcing a resync.  Besides, forcing a resync on
+		 * every file/directory delete would effectively
+		 * cripple monitoring.
+		 *
+		 * We might revisit this in the future.
+		 */
+		return GRR_NO_CONVERSION_NEEDED;
+	}
+
+	if (!wcscmp(buf_in, buf_out)) {
+		/*
+		 * The path does not have a shortname alias.
+		 */
+		return GRR_NO_CONVERSION_NEEDED;
+	}
+
+	if (wcsncmp(buf_in, buf_out, root_len)) {
+		/*
+		 * The spelling of the root directory portion of the computed
+		 * longname has changed.  This should not happen.  Basically,
+		 * it means that we don't know where (without recomputing the
+		 * longname of just the root directory) to split out the
+		 * relative path.  Since this should not happen, I'm just
+		 * going to let this fail and force a shutdown (because all
+		 * subsequent events are probably going to see the same
+		 * mismatch).
+		 */
+		return GRR_SHUTDOWN;
+	}
+
+	if (out_len - root_len >= bufsize_wpath_longname) {
+		/*
+		 * This should not happen.  We cannot copy the root-relative
+		 * portion of the path into the provided buffer without an
+		 * overrun.  Just give up.
+		 */
+		return GRR_SHUTDOWN;
+	}
+
+	/* Return the worktree root-relative portion of the longname. */
+
+	wcscpy(wpath_longname, buf_out + root_len);
+	return GRR_HAVE_CONVERSION;
+}
+
 void fsm_listen__stop_async(struct fsmonitor_daemon_state *state)
 {
-	SetEvent(state->backend_data->hListener[LISTENER_SHUTDOWN]);
+	SetEvent(state->listen_data->hListener[LISTENER_SHUTDOWN]);
 }
 
 static struct one_watch *create_watch(struct fsmonitor_daemon_state *state,
@@ -111,7 +295,9 @@ static struct one_watch *create_watch(struct fsmonitor_daemon_state *state,
 	DWORD share_mode =
 		FILE_SHARE_WRITE | FILE_SHARE_READ | FILE_SHARE_DELETE;
 	HANDLE hDir;
-	wchar_t wpath[MAX_PATH];
+	DWORD len_longname;
+	wchar_t wpath[MAX_PATH + 1];
+	wchar_t wpath_longname[MAX_PATH + 1];
 
 	if (xutftowcs_path(wpath, path) < 0) {
 		error(_("could not convert to wide characters: '%s'"), path);
@@ -128,6 +314,21 @@ static struct one_watch *create_watch(struct fsmonitor_daemon_state *state,
 		return NULL;
 	}
 
+	len_longname = GetLongPathNameW(wpath, wpath_longname,
+					ARRAY_SIZE(wpath_longname));
+	if (!len_longname) {
+		error(_("[GLE %ld] could not get longname of '%s'"),
+		      GetLastError(), path);
+		CloseHandle(hDir);
+		return NULL;
+	}
+
+	if (wpath_longname[len_longname - 1] != L'/' &&
+	    wpath_longname[len_longname - 1] != L'\\') {
+		wpath_longname[len_longname++] = L'/';
+		wpath_longname[len_longname] = 0;
+	}
+
 	CALLOC_ARRAY(watch, 1);
 
 	watch->buf_len = sizeof(watch->buffer); /* assume full MAX_RDCW_BUF */
@@ -135,6 +336,9 @@ static struct one_watch *create_watch(struct fsmonitor_daemon_state *state,
 	strbuf_init(&watch->path, 0);
 	strbuf_addstr(&watch->path, path);
 
+	wcscpy(watch->wpath_longname, wpath_longname);
+	watch->wpath_longname_len = len_longname;
+
 	watch->hDir = hDir;
 	watch->hEvent = CreateEvent(NULL, TRUE, FALSE, NULL);
 
@@ -155,7 +359,7 @@ static void destroy_watch(struct one_watch *watch)
 	free(watch);
 }
 
-static int start_rdcw_watch(struct fsmonitor_daemon_backend_data *data,
+static int start_rdcw_watch(struct fsm_listen_data *data,
 			    struct one_watch *watch)
 {
 	DWORD dwNotifyFilter =
@@ -220,12 +424,22 @@ static int recv_rdcw_watch(struct one_watch *watch)
 	}
 
 	/*
-	 * NEEDSWORK: If an external <gitdir> is deleted, the above
-	 * returns an error.  I'm not sure that there's anything that
-	 * we can do here other than failing -- the <worktree>/.git
-	 * link file would be broken anyway.  We might try to check
-	 * for that and return a better error message, but I'm not
-	 * sure it is worth it.
+	 * GetOverlappedResult() fails if the watched directory is
+	 * deleted while we were waiting for an overlapped IO to
+	 * complete.  The documentation did not list specific errors,
+	 * but I observed ERROR_ACCESS_DENIED (0x05) errors during
+	 * testing.
+	 *
+	 * Note that we only get notificaiton events for events
+	 * *within* the directory, not *on* the directory itself.
+	 * (These might be properies of the parent directory, for
+	 * example).
+	 *
+	 * NEEDSWORK: We might try to check for the deleted directory
+	 * case and return a better error message, but I'm not sure it
+	 * is worth it.
+	 *
+	 * Shutdown if we get any error.
 	 */
 
 	error(_("GetOverlappedResult failed on '%s' [GLE %ld]"),
@@ -259,6 +473,62 @@ static void cancel_rdcw_watch(struct one_watch *watch)
 }
 
 /*
+ * Process a single relative pathname event.
+ * Return 1 if we should shutdown.
+ */
+static int process_1_worktree_event(
+	struct string_list *cookie_list,
+	struct fsmonitor_batch **batch,
+	const struct strbuf *path,
+	enum fsmonitor_path_type t,
+	DWORD info_action)
+{
+	const char *slash;
+
+	switch (t) {
+	case IS_INSIDE_DOT_GIT_WITH_COOKIE_PREFIX:
+		/* special case cookie files within .git */
+
+		/* Use just the filename of the cookie file. */
+		slash = find_last_dir_sep(path->buf);
+		string_list_append(cookie_list,
+				   slash ? slash + 1 : path->buf);
+		break;
+
+	case IS_INSIDE_DOT_GIT:
+		/* ignore everything inside of "<worktree>/.git/" */
+		break;
+
+	case IS_DOT_GIT:
+		/* "<worktree>/.git" was deleted (or renamed away) */
+		if ((info_action == FILE_ACTION_REMOVED) ||
+		    (info_action == FILE_ACTION_RENAMED_OLD_NAME)) {
+			trace2_data_string("fsmonitor", NULL,
+					   "fsm-listen/dotgit",
+					   "removed");
+			return 1;
+		}
+		break;
+
+	case IS_WORKDIR_PATH:
+		/* queue normal pathname */
+		if (!*batch)
+			*batch = fsmonitor_batch__new();
+		fsmonitor_batch__add_path(*batch, path->buf);
+		break;
+
+	case IS_GITDIR:
+	case IS_INSIDE_GITDIR:
+	case IS_INSIDE_GITDIR_WITH_COOKIE_PREFIX:
+	default:
+		BUG("unexpected path classification '%d' for '%s'",
+		    t, path->buf);
+	}
+
+	return 0;
+}
+
+/*
  * Process filesystem events that happen anywhere (recursively) under the
  * <worktree> root directory.  For a normal working directory, this includes
  * both version controlled files and the contents of the .git/ directory.
@@ -268,12 +538,13 @@ static void cancel_rdcw_watch(struct one_watch *watch)
  */
 static int process_worktree_events(struct fsmonitor_daemon_state *state)
 {
-	struct fsmonitor_daemon_backend_data *data = state->backend_data;
+	struct fsm_listen_data *data = state->listen_data;
 	struct one_watch *watch = data->watch_worktree;
 	struct strbuf path = STRBUF_INIT;
 	struct string_list cookie_list = STRING_LIST_INIT_DUP;
 	struct fsmonitor_batch *batch = NULL;
 	const char *p = watch->buffer;
+	wchar_t wpath_longname[MAX_PATH + 1];
 
 	/*
 	 * If the kernel gets more events than will fit in the kernel
@@ -306,54 +577,64 @@ static int process_worktree_events(struct fsmonitor_daemon_state *state)
 	 */
 	for (;;) {
 		FILE_NOTIFY_INFORMATION *info = (void *)p;
-		const char *slash;
+		wchar_t *wpath = info->FileName;
+		DWORD wpath_len = info->FileNameLength / sizeof(WCHAR);
 		enum fsmonitor_path_type t;
+		enum get_relative_result grr;
+
+		if (watch->has_shortnames) {
+			if (!wcscmp(wpath, watch->dotgit_shortname)) {
+				/*
+				 * This event exactly matches the
+				 * spelling of the shortname of
+				 * ".git", so we can skip some steps.
+				 *
+				 * (This case is odd because the user
+				 * can "rm -rf GIT~1" and we cannot
+				 * use the filesystem to map it back
+				 * to ".git".)
+				 */
+				strbuf_reset(&path);
+				strbuf_addstr(&path, ".git");
+				t = IS_DOT_GIT;
+				goto process_it;
+			}
 
-		strbuf_reset(&path);
-		if (normalize_path_in_utf8(info, &path) == -1)
-			goto skip_this_path;
-
-		t = fsmonitor_classify_path_workdir_relative(path.buf);
-
-		switch (t) {
-		case IS_INSIDE_DOT_GIT_WITH_COOKIE_PREFIX:
-			/* special case cookie files within .git */
-
-			/* Use just the filename of the cookie file. */
-			slash = find_last_dir_sep(path.buf);
-			string_list_append(&cookie_list,
-					   slash ? slash + 1 : path.buf);
-			break;
-
-		case IS_INSIDE_DOT_GIT:
-			/* ignore everything inside of "<worktree>/.git/" */
-			break;
+			if (watch->has_tilde && !wcschr(wpath, L'~')) {
+				/*
+				 * Shortnames on this filesystem have tildes
+				 * and the notification path does not have
+				 * one, so we assume that it is a longname.
+				 */
+				goto normalize_it;
+			}
 
-		case IS_DOT_GIT:
-			/* "<worktree>/.git" was deleted (or renamed away) */
-			if ((info->Action == FILE_ACTION_REMOVED) ||
-			    (info->Action == FILE_ACTION_RENAMED_OLD_NAME)) {
-				trace2_data_string("fsmonitor", NULL,
-						   "fsm-listen/dotgit",
-						   "removed");
+			grr = get_relative_longname(watch, wpath, wpath_len,
+						    wpath_longname,
+						    ARRAY_SIZE(wpath_longname));
+			switch (grr) {
+			case GRR_NO_CONVERSION_NEEDED: /* use info buffer as is */
+				break;
+			case GRR_HAVE_CONVERSION:
+				wpath = wpath_longname;
+				wpath_len = wcslen(wpath);
+				break;
+			default:
+			case GRR_SHUTDOWN:
 				goto force_shutdown;
 			}
-			break;
+		}
 
-		case IS_WORKDIR_PATH:
-			/* queue normal pathname */
-			if (!batch)
-				batch = fsmonitor_batch__new();
-			fsmonitor_batch__add_path(batch, path.buf);
-			break;
+normalize_it:
+		if (normalize_path_in_utf8(wpath, wpath_len, &path) == -1)
+			goto skip_this_path;
 
-		case IS_GITDIR:
-		case IS_INSIDE_GITDIR:
-		case IS_INSIDE_GITDIR_WITH_COOKIE_PREFIX:
-		default:
-			BUG("unexpected path classification '%d' for '%s'",
-			    t, path.buf);
-		}
+		t = fsmonitor_classify_path_workdir_relative(path.buf);
+
+process_it:
+		if (process_1_worktree_event(&cookie_list, &batch, &path, t,
+					     info->Action))
+			goto force_shutdown;
 
 skip_this_path:
 		if (!info->NextEntryOffset)
@@ -382,10 +663,13 @@ force_shutdown:
  * Note that we DO NOT get filesystem events on the external <gitdir>
  * itself (it is not inside something that we are watching).  In particular,
  * we do not get an event if the external <gitdir> is deleted.
+ *
+ * Also, we do not care about shortnames within the external <gitdir>, since
+ * we never send these paths to clients.
  */
 static int process_gitdir_events(struct fsmonitor_daemon_state *state)
 {
-	struct fsmonitor_daemon_backend_data *data = state->backend_data;
+	struct fsm_listen_data *data = state->listen_data;
 	struct one_watch *watch = data->watch_gitdir;
 	struct strbuf path = STRBUF_INIT;
 	struct string_list cookie_list = STRING_LIST_INIT_DUP;
@@ -403,8 +687,10 @@ static int process_gitdir_events(struct fsmonitor_daemon_state *state)
 		const char *slash;
 		enum fsmonitor_path_type t;
 
-		strbuf_reset(&path);
-		if (normalize_path_in_utf8(info, &path) == -1)
+		if (normalize_path_in_utf8(
+			    info->FileName,
+			    info->FileNameLength / sizeof(WCHAR),
+			    &path) == -1)
 			goto skip_this_path;
 
 		t = fsmonitor_classify_path_gitdir_relative(path.buf);
@@ -441,11 +727,11 @@ skip_this_path:
 
 void fsm_listen__loop(struct fsmonitor_daemon_state *state)
 {
-	struct fsmonitor_daemon_backend_data *data = state->backend_data;
+	struct fsm_listen_data *data = state->listen_data;
 	DWORD dwWait;
 	int result;
 
-	state->error_code = 0;
+	state->listen_error_code = 0;
 
 	if (start_rdcw_watch(data, data->watch_worktree) == -1)
 		goto force_error_stop;
@@ -510,7 +796,7 @@ void fsm_listen__loop(struct fsmonitor_daemon_state *state)
 	}
 
 force_error_stop:
-	state->error_code = -1;
+	state->listen_error_code = -1;
 
 force_shutdown:
 	/*
@@ -527,7 +813,7 @@ clean_shutdown:
 
 int fsm_listen__ctor(struct fsmonitor_daemon_state *state)
 {
-	struct fsmonitor_daemon_backend_data *data;
+	struct fsm_listen_data *data;
 
 	CALLOC_ARRAY(data, 1);
 
@@ -538,6 +824,8 @@ int fsm_listen__ctor(struct fsmonitor_daemon_state *state)
 	if (!data->watch_worktree)
 		goto failed;
 
+	check_for_shortnames(data->watch_worktree);
+
 	if (state->nr_paths_watching > 1) {
 		data->watch_gitdir = create_watch(state,
 						  state->path_gitdir_watch.buf);
@@ -558,7 +846,7 @@ int fsm_listen__ctor(struct fsmonitor_daemon_state *state)
 		data->nr_listener_handles++;
 	}
 
-	state->backend_data = data;
+	state->listen_data = data;
 	return 0;
 
 failed:
@@ -571,16 +859,16 @@ failed:
 
 void fsm_listen__dtor(struct fsmonitor_daemon_state *state)
 {
-	struct fsmonitor_daemon_backend_data *data;
+	struct fsm_listen_data *data;
 
-	if (!state || !state->backend_data)
+	if (!state || !state->listen_data)
 		return;
 
-	data = state->backend_data;
+	data = state->listen_data;
 
 	CloseHandle(data->hEventShutdown);
 	destroy_watch(data->watch_worktree);
 	destroy_watch(data->watch_gitdir);
 
-	FREE_AND_NULL(state->backend_data);
+	FREE_AND_NULL(state->listen_data);
 }
diff --git a/compat/fsmonitor/fsm-listen.h b/compat/fsmonitor/fsm-listen.h
index f0539349ba..41650bf897 100644
--- a/compat/fsmonitor/fsm-listen.h
+++ b/compat/fsmonitor/fsm-listen.h
@@ -33,7 +33,7 @@ void fsm_listen__dtor(struct fsmonitor_daemon_state *state);
  * do so if the listener thread receives a normal shutdown signal from
  * the IPC layer.)
  *
- * It should set `state->error_code` to -1 if the daemon should exit
+ * It should set `state->listen_error_code` to -1 if the daemon should exit
  * with an error.
  */
 void fsm_listen__loop(struct fsmonitor_daemon_state *state);
diff --git a/compat/fsmonitor/fsm-settings-darwin.c b/compat/fsmonitor/fsm-settings-darwin.c
new file mode 100644
index 0000000000..efc732c0f3
--- /dev/null
+++ b/compat/fsmonitor/fsm-settings-darwin.c
@@ -0,0 +1,89 @@
+#include "cache.h"
+#include "config.h"
+#include "repository.h"
+#include "fsmonitor-settings.h"
+#include "fsmonitor.h"
+#include <sys/param.h>
+#include <sys/mount.h>
+
+/*
+ * [1] Remote working directories are problematic for FSMonitor.
+ *
+ * The underlying file system on the server machine and/or the remote
+ * mount type (NFS, SAMBA, etc.) dictates whether notification events
+ * are available at all to remote client machines.
+ *
+ * Kernel differences between the server and client machines also
+ * dictate the how (buffering, frequency, de-dup) the events are
+ * delivered to client machine processes.
+ *
+ * A client machine (such as a laptop) may choose to suspend/resume
+ * and it is unclear (without lots of testing) whether the watcher can
+ * resync after a resume.  We might be able to treat this as a normal
+ * "events were dropped by the kernel" event and do our normal "flush
+ * and resync" --or-- we might need to close the existing (zombie?)
+ * notification fd and create a new one.
+ *
+ * In theory, the above issues need to be addressed whether we are
+ * using the Hook or IPC API.
+ *
+ * For the builtin FSMonitor, we create the Unix domain socket for the
+ * IPC in the .git directory.  If the working directory is remote,
+ * then the socket will be created on the remote file system.  This
+ * can fail if the remote file system does not support UDS file types
+ * (e.g. smbfs to a Windows server) or if the remote kernel does not
+ * allow a non-local process to bind() the socket.  (These problems
+ * could be fixed by moving the UDS out of the .git directory and to a
+ * well-known local directory on the client machine, but care should
+ * be taken to ensure that $HOME is actually local and not a managed
+ * file share.)
+ *
+ * So (for now at least), mark remote working directories as
+ * incompatible.
+ *
+ *
+ * [2] FAT32 and NTFS working directories are problematic too.
+ *
+ * The builtin FSMonitor uses a Unix domain socket in the .git
+ * directory for IPC.  These Windows drive formats do not support
+ * Unix domain sockets, so mark them as incompatible for the daemon.
+ *
+ */
+static enum fsmonitor_reason check_volume(struct repository *r)
+{
+	struct statfs fs;
+
+	if (statfs(r->worktree, &fs) == -1) {
+		int saved_errno = errno;
+		trace_printf_key(&trace_fsmonitor, "statfs('%s') failed: %s",
+				 r->worktree, strerror(saved_errno));
+		errno = saved_errno;
+		return FSMONITOR_REASON_ERROR;
+	}
+
+	trace_printf_key(&trace_fsmonitor,
+			 "statfs('%s') [type 0x%08x][flags 0x%08x] '%s'",
+			 r->worktree, fs.f_type, fs.f_flags, fs.f_fstypename);
+
+	if (!(fs.f_flags & MNT_LOCAL))
+		return FSMONITOR_REASON_REMOTE;
+
+	if (!strcmp(fs.f_fstypename, "msdos")) /* aka FAT32 */
+		return FSMONITOR_REASON_NOSOCKETS;
+
+	if (!strcmp(fs.f_fstypename, "ntfs"))
+		return FSMONITOR_REASON_NOSOCKETS;
+
+	return FSMONITOR_REASON_OK;
+}
+
+enum fsmonitor_reason fsm_os__incompatible(struct repository *r)
+{
+	enum fsmonitor_reason reason;
+
+	reason = check_volume(r);
+	if (reason != FSMONITOR_REASON_OK)
+		return reason;
+
+	return FSMONITOR_REASON_OK;
+}
diff --git a/compat/fsmonitor/fsm-settings-win32.c b/compat/fsmonitor/fsm-settings-win32.c
new file mode 100644
index 0000000000..907655720b
--- /dev/null
+++ b/compat/fsmonitor/fsm-settings-win32.c
@@ -0,0 +1,137 @@
+#include "cache.h"
+#include "config.h"
+#include "repository.h"
+#include "fsmonitor-settings.h"
+#include "fsmonitor.h"
+
+/*
+ * VFS for Git is incompatible with FSMonitor.
+ *
+ * Granted, core Git does not know anything about VFS for Git and we
+ * shouldn't make assumptions about a downstream feature, but users
+ * can install both versions.  And this can lead to incorrect results
+ * from core Git commands.  So, without bringing in any of the VFS for
+ * Git code, do a simple config test for a published config setting.
+ * (We do not look at the various *_TEST_* environment variables.)
+ */
+static enum fsmonitor_reason check_vfs4git(struct repository *r)
+{
+	const char *const_str;
+
+	if (!repo_config_get_value(r, "core.virtualfilesystem", &const_str))
+		return FSMONITOR_REASON_VFS4GIT;
+
+	return FSMONITOR_REASON_OK;
+}
+
+/*
+ * Remote working directories are problematic for FSMonitor.
+ *
+ * The underlying file system on the server machine and/or the remote
+ * mount type dictates whether notification events are available at
+ * all to remote client machines.
+ *
+ * Kernel differences between the server and client machines also
+ * dictate the how (buffering, frequency, de-dup) the events are
+ * delivered to client machine processes.
+ *
+ * A client machine (such as a laptop) may choose to suspend/resume
+ * and it is unclear (without lots of testing) whether the watcher can
+ * resync after a resume.  We might be able to treat this as a normal
+ * "events were dropped by the kernel" event and do our normal "flush
+ * and resync" --or-- we might need to close the existing (zombie?)
+ * notification fd and create a new one.
+ *
+ * In theory, the above issues need to be addressed whether we are
+ * using the Hook or IPC API.
+ *
+ * So (for now at least), mark remote working directories as
+ * incompatible.
+ *
+ * Notes for testing:
+ *
+ * (a) Windows allows a network share to be mapped to a drive letter.
+ *     (This is the normal method to access it.)
+ *
+ *     $ NET USE Z: \\server\share
+ *     $ git -C Z:/repo status
+ *
+ * (b) Windows allows a network share to be referenced WITHOUT mapping
+ *     it to drive letter.
+ *
+ *     $ NET USE \\server\share\dir
+ *     $ git -C //server/share/repo status
+ *
+ * (c) Windows allows "SUBST" to create a fake drive mapping to an
+ *     arbitrary path (which may be remote)
+ *
+ *     $ SUBST Q: Z:\repo
+ *     $ git -C Q:/ status
+ *
+ * (d) Windows allows a directory symlink to be created on a local
+ *     file system that points to a remote repo.
+ *
+ *     $ mklink /d ./link //server/share/repo
+ *     $ git -C ./link status
+ */
+static enum fsmonitor_reason check_remote(struct repository *r)
+{
+	wchar_t wpath[MAX_PATH];
+	wchar_t wfullpath[MAX_PATH];
+	size_t wlen;
+	UINT driveType;
+
+	/*
+	 * Do everything in wide chars because the drive letter might be
+	 * a multi-byte sequence.  See win32_has_dos_drive_prefix().
+	 */
+	if (xutftowcs_path(wpath, r->worktree) < 0)
+		return FSMONITOR_REASON_ERROR;
+
+	/*
+	 * GetDriveTypeW() requires a final slash.  We assume that the
+	 * worktree pathname points to an actual directory.
+	 */
+	wlen = wcslen(wpath);
+	if (wpath[wlen - 1] != L'\\' && wpath[wlen - 1] != L'/') {
+		wpath[wlen++] = L'\\';
+		wpath[wlen] = 0;
+	}
+
+	/*
+	 * Normalize the path.  If nothing else, this converts forward
+	 * slashes to backslashes.  This is essential to get GetDriveTypeW()
+	 * correctly handle some UNC "\\server\share\..." paths.
+	 */
+	if (!GetFullPathNameW(wpath, MAX_PATH, wfullpath, NULL))
+		return FSMONITOR_REASON_ERROR;
+
+	driveType = GetDriveTypeW(wfullpath);
+	trace_printf_key(&trace_fsmonitor,
+			 "DriveType '%s' L'%ls' (%u)",
+			 r->worktree, wfullpath, driveType);
+
+	if (driveType == DRIVE_REMOTE) {
+		trace_printf_key(&trace_fsmonitor,
+				 "check_remote('%s') true",
+				 r->worktree);
+		return FSMONITOR_REASON_REMOTE;
+	}
+
+	return FSMONITOR_REASON_OK;
+}
+
+enum fsmonitor_reason fsm_os__incompatible(struct repository *r)
+{
+	enum fsmonitor_reason reason;
+
+	reason = check_vfs4git(r);
+	if (reason != FSMONITOR_REASON_OK)
+		return reason;
+
+	reason = check_remote(r);
+	if (reason != FSMONITOR_REASON_OK)
+		return reason;
+
+	return FSMONITOR_REASON_OK;
+}
diff --git a/compat/mingw.c b/compat/mingw.c
index 6fe80fdf01..901375d584 100644
--- a/compat/mingw.c
+++ b/compat/mingw.c
@@ -1,6 +1,7 @@
 #include "../git-compat-util.h"
 #include "win32.h"
 #include <aclapi.h>
+#include <sddl.h>
 #include <conio.h>
 #include <wchar.h>
 #include "../strbuf.h"
@@ -768,8 +769,8 @@ static int has_valid_directory_prefix(wchar_t *wfilename)
 		wfilename[n] = L'\0';
 		attributes = GetFileAttributesW(wfilename);
 		wfilename[n] = c;
-		if (attributes == FILE_ATTRIBUTE_DIRECTORY ||
-				attributes == FILE_ATTRIBUTE_DEVICE)
+		if (attributes &
+		    (FILE_ATTRIBUTE_DIRECTORY | FILE_ATTRIBUTE_DEVICE))
 			return 1;
 		if (attributes == INVALID_FILE_ATTRIBUTES)
 			switch (GetLastError()) {
@@ -1059,10 +1060,7 @@ char *mingw_mktemp(char *template)
 
 int mkstemp(char *template)
 {
-	char *filename = mktemp(template);
-	if (filename == NULL)
-		return -1;
-	return open(filename, O_RDWR | O_CREAT, 0600);
+	return git_mkstemp_mode(template, 0600);
 }
 
 int gettimeofday(struct timeval *tv, void *tz)
@@ -2332,7 +2330,7 @@ int setitimer(int type, struct itimerval *in, struct itimerval *out)
 	static const struct timeval zero;
 	static int atexit_done;
 
-	if (out != NULL)
+	if (out)
 		return errno = EINVAL,
 			error("setitimer param 3 != NULL not implemented");
 	if (!is_timeval_eq(&in->it_interval, &zero) &&
@@ -2361,7 +2359,7 @@ int sigaction(int sig, struct sigaction *in, struct sigaction *out)
 	if (sig != SIGALRM)
 		return errno = EINVAL,
 			error("sigaction only implemented for SIGALRM");
-	if (out != NULL)
+	if (out)
 		return errno = EINVAL,
 			error("sigaction: param 3 != NULL not implemented");
 
@@ -2673,7 +2671,22 @@ static PSID get_current_user_sid(void)
 	return result;
 }
 
-int is_path_owned_by_current_sid(const char *path)
+static int acls_supported(const char *path)
+{
+	size_t offset = offset_1st_component(path);
+	WCHAR wroot[MAX_PATH];
+	DWORD file_system_flags;
+
+	if (offset &&
+	    xutftowcsn(wroot, path, MAX_PATH, offset) > 0 &&
+	    GetVolumeInformationW(wroot, NULL, 0, NULL, NULL,
+				  &file_system_flags, NULL, 0))
+		return !!(file_system_flags & FILE_PERSISTENT_ACLS);
+
+	return 0;
+}
+
+int is_path_owned_by_current_sid(const char *path, struct strbuf *report)
 {
 	WCHAR wpath[MAX_PATH];
 	PSID sid = NULL;
@@ -2712,6 +2725,7 @@ int is_path_owned_by_current_sid(const char *path)
 	else if (sid && IsValidSid(sid)) {
 		/* Now, verify that the SID matches the current user's */
 		static PSID current_user_sid;
+		BOOL is_member;
 
 		if (!current_user_sid)
 			current_user_sid = get_current_user_sid();
@@ -2720,6 +2734,46 @@ int is_path_owned_by_current_sid(const char *path)
 		    IsValidSid(current_user_sid) &&
 		    EqualSid(sid, current_user_sid))
 			result = 1;
+		else if (IsWellKnownSid(sid, WinBuiltinAdministratorsSid) &&
+			 CheckTokenMembership(NULL, sid, &is_member) &&
+			 is_member)
+			/*
+			 * If owned by the Administrators group, and the
+			 * current user is an administrator, we consider that
+			 * okay, too.
+			 */
+			result = 1;
+		else if (report &&
+			 IsWellKnownSid(sid, WinWorldSid) &&
+			 !acls_supported(path)) {
+			/*
+			 * On FAT32 volumes, ownership is not actually recorded.
+			 */
+			strbuf_addf(report, "'%s' is on a file system that does"
+				    "not record ownership\n", path);
+		} else if (report) {
+			LPSTR str1, str2, to_free1 = NULL, to_free2 = NULL;
+
+			if (ConvertSidToStringSidA(sid, &str1))
+				to_free1 = str1;
+			else
+				str1 = "(inconvertible)";
+
+			if (!current_user_sid)
+				str2 = "(none)";
+			else if (!IsValidSid(current_user_sid))
+				str2 = "(invalid)";
+			else if (ConvertSidToStringSidA(current_user_sid, &str2))
+				to_free2 = str2;
+			else
+				str2 = "(inconvertible)";
+			strbuf_addf(report,
+				    "'%s' is owned by:\n"
+				    "\t'%s'\nbut the current user is:\n"
+				    "\t'%s'\n", path, str1, str2);
+			LocalFree(to_free1);
+			LocalFree(to_free2);
+		}
 	}
 
 	/*
@@ -2830,7 +2884,7 @@ not_a_reserved_name:
 			}
 
 			c = path[i];
-			if (c && c != '.' && c != ':' && c != '/' && c != '\\')
+			if (c && c != '.' && c != ':' && !is_xplatform_dir_sep(c))
 				goto not_a_reserved_name;
 
 			/* contains reserved name */
diff --git a/compat/mingw.h b/compat/mingw.h
index 494cc8de92..209cf7ceba 100644
--- a/compat/mingw.h
+++ b/compat/mingw.h
@@ -332,6 +332,9 @@ int mingw_getpagesize(void);
 int win32_fsync_no_flush(int fd);
 #define fsync_no_flush win32_fsync_no_flush
 
+#define FSYNC_COMPONENTS_PLATFORM_DEFAULT (FSYNC_COMPONENTS_DEFAULT | FSYNC_COMPONENT_LOOSE_OBJECT)
+#define FSYNC_METHOD_DEFAULT (FSYNC_METHOD_BATCH)
+
 struct rlimit {
 	unsigned int rlim_cur;
 };
@@ -460,7 +463,7 @@ char *mingw_query_user_email(void);
  * Verifies that the specified path is owned by the user running the
  * current process.
  */
-int is_path_owned_by_current_sid(const char *path);
+int is_path_owned_by_current_sid(const char *path, struct strbuf *report);
 #define is_path_owned_by_current_user is_path_owned_by_current_sid
 
 /**
diff --git a/compat/mkdir.c b/compat/mkdir.c
index 9e253fb72f..02aea3b32e 100644
--- a/compat/mkdir.c
+++ b/compat/mkdir.c
@@ -9,7 +9,7 @@ int compat_mkdir_wo_trailing_slash(const char *dir, mode_t mode)
 	size_t len = strlen(dir);
 
 	if (len && dir[len-1] == '/') {
-		if ((tmp_dir = strdup(dir)) == NULL)
+		if (!(tmp_dir = strdup(dir)))
 			return -1;
 		tmp_dir[len-1] = '\0';
 	}
diff --git a/compat/mmap.c b/compat/mmap.c
index 8d6c02d4bc..2fe1c7732e 100644
--- a/compat/mmap.c
+++ b/compat/mmap.c
@@ -13,7 +13,7 @@ void *git_mmap(void *start, size_t length, int prot, int flags, int fd, off_t of
 	}
 
 	start = malloc(length);
-	if (start == NULL) {
+	if (!start) {
 		errno = ENOMEM;
 		return MAP_FAILED;
 	}
diff --git a/compat/nonblock.c b/compat/nonblock.c
new file mode 100644
index 0000000000..9694ebdb1d
--- /dev/null
+++ b/compat/nonblock.c
@@ -0,0 +1,50 @@
+#include "git-compat-util.h"
+#include "nonblock.h"
+
+#ifdef O_NONBLOCK
+
+int enable_pipe_nonblock(int fd)
+{
+	int flags = fcntl(fd, F_GETFL);
+	if (flags < 0)
+		return -1;
+	flags |= O_NONBLOCK;
+	return fcntl(fd, F_SETFL, flags);
+}
+
+#elif defined(GIT_WINDOWS_NATIVE)
+
+#include "win32.h"
+
+int enable_pipe_nonblock(int fd)
+{
+	HANDLE h = (HANDLE)_get_osfhandle(fd);
+	DWORD mode;
+	DWORD type = GetFileType(h);
+	if (type == FILE_TYPE_UNKNOWN && GetLastError() != NO_ERROR) {
+		errno = EBADF;
+		return -1;
+	}
+	if (type != FILE_TYPE_PIPE)
+		BUG("unsupported file type: %lu", type);
+	if (!GetNamedPipeHandleState(h, &mode, NULL, NULL, NULL, NULL, 0)) {
+		errno = err_win_to_posix(GetLastError());
+		return -1;
+	}
+	mode |= PIPE_NOWAIT;
+	if (!SetNamedPipeHandleState(h, &mode, NULL, NULL)) {
+		errno = err_win_to_posix(GetLastError());
+		return -1;
+	}
+	return 0;
+}
+
+#else
+
+int enable_pipe_nonblock(int fd)
+{
+	errno = ENOSYS;
+	return -1;
+}
+
+#endif
diff --git a/compat/nonblock.h b/compat/nonblock.h
new file mode 100644
index 0000000000..af1a331301
--- /dev/null
+++ b/compat/nonblock.h
@@ -0,0 +1,9 @@
+#ifndef COMPAT_NONBLOCK_H
+#define COMPAT_NONBLOCK_H
+
+/*
+ * Enable non-blocking I/O for the pipe specified by the passed-in descriptor.
+ */
+int enable_pipe_nonblock(int fd);
+
+#endif
diff --git a/compat/win32/path-utils.h b/compat/win32/path-utils.h
index bba2b64408..65fa3b9263 100644
--- a/compat/win32/path-utils.h
+++ b/compat/win32/path-utils.h
@@ -6,11 +6,7 @@ int win32_has_dos_drive_prefix(const char *path);
 
 int win32_skip_dos_drive_prefix(char **path);
 #define skip_dos_drive_prefix win32_skip_dos_drive_prefix
-static inline int win32_is_dir_sep(int c)
-{
-	return c == '/' || c == '\\';
-}
-#define is_dir_sep win32_is_dir_sep
+#define is_dir_sep is_xplatform_dir_sep
 static inline char *win32_find_last_dir_sep(const char *path)
 {
 	char *ret = NULL;
diff --git a/compat/win32/syslog.c b/compat/win32/syslog.c
index 1f8d8934cc..0af18d8882 100644
--- a/compat/win32/syslog.c
+++ b/compat/win32/syslog.c
@@ -44,6 +44,7 @@ void syslog(int priority, const char *fmt, ...)
 
 	while ((pos = strstr(str, "%1")) != NULL) {
 		size_t offset = pos - str;
+		char *new_pos;
 		char *oldstr = str;
 		str = realloc(str, st_add(++str_len, 1));
 		if (!str) {
@@ -51,9 +52,9 @@ void syslog(int priority, const char *fmt, ...)
 			warning_errno("realloc failed");
 			return;
 		}
-		pos = str + offset;
-		memmove(pos + 2, pos + 1, strlen(pos));
-		pos[1] = ' ';
+		new_pos = str + offset;
+		memmove(new_pos + 2, new_pos + 1, strlen(new_pos));
+		new_pos[1] = ' ';
 	}
 
 	switch (priority) {
diff --git a/config.c b/config.c
index a5e11aad7f..9b0e9c9328 100644
--- a/config.c
+++ b/config.c
@@ -1342,7 +1342,7 @@ static const struct fsync_component_name {
 
 static enum fsync_component parse_fsync_components(const char *var, const char *string)
 {
-	enum fsync_component current = FSYNC_COMPONENTS_DEFAULT;
+	enum fsync_component current = FSYNC_COMPONENTS_PLATFORM_DEFAULT;
 	enum fsync_component positive = 0, negative = 0;
 
 	while (string) {
@@ -1688,6 +1688,8 @@ static int git_default_core_config(const char *var, const char *value, void *cb)
 			fsync_method = FSYNC_METHOD_FSYNC;
 		else if (!strcmp(value, "writeout-only"))
 			fsync_method = FSYNC_METHOD_WRITEOUT_ONLY;
+		else if (!strcmp(value, "batch"))
+			fsync_method = FSYNC_METHOD_BATCH;
 		else
 			warning(_("ignoring unknown core.fsyncMethod value '%s'"), value);
 
@@ -1781,6 +1783,9 @@ static int git_default_branch_config(const char *var, const char *value)
 		} else if (value && !strcmp(value, "inherit")) {
 			git_branch_track = BRANCH_TRACK_INHERIT;
 			return 0;
+		} else if (value && !strcmp(value, "simple")) {
+			git_branch_track = BRANCH_TRACK_SIMPLE;
+			return 0;
 		}
 		git_branch_track = git_config_bool(var, value);
 		return 0;
@@ -3190,7 +3195,7 @@ int git_config_set_multivar_in_file_gently(const char *config_filename,
 			goto out_free;
 		}
 		/* if nothing to unset, error out */
-		if (value == NULL) {
+		if (!value) {
 			ret = CONFIG_NOTHING_SET;
 			goto out_free;
 		}
@@ -3206,7 +3211,7 @@ int git_config_set_multivar_in_file_gently(const char *config_filename,
 		int i, new_line = 0;
 		struct config_options opts;
 
-		if (value_pattern == NULL)
+		if (!value_pattern)
 			store.value_pattern = NULL;
 		else if (value_pattern == CONFIG_REGEX_NONE)
 			store.value_pattern = CONFIG_REGEX_NONE;
@@ -3346,7 +3351,7 @@ int git_config_set_multivar_in_file_gently(const char *config_filename,
 		}
 
 		/* write the pair (value == NULL means unset) */
-		if (value != NULL) {
+		if (value) {
 			if (!store.section_seen) {
 				if (write_section(fd, key, &store) < 0)
 					goto write_err_out;
@@ -3567,7 +3572,7 @@ static int git_config_copy_or_rename_section_in_file(const char *config_filename
 			offset = section_name_match(&buf[i], old_name);
 			if (offset > 0) {
 				ret++;
-				if (new_name == NULL) {
+				if (!new_name) {
 					remove = 1;
 					continue;
 				}
diff --git a/config.mak.dev b/config.mak.dev
index c3104f400b..4fa19d361b 100644
--- a/config.mak.dev
+++ b/config.mak.dev
@@ -59,16 +59,19 @@ endif
 
 # uninitialized warnings on gcc 4.9.2 in xdiff/xdiffi.c and config.c
 # not worth fixing since newer compilers correctly stop complaining
+#
+# Likewise, gcc older than 4.9 complains about initializing a
+# struct-within-a-struct using just "{ 0 }"
 ifneq ($(filter gcc4,$(COMPILER_FEATURES)),)
 ifeq ($(filter gcc5,$(COMPILER_FEATURES)),)
 DEVELOPER_CFLAGS += -Wno-uninitialized
+DEVELOPER_CFLAGS += -Wno-missing-braces
 endif
 endif
 
 # https://bugzilla.redhat.com/show_bug.cgi?id=2075786
 ifneq ($(filter gcc12,$(COMPILER_FEATURES)),)
 DEVELOPER_CFLAGS += -Wno-error=stringop-overread
-DEVELOPER_CFLAGS += -Wno-error=dangling-pointer
 endif
 
 GIT_TEST_PERL_FATAL_WARNINGS = YesPlease
diff --git a/config.mak.uname b/config.mak.uname
index 259d1511ca..d63629fe80 100644
--- a/config.mak.uname
+++ b/config.mak.uname
@@ -164,6 +164,7 @@ ifeq ($(uname_S),Darwin)
 	ifndef NO_PTHREADS
 	ifndef NO_UNIX_SOCKETS
 	FSMONITOR_DAEMON_BACKEND = darwin
+	FSMONITOR_OS_SETTINGS = darwin
 	endif
 	endif
 
@@ -451,6 +452,8 @@ ifeq ($(uname_S),Windows)
 	# These are always available, so we do not have to conditionally
 	# support it.
 	FSMONITOR_DAEMON_BACKEND = win32
+	FSMONITOR_OS_SETTINGS = win32
+
 	NO_SVN_TESTS = YesPlease
 	RUNTIME_PREFIX = YesPlease
 	HAVE_WPGMPTR = YesWeDo
@@ -641,6 +644,8 @@ ifeq ($(uname_S),MINGW)
 	# These are always available, so we do not have to conditionally
 	# support it.
 	FSMONITOR_DAEMON_BACKEND = win32
+	FSMONITOR_OS_SETTINGS = win32
+
 	RUNTIME_PREFIX = YesPlease
 	HAVE_WPGMPTR = YesWeDo
 	NO_ST_BLOCKS_IN_STRUCT_STAT = YesPlease
@@ -651,7 +656,6 @@ ifeq ($(uname_S),MINGW)
 	UNRELIABLE_FSTAT = UnfortunatelyYes
 	OBJECT_CREATION_USES_RENAMES = UnfortunatelyNeedsTo
 	NO_REGEX = YesPlease
-	NO_PYTHON = YesPlease
 	ETAGS_TARGET = ETAGS
 	NO_POSIX_GOODIES = UnfortunatelyYes
 	DEFAULT_HELP_FORMAT = html
@@ -681,6 +685,7 @@ ifneq (,$(wildcard ../THIS_IS_MSYSGIT))
 	INTERNAL_QSORT = YesPlease
 	HAVE_LIBCHARSET_H = YesPlease
 	NO_GETTEXT = YesPlease
+	NO_PYTHON = YesPlease
 	COMPAT_CFLAGS += -D__USE_MINGW_ACCESS
 else
 	ifneq ($(shell expr "$(uname_R)" : '1\.'),2)
@@ -712,10 +717,8 @@ else
 		INSTALL = /bin/install
 		INTERNAL_QSORT = YesPlease
 		HAVE_LIBCHARSET_H = YesPlease
-		NO_GETTEXT =
 		USE_GETTEXT_SCHEME = fallthrough
 		USE_LIBPCRE = YesPlease
-		NO_CURL =
 		USE_NED_ALLOCATOR = YesPlease
 		ifeq (/mingw64,$(subst 32,64,$(prefix)))
 			# Move system config into top-level /etc/
@@ -725,6 +728,7 @@ else
 	else
 		COMPAT_CFLAGS += -D__USE_MINGW_ANSI_STDIO
 		NO_CURL = YesPlease
+		NO_PYTHON = YesPlease
 	endif
 endif
 endif
diff --git a/configure.ac b/configure.ac
index 316a31d231..7dcd048204 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1189,9 +1189,6 @@ AC_COMPILE_IFELSE([BSD_SYSCTL_SRC],
 GIT_CONF_SUBST([HAVE_BSD_SYSCTL])
 
 ## Other checks.
-# Define USE_PIC if you need the main git objects to be built with -fPIC
-# in order to build and link perl/Git.so.  x86-64 seems to need this.
-#
 # Define NO_SYMLINK_HEAD if you never want .git/HEAD to be a symbolic link.
 # Enable it on Windows.  By default, symrefs are still used.
 #
diff --git a/connect.c b/connect.c
index afc79a6236..5ea53deda2 100644
--- a/connect.c
+++ b/connect.c
@@ -473,6 +473,24 @@ void check_stateless_delimiter(int stateless_rpc,
 		die("%s", error);
 }
 
+static void send_capabilities(int fd_out, struct packet_reader *reader)
+{
+	const char *hash_name;
+
+	if (server_supports_v2("agent", 0))
+		packet_write_fmt(fd_out, "agent=%s", git_user_agent_sanitized());
+
+	if (server_feature_v2("object-format", &hash_name)) {
+		int hash_algo = hash_algo_by_name(hash_name);
+		if (hash_algo == GIT_HASH_UNKNOWN)
+			die(_("unknown object format '%s' specified by server"), hash_name);
+		reader->hash_algo = &hash_algos[hash_algo];
+		packet_write_fmt(fd_out, "object-format=%s", reader->hash_algo->name);
+	} else {
+		reader->hash_algo = &hash_algos[GIT_HASH_SHA1];
+	}
+}
+
 struct ref **get_remote_refs(int fd_out, struct packet_reader *reader,
 			     struct ref **list, int for_push,
 			     struct transport_ls_refs_options *transport_options,
@@ -480,7 +498,6 @@ struct ref **get_remote_refs(int fd_out, struct packet_reader *reader,
 			     int stateless_rpc)
 {
 	int i;
-	const char *hash_name;
 	struct strvec *ref_prefixes = transport_options ?
 		&transport_options->ref_prefixes : NULL;
 	const char **unborn_head_target = transport_options ?
@@ -490,18 +507,8 @@ struct ref **get_remote_refs(int fd_out, struct packet_reader *reader,
 	if (server_supports_v2("ls-refs", 1))
 		packet_write_fmt(fd_out, "command=ls-refs\n");
 
-	if (server_supports_v2("agent", 0))
-		packet_write_fmt(fd_out, "agent=%s", git_user_agent_sanitized());
-
-	if (server_feature_v2("object-format", &hash_name)) {
-		int hash_algo = hash_algo_by_name(hash_name);
-		if (hash_algo == GIT_HASH_UNKNOWN)
-			die(_("unknown object format '%s' specified by server"), hash_name);
-		reader->hash_algo = &hash_algos[hash_algo];
-		packet_write_fmt(fd_out, "object-format=%s", reader->hash_algo->name);
-	} else {
-		reader->hash_algo = &hash_algos[GIT_HASH_SHA1];
-	}
+	/* Send capabilities */
+	send_capabilities(fd_out, reader);
 
 	if (server_options && server_options->nr &&
 	    server_supports_v2("server-option", 1))
@@ -1327,7 +1334,7 @@ static void fill_ssh_args(struct child_process *conn, const char *ssh_host,
 
 		strvec_push(&detect.args, ssh);
 		strvec_push(&detect.args, "-G");
-		push_ssh_options(&detect.args, &detect.env_array,
+		push_ssh_options(&detect.args, &detect.env,
 				 VARIANT_SSH, port, version, flags);
 		strvec_push(&detect.args, ssh_host);
 
@@ -1335,7 +1342,8 @@ static void fill_ssh_args(struct child_process *conn, const char *ssh_host,
 	}
 
 	strvec_push(&conn->args, ssh);
-	push_ssh_options(&conn->args, &conn->env_array, variant, port, version, flags);
+	push_ssh_options(&conn->args, &conn->env, variant, port, version,
+			 flags);
 	strvec_push(&conn->args, ssh_host);
 }
 
@@ -1397,7 +1405,7 @@ struct child_process *git_connect(int fd[2], const char *url,
 
 		/* remove repo-local variables from the environment */
 		for (var = local_repo_env; *var; var++)
-			strvec_push(&conn->env_array, *var);
+			strvec_push(&conn->env, *var);
 
 		conn->use_shell = 1;
 		conn->in = conn->out = -1;
@@ -1429,7 +1437,7 @@ struct child_process *git_connect(int fd[2], const char *url,
 			transport_check_allowed("file");
 			conn->trace2_child_class = "transport/file";
 			if (version > 0) {
-				strvec_pushf(&conn->env_array,
+				strvec_pushf(&conn->env,
 					     GIT_PROTOCOL_ENVIRONMENT "=version=%d",
 					     version);
 			}
diff --git a/connected.c b/connected.c
index ed3025e7a2..74a20cb32e 100644
--- a/connected.c
+++ b/connected.c
@@ -110,7 +110,7 @@ no_promisor_pack_found:
 
 	rev_list.git_cmd = 1;
 	if (opt->env)
-		strvec_pushv(&rev_list.env_array, opt->env);
+		strvec_pushv(&rev_list.env, opt->env);
 	rev_list.in = -1;
 	rev_list.no_stdout = 1;
 	if (opt->err_fd)
diff --git a/contrib/buildsystems/CMakeLists.txt b/contrib/buildsystems/CMakeLists.txt
index 185f56f414..2237109b57 100644
--- a/contrib/buildsystems/CMakeLists.txt
+++ b/contrib/buildsystems/CMakeLists.txt
@@ -54,7 +54,7 @@ set(CMAKE_SOURCE_DIR ${CMAKE_CURRENT_LIST_DIR}/../..)
 
 option(USE_VCPKG "Whether or not to use vcpkg for obtaining dependencies.  Only applicable to Windows platforms" ON)
 if(NOT WIN32)
-	set(USE_VCPKG OFF CACHE BOOL FORCE)
+	set(USE_VCPKG OFF CACHE BOOL "" FORCE)
 endif()
 
 if(NOT DEFINED CMAKE_EXPORT_COMPILE_COMMANDS)
@@ -77,7 +77,7 @@ if(USE_VCPKG)
 	set(CMAKE_TOOLCHAIN_FILE ${VCPKG_DIR}/scripts/buildsystems/vcpkg.cmake CACHE STRING "Vcpkg toolchain file")
 endif()
 
-find_program(SH_EXE sh PATHS "C:/Program Files/Git/bin")
+find_program(SH_EXE sh PATHS "C:/Program Files/Git/bin" "$ENV{LOCALAPPDATA}/Programs/Git/bin")
 if(NOT SH_EXE)
 	message(FATAL_ERROR "sh: shell interpreter was not found in your path, please install one."
 			"On Windows, you can get it as part of 'Git for Windows' install at https://gitforwindows.org/")
@@ -108,7 +108,6 @@ project(git
 
 #TODO gitk git-gui gitweb
 #TODO Enable NLS on windows natively
-#TODO Add pcre support
 
 #macros for parsing the Makefile for sources and scripts
 macro(parse_makefile_for_sources list_var regex)
@@ -160,6 +159,14 @@ if(NOT (WIN32 AND (CMAKE_C_COMPILER_ID STREQUAL "MSVC" OR CMAKE_C_COMPILER_ID ST
 	find_package(Intl)
 endif()
 
+find_package(PkgConfig)
+if(PkgConfig_FOUND)
+	pkg_check_modules(PCRE2 libpcre2-8)
+	if(PCRE2_FOUND)
+		add_compile_definitions(USE_LIBPCRE2)
+	endif()
+endif()
+
 if(NOT Intl_FOUND)
 	add_compile_definitions(NO_GETTEXT)
 	if(NOT Iconv_FOUND)
@@ -180,6 +187,9 @@ endif()
 if(Intl_FOUND)
 	include_directories(SYSTEM ${Intl_INCLUDE_DIRS})
 endif()
+if(PCRE2_FOUND)
+	include_directories(SYSTEM ${PCRE2_INCLUDE_DIRS})
+endif()
 
 
 if(WIN32 AND NOT MSVC)#not required for visual studio builds
@@ -260,7 +270,7 @@ if(CMAKE_SYSTEM_NAME STREQUAL "Windows")
 				_CONSOLE DETECT_MSYS_TTY STRIP_EXTENSION=".exe"  NO_SYMLINK_HEAD UNRELIABLE_FSTAT
 				NOGDI OBJECT_CREATION_MODE=1 __USE_MINGW_ANSI_STDIO=0
 				USE_NED_ALLOCATOR OVERRIDE_STRDUP MMAP_PREVENTS_DELETE USE_WIN32_MMAP
-				UNICODE _UNICODE HAVE_WPGMPTR ENSURE_MSYSTEM_IS_SET HAVE_RTLGENRANDOM)
+				HAVE_WPGMPTR ENSURE_MSYSTEM_IS_SET HAVE_RTLGENRANDOM)
 	list(APPEND compat_SOURCES
 		compat/mingw.c
 		compat/winansi.c
@@ -277,7 +287,7 @@ if(CMAKE_SYSTEM_NAME STREQUAL "Windows")
 
 elseif(CMAKE_SYSTEM_NAME STREQUAL "Linux")
 	add_compile_definitions(PROCFS_EXECUTABLE_PATH="/proc/self/exe" HAVE_DEV_TTY )
-	list(APPEND compat_SOURCES unix-socket.c unix-stream-server.c)
+	list(APPEND compat_SOURCES unix-socket.c unix-stream-server.c compat/linux/procinfo.c)
 endif()
 
 if(CMAKE_SYSTEM_NAME STREQUAL "Windows")
@@ -297,9 +307,17 @@ if(SUPPORTS_SIMPLE_IPC)
 	if(CMAKE_SYSTEM_NAME STREQUAL "Windows")
 		add_compile_definitions(HAVE_FSMONITOR_DAEMON_BACKEND)
 		list(APPEND compat_SOURCES compat/fsmonitor/fsm-listen-win32.c)
+		list(APPEND compat_SOURCES compat/fsmonitor/fsm-health-win32.c)
+
+		add_compile_definitions(HAVE_FSMONITOR_OS_SETTINGS)
+		list(APPEND compat_SOURCES compat/fsmonitor/fsm-settings-win32.c)
 	elseif(CMAKE_SYSTEM_NAME STREQUAL "Darwin")
 		add_compile_definitions(HAVE_FSMONITOR_DAEMON_BACKEND)
 		list(APPEND compat_SOURCES compat/fsmonitor/fsm-listen-darwin.c)
+		list(APPEND compat_SOURCES compat/fsmonitor/fsm-health-darwin.c)
+
+		add_compile_definitions(HAVE_FSMONITOR_OS_SETTINGS)
+		list(APPEND compat_SOURCES compat/fsmonitor/fsm-settings-darwin.c)
 	endif()
 endif()
 
@@ -700,6 +718,10 @@ endif()
 if(Iconv_FOUND)
 	target_link_libraries(common-main ${Iconv_LIBRARIES})
 endif()
+if(PCRE2_FOUND)
+	target_link_libraries(common-main ${PCRE2_LIBRARIES})
+	target_link_directories(common-main PUBLIC ${PCRE2_LIBRARY_DIRS})
+endif()
 if(WIN32)
 	target_link_libraries(common-main ws2_32 ntdll ${CMAKE_BINARY_DIR}/git.res)
 	add_dependencies(common-main git-rc)
diff --git a/contrib/coccinelle/equals-null.cocci b/contrib/coccinelle/equals-null.cocci
new file mode 100644
index 0000000000..92c7054013
--- /dev/null
+++ b/contrib/coccinelle/equals-null.cocci
@@ -0,0 +1,30 @@
+/* SPDX-License-Identifier: LGPL-2.1-or-later */
+@@
+expression e;
+statement s;
+@@
+if (
+(
+!e
+|
+- e == NULL
++ !e
+)
+   )
+   {...}
+else s
+
+@@
+expression e;
+statement s;
+@@
+if (
+(
+e
+|
+- e != NULL
++ e
+)
+   )
+   {...}
+else s
diff --git a/contrib/coccinelle/free.cocci b/contrib/coccinelle/free.cocci
index 4490069df9..6fb9eb6e88 100644
--- a/contrib/coccinelle/free.cocci
+++ b/contrib/coccinelle/free.cocci
@@ -2,13 +2,21 @@
 expression E;
 @@
 - if (E)
+(
   free(E);
+|
+  free_commit_list(E);
+)
 
 @@
 expression E;
 @@
 - if (!E)
+(
   free(E);
+|
+  free_commit_list(E);
+)
 
 @@
 expression E;
@@ -16,3 +24,22 @@ expression E;
 - free(E);
 + FREE_AND_NULL(E);
 - E = NULL;
+
+@@
+expression E;
+@@
+- if (E)
+- {
+  free_commit_list(E);
+  E = NULL;
+- }
+
+@@
+expression E;
+statement S;
+@@
+- if (E) {
++ if (E)
+  S
+  free_commit_list(E);
+- }
diff --git a/contrib/coccinelle/object_id.cocci b/contrib/coccinelle/object_id.cocci
index ddf4f22bd7..01f8d6935b 100644
--- a/contrib/coccinelle/object_id.cocci
+++ b/contrib/coccinelle/object_id.cocci
@@ -1,18 +1,6 @@
 @@
 struct object_id OID;
 @@
-- is_null_sha1(OID.hash)
-+ is_null_oid(&OID)
-
-@@
-struct object_id *OIDPTR;
-@@
-- is_null_sha1(OIDPTR->hash)
-+ is_null_oid(OIDPTR)
-
-@@
-struct object_id OID;
-@@
 - hashclr(OID.hash)
 + oidclr(&OID)
 
diff --git a/contrib/coccinelle/the_repository.pending.cocci b/contrib/coccinelle/the_repository.pending.cocci
index 2ee702ecf7..072ea0d922 100644
--- a/contrib/coccinelle/the_repository.pending.cocci
+++ b/contrib/coccinelle/the_repository.pending.cocci
@@ -14,21 +14,6 @@ expression G;
 @@
 expression E;
 @@
-- has_sha1_file(
-+ repo_has_sha1_file(the_repository,
-  E)
-
-@@
-expression E;
-expression F;
-@@
-- has_sha1_file_with_flags(
-+ repo_has_sha1_file_with_flags(the_repository,
-  E)
-
-@@
-expression E;
-@@
 - has_object_file(
 + repo_has_object_file(the_repository,
   E)
diff --git a/contrib/completion/git-prompt.sh b/contrib/completion/git-prompt.sh
index 87b2b916c0..1435548e00 100644
--- a/contrib/completion/git-prompt.sh
+++ b/contrib/completion/git-prompt.sh
@@ -245,7 +245,8 @@ __git_ps1_show_upstream ()
 
 # Helper function that is meant to be called from __git_ps1.  It
 # injects color codes into the appropriate gitstring variables used
-# to build a gitstring.
+# to build a gitstring. Colored variables are responsible for clearing
+# their own color.
 __git_ps1_colorize_gitstring ()
 {
 	if [[ -n ${ZSH_VERSION-} ]]; then
@@ -271,22 +272,23 @@ __git_ps1_colorize_gitstring ()
 	else
 		branch_color="$bad_color"
 	fi
-	c="$branch_color$c"
+	if [ -n "$c" ]; then
+		c="$branch_color$c$c_clear"
+	fi
+	b="$branch_color$b$c_clear"
 
-	z="$c_clear$z"
-	if [ "$w" = "*" ]; then
-		w="$bad_color$w"
+	if [ -n "$w" ]; then
+		w="$bad_color$w$c_clear"
 	fi
 	if [ -n "$i" ]; then
-		i="$ok_color$i"
+		i="$ok_color$i$c_clear"
 	fi
 	if [ -n "$s" ]; then
-		s="$flags_color$s"
+		s="$flags_color$s$c_clear"
 	fi
 	if [ -n "$u" ]; then
-		u="$bad_color$u"
+		u="$bad_color$u$c_clear"
 	fi
-	r="$c_clear$r"
 }
 
 # Helper function to read the first line of a file into a variable.
@@ -556,6 +558,12 @@ __git_ps1 ()
 
 	local z="${GIT_PS1_STATESEPARATOR-" "}"
 
+	b=${b##refs/heads/}
+	if [ $pcmode = yes ] && [ $ps1_expanded = yes ]; then
+		__git_ps1_branch_name=$b
+		b="\${__git_ps1_branch_name}"
+	fi
+
 	# NO color option unless in PROMPT_COMMAND mode or it's Zsh
 	if [ -n "${GIT_PS1_SHOWCOLORHINTS-}" ]; then
 		if [ $pcmode = yes ] || [ -n "${ZSH_VERSION-}" ]; then
@@ -563,12 +571,6 @@ __git_ps1 ()
 		fi
 	fi
 
-	b=${b##refs/heads/}
-	if [ $pcmode = yes ] && [ $ps1_expanded = yes ]; then
-		__git_ps1_branch_name=$b
-		b="\${__git_ps1_branch_name}"
-	fi
-
 	local f="$h$w$i$s$u$p"
 	local gitstring="$c$b${f:+$z$f}${sparse}$r${upstream}"
 
diff --git a/contrib/credential/osxkeychain/git-credential-osxkeychain.c b/contrib/credential/osxkeychain/git-credential-osxkeychain.c
index 0b44a9b7cc..bf77748d60 100644
--- a/contrib/credential/osxkeychain/git-credential-osxkeychain.c
+++ b/contrib/credential/osxkeychain/git-credential-osxkeychain.c
@@ -168,7 +168,7 @@ int main(int argc, const char **argv)
 		"usage: git credential-osxkeychain <get|store|erase>";
 
 	if (!argv[1])
-		die(usage);
+		die("%s", usage);
 
 	read_credential();
 
diff --git a/contrib/rerere-train.sh b/contrib/rerere-train.sh
index 26b724c8c6..bd01e430ef 100755
--- a/contrib/rerere-train.sh
+++ b/contrib/rerere-train.sh
@@ -75,7 +75,7 @@ do
 		continue
 	fi
 	git checkout -q "$parent1^0"
-	if git merge $other_parents >/dev/null 2>&1
+	if git merge --no-gpg-sign $other_parents >/dev/null 2>&1
 	then
 		# Cleanly merges
 		continue
diff --git a/contrib/scalar/scalar.c b/contrib/scalar/scalar.c
index 58ca0e56f1..28176914e5 100644
--- a/contrib/scalar/scalar.c
+++ b/contrib/scalar/scalar.c
@@ -11,6 +11,8 @@
 #include "dir.h"
 #include "packfile.h"
 #include "help.h"
+#include "archive.h"
+#include "object-store.h"
 
 /*
  * Remove the deepest subdirectory in the provided path string. Path must not
@@ -43,9 +45,11 @@ static void setup_enlistment_directory(int argc, const char **argv,
 		usage_with_options(usagestr, options);
 
 	/* find the worktree, determine its corresponding root */
-	if (argc == 1)
+	if (argc == 1) {
 		strbuf_add_absolute_path(&path, argv[0]);
-	else if (strbuf_getcwd(&path) < 0)
+		if (!is_directory(path.buf))
+			die(_("'%s' does not exist"), path.buf);
+	} else if (strbuf_getcwd(&path) < 0)
 		die(_("need a working directory"));
 
 	strbuf_trim_trailing_dir_sep(&path);
@@ -258,6 +262,99 @@ static int unregister_dir(void)
 	return res;
 }
 
+static int add_directory_to_archiver(struct strvec *archiver_args,
+					  const char *path, int recurse)
+{
+	int at_root = !*path;
+	DIR *dir = opendir(at_root ? "." : path);
+	struct dirent *e;
+	struct strbuf buf = STRBUF_INIT;
+	size_t len;
+	int res = 0;
+
+	if (!dir)
+		return error_errno(_("could not open directory '%s'"), path);
+
+	if (!at_root)
+		strbuf_addf(&buf, "%s/", path);
+	len = buf.len;
+	strvec_pushf(archiver_args, "--prefix=%s", buf.buf);
+
+	while (!res && (e = readdir(dir))) {
+		if (!strcmp(".", e->d_name) || !strcmp("..", e->d_name))
+			continue;
+
+		strbuf_setlen(&buf, len);
+		strbuf_addstr(&buf, e->d_name);
+
+		if (e->d_type == DT_REG)
+			strvec_pushf(archiver_args, "--add-file=%s", buf.buf);
+		else if (e->d_type != DT_DIR)
+			warning(_("skipping '%s', which is neither file nor "
+				  "directory"), buf.buf);
+		else if (recurse &&
+			 add_directory_to_archiver(archiver_args,
+						   buf.buf, recurse) < 0)
+			res = -1;
+	}
+
+	closedir(dir);
+	strbuf_release(&buf);
+	return res;
+}
+
+#ifndef WIN32
+#include <sys/statvfs.h>
+#endif
+
+static int get_disk_info(struct strbuf *out)
+{
+#ifdef WIN32
+	struct strbuf buf = STRBUF_INIT;
+	char volume_name[MAX_PATH], fs_name[MAX_PATH];
+	DWORD serial_number, component_length, flags;
+	ULARGE_INTEGER avail2caller, total, avail;
+
+	strbuf_realpath(&buf, ".", 1);
+	if (!GetDiskFreeSpaceExA(buf.buf, &avail2caller, &total, &avail)) {
+		error(_("could not determine free disk size for '%s'"),
+		      buf.buf);
+		strbuf_release(&buf);
+		return -1;
+	}
+
+	strbuf_setlen(&buf, offset_1st_component(buf.buf));
+	if (!GetVolumeInformationA(buf.buf, volume_name, sizeof(volume_name),
+				   &serial_number, &component_length, &flags,
+				   fs_name, sizeof(fs_name))) {
+		error(_("could not get info for '%s'"), buf.buf);
+		strbuf_release(&buf);
+		return -1;
+	}
+	strbuf_addf(out, "Available space on '%s': ", buf.buf);
+	strbuf_humanise_bytes(out, avail2caller.QuadPart);
+	strbuf_addch(out, '\n');
+	strbuf_release(&buf);
+#else
+	struct strbuf buf = STRBUF_INIT;
+	struct statvfs stat;
+
+	strbuf_realpath(&buf, ".", 1);
+	if (statvfs(buf.buf, &stat) < 0) {
+		error_errno(_("could not determine free disk size for '%s'"),
+			    buf.buf);
+		strbuf_release(&buf);
+		return -1;
+	}
+
+	strbuf_addf(out, "Available space on '%s': ", buf.buf);
+	strbuf_humanise_bytes(out, st_mult(stat.f_bsize, stat.f_bavail));
+	strbuf_addf(out, " (mount flags 0x%lx)\n", stat.f_flag);
+	strbuf_release(&buf);
+#endif
+	return 0;
+}
+
 /* printf-style interface, expects `<key>=<value>` argument */
 static int set_config(const char *fmt, ...)
 {
@@ -498,6 +595,196 @@ cleanup:
 	return res;
 }
 
+static void dir_file_stats_objects(const char *full_path, size_t full_path_len,
+				   const char *file_name, void *data)
+{
+	struct strbuf *buf = data;
+	struct stat st;
+
+	if (!stat(full_path, &st))
+		strbuf_addf(buf, "%-70s %16" PRIuMAX "\n", file_name,
+			    (uintmax_t)st.st_size);
+}
+
+static int dir_file_stats(struct object_directory *object_dir, void *data)
+{
+	struct strbuf *buf = data;
+
+	strbuf_addf(buf, "Contents of %s:\n", object_dir->path);
+
+	for_each_file_in_pack_dir(object_dir->path, dir_file_stats_objects,
+				  data);
+
+	return 0;
+}
+
+static int count_files(char *path)
+{
+	DIR *dir = opendir(path);
+	struct dirent *e;
+	int count = 0;
+
+	if (!dir)
+		return 0;
+
+	while ((e = readdir(dir)) != NULL)
+		if (!is_dot_or_dotdot(e->d_name) && e->d_type == DT_REG)
+			count++;
+
+	closedir(dir);
+	return count;
+}
+
+static void loose_objs_stats(struct strbuf *buf, const char *path)
+{
+	DIR *dir = opendir(path);
+	struct dirent *e;
+	int count;
+	int total = 0;
+	unsigned char c;
+	struct strbuf count_path = STRBUF_INIT;
+	size_t base_path_len;
+
+	if (!dir)
+		return;
+
+	strbuf_addstr(buf, "Object directory stats for ");
+	strbuf_add_absolute_path(buf, path);
+	strbuf_addstr(buf, ":\n");
+
+	strbuf_add_absolute_path(&count_path, path);
+	strbuf_addch(&count_path, '/');
+	base_path_len = count_path.len;
+
+	while ((e = readdir(dir)) != NULL)
+		if (!is_dot_or_dotdot(e->d_name) &&
+		    e->d_type == DT_DIR && strlen(e->d_name) == 2 &&
+		    !hex_to_bytes(&c, e->d_name, 1)) {
+			strbuf_setlen(&count_path, base_path_len);
+			strbuf_addstr(&count_path, e->d_name);
+			total += (count = count_files(count_path.buf));
+			strbuf_addf(buf, "%s : %7d files\n", e->d_name, count);
+		}
+
+	strbuf_addf(buf, "Total: %d loose objects", total);
+
+	strbuf_release(&count_path);
+	closedir(dir);
+}
+
+static int cmd_diagnose(int argc, const char **argv)
+{
+	struct option options[] = {
+		OPT_END(),
+	};
+	const char * const usage[] = {
+		N_("scalar diagnose [<enlistment>]"),
+		NULL
+	};
+	struct strbuf zip_path = STRBUF_INIT;
+	struct strvec archiver_args = STRVEC_INIT;
+	char **argv_copy = NULL;
+	int stdout_fd = -1, archiver_fd = -1;
+	time_t now = time(NULL);
+	struct tm tm;
+	struct strbuf path = STRBUF_INIT, buf = STRBUF_INIT;
+	int res = 0;
+
+	argc = parse_options(argc, argv, NULL, options,
+			     usage, 0);
+
+	setup_enlistment_directory(argc, argv, usage, options, &zip_path);
+
+	strbuf_addstr(&zip_path, "/.scalarDiagnostics/scalar_");
+	strbuf_addftime(&zip_path,
+			"%Y%m%d_%H%M%S", localtime_r(&now, &tm), 0, 0);
+	strbuf_addstr(&zip_path, ".zip");
+	switch (safe_create_leading_directories(zip_path.buf)) {
+	case SCLD_EXISTS:
+	case SCLD_OK:
+		break;
+	default:
+		error_errno(_("could not create directory for '%s'"),
+			    zip_path.buf);
+		goto diagnose_cleanup;
+	}
+	stdout_fd = dup(1);
+	if (stdout_fd < 0) {
+		res = error_errno(_("could not duplicate stdout"));
+		goto diagnose_cleanup;
+	}
+
+	archiver_fd = xopen(zip_path.buf, O_CREAT | O_WRONLY | O_TRUNC, 0666);
+	if (archiver_fd < 0 || dup2(archiver_fd, 1) < 0) {
+		res = error_errno(_("could not redirect output"));
+		goto diagnose_cleanup;
+	}
+
+	init_zip_archiver();
+	strvec_pushl(&archiver_args, "scalar-diagnose", "--format=zip", NULL);
+
+	strbuf_reset(&buf);
+	strbuf_addstr(&buf, "Collecting diagnostic info\n\n");
+	get_version_info(&buf, 1);
+
+	strbuf_addf(&buf, "Enlistment root: %s\n", the_repository->worktree);
+	get_disk_info(&buf);
+	write_or_die(stdout_fd, buf.buf, buf.len);
+	strvec_pushf(&archiver_args,
+		     "--add-virtual-file=diagnostics.log:%.*s",
+		     (int)buf.len, buf.buf);
+
+	strbuf_reset(&buf);
+	strbuf_addstr(&buf, "--add-virtual-file=packs-local.txt:");
+	dir_file_stats(the_repository->objects->odb, &buf);
+	foreach_alt_odb(dir_file_stats, &buf);
+	strvec_push(&archiver_args, buf.buf);
+
+	strbuf_reset(&buf);
+	strbuf_addstr(&buf, "--add-virtual-file=objects-local.txt:");
+	loose_objs_stats(&buf, ".git/objects");
+	strvec_push(&archiver_args, buf.buf);
+
+	if ((res = add_directory_to_archiver(&archiver_args, ".git", 0)) ||
+	    (res = add_directory_to_archiver(&archiver_args, ".git/hooks", 0)) ||
+	    (res = add_directory_to_archiver(&archiver_args, ".git/info", 0)) ||
+	    (res = add_directory_to_archiver(&archiver_args, ".git/logs", 1)) ||
+	    (res = add_directory_to_archiver(&archiver_args, ".git/objects/info", 0)))
+		goto diagnose_cleanup;
+
+	strvec_pushl(&archiver_args, "--prefix=",
+		     oid_to_hex(the_hash_algo->empty_tree), "--", NULL);
+
+	/* `write_archive()` modifies the `argv` passed to it. Let it. */
+	argv_copy = xmemdupz(archiver_args.v,
+			     sizeof(char *) * archiver_args.nr);
+	res = write_archive(archiver_args.nr, (const char **)argv_copy, NULL,
+			    the_repository, NULL, 0);
+	if (res) {
+		error(_("failed to write archive"));
+		goto diagnose_cleanup;
+	}
+
+	if (!res)
+		fprintf(stderr, "\n"
+		       "Diagnostics complete.\n"
+		       "All of the gathered info is captured in '%s'\n",
+		       zip_path.buf);
+
+diagnose_cleanup:
+	if (archiver_fd >= 0) {
+		close(1);
+		dup2(stdout_fd, 1);
+	}
+	free(argv_copy);
+	strvec_clear(&archiver_args);
+	strbuf_release(&zip_path);
+	strbuf_release(&path);
+	strbuf_release(&buf);
+
+	return res;
+}
+
 static int cmd_list(int argc, const char **argv)
 {
 	if (argc != 1)
@@ -799,6 +1086,7 @@ static struct {
 	{ "reconfigure", cmd_reconfigure },
 	{ "delete", cmd_delete },
 	{ "version", cmd_version },
+	{ "diagnose", cmd_diagnose },
 	{ NULL, NULL},
 };
 
diff --git a/contrib/scalar/scalar.txt b/contrib/scalar/scalar.txt
index cf4e5b889c..c0425e0653 100644
--- a/contrib/scalar/scalar.txt
+++ b/contrib/scalar/scalar.txt
@@ -14,6 +14,7 @@ scalar register [<enlistment>]
 scalar unregister [<enlistment>]
 scalar run ( all | config | commit-graph | fetch | loose-objects | pack-files ) [<enlistment>]
 scalar reconfigure [ --all | <enlistment> ]
+scalar diagnose [<enlistment>]
 scalar delete <enlistment>
 
 DESCRIPTION
@@ -139,6 +140,17 @@ reconfigure the enlistment.
 With the `--all` option, all enlistments currently registered with Scalar
 will be reconfigured. Use this option after each Scalar upgrade.
 
+Diagnose
+~~~~~~~~
+
+diagnose [<enlistment>]::
+    When reporting issues with Scalar, it is often helpful to provide the
+    information gathered by this command, including logs and certain
+    statistics describing the data shape of the current enlistment.
++
+The output of this command is a `.zip` file that is written into
+a directory adjacent to the worktree in the `src` directory.
+
 Delete
 ~~~~~~
 
diff --git a/contrib/scalar/t/t9099-scalar.sh b/contrib/scalar/t/t9099-scalar.sh
index 89781568f4..10b1172a8a 100755
--- a/contrib/scalar/t/t9099-scalar.sh
+++ b/contrib/scalar/t/t9099-scalar.sh
@@ -93,4 +93,31 @@ test_expect_success 'scalar supports -c/-C' '
 	test true = "$(git -C sub config core.preloadIndex)"
 '
 
+test_expect_success '`scalar [...] <dir>` errors out when dir is missing' '
+	! scalar run config cloned 2>err &&
+	grep "cloned. does not exist" err
+'
+
+SQ="'"
+test_expect_success UNZIP 'scalar diagnose' '
+	scalar clone "file://$(pwd)" cloned --single-branch &&
+	git repack &&
+	echo "$(pwd)/.git/objects/" >>cloned/src/.git/objects/info/alternates &&
+	test_commit -C cloned/src loose &&
+	scalar diagnose cloned >out 2>err &&
+	grep "Available space" out &&
+	sed -n "s/.*$SQ\\(.*\\.zip\\)$SQ.*/\\1/p" <err >zip_path &&
+	zip_path=$(cat zip_path) &&
+	test -n "$zip_path" &&
+	unzip -v "$zip_path" &&
+	folder=${zip_path%.zip} &&
+	test_path_is_missing "$folder" &&
+	unzip -p "$zip_path" diagnostics.log >out &&
+	test_file_not_empty out &&
+	unzip -p "$zip_path" packs-local.txt >out &&
+	grep "$(pwd)/.git/objects" out &&
+	unzip -p "$zip_path" objects-local.txt >out &&
+	grep "^Total: [1-9]" out
+'
+
 test_done
diff --git a/contrib/vscode/README.md b/contrib/vscode/README.md
index 8202d62035..f383c95e1f 100644
--- a/contrib/vscode/README.md
+++ b/contrib/vscode/README.md
@@ -6,7 +6,11 @@ code editor which runs on your desktop and is available for
 [Windows](https://code.visualstudio.com/docs/setup/windows),
 [macOS](https://code.visualstudio.com/docs/setup/mac) and
 [Linux](https://code.visualstudio.com/docs/setup/linux). Among other languages,
-it has [support for C/C++ via an extension](https://github.com/Microsoft/vscode-cpptools).
+it has [support for C/C++ via an extension](https://github.com/Microsoft/vscode-cpptools) with
+[debugging support](https://code.visualstudio.com/docs/editor/debugging)
+
+To get help about "how to personalize your settings" read:
+[How to set up your settings](https://code.visualstudio.com/docs/getstarted/settings)
 
 To start developing Git with VS Code, simply run the Unix shell script called
 `init.sh` in this directory, which creates the configuration files in
diff --git a/contrib/vscode/init.sh b/contrib/vscode/init.sh
index 27de94994b..521d303722 100755
--- a/contrib/vscode/init.sh
+++ b/contrib/vscode/init.sh
@@ -25,8 +25,12 @@ cat >.vscode/settings.json.new <<\EOF ||
         "editor.detectIndentation": false,
         "editor.insertSpaces": false,
         "editor.tabSize": 8,
-        "editor.wordWrap": "wordWrapColumn",
-        "editor.wordWrapColumn": 80,
+        "files.trimTrailingWhitespace": true
+    },
+    "[txt]": {
+        "editor.detectIndentation": false,
+        "editor.insertSpaces": false,
+        "editor.tabSize": 8,
         "files.trimTrailingWhitespace": true
     },
     "files.associations": {
@@ -271,7 +275,6 @@ cat >.vscode/launch.json.new <<EOF ||
             "stopAtEntry": false,
             "cwd": "\${workspaceFolder}",
             "environment": [],
-            "externalConsole": true,
             "MIMode": "gdb",
             "miDebuggerPath": "$GDBPATH",
             "setupCommands": [
diff --git a/convert.c b/convert.c
index 8e39731efb..4d153729da 100644
--- a/convert.c
+++ b/convert.c
@@ -195,9 +195,9 @@ static void check_global_conv_flags_eol(const char *path,
 		if (conv_flags & CONV_EOL_RNDTRP_DIE)
 			die(_("CRLF would be replaced by LF in %s"), path);
 		else if (conv_flags & CONV_EOL_RNDTRP_WARN)
-			warning(_("CRLF will be replaced by LF in %s.\n"
-				  "The file will have its original line"
-				  " endings in your working directory"), path);
+			warning(_("in the working copy of '%s', CRLF will be"
+				  " replaced by LF the next time Git touches"
+				  " it"), path);
 	} else if (old_stats->lonelf && !new_stats->lonelf ) {
 		/*
 		 * CRLFs would be added by checkout
@@ -205,9 +205,9 @@ static void check_global_conv_flags_eol(const char *path,
 		if (conv_flags & CONV_EOL_RNDTRP_DIE)
 			die(_("LF would be replaced by CRLF in %s"), path);
 		else if (conv_flags & CONV_EOL_RNDTRP_WARN)
-			warning(_("LF will be replaced by CRLF in %s.\n"
-				  "The file will have its original line"
-				  " endings in your working directory"), path);
+			warning(_("in the working copy of '%s', LF will be"
+				  " replaced by CRLF the next time Git touches"
+				  " it"), path);
 	}
 }
 
diff --git a/convert.h b/convert.h
index 5ee1c32205..0a6e4086b8 100644
--- a/convert.h
+++ b/convert.h
@@ -53,7 +53,11 @@ struct delayed_checkout {
 	enum ce_delay_state state;
 	/* List of filter drivers that signaled delayed blobs. */
 	struct string_list filters;
-	/* List of delayed blobs identified by their path. */
+	/*
+	 * List of delayed blobs identified by their path. The `util` member
+	 * holds a counter pointer which must be incremented when/if the
+	 * associated blob gets checked out.
+	 */
 	struct string_list paths;
 };
 
diff --git a/daemon.c b/daemon.c
index 94a5b8a364..0ae7d12b5c 100644
--- a/daemon.c
+++ b/daemon.c
@@ -279,7 +279,7 @@ static const char *path_ok(const char *directory, struct hostinfo *hi)
 		/* The validation is done on the paths after enter_repo
 		 * appends optional {.git,.git/.git} and friends, but
 		 * it does not use getcwd().  So if your /pub is
-		 * a symlink to /mnt/pub, you can whitelist /pub and
+		 * a symlink to /mnt/pub, you can include /pub and
 		 * do not have to say /mnt/pub.
 		 * Do not say /pub/.
 		 */
@@ -298,7 +298,7 @@ static const char *path_ok(const char *directory, struct hostinfo *hi)
 			return path;
 	}
 
-	logerror("'%s': not in whitelist", path);
+	logerror("'%s': not in directory list", path);
 	return NULL;		/* Fallthrough. Deny by default */
 }
 
@@ -403,7 +403,7 @@ static int run_service(const char *dir, struct daemon_service *service,
 	 * a "git-daemon-export-ok" flag that says that the other side
 	 * is ok with us doing this.
 	 *
-	 * path_ok() uses enter_repo() and does whitelist checking.
+	 * path_ok() uses enter_repo() and checks for included directories.
 	 * We only need to make sure the repository is exported.
 	 */
 
@@ -447,7 +447,7 @@ static void copy_to_log(int fd)
 	FILE *fp;
 
 	fp = fdopen(fd, "r");
-	if (fp == NULL) {
+	if (!fp) {
 		logerror("fdopen of error channel failed");
 		close(fd);
 		return;
@@ -484,7 +484,7 @@ static int upload_pack(const struct strvec *env)
 	strvec_pushl(&cld.args, "upload-pack", "--strict", NULL);
 	strvec_pushf(&cld.args, "--timeout=%u", timeout);
 
-	strvec_pushv(&cld.env_array, env->v);
+	strvec_pushv(&cld.env, env->v);
 
 	return run_service_command(&cld);
 }
@@ -494,7 +494,7 @@ static int upload_archive(const struct strvec *env)
 	struct child_process cld = CHILD_PROCESS_INIT;
 	strvec_push(&cld.args, "upload-archive");
 
-	strvec_pushv(&cld.env_array, env->v);
+	strvec_pushv(&cld.env, env->v);
 
 	return run_service_command(&cld);
 }
@@ -504,7 +504,7 @@ static int receive_pack(const struct strvec *env)
 	struct child_process cld = CHILD_PROCESS_INIT;
 	strvec_push(&cld.args, "receive-pack");
 
-	strvec_pushv(&cld.env_array, env->v);
+	strvec_pushv(&cld.env, env->v);
 
 	return run_service_command(&cld);
 }
@@ -904,16 +904,16 @@ static void handle(int incoming, struct sockaddr *addr, socklen_t addrlen)
 		char buf[128] = "";
 		struct sockaddr_in *sin_addr = (void *) addr;
 		inet_ntop(addr->sa_family, &sin_addr->sin_addr, buf, sizeof(buf));
-		strvec_pushf(&cld.env_array, "REMOTE_ADDR=%s", buf);
-		strvec_pushf(&cld.env_array, "REMOTE_PORT=%d",
+		strvec_pushf(&cld.env, "REMOTE_ADDR=%s", buf);
+		strvec_pushf(&cld.env, "REMOTE_PORT=%d",
 			     ntohs(sin_addr->sin_port));
 #ifndef NO_IPV6
 	} else if (addr->sa_family == AF_INET6) {
 		char buf[128] = "";
 		struct sockaddr_in6 *sin6_addr = (void *) addr;
 		inet_ntop(AF_INET6, &sin6_addr->sin6_addr, buf, sizeof(buf));
-		strvec_pushf(&cld.env_array, "REMOTE_ADDR=[%s]", buf);
-		strvec_pushf(&cld.env_array, "REMOTE_PORT=%d",
+		strvec_pushf(&cld.env, "REMOTE_ADDR=[%s]", buf);
+		strvec_pushf(&cld.env, "REMOTE_PORT=%d",
 			     ntohs(sin6_addr->sin6_port));
 #endif
 	}
@@ -1444,7 +1444,7 @@ int cmd_main(int argc, const char **argv)
 		cred = prepare_credentials(user_name, group_name);
 
 	if (strict_paths && (!ok_paths || !*ok_paths))
-		die("option --strict-paths requires a whitelist");
+		die("option --strict-paths requires '<directory>' arguments");
 
 	if (base_path && !is_directory(base_path))
 		die("base-path '%s' does not exist or is not a directory",
diff --git a/diff-lib.c b/diff-lib.c
index ca085a03ef..2edea41a23 100644
--- a/diff-lib.c
+++ b/diff-lib.c
@@ -466,6 +466,11 @@ static void do_oneway_diff(struct unpack_trees_options *o,
 	 * Something removed from the tree?
 	 */
 	if (!idx) {
+		if (S_ISSPARSEDIR(tree->ce_mode)) {
+			diff_tree_oid(&tree->oid, NULL, tree->name, &revs->diffopt);
+			return;
+		}
+
 		diff_index_show_file(revs, "-", tree, &tree->oid, 1,
 				     tree->ce_mode, 0);
 		return;
@@ -641,7 +646,7 @@ int do_diff_cache(const struct object_id *tree_oid, struct diff_options *opt)
 
 	if (diff_cache(&revs, tree_oid, NULL, 1))
 		exit(128);
-	clear_pathspec(&revs.prune_data);
+	release_revisions(&revs);
 	return 0;
 }
 
@@ -651,6 +656,7 @@ int index_differs_from(struct repository *r,
 {
 	struct rev_info rev;
 	struct setup_revision_opt opt;
+	unsigned has_changes;
 
 	repo_init_revisions(r, &rev, NULL);
 	memset(&opt, 0, sizeof(opt));
@@ -662,8 +668,9 @@ int index_differs_from(struct repository *r,
 		diff_flags_or(&rev.diffopt.flags, flags);
 	rev.diffopt.ita_invisible_in_index = ita_invisible_in_index;
 	run_diff_index(&rev, 1);
-	object_array_clear(&rev.pending);
-	return (rev.diffopt.flags.has_changes != 0);
+	has_changes = rev.diffopt.flags.has_changes;
+	release_revisions(&rev);
+	return (has_changes != 0);
 }
 
 static struct strbuf *idiff_prefix_cb(struct diff_options *opt, void *data)
diff --git a/diff.c b/diff.c
index ef7159968b..e71cf75886 100644
--- a/diff.c
+++ b/diff.c
@@ -4136,18 +4136,13 @@ static void prep_temp_blob(struct index_state *istate,
 			   int mode)
 {
 	struct strbuf buf = STRBUF_INIT;
-	struct strbuf tempfile = STRBUF_INIT;
 	char *path_dup = xstrdup(path);
 	const char *base = basename(path_dup);
 	struct checkout_metadata meta;
 
 	init_checkout_metadata(&meta, NULL, NULL, oid);
 
-	/* Generate "XXXXXX_basename.ext" */
-	strbuf_addstr(&tempfile, "XXXXXX_");
-	strbuf_addstr(&tempfile, base);
-
-	temp->tempfile = mks_tempfile_ts(tempfile.buf, strlen(base) + 1);
+	temp->tempfile = mks_tempfile_dt("git-blob-XXXXXX", base);
 	if (!temp->tempfile)
 		die_errno("unable to create temp-file");
 	if (convert_to_working_tree(istate, path,
@@ -4162,7 +4157,6 @@ static void prep_temp_blob(struct index_state *istate,
 	oid_to_hex_r(temp->hex, oid);
 	xsnprintf(temp->mode, sizeof(temp->mode), "%06o", mode);
 	strbuf_release(&buf);
-	strbuf_release(&tempfile);
 	free(path_dup);
 }
 
diff --git a/dir.c b/dir.c
index 19a1950e08..d7cfb08e44 100644
--- a/dir.c
+++ b/dir.c
@@ -1861,7 +1861,7 @@ static enum path_treatment treat_directory(struct dir_struct *dir,
 	 */
 	enum path_treatment state;
 	int matches_how = 0;
-	int nested_repo = 0, check_only, stop_early;
+	int check_only, stop_early;
 	int old_ignored_nr, old_untracked_nr;
 	/* The "len-1" is to strip the final '/' */
 	enum exist_status status = directory_exists_in_index(istate, dirname, len-1);
@@ -1893,16 +1893,37 @@ static enum path_treatment treat_directory(struct dir_struct *dir,
 
 	if ((dir->flags & DIR_SKIP_NESTED_GIT) ||
 		!(dir->flags & DIR_NO_GITLINKS)) {
+		/*
+		 * Determine if `dirname` is a nested repo by confirming that:
+		 * 1) we are in a nonbare repository, and
+		 * 2) `dirname` is not an immediate parent of `the_repository->gitdir`,
+		 *    which could occur if the git_dir or worktree location was
+		 *    manually configured by the user; see t2205 testcases 1-3 for
+		 *    examples where this matters
+		 */
+		int nested_repo;
 		struct strbuf sb = STRBUF_INIT;
 		strbuf_addstr(&sb, dirname);
 		nested_repo = is_nonbare_repository_dir(&sb);
+
+		if (nested_repo) {
+			char *real_dirname, *real_gitdir;
+			strbuf_addstr(&sb, ".git");
+			real_dirname = real_pathdup(sb.buf, 1);
+			real_gitdir = real_pathdup(the_repository->gitdir, 1);
+
+			nested_repo = !!strcmp(real_dirname, real_gitdir);
+			free(real_gitdir);
+			free(real_dirname);
+		}
 		strbuf_release(&sb);
-	}
-	if (nested_repo) {
-		if ((dir->flags & DIR_SKIP_NESTED_GIT) ||
-		    (matches_how == MATCHED_RECURSIVELY_LEADING_PATHSPEC))
-			return path_none;
-		return excluded ? path_excluded : path_untracked;
+
+		if (nested_repo) {
+			if ((dir->flags & DIR_SKIP_NESTED_GIT) ||
+				(matches_how == MATCHED_RECURSIVELY_LEADING_PATHSPEC))
+				return path_none;
+			return excluded ? path_excluded : path_untracked;
+		}
 	}
 
 	if (!(dir->flags & DIR_SHOW_OTHER_DIRECTORIES)) {
@@ -2747,13 +2768,33 @@ static void set_untracked_ident(struct untracked_cache *uc)
 	strbuf_addch(&uc->ident, 0);
 }
 
-static void new_untracked_cache(struct index_state *istate)
+static unsigned new_untracked_cache_flags(struct index_state *istate)
+{
+	struct repository *repo = istate->repo;
+	char *val;
+
+	/*
+	 * This logic is coordinated with the setting of these flags in
+	 * wt-status.c#wt_status_collect_untracked(), and the evaluation
+	 * of the config setting in commit.c#git_status_config()
+	 */
+	if (!repo_config_get_string(repo, "status.showuntrackedfiles", &val) &&
+	    !strcmp(val, "all"))
+		return 0;
+
+	/*
+	 * The default, if "all" is not set, is "normal" - leading us here.
+	 * If the value is "none" then it really doesn't matter.
+	 */
+	return DIR_SHOW_OTHER_DIRECTORIES | DIR_HIDE_EMPTY_DIRECTORIES;
+}
+
+static void new_untracked_cache(struct index_state *istate, int flags)
 {
 	struct untracked_cache *uc = xcalloc(1, sizeof(*uc));
 	strbuf_init(&uc->ident, 100);
 	uc->exclude_per_dir = ".gitignore";
-	/* should be the same flags used by git-status */
-	uc->dir_flags = DIR_SHOW_OTHER_DIRECTORIES | DIR_HIDE_EMPTY_DIRECTORIES;
+	uc->dir_flags = flags >= 0 ? flags : new_untracked_cache_flags(istate);
 	set_untracked_ident(uc);
 	istate->untracked = uc;
 	istate->cache_changed |= UNTRACKED_CHANGED;
@@ -2762,11 +2803,11 @@ static void new_untracked_cache(struct index_state *istate)
 void add_untracked_cache(struct index_state *istate)
 {
 	if (!istate->untracked) {
-		new_untracked_cache(istate);
+		new_untracked_cache(istate, -1);
 	} else {
 		if (!ident_in_untracked(istate->untracked)) {
 			free_untracked_cache(istate->untracked);
-			new_untracked_cache(istate);
+			new_untracked_cache(istate, -1);
 		}
 	}
 }
@@ -2814,17 +2855,9 @@ static struct untracked_cache_dir *validate_untracked_cache(struct dir_struct *d
 	if (base_len || (pathspec && pathspec->nr))
 		return NULL;
 
-	/* Different set of flags may produce different results */
-	if (dir->flags != dir->untracked->dir_flags ||
-	    /*
-	     * See treat_directory(), case index_nonexistent. Without
-	     * this flag, we may need to also cache .git file content
-	     * for the resolve_gitlink_ref() call, which we don't.
-	     */
-	    !(dir->flags & DIR_SHOW_OTHER_DIRECTORIES) ||
-	    /* We don't support collecting ignore files */
-	    (dir->flags & (DIR_SHOW_IGNORED | DIR_SHOW_IGNORED_TOO |
-			   DIR_COLLECT_IGNORED)))
+	/* We don't support collecting ignore files */
+	if (dir->flags & (DIR_SHOW_IGNORED | DIR_SHOW_IGNORED_TOO |
+			DIR_COLLECT_IGNORED))
 		return NULL;
 
 	/*
@@ -2847,6 +2880,50 @@ static struct untracked_cache_dir *validate_untracked_cache(struct dir_struct *d
 		return NULL;
 	}
 
+	/*
+	 * If the untracked structure we received does not have the same flags
+	 * as requested in this run, we're going to need to either discard the
+	 * existing structure (and potentially later recreate), or bypass the
+	 * untracked cache mechanism for this run.
+	 */
+	if (dir->flags != dir->untracked->dir_flags) {
+		/*
+		 * If the untracked structure we received does not have the same flags
+		 * as configured, then we need to reset / create a new "untracked"
+		 * structure to match the new config.
+		 *
+		 * Keeping the saved and used untracked cache consistent with the
+		 * configuration provides an opportunity for frequent users of
+		 * "git status -uall" to leverage the untracked cache by aligning their
+		 * configuration - setting "status.showuntrackedfiles" to "all" or
+		 * "normal" as appropriate.
+		 *
+		 * Previously using -uall (or setting "status.showuntrackedfiles" to
+		 * "all") was incompatible with untracked cache and *consistently*
+		 * caused surprisingly bad performance (with fscache and fsmonitor
+		 * enabled) on Windows.
+		 *
+		 * IMPROVEMENT OPPORTUNITY: If we reworked the untracked cache storage
+		 * to not be as bound up with the desired output in a given run,
+		 * and instead iterated through and stored enough information to
+		 * correctly serve both "modes", then users could get peak performance
+		 * with or without '-uall' regardless of their
+		 * "status.showuntrackedfiles" config.
+		 */
+		if (dir->untracked->dir_flags != new_untracked_cache_flags(istate)) {
+			free_untracked_cache(istate->untracked);
+			new_untracked_cache(istate, dir->flags);
+			dir->untracked = istate->untracked;
+		}
+		else {
+			/*
+			 * Current untracked cache data is consistent with config, but not
+			 * usable in this request/run; just bypass untracked cache.
+			 */
+			return NULL;
+		}
+	}
+
 	if (!dir->untracked->root) {
 		/* Untracked cache existed but is not initialized; fix that */
 		FLEX_ALLOC_STR(dir->untracked->root, name, "");
@@ -3054,7 +3131,7 @@ char *git_url_basename(const char *repo, int is_bundle, int is_bare)
 	 * Skip scheme.
 	 */
 	start = strstr(repo, "://");
-	if (start == NULL)
+	if (!start)
 		start = repo;
 	else
 		start += 3;
@@ -3899,3 +3976,32 @@ void relocate_gitdir(const char *path, const char *old_git_dir, const char *new_
 
 	connect_work_tree_and_git_dir(path, new_git_dir, 0);
 }
+
+int path_match_flags(const char *const str, const enum path_match_flags flags)
+{
+	const char *p = str;
+
+	if (flags & PATH_MATCH_NATIVE &&
+	    flags & PATH_MATCH_XPLATFORM)
+		BUG("path_match_flags() must get one match kind, not multiple!");
+	else if (!(flags & PATH_MATCH_KINDS_MASK))
+		BUG("path_match_flags() must get at least one match kind!");
+
+	if (flags & PATH_MATCH_STARTS_WITH_DOT_SLASH &&
+	    flags & PATH_MATCH_STARTS_WITH_DOT_DOT_SLASH)
+		BUG("path_match_flags() must get one platform kind, not multiple!");
+	else if (!(flags & PATH_MATCH_PLATFORM_MASK))
+		BUG("path_match_flags() must get at least one platform kind!");
+
+	if (*p++ != '.')
+		return 0;
+	if (flags & PATH_MATCH_STARTS_WITH_DOT_DOT_SLASH &&
+	    *p++ != '.')
+		return 0;
+
+	if (flags & PATH_MATCH_NATIVE)
+		return is_dir_sep(*p);
+	else if (flags & PATH_MATCH_XPLATFORM)
+		return is_xplatform_dir_sep(*p);
+	BUG("unreachable");
+}
diff --git a/dir.h b/dir.h
index 8e02dfb505..7bc862030c 100644
--- a/dir.h
+++ b/dir.h
@@ -578,4 +578,67 @@ void connect_work_tree_and_git_dir(const char *work_tree,
 void relocate_gitdir(const char *path,
 		     const char *old_git_dir,
 		     const char *new_git_dir);
+
+/**
+ * The "enum path_matches_kind" determines how path_match_flags() will
+ * behave. The flags come in sets, and one (and only one) must be
+ * provided out of each "set":
+ *
+ * PATH_MATCH_NATIVE:
+ *	Path separator is is_dir_sep()
+ * PATH_MATCH_XPLATFORM:
+ *	Path separator is is_xplatform_dir_sep()
+ *
+ * Do we use is_dir_sep() to check for a directory separator
+ * (*_NATIVE), or do we always check for '/' or '\' (*_XPLATFORM). The
+ * "*_NATIVE" version on Windows is the same as "*_XPLATFORM",
+ * everywhere else "*_NATIVE" means "only /".
+ *
+ * PATH_MATCH_STARTS_WITH_DOT_SLASH:
+ *	Match a path starting with "./"
+ * PATH_MATCH_STARTS_WITH_DOT_DOT_SLASH:
+ *	Match a path starting with "../"
+ *
+ * The "/" in the above is adjusted based on the "*_NATIVE" and
+ * "*_XPLATFORM" flags.
+ */
+enum path_match_flags {
+	PATH_MATCH_NATIVE = 1 << 0,
+	PATH_MATCH_XPLATFORM = 1 << 1,
+	PATH_MATCH_STARTS_WITH_DOT_SLASH = 1 << 2,
+	PATH_MATCH_STARTS_WITH_DOT_DOT_SLASH = 1 << 3,
+};
+#define PATH_MATCH_KINDS_MASK (PATH_MATCH_STARTS_WITH_DOT_SLASH | \
+	PATH_MATCH_STARTS_WITH_DOT_DOT_SLASH)
+#define PATH_MATCH_PLATFORM_MASK (PATH_MATCH_NATIVE | PATH_MATCH_XPLATFORM)
+
+/**
+ * path_match_flags() checks if a given "path" matches a given "enum
+ * path_match_flags" criteria.
+ */
+int path_match_flags(const char *const path, const enum path_match_flags f);
+
+/**
+ * starts_with_dot_slash_native(): convenience wrapper for
+ * path_match_flags() with PATH_MATCH_STARTS_WITH_DOT_SLASH and
+ * PATH_MATCH_NATIVE.
+ */
+static inline int starts_with_dot_slash_native(const char *const path)
+{
+	const enum path_match_flags what = PATH_MATCH_STARTS_WITH_DOT_SLASH;
+
+	return path_match_flags(path, what | PATH_MATCH_NATIVE);
+}
+
+/**
+ * starts_with_dot_slash_native(): convenience wrapper for
+ * path_match_flags() with PATH_MATCH_STARTS_WITH_DOT_DOT_SLASH and
+ * PATH_MATCH_NATIVE.
+ */
+static inline int starts_with_dot_dot_slash_native(const char *const path)
+{
+	const enum path_match_flags what = PATH_MATCH_STARTS_WITH_DOT_DOT_SLASH;
+
+	return path_match_flags(path, what | PATH_MATCH_NATIVE);
+}
 #endif
diff --git a/editor.c b/editor.c
index 8b9648281d..008c04fe2f 100644
--- a/editor.c
+++ b/editor.c
@@ -80,7 +80,7 @@ static int launch_specified_editor(const char *editor, const char *path,
 
 		strvec_pushl(&p.args, editor, realpath.buf, NULL);
 		if (env)
-			strvec_pushv(&p.env_array, (const char **)env);
+			strvec_pushv(&p.env, (const char **)env);
 		p.use_shell = 1;
 		p.trace2_child_class = "editor";
 		if (start_command(&p) < 0) {
diff --git a/entry.c b/entry.c
index 1c9df62b30..616e4f073c 100644
--- a/entry.c
+++ b/entry.c
@@ -157,12 +157,11 @@ static int remove_available_paths(struct string_list_item *item, void *cb_data)
 
 	available = string_list_lookup(available_paths, item->string);
 	if (available)
-		available->util = (void *)item->string;
+		available->util = item->util;
 	return !available;
 }
 
-int finish_delayed_checkout(struct checkout *state, int *nr_checkouts,
-			    int show_progress)
+int finish_delayed_checkout(struct checkout *state, int show_progress)
 {
 	int errs = 0;
 	unsigned processed_paths = 0;
@@ -227,7 +226,7 @@ int finish_delayed_checkout(struct checkout *state, int *nr_checkouts,
 						       strlen(path->string), 0);
 				if (ce) {
 					display_progress(progress, ++processed_paths);
-					errs |= checkout_entry(ce, state, NULL, nr_checkouts);
+					errs |= checkout_entry(ce, state, NULL, path->util);
 					filtered_bytes += ce->ce_stat_data.sd_size;
 					display_throughput(progress, filtered_bytes);
 				} else
@@ -266,7 +265,8 @@ void update_ce_after_write(const struct checkout *state, struct cache_entry *ce,
 
 /* Note: ca is used (and required) iff the entry refers to a regular file. */
 static int write_entry(struct cache_entry *ce, char *path, struct conv_attrs *ca,
-		       const struct checkout *state, int to_tempfile)
+		       const struct checkout *state, int to_tempfile,
+		       int *nr_checkouts)
 {
 	unsigned int ce_mode_s_ifmt = ce->ce_mode & S_IFMT;
 	struct delayed_checkout *dco = state->delayed_checkout;
@@ -279,6 +279,7 @@ static int write_entry(struct cache_entry *ce, char *path, struct conv_attrs *ca
 	struct stat st;
 	const struct submodule *sub;
 	struct checkout_metadata meta;
+	static int scratch_nr_checkouts;
 
 	clone_checkout_metadata(&meta, &state->meta, &ce->oid);
 
@@ -333,9 +334,15 @@ static int write_entry(struct cache_entry *ce, char *path, struct conv_attrs *ca
 			ret = async_convert_to_working_tree_ca(ca, ce->name,
 							       new_blob, size,
 							       &buf, &meta, dco);
-			if (ret && string_list_has_string(&dco->paths, ce->name)) {
-				free(new_blob);
-				goto delayed;
+			if (ret) {
+				struct string_list_item *item =
+					string_list_lookup(&dco->paths, ce->name);
+				if (item) {
+					item->util = nr_checkouts ? nr_checkouts
+							: &scratch_nr_checkouts;
+					free(new_blob);
+					goto delayed;
+				}
 			}
 		} else {
 			ret = convert_to_working_tree_ca(ca, ce->name, new_blob,
@@ -392,6 +399,8 @@ finish:
 					   ce->name);
 		update_ce_after_write(state, ce , &st);
 	}
+	if (nr_checkouts)
+		(*nr_checkouts)++;
 delayed:
 	return 0;
 }
@@ -476,7 +485,7 @@ int checkout_entry_ca(struct cache_entry *ce, struct conv_attrs *ca,
 			convert_attrs(state->istate, &ca_buf, ce->name);
 			ca = &ca_buf;
 		}
-		return write_entry(ce, topath, ca, state, 1);
+		return write_entry(ce, topath, ca, state, 1, nr_checkouts);
 	}
 
 	strbuf_reset(&path);
@@ -540,18 +549,15 @@ int checkout_entry_ca(struct cache_entry *ce, struct conv_attrs *ca,
 
 	create_directories(path.buf, path.len, state);
 
-	if (nr_checkouts)
-		(*nr_checkouts)++;
-
 	if (S_ISREG(ce->ce_mode) && !ca) {
 		convert_attrs(state->istate, &ca_buf, ce->name);
 		ca = &ca_buf;
 	}
 
-	if (!enqueue_checkout(ce, ca))
+	if (!enqueue_checkout(ce, ca, nr_checkouts))
 		return 0;
 
-	return write_entry(ce, path.buf, ca, state, 0);
+	return write_entry(ce, path.buf, ca, state, 0, nr_checkouts);
 }
 
 void unlink_entry(const struct cache_entry *ce)
diff --git a/entry.h b/entry.h
index 252fd24c2e..9be4659881 100644
--- a/entry.h
+++ b/entry.h
@@ -43,8 +43,7 @@ static inline int checkout_entry(struct cache_entry *ce,
 }
 
 void enable_delayed_checkout(struct checkout *state);
-int finish_delayed_checkout(struct checkout *state, int *nr_checkouts,
-			    int show_progress);
+int finish_delayed_checkout(struct checkout *state, int show_progress);
 
 /*
  * Unlink the last component and schedule the leading directories for
diff --git a/ewah/bitmap.c b/ewah/bitmap.c
index 38a47c44db..ac61864163 100644
--- a/ewah/bitmap.c
+++ b/ewah/bitmap.c
@@ -216,14 +216,9 @@ int bitmap_is_subset(struct bitmap *self, struct bitmap *other)
 	return 0;
 }
 
-void bitmap_reset(struct bitmap *bitmap)
-{
-	memset(bitmap->words, 0x0, bitmap->word_alloc * sizeof(eword_t));
-}
-
 void bitmap_free(struct bitmap *bitmap)
 {
-	if (bitmap == NULL)
+	if (!bitmap)
 		return;
 
 	free(bitmap->words);
diff --git a/ewah/ewah_bitmap.c b/ewah/ewah_bitmap.c
index 2a8c7c5c33..6fe48d3ae0 100644
--- a/ewah/ewah_bitmap.c
+++ b/ewah/ewah_bitmap.c
@@ -451,7 +451,7 @@ struct ewah_bitmap *ewah_pool_new(void)
 
 void ewah_pool_free(struct ewah_bitmap *self)
 {
-	if (self == NULL)
+	if (!self)
 		return;
 
 	if (bitmap_pool_size == BITMAP_POOL_MAX ||
diff --git a/ewah/ewok.h b/ewah/ewok.h
index 66920965da..7eb8b9b630 100644
--- a/ewah/ewok.h
+++ b/ewah/ewok.h
@@ -177,7 +177,6 @@ struct bitmap *bitmap_dup(const struct bitmap *src);
 void bitmap_set(struct bitmap *self, size_t pos);
 void bitmap_unset(struct bitmap *self, size_t pos);
 int bitmap_get(struct bitmap *self, size_t pos);
-void bitmap_reset(struct bitmap *self);
 void bitmap_free(struct bitmap *self);
 int bitmap_equals(struct bitmap *self, struct bitmap *other);
 int bitmap_is_subset(struct bitmap *self, struct bitmap *other);
diff --git a/fetch-pack.c b/fetch-pack.c
index 4e1e88eea0..cb6647d657 100644
--- a/fetch-pack.c
+++ b/fetch-pack.c
@@ -115,11 +115,12 @@ static void for_each_cached_alternate(struct fetch_negotiator *negotiator,
 		cb(negotiator, cache.items[i]);
 }
 
-static struct commit *deref_without_lazy_fetch(const struct object_id *oid,
-					       int mark_tags_complete)
+static struct commit *deref_without_lazy_fetch_extended(const struct object_id *oid,
+							int mark_tags_complete,
+							enum object_type *type,
+							unsigned int oi_flags)
 {
-	enum object_type type;
-	struct object_info info = { .typep = &type };
+	struct object_info info = { .typep = type };
 	struct commit *commit;
 
 	commit = lookup_commit_in_graph(the_repository, oid);
@@ -128,9 +129,9 @@ static struct commit *deref_without_lazy_fetch(const struct object_id *oid,
 
 	while (1) {
 		if (oid_object_info_extended(the_repository, oid, &info,
-					     OBJECT_INFO_SKIP_FETCH_OBJECT | OBJECT_INFO_QUICK))
+					     oi_flags))
 			return NULL;
-		if (type == OBJ_TAG) {
+		if (*type == OBJ_TAG) {
 			struct tag *tag = (struct tag *)
 				parse_object(the_repository, oid);
 
@@ -144,7 +145,7 @@ static struct commit *deref_without_lazy_fetch(const struct object_id *oid,
 		}
 	}
 
-	if (type == OBJ_COMMIT) {
+	if (*type == OBJ_COMMIT) {
 		struct commit *commit = lookup_commit(the_repository, oid);
 		if (!commit || repo_parse_commit(the_repository, commit))
 			return NULL;
@@ -154,6 +155,16 @@ static struct commit *deref_without_lazy_fetch(const struct object_id *oid,
 	return NULL;
 }
 
+
+static struct commit *deref_without_lazy_fetch(const struct object_id *oid,
+					       int mark_tags_complete)
+{
+	enum object_type type;
+	unsigned flags = OBJECT_INFO_SKIP_FETCH_OBJECT | OBJECT_INFO_QUICK;
+	return deref_without_lazy_fetch_extended(oid, mark_tags_complete,
+						 &type, flags);
+}
+
 static int rev_list_insert_ref(struct fetch_negotiator *negotiator,
 			       const struct object_id *oid)
 {
@@ -836,6 +847,16 @@ static void parse_gitmodules_oids(int fd, struct oidset *gitmodules_oids)
 	} while (1);
 }
 
+static void add_index_pack_keep_option(struct strvec *args)
+{
+	char hostname[HOST_NAME_MAX + 1];
+
+	if (xgethostname(hostname, sizeof(hostname)))
+		xsnprintf(hostname, sizeof(hostname), "localhost");
+	strvec_pushf(args, "--keep=fetch-pack %"PRIuMAX " on %s",
+		     (uintmax_t)getpid(), hostname);
+}
+
 /*
  * If packfile URIs were provided, pass a non-NULL pointer to index_pack_args.
  * The strings to pass as the --index-pack-arg arguments to http-fetch will be
@@ -905,14 +926,8 @@ static int get_pack(struct fetch_pack_args *args,
 			strvec_push(&cmd.args, "-v");
 		if (args->use_thin_pack)
 			strvec_push(&cmd.args, "--fix-thin");
-		if ((do_keep || index_pack_args) && (args->lock_pack || unpack_limit)) {
-			char hostname[HOST_NAME_MAX + 1];
-			if (xgethostname(hostname, sizeof(hostname)))
-				xsnprintf(hostname, sizeof(hostname), "localhost");
-			strvec_pushf(&cmd.args,
-				     "--keep=fetch-pack %"PRIuMAX " on %s",
-				     (uintmax_t)getpid(), hostname);
-		}
+		if ((do_keep || index_pack_args) && (args->lock_pack || unpack_limit))
+			add_index_pack_keep_option(&cmd.args);
 		if (!index_pack_args && args->check_self_contained_and_connected)
 			strvec_push(&cmd.args, "--check-self-contained-and-connected");
 		else
@@ -1370,17 +1385,20 @@ static int send_fetch_request(struct fetch_negotiator *negotiator, int fd_out,
 static int process_section_header(struct packet_reader *reader,
 				  const char *section, int peek)
 {
-	int ret;
-
-	if (packet_reader_peek(reader) != PACKET_READ_NORMAL)
-		die(_("error reading section header '%s'"), section);
+	int ret = 0;
 
-	ret = !strcmp(reader->line, section);
+	if (packet_reader_peek(reader) == PACKET_READ_NORMAL &&
+	    !strcmp(reader->line, section))
+		ret = 1;
 
 	if (!peek) {
-		if (!ret)
-			die(_("expected '%s', received '%s'"),
-			    section, reader->line);
+		if (!ret) {
+			if (reader->line)
+				die(_("expected '%s', received '%s'"),
+				    section, reader->line);
+			else
+				die(_("expected '%s'"), section);
+		}
 		packet_reader_read(reader);
 	}
 
diff --git a/fmt-merge-msg.c b/fmt-merge-msg.c
index baca57d5b6..f48f44f9cd 100644
--- a/fmt-merge-msg.c
+++ b/fmt-merge-msg.c
@@ -699,6 +699,7 @@ int fmt_merge_msg(struct strbuf *in, struct strbuf *out,
 			shortlog(origins.items[i].string,
 				 origins.items[i].util,
 				 head, &rev, opts, out);
+		release_revisions(&rev);
 	}
 
 	strbuf_complete_line(out);
diff --git a/fsck.c b/fsck.c
index 614c776429..47eaeedd70 100644
--- a/fsck.c
+++ b/fsck.c
@@ -309,7 +309,7 @@ static int fsck_walk_tree(struct tree *tree, void *data, struct fsck_options *op
 		return -1;
 
 	name = fsck_get_object_name(options, &tree->object.oid);
-	if (init_tree_desc_gently(&desc, tree->buffer, tree->size))
+	if (init_tree_desc_gently(&desc, tree->buffer, tree->size, 0))
 		return -1;
 	while (tree_entry_gently(&desc, &entry)) {
 		struct object *obj;
@@ -579,7 +579,7 @@ static int fsck_tree(const struct object_id *tree_oid,
 	const char *o_name;
 	struct name_stack df_dup_candidates = { NULL };
 
-	if (init_tree_desc_gently(&desc, buffer, size)) {
+	if (init_tree_desc_gently(&desc, buffer, size, TREE_DESC_RAW_MODES)) {
 		retval += report(options, tree_oid, OBJ_TREE,
 				 FSCK_MSG_BAD_TREE,
 				 "cannot be parsed as a tree");
@@ -981,27 +981,16 @@ done:
 	return ret;
 }
 
-/*
- * Like builtin/submodule--helper.c's starts_with_dot_slash, but without
- * relying on the platform-dependent is_dir_sep helper.
- *
- * This is for use in checking whether a submodule URL is interpreted as
- * relative to the current directory on any platform, since \ is a
- * directory separator on Windows but not on other platforms.
- */
-static int starts_with_dot_slash(const char *str)
+static int starts_with_dot_slash(const char *const path)
 {
-	return str[0] == '.' && (str[1] == '/' || str[1] == '\\');
+	return path_match_flags(path, PATH_MATCH_STARTS_WITH_DOT_SLASH |
+				PATH_MATCH_XPLATFORM);
 }
 
-/*
- * Like starts_with_dot_slash, this is a variant of submodule--helper's
- * helper of the same name with the twist that it accepts backslash as a
- * directory separator even on non-Windows platforms.
- */
-static int starts_with_dot_dot_slash(const char *str)
+static int starts_with_dot_dot_slash(const char *const path)
 {
-	return str[0] == '.' && starts_with_dot_slash(str + 1);
+	return path_match_flags(path, PATH_MATCH_STARTS_WITH_DOT_DOT_SLASH |
+				PATH_MATCH_XPLATFORM);
 }
 
 static int submodule_url_is_relative(const char *url)
diff --git a/fsck.h b/fsck.h
index cc3379d4e9..121b831985 100644
--- a/fsck.h
+++ b/fsck.h
@@ -60,7 +60,6 @@ enum fsck_msg_type {
 	FUNC(GITATTRIBUTES_LINE_LENGTH, ERROR) \
 	FUNC(GITATTRIBUTES_BLOB, ERROR) \
 	/* warnings */ \
-	FUNC(BAD_FILEMODE, WARN) \
 	FUNC(EMPTY_NAME, WARN) \
 	FUNC(FULL_PATHNAME, WARN) \
 	FUNC(HAS_DOT, WARN) \
@@ -70,6 +69,7 @@ enum fsck_msg_type {
 	FUNC(ZERO_PADDED_FILEMODE, WARN) \
 	FUNC(NUL_IN_COMMIT, WARN) \
 	/* infos (reported as warnings, but ignored by default) */ \
+	FUNC(BAD_FILEMODE, INFO) \
 	FUNC(GITMODULES_PARSE, INFO) \
 	FUNC(GITIGNORE_SYMLINK, INFO) \
 	FUNC(GITATTRIBUTES_SYMLINK, INFO) \
diff --git a/fsmonitor--daemon.h b/fsmonitor--daemon.h
index bd09fffc17..2102a5c9ff 100644
--- a/fsmonitor--daemon.h
+++ b/fsmonitor--daemon.h
@@ -33,10 +33,12 @@ void fsmonitor_batch__free_list(struct fsmonitor_batch *batch);
  */
 void fsmonitor_batch__add_path(struct fsmonitor_batch *batch, const char *path);
 
-struct fsmonitor_daemon_backend_data; /* opaque platform-specific data */
+struct fsm_listen_data; /* opaque platform-specific data for listener thread */
+struct fsm_health_data; /* opaque platform-specific data for health thread */
 
 struct fsmonitor_daemon_state {
 	pthread_t listener_thread;
+	pthread_t health_thread;
 	pthread_mutex_t main_lock;
 
 	struct strbuf path_worktree_watch;
@@ -50,10 +52,13 @@ struct fsmonitor_daemon_state {
 	int cookie_seq;
 	struct hashmap cookies;
 
-	int error_code;
-	struct fsmonitor_daemon_backend_data *backend_data;
+	int listen_error_code;
+	int health_error_code;
+	struct fsm_listen_data *listen_data;
+	struct fsm_health_data *health_data;
 
 	struct ipc_server_data *ipc_server_data;
+	struct strbuf path_ipc;
 };
 
 /*
diff --git a/fsmonitor-settings.c b/fsmonitor-settings.c
index 757d230d53..464424a1e9 100644
--- a/fsmonitor-settings.c
+++ b/fsmonitor-settings.c
@@ -9,23 +9,52 @@
  */
 struct fsmonitor_settings {
 	enum fsmonitor_mode mode;
+	enum fsmonitor_reason reason;
 	char *hook_path;
 };
 
-static void lookup_fsmonitor_settings(struct repository *r)
+static enum fsmonitor_reason check_for_incompatible(struct repository *r)
+{
+	if (!r->worktree) {
+		/*
+		 * Bare repositories don't have a working directory and
+		 * therefore have nothing to watch.
+		 */
+		return FSMONITOR_REASON_BARE;
+	}
+
+#ifdef HAVE_FSMONITOR_OS_SETTINGS
+	{
+		enum fsmonitor_reason reason;
+
+		reason = fsm_os__incompatible(r);
+		if (reason != FSMONITOR_REASON_OK)
+			return reason;
+	}
+#endif
+
+	return FSMONITOR_REASON_OK;
+}
+
+static struct fsmonitor_settings *alloc_settings(void)
 {
 	struct fsmonitor_settings *s;
+
+	CALLOC_ARRAY(s, 1);
+	s->mode = FSMONITOR_MODE_DISABLED;
+	s->reason = FSMONITOR_REASON_UNTESTED;
+
+	return s;
+}
+
+static void lookup_fsmonitor_settings(struct repository *r)
+{
 	const char *const_str;
 	int bool_value;
 
 	if (r->settings.fsmonitor)
 		return;
 
-	CALLOC_ARRAY(s, 1);
-	s->mode = FSMONITOR_MODE_DISABLED;
-
-	r->settings.fsmonitor = s;
-
 	/*
 	 * Overload the existing "core.fsmonitor" config setting (which
 	 * has historically been either unset or a hook pathname) to
@@ -38,6 +67,8 @@ static void lookup_fsmonitor_settings(struct repository *r)
 	case 0: /* config value was set to <bool> */
 		if (bool_value)
 			fsm_settings__set_ipc(r);
+		else
+			fsm_settings__set_disabled(r);
 		return;
 
 	case 1: /* config value was unset */
@@ -53,18 +84,18 @@ static void lookup_fsmonitor_settings(struct repository *r)
 		return;
 	}
 
-	if (!const_str || !*const_str)
-		return;
-
-	fsm_settings__set_hook(r, const_str);
+	if (const_str && *const_str)
+		fsm_settings__set_hook(r, const_str);
+	else
+		fsm_settings__set_disabled(r);
 }
 
 enum fsmonitor_mode fsm_settings__get_mode(struct repository *r)
 {
 	if (!r)
 		r = the_repository;
-
-	lookup_fsmonitor_settings(r);
+	if (!r->settings.fsmonitor)
+		lookup_fsmonitor_settings(r);
 
 	return r->settings.fsmonitor->mode;
 }
@@ -73,31 +104,55 @@ const char *fsm_settings__get_hook_path(struct repository *r)
 {
 	if (!r)
 		r = the_repository;
-
-	lookup_fsmonitor_settings(r);
+	if (!r->settings.fsmonitor)
+		lookup_fsmonitor_settings(r);
 
 	return r->settings.fsmonitor->hook_path;
 }
 
 void fsm_settings__set_ipc(struct repository *r)
 {
+	enum fsmonitor_reason reason = check_for_incompatible(r);
+
+	if (reason != FSMONITOR_REASON_OK) {
+		fsm_settings__set_incompatible(r, reason);
+		return;
+	}
+
+	/*
+	 * Caller requested IPC explicitly, so avoid (possibly
+	 * recursive) config lookup.
+	 */
 	if (!r)
 		r = the_repository;
-
-	lookup_fsmonitor_settings(r);
+	if (!r->settings.fsmonitor)
+		r->settings.fsmonitor = alloc_settings();
 
 	r->settings.fsmonitor->mode = FSMONITOR_MODE_IPC;
+	r->settings.fsmonitor->reason = reason;
 	FREE_AND_NULL(r->settings.fsmonitor->hook_path);
 }
 
 void fsm_settings__set_hook(struct repository *r, const char *path)
 {
+	enum fsmonitor_reason reason = check_for_incompatible(r);
+
+	if (reason != FSMONITOR_REASON_OK) {
+		fsm_settings__set_incompatible(r, reason);
+		return;
+	}
+
+	/*
+	 * Caller requested hook explicitly, so avoid (possibly
+	 * recursive) config lookup.
+	 */
 	if (!r)
 		r = the_repository;
-
-	lookup_fsmonitor_settings(r);
+	if (!r->settings.fsmonitor)
+		r->settings.fsmonitor = alloc_settings();
 
 	r->settings.fsmonitor->mode = FSMONITOR_MODE_HOOK;
+	r->settings.fsmonitor->reason = reason;
 	FREE_AND_NULL(r->settings.fsmonitor->hook_path);
 	r->settings.fsmonitor->hook_path = strdup(path);
 }
@@ -106,9 +161,85 @@ void fsm_settings__set_disabled(struct repository *r)
 {
 	if (!r)
 		r = the_repository;
-
-	lookup_fsmonitor_settings(r);
+	if (!r->settings.fsmonitor)
+		r->settings.fsmonitor = alloc_settings();
 
 	r->settings.fsmonitor->mode = FSMONITOR_MODE_DISABLED;
+	r->settings.fsmonitor->reason = FSMONITOR_REASON_OK;
 	FREE_AND_NULL(r->settings.fsmonitor->hook_path);
 }
+
+void fsm_settings__set_incompatible(struct repository *r,
+				    enum fsmonitor_reason reason)
+{
+	if (!r)
+		r = the_repository;
+	if (!r->settings.fsmonitor)
+		r->settings.fsmonitor = alloc_settings();
+
+	r->settings.fsmonitor->mode = FSMONITOR_MODE_INCOMPATIBLE;
+	r->settings.fsmonitor->reason = reason;
+	FREE_AND_NULL(r->settings.fsmonitor->hook_path);
+}
+
+enum fsmonitor_reason fsm_settings__get_reason(struct repository *r)
+{
+	if (!r)
+		r = the_repository;
+	if (!r->settings.fsmonitor)
+		lookup_fsmonitor_settings(r);
+
+	return r->settings.fsmonitor->reason;
+}
+
+char *fsm_settings__get_incompatible_msg(const struct repository *r,
+					 enum fsmonitor_reason reason)
+{
+	struct strbuf msg = STRBUF_INIT;
+
+	switch (reason) {
+	case FSMONITOR_REASON_UNTESTED:
+	case FSMONITOR_REASON_OK:
+		goto done;
+
+	case FSMONITOR_REASON_BARE: {
+		char *cwd = xgetcwd();
+
+		strbuf_addf(&msg,
+			    _("bare repository '%s' is incompatible with fsmonitor"),
+			    cwd);
+		free(cwd);
+		goto done;
+	}
+
+	case FSMONITOR_REASON_ERROR:
+		strbuf_addf(&msg,
+			    _("repository '%s' is incompatible with fsmonitor due to errors"),
+			    r->worktree);
+		goto done;
+
+	case FSMONITOR_REASON_REMOTE:
+		strbuf_addf(&msg,
+			    _("remote repository '%s' is incompatible with fsmonitor"),
+			    r->worktree);
+		goto done;
+
+	case FSMONITOR_REASON_VFS4GIT:
+		strbuf_addf(&msg,
+			    _("virtual repository '%s' is incompatible with fsmonitor"),
+			    r->worktree);
+		goto done;
+
+	case FSMONITOR_REASON_NOSOCKETS:
+		strbuf_addf(&msg,
+			    _("repository '%s' is incompatible with fsmonitor due to lack of Unix sockets"),
+			    r->worktree);
+		goto done;
+	}
+
+	BUG("Unhandled case in fsm_settings__get_incompatible_msg: '%d'",
+	    reason);
+
+done:
+	return strbuf_detach(&msg, NULL);
+}
diff --git a/fsmonitor-settings.h b/fsmonitor-settings.h
index a4c5d7b488..d9c2605197 100644
--- a/fsmonitor-settings.h
+++ b/fsmonitor-settings.h
@@ -4,18 +4,51 @@
 struct repository;
 
 enum fsmonitor_mode {
+	FSMONITOR_MODE_INCOMPATIBLE = -1, /* see _reason */
 	FSMONITOR_MODE_DISABLED = 0,
 	FSMONITOR_MODE_HOOK = 1, /* core.fsmonitor=<hook_path> */
 	FSMONITOR_MODE_IPC = 2,  /* core.fsmonitor=<true> */
 };
 
+/*
+ * Incompatibility reasons.
+ */
+enum fsmonitor_reason {
+	FSMONITOR_REASON_UNTESTED = 0,
+	FSMONITOR_REASON_OK, /* no incompatibility or when disabled */
+	FSMONITOR_REASON_BARE,
+	FSMONITOR_REASON_ERROR, /* FS error probing for compatibility */
+	FSMONITOR_REASON_REMOTE,
+	FSMONITOR_REASON_VFS4GIT, /* VFS for Git virtualization */
+	FSMONITOR_REASON_NOSOCKETS, /* NTFS,FAT32 do not support Unix sockets */
+};
+
 void fsm_settings__set_ipc(struct repository *r);
 void fsm_settings__set_hook(struct repository *r, const char *path);
 void fsm_settings__set_disabled(struct repository *r);
+void fsm_settings__set_incompatible(struct repository *r,
+				    enum fsmonitor_reason reason);
 
 enum fsmonitor_mode fsm_settings__get_mode(struct repository *r);
 const char *fsm_settings__get_hook_path(struct repository *r);
 
+enum fsmonitor_reason fsm_settings__get_reason(struct repository *r);
+char *fsm_settings__get_incompatible_msg(const struct repository *r,
+					 enum fsmonitor_reason reason);
+
 struct fsmonitor_settings;
 
+#ifdef HAVE_FSMONITOR_OS_SETTINGS
+/*
+ * Ask platform-specific code whether the repository is incompatible
+ * with fsmonitor (both hook and ipc modes).  For example, if the working
+ * directory is on a remote volume and mounted via a technology that does
+ * not support notification events, then we should not pretend to watch it.
+ *
+ * fsm_os__* routines should considered private to fsm_settings__
+ * routines.
+ */
+enum fsmonitor_reason fsm_os__incompatible(struct repository *r);
+#endif /* HAVE_FSMONITOR_OS_SETTINGS */
+
 #endif /* FSMONITOR_SETTINGS_H */
diff --git a/fsmonitor.c b/fsmonitor.c
index 292a6742b4..57d6a483be 100644
--- a/fsmonitor.c
+++ b/fsmonitor.c
@@ -184,30 +184,68 @@ static int query_fsmonitor_hook(struct repository *r,
 static void fsmonitor_refresh_callback(struct index_state *istate, char *name)
 {
 	int i, len = strlen(name);
-	if (name[len - 1] == '/') {
+	int pos = index_name_pos(istate, name, len);
+
+	trace_printf_key(&trace_fsmonitor,
+			 "fsmonitor_refresh_callback '%s' (pos %d)",
+			 name, pos);
 
+	if (name[len - 1] == '/') {
 		/*
-		 * TODO We should binary search to find the first path with
-		 * TODO this directory prefix.  Then linearly update entries
-		 * TODO while the prefix matches.  Taking care to search without
-		 * TODO the trailing slash -- because '/' sorts after a few
-		 * TODO interesting special chars, like '.' and ' '.
+		 * The daemon can decorate directory events, such as
+		 * moves or renames, with a trailing slash if the OS
+		 * FS Event contains sufficient information, such as
+		 * MacOS.
+		 *
+		 * Use this to invalidate the entire cone under that
+		 * directory.
+		 *
+		 * We do not expect an exact match because the index
+		 * does not normally contain directory entries, so we
+		 * start at the insertion point and scan.
 		 */
+		if (pos < 0)
+			pos = -pos - 1;
 
 		/* Mark all entries for the folder invalid */
-		for (i = 0; i < istate->cache_nr; i++) {
-			if (istate->cache[i]->ce_flags & CE_FSMONITOR_VALID &&
-			    starts_with(istate->cache[i]->name, name))
-				istate->cache[i]->ce_flags &= ~CE_FSMONITOR_VALID;
+		for (i = pos; i < istate->cache_nr; i++) {
+			if (!starts_with(istate->cache[i]->name, name))
+				break;
+			istate->cache[i]->ce_flags &= ~CE_FSMONITOR_VALID;
 		}
-		/* Need to remove the / from the path for the untracked cache */
+
+		/*
+		 * We need to remove the traling "/" from the path
+		 * for the untracked cache.
+		 */
 		name[len - 1] = '\0';
+	} else if (pos >= 0) {
+		/*
+		 * We have an exact match for this path and can just
+		 * invalidate it.
+		 */
+		istate->cache[pos]->ce_flags &= ~CE_FSMONITOR_VALID;
 	} else {
-		int pos = index_name_pos(istate, name, strlen(name));
-
-		if (pos >= 0) {
-			struct cache_entry *ce = istate->cache[pos];
-			ce->ce_flags &= ~CE_FSMONITOR_VALID;
+		/*
+		 * The path is not a tracked file -or- it is a
+		 * directory event on a platform that cannot
+		 * distinguish between file and directory events in
+		 * the event handler, such as Windows.
+		 *
+		 * Scan as if it is a directory and invalidate the
+		 * cone under it.  (But remember to ignore items
+		 * between "name" and "name/", such as "name-" and
+		 * "name.".
+		 */
+		pos = -pos - 1;
+
+		for (i = pos; i < istate->cache_nr; i++) {
+			if (!starts_with(istate->cache[i]->name, name))
+				break;
+			if ((unsigned char)istate->cache[i]->name[len] > '/')
+				break;
+			if (istate->cache[i]->name[len] == '/')
+				istate->cache[i]->ce_flags &= ~CE_FSMONITOR_VALID;
 		}
 	}
 
@@ -215,7 +253,6 @@ static void fsmonitor_refresh_callback(struct index_state *istate, char *name)
 	 * Mark the untracked cache dirty even if it wasn't found in the index
 	 * as it could be a new untracked file.
 	 */
-	trace_printf_key(&trace_fsmonitor, "fsmonitor_refresh_callback '%s'", name);
 	untracked_cache_invalidate_path(istate, name, 0);
 }
 
@@ -543,6 +580,8 @@ void tweak_fsmonitor(struct index_state *istate)
 		if (fsmonitor_enabled) {
 			/* Mark all entries valid */
 			for (i = 0; i < istate->cache_nr; i++) {
+				if (S_ISGITLINK(istate->cache[i]->ce_mode))
+					continue;
 				istate->cache[i]->ce_flags |= CE_FSMONITOR_VALID;
 			}
 
diff --git a/fsmonitor.h b/fsmonitor.h
index 3f41f65369..edf7ce5203 100644
--- a/fsmonitor.h
+++ b/fsmonitor.h
@@ -68,6 +68,15 @@ static inline int is_fsmonitor_refreshed(const struct index_state *istate)
  * Set the given cache entries CE_FSMONITOR_VALID bit. This should be
  * called any time the cache entry has been updated to reflect the
  * current state of the file on disk.
+ *
+ * However, never mark submodules as valid.  When commands like "git
+ * status" run they might need to recurse into the submodule (using a
+ * child process) to get a summary of the submodule state.  We don't
+ * have (and don't want to create) the facility to translate every
+ * FS event that we receive and that happens to be deep inside of a
+ * submodule back to the submodule root, so we cannot correctly keep
+ * track of this bit on the gitlink directory.  Therefore, we never
+ * set it on submodules.
  */
 static inline void mark_fsmonitor_valid(struct index_state *istate, struct cache_entry *ce)
 {
@@ -75,6 +84,8 @@ static inline void mark_fsmonitor_valid(struct index_state *istate, struct cache
 
 	if (fsm_mode > FSMONITOR_MODE_DISABLED &&
 	    !(ce->ce_flags & CE_FSMONITOR_VALID)) {
+		if (S_ISGITLINK(ce->ce_mode))
+			return;
 		istate->cache_changed = 1;
 		ce->ce_flags |= CE_FSMONITOR_VALID;
 		trace_printf_key(&trace_fsmonitor, "mark_fsmonitor_clean '%s'", ce->name);
diff --git a/git-compat-util.h b/git-compat-util.h
index 33636827d5..fdb24fcd2f 100644
--- a/git-compat-util.h
+++ b/git-compat-util.h
@@ -23,6 +23,9 @@
 #include <crtdbg.h>
 #endif
 
+struct strbuf;
+
+
 #define _FILE_OFFSET_BITS 64
 
 
@@ -236,6 +239,12 @@
 #include <sys/sysctl.h>
 #endif
 
+/* Used by compat/win32/path-utils.h, and more */
+static inline int is_xplatform_dir_sep(int c)
+{
+	return c == '/' || c == '\\';
+}
+
 #if defined(__CYGWIN__)
 #include "compat/win32/path-utils.h"
 #endif
@@ -416,11 +425,11 @@ static inline int git_skip_dos_drive_prefix(char **path)
 #define skip_dos_drive_prefix git_skip_dos_drive_prefix
 #endif
 
-#ifndef is_dir_sep
 static inline int git_is_dir_sep(int c)
 {
 	return c == '/';
 }
+#ifndef is_dir_sep
 #define is_dir_sep git_is_dir_sep
 #endif
 
@@ -481,7 +490,7 @@ static inline void extract_id_from_env(const char *env, uid_t *id)
 	}
 }
 
-static inline int is_path_owned_by_current_uid(const char *path)
+static inline int is_path_owned_by_current_uid(const char *path, struct strbuf *report)
 {
 	struct stat st;
 	uid_t euid;
@@ -997,6 +1006,28 @@ static inline int cast_size_t_to_int(size_t a)
 	return (int)a;
 }
 
+/*
+ * 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
+ * the absence of bugs, large chunks can result in bad latencies when
+ * you decide to kill the process.
+ *
+ * We pick 8 MiB as our default, but if the platform defines SSIZE_MAX
+ * that is smaller than that, clip it to SSIZE_MAX, as a call to
+ * read(2) or write(2) larger than that is allowed to fail.  As the last
+ * resort, we allow a port to pass via CFLAGS e.g. "-DMAX_IO_SIZE=value"
+ * to override this, if the definition of SSIZE_MAX given by the platform
+ * is broken.
+ */
+#ifndef MAX_IO_SIZE
+# define MAX_IO_SIZE_DEFAULT (8*1024*1024)
+# if defined(SSIZE_MAX) && (SSIZE_MAX < MAX_IO_SIZE_DEFAULT)
+#  define MAX_IO_SIZE SSIZE_MAX
+# else
+#  define MAX_IO_SIZE MAX_IO_SIZE_DEFAULT
+# endif
+#endif
+
 #ifdef HAVE_ALLOCA_H
 # include <alloca.h>
 # define xalloca(size)      (alloca(size))
@@ -1333,15 +1364,27 @@ static inline int regexec_buf(const regex_t *preg, const char *buf, size_t size,
 /* usage.c: only to be used for testing BUG() implementation (see test-tool) */
 extern int BUG_exit_code;
 
+/* usage.c: if bug() is called we should have a BUG_if_bug() afterwards */
+extern int bug_called_must_BUG;
+
 __attribute__((format (printf, 3, 4))) NORETURN
 void BUG_fl(const char *file, int line, const char *fmt, ...);
 #define BUG(...) BUG_fl(__FILE__, __LINE__, __VA_ARGS__)
+__attribute__((format (printf, 3, 4)))
+void bug_fl(const char *file, int line, const char *fmt, ...);
+#define bug(...) bug_fl(__FILE__, __LINE__, __VA_ARGS__)
+#define BUG_if_bug(...) do { \
+	if (bug_called_must_BUG) \
+		BUG_fl(__FILE__, __LINE__, __VA_ARGS__); \
+} while (0)
 
+#ifndef FSYNC_METHOD_DEFAULT
 #ifdef __APPLE__
 #define FSYNC_METHOD_DEFAULT FSYNC_METHOD_WRITEOUT_ONLY
 #else
 #define FSYNC_METHOD_DEFAULT FSYNC_METHOD_FSYNC
 #endif
+#endif
 
 enum fsync_action {
 	FSYNC_WRITEOUT_ONLY,
@@ -1464,8 +1507,8 @@ int cmd_main(int, const char **);
  * Intercept all calls to exit() and route them to trace2 to
  * optionally emit a message before calling the real exit().
  */
-int trace2_cmd_exit_fl(const char *file, int line, int code);
-#define exit(code) exit(trace2_cmd_exit_fl(__FILE__, __LINE__, (code)))
+int common_exit(const char *file, int line, int code);
+#define exit(code) exit(common_exit(__FILE__, __LINE__, (code)))
 
 /*
  * You can mark a stack variable with UNLEAK(var) to avoid it being
diff --git a/git-cvsserver.perl b/git-cvsserver.perl
index 4c8118010a..7b757360e2 100755
--- a/git-cvsserver.perl
+++ b/git-cvsserver.perl
@@ -152,7 +152,7 @@ $state->{allowed_roots} = [ @ARGV ];
 
 # don't export the whole system unless the users requests it
 if ($state->{'export-all'} && !@{$state->{allowed_roots}}) {
-    die "--export-all can only be used together with an explicit whitelist\n";
+    die "--export-all can only be used together with an explicit '<directory>...' list\n";
 }
 
 # Environment handling for running under git-shell
diff --git a/git-mergetool--lib.sh b/git-mergetool--lib.sh
index 542a6a75eb..9f99201bcc 100644
--- a/git-mergetool--lib.sh
+++ b/git-mergetool--lib.sh
@@ -63,7 +63,7 @@ $(list_tool_variants)"
 					preamble=
 				fi
 				shown_any=yes
-				printf "%s%s\n" "$per_line_prefix" "$toolname"
+				printf "%s%-15s  %s\n" "$per_line_prefix" "$toolname" $(diff_mode && diff_cmd_help "$toolname" || merge_cmd_help "$toolname")
 			fi
 		done
 
@@ -162,10 +162,18 @@ setup_tool () {
 		return 1
 	}
 
+	diff_cmd_help () {
+		return 0
+	}
+
 	merge_cmd () {
 		return 1
 	}
 
+	merge_cmd_help () {
+		return 0
+	}
+
 	hide_resolved_enabled () {
 		return 0
 	}
diff --git a/git-p4.py b/git-p4.py
index a9b1f90441..77dc19daa6 100755
--- a/git-p4.py
+++ b/git-p4.py
@@ -7,34 +7,52 @@
 #            2007 Trolltech ASA
 # License: MIT <http://www.opensource.org/licenses/mit-license.php>
 #
-# pylint: disable=invalid-name,missing-docstring,too-many-arguments,broad-except
-# pylint: disable=no-self-use,wrong-import-position,consider-iterating-dictionary
-# pylint: disable=wrong-import-order,unused-import,too-few-public-methods
-# pylint: disable=too-many-lines,ungrouped-imports,fixme,too-many-locals
-# pylint: disable=line-too-long,bad-whitespace,superfluous-parens
-# pylint: disable=too-many-statements,too-many-instance-attributes
-# pylint: disable=too-many-branches,too-many-nested-blocks
+# pylint: disable=bad-whitespace
+# pylint: disable=broad-except
+# pylint: disable=consider-iterating-dictionary
+# pylint: disable=disable
+# pylint: disable=fixme
+# pylint: disable=invalid-name
+# pylint: disable=line-too-long
+# pylint: disable=missing-docstring
+# pylint: disable=no-self-use
+# pylint: disable=superfluous-parens
+# pylint: disable=too-few-public-methods
+# pylint: disable=too-many-arguments
+# pylint: disable=too-many-branches
+# pylint: disable=too-many-instance-attributes
+# pylint: disable=too-many-lines
+# pylint: disable=too-many-locals
+# pylint: disable=too-many-nested-blocks
+# pylint: disable=too-many-statements
+# pylint: disable=ungrouped-imports
+# pylint: disable=unused-import
+# pylint: disable=wrong-import-order
+# pylint: disable=wrong-import-position
 #
+
+import struct
 import sys
 if sys.version_info.major < 3 and sys.version_info.minor < 7:
     sys.stderr.write("git-p4: requires Python 2.7 or later.\n")
     sys.exit(1)
-import os
-import optparse
+
+import ctypes
+import errno
 import functools
+import glob
 import marshal
-import subprocess
-import tempfile
-import time
+import optparse
+import os
 import platform
 import re
 import shutil
 import stat
+import subprocess
+import tempfile
+import time
 import zipfile
 import zlib
-import ctypes
-import errno
-import glob
 
 # On python2.7 where raw_input() and input() are both availble,
 # we want raw_input's semantics, but aliased to input for python3
@@ -52,17 +70,21 @@ verbose = False
 defaultLabelRegexp = r'[a-zA-Z0-9_\-.]+$'
 
 # The block size is reduced automatically if required
-defaultBlockSize = 1<<20
+defaultBlockSize = 1 << 20
+
+defaultMetadataDecodingStrategy = 'passthrough' if sys.version_info.major == 2 else 'fallback'
+defaultFallbackMetadataEncoding = 'cp1252'
 
 p4_access_checked = False
 
 re_ko_keywords = re.compile(br'\$(Id|Header)(:[^$\n]+)?\$')
 re_k_keywords = re.compile(br'\$(Id|Header|Author|Date|DateTime|Change|File|Revision)(:[^$\n]+)?\$')
 
+
 def format_size_human_readable(num):
-    """ Returns a number of units (typically bytes) formatted as a human-readable
-        string.
-    """
+    """Returns a number of units (typically bytes) formatted as a
+       human-readable string.
+       """
     if num < 1024:
         return '{:d} B'.format(num)
     for unit in ["Ki", "Mi", "Gi", "Ti", "Pi", "Ei", "Zi"]:
@@ -71,18 +93,19 @@ def format_size_human_readable(num):
             return "{:3.1f} {}B".format(num, unit)
     return "{:.1f} YiB".format(num)
 
+
 def p4_build_cmd(cmd):
     """Build a suitable p4 command line.
 
-    This consolidates building and returning a p4 command line into one
-    location. It means that hooking into the environment, or other configuration
-    can be done more easily.
-    """
+       This consolidates building and returning a p4 command line into one
+       location. It means that hooking into the environment, or other
+       configuration can be done more easily.
+       """
     real_cmd = ["p4"]
 
     user = gitConfig("git-p4.user")
     if len(user) > 0:
-        real_cmd += ["-u",user]
+        real_cmd += ["-u", user]
 
     password = gitConfig("git-p4.password")
     if len(password) > 0:
@@ -118,31 +141,31 @@ def p4_build_cmd(cmd):
 
     return real_cmd
 
+
 def git_dir(path):
-    """ Return TRUE if the given path is a git directory (/path/to/dir/.git).
-        This won't automatically add ".git" to a directory.
-    """
+    """Return TRUE if the given path is a git directory (/path/to/dir/.git).
+       This won't automatically add ".git" to a directory.
+       """
     d = read_pipe(["git", "--git-dir", path, "rev-parse", "--git-dir"], True).strip()
     if not d or len(d) == 0:
         return None
     else:
         return d
 
+
 def chdir(path, is_client_path=False):
-    """Do chdir to the given path, and set the PWD environment
-       variable for use by P4.  It does not look at getcwd() output.
-       Since we're not using the shell, it is necessary to set the
-       PWD environment variable explicitly.
-
-       Normally, expand the path to force it to be absolute.  This
-       addresses the use of relative path names inside P4 settings,
-       e.g. P4CONFIG=.p4config.  P4 does not simply open the filename
-       as given; it looks for .p4config using PWD.
-
-       If is_client_path, the path was handed to us directly by p4,
-       and may be a symbolic link.  Do not call os.getcwd() in this
-       case, because it will cause p4 to think that PWD is not inside
-       the client path.
+    """Do chdir to the given path, and set the PWD environment variable for use
+       by P4.  It does not look at getcwd() output.  Since we're not using the
+       shell, it is necessary to set the PWD environment variable explicitly.
+
+       Normally, expand the path to force it to be absolute.  This addresses
+       the use of relative path names inside P4 settings, e.g.
+       P4CONFIG=.p4config.  P4 does not simply open the filename as given; it
+       looks for .p4config using PWD.
+
+       If is_client_path, the path was handed to us directly by p4, and may be
+       a symbolic link.  Do not call os.getcwd() in this case, because it will
+       cause p4 to think that PWD is not inside the client path.
        """
 
     os.chdir(path)
@@ -150,6 +173,7 @@ def chdir(path, is_client_path=False):
         path = os.getcwd()
     os.environ['PWD'] = path
 
+
 def calcDiskFree():
     """Return free space in bytes on the disk of the given dirname."""
     if platform.system() == 'Windows':
@@ -160,52 +184,124 @@ def calcDiskFree():
         st = os.statvfs(os.getcwd())
         return st.f_bavail * st.f_frsize
 
+
 def die(msg):
-    """ Terminate execution. Make sure that any running child processes have been wait()ed for before
-        calling this.
-    """
+    """Terminate execution. Make sure that any running child processes have
+       been wait()ed for before calling this.
+       """
     if verbose:
         raise Exception(msg)
     else:
         sys.stderr.write(msg + "\n")
         sys.exit(1)
 
+
 def prompt(prompt_text):
-    """ Prompt the user to choose one of the choices
+    """Prompt the user to choose one of the choices.
 
-    Choices are identified in the prompt_text by square brackets around
-    a single letter option.
-    """
+       Choices are identified in the prompt_text by square brackets around a
+       single letter option.
+       """
     choices = set(m.group(1) for m in re.finditer(r"\[(.)\]", prompt_text))
     while True:
         sys.stderr.flush()
         sys.stdout.write(prompt_text)
         sys.stdout.flush()
-        response=sys.stdin.readline().strip().lower()
+        response = sys.stdin.readline().strip().lower()
         if not response:
             continue
         response = response[0]
         if response in choices:
             return response
 
+
 # We need different encoding/decoding strategies for text data being passed
 # around in pipes depending on python version
 if bytes is not str:
     # For python3, always encode and decode as appropriate
     def decode_text_stream(s):
         return s.decode() if isinstance(s, bytes) else s
+
     def encode_text_stream(s):
         return s.encode() if isinstance(s, str) else s
 else:
     # For python2.7, pass read strings as-is, but also allow writing unicode
     def decode_text_stream(s):
         return s
+
     def encode_text_stream(s):
         return s.encode('utf_8') if isinstance(s, unicode) else s
 
+
+class MetadataDecodingException(Exception):
+    def __init__(self, input_string):
+        self.input_string = input_string
+
+    def __str__(self):
+        return """Decoding perforce metadata failed!
+The failing string was:
+---
+{}
+---
+Consider setting the git-p4.metadataDecodingStrategy config option to
+'fallback', to allow metadata to be decoded using a fallback encoding,
+defaulting to cp1252.""".format(self.input_string)
+
+
+encoding_fallback_warning_issued = False
+encoding_escape_warning_issued = False
+def metadata_stream_to_writable_bytes(s):
+    encodingStrategy = gitConfig('git-p4.metadataDecodingStrategy') or defaultMetadataDecodingStrategy
+    fallbackEncoding = gitConfig('git-p4.metadataFallbackEncoding') or defaultFallbackMetadataEncoding
+    if not isinstance(s, bytes):
+        return s.encode('utf_8')
+    if encodingStrategy == 'passthrough':
+        return s
+    try:
+        s.decode('utf_8')
+        return s
+    except UnicodeDecodeError:
+        if encodingStrategy == 'fallback' and fallbackEncoding:
+            global encoding_fallback_warning_issued
+            global encoding_escape_warning_issued
+            try:
+                if not encoding_fallback_warning_issued:
+                    print("\nCould not decode value as utf-8; using configured fallback encoding %s: %s" % (fallbackEncoding, s))
+                    print("\n(this warning is only displayed once during an import)")
+                    encoding_fallback_warning_issued = True
+                return s.decode(fallbackEncoding).encode('utf_8')
+            except Exception as exc:
+                if not encoding_escape_warning_issued:
+                    print("\nCould not decode value with configured fallback encoding %s; escaping bytes over 127: %s" % (fallbackEncoding, s))
+                    print("\n(this warning is only displayed once during an import)")
+                    encoding_escape_warning_issued = True
+                escaped_bytes = b''
+                # bytes and strings work very differently in python2 vs python3...
+                if str is bytes:
+                    for byte in s:
+                        byte_number = struct.unpack('>B', byte)[0]
+                        if byte_number > 127:
+                            escaped_bytes += b'%'
+                            escaped_bytes += hex(byte_number)[2:].upper()
+                        else:
+                            escaped_bytes += byte
+                else:
+                    for byte_number in s:
+                        if byte_number > 127:
+                            escaped_bytes += b'%'
+                            escaped_bytes += hex(byte_number).upper().encode()[2:]
+                        else:
+                            escaped_bytes += bytes([byte_number])
+                return escaped_bytes
+
+        raise MetadataDecodingException(s)
+
+
 def decode_path(path):
-    """Decode a given string (bytes or otherwise) using configured path encoding options
-    """
+    """Decode a given string (bytes or otherwise) using configured path
+       encoding options.
+       """
+
     encoding = gitConfig('git-p4.pathEncoding') or 'utf_8'
     if bytes is not str:
         return path.decode(encoding, errors='replace') if isinstance(path, bytes) else path
@@ -218,6 +314,7 @@ def decode_path(path):
                 print('Path with non-ASCII characters detected. Used {} to decode: {}'.format(encoding, path))
         return path
 
+
 def run_git_hook(cmd, param=[]):
     """Execute a hook if the hook exists."""
     args = ['git', 'hook', 'run', '--ignore-missing', cmd]
@@ -227,6 +324,7 @@ def run_git_hook(cmd, param=[]):
             args.append(p)
     return subprocess.call(args) == 0
 
+
 def write_pipe(c, stdin, *k, **kw):
     if verbose:
         sys.stderr.write('Writing pipe: {}\n'.format(' '.join(c)))
@@ -240,33 +338,35 @@ def write_pipe(c, stdin, *k, **kw):
 
     return val
 
+
 def p4_write_pipe(c, stdin, *k, **kw):
     real_cmd = p4_build_cmd(c)
     if bytes is not str and isinstance(stdin, str):
         stdin = encode_text_stream(stdin)
     return write_pipe(real_cmd, stdin, *k, **kw)
 
+
 def read_pipe_full(c, *k, **kw):
-    """ Read output from  command. Returns a tuple
-        of the return status, stdout text and stderr
-        text.
-    """
+    """Read output from command. Returns a tuple of the return status, stdout
+       text and stderr text.
+       """
     if verbose:
         sys.stderr.write('Reading pipe: {}\n'.format(' '.join(c)))
 
     p = subprocess.Popen(
         c, stdout=subprocess.PIPE, stderr=subprocess.PIPE, *k, **kw)
-    (out, err) = p.communicate()
+    out, err = p.communicate()
     return (p.returncode, out, decode_text_stream(err))
 
+
 def read_pipe(c, ignore_error=False, raw=False, *k, **kw):
-    """ Read output from  command. Returns the output text on
-        success. On failure, terminates execution, unless
-        ignore_error is True, when it returns an empty string.
+    """Read output from  command. Returns the output text on success. On
+       failure, terminates execution, unless ignore_error is True, when it
+       returns an empty string.
 
-        If raw is True, do not attempt to decode output text.
-    """
-    (retcode, out, err) = read_pipe_full(c, *k, **kw)
+       If raw is True, do not attempt to decode output text.
+       """
+    retcode, out, err = read_pipe_full(c, *k, **kw)
     if retcode != 0:
         if ignore_error:
             out = ""
@@ -276,20 +376,23 @@ def read_pipe(c, ignore_error=False, raw=False, *k, **kw):
         out = decode_text_stream(out)
     return out
 
+
 def read_pipe_text(c, *k, **kw):
-    """ Read output from a command with trailing whitespace stripped.
-        On error, returns None.
-    """
-    (retcode, out, err) = read_pipe_full(c, *k, **kw)
+    """Read output from a command with trailing whitespace stripped. On error,
+       returns None.
+       """
+    retcode, out, err = read_pipe_full(c, *k, **kw)
     if retcode != 0:
         return None
     else:
         return decode_text_stream(out).rstrip()
 
+
 def p4_read_pipe(c, ignore_error=False, raw=False, *k, **kw):
     real_cmd = p4_build_cmd(c)
     return read_pipe(real_cmd, ignore_error, raw=raw, *k, **kw)
 
+
 def read_pipe_lines(c, raw=False, *k, **kw):
     if verbose:
         sys.stderr.write('Reading pipe: {}\n'.format(' '.join(c)))
@@ -303,31 +406,36 @@ def read_pipe_lines(c, raw=False, *k, **kw):
         die('Command failed: {}'.format(' '.join(c)))
     return lines
 
+
 def p4_read_pipe_lines(c, *k, **kw):
-    """Specifically invoke p4 on the command supplied. """
+    """Specifically invoke p4 on the command supplied."""
     real_cmd = p4_build_cmd(c)
     return read_pipe_lines(real_cmd, *k, **kw)
 
+
 def p4_has_command(cmd):
-    """Ask p4 for help on this command.  If it returns an error, the
-       command does not exist in this version of p4."""
+    """Ask p4 for help on this command.  If it returns an error, the command
+       does not exist in this version of p4.
+       """
     real_cmd = p4_build_cmd(["help", cmd])
     p = subprocess.Popen(real_cmd, stdout=subprocess.PIPE,
                                    stderr=subprocess.PIPE)
     p.communicate()
     return p.returncode == 0
 
+
 def p4_has_move_command():
-    """See if the move command exists, that it supports -k, and that
-       it has not been administratively disabled.  The arguments
-       must be correct, but the filenames do not have to exist.  Use
-       ones with wildcards so even if they exist, it will fail."""
+    """See if the move command exists, that it supports -k, and that it has not
+       been administratively disabled.  The arguments must be correct, but the
+       filenames do not have to exist.  Use ones with wildcards so even if they
+       exist, it will fail.
+       """
 
     if not p4_has_command("move"):
         return False
     cmd = p4_build_cmd(["move", "-k", "@from", "@to"])
     p = subprocess.Popen(cmd, stdout=subprocess.PIPE, stderr=subprocess.PIPE)
-    (out, err) = p.communicate()
+    out, err = p.communicate()
     err = decode_text_stream(err)
     # return code will be 1 in either case
     if err.find("Invalid option") >= 0:
@@ -337,6 +445,7 @@ def p4_has_move_command():
     # assume it failed because @... was invalid changelist
     return True
 
+
 def system(cmd, ignore_error=False, *k, **kw):
     if verbose:
         sys.stderr.write("executing {}\n".format(
@@ -347,19 +456,22 @@ def system(cmd, ignore_error=False, *k, **kw):
 
     return retcode
 
+
 def p4_system(cmd, *k, **kw):
-    """Specifically invoke p4 as the system command. """
+    """Specifically invoke p4 as the system command."""
     real_cmd = p4_build_cmd(cmd)
     retcode = subprocess.call(real_cmd, *k, **kw)
     if retcode:
         raise subprocess.CalledProcessError(retcode, real_cmd)
 
+
 def die_bad_access(s):
     die("failure accessing depot: {0}".format(s.rstrip()))
 
+
 def p4_check_access(min_expiration=1):
-    """ Check if we can access Perforce - account still logged in
-    """
+    """Check if we can access Perforce - account still logged in."""
+
     results = p4CmdList(["login", "-s"])
 
     if len(results) == 0:
@@ -402,62 +514,78 @@ def p4_check_access(min_expiration=1):
     else:
         die_bad_access("unknown error code {0}".format(code))
 
+
 _p4_version_string = None
+
+
 def p4_version_string():
-    """Read the version string, showing just the last line, which
-       hopefully is the interesting version bit.
+    """Read the version string, showing just the last line, which hopefully is
+       the interesting version bit.
 
        $ p4 -V
        Perforce - The Fast Software Configuration Management System.
        Copyright 1995-2011 Perforce Software.  All rights reserved.
        Rev. P4/NTX86/2011.1/393975 (2011/12/16).
-    """
+       """
     global _p4_version_string
     if not _p4_version_string:
         a = p4_read_pipe_lines(["-V"])
         _p4_version_string = a[-1].rstrip()
     return _p4_version_string
 
+
 def p4_integrate(src, dest):
     p4_system(["integrate", "-Dt", wildcard_encode(src), wildcard_encode(dest)])
 
+
 def p4_sync(f, *options):
     p4_system(["sync"] + list(options) + [wildcard_encode(f)])
 
+
 def p4_add(f):
-    # forcibly add file names with wildcards
+    """Forcibly add file names with wildcards."""
     if wildcard_present(f):
         p4_system(["add", "-f", f])
     else:
         p4_system(["add", f])
 
+
 def p4_delete(f):
     p4_system(["delete", wildcard_encode(f)])
 
+
 def p4_edit(f, *options):
     p4_system(["edit"] + list(options) + [wildcard_encode(f)])
 
+
 def p4_revert(f):
     p4_system(["revert", wildcard_encode(f)])
 
+
 def p4_reopen(type, f):
     p4_system(["reopen", "-t", type, wildcard_encode(f)])
 
+
 def p4_reopen_in_change(changelist, files):
     cmd = ["reopen", "-c", str(changelist)] + files
     p4_system(cmd)
 
+
 def p4_move(src, dest):
     p4_system(["move", "-k", wildcard_encode(src), wildcard_encode(dest)])
 
+
 def p4_last_change():
     results = p4CmdList(["changes", "-m", "1"], skip_info=True)
     return int(results[0]['change'])
 
+
 def p4_describe(change, shelved=False):
-    """Make sure it returns a valid result by checking for
-       the presence of field "time".  Return a dict of the
-       results."""
+    """Make sure it returns a valid result by checking for the presence of
+       field "time".
+
+       Return a dict of the results.
+       """
 
     cmd = ["describe", "-s"]
     if shelved:
@@ -482,12 +610,11 @@ def p4_describe(change, shelved=False):
 
     return d
 
-#
-# Canonicalize the p4 type and return a tuple of the
-# base type, plus any modifiers.  See "p4 help filetypes"
-# for a list and explanation.
-#
+
 def split_p4_type(p4type):
+    """Canonicalize the p4 type and return a tuple of the base type, plus any
+       modifiers.  See "p4 help filetypes" for a list and explanation.
+       """
 
     p4_filetypes_historical = {
         "ctempobj": "binary+Sw",
@@ -517,18 +644,19 @@ def split_p4_type(p4type):
         mods = s[1]
     return (base, mods)
 
-#
-# return the raw p4 type of a file (text, text+ko, etc)
-#
+
 def p4_type(f):
+    """Return the raw p4 type of a file (text, text+ko, etc)."""
+
     results = p4CmdList(["fstat", "-T", "headType", wildcard_encode(f)])
     return results[0]['headType']
 
-#
-# Given a type base and modifier, return a regexp matching
-# the keywords that can be expanded in the file
-#
+
 def p4_keywords_regexp_for_type(base, type_mods):
+    """Given a type base and modifier, return a regexp matching the keywords
+       that can be expanded in the file.
+       """
+
     if base in ("text", "unicode", "binary"):
         if "ko" in type_mods:
             return re_ko_keywords
@@ -539,21 +667,23 @@ def p4_keywords_regexp_for_type(base, type_mods):
     else:
         return None
 
-#
-# Given a file, return a regexp matching the possible
-# RCS keywords that will be expanded, or None for files
-# with kw expansion turned off.
-#
+
 def p4_keywords_regexp_for_file(file):
+    """Given a file, return a regexp matching the possible RCS keywords that
+       will be expanded, or None for files with kw expansion turned off.
+       """
+
     if not os.path.exists(file):
         return None
     else:
-        (type_base, type_mods) = split_p4_type(p4_type(file))
+        type_base, type_mods = split_p4_type(p4_type(file))
         return p4_keywords_regexp_for_type(type_base, type_mods)
 
+
 def setP4ExecBit(file, mode):
-    # Reopens an already open file and changes the execute bit to match
-    # the execute bit setting in the passed in mode.
+    """Reopens an already open file and changes the execute bit to match the
+       execute bit setting in the passed in mode.
+       """
 
     p4Type = "+x"
 
@@ -566,8 +696,9 @@ def setP4ExecBit(file, mode):
 
     p4_reopen(p4Type, file)
 
+
 def getP4OpenedType(file):
-    # Returns the perforce file type for the given file.
+    """Returns the perforce file type for the given file."""
 
     result = p4_read_pipe(["opened", wildcard_encode(file)])
     match = re.match(".*\((.+)\)( \*exclusive\*)?\r?$", result)
@@ -576,8 +707,10 @@ def getP4OpenedType(file):
     else:
         die("Could not determine file type for %s (result: '%s')" % (file, result))
 
-# Return the set of all p4 labels
+
 def getP4Labels(depotPaths):
+    """Return the set of all p4 labels."""
+
     labels = set()
     if not isinstance(depotPaths, list):
         depotPaths = [depotPaths]
@@ -588,34 +721,39 @@ def getP4Labels(depotPaths):
 
     return labels
 
-# Return the set of all git tags
+
 def getGitTags():
+    """Return the set of all git tags."""
+
     gitTags = set()
     for line in read_pipe_lines(["git", "tag"]):
         tag = line.strip()
         gitTags.add(tag)
     return gitTags
 
+
 _diff_tree_pattern = None
 
+
 def parseDiffTreeEntry(entry):
     """Parses a single diff tree entry into its component elements.
 
-    See git-diff-tree(1) manpage for details about the format of the diff
-    output. This method returns a dictionary with the following elements:
-
-    src_mode - The mode of the source file
-    dst_mode - The mode of the destination file
-    src_sha1 - The sha1 for the source file
-    dst_sha1 - The sha1 fr the destination file
-    status - The one letter status of the diff (i.e. 'A', 'M', 'D', etc)
-    status_score - The score for the status (applicable for 'C' and 'R'
-                   statuses). This is None if there is no score.
-    src - The path for the source file.
-    dst - The path for the destination file. This is only present for
-          copy or renames. If it is not present, this is None.
-
-    If the pattern is not matched, None is returned."""
+       See git-diff-tree(1) manpage for details about the format of the diff
+       output. This method returns a dictionary with the following elements:
+
+       src_mode - The mode of the source file
+       dst_mode - The mode of the destination file
+       src_sha1 - The sha1 for the source file
+       dst_sha1 - The sha1 fr the destination file
+       status - The one letter status of the diff (i.e. 'A', 'M', 'D', etc)
+       status_score - The score for the status (applicable for 'C' and 'R'
+                      statuses). This is None if there is no score.
+       src - The path for the source file.
+       dst - The path for the destination file. This is only present for
+             copy or renames. If it is not present, this is None.
+
+       If the pattern is not matched, None is returned.
+       """
 
     global _diff_tree_pattern
     if not _diff_tree_pattern:
@@ -635,41 +773,91 @@ def parseDiffTreeEntry(entry):
         }
     return None
 
+
 def isModeExec(mode):
-    # Returns True if the given git mode represents an executable file,
-    # otherwise False.
+    """Returns True if the given git mode represents an executable file,
+       otherwise False.
+       """
     return mode[-3:] == "755"
 
+
 class P4Exception(Exception):
-    """ Base class for exceptions from the p4 client """
+    """Base class for exceptions from the p4 client."""
+
     def __init__(self, exit_code):
         self.p4ExitCode = exit_code
 
+
 class P4ServerException(P4Exception):
-    """ Base class for exceptions where we get some kind of marshalled up result from the server """
+    """Base class for exceptions where we get some kind of marshalled up result
+       from the server.
+       """
+
     def __init__(self, exit_code, p4_result):
         super(P4ServerException, self).__init__(exit_code)
         self.p4_result = p4_result
         self.code = p4_result[0]['code']
         self.data = p4_result[0]['data']
 
+
 class P4RequestSizeException(P4ServerException):
-    """ One of the maxresults or maxscanrows errors """
+    """One of the maxresults or maxscanrows errors."""
+
     def __init__(self, exit_code, p4_result, limit):
         super(P4RequestSizeException, self).__init__(exit_code, p4_result)
         self.limit = limit
 
+
 class P4CommandException(P4Exception):
-    """ Something went wrong calling p4 which means we have to give up """
+    """Something went wrong calling p4 which means we have to give up."""
+
     def __init__(self, msg):
         self.msg = msg
 
     def __str__(self):
         return self.msg
 
+
 def isModeExecChanged(src_mode, dst_mode):
     return isModeExec(src_mode) != isModeExec(dst_mode)
 
+
+def p4KeysContainingNonUtf8Chars():
+    """Returns all keys which may contain non UTF-8 encoded strings
+       for which a fallback strategy has to be applied.
+       """
+    return ['desc', 'client', 'FullName']
+
+
+def p4KeysContainingBinaryData():
+    """Returns all keys which may contain arbitrary binary data
+       """
+    return ['data']
+
+
+def p4KeyContainsFilePaths(key):
+    """Returns True if the key contains file paths. These are handled by decode_path().
+       Otherwise False.
+       """
+    return key.startswith('depotFile') or key in ['path', 'clientFile']
+
+
+def p4KeyWhichCanBeDirectlyDecoded(key):
+    """Returns True if the key can be directly decoded as UTF-8 string
+       Otherwise False.
+
+       Keys which can not be encoded directly:
+         - `data` which may contain arbitrary binary data
+         - `desc` or `client` or `FullName` which may contain non-UTF8 encoded text
+         - `depotFile[0-9]*`, `path`, or `clientFile` which may contain non-UTF8 encoded text, handled by decode_path()
+       """
+    if key in p4KeysContainingNonUtf8Chars() or \
+       key in p4KeysContainingBinaryData() or  \
+       p4KeyContainsFilePaths(key):
+        return False
+    return True
+
+
 def p4CmdList(cmd, stdin=None, stdin_mode='w+b', cb=None, skip_info=False,
         errors_as_exceptions=False, *k, **kw):
 
@@ -699,14 +887,13 @@ def p4CmdList(cmd, stdin=None, stdin_mode='w+b', cb=None, skip_info=False,
     try:
         while True:
             entry = marshal.load(p4.stdout)
+
             if bytes is not str:
-                # Decode unmarshalled dict to use str keys and values, except for:
-                #   - `data` which may contain arbitrary binary data
-                #   - `depotFile[0-9]*`, `path`, or `clientFile` which may contain non-UTF8 encoded text
+                # Decode unmarshalled dict to use str keys and values. Special cases are handled below.
                 decoded_entry = {}
                 for key, value in entry.items():
                     key = key.decode()
-                    if isinstance(value, bytes) and not (key in ('data', 'path', 'clientFile') or key.startswith('depotFile')):
+                    if isinstance(value, bytes) and p4KeyWhichCanBeDirectlyDecoded(key):
                         value = value.decode()
                     decoded_entry[key] = value
                 # Parse out data if it's an error response
@@ -716,6 +903,9 @@ def p4CmdList(cmd, stdin=None, stdin_mode='w+b', cb=None, skip_info=False,
             if skip_info:
                 if 'code' in entry and entry['code'] == 'info':
                     continue
+            for key in p4KeysContainingNonUtf8Chars():
+                if key in entry:
+                    entry[key] = metadata_stream_to_writable_bytes(entry[key])
             if cb is not None:
                 cb(entry)
             else:
@@ -746,12 +936,14 @@ def p4CmdList(cmd, stdin=None, stdin_mode='w+b', cb=None, skip_info=False,
 
     return result
 
+
 def p4Cmd(cmd, *k, **kw):
     list = p4CmdList(cmd, *k, **kw)
     result = {}
     for entry in list:
         result.update(entry)
-    return result;
+    return result
+
 
 def p4Where(depotPath):
     if not depotPath.endswith("/"):
@@ -773,7 +965,7 @@ def p4Where(depotPath):
             if data[:space] == depotPath:
                 output = entry
                 break
-    if output == None:
+    if output is None:
         return ""
     if output["code"] == "error":
         return ""
@@ -789,48 +981,54 @@ def p4Where(depotPath):
         clientPath = clientPath[:-3]
     return clientPath
 
+
 def currentGitBranch():
     return read_pipe_text(["git", "symbolic-ref", "--short", "-q", "HEAD"])
 
+
 def isValidGitDir(path):
-    return git_dir(path) != None
+    return git_dir(path) is not None
+
 
 def parseRevision(ref):
     return read_pipe(["git", "rev-parse", ref]).strip()
 
+
 def branchExists(ref):
     rev = read_pipe(["git", "rev-parse", "-q", "--verify", ref],
                      ignore_error=True)
     return len(rev) > 0
 
+
 def extractLogMessageFromGitCommit(commit):
     logMessage = ""
 
-    ## fixme: title is first line of commit, not 1st paragraph.
+    # fixme: title is first line of commit, not 1st paragraph.
     foundTitle = False
     for log in read_pipe_lines(["git", "cat-file", "commit", commit]):
-       if not foundTitle:
-           if len(log) == 1:
-               foundTitle = True
-           continue
+        if not foundTitle:
+            if len(log) == 1:
+                foundTitle = True
+            continue
 
-       logMessage += log
+        logMessage += log
     return logMessage
 
+
 def extractSettingsGitLog(log):
     values = {}
     for line in log.split("\n"):
         line = line.strip()
-        m = re.search (r"^ *\[git-p4: (.*)\]$", line)
+        m = re.search(r"^ *\[git-p4: (.*)\]$", line)
         if not m:
             continue
 
-        assignments = m.group(1).split (':')
+        assignments = m.group(1).split(':')
         for a in assignments:
-            vals = a.split ('=')
+            vals = a.split('=')
             key = vals[0].strip()
-            val = ('='.join (vals[1:])).strip()
-            if val.endswith ('\"') and val.startswith('"'):
+            val = ('='.join(vals[1:])).strip()
+            if val.endswith('\"') and val.startswith('"'):
                 val = val[1:-1]
 
             values[key] = val
@@ -842,41 +1040,49 @@ def extractSettingsGitLog(log):
         values['depot-paths'] = paths.split(',')
     return values
 
+
 def gitBranchExists(branch):
     proc = subprocess.Popen(["git", "rev-parse", branch],
-                            stderr=subprocess.PIPE, stdout=subprocess.PIPE);
-    return proc.wait() == 0;
+                            stderr=subprocess.PIPE, stdout=subprocess.PIPE)
+    return proc.wait() == 0
+
 
 def gitUpdateRef(ref, newvalue):
     subprocess.check_call(["git", "update-ref", ref, newvalue])
 
+
 def gitDeleteRef(ref):
     subprocess.check_call(["git", "update-ref", "-d", ref])
 
+
 _gitConfig = {}
 
+
 def gitConfig(key, typeSpecifier=None):
     if key not in _gitConfig:
-        cmd = [ "git", "config" ]
+        cmd = ["git", "config"]
         if typeSpecifier:
-            cmd += [ typeSpecifier ]
-        cmd += [ key ]
+            cmd += [typeSpecifier]
+        cmd += [key]
         s = read_pipe(cmd, ignore_error=True)
         _gitConfig[key] = s.strip()
     return _gitConfig[key]
 
+
 def gitConfigBool(key):
     """Return a bool, using git config --bool.  It is True only if the
        variable is set to true, and False if set to false or not present
-       in the config."""
+       in the config.
+       """
 
     if key not in _gitConfig:
         _gitConfig[key] = gitConfig(key, '--bool') == "true"
     return _gitConfig[key]
 
+
 def gitConfigInt(key):
     if key not in _gitConfig:
-        cmd = [ "git", "config", "--int", key ]
+        cmd = ["git", "config", "--int", key]
         s = read_pipe(cmd, ignore_error=True)
         v = s.strip()
         try:
@@ -885,6 +1091,7 @@ def gitConfigInt(key):
             _gitConfig[key] = None
     return _gitConfig[key]
 
+
 def gitConfigList(key):
     if key not in _gitConfig:
         s = read_pipe(["git", "config", "--get-all", key], ignore_error=True)
@@ -893,12 +1100,43 @@ def gitConfigList(key):
             _gitConfig[key] = []
     return _gitConfig[key]
 
+def fullP4Ref(incomingRef, importIntoRemotes=True):
+    """Standardize a given provided p4 ref value to a full git ref:
+         refs/foo/bar/branch -> use it exactly
+         p4/branch -> prepend refs/remotes/ or refs/heads/
+         branch -> prepend refs/remotes/p4/ or refs/heads/p4/"""
+    if incomingRef.startswith("refs/"):
+        return incomingRef
+    if importIntoRemotes:
+        prepend = "refs/remotes/"
+    else:
+        prepend = "refs/heads/"
+    if not incomingRef.startswith("p4/"):
+        prepend += "p4/"
+    return prepend + incomingRef
+
+def shortP4Ref(incomingRef, importIntoRemotes=True):
+    """Standardize to a "short ref" if possible:
+         refs/foo/bar/branch -> ignore
+         refs/remotes/p4/branch or refs/heads/p4/branch -> shorten
+         p4/branch -> shorten"""
+    if importIntoRemotes:
+        longprefix = "refs/remotes/p4/"
+    else:
+        longprefix = "refs/heads/p4/"
+    if incomingRef.startswith(longprefix):
+        return incomingRef[len(longprefix):]
+    if incomingRef.startswith("p4/"):
+        return incomingRef[3:]
+    return incomingRef
+
 def p4BranchesInGit(branchesAreInRemotes=True):
     """Find all the branches whose names start with "p4/", looking
        in remotes or heads as specified by the argument.  Return
        a dictionary of { branch: revision } for each one found.
        The branch names are the short names, without any
-       "p4/" prefix."""
+       "p4/" prefix.
+       """
 
     branches = {}
 
@@ -925,10 +1163,11 @@ def p4BranchesInGit(branchesAreInRemotes=True):
 
     return branches
 
+
 def branch_exists(branch):
     """Make sure that the given ref name really exists."""
 
-    cmd = [ "git", "rev-parse", "--symbolic", "--verify", branch ]
+    cmd = ["git", "rev-parse", "--symbolic", "--verify", branch]
     p = subprocess.Popen(cmd, stdout=subprocess.PIPE, stderr=subprocess.PIPE)
     out, _ = p.communicate()
     out = decode_text_stream(out)
@@ -937,7 +1176,8 @@ def branch_exists(branch):
     # expect exactly one line of output: the branch name
     return out.rstrip() == branch
 
-def findUpstreamBranchPoint(head = "HEAD"):
+
+def findUpstreamBranchPoint(head="HEAD"):
     branches = p4BranchesInGit()
     # map from depot-path to branch name
     branchByDepotPath = {}
@@ -946,8 +1186,12 @@ def findUpstreamBranchPoint(head = "HEAD"):
         log = extractLogMessageFromGitCommit(tip)
         settings = extractSettingsGitLog(log)
         if "depot-paths" in settings:
+            git_branch = "remotes/p4/" + branch
             paths = ",".join(settings["depot-paths"])
-            branchByDepotPath[paths] = "remotes/p4/" + branch
+            branchByDepotPath[paths] = git_branch
+            if "change" in settings:
+                paths = paths + ";" + settings["change"]
+                branchByDepotPath[paths] = git_branch
 
     settings = None
     parent = 0
@@ -957,6 +1201,10 @@ def findUpstreamBranchPoint(head = "HEAD"):
         settings = extractSettingsGitLog(log)
         if "depot-paths" in settings:
             paths = ",".join(settings["depot-paths"])
+            if "change" in settings:
+                expaths = paths + ";" + settings["change"]
+                if expaths in branchByDepotPath:
+                    return [branchByDepotPath[expaths], settings]
             if paths in branchByDepotPath:
                 return [branchByDepotPath[paths], settings]
 
@@ -964,7 +1212,8 @@ def findUpstreamBranchPoint(head = "HEAD"):
 
     return ["", settings]
 
-def createOrUpdateBranchesFromOrigin(localRefPrefix = "refs/remotes/p4/", silent=True):
+
+def createOrUpdateBranchesFromOrigin(localRefPrefix="refs/remotes/p4/", silent=True):
     if not silent:
         print("Creating/updating branch(es) in %s based on origin branch(es)"
                % localRefPrefix)
@@ -981,8 +1230,7 @@ def createOrUpdateBranchesFromOrigin(localRefPrefix = "refs/remotes/p4/", silent
         originHead = line
 
         original = extractSettingsGitLog(extractLogMessageFromGitCommit(originHead))
-        if ('depot-paths' not in original
-            or 'change' not in original):
+        if 'depot-paths' not in original or 'change' not in original:
             continue
 
         update = False
@@ -1011,8 +1259,9 @@ def createOrUpdateBranchesFromOrigin(localRefPrefix = "refs/remotes/p4/", silent
         if update:
             system(["git", "update-ref", remoteHead, originHead])
 
+
 def originP4BranchesExist():
-        return gitBranchExists("origin") or gitBranchExists("origin/p4") or gitBranchExists("origin/p4/master")
+    return gitBranchExists("origin") or gitBranchExists("origin/p4") or gitBranchExists("origin/p4/master")
 
 
 def p4ParseNumericChangeRange(parts):
@@ -1024,12 +1273,14 @@ def p4ParseNumericChangeRange(parts):
 
     return (changeStart, changeEnd)
 
+
 def chooseBlockSize(blockSize):
     if blockSize:
         return blockSize
     else:
         return defaultBlockSize
 
+
 def p4ChangesForPaths(depotPaths, changeRange, requestedBlockSize):
     assert depotPaths
 
@@ -1047,7 +1298,7 @@ def p4ChangesForPaths(depotPaths, changeRange, requestedBlockSize):
         parts = changeRange.split(',')
         assert len(parts) == 2
         try:
-            (changeStart, changeEnd) = p4ParseNumericChangeRange(parts)
+            changeStart, changeEnd = p4ParseNumericChangeRange(parts)
             block_size = chooseBlockSize(requestedBlockSize)
         except ValueError:
             changeStart = parts[0][1:]
@@ -1085,7 +1336,8 @@ def p4ChangesForPaths(depotPaths, changeRange, requestedBlockSize):
             else:
                 block_size = max(2, block_size // 2)
 
-            if verbose: print("block size error, retrying with block size {0}".format(block_size))
+            if verbose:
+                print("block size error, retrying with block size {0}".format(block_size))
             continue
         except P4Exception as e:
             die('Error retrieving changes description ({0})'.format(e.p4ExitCode))
@@ -1107,21 +1359,25 @@ def p4ChangesForPaths(depotPaths, changeRange, requestedBlockSize):
     changes = sorted(changes)
     return changes
 
+
 def p4PathStartsWith(path, prefix):
-    # This method tries to remedy a potential mixed-case issue:
-    #
-    # If UserA adds  //depot/DirA/file1
-    # and UserB adds //depot/dira/file2
-    #
-    # we may or may not have a problem. If you have core.ignorecase=true,
-    # we treat DirA and dira as the same directory
+    """This method tries to remedy a potential mixed-case issue:
+
+       If UserA adds  //depot/DirA/file1
+       and UserB adds //depot/dira/file2
+
+       we may or may not have a problem. If you have core.ignorecase=true,
+       we treat DirA and dira as the same directory.
+       """
     if gitConfigBool("core.ignorecase"):
         return path.lower().startswith(prefix.lower())
     return path.startswith(prefix)
 
+
 def getClientSpec():
     """Look at the p4 client spec, create a View() object that contains
-       all the mappings, and return it."""
+       all the mappings, and return it.
+       """
 
     specList = p4CmdList(["client", "-o"])
     if len(specList) != 1:
@@ -1135,7 +1391,7 @@ def getClientSpec():
     client_name = entry["Client"]
 
     # just the keys that start with "View"
-    view_keys = [ k for k in entry.keys() if k.startswith("View") ]
+    view_keys = [k for k in entry.keys() if k.startswith("View")]
 
     # hold this new View
     view = View(client_name)
@@ -1149,6 +1405,7 @@ def getClientSpec():
 
     return view
 
+
 def getClientRoot():
     """Grab the client directory."""
 
@@ -1162,12 +1419,15 @@ def getClientRoot():
 
     return entry["Root"]
 
-#
-# P4 wildcards are not allowed in filenames.  P4 complains
-# if you simply add them, but you can force it with "-f", in
-# which case it translates them into %xx encoding internally.
-#
+
 def wildcard_decode(path):
+    """Decode P4 wildcards into %xx encoding
+
+       P4 wildcards are not allowed in filenames.  P4 complains if you simply
+       add them, but you can force it with "-f", in which case it translates
+       them into %xx encoding internally.
+       """
+
     # Search for and fix just these four characters.  Do % last so
     # that fixing it does not inadvertently create new %-escapes.
     # Cannot have * in a filename in windows; untested as to
@@ -1179,7 +1439,10 @@ def wildcard_decode(path):
                .replace("%25", "%")
     return path
 
+
 def wildcard_encode(path):
+    """Encode %xx coded wildcards into P4 coding."""
+
     # do % first to avoid double-encoding the %s introduced here
     path = path.replace("%", "%25") \
                .replace("*", "%2A") \
@@ -1187,10 +1450,12 @@ def wildcard_encode(path):
                .replace("@", "%40")
     return path
 
+
 def wildcard_present(path):
     m = re.search("[*#@%]", path)
     return m is not None
 
+
 class LargeFileSystem(object):
     """Base class for large file system support."""
 
@@ -1199,13 +1464,15 @@ class LargeFileSystem(object):
         self.writeToGitStream = writeToGitStream
 
     def generatePointer(self, cloneDestination, contentFile):
-        """Return the content of a pointer file that is stored in Git instead of
-           the actual content."""
+        """Return the content of a pointer file that is stored in Git instead
+           of the actual content.
+           """
         assert False, "Method 'generatePointer' required in " + self.__class__.__name__
 
     def pushFile(self, localLargeFile):
         """Push the actual content which is not stored in the Git repository to
-           a server."""
+           a server.
+           """
         assert False, "Method 'pushFile' required in " + self.__class__.__name__
 
     def hasLargeFileExtension(self, relPath):
@@ -1253,10 +1520,11 @@ class LargeFileSystem(object):
     def processContent(self, git_mode, relPath, contents):
         """Processes the content of git fast import. This method decides if a
            file is stored in the large file system and handles all necessary
-           steps."""
+           steps.
+           """
         if self.exceedsLargeFileThreshold(relPath, contents) or self.hasLargeFileExtension(relPath):
             contentTempFile = self.generateTempFile(contents)
-            (pointer_git_mode, contents, localLargeFile) = self.generatePointer(contentTempFile)
+            pointer_git_mode, contents, localLargeFile = self.generatePointer(contentTempFile)
             if pointer_git_mode:
                 git_mode = pointer_git_mode
             if localLargeFile:
@@ -1272,12 +1540,14 @@ class LargeFileSystem(object):
                     sys.stderr.write("%s moved to large file system (%s)\n" % (relPath, localLargeFile))
         return (git_mode, contents)
 
+
 class MockLFS(LargeFileSystem):
     """Mock large file system for testing."""
 
     def generatePointer(self, contentFile):
         """The pointer content is the original content prefixed with "pointer-".
-           The local filename of the large file storage is derived from the file content.
+           The local filename of the large file storage is derived from the
+           file content.
            """
         with open(contentFile, 'r') as f:
             content = next(f)
@@ -1287,17 +1557,19 @@ class MockLFS(LargeFileSystem):
             return (gitMode, pointerContents, localLargeFile)
 
     def pushFile(self, localLargeFile):
-        """The remote filename of the large file storage is the same as the local
-           one but in a different directory.
+        """The remote filename of the large file storage is the same as the
+           local one but in a different directory.
            """
         remotePath = os.path.join(os.path.dirname(localLargeFile), '..', 'remote')
         if not os.path.exists(remotePath):
             os.makedirs(remotePath)
         shutil.copyfile(localLargeFile, os.path.join(remotePath, os.path.basename(localLargeFile)))
 
+
 class GitLFS(LargeFileSystem):
     """Git LFS as backend for the git-p4 large file system.
-       See https://git-lfs.github.com/ for details."""
+       See https://git-lfs.github.com/ for details.
+       """
 
     def __init__(self, *args):
         LargeFileSystem.__init__(self, *args)
@@ -1383,9 +1655,10 @@ class GitLFS(LargeFileSystem):
         else:
             return LargeFileSystem.processContent(self, git_mode, relPath, contents)
 
+
 class Command:
-    delete_actions = ( "delete", "move/delete", "purge" )
-    add_actions = ( "add", "branch", "move/add" )
+    delete_actions = ("delete", "move/delete", "purge")
+    add_actions = ("add", "branch", "move/add")
 
     def __init__(self):
         self.usage = "usage: %prog [options]"
@@ -1398,6 +1671,7 @@ class Command:
             setattr(self, attr, value)
         return getattr(self, attr)
 
+
 class P4UserMap:
     def __init__(self):
         self.userMapFromPerforceServer = False
@@ -1415,7 +1689,7 @@ class P4UserMap:
         die("Could not find your p4 user id")
 
     def p4UserIsMe(self, p4User):
-        # return True if the given p4 user is actually me
+        """Return True if the given p4 user is actually me."""
         me = self.p4UserId()
         if not p4User or p4User != me:
             return False
@@ -1435,7 +1709,13 @@ class P4UserMap:
         for output in p4CmdList(["users"]):
             if "User" not in output:
                 continue
-            self.users[output["User"]] = output["FullName"] + " <" + output["Email"] + ">"
+            # "FullName" is bytes. "Email" on the other hand might be bytes
+            # or unicode string depending on whether we are running under
+            # python2 or python3. To support
+            # git-p4.metadataDecodingStrategy=fallback, self.users dict values
+            # are always bytes, ready to be written to git.
+            emailbytes = metadata_stream_to_writable_bytes(output["Email"])
+            self.users[output["User"]] = output["FullName"] + b" <" + emailbytes + b">"
             self.emails[output["Email"]] = output["User"]
 
         mapUserConfigRegex = re.compile(r"^\s*(\S+)\s*=\s*(.+)\s*<(\S+)>\s*$", re.VERBOSE)
@@ -1445,29 +1725,32 @@ class P4UserMap:
                 user = mapUser[0][0]
                 fullname = mapUser[0][1]
                 email = mapUser[0][2]
-                self.users[user] = fullname + " <" + email + ">"
+                fulluser = fullname + " <" + email + ">"
+                self.users[user] = metadata_stream_to_writable_bytes(fulluser)
                 self.emails[email] = user
 
-        s = ''
+        s = b''
         for (key, val) in self.users.items():
-            s += "%s\t%s\n" % (key.expandtabs(1), val.expandtabs(1))
+            keybytes = metadata_stream_to_writable_bytes(key)
+            s += b"%s\t%s\n" % (keybytes.expandtabs(1), val.expandtabs(1))
 
-        open(self.getUserCacheFilename(), 'w').write(s)
+        open(self.getUserCacheFilename(), 'wb').write(s)
         self.userMapFromPerforceServer = True
 
     def loadUserMapFromCache(self):
         self.users = {}
         self.userMapFromPerforceServer = False
         try:
-            cache = open(self.getUserCacheFilename(), 'r')
+            cache = open(self.getUserCacheFilename(), 'rb')
             lines = cache.readlines()
             cache.close()
             for line in lines:
-                entry = line.strip().split("\t")
-                self.users[entry[0]] = entry[1]
+                entry = line.strip().split(b"\t")
+                self.users[entry[0].decode('utf_8')] = entry[1]
         except IOError:
             self.getUserMapFromPerforceServer()
 
+
 class P4Submit(Command, P4UserMap):
 
     conflict_behavior_choices = ("ask", "skip", "quit")
@@ -1560,20 +1843,20 @@ class P4Submit(Command, P4UserMap):
             die("You have files opened with perforce! Close them before starting the sync.")
 
     def separate_jobs_from_description(self, message):
-        """Extract and return a possible Jobs field in the commit
-           message.  It goes into a separate section in the p4 change
-           specification.
+        """Extract and return a possible Jobs field in the commit message.  It
+           goes into a separate section in the p4 change specification.
 
-           A jobs line starts with "Jobs:" and looks like a new field
-           in a form.  Values are white-space separated on the same
-           line or on following lines that start with a tab.
+           A jobs line starts with "Jobs:" and looks like a new field in a
+           form.  Values are white-space separated on the same line or on
+           following lines that start with a tab.
 
-           This does not parse and extract the full git commit message
-           like a p4 form.  It just sees the Jobs: line as a marker
-           to pass everything from then on directly into the p4 form,
-           but outside the description section.
+           This does not parse and extract the full git commit message like a
+           p4 form.  It just sees the Jobs: line as a marker to pass everything
+           from then on directly into the p4 form, but outside the description
+           section.
 
-           Return a tuple (stripped log message, jobs string)."""
+           Return a tuple (stripped log message, jobs string).
+           """
 
         m = re.search(r'^Jobs:', message, re.MULTILINE)
         if m is None:
@@ -1584,9 +1867,10 @@ class P4Submit(Command, P4UserMap):
         return (stripped_message, jobtext)
 
     def prepareLogMessage(self, template, message, jobs):
-        """Edits the template returned from "p4 change -o" to insert
-           the message in the Description field, and the jobs text in
-           the Jobs field."""
+        """Edits the template returned from "p4 change -o" to insert the
+           message in the Description field, and the jobs text in the Jobs
+           field.
+           """
         result = ""
 
         inDescriptionSection = False
@@ -1616,8 +1900,10 @@ class P4Submit(Command, P4UserMap):
         return result
 
     def patchRCSKeywords(self, file, regexp):
-        # Attempt to zap the RCS keywords in a p4 controlled file matching the given regex
-        (handle, outFileName) = tempfile.mkstemp(dir='.')
+        """Attempt to zap the RCS keywords in a p4 controlled file matching the
+           given regex.
+           """
+        handle, outFileName = tempfile.mkstemp(dir='.')
         try:
             with os.fdopen(handle, "wb") as outFile, open(file, "rb") as inFile:
                 for line in inFile.readlines():
@@ -1633,21 +1919,23 @@ class P4Submit(Command, P4UserMap):
 
         print("Patched up RCS keywords in %s" % file)
 
-    def p4UserForCommit(self,id):
-        # Return the tuple (perforce user,git email) for a given git commit id
+    def p4UserForCommit(self, id):
+        """Return the tuple (perforce user,git email) for a given git commit
+           id.
+           """
         self.getUserMapFromPerforceServer()
         gitEmail = read_pipe(["git", "log", "--max-count=1",
                               "--format=%ae", id])
         gitEmail = gitEmail.strip()
         if gitEmail not in self.emails:
-            return (None,gitEmail)
+            return (None, gitEmail)
         else:
-            return (self.emails[gitEmail],gitEmail)
+            return (self.emails[gitEmail], gitEmail)
 
-    def checkValidP4Users(self,commits):
-        # check if any git authors cannot be mapped to p4 users
+    def checkValidP4Users(self, commits):
+        """Check if any git authors cannot be mapped to p4 users."""
         for id in commits:
-            (user,email) = self.p4UserForCommit(id)
+            user, email = self.p4UserForCommit(id)
             if not user:
                 msg = "Cannot find p4 user for email %s in commit %s." % (email, id)
                 if gitConfigBool("git-p4.allowMissingP4Users"):
@@ -1656,10 +1944,12 @@ class P4Submit(Command, P4UserMap):
                     die("Error: %s\nSet git-p4.allowMissingP4Users to true to allow this." % msg)
 
     def lastP4Changelist(self):
-        # Get back the last changelist number submitted in this client spec. This
-        # then gets used to patch up the username in the change. If the same
-        # client spec is being used by multiple processes then this might go
-        # wrong.
+        """Get back the last changelist number submitted in this client spec.
+
+           This then gets used to patch up the username in the change. If the
+           same client spec is being used by multiple processes then this might
+           go wrong.
+           """
         results = p4CmdList(["client", "-o"])        # find the current client
         client = None
         for r in results:
@@ -1675,14 +1965,16 @@ class P4Submit(Command, P4UserMap):
         die("Could not get changelist number for last submit - cannot patch up user details")
 
     def modifyChangelistUser(self, changelist, newUser):
-        # fixup the user field of a changelist after it has been submitted.
+        """Fixup the user field of a changelist after it has been submitted."""
         changes = p4CmdList(["change", "-o", changelist])
         if len(changes) != 1:
             die("Bad output from p4 change modifying %s to user %s" %
                 (changelist, newUser))
 
         c = changes[0]
-        if c['User'] == newUser: return   # nothing to do
+        if c['User'] == newUser:
+            # Nothing to do
+            return
         c['User'] = newUser
         # p4 does not understand format version 3 and above
         input = marshal.dumps(c, 2)
@@ -1698,8 +1990,9 @@ class P4Submit(Command, P4UserMap):
         die("Could not modify user field of changelist %s to %s" % (changelist, newUser))
 
     def canChangeChangelists(self):
-        # check to see if we have p4 admin or super-user permissions, either of
-        # which are required to modify changelists.
+        """Check to see if we have p4 admin or super-user permissions, either
+           of which are required to modify changelists.
+           """
         results = p4CmdList(["protects", self.depotPath])
         for r in results:
             if 'perm' in r:
@@ -1711,13 +2004,15 @@ class P4Submit(Command, P4UserMap):
 
     def prepareSubmitTemplate(self, changelist=None):
         """Run "p4 change -o" to grab a change specification template.
+
            This does not use "p4 -G", as it is nice to keep the submission
            template in original order, since a human might edit it.
 
            Remove lines in the Files section that show changes to files
-           outside the depot path we're committing into."""
+           outside the depot path we're committing into.
+           """
 
-        [upstream, settings] = findUpstreamBranchPoint()
+        upstream, settings = findUpstreamBranchPoint()
 
         template = """\
 # A Perforce Change Specification.
@@ -1778,8 +2073,10 @@ class P4Submit(Command, P4UserMap):
         return template
 
     def edit_template(self, template_file):
-        """Invoke the editor to let the user change the submission
-           message.  Return true if okay to continue with the submit."""
+        """Invoke the editor to let the user change the submission message.
+
+           Return true if okay to continue with the submit.
+           """
 
         # if configured to skip the editing part, just submit
         if gitConfigBool("git-p4.skipSubmitEdit"):
@@ -1838,7 +2135,9 @@ class P4Submit(Command, P4UserMap):
                     for line in f.readlines():
                         newdiff += "+" + line
                 except UnicodeDecodeError:
-                    pass # Found non-text data and skip, since diff description should only include text
+                    # Found non-text data and skip, since diff description
+                    # should only include text
+                    pass
                 f.close()
 
         return (diff + newdiff).replace('\r\n', '\n')
@@ -1849,7 +2148,7 @@ class P4Submit(Command, P4UserMap):
         print("Applying", read_pipe(["git", "show", "-s",
                                      "--format=format:%h %s", id]))
 
-        (p4User, gitEmail) = self.p4UserForCommit(id)
+        p4User, gitEmail = self.p4UserForCommit(id)
 
         diff = read_pipe_lines(
             ["git", "diff-tree", "-r"] + self.diffOpts + ["{}^".format(id), id])
@@ -1956,8 +2255,8 @@ class P4Submit(Command, P4UserMap):
                     if regexp:
                         # this file is a possibility...look for RCS keywords.
                         for line in read_pipe_lines(
-                            ["git", "diff", "%s^..%s" % (id, id), file],
-                            raw=True):
+                                ["git", "diff", "%s^..%s" % (id, id), file],
+                                raw=True):
                             if regexp.search(line):
                                 if verbose:
                                     print("got keyword match on %s in %s in %s" % (regex.pattern, line, file))
@@ -2014,13 +2313,13 @@ class P4Submit(Command, P4UserMap):
         #
         logMessage = extractLogMessageFromGitCommit(id)
         logMessage = logMessage.strip()
-        (logMessage, jobs) = self.separate_jobs_from_description(logMessage)
+        logMessage, jobs = self.separate_jobs_from_description(logMessage)
 
         template = self.prepareSubmitTemplate(update_shelve)
         submitTemplate = self.prepareLogMessage(template, logMessage, jobs)
 
         if self.preserveUser:
-           submitTemplate += "\n######## Actual user %s, modified after commit\n" % p4User
+            submitTemplate += "\n######## Actual user %s, modified after commit\n" % p4User
 
         if self.checkAuthorship and not self.p4UserIsMe(p4User):
             submitTemplate += "######## git author %s does not match your p4 account.\n" % gitEmail
@@ -2032,7 +2331,7 @@ class P4Submit(Command, P4UserMap):
             submitTemplate += separatorLine
             submitTemplate += self.get_diff_description(editedFiles, filesToAdd, symlinks)
 
-        (handle, fileName) = tempfile.mkstemp()
+        handle, fileName = tempfile.mkstemp()
         tmpFile = os.fdopen(handle, "w+b")
         if self.isWindows:
             submitTemplate = submitTemplate.replace("\n", "\r\n")
@@ -2059,13 +2358,13 @@ class P4Submit(Command, P4UserMap):
                 print("  " + self.clientPath)
                 print("")
                 print("To submit, use \"p4 submit\" to write a new description,")
-                print("or \"p4 submit -i <%s\" to use the one prepared by" \
+                print("or \"p4 submit -i <%s\" to use the one prepared by"
                       " \"git p4\"." % fileName)
                 print("You can delete the file \"%s\" when finished." % fileName)
 
                 if self.preserveUser and p4User and not self.p4UserIsMe(p4User):
-                    print("To preserve change ownership by user %s, you must\n" \
-                          "do \"p4 change -f <change>\" after submitting and\n" \
+                    print("To preserve change ownership by user %s, you must\n"
+                          "do \"p4 change -f <change>\" after submitting and\n"
                           "edit the User field.")
                 if pureRenameCopy:
                     print("After submitting, renamed files must be re-synced.")
@@ -2133,9 +2432,9 @@ class P4Submit(Command, P4UserMap):
             # Revert changes if we skip this patch
             if not submitted or self.shelve:
                 if self.shelve:
-                    print ("Reverting shelved files.")
+                    print("Reverting shelved files.")
                 else:
-                    print ("Submission cancelled, undoing p4 changes.")
+                    print("Submission cancelled, undoing p4 changes.")
                 sys.stdout.flush()
                 for f in editedFiles | filesToDelete:
                     p4_revert(f)
@@ -2147,9 +2446,11 @@ class P4Submit(Command, P4UserMap):
                 os.remove(fileName)
         return submitted
 
-    # Export git tags as p4 labels. Create a p4 label and then tag
-    # with that.
     def exportGitTags(self, gitTags):
+        """Export git tags as p4 labels. Create a p4 label and then tag with
+           that.
+           """
+
         validLabelRegexp = gitConfig("git-p4.labelExportRegexp")
         if len(validLabelRegexp) == 0:
             validLabelRegexp = defaultLabelRegexp
@@ -2195,7 +2496,7 @@ class P4Submit(Command, P4UserMap):
             # Create the label - use the same view as the client spec we are using
             clientSpec = getClientSpec()
 
-            labelTemplate  = "Label: %s\n" % name
+            labelTemplate = "Label: %s\n" % name
             labelTemplate += "Description:\n"
             for b in body:
                 labelTemplate += "\t" + b + "\n"
@@ -2206,7 +2507,7 @@ class P4Submit(Command, P4UserMap):
             if self.dry_run:
                 print("Would create p4 label %s for tag" % name)
             elif self.prepare_p4_only:
-                print("Not creating p4 label %s for tag due to option" \
+                print("Not creating p4 label %s for tag due to option"
                       " --prepare-p4-only" % name)
             else:
                 p4_write_pipe(["label", "-i"], labelTemplate)
@@ -2237,7 +2538,7 @@ class P4Submit(Command, P4UserMap):
             if len(allowSubmit) > 0 and not self.master in allowSubmit.split(","):
                 die("%s is not in git-p4.allowSubmit" % self.master)
 
-        [upstream, settings] = findUpstreamBranchPoint()
+        upstream, settings = findUpstreamBranchPoint()
         self.depotPath = settings['depot-paths'][0]
         if len(self.origin) == 0:
             self.origin = upstream
@@ -2371,13 +2672,13 @@ class P4Submit(Command, P4UserMap):
         if not self.no_verify:
             try:
                 if not run_git_hook("p4-pre-submit"):
-                    print("\nThe p4-pre-submit hook failed, aborting the submit.\n\nYou can skip " \
-                        "this pre-submission check by adding\nthe command line option '--no-verify', " \
+                    print("\nThe p4-pre-submit hook failed, aborting the submit.\n\nYou can skip "
+                        "this pre-submission check by adding\nthe command line option '--no-verify', "
                         "however,\nthis will also skip the p4-changelist hook as well.")
                     sys.exit(1)
             except Exception as e:
-                print("\nThe p4-pre-submit hook failed, aborting the submit.\n\nThe hook failed "\
-                    "with the error '{0}'".format(e.message) )
+                print("\nThe p4-pre-submit hook failed, aborting the submit.\n\nThe hook failed "
+                    "with the error '{0}'".format(e.message))
                 sys.exit(1)
 
         #
@@ -2399,7 +2700,7 @@ class P4Submit(Command, P4UserMap):
                 applied.append(commit)
                 if self.prepare_p4_only:
                     if i < last:
-                        print("Processing only the first commit due to option" \
+                        print("Processing only the first commit due to option"
                                 " --prepare-p4-only")
                     break
             else:
@@ -2469,13 +2770,15 @@ class P4Submit(Command, P4UserMap):
 
         # exit with error unless everything applied perfectly
         if len(commits) != len(applied):
-                sys.exit(1)
+            sys.exit(1)
 
         return True
 
+
 class View(object):
-    """Represent a p4 view ("p4 help views"), and map files in a
-       repo according to the view."""
+    """Represent a p4 view ("p4 help views"), and map files in a repo according
+       to the view.
+       """
 
     def __init__(self, client_name):
         self.mappings = []
@@ -2484,9 +2787,10 @@ class View(object):
         self.client_spec_path_cache = {}
 
     def append(self, view_line):
-        """Parse a view line, splitting it into depot and client
-           sides.  Append to self.mappings, preserving order.  This
-           is only needed for tag creation."""
+        """Parse a view line, splitting it into depot and client sides.  Append
+           to self.mappings, preserving order.  This is only needed for tag
+           creation.
+           """
 
         # Split the view line into exactly two words.  P4 enforces
         # structure on these lines that simplifies this quite a bit.
@@ -2535,7 +2839,7 @@ class View(object):
         return clientFile[len(self.client_prefix):]
 
     def update_client_spec_path_cache(self, files):
-        """ Caching file paths by "p4 where" batch query """
+        """Caching file paths by "p4 where" batch query."""
 
         # List depot file paths exclude that already cached
         fileArgs = [f['path'] for f in files if decode_path(f['path']) not in self.client_spec_path_cache]
@@ -2567,9 +2871,11 @@ class View(object):
                 self.client_spec_path_cache[depotFile] = b''
 
     def map_in_client(self, depot_path):
-        """Return the relative location in the client where this
-           depot file should live.  Returns "" if the file should
-           not be mapped in the client."""
+        """Return the relative location in the client where this depot file
+           should live.
+
+           Returns "" if the file should not be mapped in the client.
+           """
 
         if gitConfigBool("core.ignorecase"):
             depot_path = depot_path.lower()
@@ -2577,14 +2883,16 @@ class View(object):
         if depot_path in self.client_spec_path_cache:
             return self.client_spec_path_cache[depot_path]
 
-        die( "Error: %s is not found in client spec path" % depot_path )
+        die("Error: %s is not found in client spec path" % depot_path)
         return ""
 
+
 def cloneExcludeCallback(option, opt_str, value, parser):
     # prepend "/" because the first "/" was consumed as part of the option itself.
     # ("-//depot/A/..." becomes "/depot/A/..." after option parsing)
     parser.values.cloneExclude += ["/" + re.sub(r"\.\.\.$", "", value)]
 
+
 class P4Sync(Command, P4UserMap):
 
     def __init__(self):
@@ -2665,8 +2973,8 @@ class P4Sync(Command, P4UserMap):
         self.tz = "%+03d%02d" % (- time.timezone / 3600, ((- time.timezone % 3600) / 60))
         self.labels = {}
 
-    # Force a checkpoint in fast-import and wait for it to finish
     def checkpoint(self):
+        """Force a checkpoint in fast-import and wait for it to finish."""
         self.gitStream.write("checkpoint\n\n")
         self.gitStream.write("progress checkpoint\n\n")
         self.gitStream.flush()
@@ -2687,11 +2995,11 @@ class P4Sync(Command, P4UserMap):
                 return True
         return False
 
-    def extractFilesFromCommit(self, commit, shelved=False, shelved_cl = 0):
+    def extractFilesFromCommit(self, commit, shelved=False, shelved_cl=0):
         files = []
         fnum = 0
         while "depotFile%s" % fnum in commit:
-            path =  commit["depotFile%s" % fnum]
+            path = commit["depotFile%s" % fnum]
             found = self.isPathWanted(decode_path(path))
             if not found:
                 fnum = fnum + 1
@@ -2718,10 +3026,10 @@ class P4Sync(Command, P4UserMap):
         return jobs
 
     def stripRepoPath(self, path, prefixes):
-        """When streaming files, this is called to map a p4 depot path
-           to where it should go in git.  The prefixes are either
-           self.depotPaths, or self.branchPrefixes in the case of
-           branch detection."""
+        """When streaming files, this is called to map a p4 depot path to where
+           it should go in git.  The prefixes are either self.depotPaths, or
+           self.branchPrefixes in the case of branch detection.
+           """
 
         if self.useClientSpec:
             # branch detection moves files up a level (the branch name)
@@ -2750,8 +3058,9 @@ class P4Sync(Command, P4UserMap):
         return path
 
     def splitFilesIntoBranches(self, commit):
-        """Look at each depotFile in the commit to figure out to what
-           branch it belongs."""
+        """Look at each depotFile in the commit to figure out to what branch it
+           belongs.
+           """
 
         if self.clientSpecDirs:
             files = self.extractFilesFromCommit(commit)
@@ -2811,10 +3120,12 @@ class P4Sync(Command, P4UserMap):
                 print('Path with non-ASCII characters detected. Used %s to encode: %s ' % (encoding, path))
         return path
 
-    # output one file from the P4 stream
-    # - helper for streamP4Files
-
     def streamOneP4File(self, file, contents):
+        """Output one file from the P4 stream.
+
+           This is a helper for streamP4Files().
+           """
+
         file_path = file['depotFile']
         relPath = self.stripRepoPath(decode_path(file_path), self.branchPrefixes)
 
@@ -2822,12 +3133,13 @@ class P4Sync(Command, P4UserMap):
             if 'fileSize' in self.stream_file:
                 size = int(self.stream_file['fileSize'])
             else:
-                size = 0 # deleted files don't get a fileSize apparently
+                # Deleted files don't get a fileSize apparently
+                size = 0
             sys.stdout.write('\r%s --> %s (%s)\n' % (
                 file_path, relPath, format_size_human_readable(size)))
             sys.stdout.flush()
 
-        (type_base, type_mods) = split_p4_type(file["type"])
+        type_base, type_mods = split_p4_type(file["type"])
 
         git_mode = "100644"
         if "x" in type_mods:
@@ -2869,8 +3181,8 @@ class P4Sync(Command, P4UserMap):
                     raise e
             else:
                 if p4_version_string().find('/NT') >= 0:
-                    text = text.replace(b'\r\n', b'\n')
-                contents = [ text ]
+                    text = text.replace(b'\x0d\x00\x0a\x00', b'\x0a\x00')
+                contents = [text]
 
         if type_base == "apple":
             # Apple filetype files will be streamed as a concatenation of
@@ -2885,6 +3197,16 @@ class P4Sync(Command, P4UserMap):
             print("\nIgnoring apple filetype file %s" % file['depotFile'])
             return
 
+        if type_base == "utf8":
+            # The type utf8 explicitly means utf8 *with BOM*. These are
+            # streamed just like regular text files, however, without
+            # the BOM in the stream.
+            # Therefore, to accurately import these files into git, we
+            # need to explicitly re-add the BOM before writing.
+            # 'contents' is a set of bytes in this case, so create the
+            # BOM prefix as a b'' literal.
+            contents = [b'\xef\xbb\xbf' + contents[0]] + contents[1:]
+
         # Note that we do not try to de-mangle keywords on utf16 files,
         # even though in theory somebody may want that.
         regexp = p4_keywords_regexp_for_type(type_base, type_mods)
@@ -2892,7 +3214,7 @@ class P4Sync(Command, P4UserMap):
             contents = [regexp.sub(br'$\1$', c) for c in contents]
 
         if self.largeFileSystem:
-            (git_mode, contents) = self.largeFileSystem.processContent(git_mode, relPath, contents)
+            git_mode, contents = self.largeFileSystem.processContent(git_mode, relPath, contents)
 
         self.writeToGitStream(git_mode, relPath, contents)
 
@@ -2906,8 +3228,8 @@ class P4Sync(Command, P4UserMap):
         if self.largeFileSystem and self.largeFileSystem.isLargeFile(relPath):
             self.largeFileSystem.removeLargeFile(relPath)
 
-    # handle another chunk of streaming data
     def streamP4FilesCb(self, marshalled):
+        """Handle another chunk of streaming data."""
 
         # catch p4 errors and complain
         err = None
@@ -2958,9 +3280,9 @@ class P4Sync(Command, P4UserMap):
                 self.stream_file[k] = marshalled[k]
 
         if (verbose and
-            'streamContentSize' in self.stream_file and
-            'fileSize' in self.stream_file and
-            'depotFile' in self.stream_file):
+                'streamContentSize' in self.stream_file and
+                'fileSize' in self.stream_file and
+                'depotFile' in self.stream_file):
             size = int(self.stream_file["fileSize"])
             if size > 0:
                 progress = 100*self.stream_file['streamContentSize']/size
@@ -2971,8 +3293,9 @@ class P4Sync(Command, P4UserMap):
 
         self.stream_have_file_info = True
 
-    # Stream directly from "p4 files" into "git fast-import"
     def streamP4Files(self, files):
+        """Stream directly from "p4 files" into "git fast-import."""
+
         filesForCommit = []
         filesToRead = []
         filesToDelete = []
@@ -3020,12 +3343,14 @@ class P4Sync(Command, P4UserMap):
         if userid in self.users:
             return self.users[userid]
         else:
-            return "%s <a@b>" % userid
+            userid_bytes = metadata_stream_to_writable_bytes(userid)
+            return b"%s <a@b>" % userid_bytes
 
     def streamTag(self, gitStream, labelName, labelDetails, commit, epoch):
-        """ Stream a p4 tag.
-        commit is either a git commit, or a fast-import mark, ":<p4commit>"
-        """
+        """Stream a p4 tag.
+
+           Commit is either a git commit, or a fast-import mark, ":<p4commit>".
+           """
 
         if verbose:
             print("writing tag %s for commit %s" % (labelName, commit))
@@ -3043,11 +3368,12 @@ class P4Sync(Command, P4UserMap):
             email = self.make_email(owner)
         else:
             email = self.make_email(self.p4UserId())
-        tagger = "%s %s %s" % (email, epoch, self.tz)
 
-        gitStream.write("tagger %s\n" % tagger)
+        gitStream.write("tagger ")
+        gitStream.write(email)
+        gitStream.write(" %s %s\n" % (epoch, self.tz))
 
-        print("labelDetails=",labelDetails)
+        print("labelDetails=", labelDetails)
         if 'Description' in labelDetails:
             description = labelDetails['Description']
         else:
@@ -3075,15 +3401,18 @@ class P4Sync(Command, P4UserMap):
         return hasPrefix
 
     def findShadowedFiles(self, files, change):
-        # Perforce allows you commit files and directories with the same name,
-        # so you could have files //depot/foo and //depot/foo/bar both checked
-        # in.  A p4 sync of a repository in this state fails.  Deleting one of
-        # the files recovers the repository.
-        #
-        # Git will not allow the broken state to exist and only the most recent
-        # of the conflicting names is left in the repository.  When one of the
-        # conflicting files is deleted we need to re-add the other one to make
-        # sure the git repository recovers in the same way as perforce.
+        """Perforce allows you commit files and directories with the same name,
+           so you could have files //depot/foo and //depot/foo/bar both checked
+           in.  A p4 sync of a repository in this state fails.  Deleting one of
+           the files recovers the repository.
+
+           Git will not allow the broken state to exist and only the most
+           recent of the conflicting names is left in the repository.  When one
+           of the conflicting files is deleted we need to re-add the other one
+           to make sure the git repository recovers in the same way as
+           perforce.
+           """
+
         deleted = [f for f in files if f['action'] in self.delete_actions]
         to_check = set()
         for f in deleted:
@@ -3110,7 +3439,7 @@ class P4Sync(Command, P4UserMap):
                     'rev': record['headRev'],
                     'type': record['headType']})
 
-    def commit(self, details, files, branch, parent = "", allow_empty=False):
+    def commit(self, details, files, branch, parent="", allow_empty=False):
         epoch = details["time"]
         author = details["user"]
         jobs = self.extractJobsFromCommit(details)
@@ -3138,12 +3467,12 @@ class P4Sync(Command, P4UserMap):
         self.gitStream.write("commit %s\n" % branch)
         self.gitStream.write("mark :%s\n" % details["change"])
         self.committedChanges.add(int(details["change"]))
-        committer = ""
         if author not in self.users:
             self.getUserMapFromPerforceServer()
-        committer = "%s %s %s" % (self.make_email(author), epoch, self.tz)
 
-        self.gitStream.write("committer %s\n" % committer)
+        self.gitStream.write("committer ")
+        self.gitStream.write(self.make_email(author))
+        self.gitStream.write(" %s %s\n" % (epoch, self.tz))
 
         self.gitStream.write("data <<EOT\n")
         self.gitStream.write(details["desc"])
@@ -3200,8 +3529,11 @@ class P4Sync(Command, P4UserMap):
                     print("Tag %s does not match with change %s: file count is different."
                            % (labelDetails["label"], change))
 
-    # Build a dictionary of changelists and labels, for "detect-labels" option.
     def getLabels(self):
+        """Build a dictionary of changelists and labels, for "detect-labels"
+           option.
+           """
+
         self.labels = {}
 
         l = p4CmdList(["labels"] + ["%s..." % p for p in self.depotPaths])
@@ -3227,11 +3559,12 @@ class P4Sync(Command, P4UserMap):
         if self.verbose:
             print("Label changes: %s" % self.labels.keys())
 
-    # Import p4 labels as git tags. A direct mapping does not
-    # exist, so assume that if all the files are at the same revision
-    # then we can use that, or it's something more complicated we should
-    # just ignore.
     def importP4Labels(self, stream, p4Labels):
+        """Import p4 labels as git tags. A direct mapping does not exist, so
+           assume that if all the files are at the same revision then we can
+           use that, or it's something more complicated we should just ignore.
+           """
+
         if verbose:
             print("import p4 labels: " + ' '.join(p4Labels))
 
@@ -3246,7 +3579,7 @@ class P4Sync(Command, P4UserMap):
 
             if not m.match(name):
                 if verbose:
-                    print("label %s does not match regexp %s" % (name,validLabelRegexp))
+                    print("label %s does not match regexp %s" % (name, validLabelRegexp))
                 continue
 
             if name in ignoredP4Labels:
@@ -3302,7 +3635,7 @@ class P4Sync(Command, P4UserMap):
                 p = p[:-1]
             p = p[p.strip().rfind("/") + 1:]
             if not p.endswith("/"):
-               p += "/"
+                p += "/"
             return p
 
     def getBranchMapping(self):
@@ -3322,7 +3655,7 @@ class P4Sync(Command, P4UserMap):
                     continue
                 source = paths[0]
                 destination = paths[1]
-                ## HACK
+                # HACK
                 if p4PathStartsWith(source, self.depotPaths[0]) and p4PathStartsWith(destination, self.depotPaths[0]):
                     source = source[len(self.depotPaths[0]):-4]
                     destination = destination[len(self.depotPaths[0]):-4]
@@ -3351,7 +3684,7 @@ class P4Sync(Command, P4UserMap):
         configBranches = gitConfigList("git-p4.branchList")
         for branch in configBranches:
             if branch:
-                (source, destination) = branch.split(":")
+                source, destination = branch.split(":")
                 self.knownBranches[destination] = source
 
                 lostAndFoundBranches.discard(destination)
@@ -3359,7 +3692,6 @@ class P4Sync(Command, P4UserMap):
                 if source not in self.knownBranches:
                     lostAndFoundBranches.add(source)
 
-
         for branch in lostAndFoundBranches:
             self.knownBranches[branch] = branch
 
@@ -3431,27 +3763,22 @@ class P4Sync(Command, P4UserMap):
     def importNewBranch(self, branch, maxChange):
         # make fast-import flush all changes to disk and update the refs using the checkpoint
         # command so that we can try to find the branch parent in the git history
-        self.gitStream.write("checkpoint\n\n");
-        self.gitStream.flush();
+        self.gitStream.write("checkpoint\n\n")
+        self.gitStream.flush()
         branchPrefix = self.depotPaths[0] + branch + "/"
         range = "@1,%s" % maxChange
-        #print "prefix" + branchPrefix
         changes = p4ChangesForPaths([branchPrefix], range, self.changes_block_size)
         if len(changes) <= 0:
             return False
         firstChange = changes[0]
-        #print "first change in branch: %s" % firstChange
         sourceBranch = self.knownBranches[branch]
         sourceDepotPath = self.depotPaths[0] + sourceBranch
         sourceRef = self.gitRefForBranch(sourceBranch)
-        #print "source " + sourceBranch
 
         branchParentChange = int(p4Cmd(["changes", "-m", "1", "%s...@1,%s" % (sourceDepotPath, firstChange)])["change"])
-        #print "branch parent: %s" % branchParentChange
         gitParent = self.gitCommitByP4Change(sourceRef, branchParentChange)
         if len(gitParent) > 0:
             self.initialParents[self.gitRefForBranch(branch)] = gitParent
-            #print "parent git commit: %s" % gitParent
 
         self.importChanges(changes)
         return True
@@ -3486,9 +3813,9 @@ class P4Sync(Command, P4UserMap):
                 if self.detectBranches:
                     branches = self.splitFilesIntoBranches(description)
                     for branch in branches.keys():
-                        ## HACK  --hwn
+                        # HACK  --hwn
                         branchPrefix = self.depotPaths[0] + branch + "/"
-                        self.branchPrefixes = [ branchPrefix ]
+                        self.branchPrefixes = [branchPrefix]
 
                         parent = ""
 
@@ -3508,12 +3835,12 @@ class P4Sync(Command, P4UserMap):
                                 fullBranch = self.projectName + branch
                                 if fullBranch not in self.p4BranchesInGit:
                                     if not self.silent:
-                                        print("\n    Importing new branch %s" % fullBranch);
+                                        print("\n    Importing new branch %s" % fullBranch)
                                     if self.importNewBranch(branch, change - 1):
                                         parent = ""
                                         self.p4BranchesInGit.append(fullBranch)
                                     if not self.silent:
-                                        print("\n    Resuming with change %s" % change);
+                                        print("\n    Resuming with change %s" % change)
 
                                 if self.verbose:
                                     print("parent determined through known branches: %s" % parent)
@@ -3572,7 +3899,7 @@ class P4Sync(Command, P4UserMap):
         newestRevision = 0
 
         fileCnt = 0
-        fileArgs = ["%s...%s" % (p,revision) for p in self.depotPaths]
+        fileArgs = ["%s...%s" % (p, revision) for p in self.depotPaths]
 
         for info in p4CmdList(["files"] + fileArgs):
 
@@ -3581,24 +3908,21 @@ class P4Sync(Command, P4UserMap):
                                  % info['data'])
                 if info['data'].find("must refer to client") >= 0:
                     sys.stderr.write("This particular p4 error is misleading.\n")
-                    sys.stderr.write("Perhaps the depot path was misspelled.\n");
+                    sys.stderr.write("Perhaps the depot path was misspelled.\n")
                     sys.stderr.write("Depot path:  %s\n" % " ".join(self.depotPaths))
                 sys.exit(1)
             if 'p4ExitCode' in info:
                 sys.stderr.write("p4 exitcode: %s\n" % info['p4ExitCode'])
                 sys.exit(1)
 
-
             change = int(info["change"])
             if change > newestRevision:
                 newestRevision = change
 
             if info["action"] in self.delete_actions:
-                # don't increase the file cnt, otherwise details["depotFile123"] will have gaps!
-                #fileCnt = fileCnt + 1
                 continue
 
-            for prop in ["depotFile", "rev", "action", "type" ]:
+            for prop in ["depotFile", "rev", "action", "type"]:
                 details["%s%s" % (prop, fileCnt)] = info[prop]
 
             fileCnt = fileCnt + 1
@@ -3618,7 +3942,6 @@ class P4Sync(Command, P4UserMap):
             print("IO error details: {}".format(err))
             print(self.gitError.read())
 
-
     def importRevisions(self, args, branch_arg_given):
         changes = []
 
@@ -3690,7 +4013,7 @@ class P4Sync(Command, P4UserMap):
         self.importProcess = subprocess.Popen(["git", "fast-import"],
                                               stdin=subprocess.PIPE,
                                               stdout=subprocess.PIPE,
-                                              stderr=subprocess.PIPE);
+                                              stderr=subprocess.PIPE)
         self.gitOutput = self.importProcess.stdout
         self.gitStream = self.importProcess.stdin
         self.gitError = self.importProcess.stderr
@@ -3750,9 +4073,13 @@ class P4Sync(Command, P4UserMap):
 
             # restrict to just this one, disabling detect-branches
             if branch_arg_given:
-                short = self.branch.split("/")[-1]
+                short = shortP4Ref(self.branch, self.importIntoRemotes)
                 if short in branches:
-                    self.p4BranchesInGit = [ short ]
+                    self.p4BranchesInGit = [short]
+                elif self.branch.startswith('refs/') and \
+                        branchExists(self.branch) and \
+                        '[git-p4:' in extractLogMessageFromGitCommit(self.branch):
+                    self.p4BranchesInGit = [self.branch]
             else:
                 self.p4BranchesInGit = branches.keys()
 
@@ -3769,13 +4096,13 @@ class P4Sync(Command, P4UserMap):
 
             p4Change = 0
             for branch in self.p4BranchesInGit:
-                logMsg =  extractLogMessageFromGitCommit(self.refPrefix + branch)
+                logMsg = extractLogMessageFromGitCommit(fullP4Ref(branch,
+                                                        self.importIntoRemotes))
 
                 settings = extractSettingsGitLog(logMsg)
 
                 self.readOptions(settings)
-                if ('depot-paths' in settings
-                    and 'change' in settings):
+                if 'depot-paths' in settings and 'change' in settings:
                     change = int(settings['change']) + 1
                     p4Change = max(p4Change, change)
 
@@ -3792,7 +4119,7 @@ class P4Sync(Command, P4UserMap):
                                     i = i - 1
                                     break
 
-                            paths.append ("/".join(cur_list[:i + 1]))
+                            paths.append("/".join(cur_list[:i + 1]))
 
                         self.previousDepotPaths = paths
 
@@ -3802,18 +4129,7 @@ class P4Sync(Command, P4UserMap):
                 if not self.silent and not self.detectBranches:
                     print("Performing incremental import into %s git branch" % self.branch)
 
-        # accept multiple ref name abbreviations:
-        #    refs/foo/bar/branch -> use it exactly
-        #    p4/branch -> prepend refs/remotes/ or refs/heads/
-        #    branch -> prepend refs/remotes/p4/ or refs/heads/p4/
-        if not self.branch.startswith("refs/"):
-            if self.importIntoRemotes:
-                prepend = "refs/remotes/"
-            else:
-                prepend = "refs/heads/"
-            if not self.branch.startswith("p4/"):
-                prepend += "p4/"
-            self.branch = prepend + self.branch
+        self.branch = fullP4Ref(self.branch, self.importIntoRemotes)
 
         if len(args) == 0 and self.depotPaths:
             if not self.silent:
@@ -3821,8 +4137,8 @@ class P4Sync(Command, P4UserMap):
         else:
             if self.depotPaths and self.depotPaths != args:
                 print("previous import used depot path %s and now %s was specified. "
-                       "This doesn't work!" % (' '.join (self.depotPaths),
-                                               ' '.join (args)))
+                       "This doesn't work!" % (' '.join(self.depotPaths),
+                                               ' '.join(args)))
                 sys.exit(1)
 
             self.depotPaths = sorted(args)
@@ -3862,7 +4178,7 @@ class P4Sync(Command, P4UserMap):
                 if len(self.changesFile) == 0:
                     revision = "#head"
 
-            p = re.sub ("\.\.\.$", "", p)
+            p = re.sub("\.\.\.$", "", p)
             if not p.endswith("/"):
                 p += "/"
 
@@ -3876,10 +4192,10 @@ class P4Sync(Command, P4UserMap):
         self.loadUserMapFromCache()
         self.labels = {}
         if self.detectLabels:
-            self.getLabels();
+            self.getLabels()
 
         if self.detectBranches:
-            ## FIXME - what's a P4 projectName ?
+            # FIXME - what's a P4 projectName ?
             self.projectName = self.guessProjectName()
 
             if self.hasOrigin:
@@ -3892,7 +4208,7 @@ class P4Sync(Command, P4UserMap):
             for b in self.p4BranchesInGit:
                 if b != "master":
 
-                    ## FIXME
+                    # FIXME
                     b = b[len(self.projectName):]
                 self.createdBranches.add(b)
 
@@ -3942,6 +4258,7 @@ class P4Sync(Command, P4UserMap):
 
         return True
 
+
 class P4Rebase(Command):
     def __init__(self):
         Command.__init__(self)
@@ -3961,11 +4278,11 @@ class P4Rebase(Command):
 
     def rebase(self):
         if os.system("git update-index --refresh") != 0:
-            die("Some files in your working directory are modified and different than what is in your index. You can use git update-index <filename> to bring the index up to date or stash away all your changes with git stash.");
+            die("Some files in your working directory are modified and different than what is in your index. You can use git update-index <filename> to bring the index up to date or stash away all your changes with git stash.")
         if len(read_pipe(["git", "diff-index", "HEAD", "--"])) > 0:
-            die("You have uncommitted changes. Please commit them before rebasing or stash them away with git stash.");
+            die("You have uncommitted changes. Please commit them before rebasing or stash them away with git stash.")
 
-        [upstream, settings] = findUpstreamBranchPoint()
+        upstream, settings = findUpstreamBranchPoint()
         if len(upstream) == 0:
             die("Cannot find upstream branchpoint for rebase")
 
@@ -3979,6 +4296,7 @@ class P4Rebase(Command):
             "HEAD", "--"])
         return True
 
+
 class P4Clone(P4Sync):
     def __init__(self):
         P4Sync.__init__(self)
@@ -3996,7 +4314,7 @@ class P4Clone(P4Sync):
         self.cloneBare = False
 
     def defaultDestination(self, args):
-        ## TODO: use common prefix of args?
+        # TODO: use common prefix of args?
         depotPath = args[0]
         depotDir = re.sub("(@[^@]*)$", "", depotPath)
         depotDir = re.sub("(#[^#]*)$", "", depotDir)
@@ -4032,7 +4350,7 @@ class P4Clone(P4Sync):
             os.makedirs(self.cloneDestination)
         chdir(self.cloneDestination)
 
-        init_cmd = [ "git", "init" ]
+        init_cmd = ["git", "init"]
         if self.cloneBare:
             init_cmd.append("--bare")
         retcode = subprocess.call(init_cmd)
@@ -4044,19 +4362,28 @@ class P4Clone(P4Sync):
 
         # create a master branch and check out a work tree
         if gitBranchExists(self.branch):
-            system([ "git", "branch", currentGitBranch(), self.branch ])
+            system(["git", "branch", currentGitBranch(), self.branch])
             if not self.cloneBare:
-                system([ "git", "checkout", "-f" ])
+                system(["git", "checkout", "-f"])
         else:
-            print('Not checking out any branch, use ' \
+            print('Not checking out any branch, use '
                   '"git checkout -q -b master <branch>"')
 
         # auto-set this variable if invoked with --use-client-spec
         if self.useClientSpec_from_options:
             system(["git", "config", "--bool", "git-p4.useclientspec", "true"])
 
+        # persist any git-p4 encoding-handling config options passed in for clone:
+        if gitConfig('git-p4.metadataDecodingStrategy'):
+            system(["git", "config", "git-p4.metadataDecodingStrategy", gitConfig('git-p4.metadataDecodingStrategy')])
+        if gitConfig('git-p4.metadataFallbackEncoding'):
+            system(["git", "config", "git-p4.metadataFallbackEncoding", gitConfig('git-p4.metadataFallbackEncoding')])
+        if gitConfig('git-p4.pathEncoding'):
+            system(["git", "config", "git-p4.pathEncoding", gitConfig('git-p4.pathEncoding')])
+
         return True
 
+
 class P4Unshelve(Command):
     def __init__(self):
         Command.__init__(self)
@@ -4073,14 +4400,14 @@ class P4Unshelve(Command):
         self.destbranch = "refs/remotes/p4-unshelved"
 
     def renameBranch(self, branch_name):
-        """ Rename the existing branch to branch_name.N
-        """
+        """Rename the existing branch to branch_name.N ."""
 
         found = True
-        for i in range(0,1000):
+        for i in range(0, 1000):
             backup_branch_name = "{0}.{1}".format(branch_name, i)
             if not gitBranchExists(backup_branch_name):
-                gitUpdateRef(backup_branch_name, branch_name) # copy ref to backup
+                # Copy ref to backup
+                gitUpdateRef(backup_branch_name, branch_name)
                 gitDeleteRef(branch_name)
                 found = True
                 print("renamed old unshelve branch to {0}".format(backup_branch_name))
@@ -4090,9 +4417,9 @@ class P4Unshelve(Command):
             sys.exit("gave up trying to rename existing branch {0}".format(sync.branch))
 
     def findLastP4Revision(self, starting_point):
-        """ Look back from starting_point for the first commit created by git-p4
-            to find the P4 commit we are based on, and the depot-paths.
-        """
+        """Look back from starting_point for the first commit created by git-p4
+           to find the P4 commit we are based on, and the depot-paths.
+           """
 
         for parent in (range(65535)):
             log = extractLogMessageFromGitCommit("{0}~{1}".format(starting_point, parent))
@@ -4103,8 +4430,9 @@ class P4Unshelve(Command):
         sys.exit("could not find git-p4 commits in {0}".format(self.origin))
 
     def createShelveParent(self, change, branch_name, sync, origin):
-        """ Create a commit matching the parent of the shelved changelist 'change'
-        """
+        """Create a commit matching the parent of the shelved changelist
+           'change'.
+           """
         parent_description = p4_describe(change, shelved=True)
         parent_description['desc'] = 'parent for shelved changelist {}\n'.format(change)
         files = sync.extractFilesFromCommit(parent_description, shelved=False, shelved_cl=change)
@@ -4172,10 +4500,11 @@ class P4Unshelve(Command):
 
         return True
 
+
 class P4Branches(Command):
     def __init__(self):
         Command.__init__(self)
-        self.options = [ ]
+        self.options = []
         self.description = ("Shows the git branches that hold imports and their "
                             + "corresponding perforce depot paths")
         self.verbose = False
@@ -4197,6 +4526,7 @@ class P4Branches(Command):
             print("%s <= %s (%s)" % (branch, ",".join(settings["depot-paths"]), settings["change"]))
         return True
 
+
 class HelpFormatter(optparse.IndentedHelpFormatter):
     def __init__(self):
         optparse.IndentedHelpFormatter.__init__(self)
@@ -4207,6 +4537,7 @@ class HelpFormatter(optparse.IndentedHelpFormatter):
         else:
             return ""
 
+
 def printUsage(commands):
     print("usage: %s <command> [options]" % sys.argv[0])
     print("")
@@ -4215,16 +4546,18 @@ def printUsage(commands):
     print("Try %s <command> --help for command specific help." % sys.argv[0])
     print("")
 
+
 commands = {
-    "submit" : P4Submit,
-    "commit" : P4Submit,
-    "sync" : P4Sync,
-    "rebase" : P4Rebase,
-    "clone" : P4Clone,
-    "branches" : P4Branches,
-    "unshelve" : P4Unshelve,
+    "submit": P4Submit,
+    "commit": P4Submit,
+    "sync": P4Sync,
+    "rebase": P4Rebase,
+    "clone": P4Clone,
+    "branches": P4Branches,
+    "unshelve": P4Unshelve,
 }
 
+
 def main():
     if len(sys.argv[1:]) == 0:
         printUsage(commands.keys())
@@ -4251,11 +4584,11 @@ def main():
 
     parser = optparse.OptionParser(cmd.usage.replace("%prog", "%prog " + cmdName),
                                    options,
-                                   description = cmd.description,
-                                   formatter = HelpFormatter())
+                                   description=cmd.description,
+                                   formatter=HelpFormatter())
 
     try:
-        (cmd, args) = parser.parse_args(sys.argv[2:], cmd);
+        cmd, args = parser.parse_args(sys.argv[2:], cmd)
     except:
         parser.print_help()
         raise
@@ -4263,7 +4596,7 @@ def main():
     global verbose
     verbose = cmd.verbose
     if cmd.needsGit:
-        if cmd.gitdir == None:
+        if cmd.gitdir is None:
             cmd.gitdir = os.path.abspath(".git")
             if not isValidGitDir(cmd.gitdir):
                 # "rev-parse --git-dir" without arguments will try $PWD/.git
@@ -4271,7 +4604,7 @@ def main():
                 if os.path.exists(cmd.gitdir):
                     cdup = read_pipe(["git", "rev-parse", "--show-cdup"]).strip()
                     if len(cdup) > 0:
-                        chdir(cdup);
+                        chdir(cdup)
 
         if not isValidGitDir(cmd.gitdir):
             if isValidGitDir(cmd.gitdir + "/.git"):
diff --git a/git.c b/git.c
index 3d8e48cf55..d7a7a82008 100644
--- a/git.c
+++ b/git.c
@@ -25,7 +25,7 @@ struct cmd_struct {
 };
 
 const char git_usage_string[] =
-	N_("git [--version] [--help] [-C <path>] [-c <name>=<value>]\n"
+	N_("git [-v | --version] [-h | --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"
 	   "           [--git-dir=<path>] [--work-tree=<path>] [--namespace=<name>]\n"
@@ -146,7 +146,8 @@ static int handle_options(const char ***argv, int *argc, int *envchanged)
 		 * commands can be written with "--" prepended
 		 * to make them look like flags.
 		 */
-		if (!strcmp(cmd, "--help") || !strcmp(cmd, "--version"))
+		if (!strcmp(cmd, "--help") || !strcmp(cmd, "-h") ||
+		    !strcmp(cmd, "--version") || !strcmp(cmd, "-v"))
 			break;
 
 		/*
@@ -537,7 +538,7 @@ static struct cmd_struct commands[] = {
 	{ "format-patch", cmd_format_patch, RUN_SETUP },
 	{ "fsck", cmd_fsck, RUN_SETUP },
 	{ "fsck-objects", cmd_fsck, RUN_SETUP },
-	{ "fsmonitor--daemon", cmd_fsmonitor__daemon, RUN_SETUP },
+	{ "fsmonitor--daemon", cmd_fsmonitor__daemon, SUPPORT_SUPER_PREFIX | RUN_SETUP },
 	{ "gc", cmd_gc, RUN_SETUP },
 	{ "get-tar-commit-id", cmd_get_tar_commit_id, NO_PARSEOPT },
 	{ "grep", cmd_grep, RUN_SETUP_GENTLY },
@@ -893,8 +894,10 @@ int cmd_main(int argc, const char **argv)
 	argc--;
 	handle_options(&argv, &argc, NULL);
 	if (argc > 0) {
-		/* translate --help and --version into commands */
-		skip_prefix(argv[0], "--", &argv[0]);
+		if (!strcmp("--version", argv[0]) || !strcmp("-v", argv[0]))
+			argv[0] = "version";
+		else if (!strcmp("--help", argv[0]) || !strcmp("-h", argv[0]))
+			argv[0] = "help";
 	} else {
 		/* The user didn't specify a command; give them help */
 		commit_pager_choice();
diff --git a/gitk-git/gitk b/gitk-git/gitk
index 23d9dd1fe0..0ae7d68590 100755
--- a/gitk-git/gitk
+++ b/gitk-git/gitk
@@ -2955,9 +2955,9 @@ proc savestuff {w} {
 proc resizeclistpanes {win w} {
     global oldwidth oldsash use_ttk
     if {[info exists oldwidth($win)]} {
-	if {[info exists oldsash($win)]} {
-	    set s0 [lindex $oldsash($win) 0]
-	    set s1 [lindex $oldsash($win) 1]
+        if {[info exists oldsash($win)]} {
+            set s0 [lindex $oldsash($win) 0]
+            set s1 [lindex $oldsash($win) 1]
         } elseif {$use_ttk} {
             set s0 [$win sashpos 0]
             set s1 [$win sashpos 1]
@@ -2991,8 +2991,10 @@ proc resizeclistpanes {win w} {
         } else {
             $win sash place 0 $sash0 [lindex $s0 1]
             $win sash place 1 $sash1 [lindex $s1 1]
+            set sash0 [list $sash0 [lindex $s0 1]]
+            set sash1 [list $sash1 [lindex $s1 1]]
         }
-	set oldsash($win) [list $sash0 $sash1]
+        set oldsash($win) [list $sash0 $sash1]
     }
     set oldwidth($win) $w
 }
@@ -3000,8 +3002,8 @@ proc resizeclistpanes {win w} {
 proc resizecdetpanes {win w} {
     global oldwidth oldsash use_ttk
     if {[info exists oldwidth($win)]} {
-	if {[info exists oldsash($win)]} {
-	    set s0 $oldsash($win)
+        if {[info exists oldsash($win)]} {
+            set s0 $oldsash($win)
         } elseif {$use_ttk} {
             set s0 [$win sashpos 0]
         } else {
@@ -3023,8 +3025,9 @@ proc resizecdetpanes {win w} {
             $win sashpos 0 $sash0
         } else {
             $win sash place 0 $sash0 [lindex $s0 1]
+            set sash0 [list $sash0 [lindex $s0 1]]
         }
-	set oldsash($win) $sash0
+        set oldsash($win) $sash0
     }
     set oldwidth($win) $w
 }
diff --git a/gitweb/gitweb.perl b/gitweb/gitweb.perl
index 606b50104c..1835487ab2 100755
--- a/gitweb/gitweb.perl
+++ b/gitweb/gitweb.perl
@@ -4219,7 +4219,10 @@ sub git_header_html {
 	my $mod_perl_version = $ENV{'MOD_PERL'} ? " $ENV{'MOD_PERL'}" : '';
 	print <<EOF;
 <?xml version="1.0" encoding="utf-8"?>
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<!DOCTYPE html [
+	<!ENTITY nbsp "&#xA0;">
+	<!ENTITY sdot "&#x22C5;">
+]>
 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en-US" lang="en-US">
 <!-- git web interface version $version, (C) 2005-2006, Kay Sievers <kay.sievers\@vrfy.org>, Christian Gierke -->
 <!-- git core binaries version $git_version -->
diff --git a/gpg-interface.c b/gpg-interface.c
index 280f1fa1a5..947b58ad4d 100644
--- a/gpg-interface.c
+++ b/gpg-interface.c
@@ -985,7 +985,7 @@ static int sign_buffer_ssh(struct strbuf *buffer, struct strbuf *signature,
 
 	if (!signing_key || signing_key[0] == '\0')
 		return error(
-			_("user.signingkey needs to be set for ssh signing"));
+			_("user.signingKey needs to be set for ssh signing"));
 
 	if (is_literal_ssh_key(signing_key, &literal_key)) {
 		/* A literal ssh key */
diff --git a/hook.c b/hook.c
index 1d51be3b77..a493939a4f 100644
--- a/hook.c
+++ b/hook.c
@@ -54,7 +54,7 @@ static int pick_next_hook(struct child_process *cp,
 		return 0;
 
 	cp->no_stdin = 1;
-	strvec_pushv(&cp->env_array, hook_cb->options->env.v);
+	strvec_pushv(&cp->env, hook_cb->options->env.v);
 	cp->stdout_to_stderr = 1;
 	cp->trace2_hook_name = hook_cb->hook_name;
 	cp->dir = hook_cb->options->dir;
@@ -62,9 +62,6 @@ static int pick_next_hook(struct child_process *cp,
 	strvec_push(&cp->args, hook_path);
 	strvec_pushv(&cp->args, hook_cb->options->args.v);
 
-	/* Provide context for errors if necessary */
-	*pp_task_cb = (char *)hook_path;
-
 	/*
 	 * This pick_next_hook() will be called again, we're only
 	 * running one hook, so indicate that no more work will be
@@ -80,13 +77,9 @@ static int notify_start_failure(struct strbuf *out,
 				void *pp_task_cp)
 {
 	struct hook_cb_data *hook_cb = pp_cb;
-	const char *hook_path = pp_task_cp;
 
 	hook_cb->rc |= 1;
 
-	strbuf_addf(out, _("Couldn't start hook '%s'\n"),
-		    hook_path);
-
 	return 1;
 }
 
@@ -144,6 +137,7 @@ int run_hooks_opt(const char *hook_name, struct run_hooks_opt *options)
 		cb_data.hook_path = abs_path.buf;
 	}
 
+	run_processes_parallel_ungroup = 1;
 	run_processes_parallel_tr2(jobs,
 				   pick_next_hook,
 				   notify_start_failure,
diff --git a/http-backend.c b/http-backend.c
index 81a7229ece..58b83a9f66 100644
--- a/http-backend.c
+++ b/http-backend.c
@@ -476,9 +476,9 @@ static void run_service(const char **argv, int buffer_input)
 		host = "(none)";
 
 	if (!getenv("GIT_COMMITTER_NAME"))
-		strvec_pushf(&cld.env_array, "GIT_COMMITTER_NAME=%s", user);
+		strvec_pushf(&cld.env, "GIT_COMMITTER_NAME=%s", user);
 	if (!getenv("GIT_COMMITTER_EMAIL"))
-		strvec_pushf(&cld.env_array,
+		strvec_pushf(&cld.env,
 			     "GIT_COMMITTER_EMAIL=%s@http.%s", user, host);
 
 	strvec_pushv(&cld.args, argv);
diff --git a/http-fetch.c b/http-fetch.c
index 58b394cd47..31bc5c7767 100644
--- a/http-fetch.c
+++ b/http-fetch.c
@@ -55,7 +55,7 @@ static void fetch_single_packfile(struct object_id *packfile_hash,
 	http_init(NULL, url, 0);
 
 	preq = new_direct_http_pack_request(packfile_hash->hash, xstrdup(url));
-	if (preq == NULL)
+	if (!preq)
 		die("couldn't create http pack request");
 	preq->slot->results = &results;
 	preq->index_pack_args = index_pack_args;
diff --git a/http-push.c b/http-push.c
index f0c044dcf7..5f4340a36e 100644
--- a/http-push.c
+++ b/http-push.c
@@ -253,7 +253,7 @@ static void start_fetch_loose(struct transfer_request *request)
 	struct http_object_request *obj_req;
 
 	obj_req = new_http_object_request(repo->url, &request->obj->oid);
-	if (obj_req == NULL) {
+	if (!obj_req) {
 		request->state = ABORTED;
 		return;
 	}
@@ -318,7 +318,7 @@ static void start_fetch_packed(struct transfer_request *request)
 	fprintf(stderr, " which contains %s\n", oid_to_hex(&request->obj->oid));
 
 	preq = new_http_pack_request(target->hash, repo->url);
-	if (preq == NULL) {
+	if (!preq) {
 		repo->can_update_info_refs = 0;
 		return;
 	}
@@ -520,7 +520,7 @@ static void finish_request(struct transfer_request *request)
 	/* Keep locks active */
 	check_locks();
 
-	if (request->headers != NULL)
+	if (request->headers)
 		curl_slist_free_all(request->headers);
 
 	/* URL is reused for MOVE after PUT and used during FETCH */
@@ -783,7 +783,7 @@ xml_start_tag(void *userData, const char *name, const char **atts)
 	const char *c = strchr(name, ':');
 	int old_namelen, new_len;
 
-	if (c == NULL)
+	if (!c)
 		c = name;
 	else
 		c++;
@@ -811,7 +811,7 @@ xml_end_tag(void *userData, const char *name)
 
 	ctx->userFunc(ctx, 1);
 
-	if (c == NULL)
+	if (!c)
 		c = name;
 	else
 		c++;
@@ -1689,7 +1689,6 @@ int cmd_main(int argc, const char **argv)
 	struct refspec rs = REFSPEC_INIT_PUSH;
 	struct remote_lock *ref_lock = NULL;
 	struct remote_lock *info_ref_lock = NULL;
-	struct rev_info revs;
 	int delete_branch = 0;
 	int force_delete = 0;
 	int objects_to_send;
@@ -1825,6 +1824,7 @@ int cmd_main(int argc, const char **argv)
 
 	new_refs = 0;
 	for (ref = remote_refs; ref; ref = ref->next) {
+		struct rev_info revs;
 		struct strvec commit_argv = STRVEC_INIT;
 
 		if (!ref->peer_ref)
@@ -1893,7 +1893,7 @@ int cmd_main(int argc, const char **argv)
 
 		/* Lock remote branch ref */
 		ref_lock = lock_remote(ref->name, LOCK_TIME);
-		if (ref_lock == NULL) {
+		if (!ref_lock) {
 			fprintf(stderr, "Unable to lock remote branch %s\n",
 				ref->name);
 			if (helper_status)
@@ -1941,6 +1941,7 @@ int cmd_main(int argc, const char **argv)
 		unlock_remote(ref_lock);
 		check_locks();
 		strvec_clear(&commit_argv);
+		release_revisions(&revs);
 	}
 
 	/* Update remote server info if appropriate */
diff --git a/http-walker.c b/http-walker.c
index 910fae539b..b8f0f98ae1 100644
--- a/http-walker.c
+++ b/http-walker.c
@@ -59,7 +59,7 @@ static void start_object_request(struct walker *walker,
 	struct http_object_request *req;
 
 	req = new_http_object_request(obj_req->repo->base, &obj_req->oid);
-	if (req == NULL) {
+	if (!req) {
 		obj_req->state = ABORTED;
 		return;
 	}
@@ -106,7 +106,7 @@ static void process_object_response(void *callback_data)
 	/* Use alternates if necessary */
 	if (missing_target(obj_req->req)) {
 		fetch_alternates(walker, alt->base);
-		if (obj_req->repo->next != NULL) {
+		if (obj_req->repo->next) {
 			obj_req->repo =
 				obj_req->repo->next;
 			release_http_object_request(obj_req->req);
@@ -225,12 +225,12 @@ static void process_alternates_response(void *callback_data)
 					 alt_req->url->buf);
 			active_requests++;
 			slot->in_use = 1;
-			if (slot->finished != NULL)
+			if (slot->finished)
 				(*slot->finished) = 0;
 			if (!start_active_slot(slot)) {
 				cdata->got_alternates = -1;
 				slot->in_use = 0;
-				if (slot->finished != NULL)
+				if (slot->finished)
 					(*slot->finished) = 1;
 			}
 			return;
@@ -443,7 +443,7 @@ static int http_fetch_pack(struct walker *walker, struct alt_base *repo, unsigne
 	}
 
 	preq = new_http_pack_request(target->hash, repo->base);
-	if (preq == NULL)
+	if (!preq)
 		goto abort;
 	preq->slot->results = &results;
 
@@ -489,11 +489,11 @@ static int fetch_object(struct walker *walker, unsigned char *hash)
 		if (hasheq(obj_req->oid.hash, hash))
 			break;
 	}
-	if (obj_req == NULL)
+	if (!obj_req)
 		return error("Couldn't find request for %s in the queue", hex);
 
 	if (has_object_file(&obj_req->oid)) {
-		if (obj_req->req != NULL)
+		if (obj_req->req)
 			abort_http_object_request(obj_req->req);
 		abort_object_request(obj_req);
 		return 0;
diff --git a/http.c b/http.c
index 3bdd71be5e..168ca30c55 100644
--- a/http.c
+++ b/http.c
@@ -128,6 +128,8 @@ static struct curl_slist *pragma_header;
 static struct curl_slist *no_pragma_header;
 static struct string_list extra_http_headers = STRING_LIST_INIT_DUP;
 
+static struct curl_slist *host_resolutions;
+
 static struct active_request_slot *active_queue_head;
 
 static char *cached_accept_language;
@@ -197,11 +199,11 @@ static void finish_active_slot(struct active_request_slot *slot)
 	closedown_active_slot(slot);
 	curl_easy_getinfo(slot->curl, CURLINFO_HTTP_CODE, &slot->http_code);
 
-	if (slot->finished != NULL)
+	if (slot->finished)
 		(*slot->finished) = 1;
 
 	/* Store slot results so they can be read after the slot is reused */
-	if (slot->results != NULL) {
+	if (slot->results) {
 		slot->results->curl_result = slot->curl_result;
 		slot->results->http_code = slot->http_code;
 		curl_easy_getinfo(slot->curl, CURLINFO_HTTPAUTH_AVAIL,
@@ -212,7 +214,7 @@ static void finish_active_slot(struct active_request_slot *slot)
 	}
 
 	/* Run callback if appropriate */
-	if (slot->callback_func != NULL)
+	if (slot->callback_func)
 		slot->callback_func(slot->callback_data);
 }
 
@@ -234,7 +236,7 @@ static void process_curl_messages(void)
 			while (slot != NULL &&
 			       slot->curl != curl_message->easy_handle)
 				slot = slot->next;
-			if (slot != NULL) {
+			if (slot) {
 				xmulti_remove_handle(slot);
 				slot->curl_result = curl_result;
 				finish_active_slot(slot);
@@ -347,7 +349,7 @@ static int http_options(const char *var, const char *value, void *cb)
 	if (!strcmp("http.postbuffer", var)) {
 		http_post_buffer = git_config_ssize_t(var, value);
 		if (http_post_buffer < 0)
-			warning(_("negative value for http.postbuffer; defaulting to %d"), LARGE_PACKET_MAX);
+			warning(_("negative value for http.postBuffer; defaulting to %d"), LARGE_PACKET_MAX);
 		if (http_post_buffer < LARGE_PACKET_MAX)
 			http_post_buffer = LARGE_PACKET_MAX;
 		return 0;
@@ -393,6 +395,18 @@ static int http_options(const char *var, const char *value, void *cb)
 		return 0;
 	}
 
+	if (!strcmp("http.curloptresolve", var)) {
+		if (!value) {
+			return config_error_nonbool(var);
+		} else if (!*value) {
+			curl_slist_free_all(host_resolutions);
+			host_resolutions = NULL;
+		} else {
+			host_resolutions = curl_slist_append(host_resolutions, value);
+		}
+		return 0;
+	}
+
 	if (!strcmp("http.followredirects", var)) {
 		if (value && !strcmp(value, "initial"))
 			http_follow_config = HTTP_FOLLOW_INITIAL;
@@ -838,16 +852,16 @@ static CURL *get_curl_handle(void)
 		curl_easy_setopt(result, CURLOPT_SSL_CIPHER_LIST,
 				ssl_cipherlist);
 
-	if (ssl_cert != NULL)
+	if (ssl_cert)
 		curl_easy_setopt(result, CURLOPT_SSLCERT, ssl_cert);
 	if (has_cert_password())
 		curl_easy_setopt(result, CURLOPT_KEYPASSWD, cert_auth.password);
-	if (ssl_key != NULL)
+	if (ssl_key)
 		curl_easy_setopt(result, CURLOPT_SSLKEY, ssl_key);
-	if (ssl_capath != NULL)
+	if (ssl_capath)
 		curl_easy_setopt(result, CURLOPT_CAPATH, ssl_capath);
 #ifdef GIT_CURL_HAVE_CURLOPT_PINNEDPUBLICKEY
-	if (ssl_pinnedkey != NULL)
+	if (ssl_pinnedkey)
 		curl_easy_setopt(result, CURLOPT_PINNEDPUBLICKEY, ssl_pinnedkey);
 #endif
 	if (http_ssl_backend && !strcmp("schannel", http_ssl_backend) &&
@@ -857,10 +871,10 @@ static CURL *get_curl_handle(void)
 		curl_easy_setopt(result, CURLOPT_PROXY_CAINFO, NULL);
 #endif
 	} else if (ssl_cainfo != NULL || http_proxy_ssl_ca_info != NULL) {
-		if (ssl_cainfo != NULL)
+		if (ssl_cainfo)
 			curl_easy_setopt(result, CURLOPT_CAINFO, ssl_cainfo);
 #ifdef GIT_CURL_HAVE_CURLOPT_PROXY_CAINFO
-		if (http_proxy_ssl_ca_info != NULL)
+		if (http_proxy_ssl_ca_info)
 			curl_easy_setopt(result, CURLOPT_PROXY_CAINFO, http_proxy_ssl_ca_info);
 #endif
 	}
@@ -1050,7 +1064,7 @@ void http_init(struct remote *remote, const char *url, int proactive_auth)
 
 	{
 		char *http_max_requests = getenv("GIT_HTTP_MAX_REQUESTS");
-		if (http_max_requests != NULL)
+		if (http_max_requests)
 			max_requests = atoi(http_max_requests);
 	}
 
@@ -1069,10 +1083,10 @@ void http_init(struct remote *remote, const char *url, int proactive_auth)
 	set_from_env(&user_agent, "GIT_HTTP_USER_AGENT");
 
 	low_speed_limit = getenv("GIT_HTTP_LOW_SPEED_LIMIT");
-	if (low_speed_limit != NULL)
+	if (low_speed_limit)
 		curl_low_speed_limit = strtol(low_speed_limit, NULL, 10);
 	low_speed_time = getenv("GIT_HTTP_LOW_SPEED_TIME");
-	if (low_speed_time != NULL)
+	if (low_speed_time)
 		curl_low_speed_time = strtol(low_speed_time, NULL, 10);
 
 	if (curl_ssl_verify == -1)
@@ -1109,7 +1123,7 @@ void http_cleanup(void)
 
 	while (slot != NULL) {
 		struct active_request_slot *next = slot->next;
-		if (slot->curl != NULL) {
+		if (slot->curl) {
 			xmulti_remove_handle(slot);
 			curl_easy_cleanup(slot->curl);
 		}
@@ -1131,6 +1145,9 @@ void http_cleanup(void)
 	curl_slist_free_all(no_pragma_header);
 	no_pragma_header = NULL;
 
+	curl_slist_free_all(host_resolutions);
+	host_resolutions = NULL;
+
 	if (curl_http_proxy) {
 		free((void *)curl_http_proxy);
 		curl_http_proxy = NULL;
@@ -1147,13 +1164,13 @@ void http_cleanup(void)
 	free((void *)http_proxy_authmethod);
 	http_proxy_authmethod = NULL;
 
-	if (cert_auth.password != NULL) {
+	if (cert_auth.password) {
 		memset(cert_auth.password, 0, strlen(cert_auth.password));
 		FREE_AND_NULL(cert_auth.password);
 	}
 	ssl_cert_password_required = 0;
 
-	if (proxy_cert_auth.password != NULL) {
+	if (proxy_cert_auth.password) {
 		memset(proxy_cert_auth.password, 0, strlen(proxy_cert_auth.password));
 		FREE_AND_NULL(proxy_cert_auth.password);
 	}
@@ -1179,14 +1196,14 @@ struct active_request_slot *get_active_slot(void)
 	while (slot != NULL && slot->in_use)
 		slot = slot->next;
 
-	if (slot == NULL) {
+	if (!slot) {
 		newslot = xmalloc(sizeof(*newslot));
 		newslot->curl = NULL;
 		newslot->in_use = 0;
 		newslot->next = NULL;
 
 		slot = active_queue_head;
-		if (slot == NULL) {
+		if (!slot) {
 			active_queue_head = newslot;
 		} else {
 			while (slot->next != NULL)
@@ -1196,7 +1213,7 @@ struct active_request_slot *get_active_slot(void)
 		slot = newslot;
 	}
 
-	if (slot->curl == NULL) {
+	if (!slot->curl) {
 		slot->curl = curl_easy_duphandle(curl_default);
 		curl_session_count++;
 	}
@@ -1211,6 +1228,7 @@ struct active_request_slot *get_active_slot(void)
 	if (curl_save_cookies)
 		curl_easy_setopt(slot->curl, CURLOPT_COOKIEJAR, curl_cookie_file);
 	curl_easy_setopt(slot->curl, CURLOPT_HTTPHEADER, pragma_header);
+	curl_easy_setopt(slot->curl, CURLOPT_RESOLVE, host_resolutions);
 	curl_easy_setopt(slot->curl, CURLOPT_ERRORBUFFER, curl_errorstr);
 	curl_easy_setopt(slot->curl, CURLOPT_CUSTOMREQUEST, NULL);
 	curl_easy_setopt(slot->curl, CURLOPT_READFUNCTION, NULL);
@@ -1794,7 +1812,7 @@ static int http_request(const char *url,
 	slot = get_active_slot();
 	curl_easy_setopt(slot->curl, CURLOPT_HTTPGET, 1);
 
-	if (result == NULL) {
+	if (!result) {
 		curl_easy_setopt(slot->curl, CURLOPT_NOBODY, 1);
 	} else {
 		curl_easy_setopt(slot->curl, CURLOPT_NOBODY, 0);
@@ -1971,8 +1989,8 @@ int http_get_strbuf(const char *url,
  * If a previous interrupted download is detected (i.e. a previous temporary
  * file is still around) the download is resumed.
  */
-static int http_get_file(const char *url, const char *filename,
-			 struct http_get_options *options)
+int http_get_file(const char *url, const char *filename,
+		  struct http_get_options *options)
 {
 	int ret;
 	struct strbuf tmpfile = STRBUF_INIT;
@@ -2126,7 +2144,7 @@ cleanup:
 
 void release_http_pack_request(struct http_pack_request *preq)
 {
-	if (preq->packfile != NULL) {
+	if (preq->packfile) {
 		fclose(preq->packfile);
 		preq->packfile = NULL;
 	}
@@ -2417,7 +2435,7 @@ abort:
 
 void process_http_object_request(struct http_object_request *freq)
 {
-	if (freq->slot == NULL)
+	if (!freq->slot)
 		return;
 	freq->curl_result = freq->slot->curl_result;
 	freq->http_code = freq->slot->http_code;
@@ -2474,7 +2492,7 @@ void release_http_object_request(struct http_object_request *freq)
 		freq->localfile = -1;
 	}
 	FREE_AND_NULL(freq->url);
-	if (freq->slot != NULL) {
+	if (freq->slot) {
 		freq->slot->callback_func = NULL;
 		freq->slot->callback_data = NULL;
 		release_active_slot(freq->slot);
diff --git a/http.h b/http.h
index df1590e53a..ba303cfb37 100644
--- a/http.h
+++ b/http.h
@@ -163,6 +163,15 @@ struct http_get_options {
  */
 int http_get_strbuf(const char *url, struct strbuf *result, struct http_get_options *options);
 
+/*
+ * Downloads a URL and stores the result in the given file.
+ *
+ * If a previous interrupted download is detected (i.e. a previous temporary
+ * file is still around) the download is resumed.
+ */
+int http_get_file(const char *url, const char *filename,
+		  struct http_get_options *options);
+
 int http_fetch_ref(const char *base, struct ref *ref);
 
 /* Helpers for fetching packs */
diff --git a/kwset.c b/kwset.c
index fc439e0667..08aadf0311 100644
--- a/kwset.c
+++ b/kwset.c
@@ -477,7 +477,7 @@ kwsprep (kwset_t kws)
 	next[i] = NULL;
       treenext(kwset->trie->links, next);
 
-      if ((trans = kwset->trans) != NULL)
+      if ((trans = kwset->trans))
 	for (i = 0; i < NCHAR; ++i)
 	  kwset->next[i] = next[U(trans[i])];
       else
@@ -485,7 +485,7 @@ kwsprep (kwset_t kws)
     }
 
   /* Fix things up for any translation table. */
-  if ((trans = kwset->trans) != NULL)
+  if ((trans = kwset->trans))
     for (i = 0; i < NCHAR; ++i)
       kwset->delta[i] = delta[U(trans[i])];
   else
diff --git a/ll-merge.c b/ll-merge.c
index a937cec59a..14b8362019 100644
--- a/ll-merge.c
+++ b/ll-merge.c
@@ -207,7 +207,7 @@ static enum ll_merge_result ll_ext_merge(const struct ll_merge_driver *fn,
 	dict[4].placeholder = "P"; dict[4].value = path_sq.buf;
 	dict[5].placeholder = NULL; dict[5].value = NULL;
 
-	if (fn->cmdline == NULL)
+	if (!fn->cmdline)
 		die("custom merge driver %s lacks command line.", fn->name);
 
 	result->ptr = NULL;
diff --git a/log-tree.c b/log-tree.c
index 3a03e34c30..d0ac0a6327 100644
--- a/log-tree.c
+++ b/log-tree.c
@@ -88,7 +88,7 @@ static int match_ref_pattern(const char *refname,
 			     const struct string_list_item *item)
 {
 	int matched = 0;
-	if (item->util == NULL) {
+	if (!item->util) {
 		if (!wildmatch(item->string, refname, 0))
 			matched = 1;
 	} else {
diff --git a/mailinfo.c b/mailinfo.c
index 02f6f95357..9621ba62a3 100644
--- a/mailinfo.c
+++ b/mailinfo.c
@@ -698,7 +698,7 @@ static int is_scissors_line(const char *line)
 			continue;
 		}
 		last_nonblank = c;
-		if (first_nonblank == NULL)
+		if (!first_nonblank)
 			first_nonblank = c;
 		if (*c == '-') {
 			in_perforation = 1;
@@ -1094,7 +1094,7 @@ static void handle_body(struct mailinfo *mi, struct strbuf *line)
 			 */
 			lines = strbuf_split(line, '\n');
 			for (it = lines; (sb = *it); it++) {
-				if (*(it + 1) == NULL) /* The last line */
+				if (!*(it + 1)) /* The last line */
 					if (sb->buf[sb->len - 1] != '\n') {
 						/* Partial line, save it for later. */
 						strbuf_addbuf(&prev, sb);
diff --git a/mailmap.c b/mailmap.c
index 7befdc5e48..da2589b082 100644
--- a/mailmap.c
+++ b/mailmap.c
@@ -77,7 +77,7 @@ static void add_mapping(struct string_list *map,
 	struct mailmap_entry *me;
 	struct string_list_item *item;
 
-	if (old_email == NULL) {
+	if (!old_email) {
 		old_email = new_email;
 		new_email = NULL;
 	}
@@ -92,7 +92,7 @@ static void add_mapping(struct string_list *map,
 		item->util = me;
 	}
 
-	if (old_name == NULL) {
+	if (!old_name) {
 		debug_mm("mailmap: adding (simple) entry for '%s'\n", old_email);
 
 		/* Replace current name and new email for simple entry */
@@ -123,9 +123,9 @@ static char *parse_name_and_email(char *buffer, char **name,
 	char *left, *right, *nstart, *nend;
 	*name = *email = NULL;
 
-	if ((left = strchr(buffer, '<')) == NULL)
+	if (!(left = strchr(buffer, '<')))
 		return NULL;
-	if ((right = strchr(left+1, '>')) == NULL)
+	if (!(right = strchr(left + 1, '>')))
 		return NULL;
 	if (!allow_empty_email && (left+1 == right))
 		return NULL;
@@ -153,7 +153,7 @@ static void read_mailmap_line(struct string_list *map, char *buffer)
 	if (buffer[0] == '#')
 		return;
 
-	if ((name2 = parse_name_and_email(buffer, &name1, &email1, 0)) != NULL)
+	if ((name2 = parse_name_and_email(buffer, &name1, &email1, 0)))
 		parse_name_and_email(name2, &name2, &email2, 1);
 
 	if (email1)
@@ -320,7 +320,7 @@ int map_user(struct string_list *map,
 		 (int)*emaillen, debug_str(*email));
 
 	item = lookup_prefix(map, *email, *emaillen);
-	if (item != NULL) {
+	if (item) {
 		me = (struct mailmap_entry *)item->util;
 		if (me->namemap.nr) {
 			/*
@@ -334,7 +334,7 @@ int map_user(struct string_list *map,
 				item = subitem;
 		}
 	}
-	if (item != NULL) {
+	if (item) {
 		struct mailmap_info *mi = (struct mailmap_info *)item->util;
 		if (mi->name == NULL && mi->email == NULL) {
 			debug_mm("map_user:  -- (no simple mapping)\n");
diff --git a/merge-ort.c b/merge-ort.c
index 8545354daf..ebb9a75425 100644
--- a/merge-ort.c
+++ b/merge-ort.c
@@ -1594,6 +1594,7 @@ static int find_first_merges(struct repository *repo,
 	}
 
 	object_array_clear(&merges);
+	release_revisions(&revs);
 	return result->nr;
 }
 
@@ -2068,7 +2069,7 @@ static char *handle_path_level_conflicts(struct merge_options *opt,
 	 * to ensure that's the case.
 	 */
 	c_info = strmap_get(collisions, new_path);
-	if (c_info == NULL)
+	if (!c_info)
 		BUG("c_info is NULL");
 
 	/*
@@ -2259,6 +2260,27 @@ static void compute_collisions(struct strmap *collisions,
 	}
 }
 
+static void free_collisions(struct strmap *collisions)
+{
+	struct hashmap_iter iter;
+	struct strmap_entry *entry;
+
+	/* Free each value in the collisions map */
+	strmap_for_each_entry(collisions, &iter, entry) {
+		struct collision_info *info = entry->value;
+		string_list_clear(&info->source_files, 0);
+	}
+	/*
+	 * In compute_collisions(), we set collisions.strdup_strings to 0
+	 * so that we wouldn't have to make another copy of the new_path
+	 * allocated by apply_dir_rename().  But now that we've used them
+	 * and have no other references to these strings, it is time to
+	 * deallocate them.
+	 */
+	free_strmap_strings(collisions);
+	strmap_clear(collisions, 1);
+}
+
 static char *check_for_directory_rename(struct merge_options *opt,
 					const char *path,
 					unsigned side_index,
@@ -2267,18 +2289,23 @@ static char *check_for_directory_rename(struct merge_options *opt,
 					struct strmap *collisions,
 					int *clean_merge)
 {
-	char *new_path = NULL;
+	char *new_path;
 	struct strmap_entry *rename_info;
-	struct strmap_entry *otherinfo = NULL;
+	struct strmap_entry *otherinfo;
 	const char *new_dir;
+	int other_side = 3 - side_index;
 
+	/*
+	 * Cases where we don't have or don't want a directory rename for
+	 * this path.
+	 */
 	if (strmap_empty(dir_renames))
-		return new_path;
+		return NULL;
+	if (strmap_get(&collisions[other_side], path))
+		return NULL;
 	rename_info = check_dir_renamed(path, dir_renames);
 	if (!rename_info)
-		return new_path;
-	/* old_dir = rename_info->key; */
-	new_dir = rename_info->value;
+		return NULL;
 
 	/*
 	 * This next part is a little weird.  We do not want to do an
@@ -2304,6 +2331,7 @@ static char *check_for_directory_rename(struct merge_options *opt,
 	 * As it turns out, this also prevents N-way transient rename
 	 * confusion; See testcases 9c and 9d of t6043.
 	 */
+	new_dir = rename_info->value; /* old_dir = rename_info->key; */
 	otherinfo = strmap_get_entry(dir_rename_exclusions, new_dir);
 	if (otherinfo) {
 		path_msg(opt, rename_info->key, 1,
@@ -2314,7 +2342,8 @@ static char *check_for_directory_rename(struct merge_options *opt,
 	}
 
 	new_path = handle_path_level_conflicts(opt, path, side_index,
-					       rename_info, collisions);
+					       rename_info,
+					       &collisions[side_index]);
 	*clean_merge &= (new_path != NULL);
 
 	return new_path;
@@ -3023,18 +3052,15 @@ static int detect_regular_renames(struct merge_options *opt,
 static int collect_renames(struct merge_options *opt,
 			   struct diff_queue_struct *result,
 			   unsigned side_index,
+			   struct strmap *collisions,
 			   struct strmap *dir_renames_for_side,
 			   struct strmap *rename_exclusions)
 {
 	int i, clean = 1;
-	struct strmap collisions;
 	struct diff_queue_struct *side_pairs;
-	struct hashmap_iter iter;
-	struct strmap_entry *entry;
 	struct rename_info *renames = &opt->priv->renames;
 
 	side_pairs = &renames->pairs[side_index];
-	compute_collisions(&collisions, dir_renames_for_side, side_pairs);
 
 	for (i = 0; i < side_pairs->nr; ++i) {
 		struct diff_filepair *p = side_pairs->queue[i];
@@ -3050,7 +3076,7 @@ static int collect_renames(struct merge_options *opt,
 						      side_index,
 						      dir_renames_for_side,
 						      rename_exclusions,
-						      &collisions,
+						      collisions,
 						      &clean);
 
 		possibly_cache_new_pair(renames, p, side_index, new_path);
@@ -3076,20 +3102,6 @@ static int collect_renames(struct merge_options *opt,
 		result->queue[result->nr++] = p;
 	}
 
-	/* Free each value in the collisions map */
-	strmap_for_each_entry(&collisions, &iter, entry) {
-		struct collision_info *info = entry->value;
-		string_list_clear(&info->source_files, 0);
-	}
-	/*
-	 * In compute_collisions(), we set collisions.strdup_strings to 0
-	 * so that we wouldn't have to make another copy of the new_path
-	 * allocated by apply_dir_rename().  But now that we've used them
-	 * and have no other references to these strings, it is time to
-	 * deallocate them.
-	 */
-	free_strmap_strings(&collisions);
-	strmap_clear(&collisions, 1);
 	return clean;
 }
 
@@ -3100,6 +3112,7 @@ static int detect_and_process_renames(struct merge_options *opt,
 {
 	struct diff_queue_struct combined = { 0 };
 	struct rename_info *renames = &opt->priv->renames;
+	struct strmap collisions[3];
 	int need_dir_renames, s, i, clean = 1;
 	unsigned detection_run = 0;
 
@@ -3149,12 +3162,22 @@ static int detect_and_process_renames(struct merge_options *opt,
 	ALLOC_GROW(combined.queue,
 		   renames->pairs[1].nr + renames->pairs[2].nr,
 		   combined.alloc);
+	for (i = MERGE_SIDE1; i <= MERGE_SIDE2; i++) {
+		int other_side = 3 - i;
+		compute_collisions(&collisions[i],
+				   &renames->dir_renames[other_side],
+				   &renames->pairs[i]);
+	}
 	clean &= collect_renames(opt, &combined, MERGE_SIDE1,
+				 collisions,
 				 &renames->dir_renames[2],
 				 &renames->dir_renames[1]);
 	clean &= collect_renames(opt, &combined, MERGE_SIDE2,
+				 collisions,
 				 &renames->dir_renames[1],
 				 &renames->dir_renames[2]);
+	for (i = MERGE_SIDE1; i <= MERGE_SIDE2; i++)
+		free_collisions(&collisions[i]);
 	STABLE_QSORT(combined.queue, combined.nr, compare_pairs);
 	trace2_region_leave("merge", "directory renames", opt->repo);
 
@@ -4271,6 +4294,8 @@ void merge_switch_to_result(struct merge_options *opt,
 		if (checkout(opt, head, result->tree)) {
 			/* failure to function */
 			result->clean = -1;
+			merge_finalize(opt, result);
+			trace2_region_leave("merge", "checkout", opt->repo);
 			return;
 		}
 		trace2_region_leave("merge", "checkout", opt->repo);
@@ -4281,6 +4306,9 @@ void merge_switch_to_result(struct merge_options *opt,
 			/* failure to function */
 			opt->priv = NULL;
 			result->clean = -1;
+			merge_finalize(opt, result);
+			trace2_region_leave("merge", "record_conflicted",
+					    opt->repo);
 			return;
 		}
 		opt->priv = NULL;
@@ -4640,7 +4668,7 @@ static void merge_ort_internal(struct merge_options *opt,
 	}
 
 	merged_merge_bases = pop_commit(&merge_bases);
-	if (merged_merge_bases == NULL) {
+	if (!merged_merge_bases) {
 		/* if there is no common ancestor, use an empty tree */
 		struct tree *tree;
 
diff --git a/merge-recursive.c b/merge-recursive.c
index 1ee6364e8b..b83a129b43 100644
--- a/merge-recursive.c
+++ b/merge-recursive.c
@@ -82,7 +82,7 @@ static struct dir_rename_entry *dir_rename_find_entry(struct hashmap *hashmap,
 {
 	struct dir_rename_entry key;
 
-	if (dir == NULL)
+	if (!dir)
 		return NULL;
 	hashmap_entry_init(&key.ent, strhash(dir));
 	key.dir = dir;
@@ -522,10 +522,10 @@ static struct stage_data *insert_stage_data(struct repository *r,
  */
 static struct string_list *get_unmerged(struct index_state *istate)
 {
-	struct string_list *unmerged = xcalloc(1, sizeof(struct string_list));
+	struct string_list *unmerged = xmalloc(sizeof(struct string_list));
 	int i;
 
-	unmerged->strdup_strings = 1;
+	string_list_init_dup(unmerged);
 
 	/* TODO: audit for interaction with sparse-index. */
 	ensure_full_index(istate);
@@ -1160,6 +1160,7 @@ static int find_first_merges(struct repository *repo,
 	}
 
 	object_array_clear(&merges);
+	release_revisions(&revs);
 	return result->nr;
 }
 
@@ -1990,14 +1991,14 @@ static void get_renamed_dir_portion(const char *old_path, const char *new_path,
 	 * renamed means the root directory can never be renamed -- because
 	 * the root directory always exists).
 	 */
-	if (end_of_old == NULL)
+	if (!end_of_old)
 		return; /* Note: *old_dir and *new_dir are still NULL */
 
 	/*
 	 * If new_path contains no directory (end_of_new is NULL), then we
 	 * have a rename of old_path's directory to the root directory.
 	 */
-	if (end_of_new == NULL) {
+	if (!end_of_new) {
 		*old_dir = xstrndup(old_path, end_of_old - old_path);
 		*new_dir = xstrdup("");
 		return;
@@ -2116,7 +2117,7 @@ static char *handle_path_level_conflicts(struct merge_options *opt,
 	 * to ensure that's the case.
 	 */
 	collision_ent = collision_find_entry(collisions, new_path);
-	if (collision_ent == NULL)
+	if (!collision_ent)
 		BUG("collision_ent is NULL");
 
 	/*
@@ -2996,7 +2997,7 @@ static void final_cleanup_rename(struct string_list *rename)
 	const struct rename *re;
 	int i;
 
-	if (rename == NULL)
+	if (!rename)
 		return;
 
 	for (i = 0; i < rename->nr; i++) {
@@ -3605,7 +3606,7 @@ static int merge_recursive_internal(struct merge_options *opt,
 	}
 
 	merged_merge_bases = pop_commit(&merge_bases);
-	if (merged_merge_bases == NULL) {
+	if (!merged_merge_bases) {
 		/* if there is no common ancestor, use an empty tree */
 		struct tree *tree;
 
diff --git a/mergetools/araxis b/mergetools/araxis
index e2407b65b7..eb32a7da95 100644
--- a/mergetools/araxis
+++ b/mergetools/araxis
@@ -2,6 +2,10 @@ diff_cmd () {
 	"$merge_tool_path" -wait -2 "$LOCAL" "$REMOTE" >/dev/null 2>&1
 }
 
+diff_cmd_help () {
+	echo "Use Araxis Merge (requires a graphical session)"
+}
+
 merge_cmd () {
 	if $base_present
 	then
@@ -13,6 +17,10 @@ merge_cmd () {
 	fi
 }
 
+merge_cmd_help () {
+	echo "Use Araxis Merge (requires a graphical session)"
+}
+
 translate_merge_tool_path() {
 	echo compare
 }
diff --git a/mergetools/bc b/mergetools/bc
index 26c19d46a5..2922667ddd 100644
--- a/mergetools/bc
+++ b/mergetools/bc
@@ -2,6 +2,10 @@ diff_cmd () {
 	"$merge_tool_path" "$LOCAL" "$REMOTE"
 }
 
+diff_cmd_help () {
+	echo "Use Beyond Compare (requires a graphical session)"
+}
+
 merge_cmd () {
 	if $base_present
 	then
@@ -13,6 +17,10 @@ merge_cmd () {
 	fi
 }
 
+merge_cmd_help () {
+	echo "Use Beyond Compare (requires a graphical session)"
+}
+
 translate_merge_tool_path() {
 	if type bcomp >/dev/null 2>/dev/null
 	then
diff --git a/mergetools/codecompare b/mergetools/codecompare
index 9f60e8da65..610963d377 100644
--- a/mergetools/codecompare
+++ b/mergetools/codecompare
@@ -2,6 +2,10 @@ diff_cmd () {
 	"$merge_tool_path" "$LOCAL" "$REMOTE"
 }
 
+diff_cmd_help () {
+	echo "Use Code Compare (requires a graphical session)"
+}
+
 merge_cmd () {
 	if $base_present
 	then
@@ -13,6 +17,10 @@ merge_cmd () {
 	fi
 }
 
+merge_cmd_help () {
+	echo "Use Code Compare (requires a graphical session)"
+}
+
 translate_merge_tool_path() {
 	if merge_mode
 	then
diff --git a/mergetools/deltawalker b/mergetools/deltawalker
index ee6f374bce..efae4c285c 100644
--- a/mergetools/deltawalker
+++ b/mergetools/deltawalker
@@ -2,6 +2,10 @@ diff_cmd () {
 	"$merge_tool_path" "$LOCAL" "$REMOTE" >/dev/null 2>&1
 }
 
+diff_cmd_help () {
+	echo "Use DeltaWalker (requires a graphical session)"
+}
+
 merge_cmd () {
 	# Adding $(pwd)/ in front of $MERGED should not be necessary.
 	# However without it, DeltaWalker (at least v1.9.8 on Windows)
@@ -16,6 +20,10 @@ merge_cmd () {
 	fi >/dev/null 2>&1
 }
 
+merge_cmd_help () {
+	echo "Use DeltaWalker (requires a graphical session)"
+}
+
 translate_merge_tool_path () {
 	echo DeltaWalker
 }
diff --git a/mergetools/diffmerge b/mergetools/diffmerge
index 9b6355b98a..9b5b62d1ca 100644
--- a/mergetools/diffmerge
+++ b/mergetools/diffmerge
@@ -2,6 +2,10 @@ diff_cmd () {
 	"$merge_tool_path" "$LOCAL" "$REMOTE" >/dev/null 2>&1
 }
 
+diff_cmd_help () {
+	echo "Use DiffMerge (requires a graphical session)"
+}
+
 merge_cmd () {
 	if $base_present
 	then
@@ -13,6 +17,10 @@ merge_cmd () {
 	fi
 }
 
+merge_cmd_help () {
+	echo "Use DiffMerge (requires a graphical session)"
+}
+
 exit_code_trustable () {
 	true
 }
diff --git a/mergetools/diffuse b/mergetools/diffuse
index 5a3ae8b569..ebfaba5172 100644
--- a/mergetools/diffuse
+++ b/mergetools/diffuse
@@ -2,6 +2,10 @@ diff_cmd () {
 	"$merge_tool_path" "$LOCAL" "$REMOTE" | cat
 }
 
+diff_cmd_help () {
+	echo "Use Diffuse (requires a graphical session)"
+}
+
 merge_cmd () {
 	if $base_present
 	then
@@ -13,3 +17,7 @@ merge_cmd () {
 			"$LOCAL" "$MERGED" "$REMOTE" | cat
 	fi
 }
+
+merge_cmd_help () {
+	echo "Use Diffuse (requires a graphical session)"
+}
diff --git a/mergetools/ecmerge b/mergetools/ecmerge
index 6c5101c4f7..0d4d609874 100644
--- a/mergetools/ecmerge
+++ b/mergetools/ecmerge
@@ -2,6 +2,10 @@ diff_cmd () {
 	"$merge_tool_path" --default --mode=diff2 "$LOCAL" "$REMOTE"
 }
 
+diff_cmd_help () {
+	echo "Use ECMerge (requires a graphical session)"
+}
+
 merge_cmd () {
 	if $base_present
 	then
@@ -12,3 +16,7 @@ merge_cmd () {
 			--default --mode=merge2 --to="$MERGED"
 	fi
 }
+
+merge_cmd_help () {
+	echo "Use ECMerge (requires a graphical session)"
+}
diff --git a/mergetools/emerge b/mergetools/emerge
index d1ce513ff5..fc6892cc95 100644
--- a/mergetools/emerge
+++ b/mergetools/emerge
@@ -2,6 +2,10 @@ diff_cmd () {
 	"$merge_tool_path" -f emerge-files-command "$LOCAL" "$REMOTE"
 }
 
+diff_cmd_help () {
+	echo "Use Emacs' Emerge"
+}
+
 merge_cmd () {
 	if $base_present
 	then
@@ -17,6 +21,10 @@ merge_cmd () {
 	fi
 }
 
+merge_cmd_help () {
+	echo "Use Emacs' Emerge"
+}
+
 translate_merge_tool_path() {
 	echo emacs
 }
diff --git a/mergetools/examdiff b/mergetools/examdiff
index e72b06fc4d..6f53ca9161 100644
--- a/mergetools/examdiff
+++ b/mergetools/examdiff
@@ -2,6 +2,10 @@ diff_cmd () {
 	"$merge_tool_path" "$LOCAL" "$REMOTE" -nh
 }
 
+diff_cmd_help () {
+	echo "Use ExamDiff Pro (requires a graphical session)"
+}
+
 merge_cmd () {
 	if $base_present
 	then
@@ -11,6 +15,10 @@ merge_cmd () {
 	fi
 }
 
+merge_cmd_help () {
+	echo "Use ExamDiff Pro (requires a graphical session)"
+}
+
 translate_merge_tool_path() {
 	mergetool_find_win32_cmd "ExamDiff.com" "ExamDiff Pro"
 }
diff --git a/mergetools/guiffy b/mergetools/guiffy
index 8b23a13c41..3ed07efd16 100644
--- a/mergetools/guiffy
+++ b/mergetools/guiffy
@@ -2,6 +2,10 @@ diff_cmd () {
 	"$merge_tool_path" "$LOCAL" "$REMOTE"
 }
 
+diff_cmd_help () {
+	echo "Use Guiffy's Diff Tool (requires a graphical session)"
+}
+
 merge_cmd () {
 	if $base_present
 	then
@@ -13,6 +17,10 @@ merge_cmd () {
 	fi
 }
 
+merge_cmd_help () {
+	echo "Use Guiffy's Diff Tool (requires a graphical session)"
+}
+
 exit_code_trustable () {
 	true
 }
diff --git a/mergetools/kdiff3 b/mergetools/kdiff3
index 520cb914a1..ee8b3a0570 100644
--- a/mergetools/kdiff3
+++ b/mergetools/kdiff3
@@ -4,6 +4,10 @@ diff_cmd () {
 		"$LOCAL" "$REMOTE" >/dev/null 2>&1
 }
 
+diff_cmd_help () {
+	echo "Use KDiff3 (requires a graphical session)"
+}
+
 merge_cmd () {
 	if $base_present
 	then
@@ -22,6 +26,10 @@ merge_cmd () {
 	fi
 }
 
+merge_cmd_help () {
+	echo "Use KDiff3 (requires a graphical session)"
+}
+
 exit_code_trustable () {
 	true
 }
diff --git a/mergetools/kompare b/mergetools/kompare
index e8c0bfa678..4ce23dbe8b 100644
--- a/mergetools/kompare
+++ b/mergetools/kompare
@@ -2,10 +2,18 @@ can_merge () {
 	return 1
 }
 
+diff_cmd_help () {
+	echo "Use Kompare (requires a graphical session)"
+}
+
 diff_cmd () {
 	"$merge_tool_path" "$LOCAL" "$REMOTE"
 }
 
+merge_cmd_help () {
+	echo "Use Kompare (requires a graphical session)"
+}
+
 exit_code_trustable () {
 	true
 }
diff --git a/mergetools/meld b/mergetools/meld
index aab4ebb935..8ec0867e03 100644
--- a/mergetools/meld
+++ b/mergetools/meld
@@ -2,6 +2,10 @@ diff_cmd () {
 	"$merge_tool_path" "$LOCAL" "$REMOTE"
 }
 
+diff_cmd_help () {
+	echo "Use Meld (requires a graphical session)"
+}
+
 merge_cmd () {
 	check_meld_for_features
 
@@ -20,6 +24,10 @@ merge_cmd () {
 	fi
 }
 
+merge_cmd_help () {
+	echo "Use Meld (requires a graphical session) with optional \`auto merge\` (see \`git help mergetool\`'s \`CONFIGURATION\` section)"
+}
+
 # Get meld help message
 init_meld_help_msg () {
 	if test -z "$meld_help_msg"
diff --git a/mergetools/opendiff b/mergetools/opendiff
index b608dd6de3..44adf8f951 100644
--- a/mergetools/opendiff
+++ b/mergetools/opendiff
@@ -2,6 +2,10 @@ diff_cmd () {
 	"$merge_tool_path" "$LOCAL" "$REMOTE" | cat
 }
 
+diff_cmd_help () {
+	echo "Use FileMerge (requires a graphical session)"
+}
+
 merge_cmd () {
 	if $base_present
 	then
@@ -12,3 +16,7 @@ merge_cmd () {
 			-merge "$MERGED" | cat
 	fi
 }
+
+merge_cmd_help () {
+	echo "Use FileMerge (requires a graphical session)"
+}
diff --git a/mergetools/p4merge b/mergetools/p4merge
index 7a5b291dd2..f3cb197e58 100644
--- a/mergetools/p4merge
+++ b/mergetools/p4merge
@@ -19,6 +19,10 @@ diff_cmd () {
 	fi
 }
 
+diff_cmd_help () {
+	echo "Use HelixCore P4Merge (requires a graphical session)"
+}
+
 merge_cmd () {
 	if ! $base_present
 	then
@@ -34,3 +38,7 @@ create_empty_file () {
 
 	printf "%s" "$empty_file"
 }
+
+merge_cmd_help () {
+	echo "Use HelixCore P4Merge (requires a graphical session)"
+}
diff --git a/mergetools/smerge b/mergetools/smerge
index 9c2e6f6fd7..5410835a6b 100644
--- a/mergetools/smerge
+++ b/mergetools/smerge
@@ -2,6 +2,10 @@ diff_cmd () {
 	"$merge_tool_path" mergetool "$LOCAL" "$REMOTE" -o "$MERGED"
 }
 
+diff_cmd_help () {
+	echo "Use Sublime Merge (requires a graphical session)"
+}
+
 merge_cmd () {
 	if $base_present
 	then
@@ -10,3 +14,7 @@ merge_cmd () {
 		"$merge_tool_path" mergetool "$LOCAL" "$REMOTE" -o "$MERGED"
 	fi
 }
+
+merge_cmd_help () {
+	echo "Use Sublime Merge (requires a graphical session)"
+}
diff --git a/mergetools/tkdiff b/mergetools/tkdiff
index eee5cb57e3..66906a720d 100644
--- a/mergetools/tkdiff
+++ b/mergetools/tkdiff
@@ -2,6 +2,10 @@ diff_cmd () {
 	"$merge_tool_path" "$LOCAL" "$REMOTE"
 }
 
+diff_cmd_help () {
+	echo "Use TkDiff (requires a graphical session)"
+}
+
 merge_cmd () {
 	if $base_present
 	then
@@ -14,3 +18,7 @@ merge_cmd () {
 exit_code_trustable () {
 	true
 }
+
+merge_cmd_help () {
+	echo "Use TkDiff (requires a graphical session)"
+}
diff --git a/mergetools/tortoisemerge b/mergetools/tortoisemerge
index d7ab666a59..507edcd444 100644
--- a/mergetools/tortoisemerge
+++ b/mergetools/tortoisemerge
@@ -2,6 +2,10 @@ can_diff () {
 	return 1
 }
 
+diff_cmd_help () {
+	echo "Use TortoiseMerge (requires a graphical session)"
+}
+
 merge_cmd () {
 	if $base_present
 	then
@@ -30,3 +34,7 @@ translate_merge_tool_path() {
 		echo tortoisemerge
 	fi
 }
+
+merge_cmd_help () {
+	echo "Use TortoiseMerge (requires a graphical session)"
+}
diff --git a/mergetools/vimdiff b/mergetools/vimdiff
index 96f6209a04..06937acbf5 100644
--- a/mergetools/vimdiff
+++ b/mergetools/vimdiff
@@ -1,49 +1,481 @@
+# This script can be run in two different contexts:
+#
+#   - From git, when the user invokes the "vimdiff" merge tool. In this context
+#     this script expects the following environment variables (among others) to
+#     be defined (which is something "git" takes care of):
+#
+#       - $BASE
+#       - $LOCAL
+#       - $REMOTE
+#       - $MERGED
+#
+#     In this mode, all this script does is to run the next command:
+#
+#         vim -f -c ... $LOCAL $BASE $REMOTE $MERGED
+#
+#     ...where the "..." string depends on the value of the
+#     "mergetool.vimdiff.layout" configuration variable and is used to open vim
+#     with a certain layout of buffers, windows and tabs.
+#
+#   - From a script inside the unit tests framework folder ("t" folder) by
+#     sourcing this script and then manually calling "run_unit_tests", which
+#     will run a battery of unit tests to make sure nothing breaks.
+#     In this context this script does not expect any particular environment
+#     variable to be set.
+
+
+################################################################################
+## Internal functions (not meant to be used outside this script)
+################################################################################
+
+debug_print () {
+	# Send message to stderr if global variable GIT_MERGETOOL_VIMDIFF_DEBUG
+	# is set.
+
+	if test -n "$GIT_MERGETOOL_VIMDIFF_DEBUG"
+	then
+		>&2 echo "$@"
+	fi
+}
+
+substring () {
+	# Return a substring of $1 containing $3 characters starting at
+	# zero-based offset $2.
+	#
+	# Examples:
+	#
+	#   substring "Hello world" 0 4  --> "Hell"
+	#   substring "Hello world" 3 4  --> "lo w"
+	#   substring "Hello world" 3 10 --> "lo world"
+
+	STRING=$1
+	START=$2
+	LEN=$3
+
+	echo "$STRING" | cut -c$(( START + 1 ))-$(( START + $LEN ))
+}
+
+gen_cmd_aux () {
+	# Auxiliary function used from "gen_cmd()".
+	# Read that other function documentation for more details.
+
+	LAYOUT=$1
+	CMD=$2  # This is a second (hidden) argument used for recursion
+
+	debug_print
+	debug_print "LAYOUT    : $LAYOUT"
+	debug_print "CMD       : $CMD"
+
+	start=0
+	end=${#LAYOUT}
+
+	nested=0
+	nested_min=100
+
+
+	# Step 1:
+	#
+	# Increase/decrease "start"/"end" indices respectively to get rid of
+	# outer parenthesis.
+	#
+	# Example:
+	#
+	#   - BEFORE: (( LOCAL , BASE ) / MERGED )
+	#   - AFTER :  ( LOCAL , BASE ) / MERGED
+
+	oldIFS=$IFS
+	IFS=#
+	for c in $(echo "$LAYOUT" | sed 's:.:&#:g')
+	do
+		if test "$c" = " "
+		then
+			continue
+		fi
+
+		if test "$c" = "("
+		then
+			nested=$(( nested + 1 ))
+			continue
+		fi
+
+		if test "$c" = ")"
+		then
+			nested=$(( nested - 1 ))
+			continue
+		fi
+
+		if test "$nested" -lt "$nested_min"
+		then
+			nested_min=$nested
+		fi
+	done
+	IFS=$oldIFS
+
+	debug_print "NESTED MIN: $nested_min"
+
+	while test "$nested_min" -gt "0"
+	do
+		start=$(( start + 1 ))
+		end=$(( end - 1 ))
+
+		start_minus_one=$(( start - 1 ))
+
+		while ! test "$(substring "$LAYOUT" "$start_minus_one" 1)" = "("
+		do
+			start=$(( start + 1 ))
+			start_minus_one=$(( start_minus_one + 1 ))
+		done
+
+		while ! test "$(substring "$LAYOUT" "$end" 1)" = ")"
+		do
+			end=$(( end - 1 ))
+		done
+
+		nested_min=$(( nested_min - 1 ))
+	done
+
+	debug_print "CLEAN     : $(substring "$LAYOUT" "$start" "$(( end - start ))")"
+
+
+	# Step 2:
+	#
+	# Search for all valid separators ("/" or ",") which are *not*
+	# inside parenthesis. Save the index at which each of them makes the
+	# first appearance.
+
+	index_horizontal_split=""
+	index_vertical_split=""
+
+	nested=0
+	i=$(( start - 1 ))
+
+	oldIFS=$IFS
+	IFS=#
+	for c in $(substring "$LAYOUT" "$start" "$(( end - start ))" | sed 's:.:&#:g');
+	do
+		i=$(( i + 1 ))
+
+		if test "$c" = " "
+		then
+			continue
+		fi
+
+		if test "$c" = "("
+		then
+			nested=$(( nested + 1 ))
+			continue
+		fi
+
+		if test "$c" = ")"
+		then
+			nested=$(( nested - 1 ))
+			continue
+		fi
+
+		if test "$nested" = 0
+		then
+			current=$c
+
+			if test "$current" = "/"
+			then
+				if test -z "$index_horizontal_split"
+				then
+					index_horizontal_split=$i
+				fi
+
+			elif test "$current" = ","
+			then
+				if test -z "$index_vertical_split"
+				then
+					index_vertical_split=$i
+				fi
+			fi
+		fi
+	done
+	IFS=$oldIFS
+
+
+	# Step 3:
+	#
+	# Process the separator with the highest order of precedence
+	# (";" has the highest precedence and "|" the lowest one).
+	#
+	# By "process" I mean recursively call this function twice: the first
+	# one with the substring at the left of the separator and the second one
+	# with the one at its right.
+
+	terminate="false"
+
+	if ! test -z "$index_horizontal_split"
+	then
+		before="leftabove split"
+		after="wincmd j"
+		index=$index_horizontal_split
+		terminate="true"
+
+	elif ! test -z "$index_vertical_split"
+	then
+		before="leftabove vertical split"
+		after="wincmd l"
+		index=$index_vertical_split
+		terminate="true"
+	fi
+
+	if  test "$terminate" = "true"
+	then
+		CMD="$CMD | $before"
+		CMD=$(gen_cmd_aux "$(substring "$LAYOUT" "$start" "$(( index - start ))")" "$CMD")
+		CMD="$CMD | $after"
+		CMD=$(gen_cmd_aux "$(substring "$LAYOUT" "$(( index + 1 ))" "$(( ${#LAYOUT} - index ))")" "$CMD")
+		echo "$CMD"
+		return
+	fi
+
+
+	# Step 4:
+	#
+	# If we reach this point, it means there are no separators and we just
+	# need to print the command to display the specified buffer
+
+	target=$(substring "$LAYOUT" "$start" "$(( end - start ))" | sed 's:[ @();|-]::g')
+
+	if test "$target" = "LOCAL"
+	then
+		CMD="$CMD | 1b"
+
+	elif test "$target" = "BASE"
+	then
+		CMD="$CMD | 2b"
+
+	elif test "$target" = "REMOTE"
+	then
+		CMD="$CMD | 3b"
+
+	elif test "$target" = "MERGED"
+	then
+		CMD="$CMD | 4b"
+
+	else
+		CMD="$CMD | ERROR: >$target<"
+	fi
+
+	echo "$CMD"
+	return
+}
+
+
+gen_cmd () {
+	# This function returns (in global variable FINAL_CMD) the string that
+	# you can use when invoking "vim" (as shown next) to obtain a given
+	# layout:
+	#
+	#   $ vim -f $FINAL_CMD "$LOCAL" "$BASE" "$REMOTE" "$MERGED"
+	#
+	# It takes one single argument: a string containing the desired layout
+	# definition.
+	#
+	# The syntax of the "layout definitions" is explained in "Documentation/
+	# mergetools/vimdiff.txt" but you can already intuitively understand how
+	# it works by knowing that...
+	#
+	#   * "+" means "a new vim tab"
+	#   * "/" means "a new vim horizontal split"
+	#   * "," means "a new vim vertical split"
+	#
+	# It also returns (in global variable FINAL_TARGET) the name ("LOCAL",
+	# "BASE", "REMOTE" or "MERGED") of the file that is marked with an "@",
+	# or "MERGED" if none of them is.
+	#
+	# Example:
+	#
+	#     gen_cmd "@LOCAL , REMOTE"
+	#     |
+	#     `-> FINAL_CMD    == "-c \"echo | leftabove vertical split | 1b | wincmd l | 3b | tabdo windo diffthis\" -c \"tabfirst\""
+	#         FINAL_TARGET == "LOCAL"
+
+	LAYOUT=$1
+
+
+	# Search for a "@" in one of the files identifiers ("LOCAL", "BASE",
+	# "REMOTE", "MERGED"). If not found, use "MERGE" as the default file
+	# where changes will be saved.
+
+	if echo "$LAYOUT" | grep @LOCAL >/dev/null
+	then
+		FINAL_TARGET="LOCAL"
+	elif echo "$LAYOUT" | grep @BASE >/dev/null
+	then
+		FINAL_TARGET="BASE"
+	else
+		FINAL_TARGET="MERGED"
+	fi
+
+
+	# Obtain the first part of vim "-c" option to obtain the desired layout
+
+	CMD=
+	oldIFS=$IFS
+	IFS=+
+	for tab in $LAYOUT
+	do
+		if test -z "$CMD"
+		then
+			CMD="echo" # vim "nop" operator
+		else
+			CMD="$CMD | tabnew"
+		fi
+
+		# If this is a single window diff with all the buffers
+		if ! echo "$tab" | grep ",\|/" >/dev/null
+		then
+			CMD="$CMD | silent execute 'bufdo diffthis'"
+		fi
+
+		CMD=$(gen_cmd_aux "$tab" "$CMD")
+	done
+	IFS=$oldIFS
+
+	CMD="$CMD | execute 'tabdo windo diffthis'"
+
+	FINAL_CMD="-c \"set hidden diffopt-=hiddenoff | $CMD | tabfirst\""
+}
+
+
+################################################################################
+## API functions (called from "git-mergetool--lib.sh")
+################################################################################
+
 diff_cmd () {
 	"$merge_tool_path" -R -f -d \
 		-c 'wincmd l' -c 'cd $GIT_PREFIX' "$LOCAL" "$REMOTE"
 }
 
+
+diff_cmd_help () {
+	TOOL=$1
+
+	case "$TOOL" in
+	nvimdiff*)
+		printf "Use Neovim"
+		;;
+	gvimdiff*)
+		printf "Use gVim (requires a graphical session)"
+		;;
+	vimdiff*)
+		printf "Use Vim"
+		;;
+	esac
+
+	return 0
+}
+
+
 merge_cmd () {
+	layout=$(git config mergetool.vimdiff.layout)
+
 	case "$1" in
 	*vimdiff)
-		if $base_present
+		if test -z "$layout"
 		then
-			"$merge_tool_path" -f -d -c '4wincmd w | wincmd J' \
-				"$LOCAL" "$BASE" "$REMOTE" "$MERGED"
-		else
-			"$merge_tool_path" -f -d -c 'wincmd l' \
-				"$LOCAL" "$MERGED" "$REMOTE"
+			# Default layout when none is specified
+			layout="(LOCAL,BASE,REMOTE)/MERGED"
 		fi
 		;;
 	*vimdiff1)
-		"$merge_tool_path" -f -d \
-			-c 'echon "Resolve conflicts leftward then save. Use :cq to abort."' \
-			"$LOCAL" "$REMOTE"
-		ret="$?"
-		if test "$ret" -eq 0
-		then
-			cp -- "$LOCAL" "$MERGED"
-		fi
-		return "$ret"
+		layout="@LOCAL,REMOTE"
 		;;
 	*vimdiff2)
-		"$merge_tool_path" -f -d -c 'wincmd l' \
-			"$LOCAL" "$MERGED" "$REMOTE"
+		layout="LOCAL,MERGED,REMOTE"
 		;;
 	*vimdiff3)
-		if $base_present
+		layout="MERGED"
+		;;
+	esac
+
+	gen_cmd "$layout"
+
+	debug_print ""
+	debug_print "FINAL CMD : $FINAL_CMD"
+	debug_print "FINAL TAR : $FINAL_TARGET"
+
+	if $base_present
+	then
+		eval '"$merge_tool_path"' \
+			-f "$FINAL_CMD" '"$LOCAL"' '"$BASE"' '"$REMOTE"' '"$MERGED"'
+	else
+		# If there is no BASE (example: a merge conflict in a new file
+		# with the same name created in both braches which didn't exist
+		# before), close all BASE windows using vim's "quit" command
+
+		FINAL_CMD=$(echo "$FINAL_CMD" | \
+			sed -e 's:2b:quit:g' -e 's:3b:2b:g' -e 's:4b:3b:g')
+
+		eval '"$merge_tool_path"' \
+			-f "$FINAL_CMD" '"$LOCAL"' '"$REMOTE"' '"$MERGED"'
+	fi
+
+	ret="$?"
+
+	if test "$ret" -eq 0
+	then
+		case "$FINAL_TARGET" in
+		LOCAL)
+			source_path="$LOCAL"
+			;;
+		REMOTE)
+			source_path="$REMOTE"
+			;;
+		MERGED|*)
+			# Do nothing
+			source_path=
+			;;
+		esac
+
+		if test -n "$source_path"
 		then
-			"$merge_tool_path" -f -d -c 'hid | hid | hid' \
-				"$LOCAL" "$REMOTE" "$BASE" "$MERGED"
-		else
-			"$merge_tool_path" -f -d -c 'hid | hid' \
-				"$LOCAL" "$REMOTE" "$MERGED"
+			cp "$source_path" "$MERGED"
 		fi
+	fi
+
+	return "$ret"
+}
+
+
+merge_cmd_help () {
+	TOOL=$1
+
+	case "$TOOL" in
+	nvimdiff*)
+		printf "Use Neovim "
+		;;
+	gvimdiff*)
+		printf "Use gVim (requires a graphical session) "
+		;;
+	vimdiff*)
+		printf "Use Vim "
 		;;
 	esac
+
+	case "$TOOL" in
+	*1)
+		echo "with a 2 panes layout (LOCAL and REMOTE)"
+		;;
+	*2)
+		echo "with a 3 panes layout (LOCAL, MERGED and REMOTE)"
+		;;
+	*3)
+		echo "where only the MERGED file is shown"
+		;;
+	*)
+		echo "with a custom layout (see \`git help mergetool\`'s \`BACKEND SPECIFIC HINTS\` section)"
+		;;
+	esac
+
+	return 0
 }
 
-translate_merge_tool_path() {
+
+translate_merge_tool_path () {
 	case "$1" in
 	nvimdiff*)
 		echo nvim
@@ -57,14 +489,150 @@ translate_merge_tool_path() {
 	esac
 }
 
+
 exit_code_trustable () {
 	true
 }
 
+
 list_tool_variants () {
-	for prefix in '' g n; do
-		for suffix in '' 1 2 3; do
-			echo "${prefix}vimdiff${suffix}"
+	if test "$TOOL_MODE" = "diff"
+	then
+		for prefix in '' g n
+		do
+			echo "${prefix}vimdiff"
+		done
+	else
+		for prefix in '' g n
+		do
+			for suffix in '' 1 2 3
+			do
+				echo "${prefix}vimdiff${suffix}"
+			done
 		done
+	fi
+}
+
+
+################################################################################
+## Unit tests (called from scripts inside the "t" folder)
+################################################################################
+
+run_unit_tests () {
+	# Function to make sure that we don't break anything when modifying this
+	# script.
+
+	NUMBER_OF_TEST_CASES=16
+
+	TEST_CASE_01="(LOCAL,BASE,REMOTE)/MERGED"   # default behaviour
+	TEST_CASE_02="@LOCAL,REMOTE"                # when using vimdiff1
+	TEST_CASE_03="LOCAL,MERGED,REMOTE"          # when using vimdiff2
+	TEST_CASE_04="MERGED"                       # when using vimdiff3
+	TEST_CASE_05="LOCAL/MERGED/REMOTE"
+	TEST_CASE_06="(LOCAL/REMOTE),MERGED"
+	TEST_CASE_07="MERGED,(LOCAL/REMOTE)"
+	TEST_CASE_08="(LOCAL,REMOTE)/MERGED"
+	TEST_CASE_09="MERGED/(LOCAL,REMOTE)"
+	TEST_CASE_10="(LOCAL/BASE/REMOTE),MERGED"
+	TEST_CASE_11="(LOCAL,BASE,REMOTE)/MERGED+BASE,LOCAL+BASE,REMOTE+(LOCAL/BASE/REMOTE),MERGED"
+	TEST_CASE_12="((LOCAL,REMOTE)/BASE),MERGED"
+	TEST_CASE_13="((LOCAL,REMOTE)/BASE),((LOCAL/REMOTE),MERGED)"
+	TEST_CASE_14="BASE,REMOTE+BASE,LOCAL"
+	TEST_CASE_15="  ((  (LOCAL , BASE , REMOTE) / MERGED))   +(BASE)   , LOCAL+ BASE , REMOTE+ (((LOCAL / BASE / REMOTE)) ,    MERGED   )  "
+	TEST_CASE_16="LOCAL,BASE,REMOTE / MERGED + BASE,LOCAL + BASE,REMOTE + (LOCAL / BASE / REMOTE),MERGED"
+
+	EXPECTED_CMD_01="-c \"set hidden diffopt-=hiddenoff | echo | leftabove split | leftabove vertical split | 1b | wincmd l | leftabove vertical split | 2b | wincmd l | 3b | wincmd j | 4b | execute 'tabdo windo diffthis' | tabfirst\""
+	EXPECTED_CMD_02="-c \"set hidden diffopt-=hiddenoff | echo | leftabove vertical split | 1b | wincmd l | 3b | execute 'tabdo windo diffthis' | tabfirst\""
+	EXPECTED_CMD_03="-c \"set hidden diffopt-=hiddenoff | echo | leftabove vertical split | 1b | wincmd l | leftabove vertical split | 4b | wincmd l | 3b | execute 'tabdo windo diffthis' | tabfirst\""
+	EXPECTED_CMD_04="-c \"set hidden diffopt-=hiddenoff | echo | silent execute 'bufdo diffthis' | 4b | execute 'tabdo windo diffthis' | tabfirst\""
+	EXPECTED_CMD_05="-c \"set hidden diffopt-=hiddenoff | echo | leftabove split | 1b | wincmd j | leftabove split | 4b | wincmd j | 3b | execute 'tabdo windo diffthis' | tabfirst\""
+	EXPECTED_CMD_06="-c \"set hidden diffopt-=hiddenoff | echo | leftabove vertical split | leftabove split | 1b | wincmd j | 3b | wincmd l | 4b | execute 'tabdo windo diffthis' | tabfirst\""
+	EXPECTED_CMD_07="-c \"set hidden diffopt-=hiddenoff | echo | leftabove vertical split | 4b | wincmd l | leftabove split | 1b | wincmd j | 3b | execute 'tabdo windo diffthis' | tabfirst\""
+	EXPECTED_CMD_08="-c \"set hidden diffopt-=hiddenoff | echo | leftabove split | leftabove vertical split | 1b | wincmd l | 3b | wincmd j | 4b | execute 'tabdo windo diffthis' | tabfirst\""
+	EXPECTED_CMD_09="-c \"set hidden diffopt-=hiddenoff | echo | leftabove split | 4b | wincmd j | leftabove vertical split | 1b | wincmd l | 3b | execute 'tabdo windo diffthis' | tabfirst\""
+	EXPECTED_CMD_10="-c \"set hidden diffopt-=hiddenoff | echo | leftabove vertical split | leftabove split | 1b | wincmd j | leftabove split | 2b | wincmd j | 3b | wincmd l | 4b | execute 'tabdo windo diffthis' | tabfirst\""
+	EXPECTED_CMD_11="-c \"set hidden diffopt-=hiddenoff | echo | leftabove split | leftabove vertical split | 1b | wincmd l | leftabove vertical split | 2b | wincmd l | 3b | wincmd j | 4b | tabnew | leftabove vertical split | 2b | wincmd l | 1b | tabnew | leftabove vertical split | 2b | wincmd l | 3b | tabnew | leftabove vertical split | leftabove split | 1b | wincmd j | leftabove split | 2b | wincmd j | 3b | wincmd l | 4b | execute 'tabdo windo diffthis' | tabfirst\""
+	EXPECTED_CMD_12="-c \"set hidden diffopt-=hiddenoff | echo | leftabove vertical split | leftabove split | leftabove vertical split | 1b | wincmd l | 3b | wincmd j | 2b | wincmd l | 4b | execute 'tabdo windo diffthis' | tabfirst\""
+	EXPECTED_CMD_13="-c \"set hidden diffopt-=hiddenoff | echo | leftabove vertical split | leftabove split | leftabove vertical split | 1b | wincmd l | 3b | wincmd j | 2b | wincmd l | leftabove vertical split | leftabove split | 1b | wincmd j | 3b | wincmd l | 4b | execute 'tabdo windo diffthis' | tabfirst\""
+	EXPECTED_CMD_14="-c \"set hidden diffopt-=hiddenoff | echo | leftabove vertical split | 2b | wincmd l | 3b | tabnew | leftabove vertical split | 2b | wincmd l | 1b | execute 'tabdo windo diffthis' | tabfirst\""
+	EXPECTED_CMD_15="-c \"set hidden diffopt-=hiddenoff | echo | leftabove split | leftabove vertical split | 1b | wincmd l | leftabove vertical split | 2b | wincmd l | 3b | wincmd j | 4b | tabnew | leftabove vertical split | 2b | wincmd l | 1b | tabnew | leftabove vertical split | 2b | wincmd l | 3b | tabnew | leftabove vertical split | leftabove split | 1b | wincmd j | leftabove split | 2b | wincmd j | 3b | wincmd l | 4b | execute 'tabdo windo diffthis' | tabfirst\""
+	EXPECTED_CMD_16="-c \"set hidden diffopt-=hiddenoff | echo | leftabove split | leftabove vertical split | 1b | wincmd l | leftabove vertical split | 2b | wincmd l | 3b | wincmd j | 4b | tabnew | leftabove vertical split | 2b | wincmd l | 1b | tabnew | leftabove vertical split | 2b | wincmd l | 3b | tabnew | leftabove vertical split | leftabove split | 1b | wincmd j | leftabove split | 2b | wincmd j | 3b | wincmd l | 4b | execute 'tabdo windo diffthis' | tabfirst\""
+
+	EXPECTED_TARGET_01="MERGED"
+	EXPECTED_TARGET_02="LOCAL"
+	EXPECTED_TARGET_03="MERGED"
+	EXPECTED_TARGET_04="MERGED"
+	EXPECTED_TARGET_05="MERGED"
+	EXPECTED_TARGET_06="MERGED"
+	EXPECTED_TARGET_07="MERGED"
+	EXPECTED_TARGET_08="MERGED"
+	EXPECTED_TARGET_09="MERGED"
+	EXPECTED_TARGET_10="MERGED"
+	EXPECTED_TARGET_11="MERGED"
+	EXPECTED_TARGET_12="MERGED"
+	EXPECTED_TARGET_13="MERGED"
+	EXPECTED_TARGET_14="MERGED"
+	EXPECTED_TARGET_15="MERGED"
+	EXPECTED_TARGET_16="MERGED"
+
+	at_least_one_ko="false"
+
+	for i in $(seq -w 1 99)
+	do
+		if test "$i" -gt $NUMBER_OF_TEST_CASES
+		then
+			break
+		fi
+
+		gen_cmd "$(eval echo \${TEST_CASE_"$i"})"
+
+		if test "$FINAL_CMD" = "$(eval echo \${EXPECTED_CMD_"$i"})" \
+			&& test "$FINAL_TARGET" = "$(eval echo \${EXPECTED_TARGET_"$i"})"
+		then
+			printf "Test Case #%02d: OK\n" "$(echo "$i" | sed 's/^0*//')"
+		else
+			printf "Test Case #%02d: KO !!!!\n" "$(echo "$i" | sed 's/^0*//')"
+			echo "  FINAL_CMD              : $FINAL_CMD"
+			echo "  FINAL_CMD (expected)   : $(eval echo \${EXPECTED_CMD_"$i"})"
+			echo "  FINAL_TARGET           : $FINAL_TARGET"
+			echo "  FINAL_TARGET (expected): $(eval echo \${EXPECTED_TARGET_"$i"})"
+			at_least_one_ko="true"
+		fi
 	done
+
+	# verify that `merge_cmd` handles paths with spaces
+	record_parameters () {
+		>actual
+		for arg
+		do
+			echo "$arg" >>actual
+		done
+	}
+
+	base_present=false
+	LOCAL='lo cal'
+	BASE='ba se'
+	REMOTE="' '"
+	MERGED='mer ged'
+	merge_tool_path=record_parameters
+
+	merge_cmd vimdiff || at_least_one_ko=true
+
+	cat >expect <<-\EOF
+	-f
+	-c
+	set hidden diffopt-=hiddenoff | echo | leftabove split | leftabove vertical split | 1b | wincmd l | leftabove vertical split | quit | wincmd l | 2b | wincmd j | 3b | execute 'tabdo windo diffthis' | tabfirst
+	lo cal
+	' '
+	mer ged
+	EOF
+
+	diff -u expect actual || at_least_one_ko=true
+
+	if test "$at_least_one_ko" = "true"
+	then
+		return 255
+	else
+		return 0
+	fi
 }
diff --git a/mergetools/winmerge b/mergetools/winmerge
index 74d03259fd..36c72dde6e 100644
--- a/mergetools/winmerge
+++ b/mergetools/winmerge
@@ -3,6 +3,10 @@ diff_cmd () {
 	return 0
 }
 
+diff_cmd_help () {
+	echo "Use WinMerge (requires a graphical session)"
+}
+
 merge_cmd () {
 	# mergetool.winmerge.trustExitCode is implicitly false.
 	# touch $BACKUP so that we can check_unchanged.
@@ -13,3 +17,7 @@ merge_cmd () {
 translate_merge_tool_path() {
 	mergetool_find_win32_cmd "WinMergeU.exe" "WinMerge"
 }
+
+merge_cmd_help () {
+	echo "Use WinMerge (requires a graphical session)"
+}
diff --git a/mergetools/xxdiff b/mergetools/xxdiff
index d5ce467995..cd205f9842 100644
--- a/mergetools/xxdiff
+++ b/mergetools/xxdiff
@@ -12,6 +12,10 @@ diff_cmd () {
 	fi
 }
 
+diff_cmd_help () {
+	echo "Use xxdiff (requires a graphical session)"
+}
+
 merge_cmd () {
 	if $base_present
 	then
@@ -28,3 +32,7 @@ merge_cmd () {
 			--merged-file "$MERGED" "$LOCAL" "$REMOTE"
 	fi
 }
+
+merge_cmd_help () {
+	echo "Use xxdiff (requires a graphical session)"
+}
diff --git a/midx.c b/midx.c
index 3db0e47735..5f0dd386b0 100644
--- a/midx.c
+++ b/midx.c
@@ -41,18 +41,6 @@
 
 #define PACK_EXPIRED UINT_MAX
 
-static uint8_t oid_version(void)
-{
-	switch (hash_algo_by_ptr(the_hash_algo)) {
-	case GIT_HASH_SHA1:
-		return 1;
-	case GIT_HASH_SHA256:
-		return 2;
-	default:
-		die(_("invalid hash version"));
-	}
-}
-
 const unsigned char *get_midx_checksum(struct multi_pack_index *m)
 {
 	return m->data + m->data_len - the_hash_algo->rawsz;
@@ -134,9 +122,9 @@ struct multi_pack_index *load_multi_pack_index(const char *object_dir, int local
 		      m->version);
 
 	hash_version = m->data[MIDX_BYTE_HASH_VERSION];
-	if (hash_version != oid_version()) {
+	if (hash_version != oid_version(the_hash_algo)) {
 		error(_("multi-pack-index hash version %u does not match version %u"),
-		      hash_version, oid_version());
+		      hash_version, oid_version(the_hash_algo));
 		goto cleanup_fail;
 	}
 	m->hash_len = the_hash_algo->rawsz;
@@ -420,7 +408,7 @@ static size_t write_midx_header(struct hashfile *f,
 {
 	hashwrite_be32(f, MIDX_SIGNATURE);
 	hashwrite_u8(f, MIDX_VERSION);
-	hashwrite_u8(f, oid_version());
+	hashwrite_u8(f, oid_version(the_hash_algo));
 	hashwrite_u8(f, num_chunks);
 	hashwrite_u8(f, 0); /* unused */
 	hashwrite_be32(f, num_packs);
@@ -1061,6 +1049,7 @@ static struct commit **find_commits_for_midx_bitmap(uint32_t *indexed_commits_nr
 	if (indexed_commits_nr_p)
 		*indexed_commits_nr_p = cb.commits_nr;
 
+	release_revisions(&revs);
 	return cb.commits;
 }
 
diff --git a/object-file.c b/object-file.c
index b5d1d12b68..6c8e3b1660 100644
--- a/object-file.c
+++ b/object-file.c
@@ -838,7 +838,7 @@ static void fill_alternate_refs_command(struct child_process *cmd,
 		}
 	}
 
-	strvec_pushv(&cmd->env_array, (const char **)local_repo_env);
+	strvec_pushv(&cmd->env, (const char **)local_repo_env);
 	cmd->out = -1;
 }
 
@@ -997,7 +997,7 @@ int has_loose_object_nonlocal(const struct object_id *oid)
 	return check_and_freshen_nonlocal(oid, 0);
 }
 
-static int has_loose_object(const struct object_id *oid)
+int has_loose_object(const struct object_id *oid)
 {
 	return check_and_freshen(oid, 0);
 }
@@ -1728,7 +1728,7 @@ void *read_object_file_extended(struct repository *r,
 		die(_("loose object %s (stored in %s) is corrupt"),
 		    oid_to_hex(repl), path);
 
-	if ((p = has_packed_and_bad(r, repl)) != NULL)
+	if ((p = has_packed_and_bad(r, repl)))
 		die(_("packed object %s (stored in %s) is corrupt"),
 		    oid_to_hex(repl), p->pack_name);
 	obj_read_unlock();
@@ -1893,7 +1893,9 @@ static void close_loose_object(int fd, const char *filename)
 	if (the_repository->objects->odb->will_destroy)
 		goto out;
 
-	if (fsync_object_files > 0)
+	if (batch_fsync_enabled(FSYNC_COMPONENT_LOOSE_OBJECT))
+		fsync_loose_object_bulk_checkin(fd, filename);
+	else if (fsync_object_files > 0)
 		fsync_or_die(fd, filename);
 	else
 		fsync_component_or_die(FSYNC_COMPONENT_LOOSE_OBJECT, fd,
@@ -1961,6 +1963,9 @@ static int write_loose_object(const struct object_id *oid, char *hdr,
 	static struct strbuf tmp_file = STRBUF_INIT;
 	static struct strbuf filename = STRBUF_INIT;
 
+	if (batch_fsync_enabled(FSYNC_COMPONENT_LOOSE_OBJECT))
+		prepare_loose_object_bulk_checkin();
+
 	loose_object_path(the_repository, &filename, oid);
 
 	fd = create_tmpfile(&tmp_file, filename.buf);
@@ -2035,6 +2040,8 @@ static int freshen_packed_object(const struct object_id *oid)
 	struct pack_entry e;
 	if (!find_pack_entry(the_repository, oid, &e))
 		return 0;
+	if (e.p->is_cruft)
+		return 0;
 	if (e.p->freshened)
 		return 1;
 	if (!freshen_file(e.p->pack_name))
@@ -2623,12 +2630,8 @@ int read_loose_object(const char *path,
 		goto out;
 	}
 
-	switch (unpack_loose_header(&stream, map, mapsize, hdr, sizeof(hdr),
-				    NULL)) {
-	case ULHR_OK:
-		break;
-	case ULHR_BAD:
-	case ULHR_TOO_LONG:
+	if (unpack_loose_header(&stream, map, mapsize, hdr, sizeof(hdr),
+				NULL) != ULHR_OK) {
 		error(_("unable to unpack header of %s"), path);
 		goto out;
 	}
diff --git a/object-name.c b/object-name.c
index f0e327f91f..4d2746574c 100644
--- a/object-name.c
+++ b/object-name.c
@@ -1832,7 +1832,8 @@ static void diagnose_invalid_index_path(struct repository *r,
 		pos = -pos - 1;
 	if (pos < istate->cache_nr) {
 		ce = istate->cache[pos];
-		if (ce_namelen(ce) == namelen &&
+		if (!S_ISSPARSEDIR(ce->ce_mode) &&
+		    ce_namelen(ce) == namelen &&
 		    !memcmp(ce->name, filename, namelen))
 			die(_("path '%s' is in the index, but not at stage %d\n"
 			    "hint: Did you mean ':%d:%s'?"),
@@ -1848,7 +1849,8 @@ static void diagnose_invalid_index_path(struct repository *r,
 		pos = -pos - 1;
 	if (pos < istate->cache_nr) {
 		ce = istate->cache[pos];
-		if (ce_namelen(ce) == fullname.len &&
+		if (!S_ISSPARSEDIR(ce->ce_mode) &&
+		    ce_namelen(ce) == fullname.len &&
 		    !memcmp(ce->name, fullname.buf, fullname.len))
 			die(_("path '%s' is in the index, but not '%s'\n"
 			    "hint: Did you mean ':%d:%s' aka ':%d:./%s'?"),
@@ -1881,6 +1883,20 @@ static char *resolve_relative_path(struct repository *r, const char *rel)
 			   rel);
 }
 
+static int reject_tree_in_index(struct repository *repo,
+				int only_to_die,
+				const struct cache_entry *ce,
+				int stage,
+				const char *prefix,
+				const char *cp)
+{
+	if (!S_ISSPARSEDIR(ce->ce_mode))
+		return 0;
+	if (only_to_die)
+		diagnose_invalid_index_path(repo, stage, prefix, cp);
+	return -1;
+}
+
 static enum get_oid_result get_oid_with_context_1(struct repository *repo,
 				  const char *name,
 				  unsigned flags,
@@ -1955,9 +1971,12 @@ static enum get_oid_result get_oid_with_context_1(struct repository *repo,
 			    memcmp(ce->name, cp, namelen))
 				break;
 			if (ce_stage(ce) == stage) {
+				free(new_path);
+				if (reject_tree_in_index(repo, only_to_die, ce,
+							 stage, prefix, cp))
+					return -1;
 				oidcpy(oid, &ce->oid);
 				oc->mode = ce->ce_mode;
-				free(new_path);
 				return 0;
 			}
 			pos++;
diff --git a/object-store.h b/object-store.h
index bd2322ed8c..539ea43904 100644
--- a/object-store.h
+++ b/object-store.h
@@ -115,12 +115,20 @@ struct packed_git {
 		 freshened:1,
 		 do_not_close:1,
 		 pack_promisor:1,
-		 multi_pack_index:1;
+		 multi_pack_index:1,
+		 is_cruft:1;
 	unsigned char hash[GIT_MAX_RAWSZ];
 	struct revindex_entry *revindex;
 	const uint32_t *revindex_data;
 	const uint32_t *revindex_map;
 	size_t revindex_size;
+	/*
+	 * mtimes_map points at the beginning of the memory mapped region of
+	 * this pack's corresponding .mtimes file, and mtimes_size is the size
+	 * of that .mtimes file
+	 */
+	const uint32_t *mtimes_map;
+	size_t mtimes_size;
 	/* something like ".git/objects/pack/xxxxx.pack" */
 	char pack_name[FLEX_ARRAY]; /* more */
 };
@@ -312,10 +320,6 @@ int has_object(struct repository *r, const struct object_id *oid,
  * These functions can be removed once all callers have migrated to
  * has_object() and/or oid_object_info_extended().
  */
-#ifndef NO_THE_REPOSITORY_COMPATIBILITY_MACROS
-#define has_sha1_file_with_flags(sha1, flags) repo_has_sha1_file_with_flags(the_repository, sha1, flags)
-#define has_sha1_file(sha1) repo_has_sha1_file(the_repository, sha1)
-#endif
 int repo_has_object_file(struct repository *r, const struct object_id *oid);
 int repo_has_object_file_with_flags(struct repository *r,
 				    const struct object_id *oid, int flags);
@@ -331,6 +335,8 @@ int repo_has_object_file_with_flags(struct repository *r,
  */
 int has_loose_object_nonlocal(const struct object_id *);
 
+int has_loose_object(const struct object_id *);
+
 /**
  * format_object_header() is a thin wrapper around s xsnprintf() that
  * writes the initial "<type> <obj-len>" part of the loose object
diff --git a/pack-bitmap-write.c b/pack-bitmap-write.c
index cf681547f2..c43375bd34 100644
--- a/pack-bitmap-write.c
+++ b/pack-bitmap-write.c
@@ -326,6 +326,7 @@ next:
 	trace2_data_intmax("pack-bitmap-write", the_repository,
 			   "num_maximal_commits", num_maximal);
 
+	release_revisions(&revs);
 	free_commit_list(reusable);
 }
 
diff --git a/pack-bitmap.c b/pack-bitmap.c
index 97909d48da..36134222d7 100644
--- a/pack-bitmap.c
+++ b/pack-bitmap.c
@@ -111,7 +111,7 @@ static struct ewah_bitmap *lookup_stored_bitmap(struct stored_bitmap *st)
 	struct ewah_bitmap *parent;
 	struct ewah_bitmap *composed;
 
-	if (st->xor == NULL)
+	if (!st->xor)
 		return st->root;
 
 	composed = ewah_pool_new();
@@ -279,7 +279,7 @@ static int load_bitmap_entries_v1(struct bitmap_index *index)
 		if (xor_offset > 0) {
 			xor_bitmap = recent_bitmaps[(i - xor_offset) % MAX_XOR_OFFSET];
 
-			if (xor_bitmap == NULL)
+			if (!xor_bitmap)
 				return error("Invalid XOR offset in bitmap pack index");
 		}
 
@@ -315,6 +315,8 @@ static int open_midx_bitmap_1(struct bitmap_index *bitmap_git,
 	struct stat st;
 	char *idx_name = midx_bitmap_filename(midx);
 	int fd = git_open(idx_name);
+	uint32_t i;
+	struct packed_git *preferred;
 
 	free(idx_name);
 
@@ -353,6 +355,20 @@ static int open_midx_bitmap_1(struct bitmap_index *bitmap_git,
 		warning(_("multi-pack bitmap is missing required reverse index"));
 		goto cleanup;
 	}
+
+	for (i = 0; i < bitmap_git->midx->num_packs; i++) {
+		if (prepare_midx_pack(the_repository, bitmap_git->midx, i))
+			die(_("could not open pack %s"),
+			    bitmap_git->midx->pack_names[i]);
+	}
+
+	preferred = bitmap_git->midx->packs[midx_preferred_pack(bitmap_git)];
+	if (!is_pack_valid(preferred)) {
+		warning(_("preferred pack (%s) is invalid"),
+			preferred->pack_name);
+		goto cleanup;
+	}
+
 	return 0;
 
 cleanup:
@@ -429,8 +445,6 @@ static int load_reverse_index(struct bitmap_index *bitmap_git)
 		 * 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;
@@ -728,7 +742,7 @@ static int add_commit_to_bitmap(struct bitmap_index *bitmap_git,
 	if (!or_with)
 		return 0;
 
-	if (*base == NULL)
+	if (!*base)
 		*base = ewah_to_bitmap(or_with);
 	else
 		bitmap_or_ewah(*base, or_with);
@@ -771,7 +785,7 @@ static struct bitmap *find_objects(struct bitmap_index *bitmap_git,
 	 * Best case scenario: We found bitmaps for all the roots,
 	 * so the resulting `or` bitmap has the full reachability analysis
 	 */
-	if (not_mapped == NULL)
+	if (!not_mapped)
 		return base;
 
 	roots = not_mapped;
@@ -805,7 +819,7 @@ static struct bitmap *find_objects(struct bitmap_index *bitmap_git,
 		struct include_data incdata;
 		struct bitmap_show_data show_data;
 
-		if (base == NULL)
+		if (!base)
 			base = bitmap_new();
 
 		incdata.bitmap_git = bitmap_git;
@@ -1299,7 +1313,7 @@ struct bitmap_index *prepare_bitmap_walk(struct rev_info *revs,
 		reset_revision_walk();
 		revs->ignore_missing_links = 0;
 
-		if (haves_bitmap == NULL)
+		if (!haves_bitmap)
 			BUG("failed to perform bitmap walk");
 	}
 
@@ -1698,7 +1712,7 @@ void test_bitmap_walk(struct rev_info *revs)
 		result = ewah_to_bitmap(bm);
 	}
 
-	if (result == NULL)
+	if (!result)
 		die("Commit %s doesn't have an indexed bitmap", oid_to_hex(&root->oid));
 
 	revs->tag_objects = 1;
diff --git a/pack-mtimes.c b/pack-mtimes.c
new file mode 100644
index 0000000000..0f9785fc5e
--- /dev/null
+++ b/pack-mtimes.c
@@ -0,0 +1,130 @@
+#include "git-compat-util.h"
+#include "pack-mtimes.h"
+#include "object-store.h"
+#include "packfile.h"
+
+static char *pack_mtimes_filename(struct packed_git *p)
+{
+	size_t len;
+	if (!strip_suffix(p->pack_name, ".pack", &len))
+		BUG("pack_name does not end in .pack");
+	return xstrfmt("%.*s.mtimes", (int)len, p->pack_name);
+}
+
+#define MTIMES_HEADER_SIZE (12)
+
+struct mtimes_header {
+	uint32_t signature;
+	uint32_t version;
+	uint32_t hash_id;
+};
+
+static int load_pack_mtimes_file(char *mtimes_file,
+				 uint32_t num_objects,
+				 const uint32_t **data_p, size_t *len_p)
+{
+	int fd, ret = 0;
+	struct stat st;
+	uint32_t *data = NULL;
+	size_t mtimes_size, expected_size;
+	struct mtimes_header header;
+
+	fd = git_open(mtimes_file);
+
+	if (fd < 0) {
+		ret = -1;
+		goto cleanup;
+	}
+	if (fstat(fd, &st)) {
+		ret = error_errno(_("failed to read %s"), mtimes_file);
+		goto cleanup;
+	}
+
+	mtimes_size = xsize_t(st.st_size);
+
+	if (mtimes_size < MTIMES_HEADER_SIZE) {
+		ret = error(_("mtimes file %s is too small"), mtimes_file);
+		goto cleanup;
+	}
+
+	data = xmmap(NULL, mtimes_size, PROT_READ, MAP_PRIVATE, fd, 0);
+
+	header.signature = ntohl(data[0]);
+	header.version = ntohl(data[1]);
+	header.hash_id = ntohl(data[2]);
+
+	if (header.signature != MTIMES_SIGNATURE) {
+		ret = error(_("mtimes file %s has unknown signature"), mtimes_file);
+		goto cleanup;
+	}
+
+	if (header.version != 1) {
+		ret = error(_("mtimes file %s has unsupported version %"PRIu32),
+			    mtimes_file, header.version);
+		goto cleanup;
+	}
+
+	if (!(header.hash_id == 1 || header.hash_id == 2)) {
+		ret = error(_("mtimes file %s has unsupported hash id %"PRIu32),
+			    mtimes_file, header.hash_id);
+		goto cleanup;
+	}
+
+
+	expected_size = MTIMES_HEADER_SIZE;
+	expected_size = st_add(expected_size, st_mult(sizeof(uint32_t), num_objects));
+	expected_size = st_add(expected_size, 2 * (header.hash_id == 1 ? GIT_SHA1_RAWSZ : GIT_SHA256_RAWSZ));
+
+	if (mtimes_size != expected_size) {
+		ret = error(_("mtimes file %s is corrupt"), mtimes_file);
+		goto cleanup;
+	}
+
+cleanup:
+	if (ret) {
+		if (data)
+			munmap(data, mtimes_size);
+	} else {
+		*len_p = mtimes_size;
+		*data_p = data;
+	}
+
+	if (fd >= 0)
+		close(fd);
+	return ret;
+}
+
+int load_pack_mtimes(struct packed_git *p)
+{
+	char *mtimes_name = NULL;
+	int ret = 0;
+
+	if (!p->is_cruft)
+		return ret; /* not a cruft pack */
+	if (p->mtimes_map)
+		return ret; /* already loaded */
+
+	ret = open_pack_index(p);
+	if (ret < 0)
+		goto cleanup;
+
+	mtimes_name = pack_mtimes_filename(p);
+	ret = load_pack_mtimes_file(mtimes_name,
+				    p->num_objects,
+				    &p->mtimes_map,
+				    &p->mtimes_size);
+cleanup:
+	free(mtimes_name);
+	return ret;
+}
+
+uint32_t nth_packed_mtime(struct packed_git *p, uint32_t pos)
+{
+	if (!p->mtimes_map)
+		BUG("pack .mtimes file not loaded for %s", p->pack_name);
+	if (p->num_objects <= pos)
+		BUG("pack .mtimes out-of-bounds (%"PRIu32" vs %"PRIu32")",
+		    pos, p->num_objects);
+
+	return get_be32(p->mtimes_map + pos + 3);
+}
diff --git a/pack-mtimes.h b/pack-mtimes.h
new file mode 100644
index 0000000000..cc957b3e85
--- /dev/null
+++ b/pack-mtimes.h
@@ -0,0 +1,26 @@
+#ifndef PACK_MTIMES_H
+#define PACK_MTIMES_H
+
+#include "git-compat-util.h"
+
+#define MTIMES_SIGNATURE 0x4d544d45 /* "MTME" */
+#define MTIMES_VERSION 1
+
+struct packed_git;
+
+/*
+ * Loads the .mtimes file corresponding to "p", if any, returning zero
+ * on success.
+ */
+int load_pack_mtimes(struct packed_git *p);
+
+/* Returns the mtime associated with the object at position "pos" (in
+ * lexicographic/index order) in pack "p".
+ *
+ * Note that it is a BUG() to call this function if either (a) "p" does
+ * not have a corresponding .mtimes file, or (b) it does, but it hasn't
+ * been loaded
+ */
+uint32_t nth_packed_mtime(struct packed_git *p, uint32_t pos);
+
+#endif
diff --git a/pack-objects.c b/pack-objects.c
index fe2a4eace9..272e8d4517 100644
--- a/pack-objects.c
+++ b/pack-objects.c
@@ -170,6 +170,9 @@ struct object_entry *packlist_alloc(struct packing_data *pdata,
 
 		if (pdata->layer)
 			REALLOC_ARRAY(pdata->layer, pdata->nr_alloc);
+
+		if (pdata->cruft_mtime)
+			REALLOC_ARRAY(pdata->cruft_mtime, pdata->nr_alloc);
 	}
 
 	new_entry = pdata->objects + pdata->nr_objects++;
@@ -198,6 +201,9 @@ struct object_entry *packlist_alloc(struct packing_data *pdata,
 	if (pdata->layer)
 		pdata->layer[pdata->nr_objects - 1] = 0;
 
+	if (pdata->cruft_mtime)
+		pdata->cruft_mtime[pdata->nr_objects - 1] = 0;
+
 	return new_entry;
 }
 
diff --git a/pack-objects.h b/pack-objects.h
index dca2351ef9..579476687c 100644
--- a/pack-objects.h
+++ b/pack-objects.h
@@ -116,16 +116,6 @@ struct object_entry {
 	unsigned dfs_state:OE_DFS_STATE_BITS;
 	unsigned depth:OE_DEPTH_BITS;
 	unsigned ext_base:1; /* delta_idx points outside packlist */
-
-	/*
-	 * pahole results on 64-bit linux (gcc and clang)
-	 *
-	 *   size: 80, bit_padding: 9 bits
-	 *
-	 * and on 32-bit (gcc)
-	 *
-	 *   size: 76, bit_padding: 9 bits
-	 */
 };
 
 struct packing_data {
@@ -168,6 +158,14 @@ struct packing_data {
 	/* delta islands */
 	unsigned int *tree_depth;
 	unsigned char *layer;
+
+	/*
+	 * Used when writing cruft packs.
+	 *
+	 * Object mtimes are stored in pack order when writing, but
+	 * written out in lexicographic (index) order.
+	 */
+	uint32_t *cruft_mtime;
 };
 
 void prepare_packing_data(struct repository *r, struct packing_data *pdata);
@@ -289,4 +287,21 @@ static inline void oe_set_layer(struct packing_data *pack,
 	pack->layer[e - pack->objects] = layer;
 }
 
+static inline uint32_t oe_cruft_mtime(struct packing_data *pack,
+				      struct object_entry *e)
+{
+	if (!pack->cruft_mtime)
+		return 0;
+	return pack->cruft_mtime[e - pack->objects];
+}
+
+static inline void oe_set_cruft_mtime(struct packing_data *pack,
+				      struct object_entry *e,
+				      uint32_t mtime)
+{
+	if (!pack->cruft_mtime)
+		CALLOC_ARRAY(pack->cruft_mtime, pack->nr_alloc);
+	pack->cruft_mtime[e - pack->objects] = mtime;
+}
+
 #endif
diff --git a/pack-write.c b/pack-write.c
index 51812cb129..00787e306d 100644
--- a/pack-write.c
+++ b/pack-write.c
@@ -2,6 +2,11 @@
 #include "pack.h"
 #include "csum-file.h"
 #include "remote.h"
+#include "chunk-format.h"
+#include "pack-mtimes.h"
+#include "oidmap.h"
+#include "chunk-format.h"
+#include "pack-objects.h"
 
 void reset_pack_idx_option(struct pack_idx_option *opts)
 {
@@ -181,21 +186,9 @@ static int pack_order_cmp(const void *va, const void *vb, void *ctx)
 
 static void write_rev_header(struct hashfile *f)
 {
-	uint32_t oid_version;
-	switch (hash_algo_by_ptr(the_hash_algo)) {
-	case GIT_HASH_SHA1:
-		oid_version = 1;
-		break;
-	case GIT_HASH_SHA256:
-		oid_version = 2;
-		break;
-	default:
-		die("write_rev_header: unknown hash version");
-	}
-
 	hashwrite_be32(f, RIDX_SIGNATURE);
 	hashwrite_be32(f, RIDX_VERSION);
-	hashwrite_be32(f, oid_version);
+	hashwrite_be32(f, oid_version(the_hash_algo));
 }
 
 static void write_rev_index_positions(struct hashfile *f,
@@ -288,6 +281,65 @@ const char *write_rev_file_order(const char *rev_name,
 	return rev_name;
 }
 
+static void write_mtimes_header(struct hashfile *f)
+{
+	hashwrite_be32(f, MTIMES_SIGNATURE);
+	hashwrite_be32(f, MTIMES_VERSION);
+	hashwrite_be32(f, oid_version(the_hash_algo));
+}
+
+/*
+ * Writes the object mtimes of "objects" for use in a .mtimes file.
+ * Note that objects must be in lexicographic (index) order, which is
+ * the expected ordering of these values in the .mtimes file.
+ */
+static void write_mtimes_objects(struct hashfile *f,
+				 struct packing_data *to_pack,
+				 struct pack_idx_entry **objects,
+				 uint32_t nr_objects)
+{
+	uint32_t i;
+	for (i = 0; i < nr_objects; i++) {
+		struct object_entry *e = (struct object_entry*)objects[i];
+		hashwrite_be32(f, oe_cruft_mtime(to_pack, e));
+	}
+}
+
+static void write_mtimes_trailer(struct hashfile *f, const unsigned char *hash)
+{
+	hashwrite(f, hash, the_hash_algo->rawsz);
+}
+
+static const char *write_mtimes_file(struct packing_data *to_pack,
+				     struct pack_idx_entry **objects,
+				     uint32_t nr_objects,
+				     const unsigned char *hash)
+{
+	struct strbuf tmp_file = STRBUF_INIT;
+	const char *mtimes_name;
+	struct hashfile *f;
+	int fd;
+
+	if (!to_pack)
+		BUG("cannot call write_mtimes_file with NULL packing_data");
+
+	fd = odb_mkstemp(&tmp_file, "pack/tmp_mtimes_XXXXXX");
+	mtimes_name = strbuf_detach(&tmp_file, NULL);
+	f = hashfd(fd, mtimes_name);
+
+	write_mtimes_header(f);
+	write_mtimes_objects(f, to_pack, objects, nr_objects);
+	write_mtimes_trailer(f, hash);
+
+	if (adjust_shared_perm(mtimes_name) < 0)
+		die(_("failed to make %s readable"), mtimes_name);
+
+	finalize_hashfile(f, NULL, FSYNC_COMPONENT_PACK_METADATA,
+			  CSUM_HASH_IN_STREAM | CSUM_CLOSE | CSUM_FSYNC);
+
+	return mtimes_name;
+}
+
 off_t write_pack_header(struct hashfile *f, uint32_t nr_entries)
 {
 	struct pack_header hdr;
@@ -484,11 +536,13 @@ void stage_tmp_packfiles(struct strbuf *name_buffer,
 			 const char *pack_tmp_name,
 			 struct pack_idx_entry **written_list,
 			 uint32_t nr_written,
+			 struct packing_data *to_pack,
 			 struct pack_idx_option *pack_idx_opts,
 			 unsigned char hash[],
 			 char **idx_tmp_name)
 {
 	const char *rev_tmp_name = NULL;
+	const char *mtimes_tmp_name = NULL;
 
 	if (adjust_shared_perm(pack_tmp_name))
 		die_errno("unable to make temporary pack file readable");
@@ -501,9 +555,17 @@ void stage_tmp_packfiles(struct strbuf *name_buffer,
 	rev_tmp_name = write_rev_file(NULL, written_list, nr_written, hash,
 				      pack_idx_opts->flags);
 
+	if (pack_idx_opts->flags & WRITE_MTIMES) {
+		mtimes_tmp_name = write_mtimes_file(to_pack, written_list,
+						    nr_written,
+						    hash);
+	}
+
 	rename_tmp_packfile(name_buffer, pack_tmp_name, "pack");
 	if (rev_tmp_name)
 		rename_tmp_packfile(name_buffer, rev_tmp_name, "rev");
+	if (mtimes_tmp_name)
+		rename_tmp_packfile(name_buffer, mtimes_tmp_name, "mtimes");
 }
 
 void write_promisor_file(const char *promisor_name, struct ref **sought, int nr_sought)
diff --git a/pack.h b/pack.h
index b22bfc4a18..01d385903a 100644
--- a/pack.h
+++ b/pack.h
@@ -44,6 +44,7 @@ struct pack_idx_option {
 #define WRITE_IDX_STRICT 02
 #define WRITE_REV 04
 #define WRITE_REV_VERIFY 010
+#define WRITE_MTIMES 020
 
 	uint32_t version;
 	uint32_t off32_limit;
@@ -109,11 +110,14 @@ int encode_in_pack_object_header(unsigned char *hdr, int hdr_len,
 #define PH_ERROR_PROTOCOL	(-3)
 int read_pack_header(int fd, struct pack_header *);
 
+struct packing_data;
+
 struct hashfile *create_tmp_packfile(char **pack_tmp_name);
 void stage_tmp_packfiles(struct strbuf *name_buffer,
 			 const char *pack_tmp_name,
 			 struct pack_idx_entry **written_list,
 			 uint32_t nr_written,
+			 struct packing_data *to_pack,
 			 struct pack_idx_option *pack_idx_opts,
 			 unsigned char hash[],
 			 char **idx_tmp_name);
diff --git a/packfile.c b/packfile.c
index 835b2d2716..75c254e0e0 100644
--- a/packfile.c
+++ b/packfile.c
@@ -116,7 +116,7 @@ int load_idx(const char *path, const unsigned int hashsz, void *idx_map,
 
 	if (idx_size < 4 * 256 + hashsz + hashsz)
 		return error("index file %s is too small", path);
-	if (idx_map == NULL)
+	if (!idx_map)
 		return error("empty data");
 
 	if (hdr->idx_signature == htonl(PACK_IDX_SIGNATURE)) {
@@ -334,12 +334,22 @@ static void close_pack_revindex(struct packed_git *p)
 	p->revindex_data = NULL;
 }
 
+static void close_pack_mtimes(struct packed_git *p)
+{
+	if (!p->mtimes_map)
+		return;
+
+	munmap((void *)p->mtimes_map, p->mtimes_size);
+	p->mtimes_map = NULL;
+}
+
 void close_pack(struct packed_git *p)
 {
 	close_pack_windows(p);
 	close_pack_fd(p);
 	close_pack_index(p);
 	close_pack_revindex(p);
+	close_pack_mtimes(p);
 	oidset_clear(&p->bad_objects);
 }
 
@@ -363,7 +373,7 @@ void close_object_store(struct raw_object_store *o)
 
 void unlink_pack_path(const char *pack_name, int force_delete)
 {
-	static const char *exts[] = {".pack", ".idx", ".rev", ".keep", ".bitmap", ".promisor"};
+	static const char *exts[] = {".pack", ".idx", ".rev", ".keep", ".bitmap", ".promisor", ".mtimes"};
 	int i;
 	struct strbuf buf = STRBUF_INIT;
 	size_t plen;
@@ -718,6 +728,10 @@ struct packed_git *add_packed_git(const char *path, size_t path_len, int local)
 	if (!access(p->pack_name, F_OK))
 		p->pack_promisor = 1;
 
+	xsnprintf(p->pack_name + path_len, alloc - path_len, ".mtimes");
+	if (!access(p->pack_name, F_OK))
+		p->is_cruft = 1;
+
 	xsnprintf(p->pack_name + path_len, alloc - path_len, ".pack");
 	if (stat(p->pack_name, &st) || !S_ISREG(st.st_mode)) {
 		free(p);
@@ -869,7 +883,8 @@ static void prepare_pack(const char *full_name, size_t full_name_len,
 	    ends_with(file_name, ".pack") ||
 	    ends_with(file_name, ".bitmap") ||
 	    ends_with(file_name, ".keep") ||
-	    ends_with(file_name, ".promisor"))
+	    ends_with(file_name, ".promisor") ||
+	    ends_with(file_name, ".mtimes"))
 		string_list_append(data->garbage, full_name);
 	else
 		report_garbage(PACKDIR_FILE_GARBAGE, full_name);
@@ -2214,7 +2229,17 @@ static int add_promisor_object(const struct object_id *oid,
 			       void *set_)
 {
 	struct oidset *set = set_;
-	struct object *obj = parse_object(the_repository, oid);
+	struct object *obj;
+	int we_parsed_object;
+
+	obj = lookup_object(the_repository, oid);
+	if (obj && obj->parsed) {
+		we_parsed_object = 0;
+	} else {
+		we_parsed_object = 1;
+		obj = parse_object(the_repository, oid);
+	}
+
 	if (!obj)
 		return 1;
 
@@ -2228,7 +2253,7 @@ static int add_promisor_object(const struct object_id *oid,
 		struct tree *tree = (struct tree *)obj;
 		struct tree_desc desc;
 		struct name_entry entry;
-		if (init_tree_desc_gently(&desc, tree->buffer, tree->size))
+		if (init_tree_desc_gently(&desc, tree->buffer, tree->size, 0))
 			/*
 			 * Error messages are given when packs are
 			 * verified, so do not print any here.
@@ -2236,7 +2261,8 @@ static int add_promisor_object(const struct object_id *oid,
 			return 0;
 		while (tree_entry_gently(&desc, &entry))
 			oidset_insert(set, &entry.oid);
-		free_tree_buffer(tree);
+		if (we_parsed_object)
+			free_tree_buffer(tree);
 	} else if (obj->type == OBJ_COMMIT) {
 		struct commit *commit = (struct commit *) obj;
 		struct commit_list *parents = commit->parents;
diff --git a/pager.c b/pager.c
index 27877f8ebb..5cfe23b025 100644
--- a/pager.c
+++ b/pager.c
@@ -99,7 +99,7 @@ void prepare_pager_args(struct child_process *pager_process, const char *pager)
 {
 	strvec_push(&pager_process->args, pager);
 	pager_process->use_shell = 1;
-	setup_pager_env(&pager_process->env_array);
+	setup_pager_env(&pager_process->env);
 	pager_process->trace2_child_class = "pager";
 }
 
@@ -129,7 +129,7 @@ void setup_pager(void)
 	/* spawn the pager */
 	prepare_pager_args(&pager_process, pager);
 	pager_process.in = -1;
-	strvec_push(&pager_process.env_array, "GIT_PAGER_IN_USE");
+	strvec_push(&pager_process.env, "GIT_PAGER_IN_USE");
 	if (start_command(&pager_process))
 		return;
 
diff --git a/parallel-checkout.c b/parallel-checkout.c
index 31a3d0ee1b..4f6819f240 100644
--- a/parallel-checkout.c
+++ b/parallel-checkout.c
@@ -143,7 +143,8 @@ static int is_eligible_for_parallel_checkout(const struct cache_entry *ce,
 	}
 }
 
-int enqueue_checkout(struct cache_entry *ce, struct conv_attrs *ca)
+int enqueue_checkout(struct cache_entry *ce, struct conv_attrs *ca,
+		     int *checkout_counter)
 {
 	struct parallel_checkout_item *pc_item;
 
@@ -159,6 +160,7 @@ int enqueue_checkout(struct cache_entry *ce, struct conv_attrs *ca)
 	memcpy(&pc_item->ca, ca, sizeof(pc_item->ca));
 	pc_item->status = PC_ITEM_PENDING;
 	pc_item->id = parallel_checkout.nr;
+	pc_item->checkout_counter = checkout_counter;
 	parallel_checkout.nr++;
 
 	return 0;
@@ -200,7 +202,8 @@ static int handle_results(struct checkout *state)
 
 		switch(pc_item->status) {
 		case PC_ITEM_WRITTEN:
-			/* Already handled */
+			if (pc_item->checkout_counter)
+				(*pc_item->checkout_counter)++;
 			break;
 		case PC_ITEM_COLLIDED:
 			/*
@@ -225,7 +228,8 @@ static int handle_results(struct checkout *state)
 			 * add any extra overhead.
 			 */
 			ret |= checkout_entry_ca(pc_item->ce, &pc_item->ca,
-						 state, NULL, NULL);
+						 state, NULL,
+						 pc_item->checkout_counter);
 			advance_progress_meter();
 			break;
 		case PC_ITEM_PENDING:
diff --git a/parallel-checkout.h b/parallel-checkout.h
index 80f539bcb7..c575284005 100644
--- a/parallel-checkout.h
+++ b/parallel-checkout.h
@@ -31,7 +31,8 @@ void init_parallel_checkout(void);
  * entry is not eligible for parallel checkout. Otherwise, enqueue the entry
  * for later write and return 0.
  */
-int enqueue_checkout(struct cache_entry *ce, struct conv_attrs *ca);
+int enqueue_checkout(struct cache_entry *ce, struct conv_attrs *ca,
+		     int *checkout_counter);
 size_t pc_queue_size(void);
 
 /*
@@ -68,6 +69,7 @@ struct parallel_checkout_item {
 	struct cache_entry *ce;
 	struct conv_attrs ca;
 	size_t id; /* position in parallel_checkout.items[] of main process */
+	int *checkout_counter;
 
 	/* Output fields, sent from workers. */
 	enum pc_item_status status;
diff --git a/parse-options.c b/parse-options.c
index 6e57744fd2..edf55d3ef5 100644
--- a/parse-options.c
+++ b/parse-options.c
@@ -14,15 +14,15 @@ enum opt_parsed {
 	OPT_UNSET = 1<<1,
 };
 
-static int optbug(const struct option *opt, const char *reason)
+static void optbug(const struct option *opt, const char *reason)
 {
-	if (opt->long_name) {
-		if (opt->short_name)
-			return error("BUG: switch '%c' (--%s) %s",
-				     opt->short_name, opt->long_name, reason);
-		return error("BUG: option '%s' %s", opt->long_name, reason);
-	}
-	return error("BUG: switch '%c' %s", opt->short_name, reason);
+	if (opt->long_name && opt->short_name)
+		bug("switch '%c' (--%s) %s", opt->short_name,
+		    opt->long_name, reason);
+	else if (opt->long_name)
+		bug("option '%s' %s", opt->long_name, reason);
+	else
+		bug("switch '%c' %s", opt->short_name, reason);
 }
 
 static const char *optname(const struct option *opt, enum opt_parsed flags)
@@ -441,28 +441,27 @@ static void check_typos(const char *arg, const struct option *options)
 
 static void parse_options_check(const struct option *opts)
 {
-	int err = 0;
 	char short_opts[128];
 
 	memset(short_opts, '\0', sizeof(short_opts));
 	for (; opts->type != OPTION_END; opts++) {
 		if ((opts->flags & PARSE_OPT_LASTARG_DEFAULT) &&
 		    (opts->flags & PARSE_OPT_OPTARG))
-			err |= optbug(opts, "uses incompatible flags "
-					"LASTARG_DEFAULT and OPTARG");
+			optbug(opts, "uses incompatible flags "
+			       "LASTARG_DEFAULT and OPTARG");
 		if (opts->short_name) {
 			if (0x7F <= opts->short_name)
-				err |= optbug(opts, "invalid short name");
+				optbug(opts, "invalid short name");
 			else if (short_opts[opts->short_name]++)
-				err |= optbug(opts, "short name already used");
+				optbug(opts, "short name already used");
 		}
 		if (opts->flags & PARSE_OPT_NODASH &&
 		    ((opts->flags & PARSE_OPT_OPTARG) ||
 		     !(opts->flags & PARSE_OPT_NOARG) ||
 		     !(opts->flags & PARSE_OPT_NONEG) ||
 		     opts->long_name))
-			err |= optbug(opts, "uses feature "
-					"not supported for dashless options");
+			optbug(opts, "uses feature "
+			       "not supported for dashless options");
 		switch (opts->type) {
 		case OPTION_COUNTUP:
 		case OPTION_BIT:
@@ -471,33 +470,33 @@ static void parse_options_check(const struct option *opts)
 		case OPTION_NUMBER:
 			if ((opts->flags & PARSE_OPT_OPTARG) ||
 			    !(opts->flags & PARSE_OPT_NOARG))
-				err |= optbug(opts, "should not accept an argument");
+				optbug(opts, "should not accept an argument");
 			break;
 		case OPTION_CALLBACK:
 			if (!opts->callback && !opts->ll_callback)
-				BUG("OPTION_CALLBACK needs one callback");
-			if (opts->callback && opts->ll_callback)
-				BUG("OPTION_CALLBACK can't have two callbacks");
+				optbug(opts, "OPTION_CALLBACK needs one callback");
+			else if (opts->callback && opts->ll_callback)
+				optbug(opts, "OPTION_CALLBACK can't have two callbacks");
 			break;
 		case OPTION_LOWLEVEL_CALLBACK:
 			if (!opts->ll_callback)
-				BUG("OPTION_LOWLEVEL_CALLBACK needs a callback");
+				optbug(opts, "OPTION_LOWLEVEL_CALLBACK needs a callback");
 			if (opts->callback)
-				BUG("OPTION_LOWLEVEL_CALLBACK needs no high level callback");
+				optbug(opts, "OPTION_LOWLEVEL_CALLBACK needs no high level callback");
 			break;
 		case OPTION_ALIAS:
-			BUG("OPT_ALIAS() should not remain at this point. "
-			    "Are you using parse_options_step() directly?\n"
-			    "That case is not supported yet.");
+			optbug(opts, "OPT_ALIAS() should not remain at this point. "
+			       "Are you using parse_options_step() directly?\n"
+			       "That case is not supported yet.");
+			break;
 		default:
 			; /* ok. (usually accepts an argument) */
 		}
 		if (opts->argh &&
 		    strcspn(opts->argh, " _") != strlen(opts->argh))
-			err |= optbug(opts, "multi-word argh should use dash to separate words");
+			optbug(opts, "multi-word argh should use dash to separate words");
 	}
-	if (err)
-		exit(128);
+	BUG_if_bug("invalid 'struct option'");
 }
 
 static void parse_options_start_1(struct parse_opt_ctx_t *ctx,
diff --git a/path.c b/path.c
index d73146b6cd..a3cfcd8a6e 100644
--- a/path.c
+++ b/path.c
@@ -733,7 +733,7 @@ char *interpolate_path(const char *path, int real_home)
 	struct strbuf user_path = STRBUF_INIT;
 	const char *to_copy = path;
 
-	if (path == NULL)
+	if (!path)
 		goto return_null;
 
 	if (skip_prefix(path, "%(prefix)/", &path))
@@ -1413,7 +1413,7 @@ int is_ntfs_dotgit(const char *name)
 
 	for (;;) {
 		c = *(name++);
-		if (!c || c == '\\' || c == '/' || c == ':')
+		if (!c || is_xplatform_dir_sep(c) || c == ':')
 			return 1;
 		if (c != '.' && c != ' ')
 			return 0;
diff --git a/pathspec.c b/pathspec.c
index ddeeba7911..84ad9c73cf 100644
--- a/pathspec.c
+++ b/pathspec.c
@@ -629,7 +629,7 @@ void parse_pathspec(struct pathspec *pathspec,
 	 */
 	if (nr_exclude == n) {
 		int plen = (!(flags & PATHSPEC_PREFER_CWD)) ? 0 : prefixlen;
-		init_pathspec_item(item + n, 0, prefix, plen, "");
+		init_pathspec_item(item + n, 0, prefix, plen, ".");
 		pathspec->nr++;
 	}
 
diff --git a/pkt-line.h b/pkt-line.h
index 6d2a63db23..1f623de60a 100644
--- a/pkt-line.h
+++ b/pkt-line.h
@@ -49,14 +49,6 @@ 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.
  *
- * If src_buffer and *src_buffer are not NULL, it should point to a buffer
- * containing the packet data to parse, of at least *src_len bytes.  After the
- * function returns, src_buf will be incremented and src_len decremented by the
- * number of bytes consumed.
- *
- * If src_buffer (or *src_buffer) is NULL, then data is read from the
- * descriptor "fd".
- *
  * If options does not contain PACKET_READ_GENTLE_ON_EOF, we will die under any
  * of the following conditions:
  *
@@ -104,6 +96,14 @@ int packet_length(const char lenbuf_hex[4]);
  * returns an 'enum packet_read_status' which indicates the status of the read.
  * The number of bytes read will be assigned to *pktlen if the status of the
  * read was 'PACKET_READ_NORMAL'.
+ *
+ * If src_buffer and *src_buffer are not NULL, it should point to a buffer
+ * containing the packet data to parse, of at least *src_len bytes.  After the
+ * function returns, src_buf will be incremented and src_len decremented by the
+ * number of bytes consumed.
+ *
+ * If src_buffer (or *src_buffer) is NULL, then data is read from the
+ * descriptor "fd".
  */
 enum packet_read_status {
 	PACKET_READ_EOF,
diff --git a/po/.gitignore b/po/.gitignore
index 796b96d1c4..ff0e5176a6 100644
--- a/po/.gitignore
+++ b/po/.gitignore
@@ -1 +1,3 @@
 /build
+/git.pot
+/git-core.pot
diff --git a/po/README.md b/po/README.md
index 19fabb4acf..3e4f897d93 100644
--- a/po/README.md
+++ b/po/README.md
@@ -5,12 +5,18 @@ describes how you can contribute to the effort of enhancing the language
 coverage and maintaining the translation.
 
 The localization (l10n) coordinator, Jiang Xin <worldhello.net@gmail.com>,
-coordinates our localization effort in the l10 coordinator repository:
+coordinates our localization effort in the l10n coordinator repository:
 
     https://github.com/git-l10n/git-po/
 
-The two character language translation codes are defined by ISO\_639-1, as
-stated in the gettext(1) full manual, appendix A.1, Usual Language Codes.
+We will use XX as an alias to refer to the language translation code in
+the following paragraphs, for example we use "po/XX.po" to refer to the
+translation file for a specific language. But this doesn't mean that
+the language code has only two letters. The language code can be in one
+of two forms: "ll" or "ll\_CC". Here "ll" is the ISO 639 two-letter
+language code and "CC" is the ISO 3166 two-letter code for country names
+and subdivisions. For example: "de" for German language code, "zh\_CN"
+for Simplified Chinese language code.
 
 
 ## Contributing to an existing translation
@@ -39,72 +45,74 @@ language, so that the l10n coordinator only needs to interact with one
 person per language.
 
 
-## Core translation
+## Translation Process Flow
 
-The core translation is the smallest set of work that must be completed
-for a new language translation. Because there are more than 5000 messages
-in the template message file "po/git.pot" that need to be translated,
-this is not a piece of cake for the contributor for a new language.
+The overall data-flow looks like this:
 
-The core template message file which contains a small set of messages
-will be generated in "po-core/core.pot" automatically by running a helper
-program named "git-po-helper" (described later).
+    +-------------------+             +------------------+
+    | Git source code   | ----(2)---> | L10n coordinator |
+    | repository        | <---(5)---- | repository       |
+    +-------------------+             +------------------+
+                    |                     |    ^
+                   (1)                   (3)  (4)
+                    V                     v    |
+               +----------------------------------+
+               |        Language Team XX          |
+               +----------------------------------+
 
-```shell
-git-po-helper init --core XX.po
-```
+- Translatable strings are marked in the source file.
+- Language teams can start translation iterations at any time, even
+  before the l10n window opens:
 
-After translating the generated "po-core/XX.po", you can merge it to
-"po/XX.po" using the following commands:
+  + Pull from the master branch of the source (1)
+  + Update the message file by running "make po-update PO\_FILE=po/XX.po"
+  + Translate the message file "po/XX.po"
 
-```shell
-msgcat po-core/XX.po po/XX.po -s -o /tmp/XX.po
-mv /tmp/XX.po po/XX.po
-git-po-helper update XX.po
-```
+- The L10n coordinator pulls from source and announces the l10n window
+  open (2)
+- Language team pulls from the l10n coordinator, starts another
+  translation iteration against the l10n coordinator's tree (3)
 
-Edit "po/XX.po" by hand to fix "fuzzy" messages, which may have misplaced
-translated messages and duplicate messages.
+  + Run "git pull --rebase" from the l10n coordinator
+  + Update the message file by running "make po-update PO\_FILE=po/XX.po"
+  + Translate the message file "po/XX.po"
+  + Squash trivial l10n git commits using "git rebase -i"
 
+- Language team sends pull request to the l10n coordinator (4)
+- L10n coordinator checks and merges
+- L10n coordinator asks the result to be pulled (5).
 
-## Translation Process Flow
 
-The overall data-flow looks like this:
+## Dynamically generated POT files
 
-    +-------------------+            +------------------+
-    | Git source code   | ---(1)---> | L10n coordinator |
-    | repository        | <---(4)--- | repository       |
-    +-------------------+            +------------------+
-                                          |      ^
-                                         (2)    (3)
-                                          V      |
-                                     +------------------+
-                                     | Language Team XX |
-                                     +------------------+
+POT files are templates for l10n contributors to create or update their
+translation files. We used to have the "po/git.pot" file which was
+generated by the l10n coordinator, but this file had been removed from
+the tree.
 
-- Translatable strings are marked in the source file.
-- L10n coordinator pulls from the source (1)
-- L10n coordinator updates the message template "po/git.pot"
-- Language team pulls from L10n coordinator (2)
-- Language team updates the message file "po/XX.po"
-- L10n coordinator pulls from Language team (3)
-- L10n coordinator asks the result to be pulled (4).
+The two POT files "po/git.pot" and "po/git-core.pot" can be created
+dynamically when necessary.
 
+L10n contributors use "po/git.pot" to prepare translations for their
+languages, but they are not expected to modify it. The "po/git.pot" file
+can be generated manually with the following command:
 
-## Maintaining the "po/git.pot" file
+```shell
+make po/git.pot
+```
 
-(This is done by the l10n coordinator).
+The "po/git-core.pot" file is the template for core translations. A core
+translation is the minimum set of work necessary to complete a
+translation of a new language. Since there are more than 5000 messages
+in the full set of template message file "po/git.pot" that need to be
+translated, this is not a piece of cake for new language contributors.
 
-The "po/git.pot" file contains a message catalog extracted from Git's
-sources. The l10n coordinator maintains it by adding new translations with
-msginit(1), or update existing ones with msgmerge(1).  In order to update
-the Git sources to extract the messages from, the l10n coordinator is
-expected to pull from the main git repository at strategic point in
-history (e.g. when a major release and release candidates are tagged),
-and then run "make pot" at the top-level directory.
+The "core" template file "po/git-core.pot" can be generated manually
+by running:
 
-Language contributors use this file to prepare translations for their
-language, but they are not expected to modify it.
+```shell
+make po/git-core.pot
+```
 
 
 ## Initializing a "XX.po" file
@@ -115,32 +123,14 @@ If your language XX does not have translated message file "po/XX.po" yet,
 you add a translation for the first time by running:
 
 ```shell
-msginit --locale=XX
+make po-init PO_FILE=po/XX.po
 ```
 
-in the "po/" directory, where XX is the locale, e.g. "de", "is", "pt\_BR",
-"zh\_CN", etc.
-
-Then edit the automatically generated copyright info in your new "XX.po"
-to be correct, e.g. for Icelandic:
-
-```diff
-@@ -1,6 +1,6 @@
--# Icelandic translations for PACKAGE package.
--# Copyright (C) 2010 THE PACKAGE'S COPYRIGHT HOLDER
--# This file is distributed under the same license as the PACKAGE package.
-+# Icelandic translations for Git.
-+# Copyright (C) 2010 Ævar Arnfjörð Bjarmason <avarab@gmail.com>
-+# This file is distributed under the same license as the Git package.
- # Ævar Arnfjörð Bjarmason <avarab@gmail.com>, 2010.
-```
-
-And change references to PACKAGE VERSION in the PO Header Entry to
-just "Git":
+where XX is the locale, e.g. "de", "is", "pt\_BR", "zh\_CN", etc.
 
-```shell
-perl -pi -e 's/(?<="Project-Id-Version: )PACKAGE VERSION/Git/' XX.po
-```
+The newly generated message file "po/XX.po" is based on the core pot
+file "po/git-core.pot", so it contains only a minimal set of messages
+and it's a good start for a new language contribution.
 
 Once you are done testing the translation (see below), commit the result
 and ask the l10n coordinator to pull from you.
@@ -153,19 +143,53 @@ and ask the l10n coordinator to pull from you.
 If you are replacing translation strings in an existing "XX.po" file to
 improve the translation, just edit the file.
 
-If there's an existing "XX.po" file for your language, but the repository
-of the l10n coordinator has newer "po/git.pot" file, you would need to first
-pull from the l10n coordinator (see the beginning of this document for its
-URL), and then update the existing translation by running:
+If you want to find new translatable strings in source files of upstream
+repository and propagate them to your "po/XX.po", run command:
 
 ```shell
-msgmerge --add-location --backup=off -U XX.po git.pot
+make po-update PO_FILE=po/XX.po
 ```
 
-in the "po/" directory, where "XX.po" is the file you want to update.
+It will:
 
-Once you are done testing the translation (see below), commit the result
-and ask the l10n coordinator to pull from you.
+- Call "make po/git.pot" to generate new "po/git.pot" file
+- Call "msgmerge --add-location --backup=off -U po/XX.po po/git.pot"
+  to update your "po/XX.po"
+- The "--add-location" option for msgmerge will add location lines,
+  and these location lines will help translation tools to locate
+  translation context easily.
+
+Once you are done testing the translation (see below), it's better
+to commit a location-less "po/XX.po" file to save repository space
+and make a user-friendly patch for review.
+
+To save a location-less "po/XX.po" automatically in repository, you
+can:
+
+First define a new attribute for "po/XX.po" by appending the following
+line in ".git/info/attributes":
+
+```
+/po/XX.po filter=gettext-no-location
+```
+
+Then define the driver for the "gettext-no-location" clean filter to
+strip out both filenames and locations from the contents as follows:
+
+```shell
+git config --global filter.gettext-no-location.clean \
+           "msgcat --no-location -"
+```
+
+For users who have gettext version 0.20 or higher, it is also possible
+to define a clean filter to preserve filenames but not locations:
+
+```shell
+git config --global filter.gettext-no-location.clean \
+           "msgcat --add-location=file -"
+```
+
+You're now ready to ask the l10n coordinator to pull from you.
 
 
 ## Fuzzy translation
@@ -196,6 +220,14 @@ common errors, e.g. missing printf format strings, or translated
 messages that deviate from the originals in whether they begin/end
 with a newline or not.
 
+L10n coordinator will check your contributions using a helper program
+(see "PO helper" section below):
+
+```shell
+git-po-helper check-po po/XX.po
+git-po-helper check-commits <rev-list-opts>
+```
+
 
 ## Marking strings for translation
 
@@ -370,29 +402,6 @@ l10n workflow.
 To build and install the helper program from source, see
 [git-po-helper/README][].
 
-Usage for git-po-helper:
-
-- To start a new language translation:
-
-  ```shell
-  git-po-helper init XX.po
-  ```
-
-- To update your "XX.po" file:
-
-  ```shell
-  git-po-helper update XX.po
-  ```
-
-- To check commit log and syntax of "XX.po":
-
-  ```shell
-  git-po-helper check-po XX.po
-  git-po-helper check-commits
-  ```
-
-Run "git-po-helper" without arguments to show usage.
-
 
 ## Conventions
 
@@ -436,13 +445,8 @@ additional conventions:
 - Initialize proper filename of the "XX.po" file conforming to
   iso-639 and iso-3166.
 
-- Must complete a minimal translation based on the "po-core/core.pot"
-  template. Using the following command to initialize the minimal
-  "po-core/XX.po" file:
-
-  ```shell
-  git-po-helper init --core <your-language>
-  ```
+- Must complete a minimal translation based on the "Core
+  translation". See that section above.
 
 - Add a new entry in the "po/TEAMS" file with proper format, and check
   the syntax of "po/TEAMS" by running the following command:
diff --git a/po/TEAMS b/po/TEAMS
index 2e407267c8..5a63397655 100644
--- a/po/TEAMS
+++ b/po/TEAMS
@@ -11,9 +11,9 @@ Leader:		Jordi Mas <jmas@softcatala.org>
 Members:	Alex Henrie <alexhenrie24@gmail.com>
 
 Language:	de (German)
-Repository:	https://github.com/ruester/git-po-de
-Leader:		Matthias Rüster <matthias.ruester@gmail.com>
-Members:	Ralf Thielow <ralf.thielow@gmail.com>
+Repository:	https://github.com/ralfth/git
+Leader:		Ralf Thielow <ralf.thielow@gmail.com>
+Members:	Matthias Rüster <matthias.ruester@gmail.com>
 		Phillip Szelat <phillip.szelat@gmail.com>
 
 Language:	el (Greek)
diff --git a/po/bg.po b/po/bg.po
index 8328531d33..934784fe52 100644
--- a/po/bg.po
+++ b/po/bg.po
@@ -29,7 +29,7 @@
 # git bundle пратка на git
 # bisect двоично търсене
 # am прилагам поредица от кръпки
-# working directory/tree — винаги работно дърво, git следи цялото дърво, а не директории, работна директория за cwd
+# working directory/tree/worktree — винаги работно дърво, git следи цялото дърво, а не директории, работна директория за cwd
 # switch to branch преминавам към клон
 # sparse entry/blob частично изтеглена директория/път/обект-BLOB
 # sparse index частичен индекс
@@ -48,8 +48,8 @@
 # mixed reset смесено зануляване (индекса и указателя „HEAD“, без работното дърво)
 # soft reset меко зануляване (само указателя „HEAD“, без индекса и работното дърво)
 # hard reset пълно зануляване (указателя „HEAD“, индекса и работното дърво)
-# merge reset слято зануляване (целия индекс и отчасти работното дърво — без файловете с промени между работното дърво и индекса)
-# keep reset запазващо зануляване (отчасти индекса и работното дърво — файловете с промени от подаването и „HEAD“)
+# merge reset слято зануляване (целия индекс и отчасти работното дърво — без файловете с промѐни между работното дърво и индекса)
+# keep reset запазващо зануляване (отчасти индекса и работното дърво — файловете с промѐни от подаването и „HEAD“)
 # commit-ish указател към подаване
 # sequence последователност/поредица
 # whitespace symbol знаци за интервали
@@ -88,7 +88,7 @@
 # nested tag - непряк етикет
 # strip - премахвам (за компонент при филтриране)
 # unrelated histories - независими истории
-# inexact rename detection търсене на преименувания на обекти съчетани с промени
+# inexact rename detection търсене на преименувания на обекти съчетани с промѐни
 # hunk парче
 # binary patch двоична кръпка
 # reverse-apply прилагам в обратна посока
@@ -153,7 +153,7 @@
 # end packet пакет за край
 # identity самоличност, информация за
 # boundary commit гранично подаване
-# integrate (changes) внасяне (на промени)
+# integrate (changes) внасяне (на промѐни)
 # overflow data данни за отместването
 # reverse index обратен индекс (а не обърнат, за да не се бърка с reverse key index)
 # preferred предпочитан
@@ -168,6 +168,23 @@
 # zealous merge засилено сливане
 # unregister отчислявам
 # marked counting изброяване
+# good/bad commit добро/лошо подаване
+# unreferenced object обект, към който нищо не сочи
+# reference = ref указател
+# revision = rev версия
+# specifier уточнение
+# unset изчиствам (стойност/настройка)
+# batch пакетен режим
+# skip-worktree bit флага файл само за индекса/прескачане на работното дърво
+# IPC комуникация между процеси
+# thread pool запас нишки
+# listener thread слушаща нишка
+# health thread нишка за следене на състоянието
+# cruft ненужни обекти
+# traverse обхождам
+# timestamp времево клеймо
+# bare repository голо хранилище
+#
 # ------------------------
 # „$var“ - може да не сработва за shell има gettext и eval_gettext - проверка - намират се лесно по „$
 # ------------------------
@@ -185,10 +202,10 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: git 2.34\n"
+"Project-Id-Version: git 2.37\n"
 "Report-Msgid-Bugs-To: Git Mailing List <git@vger.kernel.org>\n"
-"POT-Creation-Date: 2022-01-17 08:34+0800\n"
-"PO-Revision-Date: 2022-01-16 10:50+0100\n"
+"POT-Creation-Date: 2022-06-22 15:43+0200\n"
+"PO-Revision-Date: 2022-06-22 15:44+0200\n"
 "Last-Translator: Alexander Shopov <ash@kambanaria.org>\n"
 "Language-Team: Bulgarian <dict@fsa-bg.org>\n"
 "Language: bg\n"
@@ -197,239 +214,176 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: add-interactive.c:380
 #, c-format
 msgid "Huh (%s)?"
 msgstr "Неуспешен анализ — „%s“."
 
-#: add-interactive.c:533 add-interactive.c:834 reset.c:65 sequencer.c:3509
-#: sequencer.c:3974 sequencer.c:4136 builtin/rebase.c:1233
-#: builtin/rebase.c:1642
 msgid "could not read index"
 msgstr "индексът не може да бъде прочетен"
 
-#: add-interactive.c:588 git-add--interactive.perl:269
-#: git-add--interactive.perl:294
 msgid "binary"
 msgstr "двоично"
 
-#: add-interactive.c:646 git-add--interactive.perl:278
-#: git-add--interactive.perl:332
 msgid "nothing"
 msgstr "нищо"
 
-#: add-interactive.c:647 git-add--interactive.perl:314
-#: git-add--interactive.perl:329
 msgid "unchanged"
-msgstr "няма промени"
+msgstr "няма промѐни"
 
-#: add-interactive.c:684 git-add--interactive.perl:641
 msgid "Update"
 msgstr "Обновяване"
 
-#: add-interactive.c:701 add-interactive.c:889
 #, c-format
 msgid "could not stage '%s'"
 msgstr "неуспешно добавяне в индекса на „%s“"
 
-#: add-interactive.c:707 add-interactive.c:896 reset.c:89 sequencer.c:3713
 msgid "could not write index"
 msgstr "индексът не може да бъде записан"
 
-#: 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:728 git-add--interactive.perl:676
 #, c-format, perl-format
 msgid "note: %s is untracked now.\n"
 msgstr "БЕЛЕЖКА: „%s“ вече не се следи.\n"
 
-#: add-interactive.c:733 apply.c:4151 builtin/checkout.c:306
-#: builtin/reset.c:167
 #, c-format
 msgid "make_cache_entry failed for path '%s'"
 msgstr "неуспешно създаване на запис в кеша чрез „make_cache_entry“ за „%s“"
 
-#: add-interactive.c:763 git-add--interactive.perl:653
 msgid "Revert"
 msgstr "Отмяна"
 
-#: add-interactive.c:779
 msgid "Could not parse HEAD^{tree}"
 msgstr "Указателят „HEAD^{tree}“ не може да бъде анализиран"
 
-#: 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"
+msgstr[0] "%d файл с отменени промѐни\n"
+msgstr[1] "%d файла с отменени промѐни\n"
 
-#: add-interactive.c:868 git-add--interactive.perl:693
 #, c-format
 msgid "No untracked files.\n"
 msgstr "Няма неследени файлове.\n"
 
-#: add-interactive.c:872 git-add--interactive.perl:687
 msgid "Add untracked"
 msgstr "Добавяне на неследени"
 
-#: 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:929
 #, c-format
 msgid "ignoring unmerged: %s"
 msgstr "пренебрегване на неслятото: „%s“"
 
-#: add-interactive.c:941 add-patch.c:1752 git-add--interactive.perl:1371
 #, c-format
 msgid "Only binary files changed.\n"
 msgstr "Само двоични файлове са променени.\n"
 
-#: add-interactive.c:943 add-patch.c:1750 git-add--interactive.perl:1373
 #, c-format
 msgid "No changes.\n"
-msgstr "Няма промени.\n"
+msgstr "Няма промѐни.\n"
 
-#: add-interactive.c:947 git-add--interactive.perl:1381
 msgid "Patch update"
 msgstr "Обновяване на кръпка"
 
-#: add-interactive.c:986 git-add--interactive.perl:1794
 msgid "Review diff"
 msgstr "Преглед на разликата"
 
-#: add-interactive.c:1014
 msgid "show paths with changes"
-msgstr "извеждане на пътищата с промени"
+msgstr "извеждане на пътищата с промѐни"
 
-#: add-interactive.c:1016
 msgid "add working tree state to the staged set of changes"
-msgstr "добавяне на състоянието на работното дърво към промените в индекса"
+msgstr "добавяне на състоянието на работното дърво към промѐните в индекса"
 
-#: add-interactive.c:1018
 msgid "revert staged set of changes back to the HEAD version"
 msgstr "връщане на състоянието на индекса към соченото от „HEAD“"
 
-#: add-interactive.c:1020
 msgid "pick hunks and update selectively"
 msgstr "интерактивни избор и промяна на парчета код"
 
-#: add-interactive.c:1022
 msgid "view diff between HEAD and index"
 msgstr "разлика между соченото от „HEAD“ и индекса"
 
-#: add-interactive.c:1024
 msgid "add contents of untracked files to the staged set of changes"
 msgstr "добавяне на съдържанието на неследените файлове към индекса"
 
-#: add-interactive.c:1032 add-interactive.c:1081
 msgid "Prompt help:"
 msgstr "Помощ:"
 
-#: add-interactive.c:1034
 msgid "select a single item"
 msgstr "избор на eдин елемент"
 
-#: add-interactive.c:1036
 msgid "select a range of items"
 msgstr "избор на поредица от елементи"
 
-#: add-interactive.c:1038
 msgid "select multiple ranges"
 msgstr "избор на няколко поредици от елементи"
 
-#: add-interactive.c:1040 add-interactive.c:1085
 msgid "select item based on unique prefix"
 msgstr "избор на базата на уникален префикс"
 
-#: add-interactive.c:1042
 msgid "unselect specified items"
 msgstr "изваждане на указаното от избора"
 
-#: add-interactive.c:1044
 msgid "choose all items"
 msgstr "избор на всички елементи"
 
-#: add-interactive.c:1046
 msgid "(empty) finish selecting"
 msgstr "(празно) приключване на избирането"
 
-#: add-interactive.c:1083
 msgid "select a numbered item"
 msgstr "избор на номериран елемент"
 
-#: add-interactive.c:1087
 msgid "(empty) select nothing"
 msgstr "(празно) без избор на нищо"
 
-#: add-interactive.c:1095 builtin/clean.c:839 git-add--interactive.perl:1898
 msgid "*** Commands ***"
 msgstr "●●● Команди ●●●"
 
-#: add-interactive.c:1096 builtin/clean.c:840 git-add--interactive.perl:1895
 msgid "What now"
 msgstr "Избор на следващо действие"
 
-#: add-interactive.c:1148 git-add--interactive.perl:213
 msgid "staged"
 msgstr "в индекса"
 
-#: add-interactive.c:1148 git-add--interactive.perl:213
 msgid "unstaged"
 msgstr "извън индекса"
 
-#: add-interactive.c:1148 apply.c:5020 apply.c:5023 builtin/am.c:2367
-#: builtin/am.c:2370 builtin/bugreport.c:107 builtin/clone.c:128
-#: builtin/fetch.c:153 builtin/merge.c:287 builtin/pull.c:194
-#: builtin/submodule--helper.c:404 builtin/submodule--helper.c:1858
-#: builtin/submodule--helper.c:1861 builtin/submodule--helper.c:2504
-#: builtin/submodule--helper.c:2507 builtin/submodule--helper.c:2574
-#: builtin/submodule--helper.c:2579 builtin/submodule--helper.c:2812
-#: git-add--interactive.perl:213
 msgid "path"
 msgstr "път"
 
-#: add-interactive.c:1155
 msgid "could not refresh index"
 msgstr "индексът не може да бъде обновен"
 
 #
-#: add-interactive.c:1169 builtin/clean.c:804 git-add--interactive.perl:1805
 #, c-format
 msgid "Bye.\n"
 msgstr "Изход.\n"
 
-#: add-patch.c:34 git-add--interactive.perl:1433
 #, c-format, perl-format
 msgid "Stage mode change [y,n,q,a,d%s,?]? "
 msgstr "Добавяне на промяната на правата за достъп [y,n,q,a,d%s,?]? "
 
-#: add-patch.c:35 git-add--interactive.perl:1434
 #, c-format, perl-format
 msgid "Stage deletion [y,n,q,a,d%s,?]? "
 msgstr "Добавяне на изтриването [y,n,q,a,d%s,?]? "
 
-#: add-patch.c:36 git-add--interactive.perl:1435
 #, c-format, perl-format
 msgid "Stage addition [y,n,q,a,d%s,?]? "
 msgstr "Добавяне на добавянето [y,n,q,a,d%s,?]? "
 
-#: add-patch.c:37 git-add--interactive.perl:1436
 #, c-format, perl-format
 msgid "Stage this hunk [y,n,q,a,d%s,?]? "
 msgstr "Добавяне на това парче [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."
@@ -437,7 +391,6 @@ msgstr ""
 "Ако кръпката може да се приложи чисто, редактираното парче ще бъде незабавно "
 "добавено към индекса."
 
-#: add-patch.c:42
 msgid ""
 "y - stage this hunk\n"
 "n - do not stage this hunk\n"
@@ -451,27 +404,22 @@ msgstr ""
 "a — добавяне на това и всички следващи парчета от файла в индекса\n"
 "d — без добавяне на това и всички следващи парчета от файла в индекса\n"
 
-#: add-patch.c:56 git-add--interactive.perl:1439
 #, c-format, perl-format
 msgid "Stash mode change [y,n,q,a,d%s,?]? "
 msgstr "Скатаване на промяната на правата за достъп [y,n,q,a,d%s,?]? "
 
-#: add-patch.c:57 git-add--interactive.perl:1440
 #, c-format, perl-format
 msgid "Stash deletion [y,n,q,a,d%s,?]? "
 msgstr "Скатаване на изтриването [y,n,q,a,d%s,?]? "
 
-#: add-patch.c:58 git-add--interactive.perl:1441
 #, c-format, perl-format
 msgid "Stash addition [y,n,q,a,d%s,?]? "
 msgstr "Скатаване на добавянето [y,n,q,a,d%s,?]? "
 
-#: add-patch.c:59 git-add--interactive.perl:1442
 #, c-format, perl-format
 msgid "Stash this hunk [y,n,q,a,d%s,?]? "
 msgstr "Скатаване на това парче [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."
@@ -479,7 +427,6 @@ msgstr ""
 "Ако кръпката може да се приложи чисто, редактираното парче ще бъде незабавно "
 "скътано."
 
-#: add-patch.c:64
 msgid ""
 "y - stash this hunk\n"
 "n - do not stash this hunk\n"
@@ -493,27 +440,22 @@ msgstr ""
 "a — скатаване на това и всички следващи парчета от файла\n"
 "d — без скатаване на това и всички следващи парчета от файла\n"
 
-#: add-patch.c:80 git-add--interactive.perl:1445
 #, c-format, perl-format
 msgid "Unstage mode change [y,n,q,a,d%s,?]? "
 msgstr "Изваждане на промяната на правата за достъп [y,n,q,a,d%s,?]? "
 
-#: add-patch.c:81 git-add--interactive.perl:1446
 #, c-format, perl-format
 msgid "Unstage deletion [y,n,q,a,d%s,?]? "
 msgstr "Изваждане на изтриването [y,n,q,a,d%s,?]? "
 
-#: add-patch.c:82 git-add--interactive.perl:1447
 #, c-format, perl-format
 msgid "Unstage addition [y,n,q,a,d%s,?]? "
 msgstr "Изваждане на добавянето [y,n,q,a,d%s,?]? "
 
-#: add-patch.c:83 git-add--interactive.perl:1448
 #, c-format, perl-format
 msgid "Unstage this hunk [y,n,q,a,d%s,?]? "
 msgstr "Изваждане на това парче [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."
@@ -521,7 +463,6 @@ msgstr ""
 "Ако кръпката може да се приложи чисто, редактираното парче ще бъде незабавно "
 "извадено от индекса."
 
-#: add-patch.c:88
 msgid ""
 "y - unstage this hunk\n"
 "n - do not unstage this hunk\n"
@@ -535,28 +476,23 @@ msgstr ""
 "a — изваждане на това и всички следващи парчета от файла от индекса\n"
 "d — без изваждане на това и всички следващи парчета от файла от индекса\n"
 
-#: add-patch.c:103 git-add--interactive.perl:1451
 #, c-format, perl-format
 msgid "Apply mode change to index [y,n,q,a,d%s,?]? "
 msgstr ""
 "Прилагане на промяната на правата за достъп към индекса [y,n,q,a,d%s,?]? "
 
-#: add-patch.c:104 git-add--interactive.perl:1452
 #, c-format, perl-format
 msgid "Apply deletion to index [y,n,q,a,d%s,?]? "
 msgstr "Прилагане на изтриването към индекса [y,n,q,a,d%s,?]? "
 
-#: add-patch.c:105 git-add--interactive.perl:1453
 #, c-format, perl-format
 msgid "Apply addition to index [y,n,q,a,d%s,?]? "
 msgstr "Прилагане на добавянето към индекса [y,n,q,a,d%s,?]? "
 
-#: add-patch.c:106 git-add--interactive.perl:1454
 #, c-format, perl-format
 msgid "Apply this hunk to index [y,n,q,a,d%s,?]? "
 msgstr "Прилагане на това парче към индекса [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."
@@ -564,7 +500,6 @@ msgstr ""
 "Ако кръпката може да се приложи чисто, редактираното парче ще бъде незабавно "
 "набелязано за прилагане."
 
-#: add-patch.c:111
 msgid ""
 "y - apply this hunk to index\n"
 "n - do not apply this hunk to index\n"
@@ -578,33 +513,24 @@ msgstr ""
 "a — прилагане на това и всички следващи парчета от файла към индекса\n"
 "d — без прилагане на това и всички следващи парчета от файла към индекса\n"
 
-#: add-patch.c:126 git-add--interactive.perl:1457
-#: git-add--interactive.perl:1475
 #, c-format, perl-format
 msgid "Discard mode change from worktree [y,n,q,a,d%s,?]? "
 msgstr ""
 "Премахване на промяната в правата за достъп от работното дърво [y,n,q,a,d"
 "%s,?]? "
 
-#: add-patch.c:127 git-add--interactive.perl:1458
-#: git-add--interactive.perl:1476
 #, c-format, perl-format
 msgid "Discard deletion from worktree [y,n,q,a,d%s,?]? "
 msgstr "Премахване на изтриването от работното дърво [y,n,q,a,d%s,?]? "
 
-#: add-patch.c:128 git-add--interactive.perl:1459
-#: git-add--interactive.perl:1477
 #, c-format, perl-format
 msgid "Discard addition from worktree [y,n,q,a,d%s,?]? "
 msgstr "Премахване на добавянето от работното дърво [y,n,q,a,d%s,?]? "
 
-#: add-patch.c:129 git-add--interactive.perl:1460
-#: git-add--interactive.perl:1478
 #, c-format, perl-format
 msgid "Discard this hunk from worktree [y,n,q,a,d%s,?]? "
 msgstr "Премахване на парчето от работното дърво [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."
@@ -612,7 +538,6 @@ msgstr ""
 "Ако кръпката може да се приложи чисто, редактираното парче ще бъде незабавно "
 "набелязано за зануляване."
 
-#: add-patch.c:134 add-patch.c:202
 msgid ""
 "y - discard this hunk from worktree\n"
 "n - do not discard this hunk from worktree\n"
@@ -629,31 +554,26 @@ msgstr ""
 "d — без премахване на това и всички следващи парчета от файла от работното "
 "дърво\n"
 
-#: add-patch.c:149 add-patch.c:194 git-add--interactive.perl:1463
 #, c-format, perl-format
 msgid "Discard mode change from index and worktree [y,n,q,a,d%s,?]? "
 msgstr ""
 "Премахване на промяната в правата за достъп от индекса и работното дърво [y,"
 "n,q,a,d%s,?]? "
 
-#: add-patch.c:150 add-patch.c:195 git-add--interactive.perl:1464
 #, c-format, perl-format
 msgid "Discard deletion from index and worktree [y,n,q,a,d%s,?]? "
 msgstr ""
 "Премахване на изтриването от индекса и работното дърво [y,n,q,a,d%s,?]? "
 
-#: add-patch.c:151 add-patch.c:196 git-add--interactive.perl:1465
 #, c-format, perl-format
 msgid "Discard addition from index and worktree [y,n,q,a,d%s,?]? "
 msgstr ""
 "Премахване на добавянето от индекса и работното дърво [y,n,q,a,d%s,?]? "
 
-#: add-patch.c:152 add-patch.c:197 git-add--interactive.perl:1466
 #, c-format, perl-format
 msgid "Discard this hunk from index and worktree [y,n,q,a,d%s,?]? "
 msgstr "Премахване на парчето от индекса и работното дърво [y,n,q,a,d%s,?]? "
 
-#: add-patch.c:157
 msgid ""
 "y - discard this hunk from index and worktree\n"
 "n - do not discard this hunk from index and worktree\n"
@@ -670,30 +590,25 @@ msgstr ""
 "d — без премахване на това и всички следващи парчета от файла от индекса и "
 "работното дърво\n"
 
-#: add-patch.c:171 add-patch.c:216 git-add--interactive.perl:1469
 #, c-format, perl-format
 msgid "Apply mode change to index and worktree [y,n,q,a,d%s,?]? "
 msgstr ""
 "Прилагане на промяната в правата за достъп от индекса и работното дърво [y,n,"
 "q,a,d%s,?]? "
 
-#: add-patch.c:172 add-patch.c:217 git-add--interactive.perl:1470
 #, c-format, perl-format
 msgid "Apply deletion to index and worktree [y,n,q,a,d%s,?]? "
 msgstr ""
 "Прилагане на изтриването от индекса и работното дърво [y,n,q,a,d%s,?]? "
 
-#: add-patch.c:173 add-patch.c:218 git-add--interactive.perl:1471
 #, c-format, perl-format
 msgid "Apply addition to index and worktree [y,n,q,a,d%s,?]? "
 msgstr "Прилагане на добавянето от индекса и работното дърво [y,n,q,a,d%s,?]? "
 
-#: add-patch.c:174 add-patch.c:219 git-add--interactive.perl:1472
 #, c-format, perl-format
 msgid "Apply this hunk to index and worktree [y,n,q,a,d%s,?]? "
 msgstr "Прилагане на парчето от индекса и работното дърво [y,n,q,a,d%s,?]? "
 
-#: add-patch.c:179
 msgid ""
 "y - apply this hunk to index and worktree\n"
 "n - do not apply this hunk to index and worktree\n"
@@ -710,7 +625,6 @@ msgstr ""
 "d — без прилагане на това и всички следващи парчета от файла от индекса и "
 "работното дърво\n"
 
-#: add-patch.c:224
 msgid ""
 "y - apply this hunk to worktree\n"
 "n - do not apply this hunk to worktree\n"
@@ -724,34 +638,27 @@ msgstr ""
 "a — прилагане на това и всички следващи парчета от файла\n"
 "d — без прилагане на това и всички следващи парчета от файла\n"
 
-#: add-patch.c:343
 #, c-format
 msgid "could not parse hunk header '%.*s'"
 msgstr "заглавната част на парчето „%.*s“ не може да се анализира"
 
-#: add-patch.c:362 add-patch.c:366
 #, c-format
 msgid "could not parse colored hunk header '%.*s'"
 msgstr "заглавната част на оцветеното парче „%.*s“ не може да се анализира"
 
-#: add-patch.c:420
 msgid "could not parse diff"
 msgstr "разликата не може да се анализира"
 
-#: add-patch.c:439
 msgid "could not parse colored diff"
 msgstr "оцветената разлика не може да се анализира"
 
-#: add-patch.c:453
 #, c-format
 msgid "failed to run '%s'"
 msgstr "неуспешно изпълнение на „%s“"
 
-#: add-patch.c:612
 msgid "mismatched output from interactive.diffFilter"
 msgstr "изходът от „interactive.diffFilter“ не напасва"
 
-#: add-patch.c:613
 msgid ""
 "Your filter must maintain a one-to-one correspondence\n"
 "between its input and output lines."
@@ -759,7 +666,6 @@ msgstr ""
 "Обработените редове на изхода на ползвания филтър, трябва\n"
 "да се отнасят едно към едно спрямо редовете на входа."
 
-#: add-patch.c:791
 #, c-format
 msgid ""
 "expected context line #%d in\n"
@@ -768,7 +674,6 @@ msgstr ""
 "очаква се ред №%d от контекста в\n"
 "%.*s"
 
-#: add-patch.c:806
 #, c-format
 msgid ""
 "hunks do not overlap:\n"
@@ -781,11 +686,9 @@ msgstr ""
 "    не завършва с:\n"
 "%.*s"
 
-#: add-patch.c:1082 git-add--interactive.perl:1115
 msgid "Manual hunk edit mode -- see bottom for a quick guide.\n"
 msgstr "Ръчно редактиране на парчета код — отдолу има подсказка.\n"
 
-#: add-patch.c:1086
 #, c-format
 msgid ""
 "---\n"
@@ -799,8 +702,8 @@ msgstr ""
 "За да пропуснете редовете, започващи с „%c“: изтрийте ги.\n"
 "Редовете, които започват с „%c“ ще бъдат пропуснати.\n"
 
+#. #-#-#-#-#  git-add--interactive.perl.po  #-#-#-#-#
 #. TRANSLATORS: 'it' refers to the patch mentioned in the previous messages.
-#: 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"
@@ -810,27 +713,26 @@ msgstr ""
 "изтриете всички редове от парчето код, то ще бъде оставено непроменено, а\n"
 "редактирането — отказано.\n"
 
-#: add-patch.c:1133
 msgid "could not parse hunk header"
 msgstr "заглавната част парчето не може да се анализира"
 
-#: add-patch.c:1178
 msgid "'git apply --cached' failed"
 msgstr "неуспешно изпълнение на „git apply --cached“"
 
+#. #-#-#-#-#  add-patch.c.po  #-#-#-#-#
 #. 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.
 #.
+#. #-#-#-#-#  git-add--interactive.perl.po  #-#-#-#-#
 #. 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:1247 git-add--interactive.perl:1244
 msgid ""
 "Your edited hunk does not apply. Edit again (saying \"no\" discards!) [y/n]? "
 msgstr ""
@@ -838,19 +740,15 @@ msgstr ""
 "редактирането? (текущите редакции ще се отменят при отказ!): „y“ (да)/ "
 "„n“ (не)? "
 
-#: add-patch.c:1290
 msgid "The selected hunks do not apply to the index!"
 msgstr "Избраните парчета не може да се добавят в индекса!"
 
-#: add-patch.c:1291 git-add--interactive.perl:1348
 msgid "Apply them to the worktree anyway? "
 msgstr "Да се приложат ли към работното дърво? "
 
-#: add-patch.c:1298 git-add--interactive.perl:1351
 msgid "Nothing was applied.\n"
 msgstr "Нищо не е приложено.\n"
 
-#: add-patch.c:1355
 msgid ""
 "j - leave this hunk undecided, see next undecided hunk\n"
 "J - leave this hunk undecided, see next hunk\n"
@@ -872,73 +770,57 @@ msgstr ""
 "e — ръчно редактиране на текущото парче\n"
 "? — извеждане не помощта\n"
 
-#: add-patch.c:1517 add-patch.c:1527
 msgid "No previous hunk"
 msgstr "Няма друго парче преди това"
 
-#: add-patch.c:1522 add-patch.c:1532
 msgid "No next hunk"
 msgstr "Няма друго парче след това"
 
-#: add-patch.c:1538
 msgid "No other hunks to goto"
 msgstr "Няма други парчета"
 
-#: add-patch.c:1549 git-add--interactive.perl:1608
 msgid "go to which hunk (<ret> to see more)? "
 msgstr "към кое парче да се придвижи (за повече варианти натиснете „enter“)? "
 
-#: add-patch.c:1550 git-add--interactive.perl:1610
 msgid "go to which hunk? "
 msgstr "към кое парче да се придвижи? "
 
-#: add-patch.c:1561
 #, c-format
 msgid "Invalid number: '%s'"
 msgstr "Неправилен номер: „%s“"
 
-#: add-patch.c:1566
 #, c-format
 msgid "Sorry, only %d hunk available."
 msgid_plural "Sorry, only %d hunks available."
 msgstr[0] "Има само %d парче."
 msgstr[1] "Има само %d парчета."
 
-#: add-patch.c:1575
 msgid "No other hunks to search"
 msgstr "Няма други парчета за търсене"
 
-#: add-patch.c:1581 git-add--interactive.perl:1663
 msgid "search for regex? "
 msgstr "да се търси с регулярен израз? "
 
-#: add-patch.c:1596
 #, c-format
 msgid "Malformed search regexp %s: %s"
 msgstr "Сгрешен регулярен израз „%s“: %s"
 
-#: add-patch.c:1613
 msgid "No hunk matches the given pattern"
 msgstr "Никое парче не напасва на регулярния израз"
 
-#: add-patch.c:1620
 msgid "Sorry, cannot split this hunk"
 msgstr "Това парче не може да бъде разделено"
 
-#: add-patch.c:1624
 #, c-format
 msgid "Split into %d hunks."
 msgstr "Разделяне на %d парчета."
 
-#: add-patch.c:1628
 msgid "Sorry, cannot edit this hunk"
 msgstr "Това парче не може да бъде редактирано"
 
-#: add-patch.c:1680
 msgid "'git apply' failed"
 msgstr "неуспешно изпълнение на „git apply“"
 
-#: advice.c:78
 #, c-format
 msgid ""
 "\n"
@@ -946,39 +828,32 @@ msgid ""
 msgstr ""
 "\n"
 "За да изключите това предупреждение, изпълнете:\n"
+"\n"
 "    git config advice.%s false"
 
-#: advice.c:94
 #, c-format
 msgid "%shint: %.*s%s\n"
 msgstr "%sподсказка: %.*s%s\n"
 
-#: advice.c:178
 msgid "Cherry-picking is not possible because you have unmerged files."
 msgstr "Отбирането на подавания е блокирано от неслети файлове."
 
-#: advice.c:180
 msgid "Committing is not possible because you have unmerged files."
 msgstr "Подаването е блокирано от неслети файлове."
 
-#: advice.c:182
 msgid "Merging is not possible because you have unmerged files."
 msgstr "Сливането е блокирано от неслети файлове."
 
-#: advice.c:184
 msgid "Pulling is not possible because you have unmerged files."
 msgstr "Издърпването е блокирано от неслети файлове."
 
-#: advice.c:186
 msgid "Reverting is not possible because you have unmerged files."
 msgstr "Отмяната е блокирана от неслети файлове."
 
-#: advice.c:188
 #, c-format
 msgid "It is not possible to %s because you have unmerged files."
 msgstr "Действието „%s“ е блокирано от неслети файлове."
 
-#: 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."
@@ -986,27 +861,21 @@ msgstr ""
 "Редактирайте ги в работното дърво, и тогава ползвайте „git add/rm ФАЙЛ“,\n"
 "за да отбележите коригирането им.  След това извършете подаването."
 
-#: advice.c:204
 msgid "Exiting because of an unresolved conflict."
 msgstr "Изход от програмата заради некоригиран конфликт."
 
-#: advice.c:209 builtin/merge.c:1382
 msgid "You have not concluded your merge (MERGE_HEAD exists)."
 msgstr "Не сте завършили сливане.  (Указателят „MERGE_HEAD“ съществува)."
 
-#: advice.c:211
 msgid "Please, commit your changes before merging."
-msgstr "Промените трябва да се подадат преди сливане."
+msgstr "Промѐните трябва да се подадат преди сливане."
 
-#: advice.c:212
 msgid "Exiting because of unfinished merge."
 msgstr "Изход от програмата заради незавършено сливане."
 
-#: advice.c:217
 msgid "Not possible to fast-forward, aborting."
 msgstr "Не може да се извърши превъртане, преустановяване на действието."
 
-#: advice.c:227
 #, c-format
 msgid ""
 "The following paths and/or pathspecs matched paths that exist\n"
@@ -1016,7 +885,6 @@ msgstr ""
 "Следните пътища напасват с пътища извън дефиницията за частично\n"
 "изтегляне и няма да се обновят в индекса:\n"
 
-#: advice.c:234
 msgid ""
 "If you intend to update such entries, try one of the following:\n"
 "* Use the --sparse option.\n"
@@ -1026,7 +894,6 @@ msgstr ""
 "  ⁃ ползвайте опцията „--sparse“\n"
 "  ⁃ изключете или променете правилата за частичност."
 
-#: advice.c:242
 #, c-format
 msgid ""
 "Note: switching to '%s'.\n"
@@ -1051,9 +918,9 @@ msgstr ""
 "Бележка: преминаване към „%s“.\n"
 "\n"
 "Указателят „HEAD“ не е свързан.  Може да разглеждате, да правите произволни\n"
-"промени и да ги подавате.  Ако изтеглите нещо друго, всички промени ще "
+"промѐни и да ги подавате.  Ако изтеглите нещо друго, всички промѐни ще "
 "бъдат\n"
-"забравени и никой клон няма да се промени.\n"
+"забравени и никой клон няма да се промѐни.\n"
 "\n"
 "Ако искате да създадете нов клон, за да запазите подаванията си, може да\n"
 "направите това като зададете име на клон към опцията „-c“ на командата\n"
@@ -1069,106 +936,72 @@ msgstr ""
 "detachedHead“\n"
 "да е „false“ (лъжа̀).\n"
 
-#: alias.c:50
 msgid "cmdline ends with \\"
 msgstr "командният ред завършва с „/“"
 
-#: alias.c:51
 msgid "unclosed quote"
 msgstr "кавичка без еш"
 
-#: apply.c:70
 #, c-format
 msgid "unrecognized whitespace option '%s'"
 msgstr "непозната опция за знаците за интервали „%s“"
 
-#: apply.c:86
 #, c-format
 msgid "unrecognized whitespace ignore option '%s'"
 msgstr "непозната опция за игнориране на знаците за интервали „%s“"
 
-#: apply.c:136 archive.c:584 range-diff.c:559 revision.c:2303 revision.c:2307
-#: revision.c:2316 revision.c:2321 revision.c:2527 revision.c:2870
-#: revision.c:2874 revision.c:2880 revision.c:2883 revision.c:2885
-#: builtin/add.c:510 builtin/add.c:512 builtin/add.c:529 builtin/add.c:541
-#: builtin/branch.c:727 builtin/checkout.c:467 builtin/checkout.c:470
-#: builtin/checkout.c:1644 builtin/checkout.c:1754 builtin/checkout.c:1757
-#: builtin/clone.c:906 builtin/commit.c:358 builtin/commit.c:361
-#: builtin/commit.c:1196 builtin/describe.c:593 builtin/diff-tree.c:155
-#: builtin/difftool.c:733 builtin/fast-export.c:1245 builtin/fetch.c:2038
-#: builtin/fetch.c:2043 builtin/index-pack.c:1852 builtin/init-db.c:560
-#: builtin/log.c:1946 builtin/log.c:1948 builtin/ls-files.c:778
-#: builtin/merge.c:1403 builtin/merge.c:1405 builtin/pack-objects.c:4073
-#: builtin/push.c:592 builtin/push.c:630 builtin/push.c:636 builtin/push.c:641
-#: builtin/rebase.c:1193 builtin/rebase.c:1195 builtin/rebase.c:1199
-#: builtin/repack.c:684 builtin/repack.c:715 builtin/reset.c:426
-#: builtin/reset.c:462 builtin/rev-list.c:541 builtin/show-branch.c:710
-#: builtin/stash.c:1707 builtin/stash.c:1710 builtin/submodule--helper.c:1316
-#: builtin/submodule--helper.c:2975 builtin/tag.c:526 builtin/tag.c:572
-#: builtin/worktree.c:702
 #, c-format
 msgid "options '%s' and '%s' cannot be used together"
 msgstr "опциите „%s“ и „%s“ са несъвместими"
 
-#: apply.c:139 apply.c:150 apply.c:153
 #, c-format
 msgid "'%s' outside a repository"
 msgstr "„%s“ извън хранилище"
 
-#: apply.c:800
 #, c-format
 msgid "Cannot prepare timestamp regexp %s"
-msgstr "Регулярният израз за времето „%s“ не може за бъде компилиран"
+msgstr "Регулярният израз за времевото клеймо „%s“ не може за бъде компилиран"
 
-#: apply.c:809
 #, c-format
 msgid "regexec returned %d for input: %s"
 msgstr "Регулярният израз върна %d при подадена последователност „%s“ на входа"
 
-#: apply.c:883
 #, c-format
 msgid "unable to find filename in patch at line %d"
 msgstr "Липсва име на файл на ред %d от кръпката"
 
-#: apply.c:921
 #, c-format
 msgid "git apply: bad git-diff - expected /dev/null, got %s on line %d"
 msgstr ""
 "git apply: лош изход от командата „git-diff“ — на ред %2$d се очакваше „/dev/"
 "null“, а бе получен „%1$s“"
 
-#: apply.c:927
 #, c-format
 msgid "git apply: bad git-diff - inconsistent new filename on line %d"
 msgstr ""
 "git apply: лош изход от командата „git-diff“ — на ред %d бе получено "
 "неправилно име на нов файл"
 
-#: apply.c:928
 #, c-format
 msgid "git apply: bad git-diff - inconsistent old filename on line %d"
 msgstr ""
 "git apply: лош изход от командата „git-diff“ — на ред %d бе получено "
 "неправилно име на стар файл"
 
-#: apply.c:933
 #, c-format
 msgid "git apply: bad git-diff - expected /dev/null on line %d"
 msgstr ""
 "git apply: лош изход от командата „git-diff“ — на ред %d се очакваше „/dev/"
 "null“"
 
-#: apply.c:962
 #, c-format
 msgid "invalid mode on line %d: %s"
 msgstr "грешен режим на ред №%d: %s"
 
-#: apply.c:1281
 #, c-format
 msgid "inconsistent header lines %d and %d"
 msgstr "несъвместими заглавни части на редове №%d и №%d"
 
-#: apply.c:1371
 #, c-format
 msgid ""
 "git diff header lacks filename information when removing %d leading pathname "
@@ -1183,81 +1016,65 @@ msgstr[1] ""
 "След съкращаването на първите %d части от компонентите на пътя, в заглавната "
 "част на „git diff“ липсва информация за име на файл (ред: %d)"
 
-#: apply.c:1384
 #, c-format
 msgid "git diff header lacks filename information (line %d)"
 msgstr ""
 "в заглавната част на „git diff“ липсва информация за име на файл (ред: %d)"
 
-#: apply.c:1480
 #, c-format
 msgid "recount: unexpected line: %.*s"
 msgstr "при повторното преброяване бе получен неочакван ред: „%.*s“"
 
-#: apply.c:1549
 #, c-format
 msgid "patch fragment without header at line %d: %.*s"
 msgstr "част от кръпка без заглавна част на ред %d: %.*s"
 
-#: apply.c:1752
 msgid "new file depends on old contents"
 msgstr "новият файл зависи от старото съдържание на файла"
 
-#: apply.c:1754
 msgid "deleted file still has contents"
 msgstr "изтритият файл не е празен"
 
-#: apply.c:1788
 #, c-format
 msgid "corrupt patch at line %d"
 msgstr "грешка в кръпката на ред %d"
 
-#: apply.c:1825
 #, c-format
 msgid "new file %s depends on old contents"
 msgstr "новият файл „%s“ зависи от старото съдържание на файла"
 
-#: apply.c:1827
 #, c-format
 msgid "deleted file %s still has contents"
 msgstr "изтритият файл „%s“ не е празен"
 
-#: apply.c:1830
 #, c-format
 msgid "** warning: file %s becomes empty but is not deleted"
 msgstr "● предупреждение: файлът „%s“ вече е празен, но не е изтрит"
 
-#: apply.c:1978
 #, c-format
 msgid "corrupt binary patch at line %d: %.*s"
 msgstr "грешка в двоичната кръпка на ред %d: %.*s"
 
-#: apply.c:2015
 #, c-format
 msgid "unrecognized binary patch at line %d"
 msgstr "неразпозната двоичната кръпка на ред %d"
 
-#: apply.c:2177
 #, c-format
 msgid "patch with only garbage at line %d"
 msgstr "кръпката е с изцяло повредени данни на ред %d"
 
-#: apply.c:2263
 #, c-format
 msgid "unable to read symlink %s"
 msgstr "символната връзка „%s“ не може да бъде прочетена"
 
-#: apply.c:2267
 #, c-format
 msgid "unable to open or read %s"
 msgstr "файлът „%s“ не може да бъде отворен или прочетен"
 
-#: apply.c:2936
 #, c-format
 msgid "invalid start of line: '%c'"
 msgstr "неправилно начало на ред: „%c“"
 
-#: apply.c:3057
 #, c-format
 msgid "Hunk #%d succeeded at %d (offset %d line)."
 msgid_plural "Hunk #%d succeeded at %d (offset %d lines)."
@@ -1266,13 +1083,11 @@ msgstr[0] ""
 msgstr[1] ""
 "%d-то парче код бе успешно приложено на ред %d (отместване от %d реда)."
 
-#: apply.c:3069
 #, c-format
 msgid "Context reduced to (%ld/%ld) to apply fragment at %d"
 msgstr ""
 "Контекстът е намален на (%ld/%ld) за прилагането на парчето код на ред %d"
 
-#: apply.c:3075
 #, c-format
 msgid ""
 "while searching for:\n"
@@ -1281,318 +1096,255 @@ msgstr ""
 "при търсене за:\n"
 "%.*s"
 
-#: apply.c:3097
 #, c-format
 msgid "missing binary patch data for '%s'"
 msgstr "липсват данните за двоичната кръпка за „%s“"
 
-#: apply.c:3105
 #, c-format
 msgid "cannot reverse-apply a binary patch without the reverse hunk to '%s'"
 msgstr ""
 "двоичната кръпка не може да се приложи в обратна посока, когато обратното "
 "парче за „%s“ липсва"
 
-#: apply.c:3152
 #, c-format
 msgid "cannot apply binary patch to '%s' without full index line"
 msgstr "към „%s“ не може да се приложи двоична кръпка без пълен индекс"
 
-#: apply.c:3163
 #, c-format
 msgid ""
 "the patch applies to '%s' (%s), which does not match the current contents."
 msgstr "кръпката съответства на „%s“ (%s), който не съвпада по съдържание."
 
-#: apply.c:3171
 #, c-format
 msgid "the patch applies to an empty '%s' but it is not empty"
 msgstr "кръпката съответства на „%s“, който трябва да е празен, но не е"
 
-#: apply.c:3189
 #, c-format
 msgid "the necessary postimage %s for '%s' cannot be read"
 msgstr ""
 "необходимият резултат след операцията  — „%s“ за „%s“ не може да бъде "
 "прочетен"
 
-#: apply.c:3202
 #, c-format
 msgid "binary patch does not apply to '%s'"
 msgstr "двоичната кръпка не може да бъде приложена върху „%s“"
 
-#: apply.c:3209
 #, c-format
 msgid "binary patch to '%s' creates incorrect result (expecting %s, got %s)"
 msgstr ""
 "двоичната кръпка за „%s“ води до неправилни резултати (очакваше се: „%s“, а "
 "бе получено: „%s“)"
 
-#: apply.c:3230
 #, c-format
 msgid "patch failed: %s:%ld"
 msgstr "неуспешно прилагане на кръпка: „%s:%ld“"
 
-#: apply.c:3353
 #, c-format
 msgid "cannot checkout %s"
 msgstr "„%s“ не може да се изтегли"
 
-#: apply.c:3405 apply.c:3416 apply.c:3462 midx.c:104 pack-revindex.c:214
-#: setup.c:309
 #, c-format
 msgid "failed to read %s"
 msgstr "файлът „%s“ не може да бъде прочетен"
 
-#: apply.c:3413
 #, c-format
 msgid "reading from '%s' beyond a symbolic link"
 msgstr "изчитане на „%s“ след проследяване на символна връзка"
 
-#: apply.c:3442 apply.c:3711
 #, c-format
 msgid "path %s has been renamed/deleted"
 msgstr "обектът с път „%s“ е преименуван или изтрит"
 
-#: apply.c:3549 apply.c:3726
 #, c-format
 msgid "%s: does not exist in index"
 msgstr "„%s“ не съществува в индекса"
 
-#: apply.c:3558 apply.c:3734 apply.c:3978
 #, c-format
 msgid "%s: does not match index"
 msgstr "„%s“ не съответства на индекса"
 
-#: apply.c:3595
 msgid "repository lacks the necessary blob to perform 3-way merge."
 msgstr "в хранилището липсват необходимите обекти-BLOB, за тройно сливане."
 
-#: apply.c:3598
 #, c-format
 msgid "Performing three-way merge...\n"
 msgstr "Тройно сливане…\n"
 
-#: apply.c:3614 apply.c:3618
 #, c-format
 msgid "cannot read the current contents of '%s'"
 msgstr "текущото съдържание на „%s“ не може да бъде прочетено"
 
-#: apply.c:3630
 #, c-format
 msgid "Failed to perform three-way merge...\n"
 msgstr "Неуспешно тройно сливане…\n"
 
-#: apply.c:3644
 #, c-format
 msgid "Applied patch to '%s' with conflicts.\n"
 msgstr "Конфликти при прилагането на кръпката към „%s“.\n"
 
-#: apply.c:3649
 #, c-format
 msgid "Applied patch to '%s' cleanly.\n"
 msgstr "Кръпката бе приложена чисто към „%s“.\n"
 
-#: apply.c:3666
 #, c-format
 msgid "Falling back to direct application...\n"
 msgstr "Преминаване към пряко прилагане…\n"
 
-#: apply.c:3678
 msgid "removal patch leaves file contents"
 msgstr "изтриващата кръпка оставя файла непразен"
 
-#: apply.c:3751
 #, c-format
 msgid "%s: wrong type"
 msgstr "„%s“: неправилен вид"
 
-#: apply.c:3753
 #, c-format
 msgid "%s has type %o, expected %o"
 msgstr "„%s“ е от вид „%o“, а се очакваше „%o“"
 
-#: apply.c:3918 apply.c:3920 read-cache.c:889 read-cache.c:918
-#: read-cache.c:1381
 #, c-format
 msgid "invalid path '%s'"
 msgstr "неправилен път: „%s“"
 
-#: apply.c:3976
 #, c-format
 msgid "%s: already exists in index"
 msgstr "„%s“: вече съществува в индекса"
 
-#: apply.c:3980
 #, c-format
 msgid "%s: already exists in working directory"
 msgstr "„%s“: вече съществува в работното дърво"
 
-#: apply.c:4000
 #, c-format
 msgid "new mode (%o) of %s does not match old mode (%o)"
 msgstr "новите права за достъп (%o) на „%s“ не съвпадат със старите (%o)"
 
-#: apply.c:4005
 #, c-format
 msgid "new mode (%o) of %s does not match old mode (%o) of %s"
 msgstr ""
 "новите права за достъп (%o) на „%s“ не съвпадат със старите (%o) на „%s“"
 
-#: apply.c:4025
 #, c-format
 msgid "affected file '%s' is beyond a symbolic link"
 msgstr "засегнатият файл „%s“ е след символна връзка"
 
-#: apply.c:4029
 #, c-format
 msgid "%s: patch does not apply"
 msgstr "Кръпката „%s“ не може да бъде приложена"
 
-#: apply.c:4044
 #, c-format
 msgid "Checking patch %s..."
 msgstr "Проверяване на кръпката „%s“…"
 
-#: apply.c:4136
 #, c-format
 msgid "sha1 information is lacking or useless for submodule %s"
 msgstr ""
 "информацията за сумата по SHA1 за подмодула липсва или не е достатъчна (%s)."
 
-#: apply.c:4143
 #, c-format
 msgid "mode change for %s, which is not in current HEAD"
 msgstr "смяна на режима на достъпа на „%s“, който не е в текущия връх „HEAD“"
 
-#: apply.c:4146
 #, c-format
 msgid "sha1 information is lacking or useless (%s)."
 msgstr "информацията за сумата по SHA1 липсва или не е достатъчна (%s)."
 
-#: apply.c:4155
 #, c-format
 msgid "could not add %s to temporary index"
 msgstr "„%s“ не може да се добави към временния индекс"
 
-#: apply.c:4165
 #, c-format
 msgid "could not write temporary index to %s"
 msgstr "временният индекс не може да се запази в „%s“"
 
-#: apply.c:4303
 #, c-format
 msgid "unable to remove %s from index"
 msgstr "„%s“ не може да се извади от индекса"
 
-#: apply.c:4337
 #, c-format
 msgid "corrupt patch for submodule %s"
 msgstr "повредена кръпка за модула „%s“"
 
-#: apply.c:4343
 #, c-format
 msgid "unable to stat newly created file '%s'"
 msgstr ""
 "не може да се получи информация чрез „stat“ за новосъздадения файл „%s“"
 
-#: apply.c:4351
 #, c-format
 msgid "unable to create backing store for newly created file %s"
 msgstr ""
 "не може да се за създаде мястото за съхранение на новосъздадения файл „%s“"
 
-#: apply.c:4357 apply.c:4502
 #, c-format
 msgid "unable to add cache entry for %s"
 msgstr "не може да се добави запис в кеша за „%s“"
 
-#: apply.c:4400 builtin/bisect--helper.c:540 builtin/gc.c:2258
-#: builtin/gc.c:2293
 #, c-format
 msgid "failed to write to '%s'"
 msgstr "в „%s“ не може да се пише"
 
-#: apply.c:4404
 #, c-format
 msgid "closing file '%s'"
 msgstr "затваряне на файла „%s“"
 
-#: apply.c:4474
 #, c-format
 msgid "unable to write file '%s' mode %o"
 msgstr "файлът „%s“ не може да се запише с режим на достъп „%o“"
 
-#: apply.c:4572
 #, c-format
 msgid "Applied patch %s cleanly."
 msgstr "Кръпката „%s“ бе приложена чисто."
 
-#: apply.c:4580
 msgid "internal error"
 msgstr "вътрешна грешка"
 
-#: apply.c:4583
 #, 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:4594
 #, c-format
 msgid "truncating .rej filename to %.*s.rej"
 msgstr "съкращаване на името на файла с отхвърлените парчета на „%.*s.rej“"
 
-#: apply.c:4602
 #, c-format
 msgid "cannot open %s"
 msgstr "„%s“ не може да бъде отворен"
 
-#: apply.c:4616
 #, c-format
 msgid "Hunk #%d applied cleanly."
 msgstr "%d-то парче бе успешно приложено."
 
-#: apply.c:4620
 #, c-format
 msgid "Rejected hunk #%d."
 msgstr "%d-то парче бе отхвърлено."
 
-#: apply.c:4749
 #, c-format
 msgid "Skipped patch '%s'."
 msgstr "Пропусната кръпка: „%s“"
 
-#: apply.c:4758
 msgid "No valid patches in input (allow with \"--allow-empty\")"
 msgstr ""
 "На входа няма непразни кръпки (те се приемат при опция „--allow-empty“)"
 
-#: apply.c:4779
 msgid "unable to read index file"
 msgstr "индексът не може да бъде записан"
 
-#: apply.c:4936
 #, c-format
 msgid "can't open patch '%s': %s"
 msgstr "кръпката „%s“ не може да бъде отворена: %s"
 
-#: apply.c:4963
 #, c-format
 msgid "squelched %d whitespace error"
 msgid_plural "squelched %d whitespace errors"
 msgstr[0] "пренебрегната е %d грешка в знаците за интервали"
 msgstr[1] "пренебрегнати са %d грешки в знаците за интервали"
 
-#: apply.c:4969 apply.c:4984
 #, c-format
 msgid "%d line adds whitespace errors."
 msgid_plural "%d lines add whitespace errors."
 msgstr[0] "%d ред добавя грешки в знаците за интервали."
 msgstr[1] "%d реда добавят грешки в знаците за интервали."
 
-#: apply.c:4977
 #, c-format
 msgid "%d line applied after fixing whitespace errors."
 msgid_plural "%d lines applied after fixing whitespace errors."
@@ -1601,348 +1353,269 @@ msgstr[0] ""
 msgstr[1] ""
 "Добавени са %d реда след корекцията на грешките в знаците за интервали."
 
-#: apply.c:4993 builtin/add.c:704 builtin/mv.c:338 builtin/rm.c:430
 msgid "Unable to write new index file"
 msgstr "Новият индекс не може да бъде записан"
 
-#: apply.c:5021
 msgid "don't apply changes matching the given path"
-msgstr "без прилагане на промените напасващи на дадения път"
+msgstr "без прилагане на промѐните напасващи на дадения път"
 
-#: apply.c:5024
 msgid "apply changes matching the given path"
-msgstr "прилагане на промените напасващи на дадения път"
+msgstr "прилагане на промѐните напасващи на дадения път"
 
-#: apply.c:5026 builtin/am.c:2376
 msgid "num"
 msgstr "БРОЙ"
 
-#: apply.c:5027
 msgid "remove <num> leading slashes from traditional diff paths"
 msgstr "премахване на този БРОЙ водещи елементи от пътищата в разликата"
 
-#: apply.c:5030
 msgid "ignore additions made by the patch"
 msgstr "игнориране на редовете добавени от тази кръпка"
 
-#: apply.c:5032
 msgid "instead of applying the patch, output diffstat for the input"
-msgstr "извеждане на статистика на промените без прилагане на кръпката"
+msgstr "извеждане на статистика на промѐните без прилагане на кръпката"
 
-#: apply.c:5036
 msgid "show number of added and deleted lines in decimal notation"
 msgstr "извеждане на броя на добавените и изтритите редове"
 
-#: apply.c:5038
 msgid "instead of applying the patch, output a summary for the input"
 msgstr "извеждане на статистика на входните данни без прилагане на кръпката"
 
-#: apply.c:5040
 msgid "instead of applying the patch, see if the patch is applicable"
 msgstr "проверка дали кръпката може да се приложи, без действително прилагане"
 
-#: apply.c:5042
 msgid "make sure the patch is applicable to the current index"
 msgstr "проверка дали кръпката може да бъде приложена към текущия индекс"
 
-#: apply.c:5044
 msgid "mark new files with `git add --intent-to-add`"
 msgstr "отбелязване на новите файлове с „git add --intent-to-add“"
 
-#: apply.c:5046
 msgid "apply a patch without touching the working tree"
 msgstr "прилагане на кръпката без промяна на работното дърво"
 
-#: apply.c:5048
 msgid "accept a patch that touches outside the working area"
 msgstr "прилагане на кръпка, която променя и файлове извън работното дърво"
 
-#: apply.c:5051
 msgid "also apply the patch (use with --stat/--summary/--check)"
 msgstr ""
 "кръпката да бъде приложена.  Опцията се комбинира с „--check“/„--stat“/„--"
 "summary“"
 
-#: apply.c:5053
 msgid "attempt three-way merge, fall back on normal patch if that fails"
 msgstr ""
 "пробване с тройно сливане, ако това не сработи — стандартно прилагане на "
 "кръпка"
 
-#: apply.c:5055
 msgid "build a temporary index based on embedded index information"
 msgstr ""
 "създаване на временен индекс на база на включената информация за индекса"
 
-#: apply.c:5058 builtin/checkout-index.c:196
 msgid "paths are separated with NUL character"
 msgstr "разделяне на пътищата с нулевия знак „NUL“"
 
-#: apply.c:5060
 msgid "ensure at least <n> lines of context match"
 msgstr "да се осигури контекст от поне такъв БРОЙ съвпадащи редове"
 
-#: apply.c:5061 builtin/am.c:2352 builtin/am.c:2355
-#: 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 "действие"
 
-#: apply.c:5062
 msgid "detect new or modified lines that have whitespace errors"
 msgstr "засичане на нови или променени редове с грешки в знаците за интервали"
 
-#: apply.c:5065 apply.c:5068
 msgid "ignore changes in whitespace when finding context"
 msgstr ""
-"игнориране на промените в знаците за интервали при откриване на контекста"
+"игнориране на промѐните в знаците за интервали при откриване на контекста"
 
-#: apply.c:5071
 msgid "apply the patch in reverse"
 msgstr "прилагане на кръпката в обратна посока"
 
-#: apply.c:5073
 msgid "don't expect at least one line of context"
 msgstr "без изискване на дори и един ред контекст"
 
-#: apply.c:5075
 msgid "leave the rejected hunks in corresponding *.rej files"
 msgstr "оставяне на отхвърлените парчета във файлове с разширение „.rej“"
 
-#: apply.c:5077
 msgid "allow overlapping hunks"
 msgstr "позволяване на застъпващи се парчета"
 
-#: apply.c:5080
 msgid "tolerate incorrectly detected missing new-line at the end of file"
 msgstr "пренебрегване на неправилно липсващ знак за нов ред в края на файл"
 
-#: apply.c:5083
 msgid "do not trust the line counts in the hunk headers"
 msgstr "без доверяване на номерата на редовете в заглавните части на парчетата"
 
-#: apply.c:5085 builtin/am.c:2364
 msgid "root"
 msgstr "НАЧАЛНА_ДИРЕКТОРИЯ"
 
-#: apply.c:5086
 msgid "prepend <root> to all filenames"
 msgstr "добавяне на тази НАЧАЛНА_ДИРЕКТОРИЯ към имената на всички файлове"
 
-#: apply.c:5089
 msgid "don't return error for empty patches"
 msgstr "да не се връща грешка при празни кръпки"
 
-#: archive-tar.c:125 archive-zip.c:345
 #, c-format
 msgid "cannot stream blob %s"
 msgstr "обектът-BLOB „%s“ не може да бъде обработен"
 
-#: archive-tar.c:265 archive-zip.c:358
 #, c-format
 msgid "unsupported file mode: 0%o (SHA1: %s)"
 msgstr "неподдържани права за достъп до файл: 0%o (SHA1: %s)"
 
-#: archive-tar.c:447
 #, c-format
 msgid "unable to start '%s' filter"
 msgstr "филтърът „%s“ не може да бъде стартиран"
 
-#: archive-tar.c:450
 msgid "unable to redirect descriptor"
 msgstr "дескрипторът не може да бъде пренасочен"
 
-#: archive-tar.c:457
 #, c-format
 msgid "'%s' filter reported error"
 msgstr "филтърът „%s“ върна грешка"
 
-#: archive-zip.c:318
 #, c-format
 msgid "path is not valid UTF-8: %s"
 msgstr "пътят не е правилно кодиран в UTF-8: %s"
 
-#: archive-zip.c:322
 #, c-format
 msgid "path too long (%d chars, SHA1: %s): %s"
 msgstr "твърде дълъг път (%d знака, SHA1: %s): %s"
 
-#: archive-zip.c:469 builtin/pack-objects.c:365 builtin/pack-objects.c:368
 #, c-format
 msgid "deflate error (%d)"
 msgstr "грешка при декомпресиране с „deflate“ (%d)"
 
-#: archive-zip.c:603
 #, c-format
 msgid "timestamp too large for this system: %<PRIuMAX>"
-msgstr "времевата стойност е твърде голяма за тази система: %<PRIuMAX>"
+msgstr "времевото клеймо е твърде голямо за тази система: %<PRIuMAX>"
 
-#: archive.c:14
 msgid "git archive [<options>] <tree-ish> [<path>...]"
 msgstr "git archive [ОПЦИЯ…] УКАЗАТЕЛ_КЪМ_ДЪРВО [ПЪТ…]"
 
-#: archive.c:15
-msgid "git archive --list"
-msgstr "git archive --list"
-
-#: archive.c:16
 msgid ""
 "git archive --remote <repo> [--exec <cmd>] [<options>] <tree-ish> [<path>...]"
 msgstr ""
 "git archive --remote ХРАНИЛИЩЕ [--exec КОМАНДА] [ОПЦИЯ…] УКАЗАТЕЛ_КЪМ_ДЪРВО "
 "[ПЪТ…]"
 
-#: archive.c:17
 msgid "git archive --remote <repo> [--exec <cmd>] --list"
 msgstr "git archive --remote ХРАНИЛИЩЕ [--exec КОМАНДА] --list"
 
-#: archive.c:188 archive.c:341 builtin/gc.c:497 builtin/notes.c:238
-#: builtin/tag.c:578
 #, c-format
 msgid "cannot read '%s'"
 msgstr "файлът „%s“ не може да бъде прочетен"
 
-#: archive.c:426 builtin/add.c:215 builtin/add.c:671 builtin/rm.c:334
 #, c-format
 msgid "pathspec '%s' did not match any files"
 msgstr "пътят „%s“ не съвпада с никой файл"
 
-#: archive.c:450
 #, c-format
 msgid "no such ref: %.*s"
 msgstr "такъв указател няма: %.*s"
 
-#: archive.c:456
 #, c-format
 msgid "not a valid object name: %s"
 msgstr "неправилно име на обект: „%s“"
 
-#: archive.c:469
 #, c-format
 msgid "not a tree object: %s"
 msgstr "не е обект-дърво: %s"
 
-#: archive.c:481
 msgid "current working directory is untracked"
 msgstr "текущата работна директория не е следена"
 
-#: archive.c:522
 #, c-format
 msgid "File not found: %s"
 msgstr "Файлът „%s“ липсва"
 
-#: archive.c:524
 #, c-format
 msgid "Not a regular file: %s"
 msgstr "„%s“ не е обикновен файл"
 
-#: archive.c:551
+#, c-format
+msgid "unclosed quote: '%s'"
+msgstr "кавичка без еш: „%s“"
+
+#, c-format
+msgid "missing colon: '%s'"
+msgstr "липсва двоеточие: „%s“"
+
+#, c-format
+msgid "empty file name: '%s'"
+msgstr "празно име на файл: „%s“"
+
 msgid "fmt"
 msgstr "ФОРМАТ"
 
-#: archive.c:551
 msgid "archive format"
 msgstr "ФОРМАТ на архива"
 
-#: archive.c:552 builtin/log.c:1790
 msgid "prefix"
 msgstr "ПРЕФИКС"
 
-#: archive.c:553
 msgid "prepend prefix to each pathname in the archive"
 msgstr "добавяне на този ПРЕФИКС към всеки път в архива"
 
-#: 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:1181 builtin/fast-export.c:1183
-#: builtin/fast-export.c:1187 builtin/grep.c:935 builtin/hash-object.c:103
-#: builtin/ls-files.c:654 builtin/ls-files.c:657 builtin/notes.c:410
-#: builtin/notes.c:576 builtin/read-tree.c:115 parse-options.h:190
 msgid "file"
 msgstr "ФАЙЛ"
 
-#: archive.c:555
 msgid "add untracked file to archive"
 msgstr "добавяне на неследените файлове към архива"
 
-#: archive.c:558 builtin/archive.c:88
+msgid "path:content"
+msgstr "път:съдържание"
+
 msgid "write the archive to this file"
 msgstr "запазване на архива в този ФАЙЛ"
 
-#: archive.c:560
 msgid "read .gitattributes in working directory"
 msgstr "изчитане на „.gitattributes“ в работната директория"
 
-#: archive.c:561
 msgid "report archived files on stderr"
 msgstr "извеждане на архивираните файлове на стандартната грешка"
 
-#: archive.c:563
 msgid "set compression level"
 msgstr "задаване на нивото на компресиране"
 
-#: archive.c:566
 msgid "list supported archive formats"
 msgstr "извеждане на списъка с поддържаните формати"
 
-#: archive.c:568 builtin/archive.c:89 builtin/clone.c:118 builtin/clone.c:121
-#: builtin/submodule--helper.c:1870 builtin/submodule--helper.c:2513
 msgid "repo"
 msgstr "хранилище"
 
-#: archive.c:569 builtin/archive.c:90
 msgid "retrieve the archive from remote repository <repo>"
 msgstr "получаване на архива от отдалеченото ХРАНИЛИЩЕ"
 
-#: archive.c:570 builtin/archive.c:91 builtin/difftool.c:708
-#: builtin/notes.c:496
 msgid "command"
 msgstr "команда"
 
-#: archive.c:571 builtin/archive.c:92
 msgid "path to the remote git-upload-archive command"
 msgstr "път към отдалечената команда „git-upload-archive“"
 
-#: archive.c:578
 msgid "Unexpected option --remote"
 msgstr "Неочаквана опция „--remote“"
 
-#: archive.c:580 fetch-pack.c:300 revision.c:2887 builtin/add.c:544
-#: builtin/add.c:576 builtin/checkout.c:1763 builtin/commit.c:370
-#: builtin/fast-export.c:1230 builtin/index-pack.c:1848 builtin/log.c:2115
-#: builtin/reset.c:435 builtin/reset.c:493 builtin/rm.c:281
-#: builtin/stash.c:1719 builtin/worktree.c:508 http-fetch.c:144
-#: http-fetch.c:153
 #, c-format
 msgid "the option '%s' requires '%s'"
 msgstr "опцията „%s“ изисква „%s“"
 
-#: archive.c:582
 msgid "Unexpected option --output"
 msgstr "Неочаквана опция „--output“"
 
-#: archive.c:606
 #, c-format
 msgid "Unknown archive format '%s'"
 msgstr "Непознат формат на архив: „%s“"
 
-#: archive.c:615
 #, c-format
 msgid "Argument not supported for format '%s': -%d"
 msgstr "Аргументът не се поддържа за форма̀та „%s“: -%d"
 
-#: attr.c:203
 #, c-format
 msgid "%.*s is not a valid attribute name"
 msgstr "„%.*s“ е неправилно име за атрибут"
 
-#: attr.c:364
 #, c-format
 msgid "%s not allowed: %s:%d"
 msgstr "%s: командата не е позволена: „%s:%d“"
 
-#: attr.c:404
 msgid ""
 "Negative patterns are ignored in git attributes\n"
 "Use '\\!' for literal leading exclamation."
@@ -1950,22 +1623,18 @@ msgstr ""
 "Отрицателните шаблони се игнорират в атрибутите на git.\n"
 "Ако ви трябва начална удивителна, ползвайте „\\!“."
 
-#: bisect.c:488
 #, c-format
 msgid "Badly quoted content in file '%s': %s"
 msgstr "Неправилно цитирано съдържание във файла „%s“: %s"
 
-#: bisect.c:698
 #, c-format
 msgid "We cannot bisect more!\n"
 msgstr "Повече не може да се търси двоично!\n"
 
-#: bisect.c:764
 #, c-format
 msgid "Not a valid commit name %s"
 msgstr "Неправилно име на подаване „%s“"
 
-#: bisect.c:789
 #, c-format
 msgid ""
 "The merge base %s is bad.\n"
@@ -1974,7 +1643,6 @@ msgstr ""
 "Неправилна база за сливане: %s.\n"
 "Следователно грешката е коригирана между „%s“ и [%s].\n"
 
-#: bisect.c:794
 #, c-format
 msgid ""
 "The merge base %s is new.\n"
@@ -1983,7 +1651,6 @@ msgstr ""
 "Нова база за сливане: %s.\n"
 "Свойството е променено между „%s“ и [%s].\n"
 
-#: bisect.c:799
 #, c-format
 msgid ""
 "The merge base %s is %s.\n"
@@ -1992,7 +1659,6 @@ msgstr ""
 "Базата за сливане „%s“ е %s.\n"
 "Следователно първото %s подаване е между „%s“ и [%s].\n"
 
-#: bisect.c:807
 #, c-format
 msgid ""
 "Some %s revs are not ancestors of the %s rev.\n"
@@ -2003,7 +1669,6 @@ msgstr ""
 "Двоичното търсене с git bisect няма да работи правилно.\n"
 "Дали не сте объркали указателите „%s“ и „%s“?\n"
 
-#: bisect.c:820
 #, c-format
 msgid ""
 "the merge base between %s and [%s] must be skipped.\n"
@@ -2014,36 +1679,29 @@ msgstr ""
 "Не може да сме сигурни, че първото %s подаване е между „%s“ и „%s“.\n"
 "Двоичното търсене продължава."
 
-#: bisect.c:859
 #, c-format
 msgid "Bisecting: a merge base must be tested\n"
 msgstr "Двоично търсене: трябва да се провери база за сливане\n"
 
-#: bisect.c:909
 #, c-format
 msgid "a %s revision is needed"
 msgstr "необходима е версия „%s“"
 
-#: bisect.c:939
 #, c-format
 msgid "could not create file '%s'"
 msgstr "файлът „%s“ не може да бъде създаден"
 
-#: bisect.c:985 builtin/merge.c:155
 #, c-format
 msgid "could not read file '%s'"
 msgstr "файлът „%s“ не може да бъде прочетен"
 
-#: bisect.c:1025
 msgid "reading bisect refs failed"
 msgstr "неуспешно прочитане на указателите за двоично търсене"
 
-#: bisect.c:1055
 #, c-format
 msgid "%s was both %s and %s\n"
 msgstr "„%s“ e както „%s“, така и „%s“\n"
 
-#: bisect.c:1064
 #, c-format
 msgid ""
 "No testable commit found.\n"
@@ -2052,7 +1710,6 @@ msgstr ""
 "Липсва подходящо за тестване подаване.\n"
 "Проверете параметрите за пътищата.\n"
 
-#: bisect.c:1093
 #, c-format
 msgid "(roughly %d step)"
 msgid_plural "(roughly %d steps)"
@@ -2062,54 +1719,40 @@ msgstr[1] "(приблизително %d стъпки)"
 #. TRANSLATORS: the last %s will be replaced with "(roughly %d
 #. steps)" translation.
 #.
-#: 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"
 msgstr[0] "Двоично търсене: остава %d версия след тази %s\n"
 msgstr[1] "Двоично търсене: остават %d версии след тази %s\n"
 
-#: blame.c:2776
 msgid "--contents and --reverse do not blend well."
 msgstr "опциите „--contents“ и „--reverse“ са несъвместими"
 
-#: blame.c:2790
 msgid "cannot use --contents with final commit object name"
 msgstr "опцията „--contents“ е несъвместима с име на обект от крайно подаване"
 
-#: blame.c:2811
 msgid "--reverse and --first-parent together require specified latest commit"
 msgstr ""
 "Едновременното задаване на опциите „--reverse“ и „--first-parent“ изисква "
 "указването на крайно подаване"
 
-#: blame.c:2820 bundle.c:224 midx.c:1042 ref-filter.c:2370 remote.c:2158
-#: sequencer.c:2352 sequencer.c:4899 submodule.c:883 builtin/commit.c:1114
-#: builtin/log.c:429 builtin/log.c:1036 builtin/log.c:1644 builtin/log.c:2071
-#: builtin/log.c:2362 builtin/merge.c:431 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 "неуспешно настройване на обхождането на версиите"
 
-#: blame.c:2838
 msgid ""
 "--reverse --first-parent together require range along first-parent chain"
 msgstr ""
 "Едновременното задаване на опциите „--reverse“ и „--first-parent“ изисква "
 "указването на диапазон по веригата на първите наследници"
 
-#: blame.c:2849
 #, c-format
 msgid "no such path %s in %s"
 msgstr "няма път на име „%s“ в „%s“"
 
-#: blame.c:2860
 #, c-format
 msgid "cannot read blob %s for path %s"
 msgstr "обектът-BLOB „%s“ в пътя %s не може да бъде прочетен"
 
-#: branch.c:77
 msgid ""
 "cannot inherit upstream tracking configuration of multiple refs when "
 "rebasing is requested"
@@ -2117,32 +1760,26 @@ msgstr ""
 "настроените множество указатели, които да се следят, не може да се наследят "
 "при пребазиране"
 
-#: branch.c:88
 #, c-format
 msgid "not setting branch '%s' as its own upstream"
 msgstr ""
 "клонът „%s“ не може да служи като източник за собствената си синхронизация"
 
-#: branch.c:144
 #, c-format
 msgid "branch '%s' set up to track '%s' by rebasing."
 msgstr "клонът „%s“ ще следи „%s“ чрез пребазиране."
 
-#: branch.c:145
 #, c-format
 msgid "branch '%s' set up to track '%s'."
 msgstr "клонът „%s“ ще следи „%s“."
 
-#: branch.c:148
 #, c-format
 msgid "branch '%s' set up to track:"
 msgstr "клонът „%s“ ще следи:"
 
-#: branch.c:160
 msgid "unable to write upstream branch configuration"
 msgstr "настройките за следения клон не може да бъдат записани"
 
-#: branch.c:162
 msgid ""
 "\n"
 "After fixing the error cause you may try to fix up\n"
@@ -2152,54 +1789,83 @@ msgstr ""
 "След корекция на грешката, може да обновите\n"
 "информацията за следения клон чрез:"
 
-#: branch.c:203
 #, c-format
 msgid "asked to inherit tracking from '%s', but no remote is set"
 msgstr ""
 "заявка за наследяване на следенето от „%s“, но не е зададено отдалечено "
 "хранилище"
 
-#: branch.c:209
 #, c-format
 msgid "asked to inherit tracking from '%s', but no merge configuration is set"
 msgstr ""
 "заявка за наследяване на следенето от „%s“, но не е настроен режим за "
 "пребазиране"
 
-#: branch.c:252
 #, c-format
-msgid "not tracking: ambiguous information for ref %s"
-msgstr "няма следене: информацията за указателя „%s“ не е еднозначна"
+msgid "not tracking: ambiguous information for ref '%s'"
+msgstr "не се следени: информацията за указателя „%s“ не е еднозначна"
+
+#. #-#-#-#-#  branch.c.po  #-#-#-#-#
+#. TRANSLATORS: This is a line listing a remote with duplicate
+#. refspecs in the advice message below. For RTL languages you'll
+#. probably want to swap the "%s" and leading "  " space around.
+#.
+#. #-#-#-#-#  object-name.c.po  #-#-#-#-#
+#. TRANSLATORS: This is line item of ambiguous object output
+#. from describe_ambiguous_object() above. For RTL languages
+#. you'll probably want to swap the "%s" and leading " " space
+#. around.
+#.
+#, c-format
+msgid "  %s\n"
+msgstr "  %s\n"
+
+#. TRANSLATORS: The second argument is a \n-delimited list of
+#. duplicate refspecs, composed above.
+#.
+#, c-format
+msgid ""
+"There are multiple remotes whose fetch refspecs map to the remote\n"
+"tracking ref '%s':\n"
+"%s\n"
+"This is typically a configuration error.\n"
+"\n"
+"To support setting up tracking branches, ensure that\n"
+"different remotes' fetch refspecs map into different\n"
+"tracking namespaces."
+msgstr ""
+"Има повече от едно отдалечено хранилище, чийто указател за изтегляне "
+"отговаря на „%s“:\n"
+"%s\n"
+"Най-често това е грешка в настройките.\n"
+"\n"
+"За конфигурирането на следящи клони трябва указателите за изтегляне да "
+"съответстват\n"
+"на различни пространства от имена."
 
-#: branch.c:287
 #, c-format
 msgid "'%s' is not a valid branch name"
 msgstr "„%s“ не е позволено име за клон"
 
-#: branch.c:307
 #, c-format
 msgid "a branch named '%s' already exists"
 msgstr "вече съществува клон с име „%s“."
 
 # FIXME
-#: branch.c:313
 #, c-format
 msgid "cannot force update the branch '%s' checked out at '%s'"
 msgstr ""
 "не може принудително да обновите клона „%s“, който е изтеглен в пътя „%s“"
 
-#: branch.c:336
 #, c-format
 msgid "cannot set up tracking information; starting point '%s' is not a branch"
 msgstr ""
 "настройките за следенето не може да се зададат — началото „%s“ не е клон"
 
-#: branch.c:338
 #, c-format
 msgid "the requested upstream branch '%s' does not exist"
 msgstr "заявеният отдалечен клон „%s“ не съществува"
 
-#: branch.c:340
 msgid ""
 "\n"
 "If you are planning on basing your work on an upstream\n"
@@ -2218,8698 +1884,144 @@ msgstr ""
 "може да използвате „git push -u“, за да настроите към кой клон да се "
 "изтласква."
 
-#: branch.c:384 builtin/replace.c:321 builtin/replace.c:377
-#: builtin/replace.c:423 builtin/replace.c:453
 #, c-format
 msgid "not a valid object name: '%s'"
 msgstr "неправилно име на обект: „%s“"
 
-#: branch.c:404
 #, c-format
 msgid "ambiguous object name: '%s'"
 msgstr "името на обект не е еднозначно: „%s“"
 
-#: branch.c:409
 #, c-format
 msgid "not a valid branch point: '%s'"
 msgstr "неправилно място за начало на клон: „%s“"
 
-#: branch.c:469
-#, c-format
-msgid "'%s' is already checked out at '%s'"
-msgstr "„%s“ вече е изтеглен в „%s“"
-
-#: branch.c:494
-#, c-format
-msgid "HEAD of working tree %s is not updated"
-msgstr "Указателят „HEAD“ на работното дърво „%s“ не е обновен"
-
-#: bundle.c:44
-#, c-format
-msgid "unrecognized bundle hash algorithm: %s"
-msgstr "непознат алгоритъм за контролни суми за пратки „%s“"
-
-#: bundle.c:48
-#, c-format
-msgid "unknown capability '%s'"
-msgstr "непозната възможност „%s“"
-
-#: bundle.c:74
-#, c-format
-msgid "'%s' does not look like a v2 or v3 bundle file"
-msgstr "Файлът „%s“ не изглежда да е пратка на git версия 2 или 3"
-
-#: bundle.c:113
-#, c-format
-msgid "unrecognized header: %s%s (%d)"
-msgstr "непозната заглавна част: %s%s (%d)"
-
-#: bundle.c:140 rerere.c:464 rerere.c:674 sequencer.c:2620 sequencer.c:3406
-#: builtin/commit.c:862
-#, c-format
-msgid "could not open '%s'"
-msgstr "„%s“ не може да се отвори"
-
-#: bundle.c:198
-msgid "Repository lacks these prerequisite commits:"
-msgstr "В хранилището липсват следните необходими подавания:"
-
-#: bundle.c:201
-msgid "need a repository to verify a bundle"
-msgstr "за проверката на пратка е необходимо хранилище"
-
-#: bundle.c:257
-#, c-format
-msgid "The bundle contains this ref:"
-msgid_plural "The bundle contains these %d refs:"
-msgstr[0] "Пратката съдържа следния указател:"
-msgstr[1] "Пратката съдържа следните %d указатели:"
-
-#: bundle.c:264
-msgid "The bundle records a complete history."
-msgstr "Пратката съдържа пълна история."
-
-#: bundle.c:266
-#, c-format
-msgid "The bundle requires this ref:"
-msgid_plural "The bundle requires these %d refs:"
-msgstr[0] "Пратката изисква следния указател:"
-msgstr[1] "Пратката изисква следните %d указатели:"
-
-#: bundle.c:333
-msgid "unable to dup bundle descriptor"
-msgstr "неуспешно дублиране на дескриптора на пратката с „dup“"
-
-#: bundle.c:340
-msgid "Could not spawn pack-objects"
-msgstr "Командата „git pack-objects“ не може да бъде стартирана"
-
-#: bundle.c:351
-msgid "pack-objects died"
-msgstr "Командата „git pack-objects“ не завърши успешно"
-
-#: bundle.c:400
-#, c-format
-msgid "ref '%s' is excluded by the rev-list options"
-msgstr ""
-"указателят „%s“ не е бил включен поради опциите зададени на „git rev-list“"
-
-#: bundle.c:504
-#, c-format
-msgid "unsupported bundle version %d"
-msgstr "неподдържана версия на индекса %d"
-
-#: bundle.c:506
-#, c-format
-msgid "cannot write bundle version %d with algorithm %s"
-msgstr "пратка %d не може да се запише с алгоритъм %s"
-
-#: bundle.c:524 builtin/log.c:210 builtin/log.c:1953 builtin/shortlog.c:399
-#, c-format
-msgid "unrecognized argument: %s"
-msgstr "непознат аргумент: %s"
-
-#: bundle.c:553
-msgid "Refusing to create empty bundle."
-msgstr "Създаването на празна пратка е невъзможно."
-
-#: bundle.c:563
-#, c-format
-msgid "cannot create '%s'"
-msgstr "файлът „%s“ не може да бъде създаден"
-
-#: bundle.c:588
-msgid "index-pack died"
-msgstr "командата „git index-pack“ не завърши успешно"
-
-#: chunk-format.c:117
-msgid "terminating chunk id appears earlier than expected"
-msgstr "идентификаторът за краен откъс се явява по-рано от очакваното"
-
-#: chunk-format.c:126
-#, c-format
-msgid "improper chunk offset(s) %<PRIx64> and %<PRIx64>"
-msgstr "неправилно отместване на откъс/и %<PRIx64> и %<PRIx64>"
-
-#: chunk-format.c:133
-#, c-format
-msgid "duplicate chunk ID %<PRIx32> found"
-msgstr "повтарящ се идентификатор на откъс %<PRIx32>"
-
-#: chunk-format.c:147
-#, c-format
-msgid "final chunk has non-zero id %<PRIx32>"
-msgstr "ненулев идентификатор за краен откъс %<PRIx32>"
-
-#: color.c:354
-#, c-format
-msgid "invalid color value: %.*s"
-msgstr "неправилна стойност за цвят: %.*s"
-
-#: commit-graph.c:204 midx.c:51
-msgid "invalid hash version"
-msgstr "неправилна версия на контролна сума"
-
-#: commit-graph.c:262
-msgid "commit-graph file is too small"
-msgstr "файлът за гра̀фа с подаванията е твърде малък"
-
-#: commit-graph.c:355
-#, c-format
-msgid "commit-graph signature %X does not match signature %X"
-msgstr "отпечатъкът на гра̀фа с подаванията %X не съвпада с %X"
-
-#: commit-graph.c:362
-#, c-format
-msgid "commit-graph version %X does not match version %X"
-msgstr "версията на гра̀фа с подаванията %X не съвпада с %X"
-
-#: commit-graph.c:369
-#, c-format
-msgid "commit-graph hash version %X does not match version %X"
-msgstr "версията на контролната сума на гра̀фа с подаванията %X не съвпада с %X"
-
-#: commit-graph.c:386
-#, c-format
-msgid "commit-graph file is too small to hold %u chunks"
-msgstr "файлът с гра̀фа на подаванията е твърде малък, за да съдържа %u откъси"
-
-#: commit-graph.c:482
-msgid "commit-graph has no base graphs chunk"
-msgstr "базовият откъс липсва в гра̀фа с подаванията"
-
-#: commit-graph.c:492
-msgid "commit-graph chain does not match"
-msgstr "веригата на гра̀фа с подаванията не съвпада"
-
-#: commit-graph.c:540
-#, c-format
-msgid "invalid commit-graph chain: line '%s' not a hash"
-msgstr ""
-"грешка във веригата на гра̀фа с подаванията: ред „%s“ не е контролна сума"
-
-#: commit-graph.c:564
-msgid "unable to find all commit-graph files"
-msgstr "някои файлове на гра̀фа с подаванията не може да бъдат открити"
-
-#: commit-graph.c:749 commit-graph.c:786
-msgid "invalid commit position. commit-graph is likely corrupt"
-msgstr ""
-"неправилна позиция на подаването.  Вероятно графът с подаванията е повреден"
-
-#: commit-graph.c:770
-#, c-format
-msgid "could not find commit %s"
-msgstr "подаването „%s“ не може да бъде открито"
-
-#: commit-graph.c:803
-msgid "commit-graph requires overflow generation data but has none"
-msgstr ""
-"графът с подаванията изисква генериране на данни за отместването, но такива "
-"липсват"
-
-#: commit-graph.c:1108 builtin/am.c:1369
-#, c-format
-msgid "unable to parse commit %s"
-msgstr "подаването не може да бъде анализирано: %s"
-
-#: commit-graph.c:1370 builtin/pack-objects.c:3070
-#, c-format
-msgid "unable to get type of object %s"
-msgstr "видът на обекта „%s“ не може да бъде определен"
-
-#: commit-graph.c:1401
-msgid "Loading known commits in commit graph"
-msgstr "Зареждане на познатите подавания в гра̀фа с подаванията"
-
-#: commit-graph.c:1418
-msgid "Expanding reachable commits in commit graph"
-msgstr "Разширяване на достижимите подавания в гра̀фа"
-
-#: commit-graph.c:1438
-msgid "Clearing commit marks in commit graph"
-msgstr "Изчистване на отбелязванията на подаванията в гра̀фа с подаванията"
-
-#: commit-graph.c:1457
-msgid "Computing commit graph topological levels"
-msgstr "Изчисляване на топологичните нива в гра̀фа с подаванията"
-
-#: commit-graph.c:1510
-msgid "Computing commit graph generation numbers"
-msgstr "Изчисляване на номерата на поколенията в гра̀фа с подаванията"
-
-#: commit-graph.c:1591
-msgid "Computing commit changed paths Bloom filters"
-msgstr "Изчисляване на филтрите на Блум на пътищата с промяна при подаването"
-
-#: commit-graph.c:1668
-msgid "Collecting referenced commits"
-msgstr "Събиране на свързаните подавания"
-
-#: commit-graph.c:1693
-#, 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:1706
-#, c-format
-msgid "error adding pack %s"
-msgstr "грешка при добавяне на пакетен файл „%s“"
-
-#: commit-graph.c:1710
-#, c-format
-msgid "error opening index for %s"
-msgstr "грешка при отваряне на индекса на „%s“"
-
-#: commit-graph.c:1747
-msgid "Finding commits for commit graph among packed objects"
-msgstr "Откриване на подаванията в гра̀фа измежду пакетираните обекти"
-
-#: commit-graph.c:1765
-msgid "Finding extra edges in commit graph"
-msgstr "Откриване на още върхове в гра̀фа с подаванията"
-
-#: commit-graph.c:1814
-msgid "failed to write correct number of base graph ids"
-msgstr "правилният брой на базовите идентификатори не може да се запише"
-
-#: commit-graph.c:1845 midx.c:1149
-#, c-format
-msgid "unable to create leading directories of %s"
-msgstr "родителските директории на „%s“ не може да бъдат създадени"
-
-#: commit-graph.c:1858
-msgid "unable to create temporary graph layer"
-msgstr "не може да бъде създаден временен слой за гра̀фа с подаванията"
-
-#: commit-graph.c:1863
-#, c-format
-msgid "unable to adjust shared permissions for '%s'"
-msgstr "правата за споделен достъп до „%s“ не може да бъдат зададени"
-
-#: commit-graph.c:1920
-#, 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:1956
-msgid "unable to open commit-graph chain file"
-msgstr "файлът с веригата на гра̀фа с подаванията не може да се отвори"
-
-#: commit-graph.c:1972
-msgid "failed to rename base commit-graph file"
-msgstr "основният файл на гра̀фа с подаванията не може да бъде преименуван"
-
-#: commit-graph.c:1992
-msgid "failed to rename temporary commit-graph file"
-msgstr "временният файл на гра̀фа с подаванията не може да бъде преименуван"
-
-#: commit-graph.c:2125
-msgid "Scanning merged commits"
-msgstr "Търсене на подаванията със сливания"
-
-#: commit-graph.c:2169
-msgid "Merging commit-graph"
-msgstr "Сливане на гра̀фа с подаванията"
-
-#: commit-graph.c:2277
-msgid "attempting to write a commit-graph, but 'core.commitGraph' is disabled"
-msgstr ""
-"опит за запис на гра̀фа с подаванията, но настройката „core.commitGraph“ е "
-"изключена"
-
-#: commit-graph.c:2384
-msgid "too many commits to write graph"
-msgstr "прекалено много подавания за записване на гра̀фа"
-
-#: commit-graph.c:2482
-msgid "the commit-graph file has incorrect checksum and is likely corrupt"
-msgstr "графът с подаванията е с грешна сума за проверка — вероятно е повреден"
-
-#: commit-graph.c:2492
-#, c-format
-msgid "commit-graph has incorrect OID order: %s then %s"
-msgstr ""
-"неправилна подредба на обектите по идентификатор в гра̀фа с подаванията: „%s“ "
-"е преди „%s“, а не трябва"
-
-#: commit-graph.c:2502 commit-graph.c:2517
-#, c-format
-msgid "commit-graph has incorrect fanout value: fanout[%d] = %u != %u"
-msgstr ""
-"неправилна стойност за откъс в гра̀фа с подаванията: fanout[%d] = %u, а "
-"трябва да е %u"
-
-#: commit-graph.c:2509
-#, c-format
-msgid "failed to parse commit %s from commit-graph"
-msgstr "подаване „%s“ в гра̀фа с подаванията не може да се анализира"
-
-#: commit-graph.c:2527
-msgid "Verifying commits in commit graph"
-msgstr "Проверка на подаванията в гра̀фа"
-
-#: commit-graph.c:2542
-#, c-format
-msgid "failed to parse commit %s from object database for commit-graph"
-msgstr ""
-"подаване „%s“ в базата от данни към гра̀фа с подаванията не може да се "
-"анализира"
-
-#: commit-graph.c:2549
-#, c-format
-msgid "root tree OID for commit %s in commit-graph is %s != %s"
-msgstr ""
-"идентификаторът на обект за кореновото дърво за подаване „%s“ в гра̀фа с "
-"подаванията е „%s“, а трябва да е „%s“"
-
-#: commit-graph.c:2559
-#, c-format
-msgid "commit-graph parent list for commit %s is too long"
-msgstr "списъкът с родители на „%s“ в гра̀фа с подаванията е прекалено дълъг"
-
-#: commit-graph.c:2568
-#, c-format
-msgid "commit-graph parent for %s is %s != %s"
-msgstr "родителят на „%s“ в гра̀фа с подаванията е „%s“, а трябва да е „%s“"
-
-#: commit-graph.c:2582
-#, c-format
-msgid "commit-graph parent list for commit %s terminates early"
-msgstr "списъкът с родители на „%s“ в гра̀фа с подаванията е прекалено къс"
-
-#: commit-graph.c:2587
-#, c-format
-msgid ""
-"commit-graph has generation number zero for commit %s, but non-zero elsewhere"
-msgstr ""
-"номерът на поколението на подаване „%s“ в гра̀фа с подаванията е 0, а другаде "
-"не е"
-
-#: commit-graph.c:2591
-#, c-format
-msgid ""
-"commit-graph has non-zero generation number for commit %s, but zero elsewhere"
-msgstr ""
-"номерът на поколението на подаване „%s“ в гра̀фа с подаванията не е 0, а "
-"другаде е"
-
-#: commit-graph.c:2608
-#, c-format
-msgid "commit-graph generation for commit %s is %<PRIuMAX> < %<PRIuMAX>"
-msgstr ""
-"номерът на поколението на подаване „%s“ в гра̀фа с подаванията е %<PRIuMAX> < "
-"%<PRIuMAX>"
-
-#: commit-graph.c:2614
-#, c-format
-msgid "commit date for commit %s in commit-graph is %<PRIuMAX> != %<PRIuMAX>"
-msgstr ""
-"датата на подаване на „%s“ в гра̀фа с подаванията е %<PRIuMAX>, а трябва да е "
-"%<PRIuMAX>"
-
-#: commit.c:53 sequencer.c:3109 builtin/am.c:399 builtin/am.c:444
-#: builtin/am.c:449 builtin/am.c:1448 builtin/am.c:2123 builtin/replace.c:456
-#, c-format
-msgid "could not parse %s"
-msgstr "„%s“ не може да се анализира"
-
-#: commit.c:55
-#, c-format
-msgid "%s %s is not a commit!"
-msgstr "%s %s не е подаване!"
-
-#: commit.c:196
-msgid ""
-"Support for <GIT_DIR>/info/grafts is deprecated\n"
-"and will be removed in a future Git version.\n"
-"\n"
-"Please use \"git replace --convert-graft-file\"\n"
-"to convert the grafts into replace refs.\n"
-"\n"
-"Turn this message off by running\n"
-"\"git config advice.graftFileDeprecated false\""
-msgstr ""
-"Поддръжката на „<GIT_DIR>/info/grafts“ е остаряла.\n"
-"В бъдеща версия на Git ще бъде премахната.\n"
-"\n"
-"Може да преобразувате присадките в заместващи\n"
-"указатели с командата:\n"
-"\n"
-"    git replace --convert-graft-file\n"
-"\n"
-"За да изключите това съобщение, изпълнете:\n"
-"\n"
-"    git config advice.graftFileDeprecated false"
-
-#: commit.c:1241
-#, c-format
-msgid "Commit %s has an untrusted GPG signature, allegedly by %s."
-msgstr ""
-"Подаването „%s“ е с недоверен подпис от GPG, който твърди, че е на „%s“."
-
-#: commit.c:1245
-#, c-format
-msgid "Commit %s has a bad GPG signature allegedly by %s."
-msgstr ""
-"Подаването „%s“ е с неправилен подпис от GPG, който твърди, че е на „%s“."
-
-#: commit.c:1248
-#, c-format
-msgid "Commit %s does not have a GPG signature."
-msgstr "Подаването „%s“ е без подпис от GPG."
-
-#: commit.c:1251
-#, c-format
-msgid "Commit %s has a good GPG signature by %s\n"
-msgstr "Подаването „%s“ е с коректен подпис от GPG на „%s“.\n"
-
-#: commit.c:1505
-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"
-"variable i18n.commitencoding to the encoding your project uses.\n"
-msgstr ""
-"ПРЕДУПРЕЖДЕНИЕ: съобщението при подаване не е кодирано с UTF-8.\n"
-"Може да поправите подаването заедно със съобщението или може да\n"
-"зададете ползваното кодиране в настройката „i18n.commitencoding“.\n"
-
-#: compat/obstack.c:406 compat/obstack.c:408
-msgid "memory exhausted"
-msgstr "паметта свърши"
-
-#: config.c:125
-#, c-format
-msgid ""
-"exceeded maximum include depth (%d) while including\n"
-"\t%s\n"
-"from\n"
-"\t%s\n"
-"This might be due to circular includes."
-msgstr ""
-"максималната дълбочина на влагане (%d) е надвишена при вмъкването на:\n"
-"    %s\n"
-"от\n"
-"    %s\n"
-"Това може да се дължи на зацикляне при вмъкването."
-
-#: config.c:141
-#, c-format
-msgid "could not expand include path '%s'"
-msgstr "пътят за вмъкване „%s“не може да бъде разширен"
-
-#: config.c:152
-msgid "relative config includes must come from files"
-msgstr "относителните вмъквания на конфигурации трябва да идват от файлове"
-
-#: config.c:201
-msgid "relative config include conditionals must come from files"
-msgstr "относителните условни изрази за вмъкване трябва да идват от файлове"
-
-#: config.c:398
-#, c-format
-msgid "invalid config format: %s"
-msgstr "неправилен формат на настройка: %s"
-
-#: config.c:402
-#, c-format
-msgid "missing environment variable name for configuration '%.*s'"
-msgstr "липсва име на променлива на средата за настройката „%.*s“"
-
-#: config.c:407
-#, c-format
-msgid "missing environment variable '%s' for configuration '%.*s'"
-msgstr "липсва променлива на средата „%s“ за настройката „%.*s“"
-
-#: config.c:443
-#, c-format
-msgid "key does not contain a section: %s"
-msgstr "ключът не съдържа раздел: „%s“"
-
-#: config.c:448
-#, c-format
-msgid "key does not contain variable name: %s"
-msgstr "ключът не съдържа име на променлива: „%s“"
-
-#: config.c:470 sequencer.c:2806
-#, c-format
-msgid "invalid key: %s"
-msgstr "неправилен ключ: „%s“"
-
-#: config.c:475
-#, c-format
-msgid "invalid key (newline): %s"
-msgstr "неправилен ключ (нов ред): „%s“"
-
-#: config.c:495
-msgid "empty config key"
-msgstr "празен ключ за настройка"
-
-#: config.c:513 config.c:525
-#, c-format
-msgid "bogus config parameter: %s"
-msgstr "неправилен конфигурационен параметър: „%s“"
-
-#: config.c:539 config.c:556 config.c:563 config.c:572
-#, c-format
-msgid "bogus format in %s"
-msgstr "неправилен формат в „%s“"
-
-#: config.c:606
-#, c-format
-msgid "bogus count in %s"
-msgstr "неправилен брой в „%s“"
-
-#: config.c:610
-#, c-format
-msgid "too many entries in %s"
-msgstr "прекалено много записи в „%s“"
-
-#: config.c:620
-#, c-format
-msgid "missing config key %s"
-msgstr "ключът за настройка „%s“ липсва"
-
-#: config.c:628
-#, c-format
-msgid "missing config value %s"
-msgstr "стойността за настройка „%s“ липсва"
-
-#: config.c:979
-#, c-format
-msgid "bad config line %d in blob %s"
-msgstr "неправилен ред за настройки %d в BLOB „%s“"
-
-#: config.c:983
-#, c-format
-msgid "bad config line %d in file %s"
-msgstr "неправилен ред за настройки %d във файла „%s“"
-
-#: config.c:987
-#, c-format
-msgid "bad config line %d in standard input"
-msgstr "неправилен ред за настройки %d на стандартния вход"
-
-#: config.c:991
-#, c-format
-msgid "bad config line %d in submodule-blob %s"
-msgstr "неправилен ред за настройки %d в BLOB за подмодул „%s“"
-
-#: config.c:995
-#, c-format
-msgid "bad config line %d in command line %s"
-msgstr "неправилен ред за настройки %d на командния ред „%s“"
-
-#: config.c:999
-#, c-format
-msgid "bad config line %d in %s"
-msgstr "неправилен ред за настройки %d в „%s“"
-
-#: config.c:1136
-msgid "out of range"
-msgstr "извън диапазона"
-
-#: config.c:1136
-msgid "invalid unit"
-msgstr "неправилна мерна единица"
-
-#: config.c:1137
-#, c-format
-msgid "bad numeric config value '%s' for '%s': %s"
-msgstr "неправилна числова стойност „%s“ за „%s“: %s"
-
-#: 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:1150
-#, c-format
-msgid "bad numeric config value '%s' for '%s' in file %s: %s"
-msgstr "неправилна числова стойност „%s“ за „%s“ във файла „%s“: %s"
-
-#: config.c:1153
-#, c-format
-msgid "bad numeric config value '%s' for '%s' in standard input: %s"
-msgstr "неправилна числова стойност „%s“ за „%s“ на стандартния вход: %s"
-
-#: 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:1159
-#, c-format
-msgid "bad numeric config value '%s' for '%s' in command line %s: %s"
-msgstr "неправилна числова стойност „%s“ за „%s“ на командния ред „%s“: %s"
-
-#: config.c:1162
-#, c-format
-msgid "bad numeric config value '%s' for '%s' in %s: %s"
-msgstr "неправилна числова стойност „%s“ за „%s“ в %s: %s"
-
-#: config.c:1241
-#, c-format
-msgid "bad boolean config value '%s' for '%s'"
-msgstr "неправилна булева стойност „%s“ за „%s“"
-
-#: config.c:1259
-#, c-format
-msgid "failed to expand user dir in: '%s'"
-msgstr "домашната папка на потребителя не може да бъде открита: „%s“"
-
-#: config.c:1268
-#, c-format
-msgid "'%s' for '%s' is not a valid timestamp"
-msgstr "„%s“ не е правилна стойност за време за „%s“"
-
-#: config.c:1361
-#, c-format
-msgid "abbrev length out of range: %d"
-msgstr "дължината на съкращаване е извън интервала ([4; 40]): %d"
-
-#: config.c:1375 config.c:1386
-#, c-format
-msgid "bad zlib compression level %d"
-msgstr "неправилно ниво на компресиране: %d"
-
-#: config.c:1476
-msgid "core.commentChar should only be one character"
-msgstr "настройката „core.commentChar“ трябва да е само един знак"
-
-#: config.c:1509
-#, c-format
-msgid "invalid mode for object creation: %s"
-msgstr "неправилен режим за създаването на обекти: %s"
-
-#: config.c:1584
-#, c-format
-msgid "malformed value for %s"
-msgstr "неправилна стойност за „%s“"
-
-#: config.c:1610
-#, c-format
-msgid "malformed value for %s: %s"
-msgstr "неправилна стойност за „%s“: „%s“"
-
-#: config.c:1611
-msgid "must be one of nothing, matching, simple, upstream or current"
-msgstr ""
-"трябва да е една от следните стойности: „nothing“ (без изтласкване при липса "
-"на указател), „matching“ (всички клони със съвпадащи имена), "
-"„simple“ (клонът със същото име, от който се издърпва), „upstream“ (клонът, "
-"от който се издърпва) или „current“ (клонът със същото име)"
-
-#: config.c:1672 builtin/pack-objects.c:4053
-#, c-format
-msgid "bad pack compression level %d"
-msgstr "неправилно ниво на компресиране при пакетиране: %d"
-
-#: config.c:1795
-#, c-format
-msgid "unable to load config blob object '%s'"
-msgstr "обектът-BLOB „%s“ с конфигурации не може да се зареди"
-
-#: config.c:1798
-#, c-format
-msgid "reference '%s' does not point to a blob"
-msgstr "указателят „%s“ не сочи към обект-BLOB"
-
-#: config.c:1816
-#, c-format
-msgid "unable to resolve config blob '%s'"
-msgstr "обектът-BLOB „%s“ с конфигурации не може да бъде открит"
-
-#: config.c:1861
-#, c-format
-msgid "failed to parse %s"
-msgstr "„%s“ не може да бъде анализиран"
-
-#: config.c:1917
-msgid "unable to parse command-line config"
-msgstr "неправилни настройки от командния ред"
-
-#: config.c:2285
-msgid "unknown error occurred while reading the configuration files"
-msgstr "неочаквана грешка при изчитането на конфигурационните файлове"
-
-#: config.c:2459
-#, c-format
-msgid "Invalid %s: '%s'"
-msgstr "Неправилен %s: „%s“"
-
-#: config.c:2504
-#, c-format
-msgid "splitIndex.maxPercentChange value '%d' should be between 0 and 100"
-msgstr ""
-"стойността на „splitIndex.maxPercentChange“ трябва да е между 1 и 100, а не "
-"%d"
-
-#: config.c:2550
-#, c-format
-msgid "unable to parse '%s' from command-line config"
-msgstr "неразпозната стойност „%s“ от командния ред"
-
-#: config.c:2552
-#, c-format
-msgid "bad config variable '%s' in file '%s' at line %d"
-msgstr "неправилна настройка „%s“ във файла „%s“ на ред №%d"
-
-#: config.c:2637
-#, c-format
-msgid "invalid section name '%s'"
-msgstr "неправилно име на раздел: „%s“"
-
-#: config.c:2669
-#, c-format
-msgid "%s has multiple values"
-msgstr "зададени са няколко стойности за „%s“"
-
-#: config.c:2698
-#, c-format
-msgid "failed to write new configuration file %s"
-msgstr "новият конфигурационен файл „%s“ не може да бъде запазен"
-
-#: config.c:2950 config.c:3277
-#, c-format
-msgid "could not lock config file %s"
-msgstr "конфигурационният файл „%s“ не може да бъде заключен"
-
-#: config.c:2961
-#, c-format
-msgid "opening %s"
-msgstr "отваряне на „%s“"
-
-#: config.c:2998 builtin/config.c:361
-#, c-format
-msgid "invalid pattern: %s"
-msgstr "неправилен шаблон: %s"
-
-#: config.c:3023
-#, c-format
-msgid "invalid config file %s"
-msgstr "неправилен конфигурационен файл: „%s“"
-
-#: config.c:3036 config.c:3290
-#, c-format
-msgid "fstat on %s failed"
-msgstr "неуспешно изпълнение на „fstat“ върху „%s“"
-
-#: config.c:3047
-#, c-format
-msgid "unable to mmap '%s'%s"
-msgstr "неуспешно изпълнение на „mmap“ върху „%s“%s"
-
-#: config.c:3057 config.c:3295
-#, c-format
-msgid "chmod on %s failed"
-msgstr "неуспешна смяна на права с „chmod“ върху „%s“"
-
-#: config.c:3142 config.c:3392
-#, c-format
-msgid "could not write config file %s"
-msgstr "конфигурационният файл „%s“ не може да бъде записан"
-
-#: config.c:3176
-#, c-format
-msgid "could not set '%s' to '%s'"
-msgstr "„%s“ не може да се зададе да е „%s“"
-
-#: config.c:3178 builtin/remote.c:662 builtin/remote.c:860 builtin/remote.c:868
-#, c-format
-msgid "could not unset '%s'"
-msgstr "„%s“ не може да се премахне"
-
-#: config.c:3268
-#, c-format
-msgid "invalid section name: %s"
-msgstr "неправилно име на раздел: %s"
-
-#: config.c:3435
-#, c-format
-msgid "missing value for '%s'"
-msgstr "липсва стойност за „%s“"
-
-#: connect.c:61
-msgid "the remote end hung up upon initial contact"
-msgstr "отдалеченото хранилище прекъсна връзката веднага след отварянето ѝ"
-
-#: connect.c:63
-msgid ""
-"Could not read from remote repository.\n"
-"\n"
-"Please make sure you have the correct access rights\n"
-"and the repository exists."
-msgstr ""
-"Не може да се чете от отдалеченото хранилище.\n"
-"\n"
-"Проверете дали то съществува и дали имате права\n"
-"за достъп."
-
-#: connect.c:81
-#, c-format
-msgid "server doesn't support '%s'"
-msgstr "сървърът не поддържа „%s“"
-
-#: connect.c:118
-#, c-format
-msgid "server doesn't support feature '%s'"
-msgstr "сървърът не поддържа „%s“"
-
-#: connect.c:129
-msgid "expected flush after capabilities"
-msgstr ""
-"след първоначалната обява на възможностите се очаква изчистване на буферите"
-
-#: connect.c:265
-#, c-format
-msgid "ignoring capabilities after first line '%s'"
-msgstr "пропускане на възможностите след първия ред „%s“"
-
-#: connect.c:286
-msgid "protocol error: unexpected capabilities^{}"
-msgstr "протоколна грешка: неочаквани възможности^{}"
-
-#: connect.c:308
-#, c-format
-msgid "protocol error: expected shallow sha-1, got '%s'"
-msgstr "протоколна грешка: очаква се SHA1 на плитък обект, а бе получено: „%s“"
-
-#: connect.c:310
-msgid "repository on the other end cannot be shallow"
-msgstr "отсрещното хранилище не може да е плитко"
-
-#: connect.c:349
-msgid "invalid packet"
-msgstr "неправилен пакет"
-
-#: connect.c:369
-#, c-format
-msgid "protocol error: unexpected '%s'"
-msgstr "протоколна грешка: неочаквано „%s“"
-
-#: connect.c:499
-#, c-format
-msgid "unknown object format '%s' specified by server"
-msgstr "сървърът указа непознат формат на обект: „%s“"
-
-#: connect.c:528
-#, c-format
-msgid "invalid ls-refs response: %s"
-msgstr "неправилен отговор на „ls-refs“: „%s“"
-
-#: connect.c:532
-msgid "expected flush after ref listing"
-msgstr "след изброяването на указателите се очаква изчистване на буферите"
-
-#: connect.c:535
-msgid "expected response end packet after ref listing"
-msgstr "след изброяването на указателите се очаква пакет за край"
-
-#: connect.c:670
-#, c-format
-msgid "protocol '%s' is not supported"
-msgstr "протокол „%s“ не се поддържа"
-
-#: connect.c:721
-msgid "unable to set SO_KEEPALIVE on socket"
-msgstr "неуспешно задаване на „SO_KEEPALIVE“ на гнездо"
-
-#: connect.c:761 connect.c:824
-#, c-format
-msgid "Looking up %s ... "
-msgstr "Търсене на „%s“… "
-
-#: 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:769 connect.c:840
-#, c-format
-msgid ""
-"done.\n"
-"Connecting to %s (port %s) ... "
-msgstr ""
-"готово.\n"
-"Свързване към „%s“ (порт %s)…"
-
-#: connect.c:791 connect.c:868
-#, c-format
-msgid ""
-"unable to connect to %s:\n"
-"%s"
-msgstr ""
-"неуспешно свързване към „%s“:\n"
-"%s"
-
-#. TRANSLATORS: this is the end of "Connecting to %s (port %s) ... "
-#: connect.c:797 connect.c:874
-msgid "done."
-msgstr "действието завърши."
-
-#: connect.c:828
-#, c-format
-msgid "unable to look up %s (%s)"
-msgstr "„%s“ не може да се открие (%s)"
-
-#: connect.c:834
-#, c-format
-msgid "unknown port %s"
-msgstr "непознат порт „%s“"
-
-#: connect.c:971 connect.c:1303
-#, c-format
-msgid "strange hostname '%s' blocked"
-msgstr "необичайното име на хост „%s“ е блокирано"
-
-#: connect.c:973
-#, c-format
-msgid "strange port '%s' blocked"
-msgstr "необичайният порт „%s“ е блокиран"
-
-#: connect.c:983
-#, c-format
-msgid "cannot start proxy %s"
-msgstr "посредникът „%s“ не може да се стартира"
-
-#: connect.c:1054
-msgid "no path specified; see 'git help pull' for valid url syntax"
-msgstr ""
-"не е указан път. Проверете синтаксиса с командата:\n"
-"\n"
-"    git help pull"
-
-#: connect.c:1194
-msgid "newline is forbidden in git:// hosts and repo paths"
-msgstr ""
-"знакът за нов ред не е позволен в адресите и в пътищата до хранилищата "
-"„git://“"
-
-#: connect.c:1251
-msgid "ssh variant 'simple' does not support -4"
-msgstr "вариантът за „ssh“ — „simple“ (опростен), не поддържа опцията „-4“"
-
-#: connect.c:1263
-msgid "ssh variant 'simple' does not support -6"
-msgstr "вариантът за „ssh“ — „simple“ (опростен), не поддържа опцията „-6“"
-
-#: connect.c:1280
-msgid "ssh variant 'simple' does not support setting port"
-msgstr ""
-"вариантът за „ssh“ — „simple“ (опростен), не поддържа задаването на порт"
-
-#: connect.c:1392
-#, c-format
-msgid "strange pathname '%s' blocked"
-msgstr "необичайният път „%s“ е блокиран"
-
-#: connect.c:1440
-msgid "unable to fork"
-msgstr "неуспешно създаване на процес"
-
-#: connected.c:109 builtin/fsck.c:189 builtin/prune.c:57
-msgid "Checking connectivity"
-msgstr "Проверка на свързаността"
-
-#: connected.c:122
-msgid "Could not run 'git rev-list'"
-msgstr "Командата „git rev-list“ не може да бъде изпълнена."
-
-#: connected.c:146
-msgid "failed write to rev-list"
-msgstr "неуспешен запис на списъка с версиите"
-
-#: connected.c:151
-msgid "failed to close rev-list's stdin"
-msgstr "стандартният вход на списъка с версиите не може да бъде затворен"
-
-#: convert.c:183
-#, c-format
-msgid "illegal crlf_action %d"
-msgstr "неправилно действие за край на ред (crlf_action): %d"
-
-#: convert.c:196
-#, c-format
-msgid "CRLF would be replaced by LF in %s"
-msgstr "Всяка последователност от знаци „CRLF“ ще бъдe заменена с „LF“ в „%s“."
-
-#: convert.c:198
-#, c-format
-msgid ""
-"CRLF will be replaced by LF in %s.\n"
-"The file will have its original line endings in your working directory"
-msgstr ""
-"Всяка последователност от знаци „CRLF“ ще бъдe заменена с „LF“ в „%s“.\n"
-"Файлът ще остане с първоначалните знаци за край на ред в работната ви "
-"директория."
-
-#: convert.c:206
-#, c-format
-msgid "LF would be replaced by CRLF in %s"
-msgstr ""
-"Всеки знак „LF“ ще бъдe заменен с последователността от знаци „CRLF“ в „%s“."
-
-#: convert.c:208
-#, c-format
-msgid ""
-"LF will be replaced by CRLF in %s.\n"
-"The file will have its original line endings in your working directory"
-msgstr ""
-"Всеки знак „LF“ ще бъдe заменен с последователността от знаци „CRLF“ в "
-"„%s“.\n"
-"Файлът ще остане с първоначалните знаци за край на ред в работната ви "
-"директория."
-
-#: convert.c:273
-#, c-format
-msgid "BOM is prohibited in '%s' if encoded as %s"
-msgstr ""
-"„%s“ не трябва да съдържа маркер за поредността на байтовете (BOM) при "
-"кодиране „%s“"
-
-#: convert.c:280
-#, c-format
-msgid ""
-"The file '%s' contains a byte order mark (BOM). Please use UTF-%.*s as "
-"working-tree-encoding."
-msgstr ""
-"Файлът „%s“ съдържа маркер за поредността на байтовете (BOM).  Използвайте "
-"„UTF-%.*s“ като кодиране за работното дърво."
-
-#: convert.c:293
-#, c-format
-msgid "BOM is required in '%s' if encoded as %s"
-msgstr ""
-"„%s“ трябва да съдържа маркер за поредността на байтовете (BOM) при кодиране "
-"„%s“"
-
-#: 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."
-msgstr ""
-"Във файла „%s“ липсва маркер за поредността на байтовете (BOM).  За кодиране "
-"на работното дърво използвайте UTF-%sBE или UTF-%sLE (в зависимост от "
-"поредността на байтовете)."
-
-#: convert.c:408 convert.c:479
-#, c-format
-msgid "failed to encode '%s' from %s to %s"
-msgstr "неуспешно прекодиране на „%s“ от „%s“ към „%s“"
-
-#: convert.c:451
-#, c-format
-msgid "encoding '%s' from %s to %s and back is not the same"
-msgstr "Прекодирането на „%s“ от „%s“ към „%s“ и обратно променя файла"
-
-#: convert.c:654
-#, c-format
-msgid "cannot fork to run external filter '%s'"
-msgstr "неуспешно създаване на процес за външен филтър „%s“"
-
-#: convert.c:674
-#, c-format
-msgid "cannot feed the input to external filter '%s'"
-msgstr "входът не може да бъде подаден на външния филтър „%s“"
-
-#: convert.c:681
-#, c-format
-msgid "external filter '%s' failed %d"
-msgstr "неуспешно изпълнение на външния филтър „%s“: %d"
-
-#: convert.c:716 convert.c:719
-#, c-format
-msgid "read from external filter '%s' failed"
-msgstr "неуспешно четене от външния филтър „%s“"
-
-#: convert.c:722 convert.c:777
-#, c-format
-msgid "external filter '%s' failed"
-msgstr "неуспешно изпълнение на външния филтър „%s“"
-
-#: convert.c:826
-msgid "unexpected filter type"
-msgstr "неочакван вид филтър"
-
-#: convert.c:837
-msgid "path name too long for external filter"
-msgstr "пътят е прекалено дълъг за външен филтър"
-
-#: convert.c:935
-#, c-format
-msgid ""
-"external filter '%s' is not available anymore although not all paths have "
-"been filtered"
-msgstr ""
-"външният филтър „%s“ вече не е наличен, въпреки че не всички пътища са "
-"филтрирани"
-
-#: convert.c:1236
-msgid "true/false are no valid working-tree-encodings"
-msgstr ""
-"„true“/„false“ (истина/лъжа̀) не може да са кодирания на работното дърво"
-
-#: convert.c:1416 convert.c:1449
-#, c-format
-msgid "%s: clean filter '%s' failed"
-msgstr "%s: неуспешно изпълнение на декодиращ филтър „%s“"
-
-#: convert.c:1492
-#, c-format
-msgid "%s: smudge filter %s failed"
-msgstr "%s: неуспешно изпълнение на кодиращ филтър „%s“"
-
-#: credential.c:96
-#, c-format
-msgid "skipping credential lookup for key: credential.%s"
-msgstr "прескачане на търсенето на идентификация според ключа: „credential.%s“"
-
-#: credential.c:112
-msgid "refusing to work with credential missing host field"
-msgstr "адресът трябва задължително да съдържа хост"
-
-#: credential.c:114
-msgid "refusing to work with credential missing protocol field"
-msgstr "адресът трябва задължително да съдържа протокол"
-
-#: credential.c:395
-#, c-format
-msgid "url contains a newline in its %s component: %s"
-msgstr "адресът съдържа нов ред в частта за %s: %s"
-
-#: credential.c:439
-#, c-format
-msgid "url has no scheme: %s"
-msgstr "адресът е без схема: %s"
-
-#: credential.c:512
-#, c-format
-msgid "credential url cannot be parsed: %s"
-msgstr "адресът за идентификация не може да се анализира: „%s“"
-
-#: date.c:138
-msgid "in the future"
-msgstr "в бъдещето"
-
-#: date.c:144
-#, c-format
-msgid "%<PRIuMAX> second ago"
-msgid_plural "%<PRIuMAX> seconds ago"
-msgstr[0] "преди %<PRIuMAX> секунда"
-msgstr[1] "преди %<PRIuMAX> секунди"
-
-#: date.c:151
-#, c-format
-msgid "%<PRIuMAX> minute ago"
-msgid_plural "%<PRIuMAX> minutes ago"
-msgstr[0] "преди %<PRIuMAX> минута"
-msgstr[1] "преди %<PRIuMAX> минути"
-
-#: date.c:158
-#, c-format
-msgid "%<PRIuMAX> hour ago"
-msgid_plural "%<PRIuMAX> hours ago"
-msgstr[0] "преди %<PRIuMAX> час"
-msgstr[1] "преди %<PRIuMAX> часа"
-
-#: date.c:165
-#, c-format
-msgid "%<PRIuMAX> day ago"
-msgid_plural "%<PRIuMAX> days ago"
-msgstr[0] "преди %<PRIuMAX> ден"
-msgstr[1] "преди %<PRIuMAX> дена"
-
-#: date.c:171
-#, c-format
-msgid "%<PRIuMAX> week ago"
-msgid_plural "%<PRIuMAX> weeks ago"
-msgstr[0] "преди %<PRIuMAX> седмица"
-msgstr[1] "преди %<PRIuMAX> седмици"
-
-#: date.c:178
-#, c-format
-msgid "%<PRIuMAX> month ago"
-msgid_plural "%<PRIuMAX> months ago"
-msgstr[0] "преди %<PRIuMAX> месец"
-msgstr[1] "преди %<PRIuMAX> месеца"
-
-#: date.c:189
-#, c-format
-msgid "%<PRIuMAX> year"
-msgid_plural "%<PRIuMAX> years"
-msgstr[0] "%<PRIuMAX> година"
-msgstr[1] "%<PRIuMAX> години"
-
-#. TRANSLATORS: "%s" is "<n> years"
-#: date.c:192
-#, c-format
-msgid "%s, %<PRIuMAX> month ago"
-msgid_plural "%s, %<PRIuMAX> months ago"
-msgstr[0] "преди %s и %<PRIuMAX> месец"
-msgstr[1] "преди %s и %<PRIuMAX> месеца"
-
-#: date.c:197 date.c:202
-#, c-format
-msgid "%<PRIuMAX> year ago"
-msgid_plural "%<PRIuMAX> years ago"
-msgstr[0] "преди %<PRIuMAX> година"
-msgstr[1] "преди %<PRIuMAX> години"
-
-#: delta-islands.c:272
-msgid "Propagating island marks"
-msgstr "Разпространяване на границите на групите"
-
-#: delta-islands.c:290
-#, c-format
-msgid "bad tree object %s"
-msgstr "неправилен обект-дърво: %s"
-
-#: delta-islands.c:334
-#, c-format
-msgid "failed to load island regex for '%s': %s"
-msgstr "регулярният израз на групата за „%s“, не може да бъде зареден: „%s“"
-
-#: delta-islands.c:390
-#, c-format
-msgid "island regex from config has too many capture groups (max=%d)"
-msgstr ""
-"регулярният израз на групата в конфигурационния файл съдържа повече от "
-"максимално поддържаните (%d) прихващащи групи"
-
-#: delta-islands.c:467
-#, c-format
-msgid "Marked %d islands, done.\n"
-msgstr "Отбелязани са %d групи, работата приключи.\n"
-
-#: diff-merges.c:70
-#, c-format
-msgid "unknown value for --diff-merges: %s"
-msgstr "непозната стойност за опцията „--diff-merges“: „%s“"
-
-#: diff-lib.c:561
-msgid "--merge-base does not work with ranges"
-msgstr "опцията „--merge-base“ не работи с диапазони"
-
-#: diff-lib.c:563
-msgid "--merge-base only works with commits"
-msgstr "опцията „--merge-base“ работи само с подавания"
-
-#: diff-lib.c:580
-msgid "unable to get HEAD"
-msgstr "Указателят „HEAD“ не може да бъде получен"
-
-#: diff-lib.c:587
-msgid "no merge base found"
-msgstr "липсва база за сливане"
-
-#: diff-lib.c:589
-msgid "multiple merge bases found"
-msgstr "много бази за сливане"
-
-#: diff-no-index.c:237
-msgid "git diff --no-index [<options>] <path> <path>"
-msgstr "git diff --no-index [ОПЦИЯ…] ПЪТ ПЪТ"
-
-#: diff-no-index.c:262
-msgid ""
-"Not a git repository. Use --no-index to compare two paths outside a working "
-"tree"
-msgstr ""
-"Не е хранилище на git.  Ползвайте опцията „--no-index“, за да сравните "
-"пътища извън работно дърво"
-
-#: diff.c:158
-#, c-format
-msgid "  Failed to parse dirstat cut-off percentage '%s'\n"
-msgstr ""
-"  Неуспешно разпознаване на „%s“ като процент-праг за статистиката по "
-"директории\n"
-
-#: diff.c:163
-#, c-format
-msgid "  Unknown dirstat parameter '%s'\n"
-msgstr "  Непознат параметър „%s“ за статистиката по директории'\n"
-
-#: diff.c:299
-msgid ""
-"color moved setting must be one of 'no', 'default', 'blocks', 'zebra', "
-"'dimmed-zebra', 'plain'"
-msgstr ""
-"настройката за цвят за преместване трябва да е една от: „no“ (без), "
-"„default“ (стандартно), „blocks“ (парчета), „zebra“ (райе), „dimmed-"
-"zebra“ (тъмно райе), „plain“ (обикновено)"
-
-#: diff.c:327
-#, 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 ""
-"неподдържан режим за настройката „color-moved-ws mode“ — „%s“, възможните "
-"стойности са „ignore-space-change“ (пренебрегване на промените на празните "
-"знаци), „ignore-space-at-eol“ (пренебрегване на промените на празните знаци "
-"в края на реда), „ignore-all-space“ (пренебрегване на всички празни знаци), "
-"„allow-indentation-change“ (позволяване на промените в празните знаци за "
-"форматиране)"
-
-#: diff.c:335
-msgid ""
-"color-moved-ws: allow-indentation-change cannot be combined with other "
-"whitespace modes"
-msgstr ""
-"„color-moved-ws“: „allow-indentation-change“ е несъвместима с другите режими "
-"за празни знаци"
-
-#: diff.c:412
-#, c-format
-msgid "Unknown value for 'diff.submodule' config variable: '%s'"
-msgstr "Непозната стойност „%s“ за настройката „diff.submodule“"
-
-#: diff.c:472
-#, c-format
-msgid ""
-"Found errors in 'diff.dirstat' config variable:\n"
-"%s"
-msgstr ""
-"Грешки в настройката „diff.dirstat“:\n"
-"%s"
-
-#: diff.c:4237
-#, c-format
-msgid "external diff died, stopping at %s"
-msgstr ""
-"външната програма за разлики завърши неуспешно.  Спиране на работата при „%s“"
-
-#: diff.c:4589
-#, c-format
-msgid "options '%s', '%s', '%s', and '%s' cannot be used together"
-msgstr "опциите „%s“, „%s“, „%s“ и „%s“ са несъвместими"
-
-#: diff.c:4593 builtin/difftool.c:736 builtin/log.c:1982 builtin/worktree.c:506
-#, c-format
-msgid "options '%s', '%s', and '%s' cannot be used together"
-msgstr "опциите „%s“, „%s“ и „%s“ са несъвместими"
-
-#: diff.c:4597
-#, c-format
-msgid "options '%s' and '%s' cannot be used together, use '%s' with '%s'"
-msgstr "опциите „%s“ и „%s“ са несъвместими, използвайте „%s“ с „%s“"
-
-#: diff.c:4601
-#, c-format
-msgid ""
-"options '%s' and '%s' cannot be used together, use '%s' with '%s' and '%s'"
-msgstr "опциите „%s“ и „%s“ са несъвместими, използвайте „%s“ с „%s“ и „%s“"
-
-#: diff.c:4681
-msgid "--follow requires exactly one pathspec"
-msgstr "опцията „--follow“ изисква точно един път"
-
-#: diff.c:4729
-#, c-format
-msgid "invalid --stat value: %s"
-msgstr "неправилна стойност за „--stat“: %s"
-
-#: diff.c:4734 diff.c:4739 diff.c:4744 diff.c:4749 diff.c:5277
-#: parse-options.c:217 parse-options.c:221
-#, c-format
-msgid "%s expects a numerical value"
-msgstr "опцията „%s“ очаква число за аргумент"
-
-#: diff.c:4766
-#, c-format
-msgid ""
-"Failed to parse --dirstat/-X option parameter:\n"
-"%s"
-msgstr ""
-"Неразпознат параметър към опцията „--dirstat/-X“:\n"
-"%s"
-
-#: diff.c:4851
-#, c-format
-msgid "unknown change class '%c' in --diff-filter=%s"
-msgstr "непознат вид промяна: „%c“ в „--diff-filter=%s“"
-
-#: diff.c:4875
-#, c-format
-msgid "unknown value after ws-error-highlight=%.*s"
-msgstr "непозната стойност след „ws-error-highlight=%.*s“"
-
-#: diff.c:4889
-#, c-format
-msgid "unable to resolve '%s'"
-msgstr "„%s“ не може да се открие"
-
-#: diff.c:4939 diff.c:4945
-#, c-format
-msgid "%s expects <n>/<m> form"
-msgstr ""
-"опцията „%s“ изисква стойности за МИНИМАЛЕН_%%_ПРОМЯНА_ЗА_ИЗТОЧНИК_/"
-"МАКСИМАЛЕН_%%_ПРОМЯНА_ЗА_ЗАМЯНА от"
-
-#: diff.c:4957
-#, c-format
-msgid "%s expects a character, got '%s'"
-msgstr "опцията „%s“ изисква знак, а не: „%s“"
-
-#: diff.c:4978
-#, c-format
-msgid "bad --color-moved argument: %s"
-msgstr "неправилен аргумент за „--color-moved“: „%s“"
-
-#: diff.c:4997
-#, c-format
-msgid "invalid mode '%s' in --color-moved-ws"
-msgstr "неправилен режим „%s“ за „ --color-moved-ws“"
-
-#: diff.c:5037
-msgid ""
-"option diff-algorithm accepts \"myers\", \"minimal\", \"patience\" and "
-"\"histogram\""
-msgstr ""
-"опцията приема следните варианти за алгоритъм за разлики: „myers“ (по "
-"Майерс), „minimal“ (минимизиране на разликите), „patience“ (пасианс) и "
-"„histogram“ (хистограмен)"
-
-#: diff.c:5073 diff.c:5093
-#, c-format
-msgid "invalid argument to %s"
-msgstr "неправилен аргумент към „%s“"
-
-#: diff.c:5197
-#, c-format
-msgid "invalid regex given to -I: '%s'"
-msgstr "неправилен регулярен израз подаден към „-I“: „%s“"
-
-#: diff.c:5246
-#, c-format
-msgid "failed to parse --submodule option parameter: '%s'"
-msgstr "неразпознат параметър към опцията „--submodule“: „%s“"
-
-#: diff.c:5302
-#, c-format
-msgid "bad --word-diff argument: %s"
-msgstr "неправилен аргумент към „--word-diff“: „%s“"
-
-#: diff.c:5338
-msgid "Diff output format options"
-msgstr "Формат на изхода за разликите"
-
-#: diff.c:5340 diff.c:5346
-msgid "generate patch"
-msgstr "създаване на кръпки"
-
-#: diff.c:5343 builtin/log.c:179
-msgid "suppress diff output"
-msgstr "без извеждане на разликите"
-
-#: diff.c:5348 diff.c:5462 diff.c:5469
-msgid "<n>"
-msgstr "БРОЙ"
-
-#: diff.c:5349 diff.c:5352
-msgid "generate diffs with <n> lines context"
-msgstr "файловете с разлики да са с контекст с такъв БРОЙ редове"
-
-#: diff.c:5354
-msgid "generate the diff in raw format"
-msgstr "файловете с разлики да са в суров формат"
-
-#: diff.c:5357
-msgid "synonym for '-p --raw'"
-msgstr "псевдоним на „-p --raw“"
-
-#: diff.c:5361
-msgid "synonym for '-p --stat'"
-msgstr "псевдоним на „-p --stat“"
-
-#: diff.c:5365
-msgid "machine friendly --stat"
-msgstr "„--stat“ във формат за четене от програма"
-
-#: diff.c:5368
-msgid "output only the last line of --stat"
-msgstr "извеждане само на последния ред на „--stat“"
-
-#: diff.c:5370 diff.c:5378
-msgid "<param1,param2>..."
-msgstr "ПАРАМЕТЪР_1, ПАРАМЕТЪР_2, …"
-
-#: diff.c:5371
-msgid ""
-"output the distribution of relative amount of changes for each sub-directory"
-msgstr "извеждане на разпределението на промените за всяка поддиректория"
-
-#: diff.c:5375
-msgid "synonym for --dirstat=cumulative"
-msgstr "псевдоним на „--dirstat=cumulative“"
-
-#: diff.c:5379
-msgid "synonym for --dirstat=files,param1,param2..."
-msgstr "псевдоним на „--dirstat=ФАЙЛ…,ПАРАМЕТЪР_1,ПАРАМЕТЪР_2,…“"
-
-#: diff.c:5383
-msgid "warn if changes introduce conflict markers or whitespace errors"
-msgstr ""
-"предупреждаване, ако промените водят до маркери за конфликт или грешки в "
-"празните знаци"
-
-#: diff.c:5386
-msgid "condensed summary such as creations, renames and mode changes"
-msgstr ""
-"съкратено резюме на създадените, преименуваните и файловете с промяна на "
-"режима на достъп"
-
-#: diff.c:5389
-msgid "show only names of changed files"
-msgstr "извеждане само на имената на променените файлове"
-
-#: diff.c:5392
-msgid "show only names and status of changed files"
-msgstr "извеждане само на имената и статистиката за променените файлове"
-
-#: diff.c:5394
-msgid "<width>[,<name-width>[,<count>]]"
-msgstr "ШИРОЧИНА[,ИМЕ-ШИРОЧИНА[,БРОЙ]]"
-
-#: diff.c:5395
-msgid "generate diffstat"
-msgstr "извеждане на статистика за промените"
-
-#: diff.c:5397 diff.c:5400 diff.c:5403
-msgid "<width>"
-msgstr "ШИРОЧИНА"
-
-#: diff.c:5398
-msgid "generate diffstat with a given width"
-msgstr "статистика с такава ШИРОЧИНА за промените"
-
-#: diff.c:5401
-msgid "generate diffstat with a given name width"
-msgstr "статистика за промените с такава ШИРОЧИНА на имената"
-
-#: diff.c:5404
-msgid "generate diffstat with a given graph width"
-msgstr "статистика за промените с такава ШИРОЧИНА на гра̀фа"
-
-#: diff.c:5406
-msgid "<count>"
-msgstr "БРОЙ"
-
-#: diff.c:5407
-msgid "generate diffstat with limited lines"
-msgstr "ограничаване на БРОя на редовете в статистиката за промените"
-
-#: diff.c:5410
-msgid "generate compact summary in diffstat"
-msgstr "кратко резюме в статистиката за промените"
-
-#: diff.c:5413
-msgid "output a binary diff that can be applied"
-msgstr "извеждане на двоична разлика във вид за прилагане"
-
-#: diff.c:5416
-msgid "show full pre- and post-image object names on the \"index\" lines"
-msgstr ""
-"показване на пълните имена на обекти в редовете за индекса при вариантите "
-"преди и след промяната"
-
-#: diff.c:5418
-msgid "show colored diff"
-msgstr "разлики в цвят"
-
-#: diff.c:5419
-msgid "<kind>"
-msgstr "ВИД"
-
-#: diff.c:5420
-msgid ""
-"highlight whitespace errors in the 'context', 'old' or 'new' lines in the "
-"diff"
-msgstr ""
-"грешките в празните знаци да се указват в редовете за контекста, вариантите "
-"преди и след разликата,"
-
-#: diff.c:5423
-msgid ""
-"do not munge pathnames and use NULs as output field terminators in --raw or "
-"--numstat"
-msgstr ""
-"без преименуване на пътищата.  Да се използват нулеви байтове за разделители "
-"на полета в изхода при ползване на опцията „--raw“ или „--numstat“"
-
-#: diff.c:5426 diff.c:5429 diff.c:5432 diff.c:5541
-msgid "<prefix>"
-msgstr "ПРЕФИКС"
-
-#: diff.c:5427
-msgid "show the given source prefix instead of \"a/\""
-msgstr "префикс вместо „a/“ за източник"
-
-#: diff.c:5430
-msgid "show the given destination prefix instead of \"b/\""
-msgstr "префикс вместо „b/“ за цел"
-
-#: diff.c:5433
-msgid "prepend an additional prefix to every line of output"
-msgstr "добавяне на допълнителен префикс за всеки ред на изхода"
-
-#: diff.c:5436
-msgid "do not show any source or destination prefix"
-msgstr "без префикс за източника и целта"
-
-#: diff.c:5439
-msgid "show context between diff hunks up to the specified number of lines"
-msgstr ""
-"извеждане на контекст между последователните парчета с разлики от указания "
-"БРОЙ редове"
-
-#: diff.c:5443 diff.c:5448 diff.c:5453
-msgid "<char>"
-msgstr "ЗНАК"
-
-#: diff.c:5444
-msgid "specify the character to indicate a new line instead of '+'"
-msgstr "знак вместо „+“ за нов вариант на ред"
-
-#: diff.c:5449
-msgid "specify the character to indicate an old line instead of '-'"
-msgstr "знак вместо „-“ за стар вариант на ред"
-
-#: diff.c:5454
-msgid "specify the character to indicate a context instead of ' '"
-msgstr "знак вместо „ “ за контекст"
-
-#: diff.c:5457
-msgid "Diff rename options"
-msgstr "Настройки за разлики с преименуване"
-
-#: diff.c:5458
-msgid "<n>[/<m>]"
-msgstr "МИНИМАЛЕН_%_ПРОМЯНА_ЗА_ИЗТОЧНИК[/МАКСИМАЛEН_%_ПРОМЯНА_ЗА_ЗАМЯНА]"
-
-#: diff.c:5459
-msgid "break complete rewrite changes into pairs of delete and create"
-msgstr ""
-"заместване на пълните промени с последователност от изтриване и създаване"
-
-#: diff.c:5463
-msgid "detect renames"
-msgstr "засичане на преименуванията"
-
-#: diff.c:5467
-msgid "omit the preimage for deletes"
-msgstr "без предварителен вариант при изтриване"
-
-#: diff.c:5470
-msgid "detect copies"
-msgstr "засичане на копиранията"
-
-#: diff.c:5474
-msgid "use unmodified files as source to find copies"
-msgstr "търсене на копирано и от непроменените файлове"
-
-#: diff.c:5476
-msgid "disable rename detection"
-msgstr "без търсене на преименувания"
-
-#: diff.c:5479
-msgid "use empty blobs as rename source"
-msgstr "празни обекти като източник при преименувания"
-
-#: diff.c:5481
-msgid "continue listing the history of a file beyond renames"
-msgstr ""
-"продължаване на извеждането на историята — без отрязването при преименувания "
-"на файл"
-
-#: diff.c:5484
-msgid ""
-"prevent rename/copy detection if the number of rename/copy targets exceeds "
-"given limit"
-msgstr ""
-"без засичане на преименувания/копирания, ако броят им надвишава тази стойност"
-
-#: diff.c:5486
-msgid "Diff algorithm options"
-msgstr "Опции към алгоритъма за разлики"
-
-#: diff.c:5488
-msgid "produce the smallest possible diff"
-msgstr "търсене на възможно най-малка разлика"
-
-#: diff.c:5491
-msgid "ignore whitespace when comparing lines"
-msgstr "без промени в празните знаци при сравняване на редове"
-
-#: diff.c:5494
-msgid "ignore changes in amount of whitespace"
-msgstr "без промени в празните знаци"
-
-#: diff.c:5497
-msgid "ignore changes in whitespace at EOL"
-msgstr "без промени в празните знаци в края на редовете"
-
-#: diff.c:5500
-msgid "ignore carrier-return at the end of line"
-msgstr "без промени в знаците за край на ред"
-
-#: diff.c:5503
-msgid "ignore changes whose lines are all blank"
-msgstr "без промени в редовете, които са изцяло от празни знаци"
-
-#: diff.c:5505 diff.c:5527 diff.c:5530 diff.c:5575
-msgid "<regex>"
-msgstr "РЕГУЛЯРЕН_ИЗРАЗ"
-
-#: diff.c:5506
-msgid "ignore changes whose all lines match <regex>"
-msgstr "без промени в редовете, които напасват РЕГУЛЯРНия_ИЗРАЗ"
-
-#: diff.c:5509
-msgid "heuristic to shift diff hunk boundaries for easy reading"
-msgstr ""
-"евристика за преместване на границите на парчетата за улесняване на четенето"
-
-#: diff.c:5512
-msgid "generate diff using the \"patience diff\" algorithm"
-msgstr "разлика чрез алгоритъм за подредба като пасианс"
-
-#: diff.c:5516
-msgid "generate diff using the \"histogram diff\" algorithm"
-msgstr "разлика по хистограмния алгоритъм"
-
-#: diff.c:5518
-msgid "<algorithm>"
-msgstr "АЛГОРИТЪМ"
-
-#: diff.c:5519
-msgid "choose a diff algorithm"
-msgstr "избор на АЛГОРИТЪМа за разлики"
-
-#: diff.c:5521
-msgid "<text>"
-msgstr "ТЕКСТ"
-
-#: diff.c:5522
-msgid "generate diff using the \"anchored diff\" algorithm"
-msgstr "разлика чрез алгоритъма със закотвяне"
-
-#: diff.c:5524 diff.c:5533 diff.c:5536
-msgid "<mode>"
-msgstr "РЕЖИМ"
-
-#: diff.c:5525
-msgid "show word diff, using <mode> to delimit changed words"
-msgstr ""
-"разлика по думи, като се ползва този РЕЖИМ за отделянето на променените думи"
-
-#: diff.c:5528
-msgid "use <regex> to decide what a word is"
-msgstr "РЕГУЛЯРЕН_ИЗРАЗ за разделяне по думи"
-
-#: diff.c:5531
-msgid "equivalent to --word-diff=color --word-diff-regex=<regex>"
-msgstr "псевдоним на „--word-diff=color --word-diff-regex=РЕГУЛЯРЕН_ИЗРАЗ“"
-
-#: diff.c:5534
-msgid "moved lines of code are colored differently"
-msgstr "различен цвят за извеждане на преместените редове"
-
-#: diff.c:5537
-msgid "how white spaces are ignored in --color-moved"
-msgstr ""
-"режим за прескачането на празните знаци при задаването на „--color-moved“"
-
-#: diff.c:5540
-msgid "Other diff options"
-msgstr "Други опции за разлики"
-
-#: diff.c:5542
-msgid "when run from subdir, exclude changes outside and show relative paths"
-msgstr ""
-"при изпълнение от поддиректория да се пренебрегват разликите извън нея и да "
-"се ползват относителни пътища"
-
-#: diff.c:5546
-msgid "treat all files as text"
-msgstr "обработка на всички файлове като текстови"
-
-#: diff.c:5548
-msgid "swap two inputs, reverse the diff"
-msgstr "размяна на двата входа — обръщане на разликата"
-
-#: diff.c:5550
-msgid "exit with 1 if there were differences, 0 otherwise"
-msgstr ""
-"завършване с код за състояние 1 при наличието на разлики, а в противен "
-"случай — с 0"
-
-#: diff.c:5552
-msgid "disable all output of the program"
-msgstr "без всякакъв изход от програмата"
-
-#: diff.c:5554
-msgid "allow an external diff helper to be executed"
-msgstr "позволяване на изпълнение на външна помощна програма за разлики"
-
-#: diff.c:5556
-msgid "run external text conversion filters when comparing binary files"
-msgstr ""
-"изпълнение на външни програми-филтри при сравнението на двоични файлове"
-
-#: diff.c:5558
-msgid "<when>"
-msgstr "КОГА"
-
-#: diff.c:5559
-msgid "ignore changes to submodules in the diff generation"
-msgstr "игнориране на промените в подмодулите при извеждането на разликите"
-
-#: diff.c:5562
-msgid "<format>"
-msgstr "ФОРМАТ"
-
-#: diff.c:5563
-msgid "specify how differences in submodules are shown"
-msgstr "начин за извеждане на промените в подмодулите"
-
-#: diff.c:5567
-msgid "hide 'git add -N' entries from the index"
-msgstr "без включване в индекса на записите, добавени с „git add -N“"
-
-#: diff.c:5570
-msgid "treat 'git add -N' entries as real in the index"
-msgstr "включване в индекса на записите, добавени с „git add -N“"
-
-#: diff.c:5572
-msgid "<string>"
-msgstr "НИЗ"
-
-#: diff.c:5573
-msgid ""
-"look for differences that change the number of occurrences of the specified "
-"string"
-msgstr "търсене на разлики, които променят броя на поява на указаните низове"
-
-#: diff.c:5576
-msgid ""
-"look for differences that change the number of occurrences of the specified "
-"regex"
-msgstr ""
-"търсене на разлики, които променят броя на поява на низовете, които напасват "
-"на регулярния израз"
-
-#: diff.c:5579
-msgid "show all changes in the changeset with -S or -G"
-msgstr "извеждане на всички промени с „-G“/„-S“"
-
-#: diff.c:5582
-msgid "treat <string> in -S as extended POSIX regular expression"
-msgstr "НИЗът към „-S“ да се тълкува като разширен регулярен израз по POSIX"
-
-#: diff.c:5585
-msgid "control the order in which files appear in the output"
-msgstr "управление на подредбата на файловете в изхода"
-
-#: diff.c:5586 diff.c:5589
-msgid "<path>"
-msgstr "ПЪТ"
-
-#: diff.c:5587
-msgid "show the change in the specified path first"
-msgstr "първо извеждане на промяната в указания път"
-
-#: diff.c:5590
-msgid "skip the output to the specified path"
-msgstr "прескачане на изхода към указания път"
-
-#: diff.c:5592
-msgid "<object-id>"
-msgstr "ИДЕНТИФИКАТОР_НА_ОБЕКТ"
-
-#: diff.c:5593
-msgid ""
-"look for differences that change the number of occurrences of the specified "
-"object"
-msgstr "търсене на разлики, които променят броя на поява на указания обект"
-
-#: diff.c:5595
-msgid "[(A|C|D|M|R|T|U|X|B)...[*]]"
-msgstr "[(A|C|D|M|R|T|U|X|B)…[*]]"
-
-#: diff.c:5596
-msgid "select files by diff type"
-msgstr "избор на файловете по вид разлика"
-
-#: diff.c:5598
-msgid "<file>"
-msgstr "ФАЙЛ"
-
-#: diff.c:5599
-msgid "Output to a specific file"
-msgstr "Изход към указания файл"
-
-#: diff.c:6257
-msgid "exhaustive rename detection was skipped due to too many files."
-msgstr ""
-"пълното търсене на преименувания на обекти се прескача поради многото "
-"файлове."
-
-#: diff.c:6260
-msgid "only found copies from modified paths due to too many files."
-msgstr ""
-"установени са само точните копия на променените пътища поради многото "
-"файлове."
-
-#: diff.c:6263
-#, c-format
-msgid ""
-"you may want to set your %s variable to at least %d and retry the command."
-msgstr "задайте променливата „%s“ да е поне %d и отново изпълнете командата."
-
-#: diffcore-order.c:24
-#, c-format
-msgid "failed to read orderfile '%s'"
-msgstr "файлът с подредбата на съответствията „%s“ не може да бъде прочетен"
-
-#: diffcore-rename.c:1564
-msgid "Performing inexact rename detection"
-msgstr "Търсене на преименувания на обекти съчетани с промени"
-
-#: diffcore-rotate.c:29
-#, c-format
-msgid "No such path '%s' in the diff"
-msgstr "Няма път на име „%s“ в разликата"
-
-#: dir.c:593
-#, c-format
-msgid "pathspec '%s' did not match any file(s) known to git"
-msgstr "пътят „%s“ не съвпада с никой файл в git"
-
-#: dir.c:733 dir.c:762 dir.c:775
-#, c-format
-msgid "unrecognized pattern: '%s'"
-msgstr "непознат шаблон: „%s“"
-
-#: dir.c:790 dir.c:804
-#, c-format
-msgid "unrecognized negative pattern: '%s'"
-msgstr "непознат отрицателен шаблон: „%s“"
-
-#: dir.c:820
-#, c-format
-msgid "your sparse-checkout file may have issues: pattern '%s' is repeated"
-msgstr ""
-"файлът определящ частичността на изтегленото хранилище може да има проблем: "
-"шаблонът „%s“ се повтаря"
-
-#: dir.c:828
-msgid "disabling cone pattern matching"
-msgstr "изключване на пътеводното напасване"
-
-#: dir.c:1212
-#, c-format
-msgid "cannot use %s as an exclude file"
-msgstr "„%s“ не може да се ползва за игнорираните файлове (като gitignore)"
-
-#: dir.c:2418
-#, c-format
-msgid "could not open directory '%s'"
-msgstr "директорията „%s“ не може да бъде отворена"
-
-#: dir.c:2720
-msgid "failed to get kernel name and information"
-msgstr "името и версията на ядрото не бяха получени"
-
-#: dir.c:2844
-msgid "untracked cache is disabled on this system or location"
-msgstr ""
-"кешът за неследените файлове е изключен на тази система или местоположение"
-
-#: dir.c:3112
-msgid ""
-"No directory name could be guessed.\n"
-"Please specify a directory on the command line"
-msgstr ""
-"Името на директорията не може да бъде отгатнато.\n"
-"Задайте директорията изрично на командния ред"
-
-#: dir.c:3800
-#, c-format
-msgid "index file corrupt in repo %s"
-msgstr "файлът с индекса е повреден в хранилището „%s“"
-
-#: dir.c:3847 dir.c:3852
-#, c-format
-msgid "could not create directories for %s"
-msgstr "директориите за „%s“ не може да бъдат създадени"
-
-#: dir.c:3881
-#, c-format
-msgid "could not migrate git directory from '%s' to '%s'"
-msgstr "директорията на git не може да се мигрира от „%s“ до „%s“"
-
-#: editor.c:74
-#, c-format
-msgid "hint: Waiting for your editor to close the file...%c"
-msgstr "Подсказка: чака се редакторът ви да затвори файла …%c"
-
-#: entry.c:179
-msgid "Filtering content"
-msgstr "Филтриране на съдържанието"
-
-#: entry.c:500
-#, c-format
-msgid "could not stat file '%s'"
-msgstr "неуспешно изпълнение на „stat“ върху файла „%s“"
-
-#: environment.c:145
-#, c-format
-msgid "bad git namespace path \"%s\""
-msgstr "неправилен път към пространства от имена „%s“"
-
-#: exec-cmd.c:363
-#, c-format
-msgid "too many args to run %s"
-msgstr "прекалено много аргументи за изпълнение „%s“"
-
-#: fetch-pack.c:194
-msgid "git fetch-pack: expected shallow list"
-msgstr "git fetch-pack: очаква се плитък списък"
-
-#: fetch-pack.c:197
-msgid "git fetch-pack: expected a flush packet after shallow list"
-msgstr "git fetch-pack: след плитък списък се очаква изчистващ пакет „flush“"
-
-#: fetch-pack.c:208
-msgid "git fetch-pack: expected ACK/NAK, got a flush packet"
-msgstr ""
-"git fetch-pack: очаква се „ACK“/„NAK“, а бе получен изчистващ пакет „flush“"
-
-#: fetch-pack.c:228
-#, c-format
-msgid "git fetch-pack: expected ACK/NAK, got '%s'"
-msgstr "git fetch-pack: очаква се „ACK“/„NAK“, а бе получено „%s“"
-
-#: fetch-pack.c:239
-msgid "unable to write to remote"
-msgstr "невъзможно писане към отдалечено хранилище"
-
-#: fetch-pack.c:395 fetch-pack.c:1439
-#, c-format
-msgid "invalid shallow line: %s"
-msgstr "неправилен плитък ред: „%s“"
-
-#: fetch-pack.c:401 fetch-pack.c:1445
-#, c-format
-msgid "invalid unshallow line: %s"
-msgstr "неправилен неплитък ред: „%s“"
-
-#: fetch-pack.c:403 fetch-pack.c:1447
-#, c-format
-msgid "object not found: %s"
-msgstr "обектът „%s“ липсва"
-
-#: fetch-pack.c:406 fetch-pack.c:1450
-#, c-format
-msgid "error in object: %s"
-msgstr "грешка в обекта: „%s“"
-
-#: fetch-pack.c:408 fetch-pack.c:1452
-#, c-format
-msgid "no shallow found: %s"
-msgstr "не е открит плитък обект: %s"
-
-#: fetch-pack.c:411 fetch-pack.c:1456
-#, c-format
-msgid "expected shallow/unshallow, got %s"
-msgstr "очаква се плитък или не обект, а бе получено: „%s“"
-
-#: fetch-pack.c:451
-#, c-format
-msgid "got %s %d %s"
-msgstr "получено бе %s %d %s"
-
-#: fetch-pack.c:468
-#, c-format
-msgid "invalid commit %s"
-msgstr "неправилно подаване: „%s“"
-
-#: fetch-pack.c:499
-msgid "giving up"
-msgstr "преустановяване"
-
-#: fetch-pack.c:512 progress.c:339
-msgid "done"
-msgstr "действието завърши"
-
-#: fetch-pack.c:524
-#, c-format
-msgid "got %s (%d) %s"
-msgstr "получено бе %s (%d) %s"
-
-#: fetch-pack.c:560
-#, c-format
-msgid "Marking %s as complete"
-msgstr "Отбелязване на „%s“ като пълно"
-
-#: fetch-pack.c:775
-#, c-format
-msgid "already have %s (%s)"
-msgstr "вече има „%s“ (%s)"
-
-#: fetch-pack.c:861
-msgid "fetch-pack: unable to fork off sideband demultiplexer"
-msgstr "fetch-pack: не може да се създаде процес за демултиплексора"
-
-#: fetch-pack.c:869
-msgid "protocol error: bad pack header"
-msgstr "протоколна грешка: неправилна заглавна част на пакет"
-
-#: fetch-pack.c:965
-#, c-format
-msgid "fetch-pack: unable to fork off %s"
-msgstr "fetch-pack: не може да се създаде процес за „%s“"
-
-#: fetch-pack.c:971
-msgid "fetch-pack: invalid index-pack output"
-msgstr "fetch-pack: неправилен изход от командата „index-pack“"
-
-#: fetch-pack.c:988
-#, c-format
-msgid "%s failed"
-msgstr "неуспешно изпълнение на „%s“"
-
-#: fetch-pack.c:990
-msgid "error in sideband demultiplexer"
-msgstr "грешка в демултиплексора"
-
-#: fetch-pack.c:1035
-#, c-format
-msgid "Server version is %.*s"
-msgstr "Версията на сървъра е: %.*s"
-
-#: fetch-pack.c:1043 fetch-pack.c:1049 fetch-pack.c:1052 fetch-pack.c:1058
-#: fetch-pack.c:1062 fetch-pack.c:1066 fetch-pack.c:1070 fetch-pack.c:1074
-#: fetch-pack.c:1078 fetch-pack.c:1082 fetch-pack.c:1086 fetch-pack.c:1090
-#: fetch-pack.c:1096 fetch-pack.c:1102 fetch-pack.c:1107 fetch-pack.c:1112
-#, c-format
-msgid "Server supports %s"
-msgstr "Сървърът поддържа „%s“"
-
-#: fetch-pack.c:1045
-msgid "Server does not support shallow clients"
-msgstr "Сървърът не поддържа плитки клиенти"
-
-#: fetch-pack.c:1105
-msgid "Server does not support --shallow-since"
-msgstr "Сървърът не поддържа опцията „--shallow-since“"
-
-#: fetch-pack.c:1110
-msgid "Server does not support --shallow-exclude"
-msgstr "Сървърът не поддържа опцията „--shallow-exclude“"
-
-#: fetch-pack.c:1114
-msgid "Server does not support --deepen"
-msgstr "Сървърът не поддържа опцията „--deepen“"
-
-#: fetch-pack.c:1116
-msgid "Server does not support this repository's object format"
-msgstr "Сървърът не поддържа форма̀та на обектите на това хранилище"
-
-#: fetch-pack.c:1129
-msgid "no common commits"
-msgstr "няма общи подавания"
-
-#: fetch-pack.c:1138 fetch-pack.c:1485 builtin/clone.c:1130
-msgid "source repository is shallow, reject to clone."
-msgstr "клонираното хранилище е плитко, затова няма да се клонира."
-
-#: fetch-pack.c:1144 fetch-pack.c:1681
-msgid "git fetch-pack: fetch failed."
-msgstr "git fetch-pack: неуспешно доставяне."
-
-#: fetch-pack.c:1258
-#, c-format
-msgid "mismatched algorithms: client %s; server %s"
-msgstr "различни алгоритми — на клиента: „%s“, на сървъра: „%s“"
-
-#: fetch-pack.c:1262
-#, c-format
-msgid "the server does not support algorithm '%s'"
-msgstr "сървърът не поддържа алгоритъм „%s“"
-
-#: fetch-pack.c:1295
-msgid "Server does not support shallow requests"
-msgstr "Сървърът не поддържа плитки заявки"
-
-#: fetch-pack.c:1302
-msgid "Server supports filter"
-msgstr "Сървърът поддържа филтри"
-
-#: fetch-pack.c:1345 fetch-pack.c:2063
-msgid "unable to write request to remote"
-msgstr "невъзможно писане към отдалечено хранилище"
-
-#: fetch-pack.c:1363
-#, c-format
-msgid "error reading section header '%s'"
-msgstr "грешка при прочитане на заглавната част на раздел „%s“"
-
-#: fetch-pack.c:1369
-#, c-format
-msgid "expected '%s', received '%s'"
-msgstr "очаква се „%s“, а бе получено „%s“"
-
-#: fetch-pack.c:1403
-#, c-format
-msgid "unexpected acknowledgment line: '%s'"
-msgstr "неочакван ред за потвърждение: „%s“"
-
-#: fetch-pack.c:1408
-#, c-format
-msgid "error processing acks: %d"
-msgstr "грешка при обработка на потвържденията: %d"
-
-#: fetch-pack.c:1418
-msgid "expected packfile to be sent after 'ready'"
-msgstr ""
-"очакваше се пакетният файл да бъде изпратен след отговор за готовност (ready)"
-
-#: fetch-pack.c:1420
-msgid "expected no other sections to be sent after no 'ready'"
-msgstr ""
-"очакваше се след липса на отговор за готовност (ready) да не се се пращат "
-"други раздели"
-
-#: fetch-pack.c:1461
-#, c-format
-msgid "error processing shallow info: %d"
-msgstr "грешка при обработка на информация за дълбочината/плиткостта: %d"
-
-#: fetch-pack.c:1510
-#, c-format
-msgid "expected wanted-ref, got '%s'"
-msgstr "очаква се искан указател, а бе получено: „%s“"
-
-#: fetch-pack.c:1515
-#, c-format
-msgid "unexpected wanted-ref: '%s'"
-msgstr "неочакван искан указател: „%s“"
-
-#: fetch-pack.c:1520
-#, c-format
-msgid "error processing wanted refs: %d"
-msgstr "грешка при обработката на исканите указатели: %d"
-
-#: fetch-pack.c:1550
-msgid "git fetch-pack: expected response end packet"
-msgstr "git fetch-pack: очаква се пакет за край на отговора"
-
-#: fetch-pack.c:1959
-msgid "no matching remote head"
-msgstr "не може да бъде открит подходящ връх от отдалеченото хранилище"
-
-#: fetch-pack.c:1982 builtin/clone.c:581
-msgid "remote did not send all necessary objects"
-msgstr "отдалеченото хранилище не изпрати всички необходими обекти."
-
-#: fetch-pack.c:2085
-msgid "unexpected 'ready' from remote"
-msgstr "неочаквано състояние за готовност от отдалечено хранилище"
-
-#: fetch-pack.c:2108
-#, c-format
-msgid "no such remote ref %s"
-msgstr "такъв отдалечен указател няма: %s"
-
-#: fetch-pack.c:2111
-#, c-format
-msgid "Server does not allow request for unadvertised object %s"
-msgstr "Сървърът не позволява заявка за необявен обект „%s“"
-
-#: gpg-interface.c:329 gpg-interface.c:457 gpg-interface.c:974
-#: gpg-interface.c:990
-msgid "could not create temporary file"
-msgstr "не може да се създаде временен файл"
-
-#: gpg-interface.c:332 gpg-interface.c:460
-#, c-format
-msgid "failed writing detached signature to '%s'"
-msgstr "Програмата не успя да запише самостоятелния подпис в „%s“"
-
-#: gpg-interface.c:451
-msgid ""
-"gpg.ssh.allowedSignersFile needs to be configured and exist for ssh "
-"signature verification"
-msgstr ""
-"настройката „gpg.ssh.allowedSignersFile“ трябва да е зададена за проверка на "
-"подписите на ssh"
-
-#: gpg-interface.c:480
-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:536
-#, c-format
-msgid "ssh signing revocation file configured but not found: %s"
-msgstr ""
-"файлът за отхвърляне на подписи на ssh е настроен, но не може да се открие: "
-"%s"
-
-#: gpg-interface.c:624
-#, c-format
-msgid "bad/incompatible signature '%s'"
-msgstr "лош/несъвместим подпис „%s“"
-
-#: gpg-interface.c:801 gpg-interface.c:806
-#, c-format
-msgid "failed to get the ssh fingerprint for key '%s'"
-msgstr "отпечатъкът по ssh на ключа „%s“ не може да бъде получен"
-
-#: gpg-interface.c:829
-msgid ""
-"either user.signingkey or gpg.ssh.defaultKeyCommand needs to be configured"
-msgstr ""
-"Поне една от настройките „user.signingkey“ или „gpg.ssh.defaultKeyCommand“ "
-"трябва да е зададена"
-
-#: gpg-interface.c:851
-#, c-format
-msgid "gpg.ssh.defaultKeyCommand succeeded but returned no keys: %s %s"
-msgstr ""
-"командата „gpg.ssh.defaultKeyCommand“ завърши успешно, но не върна никакви "
-"ключове: %s %s"
-
-#: gpg-interface.c:857
-#, c-format
-msgid "gpg.ssh.defaultKeyCommand failed: %s %s"
-msgstr "неуспешно изпълнение на „gpg.ssh.defaultKeyCommand“: %s %s"
-
-#: gpg-interface.c:945
-msgid "gpg failed to sign the data"
-msgstr "Програмата „gpg“ не подписа данните"
-
-#: gpg-interface.c:967
-msgid "user.signingkey needs to be set for ssh signing"
-msgstr ""
-"за подписване със ssh е необходимо да зададете настройката „user.signingkey“"
-
-#: gpg-interface.c:978
-#, c-format
-msgid "failed writing ssh signing key to '%s'"
-msgstr "неуспешно запазване на ключа за подписване на ssh в „%s“"
-
-#: gpg-interface.c:996
-#, c-format
-msgid "failed writing ssh signing key buffer to '%s'"
-msgstr "неуспешно запазване на буфера за подписване на ssh в „%s“"
-
-#: gpg-interface.c:1014
-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:1026
-#, 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
-msgid ""
-"given pattern contains NULL byte (via -f <file>). This is only supported "
-"with -P under PCRE v2"
-msgstr ""
-"зададеният шаблон съдържа нулев знак (идва от -f „ФАЙЛ“).  Това се поддържа "
-"в комбинация с „-P“ само при ползването на „PCRE v2“"
-
-#: grep.c:1942
-#, c-format
-msgid "'%s': unable to read %s"
-msgstr "„%s“: файлът сочен от „%s“ не може да бъде прочетен"
-
-#: grep.c:1959 setup.c:177 builtin/clone.c:302 builtin/diff.c:90
-#: builtin/rm.c:136
-#, c-format
-msgid "failed to stat '%s'"
-msgstr "не може да бъде получена информация чрез „stat“ за „%s“"
-
-#: grep.c:1970
-#, c-format
-msgid "'%s': short read"
-msgstr "„%s“: изчитането върна по-малко байтове от очакваното"
-
-#: help.c:24
-msgid "start a working area (see also: git help tutorial)"
-msgstr "създаване на работно дърво (погледнете: „git help tutorial“)"
-
-#: help.c:25
-msgid "work on the current change (see also: git help everyday)"
-msgstr "работа по текущата промяна (погледнете: „git help everyday“)"
-
-#: help.c:26
-msgid "examine the history and state (see also: git help revisions)"
-msgstr "преглед на историята и състоянието (погледнете: „git help revisions“)"
-
-#: help.c:27
-msgid "grow, mark and tweak your common history"
-msgstr "увеличаване, отбелязване и промяна на общата история"
-
-#: help.c:28
-msgid "collaborate (see also: git help workflows)"
-msgstr "съвместна работа (погледнете: „git help workflows“)"
-
-#: help.c:32
-msgid "Main Porcelain Commands"
-msgstr "Основни команди от потребителско ниво"
-
-#: help.c:33
-msgid "Ancillary Commands / Manipulators"
-msgstr "Помощни команди / Променящи"
-
-#: help.c:34
-msgid "Ancillary Commands / Interrogators"
-msgstr "Помощни команди / Запитващи"
-
-#: help.c:35
-msgid "Interacting with Others"
-msgstr "Съвместна работа с други хора"
-
-#: help.c:36
-msgid "Low-level Commands / Manipulators"
-msgstr "Команди от ниско ниво / Променящи"
-
-#: help.c:37
-msgid "Low-level Commands / Interrogators"
-msgstr "Команди от ниско ниво / Запитващи"
-
-#: help.c:38
-msgid "Low-level Commands / Syncing Repositories"
-msgstr "Команди от ниско ниво / Синхронизация на хранилища"
-
-#: help.c:39
-msgid "Low-level Commands / Internal Helpers"
-msgstr "Команди от ниско ниво / Допълнителни инструменти"
-
-#: help.c:313
-#, c-format
-msgid "available git commands in '%s'"
-msgstr "налични команди на git от „%s“"
-
-#: help.c:320
-msgid "git commands available from elsewhere on your $PATH"
-msgstr "команди на git от други директории от „$PATH“"
-
-#: help.c:329
-msgid "These are common Git commands used in various situations:"
-msgstr "Това са най-често използваните команди на Git:"
-
-#: help.c:378 git.c:100
-#, c-format
-msgid "unsupported command listing type '%s'"
-msgstr "неподдържан списък от команди „%s“"
-
-#: help.c:418
-msgid "The Git concept guides are:"
-msgstr "Ръководствата за концепциите в Git са:"
-
-#: help.c:442
-msgid "See 'git help <command>' to read about a specific subcommand"
-msgstr "За повече информация за КОМАНДА изпълнете „git help КОМАНДА“"
-
-#: help.c:447
-msgid "External commands"
-msgstr "Външни команди"
-
-#: help.c:462
-msgid "Command aliases"
-msgstr "Псевдоними на командите"
-
-#: 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 ""
-"Изглежда, че „%s“ е команда на git, но тя не може да\n"
-"бъде изпълнена.  Вероятно пакетът „git-%s“ е повреден."
-
-#: 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:613
-msgid "Uh oh. Your system reports no Git commands at all."
-msgstr "Странно, изглежда, че на системата ви няма нито една команда на git."
-
-#: help.c:635
-#, c-format
-msgid "WARNING: You called a Git command named '%s', which does not exist."
-msgstr ""
-"ПРЕДУПРЕЖДЕНИЕ: Пробвахте да изпълните команда на Git на име „%s“, а такава "
-"не съществува."
-
-#: help.c:640
-#, c-format
-msgid "Continuing under the assumption that you meant '%s'."
-msgstr ""
-"Изпълнението автоматично продължава, като се счита, че имате предвид „%s“."
-
-#: 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:666
-msgid ""
-"\n"
-"The most similar command is"
-msgid_plural ""
-"\n"
-"The most similar commands are"
-msgstr[0] ""
-"\n"
-"Най-близката команда е"
-msgstr[1] ""
-"\n"
-"Най-близките команди са"
-
-#: help.c:706
-msgid "git version [<options>]"
-msgstr "git version [ОПЦИЯ…]"
-
-#: help.c:761
-#, c-format
-msgid "%s: %s - %s"
-msgstr "%s: %s — %s"
-
-#: help.c:765
-msgid ""
-"\n"
-"Did you mean this?"
-msgid_plural ""
-"\n"
-"Did you mean one of these?"
-msgstr[0] ""
-"\n"
-"Команда с подобно име е:"
-msgstr[1] ""
-"\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"
-
-#: ident.c:356
-msgid "Committer identity unknown\n"
-msgstr "Липсва информация за подалия\n"
-
-#: ident.c:362
-msgid ""
-"\n"
-"*** Please tell me who you are.\n"
-"\n"
-"Run\n"
-"\n"
-"  git config --global user.email \"you@example.com\"\n"
-"  git config --global user.name \"Your Name\"\n"
-"\n"
-"to set your account's default identity.\n"
-"Omit --global to set the identity only in this repository.\n"
-"\n"
-msgstr ""
-"\n"
-"●●● Въведете самоличност.\n"
-"\n"
-"Изпълнете:\n"
-"\n"
-"    git config --global user.email \"ИМЕ@example.com\"\n"
-"    git config --global user.name \"ВАШЕТО ИМЕ\"\n"
-"\n"
-"и въведете данни за себе си.\n"
-"Ако пропуснете опцията „--global“, самоличността е само за текущото "
-"хранилище.\n"
-"\n"
-
-#: ident.c:397
-msgid "no email was given and auto-detection is disabled"
-msgstr "липсва адрес за е-поща, а автоматичното отгатване е изключено"
-
-#: ident.c:402
-#, c-format
-msgid "unable to auto-detect email address (got '%s')"
-msgstr ""
-"адресът за е-поща не може да бъде отгатнат (най-доброто предположение бе "
-"„%s“)"
-
-#: ident.c:419
-msgid "no name was given and auto-detection is disabled"
-msgstr "липсва име, а автоматичното отгатване е изключено"
-
-#: ident.c:425
-#, c-format
-msgid "unable to auto-detect name (got '%s')"
-msgstr "името не може да бъде отгатнато (най-доброто предположение бе „%s“)"
-
-#: ident.c:433
-#, c-format
-msgid "empty ident name (for <%s>) not allowed"
-msgstr "не може да се ползва празно име като идентификатор (за <%s>)"
-
-#: ident.c:439
-#, c-format
-msgid "name consists only of disallowed characters: %s"
-msgstr "името съдържа само непозволени знаци: „%s“"
-
-#: ident.c:454 builtin/commit.c:648
-#, c-format
-msgid "invalid date format: %s"
-msgstr "неправилен формат на дата: %s"
-
-#: list-objects-filter-options.c:83
-msgid "expected 'tree:<depth>'"
-msgstr "очаква се „tree:ДЪЛБОЧИНА“"
-
-#: list-objects-filter-options.c:98
-msgid "sparse:path filters support has been dropped"
-msgstr "поддръжката на филтри със „sparse:path“ е премахната"
-
-#: list-objects-filter-options.c:105
-#, c-format
-msgid "'%s' for 'object:type=<type>' is not a valid object type"
-msgstr "„%s“ не е правилна стойност за вид на обект в „object:type=ВИД“"
-
-#: list-objects-filter-options.c:124
-#, c-format
-msgid "invalid filter-spec '%s'"
-msgstr "неправилен филтър: „%s“"
-
-#: list-objects-filter-options.c:140
-#, c-format
-msgid "must escape char in sub-filter-spec: '%c'"
-msgstr "знак за екраниране в подфилтър: „%c“"
-
-#: list-objects-filter-options.c:182
-msgid "expected something after combine:"
-msgstr "добавете нещо след комбинирането:"
-
-#: list-objects-filter-options.c:264
-msgid "multiple filter-specs cannot be combined"
-msgstr "не може да комбинирате множество филтри"
-
-#: list-objects-filter-options.c:376
-msgid "unable to upgrade repository format to support partial clone"
-msgstr ""
-"не може да се извърши частично клониране, защото форматът на хранилището не "
-"може да се обнови"
-
-#: list-objects-filter.c:532
-#, c-format
-msgid "unable to access sparse blob in '%s'"
-msgstr "няма достъп до частично изтегления обект-BLOB в „%s“"
-
-#: list-objects-filter.c:535
-#, c-format
-msgid "unable to parse sparse filter data in %s"
-msgstr ""
-"данните от филтъра за частични изтегляния в „%s“ не може да бъдат анализирани"
-
-#: list-objects.c:127
-#, c-format
-msgid "entry '%s' in tree %s has tree mode, but is not a tree"
-msgstr "обект „%s“ в дървото „%s“ е отбелязан като дърво, но не е"
-
-#: list-objects.c:140
-#, c-format
-msgid "entry '%s' in tree %s has blob mode, but is not a blob"
-msgstr "обект „%s“ в дървото „%s“ е отбелязан като BLOB, но не е"
-
-#: list-objects.c:398
-#, c-format
-msgid "unable to load root tree for commit %s"
-msgstr "кореновото дърво за подаване „%s“ не може да се зареди"
-
-#: lockfile.c:152
-#, c-format
-msgid ""
-"Unable to create '%s.lock': %s.\n"
-"\n"
-"Another git process seems to be running in this repository, e.g.\n"
-"an editor opened by 'git commit'. Please make sure all processes\n"
-"are terminated then try again. If it still fails, a git process\n"
-"may have crashed in this repository earlier:\n"
-"remove the file manually to continue."
-msgstr ""
-"Файлът-ключалка „%s.lock“ не може да бъде създаден: %s\n"
-"\n"
-"Изглежда, че и друг процес на git е пуснат в това хранилище, напр.\n"
-"редактор, стартиран с „git commit“.  Уверете се, че всички подобни\n"
-"процеси са спрени и опитайте отново.  Ако това не помогне, вероятната\n"
-"причина е, че някой процес на git в това хранилище е забил.  За да\n"
-"продължите работа, ще трябва ръчно да изтриете файла:"
-
-#: lockfile.c:160
-#, c-format
-msgid "Unable to create '%s.lock': %s"
-msgstr "Файлът-ключалка „%s.lock“ не може да бъде създаден: %s"
-
-#: ls-refs.c:37
-#, c-format
-msgid "invalid value '%s' for lsrefs.unborn"
-msgstr "неправилна стойност „%s“ за „lsrefs.unborn“"
-
-#: 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“ се очаква изчистване на буферите"
-
-#: mailinfo.c:1050
-msgid "quoted CRLF detected"
-msgstr "цитирани знаци CRLF"
-
-#: mailinfo.c:1254 builtin/am.c:184 builtin/mailinfo.c:46
-#, c-format
-msgid "bad action '%s' for '%s'"
-msgstr "неправилно действие „%s“ за „%s“"
-
-#: merge-ort.c:1584 merge-recursive.c:1211
-#, c-format
-msgid "Failed to merge submodule %s (not checked out)"
-msgstr "Неуспешно сливане на подмодула „%s“ (не е изтеглен)"
-
-#: merge-ort.c:1593 merge-recursive.c:1218
-#, c-format
-msgid "Failed to merge submodule %s (commits not present)"
-msgstr "Неуспешно сливане на подмодула „%s“ (няма подавания)"
-
-#: 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:1612 merge-ort.c:1620
-#, c-format
-msgid "Note: Fast-forwarding submodule %s to %s"
-msgstr "Бележка: Превъртане на подмодула „%s“ към „%s“"
-
-#: merge-ort.c:1642
-#, c-format
-msgid "Failed to merge submodule %s"
-msgstr "Неуспешно сливане на подмодула „%s“"
-
-#: merge-ort.c:1649
-#, c-format
-msgid ""
-"Failed to merge submodule %s, but a possible merge resolution exists:\n"
-"%s\n"
-msgstr ""
-"Неуспешно сливане на подмодула „%s“, но е открито възможно решение:\n"
-"%s\n"
-
-#: merge-ort.c:1653 merge-recursive.c:1281
-#, c-format
-msgid ""
-"If this is correct simply add it to the index for example\n"
-"by using:\n"
-"\n"
-"  git update-index --cacheinfo 160000 %s \"%s\"\n"
-"\n"
-"which will accept this suggestion.\n"
-msgstr ""
-"Ако това е така, добавете го към индекса с команда като следната:\n"
-"\n"
-"    git update-index --cacheinfo 160000 %s \"%s\"\n"
-"\n"
-"Това приема предложеното.\n"
-
-#: merge-ort.c:1666
-#, c-format
-msgid ""
-"Failed to merge submodule %s, but multiple possible merges exist:\n"
-"%s"
-msgstr ""
-"Неуспешно сливане на подмодула „%s“, но са открити множество решения:\n"
-"%s"
-
-#: merge-ort.c:1887 merge-recursive.c:1372
-msgid "Failed to execute internal merge"
-msgstr "Неуспешно вътрешно сливане"
-
-#: merge-ort.c:1892 merge-recursive.c:1377
-#, c-format
-msgid "Unable to add %s to database"
-msgstr "„%s“ не може да се добави в базата с данни"
-
-#: merge-ort.c:1899 merge-recursive.c:1410
-#, c-format
-msgid "Auto-merging %s"
-msgstr "Автоматично сливане на „%s“"
-
-#: 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 ""
-"КОНФЛИКТ (косвено преименуване на директория): следният файл или директория "
-"„%s“ не позволяват косвеното преименуване на следния път/ища: %s."
-
-#: 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 ""
-"КОНФЛИКТ (косвено преименуване на директория): повече от един път "
-"съответства на „%s“.  Косвено преименуване на директория води до поставянето "
-"на тези пътища там: %s."
-
-#: merge-ort.c:2106
-#, c-format
-msgid ""
-"CONFLICT (directory rename split): Unclear where to rename %s to; it was "
-"renamed to multiple other directories, with no destination getting a "
-"majority of the files."
-msgstr ""
-"КОНФЛИКТ (раздвояване при преименуване на директория): Не е ясно как и къде "
-"да се преименува „%s“, защото е преместен в няколко нови директории, без "
-"никоя от тях да е по-честа цел."
-
-#: 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: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 ""
-"Обновен път: „%s“ е добавен в „%s“ в директория, която е преименувана в "
-"„%s“.  Обектът се мести в „%s“."
-
-#: 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 ""
-"Обновен път: „%s“ е преименуван на „%s“ в „%s“ в директория, която е "
-"преименувана в „%s“.  Обектът се мести в „%s“."
-
-#: 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 ""
-"КОНФЛИКТ (места на файлове): „%s“ е добавен в „%s“ в директория, която е "
-"преименувана в „%s“.  Предложението е да преместите обекта в „%s“."
-
-#: 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 ""
-"КОНФЛИКТ (места на файлове): „%s“ е преименуван на „%s“ в „%s“ в директория, "
-"която е преименувана в „%s“.  Предложението е да преместите обекта в „%s“."
-
-#: 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: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."
-msgstr ""
-"КОНФЛИКТ (има и преименуване в промените): „%s“ е преименуван на „%s“, но "
-"има и промени в съдържанието, а и има съвпадение на пътя.  Може да се "
-"получат вложени маркери за конфликт."
-
-#: 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:3212 merge-recursive.c:3022
-#, c-format
-msgid "cannot read object %s"
-msgstr "обектът „%s“ не може да се прочете"
-
-#: merge-ort.c:3215 merge-recursive.c:3025
-#, c-format
-msgid "object %s is not a blob"
-msgstr "обектът „%s“ не е BLOB"
-
-#: merge-ort.c:3644
-#, c-format
-msgid ""
-"CONFLICT (file/directory): directory in the way of %s from %s; moving it to "
-"%s instead."
-msgstr ""
-"КОНФЛИКТ (файл/директория): директория на мястото на „%s“ от „%s“, вместо "
-"това се извършва преместване в „%s“."
-
-#: 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 ""
-"КОНФЛИКТ (различни видове): „%s“ е различен вид обект в двата варианта.  И "
-"двата се преименуват, за да може всичко да е отразено."
-
-#: 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 ""
-"КОНФЛИКТ (различни видове): „%s“ е различен вид обект в двата варианта.  "
-"Извършва се преименуване в единия, за да може всичко да е отразено."
-
-#: merge-ort.c:3819 merge-recursive.c:3101
-msgid "content"
-msgstr "съдържание"
-
-#: merge-ort.c:3821 merge-recursive.c:3105
-msgid "add/add"
-msgstr "добавяне/добавяне"
-
-#: merge-ort.c:3823 merge-recursive.c:3150
-msgid "submodule"
-msgstr "ПОДМОДУЛ"
-
-#: merge-ort.c:3825 merge-recursive.c:3151
-#, c-format
-msgid "CONFLICT (%s): Merge conflict in %s"
-msgstr "КОНФЛИКТ (%s): Конфликт при сливане на „%s“"
-
-#: merge-ort.c:3869
-#, c-format
-msgid ""
-"CONFLICT (modify/delete): %s deleted in %s and modified in %s.  Version %s "
-"of %s left in tree."
-msgstr ""
-"КОНФЛИКТ (промяна/изтриване): „%s“ е изтрит в %s, а е променен в %s.  Версия "
-"%s на „%s“ е оставена в дървото."
-
-#: merge-ort.c:4165
-#, c-format
-msgid ""
-"Note: %s not up to date and in way of checking out conflicted version; old "
-"copy renamed to %s"
-msgstr ""
-"Бележка: „%s“ не е актуален и пречи за преминаването към версията с "
-"конфликт.  Старият вариант е преименуван на „%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:4534
-#, c-format
-msgid "collecting merge info failed for trees %s, %s, %s"
-msgstr "неуспешно събиране на информацията за сливането на „%s“, „%s“ и „%s“"
-
-#: 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 ""
-"Сливането ще презапише локалните промени на тези файлове:\n"
-"    %s"
-
-#: merge-ort-wrappers.c:33 merge-recursive.c:3482 builtin/merge.c:405
-msgid "Already up to date."
-msgstr "Вече е обновено."
-
-#: merge-recursive.c:353
-msgid "(bad commit)\n"
-msgstr "(лошо подаване)\n"
-
-#: merge-recursive.c:381
-#, c-format
-msgid "add_cacheinfo failed for path '%s'; merge aborting."
-msgstr ""
-"неуспешно изпълнение на „add_cacheinfo“ за пътя „%s“.  Сливането е "
-"преустановено."
-
-#: merge-recursive.c:390
-#, c-format
-msgid "add_cacheinfo failed to refresh for path '%s'; merge aborting."
-msgstr ""
-"неуспешно изпълнение на „add_cacheinfo“ за обновяването на пътя „%s“.  "
-"Сливането е преустановено."
-
-#: merge-recursive.c:881
-#, c-format
-msgid "failed to create path '%s'%s"
-msgstr "грешка при създаването на пътя „%s“%s"
-
-#: merge-recursive.c:892
-#, c-format
-msgid "Removing %s to make room for subdirectory\n"
-msgstr "Изтриване на „%s“, за да се освободи място за поддиректория\n"
-
-#: merge-recursive.c:906 merge-recursive.c:925
-msgid ": perhaps a D/F conflict?"
-msgstr ": възможно е да има конфликт директория/файл."
-
-#: merge-recursive.c:915
-#, c-format
-msgid "refusing to lose untracked file at '%s'"
-msgstr ""
-"преустановяване на действието, за да не се изтрие неследеният файл „%s“"
-
-#: merge-recursive.c:956 builtin/cat-file.c:41
-#, c-format
-msgid "cannot read object %s '%s'"
-msgstr "обектът „%s“ (%s) не може да бъде прочетен"
-
-#: merge-recursive.c:961
-#, c-format
-msgid "blob expected for %s '%s'"
-msgstr "обектът „%s“ (%s) се очакваше да е BLOB, а не е"
-
-#: merge-recursive.c:986
-#, c-format
-msgid "failed to open '%s': %s"
-msgstr "„%s“ не може да се отвори: %s"
-
-#: merge-recursive.c:997
-#, c-format
-msgid "failed to symlink '%s': %s"
-msgstr "неуспешно създаване на символната връзка „%s“: %s"
-
-#: 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:1233 merge-recursive.c:1246
-#, c-format
-msgid "Fast-forwarding submodule %s to the following commit:"
-msgstr "Превъртане на подмодула „%s“ до следното подаване:"
-
-#: merge-recursive.c:1236 merge-recursive.c:1249
-#, c-format
-msgid "Fast-forwarding submodule %s"
-msgstr "Превъртане на подмодула „%s“"
-
-#: merge-recursive.c:1273
-#, c-format
-msgid "Failed to merge submodule %s (merge following commits not found)"
-msgstr ""
-"Неуспешно сливане на подмодула „%s“ (липсва сливането, което се предшества "
-"от подаванията)"
-
-#: merge-recursive.c:1277
-#, c-format
-msgid "Failed to merge submodule %s (not fast-forward)"
-msgstr "Неуспешно сливане на подмодула „%s“ (не е превъртане)"
-
-#: merge-recursive.c:1278
-msgid "Found a possible merge resolution for the submodule:\n"
-msgstr ""
-"Открито е сливане, което може да решава проблема със сливането на "
-"подмодула:\n"
-
-#: merge-recursive.c:1290
-#, c-format
-msgid "Failed to merge submodule %s (multiple merges found)"
-msgstr "Неуспешно сливане на подмодула „%s“ (открити са множество сливания)"
-
-#: 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:1506
-#, c-format
-msgid ""
-"CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s left "
-"in tree."
-msgstr ""
-"КОНФЛИКТ (%s/изтриване): „%s“ е изтрит в %s, а „%s“ в %s.  Версия %s на „%s“ "
-"е оставена в дървото."
-
-#: merge-recursive.c: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 ""
-"КОНФЛИКТ (%s/изтриване): „%s“ е изтрит в %s, а „%s“ е преименуван на „%s“ в "
-"%s.  Версия %s на „%s“ е оставена в дървото."
-
-#: 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 ""
-"КОНФЛИКТ (%s/изтриване): „%s“ е изтрит в %s, а „%s“ в %s.  Версия %s на „%s“ "
-"е оставена в дървото: %s."
-
-#: 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 ""
-"КОНФЛИКТ (%s/изтриване): „%s“ е изтрит в %s, а „%s“ е преименуван на „%s“ в "
-"%s.  Версия %s на „%s“ е оставена в дървото: %s."
-
-#: merge-recursive.c:1558
-msgid "rename"
-msgstr "преименуване"
-
-#: merge-recursive.c:1558
-msgid "renamed"
-msgstr "преименуван"
-
-#: 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:1619
-#, c-format
-msgid "Refusing to lose untracked file at %s, even though it's in the way."
-msgstr ""
-"Отказ да се загуби неследеният файл „%s“, защото е на място, където пречи."
-
-#: 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:1708
-#, c-format
-msgid "%s is a directory in %s adding as %s instead"
-msgstr "„%s“ е директория в „%s“, затова се добавя като „%s“"
-
-#: merge-recursive.c:1713
-#, c-format
-msgid "Refusing to lose untracked file at %s; adding as %s instead"
-msgstr ""
-"Преустановяване на действието, за да не се изгуби неследеният файл „%s“.  "
-"Вместо него се добавя „%s“"
-
-#: merge-recursive.c:1740
-#, c-format
-msgid ""
-"CONFLICT (rename/rename): Rename \"%s\"->\"%s\" in branch \"%s\" rename \"%s"
-"\"->\"%s\" in \"%s\"%s"
-msgstr ""
-"КОНФЛИКТ (преименуване/преименуване): „%s“ е преименуван на „%s“ в клон "
-"„%s“, а „%s“ е преименуван на „%s“ в „%s“/%s."
-
-#: merge-recursive.c:1745
-msgid " (left unresolved)"
-msgstr " (некоригиран конфликт)"
-
-#: 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:2100
-#, c-format
-msgid ""
-"CONFLICT (directory rename split): Unclear where to place %s because "
-"directory %s was renamed to multiple other directories, with no destination "
-"getting a majority of the files."
-msgstr ""
-"КОНФЛИКТ (раздвояване при преименуване на директория): Не е ясно къде да се "
-"постави „%s“, защото няколко нови директории поделят съдържанието на "
-"директория „%s“, като никоя не съдържа мнозинство от файловете ѝ."
-
-#: merge-recursive.c:2234
-#, c-format
-msgid ""
-"CONFLICT (rename/rename): Rename directory %s->%s in %s. Rename directory %s-"
-">%s in %s"
-msgstr ""
-"КОНФЛИКТ (преименуване/преименуване): „%s“ е преименуван на „%s“ в клон "
-"„%s“, а „%s“ е преименуван на „%s“ в „%s“"
-
-#: merge-recursive.c:3089
-msgid "modify"
-msgstr "промяна"
-
-#: merge-recursive.c:3089
-msgid "modified"
-msgstr "променен"
-
-#: merge-recursive.c:3128
-#, c-format
-msgid "Skipped %s (merged same as existing)"
-msgstr "Прескачане на „%s“ (слетият резултат е идентичен със сегашния)"
-
-#: merge-recursive.c:3181
-#, c-format
-msgid "Adding as %s instead"
-msgstr "Добавяне като „%s“"
-
-#: merge-recursive.c:3385
-#, c-format
-msgid "Removing %s"
-msgstr "Изтриване на „%s“"
-
-#: merge-recursive.c:3408
-msgid "file/directory"
-msgstr "файл/директория"
-
-#: merge-recursive.c:3413
-msgid "directory/file"
-msgstr "директория/файл"
-
-#: 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:3429
-#, c-format
-msgid "Adding %s"
-msgstr "Добавяне на „%s“"
-
-#: merge-recursive.c:3438
-#, c-format
-msgid "CONFLICT (add/add): Merge conflict in %s"
-msgstr "КОНФЛИКТ (добавяне/добавяне): Конфликт при сливане на „%s“"
-
-#: merge-recursive.c:3491
-#, c-format
-msgid "merging of trees %s and %s failed"
-msgstr "неуспешно сливане на дърветата „%s“ и „%s“"
-
-#: merge-recursive.c:3585
-msgid "Merging:"
-msgstr "Сливане:"
-
-#: 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:3648
-msgid "merge returned no commit"
-msgstr "сливането не върна подаване"
-
-#: merge-recursive.c:3816
-#, c-format
-msgid "Could not parse object '%s'"
-msgstr "Неуспешен анализ на обекта „%s“"
-
-#: merge-recursive.c:3834 builtin/merge.c:720 builtin/merge.c:906
-#: builtin/stash.c:489
-msgid "Unable to write index."
-msgstr "Индексът не може да бъде прочетен"
-
-#: merge.c:41
-msgid "failed to read the cache"
-msgstr "кешът не може да бъде прочетен"
-
-#: merge.c:102 rerere.c:704 builtin/am.c:1988 builtin/am.c:2022
-#: builtin/checkout.c:598 builtin/checkout.c:853 builtin/clone.c:706
-#: builtin/stash.c:269
-msgid "unable to write new index file"
-msgstr "неуспешно записване на новия индекс"
-
-#: midx.c:78
-msgid "multi-pack-index OID fanout is of the wrong size"
-msgstr "неправилен размер на откъс (OID fanout) на индекса за множество пакети"
-
-#: midx.c:111
-#, c-format
-msgid "multi-pack-index file %s is too small"
-msgstr "файлът с индекса за множество пакети „%s“ е твърде малък"
-
-#: midx.c:127
-#, c-format
-msgid "multi-pack-index signature 0x%08x does not match signature 0x%08x"
-msgstr "отпечатъкът на индекса за множество пакети 0x%08x не съвпада с 0x%08x"
-
-#: midx.c:132
-#, c-format
-msgid "multi-pack-index version %d not recognized"
-msgstr "непозната версия на индекс за множество пакети — %d"
-
-#: midx.c:137
-#, c-format
-msgid "multi-pack-index hash version %u does not match version %u"
-msgstr ""
-"версията на контролната сума на индекса за множество пакети %u не съвпада с "
-"%u"
-
-#: midx.c:154
-msgid "multi-pack-index missing required pack-name chunk"
-msgstr "липсва откъс (pack-name) от индекс за множество пакети"
-
-#: midx.c:156
-msgid "multi-pack-index missing required OID fanout chunk"
-msgstr "липсва откъс (OID fanout) от индекс за множество пакети"
-
-#: midx.c:158
-msgid "multi-pack-index missing required OID lookup chunk"
-msgstr "липсва откъс (OID lookup) от индекс за множество пакети"
-
-#: midx.c:160
-msgid "multi-pack-index missing required object offsets chunk"
-msgstr "липсва откъс за отместванията на обекти от индекс за множество пакети"
-
-#: midx.c:176
-#, c-format
-msgid "multi-pack-index pack names out of order: '%s' before '%s'"
-msgstr ""
-"неправилна подредба на имената в индекс за множество пакети: „%s“ се появи "
-"преди „%s“"
-
-#: midx.c:224
-#, c-format
-msgid "bad pack-int-id: %u (%u total packs)"
-msgstr ""
-"неправилен идентификатор на пакет (pack-int-id): %u (от общо %u пакети)"
-
-#: midx.c:274
-msgid "multi-pack-index stores a 64-bit offset, but off_t is too small"
-msgstr ""
-"индексът за множество пакети съдържа 64-битови отмествания, но размерът на "
-"„off_t“ е недостатъчен"
-
-#: midx.c:505
-#, c-format
-msgid "failed to add packfile '%s'"
-msgstr "пакетният файл „%s“ не може да бъде добавен"
-
-#: midx.c:511
-#, c-format
-msgid "failed to open pack-index '%s'"
-msgstr "индексът за пакети „%s“ не може да бъде отворен"
-
-#: midx.c:579
-#, c-format
-msgid "failed to locate object %d in packfile"
-msgstr "обект %d в пакетния файл липсва"
-
-#: midx.c:895
-msgid "cannot store reverse index file"
-msgstr "файлът за индекса не може да бъде съхранен"
-
-#: midx.c:993
-#, c-format
-msgid "could not parse line: %s"
-msgstr "редът не може да се анализира: „%s“"
-
-#: midx.c:995
-#, c-format
-msgid "malformed line: %s"
-msgstr "неправилен ред: „%s“."
-
-#: midx.c:1162
-msgid "ignoring existing multi-pack-index; checksum mismatch"
-msgstr ""
-"индексът за множество пакети се прескача, защото контролната сума не съвпада"
-
-#: midx.c:1187
-msgid "could not load pack"
-msgstr "пакетът не може да се зареди"
-
-#: midx.c:1193
-#, c-format
-msgid "could not open index for %s"
-msgstr "индексът за „%s“ не може да се отвори"
-
-#: midx.c:1204
-msgid "Adding packfiles to multi-pack-index"
-msgstr "Добавяне на пакетни файлове към индекс за множество пакети"
-
-#: midx.c:1247
-#, c-format
-msgid "unknown preferred pack: '%s'"
-msgstr "непознат предпочитан пакет: %s"
-
-#: midx.c:1292
-#, c-format
-msgid "cannot select preferred pack %s with no objects"
-msgstr ""
-"не може да изберете „%s“, който не съдържа обекти, за предпочитан пакет"
-
-#: midx.c:1324
-#, c-format
-msgid "did not see pack-file %s to drop"
-msgstr "пакетният файл за триене „%s“ не може да се открие"
-
-#: midx.c:1370
-#, c-format
-msgid "preferred pack '%s' is expired"
-msgstr "предпочитаният пакет „%s“ е остарял"
-
-#: midx.c:1383
-msgid "no pack files to index."
-msgstr "няма пакетни файлове за индексиране"
-
-#: midx.c:1420
-msgid "could not write multi-pack bitmap"
-msgstr "многопакетната битова маска не може да бъде запазена"
-
-#: midx.c:1430
-msgid "could not write multi-pack-index"
-msgstr "индексът за множество пакети не може да бъде запазен"
-
-#: midx.c:1489 builtin/clean.c:37
-#, c-format
-msgid "failed to remove %s"
-msgstr "файлът „%s“ не може да бъде изтрит"
-
-#: midx.c:1522
-#, c-format
-msgid "failed to clear multi-pack-index at %s"
-msgstr "индексът за множество пакети не може да бъде изчистен при „%s“"
-
-#: midx.c:1585
-msgid "multi-pack-index file exists, but failed to parse"
-msgstr "файлът с индекса за множество пакети, но не може да бъде анализиран"
-
-#: midx.c:1593
-msgid "incorrect checksum"
-msgstr "неправилна контролна сума"
-
-#: midx.c:1596
-msgid "Looking for referenced packfiles"
-msgstr "Търсене на указаните пакетни файлове"
-
-#: midx.c:1611
-#, c-format
-msgid ""
-"oid fanout out of order: fanout[%d] = %<PRIx32> > %<PRIx32> = fanout[%d]"
-msgstr ""
-"неправилна подредба на откъси (OID fanout): fanout[%d] = %<PRIx32> > "
-"%<PRIx32> = fanout[%d]"
-
-#: midx.c:1616
-msgid "the midx contains no oid"
-msgstr "във файла с индекса за множество пакети няма идентификатори на обекти"
-
-#: midx.c:1625
-msgid "Verifying OID order in multi-pack-index"
-msgstr ""
-"Проверка на подредбата на идентификатори на обекти във файл с индекс към "
-"множество пакетни файлове"
-
-#: midx.c:1634
-#, 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:1654
-msgid "Sorting objects by packfile"
-msgstr "Подредба на обектите по пакетни файлове"
-
-#: midx.c:1661
-msgid "Verifying object offsets"
-msgstr "Проверка на отместването на обекти"
-
-#: midx.c:1677
-#, c-format
-msgid "failed to load pack entry for oid[%d] = %s"
-msgstr "записът в пакета за обекта oid[%d] = %s не може да бъде зареден"
-
-#: midx.c:1683
-#, c-format
-msgid "failed to load pack-index for packfile %s"
-msgstr "индексът на пакета „%s“ не може да бъде зареден"
-
-#: midx.c:1692
-#, c-format
-msgid "incorrect object offset for oid[%d] = %s: %<PRIx64> != %<PRIx64>"
-msgstr "неправилно отместване на обект за oid[%d] = %s: %<PRIx64> != %<PRIx64>"
-
-#: midx.c:1719
-msgid "Counting referenced objects"
-msgstr "Преброяване на свързаните обекти"
-
-#: midx.c:1729
-msgid "Finding and deleting unreferenced packfiles"
-msgstr "Търсене и изтриване на несвързаните пакетни файлове"
-
-#: midx.c:1921
-msgid "could not start pack-objects"
-msgstr "командата „pack-objects“ не може да бъде стартирана"
-
-#: midx.c:1941
-msgid "could not finish pack-objects"
-msgstr "командата „pack-objects“ не може да бъде завършена"
-
-#: name-hash.c:542
-#, c-format
-msgid "unable to create lazy_dir thread: %s"
-msgstr "не може да се създаде нишка за директории (lazy_dir): %s"
-
-#: name-hash.c:564
-#, c-format
-msgid "unable to create lazy_name thread: %s"
-msgstr "не може да се създаде нишка за имена (lazy_name): %s"
-
-#: name-hash.c:570
-#, c-format
-msgid "unable to join lazy_name thread: %s"
-msgstr "не може да се изчака нишка за имена (lazy_name): %s"
-
-#: notes-merge.c:277
-#, 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."
-msgstr ""
-"Не сте завършили предишното сливане на бележки.  (Указателят „%s“ "
-"съществува).\n"
-"За да завършите предишното сливане, изпълнете:\n"
-"\n"
-"    git notes merge --commit\n"
-"\n"
-"За да отмените предишното сливане, изпълнете:\n"
-"\n"
-"    git notes merge --abort"
-
-#: notes-merge.c:284
-#, c-format
-msgid "You have not concluded your notes merge (%s exists)."
-msgstr ""
-"Не сте завършили сливането на бележките.  (Указателят „%s“ съществува)."
-
-#: notes-utils.c:46
-msgid "Cannot commit uninitialized/unreferenced notes tree"
-msgstr ""
-"Неинициализирано или нереферирано дърво за бележки не може да бъде подадено"
-
-#: notes-utils.c:105
-#, c-format
-msgid "Bad notes.rewriteMode value: '%s'"
-msgstr "Неправилна стойност за „notes.rewriteMode“: „%s“"
-
-#: notes-utils.c:115
-#, c-format
-msgid "Refusing to rewrite notes in %s (outside of refs/notes/)"
-msgstr ""
-"Бележките в „%s“ няма да бъдат презаписани, защото са извън „refs/notes/“."
-
-#. TRANSLATORS: The first %s is the name of
-#. the environment variable, the second %s is
-#. its value.
-#.
-#: notes-utils.c:145
-#, c-format
-msgid "Bad %s value: '%s'"
-msgstr "Зададена е лоша стойност на променливата „%s“: „%s“"
-
-#: object-file.c:456
-#, c-format
-msgid "object directory %s does not exist; check .git/objects/info/alternates"
-msgstr ""
-"директорията за обекти „%s“ не съществува, проверете „.git/objects/info/"
-"alternates“"
-
-#: object-file.c:514
-#, c-format
-msgid "unable to normalize alternate object path: %s"
-msgstr "алтернативният път към обекти не може да бъде нормализиран: „%s“"
-
-#: object-file.c:588
-#, c-format
-msgid "%s: ignoring alternate object stores, nesting too deep"
-msgstr ""
-"%s: алтернативните хранилища за обекти се пренебрегват поради прекалено "
-"дълбоко влагане"
-
-#: object-file.c:595
-#, c-format
-msgid "unable to normalize object directory: %s"
-msgstr "директорията за обекти „%s“ не може да бъде нормализирана"
-
-#: object-file.c:638
-msgid "unable to fdopen alternates lockfile"
-msgstr "заключващият файл за алтернативите не може да се отвори с „fdopen“"
-
-#: object-file.c:656
-msgid "unable to read alternates file"
-msgstr "файлът с алтернативите не може да бъде прочетен"
-
-#: object-file.c:663
-msgid "unable to move new alternates file into place"
-msgstr "новият файл с алтернативите не може да бъде преместен на мястото му"
-
-#: object-file.c:741
-#, c-format
-msgid "path '%s' does not exist"
-msgstr "пътят „%s“ не съществува."
-
-#: object-file.c:762
-#, c-format
-msgid "reference repository '%s' as a linked checkout is not supported yet."
-msgstr "все още не се поддържа еталонно хранилище „%s“ като свързано."
-
-#: object-file.c:768
-#, c-format
-msgid "reference repository '%s' is not a local repository."
-msgstr "еталонното хранилище „%s“ не е локално"
-
-#: object-file.c:774
-#, c-format
-msgid "reference repository '%s' is shallow"
-msgstr "еталонното хранилище „%s“ е плитко"
-
-#: object-file.c:782
-#, c-format
-msgid "reference repository '%s' is grafted"
-msgstr "еталонното хранилище „%s“ е с присаждане"
-
-#: object-file.c:813
-#, c-format
-msgid "could not find object directory matching %s"
-msgstr "директорията с обекти, която отговаря на „%s“, не може да бъде открита"
-
-#: object-file.c:863
-#, c-format
-msgid "invalid line while parsing alternate refs: %s"
-msgstr "неправилен ред при анализа на алтернативните указатели: „%s“"
-
-#: object-file.c:1013
-#, c-format
-msgid "attempting to mmap %<PRIuMAX> over limit %<PRIuMAX>"
-msgstr ""
-"неуспешен опит за „mmap“ %<PRIuMAX>, което е над позволеното %<PRIuMAX>"
-
-#: object-file.c:1048
-#, c-format
-msgid "mmap failed%s"
-msgstr "неуспешно изпълнение на „mmap“%s"
-
-#: object-file.c:1214
-#, c-format
-msgid "object file %s is empty"
-msgstr "файлът с обектите „%s“ е празен"
-
-#: object-file.c:1333 object-file.c:2542
-#, c-format
-msgid "corrupt loose object '%s'"
-msgstr "непакетираният обект „%s“ е повреден"
-
-#: object-file.c:1335 object-file.c:2546
-#, c-format
-msgid "garbage at end of loose object '%s'"
-msgstr "грешни данни в края на непакетирания обект „%s“"
-
-#: object-file.c:1457
-#, c-format
-msgid "unable to parse %s header"
-msgstr "заглавната част на „%s“ не може да бъде анализирана"
-
-#: object-file.c:1459
-msgid "invalid object type"
-msgstr "неправилен вид обект"
-
-#: object-file.c:1470
-#, c-format
-msgid "unable to unpack %s header"
-msgstr "заглавната част на „%s“ не може да бъде разпакетирана"
-
-#: object-file.c:1474
-#, c-format
-msgid "header for %s too long, exceeds %d bytes"
-msgstr "заглавната част на „%s“ е прекалено дълга — надхвърля %d байта"
-
-#: object-file.c:1704
-#, c-format
-msgid "failed to read object %s"
-msgstr "обектът „%s“ не може да бъде прочетен"
-
-#: object-file.c:1708
-#, c-format
-msgid "replacement %s not found for %s"
-msgstr "заместителят „%s“ на „%s“ не може да бъде открит"
-
-#: object-file.c:1712
-#, c-format
-msgid "loose object %s (stored in %s) is corrupt"
-msgstr "непакетираният обект „%s“ (в „%s“) е повреден"
-
-#: object-file.c:1716
-#, c-format
-msgid "packed object %s (stored in %s) is corrupt"
-msgstr "пакетираният обект „%s“ (в „%s“) е повреден"
-
-#: object-file.c:1821
-#, c-format
-msgid "unable to write file %s"
-msgstr "файлът „%s“ не може да бъде записан"
-
-#: object-file.c:1828
-#, c-format
-msgid "unable to set permission to '%s'"
-msgstr "правата за достъп до „%s“ не може да бъдат зададени"
-
-#: object-file.c:1835
-msgid "file write error"
-msgstr "грешка при запис на файл"
-
-#: object-file.c:1858
-msgid "error when closing loose object file"
-msgstr "грешка при затварянето на файла с непакетиран обект"
-
-#: object-file.c:1925
-#, c-format
-msgid "insufficient permission for adding an object to repository database %s"
-msgstr ""
-"няма права за добавяне на обект към базата от данни на хранилището „%s“"
-
-#: object-file.c:1927
-msgid "unable to create temporary file"
-msgstr "не може да бъде създаден временен файл"
-
-#: object-file.c:1951
-msgid "unable to write loose object file"
-msgstr "грешка при записа на файла с непакетиран обект"
-
-#: object-file.c:1957
-#, c-format
-msgid "unable to deflate new object %s (%d)"
-msgstr "новият обект „%s“ не може да се компресира с „deflate“: %d"
-
-#: object-file.c:1961
-#, c-format
-msgid "deflateEnd on object %s failed (%d)"
-msgstr "неуспешно приключване на „deflate“ върху „%s“: %d"
-
-#: object-file.c:1965
-#, c-format
-msgid "confused by unstable object source data for %s"
-msgstr "грешка поради нестабилния източник данни за обектите „%s“"
-
-#: object-file.c:1976 builtin/pack-objects.c:1243
-#, c-format
-msgid "failed utime() on %s"
-msgstr "неуспешно задаване на време на достъп/създаване чрез „utime“ на „%s“"
-
-#: object-file.c:2054
-#, c-format
-msgid "cannot read object for %s"
-msgstr "обектът за „%s“ не може да се прочете"
-
-#: object-file.c:2105
-msgid "corrupt commit"
-msgstr "повредено подаване"
-
-#: object-file.c:2113
-msgid "corrupt tag"
-msgstr "повреден етикет"
-
-#: object-file.c:2213
-#, c-format
-msgid "read error while indexing %s"
-msgstr "грешка при четене по време на индексиране на „%s“"
-
-#: object-file.c:2216
-#, c-format
-msgid "short read while indexing %s"
-msgstr "непълно прочитане по време на индексиране на „%s“"
-
-#: object-file.c:2289 object-file.c:2299
-#, c-format
-msgid "%s: failed to insert into database"
-msgstr "„%s“ не може да се вмъкне в базата от данни"
-
-#: object-file.c:2305
-#, c-format
-msgid "%s: unsupported file type"
-msgstr "неподдържан вид файл: „%s“"
-
-#: object-file.c:2329 builtin/fetch.c:1453
-#, c-format
-msgid "%s is not a valid object"
-msgstr "„%s“ е неправилен обект"
-
-#: object-file.c:2331
-#, c-format
-msgid "%s is not a valid '%s' object"
-msgstr "„%s“ е неправилен обект от вид „%s“"
-
-#: object-file.c:2358
-#, c-format
-msgid "unable to open %s"
-msgstr "обектът „%s“ не може да бъде отворен"
-
-#: object-file.c:2553
-#, c-format
-msgid "hash mismatch for %s (expected %s)"
-msgstr "неправилна контролна сума за „%s“ (трябва да е %s)"
-
-#: object-file.c:2576
-#, c-format
-msgid "unable to mmap %s"
-msgstr "неуспешно изпълнение на „mmap“ върху „%s“"
-
-#: object-file.c:2582
-#, c-format
-msgid "unable to unpack header of %s"
-msgstr "заглавната част на „%s“ не може да бъде разпакетирана"
-
-#: object-file.c:2587
-#, c-format
-msgid "unable to parse header of %s"
-msgstr "заглавната част на „%s“ не може да бъде анализирана"
-
-#: object-file.c:2598
-#, c-format
-msgid "unable to unpack contents of %s"
-msgstr "съдържанието на „%s“ не може да бъде разпакетирано"
-
-#: object-name.c:480
-#, c-format
-msgid "short object ID %s is ambiguous"
-msgstr "късият идентификатор на обект „%s“ не е еднозначен"
-
-#: object-name.c:491
-msgid "The candidates are:"
-msgstr "Възможностите са:"
-
-#: 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"
-"may be created by mistake. For example,\n"
-"\n"
-"  git switch -c $br $(git rev-parse ...)\n"
-"\n"
-"where \"$br\" is somehow empty and a 40-hex ref is created. Please\n"
-"examine these refs and maybe delete them. Turn this message off by\n"
-"running \"git config advice.objectNameWarning false\""
-msgstr ""
-"При нормална работа Git никога не създава указатели, които завършват\n"
-"с 40 шестнадесетични знака, защото стандартно те ще бъдат прескачани.\n"
-"Възможно е такива указатели да са създадени случайно.  Например:\n"
-"\n"
-"    git switch -c $br $(git rev-parse …)\n"
-"\n"
-"където стойността на променливата на средата „$br“ е празна, при което\n"
-"се създава подобен указател.  Прегледайте тези указатели и ги изтрийте.\n"
-"За да изключите това съобщение, изпълнете:\n"
-"\n"
-"    git config advice.objectNameWarning false"
-
-#: object-name.c:910
-#, c-format
-msgid "log for '%.*s' only goes back to %s"
-msgstr "журналът за „%.*s“ стига само до „%s“"
-
-#: object-name.c:918
-#, c-format
-msgid "log for '%.*s' only has %d entries"
-msgstr "журналът за „%.*s“ съдържа само %d записа"
-
-#: object-name.c:1696
-#, c-format
-msgid "path '%s' exists on disk, but not in '%.*s'"
-msgstr "пътят „%s“ съществува на диска, но не и в „%.*s“"
-
-#: object-name.c:1702
-#, c-format
-msgid ""
-"path '%s' exists, but not '%s'\n"
-"hint: Did you mean '%.*s:%s' aka '%.*s:./%s'?"
-msgstr ""
-"пътят „%s“ съществува на диска, но не е в „%s“\n"
-"Пробвайте с „%.*s:%s“, което е същото като „%.*s:./%s“."
-
-#: object-name.c:1711
-#, c-format
-msgid "path '%s' does not exist in '%.*s'"
-msgstr "пътят „%s“ не съществува в „%.*s“"
-
-#: 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 ""
-"пътят „%s“ е в индекса, но не версия %d\n"
-"Пробвайте с „%d:%s“."
-
-#: 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 ""
-"пътят „%s“ е в индекса, но не в „%s“\n"
-"Пробвайте с „%d:%s“, което е същото като „%d:./%s“."
-
-#: object-name.c:1763
-#, c-format
-msgid "path '%s' exists on disk, but not in the index"
-msgstr "пътят „%s“ съществува на диска, но не е в индекса"
-
-#: object-name.c:1765
-#, c-format
-msgid "path '%s' does not exist (neither on disk nor in the index)"
-msgstr "пътят „%s“ не съществува нито на диска, нито в индекса"
-
-#: object-name.c:1778
-msgid "relative path syntax can't be used outside working tree"
-msgstr "относителен път не може да се ползва извън работното дърво"
-
-#: object-name.c:1916
-#, c-format
-msgid "invalid object name '%.*s'."
-msgstr "неправилно име на обект: „%.*s“"
-
-#: object.c:53
-#, c-format
-msgid "invalid object type \"%s\""
-msgstr "неправилен вид обект: „%s“"
-
-#: object.c:173
-#, c-format
-msgid "object %s is a %s, not a %s"
-msgstr "обектът „%s“ е %s, а не %s"
-
-#: object.c:250
-#, c-format
-msgid "object %s has unknown type id %d"
-msgstr "обектът „%s“ е непознат вид: %d"
-
-#: object.c:263
-#, c-format
-msgid "unable to parse object: %s"
-msgstr "обектът „%s“ не може да бъде анализиран"
-
-#: object.c:283 object.c:295
-#, c-format
-msgid "hash mismatch %s"
-msgstr "разлика в контролната сума: „%s“"
-
-#: pack-bitmap.c:353
-msgid "multi-pack bitmap is missing required reverse index"
-msgstr "задължителният обратен индекс липсва в многопакетната битова маска"
-
-#: pack-bitmap.c:429
-msgid "load_reverse_index: could not open pack"
-msgstr ""
-"load_reverse_index: пакетът не може да се отвори (при зареждане на обратния "
-"индекс)"
-
-#: pack-bitmap.c:1069 pack-bitmap.c:1075 builtin/pack-objects.c:2424
-#, c-format
-msgid "unable to get size of %s"
-msgstr "размерът на „%s“ не може да бъде получен"
-
-#: pack-bitmap.c:1935
-#, c-format
-msgid "could not find %s in pack %s at offset %<PRIuMAX>"
-msgstr "„%s“ липсва в пакет „%s“ при отместване %<PRIuMAX>"
-
-#: pack-bitmap.c:1971 builtin/rev-list.c:92
-#, c-format
-msgid "unable to get disk usage of %s"
-msgstr "използваното място за „%s“ не може да бъде получено"
-
-#: pack-revindex.c:221
-#, c-format
-msgid "reverse-index file %s is too small"
-msgstr "файлът с обратния индекс „%s“ е твърде малък"
-
-#: pack-revindex.c:226
-#, c-format
-msgid "reverse-index file %s is corrupt"
-msgstr "файлът с обратния индекс „%s“ е повреден"
-
-#: pack-revindex.c:234
-#, c-format
-msgid "reverse-index file %s has unknown signature"
-msgstr "непознат подпис за файла на обратния индекс „%s“"
-
-#: pack-revindex.c:238
-#, c-format
-msgid "reverse-index file %s has unsupported version %<PRIu32>"
-msgstr "версия %2$<PRIu32> на файла с обратен индекс „%1$s“ не се поддържа"
-
-#: pack-revindex.c:243
-#, c-format
-msgid "reverse-index file %s has unsupported hash id %<PRIu32>"
-msgstr ""
-"идентификатор на контролна сума %2$<PRIu32> на файла с обратен индекс „%1$s“ "
-"не се поддържа"
-
-#: pack-write.c:251
-msgid "cannot both write and verify reverse index"
-msgstr "обратният индекс не може едновременно да се записва и да се проверява"
-
-#: pack-write.c:270
-#, c-format
-msgid "could not stat: %s"
-msgstr "не може да се получи информация чрез „stat“ за „%s“"
-
-#: pack-write.c:282
-#, c-format
-msgid "failed to make %s readable"
-msgstr "не може да се дадат права за четене на „%s“"
-
-#: pack-write.c:520
-#, c-format
-msgid "could not write '%s' promisor file"
-msgstr "гарантиращият файл „%s“ не може да се запише"
-
-#: packfile.c:627
-msgid "offset before end of packfile (broken .idx?)"
-msgstr ""
-"отместване преди края на пакетния файл (възможно е индексът да е повреден)"
-
-#: packfile.c:657
-#, c-format
-msgid "packfile %s cannot be mapped%s"
-msgstr "не може да се изпълни „mmap“ върху пакетния файл „%s“%s"
-
-#: packfile.c:1924
-#, c-format
-msgid "offset before start of pack index for %s (corrupt index?)"
-msgstr ""
-"отместване преди началото на индекса на пакетния файл „%s“ (възможно е "
-"индексът да е повреден)"
-
-#: packfile.c:1928
-#, c-format
-msgid "offset beyond end of pack index for %s (truncated index?)"
-msgstr ""
-"отместване преди края на индекса на пакетния файл „%s“ (възможно е индексът "
-"да е отрязан)"
-
-#: parse-options-cb.c:21 parse-options-cb.c:25 builtin/commit-graph.c:175
-#, c-format
-msgid "option `%s' expects a numerical value"
-msgstr "опцията „%s“ очаква число за аргумент"
-
-#: parse-options-cb.c:42
-#, c-format
-msgid "malformed expiration date '%s'"
-msgstr "неправилна дата на срок: „%s“"
-
-#: parse-options-cb.c:55
-#, c-format
-msgid "option `%s' expects \"always\", \"auto\", or \"never\""
-msgstr ""
-"опцията „%s“ изисква някоя от стойностите: „always“ (винаги), "
-"„auto“ (автоматично) или „never“ (никога)"
-
-#: parse-options-cb.c:133 parse-options-cb.c:150
-#, c-format
-msgid "malformed object name '%s'"
-msgstr "неправилно име на обект „%s“"
-
-#: parse-options-cb.c:307
-#, c-format
-msgid "option `%s' expects \"%s\" or \"%s\""
-msgstr "опцията „%s“ изисква някоя от стойностите: „%s“ или „%s“"
-
-#: parse-options.c:58
-#, c-format
-msgid "%s requires a value"
-msgstr "опцията „%s“ изисква аргумент"
-
-#: parse-options.c:93
-#, c-format
-msgid "%s is incompatible with %s"
-msgstr "опциите „%s“ и „%s“ са несъвместими"
-
-#: parse-options.c:98
-#, c-format
-msgid "%s : incompatible with something else"
-msgstr "опцията „%s“ е несъвместима с нещо"
-
-#: parse-options.c:112 parse-options.c:116
-#, c-format
-msgid "%s takes no value"
-msgstr "опцията „%s“ не приема аргументи"
-
-#: parse-options.c:114
-#, c-format
-msgid "%s isn't available"
-msgstr "опцията „%s“ не е налична"
-
-#: 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:393
-#, c-format
-msgid "ambiguous option: %s (could be --%s%s or --%s%s)"
-msgstr "нееднозначна опция: „%s“ (може да е „--%s%s“ или „--%s%s“)"
-
-#: parse-options.c:428 parse-options.c:436
-#, c-format
-msgid "did you mean `--%s` (with two dashes)?"
-msgstr "„--%s“ (с 2 тирета) ли имахте предвид?"
-
-#: parse-options.c:678 parse-options.c:1054
-#, c-format
-msgid "alias of --%s"
-msgstr "псевдоним на „--%s“"
-
-#: parse-options.c:892
-#, c-format
-msgid "unknown option `%s'"
-msgstr "непозната опция: „%s“"
-
-#: parse-options.c:894
-#, c-format
-msgid "unknown switch `%c'"
-msgstr "непознат флаг „%c“"
-
-#: parse-options.c:896
-#, c-format
-msgid "unknown non-ascii option in string: `%s'"
-msgstr "непозната стойност извън „ascii“ в низа: „%s“"
-
-#: parse-options.c:920
-msgid "..."
-msgstr "…"
-
-#: parse-options.c:934
-#, c-format
-msgid "usage: %s"
-msgstr "употреба: %s"
-
-#. TRANSLATORS: the colon here should align with the
-#. one in "usage: %s" translation.
-#.
-#: parse-options.c:949
-#, 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:970
-#, c-format
-msgid "%*s%s"
-msgstr "%*s%s"
-
-#: parse-options.c:993
-#, c-format
-msgid "    %s"
-msgstr "    %s"
-
-#: parse-options.c:1040
-msgid "-NUM"
-msgstr "-ЧИСЛО"
-
-#: path.c:922
-#, c-format
-msgid "Could not make %s writable by group"
-msgstr "Не може да се дадат права за запис в директорията „%s“ на групата"
-
-#: pathspec.c:150
-msgid "Escape character '\\' not allowed as last character in attr value"
-msgstr ""
-"Екраниращият знак „\\“не може да е последен знак в стойността на атрибут"
-
-#: pathspec.c:168
-msgid "Only one 'attr:' specification is allowed."
-msgstr "Позволено е само едно указване на „attr:“."
-
-#: pathspec.c:171
-msgid "attr spec must not be empty"
-msgstr "„attr:“ трябва да указва стойност"
-
-#: pathspec.c:214
-#, c-format
-msgid "invalid attribute name %s"
-msgstr "неправилно име на атрибут: „%s“"
-
-#: pathspec.c:279
-msgid "global 'glob' and 'noglob' pathspec settings are incompatible"
-msgstr "глобалните настройки за пътища „glob“ и „noglob“ са несъвместими"
-
-#: pathspec.c:286
-msgid ""
-"global 'literal' pathspec setting is incompatible with all other global "
-"pathspec settings"
-msgstr ""
-"глобалната настройка за дословни пътища „literal“ е несъвместима с всички "
-"други глобални настройки за пътища"
-
-#: pathspec.c:326
-msgid "invalid parameter for pathspec magic 'prefix'"
-msgstr "неправилен параметър за опцията за магически пътища „prefix“"
-
-#: pathspec.c:347
-#, c-format
-msgid "Invalid pathspec magic '%.*s' in '%s'"
-msgstr "Неправилна стойност за опцията за магически пътища „%.*s“ в „%s“"
-
-#: pathspec.c:352
-#, c-format
-msgid "Missing ')' at the end of pathspec magic in '%s'"
-msgstr "Знакът „)“ липсва в опцията за магически пътища в „%s“"
-
-#: pathspec.c:390
-#, c-format
-msgid "Unimplemented pathspec magic '%c' in '%s'"
-msgstr "Магическите пътища „%c“ са без реализация за „%s“"
-
-#: pathspec.c:449
-#, c-format
-msgid "%s: 'literal' and 'glob' are incompatible"
-msgstr "%s: опциите „literal“ и „glob“ са несъвместими"
-
-#: pathspec.c:465
-#, c-format
-msgid "%s: '%s' is outside repository at '%s'"
-msgstr "%s: „%s“ е извън хранилището при „%s“"
-
-#: pathspec.c:541
-#, c-format
-msgid "'%s' (mnemonic: '%c')"
-msgstr "„%s“ (клавиш: „%c“)"
-
-#: pathspec.c:551
-#, c-format
-msgid "%s: pathspec magic not supported by this command: %s"
-msgstr "%s: магическите пътища не се поддържат от командата „%s“"
-
-#: pathspec.c:618
-#, c-format
-msgid "pathspec '%s' is beyond a symbolic link"
-msgstr "пътят „%s“ е след символна връзка"
-
-#: pathspec.c:663
-#, c-format
-msgid "line is badly quoted: %s"
-msgstr "неправилно цитиран ред: %s"
-
-#: pkt-line.c:92
-msgid "unable to write flush packet"
-msgstr "пакетът за изчистване на буферите не може да се запише"
-
-#: pkt-line.c:99
-msgid "unable to write delim packet"
-msgstr "разделящият пакет не може да се запише"
-
-#: pkt-line.c:106
-msgid "unable to write response end packet"
-msgstr "пакетът за край на отговора не може да се запише"
-
-#: pkt-line.c:113
-msgid "flush packet write failed"
-msgstr "неуспешно изчистване на буферите при запис на пакет"
-
-#: pkt-line.c:153
-msgid "protocol error: impossibly long line"
-msgstr "протоколна грешка: прекалено дълъг ред"
-
-#: pkt-line.c:169 pkt-line.c:171
-msgid "packet write with format failed"
-msgstr "неуспешен запис на пакет с формат"
-
-#: pkt-line.c:204 pkt-line.c:252
-msgid "packet write failed - data exceeds max packet size"
-msgstr ""
-"неуспешен запис на пакетен файл — данните надвишават максималният размер на "
-"пакет"
-
-#: pkt-line.c:222
-#, c-format
-msgid "packet write failed: %s"
-msgstr "неуспешен запис на пакет: %s"
-
-#: pkt-line.c:349 pkt-line.c:350
-msgid "read error"
-msgstr "грешка при четене"
-
-#: pkt-line.c:360 pkt-line.c:361
-msgid "the remote end hung up unexpectedly"
-msgstr "отдалеченото хранилище неочаквано прекъсна връзката"
-
-#: pkt-line.c:417 pkt-line.c:419
-#, c-format
-msgid "protocol error: bad line length character: %.4s"
-msgstr "протоколна грешка: неправилeн знак за дължина на ред: %.4s"
-
-#: pkt-line.c:434 pkt-line.c:436 pkt-line.c:442 pkt-line.c:444
-#, c-format
-msgid "protocol error: bad line length %d"
-msgstr "протоколна грешка: неправилна дължина на ред: %d"
-
-#: pkt-line.c:472 sideband.c:165
-#, c-format
-msgid "remote error: %s"
-msgstr "отдалечена грешка: %s"
-
-#: preload-index.c:125
-msgid "Refreshing index"
-msgstr "Обновяване на индекса"
-
-#: preload-index.c:144
-#, c-format
-msgid "unable to create threaded lstat: %s"
-msgstr "не може да се създаде нишка за изпълнението на „lstat“: %s"
-
-#: pretty.c:1051
-msgid "unable to parse --pretty format"
-msgstr "аргументът към опцията „--pretty“ не може да се анализира"
-
-#: promisor-remote.c:31
-msgid "promisor-remote: unable to fork off fetch subprocess"
-msgstr "хранилище-гарант: неуспешно създаване на процес за доставяне"
-
-#: promisor-remote.c:38 promisor-remote.c:40
-msgid "promisor-remote: could not write to fetch subprocess"
-msgstr "хранилище-гарант: не може да се пише към процеса за доставяне"
-
-#: promisor-remote.c:44
-msgid "promisor-remote: could not close stdin to fetch subprocess"
-msgstr ""
-"хранилище-гарант: стандартният вход на процеса за доставяне не може да се "
-"затвори"
-
-#: promisor-remote.c:54
-#, c-format
-msgid "promisor remote name cannot begin with '/': %s"
-msgstr ""
-"името отдалеченото хранилище-гарант не може за започва със знака „/“: %s"
-
-#: protocol-caps.c:103
-msgid "object-info: expected flush after arguments"
-msgstr "object-info: след аргументите се очаква изчистване на буферите"
-
-#: prune-packed.c:35
-msgid "Removing duplicate objects"
-msgstr "Изтриване на повтарящите се обекти"
-
-#: range-diff.c:67
-msgid "could not start `log`"
-msgstr "командата за журнала с подавания „log“ не може да се стартира"
-
-#: range-diff.c:69
-msgid "could not read `log` output"
-msgstr ""
-"изходът от командата за журнала с подавания „log“ не може да се прочете"
-
-#: range-diff.c:97 sequencer.c:5602
-#, c-format
-msgid "could not parse commit '%s'"
-msgstr "подаването „%s“ не може да бъде анализирано"
-
-#: 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:137
-#, c-format
-msgid "could not parse git header '%.*s'"
-msgstr "заглавната част на git „%.*s“ не може да се анализира"
-
-#: range-diff.c:304
-msgid "failed to generate diff"
-msgstr "неуспешно търсене на разлика"
-
-#: range-diff.c:562 range-diff.c:564
-#, c-format
-msgid "could not parse log for '%s'"
-msgstr "журналът с подаванията на „%s“ не може да бъде анализиран"
-
-#: read-cache.c:723
-#, c-format
-msgid "will not add file alias '%s' ('%s' already exists in index)"
-msgstr ""
-"няма да бъде добавен псевдоним за файл „%s“ („%s“ вече съществува в индекса)"
-
-#: read-cache.c:739
-msgid "cannot create an empty blob in the object database"
-msgstr "в базата от данни за обектите не може да се създаде празен обект-BLOB"
-
-#: read-cache.c:761
-#, c-format
-msgid "%s: can only add regular files, symbolic links or git-directories"
-msgstr ""
-"%s: може да добавяте само обикновени файлове, символни връзки и директории "
-"на git"
-
-#: read-cache.c:766 builtin/submodule--helper.c:3242
-#, c-format
-msgid "'%s' does not have a commit checked out"
-msgstr "не е изтеглено подаване в „%s“"
-
-#: read-cache.c:818
-#, c-format
-msgid "unable to index file '%s'"
-msgstr "файлът „%s“ не може да бъде индексиран"
-
-#: read-cache.c:837
-#, c-format
-msgid "unable to add '%s' to index"
-msgstr "„%s“ не може да се добави в индекса"
-
-#: read-cache.c:848
-#, c-format
-msgid "unable to stat '%s'"
-msgstr "„stat“ не може да се изпълни върху „%s“"
-
-#: read-cache.c:1386
-#, c-format
-msgid "'%s' appears as both a file and as a directory"
-msgstr "„%s“ съществува и като файл, и като директория"
-
-#: read-cache.c:1601
-msgid "Refresh index"
-msgstr "Обновяване на индекса"
-
-#: read-cache.c:1733
-#, c-format
-msgid ""
-"index.version set, but the value is invalid.\n"
-"Using version %i"
-msgstr ""
-"Зададена е неправилна стойност на настройката „index.version“.\n"
-"Ще се ползва версия %i"
-
-#: read-cache.c:1743
-#, c-format
-msgid ""
-"GIT_INDEX_VERSION set, but the value is invalid.\n"
-"Using version %i"
-msgstr ""
-"Зададена е неправилна стойност на променливата на средата "
-"„GIT_INDEX_VERSION“.\n"
-"Ще се ползва версия %i"
-
-#: read-cache.c:1799
-#, c-format
-msgid "bad signature 0x%08x"
-msgstr "неправилен подпис: „0x%08x“"
-
-#: read-cache.c:1802
-#, c-format
-msgid "bad index version %d"
-msgstr "неправилна версия на индекса %d"
-
-#: read-cache.c:1811
-msgid "bad index file sha1 signature"
-msgstr "неправилен подпис за контролна сума по SHA1 на файла на индекса"
-
-#: read-cache.c:1845
-#, c-format
-msgid "index uses %.4s extension, which we do not understand"
-msgstr ""
-"индексът ползва разширение „%.4s“, което не се поддържа от тази версия на git"
-
-#: read-cache.c:1847
-#, c-format
-msgid "ignoring %.4s extension"
-msgstr "игнориране на разширението „%.4s“"
-
-#: read-cache.c:1884
-#, c-format
-msgid "unknown index entry format 0x%08x"
-msgstr "непознат формат на запис в индекса: „0x%08x“"
-
-#: read-cache.c:1900
-#, c-format
-msgid "malformed name field in the index, near path '%s'"
-msgstr "неправилно име на поле в индекса близо до пътя „%s“"
-
-#: read-cache.c:1957
-msgid "unordered stage entries in index"
-msgstr "неподредени записи в индекса"
-
-#: read-cache.c:1960
-#, c-format
-msgid "multiple stage entries for merged file '%s'"
-msgstr "множество записи за слетия файл „%s“"
-
-#: read-cache.c:1963
-#, c-format
-msgid "unordered stage entries for '%s'"
-msgstr "неподредени записи за „%s“"
-
-#: read-cache.c:2078 read-cache.c:2384 rerere.c:549 rerere.c:583 rerere.c:1095
-#: submodule.c:1662 builtin/add.c:600 builtin/check-ignore.c:183
-#: builtin/checkout.c:527 builtin/checkout.c:719 builtin/clean.c:1013
-#: builtin/commit.c:378 builtin/diff-tree.c:122 builtin/grep.c:519
-#: builtin/mv.c:148 builtin/reset.c:499 builtin/rm.c:293
-#: builtin/submodule--helper.c:327 builtin/submodule--helper.c:3202
-msgid "index file corrupt"
-msgstr "файлът с индекса е повреден"
-
-#: read-cache.c:2222
-#, c-format
-msgid "unable to create load_cache_entries thread: %s"
-msgstr ""
-"не може да се създаде нишка за зареждане на обектите от кеша "
-"(load_cache_entries): %s"
-
-#: read-cache.c:2235
-#, c-format
-msgid "unable to join load_cache_entries thread: %s"
-msgstr ""
-"не може да се изчака нишка за зареждане на обектите от кеша "
-"(load_cache_entries): %s"
-
-#: read-cache.c:2268
-#, c-format
-msgid "%s: index file open failed"
-msgstr "%s: неуспешно отваряне на файла на индекса"
-
-#: read-cache.c:2272
-#, c-format
-msgid "%s: cannot stat the open index"
-msgstr "%s: не може да се получи информация за отворения индекс със „stat“"
-
-#: read-cache.c:2276
-#, c-format
-msgid "%s: index file smaller than expected"
-msgstr "%s: файлът на индекса е по-малък от очакваното"
-
-#: read-cache.c:2280
-#, c-format
-msgid "%s: unable to map index file%s"
-msgstr "%s: неуспешно изпълнение на „mmap“ върху индексния файл%s"
-
-#: read-cache.c:2323
-#, c-format
-msgid "unable to create load_index_extensions thread: %s"
-msgstr ""
-"не може да се създаде нишка за зареждане на разширенията на индекса "
-"(load_index_extensions): %s"
-
-#: read-cache.c:2350
-#, c-format
-msgid "unable to join load_index_extensions thread: %s"
-msgstr ""
-"не може да се създаде нишка за зареждане на разширенията на индекса "
-"(load_index_extensions): %s"
-
-#: read-cache.c:2396
-#, c-format
-msgid "could not freshen shared index '%s'"
-msgstr "споделеният индекс „%s“ не може да се обнови"
-
-#: read-cache.c:2455
-#, c-format
-msgid "broken index, expect %s in %s, got %s"
-msgstr "грешки в индекса — в „%2$s“ се очаква „%1$s“, а бе получено „%3$s“"
-
-#: read-cache.c:3086 strbuf.c:1191 wrapper.c:641 builtin/merge.c:1150
-#, c-format
-msgid "could not close '%s'"
-msgstr "„%s“ не може да се затвори"
-
-#: read-cache.c:3129
-msgid "failed to convert to a sparse-index"
-msgstr "индексът не може да бъде превърнат в частичен"
-
-#: read-cache.c:3200
-#, c-format
-msgid "could not stat '%s'"
-msgstr "неуспешно изпълнение на „stat“ върху „%s“"
-
-#: read-cache.c:3213
-#, c-format
-msgid "unable to open git dir: %s"
-msgstr "не може да се отвори директорията на git: %s"
-
-#: read-cache.c:3225
-#, c-format
-msgid "unable to unlink: %s"
-msgstr "неуспешно изтриване на „%s“"
-
-#: read-cache.c:3254
-#, c-format
-msgid "cannot fix permission bits on '%s'"
-msgstr "правата за достъп до „%s“ не може да бъдат поправени"
-
-#: read-cache.c:3411
-#, c-format
-msgid "%s: cannot drop to stage #0"
-msgstr "%s: не може да се премине към етап №0"
-
-#: rebase-interactive.c:11
-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 ""
-"Може да промените това с командите „git rebase --edit-todo“ и „git rebase --"
-"continue“ след това.\n"
-"Може и да преустановите пребазирането с командата „git rebase --abort“.\n"
-
-#: rebase-interactive.c:33
-#, c-format
-msgid ""
-"unrecognized setting %s for option rebase.missingCommitsCheck. Ignoring."
-msgstr ""
-"Непозната стойност „%s“ за настройката „rebase.missingCommitsCheck“.  "
-"Настройката се прескача."
-
-#: rebase-interactive.c:42
-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 [-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"
-"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 [-C | -c] ПОДАВАНЕ\n"
-"                    — вкарване на подаването в предходното му, без смяна на\n"
-"                      съобщението.  С „-C“ се използва само съобщението на\n"
-"                      настоящото, а с „-c“ освен това се отваря редакторът\n"
-" x, exec ПОДАВАНЕ   — изпълнение на команда към обвивката: останалата част "
-"на\n"
-"                      реда\n"
-" b, break           — спиране (може да продължите пребазирането с командата\n"
-"                      „git rebase --continue“)\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"
-
-#: rebase-interactive.c:66
-#, c-format
-msgid "Rebase %s onto %s (%d command)"
-msgid_plural "Rebase %s onto %s (%d commands)"
-msgstr[0] "Пребазиране на „%s“ върху „%s“ (%d команди)"
-msgstr[1] "Пребазиране на „%s“ върху „%s“ (%d команда)"
-
-#: rebase-interactive.c:75
-msgid ""
-"\n"
-"Do not remove any line. Use 'drop' explicitly to remove a commit.\n"
-msgstr ""
-"\n"
-"Не изтривайте редове.  Подаванията може да се прескачат с командата „drop“.\n"
-
-#: rebase-interactive.c:78
-msgid ""
-"\n"
-"If you remove a line here THAT COMMIT WILL BE LOST.\n"
-msgstr ""
-"\n"
-"Ако изтриете ред, съответстващото му подаване ще бъде ИЗТРИТО.\n"
-
-#: rebase-interactive.c:84
-msgid ""
-"\n"
-"You are editing the todo file of an ongoing interactive rebase.\n"
-"To continue rebase after editing, run:\n"
-"    git rebase --continue\n"
-"\n"
-msgstr ""
-"\n"
-"В момента редактирате файла с командите на текущото интерактивно "
-"пребазиране.\n"
-"За да продължите пребазирането след това, изпълнете:\n"
-"    git rebase --continue\n"
-"\n"
-
-#: rebase-interactive.c:89
-msgid ""
-"\n"
-"However, if you remove everything, the rebase will be aborted.\n"
-"\n"
-msgstr ""
-"\n"
-"Ако изтриете всичко, пребазирането ще бъде преустановено.\n"
-"\n"
-
-#: rebase-interactive.c:113 rerere.c:469 rerere.c:676 sequencer.c:3883
-#: sequencer.c:3909 sequencer.c:5708 builtin/fsck.c:328 builtin/gc.c:1791
-#: builtin/rebase.c:190
-#, c-format
-msgid "could not write '%s'"
-msgstr "„%s“ не може да се запише"
-
-#: rebase-interactive.c:119
-#, c-format
-msgid "could not write '%s'."
-msgstr "„%s“ не може да се запише."
-
-#: rebase-interactive.c:196
-#, c-format
-msgid ""
-"Warning: some commits may have been dropped accidentally.\n"
-"Dropped commits (newer to older):\n"
-msgstr ""
-"Предупреждение: някои подавания може да са пропуснати.\n"
-"Пропуснати подавания (новите са най-отгоре):\n"
-
-#: rebase-interactive.c:203
-#, c-format
-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"
-"The possible behaviours are: ignore, warn, error.\n"
-"\n"
-msgstr ""
-"За да не получавате това съобщение, изрично ползвайте командата „drop“.\n"
-"\n"
-"Настройката „rebase.missingCommitsCheck“ управлява нивото на предупреждение\n"
-"Възможните стойности са „ignore“ (пренебрегване), „warn“ (само "
-"предупреждение)\n"
-"или „error“ (считане за грешка).\n"
-
-#: rebase.c:29
-#, c-format
-msgid "%s: 'preserve' superseded by 'merges'"
-msgstr "%s: „merges“ заменя „preserve“"
-
-#: ref-filter.c:42 wt-status.c:2048
-msgid "gone"
-msgstr "изтрит"
-
-#: ref-filter.c:43
-#, c-format
-msgid "ahead %d"
-msgstr "напред с %d"
-
-#: ref-filter.c:44
-#, c-format
-msgid "behind %d"
-msgstr "назад с %d"
-
-#: ref-filter.c:45
-#, c-format
-msgid "ahead %d, behind %d"
-msgstr "напред с %d, назад с %d"
-
-#: ref-filter.c:235
-#, c-format
-msgid "expected format: %%(color:<color>)"
-msgstr "очакван формат: %%(color:ЦВЯТ)"
-
-#: ref-filter.c:237
-#, c-format
-msgid "unrecognized color: %%(color:%s)"
-msgstr "непознат цвят: %%(color:%s)"
-
-#: ref-filter.c:259
-#, c-format
-msgid "Integer value expected refname:lstrip=%s"
-msgstr "очаква се цяло число за „refname:lstrip=%s“"
-
-#: ref-filter.c:263
-#, c-format
-msgid "Integer value expected refname:rstrip=%s"
-msgstr "очаква се цяло число за „refname:rstrip=%s“"
-
-#: ref-filter.c:265 ref-filter.c:344 ref-filter.c:377 ref-filter.c:431
-#: ref-filter.c:443 ref-filter.c:462 ref-filter.c:534 ref-filter.c:560
-#, c-format
-msgid "unrecognized %%(%s) argument: %s"
-msgstr "непознат аргумент за „%%(%s)“: %s"
-
-#: ref-filter.c:320
-#, c-format
-msgid "%%(objecttype) does not take arguments"
-msgstr "%%(objecttype) не приема аргументи"
-
-#: ref-filter.c:352
-#, c-format
-msgid "%%(deltabase) does not take arguments"
-msgstr "%%(deltabase) не приема аргументи"
-
-#: ref-filter.c:364
-#, c-format
-msgid "%%(body) does not take arguments"
-msgstr "%%(body) не приема аргументи"
-
-#: ref-filter.c:396
-#, c-format
-msgid "expected %%(trailers:key=<value>)"
-msgstr "очаква се %%(trailers:key=ЕПИЛОГ)"
-
-#: ref-filter.c:398
-#, c-format
-msgid "unknown %%(trailers) argument: %s"
-msgstr "непознат аргумент „%%(trailers)“: %s"
-
-#: ref-filter.c:429
-#, c-format
-msgid "positive value expected contents:lines=%s"
-msgstr "очаква се положителна стойност за „contents:lines=%s“"
-
-#: ref-filter.c:458
-#, c-format
-msgid "positive value expected '%s' in %%(%s)"
-msgstr "очаква се положителна стойност за „%s“ в %%(%s)"
-
-#: ref-filter.c:476
-#, c-format
-msgid "unrecognized email option: %s"
-msgstr "непозната опция за е-поща: %s"
-
-#: ref-filter.c:506
-#, c-format
-msgid "expected format: %%(align:<width>,<position>)"
-msgstr "очакван формат: %%(align:ШИРОЧИНА,ПОЗИЦИЯ)"
-
-#: ref-filter.c:518
-#, c-format
-msgid "unrecognized position:%s"
-msgstr "непозната позиция: %s"
-
-#: ref-filter.c:525
-#, c-format
-msgid "unrecognized width:%s"
-msgstr "непозната широчина: %s"
-
-#: ref-filter.c:542
-#, c-format
-msgid "positive width expected with the %%(align) atom"
-msgstr "очаква се положителна широчина с лексемата „%%(align)“"
-
-#: 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:707
-#, c-format
-msgid "unknown field name: %.*s"
-msgstr "непознато име на обект: „%.*s“"
-
-#: 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:844 ref-filter.c:910 ref-filter.c:946 ref-filter.c:948
-#, c-format
-msgid "format: %%(%s) atom used without a %%(%s) atom"
-msgstr "формат: лексемата %%(%s) е използвана без съответната ѝ %%(%s)"
-
-#: ref-filter.c:912
-#, c-format
-msgid "format: %%(then) atom used more than once"
-msgstr "формат: лексемата %%(then) е използвана повече от един път"
-
-#: ref-filter.c:914
-#, c-format
-msgid "format: %%(then) atom used after %%(else)"
-msgstr "формат: лексемата %%(then) е използвана след %%(else)"
-
-#: ref-filter.c:950
-#, c-format
-msgid "format: %%(else) atom used more than once"
-msgstr "формат: лексемата %%(else) е използвана повече от един път"
-
-#: ref-filter.c:965
-#, c-format
-msgid "format: %%(end) atom used without corresponding atom"
-msgstr "формат: лексемата %%(end) е използвана без съответната ѝ"
-
-#: ref-filter.c:1027
-#, c-format
-msgid "malformed format string %s"
-msgstr "неправилен форматиращ низ „%s“"
-
-#: 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:1709
-#, c-format
-msgid "(no branch, rebasing detached HEAD %s)"
-msgstr "(извън клон, пребазиране на несвързан указател „HEAD“ при „%s“)"
-
-#: ref-filter.c:1712
-#, c-format
-msgid "(no branch, bisect started on %s)"
-msgstr "(извън клон, двоично търсене от „%s“)"
-
-#: ref-filter.c:1716
-#, c-format
-msgid "(HEAD detached at %s)"
-msgstr "(указателят „HEAD“ не е свързан и е при „%s“)"
-
-#: ref-filter.c:1719
-#, c-format
-msgid "(HEAD detached from %s)"
-msgstr "(указателят „HEAD“ не е свързан и е отделѐн от „%s“)"
-
-#: ref-filter.c:1722
-msgid "(no branch)"
-msgstr "(извън клон)"
-
-#: ref-filter.c:1754 ref-filter.c:1972
-#, c-format
-msgid "missing object %s for %s"
-msgstr "обектът „%s“ липсва за „%s“"
-
-#: ref-filter.c:1764
-#, c-format
-msgid "parse_object_buffer failed on %s for %s"
-msgstr "неуспешно анализиране чрез „parse_object_buffer“ на „%s“ за „%s“"
-
-#: ref-filter.c:2155
-#, c-format
-msgid "malformed object at '%s'"
-msgstr "обект със сгрешен формат при „%s“"
-
-#: ref-filter.c:2245
-#, c-format
-msgid "ignoring ref with broken name %s"
-msgstr "игнориране на указателя с грешно име „%s“"
-
-#: ref-filter.c:2250 refs.c:676
-#, c-format
-msgid "ignoring broken ref %s"
-msgstr "игнориране на повредения указател „%s“"
-
-#: ref-filter.c:2629
-#, c-format
-msgid "format: %%(end) atom missing"
-msgstr "грешка във форма̀та: липсва лексемата %%(end)"
-
-#: ref-filter.c:2740
-#, c-format
-msgid "malformed object name %s"
-msgstr "неправилно име на обект „%s“"
-
-#: ref-filter.c:2745
-#, c-format
-msgid "option `%s' must point to a commit"
-msgstr "опцията „%s“ не сочи към подаване"
-
-#: refs.c:261
-#, c-format
-msgid "%s does not point to a valid object!"
-msgstr "„%s“ не сочи към позволен обект!"
-
-#: refs.c:563
-#, 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"
-"of your new repositories, which will suppress this warning, call:\n"
-"\n"
-"\tgit config --global init.defaultBranch <name>\n"
-"\n"
-"Names commonly chosen instead of 'master' are 'main', 'trunk' and\n"
-"'development'. The just-created branch can be renamed via this command:\n"
-"\n"
-"\tgit branch -m <name>\n"
-msgstr ""
-"Първоначалният клон ще се казва „%s“.  Това може да се промени.  Може да "
-"зададете\n"
-"настройката и да спрете това съобщение.  За това изпълнете:\n"
-"\n"
-"    git config --global init.defaultBranch ИМЕ\n"
-"\n"
-"Често ползвани варианти вместо „master“ са „main“, „trunk“ и „development“.\n"
-"За да преименувата току що създаден клон, изпълнете:\n"
-"\n"
-"    git branch -m ИМЕ\n"
-
-#: refs.c:585
-#, c-format
-msgid "could not retrieve `%s`"
-msgstr "„%s“ не може да бъде получен"
-
-#: refs.c:595
-#, c-format
-msgid "invalid branch name: %s = %s"
-msgstr "неправилно име на клон: „%s = %s“"
-
-#: refs.c:674
-#, c-format
-msgid "ignoring dangling symref %s"
-msgstr "игнориране на указател на обект извън клон „%s“"
-
-#: refs.c:925
-#, c-format
-msgid "log for ref %s has gap after %s"
-msgstr "има пропуски в журнала с подаванията за указателя „%s“ след „%s“"
-
-#: refs.c:932
-#, c-format
-msgid "log for ref %s unexpectedly ended on %s"
-msgstr "журналът с подаванията за указателя „%s“ свършва неочаквано след „%s“"
-
-#: refs.c:997
-#, c-format
-msgid "log for %s is empty"
-msgstr "журналът с подаванията за указателя „%s“ е празен"
-
-#: refs.c:1090
-#, c-format
-msgid "refusing to update ref with bad name '%s'"
-msgstr "указател не може да се обнови с грешно име „%s“"
-
-#: refs.c:1168
-#, c-format
-msgid "update_ref failed for ref '%s': %s"
-msgstr "неуспешно обновяване на указателя (update_ref) „%s“: %s"
-
-#: refs.c:2067
-#, c-format
-msgid "multiple updates for ref '%s' not allowed"
-msgstr "не са позволени повече от една промени на указателя „%s“"
-
-#: refs.c:2150
-msgid "ref updates forbidden inside quarantine environment"
-msgstr "обновяванията на указатели са забранени в среди под карантина"
-
-#: refs.c:2161
-msgid "ref updates aborted by hook"
-msgstr "обновяванията на указатели са преустановени от кука"
-
-#: refs.c:2269 refs.c:2299
-#, c-format
-msgid "'%s' exists; cannot create '%s'"
-msgstr "„%s“ съществува, не може да се създаде „%s“"
-
-#: refs.c:2275 refs.c:2310
-#, c-format
-msgid "cannot process '%s' and '%s' at the same time"
-msgstr "невъзможно е едновременно да се обработват „%s“ и „%s“"
-
-#: refs/files-backend.c:1267
-#, c-format
-msgid "could not remove reference %s"
-msgstr "Указателят „%s“ не може да бъде изтрит"
-
-#: refs/files-backend.c:1281 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:1284 refs/packed-backend.c:1562
-#, c-format
-msgid "could not delete references: %s"
-msgstr "Указателите не може да бъдат изтрити: %s"
-
-#: refspec.c:170
-#, c-format
-msgid "invalid refspec '%s'"
-msgstr "неправилен указател: „%s“"
-
-#: remote.c:402
-#, c-format
-msgid "config remote shorthand cannot begin with '/': %s"
-msgstr ""
-"съкращението за отдалечено хранилище не може за започва със знака „/“: %s"
-
-#: remote.c:450
-msgid "more than one receivepack given, using the first"
-msgstr "зададен е повече от един пакет за получаване, ще се ползва първият"
-
-#: remote.c:458
-msgid "more than one uploadpack given, using the first"
-msgstr "зададен е повече от един пакет за изпращане, ще се ползва първият"
-
-#: remote.c:699
-#, c-format
-msgid "Cannot fetch both %s and %s to %s"
-msgstr "Невъзможно е да се доставят едновременно и „%s“, и „%s“ към „%s“"
-
-#: remote.c:703
-#, c-format
-msgid "%s usually tracks %s, not %s"
-msgstr "„%s“ обикновено следи „%s“, а не „%s“"
-
-#: remote.c:707
-#, c-format
-msgid "%s tracks both %s and %s"
-msgstr "„%s“ следи както „%s“, така и „%s“"
-
-#: remote.c:775
-#, c-format
-msgid "key '%s' of pattern had no '*'"
-msgstr "ключ „%s“ на шаблона не съдържа „*“"
-
-#: remote.c:785
-#, c-format
-msgid "value '%s' of pattern has no '*'"
-msgstr "стойност „%s“ на шаблона не съдържа „*“"
-
-#: remote.c:1192
-#, c-format
-msgid "src refspec %s does not match any"
-msgstr "указателят на версия-източник „%s“ не съвпада с никой обект"
-
-#: remote.c:1197
-#, c-format
-msgid "src refspec %s matches more than one"
-msgstr "указателят на версия-източник „%s“ съвпада с повече от един обект"
-
-#. TRANSLATORS: "matches '%s'%" is the <dst> part of "git push
-#. <remote> <src>:<dst>" push, and "being pushed ('%s')" is
-#. the <src>.
-#.
-#: remote.c:1212
-#, c-format
-msgid ""
-"The destination you provided is not a full refname (i.e.,\n"
-"starting with \"refs/\"). We tried to guess what you meant by:\n"
-"\n"
-"- Looking for a ref that matches '%s' on the remote side.\n"
-"- Checking if the <src> being pushed ('%s')\n"
-"  is a ref in \"refs/{heads,tags}/\". If so we add a corresponding\n"
-"  refs/{heads,tags}/ prefix on the remote side.\n"
-"\n"
-"Neither worked, so we gave up. You must fully qualify the ref."
-msgstr ""
-"Зададената цел не е пълно име на указател (не започва с „refs/“).\n"
-"Бяха пробвани следните варианти:\n"
-"\n"
-"  ⁃ указател от отдалеченото хранилище, който да съответства на „%s“;\n"
-"  ⁃ дали изтласкваният ИЗТОЧНИК („%s“) е указател в „refs/{heads,tags}/“.\n"
-"    При съвпадение се добавя съответен префикс „refs/{heads,tags}/“ за\n"
-"    отдалеченото хранилище.\n"
-"\n"
-"Никой от вариантите не сработи.  Трябва сами да укажете пълното име на\n"
-"указателя."
-
-#: remote.c:1232
-#, c-format
-msgid ""
-"The <src> part of the refspec is a commit object.\n"
-"Did you mean to create a new branch by pushing to\n"
-"'%s:refs/heads/%s'?"
-msgstr ""
-"ИЗТОЧНИКът е обект-подаване.  Не целите ли всъщност да създадете нов клон "
-"като\n"
-"изтласкате към „%s:refs/heads/%s“?"
-
-#: remote.c:1237
-#, c-format
-msgid ""
-"The <src> part of the refspec is a tag object.\n"
-"Did you mean to create a new tag by pushing to\n"
-"'%s:refs/tags/%s'?"
-msgstr ""
-"ИЗТОЧНИКът е обект-етикет.  Не целите ли всъщност да създадете нов клон "
-"като\n"
-"изтласкате към „%s:refs/tags/%s“?"
-
-#: remote.c:1242
-#, c-format
-msgid ""
-"The <src> part of the refspec is a tree object.\n"
-"Did you mean to tag a new tree by pushing to\n"
-"'%s:refs/tags/%s'?"
-msgstr ""
-"ИЗТОЧНИКът е обект-дърво.  Не целите ли всъщност да създадете нов клон като\n"
-"изтласкате към „%s:refs/tags/%s“?"
-
-#: remote.c:1247
-#, c-format
-msgid ""
-"The <src> part of the refspec is a blob object.\n"
-"Did you mean to tag a new blob by pushing to\n"
-"'%s:refs/tags/%s'?"
-msgstr ""
-"ИЗТОЧНИКът е обект-BLOB.  Не целите ли всъщност да създадете нов клон като\n"
-"изтласкате към „%s:refs/tags/%s“?"
-
-#: remote.c:1283
-#, c-format
-msgid "%s cannot be resolved to branch"
-msgstr "не е открит клон съответстващ на „%s“"
-
-#: remote.c:1294
-#, c-format
-msgid "unable to delete '%s': remote ref does not exist"
-msgstr "„%s“ не може да се изтрие: отдалечения указател не съществува"
-
-#: remote.c:1306
-#, c-format
-msgid "dst refspec %s matches more than one"
-msgstr "указателят на версия-цел „%s“ съвпада с повече от един обект"
-
-#: remote.c:1313
-#, c-format
-msgid "dst ref %s receives from more than one src"
-msgstr ""
-"указателят на версия-цел „%s“ съответства и ще получава от повече от един "
-"източник"
-
-#: remote.c:1834 remote.c:1941
-msgid "HEAD does not point to a branch"
-msgstr "Указателят „HEAD“ не сочи към клон"
-
-#: remote.c:1843
-#, c-format
-msgid "no such branch: '%s'"
-msgstr "няма клон на име „%s“"
-
-#: remote.c:1846
-#, c-format
-msgid "no upstream configured for branch '%s'"
-msgstr "не е зададен клон-източник за клона „%s“"
-
-#: remote.c:1852
-#, c-format
-msgid "upstream branch '%s' not stored as a remote-tracking branch"
-msgstr "клонът-източник „%s“ не е съхранен като следящ клон"
-
-#: remote.c:1867
-#, c-format
-msgid "push destination '%s' on remote '%s' has no local tracking branch"
-msgstr ""
-"липсва локален следящ клон за местоположението за изтласкване „%s“ в "
-"хранилището „%s“"
-
-#: remote.c:1882
-#, c-format
-msgid "branch '%s' has no remote for pushing"
-msgstr "няма информация клонът „%s“ да следи някой друг"
-
-#: remote.c:1892
-#, c-format
-msgid "push refspecs for '%s' do not include '%s'"
-msgstr "указателят за изтласкване на „%s“ не включва „%s“"
-
-#: remote.c:1905
-msgid "push has no destination (push.default is 'nothing')"
-msgstr "указателят за изтласкване не включва цел („push.default“ е „nothing“)"
-
-#: remote.c:1927
-msgid "cannot resolve 'simple' push to a single destination"
-msgstr "простото (simple) изтласкване не съответства на една цел"
-
-#: remote.c:2060
-#, c-format
-msgid "couldn't find remote ref %s"
-msgstr "отдалеченият указател „%s“ не може да бъде открит"
-
-#: remote.c:2073
-#, c-format
-msgid "* Ignoring funny ref '%s' locally"
-msgstr "• прескачане на неочаквания локален указател „%s“"
-
-#: remote.c:2236
-#, c-format
-msgid "Your branch is based on '%s', but the upstream is gone.\n"
-msgstr "Този клон следи „%s“, но следеният клон е изтрит.\n"
-
-#: remote.c:2240
-msgid "  (use \"git branch --unset-upstream\" to fixup)\n"
-msgstr "  (за да коригирате това, използвайте „git branch --unset-upstream“)\n"
-
-#: remote.c:2243
-#, c-format
-msgid "Your branch is up to date with '%s'.\n"
-msgstr "Клонът е обновен към „%s“.\n"
-
-#: remote.c:2247
-#, c-format
-msgid "Your branch and '%s' refer to different commits.\n"
-msgstr "Клонът ви и „%s“ сочат към различни подавания.\n"
-
-#: remote.c:2250
-#, c-format
-msgid "  (use \"%s\" for details)\n"
-msgstr "  (за повече информация ползвайте „%s“)\n"
-
-#: remote.c:2254
-#, c-format
-msgid "Your branch is ahead of '%s' by %d commit.\n"
-msgid_plural "Your branch is ahead of '%s' by %d commits.\n"
-msgstr[0] "Клонът ви е с %2$d подаване пред „%1$s“.\n"
-msgstr[1] "Клонът ви е с %2$d подавания пред „%1$s“.\n"
-
-#: remote.c:2260
-msgid "  (use \"git push\" to publish your local commits)\n"
-msgstr "  (публикувайте локалните си промени чрез „git push“)\n"
-
-#: remote.c:2263
-#, c-format
-msgid "Your branch is behind '%s' by %d commit, and can be fast-forwarded.\n"
-msgid_plural ""
-"Your branch is behind '%s' by %d commits, and can be fast-forwarded.\n"
-msgstr[0] "Клонът ви е с %2$d подаване зад „%1$s“ и може да бъде превъртян.\n"
-msgstr[1] "Клонът ви е с %2$d подавания зад „%1$s“ и може да бъде превъртян.\n"
-
-#: remote.c:2271
-msgid "  (use \"git pull\" to update your local branch)\n"
-msgstr "  (обновете локалния си клон чрез „git pull“)\n"
-
-#: remote.c:2274
-#, c-format
-msgid ""
-"Your branch and '%s' have diverged,\n"
-"and have %d and %d different commit each, respectively.\n"
-msgid_plural ""
-"Your branch and '%s' have diverged,\n"
-"and have %d and %d different commits each, respectively.\n"
-msgstr[0] ""
-"Текущият клон се е отделил от „%s“,\n"
-"двата имат съответно по %d и %d несъвпадащи подавания.\n"
-msgstr[1] ""
-"Текущият клон се е отделил от „%s“,\n"
-"двата имат съответно по %d и %d несъвпадащи подавания.\n"
-
-#: remote.c:2284
-msgid "  (use \"git pull\" to merge the remote branch into yours)\n"
-msgstr "  (слейте отдалечения клон в локалния чрез „git pull“)\n"
-
-#: remote.c:2476
-#, c-format
-msgid "cannot parse expected object name '%s'"
-msgstr "очакваното име на обект „%s“ не може да бъде анализирано"
-
-#: replace-object.c:21
-#, c-format
-msgid "bad replace ref name: %s"
-msgstr "неправилно име на указател за замяна: „%s“"
-
-#: replace-object.c:30
-#, c-format
-msgid "duplicate replace ref: %s"
-msgstr "повтарящ се указател за замяна: „%s“"
-
-#: replace-object.c:82
-#, c-format
-msgid "replace depth too high for object %s"
-msgstr "дълбочината на замяна е прекалено голяма за обекта: „%s“"
-
-#: rerere.c:201 rerere.c:210 rerere.c:213
-msgid "corrupt MERGE_RR"
-msgstr "повреден „MERGE_RR“ (запис за коригиране на конфликт)"
-
-#: rerere.c:248 rerere.c:253
-msgid "unable to write rerere record"
-msgstr "приложеното коригиране на конфликт не може да бъде записано"
-
-#: rerere.c:479
-#, c-format
-msgid "there were errors while writing '%s' (%s)"
-msgstr "грешки при записването на „%s“ (%s)"
-
-#: rerere.c:482 builtin/gc.c:2263 builtin/gc.c:2298
-#, c-format
-msgid "failed to flush '%s'"
-msgstr "грешка при изчистването на буферите при записването на „%s“"
-
-#: rerere.c:487 rerere.c:1023
-#, c-format
-msgid "could not parse conflict hunks in '%s'"
-msgstr "парчетата с конфликти в „%s“ не може да се анализират"
-
-#: rerere.c:668
-#, c-format
-msgid "failed utime() on '%s'"
-msgstr "неуспешно задаване на време на достъп/създаване чрез „utime“ на „%s“"
-
-#: rerere.c:678
-#, c-format
-msgid "writing '%s' failed"
-msgstr "неуспешен запис на „%s“"
-
-#: rerere.c:698
-#, c-format
-msgid "Staged '%s' using previous resolution."
-msgstr ""
-"„%s“ е добавен към индекса с преизползване на запазена корекция при сливане"
-
-#: rerere.c:737
-#, c-format
-msgid "Recorded resolution for '%s'."
-msgstr "Корекцията на конфликта при сливане на „%s“ е запазена."
-
-#: rerere.c:772
-#, c-format
-msgid "Resolved '%s' using previous resolution."
-msgstr ""
-"Конфликтът при сливане на „%s“ е коригиран с преизползване на предишна "
-"корекция."
-
-#: rerere.c:787
-#, c-format
-msgid "cannot unlink stray '%s'"
-msgstr "излишният обект „%s“ не може да се изтрие"
-
-#: rerere.c:791
-#, c-format
-msgid "Recorded preimage for '%s'"
-msgstr "Предварителният вариант на „%s“ е запазен"
-
-#: rerere.c:865 submodule.c:2121 builtin/log.c:2017
-#: builtin/submodule--helper.c:1777 builtin/submodule--helper.c:1820
-#, c-format
-msgid "could not create directory '%s'"
-msgstr "Директорията „%s“ не може да бъде създадена"
-
-#: rerere.c:1041
-#, c-format
-msgid "failed to update conflicted state in '%s'"
-msgstr "конфликтът в „%s“ не може да се обнови"
-
-#: rerere.c:1052 rerere.c:1059
-#, c-format
-msgid "no remembered resolution for '%s'"
-msgstr "липсва запазена корекция на конфликт при „%s“"
-
-#: rerere.c:1061
-#, c-format
-msgid "cannot unlink '%s'"
-msgstr "„%s“ не може да се изтрие"
-
-#: rerere.c:1071
-#, c-format
-msgid "Updated preimage for '%s'"
-msgstr "Предварителният вариант на „%s“ е обновен"
-
-#: rerere.c:1080
-#, c-format
-msgid "Forgot resolution for '%s'\n"
-msgstr "Запазената корекция на конфликт при „%s“ е премахната\n"
-
-#: rerere.c:1191
-msgid "unable to open rr-cache directory"
-msgstr "директорията „rr-cache“ не може да се отвори"
-
-#: reset.c:42
-msgid "could not determine HEAD revision"
-msgstr "не може да се определи към какво да сочи указателят „HEAD“"
-
-#: reset.c:70 reset.c:76 sequencer.c:3700
-#, c-format
-msgid "failed to find tree of %s"
-msgstr "дървото, сочено от „%s“, не може да бъде открито"
-
-#: revision.c:2347
-msgid "--unpacked=<packfile> no longer supported"
-msgstr "опцията „--unpacked=ПАКЕТЕН_ФАЙЛ“ вече не се поддържа"
-
-#: revision.c:2686
-msgid "your current branch appears to be broken"
-msgstr "Текущият клон е повреден"
-
-#: revision.c:2689
-#, c-format
-msgid "your current branch '%s' does not have any commits yet"
-msgstr "Текущият клон „%s“ е без подавания "
-
-#: revision.c:2891
-msgid "-L does not yet support diff formats besides -p and -s"
-msgstr ""
-"опцията „-L“ поддържа единствено форматирането на разликите според опциите „-"
-"p“ и „-s“"
-
-#: run-command.c:1262
-#, c-format
-msgid "cannot create async thread: %s"
-msgstr "не може да се създаде асинхронна нишка: %s"
-
-#: send-pack.c:150
-msgid "unexpected flush packet while reading remote unpack status"
-msgstr ""
-"неочакван изчистващ пакет „flush“ при изчитане на състоянието от "
-"отдалеченото разпакетиране"
-
-#: send-pack.c:152
-#, c-format
-msgid "unable to parse remote unpack status: %s"
-msgstr ""
-"състоянието от отдалеченото разпакетиране не може да бъде анализирано: %s"
-
-#: send-pack.c:154
-#, c-format
-msgid "remote unpack failed: %s"
-msgstr "неуспешно отдалечено разпакетиране: %s"
-
-#: send-pack.c:378
-msgid "failed to sign the push certificate"
-msgstr "сертификатът за изтласкване не може да бъде подписан"
-
-#: send-pack.c:435
-msgid "send-pack: unable to fork off fetch subprocess"
-msgstr "send-pack: неуспешно създаване на процес"
-
-#: send-pack.c:457
-msgid "push negotiation failed; proceeding anyway with push"
-msgstr "неуспешно договаряне на изтласкване, но се продължава с изтласкването"
-
-#: send-pack.c:528
-msgid "the receiving end does not support this repository's hash algorithm"
-msgstr ""
-"отсрещната страна не поддържа алгоритъма за контролни суми на това хранилище"
-
-#: send-pack.c:537
-msgid "the receiving end does not support --signed push"
-msgstr "отсрещната страна не поддържа изтласкване с опцията „--signed“"
-
-#: send-pack.c:539
-msgid ""
-"not sending a push certificate since the receiving end does not support --"
-"signed push"
-msgstr ""
-"отсрещната страна не поддържа изтласкване с опцията „--signed“, затова не се "
-"използва сертификат"
-
-#: send-pack.c:546
-msgid "the receiving end does not support --atomic push"
-msgstr "получаващата страна не поддържа изтласкване с опцията „--atomic“"
-
-#: send-pack.c:551
-msgid "the receiving end does not support push options"
-msgstr "отсрещната страна не поддържа опции при изтласкване"
-
-#: sequencer.c:197
-#, c-format
-msgid "invalid commit message cleanup mode '%s'"
-msgstr "несъществуващ режим на изчистване „%s“ на съобщение при подаване"
-
-#: sequencer.c:325
-#, c-format
-msgid "could not delete '%s'"
-msgstr "„%s“ не може да бъде изтрит"
-
-#: sequencer.c:345 sequencer.c:4751 builtin/rebase.c:563 builtin/rebase.c:1297
-#: builtin/rm.c:409
-#, c-format
-msgid "could not remove '%s'"
-msgstr "„%s“ не може да бъде изтрит"
-
-#: sequencer.c:355
-msgid "revert"
-msgstr "отмяна"
-
-#: sequencer.c:357
-msgid "cherry-pick"
-msgstr "отбиране"
-
-#: sequencer.c:359
-msgid "rebase"
-msgstr "пребазиране"
-
-#: sequencer.c:361
-#, c-format
-msgid "unknown action: %d"
-msgstr "неизвестно действие: %d"
-
-#: sequencer.c:420
-msgid ""
-"after resolving the conflicts, mark the corrected paths\n"
-"with 'git add <paths>' or 'git rm <paths>'"
-msgstr ""
-"след коригирането на конфликтите, отбележете съответните пътища с:\n"
-"\n"
-"    git add ПЪТ…\n"
-"\n"
-"или\n"
-"\n"
-"    git rm ПЪТ…"
-
-#: sequencer.c:423
-msgid ""
-"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"
-"\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: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:3292
-#, c-format
-msgid "could not lock '%s'"
-msgstr "„%s“ не може да се заключи"
-
-#: sequencer.c:450 sequencer.c:3091 sequencer.c:3296 sequencer.c:3310
-#: sequencer.c:3561 sequencer.c:5618 strbuf.c:1188 wrapper.c:639
-#, c-format
-msgid "could not write to '%s'"
-msgstr "в „%s“ не може да се пише"
-
-#: sequencer.c:455
-#, c-format
-msgid "could not write eol to '%s'"
-msgstr "краят на ред не може да се запише в „%s“"
-
-#: sequencer.c:460 sequencer.c:3096 sequencer.c:3298 sequencer.c:3312
-#: sequencer.c:3569
-#, c-format
-msgid "failed to finalize '%s'"
-msgstr "„%s“ не може да се завърши"
-
-#: sequencer.c:473 sequencer.c:1934 sequencer.c:3116 sequencer.c:3551
-#: sequencer.c:3679 builtin/am.c:289 builtin/commit.c:834 builtin/merge.c:1148
-#, c-format
-msgid "could not read '%s'"
-msgstr "файлът „%s“ не може да бъде прочетен"
-
-#: sequencer.c:499
-#, c-format
-msgid "your local changes would be overwritten by %s."
-msgstr "локалните ви промени ще бъдат презаписани при %s."
-
-#: sequencer.c:503
-msgid "commit your changes or stash them to proceed."
-msgstr "подайте или скатайте промените, за да продължите"
-
-#: sequencer.c:535
-#, c-format
-msgid "%s: fast-forward"
-msgstr "%s: превъртане"
-
-#: sequencer.c:574 builtin/tag.c:614
-#, c-format
-msgid "Invalid cleanup mode %s"
-msgstr "Несъществуващ режим на изчистване „%s“"
-
-#. TRANSLATORS: %s will be "revert", "cherry-pick" or
-#. "rebase".
-#.
-#: sequencer.c:685
-#, c-format
-msgid "%s: Unable to write new index file"
-msgstr "%s: новият индекс не може да бъде запазен"
-
-#: sequencer.c:699
-msgid "unable to update cache tree"
-msgstr "дървото на кеша не може да бъде обновено"
-
-#: sequencer.c:713
-msgid "could not resolve HEAD commit"
-msgstr "подаването, сочено от указателя „HEAD“, не може да бъде открито"
-
-#: sequencer.c:793
-#, c-format
-msgid "no key present in '%.*s'"
-msgstr "в „%.*s“ няма ключове"
-
-#: sequencer.c:804
-#, c-format
-msgid "unable to dequote value of '%s'"
-msgstr "цитирането на стойността на „%s“ не може да бъде изчистено"
-
-#: sequencer.c:841 wrapper.c:209 wrapper.c:379 builtin/am.c:756
-#: builtin/am.c:848 builtin/rebase.c:694
-#, c-format
-msgid "could not open '%s' for reading"
-msgstr "файлът не може да бъде прочетен: „%s“"
-
-#: sequencer.c:851
-msgid "'GIT_AUTHOR_NAME' already given"
-msgstr "настройката за автор „GIT_AUTHOR_NAME“ вече е зададена"
-
-#: sequencer.c:856
-msgid "'GIT_AUTHOR_EMAIL' already given"
-msgstr "настройката за е-поща „GIT_AUTHOR_EMAIL“ вече е зададена"
-
-#: sequencer.c:861
-msgid "'GIT_AUTHOR_DATE' already given"
-msgstr "настройката за дата „GIT_AUTHOR_DATE“ вече е зададена"
-
-#: sequencer.c:865
-#, c-format
-msgid "unknown variable '%s'"
-msgstr "непозната променлива „%s“"
-
-#: sequencer.c:870
-msgid "missing 'GIT_AUTHOR_NAME'"
-msgstr "настройката за автор „GIT_AUTHOR_NAME“ липсва"
-
-#: sequencer.c:872
-msgid "missing 'GIT_AUTHOR_EMAIL'"
-msgstr "настройката за е-поща „GIT_AUTHOR_EMAIL“ липсва"
-
-#: sequencer.c:874
-msgid "missing 'GIT_AUTHOR_DATE'"
-msgstr "настройката за дата „GIT_AUTHOR_DATE“ липсва"
-
-#: sequencer.c:939
-#, c-format
-msgid ""
-"you have staged changes in your working tree\n"
-"If these changes are meant to be squashed into the previous commit, run:\n"
-"\n"
-"  git commit --amend %s\n"
-"\n"
-"If they are meant to go into a new commit, run:\n"
-"\n"
-"  git commit %s\n"
-"\n"
-"In both cases, once you're done, continue with:\n"
-"\n"
-"  git rebase --continue\n"
-msgstr ""
-"в това работно дърво има скатани промени.\n"
-"Ако искате да ги вкарате в предишното подаване, изпълнете:\n"
-"\n"
-"    git commit --amend %s\n"
-"\n"
-"Ако искате да създадете ново подаване, изпълнете:\n"
-"\n"
-"    git commit %s\n"
-"\n"
-"И в двата случая продължавате след това с командата:\n"
-"\n"
-"    git rebase --continue\n"
-
-#: sequencer.c:1225
-msgid "'prepare-commit-msg' hook failed"
-msgstr ""
-"неуспешно изпълнение на куката при промяна на съобщението при подаване "
-"(prepare-commit-msg)"
-
-#: sequencer.c:1231
-msgid ""
-"Your name and email address were configured automatically based\n"
-"on your username and hostname. Please check that they are accurate.\n"
-"You can suppress this message by setting them explicitly. Run the\n"
-"following command and follow the instructions in your editor to edit\n"
-"your configuration file:\n"
-"\n"
-"    git config --global --edit\n"
-"\n"
-"After doing this, you may fix the identity used for this commit with:\n"
-"\n"
-"    git commit --amend --reset-author\n"
-msgstr ""
-"Името и адресът за е-поща са настроени автоматично на базата на името на\n"
-"потребителя и името на машината.  Проверете дали са верни.  Може да спрете\n"
-"това съобщение като изрично зададете стойностите.  Изпълнете следната "
-"команда\n"
-"и следвайте инструкциите в текстовия ви редактор, за да редактирате\n"
-"конфигурационния файл:\n"
-"\n"
-"    git config --global --edit\n"
-"\n"
-"След като направите това, може да коригирате информацията за автора на\n"
-"текущото подаване чрез:\n"
-"\n"
-"    git commit --amend --reset-author\n"
-
-#: sequencer.c:1244
-msgid ""
-"Your name and email address were configured automatically based\n"
-"on your username and hostname. Please check that they are accurate.\n"
-"You can suppress this message by setting them explicitly:\n"
-"\n"
-"    git config --global user.name \"Your Name\"\n"
-"    git config --global user.email you@example.com\n"
-"\n"
-"After doing this, you may fix the identity used for this commit with:\n"
-"\n"
-"    git commit --amend --reset-author\n"
-msgstr ""
-"Името и адресът за е-поща са настроени автоматично на базата на името на\n"
-"потребителя и името на машината.  Проверете дали са верни.  Може да спрете\n"
-"това съобщение като изрично зададете стойностите:\n"
-"\n"
-"    git config --global user.name \"Вашето Име\"\n"
-"    git config --global user.email пенчо@example.com\n"
-"\n"
-"След като направите това, може да коригирате информацията за автора на\n"
-"текущото подаване чрез:\n"
-"\n"
-"    git commit --amend --reset-author\n"
-
-#: sequencer.c:1288
-msgid "couldn't look up newly created commit"
-msgstr "току що създаденото подаване не може да бъде открито"
-
-#: sequencer.c:1290
-msgid "could not parse newly created commit"
-msgstr "току що създаденото подаване не може да бъде анализирано"
-
-#: sequencer.c:1339
-msgid "unable to resolve HEAD after creating commit"
-msgstr ""
-"състоянието сочено от указателя „HEAD“ не може да бъде открито след "
-"подаването"
-
-#: sequencer.c:1342
-msgid "detached HEAD"
-msgstr "несвързан връх „HEAD“"
-
-#: sequencer.c:1346
-msgid " (root-commit)"
-msgstr " (начално подаване)"
-
-#: sequencer.c:1367
-msgid "could not parse HEAD"
-msgstr "указателят „HEAD“ не може да бъде анализиран"
-
-#: sequencer.c:1369
-#, c-format
-msgid "HEAD %s is not a commit!"
-msgstr "указателят „HEAD“ „%s“ сочи към нещо, което не е подаване!"
-
-#: sequencer.c:1373 sequencer.c:1451 builtin/commit.c:1708
-msgid "could not parse HEAD commit"
-msgstr "върховото подаване „HEAD“ не може да бъде прочетено"
-
-#: sequencer.c:1429 sequencer.c:2314
-msgid "unable to parse commit author"
-msgstr "авторът на подаването не може да бъде анализиран"
-
-#: sequencer.c:1440 builtin/am.c:1643 builtin/merge.c:710
-msgid "git write-tree failed to write a tree"
-msgstr "Командата „git write-tree“ не успя да запише обект-дърво"
-
-#: sequencer.c:1473 sequencer.c:1593
-#, c-format
-msgid "unable to read commit message from '%s'"
-msgstr "съобщението за подаване не може да бъде прочетено от „%s“"
-
-#: sequencer.c:1504 sequencer.c:1536
-#, c-format
-msgid "invalid author identity '%s'"
-msgstr "неправилна самоличност за автор: „%s“"
-
-#: sequencer.c:1510
-msgid "corrupt author: missing date information"
-msgstr "повредена информация за автор: липсва дата"
-
-#: sequencer.c:1549 builtin/am.c:1670 builtin/commit.c:1822 builtin/merge.c:915
-#: builtin/merge.c:940 t/helper/test-fast-rebase.c:78
-msgid "failed to write commit object"
-msgstr "обектът за подаването не може да бъде записан"
-
-#: sequencer.c:1576 sequencer.c:4523 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:1625
-#, c-format
-msgid "could not parse commit %s"
-msgstr "подаването „%s“ не може да бъде анализирано"
-
-#: sequencer.c:1630
-#, c-format
-msgid "could not parse parent commit %s"
-msgstr "родителското подаване „%s“ не може да бъде анализирано"
-
-#: sequencer.c:1713 sequencer.c:1994
-#, c-format
-msgid "unknown command: %d"
-msgstr "непозната команда: %d"
-
-#: sequencer.c:1755
-msgid "This is the 1st commit message:"
-msgstr "Това е 1-то съобщение при подаване:"
-
-#: sequencer.c:1756
-#, c-format
-msgid "This is the commit message #%d:"
-msgstr "Това е съобщение при подаване №%d:"
-
-#: sequencer.c:1757
-msgid "The 1st commit message will be skipped:"
-msgstr "Съобщението при подаване №1 ще бъде прескочено:"
-
-#: sequencer.c:1758
-#, c-format
-msgid "The commit message #%d will be skipped:"
-msgstr "Съобщението при подаване №%d ще бъде прескочено:"
-
-#: sequencer.c:1759
-#, c-format
-msgid "This is a combination of %d commits."
-msgstr "Това е обединение от %d подавания"
-
-#: sequencer.c:1906 sequencer.c:1963
-#, c-format
-msgid "cannot write '%s'"
-msgstr "„%s“ не може да се запази"
-
-#: sequencer.c:1953
-msgid "need a HEAD to fixup"
-msgstr "За вкарване в предходното подаване ви трябва указател „HEAD“"
-
-#: sequencer.c:1955 sequencer.c:3596
-msgid "could not read HEAD"
-msgstr "указателят „HEAD“ не може да се прочете"
-
-#: sequencer.c:1957
-msgid "could not read HEAD's commit message"
-msgstr ""
-"съобщението за подаване към указателя „HEAD“ не може да бъде прочетено: %s"
-
-#: sequencer.c:1981
-#, c-format
-msgid "could not read commit message of %s"
-msgstr "съобщението за подаване към „%s“ не може да бъде прочетено"
-
-#: sequencer.c:2091
-msgid "your index file is unmerged."
-msgstr "индексът не е слят."
-
-#: sequencer.c:2098
-msgid "cannot fixup root commit"
-msgstr "началното подаване не може да се вкара в предходното му"
-
-#: sequencer.c:2117
-#, c-format
-msgid "commit %s is a merge but no -m option was given."
-msgstr "подаването „%s“ е сливане, но не е дадена опцията „-m“"
-
-#: sequencer.c:2125 sequencer.c:2133
-#, c-format
-msgid "commit %s does not have parent %d"
-msgstr "подаването „%s“ няма родител %d"
-
-#: sequencer.c:2139
-#, 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:2158
-#, c-format
-msgid "%s: cannot parse parent commit %s"
-msgstr "%s: неразпозната стойност за родителското подаване „%s“"
-
-#: sequencer.c:2224
-#, c-format
-msgid "could not rename '%s' to '%s'"
-msgstr "„%s“ не може да се преименува на „%s“"
-
-#: sequencer.c:2284
-#, c-format
-msgid "could not revert %s... %s"
-msgstr "подаването „%s“… не може да бъде отменено: „%s“"
-
-#: sequencer.c:2285
-#, c-format
-msgid "could not apply %s... %s"
-msgstr "подаването „%s“… не може да бъде приложено: „%s“"
-
-#: sequencer.c:2306
-#, c-format
-msgid "dropping %s %s -- patch contents already upstream\n"
-msgstr "прескачане на %s %s — кръпката вече е приложена\n"
-
-#: sequencer.c:2364
-#, c-format
-msgid "git %s: failed to read the index"
-msgstr "git %s: неуспешно изчитане на индекса"
-
-#: sequencer.c:2372
-#, c-format
-msgid "git %s: failed to refresh the index"
-msgstr "git %s: неуспешно обновяване на индекса"
-
-#: sequencer.c:2452
-#, c-format
-msgid "%s does not accept arguments: '%s'"
-msgstr "„%s“ не приема аргументи: „%s“"
-
-#: sequencer.c:2461
-#, c-format
-msgid "missing arguments for %s"
-msgstr "„%s“ изисква аргументи"
-
-#: sequencer.c:2504
-#, c-format
-msgid "could not parse '%s'"
-msgstr "„%s“ не може да се анализира"
-
-#: sequencer.c:2565
-#, c-format
-msgid "invalid line %d: %.*s"
-msgstr "неправилен ред %d: %.*s"
-
-#: sequencer.c:2576
-#, c-format
-msgid "cannot '%s' without a previous commit"
-msgstr "Без предишно подаване не може да се изпълни „%s“"
-
-#: sequencer.c:2624 builtin/rebase.c:184
-#, c-format
-msgid "could not read '%s'."
-msgstr "от „%s“ не може да се чете."
-
-#: sequencer.c:2662
-msgid "cancelling a cherry picking in progress"
-msgstr "преустановяване на извършваното в момента отбиране на подавания"
-
-#: sequencer.c:2671
-msgid "cancelling a revert in progress"
-msgstr "преустановяване на извършваното в момента отмяна на подаване"
-
-#: sequencer.c:2711
-msgid "please fix this using 'git rebase --edit-todo'."
-msgstr "коригирайте това чрез „git rebase --edit-todo“."
-
-#: sequencer.c:2713
-#, c-format
-msgid "unusable instruction sheet: '%s'"
-msgstr "неизползваем файл с описание на предстоящите действия: „%s“"
-
-#: sequencer.c:2718
-msgid "no commits parsed."
-msgstr "никое от подаванията не може да се разпознае."
-
-#: sequencer.c:2729
-msgid "cannot cherry-pick during a revert."
-msgstr ""
-"по време на отмяна на подаване не може да се извърши отбиране на подаване."
-
-#: sequencer.c:2731
-msgid "cannot revert during a cherry-pick."
-msgstr "по време на отбиране не може да се извърши отмяна на подаване."
-
-#: sequencer.c:2809
-#, c-format
-msgid "invalid value for %s: %s"
-msgstr "неправилна стойност за „%s“: „%s“"
-
-#: sequencer.c:2918
-msgid "unusable squash-onto"
-msgstr "подаването, в което другите да се вкарат, не може да се използва"
-
-#: sequencer.c:2938
-#, c-format
-msgid "malformed options sheet: '%s'"
-msgstr "неправилен файл с опции: „%s“"
-
-#: sequencer.c:3033 sequencer.c:4902
-msgid "empty commit set passed"
-msgstr "зададено е празно множество от подавания"
-
-#: sequencer.c:3050
-msgid "revert is already in progress"
-msgstr "в момента вече се извършва отмяна на подавания"
-
-#: sequencer.c:3052
-#, c-format
-msgid "try \"git revert (--continue | %s--abort | --quit)\""
-msgstr "използвайте „git revert (--continue | %s--abort | --quit)“"
-
-#: sequencer.c:3055
-msgid "cherry-pick is already in progress"
-msgstr "в момента вече се извършва отбиране на подавания"
-
-#: sequencer.c:3057
-#, c-format
-msgid "try \"git cherry-pick (--continue | %s--abort | --quit)\""
-msgstr "използвайте „git cherry-pick (--continue | %s--abort | --quit)“"
-
-#: sequencer.c:3071
-#, c-format
-msgid "could not create sequencer directory '%s'"
-msgstr ""
-"директорията за определянето на последователността „%s“ не може да бъде "
-"създадена"
-
-#: sequencer.c:3086
-msgid "could not lock HEAD"
-msgstr "указателят „HEAD“ не може да се заключи"
-
-#: sequencer.c:3146 sequencer.c:4612
-msgid "no cherry-pick or revert in progress"
-msgstr ""
-"в момента не се извършва отбиране на подавания или пребазиране на клона"
-
-#: sequencer.c:3148 sequencer.c:3159
-msgid "cannot resolve HEAD"
-msgstr "Подаването сочено от указателя „HEAD“ не може да бъде открито"
-
-#: sequencer.c:3150 sequencer.c:3194
-msgid "cannot abort from a branch yet to be born"
-msgstr ""
-"действието не може да бъде преустановено, когато сте на клон, който тепърва "
-"предстои да бъде създаден"
-
-#: sequencer.c:3180 builtin/fetch.c:1004 builtin/fetch.c:1416
-#: builtin/grep.c:772
-#, c-format
-msgid "cannot open '%s'"
-msgstr "„%s“ не може да бъде отворен"
-
-#: sequencer.c:3182
-#, c-format
-msgid "cannot read '%s': %s"
-msgstr "„%s“ не може да бъде прочетен: %s"
-
-#: sequencer.c:3183
-msgid "unexpected end of file"
-msgstr "неочакван край на файл"
-
-#: sequencer.c:3189
-#, c-format
-msgid "stored pre-cherry-pick HEAD file '%s' is corrupt"
-msgstr ""
-"запазеният преди започването на отбирането файл за указателя „HEAD“ — „%s“ е "
-"повреден"
-
-#: sequencer.c:3200
-msgid "You seem to have moved HEAD. Not rewinding, check your HEAD!"
-msgstr ""
-"Изглежда указателят „HEAD“ е променен.  Проверете към какво сочи.\n"
-"Не се правят промени."
-
-#: sequencer.c:3241
-msgid "no revert in progress"
-msgstr "в момента не тече пребазиране"
-
-#: sequencer.c:3250
-msgid "no cherry-pick in progress"
-msgstr "в момента не се извършва отбиране на подавания"
-
-#: sequencer.c:3260
-msgid "failed to skip the commit"
-msgstr "неуспешно прескачане на подаването"
-
-#: sequencer.c:3267
-msgid "there is nothing to skip"
-msgstr "няма какво да се прескочи"
-
-#: sequencer.c:3270
-#, c-format
-msgid ""
-"have you committed already?\n"
-"try \"git %s --continue\""
-msgstr ""
-"подали ли сте вече?  Пробвайте с:\n"
-"\n"
-"    git %s --continue"
-
-#: sequencer.c:3432 sequencer.c:4503
-msgid "cannot read HEAD"
-msgstr "указателят „HEAD“ не може да бъде прочетен"
-
-#: sequencer.c:3449
-#, c-format
-msgid "unable to copy '%s' to '%s'"
-msgstr "„%s“ не може да се копира като „%s“"
-
-#: sequencer.c:3457
-#, c-format
-msgid ""
-"You can amend the commit now, with\n"
-"\n"
-"  git commit --amend %s\n"
-"\n"
-"Once you are satisfied with your changes, run\n"
-"\n"
-"  git rebase --continue\n"
-msgstr ""
-"Може да промените подаването с командата:\n"
-"\n"
-"    git commit --amend %s\n"
-"\n"
-"След като привършите, продължете с командата:\n"
-"\n"
-"    git rebase --continue\n"
-
-#: sequencer.c:3467
-#, c-format
-msgid "Could not apply %s... %.*s"
-msgstr "Подаването „%s“… не може да бъде приложено: „%.*s“"
-
-#: sequencer.c:3474
-#, c-format
-msgid "Could not merge %.*s"
-msgstr "Невъзможно сливане на „%.*s“"
-
-#: sequencer.c:3488 sequencer.c:3492 builtin/difftool.c:633
-#, c-format
-msgid "could not copy '%s' to '%s'"
-msgstr "„%s“ не може да се копира като „%s“"
-
-#: sequencer.c:3503
-#, c-format
-msgid "Executing: %s\n"
-msgstr "В момента се изпълнява: %s\n"
-
-#: sequencer.c:3514
-#, c-format
-msgid ""
-"execution failed: %s\n"
-"%sYou can fix the problem, and then run\n"
-"\n"
-"  git rebase --continue\n"
-"\n"
-msgstr ""
-"неуспешно изпълнение: %s\n"
-"%sМоже да коригирате проблема, след което изпълнете:\n"
-"\n"
-"    git rebase --continue\n"
-"\n"
-
-#: sequencer.c:3520
-msgid "and made changes to the index and/or the working tree\n"
-msgstr "и променѝ индекса и/или работното дърво\n"
-
-#: sequencer.c:3526
-#, c-format
-msgid ""
-"execution succeeded: %s\n"
-"but left changes to the index and/or the working tree\n"
-"Commit or stash your changes, and then run\n"
-"\n"
-"  git rebase --continue\n"
-"\n"
-msgstr ""
-"Успешно изпълнение: %s\n"
-"Остават още промени в индекса или работното дърво.\n"
-"Трябва да ги подадете или скатаете и след това изпълнете:\n"
-"\n"
-"    git rebase --continue\n"
-"\n"
-
-#: sequencer.c:3586
-#, c-format
-msgid "illegal label name: '%.*s'"
-msgstr "неправилно име на етикет: „%.*s“"
-
-#: sequencer.c:3659
-msgid "writing fake root commit"
-msgstr "запазване на фалшиво начално подаване"
-
-#: sequencer.c:3664
-msgid "writing squash-onto"
-msgstr "запазване на подаването, в което другите да се вкарат"
-
-#: sequencer.c:3743
-#, c-format
-msgid "could not resolve '%s'"
-msgstr "„%s“ не може да бъде открит"
-
-#: sequencer.c:3775
-msgid "cannot merge without a current revision"
-msgstr "без текущо подаване не може да се слива"
-
-#: sequencer.c:3797
-#, c-format
-msgid "unable to parse '%.*s'"
-msgstr "„%.*s“ не може да се анализира"
-
-#: sequencer.c:3806
-#, c-format
-msgid "nothing to merge: '%.*s'"
-msgstr "няма нищо за сливане: „%.*s“"
-
-#: sequencer.c:3818
-msgid "octopus merge cannot be executed on top of a [new root]"
-msgstr "върху начално подаване не може да се извърши множествено сливане"
-
-#: sequencer.c:3873
-#, c-format
-msgid "could not get commit message of '%s'"
-msgstr "съобщението за подаване към „%s“ не може да бъде получено"
-
-#: sequencer.c:4019
-#, c-format
-msgid "could not even attempt to merge '%.*s'"
-msgstr "сливането на „%.*s“ не може даже да започне"
-
-#: sequencer.c:4035
-msgid "merge: Unable to write new index file"
-msgstr "сливане: новият индекс не може да бъде запазен"
-
-#: sequencer.c:4116
-msgid "Cannot autostash"
-msgstr "Не може да се скатае автоматично"
-
-#: sequencer.c:4119
-#, c-format
-msgid "Unexpected stash response: '%s'"
-msgstr "Неочакван резултат при скатаване: „%s“"
-
-#: sequencer.c:4125
-#, c-format
-msgid "Could not create directory for '%s'"
-msgstr "Директорията за „%s“ не може да бъде създадена"
-
-#: sequencer.c:4128
-#, c-format
-msgid "Created autostash: %s\n"
-msgstr "Автоматично скатано: „%s“\n"
-
-#: sequencer.c:4132
-msgid "could not reset --hard"
-msgstr "неуспешно изпълнение на „git reset --hard“"
-
-#: sequencer.c:4157
-#, c-format
-msgid "Applied autostash.\n"
-msgstr "Автоматично скатаното е приложено.\n"
-
-#: sequencer.c:4169
-#, c-format
-msgid "cannot store %s"
-msgstr "„%s“ не може да бъде запазен"
-
-#: sequencer.c:4172
-#, c-format
-msgid ""
-"%s\n"
-"Your changes are safe in the stash.\n"
-"You can run \"git stash pop\" or \"git stash drop\" at any time.\n"
-msgstr ""
-"%s\n"
-"Промените ви са надеждно скатани.  Може да пробвате да ги приложите чрез\n"
-"„git stash pop“ или да ги изхвърлите чрез „git stash drop“, когато "
-"поискате.\n"
-
-#: sequencer.c:4177
-msgid "Applying autostash resulted in conflicts."
-msgstr "Конфликти при прилагането на автоматично скатаното."
-
-#: sequencer.c:4178
-msgid "Autostash exists; creating a new stash entry."
-msgstr "Вече има запис за автоматично скатано, затова се създава нов запис."
-
-#: sequencer.c:4252
-msgid "could not detach HEAD"
-msgstr "указателят „HEAD“ не може да се отдели"
-
-#: sequencer.c:4267
-#, c-format
-msgid "Stopped at HEAD\n"
-msgstr "Бе спряно при „HEAD“\n"
-
-#: sequencer.c:4269
-#, c-format
-msgid "Stopped at %s\n"
-msgstr "Бе спряно при „%s“\n"
-
-#: sequencer.c:4301
-#, c-format
-msgid ""
-"Could not execute the todo command\n"
-"\n"
-"    %.*s\n"
-"It has been rescheduled; To edit the command before continuing, please\n"
-"edit the todo list first:\n"
-"\n"
-"    git rebase --edit-todo\n"
-"    git rebase --continue\n"
-msgstr ""
-"Следната запланувана команда не може да бъде изпълнена:\n"
-"\n"
-"    %.*s\n"
-"\n"
-"Тя е запланувана за по-късно.  За да редактирате командата преди "
-"изпълнение,\n"
-"редактирайте списъка за изпълнение:\n"
-"\n"
-"    git rebase --edit-todo\n"
-"    git rebase --continue\n"
-
-#: sequencer.c:4347
-#, c-format
-msgid "Rebasing (%d/%d)%s"
-msgstr "Пребазиране (%d/%d)%s"
-
-#: sequencer.c:4393
-#, c-format
-msgid "Stopped at %s...  %.*s\n"
-msgstr "Спиране при „%s“…  %.*s\n"
-
-#: sequencer.c:4463
-#, c-format
-msgid "unknown command %d"
-msgstr "непозната команда %d"
-
-#: sequencer.c:4511
-msgid "could not read orig-head"
-msgstr "указателят за „orig-head“ не може да се прочете"
-
-#: sequencer.c:4516
-msgid "could not read 'onto'"
-msgstr "указателят за „onto“ не може да се прочете"
-
-#: sequencer.c:4530
-#, c-format
-msgid "could not update HEAD to %s"
-msgstr "„HEAD“ не може да бъде обновен до „%s“"
-
-#: sequencer.c:4590
-#, c-format
-msgid "Successfully rebased and updated %s.\n"
-msgstr "Успешно пребазиране и обновяване на „%s“.\n"
-
-#: sequencer.c:4642
-msgid "cannot rebase: You have unstaged changes."
-msgstr "не може да пребазирате, защото има промени, които не са в индекса."
-
-#: sequencer.c:4651
-msgid "cannot amend non-existing commit"
-msgstr "несъществуващо подаване не може да се поправи"
-
-#: sequencer.c:4653
-#, c-format
-msgid "invalid file: '%s'"
-msgstr "неправилен файл: „%s“"
-
-#: sequencer.c:4655
-#, c-format
-msgid "invalid contents: '%s'"
-msgstr "неправилно съдържание: „%s“"
-
-#: sequencer.c:4658
-msgid ""
-"\n"
-"You have uncommitted changes in your working tree. Please, commit them\n"
-"first and then run 'git rebase --continue' again."
-msgstr ""
-"\n"
-"В работното дърво има неподадени промени.  Първо ги подайте, а след това\n"
-"отново изпълнете „git rebase --continue“."
-
-#: sequencer.c:4694 sequencer.c:4733
-#, c-format
-msgid "could not write file: '%s'"
-msgstr "файлът „%s“ не може да бъде записан"
-
-#: sequencer.c:4749
-msgid "could not remove CHERRY_PICK_HEAD"
-msgstr "указателят „CHERRY_PICK_HEAD“ не може да бъде изтрит"
-
-#: sequencer.c:4759
-msgid "could not commit staged changes."
-msgstr "промените в индекса не може да бъдат подадени."
-
-#: sequencer.c:4879
-#, c-format
-msgid "%s: can't cherry-pick a %s"
-msgstr "%s: не може да се отбере „%s“"
-
-#: sequencer.c:4883
-#, c-format
-msgid "%s: bad revision"
-msgstr "%s: неправилна версия"
-
-#: sequencer.c:4918
-msgid "can't revert as initial commit"
-msgstr "първоначалното подаване не може да бъде отменено"
-
-#: sequencer.c:5189 sequencer.c:5418
-#, c-format
-msgid "skipped previously applied commit %s"
-msgstr "прескачане на вече приложеното подаване „%s“"
-
-#: sequencer.c:5259 sequencer.c:5434
-msgid "use --reapply-cherry-picks to include skipped commits"
-msgstr ""
-"може да включите пропуснатите подавания с опцията „--reapply-cherry-picks“"
-
-#: sequencer.c:5405
-msgid "make_script: unhandled options"
-msgstr "make_script: неподдържани опции"
-
-#: sequencer.c:5408
-msgid "make_script: error preparing revisions"
-msgstr "make_script: грешка при подготовката на версии"
-
-#: sequencer.c:5666 sequencer.c:5683
-msgid "nothing to do"
-msgstr "няма какво да се прави"
-
-#: sequencer.c:5702
-msgid "could not skip unnecessary pick commands"
-msgstr "излишните команди за отбиране не бяха прескочени"
-
-#: sequencer.c:5802
-msgid "the script was already rearranged."
-msgstr "скриптът вече е преподреден."
-
-#: setup.c:134
-#, c-format
-msgid "'%s' is outside repository at '%s'"
-msgstr "„%s“ е извън хранилището при „%s“"
-
-#: setup.c:186
-#, c-format
-msgid ""
-"%s: no such path in the working tree.\n"
-"Use 'git <command> -- <path>...' to specify paths that do not exist locally."
-msgstr ""
-"%s: в това работно дърво няма такъв път.\n"
-"За да указвате пътища, които локално не съществуват, използвайте:\n"
-"\n"
-"    git КОМАНДА -- ПЪТ…"
-
-#: setup.c:199
-#, c-format
-msgid ""
-"ambiguous argument '%s': unknown revision or path not in the working tree.\n"
-"Use '--' to separate paths from revisions, like this:\n"
-"'git <command> [<revision>...] -- [<file>...]'"
-msgstr ""
-"нееднозначен аргумент „%s: непозната версия или пътят не е част от работното "
-"дърво.\n"
-"Разделяйте пътищата от версиите с „--“, ето така:\n"
-"\n"
-"    git КОМАНДА [ВЕРСИЯ…] -- [ФАЙЛ…]"
-
-#: setup.c:265
-#, c-format
-msgid "option '%s' must come before non-option arguments"
-msgstr "опцията „%s“ трябва да е преди първия аргумент, който не е опция"
-
-#: setup.c:284
-#, c-format
-msgid ""
-"ambiguous argument '%s': both revision and filename\n"
-"Use '--' to separate paths from revisions, like this:\n"
-"'git <command> [<revision>...] -- [<file>...]'"
-msgstr ""
-"нееднозначен аргумент „%s“: както версия, така и път.\n"
-"Разделяйте пътищата от версиите с „--“, ето така:\n"
-"\n"
-"    git КОМАНДА [ВЕРСИЯ…] -- [ФАЙЛ…]"
-
-#: setup.c:420
-msgid "unable to set up work tree using invalid config"
-msgstr ""
-"не може да се зададе текуща работна директория при неправилни настройки"
-
-#: setup.c:424 builtin/rev-parse.c:895
-msgid "this operation must be run in a work tree"
-msgstr "тази команда трябва да се изпълни в работно дърво"
-
-#: setup.c:722
-#, c-format
-msgid "Expected git repo version <= %d, found %d"
-msgstr "Очаква се версия на хранилището на git <= %d, а не %d"
-
-#: setup.c:730
-msgid "unknown repository extension found:"
-msgid_plural "unknown repository extensions found:"
-msgstr[0] "открито е непознато разширение в хранилището:"
-msgstr[1] "открити са непознати разширения в хранилището:"
-
-#: setup.c:744
-msgid "repo version is 0, but v1-only extension found:"
-msgid_plural "repo version is 0, but v1-only extensions found:"
-msgstr[0] "версията на хранилището е 0, но е открито разширение за версия 1:"
-msgstr[1] "версията на хранилището е 0, но са открити разширения за версия 1:"
-
-#: setup.c:765
-#, c-format
-msgid "error opening '%s'"
-msgstr "„%s“ не може да се отвори"
-
-#: setup.c:767
-#, c-format
-msgid "too large to be a .git file: '%s'"
-msgstr "прекалено голям файл „.git“: „%s“"
-
-#: setup.c:769
-#, c-format
-msgid "error reading %s"
-msgstr "грешка при прочитане на „%s“"
-
-#: setup.c:771
-#, c-format
-msgid "invalid gitfile format: %s"
-msgstr "неправилен формат на gitfile: %s"
-
-#: setup.c:773
-#, c-format
-msgid "no path in gitfile: %s"
-msgstr "липсва път в gitfile: „%s“"
-
-#: setup.c:775
-#, c-format
-msgid "not a git repository: %s"
-msgstr "не е хранилище на Git: %s"
-
-#: setup.c:877
-#, c-format
-msgid "'$%s' too big"
-msgstr "„%s“ е прекалено голям"
-
-#: setup.c:891
-#, c-format
-msgid "not a git repository: '%s'"
-msgstr "не е хранилище на git: „%s“"
-
-#: setup.c:920 setup.c:922 setup.c:953
-#, c-format
-msgid "cannot chdir to '%s'"
-msgstr "не може да се влезе в директорията „%s“"
-
-#: setup.c:925 setup.c:981 setup.c:991 setup.c:1030 setup.c:1038
-msgid "cannot come back to cwd"
-msgstr "процесът не може да се върне към предишната работна директория"
-
-#: setup.c:1052
-#, c-format
-msgid "failed to stat '%*s%s%s'"
-msgstr "не може да бъде получена информация чрез „stat“ за „%*s%s%s“"
-
-#: setup.c:1295
-msgid "Unable to read current working directory"
-msgstr "Текущата работна директория не може да бъде прочетена"
-
-#: setup.c:1304 setup.c:1310
-#, c-format
-msgid "cannot change to '%s'"
-msgstr "не може да се влезе в директорията „%s“"
-
-#: setup.c:1315
-#, c-format
-msgid "not a git repository (or any of the parent directories): %s"
-msgstr ""
-"нито тази, нито която и да е от по-горните директории, не е хранилище на "
-"git: %s"
-
-#: setup.c:1321
-#, 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 ""
-"нито тази, нито която и да е от по-горните директории (до точката на "
-"монтиране „%s“), не е хранилище на git.\n"
-"Git работи в рамките на една файлова система, защото променливата на средата "
-"„GIT_DISCOVERY_ACROSS_FILESYSTEM“ не е зададена."
-
-#: setup.c:1446
-#, c-format
-msgid ""
-"problem with core.sharedRepository filemode value (0%.3o).\n"
-"The owner of files must always have read and write permissions."
-msgstr ""
-"зададеният в „core.sharedRepository“ режим за достъп до файлове е неправилен "
-"(0%.3o).\n"
-"Собственикът на файла трябва да има права за писане и четене."
-
-#: setup.c:1508
-msgid "fork failed"
-msgstr "неуспешно създаване на процес чрез „fork“"
-
-#: setup.c:1513
-msgid "setsid failed"
-msgstr "неуспешно изпълнение на „setsid“"
-
-#: sparse-index.c:289
-#, c-format
-msgid "index entry is a directory, but not sparse (%08x)"
-msgstr "обектът в индекса е директория, но не частично изтеглена (%08x)"
-
-#. TRANSLATORS: IEC 80000-13:2008 gibibyte
-#: strbuf.c:850
-#, c-format
-msgid "%u.%2.2u GiB"
-msgstr "%u.%2.2u GiB"
-
-#. TRANSLATORS: IEC 80000-13:2008 gibibyte/second
-#: 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:860
-#, c-format
-msgid "%u.%2.2u MiB"
-msgstr "%u.%2.2u MiB"
-
-#. TRANSLATORS: IEC 80000-13:2008 mebibyte/second
-#: 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:869
-#, c-format
-msgid "%u.%2.2u KiB"
-msgstr "%u.%2.2u KiB"
-
-#. TRANSLATORS: IEC 80000-13:2008 kibibyte/second
-#: 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:877
-#, c-format
-msgid "%u byte"
-msgid_plural "%u bytes"
-msgstr[0] "%u байт"
-msgstr[1] "%u байта"
-
-#. TRANSLATORS: IEC 80000-13:2008 byte/second
-#: strbuf.c:879
-#, c-format
-msgid "%u byte/s"
-msgid_plural "%u bytes/s"
-msgstr[0] "%u байт/сек."
-msgstr[1] "%u байта/сек."
-
-#: strbuf.c:1186 wrapper.c:207 wrapper.c:377 builtin/am.c:765
-#: builtin/rebase.c:650
-#, c-format
-msgid "could not open '%s' for writing"
-msgstr "„%s“ не може да бъде отворен за запис"
-
-#: strbuf.c:1195
-#, c-format
-msgid "could not edit '%s'"
-msgstr "„%s“ не може да се редактира"
-
-#: submodule-config.c:237
-#, c-format
-msgid "ignoring suspicious submodule name: %s"
-msgstr "игнориране на подозрително име на подмодул: „%s“"
-
-#: submodule-config.c:304
-msgid "negative values not allowed for submodule.fetchjobs"
-msgstr "настройката „submodule.fetchjobs“ не приема отрицателни стойности"
-
-#: submodule-config.c:402
-#, c-format
-msgid "ignoring '%s' which may be interpreted as a command-line option: %s"
-msgstr ""
-"„%s“ се прескача, защото е възможно да се тълкува като опция за командния "
-"ред: %s"
-
-#: submodule-config.c:499
-#, c-format
-msgid "invalid value for %s"
-msgstr "Неправилна стойност за „%s“"
-
-#: submodule-config.c:767
-#, c-format
-msgid "Could not update .gitmodules entry %s"
-msgstr "Записът „%s“ във файла „.gitmodules“ не може да бъде променен"
-
-#: submodule.c:114 submodule.c:143
-msgid "Cannot change unmerged .gitmodules, resolve merge conflicts first"
-msgstr ""
-"Неслетите файлове „.gitmodules“ не може да бъдат променяни.  Първо "
-"коригирайте конфликтите"
-
-#: submodule.c:118 submodule.c:147
-#, c-format
-msgid "Could not find section in .gitmodules where path=%s"
-msgstr "Във файла „.gitmodules“ липсва раздел за директория „path=%s“"
-
-#: submodule.c:154
-#, c-format
-msgid "Could not remove .gitmodules entry for %s"
-msgstr "Записът „%s“ във файла „.gitmodules“ не може да бъде изтрит"
-
-#: submodule.c:165
-msgid "staging updated .gitmodules failed"
-msgstr "неуспешно добавяне на променения файл „.gitmodules“ в индекса"
-
-#: submodule.c:358
-#, c-format
-msgid "in unpopulated submodule '%s'"
-msgstr "в неподготвения подмодул „%s“"
-
-#: submodule.c:389
-#, c-format
-msgid "Pathspec '%s' is in submodule '%.*s'"
-msgstr "Пътят „%s“ е в подмодула „%.*s“"
-
-#: submodule.c:466
-#, c-format
-msgid "bad --ignore-submodules argument: %s"
-msgstr "неправилен аргумент за „--ignore-submodules“: „%s“"
-
-#: 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:954
-#, c-format
-msgid "submodule entry '%s' (%s) is a %s, not a commit"
-msgstr "записът за подмодула „%s“ (%s) е %s, а не подаване!"
-
-#: submodule.c:1042
-#, c-format
-msgid ""
-"Could not run 'git rev-list <commits> --not --remotes -n 1' command in "
-"submodule %s"
-msgstr ""
-"Командата „git rev-list ПОДАВАНИЯ --not --remotes -n 1“ не може да се "
-"изпълни в подмодула „%s“"
-
-#: submodule.c:1165
-#, c-format
-msgid "process for submodule '%s' failed"
-msgstr "процесът за подмодула „%s“ завърши неуспешно"
-
-#: submodule.c:1194 builtin/branch.c:699 builtin/submodule--helper.c:2714
-msgid "Failed to resolve HEAD as a valid ref."
-msgstr "Не може да се открие към какво сочи указателят „HEAD“"
-
-#: submodule.c:1205
-#, c-format
-msgid "Pushing submodule '%s'\n"
-msgstr "Изтласкване на подмодула „%s“\n"
-
-#: submodule.c:1208
-#, c-format
-msgid "Unable to push submodule '%s'\n"
-msgstr "Подмодулът „%s“ не може да бъде изтласкан\n"
-
-#: submodule.c:1491
-#, c-format
-msgid "Fetching submodule %s%s\n"
-msgstr "Доставяне на подмодула „%s%s“\n"
-
-#: submodule.c:1525
-#, c-format
-msgid "Could not access submodule '%s'\n"
-msgstr "Подмодулът „%s“ не може да бъде достъпен\n"
-
-#: submodule.c:1680
-#, c-format
-msgid ""
-"Errors during submodule fetch:\n"
-"%s"
-msgstr ""
-"Грешки при доставяне на подмодул:\n"
-"%s"
-
-#: submodule.c:1705
-#, c-format
-msgid "'%s' not recognized as a git repository"
-msgstr "„%s“ не е хранилище на git"
-
-#: submodule.c:1722
-#, c-format
-msgid "Could not run 'git status --porcelain=2' in submodule %s"
-msgstr ""
-"Командата „git status --porcelain=2“ не може да се изпълни в подмодула „%s“"
-
-#: submodule.c:1763
-#, c-format
-msgid "'git status --porcelain=2' failed in submodule %s"
-msgstr ""
-"командата „git status --porcelain=2“ не може да се изпълни в подмодула „%s“"
-
-#: submodule.c:1838
-#, c-format
-msgid "could not start 'git status' in submodule '%s'"
-msgstr "командата „git status“ не може да се изпълни в подмодула „%s“"
-
-#: submodule.c:1851
-#, c-format
-msgid "could not run 'git status' in submodule '%s'"
-msgstr "командата „git status“ не може да се изпълни в подмодула „%s“"
-
-#: submodule.c:1868
-#, c-format
-msgid "Could not unset core.worktree setting in submodule '%s'"
-msgstr "Настройката „core.worktree“ не може да се изтрие в подмодула „%s“"
-
-#: submodule.c:1895 submodule.c:2210
-#, c-format
-msgid "could not recurse into submodule '%s'"
-msgstr "неуспешна обработка на поддиректориите в подмодула „%s“"
-
-#: submodule.c:1917
-msgid "could not reset submodule index"
-msgstr "неуспешно зануляване на индекса на подмодула"
-
-#: submodule.c:1959
-#, c-format
-msgid "submodule '%s' has dirty index"
-msgstr "индексът на подмодула „%s“ не е чист"
-
-#: submodule.c:2013
-#, c-format
-msgid "Submodule '%s' could not be updated."
-msgstr "Подмодулът „%s“ не може да се обнови."
-
-#: submodule.c:2081
-#, c-format
-msgid "submodule git dir '%s' is inside git dir '%.*s'"
-msgstr "„%s“ (директория на подмодул) е в директорията на git: „%.*s“"
-
-#: submodule.c:2102
-#, c-format
-msgid ""
-"relocate_gitdir for submodule '%s' with more than one worktree not supported"
-msgstr ""
-"не се поддържа „relocate_gitdir“ за подмодула „%s“, който има повече от едно "
-"работно дърво"
-
-#: submodule.c:2114 submodule.c:2174
-#, c-format
-msgid "could not lookup name for submodule '%s'"
-msgstr "името на подмодула „%s“ не може да бъде намерено"
-
-#: submodule.c:2118
-#, c-format
-msgid "refusing to move '%s' into an existing git dir"
-msgstr "„%s“ не може да се премести в съществуваща директория на git"
-
-#: submodule.c:2124
-#, c-format
-msgid ""
-"Migrating git directory of '%s%s' from\n"
-"'%s' to\n"
-"'%s'\n"
-msgstr ""
-"Мигриране на директорията на git — „%s%s“ от:\n"
-"„%s“ към\n"
-"„%s“\n"
-
-#: submodule.c:2255
-msgid "could not start ls-files in .."
-msgstr "„ls-stat“ не може да се стартира в „..“"
-
-#: submodule.c:2295
-#, c-format
-msgid "ls-tree returned unexpected return code %d"
-msgstr "„ls-tree“ завърши с неочакван изходен код: %d"
-
-#: symlinks.c:244
-#, c-format
-msgid "failed to lstat '%s'"
-msgstr "не може да бъде получена информация чрез „lstat“ за „%s“"
-
-#: trailer.c:244
-#, c-format
-msgid "running trailer command '%s' failed"
-msgstr "неуспешно изпълнение на завършващата команда „%s“"
-
-#: 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 "непозната стойност „%s“ за настройката „%s“"
-
-#: 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 "стойността „%s“ се повтаря в настройките"
-
-#: trailer.c:743
-#, c-format
-msgid "empty trailer token in trailer '%.*s'"
-msgstr "празна завършваща лексема в епилога „%.*s“"
-
-#: trailer.c:763
-#, c-format
-msgid "could not read input file '%s'"
-msgstr "входният файл „%s“ не може да бъде прочетен"
-
-#: trailer.c:766 builtin/mktag.c:89 imap-send.c:1573
-msgid "could not read from stdin"
-msgstr "от стандартния вход не може да се чете"
-
-#: trailer.c:1024 wrapper.c:684
-#, c-format
-msgid "could not stat %s"
-msgstr "Не може да се получи информация чрез „stat“ за „%s“"
-
-#: trailer.c:1026
-#, c-format
-msgid "file %s is not a regular file"
-msgstr "„%s“ не е обикновен файл"
-
-#: trailer.c:1028
-#, c-format
-msgid "file %s is not writable by user"
-msgstr "„%s“: няма права за записване на файла"
-
-#: trailer.c:1040
-msgid "could not open temporary file"
-msgstr "временният файл не може да се отвори"
-
-#: trailer.c:1080
-#, c-format
-msgid "could not rename temporary file to %s"
-msgstr "временният файл не може да се преименува на „%s“"
-
-#: transport-helper.c:62 transport-helper.c:91
-msgid "full write to remote helper failed"
-msgstr "неуспешен пълен запис към насрещната помощна програма"
-
-#: transport-helper.c:145
-#, c-format
-msgid "unable to find remote helper for '%s'"
-msgstr "насрещната помощна програма за „%s“ не може да бъде открита"
-
-#: transport-helper.c:161 transport-helper.c:575
-msgid "can't dup helper output fd"
-msgstr ""
-"файловият дескриптор от насрещната помощна програма не може да се дублира с "
-"„dup“"
-
-#: transport-helper.c:214
-#, c-format
-msgid ""
-"unknown mandatory capability %s; this remote helper probably needs newer "
-"version of Git"
-msgstr ""
-"непозната задължителна способност „%s“.  Насрещната помощна програма "
-"вероятно изисква нова версия на Git"
-
-#: transport-helper.c:220
-msgid "this remote helper should implement refspec capability"
-msgstr ""
-"насрещната помощна програма трябва да поддържа способност за изброяване на "
-"указатели"
-
-#: transport-helper.c:287 transport-helper.c:429
-#, c-format
-msgid "%s unexpectedly said: '%s'"
-msgstr "„%s“ неочаквано върна: „%s“"
-
-#: transport-helper.c:417
-#, c-format
-msgid "%s also locked %s"
-msgstr "„%s“ заключи и „%s“"
-
-#: transport-helper.c:497
-msgid "couldn't run fast-import"
-msgstr "неуспешно изпълнение на бързо внасяне"
-
-#: transport-helper.c:520
-msgid "error while running fast-import"
-msgstr "грешка при изпълнението на бързо внасяне"
-
-#: transport-helper.c:549 transport-helper.c:1251
-#, c-format
-msgid "could not read ref %s"
-msgstr "указателят „%s“ не може да се прочете"
-
-#: transport-helper.c:594
-#, c-format
-msgid "unknown response to connect: %s"
-msgstr "неочакван отговор при свързване: „%s“"
-
-#: transport-helper.c:616
-msgid "setting remote service path not supported by protocol"
-msgstr "протоколът не поддържа задаването на път на отдалечената услуга"
-
-#: transport-helper.c:618
-msgid "invalid remote service path"
-msgstr "неправилен път на отдалечената услуга"
-
-#: transport-helper.c:661 transport.c:1479
-msgid "operation not supported by protocol"
-msgstr "опцията не се поддържа от протокола"
-
-#: transport-helper.c:664
-#, c-format
-msgid "can't connect to subservice %s"
-msgstr "неуспешно свързване към подуслугата „%s“"
-
-#: transport-helper.c:693 transport.c:404
-msgid "--negotiate-only requires protocol v2"
-msgstr "опцията „--negotiate-only“ изисква версия 2 на протокола"
-
-#: transport-helper.c:755
-msgid "'option' without a matching 'ok/error' directive"
-msgstr "опция без съответстваща директива за успех или грешка"
-
-#: transport-helper.c:798
-#, c-format
-msgid "expected ok/error, helper said '%s'"
-msgstr ""
-"очаква се или успех, или грешка, но насрещната помощна програма върна „%s“"
-
-#: transport-helper.c:859
-#, c-format
-msgid "helper reported unexpected status of %s"
-msgstr "насрещната помощна програма завърши с неочакван изходен код: „%s“"
-
-#: transport-helper.c:942
-#, c-format
-msgid "helper %s does not support dry-run"
-msgstr "насрещната помощна програма „%s“ не поддържа проби „dry-run“"
-
-#: transport-helper.c:945
-#, c-format
-msgid "helper %s does not support --signed"
-msgstr "насрещната помощна програма „%s“ не поддържа опцията „--signed“"
-
-#: transport-helper.c:948
-#, c-format
-msgid "helper %s does not support --signed=if-asked"
-msgstr ""
-"насрещната помощна програма „%s“ не поддържа опцията „--signed=if-asked“"
-
-#: transport-helper.c:953
-#, c-format
-msgid "helper %s does not support --atomic"
-msgstr "насрещната помощна програма „%s“ не поддържа опцията „--atomic“"
-
-#: transport-helper.c:957
-#, c-format
-msgid "helper %s does not support --%s"
-msgstr "насрещната помощна програма „%s“ не поддържа опцията „%s“"
-
-#: transport-helper.c:964
-#, c-format
-msgid "helper %s does not support 'push-option'"
-msgstr "насрещната помощна програма „%s“ не поддържа опции за изтласкване"
-
-#: transport-helper.c:1064
-msgid "remote-helper doesn't support push; refspec needed"
-msgstr ""
-"насрещната помощна програма не поддържа изтласкване.  Необходимо е "
-"изброяване на указателите"
-
-#: transport-helper.c:1069
-#, c-format
-msgid "helper %s does not support 'force'"
-msgstr "насрещната помощна програма „%s“ не поддържа опцията „--force“"
-
-#: transport-helper.c:1116
-msgid "couldn't run fast-export"
-msgstr "не може да се извърши бързо изнасяне"
-
-#: transport-helper.c:1121
-msgid "error while running fast-export"
-msgstr "грешка при изпълнението на командата за бързо изнасяне"
-
-#: 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 ""
-"Няма общи указатели, не са указани никакви указатели —\n"
-"нищо няма да бъде направено.  Пробвайте да укажете клон.\n"
-
-#: transport-helper.c:1228
-#, c-format
-msgid "unsupported object format '%s'"
-msgstr "обект с неподдържан формат „%s“"
-
-#: transport-helper.c:1237
-#, c-format
-msgid "malformed response in ref list: %s"
-msgstr "неправилен отговор в списъка с указатели: „%s“"
-
-#: transport-helper.c:1389
-#, c-format
-msgid "read(%s) failed"
-msgstr "неуспешно четене на „%s“"
-
-#: transport-helper.c:1416
-#, c-format
-msgid "write(%s) failed"
-msgstr "неуспешен запис в „%s“"
-
-#: transport-helper.c:1465
-#, c-format
-msgid "%s thread failed"
-msgstr "неуспешно изпълнение на нишката „%s“"
-
-#: transport-helper.c:1469
-#, c-format
-msgid "%s thread failed to join: %s"
-msgstr "завършването на нишката „%s“ не може да се изчака: „%s“"
-
-#: transport-helper.c:1488 transport-helper.c:1492
-#, c-format
-msgid "can't start thread for copying data: %s"
-msgstr "неуспешно стартиране на нишка за копиране на данните: „%s“"
-
-#: transport-helper.c:1529
-#, c-format
-msgid "%s process failed to wait"
-msgstr "процесът на „%s“ не успя да изчака чрез „waitpid“"
-
-#: transport-helper.c:1533
-#, c-format
-msgid "%s process failed"
-msgstr "неуспешно изпълнение на „%s“"
-
-#: transport-helper.c:1551 transport-helper.c:1560
-msgid "can't start thread for copying data"
-msgstr "неуспешно стартиране на нишка за копиране на данните"
-
-#: transport.c:116
 #, c-format
-msgid "Would set upstream of '%s' to '%s' of '%s'\n"
-msgstr "Клонът „%s“ ще следи „%s“ от „%s“\n"
-
-#: transport.c:145
-#, c-format
-msgid "could not read bundle '%s'"
-msgstr "пратката на git „%s“ не може да бъде прочетена"
-
-#: transport.c:227
-#, c-format
-msgid "transport: invalid depth option '%s'"
-msgstr "transport: неправилна опция за дълбочина: %s"
-
-#: transport.c:279
-msgid "see protocol.version in 'git help config' for more details"
-msgstr ""
-"За повече информация вижте раздела „protocol.version“ в „git help config“"
-
-#: transport.c:280
-msgid "server options require protocol version 2 or later"
-msgstr "опциите на сървъра изискват поне версия 2 на протокола"
-
-#: transport.c:407
-msgid "server does not support wait-for-done"
-msgstr "сървърът не поддържа „wait-for-done“"
-
-#: transport.c:759
-msgid "could not parse transport.color.* config"
-msgstr "стойността на настройката „transport.color.*“ не може да се разпознае"
-
-#: transport.c:834
-msgid "support for protocol v2 not implemented yet"
-msgstr "протокол версия 2 все още не се поддържа"
-
-#: transport.c:967
-#, c-format
-msgid "unknown value for config '%s': %s"
-msgstr "непозната стойност за настройката „%s“: „%s“"
+msgid "submodule '%s': unable to find submodule"
+msgstr "подмодул „%s“: подмодулът липсва"
 
-#: transport.c:1033
-#, c-format
-msgid "transport '%s' not allowed"
-msgstr "преносът по „%s“ не е позволен"
-
-#: transport.c:1082
-msgid "git-over-rsync is no longer supported"
-msgstr "командата „git-over-rsync“ вече не се поддържа"
-
-#: transport.c:1185
 #, c-format
 msgid ""
-"The following submodule paths contain changes that can\n"
-"not be found on any remote:\n"
-msgstr ""
-"Следните пътища за подмодули съдържат промени,\n"
-"които липсват от всички отдалечени хранилища:\n"
-
-#: transport.c:1189
-#, c-format
-msgid ""
-"\n"
-"Please try\n"
-"\n"
-"\tgit push --recurse-submodules=on-demand\n"
-"\n"
-"or cd to the path and use\n"
-"\n"
-"\tgit push\n"
-"\n"
-"to push them to a remote.\n"
-"\n"
+"You may try updating the submodules using 'git checkout %s && git submodule "
+"update --init'"
 msgstr ""
+"Може да обновите подмодулите с командата:\n"
 "\n"
-"Пробвайте да ги изтласкате чрез командата:\n"
-"\n"
-"    git push --recurse-submodules=on-demand\n"
-"\n"
-"или отидете в съответната директория и изпълнете:\n"
-"\n"
-"    git push\n"
-"\n"
-
-#: transport.c:1197
-msgid "Aborting."
-msgstr "Преустановяване на действието."
-
-#: transport.c:1343
-msgid "failed to push all needed submodules"
-msgstr "неуспешно изтласкване на всички необходими подмодули"
-
-#: tree-walk.c:33
-msgid "too-short tree object"
-msgstr "прекалено кратък обект-дърво"
-
-#: tree-walk.c:39
-msgid "malformed mode in tree entry"
-msgstr "неправилни права за достъп в запис в дърво"
-
-#: tree-walk.c:43
-msgid "empty filename in tree entry"
-msgstr "празно име на файл в запис в дърво"
-
-#: tree-walk.c:118
-msgid "too-short tree file"
-msgstr "прекалено кратък файл-дърво"
-
-#: unpack-trees.c:118
-#, c-format
-msgid ""
-"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 ""
-"Изтеглянето ще презапише локалните промени на тези файлове:\n"
-"%%sПодайте или скатайте промените, за да преминете към нов клон."
-
-#: unpack-trees.c:120
-#, c-format
-msgid ""
-"Your local changes to the following files would be overwritten by checkout:\n"
-"%%s"
-msgstr ""
-"Изтеглянето ще презапише локалните промени на тези файлове:\n"
-"%%s"
-
-#: unpack-trees.c:123
-#, c-format
-msgid ""
-"Your local changes to the following files would be overwritten by merge:\n"
-"%%sPlease commit your changes or stash them before you merge."
-msgstr ""
-"Сливането ще презапише локалните промени на тези файлове:\n"
-"%%sПодайте или скатайте промените, за да слеете."
-
-#: unpack-trees.c:125
-#, c-format
-msgid ""
-"Your local changes to the following files would be overwritten by merge:\n"
-"%%s"
-msgstr ""
-"Сливането ще презапише локалните промени на тези файлове:\n"
-"%%s"
+"    git checkout %s && git submodule update --init"
 
-#: unpack-trees.c:128
 #, c-format
-msgid ""
-"Your local changes to the following files would be overwritten by %s:\n"
-"%%sPlease commit your changes or stash them before you %s."
-msgstr ""
-"„%s“ ще презапише локалните промени на тези файлове:\n"
-"%%sПодайте или скатайте промените, за да извършите „%s“."
+msgid "submodule '%s': cannot create branch '%s'"
+msgstr "подмодул „%s“: клонът „%s“ не може да се създаде"
 
-#: unpack-trees.c:130
 #, c-format
-msgid ""
-"Your local changes to the following files would be overwritten by %s:\n"
-"%%s"
-msgstr ""
-"„%s“ ще презапише локалните промени на тези файлове:\n"
-"%%s"
-
-#: unpack-trees.c:135
-#, c-format
-msgid ""
-"Updating the following directories would lose untracked files in them:\n"
-"%s"
-msgstr ""
-"Обновяването на следните директории ще изтрие неследените файлове в тях:\n"
-"%s"
-
-#: unpack-trees.c:138
-#, c-format
-msgid ""
-"Refusing to remove the current working directory:\n"
-"%s"
-msgstr ""
-"Текущата работна директория няма да бъде изтрита:\n"
-"%s"
-
-#: unpack-trees.c:142
-#, c-format
-msgid ""
-"The following untracked working tree files would be removed by checkout:\n"
-"%%sPlease move or remove them before you switch branches."
-msgstr ""
-"Изтеглянето ще изтрие тези неследени файлове в работното дърво:\n"
-"%%sПреместете ги или ги изтрийте, за да преминете на друг клон."
-
-#: unpack-trees.c:144
-#, c-format
-msgid ""
-"The following untracked working tree files would be removed by checkout:\n"
-"%%s"
-msgstr ""
-"Изтеглянето ще изтрие тези неследени файлове в работното дърво:\n"
-"%%s"
-
-#: unpack-trees.c:147
-#, c-format
-msgid ""
-"The following untracked working tree files would be removed by merge:\n"
-"%%sPlease move or remove them before you merge."
-msgstr ""
-"Сливането ще изтрие тези неследени файлове в работното дърво:\n"
-"%%sПреместете ги или ги изтрийте, за да слеете."
-
-#: unpack-trees.c:149
-#, c-format
-msgid ""
-"The following untracked working tree files would be removed by merge:\n"
-"%%s"
-msgstr ""
-"Сливането ще изтрие тези неследени файлове в работното дърво:\n"
-"%%s"
-
-#: unpack-trees.c:152
-#, c-format
-msgid ""
-"The following untracked working tree files would be removed by %s:\n"
-"%%sPlease move or remove them before you %s."
-msgstr ""
-"„%s“ ще изтрие тези неследени файлове в работното дърво:\n"
-"%%sПреместете ги или ги изтрийте, за да извършите „%s“."
-
-#: unpack-trees.c:154
-#, c-format
-msgid ""
-"The following untracked working tree files would be removed by %s:\n"
-"%%s"
-msgstr ""
-"„%s“ ще изтрие тези неследени файлове в работното дърво:\n"
-"%%s"
-
-#: unpack-trees.c:160
-#, c-format
-msgid ""
-"The following untracked working tree files would be overwritten by "
-"checkout:\n"
-"%%sPlease move or remove them before you switch branches."
-msgstr ""
-"Изтеглянето ще презапише тези неследени файлове в работното дърво:\n"
-"%%sПреместете ги или ги изтрийте, за да смените клон."
-
-#: unpack-trees.c:162
-#, c-format
-msgid ""
-"The following untracked working tree files would be overwritten by "
-"checkout:\n"
-"%%s"
-msgstr ""
-"Изтеглянето ще презапише тези неследени файлове в работното дърво:\n"
-"%%s"
-
-#: unpack-trees.c:165
-#, c-format
-msgid ""
-"The following untracked working tree files would be overwritten by merge:\n"
-"%%sPlease move or remove them before you merge."
-msgstr ""
-"Сливането ще презапише тези неследени файлове в работното дърво:\n"
-"%%sПреместете ги или ги изтрийте, за да слеете."
-
-#: unpack-trees.c:167
-#, c-format
-msgid ""
-"The following untracked working tree files would be overwritten by merge:\n"
-"%%s"
-msgstr ""
-"Сливането ще презапише тези неследени файлове в работното дърво:\n"
-"%%s"
-
-#: unpack-trees.c:170
-#, c-format
-msgid ""
-"The following untracked working tree files would be overwritten by %s:\n"
-"%%sPlease move or remove them before you %s."
-msgstr ""
-"„%s“ ще презапише тези неследени файлове в работното дърво:\n"
-"%%sПреместете ги или ги изтрийте, за да извършите „%s“."
-
-#: unpack-trees.c:172
-#, c-format
-msgid ""
-"The following untracked working tree files would be overwritten by %s:\n"
-"%%s"
-msgstr ""
-"„%s“ ще презапише тези неследени файлове в работното дърво:\n"
-"%%s"
-
-#: unpack-trees.c:180
-#, c-format
-msgid "Entry '%s' overlaps with '%s'.  Cannot bind."
-msgstr "Записът за „%s“ съвпада с този за „%s“.  Не може да се присвои."
-
-#: unpack-trees.c:183
-#, c-format
-msgid ""
-"Cannot update submodule:\n"
-"%s"
-msgstr ""
-"Подмодулът не може да бъде обновен:\n"
-"„%s“"
-
-#: unpack-trees.c:186
-#, c-format
-msgid ""
-"The following paths are not up to date and were left despite sparse "
-"patterns:\n"
-"%s"
-msgstr ""
-"Следните пътища не обновени и са оставени въпреки шаблоните за частично "
-"изтегляне:\n"
-"%s"
-
-#: unpack-trees.c:188
-#, c-format
-msgid ""
-"The following paths are unmerged and were left despite sparse patterns:\n"
-"%s"
-msgstr ""
-"Следните пътища не са слети и са оставени въпреки шаблоните за частично "
-"изтегляне:\n"
-"%s"
-
-#: unpack-trees.c:190
-#, c-format
-msgid ""
-"The following paths were already present and thus not updated despite sparse "
-"patterns:\n"
-"%s"
-msgstr ""
-"Следните пътища вече съществуваха и са оставени въпреки шаблоните за "
-"частично изтегляне:\n"
-"%s"
-
-#: unpack-trees.c:270
-#, c-format
-msgid "Aborting\n"
-msgstr "Преустановяване на действието\n"
-
-#: unpack-trees.c:297
-#, c-format
-msgid ""
-"After fixing the above paths, you may want to run `git sparse-checkout "
-"reapply`.\n"
-msgstr ""
-"След корекцията на грешките в пътищата по-горе, вероятно ще трябва\n"
-"да изпълните командата:\n"
-"\n"
-"    git sparse-checkout reapply\n"
-
-#: unpack-trees.c:358
-msgid "Updating files"
-msgstr "Обновяване на файлове"
-
-#: unpack-trees.c:390
-msgid ""
-"the following paths have collided (e.g. case-sensitive paths\n"
-"on a case-insensitive filesystem) and only one from the same\n"
-"colliding group is in the working tree:\n"
-msgstr ""
-"следните пътища са в конфликт (напр. при разлика в регистъра\n"
-"във файлови системи, които не различават главни от малки букви)\n"
-"и само един от участниците в конфликта е в работното дърво:\n"
-
-#: unpack-trees.c:1636
-msgid "Updating index flags"
-msgstr "Обновяване на флаговете на индекса"
-
-#: unpack-trees.c:2803
-#, c-format
-msgid "worktree and untracked commit have duplicate entries: %s"
-msgstr ""
-"работното дърво и неследеното подаване съдържат повтарящи се обекти: %s"
-
-#: upload-pack.c:1565
-msgid "expected flush after fetch arguments"
-msgstr "след аргументите на „fetch“ се очаква изчистване на буферите"
-
-#: urlmatch.c:163
-msgid "invalid URL scheme name or missing '://' suffix"
-msgstr "неправилна схема за адрес или суфиксът „://“ липсва"
-
-#: urlmatch.c:187 urlmatch.c:346 urlmatch.c:405
-#, c-format
-msgid "invalid %XX escape sequence"
-msgstr "неправилна екранираща последователност „%XX“"
-
-#: urlmatch.c:215
-msgid "missing host and scheme is not 'file:'"
-msgstr "не е указана машина, а схемата не е „file:“"
-
-#: urlmatch.c:232
-msgid "a 'file:' URL may not have a port number"
-msgstr "при схема „file:“ не може да указвате номер на порт"
-
-#: urlmatch.c:247
-msgid "invalid characters in host name"
-msgstr "неправилни знаци в името на машина"
-
-#: urlmatch.c:292 urlmatch.c:303
-msgid "invalid port number"
-msgstr "неправилен номер на порт"
-
-#: urlmatch.c:371
-msgid "invalid '..' path segment"
-msgstr "неправилна част от пътя „..“"
-
-#: walker.c:170
-msgid "Fetching objects"
-msgstr "Доставяне на обектите"
-
-#: worktree.c:238 builtin/am.c:2209 builtin/bisect--helper.c:156
-#, c-format
-msgid "failed to read '%s'"
-msgstr "„%s“ не може да бъде прочетен"
-
-#: worktree.c:305
-#, c-format
-msgid "'%s' at main working tree is not the repository directory"
-msgstr "„%s“ в основното работно дърво не е директорията на хранилището"
-
-#: worktree.c:316
-#, c-format
-msgid "'%s' file does not contain absolute path to the working tree location"
-msgstr ""
-"файлът „%s“ не съдържа абсолютния път към местоположението на работното дърво"
-
-#: worktree.c:328
-#, c-format
-msgid "'%s' does not exist"
-msgstr "„%s“ не съществува."
-
-#: worktree.c:334
-#, c-format
-msgid "'%s' is not a .git file, error code %d"
-msgstr "„%s“ не е файл на .git, код за грешка: %d"
-
-#: worktree.c:343
-#, c-format
-msgid "'%s' does not point back to '%s'"
-msgstr "„%s“ не сочи към обратно към „%s“"
-
-#: worktree.c:604
-msgid "not a directory"
-msgstr "не е директория"
-
-#: worktree.c:613
-msgid ".git is not a file"
-msgstr "„.git“ не е файл"
-
-#: worktree.c:615
-msgid ".git file broken"
-msgstr "„.git“ е повреден"
-
-#: worktree.c:617
-msgid ".git file incorrect"
-msgstr "„.git“ е неправилен"
-
-#: worktree.c:723
-msgid "not a valid path"
-msgstr "неправилен път"
-
-#: worktree.c:729
-msgid "unable to locate repository; .git is not a file"
-msgstr "не може да се открие хранилище: „.git“ не е файл"
-
-#: worktree.c:733
-msgid "unable to locate repository; .git file does not reference a repository"
-msgstr "не може да се открие хранилище: файлът „.git“ не сочи към хранилище"
-
-#: worktree.c:737
-msgid "unable to locate repository; .git file broken"
-msgstr "не може да се открие хранилище: „.git“ е повреден"
-
-#: worktree.c:743
-msgid "gitdir unreadable"
-msgstr "директорията „gitdir“ не може да се прочете"
-
-#: worktree.c:747
-msgid "gitdir incorrect"
-msgstr "неправилна директория „gitdir“"
-
-#: worktree.c:772
-msgid "not a valid directory"
-msgstr "не е валидна директория"
-
-#: worktree.c:778
-msgid "gitdir file does not exist"
-msgstr "файлът „gitdir“ не съществува"
-
-#: worktree.c:783 worktree.c:792
-#, c-format
-msgid "unable to read gitdir file (%s)"
-msgstr "файлът „gitdir“ не може да бъде прочетен (%s)"
-
-#: worktree.c:802
-#, c-format
-msgid "short read (expected %<PRIuMAX> bytes, read %<PRIuMAX>)"
-msgstr ""
-"изчитането върна по-малко байтове от очакваното (очаквани: %<PRIuMAX> байта, "
-"получени: %<PRIuMAX>)"
-
-#: worktree.c:810
-msgid "invalid gitdir file"
-msgstr "неправилен файл „gitdir“"
-
-#: worktree.c:818
-msgid "gitdir file points to non-existent location"
-msgstr "файлът „gitdir“ сочи несъществуващо местоположение"
-
-#: 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:406 wrapper.c:607
-#, c-format
-msgid "unable to access '%s'"
-msgstr "няма достъп до „%s“"
-
-#: wrapper.c:615
-msgid "unable to get current working directory"
-msgstr "текущата работна директория е недостъпна"
-
-#: wt-status.c:158
-msgid "Unmerged paths:"
-msgstr "Неслети пътища:"
-
-#: wt-status.c:187 wt-status.c:219
-msgid "  (use \"git restore --staged <file>...\" to unstage)"
-msgstr ""
-"  (използвайте „git restore --staged ФАЙЛ…“, за да извадите ФАЙЛа от индекса)"
-
-#: wt-status.c:190 wt-status.c:222
-#, c-format
-msgid "  (use \"git restore --source=%s --staged <file>...\" to unstage)"
-msgstr ""
-"  (използвайте „git restore --source=%s --staged ФАЙЛ…“, за да извадите "
-"ФАЙЛа от индекса)"
-
-#: wt-status.c:193 wt-status.c:225
-msgid "  (use \"git rm --cached <file>...\" to unstage)"
-msgstr ""
-"  (използвайте „git rm --cached %s ФАЙЛ…“, за да извадите ФАЙЛа от индекса)"
-
-#: wt-status.c:197
-msgid "  (use \"git add <file>...\" to mark resolution)"
-msgstr ""
-"  (използвайте „git add ФАЙЛ…“, за да укажете разрешаването на конфликта)"
-
-#: wt-status.c:199 wt-status.c:203
-msgid "  (use \"git add/rm <file>...\" as appropriate to mark resolution)"
-msgstr ""
-"  (използвайте „git add/rm ФАЙЛ…“, според решението, което избирате за "
-"конфликта)"
-
-#: wt-status.c:201
-msgid "  (use \"git rm <file>...\" to mark resolution)"
-msgstr ""
-"  (използвайте „git rm ФАЙЛ…“, за да укажете разрешаването на конфликта)"
-
-#: wt-status.c:211 wt-status.c:1131
-msgid "Changes to be committed:"
-msgstr "Промени, които ще бъдат подадени:"
-
-#: wt-status.c:234 wt-status.c:1140
-msgid "Changes not staged for commit:"
-msgstr "Промени, които не са в индекса за подаване:"
-
-#: wt-status.c:238
-msgid "  (use \"git add <file>...\" to update what will be committed)"
-msgstr ""
-"  (използвайте „git add ФАЙЛ…“, за да обновите съдържанието за подаване)"
-
-#: wt-status.c:240
-msgid "  (use \"git add/rm <file>...\" to update what will be committed)"
-msgstr ""
-"  (използвайте „git add/rm ФАЙЛ…“, за да обновите съдържанието за подаване)"
-
-#: wt-status.c:241
-msgid ""
-"  (use \"git restore <file>...\" to discard changes in working directory)"
-msgstr ""
-"  (използвайте „git restore ФАЙЛ…“, за да отхвърлите промените в работната "
-"директория)"
-
-#: wt-status.c:243
-msgid "  (commit or discard the untracked or modified content in submodules)"
-msgstr ""
-"  (подайте или отхвърлете неследеното или промененото съдържание в "
-"подмодулите)"
-
-#: wt-status.c:254
-#, c-format
-msgid "  (use \"git %s <file>...\" to include in what will be committed)"
-msgstr ""
-"  (използвайте „git %s ФАЙЛ…“, за да определите какво включвате в подаването)"
-
-#: wt-status.c:266
-msgid "both deleted:"
-msgstr "изтрити в двата случая:"
-
-#: wt-status.c:268
-msgid "added by us:"
-msgstr "добавени от вас:"
-
-#: wt-status.c:270
-msgid "deleted by them:"
-msgstr "изтрити от тях:"
-
-#: wt-status.c:272
-msgid "added by them:"
-msgstr "добавени от тях:"
-
-#: wt-status.c:274
-msgid "deleted by us:"
-msgstr "изтрити от вас:"
-
-#: wt-status.c:276
-msgid "both added:"
-msgstr "добавени и в двата случая:"
-
-#: wt-status.c:278
-msgid "both modified:"
-msgstr "променени и в двата случая:"
-
-#: wt-status.c:288
-msgid "new file:"
-msgstr "нов файл:"
-
-#: wt-status.c:290
-msgid "copied:"
-msgstr "копиран:"
-
-#: wt-status.c:292
-msgid "deleted:"
-msgstr "изтрит:"
-
-#: wt-status.c:294
-msgid "modified:"
-msgstr "променен:"
-
-#: wt-status.c:296
-msgid "renamed:"
-msgstr "преименуван:"
-
-#: wt-status.c:298
-msgid "typechange:"
-msgstr "смяна на вида:"
-
-#: wt-status.c:300
-msgid "unknown:"
-msgstr "непозната промяна:"
-
-#: wt-status.c:302
-msgid "unmerged:"
-msgstr "неслят:"
-
-#: wt-status.c:382
-msgid "new commits, "
-msgstr "нови подавания, "
-
-#: wt-status.c:384
-msgid "modified content, "
-msgstr "променено съдържание, "
-
-#: wt-status.c:386
-msgid "untracked content, "
-msgstr "неследено съдържание, "
-
-#: wt-status.c:964
-#, c-format
-msgid "Your stash currently has %d entry"
-msgid_plural "Your stash currently has %d entries"
-msgstr[0] "Има %d скатаване."
-msgstr[1] "Има %d скатавания."
-
-#: wt-status.c:995
-msgid "Submodules changed but not updated:"
-msgstr "Подмодулите са променени, но не са обновени:"
-
-#: wt-status.c:997
-msgid "Submodule changes to be committed:"
-msgstr "Промени в подмодулите за подаване:"
-
-#: wt-status.c:1079
-msgid ""
-"Do not modify or remove the line above.\n"
-"Everything below it will be ignored."
-msgstr ""
-"Не променяйте и не изтривайте горния ред.\n"
-"Всичко отдолу ще бъде изтрито."
-
-#: wt-status.c:1171
-#, c-format
-msgid ""
-"\n"
-"It took %.2f seconds to compute the branch ahead/behind values.\n"
-"You can use '--no-ahead-behind' to avoid this.\n"
-msgstr ""
-"\n"
-"Изчисляването на броя различаващи се подавания отне %.2f сек.\n"
-"За да избегнете това, ползвайте „--no-ahead-behind“.\n"
-
-#: wt-status.c:1201
-msgid "You have unmerged paths."
-msgstr "Някои пътища не са слети."
-
-#: wt-status.c:1204
-msgid "  (fix conflicts and run \"git commit\")"
-msgstr "  (коригирайте конфликтите и изпълнете „git commit“)"
-
-#: wt-status.c:1206
-msgid "  (use \"git merge --abort\" to abort the merge)"
-msgstr "  (използвайте „git merge --abort“, за да преустановите сливането)"
-
-#: wt-status.c:1210
-msgid "All conflicts fixed but you are still merging."
-msgstr "Всички конфликти са решени, но продължавате сливането."
-
-#: wt-status.c:1213
-msgid "  (use \"git commit\" to conclude merge)"
-msgstr "  (използвайте „git commit“, за да завършите сливането)"
-
-#: wt-status.c:1224
-msgid "You are in the middle of an am session."
-msgstr "В момента прилагате поредица от кръпки чрез „git am“."
-
-#: wt-status.c:1227
-msgid "The current patch is empty."
-msgstr "Текущата кръпка е празна."
-
-#: wt-status.c:1232
-msgid "  (fix conflicts and then run \"git am --continue\")"
-msgstr "  (коригирайте конфликтите и изпълнете „git am --continue“)"
-
-#: wt-status.c:1234
-msgid "  (use \"git am --skip\" to skip this patch)"
-msgstr "  (използвайте „git am --skip“, за да пропуснете тази кръпка)"
-
-#: wt-status.c:1237
-msgid ""
-"  (use \"git am --allow-empty\" to record this patch as an empty commit)"
-msgstr ""
-"  (използвайте „git am --allow-empty“, за да включите кръпката като празно "
-"подаване)"
-
-#: wt-status.c:1239
-msgid "  (use \"git am --abort\" to restore the original branch)"
-msgstr ""
-"  (използвайте „git am --abort“, за да възстановите първоначалния клон)"
-
-#: wt-status.c:1372
-msgid "git-rebase-todo is missing."
-msgstr "„git-rebase-todo“ липсва."
-
-#: wt-status.c:1374
-msgid "No commands done."
-msgstr "Не са изпълнени команди."
-
-#: wt-status.c:1377
-#, c-format
-msgid "Last command done (%d command done):"
-msgid_plural "Last commands done (%d commands done):"
-msgstr[0] "Последно изпълнена команда (изпълнена е общо %d команда):"
-msgstr[1] "Последно изпълнени команди (изпълнени са общо %d команди):"
-
-#: wt-status.c:1388
-#, c-format
-msgid "  (see more in file %s)"
-msgstr "  (повече информация има във файла „%s“)"
-
-#: wt-status.c:1393
-msgid "No commands remaining."
-msgstr "Не остават повече команди."
-
-#: wt-status.c:1396
-#, c-format
-msgid "Next command to do (%d remaining command):"
-msgid_plural "Next commands to do (%d remaining commands):"
-msgstr[0] "Следваща команда за изпълнение (остава още %d команда):"
-msgstr[1] "Следващи команди за изпълнение (остават още %d команди):"
-
-#: wt-status.c:1404
-msgid "  (use \"git rebase --edit-todo\" to view and edit)"
-msgstr ""
-"  (използвайте „git rebase --edit-todo“, за да разгледате и редактирате)"
-
-#: wt-status.c:1416
-#, c-format
-msgid "You are currently rebasing branch '%s' on '%s'."
-msgstr "В момента пребазирате клона „%s“ върху „%s“."
-
-#: wt-status.c:1421
-msgid "You are currently rebasing."
-msgstr "В момента пребазирате."
-
-#: wt-status.c:1434
-msgid "  (fix conflicts and then run \"git rebase --continue\")"
-msgstr "  (коригирайте конфликтите и използвайте „git rebase --continue“)"
-
-#: wt-status.c:1436
-msgid "  (use \"git rebase --skip\" to skip this patch)"
-msgstr "  (използвайте „git rebase --skip“, за да пропуснете тази кръпка)"
-
-#: wt-status.c:1438
-msgid "  (use \"git rebase --abort\" to check out the original branch)"
-msgstr ""
-"  (използвайте „git rebase --abort“, за да възстановите първоначалния клон)"
-
-#: wt-status.c:1445
-msgid "  (all conflicts fixed: run \"git rebase --continue\")"
-msgstr "  (всички конфликти са коригирани: изпълнете „git rebase --continue“)"
-
-#: wt-status.c:1449
-#, c-format
-msgid ""
-"You are currently splitting a commit while rebasing branch '%s' on '%s'."
-msgstr "В момента разделяте подаване докато пребазирате клона „%s“ върху „%s“."
-
-#: wt-status.c:1454
-msgid "You are currently splitting a commit during a rebase."
-msgstr "В момента разделяте подаване докато пребазирате."
-
-#: wt-status.c:1457
-msgid "  (Once your working directory is clean, run \"git rebase --continue\")"
-msgstr ""
-"  (След като работното ви дърво стане чисто, използвайте „git rebase --"
-"continue“)"
-
-#: wt-status.c:1461
-#, c-format
-msgid "You are currently editing a commit while rebasing branch '%s' on '%s'."
-msgstr ""
-"В момента редактирате подаване докато пребазирате клона „%s“ върху „%s“."
-
-#: wt-status.c:1466
-msgid "You are currently editing a commit during a rebase."
-msgstr "В момента редактирате подаване докато пребазирате."
-
-#: wt-status.c:1469
-msgid "  (use \"git commit --amend\" to amend the current commit)"
-msgstr ""
-"  (използвайте „git commit --amend“, за да редактирате текущото подаване)"
-
-#: wt-status.c:1471
-msgid ""
-"  (use \"git rebase --continue\" once you are satisfied with your changes)"
-msgstr ""
-"  (използвайте „git rebase --continue“, след като завършите промените си)"
-
-#: wt-status.c:1482
-msgid "Cherry-pick currently in progress."
-msgstr "В момента се извършва отбиране на подавания."
-
-#: wt-status.c:1485
-#, c-format
-msgid "You are currently cherry-picking commit %s."
-msgstr "В момента отбирате подаването „%s“."
-
-#: wt-status.c:1492
-msgid "  (fix conflicts and run \"git cherry-pick --continue\")"
-msgstr "  (коригирайте конфликтите и изпълнете „git cherry-pick --continue“)"
-
-#: wt-status.c:1495
-msgid "  (run \"git cherry-pick --continue\" to continue)"
-msgstr "  (за да продължите, изпълнете „git cherry-pick --continue“)"
-
-#: wt-status.c:1498
-msgid "  (all conflicts fixed: run \"git cherry-pick --continue\")"
-msgstr ""
-"  (всички конфликти са коригирани, изпълнете „git cherry-pick --continue“)"
-
-#: wt-status.c:1500
-msgid "  (use \"git cherry-pick --skip\" to skip this patch)"
-msgstr "  (използвайте „git cherry-pick --skip“, за да пропуснете тази кръпка)"
-
-#: wt-status.c:1502
-msgid "  (use \"git cherry-pick --abort\" to cancel the cherry-pick operation)"
-msgstr ""
-"  (използвайте „git cherry-pick --abort“, за да отмените всички действия с "
-"отбиране)"
-
-#: wt-status.c:1512
-msgid "Revert currently in progress."
-msgstr "В момента тече отмяна на подаване."
-
-#: wt-status.c:1515
-#, c-format
-msgid "You are currently reverting commit %s."
-msgstr "В момента отменяте подаване „%s“."
-
-#: wt-status.c:1521
-msgid "  (fix conflicts and run \"git revert --continue\")"
-msgstr "  (коригирайте конфликтите и изпълнете „git revert --continue“)"
-
-#: wt-status.c:1524
-msgid "  (run \"git revert --continue\" to continue)"
-msgstr "  (за да продължите, изпълнете „git revert --continue“)"
-
-#: wt-status.c:1527
-msgid "  (all conflicts fixed: run \"git revert --continue\")"
-msgstr "  (всички конфликти са коригирани, изпълнете „git revert --continue“)"
-
-#: wt-status.c:1529
-msgid "  (use \"git revert --skip\" to skip this patch)"
-msgstr "  (използвайте „git revert --skip“, за да пропуснете тази кръпка)"
-
-#: wt-status.c:1531
-msgid "  (use \"git revert --abort\" to cancel the revert operation)"
-msgstr ""
-"  (използвайте „git revert --abort“, за да преустановите отмяната на "
-"подаване)"
-
-#: wt-status.c:1541
-#, c-format
-msgid "You are currently bisecting, started from branch '%s'."
-msgstr "В момента търсите двоично, като сте стартирали от клон „%s“."
-
-#: wt-status.c:1545
-msgid "You are currently bisecting."
-msgstr "В момента търсите двоично."
-
-#: wt-status.c:1548
-msgid "  (use \"git bisect reset\" to get back to the original branch)"
-msgstr ""
-"  (използвайте „git bisect reset“, за да се върнете към първоначалното "
-"състояние и клон)"
-
-#: wt-status.c:1559
-msgid "You are in a sparse checkout."
-msgstr "Вие сте в частично изтегляне."
-
-#: wt-status.c:1562
-#, c-format
-msgid "You are in a sparse checkout with %d%% of tracked files present."
-msgstr ""
-"Намирате се в частично изтеглено хранилище с %d%% налични, следени файла."
-
-#: wt-status.c:1806
-msgid "On branch "
-msgstr "На клон "
-
-#: wt-status.c:1813
-msgid "interactive rebase in progress; onto "
-msgstr "извършвате интерактивно пребазиране върху "
-
-#: wt-status.c:1815
-msgid "rebase in progress; onto "
-msgstr "извършвате пребазиране върху "
-
-#: wt-status.c:1820
-msgid "HEAD detached at "
-msgstr "Указателят „HEAD“ не е свързан и е при "
-
-#: wt-status.c:1822
-msgid "HEAD detached from "
-msgstr "Указателят „HEAD“ не е свързан и е отделѐн от "
-
-#: wt-status.c:1825
-msgid "Not currently on any branch."
-msgstr "Извън всички клони."
-
-#: wt-status.c:1842
-msgid "Initial commit"
-msgstr "Първоначално подаване"
-
-#: wt-status.c:1843
-msgid "No commits yet"
-msgstr "Все още липсват подавания"
-
-#: wt-status.c:1857
-msgid "Untracked files"
-msgstr "Неследени файлове"
-
-#: wt-status.c:1859
-msgid "Ignored files"
-msgstr "Игнорирани файлове"
-
-#: wt-status.c:1863
-#, c-format
-msgid ""
-"It took %.2f seconds to enumerate untracked files. 'status -uno'\n"
-"may speed it up, but you have to be careful not to forget to add\n"
-"new files yourself (see 'git help status')."
-msgstr ""
-"Бяха необходими %.2f секунди за изброяването на неследените файлове.\n"
-"Добавянето на опцията „-uno“ към командата „git status“ ще ускори\n"
-"изпълнението, но ще трябва да добавяте новите файлове ръчно.\n"
-"За повече подробности погледнете „git status help“."
-
-#: wt-status.c:1869
-#, c-format
-msgid "Untracked files not listed%s"
-msgstr "Неследените файлове не са изведени%s"
-
-#: wt-status.c:1871
-msgid " (use -u option to show untracked files)"
-msgstr " (използвайте опцията „-u“, за да изведете неследените файлове)"
-
-#: wt-status.c:1877
-msgid "No changes"
-msgstr "Няма промени"
-
-#: wt-status.c:1882
-#, c-format
-msgid "no changes added to commit (use \"git add\" and/or \"git commit -a\")\n"
-msgstr ""
-"към индекса за подаване не са добавени промени (използвайте „git add“ и/или "
-"„git commit -a“)\n"
-
-#: wt-status.c:1886
-#, c-format
-msgid "no changes added to commit\n"
-msgstr "към индекса за подаване не са добавени промени\n"
-
-#: wt-status.c:1890
-#, c-format
-msgid ""
-"nothing added to commit but untracked files present (use \"git add\" to "
-"track)\n"
-msgstr ""
-"към индекса за подаване не са добавени промени, но има нови файлове "
-"(използвайте „git add“, за да започне тяхното следене)\n"
-
-#: wt-status.c:1894
-#, c-format
-msgid "nothing added to commit but untracked files present\n"
-msgstr "към индекса за подаване не са добавени промени, но има нови файлове\n"
-
-#: wt-status.c:1898
-#, c-format
-msgid "nothing to commit (create/copy files and use \"git add\" to track)\n"
-msgstr ""
-"липсват каквито и да е промени (създайте или копирайте файлове и използвайте "
-"„git add“, за да започне тяхното следене)\n"
-
-#: wt-status.c:1902 wt-status.c:1908
-#, c-format
-msgid "nothing to commit\n"
-msgstr "липсват каквито и да е промени\n"
-
-#: wt-status.c:1905
-#, c-format
-msgid "nothing to commit (use -u to show untracked files)\n"
-msgstr ""
-"липсват каквито и да е промени (използвайте опцията „-u“, за да се изведат и "
-"неследените файлове)\n"
-
-#: wt-status.c:1910
-#, c-format
-msgid "nothing to commit, working tree clean\n"
-msgstr "липсват каквито и да е промени, работното дърво е чисто\n"
-
-#: wt-status.c:2015
-msgid "No commits yet on "
-msgstr "Все още липсват подавания в "
-
-#: wt-status.c:2019
-msgid "HEAD (no branch)"
-msgstr "HEAD (извън клон)"
-
-#: wt-status.c:2050
-msgid "different"
-msgstr "различен"
-
-#: wt-status.c:2052 wt-status.c:2060
-msgid "behind "
-msgstr "назад с "
-
-#: wt-status.c:2055 wt-status.c:2058
-msgid "ahead "
-msgstr "напред с "
-
-#. TRANSLATORS: the action is e.g. "pull with rebase"
-#: wt-status.c:2596
-#, c-format
-msgid "cannot %s: You have unstaged changes."
-msgstr "не може да извършите „%s“, защото има промени, които не са в индекса."
-
-#: wt-status.c:2602
-msgid "additionally, your index contains uncommitted changes."
-msgstr "освен това в индекса има неподадени промени."
-
-#: wt-status.c:2604
-#, c-format
-msgid "cannot %s: Your index contains uncommitted changes."
-msgstr "не може да извършите „%s“, защото в индекса има неподадени промени."
-
-#: compat/simple-ipc/ipc-unix-socket.c:205
-msgid "could not send IPC command"
-msgstr "командата за комуникация между процеси не може да бъде пратена"
-
-#: compat/simple-ipc/ipc-unix-socket.c:212
-msgid "could not read IPC response"
-msgstr "отговорът за комуникацията между процеси не може да бъде прочетен"
-
-#: compat/simple-ipc/ipc-unix-socket.c:892
-#, c-format
-msgid "could not start accept_thread '%s'"
-msgstr "неуспешно изпълнение на „accept_thread“ върху нишката „%s“"
-
-#: compat/simple-ipc/ipc-unix-socket.c:904
-#, c-format
-msgid "could not start worker[0] for '%s'"
-msgstr "не може да се стартира нишката worker[0] за „%s“"
+msgid "'%s' is already checked out at '%s'"
+msgstr "„%s“ вече е изтеглен в „%s“"
 
-#: compat/precompose_utf8.c:58 builtin/clone.c:347
 #, c-format
-msgid "failed to unlink '%s'"
-msgstr "неуспешно изтриване на „%s“"
+msgid "HEAD of working tree %s is not updated"
+msgstr "Указателят „HEAD“ на работното дърво „%s“ не е обновен"
 
-#: builtin/add.c:26
 msgid "git add [<options>] [--] <pathspec>..."
 msgstr "git add [ОПЦИЯ…] [--] ПЪТ…"
 
-#: builtin/add.c:64
 #, c-format
 msgid "cannot chmod %cx '%s'"
 msgstr "правата на „%2$s“ не може да се зададат да са %1$cx"
 
-#: builtin/add.c:106
 #, c-format
 msgid "unexpected diff status %c"
 msgstr "неочакван изходен код при генериране на разлика: %c"
 
-#: builtin/add.c:111 builtin/commit.c:298
 msgid "updating files failed"
 msgstr "неуспешно обновяване на файловете"
 
-#: builtin/add.c:121
 #, c-format
 msgid "remove '%s'\n"
 msgstr "изтриване на „%s“\n"
 
-#: builtin/add.c:205
 msgid "Unstaged changes after refreshing the index:"
-msgstr "Промени, които и след обновяването на индекса не са добавени към него:"
+msgstr "Промѐни, които и след обновяването на индекса не са добавени към него:"
 
-#: builtin/add.c:313 builtin/rev-parse.c:993
 msgid "Could not read the index"
 msgstr "Индексът не може да бъде прочетен"
 
-#: builtin/add.c:326
 msgid "Could not write patch"
 msgstr "Кръпката не може да бъде записана"
 
-#: builtin/add.c:329
 msgid "editing patch failed"
 msgstr "неуспешно редактиране на кръпка"
 
-#: builtin/add.c:332
 #, c-format
 msgid "Could not stat '%s'"
 msgstr "Не може да се получи информация чрез „stat“ за файла „%s“"
 
-#: builtin/add.c:334
 msgid "Empty patch. Aborted."
 msgstr "Празна кръпка, преустановяване на действието."
 
-#: builtin/add.c:340
 #, c-format
 msgid "Could not apply '%s'"
 msgstr "Кръпката „%s“ не може да бъде приложена"
 
-#: builtin/add.c:348
 msgid "The following paths are ignored by one of your .gitignore files:\n"
 msgstr ""
 "Следните пътища ще бъдат игнорирани според някой от файловете „.gitignore“:\n"
 
-#: builtin/add.c:368 builtin/clean.c:927 builtin/fetch.c:174 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:369 builtin/check-ignore.c:22 builtin/commit.c:1484
-#: builtin/count-objects.c:98 builtin/fsck.c:789 builtin/log.c:2313
-#: builtin/mv.c:123 builtin/read-tree.c:120
 msgid "be verbose"
 msgstr "повече подробности"
 
-#: builtin/add.c:371
 msgid "interactive picking"
-msgstr "интерактивно отбиране на промени"
+msgstr "интерактивно отбиране на промѐни"
 
-#: builtin/add.c:372 builtin/checkout.c:1581 builtin/reset.c:409
 msgid "select hunks interactively"
 msgstr "интерактивен избор на парчета код"
 
-#: builtin/add.c:373
 msgid "edit current diff and apply"
 msgstr "редактиране на текущата разлика и прилагане"
 
-#: builtin/add.c:374
 msgid "allow adding otherwise ignored files"
 msgstr "добавяне и на иначе игнорираните файлове"
 
-#: builtin/add.c:375
 msgid "update tracked files"
 msgstr "обновяване на следените файлове"
 
-#: builtin/add.c:376
 msgid "renormalize EOL of tracked files (implies -u)"
 msgstr "уеднаквяване на знаците за край на файл (включва опцията „-u“)"
 
-#: builtin/add.c:377
 msgid "record only the fact that the path will be added later"
 msgstr "отбелязване само на факта, че пътят ще бъде добавен по-късно"
 
-#: builtin/add.c:378
 msgid "add changes from all tracked and untracked files"
-msgstr "добавяне на всички промени в следените и неследените файлове"
+msgstr "добавяне на всички промѐни в следените и неследените файлове"
 
-#: builtin/add.c:381
 msgid "ignore paths removed in the working tree (same as --no-all)"
 msgstr ""
 "игнориране на пътищата, които са изтрити от работното дърво (същото като „--"
 "no-all“)"
 
-#: builtin/add.c:383
 msgid "don't add, only refresh the index"
 msgstr "без добавяне на нови файлове, само обновяване на индекса"
 
-#: builtin/add.c:384
 msgid "just skip files which cannot be added because of errors"
 msgstr "прескачане на файловете, които не може да бъдат добавени поради грешки"
 
-#: builtin/add.c:385
 msgid "check if - even missing - files are ignored in dry run"
 msgstr ""
 "проверка, че при пробно изпълнение всички файлове, дори и изтритите, се "
 "игнорират"
 
-#: builtin/add.c:386 builtin/mv.c:128 builtin/rm.c:251
 msgid "allow updating entries outside of the sparse-checkout cone"
 msgstr ""
 "обновяване и на записите извън пътеводния сегмент на частичното изтегляне"
 
-#: builtin/add.c:388 builtin/update-index.c:1004
 msgid "override the executable bit of the listed files"
 msgstr "изрично задаване на стойността на флага дали файлът е изпълним"
 
-#: builtin/add.c:390
 msgid "warn when adding an embedded repository"
 msgstr "предупреждаване при добавяне на вградено хранилище"
 
-#: builtin/add.c:392
-msgid "backend for `git stash -p`"
-msgstr "реализация на „git stash -p“"
-
-#: builtin/add.c:410
 #, c-format
 msgid ""
 "You've added another git repository inside your current repository.\n"
@@ -10940,12 +2052,10 @@ msgstr ""
 "\n"
 "За повече информация погледнете „git help submodule“."
 
-#: builtin/add.c:439
 #, c-format
 msgid "adding embedded git repository: %s"
 msgstr "добавяне на вградено хранилище: %s"
 
-#: builtin/add.c:459
 msgid ""
 "Use -f if you really want to add them.\n"
 "Turn this message off by running\n"
@@ -10956,27 +2066,21 @@ msgstr ""
 "\n"
 "    git config advice.addIgnoredFile false"
 
-#: builtin/add.c:474
 msgid "adding files failed"
 msgstr "неуспешно добавяне на файлове"
 
-#: builtin/add.c:548
 #, c-format
 msgid "--chmod param '%s' must be either -x or +x"
 msgstr "параметърът към „--chmod“ — „%s“ може да е или „-x“, или „+x“"
 
-#: builtin/add.c:569 builtin/checkout.c:1751 builtin/commit.c:364
-#: builtin/reset.c:429 builtin/rm.c:275 builtin/stash.c:1713
 #, c-format
 msgid "'%s' and pathspec arguments cannot be used together"
 msgstr "опцията „%s“ и път са несъвместими"
 
-#: builtin/add.c:580
 #, c-format
 msgid "Nothing specified, nothing added.\n"
 msgstr "Нищо не е зададено и нищо не е добавено.\n"
 
-#: builtin/add.c:582
 msgid ""
 "Maybe you wanted to say 'git add .'?\n"
 "Turn this message off by running\n"
@@ -10987,70 +2091,78 @@ msgstr ""
 "\n"
 "    git config advice.addEmptyPathspec false"
 
-#: builtin/am.c:202
+msgid "index file corrupt"
+msgstr "файлът с индекса е повреден"
+
+#, c-format
+msgid "bad action '%s' for '%s'"
+msgstr "неправилно действие „%s“ за „%s“"
+
+#, c-format
+msgid "invalid value for '%s': '%s'"
+msgstr "неправилна стойност за „%s“: „%s“"
+
 #, c-format
-msgid "Invalid value for --empty: %s"
-msgstr "Неправилна стойност за „--empty“: „%s“"
+msgid "could not read '%s'"
+msgstr "файлът „%s“ не може да бъде прочетен"
 
-#: builtin/am.c:392
 msgid "could not parse author script"
 msgstr "скриптът за автор не може да се анализира"
 
-#: builtin/am.c:482
+#, c-format
+msgid "could not parse %s"
+msgstr "„%s“ не може да се анализира"
+
 #, c-format
 msgid "'%s' was deleted by the applypatch-msg hook"
 msgstr "„%s“ бе изтрит от куката „applypatch-msg“"
 
-#: builtin/am.c:524
 #, c-format
 msgid "Malformed input line: '%s'."
 msgstr "Даденият входен ред е с неправилен формат: „%s“."
 
-#: builtin/am.c:562
 #, c-format
 msgid "Failed to copy notes from '%s' to '%s'"
 msgstr "Бележката не може да се копира от „%s“ към „%s“"
 
-#: builtin/am.c:588
 msgid "fseek failed"
 msgstr "неуспешно изпълнение на „fseek“"
 
-#: builtin/am.c:776
+#, c-format
+msgid "could not open '%s' for reading"
+msgstr "файлът не може да бъде прочетен: „%s“"
+
+#, c-format
+msgid "could not open '%s' for writing"
+msgstr "„%s“ не може да бъде отворен за запис"
+
 #, c-format
 msgid "could not parse patch '%s'"
 msgstr "кръпката „%s“ не може да се анализира"
 
-#: builtin/am.c:841
 msgid "Only one StGIT patch series can be applied at once"
 msgstr ""
 "Само една поредица от кръпки от „StGIT“ може да бъде прилагана в даден момент"
 
-#: builtin/am.c:889
 msgid "invalid timestamp"
-msgstr "неправилна стойност за време"
+msgstr "неправилна стойност за времево клеймо"
 
-#: builtin/am.c:894 builtin/am.c:906
 msgid "invalid Date line"
 msgstr "неправилен ред за дата „Date“"
 
-#: builtin/am.c:901
 msgid "invalid timezone offset"
 msgstr "неправилно отместване на часовия пояс"
 
-#: builtin/am.c:994
 msgid "Patch format detection failed."
 msgstr "Форматът на кръпката не може да бъде определен."
 
-#: builtin/am.c:999 builtin/clone.c:300
 #, c-format
 msgid "failed to create directory '%s'"
 msgstr "директорията „%s“ не може да бъде създадена"
 
-#: builtin/am.c:1004
 msgid "Failed to split patches."
 msgstr "Кръпките не може да бъдат разделени."
 
-#: builtin/am.c:1153
 #, c-format
 msgid "When you have resolved this problem, run \"%s --continue\"."
 msgstr ""
@@ -11058,7 +2170,6 @@ msgstr ""
 "\n"
 "    %s --continue“"
 
-#: builtin/am.c:1154
 #, c-format
 msgid "If you prefer to skip this patch, run \"%s --skip\" instead."
 msgstr ""
@@ -11066,7 +2177,6 @@ msgstr ""
 "\n"
 "    %s --skip"
 
-#: builtin/am.c:1159
 #, c-format
 msgid "To record the empty patch as an empty commit, run \"%s --allow-empty\"."
 msgstr ""
@@ -11074,7 +2184,6 @@ msgstr ""
 "\n"
 "    %s --allow-empty"
 
-#: builtin/am.c:1161
 #, c-format
 msgid "To restore the original branch and stop patching, run \"%s --abort\"."
 msgstr ""
@@ -11082,33 +2191,31 @@ msgstr ""
 "\n"
 "    %s --abort"
 
-#: builtin/am.c:1256
 msgid "Patch sent with format=flowed; space at the end of lines might be lost."
 msgstr ""
 "Кръпката е пратена с форматиране „format=flowed“.  Празните знаци в края на "
 "редовете може да се загубят."
 
-#: builtin/am.c:1344
 #, c-format
 msgid "missing author line in commit %s"
 msgstr "липсва ред за авторство в подаването „%s“"
 
-#: builtin/am.c:1347
 #, c-format
 msgid "invalid ident line: %.*s"
 msgstr "грешен ред с идентичност: %.*s"
 
-#: builtin/am.c:1566
+#, c-format
+msgid "unable to parse commit %s"
+msgstr "подаването не може да бъде анализирано: %s"
+
 msgid "Repository lacks necessary blobs to fall back on 3-way merge."
 msgstr ""
 "В хранилището липсват необходимите обекти-BLOB, за да се премине към тройно "
 "сливане."
 
-#: builtin/am.c:1568
 msgid "Using index info to reconstruct a base tree..."
 msgstr "Базовото дърво се реконструира от информацията в индекса…"
 
-#: builtin/am.c:1587
 msgid ""
 "Did you hand edit your patch?\n"
 "It does not apply to blobs recorded in its index."
@@ -11116,24 +2223,25 @@ msgstr ""
 "Кръпката не може да се приложи към обектите-BLOB в индекса.\n"
 "Да не би да сте я редактирали на ръка?"
 
-#: builtin/am.c:1593
 msgid "Falling back to patching base and 3-way merge..."
 msgstr "Преминаване към прилагане на кръпка към базата и тройно сливане…"
 
-#: builtin/am.c:1619
 msgid "Failed to merge in the changes."
-msgstr "Неуспешно сливане на промените."
+msgstr "Неуспешно сливане на промѐните."
+
+msgid "git write-tree failed to write a tree"
+msgstr "Командата „git write-tree“ не успя да запише обект-дърво"
 
-#: builtin/am.c:1651
 msgid "applying to an empty history"
 msgstr "прилагане върху празна история"
 
-#: builtin/am.c:1703 builtin/am.c:1707
+msgid "failed to write commit object"
+msgstr "обектът за подаването не може да бъде записан"
+
 #, c-format
 msgid "cannot resume: %s does not exist."
 msgstr "не може да се продължи — „%s“ не съществува."
 
-#: builtin/am.c:1725
 msgid "Commit Body is:"
 msgstr "Тялото на кръпката за прилагане е:"
 
@@ -11141,94 +2249,80 @@ msgstr "Тялото на кръпката за прилагане е:"
 #. in your translation. The program will only accept English
 #. input at this point.
 #.
-#: builtin/am.c:1735
 #, 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:1781 builtin/commit.c:409
 msgid "unable to write index file"
 msgstr "индексът не може да бъде записан"
 
-#: builtin/am.c:1785
 #, c-format
 msgid "Dirty index: cannot apply patches (dirty: %s)"
 msgstr ""
 "Индексът не е чист: кръпките не може да бъдат приложени (замърсени са: %s)"
 
-#: builtin/am.c:1827
 #, c-format
 msgid "Skipping: %.*s"
 msgstr "Прескачане: %.*s"
 
-#: builtin/am.c:1832
 #, c-format
 msgid "Creating an empty commit: %.*s"
 msgstr "Създаване на празно подаване: %.*s"
 
-#: builtin/am.c:1836
 msgid "Patch is empty."
 msgstr "Кръпката е празна."
 
-#: builtin/am.c:1847 builtin/am.c:1916
 #, c-format
 msgid "Applying: %.*s"
 msgstr "Прилагане: %.*s"
 
-#: builtin/am.c:1864
 msgid "No changes -- Patch already applied."
-msgstr "Без промени — кръпката вече е приложена."
+msgstr "Без промѐни — кръпката вече е приложена."
 
-#: builtin/am.c:1870
 #, c-format
 msgid "Patch failed at %s %.*s"
 msgstr "Неуспешно прилагане на кръпка при %s %.*s“"
 
-#: builtin/am.c:1874
 msgid "Use 'git am --show-current-patch=diff' to see the failed patch"
 msgstr ""
 "За да видите неуспешно приложени кръпки, използвайте:\n"
 "\n"
 "    git am --show-current-patch=diff"
 
-#: builtin/am.c:1920
 msgid "No changes - recorded it as an empty commit."
-msgstr "Няма промени — създаване на празно подаване."
+msgstr "Няма промѐни — създаване на празно подаване."
 
-#: builtin/am.c:1922
 msgid ""
 "No changes - did you forget to use 'git add'?\n"
 "If there is nothing left to stage, chances are that something else\n"
 "already introduced the same changes; you might want to skip this patch."
 msgstr ""
-"Без промени — възможно е да не сте изпълнили „git add“.\n"
+"Без промѐни — възможно е да не сте изпълнили „git add“.\n"
 "Ако няма друга промяна за включване в индекса, най-вероятно някоя друга\n"
-"кръпка е довела до същите промени и в такъв случай просто пропуснете тази."
+"кръпка е довела до същите промѐни и в такъв случай просто пропуснете тази."
 
-#: builtin/am.c:1930
 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 might run `git rm` on a file to accept \"deleted by them\" for it."
 msgstr ""
-"Индексът все още съдържа неслети промени.\n"
+"Индексът все още съдържа неслети промѐни.\n"
 "След корекция на конфликтите изпълнете „git add“ върху поправените файлове.\n"
 "За да приемете „изтрити от тях“, изпълнете „git rm“ върху изтритите файлове."
 
-#: builtin/am.c:2038 builtin/am.c:2042 builtin/am.c:2054 builtin/reset.c:448
-#: builtin/reset.c:456
+msgid "unable to write new index file"
+msgstr "неуспешно записване на новия индекс"
+
 #, c-format
 msgid "Could not parse object '%s'."
 msgstr "„%s“ не е разпознат като обект."
 
-#: builtin/am.c:2090 builtin/am.c:2166
 msgid "failed to clean index"
 msgstr "индексът не може да бъде изчистен"
 
-#: builtin/am.c:2134
 msgid ""
 "You seem to have moved HEAD since the last 'am' failure.\n"
 "Not rewinding to ORIG_HEAD"
@@ -11239,173 +2333,119 @@ msgstr ""
 "сочи към\n"
 "„ORIG_HEAD“"
 
-#: builtin/am.c:2242
-#, c-format
-msgid "Invalid value for --patch-format: %s"
-msgstr "Неправилна стойност за „--patch-format“: „%s“"
-
-#: builtin/am.c:2285
 #, c-format
-msgid "Invalid value for --show-current-patch: %s"
-msgstr "Неправилна стойност за „--show-current-patch“: „%s“"
+msgid "failed to read '%s'"
+msgstr "„%s“ не може да бъде прочетен"
 
-#: builtin/am.c:2289
 #, c-format
 msgid "options '%s=%s' and '%s=%s' cannot be used together"
 msgstr "опциите „%s=%s“ и „%s=%s“ са несъвместими"
 
-#: builtin/am.c:2320
 msgid "git am [<options>] [(<mbox> | <Maildir>)...]"
 msgstr "git am [ОПЦИЯ…] [(ФАЙЛ_С_ПОЩА|ДИРЕКТОРИЯ_С_ПОЩА)…]"
 
-#: builtin/am.c:2321
 msgid "git am [<options>] (--continue | --skip | --abort)"
 msgstr "git am [ОПЦИЯ…] (--continue | --skip | --abort)"
 
-#: builtin/am.c:2327
 msgid "run interactively"
 msgstr "интерактивна работа"
 
-#: builtin/am.c:2329
 msgid "historical option -- no-op"
 msgstr "изоставена опция, съществува по исторически причини, нищо не прави"
 
-#: builtin/am.c:2331
 msgid "allow fall back on 3way merging if needed"
 msgstr "да се преминава към тройно сливане при нужда."
 
-#: builtin/am.c:2332 builtin/init-db.c:547 builtin/prune-packed.c:16
-#: builtin/repack.c:642 builtin/stash.c:962
 msgid "be quiet"
 msgstr "без извеждане на информация"
 
-#: builtin/am.c:2334
 msgid "add a Signed-off-by trailer to the commit message"
 msgstr "добавяне на епилог за подпис „Signed-off-by“ в съобщението за подаване"
 
-#: builtin/am.c:2337
 msgid "recode into utf8 (default)"
 msgstr "прекодиране в UTF-8 (стандартно)"
 
-#: builtin/am.c:2339
 msgid "pass -k flag to git-mailinfo"
 msgstr "подаване на опцията „-k“ на командата „git-mailinfo“"
 
-#: builtin/am.c:2341
 msgid "pass -b flag to git-mailinfo"
 msgstr "подаване на опцията „-b“ на командата „git-mailinfo“"
 
-#: builtin/am.c:2343
 msgid "pass -m flag to git-mailinfo"
 msgstr "подаване на опцията „-m“ на командата „git-mailinfo“"
 
-#: builtin/am.c:2345
 msgid "pass --keep-cr flag to git-mailsplit for mbox format"
 msgstr ""
 "подаване на опцията „--keep-cr“ на командата „git-mailsplit“ за формат „mbox“"
 
-#: builtin/am.c:2348
 msgid "do not pass --keep-cr flag to git-mailsplit independent of am.keepcr"
 msgstr ""
 "без подаване на опцията „--keep-cr“ на командата „git-mailsplit“ независимо "
 "от „am.keepcr“"
 
-#: builtin/am.c:2351
 msgid "strip everything before a scissors line"
 msgstr "пропускане на всичко преди реда за отрязване"
 
-#: builtin/am.c:2353
 msgid "pass it through git-mailinfo"
 msgstr "прекарване през „git-mailinfo“"
 
-#: builtin/am.c:2356 builtin/am.c:2359 builtin/am.c:2362 builtin/am.c:2365
-#: builtin/am.c:2368 builtin/am.c:2371 builtin/am.c:2374 builtin/am.c:2377
-#: builtin/am.c:2383
 msgid "pass it through git-apply"
 msgstr "прекарване през „git-apply“"
 
-#: builtin/am.c:2373 builtin/commit.c:1515 builtin/fmt-merge-msg.c:18
-#: builtin/fmt-merge-msg.c:21 builtin/grep.c:919 builtin/merge.c:263
-#: builtin/pull.c:142 builtin/pull.c:204 builtin/pull.c:221
-#: builtin/rebase.c:1046 builtin/repack.c:653 builtin/repack.c:657
-#: builtin/repack.c:659 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:317
 msgid "n"
 msgstr "БРОЙ"
 
-#: builtin/am.c:2379 builtin/branch.c:680 builtin/bugreport.c:109
-#: builtin/for-each-ref.c:41 builtin/replace.c:555 builtin/tag.c:479
-#: builtin/verify-tag.c:38
 msgid "format"
 msgstr "ФОРМАТ"
 
-#: builtin/am.c:2380
 msgid "format the patch(es) are in"
 msgstr "формат на кръпките"
 
-#: builtin/am.c:2386
 msgid "override error message when patch failure occurs"
 msgstr "избрано от вас съобщение за грешка при прилагане на кръпки"
 
-#: builtin/am.c:2388
 msgid "continue applying patches after resolving a conflict"
 msgstr "продължаване на прилагането на кръпки след коригирането на конфликт"
 
-#: builtin/am.c:2391
 msgid "synonyms for --continue"
 msgstr "псевдоними на „--continue“"
 
-#: builtin/am.c:2394
 msgid "skip the current patch"
 msgstr "прескачане на текущата кръпка"
 
-#: builtin/am.c:2397
 msgid "restore the original branch and abort the patching operation"
 msgstr ""
 "възстановяване на първоначалното състояние на клона и преустановяване на "
 "прилагането на кръпката"
 
-#: builtin/am.c:2400
 msgid "abort the patching operation but keep HEAD where it is"
 msgstr ""
 "преустановяване на прилагането на кръпката без промяна към кое сочи „HEAD“"
 
-#: builtin/am.c:2404
 msgid "show the patch being applied"
 msgstr "показване на прилаганата кръпка"
 
-#: builtin/am.c:2408
 msgid "record the empty patch as an empty commit"
 msgstr "прилагане на празна кръпка като празно подаване"
 
-#: builtin/am.c:2412
 msgid "lie about committer date"
 msgstr "дата за подаване различна от първоначалната"
 
-#: builtin/am.c:2414
 msgid "use current timestamp for author date"
-msgstr "използване на текущото време като това за автор"
+msgstr "използване на текущото времево клеймо като това за автор"
 
-#: builtin/am.c:2416 builtin/commit-tree.c:118 builtin/commit.c:1643
-#: builtin/merge.c:302 builtin/pull.c:179 builtin/rebase.c:1099
-#: builtin/revert.c:117 builtin/tag.c:460
 msgid "key-id"
 msgstr "ИДЕНТИФИКАТОР_НА_КЛЮЧ"
 
-#: builtin/am.c:2417 builtin/rebase.c:1100
 msgid "GPG-sign commits"
 msgstr "подписване на подаванията с GPG"
 
-#: builtin/am.c:2420
 msgid "how to handle empty patches"
 msgstr "как да се обработват празните подавания"
 
-#: builtin/am.c:2423
 msgid "(internal use for git-rebase)"
 msgstr "(ползва се вътрешно за „git-rebase“)"
 
-#: builtin/am.c:2441
 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."
@@ -11413,18 +2453,15 @@ msgstr ""
 "Опциите „-b“/„--binary“ отдавна не правят нищо и\n"
 "ще бъдат премахнати в бъдеще.  Не ги ползвайте."
 
-#: builtin/am.c:2448
 msgid "failed to read the index"
 msgstr "неуспешно изчитане на индекса"
 
-#: builtin/am.c:2463
 #, c-format
 msgid "previous rebase directory %s still exists but mbox given."
 msgstr ""
 "предишната директория за пребазиране „%s“ все още съществува, а е зададен "
 "файл „mbox“."
 
-#: builtin/am.c:2487
 #, c-format
 msgid ""
 "Stray %s directory found.\n"
@@ -11433,57 +2470,38 @@ msgstr ""
 "Открита е излишна директория „%s“.\n"
 "Може да я изтриете с командата „git am --abort“."
 
-#: builtin/am.c:2493
 msgid "Resolve operation not in progress, we are not resuming."
 msgstr "В момента не тече операция по коригиране и няма как да се продължи."
 
-#: builtin/am.c:2503
 msgid "interactive mode requires patches on the command line"
 msgstr "интерактивният режим изисква кръпки на командния ред"
 
-#: builtin/apply.c:8
 msgid "git apply [<options>] [<patch>...]"
 msgstr "git apply [ОПЦИЯ…] [КРЪПКА…]"
 
-#: builtin/archive.c:18
 msgid "could not redirect output"
 msgstr "изходът не може да бъде пренасочен"
 
-#: builtin/archive.c:35
 msgid "git archive: Remote with no URL"
 msgstr "git archive: Липсва адрес за отдалеченото хранилище"
 
-#: builtin/archive.c:59
 msgid "git archive: expected ACK/NAK, got a flush packet"
 msgstr ""
 "git archive: очакваше се „ACK“/„NAK“, а бе получен изчистващ пакет „flush“"
 
-#: builtin/archive.c:62
 #, c-format
 msgid "git archive: NACK %s"
 msgstr "git archive: получен е „NACK“ — %s"
 
-#: builtin/archive.c:63
 msgid "git archive: protocol error"
 msgstr "git archive: протоколна грешка"
 
-#: builtin/archive.c:67
 msgid "git archive: expected a flush"
 msgstr "git archive: очакваше се изчистване на буферите чрез „flush“"
 
-#: builtin/bisect--helper.c:24
 msgid "git bisect--helper --bisect-reset [<commit>]"
 msgstr "git bisect--helper --bisect-reset [ПОДАВАНЕ]"
 
-#: builtin/bisect--helper.c:25
-msgid ""
-"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-new]"
-
-#: builtin/bisect--helper.c:26
 msgid ""
 "git bisect--helper --bisect-start [--term-{new,bad}=<term> --term-{old,good}"
 "=<term>] [--no-checkout] [--first-parent] [<bad> [<good>...]] [--] "
@@ -11492,79 +2510,56 @@ msgstr ""
 "git bisect--helper --bisect-start [--term-{new,bad}=ЛОШО --term-{old,good}"
 "=ДОБРО] [--no-checkout] [--first-parent] [ЛОШО [ДОБРО…]] [--] [ПЪТ…]"
 
-#: builtin/bisect--helper.c:28
-msgid "git bisect--helper --bisect-next"
-msgstr "git bisect--helper --bisect-next"
-
-#: builtin/bisect--helper.c:29
 msgid "git bisect--helper --bisect-state (bad|new) [<rev>]"
 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-state (ДОБРО) [ВЕРСИЯ…]"
 
-#: builtin/bisect--helper.c:31
 msgid "git bisect--helper --bisect-replay <filename>"
 msgstr "git bisect--helper --bisect-replay ИМЕ_НА_ФАЙЛ"
 
-#: builtin/bisect--helper.c:32
 msgid "git bisect--helper --bisect-skip [(<rev>|<range>)...]"
 msgstr "git bisect--helper --bisect-skip [(ВЕРСИЯ|ДИАПАЗОН)…]"
 
-#: 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:116
 #, c-format
 msgid "could not write to file '%s'"
 msgstr "във файла „%s“ не може да се пише"
 
-#: 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:174
 #, c-format
 msgid "can't use the builtin command '%s' as a term"
 msgstr "„%s“ е вградена команда и не може да се използва като управляваща дума"
 
-#: builtin/bisect--helper.c:184
 #, c-format
 msgid "can't change the meaning of the term '%s'"
 msgstr "не може да смените значението на управляващата дума „%s“"
 
-#: builtin/bisect--helper.c:194
 msgid "please use two different terms"
 msgstr "използвайте две различни управляващи думи"
 
-#: builtin/bisect--helper.c:210
 #, c-format
 msgid "We are not bisecting.\n"
 msgstr "В момента не се извършва двоично търсене.\n"
 
-#: builtin/bisect--helper.c:218
 #, c-format
 msgid "'%s' is not a valid commit"
 msgstr "„%s“ не е подаване"
 
-#: builtin/bisect--helper.c:227
 #, c-format
 msgid ""
 "could not check out original HEAD '%s'. Try 'git bisect reset <commit>'."
@@ -11572,27 +2567,22 @@ msgstr ""
 "първоначално указаното „%s“ в указателя „HEAD“ не може да бъде\n"
 "изтеглено.  Пробвайте да изпълните командата „git bisect reset ПОДАВАНЕ“."
 
-#: builtin/bisect--helper.c:271
 #, c-format
 msgid "Bad bisect_write argument: %s"
 msgstr "Неправилен аргумент на функцията „bisect_write“: „%s“"
 
-#: builtin/bisect--helper.c:276
 #, c-format
 msgid "couldn't get the oid of the rev '%s'"
 msgstr "идентификаторът на обект на версия „%s“ не може да бъде получен"
 
-#: builtin/bisect--helper.c:288
 #, c-format
 msgid "couldn't open the file '%s'"
 msgstr "файлът „%s“ не може да бъде отворен"
 
-#: 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:341
 #, c-format
 msgid ""
 "You need to give me at least one %s and %s revision.\n"
@@ -11601,7 +2591,6 @@ msgstr ""
 "Трябва да зададете поне една „%s“ и една „%s“ версия.  (Това може да се\n"
 "направи съответно и чрез командите „git bisect %s“ и „git bisect %s“.)"
 
-#: builtin/bisect--helper.c:345
 #, c-format
 msgid ""
 "You need to start by \"git bisect start\".\n"
@@ -11612,7 +2601,6 @@ msgstr ""
 "Трябва да зададете поне една „%s“ и една „%s“ версия.  (Това може да се\n"
 "направи съответно и чрез командите „git bisect %s“ и „git bisect %s“.)"
 
-#: builtin/bisect--helper.c:365
 #, c-format
 msgid "bisecting only with a %s commit"
 msgstr "двоично търсене само по „%s“ подаване."
@@ -11621,15 +2609,26 @@ msgstr "двоично търсене само по „%s“ подаване."
 #. translation. The program will only accept English input
 #. at this point.
 #.
-#: builtin/bisect--helper.c:373
 msgid "Are you sure [Y/n]? "
 msgstr "Да се продължи ли? „Y“ —  ДА, „n“ — не"
 
-#: builtin/bisect--helper.c:434
+msgid "status: waiting for both good and bad commits\n"
+msgstr "състояние: чакане и за добро, и за лошо подаване\n"
+
+#, c-format
+msgid "status: waiting for bad commit, %d good commit known\n"
+msgid_plural "status: waiting for bad commit, %d good commits known\n"
+msgstr[0] "състояние: чакане за лошо подаване, известно е %d добро подаване\n"
+msgstr[1] ""
+"състояние: чакане за лошо подаване, известни са %d добри подавания\n"
+
+msgid "status: waiting for good commit(s), bad commit known\n"
+msgstr ""
+"състояние: чакане за добро подаване, известно е поне едно лошо подаване\n"
+
 msgid "no terms defined"
 msgstr "не са указани управляващи думи"
 
-#: builtin/bisect--helper.c:437
 #, c-format
 msgid ""
 "Your current terms are %s for the old state\n"
@@ -11638,7 +2637,6 @@ msgstr ""
 "Текущите управляващи думи са: %s за старото състояние\n"
 "и %s за новото състояние.\n"
 
-#: builtin/bisect--helper.c:447
 #, c-format
 msgid ""
 "invalid argument %s for 'git bisect terms'.\n"
@@ -11647,56 +2645,45 @@ msgstr ""
 "на „git bisect terms“ е подаден неправилен аргумент „%s“\n"
 "Поддържат се опциите „--term-good“/„--term-old“ и „--term-bad„/„--term-new“."
 
-#: builtin/bisect--helper.c:514 builtin/bisect--helper.c:1038
 msgid "revision walk setup failed\n"
 msgstr "неуспешно настройване на обхождането на версиите\n"
 
-#: builtin/bisect--helper.c:536
 #, c-format
 msgid "could not open '%s' for appending"
 msgstr "файлът „%s“ не може да се отвори за добавяне"
 
-#: builtin/bisect--helper.c:655 builtin/bisect--helper.c:668
 msgid "'' is not a valid term"
 msgstr "„“ е неправилна управляваща дума"
 
-#: builtin/bisect--helper.c:678
 #, c-format
 msgid "unrecognized option: '%s'"
 msgstr "непозната опция: %s"
 
-#: builtin/bisect--helper.c:682
 #, c-format
 msgid "'%s' does not appear to be a valid revision"
 msgstr "„%s“ не изглежда като указател към версия"
 
-#: builtin/bisect--helper.c:713
 msgid "bad HEAD - I need a HEAD"
 msgstr "Неправилен указател „HEAD“"
 
-#: 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:749
 msgid "won't bisect on cg-seek'ed tree"
 msgstr ""
 "не може да се търси двоично, когато е изпълнена командата „cg-seek“ от "
 "„cogito“"
 
-#: builtin/bisect--helper.c:752
 msgid "bad HEAD - strange symbolic ref"
 msgstr "Неправилен указател „HEAD“ — необичаен символен указател"
 
-#: builtin/bisect--helper.c:772
 #, c-format
 msgid "invalid ref: '%s'"
 msgstr "неправилен указател: „%s“"
 
-#: builtin/bisect--helper.c:830
 msgid "You need to start by \"git bisect start\"\n"
 msgstr "Започнете като изпълните командата „git bisect start“\n"
 
@@ -11704,83 +2691,75 @@ msgstr "Започнете като изпълните командата „git
 #. translation. The program will only accept English input
 #. at this point.
 #.
-#: builtin/bisect--helper.c:841
 msgid "Do you want me to do it for you [Y/n]? "
 msgstr "Да се извърши ли автоматично? „Y“ —  ДА, „n“ — не"
 
-#: builtin/bisect--helper.c:859
 msgid "Please call `--bisect-state` with at least one argument"
 msgstr "опцията „--bisect-state“ изисква поне един аргумент"
 
-#: builtin/bisect--helper.c:872
 #, c-format
 msgid "'git bisect %s' can take only one argument."
 msgstr "Командата „git bisect %s“ приема само един аргумент."
 
-#: builtin/bisect--helper.c:884 builtin/bisect--helper.c:897
 #, c-format
 msgid "Bad rev input: %s"
 msgstr "Неправилна версия: „%s“"
 
-#: builtin/bisect--helper.c:904
 #, c-format
 msgid "Bad rev input (not a commit): %s"
 msgstr "Неправилна версия (не е подаване): „%s“"
 
-#: builtin/bisect--helper.c:936
 msgid "We are not bisecting."
 msgstr "В момента не се извършва двоично търсене."
 
-#: builtin/bisect--helper.c:986
 #, c-format
 msgid "'%s'?? what are you talking about?"
 msgstr ""
 "Непозната команда „%s“.  Възможностите са: „start“, „skip“, „good“, „bad“ (и "
 "вариантите им)"
 
-#: builtin/bisect--helper.c:998
 #, c-format
 msgid "cannot read file '%s' for replaying"
 msgstr ""
 "файлът „%s“ не може да бъде прочетен, за да се изпълнят командите от него "
 "наново"
 
-#: builtin/bisect--helper.c:1107 builtin/bisect--helper.c:1274
+#, c-format
+msgid "running %s\n"
+msgstr "изпълнение на %s\n"
+
 msgid "bisect run failed: no command provided."
 msgstr "неуспешно двоично търсене, не е зададена команда."
 
-#: builtin/bisect--helper.c:1116
 #, c-format
-msgid "running %s\n"
-msgstr "изпълнение на %s\n"
+msgid "unable to verify '%s' on good revision"
+msgstr "„%s“ не може да провери с добра версия"
+
+#, c-format
+msgid "bogus exit code %d for good revision"
+msgstr "неправилен изходен код %d за добро подаване"
 
-#: 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 "
@@ -11789,247 +2768,181 @@ msgstr ""
 "неуспешно двоично търсене: „git bisect--helper --bisect-state %s“ завърши с "
 "код за грешка: %d"
 
-#: 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 ""
-"за автоматично определяне на състоянието при двоичното търсене да се ползва "
-"тази КОМАНДА…"
+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:1229
 msgid "--bisect-reset requires either no argument or a commit"
 msgstr "опцията „--bisect-reset“ изисква или 0 аргументи, или 1 — подаване"
 
-#: builtin/bisect--helper.c:1234
 msgid "--bisect-terms requires 0 or 1 argument"
 msgstr "опцията „--bisect-terms“ изисква 0 или 1 аргумента"
 
-#: builtin/bisect--helper.c:1243
 msgid "--bisect-next requires 0 arguments"
 msgstr "опцията „--bisect-next“ не приема аргументи"
 
-#: builtin/bisect--helper.c:1254
 msgid "--bisect-log requires 0 arguments"
 msgstr "опцията „--bisect-log“ не приема аргументи"
 
-#: builtin/bisect--helper.c:1259
 msgid "no logfile given"
 msgstr "не е зададен журнален файл"
 
-#: builtin/blame.c:32
 msgid "git blame [<options>] [<rev-opts>] [<rev>] [--] <file>"
 msgstr "git blame [ОПЦИЯ…] [ОПЦИЯ_ЗА_ВЕРСИЯТА…] [ВЕРСИЯ] [--] ФАЙЛ"
 
-#: builtin/blame.c:37
 msgid "<rev-opts> are documented in git-rev-list(1)"
 msgstr "ОПЦИИте_ЗА_ВЕРСИЯТА са документирани в ръководството git-rev-list(1)"
 
-#: builtin/blame.c:406
 #, c-format
 msgid "expecting a color: %s"
 msgstr "трябва да е цвят: %s"
 
-#: builtin/blame.c:413
 msgid "must end with a color"
 msgstr "трябва да завършва с цвят"
 
-#: builtin/blame.c:724
-#, c-format
-msgid "invalid color '%s' in color.blame.repeatedLines"
-msgstr "неправилен цвят „%s“ в „color.blame.repeatedLines“"
-
-#: builtin/blame.c:742
-msgid "invalid value for blame.coloring"
-msgstr "неправилна стойност за „blame.coloring“"
-
-#: builtin/blame.c:841
 #, c-format
 msgid "cannot find revision %s to ignore"
 msgstr "версията за прескачане „%s“ не може да бъде открита"
 
-#: builtin/blame.c:863
 msgid "show blame entries as we find them, incrementally"
 msgstr "извеждане на авторството с намирането му, последователно"
 
-#: builtin/blame.c:864
 msgid "do not show object names of boundary commits (Default: off)"
 msgstr ""
 "без извеждане на имената на обектите за граничните подавания (стандартно "
 "опцията е изключена)"
 
-#: builtin/blame.c:865
 msgid "do not treat root commits as boundaries (Default: off)"
 msgstr ""
 "началните подавания да не се считат за гранични (стандартно опцията е "
 "изключена)"
 
-#: builtin/blame.c:866
 msgid "show work cost statistics"
 msgstr "извеждане на статистика за извършените действия"
 
-#: builtin/blame.c:867 builtin/checkout.c:1536 builtin/clone.c:94
-#: builtin/commit-graph.c:75 builtin/commit-graph.c:228 builtin/fetch.c:180
-#: builtin/merge.c:301 builtin/multi-pack-index.c:103
-#: builtin/multi-pack-index.c:154 builtin/multi-pack-index.c:180
-#: builtin/multi-pack-index.c:208 builtin/pull.c:120 builtin/push.c:566
-#: builtin/send-pack.c:202
 msgid "force progress reporting"
 msgstr "извеждане на напредъка"
 
-#: builtin/blame.c:868
 msgid "show output score for blame entries"
 msgstr "извеждане на допълнителна информация за определянето на авторството"
 
-#: builtin/blame.c:869
 msgid "show original filename (Default: auto)"
 msgstr ""
 "извеждане на първоначалното име на файл (стандартно това е автоматично)"
 
-#: builtin/blame.c:870
 msgid "show original linenumber (Default: off)"
 msgstr ""
 "извеждане на първоначалния номер на ред (стандартно опцията е изключена)"
 
-#: builtin/blame.c:871
 msgid "show in a format designed for machine consumption"
 msgstr "извеждане във формат за по-нататъшна обработка"
 
-#: builtin/blame.c:872
 msgid "show porcelain format with per-line commit information"
 msgstr ""
 "извеждане във формат за команди от потребителско ниво с информация на всеки "
 "ред"
 
-#: builtin/blame.c:873
 msgid "use the same output mode as git-annotate (Default: off)"
 msgstr ""
 "използване на същия формат като „git-annotate“ (стандартно опцията е "
 "изключена)"
 
-#: builtin/blame.c:874
 msgid "show raw timestamp (Default: off)"
-msgstr "извеждане на неформатирани времена (стандартно опцията е изключена)"
+msgstr ""
+"извеждане на неформатирани времеви клейма (стандартно опцията е изключена)"
 
-#: builtin/blame.c:875
 msgid "show long commit SHA1 (Default: off)"
 msgstr "извеждане на пълните суми по SHA1 (стандартно опцията е изключена)"
 
-#: builtin/blame.c:876
 msgid "suppress author name and timestamp (Default: off)"
-msgstr "без име на автор и време на промяна (стандартно опцията е изключена)"
+msgstr ""
+"без име на автор и времево клеймо на промяна (стандартно опцията е изключена)"
 
-#: builtin/blame.c:877
 msgid "show author email instead of name (Default: off)"
 msgstr ""
 "извеждане на е-пощата на автора, а не името му (стандартно опцията е "
 "изключена)"
 
-#: builtin/blame.c:878
 msgid "ignore whitespace differences"
 msgstr "без разлики в знаците за интервали"
 
-#: builtin/blame.c:879 builtin/log.c:1838
 msgid "rev"
 msgstr "ВЕРС"
 
-#: builtin/blame.c:879
 msgid "ignore <rev> when blaming"
 msgstr "прескачане на ВЕРСията при извеждане на авторството"
 
-#: builtin/blame.c:880
 msgid "ignore revisions from <file>"
 msgstr "прескачане на версиите указани във ФАЙЛа"
 
-#: builtin/blame.c:881
 msgid "color redundant metadata from previous line differently"
 msgstr ""
 "оцветяване на повтарящите се метаданни от предишния ред в различен цвят"
 
-#: builtin/blame.c:882
 msgid "color lines by age"
 msgstr "оцветяване на редовете по възраст"
 
-#: builtin/blame.c:883
 msgid "spend extra cycles to find better match"
 msgstr "допълнителни изчисления за по-добри резултати"
 
-#: builtin/blame.c:884
 msgid "use revisions from <file> instead of calling git-rev-list"
 msgstr "изчитане на версиите от ФАЙЛа, а не чрез изпълнение на „git-rev-list“"
 
-#: builtin/blame.c:885
 msgid "use <file>'s contents as the final image"
 msgstr "използване на съдържанието на ФАЙЛа като крайно положение"
 
-#: builtin/blame.c:886 builtin/blame.c:887
 msgid "score"
 msgstr "напасване на редовете"
 
-#: builtin/blame.c:886
 msgid "find line copies within and across files"
 msgstr ""
 "търсене на копирани редове както в рамките на един файл, така и от един файл "
 "към друг"
 
-#: builtin/blame.c:887
 msgid "find line movements within and across files"
 msgstr ""
 "търсене на преместени редове както в рамките на един файл, така и от един "
 "файл към друг"
 
-#: builtin/blame.c:888
 msgid "range"
 msgstr "диапазон"
 
-#: builtin/blame.c:889
 msgid "process only line range <start>,<end> or function :<funcname>"
 msgstr ""
 "информация само за редовете в диапазона НАЧАЛО,КРАЙ или само на :ФУНКЦИЯта"
 
-#: builtin/blame.c:947
 msgid "--progress can't be used with --incremental or porcelain formats"
 msgstr ""
 "опцията „--progress“ е несъвместима с „--incremental“ и форма̀та на командите "
@@ -12043,50 +2956,44 @@ msgstr ""
 #. your language may need more or fewer display
 #. columns.
 #.
-#: builtin/blame.c:998
 msgid "4 years, 11 months ago"
 msgstr "преди 4 години и 11 месеца"
 
-#: builtin/blame.c:1114
 #, 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:1159
 msgid "Blaming lines"
 msgstr "Редове с авторство"
 
-#: builtin/branch.c:29
 msgid "git branch [<options>] [-r | -a] [--merged] [--no-merged]"
 msgstr "git branch [ОПЦИЯ…] [-r | -a] [--merged] [--no-merged]"
 
-#: builtin/branch.c:30
-msgid "git branch [<options>] [-l] [-f] <branch-name> [<start-point>]"
-msgstr "git branch [ОПЦИЯ…] [-l] [-f] ИМЕ_НА_КЛОН [НАЧАЛО]"
+msgid ""
+"git branch [<options>] [-f] [--recurse-submodules] <branch-name> [<start-"
+"point>]"
+msgstr "git branch [ОПЦИЯ…] [-f] [--recurse-submodules] ИМЕ_НА_КЛОН [НАЧАЛО]"
+
+msgid "git branch [<options>] [-l] [<pattern>...]"
+msgstr "git branch [ОПЦИЯ…] [-l] [ШАБЛОН…]"
 
-#: builtin/branch.c:31
 msgid "git branch [<options>] [-r] (-d | -D) <branch-name>..."
 msgstr "git branch [ОПЦИЯ…] [-r] (-d | -D) ИМЕ_НА_КЛОН…"
 
-#: builtin/branch.c:32
 msgid "git branch [<options>] (-m | -M) [<old-branch>] <new-branch>"
 msgstr "git branch [ОПЦИЯ…] (-m | -M) [СТАР_КЛОН] НОВ_КЛОН"
 
-#: builtin/branch.c:33
 msgid "git branch [<options>] (-c | -C) [<old-branch>] <new-branch>"
 msgstr "git branch [ОПЦИЯ…] (-c | -C) [СТАР_КЛОН] НОВ_КЛОН"
 
-#: builtin/branch.c:34
 msgid "git branch [<options>] [-r | -a] [--points-at]"
 msgstr "git branch [ОПЦИЯ…] [-r | -a] [--points-at]"
 
-#: builtin/branch.c:35
 msgid "git branch [<options>] [-r | -a] [--format]"
 msgstr "git branch [ОПЦИЯ…] [-r | -a] [--format]"
 
-#: builtin/branch.c:153
 #, c-format
 msgid ""
 "deleting branch '%s' that has been merged to\n"
@@ -12095,7 +3002,6 @@ msgstr ""
 "изтриване на клона „%s“, който е слят към „%s“,\n"
 "    но още не е слят към върха „HEAD“."
 
-#: builtin/branch.c:157
 #, c-format
 msgid ""
 "not deleting branch '%s' that is not yet merged to\n"
@@ -12104,12 +3010,10 @@ msgstr ""
 "отказване на изтриване на клона „%s“, който не е слят към\n"
 "    „%s“, но е слят към върха „HEAD“."
 
-#: builtin/branch.c:171
 #, c-format
 msgid "Couldn't look up commit object for '%s'"
 msgstr "Обектът-подаване за „%s“ не може да бъде открит"
 
-#: builtin/branch.c:175
 #, c-format
 msgid ""
 "The branch '%s' is not fully merged.\n"
@@ -12118,112 +3022,88 @@ msgstr ""
 "Клонът „%s“ не е слят напълно.  Ако сте сигурни, че искате\n"
 "да го изтриете, изпълнете „git branch -D %s“."
 
-#: builtin/branch.c:188
 msgid "Update of config-file failed"
 msgstr "Неуспешно обновяване на конфигурационния файл"
 
-#: builtin/branch.c:223
 msgid "cannot use -a with -d"
 msgstr "опциите „-a“ и „-d“ са несъвместими"
 
-#: builtin/branch.c:230
 msgid "Couldn't look up commit object for HEAD"
 msgstr "Обектът-подаване, сочен от указателя „HEAD“, не може да бъде открит"
 
-#: builtin/branch.c:247
 #, c-format
 msgid "Cannot delete branch '%s' checked out at '%s'"
 msgstr "Не може да изтриете клона „%s“, който е изтеглен в пътя „%s“"
 
-#: builtin/branch.c:262
 #, c-format
 msgid "remote-tracking branch '%s' not found."
 msgstr "следящият клон „%s“ не може да бъде открит."
 
-#: builtin/branch.c:263
 #, c-format
 msgid "branch '%s' not found."
 msgstr "клонът „%s“ не може да бъде открит."
 
-#: builtin/branch.c:294
 #, c-format
 msgid "Deleted remote-tracking branch %s (was %s).\n"
 msgstr "Изтрит следящ клон „%s“ (той сочеше към „%s“).\n"
 
-#: builtin/branch.c:295
 #, c-format
 msgid "Deleted branch %s (was %s).\n"
 msgstr "Изтрит клон „%s“ (той сочеше към „%s“).\n"
 
-#: builtin/branch.c:445 builtin/tag.c:63
 msgid "unable to parse format string"
 msgstr "форматиращият низ не може да бъде анализиран: %s"
 
-#: builtin/branch.c:476
 msgid "could not resolve HEAD"
 msgstr "подаването, сочено от указателя „HEAD“, не може да се установи"
 
-#: builtin/branch.c:482
 #, c-format
 msgid "HEAD (%s) points outside of refs/heads/"
 msgstr "„HEAD“ (%s) сочи извън директорията „refs/heads“"
 
-#: builtin/branch.c:497
 #, c-format
 msgid "Branch %s is being rebased at %s"
 msgstr "Клонът „%s“ се пребазира върху „%s“"
 
-#: builtin/branch.c:501
 #, c-format
 msgid "Branch %s is being bisected at %s"
 msgstr "Търси се двоично в клона „%s“ при „%s“"
 
-#: builtin/branch.c:518
 msgid "cannot copy the current branch while not on any."
 msgstr "не може да копирате текущия клон, защото сте извън който и да е клон"
 
-#: builtin/branch.c:520
 msgid "cannot rename the current branch while not on any."
 msgstr ""
 "не може да преименувате текущия клон, защото сте извън който и да е клон"
 
-#: builtin/branch.c:531
 #, c-format
 msgid "Invalid branch name: '%s'"
 msgstr "Неправилно име на клон: „%s“"
 
-#: builtin/branch.c:560
 msgid "Branch rename failed"
 msgstr "Неуспешно преименуване на клон"
 
-#: builtin/branch.c:562
 msgid "Branch copy failed"
 msgstr "Неуспешно копиране на клон"
 
-#: builtin/branch.c:566
 #, c-format
 msgid "Created a copy of a misnamed branch '%s'"
 msgstr "Клонът с неправилно име „%s“ е копиран"
 
-#: builtin/branch.c:569
 #, c-format
 msgid "Renamed a misnamed branch '%s' away"
 msgstr "Клонът с неправилно име „%s“ е преименуван"
 
-#: builtin/branch.c:575
 #, c-format
 msgid "Branch renamed to %s, but HEAD is not updated!"
 msgstr "Клонът е преименуван на „%s“, но указателят „HEAD“ не е обновен"
 
-#: builtin/branch.c:584
 msgid "Branch is renamed, but update of config-file failed"
 msgstr "Клонът е преименуван, но конфигурационният файл не е обновен"
 
-#: builtin/branch.c:586
 msgid "Branch is copied, but update of config-file failed"
 msgstr "Клонът е копиран, но конфигурационният файл не е обновен"
 
-#: builtin/branch.c:602
 #, c-format
 msgid ""
 "Please edit the description for the branch\n"
@@ -12234,179 +3114,151 @@ msgstr ""
 "    %s\n"
 "Редовете, които започват с „%c“, ще бъдат пропуснати.\n"
 
-#: builtin/branch.c:637
 msgid "Generic options"
 msgstr "Общи настройки"
 
-#: builtin/branch.c:639
 msgid "show hash and subject, give twice for upstream branch"
 msgstr ""
 "извеждане на контролната сума и темата.  Повтарянето на опцията прибавя "
 "отдалечените клони"
 
-#: builtin/branch.c:640
 msgid "suppress informational messages"
 msgstr "без информационни съобщения"
 
-#: builtin/branch.c:642
 msgid "set branch tracking configuration"
 msgstr "настройване кой клон да се следи"
 
-#: builtin/branch.c:645
 msgid "do not use"
 msgstr "да не се ползва"
 
-#: builtin/branch.c:647
 msgid "upstream"
 msgstr "клон-източник"
 
-#: builtin/branch.c:647
 msgid "change the upstream info"
 msgstr "смяна на клона-източник"
 
-#: builtin/branch.c:648
 msgid "unset the upstream info"
 msgstr "изчистване на информацията за клон-източник"
 
-#: builtin/branch.c:649
 msgid "use colored output"
 msgstr "цветен изход"
 
-#: builtin/branch.c:650
 msgid "act on remote-tracking branches"
 msgstr "действие върху следящите клони"
 
-#: builtin/branch.c:652 builtin/branch.c:654
 msgid "print only branches that contain the commit"
 msgstr "извеждане само на клоните, които съдържат това ПОДАВАНЕ"
 
-#: builtin/branch.c:653 builtin/branch.c:655
 msgid "print only branches that don't contain the commit"
 msgstr "извеждане само на клоните, които не съдържат това ПОДАВАНЕ"
 
-#: builtin/branch.c:658
 msgid "Specific git-branch actions:"
 msgstr "Специални действия на „git-branch“:"
 
-#: builtin/branch.c:659
 msgid "list both remote-tracking and local branches"
 msgstr "извеждане както на следящите, така и на локалните клони"
 
-#: builtin/branch.c:661
 msgid "delete fully merged branch"
 msgstr "изтриване на клони, които са напълно слети"
 
-#: builtin/branch.c:662
 msgid "delete branch (even if not merged)"
 msgstr "изтриване и на клони, които не са напълно слети"
 
-#: builtin/branch.c:663
 msgid "move/rename a branch and its reflog"
 msgstr ""
 "преместване/преименуване на клон и принадлежащият му журнал на указателите"
 
-#: builtin/branch.c:664
 msgid "move/rename a branch, even if target exists"
 msgstr "преместване/преименуване на клон, дори ако има вече клон с такова име"
 
-#: builtin/branch.c:665
 msgid "copy a branch and its reflog"
 msgstr "копиране на клон и принадлежащия му журнал на указателите"
 
-#: builtin/branch.c:666
 msgid "copy a branch, even if target exists"
 msgstr "копиране на клон, дори ако има вече клон с такова име"
 
-#: builtin/branch.c:667
 msgid "list branch names"
 msgstr "извеждане на имената на клоните"
 
-#: builtin/branch.c:668
 msgid "show current branch name"
 msgstr "извеждане на името на текущия клон"
 
-#: builtin/branch.c:669
 msgid "create the branch's reflog"
 msgstr "създаване на журнала на указателите на клона"
 
-#: builtin/branch.c:671
 msgid "edit the description for the branch"
 msgstr "редактиране на описанието на клона"
 
-#: builtin/branch.c:672
 msgid "force creation, move/rename, deletion"
 msgstr "принудително създаване, преместване, преименуване, изтриване"
 
-#: builtin/branch.c:673
 msgid "print only branches that are merged"
 msgstr "извеждане само на слетите клони"
 
-#: builtin/branch.c:674
 msgid "print only branches that are not merged"
 msgstr "извеждане само на неслетите клони"
 
-#: builtin/branch.c:675
 msgid "list branches in columns"
 msgstr "извеждане по колони"
 
-#: builtin/branch.c:677 builtin/for-each-ref.c:45 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:678
 msgid "print only branches of the object"
 msgstr "извеждане само на клоните на ОБЕКТА"
 
-#: builtin/branch.c:679 builtin/for-each-ref.c:51 builtin/tag.c:482
 msgid "sorting and filtering are case insensitive"
 msgstr "подредбата и филтрирането третират еднакво малките и главните букви"
 
-#: builtin/branch.c:680 builtin/for-each-ref.c:41 builtin/tag.c:480
-#: builtin/verify-tag.c:38
+msgid "recurse through submodules"
+msgstr "рекурсивно обхождане подмодулите"
+
 msgid "format to use for the output"
 msgstr "ФОРМАТ за изхода"
 
-#: builtin/branch.c:703 builtin/clone.c:678
+msgid "Failed to resolve HEAD as a valid ref."
+msgstr "Не може да се открие към какво сочи указателят „HEAD“"
+
 msgid "HEAD not found below refs/heads!"
 msgstr "В директорията „refs/heads“ липсва файл „HEAD“"
 
-#: builtin/branch.c:742 builtin/branch.c:798 builtin/branch.c:807
+msgid ""
+"branch with --recurse-submodules can only be used if submodule."
+"propagateBranches is enabled"
+msgstr ""
+"може да се ползва клон с опцията „--recurse-submodules“, само ако "
+"настройката „submodule.propagateBranches“ е зададена"
+
+msgid "--recurse-submodules can only be used to create branches"
+msgstr ""
+"опцията „--recurse-submodules“ може да се ползва само за създаването на клони"
+
 msgid "branch name required"
 msgstr "Необходимо е име на клон"
 
-#: builtin/branch.c:774
 msgid "Cannot give description to detached HEAD"
 msgstr "Не може да зададете описание на несвързан „HEAD“"
 
-#: builtin/branch.c:779
 msgid "cannot edit description of more than one branch"
 msgstr "Не може да редактирате описанието на повече от един клон едновременно"
 
-#: builtin/branch.c:786
 #, c-format
 msgid "No commit on branch '%s' yet."
 msgstr "В клона „%s“ все още няма подавания."
 
-#: builtin/branch.c:789
 #, c-format
 msgid "No branch named '%s'."
 msgstr "Липсва клон на име „%s“."
 
-#: builtin/branch.c:804
 msgid "too many branches for a copy operation"
 msgstr "прекалено много клони за копиране"
 
-#: builtin/branch.c:813
 msgid "too many arguments for a rename operation"
 msgstr "прекалено много аргументи към командата за преименуване"
 
-#: builtin/branch.c:818
 msgid "too many arguments to set new upstream"
 msgstr "прекалено много аргументи към командата за следене"
 
-#: builtin/branch.c:822
 #, c-format
 msgid ""
 "could not set upstream of HEAD to %s when it does not point to any branch."
@@ -12414,31 +3266,25 @@ msgstr ""
 "Следеното от „HEAD“ не може да се зададе да е „%s“, защото то не сочи към "
 "никой клон."
 
-#: builtin/branch.c:825 builtin/branch.c:848
 #, c-format
 msgid "no such branch '%s'"
 msgstr "Няма клон на име „%s“."
 
-#: builtin/branch.c:829
 #, c-format
 msgid "branch '%s' does not exist"
 msgstr "Не съществува клон на име „%s“."
 
-#: builtin/branch.c:842
 msgid "too many arguments to unset upstream"
 msgstr "прекалено много аргументи към командата за спиране на следене"
 
-#: builtin/branch.c:846
 msgid "could not unset upstream of HEAD when it does not point to any branch."
 msgstr ""
 "Следеното от „HEAD“ не може да махне, защото то не сочи към никой клон."
 
-#: builtin/branch.c:852
 #, c-format
 msgid "Branch '%s' has no upstream information"
 msgstr "Няма информация клонът „%s“ да следи някой друг"
 
-#: builtin/branch.c:862
 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>?"
@@ -12446,7 +3292,6 @@ msgstr ""
 "опциите „-a“ и „-r“ на „git branch“ са несъвместими с име на клон.\n"
 "Пробвайте с: „-a|-r --list ШАБЛОН“"
 
-#: builtin/branch.c:866
 msgid ""
 "the '--set-upstream' option is no longer supported. Please use '--track' or "
 "'--set-upstream-to' instead."
@@ -12454,32 +3299,25 @@ msgstr ""
 "опцията „--set-upstream“ вече не се поддържа.  Използвайте „--track“ или „--"
 "set-upstream-to“"
 
-#: builtin/bugreport.c:16
 msgid "git version:\n"
 msgstr "версия на git:\n"
 
-#: builtin/bugreport.c:22
 #, c-format
 msgid "uname() failed with error '%s' (%d)\n"
 msgstr "грешка при изпълнението на „uname()“ — „%s“ (%d)\n"
 
-#: builtin/bugreport.c:32
 msgid "compiler info: "
 msgstr "компилатор: "
 
-#: builtin/bugreport.c:35
 msgid "libc info: "
 msgstr "библиотека на C: "
 
-#: builtin/bugreport.c:49
 msgid "not run from a git repository - no hooks to show\n"
 msgstr "командата е стартирана извън хранилище на Git, затова няма куки\n"
 
-#: 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:69
 msgid ""
 "Thank you for filling out a Git bug report!\n"
 "Please answer the following questions to help us understand your issue.\n"
@@ -12515,483 +3353,468 @@ msgstr ""
 "Разгледайте останалата част от доклада за грешка по-долу.\n"
 "Може да изтриете редовете, които не искате да споделите.\n"
 
-#: builtin/bugreport.c:108
 msgid "specify a destination for the bugreport file"
 msgstr "укажете файла, в който да се запази докладът за грешка"
 
-#: builtin/bugreport.c:110
 msgid "specify a strftime format suffix for the filename"
 msgstr "укажете суфикса на файла във формат за „strftime“"
 
-#: builtin/bugreport.c:132
 #, c-format
 msgid "could not create leading directories for '%s'"
 msgstr "родителските директории на „%s“ не може да бъдат създадени"
 
-#: builtin/bugreport.c:139
 msgid "System Info"
 msgstr "Информация за системата"
 
-#: builtin/bugreport.c:142
 msgid "Enabled Hooks"
 msgstr "Включени куки"
 
-#: builtin/bugreport.c:149
 #, c-format
 msgid "unable to write to %s"
 msgstr "в „%s“ не може да се пише"
 
-#: builtin/bugreport.c:159
 #, c-format
 msgid "Created new report at '%s'.\n"
 msgstr "Новият доклад е създаден в „%s“.\n"
 
-#: builtin/bundle.c:15 builtin/bundle.c:23
 msgid "git bundle create [<options>] <file> <git-rev-list args>"
 msgstr "git bundle create [ОПЦИЯ…] ФАЙЛ АРГУМЕНТ_ЗА_git_rev-list…"
 
-#: builtin/bundle.c:16 builtin/bundle.c:28
 msgid "git bundle verify [<options>] <file>"
 msgstr "git bundle verify [ОПЦИЯ…] ФАЙЛ…"
 
-#: builtin/bundle.c:17 builtin/bundle.c:33
 msgid "git bundle list-heads <file> [<refname>...]"
 msgstr "git bundle list-heads ФАЙЛ [ИМЕ_НА_УКАЗАТЕЛ…]"
 
-#: builtin/bundle.c:18 builtin/bundle.c:38
 msgid "git bundle unbundle <file> [<refname>...]"
 msgstr "git bundle unbundle ФАЙЛ [ИМЕ_НА_УКАЗАТЕЛ…]"
 
-#: builtin/bundle.c:65 builtin/pack-objects.c:3876
 msgid "do not show progress meter"
 msgstr "без извеждане на напредъка"
 
-#: builtin/bundle.c:67 builtin/bundle.c:167 builtin/pack-objects.c:3878
 msgid "show progress meter"
 msgstr "извеждане на напредъка"
 
-#: builtin/bundle.c:69 builtin/pack-objects.c:3880
 msgid "show progress meter during object writing phase"
 msgstr "извеждане на напредъка във фазата на запазване на обектите"
 
-#: 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:74
 msgid "specify bundle format version"
 msgstr "версия на пратката"
 
-#: builtin/bundle.c:94
 msgid "Need a repository to create a bundle."
 msgstr "За създаването на пратка е необходимо хранилище."
 
-#: builtin/bundle.c:107
 msgid "do not show bundle details"
 msgstr "без подробна информация за пратките"
 
-#: builtin/bundle.c:126
 #, c-format
 msgid "%s is okay\n"
 msgstr "Пратката „%s“ е наред\n"
 
-#: builtin/bundle.c:182
 msgid "Need a repository to unbundle."
 msgstr "За приемането на пратка е необходимо хранилище."
 
-#: builtin/bundle.c:185
 msgid "Unbundling objects"
 msgstr "Разпакетиране на пратки от обекти"
 
-#: builtin/bundle.c:219 builtin/remote.c:1733
 #, c-format
 msgid "Unknown subcommand: %s"
 msgstr "Непозната подкоманда: %s"
 
-#: builtin/cat-file.c:622
+#, c-format
+msgid "cannot read object %s '%s'"
+msgstr "обектът „%s“ (%s) не може да бъде прочетен"
+
+msgid "flush is only for --buffer mode"
+msgstr "изчистването на буферите (flush) се ползва само за „--buffer“"
+
+msgid "empty command in input"
+msgstr "празна команда на входа"
+
+#, c-format
+msgid "whitespace before command: '%s'"
+msgstr "празни знаци преди командата „%s“"
+
+#, c-format
+msgid "%s requires arguments"
+msgstr "командата „%s“ изисква аргумент"
+
+#, c-format
+msgid "%s takes no arguments"
+msgstr "командата „%s“ не приема аргументи"
+
+#, c-format
+msgid "unknown command: '%s'"
+msgstr "непозната команда: „%s“"
+
+msgid "only one batch option may be specified"
+msgstr "може да укажете само една пакетна опция"
+
+msgid "git cat-file <type> <object>"
+msgstr "git cat-file ВИД ОБЕКТ"
+
+msgid "git cat-file (-e | -p) <object>"
+msgstr "git cat-file (-e | -p) ОБЕКТ"
+
+msgid "git cat-file (-t | -s) [--allow-unknown-type] <object>"
+msgstr "git cat-file (-t | -s) [--allow-unknown-type] ОБЕКТ"
+
 msgid ""
-"git cat-file (-t [--allow-unknown-type] | -s [--allow-unknown-type] | -e | -"
-"p | <type> | --textconv | --filters) [--path=<path>] <object>"
+"git cat-file (--batch | --batch-check | --batch-command) [--batch-all-"
+"objects]\n"
+"             [--buffer] [--follow-symlinks] [--unordered]\n"
+"             [--textconv | --filters]"
 msgstr ""
-"git cat-file (-t [--allow-unknown-type] | -s [--allow-unknown-type] | -e | -"
-"p | ВИД | --textconv --filters) [--path=ПЪТ] ОБЕКТ"
+"git cat-file (--batch | --batch-check | --batch-command) [--batch-all-"
+"objects]\n"
+"             [--buffer] [--follow-symlinks] [--unordered]\n"
+"             [--textconv | --filters]"
 
-#: builtin/cat-file.c:623
 msgid ""
-"git cat-file (--batch[=<format>] | --batch-check[=<format>]) [--follow-"
-"symlinks] [--textconv | --filters]"
+"git cat-file (--textconv | --filters)\n"
+"             [<rev>:<path|tree-ish> | --path=<path|tree-ish> <rev>]"
 msgstr ""
-"git cat-file (--batch[=ФОРМАТ] | --batch-check[=ФОРМАТ]) [--follow-symlinks] "
-"[--textconv | --filters]"
+"git cat-file (--textconv | --filters)\n"
+"             [ВЕРСИЯ:ПЪТ|ДЪРВО | --path=ПЪТ|ДЪРВО ВЕРСИЯ]"
 
-#: builtin/cat-file.c:644
-msgid "only one batch option may be specified"
-msgstr "може да укажете само една пакетна опция"
+msgid "Check object existence or emit object contents"
+msgstr "Проверка за съществуването на обекта или извеждане на съдържанието му"
 
-#: builtin/cat-file.c:662
-msgid "<type> can be one of: blob, tree, commit, tag"
-msgstr ""
-"ВИДът може да е: „blob“ (BLOB), „tree“ (дърво), „commit“ (подаване), "
-"„tag“ (етикет)"
+msgid "check if <object> exists"
+msgstr "проверка дали ОБЕКТът съществува"
+
+msgid "pretty-print <object> content"
+msgstr "форматирано извеждане на съдържанието на ОБЕКТа"
 
-#: builtin/cat-file.c:663
-msgid "show object type"
-msgstr "извеждане на вида на обект"
+msgid "Emit [broken] object attributes"
+msgstr "Извеждане на атрибутите на обектите (с грешки)"
+
+msgid "show object type (one of 'blob', 'tree', 'commit', 'tag', ...)"
+msgstr ""
+"показване на обекти от този ВИД: „blob“ (BLOB), „tree“ (дърво), "
+"„commit“ (подаване), „tag“ (етикет и т.н.…)"
 
-#: builtin/cat-file.c:664
 msgid "show object size"
 msgstr "извеждане на размера на обект"
 
-#: builtin/cat-file.c:666
-msgid "exit with zero when there's no error"
-msgstr "изход с 0, когато няма грешка"
-
-#: builtin/cat-file.c:667
-msgid "pretty-print object's content"
-msgstr "форматирано извеждане на съдържанието на обекта"
+msgid "allow -s and -t to work with broken/corrupt objects"
+msgstr "позволяване на опциите „-s“ и „-t“ да работят с повредени обекти"
 
-#: builtin/cat-file.c:669
-msgid "for blob objects, run textconv on object's content"
+msgid "Batch objects requested on stdin (or --batch-all-objects)"
 msgstr ""
-"да се стартира програмата зададена в настройката „textconv“ за преобразуване "
-"на съдържанието на обекта-BLOB"
+"Пакетно извеждане на заявените обекти на стандартния изход (или „--batch-all-"
+"objects“)"
 
-#: builtin/cat-file.c:671
-msgid "for blob objects, run filters on object's content"
-msgstr ""
-"да се стартират програмите за преобразуване на съдържанието на обектите-BLOB"
+msgid "show full <object> or <rev> contents"
+msgstr "извеждане на пълното съдържание на ОБЕКТа или ВЕРСИЯта"
 
-#: builtin/cat-file.c:672
-msgid "blob"
-msgstr "обект-BLOB"
+msgid "like --batch, but don't emit <contents>"
+msgstr "като „--batch“, но без извеждане на съдържанието"
 
-#: builtin/cat-file.c:673
-msgid "use a specific path for --textconv/--filters"
-msgstr "опциите „--textconv“/„--filters“ изискват път"
+msgid "read commands from stdin"
+msgstr "изчитане на командите от стандартния вход"
 
-#: builtin/cat-file.c:675
-msgid "allow -s and -t to work with broken/corrupt objects"
-msgstr "позволяване на опциите „-s“ и „-t“ да работят с повредени обекти"
+msgid "with --batch[-check]: ignores stdin, batches all known objects"
+msgstr ""
+"с „--batch[-check]“: данните от стандартния вход се прескачат, всички обекти "
+"се извеждат пакетно"
+
+msgid "Change or optimize batch output"
+msgstr "Промяна или оптимизиране на пакетното извеждане"
 
-#: builtin/cat-file.c:676
 msgid "buffer --batch output"
 msgstr "буфериране на изхода от „--batch“"
 
-#: builtin/cat-file.c:678
-msgid "show info and content of objects fed from the standard input"
+msgid "follow in-tree symlinks"
+msgstr "следване на символните връзки в работното дърво"
+
+msgid "do not order objects before emitting them"
+msgstr "без подредба на обектите преди извеждането им"
+
+msgid ""
+"Emit object (blob or tree) with conversion or filter (stand-alone, or with "
+"batch)"
 msgstr ""
-"извеждане на информация и съдържание на обектите подадени на стандартния вход"
+"Извеждане на обект (BLOB или дърво) с преобразуване или филтриране (както "
+"единично, така и в пакет)"
 
-#: builtin/cat-file.c:682
-msgid "show info about objects fed from the standard input"
-msgstr "извеждане на информация за обектите подадени на стандартния вход"
+msgid "run textconv on object's content"
+msgstr "да се изпълни програмата от „textconv“ върху съдържанието на обекта"
 
-#: builtin/cat-file.c:686
-msgid "follow in-tree symlinks (used with --batch or --batch-check)"
+msgid "run filters on object's content"
+msgstr "да се изпълнят филтрите върху съдържанието на обекта"
+
+msgid "blob|tree"
+msgstr "обект-BLOB|дърво"
+
+msgid "use a <path> for (--textconv | --filters); Not with 'batch'"
 msgstr ""
-"следване на символните връзки сочещи в дървото (ползва се с „--batch“ или „--"
-"batch-check“)"
+"опциите „--textconv“/„--filters“ изискват ПЪТ, а пакетният режим (batch) не"
+
+#, c-format
+msgid "'%s=<%s>' needs '%s' or '%s'"
+msgstr "„%s=<%s>“ изисква „%s“ или „%s“"
+
+msgid "path|tree-ish"
+msgstr "ПЪТ|ДЪРВО"
+
+#, c-format
+msgid "'%s' requires a batch mode"
+msgstr "опцията „%s“ изисква пакетен режим"
+
+#, c-format
+msgid "'-%c' is incompatible with batch mode"
+msgstr "опцията „-%c“ е несъвместима с пакетния режим"
+
+msgid "batch modes take no arguments"
+msgstr "пакетните режими не приемат никакви опции"
+
+#, c-format
+msgid "<rev> required with '%s'"
+msgstr "опцията „%s“ изисква версия"
+
+#, c-format
+msgid "<object> required with '-%c'"
+msgstr "опцията „-%c“ изисква обект"
 
-#: builtin/cat-file.c:688
-msgid "show all objects with --batch or --batch-check"
-msgstr "извеждане на всички обекти с „--batch“ или „--batch-check“"
+msgid "too many arguments"
+msgstr "прекалено много аргументи"
 
-#: builtin/cat-file.c:690
-msgid "do not order --batch-all-objects output"
-msgstr "без подреждане на изхода от „--batch-all-objects“"
+#, c-format
+msgid "only two arguments allowed in <type> <object> mode, not %d"
+msgstr "в режим с посочен ВИД ОБЕКТ се изискват точно два аргумента, а не %d"
 
-#: builtin/check-attr.c:13
 msgid "git check-attr [-a | --all | <attr>...] [--] <pathname>..."
 msgstr "git check-attr [-a | --all | АТРИБУТ…] [--] ПЪТ…"
 
-#: builtin/check-attr.c:14
 msgid "git check-attr --stdin [-z] [-a | --all | <attr>...]"
 msgstr "git check-attr --stdin [-z] [-a | --all | АТРИБУТ…]"
 
-#: builtin/check-attr.c:21
 msgid "report all attributes set on file"
 msgstr "извеждане на всички атрибути, зададени върху файл"
 
-#: builtin/check-attr.c:22
 msgid "use .gitattributes only from the index"
 msgstr "използване на файла „.gitattributes“ само от индекса"
 
-#: builtin/check-attr.c:23 builtin/check-ignore.c:25 builtin/hash-object.c:100
 msgid "read file names from stdin"
 msgstr "изчитане на имената на файловете от стандартния вход"
 
-#: builtin/check-attr.c:25 builtin/check-ignore.c:27
 msgid "terminate input and output records by a NUL character"
 msgstr "разделяне на входните и изходните записи с нулевия знак „NUL“"
 
-#: builtin/check-ignore.c:21 builtin/checkout.c:1532 builtin/gc.c:550
-#: builtin/worktree.c:493
 msgid "suppress progress reporting"
 msgstr "без показване на напредъка"
 
-#: builtin/check-ignore.c:29
 msgid "show non-matching input paths"
 msgstr "извеждане на несъвпадащите пътища"
 
-#: builtin/check-ignore.c:31
 msgid "ignore index when checking"
 msgstr "прескачане на индекса при проверката"
 
-#: builtin/check-ignore.c:165
 msgid "cannot specify pathnames with --stdin"
 msgstr "опцията „--stdin“ е несъвместима с имена на пътища"
 
-#: builtin/check-ignore.c:168
 msgid "-z only makes sense with --stdin"
 msgstr "опцията „-z“ изисква „--stdin“"
 
-#: builtin/check-ignore.c:170
 msgid "no path specified"
 msgstr "не е зададен път"
 
-#: builtin/check-ignore.c:174
 msgid "--quiet is only valid with a single pathname"
 msgstr "опцията „--quiet“ изисква да е подаден точно един път"
 
-#: builtin/check-ignore.c:176
 msgid "cannot have both --quiet and --verbose"
 msgstr "опциите „--quiet“ и „--verbose“ са несъвместими"
 
-#: builtin/check-ignore.c:179
 msgid "--non-matching is only valid with --verbose"
 msgstr "опцията „--non-matching“ изисква „--verbose“"
 
-#: builtin/check-mailmap.c:9
 msgid "git check-mailmap [<options>] <contact>..."
 msgstr "git check-mailmap [ОПЦИЯ…] КОНТАКТ…"
 
-#: builtin/check-mailmap.c:14
 msgid "also read contacts from stdin"
 msgstr "четене на контакти и от стандартния вход"
 
-#: builtin/check-mailmap.c:25
 #, c-format
 msgid "unable to parse contact: %s"
 msgstr "контактът не може да бъде анализиран: %s"
 
-#: builtin/check-mailmap.c:48
 msgid "no contacts specified"
 msgstr "не са указани контакти"
 
-#: builtin/checkout--worker.c:110
 msgid "git checkout--worker [<options>]"
 msgstr "git checkout--worker [ОПЦИЯ…]"
 
-#: builtin/checkout--worker.c:118 builtin/checkout-index.c:201
-#: builtin/column.c:31 builtin/column.c:32 builtin/submodule--helper.c:1864
-#: builtin/submodule--helper.c:1867 builtin/submodule--helper.c:1875
-#: builtin/submodule--helper.c:2511 builtin/submodule--helper.c:2577
-#: builtin/worktree.c:491 builtin/worktree.c:728
 msgid "string"
 msgstr "НИЗ"
 
-#: builtin/checkout--worker.c:119 builtin/checkout-index.c:202
 msgid "when creating files, prepend <string>"
 msgstr "при създаването на нови файлове да се добавя префикса НИЗ"
 
-#: builtin/checkout-index.c:152
 msgid "git checkout-index [<options>] [--] [<file>...]"
 msgstr "git checkout-index [ОПЦИЯ…] [--] [ФАЙЛ…]"
 
-#: builtin/checkout-index.c:169
 msgid "stage should be between 1 and 3 or all"
 msgstr "етапът трябва да е „1“, „2“, „3“ или „all“ (всички)"
 
-#: builtin/checkout-index.c:187
 msgid "check out all files in the index"
 msgstr "изтегляне на всички файлове в индекса"
 
-#: builtin/checkout-index.c:188
+msgid "do not skip files with skip-worktree set"
+msgstr ""
+"без прескачане на файловете със зададен флаг, че са само за индекса (за "
+"прескачане на работното дърво)"
+
 msgid "force overwrite of existing files"
 msgstr "презаписване на файловете, дори и да съществуват"
 
-#: builtin/checkout-index.c:190
 msgid "no warning for existing files and files not in index"
 msgstr "без предупреждения при липсващи файлове и файлове не в индекса"
 
-#: builtin/checkout-index.c:192
 msgid "don't checkout new files"
 msgstr "без изтегляне на нови файлове"
 
-#: builtin/checkout-index.c:194
 msgid "update stat information in the index file"
 msgstr "обновяване на информацията получена чрез „stat“ за файловете в индекса"
 
-#: builtin/checkout-index.c:198
 msgid "read list of paths from the standard input"
 msgstr "изчитане на пътищата от стандартния вход"
 
-#: builtin/checkout-index.c:200
 msgid "write the content to temporary files"
 msgstr "записване на съдържанието във временни файлове"
 
-#: builtin/checkout-index.c:204
 msgid "copy out the files from named stage"
 msgstr "копиране на файловете от това състояние на сливане"
 
-#: builtin/checkout.c:33
 msgid "git checkout [<options>] <branch>"
 msgstr "git checkout [ОПЦИЯ…] КЛОН"
 
-#: builtin/checkout.c:34
 msgid "git checkout [<options>] [<branch>] -- <file>..."
 msgstr "git checkout [ОПЦИЯ…] [КЛОН] -- ФАЙЛ…"
 
-#: builtin/checkout.c:39
 msgid "git switch [<options>] [<branch>]"
 msgstr "git switch [ОПЦИЯ…] КЛОН"
 
-#: builtin/checkout.c:44
 msgid "git restore [<options>] [--source=<branch>] <file>..."
 msgstr "git restore [ОПЦИЯ…] [--source=КЛОН] ФАЙЛ…"
 
-#: builtin/checkout.c:198 builtin/checkout.c:237
 #, c-format
 msgid "path '%s' does not have our version"
 msgstr "вашата версия липсва в пътя „%s“"
 
-#: builtin/checkout.c:200 builtin/checkout.c:239
 #, c-format
 msgid "path '%s' does not have their version"
 msgstr "чуждата версия липсва в пътя „%s“"
 
-#: builtin/checkout.c:216
 #, c-format
 msgid "path '%s' does not have all necessary versions"
 msgstr "някоя от необходимите версии липсва в пътя „%s“"
 
-#: builtin/checkout.c:269
 #, c-format
 msgid "path '%s' does not have necessary versions"
 msgstr "някоя от необходимите версии липсва в пътя „%s“"
 
-#: builtin/checkout.c:286
 #, c-format
 msgid "path '%s': cannot merge"
 msgstr "пътят „%s“ не може да бъде слян"
 
-#: builtin/checkout.c:302
 #, c-format
 msgid "Unable to add merge result for '%s'"
 msgstr "Резултатът за „%s“ не може да бъде слян"
 
-#: builtin/checkout.c:419
 #, c-format
 msgid "Recreated %d merge conflict"
 msgid_plural "Recreated %d merge conflicts"
 msgstr[0] "Пресъздаден е %d конфликт при сливане"
 msgstr[1] "Пресъздадени са %d конфликта при сливане"
 
-#: builtin/checkout.c:424
 #, 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:431
 #, 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:454 builtin/checkout.c:457 builtin/checkout.c:460
-#: builtin/checkout.c:464
 #, c-format
 msgid "'%s' cannot be used with updating paths"
 msgstr "опцията „%s“ е несъвместима с обновяването на пътища"
 
-#: builtin/checkout.c:474
 #, c-format
 msgid "Cannot update paths and switch to branch '%s' at the same time."
 msgstr ""
 "Невъзможно е едновременно да обновявате пътища и да преминете към клона „%s“."
 
-#: builtin/checkout.c:478
 #, c-format
 msgid "neither '%s' or '%s' is specified"
 msgstr "не е указано нито „%s“, нито „%s“"
 
-#: builtin/checkout.c:482
 #, c-format
 msgid "'%s' must be used when '%s' is not specified"
 msgstr "опцията „%s“ е задължителна, когато „%s“ не е зададена"
 
-#: builtin/checkout.c:487 builtin/checkout.c:492
 #, c-format
 msgid "'%s' or '%s' cannot be used with %s"
 msgstr "опцията „%3$s“ е несъвместима както с „%1$s“, така и с „%2$s“"
 
-#: builtin/checkout.c:566 builtin/checkout.c:573
 #, c-format
 msgid "path '%s' is unmerged"
 msgstr "пътят „%s“ не е слят"
 
-#: builtin/checkout.c:747
 msgid "you need to resolve your current index first"
 msgstr "първо трябва да коригирате индекса си"
 
-#: builtin/checkout.c:797
 #, c-format
 msgid ""
 "cannot continue with staged changes in the following files:\n"
 "%s"
 msgstr ""
-"не може да се продължи с промени в следните файлове, които са добавени в "
+"не може да се продължи с промѐни в следните файлове, които са добавени в "
 "индекса:\n"
 "%s"
 
-#: builtin/checkout.c:890
 #, c-format
 msgid "Can not do reflog for '%s': %s\n"
 msgstr "Журналът на указателите за „%s“ не може да се проследи: %s\n"
 
-#: builtin/checkout.c:934
 msgid "HEAD is now at"
 msgstr "Указателят „HEAD“ в момента сочи към"
 
-#: builtin/checkout.c:938 builtin/clone.c:609 t/helper/test-fast-rebase.c:203
 msgid "unable to update HEAD"
 msgstr "Указателят „HEAD“ не може да бъде обновен"
 
-#: builtin/checkout.c:942
 #, c-format
 msgid "Reset branch '%s'\n"
 msgstr "Зануляване на клона „%s“\n"
 
-#: builtin/checkout.c:945
 #, c-format
 msgid "Already on '%s'\n"
 msgstr "Вече сте на „%s“\n"
 
-#: builtin/checkout.c:949
 #, c-format
 msgid "Switched to and reset branch '%s'\n"
-msgstr "Преминаване към клона „%s“ и зануляване на промените\n"
+msgstr "Преминаване към клона „%s“ и зануляване на промѐните\n"
 
-#: builtin/checkout.c:951 builtin/checkout.c:1388
 #, c-format
 msgid "Switched to a new branch '%s'\n"
 msgstr "Преминахте към новия клон „%s“\n"
 
-#: builtin/checkout.c:953
 #, c-format
 msgid "Switched to branch '%s'\n"
 msgstr "Преминахте към клона „%s“\n"
 
-#: builtin/checkout.c:1004
 #, c-format
 msgid " ... and %d more.\n"
 msgstr "… и още %d.\n"
 
-#: builtin/checkout.c:1010
 #, c-format
 msgid ""
 "Warning: you are leaving %d commit behind, not connected to\n"
@@ -13013,7 +3836,6 @@ msgstr[1] ""
 "\n"
 "%s\n"
 
-#: builtin/checkout.c:1029
 #, c-format
 msgid ""
 "If you want to keep it by creating a new branch, this may be a good time\n"
@@ -13034,25 +3856,21 @@ msgstr[0] ""
 "    git branch ИМЕ_НА_НОВИЯ_КЛОН %s\n"
 "\n"
 msgstr[1] ""
-"Ако все пак искате да запазите тези промени чрез създаване на клон,\n"
+"Ако все пак искате да запазите тези промѐни чрез създаване на клон,\n"
 "сега е най-подходящият за това чрез командата:\n"
 "\n"
 "    git branch ИМЕ_НА_НОВИЯ_КЛОН %s\n"
 "\n"
 
-#: builtin/checkout.c:1064
 msgid "internal error in revision walk"
 msgstr "вътрешна грешка при обхождането на версиите"
 
-#: builtin/checkout.c:1068
 msgid "Previous HEAD position was"
 msgstr "Преди това „HEAD“ сочеше към"
 
-#: builtin/checkout.c:1114 builtin/checkout.c:1383
 msgid "You are on a branch yet to be born"
 msgstr "В момента сте на клон, който все още не е създаден"
 
-#: builtin/checkout.c:1196
 #, c-format
 msgid ""
 "'%s' could be both a local file and a tracking branch.\n"
@@ -13061,7 +3879,6 @@ msgstr ""
 "„%s“ може да е както локален файл, така и следящ клон.  За уточняване\n"
 "ползвайте разделителя „--“ (и евентуално опцията „--no-guess“)"
 
-#: builtin/checkout.c:1203
 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"
@@ -13083,51 +3900,47 @@ msgstr ""
 "\n"
 "    checkout.defaultRemote=origin"
 
-#: builtin/checkout.c:1213
 #, c-format
 msgid "'%s' matched multiple (%d) remote tracking branches"
 msgstr "„%s“ напасва с множество (%d) отдалечени клони"
 
-#: builtin/checkout.c:1279
 msgid "only one reference expected"
 msgstr "очаква се само един указател"
 
-#: builtin/checkout.c:1296
 #, c-format
 msgid "only one reference expected, %d given."
 msgstr "очаква се един указател, а сте подали %d."
 
-#: builtin/checkout.c:1342 builtin/worktree.c:269 builtin/worktree.c:436
 #, c-format
 msgid "invalid reference: %s"
 msgstr "неправилен указател: %s"
 
-#: builtin/checkout.c:1355 builtin/checkout.c:1725
 #, c-format
 msgid "reference is not a tree: %s"
 msgstr "указателят не сочи към обект-дърво: %s"
 
-#: builtin/checkout.c:1402
 #, c-format
 msgid "a branch is expected, got tag '%s'"
 msgstr "очаква се клон, а не етикет — „%s“"
 
-#: builtin/checkout.c:1404
 #, c-format
 msgid "a branch is expected, got remote branch '%s'"
 msgstr "очаква се локален, а не отдалечен клон — „%s“"
 
-#: builtin/checkout.c:1405 builtin/checkout.c:1413
 #, c-format
 msgid "a branch is expected, got '%s'"
 msgstr "очаква се клон, а не „%s“"
 
-#: builtin/checkout.c:1408
 #, c-format
 msgid "a branch is expected, got commit '%s'"
 msgstr "очаква се клон, а не подаване — „%s“"
 
-#: builtin/checkout.c:1424
+msgid ""
+"If you want to detach HEAD at the commit, try again with the --detach option."
+msgstr ""
+"Ако искате да откъснете указателя „HEAD“ при подаването, ползвайте отново, "
+"като добавите опции „--detach“."
+
 msgid ""
 "cannot switch branch while merging\n"
 "Consider \"git merge --quit\" or \"git worktree add\"."
@@ -13135,7 +3948,6 @@ msgstr ""
 "по време на сливане не може да преминете към друг клон.\n"
 "Пробвайте с „git merge --quit“ или „git worktree add“."
 
-#: builtin/checkout.c:1428
 msgid ""
 "cannot switch branch in the middle of an am session\n"
 "Consider \"git am --quit\" or \"git worktree add\"."
@@ -13144,7 +3956,6 @@ msgstr ""
 "клон.\n"
 "Пробвайте с „git am --quit“ или „git worktree add“."
 
-#: builtin/checkout.c:1432
 msgid ""
 "cannot switch branch while rebasing\n"
 "Consider \"git rebase --quit\" or \"git worktree add\"."
@@ -13152,7 +3963,6 @@ msgstr ""
 "по време на пребазиране не може да преминете към друг клон.\n"
 "Пробвайте с „git rebase --quit“ или „git worktree add“."
 
-#: builtin/checkout.c:1436
 msgid ""
 "cannot switch branch while cherry-picking\n"
 "Consider \"git cherry-pick --quit\" or \"git worktree add\"."
@@ -13160,7 +3970,6 @@ msgstr ""
 "по време на отбиране на подавания не може да преминете към друг клон.\n"
 "Пробвайте с „git cherry-pick --quit“ или „git worktree add“."
 
-#: builtin/checkout.c:1440
 msgid ""
 "cannot switch branch while reverting\n"
 "Consider \"git revert --quit\" or \"git worktree add\"."
@@ -13168,129 +3977,97 @@ msgstr ""
 "по време на отмяна на подавания не може да преминете към друг клон.\n"
 "Пробвайте с „git revert --quit“ или „git worktree add“."
 
-#: builtin/checkout.c:1444
 msgid "you are switching branch while bisecting"
 msgstr "преминаване към друг клон по време на двоично търсене"
 
-#: builtin/checkout.c:1451
 msgid "paths cannot be used with switching branches"
 msgstr "задаването на път е несъвместимо с преминаването от един клон към друг"
 
-#: builtin/checkout.c:1454 builtin/checkout.c:1458 builtin/checkout.c:1462
 #, c-format
 msgid "'%s' cannot be used with switching branches"
 msgstr "опцията „%s“ е несъвместима с преминаването от един клон към друг"
 
-#: builtin/checkout.c:1466 builtin/checkout.c:1469 builtin/checkout.c:1472
-#: builtin/checkout.c:1477 builtin/checkout.c:1482
 #, c-format
 msgid "'%s' cannot be used with '%s'"
 msgstr "опцията „%s“ е несъвместима с „%s“"
 
-#: builtin/checkout.c:1479
 #, c-format
 msgid "'%s' cannot take <start-point>"
 msgstr "опцията „%s“ е несъвместима със задаването на НАЧАЛО"
 
-#: builtin/checkout.c:1487
 #, c-format
 msgid "Cannot switch branch to a non-commit '%s'"
 msgstr ""
 "За да преминете към клон, подайте указател, който сочи към подаване.  „%s“ "
 "не е такъв"
 
-#: builtin/checkout.c:1494
 msgid "missing branch or commit argument"
 msgstr "липсва аргумент — клон или подаване"
 
-#: builtin/checkout.c:1537
 msgid "perform a 3-way merge with the new branch"
 msgstr "извършване на тройно сливане с новия клон"
 
-#: builtin/checkout.c:1538 builtin/log.c:1825 parse-options.h:323
 msgid "style"
 msgstr "СТИЛ"
 
-#: builtin/checkout.c:1539
 msgid "conflict style (merge, diff3, or zdiff3)"
 msgstr ""
 "действие при конфликт („merge“ — сливане или тройна разлика с „diff3“ или "
 "„zdiff3“)"
 
-#: builtin/checkout.c:1551 builtin/worktree.c:488
 msgid "detach HEAD at named commit"
 msgstr "отделяне на указателя „HEAD“ към указаното подаване"
 
-#: builtin/checkout.c:1553
-msgid "set up tracking mode (see git-pull(1))"
-msgstr "задаване на режима на следене (виж git-pull(1))"
-
-#: builtin/checkout.c:1556
 msgid "force checkout (throw away local modifications)"
-msgstr "принудително изтегляне (вашите промени ще бъдат занулени)"
+msgstr "принудително изтегляне (вашите промѐни ще бъдат занулени)"
 
-#: builtin/checkout.c:1558
 msgid "new-branch"
 msgstr "НОВ_КЛОН"
 
-#: builtin/checkout.c:1558
 msgid "new unparented branch"
 msgstr "нов клон без родител"
 
-#: builtin/checkout.c:1560 builtin/merge.c:305
 msgid "update ignored files (default)"
 msgstr "обновяване на игнорираните файлове (стандартно)"
 
-#: builtin/checkout.c:1563
 msgid "do not check if another worktree is holding the given ref"
 msgstr "без проверка дали друго работно дърво държи указателя"
 
-#: builtin/checkout.c:1576
 msgid "checkout our version for unmerged files"
 msgstr "изтегляне на вашата версия на неслетите файлове"
 
-#: builtin/checkout.c:1579
 msgid "checkout their version for unmerged files"
 msgstr "изтегляне на чуждата версия на неслетите файлове"
 
-#: builtin/checkout.c:1583
 msgid "do not limit pathspecs to sparse entries only"
 msgstr "без ограничаване на изброените пътища само до частично изтеглените"
 
-#: builtin/checkout.c:1640
 #, c-format
 msgid "options '-%c', '-%c', and '%s' cannot be used together"
 msgstr "опциите „-%c“, „-%c“ и „%s“ са несъвместими"
 
-#: builtin/checkout.c:1681
 msgid "--track needs a branch name"
 msgstr "опцията „--track“ изисква име на клон"
 
-#: builtin/checkout.c:1686
 #, c-format
 msgid "missing branch name; try -%c"
 msgstr "липсва име на клон, използвайте опцията „-%c“"
 
-#: builtin/checkout.c:1718
 #, c-format
 msgid "could not resolve %s"
 msgstr "„%s“ не може да бъде открит"
 
-#: builtin/checkout.c:1734
 msgid "invalid path specification"
 msgstr "указан е неправилен път"
 
-#: builtin/checkout.c:1741
 #, c-format
 msgid "'%s' is not a commit and a branch '%s' cannot be created from it"
 msgstr "„%s“ не е подаване, затова от него не може да се създаде клон „%s“"
 
-#: builtin/checkout.c:1745
 #, c-format
 msgid "git checkout: --detach does not take a path argument '%s'"
 msgstr "git checkout: опцията „--detach“ не приема аргумент-път „%s“"
 
-#: builtin/checkout.c:1770
 msgid ""
 "git checkout: --ours/--theirs, --force and --merge are incompatible when\n"
 "checking out of the index."
@@ -13298,117 +4075,92 @@ msgstr ""
 "git checkout: опциите „--ours“/„--theirs“, „--force“ и „--merge“\n"
 "са несъвместими с изтегляне от индекса."
 
-#: builtin/checkout.c:1775
 msgid "you must specify path(s) to restore"
 msgstr "трябва да укажете поне един път за възстановяване"
 
-#: builtin/checkout.c:1800 builtin/checkout.c:1802 builtin/checkout.c:1854
-#: builtin/checkout.c:1856 builtin/clone.c:126 builtin/remote.c:170
-#: builtin/remote.c:172 builtin/submodule--helper.c:2959
-#: builtin/submodule--helper.c:3253 builtin/worktree.c:484
-#: builtin/worktree.c:486
 msgid "branch"
 msgstr "клон"
 
-#: builtin/checkout.c:1801
 msgid "create and checkout a new branch"
 msgstr "създаване и преминаване към нов клон"
 
-#: builtin/checkout.c:1803
 msgid "create/reset and checkout a branch"
 msgstr "създаване/зануляване на клон и преминаване към него"
 
-#: builtin/checkout.c:1804
 msgid "create reflog for new branch"
 msgstr "създаване на журнал на указателите за нов клон"
 
-#: builtin/checkout.c:1806
 msgid "second guess 'git checkout <no-such-branch>' (default)"
 msgstr ""
 "опит за отгатване на име на клон след неуспешен опит с „git checkout "
 "НЕСЪЩЕСТВУВАЩ_КЛОН“ (стандартно)"
 
-#: builtin/checkout.c:1807
 msgid "use overlay mode (default)"
 msgstr "използване на припокриващ режим (стандартно)"
 
-#: builtin/checkout.c:1855
 msgid "create and switch to a new branch"
 msgstr "създаване и преминаване към нов клон"
 
-#: builtin/checkout.c:1857
 msgid "create/reset and switch to a branch"
 msgstr "създаване/зануляване на клон и преминаване към него"
 
-#: builtin/checkout.c:1859
 msgid "second guess 'git switch <no-such-branch>'"
 msgstr ""
 "опит за отгатване на име на клон след неуспешен опит с „git switch "
 "НЕСЪЩЕСТВУВАЩ_КЛОН“"
 
-#: builtin/checkout.c:1861
 msgid "throw away local modifications"
-msgstr "зануляване на локалните промени"
+msgstr "зануляване на локалните промѐни"
 
-#: builtin/checkout.c:1897
 msgid "which tree-ish to checkout from"
 msgstr "към кой указател към дърво да се премине"
 
-#: builtin/checkout.c:1899
 msgid "restore the index"
 msgstr "възстановяване на индекса"
 
-#: builtin/checkout.c:1901
 msgid "restore the working tree (default)"
 msgstr "възстановяване на работното дърво (стандартно)"
 
-#: builtin/checkout.c:1903
 msgid "ignore unmerged entries"
 msgstr "пренебрегване на неслетите елементи"
 
-#: builtin/checkout.c:1904
 msgid "use overlay mode"
 msgstr "използване на припокриващ режим"
 
-#: builtin/clean.c:29
 msgid ""
 "git clean [-d] [-f] [-i] [-n] [-q] [-e <pattern>] [-x | -X] [--] <paths>..."
 msgstr "git clean [-d] [-f] [-i] [-n] [-q] [-e ШАБЛОН] [-x | -X] [--] ПЪТ…"
 
-#: builtin/clean.c:33
 #, c-format
 msgid "Removing %s\n"
 msgstr "Изтриване на „%s“\n"
 
-#: builtin/clean.c:34
 #, c-format
 msgid "Would remove %s\n"
 msgstr "Файлът „%s“ ще бъде изтрит\n"
 
-#: builtin/clean.c:35
 #, c-format
 msgid "Skipping repository %s\n"
 msgstr "Прескачане на хранилището „%s“\n"
 
-#: builtin/clean.c:36
 #, c-format
 msgid "Would skip repository %s\n"
 msgstr "Хранилището „%s“ ще бъде прескочено\n"
 
-#: builtin/clean.c:38
+#, c-format
+msgid "failed to remove %s"
+msgstr "файлът „%s“ не може да бъде изтрит"
+
 #, c-format
 msgid "could not lstat %s\n"
 msgstr "не може да се получи информация чрез „lstat“ за „%s“\n"
 
-#: builtin/clean.c:39
 msgid "Refusing to remove current working directory\n"
 msgstr "Текущата работна директория няма да бъде изтрита\n"
 
-#: builtin/clean.c:40
 msgid "Would refuse to remove current working directory\n"
 msgstr "Текущата работна директория няма да бъде изтрита\n"
 
-#: builtin/clean.c:326 git-add--interactive.perl:593
 #, c-format
 msgid ""
 "Prompt help:\n"
@@ -13421,7 +4173,6 @@ msgstr ""
 "ПРЕФИКС    — избор на единствен обект по този уникален префикс\n"
 "           — (празно) нищо да не се избира\n"
 
-#: builtin/clean.c:330 git-add--interactive.perl:602
 #, c-format
 msgid ""
 "Prompt help:\n"
@@ -13442,33 +4193,26 @@ msgstr ""
 "*          — избиране на всички обекти\n"
 "           — (празно) завършване на избирането\n"
 
-#: builtin/clean.c:545 git-add--interactive.perl:568
-#: git-add--interactive.perl:573
 #, c-format, perl-format
 msgid "Huh (%s)?\n"
 msgstr "Неправилен избор (%s).\n"
 
-#: builtin/clean.c:685
 #, c-format
 msgid "Input ignore patterns>> "
 msgstr "Шаблони за игнорирани елементи≫ "
 
-#: builtin/clean.c:719
 #, c-format
 msgid "WARNING: Cannot find items matched by: %s"
 msgstr "ПРЕДУПРЕЖДЕНИЕ: Никой обект не напасва на „%s“"
 
-#: builtin/clean.c:740
 msgid "Select items to delete"
 msgstr "Избиране на обекти за изтриване"
 
 #. TRANSLATORS: Make sure to keep [y/N] as is
-#: builtin/clean.c:781
 #, c-format
 msgid "Remove %s [y/N]? "
 msgstr "Да се изтрие ли „%s“? „y“ —  да, „N“ — НЕ"
 
-#: builtin/clean.c:812
 msgid ""
 "clean               - start cleaning\n"
 "filter by pattern   - exclude items from deletion\n"
@@ -13486,52 +4230,38 @@ msgstr ""
 "help                — този край\n"
 "?                   — подсказка за шаблоните"
 
-#: builtin/clean.c:848
 msgid "Would remove the following item:"
 msgid_plural "Would remove the following items:"
 msgstr[0] "Следният обект ще бъде изтрит:"
 msgstr[1] "Следните обекти ще бъдат изтрити:"
 
-#: builtin/clean.c:864
 msgid "No more files to clean, exiting."
 msgstr "Файловете за изчистване свършиха.  Изход от програмата."
 
-#: builtin/clean.c:926
 msgid "do not print names of files removed"
 msgstr "без извеждане на имената на файловете, които ще бъдат изтрити"
 
-#: builtin/clean.c:928
 msgid "force"
 msgstr "принудително изтриване"
 
-#: builtin/clean.c:929
 msgid "interactive cleaning"
 msgstr "интерактивно изтриване"
 
-#: builtin/clean.c:931
 msgid "remove whole directories"
 msgstr "изтриване на цели директории"
 
-#: builtin/clean.c:932 builtin/describe.c:565 builtin/describe.c:567
-#: builtin/grep.c:937 builtin/log.c:184 builtin/log.c:186
-#: builtin/ls-files.c:651 builtin/name-rev.c:535 builtin/name-rev.c:537
-#: builtin/show-ref.c:179
 msgid "pattern"
 msgstr "ШАБЛОН"
 
-#: builtin/clean.c:933
 msgid "add <pattern> to ignore rules"
 msgstr "добавяне на ШАБЛОН от файлове, които да не се трият"
 
-#: builtin/clean.c:934
 msgid "remove ignored files, too"
 msgstr "изтриване и на игнорираните файлове"
 
-#: builtin/clean.c:936
 msgid "remove only ignored files"
 msgstr "изтриване само на игнорирани файлове"
 
-#: builtin/clean.c:951
 msgid ""
 "clean.requireForce set to true and neither -i, -n, nor -f given; refusing to "
 "clean"
@@ -13539,7 +4269,6 @@ msgstr ""
 "Настройката „clean.requireForce“ е зададена като истина, което изисква някоя "
 "от опциите „-i“, „-n“ или „-f“.  Няма да се извърши изчистване"
 
-#: builtin/clean.c:954
 msgid ""
 "clean.requireForce defaults to true and neither -i, -n, nor -f given; "
 "refusing to clean"
@@ -13548,219 +4277,169 @@ msgstr ""
 "което изисква някоя от опциите „-i“, „-n“ или „-f“.  Няма да се извърши "
 "изчистване"
 
-#: builtin/clean.c:966
 msgid "-x and -X cannot be used together"
 msgstr "опциите „-x“ и „-X“ са несъвместими"
 
-#: builtin/clone.c:45
 msgid "git clone [<options>] [--] <repo> [<dir>]"
 msgstr "git clone [ОПЦИЯ…] [--] ХРАНИЛИЩЕ [ДИРЕКТОРИЯ]"
 
-#: builtin/clone.c:96
 msgid "don't clone shallow repository"
 msgstr "без клониране на плитко хранилище"
 
-#: builtin/clone.c:98
 msgid "don't create a checkout"
 msgstr "без създаване на работно дърво"
 
-#: builtin/clone.c:99 builtin/clone.c:101 builtin/init-db.c:542
 msgid "create a bare repository"
 msgstr "създаване на голо хранилище"
 
-#: builtin/clone.c:103
 msgid "create a mirror repository (implies bare)"
 msgstr ""
 "създаване на хранилище-огледало (включва опцията „--bare“ за голо хранилище)"
 
-#: builtin/clone.c:105
 msgid "to clone from a local repository"
 msgstr "клониране от локално хранилище"
 
-#: builtin/clone.c:107
 msgid "don't use local hardlinks, always copy"
 msgstr "без твърди връзки, файловете винаги да се копират"
 
-#: builtin/clone.c:109
 msgid "setup as shared repository"
 msgstr "настройване за споделено хранилище"
 
-#: builtin/clone.c:111
 msgid "pathspec"
 msgstr "път"
 
-#: builtin/clone.c:111
 msgid "initialize submodules in the clone"
 msgstr "инициализиране на подмодулите при това клониране"
 
-#: builtin/clone.c:115
 msgid "number of submodules cloned in parallel"
 msgstr "брой подмодули, клонирани паралелно"
 
-#: builtin/clone.c:116 builtin/init-db.c:539
 msgid "template-directory"
 msgstr "директория с шаблони"
 
-#: builtin/clone.c:117 builtin/init-db.c:540
 msgid "directory from which templates will be used"
 msgstr "директория, която съдържа шаблоните, които да се ползват"
 
-#: builtin/clone.c:119 builtin/clone.c:121 builtin/submodule--helper.c:1871
-#: builtin/submodule--helper.c:2514 builtin/submodule--helper.c:3260
 msgid "reference repository"
 msgstr "еталонно хранилище"
 
-#: builtin/clone.c:123 builtin/submodule--helper.c:1873
-#: builtin/submodule--helper.c:2516
 msgid "use --reference only while cloning"
 msgstr "опцията „--reference“ може да се използва само при клониране"
 
-#: builtin/clone.c:124 builtin/column.c:27 builtin/fmt-merge-msg.c:27
-#: builtin/init-db.c:550 builtin/merge-file.c:48 builtin/merge.c:290
-#: builtin/pack-objects.c:3944 builtin/repack.c:665
-#: builtin/submodule--helper.c:3262 t/helper/test-simple-ipc.c:595
-#: t/helper/test-simple-ipc.c:597
 msgid "name"
 msgstr "ИМЕ"
 
-#: builtin/clone.c:125
 msgid "use <name> instead of 'origin' to track upstream"
 msgstr "използване на това ИМЕ вместо „origin“ при проследяване на клони"
 
-#: builtin/clone.c:127
 msgid "checkout <branch> instead of the remote's HEAD"
 msgstr "изтегляне на този КЛОН, а не соченият от отдалечения указател „HEAD“"
 
-#: builtin/clone.c:129
 msgid "path to git-upload-pack on the remote"
 msgstr "път към командата „git-upload-pack“ на отдалеченото хранилище"
 
-#: builtin/clone.c:130 builtin/fetch.c:181 builtin/grep.c:876
-#: builtin/pull.c:212
 msgid "depth"
 msgstr "ДЪЛБОЧИНА"
 
-#: builtin/clone.c:131
 msgid "create a shallow clone of that depth"
 msgstr "плитко клониране до тази ДЪЛБОЧИНА"
 
-#: builtin/clone.c:132 builtin/fetch.c:183 builtin/pack-objects.c:3933
-#: builtin/pull.c:215
 msgid "time"
 msgstr "ВРЕМЕ"
 
-#: builtin/clone.c:133
 msgid "create a shallow clone since a specific time"
 msgstr "плитко клониране до момент във времето"
 
-#: builtin/clone.c:134 builtin/fetch.c:185 builtin/fetch.c:208
-#: builtin/pull.c:218 builtin/pull.c:243 builtin/rebase.c:1022
 msgid "revision"
 msgstr "ВЕРСИЯ"
 
-#: builtin/clone.c:135 builtin/fetch.c:186 builtin/pull.c:219
 msgid "deepen history of shallow clone, excluding rev"
 msgstr "задълбочаване на историята на плитко хранилище до изключващ указател"
 
-#: builtin/clone.c:137 builtin/submodule--helper.c:1883
-#: builtin/submodule--helper.c:2530
 msgid "clone only one branch, HEAD or --branch"
 msgstr ""
 "клониране само на един клон — или сочения от отдалечения „HEAD“, или изрично "
 "зададения с „--branch“"
 
-#: builtin/clone.c:139
 msgid "don't clone any tags, and make later fetches not to follow them"
 msgstr ""
 "без клониране на етикети, като последващите доставяния няма да ги следят"
 
-#: builtin/clone.c:141
 msgid "any cloned submodules will be shallow"
 msgstr "всички клонирани подмодули ще са плитки"
 
-#: builtin/clone.c:142 builtin/init-db.c:548
 msgid "gitdir"
 msgstr "СЛУЖЕБНА_ДИРЕКТОРИЯ"
 
-#: builtin/clone.c:143 builtin/init-db.c:549
 msgid "separate git dir from working tree"
 msgstr "отделна СЛУЖЕБНА_ДИРЕКТОРИЯ за git извън работното дърво"
 
-#: builtin/clone.c:144
 msgid "key=value"
 msgstr "КЛЮЧ=СТОЙНОСТ"
 
-#: builtin/clone.c:145
 msgid "set config inside the new repository"
 msgstr "задаване на настройките на новото хранилище"
 
-#: builtin/clone.c:147 builtin/fetch.c:203 builtin/ls-remote.c:77
-#: builtin/pull.c:234 builtin/push.c:575 builtin/send-pack.c:200
 msgid "server-specific"
 msgstr "специфични за сървъра"
 
-#: builtin/clone.c:147 builtin/fetch.c:203 builtin/ls-remote.c:77
-#: 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:204 builtin/pull.c:238
-#: builtin/push.c:576
 msgid "use IPv4 addresses only"
 msgstr "само адреси IPv4"
 
-#: builtin/clone.c:150 builtin/fetch.c:206 builtin/pull.c:241
-#: builtin/push.c:578
 msgid "use IPv6 addresses only"
 msgstr "само адреси IPv6"
 
-#: builtin/clone.c:154
+msgid "apply partial clone filters to submodules"
+msgstr "прилагане на филтрите за непълно хранилище към подмодулите"
+
 msgid "any cloned submodules will use their remote-tracking branch"
 msgstr "всички клонирани подмодули ще ползват следящите си клони"
 
-#: builtin/clone.c:156
 msgid "initialize sparse-checkout file to include only files at root"
 msgstr ""
 "инициализиране на файла за частично изтегляне („.git/info/sparse-checkout“) "
 "да съдържа само файловете в основната директория"
 
-#: builtin/clone.c:231
 #, c-format
 msgid "info: Could not add alternate for '%s': %s\n"
 msgstr ""
 "ПРЕДУПРЕЖДЕНИЕ: не може да се добави алтернативен източник на „%s“: %s\n"
 
-#: builtin/clone.c:304
+#, c-format
+msgid "failed to stat '%s'"
+msgstr "не може да бъде получена информация чрез „stat“ за „%s“"
+
 #, c-format
 msgid "%s exists and is not a directory"
 msgstr "„%s“ съществува и не е директория"
 
-#: builtin/clone.c:322
 #, c-format
 msgid "failed to start iterator over '%s'"
 msgstr "неуспешно итериране по „%s“"
 
-#: builtin/clone.c:353
+#, c-format
+msgid "failed to unlink '%s'"
+msgstr "неуспешно изтриване на „%s“"
+
 #, c-format
 msgid "failed to create link '%s'"
 msgstr "връзката „%s“ не може да бъде създадена"
 
-#: builtin/clone.c:357
 #, c-format
 msgid "failed to copy file to '%s'"
 msgstr "файлът не може да бъде копиран като „%s“"
 
-#: builtin/clone.c:362
 #, c-format
 msgid "failed to iterate over '%s'"
 msgstr "неуспешно итериране по „%s“"
 
-#: builtin/clone.c:389
 #, c-format
 msgid "done.\n"
 msgstr "действието завърши.\n"
 
-#: builtin/clone.c:403
 msgid ""
 "Clone succeeded, but checkout failed.\n"
 "You can inspect what was checked out with 'git status'\n"
@@ -13773,104 +4452,85 @@ msgstr ""
 "\n"
 "    git restore --source=HEAD :/\n"
 
-#: builtin/clone.c:480
 #, c-format
 msgid "Could not find remote branch %s to clone."
 msgstr ""
 "Клонът „%s“ от отдалеченото хранилище, което клонирате,\n"
 "и който следва да бъде изтеглен, не съществува."
 
-#: builtin/clone.c:597
+msgid "remote did not send all necessary objects"
+msgstr "отдалеченото хранилище не изпрати всички необходими обекти."
+
 #, c-format
 msgid "unable to update %s"
 msgstr "обектът „%s“ не може да бъде обновен"
 
-#: builtin/clone.c:645
 msgid "failed to initialize sparse-checkout"
 msgstr "частичното изтегляне не може да се инициализира"
 
-#: builtin/clone.c:668
 msgid "remote HEAD refers to nonexistent ref, unable to checkout.\n"
 msgstr ""
 "указателят „HEAD“ от отдалеченото хранилище сочи към нещо,\n"
 "което не съществува.  Не може да се изтегли определен клон.\n"
 
-#: builtin/clone.c:701
 msgid "unable to checkout working tree"
 msgstr "работното дърво не може да бъде подготвено"
 
-#: builtin/clone.c:779
 msgid "unable to write parameters to config file"
 msgstr "настройките не може да бъдат записани в конфигурационния файл"
 
-#: builtin/clone.c:842
 msgid "cannot repack to clean up"
 msgstr "не може да се извърши пакетиране за изчистване на файловете"
 
-#: builtin/clone.c:844
 msgid "cannot unlink temporary alternates file"
 msgstr "временният файл за алтернативни обекти не може да бъде изтрит"
 
-#: builtin/clone.c:886
 msgid "Too many arguments."
 msgstr "Прекалено много аргументи."
 
-#: builtin/clone.c:890 contrib/scalar/scalar.c:414
 msgid "You must specify a repository to clone."
 msgstr "Трябва да укажете кое хранилище искате да клонирате."
 
-#: builtin/clone.c:903
 #, c-format
 msgid "options '%s' and '%s %s' cannot be used together"
 msgstr "опциите „%s“ и „%s %s“ са несъвместими"
 
-#: builtin/clone.c:920
 #, c-format
 msgid "repository '%s' does not exist"
 msgstr "не съществува хранилище „%s“"
 
-#: builtin/clone.c:924 builtin/fetch.c:2052
 #, c-format
 msgid "depth %s is not a positive number"
 msgstr "дълбочината трябва да е положително цяло число, а не „%s“"
 
-#: builtin/clone.c:934
 #, c-format
 msgid "destination path '%s' already exists and is not an empty directory."
 msgstr "целевият път „%s“ съществува и не е празна директория."
 
-#: builtin/clone.c:940
 #, c-format
 msgid "repository path '%s' already exists and is not an empty directory."
 msgstr "пътят в хранилището „%s“ съществува и не е празна директория."
 
-#: builtin/clone.c:954
 #, c-format
 msgid "working tree '%s' already exists."
 msgstr "в „%s“ вече съществува работно дърво."
 
-#: builtin/clone.c:969 builtin/clone.c:990 builtin/difftool.c:256
-#: builtin/log.c:2012 builtin/worktree.c:281 builtin/worktree.c:313
 #, c-format
 msgid "could not create leading directories of '%s'"
 msgstr "родителските директории на „%s“ не може да бъдат създадени"
 
-#: builtin/clone.c:974
 #, c-format
 msgid "could not create work tree dir '%s'"
 msgstr "работното дърво в „%s“ не може да бъде създадено."
 
-#: builtin/clone.c:994
 #, c-format
 msgid "Cloning into bare repository '%s'...\n"
 msgstr "Клониране и създаване на голо хранилище в „%s“…\n"
 
-#: builtin/clone.c:996
 #, c-format
 msgid "Cloning into '%s'...\n"
 msgstr "Клониране и създаване на хранилище в „%s“…\n"
 
-#: builtin/clone.c:1025
 msgid ""
 "clone --recursive is not compatible with both --reference and --reference-if-"
 "able"
@@ -13878,96 +4538,82 @@ msgstr ""
 "опцията „--recursive“ е несъвместима с опциите „--reference“ и „--reference-"
 "if-able“"
 
-#: 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:1121
 msgid "--depth is ignored in local clones; use file:// instead."
 msgstr ""
 "При локално клониране опцията „--depth“ се прескача.  Ползвайте схемата "
 "„file://“."
 
-#: builtin/clone.c:1123
 msgid "--shallow-since is ignored in local clones; use file:// instead."
 msgstr ""
 "При локално клониране опцията „--shallow-since“ се прескача.  Ползвайте "
 "схемата „file://“."
 
-#: builtin/clone.c:1125
 msgid "--shallow-exclude is ignored in local clones; use file:// instead."
 msgstr ""
 "При локално клониране опцията „--shallow-exclude“ се прескача.  Ползвайте "
 "схемата „file://“."
 
-#: builtin/clone.c:1127
 msgid "--filter is ignored in local clones; use file:// instead."
 msgstr ""
 "При локално клониране опцията „--filter“ се прескача.  Ползвайте схемата "
 "„file://“."
 
-#: builtin/clone.c:1132
+msgid "source repository is shallow, reject to clone."
+msgstr "клонираното хранилище е плитко, затова няма да се клонира."
+
 msgid "source repository is shallow, ignoring --local"
 msgstr "клонираното хранилище е плитко, затова опцията „--local“ се прескача"
 
-#: builtin/clone.c:1137
 msgid "--local is ignored"
 msgstr "опцията „--local“ се прескача"
 
-#: builtin/clone.c:1216 builtin/clone.c:1276
+msgid "cannot clone from filtered bundle"
+msgstr "не може да се клонира от филтрирана пратка"
+
 msgid "remote transport reported error"
 msgstr "отдалеченият транспорт върна грешка"
 
-#: 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:1242
 msgid "You appear to have cloned an empty repository."
 msgstr "Изглежда клонирахте празно хранилище."
 
-#: builtin/column.c:10
 msgid "git column [<options>]"
 msgstr "git column [ОПЦИЯ…]"
 
-#: builtin/column.c:27
 msgid "lookup config vars"
 msgstr "извеждане на настройките"
 
-#: builtin/column.c:28 builtin/column.c:29
 msgid "layout to use"
 msgstr "как да се подреди резултата"
 
-#: builtin/column.c:30
 msgid "maximum width"
 msgstr "максимална широчина"
 
-#: builtin/column.c:31
 msgid "padding space on left border"
 msgstr "поле в знаци отляво"
 
-#: builtin/column.c:32
 msgid "padding space on right border"
 msgstr "поле в знаци отдясно"
 
-#: builtin/column.c:33
 msgid "padding space between columns"
 msgstr "поле в знаци между колоните"
 
-#: builtin/column.c:51
 msgid "--command must be the first argument"
 msgstr "опцията „--command“ трябва да е първият аргумент"
 
-#: 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:16
 msgid ""
 "git commit-graph write [--object-dir <objdir>] [--append] [--"
 "split[=<strategy>]] [--reachable|--stdin-packs|--stdin-commits] [--changed-"
@@ -13977,98 +4623,81 @@ msgstr ""
 "split[=СТРАТЕГИЯ]] [--reachable|--stdin-packs|--stdin-commits] [--changed-"
 "paths] [--[no-]max-new-filters <n>] [--[no-]progress] ОПЦИИ_ЗА_РАЗДЕЛЯНЕ"
 
-#: builtin/commit-graph.c:51 builtin/fetch.c:192 builtin/log.c:1794
 msgid "dir"
 msgstr "директория"
 
-#: builtin/commit-graph.c:52
 msgid "the object directory to store the graph"
 msgstr "ДИРекторията_с_ОБЕКТИ за запазване на гра̀фа"
 
-#: builtin/commit-graph.c:73
 msgid "if the commit-graph is split, only verify the tip file"
 msgstr ""
 "ако гра̀фа с подаванията е раздробен, да се проверява само файлът на върха"
 
-#: builtin/commit-graph.c:100
 #, c-format
 msgid "Could not open commit-graph '%s'"
 msgstr "Графът с подаванията не може да се отвори: „%s“"
 
-#: builtin/commit-graph.c:137
 #, c-format
 msgid "unrecognized --split argument, %s"
 msgstr "непознат аргумент към „--split“: %s"
 
-#: builtin/commit-graph.c:150
 #, c-format
 msgid "unexpected non-hex object ID: %s"
 msgstr "неочакван, нешестнайсетичен идентификатор на обект:  %s"
 
-#: builtin/commit-graph.c:155
 #, c-format
 msgid "invalid object: %s"
 msgstr "неправилен обект: „%s“"
 
-#: builtin/commit-graph.c:205
+#, c-format
+msgid "option `%s' expects a numerical value"
+msgstr "опцията „%s“ очаква число за аргумент"
+
 msgid "start walk at all refs"
 msgstr "обхождането да започне от всички указатели"
 
-#: builtin/commit-graph.c:207
 msgid "scan pack-indexes listed by stdin for commits"
 msgstr ""
 "проверка на подаванията за индексите на пакетите изброени на командния ред"
 
-#: builtin/commit-graph.c:209
 msgid "start walk at commits listed by stdin"
 msgstr "започване на обхождането при подаванията подадени на стандартния вход"
 
-#: builtin/commit-graph.c:211
 msgid "include all commits already in the commit-graph file"
 msgstr ""
 "включване на всички подавания, които вече са във файла с гра̀фа на подаванията"
 
-#: builtin/commit-graph.c:213
 msgid "enable computation for changed paths"
 msgstr "включване на изчисленията за променените пътища"
 
-#: builtin/commit-graph.c:215
 msgid "allow writing an incremental commit-graph file"
 msgstr "позволяване на запис на нарастващ файл с гра̀фа на подаванията"
 
-#: builtin/commit-graph.c:219
 msgid "maximum number of commits in a non-base split commit-graph"
 msgstr "максимален брой подавания в небазово ниво на раздробен граф"
 
-#: builtin/commit-graph.c:221
 msgid "maximum ratio between two levels of a split commit-graph"
 msgstr ""
 "максимално отношение на броя подавания в две последователни нива в раздробен "
 "граф"
 
-#: builtin/commit-graph.c:223
 msgid "only expire files older than a given date-time"
 msgstr "обявяване за остарели само на файловете по-стари от това ВРЕМЕ"
 
-#: builtin/commit-graph.c:225
 msgid "maximum number of changed-path Bloom filters to compute"
-msgstr "максимален брой промени в пътищата следени от филтрите на Блум"
+msgstr "максимален брой промѐни в пътищата следени от филтрите на Блум"
 
-#: 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:282
 msgid "Collecting commits from input"
 msgstr "Получаване на подаванията от входа"
 
-#: builtin/commit-graph.c:328 builtin/multi-pack-index.c:259
 #, c-format
 msgid "unrecognized subcommand: %s"
 msgstr "непозната подкоманда: %s"
 
-#: builtin/commit-tree.c:18
 msgid ""
 "git commit-tree [(-p <parent>)...] [-S[<keyid>]] [(-m <message>)...] [(-F "
 "<file>)...] <tree>"
@@ -14076,70 +4705,52 @@ msgstr ""
 "git commit-tree [(-p РОДИТЕЛ)…] [-S[ИДЕНТИФИКАТОР]] [(-m СЪОБЩЕНИЕ)…] [(-F "
 "ФАЙЛ)…] ДЪРВО"
 
-#: builtin/commit-tree.c:31
 #, c-format
 msgid "duplicate parent %s ignored"
 msgstr "прескачане на повтарящ се родител: „%s“"
 
-#: builtin/commit-tree.c:56 builtin/commit-tree.c:134 builtin/log.c:577
 #, c-format
 msgid "not a valid object name %s"
 msgstr "неправилно име на обект: „%s“"
 
-#: builtin/commit-tree.c:94
 #, c-format
 msgid "git commit-tree: failed to read '%s'"
 msgstr "git commit-tree: „%s“ не може да се прочете"
 
-#: builtin/commit-tree.c:96
 #, c-format
 msgid "git commit-tree: failed to close '%s'"
 msgstr "git commit-tree: „%s“ не може да се затвори"
 
-#: builtin/commit-tree.c:109
 msgid "parent"
 msgstr "родител"
 
-#: builtin/commit-tree.c:110
 msgid "id of a parent commit object"
 msgstr "ИДЕНТИФИКАТОР на обекта за подаването-родител"
 
-#: builtin/commit-tree.c:112 builtin/commit.c:1627 builtin/merge.c:284
-#: builtin/notes.c:407 builtin/notes.c:573 builtin/stash.c:1677
-#: builtin/tag.c:454
 msgid "message"
 msgstr "СЪОБЩЕНИЕ"
 
-#: builtin/commit-tree.c:113 builtin/commit.c:1627
 msgid "commit message"
 msgstr "СЪОБЩЕНИЕ при подаване"
 
-#: builtin/commit-tree.c:116
 msgid "read commit log message from file"
 msgstr "изчитане на съобщението за подаване от ФАЙЛ"
 
-#: builtin/commit-tree.c:119 builtin/commit.c:1644 builtin/merge.c:303
-#: builtin/pull.c:180 builtin/revert.c:118
 msgid "GPG sign commit"
 msgstr "подписване на подаването с GPG"
 
-#: builtin/commit-tree.c:131
 msgid "must give exactly one tree"
 msgstr "трябва да е точно едно дърво"
 
-#: builtin/commit-tree.c:138
 msgid "git commit-tree: failed to read"
 msgstr "git commit-tree: не може да се прочете"
 
-#: builtin/commit.c:42
 msgid "git commit [<options>] [--] <pathspec>..."
 msgstr "git commit [ОПЦИЯ…] [--] ПЪТ…"
 
-#: builtin/commit.c:47
 msgid "git status [<options>] [--] <pathspec>..."
 msgstr "git status [ОПЦИЯ…] [--] ПЪТ…"
 
-#: 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"
@@ -14151,7 +4762,6 @@ msgstr ""
 "с опцията „--allow-empty“, или да го изтриете от историята с командата:\n"
 "„git reset HEAD^“.\n"
 
-#: 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"
@@ -14166,21 +4776,18 @@ msgstr ""
 "    git commit --allow-empty\n"
 "\n"
 
-#: builtin/commit.c:64
 msgid "Otherwise, please use 'git rebase --skip'\n"
 msgstr ""
 "В противен случай използвайте командата:\n"
 "\n"
 "    git rebase --skip\n"
 
-#: builtin/commit.c:67
 msgid "Otherwise, please use 'git cherry-pick --skip'\n"
 msgstr ""
 "В противен случай използвайте командата:\n"
 "\n"
 "    git cherry-pick --skip\n"
 
-#: builtin/commit.c:70
 msgid ""
 "and then use:\n"
 "\n"
@@ -14202,69 +4809,57 @@ msgstr ""
 "    git cherry-pick --skip\n"
 "\n"
 
-#: builtin/commit.c:325
 msgid "failed to unpack HEAD tree object"
 msgstr "върховото дърво (HEAD tree object) не може да бъде извадено от пакет"
 
-#: builtin/commit.c:375
 msgid "No paths with --include/--only does not make sense."
 msgstr "опциите „--include“ и „--only“ изискват аргументи."
 
-#: builtin/commit.c:387
 msgid "unable to create temporary index"
 msgstr "временният индекс не може да бъде създаден"
 
-#: builtin/commit.c:396
 msgid "interactive add failed"
 msgstr "неуспешно интерактивно добавяне"
 
-#: builtin/commit.c:411
 msgid "unable to update temporary index"
 msgstr "временният индекс не може да бъде обновен"
 
-#: builtin/commit.c:413
 msgid "Failed to update main cache tree"
 msgstr "Дървото на основния кеш не може да бъде обновено"
 
-#: 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:490
 msgid "cannot do a partial commit during a merge."
 msgstr "по време на сливане не може да се извърши частично подаване."
 
-#: builtin/commit.c:492
 msgid "cannot do a partial commit during a cherry-pick."
 msgstr "по време на отбиране не може да се извърши частично подаване."
 
-#: builtin/commit.c:494
 msgid "cannot do a partial commit during a rebase."
 msgstr "по време на пребазиране не може да се извърши частично подаване."
 
-#: builtin/commit.c:502
 msgid "cannot read the index"
 msgstr "индексът не може да бъде прочетен"
 
-#: builtin/commit.c:521
 msgid "unable to write temporary index file"
 msgstr "временният индекс не може да бъде записан"
 
-#: builtin/commit.c:619
 #, c-format
 msgid "commit '%s' lacks author header"
 msgstr "заглавната част за автор в подаването „%s“ липсва"
 
-#: builtin/commit.c:621
 #, c-format
 msgid "commit '%s' has malformed author line"
 msgstr "заглавната част за автор в подаването „%s“ е неправилна"
 
-#: builtin/commit.c:640
 msgid "malformed --author parameter"
 msgstr "неправилен параметър към опцията „--author“"
 
-#: builtin/commit.c:693
+#, c-format
+msgid "invalid date format: %s"
+msgstr "неправилен формат на дата: %s"
+
 msgid ""
 "unable to select a comment character that is not used\n"
 "in the current commit message"
@@ -14272,81 +4867,72 @@ msgstr ""
 "не може да се избере знак за коментар — в текущото съобщение за подаване са "
 "използвани всички подобни знаци"
 
-#: 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:759 builtin/shortlog.c:416
 #, c-format
 msgid "(reading log message from standard input)\n"
 msgstr "(изчитане на съобщението за подаване от стандартния вход)\n"
 
-#: builtin/commit.c:761
 msgid "could not read log from standard input"
 msgstr "съобщението за подаване не бе прочетено стандартния вход"
 
-#: builtin/commit.c:765
 #, c-format
 msgid "could not read log file '%s'"
 msgstr "файлът със съобщението за подаване „%s“ не може да бъде прочетен"
 
-#: builtin/commit.c:802
 #, c-format
 msgid "options '%s' and '%s:%s' cannot be used together"
 msgstr "опциите „--%s“ и „--%s:%s“ са несъвместими"
 
-#: builtin/commit.c:814 builtin/commit.c:830
 msgid "could not read SQUASH_MSG"
 msgstr "съобщението за вкарване SQUASH_MSG не може да бъде прочетено"
 
-#: builtin/commit.c:821
 msgid "could not read MERGE_MSG"
 msgstr "съобщението за сливане MERGE_MSG не може да бъде прочетено"
 
-#: builtin/commit.c:881
+#, c-format
+msgid "could not open '%s'"
+msgstr "„%s“ не може да се отвори"
+
 msgid "could not write commit template"
 msgstr "шаблонът за подаване не може да бъде запазен"
 
-#: 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 ""
-"Въведете съобщението за подаване на промените.  Редовете, които започват\n"
+"Въведете съобщението за подаване на промѐните.  Редовете, които започват\n"
 "с „%c“, ще бъдат пропуснати.\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 ""
-"Въведете съобщението за подаване на промените.  Редовете, които започват\n"
+"Въведете съобщението за подаване на промѐните.  Редовете, които започват\n"
 "с „%c“, ще бъдат пропуснати, а празно съобщение преустановява подаването.\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 ""
-"Въведете съобщението за подаване на промените.  Редовете, които започват\n"
+"Въведете съобщението за подаване на промѐните.  Редовете, които започват\n"
 "с „%c“, също ще бъдат включени — може да ги изтриете вие.\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 ""
-"Въведете съобщението за подаване на промените.  Редовете, които започват\n"
+"Въведете съобщението за подаване на промѐните.  Редовете, които започват\n"
 "с „%c“, също ще бъдат включени — може да ги изтриете вие.  Празно \n"
 "съобщение преустановява подаването.\n"
 
-#: builtin/commit.c:916
 msgid ""
 "\n"
 "It looks like you may be committing a merge.\n"
@@ -14361,7 +4947,6 @@ msgstr ""
 "    git update-ref -d MERGE_HEAD\n"
 "и опитайте отново.\n"
 
-#: builtin/commit.c:921
 msgid ""
 "\n"
 "It looks like you may be committing a cherry-pick.\n"
@@ -14376,177 +4961,120 @@ msgstr ""
 "    git update-ref -d CHERRY_PICK_HEAD\n"
 "и опитайте отново.\n"
 
-#: builtin/commit.c:948
 #, c-format
 msgid "%sAuthor:    %.*s <%.*s>"
 msgstr "%sАвтор:   %.*s <%.*s>"
 
-#: builtin/commit.c:956
 #, c-format
 msgid "%sDate:      %s"
 msgstr "%sДата:    %s"
 
-#: builtin/commit.c:963
 #, c-format
 msgid "%sCommitter: %.*s <%.*s>"
 msgstr "%sПодаващ: %.*s <%.*s>"
 
-#: builtin/commit.c:981
 msgid "Cannot read index"
 msgstr "Индексът не може да бъде прочетен"
 
-#: builtin/commit.c:1026
 msgid "unable to pass trailers to --trailers"
 msgstr "епилогът не може да се подаде на „--trailers“"
 
-#: builtin/commit.c:1066
 msgid "Error building trees"
 msgstr "Грешка при изграждане на дърветата"
 
-#: builtin/commit.c:1080 builtin/tag.c:316
 #, c-format
 msgid "Please supply the message using either -m or -F option.\n"
 msgstr "Подайте съобщението с някоя от опциите „-m“ или „-F“.\n"
 
-#: builtin/commit.c:1124
 #, c-format
 msgid "--author '%s' is not 'Name <email>' and matches no existing author"
 msgstr ""
 "опцията „--author '%s'“ не отговаря на форма̀та „Име <е-поща>“ и не съвпада с "
 "никой автор"
 
-#: builtin/commit.c:1138
 #, c-format
 msgid "Invalid ignored mode '%s'"
 msgstr "Неправилен режим за игнорираните файлове: „%s“"
 
-#: builtin/commit.c:1156 builtin/commit.c:1451
 #, c-format
 msgid "Invalid untracked files mode '%s'"
 msgstr "Неправилен режим за неследените файлове: „%s“"
 
-#: builtin/commit.c:1227
 msgid "You are in the middle of a merge -- cannot reword."
 msgstr ""
-"В момента се извършва сливане, не може да промените съобщение при подаване."
+"В момента се извършва сливане, не може да променѝте съобщение при подаване."
 
-#: builtin/commit.c:1229
 msgid "You are in the middle of a cherry-pick -- cannot reword."
 msgstr ""
-"В момента се извършва отбиране на подаване, не може да промените съобщение "
+"В момента се извършва отбиране на подаване, не може да промeнѝте съобщение "
 "при подаване."
 
-#: builtin/commit.c:1232
 #, c-format
 msgid "reword option of '%s' and path '%s' cannot be used together"
 msgstr "опцията за промяна на съобщението „%s“ и пътят „%s“ са несъвместими"
 
-#: builtin/commit.c:1234
 #, c-format
 msgid "reword option of '%s' and '%s' cannot be used together"
 msgstr "опциите „%s“ и „%s“ са несъвместими"
 
-#: builtin/commit.c:1254
-msgid "Using both --reset-author and --author does not make sense"
-msgstr "опциите „--reset-author“ и „--author“ са несъвместими"
-
-#: builtin/commit.c:1261
 msgid "You have nothing to amend."
 msgstr "Няма какво да бъде поправено."
 
-#: builtin/commit.c:1264
 msgid "You are in the middle of a merge -- cannot amend."
 msgstr "В момента се извършва сливане, не може да поправяте."
 
-#: builtin/commit.c:1266
 msgid "You are in the middle of a cherry-pick -- cannot amend."
 msgstr "В момента се извършва отбиране на подаване, не може да поправяте."
 
-#: builtin/commit.c:1268
 msgid "You are in the middle of a rebase -- cannot amend."
 msgstr "В момента се извършва пребазиране, не може да поправяте."
 
-#: builtin/commit.c:1271
-msgid "Options --squash and --fixup cannot be used together"
-msgstr "опциите „--squash“ и „--fixup“ са несъвместими."
-
-#: builtin/commit.c:1281
-msgid "Only one of -c/-C/-F/--fixup can be used."
-msgstr "опциите „-c“, „-C“, „-F“ и „--fixup““ са несъвместими."
-
-#: builtin/commit.c:1283
-msgid "Option -m cannot be combined with -c/-C/-F."
-msgstr "опцията „-m“ е несъвместима с „-c“, „-C“ и „-F“."
-
-#: builtin/commit.c:1292
 msgid "--reset-author can be used only with -C, -c or --amend."
 msgstr ""
 "опцията „--reset-author“ може да се използва само заедно с „-C“, „-c“ или\n"
 "„--amend“."
 
-#: builtin/commit.c:1310
-msgid "Only one of --include/--only/--all/--interactive/--patch can be used."
-msgstr ""
-"опциите „--include“, „--only“, „--all“, „--interactive“ и „--patch“ са\n"
-"несъвместими."
-
-#: builtin/commit.c:1338
 #, c-format
 msgid "unknown option: --fixup=%s:%s"
 msgstr "непозната опция: --fixup=%s:%s"
 
-#: builtin/commit.c:1355
 #, c-format
 msgid "paths '%s ...' with -a does not make sense"
 msgstr "опцията „-a“ е несъвместима със задаването на пътища: „%s…“"
 
-#: builtin/commit.c:1486 builtin/commit.c:1655
 msgid "show status concisely"
 msgstr "кратка информация за състоянието"
 
-#: builtin/commit.c:1488 builtin/commit.c:1657
 msgid "show branch information"
 msgstr "информация за клоните"
 
-#: builtin/commit.c:1490
 msgid "show stash information"
 msgstr "информация за скатаното"
 
-#: builtin/commit.c:1492 builtin/commit.c:1659
 msgid "compute full ahead/behind values"
 msgstr "изчисляване на точните стойности напред/назад"
 
-#: builtin/commit.c:1494
 msgid "version"
 msgstr "версия"
 
-#: builtin/commit.c:1494 builtin/commit.c:1661 builtin/push.c:551
-#: builtin/worktree.c:690
 msgid "machine-readable output"
 msgstr "формат на изхода за четене от програма"
 
-#: builtin/commit.c:1497 builtin/commit.c:1663
 msgid "show status in long format (default)"
 msgstr "подробна информация за състоянието (стандартно)"
 
-#: builtin/commit.c:1500 builtin/commit.c:1666
 msgid "terminate entries with NUL"
 msgstr "разделяне на елементите с нулевия знак „NUL“"
 
-#: builtin/commit.c:1502 builtin/commit.c:1506 builtin/commit.c:1669
-#: builtin/fast-export.c:1172 builtin/fast-export.c:1175
-#: builtin/fast-export.c:1178 builtin/rebase.c:1111 parse-options.h:337
 msgid "mode"
 msgstr "РЕЖИМ"
 
-#: builtin/commit.c:1503 builtin/commit.c:1669
 msgid "show untracked files, optional modes: all, normal, no. (Default: all)"
 msgstr ""
 "извеждане на неследените файлове.  Възможните РЕЖИМи са „all“ (подробна "
 "информация), „normal“ (кратка информация), „no“ (без неследените файлове).  "
 "Стандартният РЕЖИМ е: „all“."
 
-#: builtin/commit.c:1507
 msgid ""
 "show ignored files, optional modes: traditional, matching, no. (Default: "
 "traditional)"
@@ -14555,210 +5083,165 @@ msgstr ""
 "„traditional“ (традиционен), „matching“ (напасващи), „no“ (без игнорираните "
 "файлове).  Стандартният РЕЖИМ е: „traditional“."
 
-#: builtin/commit.c:1509 parse-options.h:192
 msgid "when"
 msgstr "КОГА"
 
-#: builtin/commit.c:1510
 msgid ""
 "ignore changes to submodules, optional when: all, dirty, untracked. "
 "(Default: all)"
 msgstr ""
-"игнориране на промените в подмодулите.  Опция с незадължителна стойност — "
-"една от „all“ (всички), „dirty“ (тези с неподадени промени), "
+"игнориране на промѐните в подмодулите.  Опция с незадължителна стойност — "
+"една от „all“ (всички), „dirty“ (тези с неподадени промѐни), "
 "„untracked“ (неследени)"
 
-#: builtin/commit.c:1512
 msgid "list untracked files in columns"
 msgstr "извеждане на неследените файлове в колони"
 
-#: builtin/commit.c:1513
 msgid "do not detect renames"
 msgstr "без засичане на преименуванията"
 
-#: builtin/commit.c:1515
 msgid "detect renames, optionally set similarity index"
 msgstr "засичане на преименуванията, може да се зададе коефициент на прилика"
 
-#: builtin/commit.c:1538
 msgid "Unsupported combination of ignored and untracked-files arguments"
 msgstr "Неподдържана комбинация от аргументи за игнорирани и неследени файлове"
 
-#: builtin/commit.c:1620
 msgid "suppress summary after successful commit"
 msgstr "без информация след успешно подаване"
 
-#: builtin/commit.c:1621
 msgid "show diff in commit message template"
 msgstr "добавяне на разликата към шаблона за съобщението при подаване"
 
-#: builtin/commit.c:1623
 msgid "Commit message options"
 msgstr "Опции за съобщението при подаване"
 
-#: builtin/commit.c:1624 builtin/merge.c:288 builtin/tag.c:456
 msgid "read message from file"
 msgstr "взимане на съобщението от ФАЙЛ"
 
-#: builtin/commit.c:1625
 msgid "author"
 msgstr "АВТОР"
 
-#: builtin/commit.c:1625
 msgid "override author for commit"
 msgstr "задаване на АВТОР за подаването"
 
-#: builtin/commit.c:1626 builtin/gc.c:551
 msgid "date"
 msgstr "ДАТА"
 
-#: builtin/commit.c:1626
 msgid "override date for commit"
 msgstr "задаване на ДАТА за подаването"
 
-#: builtin/commit.c:1628 builtin/commit.c:1629 builtin/commit.c:1635
-#: parse-options.h:329 ref-filter.h:89
 msgid "commit"
 msgstr "ПОДАВАНЕ"
 
-#: builtin/commit.c:1628
 msgid "reuse and edit message from specified commit"
 msgstr "преизползване и редактиране на съобщението от указаното ПОДАВАНЕ"
 
-#: builtin/commit.c:1629
 msgid "reuse message from specified commit"
 msgstr "преизползване на съобщението от указаното ПОДАВАНЕ"
 
 #. TRANSLATORS: Leave "[(amend|reword):]" as-is,
 #. and only translate <commit>.
 #.
-#: builtin/commit.c:1634
 msgid "[(amend|reword):]commit"
 msgstr "[(amend|reword):]подаване"
 
-#: builtin/commit.c:1634
 msgid ""
 "use autosquash formatted message to fixup or amend/reword specified commit"
 msgstr ""
 "използване на автоматичното съобщение за вкарване на указаното ПОДАВАНЕ в "
 "предходното без следа или за промяна на подаването или съобщението"
 
-#: builtin/commit.c:1635
 msgid "use autosquash formatted message to squash specified commit"
 msgstr ""
 "използване на автоматичното съобщение за вкарване на указаното ПОДАВАНЕ в "
 "предното"
 
-#: builtin/commit.c:1636
 msgid "the commit is authored by me now (used with -C/-c/--amend)"
 msgstr ""
 "смяна на автора да съвпада с подаващия (използва се с „-C“/„-c“/„--amend“)"
 
-#: builtin/commit.c:1637 builtin/interpret-trailers.c:111
 msgid "trailer"
 msgstr "ЕПИЛОГ"
 
-#: builtin/commit.c:1637
 msgid "add custom trailer(s)"
 msgstr "добавяне на друг ЕПИЛОГ"
 
-#: builtin/commit.c:1638 builtin/log.c:1769 builtin/merge.c:306
-#: builtin/pull.c:146 builtin/revert.c:110
 msgid "add a Signed-off-by trailer"
 msgstr "добавяне на епилог за подпис „Signed-off-by“"
 
-#: builtin/commit.c:1639
 msgid "use specified template file"
 msgstr "използване на указания шаблонен ФАЙЛ"
 
-#: builtin/commit.c:1640
 msgid "force edit of commit"
 msgstr "редактиране на подаване"
 
-#: builtin/commit.c:1642
 msgid "include status in commit message template"
 msgstr "вмъкване на състоянието в шаблона за съобщението при подаване"
 
-#: builtin/commit.c:1647
 msgid "Commit contents options"
 msgstr "Опции за избор на файлове при подаване"
 
-#: builtin/commit.c:1648
 msgid "commit all changed files"
 msgstr "подаване на всички променени файлове"
 
-#: builtin/commit.c:1649
 msgid "add specified files to index for commit"
 msgstr "добавяне на указаните файлове към индекса за подаване"
 
-#: builtin/commit.c:1650
 msgid "interactively add files"
 msgstr "интерактивно добавяне на файлове"
 
-#: builtin/commit.c:1651
 msgid "interactively add changes"
-msgstr "интерактивно добавяне на промени"
+msgstr "интерактивно добавяне на промѐни"
 
-#: builtin/commit.c:1652
 msgid "commit only specified files"
 msgstr "подаване само на указаните файлове"
 
-#: builtin/commit.c:1653
 msgid "bypass pre-commit and commit-msg hooks"
 msgstr ""
 "без изпълнение на куките преди подаване и при промяна на съобщението за "
 "подаване (pre-commit и commit-msg)"
 
-#: builtin/commit.c:1654
 msgid "show what would be committed"
 msgstr "отпечатване на това, което би било подадено"
 
-#: builtin/commit.c:1667
 msgid "amend previous commit"
 msgstr "поправяне на предишното подаване"
 
-#: builtin/commit.c:1668
 msgid "bypass post-rewrite hook"
 msgstr "без изпълнение на куката след презаписване (post-rewrite)"
 
-#: builtin/commit.c:1675
 msgid "ok to record an empty change"
 msgstr "позволяване на празни подавания"
 
-#: builtin/commit.c:1677
 msgid "ok to record a change with an empty message"
 msgstr "позволяване на подавания с празни съобщения"
 
-#: builtin/commit.c:1753
+msgid "could not parse HEAD commit"
+msgstr "върховото подаване „HEAD“ не може да бъде прочетено"
+
 #, c-format
 msgid "Corrupt MERGE_HEAD file (%s)"
 msgstr "Повреден файл за върха за сливането „MERGE_HEAD“ (%s)"
 
-#: builtin/commit.c:1760
 msgid "could not read MERGE_MODE"
 msgstr "режимът на сливане „MERGE_MODE“ не може да бъде прочетен"
 
-#: builtin/commit.c:1781
 #, c-format
 msgid "could not read commit message: %s"
 msgstr "съобщението за подаване не може да бъде прочетено: %s"
 
-#: builtin/commit.c:1788
 #, c-format
 msgid "Aborting commit due to empty commit message.\n"
 msgstr "Неизвършване на подаване поради празно съобщение.\n"
 
-#: builtin/commit.c:1793
 #, c-format
 msgid "Aborting commit; you did not edit the message.\n"
 msgstr "Неизвършване на подаване поради нередактирано съобщение.\n"
 
-#: builtin/commit.c:1804
 #, c-format
 msgid "Aborting commit due to empty commit message body.\n"
 msgstr "Неизвършване на подаване поради празно съобщение.\n"
 
-#: builtin/commit.c:1840
 msgid ""
 "repository has been updated, but unable to write\n"
 "new_index file. Check that disk is not full and quota is\n"
@@ -14770,230 +5253,184 @@ msgstr ""
 "\n"
 "    git restore --staged :/"
 
-#: builtin/config.c:11
 msgid "git config [<options>]"
 msgstr "git config [ОПЦИЯ…]"
 
-#: builtin/config.c:109 builtin/env--helper.c:27
 #, c-format
 msgid "unrecognized --type argument, %s"
 msgstr "непознат аргумент към „--type“: %s"
 
-#: builtin/config.c:121
 msgid "only one type at a time"
 msgstr "само по един вид"
 
-#: builtin/config.c:130
 msgid "Config file location"
 msgstr "Местоположение на конфигурационния файл"
 
-#: builtin/config.c:131
 msgid "use global config file"
 msgstr "използване на глобалния конфигурационен файл"
 
-#: builtin/config.c:132
 msgid "use system config file"
 msgstr "използване на системния конфигурационен файл"
 
-#: builtin/config.c:133
 msgid "use repository config file"
 msgstr "използване на конфигурационния файл на хранилището"
 
-#: builtin/config.c:134
 msgid "use per-worktree config file"
 msgstr "използване на конфигурационния файл на работното копие"
 
-#: builtin/config.c:135
 msgid "use given config file"
 msgstr "използване на зададения конфигурационен ФАЙЛ"
 
-#: builtin/config.c:136
 msgid "blob-id"
 msgstr "ИДЕНТИФИКАТОР"
 
-#: builtin/config.c:136
 msgid "read config from given blob object"
 msgstr ""
 "изчитане на конфигурацията от BLOB с този ИДЕНТИФИКАТОР на съдържанието"
 
-#: builtin/config.c:137
 msgid "Action"
 msgstr "Действие"
 
-#: builtin/config.c:138
 msgid "get value: name [value-pattern]"
 msgstr "извеждане на стойност: ИМЕ [ШАБЛОН_ЗА_СТОЙНОСТТА]"
 
-#: builtin/config.c:139
 msgid "get all values: key [value-pattern]"
 msgstr "извеждане на всички стойности: ключ [ШАБЛОН_ЗА_СТОЙНОСТТА]"
 
-#: builtin/config.c:140
 msgid "get values for regexp: name-regex [value-pattern]"
 msgstr ""
 "извеждане на стойностите за РЕГУЛЯРНия_ИЗРАЗ: РЕГУЛЯРЕН_ИЗРАЗ_ЗА_ИМЕТО "
 "[ШАБЛОН_ЗА_СТОЙНОСТТА]"
 
-#: builtin/config.c:141
 msgid "get value specific for the URL: section[.var] URL"
 msgstr "извеждане на стойността за указания адрес: РАЗДЕЛ[.ПРОМЕНЛИВА] АДРЕС"
 
-#: builtin/config.c:142
 msgid "replace all matching variables: name value [value-pattern]"
 msgstr ""
 "замяна на всички съвпадащи променливи: ИМЕ СТОЙНОСТ [ШАБЛОН_ЗА_СТОЙНОСТТА]"
 
-#: builtin/config.c:143
 msgid "add a new variable: name value"
 msgstr "добавяне на нова променлива: ИМЕ СТОЙНОСТ"
 
-#: builtin/config.c:144
 msgid "remove a variable: name [value-pattern]"
 msgstr "изтриване на променлива: ИМЕ [ШАБЛОН_ЗА_СТОЙНОСТТА]"
 
-#: builtin/config.c:145
 msgid "remove all matches: name [value-pattern]"
 msgstr "изтриване на всички съвпадащи: ИМЕ [ШАБЛОН_ЗА_СТОЙНОСТТА]"
 
-#: builtin/config.c:146
 msgid "rename section: old-name new-name"
 msgstr "преименуване на раздел: СТАРО_ИМЕ НОВО_ИМЕ"
 
-#: builtin/config.c:147
 msgid "remove a section: name"
 msgstr "изтриване на раздел: ИМЕ"
 
-#: builtin/config.c:148
 msgid "list all"
 msgstr "изброяване на всички"
 
-#: builtin/config.c:149
 msgid "use string equality when comparing values to 'value-pattern'"
 msgstr "дословно равенство при сравняване със ШАБЛОН_ЗА_СТОЙНОСТ"
 
-#: builtin/config.c:150
 msgid "open an editor"
 msgstr "отваряне на редактор"
 
-#: builtin/config.c:151
 msgid "find the color configured: slot [default]"
 msgstr "извеждане на зададения цвят: номер [стандартно]"
 
-#: builtin/config.c:152
 msgid "find the color setting: slot [stdout-is-tty]"
 msgstr "извеждане на зададения цвят: номер (стандартният изход е терминал)"
 
-#: builtin/config.c:153
 msgid "Type"
 msgstr "Вид"
 
-#: builtin/config.c:154 builtin/env--helper.c:43
+msgid "type"
+msgstr "ВИД"
+
 msgid "value is given this type"
 msgstr "стойността е от този вид"
 
-#: builtin/config.c:155
 msgid "value is \"true\" or \"false\""
 msgstr "СТОЙНОСТТА е „true“ (истина) или „false“ (лъжа̀)"
 
-#: builtin/config.c:156
 msgid "value is decimal number"
 msgstr "СТОЙНОСТТА е цяло, десетично число"
 
-#: builtin/config.c:157
 msgid "value is --bool or --int"
 msgstr "СТОЙНОСТТА е „--bool“ (булева) или „--int“ (десетично цяло число)"
 
-#: builtin/config.c:158
 msgid "value is --bool or string"
 msgstr "СТОЙНОСТТА е „--bool“ (булева) или низ"
 
-#: builtin/config.c:159
 msgid "value is a path (file or directory name)"
 msgstr "СТОЙНОСТТА е път (до файл или директория)"
 
-#: builtin/config.c:160
 msgid "value is an expiry date"
 msgstr "стойността е период на валидност/запазване"
 
-#: builtin/config.c:161
 msgid "Other"
 msgstr "Други"
 
-#: builtin/config.c:162
 msgid "terminate values with NUL byte"
 msgstr "разделяне на стойностите с нулевия знак „NUL“"
 
-#: builtin/config.c:163
 msgid "show variable names only"
 msgstr "извеждане на имената на променливите"
 
-#: builtin/config.c:164
 msgid "respect include directives on lookup"
 msgstr "при търсене да се уважат и директивите за включване"
 
-#: builtin/config.c:165
 msgid "show origin of config (file, standard input, blob, command line)"
 msgstr ""
 "извеждане на мястото на задаване на настройката (файл, стандартен вход, "
 "обект-BLOB, команден ред)"
 
-#: builtin/config.c:166
 msgid "show scope of config (worktree, local, global, system, command)"
 msgstr ""
 "извеждане на обхвата на настройката „worktree“ (работно дърво), "
 "„local“ (хранилище), „global“ (потребител), „system“ (система), "
 "„command“ (команда)"
 
-#: builtin/config.c:167 builtin/env--helper.c:45
 msgid "value"
 msgstr "СТОЙНОСТ"
 
-#: builtin/config.c:167
 msgid "with --get, use default value when missing entry"
 msgstr "с „--get“ се използва стандартна СТОЙНОСТ при липсваща"
 
-#: builtin/config.c:181
 #, c-format
 msgid "wrong number of arguments, should be %d"
 msgstr "неправилен брой аргументи, трябва да е точно %d"
 
-#: builtin/config.c:183
 #, c-format
 msgid "wrong number of arguments, should be from %d to %d"
 msgstr "неправилен брой аргументи, трябва да е от %d до %d включително"
 
-#: builtin/config.c:339
 #, c-format
 msgid "invalid key pattern: %s"
 msgstr "неправилен шаблон за ключ: „%s“"
 
-#: builtin/config.c:377
+#, c-format
+msgid "invalid pattern: %s"
+msgstr "неправилен шаблон: %s"
+
 #, c-format
 msgid "failed to format default config value: %s"
 msgstr "неуспешно форматиране на стандартната стойност на настройка: %s"
 
-#: builtin/config.c:441
 #, c-format
 msgid "cannot parse color '%s'"
 msgstr "„%s“ не може да се анализира като цвят"
 
-#: builtin/config.c:483
 msgid "unable to parse default color value"
 msgstr "неразпозната стойност на стандартния цвят"
 
-#: builtin/config.c:536 builtin/config.c:833
 msgid "not in a git directory"
 msgstr "не е в директория под Git"
 
-#: builtin/config.c:539
 msgid "writing to stdin is not supported"
 msgstr "не се поддържа записване в стандартния вход"
 
-#: builtin/config.c:542
 msgid "writing config blobs is not supported"
 msgstr "обекти-BLOB в настройките не се поддържат"
 
-#: builtin/config.c:627
 #, c-format
 msgid ""
 "# This is Git's per-user configuration file.\n"
@@ -15008,27 +5445,21 @@ msgstr ""
 "#\tname = %s\n"
 "#\temail = %s\n"
 
-#: builtin/config.c:652
 msgid "only one config file at a time"
 msgstr "само по един конфигурационен файл"
 
-#: builtin/config.c:658
 msgid "--local can only be used inside a git repository"
 msgstr "„--local“ може да се използва само в хранилище"
 
-#: builtin/config.c:660
 msgid "--blob can only be used inside a git repository"
 msgstr "„--blob“ може да се използва само в хранилище"
 
-#: builtin/config.c:662
 msgid "--worktree can only be used inside a git repository"
 msgstr "„--worktree“ може да се използва само в хранилище"
 
-#: builtin/config.c:684
 msgid "$HOME not set"
 msgstr "стойността „$HOME“ не е зададена"
 
-#: builtin/config.c:708
 msgid ""
 "--worktree cannot be used with multiple working trees unless the config\n"
 "extension worktreeConfig is enabled. Please read \"CONFIGURATION FILE\"\n"
@@ -15039,20 +5470,16 @@ msgstr ""
 "повече информация вижте раздела „CONFIGURATION FILE“ в\n"
 "„git help worktree“"
 
-#: builtin/config.c:743
 msgid "--get-color and variable type are incoherent"
 msgstr "опцията „--get-color“ не съответства на вида на променливата"
 
-#: builtin/config.c:748
 msgid "only one action at a time"
 msgstr "само по едно действие"
 
-#: builtin/config.c:761
 msgid "--name-only is only applicable to --list or --get-regexp"
 msgstr ""
 "опцията „--name-only“ е приложима само към опциите „--list“ и „--get-regexp“"
 
-#: builtin/config.c:767
 msgid ""
 "--show-origin is only applicable to --get, --get-all, --get-regexp, and --"
 "list"
@@ -15060,60 +5487,45 @@ msgstr ""
 "опцията „--show-origin“ е приложима само към опциите „--get“, „--get-all“, "
 "„--get-regexp“ и „--list“"
 
-#: builtin/config.c:773
 msgid "--default is only applicable to --get"
 msgstr "опцията „--default“ е приложима само към опцията „--get“"
 
-#: builtin/config.c:806
 msgid "--fixed-value only applies with 'value-pattern'"
 msgstr "опцията „--fixed-value“ е приложима само със ШАБЛОН_ЗА_СТОЙНОСТ"
 
-#: builtin/config.c:822
 #, c-format
 msgid "unable to read config file '%s'"
 msgstr "конфигурационният файл „%s“ не може да бъде прочетен"
 
-#: builtin/config.c:825
 msgid "error processing config file(s)"
 msgstr "грешка при обработката на конфигурационен файл"
 
-#: builtin/config.c:835
 msgid "editing stdin is not supported"
 msgstr "не се поддържа редактиране на стандартния вход"
 
-#: builtin/config.c:837
 msgid "editing blobs is not supported"
 msgstr "не се поддържа редактиране на обекти-BLOB"
 
-#: builtin/config.c:851
 #, c-format
 msgid "cannot create configuration file %s"
 msgstr "конфигурационният файл „%s“ не може да бъде създаден"
 
-#: builtin/config.c:864
 #, c-format
 msgid ""
 "cannot overwrite multiple values with a single value\n"
 "       Use a regexp, --add or --replace-all to change %s."
 msgstr ""
 "множество стойности не може да се замени с една.\n"
-"За да промените „%s“, ползвайте регулярен израз или опциите „--add“ и „--"
+"За да променѝте „%s“, ползвайте регулярен израз или опциите „--add“ и „--"
 "replace-all“."
 
-#: builtin/config.c:943 builtin/config.c:954
 #, c-format
 msgid "no such section: %s"
 msgstr "такъв раззел няма: %s"
 
-#: builtin/count-objects.c:90
-msgid "git count-objects [-v] [-H | --human-readable]"
-msgstr "git count-objects [-v] [-H | --human-readable]"
-
-#: builtin/count-objects.c:100
 msgid "print sizes in human readable format"
 msgstr "извеждане на размерите на обектите във формат лесно четим от хора"
 
-#: builtin/credential-cache--daemon.c:227
 #, c-format
 msgid ""
 "The permissions on your socket directory are too loose; other\n"
@@ -15128,74 +5540,59 @@ msgstr ""
 "\n"
 "    chmod 0700 %s"
 
-#: builtin/credential-cache--daemon.c:276
 msgid "print debugging messages to stderr"
 msgstr "извеждане на съобщенията за трасиране на стандартната грешка"
 
-#: builtin/credential-cache--daemon.c:316
 msgid "credential-cache--daemon unavailable; no unix socket support"
 msgstr ""
 "демонът за кеша с идентификациите е недостъпен (credential-cache--daemon) — "
 "липсва поддръжка на гнезда на unix"
 
-#: builtin/credential-cache.c:180
 msgid "credential-cache unavailable; no unix socket support"
 msgstr ""
 "кешът с идентификациите е недостъпен — липсва поддръжка на гнезда на unix"
 
-#: builtin/credential-store.c:66
 #, c-format
 msgid "unable to get credential storage lock in %d ms"
 msgstr ""
 "ключалката на хранилището на идентификациите не бе получена в рамките на %d "
 "ms"
 
-#: builtin/describe.c:26
 msgid "git describe [<options>] [<commit-ish>...]"
 msgstr "git describe [ОПЦИЯ…] [УКАЗАТЕЛ_КЪМ_ПОДАВАНЕ…]"
 
-#: builtin/describe.c:27
 msgid "git describe [<options>] --dirty"
 msgstr "git describe [ОПЦИЯ…] --dirty"
 
-#: builtin/describe.c:63
 msgid "head"
 msgstr "основно"
 
-#: builtin/describe.c:63
 msgid "lightweight"
 msgstr "кратко"
 
-#: builtin/describe.c:63
 msgid "annotated"
 msgstr "анотирано"
 
-#: builtin/describe.c:277
 #, c-format
 msgid "annotated tag %s not available"
 msgstr "не съществува анотиран етикет „%s“"
 
-#: builtin/describe.c:281
 #, c-format
 msgid "tag '%s' is externally known as '%s'"
 msgstr "етикетът „%s“ е известен другаде като „%s“"
 
-#: builtin/describe.c:328
 #, c-format
 msgid "no tag exactly matches '%s'"
 msgstr "никой етикет не напасва точно „%s“"
 
-#: builtin/describe.c:330
 #, c-format
 msgid "No exact match on refs or tags, searching to describe\n"
 msgstr "Никоя версия и етикет не напасват точно.  Търси се по описание\n"
 
-#: builtin/describe.c:397
 #, c-format
 msgid "finished search at %s\n"
 msgstr "търсенето приключи при „%s“\n"
 
-#: builtin/describe.c:424
 #, c-format
 msgid ""
 "No annotated tags can describe '%s'.\n"
@@ -15204,7 +5601,6 @@ msgstr ""
 "Никой анотиран етикет не описва „%s“.\n"
 "Съществуват и неанотирани етикети.  Пробвайте с опцията „--tags“."
 
-#: builtin/describe.c:428
 #, c-format
 msgid ""
 "No tags can describe '%s'.\n"
@@ -15213,12 +5609,10 @@ msgstr ""
 "Никой етикет не описва „%s“.\n"
 "Пробвайте с опцията „--always“ или създайте етикети."
 
-#: builtin/describe.c:458
 #, c-format
 msgid "traversed %lu commits\n"
-msgstr "претърсени са %lu подавания\n"
+msgstr "обходени са %lu подавания\n"
 
-#: builtin/describe.c:461
 #, c-format
 msgid ""
 "more than %i tags found; listed %i most recent\n"
@@ -15227,152 +5621,119 @@ msgstr ""
 "открити са над %i етикета, изведени са последните %i,\n"
 "търсенето бе прекратено при „%s“.\n"
 
-#: builtin/describe.c:529
 #, c-format
 msgid "describe %s\n"
 msgstr "описание на „%s“\n"
 
-#: builtin/describe.c:532
 #, c-format
 msgid "Not a valid object name %s"
 msgstr "Неправилно име на обект „%s“"
 
-#: builtin/describe.c:540
 #, c-format
 msgid "%s is neither a commit nor blob"
 msgstr "„%s“ не е нито подаване, нито обект-BLOB"
 
-#: builtin/describe.c:554
 msgid "find the tag that comes after the commit"
 msgstr "откриване на етикета, който следва подаване"
 
-#: builtin/describe.c:555
 msgid "debug search strategy on stderr"
 msgstr ""
 "извеждане на информация за трасиране на стратегията за търсене на "
 "стандартната грешка"
 
-#: builtin/describe.c:556
 msgid "use any ref"
 msgstr "използване на произволен указател"
 
-#: builtin/describe.c:557
 msgid "use any tag, even unannotated"
 msgstr "използване на всеки етикет — включително и неанотираните"
 
-#: builtin/describe.c:558
 msgid "always use long format"
 msgstr "винаги да се ползва дългият формат"
 
-#: builtin/describe.c:559
 msgid "only follow first parent"
 msgstr "проследяване само на първия родител"
 
-#: builtin/describe.c:562
 msgid "only output exact matches"
 msgstr "извеждане само на точните съвпадения"
 
-#: builtin/describe.c:564
 msgid "consider <n> most recent tags (default: 10)"
 msgstr "да се търси само в този БРОЙ последни етикети (стандартно: 10)"
 
-#: builtin/describe.c:566
 msgid "only consider tags matching <pattern>"
 msgstr "да се търси само измежду етикетите напасващи този ШАБЛОН"
 
-#: builtin/describe.c:568
 msgid "do not consider tags matching <pattern>"
 msgstr "да не се търси измежду етикетите напасващи този ШАБЛОН"
 
-#: builtin/describe.c:570 builtin/name-rev.c:544
 msgid "show abbreviated commit object as fallback"
 msgstr "извеждане на съкратено име на обект като резервен вариант"
 
-#: builtin/describe.c:571 builtin/describe.c:574
 msgid "mark"
 msgstr "МАРКЕР"
 
-#: builtin/describe.c:572
 msgid "append <mark> on dirty working tree (default: \"-dirty\")"
 msgstr "добавяне на такъв МАРКЕР на работното дърво (стандартно е „-dirty“)"
 
-#: builtin/describe.c:575
 msgid "append <mark> on broken working tree (default: \"-broken\")"
 msgstr ""
 "добавяне на такъв МАРКЕР на счупеното работно дърво (стандартно е „-broken“)"
 
-#: builtin/describe.c:622
 msgid "No names found, cannot describe anything."
 msgstr "Не са открити имена — нищо не може да бъде описано."
 
-#: builtin/describe.c:673 builtin/describe.c:675
 #, c-format
 msgid "option '%s' and commit-ishes cannot be used together"
 msgstr "опциите „%s“ и указателите към обекти са несъвместими"
 
-#: builtin/diff-tree.c:157
 msgid "--merge-base only works with two commits"
 msgstr "опцията „--merge-base“ изисква точно две подавания"
 
-#: builtin/diff.c:92
 #, c-format
 msgid "'%s': not a regular file or symlink"
 msgstr "„%s“: не е нито обикновен файл, нито символна връзка"
 
-#: builtin/diff.c:259
 #, c-format
 msgid "invalid option: %s"
 msgstr "неправилна опция: %s"
 
-#: builtin/diff.c:376
 #, c-format
 msgid "%s...%s: no merge base"
 msgstr "„%s..%s“: липсва база за сливане"
 
-#: builtin/diff.c:491
 msgid "Not a git repository"
 msgstr "Не е хранилище на Git"
 
-#: builtin/diff.c:537 builtin/grep.c:698
 #, c-format
 msgid "invalid object '%s' given."
 msgstr "зададен е неправилен обект „%s“."
 
-#: builtin/diff.c:548
 #, c-format
 msgid "more than two blobs given: '%s'"
 msgstr "зададени са повече от 2 обекта-BLOB: „%s“"
 
-#: builtin/diff.c:553
 #, c-format
 msgid "unhandled object '%s' given."
 msgstr "зададен е неподдържан обект „%s“."
 
-#: builtin/diff.c:587
 #, c-format
 msgid "%s...%s: multiple merge bases, using %s"
 msgstr "%s...%s: много бази за сливане, ще се ползва „%s“"
 
-#: builtin/difftool.c:31
 msgid "git difftool [<options>] [<commit> [<commit>]] [--] [<path>...]"
 msgstr "git difftool [ОПЦИЯ…] [ПОДАВАНЕ [ПОДАВАНЕ]] [[--] ПЪТ…]"
 
-#: builtin/difftool.c:287
 #, c-format
 msgid "could not read symlink %s"
 msgstr "символната връзка „%s“ не може да бъде прочетена"
 
-#: builtin/difftool.c:289
 #, c-format
 msgid "could not read symlink file %s"
 msgstr "файлът, сочен от символната връзка „%s“, не може да бъде прочетен"
 
-#: builtin/difftool.c:297
 #, c-format
 msgid "could not read object %s for symlink %s"
 msgstr "обектът „%s“ за символната връзка „%s“ не може да бъде прочетен"
 
-#: builtin/difftool.c:421
 msgid ""
 "combined diff formats ('-c' and '--cc') are not supported in\n"
 "directory diff mode ('-d' and '--dir-diff')."
@@ -15380,60 +5741,51 @@ msgstr ""
 "комбинираните формати на разликите („-c“ и „--cc“) не се поддържат\n"
 "в режима за разлики върху директории („-d“ и „--dir-diff“)."
 
-#: builtin/difftool.c:626
 #, c-format
 msgid "both files modified: '%s' and '%s'."
 msgstr "и двата файла са променени: „%s“ и „%s“."
 
-#: builtin/difftool.c:628
 msgid "working tree file has been left."
 msgstr "работното дърво е изоставено."
 
-#: builtin/difftool.c:639
+#, c-format
+msgid "could not copy '%s' to '%s'"
+msgstr "„%s“ не може да се копира като „%s“"
+
 #, c-format
 msgid "temporary files exist in '%s'."
 msgstr "в „%s“ има временни файлове."
 
-#: builtin/difftool.c:640
 msgid "you may want to cleanup or recover these."
 msgstr "възможно е да ги изчистите или възстановите"
 
-#: builtin/difftool.c:645
 #, c-format
 msgid "failed: %d"
 msgstr "неуспешно действие с изходен код: %d"
 
-#: builtin/difftool.c:690
 msgid "use `diff.guitool` instead of `diff.tool`"
 msgstr "използвайте „diff.guitool“ вместо „diff.tool“"
 
-#: builtin/difftool.c:692
 msgid "perform a full-directory diff"
 msgstr "разлика по директории"
 
-#: builtin/difftool.c:694
 msgid "do not prompt before launching a diff tool"
 msgstr "стартиране на ПРОГРАМАта за разлики без предупреждение"
 
-#: builtin/difftool.c:699
 msgid "use symlinks in dir-diff mode"
 msgstr "следване на символните връзки при разлика по директории"
 
-#: builtin/difftool.c:700
 msgid "tool"
 msgstr "ПРОГРАМА"
 
-#: builtin/difftool.c:701
 msgid "use the specified diff tool"
 msgstr "използване на указаната ПРОГРАМА"
 
-#: builtin/difftool.c:703
 msgid "print a list of diff tools that may be used with `--tool`"
 msgstr ""
 "извеждане на списък с всички ПРОГРАМи, които може да се ползват с опцията „--"
 "tool“"
 
-#: builtin/difftool.c:706
 msgid ""
 "make 'git-difftool' exit when an invoked diff tool returns a non-zero exit "
 "code"
@@ -15441,50 +5793,36 @@ msgstr ""
 "„git-difftool“ да спре работа, когато стартираната ПРОГРАМА за разлики "
 "завърши с ненулев код"
 
-#: builtin/difftool.c:709
 msgid "specify a custom command for viewing diffs"
 msgstr "команда за разглеждане на разлики"
 
-#: builtin/difftool.c:710
 msgid "passed to `diff`"
 msgstr "подава се към „diff“"
 
-#: builtin/difftool.c:726
 msgid "difftool requires worktree or --no-index"
 msgstr "„git-difftool“ изисква работно дърво или опцията „--no-index“"
 
-#: builtin/difftool.c:744
 msgid "no <tool> given for --tool=<tool>"
 msgstr "не е зададена програма за „--tool=ПРОГРАМА“"
 
-#: builtin/difftool.c:751
 msgid "no <cmd> given for --extcmd=<cmd>"
 msgstr "не е зададена команда за „--extcmd=КОМАНДА“"
 
-#: builtin/env--helper.c:6
 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:96
-msgid "type"
-msgstr "ВИД"
-
-#: builtin/env--helper.c:46
 msgid "default for git_env_*(...) to fall back on"
 msgstr "стандартна, резервна стойност за „git_env_*(…)“"
 
-#: builtin/env--helper.c:48
 msgid "be quiet only use git_env_*() value as exit code"
 msgstr ""
 "без извеждане на информация — стойността на „git_env_*()“ да е изходен код"
 
-#: builtin/env--helper.c:67
 #, c-format
 msgid "option `--default' expects a boolean value with `--type=bool`, not `%s`"
 msgstr ""
 "опцията „--default“ изисква булева стойност при „--type=bool“, а не „%s“"
 
-#: builtin/env--helper.c:82
 #, c-format
 msgid ""
 "option `--default' expects an unsigned long value with `--type=ulong`, not `"
@@ -15493,247 +5831,192 @@ msgstr ""
 "опцията „--default“ изисква целочислена стойност без знак при „--"
 "type=ulong“, а не „%s“"
 
-#: builtin/fast-export.c:29
-msgid "git fast-export [rev-list-opts]"
-msgstr "git fast-export [ОПЦИИ_ЗА_СПИСЪКА_С_ВЕРСИИ]"
+msgid "git fast-export [<rev-list-opts>]"
+msgstr "git fast-export [ОПЦИЯ_ЗА_СПИСЪКА_С_ВЕРСИИ…]"
 
-#: builtin/fast-export.c:843
 msgid "Error: Cannot export nested tags unless --mark-tags is specified."
 msgstr ""
 "Грешка: непреките етикети не се изнасят, освен ако не зададете „--mark-tags“."
 
-#: builtin/fast-export.c:1152
 msgid "--anonymize-map token cannot be empty"
 msgstr "опцията „--anonymize-map“ изисква аргумент"
 
-#: builtin/fast-export.c:1171
 msgid "show progress after <n> objects"
 msgstr "Съобщение за напредъка на всеки такъв БРОЙ обекта"
 
-#: builtin/fast-export.c:1173
 msgid "select handling of signed tags"
 msgstr "Как да се обработват подписаните етикети"
 
-#: builtin/fast-export.c:1176
 msgid "select handling of tags that tag filtered objects"
 msgstr "Как да се обработват етикетите на филтрираните обекти"
 
-#: builtin/fast-export.c:1179
 msgid "select handling of commit messages in an alternate encoding"
 msgstr ""
 "как да се обработват съобщенията за подаване, които са в друго кодиране"
 
-#: builtin/fast-export.c:1182
 msgid "dump marks to this file"
 msgstr "запазване на маркерите в този ФАЙЛ"
 
-#: builtin/fast-export.c:1184
 msgid "import marks from this file"
 msgstr "внасяне на маркерите от този ФАЙЛ"
 
-#: builtin/fast-export.c:1188
 msgid "import marks from this file if it exists"
 msgstr "внасяне на маркерите от този ФАЙЛ, ако съществува"
 
-#: builtin/fast-export.c:1190
 msgid "fake a tagger when tags lack one"
 msgstr ""
 "да се използва изкуствено име на човек при липса на създател на етикета"
 
-#: builtin/fast-export.c:1192
 msgid "output full tree for each commit"
 msgstr "извеждане на цялото дърво за всяко подаване"
 
-#: builtin/fast-export.c:1194
 msgid "use the done feature to terminate the stream"
 msgstr "използване на маркер за завършване на потока"
 
-#: builtin/fast-export.c:1195
 msgid "skip output of blob data"
 msgstr "без извеждане на съдържанието на обектите-BLOB"
 
-#: builtin/fast-export.c:1196 builtin/log.c:1841
 msgid "refspec"
 msgstr "УКАЗАТЕЛ_НА_ВЕРСИЯ"
 
-#: builtin/fast-export.c:1197
 msgid "apply refspec to exported refs"
 msgstr "прилагане на УКАЗАТЕЛя_НА_ВЕРСИЯ към изнесените указатели"
 
-#: builtin/fast-export.c:1198
 msgid "anonymize output"
 msgstr "анонимизиране на извежданата информация"
 
-#: builtin/fast-export.c:1199
 msgid "from:to"
 msgstr "ОТ:КЪМ"
 
-#: builtin/fast-export.c:1200
 msgid "convert <from> to <to> in anonymized output"
 msgstr "заместване ОТ със КЪМ в анонимизирания изход"
 
-#: builtin/fast-export.c:1203
 msgid "reference parents which are not in fast-export stream by object id"
 msgstr ""
 "указване на родителите, които не са в потока на бързо изнасяне, с "
 "идентификатор на обект"
 
-#: builtin/fast-export.c:1205
 msgid "show original object ids of blobs/commits"
 msgstr "извеждане на първоначалните идентификатори на обектите BLOB/подавяния"
 
-#: builtin/fast-export.c:1207
 msgid "label tags with mark ids"
 msgstr "задаване на идентификатори на маркери на етикетите"
 
-#: builtin/fast-import.c:3090
 #, c-format
 msgid "Missing from marks for submodule '%s'"
 msgstr "Липсват маркери „от“ за подмодула „%s“"
 
-#: builtin/fast-import.c:3092
 #, c-format
 msgid "Missing to marks for submodule '%s'"
 msgstr "Липсват маркери „до“ за подмодула „%s“"
 
-#: builtin/fast-import.c:3227
 #, c-format
 msgid "Expected 'mark' command, got %s"
 msgstr "Очаква се команда „mark“, а бе получена: „%s“"
 
-#: builtin/fast-import.c:3232
 #, c-format
 msgid "Expected 'to' command, got %s"
 msgstr "Очаква се команда „to“, а бе получена: „%s“"
 
-#: builtin/fast-import.c:3324
 msgid "Expected format name:filename for submodule rewrite option"
 msgstr "опцията за презапис на подмодул изисква формат: име:име_на_файл"
 
-#: builtin/fast-import.c:3379
 #, c-format
 msgid "feature '%s' forbidden in input without --allow-unsafe-features"
 msgstr "„%s“ изисква изричното задаване на опцията „--allow-unsafe-features“"
 
-#: builtin/fetch-pack.c:242
 #, c-format
 msgid "Lockfile created but not reported: %s"
 msgstr "Заключващият файл е създаден, но не е докладван: „%s“"
 
-#: builtin/fetch.c:36
 msgid "git fetch [<options>] [<repository> [<refspec>...]]"
 msgstr "git fetch [ОПЦИЯ…] [ХРАНИЛИЩЕ [УКАЗАТЕЛ…]]"
 
-#: builtin/fetch.c:37
 msgid "git fetch [<options>] <group>"
 msgstr "git fetch [ОПЦИЯ…] ГРУПА"
 
-#: builtin/fetch.c:38
 msgid "git fetch --multiple [<options>] [(<repository> | <group>)...]"
 msgstr "git fetch --multiple [ОПЦИЯ…] [(ХРАНИЛИЩЕ | ГРУПА)…]"
 
-#: builtin/fetch.c:39
 msgid "git fetch --all [<options>]"
 msgstr "git fetch --all [ОПЦИЯ…]"
 
-#: builtin/fetch.c:123
 msgid "fetch.parallel cannot be negative"
 msgstr "опцията „fetch.parallel“ трябва да е неотрицателна"
 
-#: builtin/fetch.c:146 builtin/pull.c:189
 msgid "fetch from all remotes"
 msgstr "доставяне от всички отдалечени хранилища"
 
-#: builtin/fetch.c:148 builtin/pull.c:249
 msgid "set upstream for git pull/fetch"
 msgstr "задаване на клон за следене за издърпване/доставяне"
 
-#: builtin/fetch.c:150 builtin/pull.c:192
 msgid "append to .git/FETCH_HEAD instead of overwriting"
 msgstr "добавяне към „.git/FETCH_HEAD“ вместо замяна"
 
-#: builtin/fetch.c:152
 msgid "use atomic transaction to update references"
 msgstr "изискване на атомарни операции за обновяване на указателите"
 
-#: builtin/fetch.c:154 builtin/pull.c:195
 msgid "path to upload pack on remote end"
 msgstr "отдалечен път, където да се качи пакетът"
 
-#: builtin/fetch.c:155
 msgid "force overwrite of local reference"
 msgstr "принудително презаписване на локален указател"
 
-#: builtin/fetch.c:157
 msgid "fetch from multiple remotes"
 msgstr "доставяне от множество отдалечени хранилища"
 
-#: builtin/fetch.c:159 builtin/pull.c:199
 msgid "fetch all tags and associated objects"
 msgstr "доставяне на всички етикети и принадлежащи обекти"
 
-#: builtin/fetch.c:161
 msgid "do not fetch all tags (--no-tags)"
 msgstr "без доставянето на всички етикети „--no-tags“"
 
-#: builtin/fetch.c:163
 msgid "number of submodules fetched in parallel"
 msgstr "брой подмодули доставени паралелно"
 
-#: builtin/fetch.c:165
 msgid "modify the refspec to place all refs within refs/prefetch/"
 msgstr ""
 "промяна на указателя, така че и той, както останалите, да бъде в „refs/"
 "prefetch/“"
 
-#: builtin/fetch.c:167 builtin/pull.c:202
 msgid "prune remote-tracking branches no longer on remote"
 msgstr "окастряне на клоните следящи вече несъществуващи отдалечени клони"
 
-#: builtin/fetch.c:169
 msgid "prune local tags no longer on remote and clobber changed tags"
 msgstr ""
 "окастряне на локалните етикети, които вече не съществуват в отдалеченото "
 "хранилище и презаписване на променените"
 
-#: builtin/fetch.c:170 builtin/fetch.c:195 builtin/pull.c:123
 msgid "on-demand"
 msgstr "ПРИ НУЖДА"
 
-#: builtin/fetch.c:171
 msgid "control recursive fetching of submodules"
 msgstr "управление на рекурсивното доставяне на подмодулите"
 
-#: builtin/fetch.c:176
 msgid "write fetched references to the FETCH_HEAD file"
 msgstr "запазване на доставените указатели във файла „FETCH_HEAD“"
 
-#: builtin/fetch.c:177 builtin/pull.c:210
 msgid "keep downloaded pack"
 msgstr "запазване на изтеглените пакети с обекти"
 
-#: builtin/fetch.c:179
 msgid "allow updating of HEAD ref"
 msgstr "позволяване на обновяването на указателя „HEAD“"
 
-#: builtin/fetch.c:182 builtin/fetch.c:188 builtin/pull.c:213
-#: builtin/pull.c:222
 msgid "deepen history of shallow clone"
 msgstr "задълбочаване на историята на плитко хранилище"
 
-#: builtin/fetch.c:184 builtin/pull.c:216
 msgid "deepen history of shallow repository based on time"
 msgstr "задълбочаване на историята на плитко хранилище до определено време"
 
-#: builtin/fetch.c:190 builtin/pull.c:225
 msgid "convert to a complete repository"
 msgstr "превръщане в пълно хранилище"
 
-#: builtin/fetch.c:193
+msgid "re-fetch without negotiating common commits"
+msgstr "повторно доставяне без договаряне на общите подавания"
+
 msgid "prepend this to submodule path output"
 msgstr "добавяне на това пред пътя на подмодула"
 
-#: builtin/fetch.c:196
 msgid ""
 "default for recursive fetching of submodules (lower priority than config "
 "files)"
@@ -15741,108 +6024,82 @@ msgstr ""
 "стандартно рекурсивно изтегляне на подмодулите (файловете с настройки са с "
 "приоритет)"
 
-#: builtin/fetch.c:200 builtin/pull.c:228
 msgid "accept refs that update .git/shallow"
 msgstr "приемане на указатели, които обновяват „.git/shallow“"
 
-#: builtin/fetch.c:201 builtin/pull.c:230
 msgid "refmap"
 msgstr "КАРТА_С_УКАЗАТЕЛИ"
 
-#: builtin/fetch.c:202 builtin/pull.c:231
 msgid "specify fetch refmap"
 msgstr "указване на КАРТАта_С_УКАЗАТЕЛИ за доставяне"
 
-#: builtin/fetch.c:209 builtin/pull.c:244
 msgid "report that we have only objects reachable from this object"
 msgstr "докладване, че всички обекти може са достижими при започване от този"
 
-#: builtin/fetch.c:211
 msgid "do not fetch a packfile; instead, print ancestors of negotiation tips"
 msgstr ""
 "без доставяне на пакетни файлове, вместо това да се извеждат предшественици "
 "на договорните върхове"
 
-#: builtin/fetch.c:214 builtin/fetch.c:216
 msgid "run 'maintenance --auto' after fetching"
 msgstr "изпълняване на „maintenance --auto“ след доставяне"
 
-#: builtin/fetch.c:218 builtin/pull.c:247
 msgid "check for forced-updates on all updated branches"
 msgstr "проверка за принудителни обновявания на всички клони"
 
-#: builtin/fetch.c:220
 msgid "write the commit-graph after fetching"
 msgstr "запазване на гра̀фа с подаванията след доставяне"
 
-#: builtin/fetch.c:222
 msgid "accept refspecs from stdin"
 msgstr "четене на указателите от стандартния вход"
 
-#: builtin/fetch.c:592
 msgid "couldn't find remote ref HEAD"
 msgstr "указателят „HEAD“ в отдалеченото хранилище не може да бъде открит"
 
-#: builtin/fetch.c:766
-#, c-format
-msgid "configuration fetch.output contains invalid value %s"
-msgstr "настройката „fetch.output“ е с неправилна стойност „%s“"
-
-#: builtin/fetch.c:867
 #, c-format
 msgid "object %s not found"
 msgstr "обектът „%s“ липсва"
 
-#: builtin/fetch.c:871
 msgid "[up to date]"
 msgstr "[актуален]"
 
-#: builtin/fetch.c:883 builtin/fetch.c:901 builtin/fetch.c:973
 msgid "[rejected]"
 msgstr "[отхвърлен]"
 
-#: builtin/fetch.c:885
 msgid "can't fetch in current branch"
 msgstr "в текущия клон не може да се доставя"
 
-#: builtin/fetch.c:886
 msgid "checked out in another worktree"
 msgstr "изтеглен в друго работно дърво"
 
-#: builtin/fetch.c:896
 msgid "[tag update]"
 msgstr "[обновяване на етикетите]"
 
-#: builtin/fetch.c:897 builtin/fetch.c:934 builtin/fetch.c:956
-#: builtin/fetch.c:968
 msgid "unable to update local ref"
 msgstr "локален указател не може да бъде обновен"
 
-#: builtin/fetch.c:901
 msgid "would clobber existing tag"
 msgstr "съществуващ етикет ще бъде презаписан"
 
-#: builtin/fetch.c:923
 msgid "[new tag]"
 msgstr "[нов етикет]"
 
-#: builtin/fetch.c:926
 msgid "[new branch]"
 msgstr "[нов клон]"
 
-#: builtin/fetch.c:929
 msgid "[new ref]"
 msgstr "[нов указател]"
 
-#: builtin/fetch.c:968
 msgid "forced update"
 msgstr "принудително обновяване"
 
-#: builtin/fetch.c:973
 msgid "non-fast-forward"
 msgstr "същинско сливане"
 
-#: builtin/fetch.c:1076
+#, c-format
+msgid "cannot open '%s'"
+msgstr "„%s“ не може да бъде отворен"
+
 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"
@@ -15855,7 +6112,6 @@ msgstr ""
 "\n"
 "    git config fetch.showForcedUpdates true"
 
-#: builtin/fetch.c:1080
 #, c-format
 msgid ""
 "it took %.2f seconds to check forced updates; you can use\n"
@@ -15869,23 +6125,19 @@ msgstr ""
 "\n"
 "    git config fetch.showForcedUpdates false\n"
 
-#: builtin/fetch.c:1112
 #, c-format
 msgid "%s did not send all necessary objects\n"
 msgstr "хранилището „%s“ не изпрати всички необходими обекти\n"
 
-#: builtin/fetch.c:1141
 #, c-format
 msgid "rejected %s because shallow roots are not allowed to be updated"
 msgstr ""
 "отхвърляне на „%s“, защото плитките върхове не може да бъдат обновявани"
 
-#: builtin/fetch.c:1231 builtin/fetch.c:1379
 #, c-format
 msgid "From %.*s\n"
 msgstr "От %.*s\n"
 
-#: builtin/fetch.c:1252
 #, c-format
 msgid ""
 "some local refs could not be updated; try running\n"
@@ -15895,50 +6147,44 @@ msgstr ""
 "„git remote prune %s“, за да премахнете остарелите клони, които\n"
 "предизвикват конфликта"
 
-#: builtin/fetch.c:1349
 #, c-format
 msgid "   (%s will become dangling)"
 msgstr "   (обектът „%s“ ще се окаже извън клон)"
 
-#: builtin/fetch.c:1350
 #, c-format
 msgid "   (%s has become dangling)"
 msgstr "   (обектът „%s“ вече е извън клон)"
 
-#: builtin/fetch.c:1382
 msgid "[deleted]"
 msgstr "[изтрит]"
 
-#: builtin/fetch.c:1383 builtin/remote.c:1128
 msgid "(none)"
 msgstr "(нищо)"
 
-#: builtin/fetch.c:1405
 #, c-format
 msgid "refusing to fetch into branch '%s' checked out at '%s'"
 msgstr "не може да доставите в клона „%s“, който е изтеглен в пътя „%s“"
 
-#: builtin/fetch.c:1425
 #, c-format
 msgid "option \"%s\" value \"%s\" is not valid for %s"
 msgstr "стойността „%2$s“ за опцията „%1$s“ не е съвместима с „%3$s“"
 
-#: builtin/fetch.c:1428
 #, c-format
 msgid "option \"%s\" is ignored for %s\n"
 msgstr "опцията „%s“ се прескача при „%s“\n"
 
-#: builtin/fetch.c:1455
+#, c-format
+msgid "%s is not a valid object"
+msgstr "„%s“ е неправилен обект"
+
 #, c-format
 msgid "the object %s does not exist"
 msgstr "обектът „%s“ не съществува"
 
-#: builtin/fetch.c:1643
 msgid "multiple branches detected, incompatible with --set-upstream"
 msgstr ""
 "засечени са множество клони, това е несъвместимо с опцията „--set-upstream“"
 
-#: builtin/fetch.c:1655
 #, c-format
 msgid ""
 "could not set upstream of HEAD to '%s' from '%s' when it does not point to "
@@ -15947,19 +6193,15 @@ msgstr ""
 "следеното от „HEAD“ не може да се смени от „%2$s“ на „%1$s“, защото второто "
 "не сочи към никой клон."
 
-#: builtin/fetch.c:1668
 msgid "not setting upstream for a remote remote-tracking branch"
 msgstr "не може да указвате клон за следене на отдалечен етикет"
 
-#: builtin/fetch.c:1670
 msgid "not setting upstream for a remote tag"
 msgstr "не може да указвате клон за следене на отдалечен етикет"
 
-#: builtin/fetch.c:1672
 msgid "unknown branch type"
 msgstr "непознат вид клон"
 
-#: builtin/fetch.c:1674
 msgid ""
 "no source branch found;\n"
 "you need to specify exactly one branch with the --set-upstream option"
@@ -15967,22 +6209,18 @@ msgstr ""
 "не е открит клон за следене;\n"
 "трябва изрично да зададете точно един клон с опцията „--set-upstream“"
 
-#: builtin/fetch.c:1804 builtin/fetch.c:1867
 #, c-format
 msgid "Fetching %s\n"
 msgstr "Доставяне на „%s“\n"
 
-#: builtin/fetch.c:1814 builtin/fetch.c:1869
 #, c-format
 msgid "could not fetch %s"
 msgstr "„%s“ не може да се достави"
 
-#: builtin/fetch.c:1826
 #, c-format
 msgid "could not fetch '%s' (exit code: %d)\n"
 msgstr "„%s“ не може да се достави (изходният код е: %d)\n"
 
-#: builtin/fetch.c:1930
 msgid ""
 "no remote repository specified; please specify either a URL or a\n"
 "remote name from which new revisions should be fetched"
@@ -15990,49 +6228,39 @@ msgstr ""
 "не сте указали отдалечено хранилище; задайте или адрес, или име\n"
 "на отдалечено хранилище, откъдето да се доставят новите версии."
 
-#: builtin/fetch.c:1966
 msgid "you need to specify a tag name"
 msgstr "трябва да укажете име на етикет"
 
-#: builtin/fetch.c:2032
-msgid "--negotiate-only needs one or more --negotiate-tip=*"
+msgid "--negotiate-only needs one or more --negotiation-tip=*"
 msgstr ""
-"Опцията „--negotiate-only“ изисква една или повече опции „--negotiate-tip=*“"
+"Опцията „--negotiate-only“ изисква една или повече опции „--negotiation-"
+"tip=*“"
 
-#: builtin/fetch.c:2036
 msgid "negative depth in --deepen is not supported"
 msgstr "отрицателна дълбочина като аргумент на „--deepen“ не се поддържа"
 
-#: builtin/fetch.c:2045
 msgid "--unshallow on a complete repository does not make sense"
 msgstr "не може да използвате опцията „--unshallow“ върху пълно хранилище"
 
-#: builtin/fetch.c:2062
 msgid "fetch --all does not take a repository argument"
 msgstr "към „git fetch --all“ не може да добавите аргумент-хранилище"
 
-#: builtin/fetch.c:2064
 msgid "fetch --all does not make sense with refspecs"
 msgstr "към „git fetch --all“ не може да добавите аргумент-указател на версия"
 
-#: builtin/fetch.c:2073
 #, c-format
 msgid "no such remote or remote group: %s"
 msgstr "няма нито отдалечено хранилище, нито група от хранилища на име „%s“"
 
-#: builtin/fetch.c:2081
 msgid "fetching a group and specifying refspecs does not make sense"
 msgstr "доставянето на група и указването на версия са несъвместими"
 
-#: builtin/fetch.c:2097
 msgid "must supply remote when using --negotiate-only"
 msgstr "опцията „--negotiate-only“ изисква хранилище"
 
-#: builtin/fetch.c:2102
 msgid "protocol does not support --negotiate-only, exiting"
 msgstr "протоколът не поддържа опцията „--negotiate-only“, изход от програмата"
 
-#: builtin/fetch.c:2121
 msgid ""
 "--filter can only be used with the remote configured in extensions."
 "partialclone"
@@ -16040,149 +6268,115 @@ msgstr ""
 "опцията „--filter“ може да се ползва само с отдалеченото хранилище указано в "
 "настройката „extensions.partialclone“"
 
-#: builtin/fetch.c:2125
 msgid "--atomic can only be used when fetching from one remote"
 msgstr ""
 "опцията „--atomic“ поддържа доставяне само от едно отдалечено хранилище"
 
-#: builtin/fetch.c:2129
 msgid "--stdin can only be used when fetching from one remote"
 msgstr "опцията „--stdin“ поддържа доставяне само от едно отдалечено хранилище"
 
-#: builtin/fmt-merge-msg.c:7
 msgid ""
 "git fmt-merge-msg [-m <message>] [--log[=<n>] | --no-log] [--file <file>]"
 msgstr ""
 "git fmt-merge-msg [-m СЪОБЩЕНИЕ] [--log[=БРОЙ] | --no-log] [--file ФАЙЛ]"
 
-#: builtin/fmt-merge-msg.c:19
 msgid "populate log with at most <n> entries from shortlog"
 msgstr ""
 "вмъкване на журнал състоящ се от не повече от БРОЙ записа от съкратения "
 "журнал"
 
-#: builtin/fmt-merge-msg.c:22
 msgid "alias for --log (deprecated)"
 msgstr "псевдоним на „--log“ (ОСТАРЯЛО)"
 
-#: builtin/fmt-merge-msg.c:25
 msgid "text"
 msgstr "ТЕКСТ"
 
-#: builtin/fmt-merge-msg.c:26
 msgid "use <text> as start of message"
 msgstr "за начало на съобщението да се ползва ТЕКСТ"
 
-#: builtin/fmt-merge-msg.c:28
 msgid "use <name> instead of the real target branch"
 msgstr "използване на това ИМЕ вместо истинския клон-цел"
 
-#: builtin/fmt-merge-msg.c:29
 msgid "file to read from"
 msgstr "файл, от който да се чете"
 
-#: builtin/for-each-ref.c:10
 msgid "git for-each-ref [<options>] [<pattern>]"
 msgstr "git for-each-ref [ОПЦИЯ…] [ШАБЛОН]"
 
-#: builtin/for-each-ref.c:11
 msgid "git for-each-ref [--points-at <object>]"
 msgstr "git for-each-ref [--points ОБЕКТ]"
 
-#: builtin/for-each-ref.c:12
 msgid "git for-each-ref [--merged [<commit>]] [--no-merged [<commit>]]"
 msgstr "git for-each-ref [--merged [ПОДАВАНЕ]] [--no-merged [ПОДАВАНЕ]]"
 
-#: builtin/for-each-ref.c:13
 msgid "git for-each-ref [--contains [<commit>]] [--no-contains [<commit>]]"
 msgstr "git for-each-ref [--contains [ПОДАВАНЕ]] [--no-contains [ПОДАВАНЕ]]"
 
-#: builtin/for-each-ref.c:31
 msgid "quote placeholders suitably for shells"
 msgstr "цитиране подходящо за командни интерпретатори на обвивката"
 
-#: builtin/for-each-ref.c:33
 msgid "quote placeholders suitably for perl"
 msgstr "цитиране подходящо за perl"
 
-#: builtin/for-each-ref.c:35
 msgid "quote placeholders suitably for python"
 msgstr "цитиране подходящо за python"
 
-#: builtin/for-each-ref.c:37
 msgid "quote placeholders suitably for Tcl"
 msgstr "цитиране подходящо за tcl"
 
-#: builtin/for-each-ref.c:40
 msgid "show only <n> matched refs"
 msgstr "извеждане само на този БРОЙ напаснати указатели"
 
-#: builtin/for-each-ref.c:42 builtin/tag.c:481
 msgid "respect format colors"
 msgstr "спазване на цветовете на форма̀та"
 
-#: builtin/for-each-ref.c:45
 msgid "print only refs which points at the given object"
 msgstr "извеждане само на указателите, сочещи към ОБЕКТА"
 
-#: builtin/for-each-ref.c:47
 msgid "print only refs that are merged"
 msgstr "извеждане само на слетите указатели"
 
-#: builtin/for-each-ref.c:48
 msgid "print only refs that are not merged"
 msgstr "извеждане само на неслетите указатели"
 
-#: builtin/for-each-ref.c:49
 msgid "print only refs which contain the commit"
 msgstr "извеждане само на указателите, които съдържат това ПОДАВАНЕ"
 
-#: builtin/for-each-ref.c:50
 msgid "print only refs which don't contain the commit"
 msgstr "извеждане само на указателите, които не съдържат това ПОДАВАНЕ"
 
-#: builtin/for-each-repo.c:9
 msgid "git for-each-repo --config=<config> <command-args>"
 msgstr "git for-each-repo --config=НАСТРОЙКА АРГУМЕНТ…"
 
-#: builtin/for-each-repo.c:34
 msgid "config"
 msgstr "настройка"
 
-#: builtin/for-each-repo.c:35
 msgid "config key storing a list of repository paths"
 msgstr "настройка, която съдържа списък с пътища към хранилища"
 
-#: builtin/for-each-repo.c:43
 msgid "missing --config=<config>"
 msgstr "липсва --config=НАСТРОЙКА"
 
-#: builtin/fsck.c:69 builtin/fsck.c:128 builtin/fsck.c:129
 msgid "unknown"
 msgstr "непознат"
 
 #. 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 "грешка в %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 "предупреждение за %s „%s“: %s"
 
-#: builtin/fsck.c:124 builtin/fsck.c:127
 #, c-format
 msgid "broken link from %7s %s"
 msgstr "скъсана връзка от %7s %s"
 
-#: builtin/fsck.c:136
 msgid "wrong object type in link"
 msgstr "неправилен вид обект във връзката"
 
-#: builtin/fsck.c:152
 #, c-format
 msgid ""
 "broken link from %7s %s\n"
@@ -16191,246 +6385,299 @@ msgstr ""
 "скъсана връзка от %7s %s\n"
 "              към %7s %s"
 
-#: builtin/fsck.c:264
+msgid "Checking connectivity"
+msgstr "Проверка на свързаността"
+
 #, c-format
 msgid "missing %s %s"
 msgstr "липсващ обект: %s „%s“"
 
-#: builtin/fsck.c:291
 #, c-format
 msgid "unreachable %s %s"
 msgstr "недостижим обект: %s „%s“"
 
-#: builtin/fsck.c:311
 #, c-format
 msgid "dangling %s %s"
 msgstr "извън клон: %s „%s“"
 
-#: builtin/fsck.c:321
 msgid "could not create lost-found"
 msgstr "„lost-found“ не може да се създаде"
 
-#: builtin/fsck.c:332
+#, c-format
+msgid "could not write '%s'"
+msgstr "„%s“ не може да се запише"
+
 #, c-format
 msgid "could not finish '%s'"
 msgstr "„%s“ не може да се завърши"
 
-#: builtin/fsck.c:349
 #, c-format
 msgid "Checking %s"
 msgstr "Проверка на „%s“"
 
-#: builtin/fsck.c:387
 #, c-format
 msgid "Checking connectivity (%d objects)"
 msgstr "Проверка на свързаността (%d обекта)"
 
-#: builtin/fsck.c:406
 #, c-format
 msgid "Checking %s %s"
 msgstr "Проверяване на %s „%s“"
 
-#: builtin/fsck.c:411
 msgid "broken links"
 msgstr "скъсани връзки"
 
-#: builtin/fsck.c:420
 #, c-format
 msgid "root %s"
 msgstr "начална директория „%s“"
 
-#: builtin/fsck.c:428
 #, c-format
 msgid "tagged %s %s (%s) in %s"
 msgstr "приложен етикет „%s“ върху „%s“ (%s) в „%s“"
 
-#: builtin/fsck.c:457
 #, c-format
 msgid "%s: object corrupt or missing"
 msgstr "%s: липсващ или повреден обект"
 
-#: builtin/fsck.c:482
 #, c-format
 msgid "%s: invalid reflog entry %s"
 msgstr "%s: неправилен запис в журнала за указатели „%s“"
 
-#: builtin/fsck.c:496
 #, c-format
 msgid "Checking reflog %s->%s"
 msgstr "Проверка на журнала на указателите: „%s“ до „%s“"
 
-#: builtin/fsck.c:530
 #, c-format
 msgid "%s: invalid sha1 pointer %s"
 msgstr "„%s“: неправилен указател за SHA1: „%s“"
 
-#: builtin/fsck.c:537
 #, c-format
 msgid "%s: not a commit"
 msgstr "%s: не е подаване!"
 
-#: builtin/fsck.c:591
 msgid "notice: No default references"
 msgstr "внимание: няма указатели по подразбиране"
 
-#: 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:628
 #, c-format
 msgid "%s: object is of unknown type '%s': %s"
 msgstr "%s: обектът е непознат вид „%s“: %s"
 
-#: builtin/fsck.c:645
 #, c-format
 msgid "%s: object could not be parsed: %s"
 msgstr "„%s“: не може да се анализира: „%s“"
 
-#: builtin/fsck.c:665
 #, c-format
 msgid "bad sha1 file: %s"
 msgstr "неправилен ред с контролна сума по SHA1: „%s“"
 
-#: builtin/fsck.c:686
 msgid "Checking object directory"
 msgstr "Проверка на директория с обекти"
 
-#: builtin/fsck.c:689
 msgid "Checking object directories"
 msgstr "Проверка на директориите с обекти"
 
-#: builtin/fsck.c:705
 #, c-format
 msgid "Checking %s link"
 msgstr "Проверка на връзките на „%s“"
 
 #
-#: builtin/fsck.c:710 builtin/index-pack.c:859
 #, c-format
 msgid "invalid %s"
 msgstr "неправилен указател „%s“"
 
-#: builtin/fsck.c:717
 #, c-format
 msgid "%s points to something strange (%s)"
 msgstr "„%s“ сочи към нещо необичайно (%s)"
 
-#: builtin/fsck.c:723
 #, c-format
 msgid "%s: detached HEAD points at nothing"
 msgstr "%s: несвързаният връх „HEAD“ не сочи към нищо"
 
-#: builtin/fsck.c:727
 #, c-format
 msgid "notice: %s points to an unborn branch (%s)"
 msgstr "предупреждение: „%s“ сочи към все още несъществуващ клон (%s)"
 
-#: builtin/fsck.c:739
 msgid "Checking cache tree"
 msgstr "Проверка на дървото на кеша"
 
-#: builtin/fsck.c:744
 #, c-format
 msgid "%s: invalid sha1 pointer in cache-tree"
 msgstr "„%s“: неправилен указател за SHA1 в дървото на кеша"
 
-#: builtin/fsck.c:753
 msgid "non-tree in cache-tree"
 msgstr "в дървото на кеша има нещо, което не е дърво"
 
-#: builtin/fsck.c:784
 msgid "git fsck [<options>] [<object>...]"
 msgstr "git fsck [ОПЦИЯ…] [ОБЕКТ…]"
 
-#: builtin/fsck.c:790
 msgid "show unreachable objects"
 msgstr "показване на недостижимите обекти"
 
-#: builtin/fsck.c:791
 msgid "show dangling objects"
 msgstr "показване на обектите извън клоните"
 
-#: builtin/fsck.c:792
 msgid "report tags"
 msgstr "показване на етикетите"
 
-#: builtin/fsck.c:793
 msgid "report root nodes"
 msgstr "показване на кореновите възли"
 
-#: builtin/fsck.c:794
 msgid "make index objects head nodes"
 msgstr "задаване на обекти от индекса да са коренови"
 
-#: builtin/fsck.c:795
 msgid "make reflogs head nodes (default)"
 msgstr "проследяване и на указателите от журнала с указателите (стандартно)"
 
-#: builtin/fsck.c:796
 msgid "also consider packs and alternate objects"
 msgstr "допълнително да се проверяват пакетите и алтернативните обекти"
 
-#: builtin/fsck.c:797
 msgid "check only connectivity"
 msgstr "проверка само на връзката"
 
-#: builtin/fsck.c:798 builtin/mktag.c:76
 msgid "enable more strict checking"
 msgstr "по-строги проверки"
 
-#: builtin/fsck.c:800
 msgid "write dangling objects in .git/lost-found"
 msgstr "запазване на обектите извън клоните в директорията „.git/lost-found“"
 
-#: builtin/fsck.c:801 builtin/prune.c:146
 msgid "show progress"
 msgstr "показване на напредъка"
 
-#: builtin/fsck.c:802
 msgid "show verbose names for reachable objects"
 msgstr "показване на подробни имена на достижимите обекти"
 
-#: builtin/fsck.c:862 builtin/index-pack.c:261
 msgid "Checking objects"
 msgstr "Проверка на обектите"
 
-#: builtin/fsck.c:890
 #, c-format
 msgid "%s: object missing"
 msgstr "„%s“: липсващ обект"
 
-#: builtin/fsck.c:901
 #, c-format
 msgid "invalid parameter: expected sha1, got '%s'"
 msgstr "неправилен параметър: очаква се SHA1, а бе получено: „%s“"
 
-#: builtin/gc.c:39
+msgid "git fsmonitor--daemon start [<options>]"
+msgstr "git fsmonitor--daemon start [ОПЦИЯ…]"
+
+msgid "git fsmonitor--daemon run [<options>]"
+msgstr "git fsmonitor--daemon run [ОПЦИЯ…]"
+
+msgid "git fsmonitor--daemon stop"
+msgstr "git fsmonitor--daemon stop"
+
+msgid "git fsmonitor--daemon status"
+msgstr "git fsmonitor--daemon status"
+
+#, c-format
+msgid "value of '%s' out of range: %d"
+msgstr "дължината на „%s“ e извън интервала: %d"
+
+#, c-format
+msgid "value of '%s' not bool or int: %d"
+msgstr "СТОЙНОСТТА на „%s“ не е нито булева, нито целочислена, а трябва: %d"
+
+#, c-format
+msgid "fsmonitor-daemon is watching '%s'\n"
+msgstr "fsmonitor-daemon наблюдава „%s“\n"
+
+#, c-format
+msgid "fsmonitor-daemon is not watching '%s'\n"
+msgstr "fsmonitor-daemon не наблюдава „%s“\n"
+
+#, c-format
+msgid "could not create fsmonitor cookie '%s'"
+msgstr "бисквитката за fsmonitor „%s“ не може да бъде създадена"
+
+#, c-format
+msgid "fsmonitor: cookie_result '%d' != SEEN"
+msgstr "fsmonitor: резултатът от бисквитката (cookie_result) „%d“ != SEEN"
+
+#, c-format
+msgid "could not start IPC thread pool on '%s'"
+msgstr ""
+"неуспешно стартиране на запаса нишки за комуникация между процеси върху „%s“"
+
+msgid "could not start fsmonitor listener thread"
+msgstr "слушащата нишка на fsmonitor не може да се стартира"
+
+msgid "could not start fsmonitor health thread"
+msgstr ""
+"нишката за следенето на състоянието на fsmonitor не може да се стартира"
+
+msgid "could not initialize listener thread"
+msgstr "слушащата нишка не може да се стартира"
+
+msgid "could not initialize health thread"
+msgstr "нишката за следенето на състоянието не може да се стартира"
+
+#, c-format
+msgid "could not cd home '%s'"
+msgstr "директорията не може да се смени да е домашната „%s“"
+
+#, c-format
+msgid "fsmonitor--daemon is already running '%s'"
+msgstr "процесът „fsmonitor--daemon“ вече е стартирал в „%s“"
+
+#, c-format
+msgid "running fsmonitor-daemon in '%s'\n"
+msgstr "процесът „fsmonitor-daemon“ се стартира в „%s“\n"
+
+#, c-format
+msgid "starting fsmonitor-daemon in '%s'\n"
+msgstr "стартиране на процеса „fsmonitor-daemon“ в „%s“\n"
+
+msgid "daemon failed to start"
+msgstr "неуспешно стартиране на процеса"
+
+msgid "daemon not online yet"
+msgstr "демонът все още не е на линия"
+
+msgid "daemon terminated"
+msgstr "демонът е убит"
+
+msgid "detach from console"
+msgstr "отделяне от конзолата"
+
+msgid "use <n> ipc worker threads"
+msgstr "използване на такъв БРОЙ работещи нишки"
+
+msgid "max seconds to wait for background daemon startup"
+msgstr "секунди изчакване на демона да стартира"
+
+#, c-format
+msgid "invalid 'ipc-threads' value (%d)"
+msgstr "неправилна стойност за „ipc-threads“: %d"
+
+#, c-format
+msgid "Unhandled subcommand '%s'"
+msgstr "Неподдържана подкоманда: „%s“"
+
+msgid "fsmonitor--daemon not supported on this platform"
+msgstr "„fsmonitor--daemon“ не се поддържа на тази платформа"
+
 msgid "git gc [<options>]"
 msgstr "git gc [ОПЦИЯ…]"
 
-#: builtin/gc.c:93
 #, c-format
 msgid "Failed to fstat %s: %s"
 msgstr "Неуспешно изпълнение на „fstat“ върху „%s“: %s"
 
-#: builtin/gc.c:129
 #, c-format
 msgid "failed to parse '%s' value '%s'"
 msgstr "стойността на „%s“ — „%s“ не може да се анализира"
 
-#: builtin/gc.c:488 builtin/init-db.c:57
 #, c-format
 msgid "cannot stat '%s'"
 msgstr "не може да се получи информация чрез „stat“ за директорията „%s“"
 
-#: builtin/gc.c:504
 #, c-format
 msgid ""
 "The last gc run reported the following. Please correct the root cause\n"
@@ -16446,58 +6693,50 @@ msgstr ""
 "\n"
 "%s"
 
-#: builtin/gc.c:552
 msgid "prune unreferenced objects"
 msgstr "окастряне на обектите, към които нищо не сочи"
 
-#: builtin/gc.c:554
+msgid "pack unreferenced objects separately"
+msgstr "пакетиране на обектите, към които нищо не сочи, отделно"
+
 msgid "be more thorough (increased runtime)"
 msgstr "изчерпателно търсене на боклука (за сметка на повече време работа)"
 
-#: builtin/gc.c:555
 msgid "enable auto-gc mode"
 msgstr "включване на автоматичното събиране на боклука (auto-gc)"
 
-#: builtin/gc.c:558
 msgid "force running gc even if there may be another gc running"
 msgstr ""
 "изрично стартиране на събирането на боклука, дори и ако вече работи друго "
 "събиране"
 
-#: builtin/gc.c:561
 msgid "repack all other packs except the largest pack"
 msgstr "препакетиране на всичко без най-големия пакет"
 
-#: builtin/gc.c:577
 #, c-format
-msgid "failed to parse gc.logexpiry value %s"
-msgstr "неразпозната стойност на „gc.logexpiry“ %s"
+msgid "failed to parse gc.logExpiry value %s"
+msgstr "неразпозната стойност на „gc.logExpiry“ %s"
 
-#: builtin/gc.c:588
 #, c-format
 msgid "failed to parse prune expiry value %s"
 msgstr "неразпозната стойност на периода за окастряне: %s"
 
-#: builtin/gc.c:608
 #, c-format
 msgid "Auto packing the repository in background for optimum performance.\n"
 msgstr ""
 "Автоматично пакетиране на заден фон на хранилището за по-добра "
 "производителност.\n"
 
-#: builtin/gc.c:610
 #, c-format
 msgid "Auto packing the repository for optimum performance.\n"
 msgstr "Автоматично пакетиране на хранилището за по-добра производителност.\n"
 
-#: builtin/gc.c:611
 #, c-format
 msgid "See \"git help gc\" for manual housekeeping.\n"
 msgstr ""
 "Погледнете ръководството за повече информация как да изпълните „git help "
 "gc“.\n"
 
-#: builtin/gc.c:652
 #, c-format
 msgid ""
 "gc is already running on machine '%s' pid %<PRIuMAX> (use --force if not)"
@@ -16506,505 +6745,389 @@ msgstr ""
 "процеса: %<PRIuMAX> (ако сте сигурни, че това не е вярно, това използвайте\n"
 "опцията „--force“)"
 
-#: builtin/gc.c:707
 msgid ""
 "There are too many unreachable loose objects; run 'git prune' to remove them."
 msgstr ""
 "Има прекалено много недостижими, непакетирани обекти.\n"
 "Използвайте „git prune“, за да ги окастрите."
 
-#: builtin/gc.c:717
 msgid ""
 "git maintenance run [--auto] [--[no-]quiet] [--task=<task>] [--schedule]"
 msgstr ""
 "git maintenance run [--auto] [--[no-]quiet] [--task=ЗАДАЧА] [--schedule]"
 
-#: builtin/gc.c:747
 msgid "--no-schedule is not allowed"
 msgstr "опцията „--no-schedule“ не е позволена"
 
-#: builtin/gc.c:752
 #, c-format
 msgid "unrecognized --schedule argument '%s'"
 msgstr "непознат аргумент към „--schedule“: %s"
 
-#: builtin/gc.c:870
 msgid "failed to write commit-graph"
 msgstr "графът с подаванията не може да бъде записан"
 
-#: builtin/gc.c:906
 msgid "failed to prefetch remotes"
 msgstr "неуспешно предварително доставяне на отдалечените клони"
 
-#: builtin/gc.c:1022
 msgid "failed to start 'git pack-objects' process"
 msgstr "процесът за командата „git pack-objects“ не може да бъде стартиран"
 
-#: builtin/gc.c:1039
 msgid "failed to finish 'git pack-objects' process"
 msgstr "процесът за командата „git pack-objects“ не може да завърши"
 
-#: builtin/gc.c:1090
 msgid "failed to write multi-pack-index"
 msgstr "индексът за множество пакети не може да бъде записан"
 
-#: builtin/gc.c:1106
 msgid "'git multi-pack-index expire' failed"
 msgstr "неуспешно изпълнение на „git multi-pack-index expire“"
 
-#: builtin/gc.c:1165
 msgid "'git multi-pack-index repack' failed"
 msgstr "неуспешно изпълнение на „git multi-pack-index repack“"
 
-#: builtin/gc.c:1174
 msgid ""
 "skipping incremental-repack task because core.multiPackIndex is disabled"
 msgstr ""
 "задачата „incremental-repack“ се прескача, защото настройката „core."
 "multiPackIndex“ е изключена"
 
-#: builtin/gc.c:1278
 #, c-format
 msgid "lock file '%s' exists, skipping maintenance"
 msgstr "заключващият файл „%s“ съществува.  Действието се прескача"
 
-#: builtin/gc.c:1308
 #, c-format
 msgid "task '%s' failed"
 msgstr "неуспешно изпълнение на задачата „%s“"
 
-#: builtin/gc.c:1390
 #, c-format
 msgid "'%s' is not a valid task"
 msgstr "„%s“ не е правилна задача"
 
-#: builtin/gc.c:1395
 #, c-format
 msgid "task '%s' cannot be selected multiple times"
 msgstr "задачата „%s“ не може да се избере повече от веднъж"
 
-#: builtin/gc.c:1410
 msgid "run tasks based on the state of the repository"
 msgstr "изпълняване на задачи според състоянието на хранилището"
 
-#: builtin/gc.c:1411
 msgid "frequency"
 msgstr "честота"
 
-#: builtin/gc.c:1412
 msgid "run tasks based on frequency"
 msgstr "изпълняване на задачи по график"
 
-#: builtin/gc.c:1415
 msgid "do not report progress or other information over stderr"
 msgstr "без извеждане на напредъка и друга информация на стандартния изход"
 
-#: builtin/gc.c:1416
 msgid "task"
 msgstr "задача"
 
-#: builtin/gc.c:1417
 msgid "run a specific task"
 msgstr "изпълнение на определена задача"
 
-#: builtin/gc.c:1434
 msgid "use at most one of --auto and --schedule=<frequency>"
 msgstr "опциите „--auto“ и „--schedule=ЧЕСТОТА“ са несъвместими"
 
-#: builtin/gc.c:1477
 msgid "failed to run 'git config'"
 msgstr "неуспешно изпълнение на „git config“"
 
-#: builtin/gc.c:1629
 #, c-format
 msgid "failed to expand path '%s'"
 msgstr "грешка при заместването на пътя „%s“"
 
-#: builtin/gc.c:1656 builtin/gc.c:1694
 msgid "failed to start launchctl"
 msgstr "неуспешно стартиране на „launchctl“."
 
-#: builtin/gc.c:1769 builtin/gc.c:2237
 #, c-format
 msgid "failed to create directories for '%s'"
 msgstr "директориите за „%s“ не може да бъдат създадени"
 
-#: builtin/gc.c:1796
 #, c-format
 msgid "failed to bootstrap service %s"
 msgstr "услугата „%s“ не може се настрои първоначално"
 
-#: builtin/gc.c:1889
 msgid "failed to create temp xml file"
 msgstr "неуспешно създаване на временен файл за xml"
 
-#: builtin/gc.c:1979
 msgid "failed to start schtasks"
 msgstr "задачите за периодично изпълнение не може да се стартират"
 
-#: builtin/gc.c:2063
 msgid "failed to run 'crontab -l'; your system might not support 'cron'"
 msgstr ""
 "неуспешно изпълнение на „crontab -l“.  Системата ви може да не поддържа "
 "„cron“"
 
-#: builtin/gc.c:2080
 msgid "failed to run 'crontab'; your system might not support 'cron'"
 msgstr ""
 "неуспешно изпълнение на „crontab“.  Системата ви може да не поддържа „cron“"
 
-#: builtin/gc.c:2084
 msgid "failed to open stdin of 'crontab'"
 msgstr "стандартният вход на „crontab“ не може да се отвори"
 
-#: builtin/gc.c:2126
 msgid "'crontab' died"
 msgstr "процесът на „crontab“ умря"
 
-#: builtin/gc.c:2191
 msgid "failed to start systemctl"
 msgstr "неуспешно стартиране на „systemctl“"
 
-#: builtin/gc.c:2201
 msgid "failed to run systemctl"
 msgstr "неуспешно изпълнение на „systemctl“"
 
-#: builtin/gc.c:2210 builtin/gc.c:2215 builtin/worktree.c:62
-#: builtin/worktree.c:944
 #, c-format
 msgid "failed to delete '%s'"
 msgstr "неуспешно изтриване на „%s“"
 
-#: builtin/gc.c:2395
+#, c-format
+msgid "failed to flush '%s'"
+msgstr "грешка при изчистването на буферите при записването на „%s“"
+
 #, c-format
 msgid "unrecognized --scheduler argument '%s'"
 msgstr "непознат аргумент към „--scheduler“: %s"
 
-#: builtin/gc.c:2420
 msgid "neither systemd timers nor crontab are available"
 msgstr "липсват както таймери на systemd, така и crontab"
 
-#: builtin/gc.c:2435
 #, c-format
 msgid "%s scheduler is not available"
 msgstr "планиращият модул „%s“ липсва"
 
-#: builtin/gc.c:2449
 msgid "another process is scheduling background maintenance"
 msgstr "друг процес задава поддръжката на заден фон"
 
-#: builtin/gc.c:2471
 msgid "git maintenance start [--scheduler=<scheduler>]"
 msgstr "git maintenance start [--scheduler=ПЛАНИРАЩ_МОДУЛ]"
 
-#: builtin/gc.c:2480
 msgid "scheduler"
 msgstr "ПЛАНИРАЩ_МОДУЛ"
 
-#: builtin/gc.c:2481
 msgid "scheduler to trigger git maintenance run"
 msgstr "ПЛАНИРАЩият_МОДУЛ, който да изпълнява задачите"
 
-#: builtin/gc.c:2495
 msgid "failed to add repo to global config"
 msgstr "неуспешно добавяне на хранилище към файла с глобални настройки"
 
-#: builtin/gc.c:2504
 msgid "git maintenance <subcommand> [<options>]"
 msgstr "git maintenance ПОДКОМАНДА [ОПЦИЯ…]"
 
-#: builtin/gc.c:2523
 #, c-format
 msgid "invalid subcommand: %s"
 msgstr "неправилна подкоманда: „%s“"
 
-#: builtin/grep.c:30
 msgid "git grep [<options>] [-e] <pattern> [<rev>...] [[--] <path>...]"
 msgstr "git grep [ОПЦИЯ…] [-e] ШАБЛОН [ВЕРСИЯ…] [[--] ПЪТ…]"
 
-#: builtin/grep.c:239
 #, c-format
 msgid "grep: failed to create thread: %s"
 msgstr "grep: неуспешно създаване на нишка: %s"
 
-#: builtin/grep.c:293
 #, c-format
 msgid "invalid number of threads specified (%d) for %s"
 msgstr "зададен е неправилен брой нишки (%d) за %s"
 
+#. #-#-#-#-#  grep.c.po  #-#-#-#-#
 #. TRANSLATORS: %s is the configuration
 #. variable for tweaking threads, currently
 #. grep.threads
 #.
-#: 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:488 builtin/grep.c:617 builtin/grep.c:657
 #, c-format
 msgid "unable to read tree (%s)"
 msgstr "дървото не може да бъде прочетено (%s)"
 
-#: builtin/grep.c:672
 #, c-format
 msgid "unable to grep from object of type %s"
 msgstr "не може да се изпълни „grep“ от обект от вида %s"
 
-#: builtin/grep.c:752
 #, c-format
 msgid "switch `%c' expects a numerical value"
 msgstr "опцията „%c“ очаква число за аргумент"
 
-#: builtin/grep.c:851
 msgid "search in index instead of in the work tree"
 msgstr "търсене в индекса, а не в работното дърво"
 
-#: builtin/grep.c:853
 msgid "find in contents not managed by git"
 msgstr "търсене и във файловете, които не са под управлението на git"
 
-#: builtin/grep.c:855
 msgid "search in both tracked and untracked files"
 msgstr "търсене и в следените, и в неследените файлове"
 
-#: builtin/grep.c:857
 msgid "ignore files specified via '.gitignore'"
 msgstr "игнориране на файловете указани в „.gitignore“"
 
-#: builtin/grep.c:859
 msgid "recursively search in each submodule"
 msgstr "рекурсивно търсене във всички подмодули"
 
-#: builtin/grep.c:862
 msgid "show non-matching lines"
 msgstr "извеждане на редовете, които не съвпадат"
 
-#: builtin/grep.c:864
 msgid "case insensitive matching"
 msgstr "без значение на регистъра на буквите (главни/малки)"
 
-#: builtin/grep.c:866
 msgid "match patterns only at word boundaries"
 msgstr "напасване на шаблоните само по границите на думите"
 
-#: builtin/grep.c:868
 msgid "process binary files as text"
 msgstr "обработване на двоичните файлове като текстови"
 
-#: builtin/grep.c:870
 msgid "don't match patterns in binary files"
 msgstr "прескачане на двоичните файлове"
 
-#: builtin/grep.c:873
 msgid "process binary files with textconv filters"
 msgstr ""
 "обработване на двоичните файлове чрез филтри за преобразуване към текст"
 
-#: builtin/grep.c:875
 msgid "search in subdirectories (default)"
 msgstr "търсене в поддиректориите (стандартно)"
 
-#: builtin/grep.c:877
 msgid "descend at most <depth> levels"
 msgstr "навлизане максимално на тази ДЪЛБОЧИНА в дървото"
 
-#: builtin/grep.c:881
 msgid "use extended POSIX regular expressions"
 msgstr "разширени регулярни изрази по POSIX"
 
-#: builtin/grep.c:884
 msgid "use basic POSIX regular expressions (default)"
 msgstr "основни регулярни изрази по POSIX (стандартно)"
 
-#: builtin/grep.c:887
 msgid "interpret patterns as fixed strings"
 msgstr "шаблоните са дословни низове"
 
-#: builtin/grep.c:890
 msgid "use Perl-compatible regular expressions"
 msgstr "регулярни изрази на Perl"
 
-#: builtin/grep.c:893
 msgid "show line numbers"
 msgstr "извеждане на номерата на редовете"
 
-#: builtin/grep.c:894
 msgid "show column number of first match"
 msgstr "извеждане на номера на колоната на първото напасване"
 
-#: builtin/grep.c:895
 msgid "don't show filenames"
 msgstr "без извеждане на имената на файловете"
 
-#: builtin/grep.c:896
 msgid "show filenames"
 msgstr "извеждане на имената на файловете"
 
-#: builtin/grep.c:898
 msgid "show filenames relative to top directory"
 msgstr ""
 "извеждане на относителните имена на файловете спрямо основната директория на "
 "хранилището"
 
-#: builtin/grep.c:900
 msgid "show only filenames instead of matching lines"
 msgstr "извеждане само на имената на файловете без напасващите редове"
 
-#: builtin/grep.c:902
 msgid "synonym for --files-with-matches"
 msgstr "псевдоним на „--files-with-matches“"
 
-#: builtin/grep.c:905
 msgid "show only the names of files without match"
 msgstr ""
 "извеждане само на имената на файловете, които не съдържат ред, напасващ на "
 "шаблона"
 
-#: builtin/grep.c:907
 msgid "print NUL after filenames"
 msgstr "извеждане на нулевия знак „NUL“ след всяко име на файл"
 
-#: builtin/grep.c:910
 msgid "show only matching parts of a line"
 msgstr "извеждане само на частите на редовете, които съвпадат"
 
-#: builtin/grep.c:912
 msgid "show the number of matches instead of matching lines"
 msgstr "извеждане на броя на съвпаденията вместо напасващите редове"
 
-#: builtin/grep.c:913
 msgid "highlight matches"
 msgstr "оцветяване на напасванията"
 
-#: builtin/grep.c:915
 msgid "print empty line between matches from different files"
 msgstr "извеждане на празен ред между напасванията от различни файлове"
 
-#: builtin/grep.c:917
 msgid "show filename only once above matches from same file"
 msgstr ""
 "извеждане на името на файла само веднъж за всички напасвания от този файл"
 
-#: builtin/grep.c:920
 msgid "show <n> context lines before and after matches"
 msgstr "извеждане на такъв БРОЙ редове преди и след напасванията"
 
-#: builtin/grep.c:923
 msgid "show <n> context lines before matches"
 msgstr "извеждане на такъв БРОЙ редове преди напасванията"
 
-#: builtin/grep.c:925
 msgid "show <n> context lines after matches"
 msgstr "извеждане на такъв БРОЙ редове след напасванията"
 
-#: builtin/grep.c:927
 msgid "use <n> worker threads"
 msgstr "използване на такъв БРОЙ работещи нишки"
 
-#: builtin/grep.c:928
 msgid "shortcut for -C NUM"
 msgstr "псевдоним на „-C БРОЙ“"
 
-#: builtin/grep.c:931
 msgid "show a line with the function name before matches"
 msgstr "извеждане на ред с името на функцията, в която е напаснат шаблона"
 
-#: builtin/grep.c:933
 msgid "show the surrounding function"
 msgstr "извеждане на обхващащата функция"
 
-#: builtin/grep.c:936
 msgid "read patterns from file"
 msgstr "изчитане на шаблоните от ФАЙЛ"
 
-#: builtin/grep.c:938
 msgid "match <pattern>"
 msgstr "напасване на ШАБЛОН"
 
-#: builtin/grep.c:940
 msgid "combine patterns specified with -e"
 msgstr "комбиниране на шаблоните указани с опцията „-e“"
 
-#: builtin/grep.c:952
 msgid "indicate hit with exit status without output"
 msgstr ""
 "без извеждане на стандартния изход.  Изходният код указва наличието на "
 "напасване"
 
-#: builtin/grep.c:954
 msgid "show only matches from files that match all patterns"
 msgstr ""
 "извеждане на редове само от файловете, които напасват на всички шаблони"
 
-#: builtin/grep.c:957
 msgid "pager"
 msgstr "програма за преглед по страници"
 
-#: builtin/grep.c:957
 msgid "show matching files in the pager"
 msgstr "извеждане на съвпадащите файлове в програма за преглед по страници"
 
-#: builtin/grep.c:961
 msgid "allow calling of grep(1) (ignored by this build)"
 msgstr ""
 "позволяване на стартирането на grep(1) (текущият компилат пренебрегва тази "
 "опция)"
 
-#: builtin/grep.c:1027
 msgid "no pattern given"
 msgstr "не сте задали шаблон"
 
-#: builtin/grep.c:1063
 msgid "--no-index or --untracked cannot be used with revs"
 msgstr "опциите „--no-index“ и „--untracked“ са несъвместими с версии."
 
-#: builtin/grep.c:1071
 #, c-format
 msgid "unable to resolve revision: %s"
 msgstr "версията „%s“ не може бъде открита"
 
-#: builtin/grep.c:1101
 msgid "--untracked not supported with --recurse-submodules"
 msgstr "опциите „--untracked“ и „--recurse-submodules“ са несъвместими"
 
-#: builtin/grep.c:1105
 msgid "invalid option combination, ignoring --threads"
 msgstr "неправилна комбинация от опции, „--threads“ ще се пренебрегне"
 
-#: builtin/grep.c:1108 builtin/pack-objects.c:4059
 msgid "no threads support, ignoring --threads"
 msgstr "липсва поддръжка за нишки.  „--threads“ ще се пренебрегне"
 
-#: 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:1145
 msgid "--open-files-in-pager only works on the worktree"
 msgstr "опцията „--open-files-in-pager“ изисква търсене в работното дърво"
 
-#: builtin/grep.c:1171
-msgid "--cached or --untracked cannot be used with --no-index"
-msgstr "опциите „--cached“ и „--untracked“ са несъвместими с „--no-index“"
-
-#: builtin/grep.c:1174
-msgid "--untracked cannot be used with --cached"
-msgstr "опциите „--untracked“ и „--cached“ са несъвместими"
-
-#: builtin/grep.c:1180
 msgid "--[no-]exclude-standard cannot be used for tracked contents"
 msgstr ""
 "опциите „--(no-)exclude-standard“ са несъвместими с търсене по следени "
 "файлове"
 
-#: builtin/grep.c:1188
 msgid "both --cached and trees are given"
 msgstr "опцията „--cached“ е несъвместима със задаване на дърво"
 
-#: builtin/hash-object.c:83
 msgid ""
 "git hash-object [-t <type>] [-w] [--path=<file> | --no-filters] [--stdin] "
 "[--] <file>..."
@@ -17012,109 +7135,78 @@ msgstr ""
 "git hash-object [-t ВИД] [-w] [--path=ФАЙЛ | --no-filters] [--stdin] [--] "
 "ФАЙЛ…"
 
-#: builtin/hash-object.c:84
-msgid "git hash-object  --stdin-paths"
-msgstr "git hash-object --stdin-paths"
-
-#: builtin/hash-object.c:96
 msgid "object type"
 msgstr "ВИД на обекта"
 
-#: builtin/hash-object.c:97
 msgid "write the object into the object database"
 msgstr "записване на обекта в базата от данни за обектите"
 
-#: builtin/hash-object.c:99
 msgid "read the object from stdin"
 msgstr "изчитане на обекта от стандартния вход"
 
-#: builtin/hash-object.c:101
 msgid "store file as is without filters"
 msgstr "запазване на файла както е — без филтри"
 
-#: builtin/hash-object.c:102
 msgid ""
 "just hash any random garbage to create corrupt objects for debugging Git"
 msgstr ""
 "създаване и изчисляване на контролни суми на произволни данни за повредени "
 "обекти за трасиране на Git"
 
-#: builtin/hash-object.c:103
 msgid "process file as it were from this path"
 msgstr "обработване на ФАЙЛа все едно е с този път"
 
-#: builtin/help.c:55
 msgid "print all available commands"
 msgstr "показване на всички налични команди"
 
-#: builtin/help.c:57
+msgid "show external commands in --all"
+msgstr "извеждане на външните команди при „--all“"
+
+msgid "show aliases in --all"
+msgstr "извеждане на псевдонимите при „--all“"
+
 msgid "exclude guides"
 msgstr "без въведения"
 
-#: builtin/help.c:58
 msgid "show man page"
 msgstr "показване на страница от ръководството"
 
-#: builtin/help.c:59
 msgid "show manual in web browser"
 msgstr "показване на страница от ръководството в уеб браузър"
 
-#: builtin/help.c:61
 msgid "show info page"
 msgstr "показване на информационна страница"
 
-#: builtin/help.c:63
 msgid "print command description"
 msgstr "извеждане на описанието на команда"
 
-#: builtin/help.c:65
 msgid "print list of useful guides"
 msgstr "показване на списък с въведения"
 
-#: 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]] [КОМАНДА]"
+msgid "git help [[-i|--info] [-m|--man] [-w|--web]] [<command>]"
+msgstr "git help [[-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:222
 msgid "Failed to start emacsclient."
 msgstr "Неуспешно стартиране на „emacsclient“."
 
-#: builtin/help.c:235
 msgid "Failed to parse emacsclient version."
 msgstr "Версията на „emacsclient“ не може да се анализира."
 
-#: builtin/help.c:243
 #, c-format
 msgid "emacsclient version '%d' too old (< 22)."
 msgstr "Прекалено стара версия на „emacsclient“ — %d (< 22)."
 
-#: builtin/help.c:261 builtin/help.c:283 builtin/help.c:293 builtin/help.c:301
 #, c-format
 msgid "failed to exec '%s'"
 msgstr "неуспешно изпълнение на „%s“"
 
-#: builtin/help.c:339
 #, c-format
 msgid ""
 "'%s': path for unsupported man viewer.\n"
@@ -17123,7 +7215,6 @@ msgstr ""
 "„%s“: път към неподдържана програма за преглед на\n"
 " ръководството.  Вместо нея пробвайте „man.<tool>.cmd“."
 
-#: builtin/help.c:351
 #, c-format
 msgid ""
 "'%s': cmd for supported man viewer.\n"
@@ -17132,415 +7223,340 @@ msgstr ""
 "„%s“: команда за поддържана програма за преглед на\n"
 " ръководството.  Вместо нея пробвайте „man.<tool>.path“."
 
-#: builtin/help.c:466
 #, c-format
 msgid "'%s': unknown man viewer."
 msgstr "„%s“: непозната програма за преглед на ръководството."
 
-#: builtin/help.c:482
 msgid "no man viewer handled the request"
 msgstr "никоя програма за преглед на ръководство не успя да обработи заявката"
 
-#: builtin/help.c:489
 msgid "no info viewer handled the request"
 msgstr ""
 "никоя програма за преглед на информационните страници не успя да обработи "
 "заявката"
 
-#: builtin/help.c:550 builtin/help.c:561 git.c:348
 #, c-format
 msgid "'%s' is aliased to '%s'"
 msgstr "„%s“ е псевдоним на „%s“"
 
-#: builtin/help.c:564 git.c:380
 #, c-format
 msgid "bad alias.%s string: %s"
 msgstr "неправилен низ за настройката „alias.%s“: „%s“"
 
-#: builtin/help.c:580
-msgid "this option doesn't take any other arguments"
-msgstr "опцията не приема аргументи"
+#, c-format
+msgid "the '%s' option doesn't take any non-option arguments"
+msgstr "опцията „%s“ не приема аргументи"
+
+msgid ""
+"the '--no-[external-commands|aliases]' options can only be used with '--all'"
+msgstr "опциите „--no-[external-commands|aliases]“ изискват опцията „--all“"
 
-#: builtin/help.c:601 builtin/help.c:628
 #, c-format
 msgid "usage: %s%s"
 msgstr "употреба: %s%s"
 
-#: builtin/help.c:623
 msgid "'git help config' for more information"
 msgstr "За повече информация изпълнете „git help config“"
 
-#: builtin/index-pack.c:221
+msgid "git hook run [--ignore-missing] <hook-name> [-- <hook-args>]"
+msgstr "git hook run [--ignore-missing] КУКА [-- АРГУМЕНТ_ЗА_КУКА…]"
+
+msgid "silently ignore missing requested <hook-name>"
+msgstr "прескачане на заявена КУКА, която липсва"
+
 #, c-format
 msgid "object type mismatch at %s"
 msgstr "неправилен вид на обекта „%s“"
 
-#: builtin/index-pack.c:241
 #, c-format
 msgid "did not receive expected object %s"
 msgstr "очакваният обект „%s“ не бе получен"
 
-#: builtin/index-pack.c:244
 #, c-format
 msgid "object %s: expected type %s, found %s"
 msgstr "неправилен вид на обекта „%s“: очакваше се „%s“, а бе получен „%s“"
 
-#: 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:304
 msgid "early EOF"
 msgstr "неочакван край на файл"
 
-#: builtin/index-pack.c:305
 msgid "read error on input"
 msgstr "грешка при четене на входните данни"
 
-#: builtin/index-pack.c:317
 msgid "used more bytes than were available"
 msgstr "използвани са повече от наличните байтове"
 
-#: 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:327 builtin/unpack-objects.c:95
-msgid "pack exceeds maximum allowed size"
-msgstr "пакетният файл надвишава максималния възможен размер"
+#, c-format
+msgid "pack exceeds maximum allowed size (%s)"
+msgstr "пакетният файл надвишава максималния възможен размер (%s)"
 
-#: builtin/index-pack.c:358
 msgid "pack signature mismatch"
 msgstr "несъответствие в подписа към пакетния файл"
 
-#: builtin/index-pack.c:360
 #, c-format
 msgid "pack version %<PRIu32> unsupported"
 msgstr "не се поддържа пакетиране вeрсия „%<PRIu32>“"
 
-#: builtin/index-pack.c:376
 #, c-format
 msgid "pack has bad object at offset %<PRIuMAX>: %s"
 msgstr "повреден обект в пакетния файл при отместване %<PRIuMAX>: %s"
 
-#: builtin/index-pack.c:482
 #, c-format
 msgid "inflate returned %d"
 msgstr "декомпресирането с „inflate“ върна %d"
 
-#: builtin/index-pack.c:531
 msgid "offset value overflow for delta base object"
 msgstr "стойността на отместването за обекта-разлика води до препълване"
 
-#: builtin/index-pack.c:539
 msgid "delta base offset is out of bound"
 msgstr "стойността на отместването за обекта-разлика е извън диапазона"
 
-#: builtin/index-pack.c:547
 #, c-format
 msgid "unknown object type %d"
 msgstr "непознат вид обект %d"
 
-#: builtin/index-pack.c:578
 msgid "cannot pread pack file"
 msgstr "пакетният файл не може да бъде прочетен"
 
-#: 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:606
 msgid "serious inflate inconsistency"
 msgstr "сериозна грешка при декомпресиране с „inflate“"
 
-#: 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: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:818
 #, c-format
 msgid "cannot read existing object info %s"
 msgstr "съществуващият обект в „%s“ не може да бъде прочетен"
 
-#: builtin/index-pack.c:826
 #, c-format
 msgid "cannot read existing object %s"
 msgstr "съществуващият обект „%s“ не може да бъде прочетен"
 
-#: builtin/index-pack.c:840
 #, c-format
 msgid "invalid blob object %s"
 msgstr "неправилен обект-BLOB „%s“"
 
-#: builtin/index-pack.c:843 builtin/index-pack.c:862
 msgid "fsck error in packed object"
 msgstr "грешка при проверката на пакетирани обекти"
 
-#: builtin/index-pack.c:864
 #, c-format
 msgid "Not all child objects of %s are reachable"
 msgstr "Някои обекти, наследници на „%s“, не може да бъдат достигнати"
 
-#: builtin/index-pack.c:925 builtin/index-pack.c:972
 msgid "failed to apply delta"
 msgstr "разликата не може да бъде приложена"
 
-#: builtin/index-pack.c:1156
 msgid "Receiving objects"
 msgstr "Получаване на обекти"
 
-#: builtin/index-pack.c:1156
 msgid "Indexing objects"
 msgstr "Индексиране на обекти"
 
-#: builtin/index-pack.c:1190
 msgid "pack is corrupted (SHA1 mismatch)"
 msgstr "пакетният файл е повреден (нееднакви суми по SHA1)"
 
-#: builtin/index-pack.c:1195
 msgid "cannot fstat packfile"
 msgstr "не може да се получи информация за пакетния файл с „fstat“"
 
-#: builtin/index-pack.c:1198
 msgid "pack has junk at the end"
 msgstr "в края на пакетния файл има повредени данни"
 
-#: builtin/index-pack.c:1210
 msgid "confusion beyond insanity in parse_pack_objects()"
 msgstr "фатална грешка във функцията „parse_pack_objects“"
 
-#: builtin/index-pack.c:1233
 msgid "Resolving deltas"
 msgstr "Откриване на съответните разлики"
 
-#: builtin/index-pack.c:1244 builtin/pack-objects.c:2905
 #, c-format
 msgid "unable to create thread: %s"
 msgstr "не може да се създаде нишка: %s"
 
-#: builtin/index-pack.c:1277
 msgid "confusion beyond insanity"
 msgstr "фатална грешка"
 
-#: 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:1295
 #, c-format
 msgid "Unexpected tail checksum for %s (disk corruption?)"
 msgstr ""
 "Неочаквана последваща сума за грешки за „%s“ (причината може да е грешка в "
 "диска)"
 
-#: 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:1323
 #, c-format
 msgid "unable to deflate appended object (%d)"
 msgstr "добавеният обект не може да се компресира с „deflate“: %d"
 
-#: builtin/index-pack.c:1419
 #, c-format
 msgid "local object %s is corrupt"
 msgstr "локалният обект „%s“ е повреден"
 
-#: builtin/index-pack.c:1440
 #, c-format
 msgid "packfile name '%s' does not end with '.%s'"
 msgstr "името на пакетния файл „%s“ не завършва с „%s“"
 
-#: builtin/index-pack.c:1464
 #, c-format
 msgid "cannot write %s file '%s'"
 msgstr "грешка при запис на файла „%s“ „%s“"
 
-#: builtin/index-pack.c:1472
 #, c-format
 msgid "cannot close written %s file '%s'"
 msgstr "грешка при затварянето на записания файл „%s“ „%s“"
 
-#: 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:1573 builtin/pack-objects.c:3150
 #, c-format
-msgid "bad pack.indexversion=%<PRIu32>"
-msgstr "зададена е неправилна версия пакетиране: „pack.indexversion=%<PRIu32>“"
+msgid "bad pack.indexVersion=%<PRIu32>"
+msgstr "неправилна стойност: „pack.indexVersion=%<PRIu32>“"
 
-#: builtin/index-pack.c:1643
 #, c-format
 msgid "Cannot open existing pack file '%s'"
 msgstr "Съществуващият пакетен файл „%s“ не може да бъде отворен"
 
-#: builtin/index-pack.c:1645
 #, c-format
 msgid "Cannot open existing pack idx file for '%s'"
 msgstr "Съществуващият индекс за пакетния файл „%s“ не може да бъде отворен"
 
-#: 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: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:1742
 msgid "Cannot come back to cwd"
 msgstr "Процесът не може да се върне към предишната работна директория"
 
-#: 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: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
 msgid "--stdin requires a git repository"
 msgstr "„--stdin“ изисква хранилище на git"
 
-#: builtin/index-pack.c:1867
 msgid "--verify with no packfile name given"
 msgstr "опцията „--verify“ изисква име на пакетен файл"
 
-#: builtin/index-pack.c:1933 builtin/unpack-objects.c:584
 msgid "fsck error in pack objects"
 msgstr "грешка при проверка с „fsck“ на пакетните обекти"
 
-#: builtin/init-db.c:63
 #, c-format
 msgid "cannot stat template '%s'"
 msgstr "не може да се получи информация чрез „stat“ за шаблона „%s“"
 
-#: builtin/init-db.c:68
 #, c-format
 msgid "cannot opendir '%s'"
 msgstr "директорията „%s“ не може да бъде отворена"
 
-#: builtin/init-db.c:80
 #, c-format
 msgid "cannot readlink '%s'"
 msgstr "връзката „%s“ не може да бъде прочетена"
 
-#: builtin/init-db.c:82
 #, c-format
 msgid "cannot symlink '%s' '%s'"
 msgstr "не може да се създаде символна връзка „%s“ в „%s“"
 
-#: builtin/init-db.c:88
 #, c-format
 msgid "cannot copy '%s' to '%s'"
 msgstr "„%s“ не може да се копира в „%s“"
 
-#: builtin/init-db.c:92
 #, c-format
 msgid "ignoring template %s"
 msgstr "игнориране на шаблона „%s“"
 
-#: builtin/init-db.c:123
 #, c-format
 msgid "templates not found in %s"
 msgstr "няма шаблони в „%s“"
 
-#: builtin/init-db.c:138
 #, c-format
 msgid "not copying templates from '%s': %s"
 msgstr "шаблоните няма да бъдат копирани от „%s“: „%s“"
 
-#: builtin/init-db.c:263
 #, c-format
 msgid "invalid initial branch name: '%s'"
 msgstr "неправилно име на първоначалния клон: „%s“"
 
-#: builtin/init-db.c:354
 #, c-format
 msgid "unable to handle file type %d"
 msgstr "файлове от вид %d не се поддържат"
 
-#: builtin/init-db.c:357
 #, c-format
 msgid "unable to move %s to %s"
 msgstr "„%s“ не може да се премести в „%s“"
 
-#: builtin/init-db.c:373
 msgid "attempt to reinitialize repository with different hash"
 msgstr ""
 "опит за повторно задаване на първото подаване в хранилището с различна "
 "контролна сума"
 
-#: builtin/init-db.c:397 builtin/init-db.c:400
 #, c-format
 msgid "%s already exists"
 msgstr "Директорията „%s“ вече съществува"
 
-#: builtin/init-db.c:432
 #, c-format
 msgid "re-init: ignored --initial-branch=%s"
 msgstr "re-init: „--initial-branch=%s“ се пропуска"
 
-#: builtin/init-db.c:463
 #, c-format
 msgid "Reinitialized existing shared Git repository in %s%s\n"
 msgstr ""
 "Инициализиране наново на съществуващо, споделено хранилище на Git в „%s%s“\n"
 
-#: builtin/init-db.c:464
 #, c-format
 msgid "Reinitialized existing Git repository in %s%s\n"
 msgstr "Инициализиране наново на съществуващо хранилище на Git в „%s%s“\n"
 
-#: builtin/init-db.c:468
 #, c-format
 msgid "Initialized empty shared Git repository in %s%s\n"
 msgstr "Инициализиране на празно, споделено хранилище на Git в „%s%s“\n"
 
-#: builtin/init-db.c:469
 #, c-format
 msgid "Initialized empty Git repository in %s%s\n"
 msgstr "Инициализиране на празно хранилище на Git в „%s%s“\n"
 
-#: builtin/init-db.c:518
 msgid ""
 "git init [-q | --quiet] [--bare] [--template=<template-directory>] [--"
 "shared[=<permissions>]] [<directory>]"
@@ -17548,39 +7564,31 @@ msgstr ""
 "git init [-q | --quiet] [--bare] [--template=ДИРЕКТОРИЯ_С_ШАБЛОНИ] [--"
 "shared[=ПРАВА]] [ДИРЕКТОРИЯ]"
 
-#: builtin/init-db.c:544
 msgid "permissions"
 msgstr "права"
 
-#: builtin/init-db.c:545
 msgid "specify that the git repository is to be shared amongst several users"
 msgstr ""
 "указване, че хранилището на Git ще бъде споделено от повече от един "
 "потребител"
 
-#: builtin/init-db.c:551
 msgid "override the name of the initial branch"
 msgstr "задаване на името на първоначалния клон"
 
-#: builtin/init-db.c:552 builtin/verify-pack.c:74
 msgid "hash"
 msgstr "алгоритъм"
 
-#: builtin/init-db.c:553 builtin/show-index.c:22 builtin/verify-pack.c:75
 msgid "specify the hash algorithm to use"
 msgstr "указване на алгоритъм за контролна сума"
 
-#: builtin/init-db.c:591 builtin/init-db.c:596
 #, c-format
 msgid "cannot mkdir %s"
 msgstr "директорията „%s“ не може да бъде създадена"
 
-#: builtin/init-db.c:600 builtin/init-db.c:655
 #, c-format
 msgid "cannot chdir to %s"
 msgstr "не може да се влезе в директорията „%s“"
 
-#: builtin/init-db.c:627
 #, c-format
 msgid ""
 "%s (or --work-tree=<directory>) not allowed without specifying %s (or --git-"
@@ -17589,16 +7597,13 @@ msgstr ""
 "%s (или --work-tree=ДИРЕКТОРИЯ) изисква указването на %s (или --git-"
 "dir=ДИРЕКТОРИЯ)"
 
-#: builtin/init-db.c:679
 #, c-format
 msgid "Cannot access work tree '%s'"
 msgstr "Работното дърво в „%s“ е недостъпно"
 
-#: builtin/init-db.c:684
 msgid "--separate-git-dir incompatible with bare repository"
 msgstr "опцията „--separate-git-dir“ е несъвместима с голо хранилище"
 
-#: builtin/interpret-trailers.c:16
 msgid ""
 "git interpret-trailers [--in-place] [--trim-empty] [(--trailer "
 "<token>[(=|:)<value>])...] [<file>...]"
@@ -17606,94 +7611,75 @@ msgstr ""
 "git interpret-trailers [--in-place] [--trim-empty] [(--trailer "
 "ЛЕКСЕМА[(=|:)СТОЙНОСТ])…] [ФАЙЛ…]"
 
-#: builtin/interpret-trailers.c:95
 msgid "edit files in place"
 msgstr "директно редактиране на файловете"
 
-#: builtin/interpret-trailers.c:96
 msgid "trim empty trailers"
 msgstr "изчистване на празните епилози"
 
-#: builtin/interpret-trailers.c:99
 msgid "where to place the new trailer"
 msgstr "къде да се постави новият епилог"
 
-#: builtin/interpret-trailers.c:101
 msgid "action if trailer already exists"
 msgstr "действие, ако епилог вече съществува"
 
-#: builtin/interpret-trailers.c:103
 msgid "action if trailer is missing"
 msgstr "действие при липсващ епилог"
 
-#: builtin/interpret-trailers.c:105
 msgid "output only the trailers"
 msgstr "извеждане само на епилозите"
 
-#: builtin/interpret-trailers.c:106
 msgid "do not apply config rules"
 msgstr "без прилагане на правилата за настройките"
 
-#: builtin/interpret-trailers.c:107
 msgid "join whitespace-continued values"
 msgstr "сливане на стойностите последване от знаци за интервали"
 
-#: builtin/interpret-trailers.c:108
 msgid "set parsing options"
 msgstr "опции при анализ"
 
-#: builtin/interpret-trailers.c:110
 msgid "do not treat --- specially"
 msgstr "„---“ няма специално значение"
 
-#: builtin/interpret-trailers.c:112
 msgid "trailer(s) to add"
 msgstr "епилози за добавяне"
 
-#: builtin/interpret-trailers.c:123
 msgid "--trailer with --only-input does not make sense"
 msgstr "опцията „--trailer“ е несъвместима с „--only-input“"
 
-#: builtin/interpret-trailers.c:133
 msgid "no input file given for in-place editing"
 msgstr "не е зададен входен файл за редактиране на място"
 
-#: builtin/log.c:59
 msgid "git log [<options>] [<revision-range>] [[--] <path>...]"
 msgstr "git log [ОПЦИЯ…] [ДИАПАЗОН_НА_ВЕРСИИТЕ] [[--] ПЪТ…]"
 
-#: builtin/log.c:60
 msgid "git show [<options>] <object>..."
 msgstr "git show [ОПЦИЯ…] ОБЕКТ…"
 
-#: builtin/log.c:113
 #, c-format
 msgid "invalid --decorate option: %s"
 msgstr "неправилна опция „--decorate“: %s"
 
-#: builtin/log.c:180
+msgid "suppress diff output"
+msgstr "без извеждане на разликите"
+
 msgid "show source"
 msgstr "извеждане на изходния код"
 
-#: builtin/log.c:181
 msgid "use mail map file"
 msgstr ""
 "използване на файл за съответствията на имената и адресите на е-поща („."
 "mailmap“)"
 
-#: builtin/log.c:184
 msgid "only decorate refs that match <pattern>"
 msgstr "специален формат само на указателите напасващи на ШАБЛОНа"
 
-#: builtin/log.c:186
 msgid "do not decorate refs that match <pattern>"
 msgstr "без специален формат на указателите напасващи на ШАБЛОНа"
 
-#: builtin/log.c:187
 msgid "decorate options"
 msgstr "настройки на форма̀та на извежданата информация"
 
-#: builtin/log.c:190
 msgid ""
 "trace the evolution of line range <start>,<end> or function :<funcname> in "
 "<file>"
@@ -17701,89 +7687,76 @@ msgstr ""
 "проследяване на еволюцията на диапазона от редове НАЧАЛО,КРАЙ или :ФУНКЦИЯта "
 "във ФАЙЛа"
 
-#: builtin/log.c:213
+#, c-format
+msgid "unrecognized argument: %s"
+msgstr "непознат аргумент: %s"
+
 msgid "-L<range>:<file> cannot be used with pathspec"
 msgstr "опцията „-LДИАПАЗОН:ФАЙЛ“ не може да се ползва с път"
 
-#: builtin/log.c:321
 #, c-format
 msgid "Final output: %d %s\n"
 msgstr "Резултат: %d %s\n"
 
-#: builtin/log.c:586
+msgid "unable to create temporary object directory"
+msgstr "не може да бъде създадена директория за временни обекти"
+
 #, c-format
 msgid "git show %s: bad file"
 msgstr "git show %s: повреден файл"
 
-#: builtin/log.c:601 builtin/log.c:691
 #, c-format
 msgid "could not read object %s"
 msgstr "обектът не може да бъде прочетен: %s"
 
-#: builtin/log.c:716
 #, c-format
 msgid "unknown type: %d"
 msgstr "неизвестен вид: %d"
 
-#: builtin/log.c:861
 #, c-format
 msgid "%s: invalid cover from description mode"
 msgstr "%s: неправилно придружаващо писмо от режима на описание"
 
-#: builtin/log.c:868
 msgid "format.headers without value"
 msgstr "не е зададена стойност на „format.headers“"
 
-#: builtin/log.c:997
 #, c-format
 msgid "cannot open patch file %s"
 msgstr "файлът-кръпка „%s“ не може да бъде отворен"
 
-#: builtin/log.c:1014
 msgid "need exactly one range"
 msgstr "трябва да зададете точно един диапазон"
 
-#: builtin/log.c:1024
 msgid "not a range"
 msgstr "не е диапазон"
 
-#: builtin/log.c:1188
 msgid "cover letter needs email format"
 msgstr "придружаващото писмо трябва да е форматирано като е-писмо"
 
-#: builtin/log.c:1194
 msgid "failed to create cover-letter file"
 msgstr "неуспешно създаване на придружаващо писмо"
 
-#: builtin/log.c:1281
 #, c-format
 msgid "insane in-reply-to: %s"
 msgstr "неправилен формат на заглавната част за отговор „in-reply-to“: %s"
 
-#: builtin/log.c:1308
 msgid "git format-patch [<options>] [<since> | <revision-range>]"
 msgstr "git format-patch [ОПЦИЯ…] [ОТ | ДИАПАЗОН_НА_ВЕРСИИТЕ]"
 
-#: builtin/log.c:1366
 msgid "two output directories?"
 msgstr "може да укажете максимум една директория за изход"
 
-#: builtin/log.c:1517 builtin/log.c:2344 builtin/log.c:2346 builtin/log.c:2358
 #, c-format
 msgid "unknown commit %s"
 msgstr "непознато подаване: „%s“"
 
-#: builtin/log.c:1528 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“ не е указател или не сочи към нищо"
 
-#: builtin/log.c:1537
 msgid "could not find exact merge base"
 msgstr "точната база за сливане не може да бъде открита"
 
-#: builtin/log.c:1547
 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"
@@ -17794,289 +7767,230 @@ msgstr ""
 "Може ръчно да зададете базово подаване чрез „--"
 "base=<ИДЕНТИФИКАТОР_НА_БАЗОВО_ПОДАВАНЕ>“."
 
-#: builtin/log.c:1570
 msgid "failed to find exact merge base"
 msgstr "точната база при сливане не може да бъде открита"
 
-#: builtin/log.c:1587
 msgid "base commit should be the ancestor of revision list"
 msgstr "базовото подаване трябва да е предшественикът на списъка с версиите"
 
-#: builtin/log.c:1597
 msgid "base commit shouldn't be in revision list"
 msgstr "базовото подаване не може да е в списъка с версиите"
 
-#: builtin/log.c:1655
 msgid "cannot get patch id"
 msgstr "идентификаторът на кръпката не може да бъде получен"
 
-#: builtin/log.c:1718
 msgid "failed to infer range-diff origin of current series"
 msgstr ""
 "неуспешно определяне на началото на диапазонната разлика на текущата поредица"
 
-#: builtin/log.c:1720
 #, c-format
 msgid "using '%s' as range-diff origin of current series"
 msgstr ""
 "„%s“ се ползва като началото на диапазонната разлика на текущата поредица"
 
-#: builtin/log.c:1764
 msgid "use [PATCH n/m] even with a single patch"
 msgstr "номерация „[PATCH n/m]“ дори и при единствена кръпка"
 
-#: builtin/log.c:1767
 msgid "use [PATCH] even with multiple patches"
 msgstr "номерация „[PATCH]“ дори и при множество кръпки"
 
-#: builtin/log.c:1771
 msgid "print patches to standard out"
 msgstr "извеждане на кръпките на стандартния изход"
 
-#: builtin/log.c:1773
 msgid "generate a cover letter"
 msgstr "създаване на придружаващо писмо"
 
-#: builtin/log.c:1775
 msgid "use simple number sequence for output file names"
 msgstr "проста числова последователност за имената на файловете-кръпки"
 
-#: builtin/log.c:1776
 msgid "sfx"
 msgstr "ЗНАЦИ"
 
-#: builtin/log.c:1777
 msgid "use <sfx> instead of '.patch'"
 msgstr "използване на тези ЗНАЦИ за суфикс вместо „.patch“"
 
-#: builtin/log.c:1779
 msgid "start numbering patches at <n> instead of 1"
 msgstr "номерирането на кръпките да започва от този БРОЙ, а не с 1"
 
-#: builtin/log.c:1780
 msgid "reroll-count"
 msgstr "номер на редакция"
 
-#: builtin/log.c:1781
 msgid "mark the series as Nth re-roll"
 msgstr "отбелязване, че това е N-тата поредна редакция на поредицата от кръпки"
 
-#: builtin/log.c:1783
 msgid "max length of output filename"
 msgstr "максимална дължина на име на всеки пакетен файл"
 
-#: builtin/log.c:1785
 msgid "use [RFC PATCH] instead of [PATCH]"
 msgstr "използване на „[RFC PATCH]“ вместо „[PATCH]“"
 
-#: builtin/log.c:1788
 msgid "cover-from-description-mode"
 msgstr "режим-придружаващо-писмо-по-описание"
 
-#: builtin/log.c:1789
 msgid "generate parts of a cover letter based on a branch's description"
 msgstr ""
 "генериране на частите на придружаващото писмо на базата на описанието на "
 "клона"
 
-#: builtin/log.c:1791
 msgid "use [<prefix>] instead of [PATCH]"
 msgstr "използване на този „[ПРЕФИКС]“ вместо „[PATCH]“"
 
-#: builtin/log.c:1794
 msgid "store resulting files in <dir>"
 msgstr "запазване на изходните файлове в тази ДИРЕКТОРИЯ"
 
-#: builtin/log.c:1797
 msgid "don't strip/add [PATCH]"
 msgstr "без добавяне/махане на префикса „[PATCH]“"
 
-#: builtin/log.c:1800
 msgid "don't output binary diffs"
 msgstr "без извеждане на разлики между двоични файлове"
 
-#: builtin/log.c:1802
 msgid "output all-zero hash in From header"
 msgstr "в заглавната част „From:“ (от) контролната сума да е само от нули"
 
-#: builtin/log.c:1804
 msgid "don't include a patch matching a commit upstream"
 msgstr "без кръпки, които присъстват в следения клон"
 
-#: builtin/log.c:1806
 msgid "show patch format instead of default (patch + stat)"
 msgstr ""
 "извеждане във формат за кръпки, а на в стандартния (кръпка и статистика)"
 
-#: builtin/log.c:1808
 msgid "Messaging"
 msgstr "Опции при изпращане"
 
-#: builtin/log.c:1809
 msgid "header"
 msgstr "ЗАГЛАВНА_ЧАСТ"
 
-#: builtin/log.c:1810
 msgid "add email header"
 msgstr "добавяне на тази ЗАГЛАВНА_ЧАСТ"
 
-#: builtin/log.c:1811 builtin/log.c:1812
 msgid "email"
 msgstr "Е-ПОЩА"
 
-#: builtin/log.c:1811
 msgid "add To: header"
 msgstr "добавяне на заглавна част „To:“ (до)"
 
-#: builtin/log.c:1812
 msgid "add Cc: header"
 msgstr "добавяне на заглавна част „Cc:“ (и до)"
 
-#: builtin/log.c:1813
 msgid "ident"
 msgstr "ИДЕНТИЧНОСТ"
 
-#: builtin/log.c:1814
 msgid "set From address to <ident> (or committer ident if absent)"
 msgstr ""
 "задаване на адреса в заглавната част „From“ (от) да е тази ИДЕНТИЧНОСТ.  Ако "
 "не е зададена такава, се взима адреса на подаващия"
 
-#: builtin/log.c:1816
 msgid "message-id"
 msgstr "ИДЕНТИФИКАТОР_НА_СЪОБЩЕНИЕ"
 
-#: builtin/log.c:1817
 msgid "make first mail a reply to <message-id>"
 msgstr ""
 "първото съобщение да е в отговор на е-писмото с този "
 "ИДЕНТИФИКАТОР_НА_СЪОБЩЕНИЕ"
 
-#: builtin/log.c:1818 builtin/log.c:1821
 msgid "boundary"
 msgstr "граница"
 
-#: builtin/log.c:1819
 msgid "attach the patch"
 msgstr "прикрепяне на кръпката"
 
-#: builtin/log.c:1822
 msgid "inline the patch"
 msgstr "включване на кръпката в текста на писмата"
 
-#: builtin/log.c:1826
 msgid "enable message threading, styles: shallow, deep"
 msgstr ""
 "използване на нишки за съобщенията.  СТИЛът е „shallow“ (плитък) или "
 "„deep“ (дълбок)"
 
-#: builtin/log.c:1828
 msgid "signature"
 msgstr "подпис"
 
-#: builtin/log.c:1829
 msgid "add a signature"
 msgstr "добавяне на поле за подпис"
 
-#: builtin/log.c:1830
 msgid "base-commit"
 msgstr "БАЗОВО_ПОДАВАНЕ"
 
-#: builtin/log.c:1831
 msgid "add prerequisite tree info to the patch series"
 msgstr "добавяне на необходимото БАЗово дърво към поредицата от кръпки"
 
-#: builtin/log.c:1834
 msgid "add a signature from a file"
 msgstr "добавяне на подпис от файл"
 
-#: builtin/log.c:1835
 msgid "don't print the patch filenames"
 msgstr "без извеждане на имената на кръпките"
 
-#: builtin/log.c:1837
 msgid "show progress while generating patches"
 msgstr "извеждане на напредъка във фазата на създаване на кръпките"
 
-#: builtin/log.c:1839
 msgid "show changes against <rev> in cover letter or single patch"
 msgstr ""
-"показване на промените спрямо ВЕРСията в придружаващото писмо или единствена "
+"показване на промѐните спрямо ВЕРСията в придружаващото писмо или единствена "
 "кръпка"
 
-#: builtin/log.c:1842
 msgid "show changes against <refspec> in cover letter or single patch"
 msgstr ""
-"показване на промените спрямо указателя на ВЕРСията в придружаващото писмо "
+"показване на промѐните спрямо указателя на ВЕРСията в придружаващото писмо "
 "или единствена кръпка"
 
-#: builtin/log.c:1844 builtin/range-diff.c:28
 msgid "percentage by which creation is weighted"
 msgstr "процент за претегляне при оценка на създаването"
 
-#: builtin/log.c:1931
 #, c-format
 msgid "invalid ident line: %s"
 msgstr "грешна идентичност: %s"
 
-#: builtin/log.c:1956
 msgid "--name-only does not make sense"
 msgstr "опцията „--name-only“ е несъвместима с генерирането на кръпки"
 
-#: builtin/log.c:1958
 msgid "--name-status does not make sense"
 msgstr "опцията „--name-status“ е несъвместима с генерирането на кръпки"
 
-#: builtin/log.c:1960
 msgid "--check does not make sense"
 msgstr "опцията „--check“ е несъвместима с генерирането на кръпки"
 
-#: builtin/log.c:2104
+msgid "--remerge-diff does not make sense"
+msgstr "опцията „--remerge-diff“ е несъвместима с генерирането на кръпки"
+
+#, c-format
+msgid "could not create directory '%s'"
+msgstr "Директорията „%s“ не може да бъде създадена"
+
 msgid "--interdiff requires --cover-letter or single patch"
 msgstr ""
 "опцията „--interdiff“ изисква опция „--cover-letter“ или единствена кръпка"
 
-#: builtin/log.c:2108
 msgid "Interdiff:"
 msgstr "Разлика в разликите:"
 
-#: builtin/log.c:2109
 #, c-format
 msgid "Interdiff against v%d:"
 msgstr "Разлика в разликите спрямо v%d:"
 
-#: builtin/log.c:2119
 msgid "--range-diff requires --cover-letter or single patch"
 msgstr ""
 "опцията „--range-diff“ изисква опция „--cover-letter“ или единствена кръпка"
 
-#: builtin/log.c:2127
 msgid "Range-diff:"
 msgstr "Диапазонна разлика:"
 
-#: builtin/log.c:2128
 #, c-format
 msgid "Range-diff against v%d:"
 msgstr "Диапазонна разлика спрямо v%d:"
 
-#: builtin/log.c:2139
 #, c-format
 msgid "unable to read signature file '%s'"
 msgstr "файлът „%s“ с подпис не може да бъде прочетен"
 
-#: builtin/log.c:2175
 msgid "Generating patches"
 msgstr "Създаване на кръпки"
 
-#: builtin/log.c:2219
 msgid "failed to create output files"
 msgstr "неуспешно създаване на изходни файлове"
 
-#: builtin/log.c:2279
 msgid "git cherry [-v] [<upstream> [<head> [<limit>]]]"
 msgstr "git cherry [-v] [ОТДАЛЕЧЕН_КЛОН [ВРЪХ [ПРЕДЕЛ]]]"
 
-#: builtin/log.c:2333
 #, c-format
 msgid ""
 "Could not find a tracked remote branch, please specify <upstream> manually.\n"
@@ -18084,126 +7998,93 @@ msgstr ""
 "Следеният отдалечен клон не бе открит, затова изрично задайте "
 "ОТДАЛЕЧЕН_КЛОН.\n"
 
-#: builtin/ls-files.c:564
 msgid "git ls-files [<options>] [<file>...]"
 msgstr "git ls-files [ОПЦИЯ…] [ФАЙЛ…]"
 
-#: builtin/ls-files.c:618
 msgid "separate paths with the NUL character"
 msgstr "разделяне на пътищата с нулевия знак „NUL“"
 
-#: builtin/ls-files.c:620
 msgid "identify the file status with tags"
 msgstr "извеждане на състоянието на файловете с еднобуквени флагове"
 
-#: builtin/ls-files.c:622
 msgid "use lowercase letters for 'assume unchanged' files"
 msgstr "малки букви за файловете, които да се счетат за непроменени"
 
-#: builtin/ls-files.c:624
 msgid "use lowercase letters for 'fsmonitor clean' files"
 msgstr "малки букви за файловете за командата „fsmonitor clean“"
 
-#: builtin/ls-files.c:626
 msgid "show cached files in the output (default)"
 msgstr "извеждане на кешираните файлове (стандартно)"
 
-#: builtin/ls-files.c:628
 msgid "show deleted files in the output"
 msgstr "извеждане на изтритите файлове"
 
-#: builtin/ls-files.c:630
 msgid "show modified files in the output"
 msgstr "извеждане на променените файлове"
 
-#: builtin/ls-files.c:632
 msgid "show other files in the output"
 msgstr "извеждане на другите файлове"
 
-#: builtin/ls-files.c:634
 msgid "show ignored files in the output"
 msgstr "извеждане на игнорираните файлове"
 
-#: builtin/ls-files.c:637
 msgid "show staged contents' object name in the output"
 msgstr "извеждане на името на обекта за съдържанието на индекса"
 
-#: builtin/ls-files.c:639
 msgid "show files on the filesystem that need to be removed"
 msgstr "извеждане на файловете, които трябва да бъдат изтрити"
 
-#: builtin/ls-files.c:641
 msgid "show 'other' directories' names only"
 msgstr "извеждане само на името на другите (неследените) директории"
 
-#: builtin/ls-files.c:643
 msgid "show line endings of files"
 msgstr "извеждане на знаците за край на ред във файловете"
 
-#: builtin/ls-files.c:645
 msgid "don't show empty directories"
 msgstr "без извеждане на празните директории"
 
-#: builtin/ls-files.c:648
 msgid "show unmerged files in the output"
 msgstr "извеждане на неслетите файлове"
 
-#: builtin/ls-files.c:650
 msgid "show resolve-undo information"
 msgstr "извеждане на информацията за отмяна на разрешените подавания"
 
-#: builtin/ls-files.c:652
 msgid "skip files matching pattern"
 msgstr "прескачане на файловете напасващи ШАБЛОНа"
 
-#: builtin/ls-files.c:655
 msgid "read exclude patterns from <file>"
 msgstr "изчитане на шаблоните за игнориране от ФАЙЛ"
 
-#: builtin/ls-files.c:658
 msgid "read additional per-directory exclude patterns in <file>"
 msgstr ""
 "изчитане на допълнителните шаблони за игнориране по директория от този ФАЙЛ"
 
-#: builtin/ls-files.c:660
 msgid "add the standard git exclusions"
 msgstr "добавяне на стандартно игнорираните от Git файлове"
 
-#: builtin/ls-files.c:664
 msgid "make the output relative to the project top directory"
 msgstr "пътищата да са относителни спрямо основната директория на проекта"
 
-#: builtin/ls-files.c:667
-msgid "recurse through submodules"
-msgstr "рекурсивно обхождане подмодулите"
-
-#: builtin/ls-files.c:669
 msgid "if any <file> is not in the index, treat this as an error"
 msgstr "грешка, ако някой от тези ФАЙЛове не е в индекса"
 
-#: builtin/ls-files.c:670
 msgid "tree-ish"
 msgstr "УКАЗАТЕЛ_КЪМ_ДЪРВО"
 
-#: builtin/ls-files.c:671
 msgid "pretend that paths removed since <tree-ish> are still present"
 msgstr ""
 "считане, че пътищата изтрити след УКАЗАТЕЛя_КЪМ_ДЪРВО все още съществуват"
 
-#: builtin/ls-files.c:673
 msgid "show debugging data"
 msgstr "извеждане на информацията за изчистване на грешки"
 
-#: builtin/ls-files.c:675
 msgid "suppress duplicate entries"
 msgstr "без повтаряне на записите"
 
-#: builtin/ls-files.c:677
 msgid "show sparse directories in the presence of a sparse index"
 msgstr ""
 "указване на частично изтеглените директории при наличието на частичен индекс"
 
-#: builtin/ls-remote.c:9
 msgid ""
 "git ls-remote [--heads] [--tags] [--refs] [--upload-pack=<exec>]\n"
 "              [-q | --quiet] [--exit-code] [--get-url]\n"
@@ -18213,179 +8094,163 @@ msgstr ""
 "              [-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:1103
 msgid "exec"
 msgstr "КОМАНДА"
 
-#: builtin/ls-remote.c:62 builtin/ls-remote.c:64
 msgid "path of git-upload-pack on the remote host"
 msgstr "път към командата „git-upload-pack“ на отдалечената машина"
 
-#: builtin/ls-remote.c:66
 msgid "limit to tags"
 msgstr "само етикетите"
 
-#: builtin/ls-remote.c:67
 msgid "limit to heads"
 msgstr "само върховете"
 
-#: builtin/ls-remote.c:68
 msgid "do not show peeled tags"
 msgstr "без проследяване на непреките етикети"
 
-#: builtin/ls-remote.c:70
 msgid "take url.<base>.insteadOf into account"
 msgstr "взимане предвид на „url.БАЗА.insteadOf“"
 
-#: builtin/ls-remote.c:73
 msgid "exit with exit code 2 if no matching refs are found"
 msgstr "изход с код 2, ако не се открият съвпадащи указатели"
 
-#: builtin/ls-remote.c:76
 msgid "show underlying ref in addition to the object pointed by it"
 msgstr "извеждане на указателя заедно с обекта сочен от него"
 
-#: builtin/ls-tree.c:30
 msgid "git ls-tree [<options>] <tree-ish> [<path>...]"
 msgstr "git ls-tree [ОПЦИЯ…] УКАЗАТЕЛ_КЪМ_ДЪРВО [ПЪТ…]"
 
-#: builtin/ls-tree.c:128
+#, c-format
+msgid "could not get object info about '%s'"
+msgstr "не може да се получи информация за обекта „%s“"
+
+#, c-format
+msgid "bad ls-tree format: element '%s' does not start with '('"
+msgstr "неправилен формат за „ls-tree“: елементът „%s“ не започва с „(“"
+
+#, c-format
+msgid "bad ls-tree format: element '%s' does not end in ')'"
+msgstr "неправилен формат за „ls-tree“: елементът „%s“ не завършва с „(“"
+
+#, c-format
+msgid "bad ls-tree format: %%%.*s"
+msgstr "неправилен формат за „ls-tree“: %%%.*s"
+
 msgid "only show trees"
 msgstr "извеждане само на дървета"
 
-#: builtin/ls-tree.c:130
 msgid "recurse into subtrees"
 msgstr "рекурсивно обхождане поддърветата"
 
-#: builtin/ls-tree.c:132
 msgid "show trees when recursing"
 msgstr "извеждане на дърветата при рекурсивното обхождане"
 
-#: builtin/ls-tree.c:135
 msgid "terminate entries with NUL byte"
 msgstr "разделяне на обектите с нулевия знак „NUL“"
 
-#: builtin/ls-tree.c:136
 msgid "include object size"
 msgstr "извеждане на размера на обекта"
 
-#: builtin/ls-tree.c:138 builtin/ls-tree.c:140
 msgid "list only filenames"
 msgstr "извеждане само имената на файловете"
 
-#: builtin/ls-tree.c:143
+msgid "list only objects"
+msgstr "извеждане само на обектите"
+
 msgid "use full path names"
 msgstr "използване на пълните имена на пътищата"
 
-#: builtin/ls-tree.c:145
 msgid "list entire tree; not just current directory (implies --full-name)"
 msgstr ""
 "извеждане на цялото дърво, не само на текущата директория (включва опцията "
 "„--full-name“)"
 
+msgid "--format can't be combined with other format-altering options"
+msgstr ""
+"опцията „--format“ е несъвместима с другите опции за промяна на форма̀та"
+
 #. TRANSLATORS: keep <> in "<" mail ">" info.
-#: builtin/mailinfo.c:14
 msgid "git mailinfo [<options>] <msg> <patch> < mail >info"
 msgstr "git mailinfo [ОПЦИЯ…] СЪОБЩЕНИЕ КРЪПКА < ПИСМО >ИНФОРМАЦИЯ"
 
-#: builtin/mailinfo.c:58
 msgid "keep subject"
 msgstr "запазване на темата"
 
-#: builtin/mailinfo.c:60
 msgid "keep non patch brackets in subject"
 msgstr "запазване на допълнителните квадратни скоби в темата"
 
-#: builtin/mailinfo.c:62
 msgid "copy Message-ID to the end of commit message"
 msgstr ""
 "копиране на идентификатора на съобщение „Message-ID“ в края на съобщението "
 "при подаване"
 
-#: builtin/mailinfo.c:64
 msgid "re-code metadata to i18n.commitEncoding"
 msgstr ""
 "прекодиране на метаданните към зададеното в „i18n.commitEncoding“ кодиране"
 
-#: builtin/mailinfo.c:67
 msgid "disable charset re-coding of metadata"
 msgstr "без прекодиране на метаданните"
 
-#: builtin/mailinfo.c:69
 msgid "encoding"
 msgstr "кодиране"
 
-#: builtin/mailinfo.c:70
 msgid "re-code metadata to this encoding"
 msgstr "прекодиране на метаданните към това кодиране"
 
-#: builtin/mailinfo.c:72
 msgid "use scissors"
 msgstr "ножици"
 
-#: builtin/mailinfo.c:73
 msgid "<action>"
 msgstr "ДЕЙСТВИЕ"
 
-#: builtin/mailinfo.c:74
 msgid "action when quoted CR is found"
 msgstr "ДЕЙСТВИЕ при намирането на цитиран знак за нов ред"
 
-#: builtin/mailinfo.c:77
 msgid "use headers in message's body"
 msgstr "заглавни части в тялото на писмото"
 
-#: builtin/mailsplit.c:239
+msgid "reading patches from stdin/tty..."
+msgstr "изчитане на кръпките от стандартния вход/терминал…"
+
 #, c-format
 msgid "empty mbox: '%s'"
 msgstr "празна пощенска кутия mbox: „%s“"
 
-#: builtin/merge-base.c:32
 msgid "git merge-base [-a | --all] <commit> <commit>..."
 msgstr "git merge-base [-a | --all] ПОДАВАНЕ ПОДАВАНЕ…"
 
-#: builtin/merge-base.c:33
 msgid "git merge-base [-a | --all] --octopus <commit>..."
 msgstr "git merge-base [-a | --all] --octopus ПОДАВАНЕ…"
 
-#: builtin/merge-base.c:34
 msgid "git merge-base --independent <commit>..."
 msgstr "git merge-base --independent ПОДАВАНЕ…"
 
-#: builtin/merge-base.c:35
 msgid "git merge-base --is-ancestor <commit> <commit>"
 msgstr "git merge-base --is-ancestor ПОДАВАНЕ_1 ПОДАВАНЕ_2"
 
-#: builtin/merge-base.c:36
 msgid "git merge-base --fork-point <ref> [<commit>]"
 msgstr "git merge-base --fork-point УКАЗАТЕЛ [ПОДАВАНЕ]"
 
-#: builtin/merge-base.c:143
 msgid "output all common ancestors"
 msgstr "извеждане на всички общи предшественици"
 
-#: builtin/merge-base.c:145
 msgid "find ancestors for a single n-way merge"
 msgstr ""
 "откриване на предшествениците за еднократно сливане на множество истории"
 
-#: builtin/merge-base.c:147
 msgid "list revs not reachable from others"
 msgstr "извеждане на недостижимите от другите указатели"
 
-#: builtin/merge-base.c:149
 msgid "is the first one ancestor of the other?"
 msgstr "ПОДАВАНЕ_1 предшественик ли е на ПОДАВАНЕ_2?"
 
-#: builtin/merge-base.c:151
 msgid "find where <commit> forked from reflog of <ref>"
 msgstr "откриване къде ПОДАВАНЕто се е отклонило от историята на УКАЗАТЕЛя"
 
-#: builtin/merge-file.c:9
 msgid ""
 "git merge-file [<options>] [-L <name1> [-L <orig> [-L <name2>]]] <file1> "
 "<orig-file> <file2>"
@@ -18393,259 +8258,207 @@ msgstr ""
 "git merge-file [ОПЦИЯ…] [-L ИМЕ_1 [-L ОРИГИНАЛ [-L ИМЕ_2]]] ФАЙЛ_1 ОРИГ_ФАЙЛ "
 "ФАЙЛ_2"
 
-#: builtin/merge-file.c:35
 msgid "send results to standard output"
 msgstr "извеждане на резултатите на стандартния изход"
 
-#: builtin/merge-file.c:36
 msgid "use a diff3 based merge"
 msgstr "сливане на базата на „diff3“"
 
-#: builtin/merge-file.c:37
 msgid "use a zealous diff3 based merge"
 msgstr "засилено сливане на базата на „diff3“"
 
-#: builtin/merge-file.c:39
 msgid "for conflicts, use our version"
 msgstr "при конфликти да се ползва локалната версия"
 
-#: builtin/merge-file.c:41
 msgid "for conflicts, use their version"
 msgstr "при конфликти да се ползва чуждата версия"
 
-#: builtin/merge-file.c:43
 msgid "for conflicts, use a union version"
 msgstr "при конфликти да се ползва обединена версия"
 
-#: builtin/merge-file.c:46
 msgid "for conflicts, use this marker size"
 msgstr "при конфликти да се ползва маркер с такъв БРОЙ знаци"
 
-#: builtin/merge-file.c:47
 msgid "do not warn about conflicts"
 msgstr "без предупреждения при конфликти"
 
-#: builtin/merge-file.c:49
 msgid "set labels for file1/orig-file/file2"
 msgstr "задаване на етикети за ФАЙЛ_1/ОРИГИНАЛ/ФАЙЛ_2"
 
-#: builtin/merge-recursive.c:47
 #, c-format
 msgid "unknown option %s"
 msgstr "непозната опция: „%s“"
 
-#: builtin/merge-recursive.c:53
 #, c-format
 msgid "could not parse object '%s'"
 msgstr "неуспешен анализ на обекта „%s“"
 
-#: builtin/merge-recursive.c:57
 #, c-format
 msgid "cannot handle more than %d base. Ignoring %s."
 msgid_plural "cannot handle more than %d bases. Ignoring %s."
 msgstr[0] "не се поддържа повече от %d база.  „%s“ се прескача."
 msgstr[1] "не се поддържат повече от %d бази.  „%s“ се прескача."
 
-#: builtin/merge-recursive.c:65
 msgid "not handling anything other than two heads merge."
 msgstr "поддържа се само сливане на точно две истории."
 
-#: builtin/merge-recursive.c:74 builtin/merge-recursive.c:76
 #, c-format
 msgid "could not resolve ref '%s'"
 msgstr "указателят „%s“ не може да бъде изтрит"
 
-#: builtin/merge-recursive.c:82
 #, c-format
 msgid "Merging %s with %s\n"
 msgstr "Сливане на „%s“ с „%s“\n"
 
-#: builtin/merge.c:59
 msgid "git merge [<options>] [<commit>...]"
 msgstr "git merge [ОПЦИЯ…] [ПОДАВАНЕ…]"
 
-#: builtin/merge.c:125
 msgid "switch `m' requires a value"
 msgstr "опцията „-m“ изисква стойност"
 
-#: builtin/merge.c:148
 #, c-format
 msgid "option `%s' requires a value"
 msgstr "опцията „%s“ изисква стойност"
 
-#: builtin/merge.c:201
 #, c-format
 msgid "Could not find merge strategy '%s'.\n"
 msgstr "Няма такава стратегия за сливане: „%s“.\n"
 
-#: builtin/merge.c:202
 #, c-format
 msgid "Available strategies are:"
 msgstr "Наличните стратегии са:"
 
-#: builtin/merge.c:207
 #, c-format
 msgid "Available custom strategies are:"
 msgstr "Допълнителните стратегии са:"
 
-#: builtin/merge.c:258 builtin/pull.c:134
 msgid "do not show a diffstat at the end of the merge"
 msgstr "без извеждане на статистиката след завършване на сливане"
 
-#: builtin/merge.c:261 builtin/pull.c:137
 msgid "show a diffstat at the end of the merge"
 msgstr "извеждане на статистиката след завършване на сливане"
 
-#: builtin/merge.c:262 builtin/pull.c:140
 msgid "(synonym to --stat)"
 msgstr "(псевдоним на „--stat“)"
 
-#: builtin/merge.c:264 builtin/pull.c:143
 msgid "add (at most <n>) entries from shortlog to merge commit message"
 msgstr ""
 "добавяне (на максимум такъв БРОЙ) записи от съкратения журнал в съобщението "
 "за подаване"
 
-#: builtin/merge.c:267 builtin/pull.c:149
 msgid "create a single commit instead of doing a merge"
 msgstr "създаване на едно подаване вместо извършване на сливане"
 
-#: builtin/merge.c:269 builtin/pull.c:152
 msgid "perform a commit if the merge succeeds (default)"
 msgstr "извършване на подаване при успешно сливане (стандартно действие)"
 
-#: builtin/merge.c:271 builtin/pull.c:155
 msgid "edit message before committing"
 msgstr "редактиране на съобщението преди подаване"
 
-#: builtin/merge.c:273
 msgid "allow fast-forward (default)"
 msgstr "позволяване на превъртане (стандартно действие)"
 
-#: builtin/merge.c:275 builtin/pull.c:162
 msgid "abort if fast-forward is not possible"
 msgstr "преустановяване, ако превъртането е невъзможно"
 
-#: builtin/merge.c:279 builtin/pull.c:168
 msgid "verify that the named commit has a valid GPG signature"
 msgstr "проверка, че указаното подаване е с правилен подпис на GPG"
 
-#: builtin/merge.c:280 builtin/notes.c:785 builtin/pull.c:172
-#: builtin/rebase.c:1117 builtin/revert.c:114
 msgid "strategy"
 msgstr "СТРАТЕГИЯ"
 
-#: builtin/merge.c:281 builtin/pull.c:173
 msgid "merge strategy to use"
 msgstr "СТРАТЕГИЯ за сливане, която да се ползва"
 
-#: builtin/merge.c:282 builtin/pull.c:176
 msgid "option=value"
 msgstr "ОПЦИЯ=СТОЙНОСТ"
 
-#: builtin/merge.c:283 builtin/pull.c:177
 msgid "option for selected merge strategy"
 msgstr "ОПЦИЯ за избраната стратегия за сливане"
 
-#: builtin/merge.c:285
 msgid "merge commit message (for a non-fast-forward merge)"
 msgstr "СЪОБЩЕНИЕ при подаването със сливане (при същински сливания)"
 
-#: builtin/merge.c:291
 msgid "use <name> instead of the real target"
 msgstr "използване на това ИМЕ вместо истинския клон-цел"
 
-#: builtin/merge.c:294
 msgid "abort the current in-progress merge"
 msgstr "преустановяване на текущото сливане"
 
-#: builtin/merge.c:296
 msgid "--abort but leave index and working tree alone"
 msgstr "преустановяване (--abort) без промяна на индекса и работното дърво"
 
-#: builtin/merge.c:298
 msgid "continue the current in-progress merge"
 msgstr "продължаване на текущото сливане"
 
-#: builtin/merge.c:300 builtin/pull.c:184
 msgid "allow merging unrelated histories"
 msgstr "позволяване на сливане на независими истории"
 
-#: builtin/merge.c:307
 msgid "bypass pre-merge-commit and commit-msg hooks"
 msgstr ""
 "без изпълнение на куките преди подаване и сливане и при промяна на "
 "съобщението за подаване (pre-merge-commit и commit-msg)"
 
-#: builtin/merge.c:323
 msgid "could not run stash."
 msgstr "не може да се извърши скатаване"
 
-#: builtin/merge.c:328
 msgid "stash failed"
 msgstr "неуспешно скатаване"
 
-#: builtin/merge.c:333
 #, c-format
 msgid "not a valid object: %s"
 msgstr "неправилен обект: „%s“"
 
-#: builtin/merge.c:355 builtin/merge.c:372
 msgid "read-tree failed"
 msgstr "неуспешно прочитане на обект-дърво"
 
-#: builtin/merge.c:403
 msgid "Already up to date. (nothing to squash)"
 msgstr "Вече е обновено (няма какво да се вкара)"
 
-#: builtin/merge.c:417
+msgid "Already up to date."
+msgstr "Вече е обновено."
+
 #, c-format
 msgid "Squash commit -- not updating HEAD\n"
 msgstr "Вкарано подаване — указателят „HEAD“ няма да бъде обновен\n"
 
-#: builtin/merge.c:467
 #, c-format
 msgid "No merge message -- not updating HEAD\n"
 msgstr ""
 "Липсва съобщение при подаване — указателят „HEAD“ няма да бъде обновен\n"
 
-#: builtin/merge.c:517
 #, c-format
 msgid "'%s' does not point to a commit"
 msgstr "„%s“ не сочи към подаване"
 
-#: builtin/merge.c:605
 #, c-format
 msgid "Bad branch.%s.mergeoptions string: %s"
 msgstr "Неправилен низ за настройката „branch.%s.mergeoptions“: „%s“"
 
-#: builtin/merge.c:732
+msgid "Unable to write index."
+msgstr "Индексът не може да бъде прочетен"
+
 msgid "Not handling anything other than two heads merge."
 msgstr "Поддържа се само сливане на точно две истории."
 
-#: builtin/merge.c:745
 #, c-format
 msgid "unknown strategy option: -X%s"
 msgstr "непозната опция за стратегия: -X%s"
 
-#: builtin/merge.c:764 t/helper/test-fast-rebase.c:223
 #, c-format
 msgid "unable to write %s"
 msgstr "„%s“ не може да бъде записан"
 
-#: builtin/merge.c:816
 #, c-format
 msgid "Could not read from '%s'"
 msgstr "От „%s“ не може да се чете"
 
-#: builtin/merge.c:825
 #, c-format
 msgid "Not committing merge; use 'git commit' to complete the merge.\n"
 msgstr ""
 "Сливането няма да бъде подадено.  За завършването му и подаването му "
 "използвайте командата „git commit“.\n"
 
-#: builtin/merge.c:831
 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"
@@ -18654,11 +8467,9 @@ msgstr ""
 "В съобщението при подаване добавете информация за причината за\n"
 "сливането, особено ако сливате обновен отдалечен клон в тематичен клон.\n"
 
-#: builtin/merge.c:836
 msgid "An empty message aborts the commit.\n"
 msgstr "Празно съобщение предотвратява подаването.\n"
 
-#: builtin/merge.c:839
 #, c-format
 msgid ""
 "Lines starting with '%c' will be ignored, and an empty message aborts\n"
@@ -18667,230 +8478,184 @@ msgstr ""
 "Редовете, които започват с „%c“, ще бъдат пропуснати, а празно\n"
 "съобщение преустановява подаването.\n"
 
-#: builtin/merge.c:894
 msgid "Empty commit message."
 msgstr "Празно съобщение при подаване."
 
-#: builtin/merge.c:909
 #, c-format
 msgid "Wonderful.\n"
 msgstr "Първият етап на сливането завърши.\n"
 
-#: builtin/merge.c:970
 #, c-format
 msgid "Automatic merge failed; fix conflicts and then commit the result.\n"
 msgstr ""
 "Неуспешно автоматично сливане — коригирайте конфликтите и подайте "
 "резултата.\n"
 
-#: builtin/merge.c:1009
 msgid "No current branch."
 msgstr "Няма текущ клон."
 
-#: builtin/merge.c:1011
 msgid "No remote for the current branch."
 msgstr "Текущият клон не следи никой."
 
-#: builtin/merge.c:1013
 msgid "No default upstream defined for the current branch."
 msgstr "Текущият клон не следи никой клон."
 
-#: builtin/merge.c:1018
 #, c-format
 msgid "No remote-tracking branch for %s from %s"
 msgstr "Никой клон не следи клона „%s“ от хранилището „%s“"
 
-#: builtin/merge.c:1075
 #, c-format
 msgid "Bad value '%s' in environment '%s'"
 msgstr "Неправилна стойност „%s“ в средата „%s“"
 
-#: builtin/merge.c:1177
+#, c-format
+msgid "could not close '%s'"
+msgstr "„%s“ не може да се затвори"
+
 #, c-format
 msgid "not something we can merge in %s: %s"
 msgstr "не може да се слее в „%s“: %s"
 
-#: builtin/merge.c:1211
 msgid "not something we can merge"
 msgstr "не може да се слее"
 
-#: builtin/merge.c:1324
 msgid "--abort expects no arguments"
 msgstr "опцията „--abort“ не приема аргументи"
 
-#: builtin/merge.c:1328
 msgid "There is no merge to abort (MERGE_HEAD missing)."
 msgstr ""
 "Не може да преустановите сливане, защото в момента не се извършва такова "
 "(липсва указател „MERGE_HEAD“)."
 
-#: builtin/merge.c:1346
 msgid "--quit expects no arguments"
 msgstr "опцията „--quit“ не приема аргументи"
 
-#: builtin/merge.c:1359
 msgid "--continue expects no arguments"
 msgstr "опцията „--continue“ не приема аргументи"
 
-#: builtin/merge.c:1363
 msgid "There is no merge in progress (MERGE_HEAD missing)."
 msgstr "В момента не се извършва сливане (липсва указател „MERGE_HEAD“)."
 
-#: builtin/merge.c:1379
 msgid ""
 "You have not concluded your merge (MERGE_HEAD exists).\n"
 "Please, commit your changes before you merge."
 msgstr ""
 "Не сте завършили сливане.  (Указателят „MERGE_HEAD“ съществува).\n"
-"Подайте промените си, преди да започнете ново сливане."
+"Подайте промѐните си, преди да започнете ново сливане."
 
-#: builtin/merge.c:1386
 msgid ""
 "You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists).\n"
 "Please, commit your changes before you merge."
 msgstr ""
 "Не сте завършили отбиране на подаване (указателят „CHERRY_PICK_HEAD“\n"
-"съществува).  Подайте промените си, преди да започнете ново сливане."
+"съществува).  Подайте промѐните си, преди да започнете ново сливане."
 
-#: builtin/merge.c:1389
 msgid "You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists)."
 msgstr ""
 "Не сте завършили отбиране на подаване (указателят „CHERRY_PICK_HEAD“\n"
 "съществува)."
 
-#: builtin/merge.c:1421
 msgid "No commit specified and merge.defaultToUpstream not set."
 msgstr ""
 "Не е указано подаване и настройката „merge.defaultToUpstream“ не е зададена."
 
-#: builtin/merge.c:1438
 msgid "Squash commit into empty head not supported yet"
 msgstr "Вкарване на подаване във връх без история все още не се поддържа"
 
-#: builtin/merge.c:1440
 msgid "Non-fast-forward commit does not make sense into an empty head"
 msgstr ""
 "Понеже върхът е без история, сливания, които не са превъртания, са невъзможни"
 
-#: builtin/merge.c:1445
 #, c-format
 msgid "%s - not something we can merge"
 msgstr "„%s“ — не е нещо, което може да се слее"
 
-#: builtin/merge.c:1447
 msgid "Can merge only exactly one commit into empty head"
 msgstr "Може да слеете точно едно подаване във връх без история"
 
-#: builtin/merge.c:1534
 msgid "refusing to merge unrelated histories"
 msgstr "независими истории не може да се слеят"
 
-#: builtin/merge.c:1553
 #, c-format
 msgid "Updating %s..%s\n"
 msgstr "Обновяване „%s..%s“\n"
 
-#: builtin/merge.c:1601
 #, c-format
 msgid "Trying really trivial in-index merge...\n"
 msgstr "Проба със сливане в рамките на индекса…\n"
 
-#: builtin/merge.c:1608
 #, c-format
 msgid "Nope.\n"
 msgstr "Неуспешно сливане.\n"
 
-#: builtin/merge.c:1667 builtin/merge.c:1733
 #, c-format
 msgid "Rewinding the tree to pristine...\n"
 msgstr "Привеждане на дървото към първоначалното…\n"
 
-#: builtin/merge.c:1671
 #, c-format
 msgid "Trying merge strategy %s...\n"
 msgstr "Пробване със стратегията за сливане „%s“…\n"
 
-#: builtin/merge.c:1723
 #, c-format
 msgid "No merge strategy handled the merge.\n"
 msgstr "Никоя стратегия за сливане не може да извърши сливането.\n"
 
-#: builtin/merge.c:1725
 #, c-format
 msgid "Merge with strategy %s failed.\n"
 msgstr "Неуспешно сливане със стратегия „%s“.\n"
 
-#: builtin/merge.c:1735
 #, c-format
 msgid "Using the %s strategy to prepare resolving by hand.\n"
 msgstr ""
 "Ползва се стратегията „%s“, която ще подготви дървото за коригиране на "
 "ръка.\n"
 
-#: builtin/merge.c:1749
 #, c-format
 msgid "Automatic merge went well; stopped before committing as requested\n"
 msgstr ""
 "Автоматичното сливане завърши успешно.  Самото подаване не е извършено\n"
 
-#: builtin/mktag.c:10
-msgid "git mktag"
-msgstr "git mktag"
-
-#: builtin/mktag.c:27
 #, c-format
 msgid "warning: tag input does not pass fsck: %s"
 msgstr "ПРЕДУПРЕЖДЕНИЕ: аргументът-етикет не минава проверка с „fsck“: %s"
 
-#: builtin/mktag.c:38
 #, c-format
 msgid "error: tag input does not pass fsck: %s"
 msgstr "ГРЕШКА: аргументът-етикет не минава проверка с „fsck“: %s"
 
-#: builtin/mktag.c:41
 #, c-format
 msgid "%d (FSCK_IGNORE?) should never trigger this callback"
 msgstr "%d (FSCK_IGNORE?) никога не трябва да задейства тази функция"
 
-#: builtin/mktag.c:56
 #, c-format
 msgid "could not read tagged object '%s'"
 msgstr "обектът с етикет не може да бъде прочетен: %s"
 
-#: builtin/mktag.c:59
 #, c-format
 msgid "object '%s' tagged as '%s', but is a '%s' type"
 msgstr "обектът „%s“ е с етикет за %s, но е %s"
 
-#: builtin/mktag.c:98
+msgid "could not read from stdin"
+msgstr "от стандартния вход не може да се чете"
+
 msgid "tag on stdin did not pass our strict fsck check"
 msgstr "етикетът на стандартния вход не преминава строгата проверка с „fsck“"
 
-#: builtin/mktag.c:101
 msgid "tag on stdin did not refer to a valid object"
 msgstr "етикетът на стандартния вход не сочи към правилен обект"
 
-#: builtin/mktag.c:104 builtin/tag.c:242
 msgid "unable to write tag file"
 msgstr "файлът за етикета не може да бъде запазен"
 
-#: builtin/mktree.c:66
-msgid "git mktree [-z] [--missing] [--batch]"
-msgstr "git mktree [-z] [--missing] [--batch]"
-
-#: builtin/mktree.c:154
 msgid "input is NUL terminated"
 msgstr "входните записи са разделени с нулевия знак „NUL“"
 
-#: builtin/mktree.c:155 builtin/write-tree.c:26
 msgid "allow missing objects"
 msgstr "разрешаване на липсващи обекти"
 
-#: builtin/mktree.c:156
 msgid "allow creation of more than one tree"
 msgstr "разрешаване на създаването на повече от едно дърво"
 
-#: builtin/multi-pack-index.c:10
 msgid ""
 "git multi-pack-index [<options>] write [--preferred-pack=<pack>][--refs-"
 "snapshot=<path>]"
@@ -18898,48 +8663,41 @@ msgstr ""
 "git multi-pack-index [ОПЦИЯ…] write [--preferred-pack=ПАКЕТ] [--refs-"
 "snapshot=ПЪТ]"
 
-#: builtin/multi-pack-index.c:14
 msgid "git multi-pack-index [<options>] verify"
 msgstr "git multi-pack-index [ОПЦИЯ…] verify"
 
-#: builtin/multi-pack-index.c:17
 msgid "git multi-pack-index [<options>] expire"
 msgstr "git multi-pack-index [ОПЦИЯ…] expire"
 
-#: 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:57
+msgid "directory"
+msgstr "директория"
+
 msgid "object directory containing set of packfile and pack-index pairs"
 msgstr ""
 "ДИРекторията_с_ОБЕКТи съдържа множество двойки пакетни файлове със "
 "съответния им индекс"
 
-#: builtin/multi-pack-index.c:98
 msgid "preferred-pack"
 msgstr "предпочитан_пакет"
 
-#: builtin/multi-pack-index.c:99
 msgid "pack for reuse when computing a multi-pack bitmap"
 msgstr ""
 "пакет, който да се преизползва при изчисляване на многопакетна битовата маска"
 
-#: 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:206
 msgid ""
 "during repack, collect pack-files of smaller size into a batch that is "
 "larger than this size"
@@ -18947,155 +8705,123 @@ msgstr ""
 "при препакетиране пакетните файлове, които са с по-малък от този размер, да "
 "се обединяват в пакети с по-голям от този размер"
 
-#: builtin/mv.c:18
 msgid "git mv [<options>] <source>... <destination>"
 msgstr "git mv [ОПЦИЯ…] ОБЕКТ… ЦЕЛ"
 
-#: builtin/mv.c:83
 #, c-format
 msgid "Directory %s is in index and no submodule?"
 msgstr "Директорията „%s“ е в индекса, но не е подмодул"
 
-#: builtin/mv.c:85
 msgid "Please stage your changes to .gitmodules or stash them to proceed"
 msgstr ""
-"За да продължите, или вкарайте промените по файла „.gitmodules“ в индекса,\n"
+"За да продължите, или вкарайте промѐните по файла „.gitmodules“ в индекса,\n"
 "или ги скатайте"
 
-#: builtin/mv.c:103
 #, c-format
 msgid "%.*s is in index"
 msgstr "„%.*s“ вече е в индекса"
 
-#: builtin/mv.c:125
 msgid "force move/rename even if target exists"
 msgstr "принудително преместване/преименуване дори целта да съществува"
 
-#: builtin/mv.c:127
 msgid "skip move/rename errors"
 msgstr "прескачане на грешките при преместване/преименуване"
 
-#: builtin/mv.c:172
 #, c-format
 msgid "destination '%s' is not a directory"
 msgstr "целта „%s“ съществува и не е директория"
 
-#: builtin/mv.c:184
 #, c-format
 msgid "Checking rename of '%s' to '%s'\n"
 msgstr "Проверка на преименуването на обект от „%s“ на „%s“\n"
 
-#: builtin/mv.c:190
 msgid "bad source"
 msgstr "неправилен обект"
 
-#: builtin/mv.c:193
 msgid "can not move directory into itself"
 msgstr "директория не може да се премести в себе си"
 
-#: builtin/mv.c:196
 msgid "cannot move directory over file"
 msgstr "директория не може да се премести върху файл"
 
-#: builtin/mv.c:205
 msgid "source directory is empty"
 msgstr "първоначалната директория е празна"
 
-#: builtin/mv.c:231
 msgid "not under version control"
 msgstr "не е под контрола на Git"
 
-#: builtin/mv.c:233
 msgid "conflicted"
 msgstr "конфликт"
 
-#: builtin/mv.c:236
 msgid "destination exists"
 msgstr "целта съществува"
 
-#: builtin/mv.c:244
 #, c-format
 msgid "overwriting '%s'"
 msgstr "презаписване на „%s“"
 
-#: builtin/mv.c:247
 msgid "Cannot overwrite"
 msgstr "Презаписването е невъзможно"
 
-#: builtin/mv.c:250
 msgid "multiple sources for the same target"
 msgstr "множество източници за една цел"
 
-#: builtin/mv.c:252
 msgid "destination directory does not exist"
 msgstr "целевата директория не съществува"
 
-#: builtin/mv.c:280
 #, c-format
 msgid "%s, source=%s, destination=%s"
 msgstr "%s, обект: „%s“, цел: „%s“"
 
-#: builtin/mv.c:308
 #, c-format
 msgid "Renaming %s to %s\n"
 msgstr "Преименуване на „%s“ на „%s“\n"
 
-#: builtin/mv.c:314 builtin/remote.c:790 builtin/repack.c:857
 #, c-format
 msgid "renaming '%s' failed"
 msgstr "неуспешно преименуване на „%s“"
 
-#: builtin/name-rev.c:474
 msgid "git name-rev [<options>] <commit>..."
 msgstr "git name-rev [ОПЦИЯ…] ПОДАВАНЕ…"
 
-#: builtin/name-rev.c:475
 msgid "git name-rev [<options>] --all"
 msgstr "git name-rev [ОПЦИЯ…] --all"
 
-#: builtin/name-rev.c:476
-msgid "git name-rev [<options>] --stdin"
-msgstr "git name-rev [ОПЦИЯ…] --stdin"
+msgid "git name-rev [<options>] --annotate-stdin"
+msgstr "git name-rev [ОПЦИЯ…] --annotate-stdin"
 
-#: builtin/name-rev.c:533
 msgid "print only ref-based names (no object names)"
 msgstr "извеждане само на имена на базата на указатели (а не имена на обекти)"
 
-#: builtin/name-rev.c:534
 msgid "only use tags to name the commits"
 msgstr "използване само на етикетите за именуване на подаванията"
 
-#: builtin/name-rev.c:536
 msgid "only use refs matching <pattern>"
 msgstr "използване само на указателите напасващи на ШАБЛОНа"
 
-#: builtin/name-rev.c:538
 msgid "ignore refs matching <pattern>"
 msgstr "игнориране на указателите напасващи на ШАБЛОНа"
 
-#: builtin/name-rev.c:540
 msgid "list all commits reachable from all refs"
 msgstr ""
 "извеждане на всички подавания, които може да бъдат достигнати от всички "
 "указатели"
 
-#: builtin/name-rev.c:541
-msgid "read from stdin"
-msgstr "четене от стандартния вход"
+msgid "deprecated: use --annotate-stdin instead"
+msgstr "ОСТАРЯЛО: вместо това ползвайте „--annotate-stdin“"
+
+msgid "annotate text from stdin"
+msgstr "анотиране на текста от стандартния вход"
 
-#: builtin/name-rev.c:542
 msgid "allow to print `undefined` names (default)"
 msgstr "да се извеждат и недефинираните имена (стандартна стойност на опцията)"
 
-#: builtin/name-rev.c:548
 msgid "dereference tags in the input (internal use)"
 msgstr "извеждане на идентификаторите на обекти-етикети (за вътрешни нужди)"
 
-#: builtin/notes.c:28
 msgid "git notes [--ref <notes-ref>] [list [<object>]]"
 msgstr "git notes [--ref УКАЗАТЕЛ_ЗА_БЕЛЕЖКА] [list [ОБЕКТ]]"
 
-#: builtin/notes.c:29
 msgid ""
 "git notes [--ref <notes-ref>] add [-f] [--allow-empty] [-m <msg> | -F <file> "
 "| (-c | -C) <object>] [<object>]"
@@ -19103,12 +8829,10 @@ msgstr ""
 "git notes [--ref УКАЗАТЕЛ_ЗА_БЕЛЕЖКА] add [-f] [--allow-empty] [-m СЪОБЩЕНИЕ "
 "| -F ФАЙЛ | (-c | -C) ОБЕКТ] [ОБЕКТ]"
 
-#: builtin/notes.c:30
 msgid "git notes [--ref <notes-ref>] copy [-f] <from-object> <to-object>"
 msgstr ""
 "git notes [--ref УКАЗАТЕЛ_ЗА_БЕЛЕЖКА] copy [-f] ОБЕКТ_ИЗТОЧНИК ОБЕКТ_ЦЕЛ"
 
-#: builtin/notes.c:31
 msgid ""
 "git notes [--ref <notes-ref>] append [--allow-empty] [-m <msg> | -F <file> | "
 "(-c | -C) <object>] [<object>]"
@@ -19116,153 +8840,108 @@ msgstr ""
 "git notes [--ref УКАЗАТЕЛ_ЗА_БЕЛЕЖКА] append [--allow-empty] [-m СЪОБЩЕНИЕ | "
 "-F ФАЙЛ | (-c | -C) ОБЕКТ] [ОБЕКТ]"
 
-#: builtin/notes.c:32
 msgid "git notes [--ref <notes-ref>] edit [--allow-empty] [<object>]"
 msgstr "git notes [--ref УКАЗАТЕЛ_ЗА_БЕЛЕЖКА] edit [--allow-empty] [ОБЕКТ]"
 
-#: builtin/notes.c:33
 msgid "git notes [--ref <notes-ref>] show [<object>]"
 msgstr "git notes [--ref УКАЗАТЕЛ_ЗА_БЕЛЕЖКА] show [ОБЕКТ]"
 
-#: builtin/notes.c:34
 msgid ""
 "git notes [--ref <notes-ref>] merge [-v | -q] [-s <strategy>] <notes-ref>"
 msgstr ""
 "git notes [--ref УКАЗАТЕЛ_ЗА_БЕЛЕЖКА] merge [-v | -q] [-s СТРАТЕГИЯ] "
 "УКАЗАТЕЛ_ЗА_БЕЛЕЖКА"
 
-#: builtin/notes.c:35
-msgid "git notes merge --commit [-v | -q]"
-msgstr "git notes merge --commit [-v | -q]"
-
-#: builtin/notes.c:36
-msgid "git notes merge --abort [-v | -q]"
-msgstr "git notes merge --abort [-v | -q]"
-
-#: builtin/notes.c:37
 msgid "git notes [--ref <notes-ref>] remove [<object>...]"
 msgstr "git notes [--ref УКАЗАТЕЛ_ЗА_БЕЛЕЖКА] remove [ОБЕКТ…]"
 
-#: builtin/notes.c:38
 msgid "git notes [--ref <notes-ref>] prune [-n] [-v]"
 msgstr "git notes [--ref УКАЗАТЕЛ_ЗА_БЕЛЕЖКА] prune [-n] [-v]"
 
-#: builtin/notes.c:39
 msgid "git notes [--ref <notes-ref>] get-ref"
 msgstr "git notes [--ref УКАЗАТЕЛ_ЗА_БЕЛЕЖКА] get-ref"
 
-#: builtin/notes.c:44
 msgid "git notes [list [<object>]]"
 msgstr "git notes [list [ОБЕКТ]]"
 
-#: builtin/notes.c:49
 msgid "git notes add [<options>] [<object>]"
 msgstr "git notes add [ОПЦИЯ…] [ОБЕКТ]"
 
-#: builtin/notes.c:54
 msgid "git notes copy [<options>] <from-object> <to-object>"
 msgstr "git notes copy [ОПЦИЯ…] ОБЕКТ_ИЗТОЧНИК ОБЕКТ_ЦЕЛ"
 
-#: builtin/notes.c:55
 msgid "git notes copy --stdin [<from-object> <to-object>]..."
 msgstr "git notes copy --stdin [ОБЕКТ_ИЗТОЧНИК ОБЕКТ_ЦЕЛ…]"
 
-#: builtin/notes.c:60
 msgid "git notes append [<options>] [<object>]"
 msgstr "git notes append [ОПЦИЯ…] [ОБЕКТ]"
 
-#: builtin/notes.c:65
 msgid "git notes edit [<object>]"
 msgstr "git notes edit [ОБЕКТ]"
 
-#: builtin/notes.c:70
 msgid "git notes show [<object>]"
 msgstr "git notes show [ОБЕКТ]"
 
-#: builtin/notes.c:75
 msgid "git notes merge [<options>] <notes-ref>"
 msgstr "git notes merge [ОПЦИЯ…] УКАЗАТЕЛ_ЗА_БЕЛЕЖКА"
 
-#: builtin/notes.c:76
 msgid "git notes merge --commit [<options>]"
 msgstr "git notes merge --commit [ОПЦИЯ…]"
 
-#: builtin/notes.c:77
 msgid "git notes merge --abort [<options>]"
 msgstr "git notes merge --abort [ОПЦИЯ…]"
 
-#: builtin/notes.c:82
 msgid "git notes remove [<object>]"
 msgstr "git notes remove [ОБЕКТ]"
 
-#: builtin/notes.c:87
 msgid "git notes prune [<options>]"
 msgstr "git notes prune [ОПЦИЯ…]"
 
-#: builtin/notes.c:92
-msgid "git notes get-ref"
-msgstr "git notes get-ref"
-
-#: builtin/notes.c:97
 msgid "Write/edit the notes for the following object:"
 msgstr "Записване/редактиране на бележките за следния обект:"
 
-#: builtin/notes.c:149
 #, c-format
 msgid "unable to start 'show' for object '%s'"
 msgstr "действието „show“ не може да се изпълни за обект „%s“"
 
-#: builtin/notes.c:153
 msgid "could not read 'show' output"
 msgstr "изведената информация от действието „show“ не може да се прочете"
 
-#: builtin/notes.c:161
 #, c-format
 msgid "failed to finish 'show' for object '%s'"
 msgstr "действието „show“ не може да се завърши за обект „%s“"
 
-#: builtin/notes.c:194
 msgid "please supply the note contents using either -m or -F option"
 msgstr "задайте съдържанието на бележката с някоя от опциите „-m“ или „-F“"
 
-#: builtin/notes.c:203
 msgid "unable to write note object"
 msgstr "обектът-бележка не може да бъде записан"
 
-#: builtin/notes.c:206
 #, c-format
 msgid "the note contents have been left in %s"
 msgstr "съдържанието на бележката е във файла „%s“"
 
-#: builtin/notes.c:240 builtin/tag.c:581
 #, c-format
 msgid "could not open or read '%s'"
 msgstr "файлът „%s“ не може да бъде отворен или прочетен"
 
-#: 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:263
 #, c-format
 msgid "failed to read object '%s'."
 msgstr "обектът „%s“ не може да бъде прочетен."
 
-#: builtin/notes.c:266
 #, c-format
 msgid "cannot read note data from non-blob object '%s'."
 msgstr ""
 "съдържанието на бележка не може да се вземе от обект, който не е BLOB: „%s“."
 
-#: builtin/notes.c:307
 #, c-format
 msgid "malformed input line: '%s'."
 msgstr "входен ред с неправилен формат: „%s“."
 
-#: builtin/notes.c:322
 #, c-format
 msgid "failed to copy notes from '%s' to '%s'"
 msgstr "бележката не може да се копира от „%s“ към „%s“"
@@ -19270,50 +8949,34 @@ msgstr "бележката не може да се копира от „%s“ к
 #. TRANSLATORS: the first %s will be replaced by a git
 #. notes command: 'add', 'merge', 'remove', etc.
 #.
-#: 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: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:965 builtin/notes.c:987
-#: builtin/prune-packed.c:25 builtin/receive-pack.c:2487 builtin/tag.c:591
-msgid "too many arguments"
-msgstr "прекалено много аргументи"
-
-#: builtin/notes.c:387 builtin/notes.c:676
 #, c-format
 msgid "no note found for object %s."
 msgstr "няма бележки за обекта „%s“."
 
-#: builtin/notes.c:408 builtin/notes.c:574
 msgid "note contents as a string"
 msgstr "низ, който е съдържанието на бележката"
 
-#: builtin/notes.c:411 builtin/notes.c:577
 msgid "note contents in a file"
 msgstr "ФАЙЛ със съдържанието на бележката"
 
-#: builtin/notes.c:414 builtin/notes.c:580
 msgid "reuse and edit specified note object"
 msgstr "преизползване и редактиране на указания ОБЕКТ-бележка"
 
-#: builtin/notes.c:417 builtin/notes.c:583
 msgid "reuse specified note object"
 msgstr "преизползване на указания ОБЕКТ-бележка"
 
-#: builtin/notes.c:420 builtin/notes.c:586
 msgid "allow storing empty note"
 msgstr "приемане и на празни бележки"
 
-#: builtin/notes.c:421 builtin/notes.c:494
 msgid "replace existing notes"
 msgstr "замяна на съществуващите бележки"
 
-#: builtin/notes.c:446
 #, c-format
 msgid ""
 "Cannot add notes. Found existing notes for object %s. Use '-f' to overwrite "
@@ -19322,31 +8985,25 @@ msgstr ""
 "Не може да се добави бележка, защото такава вече съществува за обекта „%s“.  "
 "Използвайте опцията „-f“, за да презапишете съществуващи бележки."
 
-#: builtin/notes.c:461 builtin/notes.c:542
 #, c-format
 msgid "Overwriting existing notes for object %s\n"
 msgstr "Презаписване на съществуващите бележки за обекта „%s“\n"
 
-#: builtin/notes.c:473 builtin/notes.c:635 builtin/notes.c:904
 #, c-format
 msgid "Removing note for object %s\n"
 msgstr "Изтриване на бележката за обекта „%s“\n"
 
-#: builtin/notes.c:495
 msgid "read objects from stdin"
 msgstr "изчитане на обектите от стандартния вход"
 
-#: builtin/notes.c:497
 msgid "load rewriting config for <command> (implies --stdin)"
 msgstr ""
 "зареждане на настройките за КОМАНДАта, която презаписва подавания (включва "
 "опцията „--stdin“)"
 
-#: builtin/notes.c:515
 msgid "too few arguments"
 msgstr "прекалено малко аргументи"
 
-#: builtin/notes.c:536
 #, c-format
 msgid ""
 "Cannot copy notes. Found existing notes for object %s. Use '-f' to overwrite "
@@ -19355,12 +9012,10 @@ msgstr ""
 "Не може да се копира бележка, защото такава вече съществува за обекта „%s“.  "
 "Използвайте опцията „-f“, за да презапишете съществуващи бележки."
 
-#: builtin/notes.c:548
 #, c-format
 msgid "missing notes on source object %s. Cannot copy."
 msgstr "няма бележки за обекта-източник „%s“.  Не може да се копира."
 
-#: builtin/notes.c:601
 #, c-format
 msgid ""
 "The -m/-F/-c/-C options have been deprecated for the 'edit' subcommand.\n"
@@ -19371,52 +9026,40 @@ msgstr ""
 "Вместо това ги използвайте с подкомандата „add“: „git notes add -f -m/-F/-c/-"
 "C“.\n"
 
-#: builtin/notes.c:696
 msgid "failed to delete ref NOTES_MERGE_PARTIAL"
 msgstr "указателят „NOTES_MERGE_PARTIAL“ не може да бъде изтрит"
 
-#: builtin/notes.c:698
 msgid "failed to delete ref NOTES_MERGE_REF"
 msgstr "указателят „NOTES_MERGE_REF“ не може да бъде изтрит"
 
-#: builtin/notes.c:700
 msgid "failed to remove 'git notes merge' worktree"
 msgstr "работната директория на „git notes merge“ не може да бъде изтрита"
 
-#: builtin/notes.c:720
 msgid "failed to read ref NOTES_MERGE_PARTIAL"
 msgstr "указателят „NOTES_MERGE_PARTIAL“ не може да бъде прочетен"
 
-#: builtin/notes.c:722
 msgid "could not find commit from NOTES_MERGE_PARTIAL."
 msgstr "подаването от „NOTES_MERGE_PARTIAL“ не може да се открие."
 
-#: builtin/notes.c:724
 msgid "could not parse commit from NOTES_MERGE_PARTIAL."
 msgstr "подаването от „NOTES_MERGE_PARTIAL“ не може да се анализира."
 
-#: builtin/notes.c:737
 msgid "failed to resolve NOTES_MERGE_REF"
 msgstr "не може да се открие към какво сочи „NOTES_MERGE_REF“"
 
-#: builtin/notes.c:740
 msgid "failed to finalize notes merge"
 msgstr "неуспешно сливане на бележките"
 
-#: builtin/notes.c:766
 #, c-format
 msgid "unknown notes merge strategy %s"
 msgstr "непозната стратегия за сливане на бележки „%s“"
 
-#: builtin/notes.c:782
 msgid "General options"
 msgstr "Общи опции"
 
-#: builtin/notes.c:784
 msgid "Merge options"
 msgstr "Опции при сливане"
 
-#: builtin/notes.c:786
 msgid ""
 "resolve notes conflicts using the given strategy (manual/ours/theirs/union/"
 "cat_sort_uniq)"
@@ -19426,46 +9069,36 @@ msgstr ""
 "„union“ (обединяване), „cat_sort_uniq“ (обединяване, подреждане, уникални "
 "резултати)"
 
-#: builtin/notes.c:788
 msgid "Committing unmerged notes"
 msgstr "Подаване на неслети бележки"
 
-#: builtin/notes.c:790
 msgid "finalize notes merge by committing unmerged notes"
 msgstr "завършване на сливането чрез подаване на неслети бележки"
 
-#: builtin/notes.c:792
 msgid "Aborting notes merge resolution"
 msgstr "Преустановяване на корекцията при сливането на бележки"
 
-#: builtin/notes.c:794
 msgid "abort notes merge"
 msgstr "преустановяване на сливането на бележки"
 
-#: builtin/notes.c:805
 msgid "cannot mix --commit, --abort or -s/--strategy"
 msgstr "опциите „--commit“, „--abort“ и „-s“/„--strategy“ са несъвместими"
 
-#: builtin/notes.c:810
 msgid "must specify a notes ref to merge"
 msgstr "трябва да укажете указател към бележка за сливане."
 
-#: builtin/notes.c:834
 #, c-format
 msgid "unknown -s/--strategy: %s"
 msgstr "неизвестна стратегия към опцията „-s“/„--strategy“: „%s“"
 
-#: builtin/notes.c:874
 #, c-format
 msgid "a notes merge into %s is already in-progress at %s"
 msgstr "в момента се извършва сливане на бележките в „%s“ при „%s“"
 
-#: builtin/notes.c:878
 #, c-format
 msgid "failed to store link to current notes ref (%s)"
 msgstr "не може да се запази връзка към указателя на текущата бележка („%s“)."
 
-#: builtin/notes.c:880
 #, c-format
 msgid ""
 "Automatic notes merge failed. Fix conflicts in %s and commit the result with "
@@ -19476,59 +9109,47 @@ msgstr ""
 "резултата с „git notes merge --commit“ или преустановете сливането с "
 "командата „git notes merge --abort“.\n"
 
-#: builtin/notes.c:899 builtin/tag.c:594
 #, c-format
 msgid "Failed to resolve '%s' as a valid ref."
 msgstr "Не може да се открие към какво сочи „%s“."
 
-#: builtin/notes.c:902
 #, c-format
 msgid "Object %s has no note\n"
 msgstr "Няма бележки за обекта „%s“\n"
 
-#: builtin/notes.c:914
 msgid "attempt to remove non-existent note is not an error"
 msgstr "опитът за изтриването на несъществуваща бележка не се счита за грешка"
 
-#: builtin/notes.c:917
 msgid "read object names from the standard input"
 msgstr "изчитане на имената на обектите от стандартния вход"
 
-#: builtin/notes.c:956 builtin/prune.c:144 builtin/worktree.c:147
 msgid "do not remove, show only"
 msgstr "само извеждане без действително окастряне"
 
-#: builtin/notes.c:957
 msgid "report pruned notes"
 msgstr "докладване на окастрените обекти"
 
-#: builtin/notes.c:1000
 msgid "notes-ref"
 msgstr "УКАЗАТЕЛ_ЗА_БЕЛЕЖКА"
 
-#: builtin/notes.c:1001
 msgid "use notes from <notes-ref>"
 msgstr "да се използва бележката сочена от този УКАЗАТЕЛ_ЗА_БЕЛЕЖКА"
 
-#: builtin/notes.c:1036 builtin/stash.c:1818
 #, c-format
 msgid "unknown subcommand: %s"
 msgstr "непозната подкоманда: %s"
 
-#: builtin/pack-objects.c:182
 msgid ""
 "git pack-objects --stdout [<options>...] [< <ref-list> | < <object-list>]"
 msgstr ""
 "git pack-objects --stdout [ОПЦИЯ…] [< СПИСЪК_С_УКАЗАТЕЛИ | < СПИСЪК_С_ОБЕКТИ]"
 
-#: builtin/pack-objects.c:183
 msgid ""
 "git pack-objects [<options>...] <base-name> [< <ref-list> | < <object-list>]"
 msgstr ""
 "git pack-objects [ОПЦИЯ…] ПРЕФИКС_НА_ИМЕТО [< СПИСЪК_С_УКАЗАТЕЛИ | < "
 "СПИСЪК_С_ОБЕКТИ]"
 
-#: builtin/pack-objects.c:572
 #, c-format
 msgid ""
 "write_reuse_object: could not locate %s, expected at offset %<PRIuMAX> in "
@@ -19537,116 +9158,104 @@ msgstr ""
 "write_reuse_object: „%s“ не може да се открие, а се очакваше при отместване "
 "%<PRIuMAX> в пакетния файл „%s“"
 
-#: builtin/pack-objects.c:580
 #, c-format
 msgid "bad packed object CRC for %s"
 msgstr "лоша контролна сума за пакетирания обект „%s“"
 
-#: builtin/pack-objects.c:591
 #, c-format
 msgid "corrupt packed object for %s"
 msgstr "пакетиран обект с грешки за „%s“"
 
-#: builtin/pack-objects.c:722
 #, c-format
 msgid "recursive delta detected for object %s"
 msgstr "рекурсивна разлика за обект „%s“"
 
-#: builtin/pack-objects.c:941
 #, c-format
 msgid "ordered %u objects, expected %<PRIu32>"
 msgstr "подредени бяха %u обекта, а се очакваха %<PRIu32>"
 
-#: builtin/pack-objects.c:1036
 #, c-format
 msgid "expected object at offset %<PRIuMAX> in pack %s"
 msgstr "очаква се обект при отместване %<PRIuMAX> в пакетния файл „%s“"
 
-#: builtin/pack-objects.c:1160
 msgid "disabling bitmap writing, packs are split due to pack.packSizeLimit"
 msgstr ""
 "изключване на записването на битовата маска, пакетите са разделени поради "
 "стойността на „pack.packSizeLimit“"
 
-#: builtin/pack-objects.c:1173
 msgid "Writing objects"
 msgstr "Записване на обектите"
 
-#: builtin/pack-objects.c:1235 builtin/update-index.c:90
 #, c-format
 msgid "failed to stat %s"
 msgstr "не може да бъде получена информация чрез „stat“ за „%s“"
 
-#: builtin/pack-objects.c:1268
+#, c-format
+msgid "failed utime() on %s"
+msgstr "неуспешно задаване на време на достъп/създаване чрез „utime“ на „%s“"
+
 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:1536
 msgid "disabling bitmap writing, as some objects are not being packed"
 msgstr ""
 "изключване на записването на битовата маска, защото някои обекти няма да се "
 "пакетират"
 
-#: builtin/pack-objects.c:1984
 #, c-format
 msgid "delta base offset overflow in pack for %s"
 msgstr "прекалено далечно начало на отместването за обектите-разлика за „%s“"
 
-#: builtin/pack-objects.c:1993
 #, c-format
 msgid "delta base offset out of bound for %s"
 msgstr "недостижимо начало на отместването за обектите-разлика за „%s“"
 
-#: builtin/pack-objects.c:2274
 msgid "Counting objects"
 msgstr "Преброяване на обектите"
 
-#: builtin/pack-objects.c:2439
+#, c-format
+msgid "unable to get size of %s"
+msgstr "размерът на „%s“ не може да бъде получен"
+
 #, c-format
 msgid "unable to parse object header of %s"
 msgstr "заглавната част на „%s“ не може да бъде анализирана"
 
-#: 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: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:2549
 msgid "suboptimal pack - out of memory"
 msgstr "неоптимизиран пакет — паметта свърши"
 
-#: builtin/pack-objects.c:2864
 #, c-format
 msgid "Delta compression using up to %d threads"
 msgstr "Делта компресията ще използва до %d нишки"
 
-#: builtin/pack-objects.c:3003
 #, c-format
 msgid "unable to pack objects reachable from tag %s"
 msgstr ""
 "обектите, които може да бъдат достигнати от етикета „%s“, не може да бъдат "
 "пакетирани"
 
-#: builtin/pack-objects.c:3089
+#, c-format
+msgid "unable to get type of object %s"
+msgstr "видът на обекта „%s“ не може да бъде определен"
+
 msgid "Compressing objects"
 msgstr "Компресиране на обектите"
 
-#: builtin/pack-objects.c:3095
 msgid "inconsistency with delta count"
 msgstr "неправилен брой разлики"
 
-#: builtin/pack-objects.c:3174
 #, c-format
 msgid ""
 "value of uploadpack.blobpackfileuri must be of the form '<object-hash> <pack-"
@@ -19655,7 +9264,6 @@ msgstr ""
 "стойността на „uploadpack.blobpackfileuri“ трябва да е във формат "
 "„СУМА_НА_ОБЕКТ СУМА_НА_ПАКЕТ АДРЕС“ (получена е „%s“)"
 
-#: builtin/pack-objects.c:3177
 #, c-format
 msgid ""
 "object already configured in another uploadpack.blobpackfileuri (got '%s')"
@@ -19663,18 +9271,27 @@ msgstr ""
 "вече има настройка за обекта в друг ред „uploadpack."
 "blobpackfileuri“ (получена е „%s“)"
 
-#: 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: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:3408
+#, c-format
+msgid "packfile %s cannot be accessed"
+msgstr "пакетният файл „%s“ не може да бъде достъпен"
+
+msgid "Enumerating cruft objects"
+msgstr "Изброяване на излишните обекти"
+
+msgid "unable to add cruft objects"
+msgstr "неуспешно добавяне на излишни обекти"
+
+msgid "Traversing cruft objects"
+msgstr "Обхождане на излишните обекти"
+
 #, c-format
 msgid ""
 "expected edge object ID, got garbage:\n"
@@ -19683,7 +9300,6 @@ msgstr ""
 "очаква се идентификатор на краен обект, а не:\n"
 " %s"
 
-#: builtin/pack-objects.c:3414
 #, c-format
 msgid ""
 "expected object ID, got garbage:\n"
@@ -19692,260 +9308,223 @@ msgstr ""
 "очаква се идентификатор на обект, а не:\n"
 " %s"
 
-#: builtin/pack-objects.c:3507
-msgid "invalid value for --missing"
-msgstr "неправилна стойност за „--missing“"
+msgid "could not load cruft pack .mtimes"
+msgstr ""
+"времената на промяна (.mtimes) на пакета с излишни файлове не може да се "
+"заредят"
 
-#: builtin/pack-objects.c:3532 builtin/pack-objects.c:3619
 msgid "cannot open pack index"
 msgstr "индексът на пакетния файл не може да бъде отворен"
 
-#: builtin/pack-objects.c:3541
 #, c-format
 msgid "loose object at %s could not be examined"
 msgstr "непакетираният обект в „%s“ не може да бъде анализиран"
 
-#: builtin/pack-objects.c:3627
 msgid "unable to force loose object"
 msgstr "оставането на обекта непакетиран не може да бъде наложено"
 
-#: builtin/pack-objects.c:3757
 #, c-format
 msgid "not a rev '%s'"
 msgstr "„%s“ не е версия"
 
-#: builtin/pack-objects.c:3760 builtin/rev-parse.c:1061
 #, c-format
 msgid "bad revision '%s'"
 msgstr "неправилна версия „%s“"
 
-#: builtin/pack-objects.c:3788
 msgid "unable to add recent objects"
 msgstr "скорошните обекти не може да бъдат добавени"
 
-#: builtin/pack-objects.c:3841
 #, c-format
 msgid "unsupported index version %s"
 msgstr "неподдържана версия на индекса „%s“"
 
-#: builtin/pack-objects.c:3845
 #, c-format
 msgid "bad index version '%s'"
 msgstr "неправилна версия на индекса „%s“"
 
-#: builtin/pack-objects.c:3884
 msgid "<version>[,<offset>]"
 msgstr "ВЕРСИЯ[,ОТМЕСТВАНЕ]"
 
-#: builtin/pack-objects.c:3885
 msgid "write the pack index file in the specified idx format version"
 msgstr ""
 "запазване на индекса на пакетните файлове във форма̀та с указаната версия"
 
-#: builtin/pack-objects.c:3888
 msgid "maximum size of each output pack file"
 msgstr "максимален размер на всеки пакетен файл"
 
-#: builtin/pack-objects.c:3890
 msgid "ignore borrowed objects from alternate object store"
 msgstr "игнориране на обектите заети от други хранилища на обекти"
 
-#: builtin/pack-objects.c:3892
 msgid "ignore packed objects"
 msgstr "игнориране на пакетираните обекти"
 
-#: builtin/pack-objects.c:3894
 msgid "limit pack window by objects"
 msgstr "ограничаване на прозореца за пакетиране по брой обекти"
 
-#: builtin/pack-objects.c:3896
 msgid "limit pack window by memory in addition to object limit"
 msgstr ""
 "ограничаване на прозореца за пакетиране и по памет освен по брой обекти"
 
-#: builtin/pack-objects.c:3898
 msgid "maximum length of delta chain allowed in the resulting pack"
 msgstr ""
 "максимална дължина на веригата от разлики, която е позволена в пакетния файл"
 
-#: builtin/pack-objects.c:3900
 msgid "reuse existing deltas"
 msgstr "преизползване на съществуващите разлики"
 
-#: builtin/pack-objects.c:3902
 msgid "reuse existing objects"
 msgstr "преизползване на съществуващите обекти"
 
-#: builtin/pack-objects.c:3904
 msgid "use OFS_DELTA objects"
 msgstr "използване на обекти „OFS_DELTA“"
 
-#: builtin/pack-objects.c:3906
 msgid "use threads when searching for best delta matches"
 msgstr ""
 "стартиране на нишки за претърсване на най-добрите съвпадения на разликите"
 
-#: builtin/pack-objects.c:3908
 msgid "do not create an empty pack output"
 msgstr "без създаване на празен пакетен файл"
 
-#: builtin/pack-objects.c:3910
 msgid "read revision arguments from standard input"
 msgstr "изчитане на версиите от стандартния вход"
 
-#: builtin/pack-objects.c:3912
 msgid "limit the objects to those that are not yet packed"
 msgstr "ограничаване до все още непакетираните обекти"
 
-#: builtin/pack-objects.c:3915
 msgid "include objects reachable from any reference"
 msgstr ""
 "включване на всички обекти, които може да се достигнат от произволен указател"
 
-#: builtin/pack-objects.c:3918
 msgid "include objects referred by reflog entries"
 msgstr "включване и на обектите сочени от записите в журнала на указателите"
 
-#: builtin/pack-objects.c:3921
 msgid "include objects referred to by the index"
 msgstr "включване и на обектите сочени от индекса"
 
-#: builtin/pack-objects.c:3924
 msgid "read packs from stdin"
 msgstr "изчитане на пакетите от стандартния вход"
 
-#: builtin/pack-objects.c:3926
 msgid "output pack to stdout"
 msgstr "извеждане на пакета на стандартния изход"
 
-#: builtin/pack-objects.c:3928
 msgid "include tag objects that refer to objects to be packed"
 msgstr ""
 "включване и на обектите-етикети, които сочат към обектите, които ще бъдат "
 "пакетирани"
 
-#: builtin/pack-objects.c:3930
 msgid "keep unreachable objects"
 msgstr "запазване на недостижимите обекти"
 
-#: builtin/pack-objects.c:3932
 msgid "pack loose unreachable objects"
 msgstr "пакетиране и на недостижимите обекти"
 
-#: builtin/pack-objects.c:3934
 msgid "unpack unreachable objects newer than <time>"
 msgstr "разпакетиране на недостижимите обекти, които са по-нови от това ВРЕМЕ"
 
-#: builtin/pack-objects.c:3937
+msgid "create a cruft pack"
+msgstr "създаване на пакет с излишните обекти"
+
+msgid "expire cruft objects older than <time>"
+msgstr "обявяване на излишните обекти по-стари от това ВРЕМЕ за остарели"
+
 msgid "use the sparse reachability algorithm"
 msgstr "използване на алгоритъм за частична достижимост"
 
-#: builtin/pack-objects.c:3939
 msgid "create thin packs"
 msgstr "създаване на съкратени пакети"
 
-#: builtin/pack-objects.c:3941
 msgid "create packs suitable for shallow fetches"
 msgstr "пакетиране подходящо за плитко доставяне"
 
-#: builtin/pack-objects.c:3943
 msgid "ignore packs that have companion .keep file"
 msgstr "игнориране на пакетите, които са придружени от файл „.keep“"
 
-#: builtin/pack-objects.c:3945
 msgid "ignore this pack"
 msgstr "пропускане на този пакет"
 
-#: builtin/pack-objects.c:3947
 msgid "pack compression level"
 msgstr "ниво на компресиране при пакетиране"
 
-#: builtin/pack-objects.c:3949
 msgid "do not hide commits by grafts"
 msgstr ""
 "извеждане на всички родители — дори и тези, които нормално са скрити при "
 "присажданията"
 
-#: builtin/pack-objects.c:3951
 msgid "use a bitmap index if available to speed up counting objects"
 msgstr ""
 "използване на съществуващи индекси на база битови маски за ускоряване на "
 "преброяването на обектите"
 
-#: builtin/pack-objects.c:3953
 msgid "write a bitmap index together with the pack index"
 msgstr "запазване и на индекс на база битова маска, заедно с индекса за пакета"
 
-#: builtin/pack-objects.c:3957
 msgid "write a bitmap index if possible"
 msgstr "записване на индекси на база битови маски при възможност"
 
-#: builtin/pack-objects.c:3961
 msgid "handling for missing objects"
 msgstr "как да се обработват липсващите обекти"
 
-#: builtin/pack-objects.c:3964
 msgid "do not pack objects in promisor packfiles"
 msgstr "без пакетиране на обекти в гарантиращи пакети"
 
-#: builtin/pack-objects.c:3966
 msgid "respect islands during delta compression"
 msgstr "без промяна на групите при делта компресия"
 
-#: builtin/pack-objects.c:3968
 msgid "protocol"
 msgstr "протокол"
 
-#: builtin/pack-objects.c:3969
 msgid "exclude any configured uploadpack.blobpackfileuri with this protocol"
 msgstr "без ползване на настройки „uploadpack.blobpackfileuri“ с този протокол"
 
-#: builtin/pack-objects.c:4002
 #, c-format
 msgid "delta chain depth %d is too deep, forcing %d"
 msgstr "веригата с разлики е прекалено дълбока — %d, ще се ползва %d"
 
-#: builtin/pack-objects.c:4007
 #, c-format
 msgid "pack.deltaCacheLimit is too high, forcing %d"
 msgstr ""
 "Стойността на настройката „pack.deltaCacheLimit“ е прекалено голяма.  Ще се "
 "ползва %d"
 
-#: builtin/pack-objects.c:4063
+#, c-format
+msgid "bad pack compression level %d"
+msgstr "неправилно ниво на компресиране при пакетиране: %d"
+
 msgid "--max-pack-size cannot be used to build a pack for transfer"
 msgstr ""
 "опцията „--max-pack-size“ не може да се използва за създаване на пакетни "
 "файлове за пренос"
 
-#: builtin/pack-objects.c:4065
 msgid "minimum pack size limit is 1 MiB"
 msgstr "минималният размер на пакетите е 1 MiB"
 
-#: builtin/pack-objects.c:4070
 msgid "--thin cannot be used to build an indexable pack"
 msgstr ""
 "опцията „--thin“не може да се използва за създаване на пакетни файлове с "
 "индекс"
 
-#: builtin/pack-objects.c:4079
 msgid "cannot use --filter without --stdout"
 msgstr "опцията „--filter“ изисква „--stdout“"
 
-#: builtin/pack-objects.c:4081
 msgid "cannot use --filter with --stdin-packs"
 msgstr "опциите „--filter“ и „--stdin-packs“ са несъвместими"
 
-#: builtin/pack-objects.c:4085
 msgid "cannot use internal rev list with --stdin-packs"
 msgstr ""
 "вътрешният списък на указатели и опцията „--stdin-packs“ са несъвместими"
 
-#: builtin/pack-objects.c:4144
+msgid "cannot use internal rev list with --cruft"
+msgstr "вътрешният списък на версии и опцията „--cruft“ са несъвместими"
+
+msgid "cannot use --stdin-packs with --cruft"
+msgstr "опциите „--stdin-packs“ и „--cruft“ са несъвместими"
+
+msgid "cannot use --max-pack-size with --cruft"
+msgstr "опциите „--max-pack-size“ и „--cruft“ са несъвместими"
+
 msgid "Enumerating objects"
 msgstr "Изброяване на обектите"
 
-#: builtin/pack-objects.c:4180
 #, c-format
 msgid ""
 "Total %<PRIu32> (delta %<PRIu32>), reused %<PRIu32> (delta %<PRIu32>), pack-"
@@ -19954,7 +9533,6 @@ msgstr ""
 "Общо: %<PRIu32> (разлики: %<PRIu32>), преизползвани: %<PRIu32> (разлики: "
 "%<PRIu32>), преизползвани при пакетиране: %<PRIu32>"
 
-#: builtin/pack-redundant.c:601
 msgid ""
 "'git pack-redundant' is nominated for removal.\n"
 "If you still use this command, please add an extra\n"
@@ -19968,95 +9546,62 @@ msgstr ""
 "ни известите с е-писмо до пощенския списък:\n"
 "<git@vger.kernel.org>.\n"
 
-#: builtin/pack-refs.c:8
 msgid "git pack-refs [<options>]"
 msgstr "git pack-refs [ОПЦИЯ…]"
 
-#: builtin/pack-refs.c:16
 msgid "pack everything"
 msgstr "пакетиране на всичко"
 
-#: builtin/pack-refs.c:17
 msgid "prune loose refs (default)"
 msgstr "окастряне на недостижимите указатели (стандартно)"
 
-#: builtin/prune-packed.c:6
-msgid "git prune-packed [-n | --dry-run] [-q | --quiet]"
-msgstr "git prune-packed [-n | --dry-run] [-q | --quiet]"
-
-#: builtin/prune.c:14
 msgid "git prune [-n] [-v] [--progress] [--expire <time>] [--] [<head>...]"
 msgstr "git prune [-n] [-v] [--progress] [--expire ВРЕМЕ] [--] [ВРЪХ…]"
 
-#: builtin/prune.c:145
 msgid "report pruned objects"
 msgstr "информация за окастрените обекти"
 
-#: builtin/prune.c:148
 msgid "expire objects older than <time>"
 msgstr "обявяване на обектите по-стари от това ВРЕМЕ за остарели"
 
-#: builtin/prune.c:150
 msgid "limit traversal to objects outside promisor packfiles"
 msgstr "ограничаване на обхождането до обекти извън гарантиращи пакети"
 
-#: builtin/prune.c:163
 msgid "cannot prune in a precious-objects repo"
 msgstr "хранилище с важни обекти не може да се окастря"
 
-#: builtin/pull.c:45 builtin/pull.c:47
-#, c-format
-msgid "Invalid value for %s: %s"
-msgstr "Неправилна стойност за „%s“: „%s“"
-
-#: builtin/pull.c:67
 msgid "git pull [<options>] [<repository> [<refspec>...]]"
 msgstr "git push [ОПЦИЯ…] [ХРАНИЛИЩЕ [УКАЗАТЕЛ_НА_ВЕРСИЯ…]]"
 
-#: builtin/pull.c:124
 msgid "control for recursive fetching of submodules"
 msgstr "управление на рекурсивното доставяне на подмодулите"
 
-#: builtin/pull.c:128
 msgid "Options related to merging"
 msgstr "Опции при сливане"
 
-#: builtin/pull.c:131
 msgid "incorporate changes by rebasing rather than merging"
-msgstr "внасяне на промените чрез пребазиране, а не чрез сливане"
+msgstr "внасяне на промѐните чрез пребазиране, а не чрез сливане"
 
-#: builtin/pull.c:159 builtin/revert.c:126
 msgid "allow fast-forward"
 msgstr "позволяване на превъртания"
 
-#: 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:340
 msgid "automatically stash/stash pop before and after"
 msgstr "автоматично скатаване/прилагане на скатаното преди и след пребазиране"
 
-#: builtin/pull.c:187
 msgid "Options related to fetching"
 msgstr "Опции при доставяне"
 
-#: builtin/pull.c:197
 msgid "force overwrite of local branch"
 msgstr "принудително презаписване на локалния клон"
 
-#: builtin/pull.c:205
 msgid "number of submodules pulled in parallel"
 msgstr "брой подмодули издърпани паралелно"
 
-#: builtin/pull.c:321
-#, c-format
-msgid "Invalid value for pull.ff: %s"
-msgstr "Неправилна стойност за „pull.ff“: „%s“"
-
-#: builtin/pull.c:449
 msgid ""
 "There is no candidate for rebasing against among the refs that you just "
 "fetched."
@@ -20064,14 +9609,12 @@ msgstr ""
 "Между указателите, които току що доставихте, няма подходящ кандидат, върху "
 "който да пребазирате."
 
-#: builtin/pull.c:451
 msgid ""
 "There are no candidates for merging among the refs that you just fetched."
 msgstr ""
 "Между указателите, които току що доставихте, няма подходящ кандидат, който "
 "да слеете."
 
-#: builtin/pull.c:452
 msgid ""
 "Generally this means that you provided a wildcard refspec which had no\n"
 "matches on the remote end."
@@ -20079,7 +9622,6 @@ msgstr ""
 "Най вероятно сте подали шаблон за указатели, който не е напаснал с нищо в "
 "отдалеченото хранилище."
 
-#: builtin/pull.c:455
 #, c-format
 msgid ""
 "You asked to pull from the remote '%s', but did not specify\n"
@@ -20090,44 +9632,33 @@ msgstr ""
 "Понеже това не е хранилището по подразбиране на текущия клон, трябва\n"
 "да укажете отдалечения клон на командния ред."
 
-#: builtin/pull.c:460 builtin/rebase.c:951
 msgid "You are not currently on a branch."
 msgstr "Извън всички клони."
 
-#: builtin/pull.c:462 builtin/pull.c:477
 msgid "Please specify which branch you want to rebase against."
 msgstr "Укажете върху кой клон искате да пребазирате."
 
-#: builtin/pull.c:464 builtin/pull.c:479
 msgid "Please specify which branch you want to merge with."
 msgstr "Укажете кой клон искате да слеете."
 
-#: builtin/pull.c:465 builtin/pull.c:480
 msgid "See git-pull(1) for details."
 msgstr "За повече информация погледнете ръководството „git-pull(1)“"
 
-#: builtin/pull.c:467 builtin/pull.c:473 builtin/pull.c:482
-#: builtin/rebase.c:957
 msgid "<remote>"
 msgstr "ОТДАЛЕЧЕНО_ХРАНИЛИЩЕ"
 
-#: builtin/pull.c:467 builtin/pull.c:482 builtin/pull.c:487
-#: contrib/scalar/scalar.c:375
 msgid "<branch>"
 msgstr "КЛОН"
 
-#: builtin/pull.c:475 builtin/rebase.c:949
 msgid "There is no tracking information for the current branch."
 msgstr "Текущият клон не следи никой."
 
-#: builtin/pull.c:484
 msgid ""
 "If you wish to set tracking information for this branch you can do so with:"
 msgstr ""
 "Ако искате да зададете информация за следен клон, може да направите това с "
 "командата:"
 
-#: builtin/pull.c:489
 #, c-format
 msgid ""
 "Your configuration specifies to merge with the ref '%s'\n"
@@ -20136,16 +9667,13 @@ msgstr ""
 "За сливане е указан отдалеченият указател „%s“,\n"
 "но такъв не е доставен."
 
-#: builtin/pull.c:600
 #, c-format
 msgid "unable to access commit %s"
 msgstr "недостъпно подаване: %s"
 
-#: builtin/pull.c:908
 msgid "ignoring --verify-signatures for rebase"
 msgstr "без „--verify-signatures“ при пребазиране"
 
-#: builtin/pull.c:969
 msgid ""
 "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"
@@ -20174,19 +9702,15 @@ msgstr ""
 "използвайте опциите „--rebase“, „--no-rebase“, „--ff-only“.  Те са с\n"
 "приоритет пред настройките.\n"
 
-#: builtin/pull.c:1046
 msgid "Updating an unborn branch with changes added to the index."
-msgstr "Обновяване на все още несъздаден клон с промените от индекса"
+msgstr "Обновяване на все още несъздаден клон с промѐните от индекса"
 
-#: builtin/pull.c:1050
 msgid "pull with rebase"
 msgstr "издърпване с пребазиране"
 
-#: builtin/pull.c:1051
 msgid "please commit or stash them."
-msgstr "трябва да подадете или скатаете промените."
+msgstr "трябва да подадете или скатаете промѐните."
 
-#: builtin/pull.c:1076
 #, c-format
 msgid ""
 "fetch updated the current branch head.\n"
@@ -20196,7 +9720,6 @@ msgstr ""
 "доставянето обнови върха на текущия клон.  Работното\n"
 "ви копие бе превъртяно от подаване „%s“."
 
-#: builtin/pull.c:1082
 #, c-format
 msgid ""
 "Cannot fast-forward your working tree.\n"
@@ -20213,50 +9736,52 @@ msgstr ""
 "    git reset --hard\n"
 "за връщане към нормално състояние."
 
-#: builtin/pull.c:1097
 msgid "Cannot merge multiple branches into empty head."
 msgstr "Не може да сливате множество клони в празен върхов указател."
 
-#: builtin/pull.c:1102
 msgid "Cannot rebase onto multiple branches."
 msgstr "Не може да пребазирате върху повече от един клон."
 
-#: builtin/pull.c:1104
 msgid "Cannot fast-forward to multiple branches."
 msgstr "Не може да превъртите към повече от един клон."
 
-#: builtin/pull.c:1119
 msgid "Need to specify how to reconcile divergent branches."
 msgstr ""
 "Трябва да укажете как да се решават разликите при разминаване на клоните."
 
-#: builtin/pull.c:1133
 msgid "cannot rebase with locally recorded submodule modifications"
 msgstr ""
-"пребазирането е невъзможно заради локално записаните промени по подмодулите"
+"пребазирането е невъзможно заради локално записаните промѐни по подмодулите"
 
-#: builtin/push.c:19
 msgid "git push [<options>] [<repository> [<refspec>...]]"
 msgstr "git push [ОПЦИЯ…] [ХРАНИЛИЩЕ [УКАЗАТЕЛ_НА_ВЕРСИЯ…]]"
 
-#: builtin/push.c:111
 msgid "tag shorthand without <tag>"
 msgstr "съкращение за етикет без ЕТИКЕТ"
 
-#: builtin/push.c:119
 msgid "--delete only accepts plain target ref names"
 msgstr "опцията „--delete“ приема за цел само прости имена на указатели"
 
-#: builtin/push.c:164
 msgid ""
 "\n"
-"To choose either option permanently, see push.default in 'git help config'."
+"To choose either option permanently, see push.default in 'git help config'.\n"
+msgstr ""
+"\n"
+"За да включите някоя от тези опции за постоянно, погледнете документацията "
+"за настройката „push.default“ в „git help config“.\n"
+
+msgid ""
+"\n"
+"To avoid automatically configuring upstream branches when their name\n"
+"doesn't match the local branch, see option 'simple' of branch."
+"autoSetupMerge\n"
+"in 'git help config'.\n"
 msgstr ""
 "\n"
-"За да включите тази опция за постоянно, погледнете документацията за "
-"настройката „push.default“ в „git help config“."
+"За да избегнете автоматичното задаване на следени клони, когато името им не "
+"съвпада с това на локалния клон, погледнете документацията за стойността "
+"„simple“ на настройката „branch.autoSetupMerge“ в „git help config“.\n"
 
-#: builtin/push.c:167
 #, c-format
 msgid ""
 "The upstream branch of your current branch does not match\n"
@@ -20268,7 +9793,7 @@ msgid ""
 "To push to the branch of the same name on the remote, use\n"
 "\n"
 "    git push %s HEAD\n"
-"%s"
+"%s%s"
 msgstr ""
 "Името на текущия клон се различава от името на клона, който той следи.\n"
 "За да изтласкате към следения клон използвайте командата:\n"
@@ -20279,9 +9804,8 @@ msgstr ""
 "командата:\n"
 "\n"
 "    git push %s HEAD\n"
-"%s"
+"%s%s"
 
-#: builtin/push.c:182
 #, c-format
 msgid ""
 "You are not currently on a branch.\n"
@@ -20295,35 +9819,42 @@ msgstr ""
 "\n"
 "    git push %s HEAD:ИМЕ_НА_ОТДАЛЕЧЕНИЯ_КЛОН\n"
 
-#: builtin/push.c:191
+msgid ""
+"\n"
+"To have this happen automatically for branches without a tracking\n"
+"upstream, see 'push.autoSetupRemote' in 'git help config'.\n"
+msgstr ""
+"\n"
+"За автоматично задаване за клони без следен клон, погледнете документацията "
+"на настройката „push.autoSetupRemote“ в „git help config“.\n"
+
 #, c-format
 msgid ""
 "The current branch %s has no upstream branch.\n"
 "To push the current branch and set the remote as upstream, use\n"
 "\n"
 "    git push --set-upstream %s %s\n"
+"%s"
 msgstr ""
 "Не е зададен отдалечен клон, който текущият клон „%s“ да следи.\n"
 "За да изтласкате локалния клон към отдалечен и същевременно да зададете\n"
 "втория като този, който първият следи, използвайте командата:\n"
 "\n"
 "    git push --set-upstream %s %s\n"
+"%s"
 
-#: builtin/push.c:199
 #, c-format
 msgid "The current branch %s has multiple upstream branches, refusing to push."
 msgstr ""
 "Текущият клон „%s“ следи няколко отдалечени клона, не може просто да "
 "изтласкате."
 
-#: builtin/push.c:217
 msgid ""
 "You didn't specify any refspecs to push, and push.default is \"nothing\"."
 msgstr ""
 "Не сте указали версия за подаване, а настройката „push.default“ е "
 "„nothing“ (нищо без изрично указана версия да не се изтласква)"
 
-#: builtin/push.c:243
 #, c-format
 msgid ""
 "You are pushing to remote '%s', which is not the upstream of\n"
@@ -20335,7 +9866,6 @@ msgstr ""
 "Трябва да укажете коя версия да се изтласка, за обновяване на отдалечения "
 "клон."
 
-#: 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"
@@ -20344,12 +9874,11 @@ msgid ""
 msgstr ""
 "Обновяването е отхвърлено, защото върхът на текущия ви клон е преди върха "
 "на\n"
-"отдалечения клон.  Внесете отдалечените промени (напр. с командата „git "
+"отдалечения клон.  Внесете отдалечените промѐни (напр. с командата „git "
 "pull…“),\n"
-"преди отново да изтласкате промените.  За повече информация вижте раздела\n"
+"преди отново да изтласкате промѐните.  За повече информация вижте раздела\n"
 "„Note about fast-forwards“ в страницата от ръководството „git push --help“."
 
-#: 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"
@@ -20357,13 +9886,12 @@ msgid ""
 "See the 'Note about fast-forwards' in 'git push --help' for details."
 msgstr ""
 "Обновяването е отхвърлено, защото върхът на изтласквания клон е преди върха\n"
-"на отдалечения клон.  Преминете към клона и внесете отдалечените промени "
+"на отдалечения клон.  Преминете към клона и внесете отдалечените промѐни "
 "(напр.\n"
-"с командата „git pull…“), преди отново да изтласкате промените.  За повече\n"
+"с командата „git pull…“), преди отново да изтласкате промѐните.  За повече\n"
 "информация погледнете раздела „Note about fast-forwards“ в страницата от\n"
 "ръководството „git push --help“."
 
-#: 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"
@@ -20373,23 +9901,21 @@ msgid ""
 msgstr ""
 "Обновяването е отхвърлено, защото хранилището, към което изтласквате, "
 "съдържа\n"
-"промени, които липсват в локалното хранилище.  Най-честата причина за това "
+"промѐни, които липсват в локалното хранилище.  Най-честата причина за това "
 "е,\n"
 "че някой друг е изтласквал към същия клон.  Първо внесете отдалечените "
-"промени\n"
-"(напр. с командата „git pull…“), преди отново да изтласкате промените.\n"
+"промѐни\n"
+"(напр. с командата „git pull…“), преди отново да изтласкате промѐните.\n"
 "За повече информация погледнете раздела „Note about fast-forwards“ в "
 "страницата\n"
 "от ръководството „git push --help“."
 
-#: builtin/push.c:277
 msgid "Updates were rejected because the tag already exists in the remote."
 msgstr ""
 "Изтласкването е отхвърлено, защото в отдалеченото хранилище съществува "
 "етикет,\n"
 "който ще припокриете с етикет от вашето хранилище."
 
-#: 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"
@@ -20397,9 +9923,8 @@ msgid ""
 msgstr ""
 "Без да укажете опцията „--force“, не може да обновите отдалечен\n"
 "указател, който вече сочи към обект, който не е подаване, както и тепърва\n"
-"да го промените да сочи към подобен обект.\n"
+"да го променѝте да сочи към подобен обект.\n"
 
-#: 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"
@@ -20407,105 +9932,85 @@ msgid ""
 "before forcing an update.\n"
 msgstr ""
 "Обновяването е отхвърлено, защото върхът на следящия клон е обновяван след\n"
-"последното изтегляне.  Внесете отдалечените промени (напр. с командата\n"
-"„git pull…“), преди отново принудително да изтласкате промените.\n"
+"последното изтегляне.  Внесете отдалечените промѐни (напр. с командата\n"
+"„git pull…“), преди отново принудително да изтласкате промѐните.\n"
 
-#: builtin/push.c:355
 #, c-format
 msgid "Pushing to %s\n"
 msgstr "Изтласкване към „%s“\n"
 
-#: builtin/push.c:362
 #, c-format
 msgid "failed to push some refs to '%s'"
 msgstr "част от указателите не бяха изтласкани към „%s“"
 
-#: builtin/push.c:544 builtin/submodule--helper.c:3259
+#, c-format
+msgid "invalid value for '%s'"
+msgstr "Неправилна стойност за „%s“"
+
 msgid "repository"
 msgstr "хранилище"
 
-#: builtin/push.c:545 builtin/send-pack.c:193
 msgid "push all refs"
 msgstr "изтласкване на всички указатели"
 
-#: builtin/push.c:546 builtin/send-pack.c:195
 msgid "mirror all refs"
 msgstr "огледално копие на всички указатели"
 
-#: builtin/push.c:548
 msgid "delete refs"
 msgstr "изтриване на указателите"
 
-#: builtin/push.c:549
 msgid "push tags (can't be used with --all or --mirror)"
 msgstr "изтласкване на етикетите (несъвместимо с опциите „--all“ и „--mirror“)"
 
-#: builtin/push.c:552 builtin/send-pack.c:196
 msgid "force updates"
 msgstr "принудително обновяване"
 
-#: builtin/push.c:553 builtin/send-pack.c:208
 msgid "<refname>:<expect>"
 msgstr "ИМЕ_НА_УКАЗАТЕЛ:ОЧАКВАНА_СТОЙНОСТ"
 
-#: 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:212
 msgid "require remote updates to be integrated locally"
 msgstr ""
 "изискване обновяванията в отдалечените хранилища да се внасят и в локалното"
 
-#: builtin/push.c:560
 msgid "control recursive pushing of submodules"
 msgstr "управление на рекурсивното изтласкване на подмодулите"
 
-#: 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:190
-#: builtin/send-pack.c:191
 msgid "receive pack program"
 msgstr "програма за получаването на пакети"
 
-#: builtin/push.c:564
 msgid "set upstream for git pull/status"
 msgstr "задаване на отдалеченото хранилище за командите „git pull/status“"
 
-#: builtin/push.c:567
 msgid "prune locally removed refs"
 msgstr "окастряне на указателите, които са премахнати от локалното хранилище"
 
-#: builtin/push.c:569
 msgid "bypass pre-push hook"
 msgstr "без изпълнение на куката преди изтласкване (pre-push)"
 
-#: builtin/push.c:570
 msgid "push missing but relevant tags"
 msgstr ""
 "изтласкване на липсващите в отдалеченото хранилище, но свързани с текущото "
 "изтласкване, етикети"
 
-#: builtin/push.c:572 builtin/send-pack.c:197
 msgid "GPG sign the push"
 msgstr "подписване на изтласкването с GPG"
 
-#: builtin/push.c:574 builtin/send-pack.c:204
 msgid "request atomic transaction on remote side"
 msgstr "изискване на атомарни операции от отсрещната страна"
 
-#: builtin/push.c:594
 msgid "--delete doesn't make sense without any refs"
 msgstr "опцията „--delete“ изисква поне един указател на версия"
 
-#: builtin/push.c:614
 #, c-format
 msgid "bad repository '%s'"
 msgstr "неправилно указано хранилище „%s“"
 
-#: builtin/push.c:615
 msgid ""
 "No configured push destination.\n"
 "Either specify the URL from the command-line or configure a remote "
@@ -20527,64 +10032,49 @@ msgstr ""
 "\n"
 "    git push ИМЕ\n"
 
-#: builtin/push.c:632
 msgid "--all can't be combined with refspecs"
 msgstr "опцията „--all“ е несъвместима с указването на версия"
 
-#: builtin/push.c:638
 msgid "--mirror can't be combined with refspecs"
 msgstr "опцията „--mirror“ е несъвместима с указването на версия"
 
-#: builtin/push.c:648
 msgid "push options must not have new line characters"
 msgstr "опциите за изтласкване не трябва да съдържат знак за нов ред"
 
-#: builtin/range-diff.c:9
 msgid "git range-diff [<options>] <old-base>..<old-tip> <new-base>..<new-tip>"
 msgstr "git range-diff [ОПЦИЯ…] СТАРА_БАЗА..СТАР_ВРЪХ НОВА_БАЗА..НОВ_ВРЪХ"
 
-#: builtin/range-diff.c:10
 msgid "git range-diff [<options>] <old-tip>...<new-tip>"
 msgstr "git range-diff [ОПЦИЯ…] СТАР_ВРЪХ...НОВ_ВРЪХ"
 
-#: builtin/range-diff.c:11
 msgid "git range-diff [<options>] <base> <old-tip> <new-tip>"
 msgstr "git range-diff [ОПЦИЯ…] БАЗА СТАР_ВРЪХ НОВ_ВРЪХ"
 
-#: builtin/range-diff.c:30
 msgid "use simple diff colors"
 msgstr "използване на прости цветове за разликите"
 
-#: builtin/range-diff.c:32
 msgid "notes"
 msgstr "бележки"
 
-#: builtin/range-diff.c:32
 msgid "passed to 'git log'"
 msgstr "подава се на командата „git log“"
 
-#: builtin/range-diff.c:35
 msgid "only emit output related to the first range"
 msgstr "извеждане само на информацията за първия диапазон"
 
-#: builtin/range-diff.c:37
 msgid "only emit output related to the second range"
 msgstr "извеждане само на информацията за втория диапазон"
 
-#: builtin/range-diff.c:60 builtin/range-diff.c:64
 #, c-format
 msgid "not a commit range: '%s'"
 msgstr "не е диапазон с подавания: „%s“"
 
-#: builtin/range-diff.c:74
 msgid "single arg format must be symmetric range"
 msgstr "вариантът с единствен аргумент изисква симетричен диапазон"
 
-#: builtin/range-diff.c:89
 msgid "need two commit ranges"
 msgstr "необходими са два диапазона с подавания"
 
-#: builtin/read-tree.c:41
 msgid ""
 "git read-tree [(-m [--trivial] [--aggressive] | --reset | --prefix=<prefix>) "
 "[-u | -i]] [--no-sparse-checkout] [--index-output=<file>] (--empty | <tree-"
@@ -20594,79 +10084,60 @@ msgstr ""
 "[-u | -i]] [--no-sparse-checkout] [--index-output=ФАЙЛ] (--empty | "
 "УКАЗАТЕЛ_КЪМ_ДЪРВО_1 [УКАЗАТЕЛ_КЪМ_ДЪРВО_2 [УКАЗАТЕЛ_КЪМ_ДЪРВО_3]])"
 
-#: builtin/read-tree.c:116
 msgid "write resulting index to <file>"
 msgstr "запазване на индекса в този ФАЙЛ"
 
-#: builtin/read-tree.c:119
 msgid "only empty the index"
 msgstr "само зануляване на индекса"
 
-#: builtin/read-tree.c:121
 msgid "Merging"
 msgstr "Сливане"
 
-#: builtin/read-tree.c:123
 msgid "perform a merge in addition to a read"
 msgstr "да се извърши и сливане след освен изчитането"
 
-#: builtin/read-tree.c:125
 msgid "3-way merge if no file level merging required"
 msgstr "тройно сливане, ако не се налага пофайлово сливане"
 
-#: builtin/read-tree.c:127
 msgid "3-way merge in presence of adds and removes"
 msgstr "тройно сливане при добавяне на добавяне и изтриване на файлове"
 
-#: builtin/read-tree.c:129
 msgid "same as -m, but discard unmerged entries"
 msgstr "същото като опцията „-m“, но неслетите обекти се пренебрегват"
 
-#: builtin/read-tree.c:130
 msgid "<subdirectory>/"
 msgstr "ПОДДИРЕКТОРИЯ/"
 
-#: builtin/read-tree.c:131
 msgid "read the tree into the index under <subdirectory>/"
 msgstr "изчитане на дървото към индекса като да е в тази ПОДДИРЕКТОРИЯ/"
 
-#: builtin/read-tree.c:134
 msgid "update working tree with merge result"
 msgstr "обновяване на работното дърво с резултата от сливането"
 
-#: builtin/read-tree.c:136
 msgid "gitignore"
 msgstr "ФАЙЛ_С_ИЗКЛЮЧЕНИЯ"
 
-#: builtin/read-tree.c:137
 msgid "allow explicitly ignored files to be overwritten"
 msgstr "позволяване на презаписването на изрично пренебрегваните файлове"
 
-#: builtin/read-tree.c:140
 msgid "don't check the working tree after merging"
 msgstr "без проверка на работното дърво след сливането"
 
-#: builtin/read-tree.c:141
 msgid "don't update the index or the work tree"
 msgstr "без обновяване и на индекса, и на работното дърво"
 
-#: builtin/read-tree.c:143
 msgid "skip applying sparse checkout filter"
 msgstr "без прилагане на филтъра за частично изтегляне"
 
-#: builtin/read-tree.c:145
 msgid "debug unpack-trees"
 msgstr "изчистване на грешки в командата „unpack-trees“"
 
-#: builtin/read-tree.c:149
 msgid "suppress feedback messages"
 msgstr "без информационни съобщения"
 
-#: builtin/read-tree.c:183
 msgid "You need to resolve your current index first"
 msgstr "Първо трябва да коригирате индекса си"
 
-#: builtin/rebase.c:35
 msgid ""
 "git rebase [-i] [options] [--exec <cmd>] [--onto <newbase> | --keep-base] "
 "[<upstream> [<branch>]]"
@@ -20674,54 +10145,48 @@ msgstr ""
 "git rebase [-i] [ОПЦИЯ…] [--exec КОМАНДА] [--onto НОВА_БАЗА | --keep-base] "
 "[КЛОН_ИЗТОЧНИК [КЛОН]]"
 
-#: builtin/rebase.c:37
 msgid ""
 "git rebase [-i] [options] [--exec <cmd>] [--onto <newbase>] --root [<branch>]"
 msgstr ""
 "git rebase [-i] [ОПЦИЯ…] [--exec КОМАНДА] [--onto НОВА_БАЗА] --root [КЛОН]"
 
-#: builtin/rebase.c:39
-msgid "git rebase --continue | --abort | --skip | --edit-todo"
-msgstr "git rebase --continue | --abort | --skip | --edit-todo"
+#, c-format
+msgid "could not read '%s'."
+msgstr "от „%s“ не може да се чете."
 
-#: builtin/rebase.c:230
 #, c-format
 msgid "could not create temporary %s"
 msgstr "не може да се създаде временна директория „%s“"
 
-#: builtin/rebase.c:236
 msgid "could not mark as interactive"
 msgstr "невъзможно задаване на интерактивна работа"
 
-#: builtin/rebase.c:289
 msgid "could not generate todo list"
 msgstr "файлът с командите не може да се генерира"
 
-#: builtin/rebase.c:331
 msgid "a base commit must be provided with --upstream or --onto"
 msgstr "опциите „--upstream“ и „--onto“ изискват базово подаване"
 
-#: builtin/rebase.c:390
 #, c-format
 msgid "%s requires the merge backend"
 msgstr "„%s“ изисква пребазиране"
 
-#: builtin/rebase.c:432
 #, c-format
 msgid "could not get 'onto': '%s'"
 msgstr "не може да се премине към новата база, зададена с „onto“: „%s“"
 
-#: builtin/rebase.c:449
 #, c-format
 msgid "invalid orig-head: '%s'"
 msgstr "неправилен указател към първоначален връх „orig-head“: „%s“"
 
-#: builtin/rebase.c:474
 #, c-format
 msgid "ignoring invalid allow_rerere_autoupdate: '%s'"
 msgstr "неправилната стойност на „allow_rerere_autoupdate“ се прескача: „%s“"
 
-#: builtin/rebase.c:597
+#, c-format
+msgid "could not remove '%s'"
+msgstr "„%s“ не може да бъде изтрит"
+
 msgid ""
 "Resolve all conflicts manually, mark them as resolved with\n"
 "\"git add/rm <conflicted_files>\", then run \"git rebase --continue\".\n"
@@ -20735,7 +10200,6 @@ msgstr ""
 "За да откажете пребазирането и да се върнете към първоначалното състояние,\n"
 "изпълнете „git rebase --abort“."
 
-#: builtin/rebase.c:680
 #, c-format
 msgid ""
 "\n"
@@ -20753,7 +10217,10 @@ msgstr ""
 "\n"
 "В резултат те не може да се пребазират."
 
-#: builtin/rebase.c:925
+#, c-format
+msgid "could not switch to %s"
+msgstr "не може да се премине към „%s“"
+
 #, c-format
 msgid ""
 "unrecognized empty type '%s'; valid values are \"drop\", \"keep\", and \"ask"
@@ -20762,7 +10229,6 @@ msgstr ""
 "неправилна стойност „%s“: вариантите са „drop“ (прескачане), "
 "„keep“ (запазване) и „ask“ (питане)"
 
-#: builtin/rebase.c:943
 #, c-format
 msgid ""
 "%s\n"
@@ -20779,7 +10245,6 @@ msgstr ""
 "    git rebase КЛОН\n"
 "\n"
 
-#: builtin/rebase.c:959
 #, c-format
 msgid ""
 "If you wish to set tracking information for this branch you can do so with:\n"
@@ -20792,190 +10257,167 @@ msgstr ""
 "\n"
 "    git branch --set-upstream-to=%s/КЛОН %s\n"
 
-#: builtin/rebase.c:989
 msgid "exec commands cannot contain newlines"
 msgstr "командите за изпълнение не може да съдържат нови редове"
 
-#: builtin/rebase.c:993
 msgid "empty exec command"
 msgstr "празна команда за изпълнение"
 
-#: builtin/rebase.c:1023
 msgid "rebase onto given branch instead of upstream"
 msgstr "пребазиране върху зададения, а не следения клон"
 
-#: builtin/rebase.c:1025
 msgid "use the merge-base of upstream and branch as the current base"
 msgstr "за текуща база да се ползва базата за сливане на клона и следеното"
 
-#: builtin/rebase.c:1027
 msgid "allow pre-rebase hook to run"
 msgstr "позволяване на куката преди пребазиране да се изпълни"
 
-#: builtin/rebase.c:1029
 msgid "be quiet. implies --no-stat"
 msgstr "без извеждане на информация.  Включва опцията „--no-stat“"
 
-#: builtin/rebase.c:1032
 msgid "display a diffstat of what changed upstream"
-msgstr "извеждане на статистика с промените в следения клон"
+msgstr "извеждане на статистика с промѐните в следения клон"
 
-#: builtin/rebase.c:1035
 msgid "do not show diffstat of what changed upstream"
-msgstr "без извеждане на статистика с промените в следения клон"
+msgstr "без извеждане на статистика с промѐните в следения клон"
 
-#: builtin/rebase.c:1038
 msgid "add a Signed-off-by trailer to each commit"
 msgstr "добавяне на епилог за подпис „Signed-off-by“ към всяко подаване"
 
-#: builtin/rebase.c:1041
 msgid "make committer date match author date"
 msgstr "датата на подаващия да отговаря на датата на автора"
 
-#: builtin/rebase.c:1043
 msgid "ignore author date and use current date"
 msgstr "да се ползва днешна дата, а не тази на автора"
 
-#: builtin/rebase.c:1045
 msgid "synonym of --reset-author-date"
 msgstr "псевдоним на „--reset-author-date“"
 
-#: builtin/rebase.c:1047 builtin/rebase.c:1051
 msgid "passed to 'git apply'"
 msgstr "подава се на командата „git apply“"
 
-#: builtin/rebase.c:1049
 msgid "ignore changes in whitespace"
-msgstr "без промени в празните знаци"
+msgstr "без промѐни в празните знаци"
 
-#: builtin/rebase.c:1053 builtin/rebase.c:1056
 msgid "cherry-pick all commits, even if unchanged"
-msgstr "отбиране на всички подавания дори да няма промени"
+msgstr "отбиране на всички подавания дори да няма промѐни"
 
-#: builtin/rebase.c:1058
 msgid "continue"
 msgstr "продължаване"
 
-#: builtin/rebase.c:1061
 msgid "skip current patch and continue"
 msgstr "прескачане на текущата кръпка и продължаване"
 
-#: builtin/rebase.c:1063
 msgid "abort and check out the original branch"
 msgstr "преустановяване и възстановяване на първоначалния клон"
 
-#: builtin/rebase.c:1066
 msgid "abort but keep HEAD where it is"
 msgstr "преустановяване без промяна към какво сочи „HEAD“"
 
-#: builtin/rebase.c:1067
 msgid "edit the todo list during an interactive rebase"
 msgstr "редактиране на файла с команди при интерактивно пребазиране"
 
-#: builtin/rebase.c:1070
 msgid "show the patch file being applied or merged"
 msgstr "показване на кръпката, която се прилага или слива"
 
-#: builtin/rebase.c:1073
 msgid "use apply strategies to rebase"
 msgstr "при пребазиране да се ползва стратегия с прилагане"
 
-#: builtin/rebase.c:1077
 msgid "use merging strategies to rebase"
 msgstr "при пребазиране да се ползва стратегия със сливане"
 
-#: builtin/rebase.c:1081
 msgid "let the user edit the list of commits to rebase"
 msgstr ""
 "позволяване на потребителя да редактира списъка с подавания за пребазиране"
 
-#: builtin/rebase.c:1085
-msgid "(DEPRECATED) try to recreate merges instead of ignoring them"
-msgstr "(ОСТАРЯЛО) пресъздаване на сливанията вместо да се прескачат"
+msgid "(REMOVED) was: try to recreate merges instead of ignoring them"
+msgstr ""
+"(ОСТАРЯЛО) бе: опит за пресъздаване на сливанията вместо да се прескачат"
 
-#: builtin/rebase.c:1090
 msgid "how to handle commits that become empty"
 msgstr "как да се обработват оказалите се празни подавания"
 
-#: 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:1104
 msgid "add exec lines after each commit of the editable list"
 msgstr ""
 "добавяне на редове с команди за изпълнение след всяко подаване в "
 "редактирания списък"
 
-#: builtin/rebase.c:1108
 msgid "allow rebasing commits with empty messages"
 msgstr "позволяване на пребазиране на подавания с празни съобщения"
 
-#: builtin/rebase.c:1112
 msgid "try to rebase merges instead of skipping them"
 msgstr "опит за пребазиране на сливанията вместо те да се прескачат"
 
-#: builtin/rebase.c:1115
 msgid "use 'merge-base --fork-point' to refine upstream"
 msgstr ""
 "за доуточняването на следения клон, използвайте:\n"
 "\n"
 "    git merge-base --fork-point"
 
-#: builtin/rebase.c:1117
 msgid "use the given merge strategy"
 msgstr "използване на зададената стратегията на сливане"
 
-#: builtin/rebase.c:1119 builtin/revert.c:115
 msgid "option"
 msgstr "опция"
 
-#: builtin/rebase.c:1120
 msgid "pass the argument through to the merge strategy"
 msgstr "аргументът да се подаде на стратегията за сливане"
 
-#: builtin/rebase.c:1123
 msgid "rebase all reachable commits up to the root(s)"
 msgstr "пребазиране на всички достижими подавания до началното им подаване"
 
-#: 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 "прилагане на всички промени, дори и наличните вече в следеното"
+msgstr "прилагане на всички промѐни, дори и наличните вече в следеното"
 
-#: builtin/rebase.c:1149
 msgid "It looks like 'git am' is in progress. Cannot rebase."
 msgstr ""
 "Изглежда, че сега се прилагат кръпки чрез командата „git am“.  Не може да "
 "пребазирате в момента."
 
-#: builtin/rebase.c:1180
-msgid "--preserve-merges was replaced by --rebase-merges"
-msgstr "Опцията „--preserve-merges“ е заменена с „--rebase-merges“."
+msgid ""
+"`rebase --preserve-merges` (-p) is no longer supported.\n"
+"Use `git rebase --abort` to terminate current rebase.\n"
+"Or downgrade to v2.33, or earlier, to complete the rebase."
+msgstr ""
+"Вариантът „rebase --preserve-merges“ („-p“) вече не се поддържа.\n"
+"За да преустановите текущото пребазиране, изпълнете:\n"
+"\n"
+"    git rebase --abort\n"
+"\n"
+"Ако искате да завършите пребазирането, се върнете на версия на git v2.33 или "
+"по-ранна."
+
+msgid ""
+"--preserve-merges was replaced by --rebase-merges\n"
+"Note: Your `pull.rebase` configuration may also be set to 'preserve',\n"
+"which is no longer supported; use 'merges' instead"
+msgstr ""
+"Опцията „--preserve-merges“ е заменена с „--rebase-merges“.\n"
+"БЕЛЕЖКА: Проверете дали стойността на настройката „pull.rebase“ е "
+"„preserve“.\n"
+"Тази стойност вече не се поддържа, заменете я с „merges“."
 
-#: builtin/rebase.c:1202
 msgid "No rebase in progress?"
 msgstr "Изглежда в момента не тече пребазиране"
 
-#: builtin/rebase.c:1206
 msgid "The --edit-todo action can only be used during interactive rebase."
 msgstr ""
 "Опцията „--edit-todo“ е достъпна само по време на интерактивно пребазиране."
 
-#: builtin/rebase.c:1229 t/helper/test-fast-rebase.c:122
 msgid "Cannot read HEAD"
 msgstr "Указателят „HEAD“ не може да бъде прочетен"
 
-#: builtin/rebase.c:1241
 msgid ""
 "You must edit all merge conflicts and then\n"
 "mark them as resolved using git add"
@@ -20983,16 +10425,13 @@ msgstr ""
 "Трябва да редактирате всички конфликти при сливането.  След това\n"
 "отбележете коригирането им чрез командата „git add“"
 
-#: builtin/rebase.c:1260
 msgid "could not discard worktree changes"
-msgstr "промените в работното дърво не може да бъдат занулени"
+msgstr "промѐните в работното дърво не може да бъдат занулени"
 
-#: builtin/rebase.c:1279
 #, c-format
 msgid "could not move back to %s"
 msgstr "връщането към „%s“ е невъзможно"
 
-#: builtin/rebase.c:1325
 #, c-format
 msgid ""
 "It seems that there is already a %s directory, and\n"
@@ -21011,138 +10450,105 @@ msgstr ""
 "    %s\n"
 "и отново започнете пребазирането.  Текущото пребазиране се преустановява, "
 "за\n"
-"да не загубите случайно промени.\n"
+"да не загубите случайно промѐни.\n"
 
-#: builtin/rebase.c:1353
 msgid "switch `C' expects a numerical value"
 msgstr "опцията „C“ очаква число за аргумент"
 
-#: builtin/rebase.c:1395
 #, c-format
 msgid "Unknown mode: %s"
 msgstr "Неизвестна стратегия: „%s“"
 
-#: builtin/rebase.c:1434
 msgid "--strategy requires --merge or --interactive"
 msgstr ""
 "опцията „--strategy“ изисква някоя от опциите „--merge“ или „--interactive“"
 
-#: builtin/rebase.c:1463
 msgid "apply options and merge options cannot be used together"
 msgstr "опциите за прилагане и сливане са несъвместими"
 
-#: builtin/rebase.c:1476
 #, c-format
 msgid "Unknown rebase backend: %s"
 msgstr "Непозната реализация на пребазиране: %s"
 
-#: builtin/rebase.c:1505
 msgid "--reschedule-failed-exec requires --exec or --interactive"
 msgstr ""
 "опцията „--reschedule-failed-exec“ изисква някоя от опциите „--exec“ или „--"
 "interactive“"
 
-#: builtin/rebase.c:1536
 #, c-format
 msgid "invalid upstream '%s'"
 msgstr "неправилен следен клон: „%s“"
 
-#: builtin/rebase.c:1542
 msgid "Could not create new root commit"
 msgstr "Не може да се създаде ново начално подаване"
 
-#: builtin/rebase.c:1568
-#, c-format
-msgid "'%s': need exactly one merge base with branch"
-msgstr "„%s“: изисква се точно една база за сливане с клона"
-
-#: builtin/rebase.c:1571
-#, c-format
-msgid "'%s': need exactly one merge base"
-msgstr "„%s“: изисква се точно една база за пребазиране"
-
-#: builtin/rebase.c:1580
-#, c-format
-msgid "Does not point to a valid commit '%s'"
-msgstr "Указателят „%s“ не сочи към подаване"
-
-#: builtin/rebase.c:1607
 #, c-format
 msgid "no such branch/commit '%s'"
 msgstr "не съществува клон/подаване „%s“"
 
-#: builtin/rebase.c:1618 builtin/submodule--helper.c:39
-#: builtin/submodule--helper.c:2659
 #, c-format
 msgid "No such ref: %s"
 msgstr "Такъв указател няма: %s"
 
-#: builtin/rebase.c:1629
 msgid "Could not resolve HEAD to a revision"
 msgstr "Подаването, сочено от указателя „HEAD“, не може да бъде открито"
 
-#: builtin/rebase.c:1650
-msgid "Please commit or stash them."
-msgstr "Промените трябва или да се подадат, или да се скатаят."
+#, c-format
+msgid "'%s': need exactly one merge base with branch"
+msgstr "„%s“: изисква се точно една база за сливане с клона"
 
-#: builtin/rebase.c:1686
 #, c-format
-msgid "could not switch to %s"
-msgstr "не може да се премине към „%s“"
+msgid "'%s': need exactly one merge base"
+msgstr "„%s“: изисква се точно една база за пребазиране"
+
+#, c-format
+msgid "Does not point to a valid commit '%s'"
+msgstr "Указателят „%s“ не сочи към подаване"
+
+msgid "Please commit or stash them."
+msgstr "Промѐните трябва или да се подадат, или да се скатаят."
 
-#: builtin/rebase.c:1697
 msgid "HEAD is up to date."
 msgstr "Указателят „HEAD“ е напълно актуален."
 
-#: builtin/rebase.c:1699
 #, c-format
 msgid "Current branch %s is up to date.\n"
 msgstr "Текущият клон „%s“ е напълно актуален.\n"
 
-#: builtin/rebase.c:1707
 msgid "HEAD is up to date, rebase forced."
 msgstr "Указателят „HEAD“ е напълно актуален — принудително пребазиране"
 
-#: builtin/rebase.c:1709
 #, c-format
 msgid "Current branch %s is up to date, rebase forced.\n"
 msgstr "Текущият клон „%s“ е напълно актуален — принудително пребазиране\n"
 
-#: builtin/rebase.c:1717
 msgid "The pre-rebase hook refused to rebase."
 msgstr "Куката за изпълнение преди пребазиране отхвърли пребазирането."
 
-#: builtin/rebase.c:1724
 #, c-format
 msgid "Changes to %s:\n"
-msgstr "Промените в „%s“:\n"
+msgstr "Промѐните в „%s“:\n"
 
-#: builtin/rebase.c:1727
 #, c-format
 msgid "Changes from %s to %s:\n"
-msgstr "Промените от „%s“ към „%s“:\n"
+msgstr "Промѐните от „%s“ към „%s“:\n"
 
-#: 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:1761
 msgid "Could not detach HEAD"
 msgstr "Указателят „HEAD“ не може да се отделѝ"
 
-#: builtin/rebase.c:1770
 #, c-format
 msgid "Fast-forwarded %s to %s.\n"
 msgstr "Превъртане на „%s“ към „%s“.\n"
 
-#: builtin/receive-pack.c:35
 msgid "git receive-pack <git-dir>"
 msgstr "git receive-pack ДИРЕКТОРИЯ_НА_GIT"
 
-#: builtin/receive-pack.c:1275
 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"
@@ -21175,7 +10581,6 @@ msgstr ""
 "За да заглушите това съобщение, като запазите стандартното поведение,\n"
 "задайте настройката „receive.denyCurrentBranch“ да е „refuse“ (отказ)."
 
-#: builtin/receive-pack.c:1295
 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"
@@ -21196,78 +10601,95 @@ msgstr ""
 "За да заглушите това съобщение, задайте настройката\n"
 "„receive.denyDeleteCurrent“ да е „refuse“ (отказ)."
 
-#: builtin/receive-pack.c:2474
 msgid "quiet"
 msgstr "без извеждане на информация"
 
-#: builtin/receive-pack.c:2489
 msgid "you must specify a directory"
 msgstr "трябва да укажете директория"
 
-#: builtin/reflog.c:17
+msgid "git reflog [show] [<log-options>] [<ref>]"
+msgstr "git reflog [show] [ОПЦИЯ…] [УКАЗАТЕЛ]"
+
 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>]\n"
+"                  [--rewrite] [--updateref] [--stale-fix]\n"
+"                  [--dry-run | -n] [--verbose] [--all [--single-worktree] | "
+"<refs>...]"
 msgstr ""
-"git reflog expire [--expire=ВРЕМЕ] [--expire-unreachable=ВРЕМЕ] [--rewrite] "
-"[--updateref] [--stale-fix] [--dry-run | -n] [--verbose] [--all] УКАЗАТЕЛ…"
+"git reflog expire [--expire=ВРЕМЕ] [--expire-unreachable=ВРЕМЕ]\n"
+"                  [--rewrite] [--updateref] [--stale-fix]\n"
+"                  [--dry-run | -n] [--verbose] [--all [--single-worktree] | "
+"УКАЗАТЕЛ…]"
 
-#: builtin/reflog.c:22
 msgid ""
-"git reflog delete [--rewrite] [--updateref] [--dry-run | -n] [--verbose] "
-"<refs>..."
+"git reflog delete [--rewrite] [--updateref]\n"
+"                  [--dry-run | -n] [--verbose] <ref>@{<specifier>}..."
 msgstr ""
-"git reflog delete [--rewrite] [--updateref] [--dry-run | -n] [--verbose] "
-"УКАЗАТЕЛ…"
+"git reflog delete [--rewrite] [--updateref]\n"
+"                  [--dry-run | -n] [--verbose] УКАЗАТЕЛ@{УТОЧНЕНИЕ}…"
 
-#: builtin/reflog.c:25
 msgid "git reflog exists <ref>"
 msgstr "git reflog exists УКАЗАТЕЛ"
 
-#: builtin/reflog.c:585 builtin/reflog.c:590
 #, c-format
-msgid "'%s' is not a valid timestamp"
-msgstr "„%s“ не е правилна стойност за време"
+msgid "invalid timestamp '%s' given to '--%s'"
+msgstr "неправилно времево клеймо „%s“ подадено към „--%s“"
+
+msgid "do not actually prune any entries"
+msgstr "без окастряне на записи"
+
+msgid ""
+"rewrite the old SHA1 with the new SHA1 of the entry that now precedes it"
+msgstr ""
+"презаписване на старата сума по SHA1 с новата на записа, който директно го "
+"предхожда"
+
+msgid "update the reference to the value of the top reflog entry"
+msgstr ""
+"обновяване на указателя да е стойността на първия запис в журнала с указатели"
+
+msgid "print extra information on screen"
+msgstr "извеждане на допълнителна информация на екрана"
+
+msgid "timestamp"
+msgstr "времево клеймо"
+
+msgid "prune entries older than the specified time"
+msgstr "окастряне на записите по-стари от указаното време"
+
+msgid ""
+"prune entries older than <time> that are not reachable from the current tip "
+"of the branch"
+msgstr ""
+"окастряне на всички записи по-стари от това ВРЕМЕ, които не са достижими от "
+"текущия връх на клона"
+
+msgid "prune any reflog entries that point to broken commits"
+msgstr ""
+"окастряне на записите в журнала с указатели, които сочат към повредени "
+"подавания"
+
+msgid "process the reflogs of all references"
+msgstr "обработка на всички указатели в журнала с тях"
+
+msgid "limits processing to reflogs from the current worktree only"
+msgstr "обработка само на журнала с указатели в текущото работно дърво"
 
-#: builtin/reflog.c:631
 #, c-format
 msgid "Marking reachable objects..."
 msgstr "Отбелязване на достижимите обекти…"
 
-#: builtin/reflog.c:675
 #, c-format
 msgid "%s points nowhere!"
 msgstr "„%s“ не сочи наникъде!"
 
-#: builtin/reflog.c:731
 msgid "no reflog specified to delete"
 msgstr "не е указан журнал с подавания за изтриване"
 
-#: builtin/reflog.c:742
-#, c-format
-msgid "not a reflog: %s"
-msgstr "„%s“ не е журнал с подавания"
-
-#: builtin/reflog.c:747
-#, c-format
-msgid "no reflog for '%s'"
-msgstr "липсва журнал с подаванията за „%s“"
-
-#: builtin/reflog.c:794
 #, c-format
 msgid "invalid ref format: %s"
 msgstr "неправилен формат на указател: %s"
 
-#: builtin/reflog.c:803
-msgid "git reflog [ show | expire | delete | exists ]"
-msgstr "git reflog [ show | expire | delete | exists ]"
-
-#: builtin/remote.c:17
-msgid "git remote [-v | --verbose]"
-msgstr "git remote [-v | --verbose]"
-
-#: builtin/remote.c:18
 msgid ""
 "git remote add [-t <branch>] [-m <master>] [-f] [--tags | --no-tags] [--"
 "mirror=<fetch|push>] <name> <url>"
@@ -21275,88 +10697,68 @@ msgstr ""
 "git remote add [-t КЛОН] [-m ОСНОВЕН_КЛОН] [-f] [--tags | --no-tags] [--"
 "mirror=<fetch|push>] ИМЕ АДРЕС"
 
-#: builtin/remote.c:19 builtin/remote.c:39
-msgid "git remote rename <old> <new>"
-msgstr "git remote rename СТАРО_ИМЕ НОВО_ИМЕ"
+msgid "git remote rename [--[no-]progress] <old> <new>"
+msgstr "git remote rename [--[no-]progress] СТАРО_ИМЕ НОВО_ИМЕ"
 
-#: builtin/remote.c:20 builtin/remote.c:44
 msgid "git remote remove <name>"
 msgstr "git remote remove ИМЕ"
 
-#: builtin/remote.c:21 builtin/remote.c:49
 msgid "git remote set-head <name> (-a | --auto | -d | --delete | <branch>)"
 msgstr "git remote set-head ИМЕ (-a | --auto | -d | --delete | КЛОН)"
 
-#: builtin/remote.c:22
 msgid "git remote [-v | --verbose] show [-n] <name>"
 msgstr "git remote [-v | --verbose] show [-n] ИМЕ"
 
-#: builtin/remote.c:23
 msgid "git remote prune [-n | --dry-run] <name>"
 msgstr "git remote prune [-n | --dry-run] ИМЕ"
 
-#: builtin/remote.c:24
 msgid ""
 "git remote [-v | --verbose] update [-p | --prune] [(<group> | <remote>)...]"
 msgstr ""
 "git remote [-v | --verbose] update [-p | --prune] [(ГРУПА | "
 "ОТДАЛЕЧЕНО_ХРАНИЛИЩЕ)…]"
 
-#: builtin/remote.c:25
 msgid "git remote set-branches [--add] <name> <branch>..."
 msgstr "git remote set-branches [--add] ИМЕ КЛОН…"
 
-#: builtin/remote.c:26 builtin/remote.c:75
 msgid "git remote get-url [--push] [--all] <name>"
 msgstr "git remote get-url [--push] [--all] ИМЕ"
 
-#: builtin/remote.c:27 builtin/remote.c:80
 msgid "git remote set-url [--push] <name> <newurl> [<oldurl>]"
 msgstr "git remote set-url [--push] ИМЕ НОВ_АДРЕС [СТАР_АДРЕС]"
 
-#: builtin/remote.c:28 builtin/remote.c:81
 msgid "git remote set-url --add <name> <newurl>"
 msgstr "git remote set-url --add ИМЕ НОВ_АДРЕС"
 
-#: builtin/remote.c:29 builtin/remote.c:82
 msgid "git remote set-url --delete <name> <url>"
 msgstr "git remote set-url --delete ИМЕ АДРЕС"
 
-#: builtin/remote.c:34
 msgid "git remote add [<options>] <name> <url>"
 msgstr "git remote add [ОПЦИЯ…] ИМЕ АДРЕС"
 
-#: builtin/remote.c:54
 msgid "git remote set-branches <name> <branch>..."
 msgstr "git remote set-branches ИМЕ КЛОН…"
 
-#: builtin/remote.c:55
 msgid "git remote set-branches --add <name> <branch>..."
 msgstr "git remote set-branches --add ИМЕ КЛОН…"
 
-#: builtin/remote.c:60
 msgid "git remote show [<options>] <name>"
 msgstr "git remote show [ОПЦИЯ…] ИМЕ"
 
-#: builtin/remote.c:65
 msgid "git remote prune [<options>] <name>"
 msgstr "git remote prune [ОПЦИЯ…] ИМЕ"
 
-#: builtin/remote.c:70
 msgid "git remote update [<options>] [<group> | <remote>]..."
 msgstr "git remote update [ОПЦИЯ…] [ГРУПА | ОТДАЛЕЧЕНО_ХРАНИЛИЩЕ…]"
 
-#: builtin/remote.c:99
 #, c-format
 msgid "Updating %s"
 msgstr "Обновяване на „%s“"
 
-#: builtin/remote.c:101
 #, c-format
 msgid "Could not fetch %s"
 msgstr "„%s“ не може да се достави"
 
-#: builtin/remote.c:131
 msgid ""
 "--mirror is dangerous and deprecated; please\n"
 "\t use --mirror=fetch or --mirror=push instead"
@@ -21364,81 +10766,72 @@ msgstr ""
 "Използването само на „--mirror“ е опасно.  Вместо това\n"
 "ползвайте „--mirror=fetch“ или „--mirror=push“"
 
-#: builtin/remote.c:148
 #, c-format
 msgid "unknown mirror argument: %s"
 msgstr "неправилна стойност за „--mirror“: %s"
 
-#: builtin/remote.c:164
 msgid "fetch the remote branches"
 msgstr "отдалечените клони не може да бъдат доставени"
 
-#: builtin/remote.c:166
 msgid "import all tags and associated objects when fetching"
 msgstr "внасяне на всички етикети и принадлежащите им обекти при доставяне"
 
-#: builtin/remote.c:169
 msgid "or do not fetch any tag at all (--no-tags)"
 msgstr "може и да не се доставят никакви етикети (чрез опцията „--no-tags“)"
 
-#: builtin/remote.c:171
 msgid "branch(es) to track"
 msgstr "клон/и за следене"
 
-#: builtin/remote.c:172
 msgid "master branch"
 msgstr "основен клон"
 
-#: builtin/remote.c:174
 msgid "set up remote as a mirror to push to or fetch from"
 msgstr ""
 "настройване на отдалечено хранилище, от което да се издърпва или доставя"
 
-#: builtin/remote.c:186
 msgid "specifying a master branch makes no sense with --mirror"
 msgstr ""
 "няма смисъл да се указва основен клон при използване на опцията „--mirror“"
 
-#: builtin/remote.c:188
 msgid "specifying branches to track makes sense only with fetch mirrors"
 msgstr ""
 "указването на следени клони е смислено само за отдалечени хранилища, от "
 "които се доставя"
 
-#: builtin/remote.c:195 builtin/remote.c:705
 #, c-format
 msgid "remote %s already exists."
 msgstr "вече съществува отдалечено хранилище с име „%s“."
 
-#: builtin/remote.c:240
 #, c-format
 msgid "Could not setup master '%s'"
 msgstr "Основният клон „%s“ не може да бъде настроен"
 
-#: builtin/remote.c:322
+#, c-format
+msgid "more than one %s"
+msgstr "стойността „%s“ се повтаря в настройките"
+
 #, 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:460 builtin/remote.c:468
 msgid "(matching)"
 msgstr "(съвпадащи)"
 
-#: builtin/remote.c:472
 msgid "(delete)"
 msgstr "(за изтриване)"
 
-#: builtin/remote.c:660
 #, c-format
 msgid "could not set '%s'"
 msgstr "„%s“ не може да се зададе"
 
-#: builtin/remote.c:665
+#, c-format
+msgid "could not unset '%s'"
+msgstr "„%s“ не може да се премахне"
+
 #, c-format
 msgid ""
 "The %s configuration remote.pushDefault in:\n"
@@ -21449,17 +10842,14 @@ msgstr ""
 "    %s:%d\n"
 "използва отдалечено хранилище, което вече не съществува: „%s“"
 
-#: builtin/remote.c:696 builtin/remote.c:841 builtin/remote.c:948
 #, c-format
 msgid "No such remote: '%s'"
 msgstr "Няма отдалечено хранилище на име „%s“"
 
-#: builtin/remote.c:715
 #, c-format
 msgid "Could not rename config section '%s' to '%s'"
 msgstr "Разделът „%s“ в настройките не може да бъде преименуван на „%s“"
 
-#: builtin/remote.c:735
 #, c-format
 msgid ""
 "Not updating non-default fetch refspec\n"
@@ -21470,17 +10860,17 @@ msgstr ""
 "    %s\n"
 "  Променете настройките ръчно, ако е необходимо."
 
-#: builtin/remote.c:775
+msgid "Renaming remote references"
+msgstr "Преименуване на отдалечените указатели"
+
 #, c-format
 msgid "deleting '%s' failed"
 msgstr "неуспешно изтриване на „%s“"
 
-#: builtin/remote.c:809
 #, c-format
 msgid "creating '%s' failed"
 msgstr "неуспешно създаване на „%s“"
 
-#: builtin/remote.c:887
 msgid ""
 "Note: A branch outside the refs/remotes/ hierarchy was not removed;\n"
 "to delete it, use:"
@@ -21494,121 +10884,96 @@ msgstr[1] ""
 "Бележка: Няколко клона извън йерархията „refs/remotes/“ не бяха изтрити.\n"
 "Изтрийте ги чрез командата:"
 
-#: builtin/remote.c:901
 #, c-format
 msgid "Could not remove config section '%s'"
 msgstr "Разделът „%s“ в настройките не може да бъде изтрит"
 
-#: builtin/remote.c:1009
 #, c-format
 msgid " new (next fetch will store in remotes/%s)"
 msgstr " нов (следващото доставяне ще го разположи в „remotes/%s“)"
 
-#: builtin/remote.c:1012
 msgid " tracked"
 msgstr " следен"
 
-#: builtin/remote.c:1014
 msgid " stale (use 'git remote prune' to remove)"
 msgstr " стар (изтрийте чрез „git remote prune“)"
 
-#: builtin/remote.c:1016
 msgid " ???"
 msgstr " неясно състояние"
 
 # CHECK
-#: builtin/remote.c:1057
 #, c-format
 msgid "invalid branch.%s.merge; cannot rebase onto > 1 branch"
 msgstr ""
 "неправилен клон за сливане „branch.%s.merge“.  Невъзможно е да пребазирате "
 "върху повече от 1 клон"
 
-#: builtin/remote.c:1066
 #, c-format
 msgid "rebases interactively onto remote %s"
 msgstr "интерактивно пребазиране върху отдалечения клон „%s“"
 
-#: builtin/remote.c:1068
 #, c-format
 msgid "rebases interactively (with merges) onto remote %s"
 msgstr "интерактивно пребазиране (със сливания) върху отдалечения клон „%s“"
 
-#: builtin/remote.c:1071
 #, c-format
 msgid "rebases onto remote %s"
 msgstr "пребазиране върху отдалечения клон „%s“"
 
-#: builtin/remote.c:1075
 #, c-format
 msgid " merges with remote %s"
 msgstr " сливане с отдалечения клон „%s“"
 
-#: builtin/remote.c:1078
 #, c-format
 msgid "merges with remote %s"
 msgstr "сливане с отдалечения клон „%s“"
 
-#: builtin/remote.c:1081
 #, c-format
 msgid "%-*s    and with remote %s\n"
 msgstr "%-*s    и с отдалечения клон „%s“\n"
 
-#: builtin/remote.c:1124
 msgid "create"
 msgstr "създаден"
 
-#: builtin/remote.c:1127
 msgid "delete"
 msgstr "изтрит"
 
-#: builtin/remote.c:1131
 msgid "up to date"
 msgstr "актуален"
 
-#: builtin/remote.c:1134
 msgid "fast-forwardable"
 msgstr "може да се превърти"
 
-#: builtin/remote.c:1137
 msgid "local out of date"
 msgstr "локалният е изостанал"
 
-#: builtin/remote.c:1144
 #, c-format
 msgid "    %-*s forces to %-*s (%s)"
 msgstr "    %-*s принудително изтласква към %-*s (%s)"
 
-#: builtin/remote.c:1147
 #, c-format
 msgid "    %-*s pushes to %-*s (%s)"
 msgstr "    %-*s изтласква към %-*s (%s)"
 
-#: builtin/remote.c:1151
 #, c-format
 msgid "    %-*s forces to %s"
 msgstr "    %-*s принудително изтласква към %s"
 
-#: builtin/remote.c:1154
 #, c-format
 msgid "    %-*s pushes to %s"
 msgstr "    %-*s изтласква към %s"
 
-#: builtin/remote.c:1222
 msgid "do not query remotes"
 msgstr "без заявки към отдалечените хранилища"
 
-#: builtin/remote.c:1243
 #, c-format
 msgid "* remote %s"
 msgstr "● отдалечено хранилище „%s“"
 
-#: builtin/remote.c:1244
 #, c-format
 msgid "  Fetch URL: %s"
 msgstr "  Адрес за доставяне: %s"
 
-#: builtin/remote.c:1245 builtin/remote.c:1261 builtin/remote.c:1398
 msgid "(no URL)"
 msgstr "(без адрес)"
 
@@ -21616,25 +10981,20 @@ msgstr "(без адрес)"
 #. with the one in " Fetch URL: %s"
 #. translation.
 #.
-#: builtin/remote.c:1259 builtin/remote.c:1261
 #, c-format
 msgid "  Push  URL: %s"
 msgstr "  Адрес за изтласкване: %s"
 
-#: builtin/remote.c:1263 builtin/remote.c:1265 builtin/remote.c:1267
 #, c-format
 msgid "  HEAD branch: %s"
 msgstr "  клон сочен от HEAD: %s"
 
-#: builtin/remote.c:1263
 msgid "(not queried)"
 msgstr "(без проверка)"
 
-#: builtin/remote.c:1265
 msgid "(unknown)"
 msgstr "(непознат)"
 
-#: builtin/remote.c:1269
 #, c-format
 msgid ""
 "  HEAD branch (remote HEAD is ambiguous, may be one of the following):\n"
@@ -21643,355 +11003,289 @@ msgstr ""
 "хранилище\n"
 "  не е еднозначен и е някой от следните):\n"
 
-#: builtin/remote.c:1281
 #, c-format
 msgid "  Remote branch:%s"
 msgid_plural "  Remote branches:%s"
 msgstr[0] "  Отдалечен клон:%s"
 msgstr[1] "  Отдалечени клони:%s"
 
-#: builtin/remote.c:1284 builtin/remote.c:1310
 msgid " (status not queried)"
 msgstr " (състоянието не бе проверено)"
 
-#: 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:1301
 msgid "  Local refs will be mirrored by 'git push'"
 msgstr "  Локалните указатели ще бъдат пренесени чрез „ push“"
 
-#: 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:1328
 msgid "set refs/remotes/<name>/HEAD according to remote"
 msgstr "задаване на refs/remotes/ИМЕ/HEAD според отдалеченото хранилище"
 
-#: builtin/remote.c:1330
 msgid "delete refs/remotes/<name>/HEAD"
 msgstr "изтриване на refs/remotes/ИМЕ/HEAD"
 
-#: builtin/remote.c:1344
 msgid "Cannot determine remote HEAD"
 msgstr "Не може да се установи отдалеченият връх"
 
-#: builtin/remote.c:1346
 msgid "Multiple remote HEAD branches. Please choose one explicitly with:"
 msgstr ""
 "Множество клони с върхове.  Изберете изрично някой от тях чрез командата:"
 
-#: builtin/remote.c:1356
 #, c-format
 msgid "Could not delete %s"
 msgstr "„%s“ не може да бъде изтрит"
 
-#: builtin/remote.c:1364
 #, c-format
 msgid "Not a valid ref: %s"
 msgstr "Неправилен указател: %s"
 
-#: builtin/remote.c:1366
 #, c-format
 msgid "Could not setup %s"
 msgstr "„%s“ не може да се настрои"
 
-#: builtin/remote.c:1384
 #, c-format
 msgid " %s will become dangling!"
 msgstr "„%s“ ще се превърне в обект извън клоните!"
 
-#: builtin/remote.c:1385
 #, c-format
 msgid " %s has become dangling!"
 msgstr "„%s“ се превърна в обект извън клоните!"
 
-#: builtin/remote.c:1394
 #, c-format
 msgid "Pruning %s"
 msgstr "Окастряне на „%s“"
 
-#: builtin/remote.c:1395
 #, c-format
 msgid "URL: %s"
 msgstr "адрес: %s"
 
-#: builtin/remote.c:1411
 #, c-format
 msgid " * [would prune] %s"
 msgstr " ● [ще бъде окастрено] %s"
 
-#: builtin/remote.c:1414
 #, c-format
 msgid " * [pruned] %s"
 msgstr " ● [окастрено] %s"
 
-#: builtin/remote.c:1459
 msgid "prune remotes after fetching"
 msgstr "окастряне на огледалата на отдалечените хранилища след доставяне"
 
-#: builtin/remote.c:1523 builtin/remote.c:1579 builtin/remote.c:1649
 #, c-format
 msgid "No such remote '%s'"
 msgstr "Няма отдалечено хранилище на име „%s“"
 
-#: builtin/remote.c:1541
 msgid "add branch"
 msgstr "добавяне на клон"
 
-#: builtin/remote.c:1548
 msgid "no remote specified"
 msgstr "не е указано отдалечено хранилище"
 
-#: builtin/remote.c:1565
 msgid "query push URLs rather than fetch URLs"
 msgstr "запитване към адресите за изтласкване, а не за доставяне"
 
-#: builtin/remote.c:1567
 msgid "return all URLs"
 msgstr "извеждане на всички адреси"
 
-#: builtin/remote.c:1597
 #, c-format
 msgid "no URLs configured for remote '%s'"
 msgstr "не е зададен адрес за отдалеченото хранилище „%s“"
 
-#: builtin/remote.c:1623
 msgid "manipulate push URLs"
 msgstr "промяна на адресите за изтласкване"
 
-#: builtin/remote.c:1625
 msgid "add URL"
 msgstr "добавяне на адреси"
 
-#: builtin/remote.c:1627
 msgid "delete URLs"
 msgstr "изтриване на адреси"
 
-#: builtin/remote.c:1634
 msgid "--add --delete doesn't make sense"
 msgstr "опциите „--add“ и „--delete“ са несъвместими"
 
-#: builtin/remote.c:1675
 #, c-format
 msgid "Invalid old URL pattern: %s"
 msgstr "Неправилен (стар) формат за адрес: %s"
 
-#: builtin/remote.c:1683
 #, c-format
 msgid "No such URL found: %s"
 msgstr "Такъв адрес не е открит: %s"
 
-#: builtin/remote.c:1685
 msgid "Will not delete all non-push URLs"
 msgstr "Никой от адресите, които не са за изтласкване, няма да се изтрие"
 
-#: 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:33
 msgid ""
 "Incremental repacks are incompatible with bitmap indexes.  Use\n"
-"--no-write-bitmap-index or disable the pack.writebitmaps configuration."
+"--no-write-bitmap-index or disable the pack.writeBitmaps configuration."
 msgstr ""
 "Постепенното препакетиране е несъвместимо с индекси на база битови маски.\n"
-"Ползвайте опцията --no-write-bitmap-index или изключете настройката\n"
-"„pack.writebitmaps“."
+"Ползвайте опцията „--no-write-bitmap-index“ или изключете настройката\n"
+"„pack.writeBitmaps“."
 
-#: builtin/repack.c:201
 msgid "could not start pack-objects to repack promisor objects"
 msgstr ""
 "командата „pack-objects“ не може да се стартира за препакетирането на "
 "гарантиращите обекти"
 
-#: builtin/repack.c:275 builtin/repack.c:820
 msgid "repack: Expecting full hex object ID lines only from pack-objects."
 msgstr ""
 "repack: от „pack-objects“ се изискват редове само с пълни шестнайсетични "
 "указатели."
 
-#: builtin/repack.c:299
 msgid "could not finish pack-objects to repack promisor objects"
 msgstr ""
 "командата „pack-objects“ не може да завърши за препакетирането на "
 "гарантиращите обекти"
 
-#: builtin/repack.c:314
 #, c-format
 msgid "cannot open index for %s"
 msgstr "грешка при отваряне на индекса за „%s“"
 
-#: builtin/repack.c:373
 #, c-format
 msgid "pack %s too large to consider in geometric progression"
 msgstr "пакет „%s“ е твърде голям, за да е част от геометрична прогресия"
 
-#: builtin/repack.c:406 builtin/repack.c:413 builtin/repack.c:418
 #, c-format
 msgid "pack %s too large to roll up"
 msgstr "пакет „%s“ е твърде голям за свиване"
 
-#: builtin/repack.c:498
 #, c-format
 msgid "could not open tempfile %s for writing"
 msgstr "временният файл „%s“ не може да бъде отворен за запис"
 
-#: builtin/repack.c:516
 msgid "could not close refs snapshot tempfile"
 msgstr "временният файл със снимка на указателите не може да се затвори"
 
-#: builtin/repack.c:630
 msgid "pack everything in a single pack"
 msgstr "пакетиране на всичко в пакет"
 
-#: builtin/repack.c:632
 msgid "same as -a, and turn unreachable objects loose"
 msgstr ""
 "същото като опцията „-a“.  Допълнително — недостижимите обекти да станат "
 "непакетирани"
 
-#: builtin/repack.c:635
+msgid "same as -a, pack unreachable cruft objects separately"
+msgstr ""
+"същото като опцията „-a“.  Недостижимите излишни обекти да се пакетират "
+"отделно"
+
+msgid "approxidate"
+msgstr "евристична дата"
+
+msgid "with -C, expire objects older than this"
+msgstr ""
+"с опцията „-C“: обявяване на обектите по-стари от това ВРЕМЕ за остарели"
+
 msgid "remove redundant packs, and run git-prune-packed"
 msgstr ""
 "премахване на ненужните пакетирани файлове и изпълнение на командата „git-"
 "prune-packed“"
 
-#: builtin/repack.c:637
 msgid "pass --no-reuse-delta to git-pack-objects"
 msgstr "подаване на опцията „--no-reuse-delta“ на командата „git-pack-objects“"
 
-#: builtin/repack.c:639
 msgid "pass --no-reuse-object to git-pack-objects"
 msgstr ""
 "подаване на опцията „--no-reuse-object“ на командата „git-pack-objects“"
 
-#: builtin/repack.c:641
 msgid "do not run git-update-server-info"
 msgstr "без изпълнение на командата „git-update-server-info“"
 
-#: builtin/repack.c:644
 msgid "pass --local to git-pack-objects"
 msgstr "подаване на опцията „--local“ на командата „git-pack-objects“"
 
-#: builtin/repack.c:646
 msgid "write bitmap index"
 msgstr "създаване и записване на индекси на база битови маски"
 
-#: builtin/repack.c:648
 msgid "pass --delta-islands to git-pack-objects"
 msgstr "подаване на опцията „--delta-islands“ на командата „git-pack-objects“"
 
-#: builtin/repack.c:649
-msgid "approxidate"
-msgstr "евристична дата"
-
-#: builtin/repack.c:650
 msgid "with -A, do not loosen objects older than this"
 msgstr ""
 "при комбинирането с опцията „-A“ — без разпакетиране на обектите по стари от "
 "това"
 
-#: builtin/repack.c:652
 msgid "with -a, repack unreachable objects"
 msgstr "с „-a“ — препакетиране на недостижимите обекти"
 
-#: builtin/repack.c:654
 msgid "size of the window used for delta compression"
 msgstr "размер на прозореца за делта компресията"
 
-#: builtin/repack.c:655 builtin/repack.c:661
 msgid "bytes"
 msgstr "байтове"
 
-#: builtin/repack.c:656
 msgid "same as the above, but limit memory size instead of entries count"
 msgstr ""
 "същото като горната опция, но ограничението да е по размер на паметта, а не "
 "по броя на обектите"
 
-#: builtin/repack.c:658
 msgid "limits the maximum delta depth"
 msgstr "ограничаване на максималната дълбочина на делтата"
 
-#: builtin/repack.c:660
 msgid "limits the maximum number of threads"
 msgstr "ограничаване на максималния брой нишки"
 
-#: builtin/repack.c:662
 msgid "maximum size of each packfile"
 msgstr "максимален размер на всеки пакет"
 
-#: builtin/repack.c:664
 msgid "repack objects in packs marked with .keep"
 msgstr "препакетиране на обектите в пакети белязани с „.keep“"
 
-#: builtin/repack.c:666
 msgid "do not repack this pack"
 msgstr "без препакетиране на този пакет"
 
-#: builtin/repack.c:668
 msgid "find a geometric progression with factor <N>"
 msgstr "откриване на геометрична прогресия с частно <N>"
 
-#: builtin/repack.c:670
 msgid "write a multi-pack index of the resulting packs"
 msgstr "запазване на многопакетен индекс за създадените пакети"
 
-#: builtin/repack.c:680
 msgid "cannot delete packs in a precious-objects repo"
 msgstr "пакетите в хранилище с важни обекти не може да се трият"
 
-#: builtin/repack.c:829
 msgid "Nothing new to pack."
 msgstr "Нищо ново за пакетиране"
 
-#: builtin/repack.c:859
+#, c-format
+msgid "pack prefix %s does not begin with objdir %s"
+msgstr "името на пакетния файл „%s“ не започва с директорията за обекти с „%s“"
+
 #, c-format
 msgid "missing required file: %s"
 msgstr "липсва задължителния файл „%s“"
 
-#: builtin/repack.c:861
 #, c-format
 msgid "could not unlink: %s"
 msgstr "неуспешно изтриване на „%s“"
 
-#: builtin/replace.c:22
 msgid "git replace [-f] <object> <replacement>"
 msgstr "git replace [-f] ОБЕКТ ЗАМЯНА"
 
-#: builtin/replace.c:23
 msgid "git replace [-f] --edit <object>"
 msgstr "git replace [-f] --edit ОБЕКТ"
 
-#: builtin/replace.c:24
 msgid "git replace [-f] --graft <commit> [<parent>...]"
 msgstr "git replace [-f] --graft ПОДАВАНЕ [РОДИТЕЛ…]"
 
-#: builtin/replace.c:25
-msgid "git replace [-f] --convert-graft-file"
-msgstr "git replace [-f] --convert-graft-file"
-
-#: builtin/replace.c:26
 msgid "git replace -d <object>..."
 msgstr "git replace -d ОБЕКТ…"
 
-#: builtin/replace.c:27
 msgid "git replace [--format=<format>] [-l [<pattern>]]"
 msgstr "git replace [--format=ФОРМАТ] [-l [ШАБЛОН]]"
 
-#: builtin/replace.c:90
 #, c-format
 msgid ""
 "invalid replace format '%s'\n"
@@ -22000,27 +11294,22 @@ msgstr ""
 "неправилен формат са заместване: „%s“\n"
 "възможните формати са „short“ (кратък), „medium“ (среден) и „long“ (дълъг)"
 
-#: builtin/replace.c:125
 #, c-format
 msgid "replace ref '%s' not found"
 msgstr "указателят за замяна „%s“ не може да бъде открит"
 
-#: builtin/replace.c:141
 #, c-format
 msgid "Deleted replace ref '%s'"
 msgstr "Указателят за замяна е изтрит: „%s“"
 
-#: builtin/replace.c:153
 #, c-format
 msgid "'%s' is not a valid ref name"
 msgstr "„%s“ е неправилно име за указател за замяна"
 
-#: builtin/replace.c:158
 #, c-format
 msgid "replace ref '%s' already exists"
 msgstr "указателят за замяна „%s“ вече съществува"
 
-#: builtin/replace.c:178
 #, c-format
 msgid ""
 "Objects must be of the same type.\n"
@@ -22031,75 +11320,59 @@ msgstr ""
 "„%s“ сочи към заменен обект „%s“,\n"
 "а „%s“ сочи към заместващ обект от вид „%s“."
 
-#: builtin/replace.c:229
 #, c-format
 msgid "unable to open %s for writing"
 msgstr "„%s“ не може да бъде отворен за запис"
 
-#: builtin/replace.c:242
 msgid "cat-file reported failure"
 msgstr "изпълнението на „cat-file“ завърши с грешка"
 
-#: builtin/replace.c:258
 #, c-format
 msgid "unable to open %s for reading"
 msgstr "„%s“ не може да бъде отворен за четене"
 
-#: builtin/replace.c:271
 msgid "unable to spawn mktree"
 msgstr "не може да се създаде процес за „mktree“"
 
-#: builtin/replace.c:275
 msgid "unable to read from mktree"
 msgstr "не може да се прочете от „mktree“"
 
-#: builtin/replace.c:284
 msgid "mktree reported failure"
 msgstr "„mktree“ завърши с грешка"
 
-#: builtin/replace.c:288
 msgid "mktree did not return an object name"
 msgstr "„mktree“ не върна име на обект"
 
-#: builtin/replace.c:297
 #, c-format
 msgid "unable to fstat %s"
 msgstr "„fstat“ не може да се изпълни върху „%s“"
 
-#: builtin/replace.c:302
 msgid "unable to write object to database"
 msgstr "обектът не може да бъде записан в базата от данни"
 
-#: builtin/replace.c:325
 #, c-format
 msgid "unable to get object type for %s"
 msgstr "не може да се определи видът на обекта „%s“"
 
-#: builtin/replace.c:341
 msgid "editing object file failed"
 msgstr "неуспешно редактиране на файла с обектите"
 
-#: builtin/replace.c:350
 #, c-format
 msgid "new object is the same as the old one: '%s'"
 msgstr "новият и старият обект са един и същ: „%s“"
 
-#: builtin/replace.c:383
 #, c-format
 msgid "could not parse %s as a commit"
 msgstr "„%s“ не може да се анализира като подаване"
 
-#: builtin/replace.c:415
 #, c-format
 msgid "bad mergetag in commit '%s'"
 msgstr "етикетът при сливане в подаването „%s“ e неправилен"
 
-#: builtin/replace.c:417
 #, c-format
 msgid "malformed mergetag in commit '%s'"
 msgstr "етикетът при сливане в подаването „%s“ e неправилен"
 
-#: builtin/replace.c:429
 #, c-format
 msgid ""
 "original commit '%s' contains mergetag '%s' that is discarded; use --edit "
@@ -22108,31 +11381,25 @@ msgstr ""
 "Първоначалното подаване „%s“ съдържа етикета при сливане „%s“, който е "
 "изхвърлен, затова използвайте опцията „--edit“, а не „--graft“."
 
-#: builtin/replace.c:468
 #, c-format
 msgid "the original commit '%s' has a gpg signature"
 msgstr "първоначалното подаване „%s“ е с подпис на GPG"
 
-#: builtin/replace.c:469
 msgid "the signature will be removed in the replacement commit!"
 msgstr "Подписът ще бъде премахнат в заменящото подаване!"
 
-#: builtin/replace.c:479
 #, c-format
 msgid "could not write replacement commit for: '%s'"
 msgstr "заменящото подаване за „%s“ не може да бъде записано"
 
-#: builtin/replace.c:487
 #, c-format
 msgid "graft for '%s' unnecessary"
 msgstr "присадката за „%s“ е излишна"
 
-#: builtin/replace.c:491
 #, c-format
 msgid "new commit is the same as the old one: '%s'"
 msgstr "новото и старото подаване са едно и също: „%s“"
 
-#: builtin/replace.c:526
 #, c-format
 msgid ""
 "could not convert the following graft(s):\n"
@@ -22141,275 +11408,213 @@ msgstr ""
 "следните присадки не може да се преобразуват:\n"
 "%s"
 
-#: builtin/replace.c:547
 msgid "list replace refs"
 msgstr "извеждане на списъка с указателите за замяна"
 
-#: builtin/replace.c:548
 msgid "delete replace refs"
 msgstr "изтриване на указателите за замяна"
 
-#: builtin/replace.c:549
 msgid "edit existing object"
 msgstr "редактиране на съществуващ обект"
 
-#: builtin/replace.c:550
 msgid "change a commit's parents"
 msgstr "смяна на родителите на подаване"
 
-#: builtin/replace.c:551
 msgid "convert existing graft file"
 msgstr "преобразуване на файла за присадките"
 
-#: builtin/replace.c:552
 msgid "replace the ref if it exists"
 msgstr "замяна на указателя, ако съществува"
 
-#: builtin/replace.c:554
 msgid "do not pretty-print contents for --edit"
 msgstr "без форматирано извеждане на съдържанието — за опцията „--edit“"
 
-#: builtin/replace.c:555
 msgid "use this format"
 msgstr "използване на този ФОРМАТ"
 
-#: builtin/replace.c:568
 msgid "--format cannot be used when not listing"
 msgstr "опцията „--format“ изисква извеждане на списък"
 
-#: builtin/replace.c:576
 msgid "-f only makes sense when writing a replacement"
 msgstr "опцията „-f“ изисква запазването на заместител"
 
-#: builtin/replace.c:580
 msgid "--raw only makes sense with --edit"
 msgstr "опцията „--raw“ изисква „--edit“"
 
-#: builtin/replace.c:586
 msgid "-d needs at least one argument"
 msgstr "опцията „-d“ изисква поне един аргумент"
 
-#: builtin/replace.c:592
 msgid "bad number of arguments"
 msgstr "неправилен брой аргументи"
 
-#: builtin/replace.c:598
 msgid "-e needs exactly one argument"
 msgstr "опцията „-e“ изисква поне един аргумент"
 
-#: builtin/replace.c:604
 msgid "-g needs at least one argument"
 msgstr "опцията „-g“ изисква поне един аргумент"
 
-#: builtin/replace.c:610
 msgid "--convert-graft-file takes no argument"
 msgstr "опцията „--convert-graft-file“ не приема аргументи"
 
-#: builtin/replace.c:616
 msgid "only one pattern can be given with -l"
 msgstr "опцията „-l“ приема точно един шаблон"
 
-#: builtin/rerere.c:13
 msgid "git rerere [clear | forget <path>... | status | remaining | diff | gc]"
 msgstr "git rerere [clear | forget ПЪТ… | status | remaining | diff | gc]"
 
-#: builtin/rerere.c:58
 msgid "register clean resolutions in index"
 msgstr "регистриране на чисти корекции на конфликти в индекса"
 
-#: builtin/rerere.c:77
 msgid "'git rerere forget' without paths is deprecated"
 msgstr "командата „git rerere forget“ изисква указването на път"
 
-#: builtin/rerere.c:111
 #, c-format
 msgid "unable to generate diff for '%s'"
 msgstr "неуспешно генериране на разлика за „%s“"
 
-#: builtin/reset.c:33
 msgid ""
 "git reset [--mixed | --soft | --hard | --merge | --keep] [-q] [<commit>]"
 msgstr ""
 "git reset [--mixed | --soft | --hard | --merge | --keep] [-q] [ПОДАВАНЕ]"
 
-#: builtin/reset.c:34
 msgid "git reset [-q] [<tree-ish>] [--] <pathspec>..."
 msgstr "git reset [-q] [УКАЗАТЕЛ_КЪМ_ДЪРВО] [--] ПЪТИЩА…"
 
-#: builtin/reset.c:35
 msgid ""
 "git reset [-q] [--pathspec-from-file [--pathspec-file-nul]] [<tree-ish>]"
 msgstr ""
 "git reset [-q] [--pathspec-from-file [--pathspec-file-nul]] "
 "[УКАЗАТЕЛ_КЪМ_ДЪРВО]"
 
-#: builtin/reset.c:36
 msgid "git reset --patch [<tree-ish>] [--] [<pathspec>...]"
 msgstr "git reset --patch [УКАЗАТЕЛ_КЪМ_ДЪРВО] [--] [ПЪТИЩА…]"
 
-#: builtin/reset.c:42
 msgid "mixed"
 msgstr "смесено (mixed)"
 
-#: builtin/reset.c:42
 msgid "soft"
 msgstr "меко (soft)"
 
-#: builtin/reset.c:42
 msgid "hard"
 msgstr "пълно (hard)"
 
-#: builtin/reset.c:42
 msgid "merge"
 msgstr "слято (merge)"
 
-#: builtin/reset.c:42
 msgid "keep"
 msgstr "запазващо (keep)"
 
-#: builtin/reset.c:90
 msgid "You do not have a valid HEAD."
 msgstr "Указателят „HEAD“ е повреден."
 
-#: builtin/reset.c:92
 msgid "Failed to find tree of HEAD."
 msgstr "Дървото, сочено от указателя „HEAD“, не може да бъде открито."
 
-#: builtin/reset.c:98
 #, c-format
 msgid "Failed to find tree of %s."
 msgstr "Дървото, сочено от „%s“, не може да бъде открито."
 
-#: builtin/reset.c:123
 #, c-format
 msgid "HEAD is now at %s"
 msgstr "Указателят „HEAD“ сочи към „%s“"
 
-#: builtin/reset.c:299
 #, c-format
 msgid "Cannot do a %s reset in the middle of a merge."
 msgstr "Не може да се извърши %s зануляване по време на сливане."
 
-#: builtin/reset.c:396 builtin/stash.c:606 builtin/stash.c:680
-#: builtin/stash.c:704
 msgid "be quiet, only report errors"
 msgstr "по-малко подробности, да се извеждат само грешките"
 
-#: builtin/reset.c:398
+msgid "skip refreshing the index after reset"
+msgstr "пропускане на обновяването на индекса след изчистване"
+
 msgid "reset HEAD and index"
 msgstr "индекса и указателя „HEAD“, без работното дърво"
 
-#: builtin/reset.c:399
 msgid "reset only HEAD"
 msgstr "само указателя „HEAD“, без индекса и работното дърво"
 
-#: builtin/reset.c:401 builtin/reset.c:403
 msgid "reset HEAD, index and working tree"
 msgstr "указателя „HEAD“, индекса и работното дърво"
 
-#: builtin/reset.c:405
 msgid "reset HEAD but keep local changes"
-msgstr "зануляване на указателя „HEAD“, но запазване на локалните промени"
+msgstr "зануляване на указателя „HEAD“, но запазване на локалните промѐни"
 
-#: builtin/reset.c:411
 msgid "record only the fact that removed paths will be added later"
 msgstr ""
 "отбелязване само на факта, че изтритите пътища ще бъдат добавени по-късно"
 
-#: builtin/reset.c:445
 #, c-format
 msgid "Failed to resolve '%s' as a valid revision."
 msgstr "Стойността „%s“ не е разпозната като съществуваща версия."
 
-#: builtin/reset.c:453
 #, c-format
 msgid "Failed to resolve '%s' as a valid tree."
 msgstr "„%s“ не е разпознат като дърво."
 
-#: builtin/reset.c:472
 msgid "--mixed with paths is deprecated; use 'git reset -- <paths>' instead."
 msgstr ""
 "опцията „--mixed“ не бива да се използва заедно с пътища.  Вместо това "
 "изпълнете „git reset -- ПЪТ…“."
 
-#: builtin/reset.c:474
 #, c-format
 msgid "Cannot do %s reset with paths."
 msgstr "Не може да извършите %s зануляване, когато сте задали ПЪТ."
 
-#: builtin/reset.c:489
 #, c-format
 msgid "%s reset is not allowed in a bare repository"
 msgstr "В голо хранилище не може да извършите %s зануляване"
 
-#: builtin/reset.c:520
 msgid "Unstaged changes after reset:"
-msgstr "Промени извън индекса след зануляването:"
+msgstr "Промѐни извън индекса след зануляването:"
 
-#: builtin/reset.c:523
 #, c-format
 msgid ""
-"\n"
-"It 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"
+"It took %.2f seconds to refresh the index after reset.  You can use\n"
+"'--no-refresh' to avoid this."
 msgstr ""
-"\n"
-"Изброяването на промените извън индекса след зануляване отне %.2f сек.\n"
-"Опцията „--quiet“ заглушава това съобщение еднократно.  За постоянно\n"
-"заглушаване задайте настройката „reset.quiet“ да е „true“ (истина).\n"
+"Обновяването на индекса след зануляване отне %.2f сек.\n"
+"За да избегнете това, ползвайте „--no-refresh“."
 
-#: builtin/reset.c:541
 #, c-format
 msgid "Could not reset index file to revision '%s'."
 msgstr "Индексът не може да бъде занулен към версия „%s“."
 
-#: builtin/reset.c:546
 msgid "Could not write new index file."
 msgstr "Новият индекс не може да бъде записан."
 
-#: builtin/rev-list.c:602
-msgid "object filtering requires --objects"
-msgstr "филтрирането на обекти изисква опцията „--objects“"
+#, c-format
+msgid "unable to get disk usage of %s"
+msgstr "използваното място за „%s“ не може да бъде получено"
 
-#: builtin/rev-list.c:674
 msgid "rev-list does not support display of notes"
 msgstr "командата „rev-list“ не поддържа извеждането на бележки"
 
-#: builtin/rev-list.c:679
 #, c-format
 msgid "marked counting and '%s' cannot be used together"
 msgstr "опцията „%s“ е несъвместима с изброяването"
 
-#: builtin/rev-parse.c:409
 msgid "git rev-parse --parseopt [<options>] -- [<args>...]"
 msgstr "git rev-parse --parseopt [ОПЦИЯ…] -- [АРГУМЕНТ…]"
 
-#: builtin/rev-parse.c:414
 msgid "keep the `--` passed as an arg"
 msgstr "зададеният низ „--“ да се тълкува като аргумент"
 
-#: builtin/rev-parse.c:416
 msgid "stop parsing after the first non-option argument"
 msgstr "спиране на анализа след първия аргумент, който не е опция"
 
-#: builtin/rev-parse.c:419
 msgid "output in stuck long form"
 msgstr "изход в дългия формат"
 
-#: builtin/rev-parse.c:438
 msgid "premature end of input"
 msgstr "неочакван край на входа"
 
-#: builtin/rev-parse.c:442
 msgid "no usage string given before the `--' separator"
 msgstr "липсва низ преди разделителя „--“"
 
-#: builtin/rev-parse.c:548
 msgid "Needed a single revision"
 msgstr "Изисква точно една версия"
 
-#: builtin/rev-parse.c:552
 msgid ""
 "git rev-parse --parseopt [<options>] -- [<args>...]\n"
 "   or: git rev-parse --sq-quote [<arg>...]\n"
@@ -22424,145 +11629,117 @@ msgstr ""
 "За повече информация за първия вариант изпълнете „git rev-parse --parseopt -"
 "h“"
 
-#: builtin/rev-parse.c:712
 msgid "--resolve-git-dir requires an argument"
 msgstr "опцията „--resolve-git-dir“ изисква аргумент"
 
-#: builtin/rev-parse.c:715
 #, c-format
 msgid "not a gitdir '%s'"
 msgstr "„%s“ не е директория „gitdir“"
 
-#: builtin/rev-parse.c:739
 msgid "--git-path requires an argument"
 msgstr "опцията „--git-path“ изисква аргумент"
 
-#: builtin/rev-parse.c:749
 msgid "-n requires an argument"
 msgstr "опцията „-n“ изисква аргумент"
 
-#: builtin/rev-parse.c:763
 msgid "--path-format requires an argument"
 msgstr "опцията „--path-format“ изисква аргумент"
 
-#: builtin/rev-parse.c:769
 #, c-format
 msgid "unknown argument to --path-format: %s"
 msgstr "неправилен аргумент за „--path-format“: „%s“"
 
-#: builtin/rev-parse.c:776
 msgid "--default requires an argument"
 msgstr "опцията „--default“ изисква аргумент"
 
-#: builtin/rev-parse.c:782
 msgid "--prefix requires an argument"
 msgstr "опцията „--prefix“ изисква аргумент"
 
-#: builtin/rev-parse.c:851
 #, c-format
 msgid "unknown mode for --abbrev-ref: %s"
 msgstr "непознат режим за „--abbrev-ref“: „%s“"
 
-#: builtin/rev-parse.c:1023
+msgid "this operation must be run in a work tree"
+msgstr "тази команда трябва да се изпълни в работно дърво"
+
 #, c-format
 msgid "unknown mode for --show-object-format: %s"
 msgstr "непознат режим за „--show-object-format“: „%s“"
 
-#: builtin/revert.c:24
 msgid "git revert [<options>] <commit-ish>..."
 msgstr "git revert [ОПЦИЯ…] УКАЗАТЕЛ_КЪМ_ПОДАВАНЕ…"
 
-#: builtin/revert.c:25
 msgid "git revert <subcommand>"
 msgstr "git revert ПОДКОМАНДА"
 
-#: builtin/revert.c:30
 msgid "git cherry-pick [<options>] <commit-ish>..."
 msgstr "git cherry-pick [ОПЦИЯ…] УКАЗАТЕЛ_КЪМ_ПОДАВАНЕ…"
 
-#: builtin/revert.c:31
 msgid "git cherry-pick <subcommand>"
 msgstr "git cherry-pick ПОДКОМАНДА"
 
-#: builtin/revert.c:72
 #, c-format
 msgid "option `%s' expects a number greater than zero"
 msgstr "опцията „%s“ очаква положително число за аргумент"
 
-#: builtin/revert.c:92
 #, c-format
 msgid "%s: %s cannot be used with %s"
 msgstr "%s: опцията „%s“ е несъвместима с „%s“"
 
-#: builtin/revert.c:102
 msgid "end revert or cherry-pick sequence"
 msgstr "завършване на поредица от отбирания или отмени на подавания"
 
-#: builtin/revert.c:103
 msgid "resume revert or cherry-pick sequence"
 msgstr "продължаване на поредица от отбирания или отмени на подавания"
 
-#: builtin/revert.c:104
 msgid "cancel revert or cherry-pick sequence"
 msgstr "отмяна на поредица от отбирания или отмени на подавания"
 
-#: builtin/revert.c:105
 msgid "skip current commit and continue"
 msgstr "прескачане на текущото подаване и продължаване"
 
-#: builtin/revert.c:107
 msgid "don't automatically commit"
 msgstr "без автоматично подаване"
 
-#: builtin/revert.c:108
 msgid "edit the commit message"
 msgstr "редактиране на съобщението при подаване"
 
-#: builtin/revert.c:111
 msgid "parent-number"
 msgstr "номер на родителя"
 
-#: builtin/revert.c:112
 msgid "select mainline parent"
 msgstr "избор на основния родител"
 
-#: builtin/revert.c:114
 msgid "merge strategy"
 msgstr "стратегия на сливане"
 
-#: builtin/revert.c:116
 msgid "option for merge strategy"
 msgstr "опция за стратегията на сливане"
 
-#: builtin/revert.c:125
 msgid "append commit name"
 msgstr "добавяне на името на подаването"
 
-#: builtin/revert.c:127
 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:241
+msgid "use the 'reference' format to refer to commits"
+msgstr "указване на подавания във формат за указател"
+
 msgid "revert failed"
 msgstr "неуспешна отмяна"
 
-#: builtin/revert.c:254
 msgid "cherry-pick failed"
 msgstr "неуспешно отбиране"
 
-#: builtin/rm.c:20
 msgid "git rm [<options>] [--] <file>..."
 msgstr "git rm [ОПЦИЯ…] [--] ФАЙЛ…"
 
-#: builtin/rm.c:208
 msgid ""
 "the following file has staged content different from both the\n"
 "file and the HEAD:"
@@ -22578,7 +11755,6 @@ msgstr[1] ""
 "съдържание и\n"
 "различно от съответстващото на HEAD:"
 
-#: builtin/rm.c:213
 msgid ""
 "\n"
 "(use -f to force removal)"
@@ -22586,13 +11762,11 @@ msgstr ""
 "\n"
 "(за принудително изтриване използвайте опцията „-f“)"
 
-#: 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] "следният файл е с променено съдържание в индекса:"
 msgstr[1] "следните файлове са с променено съдържание в индекса:"
 
-#: builtin/rm.c:221 builtin/rm.c:230
 msgid ""
 "\n"
 "(use --cached to keep the file, or -f to force removal)"
@@ -22601,55 +11775,44 @@ msgstr ""
 "(за запазване на файла използвайте опцията „--cached“, а за принудително\n"
 "изтриване — „-f“)"
 
-#: builtin/rm.c:227
 msgid "the following file has local modifications:"
 msgid_plural "the following files have local modifications:"
 msgstr[0] "следният файл е с променено съдържание"
 msgstr[1] "следните файлове са с променено съдържание"
 
-#: builtin/rm.c:245
 msgid "do not list removed files"
 msgstr "да не се извеждат изтритите файлове"
 
-#: builtin/rm.c:246
 msgid "only remove from the index"
 msgstr "изтриване само от индекса"
 
-#: builtin/rm.c:247
 msgid "override the up-to-date check"
 msgstr "въпреки проверката за актуалността на съдържанието"
 
-#: builtin/rm.c:248
 msgid "allow recursive removal"
 msgstr "рекурсивно изтриване"
 
-#: builtin/rm.c:250
 msgid "exit with a zero status even if nothing matched"
 msgstr ""
 "изходният код да е 0, дори ако никой файл нe e напаснал с шаблона за "
 "изтриване"
 
-#: builtin/rm.c:285
 msgid "No pathspec was given. Which files should I remove?"
 msgstr "Не са зададени пътища.  Кои файлове да се изтрият?"
 
-#: builtin/rm.c:315
 msgid "please stage your changes to .gitmodules or stash them to proceed"
 msgstr ""
-"за да продължите, или вкарайте промените по файла „.gitmodules“ в индекса,\n"
+"за да продължите, или вкарайте промѐните по файла „.gitmodules“ в индекса,\n"
 "или ги скатайте"
 
-#: builtin/rm.c:337
 #, c-format
 msgid "not removing '%s' recursively without -r"
 msgstr "без използването на опцията „-r“ „%s“ няма да се изтрие рекурсивно"
 
-#: 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 [--mirror] [--dry-run] [--force]\n"
 "              [--receive-pack=<git-receive-pack>]\n"
@@ -22661,80 +11824,61 @@ msgstr ""
 "              [--verbose] [--thin] [--atomic]\n"
 "              [ХОСТ:]ДИРЕКТОРИЯ (--all | УКАЗАТЕЛ…])"
 
-#: builtin/send-pack.c:192
 msgid "remote name"
 msgstr "име на отдалечено хранилище"
 
-#: builtin/send-pack.c:205
 msgid "use stateless RPC protocol"
 msgstr "използване на протокол без запазване на състоянието за RPC"
 
-#: builtin/send-pack.c:206
 msgid "read refs from stdin"
 msgstr "четене на указателите от стандартния вход"
 
-#: builtin/send-pack.c:207
 msgid "print status from remote helper"
 msgstr "извеждане на състоянието от отдалечената помощна функция"
 
-#: builtin/shortlog.c:16
 msgid "git shortlog [<options>] [<revision-range>] [[--] <path>...]"
 msgstr "git shortlog [ОПЦИЯ…] [ДИАПАЗОН_НА_ВЕРСИИТЕ] [[--] [ПЪТ…]]"
 
-#: builtin/shortlog.c:17
 msgid "git log --pretty=short | git shortlog [<options>]"
 msgstr "git log --pretty=short | git shortlog [ОПЦИЯ…]"
 
-#: builtin/shortlog.c:123
 msgid "using multiple --group options with stdin is not supported"
 msgstr "повече от една опции „--group“ са несъвместими със стандартния вход"
 
-#: builtin/shortlog.c:133
 msgid "using --group=trailer with stdin is not supported"
 msgstr "опцията „--group=trailer“ е несъвместима със стандартния вход"
 
-#: builtin/shortlog.c:323
 #, c-format
 msgid "unknown group type: %s"
 msgstr "неизвестен вид група: %s"
 
-#: builtin/shortlog.c:351
 msgid "group by committer rather than author"
 msgstr "групиране по подаващ, а не по автор"
 
-#: builtin/shortlog.c:354
 msgid "sort output according to the number of commits per author"
 msgstr "подредба на подаванията по броя подавания от автор"
 
-#: builtin/shortlog.c:356
 msgid "suppress commit descriptions, only provides commit count"
 msgstr "без описания на подаванията — да се показва само броя подавания"
 
-#: builtin/shortlog.c:358
 msgid "show the email address of each author"
 msgstr "извеждане на адреса на е-поща за всеки автор"
 
-#: builtin/shortlog.c:359
 msgid "<w>[,<i1>[,<i2>]]"
 msgstr "<ШИРОЧИНА>[,<ОТСТЪП_1>[,<ОТСТЪП_2>]]"
 
-#: builtin/shortlog.c:360
 msgid "linewrap output"
 msgstr "пренасяне на редовете"
 
-#: builtin/shortlog.c:362
 msgid "field"
 msgstr "поле"
 
-#: builtin/shortlog.c:363
 msgid "group by field"
 msgstr "групиране по поле"
 
-#: 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"
 "                [--current] [--color[=<when>] | --no-color] [--sparse]\n"
@@ -22746,134 +11890,105 @@ msgstr ""
 "                [--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>]"
 msgstr "git show-branch (-g | --reflog)[=БРОЙ[,БАЗА]] [--list] [УКАЗАТЕЛ]"
 
-#: builtin/show-branch.c:395
 #, c-format
 msgid "ignoring %s; cannot handle more than %d ref"
 msgid_plural "ignoring %s; cannot handle more than %d refs"
 msgstr[0] "„%s“ се прескача — не може да се обработят повече от %d указател"
 msgstr[1] "„%s“ се прескача — не може да се обработят повече от %d указатели"
 
-#: builtin/show-branch.c:547
 #, c-format
 msgid "no matching refs with %s"
 msgstr "никой указател не съвпада с „%s“"
 
-#: builtin/show-branch.c:644
 msgid "show remote-tracking and local branches"
 msgstr "извеждане на следящите и локалните клони"
 
-#: builtin/show-branch.c:646
 msgid "show remote-tracking branches"
 msgstr "извеждане на следящите клони"
 
-#: builtin/show-branch.c:648
 msgid "color '*!+-' corresponding to the branch"
 msgstr "оцветяване на „*!+-“ според клоните"
 
-#: builtin/show-branch.c:650
 msgid "show <n> more commits after the common ancestor"
 msgstr "извеждане на такъв БРОЙ подавания от общия предшественик"
 
-#: builtin/show-branch.c:652
 msgid "synonym to more=-1"
 msgstr "псевдоним на „more=-1“"
 
-#: builtin/show-branch.c:653
 msgid "suppress naming strings"
 msgstr "без низове за имената на клоните"
 
-#: builtin/show-branch.c:655
 msgid "include the current branch"
 msgstr "включване и на текущия клон"
 
-#: builtin/show-branch.c:657
 msgid "name commits with their object names"
 msgstr "именуване на подаванията с имената им на обекти"
 
-#: builtin/show-branch.c:659
 msgid "show possible merge bases"
 msgstr "извеждане на възможните бази за сливания"
 
-#: builtin/show-branch.c:661
 msgid "show refs unreachable from any other ref"
 msgstr "извеждане на недостижимите указатели"
 
-#: builtin/show-branch.c:663
 msgid "show commits in topological order"
 msgstr "извеждане на подаванията в топологическа подредба"
 
-#: builtin/show-branch.c:666
 msgid "show only commits not on the first branch"
 msgstr "извеждане само на подаванията, които не са от първия клон"
 
-#: builtin/show-branch.c:668
 msgid "show merges reachable from only one tip"
 msgstr "извеждане на сливанията, които може да се достигнат само от един връх"
 
-#: builtin/show-branch.c:670
 msgid "topologically sort, maintaining date order where possible"
 msgstr ""
 "топологическа подредба, при запазване на подредбата по дата, доколкото е\n"
 "възможно"
 
-#: builtin/show-branch.c:673
 msgid "<n>[,<base>]"
 msgstr "БРОЙ[,БАЗА]"
 
-#: builtin/show-branch.c:674
 msgid "show <n> most recent ref-log entries starting at base"
 msgstr "показване на най-много БРОЙ журнални записа с начало съответната БАЗА"
 
-#: builtin/show-branch.c:734
 msgid "no branches given, and HEAD is not valid"
 msgstr "не е зададен клон, а указателят „HEAD“ е неправилен"
 
-#: builtin/show-branch.c:737
 msgid "--reflog option needs one branch name"
 msgstr "опцията „--reflog“ изисква точно едно име на клон"
 
-#: 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:744
 #, c-format
 msgid "no such ref %s"
 msgstr "такъв указател няма: %s"
 
-#: builtin/show-branch.c:830
 #, 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:834
 #, c-format
 msgid "'%s' is not a valid ref."
 msgstr "„%s“ е неправилен указател."
 
-#: builtin/show-branch.c:837
 #, c-format
 msgid "cannot find commit %s (%s)"
 msgstr "подаването „%s“ (%s) липсва"
 
-#: builtin/show-index.c:21
 msgid "hash-algorithm"
 msgstr "алгоритъм"
 
-#: builtin/show-index.c:31
 msgid "Unknown hash algorithm"
 msgstr "Непознат алгоритъм за контролни суми"
 
-#: builtin/show-ref.c:12
 msgid ""
 "git show-ref [-q | --quiet] [--verify] [--head] [-d | --dereference] [-s | --"
 "hash[=<n>]] [--abbrev[=<n>]] [--tags] [--heads] [--] [<pattern>...]"
@@ -22881,64 +11996,47 @@ msgstr ""
 "git show-ref [-q | --quiet] [--verify] [--head] [-d | --dereference] [-s | --"
 "hash[=ЧИСЛО]] [--abbrev[=ЧИСЛО]] [--tags] [--heads] [--] [ШАБЛОН…]"
 
-#: builtin/show-ref.c:13
 msgid "git show-ref --exclude-existing[=<pattern>]"
 msgstr "git show-ref --exclude-existing[=ШАБЛОН]"
 
-#: builtin/show-ref.c:162
 msgid "only show tags (can be combined with heads)"
 msgstr "извеждане на етикетите (може да се комбинира с върховете)"
 
-#: builtin/show-ref.c:163
 msgid "only show heads (can be combined with tags)"
 msgstr "извеждане на върховете (може да се комбинира с етикетите)"
 
-#: builtin/show-ref.c:164
 msgid "stricter reference checking, requires exact ref path"
 msgstr "строга проверка на указателите, изисква се указател с пълен път"
 
-#: builtin/show-ref.c:167 builtin/show-ref.c:169
 msgid "show the HEAD reference, even if it would be filtered out"
 msgstr "задължително извеждане и на указателя HEAD"
 
-#: builtin/show-ref.c:171
 msgid "dereference tags into object IDs"
 msgstr "да се извеждат идентификаторите на обектите-етикети"
 
-#: builtin/show-ref.c:173
 msgid "only show SHA1 hash using <n> digits"
 msgstr "извеждане само на този БРОЙ цифри от всяка сума по SHA1"
 
-#: builtin/show-ref.c:177
 msgid "do not print results to stdout (useful with --verify)"
 msgstr ""
 "без извеждане на резултатите на стандартния изход (полезно с опцията „--"
 "verify“)"
 
-#: builtin/show-ref.c:179
 msgid "show refs from stdin that aren't in local repository"
 msgstr ""
 "извеждане на указателите приети от стандартния вход, които липсват в "
 "локалното хранилище"
 
-#: 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) ОПЦИЯ…"
 
-#: builtin/sparse-checkout.c:46
-msgid "git sparse-checkout list"
-msgstr "git sparse-checkout list"
-
-#: builtin/sparse-checkout.c:60
 msgid "this worktree is not sparse"
 msgstr "това работно дърво не е частично"
 
-#: builtin/sparse-checkout.c:75
 msgid "this worktree is not sparse (sparse-checkout file may not exist)"
 msgstr ""
 "това не е частично работно дърво (вероятно липсва файл „sparse-checkout“)"
 
-#: builtin/sparse-checkout.c:176
 #, c-format
 msgid ""
 "directory '%s' contains untracked files, but is not in the sparse-checkout "
@@ -22947,126 +12045,130 @@ msgstr ""
 "директорията „%s“ съдържа неследени файлове, но не е в пътищата на "
 "пътеводното напасване на частичното изтегляне"
 
-#: builtin/sparse-checkout.c:184
 #, c-format
 msgid "failed to remove directory '%s'"
 msgstr "директорията „%s“ не може да бъде изтрита"
 
-#: builtin/sparse-checkout.c:324
 msgid "failed to create directory for sparse-checkout file"
 msgstr "директорията за частично изтегляне „%s“ не може да бъде създадена"
 
-#: builtin/sparse-checkout.c:365
-msgid "unable to upgrade repository format to enable worktreeConfig"
-msgstr ""
-"настройката „worktreeConfig“ не може да се включи, защото форматът на "
-"хранилището не може да се обнови"
-
-#: builtin/sparse-checkout.c:367
-msgid "failed to set extensions.worktreeConfig setting"
-msgstr "неуспешно задаване на настройката „extensions.worktreeConfig“"
+msgid "failed to initialize worktree config"
+msgstr "настройките на работното дърво не може да се инициализират"
 
-#: builtin/sparse-checkout.c:411
 msgid "failed to modify sparse-index config"
 msgstr "настройките на частичния индекс не може да се променят"
 
-#: builtin/sparse-checkout.c:422
-msgid "git sparse-checkout init [--cone] [--[no-]sparse-index]"
-msgstr "git sparse-checkout init [--cone] [--[no-]sparse-index]"
-
-#: builtin/sparse-checkout.c:441 builtin/sparse-checkout.c:729
-#: builtin/sparse-checkout.c:778
 msgid "initialize the sparse-checkout in cone mode"
 msgstr "инициализиране на частичното изтегляне в пътеводен режим"
 
-#: builtin/sparse-checkout.c:443 builtin/sparse-checkout.c:731
-#: builtin/sparse-checkout.c:780
 msgid "toggle the use of a sparse index"
 msgstr "превключване на ползването на частичен индекс"
 
-#: builtin/sparse-checkout.c:476
+#, c-format
+msgid "unable to create leading directories of %s"
+msgstr "родителските директории на „%s“ не може да бъдат създадени"
+
 #, c-format
 msgid "failed to open '%s'"
 msgstr "„%s“ не може да се отвори"
 
-#: builtin/sparse-checkout.c:528
 #, c-format
 msgid "could not normalize path %s"
 msgstr "пътят „%s“  не може да се нормализира"
 
-#: builtin/sparse-checkout.c:557
 #, c-format
 msgid "unable to unquote C-style string '%s'"
 msgstr "цитирането на низ, форматиран за C — „%s“ не може да бъде изчистено"
 
-#: builtin/sparse-checkout.c:612 builtin/sparse-checkout.c:640
 msgid "unable to load existing sparse-checkout patterns"
 msgstr "шаблоните за частично изтегляне не може да се заредят"
 
-#: builtin/sparse-checkout.c:616
 msgid "existing sparse-checkout patterns do not use cone mode"
 msgstr ""
 "съществуващите шаблони за частично изтегляне не използват пътеводни сегменти"
 
-#: builtin/sparse-checkout.c:682
-msgid "git sparse-checkout add (--stdin | <patterns>)"
-msgstr "git sparse-checkout add (--stdin | ШАБЛОН…)"
+msgid "please run from the toplevel directory in non-cone mode"
+msgstr "изпълнете от най-горната директория в непътеводен режим"
+
+msgid "specify directories rather than patterns (no leading slash)"
+msgstr "указване на директории, а не на шаблони (без водещ знак „/“)"
+
+msgid ""
+"specify directories rather than patterns.  If your directory starts with a "
+"'!', pass --skip-checks"
+msgstr ""
+"указване на директории, а не на шаблони.  Ако някоя директория започва със "
+"знака „!“, добавете и опцията „--skip-checks“"
+
+msgid ""
+"specify directories rather than patterns.  If your directory really has any "
+"of '*?[]\\' in it, pass --skip-checks"
+msgstr ""
+"указване на директории, а не на шаблони.  Ако някоя директория съдържа някой "
+"от знаците „*?[]\\“, добавете и опцията „--skip-checks“"
+
+#, c-format
+msgid ""
+"'%s' is not a directory; to treat it as a directory anyway, rerun with --"
+"skip-checks"
+msgstr ""
+"„%s“ не е директория.  За да се обработи като такава, изпълнете командата "
+"наново като добавите и опцията „--skip-checks“"
+
+#, c-format
+msgid ""
+"pass a leading slash before paths such as '%s' if you want a single file "
+"(see NON-CONE PROBLEMS in the git-sparse-checkout manual)."
+msgstr ""
+"ако задавате единичен файл, добавете единичен, водещ знак „/“ преди път като "
+"„%s“ (за повече подробности вижте раздела „NON-CONE PROBLEMS“ в страницата в "
+"ръководството на командата „git-sparse-checkout“)."
+
+msgid "git sparse-checkout add [--skip-checks] (--stdin | <patterns>)"
+msgstr "git sparse-checkout add [--skip-checks] (--stdin | ШАБЛОН…)"
+
+msgid ""
+"skip some sanity checks on the given paths that might give false positives"
+msgstr ""
+"пропускане на някои проверки върху специфични пътища, които погрешно може да "
+"се маркират като неправилни"
 
-#: builtin/sparse-checkout.c:694 builtin/sparse-checkout.c:733
 msgid "read patterns from standard in"
 msgstr "изчитане на шаблоните от стандартния вход"
 
-#: builtin/sparse-checkout.c:699
 msgid "no sparse-checkout to add to"
 msgstr "няма частично изтегляне, към което да се добавя"
 
-#: builtin/sparse-checkout.c:712
 msgid ""
-"git sparse-checkout set [--[no-]cone] [--[no-]sparse-index] (--stdin | "
-"<patterns>)"
+"git sparse-checkout set [--[no-]cone] [--[no-]sparse-index] [--skip-checks] "
+"(--stdin | <patterns>)"
 msgstr ""
-"git sparse-checkout set [--[no-]cone] [--[no-]sparse-index] (--stdin | "
-"ШАБЛОН…)"
-
-#: builtin/sparse-checkout.c:765
-msgid "git sparse-checkout reapply [--[no-]cone] [--[no-]sparse-index]"
-msgstr "git sparse-checkout reapply [--[no-]cone] [--[no-]sparse-index]"
+"git sparse-checkout set [--[no-]cone] [--[no-]sparse-index] [--skip-checks] "
+"(--stdin | ШАБЛОН…)"
 
-#: builtin/sparse-checkout.c:785
 msgid "must be in a sparse-checkout to reapply sparsity patterns"
 msgstr ""
 "шаблоните за частичност може да бъдат приложени наново само в частично "
 "изтеглено хранилище"
 
-#: builtin/sparse-checkout.c:803
-msgid "git sparse-checkout disable"
-msgstr "git sparse-checkout disable"
-
-#: builtin/sparse-checkout.c:845
 msgid "error while refreshing working directory"
 msgstr "грешка при обновяване на работната директория"
 
-#: builtin/stash.c:24 builtin/stash.c:40
 msgid "git stash list [<options>]"
 msgstr "git stash list [ОПЦИЯ…]"
 
-#: builtin/stash.c:25 builtin/stash.c:45
 msgid "git stash show [<options>] [<stash>]"
 msgstr "git stash show [ОПЦИЯ…] [СКАТАНО]"
 
-#: builtin/stash.c:26 builtin/stash.c:50
 msgid "git stash drop [-q|--quiet] [<stash>]"
 msgstr "git stash drop [-q|--quiet] [СКАТАНО]"
 
-#: builtin/stash.c:27
 msgid "git stash ( pop | apply ) [--index] [-q|--quiet] [<stash>]"
 msgstr "git stash ( pop | apply ) [--index] [-q|--quiet] [СКАТАНО]"
 
-#: builtin/stash.c:28 builtin/stash.c:65
 msgid "git stash branch <branchname> [<stash>]"
 msgstr "git stash branch КЛОН [СКАТАНО]"
 
-#: builtin/stash.c:30
 msgid ""
 "git stash [push [-p|--patch] [-S|--staged] [-k|--[no-]keep-index] [-q|--"
 "quiet]\n"
@@ -23080,7 +12182,6 @@ msgstr ""
 "          [--pathspec-from-file=ФАЙЛ [--pathspec-file-nul]]\n"
 "          [--] [ПЪТ…]]"
 
-#: builtin/stash.c:34
 msgid ""
 "git stash save [-p|--patch] [-S|--staged] [-k|--[no-]keep-index] [-q|--"
 "quiet]\n"
@@ -23090,19 +12191,15 @@ msgstr ""
 "quiet]\n"
 "          [-u|--include-untracked] [-a|--all] [СЪОБЩЕНИЕ]"
 
-#: builtin/stash.c:55
 msgid "git stash pop [--index] [-q|--quiet] [<stash>]"
 msgstr "git stash pop [--index] [-q|--quiet] [СКАТАНО]"
 
-#: builtin/stash.c:60
 msgid "git stash apply [--index] [-q|--quiet] [<stash>]"
 msgstr "git stash apply [--index] [-q|--quiet] [СКАТАНО]"
 
-#: builtin/stash.c:75
 msgid "git stash store [-m|--message <message>] [-q|--quiet] <commit>"
 msgstr "git stash store [-m|--message СЪОБЩЕНИЕ] [-q|--quiet] ПОДАВАНЕ"
 
-#: 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"
@@ -23112,7 +12209,6 @@ msgstr ""
 "          [-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>]"
@@ -23120,30 +12216,24 @@ 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"
 msgstr "„%s“ не е подаване, приличащо на нещо скатано"
 
-#: builtin/stash.c:150
 #, c-format
 msgid "Too many revisions specified:%s"
 msgstr "Указани са прекалено много версии:%s"
 
-#: builtin/stash.c:164
 msgid "No stash entries found."
 msgstr "Не е открито нищо скатано."
 
-#: builtin/stash.c:178
 #, c-format
 msgid "%s is not a valid reference"
 msgstr "„%s“ е неправилно име за указател"
 
-#: builtin/stash.c:227
 msgid "git stash clear with arguments is unimplemented"
 msgstr "командата „git stash clear“ не поддържа аргументи"
 
-#: builtin/stash.c:447
 #, c-format
 msgid ""
 "WARNING: Untracked file in way of tracked file!  Renaming\n"
@@ -23154,225 +12244,153 @@ msgstr ""
 "            „%s“ на „%s“\n"
 "         за да се направи място.\n"
 
-#: builtin/stash.c:508
 msgid "cannot apply a stash in the middle of a merge"
 msgstr "по време на сливане не може да приложите нещо скатано"
 
-#: builtin/stash.c:519
 #, c-format
 msgid "could not generate diff %s^!."
 msgstr "файлът с разликите „%s^!“ не може да се генерира"
 
-#: builtin/stash.c:526
 msgid "conflicts in index. Try without --index."
 msgstr ""
 "в индекса има конфликти.  Пробвайте да изпълните командата без опцията „--"
 "index“."
 
-#: builtin/stash.c:532
 msgid "could not save index tree"
 msgstr "дървото сочено от индекса не може да бъде запазено"
 
-#: builtin/stash.c:552
 #, c-format
 msgid "Merging %s with %s"
 msgstr "Сливане на „%s“ с „%s“"
 
-#: builtin/stash.c:562
 msgid "Index was not unstashed."
 msgstr "Индексът не е изваден от скатаното."
 
-#: builtin/stash.c:576
 msgid "could not restore untracked files from stash"
 msgstr "неследени файлове не може да се възстановят от скатаното"
 
-#: builtin/stash.c:608 builtin/stash.c:706
 msgid "attempt to recreate the index"
 msgstr "опит за повторно създаване на индекса"
 
-#: builtin/stash.c:652
 #, c-format
 msgid "Dropped %s (%s)"
 msgstr "Изтрито: „%s“ (%s)"
 
-#: builtin/stash.c:655
 #, c-format
 msgid "%s: Could not drop stash entry"
 msgstr "Скатаното „%s“ не може да бъде изтрито"
 
-#: builtin/stash.c:668
 #, c-format
 msgid "'%s' is not a stash reference"
 msgstr "„%s“ не е указател към нещо скатано"
 
-#: builtin/stash.c:718
 msgid "The stash entry is kept in case you need it again."
 msgstr "Скатаното е запазено в случай, че ви потрябва отново."
 
-#: builtin/stash.c:741
 msgid "No branch name specified"
 msgstr "Не е указано име на клон"
 
-#: builtin/stash.c:825
 msgid "failed to parse tree"
 msgstr "дървото не може да бъде анализирано"
 
-#: builtin/stash.c:836
 msgid "failed to unpack trees"
 msgstr "дървото не може да бъде разпакетирано"
 
-#: builtin/stash.c:856
 msgid "include untracked files in the stash"
 msgstr "скатаване и на неследените файлове"
 
-#: builtin/stash.c:859
 msgid "only show untracked files in the stash"
 msgstr "извеждане само на неследените файлове в скатаното"
 
-#: builtin/stash.c:946 builtin/stash.c:983
 #, c-format
 msgid "Cannot update %s with %s"
 msgstr "Указателят „%s“ не може да бъде обновен да сочи към „%s“"
 
-#: builtin/stash.c:964 builtin/stash.c:1678 builtin/stash.c:1750
 msgid "stash message"
 msgstr "съобщение при скатаване"
 
-#: builtin/stash.c:974
 msgid "\"git stash store\" requires one <commit> argument"
 msgstr "командата „git stash store“ изисква точно един аргумент-ПОДАВАНЕ"
 
-#: builtin/stash.c:1159
 msgid "No staged changes"
-msgstr "Няма промени в индекса"
+msgstr "Няма промѐни в индекса"
 
-#: builtin/stash.c:1220
 msgid "No changes selected"
-msgstr "Не са избрани никакви промени"
+msgstr "Не са избрани никакви промѐни"
 
-#: builtin/stash.c:1320
 msgid "You do not have the initial commit yet"
 msgstr "Все още липсва първоначално подаване"
 
-#: builtin/stash.c:1347
 msgid "Cannot save the current index state"
 msgstr "Състоянието на текущия индекс не може да бъде запазено"
 
-#: builtin/stash.c:1356
 msgid "Cannot save the untracked files"
 msgstr "Неследените файлове не може да се запазят"
 
-#: builtin/stash.c:1367 builtin/stash.c:1386
 msgid "Cannot save the current worktree state"
 msgstr "Състоянието на работното дърво не може да бъде запазено"
 
-#: builtin/stash.c:1377
 msgid "Cannot save the current staged state"
 msgstr "Състоянието на текущия индекс не може да бъде запазено"
 
-#: builtin/stash.c:1414
 msgid "Cannot record working tree state"
 msgstr "Състоянието на работното дърво не може да бъде запазено"
 
-#: builtin/stash.c:1463
 msgid "Can't use --patch and --include-untracked or --all at the same time"
 msgstr "опцията „--patch“ е несъвместима с „--include-untracked“ и „--all“"
 
-#: builtin/stash.c:1474
 msgid "Can't use --staged and --include-untracked or --all at the same time"
 msgstr ""
 "опцията „--staged“ е несъвместима както с „--include-untracked“, така и с „--"
 "all“"
 
-#: builtin/stash.c:1492
 msgid "Did you forget to 'git add'?"
 msgstr "Пробвайте да използвате „git add“"
 
-#: builtin/stash.c:1507
 msgid "No local changes to save"
-msgstr "Няма никакви локални промени за скатаване"
+msgstr "Няма никакви локални промѐни за скатаване"
 
-#: builtin/stash.c:1514
 msgid "Cannot initialize stash"
 msgstr "Скатаването не може да стартира"
 
-#: builtin/stash.c:1529
 msgid "Cannot save the current status"
 msgstr "Текущото състояние не може да бъде запазено"
 
-#: builtin/stash.c:1534
 #, c-format
 msgid "Saved working directory and index state %s"
 msgstr "Състоянието на работната директория и индекса e запазено: „%s“"
 
-#: builtin/stash.c:1627
 msgid "Cannot remove worktree changes"
-msgstr "Промените в работното дърво не може да бъдат занулени"
+msgstr "Промѐните в работното дърво не може да бъдат занулени"
 
-#: builtin/stash.c:1667 builtin/stash.c:1739
 msgid "keep index"
 msgstr "запазване на индекса"
 
-#: builtin/stash.c:1669 builtin/stash.c:1741
 msgid "stash staged changes only"
-msgstr "скатаване само на промените, вкарани в индекса"
+msgstr "скатаване само на промѐните, вкарани в индекса"
 
-#: builtin/stash.c:1671 builtin/stash.c:1743
 msgid "stash in patch mode"
 msgstr "скатаване в режим за кръпки"
 
-#: builtin/stash.c:1672 builtin/stash.c:1744
 msgid "quiet mode"
 msgstr "без извеждане на информация"
 
-#: builtin/stash.c:1674 builtin/stash.c:1746
 msgid "include untracked files in stash"
 msgstr "скатаване и на неследените файлове"
 
-#: builtin/stash.c:1676 builtin/stash.c:1748
 msgid "include ignore files"
 msgstr "скатаване и на игнорираните файлове"
 
-#: builtin/stash.c:1783
-msgid ""
-"the stash.useBuiltin support has been removed!\n"
-"See its entry in 'git help config' for details."
-msgstr ""
-"поддръжката на „stash.useBuiltin“ е премахната.\n"
-"За повече информация вижте „git help config“."
-
-#: builtin/stripspace.c:18
-msgid "git stripspace [-s | --strip-comments]"
-msgstr "git stripspace [-s | --strip-comments]"
-
-#: builtin/stripspace.c:19
-msgid "git stripspace [-c | --comment-lines]"
-msgstr "git stripspace [-c | --comment-lines]"
-
-#: builtin/stripspace.c:37
 msgid "skip and remove all lines starting with comment character"
 msgstr "пропускане на всички редове, които започват с „#“"
 
-#: builtin/stripspace.c:40
 msgid "prepend comment character and space to each line"
 msgstr "добавяне на „# “ в началото на всеки ред"
 
-#: builtin/submodule--helper.c:46 builtin/submodule--helper.c:2668
 #, c-format
 msgid "Expecting a full ref name, got %s"
 msgstr "Очаква се пълно име на указател, а не „%s“"
 
-#: builtin/submodule--helper.c:63
-msgid "submodule--helper print-default-remote takes no arguments"
-msgstr ""
-"командата „print-default-remote“ на „submodule--helper“ не приема аргументи"
-
-#: builtin/submodule--helper.c:101
-#, c-format
-msgid "cannot strip one component off url '%s'"
-msgstr "не може да се махне компонент от адреса „%s“"
-
-#: builtin/submodule--helper.c:211
 #, c-format
 msgid ""
 "could not look up configuration '%s'. Assuming this repository is its own "
@@ -23381,26 +12399,20 @@ msgstr ""
 "настройката „%s“ липсва.  Приема се, че това хранилище е правилният източник "
 "за себе си."
 
-#: builtin/submodule--helper.c:405 builtin/submodule--helper.c:1859
 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"
@@ -23409,7 +12421,6 @@ msgstr ""
 "изпълнената команда (run_command) завърши с ненулев изход за „%s“\n"
 "."
 
-#: builtin/submodule--helper.c:545
 #, c-format
 msgid ""
 "run_command returned non-zero status while recursing in the nested "
@@ -23420,68 +12431,53 @@ msgstr ""
 "подмодулите, вложени в „%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:646
 #, c-format
 msgid "Submodule '%s' (%s) registered for path '%s'\n"
 msgstr "Регистриран е подмодул „%s“ (%s) за пътя към подмодул „%s“\n"
 
-#: builtin/submodule--helper.c:656
 #, c-format
 msgid "warning: command update mode suggested for submodule '%s'\n"
 msgstr "ПРЕДУПРЕЖДЕНИЕ: препоръчва се режим на обновяване за подмодула „%s“\n"
 
-#: builtin/submodule--helper.c:663
 #, c-format
 msgid "Failed to register update mode for submodule path '%s'"
 msgstr ""
 "Неуспешно регистриране на режима на обновяване за пътя към подмодул „%s“"
 
-#: builtin/submodule--helper.c:685
 msgid "suppress output for initializing a submodule"
 msgstr "без извеждане на информация при инициализирането на подмодул"
 
-#: builtin/submodule--helper.c:690
 msgid "git submodule--helper init [<options>] [<path>]"
 msgstr "git submodule--helper init [ОПЦИЯ…] [ПЪТ]"
 
-#: 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:811
 #, c-format
 msgid "could not resolve HEAD ref inside the submodule '%s'"
 msgstr "указателят сочен от „HEAD“ в подмодула „%s“ не може да бъде открит"
 
-#: 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:862 builtin/submodule--helper.c:1590
 msgid "suppress submodule status output"
 msgstr "без изход за състоянието на подмодула"
 
-#: builtin/submodule--helper.c:863
 msgid ""
 "use commit stored in the index instead of the one stored in the submodule "
 "HEAD"
@@ -23489,96 +12485,76 @@ msgstr ""
 "използване на подаването указано в индекса, а не това от указателя „HEAD“ на "
 "подмодула"
 
-#: builtin/submodule--helper.c:869
 msgid "git submodule status [--quiet] [--cached] [--recursive] [<path>...]"
 msgstr "git submodule status [--quiet] [--cached] [--recursive] [ПЪТ…]"
 
-#: builtin/submodule--helper.c:893
 msgid "git submodule--helper name <path>"
 msgstr "git submodule--helper name ПЪТ"
 
-#: builtin/submodule--helper.c:965
 #, c-format
 msgid "* %s %s(blob)->%s(submodule)"
 msgstr "● %s %s(обект-BLOB)→%s(подмодул)"
 
-#: builtin/submodule--helper.c:968
 #, c-format
 msgid "* %s %s(submodule)->%s(blob)"
 msgstr "● %s %s(подмодул)→%s(обект-BLOB)"
 
-#: builtin/submodule--helper.c:981
 #, c-format
 msgid "%s"
 msgstr "%s"
 
-#: builtin/submodule--helper.c:1031
 #, c-format
 msgid "couldn't hash object from '%s'"
 msgstr "неуспешно изчисляване на контролната сума на обект от „%s“"
 
-#: builtin/submodule--helper.c:1035
 #, c-format
 msgid "unexpected mode %o\n"
 msgstr "неочакван режим „%o“\n"
 
-#: builtin/submodule--helper.c:1276
 msgid "use the commit stored in the index instead of the submodule HEAD"
 msgstr ""
 "използване на подаването указано в индекса, а не това от указателя „HEAD“ на "
 "подмодула"
 
-#: builtin/submodule--helper.c:1278
 msgid "compare the commit in the index with that in the submodule HEAD"
 msgstr ""
 "сравнение на подаването указано в индекса с това от указателя „HEAD“ на "
 "подмодула"
 
-#: builtin/submodule--helper.c:1280
 msgid "skip submodules with 'ignore_config' value set to 'all'"
 msgstr "прескачане на подмодули, чиято настройка „ignore_config“ е „all“"
 
-#: builtin/submodule--helper.c:1282
 msgid "limit the summary size"
 msgstr "ограничаване на размера на обобщението"
 
-#: builtin/submodule--helper.c:1287
 msgid "git submodule--helper summary [<options>] [<commit>] [--] [<path>]"
 msgstr "git submodule--helper summary [ОПЦИЯ…] [ПОДАВАНЕ] [--] [ПЪТ]"
 
-#: builtin/submodule--helper.c:1311
 msgid "could not fetch a revision for HEAD"
 msgstr "не може да се достави версия за „HEAD“"
 
-#: builtin/submodule--helper.c:1373
 #, c-format
 msgid "Synchronizing submodule url for '%s'\n"
 msgstr "Синхронизиране на адреса на подмодул за „%s“\n"
 
-#: builtin/submodule--helper.c:1379
 #, c-format
 msgid "failed to register url for submodule path '%s'"
 msgstr "неуспешно регистриране на адрес за пътя към подмодул „%s“"
 
-#: builtin/submodule--helper.c:1393
 #, c-format
 msgid "failed to get the default remote for submodule '%s'"
 msgstr "отдалеченият адрес на подмодула „%s“ не може да бъде получен"
 
-#: builtin/submodule--helper.c:1404
 #, c-format
 msgid "failed to update remote for submodule '%s'"
 msgstr "отдалеченият адрес на подмодула „%s“ не може да бъде променен"
 
-#: builtin/submodule--helper.c:1451
 msgid "suppress output of synchronizing submodule url"
 msgstr "без извеждане на информация при синхронизирането на подмодул"
 
-#: builtin/submodule--helper.c:1458
 msgid "git submodule--helper sync [--quiet] [--recursive] [<path>]"
 msgstr "git submodule--helper sync [--quiet] [--recursive] [ПЪТ]"
 
-#: builtin/submodule--helper.c:1508
 #, c-format
 msgid ""
 "Submodule work tree '%s' contains a .git directory. This will be replaced "
@@ -23588,56 +12564,46 @@ msgstr ""
 "заменени\n"
 "с файл „.git“ чрез командата „absorbgitdirs“."
 
-#: builtin/submodule--helper.c:1525
 #, c-format
 msgid ""
 "Submodule work tree '%s' contains local modifications; use '-f' to discard "
 "them"
 msgstr ""
-"Работното дърво на подмодул „%s“ съдържа локални промени.  Може да ги "
+"Работното дърво на подмодул „%s“ съдържа локални промѐни.  Може да ги "
 "отхвърлите с опцията „-f“"
 
-#: builtin/submodule--helper.c:1533
 #, c-format
 msgid "Cleared directory '%s'\n"
 msgstr "Директорията „%s“ е изчистена\n"
 
-#: builtin/submodule--helper.c:1535
 #, c-format
 msgid "Could not remove submodule work tree '%s'\n"
 msgstr ""
 "Директорията към работното дърво на подмодула „%s“ не може да бъде изтрита\n"
 
-#: builtin/submodule--helper.c:1546
 #, c-format
 msgid "could not create empty submodule directory %s"
 msgstr "празната директория за подмодула „%s“ не може да бъде създадена"
 
-#: builtin/submodule--helper.c:1562
 #, c-format
 msgid "Submodule '%s' (%s) unregistered for path '%s'\n"
 msgstr "Регистрацията на подмодула „%s“ (%s) за пътя „%s“ е премахната\n"
 
-#: builtin/submodule--helper.c:1591
 msgid "remove submodule working trees even if they contain local changes"
 msgstr ""
 "изтриване на работните дървета на подмодулите, дори когато те съдържат "
-"локални промени"
+"локални промѐни"
 
-#: builtin/submodule--helper.c:1592
 msgid "unregister all submodules"
 msgstr "премахване на регистрациите на всички подмодули"
 
-#: builtin/submodule--helper.c:1597
 msgid ""
 "git submodule deinit [--quiet] [-f | --force] [--all | [--] [<path>...]]"
 msgstr "git submodule deinit [--quiet] [-f | --force] [--all | [--] [ПЪТ…]]"
 
-#: builtin/submodule--helper.c:1611
 msgid "Use '--all' if you really want to deinitialize all submodules"
 msgstr "Използвайте „--all“, за да премахнете всички подмодули"
 
-#: builtin/submodule--helper.c:1656
 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"
@@ -23649,167 +12615,135 @@ msgstr ""
 "задайте настройката „submodule.alternateErrorStrategy“ да е „info“ или\n"
 "при клониране ползвайте опцията „--reference-if-able“ вместо „--reference“."
 
-#: builtin/submodule--helper.c:1701 builtin/submodule--helper.c:1704
 #, c-format
 msgid "submodule '%s' cannot add alternate: %s"
 msgstr "към подмодула „%s“ не може да се добави алтернативен източник: %s"
 
-#: builtin/submodule--helper.c:1740
 #, c-format
 msgid "Value '%s' for submodule.alternateErrorStrategy is not recognized"
 msgstr ""
 "Непозната стойност „%s“ за настройката „submodule.alternateErrorStrategy“"
 
-#: builtin/submodule--helper.c:1747
 #, c-format
 msgid "Value '%s' for submodule.alternateLocation is not recognized"
 msgstr "Непозната стойност „%s“ за настройката „submodule.alternateLocation“"
 
-#: builtin/submodule--helper.c:1772
 #, c-format
 msgid "refusing to create/use '%s' in another submodule's git dir"
 msgstr ""
 "„%s“ не може нито да се създаде, нито да се ползва в директорията на git на "
 "друг подмодул"
 
-#: builtin/submodule--helper.c:1813
 #, c-format
 msgid "clone of '%s' into submodule path '%s' failed"
 msgstr "Неуспешно клониране на адреса „%s“ в пътя „%s“ като подмодул"
 
-#: builtin/submodule--helper.c:1818
 #, c-format
 msgid "directory not empty: '%s'"
 msgstr "директорията не е празна: „%s“"
 
-#: builtin/submodule--helper.c:1830
 #, c-format
 msgid "could not get submodule directory for '%s'"
 msgstr "директорията на подмодула „%s“ не може да бъде получена"
 
-#: builtin/submodule--helper.c:1862
 msgid "where the new submodule will be cloned to"
 msgstr "къде да се клонира новият подмодул"
 
-#: builtin/submodule--helper.c:1865
 msgid "name of the new submodule"
 msgstr "име на новия подмодул"
 
-#: builtin/submodule--helper.c:1868
 msgid "url where to clone the submodule from"
 msgstr "адрес, от който да се клонира новият подмодул"
 
-#: builtin/submodule--helper.c:1876 builtin/submodule--helper.c:3265
 msgid "depth for shallow clones"
 msgstr "дълбочина на плитките хранилища"
 
-#: builtin/submodule--helper.c:1879 builtin/submodule--helper.c:2526
-#: builtin/submodule--helper.c:3258
 msgid "force cloning progress"
 msgstr "извеждане на напредъка на клонирането"
 
-#: builtin/submodule--helper.c:1881 builtin/submodule--helper.c:2528
 msgid "disallow cloning into non-empty directory"
 msgstr "предотвратяване на клониране в непразна история"
 
-#: builtin/submodule--helper.c:1888
 msgid ""
 "git submodule--helper clone [--prefix=<path>] [--quiet] [--reference "
-"<repository>] [--name <name>] [--depth <depth>] [--single-branch] --url "
-"<url> --path <path>"
+"<repository>] [--name <name>] [--depth <depth>] [--single-branch] [--filter "
+"<filter-spec>] --url <url> --path <path>"
 msgstr ""
 "git submodule--helper clone [--prefix=ПЪТ] [--quiet] [--reference ХРАНИЛИЩЕ] "
-"[--name ИМЕ] [--depth ДЪЛБОЧИНА] [--single-branch] --url АДРЕС --path ПЪТ"
+"[--name ИМЕ] [--depth ДЪЛБОЧИНА] [--single-branch] [--filter ФИЛТЪР] --url "
+"АДРЕС --path ПЪТ"
 
-#: builtin/submodule--helper.c:1925
 #, c-format
 msgid "Invalid update mode '%s' for submodule path '%s'"
 msgstr "Неправилен режим на обновяване „%s“ за пътя към подмодул „%s“"
 
-#: builtin/submodule--helper.c:1929
 #, c-format
 msgid "Invalid update mode '%s' configured for submodule path '%s'"
 msgstr ""
 "Настроен е неправилен режим на обновяване „%s“ за пътя към подмодул „%s“"
 
-#: builtin/submodule--helper.c:2044
 #, c-format
 msgid "Submodule path '%s' not initialized"
 msgstr "Пътят на подмодула „%s“ не е инициализиран"
 
-#: builtin/submodule--helper.c:2048
 msgid "Maybe you want to use 'update --init'?"
 msgstr "Вероятно искахте да използвате „update --init“?"
 
-#: builtin/submodule--helper.c:2078
 #, c-format
 msgid "Skipping unmerged submodule %s"
 msgstr "Прескачане на неслетия подмодул „%s“"
 
-#: builtin/submodule--helper.c:2107
 #, c-format
 msgid "Skipping submodule '%s'"
 msgstr "Прескачане на подмодула „%s“"
 
-#: builtin/submodule--helper.c:2257
 #, c-format
 msgid "Failed to clone '%s'. Retry scheduled"
 msgstr "Неуспешен опит за клониране на „%s“.  Насрочен е втори опит"
 
-#: builtin/submodule--helper.c:2268
 #, c-format
 msgid "Failed to clone '%s' a second time, aborting"
 msgstr ""
 "Втори неуспешен опит за клониране на „%s“.  Действието се преустановява"
 
-#: builtin/submodule--helper.c:2373
 #, c-format
 msgid "Unable to checkout '%s' in submodule path '%s'"
 msgstr "Неуспешно изтегляне на версия „%s“ в пътя към подмодул „%s“'"
 
-#: builtin/submodule--helper.c:2377
 #, c-format
 msgid "Unable to rebase '%s' in submodule path '%s'"
 msgstr "Неуспешно пребазиране на версия „%s“ в пътя към подмодул „%s“"
 
-#: builtin/submodule--helper.c:2381
 #, c-format
 msgid "Unable to merge '%s' in submodule path '%s'"
 msgstr "Неуспешно сливане на версия „%s“ в пътя към подмодул „%s“"
 
-#: builtin/submodule--helper.c:2385
 #, c-format
 msgid "Execution of '%s %s' failed in submodule path '%s'"
 msgstr "Неуспешно изпълнение на командата „%s %s“ в пътя към подмодул „%s“"
 
-#: builtin/submodule--helper.c:2409
 #, c-format
 msgid "Submodule path '%s': checked out '%s'\n"
 msgstr "Път към подмодул „%s“: изтеглена е версия „%s“\n"
 
-#: builtin/submodule--helper.c:2413
 #, c-format
 msgid "Submodule path '%s': rebased into '%s'\n"
 msgstr "Път към подмодул „%s“: пребазиран към „%s“\n"
 
-#: builtin/submodule--helper.c:2417
 #, c-format
 msgid "Submodule path '%s': merged in '%s'\n"
 msgstr "Път към подмодул „%s“: слят в „%s“\n"
 
-#: builtin/submodule--helper.c:2421
 #, c-format
 msgid "Submodule path '%s': '%s %s'\n"
 msgstr "Пътят на подмодула „%s“: „%s %s“\n"
 
-#: builtin/submodule--helper.c:2445
 #, c-format
 msgid "Unable to fetch in submodule path '%s'; trying to directly fetch %s:"
 msgstr ""
 "Неуспешно доставяне в пътя към подмодул „%s“, опит за директно доставяне на "
 "„%s“"
 
-#: builtin/submodule--helper.c:2454
 #, c-format
 msgid ""
 "Fetched in submodule path '%s', but it did not contain %s. Direct fetching "
@@ -23818,181 +12752,163 @@ msgstr ""
 "Подмодулът в пътя „%s“ е доставен, но не съдържа обекта със сума\n"
 "„%s“.  Директното доставяне на това подаване е неуспешно."
 
-#: builtin/submodule--helper.c:2505 builtin/submodule--helper.c:2575
-#: builtin/submodule--helper.c:2813
+#, c-format
+msgid ""
+"Submodule (%s) branch configured to inherit branch from superproject, but "
+"the superproject is not on any branch"
+msgstr ""
+"Клонът на подмодула „%s“ е настроен да наследява клона от обхващащия проект, "
+"но той не е на никой клон"
+
+#, c-format
+msgid "could not get a repository handle for submodule '%s'"
+msgstr "не може да се получи връзка към хранилище за подмодула „%s“"
+
+#, c-format
+msgid "Unable to find current revision in submodule path '%s'"
+msgstr "Текущата версия за подмодула в „%s“ липсва"
+
+#, c-format
+msgid "Unable to fetch in submodule path '%s'"
+msgstr "Неуспешно доставяне в пътя към подмодул „%s“"
+
+#, c-format
+msgid "Unable to find %s revision in submodule path '%s'"
+msgstr "Версията „%s“ липсва в пътя към подмодула „%s“"
+
+#, c-format
+msgid "Failed to recurse into submodule path '%s'"
+msgstr "Неуспешно рекурсивно обхождане на пътя към подмодула „%s“"
+
+msgid "force checkout updates"
+msgstr "принудително изтегляне на обновленията"
+
+msgid "initialize uninitialized submodules before update"
+msgstr "инициализиране на неинициализираните подмодули при това обновяване"
+
+msgid "use SHA-1 of submodule's remote tracking branch"
+msgstr "използване на сумата по SHA1 от отдалечения следен клон на подмодула"
+
+msgid "traverse submodules recursively"
+msgstr "рекурсивно обхождане на подмодулите"
+
+msgid "don't fetch new objects from the remote site"
+msgstr "без доставяне на новите обекти от отдалеченото хранилище"
+
 msgid "path into the working tree"
 msgstr "път към работното дърво"
 
-#: builtin/submodule--helper.c:2508 builtin/submodule--helper.c:2580
 msgid "path into the working tree, across nested submodule boundaries"
 msgstr "път към работното дърво, през границите на вложените подмодули"
 
-#: builtin/submodule--helper.c:2512 builtin/submodule--helper.c:2578
 msgid "rebase, merge, checkout or none"
 msgstr ""
 "„rebase“ (пребазиране), „merge“ (сливане), „checkout“ (изтегляне) или "
 "„none“ (нищо да не се прави)"
 
-#: builtin/submodule--helper.c:2518
 msgid "create a shallow clone truncated to the specified number of revisions"
 msgstr "извършване на плитко клониране, отрязано до указания брой версии"
 
-#: builtin/submodule--helper.c:2521
 msgid "parallel jobs"
 msgstr "брой паралелни процеси"
 
-#: builtin/submodule--helper.c:2523
 msgid "whether the initial clone should follow the shallow recommendation"
 msgstr "дали първоначалното клониране да е плитко, както се препоръчва"
 
-#: builtin/submodule--helper.c:2524
 msgid "don't print cloning progress"
 msgstr "без извеждане на напредъка на клонирането"
 
-#: builtin/submodule--helper.c:2535
-msgid "git submodule--helper update-clone [--prefix=<path>] [<path>...]"
-msgstr "git submodule--helper update-clone [--prefix=ПЪТ] [ПЪТ…]"
-
-#: builtin/submodule--helper.c:2548
-msgid "bad value for update parameter"
-msgstr "неправилен параметър към опцията „--update“"
-
-#: builtin/submodule--helper.c:2566
-msgid "suppress output for update by rebase or merge"
-msgstr ""
-"без извеждане на информация при обновяване чрез пребазиране или сливане"
-
-#: builtin/submodule--helper.c:2567
-msgid "force checkout updates"
-msgstr "принудително изтегляне на обновленията"
-
-#: builtin/submodule--helper.c:2569
-msgid "don't fetch new objects from the remote site"
-msgstr "без доставяне на новите обекти от отдалеченото хранилище"
-
-#: builtin/submodule--helper.c:2571
-msgid "overrides update mode in case the repository is a fresh clone"
-msgstr ""
-"различен режим на обновяване, когато хранилището е чисто ново изтеглено"
-
-#: builtin/submodule--helper.c:2572
-msgid "depth for shallow fetch"
-msgstr "дълбочина на плиткото доставяне"
-
-#: builtin/submodule--helper.c:2582
-msgid "sha1"
-msgstr "сума по SHA1"
-
-#: builtin/submodule--helper.c:2583
-msgid "SHA1 expected by superproject"
-msgstr "сумата по SHA1, очаквана от обхващащия модул"
-
-#: builtin/submodule--helper.c:2585
-msgid "subsha1"
-msgstr "сумата по SHA1 на подмодула"
-
-#: builtin/submodule--helper.c:2586
-msgid "SHA1 of submodule's HEAD"
-msgstr "сумата по SHA1 за указателя HEAD на подмодула"
-
-#: builtin/submodule--helper.c:2592
-msgid "git submodule--helper run-update-procedure [<options>] <path>"
-msgstr "git submodule--helper run-update-procedure [ОПЦИЯ…] [ПЪТ]"
-
-#: builtin/submodule--helper.c:2663
-#, c-format
 msgid ""
-"Submodule (%s) branch configured to inherit branch from superproject, but "
-"the superproject is not on any branch"
+"git submodule [--quiet] update [--init [--filter=<filter-spec>]] [--remote] "
+"[-N|--no-fetch] [-f|--force] [--checkout|--merge|--rebase] [--[no-]recommend-"
+"shallow] [--reference <repository>] [--recursive] [--[no-]single-branch] "
+"[--] [<path>...]"
 msgstr ""
-"Клонът на подмодула „%s“ е настроен да наследява клона от обхващащия проект, "
-"но той не е на никой клон"
+"git submodule [--quiet] update [--init [--filter=ФИЛТЪР]] [--remote] [-N|--"
+"no-fetch] [-f|--force] [--checkout|--merge|--rebase] [--[no-]recommend-"
+"shallow] [--reference <repository>] [--recursive] [--[no-]single-branch] "
+"[--] [ПЪТ…]"
 
-#: builtin/submodule--helper.c:2781
-#, c-format
-msgid "could not get a repository handle for submodule '%s'"
-msgstr "не може да се получи връзка към хранилище за подмодула „%s“"
+msgid "bad value for update parameter"
+msgstr "неправилен параметър към опцията „--update“"
 
-#: builtin/submodule--helper.c:2814
 msgid "recurse into submodules"
 msgstr "рекурсивно обхождане подмодулите"
 
-#: builtin/submodule--helper.c:2820
 msgid "git submodule--helper absorb-git-dirs [<options>] [<path>...]"
 msgstr "git submodule--helper absorb-git-dirs [ОПЦИЯ…] [ПЪТ…]"
 
-#: builtin/submodule--helper.c:2876
 msgid "check if it is safe to write to the .gitmodules file"
 msgstr "проверка дали писането във файла „.gitmodules“ е безопасно"
 
-#: builtin/submodule--helper.c:2879
 msgid "unset the config in the .gitmodules file"
 msgstr "изтриване на настройка във файла „.gitmodules“"
 
-#: builtin/submodule--helper.c:2884
 msgid "git submodule--helper config <name> [<value>]"
 msgstr "git submodule--helper config ИМЕ [СТОЙНОСТ]"
 
-#: builtin/submodule--helper.c:2885
 msgid "git submodule--helper config --unset <name>"
 msgstr "git submodule--helper config --unset ИМЕ"
 
-#: builtin/submodule--helper.c:2886
-msgid "git submodule--helper config --check-writeable"
-msgstr "git submodule--helper config --check-writeable"
-
-#: builtin/submodule--helper.c:2905 builtin/submodule--helper.c:3121
-#: builtin/submodule--helper.c:3277
 msgid "please make sure that the .gitmodules file is in the working tree"
 msgstr "файлът „.gitmodules“ трябва да е в работното дърво"
 
-#: builtin/submodule--helper.c:2921
 msgid "suppress output for setting url of a submodule"
 msgstr "без извеждане на информация при задаването на адреса на подмодул"
 
-#: builtin/submodule--helper.c:2925
 msgid "git submodule--helper set-url [--quiet] <path> <newurl>"
 msgstr "git submodule--helper set-url [--quiet] [ПЪТ] [НОВ_ПЪТ]"
 
-#: builtin/submodule--helper.c:2958
 msgid "set the default tracking branch to master"
 msgstr "задаване на стандартния следящ клон да е „master“"
 
-#: builtin/submodule--helper.c:2960
 msgid "set the default tracking branch"
 msgstr "задаване на стандартния следящ клон"
 
-#: builtin/submodule--helper.c:2964
 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:2965
 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:2972
 msgid "--branch or --default required"
 msgstr "необходимо е една от опциите „--branch“ и „--default“"
 
-#: builtin/submodule--helper.c:3038
+msgid "print only error messages"
+msgstr "извеждане само на съобщенията за грешка"
+
+msgid "force creation"
+msgstr "принудително създаване"
+
+msgid "show whether the branch would be created"
+msgstr "извеждане дали клонът ще бъде създаден"
+
+msgid ""
+"git submodule--helper create-branch [-f|--force] [--create-reflog] [-q|--"
+"quiet] [-t|--track] [-n|--dry-run] <name> <start-oid> <start-name>"
+msgstr ""
+"git submodule--helper create-branch [-f|--force] [--create-reflog] [-q|--"
+"quiet] [-t|--track] [-n|--dry-run] ИМЕ НАЧАЛЕН_ИД_ОБЕКТ НАЧАЛНО_ИМЕ"
+
+#, c-format
+msgid "creating branch '%s'"
+msgstr "създаване на клона „%s“"
+
 #, c-format
 msgid "Adding existing repo at '%s' to the index\n"
 msgstr "Добавяне на съществуващото хранилище в „%s“ към индекса\n"
 
-#: builtin/submodule--helper.c:3041
 #, c-format
 msgid "'%s' already exists and is not a valid git repo"
 msgstr "„%s“ съществува, а не е хранилище на Git"
 
-#: builtin/submodule--helper.c:3054
 #, c-format
 msgid "A git directory for '%s' is found locally with remote(s):\n"
 msgstr ""
 "Открита е локална директория на Git — „%s“, която сочи към отдалечените "
 "хранилища:\n"
 
-#: builtin/submodule--helper.c:3061
 #, c-format
 msgid ""
 "If you want to reuse this local git directory instead of cloning again from\n"
@@ -24009,120 +12925,96 @@ msgstr ""
 "правилното хранилище или ако не знаете какво означава това, използвайте\n"
 "друго име като аргумент към опцията „--name“."
 
-#: builtin/submodule--helper.c:3073
 #, c-format
 msgid "Reactivating local git directory for submodule '%s'\n"
 msgstr "Активиране на локалното хранилище за подмодула „%s“ наново.\n"
 
-#: builtin/submodule--helper.c:3110
 #, c-format
 msgid "unable to checkout submodule '%s'"
 msgstr "Подмодулът „%s“ не може да бъде изтеглен"
 
-#: builtin/submodule--helper.c:3149
 #, c-format
 msgid "Failed to add submodule '%s'"
 msgstr "Неуспешно добавяне на подмодула „%s“"
 
-#: builtin/submodule--helper.c:3153 builtin/submodule--helper.c:3158
-#: builtin/submodule--helper.c:3166
 #, c-format
 msgid "Failed to register submodule '%s'"
 msgstr "Неуспешно регистриране на подмодула „%s“"
 
-#: builtin/submodule--helper.c:3222
 #, c-format
 msgid "'%s' already exists in the index"
 msgstr "„%s“ вече съществува в индекса"
 
-#: builtin/submodule--helper.c:3225
 #, c-format
 msgid "'%s' already exists in the index and is not a submodule"
 msgstr "„%s“ вече съществува в индекса и не е подмодул"
 
-#: builtin/submodule--helper.c:3254
+#, c-format
+msgid "'%s' does not have a commit checked out"
+msgstr "не е изтеглено подаване в „%s“"
+
 msgid "branch of repository to add as submodule"
 msgstr "клон на хранилище, който да се добави като подмодул"
 
-#: builtin/submodule--helper.c:3255
 msgid "allow adding an otherwise ignored submodule path"
 msgstr "позволяване на добавяне и на иначе игнорираните файлове"
 
-#: builtin/submodule--helper.c:3257
-msgid "print only error messages"
-msgstr "извеждане само на съобщенията за грешка"
-
-#: builtin/submodule--helper.c:3261
 msgid "borrow the objects from reference repositories"
 msgstr "заемане на обектите от еталонните хранилища"
 
-#: builtin/submodule--helper.c:3263
 msgid ""
-"sets the submodule’s name to the given string instead of defaulting to its "
+"sets the submodule's name to the given string instead of defaulting to its "
 "path"
-msgstr "името на подмодула да е указаното, а не да е същото като пътя"
+msgstr ""
+"името на подмодула да е указаното, а не да е автоматично същото като пътя"
 
-#: builtin/submodule--helper.c:3270
 msgid "git submodule--helper add [<options>] [--] <repository> [<path>]"
 msgstr "git submodule--helper add [ОПЦИЯ…] [--] ХРАНИЛИЩЕ [ПЪТ]"
 
-#: builtin/submodule--helper.c:3298
 msgid "Relative path can only be used from the toplevel of the working tree"
 msgstr ""
 "Относителен път може да се ползва само от основната директория на работното "
 "дърво"
 
-#: builtin/submodule--helper.c:3306
 #, c-format
 msgid "repo URL: '%s' must be absolute or begin with ./|../"
 msgstr ""
 "адрес на хранилище: „%s“ трябва или да е абсолютен, или да започва с „./“ "
 "или „../“"
 
-#: builtin/submodule--helper.c:3341
 #, c-format
 msgid "'%s' is not a valid submodule name"
 msgstr "„%s“ е неправилно име за подмодул"
 
-#: builtin/submodule--helper.c:3405 git.c:452 git.c:726
 #, c-format
 msgid "%s doesn't support --super-prefix"
 msgstr "„%s“ не поддържа опцията „--super-prefix“"
 
-#: builtin/submodule--helper.c:3411
 #, c-format
 msgid "'%s' is not a valid submodule--helper subcommand"
 msgstr "„%s“ не е подкоманда на „submodule--helper“"
 
-#: builtin/symbolic-ref.c:8
 msgid "git symbolic-ref [<options>] <name> [<ref>]"
 msgstr "git symbolic-ref [ОПЦИЯ…] ИМЕ [УКАЗАТЕЛ]"
 
-#: builtin/symbolic-ref.c:9
 msgid "git symbolic-ref -d [-q] <name>"
 msgstr "git symbolic-ref -d [-q] ИМЕ"
 
-#: builtin/symbolic-ref.c:42
 msgid "suppress error message for non-symbolic (detached) refs"
 msgstr "без извеждане на грешка за несвързани (несимволни) указатели"
 
-#: builtin/symbolic-ref.c:43
 msgid "delete symbolic ref"
 msgstr "изтриване на символен указател"
 
-#: builtin/symbolic-ref.c:44
 msgid "shorten ref output"
 msgstr "кратка информация за указателя"
 
-#: builtin/symbolic-ref.c:45 builtin/update-ref.c:505
 msgid "reason"
 msgstr "причина"
 
-#: 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"
 "        <tagname> [<head>]"
@@ -24130,11 +13022,9 @@ msgstr ""
 "git tag [-a | -s | -u ИДЕНТИФИКАТОР_НА_КЛЮЧ] [-f] [-m СЪОБЩЕНИЕ | -F ФАЙЛ]\n"
 "        ЕТИКЕТ [ВРЪХ]"
 
-#: builtin/tag.c:27
 msgid "git tag -d <tagname>..."
 msgstr "git tag -d ЕТИКЕТ…"
 
-#: builtin/tag.c:28
 msgid ""
 "git tag -l [-n[<num>]] [--contains <commit>] [--no-contains <commit>] [--"
 "points-at <object>]\n"
@@ -24145,21 +13035,17 @@ msgstr ""
 "           [--points-at ОБЕКТ] [--format=ФОРМАТ] [--merged ПОДАВАНЕ]\n"
 "           [--no-merged ПОДАВАНЕ] [ШАБЛОН…]"
 
-#: builtin/tag.c:30
 msgid "git tag -v [--format=<format>] <tagname>..."
 msgstr "git tag -v [--format=ФОРМАТ] ЕТИКЕТ…"
 
-#: builtin/tag.c:100
 #, c-format
 msgid "tag '%s' not found."
 msgstr "етикетът „%s“ не е открит."
 
-#: builtin/tag.c:135
 #, c-format
 msgid "Deleted tag '%s' (was %s)\n"
 msgstr "Изтрит е етикетът „%s“ (бе „%s“)\n"
 
-#: builtin/tag.c:170
 #, c-format
 msgid ""
 "\n"
@@ -24172,7 +13058,6 @@ msgstr ""
 "    %s\n"
 "Редовете, които започват с „%c“, ще бъдат пропуснати.\n"
 
-#: builtin/tag.c:174
 #, c-format
 msgid ""
 "\n"
@@ -24187,11 +13072,9 @@ msgstr ""
 "Редовете, които започват с „%c“, също ще бъдат включени — може да ги "
 "изтриете вие.\n"
 
-#: builtin/tag.c:240
 msgid "unable to sign the tag"
 msgstr "етикетът не може да бъде подписан"
 
-#: builtin/tag.c:258
 #, c-format
 msgid ""
 "You have created a nested tag. The object referred to by your new tag is\n"
@@ -24205,330 +13088,265 @@ msgstr ""
 "\n"
 "    git tag -f %s %s^{}"
 
-#: builtin/tag.c:274
 msgid "bad object type."
 msgstr "неправилен вид обект."
 
-#: builtin/tag.c:325
 msgid "no tag message?"
 msgstr "липсва съобщение за етикета"
 
-#: builtin/tag.c:332
 #, c-format
 msgid "The tag message has been left in %s\n"
 msgstr "Съобщението за етикета е запазено във файла „%s“\n"
 
-#: builtin/tag.c:444
 msgid "list tag names"
 msgstr "извеждане на имената на етикетите"
 
-#: builtin/tag.c:446
 msgid "print <n> lines of each tag message"
 msgstr "извеждане на този БРОЙ редове от всяко съобщение за етикет"
 
-#: builtin/tag.c:448
 msgid "delete tags"
 msgstr "изтриване на етикети"
 
-#: builtin/tag.c:449
 msgid "verify tags"
 msgstr "проверка на етикети"
 
-#: builtin/tag.c:451
 msgid "Tag creation options"
 msgstr "Опции при създаването на етикети"
 
-#: builtin/tag.c:453
 msgid "annotated tag, needs a message"
 msgstr "анотирането на етикети изисква съобщение"
 
-#: builtin/tag.c:455
 msgid "tag message"
 msgstr "СЪОБЩЕНИЕ за етикет"
 
-#: builtin/tag.c:457
 msgid "force edit of tag message"
 msgstr "принудително редактиране на съобщение за етикет"
 
-#: builtin/tag.c:458
 msgid "annotated and GPG-signed tag"
 msgstr "анотиран етикет с подпис по GPG"
 
-#: builtin/tag.c:461
 msgid "use another key to sign the tag"
 msgstr "използване на друг ключ за подписването на етикет"
 
-#: builtin/tag.c:462
 msgid "replace the tag if exists"
 msgstr "замяна на етикета, ако съществува"
 
-#: builtin/tag.c:463 builtin/update-ref.c:511
 msgid "create a reflog"
 msgstr "създаване на журнал на указателите"
 
-#: builtin/tag.c:465
 msgid "Tag listing options"
 msgstr "Опции за извеждането на етикети"
 
-#: builtin/tag.c:466
 msgid "show tag list in columns"
 msgstr "извеждане на списъка на етикетите по колони"
 
-#: builtin/tag.c:467 builtin/tag.c:469
 msgid "print only tags that contain the commit"
 msgstr "извеждане само на етикетите, които съдържат подаването"
 
-#: builtin/tag.c:468 builtin/tag.c:470
 msgid "print only tags that don't contain the commit"
 msgstr "извеждане само на етикетите, които не съдържат подаването"
 
-#: builtin/tag.c:471
 msgid "print only tags that are merged"
 msgstr "извеждане само на слетите етикети"
 
-#: builtin/tag.c:472
 msgid "print only tags that are not merged"
 msgstr "извеждане само на неслетите етикети"
 
-#: builtin/tag.c:476
 msgid "print only tags of the object"
 msgstr "извеждане само на етикетите на ОБЕКТА"
 
-#: builtin/tag.c:558
 #, c-format
 msgid "the '%s' option is only allowed in list mode"
 msgstr "опцията „%s“ изисква режим на списък"
 
-#: builtin/tag.c:597
 #, c-format
 msgid "'%s' is not a valid tag name."
 msgstr "„%s“ е неправилно име за етикет."
 
-#: builtin/tag.c:602
 #, c-format
 msgid "tag '%s' already exists"
 msgstr "етикетът „%s“ вече съществува"
 
-#: builtin/tag.c:633
+#, c-format
+msgid "Invalid cleanup mode %s"
+msgstr "Несъществуващ режим на изчистване „%s“"
+
 #, c-format
 msgid "Updated tag '%s' (was %s)\n"
 msgstr "Обновен етикет „%s“ (бе „%s“)\n"
 
-#: builtin/unpack-objects.c:504
+msgid "pack exceeds maximum allowed size"
+msgstr "пакетният файл надвишава максималния възможен размер"
+
 msgid "Unpacking objects"
 msgstr "Разпакетиране на обектите"
 
-#: builtin/update-index.c:84
 #, c-format
 msgid "failed to create directory %s"
 msgstr "директорията „%s“ не може да бъде създадена"
 
-#: builtin/update-index.c:106
 #, c-format
 msgid "failed to delete file %s"
 msgstr "файлът „%s“ не може да бъде изтрит"
 
-#: builtin/update-index.c:113 builtin/update-index.c:219
 #, c-format
 msgid "failed to delete directory %s"
 msgstr "директорията „%s“ не може да бъде изтрита"
 
-#: builtin/update-index.c:138
 #, c-format
 msgid "Testing mtime in '%s' "
-msgstr "Проверка на времето на промяна (mtime) на файла „%s“"
+msgstr "Проверка на времето на промяна (mtime) на „%s“"
 
-#: builtin/update-index.c:152
 msgid "directory stat info does not change after adding a new file"
 msgstr ""
 "информацията получена чрез „stat“ за директорията не се променя след "
 "добавянето на нов файл"
 
-#: builtin/update-index.c:165
 msgid "directory stat info does not change after adding a new directory"
 msgstr ""
 "информацията получена чрез „stat“ за директорията не се променя след "
 "добавянето на нова директория"
 
-#: builtin/update-index.c:178
 msgid "directory stat info changes after updating a file"
 msgstr ""
 "информацията получена чрез „stat“ за директорията се променя след "
 "обновяването на нов файл"
 
-#: builtin/update-index.c:189
 msgid "directory stat info changes after adding a file inside subdirectory"
 msgstr ""
 "информацията получена чрез „stat“ за директорията се променя след добавянето "
 "на файл в поддиректория"
 
-#: builtin/update-index.c:200
 msgid "directory stat info does not change after deleting a file"
 msgstr ""
 "информацията получена чрез „stat“ за директорията не се променя след "
 "изтриването на файл"
 
-#: builtin/update-index.c:213
 msgid "directory stat info does not change after deleting a directory"
 msgstr ""
 "информацията получена чрез „stat“ за директорията не се променя след "
 "изтриването на директория"
 
-#: builtin/update-index.c:220
 msgid " OK"
 msgstr " Добре"
 
-#: builtin/update-index.c:589
 msgid "git update-index [<options>] [--] [<file>...]"
 msgstr "git update-index [ОПЦИЯ…] [--] [ФАЙЛ…]"
 
-#: builtin/update-index.c:974
 msgid "continue refresh even when index needs update"
 msgstr ""
 "продължаване с обновяването, дори когато индексът трябва да бъде обновен"
 
-#: builtin/update-index.c:977
 msgid "refresh: ignore submodules"
 msgstr "подмодулите да се игнорират при обновяването"
 
-#: builtin/update-index.c:980
 msgid "do not ignore new files"
 msgstr "новите файлове да не се игнорират"
 
-#: builtin/update-index.c:982
 msgid "let files replace directories and vice-versa"
 msgstr "файлове да може да заменят директории и обратно"
 
-#: builtin/update-index.c:984
 msgid "notice files missing from worktree"
 msgstr "предупреждаване при липсващи в работното дърво файлове"
 
-#: builtin/update-index.c:986
 msgid "refresh even if index contains unmerged entries"
 msgstr "обновяване дори и индексът да съдържа неслети обекти"
 
-#: builtin/update-index.c:989
 msgid "refresh stat information"
 msgstr "обновяване на информацията от функцията „stat“"
 
-#: builtin/update-index.c:993
 msgid "like --refresh, but ignore assume-unchanged setting"
 msgstr ""
 "като опцията „--refresh“, но да се проверят и обектите, които са били приети "
 "за непроменени"
 
-#: builtin/update-index.c:997
 msgid "<mode>,<object>,<path>"
 msgstr "РЕЖИМ,ОБЕКТ,ПЪТ"
 
-#: builtin/update-index.c:998
 msgid "add the specified entry to the index"
 msgstr "добавяне на изброените обекти към индекса"
 
-#: builtin/update-index.c:1008
 msgid "mark files as \"not changing\""
 msgstr "задаване на флаг, че файлът не се променя"
 
-#: builtin/update-index.c:1011
 msgid "clear assumed-unchanged bit"
 msgstr "изчистване на флага, че файлът не се променя"
 
-#: builtin/update-index.c:1014
 msgid "mark files as \"index-only\""
 msgstr "задаване на флаг, че файловете са само за индекса"
 
-#: builtin/update-index.c:1017
 msgid "clear skip-worktree bit"
-msgstr "изчистване на флага, че файловете са само за индекса"
+msgstr ""
+"изчистване на флага, че файловете са само за индекса (за прескачане на "
+"работното дърво)"
 
-#: builtin/update-index.c:1020
 msgid "do not touch index-only entries"
 msgstr "без промяна на файловете само за индекса"
 
-#: builtin/update-index.c:1022
 msgid "add to index only; do not add content to object database"
 msgstr "добавяне само към индекса без добавяне към базата от данни за обектите"
 
-#: builtin/update-index.c:1024
 msgid "remove named paths even if present in worktree"
 msgstr "изтриване на указаните пътища, дори и да съществуват в работното дърво"
 
-#: builtin/update-index.c:1026
 msgid "with --stdin: input lines are terminated by null bytes"
 msgstr ""
 "при комбиниране с опцията „--stdin“ — входните редове са разделени с нулевия "
 "байт"
 
-#: builtin/update-index.c:1028
 msgid "read list of paths to be updated from standard input"
 msgstr "изчитане на списъка с пътища за обновяване от стандартния вход"
 
-#: builtin/update-index.c:1032
 msgid "add entries from standard input to the index"
 msgstr "добавяне на елементите от стандартния вход към индекса"
 
-#: builtin/update-index.c:1036
 msgid "repopulate stages #2 and #3 for the listed paths"
 msgstr ""
 "възстановяване на състоянието преди сливане или нужда от обновяване за "
 "изброените пътища"
 
-#: builtin/update-index.c:1040
 msgid "only update entries that differ from HEAD"
 msgstr "добавяне само на съдържанието, което се различава от това в „HEAD“"
 
-#: builtin/update-index.c:1044
 msgid "ignore files missing from worktree"
 msgstr "игнориране на файловете, които липсват в работното дърво"
 
-#: builtin/update-index.c:1047
 msgid "report actions to standard output"
 msgstr "извеждане на действията на стандартния изход"
 
-#: builtin/update-index.c:1049
 msgid "(for porcelains) forget saved unresolved conflicts"
 msgstr ""
 "забравяне на записаната информация за неразрешени конфликти — за командите "
 "от потребителско ниво"
 
-#: builtin/update-index.c:1053
 msgid "write index in this format"
 msgstr "записване на индекса в този формат"
 
-#: builtin/update-index.c:1055
 msgid "enable or disable split index"
 msgstr "включване или изключване на разделянето на индекса"
 
-#: builtin/update-index.c:1057
 msgid "enable/disable untracked cache"
 msgstr "включване/изключване на кеша за неследените файлове"
 
-#: builtin/update-index.c:1059
 msgid "test if the filesystem supports untracked cache"
 msgstr "проверка дали файловата система поддържа кеш за неследени файлове"
 
-#: builtin/update-index.c:1061
 msgid "enable untracked cache without testing the filesystem"
 msgstr ""
 "включване на кеша за неследените файлове без проверка на файловата система"
 
-#: builtin/update-index.c:1063
 msgid "write out the index even if is not flagged as changed"
 msgstr "запис на индекса, дори да не е отбелязан като променен"
 
-#: builtin/update-index.c:1065
 msgid "enable or disable file system monitor"
 msgstr "включване или изключване на наблюдението на файловата система"
 
-#: builtin/update-index.c:1067
 msgid "mark files as fsmonitor valid"
 msgstr "отбелязване на файловете, че може да се следят чрез файловата система"
 
-#: builtin/update-index.c:1070
 msgid "clear fsmonitor valid bit"
 msgstr "изчистване на флага за следенето чрез файловата система"
 
-#: builtin/update-index.c:1173
 msgid ""
 "core.splitIndex is set to false; remove or change it, if you really want to "
 "enable split index"
@@ -24536,7 +13354,6 @@ msgstr ""
 "Настройката „core.splitIndex“ е зададена на „false“ (лъжа̀).  Сменете я или я "
 "изтрийте, за да включите разделянето на индекса"
 
-#: builtin/update-index.c:1182
 msgid ""
 "core.splitIndex is set to true; remove or change it, if you really want to "
 "disable split index"
@@ -24544,7 +13361,6 @@ msgstr ""
 "Настройката „core.splitIndex“ е зададена на „true“ (истина).  Сменете я или "
 "я изтрийте, за да изключите разделянето на индекса."
 
-#: 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"
@@ -24552,11 +13368,9 @@ msgstr ""
 "Настройката „core.untrackedCache“ е зададена на „true“ (истина).  Сменете я "
 "или я изтрийте, за да изключите кеша за неследените файлове"
 
-#: builtin/update-index.c:1198
 msgid "Untracked cache disabled"
 msgstr "Кешът за неследените файлове е изключен"
 
-#: 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"
@@ -24564,175 +13378,135 @@ msgstr ""
 "Настройката „core.untrackedCache“ е зададена на „false“ (лъжа̀).  Сменете я "
 "или я изтрийте, за да включите кеша за неследените файлове"
 
-#: builtin/update-index.c:1210
 #, c-format
 msgid "Untracked cache enabled for '%s'"
 msgstr "Кешът за неследените файлове е включен за „%s“"
 
-#: 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:1222
 msgid "fsmonitor enabled"
 msgstr "следенето чрез файловата система е включено"
 
-#: 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:1229
 msgid "fsmonitor disabled"
 msgstr "следенето чрез файловата система е изключено"
 
-#: builtin/update-ref.c:10
 msgid "git update-ref [<options>] -d <refname> [<old-val>]"
 msgstr "git update-ref [ОПЦИЯ…] -d ИМЕ_НА_УКАЗАТЕЛ [СТАРА_СТОЙНОСТ]"
 
-#: builtin/update-ref.c:11
 msgid "git update-ref [<options>]    <refname> <new-val> [<old-val>]"
 msgstr "git update-ref [ОПЦИЯ…] ИМЕ_НА_УКАЗАТЕЛ НОВА_СТОЙНОСТ [СТАРА_СТОЙНОСТ]"
 
-#: builtin/update-ref.c:12
 msgid "git update-ref [<options>] --stdin [-z]"
 msgstr "git update-ref [ОПЦИЯ…] --stdin [-z]"
 
-#: builtin/update-ref.c:506
 msgid "delete the reference"
 msgstr "изтриване на указателя"
 
-#: builtin/update-ref.c:508
 msgid "update <refname> not the one it points to"
 msgstr "обновяване на ИМЕто_НА_УКАЗАТЕЛя, а не това, към което сочи"
 
-#: builtin/update-ref.c:509
 msgid "stdin has NUL-terminated arguments"
 msgstr ""
 "някои от елементите подадени на стандартния вход завършват с нулевия знак "
 "„NUL“"
 
-#: builtin/update-ref.c:510
 msgid "read updates from stdin"
 msgstr "изчитане на указателите от стандартния вход"
 
-#: builtin/update-server-info.c:7
-msgid "git update-server-info [--force]"
-msgstr "git update-server-info [--force]"
-
-#: builtin/update-server-info.c:15
 msgid "update the info files from scratch"
 msgstr "обновяване на информационните файлове от нулата"
 
-#: builtin/upload-pack.c:11
 msgid "git upload-pack [<options>] <dir>"
 msgstr "git upload-pack [ОПЦИЯ…] ДИРЕКТОРИЯ"
 
-#: 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:26
 msgid "serve up the info/refs for git-http-backend"
 msgstr "доставяне на информацията/указателите за „git-http-backend“"
 
-#: builtin/upload-pack.c:29
 msgid "do not try <directory>/.git/ if <directory> is no Git directory"
 msgstr ""
 "да не се търси „ДИРЕКТОРИЯ/.git/“, ако ДИРЕКТОРИЯта не е под контрола на Git"
 
-#: 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-commit [-v | --verbose] ПОДАВАНЕ…"
 
-#: builtin/verify-commit.c:68
 msgid "print commit contents"
 msgstr "извеждане на съдържанието на подаването"
 
-#: builtin/verify-commit.c:69 builtin/verify-tag.c:37
 msgid "print raw gpg status output"
 msgstr "извеждане на необработения изход от състоянието на „gpg“"
 
-#: builtin/verify-pack.c:59
 msgid "git verify-pack [-v | --verbose] [-s | --stat-only] <pack>..."
 msgstr "git verify-pack [-v | --verbose] [-s | --stat-only] ПАКЕТ…"
 
-#: builtin/verify-pack.c:70
 msgid "verbose"
 msgstr "извеждане на подробна информация"
 
-#: builtin/verify-pack.c:72
 msgid "show statistics only"
 msgstr "извеждане само на статистиката"
 
-#: builtin/verify-tag.c:18
 msgid "git verify-tag [-v | --verbose] [--format=<format>] <tag>..."
 msgstr "git verify-tag [-v | --verbose] [--format=ФОРМАТ] ЕТИКЕТ…"
 
-#: builtin/verify-tag.c:36
 msgid "print tag contents"
 msgstr "извеждане на съдържанието на ЕТИКЕТи"
 
-#: builtin/worktree.c:19
 msgid "git worktree add [<options>] <path> [<commit-ish>]"
 msgstr "git worktree add [ОПЦИЯ…] ПЪТ [УКАЗАТЕЛ_КЪМ_ПОДАВАНЕ]"
 
-#: builtin/worktree.c:20
 msgid "git worktree list [<options>]"
 msgstr "git worktree list [ОПЦИЯ…]"
 
-#: builtin/worktree.c:21
 msgid "git worktree lock [<options>] <path>"
 msgstr "git worktree lock [ОПЦИЯ…] [ПЪТ]"
 
-#: builtin/worktree.c:22
 msgid "git worktree move <worktree> <new-path>"
 msgstr "git worktree move [ДЪРВО] [НОВ_ПЪТ]"
 
-#: builtin/worktree.c:23
 msgid "git worktree prune [<options>]"
 msgstr "git worktree prune [ОПЦИЯ…]"
 
-#: builtin/worktree.c:24
 msgid "git worktree remove [<options>] <worktree>"
 msgstr "git worktree remove [ОПЦИЯ…] [ДЪРВО]"
 
-#: builtin/worktree.c:25
+msgid "git worktree repair [<path>...]"
+msgstr "git worktree repair [ПЪТ…]"
+
 msgid "git worktree unlock <path>"
 msgstr "git worktree unlock [ПЪТ]"
 
-#: builtin/worktree.c:75
 #, c-format
 msgid "Removing %s/%s: %s"
 msgstr "Изтриване на „%s/%s“: %s"
 
-#: builtin/worktree.c:148
 msgid "report pruned working trees"
 msgstr "докладване на окастрените работни дървета"
 
-#: builtin/worktree.c:150
 msgid "expire working trees older than <time>"
 msgstr "обявяване на работните копия по-стари от това ВРЕМЕ за остарели"
 
-#: builtin/worktree.c:220
 #, c-format
 msgid "'%s' already exists"
 msgstr "„%s“ вече съществува"
 
-#: builtin/worktree.c:229
 #, c-format
 msgid "unusable worktree destination '%s'"
 msgstr "целта не може да се ползва за работно дърво: „%s“"
 
-#: builtin/worktree.c:234
 #, c-format
 msgid ""
 "'%s' is a missing but locked worktree;\n"
@@ -24742,7 +13516,6 @@ msgstr ""
 "За изрично задаване ползвайте „%s -f -f“, а за изчистване —\n"
 "„unlock“, „prune“ или „remove“"
 
-#: builtin/worktree.c:236
 #, c-format
 msgid ""
 "'%s' is a missing but already registered worktree;\n"
@@ -24752,133 +13525,125 @@ msgstr ""
 "За изрично задаване ползвайте „%s -f“, а за изчистване —\n"
 "„prune“ или „remove“"
 
-#: builtin/worktree.c:287
+#, c-format
+msgid "failed to copy '%s' to '%s'; sparse-checkout may not work correctly"
+msgstr ""
+"неуспешно копиране на „%s“ към „%s“.  Частичното изтегляне може и да не "
+"сработи"
+
+#, c-format
+msgid "failed to copy worktree config from '%s' to '%s'"
+msgstr "неуспешно копиране на настройките на работното дърво „%s“ към „%s“"
+
+#, c-format
+msgid "failed to unset '%s' in '%s'"
+msgstr "„%s“ не може да се изчисти в „%s“"
+
 #, c-format
 msgid "could not create directory of '%s'"
 msgstr "директорията „%s“ не може да бъде създадена"
 
-#: builtin/worktree.c:309
 msgid "initializing"
 msgstr "инициализация"
 
-#: builtin/worktree.c:420 builtin/worktree.c:426
 #, c-format
 msgid "Preparing worktree (new branch '%s')"
 msgstr "Приготвяне на работното дърво (нов клон „%s“)"
 
-#: builtin/worktree.c:422
 #, c-format
 msgid "Preparing worktree (resetting branch '%s'; was at %s)"
 msgstr ""
 "Приготвяне на работното дърво (зануляване на клона „%s“, който сочеше към "
 "„%s“)"
 
-#: builtin/worktree.c:431
 #, c-format
 msgid "Preparing worktree (checking out '%s')"
 msgstr "Приготвяне на работното дърво (изтегляне на „%s“)"
 
-#: builtin/worktree.c:437
 #, c-format
 msgid "Preparing worktree (detached HEAD %s)"
 msgstr "Подготвяне на работно дърво (указателят „HEAD“ не свързан: %s)"
 
-#: builtin/worktree.c:482
 msgid "checkout <branch> even if already checked out in other worktree"
 msgstr "Изтегляне КЛОНа, дори и да е изтеглен в друго работно дърво"
 
-#: builtin/worktree.c:485
 msgid "create a new branch"
 msgstr "създаване на нов клон"
 
-#: builtin/worktree.c:487
 msgid "create or reset a branch"
 msgstr "създаване или зануляване на клони"
 
-#: builtin/worktree.c:489
 msgid "populate the new working tree"
 msgstr "подготвяне на новото работно дърво"
 
-#: builtin/worktree.c:490
 msgid "keep the new working tree locked"
 msgstr "новото работно дърво да остане заключено"
 
-#: builtin/worktree.c:492 builtin/worktree.c:729
 msgid "reason for locking"
 msgstr "причина за заключване"
 
-#: builtin/worktree.c:495
 msgid "set up tracking mode (see git-branch(1))"
 msgstr "задаване на режима на следене (виж git-branch(1))"
 
-#: builtin/worktree.c:498
 msgid "try to match the new branch name with a remote-tracking branch"
 msgstr "опит за напасване на името на новия клон с това на следящ клон"
 
-#: builtin/worktree.c:512
+#, c-format
+msgid "options '%s', '%s', and '%s' cannot be used together"
+msgstr "опциите „%s“, „%s“ и „%s“ са несъвместими"
+
 msgid "added with --lock"
 msgstr "добавена с „--lock“"
 
-#: builtin/worktree.c:574
 msgid "--[no-]track can only be used if a new branch is created"
 msgstr "„--[no-]track“ може да се използва само при създаването на нов клон"
 
-#: builtin/worktree.c:691
 msgid "show extended annotations and reasons, if available"
 msgstr "извеждане на подробни анотации и обяснения, ако такива са налични"
 
-#: builtin/worktree.c:693
 msgid "add 'prunable' annotation to worktrees older than <time>"
 msgstr ""
 "добавяне на анотация за окастряне на работните копия по-стари от това ВРЕМЕ"
 
-#: builtin/worktree.c:741 builtin/worktree.c:774 builtin/worktree.c:848
-#: builtin/worktree.c:972
+msgid "terminate records with a NUL character"
+msgstr "разделяне на записите с нулевия знак „NUL“"
+
 #, c-format
 msgid "'%s' is not a working tree"
 msgstr "„%s“ не е работно дърво"
 
-#: builtin/worktree.c:743 builtin/worktree.c:776
 msgid "The main working tree cannot be locked or unlocked"
 msgstr "Основното дърво не може да се отключи или заключи"
 
-#: builtin/worktree.c:748
 #, c-format
 msgid "'%s' is already locked, reason: %s"
 msgstr "„%s“ вече е заключено, защото „%s“"
 
-#: builtin/worktree.c:750
 #, c-format
 msgid "'%s' is already locked"
 msgstr "„%s“ вече е заключено"
 
-#: builtin/worktree.c:778
 #, c-format
 msgid "'%s' is not locked"
 msgstr "„%s“ не е заключено"
 
-#: builtin/worktree.c:819
 msgid "working trees containing submodules cannot be moved or removed"
 msgstr ""
 "не може да местите или изтривате работни дървета, в които има подмодули"
 
-#: builtin/worktree.c:827
 msgid "force move even if worktree is dirty or locked"
 msgstr ""
 "принудително преместване, дори работното дърво да не е чисто или да е "
 "заключено"
 
-#: builtin/worktree.c:850 builtin/worktree.c:974
 #, c-format
 msgid "'%s' is a main working tree"
 msgstr "„%s“ е основно работно дърво"
 
-#: builtin/worktree.c:855
 #, c-format
 msgid "could not figure out destination name from '%s'"
 msgstr "името на целта не може да се определи от „%s“"
 
-#: builtin/worktree.c:868
 #, c-format
 msgid ""
 "cannot move a locked working tree, lock reason: %s\n"
@@ -24887,7 +13652,6 @@ msgstr ""
 "не може да преместите заключено работно дърво, причина за заключването: %s\n"
 "или го отключете, или го преместете принудително с „move -f -f“"
 
-#: builtin/worktree.c:870
 msgid ""
 "cannot move a locked working tree;\n"
 "use 'move -f -f' to override or unlock first"
@@ -24895,41 +13659,34 @@ msgstr ""
 "не може да преместите заключено работно дърво:\n"
 "или го отключете, или го преместете принудително с „move -f -f“"
 
-#: builtin/worktree.c:873
 #, c-format
 msgid "validation failed, cannot move working tree: %s"
 msgstr ""
 "проверките са неуспешни, работното дърво не може да бъде преместено: %s"
 
-#: builtin/worktree.c:878
 #, c-format
 msgid "failed to move '%s' to '%s'"
 msgstr "„%s“ не може да се премести в „%s“"
 
-#: builtin/worktree.c:924
 #, c-format
 msgid "failed to run 'git status' on '%s'"
 msgstr "неуспешно изпълнение на „git status“ върху „%s“"
 
-#: builtin/worktree.c:928
 #, c-format
 msgid "'%s' contains modified or untracked files, use --force to delete it"
 msgstr ""
 "„%s“ съдържа променени или нови файлове, за принудително изтриване е "
 "необходима опцията „--force“"
 
-#: builtin/worktree.c:933
 #, c-format
 msgid "failed to run 'git status' on '%s', code %d"
 msgstr ""
 "командата „git status“ не може да се изпълни за „%s“, код за грешка: %d"
 
-#: builtin/worktree.c:956
 msgid "force removal even if worktree is dirty or locked"
 msgstr ""
 "принудително изтриване, дори работното дърво да не е чисто или да е заключено"
 
-#: builtin/worktree.c:979
 #, c-format
 msgid ""
 "cannot remove a locked working tree, lock reason: %s\n"
@@ -24938,7 +13695,6 @@ msgstr ""
 "не може да изтриете заключено работно дърво, причина за заключването: %s\n"
 "или го отключете, или го изтрийте принудително с „remove -f -f“"
 
-#: builtin/worktree.c:981
 msgid ""
 "cannot remove a locked working tree;\n"
 "use 'remove -f -f' to override or unlock first"
@@ -24946,1519 +13702,8321 @@ msgstr ""
 "не може да изтриете заключено работно дърво:\n"
 "или го отключете, или го изтрийте принудително с „remove -f -f“"
 
-#: builtin/worktree.c:984
 #, c-format
 msgid "validation failed, cannot remove working tree: %s"
 msgstr "проверките са неуспешни, работното дърво не може да бъде изтрито: %s"
 
-#: builtin/worktree.c:1008
 #, c-format
 msgid "repair: %s: %s"
 msgstr "поправяне: %s: „%s“"
 
-#: builtin/worktree.c:1011
 #, c-format
 msgid "error: %s: %s"
 msgstr "грешка: %s: „%s“"
 
-#: builtin/write-tree.c:15
 msgid "git write-tree [--missing-ok] [--prefix=<prefix>/]"
 msgstr "git write-tree [--missing-ok] [--prefix=ПРЕФИКС/]"
 
-#: builtin/write-tree.c:28
 msgid "<prefix>/"
 msgstr "ПРЕФИКС/"
 
-#: builtin/write-tree.c:29
 msgid "write tree object for a subdirectory <prefix>"
 msgstr "запис на обект-дърво за поддиректорията започваща с тази ПРЕФИКС"
 
-#: builtin/write-tree.c:31
 msgid "only useful for debugging"
 msgstr "само за изчистване на грешки"
 
-#: git.c:28
-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"
-"           [--git-dir=<path>] [--work-tree=<path>] [--namespace=<name>]\n"
-"           [--super-prefix=<path>] [--config-env=<name>=<envvar>]\n"
-"           <command> [<args>]"
-msgstr ""
-"git [--version] [--help] [-C ПЪТ] [-c ИМЕ=СТОЙНОСТ]\n"
-"           [--exec-path[=ПЪТ]] [--html-path] [--man-path] [--info-path]\n"
-"           [-p | --paginate | -P | --no-pager] [--no-replace-objects] [--"
-"bare]\n"
-"           [--git-dir=ПЪТ] [--work-tree=ПЪТ] [--namespace=ИМЕ]\n"
-"           [--super-prefix=ПЪТ] [--config-env=ИМЕ=ПРОМЕНЛИВА_НА_СРЕДАТА]\n"
-"           КОМАНДА [АРГ…]"
-
-#: git.c:36
-msgid ""
-"'git help -a' and 'git help -g' list available subcommands and some\n"
-"concept guides. See 'git help <command>' or 'git help <concept>'\n"
-"to read about a specific subcommand or concept.\n"
-"See 'git help git' for an overview of the system."
-msgstr ""
-"„git help -a“ извежда наличните подкоманди, а „git help -g“ извежда "
-"наличните\n"
-"въведения.  За помощ за специфична КОМАНДА ползвайте „git help КОМАНДА“, а "
-"за\n"
-"някое определено ПОНЯТИЕ използвайте „git help ПОНЯТИЕ“.  За преглед на\n"
-"системата за помощ използвайте „git help git“."
-
-#: git.c:188 git.c:216 git.c:300
-#, c-format
-msgid "no directory given for '%s' option\n"
-msgstr "опцията „%s“ изисква директория\n"
-
-#: git.c:202
-#, c-format
-msgid "no namespace given for --namespace\n"
-msgstr "опцията „--namespace“ изисква име\n"
-
-#: git.c:230
-#, c-format
-msgid "no prefix given for --super-prefix\n"
-msgstr "опцията „--super-prefix“ изисква префикс\n"
-
-#: git.c:252
-#, c-format
-msgid "-c expects a configuration string\n"
-msgstr "опцията „-c“ изисква низ за настройка\n"
-
-#: git.c:260
-#, c-format
-msgid "no config key given for --config-env\n"
-msgstr "опцията „--config-env“ изисква ключ\n"
-
-#: git.c:326
 #, c-format
-msgid "unknown option: %s\n"
-msgstr "непозната опция: „%s“\n"
-
-#: git.c:375
-#, c-format
-msgid "while expanding alias '%s': '%s'"
-msgstr "при заместването на псевдоним „%s“: „%s“"
-
-#: git.c:384
-#, c-format
-msgid ""
-"alias '%s' changes environment variables.\n"
-"You can use '!git' in the alias to do this"
-msgstr ""
-"псевдонимът „%s“ променя променливи на средата.\n"
-"За това може да ползвате „!git“ в псевдонима"
-
-#: git.c:391
-#, c-format
-msgid "empty alias for %s"
-msgstr "празен псевдоним за „%s“"
-
-#: git.c:394
-#, c-format
-msgid "recursive alias: %s"
-msgstr "зациклен псевдоним: „%s“"
-
-#: git.c:479
-msgid "write failure on standard output"
-msgstr "грешка при запис на стандартния изход"
-
-#: git.c:481
-msgid "unknown write failure on standard output"
-msgstr "неизвестна грешка при запис на стандартния изход"
-
-#: git.c:483
-msgid "close failed on standard output"
-msgstr "грешка при затваряне на стандартния изход"
-
-#: git.c:835
-#, c-format
-msgid "alias loop detected: expansion of '%s' does not terminate:%s"
-msgstr "зацикляне в псевдонимите: заместванията на „%s“ не приключват:%s"
-
-#: git.c:885
-#, c-format
-msgid "cannot handle %s as a builtin"
-msgstr "„%s“ не може да се обработи като вградена команда"
-
-#: git.c:898
-#, c-format
-msgid ""
-"usage: %s\n"
-"\n"
-msgstr ""
-"употреба: %s\n"
-"\n"
-
-#: git.c:918
-#, c-format
-msgid "expansion of alias '%s' failed; '%s' is not a git command\n"
-msgstr ""
-"неуспешно заместване на псевдонима „%s“ — резултатът „%s“ не е команда на "
-"git\n"
-
-#: git.c:930
-#, c-format
-msgid "failed to run command '%s': %s\n"
-msgstr "командата „%s“ не може да се изпълни: %s\n"
-
-#: http-fetch.c:128
-#, c-format
-msgid "argument to --packfile must be a valid hash (got '%s')"
-msgstr "опцията „--packfile“ изисква валидна контролна сума (а не „%s“)"
-
-#: http-fetch.c:138
-msgid "not a git repository"
-msgstr "не е хранилище на Git"
-
-#: t/helper/test-fast-rebase.c:141
-msgid "unhandled options"
-msgstr "неподдържани опции"
-
-#: t/helper/test-fast-rebase.c:146
-msgid "error preparing revisions"
-msgstr "грешка при подготовката на версии"
-
-#: t/helper/test-reach.c:154
-#, c-format
-msgid "commit %s is not marked reachable"
-msgstr "подаването „%s“ не е отбелязано като достижимо"
-
-#: t/helper/test-reach.c:164
-msgid "too many commits marked reachable"
-msgstr "прекалено много подавания са отбелязани като достижими"
-
-#: t/helper/test-serve-v2.c:7
-msgid "test-tool serve-v2 [<options>]"
-msgstr "test-tool serve-v2 [ОПЦИЯ…]"
-
-#: t/helper/test-serve-v2.c:19
-msgid "exit immediately after advertising capabilities"
-msgstr "изход след първоначалната обява на възможностите"
-
-#: 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:582
-msgid "test-helper simple-ipc run-daemon   [<name>] [<threads>]"
-msgstr "test-helper simple-ipc run-daemon   [ИМЕ] [НИШКИ]"
-
-#: 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:584
-msgid "test-helper simple-ipc stop-daemon  [<name>] [<max-wait>]"
-msgstr "test-helper simple-ipc stop-daemon  [ИМЕ] [ИЗЧАКВАНЕ]"
-
-#: 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:586
-msgid "test-helper simple-ipc sendbytes    [<name>] [<bytecount>] [<byte>]"
-msgstr "test-helper simple-ipc sendbytes    [ИМЕ] [БРОЙ_БАЙТОВЕ] [РАЗМЕР]"
-
-#: t/helper/test-simple-ipc.c:587
-msgid ""
-"test-helper simple-ipc multiple     [<name>] [<threads>] [<bytecount>] "
-"[<batchsize>]"
-msgstr ""
-"test-helper simple-ipc multiple     [ИМЕ] [НИШКИ] [БРОЙ_БАЙТОВЕ] "
-"[РАЗМЕР_НА_ПАКЕТА]"
-
-#: t/helper/test-simple-ipc.c:595
-msgid "name or pathname of unix domain socket"
-msgstr "име или път за гнездото на Unix"
-
-#: t/helper/test-simple-ipc.c:597
-msgid "named-pipe name"
-msgstr "име на именован канал"
-
-#: t/helper/test-simple-ipc.c:599
-msgid "number of threads in server thread pool"
-msgstr "брой нишки в запаса нишки"
-
-#: t/helper/test-simple-ipc.c:600
-msgid "seconds to wait for daemon to start or stop"
-msgstr "секунди изчакване на демона да стартира или спре"
-
-#: t/helper/test-simple-ipc.c:602
-msgid "number of bytes"
-msgstr "брой байтове"
-
-#: t/helper/test-simple-ipc.c:603
-msgid "number of requests per thread"
-msgstr "брой заявки на нишка"
-
-#: t/helper/test-simple-ipc.c:605
-msgid "byte"
-msgstr "байта"
-
-#: t/helper/test-simple-ipc.c:605
-msgid "ballast character"
-msgstr "знаци за пращане"
-
-#: t/helper/test-simple-ipc.c:606
-msgid "token"
-msgstr "лексема"
-
-#: t/helper/test-simple-ipc.c:606
-msgid "command token to send to the server"
-msgstr "командна лексема за пращане"
-
-#: http.c:350
-#, c-format
-msgid "negative value for http.postbuffer; defaulting to %d"
-msgstr ""
-"отрицателна стойност за „http.postbuffer“.  Ще се ползва стандартната: %d"
-
-#: http.c:371
-msgid "Delegation control is not supported with cURL < 7.22.0"
-msgstr "Управлението на делегирането не се поддържа от cURL < 7.22.0"
-
-#: http.c:380
-msgid "Public key pinning not supported with cURL < 7.39.0"
-msgstr "Задаването на постоянен публичен ключ не се поддържа от cURL < 7.39.0"
-
-#: http.c:812
-msgid "CURLSSLOPT_NO_REVOKE not supported with cURL < 7.44.0"
-msgstr "„CURLSSLOPT_NO_REVOKE“ не се поддържа от cURL < 7.44.0"
-
-#: http.c:1016
-#, c-format
-msgid "Unsupported SSL backend '%s'. Supported SSL backends:"
-msgstr "Неподдържана реализация на SSL „%s“. Поддържат се:"
-
-#: 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:1027
-#, c-format
-msgid "Could not set SSL backend to '%s': already set"
-msgstr ""
-"Реализацията на SSL не може да се зададе да е „%s“, защото вече е зададена "
-"друга"
-
-#: http.c:1876
-#, c-format
-msgid ""
-"unable to update url base from redirection:\n"
-"  asked for: %s\n"
-"   redirect: %s"
-msgstr ""
-"базовият адрес не може да се обнови след пренасочване:\n"
-"    ● заявен адрес: %s\n"
-"    ● пренасочване: %s"
-
-#: remote-curl.c:183
-#, c-format
-msgid "invalid quoting in push-option value: '%s'"
-msgstr ""
-"неправилно екраниране или цитиране в стойността към опция за изтласкване: "
-"„%s“"
-
-#: remote-curl.c:304
-#, c-format
-msgid "%sinfo/refs not valid: is this a git repository?"
-msgstr "„%sinfo/refs“ е неизползваемо, проверете дали е хранилище на git"
-
-#: remote-curl.c:405
-msgid "invalid server response; expected service, got flush packet"
-msgstr ""
-"неправилен отговор от сървъра: очакваше се услуга, а бе получен изчистващ "
-"пакет „flush“"
+msgid "unrecognized bundle hash algorithm: %s"
+msgstr "непознат алгоритъм за контролни суми за пратки „%s“"
 
-#: remote-curl.c:436
 #, c-format
-msgid "invalid server response; got '%s'"
-msgstr "неправилен отговор от сървъра, бе получено: „%s“"
+msgid "unknown capability '%s'"
+msgstr "непозната възможност „%s“"
 
-#: remote-curl.c:496
 #, c-format
-msgid "repository '%s' not found"
-msgstr "хранилището „%s“ липсва"
+msgid "'%s' does not look like a v2 or v3 bundle file"
+msgstr "Файлът „%s“ не изглежда да е пратка на git версия 2 или 3"
 
-#: remote-curl.c:500
 #, c-format
-msgid "Authentication failed for '%s'"
-msgstr "Неуспешна идентификация към „%s“"
+msgid "unrecognized header: %s%s (%d)"
+msgstr "непозната заглавна част: %s%s (%d)"
 
-#: remote-curl.c:504
-#, c-format
-msgid "unable to access '%s' with http.pinnedPubkey configuration: %s"
-msgstr "няма достъп до „%s“ със следната настройка на „http.pinnedPubkey“: %s"
+msgid "Repository lacks these prerequisite commits:"
+msgstr "В хранилището липсват следните необходими подавания:"
 
-#: remote-curl.c:508
-#, c-format
-msgid "unable to access '%s': %s"
-msgstr "няма достъп до „%s“: %s"
+msgid "need a repository to verify a bundle"
+msgstr "за проверката на пратка е необходимо хранилище"
 
-#: remote-curl.c:514
 #, c-format
-msgid "redirecting to %s"
-msgstr "пренасочване към „%s“"
-
-#: remote-curl.c:645
-msgid "shouldn't have EOF when not gentle on EOF"
-msgstr "получен е EOF, в режим без поддръжка за това"
-
-#: remote-curl.c:657
-msgid "remote server sent unexpected response end packet"
-msgstr "отдалеченият сървър прати неочакван пакет за край на отговор"
+msgid "The bundle contains this ref:"
+msgid_plural "The bundle contains these %<PRIuMAX> refs:"
+msgstr[0] "Пратката съдържа следния указател:"
+msgstr[1] "Пратката съдържа следните %<PRIuMAX> указатели:"
 
-#: remote-curl.c:726
-msgid "unable to rewind rpc post data - try increasing http.postBuffer"
-msgstr ""
-"данните за POST не може да се прочетат наново, пробвайте да увеличите "
-"настройката „http.postBuffer“"
+msgid "The bundle records a complete history."
+msgstr "Пратката съдържа пълна история."
 
-#: remote-curl.c:755
 #, c-format
-msgid "remote-curl: bad line length character: %.4s"
-msgstr "remote-curl: неправилeн знак за дължина на ред: %.4s"
-
-#: remote-curl.c:757
-msgid "remote-curl: unexpected response end packet"
-msgstr "remote-curl: неочакван пакет за край на отговор"
+msgid "The bundle requires this ref:"
+msgid_plural "The bundle requires these %<PRIuMAX> refs:"
+msgstr[0] "Пратката изисква следния указател:"
+msgstr[1] "Пратката изисква следните %<PRIuMAX> указатели:"
 
-#: remote-curl.c:833
-#, c-format
-msgid "RPC failed; %s"
-msgstr "Неуспешно отдалечено извикване.  %s"
+msgid "unable to dup bundle descriptor"
+msgstr "неуспешно дублиране на дескриптора на пратката с „dup“"
 
-#: remote-curl.c:873
-msgid "cannot handle pushes this big"
-msgstr "толкова големи изтласквания не може да се изпълнят"
+msgid "Could not spawn pack-objects"
+msgstr "Командата „git pack-objects“ не може да бъде стартирана"
 
-#: remote-curl.c:986
-#, c-format
-msgid "cannot deflate request; zlib deflate error %d"
-msgstr ""
-"заявката не може да бъде декомпресирана, грешка от „zlib“ при "
-"декомпресиране: %d"
+msgid "pack-objects died"
+msgstr "Командата „git pack-objects“ не завърши успешно"
 
-#: remote-curl.c:990
 #, c-format
-msgid "cannot deflate request; zlib end error %d"
+msgid "ref '%s' is excluded by the rev-list options"
 msgstr ""
-"заявката не може да бъде декомпресирана; грешка от „zlib“ при завършване: %d<"
-
-#: remote-curl.c:1040
-#, c-format
-msgid "%d bytes of length header were received"
-msgstr "получени са %d байта от заглавна част"
-
-#: remote-curl.c:1042
-#, c-format
-msgid "%d bytes of body are still expected"
-msgstr "очакват се още %d байта от тялото на отговора"
-
-#: remote-curl.c:1131
-msgid "dumb http transport does not support shallow capabilities"
-msgstr "опростеният транспорт по http не поддържа плитки клиенти"
-
-#: remote-curl.c:1146
-msgid "fetch failed."
-msgstr "неуспешно доставяне."
-
-#: remote-curl.c:1192
-msgid "cannot fetch by sha1 over smart http"
-msgstr "умният вариант на http не може да доставя по SHA1"
-
-#: remote-curl.c:1236 remote-curl.c:1242
-#, c-format
-msgid "protocol error: expected sha/ref, got '%s'"
-msgstr "протоколна грешка: очаква се SHA1 или указател, а бе получено: „%s“"
-
-#: remote-curl.c:1254 remote-curl.c:1372
-#, c-format
-msgid "http transport does not support %s"
-msgstr "транспортът по http не поддържа „%s“"
-
-#: remote-curl.c:1290
-msgid "git-http-push failed"
-msgstr "неуспешно изпълнение на „git-http-push“"
-
-#: remote-curl.c:1478
-msgid "remote-curl: usage: git remote-curl <remote> [<url>]"
-msgstr "remote-curl: употреба: git remote-curl ХРАНИЛИЩЕ [АДРЕС]"
-
-#: remote-curl.c:1510
-msgid "remote-curl: error reading command stream from git"
-msgstr "remote-curl: грешка при изчитането на потока команди от git"
-
-#: remote-curl.c:1517
-msgid "remote-curl: fetch attempted without a local repo"
-msgstr "remote-curl: опит за доставяне без локално хранилище"
-
-#: remote-curl.c:1558
-#, c-format
-msgid "remote-curl: unknown command '%s' from git"
-msgstr "remote-curl: непозната команда „%s“ от git"
-
-#: contrib/scalar/scalar.c:49
-msgid "need a working directory"
-msgstr "необходима е работна директория"
-
-#: contrib/scalar/scalar.c:86
-msgid "could not find enlistment root"
-msgstr "началната зачислена директория не може да бъде открита"
-
-#: contrib/scalar/scalar.c:89 contrib/scalar/scalar.c:351
-#: contrib/scalar/scalar.c:436 contrib/scalar/scalar.c:579
-#, c-format
-msgid "could not switch to '%s'"
-msgstr "не може да се премине към „%s“"
+"указателят „%s“ не е бил включен поради опциите зададени на „git rev-list“"
 
-#: contrib/scalar/scalar.c:180
 #, c-format
-msgid "could not configure %s=%s"
-msgstr "настройката „%s=%s“ не може да се зададе"
-
-#: contrib/scalar/scalar.c:198
-msgid "could not configure log.excludeDecoration"
-msgstr "„log.excludeDecoration“ не може да се настрои"
-
-#: contrib/scalar/scalar.c:219
-msgid "Scalar enlistments require a worktree"
-msgstr "Зачисляването на директории чрез „scalar“ изисква работно дърво"
+msgid "unsupported bundle version %d"
+msgstr "неподдържана версия на индекса %d"
 
-#: contrib/scalar/scalar.c:311
 #, c-format
-msgid "remote HEAD is not a branch: '%.*s'"
-msgstr "отдалеченият указател „HEAD“ не сочи към клон: „%.*s“"
-
-#: contrib/scalar/scalar.c:317
-msgid "failed to get default branch name from remote; using local default"
-msgstr ""
-"името на стандартния клон на отдалеченото хранилище не може да се получи, "
-"затова ще се ползва локално настроеното име на стандартния клон"
-
-#: contrib/scalar/scalar.c:330
-msgid "failed to get default branch name"
-msgstr "неуспешно получаване на името на стандартния клон"
-
-#: contrib/scalar/scalar.c:341
-msgid "failed to unregister repository"
-msgstr "хранилището не може да бъде отчислено"
-
-#: contrib/scalar/scalar.c:356
-msgid "failed to delete enlistment directory"
-msgstr "зачислената директория не може да бъде изтрита"
-
-#: contrib/scalar/scalar.c:376
-msgid "branch to checkout after clone"
-msgstr "към кой клон да се премине след клониране"
-
-#: contrib/scalar/scalar.c:378
-msgid "when cloning, create full working directory"
-msgstr "при клониране да се създава пълна работна директория"
-
-#: contrib/scalar/scalar.c:380
-msgid "only download metadata for the branch that will be checked out"
-msgstr "да се свалят метаданните само за изтегляния клон"
+msgid "cannot write bundle version %d with algorithm %s"
+msgstr "пратка %d не може да се запише с алгоритъм %s"
 
-#: contrib/scalar/scalar.c:385
-msgid "scalar clone [<options>] [--] <repo> [<dir>]"
-msgstr "scalar clone [ОПЦИЯ…] [--] ХРАНИЛИЩЕ [ДИРЕКТОРИЯ]"
+msgid "Refusing to create empty bundle."
+msgstr "Създаването на празна пратка е невъзможно."
 
-#: contrib/scalar/scalar.c:410
 #, c-format
-msgid "cannot deduce worktree name from '%s'"
-msgstr "името на работното дърво не може да се извлече от „%s“"
+msgid "cannot create '%s'"
+msgstr "файлът „%s“ не може да бъде създаден"
 
-#: contrib/scalar/scalar.c:419
-#, c-format
-msgid "directory '%s' exists already"
-msgstr "директорията „%s“ вече съществува"
+msgid "index-pack died"
+msgstr "командата „git index-pack“ не завърши успешно"
 
-#: contrib/scalar/scalar.c:446
-#, c-format
-msgid "failed to get default branch for '%s'"
-msgstr "основният клон на „%s“ не може да бъде получен"
+msgid "terminating chunk id appears earlier than expected"
+msgstr "идентификаторът за краен откъс се явява по-рано от очакваното"
 
-#: contrib/scalar/scalar.c:457
 #, c-format
-msgid "could not configure remote in '%s'"
-msgstr "отдалеченото хранилище в „%s“ не може да се настрои"
+msgid "improper chunk offset(s) %<PRIx64> and %<PRIx64>"
+msgstr "неправилно отместване на откъс/и %<PRIx64> и %<PRIx64>"
 
-#: contrib/scalar/scalar.c:466
 #, c-format
-msgid "could not configure '%s'"
-msgstr "„%s“ не може да се настрои"
-
-#: contrib/scalar/scalar.c:469
-msgid "partial clone failed; attempting full clone"
-msgstr "неуспешно създаване на непълно хранилище, ще се опита пълно хранилище"
-
-#: contrib/scalar/scalar.c:473
-msgid "could not configure for full clone"
-msgstr "не може да се настрои пълно клониране"
-
-#: contrib/scalar/scalar.c:505
-msgid "`scalar list` does not take arguments"
-msgstr "„scalar list“ не приема аргументи"
-
-#: contrib/scalar/scalar.c:518
-msgid "scalar register [<enlistment>]"
-msgstr "scalar register [ЗАЧИСЛЕНА_ДИРЕКТОРИЯ]"
-
-#: contrib/scalar/scalar.c:545
-msgid "reconfigure all registered enlistments"
-msgstr "пренастройване на всички зачислени директории"
-
-#: contrib/scalar/scalar.c:549
-msgid "scalar reconfigure [--all | <enlistment>]"
-msgstr "scalar reconfigure [--all | ЗАЧИСЛЕНА_ДИРЕКТОРИЯ]"
-
-#: contrib/scalar/scalar.c:567
-msgid "--all or <enlistment>, but not both"
-msgstr "опцията „--all“ и указването на зачислена директория не са съвместими"
+msgid "duplicate chunk ID %<PRIx32> found"
+msgstr "повтарящ се идентификатор на откъс %<PRIx32>"
 
-#: contrib/scalar/scalar.c:582
 #, c-format
-msgid "git repository gone in '%s'"
-msgstr "вече няма хранилище на git в „%s“"
+msgid "final chunk has non-zero id %<PRIx32>"
+msgstr "ненулев идентификатор за краен откъс %<PRIx32>"
 
-#: contrib/scalar/scalar.c:622
-msgid ""
-"scalar run <task> [<enlistment>]\n"
-"Tasks:\n"
-msgstr ""
-"scalar run ЗАДАЧА [ЗАЧИСЛЕНА_ДИРЕКТОРИЯ]\n"
-"Задачи:\n"
+msgid "invalid hash version"
+msgstr "неправилна версия на контролна сума"
 
-#: contrib/scalar/scalar.c:640
 #, c-format
-msgid "no such task: '%s'"
-msgstr "няма задача с име „%s“"
-
-#: contrib/scalar/scalar.c:690
-msgid "scalar unregister [<enlistment>]"
-msgstr "scalar unregister [ЗАЧИСЛЕНА_ДИРЕКТОРИЯ]"
-
-#: contrib/scalar/scalar.c:737
-msgid "scalar delete <enlistment>"
-msgstr "scalar delete ЗАЧИСЛЕНА_ДИРЕКТОРИЯ"
-
-#: contrib/scalar/scalar.c:752
-msgid "refusing to delete current working directory"
-msgstr "текущата работна директория няма да бъде изтрита"
-
-#: contrib/scalar/scalar.c:767
-msgid "include Git version"
-msgstr "включване и на версията на git"
-
-#: contrib/scalar/scalar.c:769
-msgid "include Git's build options"
-msgstr "включване и на опциите за компилиране на git"
-
-#: contrib/scalar/scalar.c:773
-msgid "scalar verbose [-v | --verbose] [--build-options]"
-msgstr "scalar verbose [-v | --verbose] [--build-options]"
-
-#: contrib/scalar/scalar.c:821
-msgid ""
-"scalar <command> [<options>]\n"
-"\n"
-"Commands:\n"
-msgstr ""
-"scalar КОМАНДА [ОПЦИЯ…]<\n"
-"\n"
-"Команди:\n"
-
-#: compat/compiler.h:26
-msgid "no compiler information available\n"
-msgstr "липсва информация за компилатора\n"
-
-#: compat/compiler.h:38
-msgid "no libc information available\n"
-msgstr "липсва информация за библиотеката на C\n"
-
-#: list-objects-filter-options.h:94
-msgid "args"
-msgstr "АРГУМЕНТИ"
-
-#: list-objects-filter-options.h:95
-msgid "object filtering"
-msgstr "филтриране по вид на обекта"
-
-#: parse-options.h:183
-msgid "expiry-date"
-msgstr "период на валидност/запазване"
-
-#: parse-options.h:197
-msgid "no-op (backward compatibility)"
-msgstr "нулева операция (за съвместимост с предишни версии)"
-
-#: parse-options.h:310
-msgid "be more verbose"
-msgstr "повече подробности"
-
-#: parse-options.h:312
-msgid "be more quiet"
-msgstr "по-малко подробности"
-
-#: parse-options.h:318
-msgid "use <n> digits to display object names"
-msgstr "да се показват такъв БРОЙ цифри от имената на обектите"
-
-#: parse-options.h:337
-msgid "how to strip spaces and #comments from message"
-msgstr "кои празни знаци и #коментари да се махат от съобщенията"
-
-#: parse-options.h:338
-msgid "read pathspec from file"
-msgstr "изчитане на пътищата от ФАЙЛ"
-
-#: parse-options.h:339
-msgid ""
-"with --pathspec-from-file, pathspec elements are separated with NUL character"
-msgstr ""
-"при ползването на „--pathspec-from-file“, пътищата са разделени с нулевия "
-"знак „NUL“"
-
-#: ref-filter.h:98
-msgid "key"
-msgstr "КЛЮЧ"
-
-#: ref-filter.h:98
-msgid "field name to sort on"
-msgstr "име на полето, по което да е подредбата"
-
-#: rerere.h:44
-msgid "update the index with reused conflict resolution if possible"
-msgstr ""
-"при възможност преизползване на решението на конфликта за обновяване на "
-"индекса"
+msgid "invalid color value: %.*s"
+msgstr "неправилна стойност за цвят: %.*s"
 
-#: command-list.h:50
 msgid "Add file contents to the index"
 msgstr "Добавяне на съдържанието на файла към индекса"
 
-#: command-list.h:51
 msgid "Apply a series of patches from a mailbox"
 msgstr "Прилагане на поредица от кръпки от пощенска кутия"
 
-#: command-list.h:52
 msgid "Annotate file lines with commit information"
 msgstr "Добавяне на информация за подаванията към редовете на файловете"
 
-#: command-list.h:53
 msgid "Apply a patch to files and/or to the index"
 msgstr "Прилагане на кръпка към файловете и/или индекса"
 
-#: command-list.h:54
 msgid "Import a GNU Arch repository into Git"
 msgstr "Внасяне на хранилище на GNU Arch в Git"
 
-#: command-list.h:55
 msgid "Create an archive of files from a named tree"
 msgstr "Създаване на архив с файловете от именовано дърво"
 
-#: command-list.h:56
 msgid "Use binary search to find the commit that introduced a bug"
 msgstr "Двоично търсене на промяната, която е причинила грешка"
 
-#: command-list.h:57
 msgid "Show what revision and author last modified each line of a file"
 msgstr ""
 "Извеждане на версията и автора на последната промяна на всеки от редовете на "
 "файл"
 
-#: command-list.h:58
 msgid "List, create, or delete branches"
 msgstr "Извеждане, създаване, изтриване на клони"
 
-#: command-list.h:59
 msgid "Collect information for user to file a bug report"
 msgstr "Събиране на информация за потребителя за доклад за грешка"
 
-#: command-list.h:60
 msgid "Move objects and refs by archive"
 msgstr "Местене на обекти и указатели по архиви"
 
-#: command-list.h:61
 msgid "Provide content or type and size information for repository objects"
 msgstr ""
 "Предоставяне на съдържанието или вида и размерите на обекти от хранилище"
 
-#: command-list.h:62
 msgid "Display gitattributes information"
 msgstr "Извеждане на информацията за атрибутите на git (gitattributes)"
 
-#: command-list.h:63
 msgid "Debug gitignore / exclude files"
 msgstr "Изчистване на грешки в игнорираните файлове (gitignore)"
 
-#: command-list.h:64
 msgid "Show canonical names and email addresses of contacts"
 msgstr "Извеждане на каноничните име и адрес на е-поща на контактите"
 
-#: command-list.h:65
 msgid "Ensures that a reference name is well formed"
 msgstr "Проверка дали името на указателя е по правилата"
 
-#: command-list.h:66
 msgid "Switch branches or restore working tree files"
 msgstr ""
 "Преминаване към друг клон или възстановяване на файловете в работното дърво"
 
-#: command-list.h:67
 msgid "Copy files from the index to the working tree"
 msgstr "Копиране на файлове от индекса към работното дърво"
 
-#: command-list.h:68
 msgid "Find commits yet to be applied to upstream"
 msgstr ""
 "Откриване на подавания, които още не са подадени към отдалеченото хранилище"
 
-#: command-list.h:69
 msgid "Apply the changes introduced by some existing commits"
-msgstr "Прилагане на промените от съществуващи подавания"
+msgstr "Прилагане на промѐните от съществуващи подавания"
 
-#: command-list.h:70
 msgid "Graphical alternative to git-commit"
 msgstr "Графична алтернатива на „git-commit“"
 
-#: command-list.h:71
 msgid "Remove untracked files from the working tree"
 msgstr "Изтриване на неследените файлове от работното дърво"
 
-#: command-list.h:72
 msgid "Clone a repository into a new directory"
 msgstr "Клониране на хранилище в нова директория"
 
-#: command-list.h:73
 msgid "Display data in columns"
 msgstr "Извеждане по колони"
 
-#: command-list.h:74
 msgid "Record changes to the repository"
-msgstr "Подаване на промени в хранилището"
+msgstr "Подаване на промѐни в хранилището"
 
-#: command-list.h:75
 msgid "Write and verify Git commit-graph files"
 msgstr "Запис и проверка на файловете с гра̀фа на подаванията на Git"
 
-#: command-list.h:76
 msgid "Create a new commit object"
 msgstr "Създаване на нов обект-подаване"
 
-#: command-list.h:77
 msgid "Get and set repository or global options"
 msgstr ""
 "Извеждане и задаване на глобални настройки или настройки на определено "
 "хранилище"
 
-#: command-list.h:78
 msgid "Count unpacked number of objects and their disk consumption"
 msgstr ""
 "Преброяване на непакетираните обекти и колко дисково пространство заемат"
 
-#: command-list.h:79
 msgid "Retrieve and store user credentials"
 msgstr "Получаване и запазване на идентификацията на потребител"
 
-#: command-list.h:80
 msgid "Helper to temporarily store passwords in memory"
 msgstr "Помощна програма за временно запазване на пароли в паметта"
 
-#: command-list.h:81
 msgid "Helper to store credentials on disk"
 msgstr ""
 "Помощна програма за запазване на идентификацията на потребител на диска"
 
-#: command-list.h:82
 msgid "Export a single commit to a CVS checkout"
 msgstr "Изнасяне на едно подаване като изтегляне в CVS"
 
-#: command-list.h:83
 msgid "Salvage your data out of another SCM people love to hate"
 msgstr "Изнасяне на данните ви от друга система за контрол на версиите"
 
-#: command-list.h:84
 msgid "A CVS server emulator for Git"
 msgstr "Емулация на сървър за CVS за Git"
 
-#: command-list.h:85
 msgid "A really simple server for Git repositories"
 msgstr "Силно опростен сървър за хранилища на Git"
 
-#: command-list.h:86
 msgid "Give an object a human readable name based on an available ref"
 msgstr ""
 "Задаване на име удобно за потребителите на обект въз основа на наличен "
 "указател"
 
-#: command-list.h:87
 msgid "Show changes between commits, commit and working tree, etc"
 msgstr "Извеждане на разликите между подаванията, версиите, работното дърво"
 
-#: command-list.h:88
 msgid "Compares files in the working tree and the index"
 msgstr "Сравняване на файлове от работното дърво и индекса"
 
-#: command-list.h:89
 msgid "Compare a tree to the working tree or index"
 msgstr "Сравняване на обекти-дърво с работното дърво и индекса"
 
-#: command-list.h:90
 msgid "Compares the content and mode of blobs found via two tree objects"
 msgstr ""
 "Сравняване на съдържанието и правата за достъп на обектите-BLOB чрез два "
 "обекта-дърво"
 
-#: command-list.h:91
 msgid "Show changes using common diff tools"
-msgstr "Извеждане на промените чрез стандартните инструменти за това"
+msgstr "Извеждане на промѐните чрез стандартните инструменти за това"
 
-#: command-list.h:92
 msgid "Git data exporter"
 msgstr "Разглеждане на данните от Git"
 
-#: command-list.h:93
 msgid "Backend for fast Git data importers"
 msgstr "Ядро за бързо внасяне на данни в Git"
 
-#: command-list.h:94
 msgid "Download objects and refs from another repository"
 msgstr "Изтегляне на обекти и указатели от друго хранилище"
 
-#: command-list.h:95
 msgid "Receive missing objects from another repository"
 msgstr "Получаване на липсващи обекти от друго хранилище"
 
-#: command-list.h:96
 msgid "Rewrite branches"
 msgstr "Презаписване на клони"
 
-#: command-list.h:97
 msgid "Produce a merge commit message"
 msgstr "Създаване на съобщение при подаване със сливане"
 
-#: command-list.h:98
 msgid "Output information on each ref"
 msgstr "Извеждане на информацията за всеки указател"
 
-#: command-list.h:99
 msgid "Run a Git command on a list of repositories"
 msgstr "Изпълняване на команда на git за всяко хранилище от списъка"
 
-#: command-list.h:100
 msgid "Prepare patches for e-mail submission"
 msgstr "Подготвяне на кръпки за изпращане по е-поща"
 
-#: command-list.h:101
 msgid "Verifies the connectivity and validity of the objects in the database"
 msgstr "Проверка на обектите и връзките тях в базата от данни за обектите"
 
-#: command-list.h:102
 msgid "Cleanup unnecessary files and optimize the local repository"
 msgstr "Изчистване на ненужните файлове и оптимизиране на локалното хранилище"
 
-#: command-list.h:103
 msgid "Extract commit ID from an archive created using git-archive"
 msgstr "Извеждане на идентификатора на подаване от архив на „git-archive“"
 
-#: command-list.h:104
 msgid "Print lines matching a pattern"
 msgstr "Извеждане на редовете напасващи на шаблон"
 
-#: command-list.h:105
 msgid "A portable graphical interface to Git"
 msgstr "Графичен интерфейс към Git"
 
-#: command-list.h:106
 msgid "Compute object ID and optionally creates a blob from a file"
 msgstr ""
 "Изчисляване на идентификатор на обект и евентуално създаване на обект-BLOB "
 "от файл"
 
-#: command-list.h:107
 msgid "Display help information about Git"
 msgstr "Извеждане на помощта за Git"
 
-#: command-list.h:108
+msgid "Run git hooks"
+msgstr "Изпълнение на куки на git"
+
 msgid "Server side implementation of Git over HTTP"
 msgstr "Сървърна реализация на Git по HTTP"
 
-#: command-list.h:109
 msgid "Download from a remote Git repository via HTTP"
 msgstr "Изтегляне на отдалечено хранилище по HTTP"
 
-#: command-list.h:110
 msgid "Push objects over HTTP/DAV to another repository"
 msgstr "Изтласкване на обекти по HTTP/DAV към друго хранилище"
 
-#: command-list.h:111
 msgid "Send a collection of patches from stdin to an IMAP folder"
 msgstr "Изпращане на поредица от кръпки на стандартния вход към папка по IMAP"
 
-#: command-list.h:112
 msgid "Build pack index file for an existing packed archive"
 msgstr "Създаване на пакетен индекс за съществуващ пакетиран архив"
 
-#: command-list.h:113
 msgid "Create an empty Git repository or reinitialize an existing one"
 msgstr "Създаване на празно хранилище на Git или зануляване на съществуващо"
 
-#: command-list.h:114
 msgid "Instantly browse your working repository in gitweb"
 msgstr "Незабавно разглеждане на работното ви хранилище чрез „gitweb“"
 
-#: command-list.h:115
 msgid "Add or parse structured information in commit messages"
 msgstr ""
 "Добавяне или обработка на структурирана информация в съобщенията при подаване"
 
-#: command-list.h:116
 msgid "Show commit logs"
 msgstr "Извеждане на журнала с подаванията"
 
-#: command-list.h:117
 msgid "Show information about files in the index and the working tree"
 msgstr "Извеждане на информация за файловете в индекса и работното дърво"
 
-#: command-list.h:118
 msgid "List references in a remote repository"
 msgstr "Извеждане на указателите в отдалечено хранилище"
 
-#: command-list.h:119
 msgid "List the contents of a tree object"
 msgstr "Извеждане на съдържанието на обект-дърво"
 
-#: command-list.h:120
 msgid "Extracts patch and authorship from a single e-mail message"
 msgstr "Изваждане на кръпка и авторството от е-писмо"
 
-#: command-list.h:121
 msgid "Simple UNIX mbox splitter program"
 msgstr "Проста програма за разделяне на файлове във формат UNIX mbox"
 
-#: command-list.h:122
 msgid "Run tasks to optimize Git repository data"
 msgstr "Изпълнение на задачи за оптимизиране на хранилището на Git"
 
-#: command-list.h:123
 msgid "Join two or more development histories together"
-msgstr "Сливане на две или повече поредици/истории от промени"
+msgstr "Сливане на две или повече поредици/истории от промѐни"
 
-#: command-list.h:124
 msgid "Find as good common ancestors as possible for a merge"
 msgstr "Откриване на най-подходящите общи предшественици за сливане"
 
-#: command-list.h:125
 msgid "Run a three-way file merge"
 msgstr "Изпълнение на тройно сливане"
 
-#: command-list.h:126
 msgid "Run a merge for files needing merging"
 msgstr "Сливане на файловете, които се нуждаят от това"
 
-#: command-list.h:127
 msgid "The standard helper program to use with git-merge-index"
 msgstr "Стандартната помощна програма за „git-merge-index“"
 
-#: command-list.h:128
 msgid "Show three-way merge without touching index"
 msgstr "Извеждане на тройно сливане без промяна на индекса"
 
-#: command-list.h:129
 msgid "Run merge conflict resolution tools to resolve merge conflicts"
 msgstr "Изпълнение на програмите за коригиране на конфликтите при сливане"
 
-#: command-list.h:130
 msgid "Creates a tag object with extra validation"
 msgstr "Създаване на обект-етикет с допълнителни проверки"
 
-#: command-list.h:131
 msgid "Build a tree-object from ls-tree formatted text"
 msgstr "Създаване на обект-дърво от текст във формат „ls-tree“"
 
-#: command-list.h:132
 msgid "Write and verify multi-pack-indexes"
 msgstr "Запис и проверка на индексите за множество пакети"
 
-#: command-list.h:133
 msgid "Move or rename a file, a directory, or a symlink"
 msgstr "Преместване или преименуване на файл, директория или символна връзка"
 
-#: command-list.h:134
 msgid "Find symbolic names for given revs"
 msgstr "Откриване на имената дадени на версия"
 
-#: command-list.h:135
 msgid "Add or inspect object notes"
 msgstr "Добавяне или преглед на бележки към обект"
 
-#: command-list.h:136
 msgid "Import from and submit to Perforce repositories"
 msgstr "Внасяне и подаване към хранилища на Perforce"
 
-#: command-list.h:137
 msgid "Create a packed archive of objects"
 msgstr "Създаване на пакетиран архив от обекти"
 
-#: command-list.h:138
 msgid "Find redundant pack files"
 msgstr "Намиране на повтарящи се пакетни файлове"
 
-#: command-list.h:139
 msgid "Pack heads and tags for efficient repository access"
 msgstr "Пакетиране на върховете и етикетите за бърз достъп до хранилище"
 
-#: command-list.h:140
 msgid "Compute unique ID for a patch"
 msgstr "Генериране на уникален идентификатор на кръпка"
 
-#: command-list.h:141
 msgid "Prune all unreachable objects from the object database"
 msgstr "Окастряне на всички недостижими обекти в базата от данни за обектите"
 
-#: command-list.h:142
 msgid "Remove extra objects that are already in pack files"
 msgstr "Изтриване на допълнителните обекти, които вече са в пакетни файлове"
 
-#: command-list.h:143
 msgid "Fetch from and integrate with another repository or a local branch"
-msgstr "Доставяне и внасяне на промените от друго хранилище или клон"
+msgstr "Доставяне и внасяне на промѐните от друго хранилище или клон"
 
-#: command-list.h:144
 msgid "Update remote refs along with associated objects"
 msgstr "Обновяване на отдалечените указатели и свързаните с тях обекти"
 
-#: command-list.h:145
 msgid "Applies a quilt patchset onto the current branch"
 msgstr "Прилагане на поредица от кръпки от quilt към текущия клон"
 
-#: command-list.h:146
 msgid "Compare two commit ranges (e.g. two versions of a branch)"
 msgstr "Сравняване на два диапазона от подавания (напр. две версии на клон)"
 
-#: command-list.h:147
 msgid "Reads tree information into the index"
 msgstr "Изчитане на информация за обект-дърво в индекса"
 
-#: command-list.h:148
 msgid "Reapply commits on top of another base tip"
 msgstr "Прилагане на подаванията върху друг връх"
 
-#: command-list.h:149
 msgid "Receive what is pushed into the repository"
 msgstr "Получаване на изтласканото в хранилището"
 
-#: command-list.h:150
 msgid "Manage reflog information"
 msgstr "Управление на информацията в журнала на указателите"
 
-#: command-list.h:151
 msgid "Manage set of tracked repositories"
 msgstr "Управление на набор от следени хранилища"
 
-#: command-list.h:152
 msgid "Pack unpacked objects in a repository"
 msgstr "Пакетиране на непакетираните обекти в хранилище"
 
-#: command-list.h:153
 msgid "Create, list, delete refs to replace objects"
 msgstr "Създаване, извеждане, изтриване на указатели за замяна на обекти"
 
-#: command-list.h:154
 msgid "Generates a summary of pending changes"
-msgstr "Обобщение на предстоящите промени"
+msgstr "Обобщение на предстоящите промѐни"
 
-#: command-list.h:155
 msgid "Reuse recorded resolution of conflicted merges"
 msgstr "Преизползване на вече запазено коригиране на конфликт при сливане"
 
-#: command-list.h:156
 msgid "Reset current HEAD to the specified state"
 msgstr "Привеждане на указателя „HEAD“ към зададеното състояние"
 
-#: command-list.h:157
 msgid "Restore working tree files"
 msgstr "Възстановяване на файловете в работното дърво"
 
-#: command-list.h:158
 msgid "Lists commit objects in reverse chronological order"
 msgstr "Извеждане на подаванията в обратна хронологическа подредба"
 
-#: command-list.h:159
 msgid "Pick out and massage parameters"
 msgstr "Избор и промяна на параметри"
 
-#: command-list.h:160
 msgid "Revert some existing commits"
 msgstr "Отменяне на съществуващи подавания"
 
-#: command-list.h:161
 msgid "Remove files from the working tree and from the index"
 msgstr "Изтриване на файлове от работното дърво и индекса"
 
-#: command-list.h:162
 msgid "Send a collection of patches as emails"
 msgstr "Изпращане на поредица от кръпки по е-поща"
 
-#: command-list.h:163
 msgid "Push objects over Git protocol to another repository"
 msgstr "Изтласкване на обекти по протокола на Git към друго хранилище"
 
-#: command-list.h:164
 msgid "Git's i18n setup code for shell scripts"
 msgstr "Настройки на Git за интернационализация на скриптовете на обвивката"
 
-#: command-list.h:165
 msgid "Common Git shell script setup code"
 msgstr "Настройки на Git за скриптовете на обвивката"
 
-#: command-list.h:166
 msgid "Restricted login shell for Git-only SSH access"
 msgstr "Ограничена входна обвивка за достъп през SSH само до Git"
 
-#: command-list.h:167
 msgid "Summarize 'git log' output"
 msgstr "Обобщен изход от „git log“"
 
-#: command-list.h:168
 msgid "Show various types of objects"
 msgstr "Извеждане на различните видове обекти в Git"
 
-#: command-list.h:169
 msgid "Show branches and their commits"
 msgstr "Извеждане на клоните и подаванията в тях"
 
-#: command-list.h:170
 msgid "Show packed archive index"
 msgstr "Извеждане на индекса на пакетирания архив"
 
-#: command-list.h:171
 msgid "List references in a local repository"
 msgstr "Извеждане на указателите в локално хранилище"
 
-#: command-list.h:172
-msgid "Initialize and modify the sparse-checkout"
-msgstr "Инициализиране и промяна на частичното изтегляне"
+msgid "Reduce your working tree to a subset of tracked files"
+msgstr "Свиване на работното дърво само до част от следените файлове"
 
-#: command-list.h:173
 msgid "Add file contents to the staging area"
 msgstr "Добавяне на съдържанието на файла към индекса"
 
-#: command-list.h:174
 msgid "Stash the changes in a dirty working directory away"
-msgstr "Скатаване на неподадените промени в работното дърво"
+msgstr "Скатаване на неподадените промѐни в работното дърво"
 
-#: command-list.h:175
 msgid "Show the working tree status"
 msgstr "Извеждане на състоянието на работното дърво"
 
-#: command-list.h:176
 msgid "Remove unnecessary whitespace"
 msgstr "Премахване на излишните знаци за интервали"
 
-#: command-list.h:177
 msgid "Initialize, update or inspect submodules"
 msgstr "Инициализиране, обновяване или разглеждане на подмодули"
 
-#: command-list.h:178
 msgid "Bidirectional operation between a Subversion repository and Git"
 msgstr "Двупосочна работа между хранилища под Subversion и Git"
 
-#: command-list.h:179
 msgid "Switch branches"
 msgstr "Преминаване към друг клон"
 
-#: command-list.h:180
 msgid "Read, modify and delete symbolic refs"
 msgstr "Извеждане, промяна и изтриване на символни указатели"
 
-#: command-list.h:181
 msgid "Create, list, delete or verify a tag object signed with GPG"
 msgstr "Извеждане, създаване, изтриване, проверка на етикети подписани с GPG"
 
-#: command-list.h:182
 msgid "Creates a temporary file with a blob's contents"
 msgstr "Създаване на временен файл със същото съдържание като обектът-BLOB"
 
-#: command-list.h:183
 msgid "Unpack objects from a packed archive"
 msgstr "Разпакетиране на обекти от пакетиран архив"
 
-#: command-list.h:184
 msgid "Register file contents in the working tree to the index"
 msgstr "Регистриране на съдържанието на файловете от работното дърво в индекса"
 
-#: command-list.h:185
 msgid "Update the object name stored in a ref safely"
 msgstr "Безопасно обновяване на името на обект в указател"
 
-#: command-list.h:186
 msgid "Update auxiliary info file to help dumb servers"
 msgstr ""
 "Обновяване на файла с допълнителна информация в помощ на опростените сървъри"
 
-#: command-list.h:187
 msgid "Send archive back to git-archive"
 msgstr "Изпращане на архива обратно към „git-archive“"
 
-#: command-list.h:188
 msgid "Send objects packed back to git-fetch-pack"
 msgstr "Изпращане на пакетираните обекти обратно към „git-fetch-pack“"
 
-#: command-list.h:189
 msgid "Show a Git logical variable"
 msgstr "Извеждане на логическа променлива на Git"
 
-#: command-list.h:190
 msgid "Check the GPG signature of commits"
 msgstr "Проверка на подписите GPG върху подаванията"
 
-#: command-list.h:191
 msgid "Validate packed Git archive files"
 msgstr "Проверка на пакетираните архивни файлове на Git"
 
-#: command-list.h:192
 msgid "Check the GPG signature of tags"
 msgstr "Проверка на подписите GPG върху етикетите"
 
-#: command-list.h:193
 msgid "Show logs with difference each commit introduces"
 msgstr "Извеждане на журнал с разликите, въведени с всяко подаване"
 
-#: command-list.h:194
 msgid "Manage multiple working trees"
 msgstr "Управление на множество работни дървета"
 
-#: command-list.h:195
 msgid "Create a tree object from the current index"
 msgstr "Създаване на обект-дърво от текущия индекс"
 
-#: command-list.h:196
 msgid "Defining attributes per path"
 msgstr "Указване на атрибути към път"
 
-#: command-list.h:197
 msgid "Git command-line interface and conventions"
 msgstr "Команден ред и конвенции на Git"
 
-#: command-list.h:198
 msgid "A Git core tutorial for developers"
 msgstr "Въвеждащ урок в Git за разработчици"
 
-#: command-list.h:199
 msgid "Providing usernames and passwords to Git"
 msgstr "Въвеждане на имена и пароли към Git"
 
-#: command-list.h:200
 msgid "Git for CVS users"
 msgstr "Git за потребители на CVS"
 
-#: command-list.h:201
 msgid "Tweaking diff output"
 msgstr "Настройване на изгледа на разликите"
 
-#: command-list.h:202
 msgid "A useful minimum set of commands for Everyday Git"
 msgstr "Полезен минимален набор от команди за ежедневната работа с Git"
 
-#: command-list.h:203
 msgid "Frequently asked questions about using Git"
 msgstr "Често задавани въпроси за употребата на Git"
 
-#: command-list.h:204
 msgid "A Git Glossary"
 msgstr "Речник с термините на Git"
 
-#: command-list.h:205
 msgid "Hooks used by Git"
 msgstr "Куки на Git"
 
-#: command-list.h:206
 msgid "Specifies intentionally untracked files to ignore"
 msgstr "Указване на неследени файлове, които да бъдат нарочно пренебрегвани"
 
-#: command-list.h:207
 msgid "The Git repository browser"
 msgstr "Разглеждане на хранилище на Git"
 
-#: command-list.h:208
 msgid "Map author/committer names and/or E-Mail addresses"
 msgstr "Съответствия на имена на автор/подаващ и/или адреси на е-поща"
 
-#: command-list.h:209
 msgid "Defining submodule properties"
 msgstr "Дефиниране на свойствата на подмодулите"
 
-#: command-list.h:210
 msgid "Git namespaces"
 msgstr "Пространства от имена на Git"
 
-#: command-list.h:211
 msgid "Helper programs to interact with remote repositories"
 msgstr "Помощни програми за работа с отдалечените хранилища"
 
-#: command-list.h:212
 msgid "Git Repository Layout"
 msgstr "Устройство на хранилището на Git"
 
-#: command-list.h:213
 msgid "Specifying revisions and ranges for Git"
 msgstr "Указване на версии и диапазони в Git"
 
-#: command-list.h:214
 msgid "Mounting one repository inside another"
 msgstr "Монтиране на едно хранилище в друго"
 
-#: command-list.h:215
 msgid "A tutorial introduction to Git"
 msgstr "Въвеждащ урок за Git"
 
-#: command-list.h:216
 msgid "A tutorial introduction to Git: part two"
 msgstr "Въвеждащ урок за Git: втора част"
 
-#: command-list.h:217
 msgid "Git web interface (web frontend to Git repositories)"
 msgstr "Уеб интерфейс на Git"
 
-#: command-list.h:218
 msgid "An overview of recommended workflows with Git"
 msgstr "Общ преглед на препоръчваните начини за работа с Git"
 
-#: git-merge-octopus.sh:46
+msgid "commit-graph file is too small"
+msgstr "файлът за гра̀фа с подаванията е твърде малък"
+
+#, c-format
+msgid "commit-graph signature %X does not match signature %X"
+msgstr "отпечатъкът на гра̀фа с подаванията %X не съвпада с %X"
+
+#, c-format
+msgid "commit-graph version %X does not match version %X"
+msgstr "версията на гра̀фа с подаванията %X не съвпада с %X"
+
+#, c-format
+msgid "commit-graph hash version %X does not match version %X"
+msgstr "версията на контролната сума на гра̀фа с подаванията %X не съвпада с %X"
+
+#, c-format
+msgid "commit-graph file is too small to hold %u chunks"
+msgstr "файлът с гра̀фа на подаванията е твърде малък, за да съдържа %u откъси"
+
+msgid "commit-graph has no base graphs chunk"
+msgstr "базовият откъс липсва в гра̀фа с подаванията"
+
+msgid "commit-graph chain does not match"
+msgstr "веригата на гра̀фа с подаванията не съвпада"
+
+#, c-format
+msgid "invalid commit-graph chain: line '%s' not a hash"
+msgstr ""
+"грешка във веригата на гра̀фа с подаванията: ред „%s“ не е контролна сума"
+
+msgid "unable to find all commit-graph files"
+msgstr "някои файлове на гра̀фа с подаванията не може да бъдат открити"
+
+msgid "invalid commit position. commit-graph is likely corrupt"
+msgstr ""
+"неправилна позиция на подаването.  Вероятно графът с подаванията е повреден"
+
+#, c-format
+msgid "could not find commit %s"
+msgstr "подаването „%s“ не може да бъде открито"
+
+msgid "commit-graph requires overflow generation data but has none"
+msgstr ""
+"графът с подаванията изисква генериране на данни за отместването, но такива "
+"липсват"
+
+msgid "Loading known commits in commit graph"
+msgstr "Зареждане на познатите подавания в гра̀фа с подаванията"
+
+msgid "Expanding reachable commits in commit graph"
+msgstr "Разширяване на достижимите подавания в гра̀фа"
+
+msgid "Clearing commit marks in commit graph"
+msgstr "Изчистване на отбелязванията на подаванията в гра̀фа с подаванията"
+
+msgid "Computing commit graph topological levels"
+msgstr "Изчисляване на топологичните нива в гра̀фа с подаванията"
+
+msgid "Computing commit graph generation numbers"
+msgstr "Изчисляване на номерата на поколенията в гра̀фа с подаванията"
+
+msgid "Computing commit changed paths Bloom filters"
+msgstr "Изчисляване на филтрите на Блум на пътищата с промяна при подаването"
+
+msgid "Collecting referenced commits"
+msgstr "Събиране на свързаните подавания"
+
+#, c-format
+msgid "Finding commits for commit graph in %<PRIuMAX> pack"
+msgid_plural "Finding commits for commit graph in %<PRIuMAX> packs"
+msgstr[0] "Откриване на подаванията в гра̀фа в %<PRIuMAX> пакетен файл"
+msgstr[1] "Откриване на подаванията в гра̀фа в %<PRIuMAX> пакетни файла"
+
+#, c-format
+msgid "error adding pack %s"
+msgstr "грешка при добавяне на пакетен файл „%s“"
+
+#, c-format
+msgid "error opening index for %s"
+msgstr "грешка при отваряне на индекса на „%s“"
+
+msgid "Finding commits for commit graph among packed objects"
+msgstr "Откриване на подаванията в гра̀фа измежду пакетираните обекти"
+
+msgid "Finding extra edges in commit graph"
+msgstr "Откриване на още върхове в гра̀фа с подаванията"
+
+msgid "failed to write correct number of base graph ids"
+msgstr "правилният брой на базовите идентификатори не може да се запише"
+
+msgid "unable to create temporary graph layer"
+msgstr "не може да бъде създаден временен слой за гра̀фа с подаванията"
+
+#, c-format
+msgid "unable to adjust shared permissions for '%s'"
+msgstr "правата за споделен достъп до „%s“ не може да бъдат зададени"
+
+#, 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 паса"
+
+msgid "unable to open commit-graph chain file"
+msgstr "файлът с веригата на гра̀фа с подаванията не може да се отвори"
+
+msgid "failed to rename base commit-graph file"
+msgstr "основният файл на гра̀фа с подаванията не може да бъде преименуван"
+
+msgid "failed to rename temporary commit-graph file"
+msgstr "временният файл на гра̀фа с подаванията не може да бъде преименуван"
+
+msgid "Scanning merged commits"
+msgstr "Търсене на подаванията със сливания"
+
+msgid "Merging commit-graph"
+msgstr "Сливане на гра̀фа с подаванията"
+
+msgid "attempting to write a commit-graph, but 'core.commitGraph' is disabled"
+msgstr ""
+"опит за запис на гра̀фа с подаванията, но настройката „core.commitGraph“ е "
+"изключена"
+
+msgid "too many commits to write graph"
+msgstr "прекалено много подавания за записване на гра̀фа"
+
+msgid "the commit-graph file has incorrect checksum and is likely corrupt"
+msgstr "графът с подаванията е с грешна сума за проверка — вероятно е повреден"
+
+#, c-format
+msgid "commit-graph has incorrect OID order: %s then %s"
+msgstr ""
+"неправилна подредба на обектите по идентификатор в гра̀фа с подаванията: „%s“ "
+"е преди „%s“, а не трябва"
+
+#, c-format
+msgid "commit-graph has incorrect fanout value: fanout[%d] = %u != %u"
+msgstr ""
+"неправилна стойност за откъс в гра̀фа с подаванията: fanout[%d] = %u, а "
+"трябва да е %u"
+
+#, c-format
+msgid "failed to parse commit %s from commit-graph"
+msgstr "подаване „%s“ в гра̀фа с подаванията не може да се анализира"
+
+msgid "Verifying commits in commit graph"
+msgstr "Проверка на подаванията в гра̀фа"
+
+#, c-format
+msgid "failed to parse commit %s from object database for commit-graph"
+msgstr ""
+"подаване „%s“ в базата от данни към гра̀фа с подаванията не може да се "
+"анализира"
+
+#, c-format
+msgid "root tree OID for commit %s in commit-graph is %s != %s"
+msgstr ""
+"идентификаторът на обект за кореновото дърво за подаване „%s“ в гра̀фа с "
+"подаванията е „%s“, а трябва да е „%s“"
+
+#, c-format
+msgid "commit-graph parent list for commit %s is too long"
+msgstr "списъкът с родители на „%s“ в гра̀фа с подаванията е прекалено дълъг"
+
+#, c-format
+msgid "commit-graph parent for %s is %s != %s"
+msgstr "родителят на „%s“ в гра̀фа с подаванията е „%s“, а трябва да е „%s“"
+
+#, c-format
+msgid "commit-graph parent list for commit %s terminates early"
+msgstr "списъкът с родители на „%s“ в гра̀фа с подаванията е прекалено къс"
+
+#, c-format
+msgid ""
+"commit-graph has generation number zero for commit %s, but non-zero elsewhere"
+msgstr ""
+"номерът на поколението на подаване „%s“ в гра̀фа с подаванията е 0, а другаде "
+"не е"
+
+#, c-format
+msgid ""
+"commit-graph has non-zero generation number for commit %s, but zero elsewhere"
+msgstr ""
+"номерът на поколението на подаване „%s“ в гра̀фа с подаванията не е 0, а "
+"другаде е"
+
+#, c-format
+msgid "commit-graph generation for commit %s is %<PRIuMAX> < %<PRIuMAX>"
+msgstr ""
+"номерът на поколението на подаване „%s“ в гра̀фа с подаванията е %<PRIuMAX> < "
+"%<PRIuMAX>"
+
+#, c-format
+msgid "commit date for commit %s in commit-graph is %<PRIuMAX> != %<PRIuMAX>"
+msgstr ""
+"датата на подаване на „%s“ в гра̀фа с подаванията е %<PRIuMAX>, а трябва да е "
+"%<PRIuMAX>"
+
+#, c-format
+msgid "%s %s is not a commit!"
+msgstr "%s %s не е подаване!"
+
+msgid ""
+"Support for <GIT_DIR>/info/grafts is deprecated\n"
+"and will be removed in a future Git version.\n"
+"\n"
+"Please use \"git replace --convert-graft-file\"\n"
+"to convert the grafts into replace refs.\n"
+"\n"
+"Turn this message off by running\n"
+"\"git config advice.graftFileDeprecated false\""
+msgstr ""
+"Поддръжката на „<GIT_DIR>/info/grafts“ е остаряла.\n"
+"В бъдеща версия на Git ще бъде премахната.\n"
+"\n"
+"Може да преобразувате присадките в заместващи\n"
+"указатели с командата:\n"
+"\n"
+"    git replace --convert-graft-file\n"
+"\n"
+"За да изключите това съобщение, изпълнете:\n"
+"\n"
+"    git config advice.graftFileDeprecated false"
+
+#, c-format
+msgid "Commit %s has an untrusted GPG signature, allegedly by %s."
+msgstr ""
+"Подаването „%s“ е с недоверен подпис от GPG, който твърди, че е на „%s“."
+
+#, c-format
+msgid "Commit %s has a bad GPG signature allegedly by %s."
+msgstr ""
+"Подаването „%s“ е с неправилен подпис от GPG, който твърди, че е на „%s“."
+
+#, c-format
+msgid "Commit %s does not have a GPG signature."
+msgstr "Подаването „%s“ е без подпис от GPG."
+
+#, c-format
+msgid "Commit %s has a good GPG signature by %s\n"
+msgstr "Подаването „%s“ е с коректен подпис от GPG на „%s“.\n"
+
+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"
+"variable i18n.commitEncoding to the encoding your project uses.\n"
+msgstr ""
+"ПРЕДУПРЕЖДЕНИЕ: съобщението при подаване не е кодирано с UTF-8.\n"
+"Може да поправите подаването заедно със съобщението или може да\n"
+"зададете ползваното кодиране в настройката „i18n.commitEncoding“.\n"
+
+msgid "no compiler information available\n"
+msgstr "липсва информация за компилатора\n"
+
+msgid "no libc information available\n"
+msgstr "липсва информация за библиотеката на C\n"
+
+#, c-format
+msgid "[GLE %ld] health thread could not open '%ls'"
+msgstr ""
+"нишката за следенето на състоянието не може да отвори „%2$ls“ [последна "
+"грешка в нишката: GLE=%1$ld]"
+
+#, c-format
+msgid "[GLE %ld] health thread getting BHFI for '%ls'"
+msgstr ""
+"нишката за следенето на състоянието не получи BHFI (информация за файла по "
+"манипулатора му) за „%2$ls“ [последна грешка в нишката: GLE=%1$ld]"
+
+#, c-format
+msgid "could not convert to wide characters: '%s'"
+msgstr "низът „%s“ не може да се преобразува в широки знаци"
+
+#, c-format
+msgid "BHFI changed '%ls'"
+msgstr "BHFI (информацията за файла по манипулатора му) се променѝ „%ls“"
+
+#, c-format
+msgid "unhandled case in 'has_worktree_moved': %d"
+msgstr "необработен случай в „has_worktree_moved“: %d"
+
+#, c-format
+msgid "health thread wait failed [GLE %ld]"
+msgstr ""
+"грешка в нишката за следене на състоянието [последна грешка в нишката: GLE="
+"%1$ld]"
+
+msgid "Unable to create FSEventStream."
+msgstr "Неуспешно създаване на „FSEventStream“."
+
+msgid "Failed to start the FSEventStream"
+msgstr "Неуспешно стартиране на „FSEventStream“"
+
+# FIXME - как да обърна реда на форматите? Нито %2$.*ls, нито %.*2$ls, нито  %2$.*2$ls работят
+#, c-format
+msgid "[GLE %ld] could not convert path to UTF-8: '%.*ls'"
+msgstr ""
+"[последна грешка в нишката: GLE=%ld] пътят „%.*ls“ не може да се преобразува "
+"до UTF-8"
+
+#, c-format
+msgid "[GLE %ld] could not watch '%s'"
+msgstr "„%2$s“ не може да се наблюдава [последна грешка в нишката: GLE=%1$ld]"
+
+#, c-format
+msgid "[GLE %ld] could not get longname of '%s'"
+msgstr ""
+"дългото име на „%2$s“ те може да се получи [последна грешка в нишката: GLE="
+"%1$ld]"
+
+#, c-format
+msgid "ReadDirectoryChangedW failed on '%s' [GLE %ld]"
+msgstr ""
+"неуспешно изпълнение на „ReadDirectoryChangedW“ върху „%s“ [последна грешка "
+"в нишката: GLE=%ld]"
+
+#, c-format
+msgid "GetOverlappedResult failed on '%s' [GLE %ld]"
+msgstr ""
+"неуспешно изпълнение на „GetOverlappedResult“ върху „%s“ [последна грешка в "
+"нишката: GLE=%ld]"
+
+#, c-format
+msgid "could not read directory changes [GLE %ld]"
+msgstr ""
+"промѐните по директориите не може да бъдат прочетени [последна грешка в "
+"нишката: GLE=%ld]"
+
+#, c-format
+msgid "failed to copy SID (%ld)"
+msgstr "идентификаторът за сигурност (SID=%ld) не може да бъде копиран"
+
+#, c-format
+msgid "failed to get owner for '%s' (%ld)"
+msgstr "притежателят на „%s“ (%ld) не може да бъде получен"
+
+msgid "memory exhausted"
+msgstr "паметта е изчерпана"
+
+msgid "Success"
+msgstr "Успех"
+
+msgid "No match"
+msgstr "Няма съвпадения"
+
+msgid "Invalid regular expression"
+msgstr "Неправилен регулярен израз"
+
+msgid "Invalid collation character"
+msgstr "Неправилен знак за подредба"
+
+msgid "Invalid character class name"
+msgstr "Неправилно име на клас знаци"
+
+msgid "Trailing backslash"
+msgstr "Самотна „\\“ накрая"
+
+msgid "Invalid back reference"
+msgstr "Неправилна препратка към съвпадение"
+
+msgid "Unmatched [ or [^"
+msgstr "„[“ или „[^“ без еш"
+
+msgid "Unmatched ( or \\("
+msgstr "„(“ или „\\(“ без еш"
+
+msgid "Unmatched \\{"
+msgstr "„\\{“ без еш"
+
+msgid "Invalid content of \\{\\}"
+msgstr "Неправилно съдържание в „\\{\\}“"
+
+msgid "Invalid range end"
+msgstr "Неправилен край на диапазон"
+
+msgid "Memory exhausted"
+msgstr "Паметта свърши"
+
+msgid "Invalid preceding regular expression"
+msgstr "Предхождащият регулярен израз е неправилен"
+
+msgid "Premature end of regular expression"
+msgstr "Ранен край на регулярен израз"
+
+msgid "Regular expression too big"
+msgstr "Регулярният израз е прекалено голям"
+
+msgid "Unmatched ) or \\)"
+msgstr "„)“ или „\\)“ без еш"
+
+msgid "No previous regular expression"
+msgstr "Няма предхождащ регулярен израз"
+
+msgid "could not send IPC command"
+msgstr "командата за комуникация между процеси не може да бъде пратена"
+
+msgid "could not read IPC response"
+msgstr "отговорът за комуникацията между процеси не може да бъде прочетен"
+
+#, c-format
+msgid "could not start accept_thread '%s'"
+msgstr "неуспешно изпълнение на „accept_thread“ върху нишката „%s“"
+
+#, c-format
+msgid "could not start worker[0] for '%s'"
+msgstr "не може да се стартира нишката worker[0] за „%s“"
+
+#, c-format
+msgid "ConnectNamedPipe failed for '%s' (%lu)"
+msgstr "грешка при изпълнението на „ConnectNamedPipe“ върху „%s“ (%lu)"
+
+#, c-format
+msgid "could not create fd from pipe for '%s'"
+msgstr "не може да се създаде файлов дескриптор от програмния канал за „%s“"
+
+#, c-format
+msgid "could not start thread[0] for '%s'"
+msgstr "не може да се стартира нишката thread[0] за „%s“"
+
+#, c-format
+msgid "wait for hEvent failed for '%s'"
+msgstr "неуспешно изчакване на събитие „hEvent“ за „%s“"
+
+msgid "cannot resume in the background, please use 'fg' to resume"
+msgstr ""
+"работата не може да продължи във фонов режим, затова изпълнете командата:\n"
+"\n"
+"    fg"
+
+msgid "cannot restore terminal settings"
+msgstr "настройките на терминала не може да се възстановят"
+
+#, c-format
+msgid ""
+"exceeded maximum include depth (%d) while including\n"
+"\t%s\n"
+"from\n"
+"\t%s\n"
+"This might be due to circular includes."
+msgstr ""
+"максималната дълбочина на влагане (%d) е надвишена при вмъкването на:\n"
+"    %s\n"
+"от\n"
+"    %s\n"
+"Това може да се дължи на зацикляне при вмъкването."
+
+#, c-format
+msgid "could not expand include path '%s'"
+msgstr "пътят за вмъкване „%s“не може да бъде разширен"
+
+msgid "relative config includes must come from files"
+msgstr "относителните вмъквания на конфигурации трябва да идват от файлове"
+
+msgid "relative config include conditionals must come from files"
+msgstr "относителните условни изрази за вмъкване трябва да идват от файлове"
+
+msgid ""
+"remote URLs cannot be configured in file directly or indirectly included by "
+"includeIf.hasconfig:remote.*.url"
+msgstr ""
+"отдалечени адреси не може да се настроят във файл, който директно или не е "
+"включен в някоя настройка „includeIf.hasconfig:remote.*.url“"
+
+#, c-format
+msgid "invalid config format: %s"
+msgstr "неправилен формат на настройка: %s"
+
+#, c-format
+msgid "missing environment variable name for configuration '%.*s'"
+msgstr "липсва име на променлива на средата за настройката „%.*s“"
+
+#, c-format
+msgid "missing environment variable '%s' for configuration '%.*s'"
+msgstr "липсва променлива на средата „%s“ за настройката „%.*s“"
+
+#, c-format
+msgid "key does not contain a section: %s"
+msgstr "ключът не съдържа раздел: „%s“"
+
+#, c-format
+msgid "key does not contain variable name: %s"
+msgstr "ключът не съдържа име на променлива: „%s“"
+
+#, c-format
+msgid "invalid key: %s"
+msgstr "неправилен ключ: „%s“"
+
+#, c-format
+msgid "invalid key (newline): %s"
+msgstr "неправилен ключ (нов ред): „%s“"
+
+msgid "empty config key"
+msgstr "празен ключ за настройка"
+
+#, c-format
+msgid "bogus config parameter: %s"
+msgstr "неправилен конфигурационен параметър: „%s“"
+
+#, c-format
+msgid "bogus format in %s"
+msgstr "неправилен формат в „%s“"
+
+#, c-format
+msgid "bogus count in %s"
+msgstr "неправилен брой в „%s“"
+
+#, c-format
+msgid "too many entries in %s"
+msgstr "прекалено много записи в „%s“"
+
+#, c-format
+msgid "missing config key %s"
+msgstr "ключът за настройка „%s“ липсва"
+
+#, c-format
+msgid "missing config value %s"
+msgstr "стойността за настройка „%s“ липсва"
+
+#, c-format
+msgid "bad config line %d in blob %s"
+msgstr "неправилен ред за настройки %d в BLOB „%s“"
+
+#, c-format
+msgid "bad config line %d in file %s"
+msgstr "неправилен ред за настройки %d във файла „%s“"
+
+#, c-format
+msgid "bad config line %d in standard input"
+msgstr "неправилен ред за настройки %d на стандартния вход"
+
+#, c-format
+msgid "bad config line %d in submodule-blob %s"
+msgstr "неправилен ред за настройки %d в BLOB за подмодул „%s“"
+
+#, c-format
+msgid "bad config line %d in command line %s"
+msgstr "неправилен ред за настройки %d на командния ред „%s“"
+
+#, c-format
+msgid "bad config line %d in %s"
+msgstr "неправилен ред за настройки %d в „%s“"
+
+msgid "out of range"
+msgstr "извън диапазона"
+
+msgid "invalid unit"
+msgstr "неправилна мерна единица"
+
+#, c-format
+msgid "bad numeric config value '%s' for '%s': %s"
+msgstr "неправилна числова стойност „%s“ за „%s“: %s"
+
+#, c-format
+msgid "bad numeric config value '%s' for '%s' in blob %s: %s"
+msgstr "неправилна числова стойност „%s“ за „%s“ в BLOB „%s“: %s"
+
+#, c-format
+msgid "bad numeric config value '%s' for '%s' in file %s: %s"
+msgstr "неправилна числова стойност „%s“ за „%s“ във файла „%s“: %s"
+
+#, c-format
+msgid "bad numeric config value '%s' for '%s' in standard input: %s"
+msgstr "неправилна числова стойност „%s“ за „%s“ на стандартния вход: %s"
+
+#, c-format
+msgid "bad numeric config value '%s' for '%s' in submodule-blob %s: %s"
+msgstr "неправилна числова стойност „%s“ за „%s“ в BLOB от подмодул „%s“: %s"
+
+#, c-format
+msgid "bad numeric config value '%s' for '%s' in command line %s: %s"
+msgstr "неправилна числова стойност „%s“ за „%s“ на командния ред „%s“: %s"
+
+#, c-format
+msgid "bad numeric config value '%s' for '%s' in %s: %s"
+msgstr "неправилна числова стойност „%s“ за „%s“ в %s: %s"
+
+#, c-format
+msgid "invalid value for variable %s"
+msgstr "неправилна стойност за променливата „%s“"
+
+#, c-format
+msgid "ignoring unknown core.fsync component '%s'"
+msgstr "прескачане на непознатия компонент в настройката „core.fsync“: „%s“"
+
+#, c-format
+msgid "bad boolean config value '%s' for '%s'"
+msgstr "неправилна булева стойност „%s“ за „%s“"
+
+#, c-format
+msgid "failed to expand user dir in: '%s'"
+msgstr "домашната папка на потребителя не може да бъде открита: „%s“"
+
+#, c-format
+msgid "'%s' for '%s' is not a valid timestamp"
+msgstr "„%s“ не е правилна стойност за време за „%s“"
+
+#, c-format
+msgid "abbrev length out of range: %d"
+msgstr "дължината на съкращаване е извън интервала ([4; 40]): %d"
+
+#, c-format
+msgid "bad zlib compression level %d"
+msgstr "неправилно ниво на компресиране: %d"
+
+msgid "core.commentChar should only be one character"
+msgstr "настройката „core.commentChar“ трябва да е само един знак"
+
+#, c-format
+msgid "ignoring unknown core.fsyncMethod value '%s'"
+msgstr "непознатата стойност за „core.fsyncMethod“ — „%s“ се прескача"
+
+msgid "core.fsyncObjectFiles is deprecated; use core.fsync instead"
+msgstr ""
+"настройката „core.fsyncObjectFiles“ е остаряла и е заменена с „core.fsync“"
+
+#, c-format
+msgid "invalid mode for object creation: %s"
+msgstr "неправилен режим за създаването на обекти: %s"
+
+#, c-format
+msgid "malformed value for %s"
+msgstr "неправилна стойност за „%s“"
+
+#, c-format
+msgid "malformed value for %s: %s"
+msgstr "неправилна стойност за „%s“: „%s“"
+
+msgid "must be one of nothing, matching, simple, upstream or current"
+msgstr ""
+"трябва да е една от следните стойности: „nothing“ (без изтласкване при липса "
+"на указател), „matching“ (всички клони със съвпадащи имена), "
+"„simple“ (клонът със същото име, от който се издърпва), „upstream“ (клонът, "
+"от който се издърпва) или „current“ (клонът със същото име)"
+
+#, c-format
+msgid "unable to load config blob object '%s'"
+msgstr "обектът-BLOB „%s“ с конфигурации не може да се зареди"
+
+#, c-format
+msgid "reference '%s' does not point to a blob"
+msgstr "указателят „%s“ не сочи към обект-BLOB"
+
+#, c-format
+msgid "unable to resolve config blob '%s'"
+msgstr "обектът-BLOB „%s“ с конфигурации не може да бъде открит"
+
+#, c-format
+msgid "failed to parse %s"
+msgstr "„%s“ не може да бъде анализиран"
+
+msgid "unable to parse command-line config"
+msgstr "неправилни настройки от командния ред"
+
+msgid "unknown error occurred while reading the configuration files"
+msgstr "неочаквана грешка при изчитането на конфигурационните файлове"
+
+#, c-format
+msgid "Invalid %s: '%s'"
+msgstr "Неправилен %s: „%s“"
+
+#, c-format
+msgid "splitIndex.maxPercentChange value '%d' should be between 0 and 100"
+msgstr ""
+"стойността на „splitIndex.maxPercentChange“ трябва да е между 1 и 100, а не "
+"%d"
+
+#, c-format
+msgid "unable to parse '%s' from command-line config"
+msgstr "неразпозната стойност „%s“ от командния ред"
+
+#, c-format
+msgid "bad config variable '%s' in file '%s' at line %d"
+msgstr "неправилна настройка „%s“ във файла „%s“ на ред №%d"
+
+#, c-format
+msgid "invalid section name '%s'"
+msgstr "неправилно име на раздел: „%s“"
+
+#, c-format
+msgid "%s has multiple values"
+msgstr "зададени са няколко стойности за „%s“"
+
+#, c-format
+msgid "failed to write new configuration file %s"
+msgstr "новият конфигурационен файл „%s“ не може да бъде запазен"
+
+#, c-format
+msgid "could not lock config file %s"
+msgstr "конфигурационният файл „%s“ не може да бъде заключен"
+
+#, c-format
+msgid "opening %s"
+msgstr "отваряне на „%s“"
+
+#, c-format
+msgid "invalid config file %s"
+msgstr "неправилен конфигурационен файл: „%s“"
+
+#, c-format
+msgid "fstat on %s failed"
+msgstr "неуспешно изпълнение на „fstat“ върху „%s“"
+
+#, c-format
+msgid "unable to mmap '%s'%s"
+msgstr "неуспешно изпълнение на „mmap“ върху „%s“%s"
+
+#, c-format
+msgid "chmod on %s failed"
+msgstr "неуспешна смяна на права с „chmod“ върху „%s“"
+
+#, c-format
+msgid "could not write config file %s"
+msgstr "конфигурационният файл „%s“ не може да бъде записан"
+
+#, c-format
+msgid "could not set '%s' to '%s'"
+msgstr "„%s“ не може да се зададе да е „%s“"
+
+#, c-format
+msgid "invalid section name: %s"
+msgstr "неправилно име на раздел: %s"
+
+#, c-format
+msgid "missing value for '%s'"
+msgstr "липсва стойност за „%s“"
+
+msgid "the remote end hung up upon initial contact"
+msgstr "отдалеченото хранилище прекъсна връзката веднага след отварянето ѝ"
+
+msgid ""
+"Could not read from remote repository.\n"
+"\n"
+"Please make sure you have the correct access rights\n"
+"and the repository exists."
+msgstr ""
+"Не може да се чете от отдалеченото хранилище.\n"
+"\n"
+"Проверете дали то съществува и дали имате права\n"
+"за достъп."
+
+#, c-format
+msgid "server doesn't support '%s'"
+msgstr "сървърът не поддържа „%s“"
+
+#, c-format
+msgid "server doesn't support feature '%s'"
+msgstr "сървърът не поддържа „%s“"
+
+msgid "expected flush after capabilities"
+msgstr ""
+"след първоначалната обява на възможностите се очаква изчистване на буферите"
+
+#, c-format
+msgid "ignoring capabilities after first line '%s'"
+msgstr "пропускане на възможностите след първия ред „%s“"
+
+msgid "protocol error: unexpected capabilities^{}"
+msgstr "протоколна грешка: неочаквани възможности^{}"
+
+#, c-format
+msgid "protocol error: expected shallow sha-1, got '%s'"
+msgstr "протоколна грешка: очаква се SHA1 на плитък обект, а бе получено: „%s“"
+
+msgid "repository on the other end cannot be shallow"
+msgstr "отсрещното хранилище не може да е плитко"
+
+msgid "invalid packet"
+msgstr "неправилен пакет"
+
+#, c-format
+msgid "protocol error: unexpected '%s'"
+msgstr "протоколна грешка: неочаквано „%s“"
+
+#, c-format
+msgid "unknown object format '%s' specified by server"
+msgstr "сървърът указа непознат формат на обект: „%s“"
+
+#, c-format
+msgid "invalid ls-refs response: %s"
+msgstr "неправилен отговор на „ls-refs“: „%s“"
+
+msgid "expected flush after ref listing"
+msgstr "след изброяването на указателите се очаква изчистване на буферите"
+
+msgid "expected response end packet after ref listing"
+msgstr "след изброяването на указателите се очаква пакет за край"
+
+#, c-format
+msgid "protocol '%s' is not supported"
+msgstr "протокол „%s“ не се поддържа"
+
+msgid "unable to set SO_KEEPALIVE on socket"
+msgstr "неуспешно задаване на „SO_KEEPALIVE“ на гнездо"
+
+#, c-format
+msgid "Looking up %s ... "
+msgstr "Търсене на „%s“… "
+
+#, c-format
+msgid "unable to look up %s (port %s) (%s)"
+msgstr "„%s“ (порт %s) не може да се открие („%s“)"
+
+#. TRANSLATORS: this is the end of "Looking up %s ... "
+#, c-format
+msgid ""
+"done.\n"
+"Connecting to %s (port %s) ... "
+msgstr ""
+"готово.\n"
+"Свързване към „%s“ (порт %s)…"
+
+#, c-format
+msgid ""
+"unable to connect to %s:\n"
+"%s"
+msgstr ""
+"неуспешно свързване към „%s“:\n"
+"%s"
+
+#. TRANSLATORS: this is the end of "Connecting to %s (port %s) ... "
+msgid "done."
+msgstr "действието завърши."
+
+#, c-format
+msgid "unable to look up %s (%s)"
+msgstr "„%s“ не може да се открие (%s)"
+
+#, c-format
+msgid "unknown port %s"
+msgstr "непознат порт „%s“"
+
+#, c-format
+msgid "strange hostname '%s' blocked"
+msgstr "необичайното име на хост „%s“ е блокирано"
+
+#, c-format
+msgid "strange port '%s' blocked"
+msgstr "необичайният порт „%s“ е блокиран"
+
+#, c-format
+msgid "cannot start proxy %s"
+msgstr "посредникът „%s“ не може да се стартира"
+
+msgid "no path specified; see 'git help pull' for valid url syntax"
+msgstr ""
+"не е указан път. Проверете синтаксиса с командата:\n"
+"\n"
+"    git help pull"
+
+msgid "newline is forbidden in git:// hosts and repo paths"
+msgstr ""
+"знакът за нов ред не е позволен в адресите и в пътищата до хранилищата "
+"„git://“"
+
+msgid "ssh variant 'simple' does not support -4"
+msgstr "вариантът за „ssh“ — „simple“ (опростен), не поддържа опцията „-4“"
+
+msgid "ssh variant 'simple' does not support -6"
+msgstr "вариантът за „ssh“ — „simple“ (опростен), не поддържа опцията „-6“"
+
+msgid "ssh variant 'simple' does not support setting port"
+msgstr ""
+"вариантът за „ssh“ — „simple“ (опростен), не поддържа задаването на порт"
+
+#, c-format
+msgid "strange pathname '%s' blocked"
+msgstr "необичайният път „%s“ е блокиран"
+
+msgid "unable to fork"
+msgstr "неуспешно създаване на процес"
+
+msgid "Could not run 'git rev-list'"
+msgstr "Командата „git rev-list“ не може да бъде изпълнена."
+
+msgid "failed write to rev-list"
+msgstr "неуспешен запис на списъка с версиите"
+
+msgid "failed to close rev-list's stdin"
+msgstr "стандартният вход на списъка с версиите не може да бъде затворен"
+
+#, c-format
+msgid "'%s' does not exist"
+msgstr "„%s“ не съществува."
+
+msgid "need a working directory"
+msgstr "необходима е работна директория"
+
+msgid "could not find enlistment root"
+msgstr "началната зачислена директория не може да бъде открита"
+
+#, c-format
+msgid "could not switch to '%s'"
+msgstr "не може да се премине към „%s“"
+
+#, c-format
+msgid "could not configure %s=%s"
+msgstr "настройката „%s=%s“ не може да се зададе"
+
+msgid "could not configure log.excludeDecoration"
+msgstr "„log.excludeDecoration“ не може да се настрои"
+
+msgid "Scalar enlistments require a worktree"
+msgstr "Зачисляването на директории чрез „scalar“ изисква работно дърво"
+
+#, c-format
+msgid "could not open directory '%s'"
+msgstr "директорията „%s“ не може да бъде отворена"
+
+#, c-format
+msgid "skipping '%s', which is neither file nor directory"
+msgstr "„%s“ се прескача, защото не е нито файл, нито директория"
+
+#, c-format
+msgid "could not determine free disk size for '%s'"
+msgstr "не може да се определи свободното дисково пространство за „%s“"
+
+#, c-format
+msgid "could not get info for '%s'"
+msgstr "не може да се получи информацията за „%s“"
+
+#, c-format
+msgid "remote HEAD is not a branch: '%.*s'"
+msgstr "отдалеченият указател „HEAD“ не сочи към клон: „%.*s“"
+
+msgid "failed to get default branch name from remote; using local default"
+msgstr ""
+"името на стандартния клон на отдалеченото хранилище не може да се получи, "
+"затова ще се ползва локално настроеното име на стандартния клон"
+
+msgid "failed to get default branch name"
+msgstr "неуспешно получаване на името на стандартния клон"
+
+msgid "failed to unregister repository"
+msgstr "хранилището не може да бъде отчислено"
+
+msgid "failed to delete enlistment directory"
+msgstr "зачислената директория не може да бъде изтрита"
+
+msgid "branch to checkout after clone"
+msgstr "към кой клон да се премине след клониране"
+
+msgid "when cloning, create full working directory"
+msgstr "при клониране да се създава пълна работна директория"
+
+msgid "only download metadata for the branch that will be checked out"
+msgstr "да се свалят метаданните само за изтегляния клон"
+
+msgid "scalar clone [<options>] [--] <repo> [<dir>]"
+msgstr "scalar clone [ОПЦИЯ…] [--] ХРАНИЛИЩЕ [ДИРЕКТОРИЯ]"
+
+#, c-format
+msgid "cannot deduce worktree name from '%s'"
+msgstr "името на работното дърво не може да се извлече от „%s“"
+
+#, c-format
+msgid "directory '%s' exists already"
+msgstr "директорията „%s“ вече съществува"
+
+#, c-format
+msgid "failed to get default branch for '%s'"
+msgstr "основният клон на „%s“ не може да бъде получен"
+
+#, c-format
+msgid "could not configure remote in '%s'"
+msgstr "отдалеченото хранилище в „%s“ не може да се настрои"
+
+#, c-format
+msgid "could not configure '%s'"
+msgstr "„%s“ не може да се настрои"
+
+msgid "partial clone failed; attempting full clone"
+msgstr "неуспешно създаване на непълно хранилище, ще се опита пълно хранилище"
+
+msgid "could not configure for full clone"
+msgstr "не може да се настрои пълно клониране"
+
+msgid "scalar diagnose [<enlistment>]"
+msgstr "scalar diagnose [ЗАЧИСЛЕНА_ДИРЕКТОРИЯ]"
+
+#, c-format
+msgid "could not create directory for '%s'"
+msgstr "директорията за „%s“ не може да се създадe"
+
+msgid "could not duplicate stdout"
+msgstr "стандартният изход не може да се дублира"
+
+msgid "failed to write archive"
+msgstr "неуспешен запис на архива"
+
+msgid "`scalar list` does not take arguments"
+msgstr "„scalar list“ не приема аргументи"
+
+msgid "scalar register [<enlistment>]"
+msgstr "scalar register [ЗАЧИСЛЕНА_ДИРЕКТОРИЯ]"
+
+msgid "reconfigure all registered enlistments"
+msgstr "пренастройване на всички зачислени директории"
+
+msgid "scalar reconfigure [--all | <enlistment>]"
+msgstr "scalar reconfigure [--all | ЗАЧИСЛЕНА_ДИРЕКТОРИЯ]"
+
+msgid "--all or <enlistment>, but not both"
+msgstr "опцията „--all“ и указването на зачислена директория не са съвместими"
+
+#, c-format
+msgid "git repository gone in '%s'"
+msgstr "вече няма хранилище на git в „%s“"
+
+msgid ""
+"scalar run <task> [<enlistment>]\n"
+"Tasks:\n"
+msgstr ""
+"scalar run ЗАДАЧА [ЗАЧИСЛЕНА_ДИРЕКТОРИЯ]\n"
+"Задачи:\n"
+
+#, c-format
+msgid "no such task: '%s'"
+msgstr "няма задача с име „%s“"
+
+msgid "scalar unregister [<enlistment>]"
+msgstr "scalar unregister [ЗАЧИСЛЕНА_ДИРЕКТОРИЯ]"
+
+msgid "scalar delete <enlistment>"
+msgstr "scalar delete ЗАЧИСЛЕНА_ДИРЕКТОРИЯ"
+
+msgid "refusing to delete current working directory"
+msgstr "текущата работна директория няма да бъде изтрита"
+
+msgid "include Git version"
+msgstr "включване и на версията на git"
+
+msgid "include Git's build options"
+msgstr "включване и на опциите за компилиране на git"
+
+msgid "scalar verbose [-v | --verbose] [--build-options]"
+msgstr "scalar verbose [-v | --verbose] [--build-options]"
+
+msgid "-C requires a <directory>"
+msgstr "„-C“ изисква ДИРЕКТОРИЯ"
+
+#, c-format
+msgid "could not change to '%s'"
+msgstr "не може да се влезе в директорията „%s“"
+
+msgid "-c requires a <key>=<value> argument"
+msgstr "опцията „-c“ изисква аргумент във вид КЛЮЧ=СТОЙНОСТ"
+
+msgid ""
+"scalar [-C <directory>] [-c <key>=<value>] <command> [<options>]\n"
+"\n"
+"Commands:\n"
+msgstr ""
+"scalar [-C ДИРЕКТОРИЯ] [-c КЛЮЧ=СТОЙНОСТ] КОМАНДА [ОПЦИЯ…]<\n"
+"\n"
+"Команди:\n"
+
+#, c-format
+msgid "illegal crlf_action %d"
+msgstr "неправилно действие за край на ред (crlf_action): %d"
+
+#, c-format
+msgid "CRLF would be replaced by LF in %s"
+msgstr "всяка последователност от знаци „CRLF“ ще бъдe заменена с „LF“ в „%s“."
+
+#, c-format
+msgid ""
+"in the working copy of '%s', CRLF will be replaced by LF the next time Git "
+"touches it"
+msgstr ""
+"следващия път, когато git работи в работното копие на „%s“, всяка "
+"последователност от знаци „CRLF“ ще бъдe заменена с „LF“"
+
+#, c-format
+msgid "LF would be replaced by CRLF in %s"
+msgstr ""
+"всеки знак „LF“ ще бъдe заменен с последователността от знаци „CRLF“ в „%s“."
+
+#, c-format
+msgid ""
+"in the working copy of '%s', LF will be replaced by CRLF the next time Git "
+"touches it"
+msgstr ""
+"следващия път, когато git работи в работното копие на „%s“, всеки знак „LF“ "
+"ще бъдe заменен с последователността от знаци „CRLF“"
+
+#, c-format
+msgid "BOM is prohibited in '%s' if encoded as %s"
+msgstr ""
+"„%s“ не трябва да съдържа маркер за поредността на байтовете (BOM) при "
+"кодиране „%s“"
+
+#, c-format
+msgid ""
+"The file '%s' contains a byte order mark (BOM). Please use UTF-%.*s as "
+"working-tree-encoding."
+msgstr ""
+"Файлът „%s“ съдържа маркер за поредността на байтовете (BOM).  Използвайте "
+"„UTF-%.*s“ като кодиране за работното дърво."
+
+#, c-format
+msgid "BOM is required in '%s' if encoded as %s"
+msgstr ""
+"„%s“ трябва да съдържа маркер за поредността на байтовете (BOM) при кодиране "
+"„%s“"
+
+#, 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."
+msgstr ""
+"Във файла „%s“ липсва маркер за поредността на байтовете (BOM).  За кодиране "
+"на работното дърво използвайте UTF-%sBE или UTF-%sLE (в зависимост от "
+"поредността на байтовете)."
+
+#, c-format
+msgid "failed to encode '%s' from %s to %s"
+msgstr "неуспешно прекодиране на „%s“ от „%s“ към „%s“"
+
+#, c-format
+msgid "encoding '%s' from %s to %s and back is not the same"
+msgstr "Прекодирането на „%s“ от „%s“ към „%s“ и обратно променя файла"
+
+#, c-format
+msgid "cannot fork to run external filter '%s'"
+msgstr "неуспешно създаване на процес за външен филтър „%s“"
+
+#, c-format
+msgid "cannot feed the input to external filter '%s'"
+msgstr "входът не може да бъде подаден на външния филтър „%s“"
+
+#, c-format
+msgid "external filter '%s' failed %d"
+msgstr "неуспешно изпълнение на външния филтър „%s“: %d"
+
+#, c-format
+msgid "read from external filter '%s' failed"
+msgstr "неуспешно четене от външния филтър „%s“"
+
+#, c-format
+msgid "external filter '%s' failed"
+msgstr "неуспешно изпълнение на външния филтър „%s“"
+
+msgid "unexpected filter type"
+msgstr "неочакван вид филтър"
+
+msgid "path name too long for external filter"
+msgstr "пътят е прекалено дълъг за външен филтър"
+
+#, c-format
+msgid ""
+"external filter '%s' is not available anymore although not all paths have "
+"been filtered"
+msgstr ""
+"външният филтър „%s“ вече не е наличен, въпреки че не всички пътища са "
+"филтрирани"
+
+msgid "true/false are no valid working-tree-encodings"
+msgstr ""
+"„true“/„false“ (истина/лъжа̀) не може да са кодирания на работното дърво"
+
+#, c-format
+msgid "%s: clean filter '%s' failed"
+msgstr "%s: неуспешно изпълнение на декодиращ филтър „%s“"
+
+#, c-format
+msgid "%s: smudge filter %s failed"
+msgstr "%s: неуспешно изпълнение на кодиращ филтър „%s“"
+
+#, c-format
+msgid "skipping credential lookup for key: credential.%s"
+msgstr "прескачане на търсенето на идентификация според ключа: „credential.%s“"
+
+msgid "refusing to work with credential missing host field"
+msgstr "адресът трябва задължително да съдържа хост"
+
+msgid "refusing to work with credential missing protocol field"
+msgstr "адресът трябва задължително да съдържа протокол"
+
+#, c-format
+msgid "url contains a newline in its %s component: %s"
+msgstr "адресът съдържа нов ред в частта за %s: %s"
+
+#, c-format
+msgid "url has no scheme: %s"
+msgstr "адресът е без схема: %s"
+
+#, c-format
+msgid "credential url cannot be parsed: %s"
+msgstr "адресът за идентификация не може да се анализира: „%s“"
+
+msgid "in the future"
+msgstr "в бъдещето"
+
+#, c-format
+msgid "%<PRIuMAX> second ago"
+msgid_plural "%<PRIuMAX> seconds ago"
+msgstr[0] "преди %<PRIuMAX> секунда"
+msgstr[1] "преди %<PRIuMAX> секунди"
+
+#, c-format
+msgid "%<PRIuMAX> minute ago"
+msgid_plural "%<PRIuMAX> minutes ago"
+msgstr[0] "преди %<PRIuMAX> минута"
+msgstr[1] "преди %<PRIuMAX> минути"
+
+#, c-format
+msgid "%<PRIuMAX> hour ago"
+msgid_plural "%<PRIuMAX> hours ago"
+msgstr[0] "преди %<PRIuMAX> час"
+msgstr[1] "преди %<PRIuMAX> часа"
+
+#, c-format
+msgid "%<PRIuMAX> day ago"
+msgid_plural "%<PRIuMAX> days ago"
+msgstr[0] "преди %<PRIuMAX> ден"
+msgstr[1] "преди %<PRIuMAX> дена"
+
+#, c-format
+msgid "%<PRIuMAX> week ago"
+msgid_plural "%<PRIuMAX> weeks ago"
+msgstr[0] "преди %<PRIuMAX> седмица"
+msgstr[1] "преди %<PRIuMAX> седмици"
+
+#, c-format
+msgid "%<PRIuMAX> month ago"
+msgid_plural "%<PRIuMAX> months ago"
+msgstr[0] "преди %<PRIuMAX> месец"
+msgstr[1] "преди %<PRIuMAX> месеца"
+
+#, c-format
+msgid "%<PRIuMAX> year"
+msgid_plural "%<PRIuMAX> years"
+msgstr[0] "%<PRIuMAX> година"
+msgstr[1] "%<PRIuMAX> години"
+
+#. TRANSLATORS: "%s" is "<n> years"
+#, c-format
+msgid "%s, %<PRIuMAX> month ago"
+msgid_plural "%s, %<PRIuMAX> months ago"
+msgstr[0] "преди %s и %<PRIuMAX> месец"
+msgstr[1] "преди %s и %<PRIuMAX> месеца"
+
+#, c-format
+msgid "%<PRIuMAX> year ago"
+msgid_plural "%<PRIuMAX> years ago"
+msgstr[0] "преди %<PRIuMAX> година"
+msgstr[1] "преди %<PRIuMAX> години"
+
+msgid "Propagating island marks"
+msgstr "Разпространяване на границите на групите"
+
+#, c-format
+msgid "bad tree object %s"
+msgstr "неправилен обект-дърво: %s"
+
+#, c-format
+msgid "failed to load island regex for '%s': %s"
+msgstr "регулярният израз на групата за „%s“, не може да бъде зареден: „%s“"
+
+#, c-format
+msgid "island regex from config has too many capture groups (max=%d)"
+msgstr ""
+"регулярният израз на групата в конфигурационния файл съдържа повече от "
+"максимално поддържаните (%d) прихващащи групи"
+
+#, c-format
+msgid "Marked %d islands, done.\n"
+msgstr "Отбелязани са %d групи, работата приключи.\n"
+
+msgid "--merge-base does not work with ranges"
+msgstr "опцията „--merge-base“ не работи с диапазони"
+
+msgid "--merge-base only works with commits"
+msgstr "опцията „--merge-base“ работи само с подавания"
+
+msgid "unable to get HEAD"
+msgstr "Указателят „HEAD“ не може да бъде получен"
+
+msgid "no merge base found"
+msgstr "липсва база за сливане"
+
+msgid "multiple merge bases found"
+msgstr "много бази за сливане"
+
+msgid "git diff --no-index [<options>] <path> <path>"
+msgstr "git diff --no-index [ОПЦИЯ…] ПЪТ ПЪТ"
+
+msgid ""
+"Not a git repository. Use --no-index to compare two paths outside a working "
+"tree"
+msgstr ""
+"Не е хранилище на git.  Ползвайте опцията „--no-index“, за да сравните "
+"пътища извън работно дърво"
+
+#, c-format
+msgid "  Failed to parse dirstat cut-off percentage '%s'\n"
+msgstr ""
+"  Неуспешно разпознаване на „%s“ като процент-праг за статистиката по "
+"директории\n"
+
+#, c-format
+msgid "  Unknown dirstat parameter '%s'\n"
+msgstr "  Непознат параметър „%s“ за статистиката по директории'\n"
+
+msgid ""
+"color moved setting must be one of 'no', 'default', 'blocks', 'zebra', "
+"'dimmed-zebra', 'plain'"
+msgstr ""
+"настройката за цвят за преместване трябва да е една от: „no“ (без), "
+"„default“ (стандартно), „blocks“ (парчета), „zebra“ (райе), „dimmed-"
+"zebra“ (тъмно райе), „plain“ (обикновено)"
+
+#, 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 ""
+"неподдържан режим за настройката „color-moved-ws mode“ — „%s“, възможните "
+"стойности са „ignore-space-change“ (пренебрегване на промѐните на празните "
+"знаци), „ignore-space-at-eol“ (пренебрегване на промѐните на празните знаци "
+"в края на реда), „ignore-all-space“ (пренебрегване на всички празни знаци), "
+"„allow-indentation-change“ (позволяване на промѐните в празните знаци за "
+"форматиране)"
+
+msgid ""
+"color-moved-ws: allow-indentation-change cannot be combined with other "
+"whitespace modes"
+msgstr ""
+"„color-moved-ws“: „allow-indentation-change“ е несъвместима с другите режими "
+"за празни знаци"
+
+#, c-format
+msgid "Unknown value for 'diff.submodule' config variable: '%s'"
+msgstr "Непозната стойност „%s“ за настройката „diff.submodule“"
+
+#, c-format
+msgid ""
+"Found errors in 'diff.dirstat' config variable:\n"
+"%s"
+msgstr ""
+"Грешки в настройката „diff.dirstat“:\n"
+"%s"
+
+#, c-format
+msgid "external diff died, stopping at %s"
+msgstr ""
+"външната програма за разлики завърши неуспешно.  Спиране на работата при „%s“"
+
+#, c-format
+msgid "options '%s', '%s', '%s', and '%s' cannot be used together"
+msgstr "опциите „%s“, „%s“, „%s“ и „%s“ са несъвместими"
+
+#, c-format
+msgid "options '%s' and '%s' cannot be used together, use '%s' with '%s'"
+msgstr "опциите „%s“ и „%s“ са несъвместими, използвайте „%s“ с „%s“"
+
+#, c-format
+msgid ""
+"options '%s' and '%s' cannot be used together, use '%s' with '%s' and '%s'"
+msgstr "опциите „%s“ и „%s“ са несъвместими, използвайте „%s“ с „%s“ и „%s“"
+
+msgid "--follow requires exactly one pathspec"
+msgstr "опцията „--follow“ изисква точно един път"
+
+#, c-format
+msgid "invalid --stat value: %s"
+msgstr "неправилна стойност за „--stat“: %s"
+
+#, c-format
+msgid "%s expects a numerical value"
+msgstr "опцията „%s“ очаква число за аргумент"
+
+#, c-format
+msgid ""
+"Failed to parse --dirstat/-X option parameter:\n"
+"%s"
+msgstr ""
+"Неразпознат параметър към опцията „--dirstat/-X“:\n"
+"%s"
+
+#, c-format
+msgid "unknown change class '%c' in --diff-filter=%s"
+msgstr "непознат вид промяна: „%c“ в „--diff-filter=%s“"
+
+#, c-format
+msgid "unknown value after ws-error-highlight=%.*s"
+msgstr "непозната стойност след „ws-error-highlight=%.*s“"
+
+#, c-format
+msgid "unable to resolve '%s'"
+msgstr "„%s“ не може да се открие"
+
+#, c-format
+msgid "%s expects <n>/<m> form"
+msgstr ""
+"опцията „%s“ изисква стойности за МИНИМАЛЕН_%%_ПРОМЯНА_ЗА_ИЗТОЧНИК_/"
+"МАКСИМАЛЕН_%%_ПРОМЯНА_ЗА_ЗАМЯНА от"
+
+#, c-format
+msgid "%s expects a character, got '%s'"
+msgstr "опцията „%s“ изисква знак, а не: „%s“"
+
+#, c-format
+msgid "bad --color-moved argument: %s"
+msgstr "неправилен аргумент за „--color-moved“: „%s“"
+
+#, c-format
+msgid "invalid mode '%s' in --color-moved-ws"
+msgstr "неправилен режим „%s“ за „ --color-moved-ws“"
+
+msgid ""
+"option diff-algorithm accepts \"myers\", \"minimal\", \"patience\" and "
+"\"histogram\""
+msgstr ""
+"опцията приема следните варианти за алгоритъм за разлики: „myers“ (по "
+"Майерс), „minimal“ (минимизиране на разликите), „patience“ (пасианс) и "
+"„histogram“ (хистограмен)"
+
+#, c-format
+msgid "invalid argument to %s"
+msgstr "неправилен аргумент към „%s“"
+
+#, c-format
+msgid "invalid regex given to -I: '%s'"
+msgstr "неправилен регулярен израз подаден към „-I“: „%s“"
+
+#, c-format
+msgid "failed to parse --submodule option parameter: '%s'"
+msgstr "неразпознат параметър към опцията „--submodule“: „%s“"
+
+#, c-format
+msgid "bad --word-diff argument: %s"
+msgstr "неправилен аргумент към „--word-diff“: „%s“"
+
+msgid "Diff output format options"
+msgstr "Формат на изхода за разликите"
+
+msgid "generate patch"
+msgstr "създаване на кръпки"
+
+msgid "<n>"
+msgstr "БРОЙ"
+
+msgid "generate diffs with <n> lines context"
+msgstr "файловете с разлики да са с контекст с такъв БРОЙ редове"
+
+msgid "generate the diff in raw format"
+msgstr "файловете с разлики да са в суров формат"
+
+msgid "synonym for '-p --raw'"
+msgstr "псевдоним на „-p --raw“"
+
+msgid "synonym for '-p --stat'"
+msgstr "псевдоним на „-p --stat“"
+
+msgid "machine friendly --stat"
+msgstr "„--stat“ във формат за четене от програма"
+
+msgid "output only the last line of --stat"
+msgstr "извеждане само на последния ред на „--stat“"
+
+msgid "<param1,param2>..."
+msgstr "ПАРАМЕТЪР_1, ПАРАМЕТЪР_2, …"
+
+msgid ""
+"output the distribution of relative amount of changes for each sub-directory"
+msgstr "извеждане на разпределението на промѐните за всяка поддиректория"
+
+msgid "synonym for --dirstat=cumulative"
+msgstr "псевдоним на „--dirstat=cumulative“"
+
+msgid "synonym for --dirstat=files,param1,param2..."
+msgstr "псевдоним на „--dirstat=ФАЙЛ…,ПАРАМЕТЪР_1,ПАРАМЕТЪР_2,…“"
+
+msgid "warn if changes introduce conflict markers or whitespace errors"
+msgstr ""
+"предупреждаване, ако промѐните водят до маркери за конфликт или грешки в "
+"празните знаци"
+
+msgid "condensed summary such as creations, renames and mode changes"
+msgstr ""
+"съкратено резюме на създадените, преименуваните и файловете с промяна на "
+"режима на достъп"
+
+msgid "show only names of changed files"
+msgstr "извеждане само на имената на променените файлове"
+
+msgid "show only names and status of changed files"
+msgstr "извеждане само на имената и статистиката за променените файлове"
+
+msgid "<width>[,<name-width>[,<count>]]"
+msgstr "ШИРОЧИНА[,ИМЕ-ШИРОЧИНА[,БРОЙ]]"
+
+msgid "generate diffstat"
+msgstr "извеждане на статистика за промѐните"
+
+msgid "<width>"
+msgstr "ШИРОЧИНА"
+
+msgid "generate diffstat with a given width"
+msgstr "статистика с такава ШИРОЧИНА за промѐните"
+
+msgid "generate diffstat with a given name width"
+msgstr "статистика за промѐните с такава ШИРОЧИНА на имената"
+
+msgid "generate diffstat with a given graph width"
+msgstr "статистика за промѐните с такава ШИРОЧИНА на гра̀фа"
+
+msgid "<count>"
+msgstr "БРОЙ"
+
+msgid "generate diffstat with limited lines"
+msgstr "ограничаване на БРОя на редовете в статистиката за промѐните"
+
+msgid "generate compact summary in diffstat"
+msgstr "кратко резюме в статистиката за промѐните"
+
+msgid "output a binary diff that can be applied"
+msgstr "извеждане на двоична разлика във вид за прилагане"
+
+msgid "show full pre- and post-image object names on the \"index\" lines"
+msgstr ""
+"показване на пълните имена на обекти в редовете за индекса при вариантите "
+"преди и след промяната"
+
+msgid "show colored diff"
+msgstr "разлики в цвят"
+
+msgid "<kind>"
+msgstr "ВИД"
+
+msgid ""
+"highlight whitespace errors in the 'context', 'old' or 'new' lines in the "
+"diff"
+msgstr ""
+"грешките в празните знаци да се указват в редовете за контекста, вариантите "
+"преди и след разликата,"
+
+msgid ""
+"do not munge pathnames and use NULs as output field terminators in --raw or "
+"--numstat"
+msgstr ""
+"без преименуване на пътищата.  Да се използват нулеви байтове за разделители "
+"на полета в изхода при ползване на опцията „--raw“ или „--numstat“"
+
+msgid "<prefix>"
+msgstr "ПРЕФИКС"
+
+msgid "show the given source prefix instead of \"a/\""
+msgstr "префикс вместо „a/“ за източник"
+
+msgid "show the given destination prefix instead of \"b/\""
+msgstr "префикс вместо „b/“ за цел"
+
+msgid "prepend an additional prefix to every line of output"
+msgstr "добавяне на допълнителен префикс за всеки ред на изхода"
+
+msgid "do not show any source or destination prefix"
+msgstr "без префикс за източника и целта"
+
+msgid "show context between diff hunks up to the specified number of lines"
+msgstr ""
+"извеждане на контекст между последователните парчета с разлики от указания "
+"БРОЙ редове"
+
+msgid "<char>"
+msgstr "ЗНАК"
+
+msgid "specify the character to indicate a new line instead of '+'"
+msgstr "знак вместо „+“ за нов вариант на ред"
+
+msgid "specify the character to indicate an old line instead of '-'"
+msgstr "знак вместо „-“ за стар вариант на ред"
+
+msgid "specify the character to indicate a context instead of ' '"
+msgstr "знак вместо „ “ за контекст"
+
+msgid "Diff rename options"
+msgstr "Настройки за разлики с преименуване"
+
+msgid "<n>[/<m>]"
+msgstr "МИНИМАЛЕН_%_ПРОМЯНА_ЗА_ИЗТОЧНИК[/МАКСИМАЛEН_%_ПРОМЯНА_ЗА_ЗАМЯНА]"
+
+msgid "break complete rewrite changes into pairs of delete and create"
+msgstr ""
+"заместване на пълните промѐни с последователност от изтриване и създаване"
+
+msgid "detect renames"
+msgstr "засичане на преименуванията"
+
+msgid "omit the preimage for deletes"
+msgstr "без предварителен вариант при изтриване"
+
+msgid "detect copies"
+msgstr "засичане на копиранията"
+
+msgid "use unmodified files as source to find copies"
+msgstr "търсене на копирано и от непроменените файлове"
+
+msgid "disable rename detection"
+msgstr "без търсене на преименувания"
+
+msgid "use empty blobs as rename source"
+msgstr "празни обекти като източник при преименувания"
+
+msgid "continue listing the history of a file beyond renames"
+msgstr ""
+"продължаване на извеждането на историята — без отрязването при преименувания "
+"на файл"
+
+msgid ""
+"prevent rename/copy detection if the number of rename/copy targets exceeds "
+"given limit"
+msgstr ""
+"без засичане на преименувания/копирания, ако броят им надвишава тази стойност"
+
+msgid "Diff algorithm options"
+msgstr "Опции към алгоритъма за разлики"
+
+msgid "produce the smallest possible diff"
+msgstr "търсене на възможно най-малка разлика"
+
+msgid "ignore whitespace when comparing lines"
+msgstr "без промѐни в празните знаци при сравняване на редове"
+
+msgid "ignore changes in amount of whitespace"
+msgstr "без промѐни в празните знаци"
+
+msgid "ignore changes in whitespace at EOL"
+msgstr "без промѐни в празните знаци в края на редовете"
+
+msgid "ignore carrier-return at the end of line"
+msgstr "без промѐни в знаците за край на ред"
+
+msgid "ignore changes whose lines are all blank"
+msgstr "без промѐни в редовете, които са изцяло от празни знаци"
+
+msgid "<regex>"
+msgstr "РЕГУЛЯРЕН_ИЗРАЗ"
+
+msgid "ignore changes whose all lines match <regex>"
+msgstr "без промѐни в редовете, които напасват РЕГУЛЯРНия_ИЗРАЗ"
+
+msgid "heuristic to shift diff hunk boundaries for easy reading"
+msgstr ""
+"евристика за преместване на границите на парчетата за улесняване на четенето"
+
+msgid "generate diff using the \"patience diff\" algorithm"
+msgstr "разлика чрез алгоритъм за подредба като пасианс"
+
+msgid "generate diff using the \"histogram diff\" algorithm"
+msgstr "разлика по хистограмния алгоритъм"
+
+msgid "<algorithm>"
+msgstr "АЛГОРИТЪМ"
+
+msgid "choose a diff algorithm"
+msgstr "избор на АЛГОРИТЪМа за разлики"
+
+msgid "<text>"
+msgstr "ТЕКСТ"
+
+msgid "generate diff using the \"anchored diff\" algorithm"
+msgstr "разлика чрез алгоритъма със закотвяне"
+
+msgid "<mode>"
+msgstr "РЕЖИМ"
+
+msgid "show word diff, using <mode> to delimit changed words"
+msgstr ""
+"разлика по думи, като се ползва този РЕЖИМ за отделянето на променените думи"
+
+msgid "use <regex> to decide what a word is"
+msgstr "РЕГУЛЯРЕН_ИЗРАЗ за разделяне по думи"
+
+msgid "equivalent to --word-diff=color --word-diff-regex=<regex>"
+msgstr "псевдоним на „--word-diff=color --word-diff-regex=РЕГУЛЯРЕН_ИЗРАЗ“"
+
+msgid "moved lines of code are colored differently"
+msgstr "различен цвят за извеждане на преместените редове"
+
+msgid "how white spaces are ignored in --color-moved"
+msgstr ""
+"режим за прескачането на празните знаци при задаването на „--color-moved“"
+
+msgid "Other diff options"
+msgstr "Други опции за разлики"
+
+msgid "when run from subdir, exclude changes outside and show relative paths"
+msgstr ""
+"при изпълнение от поддиректория да се пренебрегват разликите извън нея и да "
+"се ползват относителни пътища"
+
+msgid "treat all files as text"
+msgstr "обработка на всички файлове като текстови"
+
+msgid "swap two inputs, reverse the diff"
+msgstr "размяна на двата входа — обръщане на разликата"
+
+msgid "exit with 1 if there were differences, 0 otherwise"
+msgstr ""
+"завършване с код за състояние 1 при наличието на разлики, а в противен "
+"случай — с 0"
+
+msgid "disable all output of the program"
+msgstr "без всякакъв изход от програмата"
+
+msgid "allow an external diff helper to be executed"
+msgstr "позволяване на изпълнение на външна помощна програма за разлики"
+
+msgid "run external text conversion filters when comparing binary files"
+msgstr ""
+"изпълнение на външни програми-филтри при сравнението на двоични файлове"
+
+msgid "<when>"
+msgstr "КОГА"
+
+msgid "ignore changes to submodules in the diff generation"
+msgstr "игнориране на промѐните в подмодулите при извеждането на разликите"
+
+msgid "<format>"
+msgstr "ФОРМАТ"
+
+msgid "specify how differences in submodules are shown"
+msgstr "начин за извеждане на промѐните в подмодулите"
+
+msgid "hide 'git add -N' entries from the index"
+msgstr "без включване в индекса на записите, добавени с „git add -N“"
+
+msgid "treat 'git add -N' entries as real in the index"
+msgstr "включване в индекса на записите, добавени с „git add -N“"
+
+msgid "<string>"
+msgstr "НИЗ"
+
+msgid ""
+"look for differences that change the number of occurrences of the specified "
+"string"
+msgstr "търсене на разлики, които променят броя на поява на указаните низове"
+
+msgid ""
+"look for differences that change the number of occurrences of the specified "
+"regex"
+msgstr ""
+"търсене на разлики, които променят броя на поява на низовете, които напасват "
+"на регулярния израз"
+
+msgid "show all changes in the changeset with -S or -G"
+msgstr "извеждане на всички промѐни с „-G“/„-S“"
+
+msgid "treat <string> in -S as extended POSIX regular expression"
+msgstr "НИЗът към „-S“ да се тълкува като разширен регулярен израз по POSIX"
+
+msgid "control the order in which files appear in the output"
+msgstr "управление на подредбата на файловете в изхода"
+
+msgid "<path>"
+msgstr "ПЪТ"
+
+msgid "show the change in the specified path first"
+msgstr "първо извеждане на промяната в указания път"
+
+msgid "skip the output to the specified path"
+msgstr "прескачане на изхода към указания път"
+
+msgid "<object-id>"
+msgstr "ИДЕНТИФИКАТОР_НА_ОБЕКТ"
+
+msgid ""
+"look for differences that change the number of occurrences of the specified "
+"object"
+msgstr "търсене на разлики, които променят броя на поява на указания обект"
+
+msgid "[(A|C|D|M|R|T|U|X|B)...[*]]"
+msgstr "[(A|C|D|M|R|T|U|X|B)…[*]]"
+
+msgid "select files by diff type"
+msgstr "избор на файловете по вид разлика"
+
+msgid "<file>"
+msgstr "ФАЙЛ"
+
+msgid "output to a specific file"
+msgstr "изход към указания ФАЙЛ"
+
+msgid "exhaustive rename detection was skipped due to too many files."
+msgstr ""
+"пълното търсене на преименувания на обекти се прескача поради многото "
+"файлове."
+
+msgid "only found copies from modified paths due to too many files."
+msgstr ""
+"установени са само точните копия на променените пътища поради многото "
+"файлове."
+
+#, c-format
+msgid ""
+"you may want to set your %s variable to at least %d and retry the command."
+msgstr "задайте променливата „%s“ да е поне %d и отново изпълнете командата."
+
+#, c-format
+msgid "failed to read orderfile '%s'"
+msgstr "файлът с подредбата на съответствията „%s“ не може да бъде прочетен"
+
+msgid "Performing inexact rename detection"
+msgstr "Търсене на преименувания на обекти съчетани с промѐни"
+
+#, c-format
+msgid "No such path '%s' in the diff"
+msgstr "Няма път на име „%s“ в разликата"
+
+#, c-format
+msgid "pathspec '%s' did not match any file(s) known to git"
+msgstr "пътят „%s“ не съвпада с никой файл в git"
+
+#, c-format
+msgid "unrecognized pattern: '%s'"
+msgstr "непознат шаблон: „%s“"
+
+#, c-format
+msgid "unrecognized negative pattern: '%s'"
+msgstr "непознат отрицателен шаблон: „%s“"
+
+#, c-format
+msgid "your sparse-checkout file may have issues: pattern '%s' is repeated"
+msgstr ""
+"файлът определящ частичността на изтегленото хранилище може да има проблем: "
+"шаблонът „%s“ се повтаря"
+
+msgid "disabling cone pattern matching"
+msgstr "изключване на пътеводното напасване"
+
+#, c-format
+msgid "cannot use %s as an exclude file"
+msgstr "„%s“ не може да се ползва за игнорираните файлове (като gitignore)"
+
+msgid "failed to get kernel name and information"
+msgstr "името и версията на ядрото не бяха получени"
+
+msgid "untracked cache is disabled on this system or location"
+msgstr ""
+"кешът за неследените файлове е изключен на тази система или местоположение"
+
+msgid ""
+"No directory name could be guessed.\n"
+"Please specify a directory on the command line"
+msgstr ""
+"Името на директорията не може да бъде отгатнато.\n"
+"Задайте директорията изрично на командния ред"
+
+#, c-format
+msgid "index file corrupt in repo %s"
+msgstr "файлът с индекса е повреден в хранилището „%s“"
+
+#, c-format
+msgid "could not create directories for %s"
+msgstr "директориите за „%s“ не може да бъдат създадени"
+
+#, c-format
+msgid "could not migrate git directory from '%s' to '%s'"
+msgstr "директорията на git не може да се мигрира от „%s“ до „%s“"
+
+#, c-format
+msgid "hint: Waiting for your editor to close the file...%c"
+msgstr "Подсказка: чака се редакторът ви да затвори файла …%c"
+
+msgid "Filtering content"
+msgstr "Филтриране на съдържанието"
+
+#, c-format
+msgid "could not stat file '%s'"
+msgstr "неуспешно изпълнение на „stat“ върху файла „%s“"
+
+#, c-format
+msgid "bad git namespace path \"%s\""
+msgstr "неправилен път към пространства от имена „%s“"
+
+#, c-format
+msgid "too many args to run %s"
+msgstr "прекалено много аргументи за изпълнение „%s“"
+
+msgid "git fetch-pack: expected shallow list"
+msgstr "git fetch-pack: очаква се плитък списък"
+
+msgid "git fetch-pack: expected a flush packet after shallow list"
+msgstr "git fetch-pack: след плитък списък се очаква изчистващ пакет „flush“"
+
+msgid "git fetch-pack: expected ACK/NAK, got a flush packet"
+msgstr ""
+"git fetch-pack: очаква се „ACK“/„NAK“, а бе получен изчистващ пакет „flush“"
+
+#, c-format
+msgid "git fetch-pack: expected ACK/NAK, got '%s'"
+msgstr "git fetch-pack: очаква се „ACK“/„NAK“, а бе получено „%s“"
+
+msgid "unable to write to remote"
+msgstr "невъзможно писане към отдалечено хранилище"
+
+#, c-format
+msgid "invalid shallow line: %s"
+msgstr "неправилен плитък ред: „%s“"
+
+#, c-format
+msgid "invalid unshallow line: %s"
+msgstr "неправилен неплитък ред: „%s“"
+
+#, c-format
+msgid "object not found: %s"
+msgstr "обектът „%s“ липсва"
+
+#, c-format
+msgid "error in object: %s"
+msgstr "грешка в обекта: „%s“"
+
+#, c-format
+msgid "no shallow found: %s"
+msgstr "не е открит плитък обект: %s"
+
+#, c-format
+msgid "expected shallow/unshallow, got %s"
+msgstr "очаква се плитък или не обект, а бе получено: „%s“"
+
+#, c-format
+msgid "got %s %d %s"
+msgstr "получено бе %s %d %s"
+
+#, c-format
+msgid "invalid commit %s"
+msgstr "неправилно подаване: „%s“"
+
+msgid "giving up"
+msgstr "преустановяване"
+
+msgid "done"
+msgstr "действието завърши"
+
+#, c-format
+msgid "got %s (%d) %s"
+msgstr "получено бе %s (%d) %s"
+
+#, c-format
+msgid "Marking %s as complete"
+msgstr "Отбелязване на „%s“ като пълно"
+
+#, c-format
+msgid "already have %s (%s)"
+msgstr "вече има „%s“ (%s)"
+
+msgid "fetch-pack: unable to fork off sideband demultiplexer"
+msgstr "fetch-pack: не може да се създаде процес за демултиплексора"
+
+msgid "protocol error: bad pack header"
+msgstr "протоколна грешка: неправилна заглавна част на пакет"
+
+#, c-format
+msgid "fetch-pack: unable to fork off %s"
+msgstr "fetch-pack: не може да се създаде процес за „%s“"
+
+msgid "fetch-pack: invalid index-pack output"
+msgstr "fetch-pack: неправилен изход от командата „index-pack“"
+
+#, c-format
+msgid "%s failed"
+msgstr "неуспешно изпълнение на „%s“"
+
+msgid "error in sideband demultiplexer"
+msgstr "грешка в демултиплексора"
+
+#, c-format
+msgid "Server version is %.*s"
+msgstr "Версията на сървъра е: %.*s"
+
+#, c-format
+msgid "Server supports %s"
+msgstr "Сървърът поддържа „%s“"
+
+msgid "Server does not support shallow clients"
+msgstr "Сървърът не поддържа плитки клиенти"
+
+msgid "Server does not support --shallow-since"
+msgstr "Сървърът не поддържа опцията „--shallow-since“"
+
+msgid "Server does not support --shallow-exclude"
+msgstr "Сървърът не поддържа опцията „--shallow-exclude“"
+
+msgid "Server does not support --deepen"
+msgstr "Сървърът не поддържа опцията „--deepen“"
+
+msgid "Server does not support this repository's object format"
+msgstr "Сървърът не поддържа форма̀та на обектите на това хранилище"
+
+msgid "no common commits"
+msgstr "няма общи подавания"
+
+msgid "git fetch-pack: fetch failed."
+msgstr "git fetch-pack: неуспешно доставяне."
+
+#, c-format
+msgid "mismatched algorithms: client %s; server %s"
+msgstr "различни алгоритми — на клиента: „%s“, на сървъра: „%s“"
+
+#, c-format
+msgid "the server does not support algorithm '%s'"
+msgstr "сървърът не поддържа алгоритъм „%s“"
+
+msgid "Server does not support shallow requests"
+msgstr "Сървърът не поддържа плитки заявки"
+
+msgid "Server supports filter"
+msgstr "Сървърът поддържа филтри"
+
+msgid "unable to write request to remote"
+msgstr "невъзможно писане към отдалечено хранилище"
+
+#, c-format
+msgid "expected '%s', received '%s'"
+msgstr "очаква се „%s“, а бе получено „%s“"
+
+#, c-format
+msgid "expected '%s'"
+msgstr "очаква се „%s“"
+
+#, c-format
+msgid "unexpected acknowledgment line: '%s'"
+msgstr "неочакван ред за потвърждение: „%s“"
+
+#, c-format
+msgid "error processing acks: %d"
+msgstr "грешка при обработка на потвържденията: %d"
+
+#. TRANSLATORS: The parameter will be 'ready', a protocol
+#. keyword.
+#.
+#, c-format
+msgid "expected packfile to be sent after '%s'"
+msgstr "очаква се пакетният файл да бъде изпратен след „%s“"
+
+#. TRANSLATORS: The parameter will be 'ready', a protocol
+#. keyword.
+#.
+#, c-format
+msgid "expected no other sections to be sent after no '%s'"
+msgstr "очаква се след липса на „%s“ да не се се пращат други раздели"
+
+#, c-format
+msgid "error processing shallow info: %d"
+msgstr "грешка при обработка на информация за дълбочината/плиткостта: %d"
+
+#, c-format
+msgid "expected wanted-ref, got '%s'"
+msgstr "очаква се искан указател, а бе получено: „%s“"
+
+#, c-format
+msgid "unexpected wanted-ref: '%s'"
+msgstr "неочакван искан указател: „%s“"
+
+#, c-format
+msgid "error processing wanted refs: %d"
+msgstr "грешка при обработката на исканите указатели: %d"
+
+msgid "git fetch-pack: expected response end packet"
+msgstr "git fetch-pack: очаква се пакет за край на отговора"
+
+msgid "no matching remote head"
+msgstr "не може да бъде открит подходящ връх от отдалеченото хранилище"
+
+msgid "unexpected 'ready' from remote"
+msgstr "неочаквано състояние за готовност от отдалечено хранилище"
+
+#, c-format
+msgid "no such remote ref %s"
+msgstr "такъв отдалечен указател няма: %s"
+
+#, c-format
+msgid "Server does not allow request for unadvertised object %s"
+msgstr "Сървърът не позволява заявка за необявен обект „%s“"
+
+#, c-format
+msgid "fsmonitor_ipc__send_query: invalid path '%s'"
+msgstr "fsmonitor_ipc__send_query: неправилен път „%s“"
+
+#, c-format
+msgid "fsmonitor_ipc__send_query: unspecified error on '%s'"
+msgstr "fsmonitor_ipc__send_query: неуказана грешка за „%s“"
+
+msgid "fsmonitor--daemon is not running"
+msgstr "„fsmonitor--daemon“ не работи"
+
+#, c-format
+msgid "could not send '%s' command to fsmonitor--daemon"
+msgstr "командата „%s“ не може да се прати към „fsmonitor--daemon“"
+
+#, c-format
+msgid "bare repository '%s' is incompatible with fsmonitor"
+msgstr "голото хранилище „%s“ е несъвместимо с fsmonitor"
+
+#, c-format
+msgid "repository '%s' is incompatible with fsmonitor due to errors"
+msgstr "хранилището „%s“ е несъвместимо с fsmonitor поради грешки"
+
+#, c-format
+msgid "remote repository '%s' is incompatible with fsmonitor"
+msgstr "отдалеченото хранилище „%s“ е съвместимо с fsmonitor"
+
+#, c-format
+msgid "virtual repository '%s' is incompatible with fsmonitor"
+msgstr "виртуалното хранилище „%s“ е несъвместимо с fsmonitor"
+
+#, c-format
+msgid ""
+"repository '%s' is incompatible with fsmonitor due to lack of Unix sockets"
+msgstr ""
+"хранилището „%s“ е несъвместимо с fsmonitor заради липсата на гнезда на unix"
+
+msgid ""
+"git [-v | --version] [-h | --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"
+"           [--git-dir=<path>] [--work-tree=<path>] [--namespace=<name>]\n"
+"           [--super-prefix=<path>] [--config-env=<name>=<envvar>]\n"
+"           <command> [<args>]"
+msgstr ""
+"git [-v | --version] [-h | --help] [-C ПЪТ] [-c ИМЕ=СТОЙНОСТ]\n"
+"           [--exec-path[=ПЪТ]] [--html-path] [--man-path] [--info-path]\n"
+"           [-p | --paginate | -P | --no-pager] [--no-replace-objects] [--"
+"bare]\n"
+"           [--git-dir=ПЪТ] [--work-tree=ПЪТ] [--namespace=ИМЕ]\n"
+"           [--super-prefix=ПЪТ] [--config-env=ИМЕ=ПРОМЕНЛИВА_НА_СРЕДАТА]\n"
+"           КОМАНДА [АРГ…]"
+
+msgid ""
+"'git help -a' and 'git help -g' list available subcommands and some\n"
+"concept guides. See 'git help <command>' or 'git help <concept>'\n"
+"to read about a specific subcommand or concept.\n"
+"See 'git help git' for an overview of the system."
+msgstr ""
+"„git help -a“ извежда наличните подкоманди, а „git help -g“ извежда "
+"наличните\n"
+"въведения.  За помощ за специфична КОМАНДА ползвайте „git help КОМАНДА“, а "
+"за\n"
+"някое определено ПОНЯТИЕ използвайте „git help ПОНЯТИЕ“.  За преглед на\n"
+"системата за помощ използвайте „git help git“."
+
+#, c-format
+msgid "unsupported command listing type '%s'"
+msgstr "неподдържан списък от команди „%s“"
+
+#, c-format
+msgid "no directory given for '%s' option\n"
+msgstr "опцията „%s“ изисква директория\n"
+
+#, c-format
+msgid "no namespace given for --namespace\n"
+msgstr "опцията „--namespace“ изисква име\n"
+
+#, c-format
+msgid "no prefix given for --super-prefix\n"
+msgstr "опцията „--super-prefix“ изисква префикс\n"
+
+#, c-format
+msgid "-c expects a configuration string\n"
+msgstr "опцията „-c“ изисква низ за настройка\n"
+
+#, c-format
+msgid "no config key given for --config-env\n"
+msgstr "опцията „--config-env“ изисква ключ\n"
+
+#, c-format
+msgid "unknown option: %s\n"
+msgstr "непозната опция: „%s“\n"
+
+#, c-format
+msgid "while expanding alias '%s': '%s'"
+msgstr "при заместването на псевдоним „%s“: „%s“"
+
+#, c-format
+msgid ""
+"alias '%s' changes environment variables.\n"
+"You can use '!git' in the alias to do this"
+msgstr ""
+"псевдонимът „%s“ променя променливи на средата.\n"
+"За това може да ползвате „!git“ в псевдонима"
+
+#, c-format
+msgid "empty alias for %s"
+msgstr "празен псевдоним за „%s“"
+
+#, c-format
+msgid "recursive alias: %s"
+msgstr "зациклен псевдоним: „%s“"
+
+msgid "write failure on standard output"
+msgstr "грешка при запис на стандартния изход"
+
+msgid "unknown write failure on standard output"
+msgstr "неизвестна грешка при запис на стандартния изход"
+
+msgid "close failed on standard output"
+msgstr "грешка при затваряне на стандартния изход"
+
+#, c-format
+msgid "alias loop detected: expansion of '%s' does not terminate:%s"
+msgstr "зацикляне в псевдонимите: заместванията на „%s“ не приключват:%s"
+
+#, c-format
+msgid "cannot handle %s as a builtin"
+msgstr "„%s“ не може да се обработи като вградена команда"
+
+#, c-format
+msgid ""
+"usage: %s\n"
+"\n"
+msgstr ""
+"употреба: %s\n"
+"\n"
+
+#, c-format
+msgid "expansion of alias '%s' failed; '%s' is not a git command\n"
+msgstr ""
+"неуспешно заместване на псевдонима „%s“ — резултатът „%s“ не е команда на "
+"git\n"
+
+#, c-format
+msgid "failed to run command '%s': %s\n"
+msgstr "командата „%s“ не може да се изпълни: %s\n"
+
+msgid "could not create temporary file"
+msgstr "не може да се създаде временен файл"
+
+#, c-format
+msgid "failed writing detached signature to '%s'"
+msgstr "Програмата не успя да запише самостоятелния подпис в „%s“"
+
+msgid ""
+"gpg.ssh.allowedSignersFile needs to be configured and exist for ssh "
+"signature verification"
+msgstr ""
+"настройката „gpg.ssh.allowedSignersFile“ трябва да е зададена за проверка на "
+"подписите на ssh"
+
+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"
+
+#, c-format
+msgid "ssh signing revocation file configured but not found: %s"
+msgstr ""
+"файлът за отхвърляне на подписи на ssh е настроен, но не може да се открие: "
+"%s"
+
+#, c-format
+msgid "bad/incompatible signature '%s'"
+msgstr "лош/несъвместим подпис „%s“"
+
+#, c-format
+msgid "failed to get the ssh fingerprint for key '%s'"
+msgstr "отпечатъкът по ssh на ключа „%s“ не може да бъде получен"
+
+msgid ""
+"either user.signingkey or gpg.ssh.defaultKeyCommand needs to be configured"
+msgstr ""
+"Поне една от настройките „user.signingkey“ или „gpg.ssh.defaultKeyCommand“ "
+"трябва да е зададена"
+
+#, c-format
+msgid "gpg.ssh.defaultKeyCommand succeeded but returned no keys: %s %s"
+msgstr ""
+"командата „gpg.ssh.defaultKeyCommand“ завърши успешно, но не върна никакви "
+"ключове: %s %s"
+
+#, c-format
+msgid "gpg.ssh.defaultKeyCommand failed: %s %s"
+msgstr "неуспешно изпълнение на „gpg.ssh.defaultKeyCommand“: %s %s"
+
+msgid "gpg failed to sign the data"
+msgstr "Програмата „gpg“ не подписа данните"
+
+msgid "user.signingKey needs to be set for ssh signing"
+msgstr ""
+"за подписване със ssh е необходимо да зададете настройката „user.signingKey“"
+
+#, c-format
+msgid "failed writing ssh signing key to '%s'"
+msgstr "неуспешно запазване на ключа за подписване на ssh в „%s“"
+
+#, c-format
+msgid "failed writing ssh signing key buffer to '%s'"
+msgstr "неуспешно запазване на буфера за подписване на ssh в „%s“"
+
+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"
+
+#, c-format
+msgid "failed reading ssh signing data buffer from '%s'"
+msgstr "неуспешно прочитане на буфера за подписване на ssh от „%s“"
+
+#, c-format
+msgid "ignored invalid color '%.*s' in log.graphColors"
+msgstr "прескачане на неправилния цвят „%.*s“ в „log.graphColors“"
+
+msgid ""
+"given pattern contains NULL byte (via -f <file>). This is only supported "
+"with -P under PCRE v2"
+msgstr ""
+"зададеният шаблон съдържа нулев знак (идва от -f „ФАЙЛ“).  Това се поддържа "
+"в комбинация с „-P“ само при ползването на „PCRE v2“"
+
+#, c-format
+msgid "'%s': unable to read %s"
+msgstr "„%s“: файлът сочен от „%s“ не може да бъде прочетен"
+
+#, c-format
+msgid "'%s': short read"
+msgstr "„%s“: изчитането върна по-малко байтове от очакваното"
+
+msgid "start a working area (see also: git help tutorial)"
+msgstr "създаване на работно дърво (погледнете: „git help tutorial“)"
+
+msgid "work on the current change (see also: git help everyday)"
+msgstr "работа по текущата промяна (погледнете: „git help everyday“)"
+
+msgid "examine the history and state (see also: git help revisions)"
+msgstr "преглед на историята и състоянието (погледнете: „git help revisions“)"
+
+msgid "grow, mark and tweak your common history"
+msgstr "увеличаване, отбелязване и промяна на общата история"
+
+msgid "collaborate (see also: git help workflows)"
+msgstr "съвместна работа (погледнете: „git help workflows“)"
+
+msgid "Main Porcelain Commands"
+msgstr "Основни команди от потребителско ниво"
+
+msgid "Ancillary Commands / Manipulators"
+msgstr "Помощни команди / Променящи"
+
+msgid "Ancillary Commands / Interrogators"
+msgstr "Помощни команди / Запитващи"
+
+msgid "Interacting with Others"
+msgstr "Съвместна работа с други хора"
+
+msgid "Low-level Commands / Manipulators"
+msgstr "Команди от ниско ниво / Променящи"
+
+msgid "Low-level Commands / Interrogators"
+msgstr "Команди от ниско ниво / Запитващи"
+
+msgid "Low-level Commands / Syncing Repositories"
+msgstr "Команди от ниско ниво / Синхронизация на хранилища"
+
+msgid "Low-level Commands / Internal Helpers"
+msgstr "Команди от ниско ниво / Допълнителни инструменти"
+
+#, c-format
+msgid "available git commands in '%s'"
+msgstr "налични команди на git от „%s“"
+
+msgid "git commands available from elsewhere on your $PATH"
+msgstr "команди на git от други директории от „$PATH“"
+
+msgid "These are common Git commands used in various situations:"
+msgstr "Това са най-често използваните команди на Git:"
+
+msgid "The Git concept guides are:"
+msgstr "Ръководствата за концепциите в Git са:"
+
+msgid "External commands"
+msgstr "Външни команди"
+
+msgid "Command aliases"
+msgstr "Псевдоними на командите"
+
+msgid "See 'git help <command>' to read about a specific subcommand"
+msgstr "За повече информация за КОМАНДА изпълнете „git help КОМАНДА“"
+
+#, c-format
+msgid ""
+"'%s' appears to be a git command, but we were not\n"
+"able to execute it. Maybe git-%s is broken?"
+msgstr ""
+"Изглежда, че „%s“ е команда на git, но тя не може да\n"
+"бъде изпълнена.  Вероятно пакетът „git-%s“ е повреден."
+
+#, c-format
+msgid "git: '%s' is not a git command. See 'git --help'."
+msgstr "git: „%s“ не е команда на git.  Погледнете изхода от „git --help“."
+
+msgid "Uh oh. Your system reports no Git commands at all."
+msgstr "Странно, изглежда, че на системата ви няма нито една команда на git."
+
+#, c-format
+msgid "WARNING: You called a Git command named '%s', which does not exist."
+msgstr ""
+"ПРЕДУПРЕЖДЕНИЕ: Пробвахте да изпълните команда на Git на име „%s“, а такава "
+"не съществува."
+
+#, c-format
+msgid "Continuing under the assumption that you meant '%s'."
+msgstr ""
+"Изпълнението автоматично продължава, като се счита, че имате предвид „%s“."
+
+#, c-format
+msgid "Run '%s' instead [y/N]? "
+msgstr "Да се изпълни „%s“ вместо това [y/N]? "
+
+#, c-format
+msgid "Continuing in %0.1f seconds, assuming that you meant '%s'."
+msgstr ""
+"Изпълнението автоматично ще продължи след %0.1f сек., като се счита, че "
+"имате предвид „%s“."
+
+msgid ""
+"\n"
+"The most similar command is"
+msgid_plural ""
+"\n"
+"The most similar commands are"
+msgstr[0] ""
+"\n"
+"Най-близката команда е"
+msgstr[1] ""
+"\n"
+"Най-близките команди са"
+
+msgid "git version [<options>]"
+msgstr "git version [ОПЦИЯ…]"
+
+#, c-format
+msgid "%s: %s - %s"
+msgstr "%s: %s — %s"
+
+msgid ""
+"\n"
+"Did you mean this?"
+msgid_plural ""
+"\n"
+"Did you mean one of these?"
+msgstr[0] ""
+"\n"
+"Команда с подобно име е:"
+msgstr[1] ""
+"\n"
+"Команди с подобно име са:"
+
+#, 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"
+
+#, c-format
+msgid "Couldn't start hook '%s'\n"
+msgstr "Куката „%s“ не може да се стартира\n"
+
+#, c-format
+msgid "argument to --packfile must be a valid hash (got '%s')"
+msgstr "опцията „--packfile“ изисква валидна контролна сума (а не „%s“)"
+
+msgid "not a git repository"
+msgstr "не е хранилище на Git"
+
+#, c-format
+msgid "negative value for http.postBuffer; defaulting to %d"
+msgstr ""
+"отрицателна стойност за „http.postBuffer“.  Ще се ползва стандартната: %d"
+
+msgid "Delegation control is not supported with cURL < 7.22.0"
+msgstr "Управлението на делегирането не се поддържа от cURL < 7.22.0"
+
+msgid "Public key pinning not supported with cURL < 7.39.0"
+msgstr "Задаването на постоянен публичен ключ не се поддържа от cURL < 7.39.0"
+
+msgid "CURLSSLOPT_NO_REVOKE not supported with cURL < 7.44.0"
+msgstr "„CURLSSLOPT_NO_REVOKE“ не се поддържа от cURL < 7.44.0"
+
+#, c-format
+msgid "Unsupported SSL backend '%s'. Supported SSL backends:"
+msgstr "Неподдържана реализация на SSL „%s“. Поддържат се:"
+
+#, c-format
+msgid "Could not set SSL backend to '%s': cURL was built without SSL backends"
+msgstr ""
+"Реализацията на SSL не може да се зададе да е „%s“: cURL е компилиран без "
+"поддръжка на SSL"
+
+#, c-format
+msgid "Could not set SSL backend to '%s': already set"
+msgstr ""
+"Реализацията на SSL не може да се зададе да е „%s“, защото вече е зададена "
+"друга"
+
+#, c-format
+msgid ""
+"unable to update url base from redirection:\n"
+"  asked for: %s\n"
+"   redirect: %s"
+msgstr ""
+"базовият адрес не може да се обнови след пренасочване:\n"
+"    ● заявен адрес: %s\n"
+"    ● пренасочване: %s"
+
+msgid "Author identity unknown\n"
+msgstr "Липсва информация за автора\n"
+
+msgid "Committer identity unknown\n"
+msgstr "Липсва информация за подалия\n"
+
+msgid ""
+"\n"
+"*** Please tell me who you are.\n"
+"\n"
+"Run\n"
+"\n"
+"  git config --global user.email \"you@example.com\"\n"
+"  git config --global user.name \"Your Name\"\n"
+"\n"
+"to set your account's default identity.\n"
+"Omit --global to set the identity only in this repository.\n"
+"\n"
+msgstr ""
+"\n"
+"●●● Въведете самоличност.\n"
+"\n"
+"Изпълнете:\n"
+"\n"
+"    git config --global user.email \"ИМЕ@example.com\"\n"
+"    git config --global user.name \"ВАШЕТО ИМЕ\"\n"
+"\n"
+"и въведете данни за себе си.\n"
+"Ако пропуснете опцията „--global“, самоличността е само за текущото "
+"хранилище.\n"
+"\n"
+
+msgid "no email was given and auto-detection is disabled"
+msgstr "липсва адрес за е-поща, а автоматичното отгатване е изключено"
+
+#, c-format
+msgid "unable to auto-detect email address (got '%s')"
+msgstr ""
+"адресът за е-поща не може да бъде отгатнат (най-доброто предположение бе "
+"„%s“)"
+
+msgid "no name was given and auto-detection is disabled"
+msgstr "липсва име, а автоматичното отгатване е изключено"
+
+#, c-format
+msgid "unable to auto-detect name (got '%s')"
+msgstr "името не може да бъде отгатнато (най-доброто предположение бе „%s“)"
+
+#, c-format
+msgid "empty ident name (for <%s>) not allowed"
+msgstr "не може да се ползва празно име като идентификатор (за <%s>)"
+
+#, c-format
+msgid "name consists only of disallowed characters: %s"
+msgstr "името съдържа само непозволени знаци: „%s“"
+
+msgid "expected 'tree:<depth>'"
+msgstr "очаква се „tree:ДЪЛБОЧИНА“"
+
+msgid "sparse:path filters support has been dropped"
+msgstr "поддръжката на филтри със „sparse:path“ е премахната"
+
+#, c-format
+msgid "'%s' for 'object:type=<type>' is not a valid object type"
+msgstr "„%s“ не е правилна стойност за вид на обект в „object:type=ВИД“"
+
+#, c-format
+msgid "invalid filter-spec '%s'"
+msgstr "неправилен филтър: „%s“"
+
+#, c-format
+msgid "must escape char in sub-filter-spec: '%c'"
+msgstr "знак за екраниране в подфилтър: „%c“"
+
+msgid "expected something after combine:"
+msgstr "добавете нещо след комбинирането:"
+
+msgid "multiple filter-specs cannot be combined"
+msgstr "не може да комбинирате множество филтри"
+
+msgid "unable to upgrade repository format to support partial clone"
+msgstr ""
+"не може да се извърши частично клониране, защото форматът на хранилището не "
+"може да се обнови"
+
+msgid "args"
+msgstr "АРГУМЕНТИ"
+
+msgid "object filtering"
+msgstr "филтриране по вид на обекта"
+
+#, c-format
+msgid "unable to access sparse blob in '%s'"
+msgstr "няма достъп до частично изтегления обект-BLOB в „%s“"
+
+#, c-format
+msgid "unable to parse sparse filter data in %s"
+msgstr ""
+"данните от филтъра за частични изтегляния в „%s“ не може да бъдат анализирани"
+
+#, c-format
+msgid "entry '%s' in tree %s has tree mode, but is not a tree"
+msgstr "обект „%s“ в дървото „%s“ е отбелязан като дърво, но не е"
+
+#, c-format
+msgid "entry '%s' in tree %s has blob mode, but is not a blob"
+msgstr "обект „%s“ в дървото „%s“ е отбелязан като BLOB, но не е"
+
+#, c-format
+msgid "unable to load root tree for commit %s"
+msgstr "кореновото дърво за подаване „%s“ не може да се зареди"
+
+#, c-format
+msgid ""
+"Unable to create '%s.lock': %s.\n"
+"\n"
+"Another git process seems to be running in this repository, e.g.\n"
+"an editor opened by 'git commit'. Please make sure all processes\n"
+"are terminated then try again. If it still fails, a git process\n"
+"may have crashed in this repository earlier:\n"
+"remove the file manually to continue."
+msgstr ""
+"Файлът-ключалка „%s.lock“ не може да бъде създаден: %s\n"
+"\n"
+"Изглежда, че и друг процес на git е пуснат в това хранилище, напр.\n"
+"редактор, стартиран с „git commit“.  Уверете се, че всички подобни\n"
+"процеси са спрени и опитайте отново.  Ако това не помогне, вероятната\n"
+"причина е, че някой процес на git в това хранилище е забил.  За да\n"
+"продължите работа, ще трябва ръчно да изтриете файла:"
+
+#, c-format
+msgid "Unable to create '%s.lock': %s"
+msgstr "Файлът-ключалка „%s.lock“ не може да бъде създаден: %s"
+
+#, c-format
+msgid "unexpected line: '%s'"
+msgstr "неочакван ред: „%s“"
+
+msgid "expected flush after ls-refs arguments"
+msgstr "след аргументите към „ls-refs“ се очаква изчистване на буферите"
+
+msgid "quoted CRLF detected"
+msgstr "цитирани знаци CRLF"
+
+#, c-format
+msgid ""
+"Your local changes to the following files would be overwritten by merge:\n"
+"  %s"
+msgstr ""
+"Сливането ще презапише локалните промѐни на тези файлове:\n"
+"    %s"
+
+#, c-format
+msgid "Failed to merge submodule %s (not checked out)"
+msgstr "Неуспешно сливане на подмодула „%s“ (не е изтеглен)"
+
+#, c-format
+msgid "Failed to merge submodule %s (commits not present)"
+msgstr "Неуспешно сливане на подмодула „%s“ (няма подавания)"
+
+#, c-format
+msgid "Failed to merge submodule %s (commits don't follow merge-base)"
+msgstr ""
+"Подмодулът „%s“ не може да бъде слят (базата за сливане не предшества "
+"подаванията)"
+
+#, c-format
+msgid "Note: Fast-forwarding submodule %s to %s"
+msgstr "Бележка: Превъртане на подмодула „%s“ към „%s“"
+
+#, c-format
+msgid "Failed to merge submodule %s"
+msgstr "Неуспешно сливане на подмодула „%s“"
+
+#, c-format
+msgid ""
+"Failed to merge submodule %s, but a possible merge resolution exists:\n"
+"%s\n"
+msgstr ""
+"Неуспешно сливане на подмодула „%s“, но е открито възможно решение:\n"
+"%s\n"
+
+#, c-format
+msgid ""
+"If this is correct simply add it to the index for example\n"
+"by using:\n"
+"\n"
+"  git update-index --cacheinfo 160000 %s \"%s\"\n"
+"\n"
+"which will accept this suggestion.\n"
+msgstr ""
+"Ако това е така, добавете го към индекса с команда като следната:\n"
+"\n"
+"    git update-index --cacheinfo 160000 %s \"%s\"\n"
+"\n"
+"Това приема предложеното.\n"
+
+#, c-format
+msgid ""
+"Failed to merge submodule %s, but multiple possible merges exist:\n"
+"%s"
+msgstr ""
+"Неуспешно сливане на подмодула „%s“, но са открити множество решения:\n"
+"%s"
+
+msgid "Failed to execute internal merge"
+msgstr "Неуспешно вътрешно сливане"
+
+#, c-format
+msgid "Unable to add %s to database"
+msgstr "„%s“ не може да се добави в базата с данни"
+
+#, c-format
+msgid "Auto-merging %s"
+msgstr "Автоматично сливане на „%s“"
+
+#, 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 ""
+"КОНФЛИКТ (косвено преименуване на директория): следният файл или директория "
+"„%s“ не позволяват косвеното преименуване на следния път/ища: %s."
+
+#, 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 ""
+"КОНФЛИКТ (косвено преименуване на директория): повече от един път "
+"съответства на „%s“.  Косвено преименуване на директория води до поставянето "
+"на тези пътища там: %s."
+
+#, c-format
+msgid ""
+"CONFLICT (directory rename split): Unclear where to rename %s to; it was "
+"renamed to multiple other directories, with no destination getting a "
+"majority of the files."
+msgstr ""
+"КОНФЛИКТ (раздвояване при преименуване на директория): Не е ясно как и къде "
+"да се преименува „%s“, защото е преместен в няколко нови директории, без "
+"никоя от тях да е по-честа цел."
+
+#, c-format
+msgid ""
+"WARNING: Avoiding applying %s -> %s rename to %s, because %s itself was "
+"renamed."
+msgstr ""
+"ПРЕДУПРЕЖДЕНИЕ: прескачане на преименуването на „%s“ на „%s“ в „%s“, защото "
+"„%s“ също е с променено име."
+
+#, c-format
+msgid ""
+"Path updated: %s added in %s inside a directory that was renamed in %s; "
+"moving it to %s."
+msgstr ""
+"Обновен път: „%s“ е добавен в „%s“ в директория, която е преименувана в "
+"„%s“.  Обектът се мести в „%s“."
+
+#, c-format
+msgid ""
+"Path updated: %s renamed to %s in %s, inside a directory that was renamed in "
+"%s; moving it to %s."
+msgstr ""
+"Обновен път: „%s“ е преименуван на „%s“ в „%s“ в директория, която е "
+"преименувана в „%s“.  Обектът се мести в „%s“."
+
+#, 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 ""
+"КОНФЛИКТ (места на файлове): „%s“ е добавен в „%s“ в директория, която е "
+"преименувана в „%s“.  Предложението е да преместите обекта в „%s“."
+
+#, 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 ""
+"КОНФЛИКТ (места на файлове): „%s“ е преименуван на „%s“ в „%s“ в директория, "
+"която е преименувана в „%s“.  Предложението е да преместите обекта в „%s“."
+
+#, c-format
+msgid "CONFLICT (rename/rename): %s renamed to %s in %s and to %s in %s."
+msgstr ""
+"КОНФЛИКТ (преименуване/преименуване): „%s“ е преименуван на „%s“ в клон „%s“ "
+"и на „%s“ в „%s“."
+
+#, 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."
+msgstr ""
+"КОНФЛИКТ (има и преименуване в промѐните): „%s“ е преименуван на „%s“, но "
+"има и промѐни в съдържанието, а и има съвпадение на пътя.  Може да се "
+"получат вложени маркери за конфликт."
+
+#, c-format
+msgid "CONFLICT (rename/delete): %s renamed to %s in %s, but deleted in %s."
+msgstr ""
+"КОНФЛИКТ (преименуване/добавяне): „%s“ е преименуван на „%s“ в клон „%s“, а "
+"е изтрит в „%s“."
+
+#, c-format
+msgid "cannot read object %s"
+msgstr "обектът „%s“ не може да се прочете"
+
+#, c-format
+msgid "object %s is not a blob"
+msgstr "обектът „%s“ не е BLOB"
+
+#, c-format
+msgid ""
+"CONFLICT (file/directory): directory in the way of %s from %s; moving it to "
+"%s instead."
+msgstr ""
+"КОНФЛИКТ (файл/директория): директория на мястото на „%s“ от „%s“, вместо "
+"това се извършва преместване в „%s“."
+
+#, c-format
+msgid ""
+"CONFLICT (distinct types): %s had different types on each side; renamed both "
+"of them so each can be recorded somewhere."
+msgstr ""
+"КОНФЛИКТ (различни видове): „%s“ е различен вид обект в двата варианта.  И "
+"двата се преименуват, за да може всичко да е отразено."
+
+#, c-format
+msgid ""
+"CONFLICT (distinct types): %s had different types on each side; renamed one "
+"of them so each can be recorded somewhere."
+msgstr ""
+"КОНФЛИКТ (различни видове): „%s“ е различен вид обект в двата варианта.  "
+"Извършва се преименуване в единия, за да може всичко да е отразено."
+
+msgid "content"
+msgstr "съдържание"
+
+msgid "add/add"
+msgstr "добавяне/добавяне"
+
+msgid "submodule"
+msgstr "ПОДМОДУЛ"
+
+#, c-format
+msgid "CONFLICT (%s): Merge conflict in %s"
+msgstr "КОНФЛИКТ (%s): Конфликт при сливане на „%s“"
+
+#, c-format
+msgid ""
+"CONFLICT (modify/delete): %s deleted in %s and modified in %s.  Version %s "
+"of %s left in tree."
+msgstr ""
+"КОНФЛИКТ (промяна/изтриване): „%s“ е изтрит в %s, а е променен в %s.  Версия "
+"%s на „%s“ е оставена в дървото."
+
+#, c-format
+msgid ""
+"Note: %s not up to date and in way of checking out conflicted version; old "
+"copy renamed to %s"
+msgstr ""
+"Бележка: „%s“ не е актуален и пречи за преминаването към версията с "
+"конфликт.  Старият вариант е преименуван на „%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.
+#.
+#, c-format
+msgid "collecting merge info failed for trees %s, %s, %s"
+msgstr "неуспешно събиране на информацията за сливането на „%s“, „%s“ и „%s“"
+
+msgid "(bad commit)\n"
+msgstr "(лошо подаване)\n"
+
+#, c-format
+msgid "add_cacheinfo failed for path '%s'; merge aborting."
+msgstr ""
+"неуспешно изпълнение на „add_cacheinfo“ за пътя „%s“.  Сливането е "
+"преустановено."
+
+#, c-format
+msgid "add_cacheinfo failed to refresh for path '%s'; merge aborting."
+msgstr ""
+"неуспешно изпълнение на „add_cacheinfo“ за обновяването на пътя „%s“.  "
+"Сливането е преустановено."
+
+#, c-format
+msgid "failed to create path '%s'%s"
+msgstr "грешка при създаването на пътя „%s“%s"
+
+#, c-format
+msgid "Removing %s to make room for subdirectory\n"
+msgstr "Изтриване на „%s“, за да се освободи място за поддиректория\n"
+
+msgid ": perhaps a D/F conflict?"
+msgstr ": възможно е да има конфликт директория/файл."
+
+#, c-format
+msgid "refusing to lose untracked file at '%s'"
+msgstr ""
+"преустановяване на действието, за да не се изтрие неследеният файл „%s“"
+
+#, c-format
+msgid "blob expected for %s '%s'"
+msgstr "обектът „%s“ (%s) се очакваше да е BLOB, а не е"
+
+#, c-format
+msgid "failed to open '%s': %s"
+msgstr "„%s“ не може да се отвори: %s"
+
+#, c-format
+msgid "failed to symlink '%s': %s"
+msgstr "неуспешно създаване на символната връзка „%s“: %s"
+
+#, c-format
+msgid "do not know what to do with %06o %s '%s'"
+msgstr ""
+"не е ясно какво да се прави с обекта „%2$s“ (%3$s) с права за достъп „%1$06o“"
+
+#, c-format
+msgid "Fast-forwarding submodule %s to the following commit:"
+msgstr "Превъртане на подмодула „%s“ до следното подаване:"
+
+#, c-format
+msgid "Fast-forwarding submodule %s"
+msgstr "Превъртане на подмодула „%s“"
+
+#, c-format
+msgid "Failed to merge submodule %s (merge following commits not found)"
+msgstr ""
+"Неуспешно сливане на подмодула „%s“ (липсва сливането, което се предшества "
+"от подаванията)"
+
+#, c-format
+msgid "Failed to merge submodule %s (not fast-forward)"
+msgstr "Неуспешно сливане на подмодула „%s“ (не е превъртане)"
+
+msgid "Found a possible merge resolution for the submodule:\n"
+msgstr ""
+"Открито е сливане, което може да решава проблема със сливането на "
+"подмодула:\n"
+
+#, c-format
+msgid "Failed to merge submodule %s (multiple merges found)"
+msgstr "Неуспешно сливане на подмодула „%s“ (открити са множество сливания)"
+
+#, c-format
+msgid "Error: Refusing to lose untracked file at %s; writing to %s instead."
+msgstr "Грешка: за да не се изтрие неследеният файл „%s“, се записва в „%s“."
+
+#, c-format
+msgid ""
+"CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s left "
+"in tree."
+msgstr ""
+"КОНФЛИКТ (%s/изтриване): „%s“ е изтрит в %s, а „%s“ в %s.  Версия %s на „%s“ "
+"е оставена в дървото."
+
+#, c-format
+msgid ""
+"CONFLICT (%s/delete): %s deleted in %s and %s to %s in %s. Version %s of %s "
+"left in tree."
+msgstr ""
+"КОНФЛИКТ (%s/изтриване): „%s“ е изтрит в %s, а „%s“ е преименуван на „%s“ в "
+"%s.  Версия %s на „%s“ е оставена в дървото."
+
+#, c-format
+msgid ""
+"CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s left "
+"in tree at %s."
+msgstr ""
+"КОНФЛИКТ (%s/изтриване): „%s“ е изтрит в %s, а „%s“ в %s.  Версия %s на „%s“ "
+"е оставена в дървото: %s."
+
+#, 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 ""
+"КОНФЛИКТ (%s/изтриване): „%s“ е изтрит в %s, а „%s“ е преименуван на „%s“ в "
+"%s.  Версия %s на „%s“ е оставена в дървото: %s."
+
+msgid "rename"
+msgstr "преименуване"
+
+msgid "renamed"
+msgstr "преименуван"
+
+#, c-format
+msgid "Refusing to lose dirty file at %s"
+msgstr "Преустановяване на действието, за да не се изгуби промененият „%s“"
+
+#, c-format
+msgid "Refusing to lose untracked file at %s, even though it's in the way."
+msgstr ""
+"Отказ да се загуби неследеният файл „%s“, защото е на място, където пречи."
+
+#, c-format
+msgid "CONFLICT (rename/add): Rename %s->%s in %s.  Added %s in %s"
+msgstr ""
+"КОНФЛИКТ (преименуване/добавяне): „%s“ е преименуван на „%s“ в клон „%s“, а "
+"„%s“ е добавен в „%s“"
+
+#, c-format
+msgid "%s is a directory in %s adding as %s instead"
+msgstr "„%s“ е директория в „%s“, затова се добавя като „%s“"
+
+#, c-format
+msgid "Refusing to lose untracked file at %s; adding as %s instead"
+msgstr ""
+"Преустановяване на действието, за да не се изгуби неследеният файл „%s“.  "
+"Вместо него се добавя „%s“"
+
+#, c-format
+msgid ""
+"CONFLICT (rename/rename): Rename \"%s\"->\"%s\" in branch \"%s\" rename \"%s"
+"\"->\"%s\" in \"%s\"%s"
+msgstr ""
+"КОНФЛИКТ (преименуване/преименуване): „%s“ е преименуван на „%s“ в клон "
+"„%s“, а „%s“ е преименуван на „%s“ в „%s“/%s."
+
+msgid " (left unresolved)"
+msgstr " (некоригиран конфликт)"
+
+#, c-format
+msgid "CONFLICT (rename/rename): Rename %s->%s in %s. Rename %s->%s in %s"
+msgstr ""
+"КОНФЛИКТ (преименуване/преименуване): „%s“ е преименуван на „%s“ в клон "
+"„%s“, а „%s“ е преименуван на „%s“ в „%s“"
+
+#, c-format
+msgid ""
+"CONFLICT (directory rename split): Unclear where to place %s because "
+"directory %s was renamed to multiple other directories, with no destination "
+"getting a majority of the files."
+msgstr ""
+"КОНФЛИКТ (раздвояване при преименуване на директория): Не е ясно къде да се "
+"постави „%s“, защото няколко нови директории поделят съдържанието на "
+"директория „%s“, като никоя не съдържа мнозинство от файловете ѝ."
+
+#, c-format
+msgid ""
+"CONFLICT (rename/rename): Rename directory %s->%s in %s. Rename directory %s-"
+">%s in %s"
+msgstr ""
+"КОНФЛИКТ (преименуване/преименуване): „%s“ е преименуван на „%s“ в клон "
+"„%s“, а „%s“ е преименуван на „%s“ в „%s“"
+
+msgid "modify"
+msgstr "промяна"
+
+msgid "modified"
+msgstr "променен"
+
+#, c-format
+msgid "Skipped %s (merged same as existing)"
+msgstr "Прескачане на „%s“ (слетият резултат е идентичен със сегашния)"
+
+#, c-format
+msgid "Adding as %s instead"
+msgstr "Добавяне като „%s“"
+
+#, c-format
+msgid "Removing %s"
+msgstr "Изтриване на „%s“"
+
+msgid "file/directory"
+msgstr "файл/директория"
+
+msgid "directory/file"
+msgstr "директория/файл"
+
+#, c-format
+msgid "CONFLICT (%s): There is a directory with name %s in %s. Adding %s as %s"
+msgstr ""
+"КОНФЛИКТ (%s): Съществува директория на име „%s“ в „%s“.  Добавяне на „%s“ "
+"като „%s“"
+
+#, c-format
+msgid "Adding %s"
+msgstr "Добавяне на „%s“"
+
+#, c-format
+msgid "CONFLICT (add/add): Merge conflict in %s"
+msgstr "КОНФЛИКТ (добавяне/добавяне): Конфликт при сливане на „%s“"
+
+#, c-format
+msgid "merging of trees %s and %s failed"
+msgstr "неуспешно сливане на дърветата „%s“ и „%s“"
+
+msgid "Merging:"
+msgstr "Сливане:"
+
+#, c-format
+msgid "found %u common ancestor:"
+msgid_plural "found %u common ancestors:"
+msgstr[0] "открит е %u общ предшественик:"
+msgstr[1] "открити са %u общи предшественици:"
+
+msgid "merge returned no commit"
+msgstr "сливането не върна подаване"
+
+#, c-format
+msgid "Could not parse object '%s'"
+msgstr "Неуспешен анализ на обекта „%s“"
+
+msgid "failed to read the cache"
+msgstr "кешът не може да бъде прочетен"
+
+msgid "multi-pack-index OID fanout is of the wrong size"
+msgstr "неправилен размер на откъс (OID fanout) на индекса за множество пакети"
+
+#, c-format
+msgid "multi-pack-index file %s is too small"
+msgstr "файлът с индекса за множество пакети „%s“ е твърде малък"
+
+#, c-format
+msgid "multi-pack-index signature 0x%08x does not match signature 0x%08x"
+msgstr "отпечатъкът на индекса за множество пакети 0x%08x не съвпада с 0x%08x"
+
+#, c-format
+msgid "multi-pack-index version %d not recognized"
+msgstr "непозната версия на индекс за множество пакети — %d"
+
+#, c-format
+msgid "multi-pack-index hash version %u does not match version %u"
+msgstr ""
+"версията на контролната сума на индекса за множество пакети %u не съвпада с "
+"%u"
+
+msgid "multi-pack-index missing required pack-name chunk"
+msgstr "липсва откъс (pack-name) от индекс за множество пакети"
+
+msgid "multi-pack-index missing required OID fanout chunk"
+msgstr "липсва откъс (OID fanout) от индекс за множество пакети"
+
+msgid "multi-pack-index missing required OID lookup chunk"
+msgstr "липсва откъс (OID lookup) от индекс за множество пакети"
+
+msgid "multi-pack-index missing required object offsets chunk"
+msgstr "липсва откъс за отместванията на обекти от индекс за множество пакети"
+
+#, c-format
+msgid "multi-pack-index pack names out of order: '%s' before '%s'"
+msgstr ""
+"неправилна подредба на имената в индекс за множество пакети: „%s“ се появи "
+"преди „%s“"
+
+#, c-format
+msgid "bad pack-int-id: %u (%u total packs)"
+msgstr ""
+"неправилен идентификатор на пакет (pack-int-id): %u (от общо %u пакети)"
+
+msgid "multi-pack-index stores a 64-bit offset, but off_t is too small"
+msgstr ""
+"индексът за множество пакети съдържа 64-битови отмествания, но размерът на "
+"„off_t“ е недостатъчен"
+
+#, c-format
+msgid "failed to add packfile '%s'"
+msgstr "пакетният файл „%s“ не може да бъде добавен"
+
+#, c-format
+msgid "failed to open pack-index '%s'"
+msgstr "индексът за пакети „%s“ не може да бъде отворен"
+
+#, c-format
+msgid "failed to locate object %d in packfile"
+msgstr "обект %d в пакетния файл липсва"
+
+msgid "cannot store reverse index file"
+msgstr "файлът за индекса не може да бъде съхранен"
+
+#, c-format
+msgid "could not parse line: %s"
+msgstr "редът не може да се анализира: „%s“"
+
+#, c-format
+msgid "malformed line: %s"
+msgstr "неправилен ред: „%s“."
+
+msgid "ignoring existing multi-pack-index; checksum mismatch"
+msgstr ""
+"индексът за множество пакети се прескача, защото контролната сума не съвпада"
+
+msgid "could not load pack"
+msgstr "пакетът не може да се зареди"
+
+#, c-format
+msgid "could not open index for %s"
+msgstr "индексът за „%s“ не може да се отвори"
+
+msgid "Adding packfiles to multi-pack-index"
+msgstr "Добавяне на пакетни файлове към индекс за множество пакети"
+
+#, c-format
+msgid "unknown preferred pack: '%s'"
+msgstr "непознат предпочитан пакет: %s"
+
+#, c-format
+msgid "cannot select preferred pack %s with no objects"
+msgstr ""
+"не може да изберете „%s“, който не съдържа обекти, за предпочитан пакет"
+
+#, c-format
+msgid "did not see pack-file %s to drop"
+msgstr "пакетният файл за триене „%s“ не може да се открие"
+
+#, c-format
+msgid "preferred pack '%s' is expired"
+msgstr "предпочитаният пакет „%s“ е остарял"
+
+msgid "no pack files to index."
+msgstr "няма пакетни файлове за индексиране"
+
+msgid "refusing to write multi-pack .bitmap without any objects"
+msgstr ""
+"многопакетната битова маска без никакви обекти не може да бъде запазена"
+
+msgid "could not write multi-pack bitmap"
+msgstr "многопакетната битова маска не може да бъде запазена"
+
+msgid "could not write multi-pack-index"
+msgstr "индексът за множество пакети не може да бъде запазен"
+
+#, c-format
+msgid "failed to clear multi-pack-index at %s"
+msgstr "индексът за множество пакети не може да бъде изчистен при „%s“"
+
+msgid "multi-pack-index file exists, but failed to parse"
+msgstr "файлът с индекса за множество пакети, но не може да бъде анализиран"
+
+msgid "incorrect checksum"
+msgstr "неправилна контролна сума"
+
+msgid "Looking for referenced packfiles"
+msgstr "Търсене на указаните пакетни файлове"
+
+#, c-format
+msgid ""
+"oid fanout out of order: fanout[%d] = %<PRIx32> > %<PRIx32> = fanout[%d]"
+msgstr ""
+"неправилна подредба на откъси (OID fanout): fanout[%d] = %<PRIx32> > "
+"%<PRIx32> = fanout[%d]"
+
+msgid "the midx contains no oid"
+msgstr "във файла с индекса за множество пакети няма идентификатори на обекти"
+
+msgid "Verifying OID order in multi-pack-index"
+msgstr ""
+"Проверка на подредбата на идентификатори на обекти във файл с индекс към "
+"множество пакетни файлове"
+
+#, c-format
+msgid "oid lookup out of order: oid[%d] = %s >= %s = oid[%d]"
+msgstr ""
+"неправилна подредба на откъси (OID lookup): oid[%d] = %s >= %s = oid[%d]"
+
+msgid "Sorting objects by packfile"
+msgstr "Подредба на обектите по пакетни файлове"
+
+msgid "Verifying object offsets"
+msgstr "Проверка на отместването на обекти"
+
+#, c-format
+msgid "failed to load pack entry for oid[%d] = %s"
+msgstr "записът в пакета за обекта oid[%d] = %s не може да бъде зареден"
+
+#, c-format
+msgid "failed to load pack-index for packfile %s"
+msgstr "индексът на пакета „%s“ не може да бъде зареден"
+
+#, c-format
+msgid "incorrect object offset for oid[%d] = %s: %<PRIx64> != %<PRIx64>"
+msgstr "неправилно отместване на обект за oid[%d] = %s: %<PRIx64> != %<PRIx64>"
+
+msgid "Counting referenced objects"
+msgstr "Преброяване на свързаните обекти"
+
+msgid "Finding and deleting unreferenced packfiles"
+msgstr "Търсене и изтриване на несвързаните пакетни файлове"
+
+msgid "could not start pack-objects"
+msgstr "командата „pack-objects“ не може да бъде стартирана"
+
+msgid "could not finish pack-objects"
+msgstr "командата „pack-objects“ не може да бъде завършена"
+
+#, c-format
+msgid "unable to create lazy_dir thread: %s"
+msgstr "не може да се създаде нишка за директории (lazy_dir): %s"
+
+#, c-format
+msgid "unable to create lazy_name thread: %s"
+msgstr "не може да се създаде нишка за имена (lazy_name): %s"
+
+#, c-format
+msgid "unable to join lazy_name thread: %s"
+msgstr "не може да се изчака нишка за имена (lazy_name): %s"
+
+#, 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."
+msgstr ""
+"Не сте завършили предишното сливане на бележки.  (Указателят „%s“ "
+"съществува).\n"
+"За да завършите предишното сливане, изпълнете:\n"
+"\n"
+"    git notes merge --commit\n"
+"\n"
+"За да отмените предишното сливане, изпълнете:\n"
+"\n"
+"    git notes merge --abort"
+
+#, c-format
+msgid "You have not concluded your notes merge (%s exists)."
+msgstr ""
+"Не сте завършили сливането на бележките.  (Указателят „%s“ съществува)."
+
+msgid "Cannot commit uninitialized/unreferenced notes tree"
+msgstr ""
+"Неинициализирано или нереферирано дърво за бележки не може да бъде подадено"
+
+#, c-format
+msgid "Bad notes.rewriteMode value: '%s'"
+msgstr "Неправилна стойност за „notes.rewriteMode“: „%s“"
+
+#, c-format
+msgid "Refusing to rewrite notes in %s (outside of refs/notes/)"
+msgstr ""
+"Бележките в „%s“ няма да бъдат презаписани, защото са извън „refs/notes/“."
+
+#. TRANSLATORS: The first %s is the name of
+#. the environment variable, the second %s is
+#. its value.
+#.
+#, c-format
+msgid "Bad %s value: '%s'"
+msgstr "Зададена е лоша стойност на променливата „%s“: „%s“"
+
+#, c-format
+msgid "object directory %s does not exist; check .git/objects/info/alternates"
+msgstr ""
+"директорията за обекти „%s“ не съществува, проверете „.git/objects/info/"
+"alternates“"
+
+#, c-format
+msgid "unable to normalize alternate object path: %s"
+msgstr "алтернативният път към обекти не може да бъде нормализиран: „%s“"
+
+#, c-format
+msgid "%s: ignoring alternate object stores, nesting too deep"
+msgstr ""
+"%s: алтернативните хранилища за обекти се пренебрегват поради прекалено "
+"дълбоко влагане"
+
+#, c-format
+msgid "unable to normalize object directory: %s"
+msgstr "директорията за обекти „%s“ не може да бъде нормализирана"
+
+msgid "unable to fdopen alternates lockfile"
+msgstr "заключващият файл за алтернативите не може да се отвори с „fdopen“"
+
+msgid "unable to read alternates file"
+msgstr "файлът с алтернативите не може да бъде прочетен"
+
+msgid "unable to move new alternates file into place"
+msgstr "новият файл с алтернативите не може да бъде преместен на мястото му"
+
+#, c-format
+msgid "path '%s' does not exist"
+msgstr "пътят „%s“ не съществува."
+
+#, c-format
+msgid "reference repository '%s' as a linked checkout is not supported yet."
+msgstr "все още не се поддържа еталонно хранилище „%s“ като свързано."
+
+#, c-format
+msgid "reference repository '%s' is not a local repository."
+msgstr "еталонното хранилище „%s“ не е локално"
+
+#, c-format
+msgid "reference repository '%s' is shallow"
+msgstr "еталонното хранилище „%s“ е плитко"
+
+#, c-format
+msgid "reference repository '%s' is grafted"
+msgstr "еталонното хранилище „%s“ е с присаждане"
+
+#, c-format
+msgid "could not find object directory matching %s"
+msgstr "директорията с обекти, която отговаря на „%s“, не може да бъде открита"
+
+#, c-format
+msgid "invalid line while parsing alternate refs: %s"
+msgstr "неправилен ред при анализа на алтернативните указатели: „%s“"
+
+#, c-format
+msgid "attempting to mmap %<PRIuMAX> over limit %<PRIuMAX>"
+msgstr ""
+"неуспешен опит за „mmap“ %<PRIuMAX>, което е над позволеното %<PRIuMAX>"
+
+#, c-format
+msgid "mmap failed%s"
+msgstr "неуспешно изпълнение на „mmap“%s"
+
+#, c-format
+msgid "object file %s is empty"
+msgstr "файлът с обектите „%s“ е празен"
+
+#, c-format
+msgid "corrupt loose object '%s'"
+msgstr "непакетираният обект „%s“ е повреден"
+
+#, c-format
+msgid "garbage at end of loose object '%s'"
+msgstr "грешни данни в края на непакетирания обект „%s“"
+
+#, c-format
+msgid "unable to parse %s header"
+msgstr "заглавната част на „%s“ не може да бъде анализирана"
+
+msgid "invalid object type"
+msgstr "неправилен вид обект"
+
+#, c-format
+msgid "unable to unpack %s header"
+msgstr "заглавната част на „%s“ не може да бъде разпакетирана"
+
+#, c-format
+msgid "header for %s too long, exceeds %d bytes"
+msgstr "заглавната част на „%s“ е прекалено дълга — надхвърля %d байта"
+
+#, c-format
+msgid "failed to read object %s"
+msgstr "обектът „%s“ не може да бъде прочетен"
+
+#, c-format
+msgid "replacement %s not found for %s"
+msgstr "заместителят „%s“ на „%s“ не може да бъде открит"
+
+#, c-format
+msgid "loose object %s (stored in %s) is corrupt"
+msgstr "непакетираният обект „%s“ (в „%s“) е повреден"
+
+#, c-format
+msgid "packed object %s (stored in %s) is corrupt"
+msgstr "пакетираният обект „%s“ (в „%s“) е повреден"
+
+#, c-format
+msgid "unable to write file %s"
+msgstr "файлът „%s“ не може да бъде записан"
+
+#, c-format
+msgid "unable to set permission to '%s'"
+msgstr "правата за достъп до „%s“ не може да бъдат зададени"
+
+msgid "file write error"
+msgstr "грешка при запис на файл"
+
+msgid "error when closing loose object file"
+msgstr "грешка при затварянето на файла с непакетиран обект"
+
+#, c-format
+msgid "insufficient permission for adding an object to repository database %s"
+msgstr ""
+"няма права за добавяне на обект към базата от данни на хранилището „%s“"
+
+msgid "unable to create temporary file"
+msgstr "не може да бъде създаден временен файл"
+
+msgid "unable to write loose object file"
+msgstr "грешка при записа на файла с непакетиран обект"
+
+#, c-format
+msgid "unable to deflate new object %s (%d)"
+msgstr "новият обект „%s“ не може да се компресира с „deflate“: %d"
+
+#, c-format
+msgid "deflateEnd on object %s failed (%d)"
+msgstr "неуспешно приключване на „deflate“ върху „%s“: %d"
+
+#, c-format
+msgid "confused by unstable object source data for %s"
+msgstr "грешка поради нестабилния източник данни за обектите „%s“"
+
+#, c-format
+msgid "cannot read object for %s"
+msgstr "обектът за „%s“ не може да се прочете"
+
+msgid "corrupt commit"
+msgstr "повредено подаване"
+
+msgid "corrupt tag"
+msgstr "повреден етикет"
+
+#, c-format
+msgid "read error while indexing %s"
+msgstr "грешка при четене по време на индексиране на „%s“"
+
+#, c-format
+msgid "short read while indexing %s"
+msgstr "непълно прочитане по време на индексиране на „%s“"
+
+#, c-format
+msgid "%s: failed to insert into database"
+msgstr "„%s“ не може да се вмъкне в базата от данни"
+
+#, c-format
+msgid "%s: unsupported file type"
+msgstr "неподдържан вид файл: „%s“"
+
+#, c-format
+msgid "%s is not a valid '%s' object"
+msgstr "„%s“ е неправилен обект от вид „%s“"
+
+#, c-format
+msgid "unable to open %s"
+msgstr "обектът „%s“ не може да бъде отворен"
+
+#, c-format
+msgid "hash mismatch for %s (expected %s)"
+msgstr "неправилна контролна сума за „%s“ (трябва да е %s)"
+
+#, c-format
+msgid "unable to mmap %s"
+msgstr "неуспешно изпълнение на „mmap“ върху „%s“"
+
+#, c-format
+msgid "unable to unpack header of %s"
+msgstr "заглавната част на „%s“ не може да бъде разпакетирана"
+
+#, c-format
+msgid "unable to parse header of %s"
+msgstr "заглавната част на „%s“ не може да бъде анализирана"
+
+#, c-format
+msgid "unable to unpack contents of %s"
+msgstr "съдържанието на „%s“ не може да бъде разпакетирано"
+
+#. TRANSLATORS: This is a line of ambiguous object
+#. output shown when we cannot look up or parse the
+#. object in question. E.g. "deadbeef [bad object]".
+#.
+#, c-format
+msgid "%s [bad object]"
+msgstr "„%s“ [неправилен обект]"
+
+#. TRANSLATORS: This is a line of ambiguous commit
+#. object output. E.g.:
+#. *
+#.    "deadbeef commit 2021-01-01 - Some Commit Message"
+#.
+#, c-format
+msgid "%s commit %s - %s"
+msgstr "„%s“ подаване %s — %s"
+
+#. TRANSLATORS: This is a line of ambiguous
+#. tag object output. E.g.:
+#. *
+#.    "deadbeef tag 2022-01-01 - Some Tag Message"
+#. *
+#. The second argument is the YYYY-MM-DD found
+#. in the tag.
+#. *
+#. The third argument is the "tag" string
+#. from object.c.
+#.
+#, c-format
+msgid "%s tag %s - %s"
+msgstr "„%s“: етикет %s — %s"
+
+#. TRANSLATORS: This is a line of ambiguous
+#. tag object output where we couldn't parse
+#. the tag itself. E.g.:
+#. *
+#.    "deadbeef [bad tag, could not parse it]"
+#.
+#, c-format
+msgid "%s [bad tag, could not parse it]"
+msgstr "„%s“ [неправилен етикет — не може да се анализира]"
+
+#. TRANSLATORS: This is a line of ambiguous <type>
+#. object output. E.g. "deadbeef tree".
+#.
+#, c-format
+msgid "%s tree"
+msgstr "„%s“ (дърво)"
+
+#. TRANSLATORS: This is a line of ambiguous <type>
+#. object output. E.g. "deadbeef blob".
+#.
+#, c-format
+msgid "%s blob"
+msgstr "„%s“ (BLOB)"
+
+#, c-format
+msgid "short object ID %s is ambiguous"
+msgstr "късият идентификатор на обект „%s“ не е еднозначен"
+
+#. TRANSLATORS: The argument is the list of ambiguous
+#. objects composed in show_ambiguous_object(). See
+#. its "TRANSLATORS" comments for details.
+#.
+#, c-format
+msgid ""
+"The candidates are:\n"
+"%s"
+msgstr ""
+"Възможностите са:\n"
+"%s"
+
+msgid ""
+"Git normally never creates a ref that ends with 40 hex characters\n"
+"because it will be ignored when you just specify 40-hex. These refs\n"
+"may be created by mistake. For example,\n"
+"\n"
+"  git switch -c $br $(git rev-parse ...)\n"
+"\n"
+"where \"$br\" is somehow empty and a 40-hex ref is created. Please\n"
+"examine these refs and maybe delete them. Turn this message off by\n"
+"running \"git config advice.objectNameWarning false\""
+msgstr ""
+"При нормална работа Git никога не създава указатели, които завършват\n"
+"с 40 шестнадесетични знака, защото стандартно те ще бъдат прескачани.\n"
+"Възможно е такива указатели да са създадени случайно.  Например:\n"
+"\n"
+"    git switch -c $br $(git rev-parse …)\n"
+"\n"
+"където стойността на променливата на средата „$br“ е празна, при което\n"
+"се създава подобен указател.  Прегледайте тези указатели и ги изтрийте.\n"
+"За да изключите това съобщение, изпълнете:\n"
+"\n"
+"    git config advice.objectNameWarning false"
+
+#, c-format
+msgid "log for '%.*s' only goes back to %s"
+msgstr "журналът за „%.*s“ стига само до „%s“"
+
+#, c-format
+msgid "log for '%.*s' only has %d entries"
+msgstr "журналът за „%.*s“ съдържа само %d записа"
+
+#, c-format
+msgid "path '%s' exists on disk, but not in '%.*s'"
+msgstr "пътят „%s“ съществува на диска, но не и в „%.*s“"
+
+#, c-format
+msgid ""
+"path '%s' exists, but not '%s'\n"
+"hint: Did you mean '%.*s:%s' aka '%.*s:./%s'?"
+msgstr ""
+"пътят „%s“ съществува на диска, но не е в „%s“\n"
+"Пробвайте с „%.*s:%s“, което е същото като „%.*s:./%s“."
+
+#, c-format
+msgid "path '%s' does not exist in '%.*s'"
+msgstr "пътят „%s“ не съществува в „%.*s“"
+
+#, c-format
+msgid ""
+"path '%s' is in the index, but not at stage %d\n"
+"hint: Did you mean ':%d:%s'?"
+msgstr ""
+"пътят „%s“ е в индекса, но не версия %d\n"
+"Пробвайте с „%d:%s“."
+
+#, c-format
+msgid ""
+"path '%s' is in the index, but not '%s'\n"
+"hint: Did you mean ':%d:%s' aka ':%d:./%s'?"
+msgstr ""
+"пътят „%s“ е в индекса, но не в „%s“\n"
+"Пробвайте с „%d:%s“, което е същото като „%d:./%s“."
+
+#, c-format
+msgid "path '%s' exists on disk, but not in the index"
+msgstr "пътят „%s“ съществува на диска, но не е в индекса"
+
+#, c-format
+msgid "path '%s' does not exist (neither on disk nor in the index)"
+msgstr "пътят „%s“ не съществува нито на диска, нито в индекса"
+
+msgid "relative path syntax can't be used outside working tree"
+msgstr "относителен път не може да се ползва извън работното дърво"
+
+#, c-format
+msgid "<object>:<path> required, only <object> '%s' given"
+msgstr "необходими са и двете — ОБЕКТ:ПЪТ, а е даден само ОБЕКТът „%s“"
+
+#, c-format
+msgid "invalid object name '%.*s'."
+msgstr "неправилно име на обект: „%.*s“"
+
+#, c-format
+msgid "invalid object type \"%s\""
+msgstr "неправилен вид обект: „%s“"
+
+#, c-format
+msgid "object %s is a %s, not a %s"
+msgstr "обектът „%s“ е %s, а не %s"
+
+#, c-format
+msgid "object %s has unknown type id %d"
+msgstr "обектът „%s“ е непознат вид: %d"
+
+#, c-format
+msgid "unable to parse object: %s"
+msgstr "обектът „%s“ не може да бъде анализиран"
+
+#, c-format
+msgid "hash mismatch %s"
+msgstr "разлика в контролната сума: „%s“"
+
+msgid "multi-pack bitmap is missing required reverse index"
+msgstr "задължителният обратен индекс липсва в многопакетната битова маска"
+
+#, c-format
+msgid "could not open pack %s"
+msgstr "пакетът „%s“ не може да се отвори"
+
+#, c-format
+msgid "preferred pack (%s) is invalid"
+msgstr "предпочитаният пакет „%s“ е неправилен"
+
+#, c-format
+msgid "could not find %s in pack %s at offset %<PRIuMAX>"
+msgstr "„%s“ липсва в пакет „%s“ при отместване %<PRIuMAX>"
+
+#, c-format
+msgid "mtimes file %s is too small"
+msgstr "файлът с времето на промяна (mtime) „%s“ е твърде малък"
+
+#, c-format
+msgid "mtimes file %s has unknown signature"
+msgstr "файлът с времето на промяна „%s“ е с непознат подпис"
+
+#, c-format
+msgid "mtimes file %s has unsupported version %<PRIu32>"
+msgstr ""
+"версия %2$<PRIu32> на файла с времето на промяна (mtime) „%1$s“ не се "
+"поддържа"
+
+#, c-format
+msgid "mtimes file %s has unsupported hash id %<PRIu32>"
+msgstr ""
+"файлът с времето на промяна (mtime) „%s“ е с неподдържан идентификатор на "
+"контролна сума %<PRIu32>"
+
+#, c-format
+msgid "mtimes file %s is corrupt"
+msgstr "файлът с времето на промяна (mtime) „%s“ е повреден"
+
+#, c-format
+msgid "reverse-index file %s is too small"
+msgstr "файлът с обратния индекс „%s“ е твърде малък"
+
+#, c-format
+msgid "reverse-index file %s is corrupt"
+msgstr "файлът с обратния индекс „%s“ е повреден"
+
+#, c-format
+msgid "reverse-index file %s has unknown signature"
+msgstr "непознат подпис за файла на обратния индекс „%s“"
+
+#, c-format
+msgid "reverse-index file %s has unsupported version %<PRIu32>"
+msgstr "версия %2$<PRIu32> на файла с обратен индекс „%1$s“ не се поддържа"
+
+#, c-format
+msgid "reverse-index file %s has unsupported hash id %<PRIu32>"
+msgstr ""
+"идентификатор на контролна сума %2$<PRIu32> на файла с обратен индекс „%1$s“ "
+"не се поддържа"
+
+msgid "cannot both write and verify reverse index"
+msgstr "обратният индекс не може едновременно да се записва и да се проверява"
+
+#, c-format
+msgid "could not stat: %s"
+msgstr "не може да се получи информация чрез „stat“ за „%s“"
+
+#, c-format
+msgid "failed to make %s readable"
+msgstr "не може да се дадат права за четене на „%s“"
+
+#, c-format
+msgid "could not write '%s' promisor file"
+msgstr "гарантиращият файл „%s“ не може да се запише"
+
+msgid "offset before end of packfile (broken .idx?)"
+msgstr ""
+"отместване преди края на пакетния файл (възможно е индексът да е повреден)"
+
+#, c-format
+msgid "packfile %s cannot be mapped%s"
+msgstr "не може да се изпълни „mmap“ върху пакетния файл „%s“%s"
+
+#, c-format
+msgid "offset before start of pack index for %s (corrupt index?)"
+msgstr ""
+"отместване преди началото на индекса на пакетния файл „%s“ (възможно е "
+"индексът да е повреден)"
+
+#, c-format
+msgid "offset beyond end of pack index for %s (truncated index?)"
+msgstr ""
+"отместване преди края на индекса на пакетния файл „%s“ (възможно е индексът "
+"да е отрязан)"
+
+#, c-format
+msgid "malformed expiration date '%s'"
+msgstr "неправилна дата на срок: „%s“"
+
+#, c-format
+msgid "option `%s' expects \"always\", \"auto\", or \"never\""
+msgstr ""
+"опцията „%s“ изисква някоя от стойностите: „always“ (винаги), "
+"„auto“ (автоматично) или „never“ (никога)"
+
+#, c-format
+msgid "malformed object name '%s'"
+msgstr "неправилно име на обект „%s“"
+
+#, c-format
+msgid "option `%s' expects \"%s\" or \"%s\""
+msgstr "опцията „%s“ изисква някоя от стойностите: „%s“ или „%s“"
+
+#, c-format
+msgid "%s requires a value"
+msgstr "опцията „%s“ изисква аргумент"
+
+#, c-format
+msgid "%s is incompatible with %s"
+msgstr "опциите „%s“ и „%s“ са несъвместими"
+
+#, c-format
+msgid "%s : incompatible with something else"
+msgstr "опцията „%s“ е несъвместима с нещо"
+
+#, c-format
+msgid "%s takes no value"
+msgstr "опцията „%s“ не приема аргументи"
+
+#, c-format
+msgid "%s isn't available"
+msgstr "опцията „%s“ не е налична"
+
+#, c-format
+msgid "%s expects a non-negative integer value with an optional k/m/g suffix"
+msgstr ""
+"„%s“ очаква неотрицателно цяло число, евентуално със суфикс „k“/„m“/„g“"
+
+#, c-format
+msgid "ambiguous option: %s (could be --%s%s or --%s%s)"
+msgstr "нееднозначна опция: „%s“ (може да е „--%s%s“ или „--%s%s“)"
+
+#, c-format
+msgid "did you mean `--%s` (with two dashes)?"
+msgstr "„--%s“ (с 2 тирета) ли имахте предвид?"
+
+#, c-format
+msgid "alias of --%s"
+msgstr "псевдоним на „--%s“"
+
+#, c-format
+msgid "unknown option `%s'"
+msgstr "непозната опция: „%s“"
+
+#, c-format
+msgid "unknown switch `%c'"
+msgstr "непознат флаг „%c“"
+
+#, c-format
+msgid "unknown non-ascii option in string: `%s'"
+msgstr "непозната стойност извън „ascii“ в низа: „%s“"
+
+msgid "..."
+msgstr "…"
+
+#, c-format
+msgid "usage: %s"
+msgstr "употреба: %s"
+
+#. TRANSLATORS: the colon here should align with the
+#. one in "usage: %s" translation.
+#.
+#, 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.
+#.
+#, c-format
+msgid "%*s%s"
+msgstr "%*s%s"
+
+#, c-format
+msgid "    %s"
+msgstr "    %s"
+
+msgid "-NUM"
+msgstr "-ЧИСЛО"
+
+msgid "expiry-date"
+msgstr "период на валидност/запазване"
+
+msgid "no-op (backward compatibility)"
+msgstr "нулева операция (за съвместимост с предишни версии)"
+
+msgid "be more verbose"
+msgstr "повече подробности"
+
+msgid "be more quiet"
+msgstr "по-малко подробности"
+
+msgid "use <n> digits to display object names"
+msgstr "да се показват такъв БРОЙ цифри от имената на обектите"
+
+msgid "how to strip spaces and #comments from message"
+msgstr "кои празни знаци и #коментари да се махат от съобщенията"
+
+msgid "read pathspec from file"
+msgstr "изчитане на пътищата от ФАЙЛ"
+
+msgid ""
+"with --pathspec-from-file, pathspec elements are separated with NUL character"
+msgstr ""
+"при ползването на „--pathspec-from-file“, пътищата са разделени с нулевия "
+"знак „NUL“"
+
+#, c-format
+msgid "Could not make %s writable by group"
+msgstr "Не може да се дадат права за запис в директорията „%s“ на групата"
+
+msgid "Escape character '\\' not allowed as last character in attr value"
+msgstr ""
+"Екраниращият знак „\\“не може да е последен знак в стойността на атрибут"
+
+msgid "Only one 'attr:' specification is allowed."
+msgstr "Позволено е само едно указване на „attr:“."
+
+msgid "attr spec must not be empty"
+msgstr "„attr:“ трябва да указва стойност"
+
+#, c-format
+msgid "invalid attribute name %s"
+msgstr "неправилно име на атрибут: „%s“"
+
+msgid "global 'glob' and 'noglob' pathspec settings are incompatible"
+msgstr "глобалните настройки за пътища „glob“ и „noglob“ са несъвместими"
+
+msgid ""
+"global 'literal' pathspec setting is incompatible with all other global "
+"pathspec settings"
+msgstr ""
+"глобалната настройка за дословни пътища „literal“ е несъвместима с всички "
+"други глобални настройки за пътища"
+
+msgid "invalid parameter for pathspec magic 'prefix'"
+msgstr "неправилен параметър за опцията за магически пътища „prefix“"
+
+#, c-format
+msgid "Invalid pathspec magic '%.*s' in '%s'"
+msgstr "Неправилна стойност за опцията за магически пътища „%.*s“ в „%s“"
+
+#, c-format
+msgid "Missing ')' at the end of pathspec magic in '%s'"
+msgstr "Знакът „)“ липсва в опцията за магически пътища в „%s“"
+
+#, c-format
+msgid "Unimplemented pathspec magic '%c' in '%s'"
+msgstr "Магическите пътища „%c“ са без реализация за „%s“"
+
+#, c-format
+msgid "%s: 'literal' and 'glob' are incompatible"
+msgstr "%s: опциите „literal“ и „glob“ са несъвместими"
+
+#, c-format
+msgid "%s: '%s' is outside repository at '%s'"
+msgstr "%s: „%s“ е извън хранилището при „%s“"
+
+#, c-format
+msgid "'%s' (mnemonic: '%c')"
+msgstr "„%s“ (клавиш: „%c“)"
+
+#, c-format
+msgid "%s: pathspec magic not supported by this command: %s"
+msgstr "%s: магическите пътища не се поддържат от командата „%s“"
+
+#, c-format
+msgid "pathspec '%s' is beyond a symbolic link"
+msgstr "пътят „%s“ е след символна връзка"
+
+#, c-format
+msgid "line is badly quoted: %s"
+msgstr "неправилно цитиран ред: %s"
+
+msgid "unable to write flush packet"
+msgstr "пакетът за изчистване на буферите не може да се запише"
+
+msgid "unable to write delim packet"
+msgstr "разделящият пакет не може да се запише"
+
+msgid "unable to write response end packet"
+msgstr "пакетът за край на отговора не може да се запише"
+
+msgid "flush packet write failed"
+msgstr "неуспешно изчистване на буферите при запис на пакет"
+
+msgid "protocol error: impossibly long line"
+msgstr "протоколна грешка: прекалено дълъг ред"
+
+msgid "packet write with format failed"
+msgstr "неуспешен запис на пакет с формат"
+
+msgid "packet write failed - data exceeds max packet size"
+msgstr ""
+"неуспешен запис на пакетен файл — данните надвишават максималният размер на "
+"пакет"
+
+#, c-format
+msgid "packet write failed: %s"
+msgstr "неуспешен запис на пакет: %s"
+
+msgid "read error"
+msgstr "грешка при четене"
+
+msgid "the remote end hung up unexpectedly"
+msgstr "отдалеченото хранилище неочаквано прекъсна връзката"
+
+#, c-format
+msgid "protocol error: bad line length character: %.4s"
+msgstr "протоколна грешка: неправилeн знак за дължина на ред: %.4s"
+
+#, c-format
+msgid "protocol error: bad line length %d"
+msgstr "протоколна грешка: неправилна дължина на ред: %d"
+
+#, c-format
+msgid "remote error: %s"
+msgstr "отдалечена грешка: %s"
+
+msgid "Refreshing index"
+msgstr "Обновяване на индекса"
+
+#, c-format
+msgid "unable to create threaded lstat: %s"
+msgstr "не може да се създаде нишка за изпълнението на „lstat“: %s"
+
+msgid "unable to parse --pretty format"
+msgstr "аргументът към опцията „--pretty“ не може да се анализира"
+
+msgid "promisor-remote: unable to fork off fetch subprocess"
+msgstr "хранилище-гарант: неуспешно създаване на процес за доставяне"
+
+msgid "promisor-remote: could not write to fetch subprocess"
+msgstr "хранилище-гарант: не може да се пише към процеса за доставяне"
+
+msgid "promisor-remote: could not close stdin to fetch subprocess"
+msgstr ""
+"хранилище-гарант: стандартният вход на процеса за доставяне не може да се "
+"затвори"
+
+#, c-format
+msgid "promisor remote name cannot begin with '/': %s"
+msgstr ""
+"името отдалеченото хранилище-гарант не може за започва със знака „/“: %s"
+
+msgid "object-info: expected flush after arguments"
+msgstr "object-info: след аргументите се очаква изчистване на буферите"
+
+msgid "Removing duplicate objects"
+msgstr "Изтриване на повтарящите се обекти"
+
+msgid "could not start `log`"
+msgstr "командата за журнала с подавания „log“ не може да се стартира"
+
+msgid "could not read `log` output"
+msgstr ""
+"изходът от командата за журнала с подавания „log“ не може да се прочете"
+
+#, c-format
+msgid "could not parse commit '%s'"
+msgstr "подаването „%s“ не може да бъде анализирано"
+
+#, c-format
+msgid ""
+"could not parse first line of `log` output: did not start with 'commit ': "
+"'%s'"
+msgstr ""
+"първият ред от изхода на командата „log“ не може да се анализира, защото не "
+"започва с „commit “: „%s“"
+
+#, c-format
+msgid "could not parse git header '%.*s'"
+msgstr "заглавната част на git „%.*s“ не може да се анализира"
+
+msgid "failed to generate diff"
+msgstr "неуспешно търсене на разлика"
+
+#, c-format
+msgid "could not parse log for '%s'"
+msgstr "журналът с подаванията на „%s“ не може да бъде анализиран"
+
+#, c-format
+msgid "will not add file alias '%s' ('%s' already exists in index)"
+msgstr ""
+"няма да бъде добавен псевдоним за файл „%s“ („%s“ вече съществува в индекса)"
+
+msgid "cannot create an empty blob in the object database"
+msgstr "в базата от данни за обектите не може да се създаде празен обект-BLOB"
+
+#, c-format
+msgid "%s: can only add regular files, symbolic links or git-directories"
+msgstr ""
+"%s: може да добавяте само обикновени файлове, символни връзки и директории "
+"на git"
+
+#, c-format
+msgid "unable to index file '%s'"
+msgstr "файлът „%s“ не може да бъде индексиран"
+
+#, c-format
+msgid "unable to add '%s' to index"
+msgstr "„%s“ не може да се добави в индекса"
+
+#, c-format
+msgid "unable to stat '%s'"
+msgstr "„stat“ не може да се изпълни върху „%s“"
+
+#, c-format
+msgid "'%s' appears as both a file and as a directory"
+msgstr "„%s“ съществува и като файл, и като директория"
+
+msgid "Refresh index"
+msgstr "Обновяване на индекса"
+
+#, c-format
+msgid ""
+"index.version set, but the value is invalid.\n"
+"Using version %i"
+msgstr ""
+"Зададена е неправилна стойност на настройката „index.version“.\n"
+"Ще се ползва версия %i"
+
+#, c-format
+msgid ""
+"GIT_INDEX_VERSION set, but the value is invalid.\n"
+"Using version %i"
+msgstr ""
+"Зададена е неправилна стойност на променливата на средата "
+"„GIT_INDEX_VERSION“.\n"
+"Ще се ползва версия %i"
+
+#, c-format
+msgid "bad signature 0x%08x"
+msgstr "неправилен подпис: „0x%08x“"
+
+#, c-format
+msgid "bad index version %d"
+msgstr "неправилна версия на индекса %d"
+
+msgid "bad index file sha1 signature"
+msgstr "неправилен подпис за контролна сума по SHA1 на файла на индекса"
+
+#, c-format
+msgid "index uses %.4s extension, which we do not understand"
+msgstr ""
+"индексът ползва разширение „%.4s“, което не се поддържа от тази версия на git"
+
+#, c-format
+msgid "ignoring %.4s extension"
+msgstr "игнориране на разширението „%.4s“"
+
+#, c-format
+msgid "unknown index entry format 0x%08x"
+msgstr "непознат формат на запис в индекса: „0x%08x“"
+
+#, c-format
+msgid "malformed name field in the index, near path '%s'"
+msgstr "неправилно име на поле в индекса близо до пътя „%s“"
+
+msgid "unordered stage entries in index"
+msgstr "неподредени записи в индекса"
+
+#, c-format
+msgid "multiple stage entries for merged file '%s'"
+msgstr "множество записи за слетия файл „%s“"
+
+#, c-format
+msgid "unordered stage entries for '%s'"
+msgstr "неподредени записи за „%s“"
+
+#, c-format
+msgid "unable to create load_cache_entries thread: %s"
+msgstr ""
+"не може да се създаде нишка за зареждане на обектите от кеша "
+"(load_cache_entries): %s"
+
+#, c-format
+msgid "unable to join load_cache_entries thread: %s"
+msgstr ""
+"не може да се изчака нишка за зареждане на обектите от кеша "
+"(load_cache_entries): %s"
+
+#, c-format
+msgid "%s: index file open failed"
+msgstr "%s: неуспешно отваряне на файла на индекса"
+
+#, c-format
+msgid "%s: cannot stat the open index"
+msgstr "%s: не може да се получи информация за отворения индекс със „stat“"
+
+#, c-format
+msgid "%s: index file smaller than expected"
+msgstr "%s: файлът на индекса е по-малък от очакваното"
+
+#, c-format
+msgid "%s: unable to map index file%s"
+msgstr "%s: неуспешно изпълнение на „mmap“ върху индексния файл%s"
+
+#, c-format
+msgid "unable to create load_index_extensions thread: %s"
+msgstr ""
+"не може да се създаде нишка за зареждане на разширенията на индекса "
+"(load_index_extensions): %s"
+
+#, c-format
+msgid "unable to join load_index_extensions thread: %s"
+msgstr ""
+"не може да се създаде нишка за зареждане на разширенията на индекса "
+"(load_index_extensions): %s"
+
+#, c-format
+msgid "could not freshen shared index '%s'"
+msgstr "споделеният индекс „%s“ не може да се обнови"
+
+#, c-format
+msgid "broken index, expect %s in %s, got %s"
+msgstr "грешки в индекса — в „%2$s“ се очаква „%1$s“, а бе получено „%3$s“"
+
+msgid "cannot write split index for a sparse index"
+msgstr "не може да се запише разделѐн, частичен индекс"
+
+msgid "failed to convert to a sparse-index"
+msgstr "индексът не може да бъде превърнат в частичен"
+
+#, c-format
+msgid "could not stat '%s'"
+msgstr "неуспешно изпълнение на „stat“ върху „%s“"
+
+#, c-format
+msgid "unable to open git dir: %s"
+msgstr "не може да се отвори директорията на git: %s"
+
+#, c-format
+msgid "unable to unlink: %s"
+msgstr "неуспешно изтриване на „%s“"
+
+#, c-format
+msgid "cannot fix permission bits on '%s'"
+msgstr "правата за достъп до „%s“ не може да бъдат поправени"
+
+#, c-format
+msgid "%s: cannot drop to stage #0"
+msgstr "%s: не може да се премине към етап №0"
+
+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 ""
+"Може да променѝте това с командите „git rebase --edit-todo“ и „git rebase --"
+"continue“ след това.\n"
+"Може и да преустановите пребазирането с командата „git rebase --abort“.\n"
+
+#, c-format
+msgid ""
+"unrecognized setting %s for option rebase.missingCommitsCheck. Ignoring."
+msgstr ""
+"Непозната стойност „%s“ за настройката „rebase.missingCommitsCheck“.  "
+"Настройката се прескача."
+
+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 [-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"
+"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 [-C | -c] ПОДАВАНЕ\n"
+"                    — вкарване на подаването в предходното му, без смяна на\n"
+"                      съобщението.  С „-C“ се използва само съобщението на\n"
+"                      настоящото, а с „-c“ освен това се отваря редакторът\n"
+" x, exec ПОДАВАНЕ   — изпълнение на команда към обвивката: останалата част "
+"на\n"
+"                      реда\n"
+" b, break           — спиране (може да продължите пребазирането с командата\n"
+"                      „git rebase --continue“)\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"
+
+#, c-format
+msgid "Rebase %s onto %s (%d command)"
+msgid_plural "Rebase %s onto %s (%d commands)"
+msgstr[0] "Пребазиране на „%s“ върху „%s“ (%d команди)"
+msgstr[1] "Пребазиране на „%s“ върху „%s“ (%d команда)"
+
+msgid ""
+"\n"
+"Do not remove any line. Use 'drop' explicitly to remove a commit.\n"
+msgstr ""
+"\n"
+"Не изтривайте редове.  Подаванията може да се прескачат с командата „drop“.\n"
+
+msgid ""
+"\n"
+"If you remove a line here THAT COMMIT WILL BE LOST.\n"
+msgstr ""
+"\n"
+"Ако изтриете ред, съответстващото му подаване ще бъде ИЗТРИТО.\n"
+
+msgid ""
+"\n"
+"You are editing the todo file of an ongoing interactive rebase.\n"
+"To continue rebase after editing, run:\n"
+"    git rebase --continue\n"
+"\n"
+msgstr ""
+"\n"
+"В момента редактирате файла с командите на текущото интерактивно "
+"пребазиране.\n"
+"За да продължите пребазирането след това, изпълнете:\n"
+"    git rebase --continue\n"
+"\n"
+
+msgid ""
+"\n"
+"However, if you remove everything, the rebase will be aborted.\n"
+"\n"
+msgstr ""
+"\n"
+"Ако изтриете всичко, пребазирането ще бъде преустановено.\n"
+"\n"
+
+#, c-format
+msgid "could not write '%s'."
+msgstr "„%s“ не може да се запише."
+
+#, c-format
+msgid ""
+"Warning: some commits may have been dropped accidentally.\n"
+"Dropped commits (newer to older):\n"
+msgstr ""
+"Предупреждение: някои подавания може да са пропуснати.\n"
+"Пропуснати подавания (новите са най-отгоре):\n"
+
+#, c-format
+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"
+"The possible behaviours are: ignore, warn, error.\n"
+"\n"
+msgstr ""
+"За да не получавате това съобщение, изрично ползвайте командата „drop“.\n"
+"\n"
+"Настройката „rebase.missingCommitsCheck“ управлява нивото на предупреждение\n"
+"Възможните стойности са „ignore“ (пренебрегване), „warn“ (само "
+"предупреждение)\n"
+"или „error“ (считане за грешка).\n"
+
+#, c-format
+msgid "%s: 'preserve' superseded by 'merges'"
+msgstr "%s: „merges“ заменя „preserve“"
+
+msgid "gone"
+msgstr "изтрит"
+
+#, c-format
+msgid "ahead %d"
+msgstr "напред с %d"
+
+#, c-format
+msgid "behind %d"
+msgstr "назад с %d"
+
+#, c-format
+msgid "ahead %d, behind %d"
+msgstr "напред с %d, назад с %d"
+
+#, c-format
+msgid "expected format: %%(color:<color>)"
+msgstr "очакван формат: %%(color:ЦВЯТ)"
+
+#, c-format
+msgid "unrecognized color: %%(color:%s)"
+msgstr "непознат цвят: %%(color:%s)"
+
+#, c-format
+msgid "Integer value expected refname:lstrip=%s"
+msgstr "очаква се цяло число за „refname:lstrip=%s“"
+
+#, c-format
+msgid "Integer value expected refname:rstrip=%s"
+msgstr "очаква се цяло число за „refname:rstrip=%s“"
+
+#, c-format
+msgid "unrecognized %%(%s) argument: %s"
+msgstr "непознат аргумент за „%%(%s)“: %s"
+
+#, c-format
+msgid "%%(objecttype) does not take arguments"
+msgstr "%%(objecttype) не приема аргументи"
+
+#, c-format
+msgid "%%(deltabase) does not take arguments"
+msgstr "%%(deltabase) не приема аргументи"
+
+#, c-format
+msgid "%%(body) does not take arguments"
+msgstr "%%(body) не приема аргументи"
+
+#, c-format
+msgid "expected %%(trailers:key=<value>)"
+msgstr "очаква се %%(trailers:key=ЕПИЛОГ)"
+
+#, c-format
+msgid "unknown %%(trailers) argument: %s"
+msgstr "непознат аргумент „%%(trailers)“: %s"
+
+#, c-format
+msgid "positive value expected contents:lines=%s"
+msgstr "очаква се положителна стойност за „contents:lines=%s“"
+
+#, c-format
+msgid "positive value expected '%s' in %%(%s)"
+msgstr "очаква се положителна стойност за „%s“ в %%(%s)"
+
+#, c-format
+msgid "unrecognized email option: %s"
+msgstr "непозната опция за е-поща: %s"
+
+#, c-format
+msgid "expected format: %%(align:<width>,<position>)"
+msgstr "очакван формат: %%(align:ШИРОЧИНА,ПОЗИЦИЯ)"
+
+#, c-format
+msgid "unrecognized position:%s"
+msgstr "непозната позиция: %s"
+
+#, c-format
+msgid "unrecognized width:%s"
+msgstr "непозната широчина: %s"
+
+#, c-format
+msgid "positive width expected with the %%(align) atom"
+msgstr "очаква се положителна широчина с лексемата „%%(align)“"
+
+#, c-format
+msgid "%%(rest) does not take arguments"
+msgstr "%%(rest) не приема аргументи"
+
+#, c-format
+msgid "malformed field name: %.*s"
+msgstr "неправилно име на обект: „%.*s“"
+
+#, c-format
+msgid "unknown field name: %.*s"
+msgstr "непознато име на обект: „%.*s“"
+
+#, c-format
+msgid ""
+"not a git repository, but the field '%.*s' requires access to object data"
+msgstr "не е хранилище на git, а полето „%.*s“ изисква достъп данни на обектни"
+
+#, c-format
+msgid "format: %%(%s) atom used without a %%(%s) atom"
+msgstr "формат: лексемата %%(%s) е използвана без съответната ѝ %%(%s)"
+
+#, c-format
+msgid "format: %%(then) atom used more than once"
+msgstr "формат: лексемата %%(then) е използвана повече от един път"
+
+#, c-format
+msgid "format: %%(then) atom used after %%(else)"
+msgstr "формат: лексемата %%(then) е използвана след %%(else)"
+
+#, c-format
+msgid "format: %%(else) atom used more than once"
+msgstr "формат: лексемата %%(else) е използвана повече от един път"
+
+#, c-format
+msgid "format: %%(end) atom used without corresponding atom"
+msgstr "формат: лексемата %%(end) е използвана без съответната ѝ"
+
+#, c-format
+msgid "malformed format string %s"
+msgstr "неправилен форматиращ низ „%s“"
+
+#, c-format
+msgid "this command reject atom %%(%.*s)"
+msgstr "тази команда отхвърли лексемата %%(%.*s)"
+
+#, c-format
+msgid "--format=%.*s cannot be used with --python, --shell, --tcl"
+msgstr ""
+"опцията „--format=%.*s“ е несъвместима с „--python“, „--shell“, „--tcl“"
+
+#, c-format
+msgid "(no branch, rebasing %s)"
+msgstr "(извън клон, пребазиране на „%s“)"
+
+#, c-format
+msgid "(no branch, rebasing detached HEAD %s)"
+msgstr "(извън клон, пребазиране на несвързан указател „HEAD“ при „%s“)"
+
+#, c-format
+msgid "(no branch, bisect started on %s)"
+msgstr "(извън клон, двоично търсене от „%s“)"
+
+#, c-format
+msgid "(HEAD detached at %s)"
+msgstr "(указателят „HEAD“ не е свързан и е при „%s“)"
+
+#, c-format
+msgid "(HEAD detached from %s)"
+msgstr "(указателят „HEAD“ не е свързан и е отделѐн от „%s“)"
+
+msgid "(no branch)"
+msgstr "(извън клон)"
+
+#, c-format
+msgid "missing object %s for %s"
+msgstr "обектът „%s“ липсва за „%s“"
+
+#, c-format
+msgid "parse_object_buffer failed on %s for %s"
+msgstr "неуспешно анализиране чрез „parse_object_buffer“ на „%s“ за „%s“"
+
+#, c-format
+msgid "malformed object at '%s'"
+msgstr "обект със сгрешен формат при „%s“"
+
+#, c-format
+msgid "ignoring ref with broken name %s"
+msgstr "игнориране на указателя с грешно име „%s“"
+
+#, c-format
+msgid "ignoring broken ref %s"
+msgstr "игнориране на повредения указател „%s“"
+
+#, c-format
+msgid "format: %%(end) atom missing"
+msgstr "грешка във форма̀та: липсва лексемата %%(end)"
+
+#, c-format
+msgid "malformed object name %s"
+msgstr "неправилно име на обект „%s“"
+
+#, c-format
+msgid "option `%s' must point to a commit"
+msgstr "опцията „%s“ не сочи към подаване"
+
+msgid "key"
+msgstr "КЛЮЧ"
+
+msgid "field name to sort on"
+msgstr "име на полето, по което да е подредбата"
+
+#, c-format
+msgid "not a reflog: %s"
+msgstr "„%s“ не е журнал с подавания"
+
+#, c-format
+msgid "no reflog for '%s'"
+msgstr "липсва журнал с подаванията за „%s“"
+
+#, c-format
+msgid "%s does not point to a valid object!"
+msgstr "„%s“ не сочи към позволен обект!"
+
+#, 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"
+"of your new repositories, which will suppress this warning, call:\n"
+"\n"
+"\tgit config --global init.defaultBranch <name>\n"
+"\n"
+"Names commonly chosen instead of 'master' are 'main', 'trunk' and\n"
+"'development'. The just-created branch can be renamed via this command:\n"
+"\n"
+"\tgit branch -m <name>\n"
+msgstr ""
+"Първоначалният клон ще се казва „%s“.  Това може да се променѝ.  Може да "
+"зададете\n"
+"настройката и да спрете това съобщение.  За това изпълнете:\n"
+"\n"
+"    git config --global init.defaultBranch ИМЕ\n"
+"\n"
+"Често ползвани варианти вместо „master“ са „main“, „trunk“ и „development“.\n"
+"За да преименувата току що създаден клон, изпълнете:\n"
+"\n"
+"    git branch -m ИМЕ\n"
+
+#, c-format
+msgid "could not retrieve `%s`"
+msgstr "„%s“ не може да бъде получен"
+
+#, c-format
+msgid "invalid branch name: %s = %s"
+msgstr "неправилно име на клон: „%s = %s“"
+
+#, c-format
+msgid "ignoring dangling symref %s"
+msgstr "игнориране на указател на обект извън клон „%s“"
+
+#, c-format
+msgid "log for ref %s has gap after %s"
+msgstr "има пропуски в журнала с подаванията за указателя „%s“ след „%s“"
+
+#, c-format
+msgid "log for ref %s unexpectedly ended on %s"
+msgstr "журналът с подаванията за указателя „%s“ свършва неочаквано след „%s“"
+
+#, c-format
+msgid "log for %s is empty"
+msgstr "журналът с подаванията за указателя „%s“ е празен"
+
+#, c-format
+msgid "refusing to update ref with bad name '%s'"
+msgstr "указател не може да се обнови с грешно име „%s“"
+
+#, c-format
+msgid "update_ref failed for ref '%s': %s"
+msgstr "неуспешно обновяване на указателя (update_ref) „%s“: %s"
+
+#, c-format
+msgid "multiple updates for ref '%s' not allowed"
+msgstr "не са позволени повече от една промѐни на указателя „%s“"
+
+msgid "ref updates forbidden inside quarantine environment"
+msgstr "обновяванията на указатели са забранени в среди под карантина"
+
+msgid "ref updates aborted by hook"
+msgstr "обновяванията на указатели са преустановени от кука"
+
+#, c-format
+msgid "'%s' exists; cannot create '%s'"
+msgstr "„%s“ съществува, не може да се създаде „%s“"
+
+#, c-format
+msgid "cannot process '%s' and '%s' at the same time"
+msgstr "невъзможно е едновременно да се обработват „%s“ и „%s“"
+
+#, c-format
+msgid "could not remove reference %s"
+msgstr "Указателят „%s“ не може да бъде изтрит"
+
+#, c-format
+msgid "could not delete reference %s: %s"
+msgstr "Указателят „%s“ не може да бъде изтрит: %s"
+
+#, c-format
+msgid "could not delete references: %s"
+msgstr "Указателите не може да бъдат изтрити: %s"
+
+#, c-format
+msgid "invalid refspec '%s'"
+msgstr "неправилен указател: „%s“"
+
+#, c-format
+msgid "invalid quoting in push-option value: '%s'"
+msgstr ""
+"неправилно екраниране или цитиране в стойността към опция за изтласкване: "
+"„%s“"
+
+#, c-format
+msgid "%sinfo/refs not valid: is this a git repository?"
+msgstr "„%sinfo/refs“ е неизползваемо, проверете дали е хранилище на git"
+
+msgid "invalid server response; expected service, got flush packet"
+msgstr ""
+"неправилен отговор от сървъра: очакваше се услуга, а бе получен изчистващ "
+"пакет „flush“"
+
+#, c-format
+msgid "invalid server response; got '%s'"
+msgstr "неправилен отговор от сървъра, бе получено: „%s“"
+
+#, c-format
+msgid "repository '%s' not found"
+msgstr "хранилището „%s“ липсва"
+
+#, c-format
+msgid "Authentication failed for '%s'"
+msgstr "Неуспешна идентификация към „%s“"
+
+#, c-format
+msgid "unable to access '%s' with http.pinnedPubkey configuration: %s"
+msgstr "няма достъп до „%s“ със следната настройка на „http.pinnedPubkey“: %s"
+
+#, c-format
+msgid "unable to access '%s': %s"
+msgstr "няма достъп до „%s“: %s"
+
+#, c-format
+msgid "redirecting to %s"
+msgstr "пренасочване към „%s“"
+
+msgid "shouldn't have EOF when not gentle on EOF"
+msgstr "получен е EOF, в режим без поддръжка за това"
+
+msgid "remote server sent unexpected response end packet"
+msgstr "отдалеченият сървър прати неочакван пакет за край на отговор"
+
+msgid "unable to rewind rpc post data - try increasing http.postBuffer"
+msgstr ""
+"данните за POST не може да се прочетат наново, пробвайте да увеличите "
+"настройката „http.postBuffer“"
+
+#, c-format
+msgid "remote-curl: bad line length character: %.4s"
+msgstr "remote-curl: неправилeн знак за дължина на ред: %.4s"
+
+msgid "remote-curl: unexpected response end packet"
+msgstr "remote-curl: неочакван пакет за край на отговор"
+
+#, c-format
+msgid "RPC failed; %s"
+msgstr "Неуспешно отдалечено извикване.  %s"
+
+msgid "cannot handle pushes this big"
+msgstr "толкова големи изтласквания не може да се изпълнят"
+
+#, c-format
+msgid "cannot deflate request; zlib deflate error %d"
+msgstr ""
+"заявката не може да бъде декомпресирана, грешка от „zlib“ при "
+"декомпресиране: %d"
+
+#, c-format
+msgid "cannot deflate request; zlib end error %d"
+msgstr ""
+"заявката не може да бъде декомпресирана; грешка от „zlib“ при завършване: %d<"
+
+#, c-format
+msgid "%d bytes of length header were received"
+msgstr "получени са %d байта от заглавна част"
+
+#, c-format
+msgid "%d bytes of body are still expected"
+msgstr "очакват се още %d байта от тялото на отговора"
+
+msgid "dumb http transport does not support shallow capabilities"
+msgstr "опростеният транспорт по http не поддържа плитки клиенти"
+
+msgid "fetch failed."
+msgstr "неуспешно доставяне."
+
+msgid "cannot fetch by sha1 over smart http"
+msgstr "умният вариант на http не може да доставя по SHA1"
+
+#, c-format
+msgid "protocol error: expected sha/ref, got '%s'"
+msgstr "протоколна грешка: очаква се SHA1 или указател, а бе получено: „%s“"
+
+#, c-format
+msgid "http transport does not support %s"
+msgstr "транспортът по http не поддържа „%s“"
+
+msgid "git-http-push failed"
+msgstr "неуспешно изпълнение на „git-http-push“"
+
+msgid "remote-curl: usage: git remote-curl <remote> [<url>]"
+msgstr "remote-curl: употреба: git remote-curl ХРАНИЛИЩЕ [АДРЕС]"
+
+msgid "remote-curl: error reading command stream from git"
+msgstr "remote-curl: грешка при изчитането на потока команди от git"
+
+msgid "remote-curl: fetch attempted without a local repo"
+msgstr "remote-curl: опит за доставяне без локално хранилище"
+
+#, c-format
+msgid "remote-curl: unknown command '%s' from git"
+msgstr "remote-curl: непозната команда „%s“ от git"
+
+#, c-format
+msgid "config remote shorthand cannot begin with '/': %s"
+msgstr ""
+"съкращението за отдалечено хранилище не може за започва със знака „/“: %s"
+
+msgid "more than one receivepack given, using the first"
+msgstr "зададен е повече от един пакет за получаване, ще се ползва първият"
+
+msgid "more than one uploadpack given, using the first"
+msgstr "зададен е повече от един пакет за изпращане, ще се ползва първият"
+
+#, c-format
+msgid "unrecognized value transfer.credentialsInUrl: '%s'"
+msgstr "непозната стойност за „transfer.credentialsInUrl“: „%s“"
+
+#, c-format
+msgid "URL '%s' uses plaintext credentials"
+msgstr "Адресът „%s“ използва идентификация с нешифриран текст"
+
+#, c-format
+msgid "Cannot fetch both %s and %s to %s"
+msgstr "Невъзможно е да се доставят едновременно и „%s“, и „%s“ към „%s“"
+
+#, c-format
+msgid "%s usually tracks %s, not %s"
+msgstr "„%s“ обикновено следи „%s“, а не „%s“"
+
+#, c-format
+msgid "%s tracks both %s and %s"
+msgstr "„%s“ следи както „%s“, така и „%s“"
+
+#, c-format
+msgid "key '%s' of pattern had no '*'"
+msgstr "ключ „%s“ на шаблона не съдържа „*“"
+
+#, c-format
+msgid "value '%s' of pattern has no '*'"
+msgstr "стойност „%s“ на шаблона не съдържа „*“"
+
+#, c-format
+msgid "src refspec %s does not match any"
+msgstr "указателят на версия-източник „%s“ не съвпада с никой обект"
+
+#, c-format
+msgid "src refspec %s matches more than one"
+msgstr "указателят на версия-източник „%s“ съвпада с повече от един обект"
+
+#. TRANSLATORS: "matches '%s'%" is the <dst> part of "git push
+#. <remote> <src>:<dst>" push, and "being pushed ('%s')" is
+#. the <src>.
+#.
+#, c-format
+msgid ""
+"The destination you provided is not a full refname (i.e.,\n"
+"starting with \"refs/\"). We tried to guess what you meant by:\n"
+"\n"
+"- Looking for a ref that matches '%s' on the remote side.\n"
+"- Checking if the <src> being pushed ('%s')\n"
+"  is a ref in \"refs/{heads,tags}/\". If so we add a corresponding\n"
+"  refs/{heads,tags}/ prefix on the remote side.\n"
+"\n"
+"Neither worked, so we gave up. You must fully qualify the ref."
+msgstr ""
+"Зададената цел не е пълно име на указател (не започва с „refs/“).\n"
+"Бяха пробвани следните варианти:\n"
+"\n"
+"  ⁃ указател от отдалеченото хранилище, който да съответства на „%s“;\n"
+"  ⁃ дали изтласкваният ИЗТОЧНИК („%s“) е указател в „refs/{heads,tags}/“.\n"
+"    При съвпадение се добавя съответен префикс „refs/{heads,tags}/“ за\n"
+"    отдалеченото хранилище.\n"
+"\n"
+"Никой от вариантите не сработи.  Трябва сами да укажете пълното име на\n"
+"указателя."
+
+#, c-format
+msgid ""
+"The <src> part of the refspec is a commit object.\n"
+"Did you mean to create a new branch by pushing to\n"
+"'%s:refs/heads/%s'?"
+msgstr ""
+"ИЗТОЧНИКът е обект-подаване.  Не целите ли всъщност да създадете нов клон "
+"като\n"
+"изтласкате към „%s:refs/heads/%s“?"
+
+#, c-format
+msgid ""
+"The <src> part of the refspec is a tag object.\n"
+"Did you mean to create a new tag by pushing to\n"
+"'%s:refs/tags/%s'?"
+msgstr ""
+"ИЗТОЧНИКът е обект-етикет.  Не целите ли всъщност да създадете нов клон "
+"като\n"
+"изтласкате към „%s:refs/tags/%s“?"
+
+#, c-format
+msgid ""
+"The <src> part of the refspec is a tree object.\n"
+"Did you mean to tag a new tree by pushing to\n"
+"'%s:refs/tags/%s'?"
+msgstr ""
+"ИЗТОЧНИКът е обект-дърво.  Не целите ли всъщност да създадете нов клон като\n"
+"изтласкате към „%s:refs/tags/%s“?"
+
+#, c-format
+msgid ""
+"The <src> part of the refspec is a blob object.\n"
+"Did you mean to tag a new blob by pushing to\n"
+"'%s:refs/tags/%s'?"
+msgstr ""
+"ИЗТОЧНИКът е обект-BLOB.  Не целите ли всъщност да създадете нов клон като\n"
+"изтласкате към „%s:refs/tags/%s“?"
+
+#, c-format
+msgid "%s cannot be resolved to branch"
+msgstr "не е открит клон съответстващ на „%s“"
+
+#, c-format
+msgid "unable to delete '%s': remote ref does not exist"
+msgstr "„%s“ не може да се изтрие: отдалечения указател не съществува"
+
+#, c-format
+msgid "dst refspec %s matches more than one"
+msgstr "указателят на версия-цел „%s“ съвпада с повече от един обект"
+
+#, c-format
+msgid "dst ref %s receives from more than one src"
+msgstr ""
+"указателят на версия-цел „%s“ съответства и ще получава от повече от един "
+"източник"
+
+msgid "HEAD does not point to a branch"
+msgstr "Указателят „HEAD“ не сочи към клон"
+
+#, c-format
+msgid "no such branch: '%s'"
+msgstr "няма клон на име „%s“"
+
+#, c-format
+msgid "no upstream configured for branch '%s'"
+msgstr "не е зададен клон-източник за клона „%s“"
+
+#, c-format
+msgid "upstream branch '%s' not stored as a remote-tracking branch"
+msgstr "клонът-източник „%s“ не е съхранен като следящ клон"
+
+#, c-format
+msgid "push destination '%s' on remote '%s' has no local tracking branch"
+msgstr ""
+"липсва локален следящ клон за местоположението за изтласкване „%s“ в "
+"хранилището „%s“"
+
+#, c-format
+msgid "branch '%s' has no remote for pushing"
+msgstr "няма информация клонът „%s“ да следи някой друг"
+
+#, c-format
+msgid "push refspecs for '%s' do not include '%s'"
+msgstr "указателят за изтласкване на „%s“ не включва „%s“"
+
+msgid "push has no destination (push.default is 'nothing')"
+msgstr "указателят за изтласкване не включва цел („push.default“ е „nothing“)"
+
+msgid "cannot resolve 'simple' push to a single destination"
+msgstr "простото (simple) изтласкване не съответства на една цел"
+
+#, c-format
+msgid "couldn't find remote ref %s"
+msgstr "отдалеченият указател „%s“ не може да бъде открит"
+
+#, c-format
+msgid "* Ignoring funny ref '%s' locally"
+msgstr "• прескачане на неочаквания локален указател „%s“"
+
+#, c-format
+msgid "Your branch is based on '%s', but the upstream is gone.\n"
+msgstr "Този клон следи „%s“, но следеният клон е изтрит.\n"
+
+msgid "  (use \"git branch --unset-upstream\" to fixup)\n"
+msgstr "  (за да коригирате това, използвайте „git branch --unset-upstream“)\n"
+
+#, c-format
+msgid "Your branch is up to date with '%s'.\n"
+msgstr "Клонът е обновен към „%s“.\n"
+
+#, c-format
+msgid "Your branch and '%s' refer to different commits.\n"
+msgstr "Клонът ви и „%s“ сочат към различни подавания.\n"
+
+#, c-format
+msgid "  (use \"%s\" for details)\n"
+msgstr "  (за повече информация ползвайте „%s“)\n"
+
+#, c-format
+msgid "Your branch is ahead of '%s' by %d commit.\n"
+msgid_plural "Your branch is ahead of '%s' by %d commits.\n"
+msgstr[0] "Клонът ви е с %2$d подаване пред „%1$s“.\n"
+msgstr[1] "Клонът ви е с %2$d подавания пред „%1$s“.\n"
+
+msgid "  (use \"git push\" to publish your local commits)\n"
+msgstr "  (публикувайте локалните промѐни чрез „git push“)\n"
+
+#, c-format
+msgid "Your branch is behind '%s' by %d commit, and can be fast-forwarded.\n"
+msgid_plural ""
+"Your branch is behind '%s' by %d commits, and can be fast-forwarded.\n"
+msgstr[0] "Клонът ви е с %2$d подаване зад „%1$s“ и може да бъде превъртян.\n"
+msgstr[1] "Клонът ви е с %2$d подавания зад „%1$s“ и може да бъде превъртян.\n"
+
+msgid "  (use \"git pull\" to update your local branch)\n"
+msgstr "  (обновете локалния си клон чрез „git pull“)\n"
+
+#, c-format
+msgid ""
+"Your branch and '%s' have diverged,\n"
+"and have %d and %d different commit each, respectively.\n"
+msgid_plural ""
+"Your branch and '%s' have diverged,\n"
+"and have %d and %d different commits each, respectively.\n"
+msgstr[0] ""
+"Текущият клон се е отделил от „%s“,\n"
+"двата имат съответно по %d и %d несъвпадащи подавания.\n"
+msgstr[1] ""
+"Текущият клон се е отделил от „%s“,\n"
+"двата имат съответно по %d и %d несъвпадащи подавания.\n"
+
+msgid "  (use \"git pull\" to merge the remote branch into yours)\n"
+msgstr "  (слейте отдалечения клон в локалния чрез „git pull“)\n"
+
+#, c-format
+msgid "cannot parse expected object name '%s'"
+msgstr "очакваното име на обект „%s“ не може да бъде анализирано"
+
+#, c-format
+msgid "cannot strip one component off url '%s'"
+msgstr "не може да се махне компонент от адреса „%s“"
+
+#, c-format
+msgid "bad replace ref name: %s"
+msgstr "неправилно име на указател за замяна: „%s“"
+
+#, c-format
+msgid "duplicate replace ref: %s"
+msgstr "повтарящ се указател за замяна: „%s“"
+
+#, c-format
+msgid "replace depth too high for object %s"
+msgstr "дълбочината на замяна е прекалено голяма за обекта: „%s“"
+
+msgid "corrupt MERGE_RR"
+msgstr "повреден „MERGE_RR“ (запис за коригиране на конфликт)"
+
+msgid "unable to write rerere record"
+msgstr "приложеното коригиране на конфликт не може да бъде записано"
+
+#, c-format
+msgid "there were errors while writing '%s' (%s)"
+msgstr "грешки при записването на „%s“ (%s)"
+
+#, c-format
+msgid "could not parse conflict hunks in '%s'"
+msgstr "парчетата с конфликти в „%s“ не може да се анализират"
+
+#, c-format
+msgid "failed utime() on '%s'"
+msgstr "неуспешно задаване на време на достъп/създаване чрез „utime“ на „%s“"
+
+#, c-format
+msgid "writing '%s' failed"
+msgstr "неуспешен запис на „%s“"
+
+#, c-format
+msgid "Staged '%s' using previous resolution."
+msgstr ""
+"„%s“ е добавен към индекса с преизползване на запазена корекция при сливане"
+
+#, c-format
+msgid "Recorded resolution for '%s'."
+msgstr "Корекцията на конфликта при сливане на „%s“ е запазена."
+
+#, c-format
+msgid "Resolved '%s' using previous resolution."
+msgstr ""
+"Конфликтът при сливане на „%s“ е коригиран с преизползване на предишна "
+"корекция."
+
+#, c-format
+msgid "cannot unlink stray '%s'"
+msgstr "излишният обект „%s“ не може да се изтрие"
+
+#, c-format
+msgid "Recorded preimage for '%s'"
+msgstr "Предварителният вариант на „%s“ е запазен"
+
+#, c-format
+msgid "failed to update conflicted state in '%s'"
+msgstr "конфликтът в „%s“ не може да се обнови"
+
+#, c-format
+msgid "no remembered resolution for '%s'"
+msgstr "липсва запазена корекция на конфликт при „%s“"
+
+#, c-format
+msgid "cannot unlink '%s'"
+msgstr "„%s“ не може да се изтрие"
+
+#, c-format
+msgid "Updated preimage for '%s'"
+msgstr "Предварителният вариант на „%s“ е обновен"
+
+#, c-format
+msgid "Forgot resolution for '%s'\n"
+msgstr "Запазената корекция на конфликт при „%s“ е премахната\n"
+
+msgid "unable to open rr-cache directory"
+msgstr "директорията „rr-cache“ не може да се отвори"
+
+msgid "update the index with reused conflict resolution if possible"
+msgstr ""
+"при възможност преизползване на решението на конфликта за обновяване на "
+"индекса"
+
+msgid "could not determine HEAD revision"
+msgstr "не може да се определи към какво да сочи указателят „HEAD“"
+
+#, c-format
+msgid "failed to find tree of %s"
+msgstr "дървото, сочено от „%s“, не може да бъде открито"
+
+msgid "--unpacked=<packfile> no longer supported"
+msgstr "опцията „--unpacked=ПАКЕТЕН_ФАЙЛ“ вече не се поддържа"
+
+msgid "your current branch appears to be broken"
+msgstr "Текущият клон е повреден"
+
+#, c-format
+msgid "your current branch '%s' does not have any commits yet"
+msgstr "Текущият клон „%s“ е без подавания "
+
+msgid "object filtering requires --objects"
+msgstr "филтрирането на обекти изисква опцията „--objects“"
+
+msgid "-L does not yet support diff formats besides -p and -s"
+msgstr ""
+"опцията „-L“ поддържа единствено форматирането на разликите според опциите „-"
+"p“ и „-s“"
+
+#, c-format
+msgid "cannot create async thread: %s"
+msgstr "не може да се създаде асинхронна нишка: %s"
+
+msgid "unexpected flush packet while reading remote unpack status"
+msgstr ""
+"неочакван изчистващ пакет „flush“ при изчитане на състоянието от "
+"отдалеченото разпакетиране"
+
+#, c-format
+msgid "unable to parse remote unpack status: %s"
+msgstr ""
+"състоянието от отдалеченото разпакетиране не може да бъде анализирано: %s"
+
+#, c-format
+msgid "remote unpack failed: %s"
+msgstr "неуспешно отдалечено разпакетиране: %s"
+
+msgid "failed to sign the push certificate"
+msgstr "сертификатът за изтласкване не може да бъде подписан"
+
+msgid "send-pack: unable to fork off fetch subprocess"
+msgstr "send-pack: неуспешно създаване на процес"
+
+msgid "push negotiation failed; proceeding anyway with push"
+msgstr "неуспешно договаряне на изтласкване, но се продължава с изтласкването"
+
+msgid "the receiving end does not support this repository's hash algorithm"
+msgstr ""
+"отсрещната страна не поддържа алгоритъма за контролни суми на това хранилище"
+
+msgid "the receiving end does not support --signed push"
+msgstr "отсрещната страна не поддържа изтласкване с опцията „--signed“"
+
+msgid ""
+"not sending a push certificate since the receiving end does not support --"
+"signed push"
+msgstr ""
+"отсрещната страна не поддържа изтласкване с опцията „--signed“, затова не се "
+"използва сертификат"
+
+msgid "the receiving end does not support --atomic push"
+msgstr "получаващата страна не поддържа изтласкване с опцията „--atomic“"
+
+msgid "the receiving end does not support push options"
+msgstr "отсрещната страна не поддържа опции при изтласкване"
+
+#, c-format
+msgid "invalid commit message cleanup mode '%s'"
+msgstr "несъществуващ режим на изчистване „%s“ на съобщение при подаване"
+
+#, c-format
+msgid "could not delete '%s'"
+msgstr "„%s“ не може да бъде изтрит"
+
+msgid "revert"
+msgstr "отмяна"
+
+msgid "cherry-pick"
+msgstr "отбиране"
+
+msgid "rebase"
+msgstr "пребазиране"
+
+#, c-format
+msgid "unknown action: %d"
+msgstr "неизвестно действие: %d"
+
+msgid ""
+"after resolving the conflicts, mark the corrected paths\n"
+"with 'git add <paths>' or 'git rm <paths>'"
+msgstr ""
+"след коригирането на конфликтите, отбележете съответните пътища с:\n"
+"\n"
+"    git add ПЪТ…\n"
+"\n"
+"или\n"
+"\n"
+"    git rm ПЪТ…"
+
+msgid ""
+"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"
+"\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"
+
+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"
+
+#, c-format
+msgid "could not lock '%s'"
+msgstr "„%s“ не може да се заключи"
+
+#, c-format
+msgid "could not write to '%s'"
+msgstr "в „%s“ не може да се пише"
+
+#, c-format
+msgid "could not write eol to '%s'"
+msgstr "краят на ред не може да се запише в „%s“"
+
+#, c-format
+msgid "failed to finalize '%s'"
+msgstr "„%s“ не може да се завърши"
+
+#, c-format
+msgid "your local changes would be overwritten by %s."
+msgstr "локалните промѐни ще бъдат презаписани при %s."
+
+msgid "commit your changes or stash them to proceed."
+msgstr "подайте или скатайте промѐните, за да продължите"
+
+#, c-format
+msgid "%s: fast-forward"
+msgstr "%s: превъртане"
+
+#. TRANSLATORS: %s will be "revert", "cherry-pick" or
+#. "rebase".
+#.
+#, c-format
+msgid "%s: Unable to write new index file"
+msgstr "%s: новият индекс не може да бъде запазен"
+
+msgid "unable to update cache tree"
+msgstr "дървото на кеша не може да бъде обновено"
+
+msgid "could not resolve HEAD commit"
+msgstr "подаването, сочено от указателя „HEAD“, не може да бъде открито"
+
+#, c-format
+msgid "no key present in '%.*s'"
+msgstr "в „%.*s“ няма ключове"
+
+#, c-format
+msgid "unable to dequote value of '%s'"
+msgstr "цитирането на стойността на „%s“ не може да бъде изчистено"
+
+msgid "'GIT_AUTHOR_NAME' already given"
+msgstr "настройката за автор „GIT_AUTHOR_NAME“ вече е зададена"
+
+msgid "'GIT_AUTHOR_EMAIL' already given"
+msgstr "настройката за е-поща „GIT_AUTHOR_EMAIL“ вече е зададена"
+
+msgid "'GIT_AUTHOR_DATE' already given"
+msgstr "настройката за дата „GIT_AUTHOR_DATE“ вече е зададена"
+
+#, c-format
+msgid "unknown variable '%s'"
+msgstr "непозната променлива „%s“"
+
+msgid "missing 'GIT_AUTHOR_NAME'"
+msgstr "настройката за автор „GIT_AUTHOR_NAME“ липсва"
+
+msgid "missing 'GIT_AUTHOR_EMAIL'"
+msgstr "настройката за е-поща „GIT_AUTHOR_EMAIL“ липсва"
+
+msgid "missing 'GIT_AUTHOR_DATE'"
+msgstr "настройката за дата „GIT_AUTHOR_DATE“ липсва"
+
+#, c-format
+msgid ""
+"you have staged changes in your working tree\n"
+"If these changes are meant to be squashed into the previous commit, run:\n"
+"\n"
+"  git commit --amend %s\n"
+"\n"
+"If they are meant to go into a new commit, run:\n"
+"\n"
+"  git commit %s\n"
+"\n"
+"In both cases, once you're done, continue with:\n"
+"\n"
+"  git rebase --continue\n"
+msgstr ""
+"в това работно дърво има скатани промѐни.\n"
+"Ако искате да ги вкарате в предишното подаване, изпълнете:\n"
+"\n"
+"    git commit --amend %s\n"
+"\n"
+"Ако искате да създадете ново подаване, изпълнете:\n"
+"\n"
+"    git commit %s\n"
+"\n"
+"И в двата случая продължавате след това с командата:\n"
+"\n"
+"    git rebase --continue\n"
+
+msgid "'prepare-commit-msg' hook failed"
+msgstr ""
+"неуспешно изпълнение на куката при промяна на съобщението при подаване "
+"(prepare-commit-msg)"
+
+msgid ""
+"Your name and email address were configured automatically based\n"
+"on your username and hostname. Please check that they are accurate.\n"
+"You can suppress this message by setting them explicitly. Run the\n"
+"following command and follow the instructions in your editor to edit\n"
+"your configuration file:\n"
+"\n"
+"    git config --global --edit\n"
+"\n"
+"After doing this, you may fix the identity used for this commit with:\n"
+"\n"
+"    git commit --amend --reset-author\n"
+msgstr ""
+"Името и адресът за е-поща са настроени автоматично на базата на името на\n"
+"потребителя и името на машината.  Проверете дали са верни.  Може да спрете\n"
+"това съобщение като изрично зададете стойностите.  Изпълнете следната "
+"команда\n"
+"и следвайте инструкциите в текстовия ви редактор, за да редактирате\n"
+"конфигурационния файл:\n"
+"\n"
+"    git config --global --edit\n"
+"\n"
+"След като направите това, може да коригирате информацията за автора на\n"
+"текущото подаване чрез:\n"
+"\n"
+"    git commit --amend --reset-author\n"
+
+msgid ""
+"Your name and email address were configured automatically based\n"
+"on your username and hostname. Please check that they are accurate.\n"
+"You can suppress this message by setting them explicitly:\n"
+"\n"
+"    git config --global user.name \"Your Name\"\n"
+"    git config --global user.email you@example.com\n"
+"\n"
+"After doing this, you may fix the identity used for this commit with:\n"
+"\n"
+"    git commit --amend --reset-author\n"
+msgstr ""
+"Името и адресът за е-поща са настроени автоматично на базата на името на\n"
+"потребителя и името на машината.  Проверете дали са верни.  Може да спрете\n"
+"това съобщение като изрично зададете стойностите:\n"
+"\n"
+"    git config --global user.name \"Вашето Име\"\n"
+"    git config --global user.email пенчо@example.com\n"
+"\n"
+"След като направите това, може да коригирате информацията за автора на\n"
+"текущото подаване чрез:\n"
+"\n"
+"    git commit --amend --reset-author\n"
+
+msgid "couldn't look up newly created commit"
+msgstr "току що създаденото подаване не може да бъде открито"
+
+msgid "could not parse newly created commit"
+msgstr "току що създаденото подаване не може да бъде анализирано"
+
+msgid "unable to resolve HEAD after creating commit"
+msgstr ""
+"състоянието сочено от указателя „HEAD“ не може да бъде открито след "
+"подаването"
+
+msgid "detached HEAD"
+msgstr "несвързан връх „HEAD“"
+
+msgid " (root-commit)"
+msgstr " (начално подаване)"
+
+msgid "could not parse HEAD"
+msgstr "указателят „HEAD“ не може да бъде анализиран"
+
+#, c-format
+msgid "HEAD %s is not a commit!"
+msgstr "указателят „HEAD“ „%s“ сочи към нещо, което не е подаване!"
+
+msgid "unable to parse commit author"
+msgstr "авторът на подаването не може да бъде анализиран"
+
+#, c-format
+msgid "unable to read commit message from '%s'"
+msgstr "съобщението за подаване не може да бъде прочетено от „%s“"
+
+#, c-format
+msgid "invalid author identity '%s'"
+msgstr "неправилна самоличност за автор: „%s“"
+
+msgid "corrupt author: missing date information"
+msgstr "повредена информация за автор: липсва дата"
+
+#, c-format
+msgid "could not update %s"
+msgstr "„%s“ не може да се обнови"
+
+#, c-format
+msgid "could not parse commit %s"
+msgstr "подаването „%s“ не може да бъде анализирано"
+
+#, c-format
+msgid "could not parse parent commit %s"
+msgstr "родителското подаване „%s“ не може да бъде анализирано"
+
+#, c-format
+msgid "unknown command: %d"
+msgstr "непозната команда: %d"
+
+msgid "This is the 1st commit message:"
+msgstr "Това е 1-то съобщение при подаване:"
+
+#, c-format
+msgid "This is the commit message #%d:"
+msgstr "Това е съобщение при подаване №%d:"
+
+msgid "The 1st commit message will be skipped:"
+msgstr "Съобщението при подаване №1 ще бъде прескочено:"
+
+#, c-format
+msgid "The commit message #%d will be skipped:"
+msgstr "Съобщението при подаване №%d ще бъде прескочено:"
+
+#, c-format
+msgid "This is a combination of %d commits."
+msgstr "Това е обединение от %d подавания"
+
+#, c-format
+msgid "cannot write '%s'"
+msgstr "„%s“ не може да се запази"
+
+msgid "need a HEAD to fixup"
+msgstr "За вкарване в предходното подаване ви трябва указател „HEAD“"
+
+msgid "could not read HEAD"
+msgstr "указателят „HEAD“ не може да се прочете"
+
+msgid "could not read HEAD's commit message"
+msgstr ""
+"съобщението за подаване към указателя „HEAD“ не може да бъде прочетено: %s"
+
+#, c-format
+msgid "could not read commit message of %s"
+msgstr "съобщението за подаване към „%s“ не може да бъде прочетено"
+
+msgid "your index file is unmerged."
+msgstr "индексът не е слят."
+
+msgid "cannot fixup root commit"
+msgstr "началното подаване не може да се вкара в предходното му"
+
+#, c-format
+msgid "commit %s is a merge but no -m option was given."
+msgstr "подаването „%s“ е сливане, но не е дадена опцията „-m“"
+
+#, c-format
+msgid "commit %s does not have parent %d"
+msgstr "подаването „%s“ няма родител %d"
+
+#, 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.
+#, c-format
+msgid "%s: cannot parse parent commit %s"
+msgstr "%s: неразпозната стойност за родителското подаване „%s“"
+
+#, c-format
+msgid "could not rename '%s' to '%s'"
+msgstr "„%s“ не може да се преименува на „%s“"
+
+#, c-format
+msgid "could not revert %s... %s"
+msgstr "подаването „%s“… не може да бъде отменено: „%s“"
+
+#, c-format
+msgid "could not apply %s... %s"
+msgstr "подаването „%s“… не може да бъде приложено: „%s“"
+
+#, c-format
+msgid "dropping %s %s -- patch contents already upstream\n"
+msgstr "прескачане на %s %s — кръпката вече е приложена\n"
+
+#, c-format
+msgid "git %s: failed to read the index"
+msgstr "git %s: неуспешно изчитане на индекса"
+
+#, c-format
+msgid "git %s: failed to refresh the index"
+msgstr "git %s: неуспешно обновяване на индекса"
+
+#, c-format
+msgid "%s does not accept arguments: '%s'"
+msgstr "„%s“ не приема аргументи: „%s“"
+
+#, c-format
+msgid "missing arguments for %s"
+msgstr "„%s“ изисква аргументи"
+
+#, c-format
+msgid "could not parse '%s'"
+msgstr "„%s“ не може да се анализира"
+
+#, c-format
+msgid "invalid line %d: %.*s"
+msgstr "неправилен ред %d: %.*s"
+
+#, c-format
+msgid "cannot '%s' without a previous commit"
+msgstr "Без предишно подаване не може да се изпълни „%s“"
+
+msgid "cancelling a cherry picking in progress"
+msgstr "преустановяване на извършваното в момента отбиране на подавания"
+
+msgid "cancelling a revert in progress"
+msgstr "преустановяване на извършваното в момента отмяна на подаване"
+
+msgid "please fix this using 'git rebase --edit-todo'."
+msgstr "коригирайте това чрез „git rebase --edit-todo“."
+
+#, c-format
+msgid "unusable instruction sheet: '%s'"
+msgstr "неизползваем файл с описание на предстоящите действия: „%s“"
+
+msgid "no commits parsed."
+msgstr "никое от подаванията не може да се разпознае."
+
+msgid "cannot cherry-pick during a revert."
+msgstr ""
+"по време на отмяна на подаване не може да се извърши отбиране на подаване."
+
+msgid "cannot revert during a cherry-pick."
+msgstr "по време на отбиране не може да се извърши отмяна на подаване."
+
+msgid "unusable squash-onto"
+msgstr "подаването, в което другите да се вкарат, не може да се използва"
+
+#, c-format
+msgid "malformed options sheet: '%s'"
+msgstr "неправилен файл с опции: „%s“"
+
+msgid "empty commit set passed"
+msgstr "зададено е празно множество от подавания"
+
+msgid "revert is already in progress"
+msgstr "в момента вече се извършва отмяна на подавания"
+
+#, c-format
+msgid "try \"git revert (--continue | %s--abort | --quit)\""
+msgstr "използвайте „git revert (--continue | %s--abort | --quit)“"
+
+msgid "cherry-pick is already in progress"
+msgstr "в момента вече се извършва отбиране на подавания"
+
+#, c-format
+msgid "try \"git cherry-pick (--continue | %s--abort | --quit)\""
+msgstr "използвайте „git cherry-pick (--continue | %s--abort | --quit)“"
+
+#, c-format
+msgid "could not create sequencer directory '%s'"
+msgstr ""
+"директорията за определянето на последователността „%s“ не може да бъде "
+"създадена"
+
+msgid "could not lock HEAD"
+msgstr "указателят „HEAD“ не може да се заключи"
+
+msgid "no cherry-pick or revert in progress"
+msgstr ""
+"в момента не се извършва отбиране на подавания или пребазиране на клона"
+
+msgid "cannot resolve HEAD"
+msgstr "Подаването сочено от указателя „HEAD“ не може да бъде открито"
+
+msgid "cannot abort from a branch yet to be born"
+msgstr ""
+"действието не може да бъде преустановено, когато сте на клон, който тепърва "
+"предстои да бъде създаден"
+
+#, c-format
+msgid "cannot read '%s': %s"
+msgstr "„%s“ не може да бъде прочетен: %s"
+
+msgid "unexpected end of file"
+msgstr "неочакван край на файл"
+
+#, c-format
+msgid "stored pre-cherry-pick HEAD file '%s' is corrupt"
+msgstr ""
+"запазеният преди започването на отбирането файл за указателя „HEAD“ — „%s“ е "
+"повреден"
+
+msgid "You seem to have moved HEAD. Not rewinding, check your HEAD!"
+msgstr ""
+"Изглежда указателят „HEAD“ е променен.  Проверете към какво сочи.\n"
+"Не се правят промѐни."
+
+msgid "no revert in progress"
+msgstr "в момента не тече пребазиране"
+
+msgid "no cherry-pick in progress"
+msgstr "в момента не се извършва отбиране на подавания"
+
+msgid "failed to skip the commit"
+msgstr "неуспешно прескачане на подаването"
+
+msgid "there is nothing to skip"
+msgstr "няма какво да се прескочи"
+
+#, c-format
+msgid ""
+"have you committed already?\n"
+"try \"git %s --continue\""
+msgstr ""
+"подали ли сте вече?  Пробвайте с:\n"
+"\n"
+"    git %s --continue"
+
+msgid "cannot read HEAD"
+msgstr "указателят „HEAD“ не може да бъде прочетен"
+
+#, c-format
+msgid "unable to copy '%s' to '%s'"
+msgstr "„%s“ не може да се копира като „%s“"
+
+#, c-format
+msgid ""
+"You can amend the commit now, with\n"
+"\n"
+"  git commit --amend %s\n"
+"\n"
+"Once you are satisfied with your changes, run\n"
+"\n"
+"  git rebase --continue\n"
+msgstr ""
+"Може да променѝте подаването с командата:\n"
+"\n"
+"    git commit --amend %s\n"
+"\n"
+"След като привършите, продължете с командата:\n"
+"\n"
+"    git rebase --continue\n"
+
+#, c-format
+msgid "Could not apply %s... %.*s"
+msgstr "Подаването „%s“… не може да бъде приложено: „%.*s“"
+
+#, c-format
+msgid "Could not merge %.*s"
+msgstr "Невъзможно сливане на „%.*s“"
+
+#, c-format
+msgid "Executing: %s\n"
+msgstr "В момента се изпълнява: %s\n"
+
+#, c-format
+msgid ""
+"execution failed: %s\n"
+"%sYou can fix the problem, and then run\n"
+"\n"
+"  git rebase --continue\n"
+"\n"
+msgstr ""
+"неуспешно изпълнение: %s\n"
+"%sМоже да коригирате проблема, след което изпълнете:\n"
+"\n"
+"    git rebase --continue\n"
+"\n"
+
+msgid "and made changes to the index and/or the working tree\n"
+msgstr "и променѝ индекса и/или работното дърво\n"
+
+#, c-format
+msgid ""
+"execution succeeded: %s\n"
+"but left changes to the index and/or the working tree\n"
+"Commit or stash your changes, and then run\n"
+"\n"
+"  git rebase --continue\n"
+"\n"
+msgstr ""
+"Успешно изпълнение: %s\n"
+"Остават още промѐни в индекса или работното дърво.\n"
+"Трябва да ги подадете или скатаете и след това изпълнете:\n"
+"\n"
+"    git rebase --continue\n"
+"\n"
+
+#, c-format
+msgid "illegal label name: '%.*s'"
+msgstr "неправилно име на етикет: „%.*s“"
+
+msgid "writing fake root commit"
+msgstr "запазване на фалшиво начално подаване"
+
+msgid "writing squash-onto"
+msgstr "запазване на подаването, в което другите да се вкарат"
+
+#, c-format
+msgid "could not resolve '%s'"
+msgstr "„%s“ не може да бъде открит"
+
+msgid "cannot merge without a current revision"
+msgstr "без текущо подаване не може да се слива"
+
+#, c-format
+msgid "unable to parse '%.*s'"
+msgstr "„%.*s“ не може да се анализира"
+
+#, c-format
+msgid "nothing to merge: '%.*s'"
+msgstr "няма нищо за сливане: „%.*s“"
+
+msgid "octopus merge cannot be executed on top of a [new root]"
+msgstr "върху начално подаване не може да се извърши множествено сливане"
+
+#, c-format
+msgid "could not get commit message of '%s'"
+msgstr "съобщението за подаване към „%s“ не може да бъде получено"
+
+#, c-format
+msgid "could not even attempt to merge '%.*s'"
+msgstr "сливането на „%.*s“ не може даже да започне"
+
+msgid "merge: Unable to write new index file"
+msgstr "сливане: новият индекс не може да бъде запазен"
+
+msgid "Cannot autostash"
+msgstr "Не може да се скатае автоматично"
+
+#, c-format
+msgid "Unexpected stash response: '%s'"
+msgstr "Неочакван резултат при скатаване: „%s“"
+
+#, c-format
+msgid "Could not create directory for '%s'"
+msgstr "Директорията за „%s“ не може да бъде създадена"
+
+#, c-format
+msgid "Created autostash: %s\n"
+msgstr "Автоматично скатано: „%s“\n"
+
+msgid "could not reset --hard"
+msgstr "неуспешно изпълнение на „git reset --hard“"
+
+#, c-format
+msgid "Applied autostash.\n"
+msgstr "Автоматично скатаното е приложено.\n"
+
+#, c-format
+msgid "cannot store %s"
+msgstr "„%s“ не може да бъде запазен"
+
+#, c-format
+msgid ""
+"%s\n"
+"Your changes are safe in the stash.\n"
+"You can run \"git stash pop\" or \"git stash drop\" at any time.\n"
+msgstr ""
+"%s\n"
+"Промѐните ви са надеждно скатани.  Може да пробвате да ги приложите чрез\n"
+"„git stash pop“ или да ги изхвърлите чрез „git stash drop“, когато "
+"поискате.\n"
+
+msgid "Applying autostash resulted in conflicts."
+msgstr "Конфликти при прилагането на автоматично скатаното."
+
+msgid "Autostash exists; creating a new stash entry."
+msgstr "Вече има запис за автоматично скатано, затова се създава нов запис."
+
+msgid "could not detach HEAD"
+msgstr "указателят „HEAD“ не може да се отдели"
+
+#, c-format
+msgid "Stopped at HEAD\n"
+msgstr "Бе спряно при „HEAD“\n"
+
+#, c-format
+msgid "Stopped at %s\n"
+msgstr "Бе спряно при „%s“\n"
+
+#, c-format
+msgid ""
+"Could not execute the todo command\n"
+"\n"
+"    %.*s\n"
+"It has been rescheduled; To edit the command before continuing, please\n"
+"edit the todo list first:\n"
+"\n"
+"    git rebase --edit-todo\n"
+"    git rebase --continue\n"
+msgstr ""
+"Следната запланувана команда не може да бъде изпълнена:\n"
+"\n"
+"    %.*s\n"
+"\n"
+"Тя е запланувана за по-късно.  За да редактирате командата преди "
+"изпълнение,\n"
+"редактирайте списъка за изпълнение:\n"
+"\n"
+"    git rebase --edit-todo\n"
+"    git rebase --continue\n"
+
+#, c-format
+msgid "Rebasing (%d/%d)%s"
+msgstr "Пребазиране (%d/%d)%s"
+
+#, c-format
+msgid "Stopped at %s...  %.*s\n"
+msgstr "Спиране при „%s“…  %.*s\n"
+
+#, c-format
+msgid "unknown command %d"
+msgstr "непозната команда %d"
+
+msgid "could not read orig-head"
+msgstr "указателят за „orig-head“ не може да се прочете"
+
+msgid "could not read 'onto'"
+msgstr "указателят за „onto“ не може да се прочете"
+
+#, c-format
+msgid "could not update HEAD to %s"
+msgstr "„HEAD“ не може да бъде обновен до „%s“"
+
+#, c-format
+msgid "Successfully rebased and updated %s.\n"
+msgstr "Успешно пребазиране и обновяване на „%s“.\n"
+
+msgid "cannot rebase: You have unstaged changes."
+msgstr "не може да пребазирате, защото има промѐни, които не са в индекса."
+
+msgid "cannot amend non-existing commit"
+msgstr "несъществуващо подаване не може да се поправи"
+
+#, c-format
+msgid "invalid file: '%s'"
+msgstr "неправилен файл: „%s“"
+
+#, c-format
+msgid "invalid contents: '%s'"
+msgstr "неправилно съдържание: „%s“"
+
+msgid ""
+"\n"
+"You have uncommitted changes in your working tree. Please, commit them\n"
+"first and then run 'git rebase --continue' again."
+msgstr ""
+"\n"
+"В работното дърво има неподадени промѐни.  Първо ги подайте, а след това\n"
+"отново изпълнете „git rebase --continue“."
+
+#, c-format
+msgid "could not write file: '%s'"
+msgstr "файлът „%s“ не може да бъде записан"
+
+msgid "could not remove CHERRY_PICK_HEAD"
+msgstr "указателят „CHERRY_PICK_HEAD“ не може да бъде изтрит"
+
+msgid "could not commit staged changes."
+msgstr "промѐните в индекса не може да бъдат подадени."
+
+#, c-format
+msgid "%s: can't cherry-pick a %s"
+msgstr "%s: не може да се отбере „%s“"
+
+#, c-format
+msgid "%s: bad revision"
+msgstr "%s: неправилна версия"
+
+msgid "can't revert as initial commit"
+msgstr "първоначалното подаване не може да бъде отменено"
+
+#, c-format
+msgid "skipped previously applied commit %s"
+msgstr "прескачане на вече приложеното подаване „%s“"
+
+msgid "use --reapply-cherry-picks to include skipped commits"
+msgstr ""
+"може да включите пропуснатите подавания с опцията „--reapply-cherry-picks“"
+
+msgid "make_script: unhandled options"
+msgstr "make_script: неподдържани опции"
+
+msgid "make_script: error preparing revisions"
+msgstr "make_script: грешка при подготовката на версии"
+
+msgid "nothing to do"
+msgstr "няма какво да се прави"
+
+msgid "could not skip unnecessary pick commands"
+msgstr "излишните команди за отбиране не бяха прескочени"
+
+msgid "the script was already rearranged."
+msgstr "скриптът вече е преподреден."
+
+#, c-format
+msgid "'%s' is outside repository at '%s'"
+msgstr "„%s“ е извън хранилището при „%s“"
+
+#, c-format
+msgid ""
+"%s: no such path in the working tree.\n"
+"Use 'git <command> -- <path>...' to specify paths that do not exist locally."
+msgstr ""
+"%s: в това работно дърво няма такъв път.\n"
+"За да указвате пътища, които локално не съществуват, използвайте:\n"
+"\n"
+"    git КОМАНДА -- ПЪТ…"
+
+#, c-format
+msgid ""
+"ambiguous argument '%s': unknown revision or path not in the working tree.\n"
+"Use '--' to separate paths from revisions, like this:\n"
+"'git <command> [<revision>...] -- [<file>...]'"
+msgstr ""
+"нееднозначен аргумент „%s: непозната версия или пътят не е част от работното "
+"дърво.\n"
+"Разделяйте пътищата от версиите с „--“, ето така:\n"
+"\n"
+"    git КОМАНДА [ВЕРСИЯ…] -- [ФАЙЛ…]"
+
+#, c-format
+msgid "option '%s' must come before non-option arguments"
+msgstr "опцията „%s“ трябва да е преди първия аргумент, който не е опция"
+
+#, c-format
+msgid ""
+"ambiguous argument '%s': both revision and filename\n"
+"Use '--' to separate paths from revisions, like this:\n"
+"'git <command> [<revision>...] -- [<file>...]'"
+msgstr ""
+"нееднозначен аргумент „%s“: както версия, така и път.\n"
+"Разделяйте пътищата от версиите с „--“, ето така:\n"
+"\n"
+"    git КОМАНДА [ВЕРСИЯ…] -- [ФАЙЛ…]"
+
+msgid "unable to set up work tree using invalid config"
+msgstr ""
+"не може да се зададе текуща работна директория при неправилни настройки"
+
+#, c-format
+msgid "Expected git repo version <= %d, found %d"
+msgstr "Очаква се версия на хранилището на git <= %d, а не %d"
+
+msgid "unknown repository extension found:"
+msgid_plural "unknown repository extensions found:"
+msgstr[0] "открито е непознато разширение в хранилището:"
+msgstr[1] "открити са непознати разширения в хранилището:"
+
+msgid "repo version is 0, but v1-only extension found:"
+msgid_plural "repo version is 0, but v1-only extensions found:"
+msgstr[0] "версията на хранилището е 0, но е открито разширение за версия 1:"
+msgstr[1] "версията на хранилището е 0, но са открити разширения за версия 1:"
+
+#, c-format
+msgid "error opening '%s'"
+msgstr "„%s“ не може да се отвори"
+
+#, c-format
+msgid "too large to be a .git file: '%s'"
+msgstr "прекалено голям файл „.git“: „%s“"
+
+#, c-format
+msgid "error reading %s"
+msgstr "грешка при прочитане на „%s“"
+
+#, c-format
+msgid "invalid gitfile format: %s"
+msgstr "неправилен формат на gitfile: %s"
+
+#, c-format
+msgid "no path in gitfile: %s"
+msgstr "липсва път в gitfile: „%s“"
+
+#, c-format
+msgid "not a git repository: %s"
+msgstr "не е хранилище на Git: %s"
+
+#, c-format
+msgid "'$%s' too big"
+msgstr "„%s“ е прекалено голям"
+
+#, c-format
+msgid "not a git repository: '%s'"
+msgstr "не е хранилище на git: „%s“"
+
+#, c-format
+msgid "cannot chdir to '%s'"
+msgstr "не може да се влезе в директорията „%s“"
+
+msgid "cannot come back to cwd"
+msgstr "процесът не може да се върне към предишната работна директория"
+
+#, c-format
+msgid "failed to stat '%*s%s%s'"
+msgstr "не може да бъде получена информация чрез „stat“ за „%*s%s%s“"
+
+msgid "Unable to read current working directory"
+msgstr "Текущата работна директория не може да бъде прочетена"
+
+#, c-format
+msgid "cannot change to '%s'"
+msgstr "не може да се влезе в директорията „%s“"
+
+#, c-format
+msgid "not a git repository (or any of the parent directories): %s"
+msgstr ""
+"нито тази, нито която и да е от по-горните директории, не е хранилище на "
+"git: %s"
+
+#, 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 ""
+"нито тази, нито която и да е от по-горните директории (до точката на "
+"монтиране „%s“), не е хранилище на git.\n"
+"Git работи в рамките на една файлова система, защото променливата на средата "
+"„GIT_DISCOVERY_ACROSS_FILESYSTEM“ не е зададена."
+
+#, c-format
+msgid ""
+"unsafe repository ('%s' is owned by someone else)\n"
+"To add an exception for this directory, call:\n"
+"\n"
+"\tgit config --global --add safe.directory %s"
+msgstr ""
+"хранилището не е безопасно („%s“ се притежава от някой друг)\n"
+"За да зададете изключение за тази директория, изпълнете:\n"
+"\n"
+"    git config --global --add safe.directory %s"
+
+#, c-format
+msgid ""
+"problem with core.sharedRepository filemode value (0%.3o).\n"
+"The owner of files must always have read and write permissions."
+msgstr ""
+"зададеният в „core.sharedRepository“ режим за достъп до файлове е неправилен "
+"(0%.3o).\n"
+"Собственикът на файла трябва да има права за писане и четене."
+
+msgid "fork failed"
+msgstr "неуспешно създаване на процес чрез „fork“"
+
+msgid "setsid failed"
+msgstr "неуспешно изпълнение на „setsid“"
+
+#, c-format
+msgid "index entry is a directory, but not sparse (%08x)"
+msgstr "обектът в индекса е директория, но не частично изтеглена (%08x)"
+
+msgid "cannot use split index with a sparse index"
+msgstr "разделѐн индекс не може да се ползва частичен индекс"
+
+#. TRANSLATORS: IEC 80000-13:2008 gibibyte
+#, c-format
+msgid "%u.%2.2u GiB"
+msgstr "%u.%2.2u GiB"
+
+#. TRANSLATORS: IEC 80000-13:2008 gibibyte/second
+#, c-format
+msgid "%u.%2.2u GiB/s"
+msgstr "%u.%2.2u GiB/s"
+
+#. TRANSLATORS: IEC 80000-13:2008 mebibyte
+#, c-format
+msgid "%u.%2.2u MiB"
+msgstr "%u.%2.2u MiB"
+
+#. TRANSLATORS: IEC 80000-13:2008 mebibyte/second
+#, c-format
+msgid "%u.%2.2u MiB/s"
+msgstr "%u.%2.2u MiB/s"
+
+#. TRANSLATORS: IEC 80000-13:2008 kibibyte
+#, c-format
+msgid "%u.%2.2u KiB"
+msgstr "%u.%2.2u KiB"
+
+#. TRANSLATORS: IEC 80000-13:2008 kibibyte/second
+#, c-format
+msgid "%u.%2.2u KiB/s"
+msgstr "%u.%2.2u KiB/s"
+
+#. TRANSLATORS: IEC 80000-13:2008 byte
+#, c-format
+msgid "%u byte"
+msgid_plural "%u bytes"
+msgstr[0] "%u байт"
+msgstr[1] "%u байта"
+
+#. TRANSLATORS: IEC 80000-13:2008 byte/second
+#, c-format
+msgid "%u byte/s"
+msgid_plural "%u bytes/s"
+msgstr[0] "%u байт/сек."
+msgstr[1] "%u байта/сек."
+
+#, c-format
+msgid "could not edit '%s'"
+msgstr "„%s“ не може да се редактира"
+
+#, c-format
+msgid "ignoring suspicious submodule name: %s"
+msgstr "игнориране на подозрително име на подмодул: „%s“"
+
+msgid "negative values not allowed for submodule.fetchJobs"
+msgstr "настройката „submodule.fetchJobs“ не приема отрицателни стойности"
+
+#, c-format
+msgid "ignoring '%s' which may be interpreted as a command-line option: %s"
+msgstr ""
+"„%s“ се прескача, защото е възможно да се тълкува като опция за командния "
+"ред: %s"
+
+#, c-format
+msgid "Could not update .gitmodules entry %s"
+msgstr "Записът „%s“ във файла „.gitmodules“ не може да бъде променен"
+
+msgid "Cannot change unmerged .gitmodules, resolve merge conflicts first"
+msgstr ""
+"Неслетите файлове „.gitmodules“ не може да бъдат променяни.  Първо "
+"коригирайте конфликтите"
+
+#, c-format
+msgid "Could not find section in .gitmodules where path=%s"
+msgstr "Във файла „.gitmodules“ липсва раздел за директория „path=%s“"
+
+#, c-format
+msgid "Could not remove .gitmodules entry for %s"
+msgstr "Записът „%s“ във файла „.gitmodules“ не може да бъде изтрит"
+
+msgid "staging updated .gitmodules failed"
+msgstr "неуспешно добавяне на променения файл „.gitmodules“ в индекса"
+
+#, c-format
+msgid "in unpopulated submodule '%s'"
+msgstr "в неподготвения подмодул „%s“"
+
+#, c-format
+msgid "Pathspec '%s' is in submodule '%.*s'"
+msgstr "Пътят „%s“ е в подмодула „%.*s“"
+
+#, c-format
+msgid "bad --ignore-submodules argument: %s"
+msgstr "неправилен аргумент за „--ignore-submodules“: „%s“"
+
+#, c-format
+msgid ""
+"Submodule in commit %s at path: '%s' collides with a submodule named the "
+"same. Skipping it."
+msgstr ""
+"Подмодулът при подаване %s на пътя „%s“ е различен от другия модул със "
+"същото име, затова първият се прескача."
+
+#, c-format
+msgid "submodule entry '%s' (%s) is a %s, not a commit"
+msgstr "записът за подмодула „%s“ (%s) е %s, а не подаване!"
+
+#, c-format
+msgid ""
+"Could not run 'git rev-list <commits> --not --remotes -n 1' command in "
+"submodule %s"
+msgstr ""
+"Командата „git rev-list ПОДАВАНИЯ --not --remotes -n 1“ не може да се "
+"изпълни в подмодула „%s“"
+
+#, c-format
+msgid "process for submodule '%s' failed"
+msgstr "процесът за подмодула „%s“ завърши неуспешно"
+
+#, c-format
+msgid "Pushing submodule '%s'\n"
+msgstr "Изтласкване на подмодула „%s“\n"
+
+#, c-format
+msgid "Unable to push submodule '%s'\n"
+msgstr "Подмодулът „%s“ не може да бъде изтласкан\n"
+
+#, c-format
+msgid "Fetching submodule %s%s\n"
+msgstr "Доставяне на подмодула „%s%s“\n"
+
+#, c-format
+msgid "Could not access submodule '%s'\n"
+msgstr "Подмодулът „%s“ не може да бъде достъпен\n"
+
+#, c-format
+msgid "Could not access submodule '%s' at commit %s\n"
+msgstr "Подмодулът „%s“ не може да бъде достъпен при подаване %s\n"
+
+#, c-format
+msgid "Fetching submodule %s%s at commit %s\n"
+msgstr "Доставяне на подмодула „%s%s“ при подаване %s\n"
+
+#, c-format
+msgid ""
+"Errors during submodule fetch:\n"
+"%s"
+msgstr ""
+"Грешки при доставяне на подмодул:\n"
+"%s"
+
+#, c-format
+msgid "'%s' not recognized as a git repository"
+msgstr "„%s“ не е хранилище на git"
+
+#, c-format
+msgid "Could not run 'git status --porcelain=2' in submodule %s"
+msgstr ""
+"Командата „git status --porcelain=2“ не може да се изпълни в подмодула „%s“"
+
+#, c-format
+msgid "'git status --porcelain=2' failed in submodule %s"
+msgstr ""
+"командата „git status --porcelain=2“ не може да се изпълни в подмодула „%s“"
+
+#, c-format
+msgid "could not start 'git status' in submodule '%s'"
+msgstr "командата „git status“ не може да се изпълни в подмодула „%s“"
+
+#, c-format
+msgid "could not run 'git status' in submodule '%s'"
+msgstr "командата „git status“ не може да се изпълни в подмодула „%s“"
+
+#, c-format
+msgid "Could not unset core.worktree setting in submodule '%s'"
+msgstr "Настройката „core.worktree“ не може да се изтрие в подмодула „%s“"
+
+#, c-format
+msgid "could not recurse into submodule '%s'"
+msgstr "неуспешна обработка на поддиректориите в подмодула „%s“"
+
+msgid "could not reset submodule index"
+msgstr "неуспешно зануляване на индекса на подмодула"
+
+#, c-format
+msgid "submodule '%s' has dirty index"
+msgstr "индексът на подмодула „%s“ не е чист"
+
+#, c-format
+msgid "Submodule '%s' could not be updated."
+msgstr "Подмодулът „%s“ не може да се обнови."
+
+#, c-format
+msgid "submodule git dir '%s' is inside git dir '%.*s'"
+msgstr "„%s“ (директория на подмодул) е в директорията на git: „%.*s“"
+
+#, c-format
+msgid ""
+"relocate_gitdir for submodule '%s' with more than one worktree not supported"
+msgstr ""
+"не се поддържа „relocate_gitdir“ за подмодула „%s“, който има повече от едно "
+"работно дърво"
+
+#, c-format
+msgid "could not lookup name for submodule '%s'"
+msgstr "името на подмодула „%s“ не може да бъде намерено"
+
+#, c-format
+msgid "refusing to move '%s' into an existing git dir"
+msgstr "„%s“ не може да се премести в съществуваща директория на git"
+
+#, c-format
+msgid ""
+"Migrating git directory of '%s%s' from\n"
+"'%s' to\n"
+"'%s'\n"
+msgstr ""
+"Мигриране на директорията на git — „%s%s“ от:\n"
+"„%s“ към\n"
+"„%s“\n"
+
+msgid "could not start ls-files in .."
+msgstr "„ls-stat“ не може да се стартира в „..“"
+
+#, c-format
+msgid "ls-tree returned unexpected return code %d"
+msgstr "„ls-tree“ завърши с неочакван изходен код: %d"
+
+#, c-format
+msgid "failed to lstat '%s'"
+msgstr "не може да бъде получена информация чрез „lstat“ за „%s“"
+
+msgid "unhandled options"
+msgstr "неподдържани опции"
+
+msgid "error preparing revisions"
+msgstr "грешка при подготовката на версии"
+
+#, c-format
+msgid "commit %s is not marked reachable"
+msgstr "подаването „%s“ не е отбелязано като достижимо"
+
+msgid "too many commits marked reachable"
+msgstr "прекалено много подавания са отбелязани като достижими"
+
+msgid "test-tool serve-v2 [<options>]"
+msgstr "test-tool serve-v2 [ОПЦИЯ…]"
+
+msgid "exit immediately after advertising capabilities"
+msgstr "изход след първоначалната обява на възможностите"
+
+msgid "test-helper simple-ipc is-active    [<name>] [<options>]"
+msgstr "test-helper simple-ipc is-active    [ИМЕ] [ОПЦИЯ…]"
+
+msgid "test-helper simple-ipc run-daemon   [<name>] [<threads>]"
+msgstr "test-helper simple-ipc run-daemon   [ИМЕ] [НИШКИ]"
+
+msgid "test-helper simple-ipc start-daemon [<name>] [<threads>] [<max-wait>]"
+msgstr "test-helper simple-ipc start-daemon [ИМЕ] [НИШКИ] [ИЗЧАКВАНЕ]"
+
+msgid "test-helper simple-ipc stop-daemon  [<name>] [<max-wait>]"
+msgstr "test-helper simple-ipc stop-daemon  [ИМЕ] [ИЗЧАКВАНЕ]"
+
+msgid "test-helper simple-ipc send         [<name>] [<token>]"
+msgstr "test-helper simple-ipc send         [ИМЕ] [ЛЕКСЕМА]"
+
+msgid "test-helper simple-ipc sendbytes    [<name>] [<bytecount>] [<byte>]"
+msgstr "test-helper simple-ipc sendbytes    [ИМЕ] [БРОЙ_БАЙТОВЕ] [РАЗМЕР]"
+
+msgid ""
+"test-helper simple-ipc multiple     [<name>] [<threads>] [<bytecount>] "
+"[<batchsize>]"
+msgstr ""
+"test-helper simple-ipc multiple     [ИМЕ] [НИШКИ] [БРОЙ_БАЙТОВЕ] "
+"[РАЗМЕР_НА_ПАКЕТА]"
+
+msgid "name or pathname of unix domain socket"
+msgstr "име или път за гнездото на Unix"
+
+msgid "named-pipe name"
+msgstr "име на именован канал"
+
+msgid "number of threads in server thread pool"
+msgstr "брой нишки в запаса нишки"
+
+msgid "seconds to wait for daemon to start or stop"
+msgstr "секунди изчакване на демона да стартира или спре"
+
+msgid "number of bytes"
+msgstr "брой байтове"
+
+msgid "number of requests per thread"
+msgstr "брой заявки на нишка"
+
+msgid "byte"
+msgstr "байта"
+
+msgid "ballast character"
+msgstr "знаци за пращане"
+
+msgid "token"
+msgstr "лексема"
+
+msgid "command token to send to the server"
+msgstr "командна лексема за пращане"
+
+#, c-format
+msgid "running trailer command '%s' failed"
+msgstr "неуспешно изпълнение на завършващата команда „%s“"
+
+#, c-format
+msgid "unknown value '%s' for key '%s'"
+msgstr "непозната стойност „%s“ за настройката „%s“"
+
+#, c-format
+msgid "empty trailer token in trailer '%.*s'"
+msgstr "празна завършваща лексема в епилога „%.*s“"
+
+#, c-format
+msgid "could not read input file '%s'"
+msgstr "входният файл „%s“ не може да бъде прочетен"
+
+#, c-format
+msgid "could not stat %s"
+msgstr "Не може да се получи информация чрез „stat“ за „%s“"
+
+#, c-format
+msgid "file %s is not a regular file"
+msgstr "„%s“ не е обикновен файл"
+
+#, c-format
+msgid "file %s is not writable by user"
+msgstr "„%s“: няма права за записване на файла"
+
+msgid "could not open temporary file"
+msgstr "временният файл не може да се отвори"
+
+#, c-format
+msgid "could not rename temporary file to %s"
+msgstr "временният файл не може да се преименува на „%s“"
+
+msgid "full write to remote helper failed"
+msgstr "неуспешен пълен запис към насрещната помощна програма"
+
+#, c-format
+msgid "unable to find remote helper for '%s'"
+msgstr "насрещната помощна програма за „%s“ не може да бъде открита"
+
+msgid "can't dup helper output fd"
+msgstr ""
+"файловият дескриптор от насрещната помощна програма не може да се дублира с "
+"„dup“"
+
+#, c-format
+msgid ""
+"unknown mandatory capability %s; this remote helper probably needs newer "
+"version of Git"
+msgstr ""
+"непозната задължителна способност „%s“.  Насрещната помощна програма "
+"вероятно изисква нова версия на Git"
+
+msgid "this remote helper should implement refspec capability"
+msgstr ""
+"насрещната помощна програма трябва да поддържа способност за изброяване на "
+"указатели"
+
+#, c-format
+msgid "%s unexpectedly said: '%s'"
+msgstr "„%s“ неочаквано върна: „%s“"
+
+#, c-format
+msgid "%s also locked %s"
+msgstr "„%s“ заключи и „%s“"
+
+msgid "couldn't run fast-import"
+msgstr "неуспешно изпълнение на бързо внасяне"
+
+msgid "error while running fast-import"
+msgstr "грешка при изпълнението на бързо внасяне"
+
+#, c-format
+msgid "could not read ref %s"
+msgstr "указателят „%s“ не може да се прочете"
+
+#, c-format
+msgid "unknown response to connect: %s"
+msgstr "неочакван отговор при свързване: „%s“"
+
+msgid "setting remote service path not supported by protocol"
+msgstr "протоколът не поддържа задаването на път на отдалечената услуга"
+
+msgid "invalid remote service path"
+msgstr "неправилен път на отдалечената услуга"
+
+msgid "operation not supported by protocol"
+msgstr "опцията не се поддържа от протокола"
+
+#, c-format
+msgid "can't connect to subservice %s"
+msgstr "неуспешно свързване към подуслугата „%s“"
+
+msgid "--negotiate-only requires protocol v2"
+msgstr "опцията „--negotiate-only“ изисква версия 2 на протокола"
+
+msgid "'option' without a matching 'ok/error' directive"
+msgstr "опция без съответстваща директива за успех или грешка"
+
+#, c-format
+msgid "expected ok/error, helper said '%s'"
+msgstr ""
+"очаква се или успех, или грешка, но насрещната помощна програма върна „%s“"
+
+#, c-format
+msgid "helper reported unexpected status of %s"
+msgstr "насрещната помощна програма завърши с неочакван изходен код: „%s“"
+
+#, c-format
+msgid "helper %s does not support dry-run"
+msgstr "насрещната помощна програма „%s“ не поддържа проби „dry-run“"
+
+#, c-format
+msgid "helper %s does not support --signed"
+msgstr "насрещната помощна програма „%s“ не поддържа опцията „--signed“"
+
+#, c-format
+msgid "helper %s does not support --signed=if-asked"
+msgstr ""
+"насрещната помощна програма „%s“ не поддържа опцията „--signed=if-asked“"
+
+#, c-format
+msgid "helper %s does not support --atomic"
+msgstr "насрещната помощна програма „%s“ не поддържа опцията „--atomic“"
+
+#, c-format
+msgid "helper %s does not support --%s"
+msgstr "насрещната помощна програма „%s“ не поддържа опцията „%s“"
+
+#, c-format
+msgid "helper %s does not support 'push-option'"
+msgstr "насрещната помощна програма „%s“ не поддържа опции за изтласкване"
+
+msgid "remote-helper doesn't support push; refspec needed"
+msgstr ""
+"насрещната помощна програма не поддържа изтласкване.  Необходимо е "
+"изброяване на указателите"
+
+#, c-format
+msgid "helper %s does not support 'force'"
+msgstr "насрещната помощна програма „%s“ не поддържа опцията „--force“"
+
+msgid "couldn't run fast-export"
+msgstr "не може да се извърши бързо изнасяне"
+
+msgid "error while running fast-export"
+msgstr "грешка при изпълнението на командата за бързо изнасяне"
+
+#, c-format
+msgid ""
+"No refs in common and none specified; doing nothing.\n"
+"Perhaps you should specify a branch.\n"
+msgstr ""
+"Няма общи указатели, не са указани никакви указатели —\n"
+"нищо няма да бъде направено.  Пробвайте да укажете клон.\n"
+
+#, c-format
+msgid "unsupported object format '%s'"
+msgstr "обект с неподдържан формат „%s“"
+
+#, c-format
+msgid "malformed response in ref list: %s"
+msgstr "неправилен отговор в списъка с указатели: „%s“"
+
+#, c-format
+msgid "read(%s) failed"
+msgstr "неуспешно четене на „%s“"
+
+#, c-format
+msgid "write(%s) failed"
+msgstr "неуспешен запис в „%s“"
+
+#, c-format
+msgid "%s thread failed"
+msgstr "неуспешно изпълнение на нишката „%s“"
+
+#, c-format
+msgid "%s thread failed to join: %s"
+msgstr "завършването на нишката „%s“ не може да се изчака: „%s“"
+
+#, c-format
+msgid "can't start thread for copying data: %s"
+msgstr "неуспешно стартиране на нишка за копиране на данните: „%s“"
+
+#, c-format
+msgid "%s process failed to wait"
+msgstr "процесът на „%s“ не успя да изчака чрез „waitpid“"
+
+#, c-format
+msgid "%s process failed"
+msgstr "неуспешно изпълнение на „%s“"
+
+msgid "can't start thread for copying data"
+msgstr "неуспешно стартиране на нишка за копиране на данните"
+
+#, c-format
+msgid "Would set upstream of '%s' to '%s' of '%s'\n"
+msgstr "Клонът „%s“ ще следи „%s“ от „%s“\n"
+
+#, c-format
+msgid "could not read bundle '%s'"
+msgstr "пратката на git „%s“ не може да бъде прочетена"
+
+#, c-format
+msgid "transport: invalid depth option '%s'"
+msgstr "transport: неправилна опция за дълбочина: %s"
+
+msgid "see protocol.version in 'git help config' for more details"
+msgstr ""
+"За повече информация вижте раздела „protocol.version“ в „git help config“"
+
+msgid "server options require protocol version 2 or later"
+msgstr "опциите на сървъра изискват поне версия 2 на протокола"
+
+msgid "server does not support wait-for-done"
+msgstr "сървърът не поддържа „wait-for-done“"
+
+msgid "could not parse transport.color.* config"
+msgstr "стойността на настройката „transport.color.*“ не може да се разпознае"
+
+msgid "support for protocol v2 not implemented yet"
+msgstr "протокол версия 2 все още не се поддържа"
+
+#, c-format
+msgid "unknown value for config '%s': %s"
+msgstr "непозната стойност за настройката „%s“: „%s“"
+
+#, c-format
+msgid "transport '%s' not allowed"
+msgstr "преносът по „%s“ не е позволен"
+
+msgid "git-over-rsync is no longer supported"
+msgstr "командата „git-over-rsync“ вече не се поддържа"
+
+#, c-format
+msgid ""
+"The following submodule paths contain changes that can\n"
+"not be found on any remote:\n"
+msgstr ""
+"Следните пътища за подмодули съдържат промѐни,\n"
+"които липсват от всички отдалечени хранилища:\n"
+
+#, c-format
+msgid ""
+"\n"
+"Please try\n"
+"\n"
+"\tgit push --recurse-submodules=on-demand\n"
+"\n"
+"or cd to the path and use\n"
+"\n"
+"\tgit push\n"
+"\n"
+"to push them to a remote.\n"
+"\n"
+msgstr ""
+"\n"
+"Пробвайте да ги изтласкате чрез командата:\n"
+"\n"
+"    git push --recurse-submodules=on-demand\n"
+"\n"
+"или отидете в съответната директория и изпълнете:\n"
+"\n"
+"    git push\n"
+"\n"
+
+msgid "Aborting."
+msgstr "Преустановяване на действието."
+
+msgid "failed to push all needed submodules"
+msgstr "неуспешно изтласкване на всички необходими подмодули"
+
+msgid "too-short tree object"
+msgstr "прекалено кратък обект-дърво"
+
+msgid "malformed mode in tree entry"
+msgstr "неправилни права за достъп в запис в дърво"
+
+msgid "empty filename in tree entry"
+msgstr "празно име на файл в запис в дърво"
+
+msgid "too-short tree file"
+msgstr "прекалено кратък файл-дърво"
+
+#, c-format
+msgid ""
+"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 ""
+"Изтеглянето ще презапише локалните промѐни на тези файлове:\n"
+"%%sПодайте или скатайте промѐните, за да преминете към нов клон."
+
+#, c-format
+msgid ""
+"Your local changes to the following files would be overwritten by checkout:\n"
+"%%s"
+msgstr ""
+"Изтеглянето ще презапише локалните промѐни на тези файлове:\n"
+"%%s"
+
+#, c-format
+msgid ""
+"Your local changes to the following files would be overwritten by merge:\n"
+"%%sPlease commit your changes or stash them before you merge."
+msgstr ""
+"Сливането ще презапише локалните промѐни на тези файлове:\n"
+"%%sПодайте или скатайте промѐните, за да слеете."
+
+#, c-format
+msgid ""
+"Your local changes to the following files would be overwritten by merge:\n"
+"%%s"
+msgstr ""
+"Сливането ще презапише локалните промѐни на тези файлове:\n"
+"%%s"
+
+#, c-format
+msgid ""
+"Your local changes to the following files would be overwritten by %s:\n"
+"%%sPlease commit your changes or stash them before you %s."
+msgstr ""
+"„%s“ ще презапише локалните промѐни на тези файлове:\n"
+"%%sПодайте или скатайте промѐните, за да извършите „%s“."
+
+#, c-format
+msgid ""
+"Your local changes to the following files would be overwritten by %s:\n"
+"%%s"
+msgstr ""
+"„%s“ ще презапише локалните промѐни на тези файлове:\n"
+"%%s"
+
+#, c-format
+msgid ""
+"Updating the following directories would lose untracked files in them:\n"
+"%s"
+msgstr ""
+"Обновяването на следните директории ще изтрие неследените файлове в тях:\n"
+"%s"
+
+#, c-format
+msgid ""
+"Refusing to remove the current working directory:\n"
+"%s"
+msgstr ""
+"Текущата работна директория няма да бъде изтрита:\n"
+"%s"
+
+#, c-format
+msgid ""
+"The following untracked working tree files would be removed by checkout:\n"
+"%%sPlease move or remove them before you switch branches."
+msgstr ""
+"Изтеглянето ще изтрие тези неследени файлове в работното дърво:\n"
+"%%sПреместете ги или ги изтрийте, за да преминете на друг клон."
+
+#, c-format
+msgid ""
+"The following untracked working tree files would be removed by checkout:\n"
+"%%s"
+msgstr ""
+"Изтеглянето ще изтрие тези неследени файлове в работното дърво:\n"
+"%%s"
+
+#, c-format
+msgid ""
+"The following untracked working tree files would be removed by merge:\n"
+"%%sPlease move or remove them before you merge."
+msgstr ""
+"Сливането ще изтрие тези неследени файлове в работното дърво:\n"
+"%%sПреместете ги или ги изтрийте, за да слеете."
+
+#, c-format
+msgid ""
+"The following untracked working tree files would be removed by merge:\n"
+"%%s"
+msgstr ""
+"Сливането ще изтрие тези неследени файлове в работното дърво:\n"
+"%%s"
+
+#, c-format
+msgid ""
+"The following untracked working tree files would be removed by %s:\n"
+"%%sPlease move or remove them before you %s."
+msgstr ""
+"„%s“ ще изтрие тези неследени файлове в работното дърво:\n"
+"%%sПреместете ги или ги изтрийте, за да извършите „%s“."
+
+#, c-format
+msgid ""
+"The following untracked working tree files would be removed by %s:\n"
+"%%s"
+msgstr ""
+"„%s“ ще изтрие тези неследени файлове в работното дърво:\n"
+"%%s"
+
+#, c-format
+msgid ""
+"The following untracked working tree files would be overwritten by "
+"checkout:\n"
+"%%sPlease move or remove them before you switch branches."
+msgstr ""
+"Изтеглянето ще презапише тези неследени файлове в работното дърво:\n"
+"%%sПреместете ги или ги изтрийте, за да смените клон."
+
+#, c-format
+msgid ""
+"The following untracked working tree files would be overwritten by "
+"checkout:\n"
+"%%s"
+msgstr ""
+"Изтеглянето ще презапише тези неследени файлове в работното дърво:\n"
+"%%s"
+
+#, c-format
+msgid ""
+"The following untracked working tree files would be overwritten by merge:\n"
+"%%sPlease move or remove them before you merge."
+msgstr ""
+"Сливането ще презапише тези неследени файлове в работното дърво:\n"
+"%%sПреместете ги или ги изтрийте, за да слеете."
+
+#, c-format
+msgid ""
+"The following untracked working tree files would be overwritten by merge:\n"
+"%%s"
+msgstr ""
+"Сливането ще презапише тези неследени файлове в работното дърво:\n"
+"%%s"
+
+#, c-format
+msgid ""
+"The following untracked working tree files would be overwritten by %s:\n"
+"%%sPlease move or remove them before you %s."
+msgstr ""
+"„%s“ ще презапише тези неследени файлове в работното дърво:\n"
+"%%sПреместете ги или ги изтрийте, за да извършите „%s“."
+
+#, c-format
+msgid ""
+"The following untracked working tree files would be overwritten by %s:\n"
+"%%s"
+msgstr ""
+"„%s“ ще презапише тези неследени файлове в работното дърво:\n"
+"%%s"
+
+#, c-format
+msgid "Entry '%s' overlaps with '%s'.  Cannot bind."
+msgstr "Записът за „%s“ съвпада с този за „%s“.  Не може да се присвои."
+
+#, c-format
+msgid ""
+"Cannot update submodule:\n"
+"%s"
+msgstr ""
+"Подмодулът не може да бъде обновен:\n"
+"„%s“"
+
+#, c-format
+msgid ""
+"The following paths are not up to date and were left despite sparse "
+"patterns:\n"
+"%s"
+msgstr ""
+"Следните пътища не обновени и са оставени въпреки шаблоните за частично "
+"изтегляне:\n"
+"%s"
+
+#, c-format
+msgid ""
+"The following paths are unmerged and were left despite sparse patterns:\n"
+"%s"
+msgstr ""
+"Следните пътища не са слети и са оставени въпреки шаблоните за частично "
+"изтегляне:\n"
+"%s"
+
+#, c-format
+msgid ""
+"The following paths were already present and thus not updated despite sparse "
+"patterns:\n"
+"%s"
+msgstr ""
+"Следните пътища вече съществуваха и са оставени въпреки шаблоните за "
+"частично изтегляне:\n"
+"%s"
+
+#, c-format
+msgid "Aborting\n"
+msgstr "Преустановяване на действието\n"
+
+#, c-format
+msgid ""
+"After fixing the above paths, you may want to run `git sparse-checkout "
+"reapply`.\n"
+msgstr ""
+"След корекцията на грешките в пътищата по-горе, вероятно ще трябва\n"
+"да изпълните командата:\n"
+"\n"
+"    git sparse-checkout reapply\n"
+
+msgid "Updating files"
+msgstr "Обновяване на файлове"
+
+msgid ""
+"the following paths have collided (e.g. case-sensitive paths\n"
+"on a case-insensitive filesystem) and only one from the same\n"
+"colliding group is in the working tree:\n"
+msgstr ""
+"следните пътища са в конфликт (напр. при разлика в регистъра\n"
+"във файлови системи, които не различават главни от малки букви)\n"
+"и само един от участниците в конфликта е в работното дърво:\n"
+
+msgid "Updating index flags"
+msgstr "Обновяване на флаговете на индекса"
+
+#, c-format
+msgid "worktree and untracked commit have duplicate entries: %s"
+msgstr ""
+"работното дърво и неследеното подаване съдържат повтарящи се обекти: %s"
+
+msgid "expected flush after fetch arguments"
+msgstr "след аргументите на „fetch“ се очаква изчистване на буферите"
+
+msgid "invalid URL scheme name or missing '://' suffix"
+msgstr "неправилна схема за адрес или суфиксът „://“ липсва"
+
+#, c-format
+msgid "invalid %XX escape sequence"
+msgstr "неправилна екранираща последователност „%XX“"
+
+msgid "missing host and scheme is not 'file:'"
+msgstr "не е указана машина, а схемата не е „file:“"
+
+msgid "a 'file:' URL may not have a port number"
+msgstr "при схема „file:“ не може да указвате номер на порт"
+
+msgid "invalid characters in host name"
+msgstr "неправилни знаци в името на машина"
+
+msgid "invalid port number"
+msgstr "неправилен номер на порт"
+
+msgid "invalid '..' path segment"
+msgstr "неправилна част от пътя „..“"
+
+msgid "Fetching objects"
+msgstr "Доставяне на обектите"
+
+#, c-format
+msgid "'%s' at main working tree is not the repository directory"
+msgstr "„%s“ в основното работно дърво не е директорията на хранилището"
+
+#, c-format
+msgid "'%s' file does not contain absolute path to the working tree location"
+msgstr ""
+"файлът „%s“ не съдържа абсолютния път към местоположението на работното дърво"
+
+#, c-format
+msgid "'%s' is not a .git file, error code %d"
+msgstr "„%s“ не е файл на .git, код за грешка: %d"
+
+#, c-format
+msgid "'%s' does not point back to '%s'"
+msgstr "„%s“ не сочи към обратно към „%s“"
+
+msgid "not a directory"
+msgstr "не е директория"
+
+msgid ".git is not a file"
+msgstr "„.git“ не е файл"
+
+msgid ".git file broken"
+msgstr "„.git“ е повреден"
+
+msgid ".git file incorrect"
+msgstr "„.git“ е неправилен"
+
+msgid "not a valid path"
+msgstr "неправилен път"
+
+msgid "unable to locate repository; .git is not a file"
+msgstr "не може да се открие хранилище: „.git“ не е файл"
+
+msgid "unable to locate repository; .git file does not reference a repository"
+msgstr "не може да се открие хранилище: файлът „.git“ не сочи към хранилище"
+
+msgid "unable to locate repository; .git file broken"
+msgstr "не може да се открие хранилище: „.git“ е повреден"
+
+msgid "gitdir unreadable"
+msgstr "директорията „gitdir“ не може да се прочете"
+
+msgid "gitdir incorrect"
+msgstr "неправилна директория „gitdir“"
+
+msgid "not a valid directory"
+msgstr "не е валидна директория"
+
+msgid "gitdir file does not exist"
+msgstr "файлът „gitdir“ не съществува"
+
+#, c-format
+msgid "unable to read gitdir file (%s)"
+msgstr "файлът „gitdir“ не може да бъде прочетен (%s)"
+
+#, c-format
+msgid "short read (expected %<PRIuMAX> bytes, read %<PRIuMAX>)"
+msgstr ""
+"изчитането върна по-малко байтове от очакваното (очаквани: %<PRIuMAX> байта, "
+"получени: %<PRIuMAX>)"
+
+msgid "invalid gitdir file"
+msgstr "неправилен файл „gitdir“"
+
+msgid "gitdir file points to non-existent location"
+msgstr "файлът „gitdir“ сочи несъществуващо местоположение"
+
+#, c-format
+msgid "unable to set %s in '%s'"
+msgstr "„%s“ не може да се зададе в „%s“"
+
+#, c-format
+msgid "unable to unset %s in '%s'"
+msgstr "„%s“ не може да се изчисти в „%s“"
+
+msgid "failed to set extensions.worktreeConfig setting"
+msgstr "неуспешно задаване на настройката „extensions.worktreeConfig“"
+
+#, c-format
+msgid "could not setenv '%s'"
+msgstr "променливата на средата „%s“ не може да се зададе чрез „setenv“"
+
+#, c-format
+msgid "unable to create '%s'"
+msgstr "пакетният файл „%s“ не може да бъде създаден"
+
+#, c-format
+msgid "could not open '%s' for reading and writing"
+msgstr "„%s“ не може да бъде отворен и за четене, и за запис"
+
+#, c-format
+msgid "unable to access '%s'"
+msgstr "няма достъп до „%s“"
+
+msgid "unable to get current working directory"
+msgstr "текущата работна директория е недостъпна"
+
+msgid "Unmerged paths:"
+msgstr "Неслети пътища:"
+
+msgid "  (use \"git restore --staged <file>...\" to unstage)"
+msgstr ""
+"  (използвайте „git restore --staged ФАЙЛ…“, за да извадите ФАЙЛа от индекса)"
+
+#, c-format
+msgid "  (use \"git restore --source=%s --staged <file>...\" to unstage)"
+msgstr ""
+"  (използвайте „git restore --source=%s --staged ФАЙЛ…“, за да извадите "
+"ФАЙЛа от индекса)"
+
+msgid "  (use \"git rm --cached <file>...\" to unstage)"
+msgstr ""
+"  (използвайте „git rm --cached %s ФАЙЛ…“, за да извадите ФАЙЛа от индекса)"
+
+msgid "  (use \"git add <file>...\" to mark resolution)"
+msgstr ""
+"  (използвайте „git add ФАЙЛ…“, за да укажете разрешаването на конфликта)"
+
+msgid "  (use \"git add/rm <file>...\" as appropriate to mark resolution)"
+msgstr ""
+"  (използвайте „git add/rm ФАЙЛ…“, според решението, което избирате за "
+"конфликта)"
+
+msgid "  (use \"git rm <file>...\" to mark resolution)"
+msgstr ""
+"  (използвайте „git rm ФАЙЛ…“, за да укажете разрешаването на конфликта)"
+
+msgid "Changes to be committed:"
+msgstr "Промѐни, които ще бъдат подадени:"
+
+msgid "Changes not staged for commit:"
+msgstr "Промѐни, които не са в индекса за подаване:"
+
+msgid "  (use \"git add <file>...\" to update what will be committed)"
+msgstr ""
+"  (използвайте „git add ФАЙЛ…“, за да обновите съдържанието за подаване)"
+
+msgid "  (use \"git add/rm <file>...\" to update what will be committed)"
+msgstr ""
+"  (използвайте „git add/rm ФАЙЛ…“, за да обновите съдържанието за подаване)"
+
+msgid ""
+"  (use \"git restore <file>...\" to discard changes in working directory)"
+msgstr ""
+"  (използвайте „git restore ФАЙЛ…“, за да отхвърлите промѐните в работната "
+"директория)"
+
+msgid "  (commit or discard the untracked or modified content in submodules)"
+msgstr ""
+"  (подайте или отхвърлете неследеното или промененото съдържание в "
+"подмодулите)"
+
+#, c-format
+msgid "  (use \"git %s <file>...\" to include in what will be committed)"
+msgstr ""
+"  (използвайте „git %s ФАЙЛ…“, за да определите какво включвате в подаването)"
+
+msgid "both deleted:"
+msgstr "изтрити в двата случая:"
+
+msgid "added by us:"
+msgstr "добавени от вас:"
+
+msgid "deleted by them:"
+msgstr "изтрити от тях:"
+
+msgid "added by them:"
+msgstr "добавени от тях:"
+
+msgid "deleted by us:"
+msgstr "изтрити от вас:"
+
+msgid "both added:"
+msgstr "добавени и в двата случая:"
+
+msgid "both modified:"
+msgstr "променени и в двата случая:"
+
+msgid "new file:"
+msgstr "нов файл:"
+
+msgid "copied:"
+msgstr "копиран:"
+
+msgid "deleted:"
+msgstr "изтрит:"
+
+msgid "modified:"
+msgstr "променен:"
+
+msgid "renamed:"
+msgstr "преименуван:"
+
+msgid "typechange:"
+msgstr "смяна на вида:"
+
+msgid "unknown:"
+msgstr "непозната промяна:"
+
+msgid "unmerged:"
+msgstr "неслят:"
+
+msgid "new commits, "
+msgstr "нови подавания, "
+
+msgid "modified content, "
+msgstr "променено съдържание, "
+
+msgid "untracked content, "
+msgstr "неследено съдържание, "
+
+#, c-format
+msgid "Your stash currently has %d entry"
+msgid_plural "Your stash currently has %d entries"
+msgstr[0] "Има %d скатаване."
+msgstr[1] "Има %d скатавания."
+
+msgid "Submodules changed but not updated:"
+msgstr "Подмодулите са променени, но не са обновени:"
+
+msgid "Submodule changes to be committed:"
+msgstr "Промѐни в подмодулите за подаване:"
+
+msgid ""
+"Do not modify or remove the line above.\n"
+"Everything below it will be ignored."
+msgstr ""
+"Не променяйте и не изтривайте горния ред.\n"
+"Всичко отдолу ще бъде изтрито."
+
+#, c-format
+msgid ""
+"\n"
+"It took %.2f seconds to compute the branch ahead/behind values.\n"
+"You can use '--no-ahead-behind' to avoid this.\n"
+msgstr ""
+"\n"
+"Изчисляването на броя различаващи се подавания отне %.2f сек.\n"
+"За да избегнете това, ползвайте „--no-ahead-behind“.\n"
+
+msgid "You have unmerged paths."
+msgstr "Някои пътища не са слети."
+
+msgid "  (fix conflicts and run \"git commit\")"
+msgstr "  (коригирайте конфликтите и изпълнете „git commit“)"
+
+msgid "  (use \"git merge --abort\" to abort the merge)"
+msgstr "  (използвайте „git merge --abort“, за да преустановите сливането)"
+
+msgid "All conflicts fixed but you are still merging."
+msgstr "Всички конфликти са решени, но продължавате сливането."
+
+msgid "  (use \"git commit\" to conclude merge)"
+msgstr "  (използвайте „git commit“, за да завършите сливането)"
+
+msgid "You are in the middle of an am session."
+msgstr "В момента прилагате поредица от кръпки чрез „git am“."
+
+msgid "The current patch is empty."
+msgstr "Текущата кръпка е празна."
+
+msgid "  (fix conflicts and then run \"git am --continue\")"
+msgstr "  (коригирайте конфликтите и изпълнете „git am --continue“)"
+
+msgid "  (use \"git am --skip\" to skip this patch)"
+msgstr "  (използвайте „git am --skip“, за да пропуснете тази кръпка)"
+
+msgid ""
+"  (use \"git am --allow-empty\" to record this patch as an empty commit)"
+msgstr ""
+"  (използвайте „git am --allow-empty“, за да включите кръпката като празно "
+"подаване)"
+
+msgid "  (use \"git am --abort\" to restore the original branch)"
+msgstr ""
+"  (използвайте „git am --abort“, за да възстановите първоначалния клон)"
+
+msgid "git-rebase-todo is missing."
+msgstr "„git-rebase-todo“ липсва."
+
+msgid "No commands done."
+msgstr "Не са изпълнени команди."
+
+#, c-format
+msgid "Last command done (%<PRIuMAX> command done):"
+msgid_plural "Last commands done (%<PRIuMAX> commands done):"
+msgstr[0] "Последно изпълнена команда (изпълнена е общо %<PRIuMAX> команда):"
+msgstr[1] "Последно изпълнени команди (изпълнени са общо %<PRIuMAX> команди):"
+
+#, c-format
+msgid "  (see more in file %s)"
+msgstr "  (повече информация има във файла „%s“)"
+
+msgid "No commands remaining."
+msgstr "Не остават повече команди."
+
+#, c-format
+msgid "Next command to do (%<PRIuMAX> remaining command):"
+msgid_plural "Next commands to do (%<PRIuMAX> remaining commands):"
+msgstr[0] "Следваща команда за изпълнение (остава още %<PRIuMAX> команда):"
+msgstr[1] "Следващи команди за изпълнение (остават още %<PRIuMAX> команди):"
+
+msgid "  (use \"git rebase --edit-todo\" to view and edit)"
+msgstr ""
+"  (използвайте „git rebase --edit-todo“, за да разгледате и редактирате)"
+
+#, c-format
+msgid "You are currently rebasing branch '%s' on '%s'."
+msgstr "В момента пребазирате клона „%s“ върху „%s“."
+
+msgid "You are currently rebasing."
+msgstr "В момента пребазирате."
+
+msgid "  (fix conflicts and then run \"git rebase --continue\")"
+msgstr "  (коригирайте конфликтите и използвайте „git rebase --continue“)"
+
+msgid "  (use \"git rebase --skip\" to skip this patch)"
+msgstr "  (използвайте „git rebase --skip“, за да пропуснете тази кръпка)"
+
+msgid "  (use \"git rebase --abort\" to check out the original branch)"
+msgstr ""
+"  (използвайте „git rebase --abort“, за да възстановите първоначалния клон)"
+
+msgid "  (all conflicts fixed: run \"git rebase --continue\")"
+msgstr "  (всички конфликти са коригирани: изпълнете „git rebase --continue“)"
+
+#, c-format
+msgid ""
+"You are currently splitting a commit while rebasing branch '%s' on '%s'."
+msgstr "В момента разделяте подаване докато пребазирате клона „%s“ върху „%s“."
+
+msgid "You are currently splitting a commit during a rebase."
+msgstr "В момента разделяте подаване докато пребазирате."
+
+msgid "  (Once your working directory is clean, run \"git rebase --continue\")"
+msgstr ""
+"  (След като работното ви дърво стане чисто, използвайте „git rebase --"
+"continue“)"
+
+#, c-format
+msgid "You are currently editing a commit while rebasing branch '%s' on '%s'."
+msgstr ""
+"В момента редактирате подаване докато пребазирате клона „%s“ върху „%s“."
+
+msgid "You are currently editing a commit during a rebase."
+msgstr "В момента редактирате подаване докато пребазирате."
+
+msgid "  (use \"git commit --amend\" to amend the current commit)"
+msgstr ""
+"  (използвайте „git commit --amend“, за да редактирате текущото подаване)"
+
+msgid ""
+"  (use \"git rebase --continue\" once you are satisfied with your changes)"
+msgstr ""
+"  (използвайте „git rebase --continue“, след като завършите промѐните си)"
+
+msgid "Cherry-pick currently in progress."
+msgstr "В момента се извършва отбиране на подавания."
+
+#, c-format
+msgid "You are currently cherry-picking commit %s."
+msgstr "В момента отбирате подаването „%s“."
+
+msgid "  (fix conflicts and run \"git cherry-pick --continue\")"
+msgstr "  (коригирайте конфликтите и изпълнете „git cherry-pick --continue“)"
+
+msgid "  (run \"git cherry-pick --continue\" to continue)"
+msgstr "  (за да продължите, изпълнете „git cherry-pick --continue“)"
+
+msgid "  (all conflicts fixed: run \"git cherry-pick --continue\")"
+msgstr ""
+"  (всички конфликти са коригирани, изпълнете „git cherry-pick --continue“)"
+
+msgid "  (use \"git cherry-pick --skip\" to skip this patch)"
+msgstr "  (използвайте „git cherry-pick --skip“, за да пропуснете тази кръпка)"
+
+msgid "  (use \"git cherry-pick --abort\" to cancel the cherry-pick operation)"
+msgstr ""
+"  (използвайте „git cherry-pick --abort“, за да отмените всички действия с "
+"отбиране)"
+
+msgid "Revert currently in progress."
+msgstr "В момента тече отмяна на подаване."
+
+#, c-format
+msgid "You are currently reverting commit %s."
+msgstr "В момента отменяте подаване „%s“."
+
+msgid "  (fix conflicts and run \"git revert --continue\")"
+msgstr "  (коригирайте конфликтите и изпълнете „git revert --continue“)"
+
+msgid "  (run \"git revert --continue\" to continue)"
+msgstr "  (за да продължите, изпълнете „git revert --continue“)"
+
+msgid "  (all conflicts fixed: run \"git revert --continue\")"
+msgstr "  (всички конфликти са коригирани, изпълнете „git revert --continue“)"
+
+msgid "  (use \"git revert --skip\" to skip this patch)"
+msgstr "  (използвайте „git revert --skip“, за да пропуснете тази кръпка)"
+
+msgid "  (use \"git revert --abort\" to cancel the revert operation)"
+msgstr ""
+"  (използвайте „git revert --abort“, за да преустановите отмяната на "
+"подаване)"
+
+#, c-format
+msgid "You are currently bisecting, started from branch '%s'."
+msgstr "В момента търсите двоично, като сте стартирали от клон „%s“."
+
+msgid "You are currently bisecting."
+msgstr "В момента търсите двоично."
+
+msgid "  (use \"git bisect reset\" to get back to the original branch)"
+msgstr ""
+"  (използвайте „git bisect reset“, за да се върнете към първоначалното "
+"състояние и клон)"
+
+msgid "You are in a sparse checkout."
+msgstr "Вие сте в частично изтегляне."
+
+#, c-format
+msgid "You are in a sparse checkout with %d%% of tracked files present."
+msgstr ""
+"Намирате се в частично изтеглено хранилище с %d%% налични, следени файла."
+
+msgid "On branch "
+msgstr "На клон "
+
+msgid "interactive rebase in progress; onto "
+msgstr "извършвате интерактивно пребазиране върху "
+
+msgid "rebase in progress; onto "
+msgstr "извършвате пребазиране върху "
+
+msgid "HEAD detached at "
+msgstr "Указателят „HEAD“ не е свързан и е при "
+
+msgid "HEAD detached from "
+msgstr "Указателят „HEAD“ не е свързан и е отделѐн от "
+
+msgid "Not currently on any branch."
+msgstr "Извън всички клони."
+
+msgid "Initial commit"
+msgstr "Първоначално подаване"
+
+msgid "No commits yet"
+msgstr "Все още липсват подавания"
+
+msgid "Untracked files"
+msgstr "Неследени файлове"
+
+msgid "Ignored files"
+msgstr "Игнорирани файлове"
+
+#, c-format
+msgid ""
+"It took %.2f seconds to enumerate untracked files. 'status -uno'\n"
+"may speed it up, but you have to be careful not to forget to add\n"
+"new files yourself (see 'git help status')."
+msgstr ""
+"Бяха необходими %.2f секунди за изброяването на неследените файлове.\n"
+"Добавянето на опцията „-uno“ към командата „git status“ ще ускори\n"
+"изпълнението, но ще трябва да добавяте новите файлове ръчно.\n"
+"За повече подробности погледнете „git status help“."
+
+#, c-format
+msgid "Untracked files not listed%s"
+msgstr "Неследените файлове не са изведени%s"
+
+msgid " (use -u option to show untracked files)"
+msgstr " (използвайте опцията „-u“, за да изведете неследените файлове)"
+
+msgid "No changes"
+msgstr "Няма промѐни"
+
+#, c-format
+msgid "no changes added to commit (use \"git add\" and/or \"git commit -a\")\n"
+msgstr ""
+"към индекса за подаване не са добавени промѐни (използвайте „git add“ и/или "
+"„git commit -a“)\n"
+
+#, c-format
+msgid "no changes added to commit\n"
+msgstr "към индекса за подаване не са добавени промѐни\n"
+
+#, c-format
+msgid ""
+"nothing added to commit but untracked files present (use \"git add\" to "
+"track)\n"
+msgstr ""
+"към индекса за подаване не са добавени промѐни, но има нови файлове "
+"(използвайте „git add“, за да започне тяхното следене)\n"
+
+#, c-format
+msgid "nothing added to commit but untracked files present\n"
+msgstr "към индекса за подаване не са добавени промѐни, но има нови файлове\n"
+
+#, c-format
+msgid "nothing to commit (create/copy files and use \"git add\" to track)\n"
+msgstr ""
+"липсват каквито и да е промѐни (създайте или копирайте файлове и използвайте "
+"„git add“, за да започне тяхното следене)\n"
+
+#, c-format
+msgid "nothing to commit\n"
+msgstr "липсват каквито и да е промѐни\n"
+
+#, c-format
+msgid "nothing to commit (use -u to show untracked files)\n"
+msgstr ""
+"липсват каквито и да е промѐни (използвайте опцията „-u“, за да се изведат и "
+"неследените файлове)\n"
+
+#, c-format
+msgid "nothing to commit, working tree clean\n"
+msgstr "липсват каквито и да е промѐни, работното дърво е чисто\n"
+
+msgid "No commits yet on "
+msgstr "Все още липсват подавания в "
+
+msgid "HEAD (no branch)"
+msgstr "HEAD (извън клон)"
+
+msgid "different"
+msgstr "различен"
+
+msgid "behind "
+msgstr "назад с "
+
+msgid "ahead "
+msgstr "напред с "
+
+#. TRANSLATORS: the action is e.g. "pull with rebase"
+#, c-format
+msgid "cannot %s: You have unstaged changes."
+msgstr "не може да извършите „%s“, защото има промѐни, които не са в индекса."
+
+msgid "additionally, your index contains uncommitted changes."
+msgstr "освен това в индекса има неподадени промѐни."
+
+#, c-format
+msgid "cannot %s: Your index contains uncommitted changes."
+msgstr "не може да извършите „%s“, защото в индекса има неподадени промѐни."
+
 msgid ""
 "Error: Your local changes to the following files would be overwritten by "
 "merge"
-msgstr "Грешка: Сливането ще презапише локалните промени на тези файлове:"
+msgstr "Грешка: Сливането ще презапише локалните промѐни на тези файлове:"
 
-#: git-merge-octopus.sh:61
 msgid "Automated merge did not work."
 msgstr "Автоматичното сливане не сработи."
 
-#: git-merge-octopus.sh:62
 msgid "Should not be doing an octopus."
 msgstr "Не трябва да се прави множествено сливане."
 
-#: git-merge-octopus.sh:73
 #, sh-format
 msgid "Unable to find common commit with $pretty_name"
 msgstr "Не може да се открие общо подаване с „$pretty_name“"
 
-#: git-merge-octopus.sh:77
 #, sh-format
 msgid "Already up to date with $pretty_name"
 msgstr "Вече е обновено до „$pretty_name“"
 
-#: git-merge-octopus.sh:89
 #, sh-format
 msgid "Fast-forwarding to: $pretty_name"
 msgstr "Превъртане до „$pretty_name“"
 
-#: git-merge-octopus.sh:97
 #, sh-format
 msgid "Trying simple merge with $pretty_name"
 msgstr "Опит за просто сливане с „$pretty_name“"
 
-#: git-merge-octopus.sh:102
 msgid "Simple merge did not work, trying automatic merge."
 msgstr "Простото сливане не сработи, пробва се автоматично сливане."
 
-#: git-submodule.sh:401
-#, sh-format
-msgid "Unable to find current revision in submodule path '$displaypath'"
-msgstr "Текущата версия за подмодула в „${displaypath}“ липсва"
-
-#: git-submodule.sh:411
-#, sh-format
-msgid "Unable to fetch in submodule path '$sm_path'"
-msgstr "Неуспешно доставяне в пътя към подмодул „${sm_path}“"
-
-#: git-submodule.sh:416
-#, sh-format
-msgid ""
-"Unable to find current ${remote_name}/${branch} revision in submodule path "
-"'$sm_path'"
-msgstr ""
-"Текущата версия „${remote_name}/${branch}“ в пътя към подмодул „${sm_path}“ "
-"липсва"
-
-#: git-submodule.sh:464
-#, sh-format
-msgid "Failed to recurse into submodule path '$displaypath'"
-msgstr ""
-"Неуспешна обработка на поддиректориите в пътя към подмодул „${displaypath}“"
-
-#: git-sh-setup.sh:89 git-sh-setup.sh:94
 #, sh-format
 msgid "usage: $dashless $USAGE"
 msgstr "Употреба: $dashless $USAGE"
 
-#: git-sh-setup.sh:183
 #, sh-format
 msgid "Cannot chdir to $cdup, the toplevel of the working tree"
 msgstr ""
 "Не може да се премине към „$cdup“ — основната директория на работното дърво."
 
-#: git-sh-setup.sh:192 git-sh-setup.sh:199
 #, sh-format
 msgid "fatal: $program_name cannot be used without a working tree."
 msgstr ""
 "ФАТАЛНА ГРЕШКА: „$program_name“ не може да се ползва без работно дърво."
 
-#: git-sh-setup.sh:213
 msgid "Cannot rewrite branches: You have unstaged changes."
 msgstr ""
-"Не може да презапишете клоните, защото има промени, които не са в индекса."
+"Не може да презапишете клоните, защото има промѐни, които не са в индекса."
 
-#: git-sh-setup.sh:216
 #, sh-format
 msgid "Cannot $action: You have unstaged changes."
 msgstr ""
-"Не може да изпълните „$action“, защото има промени, които не са в индекса."
+"Не може да изпълните „$action“, защото има промѐни, които не са в индекса."
 
-#: git-sh-setup.sh:227
 #, sh-format
 msgid "Cannot $action: Your index contains uncommitted changes."
 msgstr ""
-"Не може да изпълните „$action“, защото в индекса има неподадени промени."
+"Не може да изпълните „$action“, защото в индекса има неподадени промѐни."
 
-#: git-sh-setup.sh:229
 msgid "Additionally, your index contains uncommitted changes."
-msgstr "Освен това в индекса има неподадени промени."
+msgstr "Освен това в индекса има неподадени промѐни."
 
-#: git-sh-setup.sh:349
 msgid "You need to run this command from the toplevel of the working tree."
 msgstr ""
 "Тази команда трябва да се изпълни от основната директория на работното дърво"
 
-#: git-sh-setup.sh:354
 msgid "Unable to determine absolute path of git directory"
 msgstr "Абсолютният път на работното дърво не може да се определи"
 
 #. TRANSLATORS: you can adjust this to align "git add -i" status menu
-#: git-add--interactive.perl:212
 #, perl-format
 msgid "%12s %12s %s"
 msgstr "%14s %14s %s"
 
-#: git-add--interactive.perl:632
 #, perl-format
 msgid "touched %d path\n"
 msgid_plural "touched %d paths\n"
 msgstr[0] "%d файл засегнат\n"
 msgstr[1] "%d файла засегнати\n"
 
-#: git-add--interactive.perl:1056
 msgid ""
 "If the patch applies cleanly, the edited hunk will immediately be\n"
 "marked for staging."
@@ -26467,7 +22025,6 @@ msgstr ""
 "незабавно\n"
 "добавено към индекса"
 
-#: git-add--interactive.perl:1059
 msgid ""
 "If the patch applies cleanly, the edited hunk will immediately be\n"
 "marked for stashing."
@@ -26476,7 +22033,6 @@ msgstr ""
 "незабавно\n"
 "скътано"
 
-#: git-add--interactive.perl:1062
 msgid ""
 "If the patch applies cleanly, the edited hunk will immediately be\n"
 "marked for unstaging."
@@ -26485,8 +22041,6 @@ msgstr ""
 "незабавно\n"
 "извадено от индекса."
 
-#: git-add--interactive.perl:1065 git-add--interactive.perl:1074
-#: git-add--interactive.perl:1080
 msgid ""
 "If the patch applies cleanly, the edited hunk will immediately be\n"
 "marked for applying."
@@ -26495,8 +22049,6 @@ msgstr ""
 "незабавно\n"
 "набелязано за прилагане."
 
-#: git-add--interactive.perl:1068 git-add--interactive.perl:1071
-#: git-add--interactive.perl:1077
 msgid ""
 "If the patch applies cleanly, the edited hunk will immediately be\n"
 "marked for discarding."
@@ -26505,12 +22057,10 @@ msgstr ""
 "незабавно\n"
 "набелязано за зануляване."
 
-#: git-add--interactive.perl:1114
 #, perl-format
 msgid "failed to open hunk edit file for writing: %s"
 msgstr "файлът за редактиране на парчето код не може да бъде отворен: „%s“"
 
-#: git-add--interactive.perl:1121
 #, perl-format
 msgid ""
 "---\n"
@@ -26524,13 +22074,11 @@ msgstr ""
 "За да пропуснете редовете започващи с „%s“ — изтрийте ги.\n"
 "Редовете, които започват с „%s“ ще бъдат пропуснати.\n"
 
-#: git-add--interactive.perl:1143
 #, perl-format
 msgid "failed to open hunk edit file for reading: %s"
 msgstr ""
 "файлът за редактиране на парчето код не може да бъде отворен за четене: „%s“"
 
-#: git-add--interactive.perl:1253
 msgid ""
 "y - stage this hunk\n"
 "n - do not stage this hunk\n"
@@ -26544,7 +22092,6 @@ msgstr ""
 "a — добавяне на това и всички следващи парчета от файла в индекса\n"
 "d — без добавяне на това и всички следващи парчета от файла в индекса"
 
-#: git-add--interactive.perl:1259
 msgid ""
 "y - stash this hunk\n"
 "n - do not stash this hunk\n"
@@ -26558,7 +22105,6 @@ msgstr ""
 "a — скатаване на това и всички следващи парчета от файла\n"
 "d — без скатаване на това и всички следващи парчета от файла"
 
-#: git-add--interactive.perl:1265
 msgid ""
 "y - unstage this hunk\n"
 "n - do not unstage this hunk\n"
@@ -26572,7 +22118,6 @@ msgstr ""
 "a — изваждане на това и всички следващи парчета от файла от индекса\n"
 "d — без изваждане на това и всички следващи парчета от файла от индекса"
 
-#: git-add--interactive.perl:1271
 msgid ""
 "y - apply this hunk to index\n"
 "n - do not apply this hunk to index\n"
@@ -26586,7 +22131,6 @@ msgstr ""
 "a — прилагане на това и всички следващи парчета от файла към индекса\n"
 "d — без прилагане на това и всички следващи парчета от файла към индекса"
 
-#: git-add--interactive.perl:1277 git-add--interactive.perl:1295
 msgid ""
 "y - discard this hunk from worktree\n"
 "n - do not discard this hunk from worktree\n"
@@ -26603,7 +22147,6 @@ msgstr ""
 "d — без премахване на това и всички следващи парчета от файла от работното "
 "дърво"
 
-#: git-add--interactive.perl:1283
 msgid ""
 "y - discard this hunk from index and worktree\n"
 "n - do not discard this hunk from index and worktree\n"
@@ -26620,7 +22163,6 @@ msgstr ""
 "d — без премахване на това и всички следващи парчета от файла от индекса и "
 "работното дърво"
 
-#: git-add--interactive.perl:1289
 msgid ""
 "y - apply this hunk to index and worktree\n"
 "n - do not apply this hunk to index and worktree\n"
@@ -26637,7 +22179,6 @@ msgstr ""
 "d — без прилагане на това и всички следващи парчета от файла от индекса и "
 "работното дърво"
 
-#: git-add--interactive.perl:1301
 msgid ""
 "y - apply this hunk to worktree\n"
 "n - do not apply this hunk to worktree\n"
@@ -26651,7 +22192,6 @@ msgstr ""
 "a — прилагане на това и всички следващи парчета от файла\n"
 "d — без прилагане на това и всички следващи парчета от файла"
 
-#: git-add--interactive.perl:1316
 msgid ""
 "g - select a hunk to go to\n"
 "/ - search for a hunk matching the given regex\n"
@@ -26673,92 +22213,74 @@ msgstr ""
 "e — ръчно редактиране на текущото парче\n"
 "? — извеждане не помощта\n"
 
-#: git-add--interactive.perl:1347
 msgid "The selected hunks do not apply to the index!\n"
 msgstr "Избраните парчета не може да се добавят в индекса!\n"
 
-#: git-add--interactive.perl:1362
 #, perl-format
 msgid "ignoring unmerged: %s\n"
 msgstr "пренебрегване на неслятото: „%s“\n"
 
-#: git-add--interactive.perl:1481
 #, perl-format
 msgid "Apply mode change to worktree [y,n,q,a,d%s,?]? "
 msgstr ""
 "Прилагане на промяната в правата за достъп към работното дърво [y,n,q,a,d"
 "%s,?]? "
 
-#: git-add--interactive.perl:1482
 #, perl-format
 msgid "Apply deletion to worktree [y,n,q,a,d%s,?]? "
 msgstr "Прилагане на изтриването към работното дърво [y,n,q,a,d%s,?]? "
 
-#: git-add--interactive.perl:1483
 #, perl-format
 msgid "Apply addition to worktree [y,n,q,a,d%s,?]? "
 msgstr "Прилагане на добавянето към работното дърво [y,n,q,a,d%s,?]? "
 
-#: git-add--interactive.perl:1484
 #, perl-format
 msgid "Apply this hunk to worktree [y,n,q,a,d%s,?]? "
 msgstr "Прилагане на парчето към работното дърво [y,n,q,a,d%s,?]? "
 
-#: git-add--interactive.perl:1601
 msgid "No other hunks to goto\n"
 msgstr "Няма други парчета\n"
 
-#: git-add--interactive.perl:1619
 #, perl-format
 msgid "Invalid number: '%s'\n"
 msgstr "Неправилен номер: „%s“\n"
 
-#: git-add--interactive.perl:1624
 #, perl-format
 msgid "Sorry, only %d hunk available.\n"
 msgid_plural "Sorry, only %d hunks available.\n"
 msgstr[0] "Има само %d парче.\n"
 msgstr[1] "Има само %d парчета.\n"
 
-#: git-add--interactive.perl:1659
 msgid "No other hunks to search\n"
 msgstr "Няма други парчета за търсене\n"
 
-#: git-add--interactive.perl:1676
 #, perl-format
 msgid "Malformed search regexp %s: %s\n"
 msgstr "Сгрешен регулярен израз „%s“: %s\n"
 
-#: git-add--interactive.perl:1686
 msgid "No hunk matches the given pattern\n"
 msgstr "Никое парче не напасва на регулярния израз\n"
 
-#: git-add--interactive.perl:1698 git-add--interactive.perl:1720
 msgid "No previous hunk\n"
 msgstr "Няма друго парче преди това\n"
 
-#: git-add--interactive.perl:1707 git-add--interactive.perl:1726
 msgid "No next hunk\n"
 msgstr "Няма друго парче след това\n"
 
-#: git-add--interactive.perl:1732
 msgid "Sorry, cannot split this hunk\n"
 msgstr "Това парче не може да бъде разделено\n"
 
-#: git-add--interactive.perl:1738
 #, perl-format
 msgid "Split into %d hunk.\n"
 msgid_plural "Split into %d hunks.\n"
 msgstr[0] "Разделяне на %d парче.\n"
 msgstr[1] "Разделяне на %d парчета.\n"
 
-#: git-add--interactive.perl:1748
 msgid "Sorry, cannot edit this hunk\n"
 msgstr "Това парче не може да бъде редактирано\n"
 
 #. TRANSLATORS: please do not translate the command names
 #. 'status', 'update', 'revert', etc.
-#: git-add--interactive.perl:1813
 msgid ""
 "status        - show paths with changes\n"
 "update        - add working tree state to the staged set of changes\n"
@@ -26768,70 +22290,56 @@ msgid ""
 "add untracked - add contents of untracked files to the staged set of "
 "changes\n"
 msgstr ""
-"status        — извеждане на пътищата с промените\n"
-"update        — добавяне на състоянието на работното дърво към промените в\n"
+"status        — извеждане на пътищата с промѐните\n"
+"update        — добавяне на състоянието на работното дърво към промѐните в\n"
 "                индекса\n"
-"revert        — отмяна на промените в индекса към състоянието сочено от "
+"revert        — отмяна на промѐните в индекса към състоянието сочено от "
 "„HEAD“\n"
 "patch         — избиране на парчета код и обновяване поединично\n"
 "diff          — извеждане на разликата между състоянието на соченото от "
 "„HEAD“\n"
 "                и индекса\n"
-"add untracked — добавяне на неследените файлове към промените в индекса\n"
+"add untracked — добавяне на неследените файлове към промѐните в индекса\n"
 
-#: git-add--interactive.perl:1830 git-add--interactive.perl:1842
-#: git-add--interactive.perl:1845 git-add--interactive.perl:1852
-#: git-add--interactive.perl:1855 git-add--interactive.perl:1862
-#: git-add--interactive.perl:1866 git-add--interactive.perl:1872
 msgid "missing --"
 msgstr "„--“ липсва"
 
-#: git-add--interactive.perl:1868
 #, perl-format
 msgid "unknown --patch mode: %s"
 msgstr "неизвестна стратегия за прилагане на кръпка към „--patch“: „%s“"
 
-#: git-add--interactive.perl:1874 git-add--interactive.perl:1880
 #, perl-format
 msgid "invalid argument %s, expecting --"
 msgstr "указан е неправилен аргумент „%s“, а се очаква „--“."
 
-#: git-send-email.perl:159
 msgid "local zone differs from GMT by a non-minute interval\n"
 msgstr ""
 "разликата между местния часови пояс и GMT съдържа дробна част от минута\n"
 "\n"
 
-#: git-send-email.perl:166 git-send-email.perl:172
 msgid "local time offset greater than or equal to 24 hours\n"
 msgstr "разликата между местния часовия пояс и GMT е 24 часа или повече\n"
 
-#: git-send-email.perl:244
 #, perl-format
 msgid "fatal: command '%s' died with exit code %d"
 msgstr "ФАТАЛНА ГРЕШКА: „%s“ не завърши успешно, а с код %d"
 
-#: git-send-email.perl:257
 msgid "the editor exited uncleanly, aborting everything"
 msgstr ""
 "текстовият редактор приключи работата с грешка, всичко се преустановява"
 
-#: git-send-email.perl:346
 #, perl-format
 msgid ""
 "'%s' contains an intermediate version of the email you were composing.\n"
 msgstr "„%s“ съдържа временна версия на подготвяното е-писмо.\n"
 
-#: git-send-email.perl:351
 #, perl-format
 msgid "'%s.final' contains the composed email.\n"
 msgstr "„%s.final“ съдържа подготвеното е-писмо.\n"
 
-#: git-send-email.perl:484
 msgid "--dump-aliases incompatible with other options\n"
 msgstr "опцията „--dump-aliases“ е несъвместима с другите опции\n"
 
-#: git-send-email.perl:561
 msgid ""
 "fatal: found configuration options for 'sendmail'\n"
 "git-send-email is configured with the sendemail.* options - note the 'e'.\n"
@@ -26842,11 +22350,9 @@ msgstr ""
 "забележете знака „e“.  За да изключите тази проверка, задайте\n"
 "настройката „sendemail.forbidSendmailVariables“ да е „false“ (лъжа̀).\n"
 
-#: git-send-email.perl:566 git-send-email.perl:782
 msgid "Cannot run git format-patch from outside a repository\n"
 msgstr "Командата „git format-patch“ не може да се изпълни извън хранилище\n"
 
-#: git-send-email.perl:569
 msgid ""
 "`batch-size` and `relogin` must be specified together (via command-line or "
 "configuration option)\n"
@@ -26854,40 +22360,33 @@ msgstr ""
 "„batch-size“ и „relogin“ трябва да се указват заедно (или чрез командния "
 "ред, или чрез настройките)\n"
 
-#: git-send-email.perl:582
 #, perl-format
 msgid "Unknown --suppress-cc field: '%s'\n"
 msgstr "Непознато поле за опцията „--suppress-cc“: „%s“\n"
 
-#: git-send-email.perl:613
 #, perl-format
 msgid "Unknown --confirm setting: '%s'\n"
 msgstr "Непозната стойност за „--confirm“: %s\n"
 
-#: git-send-email.perl:653
 #, perl-format
 msgid "warning: sendmail alias with quotes is not supported: %s\n"
 msgstr ""
 "ПРЕДУПРЕЖДЕНИЕ: псевдоними за sendmail съдържащи кавички („\"“) не се "
 "поддържат: %s\n"
 
-#: git-send-email.perl:655
 #, perl-format
 msgid "warning: `:include:` not supported: %s\n"
 msgstr "ПРЕДУПРЕЖДЕНИЕ: „:include:“ не се поддържа: %s\n"
 
-#: git-send-email.perl:657
 #, perl-format
 msgid "warning: `/file` or `|pipe` redirection not supported: %s\n"
 msgstr ""
 "ПРЕДУПРЕЖДЕНИЕ: пренасочвания „/file“ или „|pipe“ не се поддържат: %s\n"
 
-#: git-send-email.perl:662
 #, perl-format
 msgid "warning: sendmail line is not recognized: %s\n"
 msgstr "ПРЕДУПРЕЖДЕНИЕ: редът за „sendmail“ не е разпознат: %s\n"
 
-#: git-send-email.perl:747
 #, perl-format
 msgid ""
 "File '%s' exists but it could also be the range of commits\n"
@@ -26902,12 +22401,10 @@ msgstr ""
 "    ● укажете „./%s“ за файл;\n"
 "    ● използвате опцията „--format-patch“ за диапазон.\n"
 
-#: git-send-email.perl:768
 #, perl-format
 msgid "Failed to opendir %s: %s"
 msgstr "Директорията „%s“ не може да се отвори: %s"
 
-#: git-send-email.perl:803
 msgid ""
 "\n"
 "No patch files specified!\n"
@@ -26917,17 +22414,14 @@ msgstr ""
 "Не са указани кръпки!\n"
 "\n"
 
-#: git-send-email.perl:816
 #, perl-format
 msgid "No subject line in %s?"
 msgstr "В „%s“ липсва тема"
 
-#: git-send-email.perl:827
 #, perl-format
 msgid "Failed to open for writing %s: %s"
 msgstr "„%s“ не може да се отвори за запис: %s"
 
-#: git-send-email.perl:838
 msgid ""
 "Lines beginning in \"GIT:\" will be removed.\n"
 "Consider including an overall diffstat or table of contents\n"
@@ -26942,27 +22436,22 @@ msgstr ""
 "\n"
 "Изтрийте всичко, ако не искате да изпратите обобщаващо писмо.\n"
 
-#: git-send-email.perl:862
 #, perl-format
 msgid "Failed to open %s: %s"
 msgstr "„%s“ не може да се отвори: %s"
 
-#: git-send-email.perl:879
 #, perl-format
 msgid "Failed to open %s.final: %s"
 msgstr "„%s.final“ не може да се отвори: %s"
 
-#: git-send-email.perl:922
 msgid "Summary email is empty, skipping it\n"
 msgstr "Обобщаващото писмо е празно и се прескача\n"
 
 #. TRANSLATORS: please keep [y/N] as is.
-#: git-send-email.perl:971
 #, perl-format
 msgid "Are you sure you want to use <%s> [y/N]? "
 msgstr "Сигурни ли сте, че искате да ползвате „%s“ [y/N]? "
 
-#: git-send-email.perl:1026
 msgid ""
 "The following files are 8bit, but do not declare a Content-Transfer-"
 "Encoding.\n"
@@ -26970,11 +22459,9 @@ msgstr ""
 "Следните файлове са 8 битови, но не са с обявена заглавна част „Content-"
 "Transfer-Encoding“.\n"
 
-#: git-send-email.perl:1031
 msgid "Which 8bit encoding should I declare [UTF-8]? "
 msgstr "Кое 8 битово кодиране се ползва [стандартно: UTF-8]? "
 
-#: git-send-email.perl:1039
 #, perl-format
 msgid ""
 "Refusing to send because the patch\n"
@@ -26987,22 +22474,18 @@ msgstr ""
 "все още е с шаблонното заглавие „*** SUBJECT HERE ***“.  Ползвайте опцията\n"
 "„--force“, ако сте сигурни, че точно това искате да изпратите.\n"
 
-#: git-send-email.perl:1058
 msgid "To whom should the emails be sent (if anyone)?"
 msgstr "На кой да се пратят е-писмата (незадължително поле)"
 
-#: git-send-email.perl:1076
 #, perl-format
 msgid "fatal: alias '%s' expands to itself\n"
 msgstr "ФАТАЛНА ГРЕШКА: „%s“ е псевдоним на себе си\n"
 
-#: git-send-email.perl:1088
 msgid "Message-ID to be used as In-Reply-To for the first email (if any)? "
 msgstr ""
 "Идентификатор на съобщение „Message-ID“, което да се използва за обявяването "
 "на отговор „In-Reply-To“ (незадължително поле)"
 
-#: git-send-email.perl:1150 git-send-email.perl:1158
 #, perl-format
 msgid "error: unable to extract a valid address from: %s\n"
 msgstr "ГРЕШКА: не може да се извлече адрес от „%s“\n"
@@ -27010,18 +22493,15 @@ msgstr "ГРЕШКА: не може да се извлече адрес от „
 #. 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:1162
 msgid "What to do with this address? ([q]uit|[d]rop|[e]dit): "
 msgstr ""
 "Какво да се направи с този адрес? „q“ (спиране), „d“ (изтриване), "
 "„e“ (редактиране): "
 
-#: git-send-email.perl:1482
 #, perl-format
 msgid "CA path \"%s\" does not exist"
 msgstr "Пътят към сертификат „%s“ не съществува."
 
-#: git-send-email.perl:1565
 msgid ""
 "    The Cc list above has been expanded by additional\n"
 "    addresses found in the patch commit message. By default\n"
@@ -27049,132 +22529,106 @@ msgstr ""
 #. 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:1580
 msgid "Send this email? ([y]es|[n]o|[e]dit|[q]uit|[a]ll): "
 msgstr ""
 "Изпращане на е-писмото? „y“ (да), „n“ (не), „e“ (редактиране), „q“ (изход), "
 "„a“ (всичко): "
 
-#: git-send-email.perl:1583
 msgid "Send this email reply required"
 msgstr "Изискване на отговор към това е-писмо"
 
-#: git-send-email.perl:1617
 msgid "The required SMTP server is not properly defined."
 msgstr "Сървърът за SMTP не е настроен правилно."
 
-#: git-send-email.perl:1664
 #, perl-format
 msgid "Server does not support STARTTLS! %s"
 msgstr "Сървърът не поддържа „STARTTLS“! %s"
 
-#: git-send-email.perl:1669 git-send-email.perl:1673
 #, perl-format
 msgid "STARTTLS failed! %s"
 msgstr "Неуспешно изпълнение на STARTTLS! %s"
 
-#: git-send-email.perl:1682
 msgid "Unable to initialize SMTP properly. Check config and use --smtp-debug."
 msgstr ""
 "Подсистемата за SMTP не може да се инициализира.  Проверете настройките и "
 "използвайте опцията: „--smtp-debug“."
 
-#: git-send-email.perl:1700
 #, perl-format
 msgid "Failed to send %s\n"
 msgstr "„%s“ не може да бъде изпратен\n"
 
-#: git-send-email.perl:1703
 #, perl-format
 msgid "Dry-Sent %s\n"
 msgstr "Проба за изпращане на „%s“\n"
 
-#: git-send-email.perl:1703
 #, perl-format
 msgid "Sent %s\n"
 msgstr "Изпращане на „%s“\n"
 
-#: git-send-email.perl:1705
 msgid "Dry-OK. Log says:\n"
 msgstr "Успех при пробата.  От журнала:\n"
 
-#: git-send-email.perl:1705
 msgid "OK. Log says:\n"
 msgstr "Успех.  От журнала:\n"
 
-#: git-send-email.perl:1724
 msgid "Result: "
 msgstr "Резултат: "
 
-#: git-send-email.perl:1727
 msgid "Result: OK\n"
 msgstr "Резултат: успех\n"
 
-#: git-send-email.perl:1744
 #, perl-format
 msgid "can't open file %s"
 msgstr "файлът „%s“ не може да бъде отворен"
 
-#: git-send-email.perl:1792 git-send-email.perl:1812
 #, perl-format
 msgid "(mbox) Adding cc: %s from line '%s'\n"
 msgstr "(mbox) Добавяне на „як: %s“ от ред „%s“\n"
 
-#: git-send-email.perl:1798
 #, perl-format
 msgid "(mbox) Adding to: %s from line '%s'\n"
 msgstr "(mbox) Добавяне на „до: %s“ от ред „%s“\n"
 
-#: git-send-email.perl:1855
 #, perl-format
 msgid "(non-mbox) Adding cc: %s from line '%s'\n"
 msgstr "(не-mbox) Добавяне на „як: %s“ от ред „%s“\n"
 
-#: git-send-email.perl:1890
 #, perl-format
 msgid "(body) Adding cc: %s from line '%s'\n"
 msgstr "(тяло) Добавяне на „як: %s“ от ред „%s“\n"
 
-#: git-send-email.perl:2009
 #, perl-format
 msgid "(%s) Could not execute '%s'"
 msgstr "(%s) Не може да бъде се изпълни „%s“"
 
-#: git-send-email.perl:2016
 #, perl-format
 msgid "(%s) Adding %s: %s from: '%s'\n"
 msgstr "(%s) Добавяне на „%s: %s“ от: „%s“\n"
 
-#: git-send-email.perl:2020
 #, perl-format
 msgid "(%s) failed to close pipe to '%s'"
 msgstr "(%s) програмният канал не може да се затвори за изпълнението на „%s“"
 
-#: git-send-email.perl:2050
 msgid "cannot send message as 7bit"
 msgstr "съобщението не може да се изпрати чрез 7 битови знаци"
 
-#: git-send-email.perl:2058
 msgid "invalid transfer encoding"
 msgstr "неправилно кодиране за пренос"
 
-#: git-send-email.perl:2095
 #, perl-format
 msgid ""
-"fatal: %s: rejected by sendemail-validate hook\n"
+"fatal: %s: rejected by %s hook\n"
 "%s\n"
 "warning: no patches were sent\n"
 msgstr ""
-"ФАТАЛНА ГРЕШКА: %s: отхвърлено от куката „sendemail-validate“\n"
+"ФАТАЛНА ГРЕШКА: %s: отхвърлено от куката „%s“\n"
 "%s\n"
 "ПРЕДУПРЕЖДЕНИЕ: не са пратени никакви кръпки\n"
 
-#: git-send-email.perl:2105 git-send-email.perl:2158 git-send-email.perl:2168
 #, perl-format
 msgid "unable to open %s: %s\n"
 msgstr "„%s“ не може да се отвори: %s\n"
 
-#: git-send-email.perl:2108
 #, perl-format
 msgid ""
 "fatal: %s:%d is longer than 998 characters\n"
@@ -27183,13 +22637,11 @@ msgstr ""
 "ФАТАЛНА ГРЕШКА: %s: %d е повече от 998 знака\n"
 "ПРЕДУПРЕЖДЕНИЕ: не са пратени никакви кръпки\n"
 
-#: git-send-email.perl:2126
 #, 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:2130
 #, 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 524330a561..80c430df45 100644
--- a/po/ca.po
+++ b/po/ca.po
@@ -20,6 +20,7 @@
 #   fatal            |  fatal
 #   fetch            |  obtenir
 #   flush            |  buidar / buidatge
+#   graph            |  graf
 #   hint             |  consell
 #   hook             |  lligam
 #   hunk             |  tros
@@ -64,8 +65,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Git\n"
 "Report-Msgid-Bugs-To: Git Mailing List <git@vger.kernel.org>\n"
-"POT-Creation-Date: 2022-04-06 14:40+0800\n"
-"PO-Revision-Date: 2022-04-13 19:00-0600\n"
+"POT-Creation-Date: 2022-06-24 13:30+0200\n"
+"PO-Revision-Date: 2022-06-03 19:00-0600\n"
 "Last-Translator: Jordi Mas i Hernàndez <jmas@softcatala.org>\n"
 "Language-Team: Catalan\n"
 "Language: ca\n"
@@ -75,245 +76,182 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 "X-Generator: Poedit 2.3.1\n"
 
-#: add-interactive.c:382
 #, c-format
 msgid "Huh (%s)?"
 msgstr "Perdó (%s)?"
 
-#: add-interactive.c:535 add-interactive.c:836 reset.c:136 sequencer.c:3505
-#: sequencer.c:3970 sequencer.c:4127 builtin/rebase.c:1261
-#: builtin/rebase.c:1671
 msgid "could not read index"
 msgstr "no s'ha pogut llegir l'índex"
 
-#: add-interactive.c:590 git-add--interactive.perl:269
-#: git-add--interactive.perl:294
 msgid "binary"
 msgstr "binari"
 
-#: add-interactive.c:648 git-add--interactive.perl:278
-#: git-add--interactive.perl:332
 msgid "nothing"
 msgstr "res"
 
-#: add-interactive.c:649 git-add--interactive.perl:314
-#: git-add--interactive.perl:329
 msgid "unchanged"
 msgstr "sense canvis"
 
-#: add-interactive.c:686 git-add--interactive.perl:641
 msgid "Update"
 msgstr "Actualitza"
 
-#: add-interactive.c:703 add-interactive.c:891
 #, c-format
 msgid "could not stage '%s'"
 msgstr "no s'ha pogut fer «stage» «%s»"
 
-#: add-interactive.c:709 add-interactive.c:898 reset.c:160 sequencer.c:3709
 msgid "could not write index"
 msgstr "no s'ha pogut escriure l'índex"
 
-#: add-interactive.c:712 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:730 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:735 apply.c:4133 builtin/checkout.c:311
-#: builtin/reset.c:167
 #, c-format
 msgid "make_cache_entry failed for path '%s'"
 msgstr "make_cache_entry ha fallat per al camí «%s»"
 
-#: add-interactive.c:765 git-add--interactive.perl:653
 msgid "Revert"
 msgstr "Reverteix"
 
-#: add-interactive.c:781
 msgid "Could not parse HEAD^{tree}"
 msgstr "No s'ha pogut analitzar HEAD^{tree}"
 
-#: add-interactive.c:819 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:870 git-add--interactive.perl:693
 #, c-format
 msgid "No untracked files.\n"
 msgstr "Sense fitxers no seguits.\n"
 
-#: add-interactive.c:874 git-add--interactive.perl:687
 msgid "Add untracked"
 msgstr "Afegeix sense seguiment"
 
-#: add-interactive.c:901 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:931
 #, c-format
 msgid "ignoring unmerged: %s"
 msgstr "s'està ignorant allò no fusionat: %s"
 
-#: add-interactive.c:943 add-patch.c:1758 git-add--interactive.perl:1371
 #, c-format
 msgid "Only binary files changed.\n"
 msgstr "Només han canviat fitxers binaris.\n"
 
-#: add-interactive.c:945 add-patch.c:1756 git-add--interactive.perl:1373
 #, c-format
 msgid "No changes.\n"
 msgstr "Sense canvis.\n"
 
-#: add-interactive.c:949 git-add--interactive.perl:1381
 msgid "Patch update"
 msgstr "Actualització del pedaç"
 
-#: add-interactive.c:988 git-add--interactive.perl:1794
 msgid "Review diff"
 msgstr "Reviseu les diferències"
 
-#: add-interactive.c:1016
 msgid "show paths with changes"
 msgstr "mostra els camins amb canvis"
 
-#: add-interactive.c:1018
 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:1020
 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:1022
 msgid "pick hunks and update selectively"
 msgstr "selecciona els trossos i actualitza selectivament"
 
-#: add-interactive.c:1024
 msgid "view diff between HEAD and index"
 msgstr "visualitza les diferències entre HEAD i l'índex"
 
-#: add-interactive.c:1026
 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:1034 add-interactive.c:1083
 msgid "Prompt help:"
 msgstr "Mostra ajuda:"
 
-#: add-interactive.c:1036
 msgid "select a single item"
 msgstr "seleccioneu un únic ítem"
 
-#: add-interactive.c:1038
 msgid "select a range of items"
 msgstr "seleccioneu un rang d'ítems"
 
-#: add-interactive.c:1040
 msgid "select multiple ranges"
 msgstr "seleccioneu rangs múltiples"
 
-#: add-interactive.c:1042 add-interactive.c:1087
 msgid "select item based on unique prefix"
 msgstr "seleccioneu un ítem basant-se en un prefix únic"
 
-#: add-interactive.c:1044
 msgid "unselect specified items"
 msgstr "desselecciona els ítems especificats"
 
-#: add-interactive.c:1046
 msgid "choose all items"
 msgstr "trieu tots els ítems"
 
-#: add-interactive.c:1048
 msgid "(empty) finish selecting"
 msgstr "(buit) finalitza la selecció"
 
-#: add-interactive.c:1085
 msgid "select a numbered item"
 msgstr "seleccioneu un ítem numerat"
 
-#: add-interactive.c:1089
 msgid "(empty) select nothing"
 msgstr "(buit) no seleccionis res"
 
-#: add-interactive.c:1097 builtin/clean.c:839 git-add--interactive.perl:1898
 msgid "*** Commands ***"
 msgstr "*** Ordres ***"
 
-#: add-interactive.c:1098 builtin/clean.c:840 git-add--interactive.perl:1895
 msgid "What now"
 msgstr "I ara què"
 
-#: add-interactive.c:1150 git-add--interactive.perl:213
 msgid "staged"
 msgstr "staged"
 
-#: add-interactive.c:1150 git-add--interactive.perl:213
 msgid "unstaged"
 msgstr "unstaged"
 
-#: add-interactive.c:1150 apply.c:5002 apply.c:5005 builtin/am.c:2370
-#: builtin/am.c:2373 builtin/bugreport.c:107 builtin/clone.c:132
-#: builtin/fetch.c:154 builtin/merge.c:287 builtin/pull.c:194
-#: builtin/submodule--helper.c:412 builtin/submodule--helper.c:1872
-#: builtin/submodule--helper.c:1875 builtin/submodule--helper.c:2709
-#: builtin/submodule--helper.c:2712 builtin/submodule--helper.c:2891
-#: git-add--interactive.perl:213
 msgid "path"
 msgstr "camí"
 
-#: add-interactive.c:1157
 msgid "could not refresh index"
 msgstr "no s'ha pogut actualitzar l'índex"
 
-#: add-interactive.c:1171 builtin/clean.c:804 git-add--interactive.perl:1805
 #, c-format
 msgid "Bye.\n"
 msgstr "Adeu.\n"
 
-#: add-patch.c:34 git-add--interactive.perl:1433
 #, c-format, perl-format
 msgid "Stage mode change [y,n,q,a,d%s,?]? "
 msgstr "Canvia el mode de «stage» [y,n,q,a,d%s,?]? "
 
-#: add-patch.c:35 git-add--interactive.perl:1434
 #, c-format, perl-format
 msgid "Stage deletion [y,n,q,a,d%s,?]? "
 msgstr "Suprimeix «stage» [y,n,q,a,d%s,?]? "
 
-#: add-patch.c:36 git-add--interactive.perl:1435
 #, c-format, perl-format
 msgid "Stage addition [y,n,q,a,d%s,?]? "
 msgstr "Afegeix a «stage» [y,n,q,a,d%s,?]? "
 
-#: add-patch.c:37 git-add--interactive.perl:1436
 #, c-format, perl-format
 msgid "Stage this hunk [y,n,q,a,d%s,?]? "
 msgstr "Fer un «stage» d'aquest tros [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."
+"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 ""
 "y - stage this hunk\n"
 "n - do not stage this hunk\n"
@@ -327,35 +265,29 @@ msgstr ""
 "a - fes «stage» d'aquest tros i de tota la resta de trossos del fitxer\n"
 "d - no facis «stage» d'aquest tros ni de cap altre restant del fitxer\n"
 
-#: add-patch.c:56 git-add--interactive.perl:1439
 #, c-format, perl-format
 msgid "Stash mode change [y,n,q,a,d%s,?]? "
 msgstr "Canvia el mode de «stash» [y,n,q,a,d%s,?]? "
 
-#: add-patch.c:57 git-add--interactive.perl:1440
 #, c-format, perl-format
 msgid "Stash deletion [y,n,q,a,d%s,?]? "
 msgstr "Suprimeix «stash» [y,n,q,a,d%s,?]? "
 
-#: add-patch.c:58 git-add--interactive.perl:1441
 #, c-format, perl-format
 msgid "Stash addition [y,n,q,a,d%s,?]? "
 msgstr "Afegeix a «stash» [y,n,q,a,d%s,?]? "
 
-#: add-patch.c:59 git-add--interactive.perl:1442
 #, c-format, perl-format
 msgid "Stash this hunk [y,n,q,a,d%s,?]? "
 msgstr "Fer un «stash» d'aquest tros [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."
+"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»."
 
-#: add-patch.c:64
 msgid ""
 "y - stash this hunk\n"
 "n - do not stash this hunk\n"
@@ -369,35 +301,29 @@ msgstr ""
 "a - fes «stash» d'aquest tros i de tota la resta de trossos del fitxer\n"
 "d - no facis «stash» d'aquest tros ni de cap altre restant del fitxer\n"
 
-#: add-patch.c:80 git-add--interactive.perl:1445
 #, c-format, perl-format
 msgid "Unstage mode change [y,n,q,a,d%s,?]? "
 msgstr "Canvia el mode de «unstage» [y,n,q,a,d%s,?]? "
 
-#: add-patch.c:81 git-add--interactive.perl:1446
 #, c-format, perl-format
 msgid "Unstage deletion [y,n,q,a,d%s,?]? "
 msgstr "Suprimeix «Unstage» [y,n,q,a,d%s,?]? "
 
-#: add-patch.c:82 git-add--interactive.perl:1447
 #, c-format, perl-format
 msgid "Unstage addition [y,n,q,a,d%s,?]? "
 msgstr "Afegeix a «unstage» [y,n,q,a,d%s,?]? "
 
-#: add-patch.c:83 git-add--interactive.perl:1448
 #, c-format, perl-format
 msgid "Unstage this hunk [y,n,q,a,d%s,?]? "
 msgstr "Fer un «unstage» d'aquest tros [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."
+"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 ""
 "y - unstage this hunk\n"
 "n - do not unstage this hunk\n"
@@ -411,35 +337,29 @@ msgstr ""
 "a - fes «unstage» d'aquest tros i de tota la resta de trossos del fitxer\n"
 "d - no facis «unstage» d'aquest tros ni de cap altre restant del fitxer\n"
 
-#: add-patch.c:103 git-add--interactive.perl:1451
 #, c-format, perl-format
 msgid "Apply mode change to index [y,n,q,a,d%s,?]? "
 msgstr "Aplica el canvi de mode a l'índex [y,n,q,a,d%s,?]? "
 
-#: add-patch.c:104 git-add--interactive.perl:1452
 #, c-format, perl-format
 msgid "Apply deletion to index [y,n,q,a,d%s,?]? "
 msgstr "Aplica la supressió a l'índex [y,n,q,a,d%s,?]? "
 
-#: add-patch.c:105 git-add--interactive.perl:1453
 #, c-format, perl-format
 msgid "Apply addition to index [y,n,q,a,d%s,?]? "
 msgstr "Aplica l'addició a l'índex [y,n,q,a,d%s,?]? "
 
-#: add-patch.c:106 git-add--interactive.perl:1454
 #, c-format, perl-format
 msgid "Apply this hunk to index [y,n,q,a,d%s,?]? "
 msgstr "Aplica aquest tros a l'índex [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."
+"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 a"
-" aplicar-lo."
+"Si el pedaç s'aplica netament, el tros editat es marcarà immediatament per a "
+"aplicar-lo."
 
-#: add-patch.c:111
 msgid ""
 "y - apply this hunk to index\n"
 "n - do not apply this hunk to index\n"
@@ -453,39 +373,29 @@ msgstr ""
 "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:126 git-add--interactive.perl:1457
-#: git-add--interactive.perl:1475
 #, c-format, perl-format
 msgid "Discard mode change from worktree [y,n,q,a,d%s,?]? "
 msgstr "Descarta el canvi de mode de l'arbre de treball [y,n,q,a,d%s,?]? "
 
-#: add-patch.c:127 git-add--interactive.perl:1458
-#: git-add--interactive.perl:1476
 #, c-format, perl-format
 msgid "Discard deletion from worktree [y,n,q,a,d%s,?]? "
 msgstr "Descarta suprimir de l'arbre de treball [y,n,q,a,d%s,?]? "
 
-#: add-patch.c:128 git-add--interactive.perl:1459
-#: git-add--interactive.perl:1477
 #, c-format, perl-format
 msgid "Discard addition from worktree [y,n,q,a,d%s,?]? "
 msgstr "Descarta l'addició de l'arbre de treball [y,n,q,a,d%s,?]? "
 
-#: add-patch.c:129 git-add--interactive.perl:1460
-#: git-add--interactive.perl:1478
 #, c-format, perl-format
 msgid "Discard this hunk from worktree [y,n,q,a,d%s,?]? "
 msgstr "Descarta aquest tros de l'arbre de treball [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."
+"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 ""
 "y - discard this hunk from worktree\n"
 "n - do not discard this hunk from worktree\n"
@@ -499,32 +409,26 @@ msgstr ""
 "a - descarta aquest tros i tots els trossos posteriors en el fitxer\n"
 "d - no descartis aquest tros ni cap dels trossos posteriors en el fitxer\n"
 
-#: add-patch.c:149 add-patch.c:194 git-add--interactive.perl:1463
 #, 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:1464
 #, 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:1465
 #, c-format, perl-format
 msgid "Discard addition from index and worktree [y,n,q,a,d%s,?]? "
 msgstr ""
 "Descarta l'addició de l'índex i de l'arbre de treball [y,n,q,a,d%s,?]? "
 
-#: add-patch.c:152 add-patch.c:197 git-add--interactive.perl:1466
 #, c-format, perl-format
 msgid "Discard this hunk from index and worktree [y,n,q,a,d%s,?]? "
 msgstr ""
 "Descarta aquest tros de l'índex i de l'arbre de treball [y,n,q,a,d%s,?]? "
 
-#: add-patch.c:157
 msgid ""
 "y - discard this hunk from index and worktree\n"
 "n - do not discard this hunk from index and worktree\n"
@@ -538,29 +442,23 @@ msgstr ""
 "a - descarta aquest tros i tots els trossos posteriors en el fitxer\n"
 "d - no descartis aquest tros ni cap dels trossos posteriors en el fitxer\n"
 
-#: add-patch.c:171 add-patch.c:216 git-add--interactive.perl:1469
 #, c-format, perl-format
 msgid "Apply mode change to index and worktree [y,n,q,a,d%s,?]? "
 msgstr ""
 "Aplica el canvi de mode a l'índex i a l'arbre de treball [y,n,q,a,d%s,?]? "
 
-#: add-patch.c:172 add-patch.c:217 git-add--interactive.perl:1470
 #, 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:1471
 #, c-format, perl-format
 msgid "Apply addition to index and worktree [y,n,q,a,d%s,?]? "
 msgstr "Aplica l'addició a l'índex i a l'arbre de treball [y,n,q,a,d%s,?]? "
 
-#: add-patch.c:174 add-patch.c:219 git-add--interactive.perl:1472
 #, c-format, perl-format
 msgid "Apply this hunk to index and worktree [y,n,q,a,d%s,?]? "
 msgstr "Aplica aquest tros a l'índex i a l'arbre de treball [y,n,q,a,d%s,?]? "
 
-#: add-patch.c:179
 msgid ""
 "y - apply this hunk to index and worktree\n"
 "n - do not apply this hunk to index and worktree\n"
@@ -574,7 +472,6 @@ msgstr ""
 "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:224
 msgid ""
 "y - apply this hunk to worktree\n"
 "n - do not apply this hunk to worktree\n"
@@ -588,34 +485,27 @@ msgstr ""
 "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: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: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:431
 msgid "could not parse diff"
 msgstr "no s'ha pogut analitzar el diff"
 
-#: add-patch.c:450
 msgid "could not parse colored diff"
 msgstr "no s'ha pogut analitzar el diff acolorit"
 
-#: add-patch.c:464
 #, c-format
 msgid "failed to run '%s'"
 msgstr "no s'ha pogut executar «%s»"
 
-#: add-patch.c:618
 msgid "mismatched output from interactive.diffFilter"
 msgstr "sortida no coincident des d'interactive.diffFilter"
 
-#: add-patch.c:619
 msgid ""
 "Your filter must maintain a one-to-one correspondence\n"
 "between its input and output lines."
@@ -623,7 +513,6 @@ msgstr ""
 "El filtre ha de mantenir una correspondència d'un a un\n"
 "entre les línies d'entrada i sortida."
 
-#: add-patch.c:797
 #, c-format
 msgid ""
 "expected context line #%d in\n"
@@ -632,7 +521,6 @@ msgstr ""
 "s'esperava la línia amb contingut #%d a\n"
 "%.*s"
 
-#: add-patch.c:812
 #, c-format
 msgid ""
 "hunks do not overlap:\n"
@@ -645,12 +533,10 @@ msgstr ""
 "\tno acaben amb:\n"
 "%.*s"
 
-#: add-patch.c:1088 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 a una guia ràpida.\n"
 
-#: add-patch.c:1092
 #, c-format
 msgid ""
 "---\n"
@@ -663,8 +549,8 @@ msgstr ""
 "Per a eliminar les línies «%c», suprimiu-les.\n"
 "Les línies que comencin per %c s'eliminaran.\n"
 
+#. #-#-#-#-#  git-add--interactive.perl.po  #-#-#-#-#
 #. TRANSLATORS: 'it' refers to the patch mentioned in the previous messages.
-#: add-patch.c:1106 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"
@@ -674,46 +560,41 @@ msgstr ""
 "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:1139
 msgid "could not parse hunk header"
 msgstr "no s'ha pogut analitzar la capçalera del tros"
 
-#: add-patch.c:1184
 msgid "'git apply --cached' failed"
 msgstr "«git apply --cached» ha fallat"
 
+#. #-#-#-#-#  add-patch.c.po  #-#-#-#-#
 #. 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.
+#.
+#. #-#-#-#-#  git-add--interactive.perl.po  #-#-#-#-#
 #. 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:1253 git-add--interactive.perl:1244
 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:1296
 msgid "The selected hunks do not apply to the index!"
 msgstr "Els trossos seleccionats no s'apliquen a l'índex!"
 
-#: add-patch.c:1297 git-add--interactive.perl:1348
 msgid "Apply them to the worktree anyway? "
 msgstr "Voleu aplicar-los igualment a l'arbre de treball? "
 
-#: add-patch.c:1304 git-add--interactive.perl:1351
 msgid "Nothing was applied.\n"
 msgstr "No s'ha aplicat res.\n"
 
-#: add-patch.c:1361
 msgid ""
 "j - leave this hunk undecided, see next undecided hunk\n"
 "J - leave this hunk undecided, see next hunk\n"
@@ -735,73 +616,57 @@ msgstr ""
 "e - edita manualment el tros actual\n"
 "? - mostra l'ajuda\n"
 
-#: add-patch.c:1523 add-patch.c:1533
 msgid "No previous hunk"
 msgstr "Sense tros previ"
 
-#: add-patch.c:1528 add-patch.c:1538
 msgid "No next hunk"
 msgstr "No hi ha tros següent"
 
-#: add-patch.c:1544
 msgid "No other hunks to goto"
 msgstr "No hi ha altres trossos on anar-hi"
 
-#: add-patch.c:1555 git-add--interactive.perl:1608
 msgid "go to which hunk (<ret> to see more)? "
 msgstr "ves a quin tros (<ret> per a veure'n més)? "
 
-#: add-patch.c:1556 git-add--interactive.perl:1610
 msgid "go to which hunk? "
 msgstr "ves a quin tros? "
 
-#: add-patch.c:1567
 #, c-format
 msgid "Invalid number: '%s'"
 msgstr "Número no vàlid: «%s»"
 
-#: add-patch.c:1572
 #, 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:1581
 msgid "No other hunks to search"
 msgstr "No hi ha cap altre tros a cercar"
 
-#: add-patch.c:1587 git-add--interactive.perl:1663
 msgid "search for regex? "
 msgstr "cerca per expressió regular? "
 
-#: add-patch.c:1602
 #, c-format
 msgid "Malformed search regexp %s: %s"
 msgstr "Expressió regular de cerca mal formada %s: %s"
 
-#: add-patch.c:1619
 msgid "No hunk matches the given pattern"
 msgstr "No hi ha trossos que coincideixin amb el patró donat"
 
-#: add-patch.c:1626
 msgid "Sorry, cannot split this hunk"
 msgstr "No es pot dividir aquest tros"
 
-#: add-patch.c:1630
 #, c-format
 msgid "Split into %d hunks."
 msgstr "Divideix en %d trossos."
 
-#: add-patch.c:1634
 msgid "Sorry, cannot edit this hunk"
 msgstr "No es pot editar aquest tros"
 
-#: add-patch.c:1686
 msgid "'git apply' failed"
 msgstr "«git apply» ha fallat"
 
-#: advice.c:81
 #, c-format
 msgid ""
 "\n"
@@ -810,37 +675,29 @@ msgstr ""
 "\n"
 "Desactiva aquest missatge amb «git config advice.%s false»"
 
-#: advice.c:97
 #, c-format
 msgid "%shint: %.*s%s\n"
 msgstr "%sconsell: %.*s%s\n"
 
-#: advice.c:181
 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:183
 msgid "Committing is not possible because you have unmerged files."
 msgstr "Cometre no és possible perquè teniu fitxers sense fusionar."
 
-#: advice.c:185
 msgid "Merging is not possible because you have unmerged files."
 msgstr "Fusionar no és possible perquè teniu fitxers sense fusionar."
 
-#: advice.c:187
 msgid "Pulling is not possible because you have unmerged files."
 msgstr "Baixar no és possible perquè teniu fitxers sense fusionar."
 
-#: advice.c:189
 msgid "Reverting is not possible because you have unmerged files."
 msgstr "Revertir no és possible perquè teniu fitxers sense fusionar."
 
-#: advice.c:191
 #, 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:199
 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."
@@ -849,27 +706,21 @@ msgstr ""
 "«git add/rm <fitxer>» segons sigui apropiat per a\n"
 "marcar la resolució i feu una comissió."
 
-#: advice.c:207
 msgid "Exiting because of an unresolved conflict."
 msgstr "S'està sortint a causa d'un conflicte no resolt."
 
-#: advice.c:212 builtin/merge.c:1388
 msgid "You have not concluded your merge (MERGE_HEAD exists)."
 msgstr "No heu conclòs la vostra fusió (MERGE_HEAD existeix)."
 
-#: advice.c:214
 msgid "Please, commit your changes before merging."
 msgstr "Cometeu els vostres canvis abans de fusionar."
 
-#: advice.c:215
 msgid "Exiting because of unfinished merge."
 msgstr "S'està sortint a causa d'una fusió no terminada."
 
-#: advice.c:220
 msgid "Not possible to fast-forward, aborting."
 msgstr "No és possible avançar ràpidament, s'està avortant."
 
-#: advice.c:230
 #, c-format
 msgid ""
 "The following paths and/or pathspecs matched paths that exist\n"
@@ -880,7 +731,6 @@ msgstr ""
 "amb camins que existeixen fora de la vostra definició de\n"
 "«sparse-checkout», així que no serà actualitzaran en l'índex:\n"
 
-#: advice.c:237
 msgid ""
 "If you intend to update such entries, try one of the following:\n"
 "* Use the --sparse option.\n"
@@ -890,7 +740,6 @@ msgstr ""
 "* Utilitzeu l'opció --sparse.\n"
 "* Inhabiliteu o modifiqueu les regles de dispersió."
 
-#: advice.c:245
 #, c-format
 msgid ""
 "Note: switching to '%s'.\n"
@@ -908,7 +757,8 @@ msgid ""
 "\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"
@@ -926,117 +776,81 @@ msgstr ""
 "\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
 msgid "cmdline ends with \\"
 msgstr "la línia d'ordres acaba amb \\"
 
-#: alias.c:51
 msgid "unclosed quote"
 msgstr "cita no tancada"
 
-#: apply.c:70
 #, c-format
 msgid "unrecognized whitespace option '%s'"
 msgstr "opció d'espai en blanc «%s» no reconeguda"
 
-#: apply.c:86
 #, c-format
 msgid "unrecognized whitespace ignore option '%s'"
 msgstr "opció ignora l'espai en blanc «%s» no reconeguda"
 
-#: apply.c:138 archive.c:584 parse-options.c:1122 range-diff.c:555
-#: revision.c:2314 revision.c:2318 revision.c:2327 revision.c:2332
-#: revision.c:2560 revision.c:2895 revision.c:2899 revision.c:2907
-#: revision.c:2910 revision.c:2912 builtin/add.c:507 builtin/add.c:509
-#: builtin/add.c:515 builtin/add.c:527 builtin/branch.c:755
-#: builtin/checkout.c:472 builtin/checkout.c:475 builtin/checkout.c:1663
-#: builtin/checkout.c:1773 builtin/checkout.c:1776 builtin/clone.c:921
-#: builtin/commit.c:359 builtin/commit.c:362 builtin/commit.c:1200
-#: builtin/commit.c:1256 builtin/commit.c:1273 builtin/describe.c:593
-#: builtin/diff-tree.c:155 builtin/difftool.c:733 builtin/fast-export.c:1245
-#: builtin/fetch.c:2141 builtin/fetch.c:2162 builtin/fetch.c:2167
-#: builtin/help.c:602 builtin/index-pack.c:1858 builtin/init-db.c:560
-#: builtin/log.c:1968 builtin/log.c:1970 builtin/ls-files.c:778
-#: builtin/merge-base.c:163 builtin/merge-base.c:169 builtin/merge.c:1409
-#: builtin/merge.c:1411 builtin/pack-objects.c:4098 builtin/push.c:592
-#: builtin/push.c:630 builtin/push.c:636 builtin/push.c:641
-#: builtin/rebase.c:1221 builtin/rebase.c:1223 builtin/rebase.c:1227
-#: builtin/repack.c:688 builtin/repack.c:719 builtin/reset.c:433
-#: builtin/reset.c:469 builtin/rev-list.c:537 builtin/show-branch.c:711
-#: builtin/stash.c:1696 builtin/stash.c:1699 builtin/submodule--helper.c:1328
-#: builtin/submodule--helper.c:3054 builtin/tag.c:527 builtin/tag.c:573
-#: builtin/worktree.c:779
 #, c-format
 msgid "options '%s' and '%s' cannot be used together"
 msgstr "les opcions «%s» i «%s» no es poden usar juntes"
 
-#: apply.c:141 apply.c:152 apply.c:155
 #, c-format
 msgid "'%s' outside a repository"
 msgstr "«%s» fora d'un repositori"
 
-#: apply.c:807
 #, c-format
 msgid "Cannot prepare timestamp regexp %s"
 msgstr "No es pot preparar l'expressió regular de marca de temps %s"
 
-#: apply.c:816
 #, c-format
 msgid "regexec returned %d for input: %s"
 msgstr "regexec ha retornat %d per a l'entrada: %s"
 
-#: apply.c:890
 #, c-format
 msgid "unable to find filename in patch at line %d"
 msgstr "no s'ha pogut trobar el nom de fitxer en el pedaç a la línia %d"
 
-#: apply.c:928
 #, c-format
 msgid "git apply: bad git-diff - expected /dev/null, got %s on line %d"
 msgstr ""
 "git apply: git-diff incorrecte - s'esperava /dev/null, s'ha rebut %s en la "
 "línia %d"
 
-#: apply.c:934
 #, c-format
 msgid "git apply: bad git-diff - inconsistent new filename on line %d"
 msgstr ""
 "git apply: git-diff incorrecte - nom de fitxer nou inconsistent en la línia "
 "%d"
 
-#: apply.c:935
 #, c-format
 msgid "git apply: bad git-diff - inconsistent old filename on line %d"
 msgstr ""
 "git apply: git-diff incorrecte - nom de fitxer antic inconsistent en la "
 "línia %d"
 
-#: apply.c:940
 #, c-format
 msgid "git apply: bad git-diff - expected /dev/null on line %d"
 msgstr "git apply: git-diff incorrecte - s'esperava /dev/null en la línia %d"
 
-#: apply.c:969
 #, c-format
 msgid "invalid mode on line %d: %s"
 msgstr "mode no vàlid en la línia %d: %s"
 
-#: apply.c:1288
 #, c-format
 msgid "inconsistent header lines %d and %d"
 msgstr "línies de capçalera %d i %d inconsistents"
 
-#: apply.c:1378
 #, 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)"
@@ -1044,93 +858,75 @@ msgstr[1] ""
 "a la capçalera de git diff li manca informació de nom de fitxer en eliminar "
 "%d components de nom de camí inicial (línia %d)"
 
-#: apply.c:1391
 #, c-format
 msgid "git diff header lacks filename information (line %d)"
 msgstr ""
 "a la capçalera de git diff li manca informació de nom de fitxer (línia %d)"
 
-#: apply.c:1487
 #, c-format
 msgid "recount: unexpected line: %.*s"
 msgstr "recompte: línia inesperada: %.*s"
 
-#: apply.c:1556
 #, c-format
 msgid "patch fragment without header at line %d: %.*s"
 msgstr "fragment de pedaç sense capçalera a la línia %d: %.*s"
 
-#: apply.c:1759
 msgid "new file depends on old contents"
 msgstr "el fitxer nou depèn dels continguts antics"
 
-#: apply.c:1761
 msgid "deleted file still has contents"
 msgstr "el fitxer suprimit encara té continguts"
 
-#: apply.c:1795
 #, c-format
 msgid "corrupt patch at line %d"
 msgstr "pedaç malmès a la línia %d"
 
-#: apply.c:1832
 #, c-format
 msgid "new file %s depends on old contents"
 msgstr "el fitxer nou %s depèn dels continguts antics"
 
-#: apply.c:1834
 #, c-format
 msgid "deleted file %s still has contents"
 msgstr "el fitxer suprimit %s encara té continguts"
 
-#: apply.c:1837
 #, c-format
 msgid "** warning: file %s becomes empty but is not deleted"
 msgstr "** advertència: el fitxer %s queda buit però no se suprimeix"
 
-#: apply.c:1985
 #, c-format
 msgid "corrupt binary patch at line %d: %.*s"
 msgstr "pedaç binari malmès a la línia %d: %.*s"
 
-#: apply.c:2022
 #, c-format
 msgid "unrecognized binary patch at line %d"
 msgstr "pedaç binari no reconegut a la línia %d"
 
-#: apply.c:2184
 #, c-format
 msgid "patch with only garbage at line %d"
 msgstr "pedaç amb només escombraries a la línia %d"
 
-#: apply.c:2270
 #, c-format
 msgid "unable to read symlink %s"
 msgstr "no s'ha pogut llegir l'enllaç simbòlic %s"
 
-#: apply.c:2274
 #, c-format
 msgid "unable to open or read %s"
 msgstr "no s'ha pogut obrir o llegir %s"
 
-#: apply.c:2943
 #, c-format
 msgid "invalid start of line: '%c'"
 msgstr "inici de línia no vàlid: «%c»"
 
-#: apply.c:3064
 #, 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:3076
 #, 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:3082
 #, c-format
 msgid ""
 "while searching for:\n"
@@ -1139,23 +935,19 @@ msgstr ""
 "tot cercant:\n"
 "%.*s"
 
-#: apply.c:3104
 #, c-format
 msgid "missing binary patch data for '%s'"
 msgstr "manquen les dades de pedaç binari de «%s»"
 
-#: apply.c:3112
 #, 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:3159
 #, 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:3170
 #, c-format
 msgid ""
 "the patch applies to '%s' (%s), which does not match the current contents."
@@ -1163,291 +955,231 @@ msgstr ""
 "el pedaç s'aplica a «%s» (%s), el qual no coincideix amb els continguts "
 "actuals."
 
-#: apply.c:3178
 #, 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:3196
 #, 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:3209
 #, c-format
 msgid "binary patch does not apply to '%s'"
 msgstr "el pedaç binari no s'aplica a «%s»"
 
-#: apply.c:3216
 #, 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:3237
 #, c-format
 msgid "patch failed: %s:%ld"
 msgstr "el pedaç ha fallat: %s:%ld"
 
-#: apply.c:3360
 #, c-format
 msgid "cannot checkout %s"
 msgstr "no es pot agafar %s"
 
-#: apply.c:3412 apply.c:3423 apply.c:3469 midx.c:105 pack-revindex.c:214
-#: setup.c:309
 #, c-format
 msgid "failed to read %s"
 msgstr "s'ha produït un error en llegir %s"
 
-#: apply.c:3420
 #, 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:3449 apply.c:3721
 #, c-format
 msgid "path %s has been renamed/deleted"
 msgstr "el camí %s s'ha canviat de nom / s'ha suprimit"
 
-#: apply.c:3559 apply.c:3736
 #, c-format
 msgid "%s: does not exist in index"
 msgstr "%s: no existeix en l'índex"
 
-#: apply.c:3568 apply.c:3744 apply.c:3960
 #, c-format
 msgid "%s: does not match index"
 msgstr "%s: no coincideix amb l'índex"
 
-#: apply.c:3605
 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:3608
 #, c-format
 msgid "Performing three-way merge...\n"
 msgstr "S'està fent una fusió de 3 vies...\n"
 
-#: apply.c:3624 apply.c:3628
 #, c-format
 msgid "cannot read the current contents of '%s'"
 msgstr "no es poden llegir els continguts actuals de «%s»"
 
-#: apply.c:3640
 #, 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:3654
 #, c-format
 msgid "Applied patch to '%s' with conflicts.\n"
 msgstr "S'ha aplicat el pedaç a «%s» amb conflictes.\n"
 
-#: apply.c:3659
 #, c-format
 msgid "Applied patch to '%s' cleanly.\n"
 msgstr "S'ha aplicat el pedaç a «%s» netament.\n"
 
-#: apply.c:3676
 #, c-format
 msgid "Falling back to direct application...\n"
 msgstr "S'està usant alternativament l'aplicació directa...\n"
 
-#: apply.c:3688
 msgid "removal patch leaves file contents"
 msgstr "el pedaç d'eliminació deixa els continguts dels fitxers"
 
-#: apply.c:3761
 #, c-format
 msgid "%s: wrong type"
 msgstr "%s: tipus erroni"
 
-#: apply.c:3763
 #, c-format
 msgid "%s has type %o, expected %o"
 msgstr "%s és del tipus %o, s'esperava %o"
 
-#: apply.c:3900 apply.c:3902 read-cache.c:903 read-cache.c:932
-#: read-cache.c:1399
 #, c-format
 msgid "invalid path '%s'"
 msgstr "camí no vàlid: «%s»"
 
-#: apply.c:3958
 #, c-format
 msgid "%s: already exists in index"
 msgstr "%s: ja existeix en l'índex"
 
-#: apply.c:3962
 #, c-format
 msgid "%s: already exists in working directory"
 msgstr "%s: ja existeix en el directori de treball"
 
-#: apply.c:3982
 #, 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:3987
 #, 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:4007
 #, 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:4011
 #, c-format
 msgid "%s: patch does not apply"
 msgstr "%s: el pedaç no s'aplica"
 
-#: apply.c:4026
 #, c-format
 msgid "Checking patch %s..."
 msgstr "S'està comprovant el pedaç %s..."
 
-#: apply.c:4118
 #, 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:4125
 #, 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:4128
 #, c-format
 msgid "sha1 information is lacking or useless (%s)."
 msgstr "falta informació sha1 o és inútil (%s)."
 
-#: apply.c:4137
 #, c-format
 msgid "could not add %s to temporary index"
 msgstr "no s'ha pogut afegir %s a l'índex temporal"
 
-#: apply.c:4147
 #, c-format
 msgid "could not write temporary index to %s"
 msgstr "no s'ha pogut escriure l'índex temporal a %s"
 
-#: apply.c:4285
 #, c-format
 msgid "unable to remove %s from index"
 msgstr "no s'ha pogut eliminar %s de l'índex"
 
-#: apply.c:4319
 #, c-format
 msgid "corrupt patch for submodule %s"
 msgstr "pedaç malmès per al submòdul %s"
 
-#: apply.c:4325
 #, c-format
 msgid "unable to stat newly created file '%s'"
 msgstr "no s'ha pogut fer stat al fitxer novament creat «%s»"
 
-#: apply.c:4333
 #, 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"
 
-#: apply.c:4339 apply.c:4484
 #, 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:4382 builtin/bisect--helper.c:540 builtin/gc.c:2258
-#: builtin/gc.c:2293
 #, c-format
 msgid "failed to write to '%s'"
 msgstr "no s'ha pogut escriure a «%s»"
 
-#: apply.c:4386
 #, c-format
 msgid "closing file '%s'"
 msgstr "s'està tancant el fitxer «%s»"
 
-#: apply.c:4456
 #, c-format
 msgid "unable to write file '%s' mode %o"
 msgstr "no s'ha pogut escriure el fitxer «%s» mode %o"
 
-#: apply.c:4554
 #, c-format
 msgid "Applied patch %s cleanly."
 msgstr "El pedaç %s s'ha aplicat netament."
 
-#: apply.c:4562
 msgid "internal error"
 msgstr "error intern"
 
-#: apply.c:4565
 #, 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:4576
 #, c-format
 msgid "truncating .rej filename to %.*s.rej"
 msgstr "s'està truncant el nom del fitxer .rej a %.*s.rej"
 
-#: apply.c:4584
 #, c-format
 msgid "cannot open %s"
 msgstr "no es pot obrir %s"
 
-#: apply.c:4598
 #, c-format
 msgid "Hunk #%d applied cleanly."
 msgstr "El tros #%d s'ha aplicat netament."
 
-#: apply.c:4602
 #, c-format
 msgid "Rejected hunk #%d."
 msgstr "S'ha rebutjat el tros #%d."
 
-#: apply.c:4731
 #, c-format
 msgid "Skipped patch '%s'."
 msgstr "S'ha omès el pedaç «%s»."
 
-#: apply.c:4740
 msgid "No valid patches in input (allow with \"--allow-empty\")"
-msgstr ""
-"No hi ha pedaços vàlids a l'entrada (permeteu-los amb «--allow-empty»)"
+msgstr "No hi ha pedaços vàlids a l'entrada (permeteu-los amb «--allow-empty»)"
 
-#: apply.c:4761
 msgid "unable to read index file"
 msgstr "no es pot llegir el fitxer d'índex"
 
-#: apply.c:4918
 #, c-format
 msgid "can't open patch '%s': %s"
 msgstr "no es pot obrir el pedaç «%s»: %s"
 
-#: apply.c:4945
 #, 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:4951 apply.c:4966
 #, 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:4959
 #, c-format
 msgid "%d line applied after fixing whitespace errors."
 msgid_plural "%d lines applied after fixing whitespace errors."
@@ -1456,347 +1188,269 @@ msgstr[0] ""
 msgstr[1] ""
 "S'han aplicat %d línies després d'arreglar els errors d'espai en blanc."
 
-#: apply.c:4975 builtin/add.c:690 builtin/mv.c:338 builtin/rm.c:430
 msgid "Unable to write new index file"
 msgstr "No s'ha pogut escriure un fitxer d'índex nou"
 
-#: apply.c:5003
 msgid "don't apply changes matching the given path"
 msgstr "no apliquis els canvis que coincideixin amb el camí donat"
 
-#: apply.c:5006
 msgid "apply changes matching the given path"
 msgstr "aplica els canvis que coincideixin amb el camí donat"
 
-#: apply.c:5008 builtin/am.c:2379
 msgid "num"
 msgstr "nombre"
 
-#: apply.c:5009
 msgid "remove <num> leading slashes from traditional diff paths"
 msgstr ""
 "elimina <nombre> barres obliqües inicials dels camins de diferència "
 "tradicionals"
 
-#: apply.c:5012
 msgid "ignore additions made by the patch"
 msgstr "ignora afegiments fets pel pedaç"
 
-#: apply.c:5014
 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:5018
 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:5020
 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:5022
 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:5024
 msgid "make sure the patch is applicable to the current index"
 msgstr "assegura que el pedaç sigui aplicable a l'índex actual"
 
-#: apply.c:5026
 msgid "mark new files with `git add --intent-to-add`"
 msgstr "marca els fitxers nous amb «git add --intent-to-add»"
 
-#: apply.c:5028
 msgid "apply a patch without touching the working tree"
 msgstr "aplica un pedaç sense tocar l'arbre de treball"
 
-#: apply.c:5030
 msgid "accept a patch that touches outside the working area"
 msgstr "accepta un pedaç que toqui fora de l'àrea de treball"
 
-#: apply.c:5033
 msgid "also apply the patch (use with --stat/--summary/--check)"
 msgstr "aplica el pedaç també (useu amb --stat/--summary/--check)"
 
-#: apply.c:5035
 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"
 
-#: apply.c:5037
 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:5040 builtin/checkout-index.c:230
 msgid "paths are separated with NUL character"
 msgstr "els camins se separen amb el caràcter NUL"
 
-#: apply.c:5042
 msgid "ensure at least <n> lines of context match"
 msgstr "assegura't que almenys <n> línies de context coincideixin"
 
-#: apply.c:5043 builtin/am.c:2355 builtin/am.c:2358
-#: builtin/interpret-trailers.c:98 builtin/interpret-trailers.c:100
-#: builtin/interpret-trailers.c:102 builtin/pack-objects.c:3983
-#: builtin/rebase.c:1079
 msgid "action"
 msgstr "acció"
 
-#: apply.c:5044
 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:5047 apply.c:5050
 msgid "ignore changes in whitespace when finding context"
 msgstr "ignora els canvis d'espai en blanc en cercar context"
 
-#: apply.c:5053
 msgid "apply the patch in reverse"
 msgstr "aplica el pedaç al revés"
 
-#: apply.c:5055
 msgid "don't expect at least one line of context"
 msgstr "no esperis almenys una línia de context"
 
-#: apply.c:5057
 msgid "leave the rejected hunks in corresponding *.rej files"
 msgstr "deixa els trossos rebutjats en fitxers *.rej corresponents"
 
-#: apply.c:5059
 msgid "allow overlapping hunks"
 msgstr "permet trossos superposats"
 
-#: apply.c:5062
 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:5065
 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:5067 builtin/am.c:2367
 msgid "root"
 msgstr "arrel"
 
-#: apply.c:5068
 msgid "prepend <root> to all filenames"
 msgstr "anteposa <arrel> a tots els noms de fitxer"
 
-#: apply.c:5071
 msgid "don't return error for empty patches"
 msgstr "no retornis l'error per als pedaços buits"
 
-#: archive-tar.c:125 archive-zip.c:346
 #, c-format
 msgid "cannot stream blob %s"
 msgstr "no es pot transmetre el blob %s"
 
-#: archive-tar.c:265 archive-zip.c:359
 #, c-format
 msgid "unsupported file mode: 0%o (SHA1: %s)"
 msgstr "mode de fitxer no compatible: 0%o (SHA1: %s)"
 
-#: archive-tar.c:447
 #, c-format
 msgid "unable to start '%s' filter"
 msgstr "no s'ha pogut iniciar el filtre «%s»"
 
-#: archive-tar.c:450
 msgid "unable to redirect descriptor"
 msgstr "no s'ha pogut redirigir el descriptor"
 
-#: archive-tar.c:457
 #, c-format
 msgid "'%s' filter reported error"
 msgstr "«%s» error reportat pel filtre"
 
-#: archive-zip.c:319
 #, c-format
 msgid "path is not valid UTF-8: %s"
 msgstr "el camí no és vàlid en UTF-8: %s"
 
-#: archive-zip.c:323
 #, c-format
 msgid "path too long (%d chars, SHA1: %s): %s"
 msgstr "el camí és massa llarg (%d caràcters, SHA1: %s): %s"
 
-#: archive-zip.c:470 builtin/pack-objects.c:363 builtin/pack-objects.c:366
 #, c-format
 msgid "deflate error (%d)"
 msgstr "error de deflació (%d)"
 
-#: archive-zip.c:604
 #, c-format
 msgid "timestamp too large for this system: %<PRIuMAX>"
 msgstr "marca de temps massa gran per a aquest sistema: %<PRIuMAX>"
 
-#: archive.c:14
 msgid "git archive [<options>] <tree-ish> [<path>...]"
 msgstr "git archive [<opcions>] <arbre> [<camí>...]"
 
-#: 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í>...]"
 
-#: archive.c:17
 msgid "git archive --remote <repo> [--exec <cmd>] --list"
 msgstr "git archive --remote <repositori> [--exec <ordre>] --list"
 
-#: archive.c:188 archive.c:341 builtin/gc.c:497 builtin/notes.c:238
-#: builtin/tag.c:579
 #, c-format
 msgid "cannot read '%s'"
 msgstr "no es pot llegir «%s»"
 
-#: archive.c:426 builtin/add.c:214 builtin/add.c:657 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:450
 #, c-format
 msgid "no such ref: %.*s"
 msgstr "no existeix la referència: %.*s"
 
-#: archive.c:456
 #, c-format
 msgid "not a valid object name: %s"
 msgstr "no és un nom d'objecte vàlid: %s"
 
-#: archive.c:469
 #, c-format
 msgid "not a tree object: %s"
 msgstr "no és un objecte d'arbre: %s"
 
-#: archive.c:481
 msgid "current working directory is untracked"
 msgstr "no se segueix el directori de treball actual"
 
-#: archive.c:522
 #, c-format
 msgid "File not found: %s"
 msgstr "Fitxer no trobat: %s"
 
-#: archive.c:524
 #, c-format
 msgid "Not a regular file: %s"
 msgstr "No és un fitxer normal: %s"
 
-#: archive.c:551
+#, fuzzy, c-format
+msgid "unclosed quote: '%s'"
+msgstr "cita no tancada"
+
+#, fuzzy, c-format
+msgid "missing colon: '%s'"
+msgstr "falta el valor per «%s»"
+
+#, fuzzy, c-format
+msgid "empty file name: '%s'"
+msgstr "mbox buit: «%s»"
+
 msgid "fmt"
 msgstr "format"
 
-#: archive.c:551
 msgid "archive format"
 msgstr "format d'arxiu"
 
-#: archive.c:552 builtin/log.c:1809
 msgid "prefix"
 msgstr "prefix"
 
-#: 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:554 archive.c:557 builtin/blame.c:881 builtin/blame.c:885
-#: builtin/blame.c:886 builtin/commit-tree.c:115 builtin/config.c:135
-#: builtin/fast-export.c:1181 builtin/fast-export.c:1183
-#: builtin/fast-export.c:1187 builtin/grep.c:936 builtin/hash-object.c:104
-#: builtin/ls-files.c:654 builtin/ls-files.c:657 builtin/notes.c:410
-#: builtin/notes.c:576 builtin/read-tree.c:115 parse-options.h:195
 msgid "file"
 msgstr "fitxer"
 
-#: archive.c:555
 msgid "add untracked file to archive"
 msgstr "inclou els fitxers no seguits a l'arxiu"
 
-#: archive.c:558 builtin/archive.c:88
+#, fuzzy
+msgid "path:content"
+msgstr "contingut"
+
 msgid "write the archive to this file"
 msgstr "escriu l'arxiu a aquest fitxer"
 
-#: archive.c:560
 msgid "read .gitattributes in working directory"
 msgstr "llegeix .gitattributes en el directori de treball"
 
-#: archive.c:561
 msgid "report archived files on stderr"
 msgstr "informa de fitxers arxivats en stderr"
 
-#: archive.c:563
 msgid "set compression level"
 msgstr "estableix el nivell de compressió"
 
-#: archive.c:566
 msgid "list supported archive formats"
 msgstr "llista els formats d'arxiu admesos"
 
-#: archive.c:568 builtin/archive.c:89 builtin/clone.c:122 builtin/clone.c:125
-#: builtin/submodule--helper.c:1884 builtin/submodule--helper.c:2718
 msgid "repo"
 msgstr "repositori"
 
-#: 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:570 builtin/archive.c:91 builtin/difftool.c:708
-#: builtin/notes.c:496
 msgid "command"
 msgstr "ordre"
 
-#: 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:578
 msgid "Unexpected option --remote"
 msgstr "Opció inesperada --remote"
 
-#: archive.c:580 fetch-pack.c:300 revision.c:2914 builtin/add.c:530
-#: builtin/add.c:562 builtin/checkout.c:1782 builtin/clone.c:1099
-#: builtin/clone.c:1102 builtin/commit.c:371 builtin/fast-export.c:1230
-#: builtin/index-pack.c:1854 builtin/log.c:2140 builtin/reset.c:442
-#: builtin/reset.c:500 builtin/rm.c:281 builtin/stash.c:1708
-#: builtin/worktree.c:580 builtin/worktree.c:781 http-fetch.c:144
-#: http-fetch.c:153
 #, c-format
 msgid "the option '%s' requires '%s'"
 msgstr "l'opció «%s» requereix «%s»"
 
-#: archive.c:582
 msgid "Unexpected option --output"
 msgstr "Opció inesperada --output"
 
-#: archive.c:606
 #, c-format
 msgid "Unknown archive format '%s'"
 msgstr "Format d'arxiu desconegut «%s»"
 
-#: 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
 #, c-format
 msgid "%.*s is not a valid attribute name"
 msgstr "%.*s no és un nom d'atribut vàlid"
 
-#: attr.c:363
 #, c-format
 msgid "%s not allowed: %s:%d"
 msgstr "%s no està permès: %s:%d"
 
-#: attr.c:403
 msgid ""
 "Negative patterns are ignored in git attributes\n"
 "Use '\\!' for literal leading exclamation."
@@ -1804,22 +1458,18 @@ msgstr ""
 "Els patrons negatius s'ignoren en els atributs de git\n"
 "Useu «\\!» per exclamació capdavantera literal."
 
-#: 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:698
 #, c-format
 msgid "We cannot bisect more!\n"
 msgstr "No podem bisecar més!\n"
 
-#: bisect.c:765
 #, c-format
 msgid "Not a valid commit name %s"
 msgstr "No és un nom de comissió vàlid %s"
 
-#: bisect.c:790
 #, c-format
 msgid ""
 "The merge base %s is bad.\n"
@@ -1828,7 +1478,6 @@ msgstr ""
 "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:795
 #, c-format
 msgid ""
 "The merge base %s is new.\n"
@@ -1837,7 +1486,6 @@ msgstr ""
 "La base de fusió %s és nova.\n"
 "La propietat s'ha canviat entre %s i [%s].\n"
 
-#: bisect.c:800
 #, c-format
 msgid ""
 "The merge base %s is %s.\n"
@@ -1846,7 +1494,6 @@ msgstr ""
 "La base de fusió %s és %s.\n"
 "Això vol dir que la primera comissió «%s» és entre %s i [%s].\n"
 
-#: bisect.c:808
 #, c-format
 msgid ""
 "Some %s revs are not ancestors of the %s rev.\n"
@@ -1857,7 +1504,6 @@ msgstr ""
 "git bisect no pot funcionar correctament en aquest cas.\n"
 "Potser heu confós les revisions %s i %s?\n"
 
-#: bisect.c:821
 #, c-format
 msgid ""
 "the merge base between %s and [%s] must be skipped.\n"
@@ -1865,39 +1511,33 @@ msgid ""
 "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:860
 #, c-format
 msgid "Bisecting: a merge base must be tested\n"
 msgstr "Bisecant: s'ha de provar una base de fusió\n"
 
-#: bisect.c:910
 #, c-format
 msgid "a %s revision is needed"
 msgstr "es necessita una revisió %s"
 
-#: bisect.c:940
 #, c-format
 msgid "could not create file '%s'"
 msgstr "no s'ha pogut crear el fitxer «%s»"
 
-#: bisect.c:986 builtin/merge.c:155
 #, c-format
 msgid "could not read file '%s'"
 msgstr "no s'ha pogut llegir el fitxer «%s»"
 
-#: bisect.c:1026
 msgid "reading bisect refs failed"
 msgstr "la lectura de les referències de bisecció ha fallat"
 
-#: bisect.c:1056
 #, c-format
 msgid "%s was both %s and %s\n"
 msgstr "%s era ambdós %s i %s\n"
 
-#: bisect.c:1065
 #, c-format
 msgid ""
 "No testable commit found.\n"
@@ -1906,7 +1546,6 @@ msgstr ""
 "No s'ha trobat cap comissió comprovable.\n"
 "Potser heu començat amb paràmetres de camí incorrectes?\n"
 
-#: bisect.c:1094
 #, c-format
 msgid "(roughly %d step)"
 msgid_plural "(roughly %d steps)"
@@ -1915,54 +1554,40 @@ msgstr[1] "(aproximadament %d passos)"
 
 #. TRANSLATORS: the last %s will be replaced with "(roughly %d
 #. steps)" translation.
-#: bisect.c:1100
+#.
 #, 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"
 msgstr[0] "Bisecant: manca %d revisió a provar després d'aquesta %s\n"
 msgstr[1] "Bisecant: manquen %d revisions a provar després d'aquesta %s\n"
 
-#: blame.c:2773
 msgid "--contents and --reverse do not blend well."
 msgstr "--contents i --reverse no funcionen bé juntes."
 
-#: blame.c:2787
 msgid "cannot use --contents with final commit object name"
 msgstr "no es pot usar --contents amb el nom d'objecte de la comissió final"
 
-#: blame.c:2808
 msgid "--reverse and --first-parent together require specified latest commit"
 msgstr ""
-"--reverse i --first-parent junts requereixen una última comissió "
-"especificada"
+"--reverse i --first-parent junts requereixen una última comissió especificada"
 
-#: blame.c:2817 bundle.c:231 midx.c:1058 ref-filter.c:2371 remote.c:2157
-#: sequencer.c:2348 sequencer.c:4872 submodule.c:913 builtin/commit.c:1118
-#: builtin/log.c:437 builtin/log.c:1055 builtin/log.c:1663 builtin/log.c:2096
-#: builtin/log.c:2387 builtin/merge.c:431 builtin/pack-objects.c:3381
-#: builtin/pack-objects.c:3781 builtin/pack-objects.c:3796
-#: builtin/shortlog.c:255
 msgid "revision walk setup failed"
 msgstr "la configuració del recorregut de revisions ha fallat"
 
-#: blame.c:2835
 msgid ""
 "--reverse --first-parent together require range along first-parent chain"
 msgstr ""
 "--reverse --first-parent junts requereixen un rang de la cadena de pares "
 "primers"
 
-#: blame.c:2846
 #, c-format
 msgid "no such path %s in %s"
 msgstr "no hi ha tal camí %s en %s"
 
-#: blame.c:2857
 #, c-format
 msgid "cannot read blob %s for path %s"
 msgstr "no es pot llegir el blob %s per al camí %s"
 
-#: branch.c:93
 msgid ""
 "cannot inherit upstream tracking configuration of multiple refs when "
 "rebasing is requested"
@@ -1970,31 +1595,25 @@ msgstr ""
 "no es pot heretar la configuració del seguiment de la font de múltiples "
 "referències quan es demana fer «rebase»"
 
-#: branch.c:104
 #, c-format
 msgid "not setting branch '%s' as its own upstream"
 msgstr "no s'està establert la branca «%s» com a la seva pròpia font"
 
-#: branch.c:160
 #, c-format
 msgid "branch '%s' set up to track '%s' by rebasing."
 msgstr "la branca «%s» està configurada per a seguir «%s» fent «rebase»."
 
-#: branch.c:161
 #, c-format
 msgid "branch '%s' set up to track '%s'."
 msgstr "la branca «%s» està configurada per a seguir «%s»."
 
-#: branch.c:164
 #, c-format
 msgid "branch '%s' set up to track:"
 msgstr "la branca «%s» està configurada per a seguir:"
 
-#: branch.c:176
 msgid "unable to write upstream branch configuration"
 msgstr "no es pot escriure la configuració de la branca font"
 
-#: branch.c:178
 msgid ""
 "\n"
 "After fixing the error cause you may try to fix up\n"
@@ -2004,40 +1623,40 @@ msgstr ""
 "Després de corregir la causa de l'error, podeu intentar\n"
 "corregir la informació de seguiment remot executant:"
 
-#: branch.c:219
 #, c-format
 msgid "asked to inherit tracking from '%s', but no remote is set"
 msgstr ""
 "s'ha demanat que hereti el seguiment de «%s», però no s'ha establert cap "
 "remot"
 
-#: branch.c:225
 #, c-format
 msgid "asked to inherit tracking from '%s', but no merge configuration is set"
 msgstr ""
 "s'ha demanat que hereti el seguiment de «%s», però no s'ha establert cap "
 "configuració de fusionat"
 
-#: branch.c:277
 #, c-format
 msgid "not tracking: ambiguous information for ref '%s'"
 msgstr "no s'està seguint: informació ambigua per a la referència «%s»"
 
+#. #-#-#-#-#  branch.c.po  #-#-#-#-#
 #. TRANSLATORS: This is a line listing a remote with duplicate
 #. refspecs in the advice message below. For RTL languages you'll
 #. probably want to swap the "%s" and leading "  " space around.
+#.
+#. #-#-#-#-#  object-name.c.po  #-#-#-#-#
 #. TRANSLATORS: This is line item of ambiguous object output
 #. from describe_ambiguous_object() above. For RTL languages
 #. you'll probably want to swap the "%s" and leading " " space
 #. around.
-#: branch.c:289 object-name.c:464
+#.
 #, c-format
 msgid "  %s\n"
 msgstr "  %s\n"
 
 #. TRANSLATORS: The second argument is a \n-delimited list of
 #. duplicate refspecs, composed above.
-#: branch.c:295
+#.
 #, c-format
 msgid ""
 "There are multiple remotes whose fetch refspecs map to the remote\n"
@@ -2058,35 +1677,28 @@ msgstr ""
 "els diferents refspecs remots s'assignen a diferents espais de noms\n"
 "de seguiment."
 
-#: branch.c:344
 #, c-format
 msgid "'%s' is not a valid branch name"
 msgstr "«%s» no és un nom de branca vàlid"
 
-#: branch.c:364
 #, c-format
 msgid "a branch named '%s' already exists"
 msgstr "ja existeix una branca amb nom «%s»"
 
-#: branch.c:370
 #, c-format
 msgid "cannot force update the branch '%s' checked out at '%s'"
 msgstr "no es pot forçar l'actualització de la branca «%s», agafada a «%s»"
 
-#: branch.c:393
 #, c-format
-msgid ""
-"cannot set up tracking information; starting point '%s' is not a branch"
+msgid "cannot set up tracking information; starting point '%s' is not a branch"
 msgstr ""
 "no es pot configurar la informació de seguiment; el punt inicial «%s» no és "
 "una branca"
 
-#: branch.c:395
 #, c-format
 msgid "the requested upstream branch '%s' does not exist"
 msgstr "la branca font demanada «%s» no existeix"
 
-#: branch.c:397
 msgid ""
 "\n"
 "If you are planning on basing your work on an upstream\n"
@@ -2107,8773 +1719,140 @@ msgstr ""
 "«git push -u» per a establir la configuració font\n"
 "mentre pugeu."
 
-#: branch.c:445 builtin/replace.c:321 builtin/replace.c:377
-#: builtin/replace.c:423 builtin/replace.c:453
 #, c-format
 msgid "not a valid object name: '%s'"
 msgstr "no és un nom d'objecte vàlid: «%s»"
 
-#: branch.c:465
 #, c-format
 msgid "ambiguous object name: '%s'"
 msgstr "nom d'objecte ambigu: «%s»"
 
-#: branch.c:470
 #, c-format
 msgid "not a valid branch point: '%s'"
 msgstr "no és un punt de ramificació vàlid: «%s»"
 
-#: branch.c:658
 #, c-format
 msgid "submodule '%s': unable to find submodule"
 msgstr "submòdul «%s»: no es pot trobar el submòdul"
 
-#: branch.c:661
 #, c-format
 msgid ""
 "You may try updating the submodules using 'git checkout %s && git submodule "
 "update --init'"
 msgstr ""
-"Podeu provar d'actualitzar els submòduls utilitzant «git checkout %s && git submodule update --init»"
+"Podeu provar d'actualitzar els submòduls utilitzant «git checkout %s && git "
+"submodule update --init»"
 
-#: branch.c:672 branch.c:698
 #, c-format
 msgid "submodule '%s': cannot create branch '%s'"
 msgstr "submòdul «%s»: no es pot crear la branca: «%s»"
 
-#: branch.c:730
 #, c-format
 msgid "'%s' is already checked out at '%s'"
 msgstr "«%s» ja s'ha agafat a «%s»"
 
-#: branch.c:755
 #, c-format
 msgid "HEAD of working tree %s is not updated"
 msgstr "HEAD de l'arbre de treball %s no està actualitzat"
 
-#: bundle.c:45
-#, c-format
-msgid "unrecognized bundle hash algorithm: %s"
-msgstr "algoritme de hash del farcell desconegut: %s"
-
-#: bundle.c:53
-#, c-format
-msgid "unknown capability '%s'"
-msgstr "funcionalitat «%s» desconeguda"
-
-#: bundle.c:79
-#, 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:118
-#, c-format
-msgid "unrecognized header: %s%s (%d)"
-msgstr "capçalera no reconeguda: %s%s (%d)"
-
-#: bundle.c:145 rerere.c:464 rerere.c:675 sequencer.c:2616 sequencer.c:3402
-#: builtin/commit.c:865
-#, c-format
-msgid "could not open '%s'"
-msgstr "no s'ha pogut obrir «%s»"
-
-#: bundle.c:203
-msgid "Repository lacks these prerequisite commits:"
-msgstr "Al repositori li manquen aquestes comissions prerequerides:"
-
-#: bundle.c:206
-msgid "need a repository to verify a bundle"
-msgstr "cal un repositori per a verificar un farcell"
-
-#: bundle.c:264
-#, c-format
-msgid "The bundle contains this ref:"
-msgid_plural "The bundle contains these %<PRIuMAX> refs:"
-msgstr[0] "El farcell conté aquesta referència:"
-msgstr[1] "El farcell conté aquestes %<PRIuMAX> referències:"
-
-#: bundle.c:272
-msgid "The bundle records a complete history."
-msgstr "El farcell registra una història completa."
-
-#: bundle.c:274
-#, c-format
-msgid "The bundle requires this ref:"
-msgid_plural "The bundle requires these %<PRIuMAX> refs:"
-msgstr[0] "El farcell requereix aquesta referència:"
-msgstr[1] "El farcell requereix aquestes %<PRIuMAX> referències:"
-
-#: bundle.c:350
-msgid "unable to dup bundle descriptor"
-msgstr "no s'ha pogut duplicar el descriptor del farcell"
-
-#: bundle.c:357
-msgid "Could not spawn pack-objects"
-msgstr "No s'ha pogut engendrar el pack-objects"
-
-#: bundle.c:368
-msgid "pack-objects died"
-msgstr "el pack-objects s'ha mort"
-
-#: bundle.c:417
-#, 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:533 builtin/log.c:211 builtin/log.c:1975 builtin/shortlog.c:400
-#, c-format
-msgid "unrecognized argument: %s"
-msgstr "argument no reconegut: %s"
-
-#: bundle.c:548
-#, c-format
-msgid "unsupported bundle version %d"
-msgstr "versió del farcell no compatible %d"
-
-#: bundle.c:550
-#, c-format
-msgid "cannot write bundle version %d with algorithm %s"
-msgstr "no es pot escriure la versió del farcell %d amb l'algorisme %s"
-
-#: bundle.c:600
-msgid "Refusing to create empty bundle."
-msgstr "S'està refusant crear un farcell buit."
-
-#: bundle.c:610
-#, c-format
-msgid "cannot create '%s'"
-msgstr "no es pot crear «%s»"
-
-#: bundle.c:639
-msgid "index-pack died"
-msgstr "l'index-pack s'ha mort"
-
-#: 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"
-
-#: chunk-format.c:126
-#, c-format
-msgid "improper chunk offset(s) %<PRIx64> and %<PRIx64>"
-msgstr "desplaçament incorrecte del fragment %<PRIx64> i %<PRIx64>"
-
-#: 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:147
-#, c-format
-msgid "final chunk has non-zero id %<PRIx32>"
-msgstr "el fragment final té un id %<PRIx32> que no és zero"
-
-#: color.c:354
-#, c-format
-msgid "invalid color value: %.*s"
-msgstr "valor de color no vàlid: %.*s"
-
-#: commit-graph.c:204 midx.c:52
-msgid "invalid hash version"
-msgstr "especificació de hash no vàlida"
-
-#: commit-graph.c:262
-msgid "commit-graph file is too small"
-msgstr "el fitxer del graf de comissions és massa petit"
-
-#: commit-graph.c:355
-#, c-format
-msgid "commit-graph signature %X does not match signature %X"
-msgstr ""
-"la signatura del graf de comissions %X no coincideix amb la signatura %X"
-
-#: commit-graph.c:362
-#, c-format
-msgid "commit-graph version %X does not match version %X"
-msgstr "la versió del graf de comissions %X no coincideix amb la versió %X"
-
-#: commit-graph.c:369
-#, c-format
-msgid "commit-graph hash version %X does not match version %X"
-msgstr ""
-"la versió del hash del graf de comissions %X no coincideix amb la versió %X"
-
-#: commit-graph.c:386
-#, c-format
-msgid "commit-graph file is too small to hold %u chunks"
-msgstr ""
-"el fitxer del graf de comissions és massa petit per a guardar %u fragments"
-
-#: commit-graph.c:485
-msgid "commit-graph has no base graphs chunk"
-msgstr "el fragment del graf de comissions no té grafs de base"
-
-#: commit-graph.c:495
-msgid "commit-graph chain does not match"
-msgstr "la cadena del graf de comissions no coincideix"
-
-#: commit-graph.c:543
-#, c-format
-msgid "invalid commit-graph chain: line '%s' not a hash"
-msgstr ""
-"la cadena del graf de comissions no és vàlida: la línia «%s» no és un hash"
-
-#: commit-graph.c:567
-msgid "unable to find all commit-graph files"
-msgstr "no es poden trobar tots els fitxers del graf de comissions"
-
-#: commit-graph.c:752 commit-graph.c:789
-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:773
-#, c-format
-msgid "could not find commit %s"
-msgstr "no s'ha pogut trobar la comissió %s"
-
-#: commit-graph.c:806
-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é cap"
-
-#: commit-graph.c:1111 builtin/am.c:1370 builtin/checkout.c:775
-#: builtin/clone.c:705
-#, c-format
-msgid "unable to parse commit %s"
-msgstr "no s'ha pogut analitzar la comissió %s"
-
-#: commit-graph.c:1373 builtin/pack-objects.c:3078
-#, 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:1404
-msgid "Loading known commits in commit graph"
-msgstr "S'estan carregant comissions conegudes al graf de comissions"
-
-#: commit-graph.c:1421
-msgid "Expanding reachable commits in commit graph"
-msgstr "S'estan expandint les comissions abastables al graf de comissions"
-
-#: commit-graph.c:1441
-msgid "Clearing commit marks in commit graph"
-msgstr "S'estan esborrant les marques de comissions al graf de comissions"
-
-#: commit-graph.c:1460
-msgid "Computing commit graph topological levels"
-msgstr "S'estan calculant els nivells topològics del graf de comissions"
-
-#: commit-graph.c:1513
-msgid "Computing commit graph generation numbers"
-msgstr "S'estan calculant els nombres de generació del graf de comissions"
-
-#: commit-graph.c:1598
-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:1675
-msgid "Collecting referenced commits"
-msgstr "S'estan recollint els objectes referenciats"
-
-#: commit-graph.c:1701
-#, c-format
-msgid "Finding commits for commit graph in %<PRIuMAX> pack"
-msgid_plural "Finding commits for commit graph in %<PRIuMAX> packs"
-msgstr[0] ""
-"S'estan cercant les comissions pel graf de comissions en %<PRIuMAX> paquet"
-msgstr[1] ""
-"S'estan cercant les comissions pel graf de comissions en %<PRIuMAX> paquets"
-
-#: commit-graph.c:1714
-#, c-format
-msgid "error adding pack %s"
-msgstr "error en afegir paquet %s"
-
-#: commit-graph.c:1718
-#, c-format
-msgid "error opening index for %s"
-msgstr "s'ha produït un error en obrir l'índex per «%s»"
-
-#: commit-graph.c:1756
-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:1774
-msgid "Finding extra edges in commit graph"
-msgstr "S'estan cercant les vores addicionals al graf de comissions"
-
-#: commit-graph.c:1823
-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:1854 midx.c:1168 builtin/sparse-checkout.c:475
-#, c-format
-msgid "unable to create leading directories of %s"
-msgstr "no s'han pogut crear els directoris inicials de «%s»"
-
-#: commit-graph.c:1868
-msgid "unable to create temporary graph layer"
-msgstr "no s'ha pogut crear una capa de graf temporal"
-
-#: commit-graph.c:1873
-#, 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:1930
-#, 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:1967
-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:1983
-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:2004
-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:2137
-msgid "Scanning merged commits"
-msgstr "S'estan escanejant les comissions fusionades"
-
-#: commit-graph.c:2181
-msgid "Merging commit-graph"
-msgstr "S'està fusionant el graf de comissions"
-
-#: commit-graph.c:2289
-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:2396
-msgid "too many commits to write graph"
-msgstr "massa comissions per a escriure un graf"
-
-#: commit-graph.c:2494
-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:2504
-#, 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:2514 commit-graph.c:2529
-#, 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"
-
-#: commit-graph.c:2521
-#, 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:2539
-msgid "Verifying commits in commit graph"
-msgstr "S'estan verificant les comissions al graf de comissions"
-
-#: commit-graph.c:2554
-#, 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:2561
-#, 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"
-
-#: commit-graph.c:2571
-#, 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:2580
-#, 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:2594
-#, 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:2599
-#, c-format
-msgid ""
-"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"
-
-#: commit-graph.c:2603
-#, c-format
-msgid ""
-"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:2620
-#, 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>"
-
-#: commit-graph.c:2626
-#, 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:54 sequencer.c:3105 builtin/am.c:400 builtin/am.c:445
-#: builtin/am.c:450 builtin/am.c:1449 builtin/am.c:2124 builtin/replace.c:456
-#, c-format
-msgid "could not parse %s"
-msgstr "no s'ha pogut analitzar %s"
-
-#: commit.c:56
-#, c-format
-msgid "%s %s is not a commit!"
-msgstr "%s %s no és una comissió!"
-
-#: commit.c:197
-msgid ""
-"Support for <GIT_DIR>/info/grafts is deprecated\n"
-"and will be removed in a future Git version.\n"
-"\n"
-"Please use \"git replace --convert-graft-file\"\n"
-"to convert the grafts into replace refs.\n"
-"\n"
-"Turn this message off by running\n"
-"\"git config advice.graftFileDeprecated false\""
-msgstr ""
-"La compatibilitat amb <GIT_DIR>/info/grafts és obsoleta\n"
-"i s'eliminarà en una futura versió del Git.\n"
-"\n"
-"Useu «git replace --convert-graft-file»\n"
-"per a convertir els grafs en referències de reemplaçament.\n"
-"\n"
-"Desactiveu aquest missatge executant\n"
-"«git config advice.graftFileDeprecated false»"
-
-#: commit.c:1252
-#, 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:1256
-#, 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:1259
-#, c-format
-msgid "Commit %s does not have a GPG signature."
-msgstr "La comissió %s no té signatura GPG."
-
-#: commit.c:1262
-#, 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:1516
-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"
-"variable i18n.commitencoding to the encoding your project uses.\n"
-msgstr ""
-"Advertència: el missatge de comissió no és compatible amb UTF-8.\n"
-"Potser voleu esmenar-lo després de corregir el missatge, o establir\n"
-"la variable de configuració i18n.commitencoding a la codificació que\n"
-"usi el vostre projecte.\n"
-
-#: compat/obstack.c:406 compat/obstack.c:408
-msgid "memory exhausted"
-msgstr "memòria esgotada"
-
-#: compat/terminal.c:167
-msgid "cannot resume in the background, please use 'fg' to resume"
-msgstr "no es pot reprendre en segon pla, si us plau useu «fg» per a reprendre"
-
-#: compat/terminal.c:168
-msgid "cannot restore terminal settings"
-msgstr "no es poden restaurar els paràmetres del terminal"
-
-#: config.c:143
-#, c-format
-msgid ""
-"exceeded maximum include depth (%d) while including\n"
-"\t%s\n"
-"from\n"
-"\t%s\n"
-"This might be due to circular includes."
-msgstr ""
-"s'ha superat la profunditat màxima d'inclusió (%d) mentre s'incloïen\n"
-"\t%s\n"
-"des de\n"
-"\t%s\n"
-"Això pot ser degut a inclusions circulars."
-
-#: config.c:159
-#, c-format
-msgid "could not expand include path '%s'"
-msgstr "no s'ha pogut expandir el camí d'inclusió «%s»"
-
-#: config.c:170
-msgid "relative config includes must come from files"
-msgstr "les inclusions de configuració relatives han de venir de fitxers"
-
-#: config.c:219
-msgid "relative config include conditionals must come from files"
-msgstr ""
-"els condicionals d'inclusió de configuració relatius han de venir de fitxers"
-
-#: config.c:364
-msgid ""
-"remote URLs cannot be configured in file directly or indirectly included by "
-"includeIf.hasconfig:remote.*.url"
-msgstr ""
-"URL remots no es poden configurar en un fitxer directament o indirectament "
-"inclòs per «includeIf.hasconfig:remote.*.url»"
-
-#: config.c:508
-#, c-format
-msgid "invalid config format: %s"
-msgstr "format de configuració no vàlid: %s"
-
-#: config.c:512
-#, c-format
-msgid "missing environment variable name for configuration '%.*s'"
-msgstr "falta el nom de la variable d'entorn per a la configuració «%.*s»"
-
-#: config.c:517
-#, c-format
-msgid "missing environment variable '%s' for configuration '%.*s'"
-msgstr "falta la variable d'entorn «%s» per a la configuració «%.*s»"
-
-#: config.c:553
-#, c-format
-msgid "key does not contain a section: %s"
-msgstr "la clau no conté una secció: «%s»"
-
-#: config.c:558
-#, c-format
-msgid "key does not contain variable name: %s"
-msgstr "la clau no conté un nom de variable: «%s»"
-
-#: config.c:580 sequencer.c:2802
-#, c-format
-msgid "invalid key: %s"
-msgstr "clau no vàlida: %s"
-
-#: config.c:585
-#, c-format
-msgid "invalid key (newline): %s"
-msgstr "clau no vàlida (línia nova): %s"
-
-#: config.c:605
-msgid "empty config key"
-msgstr "clau de configuració buida"
-
-#: config.c:623 config.c:635
-#, c-format
-msgid "bogus config parameter: %s"
-msgstr "paràmetre de configuració erroni: %s"
-
-#: config.c:649 config.c:666 config.c:673 config.c:682
-#, c-format
-msgid "bogus format in %s"
-msgstr "format erroni a %s"
-
-#: config.c:716
-#, c-format
-msgid "bogus count in %s"
-msgstr "comptatge erroni a %s"
-
-#: config.c:720
-#, c-format
-msgid "too many entries in %s"
-msgstr "hi ha massa arguments a %s"
-
-#: config.c:730
-#, c-format
-msgid "missing config key %s"
-msgstr "falta la clau de configuració %s"
-
-#: config.c:738
-#, c-format
-msgid "missing config value %s"
-msgstr "falta el valor de configuració %s"
-
-#: config.c:1089
-#, c-format
-msgid "bad config line %d in blob %s"
-msgstr "línia de configuració %d errònia en el blob %s"
-
-#: config.c:1093
-#, c-format
-msgid "bad config line %d in file %s"
-msgstr "línia de configuració %d errònia en el fitxer %s"
-
-#: config.c:1097
-#, 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:1101
-#, 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:1105
-#, 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:1109
-#, c-format
-msgid "bad config line %d in %s"
-msgstr "línia de configuració %d errònia en %s"
-
-#: config.c:1246
-msgid "out of range"
-msgstr "fora de rang"
-
-#: config.c:1246
-msgid "invalid unit"
-msgstr "unitat no vàlida"
-
-#: config.c:1247
-#, c-format
-msgid "bad numeric config value '%s' for '%s': %s"
-msgstr "valor de configuració numèric erroni «%s» per «%s»: %s"
-
-#: config.c:1257
-#, 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:1260
-#, 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"
-
-#: config.c:1263
-#, 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"
-
-#: config.c:1266
-#, 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:1269
-#, 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:1272
-#, 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:1368
-#, c-format
-msgid "invalid value for variable %s"
-msgstr "valor no vàlid per a la variable %s"
-
-#: config.c:1389
-#, c-format
-msgid "ignoring unknown core.fsync component '%s'"
-msgstr "s'ignora el component core.fsync «%s» desconegut"
-
-#: config.c:1425
-#, c-format
-msgid "bad boolean config value '%s' for '%s'"
-msgstr "valor de configuració booleà erroni «%s» per a «%s»"
-
-#: config.c:1443
-#, 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:1452
-#, 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:1545
-#, c-format
-msgid "abbrev length out of range: %d"
-msgstr "la longitud d'«abbrev» està fora de rang: %d"
-
-#: config.c:1559 config.c:1570
-#, c-format
-msgid "bad zlib compression level %d"
-msgstr "nivell de compressió de zlib incorrecte %d"
-
-#: config.c:1660
-msgid "core.commentChar should only be one character"
-msgstr "core.commentChar només hauria de ser un caràcter"
-
-#: config.c:1692
-#, c-format
-msgid "ignoring unknown core.fsyncMethod value '%s'"
-msgstr "s'ignora el valor desconegut «%s» de core.fsyncMethod"
-
-#: config.c:1698
-msgid "core.fsyncObjectFiles is deprecated; use core.fsync instead"
-msgstr "core.fsyncObjectFiles és obsolet; useu core.fsync"
-
-#: config.c:1714
-#, c-format
-msgid "invalid mode for object creation: %s"
-msgstr "mode de creació d'objecte no vàlid: %s"
-
-#: config.c:1800
-#, c-format
-msgid "malformed value for %s"
-msgstr "valor no vàlid per a %s"
-
-#: config.c:1826
-#, c-format
-msgid "malformed value for %s: %s"
-msgstr "valor no vàlid per a %s: %s"
-
-#: config.c:1827
-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:1888 builtin/pack-objects.c:4078
-#, c-format
-msgid "bad pack compression level %d"
-msgstr "nivell de compressió de paquet %d erroni"
-
-#: config.c:2014
-#, c-format
-msgid "unable to load config blob object '%s'"
-msgstr "no s'ha pogut carregar l'objecte blob de configuració «%s»"
-
-#: config.c:2017
-#, c-format
-msgid "reference '%s' does not point to a blob"
-msgstr "la referència «%s» no assenyala a un blob"
-
-#: config.c:2035
-#, c-format
-msgid "unable to resolve config blob '%s'"
-msgstr "no s'ha pogut resoldre el blob de configuració: «%s»"
-
-#: config.c:2080
-#, c-format
-msgid "failed to parse %s"
-msgstr "s'ha produït un error en analitzar %s"
-
-#: config.c:2136
-msgid "unable to parse command-line config"
-msgstr "no s'ha pogut analitzar la configuració de la línia d'ordres"
-
-#: config.c:2512
-msgid "unknown error occurred while reading the configuration files"
-msgstr ""
-"un error desconegut ha ocorregut en llegir els fitxers de configuració"
-
-#: config.c:2686
-#, c-format
-msgid "Invalid %s: '%s'"
-msgstr "%s no vàlid: «%s»"
-
-#: config.c:2731
-#, 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:2763
-#, 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:2765
-#, 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:2850
-#, c-format
-msgid "invalid section name '%s'"
-msgstr "nom de secció no vàlid «%s»"
-
-#: config.c:2882
-#, c-format
-msgid "%s has multiple values"
-msgstr "%s té múltiples valors"
-
-#: config.c:2911
-#, c-format
-msgid "failed to write new configuration file %s"
-msgstr "no es pot escriure un nou fitxer de configuració %s"
-
-#: config.c:3177 config.c:3518
-#, c-format
-msgid "could not lock config file %s"
-msgstr "no s'ha pogut blocar el fitxer de configuració %s"
-
-#: config.c:3188
-#, c-format
-msgid "opening %s"
-msgstr "s'està obrint %s"
-
-#: config.c:3225 builtin/config.c:361
-#, c-format
-msgid "invalid pattern: %s"
-msgstr "patró no vàlid: %s"
-
-#: config.c:3250
-#, c-format
-msgid "invalid config file %s"
-msgstr "fitxer de configuració no vàlid %s"
-
-#: config.c:3263 config.c:3531
-#, c-format
-msgid "fstat on %s failed"
-msgstr "ha fallat «fstat» a %s"
-
-#: config.c:3274
-#, c-format
-msgid "unable to mmap '%s'%s"
-msgstr "no s'ha pogut fer «mmap» «%s»%s"
-
-#: config.c:3284 config.c:3536
-#, c-format
-msgid "chmod on %s failed"
-msgstr "ha fallat chmod a %s"
-
-#: config.c:3369 config.c:3633
-#, c-format
-msgid "could not write config file %s"
-msgstr "no s'ha pogut escriure el fitxer de configuració «%s»"
-
-#: config.c:3403
-#, c-format
-msgid "could not set '%s' to '%s'"
-msgstr "no s'ha pogut establir «%s» a «%s»"
-
-#: config.c:3405 builtin/remote.c:666 builtin/remote.c:885
-#: builtin/remote.c:893
-#, c-format
-msgid "could not unset '%s'"
-msgstr "no s'ha pogut desassignar «%s»"
-
-#: config.c:3509
-#, c-format
-msgid "invalid section name: %s"
-msgstr "nom de secció no vàlida: %s"
-
-#: config.c:3676
-#, c-format
-msgid "missing value for '%s'"
-msgstr "falta el valor per «%s»"
-
-#: connect.c:61
-msgid "the remote end hung up upon initial contact"
-msgstr "el costat remot ha penjat en el moment de contacte inicial"
-
-#: connect.c:63
-msgid ""
-"Could not read from remote repository.\n"
-"\n"
-"Please make sure you have the correct access rights\n"
-"and the repository exists."
-msgstr ""
-"No s'ha pogut llegir del repositori remot.\n"
-"\n"
-"Assegureu-vos que tingueu els permisos\n"
-"d'accés correctes i que el repositori existeixi."
-
-#: connect.c:81
-#, c-format
-msgid "server doesn't support '%s'"
-msgstr "el servidor no és compatible amb «%s»"
-
-#: connect.c:118
-#, c-format
-msgid "server doesn't support feature '%s'"
-msgstr "el servidor no és compatible amb la característica «%s»"
-
-#: connect.c:129
-msgid "expected flush after capabilities"
-msgstr "s'esperava un buidatge després de les capacitats"
-
-#: 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:286
-msgid "protocol error: unexpected capabilities^{}"
-msgstr "error de protocol: unexpected capabilities^{}"
-
-#: 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:310
-msgid "repository on the other end cannot be shallow"
-msgstr "el repositori de l'altre extrem no pot ser shallow"
-
-#: connect.c:349
-msgid "invalid packet"
-msgstr "paquet no vàlid"
-
-#: 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:499
-#, c-format
-msgid "unknown object format '%s' specified by server"
-msgstr "format d'objecte «%s» especificat pel servidor desconegut"
-
-#: connect.c:528
-#, c-format
-msgid "invalid ls-refs response: %s"
-msgstr "resposta de ls-refs no vàlida: %s"
-
-#: connect.c:532
-msgid "expected flush after ref listing"
-msgstr "s'esperava una neteja després del llistat de referències"
-
-#: connect.c:535
-msgid "expected response end packet after ref listing"
-msgstr ""
-"s'esperava un paquet de final de resposta després del llistat de referències"
-
-#: connect.c:670
-#, c-format
-msgid "protocol '%s' is not supported"
-msgstr "el protocol «%s» no és compatible"
-
-#: connect.c:721
-msgid "unable to set SO_KEEPALIVE on socket"
-msgstr "no s'ha pogut establir SO_KEEPALIVE al sòcol"
-
-#: connect.c:761 connect.c:824
-#, c-format
-msgid "Looking up %s ... "
-msgstr "S'està cercant %s..."
-
-#: 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:769 connect.c:840
-#, c-format
-msgid ""
-"done.\n"
-"Connecting to %s (port %s) ... "
-msgstr ""
-"fet.\n"
-"S'està connectant a %s (port %s) ... "
-
-#: connect.c:791 connect.c:868
-#, c-format
-msgid ""
-"unable to connect to %s:\n"
-"%s"
-msgstr ""
-"no s'ha pogut connectar a %s:\n"
-"%s"
-
-#. TRANSLATORS: this is the end of "Connecting to %s (port %s) ... "
-#: connect.c:797 connect.c:874
-msgid "done."
-msgstr "fet."
-
-#: connect.c:828
-#, c-format
-msgid "unable to look up %s (%s)"
-msgstr "no s'ha pogut trobar %s (%s)"
-
-#: connect.c:834
-#, c-format
-msgid "unknown port %s"
-msgstr "port desconegut %s"
-
-#: 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:973
-#, c-format
-msgid "strange port '%s' blocked"
-msgstr "s'ha bloquejat el port estrany «%s»"
-
-#: connect.c:983
-#, c-format
-msgid "cannot start proxy %s"
-msgstr "no s'ha pogut iniciar servidor intermediari «%s»"
-
-#: 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"
-
-#: 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:1251
-msgid "ssh variant 'simple' does not support -4"
-msgstr "la variant «simple» de ssh no és compatible amb -4"
-
-#: connect.c:1263
-msgid "ssh variant 'simple' does not support -6"
-msgstr "la variant «simple» de ssh no és compatible amb -6"
-
-#: 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:1392
-#, c-format
-msgid "strange pathname '%s' blocked"
-msgstr "s'ha bloquejat el nom de fitxer estrany «%s»"
-
-#: connect.c:1440
-msgid "unable to fork"
-msgstr "no s'ha pogut bifurcar"
-
-#: connected.c:109 builtin/fsck.c:189 builtin/prune.c:57
-msgid "Checking connectivity"
-msgstr "S'està comprovant la connectivitat"
-
-#: connected.c:122
-msgid "Could not run 'git rev-list'"
-msgstr "No s'ha pogut executar «git rev-list»"
-
-#: connected.c:146
-msgid "failed write to rev-list"
-msgstr "escriptura fallada al rev-list"
-
-#: 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"
-
-#: convert.c:183
-#, c-format
-msgid "illegal crlf_action %d"
-msgstr "crlf_action %d il·legal"
-
-#: convert.c:196
-#, c-format
-msgid "CRLF would be replaced by LF in %s"
-msgstr "CRLF es reemplaçà per LF en %s"
-
-#: convert.c:198
-#, c-format
-msgid ""
-"CRLF will be replaced by LF in %s.\n"
-"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"
-
-#: convert.c:206
-#, c-format
-msgid "LF would be replaced by CRLF in %s"
-msgstr "LF es reemplaçà per CRLF en %s"
-
-#: convert.c:208
-#, c-format
-msgid ""
-"LF will be replaced by CRLF in %s.\n"
-"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"
-
-#: convert.c:273
-#, c-format
-msgid "BOM is prohibited in '%s' if encoded as %s"
-msgstr "BOM està prohibida a «%s» si està codificada com a %s"
-
-#: convert.c:280
-#, c-format
-msgid ""
-"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."
-
-#: convert.c:293
-#, c-format
-msgid "BOM is required in '%s' if encoded as %s"
-msgstr "La BOM és necessària en «%s» si està codificada com a %s"
-
-#: 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."
-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."
-
-#: convert.c:408 convert.c:479
-#, c-format
-msgid "failed to encode '%s' from %s to %s"
-msgstr "s'ha produït un error en codificar «%s» des de %s a %s"
-
-#: convert.c:451
-#, c-format
-msgid "encoding '%s' from %s to %s and back is not the same"
-msgstr "codificar «%s» des de %s a %s i cap enrere no és el mateix"
-
-#: convert.c:654
-#, c-format
-msgid "cannot fork to run external filter '%s'"
-msgstr "no es pot bifurcar per a executar el filtre extern «%s»"
-
-#: convert.c:674
-#, c-format
-msgid "cannot feed the input to external filter '%s'"
-msgstr "no es pot alimentar l'entrada al filtre extern «%s»"
-
-#: convert.c:681
-#, c-format
-msgid "external filter '%s' failed %d"
-msgstr "el filtre extern «%s» ha fallat %d"
-
-#: convert.c:716 convert.c:719
-#, c-format
-msgid "read from external filter '%s' failed"
-msgstr "la lectura del filtre extern «%s» ha fallat"
-
-#: convert.c:722 convert.c:777
-#, c-format
-msgid "external filter '%s' failed"
-msgstr "el filtre extern «%s» ha fallat"
-
-#: convert.c:826
-msgid "unexpected filter type"
-msgstr "tipus de filtre inesperat"
-
-#: convert.c:837
-msgid "path name too long for external filter"
-msgstr "el nom del camí és massa gran per al filtre extern"
-
-#: 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"
-
-#: 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:1416 convert.c:1449
-#, c-format
-msgid "%s: clean filter '%s' failed"
-msgstr "%s: el filtre de netejat «%s» ha fallat"
-
-#: convert.c:1492
-#, c-format
-msgid "%s: smudge filter %s failed"
-msgstr "%s: ha fallat el filtre smudge %s"
-
-#: credential.c:96
-#, c-format
-msgid "skipping credential lookup for key: credential.%s"
-msgstr "s'està ometent la cerca de credencials per una clau: credential.%s"
-
-#: credential.c:112
-msgid "refusing to work with credential missing host field"
-msgstr ""
-"s'ha rebutjat treballar amb credencials que no tenen el camp d'amfitrió"
-
-#: credential.c:114
-msgid "refusing to work with credential missing protocol field"
-msgstr ""
-"s'ha rebutjat treballar amb credencials que no tenen el camp de protocol"
-
-#: credential.c:396
-#, 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:440
-#, c-format
-msgid "url has no scheme: %s"
-msgstr "l'url no té esquema: %s"
-
-#: credential.c:513
-#, c-format
-msgid "credential url cannot be parsed: %s"
-msgstr "no s'ha pogut analitzar l'URL de credencials: %s"
-
-#: date.c:139
-msgid "in the future"
-msgstr "en el futur"
-
-#: date.c:145
-#, c-format
-msgid "%<PRIuMAX> second ago"
-msgid_plural "%<PRIuMAX> seconds ago"
-msgstr[0] "fa %<PRIuMAX> segon"
-msgstr[1] "fa %<PRIuMAX> segons"
-
-#: date.c:152
-#, c-format
-msgid "%<PRIuMAX> minute ago"
-msgid_plural "%<PRIuMAX> minutes ago"
-msgstr[0] "fa %<PRIuMAX> minut"
-msgstr[1] "fa %<PRIuMAX> minuts"
-
-#: date.c:159
-#, c-format
-msgid "%<PRIuMAX> hour ago"
-msgid_plural "%<PRIuMAX> hours ago"
-msgstr[0] "fa %<PRIuMAX> hora"
-msgstr[1] "fa %<PRIuMAX> hores"
-
-#: date.c:166
-#, c-format
-msgid "%<PRIuMAX> day ago"
-msgid_plural "%<PRIuMAX> days ago"
-msgstr[0] "fa %<PRIuMAX> dia"
-msgstr[1] "fa %<PRIuMAX> dies"
-
-#: date.c:172
-#, c-format
-msgid "%<PRIuMAX> week ago"
-msgid_plural "%<PRIuMAX> weeks ago"
-msgstr[0] "fa %<PRIuMAX> setmana"
-msgstr[1] "fa %<PRIuMAX> setmanes"
-
-#: date.c:179
-#, c-format
-msgid "%<PRIuMAX> month ago"
-msgid_plural "%<PRIuMAX> months ago"
-msgstr[0] "fa %<PRIuMAX> mes"
-msgstr[1] "fa %<PRIuMAX> mesos"
-
-#: date.c:190
-#, c-format
-msgid "%<PRIuMAX> year"
-msgid_plural "%<PRIuMAX> years"
-msgstr[0] "%<PRIuMAX> any"
-msgstr[1] "%<PRIuMAX> anys"
-
-#. TRANSLATORS: "%s" is "<n> years"
-#: date.c:193
-#, c-format
-msgid "%s, %<PRIuMAX> month ago"
-msgid_plural "%s, %<PRIuMAX> months ago"
-msgstr[0] "fa %s i %<PRIuMAX> mes"
-msgstr[1] "fa %s i %<PRIuMAX> mesos"
-
-#: date.c:198 date.c:203
-#, c-format
-msgid "%<PRIuMAX> year ago"
-msgid_plural "%<PRIuMAX> years ago"
-msgstr[0] "fa %<PRIuMAX> any"
-msgstr[1] "fa %<PRIuMAX> anys"
-
-#: delta-islands.c:272
-msgid "Propagating island marks"
-msgstr "S'estan propagant les marques d'illa"
-
-#: delta-islands.c:290
-#, c-format
-msgid "bad tree object %s"
-msgstr "objecte d'arbre malmès %s"
-
-#: delta-islands.c:334
-#, c-format
-msgid "failed to load island regex for '%s': %s"
-msgstr ""
-"s'ha produït un error en carregar l'expressió regular de l'illa per «%s»: %s"
-
-#: delta-islands.c:390
-#, c-format
-msgid "island regex from config has too many capture groups (max=%d)"
-msgstr ""
-"l'expressió regular de l'illa des de la configuració té massa grups de "
-"captura (màx=%d)"
-
-#: delta-islands.c:467
-#, c-format
-msgid "Marked %d islands, done.\n"
-msgstr "Marcades %d illes, fet.\n"
-
-#: diff-merges.c:81 gpg-interface.c:719 gpg-interface.c:734 ls-refs.c:37
-#: parallel-checkout.c:42 sequencer.c:2805 setup.c:562 builtin/am.c:203
-#: builtin/am.c:2243 builtin/am.c:2287 builtin/blame.c:724 builtin/blame.c:742
-#: builtin/fetch.c:792 builtin/pack-objects.c:3515 builtin/pull.c:45
-#: builtin/pull.c:47 builtin/pull.c:321
-#, c-format
-msgid "invalid value for '%s': '%s'"
-msgstr "valor no vàlid per a «%s»: «%s»"
-
-#: diff-lib.c:561
-msgid "--merge-base does not work with ranges"
-msgstr "--merge-base no funciona amb intervals"
-
-#: diff-lib.c:563
-msgid "--merge-base only works with commits"
-msgstr "--merge-base només funciona amb comissions"
-
-#: diff-lib.c:580
-msgid "unable to get HEAD"
-msgstr "no s'ha pogut obtenir HEAD"
-
-#: diff-lib.c:587
-msgid "no merge base found"
-msgstr "no s'ha trobat una base de fusió"
-
-#: diff-lib.c:589
-msgid "multiple merge bases found"
-msgstr "s'han trobat múltiples bases de fusió"
-
-#: 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:262
-msgid ""
-"Not a git repository. Use --no-index to compare two paths outside a working "
-"tree"
-msgstr ""
-"No és un repositori Git. Useu --no-index per a comparar dos camins fora del "
-"directori de treball"
-
-#: diff.c:159
-#, 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:164
-#, c-format
-msgid "  Unknown dirstat parameter '%s'\n"
-msgstr "  Paràmetre de dirstat desconegut «%s»\n"
-
-#: diff.c:300
-msgid ""
-"color moved setting must be one of 'no', 'default', 'blocks', 'zebra', "
-"'dimmed-zebra', 'plain'"
-msgstr ""
-"el paràmetre de color en moviment ha de ser «no», «default», «blocks», "
-"«zebra», «dimmed-zebra» o «plain»"
-
-#: diff.c:328
-#, 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 ""
-"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:336
-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"
-
-#: diff.c:413
-#, 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:473
-#, c-format
-msgid ""
-"Found errors in 'diff.dirstat' config variable:\n"
-"%s"
-msgstr ""
-"S'han trobat errors en la variable de configuració «diff.dirstat»:\n"
-"%s"
-
-#: diff.c:4282
-#, c-format
-msgid "external diff died, stopping at %s"
-msgstr "el diff external s'ha mort, s'està aturant a %s"
-
-#: diff.c:4677 parse-options.c:1114
-#, c-format
-msgid "options '%s', '%s', '%s', and '%s' cannot be used together"
-msgstr "les opcions «%s», «%s», «%s», i «%s» no es poden usar juntes"
-
-#: diff.c:4681 parse-options.c:1118 builtin/worktree.c:578
-#, c-format
-msgid "options '%s', '%s', and '%s' cannot be used together"
-msgstr "les opcions «%s», «%s», i «%s» no es poden usar juntes"
-
-#: diff.c:4685
-#, c-format
-msgid "options '%s' and '%s' cannot be used together, use '%s' with '%s'"
-msgstr "les opcions «%s» i «%s» no es poden usar juntes, useu «%s» amb «%s»"
-
-#: diff.c:4689
-#, c-format
-msgid ""
-"options '%s' and '%s' cannot be used together, use '%s' with '%s' and '%s'"
-msgstr ""
-"les opcions «%s» i «%s» no es poden usar juntes, useu «%s» amb «%s» i «%s»"
-
-#: diff.c:4769
-msgid "--follow requires exactly one pathspec"
-msgstr "--follow requereix exactament una especificació de camí"
-
-#: diff.c:4823
-#, c-format
-msgid "invalid --stat value: %s"
-msgstr "valor --stat no vàlid: %s"
-
-#: diff.c:4828 diff.c:4833 diff.c:4838 diff.c:4843 diff.c:5319
-#: 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:4860
-#, c-format
-msgid ""
-"Failed to parse --dirstat/-X option parameter:\n"
-"%s"
-msgstr ""
-"S'ha produït un error en analitzar el paràmetre d'opció de --dirstat/-X:\n"
-"%s"
-
-#: diff.c:4893
-#, c-format
-msgid "unknown change class '%c' in --diff-filter=%s"
-msgstr "classe de canvi «%c» desconeguda a --diff-filter=%s"
-
-#: diff.c:4917
-#, c-format
-msgid "unknown value after ws-error-highlight=%.*s"
-msgstr "valor desconegut després de ws-error-highlight=%.*s"
-
-#: diff.c:4931
-#, c-format
-msgid "unable to resolve '%s'"
-msgstr "no s'ha pogut resoldre «%s»"
-
-#: diff.c:4981 diff.c:4987
-#, c-format
-msgid "%s expects <n>/<m> form"
-msgstr "%s espera una forma <n>/<m>"
-
-#: diff.c:4999
-#, c-format
-msgid "%s expects a character, got '%s'"
-msgstr "%s esperava un caràcter, s'ha rebut «%s»"
-
-#: diff.c:5020
-#, c-format
-msgid "bad --color-moved argument: %s"
-msgstr "argument --color-moved incorrecte: %s"
-
-#: diff.c:5039
-#, c-format
-msgid "invalid mode '%s' in --color-moved-ws"
-msgstr "mode «%s» no vàlid en --color-moved-ws"
-
-#: diff.c:5079
-msgid "option diff-algorithm accepts \"myers\", \"minimal\", \"patience\" and \"histogram\""
-msgstr ""
-"l'opció diff-algorithm accepta «myers», «minimal», «patience» i «histogram»"
-
-#: diff.c:5115 diff.c:5135
-#, c-format
-msgid "invalid argument to %s"
-msgstr "argument no vàlid a %s"
-
-#: diff.c:5239
-#, c-format
-msgid "invalid regex given to -I: '%s'"
-msgstr "expressió regular donada a -I: no vàlida: «%s»"
-
-#: diff.c:5288
-#, 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:5344
-#, c-format
-msgid "bad --word-diff argument: %s"
-msgstr "argument --word-diff incorrecte: %s"
-
-#: diff.c:5380
-msgid "Diff output format options"
-msgstr "Opcions del format de sortida del diff"
-
-#: diff.c:5382 diff.c:5388
-msgid "generate patch"
-msgstr "genera el pedaç"
-
-#: diff.c:5385 builtin/log.c:180
-msgid "suppress diff output"
-msgstr "omet la sortida de diferències"
-
-#: diff.c:5390 diff.c:5504 diff.c:5511
-msgid "<n>"
-msgstr "<n>"
-
-#: diff.c:5391 diff.c:5394
-msgid "generate diffs with <n> lines context"
-msgstr "genera diffs amb <n> línies de context"
-
-#: diff.c:5396
-msgid "generate the diff in raw format"
-msgstr "genera el diff en format cru"
-
-#: diff.c:5399
-msgid "synonym for '-p --raw'"
-msgstr "sinònim de «-p --raw»"
-
-#: diff.c:5403
-msgid "synonym for '-p --stat'"
-msgstr "sinònim de «-p --stat»"
-
-#: diff.c:5407
-msgid "machine friendly --stat"
-msgstr "llegible per màquina --stat"
-
-#: diff.c:5410
-msgid "output only the last line of --stat"
-msgstr "mostra només l'última línia de --stat"
-
-#: diff.c:5412 diff.c:5420
-msgid "<param1,param2>..."
-msgstr "<param1,param2>..."
-
-#: diff.c:5413
-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:5417
-msgid "synonym for --dirstat=cumulative"
-msgstr "sinònim de --dirstat=cumulative"
-
-#: diff.c:5421
-msgid "synonym for --dirstat=files,param1,param2..."
-msgstr "sinònim de --dirstat=files,param1,param2..."
-
-#: diff.c:5425
-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:5428
-msgid "condensed summary such as creations, renames and mode changes"
-msgstr "resum condensat com ara creacions, canvis de nom i mode"
-
-#: diff.c:5431
-msgid "show only names of changed files"
-msgstr "mostra només els noms de fitxers canviats"
-
-#: diff.c:5434
-msgid "show only names and status of changed files"
-msgstr "mostra només els noms i l'estat dels fitxers canviats"
-
-#: diff.c:5436
-msgid "<width>[,<name-width>[,<count>]]"
-msgstr "<amplada>[<amplada-nom>[,<recompte>]]"
-
-#: diff.c:5437
-msgid "generate diffstat"
-msgstr "genera diffstat"
-
-#: diff.c:5439 diff.c:5442 diff.c:5445
-msgid "<width>"
-msgstr "<amplada>"
-
-#: diff.c:5440
-msgid "generate diffstat with a given width"
-msgstr "genera diffstat amb una amplada donada"
-
-#: diff.c:5443
-msgid "generate diffstat with a given name width"
-msgstr "genera diffstat amb un nom d'amplada donat"
-
-#: diff.c:5446
-msgid "generate diffstat with a given graph width"
-msgstr "genera diffstat amb una amplada de graf donada"
-
-#: diff.c:5448
-msgid "<count>"
-msgstr "<comptador>"
-
-#: diff.c:5449
-msgid "generate diffstat with limited lines"
-msgstr "genera diffstat amb línies limitades"
-
-#: diff.c:5452
-msgid "generate compact summary in diffstat"
-msgstr "genera un resum compacte a diffstat"
-
-#: diff.c:5455
-msgid "output a binary diff that can be applied"
-msgstr "diff amb sortida binària que pot ser aplicada"
-
-#: diff.c:5458
-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»"
-
-#: diff.c:5460
-msgid "show colored diff"
-msgstr "mostra un diff amb colors"
-
-#: diff.c:5461
-msgid "<kind>"
-msgstr "<kind>"
-
-#: diff.c:5462
-msgid ""
-"highlight whitespace errors in the 'context', 'old' or 'new' lines in the "
-"diff"
-msgstr ""
-"ressalta els errors d'espai en blanc a les línies «context», «old» o «new» "
-"al diff"
-
-#: diff.c:5465
-msgid ""
-"do not munge pathnames and use NULs as output field terminators in --raw or "
-"--numstat"
-msgstr ""
-"no consolidis els noms de camí i utilitza NULs com a terminadors de camp de "
-"sortida en --raw o --numstat"
-
-#: diff.c:5468 diff.c:5471 diff.c:5474 diff.c:5583
-msgid "<prefix>"
-msgstr "<prefix>"
-
-#: diff.c:5469
-msgid "show the given source prefix instead of \"a/\""
-msgstr "mostra el prefix d'origen donat en lloc de «a/»"
-
-#: diff.c:5472
-msgid "show the given destination prefix instead of \"b/\""
-msgstr "mostra el prefix de destinació indicat en lloc de «b/»"
-
-#: diff.c:5475
-msgid "prepend an additional prefix to every line of output"
-msgstr "afegir un prefix addicional per a cada línia de sortida"
-
-#: diff.c:5478
-msgid "do not show any source or destination prefix"
-msgstr "no mostris cap prefix d'origen o destí"
-
-#: diff.c:5481
-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:5485 diff.c:5490 diff.c:5495
-msgid "<char>"
-msgstr "<char>"
-
-#: diff.c:5486
-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:5491
-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:5496
-msgid "specify the character to indicate a context instead of ' '"
-msgstr "especifiqueu el caràcter per a indicar context en comptes de « »"
-
-#: diff.c:5499
-msgid "Diff rename options"
-msgstr "Opcions de canvi de nom del diff"
-
-#: diff.c:5500
-msgid "<n>[/<m>]"
-msgstr "<n>[/<m>]"
-
-#: diff.c:5501
-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:5505
-msgid "detect renames"
-msgstr "detecta els canvis de noms"
-
-#: diff.c:5509
-msgid "omit the preimage for deletes"
-msgstr "omet les preimatges per les supressions"
-
-#: diff.c:5512
-msgid "detect copies"
-msgstr "detecta còpies"
-
-#: diff.c:5516
-msgid "use unmodified files as source to find copies"
-msgstr "usa els fitxers no modificats com a font per a trobar còpies"
-
-#: diff.c:5518
-msgid "disable rename detection"
-msgstr "inhabilita la detecció de canvis de nom"
-
-#: diff.c:5521
-msgid "use empty blobs as rename source"
-msgstr "usa els blobs buits com a font de canvi de nom"
-
-#: diff.c:5523
-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:5526
-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"
-
-#: diff.c:5528
-msgid "Diff algorithm options"
-msgstr "Opcions de l'algorisme Diff"
-
-#: diff.c:5530
-msgid "produce the smallest possible diff"
-msgstr "produeix el diff més petit possible"
-
-#: diff.c:5533
-msgid "ignore whitespace when comparing lines"
-msgstr "ignora els espais en blanc en comparar línies"
-
-#: diff.c:5536
-msgid "ignore changes in amount of whitespace"
-msgstr "ignora els canvis en la quantitat d'espai en blanc"
-
-#: diff.c:5539
-msgid "ignore changes in whitespace at EOL"
-msgstr "ignora els canvis d'espai en blanc al final de la línia"
-
-#: diff.c:5542
-msgid "ignore carrier-return at the end of line"
-msgstr "ignora els retorns de línia al final de la línia"
-
-#: diff.c:5545
-msgid "ignore changes whose lines are all blank"
-msgstr "ignora els canvis en línies que estan en blanc"
-
-#: diff.c:5547 diff.c:5569 diff.c:5572 diff.c:5617
-msgid "<regex>"
-msgstr "<regex>"
-
-#: diff.c:5548
-msgid "ignore changes whose all lines match <regex>"
-msgstr "ignora els canvis en les línies que coincideixen amb <regex>"
-
-#: diff.c:5551
-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:5554
-msgid "generate diff using the \"patience diff\" algorithm"
-msgstr "genera diff usant l'algorisme «patience diff»"
-
-#: diff.c:5558
-msgid "generate diff using the \"histogram diff\" algorithm"
-msgstr "genera diff usant l'algorisme «histogram diff»"
-
-#: diff.c:5560
-msgid "<algorithm>"
-msgstr "<algorisme>"
-
-#: diff.c:5561
-msgid "choose a diff algorithm"
-msgstr "trieu un algorisme per al diff"
-
-#: diff.c:5563
-msgid "<text>"
-msgstr "<text>"
-
-#: diff.c:5564
-msgid "generate diff using the \"anchored diff\" algorithm"
-msgstr "genera diff usant l'algorisme «anchored diff»"
-
-#: diff.c:5566 diff.c:5575 diff.c:5578
-msgid "<mode>"
-msgstr "<mode>"
-
-#: diff.c:5567
-msgid "show word diff, using <mode> to delimit changed words"
-msgstr ""
-"mostra el diff de paraules usant <mode> per a delimitar les paraules "
-"modificades"
-
-#: diff.c:5570
-msgid "use <regex> to decide what a word is"
-msgstr "utilitza <regex> per a decidir què és una paraula"
-
-#: diff.c:5573
-msgid "equivalent to --word-diff=color --word-diff-regex=<regex>"
-msgstr "equivalent a --word-diff=color --word-diff-regex=<regex>"
-
-#: diff.c:5576
-msgid "moved lines of code are colored differently"
-msgstr "les línies de codi que s'ha mogut s'acoloreixen diferent"
-
-#: diff.c:5579
-msgid "how white spaces are ignored in --color-moved"
-msgstr "com s'ignoren els espais en blanc a --color-moved"
-
-#: diff.c:5582
-msgid "Other diff options"
-msgstr "Altres opcions diff"
-
-#: diff.c:5584
-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"
-
-#: diff.c:5588
-msgid "treat all files as text"
-msgstr "tracta tots els fitxers com a text"
-
-#: diff.c:5590
-msgid "swap two inputs, reverse the diff"
-msgstr "intercanvia les dues entrades, inverteix el diff"
-
-#: diff.c:5592
-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:5594
-msgid "disable all output of the program"
-msgstr "inhabilita totes les sortides del programa"
-
-#: diff.c:5596
-msgid "allow an external diff helper to be executed"
-msgstr "permet executar un ajudant de diff extern"
-
-#: diff.c:5598
-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:5600
-msgid "<when>"
-msgstr "<quan>"
-
-#: diff.c:5601
-msgid "ignore changes to submodules in the diff generation"
-msgstr "ignora els canvis als submòduls en la generació del diff"
-
-#: diff.c:5604
-msgid "<format>"
-msgstr "<format>"
-
-#: diff.c:5605
-msgid "specify how differences in submodules are shown"
-msgstr "especifiqueu com es mostren els canvis als submòduls"
-
-#: diff.c:5609
-msgid "hide 'git add -N' entries from the index"
-msgstr "amaga les entrades «git add -N» de l'índex"
-
-#: diff.c:5612
-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:5614
-msgid "<string>"
-msgstr "<cadena>"
-
-#: diff.c:5615
-msgid ""
-"look for differences that change the number of occurrences of the specified "
-"string"
-msgstr ""
-"cerca les diferències que canvien el nombre d'ocurrències de la cadena "
-"especificada"
-
-#: diff.c:5618
-msgid ""
-"look for differences that change the number of occurrences of the specified "
-"regex"
-msgstr ""
-"cerca les diferències que canvien el nombre d'ocurrències de l'expressió "
-"regular especificada"
-
-#: diff.c:5621
-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:5624
-msgid "treat <string> in -S as extended POSIX regular expression"
-msgstr "tracta <cadena> a -S com a expressió regular POSIX ampliada"
-
-#: diff.c:5627
-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:5628 diff.c:5631
-msgid "<path>"
-msgstr "<camí>"
-
-#: diff.c:5629
-msgid "show the change in the specified path first"
-msgstr "mostra el canvi primer al camí especificat"
-
-#: diff.c:5632
-msgid "skip the output to the specified path"
-msgstr "omet la sortida al camí especificat"
-
-#: diff.c:5634
-msgid "<object-id>"
-msgstr "<id de l'objecte>"
-
-#: diff.c:5635
-msgid ""
-"look for differences that change the number of occurrences of the specified "
-"object"
-msgstr ""
-"cerca les diferències que canvien el nombre d'ocurrències de l'objecte "
-"especificat"
-
-#: diff.c:5637
-msgid "[(A|C|D|M|R|T|U|X|B)...[*]]"
-msgstr "[(A|C|D|M|R|T|U|X|B)...[*]]"
-
-#: diff.c:5638
-msgid "select files by diff type"
-msgstr "seleccioneu els fitxers per tipus de diff"
-
-#: diff.c:5640
-msgid "<file>"
-msgstr "<fitxer>"
-
-#: diff.c:5641
-msgid "output to a specific file"
-msgstr "sortida a un fitxer específic"
-
-#: diff.c:6321
-msgid "exhaustive rename detection was skipped due to too many files."
-msgstr ""
-"s'ha omès la detecció de canvi de nom exhaustiva perquè hi ha massa fitxers."
-
-#: diff.c:6324
-msgid "only found copies from modified paths due to too many files."
-msgstr ""
-"només s'han trobat còpies des de camins modificats perquè de massa fitxers."
-
-#: diff.c:6327
-#, 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."
-
-#: 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:1564
-msgid "Performing inexact rename detection"
-msgstr "S'està realitzant una detecció inexacta de canvis de nom"
-
-#: diffcore-rotate.c:29
-#, c-format
-msgid "No such path '%s' in the diff"
-msgstr "No existeix el camí «%s» al diff"
-
-#: 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:733 dir.c:762 dir.c:775
-#, c-format
-msgid "unrecognized pattern: '%s'"
-msgstr "patró no reconegut: «%s»"
-
-#: dir.c:790 dir.c:804
-#, c-format
-msgid "unrecognized negative pattern: '%s'"
-msgstr "patró negatiu no reconegut: «%s»"
-
-#: 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:828
-msgid "disabling cone pattern matching"
-msgstr "inhabilita la coincidència de patrons «cone»"
-
-#: dir.c:1212
-#, c-format
-msgid "cannot use %s as an exclude file"
-msgstr "no es pot usar %s com a fitxer d'exclusió"
-
-#: dir.c:2419
-#, c-format
-msgid "could not open directory '%s'"
-msgstr "no s'ha pogut obrir el directori «%s»"
-
-#: dir.c:2721
-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:2846
-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:3119
-msgid ""
-"No directory name could be guessed.\n"
-"Please specify a directory on the command line"
-msgstr ""
-"No s'ha pogut deduir cap nom de directori.\n"
-"Especifiqueu un directori en la línia d'ordres"
-
-#: dir.c:3807
-#, c-format
-msgid "index file corrupt in repo %s"
-msgstr "el fitxer d'índex al repositori %s és malmès"
-
-#: dir.c:3854 dir.c:3859
-#, c-format
-msgid "could not create directories for %s"
-msgstr "no s'han pogut crear directoris per %s"
-
-#: dir.c:3888
-#, 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
-#, 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
-msgid "Filtering content"
-msgstr "S'està filtrant el contingut"
-
-#: entry.c:500
-#, c-format
-msgid "could not stat file '%s'"
-msgstr "no s'ha pogut fer «stat» sobre el fitxer «%s»"
-
-#: environment.c:147
-#, c-format
-msgid "bad git namespace path \"%s\""
-msgstr "camí d'espai de noms git incorrecte «%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:194
-msgid "git fetch-pack: expected shallow list"
-msgstr "git fetch-pack: llista shallow esperada"
-
-#: fetch-pack.c:197
-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"
-
-#: fetch-pack.c:208
-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:228
-#, 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:239
-msgid "unable to write to remote"
-msgstr "no s'ha pogut escriure al remot"
-
-#: fetch-pack.c:397 fetch-pack.c:1460
-#, c-format
-msgid "invalid shallow line: %s"
-msgstr "línia de shallow no vàlida: %s"
-
-#: fetch-pack.c:403 fetch-pack.c:1466
-#, c-format
-msgid "invalid unshallow line: %s"
-msgstr "línia d'unshallow no vàlida: %s"
-
-#: fetch-pack.c:405 fetch-pack.c:1468
-#, c-format
-msgid "object not found: %s"
-msgstr "objecte no trobat: %s"
-
-#: fetch-pack.c:408 fetch-pack.c:1471
-#, c-format
-msgid "error in object: %s"
-msgstr "error en objecte: %s"
-
-#: fetch-pack.c:410 fetch-pack.c:1473
-#, c-format
-msgid "no shallow found: %s"
-msgstr "no s'ha trobat cap shallow: %s"
-
-#: fetch-pack.c:413 fetch-pack.c:1477
-#, c-format
-msgid "expected shallow/unshallow, got %s"
-msgstr "s'esperava shallow/unshallow, s'ha rebut %s"
-
-#: fetch-pack.c:453
-#, c-format
-msgid "got %s %d %s"
-msgstr "s'ha rebut %s %d %s"
-
-#: fetch-pack.c:470
-#, c-format
-msgid "invalid commit %s"
-msgstr "comissió no vàlida %s"
-
-#: fetch-pack.c:501
-msgid "giving up"
-msgstr "s'abandona"
-
-#: fetch-pack.c:514 progress.h:25
-msgid "done"
-msgstr "fet"
-
-#: fetch-pack.c:526
-#, c-format
-msgid "got %s (%d) %s"
-msgstr "s'ha rebut %s (%d) %s"
-
-#: fetch-pack.c:562
-#, c-format
-msgid "Marking %s as complete"
-msgstr "S'està marcant %s com a complet"
-
-#: fetch-pack.c:784
-#, c-format
-msgid "already have %s (%s)"
-msgstr "ja es té %s (%s)"
-
-#: fetch-pack.c:870
-msgid "fetch-pack: unable to fork off sideband demultiplexer"
-msgstr ""
-"fetch-pack: no s'ha pogut bifurcar del desmultiplexor de banda lateral"
-
-#: fetch-pack.c:878
-msgid "protocol error: bad pack header"
-msgstr "error de protocol: capçalera de paquet errònia"
-
-#: fetch-pack.c:974
-#, c-format
-msgid "fetch-pack: unable to fork off %s"
-msgstr "fetch-pack: no es pot bifurcar de %s"
-
-#: fetch-pack.c:980
-msgid "fetch-pack: invalid index-pack output"
-msgstr "fetch-pack: sortida d'index-pack no vàlida"
-
-#: fetch-pack.c:997
-#, c-format
-msgid "%s failed"
-msgstr "%s ha fallat"
-
-#: fetch-pack.c:999
-msgid "error in sideband demultiplexer"
-msgstr "error en desmultiplexor de banda lateral"
-
-#: fetch-pack.c:1048
-#, c-format
-msgid "Server version is %.*s"
-msgstr "La versió del servidor és %.*s"
-
-#: fetch-pack.c:1056 fetch-pack.c:1062 fetch-pack.c:1065 fetch-pack.c:1071
-#: fetch-pack.c:1075 fetch-pack.c:1079 fetch-pack.c:1083 fetch-pack.c:1087
-#: fetch-pack.c:1091 fetch-pack.c:1095 fetch-pack.c:1099 fetch-pack.c:1103
-#: fetch-pack.c:1109 fetch-pack.c:1115 fetch-pack.c:1120 fetch-pack.c:1125
-#, c-format
-msgid "Server supports %s"
-msgstr "El servidor accepta %s"
-
-#: fetch-pack.c:1058
-msgid "Server does not support shallow clients"
-msgstr "El servidor no permet clients superficials"
-
-#: fetch-pack.c:1118
-msgid "Server does not support --shallow-since"
-msgstr "El servidor no admet --shallow-since"
-
-#: fetch-pack.c:1123
-msgid "Server does not support --shallow-exclude"
-msgstr "El servidor no admet --shallow-exclude"
-
-#: fetch-pack.c:1127
-msgid "Server does not support --deepen"
-msgstr "El servidor no admet --deepen"
-
-#: fetch-pack.c:1129
-msgid "Server does not support this repository's object format"
-msgstr ""
-"El servidor no és compatible amb el format d'objecte d'aquest repositori"
-
-#: fetch-pack.c:1142
-msgid "no common commits"
-msgstr "cap comissió en comú"
-
-#: fetch-pack.c:1151 fetch-pack.c:1506 builtin/clone.c:1166
-msgid "source repository is shallow, reject to clone."
-msgstr "el repositori font és superficial, es rebutja clonar-ho."
-
-#: fetch-pack.c:1157 fetch-pack.c:1705
-msgid "git fetch-pack: fetch failed."
-msgstr "git fetch-pack: l'obtenció ha fallat."
-
-#: fetch-pack.c:1271
-#, c-format
-msgid "mismatched algorithms: client %s; server %s"
-msgstr "algoritmes no coincidents: client %s; servidor %s"
-
-#: fetch-pack.c:1275
-#, c-format
-msgid "the server does not support algorithm '%s'"
-msgstr "el servidor no és compatible amb l'algorisme «%s»"
-
-#: fetch-pack.c:1308
-msgid "Server does not support shallow requests"
-msgstr "El servidor no permet sol·licituds superficials"
-
-#: fetch-pack.c:1315
-msgid "Server supports filter"
-msgstr "El servidor accepta filtratge"
-
-#: fetch-pack.c:1358 fetch-pack.c:2087
-msgid "unable to write request to remote"
-msgstr "no s'ha pogut escriure la sol·licitud al remot"
-
-#: fetch-pack.c:1376
-#, c-format
-msgid "error reading section header '%s'"
-msgstr "error en llegir la capçalera de la secció «%s»"
-
-#: fetch-pack.c:1382
-#, c-format
-msgid "expected '%s', received '%s'"
-msgstr "s'esperava «%s», s'ha rebut «%s»"
-
-#: fetch-pack.c:1416
-#, c-format
-msgid "unexpected acknowledgment line: '%s'"
-msgstr "línia de confirmació inesperada: «%s»"
-
-#: fetch-pack.c:1421
-#, c-format
-msgid "error processing acks: %d"
-msgstr "s'ha produït un error en processar els acks: %d"
-
-#. TRANSLATORS: The parameter will be 'ready', a protocol
-#. keyword.
-#: fetch-pack.c:1435
-#, c-format
-msgid "expected packfile to be sent after '%s'"
-msgstr "s'esperava que el fitxer de paquet s'enviés després de «%s»"
-
-#. TRANSLATORS: The parameter will be 'ready', a protocol
-#. keyword.
-#: fetch-pack.c:1441
-#, c-format
-msgid "expected no other sections to be sent after no '%s'"
-msgstr "no s'esperava que cap altra secció s'enviés després de «%s»"
-
-#: fetch-pack.c:1482
-#, c-format
-msgid "error processing shallow info: %d"
-msgstr "s'ha produït un error en processar la informació superficial: %d"
-
-#: fetch-pack.c:1531
-#, c-format
-msgid "expected wanted-ref, got '%s'"
-msgstr "s'esperava wanted-ref, s'ha rebut «%s»"
-
-#: fetch-pack.c:1536
-#, c-format
-msgid "unexpected wanted-ref: '%s'"
-msgstr "wanted-ref inesperat: «%s»"
-
-#: fetch-pack.c:1541
-#, 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:1571
-msgid "git fetch-pack: expected response end packet"
-msgstr "git fetch-pack: s'esperava un paquet de final de resposta"
-
-#: fetch-pack.c:1983
-msgid "no matching remote head"
-msgstr "no hi ha cap HEAD remot coincident"
-
-#: fetch-pack.c:2006 builtin/clone.c:587
-msgid "remote did not send all necessary objects"
-msgstr "el remot no ha enviat tots els objectes necessaris"
-
-#: fetch-pack.c:2109
-msgid "unexpected 'ready' from remote"
-msgstr "«ready» no esperat des del remot"
-
-#: fetch-pack.c:2132
-#, c-format
-msgid "no such remote ref %s"
-msgstr "no existeix la referència remota %s"
-
-#: fetch-pack.c:2135
-#, c-format
-msgid "Server does not allow request for unadvertised object %s"
-msgstr "El servidor no permet sol·licitar objectes no anunciats %s"
-
-#: fsmonitor-ipc.c:119
-#, c-format
-msgid "fsmonitor_ipc__send_query: invalid path '%s'"
-msgstr "fsmonitor_ipc__send_query: camí no vàlid «%s»"
-
-#: fsmonitor-ipc.c:125
-#, c-format
-msgid "fsmonitor_ipc__send_query: unspecified error on '%s'"
-msgstr "fsmonitor_ipc__send_query: error no especificat en «%s»"
-
-#: fsmonitor-ipc.c:155
-msgid "fsmonitor--daemon is not running"
-msgstr "fsmonitor--daemon no s'està executant"
-
-#: fsmonitor-ipc.c:164
-#, c-format
-msgid "could not send '%s' command to fsmonitor--daemon"
-msgstr "no s'ha pogut enviar l'ordre «%s» a fsmonitor--daemon"
-
-#: gpg-interface.c:329 gpg-interface.c:456 gpg-interface.c:995
-#: gpg-interface.c:1011
-msgid "could not create temporary file"
-msgstr "no s'ha pogut crear el fitxer temporal"
-
-#: gpg-interface.c:332 gpg-interface.c:459
-#, c-format
-msgid "failed writing detached signature to '%s'"
-msgstr ""
-"s'ha produït un error en escriure la clau de signatura separada a «%s»"
-
-#: gpg-interface.c:450
-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:479
-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:550
-#, c-format
-msgid "ssh signing revocation file configured but not found: %s"
-msgstr "fitxer de revocació de la signatura ssh configurat però no trobat: %s"
-
-#: gpg-interface.c:638
-#, c-format
-msgid "bad/incompatible signature '%s'"
-msgstr "la signatura «%s» és incompatible o està malmesa"
-
-#: gpg-interface.c:815 gpg-interface.c:820
-#, c-format
-msgid "failed to get the ssh fingerprint for key '%s'"
-msgstr "no s'ha pogut obtenir l'empremta ssh de la clau  «%s»"
-
-#: gpg-interface.c:843
-msgid ""
-"either user.signingkey or gpg.ssh.defaultKeyCommand needs to be configured"
-msgstr ""
-"o bé user.signingkey o gpg.ssh.defaultKeyCommand han de ser configurats"
-
-#: gpg-interface.c:865
-#, c-format
-msgid "gpg.ssh.defaultKeyCommand succeeded but returned no keys: %s %s"
-msgstr ""
-"gpg.ssh.defaultKeyCommand ha tingut èxit però no ha retornat cap clau: %s %s"
-
-#: gpg-interface.c:871
-#, c-format
-msgid "gpg.ssh.defaultKeyCommand failed: %s %s"
-msgstr "gpg.ssh.defaultKeyCommand ha fallat: %s %s"
-
-#: gpg-interface.c:966
-msgid "gpg failed to sign the data"
-msgstr "gpg ha fallat en signar les dades"
-
-#: gpg-interface.c:988
-msgid "user.signingkey needs to be set for ssh signing"
-msgstr "user.signingkey s'ha d'establir per a signar amb ssh"
-
-#: gpg-interface.c:999
-#, c-format
-msgid "failed writing ssh signing key to '%s'"
-msgstr "s'ha produït un error en escriure la clau de signatura ssh a «%s»"
-
-#: gpg-interface.c:1017
-#, c-format
-msgid "failed writing ssh signing key buffer to '%s'"
-msgstr "s'ha produït un error en escriure la clau de signatura ssh a «%s»"
-
-#: gpg-interface.c:1035
-msgid ""
-"ssh-keygen -Y sign is needed for ssh signing (available in openssh version "
-"8.2p1+)"
-msgstr ""
-"ssh-keygen -Y sign és necessari per a signar amb ssh (disponible a openssh "
-"versió 8.2p1+)"
-
-#: gpg-interface.c:1047
-#, c-format
-msgid "failed reading ssh signing data buffer from '%s'"
-msgstr "s'ha produït un error en llegir la signatura ssh des de «%s»"
-
-#: graph.c:98
-#, c-format
-msgid "ignored invalid color '%.*s' in log.graphColors"
-msgstr "ignora el color no vàlid «%.*s» a log.graphColors"
-
-#: grep.c:446
-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"
-
-#: grep.c:1859
-#, c-format
-msgid "'%s': unable to read %s"
-msgstr "«%s»: no s'ha pogut llegir %s"
-
-#: grep.c:1876 setup.c:177 builtin/clone.c:308 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:1887
-#, c-format
-msgid "'%s': short read"
-msgstr "«%s»: lectura curta"
-
-#: help.c:25
-msgid "start a working area (see also: git help tutorial)"
-msgstr "començar una àrea de treball (vegeu també: git help tutorial)"
-
-#: help.c:26
-msgid "work on the current change (see also: git help everyday)"
-msgstr "treballar en el canvi actual (vegeu també: git help everyday)"
-
-#: help.c:27
-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:28
-msgid "grow, mark and tweak your common history"
-msgstr "fer créixer, marcar i ajustar la vostra història comuna"
-
-#: help.c:29
-msgid "collaborate (see also: git help workflows)"
-msgstr "col·laborar (vegeu també: git help workflow)"
-
-#: help.c:33
-msgid "Main Porcelain Commands"
-msgstr "Ordres principals de porcellana"
-
-#: help.c:34
-msgid "Ancillary Commands / Manipulators"
-msgstr "Ordres auxiliars / manipuladors"
-
-#: help.c:35
-msgid "Ancillary Commands / Interrogators"
-msgstr "Ordres auxiliars / interrogadors"
-
-#: help.c:36
-msgid "Interacting with Others"
-msgstr "Interaccionar amb altres"
-
-#: help.c:37
-msgid "Low-level Commands / Manipulators"
-msgstr "Ordres de baix nivell / Manipuladors"
-
-#: help.c:38
-msgid "Low-level Commands / Interrogators"
-msgstr "Ordres de baix nivell / Interrogadors"
-
-#: help.c:39
-msgid "Low-level Commands / Syncing Repositories"
-msgstr "Ordres de baix nivell / Sincronització de repositoris"
-
-#: help.c:40
-msgid "Low-level Commands / Internal Helpers"
-msgstr "Ordres de baix nivell / Ajudants interns"
-
-#: help.c:316
-#, c-format
-msgid "available git commands in '%s'"
-msgstr "ordres de git disponibles en «%s»"
-
-#: help.c:323
-msgid "git commands available from elsewhere on your $PATH"
-msgstr "ordres de git disponibles d'altres llocs en el vostre $PATH"
-
-#: help.c:332
-msgid "These are common Git commands used in various situations:"
-msgstr "Aquestes són ordres habituals del Git usades en diverses situacions:"
-
-#: help.c:382 git.c:100
-#, c-format
-msgid "unsupported command listing type '%s'"
-msgstr "tipus de llistat de l'ordre no compatible «%s»"
-
-#: help.c:422
-msgid "The Git concept guides are:"
-msgstr "Les guies de Git de conceptes són:"
-
-#: help.c:446
-msgid "External commands"
-msgstr "Ordres externes"
-
-#: help.c:468
-msgid "Command aliases"
-msgstr "Àlies d'ordres"
-
-#: help.c:486
-msgid "See 'git help <command>' to read about a specific subcommand"
-msgstr "Vegeu «git help <ordre>» per a llegir sobre una subordre específica"
-
-#: help.c:563
-#, c-format
-msgid ""
-"'%s' appears to be a git command, but we were not\n"
-"able to execute it. Maybe git-%s is broken?"
-msgstr ""
-"«%s» sembla una ordre de git, però no hem pogut\n"
-"executar-la. Pot ser que git-%s estigui malmès?"
-
-#: help.c:585 help.c:682
-#, 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:633
-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:655
-#, 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:660
-#, c-format
-msgid "Continuing under the assumption that you meant '%s'."
-msgstr "El procés continuarà, pressuposant que volíeu dir «%s»."
-
-#: help.c:666
-#, c-format
-msgid "Run '%s' instead [y/N]? "
-msgstr "Voleu executar «%s» en el seu lloc? [y/N]? "
-
-#: help.c:674
-#, 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:686
-msgid ""
-"\n"
-"The most similar command is"
-msgid_plural ""
-"\n"
-"The most similar commands are"
-msgstr[0] ""
-"\n"
-"L'ordre més similar és"
-msgstr[1] ""
-"\n"
-"Les ordres més similars són"
-
-#: help.c:729
-msgid "git version [<options>]"
-msgstr "git version [<opcions>]"
-
-#: help.c:784
-#, c-format
-msgid "%s: %s - %s"
-msgstr "%s: %s - %s"
-
-#: help.c:788
-msgid ""
-"\n"
-"Did you mean this?"
-msgid_plural ""
-"\n"
-"Did you mean one of these?"
-msgstr[0] ""
-"\n"
-"Volíeu dir això?"
-msgstr[1] ""
-"\n"
-"Volíeu dir un d'aquests?"
-
-#: hook.c:28
-#, 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»."
-
-#: hook.c:87
-#, c-format
-msgid "Couldn't start hook '%s'\n"
-msgstr "No s'ha pogut iniciar el lligam «%s»'\n"
-
-#: ident.c:354
-msgid "Author identity unknown\n"
-msgstr "Identitat de l'autor desconeguda\n"
-
-#: ident.c:357
-msgid "Committer identity unknown\n"
-msgstr "Es desconeix la identitat del comitent\n"
-
-#: ident.c:363
-msgid ""
-"\n"
-"*** Please tell me who you are.\n"
-"\n"
-"Run\n"
-"\n"
-"  git config --global user.email \"you@example.com\"\n"
-"  git config --global user.name \"Your Name\"\n"
-"\n"
-"to set your account's default identity.\n"
-"Omit --global to set the identity only in this repository.\n"
-"\n"
-msgstr ""
-"\n"
-"*** Digueu-me qui sou.\n"
-"\n"
-"Executeu\n"
-"\n"
-"  git config --global user.email «usuari@domini.com»\n"
-"  git config --global user.name «El vostre nom»\n"
-"\n"
-"per a establir la identitat predeterminada del vostre compte.\n"
-"Ometeu --global per a establir la identitat només en aquest repositori.\n"
-
-#: ident.c:398
-msgid "no email was given and auto-detection is disabled"
-msgstr ""
-"no s'ha proporcionat cap adreça electrònica i la detecció automàtica està "
-"inhabilitada"
-
-#: ident.c:403
-#, c-format
-msgid "unable to auto-detect email address (got '%s')"
-msgstr ""
-"no s'ha pogut detectar automàticament una adreça electrònica vàlida (s'ha "
-"rebut «%s»)"
-
-#: ident.c:420
-msgid "no name was given and auto-detection is disabled"
-msgstr ""
-"no s'ha proporcionat cap nom i la detecció automàtica està inhabilitada"
-
-#: ident.c:426
-#, c-format
-msgid "unable to auto-detect name (got '%s')"
-msgstr "no s'ha pogut detectar automàticament el nom (s'ha rebut «%s»)"
-
-#: ident.c:434
-#, c-format
-msgid "empty ident name (for <%s>) not allowed"
-msgstr "nom d'identitat buit (per <%s>) no és permès"
-
-#: ident.c:440
-#, c-format
-msgid "name consists only of disallowed characters: %s"
-msgstr "el nom conté només caràcters no permesos: %s"
-
-#: ident.c:455 builtin/commit.c:649
-#, c-format
-msgid "invalid date format: %s"
-msgstr "format de data no vàlid: %s"
-
-#: list-objects-filter-options.c:68
-msgid "expected 'tree:<depth>'"
-msgstr "s'esperava «tree:<profunditat>»"
-
-#: list-objects-filter-options.c:83
-msgid "sparse:path filters support has been dropped"
-msgstr "sparse: s'ha eliminat la implementació de filtres de camí sparse"
-
-#: list-objects-filter-options.c:90
-#, c-format
-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:109
-#, c-format
-msgid "invalid filter-spec '%s'"
-msgstr "filtre d'especificació no vàlid: «%s»"
-
-#: list-objects-filter-options.c:125
-#, c-format
-msgid "must escape char in sub-filter-spec: '%c'"
-msgstr "cal escapar el caràcter en el sub-filter-spec «%c»"
-
-#: list-objects-filter-options.c:167
-msgid "expected something after combine:"
-msgstr "s'esperava alguna cosa després de combinar:"
-
-#: list-objects-filter-options.c:249
-msgid "multiple filter-specs cannot be combined"
-msgstr "no es poden combinar múltiples especificacions de filtratge"
-
-#: list-objects-filter-options.c:365
-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"
-
-#: list-objects-filter.c:532
-#, c-format
-msgid "unable to access sparse blob in '%s'"
-msgstr "no s'ha pogut accedir a un blob dispers en «%s»"
-
-#: list-objects-filter.c:535
-#, c-format
-msgid "unable to parse sparse filter data in %s"
-msgstr "no s'han pogut analitzar les dades disperses filtrades %s"
-
-#: list-objects.c:144
-#, c-format
-msgid "entry '%s' in tree %s has tree mode, but is not a tree"
-msgstr "l'entrada «%s» a l'arbre %s té mode d'arbre, però no és un arbre"
-
-#: list-objects.c:157
-#, c-format
-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:415
-#, 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"
-
-#: lockfile.c:152
-#, c-format
-msgid ""
-"Unable to create '%s.lock': %s.\n"
-"\n"
-"Another git process seems to be running in this repository, e.g.\n"
-"an editor opened by 'git commit'. Please make sure all processes\n"
-"are terminated then try again. If it still fails, a git process\n"
-"may have crashed in this repository earlier:\n"
-"remove the file manually to continue."
-msgstr ""
-"No s'ha pogut crear «%s.lock»: %s.\n"
-"\n"
-"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 un procés git\n"
-"ha fallat en aquest repositori abans:\n"
-"elimineu el fitxer manualment per a continuar."
-
-#: lockfile.c:160
-#, c-format
-msgid "Unable to create '%s.lock': %s"
-msgstr "No s'ha pogut crear «%s.lock»: %s"
-
-#: ls-refs.c:175
-#, c-format
-msgid "unexpected line: '%s'"
-msgstr "línia inesperada: «%s»"
-
-#: ls-refs.c:179
-msgid "expected flush after ls-refs arguments"
-msgstr "s'esperava una neteja després dels arguments ls-refs"
-
-#: mailinfo.c:1050
-msgid "quoted CRLF detected"
-msgstr "CRLF citat detectat"
-
-#: mailinfo.c:1254 builtin/am.c:185 builtin/mailinfo.c:46
-#, c-format
-msgid "bad action '%s' for '%s'"
-msgstr "acció «%s» incorrecta per a «%s»"
-
-#: merge-ort.c:1630 merge-recursive.c:1214
-#, 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:1639 merge-recursive.c:1221
-#, 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)"
-
-#: merge-ort.c:1648 merge-recursive.c:1228
-#, 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:1658 merge-ort.c:1666
-#, 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:1688
-#, c-format
-msgid "Failed to merge submodule %s"
-msgstr "S'ha produït un error en fusionar el submòdul «%s»"
-
-#: merge-ort.c:1695
-#, c-format
-msgid ""
-"Failed to merge submodule %s, but a possible merge resolution exists:\n"
-"%s\n"
-msgstr ""
-"S'ha produït un error en fusionar el submòdul %s, però existeix una solució possible:\n"
-"%s\n"
-
-#: merge-ort.c:1699 merge-recursive.c:1284
-#, c-format
-msgid ""
-"If this is correct simply add it to the index for example\n"
-"by using:\n"
-"\n"
-"  git update-index --cacheinfo 160000 %s \"%s\"\n"
-"\n"
-"which will accept this suggestion.\n"
-msgstr ""
-"Si això és correcte simplement afegiu-ho a l'índex per exemple\n"
-"utilitzant:\n"
-"\n"
-"  git update-index --cacheinfo 160000 %s «%s»\n"
-"\n"
-"que acceptarà aquest suggeriment.\n"
-
-#: merge-ort.c:1712
-#, c-format
-msgid ""
-"Failed to merge submodule %s, but multiple possible merges exist:\n"
-"%s"
-msgstr ""
-"S'ha produït un error en fusionar el submòdul %s, però existeixen múltiples solucions possibles:\n"
-"%s"
-
-#: merge-ort.c:1937 merge-recursive.c:1375
-msgid "Failed to execute internal merge"
-msgstr "S'ha produït un error en executar la fusió interna"
-
-#: merge-ort.c:1942 merge-recursive.c:1380
-#, c-format
-msgid "Unable to add %s to database"
-msgstr "No s'ha pogut afegir %s a la base de dades"
-
-#: merge-ort.c:1949 merge-recursive.c:1413
-#, c-format
-msgid "Auto-merging %s"
-msgstr "S'està autofusionant %s"
-
-#: merge-ort.c:2088 merge-recursive.c:2135
-#, 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 ""
-"CONFLICTE (canvi del nom del directori implícit): el fitxer o directori "
-"existent a %s en forma de canvi del nom del directori implícit, posant-hi "
-"els camins següents a: %s."
-
-#: merge-ort.c:2098 merge-recursive.c:2145
-#, 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 ""
-"CONFLICT (canvi del nom del directori implícit) no es pot assignar més d'un "
-"camí a %s; els canvis del nom del directori implícits han intentat posar "
-"aquests camins a: %s segons"
-
-#: merge-ort.c:2156
-#, c-format
-msgid ""
-"CONFLICT (directory rename split): Unclear where to rename %s to; it was "
-"renamed to multiple other directories, with no destination getting a "
-"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."
-
-#: merge-ort.c:2310 merge-recursive.c:2481
-#, c-format
-msgid ""
-"WARNING: Avoiding applying %s -> %s rename to %s, because %s itself was "
-"renamed."
-msgstr ""
-"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:2450 merge-recursive.c:3264
-#, 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."
-
-#: merge-ort.c:2457 merge-recursive.c:3271
-#, c-format
-msgid ""
-"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."
-
-#: merge-ort.c:2470 merge-recursive.c:3267
-#, 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 ""
-"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:2478 merge-recursive.c:3274
-#, 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."
-
-#: merge-ort.c:2634
-#, 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."
-
-#: merge-ort.c:2729
-#, 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."
-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:2748 merge-ort.c:2772
-#, 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."
-
-#: merge-ort.c:3261 merge-recursive.c:3025
-#, c-format
-msgid "cannot read object %s"
-msgstr "no es pot llegir l'objecte %s"
-
-#: merge-ort.c:3264 merge-recursive.c:3028
-#, c-format
-msgid "object %s is not a blob"
-msgstr "l'objecte %s no és un blob"
-
-#: merge-ort.c:3693
-#, 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:3770
-#, c-format
-msgid ""
-"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:3777
-#, 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:3866 merge-recursive.c:3104
-msgid "content"
-msgstr "contingut"
-
-#: merge-ort.c:3868 merge-recursive.c:3108
-msgid "add/add"
-msgstr "afegiment/afegiment"
-
-#: merge-ort.c:3870 merge-recursive.c:3153
-msgid "submodule"
-msgstr "submòdul"
-
-#: merge-ort.c:3872 merge-recursive.c:3154
-#, c-format
-msgid "CONFLICT (%s): Merge conflict in %s"
-msgstr "CONFLICTE (%s): Conflicte de fusió en %s"
-
-#: merge-ort.c:3916
-#, 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."
-
-#: merge-ort.c:4212
-#, 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:4586
-#, 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"
-
-#: merge-ort-wrappers.c:13 merge-recursive.c:3723
-#, c-format
-msgid ""
-"Your local changes to the following files would be overwritten by merge:\n"
-"  %s"
-msgstr ""
-"Els canvis locals als fitxers següents se sobreescriuran per la fusió:\n"
-"  %s"
-
-#: merge-ort-wrappers.c:33 merge-recursive.c:3485 builtin/merge.c:405
-msgid "Already up to date."
-msgstr "Ja està al dia."
-
-#: merge-recursive.c:353
-msgid "(bad commit)\n"
-msgstr "(comissió errònia)\n"
-
-#: 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: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: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: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:906 merge-recursive.c:925
-msgid ": perhaps a D/F conflict?"
-msgstr ": potser un conflicte D/F?"
-
-#: 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:956 builtin/cat-file.c:47
-#, c-format
-msgid "cannot read object %s '%s'"
-msgstr "no es pot llegir l'objecte %s «%s»"
-
-#: merge-recursive.c:961
-#, c-format
-msgid "blob expected for %s '%s'"
-msgstr "blob esperat per a %s «%s»"
-
-#: 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: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: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:1236 merge-recursive.c:1249
-#, 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:1239 merge-recursive.c:1252
-#, c-format
-msgid "Fast-forwarding submodule %s"
-msgstr "Avançament ràpid al submòdul %s"
-
-#: merge-recursive.c:1276
-#, 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)"
-
-#: merge-recursive.c:1280
-#, 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:1281
-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:1293
-#, 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:1437
-#, 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:1509
-#, c-format
-msgid ""
-"CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s left "
-"in tree."
-msgstr ""
-"CONFLICTE: (%s/supressió): %s suprimit en %s i %s en %s. La versió %s de %s "
-"s'ha deixat en l'arbre."
-
-#: merge-recursive.c:1514
-#, c-format
-msgid ""
-"CONFLICT (%s/delete): %s deleted in %s and %s to %s in %s. Version %s of %s "
-"left in tree."
-msgstr ""
-"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:1521
-#, c-format
-msgid ""
-"CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s left "
-"in tree at %s."
-msgstr ""
-"CONFLICTE: (%s/supressió): %s suprimit en %s i %s en %s. La versió %s de %s "
-"s'ha deixat en l'arbre a %s."
-
-#: merge-recursive.c:1526
-#, 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 ""
-"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:1561
-msgid "rename"
-msgstr "canvi de nom"
-
-#: merge-recursive.c:1561
-msgid "renamed"
-msgstr "canviat de nom"
-
-#: merge-recursive.c:1612 merge-recursive.c:2518 merge-recursive.c:3181
-#, c-format
-msgid "Refusing to lose dirty file at %s"
-msgstr "S'està refusant a perdre el fitxer brut a %s"
-
-#: merge-recursive.c:1622
-#, 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:1680
-#, 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:1711
-#, 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:1716
-#, 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:1743
-#, c-format
-msgid ""
-"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:1748
-msgid " (left unresolved)"
-msgstr " (deixat sense resolució)"
-
-#: merge-recursive.c:1840
-#, 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:2103
-#, c-format
-msgid ""
-"CONFLICT (directory rename split): Unclear where to place %s because "
-"directory %s was renamed to multiple other directories, with no destination "
-"getting a majority of the files."
-msgstr ""
-"CONFLICTE (divisió de canvi de nom de directori): no està clar on col·locar "
-"%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:2237
-#, c-format
-msgid ""
-"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:3092
-msgid "modify"
-msgstr "modificació"
-
-#: merge-recursive.c:3092
-msgid "modified"
-msgstr "modificat"
-
-#: merge-recursive.c:3131
-#, 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:3184
-#, c-format
-msgid "Adding as %s instead"
-msgstr "S'està afegint com a %s en lloc d'això"
-
-#: merge-recursive.c:3388
-#, c-format
-msgid "Removing %s"
-msgstr "S'està eliminant %s"
-
-#: merge-recursive.c:3411
-msgid "file/directory"
-msgstr "fitxer/directori"
-
-#: merge-recursive.c:3416
-msgid "directory/file"
-msgstr "directori/fitxer"
-
-#: merge-recursive.c:3423
-#, c-format
-msgid ""
-"CONFLICT (%s): There is a directory with name %s in %s. Adding %s as %s"
-msgstr ""
-"CONFLICTE (%s): Hi ha un directori amb nom %s en %s. S'està afegint %s com a"
-" %s"
-
-#: merge-recursive.c:3432
-#, c-format
-msgid "Adding %s"
-msgstr "S'està afegint %s"
-
-#: merge-recursive.c:3441
-#, c-format
-msgid "CONFLICT (add/add): Merge conflict in %s"
-msgstr "CONFLICTE (afegiment/afegiment): Conflicte de fusió en %s"
-
-#: merge-recursive.c:3494
-#, c-format
-msgid "merging of trees %s and %s failed"
-msgstr "la fusió dels arbres %s i %s ha fallat"
-
-#: merge-recursive.c:3588
-msgid "Merging:"
-msgstr "S'està fusionant:"
-
-#: merge-recursive.c:3601
-#, 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:3651
-msgid "merge returned no commit"
-msgstr "la fusió no ha retornat cap comissió"
-
-#: merge-recursive.c:3823
-#, c-format
-msgid "Could not parse object '%s'"
-msgstr "No s'ha pogut analitzar l'objecte «%s»"
-
-#: merge-recursive.c:3841 builtin/merge.c:720 builtin/merge.c:912
-#: builtin/stash.c:489
-msgid "Unable to write index."
-msgstr "No s'ha pogut escriure l'índex."
-
-#: merge.c:41
-msgid "failed to read the cache"
-msgstr "s'ha produït un error en llegir la memòria cau"
-
-#: merge.c:102 rerere.c:705 builtin/am.c:1989 builtin/am.c:2023
-#: builtin/checkout.c:603 builtin/checkout.c:865 builtin/clone.c:714
-#: builtin/stash.c:269
-msgid "unable to write new index file"
-msgstr "no s'ha pogut escriure un fitxer d'índex nou"
-
-#: midx.c:79
-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:112
-#, c-format
-msgid "multi-pack-index file %s is too small"
-msgstr "el fitxer de l'índex multipaquet %s és massa petit"
-
-#: midx.c:128
-#, 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"
-
-#: midx.c:133
-#, c-format
-msgid "multi-pack-index version %d not recognized"
-msgstr "no es reconeix la versió %d de l'índex multipaquet"
-
-#: midx.c:138
-#, 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:155
-msgid "multi-pack-index missing required pack-name chunk"
-msgstr "falta un fragment de nom de paquet necessari al multi-index"
-
-#: midx.c:157
-msgid "multi-pack-index missing required OID fanout chunk"
-msgstr "falta un fragment «fanout» OID necessari al multi-pack-index"
-
-#: midx.c:159
-msgid "multi-pack-index missing required OID lookup chunk"
-msgstr "falta un fragment de cerca «fanout» OID necessari al multi-pack-index"
-
-#: midx.c:161
-msgid "multi-pack-index missing required object offsets chunk"
-msgstr "falta un fragment necessari dels desplaçaments al multi-pack-index"
-
-#: midx.c:180
-#, 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»"
-
-#: midx.c:228
-#, c-format
-msgid "bad pack-int-id: %u (%u total packs)"
-msgstr "pack-int-id: %u incorrecte (%u paquets en total)"
-
-#: midx.c:278
-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"
-
-#: midx.c:509
-#, c-format
-msgid "failed to add packfile '%s'"
-msgstr "no s'ha pogut afegir el fitxer de paquet «%s»"
-
-#: midx.c:515
-#, c-format
-msgid "failed to open pack-index '%s'"
-msgstr "no s'ha pogut obrir l'índex del paquet «%s»"
-
-#: midx.c:583
-#, 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:911
-msgid "cannot store reverse index file"
-msgstr "no es pot emmagatzemar el fitxer d'índex invers"
-
-#: midx.c:1009
-#, c-format
-msgid "could not parse line: %s"
-msgstr "no s'ha pogut analitzar la línia: %s"
-
-#: midx.c:1011
-#, c-format
-msgid "malformed line: %s"
-msgstr "línia mal formada: %s"
-
-#: midx.c:1181
-msgid "ignoring existing multi-pack-index; checksum mismatch"
-msgstr ""
-"s'està ignorant l'índex multipaquet existent; la suma de verificació no "
-"coincideix"
-
-#: midx.c:1206
-msgid "could not load pack"
-msgstr "no s'ha pogut carregar el paquet"
-
-#: midx.c:1212
-#, c-format
-msgid "could not open index for %s"
-msgstr "s'ha produït un error en obrir l'índex per «%s»"
-
-#: midx.c:1223
-msgid "Adding packfiles to multi-pack-index"
-msgstr "S'estan afegint fitxers empaquetats a l'índex multipaquet"
-
-#: midx.c:1266
-#, c-format
-msgid "unknown preferred pack: '%s'"
-msgstr "paquet preferit desconegut: «%s»"
-
-#: midx.c:1311
-#, c-format
-msgid "cannot select preferred pack %s with no objects"
-msgstr "no es pot seleccionar un paquet preferit %s sense objectes"
-
-#: midx.c:1343
-#, c-format
-msgid "did not see pack-file %s to drop"
-msgstr "no s'ha vist caure el fitxer empaquetat %s"
-
-#: midx.c:1389
-#, c-format
-msgid "preferred pack '%s' is expired"
-msgstr "el paquet preferit «%s» ha caducat"
-
-#: midx.c:1402
-msgid "no pack files to index."
-msgstr "no hi ha fitxers empaquetats a indexar."
-
-#: midx.c:1409
-#, fuzzy
-msgid "refusing to write multi-pack .bitmap without any objects"
-msgstr "es nega a escriure el .bitmap multi-paquet sense cap objecte"
-
-#: midx.c:1451
-msgid "could not write multi-pack bitmap"
-msgstr "no s'han pogut escriure els mapes de bits dels multipaquets"
-
-#: midx.c:1461
-msgid "could not write multi-pack-index"
-msgstr "no s'ha pogut escriure l'índex multipaquet"
-
-#: midx.c:1520 builtin/clean.c:37
-#, c-format
-msgid "failed to remove %s"
-msgstr "s'ha produït un error en eliminar %s"
-
-#: midx.c:1553
-#, c-format
-msgid "failed to clear multi-pack-index at %s"
-msgstr "no s'ha pogut netejar l'índex multipaquet a %s"
-
-#: midx.c:1616
-msgid "multi-pack-index file exists, but failed to parse"
-msgstr ""
-"el fitxer de l'índex multipaquet existeix, però no s'ha pogut analitzar"
-
-#: midx.c:1624
-msgid "incorrect checksum"
-msgstr "suma de verificació incorrecta"
-
-#: midx.c:1627
-msgid "Looking for referenced packfiles"
-msgstr "S'estan cercant fitxers empaquetats referenciats"
-
-#: midx.c:1642
-#, 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:1647
-msgid "the midx contains no oid"
-msgstr "el midx no conté cap oid"
-
-#: midx.c:1656
-msgid "Verifying OID order in multi-pack-index"
-msgstr "S'està verificant l'ordre OID a l'índex multipaquet"
-
-#: midx.c:1665
-#, 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:1685
-msgid "Sorting objects by packfile"
-msgstr "S'estan ordenant els objectes per fitxer empaquetats"
-
-#: midx.c:1692
-msgid "Verifying object offsets"
-msgstr "S'estan verificant els desplaçaments dels objectes"
-
-#: midx.c:1708
-#, 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"
-
-#: midx.c:1714
-#, 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:1723
-#, 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>"
-
-#: midx.c:1750
-msgid "Counting referenced objects"
-msgstr "S'estan comptant els objectes referenciats"
-
-#: midx.c:1760
-msgid "Finding and deleting unreferenced packfiles"
-msgstr "S'estan cercant i suprimint els fitxers de paquets no referenciats"
-
-#: midx.c:1952
-msgid "could not start pack-objects"
-msgstr "no s'ha pogut iniciar el pack-objects"
-
-#: midx.c:1972
-msgid "could not finish pack-objects"
-msgstr "no s'ha pogut finalitzar el pack-objects"
-
-#: name-hash.c:542
-#, c-format
-msgid "unable to create lazy_dir thread: %s"
-msgstr "no s'ha pogut crear el fil «lazy_dir» :%s"
-
-#: name-hash.c:564
-#, c-format
-msgid "unable to create lazy_name thread: %s"
-msgstr "no s'ha pogut crear un fil «lazy_name»: %s"
-
-#: name-hash.c:570
-#, c-format
-msgid "unable to join lazy_name thread: %s"
-msgstr "no s'ha pogut unir el fil «lazy_name»: %s"
-
-#: notes-merge.c:276
-#, 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."
-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."
-
-#: notes-merge.c:283
-#, c-format
-msgid "You have not concluded your notes merge (%s exists)."
-msgstr "No heu conclòs la vostra fusió de notes (%s existeix)."
-
-#: notes-utils.c:46
-msgid "Cannot commit uninitialized/unreferenced notes tree"
-msgstr "No es pot cometre un arbre de notes no inicialitzat / no referenciat"
-
-#: notes-utils.c:105
-#, c-format
-msgid "Bad notes.rewriteMode value: '%s'"
-msgstr "Valor de notes.rewriteMode erroni: «%s»"
-
-#: notes-utils.c:115
-#, c-format
-msgid "Refusing to rewrite notes in %s (outside of refs/notes/)"
-msgstr "S'està refusant reescriure les notes en %s (fora de refs/notes/)"
-
-#. 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:457
-#, 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"
-
-#: object-file.c:515
-#, 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:589
-#, c-format
-msgid "%s: ignoring alternate object stores, nesting too deep"
-msgstr ""
-"%s: s'estan ignorant els emmagatzematges alternatius d'objectes, imbricació "
-"massa profunda"
-
-#: object-file.c:596
-#, c-format
-msgid "unable to normalize object directory: %s"
-msgstr "no s'ha pogut normalitzar el directori de l'objecte: %s"
-
-#: object-file.c:639
-msgid "unable to fdopen alternates lockfile"
-msgstr "no s'ha pogut fer «fdopen» al fitxer de bloqueig alternatiu"
-
-#: object-file.c:657
-msgid "unable to read alternates file"
-msgstr "no es pot llegir el fitxer «alternates»"
-
-#: object-file.c:664
-msgid "unable to move new alternates file into place"
-msgstr "no s'ha pogut moure el nou fitxer «alternates» al lloc"
-
-#: object-file.c:742
-#, c-format
-msgid "path '%s' does not exist"
-msgstr "el camí «%s» no existeix"
-
-#: object-file.c:763
-#, 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:769
-#, 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:775
-#, c-format
-msgid "reference repository '%s' is shallow"
-msgstr "el repositori de referència «%s» és superficial"
-
-#: object-file.c:783
-#, c-format
-msgid "reference repository '%s' is grafted"
-msgstr "el repositori de referència «%s» és empeltat"
-
-#: object-file.c:814
-#, 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:864
-#, 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:1014
-#, 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:1049
-#, c-format
-msgid "mmap failed%s"
-msgstr "mmap ha fallat%s"
-
-#: object-file.c:1230
-#, c-format
-msgid "object file %s is empty"
-msgstr "el tipus d'objecte %s és buit"
-
-#: object-file.c:1349 object-file.c:2588
-#, c-format
-msgid "corrupt loose object '%s'"
-msgstr "objecte solt corrupte «%s»"
-
-#: object-file.c:1351 object-file.c:2592
-#, c-format
-msgid "garbage at end of loose object '%s'"
-msgstr "brossa al final de l'objecte solt «%s»"
-
-#: object-file.c:1473
-#, c-format
-msgid "unable to parse %s header"
-msgstr "no s'ha pogut analitzar la capçalera %s"
-
-#: object-file.c:1475
-msgid "invalid object type"
-msgstr "tipus d'objecte és incorrecte"
-
-#: object-file.c:1486
-#, c-format
-msgid "unable to unpack %s header"
-msgstr "no s'ha pogut desempaquetar la capçalera %s"
-
-#: object-file.c:1490
-#, c-format
-msgid "header for %s too long, exceeds %d bytes"
-msgstr "la capçalera per a %s és massa llarga, supera els %d bytes"
-
-#: object-file.c:1720
-#, c-format
-msgid "failed to read object %s"
-msgstr "s'ha produït un error en llegir l'objecte %s"
-
-#: object-file.c:1724
-#, c-format
-msgid "replacement %s not found for %s"
-msgstr "no s'ha trobat el reemplaçament %s per a %s"
-
-#: object-file.c:1728
-#, c-format
-msgid "loose object %s (stored in %s) is corrupt"
-msgstr "l'objecte solt %s (emmagatzemat a %s) és corrupte"
-
-#: object-file.c:1732
-#, c-format
-msgid "packed object %s (stored in %s) is corrupt"
-msgstr "l'objecte empaquetat %s (emmagatzemat a %s) és corrupte"
-
-#: object-file.c:1855
-#, c-format
-msgid "unable to write file %s"
-msgstr "no s'ha pogut escriure al fitxer %s"
-
-#: object-file.c:1862
-#, c-format
-msgid "unable to set permission to '%s'"
-msgstr "no s'ha pogut establir el permís a «%s»"
-
-#: object-file.c:1869
-msgid "file write error"
-msgstr "s'ha produït un error en escriure al fitxer"
-
-#: object-file.c:1904
-msgid "error when closing loose object file"
-msgstr "error en tancar el fitxer d'objecte solt"
-
-#: object-file.c:1971
-#, 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"
-
-#: object-file.c:1973
-msgid "unable to create temporary file"
-msgstr "no s'ha pogut crear un fitxer temporal"
-
-#: object-file.c:1997
-msgid "unable to write loose object file"
-msgstr "no s'ha pogut escriure el fitxer d'objecte solt"
-
-#: object-file.c:2003
-#, c-format
-msgid "unable to deflate new object %s (%d)"
-msgstr "no s'ha pogut desinflar l'object nou %s (%d)"
-
-#: object-file.c:2007
-#, c-format
-msgid "deflateEnd on object %s failed (%d)"
-msgstr "ha fallat deflateEnd a l'objecte %s(%d)"
-
-#: object-file.c:2011
-#, 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:2022 builtin/pack-objects.c:1251
-#, c-format
-msgid "failed utime() on %s"
-msgstr "ha fallat utime() a %s"
-
-#: object-file.c:2100
-#, c-format
-msgid "cannot read object for %s"
-msgstr "no es pot llegir l'objecte per a %s"
-
-#: object-file.c:2151
-msgid "corrupt commit"
-msgstr "comissió corrupta"
-
-#: object-file.c:2159
-msgid "corrupt tag"
-msgstr "etiqueta corrupta"
-
-#: object-file.c:2259
-#, c-format
-msgid "read error while indexing %s"
-msgstr "error de lectura mentre s'indexava %s"
-
-#: object-file.c:2262
-#, c-format
-msgid "short read while indexing %s"
-msgstr "lectura curta mentre s'indexa %s"
-
-#: object-file.c:2335 object-file.c:2345
-#, c-format
-msgid "%s: failed to insert into database"
-msgstr "%s: no s'han pogut inserir a la base de dades"
-
-#: object-file.c:2351
-#, c-format
-msgid "%s: unsupported file type"
-msgstr "%s: tipus de fitxer no suportat"
-
-#: object-file.c:2375 builtin/fetch.c:1494
-#, c-format
-msgid "%s is not a valid object"
-msgstr "%s no és un objecte vàlid"
-
-#: object-file.c:2377
-#, c-format
-msgid "%s is not a valid '%s' object"
-msgstr "%s no és un objecte de «%s» vàlid"
-
-#: object-file.c:2404
-#, c-format
-msgid "unable to open %s"
-msgstr "no s'ha pogut obrir %s"
-
-#: object-file.c:2599
-#, c-format
-msgid "hash mismatch for %s (expected %s)"
-msgstr "no coincideix la suma per a %s (s'esperava %s)"
-
-#: object-file.c:2622
-#, c-format
-msgid "unable to mmap %s"
-msgstr "no s'ha pogut fer «mmap» %s"
-
-#: object-file.c:2628
-#, c-format
-msgid "unable to unpack header of %s"
-msgstr "no s'ha pogut desempaquetar la capçalera de %s"
-
-#: object-file.c:2633
-#, c-format
-msgid "unable to parse header of %s"
-msgstr "no s'ha pogut analitzar la capçalera de %s"
-
-#: object-file.c:2644
-#, c-format
-msgid "unable to unpack contents of %s"
-msgstr "no s'han pogut desempaquetar els continguts de %s"
-
-#. TRANSLATORS: This is a line of ambiguous object
-#. output shown when we cannot look up or parse the
-#. object in question. E.g. "deadbeef [bad object]".
-#: object-name.c:382
-#, c-format
-msgid "%s [bad object]"
-msgstr "%s [objecte incorrecte]"
-
-#. TRANSLATORS: This is a line of ambiguous commit
-#. object output. E.g.:
-#. *
-#.    "deadbeef commit 2021-01-01 - Some Commit Message"
-#: object-name.c:407
-#, c-format
-msgid "%s commit %s - %s"
-msgstr "%s comissió %s - %s"
-
-#. TRANSLATORS: This is a line of ambiguous
-#. tag object output. E.g.:
-#. *
-#.    "deadbeef tag 2022-01-01 - Some Tag Message"
-#. *
-#. The second argument is the YYYY-MM-DD found
-#. in the tag.
-#. *
-#. The third argument is the "tag" string
-#. from object.c.
-#: object-name.c:428
-#, c-format
-msgid "%s tag %s - %s"
-msgstr "%s etiqueta %s - %s"
-
-#. TRANSLATORS: This is a line of ambiguous
-#. tag object output where we couldn't parse
-#. the tag itself. E.g.:
-#. *
-#.    "deadbeef [bad tag, could not parse it]"
-#: object-name.c:439
-#, c-format, fuzzy
-msgid "%s [bad tag, could not parse it]"
-msgstr "tagetiqueta dolenta, no s'ha pogut analitzar]"
-
-#. TRANSLATORS: This is a line of ambiguous <type>
-#. object output. E.g. "deadbeef tree".
-#: object-name.c:447
-#, c-format, fuzzy
-msgid "%s tree"
-msgstr "arbre del 0%"
-
-#. TRANSLATORS: This is a line of ambiguous <type>
-#. object output. E.g. "deadbeef blob".
-#: object-name.c:453
-#, c-format, fuzzy
-msgid "%s blob"
-msgstr "blob"
-
-#: object-name.c:569
-#, c-format
-msgid "short object ID %s is ambiguous"
-msgstr "l'id d'objecte curt %s és ambigu"
-
-#. TRANSLATORS: The argument is the list of ambiguous
-#. objects composed in show_ambiguous_object(). See
-#. its "TRANSLATORS" comments for details.
-#: object-name.c:591
-#, c-format
-msgid ""
-"The candidates are:\n"
-"%s"
-msgstr ""
-"Els candidats són:\n"
-"%s"
-
-#: object-name.c:888
-msgid ""
-"Git normally never creates a ref that ends with 40 hex characters\n"
-"because it will be ignored when you just specify 40-hex. These refs\n"
-"may be created by mistake. For example,\n"
-"\n"
-"  git switch -c $br $(git rev-parse ...)\n"
-"\n"
-"where \"$br\" is somehow empty and a 40-hex ref is created. Please\n"
-"examine these refs and maybe delete them. Turn this message off by\n"
-"running \"git config advice.objectNameWarning false\""
-msgstr ""
-"Git normalment mai crea una referència que acabi amb 40 caràcters\n"
-"hexadecimals perquè s'ignorarà quan només especifiqueu 40 caràcters\n"
-"hexadecimals. Aquestes referències es poden crear per error. Per\n"
-"exemple,\n"
-"\n"
-"  git switch -c $br $(git rev-parse ...)\n"
-"\n"
-"on «$br» és buida per algun motiu i es crea una referència de 40 caràcters\n"
-"hexadecimals. Examineu aquestes referències i potser\n"
-"suprimiu-les. Desactiveu aquest missatge executant\n"
-"«git config advice.objectNameWarning false»"
-
-#: object-name.c:1008
-#, c-format
-msgid "log for '%.*s' only goes back to %s"
-msgstr "registre per a «%.*s» només retorna a %s"
-
-#: object-name.c:1016
-#, c-format
-msgid "log for '%.*s' only has %d entries"
-msgstr "registre per a «%.*s» només té %d entrades"
-
-#: object-name.c:1794
-#, 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:1800
-#, c-format
-msgid ""
-"path '%s' exists, but not '%s'\n"
-"hint: Did you mean '%.*s:%s' aka '%.*s:./%s'?"
-msgstr ""
-"el camí «%s» existeix, però no «%s»\n"
-"consell: volíeu dir «%.*s:%s» conegut com a «%.*s:./%s»?"
-
-#: object-name.c:1809
-#, c-format
-msgid "path '%s' does not exist in '%.*s'"
-msgstr "el camí «%s» no existeix en «%.*s»"
-
-#: object-name.c:1837
-#, 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»?"
-
-#: object-name.c:1853
-#, 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»?"
-
-#: object-name.c:1861
-#, 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:1863
-#, 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:1876
-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:1901
-#, c-format, fuzzy
-msgid "<object>:<path> required, only <object> '%s' given"
-msgstr "<object>:<path> requerit, només <object>'%s' donat"
-
-#: object-name.c:2014
-#, c-format
-msgid "invalid object name '%.*s'."
-msgstr "nom d'objecte no vàlid «%.*s»."
-
-#: object.c:53
-#, c-format
-msgid "invalid object type \"%s\""
-msgstr "tipus d'objecte «%s» no vàlid"
-
-#: object.c:173
-#, c-format
-msgid "object %s is a %s, not a %s"
-msgstr "l'objecte %s és %s, no pas %s"
-
-#: 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:263
-#, c-format
-msgid "unable to parse object: %s"
-msgstr "no s'ha pogut analitzar l'objecte: %s"
-
-#: object.c:283 object.c:294
-#, c-format
-msgid "hash mismatch %s"
-msgstr "el resum no coincideix %s"
-
-#: pack-bitmap.c:353
-msgid "multi-pack bitmap is missing required reverse index"
-msgstr "falta l'índex invers necessari al mapa de bits multipaquet"
-
-#: pack-bitmap.c:433
-msgid "load_reverse_index: could not open pack"
-msgstr "load_reverse_index: no s'ha pogut obrir el paquet"
-
-#: pack-bitmap.c:1072 pack-bitmap.c:1078 builtin/pack-objects.c:2432
-#, c-format
-msgid "unable to get size of %s"
-msgstr "no s'ha pogut obtenir la mida de %s"
-
-#: pack-bitmap.c:1937
-#, c-format
-msgid "could not find %s in pack %s at offset %<PRIuMAX>"
-msgstr "no s'ha pogut trobar %s al paquet %s al desplaçament %<PRIuMAX>"
-
-#: pack-bitmap.c:1973 builtin/rev-list.c:91
-#, c-format
-msgid "unable to get disk usage of %s"
-msgstr "no s'ha pogut obtenir l'ús del disc de %s"
-
-#: pack-revindex.c:221
-#, c-format
-msgid "reverse-index file %s is too small"
-msgstr "el fitxer d'índex invers %s és massa petit"
-
-#: pack-revindex.c:226
-#, c-format
-msgid "reverse-index file %s is corrupt"
-msgstr "el fitxer d'índex invers %s està malmès"
-
-#: pack-revindex.c:234
-#, c-format
-msgid "reverse-index file %s has unknown signature"
-msgstr "el fitxer d'índex invers %s té una signatura desconeguda"
-
-#: pack-revindex.c:238
-#, c-format
-msgid "reverse-index file %s has unsupported version %<PRIu32>"
-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 "el fitxer d'índex invers %s té un ID de resum %<PRIu32> no admès"
-
-#: 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:270
-#, c-format
-msgid "could not stat: %s"
-msgstr "no s'ha pogut fer stat a: %s"
-
-#: 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:521
-#, c-format
-msgid "could not write '%s' promisor file"
-msgstr "no s'ha pogut escriure «%s» al fitxer «promisor»"
-
-#: packfile.c:627
-msgid "offset before end of packfile (broken .idx?)"
-msgstr "desplaçament abans de la fi del fitxer de paquet (.idx trencat?)"
-
-#: packfile.c:657
-#, c-format
-msgid "packfile %s cannot be mapped%s"
-msgstr "el fitxer de paquet %s no es pot mapar%s"
-
-#: packfile.c:1924
-#, 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:1928
-#, 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:21 parse-options-cb.c:25 builtin/commit-graph.c:175
-#, c-format
-msgid "option `%s' expects a numerical value"
-msgstr "l'opció «%s» espera un valor numèric"
-
-#: parse-options-cb.c:42
-#, c-format
-msgid "malformed expiration date '%s'"
-msgstr "data de venciment «%s» mal formada"
-
-#: parse-options-cb.c:55
-#, c-format
-msgid "option `%s' expects \"always\", \"auto\", or \"never\""
-msgstr "l'opció «%s» espera «always», «auto» o «never»"
-
-#: parse-options-cb.c:133 parse-options-cb.c:150
-#, c-format
-msgid "malformed object name '%s'"
-msgstr "nom d'objecte «%s» mal format"
-
-#: parse-options-cb.c:307
-#, c-format
-msgid "option `%s' expects \"%s\" or \"%s\""
-msgstr "l'opció «%s» espera «%s» o «%s»"
-
-#: parse-options.c:58
-#, c-format
-msgid "%s requires a value"
-msgstr "%s requereix un valor"
-
-#: parse-options.c:93
-#, c-format
-msgid "%s is incompatible with %s"
-msgstr "%s és incompatible amb %s"
-
-#: parse-options.c:98
-#, c-format
-msgid "%s : incompatible with something else"
-msgstr "%s: és incompatible amb alguna altra cosa"
-
-#: parse-options.c:112 parse-options.c:116
-#, c-format
-msgid "%s takes no value"
-msgstr "%s no accepta cap valor"
-
-#: parse-options.c:114
-#, c-format
-msgid "%s isn't available"
-msgstr "%s no és disponible"
-
-#: 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: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:428 parse-options.c:436
-#, c-format
-msgid "did you mean `--%s` (with two dashes)?"
-msgstr "voleu dir «--%s» (amb dos guionets)?"
-
-#: parse-options.c:678 parse-options.c:1054
-#, c-format
-msgid "alias of --%s"
-msgstr "àlies de --%s"
-
-#: parse-options.c:892
-#, c-format
-msgid "unknown option `%s'"
-msgstr "opció desconeguda «%s»"
-
-#: parse-options.c:894
-#, c-format
-msgid "unknown switch `%c'"
-msgstr "opció «%c» desconeguda"
-
-#: parse-options.c:896
-#, c-format
-msgid "unknown non-ascii option in string: `%s'"
-msgstr "opció no ascii desconeguda en la cadena: «%s»"
-
-#: parse-options.c:920
-msgid "..."
-msgstr "..."
-
-#: parse-options.c:934
-#, c-format
-msgid "usage: %s"
-msgstr "ús: %s"
-
-#. TRANSLATORS: the colon here should align with the
-#. one in "usage: %s" translation.
-#: parse-options.c:949
-#, c-format
-msgid "   or: %s"
-msgstr "   o: %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:970
-#, c-format
-msgid "%*s%s"
-msgstr "%*s%s"
-
-#: parse-options.c:993
-#, c-format
-msgid "    %s"
-msgstr "    %s"
-
-#: parse-options.c:1040
-msgid "-NUM"
-msgstr "-NUM"
-
-#: 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: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:168
-msgid "Only one 'attr:' specification is allowed."
-msgstr "Només es permet una especificació «attr:»."
-
-#: pathspec.c:171
-msgid "attr spec must not be empty"
-msgstr "una especificació d'atribut no pot estar buida"
-
-#: pathspec.c:214
-#, c-format
-msgid "invalid attribute name %s"
-msgstr "nom d'atribut no vàlid %s"
-
-#: 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:286
-msgid ""
-"global 'literal' pathspec setting is incompatible with all other global "
-"pathspec settings"
-msgstr ""
-"el paràmetre d'especificació de camí «literal» global és incompatible amb "
-"tots els altres paràmetres d'especificació de camí globals"
-
-#: 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: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: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:390
-#, c-format
-msgid "Unimplemented pathspec magic '%c' in '%s'"
-msgstr "Màgia d'especificació de camí no implementada «%c» en «%s»"
-
-#: pathspec.c:449
-#, c-format
-msgid "%s: 'literal' and 'glob' are incompatible"
-msgstr "%s: «literal» i «glob» són incompatibles"
-
-#: pathspec.c:465
-#, c-format
-msgid "%s: '%s' is outside repository at '%s'"
-msgstr "%s: «%s» està fora del repositori en «%s»"
-
-#: pathspec.c:541
-#, c-format
-msgid "'%s' (mnemonic: '%c')"
-msgstr "«%s» (mnemònic: «%c»)"
-
-#: 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: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:663
-#, c-format
-msgid "line is badly quoted: %s"
-msgstr "la línia està mal citada: %s"
-
-#: pkt-line.c:92
-msgid "unable to write flush packet"
-msgstr "no s'ha pogut escriure el paquet de buidatge"
-
-#: pkt-line.c:99
-msgid "unable to write delim packet"
-msgstr "no s'ha pogut escriure el paquet delim"
-
-#: pkt-line.c:106
-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
-msgid "protocol error: impossibly long line"
-msgstr "error de protocol: longitud de línia impossible"
-
-#: pkt-line.c:169 pkt-line.c:171
-msgid "packet write with format failed"
-msgstr "ha fallat l'escriptura del paquet amb format"
-
-#: 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 "
-"paquet"
-
-#: pkt-line.c:222
-#, c-format
-msgid "packet write failed: %s"
-msgstr "no s'ha pogut escriure el paquet: %s"
-
-#: pkt-line.c:349 pkt-line.c:350
-msgid "read error"
-msgstr "error de lectura"
-
-#: pkt-line.c:360 pkt-line.c:361
-msgid "the remote end hung up unexpectedly"
-msgstr "el remot ha penjat inesperadament"
-
-#: pkt-line.c:417 pkt-line.c:419
-#, 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:434 pkt-line.c:436 pkt-line.c:442 pkt-line.c:444
-#, c-format
-msgid "protocol error: bad line length %d"
-msgstr "error de protocol: longitud de línia errònia %d"
-
-#: pkt-line.c:472 sideband.c:165
-#, c-format
-msgid "remote error: %s"
-msgstr "error remot: %s"
-
-#: preload-index.c:125
-msgid "Refreshing index"
-msgstr "S'està actualitzant l'índex"
-
-#: preload-index.c:144
-#, c-format
-msgid "unable to create threaded lstat: %s"
-msgstr "no s'han pogut crear lstat amb fils %s"
-
-#: pretty.c:1051
-msgid "unable to parse --pretty format"
-msgstr "no s'ha pogut analitzar el format --pretty"
-
-#: promisor-remote.c:31
-msgid "promisor-remote: unable to fork off fetch subprocess"
-msgstr "promisor-remote: no es pot bifurcar el subprocés d'obtenció"
-
-#: 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 al subprocés d'obtenció"
-
-#: promisor-remote.c:44
-msgid "promisor-remote: could not close stdin to fetch subprocess"
-msgstr "promisor-remote: no s'ha pogut tancar stdin al subprocés d'obtenció"
-
-#: 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"
-
-#: protocol-caps.c:103
-msgid "object-info: expected flush after arguments"
-msgstr "object-info: s'esperava una neteja després dels arguments"
-
-#: prune-packed.c:35
-msgid "Removing duplicate objects"
-msgstr "S'estan eliminant els objectes duplicats"
-
-#: range-diff.c:68
-msgid "could not start `log`"
-msgstr "no s'ha pogut iniciar «log»"
-
-#: range-diff.c:70
-msgid "could not read `log` output"
-msgstr "no s'ha pogut llegir la sortida de «log»"
-
-#: range-diff.c:98 sequencer.c:5575
-#, c-format
-msgid "could not parse commit '%s'"
-msgstr "no s'ha pogut analitzar la comissió «%s»"
-
-#: range-diff.c:109
-#, c-format
-msgid ""
-"could not parse first line of `log` output: did not start with 'commit ': "
-"'%s'"
-msgstr ""
-"no s'ha pogut analitzar la primera línia de la sortida «log»: no començava "
-"amb «commit»: «%s»"
-
-#: range-diff.c:132
-#, 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:300
-msgid "failed to generate diff"
-msgstr "s'ha produït un error en generar el diff"
-
-#: range-diff.c:558 range-diff.c:560
-#, 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:737
-#, 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:753
-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:775
-#, 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:780 builtin/submodule--helper.c:3359
-#, c-format
-msgid "'%s' does not have a commit checked out"
-msgstr "«%s» no té una comissió comprovada"
-
-#: read-cache.c:832
-#, c-format
-msgid "unable to index file '%s'"
-msgstr "no es pot llegir indexar el fitxer «%s»"
-
-#: read-cache.c:851
-#, c-format
-msgid "unable to add '%s' to index"
-msgstr "no s'ha pogut afegir «%s» a l'índex"
-
-#: read-cache.c:862
-#, c-format
-msgid "unable to stat '%s'"
-msgstr "no s'ha pogut fer «stat» a «%s»"
-
-#: read-cache.c:1404
-#, 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:1619
-msgid "Refresh index"
-msgstr "Actualitza l'índex"
-
-#: read-cache.c:1751
-#, c-format
-msgid ""
-"index.version set, but the value is invalid.\n"
-"Using version %i"
-msgstr ""
-"index.version està establerta, però el valor no és vàlid.\n"
-"S'està usant la versió %i"
-
-#: read-cache.c:1761
-#, c-format
-msgid ""
-"GIT_INDEX_VERSION set, but the value is invalid.\n"
-"Using version %i"
-msgstr ""
-"GIT_INDEX_VERSION està establerta, però el valor no és vàlid.\n"
-"S'està usant la versió %i"
-
-#: read-cache.c:1817
-#, c-format
-msgid "bad signature 0x%08x"
-msgstr "signatura malmesa 0x%08x"
-
-#: read-cache.c:1820
-#, c-format
-msgid "bad index version %d"
-msgstr "versió d'índex incorrecta %d"
-
-#: read-cache.c:1829
-msgid "bad index file sha1 signature"
-msgstr "signatura sha1 malmesa al fitxer d'índex"
-
-#: read-cache.c:1863
-#, 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:1865
-#, c-format
-msgid "ignoring %.4s extension"
-msgstr "s'està ignorant l'extensió %.4s"
-
-#: read-cache.c:1902
-#, c-format
-msgid "unknown index entry format 0x%08x"
-msgstr "format d'entrada d'índex desconeguda «0x%08x»"
-
-#: read-cache.c:1918
-#, 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:1975
-msgid "unordered stage entries in index"
-msgstr "entrades «stage» no ordenades en l'índex"
-
-#: read-cache.c:1978
-#, c-format
-msgid "multiple stage entries for merged file '%s'"
-msgstr "múltiples entrades «stage» per al fitxer fusionat «%s»"
-
-#: read-cache.c:1981
-#, c-format
-msgid "unordered stage entries for '%s'"
-msgstr "entrades «stage» no ordenades per a «%s»"
-
-#: read-cache.c:2096 read-cache.c:2402 rerere.c:549 rerere.c:583 rerere.c:1096
-#: submodule.c:1831 builtin/add.c:586 builtin/check-ignore.c:183
-#: builtin/checkout.c:532 builtin/checkout.c:724 builtin/clean.c:1016
-#: builtin/commit.c:379 builtin/diff-tree.c:122 builtin/grep.c:521
-#: builtin/mv.c:148 builtin/reset.c:506 builtin/rm.c:293
-#: builtin/submodule--helper.c:335 builtin/submodule--helper.c:3319
-msgid "index file corrupt"
-msgstr "fitxer d'índex malmès"
-
-#: read-cache.c:2240
-#, 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:2253
-#, 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:2286
-#, c-format
-msgid "%s: index file open failed"
-msgstr "%s: ha fallat l'obertura del fitxer d'índex"
-
-#: read-cache.c:2290
-#, c-format
-msgid "%s: cannot stat the open index"
-msgstr "%s: no es pot fer «stat» a l'índex obert"
-
-#: read-cache.c:2294
-#, c-format
-msgid "%s: index file smaller than expected"
-msgstr "%s: fitxer d'índex més petit que s'esperava"
-
-#: read-cache.c:2298
-#, c-format
-msgid "%s: unable to map index file%s"
-msgstr "%s: no es pot mapar el fitxer d'índex%s"
-
-#: read-cache.c:2341
-#, 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:2368
-#, 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:2414
-#, c-format
-msgid "could not freshen shared index '%s'"
-msgstr "no s'ha pogut refrescar l'índex compartit «%s»"
-
-#: read-cache.c:2473
-#, 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:3032
-#, fuzzy
-msgid "cannot write split index for a sparse index"
-msgstr "no es pot escriure l'índex de divisió per a un índex dispers"
-
-#: read-cache.c:3114 strbuf.c:1192 wrapper.c:717 builtin/merge.c:1156
-#, c-format
-msgid "could not close '%s'"
-msgstr "no s'ha pogut tancar «%s»"
-
-#: read-cache.c:3157
-msgid "failed to convert to a sparse-index"
-msgstr "s'ha produït un error en convertir a un índex dispers"
-
-#: read-cache.c:3228
-#, c-format
-msgid "could not stat '%s'"
-msgstr "no s'ha pogut fer stat a «%s»"
-
-#: read-cache.c:3241
-#, c-format
-msgid "unable to open git dir: %s"
-msgstr "no s'ha pogut obrir el directori git: %s"
-
-#: read-cache.c:3253
-#, c-format
-msgid "unable to unlink: %s"
-msgstr "no s'ha pogut desenllaçar: %s"
-
-#: read-cache.c:3282
-#, c-format
-msgid "cannot fix permission bits on '%s'"
-msgstr "no s'han pogut corregir els bits de permisos en «%s»"
-
-#: read-cache.c:3439
-#, 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"
-"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"
-"O bé, podeu avortar el «rebase» amb «git rebase --abort».\n"
-
-#: rebase-interactive.c:33
-#, c-format
-msgid ""
-"unrecognized setting %s for option rebase.missingCommitsCheck. Ignoring."
-msgstr ""
-"no s'ha reconegut el paràmetre %s per rebase.missingCommitsCheck. S'està "
-"ignorant."
-
-#: rebase-interactive.c:42
-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 [-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"
-"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-la\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"
-"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"
-"\n"
-"Es pot canviar l'ordre d'aquestes línies; s'executen de dalt a baix.\n"
-
-#: rebase-interactive.c:66
-#, c-format
-msgid "Rebase %s onto %s (%d command)"
-msgid_plural "Rebase %s onto %s (%d commands)"
-msgstr[0] "Fes «rebase» de %s a %s (%d ordre)"
-msgstr[1] "Fes «rebase» de %s a %s (%d ordres)"
-
-#: 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"
-
-#: rebase-interactive.c:78
-msgid ""
-"\n"
-"If you remove a line here THAT COMMIT WILL BE LOST.\n"
-msgstr ""
-"\n"
-"Si elimineu una línia aquí, ES PERDRÀ AQUELLA COMISSIÓ.\n"
-
-#: rebase-interactive.c:84
-msgid ""
-"\n"
-"You are editing the todo file of an ongoing interactive rebase.\n"
-"To continue rebase after editing, run:\n"
-"    git rebase --continue\n"
-"\n"
-msgstr ""
-"\n"
-"Esteu editant el fitxer de coses a fer d'un «rebase» interactiu en marxa.\n"
-"Per a continuar el «rebase» després d'editar, executeu:\n"
-"    git rebase --continue\n"
-"\n"
-
-#: rebase-interactive.c:89
-msgid ""
-"\n"
-"However, if you remove everything, the rebase will be aborted.\n"
-"\n"
-msgstr ""
-"\n"
-"No obstant, si elimineu tot, s'avortarà el «rebase».\n"
-"\n"
-
-#: rebase-interactive.c:113 rerere.c:469 rerere.c:677 sequencer.c:3879
-#: sequencer.c:3905 sequencer.c:5681 builtin/fsck.c:328 builtin/gc.c:1791
-#: builtin/rebase.c:191
-#, c-format
-msgid "could not write '%s'"
-msgstr "no s'ha pogut escriure «%s»"
-
-#: rebase-interactive.c:119
-#, c-format
-msgid "could not write '%s'."
-msgstr "no s'ha pogut escriure a «%s»."
-
-#: rebase-interactive.c:196
-#, c-format
-msgid ""
-"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"
-"Les comissions descartades (més nova a més vella):\n"
-
-#: rebase-interactive.c:203
-#, c-format
-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"
-"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"
-"\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.c:29
-#, c-format
-msgid "%s: 'preserve' superseded by 'merges'"
-msgstr "%s: «conserva» substituït per «fusiona»"
-
-#: ref-filter.c:42 wt-status.c:2057
-msgid "gone"
-msgstr "no hi és"
-
-#: ref-filter.c:43
-#, c-format
-msgid "ahead %d"
-msgstr "davant per %d"
-
-#: ref-filter.c:44
-#, c-format
-msgid "behind %d"
-msgstr "darrere per %d"
-
-#: ref-filter.c:45
-#, c-format
-msgid "ahead %d, behind %d"
-msgstr "davant per %d, darrere per %d"
-
-#: ref-filter.c:235
-#, c-format
-msgid "expected format: %%(color:<color>)"
-msgstr "format esperat: %%(color:<color>)"
-
-#: ref-filter.c:237
-#, c-format
-msgid "unrecognized color: %%(color:%s)"
-msgstr "color no reconegut: %%(color:%s)"
-
-#: 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:263
-#, c-format
-msgid "Integer value expected refname:rstrip=%s"
-msgstr "Valor enter esperat pel nom de referència:rstrip=%s"
-
-#: ref-filter.c:265 ref-filter.c:344 ref-filter.c:377 ref-filter.c:431
-#: ref-filter.c:443 ref-filter.c:462 ref-filter.c:534 ref-filter.c:560
-#, c-format
-msgid "unrecognized %%(%s) argument: %s"
-msgstr "argument %%(%s) desconegut: %s"
-
-#: ref-filter.c:320
-#, c-format
-msgid "%%(objecttype) does not take arguments"
-msgstr "%%(objecttype) no accepta arguments"
-
-#: ref-filter.c:352
-#, c-format
-msgid "%%(deltabase) does not take arguments"
-msgstr "%%(deltabase) no accepta arguments"
-
-#: ref-filter.c:364
-#, c-format
-msgid "%%(body) does not take arguments"
-msgstr "%%(body) no accepta arguments"
-
-#: ref-filter.c:396
-#, c-format
-msgid "expected %%(trailers:key=<value>)"
-msgstr "s'esperava %%(trailers:key=<value>)"
-
-#: ref-filter.c:398
-#, c-format
-msgid "unknown %%(trailers) argument: %s"
-msgstr "argument %%(trailers) desconegut: %s"
-
-#: ref-filter.c:429
-#, c-format
-msgid "positive value expected contents:lines=%s"
-msgstr "valor positiu esperat conté:lines=%s"
-
-#: ref-filter.c:458
-#, c-format
-msgid "positive value expected '%s' in %%(%s)"
-msgstr "valor positiu esperat «%s» a %%(%s)"
-
-#: ref-filter.c:476
-#, c-format
-msgid "unrecognized email option: %s"
-msgstr "opció del correu electrònic no reconeguda: «%s»"
-
-#: ref-filter.c:506
-#, c-format
-msgid "expected format: %%(align:<width>,<position>)"
-msgstr "format esperat: %%(align:<amplada>,<posició>)"
-
-#: ref-filter.c:518
-#, c-format
-msgid "unrecognized position:%s"
-msgstr "posició no reconeguda:%s"
-
-#: ref-filter.c:525
-#, c-format
-msgid "unrecognized width:%s"
-msgstr "amplada no reconeguda:%s"
-
-#: 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:568
-#, c-format
-msgid "%%(rest) does not take arguments"
-msgstr "%%(rest) no accepta arguments"
-
-#: ref-filter.c:680
-#, c-format
-msgid "malformed field name: %.*s"
-msgstr "nom de camp mal format: %.*s"
-
-#: ref-filter.c:707
-#, c-format
-msgid "unknown field name: %.*s"
-msgstr "nom de camp desconegut: %.*s"
-
-#: ref-filter.c:711
-#, c-format
-msgid ""
-"not a git repository, but the field '%.*s' requires access to object data"
-msgstr ""
-"no és un repositori git, però el camp «%.*s» requereix accés a les dades de "
-"l'objecte"
-
-#: ref-filter.c:844 ref-filter.c:910 ref-filter.c:946 ref-filter.c:948
-#, c-format
-msgid "format: %%(%s) atom used without a %%(%s) atom"
-msgstr "format: l'àtom %%(%s) usat sense un àtom %%(%s)"
-
-#: 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: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: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: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:1027
-#, c-format
-msgid "malformed format string %s"
-msgstr "cadena de format mal format %s"
-
-#: ref-filter.c:1033
-#, c-format
-msgid "this command reject atom %%(%.*s)"
-msgstr "aquesta ordre rebutja l'àtom %%(%.*s)"
-
-#: ref-filter.c:1040
-#, c-format
-msgid "--format=%.*s cannot be used with --python, --shell, --tcl"
-msgstr "no es pot usar --format=%.*s amb --python, --shell, --tcl"
-
-#: ref-filter.c:1707
-#, c-format
-msgid "(no branch, rebasing %s)"
-msgstr "(sense branca, s'està fent «rebase» %s)"
-
-#: ref-filter.c:1710
-#, c-format
-msgid "(no branch, rebasing detached HEAD %s)"
-msgstr "(sense branca, s'està fent «rebase» d'un «HEAD» separat %s)"
-
-#: ref-filter.c:1713
-#, c-format
-msgid "(no branch, bisect started on %s)"
-msgstr "(sense branca, bisecció començada en %s)"
-
-#: ref-filter.c:1717
-#, c-format
-msgid "(HEAD detached at %s)"
-msgstr "(HEAD separat a %s)"
-
-#: ref-filter.c:1720
-#, c-format
-msgid "(HEAD detached from %s)"
-msgstr "(HEAD separat des de %s)"
-
-#: ref-filter.c:1723
-msgid "(no branch)"
-msgstr "(sense branca)"
-
-#: ref-filter.c:1755 ref-filter.c:1973
-#, c-format
-msgid "missing object %s for %s"
-msgstr "manca l'objecte %s per a %s"
-
-#: ref-filter.c:1765
-#, 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:2156
-#, c-format
-msgid "malformed object at '%s'"
-msgstr "objecte mal format a «%s»"
-
-#: ref-filter.c:2246
-#, c-format
-msgid "ignoring ref with broken name %s"
-msgstr "s'està ignorant la referència amb nom malmès %s"
-
-#: ref-filter.c:2251 refs.c:672
-#, c-format
-msgid "ignoring broken ref %s"
-msgstr "s'està ignorant la referència malmesa %s"
-
-#: ref-filter.c:2630
-#, c-format
-msgid "format: %%(end) atom missing"
-msgstr "format: manca l'àtom %%(end)"
-
-#: ref-filter.c:2741
-#, c-format
-msgid "malformed object name %s"
-msgstr "nom d'objecte %s mal format"
-
-#: ref-filter.c:2746
-#, c-format
-msgid "option `%s' must point to a commit"
-msgstr "l'opció «%s» ha d'apuntar a una comissió"
-
-#: reflog.c:407
-#, c-format
-msgid "not a reflog: %s"
-msgstr "no és un registre de referència: %s"
-
-#: reflog.c:410
-#, c-format
-msgid "no reflog for '%s'"
-msgstr "cap registre de referència per a «%s»"
-
-#: refs.c:262
-#, c-format
-msgid "%s does not point to a valid object!"
-msgstr "%s no apunta a un objecte vàlid"
-
-#: refs.c:561
-#, 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"
-"of your new repositories, which will suppress this warning, call:\n"
-"\n"
-"\tgit config --global init.defaultBranch <name>\n"
-"\n"
-"Names commonly chosen instead of 'master' are 'main', 'trunk' and\n"
-"'development'. The just-created branch can be renamed via this command:\n"
-"\n"
-"\tgit branch -m <name>\n"
-msgstr ""
-"S'està utilitzant «%s» com a nom de la branca inicial. Aquest nom de branca\n"
-"per defecte es pot canviar. Per a configurar el nom inicial de la branca que\n"
-"s'utilitzarà en tots els repositoris nous, i que suprimirà aquest avís, useu:\n"
-"\n"
-"\tgit config --global init.defaultBranch <nom>\n"
-"\n"
-"Els noms més usats habitualment en lloc de «master» són «main», «trunk» i\n"
-"«development». La branca acabada de crear es pot canviar de nom amb l'ordre:\n"
-"\n"
-"\tgit branch -m <nom>\n"
-
-#: refs.c:583
-#, c-format
-msgid "could not retrieve `%s`"
-msgstr "no s'ha pogut recuperar «%s»"
-
-#: refs.c:593
-#, c-format
-msgid "invalid branch name: %s = %s"
-msgstr "nom de branca no vàlida: %s = %s"
-
-#: refs.c:670
-#, c-format
-msgid "ignoring dangling symref %s"
-msgstr "s'està ignorant symref penjant %s"
-
-#: refs.c:919
-#, 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:926
-#, c-format
-msgid "log for ref %s unexpectedly ended on %s"
-msgstr "registre per als ref %s ha acabat inesperadament a %s"
-
-#: refs.c:991
-#, c-format
-msgid "log for %s is empty"
-msgstr "el registre per a %s és buit"
-
-#: refs.c:1086
-#, 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:1164
-#, c-format
-msgid "update_ref failed for ref '%s': %s"
-msgstr "ha fallat update_ref per a la ref «%s»: %s"
-
-#: refs.c:2059
-#, 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:2145
-msgid "ref updates forbidden inside quarantine environment"
-msgstr "no està permès actualitzar les referències en un entorn de quarantena"
-
-#: refs.c:2156
-msgid "ref updates aborted by hook"
-msgstr "les actualitzacions de referències s'han avortat per un lligam"
-
-#: refs.c:2264 refs.c:2294
-#, c-format
-msgid "'%s' exists; cannot create '%s'"
-msgstr "«%s» existeix; no es pot crear «%s»"
-
-#: refs.c:2270 refs.c:2305
-#, 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:1295
-#, c-format
-msgid "could not remove reference %s"
-msgstr "no s'ha pogut eliminar la referència %s"
-
-#: refs/files-backend.c:1310 refs/packed-backend.c:1565
-#: refs/packed-backend.c:1575
-#, c-format
-msgid "could not delete reference %s: %s"
-msgstr "no s'ha pogut suprimir la referència %s: %s"
-
-#: refs/files-backend.c:1313 refs/packed-backend.c:1578
-#, c-format
-msgid "could not delete references: %s"
-msgstr "no s'han pogut suprimir les referències: %s"
-
-#: refspec.c:170
-#, c-format
-msgid "invalid refspec '%s'"
-msgstr "refspec no vàlida: «%s»"
-
-#: remote.c:402
-#, c-format
-msgid "config remote shorthand cannot begin with '/': %s"
-msgstr ""
-"l'abreviatura del fitxer de configuració remot no pot començar amb «/»: %s"
-
-#: remote.c:450
-msgid "more than one receivepack given, using the first"
-msgstr "més d'un paquet de recepció donat, usant el primer"
-
-#: remote.c:458
-msgid "more than one uploadpack given, using the first"
-msgstr "més d'un paquet de càrrega donat, usant el primer"
-
-#: remote.c:698
-#, c-format
-msgid "Cannot fetch both %s and %s to %s"
-msgstr "No es poden obtenir ambdós %s i %s a %s"
-
-#: remote.c:702
-#, c-format
-msgid "%s usually tracks %s, not %s"
-msgstr "%s generalment segueix %s, no %s"
-
-#: remote.c:706
-#, c-format
-msgid "%s tracks both %s and %s"
-msgstr "%s segueix ambdós %s i %s"
-
-#: remote.c:774
-#, c-format
-msgid "key '%s' of pattern had no '*'"
-msgstr "la clau «%s» del patró no té «*»"
-
-#: remote.c:784
-#, c-format
-msgid "value '%s' of pattern has no '*'"
-msgstr "el valor «%s» del patró no té «*»"
-
-#: remote.c:1191
-#, c-format
-msgid "src refspec %s does not match any"
-msgstr "l'especificació de referència src %s no coincideix amb cap referència"
-
-#: remote.c:1196
-#, 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"
-
-#. TRANSLATORS: "matches '%s'%" is the <dst> part of "git push
-#. <remote> <src>:<dst>" push, and "being pushed ('%s')" is
-#. the <src>.
-#: remote.c:1211
-#, c-format
-msgid ""
-"The destination you provided is not a full refname (i.e.,\n"
-"starting with \"refs/\"). We tried to guess what you meant by:\n"
-"\n"
-"- Looking for a ref that matches '%s' on the remote side.\n"
-"- Checking if the <src> being pushed ('%s')\n"
-"  is a ref in \"refs/{heads,tags}/\". If so we add a corresponding\n"
-"  refs/{heads,tags}/ prefix on the remote side.\n"
-"\n"
-"Neither worked, so we gave up. You must fully qualify the ref."
-msgstr ""
-"La destinació que heu proporcionat no és un nom de referència complet\n"
-"(p. ex., que comenci amb «refs/»). Hem intentat deduir el que voleu dir:\n"
-"\n"
-"- Buscant una referència que coincideixi amb «%s» al costat remot.\n"
-"- Comprovant si el <src> que s'ha pujat («%s»)\n"
-"  és una referència «refs/{heads,tags}/». Si és així, afegim el prefix\n"
-"  refs/{heads,tags}/ corresponent al costat remot.\n"
-"\n"
-"Res d'això ha funcionat. Cal que proporcioneu una referència completa."
-
-#: remote.c:1231
-#, c-format
-msgid ""
-"The <src> part of the refspec is a commit object.\n"
-"Did you mean to create a new branch by pushing to\n"
-"'%s:refs/heads/%s'?"
-msgstr ""
-"La part <src> de l'especificació de la referència és un objecte de comissió.\n"
-"Voleu crear una branca nova empenyent a\n"
-"«%s:refs/heads/%s»?"
-
-#: remote.c:1236
-#, c-format
-msgid ""
-"The <src> part of the refspec is a tag object.\n"
-"Did you mean to create a new tag by pushing to\n"
-"'%s:refs/tags/%s'?"
-msgstr ""
-"La part <src> de l'especificació de la referència és un objecte d'etiqueta.\n"
-"Voleu crear una etiqueta pujant-la a «%srefs/tags/%s»?"
-
-#: remote.c:1241
-#, c-format
-msgid ""
-"The <src> part of the refspec is a tree object.\n"
-"Did you mean to tag a new tree by pushing to\n"
-"'%s:refs/tags/%s'?"
-msgstr ""
-"La part <src> de l'especificació de la referència és un objecte d'arbre.\n"
-"Voleu crear una etiqueta pujant-la a «%srefs/tags/%s»?"
-
-#: remote.c:1246
-#, c-format
-msgid ""
-"The <src> part of the refspec is a blob object.\n"
-"Did you mean to tag a new blob by pushing to\n"
-"'%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»?"
-
-#: remote.c:1282
-#, c-format
-msgid "%s cannot be resolved to branch"
-msgstr "«%s» no es pot resoldre a una branca"
-
-#: remote.c:1293
-#, c-format
-msgid "unable to delete '%s': remote ref does not exist"
-msgstr "no s'ha pogut suprimir «%s»: la referència remota no existeix"
-
-#: remote.c:1305
-#, 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"
-
-#: remote.c:1312
-#, c-format
-msgid "dst ref %s receives from more than one src"
-msgstr "l'especificació de la referència dst %s rep més d'una referència src"
-
-#: remote.c:1833 remote.c:1940
-msgid "HEAD does not point to a branch"
-msgstr "HEAD no assenyala cap branca"
-
-#: remote.c:1842
-#, c-format
-msgid "no such branch: '%s'"
-msgstr "no existeix la branca: «%s»"
-
-#: remote.c:1845
-#, c-format
-msgid "no upstream configured for branch '%s'"
-msgstr "cap font configurada per a la branca «%s»"
-
-#: remote.c:1851
-#, c-format
-msgid "upstream branch '%s' not stored as a remote-tracking branch"
-msgstr "la branca font «%s» no s'emmagatzema com a branca amb seguiment remot"
-
-#: remote.c:1866
-#, 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"
-
-#: remote.c:1881
-#, c-format
-msgid "branch '%s' has no remote for pushing"
-msgstr "la branca «%s» no té cap remot al qual pujar"
-
-#: remote.c:1891
-#, c-format
-msgid "push refspecs for '%s' do not include '%s'"
-msgstr "les especificacions de referència de pujada «%s» no inclouen «%s»"
-
-#: remote.c:1904
-msgid "push has no destination (push.default is 'nothing')"
-msgstr "push no té destí (push.default és «nothing»)"
-
-#: remote.c:1926
-msgid "cannot resolve 'simple' push to a single destination"
-msgstr "no es pot resoldre una pujada «simple» a un sol destí"
-
-#: remote.c:2059
-#, c-format
-msgid "couldn't find remote ref %s"
-msgstr "no s'ha pogut trobar la referència remota %s"
-
-#: remote.c:2072
-#, c-format
-msgid "* Ignoring funny ref '%s' locally"
-msgstr "* S'estan ignorant les referències «%s» localment"
-
-#: remote.c:2235
-#, c-format
-msgid "Your branch is based on '%s', but the upstream is gone.\n"
-msgstr "La vostra branca està basada en «%s», però la font no hi és.\n"
-
-#: remote.c:2239
-msgid "  (use \"git branch --unset-upstream\" to fixup)\n"
-msgstr "  (useu «git branch --unset-upstream» per a arreglar-ho)\n"
-
-#: remote.c:2242
-#, c-format
-msgid "Your branch is up to date with '%s'.\n"
-msgstr "La vostra branca està al dia amb «%s».\n"
-
-#: remote.c:2246
-#, c-format
-msgid "Your branch and '%s' refer to different commits.\n"
-msgstr "La vostra branca i «%s» es refereixen a diferents comissions.\n"
-
-#: remote.c:2249
-#, c-format
-msgid "  (use \"%s\" for details)\n"
-msgstr "  (useu «%s» per a detalls)\n"
-
-#: remote.c:2253
-#, c-format
-msgid "Your branch is ahead of '%s' by %d commit.\n"
-msgid_plural "Your branch is ahead of '%s' by %d commits.\n"
-msgstr[0] "La vostra branca està %2$d comissió per davant de «%1$s».\n"
-msgstr[1] "La vostra branca està %2$d comissions per davant de «%1$s».\n"
-
-#: remote.c:2259
-msgid "  (use \"git push\" to publish your local commits)\n"
-msgstr "  (useu «git push» per a publicar les vostres comissions locals)\n"
-
-#: remote.c:2262
-#, c-format
-msgid "Your branch is behind '%s' by %d commit, and can be fast-forwarded.\n"
-msgid_plural ""
-"Your branch is behind '%s' by %d commits, and can be fast-forwarded.\n"
-msgstr[0] ""
-"La vostra branca està %2$d comissió per darrere de «%1$s», i pot avançar-se "
-"ràpidament.\n"
-msgstr[1] ""
-"La vostra branca està %2$d comissions per darrere de «%1$s», i pot avançar-"
-"se ràpidament.\n"
-
-#: remote.c:2270
-msgid "  (use \"git pull\" to update your local branch)\n"
-msgstr "  (useu «git pull» per a actualitzar la vostra branca local)\n"
-
-#: remote.c:2273
-#, c-format
-msgid ""
-"Your branch and '%s' have diverged,\n"
-"and have %d and %d different commit each, respectively.\n"
-msgid_plural ""
-"Your branch and '%s' have diverged,\n"
-"and have %d and %d different commits each, respectively.\n"
-msgstr[0] ""
-"La vostra branca i «%s» han divergit,\n"
-"i tenen %d i %d comissió distinta cada una, respectivament.\n"
-msgstr[1] ""
-"La vostra branca i «%s» han divergit,\n"
-"i tenen %d i %d comissions distintes cada una, respectivament.\n"
-
-#: remote.c:2283
-msgid "  (use \"git pull\" to merge the remote branch into yours)\n"
-msgstr "  (useu «git pull» per a fusionar la branca remota amb la vostra)\n"
-
-#: remote.c:2475
-#, c-format
-msgid "cannot parse expected object name '%s'"
-msgstr "no es pot analitzar el nom de l'objecte esperat «%s»"
-
-#: replace-object.c:21
-#, c-format
-msgid "bad replace ref name: %s"
-msgstr "nom de la referència reemplaçada incorrecte: %s"
-
-#: replace-object.c:30
-#, c-format
-msgid "duplicate replace ref: %s"
-msgstr "duplica les referències reemplaçades: %s"
-
-#: replace-object.c:82
-#, c-format
-msgid "replace depth too high for object %s"
-msgstr "la profunditat de reemplaçament és massa alta per l'objecte %s"
-
-#: rerere.c:201 rerere.c:210 rerere.c:213
-msgid "corrupt MERGE_RR"
-msgstr "MERGE_RR corrupte"
-
-#: rerere.c:248 rerere.c:253
-msgid "unable to write rerere record"
-msgstr "no s'ha pogut escriure el registre «rerere»"
-
-#: rerere.c:479
-#, c-format
-msgid "there were errors while writing '%s' (%s)"
-msgstr "s'han produït errors en escriure «%s» (%s)"
-
-#: rerere.c:482 builtin/gc.c:2263 builtin/gc.c:2298
-#, c-format
-msgid "failed to flush '%s'"
-msgstr "no s'ha pogut buidar «%s»"
-
-#: rerere.c:487 rerere.c:1024
-#, c-format
-msgid "could not parse conflict hunks in '%s'"
-msgstr "no s'han pogut analitzar els pedaços en conflicte a «%s»"
-
-#: rerere.c:669
-#, c-format
-msgid "failed utime() on '%s'"
-msgstr "s'ha produït un error en fer «failed utime()» a «%s»"
-
-#: rerere.c:679
-#, c-format
-msgid "writing '%s' failed"
-msgstr "s'ha produït un error en escriure «%s»"
-
-#: rerere.c:699
-#, c-format
-msgid "Staged '%s' using previous resolution."
-msgstr "«Staged» «%s» utilitzant una resolució anterior."
-
-#: rerere.c:738
-#, c-format
-msgid "Recorded resolution for '%s'."
-msgstr "Es recorda la resolució per a «%s»."
-
-#: rerere.c:773
-#, c-format
-msgid "Resolved '%s' using previous resolution."
-msgstr "S'ha resolt «%s» usant una resolució anterior."
-
-#: rerere.c:788
-#, c-format
-msgid "cannot unlink stray '%s'"
-msgstr "no es pot desenllaçar «%s» (extraviat)"
-
-#: rerere.c:792
-#, c-format
-msgid "Recorded preimage for '%s'"
-msgstr "Imatge prèvia registrada per a «%s»"
-
-#: rerere.c:866 submodule.c:2290 builtin/log.c:2042
-#: builtin/submodule--helper.c:1786 builtin/submodule--helper.c:1833
-#, c-format
-msgid "could not create directory '%s'"
-msgstr "no s'ha pogut crear el directori «%s»"
-
-#: rerere.c:1042
-#, c-format
-msgid "failed to update conflicted state in '%s'"
-msgstr "ha fallat en actualitzar l'estat en conflicte a «%s»"
-
-#: rerere.c:1053 rerere.c:1060
-#, c-format
-msgid "no remembered resolution for '%s'"
-msgstr "no hi ha cap resolució recordada per a «%s»"
-
-#: rerere.c:1062
-#, c-format
-msgid "cannot unlink '%s'"
-msgstr "no es pot fer «unlink» de «%s»"
-
-#: rerere.c:1072
-#, c-format
-msgid "Updated preimage for '%s'"
-msgstr "Imatge prèvia actualitzada per a «%s»"
-
-#: rerere.c:1081
-#, c-format
-msgid "Forgot resolution for '%s'\n"
-msgstr "S'ha oblidat la resolució per a «%s»\n"
-
-#: rerere.c:1192
-msgid "unable to open rr-cache directory"
-msgstr "no s'ha pogut obrir el directori rr-cache"
-
-#: reset.c:112
-msgid "could not determine HEAD revision"
-msgstr "no s'ha pogut determinar la revisió de HEAD"
-
-#: reset.c:141 reset.c:147 sequencer.c:3696
-#, c-format
-msgid "failed to find tree of %s"
-msgstr "s'ha produït un error en cercar l'arbre de %s"
-
-#: revision.c:2358
-msgid "--unpacked=<packfile> no longer supported"
-msgstr "--unpacked=<packfile> ja no s'admet"
-
-#: revision.c:2712
-msgid "your current branch appears to be broken"
-msgstr "la vostra branca actual sembla malmesa"
-
-#: revision.c:2715
-#, 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:2901
-msgid "object filtering requires --objects"
-msgstr "el filtratge d'objectes requereix --objects"
-
-#: revision.c:2918
-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:1262
-#, c-format
-msgid "cannot create async thread: %s"
-msgstr "no s'ha pogut crear fil «async»: %s"
-
-#: send-pack.c:150
-msgid "unexpected flush packet while reading remote unpack status"
-msgstr ""
-"paquet de buidatge no esperat quan estava llegint l'estat del "
-"desempaquetament remot"
-
-#: send-pack.c:152
-#, c-format
-msgid "unable to parse remote unpack status: %s"
-msgstr "no s'ha pogut analitzar l'estat del desempaquetament remot: %s"
-
-#: send-pack.c:154
-#, c-format
-msgid "remote unpack failed: %s"
-msgstr "s'ha produït un error en el desempaquetament remot: %s"
-
-#: send-pack.c:378
-msgid "failed to sign the push certificate"
-msgstr "s'ha produït un error en signar el certificat de pujada"
-
-#: 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:457
-msgid "push negotiation failed; proceeding anyway with push"
-msgstr ""
-"ha fallat la negociació de la pujada; s'està procedint igualment amb "
-"l'empenta"
-
-#: 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 de hash del repositori"
-
-#: send-pack.c:537
-msgid "the receiving end does not support --signed push"
-msgstr "el destí receptor no admet pujar --signed"
-
-#: send-pack.c:539
-msgid ""
-"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:546
-msgid "the receiving end does not support --atomic push"
-msgstr "el destí receptor no admet pujar --atomic"
-
-#: send-pack.c:551
-msgid "the receiving end does not support push options"
-msgstr "el receptor al destí no admet opcions de pujada"
-
-#: 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:325
-#, c-format
-msgid "could not delete '%s'"
-msgstr "no s'ha pogut suprimir «%s»"
-
-#: sequencer.c:345 sequencer.c:4724 builtin/rebase.c:564 builtin/rebase.c:1326
-#: builtin/rm.c:409
-#, c-format
-msgid "could not remove '%s'"
-msgstr "no s'ha pogut eliminar «%s»"
-
-#: sequencer.c:355
-msgid "revert"
-msgstr "revertir"
-
-#: sequencer.c:357
-msgid "cherry-pick"
-msgstr "cherry-pick"
-
-#: sequencer.c:359
-msgid "rebase"
-msgstr "rebase"
-
-#: sequencer.c:361
-#, c-format
-msgid "unknown action: %d"
-msgstr "acció desconeguda: %d"
-
-#: sequencer.c:420
-msgid ""
-"after resolving the conflicts, mark the corrected paths\n"
-"with 'git add <paths>' or 'git rm <paths>'"
-msgstr ""
-"després de resoldre els conflictes, marqueu els camins\n"
-"corregits amb «git add <camins>» o «git rm <camins>»"
-
-#: sequencer.c:423
-msgid ""
-"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-los amb\n"
-"«git add/rm <pathspec>», llavors executeu\n"
-"«git cherry-pick --continue».\n"
-"Podeu també ometre aquesta comissió amb «git cherry-pick --skip».\n"
-"Per a interrompre i tornar a l'estat anterior abans de «git cherry-pick»,\n"
-"executeu «git cherry-pick --abort»."
-
-#: 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 ""
-"Després de resoldre els conflictes, marqueu-los amb\n"
-"«git add/rm <pathspec>», llavors executeu\n"
-"«git revert --continue».\n"
-"Podeu també ometre aquesta comissió amb «git revert --skip».\n"
-"Per a interrompre i tornar a l'estat anterior abans de «git revert»,\n"
-"executeu «git revert --abort»."
-
-#: sequencer.c:448 sequencer.c:3288
-#, c-format
-msgid "could not lock '%s'"
-msgstr "no s'ha pogut bloquejar «%s»"
-
-#: sequencer.c:450 sequencer.c:3087 sequencer.c:3292 sequencer.c:3306
-#: sequencer.c:3557 sequencer.c:5591 strbuf.c:1189 wrapper.c:715
-#, c-format
-msgid "could not write to '%s'"
-msgstr "no s'ha pogut escriure a «%s»"
-
-#: 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:460 sequencer.c:3092 sequencer.c:3294 sequencer.c:3308
-#: sequencer.c:3565
-#, c-format
-msgid "failed to finalize '%s'"
-msgstr "s'ha produït un error en finalitzar «%s»"
-
-#: sequencer.c:473 sequencer.c:1930 sequencer.c:3112 sequencer.c:3547
-#: sequencer.c:3675 builtin/am.c:290 builtin/commit.c:837 builtin/merge.c:1154
-#, c-format
-msgid "could not read '%s'"
-msgstr "no s'ha pogut llegir «%s»"
-
-#: 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:503
-msgid "commit your changes or stash them to proceed."
-msgstr "cometeu els vostres canvis o feu un «stash» per a procedir."
-
-#: sequencer.c:535
-#, c-format
-msgid "%s: fast-forward"
-msgstr "%s: avanç ràpid"
-
-#: sequencer.c:574 builtin/tag.c:615
-#, 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: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:699
-msgid "unable to update cache tree"
-msgstr "no s'ha pogut actualitzar l'arbre cau"
-
-#: sequencer.c:713
-msgid "could not resolve HEAD commit"
-msgstr "no s'ha pogut resoldre la comissió HEAD"
-
-#: sequencer.c:793
-#, c-format
-msgid "no key present in '%.*s'"
-msgstr "no hi ha una clau a «%.*s»"
-
-#: 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:841 wrapper.c:219 wrapper.c:389 builtin/am.c:757
-#: builtin/am.c:849 builtin/rebase.c:699
-#, c-format
-msgid "could not open '%s' for reading"
-msgstr "no s'ha pogut obrir «%s» per a lectura"
-
-#: sequencer.c:851
-msgid "'GIT_AUTHOR_NAME' already given"
-msgstr "Ja s'ha donat «GIT_AUTHOR_NAME»"
-
-#: sequencer.c:856
-msgid "'GIT_AUTHOR_EMAIL' already given"
-msgstr "Ja s'ha donat «GIT_AUTHOR_EMAIL»"
-
-#: sequencer.c:861
-msgid "'GIT_AUTHOR_DATE' already given"
-msgstr "Ja s'ha donat «GIT_AUTHOR_DATE»"
-
-#: sequencer.c:865
-#, c-format
-msgid "unknown variable '%s'"
-msgstr "variable «%s» desconeguda"
-
-#: sequencer.c:870
-msgid "missing 'GIT_AUTHOR_NAME'"
-msgstr "falta «GIT_AUTHOR_NAME»"
-
-#: sequencer.c:872
-msgid "missing 'GIT_AUTHOR_EMAIL'"
-msgstr "falta «GIT_AUTHOR_EMAIL»"
-
-#: sequencer.c:874
-msgid "missing 'GIT_AUTHOR_DATE'"
-msgstr "falta «GIT_AUTHOR_DATE»"
-
-#: sequencer.c:939
-#, c-format
-msgid ""
-"you have staged changes in your working tree\n"
-"If these changes are meant to be squashed into the previous commit, run:\n"
-"\n"
-"  git commit --amend %s\n"
-"\n"
-"If they are meant to go into a new commit, run:\n"
-"\n"
-"  git commit %s\n"
-"\n"
-"In both cases, once you're done, continue with:\n"
-"\n"
-"  git rebase --continue\n"
-msgstr ""
-"teniu canvis «staged» en el vostre arbre de treball\n"
-"Si aquests canvis estan pensats per a fer «squash» a la comissió prèvia, executeu:\n"
-"\n"
-"  git commit --amend %s\n"
-"\n"
-"Si són per a formar una comissió nova, executeu:\n"
-"\n"
-"  git commit %s\n"
-"\n"
-"En ambdós casos, quan hàgiu terminat, continueu amb:\n"
-"\n"
-"  git rebase --continue\n"
-
-#: sequencer.c:1225
-msgid "'prepare-commit-msg' hook failed"
-msgstr "el lligam «prepare-commit-msg» ha fallat"
-
-#: sequencer.c:1231
-msgid ""
-"Your name and email address were configured automatically based\n"
-"on your username and hostname. Please check that they are accurate.\n"
-"You can suppress this message by setting them explicitly. Run the\n"
-"following command and follow the instructions in your editor to edit\n"
-"your configuration file:\n"
-"\n"
-"    git config --global --edit\n"
-"\n"
-"After doing this, you may fix the identity used for this commit with:\n"
-"\n"
-"    git commit --amend --reset-author\n"
-msgstr ""
-"S'han configurat el vostre nom i adreça electrònica\n"
-"automàticament basant-se en el vostre nom d'usuari i nom de màquina. \n"
-"Comproveu que siguin correctes. Podeu suprimir aquest\n"
-"missatge establint-los explícitament. Executeu l'ordre següent i\n"
-"seguiu les instruccions en l'editor per a editar el vostre\n"
-"fitxer de configuració:\n"
-"\n"
-"    git config --global --edit\n"
-"Després de fer això, podeu esmenar la identitat usada per a aquesta\n"
-"comissió amb:\n"
-"\n"
-"    git commit --amend --reset-author\n"
-
-#: sequencer.c:1244
-msgid ""
-"Your name and email address were configured automatically based\n"
-"on your username and hostname. Please check that they are accurate.\n"
-"You can suppress this message by setting them explicitly:\n"
-"\n"
-"    git config --global user.name \"Your Name\"\n"
-"    git config --global user.email you@example.com\n"
-"\n"
-"After doing this, you may fix the identity used for this commit with:\n"
-"\n"
-"    git commit --amend --reset-author\n"
-msgstr ""
-"S'han configurat el vostre nom i adreça electrònica\n"
-"automàticament basats en el vostre nom d'usuari i nom de màquina. \n"
-"Comproveu que siguin correctes. Podeu suprimir aquest\n"
-"missatge establint-los explícitament:\n"
-"\n"
-"    git config --global user.name \"El vostre nom\"\n"
-"    git config --global user.email usuari@example.com\n"
-"\n"
-"Després de fer això, podeu arreglar la identitat usada per a aquesta\n"
-"comissió amb:\n"
-"\n"
-"    git commit --amend --reset-author\n"
-
-#: sequencer.c:1287
-msgid "couldn't look up newly created commit"
-msgstr "no s'ha pogut trobar la comissió novament creada"
-
-#: sequencer.c:1289
-msgid "could not parse newly created commit"
-msgstr "no s'ha pogut analitzar la comissió novament creada"
-
-#: 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:1338
-msgid "detached HEAD"
-msgstr "HEAD separat"
-
-#: sequencer.c:1342
-msgid " (root-commit)"
-msgstr " (comissió arrel)"
-
-#: sequencer.c:1363
-msgid "could not parse HEAD"
-msgstr "no s'ha pogut analitzar HEAD"
-
-#: sequencer.c:1365
-#, c-format
-msgid "HEAD %s is not a commit!"
-msgstr "HEAD %s no és una comissió!"
-
-#: 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:1425 sequencer.c:2310
-msgid "unable to parse commit author"
-msgstr "no s'ha pogut analitzar l'autor de la comissió"
-
-#: sequencer.c:1436 builtin/am.c:1644 builtin/merge.c:710
-msgid "git write-tree failed to write a tree"
-msgstr "git write-tree ha fallat en escriure un arbre"
-
-#: 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:1500 sequencer.c:1532
-#, c-format
-msgid "invalid author identity '%s'"
-msgstr "identitat d'autor no vàlida: «%s»"
-
-#: sequencer.c:1506
-msgid "corrupt author: missing date information"
-msgstr "autor malmès: falta la informació de la data"
-
-#: sequencer.c:1545 builtin/am.c:1671 builtin/commit.c:1821
-#: builtin/merge.c:921 builtin/merge.c:946 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:1572 sequencer.c:4496 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:1621
-#, c-format
-msgid "could not parse commit %s"
-msgstr "no s'ha pogut analitzar la comissió %s"
-
-#: sequencer.c:1626
-#, c-format
-msgid "could not parse parent commit %s"
-msgstr "no s'ha pogut analitzar la comissió pare %s"
-
-#: sequencer.c:1709 sequencer.c:1990
-#, c-format
-msgid "unknown command: %d"
-msgstr "ordre desconeguda: %d"
-
-#: sequencer.c:1751
-msgid "This is the 1st commit message:"
-msgstr "Aquest és el 1r missatge de comissió:"
-
-#: sequencer.c:1752
-#, c-format
-msgid "This is the commit message #%d:"
-msgstr "Aquest és el missatge de comissió #%d:"
-
-#: sequencer.c:1753
-msgid "The 1st commit message will be skipped:"
-msgstr "El primer missatge de comissió s'ometrà:"
-
-#: 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:1755
-#, c-format
-msgid "This is a combination of %d commits."
-msgstr "Això és una combinació de %d comissions."
-
-#: sequencer.c:1902 sequencer.c:1959
-#, c-format
-msgid "cannot write '%s'"
-msgstr "no es pot escriure «%s»"
-
-#: sequencer.c:1949
-msgid "need a HEAD to fixup"
-msgstr "cal un HEAD per a reparar-ho"
-
-#: sequencer.c:1951 sequencer.c:3592
-msgid "could not read HEAD"
-msgstr "no s'ha pogut llegir HEAD"
-
-#: 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:1977
-#, c-format
-msgid "could not read commit message of %s"
-msgstr "no s'ha pogut llegir el missatge de comissió: %s"
-
-#: sequencer.c:2087
-msgid "your index file is unmerged."
-msgstr "el vostre fitxer d'índex està sense fusionar."
-
-#: sequencer.c:2094
-msgid "cannot fixup root commit"
-msgstr "no es pot arreglar la comissió arrel"
-
-#: 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:2121 sequencer.c:2129
-#, c-format
-msgid "commit %s does not have parent %d"
-msgstr "la comissió %s no té pare %d"
-
-#: 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:2154
-#, c-format
-msgid "%s: cannot parse parent commit %s"
-msgstr "%s: no es pot analitzar la comissió pare %s"
-
-#: 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:2280
-#, c-format
-msgid "could not revert %s... %s"
-msgstr "no s'ha pogut revertir %s... %s"
-
-#: sequencer.c:2281
-#, c-format
-msgid "could not apply %s... %s"
-msgstr "no s'ha pogut aplicar %s... %s"
-
-#: sequencer.c:2302
-#, c-format
-msgid "dropping %s %s -- patch contents already upstream\n"
-msgstr "descartant %s %s -- el contingut del pedaç ja està a la font\n"
-
-#: 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: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:2448
-#, c-format
-msgid "%s does not accept arguments: '%s'"
-msgstr "%s no accepta arguments: «%s»"
-
-#: sequencer.c:2457
-#, c-format
-msgid "missing arguments for %s"
-msgstr "falten els arguments per a %s"
-
-#: sequencer.c:2500
-#, c-format
-msgid "could not parse '%s'"
-msgstr "no s'ha pogut analitzar «%s»"
-
-#: sequencer.c:2561
-#, c-format
-msgid "invalid line %d: %.*s"
-msgstr "línia no vàlida %d: %.*s"
-
-#: sequencer.c:2572
-#, c-format
-msgid "cannot '%s' without a previous commit"
-msgstr "no es pot «%s» sense una comissió prèvia"
-
-#: sequencer.c:2620 builtin/rebase.c:185
-#, 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:2667
-msgid "cancelling a revert in progress"
-msgstr "s'està cancel·lant la reversió en curs"
-
-#: sequencer.c:2707
-msgid "please fix this using 'git rebase --edit-todo'."
-msgstr "corregiu-ho usant «git rebase --edit-todo»."
-
-#: sequencer.c:2709
-#, c-format
-msgid "unusable instruction sheet: '%s'"
-msgstr "full d'instruccions inusable: «%s»"
-
-#: sequencer.c:2714
-msgid "no commits parsed."
-msgstr "no s'ha analitzat cap comissió."
-
-#: sequencer.c:2725
-msgid "cannot cherry-pick during a revert."
-msgstr "no es pot fer «cherry pick» durant una reversió."
-
-#: sequencer.c:2727
-msgid "cannot revert during a cherry-pick."
-msgstr "no es pot revertir durant un «cherry pick»."
-
-#: sequencer.c:2914
-msgid "unusable squash-onto"
-msgstr "«squash-onto» no usable"
-
-#: sequencer.c:2934
-#, c-format
-msgid "malformed options sheet: '%s'"
-msgstr "full d'opcions mal format: «%s»"
-
-#: sequencer.c:3029 sequencer.c:4875
-msgid "empty commit set passed"
-msgstr "conjunt de comissions buit passat"
-
-#: sequencer.c:3046
-msgid "revert is already in progress"
-msgstr "una reversió ja està en curs"
-
-#: sequencer.c:3048
-#, c-format
-msgid "try \"git revert (--continue | %s--abort | --quit)\""
-msgstr "intenteu «git revert (--continue | %s--abort | --quit)»"
-
-#: sequencer.c:3051
-msgid "cherry-pick is already in progress"
-msgstr "un «cherry pick» ja està en curs"
-
-#: 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:3067
-#, c-format
-msgid "could not create sequencer directory '%s'"
-msgstr "no s'ha pogut crear el directori de seqüenciador «%s»"
-
-#: sequencer.c:3082
-msgid "could not lock HEAD"
-msgstr "no s'ha pogut bloquejar HEAD"
-
-#: sequencer.c:3142 sequencer.c:4585
-msgid "no cherry-pick or revert in progress"
-msgstr "ni hi ha cap «cherry pick» ni cap reversió en curs"
-
-#: sequencer.c:3144 sequencer.c:3155
-msgid "cannot resolve HEAD"
-msgstr "no es pot resoldre HEAD"
-
-#: 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:3176 builtin/fetch.c:1030 builtin/fetch.c:1457
-#: builtin/grep.c:774
-#, c-format
-msgid "cannot open '%s'"
-msgstr "no es pot obrir «%s»"
-
-#: sequencer.c:3178
-#, c-format
-msgid "cannot read '%s': %s"
-msgstr "no es pot llegir «%s»: %s"
-
-#: sequencer.c:3179
-msgid "unexpected end of file"
-msgstr "final de fitxer inesperat"
-
-#: 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: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:3237
-msgid "no revert in progress"
-msgstr "no hi ha cap reversió en curs"
-
-#: sequencer.c:3246
-msgid "no cherry-pick in progress"
-msgstr "ni hi ha cap «cherry pick» en curs"
-
-#: sequencer.c:3256
-msgid "failed to skip the commit"
-msgstr "s'ha produït un error en ometre la comissió"
-
-#: sequencer.c:3263
-msgid "there is nothing to skip"
-msgstr "no hi ha res a ometre"
-
-#: sequencer.c:3266
-#, c-format
-msgid ""
-"have you committed already?\n"
-"try \"git %s --continue\""
-msgstr ""
-"heu fet ja una comissió?\n"
-"proveu «git %s --continue»"
-
-#: sequencer.c:3428 sequencer.c:4476
-msgid "cannot read HEAD"
-msgstr "no es pot llegir HEAD"
-
-#: sequencer.c:3445
-#, c-format
-msgid "unable to copy '%s' to '%s'"
-msgstr "no s'ha pogut copiar «%s» a «%s»"
-
-#: sequencer.c:3453
-#, c-format
-msgid ""
-"You can amend the commit now, with\n"
-"\n"
-"  git commit --amend %s\n"
-"\n"
-"Once you are satisfied with your changes, run\n"
-"\n"
-"  git rebase --continue\n"
-msgstr ""
-"Podeu esmenar la comissió ara, amb\n"
-"\n"
-"  git commit --amend %s\n"
-"\n"
-"Una vegada que estigueu satisfet amb els vostres canvis, executeu\n"
-"\n"
-"  git rebase --continue\n"
-
-#: sequencer.c:3463
-#, c-format
-msgid "Could not apply %s... %.*s"
-msgstr "No s'ha pogut aplicar %s... %.*s"
-
-#: sequencer.c:3470
-#, c-format
-msgid "Could not merge %.*s"
-msgstr "No s'ha pogut fusionar %.*s"
-
-#: sequencer.c:3484 sequencer.c:3488 builtin/difftool.c:633
-#, c-format
-msgid "could not copy '%s' to '%s'"
-msgstr "no s'ha pogut copiar «%s» a «%s»"
-
-#: sequencer.c:3499
-#, c-format
-msgid "Executing: %s\n"
-msgstr "S'està executant: %s\n"
-
-#: sequencer.c:3510
-#, c-format
-msgid ""
-"execution failed: %s\n"
-"%sYou can fix the problem, and then run\n"
-"\n"
-"  git rebase --continue\n"
-"\n"
-msgstr ""
-"ha fallat: %s\n"
-"%sPodeu solucionar el problema, i llavors executar\n"
-"\n"
-" git rebase --continue\n"
-"\n"
-
-#: sequencer.c:3516
-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:3522
-#, c-format
-msgid ""
-"execution succeeded: %s\n"
-"but left changes to the index and/or the working tree\n"
-"Commit or stash your changes, and then run\n"
-"\n"
-"  git rebase --continue\n"
-"\n"
-msgstr ""
-"l'execució ha tingut èxit: %s\n"
-"però ha deixat canvis a l'índex i/o l'arbre de treball\n"
-"Cometeu o feu «stash» dels vostres canvis, i llavors executeu\n"
-"\n"
-" git rebase --continue\n"
-
-#: sequencer.c:3582
-#, c-format
-msgid "illegal label name: '%.*s'"
-msgstr "nom d'etiqueta no permès: «%.*s»"
-
-#: sequencer.c:3655
-msgid "writing fake root commit"
-msgstr "s'està escrivint una comissió arrel falsa"
-
-#: sequencer.c:3660
-msgid "writing squash-onto"
-msgstr "s'està escrivint «squash-onto»"
-
-#: sequencer.c:3739
-#, c-format
-msgid "could not resolve '%s'"
-msgstr "no s'ha pogut resoldre «%s»"
-
-#: sequencer.c:3771
-msgid "cannot merge without a current revision"
-msgstr "no es pot fusionar sense una revisió actual"
-
-#: sequencer.c:3793
-#, c-format
-msgid "unable to parse '%.*s'"
-msgstr "no s'ha pogut analitzar «%.*s»"
-
-#: sequencer.c:3802
-#, c-format
-msgid "nothing to merge: '%.*s'"
-msgstr "no hi ha res per a fusionar «%.*s»"
-
-#: sequencer.c:3814
-msgid "octopus merge cannot be executed on top of a [new root]"
-msgstr ""
-"no es pot executar la fusió «octopus» a la part superior d'una [arrel nova]"
-
-#: sequencer.c:3869
-#, c-format
-msgid "could not get commit message of '%s'"
-msgstr "no s'ha pogut llegir el missatge de comissió de «%s»"
-
-#: sequencer.c:4013
-#, c-format
-msgid "could not even attempt to merge '%.*s'"
-msgstr "no s'ha pogut fusionar «%.*s»"
-
-#: sequencer.c:4029
-msgid "merge: Unable to write new index file"
-msgstr "fusió: no s'ha pogut escriure un fitxer d'índex nou"
-
-#: sequencer.c:4110
-msgid "Cannot autostash"
-msgstr "No es pot fer un «stash» automàticament"
-
-#: sequencer.c:4113
-#, c-format
-msgid "Unexpected stash response: '%s'"
-msgstr "Resposta de «stash» inesperada: «%s»"
-
-#: sequencer.c:4119
-#, c-format
-msgid "Could not create directory for '%s'"
-msgstr "No s'ha pogut crear el directori per a «%s»"
-
-#: sequencer.c:4122
-#, c-format
-msgid "Created autostash: %s\n"
-msgstr "S'ha creat un «stash» automàticament: %s\n"
-
-#: sequencer.c:4124
-msgid "could not reset --hard"
-msgstr "no s'ha pogut fer reset --hard"
-
-#: sequencer.c:4148
-#, c-format
-msgid "Applied autostash.\n"
-msgstr "S'ha aplicat el «stash» automàticament.\n"
-
-#: sequencer.c:4160
-#, c-format
-msgid "cannot store %s"
-msgstr "no es pot emmagatzemar %s"
-
-#: sequencer.c:4163
-#, c-format
-msgid ""
-"%s\n"
-"Your changes are safe in the stash.\n"
-"You can run \"git stash pop\" or \"git stash drop\" at any time.\n"
-msgstr ""
-"%s\n"
-"Els vostres canvis estan segurs en el «stash».\n"
-"Podeu executar «git stash pop» o «git stash drop» en qualsevol moment.\n"
-
-#: sequencer.c:4168
-msgid "Applying autostash resulted in conflicts."
-msgstr "L'aplicació del «stash» automàticament ha donat conflictes."
-
-#: sequencer.c:4169
-msgid "Autostash exists; creating a new stash entry."
-msgstr ""
-"El «stash» automàtic ja existeix; s'està creant una entrada «stash» nova."
-
-#: sequencer.c:4225
-msgid "could not detach HEAD"
-msgstr "no s'ha pogut separar HEAD"
-
-#: sequencer.c:4240
-#, c-format
-msgid "Stopped at HEAD\n"
-msgstr "Aturat a HEAD\n"
-
-#: sequencer.c:4242
-#, c-format
-msgid "Stopped at %s\n"
-msgstr "Aturat a %s\n"
-
-#: sequencer.c:4274
-#, c-format
-msgid ""
-"Could not execute the todo command\n"
-"\n"
-"    %.*s\n"
-"It has been rescheduled; To edit the command before continuing, please\n"
-"edit the todo list first:\n"
-"\n"
-"    git rebase --edit-todo\n"
-"    git rebase --continue\n"
-msgstr ""
-"No s'ha pogut executar l'ordre «todo»\n"
-"\n"
-"    %.*s\n"
-"S'ha reprogramat; per a editar l'ordre abans de continuar, editeu primer\n"
-"la llista de tasques pendents:\n"
-"\n"
-"    git rebase --edit-todo\n"
-"    git rebase --continue\n"
-
-#: sequencer.c:4320
-#, c-format
-msgid "Rebasing (%d/%d)%s"
-msgstr "S'està fent «rebase» (%d/%d)%s"
-
-#: sequencer.c:4366
-#, c-format
-msgid "Stopped at %s...  %.*s\n"
-msgstr "Aturat a %s...  %.*s\n"
-
-#: sequencer.c:4436
-#, c-format
-msgid "unknown command %d"
-msgstr "ordre %d desconeguda"
-
-#: sequencer.c:4484
-msgid "could not read orig-head"
-msgstr "no s'ha pogut llegir orig-head"
-
-#: sequencer.c:4489
-msgid "could not read 'onto'"
-msgstr "no s'ha pogut llegir «onto»"
-
-#: sequencer.c:4503
-#, c-format
-msgid "could not update HEAD to %s"
-msgstr "no s'ha pogut actualitzar HEAD a %s"
-
-#: sequencer.c:4563
-#, c-format
-msgid "Successfully rebased and updated %s.\n"
-msgstr "S'ha fet «rebase» i actualitzat %s amb èxit.\n"
-
-#: sequencer.c:4615
-msgid "cannot rebase: You have unstaged changes."
-msgstr "no es pot fer «rebase»: teniu canvis «unstaged»."
-
-#: sequencer.c:4624
-msgid "cannot amend non-existing commit"
-msgstr "no es pot esmenar una comissió no existent"
-
-#: sequencer.c:4626
-#, c-format
-msgid "invalid file: '%s'"
-msgstr "fitxer no vàlid: «%s»"
-
-#: sequencer.c:4628
-#, c-format
-msgid "invalid contents: '%s'"
-msgstr "contingut no vàlid: «%s»"
-
-#: sequencer.c:4631
-msgid ""
-"\n"
-"You have uncommitted changes in your working tree. Please, commit them\n"
-"first and then run 'git rebase --continue' again."
-msgstr ""
-"\n"
-"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:4667 sequencer.c:4706
-#, c-format
-msgid "could not write file: '%s'"
-msgstr "no s'ha pogut escriure el fitxer: «%s»"
-
-#: sequencer.c:4722
-msgid "could not remove CHERRY_PICK_HEAD"
-msgstr "no s'ha pogut eliminar CHERRY_PICK_HEAD"
-
-#: sequencer.c:4732
-msgid "could not commit staged changes."
-msgstr "no s'han pogut cometre els canvis «staged»."
-
-#: sequencer.c:4852
-#, c-format
-msgid "%s: can't cherry-pick a %s"
-msgstr "%s: no es pot fer «cherry pick» a %s"
-
-#: sequencer.c:4856
-#, c-format
-msgid "%s: bad revision"
-msgstr "%s: revisió incorrecta"
-
-#: sequencer.c:4891
-msgid "can't revert as initial commit"
-msgstr "no es pot revertir com a comissió inicial"
-
-#: sequencer.c:5162 sequencer.c:5391
-#, c-format
-msgid "skipped previously applied commit %s"
-msgstr "omet les comissions aplicades anteriorment %s"
-
-#: sequencer.c:5232 sequencer.c:5407
-msgid "use --reapply-cherry-picks to include skipped commits"
-msgstr "useu --reapply-cherry-picks per a incloure les comissions omeses"
-
-#: sequencer.c:5378
-msgid "make_script: unhandled options"
-msgstr "make_script: opcions no gestionades"
-
-#: sequencer.c:5381
-msgid "make_script: error preparing revisions"
-msgstr "make_script: s'ha produït un error en preparar les revisions"
-
-#: sequencer.c:5639 sequencer.c:5656
-msgid "nothing to do"
-msgstr "res a fer"
-
-#: sequencer.c:5675
-msgid "could not skip unnecessary pick commands"
-msgstr "no s'han pogut ometre les ordres «picks» no necessàries"
-
-#: sequencer.c:5775
-msgid "the script was already rearranged."
-msgstr "l'script ja estava endreçat."
-
-#: setup.c:134
-#, c-format
-msgid "'%s' is outside repository at '%s'"
-msgstr "«%s» està fora del repositori a «%s»"
-
-#: setup.c:186
-#, c-format
-msgid ""
-"%s: no such path in the working tree.\n"
-"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."
-
-#: setup.c:199
-#, c-format
-msgid ""
-"ambiguous argument '%s': unknown revision or path not in the working tree.\n"
-"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"
-"Useu «--» per a separar els camins de les revisions:\n"
-"«git <ordre> [<revisió>...] -- [<fitxer>...]»"
-
-#: setup.c:265
-#, c-format
-msgid "option '%s' must come before non-option arguments"
-msgstr "l'opció «%s» ha d'aparèixer abans que els arguments opcionals"
-
-#: setup.c:284
-#, c-format
-msgid ""
-"ambiguous argument '%s': both revision and filename\n"
-"Use '--' to separate paths from revisions, like this:\n"
-"'git <command> [<revision>...] -- [<file>...]'"
-msgstr ""
-"argument ambigu «%s»: ambdós una revisió i un nom de fitxer\n"
-"Useu «--» per a separar els camins de les revisions:\n"
-"«git <ordre> [<revisió>...] -- [<fitxer>...]»"
-
-#: setup.c:420
-msgid "unable to set up work tree using invalid config"
-msgstr ""
-"no s'ha pogut configurar un arbre de treball utilitzant una configuració no "
-"vàlida"
-
-#: setup.c:424 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:723
-#, 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:731
-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:745
-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:766
-#, c-format
-msgid "error opening '%s'"
-msgstr "s'ha produït un error en obrir «%s»"
-
-#: setup.c:768
-#, c-format
-msgid "too large to be a .git file: '%s'"
-msgstr "massa gran per a ser un fitxer .git: «%s»"
-
-#: setup.c:770
-#, c-format
-msgid "error reading %s"
-msgstr "error en llegir %s"
-
-#: setup.c:772
-#, c-format
-msgid "invalid gitfile format: %s"
-msgstr "format gitfile no vàlid: %s"
-
-#: setup.c:774
-#, c-format
-msgid "no path in gitfile: %s"
-msgstr "sense camí al gitfile: %s"
-
-#: setup.c:776
-#, c-format
-msgid "not a git repository: %s"
-msgstr "no és un repositori de git: %s"
-
-#: setup.c:878
-#, c-format
-msgid "'$%s' too big"
-msgstr "«$%s» massa gran"
-
-#: setup.c:892
-#, c-format
-msgid "not a git repository: '%s'"
-msgstr "no és un repositori de git: «%s»"
-
-#: setup.c:921 setup.c:923 setup.c:954
-#, c-format
-msgid "cannot chdir to '%s'"
-msgstr "no es pot canviar de directori a «%s»"
-
-#: setup.c:926 setup.c:982 setup.c:992 setup.c:1031 setup.c:1039
-msgid "cannot come back to cwd"
-msgstr "no es pot tornar al directori de treball actual"
-
-#: setup.c:1053
-#, 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:1296
-msgid "Unable to read current working directory"
-msgstr "No s'ha pogut llegir el directori de treball actual"
-
-#: setup.c:1305 setup.c:1311
-#, c-format
-msgid "cannot change to '%s'"
-msgstr "no es pot canviar a «%s»"
-
-#: setup.c:1316
-#, 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:1322
-#, 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)."
-
-#: setup.c:1447
-#, 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."
-
-#: setup.c:1509
-msgid "fork failed"
-msgstr "el «fork» ha fallat"
-
-#: setup.c:1514
-msgid "setsid failed"
-msgstr "«setsid» ha fallat"
-
-#: sparse-index.c:285
-#, c-format
-msgid "index entry is a directory, but not sparse (%08x)"
-msgstr "l'entrada d'índex és un directori, però no dispers (%08x)"
-
-#: split-index.c:9
-#, fuzzy
-msgid "cannot use split index with a sparse index"
-msgstr "no es pot utilitzar l'índex de divisió amb un índex dispers"
-
-#. TRANSLATORS: IEC 80000-13:2008 gibibyte
-#: strbuf.c:851
-#, c-format
-msgid "%u.%2.2u GiB"
-msgstr "%u.%2.2u GiB"
-
-#. TRANSLATORS: IEC 80000-13:2008 gibibyte/second
-#: strbuf.c:853
-#, c-format
-msgid "%u.%2.2u GiB/s"
-msgstr "%u.%2.2u GiB/s"
-
-#. TRANSLATORS: IEC 80000-13:2008 mebibyte
-#: strbuf.c:861
-#, c-format
-msgid "%u.%2.2u MiB"
-msgstr "%u.%2.2u MiB"
-
-#. TRANSLATORS: IEC 80000-13:2008 mebibyte/second
-#: strbuf.c:863
-#, c-format
-msgid "%u.%2.2u MiB/s"
-msgstr "%u.%2.2u MiB/s"
-
-#. TRANSLATORS: IEC 80000-13:2008 kibibyte
-#: strbuf.c:870
-#, c-format
-msgid "%u.%2.2u KiB"
-msgstr "%u.%2.2u KiB"
-
-#. TRANSLATORS: IEC 80000-13:2008 kibibyte/second
-#: strbuf.c:872
-#, c-format
-msgid "%u.%2.2u KiB/s"
-msgstr "%u.%2.2u KiB/s"
-
-#. TRANSLATORS: IEC 80000-13:2008 byte
-#: strbuf.c:878
-#, c-format
-msgid "%u byte"
-msgid_plural "%u bytes"
-msgstr[0] "%u byte"
-msgstr[1] "%u bytes"
-
-#. TRANSLATORS: IEC 80000-13:2008 byte/second
-#: strbuf.c:880
-#, c-format
-msgid "%u byte/s"
-msgid_plural "%u bytes/s"
-msgstr[0] "%u byte/s"
-msgstr[1] "%u bytes/s"
-
-#: strbuf.c:1187 wrapper.c:217 wrapper.c:387 builtin/am.c:766
-#: builtin/rebase.c:653
-#, c-format
-msgid "could not open '%s' for writing"
-msgstr "no s'ha pogut obrir «%s» per a escriptura"
-
-#: strbuf.c:1196
-#, c-format
-msgid "could not edit '%s'"
-msgstr "no s'ha pogut editar «%s»"
-
-#: submodule-config.c:238
-#, c-format
-msgid "ignoring suspicious submodule name: %s"
-msgstr "s'està ignorant el nom de submòdul sospitós %s"
-
-#: submodule-config.c:305
-msgid "negative values not allowed for submodule.fetchjobs"
-msgstr "no es permeten els valors negatius a submodule.fetchjobs"
-
-#: submodule-config.c:403
-#, 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"
-
-#: submodule-config.c:500 builtin/push.c:489 builtin/send-pack.c:148
-#, c-format
-msgid "invalid value for '%s'"
-msgstr "valor no vàlid per a «%s»"
-
-#: submodule-config.c:828
-#, c-format
-msgid "Could not update .gitmodules entry %s"
-msgstr "No s'ha pogut actualitzar l'entrada de .gitmodules %s"
-
-#: submodule.c:115 submodule.c:144
-msgid "Cannot change unmerged .gitmodules, resolve merge conflicts first"
-msgstr ""
-"No es pot canviar un .gitmodules no fusionat, primer resoleu els conflictes "
-"de fusió"
-
-#: submodule.c:119 submodule.c:148
-#, c-format
-msgid "Could not find section in .gitmodules where path=%s"
-msgstr "No s'ha pogut trobar la secció en .gitmodules on path=%s"
-
-#: submodule.c:155
-#, c-format
-msgid "Could not remove .gitmodules entry for %s"
-msgstr "No s'ha pogut eliminar l'entrada de .gitmodules per a %s"
-
-#: submodule.c:166
-msgid "staging updated .gitmodules failed"
-msgstr "l'allistament del .gitmodules actualitzat ha fallat"
-
-#: submodule.c:346
-#, c-format
-msgid "in unpopulated submodule '%s'"
-msgstr "al submòdul sense popular «%s»"
-
-#: submodule.c:377
-#, c-format
-msgid "Pathspec '%s' is in submodule '%.*s'"
-msgstr "L'especificació «%s» és en el submòdul «%.*s»"
-
-#: submodule.c:454
-#, c-format
-msgid "bad --ignore-submodules argument: %s"
-msgstr "argument incorrecte --ignore-submodules: %s"
-
-#: submodule.c:866
-#, c-format
-msgid ""
-"Submodule in commit %s at path: '%s' collides with a submodule named the "
-"same. Skipping it."
-msgstr ""
-"El submòdul en la comissió %s al camí: «%s» col·lideix amb un submòdul amb "
-"el mateix nom. Ometent-lo."
-
-#: submodule.c:987
-#, 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:1069
-#, 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"
-
-#: submodule.c:1192
-#, c-format
-msgid "process for submodule '%s' failed"
-msgstr "ha fallat el procés per al submòdul «%s»"
-
-#: submodule.c:1221 builtin/branch.c:714 builtin/submodule--helper.c:2827
-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:1232
-#, c-format
-msgid "Pushing submodule '%s'\n"
-msgstr "S'està pujant el submòdul «%s»\n"
-
-#: submodule.c:1235
-#, c-format
-msgid "Unable to push submodule '%s'\n"
-msgstr "No s'ha pogut pujar el submòdul «%s»\n"
-
-#: submodule.c:1567
-#, c-format
-msgid "Fetching submodule %s%s\n"
-msgstr "S'està obtenint el submòdul %s%s\n"
-
-#: submodule.c:1589
-#, c-format
-msgid "Could not access submodule '%s'\n"
-msgstr "No s'ha pogut accedir al submòdul «%s»\n"
-
-#: submodule.c:1618
-#, c-format, fuzzy
-msgid "Could not access submodule '%s' at commit %s\n"
-msgstr "No s'ha pogut accedir al submòdul «%s» en els percentatges"
-
-#: submodule.c:1629
-#, c-format, fuzzy
-msgid "Fetching submodule %s%s at commit %s\n"
-msgstr ""
-"S'estan recollint els submòduls un percentatge de percentatges a les "
-"comissions"
-
-#: submodule.c:1849
-#, c-format
-msgid ""
-"Errors during submodule fetch:\n"
-"%s"
-msgstr ""
-"Errors durant l'obtenció de submòduls:\n"
-"%s"
-
-#: submodule.c:1874
-#, c-format
-msgid "'%s' not recognized as a git repository"
-msgstr "«%s» no reconegut com un repositori git"
-
-#: submodule.c:1891
-#, 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:1932
-#, 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:2007
-#, 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:2020
-#, 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:2037
-#, 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»"
-
-#: submodule.c:2064 submodule.c:2379
-#, 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»"
-
-#: submodule.c:2086
-msgid "could not reset submodule index"
-msgstr "no s'ha pogut restablir l'índex del submòdul"
-
-#: submodule.c:2128
-#, c-format
-msgid "submodule '%s' has dirty index"
-msgstr "el submòdul «%s» té l'índex brut"
-
-#: submodule.c:2182
-#, c-format
-msgid "Submodule '%s' could not be updated."
-msgstr "No s'ha pogut actualitzar el submòdul «%s»."
-
-#: submodule.c:2250
-#, c-format
-msgid "submodule git dir '%s' is inside git dir '%.*s'"
-msgstr "submodule git dir «%s» està dins git dir «%.*s»"
-
-#: submodule.c:2271
-#, c-format
-msgid ""
-"relocate_gitdir for submodule '%s' with more than one worktree not supported"
-msgstr ""
-"no està admès relocate_gitdir per al submòdul «%s» amb més d'un arbre de "
-"treball"
-
-#: submodule.c:2283 submodule.c:2343
-#, c-format
-msgid "could not lookup name for submodule '%s'"
-msgstr "no s'ha trobat el nom pel submòdul «%s»"
-
-#: submodule.c:2287
-#, 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:2293
-#, c-format
-msgid ""
-"Migrating git directory of '%s%s' from\n"
-"'%s' to\n"
-"'%s'\n"
-msgstr ""
-"S'està migrant el directori de «%s%s» des de\n"
-"«%s» a\n"
-"«%s»\n"
-
-#: submodule.c:2424
-msgid "could not start ls-files in .."
-msgstr "no s'ha pogut iniciar ls-files a .."
-
-#: submodule.c:2464
-#, c-format
-msgid "ls-tree returned unexpected return code %d"
-msgstr "ls-tree ha retornat un codi de retorn %d no esperat"
-
-#: symlinks.c:244
-#, c-format
-msgid "failed to lstat '%s'"
-msgstr "s'ha produït un error en fer lstat a «%s»"
-
-#: trailer.c:244
-#, c-format
-msgid "running trailer command '%s' failed"
-msgstr "l'execució de l'ordre «trailer» «%s» ha fallat"
-
-#: 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 "valor desconegut «%s» per a la clau «%s»"
-
-#: trailer.c:547 trailer.c:552 trailer.c:557 builtin/remote.c:300
-#: builtin/remote.c:328
-#, c-format
-msgid "more than one %s"
-msgstr "més d'un %s"
-
-#: trailer.c:743
-#, c-format
-msgid "empty trailer token in trailer '%.*s'"
-msgstr "testimoni de «trailer» buit en el «trailer» «%.*s»"
-
-#: trailer.c:763
-#, c-format
-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 imap-send.c:1563
-msgid "could not read from stdin"
-msgstr "no s'ha pogut llegir des de stdin"
-
-#: trailer.c:1024 wrapper.c:760
-#, c-format
-msgid "could not stat %s"
-msgstr "no s'ha pogut fer stat a %s"
-
-#: trailer.c:1026
-#, c-format
-msgid "file %s is not a regular file"
-msgstr "el fitxer %s no és un fitxer regular"
-
-#: trailer.c:1028
-#, c-format
-msgid "file %s is not writable by user"
-msgstr "el fitxer %s no és gravable per l'usuari"
-
-#: trailer.c:1040
-msgid "could not open temporary file"
-msgstr "no s'ha pogut obrir el fitxer temporal"
-
-#: trailer.c:1080
-#, c-format
-msgid "could not rename temporary file to %s"
-msgstr "no s'ha pogut canviar el nom del fitxer temporal a %s"
-
-#: transport-helper.c:62 transport-helper.c:91
-msgid "full write to remote helper failed"
-msgstr "l'escriptura completa a l'ajudant remot ha fallat"
-
-#: transport-helper.c:145
-#, c-format
-msgid "unable to find remote helper for '%s'"
-msgstr "no s'ha pogut trobar l'ajudant remot per a «%s»"
-
-#: transport-helper.c:161 transport-helper.c:575
-msgid "can't dup helper output fd"
-msgstr "no es pot duplicar la sortida de l'ajudant «fd»"
-
-#: transport-helper.c:214
-#, c-format
-msgid ""
-"unknown mandatory capability %s; this remote helper probably needs newer "
-"version of Git"
-msgstr ""
-"funcionalitat obligatòria %s desconeguda; aquest ajudant remot probablement "
-"necessita una versió més nova del Git"
-
-#: transport-helper.c:220
-msgid "this remote helper should implement refspec capability"
-msgstr "aquest ajudant remot ha d'implementar la funcionalitat de refspec"
-
-#: transport-helper.c:287 transport-helper.c:429
-#, c-format
-msgid "%s unexpectedly said: '%s'"
-msgstr "%s ha dit inesperadament «%s»"
-
-#: transport-helper.c:417
-#, c-format
-msgid "%s also locked %s"
-msgstr "%s també està bloquejat %s"
-
-#: transport-helper.c:497
-msgid "couldn't run fast-import"
-msgstr "no s'ha pogut executar «fast-import»"
-
-#: transport-helper.c:520
-msgid "error while running fast-import"
-msgstr "error en executar la importació ràpida"
-
-#: transport-helper.c:549 transport-helper.c:1254
-#, c-format
-msgid "could not read ref %s"
-msgstr "no s'ha pogut llegir la referència %s"
-
-#: transport-helper.c:594
-#, c-format
-msgid "unknown response to connect: %s"
-msgstr "resposta desconeguda en connectar: %s"
-
-#: transport-helper.c:616
-msgid "setting remote service path not supported by protocol"
-msgstr "el protocol no permet establir el camí del servei remot"
-
-#: transport-helper.c:618
-msgid "invalid remote service path"
-msgstr "el camí del servei remot no és vàlid"
-
-#: transport-helper.c:661 transport.c:1496
-msgid "operation not supported by protocol"
-msgstr "opció no admesa pel protocol"
-
-#: transport-helper.c:664
-#, c-format
-msgid "can't connect to subservice %s"
-msgstr "no es pot connectar al subservei %s"
-
-#: transport-helper.c:693 transport.c:415
-msgid "--negotiate-only requires protocol v2"
-msgstr "--negotiate-only requereix el protocol v2"
-
-#: transport-helper.c:758
-msgid "'option' without a matching 'ok/error' directive"
-msgstr "«option» sense una directiva «ok/error» coincident"
-
-#: transport-helper.c:801
-#, c-format
-msgid "expected ok/error, helper said '%s'"
-msgstr "s'esperava error/OK, l'ajudant ha dit «%s»"
-
-#: transport-helper.c:862
-#, c-format
-msgid "helper reported unexpected status of %s"
-msgstr "l'ajudant ha informat d'un estat inesperat de %s"
-
-#: transport-helper.c:945
-#, c-format
-msgid "helper %s does not support dry-run"
-msgstr "l'ajudant %s no admet dry-run"
-
-#: transport-helper.c:948
-#, c-format
-msgid "helper %s does not support --signed"
-msgstr "l'ajudant %s no admet --signed"
-
-#: transport-helper.c:951
-#, c-format
-msgid "helper %s does not support --signed=if-asked"
-msgstr "l'ajudant %s no admet --signed=if-asked"
-
-#: transport-helper.c:956
-#, c-format
-msgid "helper %s does not support --atomic"
-msgstr "l'ajudant %s no admet --atomic"
-
-#: transport-helper.c:960
-#, c-format
-msgid "helper %s does not support --%s"
-msgstr "l'ajudant %s no admet --%s"
-
-#: transport-helper.c:967
-#, c-format
-msgid "helper %s does not support 'push-option'"
-msgstr "l'ajudant %s no admet «push-option»"
-
-#: transport-helper.c:1067
-msgid "remote-helper doesn't support push; refspec needed"
-msgstr ""
-"remot-helper no permet pujar; es necessiten especificacions de referència"
-
-#: transport-helper.c:1072
-#, c-format
-msgid "helper %s does not support 'force'"
-msgstr "l'ajudant %s no admet «force»"
-
-#: transport-helper.c:1119
-msgid "couldn't run fast-export"
-msgstr "no s'ha pogut executar l'exportació ràpida"
-
-#: transport-helper.c:1124
-msgid "error while running fast-export"
-msgstr "error en executar l'exportació ràpida"
-
-#: transport-helper.c:1149
-#, c-format
-msgid ""
-"No refs in common and none specified; doing nothing.\n"
-"Perhaps you should specify a branch.\n"
-msgstr ""
-"No hi ha referències en comú i no n'hi ha cap d'especificada.\n"
-"No es farà res. Potser hauríeu d'especificar una branca.\n"
-
-#: transport-helper.c:1231
-#, c-format
-msgid "unsupported object format '%s'"
-msgstr "format d'objecte no suportat «%s»"
-
-#: transport-helper.c:1240
-#, c-format
-msgid "malformed response in ref list: %s"
-msgstr "resposta mal formada al llistat de referències: %s"
-
-#: transport-helper.c:1392
-#, c-format
-msgid "read(%s) failed"
-msgstr "ha fallat la lectura(%s)"
-
-#: transport-helper.c:1419
-#, c-format
-msgid "write(%s) failed"
-msgstr "ha fallat l'escriptura(%s)"
-
-#: transport-helper.c:1468
-#, c-format
-msgid "%s thread failed"
-msgstr "%s ha fallat el fil"
-
-#: transport-helper.c:1472
-#, c-format
-msgid "%s thread failed to join: %s"
-msgstr "el fil %s no s'ha pogut unir: %s"
-
-#: transport-helper.c:1491 transport-helper.c:1495
-#, c-format
-msgid "can't start thread for copying data: %s"
-msgstr "no es pot iniciar el fil per a copiar les dades: %s"
-
-#: transport-helper.c:1532
-#, c-format
-msgid "%s process failed to wait"
-msgstr "el procés %s no ha pogut esperar"
-
-#: transport-helper.c:1536
-#, c-format
-msgid "%s process failed"
-msgstr "el procés %s ha fallat"
-
-#: transport-helper.c:1554 transport-helper.c:1563
-msgid "can't start thread for copying data"
-msgstr "no es pot iniciar el fil per a copiar dades"
-
-#: transport.c:116
-#, c-format
-msgid "Would set upstream of '%s' to '%s' of '%s'\n"
-msgstr "Canviaria la font de «%s» a «%s» de «%s»\n"
-
-#: transport.c:138
-#, c-format
-msgid "could not read bundle '%s'"
-msgstr "no s'ha pogut llegir el farcell «%s»"
-
-#: transport.c:234
-#, c-format
-msgid "transport: invalid depth option '%s'"
-msgstr "transport: opció de profunditat no vàlida «%s»"
-
-#: transport.c:289
-msgid "see protocol.version in 'git help config' for more details"
-msgstr "vegeu «protocol.version» a «git help config» per a més detalls"
-
-#: transport.c:290
-msgid "server options require protocol version 2 or later"
-msgstr "les opcions del servidor requereixen el protocol versió 2 o posterior"
-
-#: transport.c:418
-msgid "server does not support wait-for-done"
-msgstr "el servidor no admet «wait-for-done»"
-
-#: transport.c:770
-msgid "could not parse transport.color.* config"
-msgstr "no s'ha pogut analitzar la configuració de transport.color.*"
-
-#: transport.c:845
-msgid "support for protocol v2 not implemented yet"
-msgstr ""
-"encara no s'ha implementat la compatibilitat amb la versió v2 del protocol"
-
-#: transport.c:978
-#, c-format
-msgid "unknown value for config '%s': %s"
-msgstr "valor desconegut per al config «%s»': %s"
-
-#: transport.c:1044
-#, c-format
-msgid "transport '%s' not allowed"
-msgstr "no es permet el transport «%s»"
-
-#: transport.c:1093
-msgid "git-over-rsync is no longer supported"
-msgstr "git-over-rsync ja no s'admet"
-
-#: transport.c:1196
-#, c-format
-msgid ""
-"The following submodule paths contain changes that can\n"
-"not be found on any remote:\n"
-msgstr ""
-"Els camins de submòdul següents contenen canvis que no\n"
-"es poden trobar en cap remot:\n"
-
-#: transport.c:1200
-#, c-format
-msgid ""
-"\n"
-"Please try\n"
-"\n"
-"\tgit push --recurse-submodules=on-demand\n"
-"\n"
-"or cd to the path and use\n"
-"\n"
-"\tgit push\n"
-"\n"
-"to push them to a remote.\n"
-"\n"
-msgstr ""
-"\n"
-"Intenteu\n"
-"\n"
-"\tgit push --recurse-submodules=on-demand\n"
-"\n"
-"o feu cd al camí i useu\n"
-"\n"
-"\tgit push\n"
-"\n"
-"per a pujar-los a un remot.\n"
-
-#: transport.c:1208
-msgid "Aborting."
-msgstr "S'està avortant."
-
-#: transport.c:1354
-msgid "failed to push all needed submodules"
-msgstr "no s'han pogut pujar tots els submòduls necessaris"
-
-#: tree-walk.c:33
-msgid "too-short tree object"
-msgstr "objecte d'arbre massa curt"
-
-#: tree-walk.c:39
-msgid "malformed mode in tree entry"
-msgstr "mode mal format en entrada d'arbre"
-
-#: tree-walk.c:43
-msgid "empty filename in tree entry"
-msgstr "nom de fitxer buit en una entrada d'arbre"
-
-#: tree-walk.c:118
-msgid "too-short tree file"
-msgstr "fitxer d'arbre massa curt"
-
-#: unpack-trees.c:118
-#, c-format
-msgid ""
-"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 canvis locals als fitxers següents se sobreescriurien per a agafar:\n"
-"%%sCometeu els vostres canvis o feu «stash» abans de canviar de branca."
-
-#: unpack-trees.c:120
-#, c-format
-msgid ""
-"Your local changes to the following files would be overwritten by checkout:\n"
-"%%s"
-msgstr ""
-"Els canvis locals als fitxers següents se sobreescriurien per a agafar:\n"
-"%%s"
-
-#: unpack-trees.c:123
-#, c-format
-msgid ""
-"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 canvis locals als fitxers següents se sobreescriurien per a fusionar:\n"
-"%%sCometeu els vostres canvis o feu «stash» abans de fusionar."
-
-#: unpack-trees.c:125
-#, c-format
-msgid ""
-"Your local changes to the following files would be overwritten by merge:\n"
-"%%s"
-msgstr ""
-"Els canvis locals als fitxers següents se sobreescriurien per a fusionar:\n"
-"%%s"
-
-#: unpack-trees.c:128
-#, c-format
-msgid ""
-"Your local changes to the following files would be overwritten by %s:\n"
-"%%sPlease commit your changes or stash them before you %s."
-msgstr ""
-"Els vostres canvis locals als fitxers següents se sobreescriurien per %s:\n"
-"%%sCometeu els vostres canvis o feu «stash» abans de %s."
-
-#: unpack-trees.c:130
-#, c-format
-msgid ""
-"Your local changes to the following files would be overwritten by %s:\n"
-"%%s"
-msgstr ""
-"Els vostres canvis locals als fitxers següents se sobreescriurien per %s:\n"
-"%%s"
-
-#: unpack-trees.c:135
-#, c-format
-msgid ""
-"Updating the following directories would lose untracked files in them:\n"
-"%s"
-msgstr ""
-"En actualitzar els directoris següents perdria fitxers no seguits en el:\n"
-"%s"
-
-#: unpack-trees.c:138
-#, c-format
-msgid ""
-"Refusing to remove the current working directory:\n"
-"%s"
-msgstr ""
-"S'ha rebutjat suprimir el directori de treball actual:\n"
-"%s"
-
-#: unpack-trees.c:142
-#, c-format
-msgid ""
-"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 a agafar:\n"
-"%%sMoveu-los o elimineu-los abans de canviar de branca."
-
-#: unpack-trees.c:144
-#, c-format
-msgid ""
-"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 en agafar:\n"
-"%%s"
-
-#: unpack-trees.c:147
-#, c-format
-msgid ""
-"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 en fusionar:\n"
-"%%sMoveu-los o elimineu-los abans de fusionar."
-
-#: unpack-trees.c:149
-#, c-format
-msgid ""
-"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 en fusionar:\n"
-"%%s"
-
-#: unpack-trees.c:152
-#, c-format
-msgid ""
-"The following untracked working tree files would be removed by %s:\n"
-"%%sPlease move or remove them before you %s."
-msgstr ""
-"Els següents fitxers no seguits en l'arbre de treball s'eliminarien per %s:\n"
-"%%sMoveu-los o elimineu-los abans de %s."
-
-#: unpack-trees.c:154
-#, c-format
-msgid ""
-"The following untracked working tree files would be removed by %s:\n"
-"%%s"
-msgstr ""
-"Els següents fitxers no seguits en l'arbre de treball s'eliminarien per %s:\n"
-"%%s"
-
-#: unpack-trees.c:160
-#, c-format
-msgid ""
-"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 a agafar:\n"
-"%%sMoveu-los o elimineu-los abans de canviar de branca."
-
-#: unpack-trees.c:162
-#, c-format
-msgid ""
-"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 a agafar:\n"
-"%%s"
-
-#: unpack-trees.c:165
-#, c-format
-msgid ""
-"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 a fusionar:\n"
-"%%sMoveu-los o elimineu-los abans de fusionar."
-
-#: unpack-trees.c:167
-#, c-format
-msgid ""
-"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 a fusionar:\n"
-"%%s"
-
-#: unpack-trees.c:170
-#, c-format
-msgid ""
-"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"
-"%%sMoveu-los o elimineu-los abans de %s."
-
-#: unpack-trees.c:172
-#, c-format
-msgid ""
-"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"
-"%%s"
-
-#: unpack-trees.c:180
-#, c-format
-msgid "Entry '%s' overlaps with '%s'.  Cannot bind."
-msgstr "L'entrada «%s» encavalca amb «%s».  No es pot vincular."
-
-#: unpack-trees.c:183
-#, c-format
-msgid ""
-"Cannot update submodule:\n"
-"%s"
-msgstr ""
-"No es pot actualitzar el submòdul:\n"
-"%s"
-
-#: unpack-trees.c:186
-#, c-format
-msgid ""
-"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, malgrat els patrons dispersos:\n"
-"%s"
-
-#: unpack-trees.c:188
-#, c-format
-msgid ""
-"The following paths are unmerged and were left despite sparse patterns:\n"
-"%s"
-msgstr ""
-"Els camins següents no es fusionen, i es van deixar, malgrat els patrons dispersos:\n"
-"%s"
-
-#: unpack-trees.c:190
-#, c-format
-msgid ""
-"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 malgrat els patrons dispersos.:\n"
-"%s"
-
-#: unpack-trees.c:270
-#, c-format
-msgid "Aborting\n"
-msgstr "S'està avortant\n"
-
-#: unpack-trees.c:297
-#, c-format
-msgid ""
-"After fixing the above paths, you may want to run `git sparse-checkout "
-"reapply`.\n"
-msgstr ""
-"Després de corregir els camins anteriors és possible que vulgueu executar "
-"«git sparse-checkout reapply».\n"
-
-#: unpack-trees.c:358
-msgid "Updating files"
-msgstr "S'estan actualitzant els fitxers"
-
-#: unpack-trees.c:390
-msgid ""
-"the following paths have collided (e.g. case-sensitive paths\n"
-"on a case-insensitive filesystem) and only one from the same\n"
-"colliding group is in the working tree:\n"
-msgstr ""
-"els camins següents han col·lisionat (p. ex. camins sensibles a majúscules\n"
-"i minúscules en un sistema de fitxers que no distingeix entre majúscules i\n"
-"minúscules). Només un camí del mateix grup de col·lisió es troba a l'arbre\n"
-"de treball:\n"
-
-#: unpack-trees.c:1664
-msgid "Updating index flags"
-msgstr "Actualitzant els indicadors d'índex"
-
-#: unpack-trees.c:2925
-#, 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:1579
-msgid "expected flush after fetch arguments"
-msgstr "s'esperava una neteja després dels arguments del «fetch»"
-
-#: urlmatch.c:163
-msgid "invalid URL scheme name or missing '://' suffix"
-msgstr "l'esquema d'URL no és vàlid o li manca el sufix «://»"
-
-#: urlmatch.c:187 urlmatch.c:346 urlmatch.c:405
-#, c-format
-msgid "invalid %XX escape sequence"
-msgstr "seqüència d'escapament %XX no vàlida"
-
-#: urlmatch.c:215
-msgid "missing host and scheme is not 'file:'"
-msgstr "manca la màquina i l'esquema no és «file:»"
-
-#: urlmatch.c:232
-msgid "a 'file:' URL may not have a port number"
-msgstr "un URL «file:» no pot tenir número de port"
-
-#: urlmatch.c:247
-msgid "invalid characters in host name"
-msgstr "hi ha caràcters no vàlids en el nom de màquina"
-
-#: urlmatch.c:292 urlmatch.c:303
-msgid "invalid port number"
-msgstr "número de port no vàlid"
-
-#: urlmatch.c:371
-msgid "invalid '..' path segment"
-msgstr "segment de camí «..» no vàlid"
-
-#: walker.c:170
-msgid "Fetching objects"
-msgstr "S'estan obtenint objectes"
-
-#: worktree.c:237 builtin/am.c:2210 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
-#, 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
-#, 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
-#, c-format
-msgid "'%s' does not exist"
-msgstr "«%s» no existeix"
-
-#: worktree.c:333
-#, 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
-#, c-format
-msgid "'%s' does not point back to '%s'"
-msgstr "«%s» no assenyala de tornada a «%s»"
-
-#: worktree.c:600
-msgid "not a directory"
-msgstr "no és en un directori"
-
-#: worktree.c:609
-msgid ".git is not a file"
-msgstr ".git no és un fitxer"
-
-#: worktree.c:611
-msgid ".git file broken"
-msgstr "fitxer .git malmès"
-
-#: worktree.c:613
-msgid ".git file incorrect"
-msgstr "fitxer .git malmès"
-
-#: worktree.c:719
-msgid "not a valid path"
-msgstr "no és un camí vàlid"
-
-#: worktree.c:725
-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:729
-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"
-
-#: worktree.c:733
-msgid "unable to locate repository; .git file broken"
-msgstr "no s'ha pogut trobar el repositori; el fitxer .git està malmès"
-
-#: worktree.c:739
-msgid "gitdir unreadable"
-msgstr "gitdir illegible"
-
-#: worktree.c:743
-msgid "gitdir incorrect"
-msgstr "gitdir incorrecte"
-
-#: worktree.c:768
-msgid "not a valid directory"
-msgstr "no és en un directori vàlid"
-
-#: worktree.c:774
-msgid "gitdir file does not exist"
-msgstr "el fitxer gitdir no existeix"
-
-#: worktree.c:779 worktree.c:788
-#, c-format
-msgid "unable to read gitdir file (%s)"
-msgstr "no s'ha pogut llegir el fitxer gitdir (%s)"
-
-#: worktree.c:798
-#, c-format
-msgid "short read (expected %<PRIuMAX> bytes, read %<PRIuMAX>)"
-msgstr "lectura curta (s'esperaven %<PRIuMAX> bytes, llegits %<PRIuMAX>)"
-
-#: worktree.c:806
-msgid "invalid gitdir file"
-msgstr "fitxer gitdir no vàlid"
-
-#: worktree.c:814
-msgid "gitdir file points to non-existent location"
-msgstr "el fitxer gitdir indica una ubicació no existent"
-
-#: worktree.c:830
-#, c-format, fuzzy
-msgid "unable to set %s in '%s'"
-msgstr "no s'han pogut establir els percentatges en «%s»"
-
-#: worktree.c:832
-#, c-format, fuzzy
-msgid "unable to unset %s in '%s'"
-msgstr "no s'han pogut establir els percentatges en '%s'"
-
-#: worktree.c:852
-msgid "failed to set extensions.worktreeConfig setting"
-msgstr "no s'ha pogut establir el paràmetre extensions.worktreeConfig"
-
-#: wrapper.c:161
-#, c-format
-msgid "could not setenv '%s'"
-msgstr "no s'ha pogut fer setenv «%s»"
-
-#: wrapper.c:213
-#, c-format
-msgid "unable to create '%s'"
-msgstr "no s'ha pogut crear «%s»"
-
-#: wrapper.c:215 wrapper.c:385
-#, 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:416 wrapper.c:683
-#, c-format
-msgid "unable to access '%s'"
-msgstr "no s'ha pogut accedir a «%s»"
-
-#: wrapper.c:691
-msgid "unable to get current working directory"
-msgstr "no s'ha pogut obtenir el directori de treball actual"
-
-#: wt-status.c:158
-msgid "Unmerged paths:"
-msgstr "Camins sense fusionar:"
-
-#: wt-status.c:187 wt-status.c:219
-msgid "  (use \"git restore --staged <file>...\" to unstage)"
-msgstr "  (useu «git restore --staged <fitxer>...» per a fer «unstage»)"
-
-#: 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»)"
-
-#: wt-status.c:193 wt-status.c:225
-msgid "  (use \"git rm --cached <file>...\" to unstage)"
-msgstr "  (useu «git rm --cached <fitxer>...» per a fer «unstage»)"
-
-#: wt-status.c:197
-msgid "  (use \"git add <file>...\" to mark resolution)"
-msgstr "  (useu «git add <fitxer>...» per a senyalar resolució)"
-
-#: wt-status.c:199 wt-status.c:203
-msgid "  (use \"git add/rm <file>...\" as appropriate to mark resolution)"
-msgstr ""
-"  (useu «git add/rm <fitxer>...» segons sigui apropiat per a senyalar "
-"resolució)"
-
-#: wt-status.c:201
-msgid "  (use \"git rm <file>...\" to mark resolution)"
-msgstr "  (useu «git rm <fitxer>...» per a senyalar resolució)"
-
-#: wt-status.c:211 wt-status.c:1140
-msgid "Changes to be committed:"
-msgstr "Canvis a cometre:"
-
-#: wt-status.c:234 wt-status.c:1149
-msgid "Changes not staged for commit:"
-msgstr "Canvis no «staged» per a cometre:"
-
-#: wt-status.c:238
-msgid "  (use \"git add <file>...\" to update what will be committed)"
-msgstr "  (useu «git add <fitxer>...» per a actualitzar què es cometrà)"
-
-#: wt-status.c:240
-msgid "  (use \"git add/rm <file>...\" to update what will be committed)"
-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)"
-msgstr ""
-"  (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)"
-msgstr ""
-"  (cometeu o descarteu el contingut modificat o no seguit en els submòduls)"
-
-#: wt-status.c:254
-#, c-format
-msgid "  (use \"git %s <file>...\" to include in what will be committed)"
-msgstr "  (useu «git %s <fitxer>...» per a incloure'ls en la comissió)"
-
-#: wt-status.c:266
-msgid "both deleted:"
-msgstr "suprimit per ambdós:"
-
-#: wt-status.c:268
-msgid "added by us:"
-msgstr "afegit per nosaltres:"
-
-#: wt-status.c:270
-msgid "deleted by them:"
-msgstr "suprimit per ells:"
-
-#: wt-status.c:272
-msgid "added by them:"
-msgstr "afegit per ells:"
-
-#: wt-status.c:274
-msgid "deleted by us:"
-msgstr "suprimit per nosaltres:"
-
-#: wt-status.c:276
-msgid "both added:"
-msgstr "afegit per ambdós:"
-
-#: wt-status.c:278
-msgid "both modified:"
-msgstr "modificat per ambdós:"
-
-#: wt-status.c:288
-msgid "new file:"
-msgstr "fitxer nou:"
-
-#: wt-status.c:290
-msgid "copied:"
-msgstr "copiat:"
-
-#: wt-status.c:292
-msgid "deleted:"
-msgstr "suprimit:"
-
-#: wt-status.c:294
-msgid "modified:"
-msgstr "modificat:"
-
-#: wt-status.c:296
-msgid "renamed:"
-msgstr "canviat de nom:"
-
-#: wt-status.c:298
-msgid "typechange:"
-msgstr "canviat de tipus:"
-
-#: wt-status.c:300
-msgid "unknown:"
-msgstr "desconegut:"
-
-#: wt-status.c:302
-msgid "unmerged:"
-msgstr "sense fusionar:"
-
-#: wt-status.c:382
-msgid "new commits, "
-msgstr "comissions noves, "
-
-#: wt-status.c:384
-msgid "modified content, "
-msgstr "contingut modificat, "
-
-#: wt-status.c:386
-msgid "untracked content, "
-msgstr "contingut no seguit, "
-
-#: wt-status.c:973
-#, 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:1004
-msgid "Submodules changed but not updated:"
-msgstr "Submòduls canviats però no actualitzats:"
-
-#: wt-status.c:1006
-msgid "Submodule changes to be committed:"
-msgstr "Canvis de submòdul a cometre:"
-
-#: wt-status.c:1088
-msgid ""
-"Do not modify or remove the line above.\n"
-"Everything below it will be ignored."
-msgstr ""
-"No modifiqueu ni elimineu la línia de dalt.\n"
-"Tot el que hi ha a sota s'ignorarà."
-
-#: wt-status.c:1180
-#, c-format
-msgid ""
-"\n"
-"It took %.2f seconds to compute the branch ahead/behind values.\n"
-"You can use '--no-ahead-behind' to avoid this.\n"
-msgstr ""
-"\n"
-"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:1210
-msgid "You have unmerged paths."
-msgstr "Teniu camins sense fusionar."
-
-#: wt-status.c:1213
-msgid "  (fix conflicts and run \"git commit\")"
-msgstr "  (arregleu els conflictes i executeu «git commit»)"
-
-#: wt-status.c:1215
-msgid "  (use \"git merge --abort\" to abort the merge)"
-msgstr "  (useu «git merge --abort» per a avortar la fusió)"
-
-#: wt-status.c:1219
-msgid "All conflicts fixed but you are still merging."
-msgstr "Tots els conflictes estan arreglats però encara esteu fusionant."
-
-#: wt-status.c:1222
-msgid "  (use \"git commit\" to conclude merge)"
-msgstr "  (useu «git commit» per a concloure la fusió)"
-
-#: wt-status.c:1233
-msgid "You are in the middle of an am session."
-msgstr "Esteu enmig d'una sessió am."
-
-#: wt-status.c:1236
-msgid "The current patch is empty."
-msgstr "El pedaç actual està buit."
-
-#: wt-status.c:1241
-msgid "  (fix conflicts and then run \"git am --continue\")"
-msgstr "  (arregleu els conflictes i després executeu «git am --continue»)"
-
-#: wt-status.c:1243
-msgid "  (use \"git am --skip\" to skip this patch)"
-msgstr "  (useu «git am --skip» per a ometre aquest pedaç)"
-
-#: wt-status.c:1246
-msgid "  (use \"git am --allow-empty\" to record this patch as an empty commit)"
-msgstr ""
-"  (useu «git am --allow-empty» per a enregistrar aquest pedaç com una "
-"comissió buida)"
-
-#: wt-status.c:1248
-msgid "  (use \"git am --abort\" to restore the original branch)"
-msgstr "  (useu «git am --abort» per a restaurar la branca original)"
-
-#: wt-status.c:1381
-msgid "git-rebase-todo is missing."
-msgstr "Manca git-rebase-todo."
-
-#: wt-status.c:1383
-msgid "No commands done."
-msgstr "No s'ha fet cap ordre."
-
-#: wt-status.c:1386
-#, c-format, fuzzy
-msgid "Last command done (%<PRIuMAX> command done):"
-msgid_plural "Last commands done (%<PRIuMAX> commands done):"
-msgstr[0] "Darrera ordre feta (%<PRIuMAX> ordre feta):"
-msgstr[1] "Darrer ordre feta (%<PRIuMAX> ordres fetes):"
-
-#: wt-status.c:1397
-#, c-format
-msgid "  (see more in file %s)"
-msgstr "  (vegeu més en el fitxer %s)"
-
-#: wt-status.c:1402
-msgid "No commands remaining."
-msgstr "No manca cap ordre."
-
-#: wt-status.c:1405
-#, c-format, fuzzy
-msgid "Next command to do (%<PRIuMAX> remaining command):"
-msgid_plural "Next commands to do (%<PRIuMAX> remaining commands):"
-msgstr[0] "Següent ordre a fer (%<PRIuMAX> restant ordre):"
-msgstr[1] "Següent ordre a fer (%<PRIuMAX> ordres restants):"
-
-#: wt-status.c:1413
-msgid "  (use \"git rebase --edit-todo\" to view and edit)"
-msgstr "  (useu «git rebase --edit-todo» per a veure i editar)"
-
-#: wt-status.c:1425
-#, 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:1430
-msgid "You are currently rebasing."
-msgstr "Actualment esteu fent «rebase»."
-
-#: wt-status.c:1443
-msgid "  (fix conflicts and then run \"git rebase --continue\")"
-msgstr ""
-"  (arregleu els conflictes i després executeu «git rebase --continue»)"
-
-#: wt-status.c:1445
-msgid "  (use \"git rebase --skip\" to skip this patch)"
-msgstr "  (useu «git rebase --skip» per a ometre aquest pedaç)"
-
-#: wt-status.c:1447
-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:1454
-msgid "  (all conflicts fixed: run \"git rebase --continue\")"
-msgstr ""
-"  (tots els conflictes estan arreglats: executeu «git rebase --continue»)"
-
-#: wt-status.c:1458
-#, c-format
-msgid ""
-"You are currently splitting a commit while rebasing branch '%s' on '%s'."
-msgstr ""
-"Actualment esteu dividint una comissió mentre es fa «rebase» de la branca "
-"«%s» en «%s»."
-
-#: wt-status.c:1463
-msgid "You are currently splitting a commit during a rebase."
-msgstr "Actualment esteu dividint una comissió durant un «rebase»."
-
-#: wt-status.c:1466
-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:1470
-#, 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:1475
-msgid "You are currently editing a commit during a rebase."
-msgstr "Actualment esteu editant una comissió durant un «rebase»."
-
-#: wt-status.c:1478
-msgid "  (use \"git commit --amend\" to amend the current commit)"
-msgstr "  (useu «git commit --amend» per a esmenar la comissió actual)"
-
-#: wt-status.c:1480
-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:1491
-msgid "Cherry-pick currently in progress."
-msgstr "Hi ha «cherry pick» actualment en curs."
-
-#: wt-status.c:1494
-#, c-format
-msgid "You are currently cherry-picking commit %s."
-msgstr "Actualment esteu fent «cherry pick» a la comissió %s."
-
-#: wt-status.c:1501
-msgid "  (fix conflicts and run \"git cherry-pick --continue\")"
-msgstr "  (arregleu els conflictes i executeu «git cherry-pick --continue»)"
-
-#: wt-status.c:1504
-msgid "  (run \"git cherry-pick --continue\" to continue)"
-msgstr "  (executeu «git cherry-pick --continue» per a continuar)"
-
-#: wt-status.c:1507
-msgid "  (all conflicts fixed: run \"git cherry-pick --continue\")"
-msgstr ""
-"  (tots els conflictes estan arreglats: executeu «git cherry-pick "
-"--continue»)"
-
-#: wt-status.c:1509
-msgid "  (use \"git cherry-pick --skip\" to skip this patch)"
-msgstr "  (useu «git cherry-pick --skip» per a ometre aquest pedaç)"
-
-#: wt-status.c:1511
-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:1521
-msgid "Revert currently in progress."
-msgstr "Una reversió està actualment en curs."
-
-#: wt-status.c:1524
-#, c-format
-msgid "You are currently reverting commit %s."
-msgstr "Actualment esteu revertint la comissió %s."
-
-#: wt-status.c:1530
-msgid "  (fix conflicts and run \"git revert --continue\")"
-msgstr "  (arregleu els conflictes i executeu «git revert --continue»)"
-
-#: wt-status.c:1533
-msgid "  (run \"git revert --continue\" to continue)"
-msgstr "  (executeu «git revert --continue» per a continuar)"
-
-#: wt-status.c:1536
-msgid "  (all conflicts fixed: run \"git revert --continue\")"
-msgstr ""
-"  (tots els conflictes estan arreglats: executeu «git revert --continue»)"
-
-#: wt-status.c:1538
-msgid "  (use \"git revert --skip\" to skip this patch)"
-msgstr "  (useu «git revert --skip» per a ometre aquest pedaç)"
-
-#: wt-status.c:1540
-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:1550
-#, 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:1554
-msgid "You are currently bisecting."
-msgstr "Actualment esteu bisecant."
-
-#: wt-status.c:1557
-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:1568
-msgid "You are in a sparse checkout."
-msgstr "Esteu en un «sparse-checkout»."
-
-#: wt-status.c:1571
-#, c-format
-msgid "You are in a sparse checkout with %d%% of tracked files present."
-msgstr ""
-"Esteu en un «sparse-checkout» amb un %d%% de fitxers seguits presents."
-
-#: wt-status.c:1815
-msgid "On branch "
-msgstr "En la branca "
-
-#: wt-status.c:1822
-msgid "interactive rebase in progress; onto "
-msgstr "«rebase» interactiu en curs; sobre "
-
-#: wt-status.c:1824
-msgid "rebase in progress; onto "
-msgstr "«rebase» en curs; sobre "
-
-#: wt-status.c:1829
-msgid "HEAD detached at "
-msgstr "HEAD separat a "
-
-#: wt-status.c:1831
-msgid "HEAD detached from "
-msgstr "HEAD separat des de "
-
-#: wt-status.c:1834
-msgid "Not currently on any branch."
-msgstr "Actualment no s'és en cap branca."
-
-#: wt-status.c:1851
-msgid "Initial commit"
-msgstr "Comissió inicial"
-
-#: wt-status.c:1852
-msgid "No commits yet"
-msgstr "No s'ha fet cap comissió encara"
-
-#: wt-status.c:1866
-msgid "Untracked files"
-msgstr "Fitxers no seguits"
-
-#: wt-status.c:1868
-msgid "Ignored files"
-msgstr "Fitxers ignorats"
-
-#: wt-status.c:1872
-#, c-format
-msgid ""
-"It took %.2f seconds to enumerate untracked files. 'status -uno'\n"
-"may speed it up, but you have to be careful not to forget to add\n"
-"new files yourself (see 'git help status')."
-msgstr ""
-"S'ha trigat %.2f segons enumerar els fitxers no seguits.\n"
-"«status -uno» pot accelerar-ho, però heu d'anar amb compte de no\n"
-"oblidar-vos d'afegir fitxers nous vosaltres mateixos (vegeu\n"
-"«git help status»)."
-
-#: wt-status.c:1878
-#, c-format
-msgid "Untracked files not listed%s"
-msgstr "Els fitxers no seguits no estan llistats%s"
-
-#: wt-status.c:1880
-msgid " (use -u option to show untracked files)"
-msgstr " (useu l'opció -u per a mostrar els fitxers no seguits)"
-
-#: wt-status.c:1886
-msgid "No changes"
-msgstr "Sense canvis"
-
-#: wt-status.c:1891
-#, 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:1895
-#, c-format
-msgid "no changes added to commit\n"
-msgstr "no hi ha canvis afegits a cometre\n"
-
-#: wt-status.c:1899
-#, c-format
-msgid ""
-"nothing added to commit but untracked files present (use \"git add\" to "
-"track)\n"
-msgstr ""
-"no hi ha res afegit a cometre però hi ha fitxers no seguits (useu «git add» "
-"per a seguir-los)\n"
-
-#: wt-status.c:1903
-#, 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:1907
-#, 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:1911 wt-status.c:1917
-#, c-format
-msgid "nothing to commit\n"
-msgstr "no hi ha res a cometre\n"
-
-#: wt-status.c:1914
-#, 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"
-
-#: wt-status.c:1919
-#, 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:2024
-msgid "No commits yet on "
-msgstr "No s'ha fet cap comissió encara a "
-
-#: wt-status.c:2028
-msgid "HEAD (no branch)"
-msgstr "HEAD (sense branca)"
-
-#: wt-status.c:2059
-msgid "different"
-msgstr "diferent"
-
-#: wt-status.c:2061 wt-status.c:2069
-msgid "behind "
-msgstr "darrere "
-
-#: wt-status.c:2064 wt-status.c:2067
-msgid "ahead "
-msgstr "davant per "
-
-#. TRANSLATORS: the action is e.g. "pull with rebase"
-#: wt-status.c:2605
-#, c-format
-msgid "cannot %s: You have unstaged changes."
-msgstr "no es pot %s: Teniu canvis «unstaged»."
-
-#: wt-status.c:2611
-msgid "additionally, your index contains uncommitted changes."
-msgstr "addicionalment, el vostre índex conté canvis sense cometre."
-
-#: wt-status.c:2613
-#, 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:205
-msgid "could not send IPC command"
-msgstr "no s'ha pogut enviar l'ordre IPC"
-
-#: compat/simple-ipc/ipc-unix-socket.c:212
-msgid "could not read IPC response"
-msgstr "no s'ha pogut llegir la resposta IPC"
-
-#: compat/simple-ipc/ipc-unix-socket.c:892
-#, 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:904
-#, c-format
-msgid "could not start worker[0] for '%s'"
-msgstr "no s'ha pogut iniciar el fil[0] per a «%s»"
-
-#: compat/precompose_utf8.c:58 builtin/clone.c:353
-#, c-format
-msgid "failed to unlink '%s'"
-msgstr "s'ha produït un error en desenllaçar «%s»"
-
-#: compat/fsmonitor/fsm-listen-darwin.c:355
-#, fuzzy
-msgid "Unable to create FSEventStream."
-msgstr "No s'ha pogut crear el FSEventStream."
-
-#: compat/fsmonitor/fsm-listen-darwin.c:403
-#, fuzzy
-msgid "Failed to start the FSEventStream"
-msgstr "No s'ha pogut iniciar el FSEventStream"
-
-#: builtin/add.c:26
 msgid "git add [<options>] [--] <pathspec>..."
 msgstr "git add [<opcions>] [--] <especificació-de-camí>..."
 
-#: builtin/add.c:63
 #, c-format
 msgid "cannot chmod %cx '%s'"
 msgstr "no es pot fer chmod %cx «%s»"
 
-#: builtin/add.c:105
 #, c-format
 msgid "unexpected diff status %c"
 msgstr "estat de diff inesperat %c"
 
-#: builtin/add.c:110 builtin/commit.c:299
 msgid "updating files failed"
 msgstr "s'ha produït un error en actualitzar els fitxers"
 
-#: builtin/add.c:120
 #, c-format
 msgid "remove '%s'\n"
 msgstr "elimina «%s»\n"
 
-#: builtin/add.c:204
 msgid "Unstaged changes after refreshing the index:"
 msgstr "Canvis «unstaged» després d'actualitzar l'índex:"
 
-#: builtin/add.c:312 builtin/rev-parse.c:993
 msgid "Could not read the index"
 msgstr "No s'ha pogut llegir l'índex"
 
-#: builtin/add.c:325
 msgid "Could not write patch"
 msgstr "No s'ha pogut escriure el pedaç"
 
-#: builtin/add.c:328
 msgid "editing patch failed"
 msgstr "l'edició del pedaç ha fallat"
 
-#: builtin/add.c:331
 #, c-format
 msgid "Could not stat '%s'"
 msgstr "No s'ha pogut fer stat a «%s»"
 
-#: builtin/add.c:333
 msgid "Empty patch. Aborted."
 msgstr "El pedaç és buit. S'ha avortat."
 
-#: builtin/add.c:339
 #, c-format
 msgid "Could not apply '%s'"
 msgstr "No s'ha pogut aplicar «%s»"
 
-#: builtin/add.c:347
 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:367 builtin/clean.c:927 builtin/fetch.c:175 builtin/mv.c:124
-#: builtin/prune-packed.c:14 builtin/pull.c:208 builtin/push.c:550
-#: builtin/remote.c:1454 builtin/rm.c:244 builtin/send-pack.c:194
 msgid "dry run"
 msgstr "fes una prova"
 
-#: builtin/add.c:368 builtin/check-ignore.c:22 builtin/commit.c:1483
-#: builtin/count-objects.c:98 builtin/fsck.c:789 builtin/log.c:2338
-#: builtin/mv.c:123 builtin/read-tree.c:120
 msgid "be verbose"
 msgstr "sigues detallat"
 
-#: builtin/add.c:370
 msgid "interactive picking"
 msgstr "selecció interactiva"
 
-#: builtin/add.c:371 builtin/checkout.c:1599 builtin/reset.c:417
 msgid "select hunks interactively"
 msgstr "selecciona els trossos interactivament"
 
-#: builtin/add.c:372
 msgid "edit current diff and apply"
 msgstr "edita la diferència actual i aplica-la"
 
-#: builtin/add.c:373
 msgid "allow adding otherwise ignored files"
 msgstr "permet afegir fitxers que d'altra manera s'ignoren"
 
-#: builtin/add.c:374
 msgid "update tracked files"
 msgstr "actualitza els fitxers seguits"
 
-#: builtin/add.c:375
 msgid "renormalize EOL of tracked files (implies -u)"
 msgstr "torna a normalitzar EOL dels fitxers seguits (implica -u)"
 
-#: builtin/add.c:376
 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:377
 msgid "add changes from all tracked and untracked files"
 msgstr "afegeix els canvis de tots els fitxers seguits i no seguits"
 
-#: builtin/add.c:380
 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:382
 msgid "don't add, only refresh the index"
 msgstr "no afegeixis, només actualitza l'índex"
 
-#: builtin/add.c:383
 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:384
 msgid "check if - even missing - files are ignored in dry run"
 msgstr ""
 "comprova si els fitxers, fins i tot els absents, s'ignoren en fer una prova"
 
-#: builtin/add.c:385 builtin/mv.c:128 builtin/rm.c:251
 msgid "allow updating entries outside of the sparse-checkout cone"
 msgstr "permet actualitzar entrada fora del con del «sparse-checkout»"
 
-#: builtin/add.c:387 builtin/update-index.c:1023
 msgid "override the executable bit of the listed files"
 msgstr "sobreescriu el bit executable dels fitxers llistats"
 
-#: builtin/add.c:389
 msgid "warn when adding an embedded repository"
 msgstr "avisa'm quan s'afegeixi un repositori incrustat"
 
-#: builtin/add.c:407
 #, c-format
 msgid ""
 "You've added another git repository inside your current repository.\n"
@@ -10904,12 +1883,10 @@ msgstr ""
 "\n"
 "Vegeu «git help submodule» per a més informació."
 
-#: builtin/add.c:436
 #, c-format
 msgid "adding embedded git repository: %s"
 msgstr "s'està afegint un repositori incrustat: %s"
 
-#: builtin/add.c:456
 msgid ""
 "Use -f if you really want to add them.\n"
 "Turn this message off by running\n"
@@ -10919,27 +1896,21 @@ msgstr ""
 "Desactiveu aquest missatge executant\n"
 "«git config advice.addIgnoredFile false»"
 
-#: builtin/add.c:471
 msgid "adding files failed"
 msgstr "l'afegiment de fitxers ha fallat"
 
-#: builtin/add.c:534
 #, 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:555 builtin/checkout.c:1770 builtin/commit.c:365
-#: builtin/reset.c:436 builtin/rm.c:275 builtin/stash.c:1702
 #, c-format
 msgid "'%s' and pathspec arguments cannot be used together"
 msgstr "«%s» i l'especificació de camí no es poden usar juntes"
 
-#: builtin/add.c:566
 #, c-format
 msgid "Nothing specified, nothing added.\n"
 msgstr "No s'ha especificat res, no s'ha afegit res.\n"
 
-#: builtin/add.c:568
 msgid ""
 "Maybe you wanted to say 'git add .'?\n"
 "Turn this message off by running\n"
@@ -10949,115 +1920,121 @@ msgstr ""
 "Desactiveu aquest missatge executant\n"
 "«git config advice.addEmptyPathspec false»"
 
-#: builtin/am.c:393
+msgid "index file corrupt"
+msgstr "fitxer d'índex malmès"
+
+#, c-format
+msgid "bad action '%s' for '%s'"
+msgstr "acció «%s» incorrecta per a «%s»"
+
+#, c-format
+msgid "invalid value for '%s': '%s'"
+msgstr "valor no vàlid per a «%s»: «%s»"
+
+#, c-format
+msgid "could not read '%s'"
+msgstr "no s'ha pogut llegir «%s»"
+
 msgid "could not parse author script"
 msgstr "no s'ha pogut analitzar l'script d'autor"
 
-#: builtin/am.c:483
+#, c-format
+msgid "could not parse %s"
+msgstr "no s'ha pogut analitzar %s"
+
 #, c-format
 msgid "'%s' was deleted by the applypatch-msg hook"
 msgstr "s'ha suprimit «%s» pel lligam applypatch-msg"
 
-#: builtin/am.c:525
 #, c-format
 msgid "Malformed input line: '%s'."
 msgstr "Línia d'entrada mal formada: «%s»."
 
-#: builtin/am.c:563
 #, 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:589
 msgid "fseek failed"
 msgstr "fseek ha fallat"
 
-#: builtin/am.c:777
+#, c-format
+msgid "could not open '%s' for reading"
+msgstr "no s'ha pogut obrir «%s» per a lectura"
+
+#, c-format
+msgid "could not open '%s' for writing"
+msgstr "no s'ha pogut obrir «%s» per a escriptura"
+
 #, c-format
 msgid "could not parse patch '%s'"
 msgstr "no s'ha pogut analitzar el pedaç «%s»"
 
-#: builtin/am.c:842
 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:890
 msgid "invalid timestamp"
 msgstr "marca de temps no vàlida"
 
-#: builtin/am.c:895 builtin/am.c:907
 msgid "invalid Date line"
 msgstr "línia Date no vàlida"
 
-#: builtin/am.c:902
 msgid "invalid timezone offset"
 msgstr "desplaçament del fus horari no vàlid"
 
-#: builtin/am.c:995
 msgid "Patch format detection failed."
 msgstr "La detecció de format de pedaç ha fallat."
 
-#: builtin/am.c:1000 builtin/clone.c:306
 #, c-format
 msgid "failed to create directory '%s'"
 msgstr "s'ha produït un error en crear el directori «%s»"
 
-#: builtin/am.c:1005
 msgid "Failed to split patches."
 msgstr "S'ha produït un error en dividir els pedaços."
 
-#: builtin/am.c:1154
 #, 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:1155
 #, 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:1160
 #, c-format
 msgid "To record the empty patch as an empty commit, run \"%s --allow-empty\"."
 msgstr ""
 "Per a enregistrar un pedaç buit com a comissió buida, executeu «%s --allow-"
 "empty»."
 
-#: builtin/am.c:1162
 #, 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:1257
-msgid ""
-"Patch sent with format=flowed; space at the end of lines might be lost."
+msgid "Patch sent with format=flowed; space at the end of lines might be lost."
 msgstr ""
-"Pedaç enviat amb format=flowed; es pot perdre l'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:1345
 #, c-format
 msgid "missing author line in commit %s"
 msgstr "manca la línia d'autor en la comissió %s"
 
-#: builtin/am.c:1348
 #, c-format
 msgid "invalid ident line: %.*s"
 msgstr "línia d'identitat no vàlida: %.*s"
 
-#: builtin/am.c:1567
+#, c-format
+msgid "unable to parse commit %s"
+msgstr "no s'ha pogut analitzar la comissió %s"
+
 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."
 
-#: builtin/am.c:1569
 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:1588
 msgid ""
 "Did you hand edit your patch?\n"
 "It does not apply to blobs recorded in its index."
@@ -11065,84 +2042,74 @@ msgstr ""
 "Heu editat el vostre pedaç a mà?\n"
 "No s'aplica als blobs recordats en el seu índex."
 
-#: builtin/am.c:1594
 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:1620
 msgid "Failed to merge in the changes."
 msgstr "S'ha produït un error en fusionar els canvis."
 
-#: builtin/am.c:1652
+msgid "git write-tree failed to write a tree"
+msgstr "git write-tree ha fallat en escriure un arbre"
+
 msgid "applying to an empty history"
 msgstr "s'està aplicant a una història buida"
 
-#: builtin/am.c:1704 builtin/am.c:1708
+msgid "failed to write commit object"
+msgstr "s'ha produït un error en escriure l'objecte de comissió"
+
 #, c-format
 msgid "cannot resume: %s does not exist."
 msgstr "no es pot reprendre: %s no existeix."
 
-#: builtin/am.c:1726
 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:1736
+#.
 #, 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:1782 builtin/commit.c:410
 msgid "unable to write index file"
 msgstr "no s'ha pogut escriure el fitxer d'índex"
 
-#: builtin/am.c:1786
 #, c-format
 msgid "Dirty index: cannot apply patches (dirty: %s)"
 msgstr "Índex brut: no es poden aplicar pedaços (bruts: %s)"
 
-#: builtin/am.c:1828
 #, c-format
 msgid "Skipping: %.*s"
 msgstr "S'està ometent: %.*s"
 
-#: builtin/am.c:1833
 #, c-format
 msgid "Creating an empty commit: %.*s"
 msgstr "S'està creant una comissió buida: %.*s"
 
-#: builtin/am.c:1837
 msgid "Patch is empty."
 msgstr "El pedaç està buit."
 
-#: builtin/am.c:1848 builtin/am.c:1917
 #, c-format
 msgid "Applying: %.*s"
 msgstr "S'està aplicant: %.*s"
 
-#: builtin/am.c:1865
 msgid "No changes -- Patch already applied."
 msgstr "Sense canvis -- El pedaç ja s'ha aplicat."
 
-#: builtin/am.c:1871
 #, c-format
 msgid "Patch failed at %s %.*s"
 msgstr "El pedaç ha fallat a %s %.*s"
 
-#: builtin/am.c:1875
 msgid "Use 'git am --show-current-patch=diff' to see the failed patch"
 msgstr ""
 "Useu «git am --show-current-patch=diff» per a veure el pedaç que ha fallat"
 
-#: builtin/am.c:1921
 msgid "No changes - recorded it as an empty commit."
 msgstr "No hi ha canvis - enregistrat com una comissió buida."
 
-#: builtin/am.c:1923
 msgid ""
 "No changes - did you forget to use 'git add'?\n"
 "If there is nothing left to stage, chances are that something else\n"
@@ -11152,27 +2119,28 @@ msgstr ""
 "Si no hi ha res per a fer «stage», probablement alguna altra cosa ja ha\n"
 "introduït els mateixos canvis; potser voleu ometre aquest pedaç."
 
-#: builtin/am.c:1931
 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."
+
+msgid "unable to write new index file"
+msgstr "no s'ha pogut escriure un fitxer d'índex nou"
 
-#: builtin/am.c:2039 builtin/am.c:2043 builtin/am.c:2055 builtin/reset.c:455
-#: builtin/reset.c:463
 #, c-format
 msgid "Could not parse object '%s'."
 msgstr "No s'ha pogut analitzar l'objecte «%s»."
 
-#: builtin/am.c:2091 builtin/am.c:2167
 msgid "failed to clean index"
 msgstr "s'ha produït un error en netejar l'índex"
 
-#: builtin/am.c:2135
 msgid ""
 "You seem to have moved HEAD since the last 'am' failure.\n"
 "Not rewinding to ORIG_HEAD"
@@ -11180,159 +2148,114 @@ msgstr ""
 "Sembla que heu mogut HEAD després de l'última fallada de «am».\n"
 "No s'està rebobinant a ORIG_HEAD"
 
-#: builtin/am.c:2292
+#, c-format
+msgid "failed to read '%s'"
+msgstr "s'ha produït un error en llegir «%s»"
+
 #, c-format
 msgid "options '%s=%s' and '%s=%s' cannot be used together"
 msgstr "les opcions «%s=%s» i «%s=%s» no es poden usar juntes"
 
-#: builtin/am.c:2323
 msgid "git am [<options>] [(<mbox> | <Maildir>)...]"
 msgstr "git am [<opcions>] [(<bústia> | <directori-de-correu>)...]"
 
-#: builtin/am.c:2324
 msgid "git am [<options>] (--continue | --skip | --abort)"
 msgstr "git am [<opcions>] (--continue | --skip | --abort)"
 
-#: builtin/am.c:2330
 msgid "run interactively"
 msgstr "executa interactivament"
 
-#: builtin/am.c:2332
 msgid "historical option -- no-op"
 msgstr "opció històrica -- no-op"
 
-#: builtin/am.c:2334
 msgid "allow fall back on 3way merging if needed"
 msgstr "permet retrocedir a una fusió de 3 vies si és necessari"
 
-#: builtin/am.c:2335 builtin/init-db.c:547 builtin/prune-packed.c:16
-#: builtin/repack.c:646 builtin/stash.c:946
 msgid "be quiet"
 msgstr "silenciós"
 
-#: builtin/am.c:2337
 msgid "add a Signed-off-by trailer to the commit message"
 msgstr "afegeix un «trailer» tipus «Signed-off-by» al missatge de comissió"
 
-#: builtin/am.c:2340
 msgid "recode into utf8 (default)"
 msgstr "recodifica en utf8 (per defecte)"
 
-#: builtin/am.c:2342
 msgid "pass -k flag to git-mailinfo"
 msgstr "passa l'indicador -k a git-mailinfo"
 
-#: builtin/am.c:2344
 msgid "pass -b flag to git-mailinfo"
 msgstr "passa l'indicador -b a git-mailinfo"
 
-#: builtin/am.c:2346
 msgid "pass -m flag to git-mailinfo"
 msgstr "passa l'indicador -m a git-mailinfo"
 
-#: builtin/am.c:2348
 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:2351
 msgid "do not pass --keep-cr flag to git-mailsplit independent of am.keepcr"
 msgstr ""
 "no passis l'indicador --keep-cr a git-mailsplit independentment d'am.keepcr"
 
-#: builtin/am.c:2354
 msgid "strip everything before a scissors line"
 msgstr "elimina tot abans d'una línia de tisores"
 
-#: builtin/am.c:2356
 msgid "pass it through git-mailinfo"
 msgstr "passa-ho a través del git-mailinfo"
 
-#: builtin/am.c:2359 builtin/am.c:2362 builtin/am.c:2365 builtin/am.c:2368
-#: builtin/am.c:2371 builtin/am.c:2374 builtin/am.c:2377 builtin/am.c:2380
-#: builtin/am.c:2386
 msgid "pass it through git-apply"
 msgstr "passa-ho a través de git-apply"
 
-#: builtin/am.c:2376 builtin/commit.c:1514 builtin/fmt-merge-msg.c:18
-#: builtin/fmt-merge-msg.c:21 builtin/grep.c:920 builtin/merge.c:263
-#: builtin/pull.c:142 builtin/pull.c:204 builtin/pull.c:221
-#: builtin/rebase.c:1074 builtin/repack.c:657 builtin/repack.c:661
-#: builtin/repack.c:663 builtin/show-branch.c:650 builtin/show-ref.c:172
-#: builtin/tag.c:446 parse-options.h:159 parse-options.h:180
-#: parse-options.h:348
 msgid "n"
 msgstr "n"
 
-#: builtin/am.c:2382 builtin/branch.c:695 builtin/bugreport.c:109
-#: builtin/cat-file.c:848 builtin/cat-file.c:852 builtin/cat-file.c:856
-#: builtin/for-each-ref.c:41 builtin/ls-tree.c:357 builtin/replace.c:555
-#: builtin/tag.c:480 builtin/verify-tag.c:38
 msgid "format"
 msgstr "format"
 
-#: builtin/am.c:2383
 msgid "format the patch(es) are in"
 msgstr "el format en el qual estan els pedaços"
 
-#: builtin/am.c:2389
 msgid "override error message when patch failure occurs"
 msgstr "sobreescriu el missatge d'error si falla l'aplicació del pedaç"
 
-#: builtin/am.c:2391
 msgid "continue applying patches after resolving a conflict"
 msgstr "segueix aplicant pedaços després de resoldre un conflicte"
 
-#: builtin/am.c:2394
 msgid "synonyms for --continue"
 msgstr "sinònims de --continue"
 
-#: builtin/am.c:2397
 msgid "skip the current patch"
 msgstr "omet el pedaç actual"
 
-#: builtin/am.c:2400
 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:2403
 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:2407
 msgid "show the patch being applied"
 msgstr "mostra el pedaç que s'està aplicant"
 
-#: builtin/am.c:2411
 msgid "record the empty patch as an empty commit"
 msgstr "registra el pedaç buit com una comissió buida"
 
-#: builtin/am.c:2415
 msgid "lie about committer date"
 msgstr "menteix sobre la data del comitent"
 
-#: builtin/am.c:2417
 msgid "use current timestamp for author date"
 msgstr "usa la marca de temps actual per a la data d'autor"
 
-#: builtin/am.c:2419 builtin/commit-tree.c:118 builtin/commit.c:1642
-#: builtin/merge.c:302 builtin/pull.c:179 builtin/rebase.c:1127
-#: builtin/revert.c:117 builtin/tag.c:461
 msgid "key-id"
 msgstr "ID de clau"
 
-#: builtin/am.c:2420 builtin/rebase.c:1128
 msgid "GPG-sign commits"
 msgstr "signa les comissions amb GPG"
 
-#: builtin/am.c:2423
 msgid "how to handle empty patches"
 msgstr "com gestionar les comissions buides"
 
-#: builtin/am.c:2426
 msgid "(internal use for git-rebase)"
 msgstr "(ús intern per a git-rebase)"
 
-#: builtin/am.c:2444
 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."
@@ -11340,18 +2263,15 @@ msgstr ""
 "Fa molt que l'opció -b/--binary no fa res, i\n"
 "s'eliminarà. No l'useu més."
 
-#: builtin/am.c:2451
 msgid "failed to read the index"
 msgstr "s'ha produït un error en llegir l'índex"
 
-#: builtin/am.c:2466
 #, 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:2490
 #, c-format
 msgid ""
 "Stray %s directory found.\n"
@@ -11360,122 +2280,96 @@ msgstr ""
 "S'ha trobat un directori %s extraviat.\n"
 "Useu «git am --abort» per a eliminar-lo."
 
-#: builtin/am.c:2496
 msgid "Resolve operation not in progress, we are not resuming."
 msgstr "Una operació de resolució no està en curs; no reprenem."
 
-#: builtin/am.c:2506
 msgid "interactive mode requires patches on the command line"
 msgstr "el mode interactiu requereix pedaços a la línia d'ordres"
 
-#: builtin/apply.c:8
 msgid "git apply [<options>] [<patch>...]"
 msgstr "git apply [<opcions>] [<pedaç>...]"
 
-#: builtin/archive.c:18
 msgid "could not redirect output"
 msgstr "no s'ha pogut redirigir la sortida"
 
-#: builtin/archive.c:35
 msgid "git archive: Remote with no URL"
 msgstr "git archive: Remot sense URL"
 
-#: 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:62
 #, c-format
 msgid "git archive: NACK %s"
 msgstr "git archive: %s NACK"
 
-#: builtin/archive.c:63
 msgid "git archive: protocol error"
 msgstr "git archive: error de protocol"
 
-#: builtin/archive.c:67
 msgid "git archive: expected a flush"
 msgstr "git archive: s'esperava una neteja"
 
-#: builtin/bisect--helper.c:24
 msgid "git bisect--helper --bisect-reset [<commit>]"
 msgstr "git bisect--helper --bisect-reset [<comissió>]"
 
-#: builtin/bisect--helper.c:26
 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-{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>...]"
 
-#: builtin/bisect--helper.c:29
 msgid "git bisect--helper --bisect-state (bad|new) [<rev>]"
 msgstr "git bisect--helper --bisect-state (bad|new) [<rev>]"
 
-#: builtin/bisect--helper.c:30
 msgid "git bisect--helper --bisect-state (good|old) [<rev>...]"
 msgstr "git bisect--helper --bisect-state (good|old) [<rev>...]"
 
-#: builtin/bisect--helper.c:31
 msgid "git bisect--helper --bisect-replay <filename>"
 msgstr "git bisect--helper --bisect-replay <filename>"
 
-#: builtin/bisect--helper.c:32
 msgid "git bisect--helper --bisect-skip [(<rev>|<range>)...]"
 msgstr "git bisect--helper --bisect-skip [(<rev>|<range>)...]"
 
-#: 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 obrir el fitxer «%s» en mode «%s»"
 
-#: builtin/bisect--helper.c:116
 #, c-format
 msgid "could not write to file '%s'"
 msgstr "no s'ha pogut escriure el fitxer «%s»"
 
-#: 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: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: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:194
 msgid "please use two different terms"
 msgstr "useu dos termes diferents"
 
-#: builtin/bisect--helper.c:210
 #, c-format
 msgid "We are not bisecting.\n"
 msgstr "No estem bisecant.\n"
 
-#: 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:227
 #, c-format
 msgid ""
 "could not check out original HEAD '%s'. Try 'git bisect reset <commit>'."
@@ -11483,27 +2377,22 @@ msgstr ""
 "no s'ha pogut agafar la HEAD original «%s». Proveu «git bisect reset "
 "<commit>»."
 
-#: builtin/bisect--helper.c:271
 #, c-format
 msgid "Bad bisect_write argument: %s"
 msgstr "Argument «bisect_write» incorrecte: %s"
 
-#: 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:288
 #, c-format
 msgid "couldn't open the file '%s'"
 msgstr "no s'ha pogut obrir el fitxer «%s»"
 
-#: builtin/bisect--helper.c:314
 #, c-format
 msgid "Invalid command: you're currently in a %s/%s bisect"
 msgstr "Ordre no vàlida: esteu actualment en una bisecció %s/%s"
 
-#: builtin/bisect--helper.c:341
 #, c-format
 msgid ""
 "You need to give me at least one %s and %s revision.\n"
@@ -11512,7 +2401,6 @@ msgstr ""
 "Heu de donar com a mínim un %s i una revisió %s.\n"
 "Podeu usar «git bisect %s» i «git bisect %s» per a això."
 
-#: builtin/bisect--helper.c:345
 #, c-format
 msgid ""
 "You need to start by \"git bisect start\".\n"
@@ -11523,7 +2411,6 @@ msgstr ""
 "Heu de donar com a mínim un %s i una revisió %s.\n"
 "Podeu usar «git bisect %s» i «git bisect %s» per a això."
 
-#: builtin/bisect--helper.c:365
 #, c-format
 msgid "bisecting only with a %s commit"
 msgstr "bisecant amb només una comissió %s"
@@ -11531,15 +2418,25 @@ msgstr "bisecant amb només una comissió %s"
 #. 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:373
+#.
 msgid "Are you sure [Y/n]? "
 msgstr "N'esteu segur [Y/n]? "
 
-#: builtin/bisect--helper.c:434
+msgid "status: waiting for both good and bad commits\n"
+msgstr ""
+
+#, c-format
+msgid "status: waiting for bad commit, %d good commit known\n"
+msgid_plural "status: waiting for bad commit, %d good commits known\n"
+msgstr[0] ""
+msgstr[1] ""
+
+msgid "status: waiting for good commit(s), bad commit known\n"
+msgstr ""
+
 msgid "no terms defined"
 msgstr "cap terme definit"
 
-#: builtin/bisect--helper.c:437
 #, c-format
 msgid ""
 "Your current terms are %s for the old state\n"
@@ -11548,7 +2445,6 @@ msgstr ""
 "Els termes actuals són %s per a l'estat antic\n"
 "i %s per al nou estat.\n"
 
-#: builtin/bisect--helper.c:447
 #, c-format
 msgid ""
 "invalid argument %s for 'git bisect terms'.\n"
@@ -11557,142 +2453,114 @@ msgstr ""
 "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:514 builtin/bisect--helper.c:1038
 msgid "revision walk setup failed\n"
 msgstr "la configuració del recorregut de revisions ha fallat\n"
 
-#: builtin/bisect--helper.c:536
 #, c-format
 msgid "could not open '%s' for appending"
 msgstr "no s'ha pogut obrir «%s» per a afegir-hi"
 
-#: 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:678
 #, c-format
 msgid "unrecognized option: '%s'"
 msgstr "opció no reconeguda: «%s»"
 
-#: 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:713
 msgid "bad HEAD - I need a HEAD"
 msgstr "HEAD incorrecte - cal un HEAD"
 
-#: 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: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:752
 msgid "bad HEAD - strange symbolic ref"
 msgstr "HEAD incorrecte - referència simbòlica estranya"
 
-#: builtin/bisect--helper.c:772
 #, c-format
 msgid "invalid ref: '%s'"
 msgstr "referència no és vàlida: «%s»"
 
-#: builtin/bisect--helper.c:830
 msgid "You need to start by \"git bisect start\"\n"
 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: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:859
 msgid "Please call `--bisect-state` with at least one argument"
 msgstr "Executeu «--bisect-state» amb almenys un argument"
 
-#: builtin/bisect--helper.c:872
 #, c-format
 msgid "'git bisect %s' can take only one argument."
 msgstr "«git bisect %s» només pot acceptar un argument."
 
-#: builtin/bisect--helper.c:884 builtin/bisect--helper.c:897
 #, c-format
 msgid "Bad rev input: %s"
 msgstr "Entrada amb revisió errònia: %s"
 
-#: builtin/bisect--helper.c:904
 #, c-format
 msgid "Bad rev input (not a commit): %s"
 msgstr "Entrada de revisió errònia (no és una comissió): %s"
 
-#: builtin/bisect--helper.c:936
 msgid "We are not bisecting."
 msgstr "No estem bisecant."
 
-#: builtin/bisect--helper.c:986
 #, c-format
 msgid "'%s'?? what are you talking about?"
 msgstr "«%s»? Què voleu dir?"
 
-#: builtin/bisect--helper.c:998
 #, c-format
 msgid "cannot read file '%s' for replaying"
 msgstr "no es pot llegir «%s» per a reproducció"
 
-#: builtin/bisect--helper.c:1120 builtin/bisect--helper.c:1152
 #, c-format
 msgid "running %s\n"
 msgstr "s'està executant %s\n"
 
-#: builtin/bisect--helper.c:1145 builtin/bisect--helper.c:1335
 msgid "bisect run failed: no command provided."
 msgstr "ha fallat l'execució de bisect: no s'ha proporcionat cap ordre."
 
-#: builtin/bisect--helper.c:1166
 #, c-format
 msgid "unable to verify '%s' on good revision"
 msgstr "no s'ha pogut verificar «%s» en una bona revisió"
 
-#: builtin/bisect--helper.c:1172
 #, c-format
 msgid "bogus exit code %d for good revision"
 msgstr "codi d'error de sortida %d per a una bona revisió"
 
-#: builtin/bisect--helper.c:1180
 #, c-format
 msgid "bisect run failed: exit code %d from '%s' is < 0 or >= 128"
 msgstr ""
 "l'execució de la de bisecció ha fallat: codi de sortida %d de «%s» és < 0 o "
 ">= 128"
 
-#: builtin/bisect--helper.c:1195
 #, c-format
 msgid "cannot open file '%s' for writing"
 msgstr "no es pot obrir «%s» per a escriptura"
 
-#: builtin/bisect--helper.c:1213
 msgid "bisect run cannot continue any more"
 msgstr "l'execució de la bisecció no pot continuar més"
 
-#: builtin/bisect--helper.c:1215
 #, c-format
 msgid "bisect run success"
 msgstr "execució de bisecció amb èxit"
 
-#: builtin/bisect--helper.c:1218
 #, c-format
 msgid "bisect found first bad commit"
 msgstr "la bisecció ha trobat una primera comissió errònia"
 
-#: builtin/bisect--helper.c:1221
 #, c-format
 msgid ""
 "bisect run failed: 'git bisect--helper --bisect-state %s' exited with error "
@@ -11701,225 +2569,168 @@ msgstr ""
 "l'execució de la bisecció ha fallat: «git bisect--helper --bisect-state %s» "
 "ha sortit amb el codi d'error %d"
 
-#: builtin/bisect--helper.c:1253
 msgid "reset the bisection state"
 msgstr "restableix l'estat de la bisecció"
 
-#: builtin/bisect--helper.c:1255
 msgid "check whether bad or good terms exist"
 msgstr "comprova si existeixen termes correctes o incorrectes"
 
-#: builtin/bisect--helper.c:1257
 msgid "print out the bisect terms"
 msgstr "imprimeix els termes de la bisecció"
 
-#: builtin/bisect--helper.c:1259
 msgid "start the bisect session"
 msgstr "inicia la sessió bisecció"
 
-#: builtin/bisect--helper.c:1261
 msgid "find the next bisection commit"
 msgstr "troba la comissió de bisecció següent"
 
-#: builtin/bisect--helper.c:1263
 msgid "mark the state of ref (or refs)"
 msgstr "marca l'estat de la referència o referències"
 
-#: builtin/bisect--helper.c:1265
 msgid "list the bisection steps so far"
 msgstr "mostra les passes de la bisecció fins ara"
 
-#: builtin/bisect--helper.c:1267
 msgid "replay the bisection process from the given file"
 msgstr "torna a reproduir el procés de bisecció des del fitxer donat"
 
-#: builtin/bisect--helper.c:1269
 msgid "skip some commits for checkout"
 msgstr "omet algunes comissions en agafar"
 
-#: builtin/bisect--helper.c:1271
 msgid "visualize the bisection"
 msgstr "visualitza la bisecció"
 
-#: builtin/bisect--helper.c:1273
 msgid "use <cmd>... to automatically bisect"
 msgstr "useu <cmd>... per a fer una bisecció automàticament"
 
-#: builtin/bisect--helper.c:1275
 msgid "no log for BISECT_WRITE"
 msgstr "no hi ha registre per a BISECT_WRITE"
 
-#: builtin/bisect--helper.c:1290
 msgid "--bisect-reset requires either no argument or a commit"
 msgstr "--bisect-reset no requereix cap argument ni comissió"
 
-#: builtin/bisect--helper.c:1295
 msgid "--bisect-terms requires 0 or 1 argument"
 msgstr "--bisect-terms requereix 0 o 1 argument"
 
-#: builtin/bisect--helper.c:1304
 msgid "--bisect-next requires 0 arguments"
 msgstr "--bisect-next no requereix cap argument"
 
-#: builtin/bisect--helper.c:1315
 msgid "--bisect-log requires 0 arguments"
 msgstr "--bisect-log no requereix cap argument"
 
-#: builtin/bisect--helper.c:1320
 msgid "no logfile given"
 msgstr "no s'ha donat cap fitxer de registre"
 
-#: builtin/blame.c:32
 msgid "git blame [<options>] [<rev-opts>] [<rev>] [--] <file>"
 msgstr "git blame [<opcions>] [<opcions-de-revisió>] [<revisió>] [--] fitxer"
 
-#: builtin/blame.c:37
 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:406
 #, c-format
 msgid "expecting a color: %s"
 msgstr "s'esperava un color: %s"
 
-#: builtin/blame.c:413
 msgid "must end with a color"
 msgstr "ha d'acabar amb un color"
 
-#: builtin/blame.c:842
 #, c-format
 msgid "cannot find revision %s to ignore"
 msgstr "no s'ha pogut trobar la revisió %s a ignorar"
 
-#: builtin/blame.c:864
 msgid "show blame entries as we find them, incrementally"
 msgstr "mostra les entrades «blame» mentre les trobem, incrementalment"
 
-#: builtin/blame.c:865
 msgid "do not show object names of boundary commits (Default: off)"
 msgstr ""
 "no mostris els noms d'objectes de les comissions de frontera (per defecte: "
 "desactivat)"
 
-#: builtin/blame.c:866
 msgid "do not treat root commits as boundaries (Default: off)"
 msgstr ""
 "no tractis les comissions arrel com de frontera (per defecte: desactivat)"
 
-#: builtin/blame.c:867
 msgid "show work cost statistics"
 msgstr "mostra les estadístiques de preu de treball"
 
-#: builtin/blame.c:868 builtin/checkout.c:1554 builtin/clone.c:98
-#: builtin/commit-graph.c:75 builtin/commit-graph.c:228 builtin/fetch.c:181
-#: builtin/merge.c:301 builtin/multi-pack-index.c:103
-#: builtin/multi-pack-index.c:154 builtin/multi-pack-index.c:180
-#: builtin/multi-pack-index.c:208 builtin/pull.c:120 builtin/push.c:566
-#: builtin/remote.c:683 builtin/send-pack.c:202
 msgid "force progress reporting"
 msgstr "força l'informe de progrés"
 
-#: builtin/blame.c:869
 msgid "show output score for blame entries"
 msgstr "mostra la puntuació de sortida de les entrades «blame»"
 
-#: builtin/blame.c:870
 msgid "show original filename (Default: auto)"
 msgstr "mostra el nom de fitxer original (per defecte: automàtic)"
 
-#: builtin/blame.c:871
 msgid "show original linenumber (Default: off)"
 msgstr "mostra el número de línia original (per defecte: desactivat)"
 
-#: builtin/blame.c:872
 msgid "show in a format designed for machine consumption"
 msgstr "presenta en un format dissenyat per a ser consumit per una màquina"
 
-#: builtin/blame.c:873
 msgid "show porcelain format with per-line commit information"
 msgstr "mostra en format de porcellana amb informació de comissió per línia"
 
-#: builtin/blame.c:874
 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:875
 msgid "show raw timestamp (Default: off)"
 msgstr "mostra la marca de temps en cru (per defecte: desactivat)"
 
-#: builtin/blame.c:876
 msgid "show long commit SHA1 (Default: off)"
 msgstr "mostra l'SHA1 de comissió llarg (per defecte: desactivat)"
 
-#: builtin/blame.c:877
 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:878
 msgid "show author email instead of name (Default: off)"
 msgstr ""
 "mostra el correu electrònic de l'autor en comptes del nom (per defecte: "
 "desactivat)"
 
-#: builtin/blame.c:879
 msgid "ignore whitespace differences"
 msgstr "ignora les diferències d'espai en blanc"
 
-#: builtin/blame.c:880 builtin/log.c:1857
 msgid "rev"
 msgstr "rev"
 
-#: builtin/blame.c:880
 msgid "ignore <rev> when blaming"
 msgstr "ignora <rev> en fer «blame»"
 
-#: builtin/blame.c:881
 msgid "ignore revisions from <file>"
 msgstr "ignora les revisions de <fitxer>"
 
-#: builtin/blame.c:882
 msgid "color redundant metadata from previous line differently"
 msgstr ""
 "acoloreix les metadades redundants de la línia anterior de manera diferent"
 
-#: builtin/blame.c:883
 msgid "color lines by age"
 msgstr "acoloreix les línies per antiguitat"
 
-#: builtin/blame.c:884
 msgid "spend extra cycles to find better match"
 msgstr "gasta cicles extres per a trobar una coincidència millor"
 
-#: builtin/blame.c:885
 msgid "use revisions from <file> instead of calling git-rev-list"
 msgstr "usa les revisions de <fitxer> en lloc d'invocar git-rev-list"
 
-#: builtin/blame.c:886
 msgid "use <file>'s contents as the final image"
 msgstr "usa els continguts de <fitxer> com a la imatge final"
 
-#: builtin/blame.c:887 builtin/blame.c:888
 msgid "score"
 msgstr "puntuació"
 
-#: builtin/blame.c:887
 msgid "find line copies within and across files"
 msgstr "troba còpies de línia dins i a través dels fitxers"
 
-#: builtin/blame.c:888
 msgid "find line movements within and across files"
 msgstr "troba moviments de línia dins i a través dels fitxers"
 
-#: builtin/blame.c:889
 msgid "range"
 msgstr "rang"
 
-#: builtin/blame.c:890
 msgid "process only line range <start>,<end> or function :<funcname>"
 msgstr "processa només el rang <start>,<end> o la funció :<funcname>"
 
-#: builtin/blame.c:949
 msgid "--progress can't be used with --incremental or porcelain formats"
 msgstr ""
 "no es pot usar --progress amb els formats --incremental o de porcellana"
@@ -11931,26 +2742,22 @@ msgstr ""
 #. among various forms of relative timestamps, but
 #. your language may need more or fewer display
 #. columns.
-#: builtin/blame.c:1000
+#.
 msgid "4 years, 11 months ago"
 msgstr "fa 4 anys i 11 mesos"
 
-#: builtin/blame.c:1116
 #, 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:1161
 msgid "Blaming lines"
 msgstr "S'està fent un «blame»"
 
-#: builtin/branch.c:29
 msgid "git branch [<options>] [-r | -a] [--merged] [--no-merged]"
 msgstr "git branch [<opcions>] [-r | -a] [--merged | --no-merged]"
 
-#: builtin/branch.c:30
 msgid ""
 "git branch [<options>] [-f] [--recurse-submodules] <branch-name> [<start-"
 "point>]"
@@ -11958,31 +2765,24 @@ msgstr ""
 "git branch [<options>] [-f] [--recurse-submodules] <branch-name> [<start-"
 "point>]"
 
-#: builtin/branch.c:31
 msgid "git branch [<options>] [-l] [<pattern>...]"
 msgstr "git branch [<options>] [-l] [<pattern>...]"
 
-#: builtin/branch.c:32
 msgid "git branch [<options>] [-r] (-d | -D) <branch-name>..."
 msgstr "git branch [<opcions>] [-r] (-d | -D) <nom-de-branca>..."
 
-#: builtin/branch.c:33
 msgid "git branch [<options>] (-m | -M) [<old-branch>] <new-branch>"
 msgstr "git branch [<opcions>] (-m | -M) [<branca-antiga>] <branca-nova>"
 
-#: builtin/branch.c:34
 msgid "git branch [<options>] (-c | -C) [<old-branch>] <new-branch>"
 msgstr "git branch [<opcions>] (-c | -C) [<branca-antiga>] <branca-nova>"
 
-#: builtin/branch.c:35
 msgid "git branch [<options>] [-r | -a] [--points-at]"
 msgstr "git branch [<opcions>] [-r | -a] [--points-at]"
 
-#: builtin/branch.c:36
 msgid "git branch [<options>] [-r | -a] [--format]"
 msgstr "git branch [<opcions>] [-r | -a] [--format]"
 
-#: builtin/branch.c:165
 #, c-format
 msgid ""
 "deleting branch '%s' that has been merged to\n"
@@ -11992,7 +2792,6 @@ msgstr ""
 "         fusionat a «%s», però encara no\n"
 "         s'ha fusionat a HEAD."
 
-#: builtin/branch.c:169
 #, c-format
 msgid ""
 "not deleting branch '%s' that is not yet merged to\n"
@@ -12002,12 +2801,10 @@ msgstr ""
 "         s'ha fusionat a «%s», encara que està\n"
 "         fusionada a HEAD."
 
-#: builtin/branch.c:183
 #, c-format
 msgid "Couldn't look up commit object for '%s'"
 msgstr "No s'ha pogut trobar l'objecte de comissió de «%s»"
 
-#: builtin/branch.c:187
 #, c-format
 msgid ""
 "The branch '%s' is not fully merged.\n"
@@ -12016,115 +2813,91 @@ msgstr ""
 "La branca «%s» no està totalment fusionada.\n"
 "Si esteu segur que la voleu suprimir, executeu «git branch -D %s»."
 
-#: builtin/branch.c:200
 msgid "Update of config-file failed"
 msgstr "L'actualització del fitxer de configuració ha fallat"
 
-#: builtin/branch.c:235
 msgid "cannot use -a with -d"
 msgstr "no es pot usar -a amb -d"
 
-#: builtin/branch.c:242
 msgid "Couldn't look up commit object for HEAD"
 msgstr "No s'ha pogut trobar l'objecte de comissió de HEAD"
 
-#: builtin/branch.c:259
 #, c-format
 msgid "Cannot delete branch '%s' checked out at '%s'"
 msgstr "No es pot suprimir la branca «%s» agafada a «%s»"
 
-#: builtin/branch.c:274
 #, c-format
 msgid "remote-tracking branch '%s' not found."
 msgstr "no s'ha trobat la branca amb seguiment remot «%s»."
 
-#: builtin/branch.c:275
 #, c-format
 msgid "branch '%s' not found."
 msgstr "no s'ha trobat la branca «%s»."
 
-#: builtin/branch.c:306
 #, c-format
 msgid "Deleted remote-tracking branch %s (was %s).\n"
 msgstr "S'ha suprimit la branca amb seguiment remot %s (era %s).\n"
 
-#: builtin/branch.c:307
 #, c-format
 msgid "Deleted branch %s (was %s).\n"
 msgstr "S'ha suprimit la branca %s (era %s).\n"
 
-#: builtin/branch.c:457 builtin/tag.c:64
 msgid "unable to parse format string"
 msgstr "no s'ha pogut analitzar la cadena de format"
 
-#: builtin/branch.c:488
 msgid "could not resolve HEAD"
 msgstr "no s'ha pogut resoldre HEAD"
 
-#: builtin/branch.c:494
 #, c-format
 msgid "HEAD (%s) points outside of refs/heads/"
 msgstr "HEAD (%s) apunta fora de refs/heads/"
 
-#: builtin/branch.c:509
 #, c-format
 msgid "Branch %s is being rebased at %s"
 msgstr "S'està fent «rebase» en la branca %s a %s"
 
-#: builtin/branch.c:513
 #, c-format
 msgid "Branch %s is being bisected at %s"
 msgstr "La branca %s s'està bisecant a %s"
 
-#: builtin/branch.c:530
 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:532
 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:543
 #, c-format
 msgid "Invalid branch name: '%s'"
 msgstr "Nom de branca no vàlid: «%s»"
 
-#: builtin/branch.c:572
 msgid "Branch rename failed"
 msgstr "El canvi de nom de branca ha fallat"
 
-#: builtin/branch.c:574
 msgid "Branch copy failed"
 msgstr "La còpia de la branca ha fallat"
 
-#: builtin/branch.c:578
 #, 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:581
 #, c-format
 msgid "Renamed a misnamed branch '%s' away"
 msgstr "S'ha canviat el nom de la branca mal anomenada «%s»"
 
-#: builtin/branch.c:587
 #, 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:596
 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:598
 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:614
 #, c-format
 msgid ""
 "Please edit the description for the branch\n"
@@ -12135,225 +2908,172 @@ msgstr ""
 "  %s\n"
 "S'eliminaran les línies que comencin amb «%c».\n"
 
-#: builtin/branch.c:651
 msgid "Generic options"
 msgstr "Opcions genèriques"
 
-#: builtin/branch.c:653
 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:654
 msgid "suppress informational messages"
 msgstr "omet els missatges informatius"
 
-#: builtin/branch.c:656 builtin/checkout.c:1571
-#: builtin/submodule--helper.c:3077
 msgid "set branch tracking configuration"
 msgstr "estableix la configuració del seguiment de la branca"
 
-#: builtin/branch.c:659
 msgid "do not use"
 msgstr "no usar"
 
-#: builtin/branch.c:661
 msgid "upstream"
 msgstr "font"
 
-#: builtin/branch.c:661
 msgid "change the upstream info"
 msgstr "canvia la informació de font"
 
-#: builtin/branch.c:662
 msgid "unset the upstream info"
 msgstr "treu la informació de la font"
 
-#: builtin/branch.c:663
 msgid "use colored output"
 msgstr "usa sortida amb colors"
 
-#: builtin/branch.c:664
 msgid "act on remote-tracking branches"
 msgstr "actua en branques amb seguiment remot"
 
-#: builtin/branch.c:666 builtin/branch.c:668
 msgid "print only branches that contain the commit"
 msgstr "imprimeix només les branques que continguin la comissió"
 
-#: builtin/branch.c:667 builtin/branch.c:669
 msgid "print only branches that don't contain the commit"
 msgstr "imprimeix només les branques que no continguin la comissió"
 
-#: builtin/branch.c:672
 msgid "Specific git-branch actions:"
 msgstr "Accions de git-branch específiques:"
 
-#: builtin/branch.c:673
 msgid "list both remote-tracking and local branches"
 msgstr "llista les branques amb seguiment remot i les locals"
 
-#: builtin/branch.c:675
 msgid "delete fully merged branch"
 msgstr "suprimeix la branca si està completament fusionada"
 
-#: builtin/branch.c:676
 msgid "delete branch (even if not merged)"
 msgstr "suprimeix la branca (encara que no estigui fusionada)"
 
-#: builtin/branch.c:677
 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:678
 msgid "move/rename a branch, even if target exists"
 msgstr "mou/canvia de nom una branca, encara que el destí existeixi"
 
-#: builtin/branch.c:679
 msgid "copy a branch and its reflog"
 msgstr "copia una branca i el seu registre de referència"
 
-#: builtin/branch.c:680
 msgid "copy a branch, even if target exists"
 msgstr "copia una branca, encara que el destí existeixi"
 
-#: builtin/branch.c:681
 msgid "list branch names"
 msgstr "llista els noms de branca"
 
-#: builtin/branch.c:682
 msgid "show current branch name"
 msgstr "mostra el nom de la branca actual"
 
-#: builtin/branch.c:683 builtin/submodule--helper.c:3075
 msgid "create the branch's reflog"
 msgstr "crea el registre de referència de la branca"
 
-#: builtin/branch.c:685
 msgid "edit the description for the branch"
 msgstr "edita la descripció de la branca"
 
-#: builtin/branch.c:686
 msgid "force creation, move/rename, deletion"
 msgstr "força creació, moviment/canvi de nom, supressió"
 
-#: builtin/branch.c:687
 msgid "print only branches that are merged"
 msgstr "imprimeix només les branques que s'han fusionat"
 
-#: builtin/branch.c:688
 msgid "print only branches that are not merged"
 msgstr "imprimeix només les branques que no s'han fusionat"
 
-#: builtin/branch.c:689
 msgid "list branches in columns"
 msgstr "llista les branques en columnes"
 
-#: builtin/branch.c:691 builtin/for-each-ref.c:45 builtin/notes.c:413
-#: builtin/notes.c:416 builtin/notes.c:579 builtin/notes.c:582
-#: builtin/tag.c:476
 msgid "object"
 msgstr "objecte"
 
-#: builtin/branch.c:692
 msgid "print only branches of the object"
 msgstr "imprimeix només les branques de l'objecte"
 
-#: builtin/branch.c:693 builtin/for-each-ref.c:51 builtin/tag.c:483
 msgid "sorting and filtering are case insensitive"
 msgstr "l'ordenació i el filtratge distingeixen entre majúscules i minúscules"
 
-#: builtin/branch.c:694 builtin/ls-files.c:667
 msgid "recurse through submodules"
 msgstr "inclou recursivament als submòduls"
 
-#: builtin/branch.c:695 builtin/for-each-ref.c:41 builtin/ls-tree.c:358
-#: builtin/tag.c:481 builtin/verify-tag.c:38
 msgid "format to use for the output"
 msgstr "format a usar en la sortida"
 
-#: builtin/branch.c:718 builtin/clone.c:684
+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."
+
 msgid "HEAD not found below refs/heads!"
 msgstr "HEAD no trobat sota refs/heads!"
 
-#: builtin/branch.c:739
 msgid ""
-"branch with --recurse-submodules can only be used if "
-"submodule.propagateBranches is enabled"
+"branch with --recurse-submodules can only be used if submodule."
+"propagateBranches is enabled"
 msgstr ""
-"la branca amb --recurse-submodules només es pot utilitzar si "
-"submodule.propagateBranches està habilitat"
+"la branca amb --recurse-submodules només es pot utilitzar si submodule."
+"propagateBranches està habilitat"
 
-#: builtin/branch.c:741
 msgid "--recurse-submodules can only be used to create branches"
 msgstr "--recurse-submodules només es pot utilitzar per a crear branques"
 
-#: builtin/branch.c:770 builtin/branch.c:826 builtin/branch.c:835
 msgid "branch name required"
 msgstr "cal el nom de branca"
 
-#: builtin/branch.c:802
 msgid "Cannot give description to detached HEAD"
 msgstr "No es pot donar descripció a un HEAD separat"
 
-#: builtin/branch.c:807
 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:814
 #, c-format
 msgid "No commit on branch '%s' yet."
 msgstr "Encara no hi ha cap comissió en la branca «%s»."
 
-#: builtin/branch.c:817
 #, c-format
 msgid "No branch named '%s'."
 msgstr "No hi ha cap branca amb nom «%s»."
 
-#: builtin/branch.c:832
 msgid "too many branches for a copy operation"
 msgstr "hi ha massa branques per a una operació de còpia"
 
-#: builtin/branch.c:841
 msgid "too many arguments for a rename operation"
 msgstr "hi ha massa arguments per a una operació de canvi de nom"
 
-#: builtin/branch.c:846
 msgid "too many arguments to set new upstream"
 msgstr "hi ha massa arguments per a establir una nova font"
 
-#: builtin/branch.c:850
 #, 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:853 builtin/branch.c:873
 #, c-format
 msgid "no such branch '%s'"
 msgstr "no existeix la branca «%s»"
 
-#: builtin/branch.c:857
 #, c-format
 msgid "branch '%s' does not exist"
 msgstr "la branca «%s» no existeix"
 
-#: builtin/branch.c:867
 msgid "too many arguments to unset upstream"
 msgstr "hi ha massa arguments per a desassignar la font"
 
-#: builtin/branch.c:871
 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:877
 #, c-format
 msgid "Branch '%s' has no upstream information"
 msgstr "La branca «%s» no té informació de font"
 
-#: builtin/branch.c:890
 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>?"
@@ -12361,7 +3081,6 @@ msgstr ""
 "Les opcions -a i -r a «git branch» no prenen un nom de branca.\n"
 "Volíeu usar -a|-r --list <pattern>?"
 
-#: builtin/branch.c:894
 msgid ""
 "the '--set-upstream' option is no longer supported. Please use '--track' or "
 "'--set-upstream-to' instead."
@@ -12369,33 +3088,26 @@ msgstr ""
 "l'opció --set-upstream ja no s'admet. En lloc seu, useu «--track» o «--set-"
 "upstream-to»."
 
-#: builtin/bugreport.c:16
 msgid "git version:\n"
 msgstr "versió de git:\n"
 
-#: 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:32
 msgid "compiler info: "
 msgstr "informació del compilador: "
 
-#: builtin/bugreport.c:35
 msgid "libc info: "
 msgstr "informació de la libc: "
 
-#: builtin/bugreport.c:49
 msgid "not run from a git repository - no hooks to show\n"
 msgstr ""
 "no s'està executant en un repositori de git - no hi ha lligams a mostrar\n"
 
-#: 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:69
 msgid ""
 "Thank you for filling out a Git bug report!\n"
 "Please answer the following questions to help us understand your issue.\n"
@@ -12429,154 +3141,126 @@ msgstr ""
 "Reviseu la resta de l'informe d'error de sota.\n"
 "Podeu eliminar qualsevol línia que vulgueu.\n"
 
-#: 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:110
 msgid "specify a strftime format suffix for the filename"
 msgstr "especifiqueu un sufix en format strftime per al nom de fitxer"
 
-#: builtin/bugreport.c:132
 #, c-format
 msgid "could not create leading directories for '%s'"
 msgstr "no s'han pogut crear els directoris principals de «%s»"
 
-#: builtin/bugreport.c:139
 msgid "System Info"
 msgstr "Informació del sistema"
 
-#: builtin/bugreport.c:142
 msgid "Enabled Hooks"
 msgstr "Habilita els lligams"
 
-#: builtin/bugreport.c:149
 #, c-format
 msgid "unable to write to %s"
 msgstr "no s'ha pogut escriure a %s"
 
-#: builtin/bugreport.c:159
 #, c-format
 msgid "Created new report at '%s'.\n"
 msgstr "S'ha creat un nou informe a «%s».\n"
 
-#: builtin/bundle.c:15 builtin/bundle.c:23
 msgid "git bundle create [<options>] <file> <git-rev-list args>"
 msgstr "git bundle create [<opcions>] <fitxer> <git-rev-list args>"
 
-#: builtin/bundle.c:16 builtin/bundle.c:28
 msgid "git bundle verify [<options>] <file>"
 msgstr "git bundle verify [<opcions>] <fitxer>"
 
-#: builtin/bundle.c:17 builtin/bundle.c:33
 msgid "git bundle list-heads <file> [<refname>...]"
 msgstr "git bundle list-heads <fitxer> [<refname>...]"
 
-#: builtin/bundle.c:18 builtin/bundle.c:38
 msgid "git bundle unbundle <file> [<refname>...]"
 msgstr "git bundle unbundle <fitxer> [<refname>...]"
 
-#: builtin/bundle.c:65 builtin/pack-objects.c:3899
 msgid "do not show progress meter"
 msgstr "no mostris l'indicador de progrés"
 
-#: builtin/bundle.c:67 builtin/bundle.c:168 builtin/pack-objects.c:3901
 msgid "show progress meter"
 msgstr "mostra l'indicador de progrés"
 
-#: builtin/bundle.c:69 builtin/pack-objects.c:3903
 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:72 builtin/pack-objects.c:3906
 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:74
 msgid "specify bundle format version"
 msgstr "especifica la versió del format del farcell"
 
-#: builtin/bundle.c:94
 msgid "Need a repository to create a bundle."
 msgstr "Cal un repositori per a crear un farcell."
 
-#: builtin/bundle.c:108
 msgid "do not show bundle details"
 msgstr "no mostris els detalls del farcell"
 
-#: builtin/bundle.c:127
 #, c-format
 msgid "%s is okay\n"
 msgstr "%s està bé\n"
 
-#: builtin/bundle.c:183
 msgid "Need a repository to unbundle."
 msgstr "Cal un repositori per a desfer un farcell."
 
-#: builtin/bundle.c:186
 msgid "Unbundling objects"
 msgstr "S'estan desagrupant objectes"
 
-#: builtin/bundle.c:220 builtin/remote.c:1758
 #, c-format
 msgid "Unknown subcommand: %s"
 msgstr "Subordre desconeguda: %s"
 
-#: builtin/cat-file.c:568
+#, c-format
+msgid "cannot read object %s '%s'"
+msgstr "no es pot llegir l'objecte %s «%s»"
+
 msgid "flush is only for --buffer mode"
 msgstr "flush només és per al mode --buffer"
 
-#: builtin/cat-file.c:612
 msgid "empty command in input"
 msgstr "ordre buida en l'entrada"
 
-#: builtin/cat-file.c:614
-#, c-format, fuzzy
+#, c-format
 msgid "whitespace before command: '%s'"
-msgstr "espai en blanc abans de l'ordre: '%s'"
+msgstr "espai en blanc abans de l'ordre: «%s»"
 
-#: builtin/cat-file.c:623
 #, c-format
 msgid "%s requires arguments"
 msgstr "%s requereix arguments"
 
-#: builtin/cat-file.c:628
 #, c-format
 msgid "%s takes no arguments"
 msgstr "%s no accepta cap valor"
 
-#: builtin/cat-file.c:636
 #, c-format
 msgid "unknown command: '%s'"
 msgstr "ordre desconeguda: «%s»"
 
-#: builtin/cat-file.c:795
 msgid "only one batch option may be specified"
 msgstr "només es pot especificar una opció per lots"
 
-#: builtin/cat-file.c:824
 msgid "git cat-file <type> <object>"
 msgstr "git cat-file <type> <object>"
 
-#: builtin/cat-file.c:825
 msgid "git cat-file (-e | -p) <object>"
 msgstr "git cat-file (-e | -p) <object>"
 
-#: builtin/cat-file.c:826
 msgid "git cat-file (-t | -s) [--allow-unknown-type] <object>"
 msgstr "git cat-file (-t | -s) [--allow-unknown-type] <object>"
 
-#: builtin/cat-file.c:827
 msgid ""
-"git cat-file (--batch | --batch-check | --batch-command) [--batch-all-objects]\n"
+"git cat-file (--batch | --batch-check | --batch-command) [--batch-all-"
+"objects]\n"
 "             [--buffer] [--follow-symlinks] [--unordered]\n"
 "             [--textconv | --filters]"
 msgstr ""
-"git cat-file (--batch | --batch-check | --batch-command) [--batch-all-objects]\n"
+"git cat-file (--batch | --batch-check | --batch-command) [--batch-all-"
+"objects]\n"
 "             [--buffer] [--follow-symlinks] [--unordered]\n"
 "             [--textconv | --filters]"
 
-#: builtin/cat-file.c:830
 msgid ""
 "git cat-file (--textconv | --filters)\n"
 "             [<rev>:<path|tree-ish> | --path=<path|tree-ish> <rev>]"
@@ -12584,404 +3268,306 @@ msgstr ""
 "git cat-file (--textconv | --filters)\n"
 "             [<rev>:<path|tree-ish> | --path=<path|tree-ish> <rev>]"
 
-#: builtin/cat-file.c:836
-#, fuzzy
 msgid "Check object existence or emit object contents"
 msgstr "Comprova l'existència de l'objecte o emet el contingut de l'objecte"
 
-#: builtin/cat-file.c:838
-#, fuzzy
 msgid "check if <object> exists"
 msgstr "comprova si <object> existeix"
 
-#: builtin/cat-file.c:839
 #, fuzzy
 msgid "pretty-print <object> content"
 msgstr "empremta de <object> contingut"
 
-#: builtin/cat-file.c:841
 #, fuzzy
 msgid "Emit [broken] object attributes"
 msgstr "Emet els atributs de l'objecte  objectbroken]"
 
-#: builtin/cat-file.c:842
 #, fuzzy
 msgid "show object type (one of 'blob', 'tree', 'commit', 'tag', ...)"
-msgstr ""
-"mostra el tipus d'objecte (un de 'blob', 'tree', 'commit', 'tag', ...)"
+msgstr "mostra el tipus d'objecte (un de 'blob', 'tree', 'commit', 'tag', ...)"
 
-#: builtin/cat-file.c:843
 msgid "show object size"
 msgstr "mostra la mida de l'objecte"
 
-#: builtin/cat-file.c:845
 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:847
 #, fuzzy
 msgid "Batch objects requested on stdin (or --batch-all-objects)"
 msgstr "Objectes lots sol·licitats a stdin (o --batch-all-objects)"
 
-#: builtin/cat-file.c:849
 #, fuzzy
 msgid "show full <object> or <rev> contents"
 msgstr "mostra el contingut complet de <object> o <rev>"
 
-#: builtin/cat-file.c:853
 #, fuzzy
 msgid "like --batch, but don't emit <contents>"
 msgstr "com --batch, però no emeti <contents>"
 
-#: builtin/cat-file.c:857
 #, fuzzy
 msgid "read commands from stdin"
 msgstr "llegeix les ordres de stdin"
 
-#: builtin/cat-file.c:861
 #, fuzzy
 msgid "with --batch[-check]: ignores stdin, batches all known objects"
 msgstr "amb --batch--check:: ignora stdin, bateja tots els objectes coneguts"
 
-#: builtin/cat-file.c:863
 #, fuzzy
 msgid "Change or optimize batch output"
 msgstr "Canvia o optimitza la sortida per lots"
 
-#: builtin/cat-file.c:864
 msgid "buffer --batch output"
 msgstr "posa la sortida de --batch en memòria intermèdia"
 
-#: builtin/cat-file.c:866
 #, fuzzy
 msgid "follow in-tree symlinks"
 msgstr "segueix els enllaços simbòlics en l'arbre"
 
-#: builtin/cat-file.c:868
 #, fuzzy
 msgid "do not order objects before emitting them"
 msgstr "no ordena objectes abans d'emetre'ls"
 
-#: builtin/cat-file.c:870
 #, fuzzy
 msgid ""
 "Emit object (blob or tree) with conversion or filter (stand-alone, or with "
 "batch)"
 msgstr ""
-"Emet l'objecte (blob o arbre) amb conversió o filtre (stand-alone, o amb "
-"lot)"
+"Emet l'objecte (blob o arbre) amb conversió o filtre (stand-alone, o amb lot)"
 
-#: builtin/cat-file.c:872
 #, fuzzy
 msgid "run textconv on object's content"
 msgstr "executar textconv al contingut de l'objecte"
 
-#: builtin/cat-file.c:874
 #, fuzzy
 msgid "run filters on object's content"
 msgstr "executa els filtres al contingut de l'objecte"
 
-#: builtin/cat-file.c:875
 msgid "blob|tree"
 msgstr "blob|tree"
 
-#: builtin/cat-file.c:876
 #, fuzzy
 msgid "use a <path> for (--textconv | --filters); Not with 'batch'"
 msgstr "useu un <path> per a (--textconv | --filters); No amb 'batch'"
 
-#: builtin/cat-file.c:894
 #, c-format
 msgid "'%s=<%s>' needs '%s' or '%s'"
 msgstr "«%s=<%s>» necessita «%s» o «%s»"
 
-#: builtin/cat-file.c:896
 msgid "path|tree-ish"
 msgstr "path|tree-ish"
 
-#: builtin/cat-file.c:903 builtin/cat-file.c:906 builtin/cat-file.c:909
 #, c-format
 msgid "'%s' requires a batch mode"
 msgstr "%s requereix un mode batch"
 
-#: builtin/cat-file.c:921
 #, c-format
 msgid "'-%c' is incompatible with batch mode"
 msgstr "«-%c» és incompatible amb el model batch"
 
-#: builtin/cat-file.c:924
 msgid "batch modes take no arguments"
 msgstr "el mode batch no accepta cap argument"
 
-#: builtin/cat-file.c:932 builtin/cat-file.c:935
 #, c-format
 msgid "<rev> required with '%s'"
 msgstr "<rev> requerida amb «%s»"
 
-#: builtin/cat-file.c:938
 #, c-format
 msgid "<object> required with '-%c'"
 msgstr "<object> requerit amb «-%c»"
 
-#: builtin/cat-file.c:943 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:965
-#: builtin/notes.c:987 builtin/prune-packed.c:25 builtin/receive-pack.c:2489
-#: builtin/tag.c:592
 msgid "too many arguments"
 msgstr "hi ha massa arguments"
 
-#: builtin/cat-file.c:947
-#, c-format, fuzzy
+#, fuzzy, c-format
 msgid "only two arguments allowed in <type> <object> mode, not %d"
 msgstr ""
 "només es permeten dos arguments en el mode <type> <object>, no en un "
 "percentatge"
 
-#: builtin/check-attr.c:13
 msgid "git check-attr [-a | --all | <attr>...] [--] <pathname>..."
 msgstr "git check-attr [-a | --all | <atribut>...] [--] <nom-de-camí>..."
 
-#: builtin/check-attr.c:14
 msgid "git check-attr --stdin [-z] [-a | --all | <attr>...]"
 msgstr "git check-attr --stdin [-z] [-a | --all | <atribut>...]"
 
-#: builtin/check-attr.c:21
 msgid "report all attributes set on file"
 msgstr "informa de tots els atributs establerts en el fitxer"
 
-#: builtin/check-attr.c:22
 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:101
 msgid "read file names from stdin"
 msgstr "llegeix els noms de fitxer de stdin"
 
-#: builtin/check-attr.c:25 builtin/check-ignore.c:27
 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:1550 builtin/gc.c:550
-#: builtin/worktree.c:565
 msgid "suppress progress reporting"
 msgstr "omet els informes de progrés"
 
-#: builtin/check-ignore.c:29
 msgid "show non-matching input paths"
 msgstr "mostra els camins d'entrada que no coincideixin"
 
-#: builtin/check-ignore.c:31
 msgid "ignore index when checking"
 msgstr "ignora l'índex en comprovar"
 
-#: builtin/check-ignore.c:165
 msgid "cannot specify pathnames with --stdin"
 msgstr "no es poden especificar noms de camí amb --stdin"
 
-#: builtin/check-ignore.c:168
 msgid "-z only makes sense with --stdin"
 msgstr "-z només té sentit amb --stdin"
 
-#: builtin/check-ignore.c:170
 msgid "no path specified"
 msgstr "cap camí especificat"
 
-#: builtin/check-ignore.c:174
 msgid "--quiet is only valid with a single pathname"
 msgstr "--quiet només és vàlid amb un sol nom de camí"
 
-#: builtin/check-ignore.c:176
 msgid "cannot have both --quiet and --verbose"
 msgstr "no es poden especificar --quiet i --verbose alhora"
 
-#: builtin/check-ignore.c:179
 msgid "--non-matching is only valid with --verbose"
 msgstr "--non-matching és vàlid només amb --verbose"
 
-#: builtin/check-mailmap.c:9
 msgid "git check-mailmap [<options>] <contact>..."
 msgstr "git check-mailmap [<opcions>] <contacte>..."
 
-#: builtin/check-mailmap.c:14
 msgid "also read contacts from stdin"
 msgstr "també llegeix els contactes des de stdin"
 
-#: builtin/check-mailmap.c:25
 #, c-format
 msgid "unable to parse contact: %s"
 msgstr "no s'ha pogut analitzar el contacte: %s"
 
-#: builtin/check-mailmap.c:48
 msgid "no contacts specified"
 msgstr "no hi ha contactes especificats"
 
-#: builtin/checkout--worker.c:110
 msgid "git checkout--worker [<options>]"
 msgstr "git checkout--worker [<opcions>]"
 
-#: builtin/checkout--worker.c:118 builtin/checkout-index.c:235
-#: builtin/column.c:31 builtin/column.c:32 builtin/submodule--helper.c:1878
-#: builtin/submodule--helper.c:1881 builtin/submodule--helper.c:1889
-#: builtin/submodule--helper.c:2716 builtin/worktree.c:563
-#: builtin/worktree.c:808
 msgid "string"
 msgstr "cadena"
 
-#: builtin/checkout--worker.c:119 builtin/checkout-index.c:236
 msgid "when creating files, prepend <string>"
 msgstr "en crear fitxers, anteposa <cadena>"
 
-#: builtin/checkout-index.c:184
 msgid "git checkout-index [<options>] [--] [<file>...]"
 msgstr "git checkout-index [<opcions>] [--] [<fitxer>...]"
 
-#: builtin/checkout-index.c:201
 msgid "stage should be between 1 and 3 or all"
 msgstr "«stage» ha de ser entre 1 i 3 o all"
 
-#: builtin/checkout-index.c:219
 msgid "check out all files in the index"
 msgstr "agafa tots els fitxers en l'índex"
 
-#: builtin/checkout-index.c:221
 #, fuzzy
 msgid "do not skip files with skip-worktree set"
 msgstr "no ometis els fitxers amb el conjunt d'arbres de salt"
 
-#: builtin/checkout-index.c:222
 msgid "force overwrite of existing files"
 msgstr "força la sobreescriptura de fitxers existents"
 
-#: builtin/checkout-index.c:224
 msgid "no warning for existing files and files not in index"
 msgstr ""
 "cap advertència per a fitxers existents i fitxers que no siguin a l'índex"
 
-#: builtin/checkout-index.c:226
 msgid "don't checkout new files"
 msgstr "no agafis fitxers nous"
 
-#: builtin/checkout-index.c:228
 msgid "update stat information in the index file"
 msgstr "actualitza la informació d'estadístiques en el fitxer d'índex"
 
-#: builtin/checkout-index.c:232
 msgid "read list of paths from the standard input"
 msgstr "llegeix la llista de camins des de l'entrada estàndard"
 
-#: builtin/checkout-index.c:234
 msgid "write the content to temporary files"
 msgstr "escriu el contingut a fitxers temporals"
 
-#: builtin/checkout-index.c:238
 msgid "copy out the files from named stage"
 msgstr "copia els fitxers des de «stage» amb nom"
 
-#: builtin/checkout.c:34
 msgid "git checkout [<options>] <branch>"
 msgstr "git checkout [<opcions>] <branca>"
 
-#: builtin/checkout.c:35
 msgid "git checkout [<options>] [<branch>] -- <file>..."
 msgstr "git checkout [<opcions>] [<branca>] -- <fitxer>..."
 
-#: builtin/checkout.c:40
 msgid "git switch [<options>] [<branch>]"
 msgstr "git switch [<options>] [<branch>]"
 
-#: builtin/checkout.c:45
 msgid "git restore [<options>] [--source=<branch>] <file>..."
 msgstr "git restore [<opcions>] [--source=<branca>] <fitxer>..."
 
-#: builtin/checkout.c:199 builtin/checkout.c:238
 #, c-format
 msgid "path '%s' does not have our version"
 msgstr "el camí «%s» no té la nostra versió"
 
-#: builtin/checkout.c:201 builtin/checkout.c:240
 #, c-format
 msgid "path '%s' does not have their version"
 msgstr "el camí «%s» no té la seva versió"
 
-#: builtin/checkout.c:217
 #, c-format
 msgid "path '%s' does not have all necessary versions"
 msgstr "el camí «%s» no té totes les versions necessàries"
 
-#: builtin/checkout.c:271
 #, c-format
 msgid "path '%s' does not have necessary versions"
 msgstr "el camí «%s» no té les versions necessàries"
 
-#: builtin/checkout.c:291
 #, c-format
 msgid "path '%s': cannot merge"
 msgstr "camí «%s»: no es pot fusionar"
 
-#: builtin/checkout.c:307
 #, c-format
 msgid "Unable to add merge result for '%s'"
 msgstr "No s'ha pogut afegir el resultat de fusió per a «%s»"
 
-#: builtin/checkout.c:424
 #, c-format
 msgid "Recreated %d merge conflict"
 msgid_plural "Recreated %d merge conflicts"
 msgstr[0] "Recreat un conflicte de fusió"
 msgstr[1] "Recreats %d conflictes de fusió"
 
-#: builtin/checkout.c:429
 #, c-format
 msgid "Updated %d path from %s"
 msgid_plural "Updated %d paths from %s"
 msgstr[0] "S'ha actualitzat %d camí des de %s"
 msgstr[1] "S'han actualitzat %d camins des de %s"
 
-#: builtin/checkout.c:436
 #, 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:459 builtin/checkout.c:462 builtin/checkout.c:465
-#: builtin/checkout.c:469
 #, c-format
 msgid "'%s' cannot be used with updating paths"
 msgstr "«%s» no es pot usar amb actualització de camins"
 
-#: builtin/checkout.c:479
 #, 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:483
 #, c-format
 msgid "neither '%s' or '%s' is specified"
 msgstr "no s'ha especificat ni «%s» ni «%s»"
 
-#: builtin/checkout.c:487
 #, 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:492 builtin/checkout.c:497
 #, c-format
 msgid "'%s' or '%s' cannot be used with %s"
 msgstr "«%s» o «%s» no poden utilitzar-se amb %s"
 
-#: builtin/checkout.c:571 builtin/checkout.c:578
 #, c-format
 msgid "path '%s' is unmerged"
 msgstr "el camí «%s» està sense fusionar"
 
-#: builtin/checkout.c:753
 msgid "you need to resolve your current index first"
 msgstr "heu de primer resoldre el vostre índex actual"
 
-#: builtin/checkout.c:809
 #, c-format
 msgid ""
 "cannot continue with staged changes in the following files:\n"
@@ -12990,50 +3576,40 @@ msgstr ""
 "no es pot continuar amb els canvis «staged» als fitxers següents:\n"
 "%s"
 
-#: builtin/checkout.c:902
 #, 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:947
 msgid "HEAD is now at"
 msgstr "HEAD ara és a"
 
-#: builtin/checkout.c:951 builtin/clone.c:615 t/helper/test-fast-rebase.c:203
 msgid "unable to update HEAD"
 msgstr "no s'ha pogut actualitzar HEAD"
 
-#: builtin/checkout.c:955
 #, c-format
 msgid "Reset branch '%s'\n"
 msgstr "Restableix la branca «%s»\n"
 
-#: builtin/checkout.c:958
 #, c-format
 msgid "Already on '%s'\n"
 msgstr "Ja esteu en «%s»\n"
 
-#: builtin/checkout.c:962
 #, c-format
 msgid "Switched to and reset branch '%s'\n"
 msgstr "S'ha canviat i restablert a la branca «%s»\n"
 
-#: builtin/checkout.c:964 builtin/checkout.c:1398
 #, c-format
 msgid "Switched to a new branch '%s'\n"
 msgstr "S'ha canviat a la branca nova «%s»\n"
 
-#: builtin/checkout.c:966
 #, c-format
 msgid "Switched to branch '%s'\n"
 msgstr "S'ha canviat a la branca «%s»\n"
 
-#: builtin/checkout.c:1017
 #, c-format
 msgid " ... and %d more.\n"
 msgstr " ... i %d més.\n"
 
-#: builtin/checkout.c:1023
 #, c-format
 msgid ""
 "Warning: you are leaving %d commit behind, not connected to\n"
@@ -13056,7 +3632,6 @@ msgstr[1] ""
 "\n"
 "%s\n"
 
-#: builtin/checkout.c:1042
 #, c-format
 msgid ""
 "If you want to keep it by creating a new branch, this may be a good time\n"
@@ -13083,19 +3658,15 @@ msgstr[1] ""
 " git branch <nom-de-branca-nova> %s\n"
 "\n"
 
-#: builtin/checkout.c:1077
 msgid "internal error in revision walk"
 msgstr "error intern en el passeig per revisions"
 
-#: builtin/checkout.c:1081
 msgid "Previous HEAD position was"
 msgstr "La posició de HEAD anterior era"
 
-#: builtin/checkout.c:1124 builtin/checkout.c:1393
 msgid "You are on a branch yet to be born"
 msgstr "Sou en una branca que encara ha de néixer"
 
-#: builtin/checkout.c:1206
 #, c-format
 msgid ""
 "'%s' could be both a local file and a tracking branch.\n"
@@ -13104,7 +3675,6 @@ msgstr ""
 "«%s» podria ser tant un fitxer local com una branca de seguiment.\n"
 "Useu -- (i opcionalment --no-guess) per a desambiguar-ho"
 
-#: builtin/checkout.c:1213
 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"
@@ -13124,59 +3694,47 @@ msgstr ""
 "remota, p. ex. «origin» al remot, considereu configurar l'opció\n"
 "checkout.defaultRemote=origin en la vostra configuració."
 
-#: builtin/checkout.c:1223
 #, c-format
 msgid "'%s' matched multiple (%d) remote tracking branches"
 msgstr "«%s» coincideixen múltiples (%d) branques de seguiment remotes"
 
-#: builtin/checkout.c:1289
 msgid "only one reference expected"
 msgstr "només s'esperava una referència"
 
-#: builtin/checkout.c:1306
 #, c-format
 msgid "only one reference expected, %d given."
 msgstr "s'esperava només una referència, s'han donat %d."
 
-#: builtin/checkout.c:1352 builtin/worktree.c:338 builtin/worktree.c:508
 #, c-format
 msgid "invalid reference: %s"
 msgstr "referència no vàlida: %s"
 
-#: builtin/checkout.c:1365 builtin/checkout.c:1744
 #, c-format
 msgid "reference is not a tree: %s"
 msgstr "la referència no és un arbre: %s"
 
-#: builtin/checkout.c:1413
 #, c-format
 msgid "a branch is expected, got tag '%s'"
 msgstr "s'espera una branca, s'ha obtingut l'etiqueta «%s»"
 
-#: builtin/checkout.c:1415
 #, 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:1417 builtin/checkout.c:1426
 #, c-format
 msgid "a branch is expected, got '%s'"
 msgstr "s'espera una branca, s'ha obtingut «%s»"
 
-#: builtin/checkout.c:1420
 #, c-format
 msgid "a branch is expected, got commit '%s'"
 msgstr "s'espera una branca, s'ha obtingut la comissió «%s»"
 
-#: builtin/checkout.c:1429
 msgid ""
-"If you want to detach HEAD at the commit, try again with the --detach "
-"option."
+"If you want to detach HEAD at the commit, try again with the --detach option."
 msgstr ""
-"Si voleu desacoblar HEAD a la comissió, torneu-ho a provar amb l'opció "
-"--detach."
+"Si voleu desacoblar HEAD a la comissió, torneu-ho a provar amb l'opció --"
+"detach."
 
-#: builtin/checkout.c:1442
 msgid ""
 "cannot switch branch while merging\n"
 "Consider \"git merge --quit\" or \"git worktree add\"."
@@ -13184,7 +3742,6 @@ msgstr ""
 "no es pot canviar de branca mentre es fusiona\n"
 "Considereu usar «git merge --quit» o «git worktree add»."
 
-#: builtin/checkout.c:1446
 msgid ""
 "cannot switch branch in the middle of an am session\n"
 "Consider \"git am --quit\" or \"git worktree add\"."
@@ -13192,7 +3749,6 @@ msgstr ""
 "no es pot canviar de branca en mig d'una sessió «am»\n"
 "Considereu usar «git am --quit» o «git worktree add»."
 
-#: builtin/checkout.c:1450
 msgid ""
 "cannot switch branch while rebasing\n"
 "Consider \"git rebase --quit\" or \"git worktree add\"."
@@ -13200,7 +3756,6 @@ msgstr ""
 "no es pot canviar de branca mentre es fa «rebase»\n"
 "Considereu usar «git rebase --quit» o «git worktree add»."
 
-#: builtin/checkout.c:1454
 msgid ""
 "cannot switch branch while cherry-picking\n"
 "Consider \"git cherry-pick --quit\" or \"git worktree add\"."
@@ -13208,7 +3763,6 @@ msgstr ""
 "no es pot canviar de branca mentre es fa «cherry-pick»\n"
 "Considereu usar «git cherry-pick --quit» o «git worktree add»."
 
-#: builtin/checkout.c:1458
 msgid ""
 "cannot switch branch while reverting\n"
 "Consider \"git revert --quit\" or \"git worktree add\"."
@@ -13216,123 +3770,95 @@ msgstr ""
 "no es pot canviar de branca mentre s'està revertint\n"
 "Considereu «git revert --quit» o «git worktree add»."
 
-#: builtin/checkout.c:1462
 msgid "you are switching branch while bisecting"
 msgstr "s'està canviant la branca mentre es fa una bisecció"
 
-#: builtin/checkout.c:1469
 msgid "paths cannot be used with switching branches"
 msgstr "els camins no es poden usar amb canvi de branca"
 
-#: builtin/checkout.c:1472 builtin/checkout.c:1476 builtin/checkout.c:1480
 #, c-format
 msgid "'%s' cannot be used with switching branches"
 msgstr "«%s» no es pot usar amb canvi de branca"
 
-#: builtin/checkout.c:1484 builtin/checkout.c:1487 builtin/checkout.c:1490
-#: builtin/checkout.c:1495 builtin/checkout.c:1500
 #, c-format
 msgid "'%s' cannot be used with '%s'"
 msgstr "«%s» no es pot usar amb «%s»"
 
-#: builtin/checkout.c:1497
 #, c-format
 msgid "'%s' cannot take <start-point>"
 msgstr "«%s» no pot prendre <start-point>"
 
-#: builtin/checkout.c:1505
 #, 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:1512
 msgid "missing branch or commit argument"
 msgstr "manca branca o argument de comissió"
 
-#: builtin/checkout.c:1555
 msgid "perform a 3-way merge with the new branch"
 msgstr "realitza una fusió de 3 vies amb la branca nova"
 
-#: builtin/checkout.c:1556 builtin/log.c:1844 parse-options.h:354
 msgid "style"
 msgstr "estil"
 
-#: builtin/checkout.c:1557
 msgid "conflict style (merge, diff3, or zdiff3)"
 msgstr "estil de conflicte (merge, diff3, o zdiff3)"
 
-#: builtin/checkout.c:1569 builtin/worktree.c:560
 msgid "detach HEAD at named commit"
 msgstr "separa HEAD a la comissió anomenada"
 
-#: builtin/checkout.c:1574
 msgid "force checkout (throw away local modifications)"
 msgstr "agafa a la força (descarta qualsevol modificació local)"
 
-#: builtin/checkout.c:1576
 msgid "new-branch"
 msgstr "branca-nova"
 
-#: builtin/checkout.c:1576
 msgid "new unparented branch"
 msgstr "branca òrfena nova"
 
-#: builtin/checkout.c:1578 builtin/merge.c:305
 msgid "update ignored files (default)"
 msgstr "actualitza els fitxers ignorats (per defecte)"
 
-#: builtin/checkout.c:1581
 msgid "do not check if another worktree is holding the given ref"
 msgstr "no comprovis si un altre arbre de treball té la referència donada"
 
-#: builtin/checkout.c:1594
 msgid "checkout our version for unmerged files"
 msgstr "agafa la versió nostra dels fitxers sense fusionar"
 
-#: builtin/checkout.c:1597
 msgid "checkout their version for unmerged files"
 msgstr "agafa la versió seva dels fitxers sense fusionar"
 
-#: builtin/checkout.c:1601
 msgid "do not limit pathspecs to sparse entries only"
 msgstr "no limitis les especificacions de camí només a entrades disperses"
 
-#: builtin/checkout.c:1659
 #, c-format
 msgid "options '-%c', '-%c', and '%s' cannot be used together"
 msgstr "les opcions «-%c», «-%c», i «%s» no es poden usar juntes"
 
-#: builtin/checkout.c:1700
 msgid "--track needs a branch name"
 msgstr "--track necessita un nom de branca"
 
-#: builtin/checkout.c:1705
 #, c-format
 msgid "missing branch name; try -%c"
 msgstr "falta el nom de la branca; proveu -%c"
 
-#: builtin/checkout.c:1737
 #, c-format
 msgid "could not resolve %s"
 msgstr "no es pot resoldre %s"
 
-#: builtin/checkout.c:1753
 msgid "invalid path specification"
 msgstr "especificació de camí no vàlida"
 
-#: builtin/checkout.c:1760
 #, 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:1764
 #, 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:1789
 msgid ""
 "git checkout: --ours/--theirs, --force and --merge are incompatible when\n"
 "checking out of the index."
@@ -13340,114 +3866,89 @@ msgstr ""
 "git checkout: --ours/--theirs, --force i --merge són incompatibles en\n"
 "agafar de l'índex."
 
-#: builtin/checkout.c:1794
 msgid "you must specify path(s) to restore"
 msgstr "heu d'especificar el camí o camins a restaurar"
 
-#: builtin/checkout.c:1819 builtin/checkout.c:1821 builtin/checkout.c:1873
-#: builtin/checkout.c:1875 builtin/clone.c:130 builtin/remote.c:171
-#: builtin/remote.c:173 builtin/submodule--helper.c:3038
-#: builtin/submodule--helper.c:3371 builtin/worktree.c:556
-#: builtin/worktree.c:558
 msgid "branch"
 msgstr "branca"
 
-#: builtin/checkout.c:1820
 msgid "create and checkout a new branch"
 msgstr "crea i agafa una branca nova"
 
-#: builtin/checkout.c:1822
 msgid "create/reset and checkout a branch"
 msgstr "crea/restableix i agafa una branca"
 
-#: builtin/checkout.c:1823
 msgid "create reflog for new branch"
 msgstr "crea un registre de referència per a la branca nova"
 
-#: builtin/checkout.c:1825
 msgid "second guess 'git checkout <no-such-branch>' (default)"
 msgstr "segona deducció «git checkout <no-such-branch>» (per defecte)"
 
-#: builtin/checkout.c:1826
 msgid "use overlay mode (default)"
 msgstr "utilitza el mode de superposició (per defecte)"
 
-#: builtin/checkout.c:1874
 msgid "create and switch to a new branch"
 msgstr "crea i canvia a una branca nova"
 
-#: builtin/checkout.c:1876
 msgid "create/reset and switch to a branch"
 msgstr "crea/restableix i canvia a una branca"
 
-#: builtin/checkout.c:1878
 msgid "second guess 'git switch <no-such-branch>'"
 msgstr "segona deducció «git switch <no-such-branch>»"
 
-#: builtin/checkout.c:1880
 msgid "throw away local modifications"
 msgstr "descarta les modificacions locals"
 
-#: builtin/checkout.c:1916
 msgid "which tree-ish to checkout from"
 msgstr "des de quin arbre agafar"
 
-#: builtin/checkout.c:1918
 msgid "restore the index"
 msgstr "restaura l'índex"
 
-#: builtin/checkout.c:1920
 msgid "restore the working tree (default)"
 msgstr "restaura l'arbre de treball (per defecte)"
 
-#: builtin/checkout.c:1922
 msgid "ignore unmerged entries"
 msgstr "ignora les entrades sense fusionar"
 
-#: builtin/checkout.c:1923
 msgid "use overlay mode"
 msgstr "utilitza el mode de superposició"
 
-#: builtin/clean.c:29
 msgid ""
 "git clean [-d] [-f] [-i] [-n] [-q] [-e <pattern>] [-x | -X] [--] <paths>..."
 msgstr ""
 "git clean [-d] [-f] [-i] [-n] [-q] [-e <patró>] [-x | -X] [--] <camins>..."
 
-#: builtin/clean.c:33
 #, c-format
 msgid "Removing %s\n"
 msgstr "S'està eliminant %s\n"
 
-#: builtin/clean.c:34
 #, c-format
 msgid "Would remove %s\n"
 msgstr "Eliminaria %s\n"
 
-#: builtin/clean.c:35
 #, c-format
 msgid "Skipping repository %s\n"
 msgstr "S'està ometent el repositori %s\n"
 
-#: builtin/clean.c:36
 #, c-format
 msgid "Would skip repository %s\n"
 msgstr "Ometria el repositori %s\n"
 
-#: builtin/clean.c:38
+#, c-format
+msgid "failed to remove %s"
+msgstr "s'ha produït un error en eliminar %s"
+
 #, c-format
 msgid "could not lstat %s\n"
 msgstr "no s'ha pogut fer lstat %s\n"
 
-#: builtin/clean.c:39
 msgid "Refusing to remove current working directory\n"
 msgstr "S'ha rebutjat suprimir el directori de treball actual\n"
 
-#: builtin/clean.c:40
 msgid "Would refuse to remove current working directory\n"
 msgstr "Es rebutjarà eliminar el directori de treball actual\n"
 
-#: builtin/clean.c:326 git-add--interactive.perl:593
 #, c-format
 msgid ""
 "Prompt help:\n"
@@ -13460,7 +3961,6 @@ msgstr ""
 "foo        - selecciona un ítem basat en un prefix únic\n"
 "           - (buit) no seleccionis res\n"
 
-#: builtin/clean.c:330 git-add--interactive.perl:602
 #, c-format
 msgid ""
 "Prompt help:\n"
@@ -13481,33 +3981,26 @@ msgstr ""
 "*          - tria tots els ítems\n"
 "           - (buit) finalitza la selecció\n"
 
-#: builtin/clean.c:545 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:685
 #, c-format
 msgid "Input ignore patterns>> "
 msgstr "Introduïu els patrons a ignorar>> "
 
-#: builtin/clean.c:719
 #, 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:740
 msgid "Select items to delete"
 msgstr "Selecciona els ítems a suprimir"
 
 #. TRANSLATORS: Make sure to keep [y/N] as is
-#: builtin/clean.c:781
 #, c-format
 msgid "Remove %s [y/N]? "
 msgstr "Voleu eliminar %s [y/N]? "
 
-#: builtin/clean.c:812
 msgid ""
 "clean               - start cleaning\n"
 "filter by pattern   - exclude items from deletion\n"
@@ -13525,60 +4018,45 @@ msgstr ""
 "help                - aquesta pantalla\n"
 "?                   - ajuda de selecció de l'avís"
 
-#: builtin/clean.c:848
 msgid "Would remove the following item:"
 msgid_plural "Would remove the following items:"
 msgstr[0] "Eliminaria l'ítem següent:"
 msgstr[1] "Eliminaria els ítems següents:"
 
-#: builtin/clean.c:864
 msgid "No more files to clean, exiting."
 msgstr "No hi ha més fitxers a netejar; s'està sortint."
 
-#: builtin/clean.c:926
 msgid "do not print names of files removed"
 msgstr "no imprimeixis els noms dels fitxers eliminats"
 
-#: builtin/clean.c:928
 msgid "force"
 msgstr "força"
 
-#: builtin/clean.c:929
 msgid "interactive cleaning"
 msgstr "neteja interactiva"
 
-#: builtin/clean.c:931
 msgid "remove whole directories"
 msgstr "elimina directoris sencers"
 
-#: builtin/clean.c:932 builtin/describe.c:565 builtin/describe.c:567
-#: builtin/grep.c:938 builtin/log.c:185 builtin/log.c:187
-#: builtin/ls-files.c:651 builtin/name-rev.c:585 builtin/name-rev.c:587
-#: builtin/show-ref.c:179
 msgid "pattern"
 msgstr "patró"
 
-#: builtin/clean.c:933
 msgid "add <pattern> to ignore rules"
 msgstr "afegiu <patró> per a ignorar les regles"
 
-#: builtin/clean.c:934
 msgid "remove ignored files, too"
 msgstr "elimina els fitxers ignorats, també"
 
-#: builtin/clean.c:936
 msgid "remove only ignored files"
 msgstr "elimina només els fitxers ignorats"
 
-#: builtin/clean.c:951
 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:954
 msgid ""
 "clean.requireForce defaults to true and neither -i, -n, nor -f given; "
 "refusing to clean"
@@ -13586,221 +4064,166 @@ msgstr ""
 "clean.requireForce és per defecte cert i ni -i, -n ni -f s'han indicat; "
 "refusant netejar"
 
-#: builtin/clean.c:966
 msgid "-x and -X cannot be used together"
 msgstr "-x i -X no es poden usar junts"
 
-#: builtin/clone.c:47
 msgid "git clone [<options>] [--] <repo> [<dir>]"
 msgstr "git clone [<opcions>] [--] <repositori> [<directori>]"
 
-#: builtin/clone.c:100
 msgid "don't clone shallow repository"
 msgstr "no clonis un repositori superficial"
 
-#: builtin/clone.c:102
 msgid "don't create a checkout"
 msgstr "no facis cap agafament"
 
-#: builtin/clone.c:103 builtin/clone.c:105 builtin/init-db.c:542
 msgid "create a bare repository"
 msgstr "crea un repositori nu"
 
-#: builtin/clone.c:107
 msgid "create a mirror repository (implies bare)"
 msgstr "crea un repositori mirall (implica bare)"
 
-#: builtin/clone.c:109
 msgid "to clone from a local repository"
 msgstr "per a clonar des d'un repositori local"
 
-#: builtin/clone.c:111
 msgid "don't use local hardlinks, always copy"
 msgstr "no usis enllaços durs locals, sempre copia"
 
-#: builtin/clone.c:113
 msgid "setup as shared repository"
 msgstr "configura com a repositori compartit"
 
-#: builtin/clone.c:115
 msgid "pathspec"
 msgstr "especificació de camí"
 
-#: builtin/clone.c:115
 msgid "initialize submodules in the clone"
 msgstr "inicialitza els submòduls en el clon"
 
-#: builtin/clone.c:119
 msgid "number of submodules cloned in parallel"
 msgstr "nombre de submòduls clonats en paral·lel"
 
-#: builtin/clone.c:120 builtin/init-db.c:539
 msgid "template-directory"
 msgstr "directori-de-plantilla"
 
-#: builtin/clone.c:121 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:123 builtin/clone.c:125 builtin/submodule--helper.c:1885
-#: builtin/submodule--helper.c:2719 builtin/submodule--helper.c:3378
 msgid "reference repository"
 msgstr "repositori de referència"
 
-#: builtin/clone.c:127 builtin/submodule--helper.c:1887
-#: builtin/submodule--helper.c:2721
 msgid "use --reference only while cloning"
 msgstr "usa --reference només en clonar"
 
-#: builtin/clone.c:128 builtin/column.c:27 builtin/fmt-merge-msg.c:27
-#: builtin/init-db.c:550 builtin/merge-file.c:48 builtin/merge.c:290
-#: builtin/pack-objects.c:3967 builtin/repack.c:669
-#: builtin/submodule--helper.c:3380 t/helper/test-simple-ipc.c:595
-#: t/helper/test-simple-ipc.c:597
 msgid "name"
 msgstr "nom"
 
-#: builtin/clone.c:129
 msgid "use <name> instead of 'origin' to track upstream"
 msgstr "usa <nom> en lloc d'«origin» per a seguir la font"
 
-#: builtin/clone.c:131
 msgid "checkout <branch> instead of the remote's HEAD"
 msgstr "agafa <branca> en lloc de la HEAD del remot"
 
-#: builtin/clone.c:133
 msgid "path to git-upload-pack on the remote"
 msgstr "camí a git-upload-pack en el remot"
 
-#: builtin/clone.c:134 builtin/fetch.c:182 builtin/grep.c:877
-#: builtin/pull.c:212
 msgid "depth"
 msgstr "profunditat"
 
-#: builtin/clone.c:135
 msgid "create a shallow clone of that depth"
 msgstr "crea un clon superficial d'aquesta profunditat"
 
-#: builtin/clone.c:136 builtin/fetch.c:184 builtin/pack-objects.c:3956
-#: builtin/pull.c:215
 msgid "time"
 msgstr "data"
 
-#: builtin/clone.c:137
 msgid "create a shallow clone since a specific time"
 msgstr "crea un clon superficial des d'una data específica"
 
-#: builtin/clone.c:138 builtin/fetch.c:186 builtin/fetch.c:212
-#: builtin/pull.c:218 builtin/pull.c:243 builtin/rebase.c:1050
 msgid "revision"
 msgstr "revisió"
 
-#: builtin/clone.c:139 builtin/fetch.c:187 builtin/pull.c:219
 msgid "deepen history of shallow clone, excluding rev"
 msgstr "aprofundeix la història d'un clon superficial, excloent una revisió"
 
-#: builtin/clone.c:141 builtin/submodule--helper.c:1897
-#: builtin/submodule--helper.c:2735
 msgid "clone only one branch, HEAD or --branch"
 msgstr "clona només una branca, HEAD o --branch"
 
-#: builtin/clone.c:143
 msgid "don't clone any tags, and make later fetches not to follow them"
 msgstr ""
 "no cloneu cap etiqueta, i feu que els «fetch» següents no les segueixin"
 
-#: builtin/clone.c:145
 msgid "any cloned submodules will be shallow"
 msgstr "qualsevol submòdul clonat serà superficial"
 
-#: builtin/clone.c:146 builtin/init-db.c:548
 msgid "gitdir"
 msgstr "directori de git"
 
-#: builtin/clone.c:147 builtin/init-db.c:549
 msgid "separate git dir from working tree"
 msgstr "separa el directori de git de l'arbre de treball"
 
-#: builtin/clone.c:148
 msgid "key=value"
 msgstr "clau=valor"
 
-#: builtin/clone.c:149
 msgid "set config inside the new repository"
 msgstr "estableix la configuració dins del repositori nou"
 
-#: builtin/clone.c:151 builtin/fetch.c:207 builtin/ls-remote.c:77
-#: builtin/pull.c:234 builtin/push.c:575 builtin/send-pack.c:200
 msgid "server-specific"
 msgstr "específic al servidor"
 
-#: builtin/clone.c:151 builtin/fetch.c:207 builtin/ls-remote.c:77
-#: builtin/pull.c:235 builtin/push.c:575 builtin/send-pack.c:201
 msgid "option to transmit"
 msgstr "opció a transmetre"
 
-#: builtin/clone.c:152 builtin/fetch.c:208 builtin/pull.c:238
-#: builtin/push.c:576
 msgid "use IPv4 addresses only"
 msgstr "usa només adreces IPv4"
 
-#: builtin/clone.c:154 builtin/fetch.c:210 builtin/pull.c:241
-#: builtin/push.c:578
 msgid "use IPv6 addresses only"
 msgstr "usa només adreces IPv6"
 
-#: builtin/clone.c:158
 #, fuzzy
 msgid "apply partial clone filters to submodules"
 msgstr "Aplica els filtres de clonatge parcial als submòduls"
 
-#: builtin/clone.c:160
 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:162
 msgid "initialize sparse-checkout file to include only files at root"
 msgstr ""
 "inicialitza el fitxer «sparse-checkout» per a incloure només els fitxers a "
 "l'arrel"
 
-#: builtin/clone.c:237
 #, 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:310
+#, c-format
+msgid "failed to stat '%s'"
+msgstr "s'ha produït un error en fer stat a «%s»"
+
 #, c-format
 msgid "%s exists and is not a directory"
 msgstr "%s existeix i no és directori"
 
-#: builtin/clone.c:328
 #, c-format
 msgid "failed to start iterator over '%s'"
 msgstr "no s'ha pogut iniciar l'iterador sobre «%s»"
 
-#: builtin/clone.c:359
+#, c-format
+msgid "failed to unlink '%s'"
+msgstr "s'ha produït un error en desenllaçar «%s»"
+
 #, c-format
 msgid "failed to create link '%s'"
 msgstr "s'ha produït un error en crear l'enllaç «%s»"
 
-#: builtin/clone.c:363
 #, 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:368
 #, c-format
 msgid "failed to iterate over '%s'"
 msgstr "no s'ha pogut iterar sobre «%s»"
 
-#: builtin/clone.c:395
 #, c-format
 msgid "done.\n"
 msgstr "fet.\n"
 
-#: builtin/clone.c:409
 msgid ""
 "Clone succeeded, but checkout failed.\n"
 "You can inspect what was checked out with 'git status'\n"
@@ -13810,297 +4233,239 @@ msgstr ""
 "Podeu inspeccionar el que s'ha agafat amb «git status»\n"
 "i tornar-ho a provar amb «git restore --source=HEAD :/»\n"
 
-#: builtin/clone.c:486
 #, 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:603
+msgid "remote did not send all necessary objects"
+msgstr "el remot no ha enviat tots els objectes necessaris"
+
 #, c-format
 msgid "unable to update %s"
 msgstr "no s'ha pogut actualitzar %s"
 
-#: builtin/clone.c:651
 msgid "failed to initialize sparse-checkout"
 msgstr "no s'ha pogut inicialitzar «sparse-checkout»"
 
-#: builtin/clone.c:674
 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:709
 msgid "unable to checkout working tree"
 msgstr "no s'ha pogut agafar l'arbre de treball"
 
-#: builtin/clone.c:793
 msgid "unable to write parameters to config file"
 msgstr "no s'han pogut escriure els paràmetres al fitxer de configuració"
 
-#: builtin/clone.c:856
 msgid "cannot repack to clean up"
 msgstr "no es pot reempaquetar per a netejar"
 
-#: builtin/clone.c:858
 msgid "cannot unlink temporary alternates file"
 msgstr "no es pot desenllaçar el fitxer d'alternatives temporal"
 
-#: builtin/clone.c:901
 msgid "Too many arguments."
 msgstr "Hi ha massa arguments."
 
-#: builtin/clone.c:905 contrib/scalar/scalar.c:413
 msgid "You must specify a repository to clone."
 msgstr "Heu d'especificar un repositori per a clonar."
 
-#: builtin/clone.c:918
 #, c-format
 msgid "options '%s' and '%s %s' cannot be used together"
 msgstr "les opcions «%s» i «%s %s» no es poden usar juntes"
 
-#: builtin/clone.c:935
 #, c-format
 msgid "repository '%s' does not exist"
 msgstr "el repositori «%s» no existeix"
 
-#: builtin/clone.c:939 builtin/fetch.c:2176
 #, c-format
 msgid "depth %s is not a positive number"
 msgstr "la profunditat %s no és un nombre positiu"
 
-#: builtin/clone.c:949
 #, 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:955
 #, 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:969
 #, c-format
 msgid "working tree '%s' already exists."
 msgstr "l'arbre de treball «%s» ja existeix."
 
-#: builtin/clone.c:984 builtin/clone.c:1005 builtin/difftool.c:256
-#: builtin/log.c:2037 builtin/worktree.c:350 builtin/worktree.c:382
 #, c-format
 msgid "could not create leading directories of '%s'"
 msgstr "no s'han pogut crear els directoris inicials de «%s»"
 
-#: builtin/clone.c:989
 #, 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:1009
 #, c-format
 msgid "Cloning into bare repository '%s'...\n"
 msgstr "S'està clonant al repositori nu «%s»...\n"
 
-#: builtin/clone.c:1011
 #, c-format
 msgid "Cloning into '%s'...\n"
 msgstr "S'està clonant a «%s»...\n"
 
-#: builtin/clone.c:1040
 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:1116 builtin/remote.c:201 builtin/remote.c:721
 #, c-format
 msgid "'%s' is not a valid remote name"
 msgstr "«%s» no és un nom de remot vàlid"
 
-#: builtin/clone.c:1157
 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:1159
 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:1161
 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:1163
 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:1168
+msgid "source repository is shallow, reject to clone."
+msgstr "el repositori font és superficial, es rebutja clonar-ho."
+
 msgid "source repository is shallow, ignoring --local"
 msgstr "el repositori font és superficial, s'està ignorant --local"
 
-#: builtin/clone.c:1173
 msgid "--local is ignored"
 msgstr "--local s'ignora"
 
-#: builtin/clone.c:1185
 msgid "cannot clone from filtered bundle"
 msgstr "no es pot clonar des del farell filtrat"
 
-#: builtin/clone.c:1265 builtin/clone.c:1324
 msgid "remote transport reported error"
 msgstr "el transport remot ha informat d'un error"
 
-#: builtin/clone.c:1277 builtin/clone.c:1289
 #, 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:1292
 msgid "You appear to have cloned an empty repository."
 msgstr "Sembla que heu clonat un repositori buit."
 
-#: builtin/column.c:10
 msgid "git column [<options>]"
 msgstr "git column [<opcions>]"
 
-#: builtin/column.c:27
 msgid "lookup config vars"
 msgstr "cerca les variables de configuració"
 
-#: builtin/column.c:28 builtin/column.c:29
 msgid "layout to use"
 msgstr "disposició a usar"
 
-#: builtin/column.c:30
 msgid "maximum width"
 msgstr "amplada màxima"
 
-#: builtin/column.c:31
 msgid "padding space on left border"
 msgstr "espai de farciment al marge esquerre"
 
-#: builtin/column.c:32
 msgid "padding space on right border"
 msgstr "espai de farciment al marge dret"
 
-#: builtin/column.c:33
 msgid "padding space between columns"
 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
 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: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:51 builtin/fetch.c:196 builtin/log.c:1813
 msgid "dir"
 msgstr "directori"
 
-#: builtin/commit-graph.c:52
 msgid "the object directory to store the graph"
 msgstr "el directori d'objectes a emmagatzemar al graf"
 
-#: 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: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:137
 #, c-format
 msgid "unrecognized --split argument, %s"
 msgstr "argument --split no reconegut, %s"
 
-#: builtin/commit-graph.c:150
 #, c-format
 msgid "unexpected non-hex object ID: %s"
 msgstr "ID de l'objecte no hexadecimal inesperat: %s"
 
-#: builtin/commit-graph.c:155
 #, c-format
 msgid "invalid object: %s"
 msgstr "no és un objecte vàlid: %s"
 
-#: builtin/commit-graph.c:205
+#, c-format
+msgid "option `%s' expects a numerical value"
+msgstr "l'opció «%s» espera un valor numèric"
+
 msgid "start walk at all refs"
 msgstr "comença el recorregut en totes les referències"
 
-#: 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:209
 msgid "start walk at commits listed by stdin"
 msgstr "comença el recorregut per les comissions llistades per stdin"
 
-#: 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:213
 msgid "enable computation for changed paths"
 msgstr "habilita la computació per als camins canviats"
 
-#: 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:219
 msgid "maximum number of commits in a non-base split commit-graph"
 msgstr ""
 "nombre màxim de comissions en un graf de comissions separades sense base"
 
-#: 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:223
 msgid "only expire files older than a given date-time"
 msgstr "fes caducar només els objectes més antics que l'hora i data donades"
 
-#: builtin/commit-graph.c:225
 msgid "maximum number of changed-path Bloom filters to compute"
 msgstr "nombre màxim de canvis de camí en filtres Bloom a calcular"
 
-#: builtin/commit-graph.c:251
 msgid "use at most one of --reachable, --stdin-commits, or --stdin-packs"
 msgstr "usa com a màxim un --reachable, --stdin-commits, o --stdin-packs"
 
-#: builtin/commit-graph.c:282
 msgid "Collecting commits from input"
 msgstr "S'estan recollint les comissions de l'entrada"
 
-#: builtin/commit-graph.c:328 builtin/multi-pack-index.c:259
 #, c-format
 msgid "unrecognized subcommand: %s"
 msgstr "subordre no reconeguda: %s"
 
-#: builtin/commit-tree.c:18
 msgid ""
 "git commit-tree [(-p <parent>)...] [-S[<keyid>]] [(-m <message>)...] [(-F "
 "<file>)...] <tree>"
@@ -14108,70 +4473,52 @@ msgstr ""
 "git commit-tree [(-p <parent>)...] [-S[<keyid>]] [(-m <message>)...] [(-F "
 "<file>)...] <tree>"
 
-#: builtin/commit-tree.c:31
 #, c-format
 msgid "duplicate parent %s ignored"
 msgstr "s'han ignorat el pare %s duplicat"
 
-#: builtin/commit-tree.c:56 builtin/commit-tree.c:134 builtin/log.c:590
 #, c-format
 msgid "not a valid object name %s"
 msgstr "no és un nom d'objecte vàlid %s"
 
-#: 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:96
 #, c-format
 msgid "git commit-tree: failed to close '%s'"
 msgstr "git commit-tree: ha fallat en tancar «%s»"
 
-#: builtin/commit-tree.c:109
 msgid "parent"
 msgstr "pare"
 
-#: builtin/commit-tree.c:110
 msgid "id of a parent commit object"
 msgstr "id d'un objecte de comissió pare"
 
-#: builtin/commit-tree.c:112 builtin/commit.c:1626 builtin/merge.c:284
-#: builtin/notes.c:407 builtin/notes.c:573 builtin/stash.c:1666
-#: builtin/tag.c:455
 msgid "message"
 msgstr "missatge"
 
-#: builtin/commit-tree.c:113 builtin/commit.c:1626
 msgid "commit message"
 msgstr "missatge de comissió"
 
-#: 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:119 builtin/commit.c:1643 builtin/merge.c:303
-#: builtin/pull.c:180 builtin/revert.c:118
 msgid "GPG sign commit"
 msgstr "signa la comissió amb GPG"
 
-#: builtin/commit-tree.c:131
 msgid "must give exactly one tree"
 msgstr "ha de donar exactament un arbre"
 
-#: builtin/commit-tree.c:138
 msgid "git commit-tree: failed to read"
 msgstr "git commit-tree: ha fallat en llegir"
 
-#: builtin/commit.c:43
 msgid "git commit [<options>] [--] <pathspec>..."
 msgstr "git commit [<opcions>] [--] <especificació-de-camí>..."
 
-#: builtin/commit.c:48
 msgid "git status [<options>] [--] <pathspec>..."
 msgstr "git status [<opcions>] [--] <especificació-de-camí>..."
 
-#: builtin/commit.c:53
 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"
@@ -14181,7 +4528,6 @@ msgstr ""
 "deixaria buida. Podeu repetir la vostra ordre amb --allow-empty, o\n"
 "podeu eliminar la comissió per complet amb «git reset HEAD^».\n"
 
-#: builtin/commit.c:58
 msgid ""
 "The previous cherry-pick is now empty, possibly due to conflict resolution.\n"
 "If you wish to commit it anyway, use:\n"
@@ -14189,21 +4535,19 @@ msgid ""
 "    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:65
 msgid "Otherwise, please use 'git rebase --skip'\n"
 msgstr "Altrament, si us plau useu «git rebase --skip»\n"
 
-#: builtin/commit.c:68
 msgid "Otherwise, please use 'git cherry-pick --skip'\n"
 msgstr "Altrament, si us plau useu «git cherry-pick --skip»\n"
 
-#: builtin/commit.c:71
 msgid ""
 "and then use:\n"
 "\n"
@@ -14225,69 +4569,57 @@ msgstr ""
 "    git cherry-pick --skip\n"
 "\n"
 
-#: builtin/commit.c:326
 msgid "failed to unpack HEAD tree object"
 msgstr "s'ha produït un error en desempaquetar l'objecte d'arbre HEAD"
 
-#: builtin/commit.c:376
 msgid "No paths with --include/--only does not make sense."
 msgstr "--include/--only no té sentit sense camí."
 
-#: builtin/commit.c:388
 msgid "unable to create temporary index"
 msgstr "no s'ha pogut crear un índex temporal"
 
-#: builtin/commit.c:397
 msgid "interactive add failed"
 msgstr "l'afegiment interactiu ha fallat"
 
-#: builtin/commit.c:412
 msgid "unable to update temporary index"
 msgstr "no s'ha pogut actualitzar l'índex temporal"
 
-#: builtin/commit.c:414
 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:439 builtin/commit.c:462 builtin/commit.c:510
 msgid "unable to write new_index file"
 msgstr "no s'ha pogut escriure el fitxer new_index"
 
-#: builtin/commit.c:491
 msgid "cannot do a partial commit during a merge."
 msgstr "no es pot fer una comissió parcial durant una fusió."
 
-#: builtin/commit.c:493
 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:495
 msgid "cannot do a partial commit during a rebase."
 msgstr "no es pot fer una comissió parcial durant un «rebase»."
 
-#: builtin/commit.c:503
 msgid "cannot read the index"
 msgstr "no es pot llegir l'índex"
 
-#: builtin/commit.c:522
 msgid "unable to write temporary index file"
 msgstr "no s'ha pogut escriure un fitxer d'índex temporal"
 
-#: builtin/commit.c:620
 #, c-format
 msgid "commit '%s' lacks author header"
 msgstr "a la comissió «%s» li manca la capçalera d'autor"
 
-#: builtin/commit.c:622
 #, c-format
 msgid "commit '%s' has malformed author line"
 msgstr "la comissió «%s» té una línia d'autor mal formada"
 
-#: builtin/commit.c:641
 msgid "malformed --author parameter"
 msgstr "paràmetre --author mal format"
 
-#: builtin/commit.c:694
+#, c-format
+msgid "invalid date format: %s"
+msgstr "format de data no vàlid: %s"
+
 msgid ""
 "unable to select a comment character that is not used\n"
 "in the current commit message"
@@ -14295,43 +4627,38 @@ msgstr ""
 "no es pot seleccionar un caràcter de comentari que\n"
 "no sigui usat en el missatge de comissió actual"
 
-#: builtin/commit.c:750 builtin/commit.c:784 builtin/commit.c:1170
 #, c-format
 msgid "could not lookup commit %s"
 msgstr "no s'ha pogut cercar la comissió %s"
 
-#: builtin/commit.c:762 builtin/shortlog.c:417
 #, 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:764
 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:768
 #, c-format
 msgid "could not read log file '%s'"
 msgstr "no s'ha pogut llegir el fitxer de registre «%s»"
 
-#: builtin/commit.c:805
 #, c-format
 msgid "options '%s' and '%s:%s' cannot be used together"
 msgstr "les opcions «%s» i «%s:%s» no es poden usar juntes"
 
-#: builtin/commit.c:817 builtin/commit.c:833
 msgid "could not read SQUASH_MSG"
 msgstr "no s'ha pogut llegir SQUASH_MSG"
 
-#: builtin/commit.c:824
 msgid "could not read MERGE_MSG"
 msgstr "no s'ha pogut llegir MERGE_MSG"
 
-#: builtin/commit.c:884
+#, c-format
+msgid "could not open '%s'"
+msgstr "no s'ha pogut obrir «%s»"
+
 msgid "could not write commit template"
 msgstr "no s'ha pogut escriure la plantilla de comissió"
 
-#: builtin/commit.c:897
 #, c-format
 msgid ""
 "Please enter the commit message for your changes. Lines starting\n"
@@ -14340,7 +4667,6 @@ msgstr ""
 "Introduïu el missatge de comissió per als vostres canvis.\n"
 "S'ignoraran les línies que comencin amb «%c».\n"
 
-#: builtin/commit.c:899
 #, c-format
 msgid ""
 "Please enter the commit message for your changes. Lines starting\n"
@@ -14350,7 +4676,6 @@ msgstr ""
 "S'ignoraran les línies que comencin amb «%c». Un missatge de\n"
 "comissió buit avorta la comissió.\n"
 
-#: builtin/commit.c:903
 #, c-format
 msgid ""
 "Please enter the commit message for your changes. Lines starting\n"
@@ -14359,7 +4684,6 @@ 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:907
 #, c-format
 msgid ""
 "Please enter the commit message for your changes. Lines starting\n"
@@ -14367,10 +4691,10 @@ msgid ""
 "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"
+"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:919
 msgid ""
 "\n"
 "It looks like you may be committing a merge.\n"
@@ -14384,7 +4708,6 @@ msgstr ""
 "\tgit update-ref -d MERGE_HEAD\n"
 "i intenteu-ho de nou.\n"
 
-#: builtin/commit.c:924
 msgid ""
 "\n"
 "It looks like you may be committing a cherry-pick.\n"
@@ -14398,149 +4721,114 @@ msgstr ""
 "\tgit update-ref -d CHERRY_PICK_HEAD\n"
 "i intenteu-ho de nou.\n"
 
-#: builtin/commit.c:951
 #, c-format
 msgid "%sAuthor:    %.*s <%.*s>"
 msgstr "%sAutor:    %.*s <%.*s>"
 
-#: builtin/commit.c:959
 #, c-format
 msgid "%sDate:      %s"
 msgstr "%sData:      %s"
 
-#: builtin/commit.c:966
 #, c-format
 msgid "%sCommitter: %.*s <%.*s>"
 msgstr "%sComitent: %.*s <%.*s>"
 
-#: builtin/commit.c:984
 msgid "Cannot read index"
 msgstr "No es pot llegir l'índex"
 
-#: builtin/commit.c:1029
 msgid "unable to pass trailers to --trailers"
 msgstr "no s'han pogut passar els «trailers» a --trailers"
 
-#: builtin/commit.c:1069
 msgid "Error building trees"
 msgstr "Error en construir els arbres"
 
-#: builtin/commit.c:1083 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:1128
 #, 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:1142
 #, c-format
 msgid "Invalid ignored mode '%s'"
 msgstr "Mode d'ignorància no vàlid «%s»"
 
-#: builtin/commit.c:1160 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:1231
 msgid "You are in the middle of a merge -- cannot reword."
 msgstr "Esteu enmig d'una fusió -- no es pot fer «reword»."
 
-#: builtin/commit.c:1233
 msgid "You are in the middle of a cherry-pick -- cannot reword."
 msgstr "Esteu enmig d'un «cherry pick» -- no es pot fer «reword»."
 
-#: builtin/commit.c:1236
 #, c-format
 msgid "reword option of '%s' and path '%s' cannot be used together"
 msgstr "les opcions de «reword» «%s» i camí «%s» no es poden usar juntes"
 
-#: builtin/commit.c:1238
 #, c-format
 msgid "reword option of '%s' and '%s' cannot be used together"
 msgstr "les opcions de «reword» «%s» i «%s» no es poden usar juntes"
 
-#: builtin/commit.c:1263
 msgid "You have nothing to amend."
 msgstr "No teniu res a esmenar."
 
-#: builtin/commit.c:1266
 msgid "You are in the middle of a merge -- cannot amend."
 msgstr "Esteu enmig d'una fusió -- no es pot esmenar."
 
-#: builtin/commit.c:1268
 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:1270
 msgid "You are in the middle of a rebase -- cannot amend."
 msgstr "Esteu enmig d'un «rebase» -- no es pot esmenar."
 
-#: builtin/commit.c:1290
 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:1337
 #, c-format
 msgid "unknown option: --fixup=%s:%s"
 msgstr "opció desconeguda: --fixup=%s:%s"
 
-#: 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:1485 builtin/commit.c:1654
 msgid "show status concisely"
 msgstr "mostra l'estat concisament"
 
-#: builtin/commit.c:1487 builtin/commit.c:1656
 msgid "show branch information"
 msgstr "mostra la informació de branca"
 
-#: builtin/commit.c:1489
 msgid "show stash information"
 msgstr "mostra la informació de «stash»"
 
-#: builtin/commit.c:1491 builtin/commit.c:1658
 msgid "compute full ahead/behind values"
 msgstr "calcula els valors complets endavant/darrere"
 
-#: builtin/commit.c:1493
 msgid "version"
 msgstr "versió"
 
-#: builtin/commit.c:1493 builtin/commit.c:1660 builtin/push.c:551
-#: builtin/worktree.c:765
 msgid "machine-readable output"
 msgstr "sortida llegible per una màquina"
 
-#: 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:1499 builtin/commit.c:1665
 msgid "terminate entries with NUL"
 msgstr "acaba les entrades amb NUL"
 
-#: builtin/commit.c:1501 builtin/commit.c:1505 builtin/commit.c:1668
-#: builtin/fast-export.c:1172 builtin/fast-export.c:1175
-#: builtin/fast-export.c:1178 builtin/rebase.c:1139 parse-options.h:368
 msgid "mode"
 msgstr "mode"
 
-#: 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:1506
 msgid ""
 "show ignored files, optional modes: traditional, matching, no. (Default: "
 "traditional)"
@@ -14548,11 +4836,9 @@ msgstr ""
 "mostra els fitxers ignorats, modes opcionals: traditional, matching, no. "
 "(Per defecte: traditional, matching, no.)"
 
-#: builtin/commit.c:1508 parse-options.h:197
 msgid "when"
 msgstr "quan"
 
-#: builtin/commit.c:1509
 msgid ""
 "ignore changes to submodules, optional when: all, dirty, untracked. "
 "(Default: all)"
@@ -14560,196 +4846,153 @@ msgstr ""
 "ignora els canvis als submòduls, opcional quan: all, dirty, untracked. (Per "
 "defecte: all)"
 
-#: builtin/commit.c:1511
 msgid "list untracked files in columns"
 msgstr "mostra els fitxers no seguits en columnes"
 
-#: builtin/commit.c:1512
 msgid "do not detect renames"
 msgstr "no detectis canvis de noms"
 
-#: 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: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:1619
 msgid "suppress summary after successful commit"
 msgstr "omet el resum després d'una comissió reeixida"
 
-#: 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:1622
 msgid "Commit message options"
 msgstr "Opcions de missatge de comissió"
 
-#: builtin/commit.c:1623 builtin/merge.c:288 builtin/tag.c:457
 msgid "read message from file"
 msgstr "llegiu el missatge des d'un fitxer"
 
-#: builtin/commit.c:1624
 msgid "author"
 msgstr "autor"
 
-#: builtin/commit.c:1624
 msgid "override author for commit"
 msgstr "sobreescriu l'autor de la comissió"
 
-#: builtin/commit.c:1625 builtin/gc.c:551
 msgid "date"
 msgstr "data"
 
-#: builtin/commit.c:1625
 msgid "override date for commit"
 msgstr "sobreescriu la data de la comissió"
 
-#: builtin/commit.c:1627 builtin/commit.c:1628 builtin/commit.c:1634
-#: parse-options.h:360 ref-filter.h:89
 msgid "commit"
 msgstr "comissió"
 
-#: 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: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:1633
+#.
 msgid "[(amend|reword):]commit"
 msgstr "[(amend|reword):]commit"
 
-#: builtin/commit.c:1633
 msgid ""
 "use autosquash formatted message to fixup or amend/reword specified commit"
 msgstr ""
 "usa un missatge amb format de «squash» automàtic per a esmenar la comissió "
 "especificada"
 
-#: builtin/commit.c:1634
 msgid "use autosquash formatted message to squash specified commit"
 msgstr ""
 "usa un missatge amb format de «squash» automàtic per a fer «squash» de la "
 "comissió especificada"
 
-#: 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:1636 builtin/interpret-trailers.c:111
 msgid "trailer"
 msgstr "remolc"
 
-#: builtin/commit.c:1636
 msgid "add custom trailer(s)"
 msgstr "afegeix un «trailer» personalitzat"
 
-#: builtin/commit.c:1637 builtin/log.c:1788 builtin/merge.c:306
-#: builtin/pull.c:146 builtin/revert.c:110
 msgid "add a Signed-off-by trailer"
 msgstr "afegeix un «trailer» tipus «Signed-off-by»"
 
-#: builtin/commit.c:1638
 msgid "use specified template file"
 msgstr "usa el fitxer de plantilla especificat"
 
-#: builtin/commit.c:1639
 msgid "force edit of commit"
 msgstr "força l'edició de la comissió"
 
-#: 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:1646
 msgid "Commit contents options"
 msgstr "Opcions per al contingut de les comissions"
 
-#: builtin/commit.c:1647
 msgid "commit all changed files"
 msgstr "comet tots els fitxers canviats"
 
-#: 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:1649
 msgid "interactively add files"
 msgstr "afegeix els fitxers interactivament"
 
-#: builtin/commit.c:1650
 msgid "interactively add changes"
 msgstr "afegeix els canvis interactivament"
 
-#: builtin/commit.c:1651
 msgid "commit only specified files"
 msgstr "comet només els fitxers especificats"
 
-#: 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:1653
 msgid "show what would be committed"
 msgstr "mostra què es cometria"
 
-#: builtin/commit.c:1666
 msgid "amend previous commit"
 msgstr "esmena la comissió anterior"
 
-#: builtin/commit.c:1667
 msgid "bypass post-rewrite hook"
 msgstr "evita el lligam de post escriptura"
 
-#: builtin/commit.c:1674
 msgid "ok to record an empty change"
 msgstr "està bé registrar un canvi buit"
 
-#: 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:1752
+msgid "could not parse HEAD commit"
+msgstr "no s'ha pogut analitzar la comissió HEAD"
+
 #, c-format
 msgid "Corrupt MERGE_HEAD file (%s)"
 msgstr "Fitxer MERGE_HEAD malmès (%s)"
 
-#: builtin/commit.c:1759
 msgid "could not read MERGE_MODE"
 msgstr "no s'ha pogut llegir MERGE_MODE"
 
-#: 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: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: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:1803
 #, c-format
 msgid "Aborting commit due to empty commit message body.\n"
 msgstr ""
 "S'està interrompent la comissió a causa d'un missatge de comissió buit.\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"
@@ -14760,234 +5003,183 @@ msgstr ""
 "que la quota no s'ha excedit, i després, feu\n"
 "«git restore --staged :/» per a recuperar-lo."
 
-#: builtin/config.c:11
 msgid "git config [<options>]"
 msgstr "git config [<opcions>]"
 
-#: builtin/config.c:109 builtin/env--helper.c:27
 #, c-format
 msgid "unrecognized --type argument, %s"
 msgstr "argument --type no reconegut, %s"
 
-#: builtin/config.c:121
 msgid "only one type at a time"
 msgstr "només un tipus cada cop"
 
-#: builtin/config.c:130
 msgid "Config file location"
 msgstr "Ubicació del fitxer de configuració"
 
-#: builtin/config.c:131
 msgid "use global config file"
 msgstr "usa el fitxer de configuració global"
 
-#: builtin/config.c:132
 msgid "use system config file"
 msgstr "usa el fitxer de configuració del sistema"
 
-#: builtin/config.c:133
 msgid "use repository config file"
 msgstr "usa el fitxer de configuració del repositori"
 
-#: builtin/config.c:134
 msgid "use per-worktree config file"
 msgstr "usa un fitxer de configuració per repositori"
 
-#: builtin/config.c:135
 msgid "use given config file"
 msgstr "usa el fitxer de configuració donat"
 
-#: builtin/config.c:136
 msgid "blob-id"
 msgstr "ID de blob"
 
-#: builtin/config.c:136
 msgid "read config from given blob object"
 msgstr "llegeix la configuració de l'objecte de blob donat"
 
-#: builtin/config.c:137
 msgid "Action"
 msgstr "Acció"
 
-#: builtin/config.c:138
 msgid "get value: name [value-pattern]"
 msgstr "obtén valor: nom [value-pattern]"
 
-#: builtin/config.c:139
 msgid "get all values: key [value-pattern]"
 msgstr "obtén tots els valors: clau [value-pattern]"
 
-#: builtin/config.c:140
 msgid "get values for regexp: name-regex [value-pattern]"
 msgstr "obtén valors de regexp: name-regex [value-pattern]"
 
-#: builtin/config.c:141
 msgid "get value specific for the URL: section[.var] URL"
 msgstr "obtén el valor específic per a l'URL: secció[.variable] URL"
 
-#: builtin/config.c:142
 msgid "replace all matching variables: name value [value-pattern]"
 msgstr ""
 "reemplaça totes les variables que coincideixen: nom valor [value-pattern]"
 
-#: builtin/config.c:143
 msgid "add a new variable: name value"
 msgstr "afegeix una variable nova: nom valor"
 
-#: builtin/config.c:144
 msgid "remove a variable: name [value-pattern]"
 msgstr "elimina una variable: nom [value-pattern]"
 
-#: builtin/config.c:145
 msgid "remove all matches: name [value-pattern]"
 msgstr "elimina totes les coincidències: nom [value-pattern]"
 
-#: builtin/config.c:146
 msgid "rename section: old-name new-name"
 msgstr "canvia el nom de secció: nom-antic nom-nou"
 
-#: builtin/config.c:147
 msgid "remove a section: name"
 msgstr "elimina una secció: nom"
 
-#: builtin/config.c:148
 msgid "list all"
 msgstr "llista tots"
 
-#: builtin/config.c:149
 msgid "use string equality when comparing values to 'value-pattern'"
 msgstr ""
 "usa la igualtat de les cadenes quan es comparen els valors amb «value-"
 "pattern»"
 
-#: builtin/config.c:150
 msgid "open an editor"
 msgstr "obre un editor"
 
-#: builtin/config.c:151
 msgid "find the color configured: slot [default]"
 msgstr "troba el color configurat: ranura [per defecte]"
 
-#: builtin/config.c:152
 msgid "find the color setting: slot [stdout-is-tty]"
 msgstr "troba el paràmetre de color: ranura [stdout-és-tty]"
 
-#: builtin/config.c:153
 msgid "Type"
 msgstr "Tipus"
 
-#: builtin/config.c:154 builtin/env--helper.c:42 builtin/hash-object.c:97
 msgid "type"
 msgstr "tipus"
 
-#: builtin/config.c:154 builtin/env--helper.c:43
 msgid "value is given this type"
 msgstr "el valor té donat aquest tipus"
 
-#: builtin/config.c:155
 msgid "value is \"true\" or \"false\""
 msgstr "el valor és «true» o «false»"
 
-#: builtin/config.c:156
 msgid "value is decimal number"
 msgstr "el valor és un nombre decimal"
 
-#: builtin/config.c:157
 msgid "value is --bool or --int"
 msgstr "el valor és --bool o --int"
 
-#: builtin/config.c:158
 msgid "value is --bool or string"
 msgstr "el valor és --bool o string"
 
-#: builtin/config.c:159
 msgid "value is a path (file or directory name)"
 msgstr "el valor és un camí (nom de fitxer o directori)"
 
-#: builtin/config.c:160
 msgid "value is an expiry date"
 msgstr "el valor és una data de venciment"
 
-#: builtin/config.c:161
 msgid "Other"
 msgstr "Altre"
 
-#: builtin/config.c:162
 msgid "terminate values with NUL byte"
 msgstr "acaba els valors amb un octet NUL"
 
-#: builtin/config.c:163
 msgid "show variable names only"
 msgstr "mostra només els noms de variable"
 
-#: builtin/config.c:164
 msgid "respect include directives on lookup"
 msgstr "respecta les directives d'inclusió en cercar"
 
-#: builtin/config.c:165
 msgid "show origin of config (file, standard input, blob, command line)"
 msgstr ""
 "mostra l'origen de la configuració (fitxer, entrada estàndard, blob, línia "
 "d'ordres)"
 
-#: builtin/config.c:166
 msgid "show scope of config (worktree, local, global, system, command)"
 msgstr ""
 "mostra l'abast de la configuració («worktree», «local», «global», «system», "
 "«command»)"
 
-#: builtin/config.c:167 builtin/env--helper.c:45
 msgid "value"
 msgstr "valor"
 
-#: builtin/config.c:167
 msgid "with --get, use default value when missing entry"
 msgstr "amb --get utilitza el valor per defecte quan falti una entrada"
 
-#: builtin/config.c:181
 #, c-format
 msgid "wrong number of arguments, should be %d"
 msgstr "nombre d'arguments erroni, ha de ser %d"
 
-#: builtin/config.c:183
 #, c-format
 msgid "wrong number of arguments, should be from %d to %d"
 msgstr "nombre d'arguments erroni, ha de ser %d a %d"
 
-#: builtin/config.c:339
 #, c-format
 msgid "invalid key pattern: %s"
 msgstr "patró de la clau no vàlid: %s"
 
-#: builtin/config.c:377
+#, c-format
+msgid "invalid pattern: %s"
+msgstr "patró no vàlid: %s"
+
 #, 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
 msgid "cannot parse color '%s'"
 msgstr "no es pot analitzar el color «%s»"
 
-#: builtin/config.c:483
 msgid "unable to parse default color value"
 msgstr "no s'ha pogut analitzar el valor de color per defecte"
 
-#: builtin/config.c:536 builtin/config.c:833
 msgid "not in a git directory"
 msgstr "no és en un directori git"
 
-#: builtin/config.c:539
 msgid "writing to stdin is not supported"
 msgstr "no s'admet escriure a stdin"
 
-#: builtin/config.c:542
 msgid "writing config blobs is not supported"
 msgstr "no s'ha admet l'escriptura de blobs de configuració"
 
-#: builtin/config.c:627
 #, c-format
 msgid ""
 "# This is Git's per-user configuration file.\n"
@@ -15002,85 +5194,68 @@ msgstr ""
 "#\tname = %s\n"
 "#\temail = %s\n"
 
-#: builtin/config.c:652
 msgid "only one config file at a time"
 msgstr "només un fitxer de configuració cada cop"
 
-#: builtin/config.c:658
 msgid "--local can only be used inside a git repository"
 msgstr "--local només es pot usar dins d'un repositori git"
 
-#: builtin/config.c:660
 msgid "--blob can only be used inside a git repository"
 msgstr "--blob només es pot usar dins d'un repositori git"
 
-#: builtin/config.c:662
 msgid "--worktree can only be used inside a git repository"
 msgstr "--worktree només es pot usar dins d'un repositori git"
 
-#: builtin/config.c:684
 msgid "$HOME not set"
 msgstr "$HOME no està establerta"
 
-#: builtin/config.c:708
 msgid ""
 "--worktree cannot be used with multiple working trees unless the config\n"
 "extension worktreeConfig is enabled. Please read \"CONFIGURATION FILE\"\n"
 "section in \"git help worktree\" for details"
 msgstr ""
 "--worktree no es pot utilitzar amb múltiples arbres de treball tret que\n"
-"l'extensió de configuració worktreeConfig estigui habilitada. Llegiu la secció «CONFIGURATION FILE» a «git help worktree» per a més detalls"
+"l'extensió de configuració worktreeConfig estigui habilitada. Llegiu la "
+"secció «CONFIGURATION FILE» a «git help worktree» per a més detalls"
 
-#: builtin/config.c:743
 msgid "--get-color and variable type are incoherent"
 msgstr "--get-color i el tipus de variable són incoherents"
 
-#: builtin/config.c:748
 msgid "only one action at a time"
 msgstr "només una acció cada cop"
 
-#: builtin/config.c:761
 msgid "--name-only is only applicable to --list or --get-regexp"
 msgstr "--name-only només és aplicable a --list o --get-regexp"
 
-#: 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"
 
-#: builtin/config.c:773
 msgid "--default is only applicable to --get"
 msgstr "--default només és aplicable a --get"
 
-#: builtin/config.c:806
 msgid "--fixed-value only applies with 'value-pattern'"
 msgstr "--fixed-value només s'aplica amb «value-pattern»"
 
-#: builtin/config.c:822
 #, c-format
 msgid "unable to read config file '%s'"
 msgstr "no s'ha pogut llegir el fitxer de configuració «%s»"
 
-#: builtin/config.c:825
 msgid "error processing config file(s)"
 msgstr "s'ha produït un error en processar els fitxers de configuració"
 
-#: builtin/config.c:835
 msgid "editing stdin is not supported"
 msgstr "no hi ha compatibilitat per a l'edició a stdin"
 
-#: builtin/config.c:837
 msgid "editing blobs is not supported"
 msgstr "no hi ha compatibilitat per l'edició de blobs"
 
-#: builtin/config.c:851
 #, c-format
 msgid "cannot create configuration file %s"
 msgstr "no es pot crear el fitxer de configuració %s"
 
-#: builtin/config.c:864
 #, c-format
 msgid ""
 "cannot overwrite multiple values with a single value\n"
@@ -15089,16 +5264,13 @@ msgstr ""
 "no es poden sobreescriure múltiples valors amb un sol valor\n"
 "       Useu una expressió regular, --add o --replace-all per a canviar %s."
 
-#: builtin/config.c:943 builtin/config.c:954
 #, c-format
 msgid "no such section: %s"
 msgstr "no existeix la secció: %s"
 
-#: builtin/count-objects.c:100
 msgid "print sizes in human readable format"
 msgstr "imprimeix les mides en un format llegible pels humans"
 
-#: builtin/credential-cache--daemon.c:227
 #, c-format
 msgid ""
 "The permissions on your socket directory are too loose; other\n"
@@ -15112,77 +5284,60 @@ msgstr ""
 "\n"
 "\tchmod 0700 %s"
 
-#: builtin/credential-cache--daemon.c:276
 msgid "print debugging messages to stderr"
 msgstr "imprimeix els missatges de depuració a stderr"
 
-#: builtin/credential-cache--daemon.c:316
 msgid "credential-cache--daemon unavailable; no unix socket support"
 msgstr ""
 "credential-cache--daemon no disponible; no hi ha compatibilitat amb sòcols "
 "d'unix"
 
-#: 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
 #, c-format
 msgid "unable to get credential storage lock in %d ms"
 msgstr ""
-"no s'ha pogut obtenir el bloqueig de l'emmagatzematge de credencials en %d "
-"ms"
+"no s'ha pogut obtenir el bloqueig de l'emmagatzematge de credencials en %d ms"
 
-#: builtin/describe.c:26
 msgid "git describe [<options>] [<commit-ish>...]"
 msgstr "git describe [<opcions>] [<comissió>...]"
 
-#: builtin/describe.c:27
 msgid "git describe [<options>] --dirty"
 msgstr "git describe [<opcions>] --dirty"
 
-#: builtin/describe.c:63
 msgid "head"
 msgstr "davant per"
 
-#: builtin/describe.c:63
 msgid "lightweight"
 msgstr "lleuger"
 
-#: builtin/describe.c:63
 msgid "annotated"
 msgstr "anotat"
 
-#: builtin/describe.c:277
 #, c-format
 msgid "annotated tag %s not available"
 msgstr "l'etiqueta anotada %s no és disponible"
 
-#: builtin/describe.c:281
 #, c-format
 msgid "tag '%s' is externally known as '%s'"
 msgstr "l'etiqueta «%s» es coneix externament com a «%s»"
 
-#: builtin/describe.c:328
 #, c-format
 msgid "no tag exactly matches '%s'"
 msgstr "cap etiqueta coincideix exactament amb «%s»"
 
-#: builtin/describe.c:330
 #, c-format
 msgid "No exact match on refs or tags, searching to describe\n"
 msgstr ""
 "No hi ha cap coincidència exacta en la cerca de referències o etiquetes per "
 "a descriure\n"
 
-#: builtin/describe.c:397
 #, c-format
 msgid "finished search at %s\n"
 msgstr "s'ha finalitzat la cerca a %s\n"
 
-#: builtin/describe.c:424
 #, c-format
 msgid ""
 "No annotated tags can describe '%s'.\n"
@@ -15191,7 +5346,6 @@ msgstr ""
 "Cap etiqueta anotada pot descriure «%s».\n"
 "No obstant, hi havia etiquetes no anotades: proveu --tags."
 
-#: builtin/describe.c:428
 #, c-format
 msgid ""
 "No tags can describe '%s'.\n"
@@ -15200,12 +5354,10 @@ msgstr ""
 "Cap etiqueta pot descriure «%s».\n"
 "Proveu --always, o creeu algunes etiquetes."
 
-#: builtin/describe.c:458
 #, c-format
 msgid "traversed %lu commits\n"
 msgstr "%lu comissions travessades\n"
 
-#: builtin/describe.c:461
 #, c-format
 msgid ""
 "more than %i tags found; listed %i most recent\n"
@@ -15214,149 +5366,116 @@ msgstr ""
 "s'han trobat més de %i etiquetes: s'han llistat les %i més recents\n"
 "s'ha renunciat la cerca a %s\n"
 
-#: builtin/describe.c:529
 #, c-format
 msgid "describe %s\n"
 msgstr "descriu %s\n"
 
-#: builtin/describe.c:532
 #, c-format
 msgid "Not a valid object name %s"
 msgstr "%s no és un nom d'objecte vàlid"
 
-#: builtin/describe.c:540
 #, c-format
 msgid "%s is neither a commit nor blob"
 msgstr "%s no és una comissió o un blob"
 
-#: builtin/describe.c:554
 msgid "find the tag that comes after the commit"
 msgstr "troba l'etiqueta que vingui després de la comissió"
 
-#: builtin/describe.c:555
 msgid "debug search strategy on stderr"
 msgstr "estratègia de cerca de depuració en stderr"
 
-#: builtin/describe.c:556
 msgid "use any ref"
 msgstr "usa qualsevol referència"
 
-#: builtin/describe.c:557
 msgid "use any tag, even unannotated"
 msgstr "usa qualsevol etiqueta, fins i tot aquelles sense anotar"
 
-#: builtin/describe.c:558
 msgid "always use long format"
 msgstr "sempre usa el format llarg"
 
-#: builtin/describe.c:559
 msgid "only follow first parent"
 msgstr "només segueix el primer pare"
 
-#: builtin/describe.c:562
 msgid "only output exact matches"
 msgstr "emet només coincidències exactes"
 
-#: builtin/describe.c:564
 msgid "consider <n> most recent tags (default: 10)"
 msgstr "considera les <n> etiquetes més recents (per defecte: 10)"
 
-#: builtin/describe.c:566
 msgid "only consider tags matching <pattern>"
 msgstr "només considera les etiquetes que coincideixen amb <patró>"
 
-#: builtin/describe.c:568
 msgid "do not consider tags matching <pattern>"
 msgstr "no consideris les etiquetes que no coincideixen amb <patró>"
 
-#: builtin/describe.c:570 builtin/name-rev.c:595
 msgid "show abbreviated commit object as fallback"
 msgstr "mostra l'objecte de comissió abreviat com a sistema alternatiu"
 
-#: builtin/describe.c:571 builtin/describe.c:574
 msgid "mark"
 msgstr "marca"
 
-#: builtin/describe.c:572
 msgid "append <mark> on dirty working tree (default: \"-dirty\")"
 msgstr "annexa <marca> en l'arbre de treball brut (per defecte: «-dirty»)"
 
-#: builtin/describe.c:575
 msgid "append <mark> on broken working tree (default: \"-broken\")"
 msgstr "annexa <marca> en l'arbre de treball brut (per defecte: «-broken»)"
 
-#: builtin/describe.c:622
 msgid "No names found, cannot describe anything."
 msgstr "No s'ha trobat cap nom, no es pot descriure res."
 
-#: builtin/describe.c:673 builtin/describe.c:675
 #, c-format
 msgid "option '%s' and commit-ishes cannot be used together"
 msgstr "les opcions «%s» i de comissió no es poden usar juntes"
 
-#: builtin/diff-tree.c:157
 msgid "--merge-base only works with two commits"
 msgstr "--merge-base només funciona amb dues comissions"
 
-#: builtin/diff.c:92
 #, c-format
 msgid "'%s': not a regular file or symlink"
 msgstr "«%s»: no és ni fitxer regular ni enllaç simbòlic"
 
-#: builtin/diff.c:259
 #, c-format
 msgid "invalid option: %s"
 msgstr "opció no vàlida: %s"
 
-#: builtin/diff.c:376
 #, c-format
 msgid "%s...%s: no merge base"
 msgstr "%s...%s: sense una base de fusió"
 
-#: builtin/diff.c:491
 msgid "Not a git repository"
 msgstr "No és un repositori de git"
 
-#: builtin/diff.c:537 builtin/grep.c:700
 #, c-format
 msgid "invalid object '%s' given."
 msgstr "s'ha donat un objecte no vàlid «%s»."
 
-#: builtin/diff.c:548
 #, c-format
 msgid "more than two blobs given: '%s'"
 msgstr "s'ha donat més de dos blobs: «%s»"
 
-#: builtin/diff.c:553
 #, c-format
 msgid "unhandled object '%s' given."
 msgstr "s'ha donat l'objecte no gestionat «%s»."
 
-#: builtin/diff.c:587
 #, c-format
 msgid "%s...%s: multiple merge bases, using %s"
 msgstr "%s...%s: múltiples bases de fusió, utilitzant %s"
 
-#: builtin/difftool.c:31
 msgid "git difftool [<options>] [<commit> [<commit>]] [--] [<path>...]"
 msgstr "git difftool [<opcions>] [<commit> [<commit>]] [--] [<camí>...]"
 
-#: builtin/difftool.c:287
 #, c-format
 msgid "could not read symlink %s"
 msgstr "no s'ha pogut llegir l'enllaç simbòlic %s"
 
-#: builtin/difftool.c:289
 #, 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:297
 #, 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:421
 msgid ""
 "combined diff formats ('-c' and '--cc') are not supported in\n"
 "directory diff mode ('-d' and '--dir-diff')."
@@ -15364,59 +5483,50 @@ msgstr ""
 "els formats de diff combinats («-c» i «--cc») no s'admeten\n"
 "en el mode diff de directoris («-d» i «--dir-diff»)."
 
-#: builtin/difftool.c:626
 #, c-format
 msgid "both files modified: '%s' and '%s'."
 msgstr "s'han modificat ambdós fitxers: «%s» i «%s»."
 
-#: builtin/difftool.c:628
 msgid "working tree file has been left."
 msgstr "s'ha deixat un fitxer de l'arbre de treball."
 
-#: builtin/difftool.c:639
+#, c-format
+msgid "could not copy '%s' to '%s'"
+msgstr "no s'ha pogut copiar «%s» a «%s»"
+
 #, c-format
 msgid "temporary files exist in '%s'."
 msgstr "existeix un fitxer temporal a «%s»."
 
-#: builtin/difftool.c:640
 msgid "you may want to cleanup or recover these."
 msgstr "podeu netejar o recuperar-los."
 
-#: builtin/difftool.c:645
 #, c-format
 msgid "failed: %d"
 msgstr "ha fallat: %d"
 
-#: builtin/difftool.c:690
 msgid "use `diff.guitool` instead of `diff.tool`"
 msgstr "usa «diff.guitool» en lloc de «diff.tool»"
 
-#: builtin/difftool.c:692
 msgid "perform a full-directory diff"
 msgstr "fes un diff de tot el directori"
 
-#: builtin/difftool.c:694
 msgid "do not prompt before launching a diff tool"
 msgstr "no preguntis abans d'executar l'eina diff"
 
-#: builtin/difftool.c:699
 msgid "use symlinks in dir-diff mode"
 msgstr "utilitza enllaços simbòlics en mode dir-diff"
 
-#: builtin/difftool.c:700
 msgid "tool"
 msgstr "eina"
 
-#: builtin/difftool.c:701
 msgid "use the specified diff tool"
 msgstr "utilitza l'eina de diff especificada"
 
-#: builtin/difftool.c:703
 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:706
 msgid ""
 "make 'git-difftool' exit when an invoked diff tool returns a non-zero exit "
 "code"
@@ -15424,447 +5534,353 @@ msgstr ""
 "fes que «git-difftool» surti quan l'eina de diff invocada torna un codi de "
 "sortida diferent de zero"
 
-#: builtin/difftool.c:709
 msgid "specify a custom command for viewing diffs"
 msgstr "especifiqueu una ordre personalitzada per a veure diffs"
 
-#: builtin/difftool.c:710
 msgid "passed to `diff`"
 msgstr "passa-ho a «diff»"
 
-#: builtin/difftool.c:726
 msgid "difftool requires worktree or --no-index"
 msgstr "difftool requereix worktree o --no-index"
 
-#: builtin/difftool.c:745
 msgid "no <tool> given for --tool=<tool>"
 msgstr "no s'ha proporcionat l'<eina> per a --tool=<eina>"
 
-#: builtin/difftool.c:752
 msgid "no <cmd> given for --extcmd=<cmd>"
 msgstr "no s'ha proporcionat l'<ordre> per a --extcmd=<ordre>"
 
-#: builtin/env--helper.c:6
 msgid "git env--helper --type=[bool|ulong] <options> <env-var>"
 msgstr "git env--helper --type=[bool|ulong] <opcions> <env-var>"
 
-#: builtin/env--helper.c:46
 msgid "default for git_env_*(...) to fall back on"
 msgstr "valor per defecte per a git_env_*(...) en cas d'absència"
 
-#: builtin/env--helper.c:48
 msgid "be quiet only use git_env_*() value as exit code"
 msgstr "silenciós només utilitza el valor git_env_*() com a codi de sortida"
 
-#: builtin/env--helper.c:67
 #, 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 "l'opció «--default» espera un valor booleà amb «--type=bool», no «%s»"
 
-#: builtin/env--helper.c:82
 #, c-format
 msgid ""
 "option `--default' expects an unsigned long value with `--type=ulong`, not "
 "`%s`"
 msgstr ""
-"l'opció «--default» espera un valor llarg sense signe amb «--type=ulong», no"
-" «%s»"
+"l'opció «--default» espera un valor llarg sense signe amb «--type=ulong», no "
+"«%s»"
 
-#: builtin/fast-export.c:29
 msgid "git fast-export [<rev-list-opts>]"
 msgstr "git fast-export [<rev-list-opts>]"
 
-#: builtin/fast-export.c:843
 msgid "Error: Cannot export nested tags unless --mark-tags is specified."
 msgstr ""
 "Error: no es poden exportar les etiquetes imbricades a menys que "
 "s'especifiqui --mark-tags."
 
-#: builtin/fast-export.c:1152
 msgid "--anonymize-map token cannot be empty"
 msgstr "el testimoni de --anonymize-map no pot estar buit"
 
-#: builtin/fast-export.c:1171
 msgid "show progress after <n> objects"
 msgstr "mostra el progrés després de <n> objectes"
 
-#: builtin/fast-export.c:1173
 msgid "select handling of signed tags"
 msgstr "selecciona la gestió de les etiquetes signades"
 
-#: builtin/fast-export.c:1176
 msgid "select handling of tags that tag filtered objects"
 msgstr "selecciona la gestió de les etiquetes que etiquetin objectes filtrats"
 
-#: builtin/fast-export.c:1179
 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:1182
 msgid "dump marks to this file"
 msgstr "bolca les marques a aquest fitxer"
 
-#: builtin/fast-export.c:1184
 msgid "import marks from this file"
 msgstr "importa les marques d'aquest fitxer"
 
-#: builtin/fast-export.c:1188
 msgid "import marks from this file if it exists"
 msgstr "importa marques d'aquest fitxer si existeix"
 
-#: builtin/fast-export.c:1190
 msgid "fake a tagger when tags lack one"
 msgstr "fingeix un etiquetador quan en falti un a les etiquetes"
 
-#: builtin/fast-export.c:1192
 msgid "output full tree for each commit"
 msgstr "imprimeix l'arbre complet de per a cada comissió"
 
-#: builtin/fast-export.c:1194
 msgid "use the done feature to terminate the stream"
 msgstr "usa la característica fet per a acabar el flux"
 
-#: builtin/fast-export.c:1195
 msgid "skip output of blob data"
 msgstr "omet la sortida de dades de blob"
 
-#: builtin/fast-export.c:1196 builtin/log.c:1860
 msgid "refspec"
 msgstr "especificació de referència"
 
-#: builtin/fast-export.c:1197
 msgid "apply refspec to exported refs"
 msgstr "aplica l'especificació de referència a les referències exportades"
 
-#: builtin/fast-export.c:1198
 msgid "anonymize output"
 msgstr "anonimitza la sortida"
 
-#: builtin/fast-export.c:1199
 msgid "from:to"
 msgstr "des de:a"
 
-#: builtin/fast-export.c:1200
 msgid "convert <from> to <to> in anonymized output"
 msgstr "converteix <from> a <to> en una sortida anònima"
 
-#: builtin/fast-export.c:1203
 msgid "reference parents which are not in fast-export stream by object id"
 msgstr ""
 "referència els pares que no estan en flux d'exportació ràpida per "
 "identificador d'objecte"
 
-#: builtin/fast-export.c:1205
 msgid "show original object ids of blobs/commits"
 msgstr "mostra els ID dels objectes originals dels blobs i comissions"
 
-#: builtin/fast-export.c:1207
 msgid "label tags with mark ids"
 msgstr "marca les etiquetes amb els identificadors de marca"
 
-#: builtin/fast-import.c:3097
 #, c-format
 msgid "Missing from marks for submodule '%s'"
 msgstr "Falten les marques «from» per al submòdul «%s»"
 
-#: builtin/fast-import.c:3099
 #, c-format
 msgid "Missing to marks for submodule '%s'"
 msgstr "Falten les marques per al submòdul «%s»"
 
-#: builtin/fast-import.c:3234
 #, c-format
 msgid "Expected 'mark' command, got %s"
 msgstr "S'esperava l'ordre «mark», s'ha rebut %s"
 
-#: builtin/fast-import.c:3239
 #, c-format
 msgid "Expected 'to' command, got %s"
 msgstr "S'esperava l'ordre «to», s'ha rebut «%s»"
 
-#: builtin/fast-import.c:3331
 msgid "Expected format name:filename for submodule rewrite option"
 msgstr ""
 "S'esperava el format «nom:nom de fitxer» per a l'opció de reescriptura de "
 "submòdul"
 
-#: builtin/fast-import.c:3386
 #, c-format
 msgid "feature '%s' forbidden in input without --allow-unsafe-features"
 msgstr ""
 "característica «%s» prohibida a l'entrada sense --allow-unsafe-features"
 
-#: builtin/fetch-pack.c:246
 #, c-format
 msgid "Lockfile created but not reported: %s"
 msgstr "S'ha creat el fitxer de bloqueig però no s'ha informat: %s"
 
-#: builtin/fetch.c:36
 msgid "git fetch [<options>] [<repository> [<refspec>...]]"
 msgstr ""
 "git fetch [<opcions>] [<repositori> [<especificació-de-referència>...]]"
 
-#: builtin/fetch.c:37
 msgid "git fetch [<options>] <group>"
 msgstr "git fetch [<opcions>] <grup>"
 
-#: builtin/fetch.c:38
 msgid "git fetch --multiple [<options>] [(<repository> | <group>)...]"
 msgstr "git fetch --multiple [<opcions>] [(<repositori> | <grup>)...]"
 
-#: builtin/fetch.c:39
 msgid "git fetch --all [<options>]"
 msgstr "git fetch --all [<opcions>]"
 
-#: builtin/fetch.c:124
 msgid "fetch.parallel cannot be negative"
 msgstr "fetch.parallel no pot ser negatiu"
 
-#: builtin/fetch.c:147 builtin/pull.c:189
 msgid "fetch from all remotes"
 msgstr "obtén de tots els remots"
 
-#: builtin/fetch.c:149 builtin/pull.c:249
 msgid "set upstream for git pull/fetch"
 msgstr "estableix la font per a git pull/fetch"
 
-#: builtin/fetch.c:151 builtin/pull.c:192
 msgid "append to .git/FETCH_HEAD instead of overwriting"
 msgstr "annexa a .git/FETCH_HEAD en lloc de sobreescriure"
 
-#: builtin/fetch.c:153
 msgid "use atomic transaction to update references"
 msgstr "usa una transacció atòmica per a actualitzar les referències"
 
-#: builtin/fetch.c:155 builtin/pull.c:195
 msgid "path to upload pack on remote end"
 msgstr "camí al qual pujar el paquet al costat remot"
 
-#: builtin/fetch.c:156
 msgid "force overwrite of local reference"
 msgstr "força la sobreescriptura de la referència local"
 
-#: builtin/fetch.c:158
 msgid "fetch from multiple remotes"
 msgstr "obtén de múltiples remots"
 
-#: builtin/fetch.c:160 builtin/pull.c:199
 msgid "fetch all tags and associated objects"
 msgstr "obtén totes les etiquetes i tots els objectes associats"
 
-#: builtin/fetch.c:162
 msgid "do not fetch all tags (--no-tags)"
 msgstr "no obtinguis les etiquetes (--no-tags)"
 
-#: builtin/fetch.c:164
 msgid "number of submodules fetched in parallel"
 msgstr "nombre de submòduls obtinguts en paral·lel"
 
-#: builtin/fetch.c:166
 msgid "modify the refspec to place all refs within refs/prefetch/"
 msgstr ""
-"modifica l'especificació de referència per a col·locar totes les referències"
-" dins de refs/prefetch/"
+"modifica l'especificació de referència per a col·locar totes les referències "
+"dins de refs/prefetch/"
 
-#: builtin/fetch.c:168 builtin/pull.c:202
 msgid "prune remote-tracking branches no longer on remote"
 msgstr "poda les branques amb seguiment remot que ja no estiguin en el remot"
 
-#: builtin/fetch.c:170
 msgid "prune local tags no longer on remote and clobber changed tags"
 msgstr ""
 "poda les etiquetes locals que ja no existeixen al remot i adjunta les "
 "etiquetes que han canviat"
 
-#: builtin/fetch.c:171 builtin/fetch.c:199 builtin/pull.c:123
 msgid "on-demand"
 msgstr "sota demanda"
 
-#: builtin/fetch.c:172
 msgid "control recursive fetching of submodules"
 msgstr "controla l'obtenció recursiva de submòduls"
 
-#: builtin/fetch.c:177
 msgid "write fetched references to the FETCH_HEAD file"
 msgstr "escriu les referències obtingudes al fitxer FETCH_HEAD"
 
-#: builtin/fetch.c:178 builtin/pull.c:210
 msgid "keep downloaded pack"
 msgstr "retén el paquet baixat"
 
-#: builtin/fetch.c:180
 msgid "allow updating of HEAD ref"
 msgstr "permet l'actualització de la referència HEAD"
 
-#: builtin/fetch.c:183 builtin/fetch.c:189 builtin/pull.c:213
-#: builtin/pull.c:222
 msgid "deepen history of shallow clone"
 msgstr "aprofundeix la història d'un clon superficial"
 
-#: builtin/fetch.c:185 builtin/pull.c:216
 msgid "deepen history of shallow repository based on time"
 msgstr "aprofundeix la història d'un clon superficial basat en una data"
 
-#: builtin/fetch.c:191 builtin/pull.c:225
 msgid "convert to a complete repository"
 msgstr "converteix en un repositori complet"
 
-#: builtin/fetch.c:194
 #, fuzzy
 msgid "re-fetch without negotiating common commits"
 msgstr "tornar a capturar sense negociar comissions comunes"
 
-#: builtin/fetch.c:197
 msgid "prepend this to submodule path output"
 msgstr "anteposa això a la sortida de camí del submòdul"
 
-#: builtin/fetch.c:200
 msgid ""
 "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:204 builtin/pull.c:228
 msgid "accept refs that update .git/shallow"
 msgstr "accepta les referències que actualitzin .git/shallow"
 
-#: builtin/fetch.c:205 builtin/pull.c:230
 msgid "refmap"
 msgstr "mapa de referències"
 
-#: builtin/fetch.c:206 builtin/pull.c:231
 msgid "specify fetch refmap"
 msgstr "específica l'obtenció del mapa de referències"
 
-#: builtin/fetch.c:213 builtin/pull.c:244
 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:215
 msgid "do not fetch a packfile; instead, print ancestors of negotiation tips"
 msgstr ""
 "no obtinguis un fitxer de paquet; en canvi, mostra els avantpassats dels "
 "consells de negociació"
 
-#: builtin/fetch.c:218 builtin/fetch.c:220
 msgid "run 'maintenance --auto' after fetching"
 msgstr "executa «maintenance --auto» després d'obtenir"
 
-#: builtin/fetch.c:222 builtin/pull.c:247
 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:224
 msgid "write the commit-graph after fetching"
 msgstr "escriu el graf de comissions després de recollir"
 
-#: builtin/fetch.c:226
 msgid "accept refspecs from stdin"
 msgstr "llegeix les especificacions de referència des de stdin"
 
-#: builtin/fetch.c:618
 msgid "couldn't find remote ref HEAD"
 msgstr "no s'ha pogut trobar la referència HEAD remota"
 
-#: builtin/fetch.c:893
 #, c-format
 msgid "object %s not found"
 msgstr "objecte %s no trobat"
 
-#: builtin/fetch.c:897
 msgid "[up to date]"
 msgstr "[al dia]"
 
-#: builtin/fetch.c:909 builtin/fetch.c:927 builtin/fetch.c:999
 msgid "[rejected]"
 msgstr "[rebutjat]"
 
-#: builtin/fetch.c:911
 msgid "can't fetch in current branch"
 msgstr "no es pot obtenir en la branca actual"
 
-#: builtin/fetch.c:912
 msgid "checked out in another worktree"
 msgstr "s'ha agafat en un altre arbre de treball"
 
-#: builtin/fetch.c:922
 msgid "[tag update]"
 msgstr "[actualització d'etiqueta]"
 
-#: builtin/fetch.c:923 builtin/fetch.c:960 builtin/fetch.c:982
-#: builtin/fetch.c:994
 msgid "unable to update local ref"
 msgstr "no s'ha pogut actualitzar la referència local"
 
-#: builtin/fetch.c:927
 msgid "would clobber existing tag"
 msgstr "s'adjuntaria l'etiqueta existent"
 
-#: builtin/fetch.c:949
 msgid "[new tag]"
 msgstr "[etiqueta nova]"
 
-#: builtin/fetch.c:952
 msgid "[new branch]"
 msgstr "[branca nova]"
 
-#: builtin/fetch.c:955
 msgid "[new ref]"
 msgstr "[referència nova]"
 
-#: builtin/fetch.c:994
 msgid "forced update"
 msgstr "actualització forçada"
 
-#: builtin/fetch.c:999
 msgid "non-fast-forward"
 msgstr "sense avanç ràpid"
 
-#: builtin/fetch.c:1102
+#, c-format
+msgid "cannot open '%s'"
+msgstr "no es pot obrir «%s»"
+
 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 ""
-"en obtenir normalment indica quines branques tenien una actualització forçada,\n"
-"però aquesta comprovació s'ha desactivat. Per a tornar a habilitar-la, utilitzeu\n"
+"en obtenir normalment indica quines branques tenien una actualització "
+"forçada,\n"
+"però aquesta comprovació s'ha desactivat. Per a tornar a habilitar-la, "
+"utilitzeu\n"
 "«--show-forced-updates» o executeu «git config fetch.showForcedUpdates true»"
 
-#: builtin/fetch.c:1106
 #, 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 %.2f segons a comprovar les actualitzacions forçades. Podeu\n"
 "utilitzar «--no-show-forced-updates» o executar «git config \n"
 "fetch.showForcedUpdates false» per a evitar aquesta comprovació.\n"
 
-#: builtin/fetch.c:1136
 #, c-format
 msgid "%s did not send all necessary objects\n"
 msgstr "%s no ha enviat tots els objectes necessaris\n"
 
-#: builtin/fetch.c:1156
 #, c-format
 msgid "rejected %s because shallow roots are not allowed to be updated"
 msgstr ""
 "s'ha rebutjat %s perquè no es permeten actualitzar les arrels superficials"
 
-#: builtin/fetch.c:1259 builtin/fetch.c:1418
 #, c-format
 msgid "From %.*s\n"
 msgstr "De %.*s\n"
 
-#: builtin/fetch.c:1269
 #, c-format
 msgid ""
 "some local refs could not be updated; try running\n"
@@ -15874,49 +5890,43 @@ msgstr ""
 " intenteu executar «git remote prune %s» per a eliminar\n"
 " qualsevol branca antiga o conflictiva"
 
-#: builtin/fetch.c:1377
 #, c-format
 msgid "   (%s will become dangling)"
 msgstr "   (%s es tornarà penjant)"
 
-#: builtin/fetch.c:1378
 #, c-format
 msgid "   (%s has become dangling)"
 msgstr "   (%s s'ha tornat penjant)"
 
-#: builtin/fetch.c:1421
 msgid "[deleted]"
 msgstr "[suprimit]"
 
-#: builtin/fetch.c:1422 builtin/remote.c:1153
 msgid "(none)"
 msgstr "(cap)"
 
-#: builtin/fetch.c:1446
 #, c-format
 msgid "refusing to fetch into branch '%s' checked out at '%s'"
 msgstr "s'ha rebutjat l'obtenció en la branca «%s» agafada a «%s»"
 
-#: builtin/fetch.c:1466
 #, 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:1469
 #, c-format
 msgid "option \"%s\" is ignored for %s\n"
 msgstr "s'ignora l'opció «%s» per a %s\n"
 
-#: builtin/fetch.c:1496
+#, c-format
+msgid "%s is not a valid object"
+msgstr "%s no és un objecte vàlid"
+
 #, c-format
 msgid "the object %s does not exist"
 msgstr "l'objecte %s no existeix"
 
-#: builtin/fetch.c:1748
 msgid "multiple branches detected, incompatible with --set-upstream"
 msgstr "s'han detectat múltiples branques, incompatible amb --set-upstream"
 
-#: builtin/fetch.c:1760
 #, c-format
 msgid ""
 "could not set upstream of HEAD to '%s' from '%s' when it does not point to "
@@ -15925,20 +5935,16 @@ msgstr ""
 "no s'ha pogut establir la font de HEAD a «%s» des de «%s» quan no assenyala "
 "cap branca."
 
-#: builtin/fetch.c:1773
 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:1775
 msgid "not setting upstream for a remote tag"
 msgstr "no s'està configurant la font d'una etiqueta remota"
 
-#: builtin/fetch.c:1777
 msgid "unknown branch type"
 msgstr "tipus de branca desconegut"
 
-#: builtin/fetch.c:1779
 msgid ""
 "no source branch found;\n"
 "you need to specify exactly one branch with the --set-upstream option"
@@ -15946,22 +5952,18 @@ msgstr ""
 "no s'ha trobat cap branca d'origen.\n"
 "heu d'especificar exactament una branca amb l'opció --set-upstream"
 
-#: builtin/fetch.c:1904 builtin/fetch.c:1967
 #, c-format
 msgid "Fetching %s\n"
 msgstr "S'està obtenint %s\n"
 
-#: builtin/fetch.c:1914 builtin/fetch.c:1969
 #, c-format
 msgid "could not fetch %s"
 msgstr "no s'ha pogut obtenir %s"
 
-#: builtin/fetch.c:1926
 #, 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:2030
 msgid ""
 "no remote repository specified; please specify either a URL or a\n"
 "remote name from which new revisions should be fetched"
@@ -15969,198 +5971,153 @@ msgstr ""
 "no s'ha especificat cap repositori remot. Especifiqueu un URL o\n"
 "un nom remot del qual s'han d'obtenir les revisions noves"
 
-#: builtin/fetch.c:2066
 msgid "you need to specify a tag name"
 msgstr "necessiteu especificar un nom d'etiqueta"
 
-#: builtin/fetch.c:2156
 #, fuzzy
 msgid "--negotiate-only needs one or more --negotiation-tip=*"
 msgstr "--negotiate-only necessita un o més --negotiation-tip=*"
 
-#: builtin/fetch.c:2160
 msgid "negative depth in --deepen is not supported"
 msgstr "no s'admet una profunditat negativa en --deepen"
 
-#: builtin/fetch.c:2169
 msgid "--unshallow on a complete repository does not make sense"
 msgstr "--unshallow en un repositori complet no té sentit"
 
-#: builtin/fetch.c:2186
 msgid "fetch --all does not take a repository argument"
 msgstr "fetch --all no accepta un argument de repositori"
 
-#: builtin/fetch.c:2188
 msgid "fetch --all does not make sense with refspecs"
 msgstr "fetch --all no té sentit amb especificacions de referència"
 
-#: builtin/fetch.c:2197
 #, c-format
 msgid "no such remote or remote group: %s"
 msgstr "no existeix un remot ni un grup remot: %s"
 
-#: builtin/fetch.c:2205
 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:2221
 msgid "must supply remote when using --negotiate-only"
 msgstr "s'ha de subministrar el remot en usar --negotiate-only"
 
-#: builtin/fetch.c:2226
 msgid "protocol does not support --negotiate-only, exiting"
 msgstr "el protocol no admet --negotiate-only, se surt"
 
-#: builtin/fetch.c:2246
 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:2250
 msgid "--atomic can only be used when fetching from one remote"
 msgstr "l'opció --atomic només es pot usar quan s'obté des d'un remot"
 
-#: builtin/fetch.c:2254
 msgid "--stdin can only be used when fetching from one remote"
 msgstr "l'opció --stdin només es pot usar quan s'obté des d'un remot"
 
-#: builtin/fmt-merge-msg.c:7
 msgid ""
 "git fmt-merge-msg [-m <message>] [--log[=<n>] | --no-log] [--file <file>]"
 msgstr ""
 "git fmt-merge-msg [-m <missatge>] [--log[=<n>] | --no-log] [--file <fitxer>]"
 
-#: builtin/fmt-merge-msg.c:19
 msgid "populate log with at most <n> entries from shortlog"
 msgstr "emplena el registre amb <n> entrades del registre curt com a màxim"
 
-#: builtin/fmt-merge-msg.c:22
 msgid "alias for --log (deprecated)"
 msgstr "àlies per --log (en desús)"
 
-#: builtin/fmt-merge-msg.c:25
 msgid "text"
 msgstr "text"
 
-#: builtin/fmt-merge-msg.c:26
 msgid "use <text> as start of message"
 msgstr "usa <text> com a inici de missatge"
 
-#: builtin/fmt-merge-msg.c:28
 msgid "use <name> instead of the real target branch"
 msgstr "usa <nom> en lloc de la branca de destí real"
 
-#: builtin/fmt-merge-msg.c:29
 msgid "file to read from"
 msgstr "fitxer del qual llegir"
 
-#: builtin/for-each-ref.c:10
 msgid "git for-each-ref [<options>] [<pattern>]"
 msgstr "git for-each-ref [<opcions>] [<patró>]"
 
-#: builtin/for-each-ref.c:11
 msgid "git for-each-ref [--points-at <object>]"
 msgstr "git for-each-ref [--points-at <objecte>]"
 
-#: builtin/for-each-ref.c:12
 msgid "git for-each-ref [--merged [<commit>]] [--no-merged [<commit>]]"
 msgstr "git for-each-ref [--merged [<commit>]] [--no-merged [<commit>]]"
 
-#: builtin/for-each-ref.c:13
 msgid "git for-each-ref [--contains [<commit>]] [--no-contains [<commit>]]"
 msgstr ""
 "git for-each-ref [--contains [<comissió>]] [--no-contains [<comissió>]]"
 
-#: builtin/for-each-ref.c:31
 msgid "quote placeholders suitably for shells"
 msgstr ""
 "posa els marcadors de posició de forma adequada per a intèrprets d'ordres"
 
-#: builtin/for-each-ref.c:33
 msgid "quote placeholders suitably for perl"
 msgstr "posa els marcadors de posició entre cometes adequades per al perl"
 
-#: builtin/for-each-ref.c:35
 msgid "quote placeholders suitably for python"
 msgstr "posa els marcadors de posició entre cometes adequades per al python"
 
-#: builtin/for-each-ref.c:37
 msgid "quote placeholders suitably for Tcl"
 msgstr "posa els marcadors de posició entre cometes adequades per al Tcl"
 
-#: builtin/for-each-ref.c:40
 msgid "show only <n> matched refs"
 msgstr "mostra només <n> referències coincidents"
 
-#: builtin/for-each-ref.c:42 builtin/tag.c:482
 msgid "respect format colors"
 msgstr "respecta els colors del format"
 
-#: builtin/for-each-ref.c:45
 msgid "print only refs which points at the given object"
 msgstr "imprimeix només les referències que assenyalin l'objecte donat"
 
-#: builtin/for-each-ref.c:47
 msgid "print only refs that are merged"
 msgstr "imprimeix només les referències que s'han fusionat"
 
-#: builtin/for-each-ref.c:48
 msgid "print only refs that are not merged"
 msgstr "imprimeix només les referències que no s'han fusionat"
 
-#: builtin/for-each-ref.c:49
 msgid "print only refs which contain the commit"
 msgstr "imprimeix només les referències que continguin la comissió"
 
-#: builtin/for-each-ref.c:50
 msgid "print only refs which don't contain the commit"
 msgstr "imprimeix només les referències que no continguin la comissió"
 
-#: builtin/for-each-repo.c:9
 msgid "git for-each-repo --config=<config> <command-args>"
 msgstr "git for-each-repo --config=<config> <command-args>"
 
-#: builtin/for-each-repo.c:34
 msgid "config"
 msgstr "config"
 
-#: builtin/for-each-repo.c:35
 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:43
 msgid "missing --config=<config>"
 msgstr "falta --config=<config>"
 
-#: builtin/fsck.c:69 builtin/fsck.c:128 builtin/fsck.c:129
 msgid "unknown"
 msgstr "desconegut"
 
 #. 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 "error en %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 "avís en %s %s: %s"
 
-#: 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:136
 msgid "wrong object type in link"
 msgstr "tipus d'objecte incorrecte en l'enllaç"
 
-#: builtin/fsck.c:152
 #, c-format
 msgid ""
 "broken link from %7s %s\n"
@@ -16169,363 +6126,304 @@ msgstr ""
 "enllaç trencat des de %7s %s\n"
 "               fins a %7s %s"
 
-#: builtin/fsck.c:264
+msgid "Checking connectivity"
+msgstr "S'està comprovant la connectivitat"
+
 #, c-format
 msgid "missing %s %s"
 msgstr "manca %s %s"
 
-#: builtin/fsck.c:291
 #, c-format
 msgid "unreachable %s %s"
 msgstr "inabastable %s %s"
 
-#: builtin/fsck.c:311
 #, c-format
 msgid "dangling %s %s"
 msgstr "sense assignació %s %s"
 
-#: builtin/fsck.c:321
 msgid "could not create lost-found"
 msgstr "no s'ha pogut crear el trobat-perdut"
 
-#: builtin/fsck.c:332
+#, c-format
+msgid "could not write '%s'"
+msgstr "no s'ha pogut escriure «%s»"
+
 #, c-format
 msgid "could not finish '%s'"
 msgstr "no s'ha pogut finalitzar «%s»"
 
-#: builtin/fsck.c:349
 #, c-format
 msgid "Checking %s"
 msgstr "S'està comprovant %s"
 
-#: builtin/fsck.c:387
 #, c-format
 msgid "Checking connectivity (%d objects)"
 msgstr "S'està comprovant la connectivitat (%d objectes)"
 
-#: builtin/fsck.c:406
 #, c-format
 msgid "Checking %s %s"
 msgstr "S'està comprovant %s %s"
 
-#: builtin/fsck.c:411
 msgid "broken links"
 msgstr "enllaços trencats"
 
-#: builtin/fsck.c:420
 #, c-format
 msgid "root %s"
 msgstr "arrel %s"
 
-#: builtin/fsck.c:428
 #, c-format
 msgid "tagged %s %s (%s) in %s"
 msgstr "marcat %s %s (%s) a %s"
 
-#: builtin/fsck.c:457
 #, c-format
 msgid "%s: object corrupt or missing"
 msgstr "%s: objecte corrupte o no trobat"
 
-#: 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:496
 #, c-format
 msgid "Checking reflog %s->%s"
 msgstr "S'està comprovant reflog %s->%s"
 
-#: builtin/fsck.c:530
 #, c-format
 msgid "%s: invalid sha1 pointer %s"
 msgstr "%s: punter %s sha1 no vàlid"
 
-#: builtin/fsck.c:537
 #, c-format
 msgid "%s: not a commit"
 msgstr "%s: no és una comissió"
 
-#: builtin/fsck.c:591
 msgid "notice: No default references"
 msgstr "avís: no hi ha referències per defecte"
 
-#: builtin/fsck.c:621
 #, c-format
 msgid "%s: hash-path mismatch, found at: %s"
 msgstr "%s: el resum del camí no coincideix, trobat a: %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:628
 #, c-format
 msgid "%s: object is of unknown type '%s': %s"
 msgstr "%s: l'objecte és de tipus desconegut «%s»: %s"
 
-#: builtin/fsck.c:645
 #, c-format
 msgid "%s: object could not be parsed: %s"
 msgstr "%s: no s'ha pogut analitzar l'objecte: %s"
 
-#: builtin/fsck.c:665
 #, c-format
 msgid "bad sha1 file: %s"
 msgstr "fitxer sha1 malmès: %s"
 
-#: builtin/fsck.c:686
 msgid "Checking object directory"
 msgstr "S'està comprovant el directori d'objecte"
 
-#: builtin/fsck.c:689
 msgid "Checking object directories"
 msgstr "S'estan comprovant els directoris d'objecte"
 
-#: builtin/fsck.c:705
 #, c-format
 msgid "Checking %s link"
 msgstr "S'està comprovant l'enllaç %s"
 
-#: builtin/fsck.c:710 builtin/index-pack.c:862
 #, c-format
 msgid "invalid %s"
 msgstr "%s no vàlid"
 
-#: builtin/fsck.c:717
 #, c-format
 msgid "%s points to something strange (%s)"
 msgstr "%s apunta a una cosa estranya (%s)"
 
-#: builtin/fsck.c:723
 #, c-format
 msgid "%s: detached HEAD points at nothing"
 msgstr "%s: el HEAD separat no apunta a res"
 
-#: builtin/fsck.c:727
 #, 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:739
 msgid "Checking cache tree"
 msgstr "S'està comprovant l'arbre de la memòria cau"
 
-#: builtin/fsck.c:744
 #, c-format
 msgid "%s: invalid sha1 pointer in cache-tree"
 msgstr "%s: apuntador sha1 no vàlid a l'arbre de la memòria cau"
 
-#: builtin/fsck.c:753
 msgid "non-tree in cache-tree"
 msgstr "un no arbre en l'arbre de la memòria cau"
 
-#: builtin/fsck.c:784
 msgid "git fsck [<options>] [<object>...]"
 msgstr "git fsck [<opcions>] [<objecte>...]"
 
-#: builtin/fsck.c:790
 msgid "show unreachable objects"
 msgstr "mostra els objectes inabastables"
 
-#: builtin/fsck.c:791
 msgid "show dangling objects"
 msgstr "mostra els objectes penjants"
 
-#: builtin/fsck.c:792
 msgid "report tags"
 msgstr "informa de les etiquetes"
 
-#: builtin/fsck.c:793
 msgid "report root nodes"
 msgstr "informa dels nodes d'arrel"
 
-#: builtin/fsck.c:794
 msgid "make index objects head nodes"
 msgstr "fes dels objectes d'índex nodes cap"
 
-#: builtin/fsck.c:795
 msgid "make reflogs head nodes (default)"
 msgstr "fes que els registres de referències siguin nodes cap (per defecte)"
 
-#: builtin/fsck.c:796
 msgid "also consider packs and alternate objects"
 msgstr "també considera els paquets i els objectes alternatius"
 
-#: builtin/fsck.c:797
 msgid "check only connectivity"
 msgstr "comprova només la connectivitat"
 
-#: builtin/fsck.c:798 builtin/mktag.c:75
 msgid "enable more strict checking"
 msgstr "habilita la comprovació més estricta"
 
-#: builtin/fsck.c:800
 msgid "write dangling objects in .git/lost-found"
 msgstr "escriu objectes penjants a .git/lost-found"
 
-#: builtin/fsck.c:801 builtin/prune.c:146
 msgid "show progress"
 msgstr "mostra el progrés"
 
-#: builtin/fsck.c:802
 msgid "show verbose names for reachable objects"
 msgstr "mostra els noms detallats dels objectes abastables"
 
-#: builtin/fsck.c:862 builtin/index-pack.c:261
 msgid "Checking objects"
 msgstr "S'estan comprovant els objectes"
 
-#: builtin/fsck.c:890
 #, c-format
 msgid "%s: object missing"
 msgstr "%s: falta l'objecte"
 
-#: builtin/fsck.c:901
 #, c-format
 msgid "invalid parameter: expected sha1, got '%s'"
 msgstr "paràmetre no vàlid: s'esperava sha1, s'ha obtingut «%s»"
 
-#: builtin/fsmonitor--daemon.c:13
 msgid "git fsmonitor--daemon start [<options>]"
 msgstr "git fsmonitor--daemon start [<options>]"
 
-#: builtin/fsmonitor--daemon.c:14
 msgid "git fsmonitor--daemon run [<options>]"
 msgstr "git fsmonitor--daemon run [<options>]"
 
-#: builtin/fsmonitor--daemon.c:15
 msgid "git fsmonitor--daemon stop"
 msgstr "git fsmonitor--daemon stop"
 
-#: builtin/fsmonitor--daemon.c:16
 msgid "git fsmonitor--daemon status"
 msgstr "git fsmonitor--daemon status"
 
-#: builtin/fsmonitor--daemon.c:38 builtin/fsmonitor--daemon.c:47
 #, c-format
 msgid "value of '%s' out of range: %d"
 msgstr "el valor de «%s» està fora de rang: %d"
 
-#: builtin/fsmonitor--daemon.c:57
-#, c-format, fuzzy
+#, fuzzy, c-format
 msgid "value of '%s' not bool or int: %d"
 msgstr "valor de \"%s\" no bool ni int: el percentatge"
 
-#: builtin/fsmonitor--daemon.c:99
 #, c-format
 msgid "fsmonitor-daemon is watching '%s'\n"
 msgstr "fsmonitor-daemon està veient '%s'\n"
 
-#: builtin/fsmonitor--daemon.c:104
 #, c-format
 msgid "fsmonitor-daemon is not watching '%s'\n"
 msgstr "fsmonitor-daemon no està vigilant «%s»\n"
 
-#: builtin/fsmonitor--daemon.c:170
-#, c-format, fuzzy
+#, fuzzy, c-format
 msgid "could not create fsmonitor cookie '%s'"
 msgstr "no s'ha pogut crear la galeta fsmonitor '%s'"
 
-#: builtin/fsmonitor--daemon.c:753
 #, c-format
 msgid "fsmonitor: cookie_result '%d' != SEEN"
 msgstr "fsmonitor: cookie_result '%d' != SEEN"
 
-#: builtin/fsmonitor--daemon.c:1187
-#, c-format, fuzzy
+#, fuzzy, c-format
 msgid "could not start IPC thread pool on '%s'"
 msgstr "no s'ha pogut iniciar el grup de fils IPC a «%s»"
 
-#: builtin/fsmonitor--daemon.c:1199
 #, fuzzy
 msgid "could not start fsmonitor listener thread"
 msgstr "no s'ha pogut iniciar el fil d'oient del fsmonitor"
 
-#: builtin/fsmonitor--daemon.c:1297
+#, fuzzy
+msgid "could not start fsmonitor health thread"
+msgstr "no s'ha pogut iniciar el fil d'oient del fsmonitor"
+
 #, fuzzy
 msgid "could not initialize listener thread"
 msgstr "no s'ha pogut inicialitzar el fil d'oient"
 
-#: builtin/fsmonitor--daemon.c:1328 builtin/fsmonitor--daemon.c:1383
+#, fuzzy
+msgid "could not initialize health thread"
+msgstr "no s'ha pogut inicialitzar el fil d'oient"
+
+#, fuzzy, c-format
+msgid "could not cd home '%s'"
+msgstr "no s'ha pogut tancar «%s»"
+
 #, c-format
 msgid "fsmonitor--daemon is already running '%s'"
 msgstr "fsmonitor--daemon is already running «%s»"
 
-#: builtin/fsmonitor--daemon.c:1332
 #, c-format
 msgid "running fsmonitor-daemon in '%s'\n"
 msgstr "s'està executant fsmonitor-daemon en «%s»\n"
 
-#: builtin/fsmonitor--daemon.c:1387
-#, c-format, fuzzy
+#, fuzzy, c-format
 msgid "starting fsmonitor-daemon in '%s'\n"
 msgstr "s'està iniciant fsmonitor-daemon a «%s»"
 
-#: builtin/fsmonitor--daemon.c:1413
 #, fuzzy
 msgid "daemon failed to start"
 msgstr "el dimoni ha fallat en iniciar"
 
-#: builtin/fsmonitor--daemon.c:1416
 #, fuzzy
 msgid "daemon not online yet"
 msgstr "el dimoni encara no està en línia"
 
-#: builtin/fsmonitor--daemon.c:1419
 msgid "daemon terminated"
 msgstr "s'ha finalitzat el dimoni"
 
-#: builtin/fsmonitor--daemon.c:1429
 msgid "detach from console"
 msgstr "separat de la consola"
 
-#: builtin/fsmonitor--daemon.c:1432
 msgid "use <n> ipc worker threads"
 msgstr "usa <n> fils de treball ipc"
 
-#: builtin/fsmonitor--daemon.c:1435
 #, fuzzy
 msgid "max seconds to wait for background daemon startup"
 msgstr "màxim de segons a esperar a l'inici del dimoni de fons"
 
-#: builtin/fsmonitor--daemon.c:1449
-#, c-format, fuzzy
+#, fuzzy, c-format
 msgid "invalid 'ipc-threads' value (%d)"
 msgstr "valor «ipc-threads» no vàlid (%)"
 
-#: builtin/fsmonitor--daemon.c:1464
-#, c-format, fuzzy
+#, fuzzy, c-format
 msgid "Unhandled subcommand '%s'"
 msgstr "Subordre no gestionada '%s'"
 
-#: builtin/fsmonitor--daemon.c:1477
 #, fuzzy
 msgid "fsmonitor--daemon not supported on this platform"
 msgstr "fsmonitor--daemon no és compatible amb aquesta plataforma"
 
-#: builtin/gc.c:39
 msgid "git gc [<options>]"
 msgstr "git gc [<opcions>]"
 
-#: builtin/gc.c:93
 #, c-format
 msgid "Failed to fstat %s: %s"
 msgstr "S'ha produït un error en fer fstat %s: %s"
 
-#: builtin/gc.c:129
 #, c-format
 msgid "failed to parse '%s' value '%s'"
 msgstr "no s'ha pogut analitzar «%s» valor «%s»"
 
-#: builtin/gc.c:488 builtin/init-db.c:57
 #, c-format
 msgid "cannot stat '%s'"
 msgstr "no es pot fer stat en «%s»"
 
-#: builtin/gc.c:504
 #, c-format
 msgid ""
 "The last gc run reported the following. Please correct the root cause\n"
@@ -16540,650 +6438,510 @@ msgstr ""
 "\n"
 "%s"
 
-#: builtin/gc.c:552
 msgid "prune unreferenced objects"
 msgstr "poda objectes sense referència"
 
-#: builtin/gc.c:554
+#, fuzzy
+msgid "pack unreferenced objects separately"
+msgstr "poda objectes sense referència"
+
 msgid "be more thorough (increased runtime)"
 msgstr "sigues més exhaustiu (el temps d'execució augmenta)"
 
-#: builtin/gc.c:555
 msgid "enable auto-gc mode"
 msgstr "habilita el mode de recollida d'escombraries automàtica"
 
-#: builtin/gc.c:558
 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-se"
 
-#: builtin/gc.c:561
 msgid "repack all other packs except the largest pack"
 msgstr "reempaqueta tots els altres paquets excepte el paquet més gran"
 
-#: builtin/gc.c:577
-#, c-format
-msgid "failed to parse gc.logexpiry value %s"
+#, fuzzy, c-format
+msgid "failed to parse gc.logExpiry value %s"
 msgstr "no s'ha pogut analitzar el valor %s de gc.logexpiry"
 
-#: builtin/gc.c:588
 #, c-format
 msgid "failed to parse prune expiry value %s"
 msgstr "no s'ha pogut analitzar el valor de venciment de la poda %s"
 
-#: builtin/gc.c:608
 #, c-format
 msgid "Auto packing the repository in background for optimum performance.\n"
 msgstr ""
 "S'està empaquetant el repositori automàticament en el rerefons per a un "
 "rendiment òptim.\n"
 
-#: builtin/gc.c:610
 #, c-format
 msgid "Auto packing the repository for optimum performance.\n"
 msgstr ""
 "S'està empaquetant automàticament el repositori per a un rendiment òptim.\n"
 
-#: builtin/gc.c:611
 #, c-format
 msgid "See \"git help gc\" for manual housekeeping.\n"
 msgstr "Vegeu «git help gc» per a neteja manual.\n"
 
-#: builtin/gc.c:652
 #, c-format
 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:707
 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:717
 msgid ""
 "git maintenance run [--auto] [--[no-]quiet] [--task=<task>] [--schedule]"
 msgstr ""
 "git maintenance run [--auto] [--[no-]quiet] [--task=<task>] [--schedule]"
 
-#: builtin/gc.c:747
 msgid "--no-schedule is not allowed"
 msgstr "--no-schedule no està permès"
 
-#: builtin/gc.c:752
 #, c-format
 msgid "unrecognized --schedule argument '%s'"
 msgstr "argument --schedule no reconegut, «%s»"
 
-#: builtin/gc.c:870
 msgid "failed to write commit-graph"
 msgstr "s'ha produït un error en escriure el graf de comissions"
 
-#: builtin/gc.c:906
 msgid "failed to prefetch remotes"
 msgstr "s'ha produït un error en preobtenir els remots"
 
-#: builtin/gc.c:1022
 msgid "failed to start 'git pack-objects' process"
 msgstr "no s'ha pogut iniciar el procés «git pack-objects»"
 
-#: builtin/gc.c:1039
 msgid "failed to finish 'git pack-objects' process"
 msgstr "no s'ha pogut finalitzar el procés «git pack-objects»"
 
-#: builtin/gc.c:1090
 msgid "failed to write multi-pack-index"
 msgstr "no s'han pogut escriu l'índex del multipaquet"
 
-#: builtin/gc.c:1106
 msgid "'git multi-pack-index expire' failed"
 msgstr "ha fallat el venciment de «git multi-pack-index expire»"
 
-#: builtin/gc.c:1165
 msgid "'git multi-pack-index repack' failed"
 msgstr "ha fallat l'execució de «git multi-pack-index repack»"
 
-#: builtin/gc.c:1174
 msgid ""
 "skipping incremental-repack task because core.multiPackIndex is disabled"
 msgstr ""
 "s'està ometent la tasca incremental-repack perquè core.multiPackIndex està "
 "desactivat"
 
-#: builtin/gc.c:1278
 #, c-format
 msgid "lock file '%s' exists, skipping maintenance"
 msgstr "el fitxer de bloqueig «%s» existeix, s'omet el manteniment"
 
-#: builtin/gc.c:1308
 #, c-format
 msgid "task '%s' failed"
 msgstr "la tasca «%s» ha fallat"
 
-#: builtin/gc.c:1390
 #, c-format
 msgid "'%s' is not a valid task"
 msgstr "«%s» no és una tasca vàlida"
 
-#: builtin/gc.c:1395
 #, c-format
 msgid "task '%s' cannot be selected multiple times"
 msgstr "la tasca «%s» no es pot seleccionar múltiples vegades"
 
-#: builtin/gc.c:1410
 msgid "run tasks based on the state of the repository"
 msgstr "executa les tasques basades en l'estat del repositori"
 
-#: builtin/gc.c:1411
 msgid "frequency"
 msgstr "freqüència"
 
-#: builtin/gc.c:1412
 msgid "run tasks based on frequency"
 msgstr "executa les tasques basant-se en freqüència"
 
-#: builtin/gc.c:1415
 msgid "do not report progress or other information over stderr"
 msgstr "no informeu sobre el progrés o altra informació as stderr"
 
-#: builtin/gc.c:1416
 msgid "task"
 msgstr "tasca"
 
-#: builtin/gc.c:1417
 msgid "run a specific task"
 msgstr "executa una tasca específica"
 
-#: builtin/gc.c:1434
 msgid "use at most one of --auto and --schedule=<frequency>"
 msgstr "usa com a màxim un entre --auto i --schedule=<frequency>"
 
-#: builtin/gc.c:1477
 msgid "failed to run 'git config'"
 msgstr "no s'ha pogut executar «git config»"
 
-#: builtin/gc.c:1629
 #, c-format
 msgid "failed to expand path '%s'"
 msgstr "s'ha produït un error en expandir el camí «%s»"
 
-#: builtin/gc.c:1656 builtin/gc.c:1694
 msgid "failed to start launchctl"
 msgstr "s'ha produït un error en iniciar launchctl"
 
-#: builtin/gc.c:1769 builtin/gc.c:2237
 #, c-format
 msgid "failed to create directories for '%s'"
 msgstr "s'ha produït un error en crear els directoris per a «%s»"
 
-#: builtin/gc.c:1796
 #, c-format
 msgid "failed to bootstrap service %s"
 msgstr "s'ha produït un error en arrencar el servei %s"
 
-#: builtin/gc.c:1889
 msgid "failed to create temp xml file"
 msgstr "no s'han pogut crear un fitxer xml temporal"
 
-#: builtin/gc.c:1979
 msgid "failed to start schtasks"
 msgstr "s'ha produït un error en iniciar schtasks"
 
-#: builtin/gc.c:2063
 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:2080
 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:2084
 msgid "failed to open stdin of 'crontab'"
 msgstr "s'ha produït un error en obrir stdin de «crontab»"
 
-#: builtin/gc.c:2126
 msgid "'crontab' died"
 msgstr "«crontab» ha mort"
 
-#: builtin/gc.c:2191
 msgid "failed to start systemctl"
 msgstr "s'ha produït un error en iniciar systemctl"
 
-#: builtin/gc.c:2201
 msgid "failed to run systemctl"
 msgstr "s'ha produït un error en executar systemctl"
 
-#: builtin/gc.c:2210 builtin/gc.c:2215 builtin/worktree.c:63
-#: builtin/worktree.c:1024
 #, c-format
 msgid "failed to delete '%s'"
 msgstr "s'ha produït un error en suprimir «%s»"
 
-#: builtin/gc.c:2395
+#, c-format
+msgid "failed to flush '%s'"
+msgstr "no s'ha pogut buidar «%s»"
+
 #, c-format
 msgid "unrecognized --scheduler argument '%s'"
 msgstr "l'argument --scheduler no reconegut «%s»"
 
-#: builtin/gc.c:2420
 msgid "neither systemd timers nor crontab are available"
 msgstr "ni els temporitzadors de systemd ni de crontab estan disponibles"
 
-#: builtin/gc.c:2435
 #, c-format
 msgid "%s scheduler is not available"
 msgstr "el planificador %s no està disponible"
 
-#: builtin/gc.c:2449
 msgid "another process is scheduling background maintenance"
 msgstr "un altre procés està planificant un manteniment en segon pla"
 
-#: builtin/gc.c:2471
 msgid "git maintenance start [--scheduler=<scheduler>]"
 msgstr "git maintenance start [--scheduler=<scheduler>]"
 
-#: builtin/gc.c:2480
 msgid "scheduler"
 msgstr "planificador"
 
-#: builtin/gc.c:2481
 msgid "scheduler to trigger git maintenance run"
 msgstr "planificador per a activar l'execució de manteniment del git"
 
-#: builtin/gc.c:2495
 msgid "failed to add repo to global config"
 msgstr "no s'ha pogut afegir un repositori a la configuració global"
 
-#: builtin/gc.c:2504
 msgid "git maintenance <subcommand> [<options>]"
 msgstr "git maintenance <subcommand> [<options>]"
 
-#: builtin/gc.c:2523
 #, c-format
 msgid "invalid subcommand: %s"
 msgstr "subordre no vàlida: %s"
 
-#: builtin/grep.c:32
 msgid "git grep [<options>] [-e] <pattern> [<rev>...] [[--] <path>...]"
 msgstr "git grep [<opcions>] [-e] <patró> [<revisió>...] [[--] <camí>...]"
 
-#: builtin/grep.c:241
 #, c-format
 msgid "grep: failed to create thread: %s"
 msgstr "grep: s'ha produït un error en crear fil: %s"
 
-#: builtin/grep.c:295
 #, 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"
 
+#. #-#-#-#-#  grep.c.po  #-#-#-#-#
 #. TRANSLATORS: %s is the configuration
 #. variable for tweaking threads, currently
 #. grep.threads
-#: builtin/grep.c:303 builtin/index-pack.c:1587 builtin/index-pack.c:1791
-#: builtin/pack-objects.c:3150
+#.
 #, c-format
 msgid "no threads support, ignoring %s"
 msgstr "no s'admeten fils, s'ignorarà %s"
 
-#: builtin/grep.c:490 builtin/grep.c:619 builtin/grep.c:659
 #, c-format
 msgid "unable to read tree (%s)"
 msgstr "no s'ha pogut llegir l'arbre (%s)"
 
-#: builtin/grep.c:674
 #, 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:754
 #, c-format
 msgid "switch `%c' expects a numerical value"
 msgstr "l'opció «%c» espera un valor numèric"
 
-#: builtin/grep.c:852
 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:854
 msgid "find in contents not managed by git"
 msgstr "cerca en continguts no gestionats per git"
 
-#: builtin/grep.c:856
 msgid "search in both tracked and untracked files"
 msgstr "cerca tant en fitxers seguits com en no seguits"
 
-#: builtin/grep.c:858
 msgid "ignore files specified via '.gitignore'"
 msgstr "ignora els fitxers especificats mitjançant «.gitignore»"
 
-#: builtin/grep.c:860
 msgid "recursively search in each submodule"
 msgstr "cerca recursivament a cada submòdul"
 
-#: builtin/grep.c:863
 msgid "show non-matching lines"
 msgstr "mostra les línies no coincidents"
 
-#: builtin/grep.c:865
 msgid "case insensitive matching"
 msgstr "coincidència no distingeix entre majúscules i minúscules"
 
-#: builtin/grep.c:867
 msgid "match patterns only at word boundaries"
 msgstr "coincideix amb els patrons només als límits de paraula"
 
-#: builtin/grep.c:869
 msgid "process binary files as text"
 msgstr "processa els fitxers binaris com a text"
 
-#: builtin/grep.c:871
 msgid "don't match patterns in binary files"
 msgstr "no coincideixis amb els patrons en els fitxers binaris"
 
-#: builtin/grep.c:874
 msgid "process binary files with textconv filters"
 msgstr "processa els fitxers binaris amb filtres de textconv"
 
-#: builtin/grep.c:876
 msgid "search in subdirectories (default)"
 msgstr "cerca als subdirectoris (per defecte)"
 
-#: builtin/grep.c:878
 msgid "descend at most <depth> levels"
 msgstr "descendeix com a màxim <profunditat> nivells"
 
-#: builtin/grep.c:882
 msgid "use extended POSIX regular expressions"
 msgstr "usa les expressions regulars POSIX ampliades"
 
-#: builtin/grep.c:885
 msgid "use basic POSIX regular expressions (default)"
 msgstr "usa les expressions regulars POSIX bàsiques (per defecte)"
 
-#: builtin/grep.c:888
 msgid "interpret patterns as fixed strings"
 msgstr "interpreta els patrons com a cadenes fixes"
 
-#: builtin/grep.c:891
 msgid "use Perl-compatible regular expressions"
 msgstr "usa les expressions regulars compatibles amb Perl"
 
-#: builtin/grep.c:894
 msgid "show line numbers"
 msgstr "mostra els números de línia"
 
-#: builtin/grep.c:895
 msgid "show column number of first match"
 msgstr "mostra el nombre de columna de la primera coincidència"
 
-#: builtin/grep.c:896
 msgid "don't show filenames"
 msgstr "no mostris els noms de fitxer"
 
-#: builtin/grep.c:897
 msgid "show filenames"
 msgstr "mostra els noms de fitxer"
 
-#: builtin/grep.c:899
 msgid "show filenames relative to top directory"
 msgstr "mostra els noms de fitxer relatius al directori superior"
 
-#: builtin/grep.c:901
 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:903
 msgid "synonym for --files-with-matches"
 msgstr "sinònim de --files-with-matches"
 
-#: builtin/grep.c:906
 msgid "show only the names of files without match"
 msgstr "mostra només els noms dels fitxers sense coincidència"
 
-#: builtin/grep.c:908
 msgid "print NUL after filenames"
 msgstr "imprimeix NUL després dels noms de fitxer"
 
-#: builtin/grep.c:911
 msgid "show only matching parts of a line"
 msgstr "mostra només les parts de coincidents de la línia"
 
-#: builtin/grep.c:913
 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:914
 msgid "highlight matches"
 msgstr "ressalta les coincidències"
 
-#: builtin/grep.c:916
 msgid "print empty line between matches from different files"
 msgstr "imprimeix una línia buida entre coincidències de fitxers distints"
 
-#: builtin/grep.c:918
 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:921
 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:924
 msgid "show <n> context lines before matches"
 msgstr "mostra <n> línies de context abans d'una coincidència"
 
-#: builtin/grep.c:926
 msgid "show <n> context lines after matches"
 msgstr "mostra <n> línies de context després d'una coincidència"
 
-#: builtin/grep.c:928
 msgid "use <n> worker threads"
 msgstr "usa <n> fils de treball"
 
-#: builtin/grep.c:929
 msgid "shortcut for -C NUM"
 msgstr "drecera per a -C NUM"
 
-#: builtin/grep.c:932
 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:934
 msgid "show the surrounding function"
 msgstr "mostra la funció circumdant"
 
-#: builtin/grep.c:937
 msgid "read patterns from file"
 msgstr "llegeix els patrons des d'un fitxer"
 
-#: builtin/grep.c:939
 msgid "match <pattern>"
 msgstr "coincideix amb <patró>"
 
-#: builtin/grep.c:941
 msgid "combine patterns specified with -e"
 msgstr "combina els patrons especificats amb -e"
 
-#: builtin/grep.c:953
 msgid "indicate hit with exit status without output"
 msgstr "indica coincidència amb estat de sortida sense sortida textual"
 
-#: builtin/grep.c:955
 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:958
 msgid "pager"
 msgstr "paginador"
 
-#: builtin/grep.c:958
 msgid "show matching files in the pager"
 msgstr "mostra els fitxers coincidents en el paginador"
 
-#: builtin/grep.c:962
 msgid "allow calling of grep(1) (ignored by this build)"
 msgstr "permet la invocació de grep(1) (ignorat per aquesta compilació)"
 
-#: builtin/grep.c:1028
 msgid "no pattern given"
 msgstr "no s'ha donat cap patró"
 
-#: builtin/grep.c:1064
 msgid "--no-index or --untracked cannot be used with revs"
 msgstr "--no-index o --untracked no es pot usar amb revisions"
 
-#: builtin/grep.c:1072
 #, c-format
 msgid "unable to resolve revision: %s"
 msgstr "no s'ha pogut resoldre la revisió: %s"
 
-#: builtin/grep.c:1102
 msgid "--untracked not supported with --recurse-submodules"
 msgstr "--untracked no s'admet amb --recurse-submodules"
 
-#: builtin/grep.c:1106
 msgid "invalid option combination, ignoring --threads"
 msgstr "combinació d'opcions no vàlida, s'està ignorant --threads"
 
-#: builtin/grep.c:1109 builtin/pack-objects.c:4084
 msgid "no threads support, ignoring --threads"
 msgstr "no s'admeten fils, s'ignorarà --threads"
 
-#: builtin/grep.c:1112 builtin/index-pack.c:1584 builtin/pack-objects.c:3147
 #, c-format
 msgid "invalid number of threads specified (%d)"
 msgstr "s'ha especificat un nombre de fils no vàlid (%d)"
 
-#: builtin/grep.c:1146
 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:1179
 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:1187
 msgid "both --cached and trees are given"
 msgstr "ambdós --cached i arbres venen donats"
 
-#: 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:97
 msgid "object type"
 msgstr "tipus d'objecte"
 
-#: builtin/hash-object.c:98
 msgid "write the object into the object database"
 msgstr "escriu l'objecte a la base de dades d'objectes"
 
-#: builtin/hash-object.c:100
 msgid "read the object from stdin"
 msgstr "llegeix l'objecte des de stdin"
 
-#: builtin/hash-object.c:102
 msgid "store file as is without filters"
 msgstr "emmagatzema el fitxer tal com és sense filtres"
 
-#: builtin/hash-object.c:103
 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:104
 msgid "process file as it were from this path"
 msgstr "processa el fitxer com si fos d'aquest camí"
 
-#: builtin/help.c:57
 msgid "print all available commands"
 msgstr "imprimeix totes les ordres disponibles"
 
-#: builtin/help.c:60
 #, fuzzy
 msgid "show external commands in --all"
 msgstr "mostra les ordres externes a --all"
 
-#: builtin/help.c:61
 #, fuzzy
 msgid "show aliases in --all"
 msgstr "mostra els àlies a --all"
 
-#: builtin/help.c:62
 msgid "exclude guides"
 msgstr "exclou guies"
 
-#: builtin/help.c:63
 msgid "show man page"
 msgstr "mostra la pàgina de manual"
 
-#: builtin/help.c:64
 msgid "show manual in web browser"
 msgstr "mostra la pàgina de manual en el navegador web"
 
-#: builtin/help.c:66
 msgid "show info page"
 msgstr "mostra la pàgina d'informació"
 
-#: builtin/help.c:68
 msgid "print command description"
 msgstr "imprimeix la descripció de l'ordre"
 
-#: builtin/help.c:70
 msgid "print list of useful guides"
 msgstr "imprimeix la llista de guies útils"
 
-#: builtin/help.c:72
 msgid "print all configuration variable names"
 msgstr "imprimeix tots els noms de les variables de configuració"
 
-#: builtin/help.c:84
 msgid "git help [[-i|--info] [-m|--man] [-w|--web]] [<command>]"
 msgstr "git help [[-i|--info] [-m|--man] [-w|--web]] [<command>]"
 
-#: builtin/help.c:201
 #, c-format
 msgid "unrecognized help format '%s'"
 msgstr "format d'ajuda no reconegut «%s»"
 
-#: builtin/help.c:227
 msgid "Failed to start emacsclient."
 msgstr "S'ha produït un error en iniciar emacsclient."
 
-#: builtin/help.c:240
 msgid "Failed to parse emacsclient version."
 msgstr "S'ha produït un error en analitzar la versió d'emacsclient."
 
-#: builtin/help.c:248
 #, c-format
 msgid "emacsclient version '%d' too old (< 22)."
 msgstr "la versió d'emacsclient «%d» és massa vella (< 22)."
 
-#: builtin/help.c:266 builtin/help.c:288 builtin/help.c:298 builtin/help.c:306
 #, c-format
 msgid "failed to exec '%s'"
 msgstr "s'ha produït un error en executar «%s»"
 
-#: builtin/help.c:344
 #, c-format
 msgid ""
 "'%s': path for unsupported man viewer.\n"
@@ -17192,7 +6950,6 @@ msgstr ""
 "«%s»: camí a un visualitzador de manuals no compatible.\n"
 "Considereu usar «man.<eina>.cmd» en lloc d'això."
 
-#: builtin/help.c:356
 #, c-format
 msgid ""
 "'%s': cmd for supported man viewer.\n"
@@ -17201,140 +6958,111 @@ msgstr ""
 "«%s»: ordre per a un visualitzador de manuals compatible.\n"
 "Considereu usar «man.<eina>.path» en lloc d'això."
 
-#: builtin/help.c:471
 #, c-format
 msgid "'%s': unknown man viewer."
 msgstr "«%s»: visualitzador de manuals desconegut."
 
-#: builtin/help.c:487
 msgid "no man viewer handled the request"
 msgstr "cap visualitzador de manuals ha gestionat la sol·licitud"
 
-#: builtin/help.c:494
 msgid "no info viewer handled the request"
 msgstr "cap visualitzador d'informació ha gestionat la sol·licitud"
 
-#: builtin/help.c:555 builtin/help.c:566 git.c:348
 #, c-format
 msgid "'%s' is aliased to '%s'"
 msgstr "«%s» és un àlies de «%s»"
 
-#: builtin/help.c:569 git.c:380
 #, c-format
 msgid "bad alias.%s string: %s"
 msgstr "cadena «alias.%s» incorrecte: %s"
 
-#: builtin/help.c:611
-#, c-format, fuzzy
+#, fuzzy, c-format
 msgid "the '%s' option doesn't take any non-option arguments"
 msgstr "l'opció «%s» no pren cap argument que no sigui una opció"
 
-#: builtin/help.c:631
 #, fuzzy
 msgid ""
 "the '--no-[external-commands|aliases]' options can only be used with '--all'"
 msgstr ""
-"les opcions «--no-exexternal-commands|aliases with» només es poden utilitzar"
-" amb «--all»"
+"les opcions «--no-exexternal-commands|aliases with» només es poden utilitzar "
+"amb «--all»"
 
-#: builtin/help.c:643 builtin/help.c:671
 #, c-format
 msgid "usage: %s%s"
 msgstr "ús: %s%s"
 
-#: builtin/help.c:666
 msgid "'git help config' for more information"
 msgstr "«git help config» per a més informació"
 
-#: builtin/hook.c:10
 msgid "git hook run [--ignore-missing] <hook-name> [-- <hook-args>]"
 msgstr "git hook run [--ignore-missing] <hook-name> [-- <hook-args>]"
 
-#: builtin/hook.c:30
 msgid "silently ignore missing requested <hook-name>"
 msgstr "ignora silenciosament la sol·licitud <hook-name> perduda"
 
-#: 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:241
 #, c-format
 msgid "did not receive expected object %s"
 msgstr "no s'ha rebut l'objecte esperat %s"
 
-#: 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: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 poden omplir %d octets"
 
-#: builtin/index-pack.c:304
 msgid "early EOF"
 msgstr "EOF prematur"
 
-#: builtin/index-pack.c:305
 msgid "read error on input"
 msgstr "error de lectura d'entrada"
 
-#: 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:324 builtin/pack-objects.c:754
 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:329
 #, c-format
 msgid "pack exceeds maximum allowed size (%s)"
 msgstr "el paquet supera la mida màxima permesa (%s)"
 
-#: builtin/index-pack.c:362
 msgid "pack signature mismatch"
 msgstr "hi ha una discordança de signatura de paquet"
 
-#: builtin/index-pack.c:364
 #, c-format
 msgid "pack version %<PRIu32> unsupported"
 msgstr "la versió de paquet %<PRIu32> no és compatible"
 
-#: builtin/index-pack.c:380
 #, 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:485
 #, c-format
 msgid "inflate returned %d"
 msgstr "la inflació ha retornat %d"
 
-#: builtin/index-pack.c:534
 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:542
 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:550
 #, c-format
 msgid "unknown object type %d"
 msgstr "tipus d'objecte desconegut %d"
 
-#: builtin/index-pack.c:581
 msgid "cannot pread pack file"
 msgstr "no es pot fer pread en el fitxer empaquetat"
 
-#: builtin/index-pack.c:583
 #, c-format
 msgid "premature end of pack file, %<PRIuMAX> byte missing"
 msgid_plural "premature end of pack file, %<PRIuMAX> bytes missing"
@@ -17342,325 +7070,256 @@ msgstr[0] "el final del fitxer empaquetat és prematur, manca %<PRIuMAX> octet"
 msgstr[1] ""
 "el final del fitxer empaquetat és prematur, manquen %<PRIuMAX> octets"
 
-#: builtin/index-pack.c:609
 msgid "serious inflate inconsistency"
 msgstr "hi ha una inconsistència seriosa d'inflació"
 
-#: builtin/index-pack.c:754 builtin/index-pack.c:760 builtin/index-pack.c:784
-#: builtin/index-pack.c:823 builtin/index-pack.c:832
 #, c-format
 msgid "SHA1 COLLISION FOUND WITH %s !"
 msgstr "S'HA TROBAT UNA COL·LISIÓ SHA1 AMB %s !"
 
-#: builtin/index-pack.c:757 builtin/pack-objects.c:290
-#: builtin/pack-objects.c:350 builtin/pack-objects.c:456
 #, c-format
 msgid "unable to read %s"
 msgstr "no s'ha pogut llegir %s"
 
-#: builtin/index-pack.c:821
 #, c-format
 msgid "cannot read existing object info %s"
 msgstr "no es pot llegir la informació d'objecte existent %s"
 
-#: builtin/index-pack.c:829
 #, c-format
 msgid "cannot read existing object %s"
 msgstr "no es pot llegir l'objecte existent %s"
 
-#: builtin/index-pack.c:843
 #, c-format
 msgid "invalid blob object %s"
 msgstr "objecte de blob no vàlid %s"
 
-#: builtin/index-pack.c:846 builtin/index-pack.c:865
 msgid "fsck error in packed object"
 msgstr "fsck error en un objecte empaquetat"
 
-#: builtin/index-pack.c:867
 #, 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:928 builtin/index-pack.c:975
 msgid "failed to apply delta"
 msgstr "s'ha produït un error en aplicar la diferència"
 
-#: builtin/index-pack.c:1161
 msgid "Receiving objects"
 msgstr "S'estan rebent objectes"
 
-#: builtin/index-pack.c:1161
 msgid "Indexing objects"
 msgstr "S'estan indexant objectes"
 
-#: builtin/index-pack.c:1195
 msgid "pack is corrupted (SHA1 mismatch)"
 msgstr "el paquet és malmès (discordança SHA1)"
 
-#: builtin/index-pack.c:1200
 msgid "cannot fstat packfile"
 msgstr "no es pot fer fstat en el fitxer de paquet"
 
-#: builtin/index-pack.c:1203
 msgid "pack has junk at the end"
 msgstr "el paquet té brossa al seu final"
 
-#: builtin/index-pack.c:1215
 msgid "confusion beyond insanity in parse_pack_objects()"
 msgstr "confusió més enllà de la bogeria en parse_pack_objects()"
 
-#: builtin/index-pack.c:1238
 msgid "Resolving deltas"
 msgstr "S'estan resolent les diferències"
 
-#: builtin/index-pack.c:1249 builtin/pack-objects.c:2913
 #, c-format
 msgid "unable to create thread: %s"
 msgstr "no s'ha pogut crear fil: %s"
 
-#: builtin/index-pack.c:1282
 msgid "confusion beyond insanity"
 msgstr "confusió més enllà de la bogeria"
 
-#: builtin/index-pack.c:1288
 #, 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:1300
 #, 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:1304
 #, 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:1328
 #, c-format
 msgid "unable to deflate appended object (%d)"
 msgstr "no s'ha pogut desinflar l'objecte annexat (%d)"
 
-#: builtin/index-pack.c:1423
 #, c-format
 msgid "local object %s is corrupt"
 msgstr "l'objecte local %s és malmès"
 
-#: builtin/index-pack.c:1445
 #, c-format
 msgid "packfile name '%s' does not end with '.%s'"
 msgstr "el nom del fitxer de paquet «%s» no acaba amb «.%s»"
 
-#: builtin/index-pack.c:1469
 #, c-format
 msgid "cannot write %s file '%s'"
 msgstr "no es pot escriure «%s» al fitxer «%s»"
 
-#: builtin/index-pack.c:1477
 #, c-format
 msgid "cannot close written %s file '%s'"
 msgstr "no s'ha pogut tancar el fitxer %s escrit «%s»"
 
-#: builtin/index-pack.c:1494
 #, c-format
 msgid "unable to rename temporary '*.%s' file to '%s'"
 msgstr "no s'ha pogut canviar el nom del fitxer temporal «*.%s» a «%s»"
 
-#: builtin/index-pack.c:1519
 msgid "error while closing pack file"
 msgstr "error en tancar el fitxer empaquetat"
 
-#: builtin/index-pack.c:1578 builtin/pack-objects.c:3158
-#, c-format
-msgid "bad pack.indexversion=%<PRIu32>"
+#, fuzzy, c-format
+msgid "bad pack.indexVersion=%<PRIu32>"
 msgstr "pack.indexversion=%<PRIu32> incorrecte"
 
-#: builtin/index-pack.c:1648
 #, c-format
 msgid "Cannot open existing pack file '%s'"
 msgstr "No es pot obrir el fitxer empaquetat existent «%s»"
 
-#: builtin/index-pack.c:1650
 #, 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:1698
 #, 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:1705
 #, 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:1748
 msgid "Cannot come back to cwd"
 msgstr "No es pot tornar al directori de treball actual"
 
-#: builtin/index-pack.c:1802 builtin/index-pack.c:1805
-#: builtin/index-pack.c:1825 builtin/index-pack.c:1829
 #, c-format
 msgid "bad %s"
 msgstr "%s incorrecte"
 
-#: builtin/index-pack.c:1835 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:1856
 msgid "--stdin requires a git repository"
 msgstr "--stdin requereix un repositori git"
 
-#: builtin/index-pack.c:1873
 msgid "--verify with no packfile name given"
 msgstr "s'ha donat --verify sense nom de fitxer de paquet"
 
-#: builtin/index-pack.c:1939 builtin/unpack-objects.c:584
 msgid "fsck error in pack objects"
 msgstr "error fsck als objectes del paquet"
 
-#: builtin/init-db.c:63
 #, c-format
 msgid "cannot stat template '%s'"
 msgstr "no es pot fer stat en la plantilla «%s»"
 
-#: builtin/init-db.c:68
 #, c-format
 msgid "cannot opendir '%s'"
 msgstr "no es pot fer opendir en el directori «%s»"
 
-#: builtin/init-db.c:80
 #, c-format
 msgid "cannot readlink '%s'"
 msgstr "no es pot fer readlink en «%s»"
 
-#: builtin/init-db.c:82
 #, c-format
 msgid "cannot symlink '%s' '%s'"
 msgstr "no es pot fer symlink en «%s» «%s»"
 
-#: builtin/init-db.c:88
 #, c-format
 msgid "cannot copy '%s' to '%s'"
 msgstr "no es pot copiar «%s» a «%s»"
 
-#: builtin/init-db.c:92
 #, c-format
 msgid "ignoring template %s"
 msgstr "s'està ignorant la plantilla %s"
 
-#: builtin/init-db.c:123
 #, c-format
 msgid "templates not found in %s"
 msgstr "plantilles no trobades a %s"
 
-#: builtin/init-db.c:138
 #, c-format
 msgid "not copying templates from '%s': %s"
 msgstr "no s'estan copiant plantilles de «%s»: %s"
 
-#: 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: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:357
 #, c-format
 msgid "unable to move %s to %s"
 msgstr "no s'ha pogut moure %s a %s"
 
-#: 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:397 builtin/init-db.c:400
 #, c-format
 msgid "%s already exists"
 msgstr "%s ja existeix"
 
-#: builtin/init-db.c:432
 #, c-format
 msgid "re-init: ignored --initial-branch=%s"
 msgstr "reinicialització: s'ha ignorat --initial-branch=%s"
 
-#: 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: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: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: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: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:544
 msgid "permissions"
 msgstr "permisos"
 
-#: 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"
 
-#: builtin/init-db.c:551
 msgid "override the name of the initial branch"
 msgstr "sobreescriu el nom de la branca inicial"
 
-#: builtin/init-db.c:552 builtin/verify-pack.c:74
 msgid "hash"
 msgstr "hash"
 
-#: 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:591 builtin/init-db.c:596
 #, c-format
 msgid "cannot mkdir %s"
 msgstr "no es pot mkdir %s"
 
-#: 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:627
 #, c-format
 msgid ""
 "%s (or --work-tree=<directory>) not allowed without specifying %s (or --git-"
@@ -17669,16 +7328,13 @@ msgstr ""
 "no es permet %s (o --work-tree=<directori>) sense especificar %s (o --git-"
 "dir=<directori>)"
 
-#: 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:684
 msgid "--separate-git-dir incompatible with bare repository"
 msgstr "--separate-git-dir és incompatible amb un repositori nu"
 
-#: builtin/interpret-trailers.c:16
 msgid ""
 "git interpret-trailers [--in-place] [--trim-empty] [(--trailer "
 "<token>[(=|:)<value>])...] [<file>...]"
@@ -17686,92 +7342,73 @@ msgstr ""
 "git interpret-trailers [--in-place] [--trim-empty] [(--trailer "
 "<testimoni>[(=|:)<valor>])...] [<fitxer>...]"
 
-#: builtin/interpret-trailers.c:95
 msgid "edit files in place"
 msgstr "edita els fitxers in situ"
 
-#: builtin/interpret-trailers.c:96
 msgid "trim empty trailers"
 msgstr "escurça els remolcs buits"
 
-#: builtin/interpret-trailers.c:99
 msgid "where to place the new trailer"
 msgstr "on ubicar el «trailer» nou"
 
-#: builtin/interpret-trailers.c:101
 msgid "action if trailer already exists"
 msgstr "acció si el «trailer» ja existeix"
 
-#: builtin/interpret-trailers.c:103
 msgid "action if trailer is missing"
 msgstr "acció si el «trailer» falta"
 
-#: builtin/interpret-trailers.c:105
 msgid "output only the trailers"
 msgstr "mostra només els «trailer»"
 
-#: builtin/interpret-trailers.c:106
 msgid "do not apply config rules"
 msgstr "no apliquis les regles de configuració"
 
-#: builtin/interpret-trailers.c:107
 msgid "join whitespace-continued values"
 msgstr "uneix els valors continus amb espais en blanc"
 
-#: builtin/interpret-trailers.c:108
 msgid "set parsing options"
 msgstr "estableix les opcions d'anàlisi"
 
-#: builtin/interpret-trailers.c:110
 msgid "do not treat --- specially"
 msgstr "no tractis --- especialment"
 
-#: builtin/interpret-trailers.c:112
 msgid "trailer(s) to add"
 msgstr "remolcs a afegir"
 
-#: builtin/interpret-trailers.c:123
 msgid "--trailer with --only-input does not make sense"
 msgstr "--trailer amb --only-input no té sentit"
 
-#: builtin/interpret-trailers.c:133
 msgid "no input file given for in-place editing"
 msgstr "no s'ha donat cap fitxer d'entrada per a edició in situ"
 
-#: builtin/log.c:60
 msgid "git log [<options>] [<revision-range>] [[--] <path>...]"
 msgstr "git log [<opcions>] [<rang-de-revisions>] [[--] <camí>...]"
 
-#: builtin/log.c:61
 msgid "git show [<options>] <object>..."
 msgstr "git show [<opcions>] <objecte>..."
 
-#: builtin/log.c:114
 #, c-format
 msgid "invalid --decorate option: %s"
 msgstr "opció --decorate no vàlida: %s"
 
-#: builtin/log.c:181
+msgid "suppress diff output"
+msgstr "omet la sortida de diferències"
+
 msgid "show source"
 msgstr "mostra la font"
 
-#: builtin/log.c:182
 msgid "use mail map file"
 msgstr "usa el fitxer de mapa de correu"
 
-#: builtin/log.c:185
 msgid "only decorate refs that match <pattern>"
 msgstr "només decora les referències que coincideixin amb <patró>"
 
-#: builtin/log.c:187
 msgid "do not decorate refs that match <pattern>"
 msgstr "no decoris les referències que coincideixen amb <patró>"
 
-#: builtin/log.c:188
 msgid "decorate options"
 msgstr "opcions de decoració"
 
-#: builtin/log.c:191
 msgid ""
 "trace the evolution of line range <start>,<end> or function :<funcname> in "
 "<file>"
@@ -17779,94 +7416,77 @@ msgstr ""
 "traça l'evolució del rang de línia <start>,<end> o funcions :<funcname> a "
 "<file>"
 
-#: builtin/log.c:214
+#, c-format
+msgid "unrecognized argument: %s"
+msgstr "argument no reconegut: %s"
+
 msgid "-L<range>:<file> cannot be used with pathspec"
 msgstr "-L<range>:<file> no es pot usar amb una especificació de camí"
 
-#: builtin/log.c:322
 #, c-format
 msgid "Final output: %d %s\n"
 msgstr "Sortida final: %d %s\n"
 
-#: builtin/log.c:429
 #, fuzzy
 msgid "unable to create temporary object directory"
 msgstr "no s'ha pogut crear el directori temporal de l'objecte"
 
-#: builtin/log.c:599
 #, c-format
 msgid "git show %s: bad file"
 msgstr "git show %s: fitxer incorrecte"
 
-#: builtin/log.c:614 builtin/log.c:706
 #, c-format
 msgid "could not read object %s"
 msgstr "no s'ha pogut llegir l'objecte %s"
 
-#: builtin/log.c:731
 #, c-format
 msgid "unknown type: %d"
 msgstr "tipus desconegut: %d"
 
-#: builtin/log.c:880
 #, c-format
 msgid "%s: invalid cover from description mode"
 msgstr "%s: cobertura no vàlida des del mode descripció"
 
-#: builtin/log.c:887
 msgid "format.headers without value"
 msgstr "format.headers sense valor"
 
-#: builtin/log.c:1016
 #, c-format
 msgid "cannot open patch file %s"
 msgstr "no s'ha pogut obrir el fitxer de pedaç %s"
 
-#: builtin/log.c:1033
 msgid "need exactly one range"
 msgstr "necessita exactament un interval"
 
-#: builtin/log.c:1043
 msgid "not a range"
 msgstr "no és un interval"
 
-#: builtin/log.c:1207
 msgid "cover letter needs email format"
 msgstr "la carta de presentació necessita un format de correu electrònic"
 
-#: builtin/log.c:1213
 msgid "failed to create cover-letter file"
 msgstr "s'ha produït un error en crear el fitxer de carta de presentació"
 
-#: builtin/log.c:1300
 #, c-format
 msgid "insane in-reply-to: %s"
 msgstr "in-reply-to boig: %s"
 
-#: builtin/log.c:1327
 msgid "git format-patch [<options>] [<since> | <revision-range>]"
 msgstr "git format-patch [<opcions>] [<des-de> | <rang-de-revisions>]"
 
-#: builtin/log.c:1385
 msgid "two output directories?"
 msgstr "dos directoris de sortida?"
 
-#: builtin/log.c:1536 builtin/log.c:2369 builtin/log.c:2371 builtin/log.c:2383
 #, c-format
 msgid "unknown commit %s"
 msgstr "comissió desconeguda %s"
 
-#: builtin/log.c:1547 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:1556
 msgid "could not find exact merge base"
 msgstr "no s'ha pogut trobar la base exacta de la fusió"
 
-#: builtin/log.c:1566
 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"
@@ -17874,410 +7494,316 @@ msgid ""
 msgstr ""
 "no s'ha pogut obtenir la font, si voleu registrar la comissió base\n"
 "automàticament, useu git branch --set-upstream-to per a seguir una\n"
-"una branca remota. També podeu especificar la comissió base amb --base=<base-commit-id> manualment"
+"una branca remota. També podeu especificar la comissió base amb --base=<base-"
+"commit-id> manualment"
 
-#: builtin/log.c:1589
 msgid "failed to find exact merge base"
 msgstr "no s'ha pogut trobar la base exacta de la fusió"
 
-#: builtin/log.c:1606
 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:1616
 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:1674
 msgid "cannot get patch id"
 msgstr "no es pot obtenir l'id del pedaç"
 
-#: builtin/log.c:1737
 msgid "failed to infer range-diff origin of current series"
 msgstr ""
 "no s'ha pogut inferir el rang de diferències d'origen de les sèries actuals"
 
-#: builtin/log.c:1739
 #, c-format
 msgid "using '%s' as range-diff origin of current series"
-msgstr ""
-"utilitzant «%s» com a origen de rang de diferències de la sèrie actual"
+msgstr "utilitzant «%s» com a origen de rang de diferències de la sèrie actual"
 
-#: builtin/log.c:1783
 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:1786
 msgid "use [PATCH] even with multiple patches"
 msgstr "usa [PATCH] fins i tot amb múltiples pedaços"
 
-#: builtin/log.c:1790
 msgid "print patches to standard out"
 msgstr "imprimeix els pedaços a la sortida estàndard"
 
-#: builtin/log.c:1792
 msgid "generate a cover letter"
 msgstr "genera una carta de presentació"
 
-#: builtin/log.c:1794
 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:1795
 msgid "sfx"
 msgstr "sufix"
 
-#: builtin/log.c:1796
 msgid "use <sfx> instead of '.patch'"
 msgstr "usa <sufix> en lloc de «.patch»"
 
-#: builtin/log.c:1798
 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:1799
 msgid "reroll-count"
 msgstr "reroll-count"
 
-#: builtin/log.c:1800
 msgid "mark the series as Nth re-roll"
 msgstr "marca la sèrie com a l'enèsima llançada"
 
-#: builtin/log.c:1802
 msgid "max length of output filename"
 msgstr "mida màxima del nom del fitxer de sortida"
 
-#: builtin/log.c:1804
 msgid "use [RFC PATCH] instead of [PATCH]"
 msgstr "useu [RFC PATCH] en comptes de [PATCH]"
 
-#: builtin/log.c:1807
 msgid "cover-from-description-mode"
 msgstr "cover-from-description-mode"
 
-#: builtin/log.c:1808
 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"
 
-#: builtin/log.c:1810
 msgid "use [<prefix>] instead of [PATCH]"
 msgstr "useu [<prefix>] en comptes de [PATCH]"
 
-#: builtin/log.c:1813
 msgid "store resulting files in <dir>"
 msgstr "emmagatzema els fitxers resultants a <directori>"
 
-#: builtin/log.c:1816
 msgid "don't strip/add [PATCH]"
 msgstr "no despullis/afegeixis [PATCH]"
 
-#: builtin/log.c:1819
 msgid "don't output binary diffs"
 msgstr "no emetis diferències binàries"
 
-#: builtin/log.c:1821
 msgid "output all-zero hash in From header"
 msgstr "emet un hash de tots zeros en la capçalera From"
 
-#: builtin/log.c:1823
 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:1825
 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:1827
 msgid "Messaging"
 msgstr "Missatgeria"
 
-#: builtin/log.c:1828
 msgid "header"
 msgstr "capçalera"
 
-#: builtin/log.c:1829
 msgid "add email header"
 msgstr "afegeix una capçalera de correu electrònic"
 
-#: builtin/log.c:1830 builtin/log.c:1831
 msgid "email"
 msgstr "correu electrònic"
 
-#: builtin/log.c:1830
 msgid "add To: header"
 msgstr "afegeix la capçalera To:"
 
-#: builtin/log.c:1831
 msgid "add Cc: header"
 msgstr "afegeix la capçalera Cc:"
 
-#: builtin/log.c:1832
 msgid "ident"
 msgstr "identitat"
 
-#: builtin/log.c:1833
 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:1835
 msgid "message-id"
 msgstr "ID de missatge"
 
-#: builtin/log.c:1836
 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:1837 builtin/log.c:1840
 msgid "boundary"
 msgstr "límit"
 
-#: builtin/log.c:1838
 msgid "attach the patch"
 msgstr "adjunta el pedaç"
 
-#: builtin/log.c:1841
 msgid "inline the patch"
 msgstr "posa el pedaç en el cos"
 
-#: builtin/log.c:1845
 msgid "enable message threading, styles: shallow, deep"
 msgstr "habilita l'enfilada de missatges, estils: shallow, deep"
 
-#: builtin/log.c:1847
 msgid "signature"
 msgstr "signatura"
 
-#: builtin/log.c:1848
 msgid "add a signature"
 msgstr "afegeix una signatura"
 
-#: builtin/log.c:1849
 msgid "base-commit"
 msgstr "comissió base"
 
-#: builtin/log.c:1850
 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:1853
 msgid "add a signature from a file"
 msgstr "afegeix una signatura des d'un fitxer"
 
-#: builtin/log.c:1854
 msgid "don't print the patch filenames"
 msgstr "no imprimeixis els noms de fitxer del pedaç"
 
-#: builtin/log.c:1856
 msgid "show progress while generating patches"
 msgstr "mostra el progrés durant la generació de pedaços"
 
-#: builtin/log.c:1858
 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:1861
 msgid "show changes against <refspec> in cover letter or single patch"
 msgstr ""
-"mostra els canvis contra <refspec> a la carta de presentació o a un sol "
-"pedaç"
+"mostra els canvis contra <refspec> a la carta de presentació o a un sol pedaç"
 
-#: builtin/log.c:1863 builtin/range-diff.c:28
 msgid "percentage by which creation is weighted"
 msgstr "percentatge pel qual la creació és ponderada"
 
-#: builtin/log.c:1953
 #, c-format
 msgid "invalid ident line: %s"
 msgstr "línia d'identitat no vàlida: %s"
 
-#: builtin/log.c:1978
 msgid "--name-only does not make sense"
 msgstr "--name-only no té sentit"
 
-#: builtin/log.c:1980
 msgid "--name-status does not make sense"
 msgstr "--name-status no té sentit"
 
-#: builtin/log.c:1982
 msgid "--check does not make sense"
 msgstr "--check no té sentit"
 
-#: builtin/log.c:1984
 msgid "--remerge-diff does not make sense"
 msgstr "--remerge-diff no té sentit"
 
-#: builtin/log.c:2129
+#, c-format
+msgid "could not create directory '%s'"
+msgstr "no s'ha pogut crear el directori «%s»"
+
 msgid "--interdiff requires --cover-letter or single patch"
 msgstr "--interdiff requereix --cover-letter o un sol pedaç"
 
-#: builtin/log.c:2133
 msgid "Interdiff:"
 msgstr "Interdiff:"
 
-#: builtin/log.c:2134
 #, c-format
 msgid "Interdiff against v%d:"
 msgstr "Interdiff contra v%d:"
 
-#: builtin/log.c:2144
 msgid "--range-diff requires --cover-letter or single patch"
 msgstr "--range-diff requereix --cover-letter o un sol pedaç"
 
-#: builtin/log.c:2152
 msgid "Range-diff:"
 msgstr "Diferència de l'interval:"
 
-#: builtin/log.c:2153
 #, c-format
 msgid "Range-diff against v%d:"
 msgstr "Diferència de l'interval contra el v%d:"
 
-#: builtin/log.c:2164
 #, c-format
 msgid "unable to read signature file '%s'"
 msgstr "no s'ha pogut llegir el fitxer de signatura «%s»"
 
-#: builtin/log.c:2200
 msgid "Generating patches"
 msgstr "S'estan generant els pedaços"
 
-#: builtin/log.c:2244
 msgid "failed to create output files"
 msgstr "no s'han pogut crear els fitxers de sortida"
 
-#: builtin/log.c:2304
 msgid "git cherry [-v] [<upstream> [<head> [<limit>]]]"
 msgstr "git cherry [-v] [<font> [<cap> [<límit>]]]"
 
-#: builtin/log.c:2358
 #, 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:564
 msgid "git ls-files [<options>] [<file>...]"
 msgstr "git ls-files [<opcions>] [<fitxer>...]"
 
-#: builtin/ls-files.c:618
 msgid "separate paths with the NUL character"
 msgstr "separa els camins amb el caràcter NUL"
 
-#: builtin/ls-files.c:620
 msgid "identify the file status with tags"
 msgstr "identifica l'estat de fitxer amb etiquetes"
 
-#: builtin/ls-files.c:622
 msgid "use lowercase letters for 'assume unchanged' files"
 msgstr "usa lletres minúscules per als fitxers «assume unchanged»"
 
-#: builtin/ls-files.c:624
 msgid "use lowercase letters for 'fsmonitor clean' files"
 msgstr "usa lletres minúscules per als fitxers «fsmonitor clean»"
 
-#: builtin/ls-files.c:626
 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:628
 msgid "show deleted files in the output"
 msgstr "mostra en la sortida els fitxers suprimits"
 
-#: builtin/ls-files.c:630
 msgid "show modified files in the output"
 msgstr "mostra en la sortida els fitxers modificats"
 
-#: builtin/ls-files.c:632
 msgid "show other files in the output"
 msgstr "mostra en la sortida els altres fitxers"
 
-#: builtin/ls-files.c:634
 msgid "show ignored files in the output"
 msgstr "mostra en la sortida els fitxers ignorats"
 
-#: builtin/ls-files.c:637
 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:639
 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:641
 msgid "show 'other' directories' names only"
 msgstr "mostra només els noms dels directoris «other»"
 
-#: builtin/ls-files.c:643
 msgid "show line endings of files"
 msgstr "mostra els terminadors de línia dels fitxers"
 
-#: builtin/ls-files.c:645
 msgid "don't show empty directories"
 msgstr "no mostris els directoris buits"
 
-#: builtin/ls-files.c:648
 msgid "show unmerged files in the output"
 msgstr "mostra en la sortida els fitxers sense fusionar"
 
-#: builtin/ls-files.c:650
 msgid "show resolve-undo information"
 msgstr "mostra la informació de resolució de desfet"
 
-#: builtin/ls-files.c:652
 msgid "skip files matching pattern"
 msgstr "omet els fitxers coincidents amb el patró"
 
-#: builtin/ls-files.c:655
 msgid "read exclude patterns from <file>"
 msgstr "llegeix els patrons des de <file>"
 
-#: builtin/ls-files.c:658
 msgid "read additional per-directory exclude patterns in <file>"
 msgstr "llegeix els patrons addicionals d'exclusió per directori en <fitxer>"
 
-#: builtin/ls-files.c:660
 msgid "add the standard git exclusions"
 msgstr "afegeix les exclusions estàndards de git"
 
-#: builtin/ls-files.c:664
 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:669
 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:670
 msgid "tree-ish"
 msgstr "arbre"
 
-#: builtin/ls-files.c:671
 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:673
 msgid "show debugging data"
 msgstr "mostra les dades de depuració"
 
-#: builtin/ls-files.c:675
 msgid "suppress duplicate entries"
 msgstr "suprimeix les entrades duplicades"
 
-#: builtin/ls-files.c:677
 msgid "show sparse directories in the presence of a sparse index"
 msgstr "mostra els directoris dispersos en presència d'un índex dispers"
 
-#: builtin/ls-remote.c:9
 msgid ""
 "git ls-remote [--heads] [--tags] [--refs] [--upload-pack=<exec>]\n"
 "              [-q | --quiet] [--exit-code] [--get-url]\n"
@@ -18287,467 +7813,365 @@ msgstr ""
 "              [-q | --quiet] [--exit-code] [--get-url]\n"
 "              [--symref] [<repository> [<refs>...]]"
 
-#: builtin/ls-remote.c:60
 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:1131
 msgid "exec"
 msgstr "executable"
 
-#: builtin/ls-remote.c:62 builtin/ls-remote.c:64
 msgid "path of git-upload-pack on the remote host"
 msgstr "camí a git-upload-pack en la màquina remota"
 
-#: builtin/ls-remote.c:66
 msgid "limit to tags"
 msgstr "limita a etiquetes"
 
-#: builtin/ls-remote.c:67
 msgid "limit to heads"
 msgstr "limita a caps"
 
-#: builtin/ls-remote.c:68
 msgid "do not show peeled tags"
 msgstr "no mostris les etiquetes pelades"
 
-#: builtin/ls-remote.c:70
 msgid "take url.<base>.insteadOf into account"
 msgstr "tingues en compte url.<base>.insteadOf"
 
-#: builtin/ls-remote.c:73
 msgid "exit with exit code 2 if no matching refs are found"
 msgstr "surt amb codi de sortida 2 si no es troba cap referència coincident"
 
-#: builtin/ls-remote.c:76
 msgid "show underlying ref in addition to the object pointed by it"
 msgstr "mostra la referència subjacent a més de l'objecte que assenyali"
 
-#: builtin/ls-tree.c:36
 msgid "git ls-tree [<options>] <tree-ish> [<path>...]"
 msgstr "git ls-tree [<opcions>] <arbre> [<camí>...]"
 
-#: builtin/ls-tree.c:54
-#, c-format, fuzzy
+#, fuzzy, c-format
 msgid "could not get object info about '%s'"
 msgstr "no s'ha pogut obtenir la informació de l'objecte sobre «%s»"
 
-#: builtin/ls-tree.c:79
-#, c-format, fuzzy
+#, fuzzy, c-format
 msgid "bad ls-tree format: element '%s' does not start with '('"
 msgstr "format ls-tree dolent: l'element '%s' no comença amb '('"
 
-#: builtin/ls-tree.c:83
-#, c-format, fuzzy
+#, fuzzy, c-format
 msgid "bad ls-tree format: element '%s' does not end in ')'"
 msgstr "format ls-tree dolent: l'element '%s' no acaba en ')'"
 
-#: builtin/ls-tree.c:109
-#, c-format, fuzzy
+#, fuzzy, c-format
 msgid "bad ls-tree format: %%%.*s"
 msgstr "format incorrecte de ls-tree:%%.*s"
 
-#: builtin/ls-tree.c:336
 msgid "only show trees"
 msgstr "mostra només els arbres"
 
-#: builtin/ls-tree.c:338
 msgid "recurse into subtrees"
 msgstr "inclou recursivament als subarbres"
 
-#: builtin/ls-tree.c:340
 msgid "show trees when recursing"
 msgstr "mostra els arbres quan es treballa recursivament"
 
-#: builtin/ls-tree.c:343
 msgid "terminate entries with NUL byte"
 msgstr "acaba les entrades amb un octet NUL"
 
-#: builtin/ls-tree.c:344
 msgid "include object size"
 msgstr "mida de l'objecte d'inclusió"
 
-#: builtin/ls-tree.c:346 builtin/ls-tree.c:348
 msgid "list only filenames"
 msgstr "llista només els noms de fitxer"
 
-#: builtin/ls-tree.c:350
 #, fuzzy
 msgid "list only objects"
 msgstr "llista només els objectes"
 
-#: builtin/ls-tree.c:353
 msgid "use full path names"
 msgstr "usa els noms de camí complets"
 
-#: builtin/ls-tree.c:355
 msgid "list entire tree; not just current directory (implies --full-name)"
 msgstr ""
 "llista l'arbre sencer; no només el directori actual (implica --full-name)"
 
-#: builtin/ls-tree.c:391
 #, fuzzy
 msgid "--format can't be combined with other format-altering options"
 msgstr "--format no es pot combinar amb altres opcions d'alteració de format"
 
 #. TRANSLATORS: keep <> in "<" mail ">" info.
-#: builtin/mailinfo.c:14
 msgid "git mailinfo [<options>] <msg> <patch> < mail >info"
 msgstr "git mailinfo [<options>] <msg> <patch> < mail >info"
 
-#: builtin/mailinfo.c:58
 msgid "keep subject"
 msgstr "mantén l'assumpte"
 
-#: builtin/mailinfo.c:60
 msgid "keep non patch brackets in subject"
 msgstr "mantén els parèntesis que no són del pedaç en l'assumpte"
 
-#: builtin/mailinfo.c:62
 msgid "copy Message-ID to the end of commit message"
 msgstr "copia el Message-ID al final del missatge de comissió"
 
-#: builtin/mailinfo.c:64
 msgid "re-code metadata to i18n.commitEncoding"
 msgstr "torna a codificar les metadades a i18n.commitEncoding"
 
-#: builtin/mailinfo.c:67
 msgid "disable charset re-coding of metadata"
 msgstr "inhabilita la recodificació del joc de caràcters de les metadades"
 
-#: builtin/mailinfo.c:69
 msgid "encoding"
 msgstr "codificació"
 
-#: builtin/mailinfo.c:70
 msgid "re-code metadata to this encoding"
 msgstr "recodifica les metadades en aquesta codificació"
 
-#: builtin/mailinfo.c:72
 msgid "use scissors"
 msgstr "usa les tisores"
 
-#: builtin/mailinfo.c:73
 msgid "<action>"
 msgstr "<acció>"
 
-#: builtin/mailinfo.c:74
 msgid "action when quoted CR is found"
 msgstr "acció quan es troba un CR en una cita"
 
-#: builtin/mailinfo.c:77
 msgid "use headers in message's body"
 msgstr "utilitza les capçaleres en el cos del missatge"
 
-#: builtin/mailsplit.c:227
 #, fuzzy
 msgid "reading patches from stdin/tty..."
 msgstr "llegir pedaços de stdin/tty..."
 
-#: builtin/mailsplit.c:242
 #, c-format
 msgid "empty mbox: '%s'"
 msgstr "mbox buit: «%s»"
 
-#: builtin/merge-base.c:32
 msgid "git merge-base [-a | --all] <commit> <commit>..."
 msgstr "git merge-base [-a | --all] <comissió> <comissió>..."
 
-#: builtin/merge-base.c:33
 msgid "git merge-base [-a | --all] --octopus <commit>..."
 msgstr "git merge-base [-a | --all] --octopus <comissió>..."
 
-#: builtin/merge-base.c:34
 msgid "git merge-base --independent <commit>..."
 msgstr "git merge-base --independent <comissió>..."
 
-#: builtin/merge-base.c:35
 msgid "git merge-base --is-ancestor <commit> <commit>"
 msgstr "git merge-base --is-ancestor <comissió> <comissió>"
 
-#: builtin/merge-base.c:36
 msgid "git merge-base --fork-point <ref> [<commit>]"
 msgstr "git merge-base --fork-point <referència> [<comissió>]"
 
-#: builtin/merge-base.c:144
 msgid "output all common ancestors"
 msgstr "emet tots els avantpassats comuns"
 
-#: builtin/merge-base.c:146
 msgid "find ancestors for a single n-way merge"
 msgstr "troba els avantpassats per a una sola fusió d'n vies"
 
-#: builtin/merge-base.c:148
 msgid "list revs not reachable from others"
 msgstr "llista les revisions no abastables d'altres"
 
-#: builtin/merge-base.c:150
 msgid "is the first one ancestor of the other?"
 msgstr "és la primera un avantpassat de l'altre?"
 
-#: builtin/merge-base.c:152
 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"
 msgstr "envia els resultats a la sortida estàndard"
 
-#: builtin/merge-file.c:36
 msgid "use a diff3 based merge"
 msgstr "usa una fusió basada en diff3"
 
-#: builtin/merge-file.c:37
 msgid "use a zealous diff3 based merge"
 msgstr "usa una fusió basada en zealous diff3"
 
-#: builtin/merge-file.c:39
 msgid "for conflicts, use our version"
 msgstr "en conflictes, usa la nostra versió"
 
-#: builtin/merge-file.c:41
 msgid "for conflicts, use their version"
 msgstr "en conflictes, usa la seva versió"
 
-#: builtin/merge-file.c:43
 msgid "for conflicts, use a union version"
 msgstr "en conflictes, usa una versió d'unió"
 
-#: builtin/merge-file.c:46
 msgid "for conflicts, use this marker size"
 msgstr "en conflictes, usa aquesta mida de marcador"
 
-#: builtin/merge-file.c:47
 msgid "do not warn about conflicts"
 msgstr "no avisis de conflictes"
 
-#: builtin/merge-file.c:49
 msgid "set labels for file1/orig-file/file2"
 msgstr "estableix les etiquetes per a fitxer1/fitxer-original/fitxer2"
 
-#: builtin/merge-recursive.c:47
 #, c-format
 msgid "unknown option %s"
 msgstr "opció desconeguda %s"
 
-#: builtin/merge-recursive.c:53
 #, c-format
 msgid "could not parse object '%s'"
 msgstr "no s'ha pogut analitzar l'objecte «%s»"
 
-#: builtin/merge-recursive.c:57
 #, c-format
 msgid "cannot handle more than %d base. Ignoring %s."
 msgid_plural "cannot handle more than %d bases. Ignoring %s."
 msgstr[0] "no es pot gestionar més d'%d base. S'està ignorant %s."
 msgstr[1] "no es poden gestionar més de %d bases. S'està ignorant %s."
 
-#: builtin/merge-recursive.c:65
 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-recursive.c:74 builtin/merge-recursive.c:76
 #, c-format
 msgid "could not resolve ref '%s'"
 msgstr "no s'ha pogut resoldre la referència «%s»"
 
-#: builtin/merge-recursive.c:82
 #, c-format
 msgid "Merging %s with %s\n"
 msgstr "S'està fusionant %s amb %s\n"
 
-#: builtin/merge.c:59
 msgid "git merge [<options>] [<commit>...]"
 msgstr "git merge [<opcions>] [<comissió>...]"
 
-#: builtin/merge.c:125
 msgid "switch `m' requires a value"
 msgstr "l'opció «m» requereix un valor"
 
-#: builtin/merge.c:148
 #, c-format
 msgid "option `%s' requires a value"
 msgstr "l'opció «%s» requereix un valor"
 
-#: builtin/merge.c:201
 #, 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:202
 #, c-format
 msgid "Available strategies are:"
 msgstr "Les estratègies disponibles són:"
 
-#: builtin/merge.c:207
 #, c-format
 msgid "Available custom strategies are:"
 msgstr "Les estratègies personalitzades disponibles són:"
 
-#: builtin/merge.c:258 builtin/pull.c:134
 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:261 builtin/pull.c:137
 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:262 builtin/pull.c:140
 msgid "(synonym to --stat)"
 msgstr "(sinònim de --stat)"
 
-#: builtin/merge.c:264 builtin/pull.c:143
 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:267 builtin/pull.c:149
 msgid "create a single commit instead of doing a merge"
 msgstr "crea una única comissió en lloc de fusionar"
 
-#: builtin/merge.c:269 builtin/pull.c:152
 msgid "perform a commit if the merge succeeds (default)"
 msgstr "realitza una comissió si la fusió té èxit (per defecte)"
 
-#: builtin/merge.c:271 builtin/pull.c:155
 msgid "edit message before committing"
 msgstr "edita el missatge abans de cometre"
 
-#: builtin/merge.c:273
 msgid "allow fast-forward (default)"
 msgstr "permet l'avanç ràpid (per defecte)"
 
-#: builtin/merge.c:275 builtin/pull.c:162
 msgid "abort if fast-forward is not possible"
 msgstr "avorta si l'avanç ràpid no és possible"
 
-#: builtin/merge.c:279 builtin/pull.c:168
 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:280 builtin/notes.c:785 builtin/pull.c:172
-#: builtin/rebase.c:1145 builtin/revert.c:114
 msgid "strategy"
 msgstr "estratègia"
 
-#: builtin/merge.c:281 builtin/pull.c:173
 msgid "merge strategy to use"
 msgstr "estratègia de fusió a usar"
 
-#: builtin/merge.c:282 builtin/pull.c:176
 msgid "option=value"
 msgstr "opció=valor"
 
-#: builtin/merge.c:283 builtin/pull.c:177
 msgid "option for selected merge strategy"
 msgstr "opció per a l'estratègia de fusió seleccionada"
 
-#: builtin/merge.c:285
 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:291
 msgid "use <name> instead of the real target"
 msgstr "usa <nom> en lloc de destí real"
 
-#: builtin/merge.c:294
 msgid "abort the current in-progress merge"
 msgstr "avorta la fusió en curs actual"
 
-#: builtin/merge.c:296
 msgid "--abort but leave index and working tree alone"
 msgstr "--abort però deixa l'índex i l'arbre de treball intactes"
 
-#: builtin/merge.c:298
 msgid "continue the current in-progress merge"
 msgstr "continua la fusió en curs actual"
 
-#: builtin/merge.c:300 builtin/pull.c:184
 msgid "allow merging unrelated histories"
 msgstr "permet fusionar històries no relacionades"
 
-#: builtin/merge.c:307
 msgid "bypass pre-merge-commit and commit-msg hooks"
 msgstr "evita els lligams pre-merge-commit i commit-msg"
 
-#: builtin/merge.c:323
 msgid "could not run stash."
 msgstr "no s'ha pogut executar «stash»."
 
-#: builtin/merge.c:328
 msgid "stash failed"
 msgstr "l'«stash» ha fallat"
 
-#: builtin/merge.c:333
 #, c-format
 msgid "not a valid object: %s"
 msgstr "no és un objecte vàlid: %s"
 
-#: builtin/merge.c:355 builtin/merge.c:372
 msgid "read-tree failed"
 msgstr "read-tree ha fallat"
 
-#: builtin/merge.c:403
 msgid "Already up to date. (nothing to squash)"
 msgstr "Ja està actualitzat. (res a fer «squash»)"
 
-#: builtin/merge.c:417
+msgid "Already up to date."
+msgstr "Ja està al dia."
+
 #, c-format
 msgid "Squash commit -- not updating HEAD\n"
 msgstr "Comissió «squash» -- no s'està actualitzant HEAD\n"
 
-#: builtin/merge.c:467
 #, c-format
 msgid "No merge message -- not updating HEAD\n"
 msgstr "Cap missatge de fusió -- no s'està actualitzant HEAD\n"
 
-#: builtin/merge.c:517
 #, c-format
 msgid "'%s' does not point to a commit"
 msgstr "«%s» no assenyala una comissió"
 
-#: builtin/merge.c:605
 #, c-format
 msgid "Bad branch.%s.mergeoptions string: %s"
 msgstr "Cadena branch.%s.mergeoptions incorrecta: %s"
 
-#: builtin/merge.c:732
+msgid "Unable to write index."
+msgstr "No s'ha pogut escriure l'índex."
+
 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:745
 #, c-format
 msgid "unknown strategy option: -X%s"
 msgstr "opció d'estratègia desconeguda: -X%s"
 
-#: builtin/merge.c:764 t/helper/test-fast-rebase.c:223
 #, c-format
 msgid "unable to write %s"
 msgstr "no s'ha pogut escriure %s"
 
-#: builtin/merge.c:816
 #, c-format
 msgid "Could not read from '%s'"
 msgstr "No s'ha pogut llegir de «%s»"
 
-#: builtin/merge.c:825
 #, 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:831
 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"
@@ -18757,11 +8181,9 @@ msgstr ""
 "necessària, especialment si es fusiona una branca amb funcionalitat nova.\n"
 "\n"
 
-#: builtin/merge.c:836
 msgid "An empty message aborts the commit.\n"
 msgstr "Un missatge buit interromp la comissió.\n"
 
-#: builtin/merge.c:839
 #, c-format
 msgid ""
 "Lines starting with '%c' will be ignored, and an empty message aborts\n"
@@ -18770,74 +8192,62 @@ msgstr ""
 "Les línies que comencen amb «%c» seran ignorades i un missatge buit "
 "interromp la comissió.\n"
 
-#: builtin/merge.c:900
 msgid "Empty commit message."
 msgstr "El missatge de comissió és buit."
 
-#: builtin/merge.c:915
 #, c-format
 msgid "Wonderful.\n"
 msgstr "Meravellós.\n"
 
-#: builtin/merge.c:976
 #, 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:1015
 msgid "No current branch."
 msgstr "No hi ha cap branca actual."
 
-#: builtin/merge.c:1017
 msgid "No remote for the current branch."
 msgstr "No hi ha cap remot per a la branca actual."
 
-#: builtin/merge.c:1019
 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:1024
 #, 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:1081
 #, c-format
 msgid "Bad value '%s' in environment '%s'"
 msgstr "Valor incorrecte «%s» en l'entorn «%s»"
 
-#: builtin/merge.c:1183
+#, c-format
+msgid "could not close '%s'"
+msgstr "no s'ha pogut tancar «%s»"
+
 #, c-format
 msgid "not something we can merge in %s: %s"
 msgstr "no és quelcom que puguem fusionar en %s: %s"
 
-#: builtin/merge.c:1217
 msgid "not something we can merge"
 msgstr "no és quelcom que puguem fusionar"
 
-#: builtin/merge.c:1330
 msgid "--abort expects no arguments"
 msgstr "--abort no espera cap argument"
 
-#: builtin/merge.c:1334
 msgid "There is no merge to abort (MERGE_HEAD missing)."
 msgstr "No hi ha fusió a avortar (manca MERGE_HEAD)."
 
-#: builtin/merge.c:1352
 msgid "--quit expects no arguments"
 msgstr "--quit no espera cap argument"
 
-#: builtin/merge.c:1365
 msgid "--continue expects no arguments"
 msgstr "--continue no espera cap argument"
 
-#: builtin/merge.c:1369
 msgid "There is no merge in progress (MERGE_HEAD missing)."
 msgstr "No hi ha cap fusió en curs (manca MERGE_HEAD)."
 
-#: builtin/merge.c:1385
 msgid ""
 "You have not concluded your merge (MERGE_HEAD exists).\n"
 "Please, commit your changes before you merge."
@@ -18845,7 +8255,6 @@ msgstr ""
 "No heu conclòs la vostra fusió (MERGE_HEAD existeix).\n"
 "Cometeu els vostres canvis abans de fusionar."
 
-#: builtin/merge.c:1392
 msgid ""
 "You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists).\n"
 "Please, commit your changes before you merge."
@@ -18853,134 +8262,109 @@ msgstr ""
 "No heu conclòs el vostre «cherry pick» (CHERRY_PICK_HEAD existeix).\n"
 "Cometeu els vostres canvis abans de fusionar."
 
-#: builtin/merge.c:1395
 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:1427
 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:1444
 msgid "Squash commit into empty head not supported yet"
 msgstr "Una comissió «squash» a un HEAD buit encara no es permet"
 
-#: builtin/merge.c:1446
 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:1451
 #, c-format
 msgid "%s - not something we can merge"
 msgstr "%s - no és una cosa que puguem fusionar"
 
-#: builtin/merge.c:1453
 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:1540
 msgid "refusing to merge unrelated histories"
 msgstr "s'està refusant fusionar històries no relacionades"
 
-#: builtin/merge.c:1559
 #, c-format
 msgid "Updating %s..%s\n"
 msgstr "S'estan actualitzant %s..%s\n"
 
-#: builtin/merge.c:1606
 #, 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:1613
 #, c-format
 msgid "Nope.\n"
 msgstr "No.\n"
 
-#: builtin/merge.c:1671 builtin/merge.c:1737
 #, c-format
 msgid "Rewinding the tree to pristine...\n"
 msgstr "S'està rebobinant l'arbre a la pristina...\n"
 
-#: builtin/merge.c:1675
 #, c-format
 msgid "Trying merge strategy %s...\n"
 msgstr "S'està intentant l'estratègia de fusió %s...\n"
 
-#: builtin/merge.c:1727
 #, c-format
 msgid "No merge strategy handled the merge.\n"
 msgstr "Cap estratègia de fusió ha gestionat la fusió.\n"
 
-#: builtin/merge.c:1729
 #, c-format
 msgid "Merge with strategy %s failed.\n"
 msgstr "L'estratègia de fusió %s ha fallat.\n"
 
-#: builtin/merge.c:1739
 #, 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:1753
 #, 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:27
 #, c-format
 msgid "warning: tag input does not pass fsck: %s"
 msgstr "avís: l'entrada d'etiqueta no passa fsck: %s"
 
-#: builtin/mktag.c:38
 #, c-format
 msgid "error: tag input does not pass fsck: %s"
 msgstr "error: l'entrada d'etiqueta no passa fsck: %s"
 
-#: builtin/mktag.c:41
 #, c-format
 msgid "%d (FSCK_IGNORE?) should never trigger this callback"
 msgstr "%d (FSCK_IGNORE?) no hauria d'activar mai aquesta crida de retorn"
 
-#: builtin/mktag.c:56
 #, c-format
 msgid "could not read tagged object '%s'"
 msgstr "no s'ha pogut llegir l'objecte etiquetat «%s»"
 
-#: builtin/mktag.c:59
 #, c-format
 msgid "object '%s' tagged as '%s', but is a '%s' type"
 msgstr "l'objecte «%s» s'ha etiquetat com a «%s», però és del tipus «%s»"
 
-#: builtin/mktag.c:97
+msgid "could not read from stdin"
+msgstr "no s'ha pogut llegir des de stdin"
+
 msgid "tag on stdin did not pass our strict fsck check"
 msgstr "l'etiqueta a stdin no ha passat la comprovació estricta del fsck"
 
-#: builtin/mktag.c:100
 msgid "tag on stdin did not refer to a valid object"
 msgstr "l'etiqueta a stdin no apunta a un objecte vàlid"
 
-#: builtin/mktag.c:103 builtin/tag.c:243
 msgid "unable to write tag file"
 msgstr "no s'ha pogut escriure el fitxer d'etiqueta"
 
-#: builtin/mktree.c:154
 msgid "input is NUL terminated"
 msgstr "l'entrada és acabada amb NUL"
 
-#: builtin/mktree.c:155 builtin/write-tree.c:26
 msgid "allow missing objects"
 msgstr "permet els objectes absents"
 
-#: builtin/mktree.c:156
 msgid "allow creation of more than one tree"
 msgstr "permet la creació de més d'un arbre"
 
-#: builtin/multi-pack-index.c:10
 msgid ""
 "git multi-pack-index [<options>] write [--preferred-pack=<pack>][--refs-"
 "snapshot=<path>]"
@@ -18988,47 +8372,41 @@ msgstr ""
 "git multi-pack-index [<options>] write [--preferred-pack=<pack>][--refs-"
 "snapshot=<path>]"
 
-#: builtin/multi-pack-index.c:14
 msgid "git multi-pack-index [<options>] verify"
 msgstr "git multi-pack-index [<opcions>] verify"
 
-#: builtin/multi-pack-index.c:17
 msgid "git multi-pack-index [<options>] expire"
 msgstr "git multi-pack-index [<opcions>] expire"
 
-#: builtin/multi-pack-index.c:20
 msgid "git multi-pack-index [<options>] repack [--batch-size=<size>]"
 msgstr "git multi-pack-index [<opcions>] repack [--batch-size=<mida>]"
 
-#: builtin/multi-pack-index.c:57
+#, fuzzy
+msgid "directory"
+msgstr "fitxer/directori"
+
 msgid "object directory containing set of packfile and pack-index pairs"
 msgstr ""
 "directori de l'objecte que conté el conjunt de parells de fitxers i índexs "
 "de paquets"
 
-#: builtin/multi-pack-index.c:98
 msgid "preferred-pack"
 msgstr "paquet preferit"
 
-#: builtin/multi-pack-index.c:99
 msgid "pack for reuse when computing a multi-pack bitmap"
 msgstr ""
 "empaqueta per a reutilitzar quan es calcula un mapa de bits multipaquet"
 
-#: builtin/multi-pack-index.c:100
 msgid "write multi-pack bitmap"
 msgstr "escriu un map de bits multipaquet"
 
-#: builtin/multi-pack-index.c:105
 msgid "write multi-pack index containing only given indexes"
 msgstr "escriu un índex multipaquet que contingui només els índexs donats"
 
-#: builtin/multi-pack-index.c:107
 msgid "refs snapshot for selecting bitmap commits"
 msgstr ""
 "instantània de referències per a seleccionar les comissions de mapa de bits"
 
-#: builtin/multi-pack-index.c:206
 msgid ""
 "during repack, collect pack-files of smaller size into a batch that is "
 "larger than this size"
@@ -19036,356 +8414,277 @@ msgstr ""
 "durant el reempaquetament, recull els fitxers de paquets de mida més petita "
 "en un lot que és més gran que aquesta mida"
 
-#: builtin/mv.c:18
 msgid "git mv [<options>] <source>... <destination>"
 msgstr "git mv [<opcions>] <origen>... <destí>"
 
-#: builtin/mv.c:83
 #, c-format
 msgid "Directory %s is in index and no submodule?"
 msgstr "El directori %s és en l'índex i no hi ha cap submòdul?"
 
-#: builtin/mv.c:85
 msgid "Please stage your changes to .gitmodules or stash them to proceed"
 msgstr ""
 "Feu «stage» dels vostres canvis a .gitmodules o feu «stash» dels mateixos "
 "per a procedir"
 
-#: builtin/mv.c:103
 #, c-format
 msgid "%.*s is in index"
 msgstr "%.*s és en l'índex"
 
-#: builtin/mv.c:125
 msgid "force move/rename even if target exists"
 msgstr "força el moviment / canvi de nom encara que el destí existeixi"
 
-#: builtin/mv.c:127
 msgid "skip move/rename errors"
 msgstr "omet els errors de moviment / canvi de nom"
 
-#: builtin/mv.c:172
 #, c-format
 msgid "destination '%s' is not a directory"
 msgstr "el destí «%s» no és un directori"
 
-#: 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:190
 msgid "bad source"
 msgstr "origen incorrecte"
 
-#: 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:196
 msgid "cannot move directory over file"
 msgstr "no es pot moure un directori sobre un fitxer"
 
-#: builtin/mv.c:205
 msgid "source directory is empty"
 msgstr "el directori d'origen està buit"
 
-#: builtin/mv.c:231
 msgid "not under version control"
 msgstr "no està sota control de versions"
 
-#: builtin/mv.c:233
 msgid "conflicted"
 msgstr "en conflicte"
 
-#: builtin/mv.c:236
 msgid "destination exists"
 msgstr "el destí existeix"
 
-#: builtin/mv.c:244
 #, c-format
 msgid "overwriting '%s'"
 msgstr "s'està sobreescrivint «%s»"
 
-#: builtin/mv.c:247
 msgid "Cannot overwrite"
 msgstr "No es pot sobreescriure"
 
-#: builtin/mv.c:250
 msgid "multiple sources for the same target"
 msgstr "múltiples orígens per al mateix destí"
 
-#: builtin/mv.c:252
 msgid "destination directory does not exist"
 msgstr "el directori destí no existeix"
 
-#: builtin/mv.c:280
 #, c-format
 msgid "%s, source=%s, destination=%s"
 msgstr "%s, origen=%s, destí=%s"
 
-#: 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:314 builtin/remote.c:812 builtin/repack.c:861
 #, c-format
 msgid "renaming '%s' failed"
 msgstr "el canvi del nom de «%s» ha fallat"
 
-#: builtin/name-rev.c:524
 msgid "git name-rev [<options>] <commit>..."
 msgstr "git name-rev [<opcions>] <comissió>..."
 
-#: builtin/name-rev.c:525
 msgid "git name-rev [<options>] --all"
 msgstr "git name-rev [<opcions>] --all"
 
-#: builtin/name-rev.c:526
 msgid "git name-rev [<options>] --annotate-stdin"
 msgstr "git name-rev [<options>] --annotate-stdin"
 
-#: builtin/name-rev.c:583
 msgid "print only ref-based names (no object names)"
-msgstr ""
-"imprimeix només els noms basats en referències (no els noms d'objecte)"
+msgstr "imprimeix només els noms basats en referències (no els noms d'objecte)"
 
-#: builtin/name-rev.c:584
 msgid "only use tags to name the commits"
 msgstr "només usa les etiquetes per a anomenar les comissions"
 
-#: builtin/name-rev.c:586
 msgid "only use refs matching <pattern>"
 msgstr "només usa les referències que coincideixin amb <patró>"
 
-#: builtin/name-rev.c:588
 msgid "ignore refs matching <pattern>"
 msgstr "ignora les referències que coincideixin amb <patró>"
 
-#: builtin/name-rev.c:590
 msgid "list all commits reachable from all refs"
 msgstr "llista totes les comissions abastables de totes les referències"
 
-#: builtin/name-rev.c:591
-msgid "deprecated: use annotate-stdin instead"
+#, fuzzy
+msgid "deprecated: use --annotate-stdin instead"
 msgstr "obsolet: useu annotate-stdin"
 
-#: builtin/name-rev.c:592
 #, fuzzy
 msgid "annotate text from stdin"
 msgstr "anota el text de stdin"
 
-#: builtin/name-rev.c:593
 msgid "allow to print `undefined` names (default)"
 msgstr "permet imprimir els noms «undefined» (per defecte)"
 
-#: builtin/name-rev.c:599
 msgid "dereference tags in the input (internal use)"
 msgstr "desreferencia les etiquetes en l'entrada (ús intern)"
 
-#: builtin/notes.c:28
 msgid "git notes [--ref <notes-ref>] [list [<object>]]"
 msgstr "git notes [--ref <referència-de-notes>] [llista [<objecte>]]"
 
-#: 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>]"
 
-#: builtin/notes.c:30
 msgid "git notes [--ref <notes-ref>] copy [-f] <from-object> <to-object>"
 msgstr ""
 "git notes [--ref <referència-de-notes>] copy [-f] <d'objecte> <a-objecte>"
 
-#: 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>]"
 
-#: builtin/notes.c:32
 msgid "git notes [--ref <notes-ref>] edit [--allow-empty] [<object>]"
 msgstr ""
 "git notes [--ref <referència-de-notes>] edit [--allow-empty] [<objecte>]"
 
-#: builtin/notes.c:33
 msgid "git notes [--ref <notes-ref>] show [<object>]"
 msgstr "git notes [--ref <referència-de-notes>] show [<objecte>]"
 
-#: builtin/notes.c:34
 msgid ""
 "git notes [--ref <notes-ref>] merge [-v | -q] [-s <strategy>] <notes-ref>"
 msgstr ""
 "git notes [--ref <referència-de-notes>] merge [-v | -q] [-s <estratègia>] "
 "<referència-de-notes>"
 
-#: builtin/notes.c:37
 msgid "git notes [--ref <notes-ref>] remove [<object>...]"
 msgstr "git notes [--ref <referència-de-notes>] remove [<objecte>...]"
 
-#: builtin/notes.c:38
 msgid "git notes [--ref <notes-ref>] prune [-n] [-v]"
 msgstr "git notes [--ref <referència-de-notes>] prune [-n] [-v]"
 
-#: builtin/notes.c:39
 msgid "git notes [--ref <notes-ref>] get-ref"
 msgstr "git notes [--ref <referència-de-notes>] get-ref"
 
-#: builtin/notes.c:44
 msgid "git notes [list [<object>]]"
 msgstr "git notes [llista [<objecte>]]"
 
-#: builtin/notes.c:49
 msgid "git notes add [<options>] [<object>]"
 msgstr "git notes add [<opcions>] [<objecte>]"
 
-#: builtin/notes.c:54
 msgid "git notes copy [<options>] <from-object> <to-object>"
 msgstr "git notes copy [<opcions>] <d'objecte> <a-objecte>"
 
-#: builtin/notes.c:55
 msgid "git notes copy --stdin [<from-object> <to-object>]..."
 msgstr "git notes copy --stdin [<d'objecte> <a-objecte>]..."
 
-#: builtin/notes.c:60
 msgid "git notes append [<options>] [<object>]"
 msgstr "git notes append [<opcions>] [<objecte>]"
 
-#: builtin/notes.c:65
 msgid "git notes edit [<object>]"
 msgstr "git notes edit [<objecte>]"
 
-#: builtin/notes.c:70
 msgid "git notes show [<object>]"
 msgstr "git notes show [<objecte>]"
 
-#: builtin/notes.c:75
 msgid "git notes merge [<options>] <notes-ref>"
 msgstr "git notes merge [<opcions>] <referència-de-notes>"
 
-#: builtin/notes.c:76
 msgid "git notes merge --commit [<options>]"
 msgstr "git notes merge --commit [<opcions>]"
 
-#: builtin/notes.c:77
 msgid "git notes merge --abort [<options>]"
 msgstr "git notes merge --abort [<opcions>]"
 
-#: builtin/notes.c:82
 msgid "git notes remove [<object>]"
 msgstr "git notes remove [<objecte>]"
 
-#: builtin/notes.c:87
 msgid "git notes prune [<options>]"
 msgstr "git notes prune [<opcions>]"
 
-#: builtin/notes.c:97
 msgid "Write/edit the notes for the following object:"
 msgstr "Escriviu/editeu les notes per l'objecte següent:"
 
-#: builtin/notes.c:149
 #, c-format
 msgid "unable to start 'show' for object '%s'"
 msgstr "no s'ha pogut iniciar «show» per a l'objecte «%s»"
 
-#: builtin/notes.c:153
 msgid "could not read 'show' output"
 msgstr "no s'ha pogut llegir la sortida de «show»"
 
-#: builtin/notes.c:161
 #, c-format
 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:194
 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:203
 msgid "unable to write note object"
 msgstr "no s'ha pogut escriure l'objecte de nota"
 
-#: 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:240 builtin/tag.c:582
 #, c-format
 msgid "could not open or read '%s'"
 msgstr "no s'ha pogut obrir o llegir «%s»"
 
-#: 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:263
 #, c-format
 msgid "failed to read object '%s'."
 msgstr "s'ha produït un error en llegir l'objecte «%s»."
 
-#: 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:307
 #, c-format
 msgid "malformed input line: '%s'."
 msgstr "línia d'entrada mal formada: «%s»."
 
-#: 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: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: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:408 builtin/notes.c:574
 msgid "note contents as a string"
 msgstr "anota els continguts com a cadena"
 
-#: builtin/notes.c:411 builtin/notes.c:577
 msgid "note contents in a file"
 msgstr "anota els continguts en un fitxer"
 
-#: 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:417 builtin/notes.c:583
 msgid "reuse specified note object"
 msgstr "reusa l'objecte de nota especificat"
 
-#: builtin/notes.c:420 builtin/notes.c:586
 msgid "allow storing empty note"
 msgstr "permet l'emmagatzematge d'una nota buida"
 
-#: builtin/notes.c:421 builtin/notes.c:494
 msgid "replace existing notes"
 msgstr "reemplaça les notes existents"
 
-#: builtin/notes.c:446
 #, c-format
 msgid ""
 "Cannot add notes. Found existing notes for object %s. Use '-f' to overwrite "
@@ -19394,44 +8693,36 @@ msgstr ""
 "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: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:473 builtin/notes.c:635 builtin/notes.c:904
 #, c-format
 msgid "Removing note for object %s\n"
 msgstr "S'està eliminant la nota de l'objecte %s\n"
 
-#: builtin/notes.c:495
 msgid "read objects from stdin"
 msgstr "llegeix els objectes des de stdin"
 
-#: 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:515
 msgid "too few arguments"
 msgstr "massa pocs arguments"
 
-#: 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: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:601
 #, c-format
 msgid ""
 "The -m/-F/-c/-C options have been deprecated for the 'edit' subcommand.\n"
@@ -19440,166 +8731,132 @@ msgstr ""
 "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: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: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: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: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: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: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:737
 msgid "failed to resolve NOTES_MERGE_REF"
 msgstr "s'ha produït un error en resoldre NOTES_MERGE_REF"
 
-#: 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:766
 #, c-format
 msgid "unknown notes merge strategy %s"
 msgstr "estratègia de fusió de notes desconeguda %s"
 
-#: builtin/notes.c:782
 msgid "General options"
 msgstr "Opcions generals"
 
-#: builtin/notes.c:784
 msgid "Merge options"
 msgstr "Opcions de fusió"
 
-#: 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:788
 msgid "Committing unmerged notes"
 msgstr "S'estan cometent les notes sense fusionar"
 
-#: 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:792
 msgid "Aborting notes merge resolution"
 msgstr "S'està avortant la resolució de fusió de notes"
 
-#: builtin/notes.c:794
 msgid "abort notes merge"
 msgstr "avorta la fusió de notes"
 
-#: 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:810
 msgid "must specify a notes ref to merge"
 msgstr "cal especificar una referència de notes a fusionar"
 
-#: builtin/notes.c:834
 #, c-format
 msgid "unknown -s/--strategy: %s"
 msgstr "-s/--strategy desconeguda: %s"
 
-#: builtin/notes.c:874
 #, 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:878
 #, 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:880
 #, 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:899 builtin/tag.c:595
 #, 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:902
 #, c-format
 msgid "Object %s has no note\n"
 msgstr "L'objecte %s no té cap nota\n"
 
-#: builtin/notes.c:914
 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:917
 msgid "read object names from the standard input"
 msgstr "llegeix els noms d'objecte des de l'entrada estàndard"
 
-#: builtin/notes.c:956 builtin/prune.c:144 builtin/worktree.c:148
 msgid "do not remove, show only"
 msgstr "no eliminis, només mostra"
 
-#: builtin/notes.c:957
 msgid "report pruned notes"
 msgstr "informa de notes podades"
 
-#: builtin/notes.c:1000
 msgid "notes-ref"
 msgstr "referència de notes"
 
-#: builtin/notes.c:1001
 msgid "use notes from <notes-ref>"
 msgstr "usa les notes de <referència-de-notes>"
 
-#: builtin/notes.c:1036 builtin/stash.c:1802
 #, c-format
 msgid "unknown subcommand: %s"
 msgstr "subordre desconeguda: %s"
 
-#: 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: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:570
 #, c-format
 msgid ""
 "write_reuse_object: could not locate %s, expected at offset %<PRIuMAX> in "
@@ -19608,126 +8865,112 @@ msgstr ""
 "write_reuse_object: no s'ha pogut localitzar %s, s'esperava a la posició "
 "%<PRIuMAX> al paquet %s"
 
-#: builtin/pack-objects.c:578
 #, c-format
 msgid "bad packed object CRC for %s"
 msgstr "CRC de l'objecte empaquetat malmès per a %s"
 
-#: builtin/pack-objects.c:589
 #, c-format
 msgid "corrupt packed object for %s"
 msgstr "objecte empaquetat corrupte per a %s"
 
-#: builtin/pack-objects.c:720
 #, c-format
 msgid "recursive delta detected for object %s"
 msgstr "diferència recursiva detectada per a l'objecte  %s"
 
-#: builtin/pack-objects.c:939
 #, c-format
 msgid "ordered %u objects, expected %<PRIu32>"
 msgstr "ordenats %u objectes, s'esperaven %<PRIu32>"
 
-#: builtin/pack-objects.c:1034
 #, c-format
 msgid "expected object at offset %<PRIuMAX> in pack %s"
 msgstr "objecte esperat a la posició %<PRIuMAX> al paquet %s"
 
-#: builtin/pack-objects.c:1158
 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:1171
 msgid "Writing objects"
 msgstr "S'estan escrivint els objectes"
 
-#: builtin/pack-objects.c:1243 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:1276
+#, c-format
+msgid "failed utime() on %s"
+msgstr "ha fallat utime() a %s"
+
 msgid "failed to write bitmap index"
 msgstr "s'ha produït un error en escriure l'índex de mapa de bits"
 
-#: builtin/pack-objects.c:1302
 #, c-format
 msgid "wrote %<PRIu32> objects while expecting %<PRIu32>"
 msgstr "escrits %<PRIu32> objectes mentre s'esperaven %<PRIu32>"
 
-#: builtin/pack-objects.c:1544
 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:1992
 #, c-format
 msgid "delta base offset overflow in pack for %s"
 msgstr "desbordament del desplaçament base de diferències en paquet per a %s"
 
-#: builtin/pack-objects.c:2001
 #, c-format
 msgid "delta base offset out of bound for %s"
 msgstr "desplaçament base de diferències fora dels límits per a %s"
 
-#: builtin/pack-objects.c:2282
 msgid "Counting objects"
 msgstr "S'estan comptant els objectes"
 
-#: builtin/pack-objects.c:2447
+#, c-format
+msgid "unable to get size of %s"
+msgstr "no s'ha pogut obtenir la mida de %s"
+
 #, c-format
 msgid "unable to parse object header of %s"
 msgstr "no s'ha pogut analitzar la capçalera de l'objecte de %s"
 
-#: builtin/pack-objects.c:2517 builtin/pack-objects.c:2533
-#: builtin/pack-objects.c:2543
 #, c-format
 msgid "object %s cannot be read"
 msgstr "no es pot llegir l'objecte %s"
 
-#: builtin/pack-objects.c:2520 builtin/pack-objects.c:2547
 #, c-format
 msgid "object %s inconsistent object length (%<PRIuMAX> vs %<PRIuMAX>)"
 msgstr ""
 "l'objecte %s té una longitud d'objecte inconsistent (%<PRIuMAX> vs "
 "%<PRIuMAX>)"
 
-#: builtin/pack-objects.c:2557
 msgid "suboptimal pack - out of memory"
 msgstr "paquet subòptim - sense memòria"
 
-#: builtin/pack-objects.c:2872
 #, c-format
 msgid "Delta compression using up to %d threads"
 msgstr "Compressió de diferències usant fins a %d fils"
 
-#: builtin/pack-objects.c:3011
 #, 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"
+
+#, c-format
+msgid "unable to get type of object %s"
+msgstr "no s'ha pogut obtenir el tipus de l'objecte: %s"
 
-#: builtin/pack-objects.c:3097
 msgid "Compressing objects"
 msgstr "S'estan comprimint els objectes"
 
-#: builtin/pack-objects.c:3103
 msgid "inconsistency with delta count"
 msgstr "inconsistència amb el comptador de diferències"
 
-#: builtin/pack-objects.c:3182
 #, 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 uploadpack.blobpackfileuri ha de tenir la forma «<object-hash> "
 "<pack-hash> <uri>» (s'ha rebut «%s»)"
 
-#: builtin/pack-objects.c:3185
 #, c-format
 msgid ""
 "object already configured in another uploadpack.blobpackfileuri (got '%s')"
@@ -19735,18 +8978,30 @@ msgstr ""
 "l'objecte ja està configurat en un altre uploadpack.blobpackfileuri (s'ha "
 "rebut «%s»)"
 
-#: builtin/pack-objects.c:3220
 #, 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 al paquet %s"
 
-#: builtin/pack-objects.c:3348 builtin/pack-objects.c:3359
-#: builtin/pack-objects.c:3373
 #, c-format
 msgid "could not find pack '%s'"
 msgstr "no s'ha pogut trobar el paquet «%s»"
 
-#: builtin/pack-objects.c:3416
+#, fuzzy, c-format
+msgid "packfile %s cannot be accessed"
+msgstr "el fitxer de paquet %s no es pot mapar%s"
+
+#, fuzzy
+msgid "Enumerating cruft objects"
+msgstr "S'estan enumerant els objectes"
+
+#, fuzzy
+msgid "unable to add cruft objects"
+msgstr "no s'han pogut afegir els objectes recents"
+
+#, fuzzy
+msgid "Traversing cruft objects"
+msgstr "S'estan comprimint els objectes"
+
 #, c-format
 msgid ""
 "expected edge object ID, got garbage:\n"
@@ -19755,7 +9010,6 @@ msgstr ""
 "s'esperava un identificador vora de l'objecte, s'ha rebut brossa:\n"
 " %s"
 
-#: builtin/pack-objects.c:3422
 #, c-format
 msgid ""
 "expected object ID, got garbage:\n"
@@ -19764,252 +9018,222 @@ msgstr ""
 "s'esperava un identificador d'objecte, s'ha rebut brossa:\n"
 " %s"
 
-#: builtin/pack-objects.c:3540 builtin/pack-objects.c:3627
+#, fuzzy
+msgid "could not load cruft pack .mtimes"
+msgstr "no s'ha pogut carregar el paquet"
+
 msgid "cannot open pack index"
 msgstr "no s'ha pogut obrir l'índex del paquet"
 
-#: builtin/pack-objects.c:3549
 #, c-format
 msgid "loose object at %s could not be examined"
 msgstr "no s'ha pogut examinar l'objecte solt a %s"
 
-#: builtin/pack-objects.c:3635
 msgid "unable to force loose object"
 msgstr "no s'ha pogut forçar l'objecte solt"
 
-#: builtin/pack-objects.c:3763
 #, c-format
 msgid "not a rev '%s'"
 msgstr "«%s» no és una revisió"
 
-#: builtin/pack-objects.c:3766 builtin/rev-parse.c:1061
 #, c-format
 msgid "bad revision '%s'"
 msgstr "revisió incorrecta «%s»"
 
-#: builtin/pack-objects.c:3794
 msgid "unable to add recent objects"
 msgstr "no s'han pogut afegir els objectes recents"
 
-#: builtin/pack-objects.c:3847
 #, c-format
 msgid "unsupported index version %s"
 msgstr "versió d'índex no compatible %s"
 
-#: builtin/pack-objects.c:3851
 #, c-format
 msgid "bad index version '%s'"
 msgstr "versió d'índex incorrecta «%s»"
 
-#: builtin/pack-objects.c:3907
 msgid "<version>[,<offset>]"
 msgstr "<versió>[,<desplaçament>]"
 
-#: builtin/pack-objects.c:3908
 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:3911
 msgid "maximum size of each output pack file"
 msgstr "mida màxima de cada fitxer empaquetat de sortida"
 
-#: builtin/pack-objects.c:3913
 msgid "ignore borrowed objects from alternate object store"
 msgstr ""
 "ignora els objectes manllevats d'un emmagatzematge d'objectes alternatiu"
 
-#: builtin/pack-objects.c:3915
 msgid "ignore packed objects"
 msgstr "ignora els objectes empaquetats"
 
-#: builtin/pack-objects.c:3917
 msgid "limit pack window by objects"
 msgstr "limita la finestra d'empaquetament per objectes"
 
-#: builtin/pack-objects.c:3919
 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:3921
 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:3923
 msgid "reuse existing deltas"
 msgstr "reusa les diferències existents"
 
-#: builtin/pack-objects.c:3925
 msgid "reuse existing objects"
 msgstr "reusa els objectes existents"
 
-#: builtin/pack-objects.c:3927
 msgid "use OFS_DELTA objects"
 msgstr "usa objectes OFS_DELTA"
 
-#: builtin/pack-objects.c:3929
 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:3931
 msgid "do not create an empty pack output"
 msgstr "no creïs una emissió de paquet buida"
 
-#: builtin/pack-objects.c:3933
 msgid "read revision arguments from standard input"
 msgstr "llegeix els arguments de revisió des de l'entrada estàndard"
 
-#: builtin/pack-objects.c:3935
 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:3938
 msgid "include objects reachable from any reference"
 msgstr "inclou els objectes abastables de qualsevol referència"
 
-#: builtin/pack-objects.c:3941
 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:3944
 msgid "include objects referred to by the index"
 msgstr "inclou els objectes als quals faci referència l'índex"
 
-#: builtin/pack-objects.c:3947
 msgid "read packs from stdin"
 msgstr "llegeix els paquets des de stdin"
 
-#: builtin/pack-objects.c:3949
 msgid "output pack to stdout"
 msgstr "emet el paquet a stdout"
 
-#: builtin/pack-objects.c:3951
 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:3953
 msgid "keep unreachable objects"
 msgstr "retén els objectes inabastables"
 
-#: builtin/pack-objects.c:3955
 msgid "pack loose unreachable objects"
 msgstr "empaqueta els objectes inabastables solts"
 
-#: builtin/pack-objects.c:3957
 msgid "unpack unreachable objects newer than <time>"
 msgstr "desempaqueta els objectes inabastables més nous que <data>"
 
-#: builtin/pack-objects.c:3960
+#, fuzzy
+msgid "create a cruft pack"
+msgstr "crea paquets prims"
+
+#, fuzzy
+msgid "expire cruft objects older than <time>"
+msgstr "fes caducar els objectes més antics que <data>"
+
 msgid "use the sparse reachability algorithm"
 msgstr "utilitza l'algorisme d'accessibilitat dispers"
 
-#: builtin/pack-objects.c:3962
 msgid "create thin packs"
 msgstr "crea paquets prims"
 
-#: builtin/pack-objects.c:3964
 msgid "create packs suitable for shallow fetches"
 msgstr "crea paquets adequats per a les obtencions superficials"
 
-#: builtin/pack-objects.c:3966
 msgid "ignore packs that have companion .keep file"
 msgstr "ignora els paquets que tinguin un fitxer .keep corresponent"
 
-#: builtin/pack-objects.c:3968
 msgid "ignore this pack"
 msgstr "ignora aquest paquet"
 
-#: builtin/pack-objects.c:3970
 msgid "pack compression level"
 msgstr "nivell de compressió de paquet"
 
-#: builtin/pack-objects.c:3972
 msgid "do not hide commits by grafts"
 msgstr "no amaguis les comissions per empelt"
 
-#: builtin/pack-objects.c:3974
 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:3976
 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:3980
 msgid "write a bitmap index if possible"
 msgstr "escriu un índex de mapa de bits si és possible"
 
-#: builtin/pack-objects.c:3984
 msgid "handling for missing objects"
 msgstr "gestió dels objectes absents"
 
-#: builtin/pack-objects.c:3987
 msgid "do not pack objects in promisor packfiles"
 msgstr "empaquetis els objectes als fitxers de paquet «promisor»"
 
-#: builtin/pack-objects.c:3989
 msgid "respect islands during delta compression"
 msgstr "respecta les illes durant la compressió delta"
 
-#: builtin/pack-objects.c:3991
 msgid "protocol"
 msgstr "protocol"
 
-#: builtin/pack-objects.c:3992
 msgid "exclude any configured uploadpack.blobpackfileuri with this protocol"
 msgstr ""
 "exclou qualsevol uploadpack.blobpackfileuri configurat amb aquest protocol"
 
-#: builtin/pack-objects.c:4027
 #, c-format
 msgid "delta chain depth %d is too deep, forcing %d"
 msgstr "la profunditat de la cadena delta %d és massa profunda, forçant %d"
 
-#: builtin/pack-objects.c:4032
 #, c-format
 msgid "pack.deltaCacheLimit is too high, forcing %d"
 msgstr "pack.deltaCacheLimit és massa alt, forçant %d"
 
-#: builtin/pack-objects.c:4088
+#, c-format
+msgid "bad pack compression level %d"
+msgstr "nivell de compressió de paquet %d erroni"
+
 msgid "--max-pack-size cannot be used to build a pack for transfer"
 msgstr ""
 "--max-pack-size no es pot utilitzar per a construir un paquet per a la "
 "transferència"
 
-#: builtin/pack-objects.c:4090
 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:4095
 msgid "--thin cannot be used to build an indexable pack"
 msgstr "--thin no es pot utilitzar per a construir un paquet indexable"
 
-#: builtin/pack-objects.c:4104
 msgid "cannot use --filter without --stdout"
 msgstr "no es pot utilitzar --filter sense --stdout"
 
-#: builtin/pack-objects.c:4106
 msgid "cannot use --filter with --stdin-packs"
 msgstr "no es pot utilitzar --filter sense --stdin-packs"
 
-#: builtin/pack-objects.c:4110
 msgid "cannot use internal rev list with --stdin-packs"
 msgstr "no es pot utilitzar la llista de revisió interna amb --stdin-packs"
 
-#: builtin/pack-objects.c:4169
+#, fuzzy
+msgid "cannot use internal rev list with --cruft"
+msgstr "no es pot utilitzar la llista de revisió interna amb --stdin-packs"
+
+#, fuzzy
+msgid "cannot use --stdin-packs with --cruft"
+msgstr "no es pot usar -a amb -d"
+
+#, fuzzy
+msgid "cannot use --max-pack-size with --cruft"
+msgstr "no es pot usar -a amb -d"
+
 msgid "Enumerating objects"
 msgstr "S'estan enumerant els objectes"
 
-#: builtin/pack-objects.c:4210
 #, c-format
 msgid ""
 "Total %<PRIu32> (delta %<PRIu32>), reused %<PRIu32> (delta %<PRIu32>), pack-"
@@ -20018,7 +9242,6 @@ msgstr ""
 "Total %<PRIu32> (%<PRIu32> diferències), reusats %<PRIu32> (%<PRIu32> "
 "diferències), paquets reusats %<PRIu32>"
 
-#: builtin/pack-redundant.c:601
 msgid ""
 "'git pack-redundant' is nominated for removal.\n"
 "If you still use this command, please add an extra\n"
@@ -20032,81 +9255,61 @@ msgstr ""
 "i feu-nos saber que encara l'useu enviant un correu electrònic\n"
 "a <git@vger.kernel.org>.  Gràcies.\n"
 
-#: builtin/pack-refs.c:8
 msgid "git pack-refs [<options>]"
 msgstr "git pack-refs [<opcions>]"
 
-#: builtin/pack-refs.c:16
 msgid "pack everything"
 msgstr "empaqueta-ho tot"
 
-#: builtin/pack-refs.c:17
 msgid "prune loose refs (default)"
 msgstr "poda les referències soltes (per defecte)"
 
-#: builtin/prune.c:14
 msgid "git prune [-n] [-v] [--progress] [--expire <time>] [--] [<head>...]"
 msgstr "git prune [-n] [-v] [--progress] [--expire <data>] [--] [<head>...]"
 
-#: builtin/prune.c:145
 msgid "report pruned objects"
 msgstr "informa d'objectes podats"
 
-#: builtin/prune.c:148
 msgid "expire objects older than <time>"
 msgstr "fes caducar els objectes més antics que <data>"
 
-#: builtin/prune.c:150
 msgid "limit traversal to objects outside promisor packfiles"
 msgstr ""
 "limita el recorregut als objectes fora dels fitxers de paquet «promisor»"
 
-#: builtin/prune.c:163
 msgid "cannot prune in a precious-objects repo"
 msgstr "no es pot podar en un repositori d'objectes preciosos"
 
-#: 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:124
 msgid "control for recursive fetching of submodules"
 msgstr "controla l'obtenció recursiva de submòduls"
 
-#: builtin/pull.c:128
 msgid "Options related to merging"
 msgstr "Opcions relacionades amb fusionar"
 
-#: builtin/pull.c:131
 msgid "incorporate changes by rebasing rather than merging"
 msgstr "incorpora els canvis fent «rebase» en lloc de fusionar"
 
-#: builtin/pull.c:159 builtin/revert.c:126
 msgid "allow fast-forward"
 msgstr "permet l'avanç ràpid"
 
-#: builtin/pull.c:165
 msgid "control use of pre-merge-commit and commit-msg hooks"
 msgstr "controla l'ús dels lligams pre-merge-commit i commit-msg"
 
-#: builtin/pull.c:171 parse-options.h:371
 msgid "automatically stash/stash pop before and after"
 msgstr "fes «stash» i «stash pop» automàticament abans i després"
 
-#: builtin/pull.c:187
 msgid "Options related to fetching"
 msgstr "Opcions relacionades amb obtenir"
 
-#: builtin/pull.c:197
 msgid "force overwrite of local branch"
 msgstr "força la sobreescriptura de la branca local"
 
-#: builtin/pull.c:205
 msgid "number of submodules pulled in parallel"
 msgstr "nombre de submòduls baixats en paral·lel"
 
-#: builtin/pull.c:449
 msgid ""
 "There is no candidate for rebasing against among the refs that you just "
 "fetched."
@@ -20114,14 +9317,11 @@ msgstr ""
 "No hi ha cap candidat sobre el qual fer «rebase» entre les referències que "
 "acabeu d'obtenir."
 
-#: builtin/pull.c:451
 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:452
 msgid ""
 "Generally this means that you provided a wildcard refspec which had no\n"
 "matches on the remote end."
@@ -20129,7 +9329,6 @@ msgstr ""
 "Generalment això vol dir que heu proveït una especificació de\n"
 "referència de comodí que no tenia cap coincidència en el costat remot."
 
-#: builtin/pull.c:455
 #, c-format
 msgid ""
 "You asked to pull from the remote '%s', but did not specify\n"
@@ -20140,44 +9339,33 @@ msgstr ""
 "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:460 builtin/rebase.c:978
 msgid "You are not currently on a branch."
 msgstr "Actualment no sou en cap branca."
 
-#: builtin/pull.c:462 builtin/pull.c:477
 msgid "Please specify which branch you want to rebase against."
 msgstr "Especifiqueu sobre quina branca voleu fer «rebase»."
 
-#: builtin/pull.c:464 builtin/pull.c:479
 msgid "Please specify which branch you want to merge with."
 msgstr "Especifiqueu amb quina branca voleu fusionar."
 
-#: builtin/pull.c:465 builtin/pull.c:480
 msgid "See git-pull(1) for details."
 msgstr "Vegeu git-pull(1) per a més informació."
 
-#: builtin/pull.c:467 builtin/pull.c:473 builtin/pull.c:482
-#: builtin/rebase.c:984
 msgid "<remote>"
 msgstr "<remot>"
 
-#: builtin/pull.c:467 builtin/pull.c:482 builtin/pull.c:487
-#: contrib/scalar/scalar.c:374
 msgid "<branch>"
 msgstr "<branca>"
 
-#: builtin/pull.c:475 builtin/rebase.c:976
 msgid "There is no tracking information for the current branch."
 msgstr "No hi ha cap informació de seguiment per a la branca actual."
 
-#: builtin/pull.c:484
 msgid ""
 "If you wish to set tracking information for this branch you can do so with:"
 msgstr ""
-"Si voleu establir la informació de seguiment per a aquesta branca, podeu "
-"fer-ho amb:"
+"Si voleu establir la informació de seguiment per a aquesta branca, podeu fer-"
+"ho amb:"
 
-#: builtin/pull.c:489
 #, c-format
 msgid ""
 "Your configuration specifies to merge with the ref '%s'\n"
@@ -20186,16 +9374,13 @@ msgstr ""
 "La vostra configuració especifica fusionar amb la referència «%s»\n"
 "del remot, però no s'ha obtingut tal referència."
 
-#: builtin/pull.c:600
 #, c-format
 msgid "unable to access commit %s"
 msgstr "no s'ha pogut accedir a la comissió %s"
 
-#: builtin/pull.c:908
 msgid "ignoring --verify-signatures for rebase"
 msgstr "s'està ignorant --verify-signatures en fer «rebase»"
 
-#: builtin/pull.c:969
 msgid ""
 "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"
@@ -20205,7 +9390,8 @@ msgid ""
 "  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"
@@ -20219,24 +9405,21 @@ msgstr ""
 "  git config pull.ff only       # fast-forward only\n"
 "\n"
 "Podeu reemplaçar «git config» per «git config --global» per a establir una\n"
-"preferència per defecte per a tots els repositoris. Podeu també usar --rebase,\n"
+"preferència per defecte per a tots els repositoris. Podeu també usar --"
+"rebase,\n"
 "--no-rebase o --ff-only en la línia d'ordres per a sobreescriure el valor\n"
 "per defecte configuració en aquesta execució.\n"
 
-#: builtin/pull.c:1047
 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:1051
 msgid "pull with rebase"
 msgstr "baixar fent «rebase»"
 
-#: builtin/pull.c:1052
 msgid "please commit or stash them."
 msgstr "cometeu-los o emmagatzemeu-los."
 
-#: builtin/pull.c:1077
 #, c-format
 msgid ""
 "fetch updated the current branch head.\n"
@@ -20247,7 +9430,6 @@ msgstr ""
 "s'està avançant ràpidament el vostre arbre de treball des de\n"
 "la comissió %s."
 
-#: builtin/pull.c:1083
 #, c-format
 msgid ""
 "Cannot fast-forward your working tree.\n"
@@ -20258,57 +9440,57 @@ msgid ""
 "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:1098
 msgid "Cannot merge multiple branches into empty head."
 msgstr "No es poden fusionar múltiples branques a un HEAD buit."
 
-#: builtin/pull.c:1103
 msgid "Cannot rebase onto multiple branches."
 msgstr "No es pot fer «rebase» sobre múltiples branques."
 
-#: builtin/pull.c:1105
 msgid "Cannot fast-forward to multiple branches."
 msgstr "No es pot fer un avançament ràpid a branques múltiples."
 
-#: builtin/pull.c:1120
 msgid "Need to specify how to reconcile divergent branches."
 msgstr "Cal especificar com reconciliar les branques divergents."
 
-#: builtin/pull.c:1134
 msgid "cannot rebase with locally recorded submodule modifications"
 msgstr ""
 "no es pot fer «rebase» amb modificacions als submòduls enregistrades "
 "localment"
 
-#: 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>"
 msgstr "abreviatura d'etiqueta sense <tag>"
 
-#: builtin/push.c:119
 msgid "--delete only accepts plain target ref names"
 msgstr "--delete només accepta noms de referència de destí senzills"
 
-#: builtin/push.c:164
+#, fuzzy
 msgid ""
 "\n"
-"To choose either option permanently, see push.default in 'git help config'."
+"To choose either option permanently, see push.default in 'git help config'.\n"
 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
+msgid ""
+"\n"
+"To avoid automatically configuring upstream branches when their name\n"
+"doesn't match the local branch, see option 'simple' of branch."
+"autoSetupMerge\n"
+"in 'git help config'.\n"
+msgstr ""
+
+#, fuzzy, 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"
@@ -20319,7 +9501,7 @@ msgid ""
 "To push to the branch of the same name on the remote, use\n"
 "\n"
 "    git push %s HEAD\n"
-"%s"
+"%s%s"
 msgstr ""
 "La branca font de la vostra branca actual no coincideix\n"
 "amb el nom de la vostra branca actual. Per a pujar-la a la\n"
@@ -20332,7 +9514,6 @@ msgstr ""
 "    git push %s HEAD\n"
 "%s"
 
-#: builtin/push.c:182
 #, c-format
 msgid ""
 "You are not currently on a branch.\n"
@@ -20347,33 +9528,36 @@ msgstr ""
 "\n"
 "    git push %s HEAD:<nom-de-branca-remota>\n"
 
-#: builtin/push.c:191
-#, c-format
+msgid ""
+"\n"
+"To have this happen automatically for branches without a tracking\n"
+"upstream, see 'push.autoSetupRemote' in 'git help config'.\n"
+msgstr ""
+
+#, fuzzy, c-format
 msgid ""
 "The current branch %s has no upstream branch.\n"
 "To push the current branch and set the remote as upstream, use\n"
 "\n"
 "    git push --set-upstream %s %s\n"
+"%s"
 msgstr ""
 "La branca actual %s no té cap branca font.\n"
 "Per a pujar la branca actual i establir el remot com a font, useu\n"
 "\n"
 "    git push --set-upstream %s %s\n"
 
-#: 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:217
-msgid "You didn't specify any refspecs to push, and push.default is \"nothing\"."
+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"
@@ -20384,7 +9568,6 @@ msgstr ""
 "branca actual «%s», sense dir-me què pujar per a actualitzar\n"
 "quina branca remota."
 
-#: 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"
@@ -20394,9 +9577,9 @@ msgstr ""
 "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: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"
@@ -20407,9 +9590,9 @@ msgstr ""
 "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: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"
@@ -20422,15 +9605,13 @@ msgstr ""
 "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: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: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"
@@ -20441,7 +9622,6 @@ msgstr ""
 "a fer que assenyali un objecte no de comissió, sense usar l'opció\n"
 "«--force».\n"
 
-#: 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"
@@ -20453,102 +9633,83 @@ msgstr ""
 "els canvis localment (per exemple, «git pull ...») abans de forçar\n"
 "una pujada.\n"
 
-#: builtin/push.c:355
 #, c-format
 msgid "Pushing to %s\n"
 msgstr "S'està pujant a %s\n"
 
-#: 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:544 builtin/submodule--helper.c:3377
+#, c-format
+msgid "invalid value for '%s'"
+msgstr "valor no vàlid per a «%s»"
+
 msgid "repository"
 msgstr "repositori"
 
-#: builtin/push.c:545 builtin/send-pack.c:193
 msgid "push all refs"
 msgstr "puja totes les referències"
 
-#: builtin/push.c:546 builtin/send-pack.c:195
 msgid "mirror all refs"
 msgstr "reflecteix totes les referències"
 
-#: builtin/push.c:548
 msgid "delete refs"
 msgstr "suprimeix les referències"
 
-#: 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:552 builtin/send-pack.c:196
 msgid "force updates"
 msgstr "força les actualitzacions"
 
-#: builtin/push.c:553 builtin/send-pack.c:208
 msgid "<refname>:<expect>"
 msgstr "<nom-de-referència>:<esperat>"
 
-#: 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: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:560
 msgid "control recursive pushing of submodules"
 msgstr "controla la pujada recursiva dels submòduls"
 
-#: builtin/push.c:561 builtin/send-pack.c:203
 msgid "use thin pack"
 msgstr "usa el paquet prim"
 
-#: 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:564
 msgid "set upstream for git pull/status"
 msgstr "estableix la font per a git pull/status"
 
-#: builtin/push.c:567
 msgid "prune locally removed refs"
 msgstr "poda les referències eliminades localment"
 
-#: builtin/push.c:569
 msgid "bypass pre-push hook"
 msgstr "evita el lligam de prepujada"
 
-#: builtin/push.c:570
 msgid "push missing but relevant tags"
 msgstr "puja les etiquetes absents però rellevants"
 
-#: builtin/push.c:572 builtin/send-pack.c:197
 msgid "GPG sign the push"
 msgstr "signa la pujada amb GPG"
 
-#: 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:594
 msgid "--delete doesn't make sense without any refs"
 msgstr "--delete no té sentit sense referències"
 
-#: builtin/push.c:614
 #, c-format
 msgid "bad repository '%s'"
 msgstr "repositori incorrecte «%s»"
 
-#: 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"
@@ -20557,7 +9718,8 @@ msgid ""
 "    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"
@@ -20565,147 +9727,112 @@ msgstr ""
 "\n"
 "    git push <nom>\n"
 
-#: 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:638
 msgid "--mirror can't be combined with refspecs"
 msgstr "--mirror no es pot combinar amb especificacions de referència"
 
-#: 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
 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>"
+msgstr "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>"
 msgstr "git range-diff [<opcions>] <old-tip>...<new-tip>"
 
-#: builtin/range-diff.c:11
 msgid "git range-diff [<options>] <base> <old-tip> <new-tip>"
 msgstr "git range-diff [<opcions>] <base> <old-tip> <new-tip>"
 
-#: builtin/range-diff.c:30
 msgid "use simple diff colors"
 msgstr "utilitza colors simples de diff"
 
-#: builtin/range-diff.c:32
 msgid "notes"
 msgstr "notes"
 
-#: builtin/range-diff.c:32
 msgid "passed to 'git log'"
 msgstr "passa-ho a «git log»"
 
-#: builtin/range-diff.c:35
 msgid "only emit output related to the first range"
 msgstr "emet només la sortida relacionada amb el primer interval"
 
-#: builtin/range-diff.c:37
 msgid "only emit output related to the second range"
 msgstr "emet només la sortida relacionada amb el segon interval"
 
-#: builtin/range-diff.c:60 builtin/range-diff.c:64
 #, c-format
 msgid "not a commit range: '%s'"
 msgstr "no és un rang de comissions: «%s»"
 
-#: builtin/range-diff.c:74
 msgid "single arg format must be symmetric range"
 msgstr "el format de l'argument únic ha de ser de rang simètric"
 
-#: builtin/range-diff.c:89
 msgid "need two commit ranges"
 msgstr "calen dos rangs de comissió"
 
-#: builtin/read-tree.c:41
 msgid ""
-"git read-tree [(-m [--trivial] [--aggressive] | --reset | --prefix=<prefix>)"
-" [-u | -i]] [--no-sparse-checkout] [--index-output=<file>] (--empty | <tree-"
+"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 | -i]] [--no-sparse-checkout] [--index-output=<file>] (--empty | <tree-"
+"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:116
 msgid "write resulting index to <file>"
 msgstr "escriu l'índex resultant al <fitxer>"
 
-#: builtin/read-tree.c:119
 msgid "only empty the index"
 msgstr "només buida l'índex"
 
-#: builtin/read-tree.c:121
 msgid "Merging"
 msgstr "S'està fusionant"
 
-#: 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: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: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:129
 msgid "same as -m, but discard unmerged entries"
 msgstr "el mateix que -m, però descarta les entrades no fusionades"
 
-#: builtin/read-tree.c:130
 msgid "<subdirectory>/"
 msgstr "<subdirectori>/"
 
-#: 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:134
 msgid "update working tree with merge result"
 msgstr "actualitza l'arbre de treball amb el resultat de fusió"
 
-#: builtin/read-tree.c:136
 msgid "gitignore"
 msgstr "gitignore"
 
-#: 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: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: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:143
 msgid "skip applying sparse checkout filter"
 msgstr "omet l'aplicació del filtre d'agafament parcial"
 
-#: builtin/read-tree.c:145
 msgid "debug unpack-trees"
 msgstr "depura unpack-trees"
 
-#: builtin/read-tree.c:149
 msgid "suppress feedback messages"
 msgstr "suprimeix els missatges de retroacció"
 
-#: builtin/read-tree.c:190
 msgid "You need to resolve your current index first"
 msgstr "Primer heu de resoldre el vostre índex actual"
 
-#: builtin/rebase.c:36
 msgid ""
 "git rebase [-i] [options] [--exec <cmd>] [--onto <newbase> | --keep-base] "
 "[<upstream> [<branch>]]"
@@ -20713,64 +9840,63 @@ msgstr ""
 "git rebase [-i] [options] [--exec <cmd>] [--onto <newbase> | --keep-base] "
 "[<upstream> [<branch>]]"
 
-#: builtin/rebase.c:38
 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] [options] [--exec <cmd>] [--onto <newbase>] --root "
-"[<branch>]"
+"git rebase [-i] [options] [--exec <cmd>] [--onto <newbase>] --root [<branch>]"
+
+#, c-format
+msgid "could not read '%s'."
+msgstr "no s'ha pogut llegir «%s»."
 
-#: builtin/rebase.c:231
 #, c-format
 msgid "could not create temporary %s"
 msgstr "no s'ha pogut crear el fitxer temporal %s"
 
-#: builtin/rebase.c:237
 msgid "could not mark as interactive"
 msgstr "no s'ha pogut marcar com a interactiu"
 
-#: builtin/rebase.c:290
 msgid "could not generate todo list"
 msgstr "no s'ha pogut generar la llista per a fer"
 
-#: builtin/rebase.c:332
 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:391
 #, c-format
 msgid "%s requires the merge backend"
 msgstr "%s requereix un rerefons de fusió"
 
-#: builtin/rebase.c:433
 #, c-format
 msgid "could not get 'onto': '%s'"
 msgstr "no s'ha pogut obtenir «onto»: «%s»"
 
-#: builtin/rebase.c:450
 #, c-format
 msgid "invalid orig-head: '%s'"
 msgstr "orig-head no és vàlid: «%s»"
 
-#: builtin/rebase.c:475
 #, c-format
 msgid "ignoring invalid allow_rerere_autoupdate: '%s'"
 msgstr "s'ignora allow_rerere_autoupdate no vàlid: «%s»"
 
-#: builtin/rebase.c:600
+#, c-format
+msgid "could not remove '%s'"
+msgstr "no s'ha pogut eliminar «%s»"
+
 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"
-"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»."
+"«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»."
 
-#: builtin/rebase.c:685
 #, c-format
 msgid ""
 "\n"
@@ -20789,18 +9915,17 @@ msgstr ""
 "\n"
 "Com a resultat, git no pot fer un «rebase» d'elles."
 
-#: builtin/rebase.c:836
 #, c-format
 msgid "could not switch to %s"
 msgstr "no s'ha pogut commutar a %s"
 
-#: builtin/rebase.c:952
 #, 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 ""
 "tipus buit no reconegut «%s»; els valors vàlids són «drop», «keep» i «ask»."
 
-#: builtin/rebase.c:970
 #, c-format
 msgid ""
 "%s\n"
@@ -20817,7 +9942,6 @@ msgstr ""
 "    git rebase '<branca>'\n"
 "\n"
 
-#: builtin/rebase.c:986
 #, c-format
 msgid ""
 "If you wish to set tracking information for this branch you can do so with:\n"
@@ -20825,184 +9949,151 @@ msgid ""
 "    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:1016
 msgid "exec commands cannot contain newlines"
 msgstr "les ordres exec no poden contenir línies noves"
 
-#: builtin/rebase.c:1020
 msgid "empty exec command"
 msgstr "ordre exec buida"
 
-#: builtin/rebase.c:1051
 msgid "rebase onto given branch instead of upstream"
 msgstr "fes un «rebase» en la branca donada en comptes de la font"
 
-#: builtin/rebase.c:1053
 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:1055
 msgid "allow pre-rebase hook to run"
 msgstr "permet al lligam pre-rebase executar-se"
 
-#: builtin/rebase.c:1057
 msgid "be quiet. implies --no-stat"
 msgstr "silenciós. Implica --no-stat"
 
-#: builtin/rebase.c:1060
 msgid "display a diffstat of what changed upstream"
 msgstr "mostra un «diffstat» del que ha canviat a la font"
 
-#: builtin/rebase.c:1063
 msgid "do not show diffstat of what changed upstream"
 msgstr "no mostris «diffstat» del que ha canviat a la font"
 
-#: builtin/rebase.c:1066
 msgid "add a Signed-off-by trailer to each commit"
 msgstr "afegeix un «trailer» tipus «Signed-off-by» a cada comissió"
 
-#: builtin/rebase.c:1069
 msgid "make committer date match author date"
 msgstr "fes que la data del «comitter» coincideixi amb la data de l'autor"
 
-#: builtin/rebase.c:1071
 msgid "ignore author date and use current date"
 msgstr "ignora la data de l'autor i utilitza la data actual"
 
-#: builtin/rebase.c:1073
 msgid "synonym of --reset-author-date"
 msgstr "sinònim de --reset-author-date"
 
-#: builtin/rebase.c:1075 builtin/rebase.c:1079
 msgid "passed to 'git apply'"
 msgstr "passa-ho a «git apply»"
 
-#: builtin/rebase.c:1077
 msgid "ignore changes in whitespace"
 msgstr "ignora els canvis d'espais en blanc"
 
-#: builtin/rebase.c:1081 builtin/rebase.c:1084
 msgid "cherry-pick all commits, even if unchanged"
 msgstr "«cherry pick» totes les comissions, inclús les no canviades"
 
-#: builtin/rebase.c:1086
 msgid "continue"
 msgstr "continua"
 
-#: builtin/rebase.c:1089
 msgid "skip current patch and continue"
 msgstr "omet el pedaç actual i continua"
 
-#: builtin/rebase.c:1091
 msgid "abort and check out the original branch"
 msgstr "interromp i agafa la branca original"
 
-#: builtin/rebase.c:1094
 msgid "abort but keep HEAD where it is"
 msgstr "interromp però manté HEAD on és"
 
-#: builtin/rebase.c:1095
 msgid "edit the todo list during an interactive rebase"
 msgstr "edita la llista de coses a fer durant un «rebase» interactiu"
 
-#: builtin/rebase.c:1098
 msgid "show the patch file being applied or merged"
 msgstr "mostra el pedaç que s'està aplicant o fusionant"
 
-#: builtin/rebase.c:1101
 msgid "use apply strategies to rebase"
 msgstr "utilitza estratègies d'aplicació per a fer «rebase»"
 
-#: builtin/rebase.c:1105
 msgid "use merging strategies to rebase"
 msgstr "utilitza estratègies de fusió per a fer «rebase»"
 
-#: builtin/rebase.c:1109
 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:1113
-msgid "(DEPRECATED) try to recreate merges instead of ignoring them"
+#, fuzzy
+msgid "(REMOVED) was: try to recreate merges instead of ignoring them"
 msgstr "(EN DESÚS) intenta recrear fusions en lloc d'ignorar-les"
 
-#: builtin/rebase.c:1118
 msgid "how to handle commits that become empty"
 msgstr "com gestionar les comissions que queden buides"
 
-#: builtin/rebase.c:1121
 msgid "keep commits which start empty"
 msgstr "manté les comissions que comencen en blanc"
 
-#: builtin/rebase.c:1125
 msgid "move commits that begin with squash!/fixup! under -i"
 msgstr "mou les comissions que comencen amb squash!/fixup! sota -i"
 
-#: builtin/rebase.c:1132
 msgid "add exec lines after each commit of the editable list"
 msgstr "afegeix línies d'exec després de cada comissió de la llista editable"
 
-#: builtin/rebase.c:1136
 msgid "allow rebasing commits with empty messages"
 msgstr "permet fer «rebase» de les comissions amb missatges buits"
 
-#: builtin/rebase.c:1140
 msgid "try to rebase merges instead of skipping them"
 msgstr "intenta fer «rebase» de les fusions en comptes d'ometre-les"
 
-#: builtin/rebase.c:1143
 msgid "use 'merge-base --fork-point' to refine upstream"
 msgstr "usa «merge-base --fork-point» per a refinar la font"
 
-#: builtin/rebase.c:1145
 msgid "use the given merge strategy"
 msgstr "utilitza l'estratègia de fusió donada"
 
-#: builtin/rebase.c:1147 builtin/revert.c:115
 msgid "option"
 msgstr "opció"
 
-#: builtin/rebase.c:1148
 msgid "pass the argument through to the merge strategy"
 msgstr "passa l'argument a l'estratègia de fusió"
 
-#: builtin/rebase.c:1151
 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:1154
 msgid "automatically re-schedule any `exec` that fails"
 msgstr "torna a planificar automàticament qualsevol «exec» que falli"
 
-#: builtin/rebase.c:1156
 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:1177
 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:1208
-msgid "--preserve-merges was replaced by --rebase-merges"
-msgstr "--preserve-merges ha estat substituït per --rebase-merges"
+msgid ""
+"`rebase --preserve-merges` (-p) is no longer supported.\n"
+"Use `git rebase --abort` to terminate current rebase.\n"
+"Or downgrade to v2.33, or earlier, to complete the rebase."
+msgstr ""
+
+msgid ""
+"--preserve-merges was replaced by --rebase-merges\n"
+"Note: Your `pull.rebase` configuration may also be set to 'preserve',\n"
+"which is no longer supported; use 'merges' instead"
+msgstr ""
 
-#: builtin/rebase.c:1230
 msgid "No rebase in progress?"
 msgstr "No hi ha un «rebase» en curs?"
 
-#: builtin/rebase.c:1234
 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:1257 t/helper/test-fast-rebase.c:122
 msgid "Cannot read HEAD"
 msgstr "No es pot llegir HEAD"
 
-#: builtin/rebase.c:1269
 msgid ""
 "You must edit all merge conflicts and then\n"
 "mark them as resolved using git add"
@@ -21010,16 +10101,13 @@ msgstr ""
 "Heu d'editar tots els conflictes de fusió i després\n"
 "marcar-los com a resolts fent servir git add"
 
-#: builtin/rebase.c:1287
 msgid "could not discard worktree changes"
 msgstr "no s'han pogut descartar els canvis de l'arbre de treball"
 
-#: builtin/rebase.c:1308
 #, c-format
 msgid "could not move back to %s"
 msgstr "no s'ha pogut tornar a %s"
 
-#: builtin/rebase.c:1354
 #, c-format
 msgid ""
 "It seems that there is already a %s directory, and\n"
@@ -21034,133 +10122,105 @@ msgstr ""
 "Sembla que ja exigeix un directori %s, i em pregunto\n"
 "si esteu enmig d'un altre «rebase». Si aquest és el cas, proveu\n"
 "\t%s\n"
-"Si no és cas\n"
+"Si no és cas, feu:\n"
 "\t%s\n"
-"i executeu aquesta ordre de nou. S'atura l'operació en cas que\n"
+"i després executeu aquesta ordre de nou. S'atura l'operació en cas que\n"
 "tingueu quelcom valuós.\n"
 
-#: builtin/rebase.c:1382
 msgid "switch `C' expects a numerical value"
 msgstr "«switch» «c» espera un valor numèric"
 
-#: builtin/rebase.c:1424
 #, c-format
 msgid "Unknown mode: %s"
 msgstr "Mode desconegut: %s"
 
-#: builtin/rebase.c:1463
 msgid "--strategy requires --merge or --interactive"
 msgstr "--strategy requereix --merge o --interactive"
 
-#: builtin/rebase.c:1492
 msgid "apply options and merge options cannot be used together"
 msgstr "les opcions apply i merge no es poden usar juntes"
 
-#: builtin/rebase.c:1505
 #, c-format
 msgid "Unknown rebase backend: %s"
 msgstr "Rerefons de «rebase» desconegut: %s"
 
-#: builtin/rebase.c:1534
 msgid "--reschedule-failed-exec requires --exec or --interactive"
 msgstr "--reschedule-failed-exec requereix --exec o --interactive"
 
-#: builtin/rebase.c:1565
 #, c-format
 msgid "invalid upstream '%s'"
 msgstr "font no vàlida: «%s»"
 
-#: builtin/rebase.c:1571
 msgid "Could not create new root commit"
 msgstr "No s'ha pogut crear una comissió arrel nova"
 
-#: builtin/rebase.c:1597
+#, c-format
+msgid "no such branch/commit '%s'"
+msgstr "no existeix aquesta branca o comissió «%s»"
+
+#, c-format
+msgid "No such ref: %s"
+msgstr "No hi ha tal referència: %s"
+
+msgid "Could not resolve HEAD to a revision"
+msgstr "No s'ha pogut resoldre HEAD a una revisió"
+
 #, c-format
 msgid "'%s': need exactly one merge base with branch"
 msgstr "«%s»: necessita exactament una base de fusió amb branca"
 
-#: builtin/rebase.c:1600
 #, c-format
 msgid "'%s': need exactly one merge base"
 msgstr "«%s»: necessita exactament una base de fusió"
 
-#: builtin/rebase.c:1609
 #, c-format
 msgid "Does not point to a valid commit '%s'"
 msgstr "No apunta a una comissió vàlida «%s»"
 
-#: builtin/rebase.c:1636
-#, c-format
-msgid "no such branch/commit '%s'"
-msgstr "no existeix aquesta branca o comissió «%s»"
-
-#: builtin/rebase.c:1647 builtin/submodule--helper.c:43
-#: builtin/submodule--helper.c:2477
-#, c-format
-msgid "No such ref: %s"
-msgstr "No hi ha tal referència: %s"
-
-#: builtin/rebase.c:1658
-msgid "Could not resolve HEAD to a revision"
-msgstr "No s'ha pogut resoldre HEAD a una revisió"
-
-#: builtin/rebase.c:1679
 msgid "Please commit or stash them."
 msgstr "Cometeu-los o emmagatzemeu-los."
 
-#: builtin/rebase.c:1714
 msgid "HEAD is up to date."
 msgstr "HEAD està al dia."
 
-#: builtin/rebase.c:1716
 #, c-format
 msgid "Current branch %s is up to date.\n"
 msgstr "La branca actual %s està al dia.\n"
 
-#: builtin/rebase.c:1724
 msgid "HEAD is up to date, rebase forced."
 msgstr "La branca actual està al dia, «rebase» forçat."
 
-#: builtin/rebase.c:1726
 #, 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:1734
 msgid "The pre-rebase hook refused to rebase."
 msgstr "El lligam pre-«rebase» ha refusat a fer «rebase»."
 
-#: builtin/rebase.c:1741
 #, c-format
 msgid "Changes to %s:\n"
 msgstr "Canvis a %s:\n"
 
-#: builtin/rebase.c:1744
 #, c-format
 msgid "Changes from %s to %s:\n"
 msgstr "Canvis de %s a %s:\n"
 
-#: builtin/rebase.c:1769
 #, 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:1781
 msgid "Could not detach HEAD"
 msgstr "No s'ha pogut separar HEAD"
 
-#: builtin/rebase.c:1790
 #, c-format
 msgid "Fast-forwarded %s to %s.\n"
 msgstr "Avanç ràpid %s a %s.\n"
 
-#: builtin/receive-pack.c:35
 msgid "git receive-pack <git-dir>"
 msgstr "git receive-pack <git-dir>"
 
-#: builtin/receive-pack.c:1263
 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"
@@ -21191,7 +10251,6 @@ msgstr ""
 "per defecte, establiu la variable de configuració\n"
 "«receive.denyCurrentBranch» a «refuse»."
 
-#: builtin/receive-pack.c:1283
 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"
@@ -21213,29 +10272,26 @@ msgstr ""
 "\n"
 "Per a silenciar aquest missatge, podeu establir-la a «refuse»."
 
-#: builtin/receive-pack.c:2476
 msgid "quiet"
 msgstr "silenciós"
 
-#: builtin/receive-pack.c:2491
 msgid "you must specify a directory"
 msgstr "heu d'especificar un directori"
 
-#: builtin/reflog.c:9
 msgid "git reflog [show] [<log-options>] [<ref>]"
 msgstr "git reflog [show] [<log-options>] [<ref>]"
 
-#: builtin/reflog.c:12
 msgid ""
 "git reflog expire [--expire=<time>] [--expire-unreachable=<time>]\n"
 "                  [--rewrite] [--updateref] [--stale-fix]\n"
-"                  [--dry-run | -n] [--verbose] [--all [--single-worktree] | <refs>...]"
+"                  [--dry-run | -n] [--verbose] [--all [--single-worktree] | "
+"<refs>...]"
 msgstr ""
 "git reflog expire [--expire=<time>] [--expire-unreachable=<time>]\n"
 "                  [--rewrite] [--updateref] [--stale-fix]\n"
-"                  [--dry-run | -n] [--verbose] [--all [--single-worktree] | <refs>...]"
+"                  [--dry-run | -n] [--verbose] [--all [--single-worktree] | "
+"<refs>...]"
 
-#: builtin/reflog.c:17
 msgid ""
 "git reflog delete [--rewrite] [--updateref]\n"
 "                  [--dry-run | -n] [--verbose] <ref>@{<specifier>}..."
@@ -21243,44 +10299,35 @@ msgstr ""
 "git reflog delete [--rewrite] [--updateref]\n"
 "                  [--dry-run | -n] [--verbose] <ref>@{<specifier>}..."
 
-#: builtin/reflog.c:21
 msgid "git reflog exists <ref>"
 msgstr "git reflog exists <referència>"
 
-#: builtin/reflog.c:197 builtin/reflog.c:211
-#, c-format, fuzzy
+#, fuzzy, c-format
 msgid "invalid timestamp '%s' given to '--%s'"
 msgstr "el codi de temps «%s» no és vàlid donat a «--%s»"
 
-#: builtin/reflog.c:240 builtin/reflog.c:359
 #, fuzzy
 msgid "do not actually prune any entries"
 msgstr "no practiquis cap entrada"
 
-#: builtin/reflog.c:243 builtin/reflog.c:362
 msgid ""
 "rewrite the old SHA1 with the new SHA1 of the entry that now precedes it"
 msgstr "reescriu l'antic SHA1 amb el nou SHA1 de l'entrada que ara precedeix"
 
-#: builtin/reflog.c:246 builtin/reflog.c:365
 msgid "update the reference to the value of the top reflog entry"
 msgstr "actualitza la referència al valor de l'entrada de reflog superior"
 
-#: builtin/reflog.c:248 builtin/reflog.c:367
 #, fuzzy
 msgid "print extra information on screen"
 msgstr "imprimeix informació extra a la pantalla"
 
-#: builtin/reflog.c:249 builtin/reflog.c:253
 msgid "timestamp"
 msgstr "marca de temps"
 
-#: builtin/reflog.c:250
 #, fuzzy
 msgid "prune entries older than the specified time"
 msgstr "poda les entrades més antigues que el temps especificat"
 
-#: builtin/reflog.c:254
 #, fuzzy
 msgid ""
 "prune entries older than <time> that are not reachable from the current tip "
@@ -21289,129 +10336,101 @@ msgstr ""
 "poda les entrades més antigues de <time> que no es poden accedir des de la "
 "punta actual de la branca"
 
-#: builtin/reflog.c:258
 #, fuzzy
 msgid "prune any reflog entries that point to broken commits"
 msgstr "poda qualsevol entrada de reflog que apunti a comissions trencades"
 
-#: builtin/reflog.c:259
 #, fuzzy
 msgid "process the reflogs of all references"
 msgstr "processa els reflogs de totes les referències"
 
-#: builtin/reflog.c:261
 #, fuzzy
 msgid "limits processing to reflogs from the current worktree only"
 msgstr "limita el processament a reflogs només de l'arbre de treball actual"
 
-#: builtin/reflog.c:294
 #, c-format
 msgid "Marking reachable objects..."
 msgstr "S'estan marcant els objectes abastables..."
 
-#: builtin/reflog.c:338
 #, c-format
 msgid "%s points nowhere!"
 msgstr "%s no apunta a enlloc"
 
-#: builtin/reflog.c:374
 msgid "no reflog specified to delete"
 msgstr "no s'ha especificat cap registre de referència per a suprimir"
 
-#: builtin/reflog.c:396
 #, c-format
 msgid "invalid ref format: %s"
 msgstr "format de referència no vàlid: %s"
 
-#: builtin/remote.c:19
 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:20 builtin/remote.c:40
 msgid "git remote rename [--[no-]progress] <old> <new>"
 msgstr "git remote rename [--[no-]progress] <old> <new>"
 
-#: builtin/remote.c:21 builtin/remote.c:45
 msgid "git remote remove <name>"
 msgstr "git remote remove <nom>"
 
-#: builtin/remote.c:22 builtin/remote.c:50
 msgid "git remote set-head <name> (-a | --auto | -d | --delete | <branch>)"
 msgstr "git remote set-head <nom> (-a | --auto | -d | --delete | <branca>)"
 
-#: builtin/remote.c:23
 msgid "git remote [-v | --verbose] show [-n] <name>"
 msgstr "git remote [-v | --verbose] show [-n] <nom>"
 
-#: builtin/remote.c:24
 msgid "git remote prune [-n | --dry-run] <name>"
 msgstr "git remote prune [-n | --dry-run] <nom>"
 
-#: builtin/remote.c:25
 msgid ""
 "git remote [-v | --verbose] update [-p | --prune] [(<group> | <remote>)...]"
 msgstr ""
 "git remote [-v | --verbose] update [-p | --prune] [(<grup> | <remot>)...]"
 
-#: builtin/remote.c:26
 msgid "git remote set-branches [--add] <name> <branch>..."
 msgstr "git remote set-branches [--add] <nom> <branca>..."
 
-#: builtin/remote.c:27 builtin/remote.c:76
 msgid "git remote get-url [--push] [--all] <name>"
 msgstr "git remote get-url [--push] [--all] <nom>"
 
-#: builtin/remote.c:28 builtin/remote.c:81
 msgid "git remote set-url [--push] <name> <newurl> [<oldurl>]"
 msgstr "git remote set-url [--push] <nom> <url-nou> [<url-antic>]"
 
-#: builtin/remote.c:29 builtin/remote.c:82
 msgid "git remote set-url --add <name> <newurl>"
 msgstr "git remote set-url --add <nom> <url-nou>"
 
-#: builtin/remote.c:30 builtin/remote.c:83
 msgid "git remote set-url --delete <name> <url>"
 msgstr "git remote set-url --delete <nom> <url>"
 
-#: builtin/remote.c:35
 msgid "git remote add [<options>] <name> <url>"
 msgstr "git remote add [<opcions>] <nom> <url>"
 
-#: builtin/remote.c:55
 msgid "git remote set-branches <name> <branch>..."
 msgstr "git remote set-branches <nom> <branca>..."
 
-#: builtin/remote.c:56
 msgid "git remote set-branches --add <name> <branch>..."
 msgstr "git remote set-branches --add <nom> <branca>..."
 
-#: builtin/remote.c:61
 msgid "git remote show [<options>] <name>"
 msgstr "git remote show [<opcions>] <nom>"
 
-#: builtin/remote.c:66
 msgid "git remote prune [<options>] <name>"
 msgstr "git remote prune [<opcions>] <nom>"
 
-#: builtin/remote.c:71
 msgid "git remote update [<options>] [<group> | <remote>]..."
 msgstr "git remote update [<opcions>] [<grup> | <remot>]..."
 
-#: builtin/remote.c:100
 #, c-format
 msgid "Updating %s"
 msgstr "S'està actualitzant %s"
 
-#: builtin/remote.c:102
 #, c-format
 msgid "Could not fetch %s"
 msgstr "No s'ha pogut obtenir %s"
 
-#: builtin/remote.c:132
 msgid ""
 "--mirror is dangerous and deprecated; please\n"
 "\t use --mirror=fetch or --mirror=push instead"
@@ -21420,79 +10439,70 @@ msgstr ""
 "\t useu --mirror=fetch o\n"
 "\t --mirror=push en lloc d'això"
 
-#: builtin/remote.c:149
 #, c-format
 msgid "unknown mirror argument: %s"
 msgstr "argument de «mirror» desconegut: %s"
 
-#: builtin/remote.c:165
 msgid "fetch the remote branches"
 msgstr "obtén les branques remotes"
 
-#: builtin/remote.c:167
 msgid "import all tags and associated objects when fetching"
 msgstr "en obtenir, importa totes les etiquetes i tots els objectes"
 
-#: builtin/remote.c:170
 msgid "or do not fetch any tag at all (--no-tags)"
 msgstr "o no obtinguis cap etiqueta (--no-tags)"
 
-#: builtin/remote.c:172
 msgid "branch(es) to track"
 msgstr "branques a seguir"
 
-#: builtin/remote.c:173
 msgid "master branch"
 msgstr "branca mestra"
 
-#: builtin/remote.c:175
 msgid "set up remote as a mirror to push to or fetch from"
 msgstr "estableix el remot com a mirall al qual pujar o del qual obtenir"
 
-#: builtin/remote.c:187
 msgid "specifying a master branch makes no sense with --mirror"
 msgstr "especificar una branca mestra no té sentit amb --mirror"
 
-#: builtin/remote.c:189
 msgid "specifying branches to track makes sense only with fetch mirrors"
 msgstr ""
 "especificar les branques a seguir té sentit només amb miralls d'obtenció"
 
-#: builtin/remote.c:196 builtin/remote.c:716
 #, c-format
 msgid "remote %s already exists."
 msgstr "el remot %s ja existeix."
 
-#: builtin/remote.c:241
 #, c-format
 msgid "Could not setup master '%s'"
 msgstr "No s'ha pogut configurar la mestra «%s»"
 
-#: builtin/remote.c:323
+#, c-format
+msgid "more than one %s"
+msgstr "més d'un %s"
+
 #, c-format
 msgid "unhandled branch.%s.rebase=%s; assuming 'true'"
 msgstr "no s'ha gestionat branch.%s.rebase=%s; assumint «true»"
 
-#: builtin/remote.c:367
 #, 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:461 builtin/remote.c:469
 msgid "(matching)"
 msgstr "(coincident)"
 
-#: builtin/remote.c:473
 msgid "(delete)"
 msgstr "(suprimir)"
 
-#: builtin/remote.c:664
 #, c-format
 msgid "could not set '%s'"
 msgstr "no s'ha pogut establir «%s»"
 
-#: builtin/remote.c:669
+#, c-format
+msgid "could not unset '%s'"
+msgstr "no s'ha pogut desassignar «%s»"
+
 #, c-format
 msgid ""
 "The %s configuration remote.pushDefault in:\n"
@@ -21503,43 +10513,37 @@ msgstr ""
 "\t%s:%d\n"
 "ara anomena un remot no existent «%s»"
 
-#: builtin/remote.c:707 builtin/remote.c:866 builtin/remote.c:973
 #, c-format
 msgid "No such remote: '%s'"
 msgstr "No existeix el remot «%s»"
 
-#: builtin/remote.c:726
 #, 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:746
 #, 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:783
 #, fuzzy
 msgid "Renaming remote references"
 msgstr "Canviant el nom de les referències remotes"
 
-#: builtin/remote.c:794
 #, c-format
 msgid "deleting '%s' failed"
 msgstr "la supressió de «%s» ha fallat"
 
-#: builtin/remote.c:832
 #, c-format
 msgid "creating '%s' failed"
 msgstr "la creació de «%s» ha fallat"
 
-#: builtin/remote.c:912
 msgid ""
 "Note: A branch outside the refs/remotes/ hierarchy was not removed;\n"
 "to delete it, use:"
@@ -21550,489 +10554,402 @@ msgstr[0] ""
 "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:926
 #, c-format
 msgid "Could not remove config section '%s'"
 msgstr "No s'ha pogut eliminar la secció de configuració «%s»"
 
-#: builtin/remote.c:1034
 #, c-format
 msgid " new (next fetch will store in remotes/%s)"
 msgstr " nou (la pròxima obtenció emmagatzemarà a remotes/%s)"
 
-#: builtin/remote.c:1037
 msgid " tracked"
 msgstr " seguit"
 
-#: builtin/remote.c:1039
 msgid " stale (use 'git remote prune' to remove)"
 msgstr " estancat (useu «git remote prune» per a eliminar)"
 
-#: builtin/remote.c:1041
 msgid " ???"
 msgstr " ???"
 
-#: builtin/remote.c:1082
 #, 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:1091
 #, c-format
 msgid "rebases interactively onto remote %s"
 msgstr "es fa «rebase» interactivament sobre el remot %s"
 
-#: builtin/remote.c:1093
 #, c-format
 msgid "rebases interactively (with merges) onto remote %s"
 msgstr "es fa «rebase» interactivament (amb fusions) sobre el remot %s"
 
-#: builtin/remote.c:1096
 #, c-format
 msgid "rebases onto remote %s"
 msgstr "es fa «rebase» sobre el remot %s"
 
-#: builtin/remote.c:1100
 #, c-format
 msgid " merges with remote %s"
 msgstr " es fusiona amb el remot %s"
 
-#: builtin/remote.c:1103
 #, c-format
 msgid "merges with remote %s"
 msgstr "es fusiona amb el remot %s"
 
-#: builtin/remote.c:1106
 #, c-format
 msgid "%-*s    and with remote %s\n"
 msgstr "%-*s    i amb el remot %s\n"
 
-#: builtin/remote.c:1149
 msgid "create"
 msgstr "crea"
 
-#: builtin/remote.c:1152
 msgid "delete"
 msgstr "suprimeix"
 
-#: builtin/remote.c:1156
 msgid "up to date"
 msgstr "al dia"
 
-#: builtin/remote.c:1159
 msgid "fast-forwardable"
 msgstr "avanç ràpid possible"
 
-#: builtin/remote.c:1162
 msgid "local out of date"
 msgstr "local no actualitzat"
 
-#: builtin/remote.c:1169
 #, c-format
 msgid "    %-*s forces to %-*s (%s)"
 msgstr "    %-*s força a %-*s (%s)"
 
-#: builtin/remote.c:1172
 #, c-format
 msgid "    %-*s pushes to %-*s (%s)"
 msgstr "    %-*s puja a %-*s (%s)"
 
-#: builtin/remote.c:1176
 #, c-format
 msgid "    %-*s forces to %s"
 msgstr "    %-*s força a %s"
 
-#: builtin/remote.c:1179
 #, c-format
 msgid "    %-*s pushes to %s"
 msgstr "    %-*s puja a %s"
 
-#: builtin/remote.c:1247
 msgid "do not query remotes"
 msgstr "no consultis els remots"
 
-#: builtin/remote.c:1268
 #, c-format
 msgid "* remote %s"
 msgstr "* remot %s"
 
-#: builtin/remote.c:1269
 #, c-format
 msgid "  Fetch URL: %s"
 msgstr "  URL d'obtenció: %s"
 
-#: builtin/remote.c:1270 builtin/remote.c:1286 builtin/remote.c:1423
 msgid "(no URL)"
 msgstr "(sense URL)"
 
 #. TRANSLATORS: the colon ':' should align
 #. with the one in " Fetch URL: %s"
 #. translation.
-#: builtin/remote.c:1284 builtin/remote.c:1286
+#.
 #, c-format
 msgid "  Push  URL: %s"
 msgstr "  URL de pujada: %s"
 
-#: builtin/remote.c:1288 builtin/remote.c:1290 builtin/remote.c:1292
 #, c-format
 msgid "  HEAD branch: %s"
 msgstr "  Branca de HEAD: %s"
 
-#: builtin/remote.c:1288
 msgid "(not queried)"
 msgstr "(no consultat)"
 
-#: builtin/remote.c:1290
 msgid "(unknown)"
 msgstr "(desconegut)"
 
-#: builtin/remote.c:1294
 #, 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:1306
 #, c-format
 msgid "  Remote branch:%s"
 msgid_plural "  Remote branches:%s"
 msgstr[0] "  Branca remota:%s"
 msgstr[1] "  Branques remotes:%s"
 
-#: builtin/remote.c:1309 builtin/remote.c:1335
 msgid " (status not queried)"
 msgstr " (estat no consultat)"
 
-#: builtin/remote.c:1318
 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:1326
 msgid "  Local refs will be mirrored by 'git push'"
 msgstr "  «git push» reflectirà les referències locals"
 
-#: builtin/remote.c:1332
 #, 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:1353
 msgid "set refs/remotes/<name>/HEAD according to remote"
 msgstr "estableix refs/remotes/<nom>/HEAD segons el remot"
 
-#: builtin/remote.c:1355
 msgid "delete refs/remotes/<name>/HEAD"
 msgstr "suprimeix refs/remotes/<nom>/HEAD"
 
-#: builtin/remote.c:1369
 msgid "Cannot determine remote HEAD"
 msgstr "No es pot determinar la HEAD remota"
 
-#: builtin/remote.c:1371
 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:1381
 #, c-format
 msgid "Could not delete %s"
 msgstr "No s'ha pogut suprimir %s"
 
-#: builtin/remote.c:1389
 #, c-format
 msgid "Not a valid ref: %s"
 msgstr "No és una referència vàlida: %s"
 
-#: builtin/remote.c:1391
 #, c-format
 msgid "Could not setup %s"
 msgstr "No s'ha pogut configurar %s"
 
-#: builtin/remote.c:1409
 #, c-format
 msgid " %s will become dangling!"
 msgstr " %s es tornarà penjant!"
 
-#: builtin/remote.c:1410
 #, c-format
 msgid " %s has become dangling!"
 msgstr " %s s'ha tornat penjant!"
 
-#: builtin/remote.c:1419
 #, c-format
 msgid "Pruning %s"
 msgstr "S'està podant %s"
 
-#: builtin/remote.c:1420
 #, c-format
 msgid "URL: %s"
 msgstr "URL: %s"
 
-#: builtin/remote.c:1436
 #, c-format
 msgid " * [would prune] %s"
 msgstr " * [podaria] %s"
 
-#: builtin/remote.c:1439
 #, c-format
 msgid " * [pruned] %s"
 msgstr " * [podat] %s"
 
-#: builtin/remote.c:1484
 msgid "prune remotes after fetching"
 msgstr "poda els remots després d'obtenir-los"
 
-#: builtin/remote.c:1548 builtin/remote.c:1604 builtin/remote.c:1674
 #, c-format
 msgid "No such remote '%s'"
 msgstr "No hi ha tal remot «%s»"
 
-#: builtin/remote.c:1566
 msgid "add branch"
 msgstr "afegeix branca"
 
-#: builtin/remote.c:1573
 msgid "no remote specified"
 msgstr "cap remot especificat"
 
-#: builtin/remote.c:1590
 msgid "query push URLs rather than fetch URLs"
 msgstr "consulta els URL de pujada en lloc dels URL d'obtenció"
 
-#: builtin/remote.c:1592
 msgid "return all URLs"
 msgstr "retorna tots els URL"
 
-#: builtin/remote.c:1622
 #, c-format
 msgid "no URLs configured for remote '%s'"
 msgstr "cap URL configurat per al remot «%s»"
 
-#: builtin/remote.c:1648
 msgid "manipulate push URLs"
 msgstr "manipula els URL de pujada"
 
-#: builtin/remote.c:1650
 msgid "add URL"
 msgstr "afegeix URL"
 
-#: builtin/remote.c:1652
 msgid "delete URLs"
 msgstr "suprimeix els URL"
 
-#: builtin/remote.c:1659
 msgid "--add --delete doesn't make sense"
 msgstr "--add --delete no té sentit"
 
-#: builtin/remote.c:1700
 #, c-format
 msgid "Invalid old URL pattern: %s"
 msgstr "Patró d'URL antic no vàlid: %s"
 
-#: builtin/remote.c:1708
 #, c-format
 msgid "No such URL found: %s"
 msgstr "No s'ha trobat tal URL: %s"
 
-#: builtin/remote.c:1710
 msgid "Will not delete all non-push URLs"
 msgstr "No se suprimiran tots els URL no de pujada"
 
-#: builtin/remote.c:1727
 msgid "be verbose; must be placed before a subcommand"
 msgstr "sigues detallat; s'ha de col·locar abans d'una subordre"
 
-#: builtin/repack.c:29
 msgid "git repack [<options>]"
 msgstr "git repack [<opcions>]"
 
-#: builtin/repack.c:34
+#, fuzzy
 msgid ""
 "Incremental repacks are incompatible with bitmap indexes.  Use\n"
-"--no-write-bitmap-index or disable the pack.writebitmaps configuration."
+"--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:206
 msgid "could not start pack-objects to repack promisor objects"
 msgstr ""
 "no s'ha pogut iniciar pack-objects per a tornar a empaquetar els objectes "
 "«promisor»"
 
-#: builtin/repack.c:280 builtin/repack.c:824
 msgid "repack: Expecting full hex object ID lines only from pack-objects."
 msgstr ""
-"repack: s'esperen només línies amb l'id d'objecte hexadecimal complet des de"
-" pack-objects."
+"repack: s'esperen només línies amb l'id d'objecte hexadecimal complet des de "
+"pack-objects."
 
-#: builtin/repack.c:304
 msgid "could not finish pack-objects to repack promisor objects"
 msgstr ""
-"no s'ha pogut finalitzar pack-objects per a tornar a empaquetar els objectes"
-" «promisor»"
+"no s'ha pogut finalitzar pack-objects per a tornar a empaquetar els objectes "
+"«promisor»"
 
-#: builtin/repack.c:319
 #, c-format
 msgid "cannot open index for %s"
 msgstr "no s'ha pogut obrir l'índex per a %s"
 
-#: builtin/repack.c:378
 #, c-format
 msgid "pack %s too large to consider in geometric progression"
 msgstr ""
 "el paquet %s és massa gran per a considerar-ho en progressió geomètrica"
 
-#: builtin/repack.c:411 builtin/repack.c:418 builtin/repack.c:423
 #, c-format
 msgid "pack %s too large to roll up"
 msgstr "el paquet %s és massa gran per a enrotllar-lo"
 
-#: builtin/repack.c:503
 #, c-format
 msgid "could not open tempfile %s for writing"
 msgstr "no s'ha pogut obrir el fitxer temporal «%s» per a escriptura"
 
-#: builtin/repack.c:521
 msgid "could not close refs snapshot tempfile"
 msgstr ""
 "no s'ha pogut tancar el fitxer temporal amb la instantània de referències"
 
-#: builtin/repack.c:634
 msgid "pack everything in a single pack"
 msgstr "empaqueta-ho tot en un únic paquet"
 
-#: builtin/repack.c:636
 msgid "same as -a, and turn unreachable objects loose"
 msgstr "el mateix que -a, i solta els objectes inabastables"
 
-#: builtin/repack.c:639
+#, fuzzy
+msgid "same as -a, pack unreachable cruft objects separately"
+msgstr "el mateix que -a, i solta els objectes inabastables"
+
+msgid "approxidate"
+msgstr "data aproximada"
+
+#, fuzzy
+msgid "with -C, expire objects older than this"
+msgstr "fes caducar els objectes més antics que <data>"
+
 msgid "remove redundant packs, and run git-prune-packed"
 msgstr "elimina els paquets redundants, i executeu git-prune-packed"
 
-#: builtin/repack.c:641
 msgid "pass --no-reuse-delta to git-pack-objects"
 msgstr "passa --no-reuse-delta a git-pack-objects"
 
-#: builtin/repack.c:643
 msgid "pass --no-reuse-object to git-pack-objects"
 msgstr "passa --no-reuse-object a git-pack-objects"
 
-#: builtin/repack.c:645
 msgid "do not run git-update-server-info"
 msgstr "no executis git-update-server-info"
 
-#: builtin/repack.c:648
 msgid "pass --local to git-pack-objects"
 msgstr "passa --local a git-pack-objects"
 
-#: builtin/repack.c:650
 msgid "write bitmap index"
 msgstr "escriu índex de mapa de bits"
 
-#: builtin/repack.c:652
 msgid "pass --delta-islands to git-pack-objects"
 msgstr "passa --delta-islands a git-pack-objects"
 
-#: builtin/repack.c:653
-msgid "approxidate"
-msgstr "data aproximada"
-
-#: builtin/repack.c:654
 msgid "with -A, do not loosen objects older than this"
 msgstr "amb -A, no soltis els objectes més antics que aquest"
 
-#: builtin/repack.c:656
 msgid "with -a, repack unreachable objects"
 msgstr "amb -a, reempaqueta els objectes inabastables"
 
-#: builtin/repack.c:658
 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:659 builtin/repack.c:665
 msgid "bytes"
 msgstr "octets"
 
-#: builtin/repack.c:660
 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:662
 msgid "limits the maximum delta depth"
 msgstr "limita la profunditat màxima de les diferències"
 
-#: builtin/repack.c:664
 msgid "limits the maximum number of threads"
 msgstr "limita el nombre màxim de fils"
 
-#: builtin/repack.c:666
 msgid "maximum size of each packfile"
 msgstr "mida màxima de cada fitxer de paquet"
 
-#: builtin/repack.c:668
 msgid "repack objects in packs marked with .keep"
 msgstr "reempaqueta els objectes en paquets marcats amb .keep"
 
-#: builtin/repack.c:670
 msgid "do not repack this pack"
 msgstr "no reempaquetis aquest paquet"
 
-#: builtin/repack.c:672
 msgid "find a geometric progression with factor <N>"
 msgstr "troba una progressió geomètrica amb el factor <N>"
 
-#: builtin/repack.c:674
 msgid "write a multi-pack index of the resulting packs"
 msgstr "escriu un índex multipaquet dels paquets resultants"
 
-#: builtin/repack.c:684
 msgid "cannot delete packs in a precious-objects repo"
 msgstr "no es poden suprimir paquets en un repositori d'objectes preciosos"
 
-#: builtin/repack.c:833
 msgid "Nothing new to pack."
 msgstr "Res nou a empaquetar."
 
-#: builtin/repack.c:863
+#, fuzzy, c-format
+msgid "pack prefix %s does not begin with objdir %s"
+msgstr "el nom del fitxer de paquet «%s» no acaba amb «.%s»"
+
 #, c-format
 msgid "missing required file: %s"
 msgstr "falta el fitxer requerit: %s"
 
-#: builtin/repack.c:865
 #, c-format
 msgid "could not unlink: %s"
 msgstr "no s'ha pogut desenllaçar: «%s»"
 
-#: builtin/replace.c:22
 msgid "git replace [-f] <object> <replacement>"
 msgstr "git replace [-f] <objecte> <reemplaçament>"
 
-#: builtin/replace.c:23
 msgid "git replace [-f] --edit <object>"
 msgstr "git replace [-f] --edit <objecte>"
 
-#: builtin/replace.c:24
 msgid "git replace [-f] --graft <commit> [<parent>...]"
 msgstr "git replace [-f] --graft <comissió> [<parent>...]"
 
-#: builtin/replace.c:26
 msgid "git replace -d <object>..."
 msgstr "git replace -d <objecte>..."
 
-#: builtin/replace.c:27
 msgid "git replace [--format=<format>] [-l [<pattern>]]"
 msgstr "git replace [--format=<format>] [-l [<patró>]]"
 
-#: builtin/replace.c:90
 #, c-format
 msgid ""
 "invalid replace format '%s'\n"
@@ -22041,27 +10958,22 @@ msgstr ""
 "format de reemplaçament no vàlid «%s»\n"
 "els formats vàlids són «short» «medium» i «long»"
 
-#: builtin/replace.c:125
 #, c-format
 msgid "replace ref '%s' not found"
-msgstr "no s'ha trobat la referència de reemplaç '«%s»"
+msgstr "no s'ha trobat la referència de reemplaçament '«%s»"
 
-#: builtin/replace.c:141
 #, c-format
 msgid "Deleted replace ref '%s'"
 msgstr "S'ha suprimit la referència «%s»"
 
-#: builtin/replace.c:153
 #, c-format
 msgid "'%s' is not a valid ref name"
 msgstr "«%s» no és un nom de referència vàlid"
 
-#: builtin/replace.c:158
 #, c-format
 msgid "replace ref '%s' already exists"
 msgstr "la referència de reemplaçament «%s» ja existeix"
 
-#: builtin/replace.c:178
 #, c-format
 msgid ""
 "Objects must be of the same type.\n"
@@ -22072,75 +10984,59 @@ msgstr ""
 "«%s» apunta a un objecte substituït del tipus «%s»\n"
 "mentre que «%s» apunta a un objecte de substitució del tipus «%s»."
 
-#: builtin/replace.c:229
 #, c-format
 msgid "unable to open %s for writing"
 msgstr "no s'ha pogut obrir %s per a escriptura"
 
-#: builtin/replace.c:242
 msgid "cat-file reported failure"
 msgstr "cat-file ha informat d'un error"
 
-#: builtin/replace.c:258
 #, c-format
 msgid "unable to open %s for reading"
 msgstr "no s'ha pogut obrir %s per a lectura"
 
-#: builtin/replace.c:271
 msgid "unable to spawn mktree"
 msgstr "no s'ha pogut engendrar el mktree"
 
-#: builtin/replace.c:275
 msgid "unable to read from mktree"
 msgstr "no s'ha pogut llegir des de mktree"
 
-#: builtin/replace.c:284
 msgid "mktree reported failure"
 msgstr "mktree ha informat d'una fallada"
 
-#: builtin/replace.c:288
 msgid "mktree did not return an object name"
 msgstr "mktree no ha retornat un nom d'objecte"
 
-#: builtin/replace.c:297
 #, c-format
 msgid "unable to fstat %s"
 msgstr "no s'ha pogut fer fstat %s"
 
-#: builtin/replace.c:302
 msgid "unable to write object to database"
 msgstr "no s'ha pogut escriure l'objecte a la base de dades"
 
-#: builtin/replace.c:325
 #, c-format
 msgid "unable to get object type for %s"
 msgstr "no s'ha pogut obtenir el tipus d'objecte per a %s"
 
-#: builtin/replace.c:341
 msgid "editing object file failed"
 msgstr "l'edició del fitxer d'objecte ha fallat"
 
-#: builtin/replace.c:350
 #, c-format
 msgid "new object is the same as the old one: '%s'"
 msgstr "l'objecte nou és el mateix que l'antic: «%s»"
 
-#: builtin/replace.c:383
 #, c-format
 msgid "could not parse %s as a commit"
 msgstr "no s'ha pogut analitzar %s com a comissió"
 
-#: builtin/replace.c:415
 #, c-format
 msgid "bad mergetag in commit '%s'"
 msgstr "etiqueta de fusió incorrecta en la comissió «%s»"
 
-#: builtin/replace.c:417
 #, c-format
 msgid "malformed mergetag in commit '%s'"
 msgstr "etiqueta de fusió mal formada en la comissió «%s»"
 
-#: builtin/replace.c:429
 #, c-format
 msgid ""
 "original commit '%s' contains mergetag '%s' that is discarded; use --edit "
@@ -22149,31 +11045,25 @@ msgstr ""
 "la comissió original «%s» conté l'etiqueta de fusió «%s» que es descarta; "
 "useu --edit en lloc de --graft"
 
-#: builtin/replace.c:468
 #, c-format
 msgid "the original commit '%s' has a gpg signature"
 msgstr "la comissió original «%s» té una signatura gpg"
 
-#: builtin/replace.c:469
 msgid "the signature will be removed in the replacement commit!"
 msgstr "s'eliminarà la signatura en la comissió de reemplaçament!"
 
-#: builtin/replace.c:479
 #, c-format
 msgid "could not write replacement commit for: '%s'"
 msgstr "no s'ha pogut escriure la comissió de reemplaçament per a: «%s»"
 
-#: builtin/replace.c:487
 #, c-format
 msgid "graft for '%s' unnecessary"
 msgstr "«graft» per a «%s» innecessari"
 
-#: builtin/replace.c:491
 #, c-format
 msgid "new commit is the same as the old one: '%s'"
 msgstr "la comissió nova és la mateixa que l'antiga: «%s»"
 
-#: builtin/replace.c:526
 #, c-format
 msgid ""
 "could not convert the following graft(s):\n"
@@ -22182,270 +11072,212 @@ msgstr ""
 "no s'han pogut convertir els següents «grafts»:\n"
 "%s"
 
-#: builtin/replace.c:547
 msgid "list replace refs"
 msgstr "llista les referències de reemplaçament"
 
-#: builtin/replace.c:548
 msgid "delete replace refs"
 msgstr "suprimeix les referències de reemplaçament"
 
-#: builtin/replace.c:549
 msgid "edit existing object"
 msgstr "edita un objecte existent"
 
-#: builtin/replace.c:550
 msgid "change a commit's parents"
 msgstr "canvia els pares d'una comissió"
 
-#: builtin/replace.c:551
 msgid "convert existing graft file"
 msgstr "converteix el fitxer «graft» existent"
 
-#: builtin/replace.c:552
 msgid "replace the ref if it exists"
 msgstr "reemplaça la referència si existeix"
 
-#: builtin/replace.c:554
 msgid "do not pretty-print contents for --edit"
 msgstr "no imprimeixis bellament els continguts per a --edit"
 
-#: builtin/replace.c:555
 msgid "use this format"
 msgstr "usa aquest format"
 
-#: builtin/replace.c:568
 msgid "--format cannot be used when not listing"
 msgstr "no es pot utilitzar «--format» quan no s'està llistant"
 
-#: builtin/replace.c:576
 msgid "-f only makes sense when writing a replacement"
 msgstr "-f només té sentit quan s'escriu un reemplaçament"
 
-#: builtin/replace.c:580
 msgid "--raw only makes sense with --edit"
 msgstr "--raw només té sentit amb --edit"
 
-#: builtin/replace.c:586
 msgid "-d needs at least one argument"
 msgstr "-d necessita almenys un argument"
 
-#: builtin/replace.c:592
 msgid "bad number of arguments"
 msgstr "nombre incorrecte d'arguments"
 
-#: builtin/replace.c:598
 msgid "-e needs exactly one argument"
 msgstr "-e necessita exactament un argument"
 
-#: builtin/replace.c:604
 msgid "-g needs at least one argument"
 msgstr "-g necessita almenys un argument"
 
-#: builtin/replace.c:610
 msgid "--convert-graft-file takes no argument"
 msgstr "--convert-graft-file arguments"
 
-#: builtin/replace.c:616
 msgid "only one pattern can be given with -l"
 msgstr "només es pot especificar un patró amb -l"
 
-#: 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:58
 msgid "register clean resolutions in index"
 msgstr "registra les resolucions netes en l'índex"
 
-#: builtin/rerere.c:77
 msgid "'git rerere forget' without paths is deprecated"
 msgstr "«git rerere forget» sense camins està en desús"
 
-#: builtin/rerere.c:111
 #, c-format
 msgid "unable to generate diff for '%s'"
 msgstr "no s'ha pogut generar el diff per a «%s»"
 
-#: builtin/reset.c:33
 msgid ""
 "git reset [--mixed | --soft | --hard | --merge | --keep] [-q] [<commit>]"
 msgstr ""
 "git reset [--mixed | --soft | --hard | --merge | --keep] [-q] [<comissió>]"
 
-#: builtin/reset.c:34
 msgid "git reset [-q] [<tree-ish>] [--] <pathspec>..."
 msgstr "git reset [-q] [<tree-ish>] [--] <pathspec>..."
 
-#: builtin/reset.c:35
 msgid ""
 "git reset [-q] [--pathspec-from-file [--pathspec-file-nul]] [<tree-ish>]"
 msgstr ""
 "git reset [-q] [--pathspec-from-file [--pathspec-file-nul]] [<tree-ish>]"
 
-#: builtin/reset.c:36
 msgid "git reset --patch [<tree-ish>] [--] [<pathspec>...]"
 msgstr "git reset --patch [<tree-ish>] [--] [<pathspec>...]"
 
-#: builtin/reset.c:42
 msgid "mixed"
 msgstr "mixt"
 
-#: builtin/reset.c:42
 msgid "soft"
 msgstr "suau"
 
-#: builtin/reset.c:42
 msgid "hard"
 msgstr "dur"
 
-#: builtin/reset.c:42
 msgid "merge"
 msgstr "fusió"
 
-#: builtin/reset.c:42
 msgid "keep"
 msgstr "reteniment"
 
-#: builtin/reset.c:90
 msgid "You do not have a valid HEAD."
 msgstr "No teniu un HEAD vàlid."
 
-#: builtin/reset.c:92
 msgid "Failed to find tree of HEAD."
 msgstr "S'ha produït un error en trobar l'arbre de HEAD."
 
-#: builtin/reset.c:98
 #, 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:123
 #, c-format
 msgid "HEAD is now at %s"
 msgstr "HEAD ara és a %s"
 
-#: builtin/reset.c:304
 #, 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:402 builtin/stash.c:606 builtin/stash.c:669
-#: builtin/stash.c:693
 msgid "be quiet, only report errors"
 msgstr "sigues silenciós, només informa d'errors"
 
-#: builtin/reset.c:404
 msgid "skip refreshing the index after reset"
 msgstr "omet l'actualització de l'índex després de reiniciar"
 
-#: builtin/reset.c:406
 msgid "reset HEAD and index"
 msgstr "restableix HEAD i l'índex"
 
-#: builtin/reset.c:407
 msgid "reset only HEAD"
 msgstr "restableix només HEAD"
 
-#: builtin/reset.c:409 builtin/reset.c:411
 msgid "reset HEAD, index and working tree"
 msgstr "restableix HEAD, l'índex i l'arbre de treball"
 
-#: builtin/reset.c:413
 msgid "reset HEAD but keep local changes"
 msgstr "restableix HEAD però retén els canvis locals"
 
-#: builtin/reset.c:419
 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:452
 #, 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:460
 #, 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:479
 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:481
 #, c-format
 msgid "Cannot do %s reset with paths."
 msgstr "No es pot restablir de %s amb camins."
 
-#: builtin/reset.c:496
 #, 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:527
 msgid "Unstaged changes after reset:"
 msgstr "Canvis «unstaged» després del restabliment:"
 
-#: builtin/reset.c:530
-#, c-format, fuzzy
+#, fuzzy, c-format
 msgid ""
 "It took %.2f seconds to refresh the index after reset.  You can use\n"
 "'--no-refresh' to avoid this."
 msgstr ""
-"Es van trigar un temps de,2f segons a actualitzar l'índex després de reiniciar.  Pots utilitzar\n"
+"Es van trigar un temps de,2f segons a actualitzar l'índex després de "
+"reiniciar.  Pots utilitzar\n"
 ".--no-refresh' per evitar això."
 
-#: builtin/reset.c:547
 #, 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:552
 msgid "Could not write new index file."
 msgstr "No s'ha pogut escriure el fitxer d'índex nou."
 
-#: builtin/rev-list.c:659
+#, c-format
+msgid "unable to get disk usage of %s"
+msgstr "no s'ha pogut obtenir l'ús del disc de %s"
+
 msgid "rev-list does not support display of notes"
 msgstr "el rev-list no permet mostrar notes"
 
-#: builtin/rev-list.c:664
 #, c-format
 msgid "marked counting and '%s' cannot be used together"
 msgstr "«marked counting» i «%s» no es poden usar junts"
 
-#: builtin/rev-parse.c:409
 msgid "git rev-parse --parseopt [<options>] -- [<args>...]"
 msgstr "git rev-parse --parseopt [<opcions>] -- [<arguments>...]"
 
-#: builtin/rev-parse.c:414
 msgid "keep the `--` passed as an arg"
 msgstr "retén el «--» passat com a argument"
 
-#: builtin/rev-parse.c:416
 msgid "stop parsing after the first non-option argument"
 msgstr "deixa d'analitzar després del primer argument que no sigui d'opció"
 
-#: builtin/rev-parse.c:419
 msgid "output in stuck long form"
 msgstr "emet en forma llarga enganxada"
 
-#: builtin/rev-parse.c:438
 msgid "premature end of input"
 msgstr "final prematur de l'entrada"
 
-#: builtin/rev-parse.c:442
 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
 msgid "Needed a single revision"
 msgstr "Cal una sola revisió"
 
-#: builtin/rev-parse.c:552
 msgid ""
 "git rev-parse --parseopt [<options>] -- [<args>...]\n"
 "   or: git rev-parse --sq-quote [<arg>...]\n"
@@ -22457,147 +11289,120 @@ msgstr ""
 "   o bé: git rev-parse --sq-quote [<arg>...]\n"
 "   o bé: git rev-parse [<options>] [<arg>...]\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
 msgid "--resolve-git-dir requires an argument"
 msgstr "--resolve-git-dir requereix un argument"
 
-#: builtin/rev-parse.c:715
 #, c-format
 msgid "not a gitdir '%s'"
 msgstr "no és un directori git «%s»"
 
-#: builtin/rev-parse.c:739
 msgid "--git-path requires an argument"
 msgstr "--git-path requereix un argument"
 
-#: builtin/rev-parse.c:749
 msgid "-n requires an argument"
 msgstr "-n requereix un argument"
 
-#: builtin/rev-parse.c:763
 msgid "--path-format requires an argument"
 msgstr "--path-format requereix un argument"
 
-#: builtin/rev-parse.c:769
 #, c-format
 msgid "unknown argument to --path-format: %s"
 msgstr "argument no vàlid per a --path-format: %s"
 
-#: builtin/rev-parse.c:776
 msgid "--default requires an argument"
 msgstr "--default requereix un argument"
 
-#: builtin/rev-parse.c:782
 msgid "--prefix requires an argument"
 msgstr "--prefix requereix un argument"
 
-#: builtin/rev-parse.c:851
 #, c-format
 msgid "unknown mode for --abbrev-ref: %s"
 msgstr "mode desconegut per a --abbrev-ref: %s"
 
-#: builtin/rev-parse.c:1023
+msgid "this operation must be run in a work tree"
+msgstr "aquesta operació s'ha d'executar en un arbre de treball"
+
 #, c-format
 msgid "unknown mode for --show-object-format: %s"
 msgstr "mode desconegut per a --show-object-format: %s"
 
-#: builtin/revert.c:24
 msgid "git revert [<options>] <commit-ish>..."
 msgstr "git revert [<opcions>] <comissió>..."
 
-#: builtin/revert.c:25
 msgid "git revert <subcommand>"
 msgstr "git revert <subordre>"
 
-#: builtin/revert.c:30
 msgid "git cherry-pick [<options>] <commit-ish>..."
 msgstr "git cherry-pick [<opcions>] <comissió>..."
 
-#: builtin/revert.c:31
 msgid "git cherry-pick <subcommand>"
 msgstr "git cherry-pick <subordre>"
 
-#: builtin/revert.c:72
 #, c-format
 msgid "option `%s' expects a number greater than zero"
 msgstr "l'opció «%s» espera un nombre major que zero"
 
-#: builtin/revert.c:92
 #, c-format
 msgid "%s: %s cannot be used with %s"
 msgstr "%s: %s no es pot usar amb %s"
 
-#: builtin/revert.c:102
 msgid "end revert or cherry-pick sequence"
 msgstr "acaba la seqüència de reversió o el «cherry pick»"
 
-#: builtin/revert.c:103
 msgid "resume revert or cherry-pick sequence"
 msgstr "reprèn la seqüència de reversió o el «cherry pick»"
 
-#: builtin/revert.c:104
 msgid "cancel revert or cherry-pick sequence"
 msgstr "cancel·la la seqüència de reversió o el «cherry pick»"
 
-#: builtin/revert.c:105
 msgid "skip current commit and continue"
 msgstr "omet la comissió actual i continua"
 
-#: builtin/revert.c:107
 msgid "don't automatically commit"
 msgstr "no cometis automàticament"
 
-#: builtin/revert.c:108
 msgid "edit the commit message"
 msgstr "edita el missatge de comissió"
 
-#: builtin/revert.c:111
 msgid "parent-number"
 msgstr "número del pare"
 
-#: builtin/revert.c:112
 msgid "select mainline parent"
 msgstr "selecciona la línia principal del pare"
 
-#: builtin/revert.c:114
 msgid "merge strategy"
 msgstr "estratègia de fusió"
 
-#: builtin/revert.c:116
 msgid "option for merge strategy"
 msgstr "opció d'estratègia de fusió"
 
-#: builtin/revert.c:125
 msgid "append commit name"
 msgstr "nom de la comissió a annexar"
 
-#: builtin/revert.c:127
 msgid "preserve initially empty commits"
 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:241
+msgid "use the 'reference' format to refer to commits"
+msgstr ""
+
 msgid "revert failed"
 msgstr "la reversió ha fallat"
 
-#: builtin/revert.c:254
 msgid "cherry-pick failed"
 msgstr "el «cherry pick» ha fallat"
 
-#: builtin/rm.c:20
 msgid "git rm [<options>] [--] <file>..."
 msgstr "git rm [<opcions>] [--] <fitxer>..."
 
-#: builtin/rm.c:208
 msgid ""
 "the following file has staged content different from both the\n"
 "file and the HEAD:"
@@ -22611,7 +11416,6 @@ msgstr[1] ""
 "els fitxers següents tenen contingut «staged» diferent al fitxer\n"
 "i a HEAD:"
 
-#: builtin/rm.c:213
 msgid ""
 "\n"
 "(use -f to force removal)"
@@ -22619,13 +11423,11 @@ msgstr ""
 "\n"
 "(useu -f per a forçar l'eliminació)"
 
-#: 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] "el fitxer següent té canvis «staged» en l'índex:"
 msgstr[1] "els fitxers següents tenen canvis «staged» en l'índex:"
 
-#: builtin/rm.c:221 builtin/rm.c:230
 msgid ""
 "\n"
 "(use --cached to keep the file, or -f to force removal)"
@@ -22633,53 +11435,42 @@ msgstr ""
 "\n"
 "(useu --cached per a mantenir el fitxer, o -f per a forçar l'eliminació)"
 
-#: builtin/rm.c:227
 msgid "the following file has local modifications:"
 msgid_plural "the following files have local modifications:"
 msgstr[0] "el fitxer següent té modificacions locals:"
 msgstr[1] "els fitxers següents tenen modificacions locals:"
 
-#: builtin/rm.c:245
 msgid "do not list removed files"
 msgstr "no llistis els fitxers eliminats"
 
-#: builtin/rm.c:246
 msgid "only remove from the index"
 msgstr "només elimina de l'índex"
 
-#: builtin/rm.c:247
 msgid "override the up-to-date check"
 msgstr "passa per alt la comprovació d'actualitat"
 
-#: builtin/rm.c:248
 msgid "allow recursive removal"
 msgstr "permet l'eliminació recursiva"
 
-#: 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:285
 msgid "No pathspec was given. Which files should I remove?"
 msgstr ""
 "No s'ha indicat cap especificació de camí. Quins fitxers s'han de suprimir?"
 
-#: builtin/rm.c:315
 msgid "please stage your changes to .gitmodules or stash them to proceed"
 msgstr ""
 "feu un «stage» dels canvis a .gitmodules o feu un «stash» per a continuar"
 
-#: builtin/rm.c:337
 #, c-format
 msgid "not removing '%s' recursively without -r"
 msgstr "no s'eliminarà «%s» recursivament sense -r"
 
-#: 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
 msgid ""
 "git send-pack [--mirror] [--dry-run] [--force]\n"
 "              [--receive-pack=<git-receive-pack>]\n"
@@ -22691,82 +11482,63 @@ msgstr ""
 "              [--verbose] [--thin] [--atomic]\n"
 "              [<host>:]<directory> (--all | <ref>...)"
 
-#: builtin/send-pack.c:192
 msgid "remote name"
 msgstr "nom del remot"
 
-#: builtin/send-pack.c:205
 msgid "use stateless RPC protocol"
 msgstr "usa el protocol RPC sense estat"
 
-#: builtin/send-pack.c:206
 msgid "read refs from stdin"
 msgstr "llegeix les referències des de stdin"
 
-#: builtin/send-pack.c:207
 msgid "print status from remote helper"
 msgstr "imprimeix l'estat des de l'ajudant remot"
 
-#: builtin/shortlog.c:16
 msgid "git shortlog [<options>] [<revision-range>] [[--] <path>...]"
 msgstr "git shortlog [<opcions>] [<rang-de-revisions>] [[--] <camí>...]"
 
-#: builtin/shortlog.c:17
 msgid "git log --pretty=short | git shortlog [<options>]"
 msgstr "git log --pretty=short | git shortlog [<opcions>]"
 
-#: builtin/shortlog.c:123
 msgid "using multiple --group options with stdin is not supported"
 msgstr "no s'admet l'ús de múltiples opcions --group amb stdin"
 
-#: builtin/shortlog.c:133
 msgid "using --group=trailer with stdin is not supported"
 msgstr "no s'admet l'ús de --group=trailer amb stdin"
 
-#: builtin/shortlog.c:323
 #, c-format
 msgid "unknown group type: %s"
 msgstr "tipus de grup desconegut: %s"
 
-#: builtin/shortlog.c:351
 msgid "group by committer rather than author"
 msgstr "agrupa per «comitter» en comptes de per autor"
 
-#: builtin/shortlog.c:354
 msgid "sort output according to the number of commits per author"
 msgstr "ordena la sortida segons el nombre de comissions per autor"
 
-#: builtin/shortlog.c:356
 msgid "suppress commit descriptions, only provides commit count"
 msgstr ""
 "omet les descripcions de les comissions, només proveeix el recompte de "
 "comissions"
 
-#: builtin/shortlog.c:358
 msgid "show the email address of each author"
 msgstr "mostra l'adreça electrònica de cada autor"
 
-#: builtin/shortlog.c:359
 msgid "<w>[,<i1>[,<i2>]]"
 msgstr "<w>[,<i1>[,<i2>]]"
 
-#: builtin/shortlog.c:360
 msgid "linewrap output"
 msgstr "ajusta les línies de la sortida"
 
-#: builtin/shortlog.c:362
 msgid "field"
 msgstr "camp"
 
-#: builtin/shortlog.c:363
 msgid "group by field"
 msgstr "agrupa per camp"
 
-#: builtin/shortlog.c:395
 msgid "too many arguments given outside repository"
 msgstr "hi ha massa arguments donats fora del repositori"
 
-#: builtin/show-branch.c:14
 msgid ""
 "git show-branch [-a | --all] [-r | --remotes] [--topo-order | --date-order]\n"
 "                [--current] [--color[=<when>] | --no-color] [--sparse]\n"
@@ -22778,266 +11550,209 @@ msgstr ""
 "                [--more=<n> | --list | --independent | --merge-base]\n"
 "                [--no-name | --sha1-name] [--topics] [(<rev> | <glob>)...]"
 
-#: builtin/show-branch.c:18
 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:396
 #, c-format
 msgid "ignoring %s; cannot handle more than %d ref"
 msgid_plural "ignoring %s; cannot handle more than %d refs"
 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
 #, c-format
 msgid "no matching refs with %s"
 msgstr "no hi ha referències coincidents amb %s"
 
-#: builtin/show-branch.c:645
 msgid "show remote-tracking and local branches"
 msgstr "mostra les branques amb seguiment remot i les locals"
 
-#: builtin/show-branch.c:647
 msgid "show remote-tracking branches"
 msgstr "mostra les branques amb seguiment remot"
 
-#: builtin/show-branch.c:649
 msgid "color '*!+-' corresponding to the branch"
 msgstr "colora «*!+-» corresponent a la branca"
 
-#: builtin/show-branch.c:651
 msgid "show <n> more commits after the common ancestor"
 msgstr "mostra <n> comissions després de l'avantpassat comú"
 
-#: builtin/show-branch.c:653
 msgid "synonym to more=-1"
 msgstr "sinònim de more=-1"
 
-#: builtin/show-branch.c:654
 msgid "suppress naming strings"
 msgstr "omet anomenar cadenes"
 
-#: builtin/show-branch.c:656
 msgid "include the current branch"
 msgstr "inclou la branca actual"
 
-#: builtin/show-branch.c:658
 msgid "name commits with their object names"
 msgstr "anomena les comissions amb els seus noms d'objecte"
 
-#: builtin/show-branch.c:660
 msgid "show possible merge bases"
 msgstr "mostra les bases de fusió possibles"
 
-#: builtin/show-branch.c:662
 msgid "show refs unreachable from any other ref"
 msgstr "mostra les referències inabastables de qualsevol altra referència"
 
-#: builtin/show-branch.c:664
 msgid "show commits in topological order"
 msgstr "mostra les comissions en ordre topològic"
 
-#: builtin/show-branch.c:667
 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
 msgid "show merges reachable from only one tip"
 msgstr "mostra les fusions abastables de només una punta"
 
-#: builtin/show-branch.c:671
 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
 msgid "<n>[,<base>]"
 msgstr "<n>[,<base>]"
 
-#: builtin/show-branch.c:675
 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:735
 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
 msgid "--reflog option needs one branch name"
 msgstr "l'opció --reflog necessita un nom de branca"
 
-#: builtin/show-branch.c:741
 #, 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
 #, c-format
 msgid "no such ref %s"
 msgstr "no hi ha tal referència %s"
 
-#: builtin/show-branch.c:831
 #, 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
 #, c-format
 msgid "'%s' is not a valid ref."
 msgstr "«%s» no és una referència vàlida."
 
-#: builtin/show-branch.c:838
 #, c-format
 msgid "cannot find commit %s (%s)"
 msgstr "no es pot trobar la comissió %s (%s)"
 
-#: builtin/show-index.c:21
 msgid "hash-algorithm"
 msgstr "algorisme de resum"
 
-#: builtin/show-index.c:31
 msgid "Unknown hash algorithm"
 msgstr "Algorisme de resum desconegut"
 
-#: 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>]"
 msgstr "git show-ref --exclude-existing[=<patró>]"
 
-#: builtin/show-ref.c:162
 msgid "only show tags (can be combined with heads)"
 msgstr "mostra només les etiquetes (es pot combinar amb heads)"
 
-#: builtin/show-ref.c:163
 msgid "only show heads (can be combined with tags)"
 msgstr "mostra només els caps (es pot combinar amb tags)"
 
-#: builtin/show-ref.c:164
 msgid "stricter reference checking, requires exact ref path"
 msgstr ""
 "comprovació de referència més estricta, requereix el camí de referència "
 "exacte"
 
-#: builtin/show-ref.c:167 builtin/show-ref.c:169
 msgid "show the HEAD reference, even if it would be filtered out"
 msgstr "mostra la referència HEAD, encara que es filtrés"
 
-#: builtin/show-ref.c:171
 msgid "dereference tags into object IDs"
 msgstr "desreferencia les etiquetes a ID d'objecte"
 
-#: builtin/show-ref.c:173
 msgid "only show SHA1 hash using <n> digits"
 msgstr "mostra el hash SHA1 usant només <n> xifres"
 
-#: builtin/show-ref.c:177
 msgid "do not print results to stdout (useful with --verify)"
 msgstr "no imprimeixis els resultats a stdout (útil amb --verify)"
 
-#: builtin/show-ref.c:179
 msgid "show refs from stdin that aren't in local repository"
 msgstr "mostra les referències de stdin que no siguin en el repositori local"
 
-#: builtin/sparse-checkout.c:23
 msgid "git sparse-checkout (init|list|set|add|reapply|disable) <options>"
 msgstr "git sparse-checkout (init|list|set|add|reapply|disable) <opcions>"
 
-#: builtin/sparse-checkout.c:61
 msgid "this worktree is not sparse"
 msgstr "aquest arbre de treball no és dispers"
 
-#: builtin/sparse-checkout.c:76
 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:177
 #, c-format
 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 "
-"sparse-checkout"
+"el directori «%s» conté fitxers no seguits, però no està en el con de sparse-"
+"checkout"
 
-#: builtin/sparse-checkout.c:185
 #, c-format
 msgid "failed to remove directory '%s'"
 msgstr "s'ha produït un error en suprimir el directori «%s»"
 
-#: builtin/sparse-checkout.c:327
 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:366
 #, fuzzy
 msgid "failed to initialize worktree config"
 msgstr "no s'ha pogut inicialitzar l'arbre de treball to"
 
-#: builtin/sparse-checkout.c:411
 msgid "failed to modify sparse-index config"
 msgstr "no s'ha pogut modificar la configuració de l'índex dispers"
 
-#: builtin/sparse-checkout.c:441 builtin/sparse-checkout.c:793
-#: builtin/sparse-checkout.c:847
 msgid "initialize the sparse-checkout in cone mode"
 msgstr "inicialitza el «sparse-checkout» en mode con"
 
-#: builtin/sparse-checkout.c:443 builtin/sparse-checkout.c:795
-#: builtin/sparse-checkout.c:849
 msgid "toggle the use of a sparse index"
 msgstr "commuta l'ús d'un índex dispers"
 
-#: builtin/sparse-checkout.c:479
+#, c-format
+msgid "unable to create leading directories of %s"
+msgstr "no s'han pogut crear els directoris inicials de «%s»"
+
 #, c-format
 msgid "failed to open '%s'"
 msgstr "s'ha produït un error en obrir «%s»"
 
-#: builtin/sparse-checkout.c:531
 #, c-format
 msgid "could not normalize path %s"
 msgstr "no s'ha pogut normalitzar el camí %s"
 
-#: builtin/sparse-checkout.c:560
 #, c-format
 msgid "unable to unquote C-style string '%s'"
 msgstr "no s'ha pogut treure la cita a la cadena amb estil C «%s»"
 
-#: builtin/sparse-checkout.c:615 builtin/sparse-checkout.c:643
 msgid "unable to load existing sparse-checkout patterns"
 msgstr "no s'han pogut carregar els patrons de «sparse-checkout» existents"
 
-#: builtin/sparse-checkout.c:619
 msgid "existing sparse-checkout patterns do not use cone mode"
 msgstr "els patrons de «sparse-checkout» existents no usen el mode con"
 
-#: builtin/sparse-checkout.c:707
 #, fuzzy
 msgid "please run from the toplevel directory in non-cone mode"
 msgstr ""
-"executeu des del directori de nivell superior en mode que no sigui "
-"compatible"
+"executeu des del directori de nivell superior en mode que no sigui compatible"
 
-#: builtin/sparse-checkout.c:712
 #, fuzzy
 msgid "specify directories rather than patterns (no leading slash)"
-msgstr ""
-"especifica els directoris en lloc dels patrons (sense barra inclinada)"
+msgstr "especifica els directoris en lloc dels patrons (sense barra inclinada)"
 
-#: builtin/sparse-checkout.c:714
 #, fuzzy
 msgid ""
 "specify directories rather than patterns.  If your directory starts with a "
@@ -23046,7 +11761,6 @@ msgstr ""
 "especifica els directoris en lloc dels patrons.  Si el vostre directori "
 "comença amb un '!', passeu --skip-checks"
 
-#: builtin/sparse-checkout.c:716
 #, fuzzy
 msgid ""
 "specify directories rather than patterns.  If your directory really has any "
@@ -23055,17 +11769,15 @@ msgstr ""
 "especifica els directoris en lloc dels patrons.  Si el vostre directori "
 "realment té alguna de '*?\\\\', passeu --skip-checks"
 
-#: builtin/sparse-checkout.c:732
-#, c-format, fuzzy
+#, fuzzy, c-format
 msgid ""
-"'%s' is not a directory; to treat it as a directory anyway, rerun with "
-"--skip-checks"
+"'%s' is not a directory; to treat it as a directory anyway, rerun with --"
+"skip-checks"
 msgstr ""
 "%%s' no és un directori; per tractar-lo com un directori de totes maneres, "
 "torneu a executar amb --skip-checks"
 
-#: builtin/sparse-checkout.c:734
-#, c-format, fuzzy
+#, fuzzy, c-format
 msgid ""
 "pass a leading slash before paths such as '%s' if you want a single file "
 "(see NON-CONE PROBLEMS in the git-sparse-checkout manual)."
@@ -23073,11 +11785,9 @@ msgstr ""
 "passa una barra d'inici abans dels camins com ara «%s» si voleu un sol "
 "fitxer (vegeu els problemes NO CONE al manual de git-sparse-checkout)."
 
-#: builtin/sparse-checkout.c:739
 msgid "git sparse-checkout add [--skip-checks] (--stdin | <patterns>)"
 msgstr "git sparse-checkout add [--skip-checks] (--stdin | <patterns>)"
 
-#: builtin/sparse-checkout.c:752 builtin/sparse-checkout.c:797
 #, fuzzy
 msgid ""
 "skip some sanity checks on the given paths that might give false positives"
@@ -23085,15 +11795,12 @@ msgstr ""
 "omet alguns controls de sanitat en els camins donats que podrien donar "
 "falsos positius"
 
-#: builtin/sparse-checkout.c:755 builtin/sparse-checkout.c:800
 msgid "read patterns from standard in"
 msgstr "llegeix els patrons de l'entrada estàndard"
 
-#: builtin/sparse-checkout.c:760
 msgid "no sparse-checkout to add to"
 msgstr "no hi ha un sparse-checkout a afegir"
 
-#: builtin/sparse-checkout.c:775
 msgid ""
 "git sparse-checkout set [--[no-]cone] [--[no-]sparse-index] [--skip-checks] "
 "(--stdin | <patterns>)"
@@ -23101,68 +11808,59 @@ msgstr ""
 "git sparse-checkout set [--[no-]cone] [--[no-]sparse-index] [--skip-checks] "
 "(--stdin | <patterns>)"
 
-#: builtin/sparse-checkout.c:854
 msgid "must be in a sparse-checkout to reapply sparsity patterns"
 msgstr ""
 "ha d'estar en un sparse-checkout per a tornar a aplicar patrons de dispersió"
 
-#: builtin/sparse-checkout.c:914
 msgid "error while refreshing working directory"
 msgstr "s'ha produït un error en actualitzar el directori de treball"
 
-#: builtin/stash.c:24 builtin/stash.c:40
 msgid "git stash list [<options>]"
 msgstr "git stash list [<opcions>]"
 
-#: builtin/stash.c:25 builtin/stash.c:45
 msgid "git stash show [<options>] [<stash>]"
 msgstr "git stash show [<opcions>] [<stash>]"
 
-#: builtin/stash.c:26 builtin/stash.c:50
 msgid "git stash drop [-q|--quiet] [<stash>]"
 msgstr "git stash drop [-q|--quiet] [<stash>]"
 
-#: builtin/stash.c:27
 msgid "git stash ( pop | apply ) [--index] [-q|--quiet] [<stash>]"
 msgstr "git stash ( pop | apply ) [--index] [-q|--quiet] [<stash>]"
 
-#: builtin/stash.c:28 builtin/stash.c:65
 msgid "git stash branch <branchname> [<stash>]"
 msgstr "git stash branch <nom-de-branca> [<stash>]"
 
-#: builtin/stash.c:30
 msgid ""
-"git stash [push [-p|--patch] [-S|--staged] [-k|--[no-]keep-index] [-q|--quiet]\n"
+"git stash [push [-p|--patch] [-S|--staged] [-k|--[no-]keep-index] [-q|--"
+"quiet]\n"
 "          [-u|--include-untracked] [-a|--all] [-m|--message <message>]\n"
 "          [--pathspec-from-file=<file> [--pathspec-file-nul]]\n"
 "          [--] [<pathspec>...]]"
 msgstr ""
-"git stash [push [-p|--patch] [-S|--staged] [-k|--[no-]keep-index] [-q|--quiet]\n"
+"git stash [push [-p|--patch] [-S|--staged] [-k|--[no-]keep-index] [-q|--"
+"quiet]\n"
 "          [-u|--include-untracked] [-a|--all] [-m|--message <missatge>]\n"
 "          [--pathspec-from-file=<fitxer> [--pathspec-file-nul]]\n"
 "          [--] [<pathspec>...]]"
 
-#: builtin/stash.c:34
 msgid ""
-"git stash save [-p|--patch] [-S|--staged] [-k|--[no-]keep-index] [-q|--quiet]\n"
+"git stash save [-p|--patch] [-S|--staged] [-k|--[no-]keep-index] [-q|--"
+"quiet]\n"
 "          [-u|--include-untracked] [-a|--all] [<message>]"
 msgstr ""
-"git stash save [-p|--patch] [-S|--staged] [-k|--[no-]keep-index] [-q|--quiet]\n"
+"git stash save [-p|--patch] [-S|--staged] [-k|--[no-]keep-index] [-q|--"
+"quiet]\n"
 "          [-u|--include-untracked] [-a|--all] [<missatge>]"
 
-#: builtin/stash.c:55
 msgid "git stash pop [--index] [-q|--quiet] [<stash>]"
 msgstr "git stash pop [--index] [-q|--quiet] [<stash>]"
 
-#: builtin/stash.c:60
 msgid "git stash apply [--index] [-q|--quiet] [<stash>]"
 msgstr "git stash apply [--index] [-q|--quiet] [<stash>]"
 
-#: builtin/stash.c:75
 msgid "git stash store [-m|--message <message>] [-q|--quiet] <commit>"
 msgstr "git stash store [-m|--message <missatge>] [-q|--quiet] <commit>"
 
-#: 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"
@@ -23172,7 +11870,6 @@ msgstr ""
 "          [-u|--include-untracked] [-a|--all] [-m|--message <missatge>]\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>]"
@@ -23180,30 +11877,24 @@ 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"
 msgstr "«%s» no és una comissió de tipus «stash»"
 
-#: builtin/stash.c:150
 #, c-format
 msgid "Too many revisions specified:%s"
 msgstr "S'han especificat massa revisions:%s"
 
-#: builtin/stash.c:164
 msgid "No stash entries found."
-msgstr "No s'ha trobat cap «stash»."
+msgstr "No s'ha trobat cap entrada «stash»."
 
-#: builtin/stash.c:178
 #, c-format
 msgid "%s is not a valid reference"
 msgstr "«%s» no és una referència vàlida"
 
-#: builtin/stash.c:227
 msgid "git stash clear with arguments is unimplemented"
 msgstr "git stash clear amb paràmetres no està implementat"
 
-#: builtin/stash.c:447
 #, c-format
 msgid ""
 "WARNING: Untracked file in way of tracked file!  Renaming\n"
@@ -23214,201 +11905,150 @@ msgstr ""
 "            %s -> %s\n"
 "         per a fer-ne espai.\n"
 
-#: 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:519
 #, c-format
 msgid "could not generate diff %s^!."
 msgstr "no s'ha pogut generar diff %s^!."
 
-#: builtin/stash.c:526
 msgid "conflicts in index. Try without --index."
 msgstr "hi ha conflictes en l'índex. Proveu-ho sense --index."
 
-#: builtin/stash.c:532
 msgid "could not save index tree"
 msgstr "no s'ha pogut desar l'arbre d'índex"
 
-#: builtin/stash.c:552
 #, c-format
 msgid "Merging %s with %s"
 msgstr "S'està fusionant %s amb %s"
 
-#: builtin/stash.c:562
 msgid "Index was not unstashed."
 msgstr "L'índex no estava «unstashed»."
 
-#: builtin/stash.c:576
 msgid "could not restore untracked files from stash"
 msgstr "no s'han pogut restaurar els fitxers no seguits des del «stash»"
 
-#: builtin/stash.c:608 builtin/stash.c:695
 msgid "attempt to recreate the index"
 msgstr "intenta tornar a crear l'índex"
 
-#: builtin/stash.c:641
 #, c-format
 msgid "Dropped %s (%s)"
 msgstr "Descartada %s (%s)"
 
-#: builtin/stash.c:644
 #, c-format
 msgid "%s: Could not drop stash entry"
 msgstr "%s: no s'ha pogut descartar l'entrada «stash»"
 
-#: builtin/stash.c:657
 #, c-format
 msgid "'%s' is not a stash reference"
 msgstr "«%s» no és una referència «stash»"
 
-#: builtin/stash.c:707
 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:730
 msgid "No branch name specified"
 msgstr "Cap nom de branca especificat"
 
-#: builtin/stash.c:809
 msgid "failed to parse tree"
 msgstr "s'ha produït un error en analitzar l'arbre"
 
-#: builtin/stash.c:820
 msgid "failed to unpack trees"
 msgstr "s'ha produït un error en desempaquetar els arbres"
 
-#: builtin/stash.c:840
 msgid "include untracked files in the stash"
 msgstr "inclou els fitxers no seguits a «stash»"
 
-#: builtin/stash.c:843
 msgid "only show untracked files in the stash"
 msgstr "mostra només els fitxers no seguits a «stash»"
 
-#: builtin/stash.c:930 builtin/stash.c:967
 #, c-format
 msgid "Cannot update %s with %s"
 msgstr "No es pot actualitzar %s amb %s"
 
-#: builtin/stash.c:948 builtin/stash.c:1667 builtin/stash.c:1739
 msgid "stash message"
 msgstr "missatge «stash»"
 
-#: builtin/stash.c:958
 msgid "\"git stash store\" requires one <commit> argument"
 msgstr "«git stash store» requereix un argument <comissió>"
 
-#: builtin/stash.c:1143
 msgid "No staged changes"
 msgstr "No hi ha canvis a «stage»"
 
-#: builtin/stash.c:1204
 msgid "No changes selected"
 msgstr "No hi ha canvis seleccionats"
 
-#: builtin/stash.c:1304
 msgid "You do not have the initial commit yet"
 msgstr "Encara no teniu la comissió inicial"
 
-#: builtin/stash.c:1331
 msgid "Cannot save the current index state"
 msgstr "No es pot desar l'estat d'índex actual"
 
-#: builtin/stash.c:1340
 msgid "Cannot save the untracked files"
 msgstr "No es poden desar els fitxers no seguits"
 
-#: builtin/stash.c:1351 builtin/stash.c:1370
 msgid "Cannot save the current worktree state"
 msgstr "No es pot desar l'estat d'arbre de treball actual"
 
-#: builtin/stash.c:1361
 msgid "Cannot save the current staged state"
 msgstr "No es pot desar l'estat «stage» actual"
 
-#: builtin/stash.c:1398
 msgid "Cannot record working tree state"
 msgstr "No es pot registrar l'estat de l'arbre de treball"
 
-#: builtin/stash.c:1447
 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:1458
 msgid "Can't use --staged and --include-untracked or --all at the same time"
 msgstr "No es poden usar --staged i --include-untracked o --all a la vegada"
 
-#: builtin/stash.c:1476
 msgid "Did you forget to 'git add'?"
 msgstr "Heu oblidat de fer «git add»?"
 
-#: builtin/stash.c:1491
 msgid "No local changes to save"
 msgstr "No hi ha canvis locals a desar"
 
-#: builtin/stash.c:1498
 msgid "Cannot initialize stash"
 msgstr "No es pot inicialitzar el magatzem"
 
-#: builtin/stash.c:1513
 msgid "Cannot save the current status"
 msgstr "No es pot desar l'estat actual"
 
-#: builtin/stash.c:1518
 #, 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:1615
 msgid "Cannot remove worktree changes"
 msgstr "No es poden eliminar els canvis de l'arbre de treball"
 
-#: builtin/stash.c:1656 builtin/stash.c:1728
 msgid "keep index"
 msgstr "mantén l'índex"
 
-#: builtin/stash.c:1658 builtin/stash.c:1730
 msgid "stash staged changes only"
 msgstr "fes «stash» només dels canvis «staged»"
 
-#: builtin/stash.c:1660 builtin/stash.c:1732
 msgid "stash in patch mode"
 msgstr "fes «stash» en mode pedaç"
 
-#: builtin/stash.c:1661 builtin/stash.c:1733
 msgid "quiet mode"
 msgstr "mode silenciós"
 
-#: builtin/stash.c:1663 builtin/stash.c:1735
 msgid "include untracked files in stash"
 msgstr "inclou els fitxers no seguits a «stash»"
 
-#: builtin/stash.c:1665 builtin/stash.c:1737
 msgid "include ignore files"
 msgstr "inclou els fitxers ignorats"
 
-#: builtin/stripspace.c:37
 msgid "skip and remove all lines starting with comment character"
 msgstr ""
 "omet i elimina totes les línies que comencin amb el caràcter de comentari"
 
-#: builtin/stripspace.c:40
 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:50 builtin/submodule--helper.c:2486
 #, 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:103
-#, 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:213
 #, c-format
 msgid ""
 "could not look up configuration '%s'. Assuming this repository is its own "
@@ -23417,26 +12057,20 @@ msgstr ""
 "no s'ha pogut trobar la configuració «%s». S'assumeix que aquest repositori "
 "és el seu repositori font autoritzat."
 
-#: builtin/submodule--helper.c:413 builtin/submodule--helper.c:1873
 msgid "alternative anchor for relative paths"
 msgstr "àncora alternativa per als camins relatius"
 
-#: builtin/submodule--helper.c:418
 msgid "git submodule--helper list [--prefix=<path>] [<path>...]"
 msgstr "git submodule--helper list [--prefix=<camí>] [<camí>...]"
 
-#: builtin/submodule--helper.c:476 builtin/submodule--helper.c:617
-#: builtin/submodule--helper.c:640
 #, 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:528
 #, c-format
 msgid "Entering '%s'\n"
 msgstr "S'està entrant a «%s»\n"
 
-#: builtin/submodule--helper.c:531
 #, c-format
 msgid ""
 "run_command returned non-zero status for %s\n"
@@ -23445,80 +12079,66 @@ msgstr ""
 "run_command ha retornat un estat diferent de zero per a %s\n"
 "."
 
-#: builtin/submodule--helper.c:553
 #, 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 ""
-"run_command ha retornat un estat diferent de zero mentre es treballava recursivament als submòduls imbricats de %s\n"
+"run_command ha retornat un estat diferent de zero mentre es treballava "
+"recursivament als submòduls imbricats de %s\n"
 "."
 
-#: builtin/submodule--helper.c:569
 msgid "suppress output of entering each submodule command"
 msgstr "omet la sortida en entrar a cada ordre del submòdul"
 
-#: builtin/submodule--helper.c:571 builtin/submodule--helper.c:876
-#: builtin/submodule--helper.c:1458
 msgid "recurse into nested submodules"
 msgstr "inclou recursivament els submòduls imbricats"
 
-#: builtin/submodule--helper.c:576
 msgid "git submodule--helper foreach [--quiet] [--recursive] [--] <command>"
 msgstr "git submodule--helper foreach [--quiet] [--recursive] [--] <ordre>"
 
-#: builtin/submodule--helper.c:654
 #, 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:658
 #, 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:668
 #, 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:675
 #, 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:697
 msgid "suppress output for initializing a submodule"
 msgstr "omet la sortida en inicialitzar un submòdul"
 
-#: builtin/submodule--helper.c:702
 msgid "git submodule--helper init [<options>] [<path>]"
 msgstr "git submodule--helper init [<opcions>] [<camí>]"
 
-#: builtin/submodule--helper.c:775 builtin/submodule--helper.c:910
 #, 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:823
 #, 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:850 builtin/submodule--helper.c:1428
 #, 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:874 builtin/submodule--helper.c:1595
 msgid "suppress submodule status output"
 msgstr "suprimeix la sortida de l'estat del submòdul"
 
-#: builtin/submodule--helper.c:875
 msgid ""
 "use commit stored in the index instead of the one stored in the submodule "
 "HEAD"
@@ -23526,98 +12146,77 @@ msgstr ""
 "utilitza la comissió emmagatzemada a l'índex en lloc de l'emmagatzemada al "
 "HEAD del submòdul"
 
-#: builtin/submodule--helper.c:881
 msgid "git submodule status [--quiet] [--cached] [--recursive] [<path>...]"
 msgstr "git submodule status [--quiet] [--cached] [--recursive] [<camí>...]"
 
-#: builtin/submodule--helper.c:905
 msgid "git submodule--helper name <path>"
 msgstr "git submodule--helper name <camí>"
 
-#: builtin/submodule--helper.c:977
 #, c-format
 msgid "* %s %s(blob)->%s(submodule)"
 msgstr "* %s %s(blob)->%s(submòdul)"
 
-#: builtin/submodule--helper.c:980
 #, c-format
 msgid "* %s %s(submodule)->%s(blob)"
 msgstr "* %s %s(submòdul)->%s(blob)"
 
-#: builtin/submodule--helper.c:993
 #, c-format
 msgid "%s"
 msgstr "%s"
 
-#: builtin/submodule--helper.c:1043
 #, c-format
 msgid "couldn't hash object from '%s'"
 msgstr "no s'ha pogut fer el resum de l'objecte de «%s»"
 
-#: builtin/submodule--helper.c:1047
 #, c-format
 msgid "unexpected mode %o\n"
 msgstr "mode inesperat %o\n"
 
-#: builtin/submodule--helper.c:1288
 msgid "use the commit stored in the index instead of the submodule HEAD"
 msgstr ""
 "utilitza la comissió emmagatzemada a l'índex en lloc de l'emmagatzemada al "
 "HEAD del submòdul"
 
-#: builtin/submodule--helper.c:1290
 msgid "compare the commit in the index with that in the submodule HEAD"
 msgstr ""
 "compara la comissió emmagatzemada a l'índex en lloc de l'emmagatzemada al "
 "HEAD del submòdul"
 
-#: builtin/submodule--helper.c:1292
 msgid "skip submodules with 'ignore_config' value set to 'all'"
 msgstr "omet els submòduls amb el valor «ignore_config» establert a «all»"
 
-#: builtin/submodule--helper.c:1294
 msgid "limit the summary size"
 msgstr "limita la mida del resum"
 
-#: builtin/submodule--helper.c:1299
 msgid "git submodule--helper summary [<options>] [<commit>] [--] [<path>]"
 msgstr "git submodule--helper summary [<options>] [<commit>] [--] [<path>]"
 
-#: builtin/submodule--helper.c:1323
 msgid "could not fetch a revision for HEAD"
 msgstr "no s'ha pogut obtenir una revisió per a HEAD"
 
-#: builtin/submodule--helper.c:1384
 #, 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:1390
 #, 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:1399
 #, 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:1409
 #, 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:1456
 msgid "suppress output of synchronizing submodule url"
 msgstr "omet la sortida de la sincronització de l'URL del submòdul"
 
-#: builtin/submodule--helper.c:1463
 msgid "git submodule--helper sync [--quiet] [--recursive] [<path>]"
 msgstr "git submodule--helper sync [--quiet] [--recursive] [<camí>]"
 
-#: builtin/submodule--helper.c:1513
 #, c-format
 msgid ""
 "Submodule work tree '%s' contains a .git directory. This will be replaced "
@@ -23626,7 +12225,6 @@ msgstr ""
 "L'arbre de treball del submòdul «%s» conté un directori .git. Aquest es "
 "reemplaçarà amb un fitxer a .git mitjançant l'ús d'«absorbgitdirs»."
 
-#: builtin/submodule--helper.c:1530
 #, c-format
 msgid ""
 "Submodule work tree '%s' contains local modifications; use '-f' to discard "
@@ -23635,47 +12233,38 @@ msgstr ""
 "L'arbre de treball del submòdul «%s» conté modificacions locals; useu «-f» "
 "per a descartar-les"
 
-#: builtin/submodule--helper.c:1538
 #, c-format
 msgid "Cleared directory '%s'\n"
 msgstr "S'ha esborrat el directori «%s»\n"
 
-#: builtin/submodule--helper.c:1540
 #, 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:1551
 #, 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:1567
 #, 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:1596
 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:1597
 msgid "unregister all submodules"
 msgstr "desregistra tots els submòduls"
 
-#: builtin/submodule--helper.c:1602
 msgid ""
 "git submodule deinit [--quiet] [-f | --force] [--all | [--] [<path>...]]"
 msgstr ""
 "git submodule deinit [--quiet] [-f | --force] [--all | [--] [<camí>...]]"
 
-#: builtin/submodule--helper.c:1616
 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:1665
 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"
@@ -23683,168 +12272,137 @@ msgid ""
 "'--reference-if-able' instead of '--reference'."
 msgstr ""
 "Un càlcul alternatiu des d'un alternatiu d'un superprojecte no és vàlid.\n"
-"Per a permetre que Git cloni sense una alternativa en aquests casos, establiu\n"
+"Per a permetre que Git cloni sense una alternativa en aquests casos, "
+"establiu\n"
 "submodule.alternateErrorStrategy a «info» o bé cloneu amb\n"
 "«--reference-if-able' en comptes de «--reference»."
 
-#: builtin/submodule--helper.c:1710 builtin/submodule--helper.c:1713
 #, c-format
 msgid "submodule '%s' cannot add alternate: %s"
 msgstr "el submòdul «%s» no pot afegir un alternatiu: %s"
 
-#: builtin/submodule--helper.c:1749
 #, 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:1756
 #, 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:1781
 #, c-format
 msgid "refusing to create/use '%s' in another submodule's git dir"
 msgstr "s'ha rebutjat crear/usar «%s» en el directori git d'un altre submòdul"
 
-#: builtin/submodule--helper.c:1826
 #, 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:1831
 #, c-format
 msgid "directory not empty: '%s'"
 msgstr "directori no buit: «%s»"
 
-#: builtin/submodule--helper.c:1843
 #, 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:1876
 msgid "where the new submodule will be cloned to"
 msgstr "a on es clonarà el submòdul nou"
 
-#: builtin/submodule--helper.c:1879
 msgid "name of the new submodule"
 msgstr "nom del submòdul nou"
 
-#: builtin/submodule--helper.c:1882
 msgid "url where to clone the submodule from"
 msgstr "url del qual clonar el submòdul"
 
-#: builtin/submodule--helper.c:1890 builtin/submodule--helper.c:3383
 msgid "depth for shallow clones"
 msgstr "profunditat dels clons superficials"
 
-#: builtin/submodule--helper.c:1893 builtin/submodule--helper.c:2731
-#: builtin/submodule--helper.c:3376
 msgid "force cloning progress"
 msgstr "força el progrés del clonatge"
 
-#: builtin/submodule--helper.c:1895 builtin/submodule--helper.c:2733
 msgid "disallow cloning into non-empty directory"
 msgstr "no permetis clonar en un directori no buit"
 
-#: builtin/submodule--helper.c:1903
+#, fuzzy
 msgid ""
 "git submodule--helper clone [--prefix=<path>] [--quiet] [--reference "
 "<repository>] [--name <name>] [--depth <depth>] [--single-branch] [--filter "
-"<filter-spec>]--url <url> --path <path>"
+"<filter-spec>] --url <url> --path <path>"
 msgstr ""
 "git submodule--helper clone [--prefix=<path>] [--quiet] [--reference "
 "<repository>] [--name <name>] [--depth <depth>] [--single-branch] [--filter "
 "<filter-spec>]--url <url> --path <path>"
 
-#: builtin/submodule--helper.c:1943
 #, 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:1947
 #, 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:2041
 #, c-format
 msgid "Submodule path '%s' not initialized"
 msgstr "El camí de submòdul «%s» no està inicialitzat"
 
-#: builtin/submodule--helper.c:2045
 msgid "Maybe you want to use 'update --init'?"
 msgstr "Potser voleu usar «update --init»?"
 
-#: builtin/submodule--helper.c:2075
 #, c-format
 msgid "Skipping unmerged submodule %s"
 msgstr "S'està ometent el submòdul no fusionat %s"
 
-#: builtin/submodule--helper.c:2104
 #, c-format
 msgid "Skipping submodule '%s'"
 msgstr "S'està ometent el submòdul «%s»"
 
-#: builtin/submodule--helper.c:2257
 #, 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:2268
 #, 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:2371
 #, c-format
 msgid "Unable to checkout '%s' in submodule path '%s'"
 msgstr "No s'ha pogut agafar «%s» en el camí de submòdul «%s»"
 
-#: builtin/submodule--helper.c:2375
 #, c-format
 msgid "Unable to rebase '%s' in submodule path '%s'"
 msgstr "No s'ha pogut fer «rebase» «%s» en el camí de submòdul «%s»"
 
-#: builtin/submodule--helper.c:2379
 #, c-format
 msgid "Unable to merge '%s' in submodule path '%s'"
 msgstr "No s'ha pogut fusionar «%s» en el camí de submòdul «%s»"
 
-#: builtin/submodule--helper.c:2383
 #, c-format
 msgid "Execution of '%s %s' failed in submodule path '%s'"
 msgstr "L'execució de «%s %s» ha fallat en el camí de submòdul «%s»"
 
-#: builtin/submodule--helper.c:2402
 #, c-format
 msgid "Submodule path '%s': checked out '%s'\n"
 msgstr "Camí de submòdul «%s»: s'ha agafat «%s»\n"
 
-#: builtin/submodule--helper.c:2406
 #, c-format
 msgid "Submodule path '%s': rebased into '%s'\n"
 msgstr "Camí de submòdul «%s»: s'ha fet «rebase» en «%s»\n"
 
-#: builtin/submodule--helper.c:2410
 #, c-format
 msgid "Submodule path '%s': merged in '%s'\n"
 msgstr "Camí de submòdul «%s»: s'ha fusionat en «%s»\n"
 
-#: builtin/submodule--helper.c:2414
 #, c-format
 msgid "Submodule path '%s': '%s %s'\n"
 msgstr "El camí de submòdul «%s»: '%s %s'\n"
 
-#: builtin/submodule--helper.c:2438
 #, 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 «$%s»; s'està intentant obtenir"
-" directament %s:"
+"No s'ha pogut obtenir en el camí de submòdul «$%s»; s'està intentant obtenir "
+"directament %s:"
 
-#: builtin/submodule--helper.c:2447
 #, c-format
 msgid ""
 "Fetched in submodule path '%s', but it did not contain %s. Direct fetching "
@@ -23853,7 +12411,6 @@ msgstr ""
 "S'ha obtingut en un camí de submòdul «%s», però no contenia %s. L'obtenció "
 "directa d'aquesta comissió ha fallat."
 
-#: builtin/submodule--helper.c:2481
 #, c-format
 msgid ""
 "Submodule (%s) branch configured to inherit branch from superproject, but "
@@ -23862,321 +12419,264 @@ msgstr ""
 "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:2499
 #, 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:2588
-#, c-format, fuzzy
+#, fuzzy, c-format
 msgid "Unable to find current revision in submodule path '%s'"
 msgstr "No s'ha pogut trobar la revisió actual al camí del submòdul «%s»"
 
-#: builtin/submodule--helper.c:2599
-#, c-format, fuzzy
+#, fuzzy, c-format
 msgid "Unable to fetch in submodule path '%s'"
 msgstr "No s'ha pogut recuperar el camí del submòdul «%s»"
 
-#: builtin/submodule--helper.c:2604
-#, c-format, fuzzy
+#, fuzzy, c-format
 msgid "Unable to find %s revision in submodule path '%s'"
 msgstr ""
 "No s'ha pogut trobar la revisió de percentatges en el camí del submòdul «%s»"
 
-#: builtin/submodule--helper.c:2640
-#, c-format, fuzzy
+#, fuzzy, c-format
 msgid "Failed to recurse into submodule path '%s'"
 msgstr "No s'ha pogut tornar a repetir al camí del submòdul «%s»"
 
-#: builtin/submodule--helper.c:2699
 msgid "force checkout updates"
 msgstr "força les actualitzacions"
 
-#: builtin/submodule--helper.c:2701
 msgid "initialize uninitialized submodules before update"
 msgstr "inicialitza els submòduls sense inicialitzar abans d'actualitzar"
 
-#: builtin/submodule--helper.c:2703
 #, fuzzy
 msgid "use SHA-1 of submodule's remote tracking branch"
 msgstr "utilitza SHA-1 de la branca de seguiment remota del submòdul"
 
-#: builtin/submodule--helper.c:2705
 #, fuzzy
 msgid "traverse submodules recursively"
 msgstr "traverteix els submòduls recursivament"
 
-#: builtin/submodule--helper.c:2707
 msgid "don't fetch new objects from the remote site"
 msgstr "no obtinguis els objectes nous del lloc remot"
 
-#: builtin/submodule--helper.c:2710 builtin/submodule--helper.c:2892
 msgid "path into the working tree"
 msgstr "camí a l'arbre de treball"
 
-#: builtin/submodule--helper.c:2713
 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:2717
 msgid "rebase, merge, checkout or none"
 msgstr "rebase, merge, checkout o none"
 
-#: builtin/submodule--helper.c:2723
 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:2726
 msgid "parallel jobs"
 msgstr "tasques paral·leles"
 
-#: builtin/submodule--helper.c:2728
 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:2729
 msgid "don't print cloning progress"
 msgstr "no imprimeixis el progrés del clonatge"
 
-#: builtin/submodule--helper.c:2741
 msgid ""
 "git submodule [--quiet] update [--init [--filter=<filter-spec>]] [--remote] "
-"[-N|--no-fetch] [-f|--force] [--checkout|--merge|--rebase] "
-"[--[no-]recommend-shallow] [--reference <repository>] [--recursive] "
-"[--[no-]single-branch] [--] [<path>...]"
+"[-N|--no-fetch] [-f|--force] [--checkout|--merge|--rebase] [--[no-]recommend-"
+"shallow] [--reference <repository>] [--recursive] [--[no-]single-branch] "
+"[--] [<path>...]"
 msgstr ""
 "git submodule [--quiet] update [--init [--filter=<filter-spec>]] [--remote] "
-"[-N|--no-fetch] [-f|--force] [--checkout|--merge|--rebase] "
-"[--[no-]recommend-shallow] [--reference <repository>] [--recursive] "
-"[--[no-]single-branch] [--] [<path>...]"
+"[-N|--no-fetch] [-f|--force] [--checkout|--merge|--rebase] [--[no-]recommend-"
+"shallow] [--reference <repository>] [--recursive] [--[no-]single-branch] "
+"[--] [<path>...]"
 
-#: builtin/submodule--helper.c:2767
 msgid "bad value for update parameter"
 msgstr "valor incorrecte per al paràmetre update"
 
-#: builtin/submodule--helper.c:2893
 msgid "recurse into submodules"
 msgstr "inclou recursivament als submòduls"
 
-#: builtin/submodule--helper.c:2899
 msgid "git submodule--helper absorb-git-dirs [<options>] [<path>...]"
 msgstr "git submodule--helper absorb-git-dirs [<opcions>] [<camí>...]"
 
-#: builtin/submodule--helper.c:2955
 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:2958
 msgid "unset the config in the .gitmodules file"
 msgstr "desconfigura l'opció de configuració al fitxer .gitmodules"
 
-#: builtin/submodule--helper.c:2963
 msgid "git submodule--helper config <name> [<value>]"
 msgstr "git submodule--helper config <nom> [<valor>]"
 
-#: builtin/submodule--helper.c:2964
 msgid "git submodule--helper config --unset <name>"
 msgstr "git submodule--helper config --unset <nom>"
 
-#: builtin/submodule--helper.c:2984 builtin/submodule--helper.c:3238
-#: builtin/submodule--helper.c:3395
 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:3000
 msgid "suppress output for setting url of a submodule"
 msgstr "omet la sortida en configurar un URL d'un submòdul"
 
-#: builtin/submodule--helper.c:3004
 msgid "git submodule--helper set-url [--quiet] <path> <newurl>"
 msgstr "git submodule--helper set-url [--quiet] <path> <newurl>"
 
-#: builtin/submodule--helper.c:3037
 msgid "set the default tracking branch to master"
 msgstr "estableix la branca de seguiment per defecte a «master»"
 
-#: builtin/submodule--helper.c:3039
 msgid "set the default tracking branch"
 msgstr "estableix la branca de seguiment per defecte"
 
-#: builtin/submodule--helper.c:3043
 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:3044
 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:3051
 msgid "--branch or --default required"
 msgstr "cal --branch o --default"
 
-#: builtin/submodule--helper.c:3072 builtin/submodule--helper.c:3375
 msgid "print only error messages"
 msgstr "mostra només els missatges d'error"
 
-#: builtin/submodule--helper.c:3073
 msgid "force creation"
 msgstr "força la creació"
 
-#: builtin/submodule--helper.c:3081
 #, fuzzy
 msgid "show whether the branch would be created"
 msgstr "mostra si es crearà la branca"
 
-#: builtin/submodule--helper.c:3085
+#, fuzzy
 msgid ""
-"git submodule--helper create-branch [-f|--force] [--create-reflog] "
-"[-q|--quiet] [-t|--track] [-n|--dry-run] <name> <start_oid> <start_name>"
+"git submodule--helper create-branch [-f|--force] [--create-reflog] [-q|--"
+"quiet] [-t|--track] [-n|--dry-run] <name> <start-oid> <start-name>"
 msgstr ""
-"git submodule--helper create-branch [-f|--force] [--create-reflog] "
-"[-q|--quiet] [-t|--track] [-n|--dry-run] <name> <start_oid> <start_name>"
+"git submodule--helper create-branch [-f|--force] [--create-reflog] [-q|--"
+"quiet] [-t|--track] [-n|--dry-run] <name> <start_oid> <start_name>"
 
-#: builtin/submodule--helper.c:3097
 #, c-format
 msgid "creating branch '%s'"
 msgstr "s'està creant la branca «%s»"
 
-#: builtin/submodule--helper.c:3155
 #, c-format
 msgid "Adding existing repo at '%s' to the index\n"
 msgstr "S'està afegint el repositori existent a «%s» a l'índex\n"
 
-#: builtin/submodule--helper.c:3158
 #, c-format
 msgid "'%s' already exists and is not a valid git repo"
 msgstr "«%s» ja existeix i no és un repositori de git vàlid"
 
-#: builtin/submodule--helper.c:3171
 #, 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 «%s» localment amb els remots:\n"
 
-#: builtin/submodule--helper.c:3178
 #, 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."
+"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 comptes de clonar de nou de\n"
+"Si voleu reusar aquest directori de git local en comptes de clonar de nou "
+"de\n"
 "  %s\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»."
+"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:3190
 #, c-format
 msgid "Reactivating local git directory for submodule '%s'\n"
 msgstr "S'està reactivant el directori de git local per al submòdul «%s»\n"
 
-#: builtin/submodule--helper.c:3227
 #, c-format
 msgid "unable to checkout submodule '%s'"
 msgstr "no s'ha pogut agafar el submòdul «%s»"
 
-#: builtin/submodule--helper.c:3266
 #, c-format
 msgid "Failed to add submodule '%s'"
 msgstr "S'ha produït un error en afegir el submòdul «%s»"
 
-#: builtin/submodule--helper.c:3270 builtin/submodule--helper.c:3275
-#: builtin/submodule--helper.c:3283
 #, c-format
 msgid "Failed to register submodule '%s'"
 msgstr "S'ha produït un error en registrar el submòdul «%s»"
 
-#: builtin/submodule--helper.c:3339
 #, c-format
 msgid "'%s' already exists in the index"
 msgstr "«%s» ja existeix en l'índex"
 
-#: builtin/submodule--helper.c:3342
 #, c-format
 msgid "'%s' already exists in the index and is not a submodule"
 msgstr "«%s» ja existeix en l'índex i no és submòdul"
 
-#: builtin/submodule--helper.c:3372
+#, c-format
+msgid "'%s' does not have a commit checked out"
+msgstr "«%s» no té una comissió comprovada"
+
 msgid "branch of repository to add as submodule"
 msgstr "la branca del repositori a afegir com a submòdul"
 
-#: builtin/submodule--helper.c:3373
 msgid "allow adding an otherwise ignored submodule path"
 msgstr "permet afegir un camí de submòdul que si no s'hagués ignorat"
 
-#: builtin/submodule--helper.c:3379
 msgid "borrow the objects from reference repositories"
 msgstr "manlleva els objectes dels repositoris de referències"
 
-#: builtin/submodule--helper.c:3381
+#, fuzzy
 msgid ""
-"sets the submodule’s name to the given string instead of defaulting to its "
+"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:3388
 msgid "git submodule--helper add [<options>] [--] <repository> [<path>]"
 msgstr "git submodule--helper add [<opcions>] [--] <repositori> [<camí>]"
 
-#: builtin/submodule--helper.c:3416
 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:3425
 #, c-format
 msgid "repo URL: '%s' must be absolute or begin with ./|../"
 msgstr "URL de repositori: «%s» ha de ser absolut o començar amb ./|../"
 
-#: builtin/submodule--helper.c:3460
 #, c-format
 msgid "'%s' is not a valid submodule name"
 msgstr "«%s» no és un nom de submòdul vàlid"
 
-#: builtin/submodule--helper.c:3520 git.c:453 git.c:729
 #, c-format
 msgid "%s doesn't support --super-prefix"
 msgstr "%s no admet --super-prefix"
 
-#: builtin/submodule--helper.c:3526
 #, c-format
 msgid "'%s' is not a valid submodule--helper subcommand"
 msgstr "«%s» no és una subordre vàlida de submodule--helper"
 
-#: builtin/symbolic-ref.c:8
 msgid "git symbolic-ref [<options>] <name> [<ref>]"
 msgstr "git symbolic-ref [<opcions>] <nom> [<referència>]"
 
-#: builtin/symbolic-ref.c:9
 msgid "git symbolic-ref -d [-q] <name>"
 msgstr "git symbolic-ref -d [-q] <nom>"
 
-#: builtin/symbolic-ref.c:42
 msgid "suppress error message for non-symbolic (detached) refs"
 msgstr "omet el missatge d'error de referències no simbòliques (separades)"
 
-#: builtin/symbolic-ref.c:43
 msgid "delete symbolic ref"
 msgstr "suprimeix la referència simbòlica"
 
-#: builtin/symbolic-ref.c:44
 msgid "shorten ref output"
 msgstr "escurça la sortida de referències"
 
-#: builtin/symbolic-ref.c:45 builtin/update-ref.c:505
 msgid "reason"
 msgstr "raó"
 
-#: builtin/symbolic-ref.c:45 builtin/update-ref.c:505
 msgid "reason of the update"
 msgstr "raó de l'actualització"
 
-#: builtin/tag.c:26
 msgid ""
 "git tag [-a | -s | -u <key-id>] [-f] [-m <msg> | -F <file>]\n"
 "        <tagname> [<head>]"
@@ -24184,33 +12684,31 @@ msgstr ""
 "git tag [-a | -s | -u <key-id>] [-f] [-m <msg> | -F <fitxer>]\n"
 "        <tagname> [<head>]"
 
-#: builtin/tag.c:28
 msgid "git tag -d <tagname>..."
 msgstr "git tag -d <nom-d'etiqueta>..."
 
-#: builtin/tag.c:29
 msgid ""
-"git tag -l [-n[<num>]] [--contains <commit>] [--no-contains <commit>] [--points-at <object>]\n"
-"        [--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[<num>]] [--contains <commit>] [--no-contains <commit>] [--points-at <object>]\n"
-"        [--format=<format>] [--merged <comissió>] [--no-merged <comissió>] [<patró>...]"
+"git tag -l [-n[<num>]] [--contains <commit>] [--no-contains <commit>] [--"
+"points-at <object>]\n"
+"        [--format=<format>] [--merged <comissió>] [--no-merged <comissió>] "
+"[<patró>...]"
 
-#: builtin/tag.c:31
 msgid "git tag -v [--format=<format>] <tagname>..."
 msgstr "git tag -v [--format=<format>] <nom-d'etiqueta>..."
 
-#: builtin/tag.c:101
 #, c-format
 msgid "tag '%s' not found."
 msgstr "no s'ha trobat l'etiqueta «%s»."
 
-#: builtin/tag.c:136
 #, c-format
 msgid "Deleted tag '%s' (was %s)\n"
 msgstr "S'ha suprimit l'etiqueta «%s» (era %s)\n"
 
-#: builtin/tag.c:171
 #, c-format
 msgid ""
 "\n"
@@ -24223,24 +12721,23 @@ msgstr ""
 "  %s\n"
 "Les línies que comencin amb «%c» s'ignoraran.\n"
 
-#: builtin/tag.c:175
 #, c-format
 msgid ""
 "\n"
 "Write a message for tag:\n"
 "  %s\n"
-"Lines starting with '%c' will be kept; you may remove them yourself if you want to.\n"
+"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"
 msgstr "no s'ha pogut signar l'etiqueta"
 
-#: builtin/tag.c:259
 #, c-format
 msgid ""
 "You have created a nested tag. The object referred to by your new tag is\n"
@@ -24249,346 +12746,273 @@ msgid ""
 "\tgit tag -f %s %s^{}"
 msgstr ""
 "Heu creat una etiqueta embrincada. L'objecte al qual fa referència la nova\n"
-"etiqueta ja és una etiqueta. Si voleu etiquetar l'objecte al qual apunta, useu:\n"
+"etiqueta ja és una etiqueta. Si voleu etiquetar l'objecte al qual apunta, "
+"useu:\n"
 "\n"
 "\tgit tag -f %s %s^{}"
 
-#: builtin/tag.c:275
 msgid "bad object type."
 msgstr "el tipus d'objecte és incorrecte."
 
-#: builtin/tag.c:326
 msgid "no tag message?"
 msgstr "no hi ha cap missatge d'etiqueta?"
 
-#: 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:445
 msgid "list tag names"
 msgstr "llista els noms d'etiqueta"
 
-#: builtin/tag.c:447
 msgid "print <n> lines of each tag message"
 msgstr "imprimeix <n> línies de cada missatge d'etiqueta"
 
-#: builtin/tag.c:449
 msgid "delete tags"
 msgstr "suprimeix les etiquetes"
 
-#: builtin/tag.c:450
 msgid "verify tags"
 msgstr "verifica les etiquetes"
 
-#: builtin/tag.c:452
 msgid "Tag creation options"
 msgstr "Opcions de creació d'etiquetes"
 
-#: builtin/tag.c:454
 msgid "annotated tag, needs a message"
 msgstr "etiqueta anotada, necessita un missatge"
 
-#: builtin/tag.c:456
 msgid "tag message"
 msgstr "missatge d'etiqueta"
 
-#: builtin/tag.c:458
 msgid "force edit of tag message"
 msgstr "força l'edició del missatge de l'etiqueta"
 
-#: builtin/tag.c:459
 msgid "annotated and GPG-signed tag"
 msgstr "etiqueta anotada i signada per GPG"
 
-#: builtin/tag.c:462
 msgid "use another key to sign the tag"
 msgstr "usa una altra clau per a signar l'etiqueta"
 
-#: builtin/tag.c:463
 msgid "replace the tag if exists"
 msgstr "reemplaça l'etiqueta si existeix"
 
-#: builtin/tag.c:464 builtin/update-ref.c:511
 msgid "create a reflog"
 msgstr "crea un registre de referències"
 
-#: builtin/tag.c:466
 msgid "Tag listing options"
 msgstr "Opcions de llistat d'etiquetes"
 
-#: builtin/tag.c:467
 msgid "show tag list in columns"
 msgstr "mostra la llista d'etiquetes en columnes"
 
-#: builtin/tag.c:468 builtin/tag.c:470
 msgid "print only tags that contain the commit"
 msgstr "imprimeix només les etiquetes que continguin la comissió"
 
-#: builtin/tag.c:469 builtin/tag.c:471
 msgid "print only tags that don't contain the commit"
 msgstr "imprimeix només les etiquetes que no continguin la comissió"
 
-#: builtin/tag.c:472
 msgid "print only tags that are merged"
 msgstr "imprimeix només les etiquetes que s'han fusionat"
 
-#: builtin/tag.c:473
 msgid "print only tags that are not merged"
 msgstr "imprimeix només les etiquetes que no s'han fusionat"
 
-#: builtin/tag.c:477
 msgid "print only tags of the object"
 msgstr "imprimeix només les etiquetes de l'objecte"
 
-#: builtin/tag.c:559
 #, c-format
 msgid "the '%s' option is only allowed in list mode"
 msgstr "l'opció «%s» només està permesa en mode de llista"
 
-#: builtin/tag.c:598
 #, c-format
 msgid "'%s' is not a valid tag name."
 msgstr "«%s» no és un nom d'etiqueta vàlid."
 
-#: builtin/tag.c:603
 #, c-format
 msgid "tag '%s' already exists"
 msgstr "l'etiqueta «%s» ja existeix"
 
-#: builtin/tag.c:634
+#, c-format
+msgid "Invalid cleanup mode %s"
+msgstr "Mode de neteja no vàlid %s"
+
 #, c-format
 msgid "Updated tag '%s' (was %s)\n"
 msgstr "Etiqueta «%s» actualitzada (era %s)\n"
 
-#: builtin/unpack-objects.c:95
 msgid "pack exceeds maximum allowed size"
 msgstr "el paquet supera la mida màxima permesa"
 
-#: builtin/unpack-objects.c:504
 msgid "Unpacking objects"
 msgstr "S'estan desempaquetant els objectes"
 
-#: builtin/update-index.c:84
 #, c-format
 msgid "failed to create directory %s"
 msgstr "s'ha produït un error en crear el directori %s"
 
-#: 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: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:138
 #, c-format
 msgid "Testing mtime in '%s' "
 msgstr "S'està provant mtime en «%s» "
 
-#: 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: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: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: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: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: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:220
 msgid " OK"
 msgstr " D'acord"
 
-#: builtin/update-index.c:589
 msgid "git update-index [<options>] [--] [<file>...]"
 msgstr "git update-index [<opcions>] [--] [<fitxer>...]"
 
-#: builtin/update-index.c:993
 msgid "continue refresh even when index needs update"
 msgstr ""
 "continua l'actualització encara que l'índex necessiti una actualització"
 
-#: builtin/update-index.c:996
 msgid "refresh: ignore submodules"
 msgstr "actualitza: ignora els submòduls"
 
-#: builtin/update-index.c:999
 msgid "do not ignore new files"
 msgstr "no ignoris els fitxers nous"
 
-#: builtin/update-index.c:1001
 msgid "let files replace directories and vice-versa"
 msgstr "deixa que els fitxers reemplacin els directoris i viceversa"
 
-#: builtin/update-index.c:1003
 msgid "notice files missing from worktree"
 msgstr "tingues en compte els fitxers absents de l'arbre de treball"
 
-#: builtin/update-index.c:1005
 msgid "refresh even if index contains unmerged entries"
 msgstr "actualitza encara que l'índex contingui entrades no fusionades"
 
-#: builtin/update-index.c:1008
 msgid "refresh stat information"
 msgstr "actualitza la informació d'estadístiques"
 
-#: builtin/update-index.c:1012
 msgid "like --refresh, but ignore assume-unchanged setting"
 msgstr "com --refresh, però ignora el paràmetre assume-unchanged"
 
-#: builtin/update-index.c:1016
 msgid "<mode>,<object>,<path>"
 msgstr "<mode>,<objecte>,<camí>"
 
-#: builtin/update-index.c:1017
 msgid "add the specified entry to the index"
 msgstr "afegeix l'entrada especificada a l'índex"
 
-#: builtin/update-index.c:1027
 msgid "mark files as \"not changing\""
 msgstr "marca els fitxers com a «no canviant»"
 
-#: builtin/update-index.c:1030
 msgid "clear assumed-unchanged bit"
 msgstr "esborra el bit assumed-unchanged"
 
-#: builtin/update-index.c:1033
 msgid "mark files as \"index-only\""
 msgstr "marca els fitxers com a «només índex»"
 
-#: builtin/update-index.c:1036
 msgid "clear skip-worktree bit"
 msgstr "esborra el bit skip-worktree"
 
-#: builtin/update-index.c:1039
 msgid "do not touch index-only entries"
 msgstr "no toquis les entrades de només índex"
 
-#: builtin/update-index.c:1041
 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:1043
 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:1045
 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:1047
 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:1051
 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:1055
 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:1059
 msgid "only update entries that differ from HEAD"
 msgstr "només actualitza les entrades que difereixin de HEAD"
 
-#: builtin/update-index.c:1063
 msgid "ignore files missing from worktree"
 msgstr "ignora els fitxers absents de l'arbre de treball"
 
-#: builtin/update-index.c:1066
 msgid "report actions to standard output"
 msgstr "informa de les accions en la sortida estàndard"
 
-#: builtin/update-index.c:1068
 msgid "(for porcelains) forget saved unresolved conflicts"
 msgstr "(per a porcellanes) oblida't dels conflictes no resolts ni desats"
 
-#: builtin/update-index.c:1072
 msgid "write index in this format"
 msgstr "escriu l'índex en aquest format"
 
-#: builtin/update-index.c:1074
 msgid "enable or disable split index"
 msgstr "habilita o inhabilita l'índex dividit"
 
-#: builtin/update-index.c:1076
 msgid "enable/disable untracked cache"
 msgstr "habilita/inhabilita la memòria cau no seguida"
 
-#: builtin/update-index.c:1078
 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:1080
 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:1082
 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:1084
 msgid "enable or disable file system monitor"
 msgstr "habilita o inhabilita el monitor del sistema de fitxers"
 
-#: builtin/update-index.c:1086
 msgid "mark files as fsmonitor valid"
 msgstr "marca els fitxers com a vàlids pel fsmonitor"
 
-#: builtin/update-index.c:1089
 msgid "clear fsmonitor valid bit"
 msgstr "esborra el bit de validesa del fsmonitor"
 
-#: builtin/update-index.c:1195
 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:1204
 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:1216
 msgid ""
 "core.untrackedCache is set to true; remove or change it, if you really want "
 "to disable the untracked cache"
@@ -24596,196 +13020,153 @@ msgstr ""
 "core.untrackedCache està establert a cert; elimineu-lo o canvieu-lo, si "
 "realment voleu inhabilitar el cau no seguit"
 
-#: builtin/update-index.c:1220
 msgid "Untracked cache disabled"
 msgstr "La memòria cau no seguida està inhabilitada"
 
-#: builtin/update-index.c:1228
 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:1232
 #, c-format
 msgid "Untracked cache enabled for '%s'"
 msgstr "La memòria cau no seguida està habilitada per a «%s»"
 
-#: builtin/update-index.c:1241
 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:1246
 msgid "fsmonitor enabled"
 msgstr "fsmonitor habilitat"
 
-#: builtin/update-index.c:1250
 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:1254
 msgid "fsmonitor disabled"
 msgstr "fsmonitor inhabilitat"
 
-#: builtin/update-ref.c:10
 msgid "git update-ref [<options>] -d <refname> [<old-val>]"
 msgstr "git update-ref [<opcions>] -d <nom-de-referència> [<valor-antic>]"
 
-#: 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:506
 msgid "delete the reference"
 msgstr "suprimeix la referència"
 
-#: 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:509
 msgid "stdin has NUL-terminated arguments"
 msgstr "stdin té arguments acabats amb NUL"
 
-#: builtin/update-ref.c:510
 msgid "read updates from stdin"
 msgstr "llegeix les actualitzacions des de stdin"
 
-#: builtin/update-server-info.c:15
 msgid "update the info files from scratch"
 msgstr "actualitza els fitxers d'informació des de zero"
 
-#: builtin/upload-pack.c:11
 msgid "git upload-pack [<options>] <dir>"
 msgstr "git upload-pack [<opcions>] <directori>"
 
-#: 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:26
 msgid "serve up the info/refs for git-http-backend"
 msgstr "serveix les info/refs per a git-http-backend"
 
-#: 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:31
 msgid "interrupt transfer after <n> seconds of inactivity"
 msgstr "interromp la transferència després de <n> segons d'inactivitat"
 
-#: builtin/verify-commit.c:19
 msgid "git verify-commit [-v | --verbose] <commit>..."
 msgstr "git verify-commit [-v | --verbose] <comissió>..."
 
-#: builtin/verify-commit.c:68
 msgid "print commit contents"
 msgstr "imprimeix els continguts de la comissió"
 
-#: builtin/verify-commit.c:69 builtin/verify-tag.c:37
 msgid "print raw gpg status output"
 msgstr "imprimeix la sortida crua de l'estat gpg"
 
-#: builtin/verify-pack.c:59
 msgid "git verify-pack [-v | --verbose] [-s | --stat-only] <pack>..."
 msgstr "git verify-pack [-v | --verbose] [-s | --stat-only] <paquet>..."
 
-#: builtin/verify-pack.c:70
 msgid "verbose"
 msgstr "detallat"
 
-#: builtin/verify-pack.c:72
 msgid "show statistics only"
 msgstr "mostra només estadístiques"
 
-#: builtin/verify-tag.c:18
 msgid "git verify-tag [-v | --verbose] [--format=<format>] <tag>..."
 msgstr "git verify-tag [-v | --verbose] [--format=<format>] <etiqueta>..."
 
-#: builtin/verify-tag.c:36
 msgid "print tag contents"
 msgstr "imprimeix els continguts de l'etiqueta"
 
-#: builtin/worktree.c:19
 msgid "git worktree add [<options>] <path> [<commit-ish>]"
 msgstr "git worktree add [<opcions>] <camí> [<commit-ish>]"
 
-#: builtin/worktree.c:20
 msgid "git worktree list [<options>]"
 msgstr "git worktree list [<opcions>]"
 
-#: builtin/worktree.c:21
 msgid "git worktree lock [<options>] <path>"
 msgstr "git worktree lock [<opcions>] <camí>"
 
-#: builtin/worktree.c:22
 msgid "git worktree move <worktree> <new-path>"
 msgstr "git worktree move <arbre de treball> <camí-nou>"
 
-#: builtin/worktree.c:23
 msgid "git worktree prune [<options>]"
 msgstr "git worktree prune [<opcions>]"
 
-#: builtin/worktree.c:24
 msgid "git worktree remove [<options>] <worktree>"
 msgstr "git worktree remove [<opcions>] <arbre de treball>"
 
-#: builtin/worktree.c:25
 msgid "git worktree repair [<path>...]"
 msgstr "git worktree repair [<path>...]"
 
-#: builtin/worktree.c:26
 msgid "git worktree unlock <path>"
 msgstr "git worktree unlock <camí>"
 
-#: builtin/worktree.c:76
 #, c-format
 msgid "Removing %s/%s: %s"
 msgstr "S'està eliminant %s/%s: %s"
 
-#: builtin/worktree.c:149
 msgid "report pruned working trees"
 msgstr "informa dels arbres de treball podats"
 
-#: builtin/worktree.c:151
 msgid "expire working trees older than <time>"
 msgstr "fes caducar els arbres de treball més antics que <data>"
 
-#: builtin/worktree.c:221
 #, c-format
 msgid "'%s' already exists"
 msgstr "«%s» ja existeix"
 
-#: builtin/worktree.c:230
 #, c-format
 msgid "unusable worktree destination '%s'"
 msgstr "destinació de l'arbre de treball no utilitzable «%s»"
 
-#: builtin/worktree.c:235
 #, 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ò que està bloquejat;\n"
-"useu «%s -f -f» per a sobreescriure-ho, o «unlock» i «prune» o «remove» per a netejar"
+"useu «%s -f -f» per a sobreescriure-ho, o «unlock» i «prune» o «remove» per "
+"a netejar"
 
-#: builtin/worktree.c:237
 #, c-format
 msgid ""
 "'%s' is a missing but already registered worktree;\n"
@@ -24794,157 +13175,127 @@ msgstr ""
 "manca «%s» però ja està registrat a l'arbre de treball;\n"
 "useu «%s»  per a sobreescriure-ho, o «prune» o «remove» per a netejar"
 
-#: builtin/worktree.c:248
-#, c-format, fuzzy
+#, c-format
 msgid "failed to copy '%s' to '%s'; sparse-checkout may not work correctly"
 msgstr ""
-"no s'ha pogut copiar '%s' a '%s'; la comprovació de la dispersió pot no "
-"funcionar correctament"
+"no s'ha pogut copiar «%s» a «%s»; «sparse-checkout» pot no funcionar "
+"correctament"
 
-#: builtin/worktree.c:268
-#, c-format, fuzzy
+#, c-format
 msgid "failed to copy worktree config from '%s' to '%s'"
 msgstr ""
 "no s'ha pogut copiar la configuració de l'arbre de treball de «%s» a «%s»"
 
-#: builtin/worktree.c:280 builtin/worktree.c:285
-#, c-format, fuzzy
+#, c-format
 msgid "failed to unset '%s' in '%s'"
 msgstr "no s'ha pogut desassignar «%s» a «%s»"
 
-#: builtin/worktree.c:356
 #, c-format
 msgid "could not create directory of '%s'"
 msgstr "no s'ha pogut crear directori de «%s»"
 
-#: builtin/worktree.c:378
 msgid "initializing"
 msgstr "s'està inicialitzant"
 
-#: builtin/worktree.c:492 builtin/worktree.c:498
 #, c-format
 msgid "Preparing worktree (new branch '%s')"
 msgstr "S'està preparant l'arbre de treball (branca nova «%s»)"
 
-#: builtin/worktree.c:494
 #, c-format
 msgid "Preparing worktree (resetting branch '%s'; was at %s)"
 msgstr ""
 "S'està preparant l'arbre de treball (s'està reiniciant la branca «%s»; "
 "estava a %s)"
 
-#: builtin/worktree.c:503
 #, c-format
 msgid "Preparing worktree (checking out '%s')"
 msgstr "S'està preparant l'arbre de treball (s'està agafant «%s»)"
 
-#: builtin/worktree.c:509
 #, c-format
 msgid "Preparing worktree (detached HEAD %s)"
 msgstr "S'està preparant l'arbre de treball (HEAD %s separat)"
 
-#: builtin/worktree.c:554
 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:557
 msgid "create a new branch"
 msgstr "crea una branca nova"
 
-#: builtin/worktree.c:559
 msgid "create or reset a branch"
 msgstr "crea o restableix una branca"
 
-#: builtin/worktree.c:561
 msgid "populate the new working tree"
 msgstr "emplena l'arbre de treball nou"
 
-#: builtin/worktree.c:562
 msgid "keep the new working tree locked"
 msgstr "mantén l'arbre de treball nou bloquejat"
 
-#: builtin/worktree.c:564 builtin/worktree.c:809
 msgid "reason for locking"
 msgstr "raó per a bloquejar"
 
-#: builtin/worktree.c:567
 msgid "set up tracking mode (see git-branch(1))"
 msgstr "configura el mode de seguiment (vegeu git-branch(1))"
 
-#: builtin/worktree.c:570
 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"
+
+#, c-format
+msgid "options '%s', '%s', and '%s' cannot be used together"
+msgstr "les opcions «%s», «%s», i «%s» no es poden usar juntes"
 
-#: builtin/worktree.c:584
 msgid "added with --lock"
 msgstr "afegit amb --lock"
 
-#: builtin/worktree.c:646
 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:766
 msgid "show extended annotations and reasons, if available"
 msgstr "mostra les anotacions esteses i les raons, si estan disponibles"
 
-#: builtin/worktree.c:768
 msgid "add 'prunable' annotation to worktrees older than <time>"
 msgstr ""
 "afegeix l'anotació «prunable» als arbres de treball més antics que <data>"
 
-#: builtin/worktree.c:770
-#, fuzzy
 msgid "terminate records with a NUL character"
 msgstr "finalitza els registres amb un caràcter NUL"
 
-#: builtin/worktree.c:821 builtin/worktree.c:854 builtin/worktree.c:928
-#: builtin/worktree.c:1052
 #, c-format
 msgid "'%s' is not a working tree"
 msgstr "«%s» no és un arbre de treball"
 
-#: builtin/worktree.c:823 builtin/worktree.c:856
 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:828
 #, c-format
 msgid "'%s' is already locked, reason: %s"
 msgstr "«%s» ja està bloquejat, raó: «%s»"
 
-#: builtin/worktree.c:830
 #, c-format
 msgid "'%s' is already locked"
 msgstr "«%s» ja està bloquejat"
 
-#: builtin/worktree.c:858
 #, c-format
 msgid "'%s' is not locked"
 msgstr "«%s» no està bloquejat"
 
-#: builtin/worktree.c:899
 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:907
 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:930 builtin/worktree.c:1054
 #, c-format
 msgid "'%s' is a main working tree"
 msgstr "«%s» és un arbre de treball principal"
 
-#: builtin/worktree.c:935
 #, 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:948
 #, c-format
 msgid ""
 "cannot move a locked working tree, lock reason: %s\n"
@@ -24953,7 +13304,6 @@ msgstr ""
 "no es pot moure un arbre de treball bloquejat, raó del bloqueig: %s\n"
 "useu primer «move -f -f» per a sobreescriure'l o desbloquejar-lo primer"
 
-#: builtin/worktree.c:950
 msgid ""
 "cannot move a locked working tree;\n"
 "use 'move -f -f' to override or unlock first"
@@ -24961,38 +13311,31 @@ msgstr ""
 "no es pot moure un arbre de treball bloquejat;\n"
 "useu primer «move -f -f» per a sobreescriure'l o desbloquejar-lo primer"
 
-#: builtin/worktree.c:953
 #, 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:958
 #, c-format
 msgid "failed to move '%s' to '%s'"
 msgstr "s'ha produït un error en moure «%s» a «%s»"
 
-#: builtin/worktree.c:1004
 #, c-format
 msgid "failed to run 'git status' on '%s'"
 msgstr "no s'ha pogut executar «git status» a «%s»"
 
-#: builtin/worktree.c:1008
 #, 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 a suprimir-los"
 
-#: builtin/worktree.c:1013
 #, 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:1036
 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:1059
 #, c-format
 msgid ""
 "cannot remove a locked working tree, lock reason: %s\n"
@@ -25001,7 +13344,6 @@ msgstr ""
 "no es pot suprimir un arbre de treball bloquejat, raó del bloqueig: %s\n"
 "useu primer «remove -f -f» per a sobreescriure'l o desbloquejar-lo"
 
-#: builtin/worktree.c:1061
 msgid ""
 "cannot remove a locked working tree;\n"
 "use 'remove -f -f' to override or unlock first"
@@ -25009,1505 +13351,8207 @@ msgstr ""
 "no es pot suprimir un arbre de treball bloquejat;\n"
 "useu primer «remove -f -f» per a sobreescriure'l o desbloquejar-lo"
 
-#: builtin/worktree.c:1064
 #, c-format
 msgid "validation failed, cannot remove working tree: %s"
 msgstr "la validació ha fallat, no es pot suprmir l'arbre de treball: %s"
 
-#: builtin/worktree.c:1088
 #, c-format
 msgid "repair: %s: %s"
 msgstr "repara: %s: %s"
 
-#: builtin/worktree.c:1091
 #, c-format
 msgid "error: %s: %s"
 msgstr "error: %s: %s"
 
-#: builtin/write-tree.c:15
 msgid "git write-tree [--missing-ok] [--prefix=<prefix>/]"
 msgstr "git write-tree [--missing-ok] [--prefix=<prefix>/]"
 
-#: builtin/write-tree.c:28
 msgid "<prefix>/"
 msgstr "<prefix>/"
 
-#: builtin/write-tree.c:29
 msgid "write tree object for a subdirectory <prefix>"
 msgstr "escriu l'objecte d'arbre per a un subdirectori <prefix>"
 
-#: builtin/write-tree.c:31
 msgid "only useful for debugging"
 msgstr "només útil per a la depuració"
 
-#: git.c:28
-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"
-"           [--git-dir=<path>] [--work-tree=<path>] [--namespace=<name>]\n"
-"           [--super-prefix=<path>] [--config-env=<name>=<envvar>]\n"
-"           <command> [<args>]"
-msgstr ""
-"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"
-"           [--git-dir=<path>] [--work-tree=<path>] [--namespace=<name>]\n"
-"           [--super-prefix=<path>] [--config-env=<name>=<envvar>]\n"
-"           <command> [<args>]"
-
-#: git.c:36
-msgid ""
-"'git help -a' and 'git help -g' list available subcommands and some\n"
-"concept guides. See 'git help <command>' or 'git help <concept>'\n"
-"to read about a specific subcommand or concept.\n"
-"See 'git help git' for an overview of the system."
-msgstr ""
-"«git help -a» i «git help -g» llisten les subordres disponibles i\n"
-"algunes guies de concepte. Vegeu «git help <ordre>» o\n"
-"«git help <concepte>» per a llegir sobre una subordre o concepte\n"
-"específic. Vegeu «git help git» per a una visió general del sistema."
-
-#: git.c:188 git.c:216 git.c:300
-#, c-format
-msgid "no directory given for '%s' option\n"
-msgstr "no s'ha especificat un directori per a l'opció «%s»\n"
-
-#: git.c:202
-#, c-format
-msgid "no namespace given for --namespace\n"
-msgstr "no s'ha especificat un nom d'espai per --namespace\n"
-
-#: git.c:230
 #, c-format
-msgid "no prefix given for --super-prefix\n"
-msgstr "no s'ha especificat cap prefix per a --super-prefix\n"
-
-#: git.c:252
-#, c-format
-msgid "-c expects a configuration string\n"
-msgstr "-c espera una cadena de configuració\n"
-
-#: git.c:260
-#, c-format
-msgid "no config key given for --config-env\n"
-msgstr "no s'ha indicat cap clau de configuració per a --config-env\n"
-
-#: git.c:326
-#, c-format
-msgid "unknown option: %s\n"
-msgstr "opció desconeguda: %s\n"
-
-#: git.c:375
-#, c-format
-msgid "while expanding alias '%s': '%s'"
-msgstr "en expandir l'àlies «%s»: «%s»"
-
-#: git.c:384
-#, c-format
-msgid ""
-"alias '%s' changes environment variables.\n"
-"You can use '!git' in the alias to do this"
-msgstr ""
-"l'àlies «%s» canvia variables d'entorn.\n"
-"Podeu utilitzar «!git» a l'àlies per a fer-ho"
-
-#: git.c:391
-#, c-format
-msgid "empty alias for %s"
-msgstr "àlies buit per a %s"
-
-#: git.c:394
-#, c-format
-msgid "recursive alias: %s"
-msgstr "àlies recursiu: %s"
-
-#: git.c:480
-msgid "write failure on standard output"
-msgstr "fallada d'escriptura en la sortida estàndard"
-
-#: git.c:482
-msgid "unknown write failure on standard output"
-msgstr "fallada d'escriptura desconeguda en la sortida estàndard"
-
-#: git.c:484
-msgid "close failed on standard output"
-msgstr "ha fallat el tancament en la sortida estàndard"
-
-#: git.c:838
-#, c-format
-msgid "alias loop detected: expansion of '%s' does not terminate:%s"
-msgstr "bucle d'àlies detectat expansió de «%s» no acaba:%s"
-
-#: git.c:888
-#, c-format
-msgid "cannot handle %s as a builtin"
-msgstr "no es pot gestionar %s com a integrat"
-
-#: git.c:901
-#, c-format
-msgid ""
-"usage: %s\n"
-"\n"
-msgstr ""
-"ús: %s\n"
-"\n"
-
-#: git.c:921
-#, 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\n"
-
-#: git.c:933
-#, c-format
-msgid "failed to run command '%s': %s\n"
-msgstr "s'ha produït un error en executar l'ordre «%s»: %s\n"
-
-#: http-fetch.c:128
-#, c-format
-msgid "argument to --packfile must be a valid hash (got '%s')"
-msgstr "l'argument a --packfile ha de ser un resum vàlid (s'ha obtingut «%s»)"
-
-#: http-fetch.c:138
-msgid "not a git repository"
-msgstr "no és un repositori de git"
-
-#: t/helper/test-fast-rebase.c:141
-msgid "unhandled options"
-msgstr "opcions no gestionades"
-
-#: t/helper/test-fast-rebase.c:146
-msgid "error preparing revisions"
-msgstr "s'ha produït un error en preparar les revisions"
-
-#: t/helper/test-reach.c:154
-#, c-format
-msgid "commit %s is not marked reachable"
-msgstr "la comissió %s no està marcada com abastable"
-
-#: t/helper/test-reach.c:164
-msgid "too many commits marked reachable"
-msgstr "hi ha massa comissions marcades com abastables"
-
-#: t/helper/test-serve-v2.c:7
-msgid "test-tool serve-v2 [<options>]"
-msgstr "test-tool serve-v2 [<opcions>]"
-
-#: t/helper/test-serve-v2.c:19
-msgid "exit immediately after advertising capabilities"
-msgstr "surt immediatament després d'anunciar les funcionalitats"
-
-#: t/helper/test-simple-ipc.c:581
-msgid "test-helper simple-ipc is-active    [<name>] [<options>]"
-msgstr "test-helper simple-ipc is-active    [<nom>] [<opcions>]"
-
-#: 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>]"
-
-#: 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>] [<max-wait>]"
-
-#: 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>] [<max-wait>]"
-
-#: t/helper/test-simple-ipc.c:585
-msgid "test-helper simple-ipc send         [<name>] [<token>]"
-msgstr "test-helper simple-ipc send         [<nom>] [<testimoni>]"
-
-#: t/helper/test-simple-ipc.c:586
-msgid "test-helper simple-ipc sendbytes    [<name>] [<bytecount>] [<byte>]"
-msgstr "test-helper simple-ipc sendbytes    [<nom>] [<bytecount>] [<byte>]"
-
-#: t/helper/test-simple-ipc.c:587
-msgid ""
-"test-helper simple-ipc multiple     [<name>] [<threads>] [<bytecount>] "
-"[<batchsize>]"
-msgstr ""
-"test-helper simple-ipc multiple     [<nom>] [<fils>] [<bytecount>] "
-"[<batchsize>]"
-
-#: t/helper/test-simple-ipc.c:595
-msgid "name or pathname of unix domain socket"
-msgstr "nom o nom de camí del sòcol de domini unix"
-
-#: t/helper/test-simple-ipc.c:597
-msgid "named-pipe name"
-msgstr "nom del conducte amb nom"
-
-#: t/helper/test-simple-ipc.c:599
-msgid "number of threads in server thread pool"
-msgstr "nombre de fils en el conjunt de fils del servidor"
-
-#: t/helper/test-simple-ipc.c:600
-msgid "seconds to wait for daemon to start or stop"
-msgstr "segons a esperar que el dimoni comenci o s'aturi"
-
-#: t/helper/test-simple-ipc.c:602
-msgid "number of bytes"
-msgstr "nombre d'octets"
-
-#: t/helper/test-simple-ipc.c:603
-msgid "number of requests per thread"
-msgstr "nombre de peticions per fil"
-
-#: t/helper/test-simple-ipc.c:605
-msgid "byte"
-msgstr "octet"
-
-#: t/helper/test-simple-ipc.c:605
-msgid "ballast character"
-msgstr "caràcter de llast"
-
-#: t/helper/test-simple-ipc.c:606
-msgid "token"
-msgstr "testimoni"
-
-#: t/helper/test-simple-ipc.c:606
-msgid "command token to send to the server"
-msgstr "testimoni d'ordre a enviar al servidor"
-
-#: 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: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:380
-msgid "Public key pinning not supported with cURL < 7.39.0"
-msgstr "No s'admet la fixació de clau pública amb cURL < 7.39.0"
-
-#: http.c:812
-msgid "CURLSSLOPT_NO_REVOKE not supported with cURL < 7.44.0"
-msgstr "CURLSSLOPT_NO_REVOKE no està admès amb cURL < 7.44.0"
-
-#: http.c:1016
-#, c-format
-msgid "Unsupported SSL backend '%s'. Supported SSL backends:"
-msgstr "El rerefons SSL «%s» no està admès. Els rerefons SSL admesos:"
-
-#: http.c:1023
-#, c-format
-msgid "Could not set SSL backend to '%s': cURL was built without SSL backends"
-msgstr ""
-"No s'ha pogut establir el rerefons SSL a «%s»: cURL es va construir sense "
-"rerefons SSL"
-
-#: http.c:1027
-#, c-format
-msgid "Could not set SSL backend to '%s': already set"
-msgstr "No s'ha pogut establir el rerefons SSL a «%s»: ja establert"
-
-#: http.c:1876
-#, c-format
-msgid ""
-"unable to update url base from redirection:\n"
-"  asked for: %s\n"
-"   redirect: %s"
-msgstr ""
-"no s'ha pogut actualitzar l'URL base des de la redirecció:\n"
-"  petició: %s\n"
-"   redirecció: %s"
-
-#: remote-curl.c:184
-#, c-format
-msgid "invalid quoting in push-option value: '%s'"
-msgstr "citació no vàlida en el valor de l'opció de pujada: «%s»"
-
-#: remote-curl.c:308
-#, c-format
-msgid "%sinfo/refs not valid: is this a git repository?"
-msgstr "%sinfo/refs no vàlides: és un repositori git?"
-
-#: remote-curl.c:409
-msgid "invalid server response; expected service, got flush packet"
-msgstr ""
-"resposta del servidor no és vàlida; el servei esperat, ha rebut in paquet de"
-" neteja"
-
-#: remote-curl.c:440
-#, c-format
-msgid "invalid server response; got '%s'"
-msgstr "resposta del servidor no vàlida; s'ha obtingut «%s»"
-
-#: remote-curl.c:500
-#, c-format
-msgid "repository '%s' not found"
-msgstr "no s'ha trobat el repositori «%s»"
-
-#: remote-curl.c:504
-#, c-format
-msgid "Authentication failed for '%s'"
-msgstr "S'ha produït un error en autenticar per «%s»"
-
-#: remote-curl.c:508
-#, c-format
-msgid "unable to access '%s' with http.pinnedPubkey configuration: %s"
-msgstr "no es pot accedir a «%s» la configuració de http.pinnedPubkey :%s"
-
-#: remote-curl.c:512
-#, c-format
-msgid "unable to access '%s': %s"
-msgstr "no s'ha pogut accedir a «%s»: %s"
+msgid "unrecognized bundle hash algorithm: %s"
+msgstr "algoritme de hash del farcell desconegut: %s"
 
-#: remote-curl.c:518
 #, c-format
-msgid "redirecting to %s"
-msgstr "s'està redirigint a %s"
-
-#: remote-curl.c:649
-msgid "shouldn't have EOF when not gentle on EOF"
-msgstr "no hauria de tenir EOF quan s'és lax amb els EOF"
-
-#: remote-curl.c:661
-msgid "remote server sent unexpected response end packet"
-msgstr "el servidor remot ha enviat un paquet de final de resposta inesperat"
-
-#: remote-curl.c:730
-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"
+msgid "unknown capability '%s'"
+msgstr "funcionalitat «%s» desconeguda"
 
-#: remote-curl.c:759
 #, c-format
-msgid "remote-curl: bad line length character: %.4s"
-msgstr "remote-curl: caràcter de longitud de línia erroni: %.4s"
-
-#: remote-curl.c:761
-msgid "remote-curl: unexpected response end packet"
-msgstr "remote-curl: paquet final de resposta inesperat"
+msgid "'%s' does not look like a v2 or v3 bundle file"
+msgstr "«%s» no sembla un fitxer de farcell v2 o v3"
 
-#: remote-curl.c:837
 #, c-format
-msgid "RPC failed; %s"
-msgstr "RPC ha fallat; %s"
+msgid "unrecognized header: %s%s (%d)"
+msgstr "capçalera no reconeguda: %s%s (%d)"
 
-#: remote-curl.c:877
-msgid "cannot handle pushes this big"
-msgstr "no es pot gestionar pujades tan grans"
+msgid "Repository lacks these prerequisite commits:"
+msgstr "Al repositori li manquen aquestes comissions prerequerides:"
 
-#: remote-curl.c:990
-#, c-format
-msgid "cannot deflate request; zlib deflate error %d"
-msgstr "no es pot descomprimir la sol·licitud; error de deflate zlib %d"
+msgid "need a repository to verify a bundle"
+msgstr "cal un repositori per a verificar un farcell"
 
-#: remote-curl.c:994
 #, c-format
-msgid "cannot deflate request; zlib end error %d"
-msgstr ""
-"no es pot descomprimir la sol·licitud; error de finalització de zlib %d"
+msgid "The bundle contains this ref:"
+msgid_plural "The bundle contains these %<PRIuMAX> refs:"
+msgstr[0] "El farcell conté aquesta referència:"
+msgstr[1] "El farcell conté aquestes %<PRIuMAX> referències:"
 
-#: remote-curl.c:1044
-#, c-format
-msgid "%d bytes of length header were received"
-msgstr "s'han rebut %d bytes de longitud de capçalera"
+msgid "The bundle records a complete history."
+msgstr "El farcell registra una història completa."
 
-#: remote-curl.c:1046
 #, c-format
-msgid "%d bytes of body are still expected"
-msgstr "encara s'esperen %d bytes del cos"
+msgid "The bundle requires this ref:"
+msgid_plural "The bundle requires these %<PRIuMAX> refs:"
+msgstr[0] "El farcell requereix aquesta referència:"
+msgstr[1] "El farcell requereix aquestes %<PRIuMAX> referències:"
 
-#: remote-curl.c:1135
-msgid "dumb http transport does not support shallow capabilities"
-msgstr "el transport ximple http no admet capacitats superficials"
+msgid "unable to dup bundle descriptor"
+msgstr "no s'ha pogut duplicar el descriptor del farcell"
 
-#: remote-curl.c:1150
-msgid "fetch failed."
-msgstr "l'obtenció ha fallat."
+msgid "Could not spawn pack-objects"
+msgstr "No s'ha pogut engendrar el pack-objects"
 
-#: remote-curl.c:1198
-msgid "cannot fetch by sha1 over smart http"
-msgstr "no s'ha pogut obtenir per sha1 a través de l'http intel·ligent"
+msgid "pack-objects died"
+msgstr "el pack-objects s'ha mort"
 
-#: remote-curl.c:1242 remote-curl.c:1248
 #, c-format
-msgid "protocol error: expected sha/ref, got '%s'"
-msgstr "error de protocol: s'esperava sha/ref, s'ha obtingut «%s»"
+msgid "ref '%s' is excluded by the rev-list options"
+msgstr "les opcions de la llista de revisions exclouen la referència «%s»"
 
-#: remote-curl.c:1260 remote-curl.c:1378
 #, c-format
-msgid "http transport does not support %s"
-msgstr "El transport http no admet %s"
-
-#: remote-curl.c:1296
-msgid "git-http-push failed"
-msgstr "git-http-push ha fallat"
-
-#: remote-curl.c:1485
-msgid "remote-curl: usage: git remote-curl <remote> [<url>]"
-msgstr "remote-curl: ús: git remote-curl <remote> [<url>]"
-
-#: remote-curl.c:1517
-msgid "remote-curl: error reading command stream from git"
-msgstr "remote-curl: error en llegir el flux d'ordres del git"
-
-#: remote-curl.c:1524
-msgid "remote-curl: fetch attempted without a local repo"
-msgstr "remote-curl: s'ha intentat l'obtenció sense un dipòsit local"
+msgid "unsupported bundle version %d"
+msgstr "versió del farcell no compatible %d"
 
-#: remote-curl.c:1565
 #, c-format
-msgid "remote-curl: unknown command '%s' from git"
-msgstr "remote-curl: ordre «%s» desconeguda del git"
-
-#: contrib/scalar/scalar.c:49
-msgid "need a working directory"
-msgstr "cal un directori de treball"
-
-#: contrib/scalar/scalar.c:86
-msgid "could not find enlistment root"
-msgstr "no s'ha pogut trobar un arrel d'allistament"
+msgid "cannot write bundle version %d with algorithm %s"
+msgstr "no es pot escriure la versió del farcell %d amb l'algorisme %s"
 
-#: contrib/scalar/scalar.c:89 contrib/scalar/scalar.c:350
-#: contrib/scalar/scalar.c:435 contrib/scalar/scalar.c:578
-#, c-format
-msgid "could not switch to '%s'"
-msgstr "no s'ha pogut commutar a «%s»"
+msgid "Refusing to create empty bundle."
+msgstr "S'està refusant crear un farcell buit."
 
-#: contrib/scalar/scalar.c:179
 #, c-format
-msgid "could not configure %s=%s"
-msgstr "no s'ha pogut configurar %s=%s"
-
-#: contrib/scalar/scalar.c:197
-msgid "could not configure log.excludeDecoration"
-msgstr "no s'ha pogut configurar log.excludeDecoration"
-
-#: contrib/scalar/scalar.c:218
-msgid "Scalar enlistments require a worktree"
-msgstr "Els allistaments escalars requereixen un arbre de treball"
+msgid "cannot create '%s'"
+msgstr "no es pot crear «%s»"
 
-#: contrib/scalar/scalar.c:310
-#, c-format
-msgid "remote HEAD is not a branch: '%.*s'"
-msgstr "el HEAD remot no és una branca: «%.*s»"
+msgid "index-pack died"
+msgstr "l'index-pack s'ha mort"
 
-#: contrib/scalar/scalar.c:316
-msgid "failed to get default branch name from remote; using local default"
+msgid "terminating chunk id appears earlier than expected"
 msgstr ""
-"no s'ha pogut obtenir el nom de la branca per defecte del remot; s'usa ela "
-"predeterminada localment"
-
-#: contrib/scalar/scalar.c:329
-msgid "failed to get default branch name"
-msgstr "s'ha produït un error en obtenir el nom de branca predeterminada"
-
-#: contrib/scalar/scalar.c:340
-msgid "failed to unregister repository"
-msgstr "s'ha produït un error en desregistrar el repositori"
-
-#: contrib/scalar/scalar.c:355
-msgid "failed to delete enlistment directory"
-msgstr "s'ha produït un error en suprimir l'allistament del directori"
-
-#: contrib/scalar/scalar.c:375
-msgid "branch to checkout after clone"
-msgstr "branca a agafar després de clonar"
-
-#: contrib/scalar/scalar.c:377
-msgid "when cloning, create full working directory"
-msgstr "quan es clona, crear un directori de treball complet"
-
-#: contrib/scalar/scalar.c:379
-msgid "only download metadata for the branch that will be checked out"
-msgstr "només baixa les metadades per a la branca que s'agafarà"
-
-#: contrib/scalar/scalar.c:384
-msgid "scalar clone [<options>] [--] <repo> [<dir>]"
-msgstr "scalar clone [<opcions>] [--] <repo> [<dir>]"
-
-#: contrib/scalar/scalar.c:409
-#, c-format
-msgid "cannot deduce worktree name from '%s'"
-msgstr "no es pot deduir el nom de l'arbre de treball de «%s»"
-
-#: contrib/scalar/scalar.c:418
-#, c-format
-msgid "directory '%s' exists already"
-msgstr "el directori «%s» ja existeix"
-
-#: contrib/scalar/scalar.c:445
-#, c-format
-msgid "failed to get default branch for '%s'"
-msgstr "s'ha produït un error en obtenir la branca per defecte per a «%s»"
-
-#: contrib/scalar/scalar.c:456
-#, c-format
-msgid "could not configure remote in '%s'"
-msgstr "no s'ha pogut configurar el remot a «%s»"
+"l'identificador de fragment de finalització apareix abans del que s'esperava"
 
-#: contrib/scalar/scalar.c:465
 #, c-format
-msgid "could not configure '%s'"
-msgstr "no s'ha pogut configurar «%s»"
-
-#: contrib/scalar/scalar.c:468
-msgid "partial clone failed; attempting full clone"
-msgstr "ha fallat la clonació parcial; s'està intentant la clonació completa"
-
-#: contrib/scalar/scalar.c:472
-msgid "could not configure for full clone"
-msgstr "no s'ha pogut configurar per a una clonació completa"
-
-#: contrib/scalar/scalar.c:504
-msgid "`scalar list` does not take arguments"
-msgstr "«scalar list» no accepta arguments"
-
-#: contrib/scalar/scalar.c:517
-msgid "scalar register [<enlistment>]"
-msgstr "scalar register [<enlistment>]"
-
-#: contrib/scalar/scalar.c:544
-msgid "reconfigure all registered enlistments"
-msgstr "reconfigura tots els allistaments registrats"
-
-#: contrib/scalar/scalar.c:548
-msgid "scalar reconfigure [--all | <enlistment>]"
-msgstr "scalar reconfigure [--all | <enlistment>]"
-
-#: contrib/scalar/scalar.c:566
-msgid "--all or <enlistment>, but not both"
-msgstr "--all o <enlistment>, però no ambdós"
+msgid "improper chunk offset(s) %<PRIx64> and %<PRIx64>"
+msgstr "desplaçament incorrecte del fragment %<PRIx64> i %<PRIx64>"
 
-#: contrib/scalar/scalar.c:581
 #, c-format
-msgid "git repository gone in '%s'"
-msgstr "no existeix un repositori de git a: «%s»"
-
-#: contrib/scalar/scalar.c:621
-msgid ""
-"scalar run <task> [<enlistment>]\n"
-"Tasks:\n"
-msgstr ""
-"scalar run <task>  {<enlistment>]\n"
-"Tasques:\n"
+msgid "duplicate chunk ID %<PRIx32> found"
+msgstr "s'ha trobat un ID del fragment %<PRIx32> duplicat"
 
-#: contrib/scalar/scalar.c:639
 #, c-format
-msgid "no such task: '%s'"
-msgstr "no existeix la tasca: «%s»"
-
-#: contrib/scalar/scalar.c:689
-msgid "scalar unregister [<enlistment>]"
-msgstr "scalar unregister [<enlistment>]"
-
-#: contrib/scalar/scalar.c:736
-msgid "scalar delete <enlistment>"
-msgstr "supressió de l'escalar <enlistment>"
-
-#: contrib/scalar/scalar.c:751
-msgid "refusing to delete current working directory"
-msgstr "s'ha rebutjat suprimir el directori de treball actual"
-
-#: contrib/scalar/scalar.c:766
-msgid "include Git version"
-msgstr "inclou la versió del Git"
-
-#: contrib/scalar/scalar.c:768
-msgid "include Git's build options"
-msgstr "inclou les opcions de construcció del Git"
-
-#: contrib/scalar/scalar.c:772
-msgid "scalar verbose [-v | --verbose] [--build-options]"
-msgstr "scalar verbose [-v | --verbose] [--build-options]"
+msgid "final chunk has non-zero id %<PRIx32>"
+msgstr "el fragment final té un id %<PRIx32> que no és zero"
 
-#: contrib/scalar/scalar.c:813
-msgid "-C requires a <directory>"
-msgstr "-C requereix un <directory>"
+msgid "invalid hash version"
+msgstr "especificació de hash no vàlida"
 
-#: contrib/scalar/scalar.c:815
 #, c-format
-msgid "could not change to '%s'"
-msgstr "no s'ha pogut canviar a «%s»"
-
-#: contrib/scalar/scalar.c:821
-msgid "-c requires a <key>=<value> argument"
-msgstr "-c requereix un argument <key>=<value>"
-
-#: contrib/scalar/scalar.c:839
-msgid ""
-"scalar [-C <directory>] [-c <key>=<value>] <command> [<options>]\n"
-"\n"
-"Commands:\n"
-msgstr ""
-"scalar [-C <directory>] [-c <key>=<value>] <command> [<options>]\n"
-"\n"
-"Ordres:\n"
-
-#: compat/compiler.h:26
-msgid "no compiler information available\n"
-msgstr "no hi ha informació disponible del compilador\n"
-
-#: compat/compiler.h:38
-msgid "no libc information available\n"
-msgstr "no hi ha informació disponible de libc\n"
-
-#: list-objects-filter-options.h:126
-msgid "args"
-msgstr "arguments"
-
-#: list-objects-filter-options.h:127
-msgid "object filtering"
-msgstr "filtratge d'objecte"
-
-#: parse-options.h:188
-msgid "expiry-date"
-msgstr "data-de-caducitat"
-
-#: parse-options.h:202
-msgid "no-op (backward compatibility)"
-msgstr "operació nul·la (per a compatibilitat amb versions anteriors)"
-
-#: parse-options.h:341
-msgid "be more verbose"
-msgstr "sigues més detallat"
-
-#: parse-options.h:343
-msgid "be more quiet"
-msgstr "sigues més discret"
-
-#: parse-options.h:349
-msgid "use <n> digits to display object names"
-msgstr "usa <n> xifres per a mostrar els noms d'objecte"
-
-#: parse-options.h:368
-msgid "how to strip spaces and #comments from message"
-msgstr "com suprimir els espais i #comentaris del missatge"
-
-#: parse-options.h:369
-msgid "read pathspec from file"
-msgstr "llegeix l'especificació del camí del fitxer"
-
-#: parse-options.h:370
-msgid ""
-"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 el caràcter NUL"
-
-#: ref-filter.h:98
-msgid "key"
-msgstr "clau"
-
-#: ref-filter.h:98
-msgid "field name to sort on"
-msgstr "nom del camp en el qual ordenar"
-
-#: rerere.h:44
-msgid "update the index with reused conflict resolution if possible"
-msgstr ""
-"actualitza l'índex amb la resolució de conflictes reusada si és possible"
+msgid "invalid color value: %.*s"
+msgstr "valor de color no vàlid: %.*s"
 
-#: command-list.h:50
 msgid "Add file contents to the index"
 msgstr "Afegeix els continguts dels fitxers a l'índex"
 
-#: command-list.h:51
 msgid "Apply a series of patches from a mailbox"
 msgstr "Aplica una sèrie de pedaços des d'una bústia de correu"
 
-#: command-list.h:52
 msgid "Annotate file lines with commit information"
 msgstr "Anota les línies del fitxer amb la informació de la comissió"
 
-#: command-list.h:53
 msgid "Apply a patch to files and/or to the index"
 msgstr "Aplica un pedaç a fitxer i/o a l'índex"
 
-#: command-list.h:54
 msgid "Import a GNU Arch repository into Git"
 msgstr "Importa un repositori GNU Arch a Git"
 
-#: command-list.h:55
 msgid "Create an archive of files from a named tree"
 msgstr "Crea un arxiu de fitxers des d'un arbre amb nom"
 
-#: command-list.h:56
 msgid "Use binary search to find the commit that introduced a bug"
 msgstr "Troba per cerca binària el canvi que hagi introduït un defecte"
 
-#: command-list.h:57
 msgid "Show what revision and author last modified each line of a file"
 msgstr ""
 "Mostra quina revisió i autor ha modificat per últim cop cada línia d'un "
 "fitxer"
 
-#: command-list.h:58
 msgid "List, create, or delete branches"
 msgstr "Llista, crea o suprimeix branques"
 
-#: command-list.h:59
 msgid "Collect information for user to file a bug report"
 msgstr "Recopila la informació per a l'usuari per a enviar un informe d'error"
 
-#: command-list.h:60
 msgid "Move objects and refs by archive"
 msgstr "Mou els objectes i les referències per arxiu"
 
-#: 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"
 
-#: command-list.h:62
 msgid "Display gitattributes information"
 msgstr "Mostra la informació de .gitattributes"
 
-#: command-list.h:63
 msgid "Debug gitignore / exclude files"
 msgstr "Depura gitignore / fitxers d'exclusió"
 
-#: command-list.h:64
 msgid "Show canonical names and email addresses of contacts"
 msgstr "Mostra els noms canònics i les adreces electròniques dels contactes"
 
-#: command-list.h:65
 msgid "Ensures that a reference name is well formed"
 msgstr "Assegura que un nom de referència està ben format"
 
-#: command-list.h:66
 msgid "Switch branches or restore working tree files"
 msgstr "Canvia de branca o restaura els fitxers de l'arbre de treball"
 
-#: command-list.h:67
 msgid "Copy files from the index to the working tree"
 msgstr "Copia fitxers des de l'índex a l'arbre de treball"
 
-#: command-list.h:68
 msgid "Find commits yet to be applied to upstream"
 msgstr "Troba les comissions que encara s'han d'aplicar a la font"
 
-#: command-list.h:69
 msgid "Apply the changes introduced by some existing commits"
 msgstr "Aplica els canvis introduïts per algunes comissions existents"
 
-#: command-list.h:70
 msgid "Graphical alternative to git-commit"
 msgstr "Alternativa gràfica a git-commit"
 
-#: command-list.h:71
 msgid "Remove untracked files from the working tree"
 msgstr "Elimina els fitxers no seguits de l'arbre de treball"
 
-#: command-list.h:72
 msgid "Clone a repository into a new directory"
 msgstr "Clona un repositori a un directori nou"
 
-#: command-list.h:73
 msgid "Display data in columns"
 msgstr "Mostra les dades en columnes"
 
-#: command-list.h:74
 msgid "Record changes to the repository"
 msgstr "Registra els canvis al repositori"
 
-#: command-list.h:75
 msgid "Write and verify Git commit-graph files"
 msgstr "Escriu i verifica els fitxers commit-graph de Git"
 
-#: command-list.h:76
 msgid "Create a new commit object"
 msgstr "Crea un objecte de comissió nou"
 
-#: command-list.h:77
 msgid "Get and set repository or global options"
 msgstr "Obté o estableix opcions de repositori o globals"
 
-#: command-list.h:78
 msgid "Count unpacked number of objects and their disk consumption"
 msgstr "Compta el nombre d'objectes desempaquetats i el seu consum de disc"
 
-#: command-list.h:79
 msgid "Retrieve and store user credentials"
 msgstr "Recupera i desa les credencials d'usuari"
 
-#: command-list.h:80
 msgid "Helper to temporarily store passwords in memory"
 msgstr "Ajudant per a emmagatzemar temporalment les contrasenyes en memòria"
 
-#: command-list.h:81
 msgid "Helper to store credentials on disk"
 msgstr "Ajudant per a emmagatzemar credencials a disc"
 
-#: command-list.h:82
 msgid "Export a single commit to a CVS checkout"
 msgstr "Exporta en una sola comissió a CVS checkout"
 
-#: command-list.h:83
 msgid "Salvage your data out of another SCM people love to hate"
-msgstr ""
-"Salveu les vostres dades d'un altre SMC al que la gent li agrada odiar"
+msgstr "Salveu les vostres dades d'un altre SMC al que la gent li agrada odiar"
 
-#: command-list.h:84
 msgid "A CVS server emulator for Git"
 msgstr "Un emulador de servidor CVS per al Git"
 
-#: command-list.h:85
 msgid "A really simple server for Git repositories"
 msgstr "Un servidor realment senzill per a repositoris Git"
 
-#: command-list.h:86
 msgid "Give an object a human readable name based on an available ref"
 msgstr ""
 "Dona un nom llegible per a humans basant-se en les referències disponibles"
 
-#: command-list.h:87
 msgid "Show changes between commits, commit and working tree, etc"
 msgstr ""
 "Mostra els canvis entre comissions, la comissió i l'arbre de treball, etc"
 
-#: command-list.h:88
 msgid "Compares files in the working tree and the index"
 msgstr "Compara fitxers en l'arbre de treball i l'índex"
 
-#: command-list.h:89
 msgid "Compare a tree to the working tree or index"
 msgstr "Compara un arbre amb l'arbre de treball o l'índex"
 
-#: command-list.h:90
 msgid "Compares the content and mode of blobs found via two tree objects"
 msgstr ""
 "Compara el contingut i el mode dels blobs trobats a través de dos objectes "
 "d'arbre"
 
-#: command-list.h:91
 msgid "Show changes using common diff tools"
 msgstr "Mostra els canvis usant eines diff comunes"
 
-#: command-list.h:92
 msgid "Git data exporter"
 msgstr "Exportador de dades del Git"
 
-#: command-list.h:93
 msgid "Backend for fast Git data importers"
 msgstr "Rerefons per a importadors ràpids de dades de Git"
 
-#: command-list.h:94
 msgid "Download objects and refs from another repository"
 msgstr "Baixa objectes i referències d'un altre repositori"
 
-#: command-list.h:95
 msgid "Receive missing objects from another repository"
 msgstr "Rep els objectes que manquen des d'un altre repositori"
 
-#: command-list.h:96
 msgid "Rewrite branches"
 msgstr "Torna a escriure les branques"
 
-#: command-list.h:97
 msgid "Produce a merge commit message"
 msgstr "Produeix un missatge de comissió de fusió"
 
-#: command-list.h:98
 msgid "Output information on each ref"
 msgstr "Mostra la informació en cada referència"
 
-#: command-list.h:99
 msgid "Run a Git command on a list of repositories"
 msgstr "Executa una ordre Git en una llista de repositoris"
 
-#: command-list.h:100
 msgid "Prepare patches for e-mail submission"
 msgstr "Prepara pedaços per a enviar-los per correu electrònic"
 
-#: command-list.h:101
 msgid "Verifies the connectivity and validity of the objects in the database"
 msgstr "Verifica la connectivitat i validesa dels objectes a la base de dades"
 
-#: command-list.h:102
 msgid "Cleanup unnecessary files and optimize the local repository"
 msgstr "Neteja els fitxers innecessaris i optimitza el repositori local"
 
-#: command-list.h:103
 msgid "Extract commit ID from an archive created using git-archive"
 msgstr "Extreu l'ID de la comissió d'un arxiu creat amb el git-archive"
 
-#: command-list.h:104
 msgid "Print lines matching a pattern"
 msgstr "Imprimeix les línies coincidents amb un patró"
 
-#: command-list.h:105
 msgid "A portable graphical interface to Git"
 msgstr "Una interfície gràfica portable per al Git"
 
-#: command-list.h:106
 msgid "Compute object ID and optionally creates a blob from a file"
 msgstr "Calcula l'ID de l'objecte i opcionalment crea un blob des del fitxer"
 
-#: command-list.h:107
 msgid "Display help information about Git"
 msgstr "Mostra informació d'ajuda del Git"
 
-#: command-list.h:108
-#, fuzzy
 msgid "Run git hooks"
-msgstr "Executa els ganxos del git"
+msgstr "Executa els lligams del git"
 
-#: command-list.h:109
 msgid "Server side implementation of Git over HTTP"
 msgstr "Implementació al servidor del Git sobre HTTP"
 
-#: command-list.h:110
 msgid "Download from a remote Git repository via HTTP"
 msgstr "Baixa des d'un repositori Git remot via HTTP"
 
-#: command-list.h:111
 msgid "Push objects over HTTP/DAV to another repository"
 msgstr "Pujar objectes sobre HTTP/DAV a un altre repositori"
 
-#: command-list.h:112
 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:113
 msgid "Build pack index file for an existing packed archive"
 msgstr ""
 "Construeix el fitxer d'índex del paquet per a un arxiu empaquetat existent"
 
-#: command-list.h:114
 msgid "Create an empty Git repository or reinitialize an existing one"
 msgstr "Crea un repositori de Git buit o reinicialitza un existent"
 
-#: command-list.h:115
 msgid "Instantly browse your working repository in gitweb"
 msgstr "Navegueu instantàniament pel vostre repositori de treball a gitweb"
 
-#: command-list.h:116
 msgid "Add or parse structured information in commit messages"
 msgstr ""
 "Afegeix o analitza la informació estructurada en els missatges de comissió"
 
-#: command-list.h:117
 msgid "Show commit logs"
 msgstr "Mostra els registres de comissió"
 
-#: command-list.h:118
 msgid "Show information about files in the index and the working tree"
 msgstr "Mostra informació sobre els fitxers a l'índex i a l'arbre de treball"
 
-#: command-list.h:119
 msgid "List references in a remote repository"
 msgstr "Mostra les referències d'un repositori remot"
 
-#: command-list.h:120
 msgid "List the contents of a tree object"
 msgstr "Mostra els continguts d'un objecte de l'arbre"
 
-#: command-list.h:121
 msgid "Extracts patch and authorship from a single e-mail message"
 msgstr "Extreu el pedaç i l'autoria d'un sol missatge de correu electrònic"
 
-#: command-list.h:122
 msgid "Simple UNIX mbox splitter program"
 msgstr "Programa de divisió mbox simple per a UNIX"
 
-#: command-list.h:123
 msgid "Run tasks to optimize Git repository data"
 msgstr "Executa tasques per a optimitzar les dades del repositori Git"
 
-#: command-list.h:124
 msgid "Join two or more development histories together"
 msgstr "Uneix dues o més històries de desenvolupament"
 
-#: command-list.h:125
 msgid "Find as good common ancestors as possible for a merge"
 msgstr "Troba els millors avantpassats comuns possibles per a una fusió"
 
-#: command-list.h:126
 msgid "Run a three-way file merge"
 msgstr "Executa una fusió de fitxers de tres vies"
 
-#: command-list.h:127
 msgid "Run a merge for files needing merging"
 msgstr "Executa una fusió per als fitxers que cal fusionar"
 
-#: command-list.h:128
 msgid "The standard helper program to use with git-merge-index"
 msgstr "El programa d'ajuda estàndard a utilitzar amb git-merge-index"
 
-#: command-list.h:129
 msgid "Show three-way merge without touching index"
 msgstr "Mostra la fusió de tres vies sense tocar l'índex"
 
-#: command-list.h:130
 msgid "Run merge conflict resolution tools to resolve merge conflicts"
 msgstr ""
 "Executa eines de resolució de conflictes per a resoldre conflictes de fusió"
 
-#: command-list.h:131
 msgid "Creates a tag object with extra validation"
 msgstr "Crea un objecte etiqueta amb validació addicional"
 
-#: command-list.h:132
 msgid "Build a tree-object from ls-tree formatted text"
 msgstr "Construeix un objecte en arbre a partir de text formatat amb ls-tree"
 
-#: command-list.h:133
 msgid "Write and verify multi-pack-indexes"
 msgstr "Escriu i verifica els índexs dels paquets multipaquet"
 
-#: command-list.h:134
 msgid "Move or rename a file, a directory, or a symlink"
 msgstr "Mou o canvia de nom a un fitxer, directori o enllaç simbòlic"
 
-#: command-list.h:135
 msgid "Find symbolic names for given revs"
 msgstr "Cerca noms simbòlics per a les revisions donades"
 
-#: command-list.h:136
 msgid "Add or inspect object notes"
 msgstr "Afegeix o inspecciona notes de l'objecte"
 
-#: command-list.h:137
 msgid "Import from and submit to Perforce repositories"
 msgstr "Importa des de i envia a repositoris Perforce"
 
-#: command-list.h:138
 msgid "Create a packed archive of objects"
 msgstr "Crea un arxiu empaquetat d'objectes"
 
-#: command-list.h:139
 msgid "Find redundant pack files"
 msgstr "Troba fitxers empaquetats redundants"
 
-#: command-list.h:140
 msgid "Pack heads and tags for efficient repository access"
 msgstr ""
 "Empaqueta els caps i les etiquetes per a un accés eficient al repositori"
 
-#: command-list.h:141
 msgid "Compute unique ID for a patch"
 msgstr "Calcula un identificador únic per a cada pedaç"
 
-#: command-list.h:142
 msgid "Prune all unreachable objects from the object database"
 msgstr "Poda tots els objectes no accessibles de la base de dades d'objectes"
 
-#: command-list.h:143
 msgid "Remove extra objects that are already in pack files"
 msgstr "Elimina els objectes extres que ja estan en fitxers empaquetats"
 
-#: command-list.h:144
 msgid "Fetch from and integrate with another repository or a local branch"
 msgstr "Obtén i integra amb un altre repositori o una branca local"
 
-#: command-list.h:145
 msgid "Update remote refs along with associated objects"
 msgstr ""
 "Actualitza les referències remotes juntament amb els objectes associats"
 
-#: command-list.h:146
 msgid "Applies a quilt patchset onto the current branch"
 msgstr "Aplica un conjunt de pedaços a la branca actual"
 
-#: 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)"
 
-#: command-list.h:148
 msgid "Reads tree information into the index"
 msgstr "Llegeix la informació de l'arbre a l'índex"
 
-#: command-list.h:149
 msgid "Reapply commits on top of another base tip"
 msgstr "Torna a aplicar les comissions sobre un altre punt de basament"
 
-#: command-list.h:150
 msgid "Receive what is pushed into the repository"
 msgstr "Rep el que s'envia al repositori"
 
-#: command-list.h:151
 msgid "Manage reflog information"
 msgstr "Gestiona la informació del registre de referències"
 
-#: command-list.h:152
 msgid "Manage set of tracked repositories"
 msgstr "Gestiona el conjunt de repositoris seguits"
 
-#: command-list.h:153
 msgid "Pack unpacked objects in a repository"
 msgstr "Empaqueta els objectes desempaquetats en un repositori"
 
-#: command-list.h:154
 msgid "Create, list, delete refs to replace objects"
 msgstr "Crea, llista i esborra referències per a substituir objectes"
 
-#: command-list.h:155
 msgid "Generates a summary of pending changes"
 msgstr "Genera un resum dels canvis pendents"
 
-#: command-list.h:156
 msgid "Reuse recorded resolution of conflicted merges"
 msgstr "Reutilitza la resolució registrada dels conflictes de fusió"
 
-#: command-list.h:157
 msgid "Reset current HEAD to the specified state"
 msgstr "Restableix la HEAD actual a l'estat especificat"
 
-#: command-list.h:158
 msgid "Restore working tree files"
 msgstr "Restaura els fitxers de l'arbre de treball"
 
-#: command-list.h:159
 msgid "Lists commit objects in reverse chronological order"
 msgstr "Mostra les comissions en ordre topològic invers"
 
-#: command-list.h:160
 msgid "Pick out and massage parameters"
 msgstr "Trieu i personalitzeu els paràmetres"
 
-#: command-list.h:161
 msgid "Revert some existing commits"
 msgstr "Reverteix comissions existents"
 
-#: command-list.h:162
 msgid "Remove files from the working tree and from the index"
 msgstr "Elimina fitxers de l'arbre de treball i de l'índex"
 
-#: command-list.h:163
 msgid "Send a collection of patches as emails"
 msgstr "Envia una col·lecció de pedaços com a correus electrònics"
 
-#: command-list.h:164
 msgid "Push objects over Git protocol to another repository"
 msgstr "Puja objectes sobre el protocol Git a un altre repositori"
 
-#: command-list.h:165
 msgid "Git's i18n setup code for shell scripts"
 msgstr ""
 "Codi de configuració i18n del Git per als scripts de l'intèrpret d'ordres"
 
-#: command-list.h:166
 msgid "Common Git shell script setup code"
 msgstr "Codi de scripts de configuració comuns pel Git shell"
 
-#: command-list.h:167
 msgid "Restricted login shell for Git-only SSH access"
 msgstr "Intèrpret d'ordres d'entrada restringit només per a accés SSH al Git"
 
-#: command-list.h:168
 msgid "Summarize 'git log' output"
 msgstr "Resumeix la sortida «git log»"
 
-#: command-list.h:169
 msgid "Show various types of objects"
 msgstr "Mostra diversos tipus d'objectes"
 
-#: command-list.h:170
 msgid "Show branches and their commits"
 msgstr "Mostra les branques i les seves comissions"
 
-#: command-list.h:171
 msgid "Show packed archive index"
 msgstr "Mostra l'índex d'arxius empaquetat"
 
-#: command-list.h:172
 msgid "List references in a local repository"
 msgstr "Llista les referències en un repositori local"
 
-#: command-list.h:173
-#, fuzzy
 msgid "Reduce your working tree to a subset of tracked files"
 msgstr "Redueix l'arbre de treball a un subconjunt de fitxers seguits"
 
-#: command-list.h:174
 msgid "Add file contents to the staging area"
 msgstr "Afegeix el contingut del fitxer a l'àrea de «staging»"
 
-#: command-list.h:175
 msgid "Stash the changes in a dirty working directory away"
 msgstr "Fes «stash» dels canvis en un directori de treball brut"
 
-#: command-list.h:176
 msgid "Show the working tree status"
 msgstr "Mostra l'estat de l'arbre de treball"
 
-#: command-list.h:177
 msgid "Remove unnecessary whitespace"
 msgstr "Elimina l'espai en blanc innecessari"
 
-#: command-list.h:178
 msgid "Initialize, update or inspect submodules"
 msgstr "Inicialitza, actualitza o inspecciona submòduls"
 
-#: command-list.h:179
 msgid "Bidirectional operation between a Subversion repository and Git"
 msgstr "Operació bidireccional entre un repositori a Subversion i Git"
 
-#: command-list.h:180
 msgid "Switch branches"
 msgstr "Commuta entre branques"
 
-#: command-list.h:181
 msgid "Read, modify and delete symbolic refs"
 msgstr "Llegeix, modifica i suprimeix referències simbòliques"
 
-#: command-list.h:182
 msgid "Create, list, delete or verify a tag object signed with GPG"
 msgstr ""
 "Crea, llista, suprimeix o verifica un objecte d'etiqueta signat amb GPG"
 
-#: command-list.h:183
 msgid "Creates a temporary file with a blob's contents"
 msgstr "Crea un fitxer temporal amb els continguts dels blobs"
 
-#: command-list.h:184
 msgid "Unpack objects from a packed archive"
 msgstr "Desempaqueta objectes d'un arxiu empaquetat"
 
-#: command-list.h:185
 msgid "Register file contents in the working tree to the index"
 msgstr "Registra els continguts del fitxer en l'arbre de treball a l'índex"
 
-#: 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"
 msgstr "Envia l'arxiu de tornada al git-archive"
 
-#: command-list.h:189
 msgid "Send objects packed back to git-fetch-pack"
 msgstr "Envia els objectes empaquetats de tornada al git-fetch-pack"
 
-#: command-list.h:190
 msgid "Show a Git logical variable"
 msgstr "Mostra una variable lògica del Git"
 
-#: command-list.h:191
 msgid "Check the GPG signature of commits"
 msgstr "Verifica la signatura GPG de les comissions"
 
-#: command-list.h:192
 msgid "Validate packed Git archive files"
 msgstr "Valida els fitxers d'arxius Git empaquetats"
 
-#: command-list.h:193
 msgid "Check the GPG signature of tags"
 msgstr "Verifica la signatura GPG de les etiquetes"
 
-#: command-list.h:194
 msgid "Show logs with difference each commit introduces"
 msgstr "Mostra registres amb la diferència introduïda per cada comissió"
 
-#: command-list.h:195
 msgid "Manage multiple working trees"
 msgstr "Gestiona múltiples arbres de treball"
 
-#: command-list.h:196
 msgid "Create a tree object from the current index"
 msgstr "Crea un objecte arbre des de l'índex actual"
 
-#: command-list.h:197
 msgid "Defining attributes per path"
 msgstr "La definició d'atributs per camí"
 
-#: command-list.h:198
 msgid "Git command-line interface and conventions"
 msgstr "Interfície i convencions de la línia d'ordres del Git"
 
-#: command-list.h:199
 msgid "A Git core tutorial for developers"
 msgstr "Un tutorial bàsic del Git per a desenvolupadors"
 
-#: command-list.h:200
 msgid "Providing usernames and passwords to Git"
 msgstr "Proporcionar noms d'usuari i contrasenyes a Git"
 
-#: command-list.h:201
 msgid "Git for CVS users"
 msgstr "Git per a usuaris del CVS"
 
-#: command-list.h:202
 msgid "Tweaking diff output"
 msgstr "Ajustament de la sortida de diferències"
 
-#: command-list.h:203
 msgid "A useful minimum set of commands for Everyday Git"
 msgstr "Un conjunt mínim útil d'ordres diàries del Git"
 
-#: command-list.h:204
 msgid "Frequently asked questions about using Git"
 msgstr "Preguntes freqüents sobre l'ús del Git"
 
-#: command-list.h:205
 msgid "A Git Glossary"
 msgstr "Un glossari de Git"
 
-#: command-list.h:206
 msgid "Hooks used by Git"
 msgstr "Lligams utilitzats pel Git"
 
-#: command-list.h:207
 msgid "Specifies intentionally untracked files to ignore"
 msgstr "Especifica els fitxers intencionalment no seguits a ignorar"
 
-#: command-list.h:208
 msgid "The Git repository browser"
 msgstr "El navegador de repositoris Git"
 
-#: command-list.h:209
 msgid "Map author/committer names and/or E-Mail addresses"
 msgstr "Assigna noms d'autor i comitent i/o adreces de correu electrònic"
 
-#: command-list.h:210
 msgid "Defining submodule properties"
 msgstr "La definició de les propietats de submòduls"
 
-#: command-list.h:211
 msgid "Git namespaces"
 msgstr "Espais de noms del Git"
 
-#: command-list.h:212
 msgid "Helper programs to interact with remote repositories"
 msgstr "Programes d'ajuda per a interactuar amb repositoris remots"
 
-#: command-list.h:213
 msgid "Git Repository Layout"
 msgstr "Disposició del repositori del Git"
 
-#: command-list.h:214
 msgid "Specifying revisions and ranges for Git"
 msgstr "L'especificació de revisions i rangs per al Git"
 
-#: command-list.h:215
 msgid "Mounting one repository inside another"
 msgstr "Muntant un repositori dins un altre"
 
-#: command-list.h:216
 msgid "A tutorial introduction to Git"
 msgstr "Un tutorial d'introducció al Git"
 
-#: command-list.h:217
 msgid "A tutorial introduction to Git: part two"
 msgstr "Un tutorial d'introducció al Git: segona part"
 
-#: command-list.h:218
 msgid "Git web interface (web frontend to Git repositories)"
 msgstr "Interfície web del Git (interfície web pels repositoris Git)"
 
-#: command-list.h:219
 msgid "An overview of recommended workflows with Git"
 msgstr "Una visió de conjunt de fluxos de treball recomanats amb Git"
 
-#: git-merge-octopus.sh:46
+msgid "commit-graph file is too small"
+msgstr "el fitxer del graf de comissions és massa petit"
+
+#, c-format
+msgid "commit-graph signature %X does not match signature %X"
+msgstr ""
+"la signatura del graf de comissions %X no coincideix amb la signatura %X"
+
+#, c-format
+msgid "commit-graph version %X does not match version %X"
+msgstr "la versió del graf de comissions %X no coincideix amb la versió %X"
+
+#, c-format
+msgid "commit-graph hash version %X does not match version %X"
+msgstr ""
+"la versió del hash del graf de comissions %X no coincideix amb la versió %X"
+
+#, c-format
+msgid "commit-graph file is too small to hold %u chunks"
+msgstr ""
+"el fitxer del graf de comissions és massa petit per a guardar %u fragments"
+
+msgid "commit-graph has no base graphs chunk"
+msgstr "el fragment del graf de comissions no té grafs de base"
+
+msgid "commit-graph chain does not match"
+msgstr "la cadena del graf de comissions no coincideix"
+
+#, c-format
+msgid "invalid commit-graph chain: line '%s' not a hash"
+msgstr ""
+"la cadena del graf de comissions no és vàlida: la línia «%s» no és un hash"
+
+msgid "unable to find all commit-graph files"
+msgstr "no es poden trobar tots els fitxers del graf de comissions"
+
+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"
+
+#, c-format
+msgid "could not find commit %s"
+msgstr "no s'ha pogut trobar la comissió %s"
+
+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é cap"
+
+msgid "Loading known commits in commit graph"
+msgstr "S'estan carregant comissions conegudes al graf de comissions"
+
+msgid "Expanding reachable commits in commit graph"
+msgstr "S'estan expandint les comissions abastables al graf de comissions"
+
+msgid "Clearing commit marks in commit graph"
+msgstr "S'estan esborrant les marques de comissions al graf de comissions"
+
+msgid "Computing commit graph topological levels"
+msgstr "S'estan calculant els nivells topològics del graf de comissions"
+
+msgid "Computing commit graph generation numbers"
+msgstr "S'estan calculant els nombres de generació del graf de comissions"
+
+msgid "Computing commit changed paths Bloom filters"
+msgstr ""
+"S'estan calculant els canvis les rutes de la comissió en els filtres Bloom"
+
+msgid "Collecting referenced commits"
+msgstr "S'estan recollint els objectes referenciats"
+
+#, c-format
+msgid "Finding commits for commit graph in %<PRIuMAX> pack"
+msgid_plural "Finding commits for commit graph in %<PRIuMAX> packs"
+msgstr[0] ""
+"S'estan cercant les comissions pel graf de comissions en %<PRIuMAX> paquet"
+msgstr[1] ""
+"S'estan cercant les comissions pel graf de comissions en %<PRIuMAX> paquets"
+
+#, c-format
+msgid "error adding pack %s"
+msgstr "error en afegir paquet %s"
+
+#, c-format
+msgid "error opening index for %s"
+msgstr "s'ha produït un error en obrir l'índex per «%s»"
+
+msgid "Finding commits for commit graph among packed objects"
+msgstr ""
+"S'estan cercant les comissions pel graf de comissions entre els objectes "
+"empaquetats"
+
+msgid "Finding extra edges in commit graph"
+msgstr "S'estan cercant les vores addicionals al graf de comissions"
+
+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"
+
+msgid "unable to create temporary graph layer"
+msgstr "no s'ha pogut crear una capa de graf temporal"
+
+#, c-format
+msgid "unable to adjust shared permissions for '%s'"
+msgstr "no s'han pogut ajustar els permisos compartits per a «%s»"
+
+#, 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"
+
+msgid "unable to open commit-graph chain file"
+msgstr "no s'ha pogut obrir el fitxer d'encadenament del graf de comissions"
+
+msgid "failed to rename base commit-graph file"
+msgstr "no s'ha pogut canviar el nom del fitxer base del graf de comissions"
+
+msgid "failed to rename temporary commit-graph file"
+msgstr ""
+"no s'ha pogut canviar el nom del fitxer temporal del graf de comissions"
+
+msgid "Scanning merged commits"
+msgstr "S'estan escanejant les comissions fusionades"
+
+msgid "Merging commit-graph"
+msgstr "S'està fusionant el graf de comissions"
+
+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"
+
+msgid "too many commits to write graph"
+msgstr "massa comissions per a escriure un graf"
+
+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"
+
+#, c-format
+msgid "commit-graph has incorrect OID order: %s then %s"
+msgstr "el graf de comissions té una ordre OID incorrecta; %s llavors %s"
+
+#, 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"
+
+#, 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"
+
+msgid "Verifying commits in commit graph"
+msgstr "S'estan verificant les comissions al graf de comissions"
+
+#, 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"
+
+#, 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"
+
+#, 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"
+
+#, c-format
+msgid "commit-graph parent for %s is %s != %s"
+msgstr "el pare pel graf de comissions %s és %s != %s"
+
+#, c-format
+msgid "commit-graph parent list for commit %s terminates early"
+msgstr "la llista pare del graf de comissions per %s acaba aviat"
+
+#, c-format
+msgid ""
+"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"
+
+#, c-format
+msgid ""
+"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"
+
+#, 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>"
+
+#, 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>"
+
+#, c-format
+msgid "%s %s is not a commit!"
+msgstr "%s %s no és una comissió!"
+
+msgid ""
+"Support for <GIT_DIR>/info/grafts is deprecated\n"
+"and will be removed in a future Git version.\n"
+"\n"
+"Please use \"git replace --convert-graft-file\"\n"
+"to convert the grafts into replace refs.\n"
+"\n"
+"Turn this message off by running\n"
+"\"git config advice.graftFileDeprecated false\""
+msgstr ""
+"La compatibilitat amb <GIT_DIR>/info/grafts és obsoleta\n"
+"i s'eliminarà en una futura versió del Git.\n"
+"\n"
+"Useu «git replace --convert-graft-file»\n"
+"per a convertir els grafs en referències de reemplaçament.\n"
+"\n"
+"Desactiveu aquest missatge executant\n"
+"«git config advice.graftFileDeprecated false»"
+
+#, 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."
+
+#, 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."
+
+#, c-format
+msgid "Commit %s does not have a GPG signature."
+msgstr "La comissió %s no té signatura GPG."
+
+#, 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"
+
+#, fuzzy
+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"
+"variable i18n.commitEncoding to the encoding your project uses.\n"
+msgstr ""
+"Advertència: el missatge de comissió no és compatible amb UTF-8.\n"
+"Potser voleu esmenar-lo després de corregir el missatge, o establir\n"
+"la variable de configuració i18n.commitencoding a la codificació que\n"
+"usi el vostre projecte.\n"
+
+msgid "no compiler information available\n"
+msgstr "no hi ha informació disponible del compilador\n"
+
+msgid "no libc information available\n"
+msgstr "no hi ha informació disponible de libc\n"
+
+#, fuzzy, c-format
+msgid "[GLE %ld] health thread could not open '%ls'"
+msgstr "no s'ha pogut commutar a «%s»"
+
+#, c-format
+msgid "[GLE %ld] health thread getting BHFI for '%ls'"
+msgstr ""
+
+#, fuzzy, c-format
+msgid "could not convert to wide characters: '%s'"
+msgstr ""
+"no s'han pogut convertir els següents «grafts»:\n"
+"%s"
+
+#, fuzzy, c-format
+msgid "BHFI changed '%ls'"
+msgstr "no es pot canviar a «%s»"
+
+#, c-format
+msgid "unhandled case in 'has_worktree_moved': %d"
+msgstr ""
+
+#, c-format
+msgid "health thread wait failed [GLE %ld]"
+msgstr ""
+
+msgid "Unable to create FSEventStream."
+msgstr "No s'ha pogut crear el FSEventStream."
+
+msgid "Failed to start the FSEventStream"
+msgstr "No s'ha pogut iniciar el FSEventStream"
+
+#, c-format
+msgid "[GLE %ld] could not convert path to UTF-8: '%.*ls'"
+msgstr ""
+
+#, fuzzy, c-format
+msgid "[GLE %ld] could not watch '%s'"
+msgstr "no s'ha pogut commutar a «%s»"
+
+#, fuzzy, c-format
+msgid "[GLE %ld] could not get longname of '%s'"
+msgstr "no s'ha pogut commutar a «%s»"
+
+#, c-format
+msgid "ReadDirectoryChangedW failed on '%s' [GLE %ld]"
+msgstr ""
+
+#, c-format
+msgid "GetOverlappedResult failed on '%s' [GLE %ld]"
+msgstr ""
+
+#, fuzzy, c-format
+msgid "could not read directory changes [GLE %ld]"
+msgstr "no s'han pogut crear directoris per %s"
+
+#, fuzzy, c-format
+msgid "failed to copy SID (%ld)"
+msgstr "s'ha produït un error en copiar el fitxer a «%s»"
+
+#, fuzzy, c-format
+msgid "failed to get owner for '%s' (%ld)"
+msgstr "s'ha produït un error en obtenir la branca per defecte per a «%s»"
+
+msgid "memory exhausted"
+msgstr "memòria esgotada"
+
+msgid "Success"
+msgstr ""
+
+msgid "No match"
+msgstr ""
+
+#, fuzzy
+msgid "Invalid regular expression"
+msgstr "usa les expressions regulars POSIX ampliades"
+
+#, fuzzy
+msgid "Invalid collation character"
+msgstr "caràcter de llast"
+
+#, fuzzy
+msgid "Invalid character class name"
+msgstr "hi ha caràcters no vàlids en el nom de màquina"
+
+msgid "Trailing backslash"
+msgstr ""
+
+#, fuzzy
+msgid "Invalid back reference"
+msgstr "referència no vàlida: %s"
+
+msgid "Unmatched [ or [^"
+msgstr ""
+
+msgid "Unmatched ( or \\("
+msgstr ""
+
+msgid "Unmatched \\{"
+msgstr ""
+
+#, fuzzy
+msgid "Invalid content of \\{\\}"
+msgstr "contingut no vàlid: «%s»"
+
+#, fuzzy
+msgid "Invalid range end"
+msgstr "codificació de transferència no vàlida"
+
+#, fuzzy
+msgid "Memory exhausted"
+msgstr "memòria esgotada"
+
+#, fuzzy
+msgid "Invalid preceding regular expression"
+msgstr "usa les expressions regulars POSIX ampliades"
+
+#, fuzzy
+msgid "Premature end of regular expression"
+msgstr "usa les expressions regulars POSIX ampliades"
+
+msgid "Regular expression too big"
+msgstr ""
+
+msgid "Unmatched ) or \\)"
+msgstr ""
+
+#, fuzzy
+msgid "No previous regular expression"
+msgstr "usa les expressions regulars compatibles amb Perl"
+
+msgid "could not send IPC command"
+msgstr "no s'ha pogut enviar l'ordre IPC"
+
+msgid "could not read IPC response"
+msgstr "no s'ha pogut llegir la resposta IPC"
+
+#, c-format
+msgid "could not start accept_thread '%s'"
+msgstr "no s'ha pogut començar un fil «accept_thread» «%s»"
+
+#, c-format
+msgid "could not start worker[0] for '%s'"
+msgstr "no s'ha pogut iniciar el fil[0] per a «%s»"
+
+#, fuzzy, c-format
+msgid "ConnectNamedPipe failed for '%s' (%lu)"
+msgstr "uname() ha fallat amb l'error «%s» (%d)\n"
+
+#, fuzzy, c-format
+msgid "could not create fd from pipe for '%s'"
+msgstr "no s'han pogut crear directoris per %s"
+
+#, fuzzy, c-format
+msgid "could not start thread[0] for '%s'"
+msgstr "no s'ha pogut iniciar el fil[0] per a «%s»"
+
+#, fuzzy, c-format
+msgid "wait for hEvent failed for '%s'"
+msgstr "S'ha produït un error en autenticar per «%s»"
+
+msgid "cannot resume in the background, please use 'fg' to resume"
+msgstr "no es pot reprendre en segon pla, si us plau useu «fg» per a reprendre"
+
+msgid "cannot restore terminal settings"
+msgstr "no es poden restaurar els paràmetres del terminal"
+
+#, c-format
+msgid ""
+"exceeded maximum include depth (%d) while including\n"
+"\t%s\n"
+"from\n"
+"\t%s\n"
+"This might be due to circular includes."
+msgstr ""
+"s'ha superat la profunditat màxima d'inclusió (%d) mentre s'incloïen\n"
+"\t%s\n"
+"des de\n"
+"\t%s\n"
+"Això pot ser degut a inclusions circulars."
+
+#, c-format
+msgid "could not expand include path '%s'"
+msgstr "no s'ha pogut expandir el camí d'inclusió «%s»"
+
+msgid "relative config includes must come from files"
+msgstr "les inclusions de configuració relatives han de venir de fitxers"
+
+msgid "relative config include conditionals must come from files"
+msgstr ""
+"els condicionals d'inclusió de configuració relatius han de venir de fitxers"
+
+msgid ""
+"remote URLs cannot be configured in file directly or indirectly included by "
+"includeIf.hasconfig:remote.*.url"
+msgstr ""
+"URL remots no es poden configurar en un fitxer directament o indirectament "
+"inclòs per «includeIf.hasconfig:remote.*.url»"
+
+#, c-format
+msgid "invalid config format: %s"
+msgstr "format de configuració no vàlid: %s"
+
+#, c-format
+msgid "missing environment variable name for configuration '%.*s'"
+msgstr "falta el nom de la variable d'entorn per a la configuració «%.*s»"
+
+#, c-format
+msgid "missing environment variable '%s' for configuration '%.*s'"
+msgstr "falta la variable d'entorn «%s» per a la configuració «%.*s»"
+
+#, c-format
+msgid "key does not contain a section: %s"
+msgstr "la clau no conté una secció: «%s»"
+
+#, c-format
+msgid "key does not contain variable name: %s"
+msgstr "la clau no conté un nom de variable: «%s»"
+
+#, c-format
+msgid "invalid key: %s"
+msgstr "clau no vàlida: %s"
+
+#, c-format
+msgid "invalid key (newline): %s"
+msgstr "clau no vàlida (línia nova): %s"
+
+msgid "empty config key"
+msgstr "clau de configuració buida"
+
+#, c-format
+msgid "bogus config parameter: %s"
+msgstr "paràmetre de configuració erroni: %s"
+
+#, c-format
+msgid "bogus format in %s"
+msgstr "format erroni a %s"
+
+#, c-format
+msgid "bogus count in %s"
+msgstr "comptatge erroni a %s"
+
+#, c-format
+msgid "too many entries in %s"
+msgstr "hi ha massa arguments a %s"
+
+#, c-format
+msgid "missing config key %s"
+msgstr "falta la clau de configuració %s"
+
+#, c-format
+msgid "missing config value %s"
+msgstr "falta el valor de configuració %s"
+
+#, c-format
+msgid "bad config line %d in blob %s"
+msgstr "línia de configuració %d errònia en el blob %s"
+
+#, c-format
+msgid "bad config line %d in file %s"
+msgstr "línia de configuració %d errònia en el fitxer %s"
+
+#, c-format
+msgid "bad config line %d in standard input"
+msgstr "línia de configuració %d errònia en l'entrada estàndard"
+
+#, 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"
+
+#, 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"
+
+#, c-format
+msgid "bad config line %d in %s"
+msgstr "línia de configuració %d errònia en %s"
+
+msgid "out of range"
+msgstr "fora de rang"
+
+msgid "invalid unit"
+msgstr "unitat no vàlida"
+
+#, c-format
+msgid "bad numeric config value '%s' for '%s': %s"
+msgstr "valor de configuració numèric erroni «%s» per «%s»: %s"
+
+#, 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"
+
+#, 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"
+
+#, 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"
+
+#, 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"
+
+#, 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"
+
+#, 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"
+
+#, c-format
+msgid "invalid value for variable %s"
+msgstr "valor no vàlid per a la variable %s"
+
+#, c-format
+msgid "ignoring unknown core.fsync component '%s'"
+msgstr "s'ignora el component core.fsync «%s» desconegut"
+
+#, c-format
+msgid "bad boolean config value '%s' for '%s'"
+msgstr "valor de configuració booleà erroni «%s» per a «%s»"
+
+#, 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»"
+
+#, c-format
+msgid "'%s' for '%s' is not a valid timestamp"
+msgstr "«%s» per a «%s» no és una marca de temps vàlida"
+
+#, c-format
+msgid "abbrev length out of range: %d"
+msgstr "la longitud d'«abbrev» està fora de rang: %d"
+
+#, c-format
+msgid "bad zlib compression level %d"
+msgstr "nivell de compressió de zlib incorrecte %d"
+
+msgid "core.commentChar should only be one character"
+msgstr "core.commentChar només hauria de ser un caràcter"
+
+#, c-format
+msgid "ignoring unknown core.fsyncMethod value '%s'"
+msgstr "s'ignora el valor desconegut «%s» de core.fsyncMethod"
+
+msgid "core.fsyncObjectFiles is deprecated; use core.fsync instead"
+msgstr "core.fsyncObjectFiles és obsolet; useu core.fsync"
+
+#, c-format
+msgid "invalid mode for object creation: %s"
+msgstr "mode de creació d'objecte no vàlid: %s"
+
+#, c-format
+msgid "malformed value for %s"
+msgstr "valor no vàlid per a %s"
+
+#, c-format
+msgid "malformed value for %s: %s"
+msgstr "valor no vàlid per a %s: %s"
+
+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"
+
+#, c-format
+msgid "unable to load config blob object '%s'"
+msgstr "no s'ha pogut carregar l'objecte blob de configuració «%s»"
+
+#, c-format
+msgid "reference '%s' does not point to a blob"
+msgstr "la referència «%s» no assenyala a un blob"
+
+#, c-format
+msgid "unable to resolve config blob '%s'"
+msgstr "no s'ha pogut resoldre el blob de configuració: «%s»"
+
+#, c-format
+msgid "failed to parse %s"
+msgstr "s'ha produït un error en analitzar %s"
+
+msgid "unable to parse command-line config"
+msgstr "no s'ha pogut analitzar la configuració de la línia d'ordres"
+
+msgid "unknown error occurred while reading the configuration files"
+msgstr "un error desconegut ha ocorregut en llegir els fitxers de configuració"
+
+#, c-format
+msgid "Invalid %s: '%s'"
+msgstr "%s no vàlid: «%s»"
+
+#, 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"
+
+#, 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"
+
+#, 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"
+
+#, c-format
+msgid "invalid section name '%s'"
+msgstr "nom de secció no vàlid «%s»"
+
+#, c-format
+msgid "%s has multiple values"
+msgstr "%s té múltiples valors"
+
+#, c-format
+msgid "failed to write new configuration file %s"
+msgstr "no es pot escriure un nou fitxer de configuració %s"
+
+#, c-format
+msgid "could not lock config file %s"
+msgstr "no s'ha pogut blocar el fitxer de configuració %s"
+
+#, c-format
+msgid "opening %s"
+msgstr "s'està obrint %s"
+
+#, c-format
+msgid "invalid config file %s"
+msgstr "fitxer de configuració no vàlid %s"
+
+#, c-format
+msgid "fstat on %s failed"
+msgstr "ha fallat «fstat» a %s"
+
+#, c-format
+msgid "unable to mmap '%s'%s"
+msgstr "no s'ha pogut fer «mmap» «%s»%s"
+
+#, c-format
+msgid "chmod on %s failed"
+msgstr "ha fallat chmod a %s"
+
+#, c-format
+msgid "could not write config file %s"
+msgstr "no s'ha pogut escriure el fitxer de configuració «%s»"
+
+#, c-format
+msgid "could not set '%s' to '%s'"
+msgstr "no s'ha pogut establir «%s» a «%s»"
+
+#, c-format
+msgid "invalid section name: %s"
+msgstr "nom de secció no vàlida: %s"
+
+#, c-format
+msgid "missing value for '%s'"
+msgstr "falta el valor per «%s»"
+
+msgid "the remote end hung up upon initial contact"
+msgstr "el costat remot ha penjat en el moment de contacte inicial"
+
+msgid ""
+"Could not read from remote repository.\n"
+"\n"
+"Please make sure you have the correct access rights\n"
+"and the repository exists."
+msgstr ""
+"No s'ha pogut llegir del repositori remot.\n"
+"\n"
+"Assegureu-vos que tingueu els permisos\n"
+"d'accés correctes i que el repositori existeixi."
+
+#, c-format
+msgid "server doesn't support '%s'"
+msgstr "el servidor no és compatible amb «%s»"
+
+#, c-format
+msgid "server doesn't support feature '%s'"
+msgstr "el servidor no és compatible amb la característica «%s»"
+
+msgid "expected flush after capabilities"
+msgstr "s'esperava un buidatge després de les capacitats"
+
+#, c-format
+msgid "ignoring capabilities after first line '%s'"
+msgstr "ignora les capacitats després de la primera línia «%s»"
+
+msgid "protocol error: unexpected capabilities^{}"
+msgstr "error de protocol: unexpected capabilities^{}"
+
+#, 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»"
+
+msgid "repository on the other end cannot be shallow"
+msgstr "el repositori de l'altre extrem no pot ser shallow"
+
+msgid "invalid packet"
+msgstr "paquet no vàlid"
+
+#, c-format
+msgid "protocol error: unexpected '%s'"
+msgstr "s'ha produït un error de protocol: no s'esperava «%s»"
+
+#, c-format
+msgid "unknown object format '%s' specified by server"
+msgstr "format d'objecte «%s» especificat pel servidor desconegut"
+
+#, c-format
+msgid "invalid ls-refs response: %s"
+msgstr "resposta de ls-refs no vàlida: %s"
+
+msgid "expected flush after ref listing"
+msgstr "s'esperava una neteja després del llistat de referències"
+
+msgid "expected response end packet after ref listing"
+msgstr ""
+"s'esperava un paquet de final de resposta després del llistat de referències"
+
+#, c-format
+msgid "protocol '%s' is not supported"
+msgstr "el protocol «%s» no és compatible"
+
+msgid "unable to set SO_KEEPALIVE on socket"
+msgstr "no s'ha pogut establir SO_KEEPALIVE al sòcol"
+
+#, c-format
+msgid "Looking up %s ... "
+msgstr "S'està cercant %s..."
+
+#, 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 ... "
+#, c-format
+msgid ""
+"done.\n"
+"Connecting to %s (port %s) ... "
+msgstr ""
+"fet.\n"
+"S'està connectant a %s (port %s) ... "
+
+#, c-format
+msgid ""
+"unable to connect to %s:\n"
+"%s"
+msgstr ""
+"no s'ha pogut connectar a %s:\n"
+"%s"
+
+#. TRANSLATORS: this is the end of "Connecting to %s (port %s) ... "
+msgid "done."
+msgstr "fet."
+
+#, c-format
+msgid "unable to look up %s (%s)"
+msgstr "no s'ha pogut trobar %s (%s)"
+
+#, c-format
+msgid "unknown port %s"
+msgstr "port desconegut %s"
+
+#, c-format
+msgid "strange hostname '%s' blocked"
+msgstr "s'ha bloquejat el nom estrany d'amfitrió «%s»"
+
+#, c-format
+msgid "strange port '%s' blocked"
+msgstr "s'ha bloquejat el port estrany «%s»"
+
+#, c-format
+msgid "cannot start proxy %s"
+msgstr "no s'ha pogut iniciar servidor intermediari «%s»"
+
+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"
+
+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"
+
+msgid "ssh variant 'simple' does not support -4"
+msgstr "la variant «simple» de ssh no és compatible amb -4"
+
+msgid "ssh variant 'simple' does not support -6"
+msgstr "la variant «simple» de ssh no és compatible amb -6"
+
+msgid "ssh variant 'simple' does not support setting port"
+msgstr "la variant «simple» de ssh no permet definir el port"
+
+#, c-format
+msgid "strange pathname '%s' blocked"
+msgstr "s'ha bloquejat el nom de fitxer estrany «%s»"
+
+msgid "unable to fork"
+msgstr "no s'ha pogut bifurcar"
+
+msgid "Could not run 'git rev-list'"
+msgstr "No s'ha pogut executar «git rev-list»"
+
+msgid "failed write to rev-list"
+msgstr "escriptura fallada al rev-list"
+
+msgid "failed to close rev-list's stdin"
+msgstr "s'ha produït un error en tancar l'stdin del rev-list"
+
+#, c-format
+msgid "'%s' does not exist"
+msgstr "«%s» no existeix"
+
+msgid "need a working directory"
+msgstr "cal un directori de treball"
+
+msgid "could not find enlistment root"
+msgstr "no s'ha pogut trobar un arrel d'allistament"
+
+#, c-format
+msgid "could not switch to '%s'"
+msgstr "no s'ha pogut commutar a «%s»"
+
+#, c-format
+msgid "could not configure %s=%s"
+msgstr "no s'ha pogut configurar %s=%s"
+
+msgid "could not configure log.excludeDecoration"
+msgstr "no s'ha pogut configurar log.excludeDecoration"
+
+msgid "Scalar enlistments require a worktree"
+msgstr "Els allistaments escalars requereixen un arbre de treball"
+
+#, c-format
+msgid "could not open directory '%s'"
+msgstr "no s'ha pogut obrir el directori «%s»"
+
+#, fuzzy, c-format
+msgid "skipping '%s', which is neither file nor directory"
+msgstr "el destí «%s» no és un directori"
+
+#, fuzzy, c-format
+msgid "could not determine free disk size for '%s'"
+msgstr "no s'ha pogut crear el directori d'arbre de treball «%s»"
+
+#, fuzzy, c-format
+msgid "could not get info for '%s'"
+msgstr "no s'ha pogut llegir el fitxer de registre per a «%s»"
+
+#, c-format
+msgid "remote HEAD is not a branch: '%.*s'"
+msgstr "el HEAD remot no és una branca: «%.*s»"
+
+msgid "failed to get default branch name from remote; using local default"
+msgstr ""
+"no s'ha pogut obtenir el nom de la branca per defecte del remot; s'usa ela "
+"predeterminada localment"
+
+msgid "failed to get default branch name"
+msgstr "s'ha produït un error en obtenir el nom de branca predeterminada"
+
+msgid "failed to unregister repository"
+msgstr "s'ha produït un error en desregistrar el repositori"
+
+msgid "failed to delete enlistment directory"
+msgstr "s'ha produït un error en suprimir l'allistament del directori"
+
+msgid "branch to checkout after clone"
+msgstr "branca a agafar després de clonar"
+
+msgid "when cloning, create full working directory"
+msgstr "quan es clona, crear un directori de treball complet"
+
+msgid "only download metadata for the branch that will be checked out"
+msgstr "només baixa les metadades per a la branca que s'agafarà"
+
+msgid "scalar clone [<options>] [--] <repo> [<dir>]"
+msgstr "scalar clone [<opcions>] [--] <repo> [<dir>]"
+
+#, c-format
+msgid "cannot deduce worktree name from '%s'"
+msgstr "no es pot deduir el nom de l'arbre de treball de «%s»"
+
+#, c-format
+msgid "directory '%s' exists already"
+msgstr "el directori «%s» ja existeix"
+
+#, c-format
+msgid "failed to get default branch for '%s'"
+msgstr "s'ha produït un error en obtenir la branca per defecte per a «%s»"
+
+#, c-format
+msgid "could not configure remote in '%s'"
+msgstr "no s'ha pogut configurar el remot a «%s»"
+
+#, c-format
+msgid "could not configure '%s'"
+msgstr "no s'ha pogut configurar «%s»"
+
+msgid "partial clone failed; attempting full clone"
+msgstr "ha fallat la clonació parcial; s'està intentant la clonació completa"
+
+msgid "could not configure for full clone"
+msgstr "no s'ha pogut configurar per a una clonació completa"
+
+#, fuzzy
+msgid "scalar diagnose [<enlistment>]"
+msgstr "scalar register [<enlistment>]"
+
+#, fuzzy, c-format
+msgid "could not create directory for '%s'"
+msgstr "No s'ha pogut crear el directori per a «%s»"
+
+#, fuzzy
+msgid "could not duplicate stdout"
+msgstr "no s'ha pogut actualitzar %s"
+
+#, fuzzy
+msgid "failed to write archive"
+msgstr "s'ha produït un error en llegir la memòria cau"
+
+msgid "`scalar list` does not take arguments"
+msgstr "«scalar list» no accepta arguments"
+
+msgid "scalar register [<enlistment>]"
+msgstr "scalar register [<enlistment>]"
+
+msgid "reconfigure all registered enlistments"
+msgstr "reconfigura tots els allistaments registrats"
+
+msgid "scalar reconfigure [--all | <enlistment>]"
+msgstr "scalar reconfigure [--all | <enlistment>]"
+
+msgid "--all or <enlistment>, but not both"
+msgstr "--all o <enlistment>, però no ambdós"
+
+#, c-format
+msgid "git repository gone in '%s'"
+msgstr "no existeix un repositori de git a: «%s»"
+
+msgid ""
+"scalar run <task> [<enlistment>]\n"
+"Tasks:\n"
+msgstr ""
+"scalar run <task>  {<enlistment>]\n"
+"Tasques:\n"
+
+#, c-format
+msgid "no such task: '%s'"
+msgstr "no existeix la tasca: «%s»"
+
+msgid "scalar unregister [<enlistment>]"
+msgstr "scalar unregister [<enlistment>]"
+
+msgid "scalar delete <enlistment>"
+msgstr "supressió de l'escalar <enlistment>"
+
+msgid "refusing to delete current working directory"
+msgstr "s'ha rebutjat suprimir el directori de treball actual"
+
+msgid "include Git version"
+msgstr "inclou la versió del Git"
+
+msgid "include Git's build options"
+msgstr "inclou les opcions de construcció del Git"
+
+msgid "scalar verbose [-v | --verbose] [--build-options]"
+msgstr "scalar verbose [-v | --verbose] [--build-options]"
+
+msgid "-C requires a <directory>"
+msgstr "-C requereix un <directory>"
+
+#, c-format
+msgid "could not change to '%s'"
+msgstr "no s'ha pogut canviar a «%s»"
+
+msgid "-c requires a <key>=<value> argument"
+msgstr "-c requereix un argument <key>=<value>"
+
+msgid ""
+"scalar [-C <directory>] [-c <key>=<value>] <command> [<options>]\n"
+"\n"
+"Commands:\n"
+msgstr ""
+"scalar [-C <directory>] [-c <key>=<value>] <command> [<options>]\n"
+"\n"
+"Ordres:\n"
+
+#, c-format
+msgid "illegal crlf_action %d"
+msgstr "crlf_action %d il·legal"
+
+#, c-format
+msgid "CRLF would be replaced by LF in %s"
+msgstr "CRLF es reemplaçà per LF en %s"
+
+#, c-format
+msgid ""
+"in the working copy of '%s', CRLF will be replaced by LF the next time Git "
+"touches it"
+msgstr ""
+
+#, c-format
+msgid "LF would be replaced by CRLF in %s"
+msgstr "LF es reemplaçà per CRLF en %s"
+
+#, c-format
+msgid ""
+"in the working copy of '%s', LF will be replaced by CRLF the next time Git "
+"touches it"
+msgstr ""
+
+#, c-format
+msgid "BOM is prohibited in '%s' if encoded as %s"
+msgstr "BOM està prohibida a «%s» si està codificada com a %s"
+
+#, c-format
+msgid ""
+"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."
+
+#, c-format
+msgid "BOM is required in '%s' if encoded as %s"
+msgstr "La BOM és necessària en «%s» si està codificada com a %s"
+
+#, 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."
+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."
+
+#, c-format
+msgid "failed to encode '%s' from %s to %s"
+msgstr "s'ha produït un error en codificar «%s» des de %s a %s"
+
+#, c-format
+msgid "encoding '%s' from %s to %s and back is not the same"
+msgstr "codificar «%s» des de %s a %s i cap enrere no és el mateix"
+
+#, c-format
+msgid "cannot fork to run external filter '%s'"
+msgstr "no es pot bifurcar per a executar el filtre extern «%s»"
+
+#, c-format
+msgid "cannot feed the input to external filter '%s'"
+msgstr "no es pot alimentar l'entrada al filtre extern «%s»"
+
+#, c-format
+msgid "external filter '%s' failed %d"
+msgstr "el filtre extern «%s» ha fallat %d"
+
+#, c-format
+msgid "read from external filter '%s' failed"
+msgstr "la lectura del filtre extern «%s» ha fallat"
+
+#, c-format
+msgid "external filter '%s' failed"
+msgstr "el filtre extern «%s» ha fallat"
+
+msgid "unexpected filter type"
+msgstr "tipus de filtre inesperat"
+
+msgid "path name too long for external filter"
+msgstr "el nom del camí és massa gran per al filtre extern"
+
+#, 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"
+
+msgid "true/false are no valid working-tree-encodings"
+msgstr "cert/fals no són codificacions d'arbre de treball vàlides"
+
+#, c-format
+msgid "%s: clean filter '%s' failed"
+msgstr "%s: el filtre de netejat «%s» ha fallat"
+
+#, c-format
+msgid "%s: smudge filter %s failed"
+msgstr "%s: ha fallat el filtre smudge %s"
+
+#, c-format
+msgid "skipping credential lookup for key: credential.%s"
+msgstr "s'està ometent la cerca de credencials per una clau: credential.%s"
+
+msgid "refusing to work with credential missing host field"
+msgstr ""
+"s'ha rebutjat treballar amb credencials que no tenen el camp d'amfitrió"
+
+msgid "refusing to work with credential missing protocol field"
+msgstr ""
+"s'ha rebutjat treballar amb credencials que no tenen el camp de protocol"
+
+#, c-format
+msgid "url contains a newline in its %s component: %s"
+msgstr "url conté una línia nova en %s component: %s"
+
+#, c-format
+msgid "url has no scheme: %s"
+msgstr "l'url no té esquema: %s"
+
+#, c-format
+msgid "credential url cannot be parsed: %s"
+msgstr "no s'ha pogut analitzar l'URL de credencials: %s"
+
+msgid "in the future"
+msgstr "en el futur"
+
+#, c-format
+msgid "%<PRIuMAX> second ago"
+msgid_plural "%<PRIuMAX> seconds ago"
+msgstr[0] "fa %<PRIuMAX> segon"
+msgstr[1] "fa %<PRIuMAX> segons"
+
+#, c-format
+msgid "%<PRIuMAX> minute ago"
+msgid_plural "%<PRIuMAX> minutes ago"
+msgstr[0] "fa %<PRIuMAX> minut"
+msgstr[1] "fa %<PRIuMAX> minuts"
+
+#, c-format
+msgid "%<PRIuMAX> hour ago"
+msgid_plural "%<PRIuMAX> hours ago"
+msgstr[0] "fa %<PRIuMAX> hora"
+msgstr[1] "fa %<PRIuMAX> hores"
+
+#, c-format
+msgid "%<PRIuMAX> day ago"
+msgid_plural "%<PRIuMAX> days ago"
+msgstr[0] "fa %<PRIuMAX> dia"
+msgstr[1] "fa %<PRIuMAX> dies"
+
+#, c-format
+msgid "%<PRIuMAX> week ago"
+msgid_plural "%<PRIuMAX> weeks ago"
+msgstr[0] "fa %<PRIuMAX> setmana"
+msgstr[1] "fa %<PRIuMAX> setmanes"
+
+#, c-format
+msgid "%<PRIuMAX> month ago"
+msgid_plural "%<PRIuMAX> months ago"
+msgstr[0] "fa %<PRIuMAX> mes"
+msgstr[1] "fa %<PRIuMAX> mesos"
+
+#, c-format
+msgid "%<PRIuMAX> year"
+msgid_plural "%<PRIuMAX> years"
+msgstr[0] "%<PRIuMAX> any"
+msgstr[1] "%<PRIuMAX> anys"
+
+#. TRANSLATORS: "%s" is "<n> years"
+#, c-format
+msgid "%s, %<PRIuMAX> month ago"
+msgid_plural "%s, %<PRIuMAX> months ago"
+msgstr[0] "fa %s i %<PRIuMAX> mes"
+msgstr[1] "fa %s i %<PRIuMAX> mesos"
+
+#, c-format
+msgid "%<PRIuMAX> year ago"
+msgid_plural "%<PRIuMAX> years ago"
+msgstr[0] "fa %<PRIuMAX> any"
+msgstr[1] "fa %<PRIuMAX> anys"
+
+msgid "Propagating island marks"
+msgstr "S'estan propagant les marques d'illa"
+
+#, c-format
+msgid "bad tree object %s"
+msgstr "objecte d'arbre malmès %s"
+
+#, c-format
+msgid "failed to load island regex for '%s': %s"
+msgstr ""
+"s'ha produït un error en carregar l'expressió regular de l'illa per «%s»: %s"
+
+#, c-format
+msgid "island regex from config has too many capture groups (max=%d)"
+msgstr ""
+"l'expressió regular de l'illa des de la configuració té massa grups de "
+"captura (màx=%d)"
+
+#, c-format
+msgid "Marked %d islands, done.\n"
+msgstr "Marcades %d illes, fet.\n"
+
+msgid "--merge-base does not work with ranges"
+msgstr "--merge-base no funciona amb intervals"
+
+msgid "--merge-base only works with commits"
+msgstr "--merge-base només funciona amb comissions"
+
+msgid "unable to get HEAD"
+msgstr "no s'ha pogut obtenir HEAD"
+
+msgid "no merge base found"
+msgstr "no s'ha trobat una base de fusió"
+
+msgid "multiple merge bases found"
+msgstr "s'han trobat múltiples bases de fusió"
+
+msgid "git diff --no-index [<options>] <path> <path>"
+msgstr "git diff --no-index [<opcions>] <camí> <camí>"
+
+msgid ""
+"Not a git repository. Use --no-index to compare two paths outside a working "
+"tree"
+msgstr ""
+"No és un repositori Git. Useu --no-index per a comparar dos camins fora del "
+"directori de treball"
+
+#, 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"
+
+#, c-format
+msgid "  Unknown dirstat parameter '%s'\n"
+msgstr "  Paràmetre de dirstat desconegut «%s»\n"
+
+msgid ""
+"color moved setting must be one of 'no', 'default', 'blocks', 'zebra', "
+"'dimmed-zebra', 'plain'"
+msgstr ""
+"el paràmetre de color en moviment ha de ser «no», «default», «blocks», "
+"«zebra», «dimmed-zebra» o «plain»"
+
+#, 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 ""
+"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»"
+
+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"
+
+#, c-format
+msgid "Unknown value for 'diff.submodule' config variable: '%s'"
+msgstr ""
+"Valor desconegut de la variable de configuració de «diff.submodule»: «%s»"
+
+#, c-format
+msgid ""
+"Found errors in 'diff.dirstat' config variable:\n"
+"%s"
+msgstr ""
+"S'han trobat errors en la variable de configuració «diff.dirstat»:\n"
+"%s"
+
+#, c-format
+msgid "external diff died, stopping at %s"
+msgstr "el diff external s'ha mort, s'està aturant a %s"
+
+#, c-format
+msgid "options '%s', '%s', '%s', and '%s' cannot be used together"
+msgstr "les opcions «%s», «%s», «%s», i «%s» no es poden usar juntes"
+
+#, c-format
+msgid "options '%s' and '%s' cannot be used together, use '%s' with '%s'"
+msgstr "les opcions «%s» i «%s» no es poden usar juntes, useu «%s» amb «%s»"
+
+#, c-format
+msgid ""
+"options '%s' and '%s' cannot be used together, use '%s' with '%s' and '%s'"
+msgstr ""
+"les opcions «%s» i «%s» no es poden usar juntes, useu «%s» amb «%s» i «%s»"
+
+msgid "--follow requires exactly one pathspec"
+msgstr "--follow requereix exactament una especificació de camí"
+
+#, c-format
+msgid "invalid --stat value: %s"
+msgstr "valor --stat no vàlid: %s"
+
+#, c-format
+msgid "%s expects a numerical value"
+msgstr "%s espera un valor numèric"
+
+#, c-format
+msgid ""
+"Failed to parse --dirstat/-X option parameter:\n"
+"%s"
+msgstr ""
+"S'ha produït un error en analitzar el paràmetre d'opció de --dirstat/-X:\n"
+"%s"
+
+#, c-format
+msgid "unknown change class '%c' in --diff-filter=%s"
+msgstr "classe de canvi «%c» desconeguda a --diff-filter=%s"
+
+#, c-format
+msgid "unknown value after ws-error-highlight=%.*s"
+msgstr "valor desconegut després de ws-error-highlight=%.*s"
+
+#, c-format
+msgid "unable to resolve '%s'"
+msgstr "no s'ha pogut resoldre «%s»"
+
+#, c-format
+msgid "%s expects <n>/<m> form"
+msgstr "%s espera una forma <n>/<m>"
+
+#, c-format
+msgid "%s expects a character, got '%s'"
+msgstr "%s esperava un caràcter, s'ha rebut «%s»"
+
+#, c-format
+msgid "bad --color-moved argument: %s"
+msgstr "argument --color-moved incorrecte: %s"
+
+#, c-format
+msgid "invalid mode '%s' in --color-moved-ws"
+msgstr "mode «%s» no vàlid en --color-moved-ws"
+
+msgid ""
+"option diff-algorithm accepts \"myers\", \"minimal\", \"patience\" and "
+"\"histogram\""
+msgstr ""
+"l'opció diff-algorithm accepta «myers», «minimal», «patience» i «histogram»"
+
+#, c-format
+msgid "invalid argument to %s"
+msgstr "argument no vàlid a %s"
+
+#, c-format
+msgid "invalid regex given to -I: '%s'"
+msgstr "expressió regular donada a -I: no vàlida: «%s»"
+
+#, 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»"
+
+#, c-format
+msgid "bad --word-diff argument: %s"
+msgstr "argument --word-diff incorrecte: %s"
+
+msgid "Diff output format options"
+msgstr "Opcions del format de sortida del diff"
+
+msgid "generate patch"
+msgstr "genera el pedaç"
+
+msgid "<n>"
+msgstr "<n>"
+
+msgid "generate diffs with <n> lines context"
+msgstr "genera diffs amb <n> línies de context"
+
+msgid "generate the diff in raw format"
+msgstr "genera el diff en format cru"
+
+msgid "synonym for '-p --raw'"
+msgstr "sinònim de «-p --raw»"
+
+msgid "synonym for '-p --stat'"
+msgstr "sinònim de «-p --stat»"
+
+msgid "machine friendly --stat"
+msgstr "llegible per màquina --stat"
+
+msgid "output only the last line of --stat"
+msgstr "mostra només l'última línia de --stat"
+
+msgid "<param1,param2>..."
+msgstr "<param1,param2>..."
+
+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"
+
+msgid "synonym for --dirstat=cumulative"
+msgstr "sinònim de --dirstat=cumulative"
+
+msgid "synonym for --dirstat=files,param1,param2..."
+msgstr "sinònim de --dirstat=files,param1,param2..."
+
+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"
+
+msgid "condensed summary such as creations, renames and mode changes"
+msgstr "resum condensat com ara creacions, canvis de nom i mode"
+
+msgid "show only names of changed files"
+msgstr "mostra només els noms de fitxers canviats"
+
+msgid "show only names and status of changed files"
+msgstr "mostra només els noms i l'estat dels fitxers canviats"
+
+msgid "<width>[,<name-width>[,<count>]]"
+msgstr "<amplada>[<amplada-nom>[,<recompte>]]"
+
+msgid "generate diffstat"
+msgstr "genera diffstat"
+
+msgid "<width>"
+msgstr "<amplada>"
+
+msgid "generate diffstat with a given width"
+msgstr "genera diffstat amb una amplada donada"
+
+msgid "generate diffstat with a given name width"
+msgstr "genera diffstat amb un nom d'amplada donat"
+
+msgid "generate diffstat with a given graph width"
+msgstr "genera diffstat amb una amplada de graf donada"
+
+msgid "<count>"
+msgstr "<comptador>"
+
+msgid "generate diffstat with limited lines"
+msgstr "genera diffstat amb línies limitades"
+
+msgid "generate compact summary in diffstat"
+msgstr "genera un resum compacte a diffstat"
+
+msgid "output a binary diff that can be applied"
+msgstr "diff amb sortida binària que pot ser aplicada"
+
+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»"
+
+msgid "show colored diff"
+msgstr "mostra un diff amb colors"
+
+msgid "<kind>"
+msgstr "<kind>"
+
+msgid ""
+"highlight whitespace errors in the 'context', 'old' or 'new' lines in the "
+"diff"
+msgstr ""
+"ressalta els errors d'espai en blanc a les línies «context», «old» o «new» "
+"al diff"
+
+msgid ""
+"do not munge pathnames and use NULs as output field terminators in --raw or "
+"--numstat"
+msgstr ""
+"no consolidis els noms de camí i utilitza NULs com a terminadors de camp de "
+"sortida en --raw o --numstat"
+
+msgid "<prefix>"
+msgstr "<prefix>"
+
+msgid "show the given source prefix instead of \"a/\""
+msgstr "mostra el prefix d'origen donat en lloc de «a/»"
+
+msgid "show the given destination prefix instead of \"b/\""
+msgstr "mostra el prefix de destinació indicat en lloc de «b/»"
+
+msgid "prepend an additional prefix to every line of output"
+msgstr "afegir un prefix addicional per a cada línia de sortida"
+
+msgid "do not show any source or destination prefix"
+msgstr "no mostris cap prefix d'origen o destí"
+
+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"
+
+msgid "<char>"
+msgstr "<char>"
+
+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 «+»"
+
+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 «-»"
+
+msgid "specify the character to indicate a context instead of ' '"
+msgstr "especifiqueu el caràcter per a indicar context en comptes de « »"
+
+msgid "Diff rename options"
+msgstr "Opcions de canvi de nom del diff"
+
+msgid "<n>[/<m>]"
+msgstr "<n>[/<m>]"
+
+msgid "break complete rewrite changes into pairs of delete and create"
+msgstr ""
+"divideix els canvis de reescriptura completa en parells de suprimir i crear"
+
+msgid "detect renames"
+msgstr "detecta els canvis de noms"
+
+msgid "omit the preimage for deletes"
+msgstr "omet les preimatges per les supressions"
+
+msgid "detect copies"
+msgstr "detecta còpies"
+
+msgid "use unmodified files as source to find copies"
+msgstr "usa els fitxers no modificats com a font per a trobar còpies"
+
+msgid "disable rename detection"
+msgstr "inhabilita la detecció de canvis de nom"
+
+msgid "use empty blobs as rename source"
+msgstr "usa els blobs buits com a font de canvi de nom"
+
+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"
+
+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"
+
+msgid "Diff algorithm options"
+msgstr "Opcions de l'algorisme Diff"
+
+msgid "produce the smallest possible diff"
+msgstr "produeix el diff més petit possible"
+
+msgid "ignore whitespace when comparing lines"
+msgstr "ignora els espais en blanc en comparar línies"
+
+msgid "ignore changes in amount of whitespace"
+msgstr "ignora els canvis en la quantitat d'espai en blanc"
+
+msgid "ignore changes in whitespace at EOL"
+msgstr "ignora els canvis d'espai en blanc al final de la línia"
+
+msgid "ignore carrier-return at the end of line"
+msgstr "ignora els retorns de línia al final de la línia"
+
+msgid "ignore changes whose lines are all blank"
+msgstr "ignora els canvis en línies que estan en blanc"
+
+msgid "<regex>"
+msgstr "<regex>"
+
+msgid "ignore changes whose all lines match <regex>"
+msgstr "ignora els canvis en les línies que coincideixen amb <regex>"
+
+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"
+
+msgid "generate diff using the \"patience diff\" algorithm"
+msgstr "genera diff usant l'algorisme «patience diff»"
+
+msgid "generate diff using the \"histogram diff\" algorithm"
+msgstr "genera diff usant l'algorisme «histogram diff»"
+
+msgid "<algorithm>"
+msgstr "<algorisme>"
+
+msgid "choose a diff algorithm"
+msgstr "trieu un algorisme per al diff"
+
+msgid "<text>"
+msgstr "<text>"
+
+msgid "generate diff using the \"anchored diff\" algorithm"
+msgstr "genera diff usant l'algorisme «anchored diff»"
+
+msgid "<mode>"
+msgstr "<mode>"
+
+msgid "show word diff, using <mode> to delimit changed words"
+msgstr ""
+"mostra el diff de paraules usant <mode> per a delimitar les paraules "
+"modificades"
+
+msgid "use <regex> to decide what a word is"
+msgstr "utilitza <regex> per a decidir què és una paraula"
+
+msgid "equivalent to --word-diff=color --word-diff-regex=<regex>"
+msgstr "equivalent a --word-diff=color --word-diff-regex=<regex>"
+
+msgid "moved lines of code are colored differently"
+msgstr "les línies de codi que s'ha mogut s'acoloreixen diferent"
+
+msgid "how white spaces are ignored in --color-moved"
+msgstr "com s'ignoren els espais en blanc a --color-moved"
+
+msgid "Other diff options"
+msgstr "Altres opcions diff"
+
+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"
+
+msgid "treat all files as text"
+msgstr "tracta tots els fitxers com a text"
+
+msgid "swap two inputs, reverse the diff"
+msgstr "intercanvia les dues entrades, inverteix el diff"
+
+msgid "exit with 1 if there were differences, 0 otherwise"
+msgstr "surt amb 1 si hi ha diferències, 0 en cas contrari"
+
+msgid "disable all output of the program"
+msgstr "inhabilita totes les sortides del programa"
+
+msgid "allow an external diff helper to be executed"
+msgstr "permet executar un ajudant de diff extern"
+
+msgid "run external text conversion filters when comparing binary files"
+msgstr ""
+"executa els filtres externs de conversió de text en comparar fitxers binaris"
+
+msgid "<when>"
+msgstr "<quan>"
+
+msgid "ignore changes to submodules in the diff generation"
+msgstr "ignora els canvis als submòduls en la generació del diff"
+
+msgid "<format>"
+msgstr "<format>"
+
+msgid "specify how differences in submodules are shown"
+msgstr "especifiqueu com es mostren els canvis als submòduls"
+
+msgid "hide 'git add -N' entries from the index"
+msgstr "amaga les entrades «git add -N» de l'índex"
+
+msgid "treat 'git add -N' entries as real in the index"
+msgstr "tracta les entrades «git add -N» com a reals a l'índex"
+
+msgid "<string>"
+msgstr "<cadena>"
+
+msgid ""
+"look for differences that change the number of occurrences of the specified "
+"string"
+msgstr ""
+"cerca les diferències que canvien el nombre d'ocurrències de la cadena "
+"especificada"
+
+msgid ""
+"look for differences that change the number of occurrences of the specified "
+"regex"
+msgstr ""
+"cerca les diferències que canvien el nombre d'ocurrències de l'expressió "
+"regular especificada"
+
+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"
+
+msgid "treat <string> in -S as extended POSIX regular expression"
+msgstr "tracta <cadena> a -S com a expressió regular POSIX ampliada"
+
+msgid "control the order in which files appear in the output"
+msgstr "controla l'ordre amb el qual els fitxers apareixen en la sortida"
+
+msgid "<path>"
+msgstr "<camí>"
+
+msgid "show the change in the specified path first"
+msgstr "mostra el canvi primer al camí especificat"
+
+msgid "skip the output to the specified path"
+msgstr "omet la sortida al camí especificat"
+
+msgid "<object-id>"
+msgstr "<id de l'objecte>"
+
+msgid ""
+"look for differences that change the number of occurrences of the specified "
+"object"
+msgstr ""
+"cerca les diferències que canvien el nombre d'ocurrències de l'objecte "
+"especificat"
+
+msgid "[(A|C|D|M|R|T|U|X|B)...[*]]"
+msgstr "[(A|C|D|M|R|T|U|X|B)...[*]]"
+
+msgid "select files by diff type"
+msgstr "seleccioneu els fitxers per tipus de diff"
+
+msgid "<file>"
+msgstr "<fitxer>"
+
+msgid "output to a specific file"
+msgstr "sortida a un fitxer específic"
+
+msgid "exhaustive rename detection was skipped due to too many files."
+msgstr ""
+"s'ha omès la detecció de canvi de nom exhaustiva perquè hi ha massa fitxers."
+
+msgid "only found copies from modified paths due to too many files."
+msgstr ""
+"només s'han trobat còpies des de camins modificats perquè de massa fitxers."
+
+#, 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."
+
+#, c-format
+msgid "failed to read orderfile '%s'"
+msgstr "s'ha produït un error en llegir el fitxer d'ordres «%s»"
+
+msgid "Performing inexact rename detection"
+msgstr "S'està realitzant una detecció inexacta de canvis de nom"
+
+#, c-format
+msgid "No such path '%s' in the diff"
+msgstr "No existeix el camí «%s» al diff"
+
+#, 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"
+
+#, c-format
+msgid "unrecognized pattern: '%s'"
+msgstr "patró no reconegut: «%s»"
+
+#, c-format
+msgid "unrecognized negative pattern: '%s'"
+msgstr "patró negatiu no reconegut: «%s»"
+
+#, 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"
+
+msgid "disabling cone pattern matching"
+msgstr "inhabilita la coincidència de patrons «cone»"
+
+#, c-format
+msgid "cannot use %s as an exclude file"
+msgstr "no es pot usar %s com a fitxer d'exclusió"
+
+msgid "failed to get kernel name and information"
+msgstr "s'ha produït un error en obtenir el nombre i la informació del nucli"
+
+msgid "untracked cache is disabled on this system or location"
+msgstr ""
+"la memòria cau no seguida està inhabilitada en aquest sistema o ubicació"
+
+msgid ""
+"No directory name could be guessed.\n"
+"Please specify a directory on the command line"
+msgstr ""
+"No s'ha pogut deduir cap nom de directori.\n"
+"Especifiqueu un directori en la línia d'ordres"
+
+#, c-format
+msgid "index file corrupt in repo %s"
+msgstr "el fitxer d'índex al repositori %s és malmès"
+
+#, c-format
+msgid "could not create directories for %s"
+msgstr "no s'han pogut crear directoris per %s"
+
+#, c-format
+msgid "could not migrate git directory from '%s' to '%s'"
+msgstr "no s'ha pogut migrar el directori de «%s» a «%s»"
+
+#, 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"
+
+msgid "Filtering content"
+msgstr "S'està filtrant el contingut"
+
+#, c-format
+msgid "could not stat file '%s'"
+msgstr "no s'ha pogut fer «stat» sobre el fitxer «%s»"
+
+#, c-format
+msgid "bad git namespace path \"%s\""
+msgstr "camí d'espai de noms git incorrecte «%s»"
+
+#, c-format
+msgid "too many args to run %s"
+msgstr "hi ha massa arguments per a executar %s"
+
+msgid "git fetch-pack: expected shallow list"
+msgstr "git fetch-pack: llista shallow esperada"
+
+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"
+
+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"
+
+#, c-format
+msgid "git fetch-pack: expected ACK/NAK, got '%s'"
+msgstr "git fetch-pack: s'esperava ACK/NAK, s'ha rebut «%s»"
+
+msgid "unable to write to remote"
+msgstr "no s'ha pogut escriure al remot"
+
+#, c-format
+msgid "invalid shallow line: %s"
+msgstr "línia de shallow no vàlida: %s"
+
+#, c-format
+msgid "invalid unshallow line: %s"
+msgstr "línia d'unshallow no vàlida: %s"
+
+#, c-format
+msgid "object not found: %s"
+msgstr "objecte no trobat: %s"
+
+#, c-format
+msgid "error in object: %s"
+msgstr "error en objecte: %s"
+
+#, c-format
+msgid "no shallow found: %s"
+msgstr "no s'ha trobat cap shallow: %s"
+
+#, c-format
+msgid "expected shallow/unshallow, got %s"
+msgstr "s'esperava shallow/unshallow, s'ha rebut %s"
+
+#, c-format
+msgid "got %s %d %s"
+msgstr "s'ha rebut %s %d %s"
+
+#, c-format
+msgid "invalid commit %s"
+msgstr "comissió no vàlida %s"
+
+msgid "giving up"
+msgstr "s'abandona"
+
+msgid "done"
+msgstr "fet"
+
+#, c-format
+msgid "got %s (%d) %s"
+msgstr "s'ha rebut %s (%d) %s"
+
+#, c-format
+msgid "Marking %s as complete"
+msgstr "S'està marcant %s com a complet"
+
+#, c-format
+msgid "already have %s (%s)"
+msgstr "ja es té %s (%s)"
+
+msgid "fetch-pack: unable to fork off sideband demultiplexer"
+msgstr "fetch-pack: no s'ha pogut bifurcar del desmultiplexor de banda lateral"
+
+msgid "protocol error: bad pack header"
+msgstr "error de protocol: capçalera de paquet errònia"
+
+#, c-format
+msgid "fetch-pack: unable to fork off %s"
+msgstr "fetch-pack: no es pot bifurcar de %s"
+
+msgid "fetch-pack: invalid index-pack output"
+msgstr "fetch-pack: sortida d'index-pack no vàlida"
+
+#, c-format
+msgid "%s failed"
+msgstr "%s ha fallat"
+
+msgid "error in sideband demultiplexer"
+msgstr "error en desmultiplexor de banda lateral"
+
+#, c-format
+msgid "Server version is %.*s"
+msgstr "La versió del servidor és %.*s"
+
+#, c-format
+msgid "Server supports %s"
+msgstr "El servidor accepta %s"
+
+msgid "Server does not support shallow clients"
+msgstr "El servidor no permet clients superficials"
+
+msgid "Server does not support --shallow-since"
+msgstr "El servidor no admet --shallow-since"
+
+msgid "Server does not support --shallow-exclude"
+msgstr "El servidor no admet --shallow-exclude"
+
+msgid "Server does not support --deepen"
+msgstr "El servidor no admet --deepen"
+
+msgid "Server does not support this repository's object format"
+msgstr ""
+"El servidor no és compatible amb el format d'objecte d'aquest repositori"
+
+msgid "no common commits"
+msgstr "cap comissió en comú"
+
+msgid "git fetch-pack: fetch failed."
+msgstr "git fetch-pack: l'obtenció ha fallat."
+
+#, c-format
+msgid "mismatched algorithms: client %s; server %s"
+msgstr "algoritmes no coincidents: client %s; servidor %s"
+
+#, c-format
+msgid "the server does not support algorithm '%s'"
+msgstr "el servidor no és compatible amb l'algorisme «%s»"
+
+msgid "Server does not support shallow requests"
+msgstr "El servidor no permet sol·licituds superficials"
+
+msgid "Server supports filter"
+msgstr "El servidor accepta filtratge"
+
+msgid "unable to write request to remote"
+msgstr "no s'ha pogut escriure la sol·licitud al remot"
+
+#, c-format
+msgid "expected '%s', received '%s'"
+msgstr "s'esperava «%s», s'ha rebut «%s»"
+
+#, fuzzy, c-format
+msgid "expected '%s'"
+msgstr "línia inesperada: «%s»"
+
+#, c-format
+msgid "unexpected acknowledgment line: '%s'"
+msgstr "línia de confirmació inesperada: «%s»"
+
+#, c-format
+msgid "error processing acks: %d"
+msgstr "s'ha produït un error en processar els acks: %d"
+
+#. TRANSLATORS: The parameter will be 'ready', a protocol
+#. keyword.
+#.
+#, c-format
+msgid "expected packfile to be sent after '%s'"
+msgstr "s'esperava que el fitxer de paquet s'enviés després de «%s»"
+
+#. TRANSLATORS: The parameter will be 'ready', a protocol
+#. keyword.
+#.
+#, c-format
+msgid "expected no other sections to be sent after no '%s'"
+msgstr "no s'esperava que cap altra secció s'enviés després de «%s»"
+
+#, c-format
+msgid "error processing shallow info: %d"
+msgstr "s'ha produït un error en processar la informació superficial: %d"
+
+#, c-format
+msgid "expected wanted-ref, got '%s'"
+msgstr "s'esperava wanted-ref, s'ha rebut «%s»"
+
+#, c-format
+msgid "unexpected wanted-ref: '%s'"
+msgstr "wanted-ref inesperat: «%s»"
+
+#, c-format
+msgid "error processing wanted refs: %d"
+msgstr "s'ha produït un error en processar les referències desitjades: %d"
+
+msgid "git fetch-pack: expected response end packet"
+msgstr "git fetch-pack: s'esperava un paquet de final de resposta"
+
+msgid "no matching remote head"
+msgstr "no hi ha cap HEAD remot coincident"
+
+msgid "unexpected 'ready' from remote"
+msgstr "«ready» no esperat des del remot"
+
+#, c-format
+msgid "no such remote ref %s"
+msgstr "no existeix la referència remota %s"
+
+#, c-format
+msgid "Server does not allow request for unadvertised object %s"
+msgstr "El servidor no permet sol·licitar objectes no anunciats %s"
+
+#, c-format
+msgid "fsmonitor_ipc__send_query: invalid path '%s'"
+msgstr "fsmonitor_ipc__send_query: camí no vàlid «%s»"
+
+#, c-format
+msgid "fsmonitor_ipc__send_query: unspecified error on '%s'"
+msgstr "fsmonitor_ipc__send_query: error no especificat en «%s»"
+
+msgid "fsmonitor--daemon is not running"
+msgstr "fsmonitor--daemon no s'està executant"
+
+#, c-format
+msgid "could not send '%s' command to fsmonitor--daemon"
+msgstr "no s'ha pogut enviar l'ordre «%s» a fsmonitor--daemon"
+
+#, fuzzy, c-format
+msgid "bare repository '%s' is incompatible with fsmonitor"
+msgstr "%s és incompatible amb %s"
+
+#, c-format
+msgid "repository '%s' is incompatible with fsmonitor due to errors"
+msgstr ""
+
+#, fuzzy, c-format
+msgid "remote repository '%s' is incompatible with fsmonitor"
+msgstr "%s és incompatible amb %s"
+
+#, fuzzy, c-format
+msgid "virtual repository '%s' is incompatible with fsmonitor"
+msgstr "%s és incompatible amb %s"
+
+#, c-format
+msgid ""
+"repository '%s' is incompatible with fsmonitor due to lack of Unix sockets"
+msgstr ""
+
+#, fuzzy
+msgid ""
+"git [-v | --version] [-h | --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"
+"           [--git-dir=<path>] [--work-tree=<path>] [--namespace=<name>]\n"
+"           [--super-prefix=<path>] [--config-env=<name>=<envvar>]\n"
+"           <command> [<args>]"
+msgstr ""
+"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"
+"           [--git-dir=<path>] [--work-tree=<path>] [--namespace=<name>]\n"
+"           [--super-prefix=<path>] [--config-env=<name>=<envvar>]\n"
+"           <command> [<args>]"
+
+msgid ""
+"'git help -a' and 'git help -g' list available subcommands and some\n"
+"concept guides. See 'git help <command>' or 'git help <concept>'\n"
+"to read about a specific subcommand or concept.\n"
+"See 'git help git' for an overview of the system."
+msgstr ""
+"«git help -a» i «git help -g» llisten les subordres disponibles i\n"
+"algunes guies de concepte. Vegeu «git help <ordre>» o\n"
+"«git help <concepte>» per a llegir sobre una subordre o concepte\n"
+"específic. Vegeu «git help git» per a una visió general del sistema."
+
+#, c-format
+msgid "unsupported command listing type '%s'"
+msgstr "tipus de llistat de l'ordre no compatible «%s»"
+
+#, c-format
+msgid "no directory given for '%s' option\n"
+msgstr "no s'ha especificat un directori per a l'opció «%s»\n"
+
+#, c-format
+msgid "no namespace given for --namespace\n"
+msgstr "no s'ha especificat un nom d'espai per --namespace\n"
+
+#, c-format
+msgid "no prefix given for --super-prefix\n"
+msgstr "no s'ha especificat cap prefix per a --super-prefix\n"
+
+#, c-format
+msgid "-c expects a configuration string\n"
+msgstr "-c espera una cadena de configuració\n"
+
+#, c-format
+msgid "no config key given for --config-env\n"
+msgstr "no s'ha indicat cap clau de configuració per a --config-env\n"
+
+#, c-format
+msgid "unknown option: %s\n"
+msgstr "opció desconeguda: %s\n"
+
+#, c-format
+msgid "while expanding alias '%s': '%s'"
+msgstr "en expandir l'àlies «%s»: «%s»"
+
+#, c-format
+msgid ""
+"alias '%s' changes environment variables.\n"
+"You can use '!git' in the alias to do this"
+msgstr ""
+"l'àlies «%s» canvia variables d'entorn.\n"
+"Podeu utilitzar «!git» a l'àlies per a fer-ho"
+
+#, c-format
+msgid "empty alias for %s"
+msgstr "àlies buit per a %s"
+
+#, c-format
+msgid "recursive alias: %s"
+msgstr "àlies recursiu: %s"
+
+msgid "write failure on standard output"
+msgstr "fallada d'escriptura en la sortida estàndard"
+
+msgid "unknown write failure on standard output"
+msgstr "fallada d'escriptura desconeguda en la sortida estàndard"
+
+msgid "close failed on standard output"
+msgstr "ha fallat el tancament en la sortida estàndard"
+
+#, c-format
+msgid "alias loop detected: expansion of '%s' does not terminate:%s"
+msgstr "bucle d'àlies detectat expansió de «%s» no acaba:%s"
+
+#, c-format
+msgid "cannot handle %s as a builtin"
+msgstr "no es pot gestionar %s com a integrat"
+
+#, c-format
+msgid ""
+"usage: %s\n"
+"\n"
+msgstr ""
+"ús: %s\n"
+"\n"
+
+#, 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\n"
+
+#, c-format
+msgid "failed to run command '%s': %s\n"
+msgstr "s'ha produït un error en executar l'ordre «%s»: %s\n"
+
+msgid "could not create temporary file"
+msgstr "no s'ha pogut crear el fitxer temporal"
+
+#, c-format
+msgid "failed writing detached signature to '%s'"
+msgstr "s'ha produït un error en escriure la clau de signatura separada a «%s»"
+
+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"
+
+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+)"
+
+#, c-format
+msgid "ssh signing revocation file configured but not found: %s"
+msgstr "fitxer de revocació de la signatura ssh configurat però no trobat: %s"
+
+#, c-format
+msgid "bad/incompatible signature '%s'"
+msgstr "la signatura «%s» és incompatible o està malmesa"
+
+#, c-format
+msgid "failed to get the ssh fingerprint for key '%s'"
+msgstr "no s'ha pogut obtenir l'empremta ssh de la clau  «%s»"
+
+msgid ""
+"either user.signingkey or gpg.ssh.defaultKeyCommand needs to be configured"
+msgstr ""
+"o bé user.signingkey o gpg.ssh.defaultKeyCommand han de ser configurats"
+
+#, c-format
+msgid "gpg.ssh.defaultKeyCommand succeeded but returned no keys: %s %s"
+msgstr ""
+"gpg.ssh.defaultKeyCommand ha tingut èxit però no ha retornat cap clau: %s %s"
+
+#, c-format
+msgid "gpg.ssh.defaultKeyCommand failed: %s %s"
+msgstr "gpg.ssh.defaultKeyCommand ha fallat: %s %s"
+
+msgid "gpg failed to sign the data"
+msgstr "gpg ha fallat en signar les dades"
+
+#, fuzzy
+msgid "user.signingKey needs to be set for ssh signing"
+msgstr "user.signingkey s'ha d'establir per a signar amb ssh"
+
+#, c-format
+msgid "failed writing ssh signing key to '%s'"
+msgstr "s'ha produït un error en escriure la clau de signatura ssh a «%s»"
+
+#, c-format
+msgid "failed writing ssh signing key buffer to '%s'"
+msgstr "s'ha produït un error en escriure la clau de signatura ssh a «%s»"
+
+msgid ""
+"ssh-keygen -Y sign is needed for ssh signing (available in openssh version "
+"8.2p1+)"
+msgstr ""
+"ssh-keygen -Y sign és necessari per a signar amb ssh (disponible a openssh "
+"versió 8.2p1+)"
+
+#, c-format
+msgid "failed reading ssh signing data buffer from '%s'"
+msgstr "s'ha produït un error en llegir la signatura ssh des de «%s»"
+
+#, c-format
+msgid "ignored invalid color '%.*s' in log.graphColors"
+msgstr "ignora el color no vàlid «%.*s» a log.graphColors"
+
+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"
+
+#, c-format
+msgid "'%s': unable to read %s"
+msgstr "«%s»: no s'ha pogut llegir %s"
+
+#, c-format
+msgid "'%s': short read"
+msgstr "«%s»: lectura curta"
+
+msgid "start a working area (see also: git help tutorial)"
+msgstr "començar una àrea de treball (vegeu també: git help tutorial)"
+
+msgid "work on the current change (see also: git help everyday)"
+msgstr "treballar en el canvi actual (vegeu també: git help everyday)"
+
+msgid "examine the history and state (see also: git help revisions)"
+msgstr "examinar la història i l'estat (vegeu també: git help revisions)"
+
+msgid "grow, mark and tweak your common history"
+msgstr "fer créixer, marcar i ajustar la vostra història comuna"
+
+msgid "collaborate (see also: git help workflows)"
+msgstr "col·laborar (vegeu també: git help workflow)"
+
+msgid "Main Porcelain Commands"
+msgstr "Ordres principals de porcellana"
+
+msgid "Ancillary Commands / Manipulators"
+msgstr "Ordres auxiliars / manipuladors"
+
+msgid "Ancillary Commands / Interrogators"
+msgstr "Ordres auxiliars / interrogadors"
+
+msgid "Interacting with Others"
+msgstr "Interaccionar amb altres"
+
+msgid "Low-level Commands / Manipulators"
+msgstr "Ordres de baix nivell / Manipuladors"
+
+msgid "Low-level Commands / Interrogators"
+msgstr "Ordres de baix nivell / Interrogadors"
+
+msgid "Low-level Commands / Syncing Repositories"
+msgstr "Ordres de baix nivell / Sincronització de repositoris"
+
+msgid "Low-level Commands / Internal Helpers"
+msgstr "Ordres de baix nivell / Ajudants interns"
+
+#, c-format
+msgid "available git commands in '%s'"
+msgstr "ordres de git disponibles en «%s»"
+
+msgid "git commands available from elsewhere on your $PATH"
+msgstr "ordres de git disponibles d'altres llocs en el vostre $PATH"
+
+msgid "These are common Git commands used in various situations:"
+msgstr "Aquestes són ordres habituals del Git usades en diverses situacions:"
+
+msgid "The Git concept guides are:"
+msgstr "Les guies de Git de conceptes són:"
+
+msgid "External commands"
+msgstr "Ordres externes"
+
+msgid "Command aliases"
+msgstr "Àlies d'ordres"
+
+msgid "See 'git help <command>' to read about a specific subcommand"
+msgstr "Vegeu «git help <ordre>» per a llegir sobre una subordre específica"
+
+#, c-format
+msgid ""
+"'%s' appears to be a git command, but we were not\n"
+"able to execute it. Maybe git-%s is broken?"
+msgstr ""
+"«%s» sembla una ordre de git, però no hem pogut\n"
+"executar-la. Pot ser que git-%s estigui malmès?"
+
+#, 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»."
+
+msgid "Uh oh. Your system reports no Git commands at all."
+msgstr "Ai. El vostre sistema no informa de cap ordre de Git."
+
+#, 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."
+
+#, c-format
+msgid "Continuing under the assumption that you meant '%s'."
+msgstr "El procés continuarà, pressuposant que volíeu dir «%s»."
+
+#, c-format
+msgid "Run '%s' instead [y/N]? "
+msgstr "Voleu executar «%s» en el seu lloc? [y/N]? "
+
+#, 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»."
+
+msgid ""
+"\n"
+"The most similar command is"
+msgid_plural ""
+"\n"
+"The most similar commands are"
+msgstr[0] ""
+"\n"
+"L'ordre més similar és"
+msgstr[1] ""
+"\n"
+"Les ordres més similars són"
+
+msgid "git version [<options>]"
+msgstr "git version [<opcions>]"
+
+#, c-format
+msgid "%s: %s - %s"
+msgstr "%s: %s - %s"
+
+msgid ""
+"\n"
+"Did you mean this?"
+msgid_plural ""
+"\n"
+"Did you mean one of these?"
+msgstr[0] ""
+"\n"
+"Volíeu dir això?"
+msgstr[1] ""
+"\n"
+"Volíeu dir un d'aquests?"
+
+#, 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»."
+
+#, c-format
+msgid "Couldn't start hook '%s'\n"
+msgstr "No s'ha pogut iniciar el lligam «%s»'\n"
+
+#, c-format
+msgid "argument to --packfile must be a valid hash (got '%s')"
+msgstr "l'argument a --packfile ha de ser un resum vàlid (s'ha obtingut «%s»)"
+
+msgid "not a git repository"
+msgstr "no és un repositori de git"
+
+#, fuzzy, c-format
+msgid "negative value for http.postBuffer; defaulting to %d"
+msgstr "valor negatiu per http.postbuffer; utilitzant el valor %d"
+
+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"
+
+msgid "Public key pinning not supported with cURL < 7.39.0"
+msgstr "No s'admet la fixació de clau pública amb cURL < 7.39.0"
+
+msgid "CURLSSLOPT_NO_REVOKE not supported with cURL < 7.44.0"
+msgstr "CURLSSLOPT_NO_REVOKE no està admès amb cURL < 7.44.0"
+
+#, c-format
+msgid "Unsupported SSL backend '%s'. Supported SSL backends:"
+msgstr "El rerefons SSL «%s» no està admès. Els rerefons SSL admesos:"
+
+#, c-format
+msgid "Could not set SSL backend to '%s': cURL was built without SSL backends"
+msgstr ""
+"No s'ha pogut establir el rerefons SSL a «%s»: cURL es va construir sense "
+"rerefons SSL"
+
+#, c-format
+msgid "Could not set SSL backend to '%s': already set"
+msgstr "No s'ha pogut establir el rerefons SSL a «%s»: ja establert"
+
+#, c-format
+msgid ""
+"unable to update url base from redirection:\n"
+"  asked for: %s\n"
+"   redirect: %s"
+msgstr ""
+"no s'ha pogut actualitzar l'URL base des de la redirecció:\n"
+"  petició: %s\n"
+"   redirecció: %s"
+
+msgid "Author identity unknown\n"
+msgstr "Identitat de l'autor desconeguda\n"
+
+msgid "Committer identity unknown\n"
+msgstr "Es desconeix la identitat del comitent\n"
+
+msgid ""
+"\n"
+"*** Please tell me who you are.\n"
+"\n"
+"Run\n"
+"\n"
+"  git config --global user.email \"you@example.com\"\n"
+"  git config --global user.name \"Your Name\"\n"
+"\n"
+"to set your account's default identity.\n"
+"Omit --global to set the identity only in this repository.\n"
+"\n"
+msgstr ""
+"\n"
+"*** Digueu-me qui sou.\n"
+"\n"
+"Executeu\n"
+"\n"
+"  git config --global user.email «usuari@domini.com»\n"
+"  git config --global user.name «El vostre nom»\n"
+"\n"
+"per a establir la identitat predeterminada del vostre compte.\n"
+"Ometeu --global per a establir la identitat només en aquest repositori.\n"
+
+msgid "no email was given and auto-detection is disabled"
+msgstr ""
+"no s'ha proporcionat cap adreça electrònica i la detecció automàtica està "
+"inhabilitada"
+
+#, c-format
+msgid "unable to auto-detect email address (got '%s')"
+msgstr ""
+"no s'ha pogut detectar automàticament una adreça electrònica vàlida (s'ha "
+"rebut «%s»)"
+
+msgid "no name was given and auto-detection is disabled"
+msgstr ""
+"no s'ha proporcionat cap nom i la detecció automàtica està inhabilitada"
+
+#, c-format
+msgid "unable to auto-detect name (got '%s')"
+msgstr "no s'ha pogut detectar automàticament el nom (s'ha rebut «%s»)"
+
+#, c-format
+msgid "empty ident name (for <%s>) not allowed"
+msgstr "nom d'identitat buit (per <%s>) no és permès"
+
+#, c-format
+msgid "name consists only of disallowed characters: %s"
+msgstr "el nom conté només caràcters no permesos: %s"
+
+msgid "expected 'tree:<depth>'"
+msgstr "s'esperava «tree:<profunditat>»"
+
+msgid "sparse:path filters support has been dropped"
+msgstr "sparse: s'ha eliminat la implementació de filtres de camí sparse"
+
+#, c-format
+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"
+
+#, c-format
+msgid "invalid filter-spec '%s'"
+msgstr "filtre d'especificació no vàlid: «%s»"
+
+#, c-format
+msgid "must escape char in sub-filter-spec: '%c'"
+msgstr "cal escapar el caràcter en el sub-filter-spec «%c»"
+
+msgid "expected something after combine:"
+msgstr "s'esperava alguna cosa després de combinar:"
+
+msgid "multiple filter-specs cannot be combined"
+msgstr "no es poden combinar múltiples especificacions de filtratge"
+
+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"
+
+msgid "args"
+msgstr "arguments"
+
+msgid "object filtering"
+msgstr "filtratge d'objecte"
+
+#, c-format
+msgid "unable to access sparse blob in '%s'"
+msgstr "no s'ha pogut accedir a un blob dispers en «%s»"
+
+#, c-format
+msgid "unable to parse sparse filter data in %s"
+msgstr "no s'han pogut analitzar les dades disperses filtrades %s"
+
+#, c-format
+msgid "entry '%s' in tree %s has tree mode, but is not a tree"
+msgstr "l'entrada «%s» a l'arbre %s té mode d'arbre, però no és un arbre"
+
+#, c-format
+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"
+
+#, 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"
+
+#, c-format
+msgid ""
+"Unable to create '%s.lock': %s.\n"
+"\n"
+"Another git process seems to be running in this repository, e.g.\n"
+"an editor opened by 'git commit'. Please make sure all processes\n"
+"are terminated then try again. If it still fails, a git process\n"
+"may have crashed in this repository earlier:\n"
+"remove the file manually to continue."
+msgstr ""
+"No s'ha pogut crear «%s.lock»: %s.\n"
+"\n"
+"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 un procés git\n"
+"ha fallat en aquest repositori abans:\n"
+"elimineu el fitxer manualment per a continuar."
+
+#, c-format
+msgid "Unable to create '%s.lock': %s"
+msgstr "No s'ha pogut crear «%s.lock»: %s"
+
+#, c-format
+msgid "unexpected line: '%s'"
+msgstr "línia inesperada: «%s»"
+
+msgid "expected flush after ls-refs arguments"
+msgstr "s'esperava una neteja després dels arguments ls-refs"
+
+msgid "quoted CRLF detected"
+msgstr "CRLF citat detectat"
+
+#, c-format
+msgid ""
+"Your local changes to the following files would be overwritten by merge:\n"
+"  %s"
+msgstr ""
+"Els canvis locals als fitxers següents se sobreescriuran per la fusió:\n"
+"  %s"
+
+#, 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)"
+
+#, 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)"
+
+#, 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)"
+
+#, c-format
+msgid "Note: Fast-forwarding submodule %s to %s"
+msgstr "Nota: avançament ràpid del submòdul %s a %s"
+
+#, c-format
+msgid "Failed to merge submodule %s"
+msgstr "S'ha produït un error en fusionar el submòdul «%s»"
+
+#, c-format
+msgid ""
+"Failed to merge submodule %s, but a possible merge resolution exists:\n"
+"%s\n"
+msgstr ""
+"S'ha produït un error en fusionar el submòdul %s, però existeix una solució "
+"possible:\n"
+"%s\n"
+
+#, c-format
+msgid ""
+"If this is correct simply add it to the index for example\n"
+"by using:\n"
+"\n"
+"  git update-index --cacheinfo 160000 %s \"%s\"\n"
+"\n"
+"which will accept this suggestion.\n"
+msgstr ""
+"Si això és correcte simplement afegiu-ho a l'índex per exemple\n"
+"utilitzant:\n"
+"\n"
+"  git update-index --cacheinfo 160000 %s «%s»\n"
+"\n"
+"que acceptarà aquest suggeriment.\n"
+
+#, c-format
+msgid ""
+"Failed to merge submodule %s, but multiple possible merges exist:\n"
+"%s"
+msgstr ""
+"S'ha produït un error en fusionar el submòdul %s, però existeixen múltiples "
+"solucions possibles:\n"
+"%s"
+
+msgid "Failed to execute internal merge"
+msgstr "S'ha produït un error en executar la fusió interna"
+
+#, c-format
+msgid "Unable to add %s to database"
+msgstr "No s'ha pogut afegir %s a la base de dades"
+
+#, c-format
+msgid "Auto-merging %s"
+msgstr "S'està autofusionant %s"
+
+#, 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 ""
+"CONFLICTE (canvi del nom del directori implícit): el fitxer o directori "
+"existent a %s en forma de canvi del nom del directori implícit, posant-hi "
+"els camins següents a: %s."
+
+#, 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 ""
+"CONFLICT (canvi del nom del directori implícit) no es pot assignar més d'un "
+"camí a %s; els canvis del nom del directori implícits han intentat posar "
+"aquests camins a: %s segons"
+
+#, c-format
+msgid ""
+"CONFLICT (directory rename split): Unclear where to rename %s to; it was "
+"renamed to multiple other directories, with no destination getting a "
+"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."
+
+#, c-format
+msgid ""
+"WARNING: Avoiding applying %s -> %s rename to %s, because %s itself was "
+"renamed."
+msgstr ""
+"AVÍS: S'està evitant aplicar el canvi de nom %s -> %s a %s, perquè %s ell "
+"mateix ja havia canviat de nom."
+
+#, 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."
+
+#, c-format
+msgid ""
+"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."
+
+#, 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 ""
+"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."
+
+#, 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."
+
+#, 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."
+
+#, 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."
+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."
+
+#, 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."
+
+#, c-format
+msgid "cannot read object %s"
+msgstr "no es pot llegir l'objecte %s"
+
+#, c-format
+msgid "object %s is not a blob"
+msgstr "l'objecte %s no és un blob"
+
+#, 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."
+
+#, c-format
+msgid ""
+"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."
+
+#, 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."
+
+msgid "content"
+msgstr "contingut"
+
+msgid "add/add"
+msgstr "afegiment/afegiment"
+
+msgid "submodule"
+msgstr "submòdul"
+
+#, c-format
+msgid "CONFLICT (%s): Merge conflict in %s"
+msgstr "CONFLICTE (%s): Conflicte de fusió en %s"
+
+#, 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."
+
+#, 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.
+#.
+#, 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"
+
+msgid "(bad commit)\n"
+msgstr "(comissió errònia)\n"
+
+#, c-format
+msgid "add_cacheinfo failed for path '%s'; merge aborting."
+msgstr "add_cacheinfo ha fallat per al camí «%s»; interrompent la fusió."
+
+#, 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ó."
+
+#, c-format
+msgid "failed to create path '%s'%s"
+msgstr "s'ha produït un error en crear el camí «%s»%s"
+
+#, c-format
+msgid "Removing %s to make room for subdirectory\n"
+msgstr "S'està eliminant %s per a fer espai per al subdirectori\n"
+
+msgid ": perhaps a D/F conflict?"
+msgstr ": potser un conflicte D/F?"
+
+#, c-format
+msgid "refusing to lose untracked file at '%s'"
+msgstr "s'està refusant perdre el fitxer no seguit a «%s»"
+
+#, c-format
+msgid "blob expected for %s '%s'"
+msgstr "blob esperat per a %s «%s»"
+
+#, c-format
+msgid "failed to open '%s': %s"
+msgstr "s'ha produït un error en obrir «%s»: %s"
+
+#, c-format
+msgid "failed to symlink '%s': %s"
+msgstr "s'ha produït un error en fer l'enllaç simbòlic «%s»: %s"
+
+#, c-format
+msgid "do not know what to do with %06o %s '%s'"
+msgstr "no se sap què fer amb %06o %s «%s»"
+
+#, 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ó:"
+
+#, c-format
+msgid "Fast-forwarding submodule %s"
+msgstr "Avançament ràpid al submòdul %s"
+
+#, 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)"
+
+#, 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)"
+
+msgid "Found a possible merge resolution for the submodule:\n"
+msgstr "S'ha trobat una possible resolució de fusió pel submòdul:\n"
+
+#, 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)"
+
+#, 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."
+
+#, c-format
+msgid ""
+"CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s left "
+"in tree."
+msgstr ""
+"CONFLICTE: (%s/supressió): %s suprimit en %s i %s en %s. La versió %s de %s "
+"s'ha deixat en l'arbre."
+
+#, c-format
+msgid ""
+"CONFLICT (%s/delete): %s deleted in %s and %s to %s in %s. Version %s of %s "
+"left in tree."
+msgstr ""
+"CONFLICTE: (%s/supressió): %s suprimit en %s i %s a %s en %s. La versió %s "
+"de %s s'ha deixat en l'arbre."
+
+#, c-format
+msgid ""
+"CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s left "
+"in tree at %s."
+msgstr ""
+"CONFLICTE: (%s/supressió): %s suprimit en %s i %s en %s. La versió %s de %s "
+"s'ha deixat en l'arbre a %s."
+
+#, 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 ""
+"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."
+
+msgid "rename"
+msgstr "canvi de nom"
+
+msgid "renamed"
+msgstr "canviat de nom"
+
+#, c-format
+msgid "Refusing to lose dirty file at %s"
+msgstr "S'està refusant a perdre el fitxer brut a %s"
+
+#, 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ó."
+
+#, 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"
+
+#, 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ò"
+
+#, 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"
+
+#, c-format
+msgid ""
+"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"
+
+msgid " (left unresolved)"
+msgstr " (deixat sense resolució)"
+
+#, 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"
+
+#, c-format
+msgid ""
+"CONFLICT (directory rename split): Unclear where to place %s because "
+"directory %s was renamed to multiple other directories, with no destination "
+"getting a majority of the files."
+msgstr ""
+"CONFLICTE (divisió de canvi de nom de directori): no està clar on col·locar "
+"%s perquè el directori %s s'han canviat de nom a múltiples altres "
+"directoris, sense una destinació per a la majoria dels fitxers."
+
+#, c-format
+msgid ""
+"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"
+
+msgid "modify"
+msgstr "modificació"
+
+msgid "modified"
+msgstr "modificat"
+
+#, c-format
+msgid "Skipped %s (merged same as existing)"
+msgstr "S'ha omès %s (el fusionat és igual a l'existent)"
+
+#, c-format
+msgid "Adding as %s instead"
+msgstr "S'està afegint com a %s en lloc d'això"
+
+#, c-format
+msgid "Removing %s"
+msgstr "S'està eliminant %s"
+
+msgid "file/directory"
+msgstr "fitxer/directori"
+
+msgid "directory/file"
+msgstr "directori/fitxer"
+
+#, c-format
+msgid "CONFLICT (%s): There is a directory with name %s in %s. Adding %s as %s"
+msgstr ""
+"CONFLICTE (%s): Hi ha un directori amb nom %s en %s. S'està afegint %s com a "
+"%s"
+
+#, c-format
+msgid "Adding %s"
+msgstr "S'està afegint %s"
+
+#, c-format
+msgid "CONFLICT (add/add): Merge conflict in %s"
+msgstr "CONFLICTE (afegiment/afegiment): Conflicte de fusió en %s"
+
+#, c-format
+msgid "merging of trees %s and %s failed"
+msgstr "la fusió dels arbres %s i %s ha fallat"
+
+msgid "Merging:"
+msgstr "S'està fusionant:"
+
+#, 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ú:"
+
+msgid "merge returned no commit"
+msgstr "la fusió no ha retornat cap comissió"
+
+#, c-format
+msgid "Could not parse object '%s'"
+msgstr "No s'ha pogut analitzar l'objecte «%s»"
+
+msgid "failed to read the cache"
+msgstr "s'ha produït un error en llegir la memòria cau"
+
+msgid "multi-pack-index OID fanout is of the wrong size"
+msgstr "l'OID de l'índex multipaquet és d'una mida incorrecta"
+
+#, c-format
+msgid "multi-pack-index file %s is too small"
+msgstr "el fitxer de l'índex multipaquet %s és massa petit"
+
+#, 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"
+
+#, c-format
+msgid "multi-pack-index version %d not recognized"
+msgstr "no es reconeix la versió %d de l'índex multipaquet"
+
+#, 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"
+
+msgid "multi-pack-index missing required pack-name chunk"
+msgstr "falta un fragment de nom de paquet necessari al multi-index"
+
+msgid "multi-pack-index missing required OID fanout chunk"
+msgstr "falta un fragment «fanout» OID necessari al multi-pack-index"
+
+msgid "multi-pack-index missing required OID lookup chunk"
+msgstr "falta un fragment de cerca «fanout» OID necessari al multi-pack-index"
+
+msgid "multi-pack-index missing required object offsets chunk"
+msgstr "falta un fragment necessari dels desplaçaments al multi-pack-index"
+
+#, 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»"
+
+#, c-format
+msgid "bad pack-int-id: %u (%u total packs)"
+msgstr "pack-int-id: %u incorrecte (%u paquets en total)"
+
+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"
+
+#, c-format
+msgid "failed to add packfile '%s'"
+msgstr "no s'ha pogut afegir el fitxer de paquet «%s»"
+
+#, c-format
+msgid "failed to open pack-index '%s'"
+msgstr "no s'ha pogut obrir l'índex del paquet «%s»"
+
+#, c-format
+msgid "failed to locate object %d in packfile"
+msgstr "no s'ha pogut localitzar l'objecte %d en el fitxer de paquet"
+
+msgid "cannot store reverse index file"
+msgstr "no es pot emmagatzemar el fitxer d'índex invers"
+
+#, c-format
+msgid "could not parse line: %s"
+msgstr "no s'ha pogut analitzar la línia: %s"
+
+#, c-format
+msgid "malformed line: %s"
+msgstr "línia mal formada: %s"
+
+msgid "ignoring existing multi-pack-index; checksum mismatch"
+msgstr ""
+"s'està ignorant l'índex multipaquet existent; la suma de verificació no "
+"coincideix"
+
+msgid "could not load pack"
+msgstr "no s'ha pogut carregar el paquet"
+
+#, c-format
+msgid "could not open index for %s"
+msgstr "s'ha produït un error en obrir l'índex per «%s»"
+
+msgid "Adding packfiles to multi-pack-index"
+msgstr "S'estan afegint fitxers empaquetats a l'índex multipaquet"
+
+#, c-format
+msgid "unknown preferred pack: '%s'"
+msgstr "paquet preferit desconegut: «%s»"
+
+#, c-format
+msgid "cannot select preferred pack %s with no objects"
+msgstr "no es pot seleccionar un paquet preferit %s sense objectes"
+
+#, c-format
+msgid "did not see pack-file %s to drop"
+msgstr "no s'ha vist caure el fitxer empaquetat %s"
+
+#, c-format
+msgid "preferred pack '%s' is expired"
+msgstr "el paquet preferit «%s» ha caducat"
+
+msgid "no pack files to index."
+msgstr "no hi ha fitxers empaquetats a indexar."
+
+msgid "refusing to write multi-pack .bitmap without any objects"
+msgstr "s'està refusant a escriure el .bitmap multipaquet sense cap objecte"
+
+msgid "could not write multi-pack bitmap"
+msgstr "no s'han pogut escriure els mapes de bits dels multipaquets"
+
+msgid "could not write multi-pack-index"
+msgstr "no s'ha pogut escriure l'índex multipaquet"
+
+#, c-format
+msgid "failed to clear multi-pack-index at %s"
+msgstr "no s'ha pogut netejar l'índex multipaquet a %s"
+
+msgid "multi-pack-index file exists, but failed to parse"
+msgstr ""
+"el fitxer de l'índex multipaquet existeix, però no s'ha pogut analitzar"
+
+msgid "incorrect checksum"
+msgstr "suma de verificació incorrecta"
+
+msgid "Looking for referenced packfiles"
+msgstr "S'estan cercant fitxers empaquetats referenciats"
+
+#, c-format
+msgid ""
+"oid fanout out of order: fanout[%d] = %<PRIx32> > %<PRIx32> = fanout[%d]"
+msgstr "oid fanout desordenat: fanout[%d] = %<PRIx32> > %<PRIx32> = fanout[%d]"
+
+msgid "the midx contains no oid"
+msgstr "el midx no conté cap oid"
+
+msgid "Verifying OID order in multi-pack-index"
+msgstr "S'està verificant l'ordre OID a l'índex multipaquet"
+
+#, c-format
+msgid "oid lookup out of order: oid[%d] = %s >= %s = oid[%d]"
+msgstr "oid lookup desordenat: oid[%d] = %s >= %s = oid[%d]"
+
+msgid "Sorting objects by packfile"
+msgstr "S'estan ordenant els objectes per fitxer empaquetats"
+
+msgid "Verifying object offsets"
+msgstr "S'estan verificant els desplaçaments dels objectes"
+
+#, 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"
+
+#, 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"
+
+#, 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>"
+
+msgid "Counting referenced objects"
+msgstr "S'estan comptant els objectes referenciats"
+
+msgid "Finding and deleting unreferenced packfiles"
+msgstr "S'estan cercant i suprimint els fitxers de paquets no referenciats"
+
+msgid "could not start pack-objects"
+msgstr "no s'ha pogut iniciar el pack-objects"
+
+msgid "could not finish pack-objects"
+msgstr "no s'ha pogut finalitzar el pack-objects"
+
+#, c-format
+msgid "unable to create lazy_dir thread: %s"
+msgstr "no s'ha pogut crear el fil «lazy_dir» :%s"
+
+#, c-format
+msgid "unable to create lazy_name thread: %s"
+msgstr "no s'ha pogut crear un fil «lazy_name»: %s"
+
+#, c-format
+msgid "unable to join lazy_name thread: %s"
+msgstr "no s'ha pogut unir el fil «lazy_name»: %s"
+
+#, 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."
+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."
+
+#, c-format
+msgid "You have not concluded your notes merge (%s exists)."
+msgstr "No heu conclòs la vostra fusió de notes (%s existeix)."
+
+msgid "Cannot commit uninitialized/unreferenced notes tree"
+msgstr "No es pot cometre un arbre de notes no inicialitzat / no referenciat"
+
+#, c-format
+msgid "Bad notes.rewriteMode value: '%s'"
+msgstr "Valor de notes.rewriteMode erroni: «%s»"
+
+#, c-format
+msgid "Refusing to rewrite notes in %s (outside of refs/notes/)"
+msgstr "S'està refusant reescriure les notes en %s (fora de refs/notes/)"
+
+#. TRANSLATORS: The first %s is the name of
+#. the environment variable, the second %s is
+#. its value.
+#.
+#, c-format
+msgid "Bad %s value: '%s'"
+msgstr "Valor erroni de %s: «%s»"
+
+#, 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"
+
+#, c-format
+msgid "unable to normalize alternate object path: %s"
+msgstr "no s'ha pogut normalitzar el camí a l'objecte alternatiu: %s"
+
+#, c-format
+msgid "%s: ignoring alternate object stores, nesting too deep"
+msgstr ""
+"%s: s'estan ignorant els emmagatzematges alternatius d'objectes, imbricació "
+"massa profunda"
+
+#, c-format
+msgid "unable to normalize object directory: %s"
+msgstr "no s'ha pogut normalitzar el directori de l'objecte: %s"
+
+msgid "unable to fdopen alternates lockfile"
+msgstr "no s'ha pogut fer «fdopen» al fitxer de bloqueig alternatiu"
+
+msgid "unable to read alternates file"
+msgstr "no es pot llegir el fitxer «alternates»"
+
+msgid "unable to move new alternates file into place"
+msgstr "no s'ha pogut moure el nou fitxer «alternates» al lloc"
+
+#, c-format
+msgid "path '%s' does not exist"
+msgstr "el camí «%s» no existeix"
+
+#, 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."
+
+#, c-format
+msgid "reference repository '%s' is not a local repository."
+msgstr "el repositori de referència «%s» no és un repositori local."
+
+#, c-format
+msgid "reference repository '%s' is shallow"
+msgstr "el repositori de referència «%s» és superficial"
+
+#, c-format
+msgid "reference repository '%s' is grafted"
+msgstr "el repositori de referència «%s» és empeltat"
+
+#, 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"
+
+#, 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"
+
+#, c-format
+msgid "attempting to mmap %<PRIuMAX> over limit %<PRIuMAX>"
+msgstr "s'està intentant fer mmap %<PRIuMAX> per sobre del límit %<PRIuMAX>"
+
+#, c-format
+msgid "mmap failed%s"
+msgstr "mmap ha fallat%s"
+
+#, c-format
+msgid "object file %s is empty"
+msgstr "el tipus d'objecte %s és buit"
+
+#, c-format
+msgid "corrupt loose object '%s'"
+msgstr "objecte solt corrupte «%s»"
+
+#, c-format
+msgid "garbage at end of loose object '%s'"
+msgstr "brossa al final de l'objecte solt «%s»"
+
+#, c-format
+msgid "unable to parse %s header"
+msgstr "no s'ha pogut analitzar la capçalera %s"
+
+msgid "invalid object type"
+msgstr "tipus d'objecte és incorrecte"
+
+#, c-format
+msgid "unable to unpack %s header"
+msgstr "no s'ha pogut desempaquetar la capçalera %s"
+
+#, c-format
+msgid "header for %s too long, exceeds %d bytes"
+msgstr "la capçalera per a %s és massa llarga, supera els %d bytes"
+
+#, c-format
+msgid "failed to read object %s"
+msgstr "s'ha produït un error en llegir l'objecte %s"
+
+#, c-format
+msgid "replacement %s not found for %s"
+msgstr "no s'ha trobat el reemplaçament %s per a %s"
+
+#, c-format
+msgid "loose object %s (stored in %s) is corrupt"
+msgstr "l'objecte solt %s (emmagatzemat a %s) és corrupte"
+
+#, c-format
+msgid "packed object %s (stored in %s) is corrupt"
+msgstr "l'objecte empaquetat %s (emmagatzemat a %s) és corrupte"
+
+#, c-format
+msgid "unable to write file %s"
+msgstr "no s'ha pogut escriure al fitxer %s"
+
+#, c-format
+msgid "unable to set permission to '%s'"
+msgstr "no s'ha pogut establir el permís a «%s»"
+
+msgid "file write error"
+msgstr "s'ha produït un error en escriure al fitxer"
+
+msgid "error when closing loose object file"
+msgstr "error en tancar el fitxer d'objecte solt"
+
+#, 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"
+
+msgid "unable to create temporary file"
+msgstr "no s'ha pogut crear un fitxer temporal"
+
+msgid "unable to write loose object file"
+msgstr "no s'ha pogut escriure el fitxer d'objecte solt"
+
+#, c-format
+msgid "unable to deflate new object %s (%d)"
+msgstr "no s'ha pogut desinflar l'object nou %s (%d)"
+
+#, c-format
+msgid "deflateEnd on object %s failed (%d)"
+msgstr "ha fallat deflateEnd a l'objecte %s(%d)"
+
+#, 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"
+
+#, c-format
+msgid "cannot read object for %s"
+msgstr "no es pot llegir l'objecte per a %s"
+
+msgid "corrupt commit"
+msgstr "comissió corrupta"
+
+msgid "corrupt tag"
+msgstr "etiqueta corrupta"
+
+#, c-format
+msgid "read error while indexing %s"
+msgstr "error de lectura mentre s'indexava %s"
+
+#, c-format
+msgid "short read while indexing %s"
+msgstr "lectura curta mentre s'indexa %s"
+
+#, c-format
+msgid "%s: failed to insert into database"
+msgstr "%s: no s'han pogut inserir a la base de dades"
+
+#, c-format
+msgid "%s: unsupported file type"
+msgstr "%s: tipus de fitxer no suportat"
+
+#, c-format
+msgid "%s is not a valid '%s' object"
+msgstr "%s no és un objecte de «%s» vàlid"
+
+#, c-format
+msgid "unable to open %s"
+msgstr "no s'ha pogut obrir %s"
+
+#, c-format
+msgid "hash mismatch for %s (expected %s)"
+msgstr "no coincideix la suma per a %s (s'esperava %s)"
+
+#, c-format
+msgid "unable to mmap %s"
+msgstr "no s'ha pogut fer «mmap» %s"
+
+#, c-format
+msgid "unable to unpack header of %s"
+msgstr "no s'ha pogut desempaquetar la capçalera de %s"
+
+#, c-format
+msgid "unable to parse header of %s"
+msgstr "no s'ha pogut analitzar la capçalera de %s"
+
+#, c-format
+msgid "unable to unpack contents of %s"
+msgstr "no s'han pogut desempaquetar els continguts de %s"
+
+#. TRANSLATORS: This is a line of ambiguous object
+#. output shown when we cannot look up or parse the
+#. object in question. E.g. "deadbeef [bad object]".
+#.
+#, c-format
+msgid "%s [bad object]"
+msgstr "%s [objecte incorrecte]"
+
+#. TRANSLATORS: This is a line of ambiguous commit
+#. object output. E.g.:
+#. *
+#.    "deadbeef commit 2021-01-01 - Some Commit Message"
+#.
+#, c-format
+msgid "%s commit %s - %s"
+msgstr "%s comissió %s - %s"
+
+#. TRANSLATORS: This is a line of ambiguous
+#. tag object output. E.g.:
+#. *
+#.    "deadbeef tag 2022-01-01 - Some Tag Message"
+#. *
+#. The second argument is the YYYY-MM-DD found
+#. in the tag.
+#. *
+#. The third argument is the "tag" string
+#. from object.c.
+#.
+#, c-format
+msgid "%s tag %s - %s"
+msgstr "%s etiqueta %s - %s"
+
+#. TRANSLATORS: This is a line of ambiguous
+#. tag object output where we couldn't parse
+#. the tag itself. E.g.:
+#. *
+#.    "deadbeef [bad tag, could not parse it]"
+#.
+#, c-format
+msgid "%s [bad tag, could not parse it]"
+msgstr "%s [etiqueta malmesa, no s'ha pogut analitzar]"
+
+#. TRANSLATORS: This is a line of ambiguous <type>
+#. object output. E.g. "deadbeef tree".
+#.
+#, c-format
+msgid "%s tree"
+msgstr "arbre %s"
+
+#. TRANSLATORS: This is a line of ambiguous <type>
+#. object output. E.g. "deadbeef blob".
+#.
+#, c-format
+msgid "%s blob"
+msgstr "blob %s"
+
+#, c-format
+msgid "short object ID %s is ambiguous"
+msgstr "l'id d'objecte curt %s és ambigu"
+
+#. TRANSLATORS: The argument is the list of ambiguous
+#. objects composed in show_ambiguous_object(). See
+#. its "TRANSLATORS" comments for details.
+#.
+#, c-format
+msgid ""
+"The candidates are:\n"
+"%s"
+msgstr ""
+"Els candidats són:\n"
+"%s"
+
+msgid ""
+"Git normally never creates a ref that ends with 40 hex characters\n"
+"because it will be ignored when you just specify 40-hex. These refs\n"
+"may be created by mistake. For example,\n"
+"\n"
+"  git switch -c $br $(git rev-parse ...)\n"
+"\n"
+"where \"$br\" is somehow empty and a 40-hex ref is created. Please\n"
+"examine these refs and maybe delete them. Turn this message off by\n"
+"running \"git config advice.objectNameWarning false\""
+msgstr ""
+"Git normalment mai crea una referència que acabi amb 40 caràcters\n"
+"hexadecimals perquè s'ignorarà quan només especifiqueu 40 caràcters\n"
+"hexadecimals. Aquestes referències es poden crear per error. Per\n"
+"exemple,\n"
+"\n"
+"  git switch -c $br $(git rev-parse ...)\n"
+"\n"
+"on «$br» és buida per algun motiu i es crea una referència de 40 caràcters\n"
+"hexadecimals. Examineu aquestes referències i potser\n"
+"suprimiu-les. Desactiveu aquest missatge executant\n"
+"«git config advice.objectNameWarning false»"
+
+#, c-format
+msgid "log for '%.*s' only goes back to %s"
+msgstr "registre per a «%.*s» només retorna a %s"
+
+#, c-format
+msgid "log for '%.*s' only has %d entries"
+msgstr "registre per a «%.*s» només té %d entrades"
+
+#, c-format
+msgid "path '%s' exists on disk, but not in '%.*s'"
+msgstr "el camí «%s» existeix al disc, però no a «%.*s»"
+
+#, c-format
+msgid ""
+"path '%s' exists, but not '%s'\n"
+"hint: Did you mean '%.*s:%s' aka '%.*s:./%s'?"
+msgstr ""
+"el camí «%s» existeix, però no «%s»\n"
+"consell: volíeu dir «%.*s:%s» conegut com a «%.*s:./%s»?"
+
+#, c-format
+msgid "path '%s' does not exist in '%.*s'"
+msgstr "el camí «%s» no existeix en «%.*s»"
+
+#, 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»?"
+
+#, 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»?"
+
+#, 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"
+
+#, 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)"
+
+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"
+
+#, c-format
+msgid "<object>:<path> required, only <object> '%s' given"
+msgstr "<object>:<path> requerit, només s'ha donat <object> «%s»"
+
+#, c-format
+msgid "invalid object name '%.*s'."
+msgstr "nom d'objecte no vàlid «%.*s»."
+
+#, c-format
+msgid "invalid object type \"%s\""
+msgstr "tipus d'objecte «%s» no vàlid"
+
+#, c-format
+msgid "object %s is a %s, not a %s"
+msgstr "l'objecte %s és %s, no pas %s"
+
+#, c-format
+msgid "object %s has unknown type id %d"
+msgstr "l'objecte %s té un identificador de tipus %d desconegut"
+
+#, c-format
+msgid "unable to parse object: %s"
+msgstr "no s'ha pogut analitzar l'objecte: %s"
+
+#, c-format
+msgid "hash mismatch %s"
+msgstr "el resum no coincideix %s"
+
+msgid "multi-pack bitmap is missing required reverse index"
+msgstr "falta l'índex invers necessari al mapa de bits multipaquet"
+
+#, fuzzy, c-format
+msgid "could not open pack %s"
+msgstr "no s'ha pogut obrir «%s»"
+
+#, fuzzy, c-format
+msgid "preferred pack (%s) is invalid"
+msgstr "el paquet preferit «%s» ha caducat"
+
+#, c-format
+msgid "could not find %s in pack %s at offset %<PRIuMAX>"
+msgstr "no s'ha pogut trobar %s al paquet %s al desplaçament %<PRIuMAX>"
+
+#, fuzzy, c-format
+msgid "mtimes file %s is too small"
+msgstr "el fitxer de l'índex multipaquet %s és massa petit"
+
+#, fuzzy, c-format
+msgid "mtimes file %s has unknown signature"
+msgstr "el fitxer d'índex invers %s té una signatura desconeguda"
+
+#, fuzzy, c-format
+msgid "mtimes file %s has unsupported version %<PRIu32>"
+msgstr "el fitxer d'índex invers %s té la versió %<PRIu32> no admesa"
+
+#, fuzzy, c-format
+msgid "mtimes file %s has unsupported hash id %<PRIu32>"
+msgstr "el fitxer d'índex invers %s té un ID de resum %<PRIu32> no admès"
+
+#, fuzzy, c-format
+msgid "mtimes file %s is corrupt"
+msgstr "el fitxer d'índex invers %s està malmès"
+
+#, c-format
+msgid "reverse-index file %s is too small"
+msgstr "el fitxer d'índex invers %s és massa petit"
+
+#, c-format
+msgid "reverse-index file %s is corrupt"
+msgstr "el fitxer d'índex invers %s està malmès"
+
+#, c-format
+msgid "reverse-index file %s has unknown signature"
+msgstr "el fitxer d'índex invers %s té una signatura desconeguda"
+
+#, c-format
+msgid "reverse-index file %s has unsupported version %<PRIu32>"
+msgstr "el fitxer d'índex invers %s té la versió %<PRIu32> no admesa"
+
+#, c-format
+msgid "reverse-index file %s has unsupported hash id %<PRIu32>"
+msgstr "el fitxer d'índex invers %s té un ID de resum %<PRIu32> no admès"
+
+msgid "cannot both write and verify reverse index"
+msgstr "no es pot escriure i verificar l'índex invers"
+
+#, c-format
+msgid "could not stat: %s"
+msgstr "no s'ha pogut fer stat a: %s"
+
+#, c-format
+msgid "failed to make %s readable"
+msgstr "s'ha produït un error en fer %s llegible"
+
+#, c-format
+msgid "could not write '%s' promisor file"
+msgstr "no s'ha pogut escriure «%s» al fitxer «promisor»"
+
+msgid "offset before end of packfile (broken .idx?)"
+msgstr "desplaçament abans de la fi del fitxer de paquet (.idx trencat?)"
+
+#, c-format
+msgid "packfile %s cannot be mapped%s"
+msgstr "el fitxer de paquet %s no es pot mapar%s"
+
+#, 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?)"
+
+#, 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?)"
+
+#, c-format
+msgid "malformed expiration date '%s'"
+msgstr "data de venciment «%s» mal formada"
+
+#, c-format
+msgid "option `%s' expects \"always\", \"auto\", or \"never\""
+msgstr "l'opció «%s» espera «always», «auto» o «never»"
+
+#, c-format
+msgid "malformed object name '%s'"
+msgstr "nom d'objecte «%s» mal format"
+
+#, c-format
+msgid "option `%s' expects \"%s\" or \"%s\""
+msgstr "l'opció «%s» espera «%s» o «%s»"
+
+#, c-format
+msgid "%s requires a value"
+msgstr "%s requereix un valor"
+
+#, c-format
+msgid "%s is incompatible with %s"
+msgstr "%s és incompatible amb %s"
+
+#, c-format
+msgid "%s : incompatible with something else"
+msgstr "%s: és incompatible amb alguna altra cosa"
+
+#, c-format
+msgid "%s takes no value"
+msgstr "%s no accepta cap valor"
+
+#, c-format
+msgid "%s isn't available"
+msgstr "%s no és disponible"
+
+#, 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"
+
+#, c-format
+msgid "ambiguous option: %s (could be --%s%s or --%s%s)"
+msgstr "opció ambigua: %s (pot ser --%s%s o --%s%s)"
+
+#, c-format
+msgid "did you mean `--%s` (with two dashes)?"
+msgstr "voleu dir «--%s» (amb dos guionets)?"
+
+#, c-format
+msgid "alias of --%s"
+msgstr "àlies de --%s"
+
+#, c-format
+msgid "unknown option `%s'"
+msgstr "opció desconeguda «%s»"
+
+#, c-format
+msgid "unknown switch `%c'"
+msgstr "opció «%c» desconeguda"
+
+#, c-format
+msgid "unknown non-ascii option in string: `%s'"
+msgstr "opció no ascii desconeguda en la cadena: «%s»"
+
+msgid "..."
+msgstr "..."
+
+#, c-format
+msgid "usage: %s"
+msgstr "ús: %s"
+
+#. TRANSLATORS: the colon here should align with the
+#. one in "usage: %s" translation.
+#.
+#, c-format
+msgid "   or: %s"
+msgstr "   o: %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.
+#.
+#, c-format
+msgid "%*s%s"
+msgstr "%*s%s"
+
+#, c-format
+msgid "    %s"
+msgstr "    %s"
+
+msgid "-NUM"
+msgstr "-NUM"
+
+msgid "expiry-date"
+msgstr "data-de-caducitat"
+
+msgid "no-op (backward compatibility)"
+msgstr "operació nul·la (per a compatibilitat amb versions anteriors)"
+
+msgid "be more verbose"
+msgstr "sigues més detallat"
+
+msgid "be more quiet"
+msgstr "sigues més discret"
+
+msgid "use <n> digits to display object names"
+msgstr "usa <n> xifres per a mostrar els noms d'objecte"
+
+msgid "how to strip spaces and #comments from message"
+msgstr "com suprimir els espais i #comentaris del missatge"
+
+msgid "read pathspec from file"
+msgstr "llegeix l'especificació del camí del fitxer"
+
+msgid ""
+"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 el caràcter NUL"
+
+#, c-format
+msgid "Could not make %s writable by group"
+msgstr "No s'ha pogut fer %s escrivible pel grup"
+
+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"
+
+msgid "Only one 'attr:' specification is allowed."
+msgstr "Només es permet una especificació «attr:»."
+
+msgid "attr spec must not be empty"
+msgstr "una especificació d'atribut no pot estar buida"
+
+#, c-format
+msgid "invalid attribute name %s"
+msgstr "nom d'atribut no vàlid %s"
+
+msgid "global 'glob' and 'noglob' pathspec settings are incompatible"
+msgstr ""
+"els paràmetres d'especificació de camí «glob» i «noglob» globals són "
+"incompatibles"
+
+msgid ""
+"global 'literal' pathspec setting is incompatible with all other global "
+"pathspec settings"
+msgstr ""
+"el paràmetre d'especificació de camí «literal» global és incompatible amb "
+"tots els altres paràmetres d'especificació de camí globals"
+
+msgid "invalid parameter for pathspec magic 'prefix'"
+msgstr "paràmetre no vàlid per a la màgia d'especificació de camí «prefix»"
+
+#, c-format
+msgid "Invalid pathspec magic '%.*s' in '%s'"
+msgstr "Màgia d'especificació de camí no vàlida «%.*s» en «%s»"
+
+#, 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»"
+
+#, c-format
+msgid "Unimplemented pathspec magic '%c' in '%s'"
+msgstr "Màgia d'especificació de camí no implementada «%c» en «%s»"
+
+#, c-format
+msgid "%s: 'literal' and 'glob' are incompatible"
+msgstr "%s: «literal» i «glob» són incompatibles"
+
+#, c-format
+msgid "%s: '%s' is outside repository at '%s'"
+msgstr "%s: «%s» està fora del repositori en «%s»"
+
+#, c-format
+msgid "'%s' (mnemonic: '%c')"
+msgstr "«%s» (mnemònic: «%c»)"
+
+#, 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"
+
+#, 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"
+
+#, c-format
+msgid "line is badly quoted: %s"
+msgstr "la línia està mal citada: %s"
+
+msgid "unable to write flush packet"
+msgstr "no s'ha pogut escriure el paquet de buidatge"
+
+msgid "unable to write delim packet"
+msgstr "no s'ha pogut escriure el paquet delim"
+
+msgid "unable to write response end packet"
+msgstr "no s'ha pogut escriure el paquet de final de resposta"
+
+msgid "flush packet write failed"
+msgstr "s'ha produït un error en escriure el paquet de buidatge"
+
+msgid "protocol error: impossibly long line"
+msgstr "error de protocol: longitud de línia impossible"
+
+msgid "packet write with format failed"
+msgstr "ha fallat l'escriptura del paquet amb format"
+
+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 "
+"paquet"
+
+#, c-format
+msgid "packet write failed: %s"
+msgstr "no s'ha pogut escriure el paquet: %s"
+
+msgid "read error"
+msgstr "error de lectura"
+
+msgid "the remote end hung up unexpectedly"
+msgstr "el remot ha penjat inesperadament"
+
+#, c-format
+msgid "protocol error: bad line length character: %.4s"
+msgstr "error de protocol: caràcter de longitud de línia erroni: %.4s"
+
+#, c-format
+msgid "protocol error: bad line length %d"
+msgstr "error de protocol: longitud de línia errònia %d"
+
+#, c-format
+msgid "remote error: %s"
+msgstr "error remot: %s"
+
+msgid "Refreshing index"
+msgstr "S'està actualitzant l'índex"
+
+#, c-format
+msgid "unable to create threaded lstat: %s"
+msgstr "no s'han pogut crear lstat amb fils %s"
+
+msgid "unable to parse --pretty format"
+msgstr "no s'ha pogut analitzar el format --pretty"
+
+msgid "promisor-remote: unable to fork off fetch subprocess"
+msgstr "promisor-remote: no es pot bifurcar el subprocés d'obtenció"
+
+msgid "promisor-remote: could not write to fetch subprocess"
+msgstr "promisor-remote: no s'ha pogut escriure per al subprocés d'obtenció"
+
+msgid "promisor-remote: could not close stdin to fetch subprocess"
+msgstr "promisor-remote: no s'ha pogut tancar stdin al subprocés d'obtenció"
+
+#, c-format
+msgid "promisor remote name cannot begin with '/': %s"
+msgstr "el nom remot «promisor» no pot començar amb «/»: %s"
+
+msgid "object-info: expected flush after arguments"
+msgstr "object-info: s'esperava una neteja després dels arguments"
+
+msgid "Removing duplicate objects"
+msgstr "S'estan eliminant els objectes duplicats"
+
+msgid "could not start `log`"
+msgstr "no s'ha pogut iniciar «log»"
+
+msgid "could not read `log` output"
+msgstr "no s'ha pogut llegir la sortida de «log»"
+
+#, c-format
+msgid "could not parse commit '%s'"
+msgstr "no s'ha pogut analitzar la comissió «%s»"
+
+#, c-format
+msgid ""
+"could not parse first line of `log` output: did not start with 'commit ': "
+"'%s'"
+msgstr ""
+"no s'ha pogut analitzar la primera línia de la sortida «log»: no començava "
+"amb «commit»: «%s»"
+
+#, c-format
+msgid "could not parse git header '%.*s'"
+msgstr "no s'ha pogut llegir la capçalera de la gif «%.*s»"
+
+msgid "failed to generate diff"
+msgstr "s'ha produït un error en generar el diff"
+
+#, c-format
+msgid "could not parse log for '%s'"
+msgstr "no s'ha pogut llegir el fitxer de registre per a «%s»"
+
+#, 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)"
+
+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"
+
+#, 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"
+
+#, c-format
+msgid "unable to index file '%s'"
+msgstr "no es pot llegir indexar el fitxer «%s»"
+
+#, c-format
+msgid "unable to add '%s' to index"
+msgstr "no s'ha pogut afegir «%s» a l'índex"
+
+#, c-format
+msgid "unable to stat '%s'"
+msgstr "no s'ha pogut fer «stat» a «%s»"
+
+#, c-format
+msgid "'%s' appears as both a file and as a directory"
+msgstr "«%s» apareix com a fitxer i com a directori"
+
+msgid "Refresh index"
+msgstr "Actualitza l'índex"
+
+#, c-format
+msgid ""
+"index.version set, but the value is invalid.\n"
+"Using version %i"
+msgstr ""
+"index.version està establerta, però el valor no és vàlid.\n"
+"S'està usant la versió %i"
+
+#, c-format
+msgid ""
+"GIT_INDEX_VERSION set, but the value is invalid.\n"
+"Using version %i"
+msgstr ""
+"GIT_INDEX_VERSION està establerta, però el valor no és vàlid.\n"
+"S'està usant la versió %i"
+
+#, c-format
+msgid "bad signature 0x%08x"
+msgstr "signatura malmesa 0x%08x"
+
+#, c-format
+msgid "bad index version %d"
+msgstr "versió d'índex incorrecta %d"
+
+msgid "bad index file sha1 signature"
+msgstr "signatura sha1 malmesa al fitxer d'índex"
+
+#, c-format
+msgid "index uses %.4s extension, which we do not understand"
+msgstr "l'índex usa l'extensió %.4s, que no es pot entendre"
+
+#, c-format
+msgid "ignoring %.4s extension"
+msgstr "s'està ignorant l'extensió %.4s"
+
+#, c-format
+msgid "unknown index entry format 0x%08x"
+msgstr "format d'entrada d'índex desconeguda «0x%08x»"
+
+#, c-format
+msgid "malformed name field in the index, near path '%s'"
+msgstr "camp del nom mal formatat l'índex, camí a prop «%s»"
+
+msgid "unordered stage entries in index"
+msgstr "entrades «stage» no ordenades en l'índex"
+
+#, c-format
+msgid "multiple stage entries for merged file '%s'"
+msgstr "múltiples entrades «stage» per al fitxer fusionat «%s»"
+
+#, c-format
+msgid "unordered stage entries for '%s'"
+msgstr "entrades «stage» no ordenades per a «%s»"
+
+#, c-format
+msgid "unable to create load_cache_entries thread: %s"
+msgstr "no s'ha pogut crear fil «load_cache_entries»: %s"
+
+#, c-format
+msgid "unable to join load_cache_entries thread: %s"
+msgstr "no s'ha pogut unir al fil «load_cache_entries»: %s"
+
+#, c-format
+msgid "%s: index file open failed"
+msgstr "%s: ha fallat l'obertura del fitxer d'índex"
+
+#, c-format
+msgid "%s: cannot stat the open index"
+msgstr "%s: no es pot fer «stat» a l'índex obert"
+
+#, c-format
+msgid "%s: index file smaller than expected"
+msgstr "%s: fitxer d'índex més petit que s'esperava"
+
+#, c-format
+msgid "%s: unable to map index file%s"
+msgstr "%s: no es pot mapar el fitxer d'índex%s"
+
+#, c-format
+msgid "unable to create load_index_extensions thread: %s"
+msgstr "no s'ha pogut crear un fil «load_index_extensions»: %s"
+
+#, c-format
+msgid "unable to join load_index_extensions thread: %s"
+msgstr "no s'ha pogut unir un fil «load_index_extensions»: %s"
+
+#, c-format
+msgid "could not freshen shared index '%s'"
+msgstr "no s'ha pogut refrescar l'índex compartit «%s»"
+
+#, c-format
+msgid "broken index, expect %s in %s, got %s"
+msgstr "índex malmès, s'esperava %s a %s, s'ha rebut %s"
+
+msgid "cannot write split index for a sparse index"
+msgstr "no es pot escriure l'índex dividit per a un índex dispers"
+
+msgid "failed to convert to a sparse-index"
+msgstr "s'ha produït un error en convertir a un índex dispers"
+
+#, c-format
+msgid "could not stat '%s'"
+msgstr "no s'ha pogut fer stat a «%s»"
+
+#, c-format
+msgid "unable to open git dir: %s"
+msgstr "no s'ha pogut obrir el directori git: %s"
+
+#, c-format
+msgid "unable to unlink: %s"
+msgstr "no s'ha pogut desenllaçar: %s"
+
+#, c-format
+msgid "cannot fix permission bits on '%s'"
+msgstr "no s'han pogut corregir els bits de permisos en «%s»"
+
+#, c-format
+msgid "%s: cannot drop to stage #0"
+msgstr "%s: no es pot baixar fins al «stage» #0"
+
+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 ""
+"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"
+
+#, c-format
+msgid ""
+"unrecognized setting %s for option rebase.missingCommitsCheck. Ignoring."
+msgstr ""
+"no s'ha reconegut el paràmetre %s per rebase.missingCommitsCheck. S'està "
+"ignorant."
+
+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 [-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"
+"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-la\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"
+"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"
+"\n"
+"Es pot canviar l'ordre d'aquestes línies; s'executen de dalt a baix.\n"
+
+#, c-format
+msgid "Rebase %s onto %s (%d command)"
+msgid_plural "Rebase %s onto %s (%d commands)"
+msgstr[0] "Fes «rebase» de %s a %s (%d ordre)"
+msgstr[1] "Fes «rebase» de %s a %s (%d ordres)"
+
+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"
+
+msgid ""
+"\n"
+"If you remove a line here THAT COMMIT WILL BE LOST.\n"
+msgstr ""
+"\n"
+"Si elimineu una línia aquí, ES PERDRÀ AQUELLA COMISSIÓ.\n"
+
+msgid ""
+"\n"
+"You are editing the todo file of an ongoing interactive rebase.\n"
+"To continue rebase after editing, run:\n"
+"    git rebase --continue\n"
+"\n"
+msgstr ""
+"\n"
+"Esteu editant el fitxer de coses a fer d'un «rebase» interactiu en marxa.\n"
+"Per a continuar el «rebase» després d'editar, executeu:\n"
+"    git rebase --continue\n"
+"\n"
+
+msgid ""
+"\n"
+"However, if you remove everything, the rebase will be aborted.\n"
+"\n"
+msgstr ""
+"\n"
+"No obstant, si elimineu tot, s'avortarà el «rebase».\n"
+"\n"
+
+#, c-format
+msgid "could not write '%s'."
+msgstr "no s'ha pogut escriure a «%s»."
+
+#, c-format
+msgid ""
+"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"
+"Les comissions descartades (més nova a més vella):\n"
+
+#, c-format
+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"
+"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"
+"\n"
+"Useu «git config rebase.missingCommitsCheck» per a canviar el nivell "
+"d'advertències.\n"
+"Els comportaments possibles són: ignore, warn, error.\n"
+
+#, c-format
+msgid "%s: 'preserve' superseded by 'merges'"
+msgstr "%s: «conserva» substituït per «fusiona»"
+
+msgid "gone"
+msgstr "no hi és"
+
+#, c-format
+msgid "ahead %d"
+msgstr "davant per %d"
+
+#, c-format
+msgid "behind %d"
+msgstr "darrere per %d"
+
+#, c-format
+msgid "ahead %d, behind %d"
+msgstr "davant per %d, darrere per %d"
+
+#, c-format
+msgid "expected format: %%(color:<color>)"
+msgstr "format esperat: %%(color:<color>)"
+
+#, c-format
+msgid "unrecognized color: %%(color:%s)"
+msgstr "color no reconegut: %%(color:%s)"
+
+#, c-format
+msgid "Integer value expected refname:lstrip=%s"
+msgstr "Valor enter esperat pel nom de referència:lstrip=%s"
+
+#, c-format
+msgid "Integer value expected refname:rstrip=%s"
+msgstr "Valor enter esperat pel nom de referència:rstrip=%s"
+
+#, c-format
+msgid "unrecognized %%(%s) argument: %s"
+msgstr "argument %%(%s) desconegut: %s"
+
+#, c-format
+msgid "%%(objecttype) does not take arguments"
+msgstr "%%(objecttype) no accepta arguments"
+
+#, c-format
+msgid "%%(deltabase) does not take arguments"
+msgstr "%%(deltabase) no accepta arguments"
+
+#, c-format
+msgid "%%(body) does not take arguments"
+msgstr "%%(body) no accepta arguments"
+
+#, c-format
+msgid "expected %%(trailers:key=<value>)"
+msgstr "s'esperava %%(trailers:key=<value>)"
+
+#, c-format
+msgid "unknown %%(trailers) argument: %s"
+msgstr "argument %%(trailers) desconegut: %s"
+
+#, c-format
+msgid "positive value expected contents:lines=%s"
+msgstr "valor positiu esperat conté:lines=%s"
+
+#, c-format
+msgid "positive value expected '%s' in %%(%s)"
+msgstr "valor positiu esperat «%s» a %%(%s)"
+
+#, c-format
+msgid "unrecognized email option: %s"
+msgstr "opció del correu electrònic no reconeguda: «%s»"
+
+#, c-format
+msgid "expected format: %%(align:<width>,<position>)"
+msgstr "format esperat: %%(align:<amplada>,<posició>)"
+
+#, c-format
+msgid "unrecognized position:%s"
+msgstr "posició no reconeguda:%s"
+
+#, c-format
+msgid "unrecognized width:%s"
+msgstr "amplada no reconeguda:%s"
+
+#, c-format
+msgid "positive width expected with the %%(align) atom"
+msgstr "amplada positiva esperada amb l'àtom %%(align)"
+
+#, c-format
+msgid "%%(rest) does not take arguments"
+msgstr "%%(rest) no accepta arguments"
+
+#, c-format
+msgid "malformed field name: %.*s"
+msgstr "nom de camp mal format: %.*s"
+
+#, c-format
+msgid "unknown field name: %.*s"
+msgstr "nom de camp desconegut: %.*s"
+
+#, c-format
+msgid ""
+"not a git repository, but the field '%.*s' requires access to object data"
+msgstr ""
+"no és un repositori git, però el camp «%.*s» requereix accés a les dades de "
+"l'objecte"
+
+#, c-format
+msgid "format: %%(%s) atom used without a %%(%s) atom"
+msgstr "format: l'àtom %%(%s) usat sense un àtom %%(%s)"
+
+#, c-format
+msgid "format: %%(then) atom used more than once"
+msgstr "format: s'ha usat l'àtom %%(then) més d'un cop"
+
+#, c-format
+msgid "format: %%(then) atom used after %%(else)"
+msgstr "format: s'ha usat l'àtom %%(then) després de %%(else)"
+
+#, c-format
+msgid "format: %%(else) atom used more than once"
+msgstr "format: s'ha usat l'àtom %%(else) més d'un cop"
+
+#, c-format
+msgid "format: %%(end) atom used without corresponding atom"
+msgstr "format: s'ha usat l'àtom %%(end) sense l'àtom corresponent"
+
+#, c-format
+msgid "malformed format string %s"
+msgstr "cadena de format mal format %s"
+
+#, c-format
+msgid "this command reject atom %%(%.*s)"
+msgstr "aquesta ordre rebutja l'àtom %%(%.*s)"
+
+#, c-format
+msgid "--format=%.*s cannot be used with --python, --shell, --tcl"
+msgstr "no es pot usar --format=%.*s amb --python, --shell, --tcl"
+
+#, c-format
+msgid "(no branch, rebasing %s)"
+msgstr "(sense branca, s'està fent «rebase» %s)"
+
+#, c-format
+msgid "(no branch, rebasing detached HEAD %s)"
+msgstr "(sense branca, s'està fent «rebase» d'un «HEAD» separat %s)"
+
+#, c-format
+msgid "(no branch, bisect started on %s)"
+msgstr "(sense branca, bisecció començada en %s)"
+
+#, c-format
+msgid "(HEAD detached at %s)"
+msgstr "(HEAD separat a %s)"
+
+#, c-format
+msgid "(HEAD detached from %s)"
+msgstr "(HEAD separat des de %s)"
+
+msgid "(no branch)"
+msgstr "(sense branca)"
+
+#, c-format
+msgid "missing object %s for %s"
+msgstr "manca l'objecte %s per a %s"
+
+#, c-format
+msgid "parse_object_buffer failed on %s for %s"
+msgstr "parse_object_buffer ha fallat en %s per a %s"
+
+#, c-format
+msgid "malformed object at '%s'"
+msgstr "objecte mal format a «%s»"
+
+#, c-format
+msgid "ignoring ref with broken name %s"
+msgstr "s'està ignorant la referència amb nom malmès %s"
+
+#, c-format
+msgid "ignoring broken ref %s"
+msgstr "s'està ignorant la referència malmesa %s"
+
+#, c-format
+msgid "format: %%(end) atom missing"
+msgstr "format: manca l'àtom %%(end)"
+
+#, c-format
+msgid "malformed object name %s"
+msgstr "nom d'objecte %s mal format"
+
+#, c-format
+msgid "option `%s' must point to a commit"
+msgstr "l'opció «%s» ha d'apuntar a una comissió"
+
+msgid "key"
+msgstr "clau"
+
+msgid "field name to sort on"
+msgstr "nom del camp en el qual ordenar"
+
+#, c-format
+msgid "not a reflog: %s"
+msgstr "no és un registre de referència: %s"
+
+#, c-format
+msgid "no reflog for '%s'"
+msgstr "cap registre de referència per a «%s»"
+
+#, c-format
+msgid "%s does not point to a valid object!"
+msgstr "%s no apunta a un objecte vàlid"
+
+#, 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"
+"of your new repositories, which will suppress this warning, call:\n"
+"\n"
+"\tgit config --global init.defaultBranch <name>\n"
+"\n"
+"Names commonly chosen instead of 'master' are 'main', 'trunk' and\n"
+"'development'. The just-created branch can be renamed via this command:\n"
+"\n"
+"\tgit branch -m <name>\n"
+msgstr ""
+"S'està utilitzant «%s» com a nom de la branca inicial. Aquest nom de branca\n"
+"per defecte es pot canviar. Per a configurar el nom inicial de la branca "
+"que\n"
+"s'utilitzarà en tots els repositoris nous, i que suprimirà aquest avís, "
+"useu:\n"
+"\n"
+"\tgit config --global init.defaultBranch <nom>\n"
+"\n"
+"Els noms més usats habitualment en lloc de «master» són «main», «trunk» i\n"
+"«development». La branca acabada de crear es pot canviar de nom amb "
+"l'ordre:\n"
+"\n"
+"\tgit branch -m <nom>\n"
+
+#, c-format
+msgid "could not retrieve `%s`"
+msgstr "no s'ha pogut recuperar «%s»"
+
+#, c-format
+msgid "invalid branch name: %s = %s"
+msgstr "nom de branca no vàlida: %s = %s"
+
+#, c-format
+msgid "ignoring dangling symref %s"
+msgstr "s'està ignorant symref penjant %s"
+
+#, c-format
+msgid "log for ref %s has gap after %s"
+msgstr "registre per a ref %s té un buit després de %s"
+
+#, c-format
+msgid "log for ref %s unexpectedly ended on %s"
+msgstr "registre per als ref %s ha acabat inesperadament a %s"
+
+#, c-format
+msgid "log for %s is empty"
+msgstr "el registre per a %s és buit"
+
+#, c-format
+msgid "refusing to update ref with bad name '%s'"
+msgstr "s'està refusant la referència amb nom malmès «%s»"
+
+#, c-format
+msgid "update_ref failed for ref '%s': %s"
+msgstr "ha fallat update_ref per a la ref «%s»: %s"
+
+#, c-format
+msgid "multiple updates for ref '%s' not allowed"
+msgstr "no es permeten múltiples actualitzacions per a la referència «%s»"
+
+msgid "ref updates forbidden inside quarantine environment"
+msgstr "no està permès actualitzar les referències en un entorn de quarantena"
+
+msgid "ref updates aborted by hook"
+msgstr "les actualitzacions de referències s'han avortat per un lligam"
+
+#, c-format
+msgid "'%s' exists; cannot create '%s'"
+msgstr "«%s» existeix; no es pot crear «%s»"
+
+#, c-format
+msgid "cannot process '%s' and '%s' at the same time"
+msgstr "no es poden processar «%s» i «%s» a la vegada"
+
+#, c-format
+msgid "could not remove reference %s"
+msgstr "no s'ha pogut eliminar la referència %s"
+
+#, c-format
+msgid "could not delete reference %s: %s"
+msgstr "no s'ha pogut suprimir la referència %s: %s"
+
+#, c-format
+msgid "could not delete references: %s"
+msgstr "no s'han pogut suprimir les referències: %s"
+
+#, c-format
+msgid "invalid refspec '%s'"
+msgstr "refspec no vàlida: «%s»"
+
+#, c-format
+msgid "invalid quoting in push-option value: '%s'"
+msgstr "citació no vàlida en el valor de l'opció de pujada: «%s»"
+
+#, c-format
+msgid "%sinfo/refs not valid: is this a git repository?"
+msgstr "%sinfo/refs no vàlides: és un repositori git?"
+
+msgid "invalid server response; expected service, got flush packet"
+msgstr ""
+"resposta del servidor no és vàlida; el servei esperat, ha rebut in paquet de "
+"neteja"
+
+#, c-format
+msgid "invalid server response; got '%s'"
+msgstr "resposta del servidor no vàlida; s'ha obtingut «%s»"
+
+#, c-format
+msgid "repository '%s' not found"
+msgstr "no s'ha trobat el repositori «%s»"
+
+#, c-format
+msgid "Authentication failed for '%s'"
+msgstr "S'ha produït un error en autenticar per «%s»"
+
+#, c-format
+msgid "unable to access '%s' with http.pinnedPubkey configuration: %s"
+msgstr "no es pot accedir a «%s» la configuració de http.pinnedPubkey :%s"
+
+#, c-format
+msgid "unable to access '%s': %s"
+msgstr "no s'ha pogut accedir a «%s»: %s"
+
+#, c-format
+msgid "redirecting to %s"
+msgstr "s'està redirigint a %s"
+
+msgid "shouldn't have EOF when not gentle on EOF"
+msgstr "no hauria de tenir EOF quan s'és lax amb els EOF"
+
+msgid "remote server sent unexpected response end packet"
+msgstr "el servidor remot ha enviat un paquet de final de resposta inesperat"
+
+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"
+
+#, c-format
+msgid "remote-curl: bad line length character: %.4s"
+msgstr "remote-curl: caràcter de longitud de línia erroni: %.4s"
+
+msgid "remote-curl: unexpected response end packet"
+msgstr "remote-curl: paquet final de resposta inesperat"
+
+#, c-format
+msgid "RPC failed; %s"
+msgstr "RPC ha fallat; %s"
+
+msgid "cannot handle pushes this big"
+msgstr "no es pot gestionar pujades tan grans"
+
+#, c-format
+msgid "cannot deflate request; zlib deflate error %d"
+msgstr "no es pot descomprimir la sol·licitud; error de deflate zlib %d"
+
+#, c-format
+msgid "cannot deflate request; zlib end error %d"
+msgstr ""
+"no es pot descomprimir la sol·licitud; error de finalització de zlib %d"
+
+#, c-format
+msgid "%d bytes of length header were received"
+msgstr "s'han rebut %d bytes de longitud de capçalera"
+
+#, c-format
+msgid "%d bytes of body are still expected"
+msgstr "encara s'esperen %d bytes del cos"
+
+msgid "dumb http transport does not support shallow capabilities"
+msgstr "el transport ximple http no admet capacitats superficials"
+
+msgid "fetch failed."
+msgstr "l'obtenció ha fallat."
+
+msgid "cannot fetch by sha1 over smart http"
+msgstr "no s'ha pogut obtenir per sha1 a través de l'http intel·ligent"
+
+#, c-format
+msgid "protocol error: expected sha/ref, got '%s'"
+msgstr "error de protocol: s'esperava sha/ref, s'ha obtingut «%s»"
+
+#, c-format
+msgid "http transport does not support %s"
+msgstr "El transport http no admet %s"
+
+msgid "git-http-push failed"
+msgstr "git-http-push ha fallat"
+
+msgid "remote-curl: usage: git remote-curl <remote> [<url>]"
+msgstr "remote-curl: ús: git remote-curl <remote> [<url>]"
+
+msgid "remote-curl: error reading command stream from git"
+msgstr "remote-curl: error en llegir el flux d'ordres del git"
+
+msgid "remote-curl: fetch attempted without a local repo"
+msgstr "remote-curl: s'ha intentat l'obtenció sense un dipòsit local"
+
+#, c-format
+msgid "remote-curl: unknown command '%s' from git"
+msgstr "remote-curl: ordre «%s» desconeguda del git"
+
+#, c-format
+msgid "config remote shorthand cannot begin with '/': %s"
+msgstr ""
+"l'abreviatura del fitxer de configuració remot no pot començar amb «/»: %s"
+
+msgid "more than one receivepack given, using the first"
+msgstr "més d'un paquet de recepció donat, usant el primer"
+
+msgid "more than one uploadpack given, using the first"
+msgstr "més d'un paquet de càrrega donat, usant el primer"
+
+#, fuzzy, c-format
+msgid "unrecognized value transfer.credentialsInUrl: '%s'"
+msgstr "patró no reconegut: «%s»"
+
+#, c-format
+msgid "URL '%s' uses plaintext credentials"
+msgstr ""
+
+#, c-format
+msgid "Cannot fetch both %s and %s to %s"
+msgstr "No es poden obtenir ambdós %s i %s a %s"
+
+#, c-format
+msgid "%s usually tracks %s, not %s"
+msgstr "%s generalment segueix %s, no %s"
+
+#, c-format
+msgid "%s tracks both %s and %s"
+msgstr "%s segueix ambdós %s i %s"
+
+#, c-format
+msgid "key '%s' of pattern had no '*'"
+msgstr "la clau «%s» del patró no té «*»"
+
+#, c-format
+msgid "value '%s' of pattern has no '*'"
+msgstr "el valor «%s» del patró no té «*»"
+
+#, c-format
+msgid "src refspec %s does not match any"
+msgstr "l'especificació de referència src %s no coincideix amb cap referència"
+
+#, 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"
+
+#. TRANSLATORS: "matches '%s'%" is the <dst> part of "git push
+#. <remote> <src>:<dst>" push, and "being pushed ('%s')" is
+#. the <src>.
+#.
+#, c-format
+msgid ""
+"The destination you provided is not a full refname (i.e.,\n"
+"starting with \"refs/\"). We tried to guess what you meant by:\n"
+"\n"
+"- Looking for a ref that matches '%s' on the remote side.\n"
+"- Checking if the <src> being pushed ('%s')\n"
+"  is a ref in \"refs/{heads,tags}/\". If so we add a corresponding\n"
+"  refs/{heads,tags}/ prefix on the remote side.\n"
+"\n"
+"Neither worked, so we gave up. You must fully qualify the ref."
+msgstr ""
+"La destinació que heu proporcionat no és un nom de referència complet\n"
+"(p. ex., que comenci amb «refs/»). Hem intentat deduir el que voleu dir:\n"
+"\n"
+"- Buscant una referència que coincideixi amb «%s» al costat remot.\n"
+"- Comprovant si el <src> que s'ha pujat («%s»)\n"
+"  és una referència «refs/{heads,tags}/». Si és així, afegim el prefix\n"
+"  refs/{heads,tags}/ corresponent al costat remot.\n"
+"\n"
+"Res d'això ha funcionat. Cal que proporcioneu una referència completa."
+
+#, c-format
+msgid ""
+"The <src> part of the refspec is a commit object.\n"
+"Did you mean to create a new branch by pushing to\n"
+"'%s:refs/heads/%s'?"
+msgstr ""
+"La part <src> de l'especificació de la referència és un objecte de "
+"comissió.\n"
+"Voleu crear una branca nova empenyent a\n"
+"«%s:refs/heads/%s»?"
+
+#, c-format
+msgid ""
+"The <src> part of the refspec is a tag object.\n"
+"Did you mean to create a new tag by pushing to\n"
+"'%s:refs/tags/%s'?"
+msgstr ""
+"La part <src> de l'especificació de la referència és un objecte d'etiqueta.\n"
+"Voleu crear una etiqueta pujant-la a «%srefs/tags/%s»?"
+
+#, c-format
+msgid ""
+"The <src> part of the refspec is a tree object.\n"
+"Did you mean to tag a new tree by pushing to\n"
+"'%s:refs/tags/%s'?"
+msgstr ""
+"La part <src> de l'especificació de la referència és un objecte d'arbre.\n"
+"Voleu crear una etiqueta pujant-la a «%srefs/tags/%s»?"
+
+#, c-format
+msgid ""
+"The <src> part of the refspec is a blob object.\n"
+"Did you mean to tag a new blob by pushing to\n"
+"'%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»?"
+
+#, c-format
+msgid "%s cannot be resolved to branch"
+msgstr "«%s» no es pot resoldre a una branca"
+
+#, c-format
+msgid "unable to delete '%s': remote ref does not exist"
+msgstr "no s'ha pogut suprimir «%s»: la referència remota no existeix"
+
+#, 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"
+
+#, c-format
+msgid "dst ref %s receives from more than one src"
+msgstr "l'especificació de la referència dst %s rep més d'una referència src"
+
+msgid "HEAD does not point to a branch"
+msgstr "HEAD no assenyala cap branca"
+
+#, c-format
+msgid "no such branch: '%s'"
+msgstr "no existeix la branca: «%s»"
+
+#, c-format
+msgid "no upstream configured for branch '%s'"
+msgstr "cap font configurada per a la branca «%s»"
+
+#, c-format
+msgid "upstream branch '%s' not stored as a remote-tracking branch"
+msgstr "la branca font «%s» no s'emmagatzema com a branca amb seguiment remot"
+
+#, 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"
+
+#, c-format
+msgid "branch '%s' has no remote for pushing"
+msgstr "la branca «%s» no té cap remot al qual pujar"
+
+#, c-format
+msgid "push refspecs for '%s' do not include '%s'"
+msgstr "les especificacions de referència de pujada «%s» no inclouen «%s»"
+
+msgid "push has no destination (push.default is 'nothing')"
+msgstr "push no té destí (push.default és «nothing»)"
+
+msgid "cannot resolve 'simple' push to a single destination"
+msgstr "no es pot resoldre una pujada «simple» a un sol destí"
+
+#, c-format
+msgid "couldn't find remote ref %s"
+msgstr "no s'ha pogut trobar la referència remota %s"
+
+#, c-format
+msgid "* Ignoring funny ref '%s' locally"
+msgstr "* S'estan ignorant les referències «%s» localment"
+
+#, c-format
+msgid "Your branch is based on '%s', but the upstream is gone.\n"
+msgstr "La vostra branca està basada en «%s», però la font no hi és.\n"
+
+msgid "  (use \"git branch --unset-upstream\" to fixup)\n"
+msgstr "  (useu «git branch --unset-upstream» per a arreglar-ho)\n"
+
+#, c-format
+msgid "Your branch is up to date with '%s'.\n"
+msgstr "La vostra branca està al dia amb «%s».\n"
+
+#, c-format
+msgid "Your branch and '%s' refer to different commits.\n"
+msgstr "La vostra branca i «%s» es refereixen a diferents comissions.\n"
+
+#, c-format
+msgid "  (use \"%s\" for details)\n"
+msgstr "  (useu «%s» per a detalls)\n"
+
+#, c-format
+msgid "Your branch is ahead of '%s' by %d commit.\n"
+msgid_plural "Your branch is ahead of '%s' by %d commits.\n"
+msgstr[0] "La vostra branca està %2$d comissió per davant de «%1$s».\n"
+msgstr[1] "La vostra branca està %2$d comissions per davant de «%1$s».\n"
+
+msgid "  (use \"git push\" to publish your local commits)\n"
+msgstr "  (useu «git push» per a publicar les vostres comissions locals)\n"
+
+#, c-format
+msgid "Your branch is behind '%s' by %d commit, and can be fast-forwarded.\n"
+msgid_plural ""
+"Your branch is behind '%s' by %d commits, and can be fast-forwarded.\n"
+msgstr[0] ""
+"La vostra branca està %2$d comissió per darrere de «%1$s», i pot avançar-se "
+"ràpidament.\n"
+msgstr[1] ""
+"La vostra branca està %2$d comissions per darrere de «%1$s», i pot avançar-"
+"se ràpidament.\n"
+
+msgid "  (use \"git pull\" to update your local branch)\n"
+msgstr "  (useu «git pull» per a actualitzar la vostra branca local)\n"
+
+#, c-format
+msgid ""
+"Your branch and '%s' have diverged,\n"
+"and have %d and %d different commit each, respectively.\n"
+msgid_plural ""
+"Your branch and '%s' have diverged,\n"
+"and have %d and %d different commits each, respectively.\n"
+msgstr[0] ""
+"La vostra branca i «%s» han divergit,\n"
+"i tenen %d i %d comissió distinta cada una, respectivament.\n"
+msgstr[1] ""
+"La vostra branca i «%s» han divergit,\n"
+"i tenen %d i %d comissions distintes cada una, respectivament.\n"
+
+msgid "  (use \"git pull\" to merge the remote branch into yours)\n"
+msgstr "  (useu «git pull» per a fusionar la branca remota amb la vostra)\n"
+
+#, c-format
+msgid "cannot parse expected object name '%s'"
+msgstr "no es pot analitzar el nom de l'objecte esperat «%s»"
+
+#, c-format
+msgid "cannot strip one component off url '%s'"
+msgstr "no es pot despullar un component de l'url «%s»"
+
+#, c-format
+msgid "bad replace ref name: %s"
+msgstr "nom de la referència reemplaçada incorrecte: %s"
+
+#, c-format
+msgid "duplicate replace ref: %s"
+msgstr "duplica les referències reemplaçades: %s"
+
+#, c-format
+msgid "replace depth too high for object %s"
+msgstr "la profunditat de reemplaçament és massa alta per l'objecte %s"
+
+msgid "corrupt MERGE_RR"
+msgstr "MERGE_RR corrupte"
+
+msgid "unable to write rerere record"
+msgstr "no s'ha pogut escriure el registre «rerere»"
+
+#, c-format
+msgid "there were errors while writing '%s' (%s)"
+msgstr "s'han produït errors en escriure «%s» (%s)"
+
+#, c-format
+msgid "could not parse conflict hunks in '%s'"
+msgstr "no s'han pogut analitzar els pedaços en conflicte a «%s»"
+
+#, c-format
+msgid "failed utime() on '%s'"
+msgstr "s'ha produït un error en fer «failed utime()» a «%s»"
+
+#, c-format
+msgid "writing '%s' failed"
+msgstr "s'ha produït un error en escriure «%s»"
+
+#, c-format
+msgid "Staged '%s' using previous resolution."
+msgstr "«Staged» «%s» utilitzant una resolució anterior."
+
+#, c-format
+msgid "Recorded resolution for '%s'."
+msgstr "Es recorda la resolució per a «%s»."
+
+#, c-format
+msgid "Resolved '%s' using previous resolution."
+msgstr "S'ha resolt «%s» usant una resolució anterior."
+
+#, c-format
+msgid "cannot unlink stray '%s'"
+msgstr "no es pot desenllaçar «%s» (extraviat)"
+
+#, c-format
+msgid "Recorded preimage for '%s'"
+msgstr "Imatge prèvia registrada per a «%s»"
+
+#, c-format
+msgid "failed to update conflicted state in '%s'"
+msgstr "ha fallat en actualitzar l'estat en conflicte a «%s»"
+
+#, c-format
+msgid "no remembered resolution for '%s'"
+msgstr "no hi ha cap resolució recordada per a «%s»"
+
+#, c-format
+msgid "cannot unlink '%s'"
+msgstr "no es pot fer «unlink» de «%s»"
+
+#, c-format
+msgid "Updated preimage for '%s'"
+msgstr "Imatge prèvia actualitzada per a «%s»"
+
+#, c-format
+msgid "Forgot resolution for '%s'\n"
+msgstr "S'ha oblidat la resolució per a «%s»\n"
+
+msgid "unable to open rr-cache directory"
+msgstr "no s'ha pogut obrir el directori rr-cache"
+
+msgid "update the index with reused conflict resolution if possible"
+msgstr ""
+"actualitza l'índex amb la resolució de conflictes reusada si és possible"
+
+msgid "could not determine HEAD revision"
+msgstr "no s'ha pogut determinar la revisió de HEAD"
+
+#, c-format
+msgid "failed to find tree of %s"
+msgstr "s'ha produït un error en cercar l'arbre de %s"
+
+msgid "--unpacked=<packfile> no longer supported"
+msgstr "--unpacked=<packfile> ja no s'admet"
+
+msgid "your current branch appears to be broken"
+msgstr "la vostra branca actual sembla malmesa"
+
+#, c-format
+msgid "your current branch '%s' does not have any commits yet"
+msgstr "la branca actual «%s» encara no té cap comissió"
+
+msgid "object filtering requires --objects"
+msgstr "el filtratge d'objectes requereix --objects"
+
+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»"
+
+#, c-format
+msgid "cannot create async thread: %s"
+msgstr "no s'ha pogut crear fil «async»: %s"
+
+msgid "unexpected flush packet while reading remote unpack status"
+msgstr ""
+"paquet de buidatge no esperat quan estava llegint l'estat del "
+"desempaquetament remot"
+
+#, c-format
+msgid "unable to parse remote unpack status: %s"
+msgstr "no s'ha pogut analitzar l'estat del desempaquetament remot: %s"
+
+#, c-format
+msgid "remote unpack failed: %s"
+msgstr "s'ha produït un error en el desempaquetament remot: %s"
+
+msgid "failed to sign the push certificate"
+msgstr "s'ha produït un error en signar el certificat de pujada"
+
+msgid "send-pack: unable to fork off fetch subprocess"
+msgstr "send-pack: no es pot bifurcar obtenint un subprocés"
+
+msgid "push negotiation failed; proceeding anyway with push"
+msgstr ""
+"ha fallat la negociació de la pujada; s'està procedint igualment amb "
+"l'empenta"
+
+msgid "the receiving end does not support this repository's hash algorithm"
+msgstr "el receptor de destí no admet l'algorisme de hash del repositori"
+
+msgid "the receiving end does not support --signed push"
+msgstr "el destí receptor no admet pujar --signed"
+
+msgid ""
+"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"
+
+msgid "the receiving end does not support --atomic push"
+msgstr "el destí receptor no admet pujar --atomic"
+
+msgid "the receiving end does not support push options"
+msgstr "el receptor al destí no admet opcions de pujada"
+
+#, c-format
+msgid "invalid commit message cleanup mode '%s'"
+msgstr "mode de neteja «%s» no vàlid en la comissió del missatge"
+
+#, c-format
+msgid "could not delete '%s'"
+msgstr "no s'ha pogut suprimir «%s»"
+
+msgid "revert"
+msgstr "revertir"
+
+msgid "cherry-pick"
+msgstr "cherry-pick"
+
+msgid "rebase"
+msgstr "rebase"
+
+#, c-format
+msgid "unknown action: %d"
+msgstr "acció desconeguda: %d"
+
+msgid ""
+"after resolving the conflicts, mark the corrected paths\n"
+"with 'git add <paths>' or 'git rm <paths>'"
+msgstr ""
+"després de resoldre els conflictes, marqueu els camins\n"
+"corregits amb «git add <camins>» o «git rm <camins>»"
+
+msgid ""
+"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-los amb\n"
+"«git add/rm <pathspec>», llavors executeu\n"
+"«git cherry-pick --continue».\n"
+"Podeu també ometre aquesta comissió amb «git cherry-pick --skip».\n"
+"Per a interrompre i tornar a l'estat anterior abans de «git cherry-pick»,\n"
+"executeu «git cherry-pick --abort»."
+
+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 ""
+"Després de resoldre els conflictes, marqueu-los amb\n"
+"«git add/rm <pathspec>», llavors executeu\n"
+"«git revert --continue».\n"
+"Podeu també ometre aquesta comissió amb «git revert --skip».\n"
+"Per a interrompre i tornar a l'estat anterior abans de «git revert»,\n"
+"executeu «git revert --abort»."
+
+#, c-format
+msgid "could not lock '%s'"
+msgstr "no s'ha pogut bloquejar «%s»"
+
+#, c-format
+msgid "could not write to '%s'"
+msgstr "no s'ha pogut escriure a «%s»"
+
+#, c-format
+msgid "could not write eol to '%s'"
+msgstr "no s'ha pogut escriure el terminador de línia a «%s»"
+
+#, c-format
+msgid "failed to finalize '%s'"
+msgstr "s'ha produït un error en finalitzar «%s»"
+
+#, c-format
+msgid "your local changes would be overwritten by %s."
+msgstr "els vostres canvis locals se sobreescriurien per %s."
+
+msgid "commit your changes or stash them to proceed."
+msgstr "cometeu els vostres canvis o feu un «stash» per a procedir."
+
+#, c-format
+msgid "%s: fast-forward"
+msgstr "%s: avanç ràpid"
+
+#. TRANSLATORS: %s will be "revert", "cherry-pick" or
+#. "rebase".
+#.
+#, c-format
+msgid "%s: Unable to write new index file"
+msgstr "%s: No s'ha pogut escriure un fitxer d'índex nou"
+
+msgid "unable to update cache tree"
+msgstr "no s'ha pogut actualitzar l'arbre cau"
+
+msgid "could not resolve HEAD commit"
+msgstr "no s'ha pogut resoldre la comissió HEAD"
+
+#, c-format
+msgid "no key present in '%.*s'"
+msgstr "no hi ha una clau a «%.*s»"
+
+#, c-format
+msgid "unable to dequote value of '%s'"
+msgstr "no s'han pogut treure les cometes del valor de «%s»"
+
+msgid "'GIT_AUTHOR_NAME' already given"
+msgstr "Ja s'ha donat «GIT_AUTHOR_NAME»"
+
+msgid "'GIT_AUTHOR_EMAIL' already given"
+msgstr "Ja s'ha donat «GIT_AUTHOR_EMAIL»"
+
+msgid "'GIT_AUTHOR_DATE' already given"
+msgstr "Ja s'ha donat «GIT_AUTHOR_DATE»"
+
+#, c-format
+msgid "unknown variable '%s'"
+msgstr "variable «%s» desconeguda"
+
+msgid "missing 'GIT_AUTHOR_NAME'"
+msgstr "falta «GIT_AUTHOR_NAME»"
+
+msgid "missing 'GIT_AUTHOR_EMAIL'"
+msgstr "falta «GIT_AUTHOR_EMAIL»"
+
+msgid "missing 'GIT_AUTHOR_DATE'"
+msgstr "falta «GIT_AUTHOR_DATE»"
+
+#, c-format
+msgid ""
+"you have staged changes in your working tree\n"
+"If these changes are meant to be squashed into the previous commit, run:\n"
+"\n"
+"  git commit --amend %s\n"
+"\n"
+"If they are meant to go into a new commit, run:\n"
+"\n"
+"  git commit %s\n"
+"\n"
+"In both cases, once you're done, continue with:\n"
+"\n"
+"  git rebase --continue\n"
+msgstr ""
+"teniu canvis «staged» en el vostre arbre de treball\n"
+"Si aquests canvis estan pensats per a fer «squash» a la comissió prèvia, "
+"executeu:\n"
+"\n"
+"  git commit --amend %s\n"
+"\n"
+"Si són per a formar una comissió nova, executeu:\n"
+"\n"
+"  git commit %s\n"
+"\n"
+"En ambdós casos, quan hàgiu terminat, continueu amb:\n"
+"\n"
+"  git rebase --continue\n"
+
+msgid "'prepare-commit-msg' hook failed"
+msgstr "el lligam «prepare-commit-msg» ha fallat"
+
+msgid ""
+"Your name and email address were configured automatically based\n"
+"on your username and hostname. Please check that they are accurate.\n"
+"You can suppress this message by setting them explicitly. Run the\n"
+"following command and follow the instructions in your editor to edit\n"
+"your configuration file:\n"
+"\n"
+"    git config --global --edit\n"
+"\n"
+"After doing this, you may fix the identity used for this commit with:\n"
+"\n"
+"    git commit --amend --reset-author\n"
+msgstr ""
+"S'han configurat el vostre nom i adreça electrònica\n"
+"automàticament basant-se en el vostre nom d'usuari i nom de màquina. \n"
+"Comproveu que siguin correctes. Podeu suprimir aquest\n"
+"missatge establint-los explícitament. Executeu l'ordre següent i\n"
+"seguiu les instruccions en l'editor per a editar el vostre\n"
+"fitxer de configuració:\n"
+"\n"
+"    git config --global --edit\n"
+"Després de fer això, podeu esmenar la identitat usada per a aquesta\n"
+"comissió amb:\n"
+"\n"
+"    git commit --amend --reset-author\n"
+
+msgid ""
+"Your name and email address were configured automatically based\n"
+"on your username and hostname. Please check that they are accurate.\n"
+"You can suppress this message by setting them explicitly:\n"
+"\n"
+"    git config --global user.name \"Your Name\"\n"
+"    git config --global user.email you@example.com\n"
+"\n"
+"After doing this, you may fix the identity used for this commit with:\n"
+"\n"
+"    git commit --amend --reset-author\n"
+msgstr ""
+"S'han configurat el vostre nom i adreça electrònica\n"
+"automàticament basats en el vostre nom d'usuari i nom de màquina. \n"
+"Comproveu que siguin correctes. Podeu suprimir aquest\n"
+"missatge establint-los explícitament:\n"
+"\n"
+"    git config --global user.name \"El vostre nom\"\n"
+"    git config --global user.email usuari@example.com\n"
+"\n"
+"Després de fer això, podeu arreglar la identitat usada per a aquesta\n"
+"comissió amb:\n"
+"\n"
+"    git commit --amend --reset-author\n"
+
+msgid "couldn't look up newly created commit"
+msgstr "no s'ha pogut trobar la comissió novament creada"
+
+msgid "could not parse newly created commit"
+msgstr "no s'ha pogut analitzar la comissió novament creada"
+
+msgid "unable to resolve HEAD after creating commit"
+msgstr "no s'ha pogut resoldre HEAD després de crear la comissió"
+
+msgid "detached HEAD"
+msgstr "HEAD separat"
+
+msgid " (root-commit)"
+msgstr " (comissió arrel)"
+
+msgid "could not parse HEAD"
+msgstr "no s'ha pogut analitzar HEAD"
+
+#, c-format
+msgid "HEAD %s is not a commit!"
+msgstr "HEAD %s no és una comissió!"
+
+msgid "unable to parse commit author"
+msgstr "no s'ha pogut analitzar l'autor de la comissió"
+
+#, c-format
+msgid "unable to read commit message from '%s'"
+msgstr "no s'ha pogut llegir el missatge de comissió des de «%s»"
+
+#, c-format
+msgid "invalid author identity '%s'"
+msgstr "identitat d'autor no vàlida: «%s»"
+
+msgid "corrupt author: missing date information"
+msgstr "autor malmès: falta la informació de la data"
+
+#, c-format
+msgid "could not update %s"
+msgstr "no s'ha pogut actualitzar %s"
+
+#, c-format
+msgid "could not parse commit %s"
+msgstr "no s'ha pogut analitzar la comissió %s"
+
+#, c-format
+msgid "could not parse parent commit %s"
+msgstr "no s'ha pogut analitzar la comissió pare %s"
+
+#, c-format
+msgid "unknown command: %d"
+msgstr "ordre desconeguda: %d"
+
+msgid "This is the 1st commit message:"
+msgstr "Aquest és el missatge de la 1ra comissió:"
+
+#, c-format
+msgid "This is the commit message #%d:"
+msgstr "Aquest és el missatge de la #%d comissió:"
+
+msgid "The 1st commit message will be skipped:"
+msgstr "El missatge de la primera comissió s'ometrà:"
+
+#, c-format
+msgid "The commit message #%d will be skipped:"
+msgstr "El missatge de la comissió núm. #%d s'ometrà:"
+
+#, c-format
+msgid "This is a combination of %d commits."
+msgstr "Això és una combinació de %d comissions."
+
+#, c-format
+msgid "cannot write '%s'"
+msgstr "no es pot escriure «%s»"
+
+msgid "need a HEAD to fixup"
+msgstr "cal un HEAD per a reparar-ho"
+
+msgid "could not read HEAD"
+msgstr "no s'ha pogut llegir HEAD"
+
+msgid "could not read HEAD's commit message"
+msgstr "no s'ha pogut llegir el missatge de comissió de HEAD"
+
+#, c-format
+msgid "could not read commit message of %s"
+msgstr "no s'ha pogut llegir el missatge de comissió: %s"
+
+msgid "your index file is unmerged."
+msgstr "el vostre fitxer d'índex està sense fusionar."
+
+msgid "cannot fixup root commit"
+msgstr "no es pot arreglar la comissió arrel"
+
+#, 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."
+
+#, c-format
+msgid "commit %s does not have parent %d"
+msgstr "la comissió %s no té pare %d"
+
+#, 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.
+#, c-format
+msgid "%s: cannot parse parent commit %s"
+msgstr "%s: no es pot analitzar la comissió pare %s"
+
+#, c-format
+msgid "could not rename '%s' to '%s'"
+msgstr "no s'ha pogut canviar el nom «%s» a «%s»"
+
+#, c-format
+msgid "could not revert %s... %s"
+msgstr "no s'ha pogut revertir %s... %s"
+
+#, c-format
+msgid "could not apply %s... %s"
+msgstr "no s'ha pogut aplicar %s... %s"
+
+#, c-format
+msgid "dropping %s %s -- patch contents already upstream\n"
+msgstr "descartant %s %s -- el contingut del pedaç ja està a la font\n"
+
+#, c-format
+msgid "git %s: failed to read the index"
+msgstr "git %s: s'ha produït un error en llegir l'índex"
+
+#, c-format
+msgid "git %s: failed to refresh the index"
+msgstr "git %s: s'ha produït un error en actualitzar l'índex"
+
+#, c-format
+msgid "%s does not accept arguments: '%s'"
+msgstr "%s no accepta arguments: «%s»"
+
+#, c-format
+msgid "missing arguments for %s"
+msgstr "falten els arguments per a %s"
+
+#, c-format
+msgid "could not parse '%s'"
+msgstr "no s'ha pogut analitzar «%s»"
+
+#, c-format
+msgid "invalid line %d: %.*s"
+msgstr "línia no vàlida %d: %.*s"
+
+#, c-format
+msgid "cannot '%s' without a previous commit"
+msgstr "no es pot «%s» sense una comissió prèvia"
+
+msgid "cancelling a cherry picking in progress"
+msgstr "s'està cancel·lant un «cherry pick» en curs"
+
+msgid "cancelling a revert in progress"
+msgstr "s'està cancel·lant la reversió en curs"
+
+msgid "please fix this using 'git rebase --edit-todo'."
+msgstr "corregiu-ho usant «git rebase --edit-todo»."
+
+#, c-format
+msgid "unusable instruction sheet: '%s'"
+msgstr "full d'instruccions inusable: «%s»"
+
+msgid "no commits parsed."
+msgstr "no s'ha analitzat cap comissió."
+
+msgid "cannot cherry-pick during a revert."
+msgstr "no es pot fer «cherry pick» durant una reversió."
+
+msgid "cannot revert during a cherry-pick."
+msgstr "no es pot revertir durant un «cherry pick»."
+
+msgid "unusable squash-onto"
+msgstr "«squash-onto» no usable"
+
+#, c-format
+msgid "malformed options sheet: '%s'"
+msgstr "full d'opcions mal format: «%s»"
+
+msgid "empty commit set passed"
+msgstr "conjunt de comissions buit passat"
+
+msgid "revert is already in progress"
+msgstr "una reversió ja està en curs"
+
+#, c-format
+msgid "try \"git revert (--continue | %s--abort | --quit)\""
+msgstr "intenteu «git revert (--continue | %s--abort | --quit)»"
+
+msgid "cherry-pick is already in progress"
+msgstr "un «cherry pick» ja està en curs"
+
+#, c-format
+msgid "try \"git cherry-pick (--continue | %s--abort | --quit)\""
+msgstr "intenteu «git cherry-pick (--continue | %s--abort | --quit)»"
+
+#, c-format
+msgid "could not create sequencer directory '%s'"
+msgstr "no s'ha pogut crear el directori de seqüenciador «%s»"
+
+msgid "could not lock HEAD"
+msgstr "no s'ha pogut bloquejar HEAD"
+
+msgid "no cherry-pick or revert in progress"
+msgstr "ni hi ha cap «cherry pick» ni cap reversió en curs"
+
+msgid "cannot resolve HEAD"
+msgstr "no es pot resoldre HEAD"
+
+msgid "cannot abort from a branch yet to be born"
+msgstr "no es pot avortar des d'una branca que encara ha de nàixer"
+
+#, c-format
+msgid "cannot read '%s': %s"
+msgstr "no es pot llegir «%s»: %s"
+
+msgid "unexpected end of file"
+msgstr "final de fitxer inesperat"
+
+#, 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"
+
+msgid "You seem to have moved HEAD. Not rewinding, check your HEAD!"
+msgstr "Sembla que heu mogut HEAD sense rebobinar, comproveu-ho HEAD"
+
+msgid "no revert in progress"
+msgstr "no hi ha cap reversió en curs"
+
+msgid "no cherry-pick in progress"
+msgstr "ni hi ha cap «cherry pick» en curs"
+
+msgid "failed to skip the commit"
+msgstr "s'ha produït un error en ometre la comissió"
+
+msgid "there is nothing to skip"
+msgstr "no hi ha res a ometre"
+
+#, c-format
+msgid ""
+"have you committed already?\n"
+"try \"git %s --continue\""
+msgstr ""
+"heu fet ja una comissió?\n"
+"proveu «git %s --continue»"
+
+msgid "cannot read HEAD"
+msgstr "no es pot llegir HEAD"
+
+#, c-format
+msgid "unable to copy '%s' to '%s'"
+msgstr "no s'ha pogut copiar «%s» a «%s»"
+
+#, c-format
+msgid ""
+"You can amend the commit now, with\n"
+"\n"
+"  git commit --amend %s\n"
+"\n"
+"Once you are satisfied with your changes, run\n"
+"\n"
+"  git rebase --continue\n"
+msgstr ""
+"Podeu esmenar la comissió ara, amb\n"
+"\n"
+"  git commit --amend %s\n"
+"\n"
+"Una vegada que estigueu satisfet amb els vostres canvis, executeu\n"
+"\n"
+"  git rebase --continue\n"
+
+#, c-format
+msgid "Could not apply %s... %.*s"
+msgstr "No s'ha pogut aplicar %s... %.*s"
+
+#, c-format
+msgid "Could not merge %.*s"
+msgstr "No s'ha pogut fusionar %.*s"
+
+#, c-format
+msgid "Executing: %s\n"
+msgstr "S'està executant: %s\n"
+
+#, c-format
+msgid ""
+"execution failed: %s\n"
+"%sYou can fix the problem, and then run\n"
+"\n"
+"  git rebase --continue\n"
+"\n"
+msgstr ""
+"ha fallat: %s\n"
+"%sPodeu solucionar el problema, i llavors executar\n"
+"\n"
+" git rebase --continue\n"
+"\n"
+
+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"
+
+#, c-format
+msgid ""
+"execution succeeded: %s\n"
+"but left changes to the index and/or the working tree\n"
+"Commit or stash your changes, and then run\n"
+"\n"
+"  git rebase --continue\n"
+"\n"
+msgstr ""
+"l'execució ha tingut èxit: %s\n"
+"però ha deixat canvis a l'índex i/o l'arbre de treball\n"
+"Cometeu o feu «stash» dels vostres canvis, i llavors executeu\n"
+"\n"
+" git rebase --continue\n"
+
+#, c-format
+msgid "illegal label name: '%.*s'"
+msgstr "nom d'etiqueta no permès: «%.*s»"
+
+msgid "writing fake root commit"
+msgstr "s'està escrivint una comissió arrel falsa"
+
+msgid "writing squash-onto"
+msgstr "s'està escrivint «squash-onto»"
+
+#, c-format
+msgid "could not resolve '%s'"
+msgstr "no s'ha pogut resoldre «%s»"
+
+msgid "cannot merge without a current revision"
+msgstr "no es pot fusionar sense una revisió actual"
+
+#, c-format
+msgid "unable to parse '%.*s'"
+msgstr "no s'ha pogut analitzar «%.*s»"
+
+#, c-format
+msgid "nothing to merge: '%.*s'"
+msgstr "no hi ha res per a fusionar «%.*s»"
+
+msgid "octopus merge cannot be executed on top of a [new root]"
+msgstr ""
+"no es pot executar la fusió «octopus» a la part superior d'una [arrel nova]"
+
+#, c-format
+msgid "could not get commit message of '%s'"
+msgstr "no s'ha pogut llegir el missatge de comissió de «%s»"
+
+#, c-format
+msgid "could not even attempt to merge '%.*s'"
+msgstr "no s'ha pogut fusionar «%.*s»"
+
+msgid "merge: Unable to write new index file"
+msgstr "fusió: no s'ha pogut escriure un fitxer d'índex nou"
+
+msgid "Cannot autostash"
+msgstr "No es pot fer un «stash» automàticament"
+
+#, c-format
+msgid "Unexpected stash response: '%s'"
+msgstr "Resposta de «stash» inesperada: «%s»"
+
+#, c-format
+msgid "Could not create directory for '%s'"
+msgstr "No s'ha pogut crear el directori per a «%s»"
+
+#, c-format
+msgid "Created autostash: %s\n"
+msgstr "S'ha creat un «stash» automàticament: %s\n"
+
+msgid "could not reset --hard"
+msgstr "no s'ha pogut fer reset --hard"
+
+#, c-format
+msgid "Applied autostash.\n"
+msgstr "S'ha aplicat el «stash» automàticament.\n"
+
+#, c-format
+msgid "cannot store %s"
+msgstr "no es pot emmagatzemar %s"
+
+#, c-format
+msgid ""
+"%s\n"
+"Your changes are safe in the stash.\n"
+"You can run \"git stash pop\" or \"git stash drop\" at any time.\n"
+msgstr ""
+"%s\n"
+"Els vostres canvis estan segurs en el «stash».\n"
+"Podeu executar «git stash pop» o «git stash drop» en qualsevol moment.\n"
+
+msgid "Applying autostash resulted in conflicts."
+msgstr "L'aplicació del «stash» automàticament ha donat conflictes."
+
+msgid "Autostash exists; creating a new stash entry."
+msgstr ""
+"El «stash» automàtic ja existeix; s'està creant una entrada «stash» nova."
+
+msgid "could not detach HEAD"
+msgstr "no s'ha pogut separar HEAD"
+
+#, c-format
+msgid "Stopped at HEAD\n"
+msgstr "Aturat a HEAD\n"
+
+#, c-format
+msgid "Stopped at %s\n"
+msgstr "Aturat a %s\n"
+
+#, c-format
+msgid ""
+"Could not execute the todo command\n"
+"\n"
+"    %.*s\n"
+"It has been rescheduled; To edit the command before continuing, please\n"
+"edit the todo list first:\n"
+"\n"
+"    git rebase --edit-todo\n"
+"    git rebase --continue\n"
+msgstr ""
+"No s'ha pogut executar l'ordre «todo»\n"
+"\n"
+"    %.*s\n"
+"S'ha reprogramat; per a editar l'ordre abans de continuar, editeu primer\n"
+"la llista de tasques pendents:\n"
+"\n"
+"    git rebase --edit-todo\n"
+"    git rebase --continue\n"
+
+#, c-format
+msgid "Rebasing (%d/%d)%s"
+msgstr "S'està fent «rebase» (%d/%d)%s"
+
+#, c-format
+msgid "Stopped at %s...  %.*s\n"
+msgstr "Aturat a %s...  %.*s\n"
+
+#, c-format
+msgid "unknown command %d"
+msgstr "ordre %d desconeguda"
+
+msgid "could not read orig-head"
+msgstr "no s'ha pogut llegir orig-head"
+
+msgid "could not read 'onto'"
+msgstr "no s'ha pogut llegir «onto»"
+
+#, c-format
+msgid "could not update HEAD to %s"
+msgstr "no s'ha pogut actualitzar HEAD a %s"
+
+#, c-format
+msgid "Successfully rebased and updated %s.\n"
+msgstr "S'ha fet «rebase» i actualitzat %s amb èxit.\n"
+
+msgid "cannot rebase: You have unstaged changes."
+msgstr "no es pot fer «rebase»: teniu canvis «unstaged»."
+
+msgid "cannot amend non-existing commit"
+msgstr "no es pot esmenar una comissió no existent"
+
+#, c-format
+msgid "invalid file: '%s'"
+msgstr "fitxer no vàlid: «%s»"
+
+#, c-format
+msgid "invalid contents: '%s'"
+msgstr "contingut no vàlid: «%s»"
+
+msgid ""
+"\n"
+"You have uncommitted changes in your working tree. Please, commit them\n"
+"first and then run 'git rebase --continue' again."
+msgstr ""
+"\n"
+"Teniu canvis no comesos en el vostre arbre de treball. \n"
+"Cometeu-los primer i després executeu «git rebase --continue» de nou."
+
+#, c-format
+msgid "could not write file: '%s'"
+msgstr "no s'ha pogut escriure el fitxer: «%s»"
+
+msgid "could not remove CHERRY_PICK_HEAD"
+msgstr "no s'ha pogut eliminar CHERRY_PICK_HEAD"
+
+msgid "could not commit staged changes."
+msgstr "no s'han pogut cometre els canvis «staged»."
+
+#, c-format
+msgid "%s: can't cherry-pick a %s"
+msgstr "%s: no es pot fer «cherry pick» a %s"
+
+#, c-format
+msgid "%s: bad revision"
+msgstr "%s: revisió incorrecta"
+
+msgid "can't revert as initial commit"
+msgstr "no es pot revertir com a comissió inicial"
+
+#, c-format
+msgid "skipped previously applied commit %s"
+msgstr "omet les comissions aplicades anteriorment %s"
+
+msgid "use --reapply-cherry-picks to include skipped commits"
+msgstr "useu --reapply-cherry-picks per a incloure les comissions omeses"
+
+msgid "make_script: unhandled options"
+msgstr "make_script: opcions no gestionades"
+
+msgid "make_script: error preparing revisions"
+msgstr "make_script: s'ha produït un error en preparar les revisions"
+
+msgid "nothing to do"
+msgstr "res a fer"
+
+msgid "could not skip unnecessary pick commands"
+msgstr "no s'han pogut ometre les ordres «picks» no necessàries"
+
+msgid "the script was already rearranged."
+msgstr "l'script ja estava endreçat."
+
+#, c-format
+msgid "'%s' is outside repository at '%s'"
+msgstr "«%s» està fora del repositori a «%s»"
+
+#, c-format
+msgid ""
+"%s: no such path in the working tree.\n"
+"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."
+
+#, c-format
+msgid ""
+"ambiguous argument '%s': unknown revision or path not in the working tree.\n"
+"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"
+"Useu «--» per a separar els camins de les revisions:\n"
+"«git <ordre> [<revisió>...] -- [<fitxer>...]»"
+
+#, c-format
+msgid "option '%s' must come before non-option arguments"
+msgstr "l'opció «%s» ha d'aparèixer abans que els arguments opcionals"
+
+#, c-format
+msgid ""
+"ambiguous argument '%s': both revision and filename\n"
+"Use '--' to separate paths from revisions, like this:\n"
+"'git <command> [<revision>...] -- [<file>...]'"
+msgstr ""
+"argument ambigu «%s»: ambdós una revisió i un nom de fitxer\n"
+"Useu «--» per a separar els camins de les revisions:\n"
+"«git <ordre> [<revisió>...] -- [<fitxer>...]»"
+
+msgid "unable to set up work tree using invalid config"
+msgstr ""
+"no s'ha pogut configurar un arbre de treball utilitzant una configuració no "
+"vàlida"
+
+#, c-format
+msgid "Expected git repo version <= %d, found %d"
+msgstr "S'esperava una versió de repositori de git <= %d, s'ha trobat %d"
+
+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:"
+
+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:"
+
+#, c-format
+msgid "error opening '%s'"
+msgstr "s'ha produït un error en obrir «%s»"
+
+#, c-format
+msgid "too large to be a .git file: '%s'"
+msgstr "massa gran per a ser un fitxer .git: «%s»"
+
+#, c-format
+msgid "error reading %s"
+msgstr "error en llegir %s"
+
+#, c-format
+msgid "invalid gitfile format: %s"
+msgstr "format gitfile no vàlid: %s"
+
+#, c-format
+msgid "no path in gitfile: %s"
+msgstr "sense camí al gitfile: %s"
+
+#, c-format
+msgid "not a git repository: %s"
+msgstr "no és un repositori de git: %s"
+
+#, c-format
+msgid "'$%s' too big"
+msgstr "«$%s» massa gran"
+
+#, c-format
+msgid "not a git repository: '%s'"
+msgstr "no és un repositori de git: «%s»"
+
+#, c-format
+msgid "cannot chdir to '%s'"
+msgstr "no es pot canviar de directori a «%s»"
+
+msgid "cannot come back to cwd"
+msgstr "no es pot tornar al directori de treball actual"
+
+#, c-format
+msgid "failed to stat '%*s%s%s'"
+msgstr "s'ha produït un error en fer stat a «%*s%s%s»"
+
+msgid "Unable to read current working directory"
+msgstr "No s'ha pogut llegir el directori de treball actual"
+
+#, c-format
+msgid "cannot change to '%s'"
+msgstr "no es pot canviar a «%s»"
+
+#, 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"
+
+#, 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)."
+
+#, c-format
+msgid ""
+"unsafe repository ('%s' is owned by someone else)\n"
+"To add an exception for this directory, call:\n"
+"\n"
+"\tgit config --global --add safe.directory %s"
+msgstr ""
+
+#, 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."
+
+msgid "fork failed"
+msgstr "el «fork» ha fallat"
+
+msgid "setsid failed"
+msgstr "«setsid» ha fallat"
+
+#, c-format
+msgid "index entry is a directory, but not sparse (%08x)"
+msgstr "l'entrada d'índex és un directori, però no dispers (%08x)"
+
+msgid "cannot use split index with a sparse index"
+msgstr "no es pot utilitzar l'índex partit amb un índex dispers"
+
+#. TRANSLATORS: IEC 80000-13:2008 gibibyte
+#, c-format
+msgid "%u.%2.2u GiB"
+msgstr "%u.%2.2u GiB"
+
+#. TRANSLATORS: IEC 80000-13:2008 gibibyte/second
+#, c-format
+msgid "%u.%2.2u GiB/s"
+msgstr "%u.%2.2u GiB/s"
+
+#. TRANSLATORS: IEC 80000-13:2008 mebibyte
+#, c-format
+msgid "%u.%2.2u MiB"
+msgstr "%u.%2.2u MiB"
+
+#. TRANSLATORS: IEC 80000-13:2008 mebibyte/second
+#, c-format
+msgid "%u.%2.2u MiB/s"
+msgstr "%u.%2.2u MiB/s"
+
+#. TRANSLATORS: IEC 80000-13:2008 kibibyte
+#, c-format
+msgid "%u.%2.2u KiB"
+msgstr "%u.%2.2u KiB"
+
+#. TRANSLATORS: IEC 80000-13:2008 kibibyte/second
+#, c-format
+msgid "%u.%2.2u KiB/s"
+msgstr "%u.%2.2u KiB/s"
+
+#. TRANSLATORS: IEC 80000-13:2008 byte
+#, c-format
+msgid "%u byte"
+msgid_plural "%u bytes"
+msgstr[0] "%u byte"
+msgstr[1] "%u bytes"
+
+#. TRANSLATORS: IEC 80000-13:2008 byte/second
+#, c-format
+msgid "%u byte/s"
+msgid_plural "%u bytes/s"
+msgstr[0] "%u byte/s"
+msgstr[1] "%u bytes/s"
+
+#, c-format
+msgid "could not edit '%s'"
+msgstr "no s'ha pogut editar «%s»"
+
+#, c-format
+msgid "ignoring suspicious submodule name: %s"
+msgstr "s'està ignorant el nom de submòdul sospitós %s"
+
+#, fuzzy
+msgid "negative values not allowed for submodule.fetchJobs"
+msgstr "no es permeten els valors negatius a submodule.fetchjobs"
+
+#, 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"
+
+#, c-format
+msgid "Could not update .gitmodules entry %s"
+msgstr "No s'ha pogut actualitzar l'entrada de .gitmodules %s"
+
+msgid "Cannot change unmerged .gitmodules, resolve merge conflicts first"
+msgstr ""
+"No es pot canviar un .gitmodules no fusionat, primer resoleu els conflictes "
+"de fusió"
+
+#, c-format
+msgid "Could not find section in .gitmodules where path=%s"
+msgstr "No s'ha pogut trobar la secció en .gitmodules on path=%s"
+
+#, c-format
+msgid "Could not remove .gitmodules entry for %s"
+msgstr "No s'ha pogut eliminar l'entrada de .gitmodules per a %s"
+
+msgid "staging updated .gitmodules failed"
+msgstr "l'allistament del .gitmodules actualitzat ha fallat"
+
+#, c-format
+msgid "in unpopulated submodule '%s'"
+msgstr "al submòdul sense popular «%s»"
+
+#, c-format
+msgid "Pathspec '%s' is in submodule '%.*s'"
+msgstr "L'especificació «%s» és en el submòdul «%.*s»"
+
+#, c-format
+msgid "bad --ignore-submodules argument: %s"
+msgstr "argument incorrecte --ignore-submodules: %s"
+
+#, c-format
+msgid ""
+"Submodule in commit %s at path: '%s' collides with a submodule named the "
+"same. Skipping it."
+msgstr ""
+"El submòdul en la comissió %s al camí: «%s» col·lideix amb un submòdul amb "
+"el mateix nom. Ometent-lo."
+
+#, 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ó"
+
+#, 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"
+
+#, c-format
+msgid "process for submodule '%s' failed"
+msgstr "ha fallat el procés per al submòdul «%s»"
+
+#, c-format
+msgid "Pushing submodule '%s'\n"
+msgstr "S'està pujant el submòdul «%s»\n"
+
+#, c-format
+msgid "Unable to push submodule '%s'\n"
+msgstr "No s'ha pogut pujar el submòdul «%s»\n"
+
+#, c-format
+msgid "Fetching submodule %s%s\n"
+msgstr "S'està obtenint el submòdul %s%s\n"
+
+#, c-format
+msgid "Could not access submodule '%s'\n"
+msgstr "No s'ha pogut accedir al submòdul «%s»\n"
+
+#, c-format
+msgid "Could not access submodule '%s' at commit %s\n"
+msgstr "No s'ha pogut accedir al submòdul «%s» en la comissió %s\n"
+
+#, c-format
+msgid "Fetching submodule %s%s at commit %s\n"
+msgstr "S'està obtenint el submòdul %s%s en la comissió %s\n"
+
+#, c-format
+msgid ""
+"Errors during submodule fetch:\n"
+"%s"
+msgstr ""
+"Errors durant l'obtenció de submòduls:\n"
+"%s"
+
+#, c-format
+msgid "'%s' not recognized as a git repository"
+msgstr "«%s» no reconegut com un repositori git"
+
+#, 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"
+
+#, c-format
+msgid "'git status --porcelain=2' failed in submodule %s"
+msgstr "«git status --porcelain=2» ha fallat en el submòdul %s"
+
+#, c-format
+msgid "could not start 'git status' in submodule '%s'"
+msgstr "no s'ha pogut iniciar «git status» al submòdul «%s»"
+
+#, c-format
+msgid "could not run 'git status' in submodule '%s'"
+msgstr "no s'ha pogut executar «git status» al submòdul «%s»"
+
+#, 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»"
+
+#, 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»"
+
+msgid "could not reset submodule index"
+msgstr "no s'ha pogut restablir l'índex del submòdul"
+
+#, c-format
+msgid "submodule '%s' has dirty index"
+msgstr "el submòdul «%s» té l'índex brut"
+
+#, c-format
+msgid "Submodule '%s' could not be updated."
+msgstr "No s'ha pogut actualitzar el submòdul «%s»."
+
+#, c-format
+msgid "submodule git dir '%s' is inside git dir '%.*s'"
+msgstr "submodule git dir «%s» està dins git dir «%.*s»"
+
+#, c-format
+msgid ""
+"relocate_gitdir for submodule '%s' with more than one worktree not supported"
+msgstr ""
+"no està admès relocate_gitdir per al submòdul «%s» amb més d'un arbre de "
+"treball"
+
+#, c-format
+msgid "could not lookup name for submodule '%s'"
+msgstr "no s'ha trobat el nom pel submòdul «%s»"
+
+#, c-format
+msgid "refusing to move '%s' into an existing git dir"
+msgstr "s'ha refusat moure «%s» a un directori git existent"
+
+#, c-format
+msgid ""
+"Migrating git directory of '%s%s' from\n"
+"'%s' to\n"
+"'%s'\n"
+msgstr ""
+"S'està migrant el directori de «%s%s» des de\n"
+"«%s» a\n"
+"«%s»\n"
+
+msgid "could not start ls-files in .."
+msgstr "no s'ha pogut iniciar ls-files a .."
+
+#, c-format
+msgid "ls-tree returned unexpected return code %d"
+msgstr "ls-tree ha retornat un codi de retorn %d no esperat"
+
+#, c-format
+msgid "failed to lstat '%s'"
+msgstr "s'ha produït un error en fer lstat a «%s»"
+
+msgid "unhandled options"
+msgstr "opcions no gestionades"
+
+msgid "error preparing revisions"
+msgstr "s'ha produït un error en preparar les revisions"
+
+#, c-format
+msgid "commit %s is not marked reachable"
+msgstr "la comissió %s no està marcada com abastable"
+
+msgid "too many commits marked reachable"
+msgstr "hi ha massa comissions marcades com abastables"
+
+msgid "test-tool serve-v2 [<options>]"
+msgstr "test-tool serve-v2 [<opcions>]"
+
+msgid "exit immediately after advertising capabilities"
+msgstr "surt immediatament després d'anunciar les funcionalitats"
+
+msgid "test-helper simple-ipc is-active    [<name>] [<options>]"
+msgstr "test-helper simple-ipc is-active    [<nom>] [<opcions>]"
+
+msgid "test-helper simple-ipc run-daemon   [<name>] [<threads>]"
+msgstr "test-helper simple-ipc run-daemon   [<nom>] [<fils>]"
+
+msgid "test-helper simple-ipc start-daemon [<name>] [<threads>] [<max-wait>]"
+msgstr "test-helper simple-ipc start-daemon [<nom>] [<fils>] [<max-wait>]"
+
+msgid "test-helper simple-ipc stop-daemon  [<name>] [<max-wait>]"
+msgstr "test-helper simple-ipc stop-daemon  [<nom>] [<max-wait>]"
+
+msgid "test-helper simple-ipc send         [<name>] [<token>]"
+msgstr "test-helper simple-ipc send         [<nom>] [<testimoni>]"
+
+msgid "test-helper simple-ipc sendbytes    [<name>] [<bytecount>] [<byte>]"
+msgstr "test-helper simple-ipc sendbytes    [<nom>] [<bytecount>] [<byte>]"
+
+msgid ""
+"test-helper simple-ipc multiple     [<name>] [<threads>] [<bytecount>] "
+"[<batchsize>]"
+msgstr ""
+"test-helper simple-ipc multiple     [<nom>] [<fils>] [<bytecount>] "
+"[<batchsize>]"
+
+msgid "name or pathname of unix domain socket"
+msgstr "nom o nom de camí del sòcol de domini unix"
+
+msgid "named-pipe name"
+msgstr "nom del conducte amb nom"
+
+msgid "number of threads in server thread pool"
+msgstr "nombre de fils en el conjunt de fils del servidor"
+
+msgid "seconds to wait for daemon to start or stop"
+msgstr "segons a esperar que el dimoni comenci o s'aturi"
+
+msgid "number of bytes"
+msgstr "nombre d'octets"
+
+msgid "number of requests per thread"
+msgstr "nombre de peticions per fil"
+
+msgid "byte"
+msgstr "octet"
+
+msgid "ballast character"
+msgstr "caràcter de llast"
+
+msgid "token"
+msgstr "testimoni"
+
+msgid "command token to send to the server"
+msgstr "testimoni d'ordre a enviar al servidor"
+
+#, c-format
+msgid "running trailer command '%s' failed"
+msgstr "l'execució de l'ordre «trailer» «%s» ha fallat"
+
+#, c-format
+msgid "unknown value '%s' for key '%s'"
+msgstr "valor desconegut «%s» per a la clau «%s»"
+
+#, c-format
+msgid "empty trailer token in trailer '%.*s'"
+msgstr "testimoni de «trailer» buit en el «trailer» «%.*s»"
+
+#, c-format
+msgid "could not read input file '%s'"
+msgstr "no s'ha pogut llegir el fitxer d'entrada «%s»"
+
+#, c-format
+msgid "could not stat %s"
+msgstr "no s'ha pogut fer stat a %s"
+
+#, c-format
+msgid "file %s is not a regular file"
+msgstr "el fitxer %s no és un fitxer regular"
+
+#, c-format
+msgid "file %s is not writable by user"
+msgstr "el fitxer %s no és gravable per l'usuari"
+
+msgid "could not open temporary file"
+msgstr "no s'ha pogut obrir el fitxer temporal"
+
+#, c-format
+msgid "could not rename temporary file to %s"
+msgstr "no s'ha pogut canviar el nom del fitxer temporal a %s"
+
+msgid "full write to remote helper failed"
+msgstr "l'escriptura completa a l'ajudant remot ha fallat"
+
+#, c-format
+msgid "unable to find remote helper for '%s'"
+msgstr "no s'ha pogut trobar l'ajudant remot per a «%s»"
+
+msgid "can't dup helper output fd"
+msgstr "no es pot duplicar la sortida de l'ajudant «fd»"
+
+#, c-format
+msgid ""
+"unknown mandatory capability %s; this remote helper probably needs newer "
+"version of Git"
+msgstr ""
+"funcionalitat obligatòria %s desconeguda; aquest ajudant remot probablement "
+"necessita una versió més nova del Git"
+
+msgid "this remote helper should implement refspec capability"
+msgstr "aquest ajudant remot ha d'implementar la funcionalitat de refspec"
+
+#, c-format
+msgid "%s unexpectedly said: '%s'"
+msgstr "%s ha dit inesperadament «%s»"
+
+#, c-format
+msgid "%s also locked %s"
+msgstr "%s també està bloquejat %s"
+
+msgid "couldn't run fast-import"
+msgstr "no s'ha pogut executar «fast-import»"
+
+msgid "error while running fast-import"
+msgstr "error en executar la importació ràpida"
+
+#, c-format
+msgid "could not read ref %s"
+msgstr "no s'ha pogut llegir la referència %s"
+
+#, c-format
+msgid "unknown response to connect: %s"
+msgstr "resposta desconeguda en connectar: %s"
+
+msgid "setting remote service path not supported by protocol"
+msgstr "el protocol no permet establir el camí del servei remot"
+
+msgid "invalid remote service path"
+msgstr "el camí del servei remot no és vàlid"
+
+msgid "operation not supported by protocol"
+msgstr "opció no admesa pel protocol"
+
+#, c-format
+msgid "can't connect to subservice %s"
+msgstr "no es pot connectar al subservei %s"
+
+msgid "--negotiate-only requires protocol v2"
+msgstr "--negotiate-only requereix el protocol v2"
+
+msgid "'option' without a matching 'ok/error' directive"
+msgstr "«option» sense una directiva «ok/error» coincident"
+
+#, c-format
+msgid "expected ok/error, helper said '%s'"
+msgstr "s'esperava error/OK, l'ajudant ha dit «%s»"
+
+#, c-format
+msgid "helper reported unexpected status of %s"
+msgstr "l'ajudant ha informat d'un estat inesperat de %s"
+
+#, c-format
+msgid "helper %s does not support dry-run"
+msgstr "l'ajudant %s no admet dry-run"
+
+#, c-format
+msgid "helper %s does not support --signed"
+msgstr "l'ajudant %s no admet --signed"
+
+#, c-format
+msgid "helper %s does not support --signed=if-asked"
+msgstr "l'ajudant %s no admet --signed=if-asked"
+
+#, c-format
+msgid "helper %s does not support --atomic"
+msgstr "l'ajudant %s no admet --atomic"
+
+#, c-format
+msgid "helper %s does not support --%s"
+msgstr "l'ajudant %s no admet --%s"
+
+#, c-format
+msgid "helper %s does not support 'push-option'"
+msgstr "l'ajudant %s no admet «push-option»"
+
+msgid "remote-helper doesn't support push; refspec needed"
+msgstr ""
+"remot-helper no permet pujar; es necessiten especificacions de referència"
+
+#, c-format
+msgid "helper %s does not support 'force'"
+msgstr "l'ajudant %s no admet «force»"
+
+msgid "couldn't run fast-export"
+msgstr "no s'ha pogut executar l'exportació ràpida"
+
+msgid "error while running fast-export"
+msgstr "error en executar l'exportació ràpida"
+
+#, c-format
+msgid ""
+"No refs in common and none specified; doing nothing.\n"
+"Perhaps you should specify a branch.\n"
+msgstr ""
+"No hi ha referències en comú i no n'hi ha cap d'especificada.\n"
+"No es farà res. Potser hauríeu d'especificar una branca.\n"
+
+#, c-format
+msgid "unsupported object format '%s'"
+msgstr "format d'objecte no suportat «%s»"
+
+#, c-format
+msgid "malformed response in ref list: %s"
+msgstr "resposta mal formada al llistat de referències: %s"
+
+#, c-format
+msgid "read(%s) failed"
+msgstr "ha fallat la lectura(%s)"
+
+#, c-format
+msgid "write(%s) failed"
+msgstr "ha fallat l'escriptura(%s)"
+
+#, c-format
+msgid "%s thread failed"
+msgstr "%s ha fallat el fil"
+
+#, c-format
+msgid "%s thread failed to join: %s"
+msgstr "el fil %s no s'ha pogut unir: %s"
+
+#, c-format
+msgid "can't start thread for copying data: %s"
+msgstr "no es pot iniciar el fil per a copiar les dades: %s"
+
+#, c-format
+msgid "%s process failed to wait"
+msgstr "el procés %s no ha pogut esperar"
+
+#, c-format
+msgid "%s process failed"
+msgstr "el procés %s ha fallat"
+
+msgid "can't start thread for copying data"
+msgstr "no es pot iniciar el fil per a copiar dades"
+
+#, c-format
+msgid "Would set upstream of '%s' to '%s' of '%s'\n"
+msgstr "Canviaria la font de «%s» a «%s» de «%s»\n"
+
+#, c-format
+msgid "could not read bundle '%s'"
+msgstr "no s'ha pogut llegir el farcell «%s»"
+
+#, c-format
+msgid "transport: invalid depth option '%s'"
+msgstr "transport: opció de profunditat no vàlida «%s»"
+
+msgid "see protocol.version in 'git help config' for more details"
+msgstr "vegeu «protocol.version» a «git help config» per a més detalls"
+
+msgid "server options require protocol version 2 or later"
+msgstr "les opcions del servidor requereixen el protocol versió 2 o posterior"
+
+msgid "server does not support wait-for-done"
+msgstr "el servidor no admet «wait-for-done»"
+
+msgid "could not parse transport.color.* config"
+msgstr "no s'ha pogut analitzar la configuració de transport.color.*"
+
+msgid "support for protocol v2 not implemented yet"
+msgstr ""
+"encara no s'ha implementat la compatibilitat amb la versió v2 del protocol"
+
+#, c-format
+msgid "unknown value for config '%s': %s"
+msgstr "valor desconegut per al config «%s»': %s"
+
+#, c-format
+msgid "transport '%s' not allowed"
+msgstr "no es permet el transport «%s»"
+
+msgid "git-over-rsync is no longer supported"
+msgstr "git-over-rsync ja no s'admet"
+
+#, c-format
+msgid ""
+"The following submodule paths contain changes that can\n"
+"not be found on any remote:\n"
+msgstr ""
+"Els camins de submòdul següents contenen canvis que no\n"
+"es poden trobar en cap remot:\n"
+
+#, c-format
+msgid ""
+"\n"
+"Please try\n"
+"\n"
+"\tgit push --recurse-submodules=on-demand\n"
+"\n"
+"or cd to the path and use\n"
+"\n"
+"\tgit push\n"
+"\n"
+"to push them to a remote.\n"
+"\n"
+msgstr ""
+"\n"
+"Intenteu\n"
+"\n"
+"\tgit push --recurse-submodules=on-demand\n"
+"\n"
+"o feu cd al camí i useu\n"
+"\n"
+"\tgit push\n"
+"\n"
+"per a pujar-los a un remot.\n"
+
+msgid "Aborting."
+msgstr "S'està avortant."
+
+msgid "failed to push all needed submodules"
+msgstr "no s'han pogut pujar tots els submòduls necessaris"
+
+msgid "too-short tree object"
+msgstr "objecte d'arbre massa curt"
+
+msgid "malformed mode in tree entry"
+msgstr "mode mal format en entrada d'arbre"
+
+msgid "empty filename in tree entry"
+msgstr "nom de fitxer buit en una entrada d'arbre"
+
+msgid "too-short tree file"
+msgstr "fitxer d'arbre massa curt"
+
+#, c-format
+msgid ""
+"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 canvis locals als fitxers següents se sobreescriurien per a agafar:\n"
+"%%sCometeu els vostres canvis o feu «stash» abans de canviar de branca."
+
+#, c-format
+msgid ""
+"Your local changes to the following files would be overwritten by checkout:\n"
+"%%s"
+msgstr ""
+"Els canvis locals als fitxers següents se sobreescriurien per a agafar:\n"
+"%%s"
+
+#, c-format
+msgid ""
+"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 canvis locals als fitxers següents se sobreescriurien per a fusionar:\n"
+"%%sCometeu els vostres canvis o feu «stash» abans de fusionar."
+
+#, c-format
+msgid ""
+"Your local changes to the following files would be overwritten by merge:\n"
+"%%s"
+msgstr ""
+"Els canvis locals als fitxers següents se sobreescriurien per a fusionar:\n"
+"%%s"
+
+#, c-format
+msgid ""
+"Your local changes to the following files would be overwritten by %s:\n"
+"%%sPlease commit your changes or stash them before you %s."
+msgstr ""
+"Els vostres canvis locals als fitxers següents se sobreescriurien per %s:\n"
+"%%sCometeu els vostres canvis o feu «stash» abans de %s."
+
+#, c-format
+msgid ""
+"Your local changes to the following files would be overwritten by %s:\n"
+"%%s"
+msgstr ""
+"Els vostres canvis locals als fitxers següents se sobreescriurien per %s:\n"
+"%%s"
+
+#, c-format
+msgid ""
+"Updating the following directories would lose untracked files in them:\n"
+"%s"
+msgstr ""
+"En actualitzar els directoris següents perdria fitxers no seguits en el:\n"
+"%s"
+
+#, c-format
+msgid ""
+"Refusing to remove the current working directory:\n"
+"%s"
+msgstr ""
+"S'ha rebutjat suprimir el directori de treball actual:\n"
+"%s"
+
+#, c-format
+msgid ""
+"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 a "
+"agafar:\n"
+"%%sMoveu-los o elimineu-los abans de canviar de branca."
+
+#, c-format
+msgid ""
+"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 en "
+"agafar:\n"
+"%%s"
+
+#, c-format
+msgid ""
+"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 en "
+"fusionar:\n"
+"%%sMoveu-los o elimineu-los abans de fusionar."
+
+#, c-format
+msgid ""
+"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 en "
+"fusionar:\n"
+"%%s"
+
+#, c-format
+msgid ""
+"The following untracked working tree files would be removed by %s:\n"
+"%%sPlease move or remove them before you %s."
+msgstr ""
+"Els següents fitxers no seguits en l'arbre de treball s'eliminarien per %s:\n"
+"%%sMoveu-los o elimineu-los abans de %s."
+
+#, c-format
+msgid ""
+"The following untracked working tree files would be removed by %s:\n"
+"%%s"
+msgstr ""
+"Els següents fitxers no seguits en l'arbre de treball s'eliminarien per %s:\n"
+"%%s"
+
+#, c-format
+msgid ""
+"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 "
+"a agafar:\n"
+"%%sMoveu-los o elimineu-los abans de canviar de branca."
+
+#, c-format
+msgid ""
+"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 "
+"a agafar:\n"
+"%%s"
+
+#, c-format
+msgid ""
+"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 "
+"a fusionar:\n"
+"%%sMoveu-los o elimineu-los abans de fusionar."
+
+#, c-format
+msgid ""
+"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 "
+"a fusionar:\n"
+"%%s"
+
+#, c-format
+msgid ""
+"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"
+"%%sMoveu-los o elimineu-los abans de %s."
+
+#, c-format
+msgid ""
+"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"
+"%%s"
+
+#, c-format
+msgid "Entry '%s' overlaps with '%s'.  Cannot bind."
+msgstr "L'entrada «%s» encavalca amb «%s».  No es pot vincular."
+
+#, c-format
+msgid ""
+"Cannot update submodule:\n"
+"%s"
+msgstr ""
+"No es pot actualitzar el submòdul:\n"
+"%s"
+
+#, c-format
+msgid ""
+"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, malgrat els "
+"patrons dispersos:\n"
+"%s"
+
+#, c-format
+msgid ""
+"The following paths are unmerged and were left despite sparse patterns:\n"
+"%s"
+msgstr ""
+"Els camins següents no es fusionen, i es van deixar, malgrat els patrons "
+"dispersos:\n"
+"%s"
+
+#, c-format
+msgid ""
+"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 "
+"malgrat els patrons dispersos.:\n"
+"%s"
+
+#, c-format
+msgid "Aborting\n"
+msgstr "S'està avortant\n"
+
+#, c-format
+msgid ""
+"After fixing the above paths, you may want to run `git sparse-checkout "
+"reapply`.\n"
+msgstr ""
+"Després de corregir els camins anteriors és possible que vulgueu executar "
+"«git sparse-checkout reapply».\n"
+
+msgid "Updating files"
+msgstr "S'estan actualitzant els fitxers"
+
+msgid ""
+"the following paths have collided (e.g. case-sensitive paths\n"
+"on a case-insensitive filesystem) and only one from the same\n"
+"colliding group is in the working tree:\n"
+msgstr ""
+"els camins següents han col·lisionat (p. ex. camins sensibles a majúscules\n"
+"i minúscules en un sistema de fitxers que no distingeix entre majúscules i\n"
+"minúscules). Només un camí del mateix grup de col·lisió es troba a l'arbre\n"
+"de treball:\n"
+
+msgid "Updating index flags"
+msgstr "Actualitzant els indicadors d'índex"
+
+#, 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"
+
+msgid "expected flush after fetch arguments"
+msgstr "s'esperava una neteja després dels arguments del «fetch»"
+
+msgid "invalid URL scheme name or missing '://' suffix"
+msgstr "l'esquema d'URL no és vàlid o li manca el sufix «://»"
+
+#, c-format
+msgid "invalid %XX escape sequence"
+msgstr "seqüència d'escapament %XX no vàlida"
+
+msgid "missing host and scheme is not 'file:'"
+msgstr "manca la màquina i l'esquema no és «file:»"
+
+msgid "a 'file:' URL may not have a port number"
+msgstr "un URL «file:» no pot tenir número de port"
+
+msgid "invalid characters in host name"
+msgstr "hi ha caràcters no vàlids en el nom de màquina"
+
+msgid "invalid port number"
+msgstr "número de port no vàlid"
+
+msgid "invalid '..' path segment"
+msgstr "segment de camí «..» no vàlid"
+
+msgid "Fetching objects"
+msgstr "S'estan obtenint objectes"
+
+#, 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"
+
+#, 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"
+
+#, c-format
+msgid "'%s' is not a .git file, error code %d"
+msgstr "«%s» no és un fitxer .git, codi d'error %d"
+
+#, c-format
+msgid "'%s' does not point back to '%s'"
+msgstr "«%s» no assenyala de tornada a «%s»"
+
+msgid "not a directory"
+msgstr "no és en un directori"
+
+msgid ".git is not a file"
+msgstr ".git no és un fitxer"
+
+msgid ".git file broken"
+msgstr "fitxer .git malmès"
+
+msgid ".git file incorrect"
+msgstr "fitxer .git malmès"
+
+msgid "not a valid path"
+msgstr "no és un camí vàlid"
+
+msgid "unable to locate repository; .git is not a file"
+msgstr "no s'ha pogut trobar el repositori; .git no és un fitxer"
+
+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"
+
+msgid "unable to locate repository; .git file broken"
+msgstr "no s'ha pogut trobar el repositori; el fitxer .git està malmès"
+
+msgid "gitdir unreadable"
+msgstr "gitdir illegible"
+
+msgid "gitdir incorrect"
+msgstr "gitdir incorrecte"
+
+msgid "not a valid directory"
+msgstr "no és en un directori vàlid"
+
+msgid "gitdir file does not exist"
+msgstr "el fitxer gitdir no existeix"
+
+#, c-format
+msgid "unable to read gitdir file (%s)"
+msgstr "no s'ha pogut llegir el fitxer gitdir (%s)"
+
+#, c-format
+msgid "short read (expected %<PRIuMAX> bytes, read %<PRIuMAX>)"
+msgstr "lectura curta (s'esperaven %<PRIuMAX> bytes, llegits %<PRIuMAX>)"
+
+msgid "invalid gitdir file"
+msgstr "fitxer gitdir no vàlid"
+
+msgid "gitdir file points to non-existent location"
+msgstr "el fitxer gitdir indica una ubicació no existent"
+
+#, c-format
+msgid "unable to set %s in '%s'"
+msgstr "no s'han pogut establir %s en «%s»"
+
+#, c-format
+msgid "unable to unset %s in '%s'"
+msgstr "no s'ha pogut desassignar %s en «%s»"
+
+msgid "failed to set extensions.worktreeConfig setting"
+msgstr "no s'ha pogut establir el paràmetre extensions.worktreeConfig"
+
+#, c-format
+msgid "could not setenv '%s'"
+msgstr "no s'ha pogut fer setenv «%s»"
+
+#, c-format
+msgid "unable to create '%s'"
+msgstr "no s'ha pogut crear «%s»"
+
+#, c-format
+msgid "could not open '%s' for reading and writing"
+msgstr "no s'ha pogut obrir «%s» per a lectura i escriptura"
+
+#, c-format
+msgid "unable to access '%s'"
+msgstr "no s'ha pogut accedir a «%s»"
+
+msgid "unable to get current working directory"
+msgstr "no s'ha pogut obtenir el directori de treball actual"
+
+msgid "Unmerged paths:"
+msgstr "Camins sense fusionar:"
+
+msgid "  (use \"git restore --staged <file>...\" to unstage)"
+msgstr "  (useu «git restore --staged <fitxer>...» per a fer «unstage»)"
+
+#, c-format
+msgid "  (use \"git restore --source=%s --staged <file>...\" to unstage)"
+msgstr ""
+"  (useu «git restore --source=%s --staged <fitxer>...» per a fer «unstage»)"
+
+msgid "  (use \"git rm --cached <file>...\" to unstage)"
+msgstr "  (useu «git rm --cached <fitxer>...» per a fer «unstage»)"
+
+msgid "  (use \"git add <file>...\" to mark resolution)"
+msgstr "  (useu «git add <fitxer>...» per a senyalar resolució)"
+
+msgid "  (use \"git add/rm <file>...\" as appropriate to mark resolution)"
+msgstr ""
+"  (useu «git add/rm <fitxer>...» segons sigui apropiat per a senyalar "
+"resolució)"
+
+msgid "  (use \"git rm <file>...\" to mark resolution)"
+msgstr "  (useu «git rm <fitxer>...» per a senyalar resolució)"
+
+msgid "Changes to be committed:"
+msgstr "Canvis a cometre:"
+
+msgid "Changes not staged for commit:"
+msgstr "Canvis no «staged» per a cometre:"
+
+msgid "  (use \"git add <file>...\" to update what will be committed)"
+msgstr "  (useu «git add <fitxer>...» per a actualitzar què es cometrà)"
+
+msgid "  (use \"git add/rm <file>...\" to update what will be committed)"
+msgstr "  (useu «git add/rm <fitxer>...» per a actualitzar què es cometrà)"
+
+msgid ""
+"  (use \"git restore <file>...\" to discard changes in working directory)"
+msgstr ""
+"  (useu «git restore <file>...» per a descartar canvis en el directori de "
+"treball)"
+
+msgid "  (commit or discard the untracked or modified content in submodules)"
+msgstr ""
+"  (cometeu o descarteu el contingut modificat o no seguit en els submòduls)"
+
+#, c-format
+msgid "  (use \"git %s <file>...\" to include in what will be committed)"
+msgstr "  (useu «git %s <fitxer>...» per a incloure'ls en la comissió)"
+
+msgid "both deleted:"
+msgstr "suprimit per ambdós:"
+
+msgid "added by us:"
+msgstr "afegit per nosaltres:"
+
+msgid "deleted by them:"
+msgstr "suprimit per ells:"
+
+msgid "added by them:"
+msgstr "afegit per ells:"
+
+msgid "deleted by us:"
+msgstr "suprimit per nosaltres:"
+
+msgid "both added:"
+msgstr "afegit per ambdós:"
+
+msgid "both modified:"
+msgstr "modificat per ambdós:"
+
+msgid "new file:"
+msgstr "fitxer nou:"
+
+msgid "copied:"
+msgstr "copiat:"
+
+msgid "deleted:"
+msgstr "suprimit:"
+
+msgid "modified:"
+msgstr "modificat:"
+
+msgid "renamed:"
+msgstr "canviat de nom:"
+
+msgid "typechange:"
+msgstr "canviat de tipus:"
+
+msgid "unknown:"
+msgstr "desconegut:"
+
+msgid "unmerged:"
+msgstr "sense fusionar:"
+
+msgid "new commits, "
+msgstr "comissions noves, "
+
+msgid "modified content, "
+msgstr "contingut modificat, "
+
+msgid "untracked content, "
+msgstr "contingut no seguit, "
+
+#, 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"
+
+msgid "Submodules changed but not updated:"
+msgstr "Submòduls canviats però no actualitzats:"
+
+msgid "Submodule changes to be committed:"
+msgstr "Canvis de submòdul a cometre:"
+
+msgid ""
+"Do not modify or remove the line above.\n"
+"Everything below it will be ignored."
+msgstr ""
+"No modifiqueu ni elimineu la línia de dalt.\n"
+"Tot el que hi ha a sota s'ignorarà."
+
+#, c-format
+msgid ""
+"\n"
+"It took %.2f seconds to compute the branch ahead/behind values.\n"
+"You can use '--no-ahead-behind' to avoid this.\n"
+msgstr ""
+"\n"
+"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"
+
+msgid "You have unmerged paths."
+msgstr "Teniu camins sense fusionar."
+
+msgid "  (fix conflicts and run \"git commit\")"
+msgstr "  (arregleu els conflictes i executeu «git commit»)"
+
+msgid "  (use \"git merge --abort\" to abort the merge)"
+msgstr "  (useu «git merge --abort» per a avortar la fusió)"
+
+msgid "All conflicts fixed but you are still merging."
+msgstr "Tots els conflictes estan arreglats però encara esteu fusionant."
+
+msgid "  (use \"git commit\" to conclude merge)"
+msgstr "  (useu «git commit» per a concloure la fusió)"
+
+msgid "You are in the middle of an am session."
+msgstr "Esteu enmig d'una sessió am."
+
+msgid "The current patch is empty."
+msgstr "El pedaç actual està buit."
+
+msgid "  (fix conflicts and then run \"git am --continue\")"
+msgstr "  (arregleu els conflictes i després executeu «git am --continue»)"
+
+msgid "  (use \"git am --skip\" to skip this patch)"
+msgstr "  (useu «git am --skip» per a ometre aquest pedaç)"
+
+msgid ""
+"  (use \"git am --allow-empty\" to record this patch as an empty commit)"
+msgstr ""
+"  (useu «git am --allow-empty» per a enregistrar aquest pedaç com una "
+"comissió buida)"
+
+msgid "  (use \"git am --abort\" to restore the original branch)"
+msgstr "  (useu «git am --abort» per a restaurar la branca original)"
+
+msgid "git-rebase-todo is missing."
+msgstr "Manca git-rebase-todo."
+
+msgid "No commands done."
+msgstr "No s'ha fet cap ordre."
+
+#, c-format
+msgid "Last command done (%<PRIuMAX> command done):"
+msgid_plural "Last commands done (%<PRIuMAX> commands done):"
+msgstr[0] "Darrera ordre acabada (%<PRIuMAX> ordre acabada):"
+msgstr[1] "Darreres ordres acabades (%<PRIuMAX> ordres acabades):"
+
+#, c-format
+msgid "  (see more in file %s)"
+msgstr "  (vegeu més en el fitxer %s)"
+
+msgid "No commands remaining."
+msgstr "No manca cap ordre."
+
+#, c-format
+msgid "Next command to do (%<PRIuMAX> remaining command):"
+msgid_plural "Next commands to do (%<PRIuMAX> remaining commands):"
+msgstr[0] "Següent ordre a fer (%<PRIuMAX> ordre restant):"
+msgstr[1] "Següents ordres a fer (%<PRIuMAX> ordres restants):"
+
+msgid "  (use \"git rebase --edit-todo\" to view and edit)"
+msgstr "  (useu «git rebase --edit-todo» per a veure i editar)"
+
+#, c-format
+msgid "You are currently rebasing branch '%s' on '%s'."
+msgstr "Actualment esteu fent «rebase» de la branca «%s» en «%s»."
+
+msgid "You are currently rebasing."
+msgstr "Actualment esteu fent «rebase»."
+
+msgid "  (fix conflicts and then run \"git rebase --continue\")"
+msgstr "  (arregleu els conflictes i després executeu «git rebase --continue»)"
+
+msgid "  (use \"git rebase --skip\" to skip this patch)"
+msgstr "  (useu «git rebase --skip» per a ometre aquest pedaç)"
+
+msgid "  (use \"git rebase --abort\" to check out the original branch)"
+msgstr "  (useu «git rebase --abort» per a agafar la branca original)"
+
+msgid "  (all conflicts fixed: run \"git rebase --continue\")"
+msgstr ""
+"  (tots els conflictes estan arreglats: executeu «git rebase --continue»)"
+
+#, c-format
+msgid ""
+"You are currently splitting a commit while rebasing branch '%s' on '%s'."
+msgstr ""
+"Actualment esteu dividint una comissió mentre es fa «rebase» de la branca "
+"«%s» en «%s»."
+
+msgid "You are currently splitting a commit during a rebase."
+msgstr "Actualment esteu dividint una comissió durant un «rebase»."
+
+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»)"
+
+#, 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»."
+
+msgid "You are currently editing a commit during a rebase."
+msgstr "Actualment esteu editant una comissió durant un «rebase»."
+
+msgid "  (use \"git commit --amend\" to amend the current commit)"
+msgstr "  (useu «git commit --amend» per a esmenar la comissió actual)"
+
+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)"
+
+msgid "Cherry-pick currently in progress."
+msgstr "Hi ha «cherry pick» actualment en curs."
+
+#, c-format
+msgid "You are currently cherry-picking commit %s."
+msgstr "Actualment esteu fent «cherry pick» a la comissió %s."
+
+msgid "  (fix conflicts and run \"git cherry-pick --continue\")"
+msgstr "  (arregleu els conflictes i executeu «git cherry-pick --continue»)"
+
+msgid "  (run \"git cherry-pick --continue\" to continue)"
+msgstr "  (executeu «git cherry-pick --continue» per a continuar)"
+
+msgid "  (all conflicts fixed: run \"git cherry-pick --continue\")"
+msgstr ""
+"  (tots els conflictes estan arreglats: executeu «git cherry-pick --"
+"continue»)"
+
+msgid "  (use \"git cherry-pick --skip\" to skip this patch)"
+msgstr "  (useu «git cherry-pick --skip» per a ometre aquest pedaç)"
+
+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»)"
+
+msgid "Revert currently in progress."
+msgstr "Una reversió està actualment en curs."
+
+#, c-format
+msgid "You are currently reverting commit %s."
+msgstr "Actualment esteu revertint la comissió %s."
+
+msgid "  (fix conflicts and run \"git revert --continue\")"
+msgstr "  (arregleu els conflictes i executeu «git revert --continue»)"
+
+msgid "  (run \"git revert --continue\" to continue)"
+msgstr "  (executeu «git revert --continue» per a continuar)"
+
+msgid "  (all conflicts fixed: run \"git revert --continue\")"
+msgstr ""
+"  (tots els conflictes estan arreglats: executeu «git revert --continue»)"
+
+msgid "  (use \"git revert --skip\" to skip this patch)"
+msgstr "  (useu «git revert --skip» per a ometre aquest pedaç)"
+
+msgid "  (use \"git revert --abort\" to cancel the revert operation)"
+msgstr "  (useu «git revert --abort» per a cancel·lar l'operació de reversió)"
+
+#, c-format
+msgid "You are currently bisecting, started from branch '%s'."
+msgstr "Actualment esteu bisecant, heu començat des de la branca «%s»."
+
+msgid "You are currently bisecting."
+msgstr "Actualment esteu bisecant."
+
+msgid "  (use \"git bisect reset\" to get back to the original branch)"
+msgstr "  (useu «git bisect reset» per a tornar a la branca original)"
+
+msgid "You are in a sparse checkout."
+msgstr "Esteu en un «sparse-checkout»."
+
+#, c-format
+msgid "You are in a sparse checkout with %d%% of tracked files present."
+msgstr "Esteu en un «sparse-checkout» amb un %d%% de fitxers seguits presents."
+
+msgid "On branch "
+msgstr "En la branca "
+
+msgid "interactive rebase in progress; onto "
+msgstr "«rebase» interactiu en curs; sobre "
+
+msgid "rebase in progress; onto "
+msgstr "«rebase» en curs; sobre "
+
+msgid "HEAD detached at "
+msgstr "HEAD separat a "
+
+msgid "HEAD detached from "
+msgstr "HEAD separat des de "
+
+msgid "Not currently on any branch."
+msgstr "Actualment no s'és en cap branca."
+
+msgid "Initial commit"
+msgstr "Comissió inicial"
+
+msgid "No commits yet"
+msgstr "No s'ha fet cap comissió encara"
+
+msgid "Untracked files"
+msgstr "Fitxers no seguits"
+
+msgid "Ignored files"
+msgstr "Fitxers ignorats"
+
+#, c-format
+msgid ""
+"It took %.2f seconds to enumerate untracked files. 'status -uno'\n"
+"may speed it up, but you have to be careful not to forget to add\n"
+"new files yourself (see 'git help status')."
+msgstr ""
+"S'ha trigat %.2f segons enumerar els fitxers no seguits.\n"
+"«status -uno» pot accelerar-ho, però heu d'anar amb compte de no\n"
+"oblidar-vos d'afegir fitxers nous vosaltres mateixos (vegeu\n"
+"«git help status»)."
+
+#, c-format
+msgid "Untracked files not listed%s"
+msgstr "Els fitxers no seguits no estan llistats%s"
+
+msgid " (use -u option to show untracked files)"
+msgstr " (useu l'opció -u per a mostrar els fitxers no seguits)"
+
+msgid "No changes"
+msgstr "Sense canvis"
+
+#, 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"
+
+#, c-format
+msgid "no changes added to commit\n"
+msgstr "no hi ha canvis afegits a cometre\n"
+
+#, c-format
+msgid ""
+"nothing added to commit but untracked files present (use \"git add\" to "
+"track)\n"
+msgstr ""
+"no hi ha res afegit a cometre però hi ha fitxers no seguits (useu «git add» "
+"per a seguir-los)\n"
+
+#, 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"
+
+#, 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"
+
+#, c-format
+msgid "nothing to commit\n"
+msgstr "no hi ha res a cometre\n"
+
+#, 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"
+
+#, c-format
+msgid "nothing to commit, working tree clean\n"
+msgstr "no hi ha res a cometre, l'arbre de treball està net\n"
+
+msgid "No commits yet on "
+msgstr "No s'ha fet cap comissió encara a "
+
+msgid "HEAD (no branch)"
+msgstr "HEAD (sense branca)"
+
+msgid "different"
+msgstr "diferent"
+
+msgid "behind "
+msgstr "darrere "
+
+msgid "ahead "
+msgstr "davant per "
+
+#. TRANSLATORS: the action is e.g. "pull with rebase"
+#, c-format
+msgid "cannot %s: You have unstaged changes."
+msgstr "no es pot %s: Teniu canvis «unstaged»."
+
+msgid "additionally, your index contains uncommitted changes."
+msgstr "addicionalment, el vostre índex conté canvis sense cometre."
+
+#, c-format
+msgid "cannot %s: Your index contains uncommitted changes."
+msgstr "no es pot %s: El vostre índex conté canvis sense cometre."
+
 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"
-" a fusionar"
+"Error: Els vostres canvis locals als fitxers següents se sobreescriurien per "
+"a fusionar"
 
-#: git-merge-octopus.sh:61
 msgid "Automated merge did not work."
 msgstr "La fusió automàtica no ha funcionat."
 
-#: git-merge-octopus.sh:62
 msgid "Should not be doing an octopus."
 msgstr "No s'ha de fer un «octopus»."
 
-#: git-merge-octopus.sh:73
 #, sh-format
 msgid "Unable to find common commit with $pretty_name"
 msgstr "No s'ha pogut trobar cap comissió en comú amb $pretty_name"
 
-#: git-merge-octopus.sh:77
 #, sh-format
 msgid "Already up to date with $pretty_name"
 msgstr "Ja està al dia amb $pretty_name"
 
-#: git-merge-octopus.sh:89
 #, sh-format
 msgid "Fast-forwarding to: $pretty_name"
 msgstr "S'està avançant ràpidament a: $pretty_name"
 
-#: git-merge-octopus.sh:97
 #, sh-format
 msgid "Trying simple merge with $pretty_name"
 msgstr "S'està intentant una fusió simple amb $pretty_name"
 
-#: git-merge-octopus.sh:102
 msgid "Simple merge did not work, trying automatic merge."
 msgstr ""
 "La fusió simple no ha funcionat, s'està intentant una fusió automàtica."
 
-#: git-sh-setup.sh:89 git-sh-setup.sh:94
 #, sh-format
 msgid "usage: $dashless $USAGE"
 msgstr "ús: $dashless $USAGE"
 
-#: git-sh-setup.sh:182
 #, sh-format
 msgid "Cannot chdir to $cdup, the toplevel of the working tree"
 msgstr ""
 "No es pot canviar de directori a $cdup, el nivell superior de l'arbre de "
 "treball"
 
-#: git-sh-setup.sh:191 git-sh-setup.sh:198
 #, sh-format
 msgid "fatal: $program_name cannot be used without a working tree."
 msgstr "fatal: no es pot usar $program_name sense un arbre de treball."
 
-#: git-sh-setup.sh:212
 msgid "Cannot rewrite branches: You have unstaged changes."
 msgstr "No es poden reescriure branques: Teniu canvis «unstaged»."
 
-#: git-sh-setup.sh:215
 #, sh-format
 msgid "Cannot $action: You have unstaged changes."
 msgstr "No es pot $action: Teniu canvis «unstaged»."
 
-#: git-sh-setup.sh:226
 #, 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:228
 msgid "Additionally, your index contains uncommitted changes."
 msgstr "Addicionalment, el vostre índex conté canvis sense cometre."
 
-#: git-sh-setup.sh:348
 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:353
 msgid "Unable to determine absolute path of git directory"
 msgstr "No s'ha pogut determinar el camí absolut del directori de git"
 
 #. TRANSLATORS: you can adjust this to align "git add -i" status menu
-#: git-add--interactive.perl:212
 #, perl-format
 msgid "%12s %12s %s"
 msgstr "%12s %12s %s"
 
-#: git-add--interactive.perl:632
 #, perl-format
 msgid "touched %d path\n"
 msgid_plural "touched %d paths\n"
 msgstr[0] "modificat %d camí\n"
 msgstr[1] "modificat %d camins\n"
 
-#: git-add--interactive.perl:1056
 msgid ""
 "If the patch applies cleanly, the edited hunk will immediately be\n"
 "marked for staging."
@@ -26515,7 +21559,6 @@ msgstr ""
 "Si el pedaç s'aplica correctament, el tros editat es marcarà immediatament\n"
 "per «staging»."
 
-#: git-add--interactive.perl:1059
 msgid ""
 "If the patch applies cleanly, the edited hunk will immediately be\n"
 "marked for stashing."
@@ -26523,7 +21566,6 @@ msgstr ""
 "Si el pedaç s'aplica correctament, el tros editat es marcarà immediatament\n"
 "per «stashing»."
 
-#: git-add--interactive.perl:1062
 msgid ""
 "If the patch applies cleanly, the edited hunk will immediately be\n"
 "marked for unstaging."
@@ -26531,8 +21573,6 @@ msgstr ""
 "Si el pedaç s'aplica correctament, el tros editat es marcarà immediatament\n"
 "per «unstaging»."
 
-#: git-add--interactive.perl:1065 git-add--interactive.perl:1074
-#: git-add--interactive.perl:1080
 msgid ""
 "If the patch applies cleanly, the edited hunk will immediately be\n"
 "marked for applying."
@@ -26540,8 +21580,6 @@ msgstr ""
 "Si el pedaç s'aplica correctament, el tros editat es marcarà immediatament\n"
 "per a aplicar-se."
 
-#: git-add--interactive.perl:1068 git-add--interactive.perl:1071
-#: git-add--interactive.perl:1077
 msgid ""
 "If the patch applies cleanly, the edited hunk will immediately be\n"
 "marked for discarding."
@@ -26549,12 +21587,10 @@ msgstr ""
 "Si el pedaç s'aplica correctament, el tros editat es marcarà immediatament\n"
 "per a descartar-se."
 
-#: git-add--interactive.perl:1114
 #, perl-format
 msgid "failed to open hunk edit file for writing: %s"
 msgstr "s'ha produït un error en escriure al fitxer d'edició del tros: %s"
 
-#: git-add--interactive.perl:1121
 #, perl-format
 msgid ""
 "---\n"
@@ -26567,12 +21603,10 @@ msgstr ""
 "Per a eliminar les línies «%s», suprimiu-les.\n"
 "Les línies que comencin per %s s'eliminaran.\n"
 
-#: git-add--interactive.perl:1143
 #, perl-format
 msgid "failed to open hunk edit file for reading: %s"
 msgstr "s'ha produït un error en llegir al fitxer d'edició del tros: %s"
 
-#: git-add--interactive.perl:1253
 msgid ""
 "y - stage this hunk\n"
 "n - do not stage this hunk\n"
@@ -26586,7 +21620,6 @@ msgstr ""
 "a - fes «stage» d'aquest tros i tota la resta de trossos del fitxer\n"
 "d - no facis «stage» d'aquest tros o de cap altre restant del fitxer"
 
-#: git-add--interactive.perl:1259
 msgid ""
 "y - stash this hunk\n"
 "n - do not stash this hunk\n"
@@ -26600,7 +21633,6 @@ msgstr ""
 "a - fes «stash» d'aquest tros i tota la resta de trossos del fitxer\n"
 "d - no facis «stash» d'aquest tros o de cap altre restant del fitxer"
 
-#: git-add--interactive.perl:1265
 msgid ""
 "y - unstage this hunk\n"
 "n - do not unstage this hunk\n"
@@ -26614,7 +21646,6 @@ msgstr ""
 "a - fes «unstage» d'aquest tros i tota la resta de trossos del fitxer\n"
 "d - no facis «unstage» d'aquest tros o de cap altre restant del fitxer"
 
-#: git-add--interactive.perl:1271
 msgid ""
 "y - apply this hunk to index\n"
 "n - do not apply this hunk to index\n"
@@ -26628,7 +21659,6 @@ msgstr ""
 "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"
 
-#: git-add--interactive.perl:1277 git-add--interactive.perl:1295
 msgid ""
 "y - discard this hunk from worktree\n"
 "n - do not discard this hunk from worktree\n"
@@ -26642,7 +21672,6 @@ msgstr ""
 "a - descarta aquest tros i tots els trossos posteriors en el fitxer\n"
 "d - no descartis aquest tros ni cap dels trossos posteriors en el fitxer"
 
-#: git-add--interactive.perl:1283
 msgid ""
 "y - discard this hunk from index and worktree\n"
 "n - do not discard this hunk from index and worktree\n"
@@ -26656,7 +21685,6 @@ msgstr ""
 "a - descarta aquest tros i tots els trossos posteriors en el fitxer\n"
 "d - no descartis aquest tros ni cap dels trossos posteriors en el fitxer"
 
-#: git-add--interactive.perl:1289
 msgid ""
 "y - apply this hunk to index and worktree\n"
 "n - do not apply this hunk to index and worktree\n"
@@ -26670,7 +21698,6 @@ msgstr ""
 "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"
 
-#: git-add--interactive.perl:1301
 msgid ""
 "y - apply this hunk to worktree\n"
 "n - do not apply this hunk to worktree\n"
@@ -26684,7 +21711,6 @@ msgstr ""
 "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"
 
-#: git-add--interactive.perl:1316
 msgid ""
 "g - select a hunk to go to\n"
 "/ - search for a hunk matching the given regex\n"
@@ -26706,154 +21732,126 @@ msgstr ""
 "e - edita manualment el tros actual\n"
 "? - mostra l'ajuda\n"
 
-#: git-add--interactive.perl:1347
 msgid "The selected hunks do not apply to the index!\n"
 msgstr "Els trossos seleccionats no apliquen a l'índex\n"
 
-#: git-add--interactive.perl:1362
 #, perl-format
 msgid "ignoring unmerged: %s\n"
 msgstr "s'està ignorant %s no fusionat\n"
 
-#: git-add--interactive.perl:1481
 #, perl-format
 msgid "Apply mode change to worktree [y,n,q,a,d%s,?]? "
 msgstr "Aplica el canvi de mode a l'arbre de treball [y,n,q,a,d%s,?]? "
 
-#: git-add--interactive.perl:1482
 #, perl-format
 msgid "Apply deletion to worktree [y,n,q,a,d%s,?]? "
 msgstr "Aplica la supressió a l'arbre de treball [y,n,q,a,d%s,?]? "
 
-#: git-add--interactive.perl:1483
 #, perl-format
 msgid "Apply addition to worktree [y,n,q,a,d%s,?]? "
 msgstr "Aplica l'addició a l'arbre de treball [y,n,q,a,d%s,?]? "
 
-#: git-add--interactive.perl:1484
 #, perl-format
 msgid "Apply this hunk to worktree [y,n,q,a,d%s,?]? "
 msgstr "Aplica aquest tros a l'arbre de treball [y,n,q,a,d%s,?]? "
 
-#: git-add--interactive.perl:1601
 msgid "No other hunks to goto\n"
 msgstr "No hi ha altres trossos on anar-hi\n"
 
-#: git-add--interactive.perl:1619
 #, perl-format
 msgid "Invalid number: '%s'\n"
 msgstr "Número no vàlid: «%s»\n"
 
-#: git-add--interactive.perl:1624
 #, perl-format
 msgid "Sorry, only %d hunk available.\n"
 msgid_plural "Sorry, only %d hunks available.\n"
 msgstr[0] "Només %d tros disponible.\n"
 msgstr[1] "Només %d trossos disponibles.\n"
 
-#: git-add--interactive.perl:1659
 msgid "No other hunks to search\n"
 msgstr "No hi ha cap altre tros a cercar\n"
 
-#: git-add--interactive.perl:1676
 #, perl-format
 msgid "Malformed search regexp %s: %s\n"
 msgstr "Expressió regular de cerca mal formada %s: %s\n"
 
-#: git-add--interactive.perl:1686
 msgid "No hunk matches the given pattern\n"
 msgstr "No hi ha trossos que coincideixin amb el patró donat\n"
 
-#: git-add--interactive.perl:1698 git-add--interactive.perl:1720
 msgid "No previous hunk\n"
 msgstr "Sense tros previ\n"
 
-#: git-add--interactive.perl:1707 git-add--interactive.perl:1726
 msgid "No next hunk\n"
 msgstr "No hi ha tros següent\n"
 
-#: git-add--interactive.perl:1732
 msgid "Sorry, cannot split this hunk\n"
 msgstr "No es pot dividir aquest tros\n"
 
-#: git-add--interactive.perl:1738
 #, perl-format
 msgid "Split into %d hunk.\n"
 msgid_plural "Split into %d hunks.\n"
 msgstr[0] "Divideix en %d tros.\n"
 msgstr[1] "Divideix en %d trossos.\n"
 
-#: git-add--interactive.perl:1748
 msgid "Sorry, cannot edit this hunk\n"
 msgstr "No es pot editar aquest tros\n"
 
 #. TRANSLATORS: please do not translate the command names
 #. 'status', 'update', 'revert', etc.
-#: git-add--interactive.perl:1813
 msgid ""
 "status        - show paths with changes\n"
 "update        - add working tree state to the staged set of changes\n"
 "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:1830 git-add--interactive.perl:1842
-#: git-add--interactive.perl:1845 git-add--interactive.perl:1852
-#: git-add--interactive.perl:1855 git-add--interactive.perl:1862
-#: git-add--interactive.perl:1866 git-add--interactive.perl:1872
 msgid "missing --"
 msgstr "manca --"
 
-#: git-add--interactive.perl:1868
 #, perl-format
 msgid "unknown --patch mode: %s"
 msgstr "desconegut --patch mode: %s"
 
-#: git-add--interactive.perl:1874 git-add--interactive.perl:1880
 #, perl-format
 msgid "invalid argument %s, expecting --"
 msgstr "argument %s no vàlid, s'esperava --"
 
-#: git-send-email.perl:159
 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:166 git-send-email.perl:172
 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:244
 #, perl-format
 msgid "fatal: command '%s' died with exit code %d"
 msgstr "fatal: l'ordre «%s» ha mort amb el codi de sortida %d"
 
-#: git-send-email.perl:257
 msgid "the editor exited uncleanly, aborting everything"
 msgstr "l'editor no ha sortit correctament, avortant-ho tot"
 
-#: git-send-email.perl:346
 #, 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:351
 #, perl-format
 msgid "'%s.final' contains the composed email.\n"
 msgstr "«%s.final» conté el correu redactat.\n"
 
-#: git-send-email.perl:484
 msgid "--dump-aliases incompatible with other options\n"
 msgstr "--dump-aliases és incompatible amb altres opcions\n"
 
-#: git-send-email.perl:561
 msgid ""
 "fatal: found configuration options for 'sendmail'\n"
 "git-send-email is configured with the sendemail.* options - note the 'e'.\n"
@@ -26864,11 +21862,9 @@ msgstr ""
 "la «e». Establiu sendemail.forbidSendmailVariables a false per a desactivar\n"
 "la comprovació.\n"
 
-#: git-send-email.perl:566 git-send-email.perl:782
 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:569
 msgid ""
 "`batch-size` and `relogin` must be specified together (via command-line or "
 "configuration option)\n"
@@ -26876,37 +21872,30 @@ msgstr ""
 "«batch-size» i «relogin» s'han d'especificar junts (a través de la línia "
 "d'ordres o l'opció de configuració)\n"
 
-#: git-send-email.perl:582
 #, perl-format
 msgid "Unknown --suppress-cc field: '%s'\n"
 msgstr "Camp --suppress-cc desconegut: «%s»\n"
 
-#: git-send-email.perl:613
 #, perl-format
 msgid "Unknown --confirm setting: '%s'\n"
 msgstr "Paràmetre --confirm desconegut: «%s»\n"
 
-#: git-send-email.perl:653
 #, 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:655
 #, perl-format
 msgid "warning: `:include:` not supported: %s\n"
 msgstr "avís: «:include:» no s'admet: %s\n"
 
-#: git-send-email.perl:657
 #, 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:662
 #, 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:747
 #, perl-format
 msgid ""
 "File '%s' exists but it could also be the range of commits\n"
@@ -26921,12 +21910,10 @@ msgstr ""
 "    * 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:768
 #, 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:803
 msgid ""
 "\n"
 "No patch files specified!\n"
@@ -26936,17 +21923,14 @@ msgstr ""
 "No s'han especificat fitxers de pedaç\n"
 "\n"
 
-#: git-send-email.perl:816
 #, perl-format
 msgid "No subject line in %s?"
 msgstr "Sense assumpte a %s?"
 
-#: git-send-email.perl:827
 #, 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:838
 msgid ""
 "Lines beginning in \"GIT:\" will be removed.\n"
 "Consider including an overall diffstat or table of contents\n"
@@ -26960,27 +21944,22 @@ msgstr ""
 "\n"
 "Esborreu el contingut del cos si no voleu enviar cap resum.\n"
 
-#: git-send-email.perl:862
 #, perl-format
 msgid "Failed to open %s: %s"
 msgstr "S'ha produït un error en obrir %s: %s"
 
-#: git-send-email.perl:879
 #, 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:922
 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:971
 #, 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:1026
 msgid ""
 "The following files are 8bit, but do not declare a Content-Transfer-"
 "Encoding.\n"
@@ -26988,38 +21967,34 @@ msgstr ""
 "Els fitxers següents són 8bit, però no declaren un Content-Transfer-"
 "Encoding.\n"
 
-#: git-send-email.perl:1031
 msgid "Which 8bit encoding should I declare [UTF-8]? "
 msgstr "Quina codificació de 8 bits hauria de declarar [UTF-8]? "
 
-#: git-send-email.perl:1039
 #, 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:1058
 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:1076
 #, 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:1088
 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:1150 git-send-email.perl:1158
 #, 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"
@@ -27027,16 +22002,13 @@ msgstr "error: no s'ha pogut extreure una adreça vàlida de: %s\n"
 #. 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:1162
 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:1482
 #, perl-format
 msgid "CA path \"%s\" does not exist"
 msgstr "el camí CA «%s» no existeix"
 
-#: git-send-email.perl:1565
 msgid ""
 "    The Cc list above has been expanded by additional\n"
 "    addresses found in the patch commit message. By default\n"
@@ -27063,125 +22035,105 @@ msgstr ""
 #. 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:1580
 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:1583
 msgid "Send this email reply required"
 msgstr "Requereix resposta en enviar el correu"
 
-#: git-send-email.perl:1617
 msgid "The required SMTP server is not properly defined."
 msgstr "El servidor SMTP requerit no està correctament definit."
 
-#: git-send-email.perl:1664
 #, perl-format
 msgid "Server does not support STARTTLS! %s"
 msgstr "El servidor no admet STARTTLS! %s"
 
-#: git-send-email.perl:1669 git-send-email.perl:1673
 #, perl-format
 msgid "STARTTLS failed! %s"
 msgstr "STARTTLS ha fallat! %s"
 
-#: git-send-email.perl:1682
 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:1700
 #, perl-format
 msgid "Failed to send %s\n"
 msgstr "S'ha produït un error en enviar %s\n"
 
-#: git-send-email.perl:1703
 #, perl-format
 msgid "Dry-Sent %s\n"
 msgstr "Simulació d'enviament %s\n"
 
-#: git-send-email.perl:1703
 #, perl-format
 msgid "Sent %s\n"
 msgstr "Enviat %s\n"
 
-#: git-send-email.perl:1705
 msgid "Dry-OK. Log says:\n"
 msgstr "Simulació de correcte. El registre diu:\n"
 
-#: git-send-email.perl:1705
 msgid "OK. Log says:\n"
 msgstr "Correcte. El registre diu: \n"
 
-#: git-send-email.perl:1724
 msgid "Result: "
 msgstr "Resultat: "
 
-#: git-send-email.perl:1727
 msgid "Result: OK\n"
 msgstr "Resultat: correcte\n"
 
-#: git-send-email.perl:1744
 #, perl-format
 msgid "can't open file %s"
 msgstr "no es pot obrir el fitxer %s"
 
-#: git-send-email.perl:1792 git-send-email.perl:1812
 #, 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:1798
 #, 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:1855
 #, 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:1890
 #, 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:2009
 #, perl-format
 msgid "(%s) Could not execute '%s'"
 msgstr "(%s) no s'ha pogut executar «%s»"
 
-#: git-send-email.perl:2016
 #, 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:2020
 #, 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:2050
 msgid "cannot send message as 7bit"
 msgstr "no es pot enviar el missatge en 7 bits"
 
-#: git-send-email.perl:2058
 msgid "invalid transfer encoding"
 msgstr "codificació de transferència no vàlida"
 
-#: git-send-email.perl:2099
-#, perl-format, fuzzy
-msgid "fatal: %s: rejected by %s hook\n"
-msgstr "fatal: percentatges: rebutjats per cents fatal"
+#, fuzzy, perl-format
+msgid ""
+"fatal: %s: rejected by %s hook\n"
+"%s\n"
+"warning: no patches were sent\n"
+msgstr ""
+"fatal: %s: rebutjat pel lligam sendemail-validate\n"
+"%s\n"
+"avís: no s'ha enviat cap pedaç\n"
 
-#: git-send-email.perl:2111 git-send-email.perl:2164 git-send-email.perl:2174
 #, perl-format
 msgid "unable to open %s: %s\n"
 msgstr "no s'ha pogut obrir %s: %s\n"
 
-#: git-send-email.perl:2114
 #, perl-format
 msgid ""
 "fatal: %s:%d is longer than 998 characters\n"
@@ -27190,17 +22142,47 @@ msgstr ""
 "fatal: %s:%d té més de 998 caràcters\n"
 "avís: no s'ha enviat cap pedaç\n"
 
-#: git-send-email.perl:2132
 #, 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:2136
 #, perl-format
 msgid "Do you really want to send %s? [y|N]: "
 msgstr "Esteu segur que voleu enviar %s? [y|N]: "
 
+#~ msgid "--preserve-merges was replaced by --rebase-merges"
+#~ msgstr "--preserve-merges ha estat substituït per --rebase-merges"
+
+#, c-format
+#~ msgid ""
+#~ "CRLF will be replaced by LF in %s.\n"
+#~ "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"
+
+#, c-format
+#~ msgid ""
+#~ "LF will be replaced by CRLF in %s.\n"
+#~ "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"
+
+#, c-format
+#~ msgid "error reading section header '%s'"
+#~ msgstr "error en llegir la capçalera de la secció «%s»"
+
+#~ msgid "load_reverse_index: could not open pack"
+#~ msgstr "load_reverse_index: no s'ha pogut obrir el paquet"
+
+#, perl-format
+#~ msgid "fatal: %s: rejected by %s hook\n"
+#~ msgstr "fatal: %s: rebutjat pel lligam %s\n"
+
 #~ msgid "git archive --list"
 #~ msgstr "git archive --list"
 
@@ -27228,11 +22210,11 @@ msgstr "Esteu segur que voleu enviar %s? [y|N]: "
 #~ msgstr "Valor no vàlid per --show-current-patch: %s"
 
 #~ 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-new]"
+#~ "git bisect--helper --bisect-terms [--term-good | --term-old | --term-bad "
+#~ "| --term-new]"
 
 #~ msgid "git bisect--helper --bisect-next"
 #~ msgstr "git bisect--helper --bisect-next"
@@ -27248,11 +22230,11 @@ msgstr "Esteu segur que voleu enviar %s? [y|N]: "
 #~ msgstr "valor no vàlid per a «blame.coloring»"
 
 #~ 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>"
 
 #~ msgid "show object type"
 #~ msgstr "mostra el tipus de l'objecte"
@@ -27262,7 +22244,8 @@ msgstr "Esteu segur que voleu enviar %s? [y|N]: "
 
 #~ 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"
+#~ "mostra la informació i contingut dels objectes rebuts de l'entrada "
+#~ "estàndard"
 
 #~ msgid "show info about objects fed from the standard input"
 #~ msgstr "mostra informació sobre els objectes rebuts de l'entrada estàndard"
@@ -27293,8 +22276,10 @@ msgstr "Esteu segur que voleu enviar %s? [y|N]: "
 #~ msgid "Option -m cannot be combined with -c/-C/-F."
 #~ msgstr "l'opció -m no es pot combinar amb -c/-C/-F/."
 
-#~ 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."
+#~ 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."
 
 #~ msgid "git count-objects [-v] [-H | --human-readable]"
 #~ msgstr "git count-objects [-v] [-H | --human-readable]"
@@ -27374,9 +22359,12 @@ msgstr "Esteu segur que voleu enviar %s? [y|N]: "
 #~ "to make this the default.\n"
 #~ msgstr ""
 #~ "\n"
-#~ "S'ha trigat %.2f segons a enumerar els canvis «unstaged» després del reinici.\n"
-#~ "Podeu utilitzar «--quiet» per a evitar-ho. Establiu el paràmetre de configuració\n"
-#~ "reset.quiet a true per a fer que aquesta configuració sigui predeterminada.\n"
+#~ "S'ha trigat %.2f segons a enumerar els canvis «unstaged» després del "
+#~ "reinici.\n"
+#~ "Podeu utilitzar «--quiet» per a evitar-ho. Establiu el paràmetre de "
+#~ "configuració\n"
+#~ "reset.quiet a true per a fer que aquesta configuració sigui "
+#~ "predeterminada.\n"
 
 #~ msgid "git sparse-checkout list"
 #~ msgstr "git sparse-checkout list"
@@ -27419,8 +22407,8 @@ msgstr "Esteu segur que voleu enviar %s? [y|N]: "
 
 #~ msgid "overrides update mode in case the repository is a fresh clone"
 #~ msgstr ""
-#~ "sobreescriu el mode d'actualització en cas que el repositori sigui un clon "
-#~ "nou"
+#~ "sobreescriu el mode d'actualització en cas que el repositori sigui un "
+#~ "clon nou"
 
 #~ msgid "depth for shallow fetch"
 #~ msgstr "profunditat per a les obtencions superficials"
@@ -27451,8 +22439,8 @@ msgstr "Esteu segur que voleu enviar %s? [y|N]: "
 
 #, sh-format
 #~ msgid ""
-#~ "Unable to find current ${remote_name}/${branch} revision in submodule path "
-#~ "'$sm_path'"
+#~ "Unable to find current ${remote_name}/${branch} revision in submodule "
+#~ "path '$sm_path'"
 #~ msgstr ""
 #~ "No s'ha pogut trobar la revisió actual de ${remote_name}/${branch} en el "
 #~ "camí de submòdul «$sm_path»"
@@ -27462,13 +22450,3 @@ msgstr "Esteu segur que voleu enviar %s? [y|N]: "
 #~ msgstr ""
 #~ "S'ha produït un error en recórrer recursivament dins del camí de submòdul "
 #~ "«$displaypath»"
-
-#, perl-format
-#~ msgid ""
-#~ "fatal: %s: rejected by sendemail-validate hook\n"
-#~ "%s\n"
-#~ "warning: no patches were sent\n"
-#~ msgstr ""
-#~ "fatal: %s: rebutjat pel lligam sendemail-validate\n"
-#~ "%s\n"
-#~ "avís: no s'ha enviat cap pedaç\n"
diff --git a/po/de.po b/po/de.po
index ef04b54370..76d6d3bea7 100644
--- a/po/de.po
+++ b/po/de.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Git\n"
 "Report-Msgid-Bugs-To: Git Mailing List <git@vger.kernel.org>\n"
-"POT-Creation-Date: 2022-04-13 14:52+0800\n"
-"PO-Revision-Date: 2022-04-10 15:07+0200\n"
+"POT-Creation-Date: 2022-06-21 19:57+0000\n"
+"PO-Revision-Date: 2022-06-20 21:17+0200\n"
 "Last-Translator: Matthias Rüster <matthias.ruester@gmail.com>\n"
 "Language-Team: Matthias Rüster <matthias.ruester@gmail.com>\n"
 "Language: de\n"
@@ -17,239 +17,177 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n!=1);\n"
-"X-Generator: Poedit 3.0.1\n"
+"X-Generator: Poedit 3.1\n"
 
-#: add-interactive.c:382
 #, c-format
 msgid "Huh (%s)?"
 msgstr "Wie bitte (%s)?"
 
-#: add-interactive.c:535 add-interactive.c:836 reset.c:136 sequencer.c:3505
-#: sequencer.c:3970 sequencer.c:4127 builtin/rebase.c:1261
-#: builtin/rebase.c:1671
 msgid "could not read index"
 msgstr "Index konnte nicht gelesen werden"
 
-#: add-interactive.c:590 git-add--interactive.perl:269
-#: git-add--interactive.perl:294
 msgid "binary"
 msgstr "Binär"
 
-#: add-interactive.c:648 git-add--interactive.perl:278
-#: git-add--interactive.perl:332
 msgid "nothing"
 msgstr "Nichts"
 
-#: add-interactive.c:649 git-add--interactive.perl:314
-#: git-add--interactive.perl:329
 msgid "unchanged"
 msgstr "unverändert"
 
-#: add-interactive.c:686 git-add--interactive.perl:641
 msgid "Update"
 msgstr "Aktualisieren"
 
-#: add-interactive.c:703 add-interactive.c:891
 #, c-format
 msgid "could not stage '%s'"
 msgstr "Konnte '%s' nicht zum Commit vormerken."
 
-#: add-interactive.c:709 add-interactive.c:898 reset.c:160 sequencer.c:3709
 msgid "could not write index"
 msgstr "konnte Index nicht schreiben"
 
-#: add-interactive.c:712 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:730 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:735 apply.c:4133 builtin/checkout.c:311
-#: builtin/reset.c:167
 #, c-format
 msgid "make_cache_entry failed for path '%s'"
 msgstr "make_cache_entry für Pfad '%s' fehlgeschlagen"
 
-#: add-interactive.c:765 git-add--interactive.perl:653
 msgid "Revert"
 msgstr "Revert"
 
-#: add-interactive.c:781
 msgid "Could not parse HEAD^{tree}"
 msgstr "Konnte HEAD^{tree} nicht parsen."
 
-#: add-interactive.c:819 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:870 git-add--interactive.perl:693
 #, c-format
 msgid "No untracked files.\n"
 msgstr "Keine unversionierten Dateien.\n"
 
-#: add-interactive.c:874 git-add--interactive.perl:687
 msgid "Add untracked"
 msgstr "Unversionierte Dateien hinzufügen"
 
-#: add-interactive.c:901 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:931
 #, c-format
 msgid "ignoring unmerged: %s"
 msgstr "Ignoriere nicht zusammengeführte Datei: %s"
 
-#: add-interactive.c:943 add-patch.c:1758 git-add--interactive.perl:1371
 #, c-format
 msgid "Only binary files changed.\n"
 msgstr "Nur Binärdateien geändert.\n"
 
-#: add-interactive.c:945 add-patch.c:1756 git-add--interactive.perl:1373
 #, c-format
 msgid "No changes.\n"
 msgstr "Keine Änderungen.\n"
 
-#: add-interactive.c:949 git-add--interactive.perl:1381
 msgid "Patch update"
 msgstr "Patch Aktualisierung"
 
-#: add-interactive.c:988 git-add--interactive.perl:1794
 msgid "Review diff"
 msgstr "Diff überprüfen"
 
-#: add-interactive.c:1016
 msgid "show paths with changes"
 msgstr "Zeige Pfade mit Änderungen"
 
-#: add-interactive.c:1018
 msgid "add working tree state to the staged set of changes"
 msgstr "Zustand des Arbeitsverzeichnisses zum Commit vormerken"
 
-#: add-interactive.c:1020
 msgid "revert staged set of changes back to the HEAD version"
 msgstr "Zum Commit vorgemerkte Änderungen auf HEAD-Version zurücksetzen"
 
-#: add-interactive.c:1022
 msgid "pick hunks and update selectively"
 msgstr "Blöcke und Änderung gezielt auswählen"
 
-#: add-interactive.c:1024
 msgid "view diff between HEAD and index"
 msgstr "Differenz zwischen HEAD und Index ansehen"
 
-#: add-interactive.c:1026
 msgid "add contents of untracked files to the staged set of changes"
 msgstr "Inhalte von unversionierten Dateien zum Commit vormerken"
 
-#: add-interactive.c:1034 add-interactive.c:1083
 msgid "Prompt help:"
 msgstr "Hilfe für Eingaben:"
 
-#: add-interactive.c:1036
 msgid "select a single item"
 msgstr "Ein einzelnes Element auswählen"
 
-#: add-interactive.c:1038
 msgid "select a range of items"
 msgstr "Eine Reihe von Elementen auswählen"
 
-#: add-interactive.c:1040
 msgid "select multiple ranges"
 msgstr "Mehrere Reihen auswählen"
 
-#: add-interactive.c:1042 add-interactive.c:1087
 msgid "select item based on unique prefix"
 msgstr "Element basierend auf eindeutigen Präfix auswählen"
 
-#: add-interactive.c:1044
 msgid "unselect specified items"
 msgstr "Angegebene Elemente abwählen"
 
-#: add-interactive.c:1046
 msgid "choose all items"
 msgstr "Alle Elemente auswählen"
 
-#: add-interactive.c:1048
 msgid "(empty) finish selecting"
 msgstr "(leer) Auswählen beenden"
 
-#: add-interactive.c:1085
 msgid "select a numbered item"
 msgstr "Ein nummeriertes Element auswählen"
 
-#: add-interactive.c:1089
 msgid "(empty) select nothing"
 msgstr "(leer) nichts auswählen"
 
-#: add-interactive.c:1097 builtin/clean.c:839 git-add--interactive.perl:1898
 msgid "*** Commands ***"
 msgstr "*** Befehle ***"
 
-#: add-interactive.c:1098 builtin/clean.c:840 git-add--interactive.perl:1895
 msgid "What now"
 msgstr "Was nun"
 
-#: add-interactive.c:1150 git-add--interactive.perl:213
 msgid "staged"
 msgstr "zur Staging-Area hinzugefügt"
 
-#: add-interactive.c:1150 git-add--interactive.perl:213
 msgid "unstaged"
 msgstr "aus Staging-Area entfernt"
 
-#: add-interactive.c:1150 apply.c:5002 apply.c:5005 builtin/am.c:2370
-#: builtin/am.c:2373 builtin/bugreport.c:107 builtin/clone.c:132
-#: builtin/fetch.c:154 builtin/merge.c:287 builtin/pull.c:194
-#: builtin/submodule--helper.c:412 builtin/submodule--helper.c:1872
-#: builtin/submodule--helper.c:1875 builtin/submodule--helper.c:2709
-#: builtin/submodule--helper.c:2712 builtin/submodule--helper.c:2891
-#: git-add--interactive.perl:213
 msgid "path"
 msgstr "Pfad"
 
-#: add-interactive.c:1157
 msgid "could not refresh index"
 msgstr "Index konnte nicht aktualisiert werden"
 
-#: add-interactive.c:1171 builtin/clean.c:804 git-add--interactive.perl:1805
 #, c-format
 msgid "Bye.\n"
 msgstr "Tschüss.\n"
 
-#: add-patch.c:34 git-add--interactive.perl:1433
 #, c-format, perl-format
 msgid "Stage mode change [y,n,q,a,d%s,?]? "
 msgstr "Modusänderung der Staging-Area hinzufügen [y,n,q,a,d%s,?]? "
 
-#: add-patch.c:35 git-add--interactive.perl:1434
 #, c-format, perl-format
 msgid "Stage deletion [y,n,q,a,d%s,?]? "
 msgstr "Löschung der Staging-Area hinzufügen [y,n,q,a,d%s,?]? "
 
-#: add-patch.c:36 git-add--interactive.perl:1435
 #, c-format, perl-format
 msgid "Stage addition [y,n,q,a,d%s,?]? "
 msgstr "Ergänzung der Staging-Area hinzufügen [y,n,q,a,d%s,?]? "
 
-#: add-patch.c:37 git-add--interactive.perl:1436
 #, c-format, perl-format
 msgid "Stage this hunk [y,n,q,a,d%s,?]? "
 msgstr "Diesen Patch-Block der Staging-Area hinzufügen [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."
@@ -257,7 +195,6 @@ msgstr ""
 "Wenn der Patch sauber angewendet werden kann, wird der bearbeitete Patch-"
 "Block direkt für die Staging-Area markiert."
 
-#: add-patch.c:42
 msgid ""
 "y - stage this hunk\n"
 "n - do not stage this hunk\n"
@@ -273,27 +210,22 @@ msgstr ""
 "d - diesen oder alle weiteren Patch-Blöcke in dieser Datei nicht zum Commit "
 "vormerken\n"
 
-#: add-patch.c:56 git-add--interactive.perl:1439
 #, c-format, perl-format
 msgid "Stash mode change [y,n,q,a,d%s,?]? "
 msgstr "Modusänderung stashen [y,n,q,a,d%s,?]? "
 
-#: add-patch.c:57 git-add--interactive.perl:1440
 #, c-format, perl-format
 msgid "Stash deletion [y,n,q,a,d%s,?]? "
 msgstr "Löschung stashen [y,n,q,a,d%s,?]? "
 
-#: add-patch.c:58 git-add--interactive.perl:1441
 #, c-format, perl-format
 msgid "Stash addition [y,n,q,a,d%s,?]? "
 msgstr "Ergänzung stashen [y,n,q,a,d%s,?]? "
 
-#: add-patch.c:59 git-add--interactive.perl:1442
 #, c-format, perl-format
 msgid "Stash this hunk [y,n,q,a,d%s,?]? "
 msgstr "Diesen Patch-Block stashen [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."
@@ -301,7 +233,6 @@ msgstr ""
 "Wenn der Patch sauber angewendet werden kann, wird der bearbeitete Patch-"
 "Block direkt zum Stashen markiert."
 
-#: add-patch.c:64
 msgid ""
 "y - stash this hunk\n"
 "n - do not stash this hunk\n"
@@ -315,27 +246,22 @@ msgstr ""
 "a - diesen und alle weiteren Patch-Blöcke dieser Datei stashen\n"
 "d - diesen oder alle weiteren Patch-Blöcke dieser Datei nicht stashen\n"
 
-#: add-patch.c:80 git-add--interactive.perl:1445
 #, c-format, perl-format
 msgid "Unstage mode change [y,n,q,a,d%s,?]? "
 msgstr "Modusänderung aus der Staging-Area entfernen [y,n,q,a,d%s,?]? "
 
-#: add-patch.c:81 git-add--interactive.perl:1446
 #, c-format, perl-format
 msgid "Unstage deletion [y,n,q,a,d%s,?]? "
 msgstr "Löschung aus der Staging-Area entfernen [y,n,q,a,d%s,?]? "
 
-#: add-patch.c:82 git-add--interactive.perl:1447
 #, c-format, perl-format
 msgid "Unstage addition [y,n,q,a,d%s,?]? "
 msgstr "Ergänzung aus der Staging-Area entfernen [y,n,q,a,d%s,?]? "
 
-#: add-patch.c:83 git-add--interactive.perl:1448
 #, c-format, perl-format
 msgid "Unstage this hunk [y,n,q,a,d%s,?]? "
 msgstr "Diesen Patch-Block aus der Staging-Area entfernen [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."
@@ -343,7 +269,6 @@ msgstr ""
 "Wenn der Patch sauber angewendet werden kann, wird der bearbeitete Patch-"
 "Block direkt zum Entfernen aus der Staging-Area markiert."
 
-#: add-patch.c:88
 msgid ""
 "y - unstage this hunk\n"
 "n - do not unstage this hunk\n"
@@ -360,27 +285,22 @@ msgstr ""
 "d - diesen oder alle weiteren Patch-Blöcke dieser Datei nicht aus Staging-"
 "Area entfernen\n"
 
-#: add-patch.c:103 git-add--interactive.perl:1451
 #, c-format, perl-format
 msgid "Apply mode change to index [y,n,q,a,d%s,?]? "
 msgstr "Modusänderung auf Index anwenden [y,n,q,a,d%s,?]? "
 
-#: add-patch.c:104 git-add--interactive.perl:1452
 #, c-format, perl-format
 msgid "Apply deletion to index [y,n,q,a,d%s,?]? "
 msgstr "Löschung auf Index anwenden [y,n,q,a,d%s,?]? "
 
-#: add-patch.c:105 git-add--interactive.perl:1453
 #, c-format, perl-format
 msgid "Apply addition to index [y,n,q,a,d%s,?]? "
 msgstr "Ergänzung auf Index anwenden [y,n,q,a,d%s,?]? "
 
-#: add-patch.c:106 git-add--interactive.perl:1454
 #, c-format, perl-format
 msgid "Apply this hunk to index [y,n,q,a,d%s,?]? "
 msgstr "Diesen Patch-Block auf Index anwenden [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."
@@ -388,7 +308,6 @@ msgstr ""
 "Wenn der Patch sauber angewendet werden kann, wird der bearbeitete Patch-"
 "Block direkt zum Anwenden markiert."
 
-#: add-patch.c:111
 msgid ""
 "y - apply this hunk to index\n"
 "n - do not apply this hunk to index\n"
@@ -405,31 +324,22 @@ msgstr ""
 "d - diesen oder alle weiteren Patch-Blöcke dieser Datei nicht auf den Index "
 "anwenden\n"
 
-#: add-patch.c:126 git-add--interactive.perl:1457
-#: git-add--interactive.perl:1475
 #, c-format, perl-format
 msgid "Discard mode change from worktree [y,n,q,a,d%s,?]? "
 msgstr "Modusänderung im Arbeitsverzeichnis verwerfen [y,n,q,a,d%s,?]? "
 
-#: add-patch.c:127 git-add--interactive.perl:1458
-#: git-add--interactive.perl:1476
 #, c-format, perl-format
 msgid "Discard deletion from worktree [y,n,q,a,d%s,?]? "
 msgstr "Löschung im Arbeitsverzeichnis verwerfen [y,n,q,a,d%s,?]? "
 
-#: add-patch.c:128 git-add--interactive.perl:1459
-#: git-add--interactive.perl:1477
 #, c-format, perl-format
 msgid "Discard addition from worktree [y,n,q,a,d%s,?]? "
 msgstr "Ergänzung im Arbeitsverzeichnis verwerfen [y,n,q,a,d%s,?]? "
 
-#: add-patch.c:129 git-add--interactive.perl:1460
-#: git-add--interactive.perl:1478
 #, c-format, perl-format
 msgid "Discard this hunk from worktree [y,n,q,a,d%s,?]? "
 msgstr "Diesen Patch-Block im Arbeitsverzeichnis verwerfen [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."
@@ -437,7 +347,6 @@ msgstr ""
 "Wenn der Patch sauber angewendet werden kann, wird der bearbeitete Patch-"
 "Block direkt zum Verwerfen markiert."
 
-#: add-patch.c:134 add-patch.c:202
 msgid ""
 "y - discard this hunk from worktree\n"
 "n - do not discard this hunk from worktree\n"
@@ -454,30 +363,25 @@ msgstr ""
 "d - diesen oder alle weiteren Patch-Blöcke dieser Datei nicht im "
 "Arbeitsverzeichnis verwerfen\n"
 
-#: add-patch.c:149 add-patch.c:194 git-add--interactive.perl:1463
 #, c-format, perl-format
 msgid "Discard mode change from index and worktree [y,n,q,a,d%s,?]? "
 msgstr ""
 "Modusänderung vom Index und Arbeitsverzeichnis verwerfen [y,n,q,a,d%s,?]? "
 
-#: add-patch.c:150 add-patch.c:195 git-add--interactive.perl:1464
 #, c-format, perl-format
 msgid "Discard deletion from index and worktree [y,n,q,a,d%s,?]? "
 msgstr "Löschung vom Index und Arbeitsverzeichnis verwerfen [y,n,q,a,d%s,?]? "
 
-#: add-patch.c:151 add-patch.c:196 git-add--interactive.perl:1465
 #, c-format, perl-format
 msgid "Discard addition from index and worktree [y,n,q,a,d%s,?]? "
 msgstr "Ergänzung im Index und Arbeitsverzeichnis verwerfen [y,n,q,a,d%s,?]? "
 
-#: add-patch.c:152 add-patch.c:197 git-add--interactive.perl:1466
 #, c-format, perl-format
 msgid "Discard this hunk from index and worktree [y,n,q,a,d%s,?]? "
 msgstr ""
-"Diesen Patch-Block vom Index und Arbeitsverzeichnis verwerfen [y,n,q,a,d"
-"%s,?]? "
+"Diesen Patch-Block vom Index und Arbeitsverzeichnis verwerfen [y,n,q,a,"
+"d%s,?]? "
 
-#: add-patch.c:157
 msgid ""
 "y - discard this hunk from index and worktree\n"
 "n - do not discard this hunk from index and worktree\n"
@@ -491,30 +395,25 @@ msgstr ""
 "a - diesen und alle weiteren Patch-Blöcke in der Datei verwerfen\n"
 "d - diesen oder alle weiteren Patch-Blöcke in der Datei nicht verwerfen\n"
 
-#: add-patch.c:171 add-patch.c:216 git-add--interactive.perl:1469
 #, c-format, perl-format
 msgid "Apply mode change to index and worktree [y,n,q,a,d%s,?]? "
 msgstr ""
 "Modusänderung auf Index und Arbeitsverzeichnis anwenden [y,n,q,a,d%s,?]? "
 
-#: add-patch.c:172 add-patch.c:217 git-add--interactive.perl:1470
 #, c-format, perl-format
 msgid "Apply deletion to index and worktree [y,n,q,a,d%s,?]? "
 msgstr "Löschung auf Index und Arbeitsverzeichnis anwenden [y,n,q,a,d%s,?]? "
 
-#: add-patch.c:173 add-patch.c:218 git-add--interactive.perl:1471
 #, c-format, perl-format
 msgid "Apply addition to index and worktree [y,n,q,a,d%s,?]? "
 msgstr "Ergänzung auf Index und Arbeitsverzeichnis anwenden [y,n,q,a,d%s,?]? "
 
-#: add-patch.c:174 add-patch.c:219 git-add--interactive.perl:1472
 #, c-format, perl-format
 msgid "Apply this hunk to index and worktree [y,n,q,a,d%s,?]? "
 msgstr ""
-"Diesen Patch-Block auf Index und Arbeitsverzeichnis anwenden [y,n,q,a,d"
-"%s,?]? "
+"Diesen Patch-Block auf Index und Arbeitsverzeichnis anwenden [y,n,q,a,"
+"d%s,?]? "
 
-#: add-patch.c:179
 msgid ""
 "y - apply this hunk to index and worktree\n"
 "n - do not apply this hunk to index and worktree\n"
@@ -529,7 +428,6 @@ msgstr ""
 "a - diesen und alle weiteren Patch-Blöcke in der Datei anwenden\n"
 "d - diesen oder alle weiteren Patch-Blöcke in der Datei nicht anwenden\n"
 
-#: add-patch.c:224
 msgid ""
 "y - apply this hunk to worktree\n"
 "n - do not apply this hunk to worktree\n"
@@ -543,34 +441,27 @@ msgstr ""
 "a - diesen und alle weiteren Patch-Blöcke in der Datei anwenden\n"
 "d - diesen und alle weiteren Patch-Blöcke in der Datei nicht anwenden\n"
 
-#: add-patch.c:343
 #, c-format
 msgid "could not parse hunk header '%.*s'"
 msgstr "Konnte Block-Header '%.*s' nicht parsen."
 
-#: add-patch.c:362 add-patch.c:366
 #, c-format
 msgid "could not parse colored hunk header '%.*s'"
 msgstr "Konnte farbigen Block-Header '%.*s' nicht parsen."
 
-#: add-patch.c:431
 msgid "could not parse diff"
 msgstr "konnte Diff nicht parsen"
 
-#: add-patch.c:450
 msgid "could not parse colored diff"
 msgstr "konnte farbigen Diff nicht parsen"
 
-#: add-patch.c:464
 #, c-format
 msgid "failed to run '%s'"
 msgstr "'%s' konnte nicht ausgeführt werden"
 
-#: add-patch.c:618
 msgid "mismatched output from interactive.diffFilter"
 msgstr "nicht übereinstimmende Ausgabe von interactive.diffFilter"
 
-#: add-patch.c:619
 msgid ""
 "Your filter must maintain a one-to-one correspondence\n"
 "between its input and output lines."
@@ -578,7 +469,6 @@ msgstr ""
 "Der Filter muss eine Eins-zu-Eins-Beziehung\n"
 "zwischen den Ein- und Ausgabe-Zeilen einhalten."
 
-#: add-patch.c:797
 #, c-format
 msgid ""
 "expected context line #%d in\n"
@@ -587,7 +477,6 @@ msgstr ""
 "Erwartete Kontextzeile #%d in\n"
 "%.*s"
 
-#: add-patch.c:812
 #, c-format
 msgid ""
 "hunks do not overlap:\n"
@@ -600,13 +489,11 @@ msgstr ""
 "\tendet nicht mit:\n"
 "%.*s"
 
-#: add-patch.c:1088 git-add--interactive.perl:1115
 msgid "Manual hunk edit mode -- see bottom for a quick guide.\n"
 msgstr ""
 "Manueller Editiermodus für Patch-Blöcke -- siehe nach unten für eine\n"
 "Kurzanleitung.\n"
 
-#: add-patch.c:1092
 #, c-format
 msgid ""
 "---\n"
@@ -619,8 +506,8 @@ msgstr ""
 "Um '%c' Zeilen zu entfernen, löschen Sie diese.\n"
 "Zeilen, die mit %c beginnen, werden entfernt.\n"
 
+#. #-#-#-#-#  git-add--interactive.perl.po  #-#-#-#-#
 #. TRANSLATORS: 'it' refers to the patch mentioned in the previous messages.
-#: add-patch.c:1106 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"
@@ -631,47 +518,42 @@ msgstr ""
 "werden,\n"
 "wird die Bearbeitung abgebrochen und der Patch-Block bleibt unverändert.\n"
 
-#: add-patch.c:1139
 msgid "could not parse hunk header"
 msgstr "konnte Block-Header nicht parsen"
 
-#: add-patch.c:1184
 msgid "'git apply --cached' failed"
 msgstr "'git apply --cached' schlug fehl"
 
+#. #-#-#-#-#  add-patch.c.po  #-#-#-#-#
 #. 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.
 #.
+#. #-#-#-#-#  git-add--interactive.perl.po  #-#-#-#-#
 #. 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:1253 git-add--interactive.perl:1244
 msgid ""
 "Your edited hunk does not apply. Edit again (saying \"no\" discards!) [y/n]? "
 msgstr ""
 "Ihr bearbeiteter Patch-Block kann nicht angewendet werden.\n"
 "Erneut bearbeiten? (\"n\" verwirft Bearbeitung!) [y/n]?"
 
-#: add-patch.c:1296
 msgid "The selected hunks do not apply to the index!"
 msgstr ""
 "Die ausgewählten Patch-Blöcke können nicht auf den Index angewendet werden!"
 
-#: add-patch.c:1297 git-add--interactive.perl:1348
 msgid "Apply them to the worktree anyway? "
 msgstr "Trotzdem auf Arbeitsverzeichnis anwenden? "
 
-#: add-patch.c:1304 git-add--interactive.perl:1351
 msgid "Nothing was applied.\n"
 msgstr "Nichts angewendet.\n"
 
-#: add-patch.c:1361
 msgid ""
 "j - leave this hunk undecided, see next undecided hunk\n"
 "J - leave this hunk undecided, see next hunk\n"
@@ -695,73 +577,57 @@ msgstr ""
 "e - aktuellen Patch-Block manuell editieren\n"
 "? - Hilfe anzeigen\n"
 
-#: add-patch.c:1523 add-patch.c:1533
 msgid "No previous hunk"
 msgstr "Kein vorheriger Patch-Block"
 
-#: add-patch.c:1528 add-patch.c:1538
 msgid "No next hunk"
 msgstr "Kein folgender Patch-Block"
 
-#: add-patch.c:1544
 msgid "No other hunks to goto"
 msgstr "Keine anderen Patch-Blöcke verbleibend"
 
-#: add-patch.c:1555 git-add--interactive.perl:1608
 msgid "go to which hunk (<ret> to see more)? "
 msgstr "zu welchem Patch-Block springen (<Enter> für mehr Informationen)? "
 
-#: add-patch.c:1556 git-add--interactive.perl:1610
 msgid "go to which hunk? "
 msgstr "zu welchem Patch-Block springen? "
 
-#: add-patch.c:1567
 #, c-format
 msgid "Invalid number: '%s'"
 msgstr "Ungültige Nummer: '%s'"
 
-#: add-patch.c:1572
 #, c-format
 msgid "Sorry, only %d hunk available."
 msgid_plural "Sorry, only %d hunks available."
 msgstr[0] "Entschuldigung, nur %d Patch-Block verfügbar."
 msgstr[1] "Entschuldigung, nur %d Patch-Blöcke verfügbar."
 
-#: add-patch.c:1581
 msgid "No other hunks to search"
 msgstr "Keine anderen Patch-Blöcke zum Durchsuchen"
 
-#: add-patch.c:1587 git-add--interactive.perl:1663
 msgid "search for regex? "
 msgstr "Suche nach regulärem Ausdruck? "
 
-#: add-patch.c:1602
 #, c-format
 msgid "Malformed search regexp %s: %s"
 msgstr "Fehlerhafter regulärer Ausdruck für Suche %s: %s"
 
-#: add-patch.c:1619
 msgid "No hunk matches the given pattern"
 msgstr "Kein Patch-Block entspricht dem angegebenen Muster"
 
-#: add-patch.c:1626
 msgid "Sorry, cannot split this hunk"
 msgstr "Entschuldigung, kann diesen Patch-Block nicht aufteilen"
 
-#: add-patch.c:1630
 #, c-format
 msgid "Split into %d hunks."
 msgstr "In %d Patch-Block aufgeteilt."
 
-#: add-patch.c:1634
 msgid "Sorry, cannot edit this hunk"
 msgstr "Entschuldigung, kann diesen Patch-Block nicht bearbeiten"
 
-#: add-patch.c:1686
 msgid "'git apply' failed"
 msgstr "'git apply' schlug fehl"
 
-#: advice.c:81
 #, c-format
 msgid ""
 "\n"
@@ -770,43 +636,35 @@ msgstr ""
 "\n"
 "Deaktivieren Sie diese Nachricht mit \"git config advice.%s false\""
 
-#: advice.c:97
 #, c-format
 msgid "%shint: %.*s%s\n"
 msgstr "%sHinweis: %.*s%s\n"
 
-#: advice.c:181
 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:183
 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:185
 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:187
 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:189
 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:191
 #, 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:199
 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."
@@ -815,27 +673,21 @@ msgstr ""
 "dann 'git add/rm <Datei>', um die Auflösung entsprechend zu markieren\n"
 "und zu committen."
 
-#: advice.c:207
 msgid "Exiting because of an unresolved conflict."
 msgstr "Beende wegen unaufgelöstem Konflikt."
 
-#: advice.c:212 builtin/merge.c:1388
 msgid "You have not concluded your merge (MERGE_HEAD exists)."
 msgstr "Sie haben Ihren Merge nicht abgeschlossen (MERGE_HEAD existiert)."
 
-#: advice.c:214
 msgid "Please, commit your changes before merging."
 msgstr "Bitte committen Sie Ihre Änderungen, bevor Sie mergen."
 
-#: advice.c:215
 msgid "Exiting because of unfinished merge."
 msgstr "Beende wegen nicht abgeschlossenem Merge."
 
-#: advice.c:220
 msgid "Not possible to fast-forward, aborting."
 msgstr "Vorspulen nicht möglich, breche ab."
 
-#: advice.c:230
 #, c-format
 msgid ""
 "The following paths and/or pathspecs matched paths that exist\n"
@@ -846,7 +698,6 @@ msgstr ""
 "der außerhalb Ihrer partiellen Checkout-Definition existierte, weshalb\n"
 "diese nicht im Index aktualisiert werden:\n"
 
-#: advice.c:237
 msgid ""
 "If you intend to update such entries, try one of the following:\n"
 "* Use the --sparse option.\n"
@@ -857,7 +708,6 @@ msgstr ""
 "* Verwenden Sie die Option --sparse.\n"
 "* Deaktivieren oder ändern Sie die Regeln für partielle Checkouts."
 
-#: advice.c:245
 #, c-format
 msgid ""
 "Note: switching to '%s'.\n"
@@ -900,105 +750,68 @@ msgstr ""
 "'advice.detachedHead' auf 'false' setzen.\n"
 "\n"
 
-#: alias.c:50
 msgid "cmdline ends with \\"
 msgstr "Befehlszeile endet mit \\"
 
-#: alias.c:51
 msgid "unclosed quote"
 msgstr "nicht geschlossene Anführungszeichen"
 
-#: apply.c:70
 #, c-format
 msgid "unrecognized whitespace option '%s'"
 msgstr "Nicht erkannte Whitespace-Option: '%s'"
 
-#: apply.c:86
 #, c-format
 msgid "unrecognized whitespace ignore option '%s'"
 msgstr "nicht erkannte Option zum Ignorieren von Whitespace: '%s'"
 
-#: apply.c:138 archive.c:584 parse-options.c:1122 range-diff.c:555
-#: revision.c:2314 revision.c:2318 revision.c:2327 revision.c:2332
-#: revision.c:2560 revision.c:2895 revision.c:2899 revision.c:2907
-#: revision.c:2910 revision.c:2912 builtin/add.c:507 builtin/add.c:509
-#: builtin/add.c:515 builtin/add.c:527 builtin/branch.c:755
-#: builtin/checkout.c:472 builtin/checkout.c:475 builtin/checkout.c:1663
-#: builtin/checkout.c:1773 builtin/checkout.c:1776 builtin/clone.c:921
-#: builtin/commit.c:359 builtin/commit.c:362 builtin/commit.c:1200
-#: builtin/commit.c:1256 builtin/commit.c:1273 builtin/describe.c:593
-#: builtin/diff-tree.c:155 builtin/difftool.c:733 builtin/fast-export.c:1245
-#: builtin/fetch.c:2141 builtin/fetch.c:2162 builtin/fetch.c:2167
-#: builtin/help.c:602 builtin/index-pack.c:1858 builtin/init-db.c:560
-#: builtin/log.c:1968 builtin/log.c:1970 builtin/ls-files.c:778
-#: builtin/merge-base.c:163 builtin/merge-base.c:169 builtin/merge.c:1409
-#: builtin/merge.c:1411 builtin/pack-objects.c:4098 builtin/push.c:592
-#: builtin/push.c:630 builtin/push.c:636 builtin/push.c:641
-#: builtin/rebase.c:1221 builtin/rebase.c:1223 builtin/rebase.c:1227
-#: builtin/repack.c:688 builtin/repack.c:719 builtin/reset.c:433
-#: builtin/reset.c:469 builtin/rev-list.c:537 builtin/show-branch.c:711
-#: builtin/stash.c:1696 builtin/stash.c:1699 builtin/submodule--helper.c:1328
-#: builtin/submodule--helper.c:3054 builtin/tag.c:527 builtin/tag.c:573
-#: builtin/worktree.c:779
 #, c-format
 msgid "options '%s' and '%s' cannot be used together"
 msgstr "die Optionen '%s' und '%s' können nicht gemeinsam verwendet werden"
 
-#: apply.c:141 apply.c:152 apply.c:155
 #, c-format
 msgid "'%s' outside a repository"
 msgstr "'%s' außerhalb eines Repositories"
 
-#: apply.c:807
 #, c-format
 msgid "Cannot prepare timestamp regexp %s"
 msgstr "Kann regulären Ausdruck für Zeitstempel %s nicht verarbeiten"
 
-#: apply.c:816
 #, c-format
 msgid "regexec returned %d for input: %s"
 msgstr "Ausführung des regulären Ausdrucks gab %d zurück. Eingabe: %s"
 
-#: apply.c:890
 #, c-format
 msgid "unable to find filename in patch at line %d"
 msgstr "konnte keinen Dateinamen in Zeile %d des Patches finden"
 
-#: apply.c:928
 #, c-format
 msgid "git apply: bad git-diff - expected /dev/null, got %s on line %d"
 msgstr ""
 "git apply: ungültiges 'git-diff' - erwartete /dev/null, erhielt %s in Zeile "
 "%d"
 
-#: apply.c:934
 #, c-format
 msgid "git apply: bad git-diff - inconsistent new filename on line %d"
 msgstr ""
 "git apply: ungültiges 'git-diff' - Inkonsistenter neuer Dateiname in Zeile %d"
 
-#: apply.c:935
 #, c-format
 msgid "git apply: bad git-diff - inconsistent old filename on line %d"
 msgstr ""
 "git apply: ungültiges 'git-diff' - Inkonsistenter alter Dateiname in Zeile %d"
 
-#: apply.c:940
 #, c-format
 msgid "git apply: bad git-diff - expected /dev/null on line %d"
 msgstr "git apply: ungültiges 'git-diff' - erwartete /dev/null in Zeile %d"
 
-#: apply.c:969
 #, c-format
 msgid "invalid mode on line %d: %s"
 msgstr "Ungültiger Modus in Zeile %d: %s"
 
-#: apply.c:1288
 #, c-format
 msgid "inconsistent header lines %d and %d"
 msgstr "inkonsistente Kopfzeilen %d und %d"
 
-#: apply.c:1378
 #, c-format
 msgid ""
 "git diff header lacks filename information when removing %d leading pathname "
@@ -1013,82 +826,66 @@ msgstr[1] ""
 "Dem Kopfbereich von \"git diff\" fehlen Informationen zum Dateinamen, wenn "
 "%d vorangestellte Teile des Pfades entfernt werden (Zeile %d)"
 
-#: apply.c:1391
 #, c-format
 msgid "git diff header lacks filename information (line %d)"
 msgstr ""
 "Dem Kopfbereich von \"git diff\" fehlen Informationen zum Dateinamen (Zeile "
 "%d)"
 
-#: apply.c:1487
 #, c-format
 msgid "recount: unexpected line: %.*s"
 msgstr "recount: unerwartete Zeile: %.*s"
 
-#: apply.c:1556
 #, c-format
 msgid "patch fragment without header at line %d: %.*s"
 msgstr "Patch-Fragment ohne Kopfbereich bei Zeile %d: %.*s"
 
-#: apply.c:1759
 msgid "new file depends on old contents"
 msgstr "neue Datei hängt von alten Inhalten ab"
 
-#: apply.c:1761
 msgid "deleted file still has contents"
 msgstr "entfernte Datei hat noch Inhalte"
 
-#: apply.c:1795
 #, c-format
 msgid "corrupt patch at line %d"
 msgstr "fehlerhafter Patch bei Zeile %d"
 
-#: apply.c:1832
 #, c-format
 msgid "new file %s depends on old contents"
 msgstr "neue Datei %s hängt von alten Inhalten ab"
 
-#: apply.c:1834
 #, c-format
 msgid "deleted file %s still has contents"
 msgstr "entfernte Datei %s hat noch Inhalte"
 
-#: apply.c:1837
 #, c-format
 msgid "** warning: file %s becomes empty but is not deleted"
 msgstr "** Warnung: Datei %s wird leer, aber ist nicht entfernt"
 
-#: apply.c:1985
 #, c-format
 msgid "corrupt binary patch at line %d: %.*s"
 msgstr "fehlerhafter Binär-Patch bei Zeile %d: %.*s"
 
-#: apply.c:2022
 #, c-format
 msgid "unrecognized binary patch at line %d"
 msgstr "nicht erkannter Binär-Patch bei Zeile %d"
 
-#: apply.c:2184
 #, c-format
 msgid "patch with only garbage at line %d"
 msgstr "Patch mit nutzlosen Informationen bei Zeile %d"
 
-#: apply.c:2270
 #, c-format
 msgid "unable to read symlink %s"
 msgstr "konnte symbolische Verknüpfung %s nicht lesen"
 
-#: apply.c:2274
 #, c-format
 msgid "unable to open or read %s"
 msgstr "konnte %s nicht öffnen oder lesen"
 
-#: apply.c:2943
 #, c-format
 msgid "invalid start of line: '%c'"
 msgstr "Ungültiger Zeilenanfang: '%c'"
 
-#: apply.c:3064
 #, c-format
 msgid "Hunk #%d succeeded at %d (offset %d line)."
 msgid_plural "Hunk #%d succeeded at %d (offset %d lines)."
@@ -1096,12 +893,10 @@ msgstr[0] "Patch-Bereich #%d erfolgreich angewendet bei %d (%d Zeile versetzt)"
 msgstr[1] ""
 "Patch-Bereich #%d erfolgreich angewendet bei %d (%d Zeilen versetzt)"
 
-#: apply.c:3076
 #, 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:3082
 #, c-format
 msgid ""
 "while searching for:\n"
@@ -1110,25 +905,21 @@ msgstr ""
 "bei der Suche nach:\n"
 "%.*s"
 
-#: apply.c:3104
 #, c-format
 msgid "missing binary patch data for '%s'"
 msgstr "keine Daten in Binär-Patch für '%s'"
 
-#: apply.c:3112
 #, 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:3159
 #, 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:3170
 #, c-format
 msgid ""
 "the patch applies to '%s' (%s), which does not match the current contents."
@@ -1136,641 +927,506 @@ msgstr ""
 "der Patch wird angewendet auf '%s' (%s), was nicht den aktuellen Inhalten\n"
 "entspricht."
 
-#: apply.c:3178
 #, 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:3196
 #, 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:3209
 #, c-format
 msgid "binary patch does not apply to '%s'"
 msgstr "Konnte Binär-Patch nicht auf '%s' anwenden"
 
-#: apply.c:3216
 #, 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:3237
 #, c-format
 msgid "patch failed: %s:%ld"
 msgstr "Anwendung des Patches fehlgeschlagen: %s:%ld"
 
-#: apply.c:3360
 #, c-format
 msgid "cannot checkout %s"
 msgstr "kann %s nicht auschecken"
 
-#: apply.c:3412 apply.c:3423 apply.c:3469 midx.c:105 pack-revindex.c:214
-#: setup.c:310
 #, c-format
 msgid "failed to read %s"
 msgstr "Fehler beim Lesen von %s"
 
-#: apply.c:3420
 #, c-format
 msgid "reading from '%s' beyond a symbolic link"
 msgstr "'%s' ist hinter einer symbolischen Verknüpfung"
 
-#: apply.c:3449 apply.c:3721
 #, c-format
 msgid "path %s has been renamed/deleted"
 msgstr "Pfad %s wurde umbenannt/gelöscht"
 
-#: apply.c:3559 apply.c:3736
 #, c-format
 msgid "%s: does not exist in index"
 msgstr "%s ist nicht im Index"
 
-#: apply.c:3568 apply.c:3744 apply.c:3960
 #, c-format
 msgid "%s: does not match index"
 msgstr "%s entspricht nicht der Version im Index"
 
-#: apply.c:3605
 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:3608
 #, c-format
 msgid "Performing three-way merge...\n"
 msgstr "Führe 3-Wege-Merge durch...\n"
 
-#: apply.c:3624 apply.c:3628
 #, c-format
 msgid "cannot read the current contents of '%s'"
 msgstr "kann aktuelle Inhalte von '%s' nicht lesen"
 
-#: apply.c:3640
 #, c-format
 msgid "Failed to perform three-way merge...\n"
 msgstr "Fehler beim Durchführen des 3-Wege-Merges...\n"
 
-#: apply.c:3654
 #, c-format
 msgid "Applied patch to '%s' with conflicts.\n"
 msgstr "Patch auf '%s' mit Konflikten angewendet.\n"
 
-#: apply.c:3659
 #, c-format
 msgid "Applied patch to '%s' cleanly.\n"
 msgstr "Patch auf '%s' sauber angewendet.\n"
 
-#: apply.c:3676
 #, c-format
 msgid "Falling back to direct application...\n"
 msgstr "Ausweichen auf direkte Anwendung...\n"
 
-#: apply.c:3688
 msgid "removal patch leaves file contents"
 msgstr "Lösch-Patch hinterlässt Dateiinhalte"
 
-#: apply.c:3761
 #, c-format
 msgid "%s: wrong type"
 msgstr "%s: falscher Typ"
 
-#: apply.c:3763
 #, c-format
 msgid "%s has type %o, expected %o"
 msgstr "%s ist vom Typ %o, erwartete %o"
 
-#: apply.c:3900 apply.c:3902 read-cache.c:903 read-cache.c:932
-#: read-cache.c:1399
 #, c-format
 msgid "invalid path '%s'"
 msgstr "Ungültiger Pfad '%s'"
 
-#: apply.c:3958
 #, c-format
 msgid "%s: already exists in index"
 msgstr "%s ist bereits bereitgestellt"
 
-#: apply.c:3962
 #, c-format
 msgid "%s: already exists in working directory"
 msgstr "%s existiert bereits im Arbeitsverzeichnis"
 
-#: apply.c:3982
 #, 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:3987
 #, 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:4007
 #, c-format
 msgid "affected file '%s' is beyond a symbolic link"
 msgstr "betroffene Datei '%s' ist hinter einer symbolischen Verknüpfung"
 
-#: apply.c:4011
 #, c-format
 msgid "%s: patch does not apply"
 msgstr "%s: Patch konnte nicht angewendet werden"
 
-#: apply.c:4026
 #, c-format
 msgid "Checking patch %s..."
 msgstr "Prüfe Patch %s..."
 
-#: apply.c:4118
 #, 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:4125
 #, 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:4128
 #, c-format
 msgid "sha1 information is lacking or useless (%s)."
 msgstr "SHA-1 Information fehlt oder ist unbrauchbar (%s)."
 
-#: apply.c:4137
 #, c-format
 msgid "could not add %s to temporary index"
 msgstr "konnte %s nicht zum temporären Index hinzufügen"
 
-#: apply.c:4147
 #, c-format
 msgid "could not write temporary index to %s"
 msgstr "konnte temporären Index nicht nach %s schreiben"
 
-#: apply.c:4285
 #, c-format
 msgid "unable to remove %s from index"
 msgstr "konnte %s nicht aus dem Index entfernen"
 
-#: apply.c:4319
 #, c-format
 msgid "corrupt patch for submodule %s"
 msgstr "fehlerhafter Patch für Submodul %s"
 
-#: apply.c:4325
 #, c-format
 msgid "unable to stat newly created file '%s'"
 msgstr "konnte neu erstellte Datei '%s' nicht lesen"
 
-#: apply.c:4333
 #, 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:4339 apply.c:4484
 #, c-format
 msgid "unable to add cache entry for %s"
 msgstr "kann für %s keinen Eintrag in den Zwischenspeicher hinzufügen"
 
-#: apply.c:4382 builtin/bisect--helper.c:540 builtin/gc.c:2258
-#: builtin/gc.c:2293
 #, c-format
 msgid "failed to write to '%s'"
 msgstr "Fehler beim Schreiben nach '%s'"
 
-#: apply.c:4386
 #, c-format
 msgid "closing file '%s'"
 msgstr "schließe Datei '%s'"
 
-#: apply.c:4456
 #, c-format
 msgid "unable to write file '%s' mode %o"
 msgstr "konnte Datei '%s' mit Modus %o nicht schreiben"
 
-#: apply.c:4554
 #, c-format
 msgid "Applied patch %s cleanly."
 msgstr "Patch %s sauber angewendet."
 
-#: apply.c:4562
 msgid "internal error"
 msgstr "interner Fehler"
 
-#: apply.c:4565
 #, 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:4576
 #, c-format
 msgid "truncating .rej filename to %.*s.rej"
 msgstr "Verkürze Name von .rej Datei zu %.*s.rej"
 
-#: apply.c:4584
 #, c-format
 msgid "cannot open %s"
 msgstr "kann '%s' nicht öffnen"
 
-#: apply.c:4598
 #, c-format
 msgid "Hunk #%d applied cleanly."
 msgstr "Patch-Bereich #%d sauber angewendet."
 
-#: apply.c:4602
 #, c-format
 msgid "Rejected hunk #%d."
 msgstr "Patch-Block #%d zurückgewiesen."
 
-#: apply.c:4731
 #, c-format
 msgid "Skipped patch '%s'."
 msgstr "Patch '%s' ausgelassen."
 
-#: apply.c:4740
 msgid "No valid patches in input (allow with \"--allow-empty\")"
 msgstr "Keine gültigen Patches in der Eingabe (erlauben mit \"--allow-empty\")"
 
-#: apply.c:4761
 msgid "unable to read index file"
 msgstr "Konnte Index-Datei nicht lesen"
 
-#: apply.c:4918
 #, c-format
 msgid "can't open patch '%s': %s"
 msgstr "kann Patch '%s' nicht öffnen: %s"
 
-#: apply.c:4945
 #, 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:4951 apply.c:4966
 #, 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:4959
 #, 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:4975 builtin/add.c:690 builtin/mv.c:338 builtin/rm.c:430
 msgid "Unable to write new index file"
 msgstr "Konnte neue Index-Datei nicht schreiben"
 
-#: apply.c:5003
 msgid "don't apply changes matching the given path"
 msgstr "keine Änderungen im angegebenen Pfad anwenden"
 
-#: apply.c:5006
 msgid "apply changes matching the given path"
 msgstr "Änderungen nur im angegebenen Pfad anwenden"
 
-#: apply.c:5008 builtin/am.c:2379
 msgid "num"
 msgstr "Anzahl"
 
-#: apply.c:5009
 msgid "remove <num> leading slashes from traditional diff paths"
 msgstr ""
 "<Anzahl> vorangestellte Schrägstriche von herkömmlichen Differenzpfaden "
 "entfernen"
 
-#: apply.c:5012
 msgid "ignore additions made by the patch"
 msgstr "hinzugefügte Zeilen des Patches ignorieren"
 
-#: apply.c:5014
 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:5018
 msgid "show number of added and deleted lines in decimal notation"
 msgstr ""
 "die Anzahl von hinzugefügten/entfernten Zeilen in Dezimalnotation anzeigen"
 
-#: apply.c:5020
 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:5022
 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:5024
 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:5026
 msgid "mark new files with `git add --intent-to-add`"
 msgstr "neue Dateien mit `git add --intent-to-add` markieren"
 
-#: apply.c:5028
 msgid "apply a patch without touching the working tree"
 msgstr "Patch anwenden, ohne Änderungen im Arbeitsverzeichnis vorzunehmen"
 
-#: apply.c:5030
 msgid "accept a patch that touches outside the working area"
 msgstr ""
 "Patch anwenden, der Änderungen außerhalb des Arbeitsverzeichnisses vornimmt"
 
-#: apply.c:5033
 msgid "also apply the patch (use with --stat/--summary/--check)"
 msgstr "Patch anwenden (Benutzung mit --stat/--summary/--check)"
 
-#: apply.c:5035
 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:5037
 msgid "build a temporary index based on embedded index information"
 msgstr ""
 "einen temporären Index, basierend auf den integrierten Index-Informationen, "
 "erstellen"
 
-#: apply.c:5040 builtin/checkout-index.c:230
 msgid "paths are separated with NUL character"
 msgstr "Pfade sind getrennt durch NUL Zeichen"
 
-#: apply.c:5042
 msgid "ensure at least <n> lines of context match"
 msgstr ""
 "sicher stellen, dass mindestens <n> Zeilen des Kontextes übereinstimmen"
 
-#: apply.c:5043 builtin/am.c:2355 builtin/am.c:2358
-#: builtin/interpret-trailers.c:98 builtin/interpret-trailers.c:100
-#: builtin/interpret-trailers.c:102 builtin/pack-objects.c:3983
-#: builtin/rebase.c:1079
 msgid "action"
 msgstr "Aktion"
 
-#: apply.c:5044
 msgid "detect new or modified lines that have whitespace errors"
 msgstr "neue oder geänderte Zeilen, die Whitespace-Fehler haben, ermitteln"
 
-#: apply.c:5047 apply.c:5050
 msgid "ignore changes in whitespace when finding context"
 msgstr "Änderungen im Whitespace bei der Suche des Kontextes ignorieren"
 
-#: apply.c:5053
 msgid "apply the patch in reverse"
 msgstr "den Patch in umgekehrter Reihenfolge anwenden"
 
-#: apply.c:5055
 msgid "don't expect at least one line of context"
 msgstr "keinen Kontext erwarten"
 
-#: apply.c:5057
 msgid "leave the rejected hunks in corresponding *.rej files"
 msgstr ""
 "zurückgewiesene Patch-Blöcke in entsprechenden *.rej Dateien hinterlassen"
 
-#: apply.c:5059
 msgid "allow overlapping hunks"
 msgstr "sich überlappende Patch-Blöcke erlauben"
 
-#: apply.c:5062
 msgid "tolerate incorrectly detected missing new-line at the end of file"
 msgstr "fehlerhaft erkannten fehlenden Zeilenumbruch am Dateiende tolerieren"
 
-#: apply.c:5065
 msgid "do not trust the line counts in the hunk headers"
 msgstr "den Zeilennummern im Kopf des Patch-Blocks nicht vertrauen"
 
-#: apply.c:5067 builtin/am.c:2367
 msgid "root"
 msgstr "Wurzelverzeichnis"
 
-#: apply.c:5068
 msgid "prepend <root> to all filenames"
 msgstr "<Wurzelverzeichnis> vor alle Dateinamen stellen"
 
-#: apply.c:5071
 msgid "don't return error for empty patches"
 msgstr "keinen Fehler für leere Patches zurückgeben"
 
-#: archive-tar.c:125 archive-zip.c:346
 #, c-format
 msgid "cannot stream blob %s"
 msgstr "kann Blob %s nicht streamen"
 
-#: archive-tar.c:265 archive-zip.c:359
 #, c-format
 msgid "unsupported file mode: 0%o (SHA1: %s)"
 msgstr "Nicht unterstützter Dateimodus: 0%o (SHA1: %s)"
 
-#: archive-tar.c:447
 #, c-format
 msgid "unable to start '%s' filter"
 msgstr "konnte '%s' Filter nicht starten"
 
-#: archive-tar.c:450
 msgid "unable to redirect descriptor"
 msgstr "konnte Descriptor nicht umleiten"
 
-#: archive-tar.c:457
 #, c-format
 msgid "'%s' filter reported error"
 msgstr "'%s' Filter meldete Fehler"
 
-#: archive-zip.c:319
 #, c-format
 msgid "path is not valid UTF-8: %s"
 msgstr "Pfad ist kein gültiges UTF-8: %s"
 
-#: archive-zip.c:323
 #, c-format
 msgid "path too long (%d chars, SHA1: %s): %s"
 msgstr "Pfad zu lang (%d Zeichen, SHA1: %s): %s"
 
-#: archive-zip.c:470 builtin/pack-objects.c:363 builtin/pack-objects.c:366
 #, c-format
 msgid "deflate error (%d)"
 msgstr "Fehler beim Komprimieren (%d)"
 
-#: archive-zip.c:604
 #, c-format
 msgid "timestamp too large for this system: %<PRIuMAX>"
 msgstr "Timestamp zu groß für dieses System: %<PRIuMAX>"
 
-#: archive.c:14
 msgid "git archive [<options>] <tree-ish> [<path>...]"
 msgstr "git archive [<Optionen>] <Commit-Referenz> [<Pfad>...]"
 
-#: archive.c:16
 msgid ""
 "git archive --remote <repo> [--exec <cmd>] [<options>] <tree-ish> [<path>...]"
 msgstr ""
 "git archive --remote <Repository> [--exec <Programm>] [<Optionen>] <Commit-"
 "Referenz> [<Pfad>...]"
 
-#: archive.c:17
 msgid "git archive --remote <repo> [--exec <cmd>] --list"
 msgstr "git archive --remote <Repository> [--exec <Programm>] --list"
 
-#: archive.c:188 archive.c:341 builtin/gc.c:497 builtin/notes.c:238
-#: builtin/tag.c:579
 #, c-format
 msgid "cannot read '%s'"
 msgstr "kann '%s' nicht lesen"
 
-#: archive.c:426 builtin/add.c:214 builtin/add.c:657 builtin/rm.c:334
 #, c-format
 msgid "pathspec '%s' did not match any files"
 msgstr "Pfadspezifikation '%s' stimmt mit keinen Dateien überein"
 
-#: archive.c:450
 #, c-format
 msgid "no such ref: %.*s"
 msgstr "Referenz nicht gefunden: %.*s"
 
-#: archive.c:456
 #, c-format
 msgid "not a valid object name: %s"
 msgstr "Kein gültiger Objektname: %s"
 
-#: archive.c:469
 #, c-format
 msgid "not a tree object: %s"
 msgstr "Kein Tree-Objekt: %s"
 
-#: archive.c:481
 msgid "current working directory is untracked"
 msgstr "aktuelles Arbeitsverzeichnis ist unversioniert"
 
-#: archive.c:522
 #, c-format
 msgid "File not found: %s"
 msgstr "Datei nicht gefunden: %s"
 
-#: archive.c:524
 #, c-format
 msgid "Not a regular file: %s"
 msgstr "Keine reguläre Datei: %s"
 
-#: archive.c:551
+#, c-format
+msgid "unclosed quote: '%s'"
+msgstr "nicht geschlossene Anführungszeichen: '%s'"
+
+#, c-format
+msgid "missing colon: '%s'"
+msgstr "fehlender Doppelpunkt: '%s'"
+
+#, c-format
+msgid "empty file name: '%s'"
+msgstr "leerer Dateiname: '%s'"
+
 msgid "fmt"
 msgstr "Format"
 
-#: archive.c:551
 msgid "archive format"
 msgstr "Archivformat"
 
-#: archive.c:552 builtin/log.c:1809
 msgid "prefix"
 msgstr "Präfix"
 
-#: 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:554 archive.c:557 builtin/blame.c:881 builtin/blame.c:885
-#: builtin/blame.c:886 builtin/commit-tree.c:115 builtin/config.c:135
-#: builtin/fast-export.c:1181 builtin/fast-export.c:1183
-#: builtin/fast-export.c:1187 builtin/grep.c:936 builtin/hash-object.c:104
-#: builtin/ls-files.c:654 builtin/ls-files.c:657 builtin/notes.c:410
-#: builtin/notes.c:576 builtin/read-tree.c:115 parse-options.h:195
 msgid "file"
 msgstr "Datei"
 
-#: archive.c:555
 msgid "add untracked file to archive"
 msgstr "unversionierte Datei zum Archiv hinzufügen"
 
-#: archive.c:558 builtin/archive.c:88
+msgid "path:content"
+msgstr "Pfad:Inhalt"
+
 msgid "write the archive to this file"
 msgstr "das Archiv in diese Datei schreiben"
 
-#: archive.c:560
 msgid "read .gitattributes in working directory"
 msgstr ".gitattributes aus dem Arbeitsverzeichnis lesen"
 
-#: archive.c:561
 msgid "report archived files on stderr"
 msgstr "archivierte Dateien in der Standard-Fehlerausgabe ausgeben"
 
-#: archive.c:563
 msgid "set compression level"
 msgstr "Komprimierungsgrad setzen"
 
-#: archive.c:566
 msgid "list supported archive formats"
 msgstr "unterstützte Archivformate auflisten"
 
-#: archive.c:568 builtin/archive.c:89 builtin/clone.c:122 builtin/clone.c:125
-#: builtin/submodule--helper.c:1884 builtin/submodule--helper.c:2718
 msgid "repo"
 msgstr "Repository"
 
-#: archive.c:569 builtin/archive.c:90
 msgid "retrieve the archive from remote repository <repo>"
 msgstr "Archiv vom Remote-Repository <Repository> abrufen"
 
-#: archive.c:570 builtin/archive.c:91 builtin/difftool.c:708
-#: builtin/notes.c:496
 msgid "command"
 msgstr "Programm"
 
-#: 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:578
 msgid "Unexpected option --remote"
 msgstr "Unerwartete Option --remote"
 
-#: archive.c:580 fetch-pack.c:300 revision.c:2914 builtin/add.c:530
-#: builtin/add.c:562 builtin/checkout.c:1782 builtin/clone.c:1099
-#: builtin/clone.c:1102 builtin/commit.c:371 builtin/fast-export.c:1230
-#: builtin/index-pack.c:1854 builtin/log.c:2140 builtin/reset.c:442
-#: builtin/reset.c:500 builtin/rm.c:281 builtin/stash.c:1708
-#: builtin/worktree.c:580 builtin/worktree.c:781 http-fetch.c:144
-#: http-fetch.c:153
 #, c-format
 msgid "the option '%s' requires '%s'"
 msgstr "die Option '%s' erfordert '%s'"
 
-#: archive.c:582
 msgid "Unexpected option --output"
 msgstr "Unerwartete Option --output"
 
-#: archive.c:606
 #, c-format
 msgid "Unknown archive format '%s'"
 msgstr "Unbekanntes Archivformat '%s'"
 
-#: 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
 #, c-format
 msgid "%.*s is not a valid attribute name"
 msgstr "%.*s ist kein gültiger Attributname"
 
-#: attr.c:363
 #, c-format
 msgid "%s not allowed: %s:%d"
 msgstr "%s nicht erlaubt: %s:%d"
 
-#: attr.c:403
 msgid ""
 "Negative patterns are ignored in git attributes\n"
 "Use '\\!' for literal leading exclamation."
@@ -1778,22 +1434,18 @@ msgstr ""
 "Verneinende Muster werden in Git-Attributen ignoriert.\n"
 "Benutzen Sie '\\!' für führende Ausrufezeichen."
 
-#: 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:698
 #, c-format
 msgid "We cannot bisect more!\n"
 msgstr "Keine binäre Suche mehr möglich!\n"
 
-#: bisect.c:765
 #, c-format
 msgid "Not a valid commit name %s"
 msgstr "%s ist kein gültiger Commit-Name"
 
-#: bisect.c:790
 #, c-format
 msgid ""
 "The merge base %s is bad.\n"
@@ -1802,7 +1454,6 @@ msgstr ""
 "Die Merge-Basis %s ist fehlerhaft.\n"
 "Das bedeutet, der Fehler wurde zwischen %s und [%s] behoben.\n"
 
-#: bisect.c:795
 #, c-format
 msgid ""
 "The merge base %s is new.\n"
@@ -1811,7 +1462,6 @@ msgstr ""
 "Die Merge-Basis %s ist neu.\n"
 "Das bedeutet, die Eigenschaft hat sich zwischen %s und [%s] geändert.\n"
 
-#: bisect.c:800
 #, c-format
 msgid ""
 "The merge base %s is %s.\n"
@@ -1820,7 +1470,6 @@ msgstr ""
 "Die Merge-Basis %s ist %s.\n"
 "Das bedeutet, der erste '%s' Commit befindet sich zwischen %s und [%s].\n"
 
-#: bisect.c:808
 #, c-format
 msgid ""
 "Some %s revs are not ancestors of the %s rev.\n"
@@ -1831,7 +1480,6 @@ msgstr ""
 "git bisect kann in diesem Fall nicht richtig arbeiten.\n"
 "Vielleicht verwechselten Sie %s und %s Commits?\n"
 
-#: bisect.c:821
 #, c-format
 msgid ""
 "the merge base between %s and [%s] must be skipped.\n"
@@ -1843,36 +1491,29 @@ msgstr ""
 "erste %s Commit zwischen %s und %s befindet.\n"
 "Es wird dennoch fortgesetzt."
 
-#: bisect.c:860
 #, 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:910
 #, c-format
 msgid "a %s revision is needed"
 msgstr "ein %s Commit wird benötigt"
 
-#: bisect.c:940
 #, c-format
 msgid "could not create file '%s'"
 msgstr "konnte Datei '%s' nicht erstellen"
 
-#: bisect.c:986 builtin/merge.c:155
 #, c-format
 msgid "could not read file '%s'"
 msgstr "Konnte Datei '%s' nicht lesen"
 
-#: bisect.c:1026
 msgid "reading bisect refs failed"
 msgstr "Lesen von Referenzen für binäre Suche fehlgeschlagen"
 
-#: bisect.c:1056
 #, c-format
 msgid "%s was both %s and %s\n"
 msgstr "%s war sowohl %s als auch %s\n"
 
-#: bisect.c:1065
 #, c-format
 msgid ""
 "No testable commit found.\n"
@@ -1881,7 +1522,6 @@ msgstr ""
 "Kein testbarer Commit gefunden.\n"
 "Vielleicht starteten Sie mit schlechten Pfad-Argumenten?\n"
 
-#: bisect.c:1094
 #, c-format
 msgid "(roughly %d step)"
 msgid_plural "(roughly %d steps)"
@@ -1891,56 +1531,42 @@ msgstr[1] "(ungefähr %d Schritte)"
 #. TRANSLATORS: the last %s will be replaced with "(roughly %d
 #. steps)" translation.
 #.
-#: bisect.c:1100
 #, 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"
 msgstr[0] "Binäre Suche: danach noch %d Commit zum Testen übrig %s\n"
 msgstr[1] "Binäre Suche: danach noch %d Commits zum Testen übrig %s\n"
 
-#: blame.c:2773
 msgid "--contents and --reverse do not blend well."
 msgstr "--contents und --reverse funktionieren gemeinsam nicht."
 
-#: blame.c:2787
 msgid "cannot use --contents with final commit object name"
 msgstr ""
 "kann --contents nicht mit endgültigem Namen des Commit-Objektes benutzen"
 
-#: blame.c:2808
 msgid "--reverse and --first-parent together require specified latest commit"
 msgstr ""
 "--reverse und --first-parent zusammen erfordern die Angabe eines "
 "endgültigen\n"
 "Commits"
 
-#: blame.c:2817 bundle.c:231 midx.c:1058 ref-filter.c:2371 remote.c:2157
-#: sequencer.c:2348 sequencer.c:4872 submodule.c:913 builtin/commit.c:1118
-#: builtin/log.c:437 builtin/log.c:1055 builtin/log.c:1663 builtin/log.c:2096
-#: builtin/log.c:2387 builtin/merge.c:431 builtin/pack-objects.c:3381
-#: builtin/pack-objects.c:3781 builtin/pack-objects.c:3796
-#: builtin/shortlog.c:255
 msgid "revision walk setup failed"
 msgstr "Einrichtung des Revisionsgangs fehlgeschlagen"
 
-#: blame.c:2835
 msgid ""
 "--reverse --first-parent together require range along first-parent chain"
 msgstr ""
 "--reverse und --first-parent zusammen erfordern einen Bereich entlang der\n"
 "\"first-parent\"-Kette"
 
-#: blame.c:2846
 #, c-format
 msgid "no such path %s in %s"
 msgstr "Pfad %s nicht in %s gefunden"
 
-#: blame.c:2857
 #, c-format
 msgid "cannot read blob %s for path %s"
 msgstr "kann Blob %s für Pfad '%s' nicht lesen"
 
-#: branch.c:93
 msgid ""
 "cannot inherit upstream tracking configuration of multiple refs when "
 "rebasing is requested"
@@ -1948,31 +1574,25 @@ msgstr ""
 "Upstream-Tracking-Konfiguration von mehreren Referenzen kann nicht vererbt "
 "werden, wenn ein Rebase angefordert wird"
 
-#: branch.c:104
 #, c-format
 msgid "not setting branch '%s' as its own upstream"
 msgstr "Branch %s nicht als sein eigener Upstream-Branch gesetzt"
 
-#: branch.c:160
 #, c-format
 msgid "branch '%s' set up to track '%s' by rebasing."
 msgstr "Branch '%s' folgt nun '%s' durch Rebase."
 
-#: branch.c:161
 #, c-format
 msgid "branch '%s' set up to track '%s'."
 msgstr "Branch '%s' folgt nun '%s'."
 
-#: branch.c:164
 #, c-format
 msgid "branch '%s' set up to track:"
 msgstr "Branch '%s' folgt nun:"
 
-#: branch.c:176
 msgid "unable to write upstream branch configuration"
 msgstr "konnte Konfiguration zu Upstream-Branch nicht schreiben"
 
-#: branch.c:178
 msgid ""
 "\n"
 "After fixing the error cause you may try to fix up\n"
@@ -1982,35 +1602,33 @@ msgstr ""
 "Nachdem Sie die Fehlerursache behoben haben, können Sie\n"
 "die Tracking-Informationen erneut setzen mit:"
 
-#: branch.c:219
 #, c-format
 msgid "asked to inherit tracking from '%s', but no remote is set"
 msgstr ""
 "Vererbung des Tracking von '%s' angefragt, aber es ist kein Remote-"
 "Repository gesetzt"
 
-#: branch.c:225
 #, c-format
 msgid "asked to inherit tracking from '%s', but no merge configuration is set"
 msgstr ""
 "Vererbung des Tracking von '%s' angefragt, aber es ist keine Merge-"
 "Konfiguration gesetzt"
 
-#: branch.c:277
 #, c-format
 msgid "not tracking: ambiguous information for ref '%s'"
 msgstr "kein Tracking: mehrdeutige Informationen für Referenz '%s'"
 
+#. #-#-#-#-#  branch.c.po  #-#-#-#-#
 #. TRANSLATORS: This is a line listing a remote with duplicate
 #. refspecs in the advice message below. For RTL languages you'll
 #. probably want to swap the "%s" and leading "  " space around.
 #.
+#. #-#-#-#-#  object-name.c.po  #-#-#-#-#
 #. TRANSLATORS: This is line item of ambiguous object output
 #. from describe_ambiguous_object() above. For RTL languages
 #. you'll probably want to swap the "%s" and leading " " space
 #. around.
 #.
-#: branch.c:289 object-name.c:464
 #, c-format
 msgid "  %s\n"
 msgstr "  %s\n"
@@ -2018,7 +1636,6 @@ msgstr "  %s\n"
 #. TRANSLATORS: The second argument is a \n-delimited list of
 #. duplicate refspecs, composed above.
 #.
-#: branch.c:295
 #, c-format
 msgid ""
 "There are multiple remotes whose fetch refspecs map to the remote\n"
@@ -2040,34 +1657,28 @@ msgstr ""
 "Remote-Repositories zu verschiedenen Tracking-Namensräumen\n"
 "zugeordnet werden."
 
-#: branch.c:344
 #, c-format
 msgid "'%s' is not a valid branch name"
 msgstr "'%s' ist kein gültiger Branchname"
 
-#: branch.c:364
 #, c-format
 msgid "a branch named '%s' already exists"
 msgstr "Branch '%s' existiert bereits"
 
-#: branch.c:370
 #, c-format
 msgid "cannot force update the branch '%s' checked out at '%s'"
 msgstr ""
 "kann Aktualisierung des Branches '%s' nicht erzwingen, ausgecheckt in '%s'"
 
-#: branch.c:393
 #, c-format
 msgid "cannot set up tracking information; starting point '%s' is not a branch"
 msgstr ""
 "kann Tracking-Informationen nicht einrichten; Startpunkt '%s' ist kein Branch"
 
-#: branch.c:395
 #, c-format
 msgid "the requested upstream branch '%s' does not exist"
 msgstr "der angeforderte Upstream-Branch '%s' existiert nicht"
 
-#: branch.c:397
 msgid ""
 "\n"
 "If you are planning on basing your work on an upstream\n"
@@ -2088,28 +1699,22 @@ msgstr ""
 "\"git push -u\" verwenden, um den Upstream-Branch beim \"push\"\n"
 "zu konfigurieren."
 
-#: branch.c:445 builtin/replace.c:321 builtin/replace.c:377
-#: builtin/replace.c:423 builtin/replace.c:453
 #, c-format
 msgid "not a valid object name: '%s'"
 msgstr "kein gültiger Objektname: '%s'"
 
-#: branch.c:465
 #, c-format
 msgid "ambiguous object name: '%s'"
 msgstr "mehrdeutiger Objekt-Name: '%s'"
 
-#: branch.c:470
 #, c-format
 msgid "not a valid branch point: '%s'"
 msgstr "ungültiger Branchpunkt: '%s'"
 
-#: branch.c:658
 #, c-format
 msgid "submodule '%s': unable to find submodule"
 msgstr "Submodul '%s': Submodul konnte nicht gefunden werden"
 
-#: branch.c:661
 #, c-format
 msgid ""
 "You may try updating the submodules using 'git checkout %s && git submodule "
@@ -2118,8863 +1723,123 @@ msgstr ""
 "Sie können versuchen die Submodule mit 'git checkout %s && git submodule "
 "update --init' zu aktualisieren"
 
-#: branch.c:672 branch.c:698
 #, c-format
 msgid "submodule '%s': cannot create branch '%s'"
 msgstr "Submodul '%s': kann Branch nicht erzeugen: '%s'"
 
-#: branch.c:730
 #, c-format
 msgid "'%s' is already checked out at '%s'"
 msgstr "'%s' ist bereits in '%s' ausgecheckt"
 
-#: branch.c:755
 #, c-format
 msgid "HEAD of working tree %s is not updated"
 msgstr "HEAD des Arbeitsverzeichnisses %s ist nicht aktualisiert"
 
-#: bundle.c:45
-#, c-format
-msgid "unrecognized bundle hash algorithm: %s"
-msgstr "unbekannter Paket-Hash-Algorithmus: %s"
-
-#: bundle.c:53
-#, c-format
-msgid "unknown capability '%s'"
-msgstr "unbekannte Fähigkeit '%s'"
-
-#: bundle.c:79
-#, c-format
-msgid "'%s' does not look like a v2 or v3 bundle file"
-msgstr "'%s' sieht nicht wie eine v2 oder v3 Paketdatei aus"
-
-#: bundle.c:118
-#, c-format
-msgid "unrecognized header: %s%s (%d)"
-msgstr "nicht erkannter Kopfbereich: %s%s (%d)"
-
-#: bundle.c:145 rerere.c:464 rerere.c:675 sequencer.c:2616 sequencer.c:3402
-#: builtin/commit.c:865
-#, c-format
-msgid "could not open '%s'"
-msgstr "Konnte '%s' nicht öffnen"
-
-#: bundle.c:203
-msgid "Repository lacks these prerequisite commits:"
-msgstr "Dem Repository fehlen folgende vorausgesetzte Commits:"
-
-#: bundle.c:206
-msgid "need a repository to verify a bundle"
-msgstr "um ein Paket zu überprüfen wird ein Repository benötigt"
-
-#: bundle.c:264
-#, c-format
-msgid "The bundle contains this ref:"
-msgid_plural "The bundle contains these %<PRIuMAX> refs:"
-msgstr[0] "Das Paket enthält diese Referenz:"
-msgstr[1] "Das Paket enthält diese %<PRIuMAX> Referenzen:"
-
-#: bundle.c:272
-msgid "The bundle records a complete history."
-msgstr "Das Paket speichert eine komplette Historie."
-
-#: bundle.c:274
-#, c-format
-msgid "The bundle requires this ref:"
-msgid_plural "The bundle requires these %<PRIuMAX> refs:"
-msgstr[0] "Das Paket benötigt diese Referenz:"
-msgstr[1] "Das Paket benötigt diese %<PRIuMAX> Referenzen:"
-
-#: bundle.c:350
-msgid "unable to dup bundle descriptor"
-msgstr "konnte dup für Descriptor des Pakets nicht ausführen"
-
-#: bundle.c:357
-msgid "Could not spawn pack-objects"
-msgstr "Konnte Paketobjekte nicht erstellen"
-
-#: bundle.c:368
-msgid "pack-objects died"
-msgstr "Erstellung der Paketobjekte abgebrochen"
-
-#: bundle.c:417
-#, c-format
-msgid "ref '%s' is excluded by the rev-list options"
-msgstr "Referenz '%s' wird durch \"rev-list\" Optionen ausgeschlossen"
-
-#: bundle.c:533 builtin/log.c:211 builtin/log.c:1975 builtin/shortlog.c:400
-#, c-format
-msgid "unrecognized argument: %s"
-msgstr "nicht erkanntes Argument: %s"
-
-#: bundle.c:548
-#, c-format
-msgid "unsupported bundle version %d"
-msgstr "nicht unterstützte Paket-Version %d"
-
-#: bundle.c:550
-#, c-format
-msgid "cannot write bundle version %d with algorithm %s"
-msgstr "kann Paket-Version %d nicht mit Algorithmus %s schreiben"
-
-#: bundle.c:600
-msgid "Refusing to create empty bundle."
-msgstr "Erstellung eines leeren Pakets zurückgewiesen."
-
-#: bundle.c:610
-#, c-format
-msgid "cannot create '%s'"
-msgstr "kann '%s' nicht erstellen"
-
-#: bundle.c:639
-msgid "index-pack died"
-msgstr "Erstellung der Paketindexdatei abgebrochen"
-
-#: chunk-format.c:117
-msgid "terminating chunk id appears earlier than expected"
-msgstr "abschließende Chunk-ID erscheint eher als erwartet"
-
-#: chunk-format.c:126
-#, c-format
-msgid "improper chunk offset(s) %<PRIx64> and %<PRIx64>"
-msgstr "unzulässige(r) Chunk-Offset(s) %<PRIx64> und %<PRIx64>"
-
-#: chunk-format.c:133
-#, c-format
-msgid "duplicate chunk ID %<PRIx32> found"
-msgstr "doppelte Chunk-ID %<PRIx32> gefunden"
-
-#: chunk-format.c:147
-#, c-format
-msgid "final chunk has non-zero id %<PRIx32>"
-msgstr "letzter Chunk hat nicht-Null ID %<PRIx32>"
-
-#: color.c:354
-#, c-format
-msgid "invalid color value: %.*s"
-msgstr "Ungültiger Farbwert: %.*s"
-
-#: commit-graph.c:204 midx.c:52
-msgid "invalid hash version"
-msgstr "ungültige Hash-Version"
-
-#: commit-graph.c:262
-msgid "commit-graph file is too small"
-msgstr "Commit-Graph-Datei ist zu klein"
-
-#: commit-graph.c:355
-#, c-format
-msgid "commit-graph signature %X does not match signature %X"
-msgstr "Commit-Graph-Signatur %X stimmt nicht mit Signatur %X überein"
-
-#: commit-graph.c:362
-#, c-format
-msgid "commit-graph version %X does not match version %X"
-msgstr "Commit-Graph-Version %X stimmt nicht mit Version %X überein"
-
-#: commit-graph.c:369
-#, c-format
-msgid "commit-graph hash version %X does not match version %X"
-msgstr "Hash-Version des Commit-Graph %X stimmt nicht mit Version %X überein"
-
-#: commit-graph.c:386
-#, c-format
-msgid "commit-graph file is too small to hold %u chunks"
-msgstr "Commit-Graph-Datei ist zu klein, um %u Chunks zu enthalten"
-
-#: commit-graph.c:485
-msgid "commit-graph has no base graphs chunk"
-msgstr "Commit-Graph hat keinen Basis-Graph-Chunk"
-
-#: commit-graph.c:495
-msgid "commit-graph chain does not match"
-msgstr "Commit-Graph Verkettung stimmt nicht überein"
-
-#: commit-graph.c:543
-#, c-format
-msgid "invalid commit-graph chain: line '%s' not a hash"
-msgstr "Ungültige Commit-Graph Verkettung: Zeile '%s' ist kein Hash"
-
-#: commit-graph.c:567
-msgid "unable to find all commit-graph files"
-msgstr "konnte nicht alle Commit-Graph-Dateien finden"
-
-#: commit-graph.c:752 commit-graph.c:789
-msgid "invalid commit position. commit-graph is likely corrupt"
-msgstr "ungültige Commit-Position. Commit-Graph ist wahrscheinlich beschädigt"
-
-#: commit-graph.c:773
-#, c-format
-msgid "could not find commit %s"
-msgstr "konnte Commit %s nicht finden"
-
-#: commit-graph.c:806
-msgid "commit-graph requires overflow generation data but has none"
-msgstr "Commit-Graph erfordert Überlaufgenerierungsdaten, aber hat keine"
-
-#: commit-graph.c:1111 builtin/am.c:1370 builtin/checkout.c:775
-#: builtin/clone.c:705
-#, c-format
-msgid "unable to parse commit %s"
-msgstr "konnte Commit '%s' nicht parsen"
-
-#: commit-graph.c:1373 builtin/pack-objects.c:3078
-#, c-format
-msgid "unable to get type of object %s"
-msgstr "konnte Art von Objekt '%s' nicht bestimmen"
-
-#: commit-graph.c:1404
-msgid "Loading known commits in commit graph"
-msgstr "Lade bekannte Commits in Commit-Graph"
-
-#: commit-graph.c:1421
-msgid "Expanding reachable commits in commit graph"
-msgstr "Erweitere erreichbare Commits in Commit-Graph"
-
-#: commit-graph.c:1441
-msgid "Clearing commit marks in commit graph"
-msgstr "Lösche Commit-Markierungen in Commit-Graph"
-
-#: commit-graph.c:1460
-msgid "Computing commit graph topological levels"
-msgstr "Topologische Ebenen des Commit-Graph werden berechnet"
-
-#: commit-graph.c:1513
-msgid "Computing commit graph generation numbers"
-msgstr "Commit-Graph Generationsnummern berechnen"
-
-#: commit-graph.c:1598
-msgid "Computing commit changed paths Bloom filters"
-msgstr "Berechnung der Bloom-Filter für veränderte Pfade des Commits"
-
-#: commit-graph.c:1675
-msgid "Collecting referenced commits"
-msgstr "Sammle referenzierte Commits"
-
-#: commit-graph.c:1701
-#, c-format
-msgid "Finding commits for commit graph in %<PRIuMAX> pack"
-msgid_plural "Finding commits for commit graph in %<PRIuMAX> packs"
-msgstr[0] "Suche Commits für Commit-Graph in %<PRIuMAX> Paket"
-msgstr[1] "Suche Commits für Commit-Graph in %<PRIuMAX> Paketen"
-
-#: commit-graph.c:1714
-#, c-format
-msgid "error adding pack %s"
-msgstr "Fehler beim Hinzufügen von Paket %s"
-
-#: commit-graph.c:1718
-#, c-format
-msgid "error opening index for %s"
-msgstr "Fehler beim Öffnen des Index für %s"
-
-#: commit-graph.c:1756
-msgid "Finding commits for commit graph among packed objects"
-msgstr "Suche Commits für Commit-Graph in gepackten Objekten"
-
-#: commit-graph.c:1774
-msgid "Finding extra edges in commit graph"
-msgstr "Suche zusätzliche Ränder in Commit-Graph"
-
-#: commit-graph.c:1823
-msgid "failed to write correct number of base graph ids"
-msgstr "Fehler beim Schreiben der korrekten Anzahl von Basis-Graph-IDs"
-
-#: commit-graph.c:1854 midx.c:1168 builtin/sparse-checkout.c:475
-#, c-format
-msgid "unable to create leading directories of %s"
-msgstr "konnte führende Verzeichnisse von '%s' nicht erstellen"
-
-#: commit-graph.c:1868
-msgid "unable to create temporary graph layer"
-msgstr "konnte temporäre Graphen-Schicht nicht erstellen"
-
-#: commit-graph.c:1873
-#, c-format
-msgid "unable to adjust shared permissions for '%s'"
-msgstr "konnte geteilte Zugriffsberechtigungen für '%s' nicht ändern"
-
-#: commit-graph.c:1930
-#, 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:1967
-msgid "unable to open commit-graph chain file"
-msgstr "konnte Commit-Graph Chain-Datei nicht öffnen"
-
-#: commit-graph.c:1983
-msgid "failed to rename base commit-graph file"
-msgstr "konnte Basis-Commit-Graph-Datei nicht umbenennen"
-
-#: commit-graph.c:2004
-msgid "failed to rename temporary commit-graph file"
-msgstr "konnte temporäre Commit-Graph-Datei nicht umbenennen"
-
-#: commit-graph.c:2137
-msgid "Scanning merged commits"
-msgstr "Durchsuche zusammengeführte Commits"
-
-#: commit-graph.c:2181
-msgid "Merging commit-graph"
-msgstr "Zusammenführen von Commit-Graph"
-
-#: commit-graph.c:2289
-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:2396
-msgid "too many commits to write graph"
-msgstr "zu viele Commits zum Schreiben des Graphen"
-
-#: commit-graph.c:2494
-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:2504
-#, 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:2514 commit-graph.c:2529
-#, 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:2521
-#, c-format
-msgid "failed to parse commit %s from commit-graph"
-msgstr "konnte Commit %s von Commit-Graph nicht parsen"
-
-#: commit-graph.c:2539
-msgid "Verifying commits in commit graph"
-msgstr "Commit in Commit-Graph überprüfen"
-
-#: commit-graph.c:2554
-#, 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:2561
-#, 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:2571
-#, 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:2580
-#, 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:2594
-#, 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:2599
-#, c-format
-msgid ""
-"commit-graph has generation number zero for commit %s, but non-zero elsewhere"
-msgstr ""
-"Commit-Graph hat Generationsnummer null für Commit %s, aber sonst ungleich "
-"null"
-
-#: commit-graph.c:2603
-#, c-format
-msgid ""
-"commit-graph has non-zero generation number for commit %s, but zero elsewhere"
-msgstr ""
-"Commit-Graph hat Generationsnummer ungleich null für Commit %s, aber sonst "
-"null"
-
-#: commit-graph.c:2620
-#, 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:2626
-#, 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:54 sequencer.c:3105 builtin/am.c:400 builtin/am.c:445
-#: builtin/am.c:450 builtin/am.c:1449 builtin/am.c:2124 builtin/replace.c:456
-#, c-format
-msgid "could not parse %s"
-msgstr "konnte %s nicht parsen"
-
-#: commit.c:56
-#, c-format
-msgid "%s %s is not a commit!"
-msgstr "%s %s ist kein Commit!"
-
-#: commit.c:197
-msgid ""
-"Support for <GIT_DIR>/info/grafts is deprecated\n"
-"and will be removed in a future Git version.\n"
-"\n"
-"Please use \"git replace --convert-graft-file\"\n"
-"to convert the grafts into replace refs.\n"
-"\n"
-"Turn this message off by running\n"
-"\"git config advice.graftFileDeprecated false\""
-msgstr ""
-"Die Unterstützung für <GIT_DIR>/info/grafts ist veraltet\n"
-"und wird in zukünftigen Git Versionen entfernt.\n"
-"\n"
-"Bitte benutzen Sie \"git replace --convert-graft-file\"\n"
-"zum Konvertieren der künstlichen Vorgänger (\"grafts\")\n"
-"in ersetzende Referenzen.<\n"
-"\n"
-"Sie können diese Meldung unterdrücken, indem Sie\n"
-"\"git config advice.graftFileDeprecated false\" ausführen."
-
-#: commit.c:1252
-#, 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:1256
-#, 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:1259
-#, c-format
-msgid "Commit %s does not have a GPG signature."
-msgstr "Commit %s hat keine GPG-Signatur."
-
-#: commit.c:1262
-#, 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:1516
-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"
-"variable i18n.commitencoding to the encoding your project uses.\n"
-msgstr ""
-"Warnung: Die Commit-Beschreibung ist nicht UTF-8 konform.\n"
-"Sie können das nachbessern, nachdem Sie die Beschreibung korrigiert haben,\n"
-"oder Sie setzen die Konfigurationsvariable i18n.commitencoding auf das "
-"Encoding,\n"
-"welches von ihrem Projekt verwendet wird.\n"
-
-#: compat/obstack.c:406 compat/obstack.c:408
-msgid "memory exhausted"
-msgstr "Speicher verbraucht"
-
-#: compat/terminal.c:167
-msgid "cannot resume in the background, please use 'fg' to resume"
-msgstr ""
-"kann nicht im Hintergrund fortgesetzt werden, bitte verwenden Sie 'fg', um "
-"fortzufahren"
-
-#: compat/terminal.c:168
-msgid "cannot restore terminal settings"
-msgstr "kann Terminaleinstellungen nicht wiederherstellen"
-
-#: config.c:143
-#, c-format
-msgid ""
-"exceeded maximum include depth (%d) while including\n"
-"\t%s\n"
-"from\n"
-"\t%s\n"
-"This might be due to circular includes."
-msgstr ""
-"Maximale Include-Tiefe (%d) beim Einbinden von\n"
-"\t%s\n"
-"von\n"
-"\t%s\n"
-"überschritten.\n"
-"Das könnte durch zirkulare Includes entstanden sein."
-
-#: config.c:159
-#, c-format
-msgid "could not expand include path '%s'"
-msgstr "Konnte Include-Pfad '%s' nicht erweitern."
-
-#: config.c:170
-msgid "relative config includes must come from files"
-msgstr "relative Includes von Konfigurationen müssen aus Dateien kommen"
-
-#: config.c:219
-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:364
-msgid ""
-"remote URLs cannot be configured in file directly or indirectly included by "
-"includeIf.hasconfig:remote.*.url"
-msgstr ""
-"Remote-URLs können nicht in der Datei direkt oder indirekt einbezogen durch "
-"includeIf.hasconfig:remote.*.url konfiguriert werden"
-
-#: config.c:508
-#, c-format
-msgid "invalid config format: %s"
-msgstr "ungültiges Konfigurationsformat: %s"
-
-#: config.c:512
-#, c-format
-msgid "missing environment variable name for configuration '%.*s'"
-msgstr "fehlender Name der Umgebungsvariable für Konfiguration '%.*s'"
-
-#: config.c:517
-#, c-format
-msgid "missing environment variable '%s' for configuration '%.*s'"
-msgstr "fehlende Umgebungsvariable '%s' für Konfiguration '%.*s'"
-
-#: config.c:553
-#, c-format
-msgid "key does not contain a section: %s"
-msgstr "Schlüssel enthält keine Sektion: %s"
-
-#: config.c:558
-#, c-format
-msgid "key does not contain variable name: %s"
-msgstr "Schlüssel enthält keinen Variablennamen: %s"
-
-#: config.c:580 sequencer.c:2802
-#, c-format
-msgid "invalid key: %s"
-msgstr "Ungültiger Schlüssel: %s"
-
-#: config.c:585
-#, c-format
-msgid "invalid key (newline): %s"
-msgstr "Ungültiger Schlüssel (neue Zeile): %s"
-
-#: config.c:605
-msgid "empty config key"
-msgstr "leerer Konfigurationsschlüssel"
-
-#: config.c:623 config.c:635
-#, c-format
-msgid "bogus config parameter: %s"
-msgstr "Fehlerhafter Konfigurationsparameter: %s"
-
-#: config.c:649 config.c:666 config.c:673 config.c:682
-#, c-format
-msgid "bogus format in %s"
-msgstr "Fehlerhaftes Format in %s"
-
-#: config.c:716
-#, c-format
-msgid "bogus count in %s"
-msgstr "falsche Zählung in %s"
-
-#: config.c:720
-#, c-format
-msgid "too many entries in %s"
-msgstr "zu viele Einträge in %s"
-
-#: config.c:730
-#, c-format
-msgid "missing config key %s"
-msgstr "fehlender Konfigurationsschlüssel %s"
-
-#: config.c:738
-#, c-format
-msgid "missing config value %s"
-msgstr "fehlender Konfigurationswert %s"
-
-#: config.c:1089
-#, c-format
-msgid "bad config line %d in blob %s"
-msgstr "Ungültige Konfigurationszeile %d in Blob %s"
-
-#: config.c:1093
-#, c-format
-msgid "bad config line %d in file %s"
-msgstr "Ungültige Konfigurationszeile %d in Datei %s"
-
-#: config.c:1097
-#, c-format
-msgid "bad config line %d in standard input"
-msgstr "Ungültige Konfigurationszeile %d in Standard-Eingabe"
-
-#: config.c:1101
-#, c-format
-msgid "bad config line %d in submodule-blob %s"
-msgstr "Ungültige Konfigurationszeile %d in Submodul-Blob %s"
-
-#: config.c:1105
-#, c-format
-msgid "bad config line %d in command line %s"
-msgstr "Ungültige Konfigurationszeile %d in Kommandozeile %s"
-
-#: config.c:1109
-#, c-format
-msgid "bad config line %d in %s"
-msgstr "Ungültige Konfigurationszeile %d in %s"
-
-#: config.c:1246
-msgid "out of range"
-msgstr "Außerhalb des Bereichs"
-
-#: config.c:1246
-msgid "invalid unit"
-msgstr "Ungültige Einheit"
-
-#: config.c:1247
-#, c-format
-msgid "bad numeric config value '%s' for '%s': %s"
-msgstr "Ungültiger numerischer Wert '%s' für Konfiguration '%s': %s"
-
-#: config.c:1257
-#, 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:1260
-#, 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:1263
-#, 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:1266
-#, 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:1269
-#, 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:1272
-#, 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:1368
-#, c-format
-msgid "invalid value for variable %s"
-msgstr "ungültiger Wert für Variable %s"
-
-#: config.c:1389
-#, c-format
-msgid "ignoring unknown core.fsync component '%s'"
-msgstr "ignoriere unbekannte Komponente '%s' für core.fsync"
-
-#: config.c:1425
-#, c-format
-msgid "bad boolean config value '%s' for '%s'"
-msgstr "ungültiger boolescher Konfigurationswert '%s' für '%s'"
-
-#: config.c:1443
-#, c-format
-msgid "failed to expand user dir in: '%s'"
-msgstr "Fehler beim Erweitern des Nutzerverzeichnisses in: '%s'"
-
-#: config.c:1452
-#, c-format
-msgid "'%s' for '%s' is not a valid timestamp"
-msgstr "'%s' ist kein gültiger Zeitstempel für '%s'"
-
-#: config.c:1545
-#, 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:1559 config.c:1570
-#, c-format
-msgid "bad zlib compression level %d"
-msgstr "ungültiger zlib Komprimierungsgrad %d"
-
-#: config.c:1660
-msgid "core.commentChar should only be one character"
-msgstr "core.commentChar sollte nur ein Zeichen sein"
-
-#: config.c:1692
-#, c-format
-msgid "ignoring unknown core.fsyncMethod value '%s'"
-msgstr "ignoriere unbekannten Wert '%s' für core.fsyncMethod"
-
-#: config.c:1698
-msgid "core.fsyncObjectFiles is deprecated; use core.fsync instead"
-msgstr "core.fsyncObjectFiles is veraltet; nutzen Sie stattdessen core.fsync"
-
-#: config.c:1714
-#, c-format
-msgid "invalid mode for object creation: %s"
-msgstr "Ungültiger Modus für Objekterstellung: %s"
-
-#: config.c:1800
-#, c-format
-msgid "malformed value for %s"
-msgstr "ungültiger Wert für %s"
-
-#: config.c:1826
-#, c-format
-msgid "malformed value for %s: %s"
-msgstr "Ungültiger Wert für %s: %s"
-
-#: config.c:1827
-msgid "must be one of nothing, matching, simple, upstream or current"
-msgstr ""
-"Muss einer von diesen sein: nothing, matching, simple, upstream, current"
-
-#: config.c:1888 builtin/pack-objects.c:4078
-#, c-format
-msgid "bad pack compression level %d"
-msgstr "ungültiger Komprimierungsgrad (%d) für Paketierung"
-
-#: config.c:2014
-#, c-format
-msgid "unable to load config blob object '%s'"
-msgstr "Konnte Blob-Objekt '%s' für Konfiguration nicht laden."
-
-#: config.c:2017
-#, c-format
-msgid "reference '%s' does not point to a blob"
-msgstr "Referenz '%s' zeigt auf keinen Blob."
-
-#: config.c:2035
-#, c-format
-msgid "unable to resolve config blob '%s'"
-msgstr "Konnte Blob '%s' für Konfiguration nicht auflösen."
-
-#: config.c:2080
-#, c-format
-msgid "failed to parse %s"
-msgstr "Fehler beim Parsen von %s."
-
-#: config.c:2136
-msgid "unable to parse command-line config"
-msgstr ""
-"Konnte die über die Befehlszeile angegebene Konfiguration nicht parsen."
-
-#: config.c:2512
-msgid "unknown error occurred while reading the configuration files"
-msgstr ""
-"Es trat ein unbekannter Fehler beim Lesen der Konfigurationsdateien auf."
-
-#: config.c:2686
-#, c-format
-msgid "Invalid %s: '%s'"
-msgstr "Ungültiger %s: '%s'"
-
-#: config.c:2731
-#, 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:2763
-#, 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:2765
-#, 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:2850
-#, c-format
-msgid "invalid section name '%s'"
-msgstr "Ungültiger Sektionsname '%s'"
-
-#: config.c:2882
-#, c-format
-msgid "%s has multiple values"
-msgstr "%s hat mehrere Werte"
-
-#: config.c:2911
-#, c-format
-msgid "failed to write new configuration file %s"
-msgstr "Konnte neue Konfigurationsdatei '%s' nicht schreiben."
-
-#: config.c:3177 config.c:3518
-#, c-format
-msgid "could not lock config file %s"
-msgstr "Konnte Konfigurationsdatei '%s' nicht sperren."
-
-#: config.c:3188
-#, c-format
-msgid "opening %s"
-msgstr "Öffne %s"
-
-#: config.c:3225 builtin/config.c:361
-#, c-format
-msgid "invalid pattern: %s"
-msgstr "Ungültiges Muster: %s"
-
-#: config.c:3250
-#, c-format
-msgid "invalid config file %s"
-msgstr "Ungültige Konfigurationsdatei %s"
-
-#: config.c:3263 config.c:3531
-#, c-format
-msgid "fstat on %s failed"
-msgstr "fstat auf %s fehlgeschlagen"
-
-#: config.c:3274
-#, c-format
-msgid "unable to mmap '%s'%s"
-msgstr "mmap für '%s'(%s) fehlgeschlagen"
-
-#: config.c:3284 config.c:3536
-#, c-format
-msgid "chmod on %s failed"
-msgstr "chmod auf %s fehlgeschlagen"
-
-#: config.c:3369 config.c:3633
-#, c-format
-msgid "could not write config file %s"
-msgstr "Konnte Konfigurationsdatei %s nicht schreiben."
-
-#: config.c:3403
-#, c-format
-msgid "could not set '%s' to '%s'"
-msgstr "Konnte '%s' nicht zu '%s' setzen."
-
-#: config.c:3405 builtin/remote.c:666 builtin/remote.c:885 builtin/remote.c:893
-#, c-format
-msgid "could not unset '%s'"
-msgstr "Konnte '%s' nicht aufheben."
-
-#: config.c:3509
-#, c-format
-msgid "invalid section name: %s"
-msgstr "Ungültiger Sektionsname: %s"
-
-#: config.c:3676
-#, c-format
-msgid "missing value for '%s'"
-msgstr "Fehlender Wert für '%s'"
-
-#: connect.c:61
-msgid "the remote end hung up upon initial contact"
-msgstr "Die Gegenseite hat nach dem ersten Kontakt abgebrochen."
-
-#: connect.c:63
-msgid ""
-"Could not read from remote repository.\n"
-"\n"
-"Please make sure you have the correct access rights\n"
-"and the repository exists."
-msgstr ""
-"Konnte nicht vom Remote-Repository lesen.\n"
-"\n"
-"Bitte stellen Sie sicher, dass die korrekten Zugriffsberechtigungen "
-"bestehen\n"
-"und das Repository existiert."
-
-#: connect.c:81
-#, c-format
-msgid "server doesn't support '%s'"
-msgstr "Der Server unterstützt kein '%s'."
-
-#: connect.c:118
-#, c-format
-msgid "server doesn't support feature '%s'"
-msgstr "Der Server unterstützt das Feature '%s' nicht."
-
-#: connect.c:129
-msgid "expected flush after capabilities"
-msgstr "Erwartete Flush nach Fähigkeiten."
-
-#: connect.c:265
-#, c-format
-msgid "ignoring capabilities after first line '%s'"
-msgstr "Ignoriere Fähigkeiten nach der ersten Zeile '%s'."
-
-#: connect.c:286
-msgid "protocol error: unexpected capabilities^{}"
-msgstr "Protokollfehler: unerwartetes capabilities^{}"
-
-#: connect.c:308
-#, c-format
-msgid "protocol error: expected shallow sha-1, got '%s'"
-msgstr "Protokollfehler: shallow SHA-1 erwartet, '%s' bekommen"
-
-#: 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:349
-msgid "invalid packet"
-msgstr "ungültiges Paket"
-
-#: connect.c:369
-#, c-format
-msgid "protocol error: unexpected '%s'"
-msgstr "Protokollfehler: unerwartetes '%s'"
-
-#: connect.c:499
-#, c-format
-msgid "unknown object format '%s' specified by server"
-msgstr "unbekanntes Objekt-Format '%s' vom Server angegeben"
-
-#: connect.c:528
-#, c-format
-msgid "invalid ls-refs response: %s"
-msgstr "ungültige ls-refs Antwort: %s"
-
-#: connect.c:532
-msgid "expected flush after ref listing"
-msgstr "Flush nach Auflistung der Referenzen erwartet"
-
-#: connect.c:535
-msgid "expected response end packet after ref listing"
-msgstr "Antwort-Endpaket nach Auflistung der Referenzen erwartet"
-
-#: connect.c:670
-#, c-format
-msgid "protocol '%s' is not supported"
-msgstr "Protokoll '%s' wird nicht unterstützt"
-
-#: connect.c:721
-msgid "unable to set SO_KEEPALIVE on socket"
-msgstr "kann SO_KEEPALIVE bei Socket nicht setzen"
-
-#: connect.c:761 connect.c:824
-#, c-format
-msgid "Looking up %s ... "
-msgstr "Suche nach %s ..."
-
-#: 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:769 connect.c:840
-#, c-format
-msgid ""
-"done.\n"
-"Connecting to %s (port %s) ... "
-msgstr ""
-"Fertig.\n"
-"Verbinde nach %s (Port %s) ... "
-
-#: connect.c:791 connect.c:868
-#, c-format
-msgid ""
-"unable to connect to %s:\n"
-"%s"
-msgstr ""
-"Konnte nicht nach %s verbinden:\n"
-"%s"
-
-#. TRANSLATORS: this is the end of "Connecting to %s (port %s) ... "
-#: connect.c:797 connect.c:874
-msgid "done."
-msgstr "Fertig."
-
-#: connect.c:828
-#, c-format
-msgid "unable to look up %s (%s)"
-msgstr "Fehler bei der Suche nach %s (%s)"
-
-#: connect.c:834
-#, c-format
-msgid "unknown port %s"
-msgstr "Unbekannter Port %s"
-
-#: connect.c:971 connect.c:1303
-#, c-format
-msgid "strange hostname '%s' blocked"
-msgstr "Merkwürdigen Hostnamen '%s' blockiert."
-
-#: connect.c:973
-#, c-format
-msgid "strange port '%s' blocked"
-msgstr "Merkwürdigen Port '%s' blockiert."
-
-#: connect.c:983
-#, c-format
-msgid "cannot start proxy %s"
-msgstr "Kann Proxy %s nicht starten."
-
-#: 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:1194
-msgid "newline is forbidden in git:// hosts and repo paths"
-msgstr "Zeilenumbruch ist in git:// Hosts und Repository-Pfaden verboten"
-
-#: connect.c:1251
-msgid "ssh variant 'simple' does not support -4"
-msgstr "SSH-Variante 'simple' unterstützt kein -4"
-
-#: connect.c:1263
-msgid "ssh variant 'simple' does not support -6"
-msgstr "SSH-Variante 'simple' unterstützt kein -6"
-
-#: 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:1392
-#, c-format
-msgid "strange pathname '%s' blocked"
-msgstr "Merkwürdigen Pfadnamen '%s' blockiert"
-
-#: connect.c:1440
-msgid "unable to fork"
-msgstr "kann Prozess nicht starten"
-
-#: connected.c:109 builtin/fsck.c:189 builtin/prune.c:57
-msgid "Checking connectivity"
-msgstr "Prüfe Konnektivität"
-
-#: connected.c:122
-msgid "Could not run 'git rev-list'"
-msgstr "Konnte 'git rev-list' nicht ausführen"
-
-#: connected.c:146
-msgid "failed write to rev-list"
-msgstr "Fehler beim Schreiben nach rev-list"
-
-#: connected.c:151
-msgid "failed to close rev-list's stdin"
-msgstr "Fehler beim Schließen von rev-lists Standard-Eingabe"
-
-#: convert.c:183
-#, c-format
-msgid "illegal crlf_action %d"
-msgstr "Unerlaubte crlf_action %d"
-
-#: convert.c:196
-#, c-format
-msgid "CRLF would be replaced by LF in %s"
-msgstr "CRLF würde in %s durch LF ersetzt werden"
-
-#: convert.c:198
-#, c-format
-msgid ""
-"CRLF will be replaced by LF in %s.\n"
-"The file will have its original line endings in your working directory"
-msgstr ""
-"CRLF wird in %s durch LF ersetzt.\n"
-"Die Datei wird ihre ursprünglichen Zeilenenden im Arbeitsverzeichnis "
-"behalten."
-
-#: convert.c:206
-#, c-format
-msgid "LF would be replaced by CRLF in %s"
-msgstr "LF würde in %s durch CRLF ersetzt werden"
-
-#: convert.c:208
-#, c-format
-msgid ""
-"LF will be replaced by CRLF in %s.\n"
-"The file will have its original line endings in your working directory"
-msgstr ""
-"LF wird in %s durch CRLF ersetzt.\n"
-"Die Datei wird ihre ursprünglichen Zeilenenden im Arbeitsverzeichnis "
-"behalten."
-
-#: convert.c:273
-#, c-format
-msgid "BOM is prohibited in '%s' if encoded as %s"
-msgstr "BOM ist in '%s' unzulässig, wenn als %s codiert"
-
-#: convert.c:280
-#, c-format
-msgid ""
-"The file '%s' contains a byte order mark (BOM). Please use UTF-%.*s as "
-"working-tree-encoding."
-msgstr ""
-"Die Datei '%s' enthält ein Byte-Order-Mark (BOM). Bitte benutzen Sie\n"
-"UTF-%.*s als Codierung im Arbeitsverzeichnis."
-
-#: convert.c:293
-#, c-format
-msgid "BOM is required in '%s' if encoded as %s"
-msgstr "BOM ist erforderlich in '%s', wenn als %s codiert"
-
-#: 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."
-msgstr ""
-"Der Datei '%s' fehlt ein Byte-Order-Mark (BOM). Bitte benutzen Sie UTF-%sBE\n"
-"oder UTF-%sLE (abhängig von der Byte-Reihenfolge) als Codierung im\n"
-"Arbeitsverzeichnis."
-
-#: convert.c:408 convert.c:479
-#, c-format
-msgid "failed to encode '%s' from %s to %s"
-msgstr "Fehler beim Codieren von '%s' von %s nach %s"
-
-#: convert.c:451
-#, c-format
-msgid "encoding '%s' from %s to %s and back is not the same"
-msgstr "Codierung von '%s' von %s nach %s und zurück ist nicht dasselbe"
-
-#: convert.c:654
-#, c-format
-msgid "cannot fork to run external filter '%s'"
-msgstr "kann externen Filter '%s' nicht starten"
-
-#: convert.c:674
-#, c-format
-msgid "cannot feed the input to external filter '%s'"
-msgstr "kann Eingaben nicht an externen Filter '%s' übergeben"
-
-#: convert.c:681
-#, c-format
-msgid "external filter '%s' failed %d"
-msgstr "externer Filter '%s' fehlgeschlagen %d"
-
-#: convert.c:716 convert.c:719
-#, c-format
-msgid "read from external filter '%s' failed"
-msgstr "Lesen von externem Filter '%s' fehlgeschlagen"
-
-#: convert.c:722 convert.c:777
-#, c-format
-msgid "external filter '%s' failed"
-msgstr "externer Filter '%s' fehlgeschlagen"
-
-#: convert.c:826
-msgid "unexpected filter type"
-msgstr "unerwartete Filterart"
-
-#: convert.c:837
-msgid "path name too long for external filter"
-msgstr "Pfadname zu lang für externen Filter"
-
-#: convert.c:935
-#, c-format
-msgid ""
-"external filter '%s' is not available anymore although not all paths have "
-"been filtered"
-msgstr ""
-"externer Filter '%s' nicht mehr verfügbar, obwohl nicht alle Pfade gefiltert "
-"wurden"
-
-#: convert.c:1236
-msgid "true/false are no valid working-tree-encodings"
-msgstr "true/false sind keine gültigen Codierungen im Arbeitsverzeichnis"
-
-#: convert.c:1416 convert.c:1449
-#, c-format
-msgid "%s: clean filter '%s' failed"
-msgstr "%s: clean-Filter '%s' fehlgeschlagen"
-
-#: convert.c:1492
-#, c-format
-msgid "%s: smudge filter %s failed"
-msgstr "%s: smudge-Filter '%s' fehlgeschlagen"
-
-#: credential.c:96
-#, c-format
-msgid "skipping credential lookup for key: credential.%s"
-msgstr "überspringe Suche nach Zugangsdaten für Schlüssel: credential.%s"
-
-#: credential.c:112
-msgid "refusing to work with credential missing host field"
-msgstr "Weigerung, mit fehlendem Hostnamen in Zugangsdaten zu arbeiten"
-
-#: credential.c:114
-msgid "refusing to work with credential missing protocol field"
-msgstr "Weigerung, mit fehlendem Protokoll in Zugangsdaten zu arbeiten"
-
-#: credential.c:396
-#, c-format
-msgid "url contains a newline in its %s component: %s"
-msgstr "URL enthält Zeilenumbruch in der %s Komponente: %s"
-
-#: credential.c:440
-#, c-format
-msgid "url has no scheme: %s"
-msgstr "URL hat kein Schema: %s"
-
-#: credential.c:513
-#, c-format
-msgid "credential url cannot be parsed: %s"
-msgstr "URL mit Zugangsdaten konnte nicht geparst werden: %s"
-
-#: date.c:139
-msgid "in the future"
-msgstr "in der Zukunft"
-
-#: date.c:145
-#, c-format
-msgid "%<PRIuMAX> second ago"
-msgid_plural "%<PRIuMAX> seconds ago"
-msgstr[0] "vor %<PRIuMAX> Sekunde"
-msgstr[1] "vor %<PRIuMAX> Sekunden"
-
-#: date.c:152
-#, c-format
-msgid "%<PRIuMAX> minute ago"
-msgid_plural "%<PRIuMAX> minutes ago"
-msgstr[0] "vor %<PRIuMAX> Minute"
-msgstr[1] "vor %<PRIuMAX> Minuten"
-
-#: date.c:159
-#, c-format
-msgid "%<PRIuMAX> hour ago"
-msgid_plural "%<PRIuMAX> hours ago"
-msgstr[0] "vor %<PRIuMAX> Stunde"
-msgstr[1] "vor %<PRIuMAX> Stunden"
-
-#: date.c:166
-#, c-format
-msgid "%<PRIuMAX> day ago"
-msgid_plural "%<PRIuMAX> days ago"
-msgstr[0] "vor %<PRIuMAX> Tag"
-msgstr[1] "vor %<PRIuMAX> Tagen"
-
-#: date.c:172
-#, c-format
-msgid "%<PRIuMAX> week ago"
-msgid_plural "%<PRIuMAX> weeks ago"
-msgstr[0] "vor %<PRIuMAX> Woche"
-msgstr[1] "vor %<PRIuMAX> Wochen"
-
-#: date.c:179
-#, c-format
-msgid "%<PRIuMAX> month ago"
-msgid_plural "%<PRIuMAX> months ago"
-msgstr[0] "vor %<PRIuMAX> Monat"
-msgstr[1] "vor %<PRIuMAX> Monaten"
-
-#: date.c:190
-#, c-format
-msgid "%<PRIuMAX> year"
-msgid_plural "%<PRIuMAX> years"
-msgstr[0] "vor %<PRIuMAX> Jahr"
-msgstr[1] "vor %<PRIuMAX> Jahren"
-
-#. TRANSLATORS: "%s" is "<n> years"
-#: date.c:193
-#, c-format
-msgid "%s, %<PRIuMAX> month ago"
-msgid_plural "%s, %<PRIuMAX> months ago"
-msgstr[0] "%s, und %<PRIuMAX> Monat"
-msgstr[1] "%s, und %<PRIuMAX> Monaten"
-
-#: date.c:198 date.c:203
-#, c-format
-msgid "%<PRIuMAX> year ago"
-msgid_plural "%<PRIuMAX> years ago"
-msgstr[0] "vor %<PRIuMAX> Jahr"
-msgstr[1] "vor %<PRIuMAX> Jahren"
-
-#: delta-islands.c:272
-msgid "Propagating island marks"
-msgstr "Erzeuge Delta-Island Markierungen"
-
-#: delta-islands.c:290
-#, c-format
-msgid "bad tree object %s"
-msgstr "Ungültiges Tree-Objekt %s."
-
-#: delta-islands.c:334
-#, c-format
-msgid "failed to load island regex for '%s': %s"
-msgstr ""
-"Fehler beim Laden des regulären Ausdrucks des Delta-Island für '%s': %s"
-
-#: delta-islands.c:390
-#, c-format
-msgid "island regex from config has too many capture groups (max=%d)"
-msgstr ""
-"regulärer Ausdruck des Delta-Island aus Konfiguration hat zu\n"
-"viele Capture-Gruppen (maximal %d)"
-
-#: delta-islands.c:467
-#, c-format
-msgid "Marked %d islands, done.\n"
-msgstr "%d Delta-Islands markiert, fertig.\n"
-
-#: diff-merges.c:81 gpg-interface.c:719 gpg-interface.c:734 ls-refs.c:37
-#: parallel-checkout.c:42 sequencer.c:2805 setup.c:563 builtin/am.c:203
-#: builtin/am.c:2243 builtin/am.c:2287 builtin/blame.c:724 builtin/blame.c:742
-#: builtin/fetch.c:792 builtin/pack-objects.c:3515 builtin/pull.c:45
-#: builtin/pull.c:47 builtin/pull.c:321
-#, c-format
-msgid "invalid value for '%s': '%s'"
-msgstr "ungültiger Wert für '%s': '%s'"
-
-#: diff-lib.c:561
-msgid "--merge-base does not work with ranges"
-msgstr "--merge-base funktioniert nicht mit Bereichen"
-
-#: diff-lib.c:563
-msgid "--merge-base only works with commits"
-msgstr "--merge-base funktioniert nur mit Commits"
-
-#: diff-lib.c:580
-msgid "unable to get HEAD"
-msgstr "konnte HEAD nicht bekommen"
-
-#: diff-lib.c:587
-msgid "no merge base found"
-msgstr "keine Merge-Basis gefunden"
-
-#: diff-lib.c:589
-msgid "multiple merge bases found"
-msgstr "mehrere Merge-Basen gefunden"
-
-#: diff-no-index.c:237
-msgid "git diff --no-index [<options>] <path> <path>"
-msgstr "git diff --no-index [<Optionen>] <Pfad> <Pfad>"
-
-#: diff-no-index.c:262
-msgid ""
-"Not a git repository. Use --no-index to compare two paths outside a working "
-"tree"
-msgstr ""
-"Kein Git-Repository. Nutzen Sie --no-index, um zwei Pfade außerhalb des "
-"Arbeitsverzeichnisses zu vergleichen."
-
-#: diff.c:159
-#, c-format
-msgid "  Failed to parse dirstat cut-off percentage '%s'\n"
-msgstr ""
-"  Fehler beim Parsen des abgeschnittenen \"dirstat\" Prozentsatzes '%s'\n"
-
-#: diff.c:164
-#, c-format
-msgid "  Unknown dirstat parameter '%s'\n"
-msgstr "  Unbekannter \"dirstat\" Parameter '%s'\n"
-
-#: diff.c:300
-msgid ""
-"color moved setting must be one of 'no', 'default', 'blocks', 'zebra', "
-"'dimmed-zebra', 'plain'"
-msgstr ""
-"\"color moved\"-Einstellung muss eines von diesen sein: 'no', 'default', "
-"'blocks', 'zebra', 'dimmed-zebra', 'plain'"
-
-#: diff.c:328
-#, 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 ""
-"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:336
-msgid ""
-"color-moved-ws: allow-indentation-change cannot be combined with other "
-"whitespace modes"
-msgstr ""
-"color-moved-ws: allow-indentation-change kann nicht mit anderen\n"
-"Whitespace-Modi kombiniert werden."
-
-#: diff.c:413
-#, c-format
-msgid "Unknown value for 'diff.submodule' config variable: '%s'"
-msgstr "Unbekannter Wert in Konfigurationsvariable 'diff.submodule': '%s'"
-
-#: diff.c:473
-#, c-format
-msgid ""
-"Found errors in 'diff.dirstat' config variable:\n"
-"%s"
-msgstr ""
-"Fehler in 'diff.dirstat' Konfigurationsvariable gefunden:\n"
-"%s"
-
-#: diff.c:4282
-#, c-format
-msgid "external diff died, stopping at %s"
-msgstr "externes Diff-Programm unerwartet beendet, angehalten bei %s"
-
-#: diff.c:4677 parse-options.c:1114
-#, c-format
-msgid "options '%s', '%s', '%s', and '%s' cannot be used together"
-msgstr ""
-"die Optionen '%s', '%s', '%s' und '%s' können nicht gemeinsam verwendet "
-"werden"
-
-#: diff.c:4681 parse-options.c:1118 builtin/worktree.c:578
-#, c-format
-msgid "options '%s', '%s', and '%s' cannot be used together"
-msgstr ""
-"die Optionen '%s', '%s' und '%s' können nicht gemeinsam verwendet werden"
-
-#: diff.c:4685
-#, c-format
-msgid "options '%s' and '%s' cannot be used together, use '%s' with '%s'"
-msgstr ""
-"die Optionen '%s' und '%s' können nicht gemeinsam verwendet werden, nutzen "
-"Sie '%s' mit '%s'"
-
-#: diff.c:4689
-#, c-format
-msgid ""
-"options '%s' and '%s' cannot be used together, use '%s' with '%s' and '%s'"
-msgstr ""
-"die Optionen '%s' und '%s' können nicht gemeinsam verwendet werden, nutzen "
-"Sie '%s' mit '%s' und '%s'"
-
-#: diff.c:4769
-msgid "--follow requires exactly one pathspec"
-msgstr "--follow erfordert genau eine Pfadspezifikation"
-
-#: diff.c:4823
-#, c-format
-msgid "invalid --stat value: %s"
-msgstr "Ungültiger --stat Wert: %s"
-
-#: diff.c:4828 diff.c:4833 diff.c:4838 diff.c:4843 diff.c:5319
-#: parse-options.c:217 parse-options.c:221
-#, c-format
-msgid "%s expects a numerical value"
-msgstr "%s erwartet einen numerischen Wert."
-
-#: diff.c:4860
-#, c-format
-msgid ""
-"Failed to parse --dirstat/-X option parameter:\n"
-"%s"
-msgstr ""
-"Fehler beim Parsen des --dirstat/-X Optionsparameters:\n"
-"%s"
-
-#: diff.c:4893
-#, c-format
-msgid "unknown change class '%c' in --diff-filter=%s"
-msgstr "unbekannte Änderungsklasse '%c' in --diff-filter=%s"
-
-#: diff.c:4917
-#, c-format
-msgid "unknown value after ws-error-highlight=%.*s"
-msgstr "unbekannter Wert nach ws-error-highlight=%.*s"
-
-#: diff.c:4931
-#, c-format
-msgid "unable to resolve '%s'"
-msgstr "konnte '%s' nicht auflösen"
-
-#: diff.c:4981 diff.c:4987
-#, c-format
-msgid "%s expects <n>/<m> form"
-msgstr "%s erwartet die Form <n>/<m>"
-
-#: diff.c:4999
-#, c-format
-msgid "%s expects a character, got '%s'"
-msgstr "%s erwartet ein Zeichen, '%s' bekommen"
-
-#: diff.c:5020
-#, c-format
-msgid "bad --color-moved argument: %s"
-msgstr "ungültiges --color-moved Argument: %s"
-
-#: diff.c:5039
-#, c-format
-msgid "invalid mode '%s' in --color-moved-ws"
-msgstr "ungültiger Modus '%s' in --color-moved-ws"
-
-#: diff.c:5079
-msgid ""
-"option diff-algorithm accepts \"myers\", \"minimal\", \"patience\" and "
-"\"histogram\""
-msgstr ""
-"Option diff-algorithm akzeptiert: \"myers\", \"minimal\", \"patience\" and "
-"\"histogram\""
-
-#: diff.c:5115 diff.c:5135
-#, c-format
-msgid "invalid argument to %s"
-msgstr "ungültiges Argument für %s"
-
-#: diff.c:5239
-#, c-format
-msgid "invalid regex given to -I: '%s'"
-msgstr "ungültiger regulärer Ausdruck für -I gegeben: '%s'"
-
-#: diff.c:5288
-#, c-format
-msgid "failed to parse --submodule option parameter: '%s'"
-msgstr "Fehler beim Parsen des --submodule Optionsparameters: '%s'"
-
-#: diff.c:5344
-#, c-format
-msgid "bad --word-diff argument: %s"
-msgstr "ungültiges --word-diff Argument: %s"
-
-#: diff.c:5380
-msgid "Diff output format options"
-msgstr "Diff-Optionen zu Ausgabeformaten"
-
-#: diff.c:5382 diff.c:5388
-msgid "generate patch"
-msgstr "Patch erzeugen"
-
-#: diff.c:5385 builtin/log.c:180
-msgid "suppress diff output"
-msgstr "Ausgabe der Unterschiede unterdrücken"
-
-#: diff.c:5390 diff.c:5504 diff.c:5511
-msgid "<n>"
-msgstr "<n>"
-
-#: diff.c:5391 diff.c:5394
-msgid "generate diffs with <n> lines context"
-msgstr "Unterschiede mit <n> Zeilen des Kontextes erstellen"
-
-#: diff.c:5396
-msgid "generate the diff in raw format"
-msgstr "Unterschiede im Rohformat erstellen"
-
-#: diff.c:5399
-msgid "synonym for '-p --raw'"
-msgstr "Synonym für '-p --raw'"
-
-#: diff.c:5403
-msgid "synonym for '-p --stat'"
-msgstr "Synonym für '-p --stat'"
-
-#: diff.c:5407
-msgid "machine friendly --stat"
-msgstr "maschinenlesbare Ausgabe von --stat"
-
-#: diff.c:5410
-msgid "output only the last line of --stat"
-msgstr "nur die letzte Zeile von --stat ausgeben"
-
-#: diff.c:5412 diff.c:5420
-msgid "<param1,param2>..."
-msgstr "<Parameter1,Parameter2>..."
-
-#: diff.c:5413
-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:5417
-msgid "synonym for --dirstat=cumulative"
-msgstr "Synonym für --dirstat=cumulative"
-
-#: diff.c:5421
-msgid "synonym for --dirstat=files,param1,param2..."
-msgstr "Synonym für --dirstat=files,Parameter1,Parameter2..."
-
-#: diff.c:5425
-msgid "warn if changes introduce conflict markers or whitespace errors"
-msgstr ""
-"warnen, wenn Änderungen Konfliktmarker oder Whitespace-Fehler einbringen"
-
-#: diff.c:5428
-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:5431
-msgid "show only names of changed files"
-msgstr "nur Dateinamen der geänderten Dateien anzeigen"
-
-#: diff.c:5434
-msgid "show only names and status of changed files"
-msgstr "nur Dateinamen und Status der geänderten Dateien anzeigen"
-
-#: diff.c:5436
-msgid "<width>[,<name-width>[,<count>]]"
-msgstr "<Breite>[,<Namens-Breite>[,<Anzahl>]]"
-
-#: diff.c:5437
-msgid "generate diffstat"
-msgstr "Zusammenfassung der Unterschiede erzeugen"
-
-#: diff.c:5439 diff.c:5442 diff.c:5445
-msgid "<width>"
-msgstr "<Breite>"
-
-#: diff.c:5440
-msgid "generate diffstat with a given width"
-msgstr "Zusammenfassung der Unterschiede mit gegebener Breite erzeugen"
-
-#: diff.c:5443
-msgid "generate diffstat with a given name width"
-msgstr "Zusammenfassung der Unterschiede mit gegebener Namens-Breite erzeugen"
-
-#: diff.c:5446
-msgid "generate diffstat with a given graph width"
-msgstr "Zusammenfassung der Unterschiede mit gegebener Graph-Breite erzeugen"
-
-#: diff.c:5448
-msgid "<count>"
-msgstr "<Anzahl>"
-
-#: diff.c:5449
-msgid "generate diffstat with limited lines"
-msgstr "Zusammenfassung der Unterschiede mit begrenzten Zeilen erzeugen"
-
-#: diff.c:5452
-msgid "generate compact summary in diffstat"
-msgstr "kompakte Zusammenstellung in Zusammenfassung der Unterschiede erzeugen"
-
-#: diff.c:5455
-msgid "output a binary diff that can be applied"
-msgstr "eine binäre Differenz ausgeben, dass angewendet werden kann"
-
-#: diff.c:5458
-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:5460
-msgid "show colored diff"
-msgstr "farbige Unterschiede anzeigen"
-
-#: diff.c:5461
-msgid "<kind>"
-msgstr "<Art>"
-
-#: diff.c:5462
-msgid ""
-"highlight whitespace errors in the 'context', 'old' or 'new' lines in the "
-"diff"
-msgstr ""
-"Whitespace-Fehler in den Zeilen 'context', 'old' oder 'new' bei den "
-"Unterschieden hervorheben"
-
-#: diff.c:5465
-msgid ""
-"do not munge pathnames and use NULs as output field terminators in --raw or "
-"--numstat"
-msgstr ""
-"die Pfadnamen nicht verschleiern und NUL-Zeichen als Schlusszeichen in "
-"Ausgabefeldern bei --raw oder --numstat nutzen"
-
-#: diff.c:5468 diff.c:5471 diff.c:5474 diff.c:5583
-msgid "<prefix>"
-msgstr "<Präfix>"
-
-#: diff.c:5469
-msgid "show the given source prefix instead of \"a/\""
-msgstr "den gegebenen Quell-Präfix statt \"a/\" anzeigen"
-
-#: diff.c:5472
-msgid "show the given destination prefix instead of \"b/\""
-msgstr "den gegebenen Ziel-Präfix statt \"b/\" anzeigen"
-
-#: diff.c:5475
-msgid "prepend an additional prefix to every line of output"
-msgstr "einen zusätzlichen Präfix bei jeder Ausgabezeile voranstellen"
-
-#: diff.c:5478
-msgid "do not show any source or destination prefix"
-msgstr "keine Quell- oder Ziel-Präfixe anzeigen"
-
-#: diff.c:5481
-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:5485 diff.c:5490 diff.c:5495
-msgid "<char>"
-msgstr "<Zeichen>"
-
-#: diff.c:5486
-msgid "specify the character to indicate a new line instead of '+'"
-msgstr "das Zeichen festlegen, das eine neue Zeile kennzeichnet (statt '+')"
-
-#: diff.c:5491
-msgid "specify the character to indicate an old line instead of '-'"
-msgstr "das Zeichen festlegen, das eine alte Zeile kennzeichnet (statt '-')"
-
-#: diff.c:5496
-msgid "specify the character to indicate a context instead of ' '"
-msgstr "das Zeichen festlegen, das den Kontext kennzeichnet (statt ' ')"
-
-#: diff.c:5499
-msgid "Diff rename options"
-msgstr "Diff-Optionen zur Umbenennung"
-
-#: diff.c:5500
-msgid "<n>[/<m>]"
-msgstr "<n>[/<m>]"
-
-#: diff.c:5501
-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:5505
-msgid "detect renames"
-msgstr "Umbenennungen erkennen"
-
-#: diff.c:5509
-msgid "omit the preimage for deletes"
-msgstr "Preimage für Löschungen weglassen"
-
-#: diff.c:5512
-msgid "detect copies"
-msgstr "Kopien erkennen"
-
-#: diff.c:5516
-msgid "use unmodified files as source to find copies"
-msgstr "ungeänderte Dateien als Quelle zum Finden von Kopien nutzen"
-
-#: diff.c:5518
-msgid "disable rename detection"
-msgstr "Erkennung von Umbenennungen deaktivieren"
-
-#: diff.c:5521
-msgid "use empty blobs as rename source"
-msgstr "leere Blobs als Quelle von Umbenennungen nutzen"
-
-#: diff.c:5523
-msgid "continue listing the history of a file beyond renames"
-msgstr "Auflistung der Historie einer Datei nach Umbenennung fortführen"
-
-#: diff.c:5526
-msgid ""
-"prevent rename/copy detection if the number of rename/copy targets exceeds "
-"given limit"
-msgstr ""
-"Erkennung von Umbenennungen und Kopien verhindern, wenn die Anzahl der Ziele "
-"für Umbenennungen und Kopien das gegebene Limit überschreitet"
-
-#: diff.c:5528
-msgid "Diff algorithm options"
-msgstr "Diff Algorithmus-Optionen"
-
-#: diff.c:5530
-msgid "produce the smallest possible diff"
-msgstr "die kleinstmöglichen Änderungen erzeugen"
-
-#: diff.c:5533
-msgid "ignore whitespace when comparing lines"
-msgstr "Whitespace-Änderungen beim Vergleich von Zeilen ignorieren"
-
-#: diff.c:5536
-msgid "ignore changes in amount of whitespace"
-msgstr "Änderungen bei der Anzahl von Whitespace ignorieren"
-
-#: diff.c:5539
-msgid "ignore changes in whitespace at EOL"
-msgstr "Whitespace-Änderungen am Zeilenende ignorieren"
-
-#: diff.c:5542
-msgid "ignore carrier-return at the end of line"
-msgstr "den Zeilenumbruch am Ende der Zeile ignorieren"
-
-#: diff.c:5545
-msgid "ignore changes whose lines are all blank"
-msgstr "Änderungen in leeren Zeilen ignorieren"
-
-#: diff.c:5547 diff.c:5569 diff.c:5572 diff.c:5617
-msgid "<regex>"
-msgstr "<Regex>"
-
-#: diff.c:5548
-msgid "ignore changes whose all lines match <regex>"
-msgstr ""
-"Änderungen ignorieren, bei denen alle Zeilen mit <Regex> übereinstimmen"
-
-#: diff.c:5551
-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:5554
-msgid "generate diff using the \"patience diff\" algorithm"
-msgstr "Änderungen durch Nutzung des Algorithmus \"Patience Diff\" erzeugen"
-
-#: diff.c:5558
-msgid "generate diff using the \"histogram diff\" algorithm"
-msgstr "Änderungen durch Nutzung des Algorithmus \"Histogram Diff\" erzeugen"
-
-#: diff.c:5560
-msgid "<algorithm>"
-msgstr "<Algorithmus>"
-
-#: diff.c:5561
-msgid "choose a diff algorithm"
-msgstr "einen Algorithmus für Änderungen wählen"
-
-#: diff.c:5563
-msgid "<text>"
-msgstr "<Text>"
-
-#: diff.c:5564
-msgid "generate diff using the \"anchored diff\" algorithm"
-msgstr "Änderungen durch Nutzung des Algorithmus \"Anchored Diff\" erzeugen"
-
-#: diff.c:5566 diff.c:5575 diff.c:5578
-msgid "<mode>"
-msgstr "<Modus>"
-
-#: diff.c:5567
-msgid "show word diff, using <mode> to delimit changed words"
-msgstr "Wort-Änderungen zeigen, nutze <Modus>, um Wörter abzugrenzen"
-
-#: diff.c:5570
-msgid "use <regex> to decide what a word is"
-msgstr "<Regex> nutzen, um zu entscheiden, was ein Wort ist"
-
-#: diff.c:5573
-msgid "equivalent to --word-diff=color --word-diff-regex=<regex>"
-msgstr "entsprechend wie --word-diff=color --word-diff-regex=<Regex>"
-
-#: diff.c:5576
-msgid "moved lines of code are colored differently"
-msgstr "verschobene Codezeilen sind andersfarbig"
-
-#: diff.c:5579
-msgid "how white spaces are ignored in --color-moved"
-msgstr "wie Whitespaces in --color-moved ignoriert werden"
-
-#: diff.c:5582
-msgid "Other diff options"
-msgstr "Andere Diff-Optionen"
-
-#: diff.c:5584
-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:5588
-msgid "treat all files as text"
-msgstr "alle Dateien als Text behandeln"
-
-#: diff.c:5590
-msgid "swap two inputs, reverse the diff"
-msgstr "die beiden Eingaben vertauschen und die Änderungen umkehren"
-
-#: diff.c:5592
-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:5594
-msgid "disable all output of the program"
-msgstr "alle Ausgaben vom Programm deaktivieren"
-
-#: diff.c:5596
-msgid "allow an external diff helper to be executed"
-msgstr "erlaube die Ausführung eines externes Programms für Änderungen"
-
-#: diff.c:5598
-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:5600
-msgid "<when>"
-msgstr "<wann>"
-
-#: diff.c:5601
-msgid "ignore changes to submodules in the diff generation"
-msgstr ""
-"Änderungen in Submodulen während der Erstellung der Unterschiede ignorieren"
-
-#: diff.c:5604
-msgid "<format>"
-msgstr "<Format>"
-
-#: diff.c:5605
-msgid "specify how differences in submodules are shown"
-msgstr "angeben, wie Unterschiede in Submodulen gezeigt werden"
-
-#: diff.c:5609
-msgid "hide 'git add -N' entries from the index"
-msgstr "'git add -N' Einträge vom Index verstecken"
-
-#: diff.c:5612
-msgid "treat 'git add -N' entries as real in the index"
-msgstr "'git add -N' Einträge im Index als echt behandeln"
-
-#: diff.c:5614
-msgid "<string>"
-msgstr "<Zeichenkette>"
-
-#: diff.c:5615
-msgid ""
-"look for differences that change the number of occurrences of the specified "
-"string"
-msgstr ""
-"nach Unterschieden suchen, welche die Anzahl des Vorkommens der angegebenen "
-"Zeichenkette verändern"
-
-#: diff.c:5618
-msgid ""
-"look for differences that change the number of occurrences of the specified "
-"regex"
-msgstr ""
-"nach Unterschieden suchen, welche die Anzahl des Vorkommens des angegebenen "
-"regulären Ausdrucks verändern"
-
-#: diff.c:5621
-msgid "show all changes in the changeset with -S or -G"
-msgstr "alle Änderungen im Changeset mit -S oder -G anzeigen"
-
-#: diff.c:5624
-msgid "treat <string> in -S as extended POSIX regular expression"
-msgstr ""
-"<Zeichenkette> bei -S als erweiterten POSIX regulären Ausdruck behandeln"
-
-#: diff.c:5627
-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:5628 diff.c:5631
-msgid "<path>"
-msgstr "<Pfad>"
-
-#: diff.c:5629
-msgid "show the change in the specified path first"
-msgstr "die Änderung des angegebenen Pfades zuerst anzeigen"
-
-#: diff.c:5632
-msgid "skip the output to the specified path"
-msgstr "überspringe die Ausgabe bis zum angegebenen Pfad"
-
-#: diff.c:5634
-msgid "<object-id>"
-msgstr "<Objekt-ID>"
-
-#: diff.c:5635
-msgid ""
-"look for differences that change the number of occurrences of the specified "
-"object"
-msgstr ""
-"nach Unterschieden suchen, welche die Anzahl des Vorkommens des angegebenen "
-"Objektes verändern"
-
-#: diff.c:5637
-msgid "[(A|C|D|M|R|T|U|X|B)...[*]]"
-msgstr "[(A|C|D|M|R|T|U|X|B)...[*]]"
-
-#: diff.c:5638
-msgid "select files by diff type"
-msgstr "Dateien anhand der Art der Änderung wählen"
-
-#: diff.c:5640
-msgid "<file>"
-msgstr "<Datei>"
-
-#: diff.c:5641
-msgid "output to a specific file"
-msgstr "Ausgabe zu einer bestimmten Datei"
-
-#: diff.c:6321
-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:6324
-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:6327
-#, c-format
-msgid ""
-"you may want to set your %s variable to at least %d and retry the command."
-msgstr ""
-"Sie könnten die Variable %s auf mindestens %d setzen und den Befehl\n"
-"erneut versuchen."
-
-#: diffcore-order.c:24
-#, c-format
-msgid "failed to read orderfile '%s'"
-msgstr "Fehler beim Lesen der Reihenfolgedatei '%s'"
-
-#: diffcore-rename.c:1564
-msgid "Performing inexact rename detection"
-msgstr "Führe Erkennung für ungenaue Umbenennung aus"
-
-#: diffcore-rotate.c:29
-#, c-format
-msgid "No such path '%s' in the diff"
-msgstr "Pfad '%s' nicht im Diff gefunden"
-
-#: dir.c:593
-#, c-format
-msgid "pathspec '%s' did not match any file(s) known to git"
-msgstr "Pfadspezifikation '%s' stimmt mit keinen Git bekannten Dateien überein"
-
-#: dir.c:733 dir.c:762 dir.c:775
-#, c-format
-msgid "unrecognized pattern: '%s'"
-msgstr "unbekanntes Muster: '%s'"
-
-#: dir.c:790 dir.c:804
-#, c-format
-msgid "unrecognized negative pattern: '%s'"
-msgstr "unbekanntes verneinendes Muster: '%s'"
-
-#: dir.c:820
-#, c-format
-msgid "your sparse-checkout file may have issues: pattern '%s' is repeated"
-msgstr ""
-"Ihre Datei für den partiellen Checkout hat eventuell Probleme:\n"
-"Muster '%s' wiederholt sich."
-
-#: dir.c:828
-msgid "disabling cone pattern matching"
-msgstr "deaktiviere Cone-Muster-Übereinstimmung"
-
-#: dir.c:1212
-#, c-format
-msgid "cannot use %s as an exclude file"
-msgstr "kann %s nicht als exclude-Filter benutzen"
-
-#: dir.c:2419
-#, c-format
-msgid "could not open directory '%s'"
-msgstr "konnte Verzeichnis '%s' nicht öffnen"
-
-#: dir.c:2721
-msgid "failed to get kernel name and information"
-msgstr "Fehler beim Sammeln von Namen und Informationen zum Kernel"
-
-#: dir.c:2846
-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:3119
-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:3807
-#, c-format
-msgid "index file corrupt in repo %s"
-msgstr "Index-Datei in Repository %s beschädigt"
-
-#: dir.c:3854 dir.c:3859
-#, c-format
-msgid "could not create directories for %s"
-msgstr "Konnte Verzeichnisse für '%s' nicht erstellen"
-
-#: dir.c:3888
-#, 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
-#, 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:179
-msgid "Filtering content"
-msgstr "Filtere Inhalt"
-
-#: entry.c:500
-#, c-format
-msgid "could not stat file '%s'"
-msgstr "konnte Datei '%s' nicht lesen"
-
-#: environment.c:147
-#, c-format
-msgid "bad git namespace path \"%s\""
-msgstr "ungültiger Git-Namespace-Pfad \"%s\""
-
-#: 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:194
-msgid "git fetch-pack: expected shallow list"
-msgstr "git fetch-pack: erwartete shallow-Liste"
-
-#: fetch-pack.c:197
-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:208
-msgid "git fetch-pack: expected ACK/NAK, got a flush packet"
-msgstr "git fetch-pack: ACK/NAK erwartet, Flush-Paket bekommen"
-
-#: fetch-pack.c:228
-#, c-format
-msgid "git fetch-pack: expected ACK/NAK, got '%s'"
-msgstr "git fetch-pack: ACK/NAK erwartet, '%s' bekommen"
-
-#: fetch-pack.c:239
-msgid "unable to write to remote"
-msgstr "konnte nicht zum Remote schreiben"
-
-#: fetch-pack.c:397 fetch-pack.c:1460
-#, c-format
-msgid "invalid shallow line: %s"
-msgstr "ungültige shallow-Zeile: %s"
-
-#: fetch-pack.c:403 fetch-pack.c:1466
-#, c-format
-msgid "invalid unshallow line: %s"
-msgstr "ungültige unshallow-Zeile: %s"
-
-#: fetch-pack.c:405 fetch-pack.c:1468
-#, c-format
-msgid "object not found: %s"
-msgstr "Objekt nicht gefunden: %s"
-
-#: fetch-pack.c:408 fetch-pack.c:1471
-#, c-format
-msgid "error in object: %s"
-msgstr "Fehler in Objekt: %s"
-
-#: fetch-pack.c:410 fetch-pack.c:1473
-#, c-format
-msgid "no shallow found: %s"
-msgstr "kein shallow-Objekt gefunden: %s"
-
-#: fetch-pack.c:413 fetch-pack.c:1477
-#, c-format
-msgid "expected shallow/unshallow, got %s"
-msgstr "shallow/unshallow erwartet, %s bekommen"
-
-#: fetch-pack.c:453
-#, c-format
-msgid "got %s %d %s"
-msgstr "%s %d %s bekommen"
-
-#: fetch-pack.c:470
-#, c-format
-msgid "invalid commit %s"
-msgstr "ungültiger Commit %s"
-
-#: fetch-pack.c:501
-msgid "giving up"
-msgstr "gebe auf"
-
-#: fetch-pack.c:514 progress.h:25
-msgid "done"
-msgstr "fertig"
-
-#: fetch-pack.c:526
-#, c-format
-msgid "got %s (%d) %s"
-msgstr "%s (%d) %s bekommen"
-
-#: fetch-pack.c:562
-#, c-format
-msgid "Marking %s as complete"
-msgstr "Markiere %s als vollständig"
-
-#: fetch-pack.c:784
-#, c-format
-msgid "already have %s (%s)"
-msgstr "habe %s (%s) bereits"
-
-#: fetch-pack.c:870
-msgid "fetch-pack: unable to fork off sideband demultiplexer"
-msgstr "fetch-pack: Fehler beim Starten des sideband demultiplexer"
-
-#: fetch-pack.c:878
-msgid "protocol error: bad pack header"
-msgstr "Protokollfehler: ungültiger Pack-Header"
-
-#: fetch-pack.c:974
-#, c-format
-msgid "fetch-pack: unable to fork off %s"
-msgstr "fetch-pack: konnte %s nicht starten"
-
-#: fetch-pack.c:980
-msgid "fetch-pack: invalid index-pack output"
-msgstr "fetch-pack: ungültige index-pack Ausgabe"
-
-#: fetch-pack.c:997
-#, c-format
-msgid "%s failed"
-msgstr "%s fehlgeschlagen"
-
-#: fetch-pack.c:999
-msgid "error in sideband demultiplexer"
-msgstr "Fehler in sideband demultiplexer"
-
-#: fetch-pack.c:1048
-#, c-format
-msgid "Server version is %.*s"
-msgstr "Server-Version ist %.*s"
-
-#: fetch-pack.c:1056 fetch-pack.c:1062 fetch-pack.c:1065 fetch-pack.c:1071
-#: fetch-pack.c:1075 fetch-pack.c:1079 fetch-pack.c:1083 fetch-pack.c:1087
-#: fetch-pack.c:1091 fetch-pack.c:1095 fetch-pack.c:1099 fetch-pack.c:1103
-#: fetch-pack.c:1109 fetch-pack.c:1115 fetch-pack.c:1120 fetch-pack.c:1125
-#, c-format
-msgid "Server supports %s"
-msgstr "Server unterstützt %s"
-
-#: fetch-pack.c:1058
-msgid "Server does not support shallow clients"
-msgstr "Server unterstützt keine shallow-Clients"
-
-#: fetch-pack.c:1118
-msgid "Server does not support --shallow-since"
-msgstr "Server unterstützt kein --shallow-since"
-
-#: fetch-pack.c:1123
-msgid "Server does not support --shallow-exclude"
-msgstr "Server unterstützt kein --shallow-exclude"
-
-#: fetch-pack.c:1127
-msgid "Server does not support --deepen"
-msgstr "Server unterstützt kein --deepen"
-
-#: fetch-pack.c:1129
-msgid "Server does not support this repository's object format"
-msgstr "Server unterstützt das Objekt-Format dieses Repositories nicht"
-
-#: fetch-pack.c:1142
-msgid "no common commits"
-msgstr "keine gemeinsamen Commits"
-
-#: fetch-pack.c:1151 fetch-pack.c:1506 builtin/clone.c:1166
-msgid "source repository is shallow, reject to clone."
-msgstr ""
-"Quelle ist ein Repository mit unvollständiger Historie (shallow), Klonen "
-"zurückgewiesen."
-
-#: fetch-pack.c:1157 fetch-pack.c:1705
-msgid "git fetch-pack: fetch failed."
-msgstr "git fetch-pack: Abholen fehlgeschlagen."
-
-#: fetch-pack.c:1271
-#, c-format
-msgid "mismatched algorithms: client %s; server %s"
-msgstr "Algorithmen stimmen nicht überein: Client %s; Server %s"
-
-#: fetch-pack.c:1275
-#, c-format
-msgid "the server does not support algorithm '%s'"
-msgstr "der Server unterstützt Algorithmus '%s' nicht"
-
-#: fetch-pack.c:1308
-msgid "Server does not support shallow requests"
-msgstr "Server unterstützt keine shallow-Anfragen"
-
-#: fetch-pack.c:1315
-msgid "Server supports filter"
-msgstr "Server unterstützt Filter"
-
-#: fetch-pack.c:1358 fetch-pack.c:2087
-msgid "unable to write request to remote"
-msgstr "konnte Anfrage nicht zum Remote schreiben"
-
-#: fetch-pack.c:1376
-#, c-format
-msgid "error reading section header '%s'"
-msgstr "Fehler beim Lesen von Sektionskopf '%s'."
-
-#: fetch-pack.c:1382
-#, c-format
-msgid "expected '%s', received '%s'"
-msgstr "'%s' erwartet, '%s' empfangen"
-
-#: fetch-pack.c:1416
-#, c-format
-msgid "unexpected acknowledgment line: '%s'"
-msgstr "Unerwartete Acknowledgment-Zeile: '%s'"
-
-#: fetch-pack.c:1421
-#, c-format
-msgid "error processing acks: %d"
-msgstr "Fehler beim Verarbeiten von ACKS: %d"
-
-#. TRANSLATORS: The parameter will be 'ready', a protocol
-#. keyword.
-#.
-#: fetch-pack.c:1435
-#, c-format
-msgid "expected packfile to be sent after '%s'"
-msgstr "erwartete Versand einer Packdatei nach '%s'"
-
-#. TRANSLATORS: The parameter will be 'ready', a protocol
-#. keyword.
-#.
-#: fetch-pack.c:1441
-#, c-format
-msgid "expected no other sections to be sent after no '%s'"
-msgstr "erwartete keinen Versand anderer Sektionen nach keinem '%s'"
-
-#: fetch-pack.c:1482
-#, c-format
-msgid "error processing shallow info: %d"
-msgstr "Fehler beim Verarbeiten von Shallow-Informationen: %d"
-
-#: fetch-pack.c:1531
-#, c-format
-msgid "expected wanted-ref, got '%s'"
-msgstr "wanted-ref erwartet, '%s' bekommen"
-
-#: fetch-pack.c:1536
-#, c-format
-msgid "unexpected wanted-ref: '%s'"
-msgstr "unerwartetes wanted-ref: '%s'"
-
-#: fetch-pack.c:1541
-#, c-format
-msgid "error processing wanted refs: %d"
-msgstr "Fehler beim Verarbeiten von wanted-refs: %d"
-
-#: fetch-pack.c:1571
-msgid "git fetch-pack: expected response end packet"
-msgstr "git fetch-pack: Antwort-Endpaket erwartet"
-
-#: fetch-pack.c:1983
-msgid "no matching remote head"
-msgstr "kein übereinstimmender Remote-Branch"
-
-#: fetch-pack.c:2006 builtin/clone.c:587
-msgid "remote did not send all necessary objects"
-msgstr "Remote-Repository hat nicht alle erforderlichen Objekte gesendet"
-
-#: fetch-pack.c:2109
-msgid "unexpected 'ready' from remote"
-msgstr "unerwartetes 'ready' von Remote-Repository"
-
-#: fetch-pack.c:2132
-#, c-format
-msgid "no such remote ref %s"
-msgstr "Remote-Referenz %s nicht gefunden"
-
-#: fetch-pack.c:2135
-#, c-format
-msgid "Server does not allow request for unadvertised object %s"
-msgstr "Der Server lehnt Anfrage nach nicht angebotenem Objekt %s ab."
-
-#: fsmonitor-ipc.c:119
-#, c-format
-msgid "fsmonitor_ipc__send_query: invalid path '%s'"
-msgstr "fsmonitor_ipc__send_query: ungültiger Pfad '%s'"
-
-#: fsmonitor-ipc.c:125
-#, c-format
-msgid "fsmonitor_ipc__send_query: unspecified error on '%s'"
-msgstr "fsmonitor_ipc__send_query: nicht spezifizierter Fehler bei '%s'"
-
-#: fsmonitor-ipc.c:155
-msgid "fsmonitor--daemon is not running"
-msgstr "fsmonitor--daemon läuft nicht"
-
-#: fsmonitor-ipc.c:164
-#, c-format
-msgid "could not send '%s' command to fsmonitor--daemon"
-msgstr "konnte '%s' Befehl nicht an fsmonitor--daemon senden"
-
-#: gpg-interface.c:329 gpg-interface.c:456 gpg-interface.c:995
-#: gpg-interface.c:1011
-msgid "could not create temporary file"
-msgstr "konnte temporäre Datei nicht erstellen"
-
-#: gpg-interface.c:332 gpg-interface.c:459
-#, c-format
-msgid "failed writing detached signature to '%s'"
-msgstr "Fehler beim Schreiben der losgelösten Signatur nach '%s'"
-
-#: gpg-interface.c:450
-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:479
-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:550
-#, c-format
-msgid "ssh signing revocation file configured but not found: %s"
-msgstr "SSH-Signatursperrdatei konfiguriert, aber nicht gefunden: %s"
-
-#: gpg-interface.c:638
-#, c-format
-msgid "bad/incompatible signature '%s'"
-msgstr "fehlerhafte/inkompatible Signatur '%s'"
-
-#: gpg-interface.c:815 gpg-interface.c:820
-#, 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:843
-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:865
-#, 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:871
-#, c-format
-msgid "gpg.ssh.defaultKeyCommand failed: %s %s"
-msgstr "gpg.ssh.defaultKeyCommand fehlgeschlagen: %s %s"
-
-#: gpg-interface.c:966
-msgid "gpg failed to sign the data"
-msgstr "gpg beim Signieren der Daten fehlgeschlagen"
-
-#: gpg-interface.c:988
-msgid "user.signingkey needs to be set for ssh signing"
-msgstr "user.signingkey muss für die SSH-Signatur gesetzt sein"
-
-#: gpg-interface.c:999
-#, c-format
-msgid "failed writing ssh signing key to '%s'"
-msgstr "Fehler beim Schreiben des SSH-Signaturschlüssels nach '%s'"
-
-#: gpg-interface.c:1017
-#, c-format
-msgid "failed writing ssh signing key buffer to '%s'"
-msgstr "Fehler beim Schreiben des SSH-Signaturschlüsselpuffers nach '%s'"
-
-#: gpg-interface.c:1035
-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:1047
-#, 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:446
-msgid ""
-"given pattern contains NULL byte (via -f <file>). This is only supported "
-"with -P under PCRE v2"
-msgstr ""
-"Angegebenes Muster enthält NULL Byte (über -f <Datei>). Das wird nur mit -"
-"Punter PCRE v2 unterstützt."
-
-#: grep.c:1859
-#, c-format
-msgid "'%s': unable to read %s"
-msgstr "'%s': konnte %s nicht lesen"
-
-#: grep.c:1876 setup.c:178 builtin/clone.c:308 builtin/diff.c:90
-#: builtin/rm.c:136
-#, c-format
-msgid "failed to stat '%s'"
-msgstr "Konnte '%s' nicht lesen"
-
-#: grep.c:1887
-#, c-format
-msgid "'%s': short read"
-msgstr "'%s': read() zu kurz"
-
-#: help.c:25
-msgid "start a working area (see also: git help tutorial)"
-msgstr "Arbeitsverzeichnis anlegen (siehe auch: git help tutorial)"
-
-#: help.c:26
-msgid "work on the current change (see also: git help everyday)"
-msgstr "an aktuellen Änderungen arbeiten (siehe auch: git help everyday)"
-
-#: help.c:27
-msgid "examine the history and state (see also: git help revisions)"
-msgstr "Historie und Status untersuchen (siehe auch: git help revisions)"
-
-#: help.c:28
-msgid "grow, mark and tweak your common history"
-msgstr "Historie erweitern und bearbeiten"
-
-#: help.c:29
-msgid "collaborate (see also: git help workflows)"
-msgstr "mit anderen zusammenarbeiten (siehe auch: git help workflows)"
-
-#: help.c:33
-msgid "Main Porcelain Commands"
-msgstr "Hauptbefehle"
-
-#: help.c:34
-msgid "Ancillary Commands / Manipulators"
-msgstr "Nebenbefehle / Manipulationen"
-
-#: help.c:35
-msgid "Ancillary Commands / Interrogators"
-msgstr "Nebenbefehle / Abfragen"
-
-#: help.c:36
-msgid "Interacting with Others"
-msgstr "mit anderen interagieren"
-
-#: help.c:37
-msgid "Low-level Commands / Manipulators"
-msgstr "Systembefehle / Manipulationen"
-
-#: help.c:38
-msgid "Low-level Commands / Interrogators"
-msgstr "Systembefehle / Abfragen"
-
-#: help.c:39
-msgid "Low-level Commands / Syncing Repositories"
-msgstr "Systembefehle / Repositories synchronisieren"
-
-#: help.c:40
-msgid "Low-level Commands / Internal Helpers"
-msgstr "Systembefehle / Interne Hilfsbefehle"
-
-#: help.c:316
-#, c-format
-msgid "available git commands in '%s'"
-msgstr "Vorhandene Git-Befehle in '%s'"
-
-#: help.c:323
-msgid "git commands available from elsewhere on your $PATH"
-msgstr "Vorhandene Git-Befehle anderswo in Ihrem $PATH"
-
-#: help.c:332
-msgid "These are common Git commands used in various situations:"
-msgstr "Allgemeine Git-Befehle, verwendet in verschiedenen Situationen:"
-
-#: help.c:382 git.c:100
-#, c-format
-msgid "unsupported command listing type '%s'"
-msgstr "Nicht unterstützte Art zur Befehlsauflistung '%s'."
-
-#: help.c:422
-msgid "The Git concept guides are:"
-msgstr "Die Git-Konzeptanleitungen sind:"
-
-#: help.c:446
-msgid "External commands"
-msgstr "Externe Befehle"
-
-#: help.c:468
-msgid "Command aliases"
-msgstr "Alias-Befehle"
-
-#: help.c:486
-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:563
-#, c-format
-msgid ""
-"'%s' appears to be a git command, but we were not\n"
-"able to execute it. Maybe git-%s is broken?"
-msgstr ""
-"'%s' scheint ein git-Befehl zu sein, konnte aber\n"
-"nicht ausgeführt werden. Vielleicht ist git-%s fehlerhaft?"
-
-#: help.c:585 help.c:682
-#, 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:633
-msgid "Uh oh. Your system reports no Git commands at all."
-msgstr "Uh oh. Keine Git-Befehle auf Ihrem System vorhanden."
-
-#: help.c:655
-#, 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:660
-#, c-format
-msgid "Continuing under the assumption that you meant '%s'."
-msgstr "Setze fort unter der Annahme, dass Sie '%s' meinten."
-
-#: help.c:666
-#, c-format
-msgid "Run '%s' instead [y/N]? "
-msgstr "Stattdessen '%s' ausführen (y/N)? "
-
-#: help.c:674
-#, 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:686
-msgid ""
-"\n"
-"The most similar command is"
-msgid_plural ""
-"\n"
-"The most similar commands are"
-msgstr[0] ""
-"\n"
-"Der ähnlichste Befehl ist"
-msgstr[1] ""
-"\n"
-"Die ähnlichsten Befehle sind"
-
-#: help.c:729
-msgid "git version [<options>]"
-msgstr "git version [<Optionen>]"
-
-#: help.c:784
-#, c-format
-msgid "%s: %s - %s"
-msgstr "%s: %s - %s"
-
-#: help.c:788
-msgid ""
-"\n"
-"Did you mean this?"
-msgid_plural ""
-"\n"
-"Did you mean one of these?"
-msgstr[0] ""
-"\n"
-"Haben Sie das gemeint?"
-msgstr[1] ""
-"\n"
-"Haben Sie eines von diesen gemeint?"
-
-#: hook.c:28
-#, 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."
-
-#: hook.c:87
-#, c-format
-msgid "Couldn't start hook '%s'\n"
-msgstr "Konnte Hook '%s' nicht starten\n"
-
-#: ident.c:354
-msgid "Author identity unknown\n"
-msgstr "Identität des Autors unbekannt\n"
-
-#: ident.c:357
-msgid "Committer identity unknown\n"
-msgstr "Identität des Commit-Erstellers unbekannt\n"
-
-#: ident.c:363
-msgid ""
-"\n"
-"*** Please tell me who you are.\n"
-"\n"
-"Run\n"
-"\n"
-"  git config --global user.email \"you@example.com\"\n"
-"  git config --global user.name \"Your Name\"\n"
-"\n"
-"to set your account's default identity.\n"
-"Omit --global to set the identity only in this repository.\n"
-"\n"
-msgstr ""
-"\n"
-"*** Bitte geben Sie an, wer Sie sind.\n"
-"\n"
-"Führen Sie\n"
-"\n"
-"  git config --global user.email \"you@example.com\"\n"
-"  git config --global user.name \"Your Name\"\n"
-"\n"
-"aus, um das als Ihre standardmäßige Identität zu setzen.\n"
-"Lassen Sie die Option \"--global\" weg, um die Identität nur\n"
-"für dieses Repository zu setzen.\n"
-
-#: ident.c:398
-msgid "no email was given and auto-detection is disabled"
-msgstr "keine E-Mail angegeben und automatische Erkennung ist deaktiviert"
-
-#: ident.c:403
-#, c-format
-msgid "unable to auto-detect email address (got '%s')"
-msgstr "Konnte die E-Mail-Adresse nicht automatisch erkennen ('%s' erhalten)"
-
-#: ident.c:420
-msgid "no name was given and auto-detection is disabled"
-msgstr "kein Name angegeben und automatische Erkennung ist deaktiviert"
-
-#: ident.c:426
-#, c-format
-msgid "unable to auto-detect name (got '%s')"
-msgstr "konnte Namen nicht automatisch erkennen ('%s' erhalten)"
-
-#: ident.c:434
-#, c-format
-msgid "empty ident name (for <%s>) not allowed"
-msgstr "Leerer Name in Identifikation (für <%s>) nicht erlaubt."
-
-#: ident.c:440
-#, c-format
-msgid "name consists only of disallowed characters: %s"
-msgstr "Name besteht nur aus nicht erlaubten Zeichen: %s"
-
-#: ident.c:455 builtin/commit.c:649
-#, c-format
-msgid "invalid date format: %s"
-msgstr "Ungültiges Datumsformat: %s"
-
-#: list-objects-filter-options.c:68
-msgid "expected 'tree:<depth>'"
-msgstr "'tree:<Tiefe>' erwartet"
-
-#: list-objects-filter-options.c:83
-msgid "sparse:path filters support has been dropped"
-msgstr "Keine Unterstützung für sparse:path Filter mehr"
-
-#: list-objects-filter-options.c:90
-#, c-format
-msgid "'%s' for 'object:type=<type>' is not a valid object type"
-msgstr "'%s' für 'object:type=<Typ>' ist kein gültiger Objekttyp"
-
-#: list-objects-filter-options.c:109
-#, c-format
-msgid "invalid filter-spec '%s'"
-msgstr "Ungültige filter-spec '%s'"
-
-#: list-objects-filter-options.c:125
-#, c-format
-msgid "must escape char in sub-filter-spec: '%c'"
-msgstr "Zeichen in sub-filter-spec muss maskiert werden: '%c'"
-
-#: list-objects-filter-options.c:167
-msgid "expected something after combine:"
-msgstr "erwartete etwas nach 'combine:'"
-
-#: list-objects-filter-options.c:249
-msgid "multiple filter-specs cannot be combined"
-msgstr "mehrere filter-specs können nicht kombiniert werden"
-
-#: list-objects-filter-options.c:365
-msgid "unable to upgrade repository format to support partial clone"
-msgstr ""
-"Repository-Format konnte nicht erweitert werden, um partielles Klonen zu "
-"unterstützen"
-
-#: list-objects-filter.c:532
-#, c-format
-msgid "unable to access sparse blob in '%s'"
-msgstr "konnte nicht auf partiellen Blob '%s' zugreifen"
-
-#: list-objects-filter.c:535
-#, c-format
-msgid "unable to parse sparse filter data in %s"
-msgstr "konnte partielle Filter-Daten in %s nicht parsen"
-
-#: list-objects.c:144
-#, c-format
-msgid "entry '%s' in tree %s has tree mode, but is not a tree"
-msgstr ""
-"Eintrag '%s' im Tree-Objekt %s hat Tree-Modus, aber ist kein Tree-Objekt"
-
-#: list-objects.c:157
-#, c-format
-msgid "entry '%s' in tree %s has blob mode, but is not a blob"
-msgstr "Eintrag '%s' im Tree-Objekt %s hat Blob-Modus, aber ist kein Blob"
-
-#: list-objects.c:415
-#, c-format
-msgid "unable to load root tree for commit %s"
-msgstr "Konnte Root-Tree-Objekt für Commit %s nicht laden."
-
-#: lockfile.c:152
-#, c-format
-msgid ""
-"Unable to create '%s.lock': %s.\n"
-"\n"
-"Another git process seems to be running in this repository, e.g.\n"
-"an editor opened by 'git commit'. Please make sure all processes\n"
-"are terminated then try again. If it still fails, a git process\n"
-"may have crashed in this repository earlier:\n"
-"remove the file manually to continue."
-msgstr ""
-"Konnte '%s.lock' nicht erstellen: %s.\n"
-"\n"
-"Ein anderer Git-Prozess scheint in diesem Repository ausgeführt\n"
-"zu werden, zum Beispiel ein noch offener Editor von 'git commit'.\n"
-"Bitte stellen Sie sicher, dass alle Prozesse beendet wurden und\n"
-"versuchen Sie es erneut. Falls es immer noch fehlschlägt, könnte\n"
-"ein früherer Git-Prozess in diesem Repository abgestürzt sein:\n"
-"Löschen Sie die Datei manuell um fortzufahren."
-
-#: lockfile.c:160
-#, c-format
-msgid "Unable to create '%s.lock': %s"
-msgstr "Konnte '%s.lock' nicht erstellen: %s"
-
-#: ls-refs.c:175
-#, c-format
-msgid "unexpected line: '%s'"
-msgstr "unerwartete Zeile: '%s'"
-
-#: ls-refs.c:179
-msgid "expected flush after ls-refs arguments"
-msgstr "erwartete Flush nach Argumenten für die Auflistung der Referenzen"
-
-#: mailinfo.c:1050
-msgid "quoted CRLF detected"
-msgstr "angeführtes CRLF entdeckt"
-
-#: mailinfo.c:1254 builtin/am.c:185 builtin/mailinfo.c:46
-#, c-format
-msgid "bad action '%s' for '%s'"
-msgstr "ungültige Aktion '%s' für '%s'"
-
-#: merge-ort.c:1630 merge-recursive.c:1214
-#, c-format
-msgid "Failed to merge submodule %s (not checked out)"
-msgstr "Fehler beim Merge von Submodul %s (nicht ausgecheckt)."
-
-#: merge-ort.c:1639 merge-recursive.c:1221
-#, c-format
-msgid "Failed to merge submodule %s (commits not present)"
-msgstr "Fehler beim Merge von Submodul %s (Commits nicht vorhanden)."
-
-#: merge-ort.c:1648 merge-recursive.c:1228
-#, 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:1658 merge-ort.c:1666
-#, c-format
-msgid "Note: Fast-forwarding submodule %s to %s"
-msgstr "Hinweis: Spule Submodul %s vor zu %s"
-
-#: merge-ort.c:1688
-#, c-format
-msgid "Failed to merge submodule %s"
-msgstr "Fehler beim Zusammenführen von Submodul %s"
-
-#: merge-ort.c:1695
-#, c-format
-msgid ""
-"Failed to merge submodule %s, but a possible merge resolution exists:\n"
-"%s\n"
-msgstr ""
-"Fehler beim Zusammenführen von Submodul %s, aber es ist eine mögliche "
-"Auflösung des Merges vorhanden:\n"
-"%s\n"
-
-#: merge-ort.c:1699 merge-recursive.c:1284
-#, c-format
-msgid ""
-"If this is correct simply add it to the index for example\n"
-"by using:\n"
-"\n"
-"  git update-index --cacheinfo 160000 %s \"%s\"\n"
-"\n"
-"which will accept this suggestion.\n"
-msgstr ""
-"Falls das korrekt ist, fügen Sie es einfach der Staging-Area, zum Beispiel "
-"mit:\n"
-"\n"
-"  git update-index --cacheinfo 160000 %s \"%s\"\n"
-"\n"
-"hinzu, um diesen Vorschlag zu akzeptieren.\n"
-
-#: merge-ort.c:1712
-#, c-format
-msgid ""
-"Failed to merge submodule %s, but multiple possible merges exist:\n"
-"%s"
-msgstr ""
-"Fehler beim Zusammenführen von Submodul %s, aber mehrere mögliche Merges "
-"sind vorhanden:\n"
-"%s"
-
-#: merge-ort.c:1937 merge-recursive.c:1375
-msgid "Failed to execute internal merge"
-msgstr "Fehler bei Ausführung des internen Merges"
-
-#: merge-ort.c:1942 merge-recursive.c:1380
-#, c-format
-msgid "Unable to add %s to database"
-msgstr "Konnte %s nicht zur Datenbank hinzufügen"
-
-#: merge-ort.c:1949 merge-recursive.c:1413
-#, c-format
-msgid "Auto-merging %s"
-msgstr "automatischer Merge von %s"
-
-#: merge-ort.c:2088 merge-recursive.c:2135
-#, 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 ""
-"KONFLIKT (implizite Verzeichnisumbenennung): Existierende Datei/Pfad bei %s "
-"im\n"
-"Weg von impliziter Verzeichnisumbenennung, die versucht, einen oder mehrere\n"
-"Pfade dahin zu setzen: %s."
-
-#: merge-ort.c:2098 merge-recursive.c:2145
-#, 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 ""
-"KONFLIKT (implizite Verzeichnisumbenennung): Kann nicht mehr als ein Pfad "
-"zu\n"
-"%s mappen; implizite Verzeichnisumbenennungen versuchten diese Pfade dahin\n"
-"zu setzen: %s"
-
-#: merge-ort.c:2156
-#, c-format
-msgid ""
-"CONFLICT (directory rename split): Unclear where to rename %s to; it was "
-"renamed to multiple other directories, with no destination getting a "
-"majority of the files."
-msgstr ""
-"KONFLIKT (Aufteilung Verzeichnisumbenennung): Unklar, wo %s zu platzieren "
-"ist; es wurde zu mehreren anderen Verzeichnissen umbenannt, ohne dass ein "
-"Ziel die Mehrheit der Dateien erhält."
-
-#: merge-ort.c:2310 merge-recursive.c:2481
-#, c-format
-msgid ""
-"WARNING: Avoiding applying %s -> %s rename to %s, because %s itself was "
-"renamed."
-msgstr ""
-"WARNUNG: Vermeide Umbenennung %s -> %s von %s, weil %s selbst umbenannt "
-"wurde."
-
-#: merge-ort.c:2450 merge-recursive.c:3264
-#, c-format
-msgid ""
-"Path updated: %s added in %s inside a directory that was renamed in %s; "
-"moving it to %s."
-msgstr ""
-"Pfad aktualisiert: %s hinzugefügt in %s innerhalb eines Verzeichnisses, das "
-"umbenannt wurde in %s; verschiebe es nach %s."
-
-#: merge-ort.c:2457 merge-recursive.c:3271
-#, c-format
-msgid ""
-"Path updated: %s renamed to %s in %s, inside a directory that was renamed in "
-"%s; moving it to %s."
-msgstr ""
-"Pfad aktualisiert: %s umbenannt nach %s in %s, innerhalb eines "
-"Verzeichnisses, das umbenannt wurde in %s; verschiebe es nach %s."
-
-#: merge-ort.c:2470 merge-recursive.c:3267
-#, 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 ""
-"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:2478 merge-recursive.c:3274
-#, 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 ""
-"KONFLIKT (Speicherort): %s umbenannt nach %s in %s, innerhalb eines "
-"Verzeichnisses, das umbenannt wurde in %s, es sollte vielleicht nach %s "
-"verschoben werden."
-
-#: merge-ort.c:2634
-#, 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:2729
-#, 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."
-msgstr ""
-"KONFLIKT (Umbenennung in Kollision beteiligt): Umbenennung von %s -> %s hat "
-"Inhaltskonflikte UND kollidiert mit einem anderen Pfad; dies kann zu "
-"verschachtelten Konfliktmarkierungen führen."
-
-#: merge-ort.c:2748 merge-ort.c:2772
-#, 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:3261 merge-recursive.c:3025
-#, c-format
-msgid "cannot read object %s"
-msgstr "kann Objekt %s nicht lesen"
-
-#: merge-ort.c:3264 merge-recursive.c:3028
-#, c-format
-msgid "object %s is not a blob"
-msgstr "Objekt %s ist kein Blob"
-
-#: merge-ort.c:3693
-#, c-format
-msgid ""
-"CONFLICT (file/directory): directory in the way of %s from %s; moving it to "
-"%s instead."
-msgstr ""
-"KONFLIKT (Datei/Verzeichnis): Verzeichnis im Weg von %s aus %s; stattdessen "
-"nach %s verschieben."
-
-#: merge-ort.c:3770
-#, c-format
-msgid ""
-"CONFLICT (distinct types): %s had different types on each side; renamed both "
-"of them so each can be recorded somewhere."
-msgstr ""
-"KONFLIKT (verschiedene Typen): %s hatte unterschiedliche Typen auf jeder "
-"Seite; beide wurden umbenannt, damit jeder irgendwo aufgezeichnet werden "
-"kann."
-
-#: merge-ort.c:3777
-#, 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 (verschiedene Typen): %s hatte unterschiedliche Typen auf jeder "
-"Seite; eines der beiden wurde umbenannt, damit jeder irgendwo aufgezeichnet "
-"werden kann."
-
-#: merge-ort.c:3866 merge-recursive.c:3104
-msgid "content"
-msgstr "Inhalt"
-
-#: merge-ort.c:3868 merge-recursive.c:3108
-msgid "add/add"
-msgstr "hinzufügen/hinzufügen"
-
-#: merge-ort.c:3870 merge-recursive.c:3153
-msgid "submodule"
-msgstr "Submodul"
-
-#: merge-ort.c:3872 merge-recursive.c:3154
-#, c-format
-msgid "CONFLICT (%s): Merge conflict in %s"
-msgstr "KONFLIKT (%s): Merge-Konflikt in %s"
-
-#: merge-ort.c:3916
-#, c-format
-msgid ""
-"CONFLICT (modify/delete): %s deleted in %s and modified in %s.  Version %s "
-"of %s left in tree."
-msgstr ""
-"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:4212
-#, c-format
-msgid ""
-"Note: %s not up to date and in way of checking out conflicted version; old "
-"copy renamed to %s"
-msgstr ""
-"Hinweis: %s nicht aktuell und konfliktbehaftete Version während des "
-"Auscheckens; alte Kopie zu %s umbenannt"
-
-#. 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:4586
-#, 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:3723
-#, c-format
-msgid ""
-"Your local changes to the following files would be overwritten by merge:\n"
-"  %s"
-msgstr ""
-"Ihre lokalen Änderungen in den folgenden Dateien würden durch den Merge\n"
-"überschrieben werden:\n"
-"  %s"
-
-#: merge-ort-wrappers.c:33 merge-recursive.c:3485 builtin/merge.c:405
-msgid "Already up to date."
-msgstr "Bereits aktuell."
-
-#: merge-recursive.c:353
-msgid "(bad commit)\n"
-msgstr "(ungültiger Commit)\n"
-
-#: 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: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:881
-#, c-format
-msgid "failed to create path '%s'%s"
-msgstr "Fehler beim Erstellen des Pfades '%s'%s"
-
-#: 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:906 merge-recursive.c:925
-msgid ": perhaps a D/F conflict?"
-msgstr ": vielleicht ein Verzeichnis/Datei-Konflikt?"
-
-#: 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:956 builtin/cat-file.c:47
-#, c-format
-msgid "cannot read object %s '%s'"
-msgstr "kann Objekt %s '%s' nicht lesen"
-
-#: merge-recursive.c:961
-#, c-format
-msgid "blob expected for %s '%s'"
-msgstr "Blob erwartet für %s '%s'"
-
-#: merge-recursive.c:986
-#, c-format
-msgid "failed to open '%s': %s"
-msgstr "Fehler beim Öffnen von '%s': %s"
-
-#: 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: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:1236 merge-recursive.c:1249
-#, c-format
-msgid "Fast-forwarding submodule %s to the following commit:"
-msgstr "Spule Submodul %s zu dem folgenden Commit vor:"
-
-#: merge-recursive.c:1239 merge-recursive.c:1252
-#, c-format
-msgid "Fast-forwarding submodule %s"
-msgstr "Spule Submodul %s vor"
-
-#: merge-recursive.c:1276
-#, 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:1280
-#, c-format
-msgid "Failed to merge submodule %s (not fast-forward)"
-msgstr "Fehler beim Merge von Submodul %s (kein Vorspulen)"
-
-#: merge-recursive.c:1281
-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:1293
-#, c-format
-msgid "Failed to merge submodule %s (multiple merges found)"
-msgstr "Fehler beim Merge von Submodul %s (mehrere Merges gefunden)"
-
-#: merge-recursive.c:1437
-#, 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:1509
-#, c-format
-msgid ""
-"CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s left "
-"in tree."
-msgstr ""
-"KONFLIKT (%s/löschen): %s gelöscht in %s und %s in %s. Stand %s von %s wurde "
-"im Arbeitsbereich gelassen."
-
-#: merge-recursive.c:1514
-#, c-format
-msgid ""
-"CONFLICT (%s/delete): %s deleted in %s and %s to %s in %s. Version %s of %s "
-"left in tree."
-msgstr ""
-"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:1521
-#, c-format
-msgid ""
-"CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s left "
-"in tree at %s."
-msgstr ""
-"KONFLIKT (%s/löschen): %s gelöscht in %s und %s in %s. Stand %s von %s wurde "
-"im Arbeitsbereich bei %s gelassen."
-
-#: merge-recursive.c:1526
-#, 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 ""
-"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:1561
-msgid "rename"
-msgstr "umbenennen"
-
-#: merge-recursive.c:1561
-msgid "renamed"
-msgstr "umbenannt"
-
-#: merge-recursive.c:1612 merge-recursive.c:2518 merge-recursive.c:3181
-#, c-format
-msgid "Refusing to lose dirty file at %s"
-msgstr "Verweigere geänderte Datei bei %s zu verlieren."
-
-#: merge-recursive.c:1622
-#, 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:1680
-#, 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:1711
-#, 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:1716
-#, 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:1743
-#, c-format
-msgid ""
-"CONFLICT (rename/rename): Rename \"%s\"->\"%s\" in branch \"%s\" rename \"%s"
-"\"->\"%s\" in \"%s\"%s"
-msgstr ""
-"KONFLIKT (umbenennen/umbenennen): Benenne um \"%s\"->\"%s\" in Branch \"%s\" "
-"und \"%s\"->\"%s\" in Branch \"%s\"%s"
-
-#: merge-recursive.c:1748
-msgid " (left unresolved)"
-msgstr " (bleibt unaufgelöst)"
-
-#: merge-recursive.c:1840
-#, 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:2103
-#, c-format
-msgid ""
-"CONFLICT (directory rename split): Unclear where to place %s because "
-"directory %s was renamed to multiple other directories, with no destination "
-"getting a majority of the files."
-msgstr ""
-"KONFLIKT (Aufteilung Verzeichnisumbenennung): Unklar, wo %s zu platzieren "
-"ist,\n"
-"weil Verzeichnis %s zu mehreren anderen Verzeichnissen umbenannt wurde, "
-"wobei\n"
-"keines dieser Ziele die Mehrheit der Dateien erhielt."
-
-#: merge-recursive.c:2237
-#, c-format
-msgid ""
-"CONFLICT (rename/rename): Rename directory %s->%s in %s. Rename directory %s-"
-">%s in %s"
-msgstr ""
-"KONFLIKT (umbenennen/umbenennen): Benenne Verzeichnis um %s->%s in %s.\n"
-"Benenne Verzeichnis um %s->%s in %s"
-
-#: merge-recursive.c:3092
-msgid "modify"
-msgstr "ändern"
-
-#: merge-recursive.c:3092
-msgid "modified"
-msgstr "geändert"
-
-#: merge-recursive.c:3131
-#, c-format
-msgid "Skipped %s (merged same as existing)"
-msgstr "%s ausgelassen (Ergebnis des Merges existiert bereits)"
-
-#: merge-recursive.c:3184
-#, c-format
-msgid "Adding as %s instead"
-msgstr "Füge stattdessen als %s hinzu"
-
-#: merge-recursive.c:3388
-#, c-format
-msgid "Removing %s"
-msgstr "Entferne %s"
-
-#: merge-recursive.c:3411
-msgid "file/directory"
-msgstr "Datei/Verzeichnis"
-
-#: merge-recursive.c:3416
-msgid "directory/file"
-msgstr "Verzeichnis/Datei"
-
-#: merge-recursive.c:3423
-#, 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:3432
-#, c-format
-msgid "Adding %s"
-msgstr "Füge %s hinzu"
-
-#: merge-recursive.c:3441
-#, c-format
-msgid "CONFLICT (add/add): Merge conflict in %s"
-msgstr "KONFLIKT (hinzufügen/hinzufügen): Merge-Konflikt in %s"
-
-#: merge-recursive.c:3494
-#, c-format
-msgid "merging of trees %s and %s failed"
-msgstr "Zusammenführen der \"Tree\"-Objekte %s und %s fehlgeschlagen"
-
-#: merge-recursive.c:3588
-msgid "Merging:"
-msgstr "Merge:"
-
-#: merge-recursive.c:3601
-#, 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:3651
-msgid "merge returned no commit"
-msgstr "Merge hat keinen Commit zurückgegeben"
-
-#: merge-recursive.c:3823
-#, c-format
-msgid "Could not parse object '%s'"
-msgstr "Konnte Objekt '%s' nicht parsen."
-
-#: merge-recursive.c:3841 builtin/merge.c:720 builtin/merge.c:912
-#: builtin/stash.c:489
-msgid "Unable to write index."
-msgstr "Konnte Index nicht schreiben."
-
-#: merge.c:41
-msgid "failed to read the cache"
-msgstr "Lesen des Zwischenspeichers fehlgeschlagen"
-
-#: merge.c:102 rerere.c:705 builtin/am.c:1989 builtin/am.c:2023
-#: builtin/checkout.c:603 builtin/checkout.c:865 builtin/clone.c:714
-#: builtin/stash.c:269
-msgid "unable to write new index file"
-msgstr "Konnte neue Index-Datei nicht schreiben."
-
-#: midx.c:79
-msgid "multi-pack-index OID fanout is of the wrong size"
-msgstr "Multi-Pack-Index OID fanout hat die falsche Größe"
-
-#: midx.c:112
-#, c-format
-msgid "multi-pack-index file %s is too small"
-msgstr "Multi-Pack-Index-Datei %s ist zu klein."
-
-#: midx.c:128
-#, 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:133
-#, c-format
-msgid "multi-pack-index version %d not recognized"
-msgstr "Multi-Pack-Index-Version %d nicht erkannt."
-
-#: midx.c:138
-#, 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:155
-msgid "multi-pack-index missing required pack-name chunk"
-msgstr "Multi-Pack-Index fehlt erforderlicher Pack-Namen Chunk"
-
-#: midx.c:157
-msgid "multi-pack-index missing required OID fanout chunk"
-msgstr "Multi-Pack-Index fehlt erforderlicher OID fanout Chunk"
-
-#: midx.c:159
-msgid "multi-pack-index missing required OID lookup chunk"
-msgstr "Multi-Pack-Index fehlt erforderlicher OID lookup Chunk"
-
-#: midx.c:161
-msgid "multi-pack-index missing required object offsets chunk"
-msgstr "Multi-Pack-Index fehlt erforderlicher Objekt offset Chunk"
-
-#: midx.c:180
-#, 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:228
-#, c-format
-msgid "bad pack-int-id: %u (%u total packs)"
-msgstr "Ungültige pack-int-id: %u (%u Pakete insgesamt)"
-
-#: midx.c:278
-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:509
-#, c-format
-msgid "failed to add packfile '%s'"
-msgstr "Fehler beim Hinzufügen von Packdatei '%s'"
-
-#: midx.c:515
-#, c-format
-msgid "failed to open pack-index '%s'"
-msgstr "Fehler beim Öffnen von pack-index '%s'"
-
-#: midx.c:583
-#, c-format
-msgid "failed to locate object %d in packfile"
-msgstr "Fehler beim Lokalisieren von Objekt %d in Packdatei"
-
-#: midx.c:911
-msgid "cannot store reverse index file"
-msgstr "kann Reverse-Index-Datei nicht speichern"
-
-#: midx.c:1009
-#, c-format
-msgid "could not parse line: %s"
-msgstr "Zeile konnte nicht geparst werden: %s"
-
-#: midx.c:1011
-#, c-format
-msgid "malformed line: %s"
-msgstr "fehlerhafte Zeile: %s"
-
-#: midx.c:1181
-msgid "ignoring existing multi-pack-index; checksum mismatch"
-msgstr ""
-"ignoriere existierenden Multi-Pack-Index; Prüfsumme stimmt nicht überein"
-
-#: midx.c:1206
-msgid "could not load pack"
-msgstr "Paket konnte nicht geladen werden"
-
-#: midx.c:1212
-#, c-format
-msgid "could not open index for %s"
-msgstr "konnte Index für %s nicht öffnen"
-
-#: midx.c:1223
-msgid "Adding packfiles to multi-pack-index"
-msgstr "Packdateien zum Multi-Pack-Index hinzufügen"
-
-#: midx.c:1266
-#, c-format
-msgid "unknown preferred pack: '%s'"
-msgstr "unbekanntes bevorzugtes Paket: '%s'"
-
-#: midx.c:1311
-#, c-format
-msgid "cannot select preferred pack %s with no objects"
-msgstr "bevorzugtes Paket %s ohne Objekte kann nicht ausgewählt werden"
-
-#: midx.c:1343
-#, c-format
-msgid "did not see pack-file %s to drop"
-msgstr "Pack-Datei %s zum Weglassen nicht gefunden"
-
-#: midx.c:1389
-#, c-format
-msgid "preferred pack '%s' is expired"
-msgstr "bevorzugtes Paket '%s' ist abgelaufen"
-
-#: midx.c:1402
-msgid "no pack files to index."
-msgstr "keine Packdateien zum Indizieren."
-
-#: midx.c:1409
-msgid "refusing to write multi-pack .bitmap without any objects"
-msgstr "Schreiben der Multi-Pack-Bitmap ohne Objekte abgelehnt"
-
-#: midx.c:1451
-msgid "could not write multi-pack bitmap"
-msgstr "Multi-Pack-Bitmap konnte nicht geschrieben werden"
-
-#: midx.c:1461
-msgid "could not write multi-pack-index"
-msgstr "Multi-Pack-Index konnte nicht geschrieben werden"
-
-#: midx.c:1520 builtin/clean.c:37
-#, c-format
-msgid "failed to remove %s"
-msgstr "Fehler beim Löschen von %s"
-
-#: midx.c:1553
-#, c-format
-msgid "failed to clear multi-pack-index at %s"
-msgstr "Fehler beim Löschen des Multi-Pack-Index bei %s"
-
-#: midx.c:1616
-msgid "multi-pack-index file exists, but failed to parse"
-msgstr "Multi-Pack-Index-Datei existiert, aber das Parsen schlug fehl"
-
-#: midx.c:1624
-msgid "incorrect checksum"
-msgstr "Prüfsumme nicht korrekt"
-
-#: midx.c:1627
-msgid "Looking for referenced packfiles"
-msgstr "Suche nach referenzierten Pack-Dateien"
-
-#: midx.c:1642
-#, c-format
-msgid ""
-"oid fanout out of order: fanout[%d] = %<PRIx32> > %<PRIx32> = fanout[%d]"
-msgstr ""
-"Ungültige oid fanout Reihenfolge: fanout[%d] = %<PRIx32> > %<PRIx32> = "
-"fanout[%d]"
-
-#: midx.c:1647
-msgid "the midx contains no oid"
-msgstr "das midx enthält keine oid"
-
-#: midx.c:1656
-msgid "Verifying OID order in multi-pack-index"
-msgstr "Verifiziere OID-Reihenfolge im Multi-Pack-Index"
-
-#: midx.c:1665
-#, 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:1685
-msgid "Sorting objects by packfile"
-msgstr "Sortiere Objekte nach Pack-Datei"
-
-#: midx.c:1692
-msgid "Verifying object offsets"
-msgstr "Überprüfe Objekt-Offsets"
-
-#: midx.c:1708
-#, 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:1714
-#, c-format
-msgid "failed to load pack-index for packfile %s"
-msgstr "Fehler beim Laden des Pack-Index für Packdatei %s"
-
-#: midx.c:1723
-#, 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:1750
-msgid "Counting referenced objects"
-msgstr "Referenzierte Objekte zählen"
-
-#: midx.c:1760
-msgid "Finding and deleting unreferenced packfiles"
-msgstr "Suchen und Löschen von unreferenzierten Pack-Dateien"
-
-#: midx.c:1952
-msgid "could not start pack-objects"
-msgstr "Konnte 'pack-objects' nicht ausführen"
-
-#: midx.c:1972
-msgid "could not finish pack-objects"
-msgstr "Konnte 'pack-objects' nicht beenden"
-
-#: name-hash.c:542
-#, c-format
-msgid "unable to create lazy_dir thread: %s"
-msgstr "Kann lazy_dir Thread nicht erzeugen: %s"
-
-#: name-hash.c:564
-#, c-format
-msgid "unable to create lazy_name thread: %s"
-msgstr "Kann lazy_name Thread nicht erzeugen: %s"
-
-#: name-hash.c:570
-#, c-format
-msgid "unable to join lazy_name thread: %s"
-msgstr "Kann lazy_name Thread nicht beitreten: %s"
-
-#: notes-merge.c:276
-#, 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."
-msgstr ""
-"Sie haben Ihren vorherigen Merge von Notizen nicht abgeschlossen (%s "
-"existiert).\n"
-"Bitte benutzen Sie 'git notes merge --commit' oder 'git notes merge --"
-"abort', um\n"
-"den vorherigen Merge zu committen bzw. abzubrechen, bevor Sie einen neuen "
-"Merge\n"
-"von Notizen beginnen."
-
-#: notes-merge.c:283
-#, c-format
-msgid "You have not concluded your notes merge (%s exists)."
-msgstr "Sie haben Ihren Merge von Notizen nicht abgeschlossen (%s existiert)."
-
-#: notes-utils.c:46
-msgid "Cannot commit uninitialized/unreferenced notes tree"
-msgstr ""
-"Kann uninitialisiertes/unreferenziertes Notiz-Verzeichnis nicht committen."
-
-#: notes-utils.c:105
-#, c-format
-msgid "Bad notes.rewriteMode value: '%s'"
-msgstr "Ungültiger notes.rewriteMode Wert: '%s'"
-
-#: notes-utils.c:115
-#, c-format
-msgid "Refusing to rewrite notes in %s (outside of refs/notes/)"
-msgstr ""
-"Umschreiben der Notizen in %s zurückgewiesen (außerhalb von refs/notes/)"
-
-#. 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 "Ungültiger %s Wert: '%s'"
-
-#: object-file.c:457
-#, 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:515
-#, c-format
-msgid "unable to normalize alternate object path: %s"
-msgstr "Konnte alternativen Objektpfad '%s' nicht normalisieren."
-
-#: object-file.c:589
-#, c-format
-msgid "%s: ignoring alternate object stores, nesting too deep"
-msgstr "%s: ignoriere alternative Objektspeicher - Verschachtelung zu tief"
-
-#: object-file.c:596
-#, c-format
-msgid "unable to normalize object directory: %s"
-msgstr "Konnte Objektverzeichnis '%s' nicht normalisieren."
-
-#: object-file.c:639
-msgid "unable to fdopen alternates lockfile"
-msgstr "Konnte fdopen nicht auf Lock-Datei für \"alternates\" aufrufen."
-
-#: object-file.c:657
-msgid "unable to read alternates file"
-msgstr "Konnte \"alternates\"-Datei nicht lesen."
-
-#: object-file.c:664
-msgid "unable to move new alternates file into place"
-msgstr "Konnte neue \"alternates\"-Datei nicht übernehmen."
-
-#: object-file.c:742
-#, c-format
-msgid "path '%s' does not exist"
-msgstr "Pfad '%s' existiert nicht"
-
-#: object-file.c:763
-#, 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:769
-#, c-format
-msgid "reference repository '%s' is not a local repository."
-msgstr "Referenziertes Repository '%s' ist kein lokales Repository."
-
-#: object-file.c:775
-#, c-format
-msgid "reference repository '%s' is shallow"
-msgstr ""
-"Referenziertes Repository '%s' hat eine unvollständige Historie (shallow)."
-
-#: object-file.c:783
-#, c-format
-msgid "reference repository '%s' is grafted"
-msgstr ""
-"Referenziertes Repository '%s' ist mit künstlichen Vorgängern (\"grafts\") "
-"eingehängt."
-
-#: object-file.c:814
-#, c-format
-msgid "could not find object directory matching %s"
-msgstr "konnte Objekt-Verzeichnis nicht finden, dass '%s' entsprechen soll"
-
-#: object-file.c:864
-#, c-format
-msgid "invalid line while parsing alternate refs: %s"
-msgstr "Ungültige Zeile beim Parsen alternativer Referenzen: %s"
-
-#: object-file.c:1014
-#, c-format
-msgid "attempting to mmap %<PRIuMAX> over limit %<PRIuMAX>"
-msgstr "Versuche mmap %<PRIuMAX> über Limit %<PRIuMAX>."
-
-#: object-file.c:1049
-#, c-format
-msgid "mmap failed%s"
-msgstr "mmap fehlgeschlagen%s"
-
-#: object-file.c:1230
-#, c-format
-msgid "object file %s is empty"
-msgstr "Objektdatei %s ist leer."
-
-#: object-file.c:1349 object-file.c:2588
-#, c-format
-msgid "corrupt loose object '%s'"
-msgstr "Fehlerhaftes loses Objekt '%s'."
-
-#: object-file.c:1351 object-file.c:2592
-#, c-format
-msgid "garbage at end of loose object '%s'"
-msgstr "Nutzlose Daten am Ende von losem Objekt '%s'."
-
-#: object-file.c:1473
-#, c-format
-msgid "unable to parse %s header"
-msgstr "Konnte %s Kopfbereich nicht parsen."
-
-#: object-file.c:1475
-msgid "invalid object type"
-msgstr "ungültiger Objekt-Typ"
-
-#: object-file.c:1486
-#, c-format
-msgid "unable to unpack %s header"
-msgstr "Konnte %s Kopfbereich nicht entpacken."
-
-#: object-file.c:1490
-#, c-format
-msgid "header for %s too long, exceeds %d bytes"
-msgstr "Header für %s zu lang, überschreitet %d Bytes"
-
-#: object-file.c:1720
-#, c-format
-msgid "failed to read object %s"
-msgstr "Konnte Objekt %s nicht lesen."
-
-#: object-file.c:1724
-#, c-format
-msgid "replacement %s not found for %s"
-msgstr "Ersetzung %s für %s nicht gefunden."
-
-#: object-file.c:1728
-#, c-format
-msgid "loose object %s (stored in %s) is corrupt"
-msgstr "Loses Objekt %s (gespeichert in %s) ist beschädigt."
-
-#: object-file.c:1732
-#, c-format
-msgid "packed object %s (stored in %s) is corrupt"
-msgstr "Gepacktes Objekt %s (gespeichert in %s) ist beschädigt."
-
-#: object-file.c:1855
-#, c-format
-msgid "unable to write file %s"
-msgstr "Konnte Datei %s nicht schreiben."
-
-#: object-file.c:1862
-#, c-format
-msgid "unable to set permission to '%s'"
-msgstr "Konnte Zugriffsberechtigung auf '%s' nicht setzen."
-
-#: object-file.c:1869
-msgid "file write error"
-msgstr "Fehler beim Schreiben einer Datei."
-
-#: object-file.c:1904
-msgid "error when closing loose object file"
-msgstr "Fehler beim Schließen der Datei für lose Objekte."
-
-#: object-file.c:1971
-#, 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:1973
-msgid "unable to create temporary file"
-msgstr "Konnte temporäre Datei nicht erstellen."
-
-#: object-file.c:1997
-msgid "unable to write loose object file"
-msgstr "Fehler beim Schreiben der Datei für lose Objekte."
-
-#: object-file.c:2003
-#, c-format
-msgid "unable to deflate new object %s (%d)"
-msgstr "Konnte neues Objekt %s (%d) nicht komprimieren."
-
-#: object-file.c:2007
-#, c-format
-msgid "deflateEnd on object %s failed (%d)"
-msgstr "deflateEnd auf Objekt %s fehlgeschlagen (%d)"
-
-#: object-file.c:2011
-#, c-format
-msgid "confused by unstable object source data for %s"
-msgstr "Fehler wegen instabilen Objektquelldaten für %s"
-
-#: object-file.c:2022 builtin/pack-objects.c:1251
-#, c-format
-msgid "failed utime() on %s"
-msgstr "Fehler beim Aufruf von utime() auf '%s'."
-
-#: object-file.c:2100
-#, c-format
-msgid "cannot read object for %s"
-msgstr "Kann Objekt für %s nicht lesen."
-
-#: object-file.c:2151
-msgid "corrupt commit"
-msgstr "fehlerhafter Commit"
-
-#: object-file.c:2159
-msgid "corrupt tag"
-msgstr "fehlerhaftes Tag"
-
-#: object-file.c:2259
-#, c-format
-msgid "read error while indexing %s"
-msgstr "Lesefehler beim Indizieren von '%s'."
-
-#: object-file.c:2262
-#, c-format
-msgid "short read while indexing %s"
-msgstr "read() zu kurz beim Indizieren von '%s'."
-
-#: object-file.c:2335 object-file.c:2345
-#, c-format
-msgid "%s: failed to insert into database"
-msgstr "%s: Fehler beim Einfügen in die Datenbank"
-
-#: object-file.c:2351
-#, c-format
-msgid "%s: unsupported file type"
-msgstr "%s: nicht unterstützte Dateiart"
-
-#: object-file.c:2375 builtin/fetch.c:1494
-#, c-format
-msgid "%s is not a valid object"
-msgstr "%s ist kein gültiges Objekt"
-
-#: object-file.c:2377
-#, c-format
-msgid "%s is not a valid '%s' object"
-msgstr "%s ist kein gültiges '%s' Objekt"
-
-#: object-file.c:2404
-#, c-format
-msgid "unable to open %s"
-msgstr "kann %s nicht öffnen"
-
-#: object-file.c:2599
-#, c-format
-msgid "hash mismatch for %s (expected %s)"
-msgstr "Hash für %s stimmt nicht überein (%s erwartet)."
-
-#: object-file.c:2622
-#, c-format
-msgid "unable to mmap %s"
-msgstr "Konnte mmap nicht auf %s ausführen."
-
-#: object-file.c:2628
-#, c-format
-msgid "unable to unpack header of %s"
-msgstr "Konnte Kopfbereich von %s nicht entpacken."
-
-#: object-file.c:2633
-#, c-format
-msgid "unable to parse header of %s"
-msgstr "Konnte Kopfbereich von %s nicht parsen."
-
-#: object-file.c:2644
-#, c-format
-msgid "unable to unpack contents of %s"
-msgstr "Konnte Inhalt von %s nicht entpacken."
-
-#. TRANSLATORS: This is a line of ambiguous object
-#. output shown when we cannot look up or parse the
-#. object in question. E.g. "deadbeef [bad object]".
-#.
-#: object-name.c:382
-#, c-format
-msgid "%s [bad object]"
-msgstr "%s [ungültiges Objekt]"
-
-#. TRANSLATORS: This is a line of ambiguous commit
-#. object output. E.g.:
-#. *
-#.    "deadbeef commit 2021-01-01 - Some Commit Message"
-#.
-#: object-name.c:407
-#, c-format
-msgid "%s commit %s - %s"
-msgstr "%s Commit %s - %s"
-
-#. TRANSLATORS: This is a line of ambiguous
-#. tag object output. E.g.:
-#. *
-#.    "deadbeef tag 2022-01-01 - Some Tag Message"
-#. *
-#. The second argument is the YYYY-MM-DD found
-#. in the tag.
-#. *
-#. The third argument is the "tag" string
-#. from object.c.
-#.
-#: object-name.c:428
-#, c-format
-msgid "%s tag %s - %s"
-msgstr "%s Tag %s - %s"
-
-#. TRANSLATORS: This is a line of ambiguous
-#. tag object output where we couldn't parse
-#. the tag itself. E.g.:
-#. *
-#.    "deadbeef [bad tag, could not parse it]"
-#.
-#: object-name.c:439
-#, c-format
-msgid "%s [bad tag, could not parse it]"
-msgstr "%s [ungültiger Tag, konnte es nicht parsen]"
-
-#. TRANSLATORS: This is a line of ambiguous <type>
-#. object output. E.g. "deadbeef tree".
-#.
-#: object-name.c:447
-#, c-format
-msgid "%s tree"
-msgstr "%s Tree"
-
-#. TRANSLATORS: This is a line of ambiguous <type>
-#. object output. E.g. "deadbeef blob".
-#.
-#: object-name.c:453
-#, c-format
-msgid "%s blob"
-msgstr "%s Blob"
-
-#: object-name.c:569
-#, c-format
-msgid "short object ID %s is ambiguous"
-msgstr "kurze Objekt-ID %s ist mehrdeutig"
-
-#. TRANSLATORS: The argument is the list of ambiguous
-#. objects composed in show_ambiguous_object(). See
-#. its "TRANSLATORS" comments for details.
-#.
-#: object-name.c:591
-#, c-format
-msgid ""
-"The candidates are:\n"
-"%s"
-msgstr ""
-"Die Kandidaten sind:\n"
-"%s"
-
-#: object-name.c:888
-msgid ""
-"Git normally never creates a ref that ends with 40 hex characters\n"
-"because it will be ignored when you just specify 40-hex. These refs\n"
-"may be created by mistake. For example,\n"
-"\n"
-"  git switch -c $br $(git rev-parse ...)\n"
-"\n"
-"where \"$br\" is somehow empty and a 40-hex ref is created. Please\n"
-"examine these refs and maybe delete them. Turn this message off by\n"
-"running \"git config advice.objectNameWarning false\""
-msgstr ""
-"Git erzeugt normalerweise keine Referenzen die mit\n"
-"40 Hex-Zeichen enden, da diese ignoriert werden wenn\n"
-"Sie diese angeben. Diese Referenzen könnten aus Versehen\n"
-"erzeugt worden sein. Zum Beispiel,\n"
-"\n"
-"  git switch -c $br $(git rev-parse ...)\n"
-"\n"
-"wobei \"$br\" leer ist und eine 40-Hex-Referenz erzeugt\n"
-"wurde. Bitte prüfen Sie diese Referenzen und löschen\n"
-"Sie sie gegebenenfalls. Unterdrücken Sie diese Meldung\n"
-"indem Sie \"git config advice.objectNameWarning false\"\n"
-"ausführen."
-
-#: object-name.c:1008
-#, c-format
-msgid "log for '%.*s' only goes back to %s"
-msgstr "Log für '%.*s' geht nur bis %s zurück"
-
-#: object-name.c:1016
-#, c-format
-msgid "log for '%.*s' only has %d entries"
-msgstr "Log für '%.*s' hat nur %d Einträge"
-
-#: object-name.c:1794
-#, c-format
-msgid "path '%s' exists on disk, but not in '%.*s'"
-msgstr "Pfad '%s' befindet sich im Dateisystem, aber nicht in '%.*s'"
-
-#: object-name.c:1800
-#, c-format
-msgid ""
-"path '%s' exists, but not '%s'\n"
-"hint: Did you mean '%.*s:%s' aka '%.*s:./%s'?"
-msgstr ""
-"Pfad '%s' existiert, aber nicht '%s'\n"
-"Hinweis: Meinten Sie '%.*s:%s' auch bekannt als '%.*s:./%s'?"
-
-#: object-name.c:1809
-#, c-format
-msgid "path '%s' does not exist in '%.*s'"
-msgstr "Pfad '%s' existiert nicht in '%.*s'"
-
-#: object-name.c:1837
-#, c-format
-msgid ""
-"path '%s' is in the index, but not at stage %d\n"
-"hint: Did you mean ':%d:%s'?"
-msgstr ""
-"Pfad '%s' ist im Index, aber nicht in Stufe %d\n"
-"Hinweis: Meinten Sie ':%d:%s'?"
-
-#: object-name.c:1853
-#, c-format
-msgid ""
-"path '%s' is in the index, but not '%s'\n"
-"hint: Did you mean ':%d:%s' aka ':%d:./%s'?"
-msgstr ""
-"Pfad '%s' ist im Index, aber nicht '%s'\n"
-"Hinweis: Meinten Sie ':%d:%s' auch bekannt als ':%d:./%s'?"
-
-#: object-name.c:1861
-#, c-format
-msgid "path '%s' exists on disk, but not in the index"
-msgstr "Pfad '%s' existiert im Dateisystem, aber nicht im Index"
-
-#: object-name.c:1863
-#, c-format
-msgid "path '%s' does not exist (neither on disk nor in the index)"
-msgstr "Pfad '%s' existiert nicht (weder im Dateisystem noch im Index)"
-
-#: object-name.c:1876
-msgid "relative path syntax can't be used outside working tree"
-msgstr ""
-"Die Syntax für relative Pfade kann nicht außerhalb des Arbeitsverzeichnisses "
-"benutzt werden."
-
-#: object-name.c:1901
-#, c-format
-msgid "<object>:<path> required, only <object> '%s' given"
-msgstr "<Objekt>:<Pfad> benötigt, nur <Objekt> '%s' angegeben"
-
-#: object-name.c:2014
-#, c-format
-msgid "invalid object name '%.*s'."
-msgstr "ungültiger Objektname '%.*s'."
-
-#: object.c:53
-#, c-format
-msgid "invalid object type \"%s\""
-msgstr "Ungültiger Objekttyp \"%s\""
-
-#: object.c:173
-#, c-format
-msgid "object %s is a %s, not a %s"
-msgstr "Objekt %s ist ein %s, kein %s"
-
-#: object.c:250
-#, c-format
-msgid "object %s has unknown type id %d"
-msgstr "Objekt %s hat eine unbekannte Typ-Identifikation %d"
-
-#: object.c:263
-#, c-format
-msgid "unable to parse object: %s"
-msgstr "Konnte Objekt '%s' nicht parsen."
-
-#: object.c:283 object.c:294
-#, c-format
-msgid "hash mismatch %s"
-msgstr "Hash stimmt nicht mit %s überein."
-
-#: pack-bitmap.c:353
-msgid "multi-pack bitmap is missing required reverse index"
-msgstr "Multi-Pack-Bitmap fehlt erforderlicher Reverse-Index"
-
-#: pack-bitmap.c:433
-msgid "load_reverse_index: could not open pack"
-msgstr "load_reverse_index: Paket konnte nicht geöffnet werden"
-
-#: pack-bitmap.c:1072 pack-bitmap.c:1078 builtin/pack-objects.c:2432
-#, c-format
-msgid "unable to get size of %s"
-msgstr "Konnte Größe von %s nicht bestimmen."
-
-#: pack-bitmap.c:1937
-#, 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:1973 builtin/rev-list.c:91
-#, c-format
-msgid "unable to get disk usage of %s"
-msgstr "konnte Festplattennutzung von %s nicht bekommen"
-
-#: pack-revindex.c:221
-#, c-format
-msgid "reverse-index file %s is too small"
-msgstr "Reverse-Index-Datei %s ist zu klein"
-
-#: pack-revindex.c:226
-#, c-format
-msgid "reverse-index file %s is corrupt"
-msgstr "Reverse-Index-Datei %s ist beschädigt"
-
-#: pack-revindex.c:234
-#, c-format
-msgid "reverse-index file %s has unknown signature"
-msgstr "Reverse-Index-Datei %s hat eine unbekannte Signatur"
-
-#: pack-revindex.c:238
-#, c-format
-msgid "reverse-index file %s has unsupported version %<PRIu32>"
-msgstr "Reverse-Index-Datei %s hat nicht unterstützte Version %<PRIu32>"
-
-#: pack-revindex.c:243
-#, c-format
-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:251
-msgid "cannot both write and verify reverse index"
-msgstr ""
-"Reverse-Index kann nicht gleichzeitig geschrieben und verifiziert werden"
-
-#: pack-write.c:270
-#, c-format
-msgid "could not stat: %s"
-msgstr "konnte nicht lesen: %s"
-
-#: pack-write.c:282
-#, c-format
-msgid "failed to make %s readable"
-msgstr "Fehler beim lesbar machen von %s"
-
-#: pack-write.c:521
-#, c-format
-msgid "could not write '%s' promisor file"
-msgstr "konnte Promisor-Datei '%s' nicht schreiben"
-
-#: packfile.c:627
-msgid "offset before end of packfile (broken .idx?)"
-msgstr "Offset vor Ende der Packdatei (fehlerhafte Indexdatei?)"
-
-#: packfile.c:657
-#, c-format
-msgid "packfile %s cannot be mapped%s"
-msgstr "Packdatei %s kann nicht gemappt werden%s"
-
-#: packfile.c:1924
-#, 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:1928
-#, 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:21 parse-options-cb.c:25 builtin/commit-graph.c:175
-#, c-format
-msgid "option `%s' expects a numerical value"
-msgstr "Option `%s' erwartet einen numerischen Wert."
-
-#: parse-options-cb.c:42
-#, c-format
-msgid "malformed expiration date '%s'"
-msgstr "Fehlerhaftes Ablaufdatum '%s'"
-
-#: parse-options-cb.c:55
-#, c-format
-msgid "option `%s' expects \"always\", \"auto\", or \"never\""
-msgstr "Option `%s' erwartet \"always\", \"auto\" oder \"never\"."
-
-#: parse-options-cb.c:133 parse-options-cb.c:150
-#, c-format
-msgid "malformed object name '%s'"
-msgstr "fehlerhafter Objekt-Name '%s'"
-
-#: parse-options-cb.c:307
-#, c-format
-msgid "option `%s' expects \"%s\" or \"%s\""
-msgstr "Option `%s' erwartet \"%s\" oder \"%s\""
-
-#: parse-options.c:58
-#, c-format
-msgid "%s requires a value"
-msgstr "%s erfordert einen Wert."
-
-#: parse-options.c:93
-#, c-format
-msgid "%s is incompatible with %s"
-msgstr "%s ist inkompatibel mit %s."
-
-#: parse-options.c:98
-#, c-format
-msgid "%s : incompatible with something else"
-msgstr "%s: inkompatibel mit etwas anderem"
-
-#: parse-options.c:112 parse-options.c:116
-#, c-format
-msgid "%s takes no value"
-msgstr "%s erwartet keinen Wert"
-
-#: parse-options.c:114
-#, c-format
-msgid "%s isn't available"
-msgstr "%s ist nicht verfügbar."
-
-#: 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: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:428 parse-options.c:436
-#, c-format
-msgid "did you mean `--%s` (with two dashes)?"
-msgstr "Meinten Sie `--%s` (mit zwei Strichen)?"
-
-#: parse-options.c:678 parse-options.c:1054
-#, c-format
-msgid "alias of --%s"
-msgstr "Alias für --%s"
-
-#: parse-options.c:892
-#, c-format
-msgid "unknown option `%s'"
-msgstr "Unbekannte Option: `%s'"
-
-#: parse-options.c:894
-#, c-format
-msgid "unknown switch `%c'"
-msgstr "Unbekannter Schalter `%c'"
-
-#: parse-options.c:896
-#, c-format
-msgid "unknown non-ascii option in string: `%s'"
-msgstr "Unbekannte nicht-Ascii Option in String: `%s'"
-
-#: parse-options.c:920
-msgid "..."
-msgstr "..."
-
-#: parse-options.c:934
-#, c-format
-msgid "usage: %s"
-msgstr "Verwendung: %s"
-
-#. TRANSLATORS: the colon here should align with the
-#. one in "usage: %s" translation.
-#.
-#: parse-options.c:949
-#, c-format
-msgid "   or: %s"
-msgstr "      oder: %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:970
-#, c-format
-msgid "%*s%s"
-msgstr "%*s%s"
-
-#: parse-options.c:993
-#, c-format
-msgid "    %s"
-msgstr "    %s"
-
-#: parse-options.c:1040
-msgid "-NUM"
-msgstr "-NUM"
-
-#: path.c:922
-#, c-format
-msgid "Could not make %s writable by group"
-msgstr "Konnte Gruppenschreibrecht für %s nicht setzen."
-
-#: 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:168
-msgid "Only one 'attr:' specification is allowed."
-msgstr "Es ist nur eine Angabe von 'attr:' erlaubt."
-
-#: pathspec.c:171
-msgid "attr spec must not be empty"
-msgstr "Angabe von 'attr:' darf nicht leer sein"
-
-#: pathspec.c:214
-#, c-format
-msgid "invalid attribute name %s"
-msgstr "Ungültiger Attributname %s"
-
-#: pathspec.c:279
-msgid "global 'glob' and 'noglob' pathspec settings are incompatible"
-msgstr ""
-"Globale Einstellungen zur Pfadspezifikation 'glob' und 'noglob' sind "
-"inkompatibel."
-
-#: pathspec.c:286
-msgid ""
-"global 'literal' pathspec setting is incompatible with all other global "
-"pathspec settings"
-msgstr ""
-"Globale Einstellung zur Pfadspezifikation 'literal' ist inkompatibel\n"
-"mit allen anderen Optionen."
-
-#: pathspec.c:326
-msgid "invalid parameter for pathspec magic 'prefix'"
-msgstr "ungültiger Parameter für Pfadspezifikationsangabe 'prefix'"
-
-#: pathspec.c:347
-#, c-format
-msgid "Invalid pathspec magic '%.*s' in '%s'"
-msgstr "ungültige Pfadspezifikationsangabe '%.*s' in '%s'"
-
-#: 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:390
-#, c-format
-msgid "Unimplemented pathspec magic '%c' in '%s'"
-msgstr "nicht unterstützte Pfadspezifikationsangabe '%c' in '%s'"
-
-#: pathspec.c:449
-#, c-format
-msgid "%s: 'literal' and 'glob' are incompatible"
-msgstr "%s: 'literal' und 'glob' sind inkompatibel"
-
-#: 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:541
-#, c-format
-msgid "'%s' (mnemonic: '%c')"
-msgstr "'%s' (Kürzel: '%c')"
-
-#: 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:618
-#, c-format
-msgid "pathspec '%s' is beyond a symbolic link"
-msgstr "Pfadspezifikation '%s' ist hinter einer symbolischen Verknüpfung"
-
-#: pathspec.c:663
-#, c-format
-msgid "line is badly quoted: %s"
-msgstr "Zeile enthält falsche Anführungszeichen: %s"
-
-#: pkt-line.c:92
-msgid "unable to write flush packet"
-msgstr "konnte Flush-Paket nicht schreiben"
-
-#: pkt-line.c:99
-msgid "unable to write delim packet"
-msgstr "konnte Delim-Paket nicht schreiben"
-
-#: pkt-line.c:106
-msgid "unable to write response end packet"
-msgstr "konnte Antwort-Endpaket nicht schreiben"
-
-#: pkt-line.c:113
-msgid "flush packet write failed"
-msgstr "Flush beim Schreiben des Pakets fehlgeschlagen."
-
-#: pkt-line.c:153
-msgid "protocol error: impossibly long line"
-msgstr "Protokollfehler: unmöglich lange Zeile"
-
-#: pkt-line.c:169 pkt-line.c:171
-msgid "packet write with format failed"
-msgstr "Schreiben des Pakets mit Format fehlgeschlagen."
-
-#: 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"
-
-#: pkt-line.c:222
-#, c-format
-msgid "packet write failed: %s"
-msgstr "Schreiben des Pakets fehlgeschlagen: %s"
-
-#: pkt-line.c:349 pkt-line.c:350
-msgid "read error"
-msgstr "Lesefehler"
-
-#: pkt-line.c:360 pkt-line.c:361
-msgid "the remote end hung up unexpectedly"
-msgstr "Die Gegenseite hat unerwartet abgebrochen."
-
-#: pkt-line.c:417 pkt-line.c:419
-#, c-format
-msgid "protocol error: bad line length character: %.4s"
-msgstr "Protokollfehler: ungültiges Zeichen für Zeilenlänge: %.4s"
-
-#: pkt-line.c:434 pkt-line.c:436 pkt-line.c:442 pkt-line.c:444
-#, c-format
-msgid "protocol error: bad line length %d"
-msgstr "Protokollfehler: ungültige Zeilenlänge %d"
-
-#: pkt-line.c:472 sideband.c:165
-#, c-format
-msgid "remote error: %s"
-msgstr "Fehler am anderen Ende: %s"
-
-#: preload-index.c:125
-msgid "Refreshing index"
-msgstr "Aktualisiere Index"
-
-#: preload-index.c:144
-#, c-format
-msgid "unable to create threaded lstat: %s"
-msgstr "Kann Thread für lstat nicht erzeugen: %s"
-
-#: pretty.c:1051
-msgid "unable to parse --pretty format"
-msgstr "Konnte --pretty Format nicht parsen."
-
-#: promisor-remote.c:31
-msgid "promisor-remote: unable to fork off fetch subprocess"
-msgstr "Promisor-Remote: konnte Fetch-Subprozess nicht abspalten"
-
-#: promisor-remote.c:38 promisor-remote.c:40
-msgid "promisor-remote: could not write to fetch subprocess"
-msgstr "Promisor-Remote: konnte nicht zum Fetch-Subprozess schreiben"
-
-#: promisor-remote.c:44
-msgid "promisor-remote: could not close stdin to fetch subprocess"
-msgstr ""
-"Promisor-Remote: konnte Standard-Eingabe des Fetch-Subprozesses nicht "
-"schließen"
-
-#: promisor-remote.c:54
-#, c-format
-msgid "promisor remote name cannot begin with '/': %s"
-msgstr "Promisor-Remote-Name kann nicht mit '/' beginnen: %s"
-
-#: protocol-caps.c:103
-msgid "object-info: expected flush after arguments"
-msgstr "object-info: erwartete Flush nach Argumenten"
-
-#: prune-packed.c:35
-msgid "Removing duplicate objects"
-msgstr "Lösche doppelte Objekte"
-
-#: range-diff.c:68
-msgid "could not start `log`"
-msgstr "Konnte `log` nicht starten."
-
-#: range-diff.c:70
-msgid "could not read `log` output"
-msgstr "Konnte Ausgabe von `log` nicht lesen."
-
-#: range-diff.c:98 sequencer.c:5575
-#, c-format
-msgid "could not parse commit '%s'"
-msgstr "Konnte Commit '%s' nicht parsen."
-
-#: range-diff.c:109
-#, c-format
-msgid ""
-"could not parse first line of `log` output: did not start with 'commit ': "
-"'%s'"
-msgstr ""
-"konnte erste Zeile der Ausgabe von `log` nicht parsen: fängt nicht mit "
-"'commit ' an: '%s'"
-
-#: range-diff.c:132
-#, c-format
-msgid "could not parse git header '%.*s'"
-msgstr "Konnte Git-Header '%.*s' nicht parsen."
-
-#: range-diff.c:300
-msgid "failed to generate diff"
-msgstr "Fehler beim Generieren des Diffs."
-
-#: range-diff.c:558 range-diff.c:560
-#, c-format
-msgid "could not parse log for '%s'"
-msgstr "Konnte Log für '%s' nicht parsen."
-
-#: read-cache.c:737
-#, c-format
-msgid "will not add file alias '%s' ('%s' already exists in index)"
-msgstr ""
-"Dateialias '%s' wird nicht hinzugefügt ('%s' existiert bereits im Index)."
-
-#: read-cache.c:753
-msgid "cannot create an empty blob in the object database"
-msgstr "Kann keinen leeren Blob in die Objektdatenbank schreiben."
-
-#: read-cache.c:775
-#, c-format
-msgid "%s: can only add regular files, symbolic links or git-directories"
-msgstr ""
-"%s: Kann nur reguläre Dateien, symbolische Links oder Git-Verzeichnisse "
-"hinzufügen."
-
-#: read-cache.c:780 builtin/submodule--helper.c:3359
-#, c-format
-msgid "'%s' does not have a commit checked out"
-msgstr "'%s' hat keinen Commit ausgecheckt"
-
-#: read-cache.c:832
-#, c-format
-msgid "unable to index file '%s'"
-msgstr "Konnte Datei '%s' nicht indizieren."
-
-#: read-cache.c:851
-#, c-format
-msgid "unable to add '%s' to index"
-msgstr "Konnte '%s' nicht dem Index hinzufügen."
-
-#: read-cache.c:862
-#, c-format
-msgid "unable to stat '%s'"
-msgstr "konnte '%s' nicht lesen"
-
-#: read-cache.c:1404
-#, 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:1619
-msgid "Refresh index"
-msgstr "Aktualisiere Index"
-
-#: read-cache.c:1751
-#, c-format
-msgid ""
-"index.version set, but the value is invalid.\n"
-"Using version %i"
-msgstr ""
-"index.version gesetzt, aber Wert ungültig.\n"
-"Verwende Version %i"
-
-#: read-cache.c:1761
-#, c-format
-msgid ""
-"GIT_INDEX_VERSION set, but the value is invalid.\n"
-"Using version %i"
-msgstr ""
-"GIT_INDEX_VERSION gesetzt, aber Wert ungültig.\n"
-"Verwende Version %i"
-
-#: read-cache.c:1817
-#, c-format
-msgid "bad signature 0x%08x"
-msgstr "Ungültige Signatur 0x%08x"
-
-#: read-cache.c:1820
-#, c-format
-msgid "bad index version %d"
-msgstr "Ungültige Index-Version %d"
-
-#: read-cache.c:1829
-msgid "bad index file sha1 signature"
-msgstr "Ungültige SHA1-Signatur der Index-Datei."
-
-#: read-cache.c:1863
-#, 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:1865
-#, c-format
-msgid "ignoring %.4s extension"
-msgstr "Ignoriere Erweiterung %.4s"
-
-#: read-cache.c:1902
-#, c-format
-msgid "unknown index entry format 0x%08x"
-msgstr "Unbekanntes Format für Index-Eintrag 0x%08x"
-
-#: read-cache.c:1918
-#, 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:1975
-msgid "unordered stage entries in index"
-msgstr "Ungeordnete Stage-Einträge im Index."
-
-#: read-cache.c:1978
-#, c-format
-msgid "multiple stage entries for merged file '%s'"
-msgstr "Mehrere Stage-Einträge für zusammengeführte Datei '%s'."
-
-#: read-cache.c:1981
-#, c-format
-msgid "unordered stage entries for '%s'"
-msgstr "Ungeordnete Stage-Einträge für '%s'."
-
-#: read-cache.c:2096 read-cache.c:2402 rerere.c:549 rerere.c:583 rerere.c:1096
-#: submodule.c:1831 builtin/add.c:586 builtin/check-ignore.c:183
-#: builtin/checkout.c:532 builtin/checkout.c:724 builtin/clean.c:1016
-#: builtin/commit.c:379 builtin/diff-tree.c:122 builtin/grep.c:521
-#: builtin/mv.c:148 builtin/reset.c:506 builtin/rm.c:293
-#: builtin/submodule--helper.c:335 builtin/submodule--helper.c:3319
-msgid "index file corrupt"
-msgstr "Index-Datei beschädigt"
-
-#: read-cache.c:2240
-#, 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:2253
-#, 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:2286
-#, c-format
-msgid "%s: index file open failed"
-msgstr "%s: Öffnen der Index-Datei fehlgeschlagen."
-
-#: read-cache.c:2290
-#, c-format
-msgid "%s: cannot stat the open index"
-msgstr "%s: Kann geöffneten Index nicht lesen."
-
-#: read-cache.c:2294
-#, c-format
-msgid "%s: index file smaller than expected"
-msgstr "%s: Index-Datei ist kleiner als erwartet."
-
-#: read-cache.c:2298
-#, c-format
-msgid "%s: unable to map index file%s"
-msgstr "%s: Konnte Index-Datei nicht mappen%s"
-
-#: read-cache.c:2341
-#, 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:2368
-#, 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:2414
-#, c-format
-msgid "could not freshen shared index '%s'"
-msgstr "Konnte geteilten Index '%s' nicht aktualisieren."
-
-#: read-cache.c:2473
-#, c-format
-msgid "broken index, expect %s in %s, got %s"
-msgstr "Fehlerhafter Index. Erwartete %s in %s, erhielt %s."
-
-#: read-cache.c:3032
-msgid "cannot write split index for a sparse index"
-msgstr "kann aufgeteilten Index nicht für ein Sparse-Index schreiben"
-
-#: read-cache.c:3114 strbuf.c:1192 wrapper.c:717 builtin/merge.c:1156
-#, c-format
-msgid "could not close '%s'"
-msgstr "Konnte '%s' nicht schließen."
-
-#: read-cache.c:3157
-msgid "failed to convert to a sparse-index"
-msgstr "Konvertierung zu einem Sparse-Index fehlgeschlagen"
-
-#: read-cache.c:3228
-#, c-format
-msgid "could not stat '%s'"
-msgstr "Konnte '%s' nicht lesen."
-
-#: read-cache.c:3241
-#, c-format
-msgid "unable to open git dir: %s"
-msgstr "konnte Git-Verzeichnis nicht öffnen: %s"
-
-#: read-cache.c:3253
-#, c-format
-msgid "unable to unlink: %s"
-msgstr "Konnte '%s' nicht entfernen."
-
-#: read-cache.c:3282
-#, c-format
-msgid "cannot fix permission bits on '%s'"
-msgstr "Konnte Zugriffsberechtigung auf '%s' nicht setzen."
-
-#: read-cache.c:3439
-#, c-format
-msgid "%s: cannot drop to stage #0"
-msgstr "%s: Kann nicht auf Stufe #0 wechseln."
-
-#: rebase-interactive.c:11
-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 ""
-"Sie können das mit 'git rebase --edit-todo' beheben. Führen Sie danach\n"
-"'git rebase --continue' aus.\n"
-"Oder Sie können den Rebase mit 'git rebase --abort' abbrechen.\n"
-
-#: rebase-interactive.c:33
-#, c-format
-msgid ""
-"unrecognized setting %s for option rebase.missingCommitsCheck. Ignoring."
-msgstr ""
-"Nicht erkannte Einstellung %s für Option rebase.missingCommitsCheck. "
-"Ignoriere."
-
-#: rebase-interactive.c:42
-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 [-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"
-"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 [-C | -c] <Commit> = wie \"squash\", aber nur die vorherige\n"
-"                   Commit-Beschreibung behalten, außer -C wird verwendet,\n"
-"                   in diesem Fall wird nur diese Commit-Beschreibung "
-"behalten;\n"
-"                   -c ist das Gleiche wie -C, aber ein Editor wird geöffnet\n"
-"x, exec <Commit> = Befehl (Rest der Zeile) mittels Shell ausführen\n"
-"b, break = hier anhalten (Rebase später mit 'git rebase --continue' "
-"fortsetzen)\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"
-
-#: rebase-interactive.c:66
-#, c-format
-msgid "Rebase %s onto %s (%d command)"
-msgid_plural "Rebase %s onto %s (%d commands)"
-msgstr[0] "Rebase von %s auf %s (%d Kommando)"
-msgstr[1] "Rebase von %s auf %s (%d Kommandos)"
-
-#: rebase-interactive.c:75
-msgid ""
-"\n"
-"Do not remove any line. Use 'drop' explicitly to remove a commit.\n"
-msgstr ""
-"\n"
-"Keine Zeile entfernen. Benutzen Sie 'drop', um explizit einen Commit zu\n"
-"entfernen.\n"
-
-#: rebase-interactive.c:78
-msgid ""
-"\n"
-"If you remove a line here THAT COMMIT WILL BE LOST.\n"
-msgstr ""
-"\n"
-"Wenn Sie hier eine Zeile entfernen, wird DIESER COMMIT VERLOREN GEHEN.\n"
-
-#: rebase-interactive.c:84
-msgid ""
-"\n"
-"You are editing the todo file of an ongoing interactive rebase.\n"
-"To continue rebase after editing, run:\n"
-"    git rebase --continue\n"
-"\n"
-msgstr ""
-"\n"
-"Sie bearbeiten gerade die TODO-Datei eines laufenden interaktiven Rebase.\n"
-"Um den Rebase nach dem Editieren fortzusetzen, führen Sie aus:\n"
-"    git rebase --continue\n"
-"\n"
-
-#: rebase-interactive.c:89
-msgid ""
-"\n"
-"However, if you remove everything, the rebase will be aborted.\n"
-"\n"
-msgstr ""
-"\n"
-"Wenn Sie jedoch alles löschen, wird der Rebase abgebrochen.\n"
-"\n"
-
-#: rebase-interactive.c:113 rerere.c:469 rerere.c:677 sequencer.c:3879
-#: sequencer.c:3905 sequencer.c:5681 builtin/fsck.c:328 builtin/gc.c:1791
-#: builtin/rebase.c:191
-#, c-format
-msgid "could not write '%s'"
-msgstr "Konnte '%s' nicht schreiben."
-
-#: rebase-interactive.c:119
-#, c-format
-msgid "could not write '%s'."
-msgstr "Konnte '%s' nicht schreiben."
-
-#: rebase-interactive.c:196
-#, c-format
-msgid ""
-"Warning: some commits may have been dropped accidentally.\n"
-"Dropped commits (newer to older):\n"
-msgstr ""
-"Warnung: Einige Commits könnten aus Versehen entfernt worden sein.\n"
-"Entfernte Commits (neu zu alt):\n"
-
-#: rebase-interactive.c:203
-#, c-format
-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"
-"The possible behaviours are: ignore, warn, error.\n"
-"\n"
-msgstr ""
-"Um diese Meldung zu vermeiden, benutzen Sie \"drop\", um exlizit Commits zu\n"
-"entfernen.\n"
-"\n"
-"Benutzen Sie 'git config rebase.missingCommitsCheck', um die Stufe der\n"
-"Warnungen zu ändern.\n"
-"Die möglichen Verhaltensweisen sind: ignore, warn, error.\n"
-
-#: rebase.c:29
-#, c-format
-msgid "%s: 'preserve' superseded by 'merges'"
-msgstr "%s: 'preserve' wurde durch 'merges' ersetzt"
-
-#: ref-filter.c:42 wt-status.c:2057
-msgid "gone"
-msgstr "entfernt"
-
-#: ref-filter.c:43
-#, c-format
-msgid "ahead %d"
-msgstr "%d voraus"
-
-#: ref-filter.c:44
-#, c-format
-msgid "behind %d"
-msgstr "%d hinterher"
-
-#: ref-filter.c:45
-#, c-format
-msgid "ahead %d, behind %d"
-msgstr "%d voraus, %d hinterher"
-
-#: ref-filter.c:235
-#, c-format
-msgid "expected format: %%(color:<color>)"
-msgstr "Erwartetes Format: %%(color:<Farbe>)"
-
-#: ref-filter.c:237
-#, c-format
-msgid "unrecognized color: %%(color:%s)"
-msgstr "nicht erkannte Farbe: %%(color:%s)"
-
-#: ref-filter.c:259
-#, c-format
-msgid "Integer value expected refname:lstrip=%s"
-msgstr "Positiver Wert erwartet refname:lstrip=%s"
-
-#: ref-filter.c:263
-#, c-format
-msgid "Integer value expected refname:rstrip=%s"
-msgstr "Positiver Wert erwartet refname:rstrip=%s"
-
-#: ref-filter.c:265 ref-filter.c:344 ref-filter.c:377 ref-filter.c:431
-#: ref-filter.c:443 ref-filter.c:462 ref-filter.c:534 ref-filter.c:560
-#, c-format
-msgid "unrecognized %%(%s) argument: %s"
-msgstr "nicht erkanntes %%(%s) Argument: %s"
-
-#: ref-filter.c:320
-#, c-format
-msgid "%%(objecttype) does not take arguments"
-msgstr "%%(objecttype) akzeptiert keine Argumente"
-
-#: ref-filter.c:352
-#, c-format
-msgid "%%(deltabase) does not take arguments"
-msgstr "%%(deltabase) akzeptiert keine Argumente"
-
-#: ref-filter.c:364
-#, c-format
-msgid "%%(body) does not take arguments"
-msgstr "%%(body) akzeptiert keine Argumente"
-
-#: ref-filter.c:396
-#, c-format
-msgid "expected %%(trailers:key=<value>)"
-msgstr "%%(trailers:key=<Wert>) erwartet"
-
-#: ref-filter.c:398
-#, c-format
-msgid "unknown %%(trailers) argument: %s"
-msgstr "unbekanntes %%(trailers) Argument: %s"
-
-#: ref-filter.c:429
-#, c-format
-msgid "positive value expected contents:lines=%s"
-msgstr "Positiver Wert erwartet contents:lines=%s"
-
-#: ref-filter.c:458
-#, c-format
-msgid "positive value expected '%s' in %%(%s)"
-msgstr "positiver Wert erwartet '%s' in %%(%s)"
-
-#: ref-filter.c:476
-#, c-format
-msgid "unrecognized email option: %s"
-msgstr "nicht erkannte E-Mail Option: %s"
-
-#: ref-filter.c:506
-#, c-format
-msgid "expected format: %%(align:<width>,<position>)"
-msgstr "erwartetes Format: %%(align:<Breite>,<Position>)"
-
-#: ref-filter.c:518
-#, c-format
-msgid "unrecognized position:%s"
-msgstr "nicht erkannte Position:%s"
-
-#: ref-filter.c:525
-#, c-format
-msgid "unrecognized width:%s"
-msgstr "nicht erkannte Breite:%s"
-
-#: ref-filter.c:542
-#, c-format
-msgid "positive width expected with the %%(align) atom"
-msgstr "Positive Breitenangabe für %%(align) erwartet"
-
-#: 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:707
-#, c-format
-msgid "unknown field name: %.*s"
-msgstr "Unbekannter Feldname: %.*s"
-
-#: 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:844 ref-filter.c:910 ref-filter.c:946 ref-filter.c:948
-#, c-format
-msgid "format: %%(%s) atom used without a %%(%s) atom"
-msgstr "format: %%(%s) Atom ohne ein %%(%s) Atom verwendet"
-
-#: 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:914
-#, c-format
-msgid "format: %%(then) atom used after %%(else)"
-msgstr "format: %%(then) Atom nach %%(else) verwendet"
-
-#: ref-filter.c:950
-#, c-format
-msgid "format: %%(else) atom used more than once"
-msgstr "Format: %%(else) Atom mehr als einmal verwendet"
-
-#: 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:1027
-#, c-format
-msgid "malformed format string %s"
-msgstr "Fehlerhafter Formatierungsstring %s"
-
-#: 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:1707
-#, c-format
-msgid "(no branch, rebasing %s)"
-msgstr "(kein Branch, Rebase von %s)"
-
-#: ref-filter.c:1710
-#, c-format
-msgid "(no branch, rebasing detached HEAD %s)"
-msgstr "(kein Branch, Rebase von losgelöstem HEAD %s)"
-
-#: ref-filter.c:1713
-#, c-format
-msgid "(no branch, bisect started on %s)"
-msgstr "(kein Branch, binäre Suche begonnen bei %s)"
-
-#: ref-filter.c:1717
-#, c-format
-msgid "(HEAD detached at %s)"
-msgstr "(HEAD losgelöst bei %s)"
-
-#: ref-filter.c:1720
-#, c-format
-msgid "(HEAD detached from %s)"
-msgstr "(HEAD losgelöst von %s)"
-
-#: ref-filter.c:1723
-msgid "(no branch)"
-msgstr "(kein Branch)"
-
-#: ref-filter.c:1755 ref-filter.c:1973
-#, c-format
-msgid "missing object %s for %s"
-msgstr "Objekt %s fehlt für %s"
-
-#: ref-filter.c:1765
-#, c-format
-msgid "parse_object_buffer failed on %s for %s"
-msgstr "parse_object_buffer bei %s für %s fehlgeschlagen"
-
-#: ref-filter.c:2156
-#, c-format
-msgid "malformed object at '%s'"
-msgstr "fehlerhaftes Objekt bei '%s'"
-
-#: ref-filter.c:2246
-#, c-format
-msgid "ignoring ref with broken name %s"
-msgstr "Ignoriere Referenz mit fehlerhaftem Namen %s"
-
-#: ref-filter.c:2251 refs.c:672
-#, c-format
-msgid "ignoring broken ref %s"
-msgstr "Ignoriere fehlerhafte Referenz %s"
-
-#: ref-filter.c:2630
-#, c-format
-msgid "format: %%(end) atom missing"
-msgstr "Format: %%(end) Atom fehlt"
-
-#: ref-filter.c:2741
-#, c-format
-msgid "malformed object name %s"
-msgstr "missgebildeter Objektname %s"
-
-#: ref-filter.c:2746
-#, c-format
-msgid "option `%s' must point to a commit"
-msgstr "die Option `%s' muss auf einen Commit zeigen"
-
-#: reflog.c:407
-#, c-format
-msgid "not a reflog: %s"
-msgstr "Kein Reflog: %s"
-
-#: reflog.c:410
-#, c-format
-msgid "no reflog for '%s'"
-msgstr "Kein Reflog für '%s'."
-
-#: refs.c:262
-#, c-format
-msgid "%s does not point to a valid object!"
-msgstr "%s zeigt auf kein gültiges Objekt!"
-
-#: refs.c:561
-#, 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"
-"of your new repositories, which will suppress this warning, call:\n"
-"\n"
-"\tgit config --global init.defaultBranch <name>\n"
-"\n"
-"Names commonly chosen instead of 'master' are 'main', 'trunk' and\n"
-"'development'. The just-created branch can be renamed via this command:\n"
-"\n"
-"\tgit branch -m <name>\n"
-msgstr ""
-"Als Name für den initialen Branch wurde '%s' benutzt. Dieser\n"
-"Standard-Branchname kann sich ändern. Um den Namen des initialen Branches\n"
-"zu konfigurieren, der in allen neuen Repositories verwendet werden soll und\n"
-"um diese Warnung zu unterdrücken, führen Sie aus:\n"
-"\n"
-"\tgit config --global init.defaultBranch <Name>\n"
-"\n"
-"Häufig gewählte Namen statt 'master' sind 'main', 'trunk' und\n"
-"'development'. Der gerade erstellte Branch kann mit diesem Befehl\n"
-"umbenannt werden:\n"
-"\n"
-"\tgit branch -m <Name>\n"
-
-#: refs.c:583
-#, c-format
-msgid "could not retrieve `%s`"
-msgstr "konnte `%s` nicht abrufen"
-
-#: refs.c:593
-#, c-format
-msgid "invalid branch name: %s = %s"
-msgstr "ungültiger Branchname: %s = %s"
-
-#: refs.c:670
-#, c-format
-msgid "ignoring dangling symref %s"
-msgstr "Ignoriere unreferenzierte symbolische Referenz %s"
-
-#: refs.c:919
-#, 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:926
-#, c-format
-msgid "log for ref %s unexpectedly ended on %s"
-msgstr "Log für Referenz %s unerwartet bei %s beendet."
-
-#: refs.c:991
-#, c-format
-msgid "log for %s is empty"
-msgstr "Log für %s ist leer."
-
-#: refs.c:1086
-#, c-format
-msgid "refusing to update ref with bad name '%s'"
-msgstr "verweigere Aktualisierung einer Referenz mit fehlerhaftem Namen '%s'"
-
-#: refs.c:1164
-#, c-format
-msgid "update_ref failed for ref '%s': %s"
-msgstr "update_ref für Referenz '%s' fehlgeschlagen: %s"
-
-#: refs.c:2059
-#, c-format
-msgid "multiple updates for ref '%s' not allowed"
-msgstr "mehrere Aktualisierungen für Referenz '%s' nicht erlaubt"
-
-#: refs.c:2145
-msgid "ref updates forbidden inside quarantine environment"
-msgstr ""
-"Aktualisierungen von Referenzen ist innerhalb der Quarantäne-Umgebung "
-"verboten"
-
-#: refs.c:2156
-msgid "ref updates aborted by hook"
-msgstr "Aktualisierungen von Referenzen durch Hook abgebrochen"
-
-#: refs.c:2264 refs.c:2294
-#, c-format
-msgid "'%s' exists; cannot create '%s'"
-msgstr "'%s' existiert; kann '%s' nicht erstellen"
-
-#: refs.c:2270 refs.c:2305
-#, 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:1295
-#, c-format
-msgid "could not remove reference %s"
-msgstr "konnte Referenz %s nicht löschen"
-
-#: refs/files-backend.c:1310 refs/packed-backend.c:1565
-#: refs/packed-backend.c:1575
-#, c-format
-msgid "could not delete reference %s: %s"
-msgstr "konnte Referenz %s nicht entfernen: %s"
-
-#: refs/files-backend.c:1313 refs/packed-backend.c:1578
-#, c-format
-msgid "could not delete references: %s"
-msgstr "konnte Referenzen nicht entfernen: %s"
-
-#: refspec.c:170
-#, c-format
-msgid "invalid refspec '%s'"
-msgstr "ungültige Refspec '%s'"
-
-#: remote.c:402
-#, c-format
-msgid "config remote shorthand cannot begin with '/': %s"
-msgstr ""
-"Kürzel für Remote-Repository in der Konfiguration kann nicht mit '/' "
-"beginnen: %s"
-
-#: remote.c:450
-msgid "more than one receivepack given, using the first"
-msgstr "Mehr als ein receivepack-Befehl angegeben, benutze den ersten."
-
-#: remote.c:458
-msgid "more than one uploadpack given, using the first"
-msgstr "Mehr als ein uploadpack-Befehl angegeben, benutze den ersten."
-
-#: remote.c:698
-#, c-format
-msgid "Cannot fetch both %s and %s to %s"
-msgstr "Kann 'fetch' nicht für sowohl %s als auch %s nach %s ausführen."
-
-#: remote.c:702
-#, c-format
-msgid "%s usually tracks %s, not %s"
-msgstr "%s folgt üblicherweise %s, nicht %s"
-
-#: remote.c:706
-#, c-format
-msgid "%s tracks both %s and %s"
-msgstr "%s folgt sowohl %s als auch %s"
-
-#: remote.c:774
-#, c-format
-msgid "key '%s' of pattern had no '*'"
-msgstr "Schlüssel '%s' des Musters hatte kein '*'."
-
-#: remote.c:784
-#, c-format
-msgid "value '%s' of pattern has no '*'"
-msgstr "Wert '%s' des Musters hat kein '*'."
-
-#: remote.c:1191
-#, c-format
-msgid "src refspec %s does not match any"
-msgstr "Src-Refspec %s entspricht keiner Referenz."
-
-#: remote.c:1196
-#, c-format
-msgid "src refspec %s matches more than one"
-msgstr "Src-Refspec %s entspricht mehr als einer Referenz."
-
-#. TRANSLATORS: "matches '%s'%" is the <dst> part of "git push
-#. <remote> <src>:<dst>" push, and "being pushed ('%s')" is
-#. the <src>.
-#.
-#: remote.c:1211
-#, c-format
-msgid ""
-"The destination you provided is not a full refname (i.e.,\n"
-"starting with \"refs/\"). We tried to guess what you meant by:\n"
-"\n"
-"- Looking for a ref that matches '%s' on the remote side.\n"
-"- Checking if the <src> being pushed ('%s')\n"
-"  is a ref in \"refs/{heads,tags}/\". If so we add a corresponding\n"
-"  refs/{heads,tags}/ prefix on the remote side.\n"
-"\n"
-"Neither worked, so we gave up. You must fully qualify the ref."
-msgstr ""
-"Das angegebene Ziel ist kein vollständiger Referenzname (startet mit \"refs/"
-"\").\n"
-"Wir versuchten zu erraten, was Sie meinten, mit:\n"
-"\n"
-"- Suche einer Referenz, die mit '%s' übereinstimmt, auf der Remote-Seite\n"
-"- Prüfung, ob die versendete <Quelle> ('%s') eine Referenz in \"refs/{heads,"
-"tags}\"\n"
-"  ist, in dessen Falle wir einen entsprechenden refs/{heads,tags} Präfix "
-"auf\n"
-"  der Remote-Seite hinzufügen würden.\n"
-"\n"
-"Keines hat funktioniert, sodass wir aufgegeben haben. Sie müssen die\n"
-"Referenz mit vollqualifizierten Namen angeben."
-
-#: remote.c:1231
-#, c-format
-msgid ""
-"The <src> part of the refspec is a commit object.\n"
-"Did you mean to create a new branch by pushing to\n"
-"'%s:refs/heads/%s'?"
-msgstr ""
-"Der <Quelle> Teil der Refspec ist ein Commit-Objekt.\n"
-"Meinten Sie, einen neuen Branch mittels Push nach\n"
-"'%s:refs/heads/%s' zu erstellen?"
-
-#: remote.c:1236
-#, c-format
-msgid ""
-"The <src> part of the refspec is a tag object.\n"
-"Did you mean to create a new tag by pushing to\n"
-"'%s:refs/tags/%s'?"
-msgstr ""
-"Der <Quelle> Teil der Refspec ist ein Tag-Objekt.\n"
-"Meinten Sie, einen neuen Tag mittels Push nach\n"
-"'%s:refs/tags/%s' zu erstellen?"
-
-#: remote.c:1241
-#, c-format
-msgid ""
-"The <src> part of the refspec is a tree object.\n"
-"Did you mean to tag a new tree by pushing to\n"
-"'%s:refs/tags/%s'?"
-msgstr ""
-"Der <Quelle> Teil der Refspec ist ein Tree-Objekt.\n"
-"Meinten Sie, einen Tag für ein neues Tree-Objekt\n"
-"mittels Push nach '%s:refs/tags/'%s' zu erstellen?"
-
-#: remote.c:1246
-#, c-format
-msgid ""
-"The <src> part of the refspec is a blob object.\n"
-"Did you mean to tag a new blob by pushing to\n"
-"'%s:refs/tags/%s'?"
-msgstr ""
-"Der <Quelle> Teil der Refspec ist ein Blob-Objekt.\n"
-"Meinten Sie, einen Tag für ein neues Blob-Objekt\n"
-"mittels Push nach '%s:refs/tags/%s' zu erstellen?"
-
-#: remote.c:1282
-#, c-format
-msgid "%s cannot be resolved to branch"
-msgstr "%s kann nicht zu Branch aufgelöst werden."
-
-#: remote.c:1293
-#, c-format
-msgid "unable to delete '%s': remote ref does not exist"
-msgstr "Konnte '%s' nicht löschen: Remote-Referenz existiert nicht."
-
-#: remote.c:1305
-#, c-format
-msgid "dst refspec %s matches more than one"
-msgstr "Dst-Refspec %s entspricht mehr als einer Referenz."
-
-#: remote.c:1312
-#, c-format
-msgid "dst ref %s receives from more than one src"
-msgstr "Dst-Referenz %s empfängt von mehr als einer Quelle"
-
-#: remote.c:1833 remote.c:1940
-msgid "HEAD does not point to a branch"
-msgstr "HEAD zeigt auf keinen Branch"
-
-#: remote.c:1842
-#, c-format
-msgid "no such branch: '%s'"
-msgstr "Branch nicht gefunden: '%s'"
-
-#: remote.c:1845
-#, c-format
-msgid "no upstream configured for branch '%s'"
-msgstr "Kein Upstream-Branch für Branch '%s' konfiguriert."
-
-#: remote.c:1851
-#, c-format
-msgid "upstream branch '%s' not stored as a remote-tracking branch"
-msgstr "Upstream-Branch '%s' nicht als Remote-Tracking-Branch gespeichert"
-
-#: remote.c:1866
-#, c-format
-msgid "push destination '%s' on remote '%s' has no local tracking branch"
-msgstr ""
-"Ziel für \"push\" '%s' auf Remote-Repository '%s' hat keinen lokal gefolgten "
-"Branch"
-
-#: remote.c:1881
-#, c-format
-msgid "branch '%s' has no remote for pushing"
-msgstr "Branch '%s' hat keinen Upstream-Branch gesetzt"
-
-#: remote.c:1891
-#, c-format
-msgid "push refspecs for '%s' do not include '%s'"
-msgstr "Push-Refspecs für '%s' beinhalten nicht '%s'"
-
-#: remote.c:1904
-msgid "push has no destination (push.default is 'nothing')"
-msgstr "kein Ziel für \"push\" (push.default ist 'nothing')"
-
-#: remote.c:1926
-msgid "cannot resolve 'simple' push to a single destination"
-msgstr "kann einzelnes Ziel für \"push\" im Modus 'simple' nicht auflösen"
-
-#: remote.c:2059
-#, c-format
-msgid "couldn't find remote ref %s"
-msgstr "Konnte Remote-Referenz %s nicht finden."
-
-#: remote.c:2072
-#, c-format
-msgid "* Ignoring funny ref '%s' locally"
-msgstr "* Ignoriere sonderbare Referenz '%s' lokal"
-
-#: remote.c:2235
-#, c-format
-msgid "Your branch is based on '%s', but the upstream is gone.\n"
-msgstr ""
-"Ihr Branch basiert auf '%s', aber der Upstream-Branch wurde entfernt.\n"
-
-#: remote.c:2239
-msgid "  (use \"git branch --unset-upstream\" to fixup)\n"
-msgstr "  (benutzen Sie \"git branch --unset-upstream\" zum Beheben)\n"
-
-#: remote.c:2242
-#, c-format
-msgid "Your branch is up to date with '%s'.\n"
-msgstr "Ihr Branch ist auf demselben Stand wie '%s'.\n"
-
-#: remote.c:2246
-#, c-format
-msgid "Your branch and '%s' refer to different commits.\n"
-msgstr "Ihr Branch und '%s' zeigen auf unterschiedliche Commits.\n"
-
-#: remote.c:2249
-#, c-format
-msgid "  (use \"%s\" for details)\n"
-msgstr "  (benutzen Sie \"%s\" für Details)\n"
-
-#: remote.c:2253
-#, c-format
-msgid "Your branch is ahead of '%s' by %d commit.\n"
-msgid_plural "Your branch is ahead of '%s' by %d commits.\n"
-msgstr[0] "Ihr Branch ist %2$d Commit vor '%1$s'.\n"
-msgstr[1] "Ihr Branch ist %2$d Commits vor '%1$s'.\n"
-
-#: remote.c:2259
-msgid "  (use \"git push\" to publish your local commits)\n"
-msgstr "  (benutzen Sie \"git push\", um lokale Commits zu publizieren)\n"
-
-#: remote.c:2262
-#, c-format
-msgid "Your branch is behind '%s' by %d commit, and can be fast-forwarded.\n"
-msgid_plural ""
-"Your branch is behind '%s' by %d commits, and can be fast-forwarded.\n"
-msgstr[0] ""
-"Ihr Branch ist %2$d Commit hinter '%1$s', und kann vorgespult werden.\n"
-msgstr[1] ""
-"Ihr Branch ist %2$d Commits hinter '%1$s', und kann vorgespult werden.\n"
-
-#: remote.c:2270
-msgid "  (use \"git pull\" to update your local branch)\n"
-msgstr ""
-"  (benutzen Sie \"git pull\", um Ihren lokalen Branch zu aktualisieren)\n"
-
-#: remote.c:2273
-#, c-format
-msgid ""
-"Your branch and '%s' have diverged,\n"
-"and have %d and %d different commit each, respectively.\n"
-msgid_plural ""
-"Your branch and '%s' have diverged,\n"
-"and have %d and %d different commits each, respectively.\n"
-msgstr[0] ""
-"Ihr Branch und '%s' sind divergiert,\n"
-"und haben jeweils %d und %d unterschiedliche Commits.\n"
-msgstr[1] ""
-"Ihr Branch und '%s' sind divergiert,\n"
-"und haben jeweils %d und %d unterschiedliche Commits.\n"
-
-#: remote.c:2283
-msgid "  (use \"git pull\" to merge the remote branch into yours)\n"
-msgstr ""
-"  (benutzen Sie \"git pull\", um Ihren Branch mit dem Remote-Branch "
-"zusammenzuführen)\n"
-
-#: remote.c:2475
-#, c-format
-msgid "cannot parse expected object name '%s'"
-msgstr "Kann erwarteten Objektnamen '%s' nicht parsen."
-
-#: replace-object.c:21
-#, c-format
-msgid "bad replace ref name: %s"
-msgstr "ungültiger Name für ersetzende Referenz: %s"
-
-#: replace-object.c:30
-#, c-format
-msgid "duplicate replace ref: %s"
-msgstr "doppelte ersetzende Referenz: %s"
-
-#: replace-object.c:82
-#, c-format
-msgid "replace depth too high for object %s"
-msgstr "Ersetzungstiefe zu hoch für Objekt %s"
-
-#: rerere.c:201 rerere.c:210 rerere.c:213
-msgid "corrupt MERGE_RR"
-msgstr "Fehlerhaftes MERGE_RR"
-
-#: rerere.c:248 rerere.c:253
-msgid "unable to write rerere record"
-msgstr "Konnte Rerere-Eintrag nicht schreiben."
-
-#: rerere.c:479
-#, c-format
-msgid "there were errors while writing '%s' (%s)"
-msgstr "Fehler beim Schreiben von '%s' (%s)."
-
-#: rerere.c:482 builtin/gc.c:2263 builtin/gc.c:2298
-#, c-format
-msgid "failed to flush '%s'"
-msgstr "Flush bei '%s' fehlgeschlagen."
-
-#: rerere.c:487 rerere.c:1024
-#, c-format
-msgid "could not parse conflict hunks in '%s'"
-msgstr "Konnte Konflikt-Blöcke in '%s' nicht parsen."
-
-#: rerere.c:669
-#, c-format
-msgid "failed utime() on '%s'"
-msgstr "Fehler beim Aufruf von utime() auf '%s'."
-
-#: rerere.c:679
-#, c-format
-msgid "writing '%s' failed"
-msgstr "Schreiben von '%s' fehlgeschlagen."
-
-#: rerere.c:699
-#, c-format
-msgid "Staged '%s' using previous resolution."
-msgstr "'%s' mit vorheriger Konfliktauflösung zum Commit vorgemerkt."
-
-#: rerere.c:738
-#, c-format
-msgid "Recorded resolution for '%s'."
-msgstr "Konfliktauflösung für '%s' aufgezeichnet."
-
-#: rerere.c:773
-#, c-format
-msgid "Resolved '%s' using previous resolution."
-msgstr "Konflikte in '%s' mit vorheriger Konfliktauflösung beseitigt."
-
-#: rerere.c:788
-#, c-format
-msgid "cannot unlink stray '%s'"
-msgstr "Kann '%s' nicht löschen."
-
-#: rerere.c:792
-#, c-format
-msgid "Recorded preimage for '%s'"
-msgstr "Preimage für '%s' aufgezeichnet."
-
-#: rerere.c:866 submodule.c:2290 builtin/log.c:2042
-#: builtin/submodule--helper.c:1786 builtin/submodule--helper.c:1833
-#, c-format
-msgid "could not create directory '%s'"
-msgstr "Konnte Verzeichnis '%s' nicht erstellen."
-
-#: rerere.c:1042
-#, c-format
-msgid "failed to update conflicted state in '%s'"
-msgstr "Fehler beim Aktualisieren des Konflikt-Status in '%s'."
-
-#: rerere.c:1053 rerere.c:1060
-#, c-format
-msgid "no remembered resolution for '%s'"
-msgstr "Keine aufgezeichnete Konfliktauflösung für '%s'."
-
-#: rerere.c:1062
-#, c-format
-msgid "cannot unlink '%s'"
-msgstr "Kann '%s' nicht löschen."
-
-#: rerere.c:1072
-#, c-format
-msgid "Updated preimage for '%s'"
-msgstr "Preimage für '%s' aktualisiert."
-
-#: rerere.c:1081
-#, c-format
-msgid "Forgot resolution for '%s'\n"
-msgstr "Aufgezeichnete Konfliktauflösung für '%s' gelöscht.\n"
-
-#: rerere.c:1192
-msgid "unable to open rr-cache directory"
-msgstr "Konnte rr-cache Verzeichnis nicht öffnen."
-
-#: reset.c:112
-msgid "could not determine HEAD revision"
-msgstr "Konnte HEAD-Commit nicht bestimmen."
-
-#: reset.c:141 reset.c:147 sequencer.c:3696
-#, c-format
-msgid "failed to find tree of %s"
-msgstr "Fehler beim Finden des \"Tree\"-Objektes von %s."
-
-#: revision.c:2358
-msgid "--unpacked=<packfile> no longer supported"
-msgstr "--unpacked=<Pack-Datei> wird nicht länger unterstützt"
-
-#: revision.c:2712
-msgid "your current branch appears to be broken"
-msgstr "Ihr aktueller Branch scheint fehlerhaft zu sein."
-
-#: revision.c:2715
-#, c-format
-msgid "your current branch '%s' does not have any commits yet"
-msgstr "Ihr aktueller Branch '%s' hat noch keine Commits."
-
-#: revision.c:2901
-msgid "object filtering requires --objects"
-msgstr "Das Filtern von Objekten erfordert --objects."
-
-#: revision.c:2918
-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:1262
-#, c-format
-msgid "cannot create async thread: %s"
-msgstr "Konnte Thread für async nicht erzeugen: %s"
-
-#: send-pack.c:150
-msgid "unexpected flush packet while reading remote unpack status"
-msgstr "Unerwartetes Flush-Paket beim Lesen des Remote-Unpack-Status."
-
-#: send-pack.c:152
-#, c-format
-msgid "unable to parse remote unpack status: %s"
-msgstr "Konnte Status des Entpackens der Gegenseite nicht parsen: %s"
-
-#: send-pack.c:154
-#, c-format
-msgid "remote unpack failed: %s"
-msgstr "Entpacken auf der Gegenseite fehlgeschlagen: %s"
-
-#: send-pack.c:378
-msgid "failed to sign the push certificate"
-msgstr "Fehler beim Signieren des \"push\"-Zertifikates"
-
-#: send-pack.c:435
-msgid "send-pack: unable to fork off fetch subprocess"
-msgstr "send-pack: konnte Fetch-Subprozess nicht abspalten"
-
-#: 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: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:537
-msgid "the receiving end does not support --signed push"
-msgstr ""
-"die Gegenseite unterstützt keinen signierten Versand (\"--signed push\")"
-
-#: send-pack.c:539
-msgid ""
-"not sending a push certificate since the receiving end does not support --"
-"signed push"
-msgstr ""
-"kein Versand des \"push\"-Zertifikates, da die Gegenseite keinen signierten\n"
-"Versand (\"--signed push\") unterstützt"
-
-#: 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:551
-msgid "the receiving end does not support push options"
-msgstr "die Gegenseite unterstützt keine Push-Optionen"
-
-#: sequencer.c:197
-#, c-format
-msgid "invalid commit message cleanup mode '%s'"
-msgstr "Ungültiger \"cleanup\"-Modus '%s' für Commit-Beschreibungen."
-
-#: sequencer.c:325
-#, c-format
-msgid "could not delete '%s'"
-msgstr "Konnte '%s' nicht löschen."
-
-#: sequencer.c:345 sequencer.c:4724 builtin/rebase.c:564 builtin/rebase.c:1326
-#: builtin/rm.c:409
-#, c-format
-msgid "could not remove '%s'"
-msgstr "Konnte '%s' nicht löschen"
-
-#: sequencer.c:355
-msgid "revert"
-msgstr "Revert"
-
-#: sequencer.c:357
-msgid "cherry-pick"
-msgstr "Cherry-Pick"
-
-#: sequencer.c:359
-msgid "rebase"
-msgstr "Rebase"
-
-#: sequencer.c:361
-#, c-format
-msgid "unknown action: %d"
-msgstr "Unbekannte Aktion: %d"
-
-#: sequencer.c:420
-msgid ""
-"after resolving the conflicts, mark the corrected paths\n"
-"with 'git add <paths>' or 'git rm <paths>'"
-msgstr ""
-"nach Auflösung der Konflikte markieren Sie die korrigierten Pfade\n"
-"mit 'git add <Pfade>' oder 'git rm <Pfade>'"
-
-#: sequencer.c:423
-msgid ""
-"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 ""
-"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: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:3288
-#, c-format
-msgid "could not lock '%s'"
-msgstr "Konnte '%s' nicht sperren"
-
-#: sequencer.c:450 sequencer.c:3087 sequencer.c:3292 sequencer.c:3306
-#: sequencer.c:3557 sequencer.c:5591 strbuf.c:1189 wrapper.c:715
-#, c-format
-msgid "could not write to '%s'"
-msgstr "Konnte nicht nach '%s' schreiben."
-
-#: sequencer.c:455
-#, c-format
-msgid "could not write eol to '%s'"
-msgstr "Konnte EOL nicht nach '%s' schreiben."
-
-#: sequencer.c:460 sequencer.c:3092 sequencer.c:3294 sequencer.c:3308
-#: sequencer.c:3565
-#, c-format
-msgid "failed to finalize '%s'"
-msgstr "Fehler beim Fertigstellen von '%s'."
-
-#: sequencer.c:473 sequencer.c:1930 sequencer.c:3112 sequencer.c:3547
-#: sequencer.c:3675 builtin/am.c:290 builtin/commit.c:837 builtin/merge.c:1154
-#, c-format
-msgid "could not read '%s'"
-msgstr "Konnte '%s' nicht lesen"
-
-#: 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:503
-msgid "commit your changes or stash them to proceed."
-msgstr ""
-"Committen Sie Ihre Änderungen oder benutzen Sie \"stash\", um fortzufahren."
-
-#: sequencer.c:535
-#, c-format
-msgid "%s: fast-forward"
-msgstr "%s: Vorspulen"
-
-#: sequencer.c:574 builtin/tag.c:615
-#, c-format
-msgid "Invalid cleanup mode %s"
-msgstr "Ungültiger \"cleanup\" Modus %s"
-
-#. TRANSLATORS: %s will be "revert", "cherry-pick" or
-#. "rebase".
-#.
-#: sequencer.c:685
-#, c-format
-msgid "%s: Unable to write new index file"
-msgstr "%s: Konnte neue Index-Datei nicht schreiben"
-
-#: sequencer.c:699
-msgid "unable to update cache tree"
-msgstr "Konnte Cache-Verzeichnis nicht aktualisieren."
-
-#: sequencer.c:713
-msgid "could not resolve HEAD commit"
-msgstr "Konnte HEAD-Commit nicht auflösen."
-
-#: sequencer.c:793
-#, c-format
-msgid "no key present in '%.*s'"
-msgstr "Kein Schlüssel in '%.*s' vorhanden."
-
-#: sequencer.c:804
-#, c-format
-msgid "unable to dequote value of '%s'"
-msgstr "Konnte Anführungszeichen von '%s' nicht entfernen."
-
-#: sequencer.c:841 wrapper.c:219 wrapper.c:389 builtin/am.c:757
-#: builtin/am.c:849 builtin/rebase.c:699
-#, c-format
-msgid "could not open '%s' for reading"
-msgstr "Konnte '%s' nicht zum Lesen öffnen."
-
-#: sequencer.c:851
-msgid "'GIT_AUTHOR_NAME' already given"
-msgstr "'GIT_AUTHOR_NAME' bereits angegeben."
-
-#: sequencer.c:856
-msgid "'GIT_AUTHOR_EMAIL' already given"
-msgstr "'GIT_AUTHOR_EMAIL' bereits angegeben."
-
-#: sequencer.c:861
-msgid "'GIT_AUTHOR_DATE' already given"
-msgstr "'GIT_AUTHOR_DATE' bereits angegeben."
-
-#: sequencer.c:865
-#, c-format
-msgid "unknown variable '%s'"
-msgstr "Unbekannte Variable '%s'"
-
-#: sequencer.c:870
-msgid "missing 'GIT_AUTHOR_NAME'"
-msgstr "'GIT_AUTHOR_NAME' fehlt."
-
-#: sequencer.c:872
-msgid "missing 'GIT_AUTHOR_EMAIL'"
-msgstr "'GIT_AUTHOR_EMAIL' fehlt."
-
-#: sequencer.c:874
-msgid "missing 'GIT_AUTHOR_DATE'"
-msgstr "'GIT_AUTHOR_DATE' fehlt."
-
-#: sequencer.c:939
-#, c-format
-msgid ""
-"you have staged changes in your working tree\n"
-"If these changes are meant to be squashed into the previous commit, run:\n"
-"\n"
-"  git commit --amend %s\n"
-"\n"
-"If they are meant to go into a new commit, run:\n"
-"\n"
-"  git commit %s\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 %s\n"
-"\n"
-"Wenn daraus ein neuer Commit erzeugt werden soll, führen Sie aus:\n"
-"\n"
-"  git commit %s\n"
-"\n"
-"Im Anschluss führen Sie zum Fortfahren aus:\n"
-"\n"
-"  git rebase --continue\n"
-
-#: sequencer.c:1225
-msgid "'prepare-commit-msg' hook failed"
-msgstr "'prepare-commit-msg' Hook fehlgeschlagen."
-
-#: sequencer.c:1231
-msgid ""
-"Your name and email address were configured automatically based\n"
-"on your username and hostname. Please check that they are accurate.\n"
-"You can suppress this message by setting them explicitly. Run the\n"
-"following command and follow the instructions in your editor to edit\n"
-"your configuration file:\n"
-"\n"
-"    git config --global --edit\n"
-"\n"
-"After doing this, you may fix the identity used for this commit with:\n"
-"\n"
-"    git commit --amend --reset-author\n"
-msgstr ""
-"Ihr Name und E-Mail Adresse wurden automatisch auf Basis\n"
-"Ihres Benutzer- und Rechnernamens konfiguriert. Bitte prüfen Sie, dass\n"
-"diese zutreffend sind. Sie können diese Meldung unterdrücken, indem Sie\n"
-"diese explizit setzen. Führen Sie dazu den folgenden Befehl aus und folgen\n"
-"Sie den Anweisungen in Ihrem Editor, um die Konfigurationsdatei zu "
-"bearbeiten:\n"
-"\n"
-"    git config --global --edit\n"
-"\n"
-"Nachdem Sie das getan haben, können Sie Ihre Identität für diesen Commit\n"
-"ändern mit:\n"
-"\n"
-"    git commit --amend --reset-author\n"
-
-#: sequencer.c:1244
-msgid ""
-"Your name and email address were configured automatically based\n"
-"on your username and hostname. Please check that they are accurate.\n"
-"You can suppress this message by setting them explicitly:\n"
-"\n"
-"    git config --global user.name \"Your Name\"\n"
-"    git config --global user.email you@example.com\n"
-"\n"
-"After doing this, you may fix the identity used for this commit with:\n"
-"\n"
-"    git commit --amend --reset-author\n"
-msgstr ""
-"Ihr Name und E-Mail Adresse wurden automatisch auf Basis\n"
-"Ihres Benutzer- und Rechnernamens konfiguriert. Bitte prüfen Sie, dass\n"
-"diese zutreffend sind. Sie können diese Meldung unterdrücken, indem Sie\n"
-"diese explizit setzen:\n"
-"\n"
-"    git config --global user.name \"Ihr Name\"\n"
-"    git config --global user.email ihre@emailadresse.de\n"
-"\n"
-"Nachdem Sie das getan haben, können Sie Ihre Identität für diesen Commit "
-"ändern:\n"
-"\n"
-"    git commit --amend --reset-author\n"
-
-#: sequencer.c:1287
-msgid "couldn't look up newly created commit"
-msgstr "Konnte neu erstellten Commit nicht nachschlagen."
-
-#: sequencer.c:1289
-msgid "could not parse newly created commit"
-msgstr "Konnte neu erstellten Commit nicht analysieren."
-
-#: sequencer.c:1336
-msgid "unable to resolve HEAD after creating commit"
-msgstr "Konnte HEAD nicht auflösen, nachdem der Commit erstellt wurde."
-
-#: sequencer.c:1338
-msgid "detached HEAD"
-msgstr "losgelöster HEAD"
-
-#: sequencer.c:1342
-msgid " (root-commit)"
-msgstr " (Root-Commit)"
-
-#: sequencer.c:1363
-msgid "could not parse HEAD"
-msgstr "Konnte HEAD nicht parsen."
-
-#: sequencer.c:1365
-#, c-format
-msgid "HEAD %s is not a commit!"
-msgstr "HEAD %s ist kein Commit!"
-
-#: sequencer.c:1369 sequencer.c:1447 builtin/commit.c:1707
-msgid "could not parse HEAD commit"
-msgstr "Konnte Commit von HEAD nicht analysieren."
-
-#: sequencer.c:1425 sequencer.c:2310
-msgid "unable to parse commit author"
-msgstr "Konnte Commit-Autor nicht parsen."
-
-#: sequencer.c:1436 builtin/am.c:1644 builtin/merge.c:710
-msgid "git write-tree failed to write a tree"
-msgstr "\"git write-tree\" schlug beim Schreiben eines \"Tree\"-Objektes fehl"
-
-#: sequencer.c:1469 sequencer.c:1589
-#, c-format
-msgid "unable to read commit message from '%s'"
-msgstr "Konnte Commit-Beschreibung von '%s' nicht lesen."
-
-#: sequencer.c:1500 sequencer.c:1532
-#, c-format
-msgid "invalid author identity '%s'"
-msgstr "ungültige Autor-Identität '%s'"
-
-#: sequencer.c:1506
-msgid "corrupt author: missing date information"
-msgstr "unbrauchbarer Autor: Datumsinformationen fehlen"
-
-#: sequencer.c:1545 builtin/am.c:1671 builtin/commit.c:1821 builtin/merge.c:921
-#: builtin/merge.c:946 t/helper/test-fast-rebase.c:78
-msgid "failed to write commit object"
-msgstr "Fehler beim Schreiben des Commit-Objektes."
-
-#: sequencer.c:1572 sequencer.c:4496 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:1621
-#, c-format
-msgid "could not parse commit %s"
-msgstr "Konnte Commit %s nicht parsen."
-
-#: sequencer.c:1626
-#, c-format
-msgid "could not parse parent commit %s"
-msgstr "Konnte Eltern-Commit %s nicht parsen."
-
-#: sequencer.c:1709 sequencer.c:1990
-#, c-format
-msgid "unknown command: %d"
-msgstr "Unbekannter Befehl: %d"
-
-#: sequencer.c:1751
-msgid "This is the 1st commit message:"
-msgstr "Das ist die erste Commit-Beschreibung:"
-
-#: sequencer.c:1752
-#, c-format
-msgid "This is the commit message #%d:"
-msgstr "Das ist Commit-Beschreibung #%d:"
-
-#: sequencer.c:1753
-msgid "The 1st commit message will be skipped:"
-msgstr "Die erste Commit-Beschreibung wird übersprungen:"
-
-#: sequencer.c:1754
-#, c-format
-msgid "The commit message #%d will be skipped:"
-msgstr "Die Commit-Beschreibung #%d wird ausgelassen:"
-
-#: sequencer.c:1755
-#, c-format
-msgid "This is a combination of %d commits."
-msgstr "Das ist eine Kombination aus %d Commits."
-
-#: sequencer.c:1902 sequencer.c:1959
-#, c-format
-msgid "cannot write '%s'"
-msgstr "kann '%s' nicht schreiben"
-
-#: sequencer.c:1949
-msgid "need a HEAD to fixup"
-msgstr "benötige HEAD für fixup"
-
-#: sequencer.c:1951 sequencer.c:3592
-msgid "could not read HEAD"
-msgstr "Konnte HEAD nicht lesen"
-
-#: sequencer.c:1953
-msgid "could not read HEAD's commit message"
-msgstr "Konnte Commit-Beschreibung von HEAD nicht lesen"
-
-#: sequencer.c:1977
-#, c-format
-msgid "could not read commit message of %s"
-msgstr "Konnte Commit-Beschreibung von %s nicht lesen."
-
-#: sequencer.c:2087
-msgid "your index file is unmerged."
-msgstr "Ihre Index-Datei ist nicht zusammengeführt."
-
-#: sequencer.c:2094
-msgid "cannot fixup root commit"
-msgstr "kann fixup nicht auf Root-Commit anwenden"
-
-#: sequencer.c:2113
-#, 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:2121 sequencer.c:2129
-#, c-format
-msgid "commit %s does not have parent %d"
-msgstr "Commit %s hat keinen Eltern-Commit %d"
-
-#: sequencer.c:2135
-#, 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:2154
-#, c-format
-msgid "%s: cannot parse parent commit %s"
-msgstr "%s: kann Eltern-Commit %s nicht parsen"
-
-#: sequencer.c:2220
-#, c-format
-msgid "could not rename '%s' to '%s'"
-msgstr "Konnte '%s' nicht zu '%s' umbenennen."
-
-#: sequencer.c:2280
-#, c-format
-msgid "could not revert %s... %s"
-msgstr "Konnte \"revert\" nicht auf %s... (%s) ausführen"
-
-#: sequencer.c:2281
-#, c-format
-msgid "could not apply %s... %s"
-msgstr "Konnte %s... (%s) nicht anwenden"
-
-#: sequencer.c:2302
-#, 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:2360
-#, c-format
-msgid "git %s: failed to read the index"
-msgstr "git %s: Fehler beim Lesen des Index"
-
-#: sequencer.c:2368
-#, c-format
-msgid "git %s: failed to refresh the index"
-msgstr "git %s: Fehler beim Aktualisieren des Index"
-
-#: sequencer.c:2448
-#, c-format
-msgid "%s does not accept arguments: '%s'"
-msgstr "%s akzeptiert keine Argumente: '%s'"
-
-#: sequencer.c:2457
-#, c-format
-msgid "missing arguments for %s"
-msgstr "Fehlende Argumente für %s."
-
-#: sequencer.c:2500
-#, c-format
-msgid "could not parse '%s'"
-msgstr "Konnte '%s' nicht parsen."
-
-#: sequencer.c:2561
-#, c-format
-msgid "invalid line %d: %.*s"
-msgstr "Ungültige Zeile %d: %.*s"
-
-#: sequencer.c:2572
-#, c-format
-msgid "cannot '%s' without a previous commit"
-msgstr "Kann '%s' nicht ohne vorherigen Commit ausführen"
-
-#: sequencer.c:2620 builtin/rebase.c:185
-#, c-format
-msgid "could not read '%s'."
-msgstr "Konnte '%s' nicht lesen."
-
-#: sequencer.c:2658
-msgid "cancelling a cherry picking in progress"
-msgstr "Abbrechen eines laufenden \"cherry-pick\""
-
-#: sequencer.c:2667
-msgid "cancelling a revert in progress"
-msgstr "Abbrechen eines laufenden \"revert\""
-
-#: sequencer.c:2707
-msgid "please fix this using 'git rebase --edit-todo'."
-msgstr ""
-"Bitte beheben Sie dieses, indem Sie 'git rebase --edit-todo' ausführen."
-
-#: sequencer.c:2709
-#, c-format
-msgid "unusable instruction sheet: '%s'"
-msgstr "Unbenutzbares Instruktionsblatt: '%s'"
-
-#: sequencer.c:2714
-msgid "no commits parsed."
-msgstr "Keine Commits geparst."
-
-#: sequencer.c:2725
-msgid "cannot cherry-pick during a revert."
-msgstr "Kann Cherry-Pick nicht während eines Reverts ausführen."
-
-#: sequencer.c:2727
-msgid "cannot revert during a cherry-pick."
-msgstr "Kann Revert nicht während eines Cherry-Picks ausführen."
-
-#: sequencer.c:2914
-msgid "unusable squash-onto"
-msgstr "unbenutzbares squash-onto"
-
-#: sequencer.c:2934
-#, c-format
-msgid "malformed options sheet: '%s'"
-msgstr "fehlerhaftes Optionsblatt: '%s'"
-
-#: sequencer.c:3029 sequencer.c:4875
-msgid "empty commit set passed"
-msgstr "leere Menge von Commits übergeben"
-
-#: sequencer.c:3046
-msgid "revert is already in progress"
-msgstr "\"revert\" ist bereits im Gange"
-
-#: sequencer.c:3048
-#, c-format
-msgid "try \"git revert (--continue | %s--abort | --quit)\""
-msgstr "versuchen Sie \"git revert (--continue | %s--abort | --quit)\""
-
-#: sequencer.c:3051
-msgid "cherry-pick is already in progress"
-msgstr "\"cherry-pick\" wird bereits durchgeführt"
-
-#: sequencer.c:3053
-#, c-format
-msgid "try \"git cherry-pick (--continue | %s--abort | --quit)\""
-msgstr "versuchen Sie \"git cherry-pick (--continue | %s--abort | --quit)\""
-
-#: sequencer.c:3067
-#, c-format
-msgid "could not create sequencer directory '%s'"
-msgstr "konnte \"sequencer\"-Verzeichnis '%s' nicht erstellen"
-
-#: sequencer.c:3082
-msgid "could not lock HEAD"
-msgstr "konnte HEAD nicht sperren"
-
-#: sequencer.c:3142 sequencer.c:4585
-msgid "no cherry-pick or revert in progress"
-msgstr "kein \"cherry-pick\" oder \"revert\" im Gange"
-
-#: sequencer.c:3144 sequencer.c:3155
-msgid "cannot resolve HEAD"
-msgstr "kann HEAD nicht auflösen"
-
-#: sequencer.c:3146 sequencer.c:3190
-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:3176 builtin/fetch.c:1030 builtin/fetch.c:1457
-#: builtin/grep.c:774
-#, c-format
-msgid "cannot open '%s'"
-msgstr "kann '%s' nicht öffnen"
-
-#: sequencer.c:3178
-#, c-format
-msgid "cannot read '%s': %s"
-msgstr "kann '%s' nicht lesen: %s"
-
-#: sequencer.c:3179
-msgid "unexpected end of file"
-msgstr "unerwartetes Dateiende"
-
-#: sequencer.c:3185
-#, 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:3196
-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:3237
-msgid "no revert in progress"
-msgstr "kein Revert im Gange"
-
-#: sequencer.c:3246
-msgid "no cherry-pick in progress"
-msgstr "kein \"cherry-pick\" im Gange"
-
-#: sequencer.c:3256
-msgid "failed to skip the commit"
-msgstr "Überspringen des Commits fehlgeschlagen"
-
-#: sequencer.c:3263
-msgid "there is nothing to skip"
-msgstr "nichts zum Überspringen vorhanden"
-
-#: sequencer.c:3266
-#, c-format
-msgid ""
-"have you committed already?\n"
-"try \"git %s --continue\""
-msgstr ""
-"Haben Sie bereits committet?\n"
-"Versuchen Sie \"git %s --continue\""
-
-#: sequencer.c:3428 sequencer.c:4476
-msgid "cannot read HEAD"
-msgstr "kann HEAD nicht lesen"
-
-#: sequencer.c:3445
-#, c-format
-msgid "unable to copy '%s' to '%s'"
-msgstr "konnte '%s' nicht nach '%s' kopieren"
-
-#: sequencer.c:3453
-#, c-format
-msgid ""
-"You can amend the commit now, with\n"
-"\n"
-"  git commit --amend %s\n"
-"\n"
-"Once you are satisfied with your changes, run\n"
-"\n"
-"  git rebase --continue\n"
-msgstr ""
-"Sie können den Commit nun nachbessern mit:\n"
-"\n"
-"  git commit --amend %s\n"
-"\n"
-"Sobald Sie mit Ihren Änderungen zufrieden sind, führen Sie aus:\n"
-"\n"
-"  git rebase --continue\n"
-
-#: sequencer.c:3463
-#, c-format
-msgid "Could not apply %s... %.*s"
-msgstr "Konnte %s... (%.*s) nicht anwenden"
-
-#: sequencer.c:3470
-#, c-format
-msgid "Could not merge %.*s"
-msgstr "Konnte \"%.*s\" nicht zusammenführen"
-
-#: sequencer.c:3484 sequencer.c:3488 builtin/difftool.c:633
-#, c-format
-msgid "could not copy '%s' to '%s'"
-msgstr "konnte '%s' nicht nach '%s' kopieren"
-
-#: sequencer.c:3499
-#, c-format
-msgid "Executing: %s\n"
-msgstr "Führe aus: %s\n"
-
-#: sequencer.c:3510
-#, c-format
-msgid ""
-"execution failed: %s\n"
-"%sYou can fix the problem, and then run\n"
-"\n"
-"  git rebase --continue\n"
-"\n"
-msgstr ""
-"Ausführung fehlgeschlagen: %s\n"
-"%sSie können das Problem beheben, und dann\n"
-"\n"
-"\tgit rebase --continue\n"
-"\n"
-"ausführen.\n"
-
-#: sequencer.c:3516
-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:3522
-#, c-format
-msgid ""
-"execution succeeded: %s\n"
-"but left changes to the index and/or the working tree\n"
-"Commit or stash your changes, and then run\n"
-"\n"
-"  git rebase --continue\n"
-"\n"
-msgstr ""
-"Ausführung erfolgreich: %s\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"
-"  git rebase --continue\n"
-"\n"
-
-#: sequencer.c:3582
-#, c-format
-msgid "illegal label name: '%.*s'"
-msgstr "unerlaubter Beschriftungsname: '%.*s'"
-
-#: sequencer.c:3655
-msgid "writing fake root commit"
-msgstr "unechten Root-Commit schreiben"
-
-#: sequencer.c:3660
-msgid "writing squash-onto"
-msgstr "squash-onto schreiben"
-
-#: sequencer.c:3739
-#, c-format
-msgid "could not resolve '%s'"
-msgstr "konnte '%s' nicht auflösen"
-
-#: sequencer.c:3771
-msgid "cannot merge without a current revision"
-msgstr "kann nicht ohne einen aktuellen Commit mergen"
-
-#: sequencer.c:3793
-#, c-format
-msgid "unable to parse '%.*s'"
-msgstr "konnte '%.*s' nicht parsen"
-
-#: sequencer.c:3802
-#, c-format
-msgid "nothing to merge: '%.*s'"
-msgstr "nichts zum Zusammenführen: '%.*s'"
-
-#: sequencer.c:3814
-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:3869
-#, c-format
-msgid "could not get commit message of '%s'"
-msgstr "konnte keine Commit-Beschreibung von '%s' bekommen"
-
-#: sequencer.c:4013
-#, c-format
-msgid "could not even attempt to merge '%.*s'"
-msgstr "konnte nicht einmal versuchen '%.*s' zu mergen"
-
-#: sequencer.c:4029
-msgid "merge: Unable to write new index file"
-msgstr "merge: Konnte neue Index-Datei nicht schreiben."
-
-#: sequencer.c:4110
-msgid "Cannot autostash"
-msgstr "Kann automatischen Stash nicht erzeugen"
-
-#: sequencer.c:4113
-#, c-format
-msgid "Unexpected stash response: '%s'"
-msgstr "Unerwartete 'stash'-Antwort: '%s'"
-
-#: sequencer.c:4119
-#, c-format
-msgid "Could not create directory for '%s'"
-msgstr "Konnte Verzeichnis für '%s' nicht erstellen"
-
-#: sequencer.c:4122
-#, c-format
-msgid "Created autostash: %s\n"
-msgstr "Automatischen Stash erzeugt: %s\n"
-
-#: sequencer.c:4124
-msgid "could not reset --hard"
-msgstr "konnte 'reset --hard' nicht ausführen"
-
-#: sequencer.c:4148
-#, c-format
-msgid "Applied autostash.\n"
-msgstr "Automatischen Stash angewendet.\n"
-
-#: sequencer.c:4160
-#, c-format
-msgid "cannot store %s"
-msgstr "kann %s nicht speichern"
-
-#: sequencer.c:4163
-#, c-format
-msgid ""
-"%s\n"
-"Your changes are safe in the stash.\n"
-"You can run \"git stash pop\" or \"git stash drop\" at any time.\n"
-msgstr ""
-"%s\n"
-"Ihre Änderungen sind im Stash sicher.\n"
-"Sie können jederzeit \"git stash pop\" oder \"git stash drop\" ausführen.\n"
-
-#: sequencer.c:4168
-msgid "Applying autostash resulted in conflicts."
-msgstr "Beim Anwenden des automatischen Stash traten Konflikte auf."
-
-#: sequencer.c:4169
-msgid "Autostash exists; creating a new stash entry."
-msgstr "Automatischer Stash existiert; ein neuer Stash-Eintrag wird erstellt."
-
-#: sequencer.c:4225
-msgid "could not detach HEAD"
-msgstr "konnte HEAD nicht loslösen"
-
-#: sequencer.c:4240
-#, c-format
-msgid "Stopped at HEAD\n"
-msgstr "Angehalten bei HEAD\n"
-
-#: sequencer.c:4242
-#, c-format
-msgid "Stopped at %s\n"
-msgstr "Angehalten bei %s\n"
-
-#: sequencer.c:4274
-#, c-format
-msgid ""
-"Could not execute the todo command\n"
-"\n"
-"    %.*s\n"
-"It has been rescheduled; To edit the command before continuing, please\n"
-"edit the todo list first:\n"
-"\n"
-"    git rebase --edit-todo\n"
-"    git rebase --continue\n"
-msgstr ""
-"Konnte TODO-Befehl nicht ausführen\n"
-"\n"
-"    %.*s\n"
-"Dieser wurde neu angesetzt; Um den Befehl zu bearbeiten, bevor fortgesetzt "
-"wird,\n"
-"bearbeiten Sie bitte zuerst die TODO-Liste:\n"
-"\n"
-"    git rebase --edit-todo\n"
-"    git rebase --continue\n"
-
-#: sequencer.c:4320
-#, c-format
-msgid "Rebasing (%d/%d)%s"
-msgstr "Rebase (%d/%d)%s"
-
-#: sequencer.c:4366
-#, c-format
-msgid "Stopped at %s...  %.*s\n"
-msgstr "Angehalten bei %s... %.*s\n"
-
-#: sequencer.c:4436
-#, c-format
-msgid "unknown command %d"
-msgstr "Unbekannter Befehl %d"
-
-#: sequencer.c:4484
-msgid "could not read orig-head"
-msgstr "Konnte orig-head nicht lesen."
-
-#: sequencer.c:4489
-msgid "could not read 'onto'"
-msgstr "Konnte 'onto' nicht lesen."
-
-#: sequencer.c:4503
-#, c-format
-msgid "could not update HEAD to %s"
-msgstr "Konnte HEAD nicht auf %s aktualisieren."
-
-#: sequencer.c:4563
-#, c-format
-msgid "Successfully rebased and updated %s.\n"
-msgstr "Erfolgreich Rebase ausgeführt und %s aktualisiert.\n"
-
-#: sequencer.c:4615
-msgid "cannot rebase: You have unstaged changes."
-msgstr ""
-"Rebase nicht möglich: Sie haben Änderungen, die nicht zum Commit\n"
-"vorgemerkt sind."
-
-#: sequencer.c:4624
-msgid "cannot amend non-existing commit"
-msgstr "Kann nicht existierenden Commit nicht nachbessern."
-
-#: sequencer.c:4626
-#, c-format
-msgid "invalid file: '%s'"
-msgstr "Ungültige Datei: '%s'"
-
-#: sequencer.c:4628
-#, c-format
-msgid "invalid contents: '%s'"
-msgstr "Ungültige Inhalte: '%s'"
-
-#: sequencer.c:4631
-msgid ""
-"\n"
-"You have uncommitted changes in your working tree. Please, commit them\n"
-"first and then run 'git rebase --continue' again."
-msgstr ""
-"\n"
-"Sie haben nicht committete Änderungen in Ihrem Arbeitsverzeichnis. Bitte\n"
-"committen Sie diese zuerst und führen Sie dann 'git rebase --continue'\n"
-"erneut aus."
-
-#: sequencer.c:4667 sequencer.c:4706
-#, c-format
-msgid "could not write file: '%s'"
-msgstr "Konnte Datei nicht schreiben: '%s'"
-
-#: sequencer.c:4722
-msgid "could not remove CHERRY_PICK_HEAD"
-msgstr "Konnte CHERRY_PICK_HEAD nicht löschen."
-
-#: sequencer.c:4732
-msgid "could not commit staged changes."
-msgstr "Konnte Änderungen aus der Staging-Area nicht committen."
-
-#: sequencer.c:4852
-#, c-format
-msgid "%s: can't cherry-pick a %s"
-msgstr "%s: %s kann nicht in \"cherry-pick\" benutzt werden"
-
-#: sequencer.c:4856
-#, c-format
-msgid "%s: bad revision"
-msgstr "%s: ungültiger Commit"
-
-#: sequencer.c:4891
-msgid "can't revert as initial commit"
-msgstr "Kann nicht als allerersten Commit einen Revert ausführen."
-
-#: sequencer.c:5162 sequencer.c:5391
-#, c-format
-msgid "skipped previously applied commit %s"
-msgstr "zuvor angewendeten Commit %s übersprungen"
-
-#: sequencer.c:5232 sequencer.c:5407
-msgid "use --reapply-cherry-picks to include skipped commits"
-msgstr ""
-"verwenden Sie --reapply-cherry-picks, um übersprungene Commits einzubeziehen"
-
-#: sequencer.c:5378
-msgid "make_script: unhandled options"
-msgstr "make_script: unbehandelte Optionen"
-
-#: sequencer.c:5381
-msgid "make_script: error preparing revisions"
-msgstr "make_script: Fehler beim Vorbereiten der Commits"
-
-#: sequencer.c:5639 sequencer.c:5656
-msgid "nothing to do"
-msgstr "Nichts zu tun."
-
-#: sequencer.c:5675
-msgid "could not skip unnecessary pick commands"
-msgstr "Konnte unnötige \"pick\"-Befehle nicht auslassen."
-
-#: sequencer.c:5775
-msgid "the script was already rearranged."
-msgstr "Das Script wurde bereits umgeordnet."
-
-#: setup.c:135
-#, c-format
-msgid "'%s' is outside repository at '%s'"
-msgstr "'%s' liegt außerhalb des Repositories von '%s'"
-
-#: setup.c:187
-#, c-format
-msgid ""
-"%s: no such path in the working tree.\n"
-"Use 'git <command> -- <path>...' to specify paths that do not exist locally."
-msgstr ""
-"%s: Pfad nicht im Arbeitsverzeichnis gefunden.\n"
-"Benutzen Sie 'git <Befehl> -- <Pfad>...' zur Angabe von Pfaden, die lokal\n"
-"nicht existieren."
-
-#: setup.c:200
-#, c-format
-msgid ""
-"ambiguous argument '%s': unknown revision or path not in the working tree.\n"
-"Use '--' to separate paths from revisions, like this:\n"
-"'git <command> [<revision>...] -- [<file>...]'"
-msgstr ""
-"mehrdeutiges Argument '%s': unbekannter Commit oder Pfad existiert nicht\n"
-"im Arbeitsverzeichnis\n"
-"Benutzen Sie '--', um Pfade und Commits zu trennen, ähnlich wie:\n"
-"'git <Befehl> [<Commit>...] -- [<Datei>...]'"
-
-#: setup.c:266
-#, c-format
-msgid "option '%s' must come before non-option arguments"
-msgstr ""
-"die Option '%s' muss vor den Argumenten kommen, die keine Optionen sind"
-
-#: setup.c:285
-#, c-format
-msgid ""
-"ambiguous argument '%s': both revision and filename\n"
-"Use '--' to separate paths from revisions, like this:\n"
-"'git <command> [<revision>...] -- [<file>...]'"
-msgstr ""
-"mehrdeutiges Argument '%s': sowohl Commit als auch Dateiname\n"
-"Benutzen Sie '--', um Pfade und Commits zu trennen, ähnlich wie:\n"
-"'git <Befehl> [<Commit>...] -- [<Datei>...]'"
-
-#: setup.c:421
-msgid "unable to set up work tree using invalid config"
-msgstr ""
-"Konnte Arbeitsverzeichnis mit ungültiger Konfiguration nicht einrichten."
-
-#: setup.c:425 builtin/rev-parse.c:895
-msgid "this operation must be run in a work tree"
-msgstr "Diese Operation muss in einem Arbeitsverzeichnis ausgeführt werden."
-
-#: setup.c:724
-#, c-format
-msgid "Expected git repo version <= %d, found %d"
-msgstr "Erwartete Git-Repository-Version <= %d, %d gefunden"
-
-#: setup.c:732
-msgid "unknown repository extension found:"
-msgid_plural "unknown repository extensions found:"
-msgstr[0] "Unbekannte Repository-Erweiterung gefunden:"
-msgstr[1] "Unbekannte Repository-Erweiterungen gefunden:"
-
-#: setup.c:746
-msgid "repo version is 0, but v1-only extension found:"
-msgid_plural "repo version is 0, but v1-only extensions found:"
-msgstr[0] "Repository-Version ist 0, aber Erweiterung nur für v1 gefunden:"
-msgstr[1] "Repository-Version ist 0, aber Erweiterungen nur für v1 gefunden:"
-
-#: setup.c:767
-#, c-format
-msgid "error opening '%s'"
-msgstr "Fehler beim Öffnen von '%s'."
-
-#: setup.c:769
-#, c-format
-msgid "too large to be a .git file: '%s'"
-msgstr "Zu groß, um eine .git-Datei zu sein: '%s'"
-
-#: setup.c:771
-#, c-format
-msgid "error reading %s"
-msgstr "Fehler beim Lesen von '%s'."
-
-#: setup.c:773
-#, c-format
-msgid "invalid gitfile format: %s"
-msgstr "Ungültiges gitfile-Format: %s"
-
-#: setup.c:775
-#, c-format
-msgid "no path in gitfile: %s"
-msgstr "Kein Pfad in gitfile: %s"
-
-#: setup.c:777
-#, c-format
-msgid "not a git repository: %s"
-msgstr "Kein Git-Repository: %s"
-
-#: setup.c:879
-#, c-format
-msgid "'$%s' too big"
-msgstr "'$%s' zu groß"
-
-#: setup.c:893
-#, c-format
-msgid "not a git repository: '%s'"
-msgstr "Kein Git-Repository: '%s'"
-
-#: setup.c:922 setup.c:924 setup.c:955
-#, c-format
-msgid "cannot chdir to '%s'"
-msgstr "Kann nicht in Verzeichnis '%s' wechseln."
-
-#: setup.c:927 setup.c:983 setup.c:993 setup.c:1032 setup.c:1040
-msgid "cannot come back to cwd"
-msgstr "Kann nicht zum aktuellen Arbeitsverzeichnis zurückwechseln."
-
-#: setup.c:1054
-#, c-format
-msgid "failed to stat '%*s%s%s'"
-msgstr "Konnte '%*s%s%s' nicht lesen."
-
-#: setup.c:1338
-msgid "Unable to read current working directory"
-msgstr "Konnte aktuelles Arbeitsverzeichnis nicht lesen."
-
-#: setup.c:1347 setup.c:1353
-#, c-format
-msgid "cannot change to '%s'"
-msgstr "Kann nicht nach '%s' wechseln."
-
-#: setup.c:1358
-#, c-format
-msgid "not a git repository (or any of the parent directories): %s"
-msgstr "Kein Git-Repository (oder irgendeines der Elternverzeichnisse): %s"
-
-#: setup.c:1364
-#, 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 ""
-"Kein Git-Repository (oder irgendein Elternverzeichnis bis zum Einhängepunkt "
-"%s)\n"
-"Stoppe bei Dateisystemgrenze (GIT_DISCOVERY_ACROSS_FILESYSTEM nicht gesetzt)."
-
-#: setup.c:1374
-#, c-format
-msgid ""
-"unsafe repository ('%s' is owned by someone else)\n"
-"To add an exception for this directory, call:\n"
-"\n"
-"\tgit config --global --add safe.directory %s"
-msgstr ""
-"unsicheres Repository ('%s' gehört jemand anderem)\n"
-"Um eine Ausnahme für dieses Repository hinzuzufügen, führen Sie aus:\n"
-"\n"
-"\tgit config --global --add safe.directory %s"
-
-#: setup.c:1502
-#, c-format
-msgid ""
-"problem with core.sharedRepository filemode value (0%.3o).\n"
-"The owner of files must always have read and write permissions."
-msgstr ""
-"Problem mit Wert für Dateimodus (0%.3o) von core.sharedRepository.\n"
-"Der Besitzer der Dateien muss immer Lese- und Schreibrechte haben."
-
-#: setup.c:1564
-msgid "fork failed"
-msgstr "fork fehlgeschlagen"
-
-#: setup.c:1569
-msgid "setsid failed"
-msgstr "setsid fehlgeschlagen"
-
-#: sparse-index.c:285
-#, c-format
-msgid "index entry is a directory, but not sparse (%08x)"
-msgstr "Index-Eintrag ist ein Verzeichnis, aber nicht partiell (%08x)"
-
-#: split-index.c:9
-msgid "cannot use split index with a sparse index"
-msgstr "kann aufgeteilten Index nicht mit einem Sparse-Index benutzen"
-
-#. TRANSLATORS: IEC 80000-13:2008 gibibyte
-#: strbuf.c:851
-#, c-format
-msgid "%u.%2.2u GiB"
-msgstr "%u.%2.2u GiB"
-
-#. TRANSLATORS: IEC 80000-13:2008 gibibyte/second
-#: strbuf.c:853
-#, c-format
-msgid "%u.%2.2u GiB/s"
-msgstr "%u.%2.2u GiB/s"
-
-#. TRANSLATORS: IEC 80000-13:2008 mebibyte
-#: strbuf.c:861
-#, c-format
-msgid "%u.%2.2u MiB"
-msgstr "%u.%2.2u MiB"
-
-#. TRANSLATORS: IEC 80000-13:2008 mebibyte/second
-#: strbuf.c:863
-#, c-format
-msgid "%u.%2.2u MiB/s"
-msgstr "%u.%2.2u MiB/s"
-
-#. TRANSLATORS: IEC 80000-13:2008 kibibyte
-#: strbuf.c:870
-#, c-format
-msgid "%u.%2.2u KiB"
-msgstr "%u.%2.2u KiB"
-
-#. TRANSLATORS: IEC 80000-13:2008 kibibyte/second
-#: strbuf.c:872
-#, c-format
-msgid "%u.%2.2u KiB/s"
-msgstr "%u.%2.2u KiB/s"
-
-#. TRANSLATORS: IEC 80000-13:2008 byte
-#: strbuf.c:878
-#, c-format
-msgid "%u byte"
-msgid_plural "%u bytes"
-msgstr[0] "%u Byte"
-msgstr[1] "%u Bytes"
-
-#. TRANSLATORS: IEC 80000-13:2008 byte/second
-#: strbuf.c:880
-#, c-format
-msgid "%u byte/s"
-msgid_plural "%u bytes/s"
-msgstr[0] "%u Byte/s"
-msgstr[1] "%u Bytes/s"
-
-#: strbuf.c:1187 wrapper.c:217 wrapper.c:387 builtin/am.c:766
-#: builtin/rebase.c:653
-#, c-format
-msgid "could not open '%s' for writing"
-msgstr "Konnte '%s' nicht zum Schreiben öffnen."
-
-#: strbuf.c:1196
-#, c-format
-msgid "could not edit '%s'"
-msgstr "Konnte '%s' nicht editieren."
-
-#: submodule-config.c:238
-#, c-format
-msgid "ignoring suspicious submodule name: %s"
-msgstr "Ignoriere verdächtigen Submodulnamen: %s"
-
-#: submodule-config.c:305
-msgid "negative values not allowed for submodule.fetchjobs"
-msgstr "Negative Werte für submodule.fetchjobs nicht erlaubt."
-
-#: submodule-config.c:403
-#, c-format
-msgid "ignoring '%s' which may be interpreted as a command-line option: %s"
-msgstr ""
-"Ignoriere '%s', was als eine Befehlszeilenoption '%s' interpretiert werden "
-"würde."
-
-#: submodule-config.c:500 builtin/push.c:489 builtin/send-pack.c:148
-#, c-format
-msgid "invalid value for '%s'"
-msgstr "ungültiger Wert für '%s'"
-
-#: submodule-config.c:828
-#, c-format
-msgid "Could not update .gitmodules entry %s"
-msgstr "Konnte Eintrag '%s' in .gitmodules nicht aktualisieren"
-
-#: submodule.c:115 submodule.c:144
-msgid "Cannot change unmerged .gitmodules, resolve merge conflicts first"
-msgstr ""
-"Kann nicht zusammengeführte .gitmodules-Datei nicht ändern, lösen\n"
-"Sie zuerst die Konflikte auf"
-
-#: submodule.c:119 submodule.c:148
-#, c-format
-msgid "Could not find section in .gitmodules where path=%s"
-msgstr "Konnte keine Sektion in .gitmodules mit Pfad \"%s\" finden"
-
-#: submodule.c:155
-#, c-format
-msgid "Could not remove .gitmodules entry for %s"
-msgstr "Konnte Eintrag '%s' nicht aus .gitmodules entfernen"
-
-#: submodule.c:166
-msgid "staging updated .gitmodules failed"
-msgstr "Konnte aktualisierte .gitmodules-Datei nicht zum Commit vormerken"
-
-#: submodule.c:346
-#, c-format
-msgid "in unpopulated submodule '%s'"
-msgstr "In nicht ausgechecktem Submodul '%s'."
-
-#: submodule.c:377
-#, c-format
-msgid "Pathspec '%s' is in submodule '%.*s'"
-msgstr "Pfadspezifikation '%s' befindet sich in Submodul '%.*s'"
-
-#: submodule.c:454
-#, c-format
-msgid "bad --ignore-submodules argument: %s"
-msgstr "ungültiges --ignore-submodules Argument: %s"
-
-#: submodule.c:866
-#, c-format
-msgid ""
-"Submodule in commit %s at path: '%s' collides with a submodule named the "
-"same. Skipping it."
-msgstr ""
-"Submodul in Commit %s beim Pfad: '%s' hat den gleichen Namen wie ein "
-"Submodul. Wird übersprungen."
-
-#: submodule.c:987
-#, 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:1069
-#, c-format
-msgid ""
-"Could not run 'git rev-list <commits> --not --remotes -n 1' command in "
-"submodule %s"
-msgstr ""
-"Konnte 'git rev-list <Commits> --not --remotes -n 1' nicht in Submodul '%s' "
-"ausführen."
-
-#: submodule.c:1192
-#, c-format
-msgid "process for submodule '%s' failed"
-msgstr "Prozess für Submodul '%s' fehlgeschlagen"
-
-#: submodule.c:1221 builtin/branch.c:714 builtin/submodule--helper.c:2827
-msgid "Failed to resolve HEAD as a valid ref."
-msgstr "Konnte HEAD nicht als gültige Referenz auflösen."
-
-#: submodule.c:1232
-#, c-format
-msgid "Pushing submodule '%s'\n"
-msgstr "Pushe Submodul '%s'\n"
-
-#: submodule.c:1235
-#, c-format
-msgid "Unable to push submodule '%s'\n"
-msgstr "Kann Push für Submodul '%s' nicht ausführen\n"
-
-#: submodule.c:1567
-#, c-format
-msgid "Fetching submodule %s%s\n"
-msgstr "Anfordern des Submoduls %s%s\n"
-
-#: submodule.c:1589
-#, c-format
-msgid "Could not access submodule '%s'\n"
-msgstr "Konnte nicht auf Submodul '%s' zugreifen\n"
-
-#: submodule.c:1618
-#, c-format
-msgid "Could not access submodule '%s' at commit %s\n"
-msgstr "Konnte nicht auf Submodul '%s' beim Commit %s zugreifen\n"
-
-#: submodule.c:1629
-#, c-format
-msgid "Fetching submodule %s%s at commit %s\n"
-msgstr "Anfordern des Submoduls %s%s beim Commit %s\n"
-
-#: submodule.c:1849
-#, c-format
-msgid ""
-"Errors during submodule fetch:\n"
-"%s"
-msgstr ""
-"Fehler während des Anforderns der Submodule:\n"
-"%s"
-
-#: submodule.c:1874
-#, c-format
-msgid "'%s' not recognized as a git repository"
-msgstr "'%s' nicht als Git-Repository erkannt"
-
-#: submodule.c:1891
-#, 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:1932
-#, c-format
-msgid "'git status --porcelain=2' failed in submodule %s"
-msgstr "'git status --porcelain=2' ist in Submodul %s fehlgeschlagen"
-
-#: submodule.c:2007
-#, c-format
-msgid "could not start 'git status' in submodule '%s'"
-msgstr "Konnte 'git status' in Submodul '%s' nicht starten."
-
-#: submodule.c:2020
-#, c-format
-msgid "could not run 'git status' in submodule '%s'"
-msgstr "Konnte 'git status' in Submodul '%s' nicht ausführen."
-
-#: submodule.c:2037
-#, c-format
-msgid "Could not unset core.worktree setting in submodule '%s'"
-msgstr "Konnte core.worktree Einstellung in Submodul '%s' nicht aufheben."
-
-#: submodule.c:2064 submodule.c:2379
-#, c-format
-msgid "could not recurse into submodule '%s'"
-msgstr "Fehler bei Rekursion in Submodul-Pfad '%s'"
-
-#: submodule.c:2086
-msgid "could not reset submodule index"
-msgstr "konnte Index des Submoduls nicht zurücksetzen"
-
-#: submodule.c:2128
-#, c-format
-msgid "submodule '%s' has dirty index"
-msgstr "Submodul '%s' hat einen geänderten Index."
-
-#: submodule.c:2182
-#, c-format
-msgid "Submodule '%s' could not be updated."
-msgstr "Submodule '%s' konnte nicht aktualisiert werden."
-
-#: submodule.c:2250
-#, 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:2271
-#, c-format
-msgid ""
-"relocate_gitdir for submodule '%s' with more than one worktree not supported"
-msgstr ""
-"relocate_gitdir für Submodul '%s' mit mehr als einem Arbeitsverzeichnis\n"
-"wird nicht unterstützt"
-
-#: submodule.c:2283 submodule.c:2343
-#, c-format
-msgid "could not lookup name for submodule '%s'"
-msgstr "Konnte Name für Submodul '%s' nicht nachschlagen."
-
-#: submodule.c:2287
-#, c-format
-msgid "refusing to move '%s' into an existing git dir"
-msgstr "Verschieben von '%s' in ein existierendes Git-Verzeichnis verweigert."
-
-#: submodule.c:2293
-#, c-format
-msgid ""
-"Migrating git directory of '%s%s' from\n"
-"'%s' to\n"
-"'%s'\n"
-msgstr ""
-"Migriere Git-Verzeichnis von '%s%s' von\n"
-"'%s' nach\n"
-"'%s'\n"
-
-#: submodule.c:2424
-msgid "could not start ls-files in .."
-msgstr "Konnte 'ls-files' nicht in .. starten"
-
-#: submodule.c:2464
-#, c-format
-msgid "ls-tree returned unexpected return code %d"
-msgstr "ls-tree mit unerwartetem Rückgabewert %d beendet"
-
-#: symlinks.c:244
-#, c-format
-msgid "failed to lstat '%s'"
-msgstr "'lstat' für '%s' fehlgeschlagen"
-
-#: trailer.c:244
-#, c-format
-msgid "running trailer command '%s' failed"
-msgstr "Ausführen des Anhang-Befehls '%s' fehlgeschlagen"
-
-#: 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 "unbekannter Wert '%s' für Schlüssel %s"
-
-#: trailer.c:547 trailer.c:552 trailer.c:557 builtin/remote.c:300
-#: builtin/remote.c:328
-#, c-format
-msgid "more than one %s"
-msgstr "mehr als ein %s"
-
-#: trailer.c:743
-#, c-format
-msgid "empty trailer token in trailer '%.*s'"
-msgstr "leerer Anhang-Token in Anhang '%.*s'"
-
-#: trailer.c:763
-#, c-format
-msgid "could not read input file '%s'"
-msgstr "Konnte Eingabe-Datei '%s' nicht lesen"
-
-#: trailer.c:766 builtin/mktag.c:88 imap-send.c:1563
-msgid "could not read from stdin"
-msgstr "konnte nicht von der Standard-Eingabe lesen"
-
-#: trailer.c:1024 wrapper.c:760
-#, c-format
-msgid "could not stat %s"
-msgstr "Konnte '%s' nicht lesen"
-
-#: trailer.c:1026
-#, c-format
-msgid "file %s is not a regular file"
-msgstr "Datei '%s' ist keine reguläre Datei"
-
-#: trailer.c:1028
-#, c-format
-msgid "file %s is not writable by user"
-msgstr "Datei %s ist vom Benutzer nicht beschreibbar."
-
-#: trailer.c:1040
-msgid "could not open temporary file"
-msgstr "konnte temporäre Datei '%s' nicht öffnen"
-
-#: trailer.c:1080
-#, c-format
-msgid "could not rename temporary file to %s"
-msgstr "konnte temporäre Datei nicht zu %s umbenennen"
-
-#: transport-helper.c:62 transport-helper.c:91
-msgid "full write to remote helper failed"
-msgstr "Vollständiges Schreiben zu Remote-Helper fehlgeschlagen."
-
-#: transport-helper.c:145
-#, c-format
-msgid "unable to find remote helper for '%s'"
-msgstr "Konnte Remote-Helper für '%s' nicht finden."
-
-#: transport-helper.c:161 transport-helper.c:575
-msgid "can't dup helper output fd"
-msgstr ""
-"Konnte dup() auf Dateideskriptor für Ausgaben des Remote-Helpers nicht "
-"ausführen."
-
-#: transport-helper.c:214
-#, c-format
-msgid ""
-"unknown mandatory capability %s; this remote helper probably needs newer "
-"version of Git"
-msgstr ""
-"unbekannte erforderliche Fähigkeit %s; dieser Remote-Helper benötigt\n"
-"wahrscheinlich eine neuere Version von Git"
-
-#: transport-helper.c:220
-msgid "this remote helper should implement refspec capability"
-msgstr "dieser Remote-Helper sollte die \"refspec\"-Fähigkeit implementieren"
-
-#: transport-helper.c:287 transport-helper.c:429
-#, c-format
-msgid "%s unexpectedly said: '%s'"
-msgstr "unerwartete Ausgabe von %s: '%s'"
-
-#: transport-helper.c:417
-#, c-format
-msgid "%s also locked %s"
-msgstr "%s sperrte auch %s"
-
-#: transport-helper.c:497
-msgid "couldn't run fast-import"
-msgstr "konnte \"fast-import\" nicht ausführen"
-
-#: transport-helper.c:520
-msgid "error while running fast-import"
-msgstr "Fehler beim Ausführen von 'fast-import'"
-
-#: transport-helper.c:549 transport-helper.c:1254
-#, c-format
-msgid "could not read ref %s"
-msgstr "konnte Referenz %s nicht lesen"
-
-#: transport-helper.c:594
-#, c-format
-msgid "unknown response to connect: %s"
-msgstr "unbekannte Antwort auf 'connect': %s"
-
-#: transport-helper.c:616
-msgid "setting remote service path not supported by protocol"
-msgstr ""
-"Setzen des Remote-Service Pfads wird von dem Protokoll nicht unterstützt"
-
-#: transport-helper.c:618
-msgid "invalid remote service path"
-msgstr "ungültiger Remote-Service Pfad."
-
-#: transport-helper.c:661 transport.c:1496
-msgid "operation not supported by protocol"
-msgstr "die Operation wird von dem Protokoll nicht unterstützt"
-
-#: transport-helper.c:664
-#, c-format
-msgid "can't connect to subservice %s"
-msgstr "kann keine Verbindung zu Subservice %s herstellen"
-
-#: transport-helper.c:693 transport.c:415
-msgid "--negotiate-only requires protocol v2"
-msgstr "--negotiate-only benötigt Protokoll v2"
-
-#: transport-helper.c:758
-msgid "'option' without a matching 'ok/error' directive"
-msgstr "'option' ohne passende 'ok/error' Direktive"
-
-#: transport-helper.c:801
-#, c-format
-msgid "expected ok/error, helper said '%s'"
-msgstr "erwartete ok/error, Remote-Helper gab '%s' aus"
-
-#: transport-helper.c:862
-#, c-format
-msgid "helper reported unexpected status of %s"
-msgstr "Remote-Helper meldete unerwarteten Status von %s"
-
-#: transport-helper.c:945
-#, c-format
-msgid "helper %s does not support dry-run"
-msgstr "Remote-Helper %s unterstützt kein Trockenlauf"
-
-#: transport-helper.c:948
-#, c-format
-msgid "helper %s does not support --signed"
-msgstr "Remote-Helper %s unterstützt kein --signed"
-
-#: transport-helper.c:951
-#, c-format
-msgid "helper %s does not support --signed=if-asked"
-msgstr "Remote-Helper %s unterstützt kein --signed=if-asked"
-
-#: transport-helper.c:956
-#, c-format
-msgid "helper %s does not support --atomic"
-msgstr "Remote-Helper %s unterstützt kein --atomic"
-
-#: transport-helper.c:960
-#, c-format
-msgid "helper %s does not support --%s"
-msgstr "Remote-Helper %s unterstützt kein --%s"
-
-#: transport-helper.c:967
-#, c-format
-msgid "helper %s does not support 'push-option'"
-msgstr "Remote-Helper %s unterstützt nicht 'push-option'"
-
-#: transport-helper.c:1067
-msgid "remote-helper doesn't support push; refspec needed"
-msgstr "Remote-Helper unterstützt kein Push; Refspec benötigt"
-
-#: transport-helper.c:1072
-#, c-format
-msgid "helper %s does not support 'force'"
-msgstr "Remote-Helper %s unterstützt kein 'force'."
-
-#: transport-helper.c:1119
-msgid "couldn't run fast-export"
-msgstr "Konnte \"fast-export\" nicht ausführen."
-
-#: transport-helper.c:1124
-msgid "error while running fast-export"
-msgstr "Fehler beim Ausführen von \"fast-export\"."
-
-#: transport-helper.c:1149
-#, c-format
-msgid ""
-"No refs in common and none specified; doing nothing.\n"
-"Perhaps you should specify a branch.\n"
-msgstr ""
-"Keine gemeinsamen Referenzen und nichts spezifiziert; keine Ausführung.\n"
-"Vielleicht sollten Sie einen Branch angeben.\n"
-
-#: transport-helper.c:1231
-#, c-format
-msgid "unsupported object format '%s'"
-msgstr "nicht unterstütztes Objekt-Format '%s'"
-
-#: transport-helper.c:1240
-#, c-format
-msgid "malformed response in ref list: %s"
-msgstr "Ungültige Antwort in Referenzliste: %s"
-
-#: transport-helper.c:1392
-#, c-format
-msgid "read(%s) failed"
-msgstr "Lesen von %s fehlgeschlagen."
-
-#: transport-helper.c:1419
-#, c-format
-msgid "write(%s) failed"
-msgstr "Schreiben von %s fehlgeschlagen."
-
-#: transport-helper.c:1468
-#, c-format
-msgid "%s thread failed"
-msgstr "Thread %s fehlgeschlagen."
-
-#: transport-helper.c:1472
-#, c-format
-msgid "%s thread failed to join: %s"
-msgstr "Fehler beim Beitreten zu Thread %s: %s"
-
-#: transport-helper.c:1491 transport-helper.c:1495
-#, c-format
-msgid "can't start thread for copying data: %s"
-msgstr "Kann Thread zum Kopieren von Daten nicht starten: %s"
-
-#: transport-helper.c:1532
-#, c-format
-msgid "%s process failed to wait"
-msgstr "Fehler beim Warten von Prozess %s."
-
-#: transport-helper.c:1536
-#, c-format
-msgid "%s process failed"
-msgstr "Prozess %s fehlgeschlagen"
-
-#: transport-helper.c:1554 transport-helper.c:1563
-msgid "can't start thread for copying data"
-msgstr "Kann Thread zum Kopieren von Daten nicht starten."
-
-#: transport.c:116
-#, c-format
-msgid "Would set upstream of '%s' to '%s' of '%s'\n"
-msgstr "Würde Upstream-Branch von '%s' zu '%s' von '%s' setzen\n"
-
-#: transport.c:138
-#, c-format
-msgid "could not read bundle '%s'"
-msgstr "Konnte Paket '%s' nicht lesen."
-
-#: transport.c:234
-#, c-format
-msgid "transport: invalid depth option '%s'"
-msgstr "transport: ungültige depth Option '%s'"
-
-#: transport.c:289
-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:290
-msgid "server options require protocol version 2 or later"
-msgstr "Server-Optionen benötigen Protokoll-Version 2 oder höher"
-
-#: transport.c:418
-msgid "server does not support wait-for-done"
-msgstr "Server unterstützt nicht 'wait-for-done'"
-
-#: transport.c:770
-msgid "could not parse transport.color.* config"
-msgstr "Konnte transport.color.* Konfiguration nicht parsen."
-
-#: transport.c:845
-msgid "support for protocol v2 not implemented yet"
-msgstr "Unterstützung für Protokoll v2 noch nicht implementiert."
-
-#: transport.c:978
-#, c-format
-msgid "unknown value for config '%s': %s"
-msgstr "Unbekannter Wert für Konfiguration '%s': %s"
-
-#: transport.c:1044
-#, c-format
-msgid "transport '%s' not allowed"
-msgstr "Übertragungsart '%s' nicht erlaubt."
-
-#: transport.c:1093
-msgid "git-over-rsync is no longer supported"
-msgstr "git-over-rsync wird nicht länger unterstützt."
-
-#: transport.c:1196
-#, c-format
-msgid ""
-"The following submodule paths contain changes that can\n"
-"not be found on any remote:\n"
-msgstr ""
-"Die folgenden Submodul-Pfade enthalten Änderungen, die in keinem\n"
-"Remote-Repository gefunden wurden:\n"
-
-#: transport.c:1200
-#, c-format
-msgid ""
-"\n"
-"Please try\n"
-"\n"
-"\tgit push --recurse-submodules=on-demand\n"
-"\n"
-"or cd to the path and use\n"
-"\n"
-"\tgit push\n"
-"\n"
-"to push them to a remote.\n"
-"\n"
-msgstr ""
-"\n"
-"Bitte versuchen Sie\n"
-"\n"
-"\tgit push --recurse-submodules=on-demand\n"
-"\n"
-"oder wechseln Sie in das Verzeichnis und benutzen Sie\n"
-"\n"
-"\tgit push\n"
-"\n"
-"zum Versenden zu einem Remote-Repository.\n"
-"\n"
-
-#: transport.c:1208
-msgid "Aborting."
-msgstr "Abbruch."
-
-#: transport.c:1354
-msgid "failed to push all needed submodules"
-msgstr "Fehler beim Versand aller erforderlichen Submodule."
-
-#: tree-walk.c:33
-msgid "too-short tree object"
-msgstr "zu kurzes Tree-Objekt"
-
-#: tree-walk.c:39
-msgid "malformed mode in tree entry"
-msgstr "fehlerhafter Modus in Tree-Eintrag"
-
-#: tree-walk.c:43
-msgid "empty filename in tree entry"
-msgstr "leerer Dateiname in Tree-Eintrag"
-
-#: tree-walk.c:118
-msgid "too-short tree file"
-msgstr "zu kurze Tree-Datei"
-
-#: unpack-trees.c:118
-#, c-format
-msgid ""
-"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 ""
-"Ihre lokalen Änderungen in den folgenden Dateien würden beim Auschecken\n"
-"überschrieben werden:\n"
-"%%sBitte committen oder stashen Sie Ihre Änderungen, bevor Sie Branches\n"
-"wechseln."
-
-#: unpack-trees.c:120
-#, c-format
-msgid ""
-"Your local changes to the following files would be overwritten by checkout:\n"
-"%%s"
-msgstr ""
-"Ihre lokalen Änderungen in den folgenden Dateien würden beim Auschecken\n"
-"überschrieben werden:\n"
-"%%s"
-
-#: unpack-trees.c:123
-#, c-format
-msgid ""
-"Your local changes to the following files would be overwritten by merge:\n"
-"%%sPlease commit your changes or stash them before you merge."
-msgstr ""
-"Ihre lokalen Änderungen in den folgenden Dateien würden durch den Merge\n"
-"überschrieben werden:\n"
-"%%sBitte committen oder stashen Sie Ihre Änderungen, bevor Sie mergen."
-
-#: unpack-trees.c:125
-#, c-format
-msgid ""
-"Your local changes to the following files would be overwritten by merge:\n"
-"%%s"
-msgstr ""
-"Ihre lokalen Änderungen in den folgenden Dateien würden durch den Merge\n"
-"überschrieben werden:\n"
-"%%s"
-
-#: unpack-trees.c:128
-#, c-format
-msgid ""
-"Your local changes to the following files would be overwritten by %s:\n"
-"%%sPlease commit your changes or stash them before you %s."
-msgstr ""
-"Ihre lokalen Änderungen in den folgenden Dateien würden durch %s\n"
-"überschrieben werden:\n"
-"%%sBitte committen oder stashen Sie Ihre Änderungen, bevor Sie %s ausführen."
-
-#: unpack-trees.c:130
-#, c-format
-msgid ""
-"Your local changes to the following files would be overwritten by %s:\n"
-"%%s"
-msgstr ""
-"Ihre lokalen Änderungen würden durch %s überschrieben werden.\n"
-"%%s"
-
-#: unpack-trees.c:135
-#, c-format
-msgid ""
-"Updating the following directories would lose untracked files in them:\n"
-"%s"
-msgstr ""
-"Durch die Aktualisierung der folgenden Verzeichnisse würden unversionierte\n"
-"Dateien in diesen Verzeichnissen verloren gehen:\n"
-"%s"
-
-#: unpack-trees.c:138
-#, c-format
-msgid ""
-"Refusing to remove the current working directory:\n"
-"%s"
-msgstr ""
-"Löschen des aktuellen Arbeitsverzeichnisses verweigert:\n"
-"%s"
-
-#: unpack-trees.c:142
-#, c-format
-msgid ""
-"The following untracked working tree files would be removed by checkout:\n"
-"%%sPlease move or remove them before you switch branches."
-msgstr ""
-"Die folgenden unversionierten Dateien im Arbeitsverzeichnis würden durch\n"
-"den Checkout entfernt werden:\n"
-"%%sBitte verschieben oder entfernen Sie diese, bevor Sie Branches wechseln."
-
-#: unpack-trees.c:144
-#, c-format
-msgid ""
-"The following untracked working tree files would be removed by checkout:\n"
-"%%s"
-msgstr ""
-"Die folgenden unversionierten Dateien im Arbeitsverzeichnis würden durch "
-"den\n"
-"Checkout entfernt werden:\n"
-"%%s"
-
-#: unpack-trees.c:147
-#, c-format
-msgid ""
-"The following untracked working tree files would be removed by merge:\n"
-"%%sPlease move or remove them before you merge."
-msgstr ""
-"Die folgenden unversionierten Dateien im Arbeitsverzeichnis würden durch\n"
-"den Merge entfernt werden:\n"
-"%%sBitte verschieben oder entfernen Sie diese, bevor sie mergen."
-
-#: unpack-trees.c:149
-#, c-format
-msgid ""
-"The following untracked working tree files would be removed by merge:\n"
-"%%s"
-msgstr ""
-"Die folgenden unversionierten Dateien im Arbeitsverzeichnis würden durch "
-"den\n"
-"Merge entfernt werden:\n"
-"%%s"
-
-#: unpack-trees.c:152
-#, c-format
-msgid ""
-"The following untracked working tree files would be removed by %s:\n"
-"%%sPlease move or remove them before you %s."
-msgstr ""
-"Die folgenden unversionierten Dateien im Arbeitsverzeichnis würden durch\n"
-"den %s entfernt werden:\n"
-"%%sBitte verschieben oder entfernen Sie diese, bevor sie %s ausführen."
-
-#: unpack-trees.c:154
-#, c-format
-msgid ""
-"The following untracked working tree files would be removed by %s:\n"
-"%%s"
-msgstr ""
-"Die folgenden unversionierten Dateien im Arbeitsverzeichnis würden durch\n"
-"den %s entfernt werden:\n"
-"%%s"
-
-#: unpack-trees.c:160
-#, c-format
-msgid ""
-"The following untracked working tree files would be overwritten by "
-"checkout:\n"
-"%%sPlease move or remove them before you switch branches."
-msgstr ""
-"Die folgenden unversionierten Dateien im Arbeitsverzeichnis würden durch\n"
-"den Checkout überschrieben werden:\n"
-"%%sBitte verschieben oder entfernen Sie diese, bevor Sie Branches wechseln."
-
-#: unpack-trees.c:162
-#, c-format
-msgid ""
-"The following untracked working tree files would be overwritten by "
-"checkout:\n"
-"%%s"
-msgstr ""
-"Die folgenden unversionierten Dateien im Arbeitsverzeichnis würden durch "
-"den\n"
-"Checkout überschrieben werden:\n"
-"%%s"
-
-#: unpack-trees.c:165
-#, c-format
-msgid ""
-"The following untracked working tree files would be overwritten by merge:\n"
-"%%sPlease move or remove them before you merge."
-msgstr ""
-"Die folgenden unversionierten Dateien im Arbeitsverzeichnis würden durch\n"
-"den Merge überschrieben werden:\n"
-"%%sBitte verschieben oder entfernen Sie diese, bevor Sie mergen."
-
-#: unpack-trees.c:167
-#, c-format
-msgid ""
-"The following untracked working tree files would be overwritten by merge:\n"
-"%%s"
-msgstr ""
-"Die folgenden unversionierten Dateien im Arbeitsverzeichnis würden durch\n"
-"den Merge überschrieben werden:\n"
-"%%s"
-
-#: unpack-trees.c:170
-#, c-format
-msgid ""
-"The following untracked working tree files would be overwritten by %s:\n"
-"%%sPlease move or remove them before you %s."
-msgstr ""
-"Die folgenden unversionierten Dateien im Arbeitsverzeichnis würden durch\n"
-"den %s überschrieben werden:\n"
-"%%sBitte verschieben oder entfernen Sie diese, bevor sie %s ausführen."
-
-#: unpack-trees.c:172
-#, c-format
-msgid ""
-"The following untracked working tree files would be overwritten by %s:\n"
-"%%s"
-msgstr ""
-"Die folgenden unversionierten Dateien im Arbeitsverzeichnis würden durch "
-"den\n"
-"%s überschrieben werden:\n"
-"%%s"
-
-#: unpack-trees.c:180
-#, c-format
-msgid "Entry '%s' overlaps with '%s'.  Cannot bind."
-msgstr "Eintrag '%s' überschneidet sich mit '%s'. Kann nicht verbinden."
-
-#: unpack-trees.c:183
-#, c-format
-msgid ""
-"Cannot update submodule:\n"
-"%s"
-msgstr ""
-"Kann Submodul nicht aktualisieren:\n"
-"%s"
-
-#: unpack-trees.c:186
-#, c-format
-msgid ""
-"The following paths are not up to date and were left despite sparse "
-"patterns:\n"
-"%s"
-msgstr ""
-"Die folgenden Pfade sind nicht aktuell und wurden trotz partieller Muster\n"
-"übrig gelassen:\n"
-"%s"
-
-#: unpack-trees.c:188
-#, c-format
-msgid ""
-"The following paths are unmerged and were left despite sparse patterns:\n"
-"%s"
-msgstr ""
-"Die folgenden Pfade sind nicht zusammengeführt und wurden trotz\n"
-"partieller Muster übrig gelassen:\n"
-"%s"
-
-#: unpack-trees.c:190
-#, c-format
-msgid ""
-"The following paths were already present and thus not updated despite sparse "
-"patterns:\n"
-"%s"
-msgstr ""
-"Die folgenden Pfade waren bereits vorhanden und wurden deshalb trotz\n"
-"partieller Muster nicht aktualisiert:\n"
-"%s"
-
-#: unpack-trees.c:270
-#, c-format
-msgid "Aborting\n"
-msgstr "Abbruch\n"
-
-#: unpack-trees.c:297
-#, c-format
-msgid ""
-"After fixing the above paths, you may want to run `git sparse-checkout "
-"reapply`.\n"
-msgstr ""
-"Nachdem die obigen Pfade behoben sind, können Sie `git sparse-checkout "
-"reapply` ausführen.\n"
-
-#: unpack-trees.c:358
-msgid "Updating files"
-msgstr "Aktualisiere Dateien"
-
-#: unpack-trees.c:390
-msgid ""
-"the following paths have collided (e.g. case-sensitive paths\n"
-"on a case-insensitive filesystem) and only one from the same\n"
-"colliding group is in the working tree:\n"
-msgstr ""
-"Die folgenden Pfade haben kollidiert (z.B. case-sensitive Pfade\n"
-"auf einem case-insensitiven Dateisystem) und nur einer von der\n"
-"selben Kollissionsgruppe ist im Arbeitsverzeichnis:\n"
-
-#: unpack-trees.c:1664
-msgid "Updating index flags"
-msgstr "Aktualisiere Index-Markierungen"
-
-#: unpack-trees.c:2925
-#, c-format
-msgid "worktree and untracked commit have duplicate entries: %s"
-msgstr ""
-"Arbeitsverzeichnis und unversionierter Commit haben doppelte Einträge: %s"
-
-#: upload-pack.c:1579
-msgid "expected flush after fetch arguments"
-msgstr "erwartete Flush nach Abrufen der Argumente"
-
-#: urlmatch.c:163
-msgid "invalid URL scheme name or missing '://' suffix"
-msgstr "Ungültiges URL-Schema oder Suffix '://' fehlt"
-
-#: urlmatch.c:187 urlmatch.c:346 urlmatch.c:405
-#, c-format
-msgid "invalid %XX escape sequence"
-msgstr "ungültige Escape-Sequenz %XX"
-
-#: urlmatch.c:215
-msgid "missing host and scheme is not 'file:'"
-msgstr "fehlender Host und Schema ist nicht 'file:'"
-
-#: urlmatch.c:232
-msgid "a 'file:' URL may not have a port number"
-msgstr "eine 'file:' URL darf keine Portnummer enthalten"
-
-#: urlmatch.c:247
-msgid "invalid characters in host name"
-msgstr "Hostname enthält ungültige Zeichen"
-
-#: urlmatch.c:292 urlmatch.c:303
-msgid "invalid port number"
-msgstr "ungültige Portnummer"
-
-#: urlmatch.c:371
-msgid "invalid '..' path segment"
-msgstr "ungültiges '..' Pfadsegment"
-
-#: walker.c:170
-msgid "Fetching objects"
-msgstr "Anfordern der Objekte"
-
-#: worktree.c:237 builtin/am.c:2210 builtin/bisect--helper.c:156
-#, c-format
-msgid "failed to read '%s'"
-msgstr "Fehler beim Lesen von '%s'"
-
-#: worktree.c:304
-#, c-format
-msgid "'%s' at main working tree is not the repository directory"
-msgstr "'%s' im Hauptarbeitsverzeichnis ist nicht das Repository-Verzeichnis."
-
-#: worktree.c:315
-#, c-format
-msgid "'%s' file does not contain absolute path to the working tree location"
-msgstr "'%s' Datei enthält nicht den absoluten Pfad zum Arbeitsverzeichnis."
-
-#: worktree.c:327
-#, c-format
-msgid "'%s' does not exist"
-msgstr "'%s' existiert nicht."
-
-#: worktree.c:333
-#, c-format
-msgid "'%s' is not a .git file, error code %d"
-msgstr "'%s' ist keine .git-Datei, Fehlercode %d"
-
-#: worktree.c:342
-#, c-format
-msgid "'%s' does not point back to '%s'"
-msgstr "'%s' zeigt nicht zurück auf '%s'"
-
-#: worktree.c:600
-msgid "not a directory"
-msgstr "kein Verzeichnis"
-
-#: worktree.c:609
-msgid ".git is not a file"
-msgstr ".git ist keine Datei"
-
-#: worktree.c:611
-msgid ".git file broken"
-msgstr ".git-Datei kaputt"
-
-#: worktree.c:613
-msgid ".git file incorrect"
-msgstr ".git-Datei fehlerhaft"
-
-#: worktree.c:719
-msgid "not a valid path"
-msgstr "kein gültiger Pfad"
-
-#: worktree.c:725
-msgid "unable to locate repository; .git is not a file"
-msgstr "konnte Repository nicht finden; .git ist keine Datei"
-
-#: worktree.c:729
-msgid "unable to locate repository; .git file does not reference a repository"
-msgstr ""
-"konnte Repository nicht finden; .git-Datei referenziert kein Repository"
-
-#: worktree.c:733
-msgid "unable to locate repository; .git file broken"
-msgstr "Konnte Repository nicht finden; .git-Datei ist kaputt"
-
-#: worktree.c:739
-msgid "gitdir unreadable"
-msgstr "gitdir nicht lesbar"
-
-#: worktree.c:743
-msgid "gitdir incorrect"
-msgstr "gitdir fehlerhaft"
-
-#: worktree.c:768
-msgid "not a valid directory"
-msgstr "kein gültiges Verzeichnis"
-
-#: worktree.c:774
-msgid "gitdir file does not exist"
-msgstr "gitdir-Datei existiert nicht"
-
-#: worktree.c:779 worktree.c:788
-#, c-format
-msgid "unable to read gitdir file (%s)"
-msgstr "konnte gitdir-Datei nicht lesen (%s)"
-
-#: worktree.c:798
-#, c-format
-msgid "short read (expected %<PRIuMAX> bytes, read %<PRIuMAX>)"
-msgstr "read() zu kurz (%<PRIuMAX> Bytes erwartet, %<PRIuMAX> gelesen)"
-
-#: worktree.c:806
-msgid "invalid gitdir file"
-msgstr "ungültige gitdir-Datei"
-
-#: worktree.c:814
-msgid "gitdir file points to non-existent location"
-msgstr "gitdir-Datei verweist auf nicht existierenden Ort"
-
-#: worktree.c:830
-#, c-format
-msgid "unable to set %s in '%s'"
-msgstr "konnte %s nicht in '%s' setzen"
-
-#: worktree.c:832
-#, c-format
-msgid "unable to unset %s in '%s'"
-msgstr "konnte %s nicht in '%s' aufheben"
-
-#: worktree.c:852
-msgid "failed to set extensions.worktreeConfig setting"
-msgstr "Einstellung für extensions.worktreeConfig konnte nicht gesetzt werden"
-
-#: wrapper.c:161
-#, c-format
-msgid "could not setenv '%s'"
-msgstr "konnte '%s' nicht setzen"
-
-#: wrapper.c:213
-#, c-format
-msgid "unable to create '%s'"
-msgstr "konnte '%s' nicht erstellen"
-
-#: wrapper.c:215 wrapper.c:385
-#, c-format
-msgid "could not open '%s' for reading and writing"
-msgstr "konnte '%s' nicht zum Lesen und Schreiben öffnen"
-
-#: wrapper.c:416 wrapper.c:683
-#, c-format
-msgid "unable to access '%s'"
-msgstr "konnte nicht auf '%s' zugreifen"
-
-#: wrapper.c:691
-msgid "unable to get current working directory"
-msgstr "konnte aktuelles Arbeitsverzeichnis nicht bekommen"
-
-#: wt-status.c:158
-msgid "Unmerged paths:"
-msgstr "Nicht zusammengeführte Pfade:"
-
-#: wt-status.c:187 wt-status.c:219
-msgid "  (use \"git restore --staged <file>...\" to unstage)"
-msgstr ""
-"  (benutzen Sie \"git restore --staged <Datei>...\" zum Entfernen aus der "
-"Staging-Area)"
-
-#: wt-status.c:190 wt-status.c:222
-#, c-format
-msgid "  (use \"git restore --source=%s --staged <file>...\" to unstage)"
-msgstr ""
-"  (benutzen Sie \"git restore --source=%s --staged <Datei>...\" zum "
-"Entfernen aus der Staging-Area)"
-
-#: wt-status.c:193 wt-status.c:225
-msgid "  (use \"git rm --cached <file>...\" to unstage)"
-msgstr ""
-"  (benutzen Sie \"git rm --cached <Datei>...\" zum Entfernen aus der Staging-"
-"Area)"
-
-#: wt-status.c:197
-msgid "  (use \"git add <file>...\" to mark resolution)"
-msgstr ""
-"  (benutzen Sie \"git add/rm <Datei>...\", um die Auflösung zu markieren)"
-
-#: wt-status.c:199 wt-status.c:203
-msgid "  (use \"git add/rm <file>...\" as appropriate to mark resolution)"
-msgstr ""
-"  (benutzen Sie \"git add/rm <Datei>...\", um die Auflösung entsprechend zu "
-"markieren)"
-
-#: wt-status.c:201
-msgid "  (use \"git rm <file>...\" to mark resolution)"
-msgstr ""
-"  (benutzen Sie \"git add/rm <Datei>...\", um die Auflösung zu markieren)"
-
-#: wt-status.c:211 wt-status.c:1140
-msgid "Changes to be committed:"
-msgstr "Zum Commit vorgemerkte Änderungen:"
-
-#: wt-status.c:234 wt-status.c:1149
-msgid "Changes not staged for commit:"
-msgstr "Änderungen, die nicht zum Commit vorgemerkt sind:"
-
-#: wt-status.c:238
-msgid "  (use \"git add <file>...\" to update what will be committed)"
-msgstr ""
-"  (benutzen Sie \"git add <Datei>...\", um die Änderungen zum Commit "
-"vorzumerken)"
-
-#: wt-status.c:240
-msgid "  (use \"git add/rm <file>...\" to update what will be committed)"
-msgstr ""
-"  (benutzen Sie \"git add/rm <Datei>...\", um die Änderungen zum Commit "
-"vorzumerken)"
-
-#: wt-status.c:241
-msgid ""
-"  (use \"git restore <file>...\" to discard changes in working directory)"
-msgstr ""
-"  (benutzen Sie \"git restore <Datei>...\", um die Änderungen im "
-"Arbeitsverzeichnis zu verwerfen)"
-
-#: wt-status.c:243
-msgid "  (commit or discard the untracked or modified content in submodules)"
-msgstr ""
-"  (committen oder verwerfen Sie den unversionierten oder geänderten Inhalt "
-"in den Submodulen)"
-
-#: wt-status.c:254
-#, c-format
-msgid "  (use \"git %s <file>...\" to include in what will be committed)"
-msgstr ""
-"  (benutzen Sie \"git %s <Datei>...\", um die Änderungen zum Commit "
-"vorzumerken)"
-
-#: wt-status.c:266
-msgid "both deleted:"
-msgstr "beide gelöscht:"
-
-#: wt-status.c:268
-msgid "added by us:"
-msgstr "von uns hinzugefügt:"
-
-#: wt-status.c:270
-msgid "deleted by them:"
-msgstr "von denen gelöscht:"
-
-#: wt-status.c:272
-msgid "added by them:"
-msgstr "von denen hinzugefügt:"
-
-#: wt-status.c:274
-msgid "deleted by us:"
-msgstr "von uns gelöscht:"
-
-#: wt-status.c:276
-msgid "both added:"
-msgstr "von beiden hinzugefügt:"
-
-#: wt-status.c:278
-msgid "both modified:"
-msgstr "von beiden geändert:"
-
-#: wt-status.c:288
-msgid "new file:"
-msgstr "neue Datei:"
-
-#: wt-status.c:290
-msgid "copied:"
-msgstr "kopiert:"
-
-#: wt-status.c:292
-msgid "deleted:"
-msgstr "gelöscht:"
-
-#: wt-status.c:294
-msgid "modified:"
-msgstr "geändert:"
-
-#: wt-status.c:296
-msgid "renamed:"
-msgstr "umbenannt:"
-
-#: wt-status.c:298
-msgid "typechange:"
-msgstr "Typänderung:"
-
-#: wt-status.c:300
-msgid "unknown:"
-msgstr "unbekannt:"
-
-#: wt-status.c:302
-msgid "unmerged:"
-msgstr "nicht gemerged:"
-
-#: wt-status.c:382
-msgid "new commits, "
-msgstr "neue Commits, "
-
-#: wt-status.c:384
-msgid "modified content, "
-msgstr "geänderter Inhalt, "
-
-#: wt-status.c:386
-msgid "untracked content, "
-msgstr "unversionierter Inhalt, "
-
-#: wt-status.c:973
-#, c-format
-msgid "Your stash currently has %d entry"
-msgid_plural "Your stash currently has %d entries"
-msgstr[0] "Ihr Stash hat gerade %d Eintrag"
-msgstr[1] "Ihr Stash hat gerade %d Einträge"
-
-#: wt-status.c:1004
-msgid "Submodules changed but not updated:"
-msgstr "Submodule geändert, aber nicht aktualisiert:"
-
-#: wt-status.c:1006
-msgid "Submodule changes to be committed:"
-msgstr "Änderungen in Submodul zum Committen:"
-
-#: wt-status.c:1088
-msgid ""
-"Do not modify or remove the line above.\n"
-"Everything below it will be ignored."
-msgstr ""
-"Ändern oder entfernen Sie nicht die obige Zeile.\n"
-"Alles unterhalb von ihr wird ignoriert."
-
-#: wt-status.c:1180
-#, c-format
-msgid ""
-"\n"
-"It took %.2f seconds to compute the branch ahead/behind values.\n"
-"You can use '--no-ahead-behind' to avoid this.\n"
-msgstr ""
-"\n"
-"Es wurden %.2f Sekunden benötigt, um die voraus/hinterher-Werte zu "
-"berechnen.\n"
-"Sie können '--no-ahead-behind' benutzen, um das zu verhindern.\n"
-
-#: wt-status.c:1210
-msgid "You have unmerged paths."
-msgstr "Sie haben nicht zusammengeführte Pfade."
-
-#: wt-status.c:1213
-msgid "  (fix conflicts and run \"git commit\")"
-msgstr "  (beheben Sie die Konflikte und führen Sie \"git commit\" aus)"
-
-#: wt-status.c:1215
-msgid "  (use \"git merge --abort\" to abort the merge)"
-msgstr "  (benutzen Sie \"git merge --abort\", um den Merge abzubrechen)"
-
-#: wt-status.c:1219
-msgid "All conflicts fixed but you are still merging."
-msgstr "Alle Konflikte sind behoben, aber Sie sind immer noch beim Merge."
-
-#: wt-status.c:1222
-msgid "  (use \"git commit\" to conclude merge)"
-msgstr "  (benutzen Sie \"git commit\", um den Merge abzuschließen)"
-
-#: wt-status.c:1233
-msgid "You are in the middle of an am session."
-msgstr "Eine \"am\"-Sitzung ist im Gange."
-
-#: wt-status.c:1236
-msgid "The current patch is empty."
-msgstr "Der aktuelle Patch ist leer."
-
-#: wt-status.c:1241
-msgid "  (fix conflicts and then run \"git am --continue\")"
-msgstr ""
-"  (beheben Sie die Konflikte und führen Sie dann \"git am --continue\" aus)"
-
-#: wt-status.c:1243
-msgid "  (use \"git am --skip\" to skip this patch)"
-msgstr "  (benutzen Sie \"git am --skip\", um diesen Patch auszulassen)"
-
-#: wt-status.c:1246
-msgid ""
-"  (use \"git am --allow-empty\" to record this patch as an empty commit)"
-msgstr ""
-"  (benutzen Sie \"git am --allow-empty\", um den aktuellen Patch als leeren "
-"Commit zu speichern)"
-
-#: wt-status.c:1248
-msgid "  (use \"git am --abort\" to restore the original branch)"
-msgstr ""
-"  (benutzen Sie \"git am --abort\", um den ursprünglichen Branch "
-"wiederherzustellen)"
-
-#: wt-status.c:1381
-msgid "git-rebase-todo is missing."
-msgstr "git-rebase-todo fehlt."
-
-#: wt-status.c:1383
-msgid "No commands done."
-msgstr "Keine Befehle ausgeführt."
-
-#: wt-status.c:1386
-#, c-format
-msgid "Last command done (%<PRIuMAX> command done):"
-msgid_plural "Last commands done (%<PRIuMAX> commands done):"
-msgstr[0] "Letzter Befehl erledigt (%<PRIuMAX> Befehl erledigt):"
-msgstr[1] "Letzte Befehle erledigt (%<PRIuMAX> Befehle erledigt):"
-
-#: wt-status.c:1397
-#, c-format
-msgid "  (see more in file %s)"
-msgstr "  (mehr Informationen in Datei %s)"
-
-#: wt-status.c:1402
-msgid "No commands remaining."
-msgstr "Keine Befehle verbleibend."
-
-#: wt-status.c:1405
-#, c-format
-msgid "Next command to do (%<PRIuMAX> remaining command):"
-msgid_plural "Next commands to do (%<PRIuMAX> remaining commands):"
-msgstr[0] "Nächster auszuführender Befehl (%<PRIuMAX> Befehle verbleibend):"
-msgstr[1] "Nächste auszuführende Befehle (%<PRIuMAX> Befehle verbleibend):"
-
-#: wt-status.c:1413
-msgid "  (use \"git rebase --edit-todo\" to view and edit)"
-msgstr "  (benutzen Sie \"git rebase --edit-todo\" zum Ansehen und Bearbeiten)"
-
-#: wt-status.c:1425
-#, c-format
-msgid "You are currently rebasing branch '%s' on '%s'."
-msgstr "Sie sind gerade beim Rebase von Branch '%s' auf '%s'."
-
-#: wt-status.c:1430
-msgid "You are currently rebasing."
-msgstr "Sie sind gerade beim Rebase."
-
-#: wt-status.c:1443
-msgid "  (fix conflicts and then run \"git rebase --continue\")"
-msgstr ""
-"  (beheben Sie die Konflikte und führen Sie dann \"git rebase --continue\" "
-"aus)"
-
-#: wt-status.c:1445
-msgid "  (use \"git rebase --skip\" to skip this patch)"
-msgstr "  (benutzen Sie \"git rebase --skip\", um diesen Patch auszulassen)"
-
-#: wt-status.c:1447
-msgid "  (use \"git rebase --abort\" to check out the original branch)"
-msgstr ""
-"  (benutzen Sie \"git rebase --abort\", um den ursprünglichen Branch "
-"auszuchecken)"
-
-#: wt-status.c:1454
-msgid "  (all conflicts fixed: run \"git rebase --continue\")"
-msgstr "  (alle Konflikte behoben: führen Sie \"git rebase --continue\" aus)"
-
-#: wt-status.c:1458
-#, c-format
-msgid ""
-"You are currently splitting a commit while rebasing branch '%s' on '%s'."
-msgstr ""
-"Sie teilen gerade einen Commit auf, während ein Rebase von Branch '%s' auf "
-"'%s' im Gange ist."
-
-#: wt-status.c:1463
-msgid "You are currently splitting a commit during a rebase."
-msgstr "Sie teilen gerade einen Commit während eines Rebase auf."
-
-#: wt-status.c:1466
-msgid "  (Once your working directory is clean, run \"git rebase --continue\")"
-msgstr ""
-"  (Sobald Ihr Arbeitsverzeichnis unverändert ist, führen Sie \"git rebase --"
-"continue\" aus)"
-
-#: wt-status.c:1470
-#, c-format
-msgid "You are currently editing a commit while rebasing branch '%s' on '%s'."
-msgstr ""
-"Sie editieren gerade einen Commit während eines Rebase von Branch '%s' auf "
-"'%s'."
-
-#: wt-status.c:1475
-msgid "You are currently editing a commit during a rebase."
-msgstr "Sie editieren gerade einen Commit während eines Rebase."
-
-#: wt-status.c:1478
-msgid "  (use \"git commit --amend\" to amend the current commit)"
-msgstr ""
-"  (benutzen Sie \"git commit --amend\", um den aktuellen Commit "
-"nachzubessern)"
-
-#: wt-status.c:1480
-msgid ""
-"  (use \"git rebase --continue\" once you are satisfied with your changes)"
-msgstr ""
-"  (benutzen Sie \"git rebase --continue\" sobald Ihre Änderungen "
-"abgeschlossen sind)"
-
-#: wt-status.c:1491
-msgid "Cherry-pick currently in progress."
-msgstr "Cherry-pick zurzeit im Gange."
-
-#: wt-status.c:1494
-#, c-format
-msgid "You are currently cherry-picking commit %s."
-msgstr "Sie führen gerade \"cherry-pick\" von Commit %s aus."
-
-#: wt-status.c:1501
-msgid "  (fix conflicts and run \"git cherry-pick --continue\")"
-msgstr ""
-"  (beheben Sie die Konflikte und führen Sie dann \"git cherry-pick --continue"
-"\" aus)"
-
-#: wt-status.c:1504
-msgid "  (run \"git cherry-pick --continue\" to continue)"
-msgstr "  (Führen Sie \"git cherry-pick --continue\" aus, um weiterzumachen)"
-
-#: wt-status.c:1507
-msgid "  (all conflicts fixed: run \"git cherry-pick --continue\")"
-msgstr ""
-"  (alle Konflikte behoben: führen Sie \"git cherry-pick --continue\" aus)"
-
-#: wt-status.c:1509
-msgid "  (use \"git cherry-pick --skip\" to skip this patch)"
-msgstr ""
-"  (benutzen Sie \"git cherry-pick --skip\", um diesen Patch auszulassen)"
-
-#: wt-status.c:1511
-msgid "  (use \"git cherry-pick --abort\" to cancel the cherry-pick operation)"
-msgstr ""
-"  (benutzen Sie \"git cherry-pick --abort\", um die Cherry-Pick-Operation "
-"abzubrechen)"
-
-#: wt-status.c:1521
-msgid "Revert currently in progress."
-msgstr "Revert zurzeit im Gange."
-
-#: wt-status.c:1524
-#, c-format
-msgid "You are currently reverting commit %s."
-msgstr "Sie sind gerade beim Revert von Commit '%s'."
-
-#: wt-status.c:1530
-msgid "  (fix conflicts and run \"git revert --continue\")"
-msgstr ""
-"  (beheben Sie die Konflikte und führen Sie dann \"git revert --continue\" "
-"aus)"
-
-#: wt-status.c:1533
-msgid "  (run \"git revert --continue\" to continue)"
-msgstr "  (Führen Sie \"git revert --continue\", um weiterzumachen)"
-
-#: wt-status.c:1536
-msgid "  (all conflicts fixed: run \"git revert --continue\")"
-msgstr "  (alle Konflikte behoben: führen Sie \"git revert --continue\" aus)"
-
-#: wt-status.c:1538
-msgid "  (use \"git revert --skip\" to skip this patch)"
-msgstr "  (benutzen Sie \"git revert --skip\", um diesen Patch auszulassen)"
-
-#: wt-status.c:1540
-msgid "  (use \"git revert --abort\" to cancel the revert operation)"
-msgstr ""
-"  (benutzen Sie \"git revert --abort\", um die Revert-Operation abzubrechen)"
-
-#: wt-status.c:1550
-#, c-format
-msgid "You are currently bisecting, started from branch '%s'."
-msgstr "Sie sind gerade bei einer binären Suche, gestartet von Branch '%s'."
-
-#: wt-status.c:1554
-msgid "You are currently bisecting."
-msgstr "Sie sind gerade bei einer binären Suche."
-
-#: wt-status.c:1557
-msgid "  (use \"git bisect reset\" to get back to the original branch)"
-msgstr ""
-"  (benutzen Sie \"git bisect reset\", um zum ursprünglichen Branch "
-"zurückzukehren)"
-
-#: wt-status.c:1568
-msgid "You are in a sparse checkout."
-msgstr "Sie befinden sich in einem partiellen Checkout."
-
-#: wt-status.c:1571
-#, c-format
-msgid "You are in a sparse checkout with %d%% of tracked files present."
-msgstr ""
-"Sie sind in einem partiellen Checkout mit %d%% vorhandenen versionierten "
-"Dateien."
-
-#: wt-status.c:1815
-msgid "On branch "
-msgstr "Auf Branch "
-
-#: wt-status.c:1822
-msgid "interactive rebase in progress; onto "
-msgstr "interaktives Rebase im Gange; auf "
-
-#: wt-status.c:1824
-msgid "rebase in progress; onto "
-msgstr "Rebase im Gange; auf "
-
-#: wt-status.c:1829
-msgid "HEAD detached at "
-msgstr "HEAD losgelöst bei "
-
-#: wt-status.c:1831
-msgid "HEAD detached from "
-msgstr "HEAD losgelöst von "
-
-#: wt-status.c:1834
-msgid "Not currently on any branch."
-msgstr "Im Moment auf keinem Branch."
-
-#: wt-status.c:1851
-msgid "Initial commit"
-msgstr "Initialer Commit"
-
-#: wt-status.c:1852
-msgid "No commits yet"
-msgstr "Noch keine Commits"
-
-#: wt-status.c:1866
-msgid "Untracked files"
-msgstr "Unversionierte Dateien"
-
-#: wt-status.c:1868
-msgid "Ignored files"
-msgstr "Ignorierte Dateien"
-
-#: wt-status.c:1872
-#, c-format
-msgid ""
-"It took %.2f seconds to enumerate untracked files. 'status -uno'\n"
-"may speed it up, but you have to be careful not to forget to add\n"
-"new files yourself (see 'git help status')."
-msgstr ""
-"Es dauerte %.2f Sekunden die unversionierten Dateien zu bestimmen.\n"
-"'status -uno' könnte das beschleunigen, aber Sie müssen darauf achten,\n"
-"neue Dateien selbstständig hinzuzufügen (siehe 'git help status')."
-
-#: wt-status.c:1878
-#, c-format
-msgid "Untracked files not listed%s"
-msgstr "Unversionierte Dateien nicht aufgelistet%s"
-
-#: wt-status.c:1880
-msgid " (use -u option to show untracked files)"
-msgstr " (benutzen Sie die Option -u, um unversionierte Dateien anzuzeigen)"
-
-#: wt-status.c:1886
-msgid "No changes"
-msgstr "Keine Änderungen"
-
-#: wt-status.c:1891
-#, c-format
-msgid "no changes added to commit (use \"git add\" and/or \"git commit -a\")\n"
-msgstr ""
-"keine Änderungen zum Commit vorgemerkt (benutzen Sie \"git add\" und/oder "
-"\"git commit -a\")\n"
-
-#: wt-status.c:1895
-#, c-format
-msgid "no changes added to commit\n"
-msgstr "keine Änderungen zum Commit vorgemerkt\n"
-
-#: wt-status.c:1899
-#, c-format
-msgid ""
-"nothing added to commit but untracked files present (use \"git add\" to "
-"track)\n"
-msgstr ""
-"nichts zum Commit vorgemerkt, aber es gibt unversionierte Dateien\n"
-"(benutzen Sie \"git add\" zum Versionieren)\n"
-
-#: wt-status.c:1903
-#, c-format
-msgid "nothing added to commit but untracked files present\n"
-msgstr "nichts zum Commit vorgemerkt, aber es gibt unversionierte Dateien\n"
-
-#: wt-status.c:1907
-#, c-format
-msgid "nothing to commit (create/copy files and use \"git add\" to track)\n"
-msgstr ""
-"nichts zu committen (erstellen/kopieren Sie Dateien und benutzen\n"
-"Sie \"git add\" zum Versionieren)\n"
-
-#: wt-status.c:1911 wt-status.c:1917
-#, c-format
-msgid "nothing to commit\n"
-msgstr "nichts zu committen\n"
-
-#: wt-status.c:1914
-#, c-format
-msgid "nothing to commit (use -u to show untracked files)\n"
-msgstr ""
-"nichts zu committen (benutzen Sie die Option -u, um unversionierte Dateien "
-"anzuzeigen)\n"
-
-#: wt-status.c:1919
-#, c-format
-msgid "nothing to commit, working tree clean\n"
-msgstr "nichts zu committen, Arbeitsverzeichnis unverändert\n"
-
-#: wt-status.c:2024
-msgid "No commits yet on "
-msgstr "Noch keine Commits in "
-
-#: wt-status.c:2028
-msgid "HEAD (no branch)"
-msgstr "HEAD (kein Branch)"
-
-#: wt-status.c:2059
-msgid "different"
-msgstr "unterschiedlich"
-
-#: wt-status.c:2061 wt-status.c:2069
-msgid "behind "
-msgstr "hinterher "
-
-#: wt-status.c:2064 wt-status.c:2067
-msgid "ahead "
-msgstr "voraus "
-
-#. TRANSLATORS: the action is e.g. "pull with rebase"
-#: wt-status.c:2605
-#, c-format
-msgid "cannot %s: You have unstaged changes."
-msgstr ""
-"%s nicht möglich: Sie haben Änderungen, die nicht zum Commit vorgemerkt sind."
-
-#: wt-status.c:2611
-msgid "additionally, your index contains uncommitted changes."
-msgstr "Zusätzlich enthält die Staging-Area nicht committete Änderungen."
-
-#: wt-status.c:2613
-#, c-format
-msgid "cannot %s: Your index contains uncommitted changes."
-msgstr ""
-"%s nicht möglich: Die Staging-Area enthält nicht committete Änderungen."
-
-#: compat/simple-ipc/ipc-unix-socket.c:205
-msgid "could not send IPC command"
-msgstr "konnte IPC-Befehl nicht senden"
-
-#: compat/simple-ipc/ipc-unix-socket.c:212
-msgid "could not read IPC response"
-msgstr "konnte IPC-Antwort nicht lesen"
-
-#: compat/simple-ipc/ipc-unix-socket.c:892
-#, 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:904
-#, 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:353
-#, c-format
-msgid "failed to unlink '%s'"
-msgstr "Konnte '%s' nicht entfernen."
-
-#: compat/fsmonitor/fsm-listen-darwin.c:355
-msgid "Unable to create FSEventStream."
-msgstr "Konnte FSEventStream nicht erstellen."
-
-#: compat/fsmonitor/fsm-listen-darwin.c:403
-msgid "Failed to start the FSEventStream"
-msgstr "Konnte FSEventStream nicht starten."
-
-#: builtin/add.c:26
 msgid "git add [<options>] [--] <pathspec>..."
 msgstr "git add [<Optionen>] [--] <Pfadspezifikation>..."
 
-#: builtin/add.c:63
 #, c-format
 msgid "cannot chmod %cx '%s'"
 msgstr "kann chmod %cx '%s' nicht ausführen"
 
-#: builtin/add.c:105
 #, c-format
 msgid "unexpected diff status %c"
 msgstr "unerwarteter Differenz-Status %c"
 
-#: builtin/add.c:110 builtin/commit.c:299
 msgid "updating files failed"
 msgstr "Aktualisierung der Dateien fehlgeschlagen"
 
-#: builtin/add.c:120
 #, c-format
 msgid "remove '%s'\n"
 msgstr "lösche '%s'\n"
 
-#: builtin/add.c:204
 msgid "Unstaged changes after refreshing the index:"
 msgstr ""
 "Nicht zum Commit vorgemerkte Änderungen nach Aktualisierung der Staging-Area:"
 
-#: builtin/add.c:312 builtin/rev-parse.c:993
 msgid "Could not read the index"
 msgstr "Konnte den Index nicht lesen"
 
-#: builtin/add.c:325
 msgid "Could not write patch"
 msgstr "Konnte Patch nicht schreiben"
 
-#: builtin/add.c:328
 msgid "editing patch failed"
 msgstr "Bearbeitung des Patches fehlgeschlagen"
 
-#: builtin/add.c:331
 #, c-format
 msgid "Could not stat '%s'"
 msgstr "Konnte Verzeichnis '%s' nicht lesen"
 
-#: builtin/add.c:333
 msgid "Empty patch. Aborted."
 msgstr "Leerer Patch. Abgebrochen."
 
-#: builtin/add.c:339
 #, c-format
 msgid "Could not apply '%s'"
 msgstr "Konnte '%s' nicht anwenden."
 
-#: builtin/add.c:347
 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:367 builtin/clean.c:927 builtin/fetch.c:175 builtin/mv.c:124
-#: builtin/prune-packed.c:14 builtin/pull.c:208 builtin/push.c:550
-#: builtin/remote.c:1454 builtin/rm.c:244 builtin/send-pack.c:194
 msgid "dry run"
 msgstr "Probelauf"
 
-#: builtin/add.c:368 builtin/check-ignore.c:22 builtin/commit.c:1483
-#: builtin/count-objects.c:98 builtin/fsck.c:789 builtin/log.c:2338
-#: builtin/mv.c:123 builtin/read-tree.c:120
 msgid "be verbose"
 msgstr "erweiterte Ausgaben"
 
-#: builtin/add.c:370
 msgid "interactive picking"
 msgstr "interaktives Auswählen"
 
-#: builtin/add.c:371 builtin/checkout.c:1599 builtin/reset.c:417
 msgid "select hunks interactively"
 msgstr "Blöcke interaktiv auswählen"
 
-#: builtin/add.c:372
 msgid "edit current diff and apply"
 msgstr "aktuelle Unterschiede editieren und anwenden"
 
-#: builtin/add.c:373
 msgid "allow adding otherwise ignored files"
 msgstr "das Hinzufügen andernfalls ignorierter Dateien erlauben"
 
-#: builtin/add.c:374
 msgid "update tracked files"
 msgstr "versionierte Dateien aktualisieren"
 
-#: builtin/add.c:375
 msgid "renormalize EOL of tracked files (implies -u)"
 msgstr ""
 "erneutes Normalisieren der Zeilenenden von versionierten Dateien (impliziert "
 "-u)"
 
-#: builtin/add.c:376
 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:377
 msgid "add changes from all tracked and untracked files"
 msgstr ""
 "Änderungen von allen versionierten und unversionierten Dateien hinzufügen"
 
-#: builtin/add.c:380
 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:382
 msgid "don't add, only refresh the index"
 msgstr "nichts hinzufügen, nur den Index aktualisieren"
 
-#: builtin/add.c:383
 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:384
 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:385 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:387 builtin/update-index.c:1023
 msgid "override the executable bit of the listed files"
 msgstr "das \"ausführbar\"-Bit der aufgelisteten Dateien überschreiben"
 
-#: builtin/add.c:389
 msgid "warn when adding an embedded repository"
 msgstr "warnen wenn eingebettetes Repository hinzugefügt wird"
 
-#: builtin/add.c:407
 #, c-format
 msgid ""
 "You've added another git repository inside your current repository.\n"
@@ -11008,12 +1873,10 @@ msgstr ""
 "\n"
 "Siehe \"git help submodule\" für weitere Informationen."
 
-#: builtin/add.c:436
 #, c-format
 msgid "adding embedded git repository: %s"
 msgstr "Füge eingebettetes Repository hinzu: %s"
 
-#: builtin/add.c:456
 msgid ""
 "Use -f if you really want to add them.\n"
 "Turn this message off by running\n"
@@ -11023,28 +1886,22 @@ msgstr ""
 "Um diese Meldung abzuschalten, führen Sie folgenden Befehl aus:\n"
 "\"git config advice.addIgnoredFile false\""
 
-#: builtin/add.c:471
 msgid "adding files failed"
 msgstr "Hinzufügen von Dateien fehlgeschlagen"
 
-#: builtin/add.c:534
 #, 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:555 builtin/checkout.c:1770 builtin/commit.c:365
-#: builtin/reset.c:436 builtin/rm.c:275 builtin/stash.c:1702
 #, c-format
 msgid "'%s' and pathspec arguments cannot be used together"
 msgstr ""
 "'%s' und Pfadspezifikation-Argumente können nicht gemeinsam verwendet werden"
 
-#: builtin/add.c:566
 #, c-format
 msgid "Nothing specified, nothing added.\n"
 msgstr "Nichts spezifiziert, nichts hinzugefügt.\n"
 
-#: builtin/add.c:568
 msgid ""
 "Maybe you wanted to say 'git add .'?\n"
 "Turn this message off by running\n"
@@ -11054,119 +1911,127 @@ msgstr ""
 "Um diese Meldung abzuschalten, führen Sie folgenden Befehl aus:\n"
 "\"git config advice.addEmptyPathspec false\""
 
-#: builtin/am.c:393
+msgid "index file corrupt"
+msgstr "Index-Datei beschädigt"
+
+#, c-format
+msgid "bad action '%s' for '%s'"
+msgstr "ungültige Aktion '%s' für '%s'"
+
+#, c-format
+msgid "invalid value for '%s': '%s'"
+msgstr "ungültiger Wert für '%s': '%s'"
+
+#, c-format
+msgid "could not read '%s'"
+msgstr "Konnte '%s' nicht lesen"
+
 msgid "could not parse author script"
 msgstr "konnte Autor-Skript nicht parsen"
 
-#: builtin/am.c:483
+#, c-format
+msgid "could not parse %s"
+msgstr "konnte %s nicht parsen"
+
 #, c-format
 msgid "'%s' was deleted by the applypatch-msg hook"
 msgstr "'%s' wurde durch den applypatch-msg Hook entfernt"
 
-#: builtin/am.c:525
 #, c-format
 msgid "Malformed input line: '%s'."
 msgstr "Fehlerhafte Eingabezeile: '%s'."
 
-#: builtin/am.c:563
 #, c-format
 msgid "Failed to copy notes from '%s' to '%s'"
 msgstr "Fehler beim Kopieren der Notizen von '%s' nach '%s'"
 
-#: builtin/am.c:589
 msgid "fseek failed"
 msgstr "\"fseek\" fehlgeschlagen"
 
-#: builtin/am.c:777
+#, c-format
+msgid "could not open '%s' for reading"
+msgstr "Konnte '%s' nicht zum Lesen öffnen."
+
+#, c-format
+msgid "could not open '%s' for writing"
+msgstr "Konnte '%s' nicht zum Schreiben öffnen."
+
 #, c-format
 msgid "could not parse patch '%s'"
 msgstr "konnte Patch '%s' nicht parsen"
 
-#: builtin/am.c:842
 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:890
 msgid "invalid timestamp"
 msgstr "ungültiger Zeitstempel"
 
-#: builtin/am.c:895 builtin/am.c:907
 msgid "invalid Date line"
 msgstr "Ungültige \"Date\"-Zeile"
 
-#: builtin/am.c:902
 msgid "invalid timezone offset"
 msgstr "Ungültiger Offset in der Zeitzone"
 
-#: builtin/am.c:995
 msgid "Patch format detection failed."
 msgstr "Patch-Formaterkennung fehlgeschlagen."
 
-#: builtin/am.c:1000 builtin/clone.c:306
 #, c-format
 msgid "failed to create directory '%s'"
 msgstr "Fehler beim Erstellen von Verzeichnis '%s'"
 
-#: builtin/am.c:1005
 msgid "Failed to split patches."
 msgstr "Fehler beim Aufteilen der Patches."
 
-#: builtin/am.c:1154
 #, 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:1155
 #, 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."
+"Falls Sie diesen Patch auslassen möchten, führen Sie stattdessen \"%s --"
+"skip\" aus."
 
-#: builtin/am.c:1160
 #, c-format
 msgid "To record the empty patch as an empty commit, run \"%s --allow-empty\"."
 msgstr ""
 "Um den leeren Patch als einen leeren Commit zu speichern, führen Sie \"%s --"
 "allow-empty\" aus."
 
-#: builtin/am.c:1162
 #, 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:1257
 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:1345
 #, c-format
 msgid "missing author line in commit %s"
 msgstr "Autor-Zeile fehlt in Commit %s"
 
-#: builtin/am.c:1348
 #, c-format
 msgid "invalid ident line: %.*s"
 msgstr "Ungültige Identifikationszeile: %.*s"
 
-#: builtin/am.c:1567
+#, c-format
+msgid "unable to parse commit %s"
+msgstr "konnte Commit '%s' nicht parsen"
+
 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:1569
 msgid "Using index info to reconstruct a base tree..."
 msgstr ""
 "Verwende Informationen aus der Staging-Area, um ein Basisverzeichnis "
 "nachzustellen..."
 
-#: builtin/am.c:1588
 msgid ""
 "Did you hand edit your patch?\n"
 "It does not apply to blobs recorded in its index."
@@ -11174,24 +2039,25 @@ msgstr ""
 "Haben Sie den Patch per Hand editiert?\n"
 "Er kann nicht auf die Blobs in seiner 'index' Zeile angewendet werden."
 
-#: builtin/am.c:1594
 msgid "Falling back to patching base and 3-way merge..."
 msgstr "Falle zurück zum Patchen der Basis und zum 3-Wege-Merge..."
 
-#: builtin/am.c:1620
 msgid "Failed to merge in the changes."
 msgstr "Merge der Änderungen fehlgeschlagen."
 
-#: builtin/am.c:1652
+msgid "git write-tree failed to write a tree"
+msgstr "\"git write-tree\" schlug beim Schreiben eines \"Tree\"-Objektes fehl"
+
 msgid "applying to an empty history"
 msgstr "auf leere Historie anwenden"
 
-#: builtin/am.c:1704 builtin/am.c:1708
+msgid "failed to write commit object"
+msgstr "Fehler beim Schreiben des Commit-Objektes."
+
 #, c-format
 msgid "cannot resume: %s does not exist."
 msgstr "Kann nicht fortsetzen: %s existiert nicht"
 
-#: builtin/am.c:1726
 msgid "Commit Body is:"
 msgstr "Commit-Beschreibung ist:"
 
@@ -11199,59 +2065,47 @@ msgstr "Commit-Beschreibung ist:"
 #. in your translation. The program will only accept English
 #. input at this point.
 #.
-#: builtin/am.c:1736
 #, 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:1782 builtin/commit.c:410
 msgid "unable to write index file"
 msgstr "konnte Index-Datei nicht schreiben"
 
-#: builtin/am.c:1786
 #, c-format
 msgid "Dirty index: cannot apply patches (dirty: %s)"
 msgstr "Geänderter Index: kann Patches nicht anwenden (geändert: %s)"
 
-#: builtin/am.c:1828
 #, c-format
 msgid "Skipping: %.*s"
 msgstr "Überspringe: %.*s"
 
-#: builtin/am.c:1833
 #, c-format
 msgid "Creating an empty commit: %.*s"
 msgstr "Erzeuge leeren Commit: %.*s"
 
-#: builtin/am.c:1837
 msgid "Patch is empty."
 msgstr "Patch ist leer."
 
-#: builtin/am.c:1848 builtin/am.c:1917
 #, c-format
 msgid "Applying: %.*s"
 msgstr "Wende an: %.*s"
 
-#: builtin/am.c:1865
 msgid "No changes -- Patch already applied."
 msgstr "Keine Änderungen -- Patches bereits angewendet."
 
-#: builtin/am.c:1871
 #, c-format
 msgid "Patch failed at %s %.*s"
 msgstr "Anwendung des Patches fehlgeschlagen bei %s %.*s"
 
-#: builtin/am.c:1875
 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"
 "fehlgeschlagenen Patch zu sehen"
 
-#: builtin/am.c:1921
 msgid "No changes - recorded it as an empty commit."
 msgstr "Keine Änderungen - wurde als leerer Commit gespeichert."
 
-#: builtin/am.c:1923
 msgid ""
 "No changes - did you forget to use 'git add'?\n"
 "If there is nothing left to stage, chances are that something else\n"
@@ -11262,7 +2116,6 @@ msgstr ""
 "diese bereits anderweitig eingefügt worden sein; Sie könnten diesen Patch\n"
 "auslassen."
 
-#: builtin/am.c:1931
 msgid ""
 "You still have unmerged paths in your index.\n"
 "You should 'git add' each file with resolved conflicts to mark them as "
@@ -11275,17 +2128,16 @@ msgstr ""
 "Sie können `git rm` auf Dateien ausführen, um \"von denen gelöscht\" für\n"
 "diese zu akzeptieren."
 
-#: builtin/am.c:2039 builtin/am.c:2043 builtin/am.c:2055 builtin/reset.c:455
-#: builtin/reset.c:463
+msgid "unable to write new index file"
+msgstr "Konnte neue Index-Datei nicht schreiben."
+
 #, c-format
 msgid "Could not parse object '%s'."
 msgstr "Konnte Objekt '%s' nicht parsen."
 
-#: builtin/am.c:2091 builtin/am.c:2167
 msgid "failed to clean index"
 msgstr "Fehler beim Bereinigen des Index"
 
-#: builtin/am.c:2135
 msgid ""
 "You seem to have moved HEAD since the last 'am' failure.\n"
 "Not rewinding to ORIG_HEAD"
@@ -11293,160 +2145,115 @@ msgstr ""
 "Sie scheinen seit dem letzten gescheiterten 'am' HEAD geändert zu haben.\n"
 "Keine Zurücksetzung zu ORIG_HEAD."
 
-#: builtin/am.c:2292
+#, c-format
+msgid "failed to read '%s'"
+msgstr "Fehler beim Lesen von '%s'"
+
 #, c-format
 msgid "options '%s=%s' and '%s=%s' cannot be used together"
 msgstr ""
 "die Optionen '%s=%s' und '%s=%s' können nicht gemeinsam verwendet werden"
 
-#: builtin/am.c:2323
 msgid "git am [<options>] [(<mbox> | <Maildir>)...]"
 msgstr "git am [<Optionen>] [(<mbox> | <E-Mail-Verzeichnis>)...]"
 
-#: builtin/am.c:2324
 msgid "git am [<options>] (--continue | --skip | --abort)"
 msgstr "git am [<Optionen>] (--continue | --skip | --abort)"
 
-#: builtin/am.c:2330
 msgid "run interactively"
 msgstr "interaktiv ausführen"
 
-#: builtin/am.c:2332
 msgid "historical option -- no-op"
 msgstr "historische Option -- kein Effekt"
 
-#: builtin/am.c:2334
 msgid "allow fall back on 3way merging if needed"
 msgstr "erlaube, falls notwendig, das Zurückfallen auf einen 3-Wege-Merge"
 
-#: builtin/am.c:2335 builtin/init-db.c:547 builtin/prune-packed.c:16
-#: builtin/repack.c:646 builtin/stash.c:946
 msgid "be quiet"
 msgstr "weniger Ausgaben"
 
-#: builtin/am.c:2337
 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:2340
 msgid "recode into utf8 (default)"
 msgstr "nach UTF-8 umkodieren (Standard)"
 
-#: builtin/am.c:2342
 msgid "pass -k flag to git-mailinfo"
 msgstr "-k an git-mailinfo übergeben"
 
-#: builtin/am.c:2344
 msgid "pass -b flag to git-mailinfo"
 msgstr "-b an git-mailinfo übergeben"
 
-#: builtin/am.c:2346
 msgid "pass -m flag to git-mailinfo"
 msgstr "-m an git-mailinfo übergeben"
 
-#: builtin/am.c:2348
 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:2351
 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:2354
 msgid "strip everything before a scissors line"
 msgstr "alles vor einer Scheren-Zeile entfernen"
 
-#: builtin/am.c:2356
 msgid "pass it through git-mailinfo"
 msgstr "an git-mailinfo weitergeben"
 
-#: builtin/am.c:2359 builtin/am.c:2362 builtin/am.c:2365 builtin/am.c:2368
-#: builtin/am.c:2371 builtin/am.c:2374 builtin/am.c:2377 builtin/am.c:2380
-#: builtin/am.c:2386
 msgid "pass it through git-apply"
 msgstr "an git-apply übergeben"
 
-#: builtin/am.c:2376 builtin/commit.c:1514 builtin/fmt-merge-msg.c:18
-#: builtin/fmt-merge-msg.c:21 builtin/grep.c:920 builtin/merge.c:263
-#: builtin/pull.c:142 builtin/pull.c:204 builtin/pull.c:221
-#: builtin/rebase.c:1074 builtin/repack.c:657 builtin/repack.c:661
-#: builtin/repack.c:663 builtin/show-branch.c:650 builtin/show-ref.c:172
-#: builtin/tag.c:446 parse-options.h:159 parse-options.h:180
-#: parse-options.h:348
 msgid "n"
 msgstr "Anzahl"
 
-#: builtin/am.c:2382 builtin/branch.c:695 builtin/bugreport.c:109
-#: builtin/cat-file.c:848 builtin/cat-file.c:852 builtin/cat-file.c:856
-#: builtin/for-each-ref.c:41 builtin/ls-tree.c:357 builtin/replace.c:555
-#: builtin/tag.c:480 builtin/verify-tag.c:38
 msgid "format"
 msgstr "Format"
 
-#: builtin/am.c:2383
 msgid "format the patch(es) are in"
 msgstr "Patch-Format"
 
-#: builtin/am.c:2389
 msgid "override error message when patch failure occurs"
 msgstr "Meldung bei fehlerhafter Patch-Anwendung überschreiben"
 
-#: builtin/am.c:2391
 msgid "continue applying patches after resolving a conflict"
 msgstr "Anwendung der Patches nach Auflösung eines Konfliktes fortsetzen"
 
-#: builtin/am.c:2394
 msgid "synonyms for --continue"
 msgstr "Synonyme für --continue"
 
-#: builtin/am.c:2397
 msgid "skip the current patch"
 msgstr "den aktuellen Patch auslassen"
 
-#: builtin/am.c:2400
 msgid "restore the original branch and abort the patching operation"
 msgstr ""
 "ursprünglichen Branch wiederherstellen und Anwendung der Patches abbrechen"
 
-#: builtin/am.c:2403
 msgid "abort the patching operation but keep HEAD where it is"
 msgstr "Patch-Operation abbrechen, aber HEAD an aktueller Stelle belassen"
 
-#: builtin/am.c:2407
 msgid "show the patch being applied"
 msgstr "den Patch, der gerade angewendet wird, anzeigen"
 
-#: builtin/am.c:2411
 msgid "record the empty patch as an empty commit"
 msgstr "leerer Patch als leeren Commit gespeichert"
 
-#: builtin/am.c:2415
 msgid "lie about committer date"
 msgstr "Autor-Datum als Commit-Datum verwenden"
 
-#: builtin/am.c:2417
 msgid "use current timestamp for author date"
 msgstr "aktuellen Zeitstempel als Autor-Datum verwenden"
 
-#: builtin/am.c:2419 builtin/commit-tree.c:118 builtin/commit.c:1642
-#: builtin/merge.c:302 builtin/pull.c:179 builtin/rebase.c:1127
-#: builtin/revert.c:117 builtin/tag.c:461
 msgid "key-id"
 msgstr "GPG-Schlüsselkennung"
 
-#: builtin/am.c:2420 builtin/rebase.c:1128
 msgid "GPG-sign commits"
 msgstr "Commits mit GPG signieren"
 
-#: builtin/am.c:2423
 msgid "how to handle empty patches"
 msgstr "wie leere Patches behandelt werden sollen"
 
-#: builtin/am.c:2426
 msgid "(internal use for git-rebase)"
 msgstr "(intern für git-rebase verwendet)"
 
-#: builtin/am.c:2444
 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."
@@ -11454,16 +2261,13 @@ msgstr ""
 "Die -b/--binary Option hat seit Langem keinen Effekt und wird\n"
 "entfernt. Bitte verwenden Sie diese nicht mehr."
 
-#: builtin/am.c:2451
 msgid "failed to read the index"
 msgstr "Fehler beim Lesen des Index"
 
-#: builtin/am.c:2466
 #, 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:2490
 #, c-format
 msgid ""
 "Stray %s directory found.\n"
@@ -11472,48 +2276,37 @@ msgstr ""
 "Stray %s Verzeichnis gefunden.\n"
 "Benutzen Sie \"git am --abort\", um es zu entfernen."
 
-#: builtin/am.c:2496
 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:2506
 msgid "interactive mode requires patches on the command line"
 msgstr "Interaktiver Modus benötigt Patches über die Kommandozeile"
 
-#: builtin/apply.c:8
 msgid "git apply [<options>] [<patch>...]"
 msgstr "git apply [<Optionen>] [<Patch>...]"
 
-#: builtin/archive.c:18
 msgid "could not redirect output"
 msgstr "konnte Ausgabe nicht umleiten"
 
-#: builtin/archive.c:35
 msgid "git archive: Remote with no URL"
 msgstr "git archive: Externes Archiv ohne URL"
 
-#: 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:62
 #, c-format
 msgid "git archive: NACK %s"
 msgstr "git archive: NACK %s"
 
-#: builtin/archive.c:63
 msgid "git archive: protocol error"
 msgstr "git archive: Protokollfehler"
 
-#: builtin/archive.c:67
 msgid "git archive: expected a flush"
 msgstr "git archive: erwartete eine Spülung (flush)"
 
-#: builtin/bisect--helper.c:24
 msgid "git bisect--helper --bisect-reset [<commit>]"
 msgstr "git bisect--helper --bisect-reset [<Commit>]"
 
-#: builtin/bisect--helper.c:26
 msgid ""
 "git bisect--helper --bisect-start [--term-{new,bad}=<term> --term-{old,good}"
 "=<term>] [--no-checkout] [--first-parent] [<bad> [<good>...]] [--] "
@@ -11523,71 +2316,56 @@ msgstr ""
 "good}=<Begriff>] [--no-checkout] [--first-parent] [<schlecht> [<gut>...]] "
 "[--] [<Pfade>...]"
 
-#: builtin/bisect--helper.c:29
 msgid "git bisect--helper --bisect-state (bad|new) [<rev>]"
 msgstr "git bisect--helper --bisect-state (bad|new) [<Commit>]"
 
-#: builtin/bisect--helper.c:30
 msgid "git bisect--helper --bisect-state (good|old) [<rev>...]"
 msgstr "git bisect--helper --bisect-state (good|old) [<Commit>...]"
 
-#: builtin/bisect--helper.c:31
 msgid "git bisect--helper --bisect-replay <filename>"
 msgstr "git bisect--helper --bisect-replay <Dateiname>"
 
-#: builtin/bisect--helper.c:32
 msgid "git bisect--helper --bisect-skip [(<rev>|<range>)...]"
 msgstr "git bisect--helper --bisect-skip [(<Commit>|<Bereich>)...]"
 
-#: 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:116
 #, c-format
 msgid "could not write to file '%s'"
 msgstr "konnte nicht in Datei '%s' schreiben"
 
-#: 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: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: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:194
 msgid "please use two different terms"
 msgstr "bitte verwenden Sie zwei verschiedene Begriffe"
 
-#: 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:218
 #, c-format
 msgid "'%s' is not a valid commit"
 msgstr "'%s' ist kein gültiger Commit"
 
-#: builtin/bisect--helper.c:227
 #, c-format
 msgid ""
 "could not check out original HEAD '%s'. Try 'git bisect reset <commit>'."
@@ -11595,27 +2373,22 @@ msgstr ""
 "Konnte den ursprünglichen HEAD '%s' nicht auschecken.\n"
 "Versuchen Sie 'git bisect reset <Commit>'."
 
-#: builtin/bisect--helper.c:271
 #, c-format
 msgid "Bad bisect_write argument: %s"
 msgstr "Ungültiges \"bisect_write\" Argument: %s"
 
-#: 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:288
 #, c-format
 msgid "couldn't open the file '%s'"
 msgstr "konnte die Datei '%s' nicht öffnen"
 
-#: 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:341
 #, c-format
 msgid ""
 "You need to give me at least one %s and %s revision.\n"
@@ -11624,7 +2397,6 @@ msgstr ""
 "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:345
 #, c-format
 msgid ""
 "You need to start by \"git bisect start\".\n"
@@ -11635,7 +2407,6 @@ msgstr ""
 "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:365
 #, c-format
 msgid "bisecting only with a %s commit"
 msgstr "binäre Suche nur mit einem %s Commit"
@@ -11644,15 +2415,24 @@ msgstr "binäre Suche nur mit einem %s Commit"
 #. translation. The program will only accept English input
 #. at this point.
 #.
-#: builtin/bisect--helper.c:373
 msgid "Are you sure [Y/n]? "
 msgstr "Sind Sie sicher [Y/n]? "
 
-#: builtin/bisect--helper.c:434
+msgid "status: waiting for both good and bad commits\n"
+msgstr "Status: warte auf guten und schlechten Commit\n"
+
+#, c-format
+msgid "status: waiting for bad commit, %d good commit known\n"
+msgid_plural "status: waiting for bad commit, %d good commits known\n"
+msgstr[0] "Status: warte auf schlechten Commit, %d guter Commit bekannt\n"
+msgstr[1] "Status: warte auf schlechten Commit, %d gute Commits bekannt\n"
+
+msgid "status: waiting for good commit(s), bad commit known\n"
+msgstr "Status: warte auf gute(n) Commit(s), schlechter Commit bekannt\n"
+
 msgid "no terms defined"
 msgstr "keine Begriffe definiert"
 
-#: builtin/bisect--helper.c:437
 #, c-format
 msgid ""
 "Your current terms are %s for the old state\n"
@@ -11661,7 +2441,6 @@ msgstr ""
 "Ihre aktuellen Begriffe sind %s für den alten Zustand\n"
 "und %s für den neuen Zustand.\n"
 
-#: builtin/bisect--helper.c:447
 #, c-format
 msgid ""
 "invalid argument %s for 'git bisect terms'.\n"
@@ -11670,55 +2449,44 @@ msgstr ""
 "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:514 builtin/bisect--helper.c:1038
 msgid "revision walk setup failed\n"
 msgstr "Einrichtung des Revisionsgangs fehlgeschlagen\n"
 
-#: 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:655 builtin/bisect--helper.c:668
 msgid "'' is not a valid term"
 msgstr "'' ist kein gültiger Begriff"
 
-#: builtin/bisect--helper.c:678
 #, c-format
 msgid "unrecognized option: '%s'"
 msgstr "nicht erkannte Option: '%s'"
 
-#: 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:713
 msgid "bad HEAD - I need a HEAD"
 msgstr "ungültiger HEAD - HEAD wird benötigt"
 
-#: 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: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:752
 msgid "bad HEAD - strange symbolic ref"
 msgstr "ungültiger HEAD - merkwürdige symbolische Referenz"
 
-#: builtin/bisect--helper.c:772
 #, c-format
 msgid "invalid ref: '%s'"
 msgstr "ungültige Referenz: '%s'"
 
-#: 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"
 
@@ -11726,87 +2494,69 @@ msgstr "Sie müssen mit \"git bisect start\" beginnen\n"
 #. translation. The program will only accept English input
 #. at this point.
 #.
-#: 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: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: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:884 builtin/bisect--helper.c:897
 #, c-format
 msgid "Bad rev input: %s"
 msgstr "Ungültige Referenz-Eingabe: %s"
 
-#: 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:936
 msgid "We are not bisecting."
 msgstr "Keine binäre Suche im Gange."
 
-#: builtin/bisect--helper.c:986
 #, c-format
 msgid "'%s'?? what are you talking about?"
 msgstr "'%s'?? Was reden Sie da?"
 
-#: 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:1120 builtin/bisect--helper.c:1152
 #, c-format
 msgid "running %s\n"
 msgstr "Ausführen von %s\n"
 
-#: builtin/bisect--helper.c:1145 builtin/bisect--helper.c:1335
 msgid "bisect run failed: no command provided."
 msgstr "'bisect run' fehlgeschlagen: kein Befehl angegeben."
 
-#: builtin/bisect--helper.c:1166
 #, c-format
 msgid "unable to verify '%s' on good revision"
 msgstr "konnte '%s' nicht für guten Commit überprüfen"
 
-#: builtin/bisect--helper.c:1172
 #, c-format
 msgid "bogus exit code %d for good revision"
 msgstr "fehlerhafter Exit-Code %d für guten Commit"
 
-#: builtin/bisect--helper.c:1180
 #, 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:1195
 #, c-format
 msgid "cannot open file '%s' for writing"
 msgstr "Datei '%s' kann nicht zum Schreiben geöffnet werden"
 
-#: builtin/bisect--helper.c:1213
 msgid "bisect run cannot continue any more"
 msgstr "'bisect run' kann nicht mehr fortgesetzt werden"
 
-#: builtin/bisect--helper.c:1215
 #, c-format
 msgid "bisect run success"
 msgstr "'bisect run' erfolgreich ausgeführt"
 
-#: builtin/bisect--helper.c:1218
 #, c-format
 msgid "bisect found first bad commit"
 msgstr "binäre Suche fand ersten schlechten Commit"
 
-#: builtin/bisect--helper.c:1221
 #, c-format
 msgid ""
 "bisect run failed: 'git bisect--helper --bisect-state %s' exited with error "
@@ -11815,224 +2565,167 @@ msgstr ""
 "'bisect run' fehlgeschlagen: 'git bisect--helper --bisect-state %s' mit "
 "Fehlercode %d beendet"
 
-#: builtin/bisect--helper.c:1253
 msgid "reset the bisection state"
 msgstr "den Zustand der binären Suche zurücksetzen"
 
-#: builtin/bisect--helper.c:1255
 msgid "check whether bad or good terms exist"
 msgstr "prüfen, ob Begriffe für gute und schlechte Commits existieren"
 
-#: builtin/bisect--helper.c:1257
 msgid "print out the bisect terms"
 msgstr "die Begriffe für die binäre Suche ausgeben"
 
-#: builtin/bisect--helper.c:1259
 msgid "start the bisect session"
 msgstr "Sitzung für binäre Suche starten"
 
-#: builtin/bisect--helper.c:1261
 msgid "find the next bisection commit"
 msgstr "nächsten Commit für die binäre Suche finden"
 
-#: builtin/bisect--helper.c:1263
 msgid "mark the state of ref (or refs)"
 msgstr "den Status der Referenz(en) markieren"
 
-#: builtin/bisect--helper.c:1265
 msgid "list the bisection steps so far"
 msgstr "die bisherigen Schritte der binären Suche auflisten"
 
-#: builtin/bisect--helper.c:1267
 msgid "replay the bisection process from the given file"
 msgstr "binäre Suche aus der angegebenen Datei wiederholen"
 
-#: builtin/bisect--helper.c:1269
 msgid "skip some commits for checkout"
 msgstr "einige Commits für das Auschecken überspringen"
 
-#: builtin/bisect--helper.c:1271
 msgid "visualize the bisection"
 msgstr "binäre Suche visualisieren"
 
-#: builtin/bisect--helper.c:1273
 msgid "use <cmd>... to automatically bisect"
 msgstr "verwende <Programm>... für die automatische binäre Suche"
 
-#: builtin/bisect--helper.c:1275
 msgid "no log for BISECT_WRITE"
 msgstr "kein Log für BISECT_WRITE"
 
-#: builtin/bisect--helper.c:1290
 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:1295
 msgid "--bisect-terms requires 0 or 1 argument"
 msgstr "--bisect-terms benötigt 0 oder 1 Argument"
 
-#: builtin/bisect--helper.c:1304
 msgid "--bisect-next requires 0 arguments"
 msgstr "--bisect-next benötigt 0 Argumente"
 
-#: builtin/bisect--helper.c:1315
 msgid "--bisect-log requires 0 arguments"
 msgstr "--bisect-log benötigt 0 Argumente"
 
-#: builtin/bisect--helper.c:1320
 msgid "no logfile given"
 msgstr "keine Log-Datei angegeben"
 
-#: builtin/blame.c:32
 msgid "git blame [<options>] [<rev-opts>] [<rev>] [--] <file>"
 msgstr "git blame [<Optionen>] [<rev-opts>] [<Commit>] [--] <Datei>"
 
-#: builtin/blame.c:37
 msgid "<rev-opts> are documented in git-rev-list(1)"
 msgstr "<rev-opts> sind dokumentiert in git-rev-list(1)"
 
-#: builtin/blame.c:406
 #, c-format
 msgid "expecting a color: %s"
 msgstr "erwarte eine Farbe: %s"
 
-#: builtin/blame.c:413
 msgid "must end with a color"
 msgstr "muss mit einer Farbe enden"
 
-#: builtin/blame.c:842
 #, c-format
 msgid "cannot find revision %s to ignore"
 msgstr "konnte Commit %s zum Ignorieren nicht finden"
 
-#: builtin/blame.c:864
 msgid "show blame entries as we find them, incrementally"
 msgstr "\"blame\"-Einträge schrittweise anzeigen, während wir sie finden"
 
-#: builtin/blame.c:865
 msgid "do not show object names of boundary commits (Default: off)"
 msgstr "keine Objektnamen für Grenz-Commits anzeigen (Standard: aus)"
 
-#: builtin/blame.c:866
 msgid "do not treat root commits as boundaries (Default: off)"
 msgstr "Root-Commits nicht als Grenzen behandeln (Standard: aus)"
 
-#: builtin/blame.c:867
 msgid "show work cost statistics"
 msgstr "Statistiken zum Arbeitsaufwand anzeigen"
 
-#: builtin/blame.c:868 builtin/checkout.c:1554 builtin/clone.c:98
-#: builtin/commit-graph.c:75 builtin/commit-graph.c:228 builtin/fetch.c:181
-#: builtin/merge.c:301 builtin/multi-pack-index.c:103
-#: builtin/multi-pack-index.c:154 builtin/multi-pack-index.c:180
-#: builtin/multi-pack-index.c:208 builtin/pull.c:120 builtin/push.c:566
-#: builtin/remote.c:683 builtin/send-pack.c:202
 msgid "force progress reporting"
 msgstr "Fortschrittsanzeige erzwingen"
 
-#: builtin/blame.c:869
 msgid "show output score for blame entries"
 msgstr "Ausgabebewertung für \"blame\"-Einträge anzeigen"
 
-#: builtin/blame.c:870
 msgid "show original filename (Default: auto)"
 msgstr "ursprünglichen Dateinamen anzeigen (Standard: auto)"
 
-#: builtin/blame.c:871
 msgid "show original linenumber (Default: off)"
 msgstr "ursprüngliche Zeilennummer anzeigen (Standard: aus)"
 
-#: builtin/blame.c:872
 msgid "show in a format designed for machine consumption"
 msgstr "Anzeige in einem Format für maschinelle Auswertung"
 
-#: builtin/blame.c:873
 msgid "show porcelain format with per-line commit information"
 msgstr ""
 "Anzeige in Format für Fremdprogramme mit Commit-Informationen pro Zeile"
 
-#: builtin/blame.c:874
 msgid "use the same output mode as git-annotate (Default: off)"
 msgstr ""
 "den gleichen Ausgabemodus benutzen wie \"git-annotate\" (Standard: aus)"
 
-#: builtin/blame.c:875
 msgid "show raw timestamp (Default: off)"
 msgstr "unbearbeiteten Zeitstempel anzeigen (Standard: aus)"
 
-#: builtin/blame.c:876
 msgid "show long commit SHA1 (Default: off)"
 msgstr "langen Commit-SHA1 anzeigen (Standard: aus)"
 
-#: builtin/blame.c:877
 msgid "suppress author name and timestamp (Default: off)"
 msgstr "den Namen des Autors und den Zeitstempel unterdrücken (Standard: aus)"
 
-#: builtin/blame.c:878
 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:879
 msgid "ignore whitespace differences"
 msgstr "Whitespace-Unterschiede ignorieren"
 
-#: builtin/blame.c:880 builtin/log.c:1857
 msgid "rev"
 msgstr "Commit"
 
-#: builtin/blame.c:880
 msgid "ignore <rev> when blaming"
 msgstr "ignoriere <Commit> beim Ausführen von 'blame'"
 
-#: builtin/blame.c:881
 msgid "ignore revisions from <file>"
 msgstr "ignoriere Commits aus <Datei>"
 
-#: builtin/blame.c:882
 msgid "color redundant metadata from previous line differently"
 msgstr "redundante Metadaten der vorherigen Zeile unterschiedlich einfärben"
 
-#: builtin/blame.c:883
 msgid "color lines by age"
 msgstr "Zeilen nach Alter einfärben"
 
-#: builtin/blame.c:884
 msgid "spend extra cycles to find better match"
 msgstr ""
 "mehr Arbeitsschritte ausführen, um eine bessere Übereinstimmung zu finden"
 
-#: builtin/blame.c:885
 msgid "use revisions from <file> instead of calling git-rev-list"
 msgstr "Commits von <Datei> benutzen, statt \"git-rev-list\" aufzurufen"
 
-#: builtin/blame.c:886
 msgid "use <file>'s contents as the final image"
 msgstr "Inhalte der <Datei>en als endgültiges Abbild benutzen"
 
-#: builtin/blame.c:887 builtin/blame.c:888
 msgid "score"
 msgstr "Bewertung"
 
-#: builtin/blame.c:887
 msgid "find line copies within and across files"
 msgstr "kopierte Zeilen innerhalb oder zwischen Dateien finden"
 
-#: builtin/blame.c:888
 msgid "find line movements within and across files"
 msgstr "verschobene Zeilen innerhalb oder zwischen Dateien finden"
 
-#: builtin/blame.c:889
 msgid "range"
 msgstr "Bereich"
 
-#: builtin/blame.c:890
 msgid "process only line range <start>,<end> or function :<funcname>"
 msgstr ""
 "nur Zeilen im Bereich <Start>,<Ende> oder Funktion :<Funktionsname> "
 "verarbeiten"
 
-#: builtin/blame.c:949
 msgid "--progress can't be used with --incremental or porcelain formats"
 msgstr ""
 "--progress kann nicht mit --incremental oder Formaten für Fremdprogramme\n"
@@ -12046,26 +2739,21 @@ msgstr ""
 #. your language may need more or fewer display
 #. columns.
 #.
-#: builtin/blame.c:1000
 msgid "4 years, 11 months ago"
 msgstr "vor 4 Jahren und 11 Monaten"
 
-#: builtin/blame.c:1116
 #, 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:1161
 msgid "Blaming lines"
 msgstr "Verarbeite Zeilen"
 
-#: builtin/branch.c:29
 msgid "git branch [<options>] [-r | -a] [--merged] [--no-merged]"
 msgstr "git branch [<Optionen>] [-r | -a] [--merged] [--no-merged]"
 
-#: builtin/branch.c:30
 msgid ""
 "git branch [<options>] [-f] [--recurse-submodules] <branch-name> [<start-"
 "point>]"
@@ -12073,31 +2761,24 @@ msgstr ""
 "git branch [<Optionen>] [-f] [--recurse-submodules] <Branchname> "
 "[<Startpunkt>]"
 
-#: builtin/branch.c:31
 msgid "git branch [<options>] [-l] [<pattern>...]"
 msgstr "git branch [<Optionen>] [-l] [<Muster>...]"
 
-#: builtin/branch.c:32
 msgid "git branch [<options>] [-r] (-d | -D) <branch-name>..."
 msgstr "git branch [<Optionen>] [-r] (-d | -D) <Branchname>..."
 
-#: builtin/branch.c:33
 msgid "git branch [<options>] (-m | -M) [<old-branch>] <new-branch>"
 msgstr "git branch [<Optionen>] (-m | -M) [<alter-Branch>] <neuer-Branch>"
 
-#: builtin/branch.c:34
 msgid "git branch [<options>] (-c | -C) [<old-branch>] <new-branch>"
 msgstr "git branch [<Optionen>] (-c | -C) [<alter-Branch>] <neuer-Branch>"
 
-#: builtin/branch.c:35
 msgid "git branch [<options>] [-r | -a] [--points-at]"
 msgstr "git branch [<Optionen>] [-r | -a] [--points-at]"
 
-#: builtin/branch.c:36
 msgid "git branch [<options>] [-r | -a] [--format]"
 msgstr "git branch [<Optionen>] [-r | -a] [--format]"
 
-#: builtin/branch.c:165
 #, c-format
 msgid ""
 "deleting branch '%s' that has been merged to\n"
@@ -12106,7 +2787,6 @@ msgstr ""
 "entferne Branch '%s', der zusammengeführt wurde mit\n"
 "         '%s', aber noch nicht mit HEAD zusammengeführt wurde."
 
-#: builtin/branch.c:169
 #, c-format
 msgid ""
 "not deleting branch '%s' that is not yet merged to\n"
@@ -12115,12 +2795,10 @@ msgstr ""
 "entferne Branch '%s' nicht, der noch nicht zusammengeführt wurde mit\n"
 "         '%s', obwohl er mit HEAD zusammengeführt wurde."
 
-#: builtin/branch.c:183
 #, c-format
 msgid "Couldn't look up commit object for '%s'"
 msgstr "Konnte Commit-Objekt für '%s' nicht nachschlagen."
 
-#: builtin/branch.c:187
 #, c-format
 msgid ""
 "The branch '%s' is not fully merged.\n"
@@ -12130,118 +2808,94 @@ msgstr ""
 "Wenn Sie sicher sind diesen Branch zu entfernen, führen Sie 'git branch -D "
 "%s' aus."
 
-#: builtin/branch.c:200
 msgid "Update of config-file failed"
 msgstr "Aktualisierung der Konfigurationsdatei fehlgeschlagen."
 
-#: builtin/branch.c:235
 msgid "cannot use -a with -d"
 msgstr "kann -a nicht mit -d benutzen"
 
-#: builtin/branch.c:242
 msgid "Couldn't look up commit object for HEAD"
 msgstr "Konnte Commit-Objekt für HEAD nicht nachschlagen."
 
-#: builtin/branch.c:259
 #, c-format
 msgid "Cannot delete branch '%s' checked out at '%s'"
 msgstr "Kann Branch '%s' nicht entfernen, ausgecheckt in '%s'."
 
-#: builtin/branch.c:274
 #, c-format
 msgid "remote-tracking branch '%s' not found."
 msgstr "Remote-Tracking-Branch '%s' nicht gefunden"
 
-#: builtin/branch.c:275
 #, c-format
 msgid "branch '%s' not found."
 msgstr "Branch '%s' nicht gefunden."
 
-#: builtin/branch.c:306
 #, c-format
 msgid "Deleted remote-tracking branch %s (was %s).\n"
 msgstr "Remote-Tracking-Branch %s entfernt (war %s).\n"
 
-#: builtin/branch.c:307
 #, c-format
 msgid "Deleted branch %s (was %s).\n"
 msgstr "Branch %s entfernt (war %s).\n"
 
-#: builtin/branch.c:457 builtin/tag.c:64
 msgid "unable to parse format string"
 msgstr "Konnte Formatierungsstring nicht parsen."
 
-#: builtin/branch.c:488
 msgid "could not resolve HEAD"
 msgstr "konnte HEAD-Commit nicht auflösen"
 
-#: builtin/branch.c:494
 #, c-format
 msgid "HEAD (%s) points outside of refs/heads/"
 msgstr "HEAD (%s) wurde nicht unter \"refs/heads/\" gefunden!"
 
-#: builtin/branch.c:509
 #, c-format
 msgid "Branch %s is being rebased at %s"
 msgstr "Branch %s wird auf %s umgesetzt"
 
-#: builtin/branch.c:513
 #, c-format
 msgid "Branch %s is being bisected at %s"
 msgstr "Binäre Suche von Branch %s zu %s im Gange"
 
-#: builtin/branch.c:530
 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:532
 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:543
 #, c-format
 msgid "Invalid branch name: '%s'"
 msgstr "Ungültiger Branchname: '%s'"
 
-#: builtin/branch.c:572
 msgid "Branch rename failed"
 msgstr "Umbenennung des Branches fehlgeschlagen"
 
-#: builtin/branch.c:574
 msgid "Branch copy failed"
 msgstr "Kopie des Branches fehlgeschlagen"
 
-#: builtin/branch.c:578
 #, c-format
 msgid "Created a copy of a misnamed branch '%s'"
 msgstr "Kopie eines falsch benannten Branches '%s' erstellt."
 
-#: builtin/branch.c:581
 #, c-format
 msgid "Renamed a misnamed branch '%s' away"
 msgstr "falsch benannten Branch '%s' umbenannt"
 
-#: builtin/branch.c:587
 #, 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:596
 msgid "Branch is renamed, but update of config-file failed"
 msgstr ""
 "Branch ist umbenannt, aber die Aktualisierung der Konfigurationsdatei ist "
 "fehlgeschlagen."
 
-#: builtin/branch.c:598
 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:614
 #, c-format
 msgid ""
 "Please edit the description for the branch\n"
@@ -12252,148 +2906,112 @@ msgstr ""
 "  %s\n"
 "Zeilen, die mit '%c' beginnen, werden entfernt.\n"
 
-#: builtin/branch.c:651
 msgid "Generic options"
 msgstr "Allgemeine Optionen"
 
-#: builtin/branch.c:653
 msgid "show hash and subject, give twice for upstream branch"
 msgstr "Hash und Betreff anzeigen; -vv: zusätzlich Upstream-Branch"
 
-#: builtin/branch.c:654
 msgid "suppress informational messages"
 msgstr "Informationsmeldungen unterdrücken"
 
-#: builtin/branch.c:656 builtin/checkout.c:1571
-#: builtin/submodule--helper.c:3077
 msgid "set branch tracking configuration"
 msgstr "Branch-Tracking-Konfiguration setzen"
 
-#: builtin/branch.c:659
 msgid "do not use"
 msgstr "nicht verwenden"
 
-#: builtin/branch.c:661
 msgid "upstream"
 msgstr "Upstream"
 
-#: builtin/branch.c:661
 msgid "change the upstream info"
 msgstr "Informationen zum Upstream-Branch ändern"
 
-#: builtin/branch.c:662
 msgid "unset the upstream info"
 msgstr "Informationen zum Upstream-Branch entfernen"
 
-#: builtin/branch.c:663
 msgid "use colored output"
 msgstr "farbige Ausgaben verwenden"
 
-#: builtin/branch.c:664
 msgid "act on remote-tracking branches"
 msgstr "auf Remote-Tracking-Branches wirken"
 
-#: builtin/branch.c:666 builtin/branch.c:668
 msgid "print only branches that contain the commit"
 msgstr "nur Branches ausgeben, die diesen Commit enthalten"
 
-#: builtin/branch.c:667 builtin/branch.c:669
 msgid "print only branches that don't contain the commit"
 msgstr "nur Branches ausgeben, die diesen Commit nicht enthalten"
 
-#: builtin/branch.c:672
 msgid "Specific git-branch actions:"
 msgstr "spezifische Aktionen für \"git-branch\":"
 
-#: builtin/branch.c:673
 msgid "list both remote-tracking and local branches"
 msgstr "Remote-Tracking und lokale Branches auflisten"
 
-#: builtin/branch.c:675
 msgid "delete fully merged branch"
 msgstr "vollständig zusammengeführten Branch entfernen"
 
-#: builtin/branch.c:676
 msgid "delete branch (even if not merged)"
 msgstr "Branch löschen (auch wenn nicht zusammengeführt)"
 
-#: builtin/branch.c:677
 msgid "move/rename a branch and its reflog"
 msgstr "einen Branch und dessen Reflog verschieben/umbenennen"
 
-#: builtin/branch.c:678
 msgid "move/rename a branch, even if target exists"
 msgstr ""
 "einen Branch verschieben/umbenennen, auch wenn das Ziel bereits existiert"
 
-#: builtin/branch.c:679
 msgid "copy a branch and its reflog"
 msgstr "einen Branch und dessen Reflog kopieren"
 
-#: builtin/branch.c:680
 msgid "copy a branch, even if target exists"
 msgstr "einen Branch kopieren, auch wenn das Ziel bereits existiert"
 
-#: builtin/branch.c:681
 msgid "list branch names"
 msgstr "Branchnamen auflisten"
 
-#: builtin/branch.c:682
 msgid "show current branch name"
 msgstr "Zeige aktuellen Branchnamen."
 
-#: builtin/branch.c:683 builtin/submodule--helper.c:3075
 msgid "create the branch's reflog"
 msgstr "das Reflog des Branches erzeugen"
 
-#: builtin/branch.c:685
 msgid "edit the description for the branch"
 msgstr "die Beschreibung für den Branch bearbeiten"
 
-#: builtin/branch.c:686
 msgid "force creation, move/rename, deletion"
 msgstr "Erstellung, Verschiebung/Umbenennung oder Löschung erzwingen"
 
-#: builtin/branch.c:687
 msgid "print only branches that are merged"
 msgstr "nur zusammengeführte Branches ausgeben"
 
-#: builtin/branch.c:688
 msgid "print only branches that are not merged"
 msgstr "nur nicht zusammengeführte Branches ausgeben"
 
-#: builtin/branch.c:689
 msgid "list branches in columns"
 msgstr "Branches in Spalten auflisten"
 
-#: builtin/branch.c:691 builtin/for-each-ref.c:45 builtin/notes.c:413
-#: builtin/notes.c:416 builtin/notes.c:579 builtin/notes.c:582
-#: builtin/tag.c:476
 msgid "object"
 msgstr "Objekt"
 
-#: builtin/branch.c:692
 msgid "print only branches of the object"
 msgstr "nur Branches von diesem Objekt ausgeben"
 
-#: builtin/branch.c:693 builtin/for-each-ref.c:51 builtin/tag.c:483
 msgid "sorting and filtering are case insensitive"
 msgstr "Sortierung und Filterung sind unabhängig von Groß- und Kleinschreibung"
 
-#: builtin/branch.c:694 builtin/ls-files.c:667
 msgid "recurse through submodules"
 msgstr "Rekursion in Submodulen durchführen"
 
-#: builtin/branch.c:695 builtin/for-each-ref.c:41 builtin/ls-tree.c:358
-#: builtin/tag.c:481 builtin/verify-tag.c:38
 msgid "format to use for the output"
 msgstr "für die Ausgabe zu verwendendes Format"
 
-#: builtin/branch.c:718 builtin/clone.c:684
+msgid "Failed to resolve HEAD as a valid ref."
+msgstr "Konnte HEAD nicht als gültige Referenz auflösen."
+
 msgid "HEAD not found below refs/heads!"
 msgstr "HEAD wurde nicht unter \"refs/heads\" gefunden!"
 
-#: builtin/branch.c:739
 msgid ""
 "branch with --recurse-submodules can only be used if submodule."
 "propagateBranches is enabled"
@@ -12401,45 +3019,35 @@ msgstr ""
 "Branch mit --recurse-submodules kann nur genutzt werden, wenn submodule."
 "propagateBranches aktiviert ist"
 
-#: builtin/branch.c:741
 msgid "--recurse-submodules can only be used to create branches"
 msgstr "--recurse-submodules kann nur genutzt werden, um Branches zu erstellen"
 
-#: builtin/branch.c:770 builtin/branch.c:826 builtin/branch.c:835
 msgid "branch name required"
 msgstr "Branchname erforderlich"
 
-#: builtin/branch.c:802
 msgid "Cannot give description to detached HEAD"
 msgstr "zu losgelöstem HEAD kann keine Beschreibung hinterlegt werden"
 
-#: builtin/branch.c:807
 msgid "cannot edit description of more than one branch"
 msgstr "Beschreibung von mehr als einem Branch kann nicht bearbeitet werden"
 
-#: builtin/branch.c:814
 #, c-format
 msgid "No commit on branch '%s' yet."
 msgstr "Noch kein Commit in Branch '%s'."
 
-#: builtin/branch.c:817
 #, c-format
 msgid "No branch named '%s'."
 msgstr "Branch '%s' nicht vorhanden."
 
-#: builtin/branch.c:832
 msgid "too many branches for a copy operation"
 msgstr "zu viele Branches für eine Kopieroperation angegeben"
 
-#: builtin/branch.c:841
 msgid "too many arguments for a rename operation"
 msgstr "zu viele Argumente für eine Umbenennen-Operation angegeben"
 
-#: builtin/branch.c:846
 msgid "too many arguments to set new upstream"
 msgstr "zu viele Argumente angegeben, um Upstream-Branch zu setzen"
 
-#: builtin/branch.c:850
 #, c-format
 msgid ""
 "could not set upstream of HEAD to %s when it does not point to any branch."
@@ -12447,34 +3055,28 @@ msgstr ""
 "Konnte keinen neuen Upstream-Branch von HEAD zu %s setzen, da dieser auf\n"
 "keinen Branch zeigt."
 
-#: builtin/branch.c:853 builtin/branch.c:873
 #, c-format
 msgid "no such branch '%s'"
 msgstr "Branch '%s' nicht gefunden"
 
-#: builtin/branch.c:857
 #, c-format
 msgid "branch '%s' does not exist"
 msgstr "Branch '%s' existiert nicht"
 
-#: builtin/branch.c:867
 msgid "too many arguments to unset upstream"
 msgstr ""
 "zu viele Argumente angegeben, um Konfiguration zu Upstream-Branch zu "
 "entfernen"
 
-#: builtin/branch.c:871
 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:877
 #, c-format
 msgid "Branch '%s' has no upstream information"
 msgstr "Branch '%s' hat keinen Upstream-Branch gesetzt"
 
-#: builtin/branch.c:890
 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>?"
@@ -12483,7 +3085,6 @@ msgstr ""
 "verwendet werden.\n"
 "Wollten Sie -a|-r --list <Muster> benutzen?"
 
-#: builtin/branch.c:894
 msgid ""
 "the '--set-upstream' option is no longer supported. Please use '--track' or "
 "'--set-upstream-to' instead."
@@ -12491,32 +3092,25 @@ msgstr ""
 "Die '--set-upstream' Option wird nicht länger unterstützt.\n"
 "Bitte benutzen Sie stattdessen '--track' oder '--set-upstream-to'."
 
-#: builtin/bugreport.c:16
 msgid "git version:\n"
 msgstr "git Version:\n"
 
-#: 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:32
 msgid "compiler info: "
 msgstr "Compiler Info: "
 
-#: builtin/bugreport.c:35
 msgid "libc info: "
 msgstr "libc Info: "
 
-#: 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:62
 msgid "git bugreport [-o|--output-directory <file>] [-s|--suffix <format>]"
 msgstr "git bugreport [-o|--output-directory <Datei>] [-s|--suffix <Format>]"
 
-#: 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"
@@ -12553,144 +3147,115 @@ msgstr ""
 "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:108
 msgid "specify a destination for the bugreport file"
 msgstr "Speicherort für die Datei des Fehlerberichts angeben"
 
-#: 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:132
 #, c-format
 msgid "could not create leading directories for '%s'"
 msgstr "konnte vorangehende Verzeichnisse für '%s' nicht erstellen"
 
-#: builtin/bugreport.c:139
 msgid "System Info"
 msgstr "System Info"
 
-#: builtin/bugreport.c:142
 msgid "Enabled Hooks"
 msgstr "Aktivierte Hooks"
 
-#: builtin/bugreport.c:149
 #, c-format
 msgid "unable to write to %s"
 msgstr "konnte nicht nach %s schreiben"
 
-#: builtin/bugreport.c:159
 #, c-format
 msgid "Created new report at '%s'.\n"
 msgstr "Neuer Bericht unter '%s' erstellt.\n"
 
-#: builtin/bundle.c:15 builtin/bundle.c:23
 msgid "git bundle create [<options>] <file> <git-rev-list args>"
 msgstr "git bundle create [<Optionen>] <Datei> <git-rev-list Argumente>"
 
-#: builtin/bundle.c:16 builtin/bundle.c:28
 msgid "git bundle verify [<options>] <file>"
 msgstr "git bundle verify [<Optionen>] <Datei>"
 
-#: builtin/bundle.c:17 builtin/bundle.c:33
 msgid "git bundle list-heads <file> [<refname>...]"
 msgstr "git bundle list-heads <Datei> [<Referenzname>...]"
 
-#: builtin/bundle.c:18 builtin/bundle.c:38
 msgid "git bundle unbundle <file> [<refname>...]"
 msgstr "git bundle unbundle <Datei> [<Referenzname>...]"
 
-#: builtin/bundle.c:65 builtin/pack-objects.c:3899
 msgid "do not show progress meter"
 msgstr "keine Fortschrittsanzeige anzeigen"
 
-#: builtin/bundle.c:67 builtin/bundle.c:168 builtin/pack-objects.c:3901
 msgid "show progress meter"
 msgstr "Fortschrittsanzeige anzeigen"
 
-#: builtin/bundle.c:69 builtin/pack-objects.c:3903
 msgid "show progress meter during object writing phase"
 msgstr "Forschrittsanzeige während des Schreibens von Objekten anzeigen"
 
-#: builtin/bundle.c:72 builtin/pack-objects.c:3906
 msgid "similar to --all-progress when progress meter is shown"
 msgstr "ähnlich zu --all-progress wenn Fortschrittsanzeige darstellt wird"
 
-#: builtin/bundle.c:74
 msgid "specify bundle format version"
 msgstr "Version des Paket-Formats angeben"
 
-#: 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:108
 msgid "do not show bundle details"
 msgstr "Keine Bundle-Details anzeigen"
 
-#: builtin/bundle.c:127
 #, c-format
 msgid "%s is okay\n"
 msgstr "%s ist in Ordnung\n"
 
-#: builtin/bundle.c:183
 msgid "Need a repository to unbundle."
 msgstr "Zum Entpacken wird ein Repository benötigt."
 
-#: builtin/bundle.c:186
 msgid "Unbundling objects"
 msgstr "Entpacken von Objekten"
 
-#: builtin/bundle.c:220 builtin/remote.c:1758
 #, c-format
 msgid "Unknown subcommand: %s"
 msgstr "Unbekannter Unterbefehl: %s"
 
-#: builtin/cat-file.c:568
+#, c-format
+msgid "cannot read object %s '%s'"
+msgstr "kann Objekt %s '%s' nicht lesen"
+
 msgid "flush is only for --buffer mode"
 msgstr "Flush ist nur für --buffer Modus"
 
-#: builtin/cat-file.c:612
 msgid "empty command in input"
 msgstr "leerer Befehl in der Eingabe"
 
-#: builtin/cat-file.c:614
 #, c-format
 msgid "whitespace before command: '%s'"
 msgstr "Whitespace vor Befehl: '%s'"
 
-#: builtin/cat-file.c:623
 #, c-format
 msgid "%s requires arguments"
 msgstr "%s benötigt Argumente"
 
-#: builtin/cat-file.c:628
 #, c-format
 msgid "%s takes no arguments"
 msgstr "%s braucht kein Argument"
 
-#: builtin/cat-file.c:636
 #, c-format
 msgid "unknown command: '%s'"
 msgstr "unbekannter Befehl: '%s'"
 
-#: builtin/cat-file.c:795
 msgid "only one batch option may be specified"
 msgstr "Nur eine Batch-Option erlaubt."
 
-#: builtin/cat-file.c:824
 msgid "git cat-file <type> <object>"
 msgstr "git cat-file <Typ> <Objekt>"
 
-#: builtin/cat-file.c:825
 msgid "git cat-file (-e | -p) <object>"
 msgstr "git cat-file (-e | -p) <Objekt>"
 
-#: builtin/cat-file.c:826
 msgid "git cat-file (-t | -s) [--allow-unknown-type] <object>"
 msgstr "git cat-file (-t | -s) [--allow-unknown-type] <Objekt>"
 
-#: builtin/cat-file.c:827
 msgid ""
 "git cat-file (--batch | --batch-check | --batch-command) [--batch-all-"
 "objects]\n"
@@ -12702,7 +3267,6 @@ msgstr ""
 "             [--buffer] [--follow-symlinks] [--unordered]\n"
 "             [--textconv | --filters]"
 
-#: builtin/cat-file.c:830
 msgid ""
 "git cat-file (--textconv | --filters)\n"
 "             [<rev>:<path|tree-ish> | --path=<path|tree-ish> <rev>]"
@@ -12711,74 +3275,57 @@ msgstr ""
 "             [<Commit>:<Pfad|Commit-Referenz> | --path=<Pfad|Commit-"
 "Referenz> <Commit>]"
 
-#: builtin/cat-file.c:836
 msgid "Check object existence or emit object contents"
 msgstr "Überprüfen von Objektexistenz oder Ausgeben von Objekt-Inhalten"
 
-#: builtin/cat-file.c:838
 msgid "check if <object> exists"
 msgstr "prüfe, ob <Objekt> vorhanden ist"
 
-#: builtin/cat-file.c:839
 msgid "pretty-print <object> content"
 msgstr "ansprechende Anzeige für <Objekt> Inhalt"
 
-#: builtin/cat-file.c:841
 msgid "Emit [broken] object attributes"
 msgstr "Ausgabe von [fehlerhaften] Objekt-Attributen"
 
-#: builtin/cat-file.c:842
 msgid "show object type (one of 'blob', 'tree', 'commit', 'tag', ...)"
 msgstr "zeige Objekt-Typ (eines von 'blob', 'tree', 'commit', 'tag', ...)"
 
-#: builtin/cat-file.c:843
 msgid "show object size"
 msgstr "Objektgröße anzeigen"
 
-#: builtin/cat-file.c:845
 msgid "allow -s and -t to work with broken/corrupt objects"
 msgstr "-s und -t mit beschädigten Objekten erlauben"
 
-#: builtin/cat-file.c:847
 msgid "Batch objects requested on stdin (or --batch-all-objects)"
 msgstr ""
 "Batch-Objekte von Standard-Eingabe (oder --batch-all-objects) angefordert"
 
-#: builtin/cat-file.c:849
 msgid "show full <object> or <rev> contents"
 msgstr "vollständige Inhalte von <Objekt> oder <Commit> anzeigen"
 
-#: builtin/cat-file.c:853
 msgid "like --batch, but don't emit <contents>"
 msgstr "wie --batch, aber keine Ausgabe von <Inhalten>"
 
-#: builtin/cat-file.c:857
 msgid "read commands from stdin"
 msgstr "Befehle von der Standard-Eingabe lesen"
 
-#: builtin/cat-file.c:861
 msgid "with --batch[-check]: ignores stdin, batches all known objects"
 msgstr ""
 "mit --batch[-check]: ignoriert Standard-Eingabe, Stapelverarbeitung aller "
 "bekannten Objekte"
 
-#: builtin/cat-file.c:863
 msgid "Change or optimize batch output"
 msgstr "Ändern oder Optimieren der Batch-Ausgabe"
 
-#: builtin/cat-file.c:864
 msgid "buffer --batch output"
 msgstr "Ausgabe von --batch puffern"
 
-#: builtin/cat-file.c:866
 msgid "follow in-tree symlinks"
 msgstr "folge symbolische Verknüpfungen in Verzeichnissen"
 
-#: builtin/cat-file.c:868
 msgid "do not order objects before emitting them"
 msgstr "Objekte nicht ordnen, bevor sie ausgegeben werden"
 
-#: builtin/cat-file.c:870
 msgid ""
 "Emit object (blob or tree) with conversion or filter (stand-alone, or with "
 "batch)"
@@ -12786,314 +3333,237 @@ msgstr ""
 "Objekt (Blob oder Verzeichnis) mit Konvertierung oder Filter (eigenständig "
 "oder mit Batch) ausgeben"
 
-#: builtin/cat-file.c:872
 msgid "run textconv on object's content"
 msgstr "eine Textkonvertierung auf Objekt-Inhalte ausführen"
 
-#: builtin/cat-file.c:874
 msgid "run filters on object's content"
 msgstr "Filter auf Objekt-Inhalte ausführen"
 
-#: builtin/cat-file.c:875
 msgid "blob|tree"
 msgstr "Blob|Verzeichnis"
 
-#: builtin/cat-file.c:876
 msgid "use a <path> for (--textconv | --filters); Not with 'batch'"
 msgstr ""
 "nutzen Sie einen <Pfad> für (--textconv | --filters); Nicht mit 'batch'"
 
-#: builtin/cat-file.c:894
 #, c-format
 msgid "'%s=<%s>' needs '%s' or '%s'"
 msgstr "'%s=<%s>' benötigt '%s' oder '%s'"
 
-#: builtin/cat-file.c:896
 msgid "path|tree-ish"
 msgstr "Pfad|Commit-Referenz"
 
-#: builtin/cat-file.c:903 builtin/cat-file.c:906 builtin/cat-file.c:909
 #, c-format
 msgid "'%s' requires a batch mode"
 msgstr "'%s' erfordert einen Batch-Modus"
 
-#: builtin/cat-file.c:921
 #, c-format
 msgid "'-%c' is incompatible with batch mode"
 msgstr "'%c' ist inkompatibel mit dem Batch-Modus"
 
-#: builtin/cat-file.c:924
 msgid "batch modes take no arguments"
 msgstr "Batch-Modi erwarten keine Argumente"
 
-#: builtin/cat-file.c:932 builtin/cat-file.c:935
 #, c-format
 msgid "<rev> required with '%s'"
 msgstr "<Commit> benötigt mit '%s'"
 
-#: builtin/cat-file.c:938
 #, c-format
 msgid "<object> required with '-%c'"
 msgstr "<Objekt> benötigt mit '-%c'"
 
-#: builtin/cat-file.c:943 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:965
-#: builtin/notes.c:987 builtin/prune-packed.c:25 builtin/receive-pack.c:2489
-#: builtin/tag.c:592
 msgid "too many arguments"
 msgstr "zu viele Argumente"
 
-#: builtin/cat-file.c:947
 #, c-format
 msgid "only two arguments allowed in <type> <object> mode, not %d"
 msgstr "nur zwei Argumente im <Typ> <Objekt> Modus erlaubt, nicht %d"
 
-#: builtin/check-attr.c:13
 msgid "git check-attr [-a | --all | <attr>...] [--] <pathname>..."
 msgstr "git check-attr [-a | --all | <Attribut>...] [--] <Pfadname>..."
 
-#: builtin/check-attr.c:14
 msgid "git check-attr --stdin [-z] [-a | --all | <attr>...]"
 msgstr "git check-attr --stdin [-z] [-a | --all | <Attribut>...]"
 
-#: builtin/check-attr.c:21
 msgid "report all attributes set on file"
 msgstr "alle Attribute einer Datei ausgeben"
 
-#: builtin/check-attr.c:22
 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:101
 msgid "read file names from stdin"
 msgstr "Dateinamen von der Standard-Eingabe lesen"
 
-#: builtin/check-attr.c:25 builtin/check-ignore.c:27
 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:1550 builtin/gc.c:550
-#: builtin/worktree.c:565
 msgid "suppress progress reporting"
 msgstr "Fortschrittsanzeige unterdrücken"
 
-#: builtin/check-ignore.c:29
 msgid "show non-matching input paths"
 msgstr "Eingabe-Pfade ohne Übereinstimmungen anzeigen"
 
-#: builtin/check-ignore.c:31
 msgid "ignore index when checking"
 msgstr "Index bei der Prüfung ignorieren"
 
-#: builtin/check-ignore.c:165
 msgid "cannot specify pathnames with --stdin"
 msgstr "Angabe von Pfadnamen kann nicht gemeinsam mit --stdin verwendet werden"
 
-#: builtin/check-ignore.c:168
 msgid "-z only makes sense with --stdin"
 msgstr "-z kann nur mit --stdin verwendet werden"
 
-#: builtin/check-ignore.c:170
 msgid "no path specified"
 msgstr "kein Pfad angegeben"
 
-#: builtin/check-ignore.c:174
 msgid "--quiet is only valid with a single pathname"
 msgstr "--quiet ist nur mit einem einzelnen Pfadnamen gültig"
 
-#: builtin/check-ignore.c:176
 msgid "cannot have both --quiet and --verbose"
 msgstr "--quiet und --verbose können nicht gemeinsam verwendet werden"
 
-#: builtin/check-ignore.c:179
 msgid "--non-matching is only valid with --verbose"
 msgstr "--non-matching ist nur mit --verbose zulässig"
 
-#: builtin/check-mailmap.c:9
 msgid "git check-mailmap [<options>] <contact>..."
 msgstr "git check-mailmap [<Optionen>] <Kontakt>..."
 
-#: builtin/check-mailmap.c:14
 msgid "also read contacts from stdin"
 msgstr "ebenfalls Kontakte von der Standard-Eingabe lesen"
 
-#: builtin/check-mailmap.c:25
 #, c-format
 msgid "unable to parse contact: %s"
 msgstr "konnte Kontakt nicht parsen: %s"
 
-#: builtin/check-mailmap.c:48
 msgid "no contacts specified"
 msgstr "keine Kontakte angegeben"
 
-#: builtin/checkout--worker.c:110
 msgid "git checkout--worker [<options>]"
 msgstr "git checkout--worker [<Optionen>]"
 
-#: builtin/checkout--worker.c:118 builtin/checkout-index.c:235
-#: builtin/column.c:31 builtin/column.c:32 builtin/submodule--helper.c:1878
-#: builtin/submodule--helper.c:1881 builtin/submodule--helper.c:1889
-#: builtin/submodule--helper.c:2716 builtin/worktree.c:563
-#: builtin/worktree.c:808
 msgid "string"
 msgstr "Zeichenkette"
 
-#: builtin/checkout--worker.c:119 builtin/checkout-index.c:236
 msgid "when creating files, prepend <string>"
 msgstr ""
 "wenn Dateien erzeugt werden, stelle <Zeichenkette> dem Dateinamen voran"
 
-#: builtin/checkout-index.c:184
 msgid "git checkout-index [<options>] [--] [<file>...]"
 msgstr "git checkout-index [<Optionen>] [--] [<Datei>...]"
 
-#: builtin/checkout-index.c:201
 msgid "stage should be between 1 and 3 or all"
 msgstr "stage sollte zwischen 1 und 3 oder 'all' sein"
 
-#: builtin/checkout-index.c:219
 msgid "check out all files in the index"
 msgstr "alle Dateien im Index auschecken"
 
-#: builtin/checkout-index.c:221
 msgid "do not skip files with skip-worktree set"
 msgstr "Dateien mit gesetztem skip-worktree nicht überspringen"
 
-#: builtin/checkout-index.c:222
 msgid "force overwrite of existing files"
 msgstr "das Überschreiben bereits existierender Dateien erzwingen"
 
-#: builtin/checkout-index.c:224
 msgid "no warning for existing files and files not in index"
 msgstr ""
 "keine Warnung für existierende Dateien, und Dateien, die sich nicht im Index "
 "befinden"
 
-#: builtin/checkout-index.c:226
 msgid "don't checkout new files"
 msgstr "keine neuen Dateien auschecken"
 
-#: builtin/checkout-index.c:228
 msgid "update stat information in the index file"
 msgstr "Dateiinformationen in der Index-Datei aktualisieren"
 
-#: builtin/checkout-index.c:232
 msgid "read list of paths from the standard input"
 msgstr "eine Liste von Pfaden von der Standard-Eingabe lesen"
 
-#: builtin/checkout-index.c:234
 msgid "write the content to temporary files"
 msgstr "den Inhalt in temporäre Dateien schreiben"
 
-#: builtin/checkout-index.c:238
 msgid "copy out the files from named stage"
 msgstr "Dateien von dem benannten Stand kopieren"
 
-#: builtin/checkout.c:34
 msgid "git checkout [<options>] <branch>"
 msgstr "git checkout [<Optionen>] <Branch>"
 
-#: builtin/checkout.c:35
 msgid "git checkout [<options>] [<branch>] -- <file>..."
 msgstr "git checkout [<Optionen>] [<Branch>] -- <Datei>..."
 
-#: builtin/checkout.c:40
 msgid "git switch [<options>] [<branch>]"
 msgstr "git switch [<Optionen>] [<Branch>]"
 
-#: builtin/checkout.c:45
 msgid "git restore [<options>] [--source=<branch>] <file>..."
 msgstr "git restore [<Optionen>] [--source=<Branch>] <Datei>..."
 
-#: builtin/checkout.c:199 builtin/checkout.c:238
 #, c-format
 msgid "path '%s' does not have our version"
 msgstr "Pfad '%s' hat nicht unsere Version"
 
-#: builtin/checkout.c:201 builtin/checkout.c:240
 #, c-format
 msgid "path '%s' does not have their version"
 msgstr "Pfad '%s' hat nicht deren Version"
 
-#: builtin/checkout.c:217
 #, c-format
 msgid "path '%s' does not have all necessary versions"
 msgstr "Pfad '%s' hat nicht alle notwendigen Versionen"
 
-#: builtin/checkout.c:271
 #, c-format
 msgid "path '%s' does not have necessary versions"
 msgstr "Pfad '%s' hat nicht die notwendigen Versionen"
 
-#: builtin/checkout.c:291
 #, c-format
 msgid "path '%s': cannot merge"
 msgstr "Pfad '%s': kann nicht zusammenführen"
 
-#: builtin/checkout.c:307
 #, c-format
 msgid "Unable to add merge result for '%s'"
 msgstr "Konnte Merge-Ergebnis von '%s' nicht hinzufügen."
 
-#: builtin/checkout.c:424
 #, c-format
 msgid "Recreated %d merge conflict"
 msgid_plural "Recreated %d merge conflicts"
 msgstr[0] "%d Merge-Konflikt wieder erstellt"
 msgstr[1] "%d Merge-Konflikte wieder erstellt"
 
-#: builtin/checkout.c:429
 #, c-format
 msgid "Updated %d path from %s"
 msgid_plural "Updated %d paths from %s"
 msgstr[0] "%d Pfad von %s aktualisiert"
 msgstr[1] "%d Pfade von %s aktualisiert"
 
-#: builtin/checkout.c:436
 #, c-format
 msgid "Updated %d path from the index"
 msgid_plural "Updated %d paths from the index"
 msgstr[0] "%d Pfad vom Index aktualisiert"
 msgstr[1] "%d Pfade vom Index aktualisiert"
 
-#: builtin/checkout.c:459 builtin/checkout.c:462 builtin/checkout.c:465
-#: builtin/checkout.c:469
 #, c-format
 msgid "'%s' cannot be used with updating paths"
 msgstr "'%s' kann nicht mit der Aktualisierung von Pfaden verwendet werden"
 
-#: builtin/checkout.c:479
 #, c-format
 msgid "Cannot update paths and switch to branch '%s' at the same time."
 msgstr ""
 "Kann nicht gleichzeitig Pfade aktualisieren und zu Branch '%s' wechseln"
 
-#: builtin/checkout.c:483
 #, c-format
 msgid "neither '%s' or '%s' is specified"
 msgstr "Weder '%s' noch '%s' ist angegeben"
 
-#: builtin/checkout.c:487
 #, c-format
 msgid "'%s' must be used when '%s' is not specified"
 msgstr "'%s' kann nur genutzt werden, wenn '%s' nicht verwendet wird"
 
-#: builtin/checkout.c:492 builtin/checkout.c:497
 #, c-format
 msgid "'%s' or '%s' cannot be used with %s"
 msgstr "'%s' oder '%s' kann nicht mit %s verwendet werden"
 
-#: builtin/checkout.c:571 builtin/checkout.c:578
 #, c-format
 msgid "path '%s' is unmerged"
 msgstr "Pfad '%s' ist nicht zusammengeführt"
 
-#: builtin/checkout.c:753
 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:809
 #, c-format
 msgid ""
 "cannot continue with staged changes in the following files:\n"
@@ -13102,50 +3572,40 @@ msgstr ""
 "Kann nicht mit vorgemerkten Änderungen in folgenden Dateien fortsetzen:\n"
 "%s"
 
-#: builtin/checkout.c:902
 #, 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:947
 msgid "HEAD is now at"
 msgstr "HEAD ist jetzt bei"
 
-#: builtin/checkout.c:951 builtin/clone.c:615 t/helper/test-fast-rebase.c:203
 msgid "unable to update HEAD"
 msgstr "Konnte HEAD nicht aktualisieren."
 
-#: builtin/checkout.c:955
 #, c-format
 msgid "Reset branch '%s'\n"
 msgstr "Setze Branch '%s' neu\n"
 
-#: builtin/checkout.c:958
 #, c-format
 msgid "Already on '%s'\n"
 msgstr "Bereits auf '%s'\n"
 
-#: builtin/checkout.c:962
 #, c-format
 msgid "Switched to and reset branch '%s'\n"
 msgstr "Zu umgesetztem Branch '%s' gewechselt\n"
 
-#: builtin/checkout.c:964 builtin/checkout.c:1398
 #, c-format
 msgid "Switched to a new branch '%s'\n"
 msgstr "Zu neuem Branch '%s' gewechselt\n"
 
-#: builtin/checkout.c:966
 #, c-format
 msgid "Switched to branch '%s'\n"
 msgstr "Zu Branch '%s' gewechselt\n"
 
-#: builtin/checkout.c:1017
 #, c-format
 msgid " ... and %d more.\n"
 msgstr " ... und %d weitere.\n"
 
-#: builtin/checkout.c:1023
 #, c-format
 msgid ""
 "Warning: you are leaving %d commit behind, not connected to\n"
@@ -13168,7 +3628,6 @@ msgstr[1] ""
 "\n"
 "%s\n"
 
-#: builtin/checkout.c:1042
 #, c-format
 msgid ""
 "If you want to keep it by creating a new branch, this may be a good time\n"
@@ -13195,19 +3654,15 @@ msgstr[1] ""
 " git branch <neuer-Branchname> %s\n"
 "\n"
 
-#: builtin/checkout.c:1077
 msgid "internal error in revision walk"
 msgstr "interner Fehler im Revisionsgang"
 
-#: builtin/checkout.c:1081
 msgid "Previous HEAD position was"
 msgstr "Vorherige Position von HEAD war"
 
-#: builtin/checkout.c:1124 builtin/checkout.c:1393
 msgid "You are on a branch yet to be born"
 msgstr "Sie sind auf einem Branch, der noch nicht geboren ist"
 
-#: builtin/checkout.c:1206
 #, c-format
 msgid ""
 "'%s' could be both a local file and a tracking branch.\n"
@@ -13217,7 +3672,6 @@ msgstr ""
 "Bitte benutzen Sie -- (und optional --no-guess), um diese\n"
 "eindeutig voneinander zu unterscheiden."
 
-#: builtin/checkout.c:1213
 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"
@@ -13240,58 +3694,47 @@ msgstr ""
 "bevorzugen möchten, z.B. 'origin', können Sie die Einstellung\n"
 "checkout.defaultRemote=origin in Ihrer Konfiguration setzen."
 
-#: builtin/checkout.c:1223
 #, c-format
 msgid "'%s' matched multiple (%d) remote tracking branches"
 msgstr "'%s' entspricht mehreren (%d) Remote-Tracking-Branches"
 
-#: builtin/checkout.c:1289
 msgid "only one reference expected"
 msgstr "nur eine Referenz erwartet"
 
-#: builtin/checkout.c:1306
 #, c-format
 msgid "only one reference expected, %d given."
 msgstr "nur eine Referenz erwartet, %d gegeben."
 
-#: builtin/checkout.c:1352 builtin/worktree.c:338 builtin/worktree.c:508
 #, c-format
 msgid "invalid reference: %s"
 msgstr "Ungültige Referenz: %s"
 
-#: builtin/checkout.c:1365 builtin/checkout.c:1744
 #, c-format
 msgid "reference is not a tree: %s"
 msgstr "Referenz ist kein \"Tree\"-Objekt: %s"
 
-#: builtin/checkout.c:1413
 #, c-format
 msgid "a branch is expected, got tag '%s'"
 msgstr "Ein Branch wird erwartet, Tag '%s' bekommen"
 
-#: builtin/checkout.c:1415
 #, c-format
 msgid "a branch is expected, got remote branch '%s'"
 msgstr "Ein Branch wird erwartet, Remote-Branch '%s' bekommen"
 
-#: builtin/checkout.c:1417 builtin/checkout.c:1426
 #, c-format
 msgid "a branch is expected, got '%s'"
 msgstr "Ein Branch wird erwartet, '%s' bekommen"
 
-#: builtin/checkout.c:1420
 #, c-format
 msgid "a branch is expected, got commit '%s'"
 msgstr "Ein Branch wird erwartet, Commit '%s' bekommen"
 
-#: builtin/checkout.c:1429
 msgid ""
 "If you want to detach HEAD at the commit, try again with the --detach option."
 msgstr ""
 "Wenn Sie HEAD bei dem Commit loslösen möchten, versuchen Sie es erneut mit "
 "der --detach Option."
 
-#: builtin/checkout.c:1442
 msgid ""
 "cannot switch branch while merging\n"
 "Consider \"git merge --quit\" or \"git worktree add\"."
@@ -13299,7 +3742,6 @@ msgstr ""
 "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:1446
 msgid ""
 "cannot switch branch in the middle of an am session\n"
 "Consider \"git am --quit\" or \"git worktree add\"."
@@ -13308,7 +3750,6 @@ msgstr ""
 "werden.\n"
 "Ziehen Sie \"git am --quit\" oder \"git worktree add\" in Betracht."
 
-#: builtin/checkout.c:1450
 msgid ""
 "cannot switch branch while rebasing\n"
 "Consider \"git rebase --quit\" or \"git worktree add\"."
@@ -13317,7 +3758,6 @@ msgstr ""
 "werden.\n"
 "Ziehen Sie \"git rebase --quit\" oder \"git worktree add\" in Betracht."
 
-#: builtin/checkout.c:1454
 msgid ""
 "cannot switch branch while cherry-picking\n"
 "Consider \"git cherry-pick --quit\" or \"git worktree add\"."
@@ -13326,7 +3766,6 @@ msgstr ""
 "gewechselt werden.\n"
 "Ziehen Sie \"git cherry-pick --quit\" oder \"git worktree add\" in Betracht."
 
-#: builtin/checkout.c:1458
 msgid ""
 "cannot switch branch while reverting\n"
 "Consider \"git revert --quit\" or \"git worktree add\"."
@@ -13335,125 +3774,97 @@ msgstr ""
 "werden.\n"
 "Ziehen Sie \"git revert --quit\" oder \"git worktree add\" in Betracht."
 
-#: builtin/checkout.c:1462
 msgid "you are switching branch while bisecting"
 msgstr "Sie wechseln den Branch während einer binären Suche"
 
-#: builtin/checkout.c:1469
 msgid "paths cannot be used with switching branches"
 msgstr "Pfade können nicht beim Wechseln von Branches verwendet werden"
 
-#: builtin/checkout.c:1472 builtin/checkout.c:1476 builtin/checkout.c:1480
 #, c-format
 msgid "'%s' cannot be used with switching branches"
 msgstr "'%s' kann nicht beim Wechseln von Branches verwendet werden"
 
-#: builtin/checkout.c:1484 builtin/checkout.c:1487 builtin/checkout.c:1490
-#: builtin/checkout.c:1495 builtin/checkout.c:1500
 #, c-format
 msgid "'%s' cannot be used with '%s'"
 msgstr "'%s' kann nicht mit '%s' verwendet werden"
 
-#: builtin/checkout.c:1497
 #, c-format
 msgid "'%s' cannot take <start-point>"
 msgstr "'%s' kann nicht <Startpunkt> bekommen"
 
-#: builtin/checkout.c:1505
 #, c-format
 msgid "Cannot switch branch to a non-commit '%s'"
 msgstr "Kann Branch nicht zu Nicht-Commit '%s' wechseln"
 
-#: builtin/checkout.c:1512
 msgid "missing branch or commit argument"
 msgstr "Branch- oder Commit-Argument fehlt"
 
-#: builtin/checkout.c:1555
 msgid "perform a 3-way merge with the new branch"
 msgstr "einen 3-Wege-Merge mit dem neuen Branch ausführen"
 
-#: builtin/checkout.c:1556 builtin/log.c:1844 parse-options.h:354
 msgid "style"
 msgstr "Stil"
 
-#: builtin/checkout.c:1557
 msgid "conflict style (merge, diff3, or zdiff3)"
 msgstr "Konfliktstil (merge, diff3 oder zdiff3)"
 
-#: builtin/checkout.c:1569 builtin/worktree.c:560
 msgid "detach HEAD at named commit"
 msgstr "HEAD bei benanntem Commit loslösen"
 
-#: builtin/checkout.c:1574
 msgid "force checkout (throw away local modifications)"
 msgstr "Auschecken erzwingen (verwirft lokale Änderungen)"
 
-#: builtin/checkout.c:1576
 msgid "new-branch"
 msgstr "neuer Branch"
 
-#: builtin/checkout.c:1576
 msgid "new unparented branch"
 msgstr "neuer Branch ohne Eltern-Commit"
 
-#: builtin/checkout.c:1578 builtin/merge.c:305
 msgid "update ignored files (default)"
 msgstr "ignorierte Dateien aktualisieren (Standard)"
 
-#: builtin/checkout.c:1581
 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:1594
 msgid "checkout our version for unmerged files"
 msgstr "unsere Variante für nicht zusammengeführte Dateien auschecken"
 
-#: builtin/checkout.c:1597
 msgid "checkout their version for unmerged files"
 msgstr "ihre Variante für nicht zusammengeführte Dateien auschecken"
 
-#: builtin/checkout.c:1601
 msgid "do not limit pathspecs to sparse entries only"
 msgstr "keine Einschränkung bei Pfadspezifikationen zum partiellen Auschecken"
 
-#: builtin/checkout.c:1659
 #, c-format
 msgid "options '-%c', '-%c', and '%s' cannot be used together"
 msgstr ""
 "die Optionen '-%c', '-%c' und '%s' können nicht gemeinsam verwendet werden"
 
-#: builtin/checkout.c:1700
 msgid "--track needs a branch name"
 msgstr "--track benötigt ein Branchname"
 
-#: builtin/checkout.c:1705
 #, c-format
 msgid "missing branch name; try -%c"
 msgstr "kein Branchname; versuchen Sie -%c"
 
-#: builtin/checkout.c:1737
 #, c-format
 msgid "could not resolve %s"
 msgstr "konnte %s nicht auflösen"
 
-#: builtin/checkout.c:1753
 msgid "invalid path specification"
 msgstr "ungültige Pfadspezifikation"
 
-#: builtin/checkout.c:1760
 #, 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:1764
 #, 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:1789
 msgid ""
 "git checkout: --ours/--theirs, --force and --merge are incompatible when\n"
 "checking out of the index."
@@ -13461,114 +3872,89 @@ msgstr ""
 "git checkout: --ours/--theirs, --force und --merge sind inkompatibel wenn\n"
 "Sie aus dem Index auschecken."
 
-#: builtin/checkout.c:1794
 msgid "you must specify path(s) to restore"
 msgstr "Sie müssen Pfad(e) zur Wiederherstellung angeben."
 
-#: builtin/checkout.c:1819 builtin/checkout.c:1821 builtin/checkout.c:1873
-#: builtin/checkout.c:1875 builtin/clone.c:130 builtin/remote.c:171
-#: builtin/remote.c:173 builtin/submodule--helper.c:3038
-#: builtin/submodule--helper.c:3371 builtin/worktree.c:556
-#: builtin/worktree.c:558
 msgid "branch"
 msgstr "Branch"
 
-#: builtin/checkout.c:1820
 msgid "create and checkout a new branch"
 msgstr "einen neuen Branch erzeugen und auschecken"
 
-#: builtin/checkout.c:1822
 msgid "create/reset and checkout a branch"
 msgstr "einen Branch erstellen/umsetzen und auschecken"
 
-#: builtin/checkout.c:1823
 msgid "create reflog for new branch"
 msgstr "das Reflog für den neuen Branch erzeugen"
 
-#: builtin/checkout.c:1825
 msgid "second guess 'git checkout <no-such-branch>' (default)"
 msgstr "Zweite Vermutung 'git checkout <kein-solcher-Branch>' (Standard)"
 
-#: builtin/checkout.c:1826
 msgid "use overlay mode (default)"
 msgstr "benutze Overlay-Modus (Standard)"
 
-#: builtin/checkout.c:1874
 msgid "create and switch to a new branch"
 msgstr "einen neuen Branch erzeugen und dahin wechseln"
 
-#: builtin/checkout.c:1876
 msgid "create/reset and switch to a branch"
 msgstr "einen Branch erstellen/umsetzen und dahin wechseln"
 
-#: builtin/checkout.c:1878
 msgid "second guess 'git switch <no-such-branch>'"
 msgstr "Zweite Vermutung 'git switch <kein-solcher-Branch>'"
 
-#: builtin/checkout.c:1880
 msgid "throw away local modifications"
 msgstr "lokale Änderungen verwerfen"
 
-#: builtin/checkout.c:1916
 msgid "which tree-ish to checkout from"
 msgstr "Von welcher Commit-Referenz ausgecheckt werden soll"
 
-#: builtin/checkout.c:1918
 msgid "restore the index"
 msgstr "Index wiederherstellen"
 
-#: builtin/checkout.c:1920
 msgid "restore the working tree (default)"
 msgstr "das Arbeitsverzeichnis wiederherstellen (Standard)"
 
-#: builtin/checkout.c:1922
 msgid "ignore unmerged entries"
 msgstr "ignoriere nicht zusammengeführte Einträge"
 
-#: builtin/checkout.c:1923
 msgid "use overlay mode"
 msgstr "benutze Overlay-Modus"
 
-#: builtin/clean.c:29
 msgid ""
 "git clean [-d] [-f] [-i] [-n] [-q] [-e <pattern>] [-x | -X] [--] <paths>..."
 msgstr ""
 "git clean [-d] [-f] [-i] [-n] [-q] [-e <Muster>] [-x | -X] [--] <Pfade>..."
 
-#: builtin/clean.c:33
 #, c-format
 msgid "Removing %s\n"
 msgstr "Lösche %s\n"
 
-#: builtin/clean.c:34
 #, c-format
 msgid "Would remove %s\n"
 msgstr "Würde %s löschen\n"
 
-#: builtin/clean.c:35
 #, c-format
 msgid "Skipping repository %s\n"
 msgstr "Überspringe Repository %s\n"
 
-#: builtin/clean.c:36
 #, c-format
 msgid "Would skip repository %s\n"
 msgstr "Würde Repository %s überspringen\n"
 
-#: builtin/clean.c:38
+#, c-format
+msgid "failed to remove %s"
+msgstr "Fehler beim Löschen von %s"
+
 #, c-format
 msgid "could not lstat %s\n"
 msgstr "Konnte 'lstat' nicht für %s ausführen\n"
 
-#: builtin/clean.c:39
 msgid "Refusing to remove current working directory\n"
 msgstr "Das aktuelle Arbeitsverzeichnis zu löschen wird verweigert\n"
 
-#: builtin/clean.c:40
 msgid "Would refuse to remove current working directory\n"
 msgstr "Das aktuelle Arbeitsverzeichnis zu löschen würde verweigert werden\n"
 
-#: builtin/clean.c:326 git-add--interactive.perl:593
 #, c-format
 msgid ""
 "Prompt help:\n"
@@ -13581,7 +3967,6 @@ msgstr ""
 "foo        - Element anhand eines eindeutigen Präfix auswählen\n"
 "           - (leer) nichts auswählen\n"
 
-#: builtin/clean.c:330 git-add--interactive.perl:602
 #, c-format
 msgid ""
 "Prompt help:\n"
@@ -13602,33 +3987,26 @@ msgstr ""
 "*          - alle Elemente auswählen\n"
 "           - (leer) Auswahl beenden\n"
 
-#: builtin/clean.c:545 git-add--interactive.perl:568
-#: git-add--interactive.perl:573
 #, c-format, perl-format
 msgid "Huh (%s)?\n"
 msgstr "Wie bitte (%s)?\n"
 
-#: builtin/clean.c:685
 #, c-format
 msgid "Input ignore patterns>> "
 msgstr "Ignorier-Muster eingeben>> "
 
-#: builtin/clean.c:719
 #, c-format
 msgid "WARNING: Cannot find items matched by: %s"
 msgstr "WARNUNG: Kann keine Einträge finden die Muster entsprechen: %s"
 
-#: builtin/clean.c:740
 msgid "Select items to delete"
 msgstr "Wählen Sie Einträge zum Löschen"
 
 #. TRANSLATORS: Make sure to keep [y/N] as is
-#: builtin/clean.c:781
 #, c-format
 msgid "Remove %s [y/N]? "
 msgstr "'%s' löschen [y/N]? "
 
-#: builtin/clean.c:812
 msgid ""
 "clean               - start cleaning\n"
 "filter by pattern   - exclude items from deletion\n"
@@ -13646,52 +4024,38 @@ msgstr ""
 "help                - diese Meldung anzeigen\n"
 "?                   - Hilfe zur Auswahl mittels Eingabe anzeigen"
 
-#: builtin/clean.c:848
 msgid "Would remove the following item:"
 msgid_plural "Would remove the following items:"
 msgstr[0] "Würde das folgende Element entfernen:"
 msgstr[1] "Würde die folgenden Elemente entfernen:"
 
-#: builtin/clean.c:864
 msgid "No more files to clean, exiting."
 msgstr "Keine Dateien mehr zum Löschen, beende."
 
-#: builtin/clean.c:926
 msgid "do not print names of files removed"
 msgstr "keine Namen von gelöschten Dateien ausgeben"
 
-#: builtin/clean.c:928
 msgid "force"
 msgstr "Aktion erzwingen"
 
-#: builtin/clean.c:929
 msgid "interactive cleaning"
 msgstr "interaktives Clean"
 
-#: builtin/clean.c:931
 msgid "remove whole directories"
 msgstr "ganze Verzeichnisse löschen"
 
-#: builtin/clean.c:932 builtin/describe.c:565 builtin/describe.c:567
-#: builtin/grep.c:938 builtin/log.c:185 builtin/log.c:187
-#: builtin/ls-files.c:651 builtin/name-rev.c:585 builtin/name-rev.c:587
-#: builtin/show-ref.c:179
 msgid "pattern"
 msgstr "Muster"
 
-#: builtin/clean.c:933
 msgid "add <pattern> to ignore rules"
 msgstr "<Muster> zu den Regeln für ignorierte Pfade hinzufügen"
 
-#: builtin/clean.c:934
 msgid "remove ignored files, too"
 msgstr "auch ignorierte Dateien löschen"
 
-#: builtin/clean.c:936
 msgid "remove only ignored files"
 msgstr "nur ignorierte Dateien löschen"
 
-#: builtin/clean.c:951
 msgid ""
 "clean.requireForce set to true and neither -i, -n, nor -f given; refusing to "
 "clean"
@@ -13699,7 +4063,6 @@ msgstr ""
 "clean.requireForce auf \"true\" gesetzt und weder -i, -n noch -f gegeben; "
 "\"clean\" verweigert"
 
-#: builtin/clean.c:954
 msgid ""
 "clean.requireForce defaults to true and neither -i, -n, nor -f given; "
 "refusing to clean"
@@ -13707,224 +4070,170 @@ msgstr ""
 "clean.requireForce standardmäßig auf \"true\" gesetzt und weder -i, -n noch -"
 "f gegeben; \"clean\" verweigert"
 
-#: builtin/clean.c:966
 msgid "-x and -X cannot be used together"
 msgstr "-x und -X können nicht gemeinsam verwendet werden"
 
-#: builtin/clone.c:47
 msgid "git clone [<options>] [--] <repo> [<dir>]"
 msgstr "git clone [<Optionen>] [--] <Repository> [<Verzeichnis>]"
 
-#: builtin/clone.c:100
 msgid "don't clone shallow repository"
 msgstr "Repository mit unvollständiger Historie nicht klonen"
 
-#: builtin/clone.c:102
 msgid "don't create a checkout"
 msgstr "kein Auschecken"
 
-#: builtin/clone.c:103 builtin/clone.c:105 builtin/init-db.c:542
 msgid "create a bare repository"
 msgstr "ein Bare-Repository erstellen"
 
-#: builtin/clone.c:107
 msgid "create a mirror repository (implies bare)"
 msgstr "ein Spiegelarchiv erstellen (impliziert bare)"
 
-#: builtin/clone.c:109
 msgid "to clone from a local repository"
 msgstr "von einem lokalen Repository klonen"
 
-#: builtin/clone.c:111
 msgid "don't use local hardlinks, always copy"
 msgstr "lokal keine harten Verweise verwenden, immer Kopien"
 
-#: builtin/clone.c:113
 msgid "setup as shared repository"
 msgstr "als verteiltes Repository einrichten"
 
-#: builtin/clone.c:115
 msgid "pathspec"
 msgstr "Pfadspezifikation"
 
-#: builtin/clone.c:115
 msgid "initialize submodules in the clone"
 msgstr "Submodule im Klon initialisieren"
 
-#: builtin/clone.c:119
 msgid "number of submodules cloned in parallel"
 msgstr "Anzahl der parallel zu klonenden Submodule"
 
-#: builtin/clone.c:120 builtin/init-db.c:539
 msgid "template-directory"
 msgstr "Vorlagenverzeichnis"
 
-#: builtin/clone.c:121 builtin/init-db.c:540
 msgid "directory from which templates will be used"
 msgstr "Verzeichnis, von welchem die Vorlagen verwendet werden"
 
-#: builtin/clone.c:123 builtin/clone.c:125 builtin/submodule--helper.c:1885
-#: builtin/submodule--helper.c:2719 builtin/submodule--helper.c:3378
 msgid "reference repository"
 msgstr "Repository referenzieren"
 
-#: builtin/clone.c:127 builtin/submodule--helper.c:1887
-#: builtin/submodule--helper.c:2721
 msgid "use --reference only while cloning"
 msgstr "--reference nur während des Klonens benutzen"
 
-#: builtin/clone.c:128 builtin/column.c:27 builtin/fmt-merge-msg.c:27
-#: builtin/init-db.c:550 builtin/merge-file.c:48 builtin/merge.c:290
-#: builtin/pack-objects.c:3967 builtin/repack.c:669
-#: builtin/submodule--helper.c:3380 t/helper/test-simple-ipc.c:595
-#: t/helper/test-simple-ipc.c:597
 msgid "name"
 msgstr "Name"
 
-#: builtin/clone.c:129
 msgid "use <name> instead of 'origin' to track upstream"
 msgstr "<Name> statt 'origin' für Upstream-Repository verwenden"
 
-#: builtin/clone.c:131
 msgid "checkout <branch> instead of the remote's HEAD"
 msgstr "<Branch> auschecken, anstatt HEAD des Remote-Repositories"
 
-#: builtin/clone.c:133
 msgid "path to git-upload-pack on the remote"
 msgstr "Pfad zu \"git-upload-pack\" auf der Gegenseite"
 
-#: builtin/clone.c:134 builtin/fetch.c:182 builtin/grep.c:877
-#: builtin/pull.c:212
 msgid "depth"
 msgstr "Tiefe"
 
-#: builtin/clone.c:135
 msgid "create a shallow clone of that depth"
 msgstr ""
 "einen Klon mit unvollständiger Historie (shallow) in dieser Tiefe erstellen"
 
-#: builtin/clone.c:136 builtin/fetch.c:184 builtin/pack-objects.c:3956
-#: builtin/pull.c:215
 msgid "time"
 msgstr "Zeit"
 
-#: builtin/clone.c:137
 msgid "create a shallow clone since a specific time"
 msgstr ""
 "einen Klon mit unvollständiger Historie (shallow) seit einer bestimmten "
 "Zeit\n"
 "erstellen"
 
-#: builtin/clone.c:138 builtin/fetch.c:186 builtin/fetch.c:212
-#: builtin/pull.c:218 builtin/pull.c:243 builtin/rebase.c:1050
 msgid "revision"
 msgstr "Commit"
 
-#: builtin/clone.c:139 builtin/fetch.c:187 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:141 builtin/submodule--helper.c:1897
-#: builtin/submodule--helper.c:2735
 msgid "clone only one branch, HEAD or --branch"
 msgstr "nur einen Branch klonen, HEAD oder --branch"
 
-#: builtin/clone.c:143
 msgid "don't clone any tags, and make later fetches not to follow them"
 msgstr "keine Tags klonen, und auch bei späteren Abrufen nicht beachten"
 
-#: builtin/clone.c:145
 msgid "any cloned submodules will be shallow"
 msgstr "jedes geklonte Submodul mit unvollständiger Historie (shallow)"
 
-#: builtin/clone.c:146 builtin/init-db.c:548
 msgid "gitdir"
 msgstr ".git-Verzeichnis"
 
-#: builtin/clone.c:147 builtin/init-db.c:549
 msgid "separate git dir from working tree"
 msgstr "Git-Verzeichnis vom Arbeitsverzeichnis separieren"
 
-#: builtin/clone.c:148
 msgid "key=value"
 msgstr "Schlüssel=Wert"
 
-#: builtin/clone.c:149
 msgid "set config inside the new repository"
 msgstr "Konfiguration innerhalb des neuen Repositories setzen"
 
-#: builtin/clone.c:151 builtin/fetch.c:207 builtin/ls-remote.c:77
-#: builtin/pull.c:234 builtin/push.c:575 builtin/send-pack.c:200
 msgid "server-specific"
 msgstr "serverspezifisch"
 
-#: builtin/clone.c:151 builtin/fetch.c:207 builtin/ls-remote.c:77
-#: builtin/pull.c:235 builtin/push.c:575 builtin/send-pack.c:201
 msgid "option to transmit"
 msgstr "Option übertragen"
 
-#: builtin/clone.c:152 builtin/fetch.c:208 builtin/pull.c:238
-#: builtin/push.c:576
 msgid "use IPv4 addresses only"
 msgstr "nur IPv4-Adressen benutzen"
 
-#: builtin/clone.c:154 builtin/fetch.c:210 builtin/pull.c:241
-#: builtin/push.c:578
 msgid "use IPv6 addresses only"
 msgstr "nur IPv6-Adressen benutzen"
 
-#: builtin/clone.c:158
 msgid "apply partial clone filters to submodules"
 msgstr "partielle Klonfilter auf Submodule anwenden"
 
-#: builtin/clone.c:160
 msgid "any cloned submodules will use their remote-tracking branch"
 msgstr "jedes geklonte Submodul nutzt seinen Remote-Tracking-Branch"
 
-#: builtin/clone.c:162
 msgid "initialize sparse-checkout file to include only files at root"
 msgstr ""
 "Initialisiere Datei für partiellen Checkout, um nur Dateien im\n"
 "Root-Verzeichnis einzubeziehen"
 
-#: builtin/clone.c:237
 #, 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:310
+#, c-format
+msgid "failed to stat '%s'"
+msgstr "Konnte '%s' nicht lesen"
+
 #, c-format
 msgid "%s exists and is not a directory"
 msgstr "%s existiert und ist kein Verzeichnis"
 
-#: builtin/clone.c:328
 #, c-format
 msgid "failed to start iterator over '%s'"
 msgstr "Fehler beim Starten der Iteration über '%s'"
 
-#: builtin/clone.c:359
+#, c-format
+msgid "failed to unlink '%s'"
+msgstr "Konnte '%s' nicht entfernen."
+
 #, c-format
 msgid "failed to create link '%s'"
 msgstr "Konnte Verweis '%s' nicht erstellen"
 
-#: builtin/clone.c:363
 #, c-format
 msgid "failed to copy file to '%s'"
 msgstr "Konnte Datei nicht nach '%s' kopieren"
 
-#: builtin/clone.c:368
 #, c-format
 msgid "failed to iterate over '%s'"
 msgstr "Fehler beim Iterieren über '%s'"
 
-#: builtin/clone.c:395
 #, c-format
 msgid "done.\n"
 msgstr "Fertig.\n"
 
-#: builtin/clone.c:409
 msgid ""
 "Clone succeeded, but checkout failed.\n"
 "You can inspect what was checked out with 'git status'\n"
@@ -13934,103 +4243,84 @@ msgstr ""
 "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:486
 #, c-format
 msgid "Could not find remote branch %s to clone."
 msgstr "Konnte zu klonenden Remote-Branch %s nicht finden."
 
-#: builtin/clone.c:603
+msgid "remote did not send all necessary objects"
+msgstr "Remote-Repository hat nicht alle erforderlichen Objekte gesendet"
+
 #, c-format
 msgid "unable to update %s"
 msgstr "kann %s nicht aktualisieren"
 
-#: builtin/clone.c:651
 msgid "failed to initialize sparse-checkout"
 msgstr "Fehler beim Initialisieren vom partiellen Checkout."
 
-#: builtin/clone.c:674
 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:709
 msgid "unable to checkout working tree"
 msgstr "Arbeitsverzeichnis konnte nicht ausgecheckt werden"
 
-#: builtin/clone.c:793
 msgid "unable to write parameters to config file"
 msgstr "konnte Parameter nicht in Konfigurationsdatei schreiben"
 
-#: builtin/clone.c:856
 msgid "cannot repack to clean up"
 msgstr "Kann \"repack\" zum Aufräumen nicht aufrufen"
 
-#: builtin/clone.c:858
 msgid "cannot unlink temporary alternates file"
 msgstr "Kann temporäre \"alternates\"-Datei nicht entfernen"
 
-#: builtin/clone.c:901
 msgid "Too many arguments."
 msgstr "Zu viele Argumente."
 
-#: builtin/clone.c:905 contrib/scalar/scalar.c:413
 msgid "You must specify a repository to clone."
 msgstr "Sie müssen ein Repository zum Klonen angeben."
 
-#: builtin/clone.c:918
 #, c-format
 msgid "options '%s' and '%s %s' cannot be used together"
 msgstr "die Optionen '%s' und '%s %s' können nicht gemeinsam verwendet werden"
 
-#: builtin/clone.c:935
 #, c-format
 msgid "repository '%s' does not exist"
 msgstr "Repository '%s' existiert nicht"
 
-#: builtin/clone.c:939 builtin/fetch.c:2176
 #, c-format
 msgid "depth %s is not a positive number"
 msgstr "Tiefe %s ist keine positive Zahl"
 
-#: builtin/clone.c:949
 #, 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:955
 #, 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:969
 #, c-format
 msgid "working tree '%s' already exists."
 msgstr "Arbeitsverzeichnis '%s' existiert bereits."
 
-#: builtin/clone.c:984 builtin/clone.c:1005 builtin/difftool.c:256
-#: builtin/log.c:2037 builtin/worktree.c:350 builtin/worktree.c:382
 #, c-format
 msgid "could not create leading directories of '%s'"
 msgstr "Konnte führende Verzeichnisse von '%s' nicht erstellen."
 
-#: builtin/clone.c:989
 #, c-format
 msgid "could not create work tree dir '%s'"
 msgstr "Konnte Arbeitsverzeichnis '%s' nicht erstellen"
 
-#: builtin/clone.c:1009
 #, c-format
 msgid "Cloning into bare repository '%s'...\n"
 msgstr "Klone in Bare-Repository '%s' ...\n"
 
-#: builtin/clone.c:1011
 #, c-format
 msgid "Cloning into '%s'...\n"
 msgstr "Klone nach '%s'...\n"
 
-#: builtin/clone.c:1040
 msgid ""
 "clone --recursive is not compatible with both --reference and --reference-if-"
 "able"
@@ -14038,102 +4328,86 @@ msgstr ""
 "'clone --recursive' ist nicht kompatibel mit --reference und --reference-if-"
 "able"
 
-#: builtin/clone.c:1116 builtin/remote.c:201 builtin/remote.c:721
 #, 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:1157
 msgid "--depth is ignored in local clones; use file:// instead."
 msgstr ""
 "--depth wird in lokalen Klonen ignoriert; benutzen Sie stattdessen \"file://"
 "\"."
 
-#: builtin/clone.c:1159
 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:1161
 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:1163
 msgid "--filter is ignored in local clones; use file:// instead."
 msgstr ""
 "--filter wird in lokalen Klonen ignoriert; benutzen Sie stattdessen \"file://"
 "\"."
 
-#: builtin/clone.c:1168
+msgid "source repository is shallow, reject to clone."
+msgstr ""
+"Quelle ist ein Repository mit unvollständiger Historie (shallow), Klonen "
+"zurückgewiesen."
+
 msgid "source repository is shallow, ignoring --local"
 msgstr ""
 "Quelle ist ein Repository mit unvollständiger Historie (shallow),\n"
 "ignoriere --local"
 
-#: builtin/clone.c:1173
 msgid "--local is ignored"
 msgstr "--local wird ignoriert"
 
-#: builtin/clone.c:1185
 msgid "cannot clone from filtered bundle"
 msgstr "kann nicht von gefiltertem Bundle klonen"
 
-#: builtin/clone.c:1265 builtin/clone.c:1324
 msgid "remote transport reported error"
 msgstr "Remoteübertragung meldete Fehler"
 
-#: builtin/clone.c:1277 builtin/clone.c:1289
 #, c-format
 msgid "Remote branch %s not found in upstream %s"
 msgstr "Remote-Branch %s nicht im Upstream-Repository %s gefunden"
 
-#: builtin/clone.c:1292
 msgid "You appear to have cloned an empty repository."
 msgstr "Sie scheinen ein leeres Repository geklont zu haben."
 
-#: builtin/column.c:10
 msgid "git column [<options>]"
 msgstr "git column [<Optionen>]"
 
-#: builtin/column.c:27
 msgid "lookup config vars"
 msgstr "Konfigurationsvariablen nachschlagen"
 
-#: builtin/column.c:28 builtin/column.c:29
 msgid "layout to use"
 msgstr "zu verwendende Anordnung"
 
-#: builtin/column.c:30
 msgid "maximum width"
 msgstr "maximale Breite"
 
-#: builtin/column.c:31
 msgid "padding space on left border"
 msgstr "Abstand zum linken Rand auffüllen"
 
-#: builtin/column.c:32
 msgid "padding space on right border"
 msgstr "Abstand zum rechten Rand auffüllen"
 
-#: builtin/column.c:33
 msgid "padding space between columns"
 msgstr "Abstand zwischen Spalten auffüllen"
 
-#: builtin/column.c:51
 msgid "--command must be the first argument"
 msgstr "--command muss an erster Stelle stehen"
 
-#: 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:16
 msgid ""
 "git commit-graph write [--object-dir <objdir>] [--append] [--"
 "split[=<strategy>]] [--reachable|--stdin-packs|--stdin-commits] [--changed-"
@@ -14143,99 +4417,82 @@ msgstr ""
 "split[=<Strategie>]] [--reachable|--stdin-packs|--stdin-commits] [--changed-"
 "paths] [--[no-]max-new-filters <Anzahl>] [--[no-]progress] <Split-Optionen>"
 
-#: builtin/commit-graph.c:51 builtin/fetch.c:196 builtin/log.c:1813
 msgid "dir"
 msgstr "Verzeichnis"
 
-#: builtin/commit-graph.c:52
 msgid "the object directory to store the graph"
 msgstr "das Objektverzeichnis zum Speichern des Graphen"
 
-#: 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:100
 #, c-format
 msgid "Could not open commit-graph '%s'"
 msgstr "Konnte Commit-Graph '%s' nicht öffnen."
 
-#: builtin/commit-graph.c:137
 #, c-format
 msgid "unrecognized --split argument, %s"
 msgstr "nicht erkanntes --split Argument, %s"
 
-#: 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:155
 #, c-format
 msgid "invalid object: %s"
 msgstr "ungültiges Objekt: %s"
 
-#: builtin/commit-graph.c:205
+#, c-format
+msgid "option `%s' expects a numerical value"
+msgstr "Option `%s' erwartet einen numerischen Wert."
+
 msgid "start walk at all refs"
 msgstr "Durchlauf auf allen Referenzen beginnen"
 
-#: 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: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: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:213
 msgid "enable computation for changed paths"
 msgstr "Berechnung für veränderte Pfade aktivieren"
 
-#: 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: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: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:223
 msgid "only expire files older than a given date-time"
 msgstr "nur Objekte älter als angegebene Zeit verfallen lassen"
 
-#: 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: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:282
 msgid "Collecting commits from input"
 msgstr "Sammle Commits von der Standard-Eingabe"
 
-#: builtin/commit-graph.c:328 builtin/multi-pack-index.c:259
 #, 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 "
 "<file>)...] <tree>"
@@ -14243,70 +4500,52 @@ msgstr ""
 "git commit-tree [(-p <Eltern-Commit>)...] [-S[<Key-ID>]] [(-m "
 "<Nachricht>)...] [(-F <Datei>)...] <Tree-Objekt>"
 
-#: builtin/commit-tree.c:31
 #, c-format
 msgid "duplicate parent %s ignored"
 msgstr "doppelter Vorgänger %s ignoriert"
 
-#: builtin/commit-tree.c:56 builtin/commit-tree.c:134 builtin/log.c:590
 #, c-format
 msgid "not a valid object name %s"
 msgstr "Kein gültiger Objektname: %s"
 
-#: 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: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:109
 msgid "parent"
 msgstr "Eltern-Commit"
 
-#: builtin/commit-tree.c:110
 msgid "id of a parent commit object"
 msgstr "ID eines Eltern-Commit-Objektes."
 
-#: builtin/commit-tree.c:112 builtin/commit.c:1626 builtin/merge.c:284
-#: builtin/notes.c:407 builtin/notes.c:573 builtin/stash.c:1666
-#: builtin/tag.c:455
 msgid "message"
 msgstr "Beschreibung"
 
-#: builtin/commit-tree.c:113 builtin/commit.c:1626
 msgid "commit message"
 msgstr "Commit-Beschreibung"
 
-#: builtin/commit-tree.c:116
 msgid "read commit log message from file"
 msgstr "Commit-Beschreibung von Datei lesen"
 
-#: builtin/commit-tree.c:119 builtin/commit.c:1643 builtin/merge.c:303
-#: builtin/pull.c:180 builtin/revert.c:118
 msgid "GPG sign commit"
 msgstr "Commit mit GPG signieren"
 
-#: builtin/commit-tree.c:131
 msgid "must give exactly one tree"
 msgstr "Brauche genau ein Tree-Objekt."
 
-#: builtin/commit-tree.c:138
 msgid "git commit-tree: failed to read"
 msgstr "git commit-tree: Fehler beim Lesen"
 
-#: builtin/commit.c:43
 msgid "git commit [<options>] [--] <pathspec>..."
 msgstr "git commit [<Optionen>] [--] <Pfadspezifikation>..."
 
-#: builtin/commit.c:48
 msgid "git status [<options>] [--] <pathspec>..."
 msgstr "git status [<Optionen>] [--] <Pfadspezifikation>..."
 
-#: builtin/commit.c:53
 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"
@@ -14316,7 +4555,6 @@ msgstr ""
 "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:58
 msgid ""
 "The previous cherry-pick is now empty, possibly due to conflict resolution.\n"
 "If you wish to commit it anyway, use:\n"
@@ -14331,15 +4569,12 @@ msgstr ""
 "    git commit --allow-empty\n"
 "\n"
 
-#: builtin/commit.c:65
 msgid "Otherwise, please use 'git rebase --skip'\n"
 msgstr "Andernfalls benutzen Sie bitte 'git rebase --skip'\n"
 
-#: builtin/commit.c:68
 msgid "Otherwise, please use 'git cherry-pick --skip'\n"
 msgstr "Andernfalls benutzen Sie bitte 'git cherry-pick --skip'\n"
 
-#: builtin/commit.c:71
 msgid ""
 "and then use:\n"
 "\n"
@@ -14361,70 +4596,58 @@ msgstr ""
 "    git cherry-pick --skip\n"
 "\n"
 
-#: builtin/commit.c:326
 msgid "failed to unpack HEAD tree object"
 msgstr "Fehler beim Entpacken des Tree-Objektes von HEAD."
 
-#: builtin/commit.c:376
 msgid "No paths with --include/--only does not make sense."
 msgstr "Keine Pfade mit der Option --include/--only ist nicht sinnvoll."
 
-#: builtin/commit.c:388
 msgid "unable to create temporary index"
 msgstr "Konnte temporären Index nicht erstellen."
 
-#: builtin/commit.c:397
 msgid "interactive add failed"
 msgstr "interaktives Hinzufügen fehlgeschlagen"
 
-#: builtin/commit.c:412
 msgid "unable to update temporary index"
 msgstr "Konnte temporären Index nicht aktualisieren."
 
-#: builtin/commit.c:414
 msgid "Failed to update main cache tree"
 msgstr "Konnte Haupt-Cache-Verzeichnis nicht aktualisieren"
 
-#: builtin/commit.c:439 builtin/commit.c:462 builtin/commit.c:510
 msgid "unable to write new_index file"
 msgstr "Konnte new_index Datei nicht schreiben"
 
-#: builtin/commit.c:491
 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:493
 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:495
 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:503
 msgid "cannot read the index"
 msgstr "Kann Index nicht lesen"
 
-#: builtin/commit.c:522
 msgid "unable to write temporary index file"
 msgstr "Konnte temporäre Index-Datei nicht schreiben."
 
-#: builtin/commit.c:620
 #, c-format
 msgid "commit '%s' lacks author header"
 msgstr "Commit '%s' fehlt Autor-Kopfbereich"
 
-#: builtin/commit.c:622
 #, c-format
 msgid "commit '%s' has malformed author line"
 msgstr "Commit '%s' hat fehlerhafte Autor-Zeile"
 
-#: builtin/commit.c:641
 msgid "malformed --author parameter"
 msgstr "Fehlerhafter --author Parameter"
 
-#: builtin/commit.c:694
+#, c-format
+msgid "invalid date format: %s"
+msgstr "Ungültiges Datumsformat: %s"
+
 msgid ""
 "unable to select a comment character that is not used\n"
 "in the current commit message"
@@ -14432,43 +4655,38 @@ msgstr ""
 "Konnte kein Kommentar-Zeichen auswählen, das nicht in\n"
 "der aktuellen Commit-Beschreibung verwendet wird."
 
-#: builtin/commit.c:750 builtin/commit.c:784 builtin/commit.c:1170
 #, c-format
 msgid "could not lookup commit %s"
 msgstr "Konnte Commit %s nicht nachschlagen"
 
-#: builtin/commit.c:762 builtin/shortlog.c:417
 #, c-format
 msgid "(reading log message from standard input)\n"
 msgstr "(lese Log-Nachricht von Standard-Eingabe)\n"
 
-#: builtin/commit.c:764
 msgid "could not read log from standard input"
 msgstr "Konnte Log nicht von Standard-Eingabe lesen."
 
-#: builtin/commit.c:768
 #, c-format
 msgid "could not read log file '%s'"
 msgstr "Konnte Log-Datei '%s' nicht lesen"
 
-#: builtin/commit.c:805
 #, c-format
 msgid "options '%s' and '%s:%s' cannot be used together"
 msgstr "die Optionen '%s' und '%s:%s' können nicht gemeinsam verwendet werden"
 
-#: builtin/commit.c:817 builtin/commit.c:833
 msgid "could not read SQUASH_MSG"
 msgstr "Konnte SQUASH_MSG nicht lesen"
 
-#: builtin/commit.c:824
 msgid "could not read MERGE_MSG"
 msgstr "Konnte MERGE_MSG nicht lesen"
 
-#: builtin/commit.c:884
+#, c-format
+msgid "could not open '%s'"
+msgstr "Konnte '%s' nicht öffnen"
+
 msgid "could not write commit template"
 msgstr "Konnte Commit-Vorlage nicht schreiben"
 
-#: builtin/commit.c:897
 #, c-format
 msgid ""
 "Please enter the commit message for your changes. Lines starting\n"
@@ -14477,7 +4695,6 @@ msgstr ""
 "Bitte geben Sie eine Commit-Beschreibung für Ihre Änderungen ein. Zeilen,\n"
 "die mit '%c' beginnen, werden ignoriert.\n"
 
-#: builtin/commit.c:899
 #, c-format
 msgid ""
 "Please enter the commit message for your changes. Lines starting\n"
@@ -14487,7 +4704,6 @@ msgstr ""
 "die mit '%c' beginnen, werden ignoriert, und eine leere Beschreibung\n"
 "bricht den Commit ab.\n"
 
-#: builtin/commit.c:903
 #, c-format
 msgid ""
 "Please enter the commit message for your changes. Lines starting\n"
@@ -14497,7 +4713,6 @@ msgstr ""
 "die mit '%c' beginnen, werden beibehalten; wenn Sie möchten, können Sie\n"
 "diese entfernen.\n"
 
-#: builtin/commit.c:907
 #, c-format
 msgid ""
 "Please enter the commit message for your changes. Lines starting\n"
@@ -14510,7 +4725,6 @@ msgstr ""
 "entfernen.\n"
 "Eine leere Beschreibung bricht den Commit ab.\n"
 
-#: builtin/commit.c:919
 msgid ""
 "\n"
 "It looks like you may be committing a merge.\n"
@@ -14524,7 +4738,6 @@ msgstr ""
 "\tgit update-ref -d MERGE_HEAD\n"
 "aus und versuchen Sie es erneut.\n"
 
-#: builtin/commit.c:924
 msgid ""
 "\n"
 "It looks like you may be committing a cherry-pick.\n"
@@ -14538,154 +4751,119 @@ msgstr ""
 "\tgit update-ref -d CHERRY_PICK_HEAD\n"
 "aus und versuchen Sie es erneut.\n"
 
-#: builtin/commit.c:951
 #, c-format
 msgid "%sAuthor:    %.*s <%.*s>"
 msgstr "%sAutor:           %.*s <%.*s>"
 
-#: builtin/commit.c:959
 #, c-format
 msgid "%sDate:      %s"
 msgstr "%sDatum:            %s"
 
-#: builtin/commit.c:966
 #, c-format
 msgid "%sCommitter: %.*s <%.*s>"
 msgstr "%sCommit-Ersteller: %.*s <%.*s>"
 
-#: builtin/commit.c:984
 msgid "Cannot read index"
 msgstr "Kann Index nicht lesen"
 
-#: builtin/commit.c:1029
 msgid "unable to pass trailers to --trailers"
 msgstr "konnte Anhänge nicht an --trailers weitergeben"
 
-#: builtin/commit.c:1069
 msgid "Error building trees"
 msgstr "Fehler beim Erzeugen der \"Tree\"-Objekte"
 
-#: builtin/commit.c:1083 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:1128
 #, 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:1142
 #, c-format
 msgid "Invalid ignored mode '%s'"
 msgstr "Ungültiger ignored-Modus '%s'."
 
-#: builtin/commit.c:1160 builtin/commit.c:1450
 #, c-format
 msgid "Invalid untracked files mode '%s'"
 msgstr "Ungültiger Modus '%s' für unversionierte Dateien"
 
-#: builtin/commit.c:1231
 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:1233
 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:1236
 #, c-format
 msgid "reword option of '%s' and path '%s' cannot be used together"
 msgstr ""
 "Umformulierungsoption von '%s' und Pfad '%s' können nicht gemeinsam "
 "verwendet werden"
 
-#: builtin/commit.c:1238
 #, c-format
 msgid "reword option of '%s' and '%s' cannot be used together"
 msgstr ""
 "Umformulierungsoption von '%s' und '%s' können nicht gemeinsam verwendet "
 "werden"
 
-#: builtin/commit.c:1263
 msgid "You have nothing to amend."
 msgstr "Sie haben nichts zum Nachbessern."
 
-#: builtin/commit.c:1266
 msgid "You are in the middle of a merge -- cannot amend."
 msgstr "Ein Merge ist im Gange -- Nachbesserung nicht möglich."
 
-#: builtin/commit.c:1268
 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:1270
 msgid "You are in the middle of a rebase -- cannot amend."
 msgstr "Ein Rebase ist im Gange -- Nachbesserung nicht möglich."
 
-#: builtin/commit.c:1290
 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:1337
 #, c-format
 msgid "unknown option: --fixup=%s:%s"
 msgstr "unbekannte Option: --fixup=%s:%s"
 
-#: 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:1485 builtin/commit.c:1654
 msgid "show status concisely"
 msgstr "Status im Kurzformat anzeigen"
 
-#: builtin/commit.c:1487 builtin/commit.c:1656
 msgid "show branch information"
 msgstr "Branchinformationen anzeigen"
 
-#: builtin/commit.c:1489
 msgid "show stash information"
 msgstr "Stashinformationen anzeigen"
 
-#: builtin/commit.c:1491 builtin/commit.c:1658
 msgid "compute full ahead/behind values"
 msgstr "voraus/hinterher-Werte berechnen"
 
-#: builtin/commit.c:1493
 msgid "version"
 msgstr "Version"
 
-#: builtin/commit.c:1493 builtin/commit.c:1660 builtin/push.c:551
-#: builtin/worktree.c:765
 msgid "machine-readable output"
 msgstr "maschinenlesbare Ausgabe"
 
-#: builtin/commit.c:1496 builtin/commit.c:1662
 msgid "show status in long format (default)"
 msgstr "Status im Langformat anzeigen (Standard)"
 
-#: builtin/commit.c:1499 builtin/commit.c:1665
 msgid "terminate entries with NUL"
 msgstr "Einträge mit NUL-Zeichen abschließen"
 
-#: builtin/commit.c:1501 builtin/commit.c:1505 builtin/commit.c:1668
-#: builtin/fast-export.c:1172 builtin/fast-export.c:1175
-#: builtin/fast-export.c:1178 builtin/rebase.c:1139 parse-options.h:368
 msgid "mode"
 msgstr "Modus"
 
-#: 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:1506
 msgid ""
 "show ignored files, optional modes: traditional, matching, no. (Default: "
 "traditional)"
@@ -14693,11 +4871,9 @@ msgstr ""
 "ignorierte Dateien anzeigen, optionale Modi: traditional, matching, no. "
 "(Standard: traditional)"
 
-#: builtin/commit.c:1508 parse-options.h:197
 msgid "when"
 msgstr "wann"
 
-#: builtin/commit.c:1509
 msgid ""
 "ignore changes to submodules, optional when: all, dirty, untracked. "
 "(Default: all)"
@@ -14705,195 +4881,152 @@ msgstr ""
 "Änderungen in Submodulen ignorieren, optional wenn: all, dirty, untracked. "
 "(Standard: all)"
 
-#: builtin/commit.c:1511
 msgid "list untracked files in columns"
 msgstr "unversionierte Dateien in Spalten auflisten"
 
-#: builtin/commit.c:1512
 msgid "do not detect renames"
 msgstr "keine Umbenennungen ermitteln"
 
-#: builtin/commit.c:1514
 msgid "detect renames, optionally set similarity index"
 msgstr "Umbenennungen erkennen, optional Index für Gleichheit setzen"
 
-#: 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:1619
 msgid "suppress summary after successful commit"
 msgstr "Zusammenfassung nach erfolgreichem Commit unterdrücken"
 
-#: builtin/commit.c:1620
 msgid "show diff in commit message template"
 msgstr "Unterschiede in Commit-Beschreibungsvorlage anzeigen"
 
-#: builtin/commit.c:1622
 msgid "Commit message options"
 msgstr "Optionen für Commit-Beschreibung"
 
-#: builtin/commit.c:1623 builtin/merge.c:288 builtin/tag.c:457
 msgid "read message from file"
 msgstr "Beschreibung von Datei lesen"
 
-#: builtin/commit.c:1624
 msgid "author"
 msgstr "Autor"
 
-#: builtin/commit.c:1624
 msgid "override author for commit"
 msgstr "Autor eines Commits überschreiben"
 
-#: builtin/commit.c:1625 builtin/gc.c:551
 msgid "date"
 msgstr "Datum"
 
-#: builtin/commit.c:1625
 msgid "override date for commit"
 msgstr "Datum eines Commits überschreiben"
 
-#: builtin/commit.c:1627 builtin/commit.c:1628 builtin/commit.c:1634
-#: parse-options.h:360 ref-filter.h:89
 msgid "commit"
 msgstr "Commit"
 
-#: builtin/commit.c:1627
 msgid "reuse and edit message from specified commit"
 msgstr "Beschreibung des angegebenen Commits wiederverwenden und editieren"
 
-#: 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:1633
 msgid "[(amend|reword):]commit"
 msgstr "[(amend|reword):]Commit"
 
-#: 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:1634
 msgid "use autosquash formatted message to squash specified commit"
 msgstr ""
 "eine autosquash-formatierte Beschreibung beim \"squash\" des angegebenen "
 "Commits verwenden"
 
-#: 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:1636 builtin/interpret-trailers.c:111
 msgid "trailer"
 msgstr "Anhang"
 
-#: builtin/commit.c:1636
 msgid "add custom trailer(s)"
 msgstr "benutzerdefinierte Anhänge hinzufügen"
 
-#: builtin/commit.c:1637 builtin/log.c:1788 builtin/merge.c:306
-#: 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:1638
 msgid "use specified template file"
 msgstr "angegebene Vorlagendatei verwenden"
 
-#: builtin/commit.c:1639
 msgid "force edit of commit"
 msgstr "Bearbeitung des Commits erzwingen"
 
-#: builtin/commit.c:1641
 msgid "include status in commit message template"
 msgstr "Status in die Commit-Beschreibungsvorlage einfügen"
 
-#: builtin/commit.c:1646
 msgid "Commit contents options"
 msgstr "Optionen für Commit-Inhalt"
 
-#: builtin/commit.c:1647
 msgid "commit all changed files"
 msgstr "alle geänderten Dateien committen"
 
-#: builtin/commit.c:1648
 msgid "add specified files to index for commit"
 msgstr "die angegebenen Dateien zusätzlich zum Commit vormerken"
 
-#: builtin/commit.c:1649
 msgid "interactively add files"
 msgstr "interaktives Hinzufügen von Dateien"
 
-#: builtin/commit.c:1650
 msgid "interactively add changes"
 msgstr "interaktives Hinzufügen von Änderungen"
 
-#: builtin/commit.c:1651
 msgid "commit only specified files"
 msgstr "nur die angegebenen Dateien committen"
 
-#: builtin/commit.c:1652
 msgid "bypass pre-commit and commit-msg hooks"
 msgstr "Hooks pre-commit und commit-msg umgehen"
 
-#: builtin/commit.c:1653
 msgid "show what would be committed"
 msgstr "anzeigen, was committet werden würde"
 
-#: builtin/commit.c:1666
 msgid "amend previous commit"
 msgstr "vorherigen Commit ändern"
 
-#: builtin/commit.c:1667
 msgid "bypass post-rewrite hook"
 msgstr "\"post-rewrite hook\" umgehen"
 
-#: builtin/commit.c:1674
 msgid "ok to record an empty change"
 msgstr "Aufzeichnung einer leeren Änderung erlauben"
 
-#: 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:1752
+msgid "could not parse HEAD commit"
+msgstr "Konnte Commit von HEAD nicht analysieren."
+
 #, c-format
 msgid "Corrupt MERGE_HEAD file (%s)"
 msgstr "Beschädigte MERGE_HEAD-Datei (%s)"
 
-#: builtin/commit.c:1759
 msgid "could not read MERGE_MODE"
 msgstr "Konnte MERGE_MODE nicht lesen"
 
-#: builtin/commit.c:1780
 #, c-format
 msgid "could not read commit message: %s"
 msgstr "Konnte Commit-Beschreibung nicht lesen: %s"
 
-#: 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: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:1803
 #, c-format
 msgid "Aborting commit due to empty commit message body.\n"
 msgstr "Commit aufgrund leerer Commit-Beschreibung abgebrochen.\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"
@@ -14904,231 +5037,181 @@ msgstr ""
 "voll und Ihr Kontingent nicht aufgebraucht ist und führen Sie\n"
 "anschließend \"git restore HEAD --staged :/\" zur Wiederherstellung aus."
 
-#: builtin/config.c:11
 msgid "git config [<options>]"
 msgstr "git config [<Optionen>]"
 
-#: builtin/config.c:109 builtin/env--helper.c:27
 #, c-format
 msgid "unrecognized --type argument, %s"
 msgstr "nicht erkanntes --type Argument, %s"
 
-#: builtin/config.c:121
 msgid "only one type at a time"
 msgstr "nur ein Typ erlaubt"
 
-#: builtin/config.c:130
 msgid "Config file location"
 msgstr "Ort der Konfigurationsdatei"
 
-#: builtin/config.c:131
 msgid "use global config file"
 msgstr "globale Konfigurationsdatei verwenden"
 
-#: builtin/config.c:132
 msgid "use system config file"
 msgstr "systemweite Konfigurationsdatei verwenden"
 
-#: builtin/config.c:133
 msgid "use repository config file"
 msgstr "Konfigurationsdatei des Repositories verwenden"
 
-#: builtin/config.c:134
 msgid "use per-worktree config file"
 msgstr "Konfigurationsdatei pro Arbeitsverzeichnis verwenden"
 
-#: builtin/config.c:135
 msgid "use given config file"
 msgstr "die angegebene Konfigurationsdatei verwenden"
 
-#: builtin/config.c:136
 msgid "blob-id"
 msgstr "Blob-Id"
 
-#: builtin/config.c:136
 msgid "read config from given blob object"
 msgstr "Konfiguration von angegebenem Blob-Objekt lesen"
 
-#: builtin/config.c:137
 msgid "Action"
 msgstr "Aktion"
 
-#: builtin/config.c:138
 msgid "get value: name [value-pattern]"
 msgstr "Wert zurückgeben: Name [Wert-Muster]"
 
-#: builtin/config.c:139
 msgid "get all values: key [value-pattern]"
 msgstr "alle Werte zurückgeben: Schlüssel [Wert-Muster]"
 
-#: builtin/config.c:140
 msgid "get values for regexp: name-regex [value-pattern]"
 msgstr "Werte für den regulären Ausdruck zurückgeben: Name-Regex [Wert-Muster]"
 
-#: builtin/config.c:141
 msgid "get value specific for the URL: section[.var] URL"
 msgstr "Wert spezifisch für eine URL zurückgeben: section[.var] URL"
 
-#: builtin/config.c:142
 msgid "replace all matching variables: name value [value-pattern]"
 msgstr "alle passenden Variablen ersetzen: Name Wert [Wert-Muster] "
 
-#: builtin/config.c:143
 msgid "add a new variable: name value"
 msgstr "neue Variable hinzufügen: Name Wert"
 
-#: builtin/config.c:144
 msgid "remove a variable: name [value-pattern]"
 msgstr "eine Variable entfernen: Name [Wert-Muster]"
 
-#: builtin/config.c:145
 msgid "remove all matches: name [value-pattern]"
 msgstr "alle Übereinstimmungen entfernen: Name [Wert-Muster]"
 
-#: builtin/config.c:146
 msgid "rename section: old-name new-name"
 msgstr "eine Sektion umbenennen: alter-Name neuer-Name"
 
-#: builtin/config.c:147
 msgid "remove a section: name"
 msgstr "eine Sektion entfernen: Name"
 
-#: builtin/config.c:148
 msgid "list all"
 msgstr "alles auflisten"
 
-#: builtin/config.c:149
 msgid "use string equality when comparing values to 'value-pattern'"
 msgstr ""
 "nutze String-Gleichheit beim Vergleich von Werten mit dem 'Wert-Muster'"
 
-#: builtin/config.c:150
 msgid "open an editor"
 msgstr "einen Editor öffnen"
 
-#: builtin/config.c:151
 msgid "find the color configured: slot [default]"
 msgstr "die konfigurierte Farbe finden: Slot [Standard]"
 
-#: builtin/config.c:152
 msgid "find the color setting: slot [stdout-is-tty]"
 msgstr "die Farbeinstellung finden: Slot [Standard-Ausgabe-ist-Terminal]"
 
-#: builtin/config.c:153
 msgid "Type"
 msgstr "Typ"
 
-#: builtin/config.c:154 builtin/env--helper.c:42 builtin/hash-object.c:97
 msgid "type"
 msgstr "Art"
 
-#: builtin/config.c:154 builtin/env--helper.c:43
 msgid "value is given this type"
 msgstr "Wert ist mit diesem Typ angegeben"
 
-#: builtin/config.c:155
 msgid "value is \"true\" or \"false\""
 msgstr "Wert ist \"true\" oder \"false\""
 
-#: builtin/config.c:156
 msgid "value is decimal number"
 msgstr "Wert ist eine Dezimalzahl"
 
-#: builtin/config.c:157
 msgid "value is --bool or --int"
 msgstr "Wert ist --bool oder --int"
 
-#: builtin/config.c:158
 msgid "value is --bool or string"
 msgstr "Wert ist --bool oder string"
 
-#: builtin/config.c:159
 msgid "value is a path (file or directory name)"
 msgstr "Wert ist ein Pfad (Datei oder Verzeichnisname)"
 
-#: builtin/config.c:160
 msgid "value is an expiry date"
 msgstr "Wert ist ein Verfallsdatum"
 
-#: builtin/config.c:161
 msgid "Other"
 msgstr "Sonstiges"
 
-#: builtin/config.c:162
 msgid "terminate values with NUL byte"
 msgstr "schließt Werte mit NUL-Byte ab"
 
-#: builtin/config.c:163
 msgid "show variable names only"
 msgstr "nur Variablennamen anzeigen"
 
-#: builtin/config.c:164
 msgid "respect include directives on lookup"
 msgstr "beachtet \"include\"-Direktiven beim Nachschlagen"
 
-#: builtin/config.c:165
 msgid "show origin of config (file, standard input, blob, command line)"
 msgstr ""
 "Ursprung der Konfiguration anzeigen (Datei, Standard-Eingabe, Blob, "
 "Befehlszeile)"
 
-#: builtin/config.c:166
 msgid "show scope of config (worktree, local, global, system, command)"
 msgstr ""
 "Zeige Geltungsbereich der Konfiguration (Arbeitsverzeichnis, lokal, global, "
 "systemweit, Befehl)"
 
-#: builtin/config.c:167 builtin/env--helper.c:45
 msgid "value"
 msgstr "Wert"
 
-#: builtin/config.c:167
 msgid "with --get, use default value when missing entry"
 msgstr "mit --get, benutze den Standardwert, wenn der Eintrag fehlt"
 
-#: builtin/config.c:181
 #, c-format
 msgid "wrong number of arguments, should be %d"
 msgstr "Falsche Anzahl von Argumenten - sollte %d sein."
 
-#: builtin/config.c:183
 #, c-format
 msgid "wrong number of arguments, should be from %d to %d"
 msgstr "falsche Anzahl von Argumenten - sollte zwischen %d und %d sein"
 
-#: builtin/config.c:339
 #, c-format
 msgid "invalid key pattern: %s"
 msgstr "Ungültiges Schlüsselmuster: %s"
 
-#: builtin/config.c:377
+#, c-format
+msgid "invalid pattern: %s"
+msgstr "Ungültiges Muster: %s"
+
 #, c-format
 msgid "failed to format default config value: %s"
 msgstr "Fehler beim Formatieren des Standardkonfigurationswertes: %s"
 
-#: builtin/config.c:441
 #, c-format
 msgid "cannot parse color '%s'"
 msgstr "kann Farbe '%s' nicht parsen"
 
-#: builtin/config.c:483
 msgid "unable to parse default color value"
 msgstr "konnte Standard-Farbwert nicht parsen"
 
-#: builtin/config.c:536 builtin/config.c:833
 msgid "not in a git directory"
 msgstr "nicht in einem Git-Repository"
 
-#: builtin/config.c:539
 msgid "writing to stdin is not supported"
 msgstr "das Schreiben in die Standard-Eingabe wird nicht unterstützt"
 
-#: builtin/config.c:542
 msgid "writing config blobs is not supported"
 msgstr ""
 "das Schreiben von Blob-Objekten für Konfigurationen wird nicht unterstützt"
 
-#: builtin/config.c:627
 #, c-format
 msgid ""
 "# This is Git's per-user configuration file.\n"
@@ -15143,27 +5226,21 @@ msgstr ""
 "#\tname = %s\n"
 "#\temail = %s\n"
 
-#: builtin/config.c:652
 msgid "only one config file at a time"
 msgstr "nur eine Konfigurationsdatei zu einer Zeit möglich"
 
-#: builtin/config.c:658
 msgid "--local can only be used inside a git repository"
 msgstr "--local kann nur innerhalb eines Git-Repositories verwendet werden"
 
-#: builtin/config.c:660
 msgid "--blob can only be used inside a git repository"
 msgstr "--blob kann nur innerhalb eines Git-Repositories verwendet werden"
 
-#: builtin/config.c:662
 msgid "--worktree can only be used inside a git repository"
 msgstr "--worktree kann nur innerhalb eines Git-Repositories verwendet werden"
 
-#: builtin/config.c:684
 msgid "$HOME not set"
 msgstr "$HOME nicht gesetzt"
 
-#: builtin/config.c:708
 msgid ""
 "--worktree cannot be used with multiple working trees unless the config\n"
 "extension worktreeConfig is enabled. Please read \"CONFIGURATION FILE\"\n"
@@ -15174,56 +5251,44 @@ msgstr ""
 "lesen Sie die Sektion \"CONFIGURATION FILE\" in \"git help worktree\" für "
 "Details"
 
-#: builtin/config.c:743
 msgid "--get-color and variable type are incoherent"
 msgstr "Angabe von --get-color und Variablentyp sind ungültig."
 
-#: builtin/config.c:748
 msgid "only one action at a time"
 msgstr "Nur eine Aktion erlaubt."
 
-#: builtin/config.c:761
 msgid "--name-only is only applicable to --list or --get-regexp"
 msgstr "--name-only ist nur anwendbar auf --list oder --get-regexp"
 
-#: builtin/config.c:767
 msgid ""
 "--show-origin is only applicable to --get, --get-all, --get-regexp, and --"
 "list"
 msgstr ""
 "--show-origin ist nur anwendbar auf --get, --get-all, --get-regexp und --list"
 
-#: builtin/config.c:773
 msgid "--default is only applicable to --get"
 msgstr "--default ist nur anwendbar auf --get"
 
-#: builtin/config.c:806
 msgid "--fixed-value only applies with 'value-pattern'"
 msgstr "--fixed-value wird nur zusammen mit 'Wert-Muster' angewendet"
 
-#: builtin/config.c:822
 #, c-format
 msgid "unable to read config file '%s'"
 msgstr "Konnte Konfigurationsdatei '%s' nicht lesen."
 
-#: builtin/config.c:825
 msgid "error processing config file(s)"
 msgstr "Fehler beim Verarbeiten der Konfigurationsdatei(en)."
 
-#: builtin/config.c:835
 msgid "editing stdin is not supported"
 msgstr "Das Bearbeiten der Standard-Eingabe wird nicht unterstützt."
 
-#: builtin/config.c:837
 msgid "editing blobs is not supported"
 msgstr "Das Bearbeiten von Blobs wird nicht unterstützt."
 
-#: builtin/config.c:851
 #, c-format
 msgid "cannot create configuration file %s"
 msgstr "Konnte Konfigurationsdatei '%s' nicht erstellen."
 
-#: builtin/config.c:864
 #, c-format
 msgid ""
 "cannot overwrite multiple values with a single value\n"
@@ -15233,16 +5298,13 @@ msgstr ""
 "       Benutzen Sie einen regulären Ausdruck, --add oder --replace-all, um\n"
 "       %s zu ändern."
 
-#: builtin/config.c:943 builtin/config.c:954
 #, c-format
 msgid "no such section: %s"
 msgstr "Sektion nicht gefunden: %s"
 
-#: builtin/count-objects.c:100
 msgid "print sizes in human readable format"
 msgstr "gibt Größenangaben in menschenlesbaren Format aus"
 
-#: builtin/credential-cache--daemon.c:227
 #, c-format
 msgid ""
 "The permissions on your socket directory are too loose; other\n"
@@ -15258,72 +5320,57 @@ msgstr ""
 "\n"
 "auszuführen."
 
-#: builtin/credential-cache--daemon.c:276
 msgid "print debugging messages to stderr"
 msgstr "Meldungen zur Fehlersuche in Standard-Fehlerausgabe ausgeben"
 
-#: builtin/credential-cache--daemon.c:316
 msgid "credential-cache--daemon unavailable; no unix socket support"
 msgstr ""
 "credential-cache--daemon nicht verfügbar; Unix-Socket wird nicht unterstützt"
 
-#: 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"
 
-#: builtin/credential-store.c:66
 #, c-format
 msgid "unable to get credential storage lock in %d ms"
 msgstr "konnte Sperre für Zugangsdatenspeicher nicht in %d ms bekommen"
 
-#: builtin/describe.c:26
 msgid "git describe [<options>] [<commit-ish>...]"
 msgstr "git describe [<Optionen>] [<Commit-Angabe>...]"
 
-#: builtin/describe.c:27
 msgid "git describe [<options>] --dirty"
 msgstr "git describe [<Optionen>] --dirty"
 
-#: builtin/describe.c:63
 msgid "head"
 msgstr "Branch"
 
-#: builtin/describe.c:63
 msgid "lightweight"
 msgstr "nicht-annotiert"
 
-#: builtin/describe.c:63
 msgid "annotated"
 msgstr "annotiert"
 
-#: builtin/describe.c:277
 #, c-format
 msgid "annotated tag %s not available"
 msgstr "annotiertes Tag %s ist nicht verfügbar"
 
-#: builtin/describe.c:281
 #, c-format
 msgid "tag '%s' is externally known as '%s'"
 msgstr "Tag '%s' ist extern bekannt als '%s'"
 
-#: builtin/describe.c:328
 #, c-format
 msgid "no tag exactly matches '%s'"
 msgstr "kein Tag entspricht exakt '%s'"
 
-#: builtin/describe.c:330
 #, c-format
 msgid "No exact match on refs or tags, searching to describe\n"
 msgstr ""
 "Keine exakte Übereinstimmung bei Referenzen oder Tags, Suche zum "
 "Beschreiben\n"
 
-#: builtin/describe.c:397
 #, c-format
 msgid "finished search at %s\n"
 msgstr "beendete Suche bei %s\n"
 
-#: builtin/describe.c:424
 #, c-format
 msgid ""
 "No annotated tags can describe '%s'.\n"
@@ -15332,7 +5379,6 @@ msgstr ""
 "Keine annotierten Tags können '%s' beschreiben.\n"
 "Jedoch gab es nicht-annotierte Tags: versuchen Sie --tags."
 
-#: builtin/describe.c:428
 #, c-format
 msgid ""
 "No tags can describe '%s'.\n"
@@ -15341,12 +5387,10 @@ msgstr ""
 "Keine Tags können '%s' beschreiben.\n"
 "Versuchen Sie --always oder erstellen Sie einige Tags."
 
-#: builtin/describe.c:458
 #, c-format
 msgid "traversed %lu commits\n"
 msgstr "%lu Commits durchlaufen\n"
 
-#: builtin/describe.c:461
 #, c-format
 msgid ""
 "more than %i tags found; listed %i most recent\n"
@@ -15355,152 +5399,119 @@ msgstr ""
 "mehr als %i Tags gefunden; führe die ersten %i auf\n"
 "Suche bei %s aufgegeben\n"
 
-#: builtin/describe.c:529
 #, c-format
 msgid "describe %s\n"
 msgstr "Beschreibe %s\n"
 
-#: builtin/describe.c:532
 #, c-format
 msgid "Not a valid object name %s"
 msgstr "%s ist kein gültiger Objekt-Name"
 
-#: builtin/describe.c:540
 #, c-format
 msgid "%s is neither a commit nor blob"
 msgstr "%s ist weder ein Commit, noch ein Blob."
 
-#: builtin/describe.c:554
 msgid "find the tag that comes after the commit"
 msgstr "das Tag finden, das nach dem Commit kommt"
 
-#: builtin/describe.c:555
 msgid "debug search strategy on stderr"
 msgstr "die Suchstrategie in der Standard-Fehlerausgabe protokollieren"
 
-#: builtin/describe.c:556
 msgid "use any ref"
 msgstr "alle Referenzen verwenden"
 
-#: builtin/describe.c:557
 msgid "use any tag, even unannotated"
 msgstr "jedes Tag verwenden, auch nicht-annotierte"
 
-#: builtin/describe.c:558
 msgid "always use long format"
 msgstr "immer langes Format verwenden"
 
-#: builtin/describe.c:559
 msgid "only follow first parent"
 msgstr "nur erstem Elternteil folgen"
 
-#: builtin/describe.c:562
 msgid "only output exact matches"
 msgstr "nur exakte Übereinstimmungen ausgeben"
 
-#: builtin/describe.c:564
 msgid "consider <n> most recent tags (default: 10)"
 msgstr "die jüngsten <n> Tags betrachten (Standard: 10)"
 
-#: builtin/describe.c:566
 msgid "only consider tags matching <pattern>"
 msgstr "nur Tags, die <Muster> entsprechen, betrachten"
 
-#: builtin/describe.c:568
 msgid "do not consider tags matching <pattern>"
 msgstr "keine Tags betrachten, die <Muster> entsprechen"
 
-#: builtin/describe.c:570 builtin/name-rev.c:595
 msgid "show abbreviated commit object as fallback"
 msgstr "gekürztes Commit-Objekt anzeigen, wenn sonst nichts zutrifft"
 
-#: builtin/describe.c:571 builtin/describe.c:574
 msgid "mark"
 msgstr "Markierung"
 
-#: builtin/describe.c:572
 msgid "append <mark> on dirty working tree (default: \"-dirty\")"
 msgstr ""
-"<Markierung> bei geändertem Arbeitsverzeichnis anhängen (Standard: \"-dirty"
-"\")"
+"<Markierung> bei geändertem Arbeitsverzeichnis anhängen (Standard: \"-"
+"dirty\")"
 
-#: builtin/describe.c:575
 msgid "append <mark> on broken working tree (default: \"-broken\")"
 msgstr ""
 "<Markierung> bei defektem Arbeitsverzeichnis anhängen (Standard: \"-broken\")"
 
-#: builtin/describe.c:622
 msgid "No names found, cannot describe anything."
 msgstr "Keine Namen gefunden, kann nichts beschreiben."
 
-#: builtin/describe.c:673 builtin/describe.c:675
 #, c-format
 msgid "option '%s' and commit-ishes cannot be used together"
 msgstr "Option '%s' und Commit-Angaben können nicht gemeinsam verwendet werden"
 
-#: builtin/diff-tree.c:157
 msgid "--merge-base only works with two commits"
 msgstr "--merge-base funktioniert nur mit zwei Commits"
 
-#: builtin/diff.c:92
 #, c-format
 msgid "'%s': not a regular file or symlink"
 msgstr "'%s': keine reguläre Datei oder symbolische Verknüpfung"
 
-#: builtin/diff.c:259
 #, c-format
 msgid "invalid option: %s"
 msgstr "Ungültige Option: %s"
 
-#: builtin/diff.c:376
 #, c-format
 msgid "%s...%s: no merge base"
 msgstr "%s...%s: keine Merge-Basis"
 
-#: builtin/diff.c:491
 msgid "Not a git repository"
 msgstr "Kein Git-Repository"
 
-#: builtin/diff.c:537 builtin/grep.c:700
 #, c-format
 msgid "invalid object '%s' given."
 msgstr "Objekt '%s' ist ungültig."
 
-#: builtin/diff.c:548
 #, c-format
 msgid "more than two blobs given: '%s'"
 msgstr "Mehr als zwei Blobs angegeben: '%s'"
 
-#: builtin/diff.c:553
 #, c-format
 msgid "unhandled object '%s' given."
 msgstr "unbehandeltes Objekt '%s' angegeben"
 
-#: builtin/diff.c:587
 #, c-format
 msgid "%s...%s: multiple merge bases, using %s"
 msgstr "%s...%s: mehrere Merge-Basen, nutze %s"
 
-#: builtin/difftool.c:31
 msgid "git difftool [<options>] [<commit> [<commit>]] [--] [<path>...]"
 msgstr "git difftool [<Optionen>] [<Commit> [<Commit>]] [--] [<Pfad>...]"
 
-#: builtin/difftool.c:287
 #, c-format
 msgid "could not read symlink %s"
 msgstr "konnte symbolische Verknüpfung %s nicht lesen"
 
-#: builtin/difftool.c:289
 #, c-format
 msgid "could not read symlink file %s"
 msgstr "Konnte Datei von symbolischer Verknüpfung '%s' nicht lesen."
 
-#: builtin/difftool.c:297
 #, 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:421
 msgid ""
 "combined diff formats ('-c' and '--cc') are not supported in\n"
 "directory diff mode ('-d' and '--dir-diff')."
@@ -15508,59 +5519,50 @@ msgstr ""
 "kombinierte Diff-Formate ('-c' und '--cc') werden im Verzeichnis-\n"
 "Diff-Modus ('-d' und '--dir-diff') nicht unterstützt."
 
-#: builtin/difftool.c:626
 #, c-format
 msgid "both files modified: '%s' and '%s'."
 msgstr "beide Dateien geändert: '%s' und '%s'."
 
-#: builtin/difftool.c:628
 msgid "working tree file has been left."
 msgstr "Datei im Arbeitsverzeichnis belassen."
 
-#: builtin/difftool.c:639
+#, c-format
+msgid "could not copy '%s' to '%s'"
+msgstr "konnte '%s' nicht nach '%s' kopieren"
+
 #, c-format
 msgid "temporary files exist in '%s'."
 msgstr "Es existieren temporäre Dateien in '%s'."
 
-#: builtin/difftool.c:640
 msgid "you may want to cleanup or recover these."
 msgstr "Sie könnten diese aufräumen oder wiederherstellen."
 
-#: builtin/difftool.c:645
 #, c-format
 msgid "failed: %d"
 msgstr "fehlgeschlagen: %d"
 
-#: builtin/difftool.c:690
 msgid "use `diff.guitool` instead of `diff.tool`"
 msgstr "`diff.guitool` statt `diff.tool` benutzen"
 
-#: builtin/difftool.c:692
 msgid "perform a full-directory diff"
 msgstr "Diff über ganzes Verzeichnis ausführen"
 
-#: builtin/difftool.c:694
 msgid "do not prompt before launching a diff tool"
 msgstr "keine Eingabeaufforderung vor Ausführung eines Diff-Tools"
 
-#: builtin/difftool.c:699
 msgid "use symlinks in dir-diff mode"
 msgstr "symbolische Verknüpfungen im dir-diff Modus verwenden"
 
-#: builtin/difftool.c:700
 msgid "tool"
 msgstr "Tool"
 
-#: builtin/difftool.c:701
 msgid "use the specified diff tool"
 msgstr "das angegebene Diff-Tool benutzen"
 
-#: builtin/difftool.c:703
 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:706
 msgid ""
 "make 'git-difftool' exit when an invoked diff tool returns a non-zero exit "
 "code"
@@ -15568,305 +5570,236 @@ msgstr ""
 "'git-difftool' beenden, wenn das aufgerufene Diff-Tool mit einem Exit-Code "
 "ungleich 0 ausgeführt wurde"
 
-#: builtin/difftool.c:709
 msgid "specify a custom command for viewing diffs"
 msgstr "eigenen Befehl zur Anzeige von Unterschieden angeben"
 
-#: builtin/difftool.c:710
 msgid "passed to `diff`"
 msgstr "an `diff` übergeben"
 
-#: builtin/difftool.c:726
 msgid "difftool requires worktree or --no-index"
 msgstr "difftool benötigt Arbeitsverzeichnis oder --no-index"
 
-#: builtin/difftool.c:745
 msgid "no <tool> given for --tool=<tool>"
 msgstr "kein <Tool> für --tool=<Tool> angegeben"
 
-#: builtin/difftool.c:752
 msgid "no <cmd> given for --extcmd=<cmd>"
 msgstr "kein <Programm> für --extcmd=<Programm> angegeben"
 
-#: builtin/env--helper.c:6
 msgid "git env--helper --type=[bool|ulong] <options> <env-var>"
 msgstr "git env--helper --type=[bool|ulong] <Optionen> <Umgebungsvariable>"
 
-#: builtin/env--helper.c:46
 msgid "default for git_env_*(...) to fall back on"
 msgstr "Standard für git_env_*(...), um darauf zurückzugreifen"
 
-#: builtin/env--helper.c:48
 msgid "be quiet only use git_env_*() value as exit code"
 msgstr "Ausgaben unterdrücken; nur git_env_*() Werte als Exit-Code verwenden"
 
-#: builtin/env--helper.c:67
 #, c-format
 msgid "option `--default' expects a boolean value with `--type=bool`, not `%s`"
 msgstr ""
-"Option `--default' erwartet einen booleschen Wert bei `--type=bool`, nicht `"
-"%s`"
+"Option `--default' erwartet einen booleschen Wert bei `--type=bool`, nicht "
+"`%s`"
 
-#: builtin/env--helper.c:82
 #, 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 ""
 "Option `--default' erwartet einen vorzeichenlosen Long-Wert bei `--"
 "type=ulong`, nicht `%s`"
 
-#: builtin/fast-export.c:29
 msgid "git fast-export [<rev-list-opts>]"
 msgstr "git fast-export [<rev-list-opts>]"
 
-#: builtin/fast-export.c:843
 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:1152
 msgid "--anonymize-map token cannot be empty"
 msgstr "Token für --anonymize-map kann nicht leer sein"
 
-#: builtin/fast-export.c:1171
 msgid "show progress after <n> objects"
 msgstr "Fortschritt nach <n> Objekten anzeigen"
 
-#: builtin/fast-export.c:1173
 msgid "select handling of signed tags"
 msgstr "Behandlung von signierten Tags wählen"
 
-#: builtin/fast-export.c:1176
 msgid "select handling of tags that tag filtered objects"
 msgstr "Behandlung von Tags wählen, die gefilterte Objekte markieren"
 
-#: builtin/fast-export.c:1179
 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:1182
 msgid "dump marks to this file"
 msgstr "Markierungen in diese Datei schreiben"
 
-#: builtin/fast-export.c:1184
 msgid "import marks from this file"
 msgstr "Markierungen von dieser Datei importieren"
 
-#: builtin/fast-export.c:1188
 msgid "import marks from this file if it exists"
 msgstr "Markierungen von dieser Datei importieren, wenn diese existiert"
 
-#: builtin/fast-export.c:1190
 msgid "fake a tagger when tags lack one"
 msgstr "einen Tag-Ersteller vortäuschen, wenn das Tag keinen hat"
 
-#: builtin/fast-export.c:1192
 msgid "output full tree for each commit"
 msgstr "für jeden Commit das gesamte Verzeichnis ausgeben"
 
-#: builtin/fast-export.c:1194
 msgid "use the done feature to terminate the stream"
 msgstr "die \"done\"-Funktion benutzen, um den Datenstrom abzuschließen"
 
-#: builtin/fast-export.c:1195
 msgid "skip output of blob data"
 msgstr "Ausgabe von Blob-Daten überspringen"
 
-#: builtin/fast-export.c:1196 builtin/log.c:1860
 msgid "refspec"
 msgstr "Refspec"
 
-#: builtin/fast-export.c:1197
 msgid "apply refspec to exported refs"
 msgstr "Refspec auf exportierte Referenzen anwenden"
 
-#: builtin/fast-export.c:1198
 msgid "anonymize output"
 msgstr "Ausgabe anonymisieren"
 
-#: builtin/fast-export.c:1199
 msgid "from:to"
 msgstr "von:nach"
 
-#: builtin/fast-export.c:1200
 msgid "convert <from> to <to> in anonymized output"
 msgstr "konvertiere <von> zu <nach> in anonymisierter Ausgabe"
 
-#: builtin/fast-export.c:1203
 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:1205
 msgid "show original object ids of blobs/commits"
 msgstr "originale Objekt-IDs von Blobs/Commits anzeigen"
 
-#: builtin/fast-export.c:1207
 msgid "label tags with mark ids"
 msgstr "Tags mit Markierungs-IDs beschriften"
 
-#: builtin/fast-import.c:3097
 #, c-format
 msgid "Missing from marks for submodule '%s'"
 msgstr "Fehlende 'from'-Markierungen für Submodul '%s'"
 
-#: builtin/fast-import.c:3099
 #, c-format
 msgid "Missing to marks for submodule '%s'"
 msgstr "Fehlende 'to'-Markierungen für Submodul '%s'"
 
-#: builtin/fast-import.c:3234
 #, c-format
 msgid "Expected 'mark' command, got %s"
 msgstr "'mark' Befehl erwartet, '%s' bekommen"
 
-#: builtin/fast-import.c:3239
 #, c-format
 msgid "Expected 'to' command, got %s"
 msgstr "'to' Befehl erwartet, '%s' bekommen"
 
-#: builtin/fast-import.c:3331
 msgid "Expected format name:filename for submodule rewrite option"
 msgstr "Format 'Name:Dateiname' für Submodul-Rewrite-Option erwartet"
 
-#: builtin/fast-import.c:3386
 #, c-format
 msgid "feature '%s' forbidden in input without --allow-unsafe-features"
 msgstr "Feature '%s' verboten in Eingabe ohne Option --allow-unsafe-features"
 
-#: builtin/fetch-pack.c:246
 #, c-format
 msgid "Lockfile created but not reported: %s"
 msgstr "Lock-Datei erstellt, aber nicht gemeldet: %s"
 
-#: builtin/fetch.c:36
 msgid "git fetch [<options>] [<repository> [<refspec>...]]"
 msgstr "git fetch [<Optionen>] [<Repository> [<Refspec>...]]"
 
-#: builtin/fetch.c:37
 msgid "git fetch [<options>] <group>"
 msgstr "git fetch [<Optionen>] <Gruppe>"
 
-#: builtin/fetch.c:38
 msgid "git fetch --multiple [<options>] [(<repository> | <group>)...]"
 msgstr "git fetch --multiple [<Optionen>] [(<Repository> | <Gruppe>)...]"
 
-#: builtin/fetch.c:39
 msgid "git fetch --all [<options>]"
 msgstr "git fetch --all [<Optionen>]"
 
-#: builtin/fetch.c:124
 msgid "fetch.parallel cannot be negative"
 msgstr "fetch.parallel kann nicht negativ sein"
 
-#: builtin/fetch.c:147 builtin/pull.c:189
 msgid "fetch from all remotes"
 msgstr "fordert von allen Remote-Repositories an"
 
-#: builtin/fetch.c:149 builtin/pull.c:249
 msgid "set upstream for git pull/fetch"
 msgstr "Upstream für \"git pull/fetch\" setzen"
 
-#: builtin/fetch.c:151 builtin/pull.c:192
 msgid "append to .git/FETCH_HEAD instead of overwriting"
 msgstr "an .git/FETCH_HEAD anhängen statt zu überschreiben"
 
-#: builtin/fetch.c:153
 msgid "use atomic transaction to update references"
 msgstr "atomare Transaktionen nutzen, um Referenzen zu aktualisieren"
 
-#: builtin/fetch.c:155 builtin/pull.c:195
 msgid "path to upload pack on remote end"
 msgstr "Pfad des Programms zum Hochladen von Paketen auf der Gegenseite"
 
-#: builtin/fetch.c:156
 msgid "force overwrite of local reference"
 msgstr "das Überschreiben einer lokalen Referenz erzwingen"
 
-#: builtin/fetch.c:158
 msgid "fetch from multiple remotes"
 msgstr "von mehreren Remote-Repositories anfordern"
 
-#: builtin/fetch.c:160 builtin/pull.c:199
 msgid "fetch all tags and associated objects"
 msgstr "alle Tags und verbundene Objekte anfordern"
 
-#: builtin/fetch.c:162
 msgid "do not fetch all tags (--no-tags)"
 msgstr "nicht alle Tags anfordern (--no-tags)"
 
-#: builtin/fetch.c:164
 msgid "number of submodules fetched in parallel"
 msgstr "Anzahl der parallel anzufordernden Submodule"
 
-#: builtin/fetch.c:166
 msgid "modify the refspec to place all refs within refs/prefetch/"
 msgstr ""
 "Refspec verändern, damit alle Referenzen unter refs/prefetch/ platziert "
 "werden"
 
-#: builtin/fetch.c:168 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 "
 "befinden"
 
-#: builtin/fetch.c:170
 msgid "prune local tags no longer on remote and clobber changed tags"
 msgstr ""
 "lokale Tags entfernen, die sich nicht mehr im Remote-Repository befinden, "
 "und geänderte Tags aktualisieren"
 
-#: builtin/fetch.c:171 builtin/fetch.c:199 builtin/pull.c:123
 msgid "on-demand"
 msgstr "bei-Bedarf"
 
-#: builtin/fetch.c:172
 msgid "control recursive fetching of submodules"
 msgstr "rekursive Anforderungen von Submodulen kontrollieren"
 
-#: builtin/fetch.c:177
 msgid "write fetched references to the FETCH_HEAD file"
 msgstr "schreibe angeforderte Referenzen in die FETCH_HEAD-Datei"
 
-#: builtin/fetch.c:178 builtin/pull.c:210
 msgid "keep downloaded pack"
 msgstr "heruntergeladenes Paket behalten"
 
-#: builtin/fetch.c:180
 msgid "allow updating of HEAD ref"
 msgstr "Aktualisierung der \"HEAD\"-Referenz erlauben"
 
-#: builtin/fetch.c:183 builtin/fetch.c:189 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:185 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:191 builtin/pull.c:225
 msgid "convert to a complete repository"
 msgstr "zu einem vollständigen Repository konvertieren"
 
-#: builtin/fetch.c:194
 msgid "re-fetch without negotiating common commits"
 msgstr "erneutes Abrufen ohne Aushandeln gemeinsamer Commits"
 
-#: builtin/fetch.c:197
 msgid "prepend this to submodule path output"
 msgstr "dies an die Ausgabe der Submodul-Pfade voranstellen"
 
-#: builtin/fetch.c:200
 msgid ""
 "default for recursive fetching of submodules (lower priority than config "
 "files)"
@@ -15874,105 +5807,84 @@ msgstr ""
 "Standard für die rekursive Anforderung von Submodulen (geringere Priorität\n"
 "als Konfigurationsdateien)"
 
-#: builtin/fetch.c:204 builtin/pull.c:228
 msgid "accept refs that update .git/shallow"
 msgstr "Referenzen, die .git/shallow aktualisieren, akzeptieren"
 
-#: builtin/fetch.c:205 builtin/pull.c:230
 msgid "refmap"
 msgstr "Refmap"
 
-#: builtin/fetch.c:206 builtin/pull.c:231
 msgid "specify fetch refmap"
 msgstr "Refmap für 'fetch' angeben"
 
-#: builtin/fetch.c:213 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 "
 "sind"
 
-#: builtin/fetch.c:215
 msgid "do not fetch a packfile; instead, print ancestors of negotiation tips"
 msgstr ""
 "keine Packdatei anfordern; stattdessen die Vorgänger der Verhandlungstipps "
 "anzeigen"
 
-#: builtin/fetch.c:218 builtin/fetch.c:220
 msgid "run 'maintenance --auto' after fetching"
 msgstr "führe 'maintenance --auto' nach \"fetch\" aus"
 
-#: builtin/fetch.c:222 builtin/pull.c:247
 msgid "check for forced-updates on all updated branches"
 msgstr "Prüfe auf erzwungene Aktualisierungen in allen aktualisierten Branches"
 
-#: builtin/fetch.c:224
 msgid "write the commit-graph after fetching"
 msgstr "Schreibe den Commit-Graph nach \"fetch\""
 
-#: builtin/fetch.c:226
 msgid "accept refspecs from stdin"
 msgstr "akzeptiere Refspecs von der Standard-Eingabe"
 
-#: builtin/fetch.c:618
 msgid "couldn't find remote ref HEAD"
 msgstr "konnte Remote-Referenz von HEAD nicht finden"
 
-#: builtin/fetch.c:893
 #, c-format
 msgid "object %s not found"
 msgstr "Objekt %s nicht gefunden"
 
-#: builtin/fetch.c:897
 msgid "[up to date]"
 msgstr "[aktuell]"
 
-#: builtin/fetch.c:909 builtin/fetch.c:927 builtin/fetch.c:999
 msgid "[rejected]"
 msgstr "[zurückgewiesen]"
 
-#: builtin/fetch.c:911
 msgid "can't fetch in current branch"
 msgstr "kann \"fetch\" im aktuellen Branch nicht ausführen"
 
-#: builtin/fetch.c:912
 msgid "checked out in another worktree"
 msgstr "in einem anderen Arbeitsverzeichnis ausgecheckt"
 
-#: builtin/fetch.c:922
 msgid "[tag update]"
 msgstr "[Tag Aktualisierung]"
 
-#: builtin/fetch.c:923 builtin/fetch.c:960 builtin/fetch.c:982
-#: builtin/fetch.c:994
 msgid "unable to update local ref"
 msgstr "kann lokale Referenz nicht aktualisieren"
 
-#: builtin/fetch.c:927
 msgid "would clobber existing tag"
 msgstr "würde bestehende Tags verändern"
 
-#: builtin/fetch.c:949
 msgid "[new tag]"
 msgstr "[neues Tag]"
 
-#: builtin/fetch.c:952
 msgid "[new branch]"
 msgstr "[neuer Branch]"
 
-#: builtin/fetch.c:955
 msgid "[new ref]"
 msgstr "[neue Referenz]"
 
-#: builtin/fetch.c:994
 msgid "forced update"
 msgstr "Aktualisierung erzwungen"
 
-#: builtin/fetch.c:999
 msgid "non-fast-forward"
 msgstr "kein Vorspulen"
 
-#: builtin/fetch.c:1102
+#, c-format
+msgid "cannot open '%s'"
+msgstr "kann '%s' nicht öffnen"
+
 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"
@@ -15983,7 +5895,6 @@ msgstr ""
 "aktivieren, nutzen Sie die Option '--show-forced-updates' oder führen\n"
 "Sie 'git config fetch.showForcedUpdates true' aus."
 
-#: builtin/fetch.c:1106
 #, c-format
 msgid ""
 "it took %.2f seconds to check forced updates; you can use\n"
@@ -15996,24 +5907,20 @@ msgstr ""
 "'git config fetch.showForcedUpdates false' ausführen, um diese Überprüfung\n"
 "zu umgehen.\n"
 
-#: builtin/fetch.c:1136
 #, c-format
 msgid "%s did not send all necessary objects\n"
 msgstr "%s hat nicht alle erforderlichen Objekte gesendet\n"
 
-#: builtin/fetch.c:1156
 #, 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:1259 builtin/fetch.c:1418
 #, c-format
 msgid "From %.*s\n"
 msgstr "Von %.*s\n"
 
-#: builtin/fetch.c:1269
 #, c-format
 msgid ""
 "some local refs could not be updated; try running\n"
@@ -16022,49 +5929,43 @@ msgstr ""
 "Einige lokale Referenzen konnten nicht aktualisiert werden; versuchen Sie\n"
 "'git remote prune %s', um jeden älteren, widersprüchlichen Branch zu löschen."
 
-#: builtin/fetch.c:1377
 #, c-format
 msgid "   (%s will become dangling)"
 msgstr "   (%s wird unreferenziert)"
 
-#: builtin/fetch.c:1378
 #, c-format
 msgid "   (%s has become dangling)"
 msgstr "   (%s wurde unreferenziert)"
 
-#: builtin/fetch.c:1421
 msgid "[deleted]"
 msgstr "[gelöscht]"
 
-#: builtin/fetch.c:1422 builtin/remote.c:1153
 msgid "(none)"
 msgstr "(nichts)"
 
-#: builtin/fetch.c:1446
 #, c-format
 msgid "refusing to fetch into branch '%s' checked out at '%s'"
 msgstr "Anfordern in Branch '%s' verweigert, ausgecheckt in '%s'"
 
-#: builtin/fetch.c:1466
 #, 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:1469
 #, c-format
 msgid "option \"%s\" is ignored for %s\n"
 msgstr "Option \"%s\" wird ignoriert für %s\n"
 
-#: builtin/fetch.c:1496
+#, c-format
+msgid "%s is not a valid object"
+msgstr "%s ist kein gültiges Objekt"
+
 #, c-format
 msgid "the object %s does not exist"
 msgstr "das Objekt %s ist nicht vorhanden"
 
-#: builtin/fetch.c:1748
 msgid "multiple branches detected, incompatible with --set-upstream"
 msgstr "mehrere Branches erkannt, inkompatibel mit --set-upstream"
 
-#: builtin/fetch.c:1760
 #, c-format
 msgid ""
 "could not set upstream of HEAD to '%s' from '%s' when it does not point to "
@@ -16073,19 +5974,15 @@ msgstr ""
 "konnte keinen Upstream-Branch von HEAD auf '%s' von '%s' setzen, da dieser "
 "auf keinen Branch zeigt."
 
-#: builtin/fetch.c:1773
 msgid "not setting upstream for a remote remote-tracking branch"
 msgstr "setze keinen Upstream für einen entfernten Remote-Tracking-Branch"
 
-#: builtin/fetch.c:1775
 msgid "not setting upstream for a remote tag"
 msgstr "setze keinen Upstream für einen Tag eines Remote-Repositories"
 
-#: builtin/fetch.c:1777
 msgid "unknown branch type"
 msgstr "unbekannter Branch-Typ"
 
-#: builtin/fetch.c:1779
 msgid ""
 "no source branch found;\n"
 "you need to specify exactly one branch with the --set-upstream option"
@@ -16093,22 +5990,18 @@ msgstr ""
 "kein Quell-Branch gefunden;\n"
 "Sie müssen bei der Option --set-upstream genau einen Branch angeben"
 
-#: builtin/fetch.c:1904 builtin/fetch.c:1967
 #, c-format
 msgid "Fetching %s\n"
 msgstr "Fordere an von %s\n"
 
-#: builtin/fetch.c:1914 builtin/fetch.c:1969
 #, c-format
 msgid "could not fetch %s"
 msgstr "konnte %s nicht anfordern"
 
-#: builtin/fetch.c:1926
 #, c-format
 msgid "could not fetch '%s' (exit code: %d)\n"
 msgstr "Konnte '%s' nicht anfordern (Exit-Code: %d)\n"
 
-#: builtin/fetch.c:2030
 msgid ""
 "no remote repository specified; please specify either a URL or a\n"
 "remote name from which new revisions should be fetched"
@@ -16117,52 +6010,41 @@ msgstr ""
 "oder den Namen des Remote-Repositories an, von welchem neue\n"
 "Commits angefordert werden sollen"
 
-#: builtin/fetch.c:2066
 msgid "you need to specify a tag name"
 msgstr "Sie müssen den Namen des Tags angeben"
 
-#: builtin/fetch.c:2156
 msgid "--negotiate-only needs one or more --negotiation-tip=*"
 msgstr "--negotiate-only benötigt einen oder mehrere --negotiation-tip=*"
 
-#: builtin/fetch.c:2160
 msgid "negative depth in --deepen is not supported"
 msgstr "negative Tiefe wird von --deepen nicht unterstützt"
 
-#: builtin/fetch.c:2169
 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:2186
 msgid "fetch --all does not take a repository argument"
 msgstr "fetch --all akzeptiert kein Repository als Argument"
 
-#: builtin/fetch.c:2188
 msgid "fetch --all does not make sense with refspecs"
 msgstr "fetch --all kann nicht mit Refspecs verwendet werden"
 
-#: builtin/fetch.c:2197
 #, c-format
 msgid "no such remote or remote group: %s"
 msgstr "Remote-Repository (einzeln oder Gruppe) nicht gefunden: %s"
 
-#: builtin/fetch.c:2205
 msgid "fetching a group and specifying refspecs does not make sense"
 msgstr ""
 "das Abrufen einer Gruppe und die Angabe einer Pfadspezifikation ist nicht "
 "sinnvoll"
 
-#: builtin/fetch.c:2221
 msgid "must supply remote when using --negotiate-only"
 msgstr "Remote wird benötigt, wenn --negotiate-only benutzt wird"
 
-#: builtin/fetch.c:2226
 msgid "protocol does not support --negotiate-only, exiting"
 msgstr "Protokoll unterstützt --negotiate-only nicht, beende"
 
-#: builtin/fetch.c:2246
 msgid ""
 "--filter can only be used with the remote configured in extensions."
 "partialclone"
@@ -16170,151 +6052,117 @@ msgstr ""
 "--filter kann nur mit den Remote-Repositories verwendet werden,\n"
 "die in extensions.partialclone konfiguriert sind"
 
-#: builtin/fetch.c:2250
 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:2254
 msgid "--stdin can only be used when fetching from one remote"
 msgstr ""
 "--stdin kann nur verwendet werden, wenn nur von einem Remote-Repository "
 "abgefragt wird"
 
-#: builtin/fmt-merge-msg.c:7
 msgid ""
 "git fmt-merge-msg [-m <message>] [--log[=<n>] | --no-log] [--file <file>]"
 msgstr ""
 "git fmt-merge-msg [-m <Beschreibung>] [--log[=<n>] | --no-log] [--file "
 "<Datei>]"
 
-#: builtin/fmt-merge-msg.c:19
 msgid "populate log with at most <n> entries from shortlog"
 msgstr "Historie mit höchstens <n> Einträgen von \"shortlog\" hinzufügen"
 
-#: builtin/fmt-merge-msg.c:22
 msgid "alias for --log (deprecated)"
 msgstr "Alias für --log (veraltet)"
 
-#: builtin/fmt-merge-msg.c:25
 msgid "text"
 msgstr "Text"
 
-#: builtin/fmt-merge-msg.c:26
 msgid "use <text> as start of message"
 msgstr "<Text> als Beschreibungsanfang verwenden"
 
-#: builtin/fmt-merge-msg.c:28
 msgid "use <name> instead of the real target branch"
 msgstr "<Name> statt echten Ziel-Branch verwenden"
 
-#: builtin/fmt-merge-msg.c:29
 msgid "file to read from"
 msgstr "Datei zum Einlesen"
 
-#: builtin/for-each-ref.c:10
 msgid "git for-each-ref [<options>] [<pattern>]"
 msgstr "git for-each-ref [<Optionen>] [<Muster>]"
 
-#: builtin/for-each-ref.c:11
 msgid "git for-each-ref [--points-at <object>]"
 msgstr "git for-each-ref [--points-at <Objekt>]"
 
-#: builtin/for-each-ref.c:12
 msgid "git for-each-ref [--merged [<commit>]] [--no-merged [<commit>]]"
 msgstr "git for-each-ref [--merged [<Commit>]] [--no-merged [<Commit>]]"
 
-#: builtin/for-each-ref.c:13
 msgid "git for-each-ref [--contains [<commit>]] [--no-contains [<commit>]]"
 msgstr "git for-each-ref [--contains [<Objekt>]] [--no-contains [<Commit>]]"
 
-#: builtin/for-each-ref.c:31
 msgid "quote placeholders suitably for shells"
 msgstr "Platzhalter als Shell-String formatieren"
 
-#: builtin/for-each-ref.c:33
 msgid "quote placeholders suitably for perl"
 msgstr "Platzhalter als Perl-String formatieren"
 
-#: builtin/for-each-ref.c:35
 msgid "quote placeholders suitably for python"
 msgstr "Platzhalter als Python-String formatieren"
 
-#: builtin/for-each-ref.c:37
 msgid "quote placeholders suitably for Tcl"
 msgstr "Platzhalter als Tcl-String formatieren"
 
-#: builtin/for-each-ref.c:40
 msgid "show only <n> matched refs"
 msgstr "nur <n> passende Referenzen anzeigen"
 
-#: builtin/for-each-ref.c:42 builtin/tag.c:482
 msgid "respect format colors"
 msgstr "Formatfarben beachten"
 
-#: builtin/for-each-ref.c:45
 msgid "print only refs which points at the given object"
 msgstr "nur auf dieses Objekt zeigende Referenzen ausgeben"
 
-#: builtin/for-each-ref.c:47
 msgid "print only refs that are merged"
 msgstr "nur zusammengeführte Referenzen ausgeben"
 
-#: builtin/for-each-ref.c:48
 msgid "print only refs that are not merged"
 msgstr "nur nicht zusammengeführte Referenzen ausgeben"
 
-#: builtin/for-each-ref.c:49
 msgid "print only refs which contain the commit"
 msgstr "nur Referenzen ausgeben, die diesen Commit enthalten"
 
-#: builtin/for-each-ref.c:50
 msgid "print only refs which don't contain the commit"
 msgstr "nur Referenzen ausgeben, die diesen Commit nicht enthalten"
 
-#: builtin/for-each-repo.c:9
 msgid "git for-each-repo --config=<config> <command-args>"
 msgstr "git for-each-repo --config=<Konfiguration> <Befehlsargumente>"
 
-#: builtin/for-each-repo.c:34
 msgid "config"
 msgstr "Konfiguration"
 
-#: builtin/for-each-repo.c:35
 msgid "config key storing a list of repository paths"
 msgstr "Konfigurationsschlüssel für eine Liste von Repository-Pfaden"
 
-#: builtin/for-each-repo.c:43
 msgid "missing --config=<config>"
 msgstr "Option --config=<Konfiguration> fehlt"
 
-#: builtin/fsck.c:69 builtin/fsck.c:128 builtin/fsck.c:129
 msgid "unknown"
 msgstr "unbekannt"
 
 #. 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 "Fehler in %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 "Warnung in %s %s: %s"
 
-#: builtin/fsck.c:124 builtin/fsck.c:127
 #, c-format
 msgid "broken link from %7s %s"
 msgstr "fehlerhafte Verknüpfung von %7s %s"
 
-#: builtin/fsck.c:136
 msgid "wrong object type in link"
 msgstr "falscher Objekttyp in Verknüpfung"
 
-#: builtin/fsck.c:152
 #, c-format
 msgid ""
 "broken link from %7s %s\n"
@@ -16323,357 +6171,296 @@ msgstr ""
 "fehlerhafte Verknüpfung von %7s %s\n"
 "                       nach %7s %s"
 
-#: builtin/fsck.c:264
+msgid "Checking connectivity"
+msgstr "Prüfe Konnektivität"
+
 #, c-format
 msgid "missing %s %s"
 msgstr "%s %s fehlt"
 
-#: builtin/fsck.c:291
 #, c-format
 msgid "unreachable %s %s"
 msgstr "%s %s nicht erreichbar"
 
-#: builtin/fsck.c:311
 #, c-format
 msgid "dangling %s %s"
 msgstr "%s %s unreferenziert"
 
-#: builtin/fsck.c:321
 msgid "could not create lost-found"
 msgstr "Konnte lost-found nicht erstellen."
 
-#: builtin/fsck.c:332
+#, c-format
+msgid "could not write '%s'"
+msgstr "Konnte '%s' nicht schreiben."
+
 #, c-format
 msgid "could not finish '%s'"
 msgstr "Konnte '%s' nicht abschließen."
 
-#: builtin/fsck.c:349
 #, c-format
 msgid "Checking %s"
 msgstr "Prüfe %s"
 
-#: builtin/fsck.c:387
 #, c-format
 msgid "Checking connectivity (%d objects)"
 msgstr "Prüfe Konnektivität (%d Objekte)"
 
-#: builtin/fsck.c:406
 #, c-format
 msgid "Checking %s %s"
 msgstr "Prüfe %s %s"
 
-#: builtin/fsck.c:411
 msgid "broken links"
 msgstr "Fehlerhafte Verknüpfungen"
 
-#: builtin/fsck.c:420
 #, c-format
 msgid "root %s"
 msgstr "Wurzel %s"
 
-#: builtin/fsck.c:428
 #, c-format
 msgid "tagged %s %s (%s) in %s"
 msgstr "%s %s (%s) in %s getaggt"
 
-#: builtin/fsck.c:457
 #, c-format
 msgid "%s: object corrupt or missing"
 msgstr "%s: Objekt fehlerhaft oder nicht vorhanden"
 
-#: builtin/fsck.c:482
 #, c-format
 msgid "%s: invalid reflog entry %s"
 msgstr "%s: Ungültiger Reflog-Eintrag %s"
 
-#: builtin/fsck.c:496
 #, c-format
 msgid "Checking reflog %s->%s"
 msgstr "Prüfe Reflog %s->%s"
 
-#: builtin/fsck.c:530
 #, c-format
 msgid "%s: invalid sha1 pointer %s"
 msgstr "%s: Ungültiger SHA1-Zeiger %s"
 
-#: builtin/fsck.c:537
 #, c-format
 msgid "%s: not a commit"
 msgstr "%s: kein Commit"
 
-#: builtin/fsck.c:591
 msgid "notice: No default references"
 msgstr "Notiz: Keine Standardreferenzen"
 
-#: 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:628
 #, c-format
 msgid "%s: object is of unknown type '%s': %s"
 msgstr "%s: Objekt hat einen unbekannten Typ '%s': %s"
 
-#: builtin/fsck.c:645
 #, c-format
 msgid "%s: object could not be parsed: %s"
 msgstr "%s: Objekt konnte nicht geparst werden: %s"
 
-#: builtin/fsck.c:665
 #, c-format
 msgid "bad sha1 file: %s"
 msgstr "Ungültige SHA1-Datei: %s"
 
-#: builtin/fsck.c:686
 msgid "Checking object directory"
 msgstr "Prüfe Objekt-Verzeichnis"
 
-#: builtin/fsck.c:689
 msgid "Checking object directories"
 msgstr "Prüfe Objekt-Verzeichnisse"
 
-#: builtin/fsck.c:705
 #, c-format
 msgid "Checking %s link"
 msgstr "Prüfe %s Verknüpfung"
 
-#: builtin/fsck.c:710 builtin/index-pack.c:862
 #, c-format
 msgid "invalid %s"
 msgstr "Ungültiger Objekt-Typ %s"
 
-#: builtin/fsck.c:717
 #, c-format
 msgid "%s points to something strange (%s)"
 msgstr "%s zeigt auf etwas seltsames (%s)"
 
-#: builtin/fsck.c:723
 #, c-format
 msgid "%s: detached HEAD points at nothing"
 msgstr "%s: losgelöster HEAD zeigt auf nichts"
 
-#: builtin/fsck.c:727
 #, c-format
 msgid "notice: %s points to an unborn branch (%s)"
 msgstr "Notiz: %s zeigt auf einen ungeborenen Branch (%s)"
 
-#: builtin/fsck.c:739
 msgid "Checking cache tree"
 msgstr "Prüfe Cache-Verzeichnis"
 
-#: builtin/fsck.c:744
 #, c-format
 msgid "%s: invalid sha1 pointer in cache-tree"
 msgstr "%s: Ungültiger SHA1-Zeiger in Cache-Verzeichnis"
 
-#: builtin/fsck.c:753
 msgid "non-tree in cache-tree"
 msgstr "non-tree in Cache-Verzeichnis"
 
-#: builtin/fsck.c:784
 msgid "git fsck [<options>] [<object>...]"
 msgstr "git fsck [<Optionen>] [<Objekt>...]"
 
-#: builtin/fsck.c:790
 msgid "show unreachable objects"
 msgstr "unerreichbare Objekte anzeigen"
 
-#: builtin/fsck.c:791
 msgid "show dangling objects"
 msgstr "unreferenzierte Objekte anzeigen"
 
-#: builtin/fsck.c:792
 msgid "report tags"
 msgstr "Tags melden"
 
-#: builtin/fsck.c:793
 msgid "report root nodes"
 msgstr "Hauptwurzeln melden"
 
-#: builtin/fsck.c:794
 msgid "make index objects head nodes"
 msgstr "Index-Objekte in Erreichbarkeitsprüfung einbeziehen"
 
-#: builtin/fsck.c:795
 msgid "make reflogs head nodes (default)"
 msgstr "Reflogs in Erreichbarkeitsprüfung einbeziehen (Standard)"
 
-#: builtin/fsck.c:796
 msgid "also consider packs and alternate objects"
 msgstr "ebenso Pakete und alternative Objekte betrachten"
 
-#: builtin/fsck.c:797
 msgid "check only connectivity"
 msgstr "nur Konnektivität prüfen"
 
-#: builtin/fsck.c:798 builtin/mktag.c:75
 msgid "enable more strict checking"
 msgstr "genauere Prüfung aktivieren"
 
-#: builtin/fsck.c:800
 msgid "write dangling objects in .git/lost-found"
 msgstr "unreferenzierte Objekte nach .git/lost-found schreiben"
 
-#: builtin/fsck.c:801 builtin/prune.c:146
 msgid "show progress"
 msgstr "Fortschrittsanzeige anzeigen"
 
-#: builtin/fsck.c:802
 msgid "show verbose names for reachable objects"
 msgstr "ausführliche Namen für erreichbare Objekte anzeigen"
 
-#: builtin/fsck.c:862 builtin/index-pack.c:261
 msgid "Checking objects"
 msgstr "Prüfe Objekte"
 
-#: builtin/fsck.c:890
 #, c-format
 msgid "%s: object missing"
 msgstr "%s: Objekt nicht vorhanden"
 
-#: builtin/fsck.c:901
 #, c-format
 msgid "invalid parameter: expected sha1, got '%s'"
 msgstr "Ungültiger Parameter: SHA-1 erwartet, '%s' bekommen"
 
-#: builtin/fsmonitor--daemon.c:13
 msgid "git fsmonitor--daemon start [<options>]"
 msgstr "git fsmonitor--daemon start [<Optionen>]"
 
-#: builtin/fsmonitor--daemon.c:14
 msgid "git fsmonitor--daemon run [<options>]"
 msgstr "git fsmonitor--daemon run [<Optionen>]"
 
-#: builtin/fsmonitor--daemon.c:15
 msgid "git fsmonitor--daemon stop"
 msgstr "git fsmonitor--daemon stop"
 
-#: builtin/fsmonitor--daemon.c:16
 msgid "git fsmonitor--daemon status"
 msgstr "git fsmonitor--daemon status"
 
-#: builtin/fsmonitor--daemon.c:38 builtin/fsmonitor--daemon.c:47
 #, c-format
 msgid "value of '%s' out of range: %d"
 msgstr "Wert von '%s' außerhalb des Bereichs: %d"
 
-#: builtin/fsmonitor--daemon.c:57
 #, c-format
 msgid "value of '%s' not bool or int: %d"
 msgstr "Wert von '%s' ist nicht bool oder int: %d"
 
-#: builtin/fsmonitor--daemon.c:99
 #, c-format
 msgid "fsmonitor-daemon is watching '%s'\n"
 msgstr "fsmonitor-daemon beobachtet '%s'\n"
 
-#: builtin/fsmonitor--daemon.c:104
 #, c-format
 msgid "fsmonitor-daemon is not watching '%s'\n"
 msgstr "fsmonitor-daemon beobachtet '%s nicht'\n"
 
-#: builtin/fsmonitor--daemon.c:170
 #, c-format
 msgid "could not create fsmonitor cookie '%s'"
 msgstr "konnte fsmonitor Cookie '%s' nicht erstellen"
 
-#: builtin/fsmonitor--daemon.c:753
 #, c-format
 msgid "fsmonitor: cookie_result '%d' != SEEN"
 msgstr "fsmonitor: cookie_result '%d' != SEEN"
 
-#: builtin/fsmonitor--daemon.c:1187
 #, c-format
 msgid "could not start IPC thread pool on '%s'"
 msgstr "konnte IPC-Threadpool nicht unter '%s' starten"
 
-#: builtin/fsmonitor--daemon.c:1199
 msgid "could not start fsmonitor listener thread"
 msgstr "konnte Thread für fsmonitor listener nicht starten"
 
-#: builtin/fsmonitor--daemon.c:1297
+msgid "could not start fsmonitor health thread"
+msgstr "konnte Thread für fsmonitor health nicht starten"
+
 msgid "could not initialize listener thread"
 msgstr "konnte listener Thread nicht initialisieren"
 
-#: builtin/fsmonitor--daemon.c:1328 builtin/fsmonitor--daemon.c:1383
+msgid "could not initialize health thread"
+msgstr "konnte health Thread nicht initialisieren"
+
+#, c-format
+msgid "could not cd home '%s'"
+msgstr "konnte nicht zum Home-Verzeichnis '%s' wechseln"
+
 #, c-format
 msgid "fsmonitor--daemon is already running '%s'"
 msgstr "fsmonitor--daemon läuft bereits '%s'"
 
-#: builtin/fsmonitor--daemon.c:1332
 #, c-format
 msgid "running fsmonitor-daemon in '%s'\n"
 msgstr "fsmonitor-daemon wird in '%s' ausgeführt\n"
 
-#: builtin/fsmonitor--daemon.c:1387
 #, c-format
 msgid "starting fsmonitor-daemon in '%s'\n"
 msgstr "starte fsmonitor-daemon unter '%s'\n"
 
-#: builtin/fsmonitor--daemon.c:1413
 msgid "daemon failed to start"
 msgstr "Fehler beim Starten des Daemons"
 
-#: builtin/fsmonitor--daemon.c:1416
 msgid "daemon not online yet"
 msgstr "Daemon ist noch nicht online"
 
-#: builtin/fsmonitor--daemon.c:1419
 msgid "daemon terminated"
 msgstr "Daemon beendet"
 
-#: builtin/fsmonitor--daemon.c:1429
 msgid "detach from console"
 msgstr "von der Konsole loslösen"
 
-#: builtin/fsmonitor--daemon.c:1432
 msgid "use <n> ipc worker threads"
 msgstr "<n> IPC-Arbeitsthreads benutzen"
 
-#: builtin/fsmonitor--daemon.c:1435
 msgid "max seconds to wait for background daemon startup"
 msgstr "maximale Sekunden, um auf Starten des Hintergrund-Daemons zu warten"
 
-#: builtin/fsmonitor--daemon.c:1449
 #, c-format
 msgid "invalid 'ipc-threads' value (%d)"
 msgstr "ungültiger 'ipc-threads' Wert (%d)"
 
-#: builtin/fsmonitor--daemon.c:1464
 #, c-format
 msgid "Unhandled subcommand '%s'"
 msgstr "Nicht behandelter Unterbefehl '%s'"
 
-#: builtin/fsmonitor--daemon.c:1477
 msgid "fsmonitor--daemon not supported on this platform"
 msgstr "fsmonitor--daemon wird auf dieser Plattform nicht unterstützt"
 
-#: builtin/gc.c:39
 msgid "git gc [<options>]"
 msgstr "git gc [<Optionen>]"
 
-#: builtin/gc.c:93
 #, c-format
 msgid "Failed to fstat %s: %s"
 msgstr "Konnte '%s' nicht lesen: %s"
 
-#: builtin/gc.c:129
 #, c-format
 msgid "failed to parse '%s' value '%s'"
 msgstr "Fehler beim Parsen von '%s' mit dem Wert '%s'"
 
-#: builtin/gc.c:488 builtin/init-db.c:57
 #, c-format
 msgid "cannot stat '%s'"
 msgstr "Kann '%s' nicht lesen"
 
-#: builtin/gc.c:504
 #, c-format
 msgid ""
 "The last gc run reported the following. Please correct the root cause\n"
@@ -16689,58 +6476,50 @@ msgstr ""
 "\n"
 "%s"
 
-#: builtin/gc.c:552
 msgid "prune unreferenced objects"
 msgstr "unreferenzierte Objekte entfernen"
 
-#: builtin/gc.c:554
+msgid "pack unreferenced objects separately"
+msgstr "unreferenzierte Objekte separat verpacken"
+
 msgid "be more thorough (increased runtime)"
 msgstr "mehr Gründlichkeit (erhöht Laufzeit)"
 
-#: builtin/gc.c:555
 msgid "enable auto-gc mode"
 msgstr "\"auto-gc\" Modus aktivieren"
 
-#: builtin/gc.c:558
 msgid "force running gc even if there may be another gc running"
 msgstr ""
 "Ausführung von \"git gc\" erzwingen, selbst wenn ein anderes\n"
 "\"git gc\" bereits ausgeführt wird"
 
-#: builtin/gc.c:561
 msgid "repack all other packs except the largest pack"
 msgstr "alle anderen Pakete, außer das größte Paket, neu packen"
 
-#: builtin/gc.c:577
 #, c-format
-msgid "failed to parse gc.logexpiry value %s"
-msgstr "Fehler beim Parsen des Wertes '%s' von gc.logexpiry."
+msgid "failed to parse gc.logExpiry value %s"
+msgstr "Fehler beim Parsen des Wertes '%s' von gc.logExpiry"
 
-#: builtin/gc.c:588
 #, c-format
 msgid "failed to parse prune expiry value %s"
 msgstr "Fehler beim Parsen des \"prune expiry\" Wertes %s"
 
-#: builtin/gc.c:608
 #, c-format
 msgid "Auto packing the repository in background for optimum performance.\n"
 msgstr ""
 "Die Datenbank des Repositories wird für eine optimale Performance im\n"
 "Hintergrund komprimiert.\n"
 
-#: builtin/gc.c:610
 #, c-format
 msgid "Auto packing the repository for optimum performance.\n"
 msgstr ""
 "Die Datenbank des Projektarchivs wird für eine optimale Performance "
 "komprimiert.\n"
 
-#: builtin/gc.c:611
 #, c-format
 msgid "See \"git help gc\" for manual housekeeping.\n"
 msgstr "Siehe \"git help gc\" für manuelles Aufräumen.\n"
 
-#: builtin/gc.c:652
 #, c-format
 msgid ""
 "gc is already running on machine '%s' pid %<PRIuMAX> (use --force if not)"
@@ -16748,494 +6527,386 @@ msgstr ""
 "\"git gc\" wird bereits auf Maschine '%s' pid %<PRIuMAX> ausgeführt\n"
 "(benutzen Sie --force falls nicht)"
 
-#: builtin/gc.c:707
 msgid ""
 "There are too many unreachable loose objects; run 'git prune' to remove them."
 msgstr ""
 "Es gibt zu viele unerreichbare lose Objekte; führen Sie 'git prune' aus, um "
 "diese zu löschen."
 
-#: builtin/gc.c:717
 msgid ""
 "git maintenance run [--auto] [--[no-]quiet] [--task=<task>] [--schedule]"
 msgstr ""
 "git maintenance run [--auto] [--[no-]quiet] [--task=<Aufgabe>] [--schedule]"
 
-#: builtin/gc.c:747
 msgid "--no-schedule is not allowed"
 msgstr "--no-schedule ist nicht erlaubt"
 
-#: builtin/gc.c:752
 #, c-format
 msgid "unrecognized --schedule argument '%s'"
 msgstr "nicht erkanntes --schedule Argument '%s'"
 
-#: builtin/gc.c:870
 msgid "failed to write commit-graph"
 msgstr "Fehler beim Schreiben des Commit-Graph"
 
-#: builtin/gc.c:906
 msgid "failed to prefetch remotes"
 msgstr "Vorabruf der Remote-Repositories fehlgeschlagen"
 
-#: builtin/gc.c:1022
 msgid "failed to start 'git pack-objects' process"
 msgstr "konnte 'git pack-objects' Prozess nicht starten"
 
-#: builtin/gc.c:1039
 msgid "failed to finish 'git pack-objects' process"
 msgstr "konnte 'git pack-objects' Prozess nicht beenden"
 
-#: builtin/gc.c:1090
 msgid "failed to write multi-pack-index"
 msgstr "Fehler beim Schreiben des Multi-Pack-Index"
 
-#: builtin/gc.c:1106
 msgid "'git multi-pack-index expire' failed"
 msgstr "Fehler beim Ausführen von 'git multi-pack-index expire'"
 
-#: builtin/gc.c:1165
 msgid "'git multi-pack-index repack' failed"
 msgstr "Fehler beim Ausführen von 'git multi-pack-index repack'"
 
-#: builtin/gc.c:1174
 msgid ""
 "skipping incremental-repack task because core.multiPackIndex is disabled"
 msgstr ""
 "Überspringen der Aufgabe 'incremental-repack', weil core.multiPackIndex "
 "deaktiviert ist"
 
-#: builtin/gc.c:1278
 #, c-format
 msgid "lock file '%s' exists, skipping maintenance"
 msgstr "Sperrdatei '%s' existiert, Wartung wird übersprungen"
 
-#: builtin/gc.c:1308
 #, c-format
 msgid "task '%s' failed"
 msgstr "Aufgabe '%s' fehlgeschlagen"
 
-#: builtin/gc.c:1390
 #, c-format
 msgid "'%s' is not a valid task"
 msgstr "'%s' ist keine gültige Aufgabe"
 
-#: builtin/gc.c:1395
 #, c-format
 msgid "task '%s' cannot be selected multiple times"
 msgstr "Aufgabe '%s' kann nicht mehrfach ausgewählt werden"
 
-#: builtin/gc.c:1410
 msgid "run tasks based on the state of the repository"
 msgstr "Aufgaben abhängig vom Zustand des Repositories ausführen"
 
-#: builtin/gc.c:1411
 msgid "frequency"
 msgstr "Häufigkeit"
 
-#: builtin/gc.c:1412
 msgid "run tasks based on frequency"
 msgstr "Aufgaben abhängig von der Häufigkeit ausführen"
 
-#: builtin/gc.c:1415
 msgid "do not report progress or other information over stderr"
 msgstr "zeige keinen Fortschritt oder andere Informationen über stderr"
 
-#: builtin/gc.c:1416
 msgid "task"
 msgstr "Aufgabe"
 
-#: builtin/gc.c:1417
 msgid "run a specific task"
 msgstr "eine bestimmte Aufgabe ausführen"
 
-#: builtin/gc.c:1434
 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:1477
 msgid "failed to run 'git config'"
 msgstr "Fehler beim Ausführen von 'git config'"
 
-#: builtin/gc.c:1629
 #, c-format
 msgid "failed to expand path '%s'"
 msgstr "Fehler beim Erweitern des Pfades '%s'"
 
-#: builtin/gc.c:1656 builtin/gc.c:1694
 msgid "failed to start launchctl"
 msgstr "konnte launchctl nicht starten"
 
-#: builtin/gc.c:1769 builtin/gc.c:2237
 #, c-format
 msgid "failed to create directories for '%s'"
 msgstr "Fehler beim Erstellen von Verzeichnissen für '%s'"
 
-#: builtin/gc.c:1796
 #, c-format
 msgid "failed to bootstrap service %s"
 msgstr "Fehler beim Laden des Services %s"
 
-#: builtin/gc.c:1889
 msgid "failed to create temp xml file"
 msgstr "Fehler beim Erstellen der temporären XML-Datei"
 
-#: builtin/gc.c:1979
 msgid "failed to start schtasks"
 msgstr "Fehler beim Starten von schtasks"
 
-#: builtin/gc.c:2063
 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:2080
 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:2084
 msgid "failed to open stdin of 'crontab'"
 msgstr "Fehler beim Öffnen der Standard-Eingabe von 'crontab'"
 
-#: builtin/gc.c:2126
 msgid "'crontab' died"
 msgstr "'crontab' abgebrochen"
 
-#: builtin/gc.c:2191
 msgid "failed to start systemctl"
 msgstr "Fehler beim Starten von systemctl"
 
-#: builtin/gc.c:2201
 msgid "failed to run systemctl"
 msgstr "Fehler beim Ausführen von systemctl"
 
-#: builtin/gc.c:2210 builtin/gc.c:2215 builtin/worktree.c:63
-#: builtin/worktree.c:1024
 #, c-format
 msgid "failed to delete '%s'"
 msgstr "Fehler beim Löschen von '%s'"
 
-#: builtin/gc.c:2395
+#, c-format
+msgid "failed to flush '%s'"
+msgstr "Flush bei '%s' fehlgeschlagen."
+
 #, c-format
 msgid "unrecognized --scheduler argument '%s'"
 msgstr "nicht erkanntes --scheduler Argument '%s'"
 
-#: builtin/gc.c:2420
 msgid "neither systemd timers nor crontab are available"
 msgstr "weder Timer von systemd, noch crontab ist verfügbar"
 
-#: builtin/gc.c:2435
 #, c-format
 msgid "%s scheduler is not available"
 msgstr "%s Scheduler ist nicht verfügbar"
 
-#: builtin/gc.c:2449
 msgid "another process is scheduling background maintenance"
 msgstr "ein anderer Prozess plant die Hintergrundwartung"
 
-#: builtin/gc.c:2471
 msgid "git maintenance start [--scheduler=<scheduler>]"
 msgstr "git maintenance start [--scheduler=<Scheduler>]"
 
-#: builtin/gc.c:2480
 msgid "scheduler"
 msgstr "Scheduler"
 
-#: builtin/gc.c:2481
 msgid "scheduler to trigger git maintenance run"
 msgstr "Scheduler, um \"git maintenance run\" auzuführen"
 
-#: builtin/gc.c:2495
 msgid "failed to add repo to global config"
 msgstr "Repository konnte nicht zur globalen Konfiguration hinzugefügt werden"
 
-#: builtin/gc.c:2504
 msgid "git maintenance <subcommand> [<options>]"
 msgstr "git maintenance <Unterbefehl> [<Optionen>]"
 
-#: builtin/gc.c:2523
 #, c-format
 msgid "invalid subcommand: %s"
 msgstr "ungültiger Unterbefehl: %s"
 
-#: builtin/grep.c:32
 msgid "git grep [<options>] [-e] <pattern> [<rev>...] [[--] <path>...]"
 msgstr "git grep [<Optionen>] [-e] <Muster> [<Commit>...] [[--] <Pfad>...]"
 
-#: builtin/grep.c:241
 #, c-format
 msgid "grep: failed to create thread: %s"
 msgstr "grep: Fehler beim Erzeugen eines Thread: %s"
 
-#: builtin/grep.c:295
 #, c-format
 msgid "invalid number of threads specified (%d) for %s"
 msgstr "ungültige Anzahl von Threads (%d) für %s angegeben"
 
+#. #-#-#-#-#  grep.c.po  #-#-#-#-#
 #. TRANSLATORS: %s is the configuration
 #. variable for tweaking threads, currently
 #. grep.threads
 #.
-#: builtin/grep.c:303 builtin/index-pack.c:1587 builtin/index-pack.c:1791
-#: builtin/pack-objects.c:3150
 #, c-format
 msgid "no threads support, ignoring %s"
 msgstr "keine Unterstützung von Threads, '%s' wird ignoriert"
 
-#: builtin/grep.c:490 builtin/grep.c:619 builtin/grep.c:659
 #, c-format
 msgid "unable to read tree (%s)"
 msgstr "konnte \"Tree\"-Objekt (%s) nicht lesen"
 
-#: builtin/grep.c:674
 #, 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:754
 #, c-format
 msgid "switch `%c' expects a numerical value"
 msgstr "Schalter `%c' erwartet einen numerischen Wert"
 
-#: builtin/grep.c:852
 msgid "search in index instead of in the work tree"
 msgstr "im Index statt im Arbeitsverzeichnis suchen"
 
-#: builtin/grep.c:854
 msgid "find in contents not managed by git"
 msgstr "auch in Inhalten finden, die nicht von Git verwaltet werden"
 
-#: builtin/grep.c:856
 msgid "search in both tracked and untracked files"
 msgstr "in versionierten und unversionierten Dateien suchen"
 
-#: builtin/grep.c:858
 msgid "ignore files specified via '.gitignore'"
 msgstr "Dateien, die über '.gitignore' angegeben sind, ignorieren"
 
-#: builtin/grep.c:860
 msgid "recursively search in each submodule"
 msgstr "rekursive Suche in jedem Submodul"
 
-#: builtin/grep.c:863
 msgid "show non-matching lines"
 msgstr "Zeilen ohne Übereinstimmungen anzeigen"
 
-#: builtin/grep.c:865
 msgid "case insensitive matching"
 msgstr "Übereinstimmungen unabhängig von Groß- und Kleinschreibung finden"
 
-#: builtin/grep.c:867
 msgid "match patterns only at word boundaries"
 msgstr "nur ganze Wörter suchen"
 
-#: builtin/grep.c:869
 msgid "process binary files as text"
 msgstr "binäre Dateien als Text verarbeiten"
 
-#: builtin/grep.c:871
 msgid "don't match patterns in binary files"
 msgstr "keine Muster in Binärdateien finden"
 
-#: builtin/grep.c:874
 msgid "process binary files with textconv filters"
 msgstr "binäre Dateien mit \"textconv\"-Filtern verarbeiten"
 
-#: builtin/grep.c:876
 msgid "search in subdirectories (default)"
 msgstr "in Unterverzeichnissen suchen (Standard)"
 
-#: builtin/grep.c:878
 msgid "descend at most <depth> levels"
 msgstr "höchstens <Tiefe> Ebenen durchlaufen"
 
-#: builtin/grep.c:882
 msgid "use extended POSIX regular expressions"
 msgstr "erweiterte reguläre Ausdrücke aus POSIX verwenden"
 
-#: builtin/grep.c:885
 msgid "use basic POSIX regular expressions (default)"
 msgstr "grundlegende reguläre Ausdrücke aus POSIX verwenden (Standard)"
 
-#: builtin/grep.c:888
 msgid "interpret patterns as fixed strings"
 msgstr "Muster als feste Zeichenketten interpretieren"
 
-#: builtin/grep.c:891
 msgid "use Perl-compatible regular expressions"
 msgstr "Perl-kompatible reguläre Ausdrücke verwenden"
 
-#: builtin/grep.c:894
 msgid "show line numbers"
 msgstr "Zeilennummern anzeigen"
 
-#: builtin/grep.c:895
 msgid "show column number of first match"
 msgstr "Nummer der Spalte des ersten Treffers anzeigen"
 
-#: builtin/grep.c:896
 msgid "don't show filenames"
 msgstr "keine Dateinamen anzeigen"
 
-#: builtin/grep.c:897
 msgid "show filenames"
 msgstr "Dateinamen anzeigen"
 
-#: builtin/grep.c:899
 msgid "show filenames relative to top directory"
 msgstr "Dateinamen relativ zum Projektverzeichnis anzeigen"
 
-#: builtin/grep.c:901
 msgid "show only filenames instead of matching lines"
 msgstr "nur Dateinamen anzeigen anstatt übereinstimmende Zeilen"
 
-#: builtin/grep.c:903
 msgid "synonym for --files-with-matches"
 msgstr "Synonym für --files-with-matches"
 
-#: builtin/grep.c:906
 msgid "show only the names of files without match"
 msgstr "nur die Dateinamen ohne Übereinstimmungen anzeigen"
 
-#: builtin/grep.c:908
 msgid "print NUL after filenames"
 msgstr "NUL-Zeichen nach Dateinamen ausgeben"
 
-#: builtin/grep.c:911
 msgid "show only matching parts of a line"
 msgstr "nur übereinstimmende Teile der Zeile anzeigen"
 
-#: builtin/grep.c:913
 msgid "show the number of matches instead of matching lines"
 msgstr "anstatt der Zeilen, die Anzahl der übereinstimmenden Zeilen anzeigen"
 
-#: builtin/grep.c:914
 msgid "highlight matches"
 msgstr "Übereinstimmungen hervorheben"
 
-#: builtin/grep.c:916
 msgid "print empty line between matches from different files"
 msgstr ""
 "eine Leerzeile zwischen Übereinstimmungen in verschiedenen Dateien ausgeben"
 
-#: builtin/grep.c:918
 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:921
 msgid "show <n> context lines before and after matches"
 msgstr "<n> Zeilen vor und nach den Übereinstimmungen anzeigen"
 
-#: builtin/grep.c:924
 msgid "show <n> context lines before matches"
 msgstr "<n> Zeilen vor den Übereinstimmungen anzeigen"
 
-#: builtin/grep.c:926
 msgid "show <n> context lines after matches"
 msgstr "<n> Zeilen nach den Übereinstimmungen anzeigen"
 
-#: builtin/grep.c:928
 msgid "use <n> worker threads"
 msgstr "<n> Threads benutzen"
 
-#: builtin/grep.c:929
 msgid "shortcut for -C NUM"
 msgstr "Kurzform für -C NUM"
 
-#: builtin/grep.c:932
 msgid "show a line with the function name before matches"
 msgstr "eine Zeile mit dem Funktionsnamen vor Übereinstimmungen anzeigen"
 
-#: builtin/grep.c:934
 msgid "show the surrounding function"
 msgstr "die umgebende Funktion anzeigen"
 
-#: builtin/grep.c:937
 msgid "read patterns from file"
 msgstr "Muster von einer Datei lesen"
 
-#: builtin/grep.c:939
 msgid "match <pattern>"
 msgstr "<Muster> finden"
 
-#: builtin/grep.c:941
 msgid "combine patterns specified with -e"
 msgstr "Muster kombinieren, die mit -e angegeben wurden"
 
-#: builtin/grep.c:953
 msgid "indicate hit with exit status without output"
 msgstr "Übereinstimmungen nur durch Beendigungsstatus anzeigen"
 
-#: builtin/grep.c:955
 msgid "show only matches from files that match all patterns"
 msgstr ""
 "nur Übereinstimmungen von Dateien anzeigen, die allen Mustern entsprechen"
 
-#: builtin/grep.c:958
 msgid "pager"
 msgstr "Anzeigeprogramm"
 
-#: builtin/grep.c:958
 msgid "show matching files in the pager"
 msgstr "Dateien mit Übereinstimmungen im Anzeigeprogramm anzeigen"
 
-#: builtin/grep.c:962
 msgid "allow calling of grep(1) (ignored by this build)"
 msgstr "den Aufruf von grep(1) erlauben (von dieser Programmversion ignoriert)"
 
-#: builtin/grep.c:1028
 msgid "no pattern given"
 msgstr "Kein Muster angegeben."
 
-#: builtin/grep.c:1064
 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:1072
 #, c-format
 msgid "unable to resolve revision: %s"
 msgstr "Konnte Commit nicht auflösen: %s"
 
-#: builtin/grep.c:1102
 msgid "--untracked not supported with --recurse-submodules"
 msgstr "--untracked zusammen mit --recurse-submodules wird nicht unterstützt"
 
-#: builtin/grep.c:1106
 msgid "invalid option combination, ignoring --threads"
 msgstr "Ungültige Kombination von Optionen, --threads wird ignoriert."
 
-#: builtin/grep.c:1109 builtin/pack-objects.c:4084
 msgid "no threads support, ignoring --threads"
 msgstr "Keine Unterstützung für Threads, --threads wird ignoriert."
 
-#: builtin/grep.c:1112 builtin/index-pack.c:1584 builtin/pack-objects.c:3147
 #, c-format
 msgid "invalid number of threads specified (%d)"
 msgstr "ungültige Anzahl von Threads angegeben (%d)"
 
-#: builtin/grep.c:1146
 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:1179
 msgid "--[no-]exclude-standard cannot be used for tracked contents"
 msgstr ""
 "--[no-]exclude-standard kann nicht mit versionierten Inhalten verwendet "
 "werden"
 
-#: builtin/grep.c:1187
 msgid "both --cached and trees are given"
 msgstr "--cached und \"Tree\"-Objekte angegeben"
 
-#: builtin/hash-object.c:83
 msgid ""
 "git hash-object [-t <type>] [-w] [--path=<file> | --no-filters] [--stdin] "
 "[--] <file>..."
@@ -17243,101 +6914,78 @@ msgstr ""
 "git hash-object [-t <Art>] [-w] [--path=<Datei> | --no-filters] [--stdin] "
 "[--] <Datei>..."
 
-#: builtin/hash-object.c:97
 msgid "object type"
 msgstr "Art des Objektes"
 
-#: builtin/hash-object.c:98
 msgid "write the object into the object database"
 msgstr "das Objekt in die Objektdatenbank schreiben"
 
-#: builtin/hash-object.c:100
 msgid "read the object from stdin"
 msgstr "das Objekt von der Standard-Eingabe lesen"
 
-#: builtin/hash-object.c:102
 msgid "store file as is without filters"
 msgstr "Datei wie sie ist speichern, ohne Filter"
 
-#: builtin/hash-object.c:103
 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:104
 msgid "process file as it were from this path"
 msgstr "Datei verarbeiten, als ob sie von diesem Pfad wäre"
 
-#: builtin/help.c:57
 msgid "print all available commands"
 msgstr "alle vorhandenen Befehle anzeigen"
 
-#: builtin/help.c:60
 msgid "show external commands in --all"
 msgstr "zeige externe Befehle bei --all"
 
-#: builtin/help.c:61
 msgid "show aliases in --all"
 msgstr "zeige Aliase bei --all"
 
-#: builtin/help.c:62
 msgid "exclude guides"
 msgstr "Anleitungen ausschließen"
 
-#: builtin/help.c:63
 msgid "show man page"
 msgstr "Handbuch anzeigen"
 
-#: builtin/help.c:64
 msgid "show manual in web browser"
 msgstr "Handbuch in einem Webbrowser anzeigen"
 
-#: builtin/help.c:66
 msgid "show info page"
 msgstr "Info-Seite anzeigen"
 
-#: builtin/help.c:68
 msgid "print command description"
 msgstr "Beschreibung des Befehls ausgeben"
 
-#: builtin/help.c:70
 msgid "print list of useful guides"
 msgstr "Liste von allgemein verwendeten Anleitungen anzeigen"
 
-#: builtin/help.c:72
 msgid "print all configuration variable names"
 msgstr "alle Namen der Konfigurationsvariablen ausgeben"
 
-#: builtin/help.c:84
 msgid "git help [[-i|--info] [-m|--man] [-w|--web]] [<command>]"
 msgstr "git help [[-i|--info] [-m|--man] [-w|--web]] [<Befehl>]"
 
-#: builtin/help.c:201
 #, c-format
 msgid "unrecognized help format '%s'"
 msgstr "nicht erkanntes Hilfeformat: %s"
 
-#: builtin/help.c:227
 msgid "Failed to start emacsclient."
 msgstr "Konnte emacsclient nicht starten."
 
-#: builtin/help.c:240
 msgid "Failed to parse emacsclient version."
 msgstr "Konnte Version des emacsclient nicht parsen."
 
-#: builtin/help.c:248
 #, c-format
 msgid "emacsclient version '%d' too old (< 22)."
 msgstr "Version des emacsclient '%d' ist zu alt (< 22)."
 
-#: builtin/help.c:266 builtin/help.c:288 builtin/help.c:298 builtin/help.c:306
 #, c-format
 msgid "failed to exec '%s'"
 msgstr "Fehler beim Ausführen von '%s'"
 
-#: builtin/help.c:344
 #, c-format
 msgid ""
 "'%s': path for unsupported man viewer.\n"
@@ -17346,7 +6994,6 @@ msgstr ""
 "'%s': Pfad für nicht unterstützten Handbuchbetrachter.\n"
 "Sie könnten stattdessen 'man.<Werkzeug>.cmd' benutzen."
 
-#: builtin/help.c:356
 #, c-format
 msgid ""
 "'%s': cmd for supported man viewer.\n"
@@ -17355,425 +7002,335 @@ msgstr ""
 "'%s': Programm für unterstützten Handbuchbetrachter.\n"
 "Sie könnten stattdessen 'man.<Werkzeug>.path' benutzen."
 
-#: builtin/help.c:471
 #, c-format
 msgid "'%s': unknown man viewer."
 msgstr "'%s': unbekannter Handbuch-Betrachter."
 
-#: builtin/help.c:487
 msgid "no man viewer handled the request"
 msgstr "kein Handbuch-Betrachter konnte mit dieser Anfrage umgehen"
 
-#: builtin/help.c:494
 msgid "no info viewer handled the request"
 msgstr "kein Informations-Betrachter konnte mit dieser Anfrage umgehen"
 
-#: builtin/help.c:555 builtin/help.c:566 git.c:348
 #, c-format
 msgid "'%s' is aliased to '%s'"
 msgstr "'%s' ist ein Alias für '%s'"
 
-#: builtin/help.c:569 git.c:380
 #, c-format
 msgid "bad alias.%s string: %s"
 msgstr "Ungültiger alias.%s String: %s"
 
-#: builtin/help.c:611
 #, c-format
 msgid "the '%s' option doesn't take any non-option arguments"
 msgstr "die Option '%s' akzeptiert keine anderen Nicht-Optionsargumente"
 
-#: builtin/help.c:631
 msgid ""
 "the '--no-[external-commands|aliases]' options can only be used with '--all'"
 msgstr ""
 "die Optionen '--no-[external-commands|aliases]' können nur mit '--all' "
 "verwendet werden"
 
-#: builtin/help.c:643 builtin/help.c:671
 #, c-format
 msgid "usage: %s%s"
 msgstr "Verwendung: %s%s"
 
-#: builtin/help.c:666
 msgid "'git help config' for more information"
 msgstr "'git help config' für weitere Informationen"
 
-#: builtin/hook.c:10
 msgid "git hook run [--ignore-missing] <hook-name> [-- <hook-args>]"
 msgstr "git hook run [--ignore-missing] <Hook-Name> [-- <Hook-Argumente>]"
 
-#: builtin/hook.c:30
 msgid "silently ignore missing requested <hook-name>"
 msgstr "fehlende Anforderung <Hook-Name> stillschweigend ignorieren"
 
-#: 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:241
 #, c-format
 msgid "did not receive expected object %s"
 msgstr "konnte erwartetes Objekt %s nicht empfangen"
 
-#: 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: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:304
 msgid "early EOF"
 msgstr "zu frühes Dateiende"
 
-#: builtin/index-pack.c:305
 msgid "read error on input"
 msgstr "Fehler beim Lesen der Eingabe"
 
-#: builtin/index-pack.c:317
 msgid "used more bytes than were available"
 msgstr "verwendete mehr Bytes als verfügbar waren"
 
-#: builtin/index-pack.c:324 builtin/pack-objects.c:754
 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:329
 #, c-format
 msgid "pack exceeds maximum allowed size (%s)"
 msgstr "Paket überschreitet die maximal erlaubte Größe (%s)"
 
-#: builtin/index-pack.c:362
 msgid "pack signature mismatch"
 msgstr "Paketsignatur stimmt nicht überein"
 
-#: builtin/index-pack.c:364
 #, c-format
 msgid "pack version %<PRIu32> unsupported"
 msgstr "Paketversion %<PRIu32> nicht unterstützt"
 
-#: builtin/index-pack.c:380
 #, 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:485
 #, c-format
 msgid "inflate returned %d"
 msgstr "Dekomprimierung gab %d zurück"
 
-#: builtin/index-pack.c:534
 msgid "offset value overflow for delta base object"
 msgstr "Wert für Versatz bei Differenzobjekt übergelaufen"
 
-#: builtin/index-pack.c:542
 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:550
 #, c-format
 msgid "unknown object type %d"
 msgstr "Unbekannter Objekt-Typ %d"
 
-#: builtin/index-pack.c:581
 msgid "cannot pread pack file"
 msgstr "Kann Paketdatei %s nicht lesen"
 
-#: builtin/index-pack.c:583
 #, 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:609
 msgid "serious inflate inconsistency"
 msgstr "ernsthafte Inkonsistenz nach Dekomprimierung"
 
-#: builtin/index-pack.c:754 builtin/index-pack.c:760 builtin/index-pack.c:784
-#: builtin/index-pack.c:823 builtin/index-pack.c:832
 #, c-format
 msgid "SHA1 COLLISION FOUND WITH %s !"
 msgstr "SHA1 KOLLISION MIT %s GEFUNDEN !"
 
-#: builtin/index-pack.c:757 builtin/pack-objects.c:290
-#: builtin/pack-objects.c:350 builtin/pack-objects.c:456
 #, c-format
 msgid "unable to read %s"
 msgstr "kann %s nicht lesen"
 
-#: builtin/index-pack.c:821
 #, c-format
 msgid "cannot read existing object info %s"
 msgstr "Kann existierende Informationen zu Objekt %s nicht lesen."
 
-#: builtin/index-pack.c:829
 #, c-format
 msgid "cannot read existing object %s"
 msgstr "Kann existierendes Objekt %s nicht lesen."
 
-#: builtin/index-pack.c:843
 #, c-format
 msgid "invalid blob object %s"
 msgstr "ungültiges Blob-Objekt %s"
 
-#: builtin/index-pack.c:846 builtin/index-pack.c:865
 msgid "fsck error in packed object"
 msgstr "fsck Fehler in gepacktem Objekt"
 
-#: builtin/index-pack.c:867
 #, c-format
 msgid "Not all child objects of %s are reachable"
 msgstr "Nicht alle Kind-Objekte von %s sind erreichbar"
 
-#: builtin/index-pack.c:928 builtin/index-pack.c:975
 msgid "failed to apply delta"
 msgstr "Konnte Dateiunterschied nicht anwenden"
 
-#: builtin/index-pack.c:1161
 msgid "Receiving objects"
 msgstr "Empfange Objekte"
 
-#: builtin/index-pack.c:1161
 msgid "Indexing objects"
 msgstr "Indiziere Objekte"
 
-#: builtin/index-pack.c:1195
 msgid "pack is corrupted (SHA1 mismatch)"
 msgstr "Paket ist beschädigt (SHA1 unterschiedlich)"
 
-#: builtin/index-pack.c:1200
 msgid "cannot fstat packfile"
 msgstr "kann Paketdatei nicht lesen"
 
-#: builtin/index-pack.c:1203
 msgid "pack has junk at the end"
 msgstr "Paketende enthält nicht verwendbaren Inhalt"
 
-#: builtin/index-pack.c:1215
 msgid "confusion beyond insanity in parse_pack_objects()"
 msgstr "Fehler beim Ausführen von \"parse_pack_objects()\""
 
-#: builtin/index-pack.c:1238
 msgid "Resolving deltas"
 msgstr "Löse Unterschiede auf"
 
-#: builtin/index-pack.c:1249 builtin/pack-objects.c:2913
 #, c-format
 msgid "unable to create thread: %s"
 msgstr "kann Thread nicht erzeugen: %s"
 
-#: builtin/index-pack.c:1282
 msgid "confusion beyond insanity"
 msgstr "Fehler beim Auflösen der Unterschiede"
 
-#: builtin/index-pack.c:1288
 #, 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:1300
 #, c-format
 msgid "Unexpected tail checksum for %s (disk corruption?)"
 msgstr "unerwartete Prüfsumme für %s (Festplattenfehler?)"
 
-#: builtin/index-pack.c:1304
 #, 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:1328
 #, c-format
 msgid "unable to deflate appended object (%d)"
 msgstr "Konnte angehängtes Objekt (%d) nicht komprimieren"
 
-#: builtin/index-pack.c:1423
 #, c-format
 msgid "local object %s is corrupt"
 msgstr "lokales Objekt %s ist beschädigt"
 
-#: builtin/index-pack.c:1445
 #, c-format
 msgid "packfile name '%s' does not end with '.%s'"
 msgstr "Name der Paketdatei '%s' endet nicht mit '.%s'"
 
-#: builtin/index-pack.c:1469
 #, c-format
 msgid "cannot write %s file '%s'"
 msgstr "Kann %s Datei '%s' nicht schreiben."
 
-#: builtin/index-pack.c:1477
 #, c-format
 msgid "cannot close written %s file '%s'"
 msgstr "Kann eben geschriebene %s Datei '%s' nicht schließen."
 
-#: builtin/index-pack.c:1494
 #, 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:1519
 msgid "error while closing pack file"
 msgstr "Fehler beim Schließen der Paketdatei"
 
-#: builtin/index-pack.c:1578 builtin/pack-objects.c:3158
 #, c-format
-msgid "bad pack.indexversion=%<PRIu32>"
-msgstr "\"pack.indexversion=%<PRIu32>\" ist ungültig"
+msgid "bad pack.indexVersion=%<PRIu32>"
+msgstr "pack.indexVersion=%<PRIu32> ist ungültig"
 
-#: builtin/index-pack.c:1648
 #, c-format
 msgid "Cannot open existing pack file '%s'"
 msgstr "Kann existierende Paketdatei '%s' nicht öffnen"
 
-#: builtin/index-pack.c:1650
 #, 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:1698
 #, 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:1705
 #, 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
 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:1825 builtin/index-pack.c:1829
 #, c-format
 msgid "bad %s"
 msgstr "%s ist ungültig"
 
-#: builtin/index-pack.c:1835 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:1856
 msgid "--stdin requires a git repository"
 msgstr "--stdin erfordert ein Git-Repository"
 
-#: builtin/index-pack.c:1873
 msgid "--verify with no packfile name given"
 msgstr "--verify wurde ohne Namen der Paketdatei angegeben"
 
-#: builtin/index-pack.c:1939 builtin/unpack-objects.c:584
 msgid "fsck error in pack objects"
 msgstr "fsck Fehler beim Packen von Objekten"
 
-#: builtin/init-db.c:63
 #, c-format
 msgid "cannot stat template '%s'"
 msgstr "kann Vorlage '%s' nicht lesen"
 
-#: builtin/init-db.c:68
 #, c-format
 msgid "cannot opendir '%s'"
 msgstr "kann Verzeichnis '%s' nicht öffnen"
 
-#: builtin/init-db.c:80
 #, c-format
 msgid "cannot readlink '%s'"
 msgstr "kann Verweis '%s' nicht lesen"
 
-#: builtin/init-db.c:82
 #, c-format
 msgid "cannot symlink '%s' '%s'"
 msgstr "kann symbolische Verknüpfung '%s' auf '%s' nicht erstellen"
 
-#: builtin/init-db.c:88
 #, c-format
 msgid "cannot copy '%s' to '%s'"
 msgstr "kann '%s' nicht nach '%s' kopieren"
 
-#: builtin/init-db.c:92
 #, c-format
 msgid "ignoring template %s"
 msgstr "ignoriere Vorlage %s"
 
-#: builtin/init-db.c:123
 #, c-format
 msgid "templates not found in %s"
 msgstr "Keine Vorlagen in %s gefunden."
 
-#: builtin/init-db.c:138
 #, c-format
 msgid "not copying templates from '%s': %s"
 msgstr "kopiere keine Vorlagen von '%s': %s"
 
-#: builtin/init-db.c:263
 #, c-format
 msgid "invalid initial branch name: '%s'"
 msgstr "ungültiger initialer Branchname: '%s'"
 
-#: builtin/init-db.c:354
 #, c-format
 msgid "unable to handle file type %d"
 msgstr "kann nicht mit Dateityp %d umgehen"
 
-#: builtin/init-db.c:357
 #, c-format
 msgid "unable to move %s to %s"
 msgstr "Konnte %s nicht nach %s verschieben"
 
-#: builtin/init-db.c:373
 msgid "attempt to reinitialize repository with different hash"
 msgstr "Versuch, das Repository mit einem anderen Hash zu reinitialisieren"
 
-#: builtin/init-db.c:397 builtin/init-db.c:400
 #, c-format
 msgid "%s already exists"
 msgstr "%s existiert bereits"
 
-#: builtin/init-db.c:432
 #, c-format
 msgid "re-init: ignored --initial-branch=%s"
 msgstr "Neu-Initialisierung: --initial-branch=%s ignoriert"
 
-#: builtin/init-db.c:463
 #, c-format
 msgid "Reinitialized existing shared Git repository in %s%s\n"
 msgstr "Bestehendes verteiltes Git-Repository in %s%s neuinitialisiert\n"
 
-#: builtin/init-db.c:464
 #, c-format
 msgid "Reinitialized existing Git repository in %s%s\n"
 msgstr "Bestehendes Git-Repository in %s%s neuinitialisiert\n"
 
-#: builtin/init-db.c:468
 #, c-format
 msgid "Initialized empty shared Git repository in %s%s\n"
 msgstr "Leeres verteiltes Git-Repository in %s%s initialisiert\n"
 
-#: builtin/init-db.c:469
 #, c-format
 msgid "Initialized empty Git repository in %s%s\n"
 msgstr "Leeres Git-Repository in %s%s initialisiert\n"
 
-#: builtin/init-db.c:518
 msgid ""
 "git init [-q | --quiet] [--bare] [--template=<template-directory>] [--"
 "shared[=<permissions>]] [<directory>]"
@@ -17781,37 +7338,29 @@ msgstr ""
 "git init [-q | --quiet] [--bare] [--template=<Vorlagenverzeichnis>] [--"
 "shared[=<Berechtigungen>]] [<Verzeichnis>]"
 
-#: builtin/init-db.c:544
 msgid "permissions"
 msgstr "Berechtigungen"
 
-#: builtin/init-db.c:545
 msgid "specify that the git repository is to be shared amongst several users"
 msgstr "angeben, dass das Git-Repository mit mehreren Benutzern geteilt wird"
 
-#: builtin/init-db.c:551
 msgid "override the name of the initial branch"
 msgstr "den Namen des initialen Branches überschreiben"
 
-#: builtin/init-db.c:552 builtin/verify-pack.c:74
 msgid "hash"
 msgstr "Hash"
 
-#: builtin/init-db.c:553 builtin/show-index.c:22 builtin/verify-pack.c:75
 msgid "specify the hash algorithm to use"
 msgstr "den zu verwendenen Hash-Algorithmus angeben"
 
-#: builtin/init-db.c:591 builtin/init-db.c:596
 #, c-format
 msgid "cannot mkdir %s"
 msgstr "kann Verzeichnis %s nicht erstellen"
 
-#: builtin/init-db.c:600 builtin/init-db.c:655
 #, c-format
 msgid "cannot chdir to %s"
 msgstr "kann nicht in Verzeichnis %s wechseln"
 
-#: builtin/init-db.c:627
 #, c-format
 msgid ""
 "%s (or --work-tree=<directory>) not allowed without specifying %s (or --git-"
@@ -17820,16 +7369,13 @@ msgstr ""
 "%s (oder --work-tree=<Verzeichnis>) nicht erlaubt ohne Spezifizierung von %s "
 "(oder --git-dir=<Verzeichnis>)"
 
-#: builtin/init-db.c:679
 #, c-format
 msgid "Cannot access work tree '%s'"
 msgstr "Kann nicht auf Arbeitsverzeichnis '%s' zugreifen."
 
-#: builtin/init-db.c:684
 msgid "--separate-git-dir incompatible with bare repository"
 msgstr "--separate-git-dir nicht kompatibel mit Bare-Repository"
 
-#: builtin/interpret-trailers.c:16
 msgid ""
 "git interpret-trailers [--in-place] [--trim-empty] [(--trailer "
 "<token>[(=|:)<value>])...] [<file>...]"
@@ -17837,92 +7383,73 @@ msgstr ""
 "git interpret-trailers [--in-place] [--trim-empty] [(--trailer "
 "<Token>[(=|:)<Wert>])...] [<Datei>...]"
 
-#: builtin/interpret-trailers.c:95
 msgid "edit files in place"
 msgstr "vorhandene Dateien direkt bearbeiten"
 
-#: builtin/interpret-trailers.c:96
 msgid "trim empty trailers"
 msgstr "kürzt leere Anhänge"
 
-#: builtin/interpret-trailers.c:99
 msgid "where to place the new trailer"
 msgstr "wo der neue Anhang platziert wird"
 
-#: builtin/interpret-trailers.c:101
 msgid "action if trailer already exists"
 msgstr "Aktion, wenn Anhang bereits existiert"
 
-#: builtin/interpret-trailers.c:103
 msgid "action if trailer is missing"
 msgstr "Aktion, wenn Anhang fehlt"
 
-#: builtin/interpret-trailers.c:105
 msgid "output only the trailers"
 msgstr "nur Anhänge ausgeben"
 
-#: builtin/interpret-trailers.c:106
 msgid "do not apply config rules"
 msgstr "Regeln aus Konfiguration nicht anwenden"
 
-#: builtin/interpret-trailers.c:107
 msgid "join whitespace-continued values"
 msgstr "durch Leerzeichen fortgesetzte Werte verbinden"
 
-#: builtin/interpret-trailers.c:108
 msgid "set parsing options"
 msgstr "Optionen für das Parsen setzen"
 
-#: builtin/interpret-trailers.c:110
 msgid "do not treat --- specially"
 msgstr "--- nicht speziell behandeln"
 
-#: builtin/interpret-trailers.c:112
 msgid "trailer(s) to add"
 msgstr "Anhang/Anhänge hinzufügen"
 
-#: builtin/interpret-trailers.c:123
 msgid "--trailer with --only-input does not make sense"
 msgstr "--trailer und --only-input können nicht gemeinsam verwendet werden"
 
-#: builtin/interpret-trailers.c:133
 msgid "no input file given for in-place editing"
 msgstr "keine Datei zur direkten Bearbeitung angegeben"
 
-#: builtin/log.c:60
 msgid "git log [<options>] [<revision-range>] [[--] <path>...]"
 msgstr "git log [<Optionen>] [<Commitbereich>] [[--] <Pfad>...]"
 
-#: builtin/log.c:61
 msgid "git show [<options>] <object>..."
 msgstr "git show [<Optionen>] <Objekt>..."
 
-#: builtin/log.c:114
 #, c-format
 msgid "invalid --decorate option: %s"
 msgstr "Ungültige Option für --decorate: %s"
 
-#: builtin/log.c:181
+msgid "suppress diff output"
+msgstr "Ausgabe der Unterschiede unterdrücken"
+
 msgid "show source"
 msgstr "Quelle anzeigen"
 
-#: builtin/log.c:182
 msgid "use mail map file"
 msgstr "\"mailmap\"-Datei verwenden"
 
-#: builtin/log.c:185
 msgid "only decorate refs that match <pattern>"
 msgstr "\"decorate\" nur bei Referenzen anwenden, die <Muster> entsprechen"
 
-#: builtin/log.c:187
 msgid "do not decorate refs that match <pattern>"
 msgstr "\"decorate\" nicht bei Referenzen anwenden, die <Muster> entsprechen"
 
-#: builtin/log.c:188
 msgid "decorate options"
 msgstr "decorate-Optionen"
 
-#: builtin/log.c:191
 msgid ""
 "trace the evolution of line range <start>,<end> or function :<funcname> in "
 "<file>"
@@ -17930,94 +7457,77 @@ msgstr ""
 "Entwicklung der Zeilen vom Bereich <Start>,<Ende> oder Funktion :"
 "<Funktionsname> in <Datei> verfolgen"
 
-#: builtin/log.c:214
+#, c-format
+msgid "unrecognized argument: %s"
+msgstr "nicht erkanntes Argument: %s"
+
 msgid "-L<range>:<file> cannot be used with pathspec"
 msgstr "-L<Bereich>:<Datei> kann nicht mit Pfadspezifikation verwendet werden"
 
-#: builtin/log.c:322
 #, c-format
 msgid "Final output: %d %s\n"
 msgstr "letzte Ausgabe: %d %s\n"
 
-#: builtin/log.c:429
 msgid "unable to create temporary object directory"
 msgstr "konnte temporäres Objektverzeichnis nicht erstellen"
 
-#: builtin/log.c:599
 #, c-format
 msgid "git show %s: bad file"
 msgstr "git show %s: ungültige Datei"
 
-#: builtin/log.c:614 builtin/log.c:706
 #, c-format
 msgid "could not read object %s"
 msgstr "Konnte Objekt %s nicht lesen."
 
-#: builtin/log.c:731
 #, c-format
 msgid "unknown type: %d"
 msgstr "Unbekannter Typ: %d"
 
-#: builtin/log.c:880
 #, c-format
 msgid "%s: invalid cover from description mode"
 msgstr ""
 "%s: Ungültiger Modus für Erstellung des Deckblattes aus der Beschreibung"
 
-#: builtin/log.c:887
 msgid "format.headers without value"
 msgstr "format.headers ohne Wert"
 
-#: builtin/log.c:1016
 #, c-format
 msgid "cannot open patch file %s"
 msgstr "Kann Patch-Datei %s nicht öffnen"
 
-#: builtin/log.c:1033
 msgid "need exactly one range"
 msgstr "Brauche genau einen Commit-Bereich."
 
-#: builtin/log.c:1043
 msgid "not a range"
 msgstr "Kein Commit-Bereich."
 
-#: builtin/log.c:1207
 msgid "cover letter needs email format"
 msgstr "Anschreiben benötigt E-Mail-Format"
 
-#: builtin/log.c:1213
 msgid "failed to create cover-letter file"
 msgstr "Fehler beim Erstellen der Datei für das Anschreiben."
 
-#: builtin/log.c:1300
 #, c-format
 msgid "insane in-reply-to: %s"
 msgstr "ungültiges in-reply-to: %s"
 
-#: builtin/log.c:1327
 msgid "git format-patch [<options>] [<since> | <revision-range>]"
 msgstr "git format-patch [<Optionen>] [<seit> | <Commitbereich>]"
 
-#: builtin/log.c:1385
 msgid "two output directories?"
 msgstr "Zwei Ausgabeverzeichnisse?"
 
-#: builtin/log.c:1536 builtin/log.c:2369 builtin/log.c:2371 builtin/log.c:2383
 #, c-format
 msgid "unknown commit %s"
 msgstr "Unbekannter Commit %s"
 
-#: builtin/log.c:1547 builtin/replace.c:58 builtin/replace.c:207
-#: builtin/replace.c:210
 #, c-format
 msgid "failed to resolve '%s' as a valid ref"
 msgstr "Konnte '%s' nicht als gültige Referenz auflösen."
 
-#: builtin/log.c:1556
 msgid "could not find exact merge base"
 msgstr "Konnte keine exakte Merge-Basis finden."
 
-#: builtin/log.c:1566
 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"
@@ -18028,282 +7538,219 @@ msgstr ""
 "'git branch --set-upstream-to', um einem Remote-Branch zu folgen.\n"
 "Oder geben Sie den Basis-Commit mit '--base=<Basis-Commit-Id>' manuell an."
 
-#: builtin/log.c:1589
 msgid "failed to find exact merge base"
 msgstr "Fehler beim Finden einer exakten Merge-Basis."
 
-#: builtin/log.c:1606
 msgid "base commit should be the ancestor of revision list"
 msgstr "Basis-Commit sollte der Vorgänger der Revisionsliste sein."
 
-#: builtin/log.c:1616
 msgid "base commit shouldn't be in revision list"
 msgstr "Basis-Commit sollte nicht in der Revisionsliste enthalten sein."
 
-#: builtin/log.c:1674
 msgid "cannot get patch id"
 msgstr "kann Patch-Id nicht lesen"
 
-#: builtin/log.c:1737
 msgid "failed to infer range-diff origin of current series"
 msgstr "Fehler beim Ableiten des range-diff Ursprungs der aktuellen Serie"
 
-#: builtin/log.c:1739
 #, c-format
 msgid "using '%s' as range-diff origin of current series"
 msgstr "nutze '%s' als range-diff Ursprung der aktuellen Serie"
 
-#: builtin/log.c:1783
 msgid "use [PATCH n/m] even with a single patch"
 msgstr "[PATCH n/m] auch mit einzelnem Patch verwenden"
 
-#: builtin/log.c:1786
 msgid "use [PATCH] even with multiple patches"
 msgstr "[PATCH] auch mit mehreren Patches verwenden"
 
-#: builtin/log.c:1790
 msgid "print patches to standard out"
 msgstr "Ausgabe der Patches in Standard-Ausgabe"
 
-#: builtin/log.c:1792
 msgid "generate a cover letter"
 msgstr "ein Deckblatt erzeugen"
 
-#: builtin/log.c:1794
 msgid "use simple number sequence for output file names"
 msgstr "einfache Nummernfolge für die Namen der Ausgabedateien verwenden"
 
-#: builtin/log.c:1795
 msgid "sfx"
 msgstr "Dateiendung"
 
-#: builtin/log.c:1796
 msgid "use <sfx> instead of '.patch'"
 msgstr "<Dateiendung> statt '.patch' verwenden"
 
-#: builtin/log.c:1798
 msgid "start numbering patches at <n> instead of 1"
 msgstr "die Nummerierung der Patches bei <n> statt bei 1 beginnen"
 
-#: builtin/log.c:1799
 msgid "reroll-count"
 msgstr "Reroll-Anzahl"
 
-#: builtin/log.c:1800
 msgid "mark the series as Nth re-roll"
 msgstr "die Serie als n-te Fassung kennzeichnen"
 
-#: builtin/log.c:1802
 msgid "max length of output filename"
 msgstr "maximale Länge des Dateinamens für die Ausgabe"
 
-#: builtin/log.c:1804
 msgid "use [RFC PATCH] instead of [PATCH]"
 msgstr "[RFC PATCH] statt [PATCH] verwenden"
 
-#: builtin/log.c:1807
 msgid "cover-from-description-mode"
 msgstr "Modus für Erstellung des Deckblattes aus der Beschreibung"
 
-#: builtin/log.c:1808
 msgid "generate parts of a cover letter based on a branch's description"
 msgstr ""
 "Erzeuge Teile des Deckblattes basierend auf der Beschreibung des Branches"
 
-#: builtin/log.c:1810
 msgid "use [<prefix>] instead of [PATCH]"
 msgstr "nutze [<Präfix>] statt [PATCH]"
 
-#: builtin/log.c:1813
 msgid "store resulting files in <dir>"
 msgstr "erzeugte Dateien in <Verzeichnis> speichern"
 
-#: builtin/log.c:1816
 msgid "don't strip/add [PATCH]"
 msgstr "[PATCH] nicht entfernen/hinzufügen"
 
-#: builtin/log.c:1819
 msgid "don't output binary diffs"
 msgstr "keine binären Unterschiede ausgeben"
 
-#: builtin/log.c:1821
 msgid "output all-zero hash in From header"
 msgstr "Hash mit Nullen in \"From\"-Header ausgeben"
 
-#: builtin/log.c:1823
 msgid "don't include a patch matching a commit upstream"
 msgstr ""
 "keine Patches einschließen, die einem Commit im Upstream-Branch entsprechen"
 
-#: builtin/log.c:1825
 msgid "show patch format instead of default (patch + stat)"
 msgstr "Patchformat anstatt des Standards anzeigen (Patch + Zusammenfassung)"
 
-#: builtin/log.c:1827
 msgid "Messaging"
 msgstr "E-Mail-Einstellungen"
 
-#: builtin/log.c:1828
 msgid "header"
 msgstr "Header"
 
-#: builtin/log.c:1829
 msgid "add email header"
 msgstr "E-Mail-Header hinzufügen"
 
-#: builtin/log.c:1830 builtin/log.c:1831
 msgid "email"
 msgstr "E-Mail"
 
-#: builtin/log.c:1830
 msgid "add To: header"
 msgstr "\"To:\"-Header hinzufügen"
 
-#: builtin/log.c:1831
 msgid "add Cc: header"
 msgstr "\"Cc:\"-Header hinzufügen"
 
-#: builtin/log.c:1832
 msgid "ident"
 msgstr "Ident"
 
-#: builtin/log.c:1833
 msgid "set From address to <ident> (or committer ident if absent)"
 msgstr ""
 "\"From\"-Adresse auf <Ident> setzen (oder Ident des Commit-Erstellers, wenn "
 "fehlend)"
 
-#: builtin/log.c:1835
 msgid "message-id"
 msgstr "message-id"
 
-#: builtin/log.c:1836
 msgid "make first mail a reply to <message-id>"
 msgstr "aus erster E-Mail eine Antwort zu <message-id> machen"
 
-#: builtin/log.c:1837 builtin/log.c:1840
 msgid "boundary"
 msgstr "Grenze"
 
-#: builtin/log.c:1838
 msgid "attach the patch"
 msgstr "den Patch anhängen"
 
-#: builtin/log.c:1841
 msgid "inline the patch"
 msgstr "den Patch direkt in die Nachricht einfügen"
 
-#: builtin/log.c:1845
 msgid "enable message threading, styles: shallow, deep"
 msgstr "Nachrichtenverkettung aktivieren, Stile: shallow, deep"
 
-#: builtin/log.c:1847
 msgid "signature"
 msgstr "Signatur"
 
-#: builtin/log.c:1848
 msgid "add a signature"
 msgstr "eine Signatur hinzufügen"
 
-#: builtin/log.c:1849
 msgid "base-commit"
 msgstr "Basis-Commit"
 
-#: builtin/log.c:1850
 msgid "add prerequisite tree info to the patch series"
 msgstr "erforderliche Revisions-Informationen der Patch-Serie hinzufügen"
 
-#: builtin/log.c:1853
 msgid "add a signature from a file"
 msgstr "eine Signatur aus einer Datei hinzufügen"
 
-#: builtin/log.c:1854
 msgid "don't print the patch filenames"
 msgstr "keine Dateinamen der Patches anzeigen"
 
-#: builtin/log.c:1856
 msgid "show progress while generating patches"
 msgstr "Forschrittsanzeige während der Erzeugung der Patches"
 
-#: builtin/log.c:1858
 msgid "show changes against <rev> in cover letter or single patch"
 msgstr ""
 "Änderungen gegenüber <Commit> im Deckblatt oder einzelnem Patch anzeigen"
 
-#: builtin/log.c:1861
 msgid "show changes against <refspec> in cover letter or single patch"
 msgstr ""
 "Änderungen gegenüber <Refspec> im Deckblatt oder einzelnem Patch anzeigen"
 
-#: builtin/log.c:1863 builtin/range-diff.c:28
 msgid "percentage by which creation is weighted"
 msgstr "Prozentsatz mit welchem Erzeugung gewichtet wird"
 
-#: builtin/log.c:1953
 #, c-format
 msgid "invalid ident line: %s"
 msgstr "Ungültige Identifikationszeile: %s"
 
-#: builtin/log.c:1978
 msgid "--name-only does not make sense"
 msgstr "--name-only kann nicht verwendet werden"
 
-#: builtin/log.c:1980
 msgid "--name-status does not make sense"
 msgstr "--name-status kann nicht verwendet werden"
 
-#: builtin/log.c:1982
 msgid "--check does not make sense"
 msgstr "--check kann nicht verwendet werden"
 
-#: builtin/log.c:1984
 msgid "--remerge-diff does not make sense"
 msgstr "--remerge-diff ist nicht sinnvoll"
 
-#: builtin/log.c:2129
+#, c-format
+msgid "could not create directory '%s'"
+msgstr "Konnte Verzeichnis '%s' nicht erstellen."
+
 msgid "--interdiff requires --cover-letter or single patch"
 msgstr "--interdiff erfordert --cover-letter oder einzelnen Patch"
 
-#: builtin/log.c:2133
 msgid "Interdiff:"
 msgstr "Interdiff:"
 
-#: builtin/log.c:2134
 #, c-format
 msgid "Interdiff against v%d:"
 msgstr "Interdiff gegen v%d:"
 
-#: builtin/log.c:2144
 msgid "--range-diff requires --cover-letter or single patch"
 msgstr "--range-diff erfordert --cover-letter oder einzelnen Patch."
 
-#: builtin/log.c:2152
 msgid "Range-diff:"
 msgstr "Range-Diff:"
 
-#: builtin/log.c:2153
 #, c-format
 msgid "Range-diff against v%d:"
 msgstr "Range-Diff gegen v%d:"
 
-#: builtin/log.c:2164
 #, c-format
 msgid "unable to read signature file '%s'"
 msgstr "Konnte Signatur-Datei '%s' nicht lesen"
 
-#: builtin/log.c:2200
 msgid "Generating patches"
 msgstr "Erzeuge Patches"
 
-#: builtin/log.c:2244
 msgid "failed to create output files"
 msgstr "Fehler beim Erstellen der Ausgabedateien."
 
-#: builtin/log.c:2304
 msgid "git cherry [-v] [<upstream> [<head> [<limit>]]]"
 msgstr "git cherry [-v] [<Upstream> [<Branch> [<Limit>]]]"
 
-#: builtin/log.c:2358
 #, c-format
 msgid ""
 "Could not find a tracked remote branch, please specify <upstream> manually.\n"
@@ -18311,124 +7758,95 @@ msgstr ""
 "Konnte gefolgten Remote-Branch nicht finden, bitte geben Sie <Upstream> "
 "manuell an.\n"
 
-#: builtin/ls-files.c:564
 msgid "git ls-files [<options>] [<file>...]"
 msgstr "git ls-files [<Optionen>] [<Datei>...]"
 
-#: builtin/ls-files.c:618
 msgid "separate paths with the NUL character"
 msgstr "Pfade durch NUL-Zeichen trennen"
 
-#: builtin/ls-files.c:620
 msgid "identify the file status with tags"
 msgstr "den Dateistatus mit Tags anzeigen"
 
-#: builtin/ls-files.c:622
 msgid "use lowercase letters for 'assume unchanged' files"
 msgstr ""
 "Kleinbuchstaben für Dateien mit 'assume unchanged' Markierung verwenden"
 
-#: builtin/ls-files.c:624
 msgid "use lowercase letters for 'fsmonitor clean' files"
 msgstr "Kleinbuchstaben für 'fsmonitor clean' Dateien verwenden"
 
-#: builtin/ls-files.c:626
 msgid "show cached files in the output (default)"
 msgstr "zwischengespeicherte Dateien in der Ausgabe anzeigen (Standard)"
 
-#: builtin/ls-files.c:628
 msgid "show deleted files in the output"
 msgstr "entfernte Dateien in der Ausgabe anzeigen"
 
-#: builtin/ls-files.c:630
 msgid "show modified files in the output"
 msgstr "geänderte Dateien in der Ausgabe anzeigen"
 
-#: builtin/ls-files.c:632
 msgid "show other files in the output"
 msgstr "sonstige Dateien in der Ausgabe anzeigen"
 
-#: builtin/ls-files.c:634
 msgid "show ignored files in the output"
 msgstr "ignorierte Dateien in der Ausgabe anzeigen"
 
-#: builtin/ls-files.c:637
 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:639
 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:641
 msgid "show 'other' directories' names only"
 msgstr "nur Namen von 'sonstigen' Verzeichnissen anzeigen"
 
-#: builtin/ls-files.c:643
 msgid "show line endings of files"
 msgstr "Zeilenenden von Dateien anzeigen"
 
-#: builtin/ls-files.c:645
 msgid "don't show empty directories"
 msgstr "keine leeren Verzeichnisse anzeigen"
 
-#: builtin/ls-files.c:648
 msgid "show unmerged files in the output"
 msgstr "nicht zusammengeführte Dateien in der Ausgabe anzeigen"
 
-#: builtin/ls-files.c:650
 msgid "show resolve-undo information"
 msgstr "'resolve-undo' Informationen anzeigen"
 
-#: builtin/ls-files.c:652
 msgid "skip files matching pattern"
 msgstr "Dateien auslassen, die einem Muster entsprechen"
 
-#: builtin/ls-files.c:655
 msgid "read exclude patterns from <file>"
 msgstr "Ausschlussmuster aus <Datei> lesen"
 
-#: builtin/ls-files.c:658
 msgid "read additional per-directory exclude patterns in <file>"
 msgstr "zusätzliche pro-Verzeichnis Auschlussmuster aus <Datei> auslesen"
 
-#: builtin/ls-files.c:660
 msgid "add the standard git exclusions"
 msgstr "die standardmäßigen Git-Ausschlüsse hinzufügen"
 
-#: builtin/ls-files.c:664
 msgid "make the output relative to the project top directory"
 msgstr "Ausgabe relativ zum Projektverzeichnis"
 
-#: builtin/ls-files.c:669
 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:670
 msgid "tree-ish"
 msgstr "Commit-Referenz"
 
-#: builtin/ls-files.c:671
 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:673
 msgid "show debugging data"
 msgstr "Ausgaben zur Fehlersuche anzeigen"
 
-#: builtin/ls-files.c:675
 msgid "suppress duplicate entries"
 msgstr "doppelte Einträge unterdrücken"
 
-#: builtin/ls-files.c:677
 msgid "show sparse directories in the presence of a sparse index"
 msgstr "zeige partielle Verzeichnisse, wenn ein partieller Index vorhanden ist"
 
-#: builtin/ls-remote.c:9
 msgid ""
 "git ls-remote [--heads] [--tags] [--refs] [--upload-pack=<exec>]\n"
 "              [-q | --quiet] [--exit-code] [--get-url]\n"
@@ -18438,210 +7856,161 @@ msgstr ""
 "              [-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:1131
 msgid "exec"
 msgstr "Programm"
 
-#: builtin/ls-remote.c:62 builtin/ls-remote.c:64
 msgid "path of git-upload-pack on the remote host"
 msgstr "Pfad zu \"git-upload-pack\" auf der Gegenseite"
 
-#: builtin/ls-remote.c:66
 msgid "limit to tags"
 msgstr "auf Tags einschränken"
 
-#: builtin/ls-remote.c:67
 msgid "limit to heads"
 msgstr "auf Branches einschränken"
 
-#: builtin/ls-remote.c:68
 msgid "do not show peeled tags"
 msgstr "keine Tags anzeigen, die andere Tags enthalten"
 
-#: builtin/ls-remote.c:70
 msgid "take url.<base>.insteadOf into account"
 msgstr "url.<Basis>.insteadOf berücksichtigen"
 
-#: builtin/ls-remote.c:73
 msgid "exit with exit code 2 if no matching refs are found"
 msgstr ""
 "mit Exit-Code 2 beenden, wenn keine übereinstimmenden Referenzen\n"
 "gefunden wurden"
 
-#: builtin/ls-remote.c:76
 msgid "show underlying ref in addition to the object pointed by it"
 msgstr "zusätzlich zum Objekt die darauf verweisenden Referenzen anzeigen"
 
-#: builtin/ls-tree.c:36
 msgid "git ls-tree [<options>] <tree-ish> [<path>...]"
 msgstr "git ls-tree [<Optionen>] <Commit-Referenz> [<Pfad>...]"
 
-#: builtin/ls-tree.c:54
 #, c-format
 msgid "could not get object info about '%s'"
 msgstr "konnte Objekt-Informationen über '%s' nicht bestimmen"
 
-#: builtin/ls-tree.c:79
 #, c-format
 msgid "bad ls-tree format: element '%s' does not start with '('"
 msgstr "ungültiges ls-tree-Format: Element '%s' fängt nicht mit '(' an"
 
-#: builtin/ls-tree.c:83
 #, c-format
 msgid "bad ls-tree format: element '%s' does not end in ')'"
 msgstr "ungültiges ls-tree-Format: Element '%s' endet nicht mit ')'"
 
-#: builtin/ls-tree.c:109
 #, c-format
 msgid "bad ls-tree format: %%%.*s"
 msgstr "ungültiges ls-tree-Format: %%%.*s"
 
-#: builtin/ls-tree.c:336
 msgid "only show trees"
 msgstr "nur Verzeichnisse anzeigen"
 
-#: builtin/ls-tree.c:338
 msgid "recurse into subtrees"
 msgstr "Rekursion in Unterverzeichnissen durchführen"
 
-#: builtin/ls-tree.c:340
 msgid "show trees when recursing"
 msgstr "Verzeichnisse bei Rekursion anzeigen"
 
-#: builtin/ls-tree.c:343
 msgid "terminate entries with NUL byte"
 msgstr "Einträge mit NUL-Byte abschließen"
 
-#: builtin/ls-tree.c:344
 msgid "include object size"
 msgstr "Objektgröße einschließen"
 
-#: builtin/ls-tree.c:346 builtin/ls-tree.c:348
 msgid "list only filenames"
 msgstr "nur Dateinamen auflisten"
 
-#: builtin/ls-tree.c:350
 msgid "list only objects"
 msgstr "nur Objekte auflisten"
 
-#: builtin/ls-tree.c:353
 msgid "use full path names"
 msgstr "vollständige Pfadnamen verwenden"
 
-#: builtin/ls-tree.c:355
 msgid "list entire tree; not just current directory (implies --full-name)"
 msgstr ""
 "das gesamte Verzeichnis auflisten; nicht nur das aktuelle Verzeichnis "
 "(impliziert --full-name)"
 
-#: builtin/ls-tree.c:391
 msgid "--format can't be combined with other format-altering options"
 msgstr ""
 "--format kann nicht mit anderen formatändernden Optionen kombiniert werden"
 
 #. TRANSLATORS: keep <> in "<" mail ">" info.
-#: builtin/mailinfo.c:14
 msgid "git mailinfo [<options>] <msg> <patch> < mail >info"
 msgstr "git mailinfo [<Optionen>] <Nachricht> <Patch> < mail >info"
 
-#: builtin/mailinfo.c:58
 msgid "keep subject"
 msgstr "Betreff beibehalten"
 
-#: builtin/mailinfo.c:60
 msgid "keep non patch brackets in subject"
 msgstr "behalte Klammern im Betreff, die nicht zum Patch gehören"
 
-#: builtin/mailinfo.c:62
 msgid "copy Message-ID to the end of commit message"
 msgstr "Message-ID an das Ende der Commit-Beschreibung kopieren"
 
-#: builtin/mailinfo.c:64
 msgid "re-code metadata to i18n.commitEncoding"
 msgstr "Neukodierung der Metadaten nach 'i18n.commitEncoding'"
 
-#: builtin/mailinfo.c:67
 msgid "disable charset re-coding of metadata"
 msgstr "Zeichen-Neukodierung der Metadaten deaktivieren"
 
-#: builtin/mailinfo.c:69
 msgid "encoding"
 msgstr "Encoding"
 
-#: builtin/mailinfo.c:70
 msgid "re-code metadata to this encoding"
 msgstr "Neukodierung der Metadaten zu diesem Encoding"
 
-#: builtin/mailinfo.c:72
 msgid "use scissors"
 msgstr "nutze Scherenmarkierungen"
 
-#: builtin/mailinfo.c:73
 msgid "<action>"
 msgstr "<Aktion>"
 
-#: builtin/mailinfo.c:74
 msgid "action when quoted CR is found"
 msgstr "Aktion, wenn ein angeführtes CR gefunden wird"
 
-#: builtin/mailinfo.c:77
 msgid "use headers in message's body"
 msgstr "nutze Header im Inhalt der Nachricht"
 
-#: builtin/mailsplit.c:227
 msgid "reading patches from stdin/tty..."
 msgstr "lese Patches von Standard-Eingabe/Terminal..."
 
-#: builtin/mailsplit.c:242
 #, c-format
 msgid "empty mbox: '%s'"
 msgstr "Leere mbox: '%s'"
 
-#: builtin/merge-base.c:32
 msgid "git merge-base [-a | --all] <commit> <commit>..."
 msgstr "git merge-base [-a | --all] <Commit> <Commit>..."
 
-#: builtin/merge-base.c:33
 msgid "git merge-base [-a | --all] --octopus <commit>..."
 msgstr "git merge-base [-a | --all] --octopus <Commit>..."
 
-#: builtin/merge-base.c:34
 msgid "git merge-base --independent <commit>..."
 msgstr "git merge-base --independent <Commit>..."
 
-#: builtin/merge-base.c:35
 msgid "git merge-base --is-ancestor <commit> <commit>"
 msgstr "git merge-base --is-ancestor <Commit> <Commit>"
 
-#: builtin/merge-base.c:36
 msgid "git merge-base --fork-point <ref> [<commit>]"
 msgstr "git merge-base --fork-point <Referenz> [<Commit>]"
 
-#: builtin/merge-base.c:144
 msgid "output all common ancestors"
 msgstr "Ausgabe aller gemeinsamen Vorgänger-Commits"
 
-#: builtin/merge-base.c:146
 msgid "find ancestors for a single n-way merge"
 msgstr "Vorgänger-Commits für einen einzelnen n-Wege-Merge finden"
 
-#: builtin/merge-base.c:148
 msgid "list revs not reachable from others"
 msgstr "Commits auflisten, die nicht durch Andere erreichbar sind"
 
-#: builtin/merge-base.c:150
 msgid "is the first one ancestor of the other?"
 msgstr "ist der Erste ein Vorgänger-Commit des Anderen?"
 
-#: builtin/merge-base.c:152
 msgid "find where <commit> forked from reflog of <ref>"
 msgstr "<Commit> finden, von wo Reflog von <Referenz> abgespalten wurde"
 
-#: builtin/merge-file.c:9
 msgid ""
 "git merge-file [<options>] [-L <name1> [-L <orig> [-L <name2>]]] <file1> "
 "<orig-file> <file2>"
@@ -18649,257 +8018,205 @@ msgstr ""
 "git merge-file [<Optionen>] [-L <Name1> [-L <orig> [-L <Name2>]]] <Datei1> "
 "<orig-Datei> <Datei2>"
 
-#: builtin/merge-file.c:35
 msgid "send results to standard output"
 msgstr "Ergebnisse zur Standard-Ausgabe senden"
 
-#: builtin/merge-file.c:36
 msgid "use a diff3 based merge"
 msgstr "einen diff3 basierten Merge verwenden"
 
-#: builtin/merge-file.c:37
 msgid "use a zealous diff3 based merge"
 msgstr "einen eifrigen diff3 basierten Merge verwenden"
 
-#: builtin/merge-file.c:39
 msgid "for conflicts, use our version"
 msgstr "bei Konflikten unsere Variante verwenden"
 
-#: builtin/merge-file.c:41
 msgid "for conflicts, use their version"
 msgstr "bei Konflikten ihre Variante verwenden"
 
-#: builtin/merge-file.c:43
 msgid "for conflicts, use a union version"
 msgstr "bei Konflikten eine gemeinsame Variante verwenden"
 
-#: builtin/merge-file.c:46
 msgid "for conflicts, use this marker size"
 msgstr "bei Konflikten diese Kennzeichnungslänge verwenden"
 
-#: builtin/merge-file.c:47
 msgid "do not warn about conflicts"
 msgstr "keine Warnung bei Konflikten"
 
-#: builtin/merge-file.c:49
 msgid "set labels for file1/orig-file/file2"
 msgstr "Beschriftung für Datei1/orig-Datei/Datei2 setzen"
 
-#: builtin/merge-recursive.c:47
 #, c-format
 msgid "unknown option %s"
 msgstr "unbekannte Option: %s"
 
-#: builtin/merge-recursive.c:53
 #, c-format
 msgid "could not parse object '%s'"
 msgstr "Konnte Objekt '%s' nicht parsen."
 
-#: builtin/merge-recursive.c:57
 #, c-format
 msgid "cannot handle more than %d base. Ignoring %s."
 msgid_plural "cannot handle more than %d bases. Ignoring %s."
 msgstr[0] "kann nicht mit mehr als %d Merge-Basis umgehen. Ignoriere %s."
 msgstr[1] "kann nicht mit mehr als %d Merge-Basen umgehen. Ignoriere %s."
 
-#: builtin/merge-recursive.c:65
 msgid "not handling anything other than two heads merge."
 msgstr "Es wird nur der Merge von zwei Branches behandelt."
 
-#: builtin/merge-recursive.c:74 builtin/merge-recursive.c:76
 #, c-format
 msgid "could not resolve ref '%s'"
 msgstr "Konnte Referenz '%s' nicht auflösen"
 
-#: builtin/merge-recursive.c:82
 #, c-format
 msgid "Merging %s with %s\n"
 msgstr "Führe %s mit %s zusammen\n"
 
-#: builtin/merge.c:59
 msgid "git merge [<options>] [<commit>...]"
 msgstr "git merge [<Optionen>] [<Commit>...]"
 
-#: builtin/merge.c:125
 msgid "switch `m' requires a value"
 msgstr "Schalter `m' erfordert einen Wert."
 
-#: builtin/merge.c:148
 #, c-format
 msgid "option `%s' requires a value"
 msgstr "Option `%s' erfordert einen Wert."
 
-#: builtin/merge.c:201
 #, c-format
 msgid "Could not find merge strategy '%s'.\n"
 msgstr "Konnte Merge-Strategie '%s' nicht finden.\n"
 
-#: builtin/merge.c:202
 #, c-format
 msgid "Available strategies are:"
 msgstr "Verfügbare Strategien sind:"
 
-#: builtin/merge.c:207
 #, c-format
 msgid "Available custom strategies are:"
 msgstr "Verfügbare benutzerdefinierte Strategien sind:"
 
-#: builtin/merge.c:258 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:261 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:262 builtin/pull.c:140
 msgid "(synonym to --stat)"
 msgstr "(Synonym für --stat)"
 
-#: builtin/merge.c:264 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:267 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:269 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:271 builtin/pull.c:155
 msgid "edit message before committing"
 msgstr "Bearbeitung der Beschreibung vor dem Commit"
 
-#: builtin/merge.c:273
 msgid "allow fast-forward (default)"
 msgstr "Vorspulen erlauben (Standard)"
 
-#: builtin/merge.c:275 builtin/pull.c:162
 msgid "abort if fast-forward is not possible"
 msgstr "abbrechen, wenn kein Vorspulen möglich ist"
 
-#: builtin/merge.c:279 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:280 builtin/notes.c:785 builtin/pull.c:172
-#: builtin/rebase.c:1145 builtin/revert.c:114
 msgid "strategy"
 msgstr "Strategie"
 
-#: builtin/merge.c:281 builtin/pull.c:173
 msgid "merge strategy to use"
 msgstr "zu verwendende Merge-Strategie"
 
-#: builtin/merge.c:282 builtin/pull.c:176
 msgid "option=value"
 msgstr "Option=Wert"
 
-#: builtin/merge.c:283 builtin/pull.c:177
 msgid "option for selected merge strategy"
 msgstr "Option für ausgewählte Merge-Strategie"
 
-#: builtin/merge.c:285
 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:291
 msgid "use <name> instead of the real target"
 msgstr "<Name> statt echtem Ziel verwenden"
 
-#: builtin/merge.c:294
 msgid "abort the current in-progress merge"
 msgstr "den sich im Gange befindlichen Merge abbrechen"
 
-#: builtin/merge.c:296
 msgid "--abort but leave index and working tree alone"
 msgstr "--abort, aber Index und Arbeitsverzeichnis unverändert lassen"
 
-#: builtin/merge.c:298
 msgid "continue the current in-progress merge"
 msgstr "den sich im Gange befindlichen Merge fortsetzen"
 
-#: builtin/merge.c:300 builtin/pull.c:184
 msgid "allow merging unrelated histories"
 msgstr "erlaube das Zusammenführen von nicht zusammenhängenden Historien"
 
-#: builtin/merge.c:307
 msgid "bypass pre-merge-commit and commit-msg hooks"
 msgstr "Hooks pre-merge-commit und commit-msg umgehen"
 
-#: builtin/merge.c:323
 msgid "could not run stash."
 msgstr "Konnte \"stash\" nicht ausführen."
 
-#: builtin/merge.c:328
 msgid "stash failed"
 msgstr "\"stash\" fehlgeschlagen"
 
-#: builtin/merge.c:333
 #, c-format
 msgid "not a valid object: %s"
 msgstr "kein gültiges Objekt: %s"
 
-#: builtin/merge.c:355 builtin/merge.c:372
 msgid "read-tree failed"
 msgstr "read-tree fehlgeschlagen"
 
-#: builtin/merge.c:403
 msgid "Already up to date. (nothing to squash)"
 msgstr "Bereits auf dem neuesten Stand. (nichts für Squash-Merge vorhanden)"
 
-#: builtin/merge.c:417
+msgid "Already up to date."
+msgstr "Bereits aktuell."
+
 #, c-format
 msgid "Squash commit -- not updating HEAD\n"
 msgstr "Squash Commit -- HEAD wird nicht aktualisiert\n"
 
-#: builtin/merge.c:467
 #, c-format
 msgid "No merge message -- not updating HEAD\n"
 msgstr "Keine Merge-Commit-Beschreibung -- HEAD wird nicht aktualisiert\n"
 
-#: builtin/merge.c:517
 #, c-format
 msgid "'%s' does not point to a commit"
 msgstr "'%s' zeigt auf keinen Commit"
 
-#: builtin/merge.c:605
 #, c-format
 msgid "Bad branch.%s.mergeoptions string: %s"
 msgstr "Ungültiger branch.%s.mergeoptions String: %s"
 
-#: builtin/merge.c:732
+msgid "Unable to write index."
+msgstr "Konnte Index nicht schreiben."
+
 msgid "Not handling anything other than two heads merge."
 msgstr "Es wird nur der Merge von zwei Branches behandelt."
 
-#: builtin/merge.c:745
 #, c-format
 msgid "unknown strategy option: -X%s"
 msgstr "unbekannte Strategie-Option: -X%s"
 
-#: builtin/merge.c:764 t/helper/test-fast-rebase.c:223
 #, c-format
 msgid "unable to write %s"
 msgstr "konnte %s nicht schreiben"
 
-#: builtin/merge.c:816
 #, c-format
 msgid "Could not read from '%s'"
 msgstr "konnte nicht von '%s' lesen"
 
-#: builtin/merge.c:825
 #, 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:831
 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"
@@ -18910,11 +8227,9 @@ msgstr ""
 "Upstream-Branch mit einem Thema-Branch zusammenführt.\n"
 "\n"
 
-#: builtin/merge.c:836
 msgid "An empty message aborts the commit.\n"
 msgstr "Eine leere Commit-Beschreibung bricht den Commit ab.\n"
 
-#: builtin/merge.c:839
 #, c-format
 msgid ""
 "Lines starting with '%c' will be ignored, and an empty message aborts\n"
@@ -18923,75 +8238,63 @@ msgstr ""
 "Zeilen, die mit '%c' beginnen, werden ignoriert,\n"
 "und eine leere Beschreibung bricht den Commit ab.\n"
 
-#: builtin/merge.c:900
 msgid "Empty commit message."
 msgstr "Leere Commit-Beschreibung"
 
-#: builtin/merge.c:915
 #, c-format
 msgid "Wonderful.\n"
 msgstr "Wunderbar.\n"
 
-#: builtin/merge.c:976
 #, 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:1015
 msgid "No current branch."
 msgstr "Sie befinden sich auf keinem Branch."
 
-#: builtin/merge.c:1017
 msgid "No remote for the current branch."
 msgstr "Kein Remote-Repository für den aktuellen Branch."
 
-#: builtin/merge.c:1019
 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:1024
 #, c-format
 msgid "No remote-tracking branch for %s from %s"
 msgstr "Kein Remote-Tracking-Branch für %s von %s"
 
-#: builtin/merge.c:1081
 #, c-format
 msgid "Bad value '%s' in environment '%s'"
 msgstr "Fehlerhafter Wert '%s' in Umgebungsvariable '%s'"
 
-#: builtin/merge.c:1183
+#, c-format
+msgid "could not close '%s'"
+msgstr "Konnte '%s' nicht schließen."
+
 #, 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:1217
 msgid "not something we can merge"
 msgstr "nichts was wir zusammenführen können"
 
-#: builtin/merge.c:1330
 msgid "--abort expects no arguments"
 msgstr "--abort akzeptiert keine Argumente"
 
-#: builtin/merge.c:1334
 msgid "There is no merge to abort (MERGE_HEAD missing)."
 msgstr "Es gibt keinen Merge abzubrechen (MERGE_HEAD fehlt)"
 
-#: builtin/merge.c:1352
 msgid "--quit expects no arguments"
 msgstr "--quit erwartet keine Argumente"
 
-#: builtin/merge.c:1365
 msgid "--continue expects no arguments"
 msgstr "--continue erwartet keine Argumente"
 
-#: builtin/merge.c:1369
 msgid "There is no merge in progress (MERGE_HEAD missing)."
 msgstr "Es ist kein Merge im Gange (MERGE_HEAD fehlt)."
 
-#: builtin/merge.c:1385
 msgid ""
 "You have not concluded your merge (MERGE_HEAD exists).\n"
 "Please, commit your changes before you merge."
@@ -18999,7 +8302,6 @@ msgstr ""
 "Sie haben Ihren Merge nicht abgeschlossen (MERGE_HEAD existiert).\n"
 "Bitte committen Sie Ihre Änderungen, bevor Sie den Merge ausführen."
 
-#: builtin/merge.c:1392
 msgid ""
 "You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists).\n"
 "Please, commit your changes before you merge."
@@ -19007,135 +8309,110 @@ msgstr ""
 "Sie haben \"cherry-pick\" nicht abgeschlossen (CHERRY_PICK_HEAD existiert).\n"
 "Bitte committen Sie Ihre Änderungen, bevor Sie den Merge ausführen."
 
-#: builtin/merge.c:1395
 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:1427
 msgid "No commit specified and merge.defaultToUpstream not set."
 msgstr "Kein Commit angegeben und merge.defaultToUpstream ist nicht gesetzt."
 
-#: builtin/merge.c:1444
 msgid "Squash commit into empty head not supported yet"
 msgstr "Squash-Merge auf einen leeren Branch wird noch nicht unterstützt"
 
-#: builtin/merge.c:1446
 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:1451
 #, c-format
 msgid "%s - not something we can merge"
 msgstr "%s - nichts was wir zusammenführen können"
 
-#: builtin/merge.c:1453
 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:1540
 msgid "refusing to merge unrelated histories"
 msgstr "verweigere den Merge von nicht zusammenhängenden Historien"
 
-#: builtin/merge.c:1559
 #, c-format
 msgid "Updating %s..%s\n"
 msgstr "Aktualisiere %s..%s\n"
 
-#: builtin/merge.c:1606
 #, c-format
 msgid "Trying really trivial in-index merge...\n"
 msgstr "Probiere wirklich trivialen \"in-index\"-Merge...\n"
 
-#: builtin/merge.c:1613
 #, c-format
 msgid "Nope.\n"
 msgstr "Nein.\n"
 
-#: builtin/merge.c:1671 builtin/merge.c:1737
 #, c-format
 msgid "Rewinding the tree to pristine...\n"
 msgstr "Rücklauf des Verzeichnisses bis zum Ursprung...\n"
 
-#: builtin/merge.c:1675
 #, c-format
 msgid "Trying merge strategy %s...\n"
 msgstr "Probiere Merge-Strategie %s...\n"
 
-#: builtin/merge.c:1727
 #, c-format
 msgid "No merge strategy handled the merge.\n"
 msgstr "Keine Merge-Strategie behandelt diesen Merge.\n"
 
-#: builtin/merge.c:1729
 #, c-format
 msgid "Merge with strategy %s failed.\n"
 msgstr "Merge mit Strategie %s fehlgeschlagen.\n"
 
-#: builtin/merge.c:1739
 #, 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:1753
 #, c-format
 msgid "Automatic merge went well; stopped before committing as requested\n"
 msgstr ""
 "Automatischer Merge abgeschlossen; halte, wie gewünscht, vor dem Commit an\n"
 
-#: builtin/mktag.c:27
 #, c-format
 msgid "warning: tag input does not pass fsck: %s"
 msgstr "Warnung: Tag-Eingabe ungültig für fsck: %s"
 
-#: builtin/mktag.c:38
 #, c-format
 msgid "error: tag input does not pass fsck: %s"
 msgstr "Fehler: Tag-Eingabe ungültig für fsck: %s"
 
-#: builtin/mktag.c:41
 #, c-format
 msgid "%d (FSCK_IGNORE?) should never trigger this callback"
 msgstr "%d (FSCK_IGNORE?) sollte diesen Aufruf niemals auslösen"
 
-#: builtin/mktag.c:56
 #, c-format
 msgid "could not read tagged object '%s'"
 msgstr "konnte getaggtes Objekt '%s' nicht lesen"
 
-#: builtin/mktag.c:59
 #, c-format
 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
+msgid "could not read from stdin"
+msgstr "konnte nicht von der Standard-Eingabe lesen"
+
 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
 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
 msgid "unable to write tag file"
 msgstr "konnte Tag-Datei nicht schreiben"
 
-#: builtin/mktree.c:154
 msgid "input is NUL terminated"
 msgstr "Eingabe ist durch NUL-Zeichen abgeschlossen"
 
-#: builtin/mktree.c:155 builtin/write-tree.c:26
 msgid "allow missing objects"
 msgstr "fehlende Objekte erlauben"
 
-#: builtin/mktree.c:156
 msgid "allow creation of more than one tree"
 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>][--refs-"
 "snapshot=<path>]"
@@ -19143,45 +8420,38 @@ msgstr ""
 "git multi-pack-index [<Optionen>] write [--preferred-pack=<Paket>][--refs-"
 "snapshot=<Pfad>]"
 
-#: 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:17
 msgid "git multi-pack-index [<options>] expire"
 msgstr "git multi-pack-index [<Optionen>] expire"
 
-#: 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:57
+msgid "directory"
+msgstr "Verzeichnis"
+
 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:98
 msgid "preferred-pack"
 msgstr "bevorzugtes Paket"
 
-#: 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:100
 msgid "write multi-pack bitmap"
 msgstr "schreibe Multi-Pack-Bitmap"
 
-#: builtin/multi-pack-index.c:105
 msgid "write multi-pack index containing only given indexes"
 msgstr "Multi-Pack-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:206
 msgid ""
 "during repack, collect pack-files of smaller size into a batch that is "
 "larger than this size"
@@ -19189,158 +8459,122 @@ msgstr ""
 "während des Umpackens, sammle Paket-Dateien von geringerer Größe in einen "
 "Stapel, welcher größer ist als diese Größe"
 
-#: builtin/mv.c:18
 msgid "git mv [<options>] <source>... <destination>"
 msgstr "git mv [<Optionen>] <Quelle>... <Ziel>"
 
-#: builtin/mv.c:83
 #, c-format
 msgid "Directory %s is in index and no submodule?"
 msgstr "Verzeichnis %s ist zum Commit vorgemerkt und kein Submodul?"
 
-#: builtin/mv.c:85
 msgid "Please stage your changes to .gitmodules or stash them to proceed"
 msgstr ""
 "Bitte merken Sie Ihre Änderungen in .gitmodules zum Commit vor oder "
 "benutzen\n"
 "Sie \"stash\", um fortzufahren."
 
-#: builtin/mv.c:103
 #, c-format
 msgid "%.*s is in index"
 msgstr "%.*s ist zum Commit vorgemerkt"
 
-#: builtin/mv.c:125
 msgid "force move/rename even if target exists"
 msgstr "Verschieben/Umbenennen erzwingen, auch wenn das Ziel existiert"
 
-#: builtin/mv.c:127
 msgid "skip move/rename errors"
 msgstr "Fehler beim Verschieben oder Umbenennen überspringen"
 
-#: builtin/mv.c:172
 #, c-format
 msgid "destination '%s' is not a directory"
 msgstr "Ziel '%s' ist kein Verzeichnis"
 
-#: 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:190
 msgid "bad source"
 msgstr "ungültige Quelle"
 
-#: builtin/mv.c:193
 msgid "can not move directory into itself"
 msgstr "kann Verzeichnis nicht in sich selbst verschieben"
 
-#: builtin/mv.c:196
 msgid "cannot move directory over file"
 msgstr "kann Verzeichnis nicht über Datei verschieben"
 
-#: builtin/mv.c:205
 msgid "source directory is empty"
 msgstr "Quellverzeichnis ist leer"
 
-#: builtin/mv.c:231
 msgid "not under version control"
 msgstr "nicht unter Versionskontrolle"
 
-#: builtin/mv.c:233
 msgid "conflicted"
 msgstr "in Konflikt"
 
-#: builtin/mv.c:236
 msgid "destination exists"
 msgstr "Ziel existiert bereits"
 
-#: builtin/mv.c:244
 #, c-format
 msgid "overwriting '%s'"
 msgstr "überschreibe '%s'"
 
-#: builtin/mv.c:247
 msgid "Cannot overwrite"
 msgstr "Kann nicht überschreiben"
 
-#: builtin/mv.c:250
 msgid "multiple sources for the same target"
 msgstr "mehrere Quellen für dasselbe Ziel"
 
-#: builtin/mv.c:252
 msgid "destination directory does not exist"
 msgstr "Zielverzeichnis existiert nicht"
 
-#: builtin/mv.c:280
 #, c-format
 msgid "%s, source=%s, destination=%s"
 msgstr "%s, Quelle=%s, Ziel=%s"
 
-#: builtin/mv.c:308
 #, c-format
 msgid "Renaming %s to %s\n"
 msgstr "Benenne %s nach %s um\n"
 
-#: builtin/mv.c:314 builtin/remote.c:812 builtin/repack.c:861
 #, c-format
 msgid "renaming '%s' failed"
 msgstr "Umbenennung von '%s' fehlgeschlagen"
 
-#: builtin/name-rev.c:524
 msgid "git name-rev [<options>] <commit>..."
 msgstr "git name-rev [<Optionen>] <Commit>..."
 
-#: builtin/name-rev.c:525
 msgid "git name-rev [<options>] --all"
 msgstr "git name-rev [<Optionen>] --all"
 
-#: builtin/name-rev.c:526
 msgid "git name-rev [<options>] --annotate-stdin"
 msgstr "git name-rev [<Optionen>] --annotate-stdin"
 
-#: builtin/name-rev.c:583
 msgid "print only ref-based names (no object names)"
 msgstr "nur Referenzen-basierte Namen ausgeben (keine Objektnamen)"
 
-#: builtin/name-rev.c:584
 msgid "only use tags to name the commits"
 msgstr "nur Tags verwenden, um die Commits zu benennen"
 
-#: builtin/name-rev.c:586
 msgid "only use refs matching <pattern>"
 msgstr "nur Referenzen verwenden, die <Muster> entsprechen"
 
-#: builtin/name-rev.c:588
 msgid "ignore refs matching <pattern>"
 msgstr "ignoriere Referenzen die <Muster> entsprechen"
 
-#: builtin/name-rev.c:590
 msgid "list all commits reachable from all refs"
 msgstr "alle Commits auflisten, die von allen Referenzen erreichbar sind"
 
-#: builtin/name-rev.c:591
-msgid "deprecated: use annotate-stdin instead"
-msgstr "veraltet: benutzen Sie stattdessen annotate-stdin"
+msgid "deprecated: use --annotate-stdin instead"
+msgstr "veraltet: benutzen Sie stattdessen --annotate-stdin"
 
-#: builtin/name-rev.c:592
 msgid "annotate text from stdin"
 msgstr "annotiere Text von der Standard-Eingabe"
 
-#: builtin/name-rev.c:593
 msgid "allow to print `undefined` names (default)"
 msgstr "Ausgabe von `undefinierten` Namen erlauben (Standard)"
 
-#: builtin/name-rev.c:599
 msgid "dereference tags in the input (internal use)"
 msgstr "Tags in der Eingabe dereferenzieren (interne Verwendung)"
 
-#: builtin/notes.c:28
 msgid "git notes [--ref <notes-ref>] [list [<object>]]"
 msgstr "git notes [--ref <Notiz-Referenz>] [list [<Objekt>]]"
 
-#: builtin/notes.c:29
 msgid ""
 "git notes [--ref <notes-ref>] add [-f] [--allow-empty] [-m <msg> | -F <file> "
 "| (-c | -C) <object>] [<object>]"
@@ -19348,12 +8582,10 @@ msgstr ""
 "git notes [--ref <Notiz-Referenz>] add [-f] [--allow-empty] [-m "
 "<Beschreibung> | -F <Datei> | (-c | -C) <Objekt>] [<Objekt>]"
 
-#: builtin/notes.c:30
 msgid "git notes [--ref <notes-ref>] copy [-f] <from-object> <to-object>"
 msgstr ""
 "git notes [--ref <Notiz-Referenz>] copy [-f] <von-Objekt> <nach-Objekt>"
 
-#: builtin/notes.c:31
 msgid ""
 "git notes [--ref <notes-ref>] append [--allow-empty] [-m <msg> | -F <file> | "
 "(-c | -C) <object>] [<object>]"
@@ -19361,141 +8593,108 @@ msgstr ""
 "git notes [--ref <Notiz-Referenz>] append [--allow-empty] [-m <Beschreibung> "
 "| -F <Datei> | (-c | -C) <Objekt>] [<Objekt>]"
 
-#: builtin/notes.c:32
 msgid "git notes [--ref <notes-ref>] edit [--allow-empty] [<object>]"
 msgstr "git notes [--ref <Notiz-Referenz>] edit [--allow-empty] [<Objekt>]"
 
-#: builtin/notes.c:33
 msgid "git notes [--ref <notes-ref>] show [<object>]"
 msgstr "git notes [--ref <Notiz-Referenz>] show [<Objekt>]"
 
-#: builtin/notes.c:34
 msgid ""
 "git notes [--ref <notes-ref>] merge [-v | -q] [-s <strategy>] <notes-ref>"
 msgstr ""
 "git notes [--ref <Notiz-Referenz>] merge [-v | -q] [-s <Strategie>] <Notiz-"
 "Referenz>"
 
-#: builtin/notes.c:37
 msgid "git notes [--ref <notes-ref>] remove [<object>...]"
 msgstr "git notes [--ref <Notiz-Referenz>] remove [<Objekt>...]"
 
-#: builtin/notes.c:38
 msgid "git notes [--ref <notes-ref>] prune [-n] [-v]"
 msgstr "git notes [--ref <Notiz-Referenz>] prune [-n] [-v]"
 
-#: builtin/notes.c:39
 msgid "git notes [--ref <notes-ref>] get-ref"
 msgstr "git notes [--ref <Notiz-Referenz>] get-ref"
 
-#: builtin/notes.c:44
 msgid "git notes [list [<object>]]"
 msgstr "git notes [list [<Objekt>]]"
 
-#: builtin/notes.c:49
 msgid "git notes add [<options>] [<object>]"
 msgstr "git notes add [<Optionen>] [<Objekt>]"
 
-#: builtin/notes.c:54
 msgid "git notes copy [<options>] <from-object> <to-object>"
 msgstr "git notes copy [<Optionen>] <von-Objekt> <nach-Objekt>"
 
-#: builtin/notes.c:55
 msgid "git notes copy --stdin [<from-object> <to-object>]..."
 msgstr "git notes copy --stdin [<von-Objekt> <nach-Objekt>]..."
 
-#: builtin/notes.c:60
 msgid "git notes append [<options>] [<object>]"
 msgstr "git notes append [<Optionen>] [<Objekt>]"
 
-#: builtin/notes.c:65
 msgid "git notes edit [<object>]"
 msgstr "git notes edit [<Objekt>]"
 
-#: builtin/notes.c:70
 msgid "git notes show [<object>]"
 msgstr "git notes show [<Objekt>]"
 
-#: builtin/notes.c:75
 msgid "git notes merge [<options>] <notes-ref>"
 msgstr "git notes merge [<Optionen>] <Notiz-Referenz>"
 
-#: builtin/notes.c:76
 msgid "git notes merge --commit [<options>]"
 msgstr "git notes merge --commit [<Optionen>]"
 
-#: builtin/notes.c:77
 msgid "git notes merge --abort [<options>]"
 msgstr "git notes merge --abort [<Optionen>]"
 
-#: builtin/notes.c:82
 msgid "git notes remove [<object>]"
 msgstr "git notes remove [<Objekt>]"
 
-#: builtin/notes.c:87
 msgid "git notes prune [<options>]"
 msgstr "git notes prune [<Optionen>]"
 
-#: builtin/notes.c:97
 msgid "Write/edit the notes for the following object:"
 msgstr "Schreiben/Bearbeiten der Notizen für das folgende Objekt:"
 
-#: builtin/notes.c:149
 #, c-format
 msgid "unable to start 'show' for object '%s'"
 msgstr "konnte 'show' für Objekt '%s' nicht starten"
 
-#: builtin/notes.c:153
 msgid "could not read 'show' output"
 msgstr "Konnte Ausgabe von 'show' nicht lesen."
 
-#: builtin/notes.c:161
 #, c-format
 msgid "failed to finish 'show' for object '%s'"
 msgstr "konnte 'show' für Objekt '%s' nicht abschließen"
 
-#: builtin/notes.c:194
 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:203
 msgid "unable to write note object"
 msgstr "Konnte Notiz-Objekt nicht schreiben"
 
-#: 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:240 builtin/tag.c:582
 #, c-format
 msgid "could not open or read '%s'"
 msgstr "konnte '%s' nicht öffnen oder lesen"
 
-#: 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:263
 #, c-format
 msgid "failed to read object '%s'."
 msgstr "Fehler beim Lesen des Objektes '%s'."
 
-#: 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:307
 #, c-format
 msgid "malformed input line: '%s'."
 msgstr "Fehlerhafte Eingabezeile: '%s'."
 
-#: 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'"
@@ -19503,43 +8702,34 @@ msgstr "Fehler beim Kopieren der Notizen von '%s' nach '%s'"
 #. TRANSLATORS: the first %s will be replaced by a git
 #. notes command: 'add', 'merge', 'remove', etc.
 #.
-#: 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: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:408 builtin/notes.c:574
 msgid "note contents as a string"
 msgstr "Notizinhalte als Zeichenkette"
 
-#: builtin/notes.c:411 builtin/notes.c:577
 msgid "note contents in a file"
 msgstr "Notizinhalte in einer Datei"
 
-#: 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:417 builtin/notes.c:583
 msgid "reuse specified note object"
 msgstr "Wiederverwendung des angegebenen Notiz-Objektes"
 
-#: builtin/notes.c:420 builtin/notes.c:586
 msgid "allow storing empty note"
 msgstr "Speichern leerer Notiz erlauben"
 
-#: builtin/notes.c:421 builtin/notes.c:494
 msgid "replace existing notes"
 msgstr "existierende Notizen ersetzen"
 
-#: builtin/notes.c:446
 #, c-format
 msgid ""
 "Cannot add notes. Found existing notes for object %s. Use '-f' to overwrite "
@@ -19548,31 +8738,25 @@ msgstr ""
 "Konnte Notizen nicht hinzufügen. Existierende Notizen für Objekt %s "
 "gefunden. Verwenden Sie '-f', um die existierenden Notizen zu überschreiben."
 
-#: 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:473 builtin/notes.c:635 builtin/notes.c:904
 #, c-format
 msgid "Removing note for object %s\n"
 msgstr "Entferne Notiz für Objekt %s\n"
 
-#: builtin/notes.c:495
 msgid "read objects from stdin"
 msgstr "Objekte von der Standard-Eingabe lesen"
 
-#: 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:515
 msgid "too few arguments"
 msgstr "zu wenige Argumente"
 
-#: builtin/notes.c:536
 #, c-format
 msgid ""
 "Cannot copy notes. Found existing notes for object %s. Use '-f' to overwrite "
@@ -19581,12 +8765,10 @@ msgstr ""
 "Kann Notizen nicht kopieren. Existierende Notizen für Objekt %s gefunden. "
 "Verwenden Sie '-f', um die existierenden Notizen zu überschreiben."
 
-#: 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:601
 #, c-format
 msgid ""
 "The -m/-F/-c/-C options have been deprecated for the 'edit' subcommand.\n"
@@ -19595,52 +8777,40 @@ msgstr ""
 "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:696
 msgid "failed to delete ref NOTES_MERGE_PARTIAL"
 msgstr "Fehler beim Löschen der Referenz NOTES_MERGE_PARTIAL"
 
-#: 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:700
 msgid "failed to remove 'git notes merge' worktree"
 msgstr "Fehler beim Löschen des Arbeitsverzeichnisses von 'git notes merge'."
 
-#: builtin/notes.c:720
 msgid "failed to read ref NOTES_MERGE_PARTIAL"
 msgstr "Fehler beim Lesen der Referenz NOTES_MERGE_PARTIAL"
 
-#: 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:724
 msgid "could not parse commit from NOTES_MERGE_PARTIAL."
 msgstr "Konnte Commit von NOTES_MERGE_PARTIAL nicht parsen."
 
-#: builtin/notes.c:737
 msgid "failed to resolve NOTES_MERGE_REF"
 msgstr "Fehler beim Auflösen von NOTES_MERGE_REF"
 
-#: builtin/notes.c:740
 msgid "failed to finalize notes merge"
 msgstr "Fehler beim Abschließen der Zusammenführung der Notizen."
 
-#: builtin/notes.c:766
 #, c-format
 msgid "unknown notes merge strategy %s"
 msgstr "unbekannte Merge-Strategie '%s' für Notizen"
 
-#: builtin/notes.c:782
 msgid "General options"
 msgstr "Allgemeine Optionen"
 
-#: builtin/notes.c:784
 msgid "Merge options"
 msgstr "Merge-Optionen"
 
-#: builtin/notes.c:786
 msgid ""
 "resolve notes conflicts using the given strategy (manual/ours/theirs/union/"
 "cat_sort_uniq)"
@@ -19648,49 +8818,39 @@ msgstr ""
 "löst Konflikte bei Notizen mit der angegebenen Strategie auf (manual/ours/"
 "theirs/union/cat_sort_uniq)"
 
-#: builtin/notes.c:788
 msgid "Committing unmerged notes"
 msgstr "nicht zusammengeführte Notizen eintragen"
 
-#: 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:792
 msgid "Aborting notes merge resolution"
 msgstr "Konfliktauflösung beim Merge von Notizen abbrechen"
 
-#: builtin/notes.c:794
 msgid "abort notes merge"
 msgstr "Merge von Notizen abbrechen"
 
-#: builtin/notes.c:805
 msgid "cannot mix --commit, --abort or -s/--strategy"
 msgstr "Kann --commit, --abort oder -s/--strategy nicht kombinieren."
 
-#: 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:834
 #, c-format
 msgid "unknown -s/--strategy: %s"
 msgstr "Unbekannter Wert für -s/--strategy: %s"
 
-#: builtin/notes.c:874
 #, 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:878
 #, 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:880
 #, c-format
 msgid ""
 "Automatic notes merge failed. Fix conflicts in %s and commit the result with "
@@ -19702,60 +8862,48 @@ msgstr ""
 "commit',\n"
 "oder brechen Sie den Merge mit 'git notes merge --abort' ab.\n"
 
-#: builtin/notes.c:899 builtin/tag.c:595
 #, c-format
 msgid "Failed to resolve '%s' as a valid ref."
 msgstr "Konnte '%s' nicht als gültige Referenz auflösen."
 
-#: builtin/notes.c:902
 #, c-format
 msgid "Object %s has no note\n"
 msgstr "Objekt %s hat keine Notiz\n"
 
-#: builtin/notes.c:914
 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:917
 msgid "read object names from the standard input"
 msgstr "Objektnamen von der Standard-Eingabe lesen"
 
-#: builtin/notes.c:956 builtin/prune.c:144 builtin/worktree.c:148
 msgid "do not remove, show only"
 msgstr "nicht löschen, nur anzeigen"
 
-#: builtin/notes.c:957
 msgid "report pruned notes"
 msgstr "gelöschte Notizen melden"
 
-#: builtin/notes.c:1000
 msgid "notes-ref"
 msgstr "Notiz-Referenz"
 
-#: builtin/notes.c:1001
 msgid "use notes from <notes-ref>"
 msgstr "Notizen von <Notiz-Referenz> verwenden"
 
-#: builtin/notes.c:1036 builtin/stash.c:1802
 #, c-format
 msgid "unknown subcommand: %s"
 msgstr "Unbekannter Unterbefehl: %s"
 
-#: builtin/pack-objects.c:182
 msgid ""
 "git pack-objects --stdout [<options>...] [< <ref-list> | < <object-list>]"
 msgstr ""
 "git pack-objects --stdout [<Optionen>...] [< <Referenzliste> | < "
 "<Objektliste>]"
 
-#: builtin/pack-objects.c:183
 msgid ""
 "git pack-objects [<options>...] <base-name> [< <ref-list> | < <object-list>]"
 msgstr ""
 "git pack-objects [<Optionen>...] <Basis-Name> [< <Referenzliste> | < "
 "<Objektliste>]"
 
-#: builtin/pack-objects.c:570
 #, c-format
 msgid ""
 "write_reuse_object: could not locate %s, expected at offset %<PRIuMAX> in "
@@ -19764,115 +8912,103 @@ msgstr ""
 "write_reuse_object: konnte %s nicht finden, erwartet bei Offset %<PRIuMAX> "
 "in Paket %s"
 
-#: builtin/pack-objects.c:578
 #, c-format
 msgid "bad packed object CRC for %s"
 msgstr "Ungültiges CRC für gepacktes Objekt %s."
 
-#: builtin/pack-objects.c:589
 #, c-format
 msgid "corrupt packed object for %s"
 msgstr "Fehlerhaftes gepacktes Objekt für %s."
 
-#: builtin/pack-objects.c:720
 #, c-format
 msgid "recursive delta detected for object %s"
 msgstr "Rekursiver Unterschied für Objekt %s festgestellt."
 
-#: builtin/pack-objects.c:939
 #, c-format
 msgid "ordered %u objects, expected %<PRIu32>"
 msgstr "%u Objekte geordnet, %<PRIu32> erwartet."
 
-#: builtin/pack-objects.c:1034
 #, c-format
 msgid "expected object at offset %<PRIuMAX> in pack %s"
 msgstr "Objekt beim Offset %<PRIuMAX> in Paket %s erwartet"
 
-#: builtin/pack-objects.c:1158
 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:1171
 msgid "Writing objects"
 msgstr "Schreibe Objekte"
 
-#: builtin/pack-objects.c:1243 builtin/update-index.c:90
 #, c-format
 msgid "failed to stat %s"
 msgstr "Konnte '%s' nicht lesen"
 
-#: builtin/pack-objects.c:1276
+#, c-format
+msgid "failed utime() on %s"
+msgstr "Fehler beim Aufruf von utime() auf '%s'."
+
 msgid "failed to write bitmap index"
 msgstr "Fehler beim Schreiben des Bitmap-Index"
 
-#: builtin/pack-objects.c:1302
 #, c-format
 msgid "wrote %<PRIu32> objects while expecting %<PRIu32>"
 msgstr "Schrieb %<PRIu32> Objekte während %<PRIu32> erwartet waren."
 
-#: builtin/pack-objects.c:1544
 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:1992
 #, 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:2001
 #, 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:2282
 msgid "Counting objects"
 msgstr "Zähle Objekte"
 
-#: builtin/pack-objects.c:2447
+#, c-format
+msgid "unable to get size of %s"
+msgstr "Konnte Größe von %s nicht bestimmen."
+
 #, c-format
 msgid "unable to parse object header of %s"
 msgstr "Konnte Kopfbereich von Objekt '%s' nicht parsen."
 
-#: builtin/pack-objects.c:2517 builtin/pack-objects.c:2533
-#: builtin/pack-objects.c:2543
 #, c-format
 msgid "object %s cannot be read"
 msgstr "Objekt %s kann nicht gelesen werden."
 
-#: builtin/pack-objects.c:2520 builtin/pack-objects.c:2547
 #, 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:2557
 msgid "suboptimal pack - out of memory"
 msgstr "ungünstiges Packet - Speicher voll"
 
-#: builtin/pack-objects.c:2872
 #, c-format
 msgid "Delta compression using up to %d threads"
 msgstr "Delta-Kompression verwendet bis zu %d Threads."
 
-#: builtin/pack-objects.c:3011
 #, 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:3097
+#, c-format
+msgid "unable to get type of object %s"
+msgstr "konnte Art von Objekt '%s' nicht bestimmen"
+
 msgid "Compressing objects"
 msgstr "Komprimiere Objekte"
 
-#: builtin/pack-objects.c:3103
 msgid "inconsistency with delta count"
 msgstr "Inkonsistenz mit der Anzahl von Deltas"
 
-#: builtin/pack-objects.c:3182
 #, c-format
 msgid ""
 "value of uploadpack.blobpackfileuri must be of the form '<object-hash> <pack-"
@@ -19881,7 +9017,6 @@ msgstr ""
 "Wert für uploadpack.blobpackfileuri muss in der Form '<Objekt-Hash> <Pack-"
 "Hash> <URI>' vorliegen ('%s' erhalten)"
 
-#: builtin/pack-objects.c:3185
 #, c-format
 msgid ""
 "object already configured in another uploadpack.blobpackfileuri (got '%s')"
@@ -19889,18 +9024,27 @@ msgstr ""
 "Objekt bereits in einem anderen uploadpack.blobpackfileuri konfiguriert "
 "('%s' erhalten)"
 
-#: builtin/pack-objects.c:3220
 #, 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:3348 builtin/pack-objects.c:3359
-#: builtin/pack-objects.c:3373
 #, c-format
 msgid "could not find pack '%s'"
 msgstr "Konnte Paket '%s' nicht finden"
 
-#: builtin/pack-objects.c:3416
+#, c-format
+msgid "packfile %s cannot be accessed"
+msgstr "auf Packdatei %s kann nicht zugegriffen werden"
+
+msgid "Enumerating cruft objects"
+msgstr "überflüssige Objekte aufzählen"
+
+msgid "unable to add cruft objects"
+msgstr "konnte überflüssige Objekte nicht hinzufügen"
+
+msgid "Traversing cruft objects"
+msgstr "Überflüssige Objekte durchlaufen"
+
 #, c-format
 msgid ""
 "expected edge object ID, got garbage:\n"
@@ -19909,7 +9053,6 @@ msgstr ""
 "erwartete Randobjekt-ID, erhielt nutzlose Daten:\n"
 " %s"
 
-#: builtin/pack-objects.c:3422
 #, c-format
 msgid ""
 "expected object ID, got garbage:\n"
@@ -19918,255 +9061,220 @@ msgstr ""
 "erwartete Objekt-ID, erhielt nutzlose Daten:\n"
 " %s"
 
-#: builtin/pack-objects.c:3540 builtin/pack-objects.c:3627
+msgid "could not load cruft pack .mtimes"
+msgstr "konnte überflüssiges Paket .mtimes nicht laden"
+
 msgid "cannot open pack index"
 msgstr "kann Paketindex nicht öffnen"
 
-#: builtin/pack-objects.c:3549
 #, c-format
 msgid "loose object at %s could not be examined"
 msgstr "loses Objekt bei %s konnte nicht untersucht werden"
 
-#: builtin/pack-objects.c:3635
 msgid "unable to force loose object"
 msgstr "konnte loses Objekt nicht erzwingen"
 
-#: builtin/pack-objects.c:3763
 #, c-format
 msgid "not a rev '%s'"
 msgstr "'%s' ist kein Commit"
 
-#: builtin/pack-objects.c:3766 builtin/rev-parse.c:1061
 #, c-format
 msgid "bad revision '%s'"
 msgstr "ungültiger Commit '%s'"
 
-#: builtin/pack-objects.c:3794
 msgid "unable to add recent objects"
 msgstr "konnte neuere Objekte nicht hinzufügen"
 
-#: builtin/pack-objects.c:3847
 #, c-format
 msgid "unsupported index version %s"
 msgstr "nicht unterstützte Index-Version %s"
 
-#: builtin/pack-objects.c:3851
 #, c-format
 msgid "bad index version '%s'"
 msgstr "ungültige Index-Version '%s'"
 
-#: builtin/pack-objects.c:3907
 msgid "<version>[,<offset>]"
 msgstr "<Version>[,<Offset>]"
 
-#: builtin/pack-objects.c:3908
 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:3911
 msgid "maximum size of each output pack file"
 msgstr "maximale Größe für jede ausgegebene Paketdatei"
 
-#: builtin/pack-objects.c:3913
 msgid "ignore borrowed objects from alternate object store"
 msgstr "geliehene Objekte von alternativem Objektspeicher ignorieren"
 
-#: builtin/pack-objects.c:3915
 msgid "ignore packed objects"
 msgstr "gepackte Objekte ignorieren"
 
-#: builtin/pack-objects.c:3917
 msgid "limit pack window by objects"
 msgstr "Paketfenster durch Objekte begrenzen"
 
-#: builtin/pack-objects.c:3919
 msgid "limit pack window by memory in addition to object limit"
 msgstr ""
 "Paketfenster, zusätzlich zur Objektbegrenzung, durch Speicher begrenzen"
 
-#: builtin/pack-objects.c:3921
 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:3923
 msgid "reuse existing deltas"
 msgstr "existierende Unterschiede wiederverwenden"
 
-#: builtin/pack-objects.c:3925
 msgid "reuse existing objects"
 msgstr "existierende Objekte wiederverwenden"
 
-#: builtin/pack-objects.c:3927
 msgid "use OFS_DELTA objects"
 msgstr "OFS_DELTA Objekte verwenden"
 
-#: builtin/pack-objects.c:3929
 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:3931
 msgid "do not create an empty pack output"
 msgstr "keine leeren Pakete erzeugen"
 
-#: builtin/pack-objects.c:3933
 msgid "read revision arguments from standard input"
 msgstr "Argumente bezüglich Commits von der Standard-Eingabe lesen"
 
-#: builtin/pack-objects.c:3935
 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:3938
 msgid "include objects reachable from any reference"
 msgstr "Objekte einschließen, die von jeder Referenz erreichbar sind"
 
-#: builtin/pack-objects.c:3941
 msgid "include objects referred by reflog entries"
 msgstr ""
 "Objekte einschließen, die von Einträgen des Reflogs referenziert werden"
 
-#: builtin/pack-objects.c:3944
 msgid "include objects referred to by the index"
 msgstr "Objekte einschließen, die vom Index referenziert werden"
 
-#: builtin/pack-objects.c:3947
 msgid "read packs from stdin"
 msgstr "Pakete von der Standard-Eingabe lesen"
 
-#: builtin/pack-objects.c:3949
 msgid "output pack to stdout"
 msgstr "Paket in die Standard-Ausgabe schreiben"
 
-#: builtin/pack-objects.c:3951
 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:3953
 msgid "keep unreachable objects"
 msgstr "nicht erreichbare Objekte behalten"
 
-#: builtin/pack-objects.c:3955
 msgid "pack loose unreachable objects"
 msgstr "nicht erreichbare lose Objekte packen"
 
-#: builtin/pack-objects.c:3957
 msgid "unpack unreachable objects newer than <time>"
 msgstr "nicht erreichbare Objekte entpacken, die neuer als <Zeit> sind"
 
-#: builtin/pack-objects.c:3960
+msgid "create a cruft pack"
+msgstr "überflüssiges Paket erzeugen"
+
+msgid "expire cruft objects older than <time>"
+msgstr "überflüssige Objekte älter als <Zeit> verfallen lassen"
+
 msgid "use the sparse reachability algorithm"
 msgstr "den \"sparse\" Algorithmus zur Bestimmung der Erreichbarkeit benutzen"
 
-#: builtin/pack-objects.c:3962
 msgid "create thin packs"
 msgstr "dünnere Pakete erzeugen"
 
-#: builtin/pack-objects.c:3964
 msgid "create packs suitable for shallow fetches"
 msgstr ""
 "Pakete geeignet für Abholung mit unvollständiger Historie (shallow) erzeugen"
 
-#: builtin/pack-objects.c:3966
 msgid "ignore packs that have companion .keep file"
 msgstr "Pakete ignorieren, die .keep Dateien haben"
 
-#: builtin/pack-objects.c:3968
 msgid "ignore this pack"
 msgstr "dieses Paket ignorieren"
 
-#: builtin/pack-objects.c:3970
 msgid "pack compression level"
 msgstr "Komprimierungsgrad für Paketierung"
 
-#: builtin/pack-objects.c:3972
 msgid "do not hide commits by grafts"
 msgstr "keine künstlichen Vorgänger-Commits (\"grafts\") verbergen"
 
-#: builtin/pack-objects.c:3974
 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:3976
 msgid "write a bitmap index together with the pack index"
 msgstr "Bitmap-Index zusammen mit Pack-Index schreiben"
 
-#: builtin/pack-objects.c:3980
 msgid "write a bitmap index if possible"
 msgstr "Bitmap-Index schreiben, wenn möglich"
 
-#: builtin/pack-objects.c:3984
 msgid "handling for missing objects"
 msgstr "Behandlung für fehlende Objekte"
 
-#: builtin/pack-objects.c:3987
 msgid "do not pack objects in promisor packfiles"
 msgstr ""
 "keine Objekte aus Packdateien von partiell geklonten Remote-Repositories "
 "packen"
 
-#: builtin/pack-objects.c:3989
 msgid "respect islands during delta compression"
 msgstr "Delta-Islands bei Delta-Kompression beachten"
 
-#: builtin/pack-objects.c:3991
 msgid "protocol"
 msgstr "Protokoll"
 
-#: builtin/pack-objects.c:3992
 msgid "exclude any configured uploadpack.blobpackfileuri with this protocol"
 msgstr ""
 "jegliche konfigurierte uploadpack.blobpackfileuri für dieses Protkoll "
 "ausschließen"
 
-#: builtin/pack-objects.c:4027
 #, 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:4032
 #, c-format
 msgid "pack.deltaCacheLimit is too high, forcing %d"
 msgstr "pack.deltaCacheLimit ist zu hoch, erzwinge %d"
 
-#: builtin/pack-objects.c:4088
+#, c-format
+msgid "bad pack compression level %d"
+msgstr "ungültiger Komprimierungsgrad (%d) für Paketierung"
+
 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:4090
 msgid "minimum pack size limit is 1 MiB"
 msgstr "Minimales Limit für die Paketgröße ist 1 MiB."
 
-#: builtin/pack-objects.c:4095
 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
 msgid "cannot use --filter without --stdout"
 msgstr "Kann --filter nicht ohne --stdout benutzen."
 
-#: builtin/pack-objects.c:4106
 msgid "cannot use --filter with --stdin-packs"
 msgstr "kann --filter nicht mit --stdin-packs benutzen"
 
-#: builtin/pack-objects.c:4110
 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:4169
+msgid "cannot use internal rev list with --cruft"
+msgstr "interne Commit-Liste kann nicht gemeinsam mit --cruft verwendet werden"
+
+msgid "cannot use --stdin-packs with --cruft"
+msgstr "kann --stdin-packs nicht mit --cruft benutzen"
+
+msgid "cannot use --max-pack-size with --cruft"
+msgstr "kann --max-pack-size nicht mit --cruft benutzen"
+
 msgid "Enumerating objects"
 msgstr "Objekte aufzählen"
 
-#: builtin/pack-objects.c:4210
 #, c-format
 msgid ""
 "Total %<PRIu32> (delta %<PRIu32>), reused %<PRIu32> (delta %<PRIu32>), pack-"
@@ -20175,7 +9283,6 @@ msgstr ""
 "Gesamt %<PRIu32> (Delta %<PRIu32>), Wiederverwendet %<PRIu32> (Delta "
 "%<PRIu32>), Pack wiederverwendet %<PRIu32>"
 
-#: builtin/pack-redundant.c:601
 msgid ""
 "'git pack-redundant' is nominated for removal.\n"
 "If you still use this command, please add an extra\n"
@@ -20190,81 +9297,62 @@ msgstr ""
 "Sie es immer noch verwenden, indem Sie eine E-Mail an\n"
 "<git@vger.kernel.org> senden. Danke.\n"
 
-#: builtin/pack-refs.c:8
 msgid "git pack-refs [<options>]"
 msgstr "git pack-refs [<Optionen>]"
 
-#: builtin/pack-refs.c:16
 msgid "pack everything"
 msgstr "alles packen"
 
-#: builtin/pack-refs.c:17
 msgid "prune loose refs (default)"
 msgstr "lose Referenzen entfernen (Standard)"
 
-#: builtin/prune.c:14
 msgid "git prune [-n] [-v] [--progress] [--expire <time>] [--] [<head>...]"
 msgstr "git prune [-n] [-v] [--progress] [--expire <Zeit>] [--] [<Branch>...]"
 
-#: builtin/prune.c:145
 msgid "report pruned objects"
 msgstr "gelöschte Objekte melden"
 
-#: builtin/prune.c:148
 msgid "expire objects older than <time>"
 msgstr "Objekte älter als <Zeit> verfallen lassen"
 
-#: builtin/prune.c:150
 msgid "limit traversal to objects outside promisor packfiles"
 msgstr ""
 "Traversierung auf Objekte außerhalb von Packdateien aus partiell geklonten "
 "Remote-Repositories einschränken"
 
-#: builtin/prune.c:163
 msgid "cannot prune in a precious-objects repo"
 msgstr "kann \"prune\" in precious-objects Repository nicht ausführen"
 
-#: builtin/pull.c:67
 msgid "git pull [<options>] [<repository> [<refspec>...]]"
 msgstr "git pull [<Optionen>] [<Repository> [<Refspec>...]]"
 
-#: builtin/pull.c:124
 msgid "control for recursive fetching of submodules"
 msgstr "rekursive Anforderungen von Submodulen kontrollieren"
 
-#: builtin/pull.c:128
 msgid "Options related to merging"
 msgstr "Optionen bezogen auf Merge"
 
-#: builtin/pull.c:131
 msgid "incorporate changes by rebasing rather than merging"
 msgstr "Integration von Änderungen durch Rebase statt Merge"
 
-#: builtin/pull.c:159 builtin/revert.c:126
 msgid "allow fast-forward"
 msgstr "Vorspulen erlauben"
 
-#: 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:371
 msgid "automatically stash/stash pop before and after"
 msgstr "automatischer Stash/Stash-Pop davor und danach"
 
-#: builtin/pull.c:187
 msgid "Options related to fetching"
 msgstr "Optionen bezogen auf Fetch"
 
-#: builtin/pull.c:197
 msgid "force overwrite of local branch"
 msgstr "das Überschreiben von lokalen Branches erzwingen"
 
-#: builtin/pull.c:205
 msgid "number of submodules pulled in parallel"
 msgstr "Anzahl der parallel mit 'pull' zu verarbeitenden Submodule"
 
-#: builtin/pull.c:449
 msgid ""
 "There is no candidate for rebasing against among the refs that you just "
 "fetched."
@@ -20272,14 +9360,12 @@ msgstr ""
 "Es gibt keinen Kandidaten für Rebase innerhalb der Referenzen, die eben "
 "angefordert wurden."
 
-#: 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:452
 msgid ""
 "Generally this means that you provided a wildcard refspec which had no\n"
 "matches on the remote end."
@@ -20287,7 +9373,6 @@ msgstr ""
 "Im Allgemeinen bedeutet das, dass Sie einen Refspec mit Wildcards angegeben\n"
 "haben, der auf der Gegenseite mit keinen Referenzen übereinstimmt."
 
-#: builtin/pull.c:455
 #, c-format
 msgid ""
 "You asked to pull from the remote '%s', but did not specify\n"
@@ -20299,39 +9384,29 @@ msgstr ""
 "Repository für den aktuellen Branch ist, müssen Sie einen Branch auf\n"
 "der Befehlszeile angeben."
 
-#: builtin/pull.c:460 builtin/rebase.c:978
 msgid "You are not currently on a branch."
 msgstr "Im Moment auf keinem Branch."
 
-#: 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: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:465 builtin/pull.c:480
 msgid "See git-pull(1) for details."
 msgstr "Siehe git-pull(1) für weitere Details."
 
-#: builtin/pull.c:467 builtin/pull.c:473 builtin/pull.c:482
-#: builtin/rebase.c:984
 msgid "<remote>"
 msgstr "<Remote-Repository>"
 
-#: builtin/pull.c:467 builtin/pull.c:482 builtin/pull.c:487
-#: contrib/scalar/scalar.c:374
 msgid "<branch>"
 msgstr "<Branch>"
 
-#: builtin/pull.c:475 builtin/rebase.c:976
 msgid "There is no tracking information for the current branch."
 msgstr "Es gibt keine Tracking-Informationen für den aktuellen Branch."
 
-#: builtin/pull.c:484
 msgid ""
 "If you wish to set tracking information for this branch you can do so with:"
 msgstr ""
@@ -20339,7 +9414,6 @@ msgstr ""
 "Sie\n"
 "dies tun mit:"
 
-#: builtin/pull.c:489
 #, c-format
 msgid ""
 "Your configuration specifies to merge with the ref '%s'\n"
@@ -20349,16 +9423,13 @@ msgstr ""
 "des Remote-Repositories durchzuführen, aber diese Referenz\n"
 "wurde nicht angefordert."
 
-#: builtin/pull.c:600
 #, c-format
 msgid "unable to access commit %s"
 msgstr "Konnte nicht auf Commit '%s' zugreifen."
 
-#: builtin/pull.c:908
 msgid "ignoring --verify-signatures for rebase"
 msgstr "Ignoriere --verify-signatures für Rebase"
 
-#: builtin/pull.c:969
 msgid ""
 "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"
@@ -20388,21 +9459,17 @@ msgstr ""
 "Option --rebase, --no-rebase oder --ff-only auf der Kommandozeile nutzen,\n"
 "um das konfigurierte Standardverhalten pro Aufruf zu überschreiben.\n"
 
-#: builtin/pull.c:1047
 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:1051
 msgid "pull with rebase"
 msgstr "Pull mit Rebase"
 
-#: builtin/pull.c:1052
 msgid "please commit or stash them."
 msgstr "Bitte committen Sie die Änderungen oder benutzen Sie \"stash\"."
 
-#: builtin/pull.c:1077
 #, c-format
 msgid ""
 "fetch updated the current branch head.\n"
@@ -20412,7 +9479,6 @@ msgstr ""
 "\"fetch\" aktualisierte die Spitze des aktuellen Branches.\n"
 "Spule Ihr Arbeitsverzeichnis von Commit %s vor."
 
-#: builtin/pull.c:1083
 #, c-format
 msgid ""
 "Cannot fast-forward your working tree.\n"
@@ -20429,52 +9495,54 @@ msgstr ""
 "$ git reset --hard\n"
 "zur Wiederherstellung aus."
 
-#: builtin/pull.c:1098
 msgid "Cannot merge multiple branches into empty head."
 msgstr "Kann nicht mehrere Branches in einen leeren Branch zusammenführen."
 
-#: builtin/pull.c:1103
 msgid "Cannot rebase onto multiple branches."
 msgstr "Kann Rebase nicht auf mehrere Branches ausführen."
 
-#: builtin/pull.c:1105
 msgid "Cannot fast-forward to multiple branches."
 msgstr "Kann nicht zu mehreren Branches vorspulen."
 
-#: builtin/pull.c:1120
 msgid "Need to specify how to reconcile divergent branches."
 msgstr ""
 "Es muss angegeben werden, wie mit abweichenden Branches umgegangen werden "
 "sollen."
 
-#: builtin/pull.c:1134
 msgid "cannot rebase with locally recorded submodule modifications"
 msgstr ""
 "Kann Rebase nicht mit lokal aufgezeichneten Änderungen in Submodulen "
 "ausführen."
 
-#: builtin/push.c:19
 msgid "git push [<options>] [<repository> [<refspec>...]]"
 msgstr "git push [<Optionen>] [<Repository> [<Refspec>...]]"
 
-#: builtin/push.c:111
 msgid "tag shorthand without <tag>"
 msgstr "Kurzschrift für Tag ohne <Tag>"
 
-#: builtin/push.c:119
 msgid "--delete only accepts plain target ref names"
 msgstr "--delete akzeptiert nur reine Referenznamen als Ziel"
 
-#: builtin/push.c:164
 msgid ""
 "\n"
-"To choose either option permanently, see push.default in 'git help config'."
+"To choose either option permanently, see push.default in 'git help config'.\n"
 msgstr ""
 "\n"
-"Um eine Variante permanent zu verwenden, siehe push.default in 'git help "
-"config'."
+"Um eine Option permanent zu wählen, siehe push.default in 'git help "
+"config'.\n"
+
+msgid ""
+"\n"
+"To avoid automatically configuring upstream branches when their name\n"
+"doesn't match the local branch, see option 'simple' of branch."
+"autoSetupMerge\n"
+"in 'git help config'.\n"
+msgstr ""
+"\n"
+"Um das automatische Konfigurieren von Upstream-Branches zu verhindern,\n"
+"wenn deren Namen nicht mit dem lokalen Branch übereinstimmen, siehe\n"
+"Option 'simple' bei branch.autoSetupMerge in 'git help config'.\n"
 
-#: builtin/push.c:167
 #, c-format
 msgid ""
 "The upstream branch of your current branch does not match\n"
@@ -20486,7 +9554,7 @@ msgid ""
 "To push to the branch of the same name on the remote, use\n"
 "\n"
 "    git push %s HEAD\n"
-"%s"
+"%s%s"
 msgstr ""
 "Der Name des Upstream-Branches stimmt nicht mit dem Namen Ihres\n"
 "aktuellen Branches überein. Um auf den Upstream-Branch in dem Remote-\n"
@@ -20498,9 +9566,8 @@ msgstr ""
 "benutzen Sie:\n"
 "\n"
 "    git push %s HEAD\n"
-"%s"
+"%s%s"
 
-#: builtin/push.c:182
 #, c-format
 msgid ""
 "You are not currently on a branch.\n"
@@ -20515,34 +9582,41 @@ msgstr ""
 "\n"
 "    git push %s HEAD:<Name-des-Remote-Branches>\n"
 
-#: builtin/push.c:191
+msgid ""
+"\n"
+"To have this happen automatically for branches without a tracking\n"
+"upstream, see 'push.autoSetupRemote' in 'git help config'.\n"
+msgstr ""
+"\n"
+"Damit das automatisch für Branches ohne Upstream-Tracking passiert,\n"
+"siehe 'push.autoSetupRemote' in 'git help config'.\n"
+
 #, c-format
 msgid ""
 "The current branch %s has no upstream branch.\n"
 "To push the current branch and set the remote as upstream, use\n"
 "\n"
 "    git push --set-upstream %s %s\n"
+"%s"
 msgstr ""
 "Der aktuelle Branch %s hat keinen Upstream-Branch.\n"
 "Um den aktuellen Branch zu versenden und den Remote-Branch\n"
 "als Upstream-Branch zu setzen, benutzen Sie\n"
 "\n"
 "    git push --set-upstream %s %s\n"
+"%s"
 
-#: builtin/push.c:199
 #, c-format
 msgid "The current branch %s has multiple upstream branches, refusing to push."
 msgstr ""
 "Der aktuelle Branch %s hat mehrere Upstream-Branches, \"push\" verweigert."
 
-#: builtin/push.c:217
 msgid ""
 "You didn't specify any refspecs to push, and push.default is \"nothing\"."
 msgstr ""
 "Sie haben keine Refspec für \"push\" angegeben, und push.default ist "
 "\"nothing\"."
 
-#: builtin/push.c:243
 #, c-format
 msgid ""
 "You are pushing to remote '%s', which is not the upstream of\n"
@@ -20553,7 +9627,6 @@ msgstr ""
 "Branches '%s' ist, ohne anzugeben, was versendet werden soll, um welchen\n"
 "Remote-Branch zu aktualisieren."
 
-#: 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"
@@ -20567,7 +9640,6 @@ msgstr ""
 "Siehe auch die Sektion 'Note about fast-forwards' in 'git push --help'\n"
 "für weitere Details."
 
-#: 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"
@@ -20581,7 +9653,6 @@ msgstr ""
 "Siehe auch die Sektion 'Note about fast-forwards' in 'git push --help'\n"
 "für weitere Details."
 
-#: 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"
@@ -20600,13 +9671,11 @@ msgstr ""
 "Siehe auch die Sektion 'Note about fast-forwards' in 'git push --help'\n"
 "für weitere Details."
 
-#: builtin/push.c:277
 msgid "Updates were rejected because the tag already exists in the remote."
 msgstr ""
 "Aktualisierungen wurden zurückgewiesen, weil das Tag bereits\n"
 "im Remote-Repository existiert."
 
-#: builtin/push.c: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"
@@ -20616,7 +9685,6 @@ msgstr ""
 "das kein Commit ist, oder es auf ein solches Objekt zeigen lassen, ohne\n"
 "die Option '--force' zu verwenden.\n"
 
-#: 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"
@@ -20628,99 +9696,79 @@ msgstr ""
 "diese Änderungen vielleicht lokal integrieren (z. B. 'git pull ...') bevor\n"
 "Sie die Änderungen erzwingen.\n"
 
-#: builtin/push.c:355
 #, c-format
 msgid "Pushing to %s\n"
 msgstr "Push nach %s\n"
 
-#: builtin/push.c:362
 #, c-format
 msgid "failed to push some refs to '%s'"
 msgstr "Fehler beim Versenden einiger Referenzen nach '%s'"
 
-#: builtin/push.c:544 builtin/submodule--helper.c:3377
+#, c-format
+msgid "invalid value for '%s'"
+msgstr "ungültiger Wert für '%s'"
+
 msgid "repository"
 msgstr "Repository"
 
-#: 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:195
 msgid "mirror all refs"
 msgstr "alle Referenzen spiegeln"
 
-#: builtin/push.c:548
 msgid "delete refs"
 msgstr "Referenzen löschen"
 
-#: builtin/push.c:549
 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:196
 msgid "force updates"
 msgstr "Aktualisierung erzwingen"
 
-#: builtin/push.c:553 builtin/send-pack.c:208
 msgid "<refname>:<expect>"
 msgstr "<Referenzname>:<Erwartungswert>"
 
-#: 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:212
 msgid "require remote updates to be integrated locally"
 msgstr "Aktualisierungen des Remote müssen lokal integriert werden"
 
-#: builtin/push.c:560
 msgid "control recursive pushing of submodules"
 msgstr "rekursiven \"push\" von Submodulen steuern"
 
-#: 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:190
-#: builtin/send-pack.c:191
 msgid "receive pack program"
 msgstr "'receive pack' Programm"
 
-#: builtin/push.c:564
 msgid "set upstream for git pull/status"
 msgstr "Upstream für \"git pull/status\" setzen"
 
-#: builtin/push.c:567
 msgid "prune locally removed refs"
 msgstr "lokal gelöschte Referenzen entfernen"
 
-#: builtin/push.c:569
 msgid "bypass pre-push hook"
 msgstr "\"pre-push hook\" umgehen"
 
-#: builtin/push.c:570
 msgid "push missing but relevant tags"
 msgstr "fehlende, aber relevante Tags versenden"
 
-#: 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:204
 msgid "request atomic transaction on remote side"
 msgstr "Referenzen atomar versenden"
 
-#: builtin/push.c:594
 msgid "--delete doesn't make sense without any refs"
 msgstr "--delete kann nur mit Referenzen verwendet werden"
 
-#: builtin/push.c:614
 #, c-format
 msgid "bad repository '%s'"
 msgstr "ungültiges Repository '%s'"
 
-#: builtin/push.c:615
 msgid ""
 "No configured push destination.\n"
 "Either specify the URL from the command-line or configure a remote "
@@ -20742,66 +9790,51 @@ msgstr ""
 "\n"
 "    git push <Name>\n"
 
-#: builtin/push.c:632
 msgid "--all can't be combined with refspecs"
 msgstr "--all kann nicht mit Refspecs kombiniert werden"
 
-#: builtin/push.c:638
 msgid "--mirror can't be combined with refspecs"
 msgstr "--mirror kann nicht mit Refspecs kombiniert werden"
 
-#: builtin/push.c:648
 msgid "push options must not have new line characters"
 msgstr "Push-Optionen dürfen keine Zeilenvorschubzeichen haben"
 
-#: builtin/range-diff.c:9
 msgid "git range-diff [<options>] <old-base>..<old-tip> <new-base>..<new-tip>"
 msgstr ""
 "git range-diff [<Optionen>] <alte-Basis>..<alte-Spitze> <neue-Basis>..<neue-"
 "Spitze>"
 
-#: builtin/range-diff.c:10
 msgid "git range-diff [<options>] <old-tip>...<new-tip>"
 msgstr "git range-diff [<Optionen>] <alte-Spitze>...<neue-Spitze>"
 
-#: builtin/range-diff.c:11
 msgid "git range-diff [<options>] <base> <old-tip> <new-tip>"
 msgstr "git range-diff [<Optionen>] <Basis> <alte-Spitze> <neue-Spitze>"
 
-#: builtin/range-diff.c:30
 msgid "use simple diff colors"
 msgstr "einfache Diff-Farben benutzen"
 
-#: builtin/range-diff.c:32
 msgid "notes"
 msgstr "Notizen"
 
-#: builtin/range-diff.c:32
 msgid "passed to 'git log'"
 msgstr "an 'git log' übergeben"
 
-#: builtin/range-diff.c:35
 msgid "only emit output related to the first range"
 msgstr "nur Ausgaben anzeigen, die sich auf den ersten Bereich beziehen"
 
-#: builtin/range-diff.c:37
 msgid "only emit output related to the second range"
 msgstr "nur Ausgaben anzeigen, die sich auf den zweiten Bereich beziehen"
 
-#: builtin/range-diff.c:60 builtin/range-diff.c:64
 #, c-format
 msgid "not a commit range: '%s'"
 msgstr "kein Commit-Bereich: '%s'"
 
-#: builtin/range-diff.c:74
 msgid "single arg format must be symmetric range"
 msgstr "Format mit einfachem Argument muss symmetrischer Bereich sein."
 
-#: builtin/range-diff.c:89
 msgid "need two commit ranges"
 msgstr "Benötige zwei Commit-Bereiche."
 
-#: builtin/read-tree.c:41
 msgid ""
 "git read-tree [(-m [--trivial] [--aggressive] | --reset | --prefix=<prefix>) "
 "[-u | -i]] [--no-sparse-checkout] [--index-output=<file>] (--empty | <tree-"
@@ -20811,79 +9844,60 @@ msgstr ""
 "[-u | -i]] [--no-sparse-checkout] [--index-output=<Datei>] (--empty | "
 "<Commit-Referenz1> [<Commit-Referenz2> [<Commit-Referenz3>]])"
 
-#: builtin/read-tree.c:116
 msgid "write resulting index to <file>"
 msgstr "resultierenden Index nach <Datei> schreiben"
 
-#: builtin/read-tree.c:119
 msgid "only empty the index"
 msgstr "nur den Index leeren"
 
-#: builtin/read-tree.c:121
 msgid "Merging"
 msgstr "Merge"
 
-#: 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: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: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:129
 msgid "same as -m, but discard unmerged entries"
 msgstr "genau wie -m, aber nicht zusammengeführte Einträge verwerfen"
 
-#: builtin/read-tree.c:130
 msgid "<subdirectory>/"
 msgstr "<Unterverzeichnis>/"
 
-#: 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:134
 msgid "update working tree with merge result"
 msgstr "Arbeitsverzeichnis mit dem Ergebnis des Merges aktualisieren"
 
-#: builtin/read-tree.c:136
 msgid "gitignore"
 msgstr "gitignore"
 
-#: builtin/read-tree.c:137
 msgid "allow explicitly ignored files to be overwritten"
 msgstr "explizit ignorierte Dateien zu überschreiben erlauben"
 
-#: 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:141
 msgid "don't update the index or the work tree"
 msgstr "weder den Index, noch das Arbeitsverzeichnis aktualisieren"
 
-#: builtin/read-tree.c:143
 msgid "skip applying sparse checkout filter"
 msgstr "Anwendung des Filters für partielles Auschecken überspringen"
 
-#: builtin/read-tree.c:145
 msgid "debug unpack-trees"
 msgstr "unpack-trees protokollieren"
 
-#: builtin/read-tree.c:149
 msgid "suppress feedback messages"
 msgstr "Rückmeldungen unterdrücken"
 
-#: builtin/read-tree.c:190
 msgid "You need to resolve your current index first"
 msgstr "Sie müssen zuerst die Konflikte in Ihrem aktuellen Index auflösen."
 
-#: builtin/rebase.c:36
 msgid ""
 "git rebase [-i] [options] [--exec <cmd>] [--onto <newbase> | --keep-base] "
 "[<upstream> [<branch>]]"
@@ -20891,51 +9905,49 @@ msgstr ""
 "git rebase [-i] [<Optionen>] [--exec <Programm>] [--onto <neue-Basis> | --"
 "keep-base] [<Upstream> [<Branch>]]"
 
-#: builtin/rebase.c:38
 msgid ""
 "git rebase [-i] [options] [--exec <cmd>] [--onto <newbase>] --root [<branch>]"
 msgstr ""
 "git rebase [-i] [<Optionen>] [--exec <Programm>] [--onto <neue-Basis>] --"
 "root [<Branch>]"
 
-#: builtin/rebase.c:231
+#, c-format
+msgid "could not read '%s'."
+msgstr "Konnte '%s' nicht lesen."
+
 #, c-format
 msgid "could not create temporary %s"
 msgstr "Konnte temporäres Verzeichnis '%s' nicht erstellen."
 
-#: builtin/rebase.c:237
 msgid "could not mark as interactive"
 msgstr "Markierung auf interaktiven Rebase fehlgeschlagen."
 
-#: builtin/rebase.c:290
 msgid "could not generate todo list"
 msgstr "Konnte TODO-Liste nicht erzeugen."
 
-#: builtin/rebase.c:332
 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:391
 #, c-format
 msgid "%s requires the merge backend"
 msgstr "%s erfordert das Merge-Backend"
 
-#: builtin/rebase.c:433
 #, c-format
 msgid "could not get 'onto': '%s'"
 msgstr "Konnte 'onto' nicht bestimmen: '%s'"
 
-#: builtin/rebase.c:450
 #, c-format
 msgid "invalid orig-head: '%s'"
 msgstr "Ungültiges orig-head: '%s'"
 
-#: builtin/rebase.c:475
 #, c-format
 msgid "ignoring invalid allow_rerere_autoupdate: '%s'"
 msgstr "Ignoriere ungültiges allow_rerere_autoupdate: '%s'"
 
-#: builtin/rebase.c:600
+#, c-format
+msgid "could not remove '%s'"
+msgstr "Konnte '%s' nicht löschen"
+
 msgid ""
 "Resolve all conflicts manually, mark them as resolved with\n"
 "\"git add/rm <conflicted_files>\", then run \"git rebase --continue\".\n"
@@ -20951,7 +9963,6 @@ msgstr ""
 "Um abzubrechen und zurück zum Zustand vor \"git rebase\" zu gelangen,\n"
 "führen Sie \"git rebase --abort\" aus."
 
-#: builtin/rebase.c:685
 #, c-format
 msgid ""
 "\n"
@@ -20971,21 +9982,18 @@ msgstr ""
 "Infolge dessen kann Git auf diesen Revisionen Rebase nicht\n"
 "ausführen."
 
-#: builtin/rebase.c:836
 #, c-format
 msgid "could not switch to %s"
 msgstr "Konnte nicht zu %s wechseln."
 
-#: builtin/rebase.c:952
 #, c-format
 msgid ""
-"unrecognized empty type '%s'; valid values are \"drop\", \"keep\", and \"ask"
-"\"."
+"unrecognized empty type '%s'; valid values are \"drop\", \"keep\", and "
+"\"ask\"."
 msgstr ""
 "nicht erkannter leerer Typ '%s'; gültige Werte sind \"drop\", \"keep\", und "
 "\"ask\"."
 
-#: builtin/rebase.c:970
 #, c-format
 msgid ""
 "%s\n"
@@ -21003,7 +10011,6 @@ msgstr ""
 "    git rebase '<Branch>'\n"
 "\n"
 
-#: builtin/rebase.c:986
 #, c-format
 msgid ""
 "If you wish to set tracking information for this branch you can do so with:\n"
@@ -21017,186 +10024,160 @@ msgstr ""
 "    git branch --set-upstream-to=%s/<Branch> %s\n"
 "\n"
 
-#: builtin/rebase.c:1016
 msgid "exec commands cannot contain newlines"
 msgstr "\"exec\"-Befehle können keine neuen Zeilen enthalten"
 
-#: builtin/rebase.c:1020
 msgid "empty exec command"
 msgstr "Leerer \"exec\"-Befehl."
 
-#: builtin/rebase.c:1051
 msgid "rebase onto given branch instead of upstream"
 msgstr "Rebase auf angegebenen Branch anstelle des Upstream-Branches ausführen"
 
-#: builtin/rebase.c:1053
 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:1055
 msgid "allow pre-rebase hook to run"
 msgstr "Ausführung des pre-rebase-Hooks erlauben"
 
-#: builtin/rebase.c:1057
 msgid "be quiet. implies --no-stat"
 msgstr "weniger Ausgaben (impliziert --no-stat)"
 
-#: builtin/rebase.c:1060
 msgid "display a diffstat of what changed upstream"
 msgstr ""
 "Zusammenfassung der Unterschiede gegenüber dem Upstream-Branch anzeigen"
 
-#: builtin/rebase.c:1063
 msgid "do not show diffstat of what changed upstream"
 msgstr ""
 "Zusammenfassung der Unterschiede gegenüber dem Upstream-Branch verbergen"
 
-#: builtin/rebase.c:1066
 msgid "add a Signed-off-by trailer to each commit"
 msgstr "eine Signed-off-by Zeile zu jedem Commit hinzufügen"
 
-#: builtin/rebase.c:1069
 msgid "make committer date match author date"
 msgstr "Datum des Commit-Erstellers soll mit Datum des Autors übereinstimmen"
 
-#: builtin/rebase.c:1071
 msgid "ignore author date and use current date"
 msgstr "ignoriere Autor-Datum und nutze aktuelles Datum"
 
-#: builtin/rebase.c:1073
 msgid "synonym of --reset-author-date"
 msgstr "Synonym für --reset-author-date"
 
-#: builtin/rebase.c:1075 builtin/rebase.c:1079
 msgid "passed to 'git apply'"
 msgstr "an 'git apply' übergeben"
 
-#: builtin/rebase.c:1077
 msgid "ignore changes in whitespace"
 msgstr "Whitespace-Änderungen ignorieren"
 
-#: builtin/rebase.c:1081 builtin/rebase.c:1084
 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:1086
 msgid "continue"
 msgstr "fortsetzen"
 
-#: builtin/rebase.c:1089
 msgid "skip current patch and continue"
 msgstr "den aktuellen Patch auslassen und fortfahren"
 
-#: builtin/rebase.c:1091
 msgid "abort and check out the original branch"
 msgstr "abbrechen und den ursprünglichen Branch auschecken"
 
-#: builtin/rebase.c:1094
 msgid "abort but keep HEAD where it is"
 msgstr "abbrechen, aber HEAD an aktueller Stelle belassen"
 
-#: builtin/rebase.c:1095
 msgid "edit the todo list during an interactive rebase"
 msgstr "TODO-Liste während eines interaktiven Rebase bearbeiten"
 
-#: builtin/rebase.c:1098
 msgid "show the patch file being applied or merged"
 msgstr "den Patch, der gerade angewendet oder zusammengeführt wird, anzeigen"
 
-#: builtin/rebase.c:1101
 msgid "use apply strategies to rebase"
 msgstr "Strategien von 'git am' bei Rebase verwenden"
 
-#: builtin/rebase.c:1105
 msgid "use merging strategies to rebase"
 msgstr "Merge-Strategien beim Rebase verwenden"
 
-#: builtin/rebase.c:1109
 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:1113
-msgid "(DEPRECATED) try to recreate merges instead of ignoring them"
-msgstr "(VERALTET) Versuche, Merges wiederherzustellen statt sie zu ignorieren"
+msgid "(REMOVED) was: try to recreate merges instead of ignoring them"
+msgstr ""
+"(GELÖSCHT) War: versuchen, Merges wiederherzustellen statt sie zu ignorieren"
 
-#: builtin/rebase.c:1118
 msgid "how to handle commits that become empty"
 msgstr "wie sollen Commits behandelt werden, die leer werden"
 
-#: builtin/rebase.c:1121
 msgid "keep commits which start empty"
 msgstr "behalte Commits, die leer beginnen"
 
-#: builtin/rebase.c:1125
 msgid "move commits that begin with squash!/fixup! under -i"
 msgstr "bei -i Commits verschieben, die mit squash!/fixup! beginnen"
 
-#: builtin/rebase.c:1132
 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:1136
 msgid "allow rebasing commits with empty messages"
 msgstr "Rebase von Commits mit leerer Beschreibung erlauben"
 
-#: builtin/rebase.c:1140
 msgid "try to rebase merges instead of skipping them"
 msgstr "versuchen, Rebase mit Merges auszuführen, statt diese zu überspringen"
 
-#: builtin/rebase.c:1143
 msgid "use 'merge-base --fork-point' to refine upstream"
 msgstr "'merge-base --fork-point' benutzen, um Upstream-Branch zu bestimmen"
 
-#: builtin/rebase.c:1145
 msgid "use the given merge strategy"
 msgstr "angegebene Merge-Strategie verwenden"
 
-#: builtin/rebase.c:1147 builtin/revert.c:115
 msgid "option"
 msgstr "Option"
 
-#: builtin/rebase.c:1148
 msgid "pass the argument through to the merge strategy"
 msgstr "Argument zur Merge-Strategie durchreichen"
 
-#: builtin/rebase.c:1151
 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:1154
 msgid "automatically re-schedule any `exec` that fails"
 msgstr "jeden fehlgeschlagenen `exec`-Befehl neu ansetzen"
 
-#: builtin/rebase.c:1156
 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:1177
 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:1208
-msgid "--preserve-merges was replaced by --rebase-merges"
-msgstr "--preserve-merges wurde durch --rebase-merges ersetzt"
+msgid ""
+"`rebase --preserve-merges` (-p) is no longer supported.\n"
+"Use `git rebase --abort` to terminate current rebase.\n"
+"Or downgrade to v2.33, or earlier, to complete the rebase."
+msgstr ""
+"`rebase --preserve-merges` (-p) wird nicht mehr unterstützt.\n"
+"Nutze `git rebase --abort`, um den aktuellen Rebase abzubrechen.\n"
+"Oder gehe auf Version v2.33, oder früher, zurück, um den Rebase\n"
+"abzuschließen."
+
+msgid ""
+"--preserve-merges was replaced by --rebase-merges\n"
+"Note: Your `pull.rebase` configuration may also be set to 'preserve',\n"
+"which is no longer supported; use 'merges' instead"
+msgstr ""
+"--preserve-merges wurde durch --rebase-merges ersetzt\n"
+"Hinweis: Ihre Konfiguration für `pull.rebase` ist eventuell auch auf\n"
+"'preserve' gesetzt, was nicht länger unterstützt wird; nutzen Sie\n"
+"stattdessen 'merges'"
 
-#: builtin/rebase.c:1230
 msgid "No rebase in progress?"
 msgstr "Kein Rebase im Gange?"
 
-#: builtin/rebase.c:1234
 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:1257 t/helper/test-fast-rebase.c:122
 msgid "Cannot read HEAD"
 msgstr "Kann HEAD nicht lesen"
 
-#: builtin/rebase.c:1269
 msgid ""
 "You must edit all merge conflicts and then\n"
 "mark them as resolved using git add"
@@ -21204,16 +10185,13 @@ msgstr ""
 "Sie müssen alle Merge-Konflikte editieren und diese dann\n"
 "mittels \"git add\" als aufgelöst markieren"
 
-#: builtin/rebase.c:1287
 msgid "could not discard worktree changes"
 msgstr "Konnte Änderungen im Arbeitsverzeichnis nicht verwerfen."
 
-#: builtin/rebase.c:1308
 #, c-format
 msgid "could not move back to %s"
 msgstr "Konnte nicht zu %s zurückgehen."
 
-#: builtin/rebase.c:1354
 #, c-format
 msgid ""
 "It seems that there is already a %s directory, and\n"
@@ -21234,130 +10212,102 @@ msgstr ""
 "und führen Sie diesen Befehl nochmal aus. Es wird angehalten, falls noch\n"
 "etwas Schützenswertes vorhanden ist.\n"
 
-#: builtin/rebase.c:1382
 msgid "switch `C' expects a numerical value"
 msgstr "Schalter `C' erwartet einen numerischen Wert."
 
-#: builtin/rebase.c:1424
 #, c-format
 msgid "Unknown mode: %s"
 msgstr "Unbekannter Modus: %s"
 
-#: builtin/rebase.c:1463
 msgid "--strategy requires --merge or --interactive"
 msgstr "--strategy erfordert --merge oder --interactive"
 
-#: builtin/rebase.c:1492
 msgid "apply options and merge options cannot be used together"
 msgstr ""
 "Optionen für \"am\" und Optionen für \"merge\" können nicht gemeinsam "
 "verwendet werden"
 
-#: builtin/rebase.c:1505
 #, c-format
 msgid "Unknown rebase backend: %s"
 msgstr "Unbekanntes Rebase-Backend: %s"
 
-#: builtin/rebase.c:1534
 msgid "--reschedule-failed-exec requires --exec or --interactive"
 msgstr "--reschedule-failed-exec erfordert --exec oder --interactive"
 
-#: builtin/rebase.c:1565
 #, c-format
 msgid "invalid upstream '%s'"
 msgstr "Ungültiger Upstream '%s'"
 
-#: builtin/rebase.c:1571
 msgid "Could not create new root commit"
 msgstr "Konnte neuen Root-Commit nicht erstellen."
 
-#: builtin/rebase.c:1597
+#, c-format
+msgid "no such branch/commit '%s'"
+msgstr "Branch/Commit '%s' nicht gefunden"
+
+#, c-format
+msgid "No such ref: %s"
+msgstr "Referenz nicht gefunden: %s"
+
+msgid "Could not resolve HEAD to a revision"
+msgstr "Konnte HEAD zu keinem Commit auflösen."
+
 #, 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:1600
 #, c-format
 msgid "'%s': need exactly one merge base"
 msgstr "'%s': benötige genau eine Merge-Basis"
 
-#: builtin/rebase.c:1609
 #, c-format
 msgid "Does not point to a valid commit '%s'"
 msgstr "'%s' zeigt auf keinen gültigen Commit."
 
-#: builtin/rebase.c:1636
-#, c-format
-msgid "no such branch/commit '%s'"
-msgstr "Branch/Commit '%s' nicht gefunden"
-
-#: builtin/rebase.c:1647 builtin/submodule--helper.c:43
-#: builtin/submodule--helper.c:2477
-#, c-format
-msgid "No such ref: %s"
-msgstr "Referenz nicht gefunden: %s"
-
-#: builtin/rebase.c:1658
-msgid "Could not resolve HEAD to a revision"
-msgstr "Konnte HEAD zu keinem Commit auflösen."
-
-#: builtin/rebase.c:1679
 msgid "Please commit or stash them."
 msgstr "Bitte committen Sie die Änderungen oder benutzen Sie \"stash\"."
 
-#: builtin/rebase.c:1714
 msgid "HEAD is up to date."
 msgstr "HEAD ist aktuell."
 
-#: builtin/rebase.c:1716
 #, c-format
 msgid "Current branch %s is up to date.\n"
 msgstr "Aktueller Branch %s ist auf dem neuesten Stand.\n"
 
-#: builtin/rebase.c:1724
 msgid "HEAD is up to date, rebase forced."
 msgstr "HEAD ist aktuell, Rebase erzwungen."
 
-#: builtin/rebase.c:1726
 #, 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:1734
 msgid "The pre-rebase hook refused to rebase."
 msgstr "Der \"pre-rebase hook\" hat den Rebase zurückgewiesen."
 
-#: builtin/rebase.c:1741
 #, c-format
 msgid "Changes to %s:\n"
 msgstr "Änderungen zu %s:\n"
 
-#: builtin/rebase.c:1744
 #, c-format
 msgid "Changes from %s to %s:\n"
 msgstr "Änderungen von %s zu %s:\n"
 
-#: builtin/rebase.c:1769
 #, 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:1781
 msgid "Could not detach HEAD"
 msgstr "Konnte HEAD nicht loslösen."
 
-#: builtin/rebase.c:1790
 #, c-format
 msgid "Fast-forwarded %s to %s.\n"
 msgstr "Spule %s vor zu %s.\n"
 
-#: builtin/receive-pack.c:35
 msgid "git receive-pack <git-dir>"
 msgstr "git receive-pack <Git-Verzeichnis>"
 
-#: builtin/receive-pack.c:1263
 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"
@@ -21389,7 +10339,6 @@ msgstr ""
 "setzen Sie die Konfigurationsvariable 'receive.denyCurrentBranch' auf\n"
 "'refuse'."
 
-#: builtin/receive-pack.c:1283
 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"
@@ -21410,19 +10359,15 @@ msgstr ""
 "\n"
 "Um diese Meldung zu unterdrücken, setzen Sie die Variable auf 'refuse'."
 
-#: builtin/receive-pack.c:2476
 msgid "quiet"
 msgstr "weniger Ausgaben"
 
-#: builtin/receive-pack.c:2491
 msgid "you must specify a directory"
 msgstr "Sie müssen ein Verzeichnis angeben"
 
-#: builtin/reflog.c:9
 msgid "git reflog [show] [<log-options>] [<ref>]"
 msgstr "git reflog [show] [<log-Optionen>] [<Referenz>]"
 
-#: builtin/reflog.c:12
 msgid ""
 "git reflog expire [--expire=<time>] [--expire-unreachable=<time>]\n"
 "                  [--rewrite] [--updateref] [--stale-fix]\n"
@@ -21434,7 +10379,6 @@ msgstr ""
 "                  [--dry-run | -n] [--verbose] [--all [--single-worktree] | "
 "<Referenzen>...]"
 
-#: builtin/reflog.c:17
 msgid ""
 "git reflog delete [--rewrite] [--updateref]\n"
 "                  [--dry-run | -n] [--verbose] <ref>@{<specifier>}..."
@@ -21443,43 +10387,34 @@ msgstr ""
 "                  [--dry-run | -n] [--verbose] "
 "<Referenz>@{<Spezifikation>}..."
 
-#: builtin/reflog.c:21
 msgid "git reflog exists <ref>"
 msgstr "git reflog exists <Referenz>"
 
-#: builtin/reflog.c:197 builtin/reflog.c:211
 #, c-format
 msgid "invalid timestamp '%s' given to '--%s'"
 msgstr "ungültiger Zeitstempel '%s' für '--%s'"
 
-#: builtin/reflog.c:240 builtin/reflog.c:359
 msgid "do not actually prune any entries"
 msgstr "Einträge nicht wirklich löschen"
 
-#: builtin/reflog.c:243 builtin/reflog.c:362
 msgid ""
 "rewrite the old SHA1 with the new SHA1 of the entry that now precedes it"
 msgstr ""
 "den alten SHA1 mit dem neuen SHA1 des Eintrags, der ihm jetzt vorausgeht, "
 "umschreiben"
 
-#: builtin/reflog.c:246 builtin/reflog.c:365
 msgid "update the reference to the value of the top reflog entry"
 msgstr "den Verweis auf den Wert des obersten Reflog-Eintrags aktualisieren"
 
-#: builtin/reflog.c:248 builtin/reflog.c:367
 msgid "print extra information on screen"
 msgstr "gebe zusätzliche Informationen auf dem Bildschirm aus"
 
-#: builtin/reflog.c:249 builtin/reflog.c:253
 msgid "timestamp"
 msgstr "Zeitstempel"
 
-#: builtin/reflog.c:250
 msgid "prune entries older than the specified time"
 msgstr "lösche Einträge älter als die angegebene Zeit"
 
-#: builtin/reflog.c:254
 msgid ""
 "prune entries older than <time> that are not reachable from the current tip "
 "of the branch"
@@ -21487,39 +10422,31 @@ msgstr ""
 "entferne Einträge älter als <Zeit>, die nicht von der aktuellen Spitze des "
 "Branches erreichbar sind"
 
-#: builtin/reflog.c:258
 msgid "prune any reflog entries that point to broken commits"
 msgstr "lösche alle Reflog-Einträge die auf einen fehlerhaften Commit zeigen"
 
-#: builtin/reflog.c:259
 msgid "process the reflogs of all references"
 msgstr "Reflogs von allen Referenzen verarbeiten"
 
-#: builtin/reflog.c:261
 msgid "limits processing to reflogs from the current worktree only"
 msgstr ""
 "Verarbeitung der Reflogs auf das aktuelle Arbeitsverzeichnis beschränken"
 
-#: builtin/reflog.c:294
 #, c-format
 msgid "Marking reachable objects..."
 msgstr "Markiere nicht erreichbare Objekte..."
 
-#: builtin/reflog.c:338
 #, c-format
 msgid "%s points nowhere!"
 msgstr "%s zeigt auf nichts!"
 
-#: builtin/reflog.c:374
 msgid "no reflog specified to delete"
 msgstr "Kein Reflog zum Löschen angegeben."
 
-#: builtin/reflog.c:396
 #, c-format
 msgid "invalid ref format: %s"
 msgstr "Ungültiges Format für Referenzen: %s"
 
-#: builtin/remote.c:19
 msgid ""
 "git remote add [-t <branch>] [-m <master>] [-f] [--tags | --no-tags] [--"
 "mirror=<fetch|push>] <name> <url>"
@@ -21527,87 +10454,67 @@ msgstr ""
 "git remote add [-t <Branch>] [-m <master>] [-f] [--tags | --no-tags] [--"
 "mirror=<fetch|push>] <Name> <URL>"
 
-#: builtin/remote.c:20 builtin/remote.c:40
 msgid "git remote rename [--[no-]progress] <old> <new>"
 msgstr "git remote rename [--[no-]progress] <alt> <neu>"
 
-#: builtin/remote.c:21 builtin/remote.c:45
 msgid "git remote remove <name>"
 msgstr "git remote remove <Name>"
 
-#: builtin/remote.c:22 builtin/remote.c:50
 msgid "git remote set-head <name> (-a | --auto | -d | --delete | <branch>)"
 msgstr "git remote set-head <Name> (-a | --auto | -d | --delete | <Branch>)"
 
-#: builtin/remote.c:23
 msgid "git remote [-v | --verbose] show [-n] <name>"
 msgstr "git remote [-v | --verbose] show [-n] <Name>"
 
-#: builtin/remote.c:24
 msgid "git remote prune [-n | --dry-run] <name>"
 msgstr "git remote prune [-n | --dry-run] <Name>"
 
-#: builtin/remote.c:25
 msgid ""
 "git remote [-v | --verbose] update [-p | --prune] [(<group> | <remote>)...]"
 msgstr ""
 "git remote [-v | --verbose] update [-p | --prune] [(<Gruppe> | <Remote>)...]"
 
-#: builtin/remote.c:26
 msgid "git remote set-branches [--add] <name> <branch>..."
 msgstr "git remote set-branches [--add] <Name> <Branch>..."
 
-#: builtin/remote.c:27 builtin/remote.c:76
 msgid "git remote get-url [--push] [--all] <name>"
 msgstr "git remote get-url [--push] [--all] <Name>"
 
-#: builtin/remote.c:28 builtin/remote.c:81
 msgid "git remote set-url [--push] <name> <newurl> [<oldurl>]"
 msgstr "git remote set-url [--push] <Name> <neueURL> [<alteURL>]"
 
-#: builtin/remote.c:29 builtin/remote.c:82
 msgid "git remote set-url --add <name> <newurl>"
 msgstr "git remote set-url --add <Name> <neueURL>"
 
-#: builtin/remote.c:30 builtin/remote.c:83
 msgid "git remote set-url --delete <name> <url>"
 msgstr "git remote set-url --delete <Name> <URL>"
 
-#: builtin/remote.c:35
 msgid "git remote add [<options>] <name> <url>"
 msgstr "git remote add [<Optionen>] <Name> <URL>"
 
-#: builtin/remote.c:55
 msgid "git remote set-branches <name> <branch>..."
 msgstr "git remote set-branches <Name> <Branch>..."
 
-#: builtin/remote.c:56
 msgid "git remote set-branches --add <name> <branch>..."
 msgstr "git remote set-branches --add <Name> <Branch>..."
 
-#: builtin/remote.c:61
 msgid "git remote show [<options>] <name>"
 msgstr "git remote show [<Optionen>] <Name>"
 
-#: builtin/remote.c:66
 msgid "git remote prune [<options>] <name>"
 msgstr "git remote prune [<Optionen>] <Name>"
 
-#: builtin/remote.c:71
 msgid "git remote update [<options>] [<group> | <remote>]..."
 msgstr "git remote update [<Optionen>] [<Gruppe> | <externesRepository>]..."
 
-#: builtin/remote.c:100
 #, c-format
 msgid "Updating %s"
 msgstr "Aktualisiere %s"
 
-#: builtin/remote.c:102
 #, c-format
 msgid "Could not fetch %s"
 msgstr "Konnte nicht von %s anfordern"
 
-#: builtin/remote.c:132
 msgid ""
 "--mirror is dangerous and deprecated; please\n"
 "\t use --mirror=fetch or --mirror=push instead"
@@ -21615,82 +10522,73 @@ msgstr ""
 "--mirror ist gefährlich und veraltet; bitte\n"
 "\t benutzen Sie stattdessen --mirror=fetch oder --mirror=push"
 
-#: builtin/remote.c:149
 #, c-format
 msgid "unknown mirror argument: %s"
 msgstr "unbekanntes Argument für Option mirror: %s"
 
-#: builtin/remote.c:165
 msgid "fetch the remote branches"
 msgstr "die Remote-Branches anfordern"
 
-#: builtin/remote.c:167
 msgid "import all tags and associated objects when fetching"
 msgstr "alle Tags und verbundene Objekte beim Anfordern importieren"
 
-#: builtin/remote.c:170
 msgid "or do not fetch any tag at all (--no-tags)"
 msgstr "oder fordere gar keine Tags an (--no-tags)"
 
-#: builtin/remote.c:172
 msgid "branch(es) to track"
 msgstr "Branch(es) zur Übernahme"
 
-#: builtin/remote.c:173
 msgid "master branch"
 msgstr "Hauptbranch"
 
-#: builtin/remote.c:175
 msgid "set up remote as a mirror to push to or fetch from"
 msgstr ""
 "Aufsetzen des Remote-Repositories als Spiegel-Repository für \"push\" und "
 "\"fetch\""
 
-#: builtin/remote.c:187
 msgid "specifying a master branch makes no sense with --mirror"
 msgstr ""
 "--mirror kann nicht mit der Angabe eines Hauptbranches verwendet werden"
 
-#: builtin/remote.c:189
 msgid "specifying branches to track makes sense only with fetch mirrors"
 msgstr ""
 "die Angabe von zu folgenden Branches kann nur mit dem Anfordern von "
 "Spiegelarchiven verwendet werden"
 
-#: builtin/remote.c:196 builtin/remote.c:716
 #, c-format
 msgid "remote %s already exists."
 msgstr "externes Repository %s existiert bereits."
 
-#: builtin/remote.c:241
 #, c-format
 msgid "Could not setup master '%s'"
 msgstr "Konnte symbolische Referenz für Hauptbranch von '%s' nicht einrichten"
 
-#: builtin/remote.c:323
+#, c-format
+msgid "more than one %s"
+msgstr "mehr als ein %s"
+
 #, c-format
 msgid "unhandled branch.%s.rebase=%s; assuming 'true'"
 msgstr "unbehandeltes branch.%s.rebase=%s; 'true' wird angenommen"
 
-#: builtin/remote.c:367
 #, c-format
 msgid "Could not get fetch map for refspec %s"
 msgstr "Konnte Fetch-Map für Refspec %s nicht bekommen"
 
-#: builtin/remote.c:461 builtin/remote.c:469
 msgid "(matching)"
 msgstr "(übereinstimmend)"
 
-#: builtin/remote.c:473
 msgid "(delete)"
 msgstr "(lösche)"
 
-#: builtin/remote.c:664
 #, c-format
 msgid "could not set '%s'"
 msgstr "konnte '%s' nicht setzen"
 
-#: builtin/remote.c:669
+#, c-format
+msgid "could not unset '%s'"
+msgstr "Konnte '%s' nicht aufheben."
+
 #, c-format
 msgid ""
 "The %s configuration remote.pushDefault in:\n"
@@ -21701,17 +10599,14 @@ msgstr ""
 "\t%s:%d\n"
 "benennt jetzt das nicht existierende Remote-Repository '%s'"
 
-#: builtin/remote.c:707 builtin/remote.c:866 builtin/remote.c:973
 #, c-format
 msgid "No such remote: '%s'"
 msgstr "Remote-Repository nicht gefunden: '%s'"
 
-#: builtin/remote.c:726
 #, c-format
 msgid "Could not rename config section '%s' to '%s'"
 msgstr "Konnte Sektion '%s' in Konfiguration nicht nach '%s' umbenennen"
 
-#: builtin/remote.c:746
 #, c-format
 msgid ""
 "Not updating non-default fetch refspec\n"
@@ -21722,21 +10617,17 @@ msgstr ""
 "\t%s\n"
 "\tBitte aktualisieren Sie, falls notwendig, die Konfiguration manuell."
 
-#: builtin/remote.c:783
 msgid "Renaming remote references"
 msgstr "Umbenennen von Remote-Referenzen"
 
-#: builtin/remote.c:794
 #, c-format
 msgid "deleting '%s' failed"
 msgstr "Konnte '%s' nicht löschen"
 
-#: builtin/remote.c:832
 #, c-format
 msgid "creating '%s' failed"
 msgstr "Konnte '%s' nicht erstellen"
 
-#: builtin/remote.c:912
 msgid ""
 "Note: A branch outside the refs/remotes/ hierarchy was not removed;\n"
 "to delete it, use:"
@@ -21752,118 +10643,93 @@ msgstr[1] ""
 "entfernt;\n"
 "um diese zu entfernen, benutzen Sie:"
 
-#: builtin/remote.c:926
 #, c-format
 msgid "Could not remove config section '%s'"
 msgstr "Konnte Sektion '%s' nicht aus Konfiguration entfernen"
 
-#: builtin/remote.c:1034
 #, 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:1037
 msgid " tracked"
 msgstr " gefolgt"
 
-#: builtin/remote.c:1039
 msgid " stale (use 'git remote prune' to remove)"
 msgstr " veraltet (benutzen Sie 'git remote prune' zum Löschen)"
 
-#: builtin/remote.c:1041
 msgid " ???"
 msgstr " ???"
 
-#: builtin/remote.c:1082
 #, 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:1091
 #, c-format
 msgid "rebases interactively onto remote %s"
 msgstr "interaktiver Rebase auf Remote-Branch %s"
 
-#: builtin/remote.c:1093
 #, c-format
 msgid "rebases interactively (with merges) onto remote %s"
 msgstr "interaktiver Rebase (mit Merges) auf Remote-Branch %s"
 
-#: builtin/remote.c:1096
 #, c-format
 msgid "rebases onto remote %s"
 msgstr "Rebase auf Remote-Branch %s"
 
-#: builtin/remote.c:1100
 #, c-format
 msgid " merges with remote %s"
 msgstr " führt mit Remote-Branch %s zusammen"
 
-#: builtin/remote.c:1103
 #, c-format
 msgid "merges with remote %s"
 msgstr "führt mit Remote-Branch %s zusammen"
 
-#: builtin/remote.c:1106
 #, c-format
 msgid "%-*s    and with remote %s\n"
 msgstr "%-*s    und mit Remote-Branch %s\n"
 
-#: builtin/remote.c:1149
 msgid "create"
 msgstr "erstellt"
 
-#: builtin/remote.c:1152
 msgid "delete"
 msgstr "gelöscht"
 
-#: builtin/remote.c:1156
 msgid "up to date"
 msgstr "aktuell"
 
-#: builtin/remote.c:1159
 msgid "fast-forwardable"
 msgstr "vorspulbar"
 
-#: builtin/remote.c:1162
 msgid "local out of date"
 msgstr "lokal nicht aktuell"
 
-#: builtin/remote.c:1169
 #, c-format
 msgid "    %-*s forces to %-*s (%s)"
 msgstr "    %-*s erzwingt Versandt nach %-*s (%s)"
 
-#: builtin/remote.c:1172
 #, c-format
 msgid "    %-*s pushes to %-*s (%s)"
 msgstr "    %-*s versendet nach %-*s (%s)"
 
-#: builtin/remote.c:1176
 #, c-format
 msgid "    %-*s forces to %s"
 msgstr "    %-*s erzwingt Versand nach %s"
 
-#: builtin/remote.c:1179
 #, c-format
 msgid "    %-*s pushes to %s"
 msgstr "    %-*s versendet nach %s"
 
-#: builtin/remote.c:1247
 msgid "do not query remotes"
 msgstr "keine Abfrage von Remote-Repositories"
 
-#: builtin/remote.c:1268
 #, c-format
 msgid "* remote %s"
 msgstr "* Remote-Repository %s"
 
-#: builtin/remote.c:1269
 #, c-format
 msgid "  Fetch URL: %s"
 msgstr "  URL zum Abholen: %s"
 
-#: builtin/remote.c:1270 builtin/remote.c:1286 builtin/remote.c:1423
 msgid "(no URL)"
 msgstr "(keine URL)"
 
@@ -21871,25 +10737,20 @@ msgstr "(keine URL)"
 #. with the one in " Fetch URL: %s"
 #. translation.
 #.
-#: builtin/remote.c:1284 builtin/remote.c:1286
 #, c-format
 msgid "  Push  URL: %s"
 msgstr "  URL zum Versenden: %s"
 
-#: builtin/remote.c:1288 builtin/remote.c:1290 builtin/remote.c:1292
 #, c-format
 msgid "  HEAD branch: %s"
 msgstr "  Hauptbranch: %s"
 
-#: builtin/remote.c:1288
 msgid "(not queried)"
 msgstr "(nicht abgefragt)"
 
-#: builtin/remote.c:1290
 msgid "(unknown)"
 msgstr "(unbekannt)"
 
-#: builtin/remote.c:1294
 #, c-format
 msgid ""
 "  HEAD branch (remote HEAD is ambiguous, may be one of the following):\n"
@@ -21897,346 +10758,281 @@ msgstr ""
 "  Hauptbranch (externer HEAD ist mehrdeutig, könnte einer der folgenden "
 "sein):\n"
 
-#: builtin/remote.c:1306
 #, c-format
 msgid "  Remote branch:%s"
 msgid_plural "  Remote branches:%s"
 msgstr[0] "  Remote-Branch:%s"
 msgstr[1] "  Remote-Branches:%s"
 
-#: builtin/remote.c:1309 builtin/remote.c:1335
 msgid " (status not queried)"
 msgstr " (Zustand nicht abgefragt)"
 
-#: builtin/remote.c:1318
 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:1326
 msgid "  Local refs will be mirrored by 'git push'"
 msgstr "  Lokale Referenzen werden von 'git push' gespiegelt"
 
-#: builtin/remote.c:1332
 #, 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:1353
 msgid "set refs/remotes/<name>/HEAD according to remote"
 msgstr "setzt refs/remotes/<Name>/HEAD gemäß dem Remote-Repository"
 
-#: builtin/remote.c:1355
 msgid "delete refs/remotes/<name>/HEAD"
 msgstr "entfernt refs/remotes/<Name>/HEAD"
 
-#: builtin/remote.c:1369
 msgid "Cannot determine remote HEAD"
 msgstr "Kann HEAD des Remote-Repositories nicht bestimmen"
 
-#: builtin/remote.c:1371
 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:1381
 #, c-format
 msgid "Could not delete %s"
 msgstr "Konnte %s nicht entfernen"
 
-#: builtin/remote.c:1389
 #, c-format
 msgid "Not a valid ref: %s"
 msgstr "keine gültige Referenz: %s"
 
-#: builtin/remote.c:1391
 #, c-format
 msgid "Could not setup %s"
 msgstr "Konnte %s nicht einrichten"
 
-#: builtin/remote.c:1409
 #, c-format
 msgid " %s will become dangling!"
 msgstr " %s wird unreferenziert!"
 
-#: builtin/remote.c:1410
 #, c-format
 msgid " %s has become dangling!"
 msgstr " %s wurde unreferenziert!"
 
-#: builtin/remote.c:1419
 #, c-format
 msgid "Pruning %s"
 msgstr "entferne veraltete Branches von %s"
 
-#: builtin/remote.c:1420
 #, c-format
 msgid "URL: %s"
 msgstr "URL: %s"
 
-#: builtin/remote.c:1436
 #, c-format
 msgid " * [would prune] %s"
 msgstr " * [würde veralteten Branch entfernen] %s"
 
-#: builtin/remote.c:1439
 #, c-format
 msgid " * [pruned] %s"
 msgstr "* [veralteten Branch entfernt] %s"
 
-#: builtin/remote.c:1484
 msgid "prune remotes after fetching"
 msgstr "entferne veraltete Branches im Remote-Repository nach \"fetch\""
 
-#: builtin/remote.c:1548 builtin/remote.c:1604 builtin/remote.c:1674
 #, c-format
 msgid "No such remote '%s'"
 msgstr "Remote-Repository '%s' nicht gefunden"
 
-#: builtin/remote.c:1566
 msgid "add branch"
 msgstr "Branch hinzufügen"
 
-#: builtin/remote.c:1573
 msgid "no remote specified"
 msgstr "kein Remote-Repository angegeben"
 
-#: builtin/remote.c:1590
 msgid "query push URLs rather than fetch URLs"
 msgstr "nur URLs für Push ausgeben"
 
-#: builtin/remote.c:1592
 msgid "return all URLs"
 msgstr "alle URLs ausgeben"
 
-#: builtin/remote.c:1622
 #, c-format
 msgid "no URLs configured for remote '%s'"
 msgstr "Keine URLs für Remote-Repository '%s' konfiguriert."
 
-#: builtin/remote.c:1648
 msgid "manipulate push URLs"
 msgstr "URLs für \"push\" manipulieren"
 
-#: builtin/remote.c:1650
 msgid "add URL"
 msgstr "URL hinzufügen"
 
-#: builtin/remote.c:1652
 msgid "delete URLs"
 msgstr "URLs löschen"
 
-#: builtin/remote.c:1659
 msgid "--add --delete doesn't make sense"
 msgstr "--add und --delete können nicht gemeinsam verwendet werden"
 
-#: builtin/remote.c:1700
 #, c-format
 msgid "Invalid old URL pattern: %s"
 msgstr "ungültiges altes URL Format: %s"
 
-#: builtin/remote.c:1708
 #, c-format
 msgid "No such URL found: %s"
 msgstr "URL nicht gefunden: %s"
 
-#: builtin/remote.c:1710
 msgid "Will not delete all non-push URLs"
 msgstr "Werde keine URLs entfernen, die nicht für \"push\" bestimmt sind"
 
-#: builtin/remote.c:1727
 msgid "be verbose; must be placed before a subcommand"
 msgstr "erweiterte Ausgaben; muss vor einem Unterbefehl angegeben werden"
 
-#: builtin/repack.c:29
 msgid "git repack [<options>]"
 msgstr "git repack [<Optionen>]"
 
-#: builtin/repack.c:34
 msgid ""
 "Incremental repacks are incompatible with bitmap indexes.  Use\n"
-"--no-write-bitmap-index or disable the pack.writebitmaps configuration."
+"--no-write-bitmap-index or disable the pack.writeBitmaps configuration."
 msgstr ""
 "Schrittweises Neupacken ist mit Bitmap-Indexen inkompatibel. Benutzen Sie\n"
-"--no-write-bitmap-index oder deaktivieren Sie die pack.writebitmaps\n"
+"--no-write-bitmap-index oder deaktivieren Sie die pack.writeBitmaps\n"
 "Konfiguration."
 
-#: builtin/repack.c:206
 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:280 builtin/repack.c:824
 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:304
 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:319
 #, c-format
 msgid "cannot open index for %s"
 msgstr "konnte Index für %s nicht öffnen"
 
-#: builtin/repack.c:378
 #, 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:411 builtin/repack.c:418 builtin/repack.c:423
 #, c-format
 msgid "pack %s too large to roll up"
 msgstr "Paket %s zu groß zum Aufrollen"
 
-#: builtin/repack.c:503
 #, c-format
 msgid "could not open tempfile %s for writing"
 msgstr "konnte temporäre Datei '%s' nicht zum Schreiben öffnen"
 
-#: builtin/repack.c:521
 msgid "could not close refs snapshot tempfile"
 msgstr "konnte temporäre Referenzen-Snapshot-Datei nicht schließen"
 
-#: builtin/repack.c:634
 msgid "pack everything in a single pack"
 msgstr "alles in eine einzige Pack-Datei packen"
 
-#: builtin/repack.c:636
 msgid "same as -a, and turn unreachable objects loose"
 msgstr "genau wie -a, unerreichbare Objekte werden aber nicht gelöscht"
 
-#: builtin/repack.c:639
+msgid "same as -a, pack unreachable cruft objects separately"
+msgstr "genau wie -a, unerreichbare überflüssige Objekte separat packen"
+
+msgid "approxidate"
+msgstr "Datumsangabe"
+
+msgid "with -C, expire objects older than this"
+msgstr "mit -C, Objekte älter als angegeben verfallen lassen"
+
 msgid "remove redundant packs, and run git-prune-packed"
 msgstr "redundante Pakete entfernen und \"git-prune-packed\" ausführen"
 
-#: builtin/repack.c:641
 msgid "pass --no-reuse-delta to git-pack-objects"
 msgstr "--no-reuse-delta an git-pack-objects übergeben"
 
-#: builtin/repack.c:643
 msgid "pass --no-reuse-object to git-pack-objects"
 msgstr "--no-reuse-object an git-pack-objects übergeben"
 
-#: builtin/repack.c:645
 msgid "do not run git-update-server-info"
 msgstr "git-update-server-info nicht ausführen"
 
-#: builtin/repack.c:648
 msgid "pass --local to git-pack-objects"
 msgstr "--local an git-pack-objects übergeben"
 
-#: builtin/repack.c:650
 msgid "write bitmap index"
 msgstr "Bitmap-Index schreiben"
 
-#: builtin/repack.c:652
 msgid "pass --delta-islands to git-pack-objects"
 msgstr "--delta-islands an git-pack-objects übergeben"
 
-#: builtin/repack.c:653
-msgid "approxidate"
-msgstr "Datumsangabe"
-
-#: builtin/repack.c:654
 msgid "with -A, do not loosen objects older than this"
 msgstr "mit -A, keine Objekte älter als dieses Datum löschen"
 
-#: builtin/repack.c:656
 msgid "with -a, repack unreachable objects"
 msgstr "mit -a, nicht erreichbare Objekte neu packen"
 
-#: builtin/repack.c:658
 msgid "size of the window used for delta compression"
 msgstr "Größe des Fensters für die Delta-Kompression"
 
-#: builtin/repack.c:659 builtin/repack.c:665
 msgid "bytes"
 msgstr "Bytes"
 
-#: builtin/repack.c:660
 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:662
 msgid "limits the maximum delta depth"
 msgstr "die maximale Delta-Tiefe limitieren"
 
-#: builtin/repack.c:664
 msgid "limits the maximum number of threads"
 msgstr "maximale Anzahl von Threads limitieren"
 
-#: builtin/repack.c:666
 msgid "maximum size of each packfile"
 msgstr "maximale Größe für jede Paketdatei"
 
-#: builtin/repack.c:668
 msgid "repack objects in packs marked with .keep"
 msgstr ""
 "Objekte umpacken, die sich in mit .keep markierten Pack-Dateien befinden"
 
-#: builtin/repack.c:670
 msgid "do not repack this pack"
 msgstr "dieses Paket nicht neu packen"
 
-#: builtin/repack.c:672
 msgid "find a geometric progression with factor <N>"
 msgstr "eine geometrische Progression mit Faktor <N> finden"
 
-#: builtin/repack.c:674
 msgid "write a multi-pack index of the resulting packs"
 msgstr "ein Multi-Pack-Index des resultierenden Pakets schreiben"
 
-#: builtin/repack.c:684
 msgid "cannot delete packs in a precious-objects repo"
 msgstr "kann Pack-Dateien in precious-objects Repository nicht löschen"
 
-#: builtin/repack.c:833
 msgid "Nothing new to pack."
 msgstr "Nichts Neues zum Packen."
 
-#: builtin/repack.c:863
+#, c-format
+msgid "pack prefix %s does not begin with objdir %s"
+msgstr "Pack-Präfix %s fängt nicht mit objdir %s an"
+
 #, c-format
 msgid "missing required file: %s"
 msgstr "benötigte Datei fehlt: %s"
 
-#: builtin/repack.c:865
 #, c-format
 msgid "could not unlink: %s"
 msgstr "konnte nicht löschen: %s"
 
-#: builtin/replace.c:22
 msgid "git replace [-f] <object> <replacement>"
 msgstr "git replace [-f] <Objekt> <Ersetzung>"
 
-#: builtin/replace.c:23
 msgid "git replace [-f] --edit <object>"
 msgstr "git replace [-f] --edit <Objekt>"
 
-#: builtin/replace.c:24
 msgid "git replace [-f] --graft <commit> [<parent>...]"
 msgstr "git replace [-f] --graft <Commit> [<Eltern-Commit>...]"
 
-#: builtin/replace.c:26
 msgid "git replace -d <object>..."
 msgstr "git replace -d <Objekt>..."
 
-#: builtin/replace.c:27
 msgid "git replace [--format=<format>] [-l [<pattern>]]"
 msgstr "git replace [--format=<Format>] [-l [<Muster>]]"
 
-#: builtin/replace.c:90
 #, c-format
 msgid ""
 "invalid replace format '%s'\n"
@@ -22245,27 +11041,22 @@ msgstr ""
 "Ungültiges Ersetzungsformat '%s'\n"
 "Gültige Formate sind 'short', 'medium' und 'long'."
 
-#: builtin/replace.c:125
 #, c-format
 msgid "replace ref '%s' not found"
 msgstr "Ersetzende Referenz '%s' nicht gefunden."
 
-#: builtin/replace.c:141
 #, c-format
 msgid "Deleted replace ref '%s'"
 msgstr "Ersetzende Referenz '%s' gelöscht."
 
-#: builtin/replace.c:153
 #, c-format
 msgid "'%s' is not a valid ref name"
 msgstr "'%s' ist kein gültiger Referenzname."
 
-#: builtin/replace.c:158
 #, c-format
 msgid "replace ref '%s' already exists"
 msgstr "Ersetzende Referenz '%s' existiert bereits."
 
-#: builtin/replace.c:178
 #, c-format
 msgid ""
 "Objects must be of the same type.\n"
@@ -22277,75 +11068,59 @@ msgstr ""
 "während '%s' auf ein ersetzendes Objekt vom Typ '%s'\n"
 "zeigt."
 
-#: builtin/replace.c:229
 #, c-format
 msgid "unable to open %s for writing"
 msgstr "konnte '%s' nicht zum Schreiben öffnen"
 
-#: builtin/replace.c:242
 msgid "cat-file reported failure"
 msgstr "cat-file meldete Fehler"
 
-#: builtin/replace.c:258
 #, c-format
 msgid "unable to open %s for reading"
 msgstr "konnte '%s' nicht zum Lesen öffnen"
 
-#: builtin/replace.c:271
 msgid "unable to spawn mktree"
 msgstr "konnte mktree nicht ausführen"
 
-#: builtin/replace.c:275
 msgid "unable to read from mktree"
 msgstr "konnte nicht von mktree lesen"
 
-#: builtin/replace.c:284
 msgid "mktree reported failure"
 msgstr "mktree meldete Fehler"
 
-#: builtin/replace.c:288
 msgid "mktree did not return an object name"
 msgstr "mktree lieferte keinen Objektnamen zurück"
 
-#: builtin/replace.c:297
 #, c-format
 msgid "unable to fstat %s"
 msgstr "kann fstat auf %s nicht ausführen"
 
-#: builtin/replace.c:302
 msgid "unable to write object to database"
 msgstr "konnte Objekt nicht in Datenbank schreiben"
 
-#: builtin/replace.c:325
 #, c-format
 msgid "unable to get object type for %s"
 msgstr "konnte Objektart von %s nicht bestimmten"
 
-#: builtin/replace.c:341
 msgid "editing object file failed"
 msgstr "bearbeiten von Objektdatei fehlgeschlagen"
 
-#: builtin/replace.c:350
 #, c-format
 msgid "new object is the same as the old one: '%s'"
 msgstr "neues Objekt ist dasselbe wie das alte: '%s'"
 
-#: builtin/replace.c:383
 #, c-format
 msgid "could not parse %s as a commit"
 msgstr "konnte %s nicht als Commit parsen"
 
-#: builtin/replace.c:415
 #, c-format
 msgid "bad mergetag in commit '%s'"
 msgstr "ungültiger Merge-Tag in Commit '%s'"
 
-#: builtin/replace.c:417
 #, c-format
 msgid "malformed mergetag in commit '%s'"
 msgstr "fehlerhafter Merge-Tag in Commit '%s'"
 
-#: builtin/replace.c:429
 #, c-format
 msgid ""
 "original commit '%s' contains mergetag '%s' that is discarded; use --edit "
@@ -22354,31 +11129,25 @@ msgstr ""
 "Der ursprüngliche Commit '%s' enthält Merge-Tag '%s', der verworfen\n"
 "wird; benutzen Sie --edit statt --graft"
 
-#: builtin/replace.c:468
 #, c-format
 msgid "the original commit '%s' has a gpg signature"
 msgstr "der originale Commit '%s' hat eine GPG-Signatur"
 
-#: builtin/replace.c:469
 msgid "the signature will be removed in the replacement commit!"
 msgstr "die Signatur wird in dem Ersetzungs-Commit entfernt!"
 
-#: builtin/replace.c:479
 #, c-format
 msgid "could not write replacement commit for: '%s'"
 msgstr "konnte Ersetzungs-Commit für '%s' nicht schreiben"
 
-#: builtin/replace.c:487
 #, c-format
 msgid "graft for '%s' unnecessary"
 msgstr "künstlicher Vorgänger (\"graft\") für '%s' nicht notwendig"
 
-#: builtin/replace.c:491
 #, c-format
 msgid "new commit is the same as the old one: '%s'"
 msgstr "neuer Commit ist derselbe wie der alte: '%s'"
 
-#: builtin/replace.c:526
 #, c-format
 msgid ""
 "could not convert the following graft(s):\n"
@@ -22387,215 +11156,165 @@ msgstr ""
 "konnte die folgenden künstlichen Vorgänger (\"grafts\") nicht konvertieren:\n"
 "%s"
 
-#: builtin/replace.c:547
 msgid "list replace refs"
 msgstr "ersetzende Referenzen auflisten"
 
-#: builtin/replace.c:548
 msgid "delete replace refs"
 msgstr "ersetzende Referenzen löschen"
 
-#: builtin/replace.c:549
 msgid "edit existing object"
 msgstr "existierendes Objekt bearbeiten"
 
-#: builtin/replace.c:550
 msgid "change a commit's parents"
 msgstr "Eltern-Commits eines Commits ändern"
 
-#: builtin/replace.c:551
 msgid "convert existing graft file"
 msgstr "existierende Datei des künstlichen Vorgängers (\"graft\") konvertieren"
 
-#: builtin/replace.c:552
 msgid "replace the ref if it exists"
 msgstr "die Referenz ersetzen, wenn sie existiert"
 
-#: builtin/replace.c:554
 msgid "do not pretty-print contents for --edit"
 msgstr "keine ansprechende Anzeige des Objektinhaltes für --edit"
 
-#: builtin/replace.c:555
 msgid "use this format"
 msgstr "das angegebene Format benutzen"
 
-#: builtin/replace.c:568
 msgid "--format cannot be used when not listing"
 msgstr "--format kann nicht beim Auflisten verwendet werden"
 
-#: builtin/replace.c:576
 msgid "-f only makes sense when writing a replacement"
 msgstr "-f macht nur beim Schreiben einer Ersetzung Sinn"
 
-#: builtin/replace.c:580
 msgid "--raw only makes sense with --edit"
 msgstr "--raw macht nur mit --edit Sinn"
 
-#: builtin/replace.c:586
 msgid "-d needs at least one argument"
 msgstr "-d benötigt mindestens ein Argument"
 
-#: builtin/replace.c:592
 msgid "bad number of arguments"
 msgstr "Ungültige Anzahl von Argumenten"
 
-#: builtin/replace.c:598
 msgid "-e needs exactly one argument"
 msgstr "-e benötigt genau ein Argument"
 
-#: builtin/replace.c:604
 msgid "-g needs at least one argument"
 msgstr "-g benötigt mindestens ein Argument"
 
-#: builtin/replace.c:610
 msgid "--convert-graft-file takes no argument"
 msgstr "--convert-graft-file erwartet keine Argumente"
 
-#: builtin/replace.c:616
 msgid "only one pattern can be given with -l"
 msgstr "Mit -l kann nur ein Muster angegeben werden"
 
-#: builtin/rerere.c:13
 msgid "git rerere [clear | forget <path>... | status | remaining | diff | gc]"
 msgstr "git rerere [clean | forget <Pfad>... | status | remaining | diff | gc]"
 
-#: builtin/rerere.c:58
 msgid "register clean resolutions in index"
 msgstr "saubere Auflösungen im Index registrieren"
 
-#: builtin/rerere.c:77
 msgid "'git rerere forget' without paths is deprecated"
 msgstr "'git rerere forget' ohne Pfade ist veraltet"
 
-#: builtin/rerere.c:111
 #, c-format
 msgid "unable to generate diff for '%s'"
 msgstr "konnte kein Diff für '%s' generieren"
 
-#: builtin/reset.c:33
 msgid ""
 "git reset [--mixed | --soft | --hard | --merge | --keep] [-q] [<commit>]"
 msgstr ""
 "git reset [--mixed | --soft | --hard | --merge | --keep] [-q] [<Commit>]"
 
-#: builtin/reset.c:34
 msgid "git reset [-q] [<tree-ish>] [--] <pathspec>..."
 msgstr "git reset [-q] [<Commit-Referenz>] [--] <Pfadspezifikation>..."
 
-#: builtin/reset.c:35
 msgid ""
 "git reset [-q] [--pathspec-from-file [--pathspec-file-nul]] [<tree-ish>]"
 msgstr ""
 "git reset [-q] [--pathspec-from-file [--pathspec-file-nul]] [<Commit-"
 "Referenz>]"
 
-#: builtin/reset.c:36
 msgid "git reset --patch [<tree-ish>] [--] [<pathspec>...]"
 msgstr "git reset --patch [<Commit-Referenz>] [--] [<Pfadspezifikation>...]"
 
-#: builtin/reset.c:42
 msgid "mixed"
 msgstr "mixed"
 
-#: builtin/reset.c:42
 msgid "soft"
 msgstr "soft"
 
-#: builtin/reset.c:42
 msgid "hard"
 msgstr "hard"
 
-#: builtin/reset.c:42
 msgid "merge"
 msgstr "zusammenführen"
 
-#: builtin/reset.c:42
 msgid "keep"
 msgstr "keep"
 
-#: builtin/reset.c:90
 msgid "You do not have a valid HEAD."
 msgstr "Sie haben keinen gültigen HEAD."
 
-#: builtin/reset.c:92
 msgid "Failed to find tree of HEAD."
 msgstr "Fehler beim Finden des \"Tree\"-Objektes von HEAD."
 
-#: builtin/reset.c:98
 #, c-format
 msgid "Failed to find tree of %s."
 msgstr "Fehler beim Finden des \"Tree\"-Objektes von %s."
 
-#: builtin/reset.c:123
 #, c-format
 msgid "HEAD is now at %s"
 msgstr "HEAD ist jetzt bei %s"
 
-#: builtin/reset.c:304
 #, 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:402 builtin/stash.c:606 builtin/stash.c:669
-#: builtin/stash.c:693
 msgid "be quiet, only report errors"
 msgstr "weniger Ausgaben, nur Fehler melden"
 
-#: builtin/reset.c:404
 msgid "skip refreshing the index after reset"
 msgstr "Aktualisierung des Indexes nach dem Zurücksetzen überspringen"
 
-#: builtin/reset.c:406
 msgid "reset HEAD and index"
 msgstr "HEAD und Index umsetzen"
 
-#: builtin/reset.c:407
 msgid "reset only HEAD"
 msgstr "nur HEAD umsetzen"
 
-#: builtin/reset.c:409 builtin/reset.c:411
 msgid "reset HEAD, index and working tree"
 msgstr "HEAD, Index und Arbeitsverzeichnis umsetzen"
 
-#: builtin/reset.c:413
 msgid "reset HEAD but keep local changes"
 msgstr "HEAD umsetzen, aber lokale Änderungen behalten"
 
-#: builtin/reset.c:419
 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:452
 #, c-format
 msgid "Failed to resolve '%s' as a valid revision."
 msgstr "Konnte '%s' nicht als gültigen Commit auflösen."
 
-#: builtin/reset.c:460
 #, 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:479
 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:481
 #, c-format
 msgid "Cannot do %s reset with paths."
 msgstr "Ein '%s'-Reset mit Pfaden ist nicht möglich."
 
-#: builtin/reset.c:496
 #, 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:527
 msgid "Unstaged changes after reset:"
 msgstr "Nicht zum Commit vorgemerkte Änderungen nach Zurücksetzung:"
 
-#: builtin/reset.c:530
 #, c-format
 msgid ""
 "It took %.2f seconds to refresh the index after reset.  You can use\n"
@@ -22605,54 +11324,46 @@ msgstr ""
 "aktualisieren. Sie können '--no-refresh' verwenden, um dies zu\n"
 "vermeiden."
 
-#: builtin/reset.c:547
 #, c-format
 msgid "Could not reset index file to revision '%s'."
 msgstr "Konnte Index-Datei nicht zu Commit '%s' setzen."
 
-#: builtin/reset.c:552
 msgid "Could not write new index file."
 msgstr "Konnte neue Index-Datei nicht schreiben."
 
-#: builtin/rev-list.c:659
+#, c-format
+msgid "unable to get disk usage of %s"
+msgstr "konnte Festplattennutzung von %s nicht bekommen"
+
 msgid "rev-list does not support display of notes"
 msgstr "rev-list unterstützt keine Anzeige von Notizen"
 
-#: builtin/rev-list.c:664
 #, c-format
 msgid "marked counting and '%s' cannot be used together"
 msgstr "markiertes Zählen und '%s' können nicht gemeinsam verwendet werden"
 
-#: builtin/rev-parse.c:409
 msgid "git rev-parse --parseopt [<options>] -- [<args>...]"
 msgstr "git rev-parse --parseopt [<Optionen>] -- [<Argumente>...]"
 
-#: builtin/rev-parse.c:414
 msgid "keep the `--` passed as an arg"
 msgstr "`--` als Argument lassen"
 
-#: builtin/rev-parse.c:416
 msgid "stop parsing after the first non-option argument"
 msgstr "das Parsen nach dem ersten Argument, was keine Option ist, stoppen"
 
-#: builtin/rev-parse.c:419
 msgid "output in stuck long form"
 msgstr ""
 "Ausgabe in Langform mit Argumenten an den Optionen (getrennt durch '=')"
 
-#: builtin/rev-parse.c:438
 msgid "premature end of input"
 msgstr "frühzeitiges Ende der Eingabe"
 
-#: builtin/rev-parse.c:442
 msgid "no usage string given before the `--' separator"
 msgstr "kein Verwendungstext vor dem `--' Separator angegeben"
 
-#: builtin/rev-parse.c:548
 msgid "Needed a single revision"
 msgstr "Benötigte einen einzelnen Commit"
 
-#: builtin/rev-parse.c:552
 msgid ""
 "git rev-parse --parseopt [<options>] -- [<args>...]\n"
 "   or: git rev-parse --sq-quote [<arg>...]\n"
@@ -22667,145 +11378,117 @@ msgstr ""
 "Führen Sie \"git rev-parse --parseopt -h\" für weitere Informationen bei "
 "erster Verwendung aus."
 
-#: builtin/rev-parse.c:712
 msgid "--resolve-git-dir requires an argument"
 msgstr "--resolve-git-dir benötigt ein Argument"
 
-#: builtin/rev-parse.c:715
 #, c-format
 msgid "not a gitdir '%s'"
 msgstr "kein Git-Verzeichnis '%s'"
 
-#: builtin/rev-parse.c:739
 msgid "--git-path requires an argument"
 msgstr "--git-path benötigt ein Argument"
 
-#: builtin/rev-parse.c:749
 msgid "-n requires an argument"
 msgstr "-n benötigt ein Argument"
 
-#: builtin/rev-parse.c:763
 msgid "--path-format requires an argument"
 msgstr "--path-format benötigt ein Argument"
 
-#: builtin/rev-parse.c:769
 #, c-format
 msgid "unknown argument to --path-format: %s"
 msgstr "unbekanntes Argument für --path-format: %s"
 
-#: builtin/rev-parse.c:776
 msgid "--default requires an argument"
 msgstr "--default benötigt ein Argument"
 
-#: builtin/rev-parse.c:782
 msgid "--prefix requires an argument"
 msgstr "--prefix benötigt ein Argument"
 
-#: builtin/rev-parse.c:851
 #, c-format
 msgid "unknown mode for --abbrev-ref: %s"
 msgstr "unbekannter Modus für --abbrev-ref: %s"
 
-#: builtin/rev-parse.c:1023
+msgid "this operation must be run in a work tree"
+msgstr "Diese Operation muss in einem Arbeitsverzeichnis ausgeführt werden."
+
 #, c-format
 msgid "unknown mode for --show-object-format: %s"
 msgstr "unbekannter Modus für --show-object-format: %s"
 
-#: builtin/revert.c:24
 msgid "git revert [<options>] <commit-ish>..."
 msgstr "git revert [<Optionen>] <Commit-Angabe>..."
 
-#: builtin/revert.c:25
 msgid "git revert <subcommand>"
 msgstr "git revert <Unterbefehl>"
 
-#: builtin/revert.c:30
 msgid "git cherry-pick [<options>] <commit-ish>..."
 msgstr "git cherry-pick [<Optionen>] <Commit-Angabe>..."
 
-#: builtin/revert.c:31
 msgid "git cherry-pick <subcommand>"
 msgstr "git cherry-pick <Unterbefehl>"
 
-#: builtin/revert.c:72
 #, c-format
 msgid "option `%s' expects a number greater than zero"
 msgstr "Option `%s' erwartet eine Nummer größer als 0."
 
-#: builtin/revert.c:92
 #, c-format
 msgid "%s: %s cannot be used with %s"
 msgstr "%s: %s kann nicht mit %s verwendet werden"
 
-#: builtin/revert.c:102
 msgid "end revert or cherry-pick sequence"
 msgstr "\"revert\" oder \"cherry-pick\" Ablauf beenden"
 
-#: builtin/revert.c:103
 msgid "resume revert or cherry-pick sequence"
 msgstr "\"revert\" oder \"cherry-pick\" Ablauf fortsetzen"
 
-#: builtin/revert.c:104
 msgid "cancel revert or cherry-pick sequence"
 msgstr "\"revert\" oder \"cherry-pick\" Ablauf abbrechen"
 
-#: builtin/revert.c:105
 msgid "skip current commit and continue"
 msgstr "den aktuellen Commit auslassen und fortfahren"
 
-#: builtin/revert.c:107
 msgid "don't automatically commit"
 msgstr "nicht automatisch committen"
 
-#: builtin/revert.c:108
 msgid "edit the commit message"
 msgstr "Commit-Beschreibung bearbeiten"
 
-#: builtin/revert.c:111
 msgid "parent-number"
 msgstr "Nummer des Elternteils"
 
-#: builtin/revert.c:112
 msgid "select mainline parent"
 msgstr "Elternteil der Hauptlinie auswählen"
 
-#: builtin/revert.c:114
 msgid "merge strategy"
 msgstr "Merge-Strategie"
 
-#: builtin/revert.c:116
 msgid "option for merge strategy"
 msgstr "Option für Merge-Strategie"
 
-#: builtin/revert.c:125
 msgid "append commit name"
 msgstr "Commit-Namen anhängen"
 
-#: builtin/revert.c:127
 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:241
+msgid "use the 'reference' format to refer to commits"
+msgstr "das 'reference' Format nutzen, um auf Commits zu verweisen"
+
 msgid "revert failed"
 msgstr "\"revert\" fehlgeschlagen"
 
-#: builtin/revert.c:254
 msgid "cherry-pick failed"
 msgstr "\"cherry-pick\" fehlgeschlagen"
 
-#: builtin/rm.c:20
 msgid "git rm [<options>] [--] <file>..."
 msgstr "git rm [<Optionen>] [--] <Datei>..."
 
-#: builtin/rm.c:208
 msgid ""
 "the following file has staged content different from both the\n"
 "file and the HEAD:"
@@ -22820,7 +11503,6 @@ msgstr[1] ""
 "unterschiedlich\n"
 "zu der Datei und HEAD:"
 
-#: builtin/rm.c:213
 msgid ""
 "\n"
 "(use -f to force removal)"
@@ -22828,13 +11510,11 @@ msgstr ""
 "\n"
 "(benutzen Sie -f, um die Löschung zu erzwingen)"
 
-#: 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] "die folgende Datei hat zum Commit vorgemerkte Änderungen:"
 msgstr[1] "die folgenden Dateien haben zum Commit vorgemerkte Änderungen:"
 
-#: builtin/rm.c:221 builtin/rm.c:230
 msgid ""
 "\n"
 "(use --cached to keep the file, or -f to force removal)"
@@ -22843,55 +11523,44 @@ msgstr ""
 "(benutzen Sie --cached, um die Datei zu behalten, oder -f, um das Entfernen "
 "zu erzwingen)"
 
-#: builtin/rm.c:227
 msgid "the following file has local modifications:"
 msgid_plural "the following files have local modifications:"
 msgstr[0] "die folgende Datei hat lokale Änderungen:"
 msgstr[1] "die folgenden Dateien haben lokale Änderungen:"
 
-#: builtin/rm.c:245
 msgid "do not list removed files"
 msgstr "keine gelöschten Dateien auflisten"
 
-#: builtin/rm.c:246
 msgid "only remove from the index"
 msgstr "nur aus dem Index entfernen"
 
-#: builtin/rm.c:247
 msgid "override the up-to-date check"
 msgstr "die \"up-to-date\" Prüfung überschreiben"
 
-#: builtin/rm.c:248
 msgid "allow recursive removal"
 msgstr "rekursives Entfernen erlauben"
 
-#: 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: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: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:337
 #, c-format
 msgid "not removing '%s' recursively without -r"
 msgstr "'%s' wird nicht ohne -r rekursiv entfernt"
 
-#: 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 [--mirror] [--dry-run] [--force]\n"
 "              [--receive-pack=<git-receive-pack>]\n"
@@ -22903,81 +11572,62 @@ msgstr ""
 "              [--verbose] [--thin] [--atomic]\n"
 "              [<Host>:]<Verzeichnis> (--all | <Referenz>...)"
 
-#: builtin/send-pack.c:192
 msgid "remote name"
 msgstr "Name des Remote-Repositories"
 
-#: builtin/send-pack.c:205
 msgid "use stateless RPC protocol"
 msgstr "zustandsloses RPC-Protokoll verwenden"
 
-#: builtin/send-pack.c:206
 msgid "read refs from stdin"
 msgstr "Referenzen von der Standard-Eingabe lesen"
 
-#: builtin/send-pack.c:207
 msgid "print status from remote helper"
 msgstr "Status des Remote-Helpers ausgeben"
 
-#: builtin/shortlog.c:16
 msgid "git shortlog [<options>] [<revision-range>] [[--] <path>...]"
 msgstr "git shortlog [<Optionen>] [<Commitbereich>] [[--] <Pfad>...]"
 
-#: builtin/shortlog.c:17
 msgid "git log --pretty=short | git shortlog [<options>]"
 msgstr "git log --pretty=short | git shortlog [<Optionen>]"
 
-#: builtin/shortlog.c:123
 msgid "using multiple --group options with stdin is not supported"
 msgstr "mehrere Optionen --group mit Standard-Eingabe wird nicht unterstützt"
 
-#: builtin/shortlog.c:133
 msgid "using --group=trailer with stdin is not supported"
 msgstr ""
 "Nutzung von --group=trailer mit Standard-Eingabe wird nicht unterstützt"
 
-#: builtin/shortlog.c:323
 #, c-format
 msgid "unknown group type: %s"
 msgstr "unbekannter Gruppen-Typ: %s"
 
-#: builtin/shortlog.c:351
 msgid "group by committer rather than author"
 msgstr "nach Commit-Ersteller statt Autor gruppieren"
 
-#: builtin/shortlog.c:354
 msgid "sort output according to the number of commits per author"
 msgstr "die Ausgabe entsprechend der Anzahl von Commits pro Autor sortieren"
 
-#: builtin/shortlog.c:356
 msgid "suppress commit descriptions, only provides commit count"
 msgstr "Commit-Beschreibungen unterdrücken, nur Anzahl der Commits liefern"
 
-#: builtin/shortlog.c:358
 msgid "show the email address of each author"
 msgstr "die E-Mail-Adresse jedes Autors anzeigen"
 
-#: builtin/shortlog.c:359
 msgid "<w>[,<i1>[,<i2>]]"
 msgstr "<w>[,<i1>[,<i2>]]"
 
-#: builtin/shortlog.c:360
 msgid "linewrap output"
 msgstr "Ausgabe mit Zeilenumbrüchen"
 
-#: builtin/shortlog.c:362
 msgid "field"
 msgstr "Feld"
 
-#: builtin/shortlog.c:363
 msgid "group by field"
 msgstr "Gruppieren nach Feld"
 
-#: builtin/shortlog.c:395
 msgid "too many arguments given outside repository"
 msgstr "zu viele Argumente außerhalb des Repositories angegeben"
 
-#: builtin/show-branch.c:14
 msgid ""
 "git show-branch [-a | --all] [-r | --remotes] [--topo-order | --date-order]\n"
 "                [--current] [--color[=<when>] | --no-color] [--sparse]\n"
@@ -22989,133 +11639,104 @@ msgstr ""
 "                [--more=<n> | --list | --independent | --merge-base]\n"
 "                [--no-name | --sha1-name] [--topics] [(<Commit> | <glob>)...]"
 
-#: builtin/show-branch.c:18
 msgid "git show-branch (-g | --reflog)[=<n>[,<base>]] [--list] [<ref>]"
 msgstr "git show-branch (-g | --reflog)[=<n>[,<Basis>]] [--list] [<Referenz>]"
 
-#: builtin/show-branch.c:396
 #, c-format
 msgid "ignoring %s; cannot handle more than %d ref"
 msgid_plural "ignoring %s; cannot handle more than %d refs"
 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
 #, c-format
 msgid "no matching refs with %s"
 msgstr "keine übereinstimmenden Referenzen mit %s"
 
-#: builtin/show-branch.c:645
 msgid "show remote-tracking and local branches"
 msgstr "Remote-Tracking und lokale Branches anzeigen"
 
-#: builtin/show-branch.c:647
 msgid "show remote-tracking branches"
 msgstr "Remote-Tracking-Branches anzeigen"
 
-#: builtin/show-branch.c:649
 msgid "color '*!+-' corresponding to the branch"
 msgstr "'*!+-' entsprechend des Branches einfärben"
 
-#: builtin/show-branch.c:651
 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
 msgid "synonym to more=-1"
 msgstr "Synonym für more=-1"
 
-#: builtin/show-branch.c:654
 msgid "suppress naming strings"
 msgstr "Namen unterdrücken"
 
-#: builtin/show-branch.c:656
 msgid "include the current branch"
 msgstr "den aktuellen Branch einbeziehen"
 
-#: builtin/show-branch.c:658
 msgid "name commits with their object names"
 msgstr "Commits nach ihren Objektnamen benennen"
 
-#: builtin/show-branch.c:660
 msgid "show possible merge bases"
 msgstr "mögliche Merge-Basen anzeigen"
 
-#: builtin/show-branch.c:662
 msgid "show refs unreachable from any other ref"
 msgstr ""
 "Referenzen, die unerreichbar von allen anderen Referenzen sind, anzeigen"
 
-#: builtin/show-branch.c:664
 msgid "show commits in topological order"
 msgstr "Commits in topologischer Ordnung anzeigen"
 
-#: builtin/show-branch.c:667
 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
 msgid "show merges reachable from only one tip"
 msgstr "Merges anzeigen, die nur von einem Branch aus erreichbar sind"
 
-#: builtin/show-branch.c:671
 msgid "topologically sort, maintaining date order where possible"
 msgstr "topologische Sortierung, Beibehaltung Datumsordnung wo möglich"
 
-#: builtin/show-branch.c:674
 msgid "<n>[,<base>]"
 msgstr "<n>[,<Basis>]"
 
-#: builtin/show-branch.c:675
 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:735
 msgid "no branches given, and HEAD is not valid"
 msgstr "keine Branches angegeben, und HEAD ist ungültig"
 
-#: builtin/show-branch.c:738
 msgid "--reflog option needs one branch name"
 msgstr "die Option --reflog benötigt einen Branchnamen"
 
-#: builtin/show-branch.c:741
 #, 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
 #, c-format
 msgid "no such ref %s"
 msgstr "Referenz nicht gefunden: %s"
 
-#: builtin/show-branch.c:831
 #, 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
 #, c-format
 msgid "'%s' is not a valid ref."
 msgstr "'%s' ist keine gültige Referenz."
 
-#: builtin/show-branch.c:838
 #, c-format
 msgid "cannot find commit %s (%s)"
 msgstr "kann Commit %s (%s) nicht finden"
 
-#: builtin/show-index.c:21
 msgid "hash-algorithm"
 msgstr "Hash-Algorithmus"
 
-#: builtin/show-index.c:31
 msgid "Unknown hash algorithm"
 msgstr "Unbekannter Hash-Algorithmus"
 
-#: builtin/show-ref.c:12
 msgid ""
 "git show-ref [-q | --quiet] [--verify] [--head] [-d | --dereference] [-s | --"
 "hash[=<n>]] [--abbrev[=<n>]] [--tags] [--heads] [--] [<pattern>...]"
@@ -23123,61 +11744,48 @@ msgstr ""
 "git show-ref [-q | --quiet] [--verify] [--head] [-d | --dereference] [-s | --"
 "hash[=<n>]] [--abbrev[=<n>]] [--tags] [--heads] [--] [<Muster>...] "
 
-#: builtin/show-ref.c:13
 msgid "git show-ref --exclude-existing[=<pattern>]"
 msgstr "git show-ref --exclude-existing[=<Muster>]"
 
-#: builtin/show-ref.c:162
 msgid "only show tags (can be combined with heads)"
 msgstr "nur Tags anzeigen (kann mit \"heads\" kombiniert werden)"
 
-#: builtin/show-ref.c:163
 msgid "only show heads (can be combined with tags)"
 msgstr "nur Branches anzeigen (kann mit \"tags\" kombiniert werden)"
 
-#: builtin/show-ref.c:164
 msgid "stricter reference checking, requires exact ref path"
 msgstr "strengere Referenzprüfung, erfordert exakten Referenzpfad"
 
-#: builtin/show-ref.c:167 builtin/show-ref.c:169
 msgid "show the HEAD reference, even if it would be filtered out"
 msgstr ""
 "die HEAD-Referenz anzeigen, selbst wenn diese ausgefiltert werden würde"
 
-#: builtin/show-ref.c:171
 msgid "dereference tags into object IDs"
 msgstr "Tags in Objekt-Identifikationen dereferenzieren"
 
-#: builtin/show-ref.c:173
 msgid "only show SHA1 hash using <n> digits"
 msgstr "nur SHA1 Hash mit <n> Ziffern anzeigen"
 
-#: builtin/show-ref.c:177
 msgid "do not print results to stdout (useful with --verify)"
 msgstr ""
 "keine Ausgabe der Ergebnisse in die Standard-Ausgabe (nützlich mit --verify)"
 
-#: builtin/show-ref.c:179
 msgid "show refs from stdin that aren't in local repository"
 msgstr ""
 "Referenzen von der Standard-Eingabe anzeigen, die sich nicht im lokalen "
 "Repository befinden"
 
-#: builtin/sparse-checkout.c:23
 msgid "git sparse-checkout (init|list|set|add|reapply|disable) <options>"
 msgstr "git sparse-checkout (init|list|set|add|reapply|disable) <Optionen>"
 
-#: builtin/sparse-checkout.c:61
 msgid "this worktree is not sparse"
 msgstr "dieses Arbeitsverzeichnis ist nicht partiell"
 
-#: builtin/sparse-checkout.c:76
 msgid "this worktree is not sparse (sparse-checkout file may not exist)"
 msgstr ""
 "dieses Arbeitsverzeichnis ist nicht partiell (Datei für partieller Checkout "
 "existiert eventuell nicht)"
 
-#: builtin/sparse-checkout.c:177
 #, c-format
 msgid ""
 "directory '%s' contains untracked files, but is not in the sparse-checkout "
@@ -23186,70 +11794,58 @@ msgstr ""
 "Verzeichnis '%s' enthält unversionierte Dateien, aber ist nicht innerhalb "
 "des partiellen Checkouts im Cone-Modus"
 
-#: builtin/sparse-checkout.c:185
 #, c-format
 msgid "failed to remove directory '%s'"
 msgstr "Fehler beim Löschen des Verzeichnisses '%s'"
 
-#: builtin/sparse-checkout.c:327
 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:366
 msgid "failed to initialize worktree config"
 msgstr "Fehler beim Initialisieren der Arbeitsverzeichnis-Konfiguration"
 
-#: builtin/sparse-checkout.c:411
 msgid "failed to modify sparse-index config"
 msgstr "Verändern der Konfiguration für Sparse-Index fehlgeschlagen"
 
-#: builtin/sparse-checkout.c:441 builtin/sparse-checkout.c:793
-#: builtin/sparse-checkout.c:847
 msgid "initialize the sparse-checkout in cone mode"
 msgstr "initialisiere den partiellen Checkout im Cone-Modus"
 
-#: builtin/sparse-checkout.c:443 builtin/sparse-checkout.c:795
-#: builtin/sparse-checkout.c:849
 msgid "toggle the use of a sparse index"
 msgstr "die Nutzung des Sparse-Index umschalten"
 
-#: builtin/sparse-checkout.c:479
+#, c-format
+msgid "unable to create leading directories of %s"
+msgstr "konnte führende Verzeichnisse von '%s' nicht erstellen"
+
 #, c-format
 msgid "failed to open '%s'"
 msgstr "Fehler beim Öffnen von '%s'"
 
-#: builtin/sparse-checkout.c:531
 #, c-format
 msgid "could not normalize path %s"
 msgstr "konnte Pfad '%s' nicht normalisieren"
 
-#: builtin/sparse-checkout.c:560
 #, 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:615 builtin/sparse-checkout.c:643
 msgid "unable to load existing sparse-checkout patterns"
 msgstr "konnte die existierenden Muster des partiellen Checkouts nicht laden"
 
-#: builtin/sparse-checkout.c:619
 msgid "existing sparse-checkout patterns do not use cone mode"
 msgstr ""
 "existierenden Muster des partiellen Checkouts benutzen nicht den Cone-Modus"
 
-#: builtin/sparse-checkout.c:707
 msgid "please run from the toplevel directory in non-cone mode"
 msgstr ""
 "bitte von der obersten Ebene des Arbeitsverzeichnisses im Nicht-Cone-Modus "
 "ausführen"
 
-#: builtin/sparse-checkout.c:712
 msgid "specify directories rather than patterns (no leading slash)"
 msgstr "geben Sie Verzeichnisse statt Muster an (kein führender Schrägstich)"
 
-#: builtin/sparse-checkout.c:714
 msgid ""
 "specify directories rather than patterns.  If your directory starts with a "
 "'!', pass --skip-checks"
@@ -23257,7 +11853,6 @@ msgstr ""
 "geben Sie Verzeichnisse statt Muster an. Wenn Ihr Verzeichnis mit '!' "
 "beginnt, geben Sie --skip-checks an"
 
-#: builtin/sparse-checkout.c:716
 msgid ""
 "specify directories rather than patterns.  If your directory really has any "
 "of '*?[]\\' in it, pass --skip-checks"
@@ -23265,7 +11860,6 @@ msgstr ""
 "geben Sie Verzeichnisse statt Muster an. Wenn Ihr Verzeichnis wirklich eines "
 "von '*?[]\\' enthält, geben Sie --skip-checks an"
 
-#: builtin/sparse-checkout.c:732
 #, c-format
 msgid ""
 "'%s' is not a directory; to treat it as a directory anyway, rerun with --"
@@ -23274,7 +11868,6 @@ msgstr ""
 "'%s' ist kein Verzeichnis; um es trotzdem als Verzeichnis zu behandeln, "
 "führen Sie es mit --skip-checks erneut aus"
 
-#: builtin/sparse-checkout.c:734
 #, c-format
 msgid ""
 "pass a leading slash before paths such as '%s' if you want a single file "
@@ -23284,26 +11877,21 @@ msgstr ""
 "eine einzelne Datei haben möchten (siehe NON-CONE PROBLEMS im git-sparse-"
 "checkout Handbuch)."
 
-#: builtin/sparse-checkout.c:739
 msgid "git sparse-checkout add [--skip-checks] (--stdin | <patterns>)"
 msgstr "git sparse-checkout add [--skip-checks] (--stdin | <Muster>)"
 
-#: builtin/sparse-checkout.c:752 builtin/sparse-checkout.c:797
 msgid ""
 "skip some sanity checks on the given paths that might give false positives"
 msgstr ""
 "überspringe einige Plausibilitätsprüfungen für die angegebenen Pfade, die zu "
 "falsch positiven Ergebnissen führen könnten"
 
-#: builtin/sparse-checkout.c:755 builtin/sparse-checkout.c:800
 msgid "read patterns from standard in"
 msgstr "Muster von der Standard-Eingabe lesen"
 
-#: builtin/sparse-checkout.c:760
 msgid "no sparse-checkout to add to"
 msgstr "kein partieller Checkout zum Hinzufügen"
 
-#: builtin/sparse-checkout.c:775
 msgid ""
 "git sparse-checkout set [--[no-]cone] [--[no-]sparse-index] [--skip-checks] "
 "(--stdin | <patterns>)"
@@ -23311,37 +11899,29 @@ msgstr ""
 "git sparse-checkout set [--[no-]cone] [--[no-]sparse-index] [--skip-checks] "
 "(--stdin | <Muster>)"
 
-#: builtin/sparse-checkout.c:854
 msgid "must be in a sparse-checkout to reapply sparsity patterns"
 msgstr ""
 "muss sich in einem partiellen Checkout befinden, um Sparsity-Muster erneut "
 "anwenden zu können"
 
-#: builtin/sparse-checkout.c:914
 msgid "error while refreshing working directory"
 msgstr "Fehler während der Aktualisierung des Arbeitsverzeichnisses."
 
-#: builtin/stash.c:24 builtin/stash.c:40
 msgid "git stash list [<options>]"
 msgstr "git stash list [<Optionen>]"
 
-#: builtin/stash.c:25 builtin/stash.c:45
 msgid "git stash show [<options>] [<stash>]"
 msgstr "git stash show [<Optionen>] [<Stash>]"
 
-#: builtin/stash.c:26 builtin/stash.c:50
 msgid "git stash drop [-q|--quiet] [<stash>]"
 msgstr "git stash drop [-q|--quiet] [<Stash>]"
 
-#: builtin/stash.c:27
 msgid "git stash ( pop | apply ) [--index] [-q|--quiet] [<stash>]"
 msgstr "git stash ( pop | apply ) [--index] [-q|--quiet] [<Stash>]"
 
-#: builtin/stash.c:28 builtin/stash.c:65
 msgid "git stash branch <branchname> [<stash>]"
 msgstr "git stash branch <Branch> [<Stash>]"
 
-#: builtin/stash.c:30
 msgid ""
 "git stash [push [-p|--patch] [-S|--staged] [-k|--[no-]keep-index] [-q|--"
 "quiet]\n"
@@ -23355,7 +11935,6 @@ msgstr ""
 "          [--pathspec-from-file=<Datei> [--pathspec-file-nul]]\n"
 "          [--] [<Pfadspezifikation>...]]"
 
-#: builtin/stash.c:34
 msgid ""
 "git stash save [-p|--patch] [-S|--staged] [-k|--[no-]keep-index] [-q|--"
 "quiet]\n"
@@ -23365,19 +11944,15 @@ msgstr ""
 "quiet]\n"
 "          [-u|--include-untracked] [-a|--all] [<Nachricht>]"
 
-#: builtin/stash.c:55
 msgid "git stash pop [--index] [-q|--quiet] [<stash>]"
 msgstr "git stash pop [--index] [-q|--quiet] [<Stash>]"
 
-#: builtin/stash.c:60
 msgid "git stash apply [--index] [-q|--quiet] [<stash>]"
 msgstr "git stash apply [--index] [-q|--quiet] [<Stash>]"
 
-#: builtin/stash.c:75
 msgid "git stash store [-m|--message <message>] [-q|--quiet] <commit>"
 msgstr "git stash store [-m|--message <Nachricht>] [-q|--quiet] <Commit>"
 
-#: 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"
@@ -23387,7 +11962,6 @@ msgstr ""
 "          [-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>]"
@@ -23395,30 +11969,24 @@ 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"
 msgstr "'%s' ist kein \"stash\"-artiger Commit"
 
-#: builtin/stash.c:150
 #, c-format
 msgid "Too many revisions specified:%s"
 msgstr "Zu viele Commits angegeben:%s"
 
-#: builtin/stash.c:164
 msgid "No stash entries found."
 msgstr "Keine Stash-Einträge gefunden."
 
-#: builtin/stash.c:178
 #, c-format
 msgid "%s is not a valid reference"
 msgstr "'%s' ist kein gültiger Referenzname."
 
-#: builtin/stash.c:227
 msgid "git stash clear with arguments is unimplemented"
 msgstr "git stash clear mit Parametern ist nicht implementiert"
 
-#: builtin/stash.c:447
 #, c-format
 msgid ""
 "WARNING: Untracked file in way of tracked file!  Renaming\n"
@@ -23430,206 +11998,155 @@ msgstr ""
 "            %s -> %s\n"
 "         um Platz zu schaffen.\n"
 
-#: 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:519
 #, c-format
 msgid "could not generate diff %s^!."
 msgstr "Konnte keinen Diff erzeugen %s^!."
 
-#: builtin/stash.c:526
 msgid "conflicts in index. Try without --index."
 msgstr "Konflikte im Index. Versuchen Sie es ohne --index."
 
-#: builtin/stash.c:532
 msgid "could not save index tree"
 msgstr "Konnte Index-Verzeichnis nicht speichern"
 
-#: builtin/stash.c:552
 #, c-format
 msgid "Merging %s with %s"
 msgstr "Führe %s mit %s zusammen"
 
-#: builtin/stash.c:562
 msgid "Index was not unstashed."
 msgstr "Index wurde nicht aus dem Stash zurückgeladen."
 
-#: builtin/stash.c:576
 msgid "could not restore untracked files from stash"
 msgstr "Konnte unversionierte Dateien vom Stash nicht wiederherstellen."
 
-#: builtin/stash.c:608 builtin/stash.c:695
 msgid "attempt to recreate the index"
 msgstr "Versuche Index wiederherzustellen."
 
-#: builtin/stash.c:641
 #, c-format
 msgid "Dropped %s (%s)"
 msgstr "%s (%s) gelöscht"
 
-#: builtin/stash.c:644
 #, c-format
 msgid "%s: Could not drop stash entry"
 msgstr "%s: Konnte Stash-Eintrag nicht löschen"
 
-#: builtin/stash.c:657
 #, c-format
 msgid "'%s' is not a stash reference"
 msgstr "'%s' ist keine Stash-Referenz"
 
-#: builtin/stash.c:707
 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:730
 msgid "No branch name specified"
 msgstr "Kein Branchname spezifiziert"
 
-#: builtin/stash.c:809
 msgid "failed to parse tree"
 msgstr "Parsen der Tree-Objekte fehlgeschlagen"
 
-#: builtin/stash.c:820
 msgid "failed to unpack trees"
 msgstr "Entpacken der Tree-Objekte fehlgeschlagen"
 
-#: builtin/stash.c:840
 msgid "include untracked files in the stash"
 msgstr "unversionierte Dateien in Stash einbeziehen"
 
-#: builtin/stash.c:843
 msgid "only show untracked files in the stash"
 msgstr "nur unversionierte Dateien im Stash anzeigen"
 
-#: builtin/stash.c:930 builtin/stash.c:967
 #, c-format
 msgid "Cannot update %s with %s"
 msgstr "Kann nicht %s mit %s aktualisieren."
 
-#: builtin/stash.c:948 builtin/stash.c:1667 builtin/stash.c:1739
 msgid "stash message"
 msgstr "Stash-Beschreibung"
 
-#: builtin/stash.c:958
 msgid "\"git stash store\" requires one <commit> argument"
 msgstr "\"git stash store\" erwartet ein Argument <Commit>"
 
-#: builtin/stash.c:1143
 msgid "No staged changes"
 msgstr "Keine Änderungen im Index"
 
-#: builtin/stash.c:1204
 msgid "No changes selected"
 msgstr "Keine Änderungen ausgewählt"
 
-#: builtin/stash.c:1304
 msgid "You do not have the initial commit yet"
 msgstr "Sie haben bisher noch keinen initialen Commit"
 
-#: builtin/stash.c:1331
 msgid "Cannot save the current index state"
 msgstr "Kann den aktuellen Zustand des Index nicht speichern"
 
-#: builtin/stash.c:1340
 msgid "Cannot save the untracked files"
 msgstr "Kann die unversionierten Dateien nicht speichern"
 
-#: builtin/stash.c:1351 builtin/stash.c:1370
 msgid "Cannot save the current worktree state"
 msgstr "Kann den aktuellen Zustand des Arbeitsverzeichnisses nicht speichern"
 
-#: builtin/stash.c:1361
 msgid "Cannot save the current staged state"
 msgstr "Kann den aktuellen Zustand des Index nicht speichern"
 
-#: builtin/stash.c:1398
 msgid "Cannot record working tree state"
 msgstr "Kann Zustand des Arbeitsverzeichnisses nicht aufzeichnen"
 
-#: builtin/stash.c:1447
 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:1458
 msgid "Can't use --staged and --include-untracked or --all at the same time"
 msgstr ""
 "Kann nicht gleichzeitig --staged und --include-untracked oder --all verwenden"
 
-#: builtin/stash.c:1476
 msgid "Did you forget to 'git add'?"
 msgstr "Haben Sie vielleicht 'git add' vergessen?"
 
-#: builtin/stash.c:1491
 msgid "No local changes to save"
 msgstr "Keine lokalen Änderungen zum Speichern"
 
-#: builtin/stash.c:1498
 msgid "Cannot initialize stash"
 msgstr "Kann \"stash\" nicht initialisieren"
 
-#: builtin/stash.c:1513
 msgid "Cannot save the current status"
 msgstr "Kann den aktuellen Status nicht speichern"
 
-#: builtin/stash.c:1518
 #, c-format
 msgid "Saved working directory and index state %s"
 msgstr "Arbeitsverzeichnis und Index-Status %s gespeichert."
 
-#: builtin/stash.c:1615
 msgid "Cannot remove worktree changes"
 msgstr "Kann Änderungen im Arbeitsverzeichnis nicht löschen"
 
-#: builtin/stash.c:1656 builtin/stash.c:1728
 msgid "keep index"
 msgstr "behalte Index"
 
-#: builtin/stash.c:1658 builtin/stash.c:1730
 msgid "stash staged changes only"
 msgstr "nur Änderungen stashen, die zum Commit vorgemerkt sind"
 
-#: builtin/stash.c:1660 builtin/stash.c:1732
 msgid "stash in patch mode"
 msgstr "Stash in Patch-Modus"
 
-#: builtin/stash.c:1661 builtin/stash.c:1733
 msgid "quiet mode"
 msgstr "weniger Ausgaben"
 
-#: builtin/stash.c:1663 builtin/stash.c:1735
 msgid "include untracked files in stash"
 msgstr "unversionierte Dateien in Stash einbeziehen"
 
-#: builtin/stash.c:1665 builtin/stash.c:1737
 msgid "include ignore files"
 msgstr "ignorierte Dateien einbeziehen"
 
-#: builtin/stripspace.c:37
 msgid "skip and remove all lines starting with comment character"
 msgstr ""
 "alle Zeilen, die mit dem Kommentarzeichen beginnen, überspringen und "
 "entfernen"
 
-#: builtin/stripspace.c:40
 msgid "prepend comment character and space to each line"
 msgstr "Kommentarzeichen mit Leerzeichen an jede Zeile voranstellen"
 
-#: builtin/submodule--helper.c:50 builtin/submodule--helper.c:2486
 #, c-format
 msgid "Expecting a full ref name, got %s"
 msgstr "Vollständiger Referenzname erwartet, %s erhalten"
 
-#: builtin/submodule--helper.c:103
-#, c-format
-msgid "cannot strip one component off url '%s'"
-msgstr "Kann eine Komponente von URL '%s' nicht extrahieren"
-
-#: builtin/submodule--helper.c:213
 #, c-format
 msgid ""
 "could not look up configuration '%s'. Assuming this repository is its own "
@@ -23638,26 +12155,20 @@ msgstr ""
 "Konnte Konfiguration '%s' nicht nachschlagen. Nehme an, dass dieses\n"
 "Repository sein eigenes verbindliches Upstream-Repository ist."
 
-#: builtin/submodule--helper.c:413 builtin/submodule--helper.c:1873
 msgid "alternative anchor for relative paths"
 msgstr "Alternativer Anker für relative Pfade"
 
-#: builtin/submodule--helper.c:418
 msgid "git submodule--helper list [--prefix=<path>] [<path>...]"
 msgstr "git submodule--helper list [--prefix=<Pfad>] [<Pfad>...]"
 
-#: builtin/submodule--helper.c:476 builtin/submodule--helper.c:617
-#: builtin/submodule--helper.c:640
 #, 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:528
 #, c-format
 msgid "Entering '%s'\n"
 msgstr "Betrete '%s'\n"
 
-#: builtin/submodule--helper.c:531
 #, c-format
 msgid ""
 "run_command returned non-zero status for %s\n"
@@ -23666,7 +12177,6 @@ msgstr ""
 "run_command gab nicht-Null Status für '%s' zurück.\n"
 "."
 
-#: builtin/submodule--helper.c:553
 #, c-format
 msgid ""
 "run_command returned non-zero status while recursing in the nested "
@@ -23678,164 +12188,129 @@ msgstr ""
 "nicht-Null Status zurück.\n"
 "."
 
-#: builtin/submodule--helper.c:569
 msgid "suppress output of entering each submodule command"
 msgstr "Ausgaben beim Betreten eines Submodul-Befehls unterdrücken"
 
-#: builtin/submodule--helper.c:571 builtin/submodule--helper.c:876
-#: builtin/submodule--helper.c:1458
 msgid "recurse into nested submodules"
 msgstr "Rekursion in verschachtelte Submodule durchführen"
 
-#: builtin/submodule--helper.c:576
 msgid "git submodule--helper foreach [--quiet] [--recursive] [--] <command>"
 msgstr "git submodule--helper foreach [--quiet] [--recursive] [--] <Befehl>"
 
-#: builtin/submodule--helper.c:654
 #, 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:658
 #, 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:668
 #, 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:675
 #, 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:697
 msgid "suppress output for initializing a submodule"
 msgstr "Ausgaben bei Initialisierung eines Submoduls unterdrücken"
 
-#: builtin/submodule--helper.c:702
 msgid "git submodule--helper init [<options>] [<path>]"
 msgstr "git submodule--helper init [<Optionen>] [<Pfad>]"
 
-#: builtin/submodule--helper.c:775 builtin/submodule--helper.c:910
 #, 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:823
 #, 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:850 builtin/submodule--helper.c:1428
 #, c-format
 msgid "failed to recurse into submodule '%s'"
 msgstr "Fehler bei Rekursion in Submodul '%s'."
 
-#: builtin/submodule--helper.c:874 builtin/submodule--helper.c:1595
 msgid "suppress submodule status output"
 msgstr "Ausgabe des Submodul-Status unterdrücken"
 
-#: builtin/submodule--helper.c:875
 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:881
 msgid "git submodule status [--quiet] [--cached] [--recursive] [<path>...]"
 msgstr "git submodule status [--quiet] [--cached] [--recursive] [<Pfad>...]"
 
-#: builtin/submodule--helper.c:905
 msgid "git submodule--helper name <path>"
 msgstr "git submodule--helper name <Pfad>"
 
-#: builtin/submodule--helper.c:977
 #, c-format
 msgid "* %s %s(blob)->%s(submodule)"
 msgstr "* %s %s(blob)->%s(submodule)"
 
-#: builtin/submodule--helper.c:980
 #, c-format
 msgid "* %s %s(submodule)->%s(blob)"
 msgstr "* %s %s(submodule)->%s(blob)"
 
-#: builtin/submodule--helper.c:993
 #, c-format
 msgid "%s"
 msgstr "%s"
 
-#: builtin/submodule--helper.c:1043
 #, c-format
 msgid "couldn't hash object from '%s'"
 msgstr "Hash eines Objektes von '%s' konnte nicht erzeugt werden"
 
-#: builtin/submodule--helper.c:1047
 #, c-format
 msgid "unexpected mode %o\n"
 msgstr "unerwarteter Modus %o\n"
 
-#: builtin/submodule--helper.c:1288
 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:1290
 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:1292
 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:1294
 msgid "limit the summary size"
 msgstr "Größe der Zusammenfassung begrenzen"
 
-#: builtin/submodule--helper.c:1299
 msgid "git submodule--helper summary [<options>] [<commit>] [--] [<path>]"
 msgstr "git submodule--helper summary [<Optionen>] [<Commit>] [--] [<Pfad>]"
 
-#: builtin/submodule--helper.c:1323
 msgid "could not fetch a revision for HEAD"
 msgstr "konnte keinen Commit für HEAD holen"
 
-#: builtin/submodule--helper.c:1384
 #, c-format
 msgid "Synchronizing submodule url for '%s'\n"
 msgstr "Synchronisiere Submodul-URL für '%s'\n"
 
-#: builtin/submodule--helper.c:1390
 #, 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:1399
 #, 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:1409
 #, 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:1456
 msgid "suppress output of synchronizing submodule url"
 msgstr "Ausgaben bei der Synchronisierung der Submodul-URLs unterdrücken"
 
-#: builtin/submodule--helper.c:1463
 msgid "git submodule--helper sync [--quiet] [--recursive] [<path>]"
 msgstr "git submodule--helper sync [--quiet] [--recursive] [<Pfad>]"
 
-#: builtin/submodule--helper.c:1513
 #, c-format
 msgid ""
 "Submodule work tree '%s' contains a .git directory. This will be replaced "
@@ -23844,7 +12319,6 @@ msgstr ""
 "Arbeitsverzeichnis von Submodul in '%s' enthält ein .git-Verzeichnis. Durch "
 "die Nutzung von \"absorbgitdirs\" wird dieses durch eine .git-Datei ersetzt."
 
-#: builtin/submodule--helper.c:1530
 #, c-format
 msgid ""
 "Submodule work tree '%s' contains local modifications; use '-f' to discard "
@@ -23853,49 +12327,40 @@ msgstr ""
 "Arbeitsverzeichnis von Submodul in '%s' enthält lokale Änderungen;\n"
 "verwenden Sie '-f', um diese zu verwerfen."
 
-#: builtin/submodule--helper.c:1538
 #, c-format
 msgid "Cleared directory '%s'\n"
 msgstr "Verzeichnis '%s' bereinigt.\n"
 
-#: builtin/submodule--helper.c:1540
 #, 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:1551
 #, 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:1567
 #, 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:1596
 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:1597
 msgid "unregister all submodules"
 msgstr "alle Submodule austragen"
 
-#: builtin/submodule--helper.c:1602
 msgid ""
 "git submodule deinit [--quiet] [-f | --force] [--all | [--] [<path>...]]"
 msgstr ""
 "git submodule deinit [--quiet] [-f | --force] [--all | [--] [<Pfad>...]]"
 
-#: builtin/submodule--helper.c:1616
 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:1665
 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"
@@ -23908,69 +12373,54 @@ msgstr ""
 "submodule.alternateErrorStrategy auf 'info' oder klone mit der Option\n"
 "'--reference-if-able' statt '--reference'."
 
-#: builtin/submodule--helper.c:1710 builtin/submodule--helper.c:1713
 #, c-format
 msgid "submodule '%s' cannot add alternate: %s"
 msgstr "Submodul '%s' kann Alternative nicht hinzufügen: %s"
 
-#: builtin/submodule--helper.c:1749
 #, 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:1756
 #, 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:1781
 #, 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:1826
 #, c-format
 msgid "clone of '%s' into submodule path '%s' failed"
 msgstr "Klonen von '%s' in Submodul-Pfad '%s' fehlgeschlagen."
 
-#: builtin/submodule--helper.c:1831
 #, c-format
 msgid "directory not empty: '%s'"
 msgstr "Verzeichnis ist nicht leer: '%s'"
 
-#: builtin/submodule--helper.c:1843
 #, c-format
 msgid "could not get submodule directory for '%s'"
 msgstr "Konnte Submodul-Verzeichnis '%s' nicht finden."
 
-#: builtin/submodule--helper.c:1876
 msgid "where the new submodule will be cloned to"
 msgstr "Pfad für neues Submodul"
 
-#: builtin/submodule--helper.c:1879
 msgid "name of the new submodule"
 msgstr "Name des neuen Submoduls"
 
-#: builtin/submodule--helper.c:1882
 msgid "url where to clone the submodule from"
 msgstr "URL von der das Submodul geklont wird"
 
-#: builtin/submodule--helper.c:1890 builtin/submodule--helper.c:3383
 msgid "depth for shallow clones"
 msgstr "Tiefe des Klons mit unvollständiger Historie (shallow)"
 
-#: builtin/submodule--helper.c:1893 builtin/submodule--helper.c:2731
-#: builtin/submodule--helper.c:3376
 msgid "force cloning progress"
 msgstr "Fortschrittsanzeige beim Klonen erzwingen"
 
-#: builtin/submodule--helper.c:1895 builtin/submodule--helper.c:2733
 msgid "disallow cloning into non-empty directory"
 msgstr "Klonen in ein nicht leeres Verzeichnis verbieten"
 
-#: builtin/submodule--helper.c:1903
 msgid ""
 "git submodule--helper clone [--prefix=<path>] [--quiet] [--reference "
 "<repository>] [--name <name>] [--depth <depth>] [--single-branch] [--filter "
@@ -23980,94 +12430,76 @@ msgstr ""
 "<Repository>] [--name <Name>] [--depth <Tiefe>] [--single-branch] [--filter "
 "<filter-spec>] --url <URL> --path <Pfad>"
 
-#: builtin/submodule--helper.c:1943
 #, 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:1947
 #, 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:2041
 #, c-format
 msgid "Submodule path '%s' not initialized"
 msgstr "Submodul-Pfad '%s' nicht initialisiert"
 
-#: builtin/submodule--helper.c:2045
 msgid "Maybe you want to use 'update --init'?"
 msgstr "Meinten Sie vielleicht 'update --init'?"
 
-#: builtin/submodule--helper.c:2075
 #, c-format
 msgid "Skipping unmerged submodule %s"
 msgstr "Überspringe nicht zusammengeführtes Submodul %s"
 
-#: builtin/submodule--helper.c:2104
 #, c-format
 msgid "Skipping submodule '%s'"
 msgstr "Überspringe Submodul '%s'"
 
-#: builtin/submodule--helper.c:2257
 #, c-format
 msgid "Failed to clone '%s'. Retry scheduled"
 msgstr "Fehler beim Klonen von '%s'. Weiterer Versuch geplant"
 
-#: builtin/submodule--helper.c:2268
 #, c-format
 msgid "Failed to clone '%s' a second time, aborting"
 msgstr "Zweiter Versuch '%s' zu klonen fehlgeschlagen, breche ab."
 
-#: builtin/submodule--helper.c:2371
 #, c-format
 msgid "Unable to checkout '%s' in submodule path '%s'"
 msgstr "Konnte '%s' nicht im Submodul-Pfad '%s' auschecken"
 
-#: builtin/submodule--helper.c:2375
 #, 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:2379
 #, 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:2383
 #, 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:2402
 #, c-format
 msgid "Submodule path '%s': checked out '%s'\n"
 msgstr "Submodul-Pfad '%s': '%s' ausgecheckt\n"
 
-#: builtin/submodule--helper.c:2406
 #, c-format
 msgid "Submodule path '%s': rebased into '%s'\n"
 msgstr "Submodul-Pfad '%s': Rebase in '%s'\n"
 
-#: builtin/submodule--helper.c:2410
 #, c-format
 msgid "Submodule path '%s': merged in '%s'\n"
 msgstr "Submodul-Pfad '%s': zusammengeführt in '%s'\n"
 
-#: builtin/submodule--helper.c:2414
 #, c-format
 msgid "Submodule path '%s': '%s %s'\n"
 msgstr "Submodul-Pfad '%s': '%s %s'\n"
 
-#: builtin/submodule--helper.c:2438
 #, 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:2447
 #, c-format
 msgid ""
 "Fetched in submodule path '%s', but it did not contain %s. Direct fetching "
@@ -24076,7 +12508,6 @@ msgstr ""
 "\"fetch\" in Submodul-Pfad '%s' ausgeführt, aber enthielt nicht %s. Direktes "
 "Anfordern dieses Commits ist fehlgeschlagen."
 
-#: builtin/submodule--helper.c:2481
 #, c-format
 msgid ""
 "Submodule (%s) branch configured to inherit branch from superproject, but "
@@ -24085,85 +12516,67 @@ msgstr ""
 "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:2499
 #, 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:2588
 #, c-format
 msgid "Unable to find current revision in submodule path '%s'"
 msgstr "Konnte aktuellen Commit nicht in Submodul-Pfad '%s' finden"
 
-#: builtin/submodule--helper.c:2599
 #, c-format
 msgid "Unable to fetch in submodule path '%s'"
 msgstr "Konnte \"fetch\" nicht in Submodul-Pfad '%s' ausführen"
 
-#: builtin/submodule--helper.c:2604
 #, c-format
 msgid "Unable to find %s revision in submodule path '%s'"
 msgstr "Konnte %s Commit in Submodul-Pfad '%s' nicht finden"
 
-#: builtin/submodule--helper.c:2640
 #, c-format
 msgid "Failed to recurse into submodule path '%s'"
 msgstr "Fehler bei Rekursion in Submodul-Pfad '%s'"
 
-#: builtin/submodule--helper.c:2699
 msgid "force checkout updates"
 msgstr "Checkout-Aktualisierungen erzwingen"
 
-#: builtin/submodule--helper.c:2701
 msgid "initialize uninitialized submodules before update"
 msgstr "initialisiere nicht-initialisierte Submodule vor dem Update"
 
-#: builtin/submodule--helper.c:2703
 msgid "use SHA-1 of submodule's remote tracking branch"
 msgstr "nutze SHA-1 von Remote-Tracking-Branch des Submoduls"
 
-#: builtin/submodule--helper.c:2705
 msgid "traverse submodules recursively"
 msgstr "Submodule rekursiv durchlaufen"
 
-#: builtin/submodule--helper.c:2707
 msgid "don't fetch new objects from the remote site"
 msgstr "keine neuen Objekte von Remote abrufen"
 
-#: builtin/submodule--helper.c:2710 builtin/submodule--helper.c:2892
 msgid "path into the working tree"
 msgstr "Pfad zum Arbeitsverzeichnis"
 
-#: builtin/submodule--helper.c:2713
 msgid "path into the working tree, across nested submodule boundaries"
 msgstr ""
 "Pfad zum Arbeitsverzeichnis, über verschachtelte Submodul-Grenzen hinweg"
 
-#: builtin/submodule--helper.c:2717
 msgid "rebase, merge, checkout or none"
 msgstr "rebase, merge, checkout oder none"
 
-#: builtin/submodule--helper.c:2723
 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:2726
 msgid "parallel jobs"
 msgstr "Parallele Ausführungen"
 
-#: builtin/submodule--helper.c:2728
 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:2729
 msgid "don't print cloning progress"
 msgstr "keine Fortschrittsanzeige beim Klonen"
 
-#: builtin/submodule--helper.c:2741
 msgid ""
 "git submodule [--quiet] update [--init [--filter=<filter-spec>]] [--remote] "
 "[-N|--no-fetch] [-f|--force] [--checkout|--merge|--rebase] [--[no-]recommend-"
@@ -24175,84 +12588,64 @@ msgstr ""
 "shallow] [--reference <Repository>] [--recursive] [--[no-]single-branch] "
 "[--] [<Pfad>...]"
 
-#: builtin/submodule--helper.c:2767
 msgid "bad value for update parameter"
 msgstr "Fehlerhafter Wert für update Parameter"
 
-#: builtin/submodule--helper.c:2893
 msgid "recurse into submodules"
 msgstr "Rekursion in Submodule durchführen"
 
-#: builtin/submodule--helper.c:2899
 msgid "git submodule--helper absorb-git-dirs [<options>] [<path>...]"
 msgstr "git submodule--helper absorb-git-dirs [<Optionen>] [<Pfad>...]"
 
-#: builtin/submodule--helper.c:2955
 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:2958
 msgid "unset the config in the .gitmodules file"
 msgstr "Konfiguration in der .gitmodules-Datei entfernen"
 
-#: builtin/submodule--helper.c:2963
 msgid "git submodule--helper config <name> [<value>]"
 msgstr "git submodule--helper config <name> [<Wert>]"
 
-#: builtin/submodule--helper.c:2964
 msgid "git submodule--helper config --unset <name>"
 msgstr "git submodule--helper config --unset <Name>"
 
-#: builtin/submodule--helper.c:2984 builtin/submodule--helper.c:3238
-#: builtin/submodule--helper.c:3395
 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:3000
 msgid "suppress output for setting url of a submodule"
 msgstr "Ausgaben beim Setzen der URL eines Submoduls unterdrücken"
 
-#: builtin/submodule--helper.c:3004
 msgid "git submodule--helper set-url [--quiet] <path> <newurl>"
 msgstr "git submodule--helper set-url [--quiet] <Pfad> <neue URL>"
 
-#: builtin/submodule--helper.c:3037
 msgid "set the default tracking branch to master"
 msgstr "Standard-Tracking-Branch auf master setzen"
 
-#: builtin/submodule--helper.c:3039
 msgid "set the default tracking branch"
 msgstr "Standard-Tracking-Branch setzen"
 
-#: builtin/submodule--helper.c:3043
 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:3044
 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:3051
 msgid "--branch or --default required"
 msgstr "Option --branch oder --default erforderlich"
 
-#: builtin/submodule--helper.c:3072 builtin/submodule--helper.c:3375
 msgid "print only error messages"
 msgstr "nur Fehlermeldungen ausgeben"
 
-#: builtin/submodule--helper.c:3073
 msgid "force creation"
 msgstr "erzwinge Erstellung"
 
-#: builtin/submodule--helper.c:3081
 msgid "show whether the branch would be created"
 msgstr "anzeigen, ob der Branch erzeugt werden würde"
 
-#: builtin/submodule--helper.c:3085
 msgid ""
 "git submodule--helper create-branch [-f|--force] [--create-reflog] [-q|--"
 "quiet] [-t|--track] [-n|--dry-run] <name> <start-oid> <start-name>"
@@ -24260,29 +12653,24 @@ msgstr ""
 "git submodule--helper create-branch [-f|--force] [--create-reflog] [-q|--"
 "quiet] [-t|--track] [-n|--dry-run] <Name> <Start-oid> <Start-Name>"
 
-#: builtin/submodule--helper.c:3097
 #, c-format
 msgid "creating branch '%s'"
 msgstr "erstelle Branch '%s'"
 
-#: builtin/submodule--helper.c:3155
 #, 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:3158
 #, 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:3171
 #, c-format
 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:\n"
 
-#: builtin/submodule--helper.c:3178
 #, c-format
 msgid ""
 "If you want to reuse this local git directory instead of cloning again from\n"
@@ -24300,117 +12688,96 @@ msgstr ""
 "nicht das korrekte Repository ist oder Sie unsicher sind, was das bedeutet,\n"
 "wählen Sie einen anderen Namen mit der Option '--name'."
 
-#: builtin/submodule--helper.c:3190
 #, 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:3227
 #, c-format
 msgid "unable to checkout submodule '%s'"
 msgstr "kann Submodul '%s' nicht auschecken"
 
-#: builtin/submodule--helper.c:3266
 #, c-format
 msgid "Failed to add submodule '%s'"
 msgstr "Hinzufügen von Submodul '%s' fehlgeschlagen"
 
-#: builtin/submodule--helper.c:3270 builtin/submodule--helper.c:3275
-#: builtin/submodule--helper.c:3283
 #, c-format
 msgid "Failed to register submodule '%s'"
 msgstr "Fehler beim Registrieren von Submodul '%s'"
 
-#: builtin/submodule--helper.c:3339
 #, c-format
 msgid "'%s' already exists in the index"
 msgstr "'%s' existiert bereits im Index"
 
-#: builtin/submodule--helper.c:3342
 #, 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:3372
+#, c-format
+msgid "'%s' does not have a commit checked out"
+msgstr "'%s' hat keinen Commit ausgecheckt"
+
 msgid "branch of repository to add as submodule"
 msgstr "Branch des Repositories zum Hinzufügen als Submodul"
 
-#: builtin/submodule--helper.c:3373
 msgid "allow adding an otherwise ignored submodule path"
 msgstr "das Hinzufügen eines andernfalls ignorierten Submodul-Pfads erlauben"
 
-#: builtin/submodule--helper.c:3379
 msgid "borrow the objects from reference repositories"
 msgstr "die Objekte von Referenz-Repositories ausleihen"
 
-#: builtin/submodule--helper.c:3381
 msgid ""
-"sets the submodule’s name to the given string instead of defaulting to its "
+"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 "
+"setzt den Namen des Submoduls auf die angegebene Zeichenkette fest, statt "
 "standardmäßig dessen Pfad zu nehmen"
 
-#: builtin/submodule--helper.c:3388
 msgid "git submodule--helper add [<options>] [--] <repository> [<path>]"
 msgstr "git submodule--helper add [<Optionen>] [--] <Repository> [<Pfad>]"
 
-#: builtin/submodule--helper.c:3416
 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:3425
 #, 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:3460
 #, c-format
 msgid "'%s' is not a valid submodule name"
 msgstr "'%s' ist kein gültiger Submodul-Name"
 
-#: builtin/submodule--helper.c:3520 git.c:453 git.c:729
 #, c-format
 msgid "%s doesn't support --super-prefix"
 msgstr "%s unterstützt kein --super-prefix"
 
-#: builtin/submodule--helper.c:3526
 #, c-format
 msgid "'%s' is not a valid submodule--helper subcommand"
 msgstr "'%s' ist kein gültiger Unterbefehl von submodule--helper"
 
-#: builtin/symbolic-ref.c:8
 msgid "git symbolic-ref [<options>] <name> [<ref>]"
 msgstr "git symbolic-ref [<Optionen>] <Name> [<Referenz>]"
 
-#: builtin/symbolic-ref.c:9
 msgid "git symbolic-ref -d [-q] <name>"
 msgstr "git symbolic-ref -d [-q] <Name>"
 
-#: builtin/symbolic-ref.c:42
 msgid "suppress error message for non-symbolic (detached) refs"
 msgstr ""
 "Fehlermeldungen für nicht-symbolische (losgelöste) Referenzen unterdrücken"
 
-#: builtin/symbolic-ref.c:43
 msgid "delete symbolic ref"
 msgstr "symbolische Referenzen löschen"
 
-#: builtin/symbolic-ref.c:44
 msgid "shorten ref output"
 msgstr "verkürzte Ausgabe der Referenzen"
 
-#: builtin/symbolic-ref.c:45 builtin/update-ref.c:505
 msgid "reason"
 msgstr "Grund"
 
-#: builtin/symbolic-ref.c:45 builtin/update-ref.c:505
 msgid "reason of the update"
 msgstr "Grund für die Aktualisierung"
 
-#: builtin/tag.c:26
 msgid ""
 "git tag [-a | -s | -u <key-id>] [-f] [-m <msg> | -F <file>]\n"
 "        <tagname> [<head>]"
@@ -24418,11 +12785,9 @@ msgstr ""
 "git tag [-a | -s | -u <Schlüssel-ID>] [-f] [-m <Beschreibung> | -F <Datei>]\n"
 "        <Tagname> [<Commit>]"
 
-#: builtin/tag.c:28
 msgid "git tag -d <tagname>..."
 msgstr "git tag -d <Tagname>..."
 
-#: builtin/tag.c:29
 msgid ""
 "git tag -l [-n[<num>]] [--contains <commit>] [--no-contains <commit>] [--"
 "points-at <object>]\n"
@@ -24434,21 +12799,17 @@ msgstr ""
 "        [--format=<format>] [--merged <Commit>] [--no-merged <Commit>] "
 "[<Muster>...]"
 
-#: builtin/tag.c:31
 msgid "git tag -v [--format=<format>] <tagname>..."
 msgstr "git tag -v [--format=<Format>] <Tagname>..."
 
-#: builtin/tag.c:101
 #, c-format
 msgid "tag '%s' not found."
 msgstr "Tag '%s' nicht gefunden."
 
-#: builtin/tag.c:136
 #, c-format
 msgid "Deleted tag '%s' (was %s)\n"
 msgstr "Tag '%s' gelöscht (war %s)\n"
 
-#: builtin/tag.c:171
 #, c-format
 msgid ""
 "\n"
@@ -24461,7 +12822,6 @@ msgstr ""
 "  %s\n"
 "ein. Zeilen, die mit '%c' beginnen, werden ignoriert.\n"
 
-#: builtin/tag.c:175
 #, c-format
 msgid ""
 "\n"
@@ -24476,11 +12836,9 @@ msgstr ""
 "ein. Zeilen, die mit '%c' beginnen, werden behalten; Sie dürfen diese\n"
 "selbst entfernen wenn Sie möchten.\n"
 
-#: builtin/tag.c:241
 msgid "unable to sign the tag"
 msgstr "konnte Tag nicht signieren"
 
-#: builtin/tag.c:259
 #, c-format
 msgid ""
 "You have created a nested tag. The object referred to by your new tag is\n"
@@ -24494,331 +12852,260 @@ msgstr ""
 "\n"
 "\tgit tag -f %s %s^{}"
 
-#: builtin/tag.c:275
 msgid "bad object type."
 msgstr "ungültiger Objekt-Typ"
 
-#: builtin/tag.c:326
 msgid "no tag message?"
 msgstr "keine Tag-Beschreibung?"
 
-#: 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:445
 msgid "list tag names"
 msgstr "Tagnamen auflisten"
 
-#: builtin/tag.c:447
 msgid "print <n> lines of each tag message"
 msgstr "<n> Zeilen jeder Tag-Beschreibung anzeigen"
 
-#: builtin/tag.c:449
 msgid "delete tags"
 msgstr "Tags löschen"
 
-#: builtin/tag.c:450
 msgid "verify tags"
 msgstr "Tags überprüfen"
 
-#: builtin/tag.c:452
 msgid "Tag creation options"
 msgstr "Optionen für Erstellung von Tags"
 
-#: builtin/tag.c:454
 msgid "annotated tag, needs a message"
 msgstr "annotiertes Tag, benötigt eine Beschreibung"
 
-#: builtin/tag.c:456
 msgid "tag message"
 msgstr "Tag-Beschreibung"
 
-#: builtin/tag.c:458
 msgid "force edit of tag message"
 msgstr "Bearbeitung der Tag-Beschreibung erzwingen"
 
-#: builtin/tag.c:459
 msgid "annotated and GPG-signed tag"
 msgstr "annotiertes und GPG-signiertes Tag"
 
-#: builtin/tag.c:462
 msgid "use another key to sign the tag"
 msgstr "einen anderen Schlüssel verwenden, um das Tag zu signieren"
 
-#: builtin/tag.c:463
 msgid "replace the tag if exists"
 msgstr "das Tag ersetzen, wenn es existiert"
 
-#: builtin/tag.c:464 builtin/update-ref.c:511
 msgid "create a reflog"
 msgstr "Reflog erstellen"
 
-#: builtin/tag.c:466
 msgid "Tag listing options"
 msgstr "Optionen für Auflistung der Tags"
 
-#: builtin/tag.c:467
 msgid "show tag list in columns"
 msgstr "Liste der Tags in Spalten anzeigen"
 
-#: builtin/tag.c:468 builtin/tag.c:470
 msgid "print only tags that contain the commit"
 msgstr "nur Tags ausgeben, die diesen Commit beinhalten"
 
-#: builtin/tag.c:469 builtin/tag.c:471
 msgid "print only tags that don't contain the commit"
 msgstr "nur Tags ausgeben, die diesen Commit nicht enthalten"
 
-#: builtin/tag.c:472
 msgid "print only tags that are merged"
 msgstr "nur Tags ausgeben, die gemerged wurden"
 
-#: builtin/tag.c:473
 msgid "print only tags that are not merged"
 msgstr "nur Tags ausgeben, die nicht gemerged wurden"
 
-#: builtin/tag.c:477
 msgid "print only tags of the object"
 msgstr "nur Tags von dem Objekt ausgeben"
 
-#: builtin/tag.c:559
 #, c-format
 msgid "the '%s' option is only allowed in list mode"
 msgstr "die Option '%s' ist nur im Listenmodus erlaubt"
 
-#: builtin/tag.c:598
 #, c-format
 msgid "'%s' is not a valid tag name."
 msgstr "'%s' ist kein gültiger Tagname."
 
-#: builtin/tag.c:603
 #, c-format
 msgid "tag '%s' already exists"
 msgstr "Tag '%s' existiert bereits"
 
-#: builtin/tag.c:634
+#, c-format
+msgid "Invalid cleanup mode %s"
+msgstr "Ungültiger \"cleanup\" Modus %s"
+
 #, c-format
 msgid "Updated tag '%s' (was %s)\n"
 msgstr "Tag '%s' aktualisiert (war %s)\n"
 
-#: builtin/unpack-objects.c:95
 msgid "pack exceeds maximum allowed size"
 msgstr "Paket überschreitet die maximal erlaubte Größe"
 
-#: builtin/unpack-objects.c:504
 msgid "Unpacking objects"
 msgstr "Entpacke Objekte"
 
-#: builtin/update-index.c:84
 #, c-format
 msgid "failed to create directory %s"
 msgstr "Fehler beim Erstellen von Verzeichnis '%s'"
 
-#: builtin/update-index.c:106
 #, c-format
 msgid "failed to delete file %s"
 msgstr "Konnte Datei '%s' nicht löschen"
 
-#: 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:138
 #, c-format
 msgid "Testing mtime in '%s' "
 msgstr "Prüfe mtime in '%s' "
 
-#: 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: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:178
 msgid "directory stat info changes after updating a file"
 msgstr ""
 "Verzeichnisinformationen haben sich nach Aktualisierung einer Datei geändert"
 
-#: 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: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: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:220
 msgid " OK"
 msgstr " OK"
 
-#: builtin/update-index.c:589
 msgid "git update-index [<options>] [--] [<file>...]"
 msgstr "git update-index [<Optionen>] [--] [<Datei>...]"
 
-#: builtin/update-index.c:993
 msgid "continue refresh even when index needs update"
 msgstr ""
 "Aktualisierung fortsetzen, auch wenn der Index aktualisiert werden muss"
 
-#: builtin/update-index.c:996
 msgid "refresh: ignore submodules"
 msgstr "Aktualisierung: ignoriert Submodule"
 
-#: builtin/update-index.c:999
 msgid "do not ignore new files"
 msgstr "keine neuen Dateien ignorieren"
 
-#: builtin/update-index.c:1001
 msgid "let files replace directories and vice-versa"
 msgstr "Dateien Verzeichnisse ersetzen lassen, und umgedreht"
 
-#: builtin/update-index.c:1003
 msgid "notice files missing from worktree"
 msgstr "fehlende Dateien im Arbeitsverzeichnis beachten"
 
-#: builtin/update-index.c:1005
 msgid "refresh even if index contains unmerged entries"
 msgstr ""
 "aktualisieren, auch wenn der Index nicht zusammengeführte Einträge beinhaltet"
 
-#: builtin/update-index.c:1008
 msgid "refresh stat information"
 msgstr "Dateiinformationen aktualisieren"
 
-#: builtin/update-index.c:1012
 msgid "like --refresh, but ignore assume-unchanged setting"
 msgstr "wie --refresh, ignoriert aber \"assume-unchanged\" Einstellung"
 
-#: builtin/update-index.c:1016
 msgid "<mode>,<object>,<path>"
 msgstr "<Modus>,<Objekt>,<Pfad>"
 
-#: builtin/update-index.c:1017
 msgid "add the specified entry to the index"
 msgstr "den angegebenen Eintrag zum Commit vormerken"
 
-#: builtin/update-index.c:1027
 msgid "mark files as \"not changing\""
 msgstr "diese Datei immer als unverändert betrachten"
 
-#: builtin/update-index.c:1030
 msgid "clear assumed-unchanged bit"
 msgstr "\"assumed-unchanged\"-Bit löschen"
 
-#: builtin/update-index.c:1033
 msgid "mark files as \"index-only\""
 msgstr "Dateien als \"index-only\" markieren"
 
-#: builtin/update-index.c:1036
 msgid "clear skip-worktree bit"
 msgstr "\"skip-worktree\"-Bit löschen"
 
-#: builtin/update-index.c:1039
 msgid "do not touch index-only entries"
 msgstr "\"index-only\" Einträge überspringen"
 
-#: builtin/update-index.c:1041
 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:1043
 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:1045
 msgid "with --stdin: input lines are terminated by null bytes"
 msgstr "mit --stdin: eingegebene Zeilen sind durch NUL-Bytes abgeschlossen"
 
-#: builtin/update-index.c:1047
 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:1051
 msgid "add entries from standard input to the index"
 msgstr "Einträge von der Standard-Eingabe zum Commit vormerken"
 
-#: builtin/update-index.c:1055
 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:1059
 msgid "only update entries that differ from HEAD"
 msgstr "nur Einträge aktualisieren, die unterschiedlich zu HEAD sind"
 
-#: builtin/update-index.c:1063
 msgid "ignore files missing from worktree"
 msgstr "fehlende Dateien im Arbeitsverzeichnis ignorieren"
 
-#: builtin/update-index.c:1066
 msgid "report actions to standard output"
 msgstr "die Aktionen in der Standard-Ausgabe ausgeben"
 
-#: builtin/update-index.c:1068
 msgid "(for porcelains) forget saved unresolved conflicts"
 msgstr "(für Fremdprogramme) keine gespeicherten, nicht aufgelöste Konflikte"
 
-#: builtin/update-index.c:1072
 msgid "write index in this format"
 msgstr "Index-Datei in diesem Format schreiben"
 
-#: builtin/update-index.c:1074
 msgid "enable or disable split index"
 msgstr "aufgeteilten Index aktivieren oder deaktivieren"
 
-#: builtin/update-index.c:1076
 msgid "enable/disable untracked cache"
 msgstr "Cache für unversionierte Dateien aktivieren oder deaktivieren"
 
-#: builtin/update-index.c:1078
 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:1080
 msgid "enable untracked cache without testing the filesystem"
 msgstr ""
 "Cache für unversionierte Dateien ohne Prüfung des Dateisystems aktivieren"
 
-#: builtin/update-index.c:1082
 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:1084
 msgid "enable or disable file system monitor"
 msgstr "Dateisystem-Monitor aktivieren oder deaktivieren"
 
-#: builtin/update-index.c:1086
 msgid "mark files as fsmonitor valid"
 msgstr "Dateien als \"fsmonitor valid\" markieren"
 
-#: builtin/update-index.c:1089
 msgid "clear fsmonitor valid bit"
 msgstr "\"fsmonitor valid\"-Bit löschen"
 
-#: builtin/update-index.c:1195
 msgid ""
 "core.splitIndex is set to false; remove or change it, if you really want to "
 "enable split index"
@@ -24826,7 +13113,6 @@ msgstr ""
 "core.splitIndex ist auf 'false' gesetzt; entfernen oder ändern Sie dies,\n"
 "wenn sie wirklich die Aufteilung des Index aktivieren möchten"
 
-#: builtin/update-index.c:1204
 msgid ""
 "core.splitIndex is set to true; remove or change it, if you really want to "
 "disable split index"
@@ -24834,7 +13120,6 @@ msgstr ""
 "core.splitIndex ist auf 'true' gesetzt; entfernen oder ändern Sie dies,\n"
 "wenn Sie wirklich die Aufteilung des Index deaktivieren möchten"
 
-#: builtin/update-index.c:1216
 msgid ""
 "core.untrackedCache is set to true; remove or change it, if you really want "
 "to disable the untracked cache"
@@ -24842,11 +13127,9 @@ msgstr ""
 "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:1220
 msgid "Untracked cache disabled"
 msgstr "Cache für unversionierte Dateien deaktiviert"
 
-#: builtin/update-index.c:1228
 msgid ""
 "core.untrackedCache is set to false; remove or change it, if you really want "
 "to enable the untracked cache"
@@ -24855,23 +13138,19 @@ msgstr ""
 "dies,\n"
 "wenn sie wirklich den Cache für unversionierte Dateien aktivieren möchten"
 
-#: builtin/update-index.c:1232
 #, c-format
 msgid "Untracked cache enabled for '%s'"
 msgstr "Cache für unversionierte Dateien für '%s' aktiviert"
 
-#: builtin/update-index.c:1241
 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:1246
 msgid "fsmonitor enabled"
 msgstr "Dateisystem-Monitor aktiviert"
 
-#: builtin/update-index.c:1250
 msgid ""
 "core.fsmonitor is set; remove it if you really want to disable fsmonitor"
 msgstr ""
@@ -24879,153 +13158,117 @@ msgstr ""
 "Monitor\n"
 "wirklich deaktivieren möchten."
 
-#: builtin/update-index.c:1254
 msgid "fsmonitor disabled"
 msgstr "Dateisystem-Monitor deaktiviert"
 
-#: builtin/update-ref.c:10
 msgid "git update-ref [<options>] -d <refname> [<old-val>]"
 msgstr "git update-ref [<Optionen>] -d <Referenzname> [<alter-Wert>]"
 
-#: builtin/update-ref.c:11
 msgid "git update-ref [<options>]    <refname> <new-val> [<old-val>]"
 msgstr ""
 "git update-ref [<Optionen>]    <Referenzname> <neuer-Wert> [<alter-Wert>]"
 
-#: builtin/update-ref.c:12
 msgid "git update-ref [<options>] --stdin [-z]"
 msgstr "git update-ref [<Optionen>] --stdin [-z]"
 
-#: builtin/update-ref.c:506
 msgid "delete the reference"
 msgstr "diese Referenz löschen"
 
-#: builtin/update-ref.c:508
 msgid "update <refname> not the one it points to"
 msgstr "<Referenzname> aktualisieren, nicht den Verweis"
 
-#: builtin/update-ref.c:509
 msgid "stdin has NUL-terminated arguments"
 msgstr "Standard-Eingabe hat durch NUL-Zeichen abgeschlossene Argumente"
 
-#: builtin/update-ref.c:510
 msgid "read updates from stdin"
 msgstr "Aktualisierungen von der Standard-Eingabe lesen"
 
-#: builtin/update-server-info.c:15
 msgid "update the info files from scratch"
 msgstr "die Informationsdateien von Grund auf aktualisieren"
 
-#: builtin/upload-pack.c:11
 msgid "git upload-pack [<options>] <dir>"
 msgstr "git upload-pack [<Optionen>] <Verzeichnis>"
 
-#: 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:26
 msgid "serve up the info/refs for git-http-backend"
 msgstr "info/refs für git-http-backend übergeben"
 
-#: 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:31
 msgid "interrupt transfer after <n> seconds of inactivity"
 msgstr "Übertragung nach <n> Sekunden Inaktivität unterbrechen"
 
-#: builtin/verify-commit.c:19
 msgid "git verify-commit [-v | --verbose] <commit>..."
 msgstr "git verify-commit [-v | --verbose] <Commit>..."
 
-#: builtin/verify-commit.c:68
 msgid "print commit contents"
 msgstr "Commit-Inhalte ausgeben"
 
-#: builtin/verify-commit.c:69 builtin/verify-tag.c:37
 msgid "print raw gpg status output"
 msgstr "unbearbeitete Ausgabe des Status von gpg ausgeben"
 
-#: builtin/verify-pack.c:59
 msgid "git verify-pack [-v | --verbose] [-s | --stat-only] <pack>..."
 msgstr "git verify-pack [-v | --verbose] [-s | --stat-only] <Paket>..."
 
-#: builtin/verify-pack.c:70
 msgid "verbose"
 msgstr "erweiterte Ausgaben"
 
-#: builtin/verify-pack.c:72
 msgid "show statistics only"
 msgstr "nur Statistiken anzeigen"
 
-#: builtin/verify-tag.c:18
 msgid "git verify-tag [-v | --verbose] [--format=<format>] <tag>..."
 msgstr "git verify-tag [-v | --verbose] [--format=<Format>] <Tag>..."
 
-#: builtin/verify-tag.c:36
 msgid "print tag contents"
 msgstr "Tag-Inhalte ausgeben"
 
-#: builtin/worktree.c:19
 msgid "git worktree add [<options>] <path> [<commit-ish>]"
 msgstr "git worktree add [<Optionen>] <Pfad> [<Commit-Angabe>]"
 
-#: builtin/worktree.c:20
 msgid "git worktree list [<options>]"
 msgstr "git worktree list [<Optionen>]"
 
-#: builtin/worktree.c:21
 msgid "git worktree lock [<options>] <path>"
 msgstr "git worktree lock [<Optionen>] <Pfad>"
 
-#: builtin/worktree.c:22
 msgid "git worktree move <worktree> <new-path>"
 msgstr "git worktree move <Arbeitsverzeichnis> <neuer-Pfad>"
 
-#: builtin/worktree.c:23
 msgid "git worktree prune [<options>]"
 msgstr "git worktree prune [<Optionen>]"
 
-#: builtin/worktree.c:24
 msgid "git worktree remove [<options>] <worktree>"
 msgstr "git worktree remove [<Optionen>] <Arbeitsverzeichnis>"
 
-#: builtin/worktree.c:25
 msgid "git worktree repair [<path>...]"
 msgstr "git worktree repair [<Pfad>...]"
 
-#: builtin/worktree.c:26
 msgid "git worktree unlock <path>"
 msgstr "git worktree unlock <Pfad>"
 
-#: builtin/worktree.c:76
 #, c-format
 msgid "Removing %s/%s: %s"
 msgstr "Entferne %s/%s: %s"
 
-#: builtin/worktree.c:149
 msgid "report pruned working trees"
 msgstr "entfernte Arbeitsverzeichnisse ausgeben"
 
-#: builtin/worktree.c:151
 msgid "expire working trees older than <time>"
 msgstr "Arbeitsverzeichnisse älter als <Zeit> verfallen lassen"
 
-#: builtin/worktree.c:221
 #, c-format
 msgid "'%s' already exists"
 msgstr "'%s' existiert bereits"
 
-#: builtin/worktree.c:230
 #, c-format
 msgid "unusable worktree destination '%s'"
 msgstr "nicht nutzbares Ziel des Arbeitsverzeichnisses '%s'"
 
-#: builtin/worktree.c:235
 #, c-format
 msgid ""
 "'%s' is a missing but locked worktree;\n"
@@ -25035,7 +13278,6 @@ msgstr ""
 "benutzen Sie '%s -f -f' zum Überschreiben, oder 'unlock' und 'prune'\n"
 "oder 'remove' zum Löschen"
 
-#: builtin/worktree.c:237
 #, c-format
 msgid ""
 "'%s' is a missing but already registered worktree;\n"
@@ -25045,159 +13287,131 @@ msgstr ""
 "benutzen Sie '%s -f' zum Überschreiben, oder 'prune' oder 'remove' zum\n"
 "Löschen"
 
-#: builtin/worktree.c:248
 #, c-format
 msgid "failed to copy '%s' to '%s'; sparse-checkout may not work correctly"
 msgstr ""
 "Fehler beim Kopieren von '%s' nach '%s'; partieller Checkout funktioniert "
 "möglicherweise nicht richtig"
 
-#: builtin/worktree.c:268
 #, c-format
 msgid "failed to copy worktree config from '%s' to '%s'"
 msgstr ""
 "Fehler beim Kopieren der Arbeitsverzeichniskonfiguration von '%s' nach '%s'"
 
-#: builtin/worktree.c:280 builtin/worktree.c:285
 #, c-format
 msgid "failed to unset '%s' in '%s'"
 msgstr "Fehler beim Aufheben von '%s' in '%s'"
 
-#: builtin/worktree.c:356
 #, c-format
 msgid "could not create directory of '%s'"
 msgstr "Konnte Verzeichnis '%s' nicht erstellen."
 
-#: builtin/worktree.c:378
 msgid "initializing"
 msgstr "initialisiere"
 
-#: builtin/worktree.c:492 builtin/worktree.c:498
 #, c-format
 msgid "Preparing worktree (new branch '%s')"
 msgstr "Bereite Arbeitsverzeichnis vor (neuer Branch '%s')"
 
-#: builtin/worktree.c:494
 #, 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:503
 #, c-format
 msgid "Preparing worktree (checking out '%s')"
 msgstr "Bereite Arbeitsverzeichnis vor (checke '%s' aus)"
 
-#: builtin/worktree.c:509
 #, c-format
 msgid "Preparing worktree (detached HEAD %s)"
 msgstr "Bereite Arbeitsverzeichnis vor (losgelöster HEAD %s)"
 
-#: builtin/worktree.c:554
 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:557
 msgid "create a new branch"
 msgstr "neuen Branch erstellen"
 
-#: builtin/worktree.c:559
 msgid "create or reset a branch"
 msgstr "Branch erstellen oder umsetzen"
 
-#: builtin/worktree.c:561
 msgid "populate the new working tree"
 msgstr "das neue Arbeitsverzeichnis auschecken"
 
-#: builtin/worktree.c:562
 msgid "keep the new working tree locked"
 msgstr "das neue Arbeitsverzeichnis gesperrt lassen"
 
-#: builtin/worktree.c:564 builtin/worktree.c:809
 msgid "reason for locking"
 msgstr "Sperrgrund"
 
-#: builtin/worktree.c:567
 msgid "set up tracking mode (see git-branch(1))"
 msgstr "Modus zum Folgen von Branches einstellen (siehe git-branch(1))"
 
-#: builtin/worktree.c:570
 msgid "try to match the new branch name with a remote-tracking branch"
 msgstr ""
 "versuchen, eine Übereinstimmung des Branchnamens mit einem\n"
 "Remote-Tracking-Branch herzustellen"
 
-#: builtin/worktree.c:584
+#, c-format
+msgid "options '%s', '%s', and '%s' cannot be used together"
+msgstr ""
+"die Optionen '%s', '%s' und '%s' können nicht gemeinsam verwendet werden"
+
 msgid "added with --lock"
 msgstr "mit --lock hinzugefügt"
 
-#: builtin/worktree.c:646
 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:766
 msgid "show extended annotations and reasons, if available"
 msgstr "erweiterte Anmerkungen und Gründe anzeigen, falls vorhanden"
 
-#: builtin/worktree.c:768
 msgid "add 'prunable' annotation to worktrees older than <time>"
 msgstr ""
 "'prunable'-Anmerkung zu Arbeitsverzeichnissen älter als <Zeit> hinzufügen"
 
-#: builtin/worktree.c:770
 msgid "terminate records with a NUL character"
 msgstr "Einträge mit NUL-Zeichen abschließen"
 
-#: builtin/worktree.c:821 builtin/worktree.c:854 builtin/worktree.c:928
-#: builtin/worktree.c:1052
 #, c-format
 msgid "'%s' is not a working tree"
 msgstr "'%s' ist kein Arbeitsverzeichnis"
 
-#: builtin/worktree.c:823 builtin/worktree.c:856
 msgid "The main working tree cannot be locked or unlocked"
 msgstr "Das Hauptarbeitsverzeichnis kann nicht gesperrt oder entsperrt werden."
 
-#: builtin/worktree.c:828
 #, c-format
 msgid "'%s' is already locked, reason: %s"
 msgstr "'%s' ist bereits gesperrt, Grund: %s"
 
-#: builtin/worktree.c:830
 #, c-format
 msgid "'%s' is already locked"
 msgstr "'%s' ist bereits gesperrt"
 
-#: builtin/worktree.c:858
 #, c-format
 msgid "'%s' is not locked"
 msgstr "'%s' ist nicht gesperrt"
 
-#: builtin/worktree.c:899
 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:907
 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:930 builtin/worktree.c:1054
 #, c-format
 msgid "'%s' is a main working tree"
 msgstr "'%s' ist ein Hauptarbeitsverzeichnis"
 
-#: builtin/worktree.c:935
 #, c-format
 msgid "could not figure out destination name from '%s'"
 msgstr "konnte Zielname aus '%s' nicht bestimmen"
 
-#: builtin/worktree.c:948
 #, c-format
 msgid ""
 "cannot move a locked working tree, lock reason: %s\n"
@@ -25207,7 +13421,6 @@ msgstr ""
 "benutzen Sie 'move -f -f' zum Überschreiben oder entsperren Sie zuerst\n"
 "das Arbeitsverzeichnis"
 
-#: builtin/worktree.c:950
 msgid ""
 "cannot move a locked working tree;\n"
 "use 'move -f -f' to override or unlock first"
@@ -25216,40 +13429,33 @@ msgstr ""
 "benutzen Sie 'move -f -f' zum Überschreiben oder entsperren Sie zuerst\n"
 "das Arbeitsverzeichnis"
 
-#: builtin/worktree.c:953
 #, c-format
 msgid "validation failed, cannot move working tree: %s"
 msgstr "Validierung fehlgeschlagen, kann Arbeitszeichnis nicht verschieben: %s"
 
-#: builtin/worktree.c:958
 #, c-format
 msgid "failed to move '%s' to '%s'"
 msgstr "Fehler beim Verschieben von '%s' nach '%s'"
 
-#: builtin/worktree.c:1004
 #, c-format
 msgid "failed to run 'git status' on '%s'"
 msgstr "Fehler beim Ausführen von 'git status' auf '%s'"
 
-#: builtin/worktree.c:1008
 #, 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:1013
 #, 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:1036
 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:1059
 #, c-format
 msgid ""
 "cannot remove a locked working tree, lock reason: %s\n"
@@ -25259,7 +13465,6 @@ msgstr ""
 "Benutzen Sie 'remove -f -f' zum Überschreiben oder entsperren Sie zuerst\n"
 "das Arbeitsverzeichnis."
 
-#: builtin/worktree.c:1061
 msgid ""
 "cannot remove a locked working tree;\n"
 "use 'remove -f -f' to override or unlock first"
@@ -25268,1420 +13473,8193 @@ msgstr ""
 "benutzen Sie 'remove -f -f' zum Überschreiben oder entsperren Sie zuerst\n"
 "das Arbeitsverzeichnis"
 
-#: builtin/worktree.c:1064
 #, c-format
 msgid "validation failed, cannot remove working tree: %s"
 msgstr "Validierung fehlgeschlagen, kann Arbeitsverzeichnis nicht löschen: %s"
 
-#: builtin/worktree.c:1088
 #, c-format
 msgid "repair: %s: %s"
 msgstr "repariere: %s: %s"
 
-#: builtin/worktree.c:1091
 #, c-format
 msgid "error: %s: %s"
 msgstr "Fehler: %s: %s"
 
-#: builtin/write-tree.c:15
 msgid "git write-tree [--missing-ok] [--prefix=<prefix>/]"
 msgstr "git write-tree [--missing-ok] [--prefix=<Präfix>/]"
 
-#: builtin/write-tree.c:28
 msgid "<prefix>/"
 msgstr "<Präfix>/"
 
-#: builtin/write-tree.c:29
 msgid "write tree object for a subdirectory <prefix>"
 msgstr "das Tree-Objekt für ein Unterverzeichnis <Präfix> schreiben"
 
-#: builtin/write-tree.c:31
 msgid "only useful for debugging"
 msgstr "nur nützlich für Fehlersuche"
 
-#: git.c:28
-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"
-"           [--git-dir=<path>] [--work-tree=<path>] [--namespace=<name>]\n"
-"           [--super-prefix=<path>] [--config-env=<name>=<envvar>]\n"
-"           <command> [<args>]"
-msgstr ""
-"git [--version] [--help] [-C <Pfad>] [-c <Name>=<Wert>]\n"
-"           [--exec-path[=<Pfad>]] [--html-path] [--man-path] [--info-path]\n"
-"           [-p | --paginate | -P | --no-pager] [--no-replace-objects] [--"
-"bare]\n"
-"           [--git-dir=<Pfad>] [--work-tree=<Pfad>] [--namespace=<Name>]\n"
-"           [--super-prefix=<Pfad>] [--config-env=<Name>=<Variable>]\n"
-"           <Befehl> [<Argumente>]"
-
-#: git.c:36
-msgid ""
-"'git help -a' and 'git help -g' list available subcommands and some\n"
-"concept guides. See 'git help <command>' or 'git help <concept>'\n"
-"to read about a specific subcommand or concept.\n"
-"See 'git help git' for an overview of the system."
-msgstr ""
-"'git help -a' und 'git help -g' listet verfügbare Unterbefehle und\n"
-"einige Anleitungen zu Git-Konzepten auf. Benutzen Sie 'git help <Befehl>'\n"
-"oder 'git help <Konzept>', um mehr über einen spezifischen Befehl oder\n"
-"Konzept zu erfahren.\n"
-"Benutzen Sie 'git help git' für einen Überblick des Systems."
-
-#: git.c:188 git.c:216 git.c:300
 #, c-format
-msgid "no directory given for '%s' option\n"
-msgstr "kein Verzeichnis für Option '%s' angegeben\n"
-
-#: git.c:202
-#, c-format
-msgid "no namespace given for --namespace\n"
-msgstr "Kein Namespace für --namespace angegeben.\n"
-
-#: git.c:230
-#, c-format
-msgid "no prefix given for --super-prefix\n"
-msgstr "Kein Präfix für --super-prefix angegeben.\n"
-
-#: git.c:252
-#, c-format
-msgid "-c expects a configuration string\n"
-msgstr "-c erwartet einen Konfigurationsstring.\n"
-
-#: git.c:260
-#, c-format
-msgid "no config key given for --config-env\n"
-msgstr "kein Konfigurationsschlüssel für --config-env angegeben\n"
-
-#: git.c:326
-#, c-format
-msgid "unknown option: %s\n"
-msgstr "Unbekannte Option: %s\n"
-
-#: git.c:375
-#, c-format
-msgid "while expanding alias '%s': '%s'"
-msgstr "beim Erweitern von Alias '%s': '%s'"
-
-#: git.c:384
-#, c-format
-msgid ""
-"alias '%s' changes environment variables.\n"
-"You can use '!git' in the alias to do this"
-msgstr ""
-"Alias '%s' ändert Umgebungsvariablen.\n"
-"Sie können '!git' im Alias benutzen, um dies zu tun."
-
-#: git.c:391
-#, c-format
-msgid "empty alias for %s"
-msgstr "leerer Alias für %s"
-
-#: git.c:394
-#, c-format
-msgid "recursive alias: %s"
-msgstr "rekursiver Alias: %s"
-
-#: git.c:480
-msgid "write failure on standard output"
-msgstr "Fehler beim Schreiben in die Standard-Ausgabe."
-
-#: git.c:482
-msgid "unknown write failure on standard output"
-msgstr "Unbekannter Fehler beim Schreiben in die Standard-Ausgabe."
-
-#: git.c:484
-msgid "close failed on standard output"
-msgstr "Fehler beim Schließen der Standard-Ausgabe."
-
-#: git.c:838
-#, 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:888
-#, c-format
-msgid "cannot handle %s as a builtin"
-msgstr "Kann %s nicht als eingebauten Befehl behandeln."
-
-#: git.c:901
-#, c-format
-msgid ""
-"usage: %s\n"
-"\n"
-msgstr ""
-"Verwendung: %s\n"
-"\n"
-
-#: git.c:921
-#, 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:933
-#, c-format
-msgid "failed to run command '%s': %s\n"
-msgstr "Fehler beim Ausführen von Befehl '%s': %s\n"
-
-#: http-fetch.c:128
-#, c-format
-msgid "argument to --packfile must be a valid hash (got '%s')"
-msgstr "Argument für --packfile muss ein gültiger Hash sein ('%s' erhalten)"
-
-#: http-fetch.c:138
-msgid "not a git repository"
-msgstr "kein Git-Repository"
-
-#: t/helper/test-fast-rebase.c:141
-msgid "unhandled options"
-msgstr "unbehandelte Optionen"
-
-#: t/helper/test-fast-rebase.c:146
-msgid "error preparing revisions"
-msgstr "Fehler beim Vorbereiten der Commits"
-
-#: t/helper/test-reach.c:154
-#, c-format
-msgid "commit %s is not marked reachable"
-msgstr "Commit %s ist nicht als erreichbar gekennzeichnet."
-
-#: t/helper/test-reach.c:164
-msgid "too many commits marked reachable"
-msgstr "Zu viele Commits als erreichbar gekennzeichnet."
-
-#: t/helper/test-serve-v2.c:7
-msgid "test-tool serve-v2 [<options>]"
-msgstr "test-tool serve-v2 [<Optionen>]"
-
-#: t/helper/test-serve-v2.c:19
-msgid "exit immediately after advertising capabilities"
-msgstr "direkt nach Anzeige der angebotenen Fähigkeiten beenden"
-
-#: 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: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: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: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:585
-msgid "test-helper simple-ipc send         [<name>] [<token>]"
-msgstr "test-helper simple-ipc send         [<Name>] [<Token>]"
-
-#: 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:587
-msgid ""
-"test-helper simple-ipc multiple     [<name>] [<threads>] [<bytecount>] "
-"[<batchsize>]"
-msgstr ""
-"test-helper simple-ipc multiple     [<Name>] [<Threads>] [<bytecount>] "
-"[<batchsize>]"
-
-#: 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:597
-msgid "named-pipe name"
-msgstr "Name der benannten Pipe"
-
-#: 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: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:602
-msgid "number of bytes"
-msgstr "Anzahl von Bytes"
-
-#: 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:605
-msgid "byte"
-msgstr "Byte"
-
-#: t/helper/test-simple-ipc.c:605
-msgid "ballast character"
-msgstr "Ballast-Zeichen"
-
-#: t/helper/test-simple-ipc.c:606
-msgid "token"
-msgstr "Token"
-
-#: 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:350
-#, c-format
-msgid "negative value for http.postbuffer; defaulting to %d"
-msgstr "negativer Wert für http.postbuffer; benutze Standardwert %d"
-
-#: 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:380
-msgid "Public key pinning not supported with cURL < 7.39.0"
-msgstr ""
-"Das Anheften des öffentlichen Schlüssels wird mit cURL < 7.39.0 nicht "
-"unterstützt"
-
-#: 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:1016
-#, c-format
-msgid "Unsupported SSL backend '%s'. Supported SSL backends:"
-msgstr "Nicht unterstütztes SSL-Backend '%s'. Unterstützte SSL-Backends:"
-
-#: 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: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:1876
-#, c-format
-msgid ""
-"unable to update url base from redirection:\n"
-"  asked for: %s\n"
-"   redirect: %s"
-msgstr ""
-"Konnte Basis-URL nicht durch Umleitung aktualisieren:\n"
-"  gefragt nach: %s\n"
-"    umgeleitet: %s"
-
-#: remote-curl.c:184
-#, c-format
-msgid "invalid quoting in push-option value: '%s'"
-msgstr "Ungültiges Quoting beim \"push-option\"-Wert: '%s'"
-
-#: remote-curl.c:308
-#, 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:409
-msgid "invalid server response; expected service, got flush packet"
-msgstr "ungültige Antwort des Servers; Service erwartet, Flush-Paket bekommen"
-
-#: remote-curl.c:440
-#, c-format
-msgid "invalid server response; got '%s'"
-msgstr "ungültige Serverantwort; '%s' bekommen"
-
-#: remote-curl.c:500
-#, c-format
-msgid "repository '%s' not found"
-msgstr "Repository '%s' nicht gefunden"
-
-#: remote-curl.c:504
-#, c-format
-msgid "Authentication failed for '%s'"
-msgstr "Authentifizierung fehlgeschlagen für '%s'"
-
-#: remote-curl.c:508
-#, 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:512
-#, c-format
-msgid "unable to access '%s': %s"
-msgstr "konnte nicht auf '%s' zugreifen: %s"
-
-#: remote-curl.c:518
-#, c-format
-msgid "redirecting to %s"
-msgstr "Umleitung nach %s"
-
-#: remote-curl.c:649
-msgid "shouldn't have EOF when not gentle on EOF"
-msgstr "sollte kein EOF haben, wenn nicht behutsam mit EOF"
-
-#: remote-curl.c:661
-msgid "remote server sent unexpected response end packet"
-msgstr "Remote Server sendete unerwartetes Antwort-Endpaket"
-
-#: remote-curl.c:730
-msgid "unable to rewind rpc post data - try increasing http.postBuffer"
-msgstr ""
-"konnte nicht RPC-POST-Daten zurückspulen - Versuchen Sie http.postBuffer zu "
-"erhöhen"
+msgid "unrecognized bundle hash algorithm: %s"
+msgstr "unbekannter Paket-Hash-Algorithmus: %s"
 
-#: remote-curl.c:759
 #, c-format
-msgid "remote-curl: bad line length character: %.4s"
-msgstr "remote-curl: ungültiges Zeichen für Zeilenlänge: %.4s"
-
-#: remote-curl.c:761
-msgid "remote-curl: unexpected response end packet"
-msgstr "remote-curl: unerwartetes Antwort-Endpaket"
+msgid "unknown capability '%s'"
+msgstr "unbekannte Fähigkeit '%s'"
 
-#: remote-curl.c:837
 #, c-format
-msgid "RPC failed; %s"
-msgstr "RPC fehlgeschlagen; %s"
-
-#: remote-curl.c:877
-msgid "cannot handle pushes this big"
-msgstr "kann solche großen Übertragungen nicht verarbeiten"
+msgid "'%s' does not look like a v2 or v3 bundle file"
+msgstr "'%s' sieht nicht wie eine v2 oder v3 Paketdatei aus"
 
-#: remote-curl.c:990
 #, c-format
-msgid "cannot deflate request; zlib deflate error %d"
-msgstr "kann Request nicht komprimieren; \"zlib deflate\"-Fehler %d"
+msgid "unrecognized header: %s%s (%d)"
+msgstr "nicht erkannter Kopfbereich: %s%s (%d)"
 
-#: remote-curl.c:994
-#, c-format
-msgid "cannot deflate request; zlib end error %d"
-msgstr "kann Request nicht komprimieren; \"zlib end\"-Fehler %d"
+msgid "Repository lacks these prerequisite commits:"
+msgstr "Dem Repository fehlen folgende vorausgesetzte Commits:"
 
-#: remote-curl.c:1044
-#, c-format
-msgid "%d bytes of length header were received"
-msgstr "%d Bytes des Längen-Headers wurden empfangen"
+msgid "need a repository to verify a bundle"
+msgstr "um ein Paket zu überprüfen wird ein Repository benötigt"
 
-#: remote-curl.c:1046
 #, c-format
-msgid "%d bytes of body are still expected"
-msgstr "%d Bytes des Bodys werden noch erwartet"
-
-#: remote-curl.c:1135
-msgid "dumb http transport does not support shallow capabilities"
-msgstr "Dumb HTTP-Transport unterstützt keine shallow-Funktionen"
-
-#: remote-curl.c:1150
-msgid "fetch failed."
-msgstr "\"fetch\" fehlgeschlagen."
-
-#: remote-curl.c:1198
-msgid "cannot fetch by sha1 over smart http"
-msgstr "kann SHA-1 nicht über Smart-HTTP anfordern"
+msgid "The bundle contains this ref:"
+msgid_plural "The bundle contains these %<PRIuMAX> refs:"
+msgstr[0] "Das Paket enthält diese Referenz:"
+msgstr[1] "Das Paket enthält diese %<PRIuMAX> Referenzen:"
 
-#: remote-curl.c:1242 remote-curl.c:1248
-#, c-format
-msgid "protocol error: expected sha/ref, got '%s'"
-msgstr "Protokollfehler: SHA-1/Referenz erwartet, '%s' bekommen"
+msgid "The bundle records a complete history."
+msgstr "Das Paket speichert eine komplette Historie."
 
-#: remote-curl.c:1260 remote-curl.c:1378
 #, c-format
-msgid "http transport does not support %s"
-msgstr "HTTP-Transport unterstützt nicht %s"
-
-#: remote-curl.c:1296
-msgid "git-http-push failed"
-msgstr "\"git-http-push\" fehlgeschlagen"
-
-#: remote-curl.c:1485
-msgid "remote-curl: usage: git remote-curl <remote> [<url>]"
-msgstr "remote-curl: Verwendung: git remote-curl <Remote-Repository> [<URL>]"
-
-#: remote-curl.c:1517
-msgid "remote-curl: error reading command stream from git"
-msgstr "remote-curl: Fehler beim Lesen des Kommando-Streams von Git"
-
-#: remote-curl.c:1524
-msgid "remote-curl: fetch attempted without a local repo"
-msgstr "remote-curl: \"fetch\" ohne lokales Repository versucht"
+msgid "The bundle requires this ref:"
+msgid_plural "The bundle requires these %<PRIuMAX> refs:"
+msgstr[0] "Das Paket benötigt diese Referenz:"
+msgstr[1] "Das Paket benötigt diese %<PRIuMAX> Referenzen:"
 
-#: remote-curl.c:1565
-#, c-format
-msgid "remote-curl: unknown command '%s' from git"
-msgstr "remote-curl: Unbekannter Befehl '%s' von Git"
+msgid "unable to dup bundle descriptor"
+msgstr "konnte dup für Descriptor des Pakets nicht ausführen"
 
-#: contrib/scalar/scalar.c:49
-msgid "need a working directory"
-msgstr "Arbeitsverzeichnis benötigt"
+msgid "Could not spawn pack-objects"
+msgstr "Konnte Paketobjekte nicht erstellen"
 
-#: contrib/scalar/scalar.c:86
-msgid "could not find enlistment root"
-msgstr "konnte Root-Verzeichnis für Eintragungen nicht finden"
+msgid "pack-objects died"
+msgstr "Erstellung der Paketobjekte abgebrochen"
 
-#: contrib/scalar/scalar.c:89 contrib/scalar/scalar.c:350
-#: contrib/scalar/scalar.c:435 contrib/scalar/scalar.c:578
 #, c-format
-msgid "could not switch to '%s'"
-msgstr "konnte nicht zu '%s' wechseln"
+msgid "ref '%s' is excluded by the rev-list options"
+msgstr "Referenz '%s' wird durch \"rev-list\" Optionen ausgeschlossen"
 
-#: contrib/scalar/scalar.c:179
 #, c-format
-msgid "could not configure %s=%s"
-msgstr "konnte %s=%s nicht konfigurieren"
-
-#: contrib/scalar/scalar.c:197
-msgid "could not configure log.excludeDecoration"
-msgstr "konnte log.excludeDecoration nicht konfigurieren"
-
-#: contrib/scalar/scalar.c:218
-msgid "Scalar enlistments require a worktree"
-msgstr "Skalare Eintragungen erfordern ein Arbeitsverzeichnis"
+msgid "unsupported bundle version %d"
+msgstr "nicht unterstützte Paket-Version %d"
 
-#: contrib/scalar/scalar.c:310
 #, c-format
-msgid "remote HEAD is not a branch: '%.*s'"
-msgstr "externer HEAD ist kein Branch: '%.*s'"
-
-#: contrib/scalar/scalar.c:316
-msgid "failed to get default branch name from remote; using local default"
-msgstr ""
-"Fehler beim Abfragen des Standard-Branchnamens vom Remote-Repository; nutze "
-"lokalen Standardwert"
-
-#: contrib/scalar/scalar.c:329
-msgid "failed to get default branch name"
-msgstr "Fehler beim Abfragen des Standard-Branchnamens"
-
-#: contrib/scalar/scalar.c:340
-msgid "failed to unregister repository"
-msgstr "Fehler beim Austragen des Repositories"
-
-#: contrib/scalar/scalar.c:355
-msgid "failed to delete enlistment directory"
-msgstr "Fehler beim Löschen des Eintragungs-Verzeichnisses"
-
-#: contrib/scalar/scalar.c:375
-msgid "branch to checkout after clone"
-msgstr "Branch, der nach dem Klonen ausgecheckt werden soll"
-
-#: contrib/scalar/scalar.c:377
-msgid "when cloning, create full working directory"
-msgstr "vollständiges Arbeitsverzeichnis beim Klonen erstellen"
-
-#: contrib/scalar/scalar.c:379
-msgid "only download metadata for the branch that will be checked out"
-msgstr "lade nur Metadaten des Branches herunter, der ausgecheckt wird"
-
-#: contrib/scalar/scalar.c:384
-msgid "scalar clone [<options>] [--] <repo> [<dir>]"
-msgstr "scalar clone [<Optionen>] [--] <Repository> [<Verzeichnis>]"
+msgid "cannot write bundle version %d with algorithm %s"
+msgstr "kann Paket-Version %d nicht mit Algorithmus %s schreiben"
 
-#: contrib/scalar/scalar.c:409
-#, c-format
-msgid "cannot deduce worktree name from '%s'"
-msgstr "konnte Name für Arbeitsverzeichnis nicht von '%s' ableiten"
+msgid "Refusing to create empty bundle."
+msgstr "Erstellung eines leeren Pakets zurückgewiesen."
 
-#: contrib/scalar/scalar.c:418
 #, c-format
-msgid "directory '%s' exists already"
-msgstr "Verzeichnis '%s' existiert bereits"
+msgid "cannot create '%s'"
+msgstr "kann '%s' nicht erstellen"
 
-#: contrib/scalar/scalar.c:445
-#, c-format
-msgid "failed to get default branch for '%s'"
-msgstr "Fehler beim Abfragen des Default-Branches für '%s'"
+msgid "index-pack died"
+msgstr "Erstellung der Paketindexdatei abgebrochen"
 
-#: contrib/scalar/scalar.c:456
-#, c-format
-msgid "could not configure remote in '%s'"
-msgstr "konnte Remote-Repository in '%s' nicht konfigurieren"
+msgid "terminating chunk id appears earlier than expected"
+msgstr "abschließende Chunk-ID erscheint eher als erwartet"
 
-#: contrib/scalar/scalar.c:465
 #, c-format
-msgid "could not configure '%s'"
-msgstr "konnte '%s' nicht konfigurieren"
-
-#: contrib/scalar/scalar.c:468
-msgid "partial clone failed; attempting full clone"
-msgstr "partielles Klonen fehlgeschlagen; versuche vollständiges Klonen"
-
-#: contrib/scalar/scalar.c:472
-msgid "could not configure for full clone"
-msgstr "konnte nicht für vollständiges Klonen konfigurieren"
-
-#: contrib/scalar/scalar.c:504
-msgid "`scalar list` does not take arguments"
-msgstr "`scalar list` akzeptiert keine Argumente"
-
-#: contrib/scalar/scalar.c:517
-msgid "scalar register [<enlistment>]"
-msgstr "scalar register [<Eintragung>]"
-
-#: contrib/scalar/scalar.c:544
-msgid "reconfigure all registered enlistments"
-msgstr "alle registrierten Eintragungen neu konfigurieren"
-
-#: contrib/scalar/scalar.c:548
-msgid "scalar reconfigure [--all | <enlistment>]"
-msgstr "scalar reconfigure [--all | <Eintragung>]"
-
-#: contrib/scalar/scalar.c:566
-msgid "--all or <enlistment>, but not both"
-msgstr "--all oder <Eintragung>, aber nicht beides"
+msgid "improper chunk offset(s) %<PRIx64> and %<PRIx64>"
+msgstr "unzulässige(r) Chunk-Offset(s) %<PRIx64> und %<PRIx64>"
 
-#: contrib/scalar/scalar.c:581
 #, c-format
-msgid "git repository gone in '%s'"
-msgstr "Git-Repository entfernt in '%s'"
-
-#: contrib/scalar/scalar.c:621
-msgid ""
-"scalar run <task> [<enlistment>]\n"
-"Tasks:\n"
-msgstr ""
-"scalar run <Aufgabe> [<Eintragung>]\n"
-"Aufgaben:\n"
+msgid "duplicate chunk ID %<PRIx32> found"
+msgstr "doppelte Chunk-ID %<PRIx32> gefunden"
 
-#: contrib/scalar/scalar.c:639
 #, c-format
-msgid "no such task: '%s'"
-msgstr "Aufgabe nicht gefunden: '%s'"
-
-#: contrib/scalar/scalar.c:689
-msgid "scalar unregister [<enlistment>]"
-msgstr "scalar unregister [<Eintragung>]"
-
-#: contrib/scalar/scalar.c:736
-msgid "scalar delete <enlistment>"
-msgstr "scalar delete <Eintragung>"
-
-#: contrib/scalar/scalar.c:751
-msgid "refusing to delete current working directory"
-msgstr "Löschen des aktuellen Arbeitsverzeichnisses wurde verweigert"
-
-#: contrib/scalar/scalar.c:766
-msgid "include Git version"
-msgstr "Git-Version einbeziehen"
-
-#: contrib/scalar/scalar.c:768
-msgid "include Git's build options"
-msgstr "Build-Optionen von Git einbeziehen"
-
-#: contrib/scalar/scalar.c:772
-msgid "scalar verbose [-v | --verbose] [--build-options]"
-msgstr "scalar verbose [-v | --verbose] [--build-options]"
+msgid "final chunk has non-zero id %<PRIx32>"
+msgstr "letzter Chunk hat nicht-Null ID %<PRIx32>"
 
-#: contrib/scalar/scalar.c:813
-msgid "-C requires a <directory>"
-msgstr "-C erfordert ein <Verzeichnis>"
+msgid "invalid hash version"
+msgstr "ungültige Hash-Version"
 
-#: contrib/scalar/scalar.c:815
 #, c-format
-msgid "could not change to '%s'"
-msgstr "konnte nicht zu '%s' wechseln"
-
-#: contrib/scalar/scalar.c:821
-msgid "-c requires a <key>=<value> argument"
-msgstr "-c benötigt ein <Schlüssel>=<Wert> Argument"
-
-#: contrib/scalar/scalar.c:839
-msgid ""
-"scalar [-C <directory>] [-c <key>=<value>] <command> [<options>]\n"
-"\n"
-"Commands:\n"
-msgstr ""
-"scalar [-C <Verzeichnis>] [-c <Schlüssel>=<Wert>] <Befehl> [<Optionen>]\n"
-"\n"
-"Befehle:\n"
-
-#: compat/compiler.h:26
-msgid "no compiler information available\n"
-msgstr "keine Compiler-Information verfügbar\n"
-
-#: compat/compiler.h:38
-msgid "no libc information available\n"
-msgstr "keine libc Informationen verfügbar\n"
-
-#: list-objects-filter-options.h:126
-msgid "args"
-msgstr "Argumente"
-
-#: list-objects-filter-options.h:127
-msgid "object filtering"
-msgstr "Filtern nach Objekten"
-
-#: parse-options.h:188
-msgid "expiry-date"
-msgstr "Verfallsdatum"
-
-#: parse-options.h:202
-msgid "no-op (backward compatibility)"
-msgstr "Kein Effekt (Rückwärtskompatibilität)"
-
-#: parse-options.h:341
-msgid "be more verbose"
-msgstr "erweiterte Ausgaben"
-
-#: parse-options.h:343
-msgid "be more quiet"
-msgstr "weniger Ausgaben"
-
-#: parse-options.h:349
-msgid "use <n> digits to display object names"
-msgstr "benutze <Anzahl> Ziffern zur Anzeige von Objektnamen"
-
-#: parse-options.h:368
-msgid "how to strip spaces and #comments from message"
-msgstr ""
-"wie Leerzeichen und #Kommentare von der Beschreibung getrennt werden sollen"
-
-#: parse-options.h:369
-msgid "read pathspec from file"
-msgstr "Pfadspezifikation aus einer Datei lesen"
-
-#: parse-options.h:370
-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:98
-msgid "key"
-msgstr "Schüssel"
-
-#: ref-filter.h:98
-msgid "field name to sort on"
-msgstr "sortiere nach diesem Feld"
-
-#: rerere.h:44
-msgid "update the index with reused conflict resolution if possible"
-msgstr ""
-"Index, wenn möglich, mit wiederverwendeter Konfliktauflösung aktualisieren"
+msgid "invalid color value: %.*s"
+msgstr "Ungültiger Farbwert: %.*s"
 
-#: command-list.h:50
 msgid "Add file contents to the index"
 msgstr "Dateiinhalte zum Commit vormerken"
 
-#: command-list.h:51
 msgid "Apply a series of patches from a mailbox"
 msgstr "eine Serie von Patches von einer Mailbox anwenden"
 
-#: command-list.h:52
 msgid "Annotate file lines with commit information"
 msgstr "Zeilen der Datei mit Commit-Informationen versehen und anzeigen"
 
-#: command-list.h:53
 msgid "Apply a patch to files and/or to the index"
 msgstr "einen Patch auf Dateien und/oder den Index anwenden"
 
-#: command-list.h:54
 msgid "Import a GNU Arch repository into Git"
 msgstr "ein GNU Arch Repository in Git importieren"
 
-#: command-list.h:55
 msgid "Create an archive of files from a named tree"
 msgstr "Dateiarchiv von angegebenem Verzeichnis erstellen"
 
-#: command-list.h:56
 msgid "Use binary search to find the commit that introduced a bug"
 msgstr ""
 "Binärsuche verwenden, um den Commit zu finden, der einen Fehler verursacht "
 "hat"
 
-#: command-list.h:57
 msgid "Show what revision and author last modified each line of a file"
 msgstr ""
 "Anzeigen, durch welchen Commit und Autor die jeweiligen Zeilen\n"
 "einer Datei zuletzt geändert wurden"
 
-#: command-list.h:58
 msgid "List, create, or delete branches"
 msgstr "Branches anzeigen, erstellen oder entfernen"
 
-#: command-list.h:59
 msgid "Collect information for user to file a bug report"
 msgstr ""
 "Informationen für den Benutzer zum Einreichen eines Fehlerberichts sammeln"
 
-#: command-list.h:60
 msgid "Move objects and refs by archive"
 msgstr "Objekte und Referenzen über ein Archiv verteilen"
 
-#: command-list.h:61
 msgid "Provide content or type and size information for repository objects"
 msgstr ""
 "Inhalt oder Informationen zu Typ und Größe für Repository-Objekte "
 "bereitstellen"
 
-#: command-list.h:62
 msgid "Display gitattributes information"
 msgstr "gitattributes Informationen darstellen"
 
-#: command-list.h:63
 msgid "Debug gitignore / exclude files"
 msgstr "Fehlersuche in gitignore / exclude Dateien"
 
-#: command-list.h:64
 msgid "Show canonical names and email addresses of contacts"
 msgstr "Name und E-Mail-Adresse von Kontakten anzeigen"
 
-#: command-list.h:65
 msgid "Ensures that a reference name is well formed"
 msgstr "Sicherstellen, dass ein Referenzname wohlgeformt ist"
 
-#: command-list.h:66
 msgid "Switch branches or restore working tree files"
 msgstr "Branches wechseln oder Dateien im Arbeitsverzeichnis wiederherstellen"
 
-#: command-list.h:67
 msgid "Copy files from the index to the working tree"
 msgstr "Dateien von dem Index ins Arbeitsverzeichnis kopieren"
 
-#: command-list.h:68
 msgid "Find commits yet to be applied to upstream"
 msgstr ""
 "Commits finden, die noch auf dem Upstream-Branch angewendet werden müssen"
 
-#: command-list.h:69
 msgid "Apply the changes introduced by some existing commits"
 msgstr "Änderungen eines existierenden Commits anwenden"
 
-#: command-list.h:70
 msgid "Graphical alternative to git-commit"
 msgstr "grafische Alternative zu git-commit"
 
-#: command-list.h:71
 msgid "Remove untracked files from the working tree"
 msgstr "unversionierte Dateien vom Arbeitsverzeichnis entfernen"
 
-#: command-list.h:72
 msgid "Clone a repository into a new directory"
 msgstr "ein Repository in einem neuen Verzeichnis klonen"
 
-#: command-list.h:73
 msgid "Display data in columns"
 msgstr "Daten in Spalten anzeigen"
 
-#: command-list.h:74
 msgid "Record changes to the repository"
 msgstr "Änderungen in das Repository eintragen"
 
-#: command-list.h:75
 msgid "Write and verify Git commit-graph files"
 msgstr "Git Commit-Graph-Dateien schreiben und überprüfen"
 
-#: command-list.h:76
 msgid "Create a new commit object"
 msgstr "ein neues Commit-Objekt erstellen"
 
-#: command-list.h:77
 msgid "Get and set repository or global options"
 msgstr "repositoryweite oder globale Optionen lesen oder setzen"
 
-#: command-list.h:78
 msgid "Count unpacked number of objects and their disk consumption"
 msgstr "Anzahl und Speicherverbrauch ungepackter Objekte zählen"
 
-#: command-list.h:79
 msgid "Retrieve and store user credentials"
 msgstr "Zugangsdaten des Benutzers empfangen und speichern"
 
-#: command-list.h:80
 msgid "Helper to temporarily store passwords in memory"
 msgstr ""
 "Hilfsprogramm zum temporären Speichern von Zugangsdaten im Hauptspeicher"
 
-#: command-list.h:81
 msgid "Helper to store credentials on disk"
 msgstr "Hilfsprogramm zum Speichern von Zugangsdaten auf der Festplatte"
 
-#: command-list.h:82
 msgid "Export a single commit to a CVS checkout"
 msgstr "einzelnen Commit zu einem ausgecheckten CSV-Repository exportieren"
 
-#: command-list.h:83
 msgid "Salvage your data out of another SCM people love to hate"
 msgstr "Ihre Daten aus einem anderen SCM übernehmen"
 
-#: command-list.h:84
 msgid "A CVS server emulator for Git"
 msgstr "ein CSV Server Emulator für Git"
 
-#: command-list.h:85
 msgid "A really simple server for Git repositories"
 msgstr "ein wirklich einfacher Server für Git Repositories"
 
-#: command-list.h:86
 msgid "Give an object a human readable name based on an available ref"
 msgstr ""
 "einem Objekt einen für Menschen lesbaren Namen basierend auf\n"
 "einer verfügbaren Referenz geben"
 
-#: command-list.h:87
 msgid "Show changes between commits, commit and working tree, etc"
 msgstr ""
 "Änderungen zwischen Commits, Commit und Arbeitsverzeichnis, etc. anzeigen"
 
-#: command-list.h:88
 msgid "Compares files in the working tree and the index"
 msgstr "Dateien von dem Arbeitsverzeichnis und dem Index vergleichen"
 
-#: command-list.h:89
 msgid "Compare a tree to the working tree or index"
 msgstr "ein Verzeichnis von dem Arbeitsverzeichnis und dem Index vergleichen"
 
-#: command-list.h:90
 msgid "Compares the content and mode of blobs found via two tree objects"
 msgstr ""
 "den Inhalt und Modus von Blobs aus zwei Verzeichnisobjekten vergleichen"
 
-#: command-list.h:91
 msgid "Show changes using common diff tools"
 msgstr "Änderungen mittels den allgemeinen Diff-Tools anzeigen"
 
-#: command-list.h:92
 msgid "Git data exporter"
 msgstr "Export Tool für Git Daten"
 
-#: command-list.h:93
 msgid "Backend for fast Git data importers"
 msgstr "Backend für schnelle Git Daten Import Tools"
 
-#: command-list.h:94
 msgid "Download objects and refs from another repository"
 msgstr "Objekte und Referenzen von einem anderen Repository herunterladen"
 
-#: command-list.h:95
 msgid "Receive missing objects from another repository"
 msgstr "fehlende Objekte von einem anderen Repository empfangen"
 
-#: command-list.h:96
 msgid "Rewrite branches"
 msgstr "Branches umschreiben"
 
-#: command-list.h:97
 msgid "Produce a merge commit message"
 msgstr "Beschreibung eines Merge-Commits erzeugen"
 
-#: command-list.h:98
 msgid "Output information on each ref"
 msgstr "Informationen für jede Referenz ausgeben"
 
-#: command-list.h:99
 msgid "Run a Git command on a list of repositories"
 msgstr "Einen Git-Befehl für mehrere Repositories ausführen"
 
-#: command-list.h:100
 msgid "Prepare patches for e-mail submission"
 msgstr "Patches für E-Mail-Versand vorbereiten"
 
-#: command-list.h:101
 msgid "Verifies the connectivity and validity of the objects in the database"
 msgstr ""
 "stellt die Verbundenheit und Gültigkeit der Objekte in der Datenbank sicher"
 
-#: command-list.h:102
 msgid "Cleanup unnecessary files and optimize the local repository"
 msgstr "nicht benötigte Dateien entfernen und das lokale Repository optimieren"
 
-#: command-list.h:103
 msgid "Extract commit ID from an archive created using git-archive"
 msgstr ""
 "Commit-ID eines Archivs extrahieren, welches mit git-archive erstellt wurde"
 
-#: command-list.h:104
 msgid "Print lines matching a pattern"
 msgstr "Zeilen darstellen, die einem Muster entsprechen"
 
-#: command-list.h:105
 msgid "A portable graphical interface to Git"
 msgstr "eine portable grafische Schnittstelle zu Git"
 
-#: command-list.h:106
 msgid "Compute object ID and optionally creates a blob from a file"
 msgstr ""
 "von einer Datei die Objekt-ID berechnen und optional ein Blob erstellen"
 
-#: command-list.h:107
 msgid "Display help information about Git"
 msgstr "Hilfsinformationen über Git anzeigen"
 
-#: command-list.h:108
 msgid "Run git hooks"
 msgstr "Git-Hooks ausführen"
 
-#: command-list.h:109
 msgid "Server side implementation of Git over HTTP"
 msgstr "serverseitige Implementierung von Git über HTTP"
 
-#: command-list.h:110
 msgid "Download from a remote Git repository via HTTP"
 msgstr "von einem Remote-Git-Repository über HTTP herunterladen"
 
-#: command-list.h:111
 msgid "Push objects over HTTP/DAV to another repository"
 msgstr "Objekte über HTTP/DAV zu einem anderen Repository übertragen"
 
-#: command-list.h:112
 msgid "Send a collection of patches from stdin to an IMAP folder"
 msgstr ""
 "eine Sammlung von Patches von der Standard-Eingabe zu einem IMAP-Ordner "
 "senden"
 
-#: command-list.h:113
 msgid "Build pack index file for an existing packed archive"
 msgstr "Pack-Index-Datei für ein existierendes gepacktes Archiv erzeugen"
 
-#: command-list.h:114
 msgid "Create an empty Git repository or reinitialize an existing one"
 msgstr ""
 "ein leeres Git-Repository erstellen oder ein bestehendes neuinitialisieren"
 
-#: command-list.h:115
 msgid "Instantly browse your working repository in gitweb"
 msgstr "Ihr aktuelles Repository sofort in gitweb betrachten"
 
-#: command-list.h:116
 msgid "Add or parse structured information in commit messages"
 msgstr ""
 "Strukturierte Informationen in Commit-Beschreibungen hinzufügen oder parsen"
 
-#: command-list.h:117
 msgid "Show commit logs"
 msgstr "Commit-Historie anzeigen"
 
-#: command-list.h:118
 msgid "Show information about files in the index and the working tree"
 msgstr ""
 "Informationen über Dateien in dem Index und im Arbeitsverzeichnis anzeigen"
 
-#: command-list.h:119
 msgid "List references in a remote repository"
 msgstr "Referenzen in einem Remote-Repository auflisten"
 
-#: command-list.h:120
 msgid "List the contents of a tree object"
 msgstr "Inhalte eines Tree-Objektes auflisten"
 
-#: command-list.h:121
 msgid "Extracts patch and authorship from a single e-mail message"
 msgstr ""
 "Patch und Urheberschaft von einer einzelnen E-Mail-Nachricht extrahieren"
 
-#: command-list.h:122
 msgid "Simple UNIX mbox splitter program"
 msgstr "einfaches UNIX mbox Splitter-Programm"
 
-#: command-list.h:123
 msgid "Run tasks to optimize Git repository data"
 msgstr "Aufgaben ausführen, um Git-Repository-Daten zu optimieren"
 
-#: command-list.h:124
 msgid "Join two or more development histories together"
 msgstr "zwei oder mehr Entwicklungszweige zusammenführen"
 
-#: command-list.h:125
 msgid "Find as good common ancestors as possible for a merge"
 msgstr "möglichst besten gemeinsamen Vorgänger-Commit für einen Merge finden"
 
-#: command-list.h:126
 msgid "Run a three-way file merge"
 msgstr "einen 3-Wege-Datei-Merge ausführen"
 
-#: command-list.h:127
 msgid "Run a merge for files needing merging"
 msgstr "einen Merge für zusammenzuführende Dateien ausführen"
 
-#: command-list.h:128
 msgid "The standard helper program to use with git-merge-index"
 msgstr "das Standard-Hilfsprogramm für die Verwendung mit git-merge-index"
 
-#: command-list.h:129
 msgid "Show three-way merge without touching index"
 msgstr "3-Wege-Merge anzeigen ohne den Index zu verändern"
 
-#: command-list.h:130
 msgid "Run merge conflict resolution tools to resolve merge conflicts"
 msgstr ""
 "Ausführen von Tools zur Auflösung von Merge-Konflikten zur Behebung dieser"
 
-#: command-list.h:131
 msgid "Creates a tag object with extra validation"
 msgstr "Erstellt ein Tag-Objekt mit zusätzlicher Validierung"
 
-#: command-list.h:132
 msgid "Build a tree-object from ls-tree formatted text"
 msgstr "Tree-Objekt aus ls-tree formattiertem Text erzeugen"
 
-#: command-list.h:133
 msgid "Write and verify multi-pack-indexes"
 msgstr "Multi-Pack-Indexe schreiben und überprüfen"
 
-#: command-list.h:134
 msgid "Move or rename a file, a directory, or a symlink"
 msgstr ""
 "eine Datei, ein Verzeichnis, oder eine symbolische Verknüpfung verschieben "
 "oder umbenennen"
 
-#: command-list.h:135
 msgid "Find symbolic names for given revs"
 msgstr "symbolische Namen für die gegebenen Commits finden"
 
-#: command-list.h:136
 msgid "Add or inspect object notes"
 msgstr "Objekt-Notizen hinzufügen oder überprüfen"
 
-#: command-list.h:137
 msgid "Import from and submit to Perforce repositories"
 msgstr "von Perforce Repositories importieren und nach diese senden"
 
-#: command-list.h:138
 msgid "Create a packed archive of objects"
 msgstr "ein gepacktes Archiv von Objekten erstellen"
 
-#: command-list.h:139
 msgid "Find redundant pack files"
 msgstr "redundante Paketdateien finden"
 
-#: command-list.h:140
 msgid "Pack heads and tags for efficient repository access"
 msgstr "Branches und Tags für effizienten Zugriff auf das Repository packen"
 
-#: command-list.h:141
 msgid "Compute unique ID for a patch"
 msgstr "eindeutige ID für einen Patch berechnen"
 
-#: command-list.h:142
 msgid "Prune all unreachable objects from the object database"
 msgstr "alle nicht erreichbaren Objekte von der Objektdatenbank entfernen"
 
-#: command-list.h:143
 msgid "Remove extra objects that are already in pack files"
 msgstr ""
 "zusätzliche Objekte, die sich bereits in Paketdateien befinden, entfernen"
 
-#: command-list.h:144
 msgid "Fetch from and integrate with another repository or a local branch"
 msgstr ""
 "Objekte von einem externen Repository anfordern und sie mit einem anderen "
 "Repository oder einem lokalen Branch zusammenführen"
 
-#: command-list.h:145
 msgid "Update remote refs along with associated objects"
 msgstr "Remote-Referenzen mitsamt den verbundenen Objekten aktualisieren"
 
-#: command-list.h:146
 msgid "Applies a quilt patchset onto the current branch"
 msgstr "Patches aus quilt auf aktuellen Branch anwenden"
 
-#: command-list.h:147
 msgid "Compare two commit ranges (e.g. two versions of a branch)"
 msgstr "zwei Commit-Bereiche vergleichen (zwei Versionen eines Branches)"
 
-#: command-list.h:148
 msgid "Reads tree information into the index"
 msgstr "Verzeichnisinformationen in den Index einlesen"
 
-#: command-list.h:149
 msgid "Reapply commits on top of another base tip"
 msgstr "Wiederholtes Anwenden von Commits auf anderem Basis-Commit"
 
-#: command-list.h:150
 msgid "Receive what is pushed into the repository"
 msgstr "Empfangen was in das Repository übertragen wurde"
 
-#: command-list.h:151
 msgid "Manage reflog information"
 msgstr "Reflog Informationen verwalten"
 
-#: command-list.h:152
 msgid "Manage set of tracked repositories"
 msgstr "Menge von hinterlegten Repositories verwalten"
 
-#: command-list.h:153
 msgid "Pack unpacked objects in a repository"
 msgstr "ungepackte Objekte in einem Repository packen"
 
-#: command-list.h:154
 msgid "Create, list, delete refs to replace objects"
 msgstr "Referenzen für ersetzende Objekte erstellen, auflisten, löschen"
 
-#: command-list.h:155
 msgid "Generates a summary of pending changes"
 msgstr "eine Übersicht über ausstehende Änderungen generieren"
 
-#: command-list.h:156
 msgid "Reuse recorded resolution of conflicted merges"
 msgstr "aufgezeichnete Auflösung von Merge-Konflikten wiederverwenden"
 
-#: command-list.h:157
 msgid "Reset current HEAD to the specified state"
 msgstr "aktuellen HEAD zu einem spezifizierten Zustand setzen"
 
-#: command-list.h:158
 msgid "Restore working tree files"
 msgstr "Dateien im Arbeitsverzeichnis wiederherstellen"
 
-#: command-list.h:159
 msgid "Lists commit objects in reverse chronological order"
 msgstr "Commit-Objekte in umgekehrter chronologischer Ordnung auflisten"
 
-#: command-list.h:160
 msgid "Pick out and massage parameters"
 msgstr "Parameter herauspicken und ändern"
 
-#: command-list.h:161
 msgid "Revert some existing commits"
 msgstr "einige bestehende Commits rückgängig machen"
 
-#: command-list.h:162
 msgid "Remove files from the working tree and from the index"
 msgstr "Dateien im Arbeitsverzeichnis und vom Index löschen"
 
-#: command-list.h:163
 msgid "Send a collection of patches as emails"
 msgstr "eine Sammlung von Patches als E-Mails versenden"
 
-#: command-list.h:164
 msgid "Push objects over Git protocol to another repository"
 msgstr "Objekte über das Git Protokoll zu einem anderen Repository übertragen"
 
-#: command-list.h:165
 msgid "Git's i18n setup code for shell scripts"
 msgstr "Gits i18n-Konfigurationscode für Shell-Skripte"
 
-#: command-list.h:166
 msgid "Common Git shell script setup code"
 msgstr "allgemeiner Git Shell-Skript Konfigurationscode"
 
-#: command-list.h:167
 msgid "Restricted login shell for Git-only SSH access"
 msgstr "Login-Shell beschränkt für Nur-Git SSH-Zugriff"
 
-#: command-list.h:168
 msgid "Summarize 'git log' output"
 msgstr "Ausgabe von 'git log' zusammenfassen"
 
-#: command-list.h:169
 msgid "Show various types of objects"
 msgstr "verschiedene Arten von Objekten anzeigen"
 
-#: command-list.h:170
 msgid "Show branches and their commits"
 msgstr "Branches und ihre Commits ausgeben"
 
-#: command-list.h:171
 msgid "Show packed archive index"
 msgstr "gepackten Archiv-Index anzeigen"
 
-#: command-list.h:172
 msgid "List references in a local repository"
 msgstr "Referenzen in einem lokales Repository auflisten"
 
-#: command-list.h:173
 msgid "Reduce your working tree to a subset of tracked files"
 msgstr ""
 "Reduzieren Sie Ihr Arbeitsverzeichnis auf eine Teilmenge der versionierten "
 "Dateien"
 
-#: command-list.h:174
 msgid "Add file contents to the staging area"
 msgstr "Dateiinhalte der Staging-Area hinzufügen"
 
-#: command-list.h:175
 msgid "Stash the changes in a dirty working directory away"
 msgstr "Änderungen in einem Arbeitsverzeichnis aufbewahren"
 
-#: command-list.h:176
 msgid "Show the working tree status"
 msgstr "den Zustand des Arbeitsverzeichnisses anzeigen"
 
-#: command-list.h:177
 msgid "Remove unnecessary whitespace"
 msgstr "nicht erforderlichen Whitespace entfernen"
 
-#: command-list.h:178
 msgid "Initialize, update or inspect submodules"
 msgstr "Submodule initialisieren, aktualisieren oder inspizieren"
 
-#: command-list.h:179
 msgid "Bidirectional operation between a Subversion repository and Git"
 msgstr ""
 "Bidirektionale Operationen zwischen einem Subversion Repository und Git"
 
-#: command-list.h:180
 msgid "Switch branches"
 msgstr "Branches wechseln"
 
-#: command-list.h:181
 msgid "Read, modify and delete symbolic refs"
 msgstr "symbolische Referenzen lesen, ändern und löschen"
 
-#: command-list.h:182
 msgid "Create, list, delete or verify a tag object signed with GPG"
 msgstr ""
 "ein mit GPG signiertes Tag-Objekt erzeugen, auflisten, löschen oder "
 "verifizieren."
 
-#: command-list.h:183
 msgid "Creates a temporary file with a blob's contents"
 msgstr "eine temporäre Datei mit den Inhalten eines Blobs erstellen"
 
-#: command-list.h:184
 msgid "Unpack objects from a packed archive"
 msgstr "Objekte von einem gepackten Archiv entpacken"
 
-#: command-list.h:185
 msgid "Register file contents in the working tree to the index"
 msgstr "Dateiinhalte aus dem Arbeitsverzeichnis im Index registrieren"
 
-#: command-list.h:186
 msgid "Update the object name stored in a ref safely"
 msgstr ""
 "den Objektnamen, der in einer Referenz gespeichert ist, sicher aktualisieren"
 
-#: command-list.h:187
 msgid "Update auxiliary info file to help dumb servers"
 msgstr "Hilfsinformationsdatei zur Hilfe von einfachen Servern aktualisieren"
 
-#: command-list.h:188
 msgid "Send archive back to git-archive"
 msgstr "Archiv zurück zu git-archive senden"
 
-#: command-list.h:189
 msgid "Send objects packed back to git-fetch-pack"
 msgstr "Objekte gepackt zurück an git-fetch-pack senden"
 
-#: command-list.h:190
 msgid "Show a Git logical variable"
 msgstr "eine logische Variable von Git anzeigen"
 
-#: command-list.h:191
 msgid "Check the GPG signature of commits"
 msgstr "die GPG-Signatur von Commits prüfen"
 
-#: command-list.h:192
 msgid "Validate packed Git archive files"
 msgstr "gepackte Git-Archivdateien validieren"
 
-#: command-list.h:193
 msgid "Check the GPG signature of tags"
 msgstr "die GPG-Signatur von Tags prüfen"
 
-#: command-list.h:194
 msgid "Show logs with difference each commit introduces"
 msgstr "Logs mit dem Unterschied, den jeder Commit einführt, anzeigen"
 
-#: command-list.h:195
 msgid "Manage multiple working trees"
 msgstr "mehrere Arbeitsverzeichnisse verwalten"
 
-#: command-list.h:196
 msgid "Create a tree object from the current index"
 msgstr "Tree-Objekt vom aktuellen Index erstellen"
 
-#: command-list.h:197
 msgid "Defining attributes per path"
 msgstr "Definition von Attributen pro Pfad"
 
-#: command-list.h:198
 msgid "Git command-line interface and conventions"
 msgstr "Git Kommandozeilenschnittstelle und Konventionen"
 
-#: command-list.h:199
 msgid "A Git core tutorial for developers"
 msgstr "eine Git Anleitung für Entwickler"
 
-#: command-list.h:200
 msgid "Providing usernames and passwords to Git"
 msgstr "Bereitstellung von Benutzernamen und Passwörtern für Git"
 
-#: command-list.h:201
 msgid "Git for CVS users"
 msgstr "Git für CVS Benutzer"
 
-#: command-list.h:202
 msgid "Tweaking diff output"
 msgstr "Diff-Ausgabe optimieren"
 
-#: command-list.h:203
 msgid "A useful minimum set of commands for Everyday Git"
 msgstr ""
 "ein kleine, nützliche Menge von Befehlen für die tägliche Verwendung von Git"
 
-#: command-list.h:204
 msgid "Frequently asked questions about using Git"
 msgstr "Häufig gestellte Fragen über die Nutzung von Git"
 
-#: command-list.h:205
 msgid "A Git Glossary"
 msgstr "ein Git-Glossar"
 
-#: command-list.h:206
 msgid "Hooks used by Git"
 msgstr "von Git verwendete Hooks"
 
-#: command-list.h:207
 msgid "Specifies intentionally untracked files to ignore"
 msgstr "Spezifikation von bewusst ignorierten, unversionierten Dateien"
 
-#: command-list.h:208
 msgid "The Git repository browser"
 msgstr "der Git-Repository-Browser"
 
-#: command-list.h:209
 msgid "Map author/committer names and/or E-Mail addresses"
 msgstr "Autor/Commit-Ersteller und/oder E-Mail-Adressen zuordnen"
 
-#: command-list.h:210
 msgid "Defining submodule properties"
 msgstr "Definition von Submodul-Eigenschaften"
 
-#: command-list.h:211
 msgid "Git namespaces"
 msgstr "Git Namensbereiche"
 
-#: command-list.h:212
 msgid "Helper programs to interact with remote repositories"
 msgstr "Hilfsprogramme zur Interaktion mit Remote-Repositories"
 
-#: command-list.h:213
 msgid "Git Repository Layout"
 msgstr "Git Repository Aufbau"
 
-#: command-list.h:214
 msgid "Specifying revisions and ranges for Git"
 msgstr "Spezifikation von Commits und Bereichen für Git"
 
-#: command-list.h:215
 msgid "Mounting one repository inside another"
 msgstr "Einbinden eines Repositories in ein anderes"
 
-#: command-list.h:216
 msgid "A tutorial introduction to Git"
 msgstr "eine einführende Anleitung zu Git"
 
-#: command-list.h:217
 msgid "A tutorial introduction to Git: part two"
 msgstr "eine einführende Anleitung zu Git: Teil zwei"
 
-#: command-list.h:218
 msgid "Git web interface (web frontend to Git repositories)"
 msgstr "Git Web Interface (Web-Frontend für Git-Repositories)"
 
-#: command-list.h:219
 msgid "An overview of recommended workflows with Git"
 msgstr "Eine Übersicht über empfohlene Arbeitsabläufe mit Git"
 
-#: git-merge-octopus.sh:46
+msgid "commit-graph file is too small"
+msgstr "Commit-Graph-Datei ist zu klein"
+
+#, c-format
+msgid "commit-graph signature %X does not match signature %X"
+msgstr "Commit-Graph-Signatur %X stimmt nicht mit Signatur %X überein"
+
+#, c-format
+msgid "commit-graph version %X does not match version %X"
+msgstr "Commit-Graph-Version %X stimmt nicht mit Version %X überein"
+
+#, c-format
+msgid "commit-graph hash version %X does not match version %X"
+msgstr "Hash-Version des Commit-Graph %X stimmt nicht mit Version %X überein"
+
+#, c-format
+msgid "commit-graph file is too small to hold %u chunks"
+msgstr "Commit-Graph-Datei ist zu klein, um %u Chunks zu enthalten"
+
+msgid "commit-graph has no base graphs chunk"
+msgstr "Commit-Graph hat keinen Basis-Graph-Chunk"
+
+msgid "commit-graph chain does not match"
+msgstr "Commit-Graph Verkettung stimmt nicht überein"
+
+#, c-format
+msgid "invalid commit-graph chain: line '%s' not a hash"
+msgstr "Ungültige Commit-Graph Verkettung: Zeile '%s' ist kein Hash"
+
+msgid "unable to find all commit-graph files"
+msgstr "konnte nicht alle Commit-Graph-Dateien finden"
+
+msgid "invalid commit position. commit-graph is likely corrupt"
+msgstr "ungültige Commit-Position. Commit-Graph ist wahrscheinlich beschädigt"
+
+#, c-format
+msgid "could not find commit %s"
+msgstr "konnte Commit %s nicht finden"
+
+msgid "commit-graph requires overflow generation data but has none"
+msgstr "Commit-Graph erfordert Überlaufgenerierungsdaten, aber hat keine"
+
+msgid "Loading known commits in commit graph"
+msgstr "Lade bekannte Commits in Commit-Graph"
+
+msgid "Expanding reachable commits in commit graph"
+msgstr "Erweitere erreichbare Commits in Commit-Graph"
+
+msgid "Clearing commit marks in commit graph"
+msgstr "Lösche Commit-Markierungen in Commit-Graph"
+
+msgid "Computing commit graph topological levels"
+msgstr "Topologische Ebenen des Commit-Graph werden berechnet"
+
+msgid "Computing commit graph generation numbers"
+msgstr "Commit-Graph Generationsnummern berechnen"
+
+msgid "Computing commit changed paths Bloom filters"
+msgstr "Berechnung der Bloom-Filter für veränderte Pfade des Commits"
+
+msgid "Collecting referenced commits"
+msgstr "Sammle referenzierte Commits"
+
+#, c-format
+msgid "Finding commits for commit graph in %<PRIuMAX> pack"
+msgid_plural "Finding commits for commit graph in %<PRIuMAX> packs"
+msgstr[0] "Suche Commits für Commit-Graph in %<PRIuMAX> Paket"
+msgstr[1] "Suche Commits für Commit-Graph in %<PRIuMAX> Paketen"
+
+#, c-format
+msgid "error adding pack %s"
+msgstr "Fehler beim Hinzufügen von Paket %s"
+
+#, c-format
+msgid "error opening index for %s"
+msgstr "Fehler beim Öffnen des Index für %s"
+
+msgid "Finding commits for commit graph among packed objects"
+msgstr "Suche Commits für Commit-Graph in gepackten Objekten"
+
+msgid "Finding extra edges in commit graph"
+msgstr "Suche zusätzliche Ränder in Commit-Graph"
+
+msgid "failed to write correct number of base graph ids"
+msgstr "Fehler beim Schreiben der korrekten Anzahl von Basis-Graph-IDs"
+
+msgid "unable to create temporary graph layer"
+msgstr "konnte temporäre Graphen-Schicht nicht erstellen"
+
+#, c-format
+msgid "unable to adjust shared permissions for '%s'"
+msgstr "konnte geteilte Zugriffsberechtigungen für '%s' nicht ändern"
+
+#, 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"
+
+msgid "unable to open commit-graph chain file"
+msgstr "konnte Commit-Graph Chain-Datei nicht öffnen"
+
+msgid "failed to rename base commit-graph file"
+msgstr "konnte Basis-Commit-Graph-Datei nicht umbenennen"
+
+msgid "failed to rename temporary commit-graph file"
+msgstr "konnte temporäre Commit-Graph-Datei nicht umbenennen"
+
+msgid "Scanning merged commits"
+msgstr "Durchsuche zusammengeführte Commits"
+
+msgid "Merging commit-graph"
+msgstr "Zusammenführen von Commit-Graph"
+
+msgid "attempting to write a commit-graph, but 'core.commitGraph' is disabled"
+msgstr ""
+"versuche einen Commit-Graph zu schreiben, aber 'core.commitGraph' ist "
+"deaktiviert"
+
+msgid "too many commits to write graph"
+msgstr "zu viele Commits zum Schreiben des Graphen"
+
+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"
+
+#, c-format
+msgid "commit-graph has incorrect OID order: %s then %s"
+msgstr "Commit-Graph hat fehlerhafte OID-Reihenfolge: %s dann %s"
+
+#, c-format
+msgid "commit-graph has incorrect fanout value: fanout[%d] = %u != %u"
+msgstr "Commit-Graph hat fehlerhaften Fanout-Wert: fanout[%d] = %u != %u"
+
+#, c-format
+msgid "failed to parse commit %s from commit-graph"
+msgstr "konnte Commit %s von Commit-Graph nicht parsen"
+
+msgid "Verifying commits in commit graph"
+msgstr "Commit in Commit-Graph überprüfen"
+
+#, 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"
+
+#, 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"
+
+#, 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"
+
+#, c-format
+msgid "commit-graph parent for %s is %s != %s"
+msgstr "Commit-Graph-Vorgänger für %s ist %s != %s"
+
+#, 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"
+
+#, c-format
+msgid ""
+"commit-graph has generation number zero for commit %s, but non-zero elsewhere"
+msgstr ""
+"Commit-Graph hat Generationsnummer null für Commit %s, aber sonst ungleich "
+"null"
+
+#, c-format
+msgid ""
+"commit-graph has non-zero generation number for commit %s, but zero elsewhere"
+msgstr ""
+"Commit-Graph hat Generationsnummer ungleich null für Commit %s, aber sonst "
+"null"
+
+#, c-format
+msgid "commit-graph generation for commit %s is %<PRIuMAX> < %<PRIuMAX>"
+msgstr "Commit-Graph Erstellung für Commit %s ist %<PRIuMAX> < %<PRIuMAX>"
+
+#, 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>"
+
+#, c-format
+msgid "%s %s is not a commit!"
+msgstr "%s %s ist kein Commit!"
+
+msgid ""
+"Support for <GIT_DIR>/info/grafts is deprecated\n"
+"and will be removed in a future Git version.\n"
+"\n"
+"Please use \"git replace --convert-graft-file\"\n"
+"to convert the grafts into replace refs.\n"
+"\n"
+"Turn this message off by running\n"
+"\"git config advice.graftFileDeprecated false\""
+msgstr ""
+"Die Unterstützung für <GIT_DIR>/info/grafts ist veraltet\n"
+"und wird in zukünftigen Git Versionen entfernt.\n"
+"\n"
+"Bitte benutzen Sie \"git replace --convert-graft-file\"\n"
+"zum Konvertieren der künstlichen Vorgänger (\"grafts\")\n"
+"in ersetzende Referenzen.<\n"
+"\n"
+"Sie können diese Meldung unterdrücken, indem Sie\n"
+"\"git config advice.graftFileDeprecated false\" ausführen."
+
+#, 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."
+
+#, 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."
+
+#, c-format
+msgid "Commit %s does not have a GPG signature."
+msgstr "Commit %s hat keine GPG-Signatur."
+
+#, 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"
+
+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"
+"variable i18n.commitEncoding to the encoding your project uses.\n"
+msgstr ""
+"Warnung: Die Commit-Beschreibung ist nicht UTF-8 konform.\n"
+"Sie können das nachbessern, nachdem Sie die Beschreibung korrigiert haben,\n"
+"oder Sie setzen die Konfigurationsvariable i18n.commitEncoding auf das "
+"Encoding,\n"
+"welches von ihrem Projekt verwendet wird.\n"
+
+msgid "no compiler information available\n"
+msgstr "keine Compiler-Information verfügbar\n"
+
+msgid "no libc information available\n"
+msgstr "keine libc Informationen verfügbar\n"
+
+#, c-format
+msgid "[GLE %ld] health thread could not open '%ls'"
+msgstr "[GLE %ld] health Thread konnte '%ls' nicht öffnen"
+
+#, c-format
+msgid "[GLE %ld] health thread getting BHFI for '%ls'"
+msgstr "[GLE %ld] health Thread bekommt BHFI für '%ls'"
+
+#, c-format
+msgid "could not convert to wide characters: '%s'"
+msgstr "konnte nicht zum Breitzeichensatz konvertieren: '%s'"
+
+#, c-format
+msgid "BHFI changed '%ls'"
+msgstr "BHFI veränderte '%ls'"
+
+#, c-format
+msgid "unhandled case in 'has_worktree_moved': %d"
+msgstr "unbehandelter Fall in 'has_worktree_moved': %d"
+
+#, c-format
+msgid "health thread wait failed [GLE %ld]"
+msgstr "Warten des health Thread fehlgeschlagen [GLE %ld]"
+
+msgid "Unable to create FSEventStream."
+msgstr "Konnte FSEventStream nicht erstellen."
+
+msgid "Failed to start the FSEventStream"
+msgstr "Konnte FSEventStream nicht starten."
+
+#, c-format
+msgid "[GLE %ld] could not convert path to UTF-8: '%.*ls'"
+msgstr "[GLE %ld] konnte Pfad nicht zu UTF-8 konvertieren: '%.*ls'"
+
+#, c-format
+msgid "[GLE %ld] could not watch '%s'"
+msgstr "[GLE %ld] konnte '%s' nicht beobachten"
+
+#, c-format
+msgid "[GLE %ld] could not get longname of '%s'"
+msgstr "[GLE %ld] konnte Langnamen für '%s' nicht bekommen"
+
+#, c-format
+msgid "ReadDirectoryChangedW failed on '%s' [GLE %ld]"
+msgstr "ReadDirectoryChangedW fehlgeschlagen auf '%s' [GLE %ld]"
+
+#, c-format
+msgid "GetOverlappedResult failed on '%s' [GLE %ld]"
+msgstr "GetOverlappedResult fehlgeschlagen auf '%s' [GLE %ld]"
+
+#, c-format
+msgid "could not read directory changes [GLE %ld]"
+msgstr "konnte Verzeichnisveränderungen nicht lesen [GLE %ld]"
+
+#, c-format
+msgid "failed to copy SID (%ld)"
+msgstr "Fehler beim Kopieren von SID (%ld)"
+
+#, c-format
+msgid "failed to get owner for '%s' (%ld)"
+msgstr "konnte Eigentümer für '%s' nicht ermitteln (%ld)"
+
+msgid "memory exhausted"
+msgstr "Speicher verbraucht"
+
+msgid "Success"
+msgstr "Erfolg"
+
+msgid "No match"
+msgstr "Keine Übereinstimmung"
+
+msgid "Invalid regular expression"
+msgstr "Ungültiger regulärer Ausdruck"
+
+msgid "Invalid collation character"
+msgstr "Ungültiges Kollationszeichen"
+
+msgid "Invalid character class name"
+msgstr "Ungültiger Zeichenklassenname"
+
+msgid "Trailing backslash"
+msgstr "Angehängter Backslash"
+
+msgid "Invalid back reference"
+msgstr "Ungültiger Rückverweis"
+
+msgid "Unmatched [ or [^"
+msgstr "Kein Gegenstück für [ oder [^ gefunden"
+
+msgid "Unmatched ( or \\("
+msgstr "Kein Gegenstück für ( oder \\( gefunden"
+
+msgid "Unmatched \\{"
+msgstr "Kein Gegenstück für \\{ gefunden"
+
+msgid "Invalid content of \\{\\}"
+msgstr "Ungültiger Inhalt von \\{\\}"
+
+msgid "Invalid range end"
+msgstr "Ungültiges Bereichsende"
+
+msgid "Memory exhausted"
+msgstr "Speicher aufgebraucht"
+
+msgid "Invalid preceding regular expression"
+msgstr "Ungültiger vorausgehender regulärer Ausdruck"
+
+msgid "Premature end of regular expression"
+msgstr "Unerwartetes Ende des regulären Ausdrucks"
+
+msgid "Regular expression too big"
+msgstr "Regulärer Ausdruck zu groß"
+
+msgid "Unmatched ) or \\)"
+msgstr "Kein Gegenstück für ) oder \\) gefunden"
+
+msgid "No previous regular expression"
+msgstr "Kein vorheriger regulärer Ausdruck"
+
+msgid "could not send IPC command"
+msgstr "konnte IPC-Befehl nicht senden"
+
+msgid "could not read IPC response"
+msgstr "konnte IPC-Antwort nicht lesen"
+
+#, c-format
+msgid "could not start accept_thread '%s'"
+msgstr "konnte accept_thread nicht für '%s' starten"
+
+#, c-format
+msgid "could not start worker[0] for '%s'"
+msgstr "konnte worker[0] nicht für '%s' starten"
+
+#, c-format
+msgid "ConnectNamedPipe failed for '%s' (%lu)"
+msgstr "ConnectNamedPipe fehlgeschlagen für '%s' (%lu)"
+
+#, c-format
+msgid "could not create fd from pipe for '%s'"
+msgstr "konnte keinen Dateideskriptor von Pipe für '%s' erstellen"
+
+#, c-format
+msgid "could not start thread[0] for '%s'"
+msgstr "konnte thread[0] nicht für '%s' starten"
+
+#, c-format
+msgid "wait for hEvent failed for '%s'"
+msgstr "Warten auf hEvent für '%s' fehlgeschlagen"
+
+msgid "cannot resume in the background, please use 'fg' to resume"
+msgstr ""
+"kann nicht im Hintergrund fortgesetzt werden, bitte verwenden Sie 'fg', um "
+"fortzufahren"
+
+msgid "cannot restore terminal settings"
+msgstr "kann Terminaleinstellungen nicht wiederherstellen"
+
+#, c-format
+msgid ""
+"exceeded maximum include depth (%d) while including\n"
+"\t%s\n"
+"from\n"
+"\t%s\n"
+"This might be due to circular includes."
+msgstr ""
+"Maximale Include-Tiefe (%d) beim Einbinden von\n"
+"\t%s\n"
+"von\n"
+"\t%s\n"
+"überschritten.\n"
+"Das könnte durch zirkulare Includes entstanden sein."
+
+#, c-format
+msgid "could not expand include path '%s'"
+msgstr "Konnte Include-Pfad '%s' nicht erweitern."
+
+msgid "relative config includes must come from files"
+msgstr "relative Includes von Konfigurationen müssen aus Dateien kommen"
+
+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"
+
+msgid ""
+"remote URLs cannot be configured in file directly or indirectly included by "
+"includeIf.hasconfig:remote.*.url"
+msgstr ""
+"Remote-URLs können nicht in der Datei direkt oder indirekt einbezogen durch "
+"includeIf.hasconfig:remote.*.url konfiguriert werden"
+
+#, c-format
+msgid "invalid config format: %s"
+msgstr "ungültiges Konfigurationsformat: %s"
+
+#, c-format
+msgid "missing environment variable name for configuration '%.*s'"
+msgstr "fehlender Name der Umgebungsvariable für Konfiguration '%.*s'"
+
+#, c-format
+msgid "missing environment variable '%s' for configuration '%.*s'"
+msgstr "fehlende Umgebungsvariable '%s' für Konfiguration '%.*s'"
+
+#, c-format
+msgid "key does not contain a section: %s"
+msgstr "Schlüssel enthält keine Sektion: %s"
+
+#, c-format
+msgid "key does not contain variable name: %s"
+msgstr "Schlüssel enthält keinen Variablennamen: %s"
+
+#, c-format
+msgid "invalid key: %s"
+msgstr "Ungültiger Schlüssel: %s"
+
+#, c-format
+msgid "invalid key (newline): %s"
+msgstr "Ungültiger Schlüssel (neue Zeile): %s"
+
+msgid "empty config key"
+msgstr "leerer Konfigurationsschlüssel"
+
+#, c-format
+msgid "bogus config parameter: %s"
+msgstr "Fehlerhafter Konfigurationsparameter: %s"
+
+#, c-format
+msgid "bogus format in %s"
+msgstr "Fehlerhaftes Format in %s"
+
+#, c-format
+msgid "bogus count in %s"
+msgstr "falsche Zählung in %s"
+
+#, c-format
+msgid "too many entries in %s"
+msgstr "zu viele Einträge in %s"
+
+#, c-format
+msgid "missing config key %s"
+msgstr "fehlender Konfigurationsschlüssel %s"
+
+#, c-format
+msgid "missing config value %s"
+msgstr "fehlender Konfigurationswert %s"
+
+#, c-format
+msgid "bad config line %d in blob %s"
+msgstr "Ungültige Konfigurationszeile %d in Blob %s"
+
+#, c-format
+msgid "bad config line %d in file %s"
+msgstr "Ungültige Konfigurationszeile %d in Datei %s"
+
+#, c-format
+msgid "bad config line %d in standard input"
+msgstr "Ungültige Konfigurationszeile %d in Standard-Eingabe"
+
+#, c-format
+msgid "bad config line %d in submodule-blob %s"
+msgstr "Ungültige Konfigurationszeile %d in Submodul-Blob %s"
+
+#, c-format
+msgid "bad config line %d in command line %s"
+msgstr "Ungültige Konfigurationszeile %d in Kommandozeile %s"
+
+#, c-format
+msgid "bad config line %d in %s"
+msgstr "Ungültige Konfigurationszeile %d in %s"
+
+msgid "out of range"
+msgstr "Außerhalb des Bereichs"
+
+msgid "invalid unit"
+msgstr "Ungültige Einheit"
+
+#, c-format
+msgid "bad numeric config value '%s' for '%s': %s"
+msgstr "Ungültiger numerischer Wert '%s' für Konfiguration '%s': %s"
+
+#, 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"
+
+#, 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"
+
+#, 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"
+
+#, 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"
+
+#, 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"
+
+#, 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"
+
+#, c-format
+msgid "invalid value for variable %s"
+msgstr "ungültiger Wert für Variable %s"
+
+#, c-format
+msgid "ignoring unknown core.fsync component '%s'"
+msgstr "ignoriere unbekannte Komponente '%s' für core.fsync"
+
+#, c-format
+msgid "bad boolean config value '%s' for '%s'"
+msgstr "ungültiger boolescher Konfigurationswert '%s' für '%s'"
+
+#, c-format
+msgid "failed to expand user dir in: '%s'"
+msgstr "Fehler beim Erweitern des Nutzerverzeichnisses in: '%s'"
+
+#, c-format
+msgid "'%s' for '%s' is not a valid timestamp"
+msgstr "'%s' ist kein gültiger Zeitstempel für '%s'"
+
+#, c-format
+msgid "abbrev length out of range: %d"
+msgstr "Länge für Abkürzung von Commit-IDs außerhalb des Bereichs: %d"
+
+#, c-format
+msgid "bad zlib compression level %d"
+msgstr "ungültiger zlib Komprimierungsgrad %d"
+
+msgid "core.commentChar should only be one character"
+msgstr "core.commentChar sollte nur ein Zeichen sein"
+
+#, c-format
+msgid "ignoring unknown core.fsyncMethod value '%s'"
+msgstr "ignoriere unbekannten Wert '%s' für core.fsyncMethod"
+
+msgid "core.fsyncObjectFiles is deprecated; use core.fsync instead"
+msgstr "core.fsyncObjectFiles is veraltet; nutzen Sie stattdessen core.fsync"
+
+#, c-format
+msgid "invalid mode for object creation: %s"
+msgstr "Ungültiger Modus für Objekterstellung: %s"
+
+#, c-format
+msgid "malformed value for %s"
+msgstr "ungültiger Wert für %s"
+
+#, c-format
+msgid "malformed value for %s: %s"
+msgstr "Ungültiger Wert für %s: %s"
+
+msgid "must be one of nothing, matching, simple, upstream or current"
+msgstr ""
+"Muss einer von diesen sein: nothing, matching, simple, upstream, current"
+
+#, c-format
+msgid "unable to load config blob object '%s'"
+msgstr "Konnte Blob-Objekt '%s' für Konfiguration nicht laden."
+
+#, c-format
+msgid "reference '%s' does not point to a blob"
+msgstr "Referenz '%s' zeigt auf keinen Blob."
+
+#, c-format
+msgid "unable to resolve config blob '%s'"
+msgstr "Konnte Blob '%s' für Konfiguration nicht auflösen."
+
+#, c-format
+msgid "failed to parse %s"
+msgstr "Fehler beim Parsen von %s."
+
+msgid "unable to parse command-line config"
+msgstr ""
+"Konnte die über die Befehlszeile angegebene Konfiguration nicht parsen."
+
+msgid "unknown error occurred while reading the configuration files"
+msgstr ""
+"Es trat ein unbekannter Fehler beim Lesen der Konfigurationsdateien auf."
+
+#, c-format
+msgid "Invalid %s: '%s'"
+msgstr "Ungültiger %s: '%s'"
+
+#, 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."
+
+#, 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."
+
+#, c-format
+msgid "bad config variable '%s' in file '%s' at line %d"
+msgstr "ungültige Konfigurationsvariable '%s' in Datei '%s' bei Zeile %d"
+
+#, c-format
+msgid "invalid section name '%s'"
+msgstr "Ungültiger Sektionsname '%s'"
+
+#, c-format
+msgid "%s has multiple values"
+msgstr "%s hat mehrere Werte"
+
+#, c-format
+msgid "failed to write new configuration file %s"
+msgstr "Konnte neue Konfigurationsdatei '%s' nicht schreiben."
+
+#, c-format
+msgid "could not lock config file %s"
+msgstr "Konnte Konfigurationsdatei '%s' nicht sperren."
+
+#, c-format
+msgid "opening %s"
+msgstr "Öffne %s"
+
+#, c-format
+msgid "invalid config file %s"
+msgstr "Ungültige Konfigurationsdatei %s"
+
+#, c-format
+msgid "fstat on %s failed"
+msgstr "fstat auf %s fehlgeschlagen"
+
+#, c-format
+msgid "unable to mmap '%s'%s"
+msgstr "mmap für '%s'(%s) fehlgeschlagen"
+
+#, c-format
+msgid "chmod on %s failed"
+msgstr "chmod auf %s fehlgeschlagen"
+
+#, c-format
+msgid "could not write config file %s"
+msgstr "Konnte Konfigurationsdatei %s nicht schreiben."
+
+#, c-format
+msgid "could not set '%s' to '%s'"
+msgstr "Konnte '%s' nicht zu '%s' setzen."
+
+#, c-format
+msgid "invalid section name: %s"
+msgstr "Ungültiger Sektionsname: %s"
+
+#, c-format
+msgid "missing value for '%s'"
+msgstr "Fehlender Wert für '%s'"
+
+msgid "the remote end hung up upon initial contact"
+msgstr "Die Gegenseite hat nach dem ersten Kontakt abgebrochen."
+
+msgid ""
+"Could not read from remote repository.\n"
+"\n"
+"Please make sure you have the correct access rights\n"
+"and the repository exists."
+msgstr ""
+"Konnte nicht vom Remote-Repository lesen.\n"
+"\n"
+"Bitte stellen Sie sicher, dass die korrekten Zugriffsberechtigungen "
+"bestehen\n"
+"und das Repository existiert."
+
+#, c-format
+msgid "server doesn't support '%s'"
+msgstr "Der Server unterstützt kein '%s'."
+
+#, c-format
+msgid "server doesn't support feature '%s'"
+msgstr "Der Server unterstützt das Feature '%s' nicht."
+
+msgid "expected flush after capabilities"
+msgstr "Erwartete Flush nach Fähigkeiten."
+
+#, c-format
+msgid "ignoring capabilities after first line '%s'"
+msgstr "Ignoriere Fähigkeiten nach der ersten Zeile '%s'."
+
+msgid "protocol error: unexpected capabilities^{}"
+msgstr "Protokollfehler: unerwartetes capabilities^{}"
+
+#, c-format
+msgid "protocol error: expected shallow sha-1, got '%s'"
+msgstr "Protokollfehler: shallow SHA-1 erwartet, '%s' bekommen"
+
+msgid "repository on the other end cannot be shallow"
+msgstr ""
+"Repository auf der Gegenseite kann keine unvollständige Historie (shallow) "
+"enthalten"
+
+msgid "invalid packet"
+msgstr "ungültiges Paket"
+
+#, c-format
+msgid "protocol error: unexpected '%s'"
+msgstr "Protokollfehler: unerwartetes '%s'"
+
+#, c-format
+msgid "unknown object format '%s' specified by server"
+msgstr "unbekanntes Objekt-Format '%s' vom Server angegeben"
+
+#, c-format
+msgid "invalid ls-refs response: %s"
+msgstr "ungültige ls-refs Antwort: %s"
+
+msgid "expected flush after ref listing"
+msgstr "Flush nach Auflistung der Referenzen erwartet"
+
+msgid "expected response end packet after ref listing"
+msgstr "Antwort-Endpaket nach Auflistung der Referenzen erwartet"
+
+#, c-format
+msgid "protocol '%s' is not supported"
+msgstr "Protokoll '%s' wird nicht unterstützt"
+
+msgid "unable to set SO_KEEPALIVE on socket"
+msgstr "kann SO_KEEPALIVE bei Socket nicht setzen"
+
+#, c-format
+msgid "Looking up %s ... "
+msgstr "Suche nach %s ..."
+
+#, 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 ... "
+#, c-format
+msgid ""
+"done.\n"
+"Connecting to %s (port %s) ... "
+msgstr ""
+"Fertig.\n"
+"Verbinde nach %s (Port %s) ... "
+
+#, c-format
+msgid ""
+"unable to connect to %s:\n"
+"%s"
+msgstr ""
+"Konnte nicht nach %s verbinden:\n"
+"%s"
+
+#. TRANSLATORS: this is the end of "Connecting to %s (port %s) ... "
+msgid "done."
+msgstr "Fertig."
+
+#, c-format
+msgid "unable to look up %s (%s)"
+msgstr "Fehler bei der Suche nach %s (%s)"
+
+#, c-format
+msgid "unknown port %s"
+msgstr "Unbekannter Port %s"
+
+#, c-format
+msgid "strange hostname '%s' blocked"
+msgstr "Merkwürdigen Hostnamen '%s' blockiert."
+
+#, c-format
+msgid "strange port '%s' blocked"
+msgstr "Merkwürdigen Port '%s' blockiert."
+
+#, c-format
+msgid "cannot start proxy %s"
+msgstr "Kann Proxy %s nicht starten."
+
+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"
+
+msgid "newline is forbidden in git:// hosts and repo paths"
+msgstr "Zeilenumbruch ist in git:// Hosts und Repository-Pfaden verboten"
+
+msgid "ssh variant 'simple' does not support -4"
+msgstr "SSH-Variante 'simple' unterstützt kein -4"
+
+msgid "ssh variant 'simple' does not support -6"
+msgstr "SSH-Variante 'simple' unterstützt kein -6"
+
+msgid "ssh variant 'simple' does not support setting port"
+msgstr "SSH-Variante 'simple' unterstützt nicht das Setzen eines Ports"
+
+#, c-format
+msgid "strange pathname '%s' blocked"
+msgstr "Merkwürdigen Pfadnamen '%s' blockiert"
+
+msgid "unable to fork"
+msgstr "kann Prozess nicht starten"
+
+msgid "Could not run 'git rev-list'"
+msgstr "Konnte 'git rev-list' nicht ausführen"
+
+msgid "failed write to rev-list"
+msgstr "Fehler beim Schreiben nach rev-list"
+
+msgid "failed to close rev-list's stdin"
+msgstr "Fehler beim Schließen von rev-lists Standard-Eingabe"
+
+#, c-format
+msgid "'%s' does not exist"
+msgstr "'%s' existiert nicht."
+
+msgid "need a working directory"
+msgstr "Arbeitsverzeichnis benötigt"
+
+msgid "could not find enlistment root"
+msgstr "konnte Root-Verzeichnis für Eintragungen nicht finden"
+
+#, c-format
+msgid "could not switch to '%s'"
+msgstr "konnte nicht zu '%s' wechseln"
+
+#, c-format
+msgid "could not configure %s=%s"
+msgstr "konnte %s=%s nicht konfigurieren"
+
+msgid "could not configure log.excludeDecoration"
+msgstr "konnte log.excludeDecoration nicht konfigurieren"
+
+msgid "Scalar enlistments require a worktree"
+msgstr "Skalare Eintragungen erfordern ein Arbeitsverzeichnis"
+
+#, c-format
+msgid "could not open directory '%s'"
+msgstr "konnte Verzeichnis '%s' nicht öffnen"
+
+#, c-format
+msgid "skipping '%s', which is neither file nor directory"
+msgstr "überspringe '%s', das weder Datei noch Verzeichnis ist"
+
+#, c-format
+msgid "could not determine free disk size for '%s'"
+msgstr "konnte freien Speicherplatz für '%s' nicht bestimmen"
+
+#, c-format
+msgid "could not get info for '%s'"
+msgstr "konnte keine Info für '%s' bekommen"
+
+#, c-format
+msgid "remote HEAD is not a branch: '%.*s'"
+msgstr "externer HEAD ist kein Branch: '%.*s'"
+
+msgid "failed to get default branch name from remote; using local default"
+msgstr ""
+"Fehler beim Abfragen des Standard-Branchnamens vom Remote-Repository; nutze "
+"lokalen Standardwert"
+
+msgid "failed to get default branch name"
+msgstr "Fehler beim Abfragen des Standard-Branchnamens"
+
+msgid "failed to unregister repository"
+msgstr "Fehler beim Austragen des Repositories"
+
+msgid "failed to delete enlistment directory"
+msgstr "Fehler beim Löschen des Eintragungs-Verzeichnisses"
+
+msgid "branch to checkout after clone"
+msgstr "Branch, der nach dem Klonen ausgecheckt werden soll"
+
+msgid "when cloning, create full working directory"
+msgstr "vollständiges Arbeitsverzeichnis beim Klonen erstellen"
+
+msgid "only download metadata for the branch that will be checked out"
+msgstr "lade nur Metadaten des Branches herunter, der ausgecheckt wird"
+
+msgid "scalar clone [<options>] [--] <repo> [<dir>]"
+msgstr "scalar clone [<Optionen>] [--] <Repository> [<Verzeichnis>]"
+
+#, c-format
+msgid "cannot deduce worktree name from '%s'"
+msgstr "konnte Name für Arbeitsverzeichnis nicht von '%s' ableiten"
+
+#, c-format
+msgid "directory '%s' exists already"
+msgstr "Verzeichnis '%s' existiert bereits"
+
+#, c-format
+msgid "failed to get default branch for '%s'"
+msgstr "Fehler beim Abfragen des Default-Branches für '%s'"
+
+#, c-format
+msgid "could not configure remote in '%s'"
+msgstr "konnte Remote-Repository in '%s' nicht konfigurieren"
+
+#, c-format
+msgid "could not configure '%s'"
+msgstr "konnte '%s' nicht konfigurieren"
+
+msgid "partial clone failed; attempting full clone"
+msgstr "partielles Klonen fehlgeschlagen; versuche vollständiges Klonen"
+
+msgid "could not configure for full clone"
+msgstr "konnte nicht für vollständiges Klonen konfigurieren"
+
+msgid "scalar diagnose [<enlistment>]"
+msgstr "scalar diagnose [<Eintragung>]"
+
+#, c-format
+msgid "could not create directory for '%s'"
+msgstr "konnte Verzeichnis für '%s' nicht erstellen"
+
+msgid "could not duplicate stdout"
+msgstr "konnte Standard-Ausgabe nicht duplizieren"
+
+msgid "failed to write archive"
+msgstr "Schreiben des Archivs fehlgeschlagen"
+
+msgid "`scalar list` does not take arguments"
+msgstr "`scalar list` akzeptiert keine Argumente"
+
+msgid "scalar register [<enlistment>]"
+msgstr "scalar register [<Eintragung>]"
+
+msgid "reconfigure all registered enlistments"
+msgstr "alle registrierten Eintragungen neu konfigurieren"
+
+msgid "scalar reconfigure [--all | <enlistment>]"
+msgstr "scalar reconfigure [--all | <Eintragung>]"
+
+msgid "--all or <enlistment>, but not both"
+msgstr "--all oder <Eintragung>, aber nicht beides"
+
+#, c-format
+msgid "git repository gone in '%s'"
+msgstr "Git-Repository entfernt in '%s'"
+
+msgid ""
+"scalar run <task> [<enlistment>]\n"
+"Tasks:\n"
+msgstr ""
+"scalar run <Aufgabe> [<Eintragung>]\n"
+"Aufgaben:\n"
+
+#, c-format
+msgid "no such task: '%s'"
+msgstr "Aufgabe nicht gefunden: '%s'"
+
+msgid "scalar unregister [<enlistment>]"
+msgstr "scalar unregister [<Eintragung>]"
+
+msgid "scalar delete <enlistment>"
+msgstr "scalar delete <Eintragung>"
+
+msgid "refusing to delete current working directory"
+msgstr "Löschen des aktuellen Arbeitsverzeichnisses wurde verweigert"
+
+msgid "include Git version"
+msgstr "Git-Version einbeziehen"
+
+msgid "include Git's build options"
+msgstr "Build-Optionen von Git einbeziehen"
+
+msgid "scalar verbose [-v | --verbose] [--build-options]"
+msgstr "scalar verbose [-v | --verbose] [--build-options]"
+
+msgid "-C requires a <directory>"
+msgstr "-C erfordert ein <Verzeichnis>"
+
+#, c-format
+msgid "could not change to '%s'"
+msgstr "konnte nicht zu '%s' wechseln"
+
+msgid "-c requires a <key>=<value> argument"
+msgstr "-c benötigt ein <Schlüssel>=<Wert> Argument"
+
+msgid ""
+"scalar [-C <directory>] [-c <key>=<value>] <command> [<options>]\n"
+"\n"
+"Commands:\n"
+msgstr ""
+"scalar [-C <Verzeichnis>] [-c <Schlüssel>=<Wert>] <Befehl> [<Optionen>]\n"
+"\n"
+"Befehle:\n"
+
+#, c-format
+msgid "illegal crlf_action %d"
+msgstr "Unerlaubte crlf_action %d"
+
+#, c-format
+msgid "CRLF would be replaced by LF in %s"
+msgstr "CRLF würde in %s durch LF ersetzt werden"
+
+#, c-format
+msgid ""
+"in the working copy of '%s', CRLF will be replaced by LF the next time Git "
+"touches it"
+msgstr ""
+"in der Arbeitskopie von '%s', CRLF wird durch LF ersetzt, sobald es das "
+"nächste Mal von Git verarbeitet wird"
+
+#, c-format
+msgid "LF would be replaced by CRLF in %s"
+msgstr "LF würde in %s durch CRLF ersetzt werden"
+
+#, c-format
+msgid ""
+"in the working copy of '%s', LF will be replaced by CRLF the next time Git "
+"touches it"
+msgstr ""
+"in der Arbeitskopie von '%s', LF wird durch CRLF ersetzt, sobald es das "
+"nächste Mal von Git verarbeitet wird"
+
+#, c-format
+msgid "BOM is prohibited in '%s' if encoded as %s"
+msgstr "BOM ist in '%s' unzulässig, wenn als %s codiert"
+
+#, c-format
+msgid ""
+"The file '%s' contains a byte order mark (BOM). Please use UTF-%.*s as "
+"working-tree-encoding."
+msgstr ""
+"Die Datei '%s' enthält ein Byte-Order-Mark (BOM). Bitte benutzen Sie\n"
+"UTF-%.*s als Codierung im Arbeitsverzeichnis."
+
+#, c-format
+msgid "BOM is required in '%s' if encoded as %s"
+msgstr "BOM ist erforderlich in '%s', wenn als %s codiert"
+
+#, 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."
+msgstr ""
+"Der Datei '%s' fehlt ein Byte-Order-Mark (BOM). Bitte benutzen Sie UTF-%sBE\n"
+"oder UTF-%sLE (abhängig von der Byte-Reihenfolge) als Codierung im\n"
+"Arbeitsverzeichnis."
+
+#, c-format
+msgid "failed to encode '%s' from %s to %s"
+msgstr "Fehler beim Codieren von '%s' von %s nach %s"
+
+#, c-format
+msgid "encoding '%s' from %s to %s and back is not the same"
+msgstr "Codierung von '%s' von %s nach %s und zurück ist nicht dasselbe"
+
+#, c-format
+msgid "cannot fork to run external filter '%s'"
+msgstr "kann externen Filter '%s' nicht starten"
+
+#, c-format
+msgid "cannot feed the input to external filter '%s'"
+msgstr "kann Eingaben nicht an externen Filter '%s' übergeben"
+
+#, c-format
+msgid "external filter '%s' failed %d"
+msgstr "externer Filter '%s' fehlgeschlagen %d"
+
+#, c-format
+msgid "read from external filter '%s' failed"
+msgstr "Lesen von externem Filter '%s' fehlgeschlagen"
+
+#, c-format
+msgid "external filter '%s' failed"
+msgstr "externer Filter '%s' fehlgeschlagen"
+
+msgid "unexpected filter type"
+msgstr "unerwartete Filterart"
+
+msgid "path name too long for external filter"
+msgstr "Pfadname zu lang für externen Filter"
+
+#, c-format
+msgid ""
+"external filter '%s' is not available anymore although not all paths have "
+"been filtered"
+msgstr ""
+"externer Filter '%s' nicht mehr verfügbar, obwohl nicht alle Pfade gefiltert "
+"wurden"
+
+msgid "true/false are no valid working-tree-encodings"
+msgstr "true/false sind keine gültigen Codierungen im Arbeitsverzeichnis"
+
+#, c-format
+msgid "%s: clean filter '%s' failed"
+msgstr "%s: clean-Filter '%s' fehlgeschlagen"
+
+#, c-format
+msgid "%s: smudge filter %s failed"
+msgstr "%s: smudge-Filter '%s' fehlgeschlagen"
+
+#, c-format
+msgid "skipping credential lookup for key: credential.%s"
+msgstr "überspringe Suche nach Zugangsdaten für Schlüssel: credential.%s"
+
+msgid "refusing to work with credential missing host field"
+msgstr "Weigerung, mit fehlendem Hostnamen in Zugangsdaten zu arbeiten"
+
+msgid "refusing to work with credential missing protocol field"
+msgstr "Weigerung, mit fehlendem Protokoll in Zugangsdaten zu arbeiten"
+
+#, c-format
+msgid "url contains a newline in its %s component: %s"
+msgstr "URL enthält Zeilenumbruch in der %s Komponente: %s"
+
+#, c-format
+msgid "url has no scheme: %s"
+msgstr "URL hat kein Schema: %s"
+
+#, c-format
+msgid "credential url cannot be parsed: %s"
+msgstr "URL mit Zugangsdaten konnte nicht geparst werden: %s"
+
+msgid "in the future"
+msgstr "in der Zukunft"
+
+#, c-format
+msgid "%<PRIuMAX> second ago"
+msgid_plural "%<PRIuMAX> seconds ago"
+msgstr[0] "vor %<PRIuMAX> Sekunde"
+msgstr[1] "vor %<PRIuMAX> Sekunden"
+
+#, c-format
+msgid "%<PRIuMAX> minute ago"
+msgid_plural "%<PRIuMAX> minutes ago"
+msgstr[0] "vor %<PRIuMAX> Minute"
+msgstr[1] "vor %<PRIuMAX> Minuten"
+
+#, c-format
+msgid "%<PRIuMAX> hour ago"
+msgid_plural "%<PRIuMAX> hours ago"
+msgstr[0] "vor %<PRIuMAX> Stunde"
+msgstr[1] "vor %<PRIuMAX> Stunden"
+
+#, c-format
+msgid "%<PRIuMAX> day ago"
+msgid_plural "%<PRIuMAX> days ago"
+msgstr[0] "vor %<PRIuMAX> Tag"
+msgstr[1] "vor %<PRIuMAX> Tagen"
+
+#, c-format
+msgid "%<PRIuMAX> week ago"
+msgid_plural "%<PRIuMAX> weeks ago"
+msgstr[0] "vor %<PRIuMAX> Woche"
+msgstr[1] "vor %<PRIuMAX> Wochen"
+
+#, c-format
+msgid "%<PRIuMAX> month ago"
+msgid_plural "%<PRIuMAX> months ago"
+msgstr[0] "vor %<PRIuMAX> Monat"
+msgstr[1] "vor %<PRIuMAX> Monaten"
+
+#, c-format
+msgid "%<PRIuMAX> year"
+msgid_plural "%<PRIuMAX> years"
+msgstr[0] "vor %<PRIuMAX> Jahr"
+msgstr[1] "vor %<PRIuMAX> Jahren"
+
+#. TRANSLATORS: "%s" is "<n> years"
+#, c-format
+msgid "%s, %<PRIuMAX> month ago"
+msgid_plural "%s, %<PRIuMAX> months ago"
+msgstr[0] "%s, und %<PRIuMAX> Monat"
+msgstr[1] "%s, und %<PRIuMAX> Monaten"
+
+#, c-format
+msgid "%<PRIuMAX> year ago"
+msgid_plural "%<PRIuMAX> years ago"
+msgstr[0] "vor %<PRIuMAX> Jahr"
+msgstr[1] "vor %<PRIuMAX> Jahren"
+
+msgid "Propagating island marks"
+msgstr "Erzeuge Delta-Island Markierungen"
+
+#, c-format
+msgid "bad tree object %s"
+msgstr "Ungültiges Tree-Objekt %s."
+
+#, c-format
+msgid "failed to load island regex for '%s': %s"
+msgstr ""
+"Fehler beim Laden des regulären Ausdrucks des Delta-Island für '%s': %s"
+
+#, c-format
+msgid "island regex from config has too many capture groups (max=%d)"
+msgstr ""
+"regulärer Ausdruck des Delta-Island aus Konfiguration hat zu\n"
+"viele Capture-Gruppen (maximal %d)"
+
+#, c-format
+msgid "Marked %d islands, done.\n"
+msgstr "%d Delta-Islands markiert, fertig.\n"
+
+msgid "--merge-base does not work with ranges"
+msgstr "--merge-base funktioniert nicht mit Bereichen"
+
+msgid "--merge-base only works with commits"
+msgstr "--merge-base funktioniert nur mit Commits"
+
+msgid "unable to get HEAD"
+msgstr "konnte HEAD nicht bekommen"
+
+msgid "no merge base found"
+msgstr "keine Merge-Basis gefunden"
+
+msgid "multiple merge bases found"
+msgstr "mehrere Merge-Basen gefunden"
+
+msgid "git diff --no-index [<options>] <path> <path>"
+msgstr "git diff --no-index [<Optionen>] <Pfad> <Pfad>"
+
+msgid ""
+"Not a git repository. Use --no-index to compare two paths outside a working "
+"tree"
+msgstr ""
+"Kein Git-Repository. Nutzen Sie --no-index, um zwei Pfade außerhalb des "
+"Arbeitsverzeichnisses zu vergleichen."
+
+#, c-format
+msgid "  Failed to parse dirstat cut-off percentage '%s'\n"
+msgstr ""
+"  Fehler beim Parsen des abgeschnittenen \"dirstat\" Prozentsatzes '%s'\n"
+
+#, c-format
+msgid "  Unknown dirstat parameter '%s'\n"
+msgstr "  Unbekannter \"dirstat\" Parameter '%s'\n"
+
+msgid ""
+"color moved setting must be one of 'no', 'default', 'blocks', 'zebra', "
+"'dimmed-zebra', 'plain'"
+msgstr ""
+"\"color moved\"-Einstellung muss eines von diesen sein: 'no', 'default', "
+"'blocks', 'zebra', 'dimmed-zebra', 'plain'"
+
+#, 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 ""
+"Unbekannter color-moved-ws Modus '%s', mögliche Werte sind 'ignore-space-"
+"change', 'ignore-space-at-eol', 'ignore-all-space', 'allow-identation-change'"
+
+msgid ""
+"color-moved-ws: allow-indentation-change cannot be combined with other "
+"whitespace modes"
+msgstr ""
+"color-moved-ws: allow-indentation-change kann nicht mit anderen\n"
+"Whitespace-Modi kombiniert werden."
+
+#, c-format
+msgid "Unknown value for 'diff.submodule' config variable: '%s'"
+msgstr "Unbekannter Wert in Konfigurationsvariable 'diff.submodule': '%s'"
+
+#, c-format
+msgid ""
+"Found errors in 'diff.dirstat' config variable:\n"
+"%s"
+msgstr ""
+"Fehler in 'diff.dirstat' Konfigurationsvariable gefunden:\n"
+"%s"
+
+#, c-format
+msgid "external diff died, stopping at %s"
+msgstr "externes Diff-Programm unerwartet beendet, angehalten bei %s"
+
+#, c-format
+msgid "options '%s', '%s', '%s', and '%s' cannot be used together"
+msgstr ""
+"die Optionen '%s', '%s', '%s' und '%s' können nicht gemeinsam verwendet "
+"werden"
+
+#, c-format
+msgid "options '%s' and '%s' cannot be used together, use '%s' with '%s'"
+msgstr ""
+"die Optionen '%s' und '%s' können nicht gemeinsam verwendet werden, nutzen "
+"Sie '%s' mit '%s'"
+
+#, c-format
+msgid ""
+"options '%s' and '%s' cannot be used together, use '%s' with '%s' and '%s'"
+msgstr ""
+"die Optionen '%s' und '%s' können nicht gemeinsam verwendet werden, nutzen "
+"Sie '%s' mit '%s' und '%s'"
+
+msgid "--follow requires exactly one pathspec"
+msgstr "--follow erfordert genau eine Pfadspezifikation"
+
+#, c-format
+msgid "invalid --stat value: %s"
+msgstr "Ungültiger --stat Wert: %s"
+
+#, c-format
+msgid "%s expects a numerical value"
+msgstr "%s erwartet einen numerischen Wert."
+
+#, c-format
+msgid ""
+"Failed to parse --dirstat/-X option parameter:\n"
+"%s"
+msgstr ""
+"Fehler beim Parsen des --dirstat/-X Optionsparameters:\n"
+"%s"
+
+#, c-format
+msgid "unknown change class '%c' in --diff-filter=%s"
+msgstr "unbekannte Änderungsklasse '%c' in --diff-filter=%s"
+
+#, c-format
+msgid "unknown value after ws-error-highlight=%.*s"
+msgstr "unbekannter Wert nach ws-error-highlight=%.*s"
+
+#, c-format
+msgid "unable to resolve '%s'"
+msgstr "konnte '%s' nicht auflösen"
+
+#, c-format
+msgid "%s expects <n>/<m> form"
+msgstr "%s erwartet die Form <n>/<m>"
+
+#, c-format
+msgid "%s expects a character, got '%s'"
+msgstr "%s erwartet ein Zeichen, '%s' bekommen"
+
+#, c-format
+msgid "bad --color-moved argument: %s"
+msgstr "ungültiges --color-moved Argument: %s"
+
+#, c-format
+msgid "invalid mode '%s' in --color-moved-ws"
+msgstr "ungültiger Modus '%s' in --color-moved-ws"
+
+msgid ""
+"option diff-algorithm accepts \"myers\", \"minimal\", \"patience\" and "
+"\"histogram\""
+msgstr ""
+"Option diff-algorithm akzeptiert: \"myers\", \"minimal\", \"patience\" and "
+"\"histogram\""
+
+#, c-format
+msgid "invalid argument to %s"
+msgstr "ungültiges Argument für %s"
+
+#, c-format
+msgid "invalid regex given to -I: '%s'"
+msgstr "ungültiger regulärer Ausdruck für -I gegeben: '%s'"
+
+#, c-format
+msgid "failed to parse --submodule option parameter: '%s'"
+msgstr "Fehler beim Parsen des --submodule Optionsparameters: '%s'"
+
+#, c-format
+msgid "bad --word-diff argument: %s"
+msgstr "ungültiges --word-diff Argument: %s"
+
+msgid "Diff output format options"
+msgstr "Diff-Optionen zu Ausgabeformaten"
+
+msgid "generate patch"
+msgstr "Patch erzeugen"
+
+msgid "<n>"
+msgstr "<n>"
+
+msgid "generate diffs with <n> lines context"
+msgstr "Unterschiede mit <n> Zeilen des Kontextes erstellen"
+
+msgid "generate the diff in raw format"
+msgstr "Unterschiede im Rohformat erstellen"
+
+msgid "synonym for '-p --raw'"
+msgstr "Synonym für '-p --raw'"
+
+msgid "synonym for '-p --stat'"
+msgstr "Synonym für '-p --stat'"
+
+msgid "machine friendly --stat"
+msgstr "maschinenlesbare Ausgabe von --stat"
+
+msgid "output only the last line of --stat"
+msgstr "nur die letzte Zeile von --stat ausgeben"
+
+msgid "<param1,param2>..."
+msgstr "<Parameter1,Parameter2>..."
+
+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"
+
+msgid "synonym for --dirstat=cumulative"
+msgstr "Synonym für --dirstat=cumulative"
+
+msgid "synonym for --dirstat=files,param1,param2..."
+msgstr "Synonym für --dirstat=files,Parameter1,Parameter2..."
+
+msgid "warn if changes introduce conflict markers or whitespace errors"
+msgstr ""
+"warnen, wenn Änderungen Konfliktmarker oder Whitespace-Fehler einbringen"
+
+msgid "condensed summary such as creations, renames and mode changes"
+msgstr ""
+"gekürzte Zusammenfassung, wie z.B. Erstellungen, Umbenennungen und "
+"Änderungen der Datei-Rechte"
+
+msgid "show only names of changed files"
+msgstr "nur Dateinamen der geänderten Dateien anzeigen"
+
+msgid "show only names and status of changed files"
+msgstr "nur Dateinamen und Status der geänderten Dateien anzeigen"
+
+msgid "<width>[,<name-width>[,<count>]]"
+msgstr "<Breite>[,<Namens-Breite>[,<Anzahl>]]"
+
+msgid "generate diffstat"
+msgstr "Zusammenfassung der Unterschiede erzeugen"
+
+msgid "<width>"
+msgstr "<Breite>"
+
+msgid "generate diffstat with a given width"
+msgstr "Zusammenfassung der Unterschiede mit gegebener Breite erzeugen"
+
+msgid "generate diffstat with a given name width"
+msgstr "Zusammenfassung der Unterschiede mit gegebener Namens-Breite erzeugen"
+
+msgid "generate diffstat with a given graph width"
+msgstr "Zusammenfassung der Unterschiede mit gegebener Graph-Breite erzeugen"
+
+msgid "<count>"
+msgstr "<Anzahl>"
+
+msgid "generate diffstat with limited lines"
+msgstr "Zusammenfassung der Unterschiede mit begrenzten Zeilen erzeugen"
+
+msgid "generate compact summary in diffstat"
+msgstr "kompakte Zusammenstellung in Zusammenfassung der Unterschiede erzeugen"
+
+msgid "output a binary diff that can be applied"
+msgstr "eine binäre Differenz ausgeben, dass angewendet werden kann"
+
+msgid "show full pre- and post-image object names on the \"index\" lines"
+msgstr "vollständige Objekt-Namen in den \"index\"-Zeilen anzeigen"
+
+msgid "show colored diff"
+msgstr "farbige Unterschiede anzeigen"
+
+msgid "<kind>"
+msgstr "<Art>"
+
+msgid ""
+"highlight whitespace errors in the 'context', 'old' or 'new' lines in the "
+"diff"
+msgstr ""
+"Whitespace-Fehler in den Zeilen 'context', 'old' oder 'new' bei den "
+"Unterschieden hervorheben"
+
+msgid ""
+"do not munge pathnames and use NULs as output field terminators in --raw or "
+"--numstat"
+msgstr ""
+"die Pfadnamen nicht verschleiern und NUL-Zeichen als Schlusszeichen in "
+"Ausgabefeldern bei --raw oder --numstat nutzen"
+
+msgid "<prefix>"
+msgstr "<Präfix>"
+
+msgid "show the given source prefix instead of \"a/\""
+msgstr "den gegebenen Quell-Präfix statt \"a/\" anzeigen"
+
+msgid "show the given destination prefix instead of \"b/\""
+msgstr "den gegebenen Ziel-Präfix statt \"b/\" anzeigen"
+
+msgid "prepend an additional prefix to every line of output"
+msgstr "einen zusätzlichen Präfix bei jeder Ausgabezeile voranstellen"
+
+msgid "do not show any source or destination prefix"
+msgstr "keine Quell- oder Ziel-Präfixe anzeigen"
+
+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"
+
+msgid "<char>"
+msgstr "<Zeichen>"
+
+msgid "specify the character to indicate a new line instead of '+'"
+msgstr "das Zeichen festlegen, das eine neue Zeile kennzeichnet (statt '+')"
+
+msgid "specify the character to indicate an old line instead of '-'"
+msgstr "das Zeichen festlegen, das eine alte Zeile kennzeichnet (statt '-')"
+
+msgid "specify the character to indicate a context instead of ' '"
+msgstr "das Zeichen festlegen, das den Kontext kennzeichnet (statt ' ')"
+
+msgid "Diff rename options"
+msgstr "Diff-Optionen zur Umbenennung"
+
+msgid "<n>[/<m>]"
+msgstr "<n>[/<m>]"
+
+msgid "break complete rewrite changes into pairs of delete and create"
+msgstr ""
+"teile komplette Rewrite-Änderungen in Änderungen mit \"löschen\" und "
+"\"erstellen\""
+
+msgid "detect renames"
+msgstr "Umbenennungen erkennen"
+
+msgid "omit the preimage for deletes"
+msgstr "Preimage für Löschungen weglassen"
+
+msgid "detect copies"
+msgstr "Kopien erkennen"
+
+msgid "use unmodified files as source to find copies"
+msgstr "ungeänderte Dateien als Quelle zum Finden von Kopien nutzen"
+
+msgid "disable rename detection"
+msgstr "Erkennung von Umbenennungen deaktivieren"
+
+msgid "use empty blobs as rename source"
+msgstr "leere Blobs als Quelle von Umbenennungen nutzen"
+
+msgid "continue listing the history of a file beyond renames"
+msgstr "Auflistung der Historie einer Datei nach Umbenennung fortführen"
+
+msgid ""
+"prevent rename/copy detection if the number of rename/copy targets exceeds "
+"given limit"
+msgstr ""
+"Erkennung von Umbenennungen und Kopien verhindern, wenn die Anzahl der Ziele "
+"für Umbenennungen und Kopien das gegebene Limit überschreitet"
+
+msgid "Diff algorithm options"
+msgstr "Diff Algorithmus-Optionen"
+
+msgid "produce the smallest possible diff"
+msgstr "die kleinstmöglichen Änderungen erzeugen"
+
+msgid "ignore whitespace when comparing lines"
+msgstr "Whitespace-Änderungen beim Vergleich von Zeilen ignorieren"
+
+msgid "ignore changes in amount of whitespace"
+msgstr "Änderungen bei der Anzahl von Whitespace ignorieren"
+
+msgid "ignore changes in whitespace at EOL"
+msgstr "Whitespace-Änderungen am Zeilenende ignorieren"
+
+msgid "ignore carrier-return at the end of line"
+msgstr "den Zeilenumbruch am Ende der Zeile ignorieren"
+
+msgid "ignore changes whose lines are all blank"
+msgstr "Änderungen in leeren Zeilen ignorieren"
+
+msgid "<regex>"
+msgstr "<Regex>"
+
+msgid "ignore changes whose all lines match <regex>"
+msgstr ""
+"Änderungen ignorieren, bei denen alle Zeilen mit <Regex> übereinstimmen"
+
+msgid "heuristic to shift diff hunk boundaries for easy reading"
+msgstr ""
+"Heuristik, um Grenzen der Änderungsblöcke für bessere Lesbarkeit zu "
+"verschieben"
+
+msgid "generate diff using the \"patience diff\" algorithm"
+msgstr "Änderungen durch Nutzung des Algorithmus \"Patience Diff\" erzeugen"
+
+msgid "generate diff using the \"histogram diff\" algorithm"
+msgstr "Änderungen durch Nutzung des Algorithmus \"Histogram Diff\" erzeugen"
+
+msgid "<algorithm>"
+msgstr "<Algorithmus>"
+
+msgid "choose a diff algorithm"
+msgstr "einen Algorithmus für Änderungen wählen"
+
+msgid "<text>"
+msgstr "<Text>"
+
+msgid "generate diff using the \"anchored diff\" algorithm"
+msgstr "Änderungen durch Nutzung des Algorithmus \"Anchored Diff\" erzeugen"
+
+msgid "<mode>"
+msgstr "<Modus>"
+
+msgid "show word diff, using <mode> to delimit changed words"
+msgstr "Wort-Änderungen zeigen, nutze <Modus>, um Wörter abzugrenzen"
+
+msgid "use <regex> to decide what a word is"
+msgstr "<Regex> nutzen, um zu entscheiden, was ein Wort ist"
+
+msgid "equivalent to --word-diff=color --word-diff-regex=<regex>"
+msgstr "entsprechend wie --word-diff=color --word-diff-regex=<Regex>"
+
+msgid "moved lines of code are colored differently"
+msgstr "verschobene Codezeilen sind andersfarbig"
+
+msgid "how white spaces are ignored in --color-moved"
+msgstr "wie Whitespaces in --color-moved ignoriert werden"
+
+msgid "Other diff options"
+msgstr "Andere Diff-Optionen"
+
+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"
+
+msgid "treat all files as text"
+msgstr "alle Dateien als Text behandeln"
+
+msgid "swap two inputs, reverse the diff"
+msgstr "die beiden Eingaben vertauschen und die Änderungen umkehren"
+
+msgid "exit with 1 if there were differences, 0 otherwise"
+msgstr ""
+"mit Exit-Status 1 beenden, wenn Änderungen vorhanden sind, andernfalls mit 0"
+
+msgid "disable all output of the program"
+msgstr "alle Ausgaben vom Programm deaktivieren"
+
+msgid "allow an external diff helper to be executed"
+msgstr "erlaube die Ausführung eines externes Programms für Änderungen"
+
+msgid "run external text conversion filters when comparing binary files"
+msgstr ""
+"Führe externe Text-Konvertierungsfilter aus, wenn binäre Dateien vergleicht "
+"werden"
+
+msgid "<when>"
+msgstr "<wann>"
+
+msgid "ignore changes to submodules in the diff generation"
+msgstr ""
+"Änderungen in Submodulen während der Erstellung der Unterschiede ignorieren"
+
+msgid "<format>"
+msgstr "<Format>"
+
+msgid "specify how differences in submodules are shown"
+msgstr "angeben, wie Unterschiede in Submodulen gezeigt werden"
+
+msgid "hide 'git add -N' entries from the index"
+msgstr "'git add -N' Einträge vom Index verstecken"
+
+msgid "treat 'git add -N' entries as real in the index"
+msgstr "'git add -N' Einträge im Index als echt behandeln"
+
+msgid "<string>"
+msgstr "<Zeichenkette>"
+
+msgid ""
+"look for differences that change the number of occurrences of the specified "
+"string"
+msgstr ""
+"nach Unterschieden suchen, welche die Anzahl des Vorkommens der angegebenen "
+"Zeichenkette verändern"
+
+msgid ""
+"look for differences that change the number of occurrences of the specified "
+"regex"
+msgstr ""
+"nach Unterschieden suchen, welche die Anzahl des Vorkommens des angegebenen "
+"regulären Ausdrucks verändern"
+
+msgid "show all changes in the changeset with -S or -G"
+msgstr "alle Änderungen im Changeset mit -S oder -G anzeigen"
+
+msgid "treat <string> in -S as extended POSIX regular expression"
+msgstr ""
+"<Zeichenkette> bei -S als erweiterten POSIX regulären Ausdruck behandeln"
+
+msgid "control the order in which files appear in the output"
+msgstr ""
+"die Reihenfolge kontrollieren, in der die Dateien in der Ausgabe erscheinen"
+
+msgid "<path>"
+msgstr "<Pfad>"
+
+msgid "show the change in the specified path first"
+msgstr "die Änderung des angegebenen Pfades zuerst anzeigen"
+
+msgid "skip the output to the specified path"
+msgstr "überspringe die Ausgabe bis zum angegebenen Pfad"
+
+msgid "<object-id>"
+msgstr "<Objekt-ID>"
+
+msgid ""
+"look for differences that change the number of occurrences of the specified "
+"object"
+msgstr ""
+"nach Unterschieden suchen, welche die Anzahl des Vorkommens des angegebenen "
+"Objektes verändern"
+
+msgid "[(A|C|D|M|R|T|U|X|B)...[*]]"
+msgstr "[(A|C|D|M|R|T|U|X|B)...[*]]"
+
+msgid "select files by diff type"
+msgstr "Dateien anhand der Art der Änderung wählen"
+
+msgid "<file>"
+msgstr "<Datei>"
+
+msgid "output to a specific file"
+msgstr "Ausgabe zu einer bestimmten Datei"
+
+msgid "exhaustive rename detection was skipped due to too many files."
+msgstr ""
+"genaue Erkennung für Umbenennungen wurde aufgrund zu vieler Dateien\n"
+"übersprungen."
+
+msgid "only found copies from modified paths due to too many files."
+msgstr "nur Kopien von geänderten Pfaden, aufgrund zu vieler Dateien, gefunden"
+
+#, c-format
+msgid ""
+"you may want to set your %s variable to at least %d and retry the command."
+msgstr ""
+"Sie könnten die Variable %s auf mindestens %d setzen und den Befehl\n"
+"erneut versuchen."
+
+#, c-format
+msgid "failed to read orderfile '%s'"
+msgstr "Fehler beim Lesen der Reihenfolgedatei '%s'"
+
+msgid "Performing inexact rename detection"
+msgstr "Führe Erkennung für ungenaue Umbenennung aus"
+
+#, c-format
+msgid "No such path '%s' in the diff"
+msgstr "Pfad '%s' nicht im Diff gefunden"
+
+#, c-format
+msgid "pathspec '%s' did not match any file(s) known to git"
+msgstr "Pfadspezifikation '%s' stimmt mit keinen Git bekannten Dateien überein"
+
+#, c-format
+msgid "unrecognized pattern: '%s'"
+msgstr "unbekanntes Muster: '%s'"
+
+#, c-format
+msgid "unrecognized negative pattern: '%s'"
+msgstr "unbekanntes verneinendes Muster: '%s'"
+
+#, c-format
+msgid "your sparse-checkout file may have issues: pattern '%s' is repeated"
+msgstr ""
+"Ihre Datei für den partiellen Checkout hat eventuell Probleme:\n"
+"Muster '%s' wiederholt sich."
+
+msgid "disabling cone pattern matching"
+msgstr "deaktiviere Cone-Muster-Übereinstimmung"
+
+#, c-format
+msgid "cannot use %s as an exclude file"
+msgstr "kann %s nicht als exclude-Filter benutzen"
+
+msgid "failed to get kernel name and information"
+msgstr "Fehler beim Sammeln von Namen und Informationen zum Kernel"
+
+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"
+
+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."
+
+#, c-format
+msgid "index file corrupt in repo %s"
+msgstr "Index-Datei in Repository %s beschädigt"
+
+#, c-format
+msgid "could not create directories for %s"
+msgstr "Konnte Verzeichnisse für '%s' nicht erstellen"
+
+#, c-format
+msgid "could not migrate git directory from '%s' to '%s'"
+msgstr "Konnte Git-Verzeichnis nicht von '%s' nach '%s' migrieren"
+
+#, 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"
+
+msgid "Filtering content"
+msgstr "Filtere Inhalt"
+
+#, c-format
+msgid "could not stat file '%s'"
+msgstr "konnte Datei '%s' nicht lesen"
+
+#, c-format
+msgid "bad git namespace path \"%s\""
+msgstr "ungültiger Git-Namespace-Pfad \"%s\""
+
+#, c-format
+msgid "too many args to run %s"
+msgstr "zu viele Argumente angegeben, um %s auszuführen"
+
+msgid "git fetch-pack: expected shallow list"
+msgstr "git fetch-pack: erwartete shallow-Liste"
+
+msgid "git fetch-pack: expected a flush packet after shallow list"
+msgstr "git fetch-pack: erwartete ein Flush-Paket nach der shallow-Liste"
+
+msgid "git fetch-pack: expected ACK/NAK, got a flush packet"
+msgstr "git fetch-pack: ACK/NAK erwartet, Flush-Paket bekommen"
+
+#, c-format
+msgid "git fetch-pack: expected ACK/NAK, got '%s'"
+msgstr "git fetch-pack: ACK/NAK erwartet, '%s' bekommen"
+
+msgid "unable to write to remote"
+msgstr "konnte nicht zum Remote schreiben"
+
+#, c-format
+msgid "invalid shallow line: %s"
+msgstr "ungültige shallow-Zeile: %s"
+
+#, c-format
+msgid "invalid unshallow line: %s"
+msgstr "ungültige unshallow-Zeile: %s"
+
+#, c-format
+msgid "object not found: %s"
+msgstr "Objekt nicht gefunden: %s"
+
+#, c-format
+msgid "error in object: %s"
+msgstr "Fehler in Objekt: %s"
+
+#, c-format
+msgid "no shallow found: %s"
+msgstr "kein shallow-Objekt gefunden: %s"
+
+#, c-format
+msgid "expected shallow/unshallow, got %s"
+msgstr "shallow/unshallow erwartet, %s bekommen"
+
+#, c-format
+msgid "got %s %d %s"
+msgstr "%s %d %s bekommen"
+
+#, c-format
+msgid "invalid commit %s"
+msgstr "ungültiger Commit %s"
+
+msgid "giving up"
+msgstr "gebe auf"
+
+msgid "done"
+msgstr "fertig"
+
+#, c-format
+msgid "got %s (%d) %s"
+msgstr "%s (%d) %s bekommen"
+
+#, c-format
+msgid "Marking %s as complete"
+msgstr "Markiere %s als vollständig"
+
+#, c-format
+msgid "already have %s (%s)"
+msgstr "habe %s (%s) bereits"
+
+msgid "fetch-pack: unable to fork off sideband demultiplexer"
+msgstr "fetch-pack: Fehler beim Starten des sideband demultiplexer"
+
+msgid "protocol error: bad pack header"
+msgstr "Protokollfehler: ungültiger Pack-Header"
+
+#, c-format
+msgid "fetch-pack: unable to fork off %s"
+msgstr "fetch-pack: konnte %s nicht starten"
+
+msgid "fetch-pack: invalid index-pack output"
+msgstr "fetch-pack: ungültige index-pack Ausgabe"
+
+#, c-format
+msgid "%s failed"
+msgstr "%s fehlgeschlagen"
+
+msgid "error in sideband demultiplexer"
+msgstr "Fehler in sideband demultiplexer"
+
+#, c-format
+msgid "Server version is %.*s"
+msgstr "Server-Version ist %.*s"
+
+#, c-format
+msgid "Server supports %s"
+msgstr "Server unterstützt %s"
+
+msgid "Server does not support shallow clients"
+msgstr "Server unterstützt keine shallow-Clients"
+
+msgid "Server does not support --shallow-since"
+msgstr "Server unterstützt kein --shallow-since"
+
+msgid "Server does not support --shallow-exclude"
+msgstr "Server unterstützt kein --shallow-exclude"
+
+msgid "Server does not support --deepen"
+msgstr "Server unterstützt kein --deepen"
+
+msgid "Server does not support this repository's object format"
+msgstr "Server unterstützt das Objekt-Format dieses Repositories nicht"
+
+msgid "no common commits"
+msgstr "keine gemeinsamen Commits"
+
+msgid "git fetch-pack: fetch failed."
+msgstr "git fetch-pack: Abholen fehlgeschlagen."
+
+#, c-format
+msgid "mismatched algorithms: client %s; server %s"
+msgstr "Algorithmen stimmen nicht überein: Client %s; Server %s"
+
+#, c-format
+msgid "the server does not support algorithm '%s'"
+msgstr "der Server unterstützt Algorithmus '%s' nicht"
+
+msgid "Server does not support shallow requests"
+msgstr "Server unterstützt keine shallow-Anfragen"
+
+msgid "Server supports filter"
+msgstr "Server unterstützt Filter"
+
+msgid "unable to write request to remote"
+msgstr "konnte Anfrage nicht zum Remote schreiben"
+
+#, c-format
+msgid "expected '%s', received '%s'"
+msgstr "'%s' erwartet, '%s' empfangen"
+
+#, c-format
+msgid "expected '%s'"
+msgstr "'%s' erwartet"
+
+#, c-format
+msgid "unexpected acknowledgment line: '%s'"
+msgstr "Unerwartete Acknowledgment-Zeile: '%s'"
+
+#, c-format
+msgid "error processing acks: %d"
+msgstr "Fehler beim Verarbeiten von ACKS: %d"
+
+#. TRANSLATORS: The parameter will be 'ready', a protocol
+#. keyword.
+#.
+#, c-format
+msgid "expected packfile to be sent after '%s'"
+msgstr "erwartete Versand einer Packdatei nach '%s'"
+
+#. TRANSLATORS: The parameter will be 'ready', a protocol
+#. keyword.
+#.
+#, c-format
+msgid "expected no other sections to be sent after no '%s'"
+msgstr "erwartete keinen Versand anderer Sektionen nach keinem '%s'"
+
+#, c-format
+msgid "error processing shallow info: %d"
+msgstr "Fehler beim Verarbeiten von Shallow-Informationen: %d"
+
+#, c-format
+msgid "expected wanted-ref, got '%s'"
+msgstr "wanted-ref erwartet, '%s' bekommen"
+
+#, c-format
+msgid "unexpected wanted-ref: '%s'"
+msgstr "unerwartetes wanted-ref: '%s'"
+
+#, c-format
+msgid "error processing wanted refs: %d"
+msgstr "Fehler beim Verarbeiten von wanted-refs: %d"
+
+msgid "git fetch-pack: expected response end packet"
+msgstr "git fetch-pack: Antwort-Endpaket erwartet"
+
+msgid "no matching remote head"
+msgstr "kein übereinstimmender Remote-Branch"
+
+msgid "unexpected 'ready' from remote"
+msgstr "unerwartetes 'ready' von Remote-Repository"
+
+#, c-format
+msgid "no such remote ref %s"
+msgstr "Remote-Referenz %s nicht gefunden"
+
+#, c-format
+msgid "Server does not allow request for unadvertised object %s"
+msgstr "Der Server lehnt Anfrage nach nicht angebotenem Objekt %s ab."
+
+#, c-format
+msgid "fsmonitor_ipc__send_query: invalid path '%s'"
+msgstr "fsmonitor_ipc__send_query: ungültiger Pfad '%s'"
+
+#, c-format
+msgid "fsmonitor_ipc__send_query: unspecified error on '%s'"
+msgstr "fsmonitor_ipc__send_query: nicht spezifizierter Fehler bei '%s'"
+
+msgid "fsmonitor--daemon is not running"
+msgstr "fsmonitor--daemon läuft nicht"
+
+#, c-format
+msgid "could not send '%s' command to fsmonitor--daemon"
+msgstr "konnte '%s' Befehl nicht an fsmonitor--daemon senden"
+
+#, c-format
+msgid "bare repository '%s' is incompatible with fsmonitor"
+msgstr "Bare-Repository '%s' ist inkompatibel mit fsmonitor"
+
+#, c-format
+msgid "repository '%s' is incompatible with fsmonitor due to errors"
+msgstr "Repository '%s' ist wegen Fehler inkompatibel mit fsmonitor"
+
+#, c-format
+msgid "remote repository '%s' is incompatible with fsmonitor"
+msgstr "Remote-Repository '%s' ist inkompatibel mit fsmonitor"
+
+#, c-format
+msgid "virtual repository '%s' is incompatible with fsmonitor"
+msgstr "virtuelles Repository '%s' ist inkompatibel mit fsmonitor"
+
+#, c-format
+msgid ""
+"repository '%s' is incompatible with fsmonitor due to lack of Unix sockets"
+msgstr ""
+"Repository '%s' is inkompatibel mit fsmonitor wegen fehlender Unix sockets"
+
+msgid ""
+"git [-v | --version] [-h | --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"
+"           [--git-dir=<path>] [--work-tree=<path>] [--namespace=<name>]\n"
+"           [--super-prefix=<path>] [--config-env=<name>=<envvar>]\n"
+"           <command> [<args>]"
+msgstr ""
+"git [-v | --version] [-h | --help] [-C <Pfad>] [-c <Name>=<Wert>]\n"
+"           [--exec-path[=<Pfad>]] [--html-path] [--man-path] [--info-path]\n"
+"           [-p | --paginate | -P | --no-pager] [--no-replace-objects] [--"
+"bare]\n"
+"           [--git-dir=<Pfad>] [--work-tree=<Pfad>] [--namespace=<Name>]\n"
+"           [--super-prefix=<Pfad>] [--config-env=<Name>=<Variable>]\n"
+"           <Befehl> [<Argumente>]"
+
+msgid ""
+"'git help -a' and 'git help -g' list available subcommands and some\n"
+"concept guides. See 'git help <command>' or 'git help <concept>'\n"
+"to read about a specific subcommand or concept.\n"
+"See 'git help git' for an overview of the system."
+msgstr ""
+"'git help -a' und 'git help -g' listet verfügbare Unterbefehle und\n"
+"einige Anleitungen zu Git-Konzepten auf. Benutzen Sie 'git help <Befehl>'\n"
+"oder 'git help <Konzept>', um mehr über einen spezifischen Befehl oder\n"
+"Konzept zu erfahren.\n"
+"Benutzen Sie 'git help git' für einen Überblick des Systems."
+
+#, c-format
+msgid "unsupported command listing type '%s'"
+msgstr "Nicht unterstützte Art zur Befehlsauflistung '%s'."
+
+#, c-format
+msgid "no directory given for '%s' option\n"
+msgstr "kein Verzeichnis für Option '%s' angegeben\n"
+
+#, c-format
+msgid "no namespace given for --namespace\n"
+msgstr "Kein Namespace für --namespace angegeben.\n"
+
+#, c-format
+msgid "no prefix given for --super-prefix\n"
+msgstr "Kein Präfix für --super-prefix angegeben.\n"
+
+#, c-format
+msgid "-c expects a configuration string\n"
+msgstr "-c erwartet einen Konfigurationsstring.\n"
+
+#, c-format
+msgid "no config key given for --config-env\n"
+msgstr "kein Konfigurationsschlüssel für --config-env angegeben\n"
+
+#, c-format
+msgid "unknown option: %s\n"
+msgstr "Unbekannte Option: %s\n"
+
+#, c-format
+msgid "while expanding alias '%s': '%s'"
+msgstr "beim Erweitern von Alias '%s': '%s'"
+
+#, c-format
+msgid ""
+"alias '%s' changes environment variables.\n"
+"You can use '!git' in the alias to do this"
+msgstr ""
+"Alias '%s' ändert Umgebungsvariablen.\n"
+"Sie können '!git' im Alias benutzen, um dies zu tun."
+
+#, c-format
+msgid "empty alias for %s"
+msgstr "leerer Alias für %s"
+
+#, c-format
+msgid "recursive alias: %s"
+msgstr "rekursiver Alias: %s"
+
+msgid "write failure on standard output"
+msgstr "Fehler beim Schreiben in die Standard-Ausgabe."
+
+msgid "unknown write failure on standard output"
+msgstr "Unbekannter Fehler beim Schreiben in die Standard-Ausgabe."
+
+msgid "close failed on standard output"
+msgstr "Fehler beim Schließen der Standard-Ausgabe."
+
+#, 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"
+
+#, c-format
+msgid "cannot handle %s as a builtin"
+msgstr "Kann %s nicht als eingebauten Befehl behandeln."
+
+#, c-format
+msgid ""
+"usage: %s\n"
+"\n"
+msgstr ""
+"Verwendung: %s\n"
+"\n"
+
+#, 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"
+
+#, c-format
+msgid "failed to run command '%s': %s\n"
+msgstr "Fehler beim Ausführen von Befehl '%s': %s\n"
+
+msgid "could not create temporary file"
+msgstr "konnte temporäre Datei nicht erstellen"
+
+#, c-format
+msgid "failed writing detached signature to '%s'"
+msgstr "Fehler beim Schreiben der losgelösten Signatur nach '%s'"
+
+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"
+
+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+)"
+
+#, c-format
+msgid "ssh signing revocation file configured but not found: %s"
+msgstr "SSH-Signatursperrdatei konfiguriert, aber nicht gefunden: %s"
+
+#, c-format
+msgid "bad/incompatible signature '%s'"
+msgstr "fehlerhafte/inkompatible Signatur '%s'"
+
+#, c-format
+msgid "failed to get the ssh fingerprint for key '%s'"
+msgstr "konnte SSH-Fingerabdruck für Schlüssel '%s' nicht bekommen"
+
+msgid ""
+"either user.signingkey or gpg.ssh.defaultKeyCommand needs to be configured"
+msgstr ""
+"entweder user.signingkey oder gpg.ssh.defaultKeyCommand muss konfiguriert "
+"sein"
+
+#, 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"
+
+#, c-format
+msgid "gpg.ssh.defaultKeyCommand failed: %s %s"
+msgstr "gpg.ssh.defaultKeyCommand fehlgeschlagen: %s %s"
+
+msgid "gpg failed to sign the data"
+msgstr "gpg beim Signieren der Daten fehlgeschlagen"
+
+msgid "user.signingKey needs to be set for ssh signing"
+msgstr "user.signingKey muss für die SSH-Signatur gesetzt sein"
+
+#, c-format
+msgid "failed writing ssh signing key to '%s'"
+msgstr "Fehler beim Schreiben des SSH-Signaturschlüssels nach '%s'"
+
+#, c-format
+msgid "failed writing ssh signing key buffer to '%s'"
+msgstr "Fehler beim Schreiben des SSH-Signaturschlüsselpuffers nach '%s'"
+
+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+)"
+
+#, c-format
+msgid "failed reading ssh signing data buffer from '%s'"
+msgstr "Fehler beim Lesen des SSH-Signaturdatenpuffers von '%s'"
+
+#, c-format
+msgid "ignored invalid color '%.*s' in log.graphColors"
+msgstr "ungültige Farbe '%.*s' in log.graphColors ignoriert"
+
+msgid ""
+"given pattern contains NULL byte (via -f <file>). This is only supported "
+"with -P under PCRE v2"
+msgstr ""
+"Angegebenes Muster enthält NULL Byte (über -f <Datei>). Das wird nur mit -"
+"Punter PCRE v2 unterstützt."
+
+#, c-format
+msgid "'%s': unable to read %s"
+msgstr "'%s': konnte %s nicht lesen"
+
+#, c-format
+msgid "'%s': short read"
+msgstr "'%s': read() zu kurz"
+
+msgid "start a working area (see also: git help tutorial)"
+msgstr "Arbeitsverzeichnis anlegen (siehe auch: git help tutorial)"
+
+msgid "work on the current change (see also: git help everyday)"
+msgstr "an aktuellen Änderungen arbeiten (siehe auch: git help everyday)"
+
+msgid "examine the history and state (see also: git help revisions)"
+msgstr "Historie und Status untersuchen (siehe auch: git help revisions)"
+
+msgid "grow, mark and tweak your common history"
+msgstr "Historie erweitern und bearbeiten"
+
+msgid "collaborate (see also: git help workflows)"
+msgstr "mit anderen zusammenarbeiten (siehe auch: git help workflows)"
+
+msgid "Main Porcelain Commands"
+msgstr "Hauptbefehle"
+
+msgid "Ancillary Commands / Manipulators"
+msgstr "Nebenbefehle / Manipulationen"
+
+msgid "Ancillary Commands / Interrogators"
+msgstr "Nebenbefehle / Abfragen"
+
+msgid "Interacting with Others"
+msgstr "mit anderen interagieren"
+
+msgid "Low-level Commands / Manipulators"
+msgstr "Systembefehle / Manipulationen"
+
+msgid "Low-level Commands / Interrogators"
+msgstr "Systembefehle / Abfragen"
+
+msgid "Low-level Commands / Syncing Repositories"
+msgstr "Systembefehle / Repositories synchronisieren"
+
+msgid "Low-level Commands / Internal Helpers"
+msgstr "Systembefehle / Interne Hilfsbefehle"
+
+#, c-format
+msgid "available git commands in '%s'"
+msgstr "Vorhandene Git-Befehle in '%s'"
+
+msgid "git commands available from elsewhere on your $PATH"
+msgstr "Vorhandene Git-Befehle anderswo in Ihrem $PATH"
+
+msgid "These are common Git commands used in various situations:"
+msgstr "Allgemeine Git-Befehle, verwendet in verschiedenen Situationen:"
+
+msgid "The Git concept guides are:"
+msgstr "Die Git-Konzeptanleitungen sind:"
+
+msgid "External commands"
+msgstr "Externe Befehle"
+
+msgid "Command aliases"
+msgstr "Alias-Befehle"
+
+msgid "See 'git help <command>' to read about a specific subcommand"
+msgstr ""
+"Siehe 'git help <Befehl>', um mehr über einen spezifischen Unterbefehl zu "
+"lesen."
+
+#, c-format
+msgid ""
+"'%s' appears to be a git command, but we were not\n"
+"able to execute it. Maybe git-%s is broken?"
+msgstr ""
+"'%s' scheint ein git-Befehl zu sein, konnte aber\n"
+"nicht ausgeführt werden. Vielleicht ist git-%s fehlerhaft?"
+
+#, c-format
+msgid "git: '%s' is not a git command. See 'git --help'."
+msgstr "git: '%s' ist kein Git-Befehl. Siehe 'git --help'."
+
+msgid "Uh oh. Your system reports no Git commands at all."
+msgstr "Uh oh. Keine Git-Befehle auf Ihrem System vorhanden."
+
+#, 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."
+
+#, c-format
+msgid "Continuing under the assumption that you meant '%s'."
+msgstr "Setze fort unter der Annahme, dass Sie '%s' meinten."
+
+#, c-format
+msgid "Run '%s' instead [y/N]? "
+msgstr "Stattdessen '%s' ausführen (y/N)? "
+
+#, 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."
+
+msgid ""
+"\n"
+"The most similar command is"
+msgid_plural ""
+"\n"
+"The most similar commands are"
+msgstr[0] ""
+"\n"
+"Der ähnlichste Befehl ist"
+msgstr[1] ""
+"\n"
+"Die ähnlichsten Befehle sind"
+
+msgid "git version [<options>]"
+msgstr "git version [<Optionen>]"
+
+#, c-format
+msgid "%s: %s - %s"
+msgstr "%s: %s - %s"
+
+msgid ""
+"\n"
+"Did you mean this?"
+msgid_plural ""
+"\n"
+"Did you mean one of these?"
+msgstr[0] ""
+"\n"
+"Haben Sie das gemeint?"
+msgstr[1] ""
+"\n"
+"Haben Sie eines von diesen gemeint?"
+
+#, 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."
+
+#, c-format
+msgid "Couldn't start hook '%s'\n"
+msgstr "Konnte Hook '%s' nicht starten\n"
+
+#, c-format
+msgid "argument to --packfile must be a valid hash (got '%s')"
+msgstr "Argument für --packfile muss ein gültiger Hash sein ('%s' erhalten)"
+
+msgid "not a git repository"
+msgstr "kein Git-Repository"
+
+#, c-format
+msgid "negative value for http.postBuffer; defaulting to %d"
+msgstr "negativer Wert für http.postBuffer; benutze Standardwert %d"
+
+msgid "Delegation control is not supported with cURL < 7.22.0"
+msgstr "Kontrolle über Delegation wird mit cURL < 7.22.0 nicht unterstützt"
+
+msgid "Public key pinning not supported with cURL < 7.39.0"
+msgstr ""
+"Das Anheften des öffentlichen Schlüssels wird mit cURL < 7.39.0 nicht "
+"unterstützt"
+
+msgid "CURLSSLOPT_NO_REVOKE not supported with cURL < 7.44.0"
+msgstr "CURLSSLOPT_NO_REVOKE wird mit cURL < 7.44.0 nicht unterstützt."
+
+#, c-format
+msgid "Unsupported SSL backend '%s'. Supported SSL backends:"
+msgstr "Nicht unterstütztes SSL-Backend '%s'. Unterstützte SSL-Backends:"
+
+#, 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."
+
+#, c-format
+msgid "Could not set SSL backend to '%s': already set"
+msgstr "Konnte SSL-Backend nicht zu '%s' setzen: bereits gesetzt"
+
+#, c-format
+msgid ""
+"unable to update url base from redirection:\n"
+"  asked for: %s\n"
+"   redirect: %s"
+msgstr ""
+"Konnte Basis-URL nicht durch Umleitung aktualisieren:\n"
+"  gefragt nach: %s\n"
+"    umgeleitet: %s"
+
+msgid "Author identity unknown\n"
+msgstr "Identität des Autors unbekannt\n"
+
+msgid "Committer identity unknown\n"
+msgstr "Identität des Commit-Erstellers unbekannt\n"
+
+msgid ""
+"\n"
+"*** Please tell me who you are.\n"
+"\n"
+"Run\n"
+"\n"
+"  git config --global user.email \"you@example.com\"\n"
+"  git config --global user.name \"Your Name\"\n"
+"\n"
+"to set your account's default identity.\n"
+"Omit --global to set the identity only in this repository.\n"
+"\n"
+msgstr ""
+"\n"
+"*** Bitte geben Sie an, wer Sie sind.\n"
+"\n"
+"Führen Sie\n"
+"\n"
+"  git config --global user.email \"you@example.com\"\n"
+"  git config --global user.name \"Your Name\"\n"
+"\n"
+"aus, um das als Ihre standardmäßige Identität zu setzen.\n"
+"Lassen Sie die Option \"--global\" weg, um die Identität nur\n"
+"für dieses Repository zu setzen.\n"
+
+msgid "no email was given and auto-detection is disabled"
+msgstr "keine E-Mail angegeben und automatische Erkennung ist deaktiviert"
+
+#, c-format
+msgid "unable to auto-detect email address (got '%s')"
+msgstr "Konnte die E-Mail-Adresse nicht automatisch erkennen ('%s' erhalten)"
+
+msgid "no name was given and auto-detection is disabled"
+msgstr "kein Name angegeben und automatische Erkennung ist deaktiviert"
+
+#, c-format
+msgid "unable to auto-detect name (got '%s')"
+msgstr "konnte Namen nicht automatisch erkennen ('%s' erhalten)"
+
+#, c-format
+msgid "empty ident name (for <%s>) not allowed"
+msgstr "Leerer Name in Identifikation (für <%s>) nicht erlaubt."
+
+#, c-format
+msgid "name consists only of disallowed characters: %s"
+msgstr "Name besteht nur aus nicht erlaubten Zeichen: %s"
+
+msgid "expected 'tree:<depth>'"
+msgstr "'tree:<Tiefe>' erwartet"
+
+msgid "sparse:path filters support has been dropped"
+msgstr "Keine Unterstützung für sparse:path Filter mehr"
+
+#, c-format
+msgid "'%s' for 'object:type=<type>' is not a valid object type"
+msgstr "'%s' für 'object:type=<Typ>' ist kein gültiger Objekttyp"
+
+#, c-format
+msgid "invalid filter-spec '%s'"
+msgstr "Ungültige filter-spec '%s'"
+
+#, c-format
+msgid "must escape char in sub-filter-spec: '%c'"
+msgstr "Zeichen in sub-filter-spec muss maskiert werden: '%c'"
+
+msgid "expected something after combine:"
+msgstr "erwartete etwas nach 'combine:'"
+
+msgid "multiple filter-specs cannot be combined"
+msgstr "mehrere filter-specs können nicht kombiniert werden"
+
+msgid "unable to upgrade repository format to support partial clone"
+msgstr ""
+"Repository-Format konnte nicht erweitert werden, um partielles Klonen zu "
+"unterstützen"
+
+msgid "args"
+msgstr "Argumente"
+
+msgid "object filtering"
+msgstr "Filtern nach Objekten"
+
+#, c-format
+msgid "unable to access sparse blob in '%s'"
+msgstr "konnte nicht auf partiellen Blob '%s' zugreifen"
+
+#, c-format
+msgid "unable to parse sparse filter data in %s"
+msgstr "konnte partielle Filter-Daten in %s nicht parsen"
+
+#, c-format
+msgid "entry '%s' in tree %s has tree mode, but is not a tree"
+msgstr ""
+"Eintrag '%s' im Tree-Objekt %s hat Tree-Modus, aber ist kein Tree-Objekt"
+
+#, c-format
+msgid "entry '%s' in tree %s has blob mode, but is not a blob"
+msgstr "Eintrag '%s' im Tree-Objekt %s hat Blob-Modus, aber ist kein Blob"
+
+#, c-format
+msgid "unable to load root tree for commit %s"
+msgstr "Konnte Root-Tree-Objekt für Commit %s nicht laden."
+
+#, c-format
+msgid ""
+"Unable to create '%s.lock': %s.\n"
+"\n"
+"Another git process seems to be running in this repository, e.g.\n"
+"an editor opened by 'git commit'. Please make sure all processes\n"
+"are terminated then try again. If it still fails, a git process\n"
+"may have crashed in this repository earlier:\n"
+"remove the file manually to continue."
+msgstr ""
+"Konnte '%s.lock' nicht erstellen: %s.\n"
+"\n"
+"Ein anderer Git-Prozess scheint in diesem Repository ausgeführt\n"
+"zu werden, zum Beispiel ein noch offener Editor von 'git commit'.\n"
+"Bitte stellen Sie sicher, dass alle Prozesse beendet wurden und\n"
+"versuchen Sie es erneut. Falls es immer noch fehlschlägt, könnte\n"
+"ein früherer Git-Prozess in diesem Repository abgestürzt sein:\n"
+"Löschen Sie die Datei manuell um fortzufahren."
+
+#, c-format
+msgid "Unable to create '%s.lock': %s"
+msgstr "Konnte '%s.lock' nicht erstellen: %s"
+
+#, c-format
+msgid "unexpected line: '%s'"
+msgstr "unerwartete Zeile: '%s'"
+
+msgid "expected flush after ls-refs arguments"
+msgstr "erwartete Flush nach Argumenten für die Auflistung der Referenzen"
+
+msgid "quoted CRLF detected"
+msgstr "angeführtes CRLF entdeckt"
+
+#, c-format
+msgid ""
+"Your local changes to the following files would be overwritten by merge:\n"
+"  %s"
+msgstr ""
+"Ihre lokalen Änderungen in den folgenden Dateien würden durch den Merge\n"
+"überschrieben werden:\n"
+"  %s"
+
+#, c-format
+msgid "Failed to merge submodule %s (not checked out)"
+msgstr "Fehler beim Merge von Submodul %s (nicht ausgecheckt)."
+
+#, c-format
+msgid "Failed to merge submodule %s (commits not present)"
+msgstr "Fehler beim Merge von Submodul %s (Commits nicht vorhanden)."
+
+#, 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)"
+
+#, c-format
+msgid "Note: Fast-forwarding submodule %s to %s"
+msgstr "Hinweis: Spule Submodul %s vor zu %s"
+
+#, c-format
+msgid "Failed to merge submodule %s"
+msgstr "Fehler beim Zusammenführen von Submodul %s"
+
+#, c-format
+msgid ""
+"Failed to merge submodule %s, but a possible merge resolution exists:\n"
+"%s\n"
+msgstr ""
+"Fehler beim Zusammenführen von Submodul %s, aber es ist eine mögliche "
+"Auflösung des Merges vorhanden:\n"
+"%s\n"
+
+#, c-format
+msgid ""
+"If this is correct simply add it to the index for example\n"
+"by using:\n"
+"\n"
+"  git update-index --cacheinfo 160000 %s \"%s\"\n"
+"\n"
+"which will accept this suggestion.\n"
+msgstr ""
+"Falls das korrekt ist, fügen Sie es einfach der Staging-Area, zum Beispiel "
+"mit:\n"
+"\n"
+"  git update-index --cacheinfo 160000 %s \"%s\"\n"
+"\n"
+"hinzu, um diesen Vorschlag zu akzeptieren.\n"
+
+#, c-format
+msgid ""
+"Failed to merge submodule %s, but multiple possible merges exist:\n"
+"%s"
+msgstr ""
+"Fehler beim Zusammenführen von Submodul %s, aber mehrere mögliche Merges "
+"sind vorhanden:\n"
+"%s"
+
+msgid "Failed to execute internal merge"
+msgstr "Fehler bei Ausführung des internen Merges"
+
+#, c-format
+msgid "Unable to add %s to database"
+msgstr "Konnte %s nicht zur Datenbank hinzufügen"
+
+#, c-format
+msgid "Auto-merging %s"
+msgstr "automatischer Merge von %s"
+
+#, 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 ""
+"KONFLIKT (implizite Verzeichnisumbenennung): Existierende Datei/Pfad bei %s "
+"im\n"
+"Weg von impliziter Verzeichnisumbenennung, die versucht, einen oder mehrere\n"
+"Pfade dahin zu setzen: %s."
+
+#, 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 ""
+"KONFLIKT (implizite Verzeichnisumbenennung): Kann nicht mehr als ein Pfad "
+"zu\n"
+"%s mappen; implizite Verzeichnisumbenennungen versuchten diese Pfade dahin\n"
+"zu setzen: %s"
+
+#, c-format
+msgid ""
+"CONFLICT (directory rename split): Unclear where to rename %s to; it was "
+"renamed to multiple other directories, with no destination getting a "
+"majority of the files."
+msgstr ""
+"KONFLIKT (Aufteilung Verzeichnisumbenennung): Unklar, wo %s zu platzieren "
+"ist; es wurde zu mehreren anderen Verzeichnissen umbenannt, ohne dass ein "
+"Ziel die Mehrheit der Dateien erhält."
+
+#, c-format
+msgid ""
+"WARNING: Avoiding applying %s -> %s rename to %s, because %s itself was "
+"renamed."
+msgstr ""
+"WARNUNG: Vermeide Umbenennung %s -> %s von %s, weil %s selbst umbenannt "
+"wurde."
+
+#, c-format
+msgid ""
+"Path updated: %s added in %s inside a directory that was renamed in %s; "
+"moving it to %s."
+msgstr ""
+"Pfad aktualisiert: %s hinzugefügt in %s innerhalb eines Verzeichnisses, das "
+"umbenannt wurde in %s; verschiebe es nach %s."
+
+#, c-format
+msgid ""
+"Path updated: %s renamed to %s in %s, inside a directory that was renamed in "
+"%s; moving it to %s."
+msgstr ""
+"Pfad aktualisiert: %s umbenannt nach %s in %s, innerhalb eines "
+"Verzeichnisses, das umbenannt wurde in %s; verschiebe es nach %s."
+
+#, 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 ""
+"KONFLIKT (Speicherort): %s hinzugefügt in %s innerhalb eines Verzeichnisses, "
+"das umbenannt wurde in %s, es sollte vielleicht nach %s verschoben werden."
+
+#, 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 ""
+"KONFLIKT (Speicherort): %s umbenannt nach %s in %s, innerhalb eines "
+"Verzeichnisses, das umbenannt wurde in %s, es sollte vielleicht nach %s "
+"verschoben werden."
+
+#, 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."
+
+#, 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."
+msgstr ""
+"KONFLIKT (Umbenennung in Kollision beteiligt): Umbenennung von %s -> %s hat "
+"Inhaltskonflikte UND kollidiert mit einem anderen Pfad; dies kann zu "
+"verschachtelten Konfliktmarkierungen führen."
+
+#, 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."
+
+#, c-format
+msgid "cannot read object %s"
+msgstr "kann Objekt %s nicht lesen"
+
+#, c-format
+msgid "object %s is not a blob"
+msgstr "Objekt %s ist kein Blob"
+
+#, c-format
+msgid ""
+"CONFLICT (file/directory): directory in the way of %s from %s; moving it to "
+"%s instead."
+msgstr ""
+"KONFLIKT (Datei/Verzeichnis): Verzeichnis im Weg von %s aus %s; stattdessen "
+"nach %s verschieben."
+
+#, c-format
+msgid ""
+"CONFLICT (distinct types): %s had different types on each side; renamed both "
+"of them so each can be recorded somewhere."
+msgstr ""
+"KONFLIKT (verschiedene Typen): %s hatte unterschiedliche Typen auf jeder "
+"Seite; beide wurden umbenannt, damit jeder irgendwo aufgezeichnet werden "
+"kann."
+
+#, 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 (verschiedene Typen): %s hatte unterschiedliche Typen auf jeder "
+"Seite; eines der beiden wurde umbenannt, damit jeder irgendwo aufgezeichnet "
+"werden kann."
+
+msgid "content"
+msgstr "Inhalt"
+
+msgid "add/add"
+msgstr "hinzufügen/hinzufügen"
+
+msgid "submodule"
+msgstr "Submodul"
+
+#, c-format
+msgid "CONFLICT (%s): Merge conflict in %s"
+msgstr "KONFLIKT (%s): Merge-Konflikt in %s"
+
+#, c-format
+msgid ""
+"CONFLICT (modify/delete): %s deleted in %s and modified in %s.  Version %s "
+"of %s left in tree."
+msgstr ""
+"KONFLIKT (ändern/löschen): %s gelöscht in %s und geändert in %s. Stand %s "
+"von %s wurde im Arbeitsbereich gelassen."
+
+#, c-format
+msgid ""
+"Note: %s not up to date and in way of checking out conflicted version; old "
+"copy renamed to %s"
+msgstr ""
+"Hinweis: %s nicht aktuell und konfliktbehaftete Version während des "
+"Auscheckens; alte Kopie zu %s umbenannt"
+
+#. TRANSLATORS: The %s arguments are: 1) tree hash of a merge
+#. base, and 2-3) the trees for the two trees we're merging.
+#.
+#, 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"
+
+msgid "(bad commit)\n"
+msgstr "(ungültiger Commit)\n"
+
+#, c-format
+msgid "add_cacheinfo failed for path '%s'; merge aborting."
+msgstr "add_cacheinfo für Pfad '%s' fehlgeschlagen; Merge wird abgebrochen."
+
+#, 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."
+
+#, c-format
+msgid "failed to create path '%s'%s"
+msgstr "Fehler beim Erstellen des Pfades '%s'%s"
+
+#, c-format
+msgid "Removing %s to make room for subdirectory\n"
+msgstr "Entferne %s, um Platz für Unterverzeichnis zu schaffen\n"
+
+msgid ": perhaps a D/F conflict?"
+msgstr ": vielleicht ein Verzeichnis/Datei-Konflikt?"
+
+#, c-format
+msgid "refusing to lose untracked file at '%s'"
+msgstr "verweigere, da unversionierte Dateien in '%s' verloren gehen würden"
+
+#, c-format
+msgid "blob expected for %s '%s'"
+msgstr "Blob erwartet für %s '%s'"
+
+#, c-format
+msgid "failed to open '%s': %s"
+msgstr "Fehler beim Öffnen von '%s': %s"
+
+#, c-format
+msgid "failed to symlink '%s': %s"
+msgstr "Fehler beim Erstellen einer symbolischen Verknüpfung für '%s': %s"
+
+#, c-format
+msgid "do not know what to do with %06o %s '%s'"
+msgstr "weiß nicht was mit %06o %s '%s' zu machen ist"
+
+#, c-format
+msgid "Fast-forwarding submodule %s to the following commit:"
+msgstr "Spule Submodul %s zu dem folgenden Commit vor:"
+
+#, c-format
+msgid "Fast-forwarding submodule %s"
+msgstr "Spule Submodul %s vor"
+
+#, 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)"
+
+#, c-format
+msgid "Failed to merge submodule %s (not fast-forward)"
+msgstr "Fehler beim Merge von Submodul %s (kein Vorspulen)"
+
+msgid "Found a possible merge resolution for the submodule:\n"
+msgstr "Mögliche Auflösung des Merges für Submodul gefunden:\n"
+
+#, c-format
+msgid "Failed to merge submodule %s (multiple merges found)"
+msgstr "Fehler beim Merge von Submodul %s (mehrere Merges gefunden)"
+
+#, 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."
+
+#, c-format
+msgid ""
+"CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s left "
+"in tree."
+msgstr ""
+"KONFLIKT (%s/löschen): %s gelöscht in %s und %s in %s. Stand %s von %s wurde "
+"im Arbeitsbereich gelassen."
+
+#, c-format
+msgid ""
+"CONFLICT (%s/delete): %s deleted in %s and %s to %s in %s. Version %s of %s "
+"left in tree."
+msgstr ""
+"KONFLIKT (%s/löschen): %s gelöscht in %s und %s nach %s in %s. Stand %s von "
+"%s wurde im Arbeitsbereich gelassen."
+
+#, c-format
+msgid ""
+"CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s left "
+"in tree at %s."
+msgstr ""
+"KONFLIKT (%s/löschen): %s gelöscht in %s und %s in %s. Stand %s von %s wurde "
+"im Arbeitsbereich bei %s gelassen."
+
+#, 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 ""
+"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."
+
+msgid "rename"
+msgstr "umbenennen"
+
+msgid "renamed"
+msgstr "umbenannt"
+
+#, c-format
+msgid "Refusing to lose dirty file at %s"
+msgstr "Verweigere geänderte Datei bei %s zu verlieren."
+
+#, 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."
+
+#, 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"
+
+#, 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"
+
+#, 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"
+
+#, c-format
+msgid ""
+"CONFLICT (rename/rename): Rename \"%s\"->\"%s\" in branch \"%s\" rename "
+"\"%s\"->\"%s\" in \"%s\"%s"
+msgstr ""
+"KONFLIKT (umbenennen/umbenennen): Benenne um \"%s\"->\"%s\" in Branch \"%s\" "
+"und \"%s\"->\"%s\" in Branch \"%s\"%s"
+
+msgid " (left unresolved)"
+msgstr " (bleibt unaufgelöst)"
+
+#, 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"
+
+#, c-format
+msgid ""
+"CONFLICT (directory rename split): Unclear where to place %s because "
+"directory %s was renamed to multiple other directories, with no destination "
+"getting a majority of the files."
+msgstr ""
+"KONFLIKT (Aufteilung Verzeichnisumbenennung): Unklar, wo %s zu platzieren "
+"ist,\n"
+"weil Verzeichnis %s zu mehreren anderen Verzeichnissen umbenannt wurde, "
+"wobei\n"
+"keines dieser Ziele die Mehrheit der Dateien erhielt."
+
+#, c-format
+msgid ""
+"CONFLICT (rename/rename): Rename directory %s->%s in %s. Rename directory %s-"
+">%s in %s"
+msgstr ""
+"KONFLIKT (umbenennen/umbenennen): Benenne Verzeichnis um %s->%s in %s.\n"
+"Benenne Verzeichnis um %s->%s in %s"
+
+msgid "modify"
+msgstr "ändern"
+
+msgid "modified"
+msgstr "geändert"
+
+#, c-format
+msgid "Skipped %s (merged same as existing)"
+msgstr "%s ausgelassen (Ergebnis des Merges existiert bereits)"
+
+#, c-format
+msgid "Adding as %s instead"
+msgstr "Füge stattdessen als %s hinzu"
+
+#, c-format
+msgid "Removing %s"
+msgstr "Entferne %s"
+
+msgid "file/directory"
+msgstr "Datei/Verzeichnis"
+
+msgid "directory/file"
+msgstr "Verzeichnis/Datei"
+
+#, 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."
+
+#, c-format
+msgid "Adding %s"
+msgstr "Füge %s hinzu"
+
+#, c-format
+msgid "CONFLICT (add/add): Merge conflict in %s"
+msgstr "KONFLIKT (hinzufügen/hinzufügen): Merge-Konflikt in %s"
+
+#, c-format
+msgid "merging of trees %s and %s failed"
+msgstr "Zusammenführen der \"Tree\"-Objekte %s und %s fehlgeschlagen"
+
+msgid "Merging:"
+msgstr "Merge:"
+
+#, 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"
+
+msgid "merge returned no commit"
+msgstr "Merge hat keinen Commit zurückgegeben"
+
+#, c-format
+msgid "Could not parse object '%s'"
+msgstr "Konnte Objekt '%s' nicht parsen."
+
+msgid "failed to read the cache"
+msgstr "Lesen des Zwischenspeichers fehlgeschlagen"
+
+msgid "multi-pack-index OID fanout is of the wrong size"
+msgstr "Multi-Pack-Index OID fanout hat die falsche Größe"
+
+#, c-format
+msgid "multi-pack-index file %s is too small"
+msgstr "Multi-Pack-Index-Datei %s ist zu klein."
+
+#, 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."
+
+#, c-format
+msgid "multi-pack-index version %d not recognized"
+msgstr "Multi-Pack-Index-Version %d nicht erkannt."
+
+#, 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"
+
+msgid "multi-pack-index missing required pack-name chunk"
+msgstr "Multi-Pack-Index fehlt erforderlicher Pack-Namen Chunk"
+
+msgid "multi-pack-index missing required OID fanout chunk"
+msgstr "Multi-Pack-Index fehlt erforderlicher OID fanout Chunk"
+
+msgid "multi-pack-index missing required OID lookup chunk"
+msgstr "Multi-Pack-Index fehlt erforderlicher OID lookup Chunk"
+
+msgid "multi-pack-index missing required object offsets chunk"
+msgstr "Multi-Pack-Index fehlt erforderlicher Objekt offset Chunk"
+
+#, 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'"
+
+#, c-format
+msgid "bad pack-int-id: %u (%u total packs)"
+msgstr "Ungültige pack-int-id: %u (%u Pakete insgesamt)"
+
+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"
+
+#, c-format
+msgid "failed to add packfile '%s'"
+msgstr "Fehler beim Hinzufügen von Packdatei '%s'"
+
+#, c-format
+msgid "failed to open pack-index '%s'"
+msgstr "Fehler beim Öffnen von pack-index '%s'"
+
+#, c-format
+msgid "failed to locate object %d in packfile"
+msgstr "Fehler beim Lokalisieren von Objekt %d in Packdatei"
+
+msgid "cannot store reverse index file"
+msgstr "kann Reverse-Index-Datei nicht speichern"
+
+#, c-format
+msgid "could not parse line: %s"
+msgstr "Zeile konnte nicht geparst werden: %s"
+
+#, c-format
+msgid "malformed line: %s"
+msgstr "fehlerhafte Zeile: %s"
+
+msgid "ignoring existing multi-pack-index; checksum mismatch"
+msgstr ""
+"ignoriere existierenden Multi-Pack-Index; Prüfsumme stimmt nicht überein"
+
+msgid "could not load pack"
+msgstr "Paket konnte nicht geladen werden"
+
+#, c-format
+msgid "could not open index for %s"
+msgstr "konnte Index für %s nicht öffnen"
+
+msgid "Adding packfiles to multi-pack-index"
+msgstr "Packdateien zum Multi-Pack-Index hinzufügen"
+
+#, c-format
+msgid "unknown preferred pack: '%s'"
+msgstr "unbekanntes bevorzugtes Paket: '%s'"
+
+#, c-format
+msgid "cannot select preferred pack %s with no objects"
+msgstr "bevorzugtes Paket %s ohne Objekte kann nicht ausgewählt werden"
+
+#, c-format
+msgid "did not see pack-file %s to drop"
+msgstr "Pack-Datei %s zum Weglassen nicht gefunden"
+
+#, c-format
+msgid "preferred pack '%s' is expired"
+msgstr "bevorzugtes Paket '%s' ist abgelaufen"
+
+msgid "no pack files to index."
+msgstr "keine Packdateien zum Indizieren."
+
+msgid "refusing to write multi-pack .bitmap without any objects"
+msgstr "Schreiben der Multi-Pack-Bitmap ohne Objekte abgelehnt"
+
+msgid "could not write multi-pack bitmap"
+msgstr "Multi-Pack-Bitmap konnte nicht geschrieben werden"
+
+msgid "could not write multi-pack-index"
+msgstr "Multi-Pack-Index konnte nicht geschrieben werden"
+
+#, c-format
+msgid "failed to clear multi-pack-index at %s"
+msgstr "Fehler beim Löschen des Multi-Pack-Index bei %s"
+
+msgid "multi-pack-index file exists, but failed to parse"
+msgstr "Multi-Pack-Index-Datei existiert, aber das Parsen schlug fehl"
+
+msgid "incorrect checksum"
+msgstr "Prüfsumme nicht korrekt"
+
+msgid "Looking for referenced packfiles"
+msgstr "Suche nach referenzierten Pack-Dateien"
+
+#, c-format
+msgid ""
+"oid fanout out of order: fanout[%d] = %<PRIx32> > %<PRIx32> = fanout[%d]"
+msgstr ""
+"Ungültige oid fanout Reihenfolge: fanout[%d] = %<PRIx32> > %<PRIx32> = "
+"fanout[%d]"
+
+msgid "the midx contains no oid"
+msgstr "das midx enthält keine oid"
+
+msgid "Verifying OID order in multi-pack-index"
+msgstr "Verifiziere OID-Reihenfolge im Multi-Pack-Index"
+
+#, 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]"
+
+msgid "Sorting objects by packfile"
+msgstr "Sortiere Objekte nach Pack-Datei"
+
+msgid "Verifying object offsets"
+msgstr "Überprüfe Objekt-Offsets"
+
+#, c-format
+msgid "failed to load pack entry for oid[%d] = %s"
+msgstr "Fehler beim Laden des Pack-Eintrags für oid[%d] = %s"
+
+#, c-format
+msgid "failed to load pack-index for packfile %s"
+msgstr "Fehler beim Laden des Pack-Index für Packdatei %s"
+
+#, c-format
+msgid "incorrect object offset for oid[%d] = %s: %<PRIx64> != %<PRIx64>"
+msgstr "Falscher Objekt-Offset für oid[%d] = %s: %<PRIx64> != %<PRIx64>"
+
+msgid "Counting referenced objects"
+msgstr "Referenzierte Objekte zählen"
+
+msgid "Finding and deleting unreferenced packfiles"
+msgstr "Suchen und Löschen von unreferenzierten Pack-Dateien"
+
+msgid "could not start pack-objects"
+msgstr "Konnte 'pack-objects' nicht ausführen"
+
+msgid "could not finish pack-objects"
+msgstr "Konnte 'pack-objects' nicht beenden"
+
+#, c-format
+msgid "unable to create lazy_dir thread: %s"
+msgstr "Kann lazy_dir Thread nicht erzeugen: %s"
+
+#, c-format
+msgid "unable to create lazy_name thread: %s"
+msgstr "Kann lazy_name Thread nicht erzeugen: %s"
+
+#, c-format
+msgid "unable to join lazy_name thread: %s"
+msgstr "Kann lazy_name Thread nicht beitreten: %s"
+
+#, 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."
+msgstr ""
+"Sie haben Ihren vorherigen Merge von Notizen nicht abgeschlossen (%s "
+"existiert).\n"
+"Bitte benutzen Sie 'git notes merge --commit' oder 'git notes merge --"
+"abort', um\n"
+"den vorherigen Merge zu committen bzw. abzubrechen, bevor Sie einen neuen "
+"Merge\n"
+"von Notizen beginnen."
+
+#, c-format
+msgid "You have not concluded your notes merge (%s exists)."
+msgstr "Sie haben Ihren Merge von Notizen nicht abgeschlossen (%s existiert)."
+
+msgid "Cannot commit uninitialized/unreferenced notes tree"
+msgstr ""
+"Kann uninitialisiertes/unreferenziertes Notiz-Verzeichnis nicht committen."
+
+#, c-format
+msgid "Bad notes.rewriteMode value: '%s'"
+msgstr "Ungültiger notes.rewriteMode Wert: '%s'"
+
+#, c-format
+msgid "Refusing to rewrite notes in %s (outside of refs/notes/)"
+msgstr ""
+"Umschreiben der Notizen in %s zurückgewiesen (außerhalb von refs/notes/)"
+
+#. TRANSLATORS: The first %s is the name of
+#. the environment variable, the second %s is
+#. its value.
+#.
+#, c-format
+msgid "Bad %s value: '%s'"
+msgstr "Ungültiger %s Wert: '%s'"
+
+#, 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"
+
+#, c-format
+msgid "unable to normalize alternate object path: %s"
+msgstr "Konnte alternativen Objektpfad '%s' nicht normalisieren."
+
+#, c-format
+msgid "%s: ignoring alternate object stores, nesting too deep"
+msgstr "%s: ignoriere alternative Objektspeicher - Verschachtelung zu tief"
+
+#, c-format
+msgid "unable to normalize object directory: %s"
+msgstr "Konnte Objektverzeichnis '%s' nicht normalisieren."
+
+msgid "unable to fdopen alternates lockfile"
+msgstr "Konnte fdopen nicht auf Lock-Datei für \"alternates\" aufrufen."
+
+msgid "unable to read alternates file"
+msgstr "Konnte \"alternates\"-Datei nicht lesen."
+
+msgid "unable to move new alternates file into place"
+msgstr "Konnte neue \"alternates\"-Datei nicht übernehmen."
+
+#, c-format
+msgid "path '%s' does not exist"
+msgstr "Pfad '%s' existiert nicht"
+
+#, 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."
+
+#, c-format
+msgid "reference repository '%s' is not a local repository."
+msgstr "Referenziertes Repository '%s' ist kein lokales Repository."
+
+#, c-format
+msgid "reference repository '%s' is shallow"
+msgstr ""
+"Referenziertes Repository '%s' hat eine unvollständige Historie (shallow)."
+
+#, c-format
+msgid "reference repository '%s' is grafted"
+msgstr ""
+"Referenziertes Repository '%s' ist mit künstlichen Vorgängern (\"grafts\") "
+"eingehängt."
+
+#, c-format
+msgid "could not find object directory matching %s"
+msgstr "konnte Objekt-Verzeichnis nicht finden, dass '%s' entsprechen soll"
+
+#, c-format
+msgid "invalid line while parsing alternate refs: %s"
+msgstr "Ungültige Zeile beim Parsen alternativer Referenzen: %s"
+
+#, c-format
+msgid "attempting to mmap %<PRIuMAX> over limit %<PRIuMAX>"
+msgstr "Versuche mmap %<PRIuMAX> über Limit %<PRIuMAX>."
+
+#, c-format
+msgid "mmap failed%s"
+msgstr "mmap fehlgeschlagen%s"
+
+#, c-format
+msgid "object file %s is empty"
+msgstr "Objektdatei %s ist leer."
+
+#, c-format
+msgid "corrupt loose object '%s'"
+msgstr "Fehlerhaftes loses Objekt '%s'."
+
+#, c-format
+msgid "garbage at end of loose object '%s'"
+msgstr "Nutzlose Daten am Ende von losem Objekt '%s'."
+
+#, c-format
+msgid "unable to parse %s header"
+msgstr "Konnte %s Kopfbereich nicht parsen."
+
+msgid "invalid object type"
+msgstr "ungültiger Objekt-Typ"
+
+#, c-format
+msgid "unable to unpack %s header"
+msgstr "Konnte %s Kopfbereich nicht entpacken."
+
+#, c-format
+msgid "header for %s too long, exceeds %d bytes"
+msgstr "Header für %s zu lang, überschreitet %d Bytes"
+
+#, c-format
+msgid "failed to read object %s"
+msgstr "Konnte Objekt %s nicht lesen."
+
+#, c-format
+msgid "replacement %s not found for %s"
+msgstr "Ersetzung %s für %s nicht gefunden."
+
+#, c-format
+msgid "loose object %s (stored in %s) is corrupt"
+msgstr "Loses Objekt %s (gespeichert in %s) ist beschädigt."
+
+#, c-format
+msgid "packed object %s (stored in %s) is corrupt"
+msgstr "Gepacktes Objekt %s (gespeichert in %s) ist beschädigt."
+
+#, c-format
+msgid "unable to write file %s"
+msgstr "Konnte Datei %s nicht schreiben."
+
+#, c-format
+msgid "unable to set permission to '%s'"
+msgstr "Konnte Zugriffsberechtigung auf '%s' nicht setzen."
+
+msgid "file write error"
+msgstr "Fehler beim Schreiben einer Datei."
+
+msgid "error when closing loose object file"
+msgstr "Fehler beim Schließen der Datei für lose Objekte."
+
+#, 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"
+
+msgid "unable to create temporary file"
+msgstr "Konnte temporäre Datei nicht erstellen."
+
+msgid "unable to write loose object file"
+msgstr "Fehler beim Schreiben der Datei für lose Objekte."
+
+#, c-format
+msgid "unable to deflate new object %s (%d)"
+msgstr "Konnte neues Objekt %s (%d) nicht komprimieren."
+
+#, c-format
+msgid "deflateEnd on object %s failed (%d)"
+msgstr "deflateEnd auf Objekt %s fehlgeschlagen (%d)"
+
+#, c-format
+msgid "confused by unstable object source data for %s"
+msgstr "Fehler wegen instabilen Objektquelldaten für %s"
+
+#, c-format
+msgid "cannot read object for %s"
+msgstr "Kann Objekt für %s nicht lesen."
+
+msgid "corrupt commit"
+msgstr "fehlerhafter Commit"
+
+msgid "corrupt tag"
+msgstr "fehlerhaftes Tag"
+
+#, c-format
+msgid "read error while indexing %s"
+msgstr "Lesefehler beim Indizieren von '%s'."
+
+#, c-format
+msgid "short read while indexing %s"
+msgstr "read() zu kurz beim Indizieren von '%s'."
+
+#, c-format
+msgid "%s: failed to insert into database"
+msgstr "%s: Fehler beim Einfügen in die Datenbank"
+
+#, c-format
+msgid "%s: unsupported file type"
+msgstr "%s: nicht unterstützte Dateiart"
+
+#, c-format
+msgid "%s is not a valid '%s' object"
+msgstr "%s ist kein gültiges '%s' Objekt"
+
+#, c-format
+msgid "unable to open %s"
+msgstr "kann %s nicht öffnen"
+
+#, c-format
+msgid "hash mismatch for %s (expected %s)"
+msgstr "Hash für %s stimmt nicht überein (%s erwartet)."
+
+#, c-format
+msgid "unable to mmap %s"
+msgstr "Konnte mmap nicht auf %s ausführen."
+
+#, c-format
+msgid "unable to unpack header of %s"
+msgstr "Konnte Kopfbereich von %s nicht entpacken."
+
+#, c-format
+msgid "unable to parse header of %s"
+msgstr "Konnte Kopfbereich von %s nicht parsen."
+
+#, c-format
+msgid "unable to unpack contents of %s"
+msgstr "Konnte Inhalt von %s nicht entpacken."
+
+#. TRANSLATORS: This is a line of ambiguous object
+#. output shown when we cannot look up or parse the
+#. object in question. E.g. "deadbeef [bad object]".
+#.
+#, c-format
+msgid "%s [bad object]"
+msgstr "%s [ungültiges Objekt]"
+
+#. TRANSLATORS: This is a line of ambiguous commit
+#. object output. E.g.:
+#. *
+#.    "deadbeef commit 2021-01-01 - Some Commit Message"
+#.
+#, c-format
+msgid "%s commit %s - %s"
+msgstr "%s Commit %s - %s"
+
+#. TRANSLATORS: This is a line of ambiguous
+#. tag object output. E.g.:
+#. *
+#.    "deadbeef tag 2022-01-01 - Some Tag Message"
+#. *
+#. The second argument is the YYYY-MM-DD found
+#. in the tag.
+#. *
+#. The third argument is the "tag" string
+#. from object.c.
+#.
+#, c-format
+msgid "%s tag %s - %s"
+msgstr "%s Tag %s - %s"
+
+#. TRANSLATORS: This is a line of ambiguous
+#. tag object output where we couldn't parse
+#. the tag itself. E.g.:
+#. *
+#.    "deadbeef [bad tag, could not parse it]"
+#.
+#, c-format
+msgid "%s [bad tag, could not parse it]"
+msgstr "%s [ungültiger Tag, konnte es nicht parsen]"
+
+#. TRANSLATORS: This is a line of ambiguous <type>
+#. object output. E.g. "deadbeef tree".
+#.
+#, c-format
+msgid "%s tree"
+msgstr "%s Tree"
+
+#. TRANSLATORS: This is a line of ambiguous <type>
+#. object output. E.g. "deadbeef blob".
+#.
+#, c-format
+msgid "%s blob"
+msgstr "%s Blob"
+
+#, c-format
+msgid "short object ID %s is ambiguous"
+msgstr "kurze Objekt-ID %s ist mehrdeutig"
+
+#. TRANSLATORS: The argument is the list of ambiguous
+#. objects composed in show_ambiguous_object(). See
+#. its "TRANSLATORS" comments for details.
+#.
+#, c-format
+msgid ""
+"The candidates are:\n"
+"%s"
+msgstr ""
+"Die Kandidaten sind:\n"
+"%s"
+
+msgid ""
+"Git normally never creates a ref that ends with 40 hex characters\n"
+"because it will be ignored when you just specify 40-hex. These refs\n"
+"may be created by mistake. For example,\n"
+"\n"
+"  git switch -c $br $(git rev-parse ...)\n"
+"\n"
+"where \"$br\" is somehow empty and a 40-hex ref is created. Please\n"
+"examine these refs and maybe delete them. Turn this message off by\n"
+"running \"git config advice.objectNameWarning false\""
+msgstr ""
+"Git erzeugt normalerweise keine Referenzen die mit\n"
+"40 Hex-Zeichen enden, da diese ignoriert werden wenn\n"
+"Sie diese angeben. Diese Referenzen könnten aus Versehen\n"
+"erzeugt worden sein. Zum Beispiel,\n"
+"\n"
+"  git switch -c $br $(git rev-parse ...)\n"
+"\n"
+"wobei \"$br\" leer ist und eine 40-Hex-Referenz erzeugt\n"
+"wurde. Bitte prüfen Sie diese Referenzen und löschen\n"
+"Sie sie gegebenenfalls. Unterdrücken Sie diese Meldung\n"
+"indem Sie \"git config advice.objectNameWarning false\"\n"
+"ausführen."
+
+#, c-format
+msgid "log for '%.*s' only goes back to %s"
+msgstr "Log für '%.*s' geht nur bis %s zurück"
+
+#, c-format
+msgid "log for '%.*s' only has %d entries"
+msgstr "Log für '%.*s' hat nur %d Einträge"
+
+#, c-format
+msgid "path '%s' exists on disk, but not in '%.*s'"
+msgstr "Pfad '%s' befindet sich im Dateisystem, aber nicht in '%.*s'"
+
+#, c-format
+msgid ""
+"path '%s' exists, but not '%s'\n"
+"hint: Did you mean '%.*s:%s' aka '%.*s:./%s'?"
+msgstr ""
+"Pfad '%s' existiert, aber nicht '%s'\n"
+"Hinweis: Meinten Sie '%.*s:%s' auch bekannt als '%.*s:./%s'?"
+
+#, c-format
+msgid "path '%s' does not exist in '%.*s'"
+msgstr "Pfad '%s' existiert nicht in '%.*s'"
+
+#, c-format
+msgid ""
+"path '%s' is in the index, but not at stage %d\n"
+"hint: Did you mean ':%d:%s'?"
+msgstr ""
+"Pfad '%s' ist im Index, aber nicht in Stufe %d\n"
+"Hinweis: Meinten Sie ':%d:%s'?"
+
+#, c-format
+msgid ""
+"path '%s' is in the index, but not '%s'\n"
+"hint: Did you mean ':%d:%s' aka ':%d:./%s'?"
+msgstr ""
+"Pfad '%s' ist im Index, aber nicht '%s'\n"
+"Hinweis: Meinten Sie ':%d:%s' auch bekannt als ':%d:./%s'?"
+
+#, c-format
+msgid "path '%s' exists on disk, but not in the index"
+msgstr "Pfad '%s' existiert im Dateisystem, aber nicht im Index"
+
+#, c-format
+msgid "path '%s' does not exist (neither on disk nor in the index)"
+msgstr "Pfad '%s' existiert nicht (weder im Dateisystem noch im Index)"
+
+msgid "relative path syntax can't be used outside working tree"
+msgstr ""
+"Die Syntax für relative Pfade kann nicht außerhalb des Arbeitsverzeichnisses "
+"benutzt werden."
+
+#, c-format
+msgid "<object>:<path> required, only <object> '%s' given"
+msgstr "<Objekt>:<Pfad> benötigt, nur <Objekt> '%s' angegeben"
+
+#, c-format
+msgid "invalid object name '%.*s'."
+msgstr "ungültiger Objektname '%.*s'."
+
+#, c-format
+msgid "invalid object type \"%s\""
+msgstr "Ungültiger Objekttyp \"%s\""
+
+#, c-format
+msgid "object %s is a %s, not a %s"
+msgstr "Objekt %s ist ein %s, kein %s"
+
+#, c-format
+msgid "object %s has unknown type id %d"
+msgstr "Objekt %s hat eine unbekannte Typ-Identifikation %d"
+
+#, c-format
+msgid "unable to parse object: %s"
+msgstr "Konnte Objekt '%s' nicht parsen."
+
+#, c-format
+msgid "hash mismatch %s"
+msgstr "Hash stimmt nicht mit %s überein."
+
+msgid "multi-pack bitmap is missing required reverse index"
+msgstr "Multi-Pack-Bitmap fehlt erforderlicher Reverse-Index"
+
+#, c-format
+msgid "could not open pack %s"
+msgstr "konnte Paket '%s' nicht öffnen"
+
+#, c-format
+msgid "preferred pack (%s) is invalid"
+msgstr "bevorzugtes Paket (%s) ist ungültig"
+
+#, c-format
+msgid "could not find %s in pack %s at offset %<PRIuMAX>"
+msgstr "konnte %s nicht in Paket %s bei Offset %<PRIuMAX> finden"
+
+#, c-format
+msgid "mtimes file %s is too small"
+msgstr "mtimes-Datei %s ist zu klein"
+
+#, c-format
+msgid "mtimes file %s has unknown signature"
+msgstr "mtimes-Datei %s hat eine unbekannte Signatur"
+
+#, c-format
+msgid "mtimes file %s has unsupported version %<PRIu32>"
+msgstr "mtimes-Datei %s hat nicht unterstützte Version %<PRIu32>"
+
+#, c-format
+msgid "mtimes file %s has unsupported hash id %<PRIu32>"
+msgstr "mtimes-Datei %s hat nicht unterstützte Hash-ID %<PRIu32>"
+
+#, c-format
+msgid "mtimes file %s is corrupt"
+msgstr "mtimes-Datei %s ist beschädigt"
+
+#, c-format
+msgid "reverse-index file %s is too small"
+msgstr "Reverse-Index-Datei %s ist zu klein"
+
+#, c-format
+msgid "reverse-index file %s is corrupt"
+msgstr "Reverse-Index-Datei %s ist beschädigt"
+
+#, c-format
+msgid "reverse-index file %s has unknown signature"
+msgstr "Reverse-Index-Datei %s hat eine unbekannte Signatur"
+
+#, c-format
+msgid "reverse-index file %s has unsupported version %<PRIu32>"
+msgstr "Reverse-Index-Datei %s hat nicht unterstützte Version %<PRIu32>"
+
+#, c-format
+msgid "reverse-index file %s has unsupported hash id %<PRIu32>"
+msgstr "Reverse-Index-Datei %s hat nicht unterstützte Hash-ID %<PRIu32>"
+
+msgid "cannot both write and verify reverse index"
+msgstr ""
+"Reverse-Index kann nicht gleichzeitig geschrieben und verifiziert werden"
+
+#, c-format
+msgid "could not stat: %s"
+msgstr "konnte nicht lesen: %s"
+
+#, c-format
+msgid "failed to make %s readable"
+msgstr "Fehler beim lesbar machen von %s"
+
+#, c-format
+msgid "could not write '%s' promisor file"
+msgstr "konnte Promisor-Datei '%s' nicht schreiben"
+
+msgid "offset before end of packfile (broken .idx?)"
+msgstr "Offset vor Ende der Packdatei (fehlerhafte Indexdatei?)"
+
+#, c-format
+msgid "packfile %s cannot be mapped%s"
+msgstr "Packdatei %s kann nicht gemappt werden%s"
+
+#, 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?)"
+
+#, 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?)"
+
+#, c-format
+msgid "malformed expiration date '%s'"
+msgstr "Fehlerhaftes Ablaufdatum '%s'"
+
+#, c-format
+msgid "option `%s' expects \"always\", \"auto\", or \"never\""
+msgstr "Option `%s' erwartet \"always\", \"auto\" oder \"never\"."
+
+#, c-format
+msgid "malformed object name '%s'"
+msgstr "fehlerhafter Objekt-Name '%s'"
+
+#, c-format
+msgid "option `%s' expects \"%s\" or \"%s\""
+msgstr "Option `%s' erwartet \"%s\" oder \"%s\""
+
+#, c-format
+msgid "%s requires a value"
+msgstr "%s erfordert einen Wert."
+
+#, c-format
+msgid "%s is incompatible with %s"
+msgstr "%s ist inkompatibel mit %s."
+
+#, c-format
+msgid "%s : incompatible with something else"
+msgstr "%s: inkompatibel mit etwas anderem"
+
+#, c-format
+msgid "%s takes no value"
+msgstr "%s erwartet keinen Wert"
+
+#, c-format
+msgid "%s isn't available"
+msgstr "%s ist nicht verfügbar."
+
+#, 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"
+
+#, c-format
+msgid "ambiguous option: %s (could be --%s%s or --%s%s)"
+msgstr "Mehrdeutige Option: %s (kann --%s%s oder --%s%s sein)"
+
+#, c-format
+msgid "did you mean `--%s` (with two dashes)?"
+msgstr "Meinten Sie `--%s` (mit zwei Strichen)?"
+
+#, c-format
+msgid "alias of --%s"
+msgstr "Alias für --%s"
+
+#, c-format
+msgid "unknown option `%s'"
+msgstr "Unbekannte Option: `%s'"
+
+#, c-format
+msgid "unknown switch `%c'"
+msgstr "Unbekannter Schalter `%c'"
+
+#, c-format
+msgid "unknown non-ascii option in string: `%s'"
+msgstr "Unbekannte nicht-Ascii Option in String: `%s'"
+
+msgid "..."
+msgstr "..."
+
+#, c-format
+msgid "usage: %s"
+msgstr "Verwendung: %s"
+
+#. TRANSLATORS: the colon here should align with the
+#. one in "usage: %s" translation.
+#.
+#, c-format
+msgid "   or: %s"
+msgstr "      oder: %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.
+#.
+#, c-format
+msgid "%*s%s"
+msgstr "%*s%s"
+
+#, c-format
+msgid "    %s"
+msgstr "    %s"
+
+msgid "-NUM"
+msgstr "-NUM"
+
+msgid "expiry-date"
+msgstr "Verfallsdatum"
+
+msgid "no-op (backward compatibility)"
+msgstr "Kein Effekt (Rückwärtskompatibilität)"
+
+msgid "be more verbose"
+msgstr "erweiterte Ausgaben"
+
+msgid "be more quiet"
+msgstr "weniger Ausgaben"
+
+msgid "use <n> digits to display object names"
+msgstr "benutze <Anzahl> Ziffern zur Anzeige von Objektnamen"
+
+msgid "how to strip spaces and #comments from message"
+msgstr ""
+"wie Leerzeichen und #Kommentare von der Beschreibung getrennt werden sollen"
+
+msgid "read pathspec from file"
+msgstr "Pfadspezifikation aus einer Datei lesen"
+
+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"
+
+#, c-format
+msgid "Could not make %s writable by group"
+msgstr "Konnte Gruppenschreibrecht für %s nicht setzen."
+
+msgid "Escape character '\\' not allowed as last character in attr value"
+msgstr "Escape-Zeichen '\\' als letztes Zeichen in Attributwert nicht erlaubt"
+
+msgid "Only one 'attr:' specification is allowed."
+msgstr "Es ist nur eine Angabe von 'attr:' erlaubt."
+
+msgid "attr spec must not be empty"
+msgstr "Angabe von 'attr:' darf nicht leer sein"
+
+#, c-format
+msgid "invalid attribute name %s"
+msgstr "Ungültiger Attributname %s"
+
+msgid "global 'glob' and 'noglob' pathspec settings are incompatible"
+msgstr ""
+"Globale Einstellungen zur Pfadspezifikation 'glob' und 'noglob' sind "
+"inkompatibel."
+
+msgid ""
+"global 'literal' pathspec setting is incompatible with all other global "
+"pathspec settings"
+msgstr ""
+"Globale Einstellung zur Pfadspezifikation 'literal' ist inkompatibel\n"
+"mit allen anderen Optionen."
+
+msgid "invalid parameter for pathspec magic 'prefix'"
+msgstr "ungültiger Parameter für Pfadspezifikationsangabe 'prefix'"
+
+#, c-format
+msgid "Invalid pathspec magic '%.*s' in '%s'"
+msgstr "ungültige Pfadspezifikationsangabe '%.*s' in '%s'"
+
+#, c-format
+msgid "Missing ')' at the end of pathspec magic in '%s'"
+msgstr "Fehlendes ')' am Ende der Pfadspezifikationsangabe in '%s'"
+
+#, c-format
+msgid "Unimplemented pathspec magic '%c' in '%s'"
+msgstr "nicht unterstützte Pfadspezifikationsangabe '%c' in '%s'"
+
+#, c-format
+msgid "%s: 'literal' and 'glob' are incompatible"
+msgstr "%s: 'literal' und 'glob' sind inkompatibel"
+
+#, c-format
+msgid "%s: '%s' is outside repository at '%s'"
+msgstr "%s: '%s' liegt außerhalb des Repositories von '%s'"
+
+#, c-format
+msgid "'%s' (mnemonic: '%c')"
+msgstr "'%s' (Kürzel: '%c')"
+
+#, c-format
+msgid "%s: pathspec magic not supported by this command: %s"
+msgstr ""
+"%s: Pfadspezifikationsangabe wird von diesem Befehl nicht unterstützt: %s"
+
+#, c-format
+msgid "pathspec '%s' is beyond a symbolic link"
+msgstr "Pfadspezifikation '%s' ist hinter einer symbolischen Verknüpfung"
+
+#, c-format
+msgid "line is badly quoted: %s"
+msgstr "Zeile enthält falsche Anführungszeichen: %s"
+
+msgid "unable to write flush packet"
+msgstr "konnte Flush-Paket nicht schreiben"
+
+msgid "unable to write delim packet"
+msgstr "konnte Delim-Paket nicht schreiben"
+
+msgid "unable to write response end packet"
+msgstr "konnte Antwort-Endpaket nicht schreiben"
+
+msgid "flush packet write failed"
+msgstr "Flush beim Schreiben des Pakets fehlgeschlagen."
+
+msgid "protocol error: impossibly long line"
+msgstr "Protokollfehler: unmöglich lange Zeile"
+
+msgid "packet write with format failed"
+msgstr "Schreiben des Pakets mit Format fehlgeschlagen."
+
+msgid "packet write failed - data exceeds max packet size"
+msgstr ""
+"Schreiben des Pakets fehlgeschlagen - Daten überschreiten maximale Paketgröße"
+
+#, c-format
+msgid "packet write failed: %s"
+msgstr "Schreiben des Pakets fehlgeschlagen: %s"
+
+msgid "read error"
+msgstr "Lesefehler"
+
+msgid "the remote end hung up unexpectedly"
+msgstr "Die Gegenseite hat unerwartet abgebrochen."
+
+#, c-format
+msgid "protocol error: bad line length character: %.4s"
+msgstr "Protokollfehler: ungültiges Zeichen für Zeilenlänge: %.4s"
+
+#, c-format
+msgid "protocol error: bad line length %d"
+msgstr "Protokollfehler: ungültige Zeilenlänge %d"
+
+#, c-format
+msgid "remote error: %s"
+msgstr "Fehler am anderen Ende: %s"
+
+msgid "Refreshing index"
+msgstr "Aktualisiere Index"
+
+#, c-format
+msgid "unable to create threaded lstat: %s"
+msgstr "Kann Thread für lstat nicht erzeugen: %s"
+
+msgid "unable to parse --pretty format"
+msgstr "Konnte --pretty Format nicht parsen."
+
+msgid "promisor-remote: unable to fork off fetch subprocess"
+msgstr "Promisor-Remote: konnte Fetch-Subprozess nicht abspalten"
+
+msgid "promisor-remote: could not write to fetch subprocess"
+msgstr "Promisor-Remote: konnte nicht zum Fetch-Subprozess schreiben"
+
+msgid "promisor-remote: could not close stdin to fetch subprocess"
+msgstr ""
+"Promisor-Remote: konnte Standard-Eingabe des Fetch-Subprozesses nicht "
+"schließen"
+
+#, c-format
+msgid "promisor remote name cannot begin with '/': %s"
+msgstr "Promisor-Remote-Name kann nicht mit '/' beginnen: %s"
+
+msgid "object-info: expected flush after arguments"
+msgstr "object-info: erwartete Flush nach Argumenten"
+
+msgid "Removing duplicate objects"
+msgstr "Lösche doppelte Objekte"
+
+msgid "could not start `log`"
+msgstr "Konnte `log` nicht starten."
+
+msgid "could not read `log` output"
+msgstr "Konnte Ausgabe von `log` nicht lesen."
+
+#, c-format
+msgid "could not parse commit '%s'"
+msgstr "Konnte Commit '%s' nicht parsen."
+
+#, c-format
+msgid ""
+"could not parse first line of `log` output: did not start with 'commit ': "
+"'%s'"
+msgstr ""
+"konnte erste Zeile der Ausgabe von `log` nicht parsen: fängt nicht mit "
+"'commit ' an: '%s'"
+
+#, c-format
+msgid "could not parse git header '%.*s'"
+msgstr "Konnte Git-Header '%.*s' nicht parsen."
+
+msgid "failed to generate diff"
+msgstr "Fehler beim Generieren des Diffs."
+
+#, c-format
+msgid "could not parse log for '%s'"
+msgstr "Konnte Log für '%s' nicht parsen."
+
+#, c-format
+msgid "will not add file alias '%s' ('%s' already exists in index)"
+msgstr ""
+"Dateialias '%s' wird nicht hinzugefügt ('%s' existiert bereits im Index)."
+
+msgid "cannot create an empty blob in the object database"
+msgstr "Kann keinen leeren Blob in die Objektdatenbank schreiben."
+
+#, c-format
+msgid "%s: can only add regular files, symbolic links or git-directories"
+msgstr ""
+"%s: Kann nur reguläre Dateien, symbolische Links oder Git-Verzeichnisse "
+"hinzufügen."
+
+#, c-format
+msgid "unable to index file '%s'"
+msgstr "Konnte Datei '%s' nicht indizieren."
+
+#, c-format
+msgid "unable to add '%s' to index"
+msgstr "Konnte '%s' nicht dem Index hinzufügen."
+
+#, c-format
+msgid "unable to stat '%s'"
+msgstr "konnte '%s' nicht lesen"
+
+#, c-format
+msgid "'%s' appears as both a file and as a directory"
+msgstr "'%s' scheint eine Datei und ein Verzeichnis zu sein"
+
+msgid "Refresh index"
+msgstr "Aktualisiere Index"
+
+#, c-format
+msgid ""
+"index.version set, but the value is invalid.\n"
+"Using version %i"
+msgstr ""
+"index.version gesetzt, aber Wert ungültig.\n"
+"Verwende Version %i"
+
+#, c-format
+msgid ""
+"GIT_INDEX_VERSION set, but the value is invalid.\n"
+"Using version %i"
+msgstr ""
+"GIT_INDEX_VERSION gesetzt, aber Wert ungültig.\n"
+"Verwende Version %i"
+
+#, c-format
+msgid "bad signature 0x%08x"
+msgstr "Ungültige Signatur 0x%08x"
+
+#, c-format
+msgid "bad index version %d"
+msgstr "Ungültige Index-Version %d"
+
+msgid "bad index file sha1 signature"
+msgstr "Ungültige SHA1-Signatur der Index-Datei."
+
+#, c-format
+msgid "index uses %.4s extension, which we do not understand"
+msgstr "Index verwendet Erweiterung %.4s, welche wir nicht unterstützen."
+
+#, c-format
+msgid "ignoring %.4s extension"
+msgstr "Ignoriere Erweiterung %.4s"
+
+#, c-format
+msgid "unknown index entry format 0x%08x"
+msgstr "Unbekanntes Format für Index-Eintrag 0x%08x"
+
+#, 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'."
+
+msgid "unordered stage entries in index"
+msgstr "Ungeordnete Stage-Einträge im Index."
+
+#, c-format
+msgid "multiple stage entries for merged file '%s'"
+msgstr "Mehrere Stage-Einträge für zusammengeführte Datei '%s'."
+
+#, c-format
+msgid "unordered stage entries for '%s'"
+msgstr "Ungeordnete Stage-Einträge für '%s'."
+
+#, c-format
+msgid "unable to create load_cache_entries thread: %s"
+msgstr "Kann Thread für load_cache_entries nicht erzeugen: %s"
+
+#, c-format
+msgid "unable to join load_cache_entries thread: %s"
+msgstr "Kann Thread für load_cache_entries nicht erzeugen: %s"
+
+#, c-format
+msgid "%s: index file open failed"
+msgstr "%s: Öffnen der Index-Datei fehlgeschlagen."
+
+#, c-format
+msgid "%s: cannot stat the open index"
+msgstr "%s: Kann geöffneten Index nicht lesen."
+
+#, c-format
+msgid "%s: index file smaller than expected"
+msgstr "%s: Index-Datei ist kleiner als erwartet."
+
+#, c-format
+msgid "%s: unable to map index file%s"
+msgstr "%s: Konnte Index-Datei nicht mappen%s"
+
+#, c-format
+msgid "unable to create load_index_extensions thread: %s"
+msgstr "Kann Thread für load_index_extensions nicht erzeugen: %s"
+
+#, c-format
+msgid "unable to join load_index_extensions thread: %s"
+msgstr "Kann Thread für load_index_extensions nicht beitreten: %s"
+
+#, c-format
+msgid "could not freshen shared index '%s'"
+msgstr "Konnte geteilten Index '%s' nicht aktualisieren."
+
+#, c-format
+msgid "broken index, expect %s in %s, got %s"
+msgstr "Fehlerhafter Index. Erwartete %s in %s, erhielt %s."
+
+msgid "cannot write split index for a sparse index"
+msgstr "kann aufgeteilten Index nicht für ein Sparse-Index schreiben"
+
+msgid "failed to convert to a sparse-index"
+msgstr "Konvertierung zu einem Sparse-Index fehlgeschlagen"
+
+#, c-format
+msgid "could not stat '%s'"
+msgstr "Konnte '%s' nicht lesen."
+
+#, c-format
+msgid "unable to open git dir: %s"
+msgstr "konnte Git-Verzeichnis nicht öffnen: %s"
+
+#, c-format
+msgid "unable to unlink: %s"
+msgstr "Konnte '%s' nicht entfernen."
+
+#, c-format
+msgid "cannot fix permission bits on '%s'"
+msgstr "Konnte Zugriffsberechtigung auf '%s' nicht setzen."
+
+#, c-format
+msgid "%s: cannot drop to stage #0"
+msgstr "%s: Kann nicht auf Stufe #0 wechseln."
+
+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 ""
+"Sie können das mit 'git rebase --edit-todo' beheben. Führen Sie danach\n"
+"'git rebase --continue' aus.\n"
+"Oder Sie können den Rebase mit 'git rebase --abort' abbrechen.\n"
+
+#, c-format
+msgid ""
+"unrecognized setting %s for option rebase.missingCommitsCheck. Ignoring."
+msgstr ""
+"Nicht erkannte Einstellung %s für Option rebase.missingCommitsCheck. "
+"Ignoriere."
+
+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 [-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"
+"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 [-C | -c] <Commit> = wie \"squash\", aber nur die vorherige\n"
+"                   Commit-Beschreibung behalten, außer -C wird verwendet,\n"
+"                   in diesem Fall wird nur diese Commit-Beschreibung "
+"behalten;\n"
+"                   -c ist das Gleiche wie -C, aber ein Editor wird geöffnet\n"
+"x, exec <Commit> = Befehl (Rest der Zeile) mittels Shell ausführen\n"
+"b, break = hier anhalten (Rebase später mit 'git rebase --continue' "
+"fortsetzen)\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"
+
+#, c-format
+msgid "Rebase %s onto %s (%d command)"
+msgid_plural "Rebase %s onto %s (%d commands)"
+msgstr[0] "Rebase von %s auf %s (%d Kommando)"
+msgstr[1] "Rebase von %s auf %s (%d Kommandos)"
+
+msgid ""
+"\n"
+"Do not remove any line. Use 'drop' explicitly to remove a commit.\n"
+msgstr ""
+"\n"
+"Keine Zeile entfernen. Benutzen Sie 'drop', um explizit einen Commit zu\n"
+"entfernen.\n"
+
+msgid ""
+"\n"
+"If you remove a line here THAT COMMIT WILL BE LOST.\n"
+msgstr ""
+"\n"
+"Wenn Sie hier eine Zeile entfernen, wird DIESER COMMIT VERLOREN GEHEN.\n"
+
+msgid ""
+"\n"
+"You are editing the todo file of an ongoing interactive rebase.\n"
+"To continue rebase after editing, run:\n"
+"    git rebase --continue\n"
+"\n"
+msgstr ""
+"\n"
+"Sie bearbeiten gerade die TODO-Datei eines laufenden interaktiven Rebase.\n"
+"Um den Rebase nach dem Editieren fortzusetzen, führen Sie aus:\n"
+"    git rebase --continue\n"
+"\n"
+
+msgid ""
+"\n"
+"However, if you remove everything, the rebase will be aborted.\n"
+"\n"
+msgstr ""
+"\n"
+"Wenn Sie jedoch alles löschen, wird der Rebase abgebrochen.\n"
+"\n"
+
+#, c-format
+msgid "could not write '%s'."
+msgstr "Konnte '%s' nicht schreiben."
+
+#, c-format
+msgid ""
+"Warning: some commits may have been dropped accidentally.\n"
+"Dropped commits (newer to older):\n"
+msgstr ""
+"Warnung: Einige Commits könnten aus Versehen entfernt worden sein.\n"
+"Entfernte Commits (neu zu alt):\n"
+
+#, c-format
+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"
+"The possible behaviours are: ignore, warn, error.\n"
+"\n"
+msgstr ""
+"Um diese Meldung zu vermeiden, benutzen Sie \"drop\", um exlizit Commits zu\n"
+"entfernen.\n"
+"\n"
+"Benutzen Sie 'git config rebase.missingCommitsCheck', um die Stufe der\n"
+"Warnungen zu ändern.\n"
+"Die möglichen Verhaltensweisen sind: ignore, warn, error.\n"
+
+#, c-format
+msgid "%s: 'preserve' superseded by 'merges'"
+msgstr "%s: 'preserve' wurde durch 'merges' ersetzt"
+
+msgid "gone"
+msgstr "entfernt"
+
+#, c-format
+msgid "ahead %d"
+msgstr "%d voraus"
+
+#, c-format
+msgid "behind %d"
+msgstr "%d hinterher"
+
+#, c-format
+msgid "ahead %d, behind %d"
+msgstr "%d voraus, %d hinterher"
+
+#, c-format
+msgid "expected format: %%(color:<color>)"
+msgstr "Erwartetes Format: %%(color:<Farbe>)"
+
+#, c-format
+msgid "unrecognized color: %%(color:%s)"
+msgstr "nicht erkannte Farbe: %%(color:%s)"
+
+#, c-format
+msgid "Integer value expected refname:lstrip=%s"
+msgstr "Positiver Wert erwartet refname:lstrip=%s"
+
+#, c-format
+msgid "Integer value expected refname:rstrip=%s"
+msgstr "Positiver Wert erwartet refname:rstrip=%s"
+
+#, c-format
+msgid "unrecognized %%(%s) argument: %s"
+msgstr "nicht erkanntes %%(%s) Argument: %s"
+
+#, c-format
+msgid "%%(objecttype) does not take arguments"
+msgstr "%%(objecttype) akzeptiert keine Argumente"
+
+#, c-format
+msgid "%%(deltabase) does not take arguments"
+msgstr "%%(deltabase) akzeptiert keine Argumente"
+
+#, c-format
+msgid "%%(body) does not take arguments"
+msgstr "%%(body) akzeptiert keine Argumente"
+
+#, c-format
+msgid "expected %%(trailers:key=<value>)"
+msgstr "%%(trailers:key=<Wert>) erwartet"
+
+#, c-format
+msgid "unknown %%(trailers) argument: %s"
+msgstr "unbekanntes %%(trailers) Argument: %s"
+
+#, c-format
+msgid "positive value expected contents:lines=%s"
+msgstr "Positiver Wert erwartet contents:lines=%s"
+
+#, c-format
+msgid "positive value expected '%s' in %%(%s)"
+msgstr "positiver Wert erwartet '%s' in %%(%s)"
+
+#, c-format
+msgid "unrecognized email option: %s"
+msgstr "nicht erkannte E-Mail Option: %s"
+
+#, c-format
+msgid "expected format: %%(align:<width>,<position>)"
+msgstr "erwartetes Format: %%(align:<Breite>,<Position>)"
+
+#, c-format
+msgid "unrecognized position:%s"
+msgstr "nicht erkannte Position:%s"
+
+#, c-format
+msgid "unrecognized width:%s"
+msgstr "nicht erkannte Breite:%s"
+
+#, c-format
+msgid "positive width expected with the %%(align) atom"
+msgstr "Positive Breitenangabe für %%(align) erwartet"
+
+#, c-format
+msgid "%%(rest) does not take arguments"
+msgstr "%%(rest) akzeptiert keine Argumente"
+
+#, c-format
+msgid "malformed field name: %.*s"
+msgstr "Fehlerhafter Feldname: %.*s"
+
+#, c-format
+msgid "unknown field name: %.*s"
+msgstr "Unbekannter Feldname: %.*s"
+
+#, 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."
+
+#, c-format
+msgid "format: %%(%s) atom used without a %%(%s) atom"
+msgstr "format: %%(%s) Atom ohne ein %%(%s) Atom verwendet"
+
+#, c-format
+msgid "format: %%(then) atom used more than once"
+msgstr "format: %%(then) Atom mehr als einmal verwendet"
+
+#, c-format
+msgid "format: %%(then) atom used after %%(else)"
+msgstr "format: %%(then) Atom nach %%(else) verwendet"
+
+#, c-format
+msgid "format: %%(else) atom used more than once"
+msgstr "Format: %%(else) Atom mehr als einmal verwendet"
+
+#, c-format
+msgid "format: %%(end) atom used without corresponding atom"
+msgstr "Format: %%(end) Atom ohne zugehöriges Atom verwendet"
+
+#, c-format
+msgid "malformed format string %s"
+msgstr "Fehlerhafter Formatierungsstring %s"
+
+#, c-format
+msgid "this command reject atom %%(%.*s)"
+msgstr "dieser Befehl lehnt Atom ab %%(%.*s)"
+
+#, c-format
+msgid "--format=%.*s cannot be used with --python, --shell, --tcl"
+msgstr "--format=%.*s kann nicht mit --python, --shell, --tcl verwendet werden"
+
+#, c-format
+msgid "(no branch, rebasing %s)"
+msgstr "(kein Branch, Rebase von %s)"
+
+#, c-format
+msgid "(no branch, rebasing detached HEAD %s)"
+msgstr "(kein Branch, Rebase von losgelöstem HEAD %s)"
+
+#, c-format
+msgid "(no branch, bisect started on %s)"
+msgstr "(kein Branch, binäre Suche begonnen bei %s)"
+
+#, c-format
+msgid "(HEAD detached at %s)"
+msgstr "(HEAD losgelöst bei %s)"
+
+#, c-format
+msgid "(HEAD detached from %s)"
+msgstr "(HEAD losgelöst von %s)"
+
+msgid "(no branch)"
+msgstr "(kein Branch)"
+
+#, c-format
+msgid "missing object %s for %s"
+msgstr "Objekt %s fehlt für %s"
+
+#, c-format
+msgid "parse_object_buffer failed on %s for %s"
+msgstr "parse_object_buffer bei %s für %s fehlgeschlagen"
+
+#, c-format
+msgid "malformed object at '%s'"
+msgstr "fehlerhaftes Objekt bei '%s'"
+
+#, c-format
+msgid "ignoring ref with broken name %s"
+msgstr "Ignoriere Referenz mit fehlerhaftem Namen %s"
+
+#, c-format
+msgid "ignoring broken ref %s"
+msgstr "Ignoriere fehlerhafte Referenz %s"
+
+#, c-format
+msgid "format: %%(end) atom missing"
+msgstr "Format: %%(end) Atom fehlt"
+
+#, c-format
+msgid "malformed object name %s"
+msgstr "missgebildeter Objektname %s"
+
+#, c-format
+msgid "option `%s' must point to a commit"
+msgstr "die Option `%s' muss auf einen Commit zeigen"
+
+msgid "key"
+msgstr "Schüssel"
+
+msgid "field name to sort on"
+msgstr "sortiere nach diesem Feld"
+
+#, c-format
+msgid "not a reflog: %s"
+msgstr "Kein Reflog: %s"
+
+#, c-format
+msgid "no reflog for '%s'"
+msgstr "Kein Reflog für '%s'."
+
+#, c-format
+msgid "%s does not point to a valid object!"
+msgstr "%s zeigt auf kein gültiges Objekt!"
+
+#, 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"
+"of your new repositories, which will suppress this warning, call:\n"
+"\n"
+"\tgit config --global init.defaultBranch <name>\n"
+"\n"
+"Names commonly chosen instead of 'master' are 'main', 'trunk' and\n"
+"'development'. The just-created branch can be renamed via this command:\n"
+"\n"
+"\tgit branch -m <name>\n"
+msgstr ""
+"Als Name für den initialen Branch wurde '%s' benutzt. Dieser\n"
+"Standard-Branchname kann sich ändern. Um den Namen des initialen Branches\n"
+"zu konfigurieren, der in allen neuen Repositories verwendet werden soll und\n"
+"um diese Warnung zu unterdrücken, führen Sie aus:\n"
+"\n"
+"\tgit config --global init.defaultBranch <Name>\n"
+"\n"
+"Häufig gewählte Namen statt 'master' sind 'main', 'trunk' und\n"
+"'development'. Der gerade erstellte Branch kann mit diesem Befehl\n"
+"umbenannt werden:\n"
+"\n"
+"\tgit branch -m <Name>\n"
+
+#, c-format
+msgid "could not retrieve `%s`"
+msgstr "konnte `%s` nicht abrufen"
+
+#, c-format
+msgid "invalid branch name: %s = %s"
+msgstr "ungültiger Branchname: %s = %s"
+
+#, c-format
+msgid "ignoring dangling symref %s"
+msgstr "Ignoriere unreferenzierte symbolische Referenz %s"
+
+#, c-format
+msgid "log for ref %s has gap after %s"
+msgstr "Log für Referenz %s hat eine Lücke nach %s."
+
+#, c-format
+msgid "log for ref %s unexpectedly ended on %s"
+msgstr "Log für Referenz %s unerwartet bei %s beendet."
+
+#, c-format
+msgid "log for %s is empty"
+msgstr "Log für %s ist leer."
+
+#, c-format
+msgid "refusing to update ref with bad name '%s'"
+msgstr "verweigere Aktualisierung einer Referenz mit fehlerhaftem Namen '%s'"
+
+#, c-format
+msgid "update_ref failed for ref '%s': %s"
+msgstr "update_ref für Referenz '%s' fehlgeschlagen: %s"
+
+#, c-format
+msgid "multiple updates for ref '%s' not allowed"
+msgstr "mehrere Aktualisierungen für Referenz '%s' nicht erlaubt"
+
+msgid "ref updates forbidden inside quarantine environment"
+msgstr ""
+"Aktualisierungen von Referenzen ist innerhalb der Quarantäne-Umgebung "
+"verboten"
+
+msgid "ref updates aborted by hook"
+msgstr "Aktualisierungen von Referenzen durch Hook abgebrochen"
+
+#, c-format
+msgid "'%s' exists; cannot create '%s'"
+msgstr "'%s' existiert; kann '%s' nicht erstellen"
+
+#, c-format
+msgid "cannot process '%s' and '%s' at the same time"
+msgstr "kann '%s' und '%s' nicht zur selben Zeit verarbeiten"
+
+#, c-format
+msgid "could not remove reference %s"
+msgstr "konnte Referenz %s nicht löschen"
+
+#, c-format
+msgid "could not delete reference %s: %s"
+msgstr "konnte Referenz %s nicht entfernen: %s"
+
+#, c-format
+msgid "could not delete references: %s"
+msgstr "konnte Referenzen nicht entfernen: %s"
+
+#, c-format
+msgid "invalid refspec '%s'"
+msgstr "ungültige Refspec '%s'"
+
+#, c-format
+msgid "invalid quoting in push-option value: '%s'"
+msgstr "Ungültiges Quoting beim \"push-option\"-Wert: '%s'"
+
+#, c-format
+msgid "%sinfo/refs not valid: is this a git repository?"
+msgstr "%sinfo/refs nicht gültig: Ist das ein Git-Repository?"
+
+msgid "invalid server response; expected service, got flush packet"
+msgstr "ungültige Antwort des Servers; Service erwartet, Flush-Paket bekommen"
+
+#, c-format
+msgid "invalid server response; got '%s'"
+msgstr "ungültige Serverantwort; '%s' bekommen"
+
+#, c-format
+msgid "repository '%s' not found"
+msgstr "Repository '%s' nicht gefunden"
+
+#, c-format
+msgid "Authentication failed for '%s'"
+msgstr "Authentifizierung fehlgeschlagen für '%s'"
+
+#, c-format
+msgid "unable to access '%s' with http.pinnedPubkey configuration: %s"
+msgstr ""
+"auf '%s' kann nicht mit Konfiguration http.pinnedPubkey zugegriffen werden: "
+"%s"
+
+#, c-format
+msgid "unable to access '%s': %s"
+msgstr "konnte nicht auf '%s' zugreifen: %s"
+
+#, c-format
+msgid "redirecting to %s"
+msgstr "Umleitung nach %s"
+
+msgid "shouldn't have EOF when not gentle on EOF"
+msgstr "sollte kein EOF haben, wenn nicht behutsam mit EOF"
+
+msgid "remote server sent unexpected response end packet"
+msgstr "Remote Server sendete unerwartetes Antwort-Endpaket"
+
+msgid "unable to rewind rpc post data - try increasing http.postBuffer"
+msgstr ""
+"konnte nicht RPC-POST-Daten zurückspulen - Versuchen Sie http.postBuffer zu "
+"erhöhen"
+
+#, c-format
+msgid "remote-curl: bad line length character: %.4s"
+msgstr "remote-curl: ungültiges Zeichen für Zeilenlänge: %.4s"
+
+msgid "remote-curl: unexpected response end packet"
+msgstr "remote-curl: unerwartetes Antwort-Endpaket"
+
+#, c-format
+msgid "RPC failed; %s"
+msgstr "RPC fehlgeschlagen; %s"
+
+msgid "cannot handle pushes this big"
+msgstr "kann solche großen Übertragungen nicht verarbeiten"
+
+#, c-format
+msgid "cannot deflate request; zlib deflate error %d"
+msgstr "kann Request nicht komprimieren; \"zlib deflate\"-Fehler %d"
+
+#, c-format
+msgid "cannot deflate request; zlib end error %d"
+msgstr "kann Request nicht komprimieren; \"zlib end\"-Fehler %d"
+
+#, c-format
+msgid "%d bytes of length header were received"
+msgstr "%d Bytes des Längen-Headers wurden empfangen"
+
+#, c-format
+msgid "%d bytes of body are still expected"
+msgstr "%d Bytes des Bodys werden noch erwartet"
+
+msgid "dumb http transport does not support shallow capabilities"
+msgstr "Dumb HTTP-Transport unterstützt keine shallow-Funktionen"
+
+msgid "fetch failed."
+msgstr "\"fetch\" fehlgeschlagen."
+
+msgid "cannot fetch by sha1 over smart http"
+msgstr "kann SHA-1 nicht über Smart-HTTP anfordern"
+
+#, c-format
+msgid "protocol error: expected sha/ref, got '%s'"
+msgstr "Protokollfehler: SHA-1/Referenz erwartet, '%s' bekommen"
+
+#, c-format
+msgid "http transport does not support %s"
+msgstr "HTTP-Transport unterstützt nicht %s"
+
+msgid "git-http-push failed"
+msgstr "\"git-http-push\" fehlgeschlagen"
+
+msgid "remote-curl: usage: git remote-curl <remote> [<url>]"
+msgstr "remote-curl: Verwendung: git remote-curl <Remote-Repository> [<URL>]"
+
+msgid "remote-curl: error reading command stream from git"
+msgstr "remote-curl: Fehler beim Lesen des Kommando-Streams von Git"
+
+msgid "remote-curl: fetch attempted without a local repo"
+msgstr "remote-curl: \"fetch\" ohne lokales Repository versucht"
+
+#, c-format
+msgid "remote-curl: unknown command '%s' from git"
+msgstr "remote-curl: Unbekannter Befehl '%s' von Git"
+
+#, c-format
+msgid "config remote shorthand cannot begin with '/': %s"
+msgstr ""
+"Kürzel für Remote-Repository in der Konfiguration kann nicht mit '/' "
+"beginnen: %s"
+
+msgid "more than one receivepack given, using the first"
+msgstr "Mehr als ein receivepack-Befehl angegeben, benutze den ersten."
+
+msgid "more than one uploadpack given, using the first"
+msgstr "Mehr als ein uploadpack-Befehl angegeben, benutze den ersten."
+
+#, c-format
+msgid "unrecognized value transfer.credentialsInUrl: '%s'"
+msgstr "unbekannter Wert transfer.credentialsInUrl: '%s'"
+
+#, c-format
+msgid "URL '%s' uses plaintext credentials"
+msgstr "URL '%s' nutzt Anmeldeinformationen im Klartext"
+
+#, c-format
+msgid "Cannot fetch both %s and %s to %s"
+msgstr "Kann 'fetch' nicht für sowohl %s als auch %s nach %s ausführen."
+
+#, c-format
+msgid "%s usually tracks %s, not %s"
+msgstr "%s folgt üblicherweise %s, nicht %s"
+
+#, c-format
+msgid "%s tracks both %s and %s"
+msgstr "%s folgt sowohl %s als auch %s"
+
+#, c-format
+msgid "key '%s' of pattern had no '*'"
+msgstr "Schlüssel '%s' des Musters hatte kein '*'."
+
+#, c-format
+msgid "value '%s' of pattern has no '*'"
+msgstr "Wert '%s' des Musters hat kein '*'."
+
+#, c-format
+msgid "src refspec %s does not match any"
+msgstr "Src-Refspec %s entspricht keiner Referenz."
+
+#, c-format
+msgid "src refspec %s matches more than one"
+msgstr "Src-Refspec %s entspricht mehr als einer Referenz."
+
+#. TRANSLATORS: "matches '%s'%" is the <dst> part of "git push
+#. <remote> <src>:<dst>" push, and "being pushed ('%s')" is
+#. the <src>.
+#.
+#, c-format
+msgid ""
+"The destination you provided is not a full refname (i.e.,\n"
+"starting with \"refs/\"). We tried to guess what you meant by:\n"
+"\n"
+"- Looking for a ref that matches '%s' on the remote side.\n"
+"- Checking if the <src> being pushed ('%s')\n"
+"  is a ref in \"refs/{heads,tags}/\". If so we add a corresponding\n"
+"  refs/{heads,tags}/ prefix on the remote side.\n"
+"\n"
+"Neither worked, so we gave up. You must fully qualify the ref."
+msgstr ""
+"Das angegebene Ziel ist kein vollständiger Referenzname (startet mit \"refs/"
+"\").\n"
+"Wir versuchten zu erraten, was Sie meinten, mit:\n"
+"\n"
+"- Suche einer Referenz, die mit '%s' übereinstimmt, auf der Remote-Seite\n"
+"- Prüfung, ob die versendete <Quelle> ('%s') eine Referenz in \"refs/{heads,"
+"tags}\"\n"
+"  ist, in dessen Falle wir einen entsprechenden refs/{heads,tags} Präfix "
+"auf\n"
+"  der Remote-Seite hinzufügen würden.\n"
+"\n"
+"Keines hat funktioniert, sodass wir aufgegeben haben. Sie müssen die\n"
+"Referenz mit vollqualifizierten Namen angeben."
+
+#, c-format
+msgid ""
+"The <src> part of the refspec is a commit object.\n"
+"Did you mean to create a new branch by pushing to\n"
+"'%s:refs/heads/%s'?"
+msgstr ""
+"Der <Quelle> Teil der Refspec ist ein Commit-Objekt.\n"
+"Meinten Sie, einen neuen Branch mittels Push nach\n"
+"'%s:refs/heads/%s' zu erstellen?"
+
+#, c-format
+msgid ""
+"The <src> part of the refspec is a tag object.\n"
+"Did you mean to create a new tag by pushing to\n"
+"'%s:refs/tags/%s'?"
+msgstr ""
+"Der <Quelle> Teil der Refspec ist ein Tag-Objekt.\n"
+"Meinten Sie, einen neuen Tag mittels Push nach\n"
+"'%s:refs/tags/%s' zu erstellen?"
+
+#, c-format
+msgid ""
+"The <src> part of the refspec is a tree object.\n"
+"Did you mean to tag a new tree by pushing to\n"
+"'%s:refs/tags/%s'?"
+msgstr ""
+"Der <Quelle> Teil der Refspec ist ein Tree-Objekt.\n"
+"Meinten Sie, einen Tag für ein neues Tree-Objekt\n"
+"mittels Push nach '%s:refs/tags/'%s' zu erstellen?"
+
+#, c-format
+msgid ""
+"The <src> part of the refspec is a blob object.\n"
+"Did you mean to tag a new blob by pushing to\n"
+"'%s:refs/tags/%s'?"
+msgstr ""
+"Der <Quelle> Teil der Refspec ist ein Blob-Objekt.\n"
+"Meinten Sie, einen Tag für ein neues Blob-Objekt\n"
+"mittels Push nach '%s:refs/tags/%s' zu erstellen?"
+
+#, c-format
+msgid "%s cannot be resolved to branch"
+msgstr "%s kann nicht zu Branch aufgelöst werden."
+
+#, c-format
+msgid "unable to delete '%s': remote ref does not exist"
+msgstr "Konnte '%s' nicht löschen: Remote-Referenz existiert nicht."
+
+#, c-format
+msgid "dst refspec %s matches more than one"
+msgstr "Dst-Refspec %s entspricht mehr als einer Referenz."
+
+#, c-format
+msgid "dst ref %s receives from more than one src"
+msgstr "Dst-Referenz %s empfängt von mehr als einer Quelle"
+
+msgid "HEAD does not point to a branch"
+msgstr "HEAD zeigt auf keinen Branch"
+
+#, c-format
+msgid "no such branch: '%s'"
+msgstr "Branch nicht gefunden: '%s'"
+
+#, c-format
+msgid "no upstream configured for branch '%s'"
+msgstr "Kein Upstream-Branch für Branch '%s' konfiguriert."
+
+#, c-format
+msgid "upstream branch '%s' not stored as a remote-tracking branch"
+msgstr "Upstream-Branch '%s' nicht als Remote-Tracking-Branch gespeichert"
+
+#, c-format
+msgid "push destination '%s' on remote '%s' has no local tracking branch"
+msgstr ""
+"Ziel für \"push\" '%s' auf Remote-Repository '%s' hat keinen lokal gefolgten "
+"Branch"
+
+#, c-format
+msgid "branch '%s' has no remote for pushing"
+msgstr "Branch '%s' hat keinen Upstream-Branch gesetzt"
+
+#, c-format
+msgid "push refspecs for '%s' do not include '%s'"
+msgstr "Push-Refspecs für '%s' beinhalten nicht '%s'"
+
+msgid "push has no destination (push.default is 'nothing')"
+msgstr "kein Ziel für \"push\" (push.default ist 'nothing')"
+
+msgid "cannot resolve 'simple' push to a single destination"
+msgstr "kann einzelnes Ziel für \"push\" im Modus 'simple' nicht auflösen"
+
+#, c-format
+msgid "couldn't find remote ref %s"
+msgstr "Konnte Remote-Referenz %s nicht finden."
+
+#, c-format
+msgid "* Ignoring funny ref '%s' locally"
+msgstr "* Ignoriere sonderbare Referenz '%s' lokal"
+
+#, c-format
+msgid "Your branch is based on '%s', but the upstream is gone.\n"
+msgstr ""
+"Ihr Branch basiert auf '%s', aber der Upstream-Branch wurde entfernt.\n"
+
+msgid "  (use \"git branch --unset-upstream\" to fixup)\n"
+msgstr "  (benutzen Sie \"git branch --unset-upstream\" zum Beheben)\n"
+
+#, c-format
+msgid "Your branch is up to date with '%s'.\n"
+msgstr "Ihr Branch ist auf demselben Stand wie '%s'.\n"
+
+#, c-format
+msgid "Your branch and '%s' refer to different commits.\n"
+msgstr "Ihr Branch und '%s' zeigen auf unterschiedliche Commits.\n"
+
+#, c-format
+msgid "  (use \"%s\" for details)\n"
+msgstr "  (benutzen Sie \"%s\" für Details)\n"
+
+#, c-format
+msgid "Your branch is ahead of '%s' by %d commit.\n"
+msgid_plural "Your branch is ahead of '%s' by %d commits.\n"
+msgstr[0] "Ihr Branch ist %2$d Commit vor '%1$s'.\n"
+msgstr[1] "Ihr Branch ist %2$d Commits vor '%1$s'.\n"
+
+msgid "  (use \"git push\" to publish your local commits)\n"
+msgstr "  (benutzen Sie \"git push\", um lokale Commits zu publizieren)\n"
+
+#, c-format
+msgid "Your branch is behind '%s' by %d commit, and can be fast-forwarded.\n"
+msgid_plural ""
+"Your branch is behind '%s' by %d commits, and can be fast-forwarded.\n"
+msgstr[0] ""
+"Ihr Branch ist %2$d Commit hinter '%1$s', und kann vorgespult werden.\n"
+msgstr[1] ""
+"Ihr Branch ist %2$d Commits hinter '%1$s', und kann vorgespult werden.\n"
+
+msgid "  (use \"git pull\" to update your local branch)\n"
+msgstr ""
+"  (benutzen Sie \"git pull\", um Ihren lokalen Branch zu aktualisieren)\n"
+
+#, c-format
+msgid ""
+"Your branch and '%s' have diverged,\n"
+"and have %d and %d different commit each, respectively.\n"
+msgid_plural ""
+"Your branch and '%s' have diverged,\n"
+"and have %d and %d different commits each, respectively.\n"
+msgstr[0] ""
+"Ihr Branch und '%s' sind divergiert,\n"
+"und haben jeweils %d und %d unterschiedliche Commits.\n"
+msgstr[1] ""
+"Ihr Branch und '%s' sind divergiert,\n"
+"und haben jeweils %d und %d unterschiedliche Commits.\n"
+
+msgid "  (use \"git pull\" to merge the remote branch into yours)\n"
+msgstr ""
+"  (benutzen Sie \"git pull\", um Ihren Branch mit dem Remote-Branch "
+"zusammenzuführen)\n"
+
+#, c-format
+msgid "cannot parse expected object name '%s'"
+msgstr "Kann erwarteten Objektnamen '%s' nicht parsen."
+
+#, c-format
+msgid "cannot strip one component off url '%s'"
+msgstr "Kann eine Komponente von URL '%s' nicht extrahieren"
+
+#, c-format
+msgid "bad replace ref name: %s"
+msgstr "ungültiger Name für ersetzende Referenz: %s"
+
+#, c-format
+msgid "duplicate replace ref: %s"
+msgstr "doppelte ersetzende Referenz: %s"
+
+#, c-format
+msgid "replace depth too high for object %s"
+msgstr "Ersetzungstiefe zu hoch für Objekt %s"
+
+msgid "corrupt MERGE_RR"
+msgstr "Fehlerhaftes MERGE_RR"
+
+msgid "unable to write rerere record"
+msgstr "Konnte Rerere-Eintrag nicht schreiben."
+
+#, c-format
+msgid "there were errors while writing '%s' (%s)"
+msgstr "Fehler beim Schreiben von '%s' (%s)."
+
+#, c-format
+msgid "could not parse conflict hunks in '%s'"
+msgstr "Konnte Konflikt-Blöcke in '%s' nicht parsen."
+
+#, c-format
+msgid "failed utime() on '%s'"
+msgstr "Fehler beim Aufruf von utime() auf '%s'."
+
+#, c-format
+msgid "writing '%s' failed"
+msgstr "Schreiben von '%s' fehlgeschlagen."
+
+#, c-format
+msgid "Staged '%s' using previous resolution."
+msgstr "'%s' mit vorheriger Konfliktauflösung zum Commit vorgemerkt."
+
+#, c-format
+msgid "Recorded resolution for '%s'."
+msgstr "Konfliktauflösung für '%s' aufgezeichnet."
+
+#, c-format
+msgid "Resolved '%s' using previous resolution."
+msgstr "Konflikte in '%s' mit vorheriger Konfliktauflösung beseitigt."
+
+#, c-format
+msgid "cannot unlink stray '%s'"
+msgstr "Kann '%s' nicht löschen."
+
+#, c-format
+msgid "Recorded preimage for '%s'"
+msgstr "Preimage für '%s' aufgezeichnet."
+
+#, c-format
+msgid "failed to update conflicted state in '%s'"
+msgstr "Fehler beim Aktualisieren des Konflikt-Status in '%s'."
+
+#, c-format
+msgid "no remembered resolution for '%s'"
+msgstr "Keine aufgezeichnete Konfliktauflösung für '%s'."
+
+#, c-format
+msgid "cannot unlink '%s'"
+msgstr "Kann '%s' nicht löschen."
+
+#, c-format
+msgid "Updated preimage for '%s'"
+msgstr "Preimage für '%s' aktualisiert."
+
+#, c-format
+msgid "Forgot resolution for '%s'\n"
+msgstr "Aufgezeichnete Konfliktauflösung für '%s' gelöscht.\n"
+
+msgid "unable to open rr-cache directory"
+msgstr "Konnte rr-cache Verzeichnis nicht öffnen."
+
+msgid "update the index with reused conflict resolution if possible"
+msgstr ""
+"Index, wenn möglich, mit wiederverwendeter Konfliktauflösung aktualisieren"
+
+msgid "could not determine HEAD revision"
+msgstr "Konnte HEAD-Commit nicht bestimmen."
+
+#, c-format
+msgid "failed to find tree of %s"
+msgstr "Fehler beim Finden des \"Tree\"-Objektes von %s."
+
+msgid "--unpacked=<packfile> no longer supported"
+msgstr "--unpacked=<Pack-Datei> wird nicht länger unterstützt"
+
+msgid "your current branch appears to be broken"
+msgstr "Ihr aktueller Branch scheint fehlerhaft zu sein."
+
+#, c-format
+msgid "your current branch '%s' does not have any commits yet"
+msgstr "Ihr aktueller Branch '%s' hat noch keine Commits."
+
+msgid "object filtering requires --objects"
+msgstr "Das Filtern von Objekten erfordert --objects."
+
+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"
+
+#, c-format
+msgid "cannot create async thread: %s"
+msgstr "Konnte Thread für async nicht erzeugen: %s"
+
+msgid "unexpected flush packet while reading remote unpack status"
+msgstr "Unerwartetes Flush-Paket beim Lesen des Remote-Unpack-Status."
+
+#, c-format
+msgid "unable to parse remote unpack status: %s"
+msgstr "Konnte Status des Entpackens der Gegenseite nicht parsen: %s"
+
+#, c-format
+msgid "remote unpack failed: %s"
+msgstr "Entpacken auf der Gegenseite fehlgeschlagen: %s"
+
+msgid "failed to sign the push certificate"
+msgstr "Fehler beim Signieren des \"push\"-Zertifikates"
+
+msgid "send-pack: unable to fork off fetch subprocess"
+msgstr "send-pack: konnte Fetch-Subprozess nicht abspalten"
+
+msgid "push negotiation failed; proceeding anyway with push"
+msgstr "Push-Verhandlung fehlgeschlagen; fahre trotzdem mit dem Push fort"
+
+msgid "the receiving end does not support this repository's hash algorithm"
+msgstr ""
+"die Gegenseite unterstützt nicht den Hash-Algorithmus dieses Repositories"
+
+msgid "the receiving end does not support --signed push"
+msgstr ""
+"die Gegenseite unterstützt keinen signierten Versand (\"--signed push\")"
+
+msgid ""
+"not sending a push certificate since the receiving end does not support --"
+"signed push"
+msgstr ""
+"kein Versand des \"push\"-Zertifikates, da die Gegenseite keinen signierten\n"
+"Versand (\"--signed push\") unterstützt"
+
+msgid "the receiving end does not support --atomic push"
+msgstr "die Gegenseite unterstützt keinen atomaren Versand (\"--atomic push\")"
+
+msgid "the receiving end does not support push options"
+msgstr "die Gegenseite unterstützt keine Push-Optionen"
+
+#, c-format
+msgid "invalid commit message cleanup mode '%s'"
+msgstr "Ungültiger \"cleanup\"-Modus '%s' für Commit-Beschreibungen."
+
+#, c-format
+msgid "could not delete '%s'"
+msgstr "Konnte '%s' nicht löschen."
+
+msgid "revert"
+msgstr "Revert"
+
+msgid "cherry-pick"
+msgstr "Cherry-Pick"
+
+msgid "rebase"
+msgstr "Rebase"
+
+#, c-format
+msgid "unknown action: %d"
+msgstr "Unbekannte Aktion: %d"
+
+msgid ""
+"after resolving the conflicts, mark the corrected paths\n"
+"with 'git add <paths>' or 'git rm <paths>'"
+msgstr ""
+"nach Auflösung der Konflikte markieren Sie die korrigierten Pfade\n"
+"mit 'git add <Pfade>' oder 'git rm <Pfade>'"
+
+msgid ""
+"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 ""
+"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."
+
+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."
+
+#, c-format
+msgid "could not lock '%s'"
+msgstr "Konnte '%s' nicht sperren"
+
+#, c-format
+msgid "could not write to '%s'"
+msgstr "Konnte nicht nach '%s' schreiben."
+
+#, c-format
+msgid "could not write eol to '%s'"
+msgstr "Konnte EOL nicht nach '%s' schreiben."
+
+#, c-format
+msgid "failed to finalize '%s'"
+msgstr "Fehler beim Fertigstellen von '%s'."
+
+#, c-format
+msgid "your local changes would be overwritten by %s."
+msgstr "Ihre lokalen Änderungen würden durch den %s überschrieben werden."
+
+msgid "commit your changes or stash them to proceed."
+msgstr ""
+"Committen Sie Ihre Änderungen oder benutzen Sie \"stash\", um fortzufahren."
+
+#, c-format
+msgid "%s: fast-forward"
+msgstr "%s: Vorspulen"
+
+#. TRANSLATORS: %s will be "revert", "cherry-pick" or
+#. "rebase".
+#.
+#, c-format
+msgid "%s: Unable to write new index file"
+msgstr "%s: Konnte neue Index-Datei nicht schreiben"
+
+msgid "unable to update cache tree"
+msgstr "Konnte Cache-Verzeichnis nicht aktualisieren."
+
+msgid "could not resolve HEAD commit"
+msgstr "Konnte HEAD-Commit nicht auflösen."
+
+#, c-format
+msgid "no key present in '%.*s'"
+msgstr "Kein Schlüssel in '%.*s' vorhanden."
+
+#, c-format
+msgid "unable to dequote value of '%s'"
+msgstr "Konnte Anführungszeichen von '%s' nicht entfernen."
+
+msgid "'GIT_AUTHOR_NAME' already given"
+msgstr "'GIT_AUTHOR_NAME' bereits angegeben."
+
+msgid "'GIT_AUTHOR_EMAIL' already given"
+msgstr "'GIT_AUTHOR_EMAIL' bereits angegeben."
+
+msgid "'GIT_AUTHOR_DATE' already given"
+msgstr "'GIT_AUTHOR_DATE' bereits angegeben."
+
+#, c-format
+msgid "unknown variable '%s'"
+msgstr "Unbekannte Variable '%s'"
+
+msgid "missing 'GIT_AUTHOR_NAME'"
+msgstr "'GIT_AUTHOR_NAME' fehlt."
+
+msgid "missing 'GIT_AUTHOR_EMAIL'"
+msgstr "'GIT_AUTHOR_EMAIL' fehlt."
+
+msgid "missing 'GIT_AUTHOR_DATE'"
+msgstr "'GIT_AUTHOR_DATE' fehlt."
+
+#, c-format
+msgid ""
+"you have staged changes in your working tree\n"
+"If these changes are meant to be squashed into the previous commit, run:\n"
+"\n"
+"  git commit --amend %s\n"
+"\n"
+"If they are meant to go into a new commit, run:\n"
+"\n"
+"  git commit %s\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 %s\n"
+"\n"
+"Wenn daraus ein neuer Commit erzeugt werden soll, führen Sie aus:\n"
+"\n"
+"  git commit %s\n"
+"\n"
+"Im Anschluss führen Sie zum Fortfahren aus:\n"
+"\n"
+"  git rebase --continue\n"
+
+msgid "'prepare-commit-msg' hook failed"
+msgstr "'prepare-commit-msg' Hook fehlgeschlagen."
+
+msgid ""
+"Your name and email address were configured automatically based\n"
+"on your username and hostname. Please check that they are accurate.\n"
+"You can suppress this message by setting them explicitly. Run the\n"
+"following command and follow the instructions in your editor to edit\n"
+"your configuration file:\n"
+"\n"
+"    git config --global --edit\n"
+"\n"
+"After doing this, you may fix the identity used for this commit with:\n"
+"\n"
+"    git commit --amend --reset-author\n"
+msgstr ""
+"Ihr Name und E-Mail Adresse wurden automatisch auf Basis\n"
+"Ihres Benutzer- und Rechnernamens konfiguriert. Bitte prüfen Sie, dass\n"
+"diese zutreffend sind. Sie können diese Meldung unterdrücken, indem Sie\n"
+"diese explizit setzen. Führen Sie dazu den folgenden Befehl aus und folgen\n"
+"Sie den Anweisungen in Ihrem Editor, um die Konfigurationsdatei zu "
+"bearbeiten:\n"
+"\n"
+"    git config --global --edit\n"
+"\n"
+"Nachdem Sie das getan haben, können Sie Ihre Identität für diesen Commit\n"
+"ändern mit:\n"
+"\n"
+"    git commit --amend --reset-author\n"
+
+msgid ""
+"Your name and email address were configured automatically based\n"
+"on your username and hostname. Please check that they are accurate.\n"
+"You can suppress this message by setting them explicitly:\n"
+"\n"
+"    git config --global user.name \"Your Name\"\n"
+"    git config --global user.email you@example.com\n"
+"\n"
+"After doing this, you may fix the identity used for this commit with:\n"
+"\n"
+"    git commit --amend --reset-author\n"
+msgstr ""
+"Ihr Name und E-Mail Adresse wurden automatisch auf Basis\n"
+"Ihres Benutzer- und Rechnernamens konfiguriert. Bitte prüfen Sie, dass\n"
+"diese zutreffend sind. Sie können diese Meldung unterdrücken, indem Sie\n"
+"diese explizit setzen:\n"
+"\n"
+"    git config --global user.name \"Ihr Name\"\n"
+"    git config --global user.email ihre@emailadresse.de\n"
+"\n"
+"Nachdem Sie das getan haben, können Sie Ihre Identität für diesen Commit "
+"ändern:\n"
+"\n"
+"    git commit --amend --reset-author\n"
+
+msgid "couldn't look up newly created commit"
+msgstr "Konnte neu erstellten Commit nicht nachschlagen."
+
+msgid "could not parse newly created commit"
+msgstr "Konnte neu erstellten Commit nicht analysieren."
+
+msgid "unable to resolve HEAD after creating commit"
+msgstr "Konnte HEAD nicht auflösen, nachdem der Commit erstellt wurde."
+
+msgid "detached HEAD"
+msgstr "losgelöster HEAD"
+
+msgid " (root-commit)"
+msgstr " (Root-Commit)"
+
+msgid "could not parse HEAD"
+msgstr "Konnte HEAD nicht parsen."
+
+#, c-format
+msgid "HEAD %s is not a commit!"
+msgstr "HEAD %s ist kein Commit!"
+
+msgid "unable to parse commit author"
+msgstr "Konnte Commit-Autor nicht parsen."
+
+#, c-format
+msgid "unable to read commit message from '%s'"
+msgstr "Konnte Commit-Beschreibung von '%s' nicht lesen."
+
+#, c-format
+msgid "invalid author identity '%s'"
+msgstr "ungültige Autor-Identität '%s'"
+
+msgid "corrupt author: missing date information"
+msgstr "unbrauchbarer Autor: Datumsinformationen fehlen"
+
+#, c-format
+msgid "could not update %s"
+msgstr "Konnte %s nicht aktualisieren."
+
+#, c-format
+msgid "could not parse commit %s"
+msgstr "Konnte Commit %s nicht parsen."
+
+#, c-format
+msgid "could not parse parent commit %s"
+msgstr "Konnte Eltern-Commit %s nicht parsen."
+
+#, c-format
+msgid "unknown command: %d"
+msgstr "Unbekannter Befehl: %d"
+
+msgid "This is the 1st commit message:"
+msgstr "Das ist die erste Commit-Beschreibung:"
+
+#, c-format
+msgid "This is the commit message #%d:"
+msgstr "Das ist Commit-Beschreibung #%d:"
+
+msgid "The 1st commit message will be skipped:"
+msgstr "Die erste Commit-Beschreibung wird übersprungen:"
+
+#, c-format
+msgid "The commit message #%d will be skipped:"
+msgstr "Die Commit-Beschreibung #%d wird ausgelassen:"
+
+#, c-format
+msgid "This is a combination of %d commits."
+msgstr "Das ist eine Kombination aus %d Commits."
+
+#, c-format
+msgid "cannot write '%s'"
+msgstr "kann '%s' nicht schreiben"
+
+msgid "need a HEAD to fixup"
+msgstr "benötige HEAD für fixup"
+
+msgid "could not read HEAD"
+msgstr "Konnte HEAD nicht lesen"
+
+msgid "could not read HEAD's commit message"
+msgstr "Konnte Commit-Beschreibung von HEAD nicht lesen"
+
+#, c-format
+msgid "could not read commit message of %s"
+msgstr "Konnte Commit-Beschreibung von %s nicht lesen."
+
+msgid "your index file is unmerged."
+msgstr "Ihre Index-Datei ist nicht zusammengeführt."
+
+msgid "cannot fixup root commit"
+msgstr "kann fixup nicht auf Root-Commit anwenden"
+
+#, 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."
+
+#, c-format
+msgid "commit %s does not have parent %d"
+msgstr "Commit %s hat keinen Eltern-Commit %d"
+
+#, 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.
+#, c-format
+msgid "%s: cannot parse parent commit %s"
+msgstr "%s: kann Eltern-Commit %s nicht parsen"
+
+#, c-format
+msgid "could not rename '%s' to '%s'"
+msgstr "Konnte '%s' nicht zu '%s' umbenennen."
+
+#, c-format
+msgid "could not revert %s... %s"
+msgstr "Konnte \"revert\" nicht auf %s... (%s) ausführen"
+
+#, c-format
+msgid "could not apply %s... %s"
+msgstr "Konnte %s... (%s) nicht anwenden"
+
+#, c-format
+msgid "dropping %s %s -- patch contents already upstream\n"
+msgstr "Weglassen von %s %s -- Patch-Inhalte sind bereits im Upstream-Branch\n"
+
+#, c-format
+msgid "git %s: failed to read the index"
+msgstr "git %s: Fehler beim Lesen des Index"
+
+#, c-format
+msgid "git %s: failed to refresh the index"
+msgstr "git %s: Fehler beim Aktualisieren des Index"
+
+#, c-format
+msgid "%s does not accept arguments: '%s'"
+msgstr "%s akzeptiert keine Argumente: '%s'"
+
+#, c-format
+msgid "missing arguments for %s"
+msgstr "Fehlende Argumente für %s."
+
+#, c-format
+msgid "could not parse '%s'"
+msgstr "Konnte '%s' nicht parsen."
+
+#, c-format
+msgid "invalid line %d: %.*s"
+msgstr "Ungültige Zeile %d: %.*s"
+
+#, c-format
+msgid "cannot '%s' without a previous commit"
+msgstr "Kann '%s' nicht ohne vorherigen Commit ausführen"
+
+msgid "cancelling a cherry picking in progress"
+msgstr "Abbrechen eines laufenden \"cherry-pick\""
+
+msgid "cancelling a revert in progress"
+msgstr "Abbrechen eines laufenden \"revert\""
+
+msgid "please fix this using 'git rebase --edit-todo'."
+msgstr ""
+"Bitte beheben Sie dieses, indem Sie 'git rebase --edit-todo' ausführen."
+
+#, c-format
+msgid "unusable instruction sheet: '%s'"
+msgstr "Unbenutzbares Instruktionsblatt: '%s'"
+
+msgid "no commits parsed."
+msgstr "Keine Commits geparst."
+
+msgid "cannot cherry-pick during a revert."
+msgstr "Kann Cherry-Pick nicht während eines Reverts ausführen."
+
+msgid "cannot revert during a cherry-pick."
+msgstr "Kann Revert nicht während eines Cherry-Picks ausführen."
+
+msgid "unusable squash-onto"
+msgstr "unbenutzbares squash-onto"
+
+#, c-format
+msgid "malformed options sheet: '%s'"
+msgstr "fehlerhaftes Optionsblatt: '%s'"
+
+msgid "empty commit set passed"
+msgstr "leere Menge von Commits übergeben"
+
+msgid "revert is already in progress"
+msgstr "\"revert\" ist bereits im Gange"
+
+#, c-format
+msgid "try \"git revert (--continue | %s--abort | --quit)\""
+msgstr "versuchen Sie \"git revert (--continue | %s--abort | --quit)\""
+
+msgid "cherry-pick is already in progress"
+msgstr "\"cherry-pick\" wird bereits durchgeführt"
+
+#, c-format
+msgid "try \"git cherry-pick (--continue | %s--abort | --quit)\""
+msgstr "versuchen Sie \"git cherry-pick (--continue | %s--abort | --quit)\""
+
+#, c-format
+msgid "could not create sequencer directory '%s'"
+msgstr "konnte \"sequencer\"-Verzeichnis '%s' nicht erstellen"
+
+msgid "could not lock HEAD"
+msgstr "konnte HEAD nicht sperren"
+
+msgid "no cherry-pick or revert in progress"
+msgstr "kein \"cherry-pick\" oder \"revert\" im Gange"
+
+msgid "cannot resolve HEAD"
+msgstr "kann HEAD nicht auflösen"
+
+msgid "cannot abort from a branch yet to be born"
+msgstr "kann nicht abbrechen: bin auf einem Branch, der noch nicht geboren ist"
+
+#, c-format
+msgid "cannot read '%s': %s"
+msgstr "kann '%s' nicht lesen: %s"
+
+msgid "unexpected end of file"
+msgstr "unerwartetes Dateiende"
+
+#, c-format
+msgid "stored pre-cherry-pick HEAD file '%s' is corrupt"
+msgstr "gespeicherte \"pre-cherry-pick\" HEAD Datei '%s' ist beschädigt"
+
+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."
+
+msgid "no revert in progress"
+msgstr "kein Revert im Gange"
+
+msgid "no cherry-pick in progress"
+msgstr "kein \"cherry-pick\" im Gange"
+
+msgid "failed to skip the commit"
+msgstr "Überspringen des Commits fehlgeschlagen"
+
+msgid "there is nothing to skip"
+msgstr "nichts zum Überspringen vorhanden"
+
+#, c-format
+msgid ""
+"have you committed already?\n"
+"try \"git %s --continue\""
+msgstr ""
+"Haben Sie bereits committet?\n"
+"Versuchen Sie \"git %s --continue\""
+
+msgid "cannot read HEAD"
+msgstr "kann HEAD nicht lesen"
+
+#, c-format
+msgid "unable to copy '%s' to '%s'"
+msgstr "konnte '%s' nicht nach '%s' kopieren"
+
+#, c-format
+msgid ""
+"You can amend the commit now, with\n"
+"\n"
+"  git commit --amend %s\n"
+"\n"
+"Once you are satisfied with your changes, run\n"
+"\n"
+"  git rebase --continue\n"
+msgstr ""
+"Sie können den Commit nun nachbessern mit:\n"
+"\n"
+"  git commit --amend %s\n"
+"\n"
+"Sobald Sie mit Ihren Änderungen zufrieden sind, führen Sie aus:\n"
+"\n"
+"  git rebase --continue\n"
+
+#, c-format
+msgid "Could not apply %s... %.*s"
+msgstr "Konnte %s... (%.*s) nicht anwenden"
+
+#, c-format
+msgid "Could not merge %.*s"
+msgstr "Konnte \"%.*s\" nicht zusammenführen"
+
+#, c-format
+msgid "Executing: %s\n"
+msgstr "Führe aus: %s\n"
+
+#, c-format
+msgid ""
+"execution failed: %s\n"
+"%sYou can fix the problem, and then run\n"
+"\n"
+"  git rebase --continue\n"
+"\n"
+msgstr ""
+"Ausführung fehlgeschlagen: %s\n"
+"%sSie können das Problem beheben, und dann\n"
+"\n"
+"\tgit rebase --continue\n"
+"\n"
+"ausführen.\n"
+
+msgid "and made changes to the index and/or the working tree\n"
+msgstr "Der Index und/oder das Arbeitsverzeichnis wurde geändert.\n"
+
+#, c-format
+msgid ""
+"execution succeeded: %s\n"
+"but left changes to the index and/or the working tree\n"
+"Commit or stash your changes, and then run\n"
+"\n"
+"  git rebase --continue\n"
+"\n"
+msgstr ""
+"Ausführung erfolgreich: %s\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"
+"  git rebase --continue\n"
+"\n"
+
+#, c-format
+msgid "illegal label name: '%.*s'"
+msgstr "unerlaubter Beschriftungsname: '%.*s'"
+
+msgid "writing fake root commit"
+msgstr "unechten Root-Commit schreiben"
+
+msgid "writing squash-onto"
+msgstr "squash-onto schreiben"
+
+#, c-format
+msgid "could not resolve '%s'"
+msgstr "konnte '%s' nicht auflösen"
+
+msgid "cannot merge without a current revision"
+msgstr "kann nicht ohne einen aktuellen Commit mergen"
+
+#, c-format
+msgid "unable to parse '%.*s'"
+msgstr "konnte '%.*s' nicht parsen"
+
+#, c-format
+msgid "nothing to merge: '%.*s'"
+msgstr "nichts zum Zusammenführen: '%.*s'"
+
+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"
+
+#, c-format
+msgid "could not get commit message of '%s'"
+msgstr "konnte keine Commit-Beschreibung von '%s' bekommen"
+
+#, c-format
+msgid "could not even attempt to merge '%.*s'"
+msgstr "konnte nicht einmal versuchen '%.*s' zu mergen"
+
+msgid "merge: Unable to write new index file"
+msgstr "merge: Konnte neue Index-Datei nicht schreiben."
+
+msgid "Cannot autostash"
+msgstr "Kann automatischen Stash nicht erzeugen"
+
+#, c-format
+msgid "Unexpected stash response: '%s'"
+msgstr "Unerwartete 'stash'-Antwort: '%s'"
+
+#, c-format
+msgid "Could not create directory for '%s'"
+msgstr "Konnte Verzeichnis für '%s' nicht erstellen"
+
+#, c-format
+msgid "Created autostash: %s\n"
+msgstr "Automatischen Stash erzeugt: %s\n"
+
+msgid "could not reset --hard"
+msgstr "konnte 'reset --hard' nicht ausführen"
+
+#, c-format
+msgid "Applied autostash.\n"
+msgstr "Automatischen Stash angewendet.\n"
+
+#, c-format
+msgid "cannot store %s"
+msgstr "kann %s nicht speichern"
+
+#, c-format
+msgid ""
+"%s\n"
+"Your changes are safe in the stash.\n"
+"You can run \"git stash pop\" or \"git stash drop\" at any time.\n"
+msgstr ""
+"%s\n"
+"Ihre Änderungen sind im Stash sicher.\n"
+"Sie können jederzeit \"git stash pop\" oder \"git stash drop\" ausführen.\n"
+
+msgid "Applying autostash resulted in conflicts."
+msgstr "Beim Anwenden des automatischen Stash traten Konflikte auf."
+
+msgid "Autostash exists; creating a new stash entry."
+msgstr "Automatischer Stash existiert; ein neuer Stash-Eintrag wird erstellt."
+
+msgid "could not detach HEAD"
+msgstr "konnte HEAD nicht loslösen"
+
+#, c-format
+msgid "Stopped at HEAD\n"
+msgstr "Angehalten bei HEAD\n"
+
+#, c-format
+msgid "Stopped at %s\n"
+msgstr "Angehalten bei %s\n"
+
+#, c-format
+msgid ""
+"Could not execute the todo command\n"
+"\n"
+"    %.*s\n"
+"It has been rescheduled; To edit the command before continuing, please\n"
+"edit the todo list first:\n"
+"\n"
+"    git rebase --edit-todo\n"
+"    git rebase --continue\n"
+msgstr ""
+"Konnte TODO-Befehl nicht ausführen\n"
+"\n"
+"    %.*s\n"
+"Dieser wurde neu angesetzt; Um den Befehl zu bearbeiten, bevor fortgesetzt "
+"wird,\n"
+"bearbeiten Sie bitte zuerst die TODO-Liste:\n"
+"\n"
+"    git rebase --edit-todo\n"
+"    git rebase --continue\n"
+
+#, c-format
+msgid "Rebasing (%d/%d)%s"
+msgstr "Rebase (%d/%d)%s"
+
+#, c-format
+msgid "Stopped at %s...  %.*s\n"
+msgstr "Angehalten bei %s... %.*s\n"
+
+#, c-format
+msgid "unknown command %d"
+msgstr "Unbekannter Befehl %d"
+
+msgid "could not read orig-head"
+msgstr "Konnte orig-head nicht lesen."
+
+msgid "could not read 'onto'"
+msgstr "Konnte 'onto' nicht lesen."
+
+#, c-format
+msgid "could not update HEAD to %s"
+msgstr "Konnte HEAD nicht auf %s aktualisieren."
+
+#, c-format
+msgid "Successfully rebased and updated %s.\n"
+msgstr "Erfolgreich Rebase ausgeführt und %s aktualisiert.\n"
+
+msgid "cannot rebase: You have unstaged changes."
+msgstr ""
+"Rebase nicht möglich: Sie haben Änderungen, die nicht zum Commit\n"
+"vorgemerkt sind."
+
+msgid "cannot amend non-existing commit"
+msgstr "Kann nicht existierenden Commit nicht nachbessern."
+
+#, c-format
+msgid "invalid file: '%s'"
+msgstr "Ungültige Datei: '%s'"
+
+#, c-format
+msgid "invalid contents: '%s'"
+msgstr "Ungültige Inhalte: '%s'"
+
+msgid ""
+"\n"
+"You have uncommitted changes in your working tree. Please, commit them\n"
+"first and then run 'git rebase --continue' again."
+msgstr ""
+"\n"
+"Sie haben nicht committete Änderungen in Ihrem Arbeitsverzeichnis. Bitte\n"
+"committen Sie diese zuerst und führen Sie dann 'git rebase --continue'\n"
+"erneut aus."
+
+#, c-format
+msgid "could not write file: '%s'"
+msgstr "Konnte Datei nicht schreiben: '%s'"
+
+msgid "could not remove CHERRY_PICK_HEAD"
+msgstr "Konnte CHERRY_PICK_HEAD nicht löschen."
+
+msgid "could not commit staged changes."
+msgstr "Konnte Änderungen aus der Staging-Area nicht committen."
+
+#, c-format
+msgid "%s: can't cherry-pick a %s"
+msgstr "%s: %s kann nicht in \"cherry-pick\" benutzt werden"
+
+#, c-format
+msgid "%s: bad revision"
+msgstr "%s: ungültiger Commit"
+
+msgid "can't revert as initial commit"
+msgstr "Kann nicht als allerersten Commit einen Revert ausführen."
+
+#, c-format
+msgid "skipped previously applied commit %s"
+msgstr "zuvor angewendeten Commit %s übersprungen"
+
+msgid "use --reapply-cherry-picks to include skipped commits"
+msgstr ""
+"verwenden Sie --reapply-cherry-picks, um übersprungene Commits einzubeziehen"
+
+msgid "make_script: unhandled options"
+msgstr "make_script: unbehandelte Optionen"
+
+msgid "make_script: error preparing revisions"
+msgstr "make_script: Fehler beim Vorbereiten der Commits"
+
+msgid "nothing to do"
+msgstr "Nichts zu tun."
+
+msgid "could not skip unnecessary pick commands"
+msgstr "Konnte unnötige \"pick\"-Befehle nicht auslassen."
+
+msgid "the script was already rearranged."
+msgstr "Das Script wurde bereits umgeordnet."
+
+#, c-format
+msgid "'%s' is outside repository at '%s'"
+msgstr "'%s' liegt außerhalb des Repositories von '%s'"
+
+#, c-format
+msgid ""
+"%s: no such path in the working tree.\n"
+"Use 'git <command> -- <path>...' to specify paths that do not exist locally."
+msgstr ""
+"%s: Pfad nicht im Arbeitsverzeichnis gefunden.\n"
+"Benutzen Sie 'git <Befehl> -- <Pfad>...' zur Angabe von Pfaden, die lokal\n"
+"nicht existieren."
+
+#, c-format
+msgid ""
+"ambiguous argument '%s': unknown revision or path not in the working tree.\n"
+"Use '--' to separate paths from revisions, like this:\n"
+"'git <command> [<revision>...] -- [<file>...]'"
+msgstr ""
+"mehrdeutiges Argument '%s': unbekannter Commit oder Pfad existiert nicht\n"
+"im Arbeitsverzeichnis\n"
+"Benutzen Sie '--', um Pfade und Commits zu trennen, ähnlich wie:\n"
+"'git <Befehl> [<Commit>...] -- [<Datei>...]'"
+
+#, c-format
+msgid "option '%s' must come before non-option arguments"
+msgstr ""
+"die Option '%s' muss vor den Argumenten kommen, die keine Optionen sind"
+
+#, c-format
+msgid ""
+"ambiguous argument '%s': both revision and filename\n"
+"Use '--' to separate paths from revisions, like this:\n"
+"'git <command> [<revision>...] -- [<file>...]'"
+msgstr ""
+"mehrdeutiges Argument '%s': sowohl Commit als auch Dateiname\n"
+"Benutzen Sie '--', um Pfade und Commits zu trennen, ähnlich wie:\n"
+"'git <Befehl> [<Commit>...] -- [<Datei>...]'"
+
+msgid "unable to set up work tree using invalid config"
+msgstr ""
+"Konnte Arbeitsverzeichnis mit ungültiger Konfiguration nicht einrichten."
+
+#, c-format
+msgid "Expected git repo version <= %d, found %d"
+msgstr "Erwartete Git-Repository-Version <= %d, %d gefunden"
+
+msgid "unknown repository extension found:"
+msgid_plural "unknown repository extensions found:"
+msgstr[0] "Unbekannte Repository-Erweiterung gefunden:"
+msgstr[1] "Unbekannte Repository-Erweiterungen gefunden:"
+
+msgid "repo version is 0, but v1-only extension found:"
+msgid_plural "repo version is 0, but v1-only extensions found:"
+msgstr[0] "Repository-Version ist 0, aber Erweiterung nur für v1 gefunden:"
+msgstr[1] "Repository-Version ist 0, aber Erweiterungen nur für v1 gefunden:"
+
+#, c-format
+msgid "error opening '%s'"
+msgstr "Fehler beim Öffnen von '%s'."
+
+#, c-format
+msgid "too large to be a .git file: '%s'"
+msgstr "Zu groß, um eine .git-Datei zu sein: '%s'"
+
+#, c-format
+msgid "error reading %s"
+msgstr "Fehler beim Lesen von '%s'."
+
+#, c-format
+msgid "invalid gitfile format: %s"
+msgstr "Ungültiges gitfile-Format: %s"
+
+#, c-format
+msgid "no path in gitfile: %s"
+msgstr "Kein Pfad in gitfile: %s"
+
+#, c-format
+msgid "not a git repository: %s"
+msgstr "Kein Git-Repository: %s"
+
+#, c-format
+msgid "'$%s' too big"
+msgstr "'$%s' zu groß"
+
+#, c-format
+msgid "not a git repository: '%s'"
+msgstr "Kein Git-Repository: '%s'"
+
+#, c-format
+msgid "cannot chdir to '%s'"
+msgstr "Kann nicht in Verzeichnis '%s' wechseln."
+
+msgid "cannot come back to cwd"
+msgstr "Kann nicht zum aktuellen Arbeitsverzeichnis zurückwechseln."
+
+#, c-format
+msgid "failed to stat '%*s%s%s'"
+msgstr "Konnte '%*s%s%s' nicht lesen."
+
+msgid "Unable to read current working directory"
+msgstr "Konnte aktuelles Arbeitsverzeichnis nicht lesen."
+
+#, c-format
+msgid "cannot change to '%s'"
+msgstr "Kann nicht nach '%s' wechseln."
+
+#, c-format
+msgid "not a git repository (or any of the parent directories): %s"
+msgstr "Kein Git-Repository (oder irgendeines der Elternverzeichnisse): %s"
+
+#, 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 ""
+"Kein Git-Repository (oder irgendein Elternverzeichnis bis zum Einhängepunkt "
+"%s)\n"
+"Stoppe bei Dateisystemgrenze (GIT_DISCOVERY_ACROSS_FILESYSTEM nicht gesetzt)."
+
+#, c-format
+msgid ""
+"unsafe repository ('%s' is owned by someone else)\n"
+"To add an exception for this directory, call:\n"
+"\n"
+"\tgit config --global --add safe.directory %s"
+msgstr ""
+"unsicheres Repository ('%s' gehört jemand anderem)\n"
+"Um eine Ausnahme für dieses Repository hinzuzufügen, führen Sie aus:\n"
+"\n"
+"\tgit config --global --add safe.directory %s"
+
+#, c-format
+msgid ""
+"problem with core.sharedRepository filemode value (0%.3o).\n"
+"The owner of files must always have read and write permissions."
+msgstr ""
+"Problem mit Wert für Dateimodus (0%.3o) von core.sharedRepository.\n"
+"Der Besitzer der Dateien muss immer Lese- und Schreibrechte haben."
+
+msgid "fork failed"
+msgstr "fork fehlgeschlagen"
+
+msgid "setsid failed"
+msgstr "setsid fehlgeschlagen"
+
+#, c-format
+msgid "index entry is a directory, but not sparse (%08x)"
+msgstr "Index-Eintrag ist ein Verzeichnis, aber nicht partiell (%08x)"
+
+msgid "cannot use split index with a sparse index"
+msgstr "kann aufgeteilten Index nicht mit einem Sparse-Index benutzen"
+
+#. TRANSLATORS: IEC 80000-13:2008 gibibyte
+#, c-format
+msgid "%u.%2.2u GiB"
+msgstr "%u.%2.2u GiB"
+
+#. TRANSLATORS: IEC 80000-13:2008 gibibyte/second
+#, c-format
+msgid "%u.%2.2u GiB/s"
+msgstr "%u.%2.2u GiB/s"
+
+#. TRANSLATORS: IEC 80000-13:2008 mebibyte
+#, c-format
+msgid "%u.%2.2u MiB"
+msgstr "%u.%2.2u MiB"
+
+#. TRANSLATORS: IEC 80000-13:2008 mebibyte/second
+#, c-format
+msgid "%u.%2.2u MiB/s"
+msgstr "%u.%2.2u MiB/s"
+
+#. TRANSLATORS: IEC 80000-13:2008 kibibyte
+#, c-format
+msgid "%u.%2.2u KiB"
+msgstr "%u.%2.2u KiB"
+
+#. TRANSLATORS: IEC 80000-13:2008 kibibyte/second
+#, c-format
+msgid "%u.%2.2u KiB/s"
+msgstr "%u.%2.2u KiB/s"
+
+#. TRANSLATORS: IEC 80000-13:2008 byte
+#, c-format
+msgid "%u byte"
+msgid_plural "%u bytes"
+msgstr[0] "%u Byte"
+msgstr[1] "%u Bytes"
+
+#. TRANSLATORS: IEC 80000-13:2008 byte/second
+#, c-format
+msgid "%u byte/s"
+msgid_plural "%u bytes/s"
+msgstr[0] "%u Byte/s"
+msgstr[1] "%u Bytes/s"
+
+#, c-format
+msgid "could not edit '%s'"
+msgstr "Konnte '%s' nicht editieren."
+
+#, c-format
+msgid "ignoring suspicious submodule name: %s"
+msgstr "Ignoriere verdächtigen Submodulnamen: %s"
+
+msgid "negative values not allowed for submodule.fetchJobs"
+msgstr "negative Werte für submodule.fetchJobs nicht erlaubt"
+
+#, c-format
+msgid "ignoring '%s' which may be interpreted as a command-line option: %s"
+msgstr ""
+"Ignoriere '%s', was als eine Befehlszeilenoption '%s' interpretiert werden "
+"würde."
+
+#, c-format
+msgid "Could not update .gitmodules entry %s"
+msgstr "Konnte Eintrag '%s' in .gitmodules nicht aktualisieren"
+
+msgid "Cannot change unmerged .gitmodules, resolve merge conflicts first"
+msgstr ""
+"Kann nicht zusammengeführte .gitmodules-Datei nicht ändern, lösen\n"
+"Sie zuerst die Konflikte auf"
+
+#, c-format
+msgid "Could not find section in .gitmodules where path=%s"
+msgstr "Konnte keine Sektion in .gitmodules mit Pfad \"%s\" finden"
+
+#, c-format
+msgid "Could not remove .gitmodules entry for %s"
+msgstr "Konnte Eintrag '%s' nicht aus .gitmodules entfernen"
+
+msgid "staging updated .gitmodules failed"
+msgstr "Konnte aktualisierte .gitmodules-Datei nicht zum Commit vormerken"
+
+#, c-format
+msgid "in unpopulated submodule '%s'"
+msgstr "In nicht ausgechecktem Submodul '%s'."
+
+#, c-format
+msgid "Pathspec '%s' is in submodule '%.*s'"
+msgstr "Pfadspezifikation '%s' befindet sich in Submodul '%.*s'"
+
+#, c-format
+msgid "bad --ignore-submodules argument: %s"
+msgstr "ungültiges --ignore-submodules Argument: %s"
+
+#, c-format
+msgid ""
+"Submodule in commit %s at path: '%s' collides with a submodule named the "
+"same. Skipping it."
+msgstr ""
+"Submodul in Commit %s beim Pfad: '%s' hat den gleichen Namen wie ein "
+"Submodul. Wird übersprungen."
+
+#, c-format
+msgid "submodule entry '%s' (%s) is a %s, not a commit"
+msgstr "Submodul-Eintrag '%s' (%s) ist ein %s, kein Commit."
+
+#, c-format
+msgid ""
+"Could not run 'git rev-list <commits> --not --remotes -n 1' command in "
+"submodule %s"
+msgstr ""
+"Konnte 'git rev-list <Commits> --not --remotes -n 1' nicht in Submodul '%s' "
+"ausführen."
+
+#, c-format
+msgid "process for submodule '%s' failed"
+msgstr "Prozess für Submodul '%s' fehlgeschlagen"
+
+#, c-format
+msgid "Pushing submodule '%s'\n"
+msgstr "Pushe Submodul '%s'\n"
+
+#, c-format
+msgid "Unable to push submodule '%s'\n"
+msgstr "Kann Push für Submodul '%s' nicht ausführen\n"
+
+#, c-format
+msgid "Fetching submodule %s%s\n"
+msgstr "Anfordern des Submoduls %s%s\n"
+
+#, c-format
+msgid "Could not access submodule '%s'\n"
+msgstr "Konnte nicht auf Submodul '%s' zugreifen\n"
+
+#, c-format
+msgid "Could not access submodule '%s' at commit %s\n"
+msgstr "Konnte nicht auf Submodul '%s' beim Commit %s zugreifen\n"
+
+#, c-format
+msgid "Fetching submodule %s%s at commit %s\n"
+msgstr "Anfordern des Submoduls %s%s beim Commit %s\n"
+
+#, c-format
+msgid ""
+"Errors during submodule fetch:\n"
+"%s"
+msgstr ""
+"Fehler während des Anforderns der Submodule:\n"
+"%s"
+
+#, c-format
+msgid "'%s' not recognized as a git repository"
+msgstr "'%s' nicht als Git-Repository erkannt"
+
+#, 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"
+
+#, c-format
+msgid "'git status --porcelain=2' failed in submodule %s"
+msgstr "'git status --porcelain=2' ist in Submodul %s fehlgeschlagen"
+
+#, c-format
+msgid "could not start 'git status' in submodule '%s'"
+msgstr "Konnte 'git status' in Submodul '%s' nicht starten."
+
+#, c-format
+msgid "could not run 'git status' in submodule '%s'"
+msgstr "Konnte 'git status' in Submodul '%s' nicht ausführen."
+
+#, c-format
+msgid "Could not unset core.worktree setting in submodule '%s'"
+msgstr "Konnte core.worktree Einstellung in Submodul '%s' nicht aufheben."
+
+#, c-format
+msgid "could not recurse into submodule '%s'"
+msgstr "Fehler bei Rekursion in Submodul-Pfad '%s'"
+
+msgid "could not reset submodule index"
+msgstr "konnte Index des Submoduls nicht zurücksetzen"
+
+#, c-format
+msgid "submodule '%s' has dirty index"
+msgstr "Submodul '%s' hat einen geänderten Index."
+
+#, c-format
+msgid "Submodule '%s' could not be updated."
+msgstr "Submodule '%s' konnte nicht aktualisiert werden."
+
+#, c-format
+msgid "submodule git dir '%s' is inside git dir '%.*s'"
+msgstr ""
+"Git-Verzeichnis des Submoduls '%s' ist im Git-Verzeichnis '%.*s' enthalten."
+
+#, c-format
+msgid ""
+"relocate_gitdir for submodule '%s' with more than one worktree not supported"
+msgstr ""
+"relocate_gitdir für Submodul '%s' mit mehr als einem Arbeitsverzeichnis\n"
+"wird nicht unterstützt"
+
+#, c-format
+msgid "could not lookup name for submodule '%s'"
+msgstr "Konnte Name für Submodul '%s' nicht nachschlagen."
+
+#, c-format
+msgid "refusing to move '%s' into an existing git dir"
+msgstr "Verschieben von '%s' in ein existierendes Git-Verzeichnis verweigert."
+
+#, c-format
+msgid ""
+"Migrating git directory of '%s%s' from\n"
+"'%s' to\n"
+"'%s'\n"
+msgstr ""
+"Migriere Git-Verzeichnis von '%s%s' von\n"
+"'%s' nach\n"
+"'%s'\n"
+
+msgid "could not start ls-files in .."
+msgstr "Konnte 'ls-files' nicht in .. starten"
+
+#, c-format
+msgid "ls-tree returned unexpected return code %d"
+msgstr "ls-tree mit unerwartetem Rückgabewert %d beendet"
+
+#, c-format
+msgid "failed to lstat '%s'"
+msgstr "'lstat' für '%s' fehlgeschlagen"
+
+msgid "unhandled options"
+msgstr "unbehandelte Optionen"
+
+msgid "error preparing revisions"
+msgstr "Fehler beim Vorbereiten der Commits"
+
+#, c-format
+msgid "commit %s is not marked reachable"
+msgstr "Commit %s ist nicht als erreichbar gekennzeichnet."
+
+msgid "too many commits marked reachable"
+msgstr "Zu viele Commits als erreichbar gekennzeichnet."
+
+msgid "test-tool serve-v2 [<options>]"
+msgstr "test-tool serve-v2 [<Optionen>]"
+
+msgid "exit immediately after advertising capabilities"
+msgstr "direkt nach Anzeige der angebotenen Fähigkeiten beenden"
+
+msgid "test-helper simple-ipc is-active    [<name>] [<options>]"
+msgstr "test-helper simple-ipc is-active    [<Name>] [<Optionen>]"
+
+msgid "test-helper simple-ipc run-daemon   [<name>] [<threads>]"
+msgstr "test-helper simple-ipc run-daemon   [<Name>] [<Threads>]"
+
+msgid "test-helper simple-ipc start-daemon [<name>] [<threads>] [<max-wait>]"
+msgstr "test-helper simple-ipc start-daemon [<Name>] [<Threads>] [<max-wait>]"
+
+msgid "test-helper simple-ipc stop-daemon  [<name>] [<max-wait>]"
+msgstr "test-helper simple-ipc stop-daemon  [<Name>] [<max-wait>]"
+
+msgid "test-helper simple-ipc send         [<name>] [<token>]"
+msgstr "test-helper simple-ipc send         [<Name>] [<Token>]"
+
+msgid "test-helper simple-ipc sendbytes    [<name>] [<bytecount>] [<byte>]"
+msgstr "test-helper simple-ipc sendbytes    [<Name>] [<bytecount>] [<Byte>]"
+
+msgid ""
+"test-helper simple-ipc multiple     [<name>] [<threads>] [<bytecount>] "
+"[<batchsize>]"
+msgstr ""
+"test-helper simple-ipc multiple     [<Name>] [<Threads>] [<bytecount>] "
+"[<batchsize>]"
+
+msgid "name or pathname of unix domain socket"
+msgstr "Name oder Pfadname des UNIX-Domain-Sockets"
+
+msgid "named-pipe name"
+msgstr "Name der benannten Pipe"
+
+msgid "number of threads in server thread pool"
+msgstr "Anzahl der Threads im Thread-Pool des Servers"
+
+msgid "seconds to wait for daemon to start or stop"
+msgstr "Sekunden, um auf Starten oder Stoppen des Daemons zu warten"
+
+msgid "number of bytes"
+msgstr "Anzahl von Bytes"
+
+msgid "number of requests per thread"
+msgstr "Anzahl der Anfragen pro Thread"
+
+msgid "byte"
+msgstr "Byte"
+
+msgid "ballast character"
+msgstr "Ballast-Zeichen"
+
+msgid "token"
+msgstr "Token"
+
+msgid "command token to send to the server"
+msgstr "Befehlstoken, der an den Server gesendet werden soll"
+
+#, c-format
+msgid "running trailer command '%s' failed"
+msgstr "Ausführen des Anhang-Befehls '%s' fehlgeschlagen"
+
+#, c-format
+msgid "unknown value '%s' for key '%s'"
+msgstr "unbekannter Wert '%s' für Schlüssel %s"
+
+#, c-format
+msgid "empty trailer token in trailer '%.*s'"
+msgstr "leerer Anhang-Token in Anhang '%.*s'"
+
+#, c-format
+msgid "could not read input file '%s'"
+msgstr "Konnte Eingabe-Datei '%s' nicht lesen"
+
+#, c-format
+msgid "could not stat %s"
+msgstr "Konnte '%s' nicht lesen"
+
+#, c-format
+msgid "file %s is not a regular file"
+msgstr "Datei '%s' ist keine reguläre Datei"
+
+#, c-format
+msgid "file %s is not writable by user"
+msgstr "Datei %s ist vom Benutzer nicht beschreibbar."
+
+msgid "could not open temporary file"
+msgstr "konnte temporäre Datei '%s' nicht öffnen"
+
+#, c-format
+msgid "could not rename temporary file to %s"
+msgstr "konnte temporäre Datei nicht zu %s umbenennen"
+
+msgid "full write to remote helper failed"
+msgstr "Vollständiges Schreiben zu Remote-Helper fehlgeschlagen."
+
+#, c-format
+msgid "unable to find remote helper for '%s'"
+msgstr "Konnte Remote-Helper für '%s' nicht finden."
+
+msgid "can't dup helper output fd"
+msgstr ""
+"Konnte dup() auf Dateideskriptor für Ausgaben des Remote-Helpers nicht "
+"ausführen."
+
+#, c-format
+msgid ""
+"unknown mandatory capability %s; this remote helper probably needs newer "
+"version of Git"
+msgstr ""
+"unbekannte erforderliche Fähigkeit %s; dieser Remote-Helper benötigt\n"
+"wahrscheinlich eine neuere Version von Git"
+
+msgid "this remote helper should implement refspec capability"
+msgstr "dieser Remote-Helper sollte die \"refspec\"-Fähigkeit implementieren"
+
+#, c-format
+msgid "%s unexpectedly said: '%s'"
+msgstr "unerwartete Ausgabe von %s: '%s'"
+
+#, c-format
+msgid "%s also locked %s"
+msgstr "%s sperrte auch %s"
+
+msgid "couldn't run fast-import"
+msgstr "konnte \"fast-import\" nicht ausführen"
+
+msgid "error while running fast-import"
+msgstr "Fehler beim Ausführen von 'fast-import'"
+
+#, c-format
+msgid "could not read ref %s"
+msgstr "konnte Referenz %s nicht lesen"
+
+#, c-format
+msgid "unknown response to connect: %s"
+msgstr "unbekannte Antwort auf 'connect': %s"
+
+msgid "setting remote service path not supported by protocol"
+msgstr ""
+"Setzen des Remote-Service Pfads wird von dem Protokoll nicht unterstützt"
+
+msgid "invalid remote service path"
+msgstr "ungültiger Remote-Service Pfad."
+
+msgid "operation not supported by protocol"
+msgstr "die Operation wird von dem Protokoll nicht unterstützt"
+
+#, c-format
+msgid "can't connect to subservice %s"
+msgstr "kann keine Verbindung zu Subservice %s herstellen"
+
+msgid "--negotiate-only requires protocol v2"
+msgstr "--negotiate-only benötigt Protokoll v2"
+
+msgid "'option' without a matching 'ok/error' directive"
+msgstr "'option' ohne passende 'ok/error' Direktive"
+
+#, c-format
+msgid "expected ok/error, helper said '%s'"
+msgstr "erwartete ok/error, Remote-Helper gab '%s' aus"
+
+#, c-format
+msgid "helper reported unexpected status of %s"
+msgstr "Remote-Helper meldete unerwarteten Status von %s"
+
+#, c-format
+msgid "helper %s does not support dry-run"
+msgstr "Remote-Helper %s unterstützt kein Trockenlauf"
+
+#, c-format
+msgid "helper %s does not support --signed"
+msgstr "Remote-Helper %s unterstützt kein --signed"
+
+#, c-format
+msgid "helper %s does not support --signed=if-asked"
+msgstr "Remote-Helper %s unterstützt kein --signed=if-asked"
+
+#, c-format
+msgid "helper %s does not support --atomic"
+msgstr "Remote-Helper %s unterstützt kein --atomic"
+
+#, c-format
+msgid "helper %s does not support --%s"
+msgstr "Remote-Helper %s unterstützt kein --%s"
+
+#, c-format
+msgid "helper %s does not support 'push-option'"
+msgstr "Remote-Helper %s unterstützt nicht 'push-option'"
+
+msgid "remote-helper doesn't support push; refspec needed"
+msgstr "Remote-Helper unterstützt kein Push; Refspec benötigt"
+
+#, c-format
+msgid "helper %s does not support 'force'"
+msgstr "Remote-Helper %s unterstützt kein 'force'."
+
+msgid "couldn't run fast-export"
+msgstr "Konnte \"fast-export\" nicht ausführen."
+
+msgid "error while running fast-export"
+msgstr "Fehler beim Ausführen von \"fast-export\"."
+
+#, c-format
+msgid ""
+"No refs in common and none specified; doing nothing.\n"
+"Perhaps you should specify a branch.\n"
+msgstr ""
+"Keine gemeinsamen Referenzen und nichts spezifiziert; keine Ausführung.\n"
+"Vielleicht sollten Sie einen Branch angeben.\n"
+
+#, c-format
+msgid "unsupported object format '%s'"
+msgstr "nicht unterstütztes Objekt-Format '%s'"
+
+#, c-format
+msgid "malformed response in ref list: %s"
+msgstr "Ungültige Antwort in Referenzliste: %s"
+
+#, c-format
+msgid "read(%s) failed"
+msgstr "Lesen von %s fehlgeschlagen."
+
+#, c-format
+msgid "write(%s) failed"
+msgstr "Schreiben von %s fehlgeschlagen."
+
+#, c-format
+msgid "%s thread failed"
+msgstr "Thread %s fehlgeschlagen."
+
+#, c-format
+msgid "%s thread failed to join: %s"
+msgstr "Fehler beim Beitreten zu Thread %s: %s"
+
+#, c-format
+msgid "can't start thread for copying data: %s"
+msgstr "Kann Thread zum Kopieren von Daten nicht starten: %s"
+
+#, c-format
+msgid "%s process failed to wait"
+msgstr "Fehler beim Warten von Prozess %s."
+
+#, c-format
+msgid "%s process failed"
+msgstr "Prozess %s fehlgeschlagen"
+
+msgid "can't start thread for copying data"
+msgstr "Kann Thread zum Kopieren von Daten nicht starten."
+
+#, c-format
+msgid "Would set upstream of '%s' to '%s' of '%s'\n"
+msgstr "Würde Upstream-Branch von '%s' zu '%s' von '%s' setzen\n"
+
+#, c-format
+msgid "could not read bundle '%s'"
+msgstr "Konnte Paket '%s' nicht lesen."
+
+#, c-format
+msgid "transport: invalid depth option '%s'"
+msgstr "transport: ungültige depth Option '%s'"
+
+msgid "see protocol.version in 'git help config' for more details"
+msgstr "Siehe protocol.version in 'git help config' für weitere Informationen"
+
+msgid "server options require protocol version 2 or later"
+msgstr "Server-Optionen benötigen Protokoll-Version 2 oder höher"
+
+msgid "server does not support wait-for-done"
+msgstr "Server unterstützt nicht 'wait-for-done'"
+
+msgid "could not parse transport.color.* config"
+msgstr "Konnte transport.color.* Konfiguration nicht parsen."
+
+msgid "support for protocol v2 not implemented yet"
+msgstr "Unterstützung für Protokoll v2 noch nicht implementiert."
+
+#, c-format
+msgid "unknown value for config '%s': %s"
+msgstr "Unbekannter Wert für Konfiguration '%s': %s"
+
+#, c-format
+msgid "transport '%s' not allowed"
+msgstr "Übertragungsart '%s' nicht erlaubt."
+
+msgid "git-over-rsync is no longer supported"
+msgstr "git-over-rsync wird nicht länger unterstützt."
+
+#, c-format
+msgid ""
+"The following submodule paths contain changes that can\n"
+"not be found on any remote:\n"
+msgstr ""
+"Die folgenden Submodul-Pfade enthalten Änderungen, die in keinem\n"
+"Remote-Repository gefunden wurden:\n"
+
+#, c-format
+msgid ""
+"\n"
+"Please try\n"
+"\n"
+"\tgit push --recurse-submodules=on-demand\n"
+"\n"
+"or cd to the path and use\n"
+"\n"
+"\tgit push\n"
+"\n"
+"to push them to a remote.\n"
+"\n"
+msgstr ""
+"\n"
+"Bitte versuchen Sie\n"
+"\n"
+"\tgit push --recurse-submodules=on-demand\n"
+"\n"
+"oder wechseln Sie in das Verzeichnis und benutzen Sie\n"
+"\n"
+"\tgit push\n"
+"\n"
+"zum Versenden zu einem Remote-Repository.\n"
+"\n"
+
+msgid "Aborting."
+msgstr "Abbruch."
+
+msgid "failed to push all needed submodules"
+msgstr "Fehler beim Versand aller erforderlichen Submodule."
+
+msgid "too-short tree object"
+msgstr "zu kurzes Tree-Objekt"
+
+msgid "malformed mode in tree entry"
+msgstr "fehlerhafter Modus in Tree-Eintrag"
+
+msgid "empty filename in tree entry"
+msgstr "leerer Dateiname in Tree-Eintrag"
+
+msgid "too-short tree file"
+msgstr "zu kurze Tree-Datei"
+
+#, c-format
+msgid ""
+"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 ""
+"Ihre lokalen Änderungen in den folgenden Dateien würden beim Auschecken\n"
+"überschrieben werden:\n"
+"%%sBitte committen oder stashen Sie Ihre Änderungen, bevor Sie Branches\n"
+"wechseln."
+
+#, c-format
+msgid ""
+"Your local changes to the following files would be overwritten by checkout:\n"
+"%%s"
+msgstr ""
+"Ihre lokalen Änderungen in den folgenden Dateien würden beim Auschecken\n"
+"überschrieben werden:\n"
+"%%s"
+
+#, c-format
+msgid ""
+"Your local changes to the following files would be overwritten by merge:\n"
+"%%sPlease commit your changes or stash them before you merge."
+msgstr ""
+"Ihre lokalen Änderungen in den folgenden Dateien würden durch den Merge\n"
+"überschrieben werden:\n"
+"%%sBitte committen oder stashen Sie Ihre Änderungen, bevor Sie mergen."
+
+#, c-format
+msgid ""
+"Your local changes to the following files would be overwritten by merge:\n"
+"%%s"
+msgstr ""
+"Ihre lokalen Änderungen in den folgenden Dateien würden durch den Merge\n"
+"überschrieben werden:\n"
+"%%s"
+
+#, c-format
+msgid ""
+"Your local changes to the following files would be overwritten by %s:\n"
+"%%sPlease commit your changes or stash them before you %s."
+msgstr ""
+"Ihre lokalen Änderungen in den folgenden Dateien würden durch %s\n"
+"überschrieben werden:\n"
+"%%sBitte committen oder stashen Sie Ihre Änderungen, bevor Sie %s ausführen."
+
+#, c-format
+msgid ""
+"Your local changes to the following files would be overwritten by %s:\n"
+"%%s"
+msgstr ""
+"Ihre lokalen Änderungen würden durch %s überschrieben werden.\n"
+"%%s"
+
+#, c-format
+msgid ""
+"Updating the following directories would lose untracked files in them:\n"
+"%s"
+msgstr ""
+"Durch die Aktualisierung der folgenden Verzeichnisse würden unversionierte\n"
+"Dateien in diesen Verzeichnissen verloren gehen:\n"
+"%s"
+
+#, c-format
+msgid ""
+"Refusing to remove the current working directory:\n"
+"%s"
+msgstr ""
+"Löschen des aktuellen Arbeitsverzeichnisses verweigert:\n"
+"%s"
+
+#, c-format
+msgid ""
+"The following untracked working tree files would be removed by checkout:\n"
+"%%sPlease move or remove them before you switch branches."
+msgstr ""
+"Die folgenden unversionierten Dateien im Arbeitsverzeichnis würden durch\n"
+"den Checkout entfernt werden:\n"
+"%%sBitte verschieben oder entfernen Sie diese, bevor Sie Branches wechseln."
+
+#, c-format
+msgid ""
+"The following untracked working tree files would be removed by checkout:\n"
+"%%s"
+msgstr ""
+"Die folgenden unversionierten Dateien im Arbeitsverzeichnis würden durch "
+"den\n"
+"Checkout entfernt werden:\n"
+"%%s"
+
+#, c-format
+msgid ""
+"The following untracked working tree files would be removed by merge:\n"
+"%%sPlease move or remove them before you merge."
+msgstr ""
+"Die folgenden unversionierten Dateien im Arbeitsverzeichnis würden durch\n"
+"den Merge entfernt werden:\n"
+"%%sBitte verschieben oder entfernen Sie diese, bevor sie mergen."
+
+#, c-format
+msgid ""
+"The following untracked working tree files would be removed by merge:\n"
+"%%s"
+msgstr ""
+"Die folgenden unversionierten Dateien im Arbeitsverzeichnis würden durch "
+"den\n"
+"Merge entfernt werden:\n"
+"%%s"
+
+#, c-format
+msgid ""
+"The following untracked working tree files would be removed by %s:\n"
+"%%sPlease move or remove them before you %s."
+msgstr ""
+"Die folgenden unversionierten Dateien im Arbeitsverzeichnis würden durch\n"
+"den %s entfernt werden:\n"
+"%%sBitte verschieben oder entfernen Sie diese, bevor sie %s ausführen."
+
+#, c-format
+msgid ""
+"The following untracked working tree files would be removed by %s:\n"
+"%%s"
+msgstr ""
+"Die folgenden unversionierten Dateien im Arbeitsverzeichnis würden durch\n"
+"den %s entfernt werden:\n"
+"%%s"
+
+#, c-format
+msgid ""
+"The following untracked working tree files would be overwritten by "
+"checkout:\n"
+"%%sPlease move or remove them before you switch branches."
+msgstr ""
+"Die folgenden unversionierten Dateien im Arbeitsverzeichnis würden durch\n"
+"den Checkout überschrieben werden:\n"
+"%%sBitte verschieben oder entfernen Sie diese, bevor Sie Branches wechseln."
+
+#, c-format
+msgid ""
+"The following untracked working tree files would be overwritten by "
+"checkout:\n"
+"%%s"
+msgstr ""
+"Die folgenden unversionierten Dateien im Arbeitsverzeichnis würden durch "
+"den\n"
+"Checkout überschrieben werden:\n"
+"%%s"
+
+#, c-format
+msgid ""
+"The following untracked working tree files would be overwritten by merge:\n"
+"%%sPlease move or remove them before you merge."
+msgstr ""
+"Die folgenden unversionierten Dateien im Arbeitsverzeichnis würden durch\n"
+"den Merge überschrieben werden:\n"
+"%%sBitte verschieben oder entfernen Sie diese, bevor Sie mergen."
+
+#, c-format
+msgid ""
+"The following untracked working tree files would be overwritten by merge:\n"
+"%%s"
+msgstr ""
+"Die folgenden unversionierten Dateien im Arbeitsverzeichnis würden durch\n"
+"den Merge überschrieben werden:\n"
+"%%s"
+
+#, c-format
+msgid ""
+"The following untracked working tree files would be overwritten by %s:\n"
+"%%sPlease move or remove them before you %s."
+msgstr ""
+"Die folgenden unversionierten Dateien im Arbeitsverzeichnis würden durch\n"
+"den %s überschrieben werden:\n"
+"%%sBitte verschieben oder entfernen Sie diese, bevor sie %s ausführen."
+
+#, c-format
+msgid ""
+"The following untracked working tree files would be overwritten by %s:\n"
+"%%s"
+msgstr ""
+"Die folgenden unversionierten Dateien im Arbeitsverzeichnis würden durch "
+"den\n"
+"%s überschrieben werden:\n"
+"%%s"
+
+#, c-format
+msgid "Entry '%s' overlaps with '%s'.  Cannot bind."
+msgstr "Eintrag '%s' überschneidet sich mit '%s'. Kann nicht verbinden."
+
+#, c-format
+msgid ""
+"Cannot update submodule:\n"
+"%s"
+msgstr ""
+"Kann Submodul nicht aktualisieren:\n"
+"%s"
+
+#, c-format
+msgid ""
+"The following paths are not up to date and were left despite sparse "
+"patterns:\n"
+"%s"
+msgstr ""
+"Die folgenden Pfade sind nicht aktuell und wurden trotz partieller Muster\n"
+"übrig gelassen:\n"
+"%s"
+
+#, c-format
+msgid ""
+"The following paths are unmerged and were left despite sparse patterns:\n"
+"%s"
+msgstr ""
+"Die folgenden Pfade sind nicht zusammengeführt und wurden trotz\n"
+"partieller Muster übrig gelassen:\n"
+"%s"
+
+#, c-format
+msgid ""
+"The following paths were already present and thus not updated despite sparse "
+"patterns:\n"
+"%s"
+msgstr ""
+"Die folgenden Pfade waren bereits vorhanden und wurden deshalb trotz\n"
+"partieller Muster nicht aktualisiert:\n"
+"%s"
+
+#, c-format
+msgid "Aborting\n"
+msgstr "Abbruch\n"
+
+#, c-format
+msgid ""
+"After fixing the above paths, you may want to run `git sparse-checkout "
+"reapply`.\n"
+msgstr ""
+"Nachdem die obigen Pfade behoben sind, können Sie `git sparse-checkout "
+"reapply` ausführen.\n"
+
+msgid "Updating files"
+msgstr "Aktualisiere Dateien"
+
+msgid ""
+"the following paths have collided (e.g. case-sensitive paths\n"
+"on a case-insensitive filesystem) and only one from the same\n"
+"colliding group is in the working tree:\n"
+msgstr ""
+"Die folgenden Pfade haben kollidiert (z.B. case-sensitive Pfade\n"
+"auf einem case-insensitiven Dateisystem) und nur einer von der\n"
+"selben Kollissionsgruppe ist im Arbeitsverzeichnis:\n"
+
+msgid "Updating index flags"
+msgstr "Aktualisiere Index-Markierungen"
+
+#, c-format
+msgid "worktree and untracked commit have duplicate entries: %s"
+msgstr ""
+"Arbeitsverzeichnis und unversionierter Commit haben doppelte Einträge: %s"
+
+msgid "expected flush after fetch arguments"
+msgstr "erwartete Flush nach Abrufen der Argumente"
+
+msgid "invalid URL scheme name or missing '://' suffix"
+msgstr "Ungültiges URL-Schema oder Suffix '://' fehlt"
+
+#, c-format
+msgid "invalid %XX escape sequence"
+msgstr "ungültige Escape-Sequenz %XX"
+
+msgid "missing host and scheme is not 'file:'"
+msgstr "fehlender Host und Schema ist nicht 'file:'"
+
+msgid "a 'file:' URL may not have a port number"
+msgstr "eine 'file:' URL darf keine Portnummer enthalten"
+
+msgid "invalid characters in host name"
+msgstr "Hostname enthält ungültige Zeichen"
+
+msgid "invalid port number"
+msgstr "ungültige Portnummer"
+
+msgid "invalid '..' path segment"
+msgstr "ungültiges '..' Pfadsegment"
+
+msgid "Fetching objects"
+msgstr "Anfordern der Objekte"
+
+#, c-format
+msgid "'%s' at main working tree is not the repository directory"
+msgstr "'%s' im Hauptarbeitsverzeichnis ist nicht das Repository-Verzeichnis."
+
+#, c-format
+msgid "'%s' file does not contain absolute path to the working tree location"
+msgstr "'%s' Datei enthält nicht den absoluten Pfad zum Arbeitsverzeichnis."
+
+#, c-format
+msgid "'%s' is not a .git file, error code %d"
+msgstr "'%s' ist keine .git-Datei, Fehlercode %d"
+
+#, c-format
+msgid "'%s' does not point back to '%s'"
+msgstr "'%s' zeigt nicht zurück auf '%s'"
+
+msgid "not a directory"
+msgstr "kein Verzeichnis"
+
+msgid ".git is not a file"
+msgstr ".git ist keine Datei"
+
+msgid ".git file broken"
+msgstr ".git-Datei kaputt"
+
+msgid ".git file incorrect"
+msgstr ".git-Datei fehlerhaft"
+
+msgid "not a valid path"
+msgstr "kein gültiger Pfad"
+
+msgid "unable to locate repository; .git is not a file"
+msgstr "konnte Repository nicht finden; .git ist keine Datei"
+
+msgid "unable to locate repository; .git file does not reference a repository"
+msgstr ""
+"konnte Repository nicht finden; .git-Datei referenziert kein Repository"
+
+msgid "unable to locate repository; .git file broken"
+msgstr "Konnte Repository nicht finden; .git-Datei ist kaputt"
+
+msgid "gitdir unreadable"
+msgstr "gitdir nicht lesbar"
+
+msgid "gitdir incorrect"
+msgstr "gitdir fehlerhaft"
+
+msgid "not a valid directory"
+msgstr "kein gültiges Verzeichnis"
+
+msgid "gitdir file does not exist"
+msgstr "gitdir-Datei existiert nicht"
+
+#, c-format
+msgid "unable to read gitdir file (%s)"
+msgstr "konnte gitdir-Datei nicht lesen (%s)"
+
+#, c-format
+msgid "short read (expected %<PRIuMAX> bytes, read %<PRIuMAX>)"
+msgstr "read() zu kurz (%<PRIuMAX> Bytes erwartet, %<PRIuMAX> gelesen)"
+
+msgid "invalid gitdir file"
+msgstr "ungültige gitdir-Datei"
+
+msgid "gitdir file points to non-existent location"
+msgstr "gitdir-Datei verweist auf nicht existierenden Ort"
+
+#, c-format
+msgid "unable to set %s in '%s'"
+msgstr "konnte %s nicht in '%s' setzen"
+
+#, c-format
+msgid "unable to unset %s in '%s'"
+msgstr "konnte %s nicht in '%s' aufheben"
+
+msgid "failed to set extensions.worktreeConfig setting"
+msgstr "Einstellung für extensions.worktreeConfig konnte nicht gesetzt werden"
+
+#, c-format
+msgid "could not setenv '%s'"
+msgstr "konnte '%s' nicht setzen"
+
+#, c-format
+msgid "unable to create '%s'"
+msgstr "konnte '%s' nicht erstellen"
+
+#, c-format
+msgid "could not open '%s' for reading and writing"
+msgstr "konnte '%s' nicht zum Lesen und Schreiben öffnen"
+
+#, c-format
+msgid "unable to access '%s'"
+msgstr "konnte nicht auf '%s' zugreifen"
+
+msgid "unable to get current working directory"
+msgstr "konnte aktuelles Arbeitsverzeichnis nicht bekommen"
+
+msgid "Unmerged paths:"
+msgstr "Nicht zusammengeführte Pfade:"
+
+msgid "  (use \"git restore --staged <file>...\" to unstage)"
+msgstr ""
+"  (benutzen Sie \"git restore --staged <Datei>...\" zum Entfernen aus der "
+"Staging-Area)"
+
+#, c-format
+msgid "  (use \"git restore --source=%s --staged <file>...\" to unstage)"
+msgstr ""
+"  (benutzen Sie \"git restore --source=%s --staged <Datei>...\" zum "
+"Entfernen aus der Staging-Area)"
+
+msgid "  (use \"git rm --cached <file>...\" to unstage)"
+msgstr ""
+"  (benutzen Sie \"git rm --cached <Datei>...\" zum Entfernen aus der Staging-"
+"Area)"
+
+msgid "  (use \"git add <file>...\" to mark resolution)"
+msgstr ""
+"  (benutzen Sie \"git add/rm <Datei>...\", um die Auflösung zu markieren)"
+
+msgid "  (use \"git add/rm <file>...\" as appropriate to mark resolution)"
+msgstr ""
+"  (benutzen Sie \"git add/rm <Datei>...\", um die Auflösung entsprechend zu "
+"markieren)"
+
+msgid "  (use \"git rm <file>...\" to mark resolution)"
+msgstr ""
+"  (benutzen Sie \"git add/rm <Datei>...\", um die Auflösung zu markieren)"
+
+msgid "Changes to be committed:"
+msgstr "Zum Commit vorgemerkte Änderungen:"
+
+msgid "Changes not staged for commit:"
+msgstr "Änderungen, die nicht zum Commit vorgemerkt sind:"
+
+msgid "  (use \"git add <file>...\" to update what will be committed)"
+msgstr ""
+"  (benutzen Sie \"git add <Datei>...\", um die Änderungen zum Commit "
+"vorzumerken)"
+
+msgid "  (use \"git add/rm <file>...\" to update what will be committed)"
+msgstr ""
+"  (benutzen Sie \"git add/rm <Datei>...\", um die Änderungen zum Commit "
+"vorzumerken)"
+
+msgid ""
+"  (use \"git restore <file>...\" to discard changes in working directory)"
+msgstr ""
+"  (benutzen Sie \"git restore <Datei>...\", um die Änderungen im "
+"Arbeitsverzeichnis zu verwerfen)"
+
+msgid "  (commit or discard the untracked or modified content in submodules)"
+msgstr ""
+"  (committen oder verwerfen Sie den unversionierten oder geänderten Inhalt "
+"in den Submodulen)"
+
+#, c-format
+msgid "  (use \"git %s <file>...\" to include in what will be committed)"
+msgstr ""
+"  (benutzen Sie \"git %s <Datei>...\", um die Änderungen zum Commit "
+"vorzumerken)"
+
+msgid "both deleted:"
+msgstr "beide gelöscht:"
+
+msgid "added by us:"
+msgstr "von uns hinzugefügt:"
+
+msgid "deleted by them:"
+msgstr "von denen gelöscht:"
+
+msgid "added by them:"
+msgstr "von denen hinzugefügt:"
+
+msgid "deleted by us:"
+msgstr "von uns gelöscht:"
+
+msgid "both added:"
+msgstr "von beiden hinzugefügt:"
+
+msgid "both modified:"
+msgstr "von beiden geändert:"
+
+msgid "new file:"
+msgstr "neue Datei:"
+
+msgid "copied:"
+msgstr "kopiert:"
+
+msgid "deleted:"
+msgstr "gelöscht:"
+
+msgid "modified:"
+msgstr "geändert:"
+
+msgid "renamed:"
+msgstr "umbenannt:"
+
+msgid "typechange:"
+msgstr "Typänderung:"
+
+msgid "unknown:"
+msgstr "unbekannt:"
+
+msgid "unmerged:"
+msgstr "nicht gemerged:"
+
+msgid "new commits, "
+msgstr "neue Commits, "
+
+msgid "modified content, "
+msgstr "geänderter Inhalt, "
+
+msgid "untracked content, "
+msgstr "unversionierter Inhalt, "
+
+#, c-format
+msgid "Your stash currently has %d entry"
+msgid_plural "Your stash currently has %d entries"
+msgstr[0] "Ihr Stash hat gerade %d Eintrag"
+msgstr[1] "Ihr Stash hat gerade %d Einträge"
+
+msgid "Submodules changed but not updated:"
+msgstr "Submodule geändert, aber nicht aktualisiert:"
+
+msgid "Submodule changes to be committed:"
+msgstr "Änderungen in Submodul zum Committen:"
+
+msgid ""
+"Do not modify or remove the line above.\n"
+"Everything below it will be ignored."
+msgstr ""
+"Ändern oder entfernen Sie nicht die obige Zeile.\n"
+"Alles unterhalb von ihr wird ignoriert."
+
+#, c-format
+msgid ""
+"\n"
+"It took %.2f seconds to compute the branch ahead/behind values.\n"
+"You can use '--no-ahead-behind' to avoid this.\n"
+msgstr ""
+"\n"
+"Es wurden %.2f Sekunden benötigt, um die voraus/hinterher-Werte zu "
+"berechnen.\n"
+"Sie können '--no-ahead-behind' benutzen, um das zu verhindern.\n"
+
+msgid "You have unmerged paths."
+msgstr "Sie haben nicht zusammengeführte Pfade."
+
+msgid "  (fix conflicts and run \"git commit\")"
+msgstr "  (beheben Sie die Konflikte und führen Sie \"git commit\" aus)"
+
+msgid "  (use \"git merge --abort\" to abort the merge)"
+msgstr "  (benutzen Sie \"git merge --abort\", um den Merge abzubrechen)"
+
+msgid "All conflicts fixed but you are still merging."
+msgstr "Alle Konflikte sind behoben, aber Sie sind immer noch beim Merge."
+
+msgid "  (use \"git commit\" to conclude merge)"
+msgstr "  (benutzen Sie \"git commit\", um den Merge abzuschließen)"
+
+msgid "You are in the middle of an am session."
+msgstr "Eine \"am\"-Sitzung ist im Gange."
+
+msgid "The current patch is empty."
+msgstr "Der aktuelle Patch ist leer."
+
+msgid "  (fix conflicts and then run \"git am --continue\")"
+msgstr ""
+"  (beheben Sie die Konflikte und führen Sie dann \"git am --continue\" aus)"
+
+msgid "  (use \"git am --skip\" to skip this patch)"
+msgstr "  (benutzen Sie \"git am --skip\", um diesen Patch auszulassen)"
+
+msgid ""
+"  (use \"git am --allow-empty\" to record this patch as an empty commit)"
+msgstr ""
+"  (benutzen Sie \"git am --allow-empty\", um den aktuellen Patch als leeren "
+"Commit zu speichern)"
+
+msgid "  (use \"git am --abort\" to restore the original branch)"
+msgstr ""
+"  (benutzen Sie \"git am --abort\", um den ursprünglichen Branch "
+"wiederherzustellen)"
+
+msgid "git-rebase-todo is missing."
+msgstr "git-rebase-todo fehlt."
+
+msgid "No commands done."
+msgstr "Keine Befehle ausgeführt."
+
+#, c-format
+msgid "Last command done (%<PRIuMAX> command done):"
+msgid_plural "Last commands done (%<PRIuMAX> commands done):"
+msgstr[0] "Letzter Befehl erledigt (%<PRIuMAX> Befehl erledigt):"
+msgstr[1] "Letzte Befehle erledigt (%<PRIuMAX> Befehle erledigt):"
+
+#, c-format
+msgid "  (see more in file %s)"
+msgstr "  (mehr Informationen in Datei %s)"
+
+msgid "No commands remaining."
+msgstr "Keine Befehle verbleibend."
+
+#, c-format
+msgid "Next command to do (%<PRIuMAX> remaining command):"
+msgid_plural "Next commands to do (%<PRIuMAX> remaining commands):"
+msgstr[0] "Nächster auszuführender Befehl (%<PRIuMAX> Befehle verbleibend):"
+msgstr[1] "Nächste auszuführende Befehle (%<PRIuMAX> Befehle verbleibend):"
+
+msgid "  (use \"git rebase --edit-todo\" to view and edit)"
+msgstr "  (benutzen Sie \"git rebase --edit-todo\" zum Ansehen und Bearbeiten)"
+
+#, c-format
+msgid "You are currently rebasing branch '%s' on '%s'."
+msgstr "Sie sind gerade beim Rebase von Branch '%s' auf '%s'."
+
+msgid "You are currently rebasing."
+msgstr "Sie sind gerade beim Rebase."
+
+msgid "  (fix conflicts and then run \"git rebase --continue\")"
+msgstr ""
+"  (beheben Sie die Konflikte und führen Sie dann \"git rebase --continue\" "
+"aus)"
+
+msgid "  (use \"git rebase --skip\" to skip this patch)"
+msgstr "  (benutzen Sie \"git rebase --skip\", um diesen Patch auszulassen)"
+
+msgid "  (use \"git rebase --abort\" to check out the original branch)"
+msgstr ""
+"  (benutzen Sie \"git rebase --abort\", um den ursprünglichen Branch "
+"auszuchecken)"
+
+msgid "  (all conflicts fixed: run \"git rebase --continue\")"
+msgstr "  (alle Konflikte behoben: führen Sie \"git rebase --continue\" aus)"
+
+#, c-format
+msgid ""
+"You are currently splitting a commit while rebasing branch '%s' on '%s'."
+msgstr ""
+"Sie teilen gerade einen Commit auf, während ein Rebase von Branch '%s' auf "
+"'%s' im Gange ist."
+
+msgid "You are currently splitting a commit during a rebase."
+msgstr "Sie teilen gerade einen Commit während eines Rebase auf."
+
+msgid "  (Once your working directory is clean, run \"git rebase --continue\")"
+msgstr ""
+"  (Sobald Ihr Arbeitsverzeichnis unverändert ist, führen Sie \"git rebase --"
+"continue\" aus)"
+
+#, c-format
+msgid "You are currently editing a commit while rebasing branch '%s' on '%s'."
+msgstr ""
+"Sie editieren gerade einen Commit während eines Rebase von Branch '%s' auf "
+"'%s'."
+
+msgid "You are currently editing a commit during a rebase."
+msgstr "Sie editieren gerade einen Commit während eines Rebase."
+
+msgid "  (use \"git commit --amend\" to amend the current commit)"
+msgstr ""
+"  (benutzen Sie \"git commit --amend\", um den aktuellen Commit "
+"nachzubessern)"
+
+msgid ""
+"  (use \"git rebase --continue\" once you are satisfied with your changes)"
+msgstr ""
+"  (benutzen Sie \"git rebase --continue\" sobald Ihre Änderungen "
+"abgeschlossen sind)"
+
+msgid "Cherry-pick currently in progress."
+msgstr "Cherry-pick zurzeit im Gange."
+
+#, c-format
+msgid "You are currently cherry-picking commit %s."
+msgstr "Sie führen gerade \"cherry-pick\" von Commit %s aus."
+
+msgid "  (fix conflicts and run \"git cherry-pick --continue\")"
+msgstr ""
+"  (beheben Sie die Konflikte und führen Sie dann \"git cherry-pick --"
+"continue\" aus)"
+
+msgid "  (run \"git cherry-pick --continue\" to continue)"
+msgstr "  (Führen Sie \"git cherry-pick --continue\" aus, um weiterzumachen)"
+
+msgid "  (all conflicts fixed: run \"git cherry-pick --continue\")"
+msgstr ""
+"  (alle Konflikte behoben: führen Sie \"git cherry-pick --continue\" aus)"
+
+msgid "  (use \"git cherry-pick --skip\" to skip this patch)"
+msgstr ""
+"  (benutzen Sie \"git cherry-pick --skip\", um diesen Patch auszulassen)"
+
+msgid "  (use \"git cherry-pick --abort\" to cancel the cherry-pick operation)"
+msgstr ""
+"  (benutzen Sie \"git cherry-pick --abort\", um die Cherry-Pick-Operation "
+"abzubrechen)"
+
+msgid "Revert currently in progress."
+msgstr "Revert zurzeit im Gange."
+
+#, c-format
+msgid "You are currently reverting commit %s."
+msgstr "Sie sind gerade beim Revert von Commit '%s'."
+
+msgid "  (fix conflicts and run \"git revert --continue\")"
+msgstr ""
+"  (beheben Sie die Konflikte und führen Sie dann \"git revert --continue\" "
+"aus)"
+
+msgid "  (run \"git revert --continue\" to continue)"
+msgstr "  (Führen Sie \"git revert --continue\", um weiterzumachen)"
+
+msgid "  (all conflicts fixed: run \"git revert --continue\")"
+msgstr "  (alle Konflikte behoben: führen Sie \"git revert --continue\" aus)"
+
+msgid "  (use \"git revert --skip\" to skip this patch)"
+msgstr "  (benutzen Sie \"git revert --skip\", um diesen Patch auszulassen)"
+
+msgid "  (use \"git revert --abort\" to cancel the revert operation)"
+msgstr ""
+"  (benutzen Sie \"git revert --abort\", um die Revert-Operation abzubrechen)"
+
+#, c-format
+msgid "You are currently bisecting, started from branch '%s'."
+msgstr "Sie sind gerade bei einer binären Suche, gestartet von Branch '%s'."
+
+msgid "You are currently bisecting."
+msgstr "Sie sind gerade bei einer binären Suche."
+
+msgid "  (use \"git bisect reset\" to get back to the original branch)"
+msgstr ""
+"  (benutzen Sie \"git bisect reset\", um zum ursprünglichen Branch "
+"zurückzukehren)"
+
+msgid "You are in a sparse checkout."
+msgstr "Sie befinden sich in einem partiellen Checkout."
+
+#, c-format
+msgid "You are in a sparse checkout with %d%% of tracked files present."
+msgstr ""
+"Sie sind in einem partiellen Checkout mit %d%% vorhandenen versionierten "
+"Dateien."
+
+msgid "On branch "
+msgstr "Auf Branch "
+
+msgid "interactive rebase in progress; onto "
+msgstr "interaktives Rebase im Gange; auf "
+
+msgid "rebase in progress; onto "
+msgstr "Rebase im Gange; auf "
+
+msgid "HEAD detached at "
+msgstr "HEAD losgelöst bei "
+
+msgid "HEAD detached from "
+msgstr "HEAD losgelöst von "
+
+msgid "Not currently on any branch."
+msgstr "Im Moment auf keinem Branch."
+
+msgid "Initial commit"
+msgstr "Initialer Commit"
+
+msgid "No commits yet"
+msgstr "Noch keine Commits"
+
+msgid "Untracked files"
+msgstr "Unversionierte Dateien"
+
+msgid "Ignored files"
+msgstr "Ignorierte Dateien"
+
+#, c-format
+msgid ""
+"It took %.2f seconds to enumerate untracked files. 'status -uno'\n"
+"may speed it up, but you have to be careful not to forget to add\n"
+"new files yourself (see 'git help status')."
+msgstr ""
+"Es dauerte %.2f Sekunden die unversionierten Dateien zu bestimmen.\n"
+"'status -uno' könnte das beschleunigen, aber Sie müssen darauf achten,\n"
+"neue Dateien selbstständig hinzuzufügen (siehe 'git help status')."
+
+#, c-format
+msgid "Untracked files not listed%s"
+msgstr "Unversionierte Dateien nicht aufgelistet%s"
+
+msgid " (use -u option to show untracked files)"
+msgstr " (benutzen Sie die Option -u, um unversionierte Dateien anzuzeigen)"
+
+msgid "No changes"
+msgstr "Keine Änderungen"
+
+#, c-format
+msgid "no changes added to commit (use \"git add\" and/or \"git commit -a\")\n"
+msgstr ""
+"keine Änderungen zum Commit vorgemerkt (benutzen Sie \"git add\" und/oder "
+"\"git commit -a\")\n"
+
+#, c-format
+msgid "no changes added to commit\n"
+msgstr "keine Änderungen zum Commit vorgemerkt\n"
+
+#, c-format
+msgid ""
+"nothing added to commit but untracked files present (use \"git add\" to "
+"track)\n"
+msgstr ""
+"nichts zum Commit vorgemerkt, aber es gibt unversionierte Dateien\n"
+"(benutzen Sie \"git add\" zum Versionieren)\n"
+
+#, c-format
+msgid "nothing added to commit but untracked files present\n"
+msgstr "nichts zum Commit vorgemerkt, aber es gibt unversionierte Dateien\n"
+
+#, c-format
+msgid "nothing to commit (create/copy files and use \"git add\" to track)\n"
+msgstr ""
+"nichts zu committen (erstellen/kopieren Sie Dateien und benutzen\n"
+"Sie \"git add\" zum Versionieren)\n"
+
+#, c-format
+msgid "nothing to commit\n"
+msgstr "nichts zu committen\n"
+
+#, c-format
+msgid "nothing to commit (use -u to show untracked files)\n"
+msgstr ""
+"nichts zu committen (benutzen Sie die Option -u, um unversionierte Dateien "
+"anzuzeigen)\n"
+
+#, c-format
+msgid "nothing to commit, working tree clean\n"
+msgstr "nichts zu committen, Arbeitsverzeichnis unverändert\n"
+
+msgid "No commits yet on "
+msgstr "Noch keine Commits in "
+
+msgid "HEAD (no branch)"
+msgstr "HEAD (kein Branch)"
+
+msgid "different"
+msgstr "unterschiedlich"
+
+msgid "behind "
+msgstr "hinterher "
+
+msgid "ahead "
+msgstr "voraus "
+
+#. TRANSLATORS: the action is e.g. "pull with rebase"
+#, c-format
+msgid "cannot %s: You have unstaged changes."
+msgstr ""
+"%s nicht möglich: Sie haben Änderungen, die nicht zum Commit vorgemerkt sind."
+
+msgid "additionally, your index contains uncommitted changes."
+msgstr "Zusätzlich enthält die Staging-Area nicht committete Änderungen."
+
+#, c-format
+msgid "cannot %s: Your index contains uncommitted changes."
+msgstr ""
+"%s nicht möglich: Die Staging-Area enthält nicht committete Änderungen."
+
 msgid ""
 "Error: Your local changes to the following files would be overwritten by "
 "merge"
@@ -26690,105 +21668,86 @@ msgstr ""
 "Merge\n"
 "überschrieben werden"
 
-#: git-merge-octopus.sh:61
 msgid "Automated merge did not work."
 msgstr "Automatischer Merge hat nicht funktioniert."
 
-#: git-merge-octopus.sh:62
 msgid "Should not be doing an octopus."
 msgstr "Sollte keinen Oktopus-Merge ausführen."
 
-#: git-merge-octopus.sh:73
 #, sh-format
 msgid "Unable to find common commit with $pretty_name"
 msgstr "Konnte keinen gemeinsamen Commit mit $pretty_name finden."
 
-#: git-merge-octopus.sh:77
 #, sh-format
 msgid "Already up to date with $pretty_name"
 msgstr "Bereits aktuell mit $pretty_name"
 
-#: git-merge-octopus.sh:89
 #, sh-format
 msgid "Fast-forwarding to: $pretty_name"
 msgstr "Spule vor zu: $pretty_name"
 
-#: git-merge-octopus.sh:97
 #, sh-format
 msgid "Trying simple merge with $pretty_name"
 msgstr "Versuche einfachen Merge mit $pretty_name"
 
-#: git-merge-octopus.sh:102
 msgid "Simple merge did not work, trying automatic merge."
 msgstr "Einfacher Merge hat nicht funktioniert, versuche automatischen Merge."
 
-#: git-sh-setup.sh:89 git-sh-setup.sh:94
 #, sh-format
 msgid "usage: $dashless $USAGE"
 msgstr "Verwendung: $dashless $USAGE"
 
-#: git-sh-setup.sh:182
 #, sh-format
 msgid "Cannot chdir to $cdup, the toplevel of the working tree"
 msgstr ""
 "Konnte nicht in Verzeichnis $cdup wechseln, der obersten Ebene des\n"
 "Arbeitsverzeichnisses."
 
-#: git-sh-setup.sh:191 git-sh-setup.sh:198
 #, sh-format
 msgid "fatal: $program_name cannot be used without a working tree."
 msgstr ""
 "fatal: $program_name kann ohne ein Arbeitsverzeichnis nicht verwendet werden."
 
-#: git-sh-setup.sh:212
 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:215
 #, 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:226
 #, 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:228
 msgid "Additionally, your index contains uncommitted changes."
 msgstr "Zusätzlich beinhaltet die Staging-Area nicht committete Änderungen."
 
-#: git-sh-setup.sh:348
 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:353
 msgid "Unable to determine absolute path of git directory"
 msgstr "Konnte absoluten Pfad des Git-Verzeichnisses nicht bestimmen"
 
 #. TRANSLATORS: you can adjust this to align "git add -i" status menu
-#: git-add--interactive.perl:212
 #, perl-format
 msgid "%12s %12s %s"
 msgstr "%28s %25s %s"
 
-#: git-add--interactive.perl:632
 #, perl-format
 msgid "touched %d path\n"
 msgid_plural "touched %d paths\n"
 msgstr[0] "%d Pfad angefasst\n"
 msgstr[1] "%d Pfade angefasst\n"
 
-#: git-add--interactive.perl:1056
 msgid ""
 "If the patch applies cleanly, the edited hunk will immediately be\n"
 "marked for staging."
@@ -26796,7 +21755,6 @@ msgstr ""
 "Wenn der Patch sauber angewendet werden kann, wird der bearbeitete\n"
 "Patch-Block direkt zum Hinzufügen zur Staging-Area markiert."
 
-#: git-add--interactive.perl:1059
 msgid ""
 "If the patch applies cleanly, the edited hunk will immediately be\n"
 "marked for stashing."
@@ -26804,7 +21762,6 @@ msgstr ""
 "Wenn der Patch sauber angewendet werden kann, wird der bearbeitete\n"
 "Patch-Block direkt zum Hinzufügen zum Stash markiert."
 
-#: git-add--interactive.perl:1062
 msgid ""
 "If the patch applies cleanly, the edited hunk will immediately be\n"
 "marked for unstaging."
@@ -26812,8 +21769,6 @@ msgstr ""
 "Wenn der Patch sauber angewendet werden kann, wird der bearbeitete\n"
 "Patch-Block direkt zum Entfernen aus der Staging-Area markiert."
 
-#: git-add--interactive.perl:1065 git-add--interactive.perl:1074
-#: git-add--interactive.perl:1080
 msgid ""
 "If the patch applies cleanly, the edited hunk will immediately be\n"
 "marked for applying."
@@ -26821,8 +21776,6 @@ msgstr ""
 "Wenn der Patch sauber angewendet werden kann, wird der bearbeitete\n"
 "Patch-Block direkt zum Anwenden markiert."
 
-#: git-add--interactive.perl:1068 git-add--interactive.perl:1071
-#: git-add--interactive.perl:1077
 msgid ""
 "If the patch applies cleanly, the edited hunk will immediately be\n"
 "marked for discarding."
@@ -26830,13 +21783,11 @@ msgstr ""
 "Wenn der Patch sauber angewendet werden kann, wird der bearbeitete\n"
 "Patch-Block direkt zum Verwerfen markiert."
 
-#: git-add--interactive.perl:1114
 #, perl-format
 msgid "failed to open hunk edit file for writing: %s"
 msgstr ""
 "Fehler beim Öffnen von Editier-Datei eines Patch-Blocks zum Schreiben: %s"
 
-#: git-add--interactive.perl:1121
 #, perl-format
 msgid ""
 "---\n"
@@ -26849,12 +21800,10 @@ msgstr ""
 "Um '%s' Zeilen zu entfernen, löschen Sie diese.\n"
 "Zeilen, die mit %s beginnen, werden entfernt.\n"
 
-#: git-add--interactive.perl:1143
 #, perl-format
 msgid "failed to open hunk edit file for reading: %s"
 msgstr "Fehler beim Öffnen von Editier-Datei eines Patch-Blocks zum Lesen: %s"
 
-#: git-add--interactive.perl:1253
 msgid ""
 "y - stage this hunk\n"
 "n - do not stage this hunk\n"
@@ -26870,7 +21819,6 @@ msgstr ""
 "d - diesen oder alle weiteren Patch-Blöcke in dieser Datei nicht zum Commit "
 "vormerken"
 
-#: git-add--interactive.perl:1259
 msgid ""
 "y - stash this hunk\n"
 "n - do not stash this hunk\n"
@@ -26884,7 +21832,6 @@ msgstr ""
 "a - diesen und alle weiteren Patch-Blöcke dieser Datei stashen\n"
 "d - diesen oder alle weiteren Patch-Blöcke dieser Datei nicht stashen"
 
-#: git-add--interactive.perl:1265
 msgid ""
 "y - unstage this hunk\n"
 "n - do not unstage this hunk\n"
@@ -26898,7 +21845,6 @@ msgstr ""
 "a - diesen und alle weiteren Patch-Blöcke dieser Datei unstashen\n"
 "d - diesen oder alle weiteren Patch-Blöcke dieser Datei nicht unstashen"
 
-#: git-add--interactive.perl:1271
 msgid ""
 "y - apply this hunk to index\n"
 "n - do not apply this hunk to index\n"
@@ -26915,7 +21861,6 @@ msgstr ""
 "d - diesen oder alle weiteren Patch-Blöcke dieser Datei nicht auf den Index "
 "anwenden"
 
-#: git-add--interactive.perl:1277 git-add--interactive.perl:1295
 msgid ""
 "y - discard this hunk from worktree\n"
 "n - do not discard this hunk from worktree\n"
@@ -26932,7 +21877,6 @@ msgstr ""
 "d - diesen oder alle weiteren Patch-Blöcke dieser Datei nicht im "
 "Arbeitsverzeichnis verwerfen"
 
-#: git-add--interactive.perl:1283
 msgid ""
 "y - discard this hunk from index and worktree\n"
 "n - do not discard this hunk from index and worktree\n"
@@ -26947,7 +21891,6 @@ msgstr ""
 "a - diesen und alle weiteren Patch-Blöcke in der Datei verwerfen\n"
 "d - diesen oder alle weiteren Patch-Blöcke in der Datei nicht verwerfen"
 
-#: git-add--interactive.perl:1289
 msgid ""
 "y - apply this hunk to index and worktree\n"
 "n - do not apply this hunk to index and worktree\n"
@@ -26961,7 +21904,6 @@ msgstr ""
 "a - diesen und alle weiteren Patch-Blöcke in der Datei anwenden\n"
 "d - diesen oder alle weiteren Patch-Blöcke in der Datei nicht anwenden"
 
-#: git-add--interactive.perl:1301
 msgid ""
 "y - apply this hunk to worktree\n"
 "n - do not apply this hunk to worktree\n"
@@ -26975,7 +21917,6 @@ msgstr ""
 "a - diesen und alle weiteren Patch-Blöcke in der Datei anwenden\n"
 "d - diesen und alle weiteren Patch-Blöcke in der Datei nicht anwenden"
 
-#: git-add--interactive.perl:1316
 msgid ""
 "g - select a hunk to go to\n"
 "/ - search for a hunk matching the given regex\n"
@@ -26999,92 +21940,74 @@ msgstr ""
 "e - aktuellen Patch-Block manuell editieren\n"
 "? - Hilfe anzeigen\n"
 
-#: git-add--interactive.perl:1347
 msgid "The selected hunks do not apply to the index!\n"
 msgstr ""
 "Die ausgewählten Patch-Blöcke können nicht auf den Index angewendet werden!\n"
 
-#: git-add--interactive.perl:1362
 #, perl-format
 msgid "ignoring unmerged: %s\n"
 msgstr "ignoriere nicht zusammengeführte Datei: %s\n"
 
-#: git-add--interactive.perl:1481
 #, perl-format
 msgid "Apply mode change to worktree [y,n,q,a,d%s,?]? "
 msgstr "Modusänderung auf Arbeitsverzeichnis anwenden [y,n,q,a,d%s,?]? "
 
-#: git-add--interactive.perl:1482
 #, perl-format
 msgid "Apply deletion to worktree [y,n,q,a,d%s,?]? "
 msgstr "Löschung auf Arbeitsverzeichnis anwenden [y,n,q,a,d%s,?]? "
 
-#: git-add--interactive.perl:1483
 #, perl-format
 msgid "Apply addition to worktree [y,n,q,a,d%s,?]? "
 msgstr "Ergänzung auf Arbeitsverzeichnis anwenden [y,n,q,a,d%s,?]? "
 
-#: git-add--interactive.perl:1484
 #, perl-format
 msgid "Apply this hunk to worktree [y,n,q,a,d%s,?]? "
 msgstr ""
 "Diesen Patch-Block auf das Arbeitsverzeichnis anwenden [y,n,q,a,d%s,?]? "
 
-#: git-add--interactive.perl:1601
 msgid "No other hunks to goto\n"
 msgstr "Keine anderen Patch-Blöcke verbleibend\n"
 
-#: git-add--interactive.perl:1619
 #, perl-format
 msgid "Invalid number: '%s'\n"
 msgstr "Ungültige Nummer: '%s'\n"
 
-#: git-add--interactive.perl:1624
 #, perl-format
 msgid "Sorry, only %d hunk available.\n"
 msgid_plural "Sorry, only %d hunks available.\n"
 msgstr[0] "Entschuldigung, nur %d Patch-Block verfügbar.\n"
 msgstr[1] "Entschuldigung, nur %d Patch-Blöcke verfügbar.\n"
 
-#: git-add--interactive.perl:1659
 msgid "No other hunks to search\n"
 msgstr "Keine anderen Patch-Blöcke zum Durchsuchen\n"
 
-#: git-add--interactive.perl:1676
 #, perl-format
 msgid "Malformed search regexp %s: %s\n"
 msgstr "Fehlerhafter regulärer Ausdruck für Suche %s: %s\n"
 
-#: git-add--interactive.perl:1686
 msgid "No hunk matches the given pattern\n"
 msgstr "Kein Patch-Block entspricht dem angegebenen Muster\n"
 
-#: git-add--interactive.perl:1698 git-add--interactive.perl:1720
 msgid "No previous hunk\n"
 msgstr "Kein vorheriger Patch-Block\n"
 
-#: git-add--interactive.perl:1707 git-add--interactive.perl:1726
 msgid "No next hunk\n"
 msgstr "Kein folgender Patch-Block\n"
 
-#: git-add--interactive.perl:1732
 msgid "Sorry, cannot split this hunk\n"
 msgstr "Entschuldigung, kann diesen Patch-Block nicht aufteilen.\n"
 
-#: git-add--interactive.perl:1738
 #, perl-format
 msgid "Split into %d hunk.\n"
 msgid_plural "Split into %d hunks.\n"
 msgstr[0] "In %d Patch-Block aufgeteilt.\n"
 msgstr[1] "In %d Patch-Blöcke aufgeteilt.\n"
 
-#: git-add--interactive.perl:1748
 msgid "Sorry, cannot edit this hunk\n"
 msgstr "Entschuldigung, kann diesen Patch-Block nicht bearbeiten.\n"
 
 #. TRANSLATORS: please do not translate the command names
 #. 'status', 'update', 'revert', etc.
-#: git-add--interactive.perl:1813
 msgid ""
 "status        - show paths with changes\n"
 "update        - add working tree state to the staged set of changes\n"
@@ -27103,58 +22026,44 @@ msgstr ""
 "diff          - Unterschiede zwischen HEAD und Index anzeigen\n"
 "add untracked - Inhalte von unversionierten Dateien zum Commit vormerken\n"
 
-#: git-add--interactive.perl:1830 git-add--interactive.perl:1842
-#: git-add--interactive.perl:1845 git-add--interactive.perl:1852
-#: git-add--interactive.perl:1855 git-add--interactive.perl:1862
-#: git-add--interactive.perl:1866 git-add--interactive.perl:1872
 msgid "missing --"
 msgstr "-- fehlt"
 
-#: git-add--interactive.perl:1868
 #, perl-format
 msgid "unknown --patch mode: %s"
 msgstr "Unbekannter --patch Modus: %s"
 
-#: git-add--interactive.perl:1874 git-add--interactive.perl:1880
 #, perl-format
 msgid "invalid argument %s, expecting --"
 msgstr "ungültiges Argument %s, erwarte --"
 
-#: git-send-email.perl:159
 msgid "local zone differs from GMT by a non-minute interval\n"
 msgstr ""
 "lokale Zeitzone unterscheidet sich von GMT nicht um ein Minutenintervall\n"
 
-#: git-send-email.perl:166 git-send-email.perl:172
 msgid "local time offset greater than or equal to 24 hours\n"
 msgstr "lokaler Zeit-Offset größer oder gleich 24 Stunden\n"
 
-#: git-send-email.perl:244
 #, perl-format
 msgid "fatal: command '%s' died with exit code %d"
 msgstr "fatal: Befehl '%s' mit Exit-Code %d beendet"
 
-#: git-send-email.perl:257
 msgid "the editor exited uncleanly, aborting everything"
 msgstr "der Editor wurde unsauber beendet, breche alles ab"
 
-#: git-send-email.perl:346
 #, perl-format
 msgid ""
 "'%s' contains an intermediate version of the email you were composing.\n"
 msgstr ""
 "'%s' enthält eine Zwischenversion der E-Mail, die Sie gerade verfassen.\n"
 
-#: git-send-email.perl:351
 #, perl-format
 msgid "'%s.final' contains the composed email.\n"
 msgstr "'%s.final' enthält die verfasste E-Mail.\n"
 
-#: git-send-email.perl:484
 msgid "--dump-aliases incompatible with other options\n"
 msgstr "--dump-aliases ist mit anderen Optionen inkompatibel\n"
 
-#: git-send-email.perl:561
 msgid ""
 "fatal: found configuration options for 'sendmail'\n"
 "git-send-email is configured with the sendemail.* options - note the 'e'.\n"
@@ -27166,12 +22075,10 @@ msgstr ""
 "Setzen Sie sendemail.forbidSendmailVariables auf 'false', um diese Prüfung "
 "zu deaktivieren.\n"
 
-#: git-send-email.perl:566 git-send-email.perl:782
 msgid "Cannot run git format-patch from outside a repository\n"
 msgstr ""
 "Kann 'git format-patch' nicht außerhalb eines Repositories ausführen.\n"
 
-#: git-send-email.perl:569
 msgid ""
 "`batch-size` and `relogin` must be specified together (via command-line or "
 "configuration option)\n"
@@ -27180,38 +22087,31 @@ msgstr ""
 "Kommandozeile\n"
 "oder Konfigurationsoption)\n"
 
-#: git-send-email.perl:582
 #, perl-format
 msgid "Unknown --suppress-cc field: '%s'\n"
 msgstr "Unbekanntes --suppress-cc Feld: '%s'\n"
 
-#: git-send-email.perl:613
 #, perl-format
 msgid "Unknown --confirm setting: '%s'\n"
 msgstr "Unbekannte --confirm Einstellung: '%s'\n"
 
-#: git-send-email.perl:653
 #, perl-format
 msgid "warning: sendmail alias with quotes is not supported: %s\n"
 msgstr ""
 "Warnung: sendemail-Alias mit Anführungszeichen wird nicht unterstützt: %s\n"
 
-#: git-send-email.perl:655
 #, perl-format
 msgid "warning: `:include:` not supported: %s\n"
 msgstr "Warnung: `:include:` wird nicht unterstützt: %s\n"
 
-#: git-send-email.perl:657
 #, perl-format
 msgid "warning: `/file` or `|pipe` redirection not supported: %s\n"
 msgstr "Warnung: `/file` oder `|pipe` Umleitung wird nicht unterstützt: %s\n"
 
-#: git-send-email.perl:662
 #, perl-format
 msgid "warning: sendmail line is not recognized: %s\n"
 msgstr "Warnung: sendmail Zeile wird nicht erkannt: %s\n"
 
-#: git-send-email.perl:747
 #, perl-format
 msgid ""
 "File '%s' exists but it could also be the range of commits\n"
@@ -27228,12 +22128,10 @@ msgstr ""
 "    * die Option --format-patch angeben, wenn Sie einen Commit-Bereich "
 "meinen.\n"
 
-#: git-send-email.perl:768
 #, perl-format
 msgid "Failed to opendir %s: %s"
 msgstr "Fehler beim Öffnen von %s: %s"
 
-#: git-send-email.perl:803
 msgid ""
 "\n"
 "No patch files specified!\n"
@@ -27243,17 +22141,14 @@ msgstr ""
 "Keine Patch-Dateien angegeben!\n"
 "\n"
 
-#: git-send-email.perl:816
 #, perl-format
 msgid "No subject line in %s?"
 msgstr "Keine Betreffzeile in %s?"
 
-#: git-send-email.perl:827
 #, perl-format
 msgid "Failed to open for writing %s: %s"
 msgstr "Fehler beim Öffnen von '%s' zum Schreiben: %s"
 
-#: git-send-email.perl:838
 msgid ""
 "Lines beginning in \"GIT:\" will be removed.\n"
 "Consider including an overall diffstat or table of contents\n"
@@ -27268,27 +22163,22 @@ msgstr ""
 "Leeren Sie den Inhalt des Bodys, wenn Sie keine Zusammenfassung senden "
 "möchten.\n"
 
-#: git-send-email.perl:862
 #, perl-format
 msgid "Failed to open %s: %s"
 msgstr "Fehler beim Öffnen von %s: %s"
 
-#: git-send-email.perl:879
 #, perl-format
 msgid "Failed to open %s.final: %s"
 msgstr "Fehler beim Öffnen von %s.final: %s"
 
-#: git-send-email.perl:922
 msgid "Summary email is empty, skipping it\n"
 msgstr "E-Mail mit Zusammenfassung ist leer, wird ausgelassen\n"
 
 #. TRANSLATORS: please keep [y/N] as is.
-#: git-send-email.perl:971
 #, perl-format
 msgid "Are you sure you want to use <%s> [y/N]? "
 msgstr "Sind Sie sich sicher, <%s> zu benutzen [y/N]? "
 
-#: git-send-email.perl:1026
 msgid ""
 "The following files are 8bit, but do not declare a Content-Transfer-"
 "Encoding.\n"
@@ -27296,11 +22186,9 @@ msgstr ""
 "Die folgenden Dateien sind 8-Bit, aber deklarieren kein\n"
 "Content-Transfer-Encoding.\n"
 
-#: git-send-email.perl:1031
 msgid "Which 8bit encoding should I declare [UTF-8]? "
 msgstr "Welches 8-Bit-Encoding soll deklariert werden [UTF-8]? "
 
-#: git-send-email.perl:1039
 #, perl-format
 msgid ""
 "Refusing to send because the patch\n"
@@ -27314,22 +22202,18 @@ msgstr ""
 "an,\n"
 "wenn Sie den Patch wirklich versenden wollen.\n"
 
-#: git-send-email.perl:1058
 msgid "To whom should the emails be sent (if anyone)?"
 msgstr "An wen sollen die E-Mails versendet werden (wenn überhaupt jemand)?"
 
-#: git-send-email.perl:1076
 #, perl-format
 msgid "fatal: alias '%s' expands to itself\n"
 msgstr "fatal: Alias '%s' erweitert sich zu sich selbst\n"
 
-#: git-send-email.perl:1088
 msgid "Message-ID to be used as In-Reply-To for the first email (if any)? "
 msgstr ""
 "Message-ID zur Verwendung als In-Reply-To für die erste E-Mail (wenn eine "
 "existiert)? "
 
-#: git-send-email.perl:1150 git-send-email.perl:1158
 #, perl-format
 msgid "error: unable to extract a valid address from: %s\n"
 msgstr "Fehler: konnte keine gültige Adresse aus %s extrahieren\n"
@@ -27337,18 +22221,15 @@ msgstr "Fehler: konnte keine gültige Adresse aus %s extrahieren\n"
 #. 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:1162
 msgid "What to do with this address? ([q]uit|[d]rop|[e]dit): "
 msgstr ""
 "Was soll mit dieser Adresse geschehen? (Beenden [q]|Löschen [d]|Bearbeiten "
 "[e]): "
 
-#: git-send-email.perl:1482
 #, perl-format
 msgid "CA path \"%s\" does not exist"
 msgstr "CA Pfad \"%s\" existiert nicht"
 
-#: git-send-email.perl:1565
 msgid ""
 "    The Cc list above has been expanded by additional\n"
 "    addresses found in the patch commit message. By default\n"
@@ -27377,117 +22258,93 @@ msgstr ""
 #. 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:1580
 msgid "Send this email? ([y]es|[n]o|[e]dit|[q]uit|[a]ll): "
 msgstr ""
 "Diese E-Mail versenden? (Ja [y]|Nein [n]|Bearbeiten [e]|Beenden [q]|Alle "
 "[a]): "
 
-#: git-send-email.perl:1583
 msgid "Send this email reply required"
 msgstr "Zum Versenden dieser E-Mail ist eine Antwort erforderlich"
 
-#: git-send-email.perl:1617
 msgid "The required SMTP server is not properly defined."
 msgstr "Der erforderliche SMTP-Server ist nicht korrekt definiert."
 
-#: git-send-email.perl:1664
 #, perl-format
 msgid "Server does not support STARTTLS! %s"
 msgstr "Server unterstützt kein STARTTLS! %s"
 
-#: git-send-email.perl:1669 git-send-email.perl:1673
 #, perl-format
 msgid "STARTTLS failed! %s"
 msgstr "STARTTLS fehlgeschlagen! %s"
 
-#: git-send-email.perl:1682
 msgid "Unable to initialize SMTP properly. Check config and use --smtp-debug."
 msgstr ""
 "Konnte SMTP nicht korrekt initialisieren. Bitte prüfen Sie Ihre "
 "Konfiguration\n"
 "und benutzen Sie --smtp-debug."
 
-#: git-send-email.perl:1700
 #, perl-format
 msgid "Failed to send %s\n"
 msgstr "Fehler beim Senden %s\n"
 
-#: git-send-email.perl:1703
 #, perl-format
 msgid "Dry-Sent %s\n"
 msgstr "Probeversand %s\n"
 
-#: git-send-email.perl:1703
 #, perl-format
 msgid "Sent %s\n"
 msgstr "%s gesendet\n"
 
-#: git-send-email.perl:1705
 msgid "Dry-OK. Log says:\n"
 msgstr "Probeversand OK. Log enthält:\n"
 
-#: git-send-email.perl:1705
 msgid "OK. Log says:\n"
 msgstr "OK. Log enthält:\n"
 
-#: git-send-email.perl:1724
 msgid "Result: "
 msgstr "Ergebnis: "
 
-#: git-send-email.perl:1727
 msgid "Result: OK\n"
 msgstr "Ergebnis: OK\n"
 
-#: git-send-email.perl:1744
 #, perl-format
 msgid "can't open file %s"
 msgstr "Kann Datei %s nicht öffnen"
 
-#: git-send-email.perl:1792 git-send-email.perl:1812
 #, perl-format
 msgid "(mbox) Adding cc: %s from line '%s'\n"
 msgstr "(mbox) Füge cc: hinzu: %s von Zeile '%s'\n"
 
-#: git-send-email.perl:1798
 #, perl-format
 msgid "(mbox) Adding to: %s from line '%s'\n"
 msgstr "(mbox) Füge to: hinzu: %s von Zeile '%s'\n"
 
-#: git-send-email.perl:1855
 #, perl-format
 msgid "(non-mbox) Adding cc: %s from line '%s'\n"
 msgstr "(non-mbox) Füge cc: hinzu: %s von Zeile '%s'\n"
 
-#: git-send-email.perl:1890
 #, perl-format
 msgid "(body) Adding cc: %s from line '%s'\n"
 msgstr "(body) Füge cc: hinzu: %s von Zeile '%s'\n"
 
-#: git-send-email.perl:2009
 #, perl-format
 msgid "(%s) Could not execute '%s'"
 msgstr "(%s) Konnte '%s' nicht ausführen"
 
-#: git-send-email.perl:2016
 #, perl-format
 msgid "(%s) Adding %s: %s from: '%s'\n"
 msgstr "(%s) Füge %s: %s hinzu von: '%s'\n"
 
-#: git-send-email.perl:2020
 #, perl-format
 msgid "(%s) failed to close pipe to '%s'"
 msgstr "(%s) Fehler beim Schließen der Pipe nach '%s'"
 
-#: git-send-email.perl:2050
 msgid "cannot send message as 7bit"
 msgstr "kann Nachricht nicht als 7bit versenden"
 
-#: git-send-email.perl:2058
 msgid "invalid transfer encoding"
 msgstr "ungültiges Transfer-Encoding"
 
-#: git-send-email.perl:2100
 #, perl-format
 msgid ""
 "fatal: %s: rejected by %s hook\n"
@@ -27498,12 +22355,10 @@ msgstr ""
 "%s\n"
 "Warnung: Es wurden keine Patches gesendet\n"
 
-#: git-send-email.perl:2110 git-send-email.perl:2163 git-send-email.perl:2173
 #, perl-format
 msgid "unable to open %s: %s\n"
 msgstr "konnte %s nicht öffnen: %s\n"
 
-#: git-send-email.perl:2113
 #, perl-format
 msgid ""
 "fatal: %s:%d is longer than 998 characters\n"
@@ -27512,13 +22367,11 @@ msgstr ""
 "fatal: %s:%d ist länger als 998 Zeichen\n"
 "Warnung: Es wurden keine Patches gesendet\n"
 
-#: git-send-email.perl:2131
 #, 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:2135
 #, 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 ced2eb6d3d..b219047679 100644
--- a/po/es.po
+++ b/po/es.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Git\n"
 "Report-Msgid-Bugs-To: Git Mailing List <git@vger.kernel.org>\n"
-"POT-Creation-Date: 2021-11-04 08:34+0800\n"
+"POT-Creation-Date: 2022-06-16 08:28-0600\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"
@@ -18,239 +18,176 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 "X-Generator: Poedit 3.0\n"
 
-#: add-interactive.c:380
 #, c-format
 msgid "Huh (%s)?"
 msgstr "¿Ahh (%s)?"
 
-#: 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:588 git-add--interactive.perl:269
-#: git-add--interactive.perl:294
 msgid "binary"
 msgstr "binario"
 
-#: add-interactive.c:646 git-add--interactive.perl:278
-#: git-add--interactive.perl:332
 msgid "nothing"
 msgstr "nada"
 
-#: add-interactive.c:647 git-add--interactive.perl:314
-#: git-add--interactive.perl:329
 msgid "unchanged"
 msgstr "sin cambios"
 
-#: add-interactive.c:684 git-add--interactive.perl:641
 msgid "Update"
 msgstr "Actualizar"
 
-#: 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: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: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: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: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:763 git-add--interactive.perl:653
 msgid "Revert"
 msgstr "Revertir"
 
-#: add-interactive.c:779
 msgid "Could not parse HEAD^{tree}"
 msgstr "No se pudo analizar HEAD^{tree}"
 
-#: 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:868 git-add--interactive.perl:693
 #, c-format
 msgid "No untracked files.\n"
 msgstr "No hay archivos sin rastrear.\n"
 
-#: add-interactive.c:872 git-add--interactive.perl:687
 msgid "Add untracked"
 msgstr "Agregar no rastreados"
 
-#: 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:929
 #, c-format
 msgid "ignoring unmerged: %s"
 msgstr "ignorando lo no fusionado: %s"
 
-#: 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:943 add-patch.c:1750 git-add--interactive.perl:1371
 #, c-format
 msgid "No changes.\n"
 msgstr "Sin cambios.\n"
 
-#: add-interactive.c:947 git-add--interactive.perl:1379
 msgid "Patch update"
 msgstr "Actualización del parche"
 
-#: add-interactive.c:986 git-add--interactive.perl:1792
 msgid "Review diff"
 msgstr "Revisión de diff"
 
-#: add-interactive.c:1014
 msgid "show paths with changes"
 msgstr "mostrar rutas con cambios"
 
-#: 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: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:1020
 msgid "pick hunks and update selectively"
 msgstr "elegir fragmentos y actualizar de forma selectiva"
 
-#: add-interactive.c:1022
 msgid "view diff between HEAD and index"
 msgstr "ver diff entre HEAD e index"
 
-#: 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:1032 add-interactive.c:1081
 msgid "Prompt help:"
 msgstr "Mostrar ayuda:"
 
-#: add-interactive.c:1034
 msgid "select a single item"
 msgstr "seleccionar un único objeto"
 
-#: 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:1042
 msgid "unselect specified items"
 msgstr "quitar objetos especificados"
 
-#: add-interactive.c:1044
 msgid "choose all items"
 msgstr "escoger todos los objetos"
 
-#: add-interactive.c:1046
 msgid "(empty) finish selecting"
 msgstr "(vacío) finalizar selección"
 
-#: add-interactive.c:1083
 msgid "select a numbered item"
 msgstr "seleccionar un objeto numerado"
 
-#: 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:1096 builtin/clean.c:814 git-add--interactive.perl:1893
 msgid "What now"
 msgstr "Ahora qué"
 
-#: add-interactive.c:1148 git-add--interactive.perl:213
 msgid "staged"
-msgstr "rastreado"
+msgstr "en stage"
 
-#: add-interactive.c:1148 git-add--interactive.perl:213
 msgid "unstaged"
-msgstr "no rastreado"
-
-#: 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
+msgstr "no en stage"
+
 msgid "path"
 msgstr "ruta"
 
-#: add-interactive.c:1155
 msgid "could not refresh index"
 msgstr "no se pudo refrescar el índice"
 
-#: add-interactive.c:1169 builtin/clean.c:778 git-add--interactive.perl:1803
 #, c-format
 msgid "Bye.\n"
 msgstr "Adiós.\n"
 
-#: add-patch.c:34 git-add--interactive.perl:1431
 #, c-format, perl-format
 msgid "Stage mode change [y,n,q,a,d%s,?]? "
-msgstr "¿Cambio de modo de stage [y,n,q,a,d%s,?]? "
+msgstr "¿Aplicar stage al cambio de modo [y,n,q,a,d%s,?]? "
 
-#: add-patch.c:35 git-add--interactive.perl:1432
 #, c-format, perl-format
 msgid "Stage deletion [y,n,q,a,d%s,?]? "
 msgstr "¿Aplicar stage al borrado [y,n,q,a,d%s,?]? "
 
-#: add-patch.c:36 git-add--interactive.perl:1433
 #, c-format, perl-format
 msgid "Stage addition [y,n,q,a,d%s,?]? "
 msgstr "¿Agregar al stage [y,n,q,a,d%s,?]? "
 
-#: add-patch.c:37 git-add--interactive.perl:1434
 #, c-format, perl-format
 msgid "Stage this hunk [y,n,q,a,d%s,?]? "
 msgstr "¿Aplicar stage a este fragmento [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."
@@ -258,7 +195,6 @@ msgstr ""
 "Si el parche aplica limpiamente, el fragmento editado será marcado "
 "inmediatamente para el área de stage."
 
-#: add-patch.c:42
 msgid ""
 "y - stage this hunk\n"
 "n - do not stage this hunk\n"
@@ -273,27 +209,22 @@ msgstr ""
 "d - no aplicar stage a este fragmento o a ninguno de los posteriores en este "
 "archivo\n"
 
-#: add-patch.c:56 git-add--interactive.perl:1437
 #, c-format, perl-format
 msgid "Stash mode change [y,n,q,a,d%s,?]? "
 msgstr "¿Hacer stash al cambio de modo [y,n,q,a,d%s,?]? "
 
-#: add-patch.c:57 git-add--interactive.perl:1438
 #, c-format, perl-format
 msgid "Stash deletion [y,n,q,a,d%s,?]? "
 msgstr "¿Hacer stash a la eliminación [y,n,q,a,d%s,?]? "
 
-#: add-patch.c:58 git-add--interactive.perl:1439
 #, c-format, perl-format
 msgid "Stash addition [y,n,q,a,d%s,?]? "
 msgstr "¿Agregar al stash [y,n,q,a,d%s,?]? "
 
-#: add-patch.c:59 git-add--interactive.perl:1440
 #, c-format, perl-format
 msgid "Stash this hunk [y,n,q,a,d%s,?]? "
 msgstr "¿Hacer stash a este fragmento [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."
@@ -301,7 +232,6 @@ msgstr ""
 "Si el parche aplica limpiamente, el fragmento editado será marcado "
 "inmediatamente para hacer stash."
 
-#: add-patch.c:64
 msgid ""
 "y - stash this hunk\n"
 "n - do not stash this hunk\n"
@@ -316,27 +246,22 @@ msgstr ""
 "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
 msgid "Unstage mode change [y,n,q,a,d%s,?]? "
 msgstr "¿Sacar cambio de modo del stage [y,n,q,a,d%s,?]? "
 
-#: add-patch.c:81 git-add--interactive.perl:1444
 #, c-format, perl-format
 msgid "Unstage deletion [y,n,q,a,d%s,?]? "
 msgstr "¿Sacar borrado del stage [y,n,q,a,d%s,?]? "
 
-#: add-patch.c:82 git-add--interactive.perl:1445
 #, c-format, perl-format
 msgid "Unstage addition [y,n,q,a,d%s,?]? "
 msgstr "¿Quitar adición al stage [y,n,q,a,d%s,?]? "
 
-#: add-patch.c:83 git-add--interactive.perl:1446
 #, c-format, perl-format
 msgid "Unstage this hunk [y,n,q,a,d%s,?]? "
 msgstr "¿Sacar este fragmento del stage [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."
@@ -344,7 +269,6 @@ msgstr ""
 "Si el parche aplica limpiamente, el fragmento editado será marcado "
 "inmediatamente para sacar del área de stage."
 
-#: add-patch.c:88
 msgid ""
 "y - unstage this hunk\n"
 "n - do not unstage this hunk\n"
@@ -352,36 +276,31 @@ msgid ""
 "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 - 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 "
+"y - sacar este hunk del área de stage\n"
+"n - no sacar este fragmento del área de stage\n"
+"q - quit; no sacar del área de stage este fragmento ni ninguno de los "
 "restantes\n"
-"a - sacar del area de stage este fragmento y todos los posteriores en el "
+"a - sacar del área 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 "
+"d - no sacar del área 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
 msgid "Apply mode change to index [y,n,q,a,d%s,?]? "
 msgstr "¿Aplicar cambio de modo al índice [y,n,q,a,d%s,?]? "
 
-#: add-patch.c:104 git-add--interactive.perl:1450
 #, c-format, perl-format
 msgid "Apply deletion to index [y,n,q,a,d%s,?]? "
 msgstr "¿Aplicar borrado al índice [y,n,q,a,d%s,?]? "
 
-#: add-patch.c:105 git-add--interactive.perl:1451
 #, c-format, perl-format
 msgid "Apply addition to index [y,n,q,a,d%s,?]? "
 msgstr "¿Aplicar adición al índice [y,n,q,a,d%s,?]? "
 
-#: 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 fragmento al índice [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."
@@ -389,7 +308,6 @@ msgstr ""
 "Si el parche aplica de forma limpia, el fragmento editado será marcado "
 "inmediatamente para aplicar."
 
-#: add-patch.c:111
 msgid ""
 "y - apply this hunk to index\n"
 "n - do not apply this hunk to index\n"
@@ -403,31 +321,22 @@ msgstr ""
 "a - aplicar este fragmento y todos los posteriores en el archivo\n"
 "d - no aplicar este fragmento ni ninguno de los posteriores en el archivo\n"
 
-#: add-patch.c:126 git-add--interactive.perl:1455
-#: git-add--interactive.perl:1473
 #, c-format, perl-format
 msgid "Discard mode change from worktree [y,n,q,a,d%s,?]? "
 msgstr "¿Descartar cambio de modo del árbol de trabajo [y,n,q,a,d%s,?]? "
 
-#: add-patch.c:127 git-add--interactive.perl:1456
-#: git-add--interactive.perl:1474
 #, c-format, perl-format
 msgid "Discard deletion from worktree [y,n,q,a,d%s,?]? "
 msgstr "¿Descartar borrado del árbol de trabajo [y,n,q,a,d%s,?]? "
 
-#: add-patch.c:128 git-add--interactive.perl:1457
-#: git-add--interactive.perl:1475
 #, c-format, perl-format
 msgid "Discard addition from worktree [y,n,q,a,d%s,?]? "
 msgstr "¿Descartar adición del árbol de trabajo [y,n,q,a,d%s,?]? "
 
-#: add-patch.c:129 git-add--interactive.perl:1458
-#: git-add--interactive.perl:1476
 #, c-format, perl-format
 msgid "Discard this hunk from worktree [y,n,q,a,d%s,?]? "
 msgstr "¿Descartar este fragmento del árbol de trabajo [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."
@@ -435,7 +344,6 @@ msgstr ""
 "Si el parche aplica de forma limpia, el fragmento editado será marcado "
 "inmediatamente para descarte."
 
-#: add-patch.c:134 add-patch.c:202
 msgid ""
 "y - discard this hunk from worktree\n"
 "n - do not discard this hunk from worktree\n"
@@ -449,29 +357,24 @@ msgstr ""
 "a - descartar este fragmento y todos los posteriores en este archivo\n"
 "d - no descartar este fragmento ni ninguno de los posteriores en el archivo\n"
 
-#: add-patch.c:149 add-patch.c:194 git-add--interactive.perl:1461
 #, c-format, perl-format
 msgid "Discard mode change from index and worktree [y,n,q,a,d%s,?]? "
 msgstr ""
 "¿Descartar cambio de modo del índice y el árbol de trabajo [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 "¿Descartar borrado del índice y el árbol de trabajo [y,n,q,a,d%s,?]? "
 
-#: add-patch.c:151 add-patch.c:196 git-add--interactive.perl:1463
 #, c-format, perl-format
 msgid "Discard addition from index and worktree [y,n,q,a,d%s,?]? "
 msgstr "¿Descartar adición del índice y el árbol de trabajo [y,n,q,a,d%s,?]? "
 
-#: 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 ""
 "¿Descartar este fragmento del índice y el árbol de trabajo [y,n,q,a,d%s,?]? "
 
-#: add-patch.c:157
 msgid ""
 "y - discard this hunk from index and worktree\n"
 "n - do not discard this hunk from index and worktree\n"
@@ -485,30 +388,25 @@ msgstr ""
 "a - descartar este fragmento y todos los posteriores en este archivo\n"
 "d - no descartar este fragmento ni ninguno posterior en el archivo\n"
 
-#: add-patch.c:171 add-patch.c:216 git-add--interactive.perl:1467
 #, c-format, perl-format
 msgid "Apply mode change to index and worktree [y,n,q,a,d%s,?]? "
 msgstr ""
-"¿Aplicar cambio de modo para el índice y el árbol de trabajo [y,n,q,a,d"
-"%s,?]? "
+"¿Aplicar cambio de modo para el índice y el árbol de trabajo [y,n,q,a,"
+"d%s,?]? "
 
-#: 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 "¿Aplicar borrado al índice y al árbol de trabajo [y,n,q,a,d%s,?]? "
 
-#: add-patch.c:173 add-patch.c:218 git-add--interactive.perl:1469
 #, c-format, perl-format
 msgid "Apply addition to index and worktree [y,n,q,a,d%s,?]? "
 msgstr "¿Aplicar adición al índice y al árbol de trabajo [y,n,q,a,d%s,?]? "
 
-#: 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,?]? "
 
-#: add-patch.c:179
 msgid ""
 "y - apply this hunk to index and worktree\n"
 "n - do not apply this hunk to index and worktree\n"
@@ -522,7 +420,6 @@ msgstr ""
 "a - aplicar este fragmento y todos los posteriores en el archivo\n"
 "d - no aplicar este fragmento ni ninguno de los siguientes en este archivo\n"
 
-#: add-patch.c:224
 msgid ""
 "y - apply this hunk to worktree\n"
 "n - do not apply this hunk to worktree\n"
@@ -536,34 +433,27 @@ msgstr ""
 "a - aplicar este fragmento y todos los posteriores en el archivo\n"
 "d - no aplicar este fragmento ni ninguno de los siguientes en este archivo\n"
 
-#: add-patch.c:343
 #, c-format
 msgid "could not parse hunk header '%.*s'"
 msgstr "no se puede analizar hunk header '%.*s'"
 
-#: add-patch.c:362 add-patch.c:366
 #, c-format
 msgid "could not parse colored hunk header '%.*s'"
 msgstr "no se puede analizar hunk header '%.*s'"
 
-#: add-patch.c:420
 msgid "could not parse diff"
 msgstr "no se puede analizar diff"
 
-#: add-patch.c:439
 msgid "could not parse colored diff"
 msgstr "no se pudo analizar diff a colores"
 
-#: add-patch.c:453
 #, c-format
 msgid "failed to run '%s'"
 msgstr "falló al ejecutar '%s'"
 
-#: add-patch.c:612
 msgid "mismatched output from interactive.diffFilter"
 msgstr "salida de interactive.diffFilter no concuerda"
 
-#: add-patch.c:613
 msgid ""
 "Your filter must maintain a one-to-one correspondence\n"
 "between its input and output lines."
@@ -571,7 +461,6 @@ msgstr ""
 "Tu filtro tiene que mantener correspondencia de uno a uno\n"
 "entre las líneas de entrada y salida."
 
-#: add-patch.c:791
 #, c-format
 msgid ""
 "expected context line #%d in\n"
@@ -580,7 +469,6 @@ msgstr ""
 "se esperaba línea de contexto #%d en\n"
 "%.*s"
 
-#: add-patch.c:806
 #, c-format
 msgid ""
 "hunks do not overlap:\n"
@@ -593,11 +481,9 @@ msgstr ""
 "\tno acaba con:\n"
 "%.*s"
 
-#: 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 -- mira abajo para una guía rápida.\n"
 
-#: add-patch.c:1086
 #, c-format
 msgid ""
 "---\n"
@@ -610,8 +496,8 @@ msgstr ""
 "Para eliminar '%c' líneas, bórrelas.\n"
 "Líneas comenzando con %c serán eliminadas.\n"
 
+#. #-#-#-#-#  git-add--interactive.perl.po  #-#-#-#-#
 #. TRANSLATORS: 'it' refers to the patch mentioned in the previous messages.
-#: 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"
@@ -622,46 +508,41 @@ msgstr ""
 "entonces\n"
 "la edición es abortada y el fragmento queda sin cambios.\n"
 
-#: add-patch.c:1133
 msgid "could not parse hunk header"
 msgstr "no se puede analizar hunk header"
 
-#: add-patch.c:1178
 msgid "'git apply --cached' failed"
 msgstr "falló 'git apply --cached'"
 
+#. #-#-#-#-#  add-patch.c.po  #-#-#-#-#
 #. 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.
 #.
+#. #-#-#-#-#  git-add--interactive.perl.po  #-#-#-#-#
 #. 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:1247 git-add--interactive.perl:1242
 msgid ""
 "Your edited hunk does not apply. Edit again (saying \"no\" discards!) [y/n]? "
 msgstr ""
 "Tu hunk editado no aplica. ¿Editar nuevamente (¡decir \"no\" descarta!) [y/"
 "n]? "
 
-#: add-patch.c:1290
 msgid "The selected hunks do not apply to the index!"
 msgstr "¡Los hunks seleccionados no aplican al índice!"
 
-#: add-patch.c:1291 git-add--interactive.perl:1346
 msgid "Apply them to the worktree anyway? "
 msgstr "¿Aplicarlos al árbol de trabajo de todas maneras? "
 
-#: add-patch.c:1298 git-add--interactive.perl:1349
 msgid "Nothing was applied.\n"
 msgstr "Nada fue aplicado.\n"
 
-#: add-patch.c:1355
 msgid ""
 "j - leave this hunk undecided, see next undecided hunk\n"
 "J - leave this hunk undecided, see next hunk\n"
@@ -684,73 +565,57 @@ msgstr ""
 "e - editar manualmente el fragmento actual\n"
 "? - imprimir ayuda\n"
 
-#: add-patch.c:1517 add-patch.c:1527
 msgid "No previous hunk"
 msgstr "No hay fragmento anterior"
 
-#: add-patch.c:1522 add-patch.c:1532
 msgid "No next hunk"
 msgstr "No hay fragmento siguiente"
 
-#: add-patch.c:1538
 msgid "No other hunks to goto"
 msgstr "No hay más fragmentos a que ir"
 
-#: add-patch.c:1549 git-add--interactive.perl:1606
 msgid "go to which hunk (<ret> to see more)? "
 msgstr "¿a qué fragmento ir (<enter> para ver más)? "
 
-#: add-patch.c:1550 git-add--interactive.perl:1608
 msgid "go to which hunk? "
 msgstr "¿a qué fragmento ir? "
 
-#: add-patch.c:1561
 #, c-format
 msgid "Invalid number: '%s'"
 msgstr "Número inválido: '%s'"
 
-#: add-patch.c:1566
 #, c-format
 msgid "Sorry, only %d hunk available."
 msgid_plural "Sorry, only %d hunks available."
 msgstr[0] "Lo siento, solo %d fragmento disponible."
 msgstr[1] "Lo siento, solo %d fragmentos disponibles."
 
-#: add-patch.c:1575
 msgid "No other hunks to search"
 msgstr "No hay más fragmentos para buscar"
 
-#: add-patch.c:1581 git-add--interactive.perl:1661
 msgid "search for regex? "
 msgstr "¿buscar para regexp? "
 
-#: add-patch.c:1596
 #, c-format
 msgid "Malformed search regexp %s: %s"
 msgstr "Regexp para la búsqueda mal formado %s: %s"
 
-#: add-patch.c:1613
 msgid "No hunk matches the given pattern"
 msgstr "No hay fragmentos que concuerden con el patrón entregado"
 
-#: add-patch.c:1620
 msgid "Sorry, cannot split this hunk"
 msgstr "Perdón, no se puede dividir este pedazo"
 
-#: add-patch.c:1624
 #, c-format
 msgid "Split into %d hunks."
 msgstr "Cortar en %d fragmentos."
 
-#: add-patch.c:1628
 msgid "Sorry, cannot edit this hunk"
 msgstr "Perdón, no se puede editar este pedazo"
 
-#: add-patch.c:1680
 msgid "'git apply' failed"
 msgstr "falló 'git apply'"
 
-#: advice.c:78
 #, c-format
 msgid ""
 "\n"
@@ -759,38 +624,30 @@ msgstr ""
 "\n"
 "Desactivar este mensaje con \"git config advice.%s false\""
 
-#: advice.c:94
 #, c-format
 msgid "%shint: %.*s%s\n"
 msgstr "%sayuda: %.*s%s\n"
 
-#: 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: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:182
 msgid "Merging is not possible because you have unmerged files."
 msgstr "No es posible hacer merge porque tienes archivos sin fusionar."
 
-#: 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:186
 msgid "Reverting is not possible because you have unmerged files."
 msgstr "No es posible revertir porque tienes archivos sin fusionar."
 
-#: 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: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."
@@ -798,27 +655,21 @@ msgstr ""
 "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:204
 msgid "Exiting because of an unresolved conflict."
 msgstr "Saliendo porque existe un conflicto sin resolver."
 
-#: 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:211
 msgid "Please, commit your changes before merging."
 msgstr "Por favor, realiza un commit antes de fusionar."
 
-#: advice.c:212
 msgid "Exiting because of unfinished merge."
 msgstr "Saliendo por una fusión inconclusa."
 
-#: 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 paths and/or pathspecs matched paths that exist\n"
@@ -829,7 +680,6 @@ msgstr ""
 "fuera de su definición para sparse-checkout, por lo que no\n"
 "se actualizarán en el índice:\n"
 
-#: advice.c:234
 msgid ""
 "If you intend to update such entries, try one of the following:\n"
 "* Use the --sparse option.\n"
@@ -839,7 +689,6 @@ msgstr ""
 "* Use la opción --sparse.\n"
 "* Deshabilite o modifique las reglas de escasez."
 
-#: advice.c:242
 #, c-format
 msgid ""
 "Note: switching to '%s'.\n"
@@ -882,93 +731,71 @@ msgstr ""
 "false\n"
 "\n"
 
-#: alias.c:50
 msgid "cmdline ends with \\"
 msgstr "cmdline termina en \\"
 
-#: alias.c:51
 msgid "unclosed quote"
 msgstr "comillas incompletas"
 
-#: apply.c:70
 #, c-format
 msgid "unrecognized whitespace option '%s'"
 msgstr "opción de espacios en blanco no reconocida '%s'"
 
-#: apply.c:86
 #, c-format
 msgid "unrecognized whitespace ignore option '%s'"
 msgstr "opción de ignorar espacios en blanco no reconocida '%s'"
 
-#: apply.c:136
-msgid "--reject and --3way cannot be used together."
-msgstr "--reject y --3way no se pueden utilizar juntas."
+#, fuzzy, c-format
+msgid "options '%s' and '%s' cannot be used together"
+msgstr "Opciones --squash y --fixup no pueden ser usadas juntas"
 
-#: apply.c:139
-msgid "--3way outside a repository"
+#, fuzzy, c-format
+msgid "'%s' outside a repository"
 msgstr "--3way está fuera de un repositorio"
 
-#: apply.c:150
-msgid "--index outside a repository"
-msgstr "--index está fuera de un repositorio"
-
-#: apply.c:153
-msgid "--cached outside a repository"
-msgstr "--cached está fuera de un repositorio"
-
-#: apply.c:800
 #, c-format
 msgid "Cannot prepare timestamp regexp %s"
 msgstr "No se puede preparar una marca de tiempo para la expresión regular %s"
 
-#: apply.c:809
 #, c-format
 msgid "regexec returned %d for input: %s"
 msgstr "regexec devolvió %d para la entrada: %s"
 
-#: apply.c:883
 #, c-format
 msgid "unable to find filename in patch at line %d"
 msgstr ""
 "no se puede encontrar el nombre del archivo en el parche en la línea %d"
 
-#: apply.c:921
 #, c-format
 msgid "git apply: bad git-diff - expected /dev/null, got %s on line %d"
 msgstr ""
 "git apply: git-diff erróneo - se esperaba /dev/null, se encontró %s en la "
 "línea %d"
 
-#: apply.c:927
 #, c-format
 msgid "git apply: bad git-diff - inconsistent new filename on line %d"
 msgstr ""
 "git apply: git-diff erróneo - nuevo nombre de archivo inconsistente en la "
 "línea %d"
 
-#: apply.c:928
 #, c-format
 msgid "git apply: bad git-diff - inconsistent old filename on line %d"
 msgstr ""
 "git apply: git-diff erróneo - viejo nombre de archivo inconsistente en la "
 "línea %d"
 
-#: apply.c:933
 #, c-format
 msgid "git apply: bad git-diff - expected /dev/null on line %d"
 msgstr "git apply: git-diff erróneo - se esperaba /dev/null en la línea %d"
 
-#: apply.c:962
 #, c-format
 msgid "invalid mode on line %d: %s"
 msgstr "modo inválido en la línea %d: %s"
 
-#: apply.c:1281
 #, c-format
 msgid "inconsistent header lines %d and %d"
 msgstr "header inconsistente en las líneas %d y %d"
 
-#: apply.c:1371
 #, c-format
 msgid ""
 "git diff header lacks filename information when removing %d leading pathname "
@@ -983,94 +810,76 @@ msgstr[1] ""
 "los headers de git diff carecen de información del nombre del archivo cuando "
 "se eliminan %d componentes principales de la ruta (línea %d)"
 
-#: apply.c:1384
 #, c-format
 msgid "git diff header lacks filename information (line %d)"
 msgstr ""
 "la cabecera de git diff carece de información del nombre del archivo (línea "
 "%d)"
 
-#: apply.c:1480
 #, c-format
 msgid "recount: unexpected line: %.*s"
 msgstr "recount: línea inesperada: %.*s"
 
-#: apply.c:1549
 #, c-format
 msgid "patch fragment without header at line %d: %.*s"
 msgstr "fragmento de parche sin header en la línea %d: %.*s"
 
-#: apply.c:1752
 msgid "new file depends on old contents"
 msgstr "el nuevo archivo depende de contenidos viejos"
 
-#: apply.c:1754
 msgid "deleted file still has contents"
 msgstr "el archivo eliminado todavía tiene contenido"
 
-#: apply.c:1788
 #, c-format
 msgid "corrupt patch at line %d"
 msgstr "parche corrupto en la línea %d"
 
-#: apply.c:1825
 #, c-format
 msgid "new file %s depends on old contents"
 msgstr "nuevo archivo %s depende en contenidos viejos"
 
-#: apply.c:1827
 #, c-format
 msgid "deleted file %s still has contents"
 msgstr "el archivo borrado %s todavía tiene contenido"
 
-#: apply.c:1830
 #, c-format
 msgid "** warning: file %s becomes empty but is not deleted"
 msgstr "** peligro: el archivo %s está vacío pero no es borrado"
 
-#: 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:2015
 #, c-format
 msgid "unrecognized binary patch at line %d"
 msgstr "parche binario no reconocido en la línea %d"
 
-#: 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:2263
 #, c-format
 msgid "unable to read symlink %s"
 msgstr "no es posible leer el enlace simbólico %s"
 
-#: apply.c:2267
 #, c-format
 msgid "unable to open or read %s"
 msgstr "no es posible abrir o leer %s"
 
-#: apply.c:2936
 #, c-format
 msgid "invalid start of line: '%c'"
 msgstr "comienzo inválido de línea: '%c'"
 
-#: 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: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:3075
 #, c-format
 msgid ""
 "while searching for:\n"
@@ -1079,24 +888,20 @@ msgstr ""
 "mientras se buscaba:\n"
 "%.*s"
 
-#: apply.c:3097
 #, c-format
 msgid "missing binary patch data for '%s'"
 msgstr "data perdida en parche binario para '%s'"
 
-#: 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'"
 
-#: 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:3163
 #, c-format
 msgid ""
 "the patch applies to '%s' (%s), which does not match the current contents."
@@ -1104,290 +909,231 @@ msgstr ""
 "el parche aplica a '%s' (%s), lo cual no concuerda con los contenidos "
 "actuales."
 
-#: 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: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:3202
 #, c-format
 msgid "binary patch does not apply to '%s'"
 msgstr "el parche binario no aplica para '%s'"
 
-#: 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:3230
 #, c-format
 msgid "patch failed: %s:%ld"
 msgstr "el parche falló: %s:%ld"
 
-#: apply.c:3353
 #, c-format
 msgid "cannot checkout %s"
 msgstr "no se puede hacer checkout a %s"
 
-#: 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:3413
 #, c-format
 msgid "reading from '%s' beyond a symbolic link"
 msgstr "leyendo de '%s' tras un enlace simbólico"
 
-#: 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:3549 apply.c:3724
 #, c-format
 msgid "%s: does not exist in index"
 msgstr "%s: no existe en el índice"
 
-#: 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: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:3596
 #, c-format
 msgid "Performing three-way merge...\n"
 msgstr "Realizando un merge de tres vías...\n"
 
-#: 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:3628
 #, c-format
 msgid "Failed to perform three-way merge...\n"
 msgstr "Falló en realizar fusión de tres vías...\n"
 
-#: apply.c:3642
 #, c-format
 msgid "Applied patch to '%s' with conflicts.\n"
 msgstr "Parche aplicado a '%s' con conflictos.\n"
 
-#: apply.c:3647
 #, c-format
 msgid "Applied patch to '%s' cleanly.\n"
 msgstr "Parche aplicado a '%s' limpiamente\n"
 
-#: apply.c:3664
 #, c-format
 msgid "Falling back to direct application...\n"
 msgstr "Retrocediendo a la aplicación...\n"
 
-#: apply.c:3676
 msgid "removal patch leaves file contents"
 msgstr "parche de eliminación deja contenidos en el archivo"
 
-#: apply.c:3749
 #, c-format
 msgid "%s: wrong type"
 msgstr "%s: tipo incorrecto"
 
-#: apply.c:3751
 #, c-format
 msgid "%s has type %o, expected %o"
 msgstr "%s tiene tipo %o, se esperaba %o"
 
-#: 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:3974
 #, c-format
 msgid "%s: already exists in index"
 msgstr "%s: ya existe en el índice"
 
-#: apply.c:3978
 #, c-format
 msgid "%s: already exists in working directory"
 msgstr "%s: ya existe en el directorio de trabajo"
 
-#: 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: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:4023
 #, c-format
 msgid "affected file '%s' is beyond a symbolic link"
 msgstr "archivo afectado '%s' está tras un enlace simbólico"
 
-#: apply.c:4027
 #, c-format
 msgid "%s: patch does not apply"
 msgstr "%s: el parche no aplica"
 
-#: apply.c:4042
 #, c-format
 msgid "Checking patch %s..."
 msgstr "Revisando el parche %s..."
 
-#: 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: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:4144
 #, c-format
 msgid "sha1 information is lacking or useless (%s)."
 msgstr "falta información sha1 o es inútil (%s)."
 
-#: 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:4163
 #, c-format
 msgid "could not write temporary index to %s"
 msgstr "no se pudo escribir un índice temporal para %s"
 
-#: apply.c:4301
 #, c-format
 msgid "unable to remove %s from index"
 msgstr "no se puede eliminar %s del índice"
 
-#: apply.c:4335
 #, c-format
 msgid "corrupt patch for submodule %s"
 msgstr "parche corrupto para el submódulo %s"
 
-#: 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: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: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: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:4402
 #, c-format
 msgid "closing file '%s'"
 msgstr "cerrando archivo '%s'"
 
-#: 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:4570
 #, c-format
 msgid "Applied patch %s cleanly."
 msgstr "Parche %s aplicado limpiamente."
 
-#: apply.c:4578
 msgid "internal error"
 msgstr "error interno"
 
-#: 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:4592
 #, c-format
 msgid "truncating .rej filename to %.*s.rej"
 msgstr "truncando el nombre de archivo .rej a %.*s.rej"
 
-#: 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:4614
 #, c-format
 msgid "Hunk #%d applied cleanly."
 msgstr "Hunk #%d aplicado limpiamente."
 
-#: apply.c:4618
 #, c-format
 msgid "Rejected hunk #%d."
 msgstr "Hunk #%d rechazado."
 
-#: apply.c:4747
 #, c-format
 msgid "Skipped patch '%s'."
 msgstr "Parche '%s' saltado."
 
-#: apply.c:4755
-msgid "unrecognized input"
-msgstr "input no reconocido"
+msgid "No valid patches in input (allow with \"--allow-empty\")"
+msgstr ""
 
-#: apply.c:4775
 msgid "unable to read index file"
 msgstr "no es posible leer el archivo índice"
 
-#: apply.c:4932
 #, c-format
 msgid "can't open patch '%s': %s"
 msgstr "no se puede abrir el parche '%s': %s"
 
-#: 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: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:4973
 #, c-format
 msgid "%d line applied after fixing whitespace errors."
 msgid_plural "%d lines applied after fixing whitespace errors."
@@ -1396,355 +1142,271 @@ msgstr[0] ""
 msgstr[1] ""
 "%d líneas aplicadas después de arreglar los errores de espacios en blanco."
 
-#: 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:5017
 msgid "don't apply changes matching the given path"
 msgstr "no aplicar cambios que concuerden con la ruta suministrada"
 
-#: apply.c:5020
 msgid "apply changes matching the given path"
 msgstr "aplicar cambios que concuerden con la ruta suministrada"
 
-#: apply.c:5022 builtin/am.c:2320
 msgid "num"
 msgstr "num"
 
-#: apply.c:5023
 msgid "remove <num> leading slashes from traditional diff paths"
 msgstr "eliminar <num> slashes iniciales de las rutas diff tradicionales"
 
-#: apply.c:5026
 msgid "ignore additions made by the patch"
 msgstr "ignorar adiciones hechas por el parche"
 
-#: 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: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: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: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:5038
 msgid "make sure the patch is applicable to the current index"
 msgstr "asegurar que el parche sea aplicable al índice actual"
 
-#: 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:5042
 msgid "apply a patch without touching the working tree"
 msgstr "aplicar un parche sin tocar el árbol de trabajo"
 
-#: 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:5047
 msgid "also apply the patch (use with --stat/--summary/--check)"
 msgstr "también aplicar el parche (usar con --stat/--summary/--check)"
 
-#: 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: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: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:5056
 msgid "ensure at least <n> lines of context match"
 msgstr "asegurar que al menos <n> líneas del contexto concuerden"
 
-#: 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 "acción"
 
-#: 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: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:5067
 msgid "apply the patch in reverse"
 msgstr "aplicar el parche en reversa"
 
-#: 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:5071
 msgid "leave the rejected hunks in corresponding *.rej files"
 msgstr "dejar los hunks rechazados en los archivos *.rej correspontientes"
 
-#: apply.c:5073
 msgid "allow overlapping hunks"
 msgstr "permitir solapamiento de hunks"
 
-#: 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: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: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:5081 builtin/am.c:2308
 msgid "root"
 msgstr "raíz"
 
-#: apply.c:5082
 msgid "prepend <root> to all filenames"
 msgstr "anteponer <root> a todos los nombres de archivos"
 
-#: archive-tar.c:125 archive-zip.c:345
+msgid "don't return error for empty patches"
+msgstr ""
+
 #, c-format
 msgid "cannot stream blob %s"
 msgstr "no se puede transmitir el blob %s"
 
-#: archive-tar.c:265 archive-zip.c:358
 #, c-format
 msgid "unsupported file mode: 0%o (SHA1: %s)"
 msgstr "modo de archivo no soportado: 0%o (SHA1: %s)"
 
-#: archive-tar.c:450
 #, c-format
 msgid "unable to start '%s' filter"
 msgstr "no se puede comenzar filtro '%s'"
 
-#: archive-tar.c:453
 msgid "unable to redirect descriptor"
 msgstr "incapaz de redirigir descriptor"
 
-#: archive-tar.c:460
 #, c-format
 msgid "'%s' filter reported error"
 msgstr "filtro '%s' reportó un error"
 
-#: archive-zip.c:318
 #, c-format
 msgid "path is not valid UTF-8: %s"
 msgstr "ruta no válida UTF-8: %s"
 
-#: archive-zip.c:322
 #, c-format
 msgid "path too long (%d chars, SHA1: %s): %s"
 msgstr "ruta demasiada larga (%d chars, SHA1: %s): %s"
 
-#: archive-zip.c:469 builtin/pack-objects.c:365 builtin/pack-objects.c:368
 #, c-format
 msgid "deflate error (%d)"
 msgstr "error al desinflar (%d)"
 
-#: archive-zip.c:603
 #, c-format
 msgid "timestamp too large for this system: %<PRIuMAX>"
 msgstr "timestamp demasiado grande para este sistema: %<PRIuMAX>"
 
-#: archive.c:14
 msgid "git archive [<options>] <tree-ish> [<path>...]"
 msgstr "git archive [<opciones>] <parte-del-árbol> [<ruta>...]"
 
-#: archive.c:15
-msgid "git archive --list"
-msgstr "git archive --list"
-
-#: archive.c:16
 msgid ""
 "git archive --remote <repo> [--exec <cmd>] [<options>] <tree-ish> [<path>...]"
 msgstr ""
 "git archive --remote <repo> [--exec <comando> ] [<opciones>] <parte-del-"
 "árbol> [<ruta>...]"
 
-#: archive.c:17
 msgid "git archive --remote <repo> [--exec <cmd>] --list"
 msgstr "git archive --remote <repo> [--exec <comando>] --list"
 
-#: archive.c:188
 #, c-format
-msgid "cannot read %s"
-msgstr "no se puede leer %s"
-
-#: 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'"
+msgid "cannot read '%s'"
+msgstr "no se puede leer '%s'"
 
-#: 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:450
 #, c-format
 msgid "no such ref: %.*s"
 msgstr "no existe el ref: %.*s"
 
-#: archive.c:456
 #, c-format
 msgid "not a valid object name: %s"
 msgstr "nombre de objeto no válido: %s"
 
-#: archive.c:469
 #, c-format
 msgid "not a tree object: %s"
 msgstr "no es un objeto tree: %s"
 
-#: archive.c:481
 msgid "current working directory is untracked"
 msgstr "directorio de trabajo actual no rastreado"
 
-#: archive.c:522
 #, c-format
 msgid "File not found: %s"
 msgstr "Archivo no encontrado: %s"
 
-#: archive.c:524
 #, c-format
 msgid "Not a regular file: %s"
 msgstr "No es un archivo regular: %s"
 
-#: archive.c:551
+#, fuzzy, c-format
+msgid "unclosed quote: '%s'"
+msgstr "comillas incompletas"
+
+#, fuzzy, c-format
+msgid "missing colon: '%s'"
+msgstr "valor faltante para '%s'"
+
+#, fuzzy, c-format
+msgid "empty file name: '%s'"
+msgstr "mbox vacío: '%s'"
+
 msgid "fmt"
 msgstr "fmt"
 
-#: archive.c:551
 msgid "archive format"
 msgstr "formato de crónica"
 
-#: archive.c:552 builtin/log.c:1775
 msgid "prefix"
 msgstr "prefijo"
 
-#: archive.c:553
 msgid "prepend prefix to each pathname in the archive"
 msgstr "anteponer prefijo a cada ruta en la crónica"
 
-#: 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:555
 msgid "add untracked file to archive"
 msgstr "incluir archivos sin seguimiento a la crónica"
 
-#: archive.c:558 builtin/archive.c:88
+#, fuzzy
+msgid "path:content"
+msgstr "contenido"
+
 msgid "write the archive to this file"
 msgstr "escribe la crónica en este archivo"
 
-#: archive.c:560
 msgid "read .gitattributes in working directory"
 msgstr "leer .gitattributes en el directorio de trabajo"
 
-#: archive.c:561
 msgid "report archived files on stderr"
 msgstr "reportar archivos en la crónica por stderr"
 
-#: archive.c:563
 msgid "set compression level"
 msgstr "configurar nivel de compresión"
 
-#: archive.c:566
 msgid "list supported archive formats"
 msgstr "listar los formatos de crónica soportados"
 
-#: 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:569 builtin/archive.c:90
 msgid "retrieve the archive from remote repository <repo>"
 msgstr "obtener la crónica del repositorio remoto <repo>"
 
-#: archive.c:570 builtin/archive.c:91 builtin/difftool.c:714
-#: builtin/notes.c:496
 msgid "command"
 msgstr "comando"
 
-#: 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:578
 msgid "Unexpected option --remote"
 msgstr "Opción inesperada --remote"
 
-#: archive.c:580
-msgid "Option --exec can only be used together with --remote"
-msgstr "Opción --exec solo puede ser utilizada con --remote"
+#, fuzzy, c-format
+msgid "the option '%s' requires '%s'"
+msgstr "opción `%s' requiere un valor"
 
-#: archive.c:582
 msgid "Unexpected option --output"
 msgstr "Opción inesperada --output"
 
-#: 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:606
 #, c-format
 msgid "Unknown archive format '%s'"
 msgstr "Formato de crónica desconocido '%s'"
 
-#: archive.c:615
 #, c-format
 msgid "Argument not supported for format '%s': -%d"
 msgstr "Argumento no soportado para formato '%s': -%d"
 
-#: 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:364
 #, c-format
 msgid "%s not allowed: %s:%d"
 msgstr "%s no permitido: %s:%d"
 
-#: attr.c:404
 msgid ""
 "Negative patterns are ignored in git attributes\n"
 "Use '\\!' for literal leading exclamation."
@@ -1752,22 +1414,18 @@ msgstr ""
 "Los patrones negativos son ignorados en los atributos de git\n"
 "Usa '\\!' para comenzar literalmente con exclamación."
 
-#: bisect.c:488
 #, c-format
 msgid "Badly quoted content in file '%s': %s"
 msgstr "Revisa las comillas en el archivo '%s': %s"
 
-#: bisect.c:698
 #, c-format
 msgid "We cannot bisect more!\n"
 msgstr "¡No podemos biseccionar más!\n"
 
-#: bisect.c:764
 #, c-format
 msgid "Not a valid commit name %s"
 msgstr "No es un nombre de commit válido %s"
 
-#: bisect.c:789
 #, c-format
 msgid ""
 "The merge base %s is bad.\n"
@@ -1776,7 +1434,6 @@ msgstr ""
 "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:794
 #, c-format
 msgid ""
 "The merge base %s is new.\n"
@@ -1785,7 +1442,6 @@ msgstr ""
 "La base de fusión %s es nueva.\n"
 "Esta propiedad ha cambiado entre %s y [%s].\n"
 
-#: bisect.c:799
 #, c-format
 msgid ""
 "The merge base %s is %s.\n"
@@ -1794,7 +1450,6 @@ msgstr ""
 "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:807
 #, c-format
 msgid ""
 "Some %s revs are not ancestors of the %s rev.\n"
@@ -1805,7 +1460,6 @@ msgstr ""
 "git bisect no puede trabajar bien en este caso.\n"
 "¿Tal vez confundiste las revisiones %s y %s?\n"
 
-#: bisect.c:820
 #, c-format
 msgid ""
 "the merge base between %s and [%s] must be skipped.\n"
@@ -1817,36 +1471,29 @@ msgstr ""
 "%s.\n"
 "Vamos a continuar de todas maneras."
 
-#: 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:909
 #, c-format
 msgid "a %s revision is needed"
 msgstr "una revisión %s es necesaria"
 
-#: bisect.c:939
 #, c-format
 msgid "could not create file '%s'"
 msgstr "no se pudo crear el archivo '%s'"
 
-#: 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:1025
 msgid "reading bisect refs failed"
 msgstr "falló leer las refs de bisect"
 
-#: bisect.c:1055
 #, c-format
 msgid "%s was both %s and %s\n"
 msgstr "%s fue tanto %s como %s\n"
 
-#: bisect.c:1064
 #, c-format
 msgid ""
 "No testable commit found.\n"
@@ -1855,7 +1502,6 @@ msgstr ""
 "No se encontró commit que se pueda probar.\n"
 "¿Quizás iniciaste con parámetros de rutas incorrectos?\n"
 
-#: bisect.c:1093
 #, c-format
 msgid "(roughly %d step)"
 msgid_plural "(roughly %d steps)"
@@ -1865,156 +1511,143 @@ msgstr[1] "(aproximadamente %d pasos)"
 #. TRANSLATORS: the last %s will be replaced with "(roughly %d
 #. steps)" translation.
 #.
-#: 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"
 msgstr[0] "Biseccionando: falta %d revisión por probar después de esta %s\n"
 msgstr[1] "Biseccionando: faltan %d revisiones por probar después de esta %s\n"
 
-#: blame.c:2776
 msgid "--contents and --reverse do not blend well."
 msgstr "--contents y --reverse no se mezclan bien."
 
-#: blame.c:2790
 msgid "cannot use --contents with final commit object name"
 msgstr "no se puede usar --contents con el nombre de objeto commit final"
 
-#: blame.c:2811
 msgid "--reverse and --first-parent together require specified latest commit"
 msgstr ""
 "--reverse y --first-parent juntos requieren especificar el último commit"
 
-#: 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"
 
-#: blame.c:2838
 msgid ""
 "--reverse --first-parent together require range along first-parent chain"
 msgstr ""
 "--reverse --first-parent juntos requieren un rango a lo largo de la cadena "
 "del primer padre"
 
-#: blame.c:2849
 #, c-format
 msgid "no such path %s in %s"
 msgstr "no hay una ruta %s en %s"
 
-#: blame.c:2860
 #, c-format
 msgid "cannot read blob %s for path %s"
 msgstr "no se puede leer el blob %s para la ruta %s"
 
-#: branch.c:53
-#, c-format
 msgid ""
-"\n"
-"After fixing the error cause you may try to fix up\n"
-"the remote tracking information by invoking\n"
-"\"git branch --set-upstream-to=%s%s%s\"."
+"cannot inherit upstream tracking configuration of multiple refs when "
+"rebasing is requested"
 msgstr ""
-"\n"
-"Tras arreglar la causa del error puedes intentar arreglar\n"
-"la información del rastreo remoto invocando\n"
-"\"git branch --set-upstream-to=%s%s%s\"."
 
-#: branch.c:67
-#, c-format
-msgid "Not setting branch %s as its own upstream."
+#, fuzzy, c-format
+msgid "not setting branch '%s' as its own upstream"
 msgstr "La rama %s no se configura como su propio upstream."
 
-#: branch.c:93
-#, c-format
-msgid "Branch '%s' set up to track remote branch '%s' from '%s' by rebasing."
+#, fuzzy, c-format
+msgid "branch '%s' set up to track '%s' by rebasing."
 msgstr ""
-"Rama '%s' configurada para hacer seguimiento a la rama remota '%s' de '%s' "
-"por rebase."
+"Rama '%s' configurada para hacer seguimiento a la referencia local '%s' por "
+"rebase."
 
-#: branch.c:94
-#, c-format
-msgid "Branch '%s' set up to track remote branch '%s' from '%s'."
+#, fuzzy, c-format
+msgid "branch '%s' set up to track '%s'."
 msgstr ""
-"Rama '%s' configurada para hacer seguimiento a la rama remota '%s' de '%s'."
+"Rama '%s' configurada para hacer seguimiento a la referencia local '%s'."
 
-#: branch.c:98
-#, c-format
-msgid "Branch '%s' set up to track local branch '%s' by rebasing."
+#, fuzzy, c-format
+msgid "branch '%s' set up to track:"
 msgstr ""
-"Rama '%s' configurada para hacer seguimiento a la rama local '%s' por rebase."
+"Rama '%s' configurada para hacer seguimiento a la referencia local '%s'."
 
-#: branch.c:99
-#, c-format
-msgid "Branch '%s' set up to track local branch '%s'."
-msgstr "Rama '%s' configurada para hacer seguimiento a la rama local '%s'."
+#, fuzzy
+msgid "unable to write upstream branch configuration"
+msgstr "No es posible escribir la configuración de la rama upstream"
 
-#: branch.c:104
-#, c-format
-msgid "Branch '%s' set up to track remote ref '%s' by rebasing."
+#, fuzzy
+msgid ""
+"\n"
+"After fixing the error cause you may try to fix up\n"
+"the remote tracking information by invoking:"
 msgstr ""
-"Rama '%s' configurada para hacer seguimiento a la referencia remota '%s' por "
-"rebase."
+"\n"
+"Tras arreglar la causa del error puedes intentar arreglar\n"
+"la información del rastreo remoto invocando\n"
+"\"git branch --set-upstream-to=%s%s%s\"."
 
-#: branch.c:105
 #, c-format
-msgid "Branch '%s' set up to track remote ref '%s'."
+msgid "asked to inherit tracking from '%s', but no remote is set"
 msgstr ""
-"Rama '%s' configurada para hacer seguimiento a la referencia remota '%s'."
 
-#: branch.c:109
 #, c-format
-msgid "Branch '%s' set up to track local ref '%s' by rebasing."
+msgid "asked to inherit tracking from '%s', but no merge configuration is set"
 msgstr ""
-"Rama '%s' configurada para hacer seguimiento a la referencia local '%s' por "
-"rebase."
 
-#: branch.c:110
-#, c-format
-msgid "Branch '%s' set up to track local ref '%s'."
-msgstr ""
-"Rama '%s' configurada para hacer seguimiento a la referencia local '%s'."
+#, fuzzy, c-format
+msgid "not tracking: ambiguous information for ref '%s'"
+msgstr "No rastreando: información ambigua para la referencia %s"
 
-#: branch.c:119
-msgid "Unable to write upstream branch configuration"
-msgstr "No es posible escribir la configuración de la rama upstream"
+#. #-#-#-#-#  branch.c.po  #-#-#-#-#
+#. TRANSLATORS: This is a line listing a remote with duplicate
+#. refspecs in the advice message below. For RTL languages you'll
+#. probably want to swap the "%s" and leading "  " space around.
+#.
+#. #-#-#-#-#  object-name.c.po  #-#-#-#-#
+#. TRANSLATORS: This is line item of ambiguous object output
+#. from describe_ambiguous_object() above. For RTL languages
+#. you'll probably want to swap the "%s" and leading " " space
+#. around.
+#.
+#, fuzzy, c-format
+msgid "  %s\n"
+msgstr "    %s"
 
-#: branch.c:156
+#. TRANSLATORS: The second argument is a \n-delimited list of
+#. duplicate refspecs, composed above.
+#.
 #, c-format
-msgid "Not tracking: ambiguous information for ref %s"
-msgstr "No rastreando: información ambigua para la referencia %s"
+msgid ""
+"There are multiple remotes whose fetch refspecs map to the remote\n"
+"tracking ref '%s':\n"
+"%s\n"
+"This is typically a configuration error.\n"
+"\n"
+"To support setting up tracking branches, ensure that\n"
+"different remotes' fetch refspecs map into different\n"
+"tracking namespaces."
+msgstr ""
 
-#: branch.c:189
-#, c-format
-msgid "'%s' is not a valid branch name."
+#, fuzzy, c-format
+msgid "'%s' is not a valid branch name"
 msgstr "'%s' no es un nombre válido de rama."
 
-#: branch.c:208
-#, c-format
-msgid "A branch named '%s' already exists."
+#, fuzzy, c-format
+msgid "a branch named '%s' already exists"
 msgstr "Una rama llamada '%s' ya existe."
 
-#: branch.c:213
-msgid "Cannot force update the current branch."
-msgstr "No se puede forzar la actualización de la rama actual."
+#, fuzzy, c-format
+msgid "cannot force update the branch '%s' checked out at '%s'"
+msgstr "No se puede borrar rama '%s' que cuenta con checkout en '%s'"
 
-#: branch.c:233
-#, c-format
-msgid "Cannot setup tracking information; starting point '%s' is not a branch."
+#, fuzzy, c-format
+msgid "cannot set up tracking information; starting point '%s' is not a branch"
 msgstr ""
 "No se puede configurar el rastreo de información; el punto de partida '%s' "
 "no es una rama."
 
-#: branch.c:235
 #, c-format
 msgid "the requested upstream branch '%s' does not exist"
 msgstr "la rama de upstream solicitada '%s' no existe"
 
-#: branch.c:237
 msgid ""
 "\n"
 "If you are planning on basing your work on an upstream\n"
@@ -2030,8567 +1663,143 @@ msgstr ""
 "que ya existe en el remoto, tal vez necesites ejecutar\n"
 "\"git fetch\" para recibirla.\n"
 "\n"
-"Si estás planeando hacer push a una nueva rama local que\n"
+"Si estás planeando empujar a una nueva rama local que\n"
 "va a rastrear a su contraparte remota, tal vez quieras usar\n"
 "\"git push -u\" para configurar tu upstream predeterminado cuando realices "
 "el push."
 
-#: branch.c:281
 #, c-format
-msgid "Not a valid object name: '%s'."
-msgstr "Nombre de objeto no válido: '%s'."
+msgid "not a valid object name: '%s'"
+msgstr "nombre de objeto no válido: '%s'"
 
-#: branch.c:301
-#, c-format
-msgid "Ambiguous object name: '%s'."
+#, fuzzy, c-format
+msgid "ambiguous object name: '%s'"
 msgstr "Nombre de objeto ambiguo: '%s'."
 
-#: branch.c:306
-#, c-format
-msgid "Not a valid branch point: '%s'."
+#, fuzzy, c-format
+msgid "not a valid branch point: '%s'"
 msgstr "Punto de rama no válido: '%s'."
 
-#: branch.c:366
-#, c-format
-msgid "'%s' is already checked out at '%s'"
-msgstr "'%s' ya ha sido marcado en '%s'"
-
-#: branch.c:389
-#, c-format
-msgid "HEAD of working tree %s is not updated"
-msgstr "HEAD del árbol de trabajo %s no está actualizada"
-
-#: bundle.c:44
-#, c-format
-msgid "unrecognized bundle hash algorithm: %s"
-msgstr "algoritmo bundle hash desconocido %s"
-
-#: bundle.c:48
-#, c-format
-msgid "unknown capability '%s'"
-msgstr "capacidad desconocida '%s'"
-
-#: bundle.c:74
-#, c-format
-msgid "'%s' does not look like a v2 or v3 bundle file"
-msgstr "'%s' no se ve como un archivo bundle v2 o v3"
-
-#: bundle.c:113
-#, c-format
-msgid "unrecognized header: %s%s (%d)"
-msgstr "header no reconocido %s%s (%d)"
-
-#: 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'"
-
-#: bundle.c:198
-msgid "Repository lacks these prerequisite commits:"
-msgstr "Al repositorio le faltan estos commits prerrequisitos:"
-
-#: bundle.c:201
-msgid "need a repository to verify a bundle"
-msgstr "se necesita un repositorio para verificar un bundle"
-
-#: bundle.c:257
-#, c-format
-msgid "The bundle contains this ref:"
-msgid_plural "The bundle contains these %d refs:"
-msgstr[0] "El bundle contiene esta referencia:"
-msgstr[1] "El bundle contiene estas %d referencias:"
-
-#: bundle.c:264
-msgid "The bundle records a complete history."
-msgstr "El bundle registra una historia completa."
-
-#: bundle.c:266
-#, c-format
-msgid "The bundle requires this ref:"
-msgid_plural "The bundle requires these %d refs:"
-msgstr[0] "El bundle requiere esta referencia:"
-msgstr[1] "El bundle requiere estas %d referencias:"
-
-#: bundle.c:333
-msgid "unable to dup bundle descriptor"
-msgstr "incapaz de duplicar bundle descriptor"
-
-#: bundle.c:340
-msgid "Could not spawn pack-objects"
-msgstr "No se pudo ejecutar pack-objects"
-
-#: bundle.c:351
-msgid "pack-objects died"
-msgstr "pack-objects murió"
-
-#: bundle.c:400
-#, c-format
-msgid "ref '%s' is excluded by the rev-list options"
-msgstr "referencia '%s' es excluida por las opciones de rev-list"
-
-#: bundle.c:504
-#, c-format
-msgid "unsupported bundle version %d"
-msgstr "versión de bundle no soportada %d"
-
-#: bundle.c:506
-#, c-format
-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:399
-#, c-format
-msgid "unrecognized argument: %s"
-msgstr "argumento no reconocido: %s"
-
-#: bundle.c:553
-msgid "Refusing to create empty bundle."
-msgstr "Rechazando crear un bundle vacío."
-
-#: bundle.c:563
-#, c-format
-msgid "cannot create '%s'"
-msgstr "no se puede crear '%s'"
-
-#: bundle.c:588
-msgid "index-pack died"
-msgstr "index-pack murió"
-
-#: chunk-format.c:117
-msgid "terminating chunk id appears earlier than expected"
-msgstr "terminando porque el id del chunk aparece antes de lo esperado"
-
-#: chunk-format.c:126
-#, c-format
-msgid "improper chunk offset(s) %<PRIx64> and %<PRIx64>"
-msgstr "offset para chunk incorrecto %<PRIx64> y %<PRIx64>"
-
-#: chunk-format.c:133
-#, c-format
-msgid "duplicate chunk ID %<PRIx32> found"
-msgstr "se encontró ID de chuck %<PRIx32> duplicado"
-
-#: chunk-format.c:147
-#, c-format
-msgid "final chunk has non-zero id %<PRIx32>"
-msgstr "chunk final tiene un id distinto de cero %<PRIx32>"
-
-#: color.c:329
-#, c-format
-msgid "invalid color value: %.*s"
-msgstr "color inválido: %.*s"
-
-#: commit-graph.c:204 midx.c:51
-msgid "invalid hash version"
-msgstr "versión de hash inválida"
-
-#: commit-graph.c:262
-msgid "commit-graph file is too small"
-msgstr "archivo commit-graph es demasiado pequeño"
-
-#: commit-graph.c:355
-#, c-format
-msgid "commit-graph signature %X does not match signature %X"
-msgstr "firma %X en commit-graph no concuerda con firma %X"
-
-#: commit-graph.c:362
-#, c-format
-msgid "commit-graph version %X does not match version %X"
-msgstr "versión de commit-graph %X no concuerda con versión %X"
-
-#: commit-graph.c:369
-#, c-format
-msgid "commit-graph hash version %X does not match version %X"
-msgstr "versión de hash de commit-graph %X no concuerda con versión %X"
-
-#: commit-graph.c:386
-#, c-format
-msgid "commit-graph file is too small to hold %u chunks"
-msgstr "commit-graph file es demasiado pequeño para almacenar %u chunks"
-
-#: commit-graph.c:482
-msgid "commit-graph has no base graphs chunk"
-msgstr "commit-graph no tiene un fragmento base de graphs"
-
-#: commit-graph.c:492
-msgid "commit-graph chain does not match"
-msgstr "cadena commit-graph no concuerda"
-
-#: commit-graph.c:540
-#, c-format
-msgid "invalid commit-graph chain: line '%s' not a hash"
-msgstr "cadena de commit-graph inválida: línea '%s' no es un hash"
-
-#: commit-graph.c:564
-msgid "unable to find all commit-graph files"
-msgstr "no es posible encontrar los archivos commit-graph"
-
-#: 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:767
-#, c-format
-msgid "could not find commit %s"
-msgstr "no se pudo encontrar commit %s"
-
-#: 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:1105 builtin/am.c:1342
-#, c-format
-msgid "unable to parse commit %s"
-msgstr "no es posible analizar el commit %s"
-
-#: 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:1398
-msgid "Loading known commits in commit graph"
-msgstr "Cargando commits conocidos en commit graph"
-
-#: commit-graph.c:1415
-msgid "Expanding reachable commits in commit graph"
-msgstr "Expandiendo commits alcanzables en commit graph"
-
-#: commit-graph.c:1435
-msgid "Clearing commit marks in commit graph"
-msgstr "Limpiando marcas de commits en commit graph"
-
-#: commit-graph.c:1454
-msgid "Computing commit graph topological levels"
-msgstr "Calculando niveles topológicos de commit graph"
-
-#: commit-graph.c:1507
-msgid "Computing commit graph generation numbers"
-msgstr "Calculando números de generación de commit graph"
-
-#: commit-graph.c:1588
-msgid "Computing commit changed paths Bloom filters"
-msgstr "Calculando números de generación de commit graph"
-
-#: commit-graph.c:1665
-msgid "Collecting referenced commits"
-msgstr "Recolectando commits referenciados"
-
-#: 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:1703
-#, c-format
-msgid "error adding pack %s"
-msgstr "error al agregar pack %s"
-
-#: commit-graph.c:1707
-#, c-format
-msgid "error opening index for %s"
-msgstr "error al abrir index para %s"
-
-#: 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:1762
-msgid "Finding extra edges in commit graph"
-msgstr "Encontrando esquinas extra en commit graph"
-
-#: 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: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:1855
-msgid "unable to create temporary graph layer"
-msgstr "no es posible crear una capa de gráfico temporal"
-
-#: 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: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:1953
-msgid "unable to open commit-graph chain file"
-msgstr "no se pudo abrir la cadena de archivos commit-graph"
-
-#: 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:1989
-msgid "failed to rename temporary commit-graph file"
-msgstr "falló al renombrar el archivo temporal commit-graph"
-
-#: commit-graph.c:2122
-msgid "Scanning merged commits"
-msgstr "Escaneando commits fusionados"
-
-#: commit-graph.c:2166
-msgid "Merging commit-graph"
-msgstr "Fusionando commit-graph"
-
-#: 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:2381
-msgid "too many commits to write graph"
-msgstr "demasiados commits para escribir el gráfico"
-
-#: 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: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: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:2506
-#, c-format
-msgid "failed to parse commit %s from commit-graph"
-msgstr "falló al analizar commit %s para commit-graph"
-
-#: commit-graph.c:2524
-msgid "Verifying commits in commit graph"
-msgstr "Verificando commits en commit graph"
-
-#: 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: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: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: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: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:2584
-#, c-format
-msgid ""
-"commit-graph has generation number zero for commit %s, but non-zero elsewhere"
-msgstr ""
-"commit-graph tiene número de generación cero para %s, pero no cero en otro "
-"lugar"
-
-#: commit-graph.c:2588
-#, c-format
-msgid ""
-"commit-graph has non-zero generation number for commit %s, but zero elsewhere"
-msgstr ""
-"commit-graph tiene número de generación no cero para %s, pero cero en otro "
-"lugar"
-
-#: 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: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: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:55
-#, c-format
-msgid "%s %s is not a commit!"
-msgstr "¡%s %s no es un commit!"
-
-#: commit.c:196
-msgid ""
-"Support for <GIT_DIR>/info/grafts is deprecated\n"
-"and will be removed in a future Git version.\n"
-"\n"
-"Please use \"git replace --convert-graft-file\"\n"
-"to convert the grafts into replace refs.\n"
-"\n"
-"Turn this message off by running\n"
-"\"git config advice.graftFileDeprecated false\""
-msgstr ""
-"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 usa \"git replace --convert-graft-file\"\n"
-"para convertir los grafts en refs.\n"
-"\n"
-"Apaga este mensaje ejecutando\n"
-"\"git config advice.graftFileDeprecated false\""
-
-#: 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: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:1246
-#, c-format
-msgid "Commit %s does not have a GPG signature."
-msgstr "Commit %s no tiene una firma GPG."
-
-#: 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: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"
-"variable i18n.commitencoding to the encoding your project uses.\n"
-msgstr ""
-"Peligro: el mensaje del commit no se ajusta a UTF-8.\n"
-"Tal vez quieras enmendarlo después de arreglar el mensaje, o arreglar la\n"
-"variable de configuración i18n.commitencoding para la codificación que use "
-"tu proyecto.\n"
-
-#: compat/obstack.c:406 compat/obstack.c:408
-msgid "memory exhausted"
-msgstr "memoria agotada"
-
-#: config.c:125
-#, c-format
-msgid ""
-"exceeded maximum include depth (%d) while including\n"
-"\t%s\n"
-"from\n"
-"\t%s\n"
-"This might be due to circular includes."
-msgstr ""
-"profundidad máxima de inclusión excedida (%d) mientras se incluía\n"
-"\t%s\n"
-"de\n"
-"\t%s\n"
-"Esto puede ser causado por inclusiones circulares."
-
-#: config.c:141
-#, c-format
-msgid "could not expand include path '%s'"
-msgstr "no se pudo expandir rutas de inclusión '%s'"
-
-#: config.c:152
-msgid "relative config includes must come from files"
-msgstr "inclusiones de configuración relativas tienen que venir de archivos"
-
-#: 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:398
-#, c-format
-msgid "invalid config format: %s"
-msgstr "formato config inválido: %s"
-
-#: 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: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:443
-#, c-format
-msgid "key does not contain a section: %s"
-msgstr "llave no contiene una sección: %s"
-
-#: config.c:448
-#, c-format
-msgid "key does not contain variable name: %s"
-msgstr "llave no contiene el nombre de variable: %s"
-
-#: config.c:470 sequencer.c:2804
-#, c-format
-msgid "invalid key: %s"
-msgstr "llave inválida: %s"
-
-#: config.c:475
-#, c-format
-msgid "invalid key (newline): %s"
-msgstr "llave inválida (nueva línea): %s"
-
-#: config.c:495
-msgid "empty config key"
-msgstr "clave de config vacía"
-
-#: config.c:513 config.c:525
-#, c-format
-msgid "bogus config parameter: %s"
-msgstr "parámetro de configuración malogrado: %s"
-
-#: 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:606
-#, c-format
-msgid "bogus count in %s"
-msgstr "conteo malogrado en %s"
-
-#: config.c:610
-#, c-format
-msgid "too many entries in %s"
-msgstr "demasiadas entradas en %s"
-
-#: config.c:620
-#, c-format
-msgid "missing config key %s"
-msgstr "llave de configuración faltante %s"
-
-#: config.c:628
-#, c-format
-msgid "missing config value %s"
-msgstr "valor de config faltante para %s"
-
-#: 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:983
-#, c-format
-msgid "bad config line %d in file %s"
-msgstr "mala línea de config %d en el archivo %s"
-
-#: 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: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: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:999
-#, c-format
-msgid "bad config line %d in %s"
-msgstr "mala línea de config %d en %s"
-
-#: config.c:1136
-msgid "out of range"
-msgstr "fuera de rango"
-
-#: config.c:1136
-msgid "invalid unit"
-msgstr "unidad inválida"
-
-#: 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: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: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: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: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: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: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:1241
-#, c-format
-msgid "bad boolean config value '%s' for '%s'"
-msgstr "mal valor de config booleano '%s' para '%s'"
-
-#: 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: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:1361
-#, c-format
-msgid "abbrev length out of range: %d"
-msgstr "largo de abreviatura fuera de rango: %d"
-
-#: 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:1476
-msgid "core.commentChar should only be one character"
-msgstr "core.commentChar debería tener solo un carácter"
-
-#: config.c:1509
-#, c-format
-msgid "invalid mode for object creation: %s"
-msgstr "modo inválido de creación de objetos: %s"
-
-#: config.c:1581
-#, c-format
-msgid "malformed value for %s"
-msgstr "valor malformado para %s"
-
-#: config.c:1607
-#, c-format
-msgid "malformed value for %s: %s"
-msgstr "valor malformado para %s: %s"
-
-#: 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: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:1792
-#, c-format
-msgid "unable to load config blob object '%s'"
-msgstr "incapaz de cargar configuración de objeto blob '%s'"
-
-#: config.c:1795
-#, c-format
-msgid "reference '%s' does not point to a blob"
-msgstr "referencia '%s' no apunta a un blob"
-
-#: config.c:1813
-#, c-format
-msgid "unable to resolve config blob '%s'"
-msgstr "no es posible resolver configuración de blob '%s'"
-
-#: config.c:1858
-#, c-format
-msgid "failed to parse %s"
-msgstr "no se pudo analizar %s"
-
-#: 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: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:2456
-#, c-format
-msgid "Invalid %s: '%s'"
-msgstr "%s inválido: '%s'"
-
-#: 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: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: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:2633
-#, c-format
-msgid "invalid section name '%s'"
-msgstr "nombre de sección inválido '%s'"
-
-#: config.c:2665
-#, c-format
-msgid "%s has multiple values"
-msgstr "%s tiene múltiples valores"
-
-#: 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: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:2957
-#, c-format
-msgid "opening %s"
-msgstr "abriendo %s"
-
-#: config.c:2994 builtin/config.c:361
-#, c-format
-msgid "invalid pattern: %s"
-msgstr "patrón inválido: %s"
-
-#: config.c:3019
-#, c-format
-msgid "invalid config file %s"
-msgstr "archivo de configuración inválido: %s"
-
-#: config.c:3032 config.c:3286
-#, c-format
-msgid "fstat on %s failed"
-msgstr "fstat en %s falló"
-
-#: config.c:3043
-#, c-format
-msgid "unable to mmap '%s'%s"
-msgstr "no es posible hacer mmap '%s'%s"
-
-#: config.c:3053 config.c:3291
-#, c-format
-msgid "chmod on %s failed"
-msgstr "chmod en %s falló"
-
-#: 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:3172
-#, c-format
-msgid "could not set '%s' to '%s'"
-msgstr "no se pudo configurar '%s' a '%s'"
-
-#: 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:3264
-#, c-format
-msgid "invalid section name: %s"
-msgstr "nombre de sección inválido: %s"
-
-#: config.c:3431
-#, c-format
-msgid "missing value for '%s'"
-msgstr "valor faltante para '%s'"
-
-#: connect.c:61
-msgid "the remote end hung up upon initial contact"
-msgstr "el remoto se colgó en el contacto inicial"
-
-#: connect.c:63
-msgid ""
-"Could not read from remote repository.\n"
-"\n"
-"Please make sure you have the correct access rights\n"
-"and the repository exists."
-msgstr ""
-"No se pudo leer del repositorio remoto.\n"
-"\n"
-"Por favor asegúrate de que tengas los permisos de acceso correctos\n"
-"y que el repositorio exista."
-
-#: connect.c:81
-#, c-format
-msgid "server doesn't support '%s'"
-msgstr "servidor no soporta '%s'"
-
-#: connect.c:118
-#, c-format
-msgid "server doesn't support feature '%s'"
-msgstr "servidor no soporta feature '%s'"
-
-#: connect.c:129
-msgid "expected flush after capabilities"
-msgstr "se espera flush tras capacidades"
-
-#: connect.c:265
-#, c-format
-msgid "ignoring capabilities after first line '%s'"
-msgstr "ignorando capacidades tras primera línea '%s'"
-
-#: connect.c:286
-msgid "protocol error: unexpected capabilities^{}"
-msgstr "error de protocolo: capacidades imprevistas^{}"
-
-#: 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:310
-msgid "repository on the other end cannot be shallow"
-msgstr "el repositorio en el otro lado no puede ser superficial"
-
-#: connect.c:349
-msgid "invalid packet"
-msgstr "paquete inválido"
-
-#: connect.c:369
-#, c-format
-msgid "protocol error: unexpected '%s'"
-msgstr "error de protocolo: '%s' inesperado"
-
-#: 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:528
-#, c-format
-msgid "invalid ls-refs response: %s"
-msgstr "respuesta de ls-refs inválida: %s"
-
-#: connect.c:532
-msgid "expected flush after ref listing"
-msgstr "flush esperado tras listado de refs"
-
-#: connect.c:535
-msgid "expected response end packet after ref listing"
-msgstr "se esperaba un paquete final luego del ref listing"
-
-#: connect.c:670
-#, c-format
-msgid "protocol '%s' is not supported"
-msgstr "protocolo '%s' no es soportado"
-
-#: connect.c:721
-msgid "unable to set SO_KEEPALIVE on socket"
-msgstr "no es posible configurar SO_KEEPALIVE en el socket"
-
-#: connect.c:761 connect.c:824
-#, c-format
-msgid "Looking up %s ... "
-msgstr "Revisando %s... "
-
-#: 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:769 connect.c:840
-#, c-format
-msgid ""
-"done.\n"
-"Connecting to %s (port %s) ... "
-msgstr ""
-"hecho.\n"
-"Conectando a %s (puerto %s) ... "
-
-#: connect.c:791 connect.c:868
-#, c-format
-msgid ""
-"unable to connect to %s:\n"
-"%s"
-msgstr ""
-"no es posible conectar a %s:\n"
-"%s"
-
-#. TRANSLATORS: this is the end of "Connecting to %s (port %s) ... "
-#: connect.c:797 connect.c:874
-msgid "done."
-msgstr "hecho."
-
-#: connect.c:828
-#, c-format
-msgid "unable to look up %s (%s)"
-msgstr "no es posible revisar %s (%s)"
-
-#: connect.c:834
-#, c-format
-msgid "unknown port %s"
-msgstr "puerto desconocido %s"
-
-#: connect.c:971 connect.c:1303
-#, c-format
-msgid "strange hostname '%s' blocked"
-msgstr "hostname extraño '%s' bloqueado"
-
-#: connect.c:973
-#, c-format
-msgid "strange port '%s' blocked"
-msgstr "puerto extraño '%s' bloqueado"
-
-#: connect.c:983
-#, c-format
-msgid "cannot start proxy %s"
-msgstr "no se puede comenzar proxy %s"
-
-#: connect.c:1054
-msgid "no path specified; see 'git help pull' for valid url syntax"
-msgstr ""
-"no hay ruta especificada; mira 'git help pull' para sintaxis válida de url"
-
-#: 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:1251
-msgid "ssh variant 'simple' does not support -4"
-msgstr "variante 'simple' de ssh no soporta -4"
-
-#: connect.c:1263
-msgid "ssh variant 'simple' does not support -6"
-msgstr "variante 'simple' de ssh no soporta -6"
-
-#: connect.c:1280
-msgid "ssh variant 'simple' does not support setting port"
-msgstr "variante ssh 'simple' no soporta configurar puerto"
-
-#: connect.c:1392
-#, c-format
-msgid "strange pathname '%s' blocked"
-msgstr "ruta extraña '%s' bloqueada"
-
-#: connect.c:1440
-msgid "unable to fork"
-msgstr "no es posible hacer fork"
-
-#: connected.c:109 builtin/fsck.c:189 builtin/prune.c:45
-msgid "Checking connectivity"
-msgstr "Verificando conectividad"
-
-#: connected.c:122
-msgid "Could not run 'git rev-list'"
-msgstr "No se pudo ejecutar 'git rev-list'"
-
-#: connected.c:146
-msgid "failed write to rev-list"
-msgstr "falló escribir a rev-list"
-
-#: connected.c:151
-msgid "failed to close rev-list's stdin"
-msgstr "falló al cerrar la entrada standard de rev-list"
-
-#: convert.c:183
-#, c-format
-msgid "illegal crlf_action %d"
-msgstr "crlf_action %d ilegal"
-
-#: convert.c:196
-#, c-format
-msgid "CRLF would be replaced by LF in %s"
-msgstr "CRLF será reemplazado por LF en %s"
-
-#: convert.c:198
-#, c-format
-msgid ""
-"CRLF will be replaced by LF in %s.\n"
-"The file will have its original line endings in your working directory"
-msgstr ""
-"CRLF será remplazado por LF en %s.\n"
-"El archivo tendrá sus finales de línea originales en tu directorio de trabajo"
-
-#: convert.c:206
-#, c-format
-msgid "LF would be replaced by CRLF in %s"
-msgstr "LF será reemplazado por CRLF en %s"
-
-#: convert.c:208
-#, c-format
-msgid ""
-"LF will be replaced by CRLF in %s.\n"
-"The file will have its original line endings in your working directory"
-msgstr ""
-"LF será reemplazado por CRLF en %s.\n"
-"El archivo tendrá sus finales de línea originales en tu directorio de trabajo"
-
-#: convert.c:273
-#, c-format
-msgid "BOM is prohibited in '%s' if encoded as %s"
-msgstr "BOM está prohibido en '%s' si es codificado como %s"
-
-#: convert.c:280
-#, c-format
-msgid ""
-"The file '%s' contains a byte order mark (BOM). Please use UTF-%.*s as "
-"working-tree-encoding."
-msgstr ""
-"El archivo '%s' contiene una marca de orden de bytes (BOM). Por favor usa "
-"UTF-%.*s como working-tree-encoding."
-
-#: convert.c:293
-#, c-format
-msgid "BOM is required in '%s' if encoded as %s"
-msgstr "BOM es requerido en '%s' si es codificado como %s"
-
-#: 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."
-msgstr ""
-"Al archivo '%s' le falta una marca de orden de bytes (BOM). Por favor usa "
-"UTF-%sBE o UTF-%sLE (dependiendo del orden de bytes) como working-tree-"
-"encoding."
-
-#: convert.c:408 convert.c:479
-#, c-format
-msgid "failed to encode '%s' from %s to %s"
-msgstr "falló al codificar '%s' de %s a %s"
-
-#: convert.c:451
-#, c-format
-msgid "encoding '%s' from %s to %s and back is not the same"
-msgstr "codificación '%s' de %s a %s y de vuelta no son iguales"
-
-#: convert.c:654
-#, c-format
-msgid "cannot fork to run external filter '%s'"
-msgstr "no se puede hacer fork para ejecutar filtros externos '%s'"
-
-#: convert.c:674
-#, c-format
-msgid "cannot feed the input to external filter '%s'"
-msgstr "no se pueden alimentar de input a los filtros externos '%s'"
-
-#: convert.c:681
-#, c-format
-msgid "external filter '%s' failed %d"
-msgstr "filtro externo '%s' falló %d"
-
-#: convert.c:716 convert.c:719
-#, c-format
-msgid "read from external filter '%s' failed"
-msgstr "lectura de filtro externo '%s' falló"
-
-#: convert.c:722 convert.c:777
-#, c-format
-msgid "external filter '%s' failed"
-msgstr "filtro externo '%s' falló"
-
-#: convert.c:826
-msgid "unexpected filter type"
-msgstr "tipo de filtro inesperado"
-
-#: convert.c:837
-msgid "path name too long for external filter"
-msgstr "nombre de ruta demasiado largo para filtro externo"
-
-#: convert.c:935
-#, c-format
-msgid ""
-"external filter '%s' is not available anymore although not all paths have "
-"been filtered"
-msgstr ""
-"filtro externo '%s' ya no está disponible aunque no todas las rutas han sido "
-"filtradas"
-
-#: convert.c:1236
-msgid "true/false are no valid working-tree-encodings"
-msgstr "true/false no son working-tree-encodings válidos"
-
-#: convert.c:1416 convert.c:1449
-#, c-format
-msgid "%s: clean filter '%s' failed"
-msgstr "%s: falló al limpiar filtro '%s'"
-
-#: convert.c:1492
-#, c-format
-msgid "%s: smudge filter %s failed"
-msgstr "%s: filtro smudge %s falló"
-
-#: credential.c:96
-#, c-format
-msgid "skipping credential lookup for key: credential.%s"
-msgstr "saltando revisión de credenciales para llave: credential.%s"
-
-#: credential.c:112
-msgid "refusing to work with credential missing host field"
-msgstr "rehusando trabajar con campo host faltante en la credencial"
-
-#: credential.c:114
-msgid "refusing to work with credential missing protocol field"
-msgstr "rehusando trabajar con campo protocolo faltante en la credencial"
-
-#: 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:439
-#, c-format
-msgid "url has no scheme: %s"
-msgstr "url no tiene scheme: %s"
-
-#: credential.c:512
-#, c-format
-msgid "credential url cannot be parsed: %s"
-msgstr "url de credencial no puede ser analizada: %s"
-
-#: date.c:138
-msgid "in the future"
-msgstr "en el futuro"
-
-#: date.c:144
-#, c-format
-msgid "%<PRIuMAX> second ago"
-msgid_plural "%<PRIuMAX> seconds ago"
-msgstr[0] "hace %<PRIuMAX> segundo"
-msgstr[1] "hace %<PRIuMAX> segundos"
-
-#: date.c:151
-#, c-format
-msgid "%<PRIuMAX> minute ago"
-msgid_plural "%<PRIuMAX> minutes ago"
-msgstr[0] "hace %<PRIuMAX> minuto"
-msgstr[1] "hace %<PRIuMAX> minutos"
-
-#: date.c:158
-#, c-format
-msgid "%<PRIuMAX> hour ago"
-msgid_plural "%<PRIuMAX> hours ago"
-msgstr[0] "hace %<PRIuMAX> hora"
-msgstr[1] "hace %<PRIuMAX> horas"
-
-#: date.c:165
-#, c-format
-msgid "%<PRIuMAX> day ago"
-msgid_plural "%<PRIuMAX> days ago"
-msgstr[0] "hace %<PRIuMAX> día"
-msgstr[1] "hace %<PRIuMAX> días"
-
-#: date.c:171
-#, c-format
-msgid "%<PRIuMAX> week ago"
-msgid_plural "%<PRIuMAX> weeks ago"
-msgstr[0] "hace %<PRIuMAX> semana"
-msgstr[1] "hace %<PRIuMAX> semanas"
-
-#: date.c:178
-#, c-format
-msgid "%<PRIuMAX> month ago"
-msgid_plural "%<PRIuMAX> months ago"
-msgstr[0] "hace %<PRIuMAX> mes"
-msgstr[1] "hace %<PRIuMAX> meses"
-
-#: date.c:189
-#, c-format
-msgid "%<PRIuMAX> year"
-msgid_plural "%<PRIuMAX> years"
-msgstr[0] "%<PRIuMAX> año"
-msgstr[1] "%<PRIuMAX> años"
-
-#. TRANSLATORS: "%s" is "<n> years"
-#: date.c:192
-#, c-format
-msgid "%s, %<PRIuMAX> month ago"
-msgid_plural "%s, %<PRIuMAX> months ago"
-msgstr[0] "%s, y %<PRIuMAX> mes atrás"
-msgstr[1] "%s, y %<PRIuMAX> meses atrás"
-
-#: date.c:197 date.c:202
-#, c-format
-msgid "%<PRIuMAX> year ago"
-msgid_plural "%<PRIuMAX> years ago"
-msgstr[0] "hace %<PRIuMAX> año"
-msgstr[1] "hace %<PRIuMAX> años"
-
-#: delta-islands.c:272
-msgid "Propagating island marks"
-msgstr "Propagando marcas isla"
-
-#: delta-islands.c:290
-#, c-format
-msgid "bad tree object %s"
-msgstr "mal objeto árbol %s"
-
-#: delta-islands.c:334
-#, c-format
-msgid "failed to load island regex for '%s': %s"
-msgstr "falló al cargar regex isla para '%s': %s"
-
-#: delta-islands.c:390
-#, c-format
-msgid "island regex from config has too many capture groups (max=%d)"
-msgstr "regex isla de config tiene demasiados grupos de captura (max=%d)"
-
-#: delta-islands.c:467
-#, c-format
-msgid "Marked %d islands, done.\n"
-msgstr "%d islas marcadas, listo.\n"
-
-#: diff-merges.c:70
-#, c-format
-msgid "unknown value for --diff-merges: %s"
-msgstr "valor desconocido para --diff-merges: %s"
-
-#: diff-lib.c:561
-msgid "--merge-base does not work with ranges"
-msgstr "--merge-base no funciona con rangos"
-
-#: diff-lib.c:563
-msgid "--merge-base only works with commits"
-msgstr "--merge-base solo funciona con confirmaciones"
-
-#: diff-lib.c:580
-msgid "unable to get HEAD"
-msgstr "no es posible obtener HEAD"
-
-#: diff-lib.c:587
-msgid "no merge base found"
-msgstr "no se encontró base de fusión"
-
-#: diff-lib.c:589
-msgid "multiple merge bases found"
-msgstr "múltiples bases de fusión encontradas"
-
-#: diff-no-index.c:237
-msgid "git diff --no-index [<options>] <path> <path>"
-msgstr "git diff --no-index [<opciones>] <path> <path>"
-
-#: diff-no-index.c:262
-msgid ""
-"Not a git repository. Use --no-index to compare two paths outside a working "
-"tree"
-msgstr ""
-"No es un repositorio git. Usa --no-index para comparar dos paths fuera del "
-"árbol de trabajo"
-
-#: 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:162
-#, c-format
-msgid "  Unknown dirstat parameter '%s'\n"
-msgstr "  Parámetro '%s' de dirstat desconocido\n"
-
-#: diff.c:298
-msgid ""
-"color moved setting must be one of 'no', 'default', 'blocks', 'zebra', "
-"'dimmed-zebra', 'plain'"
-msgstr ""
-"opción de color tiene que ser una de 'no', 'default', 'blocks', 'zebra', "
-"'dimmed-zebra', 'plain'"
-
-#: 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 ""
-"modo color-moved-ws desconocido '%s', valores posibles son 'ignore-space-"
-"change', 'ignore-space-at-eol', 'ignore-all-space', 'allow-indentation-"
-"change'"
-
-#: 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 puede ser combinado con otros "
-"modos de espacios en blanco"
-
-#: 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:471
-#, c-format
-msgid ""
-"Found errors in 'diff.dirstat' config variable:\n"
-"%s"
-msgstr ""
-"Errores en la variable de config 'diff.dirstat' encontrados:\n"
-"%s"
-
-#: diff.c:4290
-#, c-format
-msgid "external diff died, stopping at %s"
-msgstr "diff externo murió, deteniendo en %s"
-
-#: 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:4645
-msgid "-G, -S and --find-object are mutually exclusive"
-msgstr "-G, -S y --find-object son mutuamente exclusivas"
-
-#: diff.c:4648
-msgid ""
-"-G and --pickaxe-regex are mutually exclusive, use --pickaxe-regex with -S"
-msgstr ""
-"-G y --pickaxe-regex son mutuamente exclusivos, usa --pickaxe-regex con -S"
-
-#: 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, usa --pickaxe-all "
-"con -G y -S"
-
-#: diff.c:4730
-msgid "--follow requires exactly one pathspec"
-msgstr "--follow requiere exactamente un pathspec"
-
-#: diff.c:4778
-#, c-format
-msgid "invalid --stat value: %s"
-msgstr "valor --stat inválido: %s"
-
-#: 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:4815
-#, c-format
-msgid ""
-"Failed to parse --dirstat/-X option parameter:\n"
-"%s"
-msgstr ""
-"Falló al analizar parámetro de opción --dirstat/-X:\n"
-"%s"
-
-#: 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:4924
-#, c-format
-msgid "unknown value after ws-error-highlight=%.*s"
-msgstr "valor desconocido luego de ws-error-highlight=%.*s"
-
-#: diff.c:4938
-#, c-format
-msgid "unable to resolve '%s'"
-msgstr "no se puede resolver '%s'"
-
-#: diff.c:4988 diff.c:4994
-#, c-format
-msgid "%s expects <n>/<m> form"
-msgstr "%s espera forma <n>/<m>"
-
-#: diff.c:5006
-#, c-format
-msgid "%s expects a character, got '%s'"
-msgstr "%s esperaba un char, se obtuvo '%s'"
-
-#: diff.c:5027
-#, c-format
-msgid "bad --color-moved argument: %s"
-msgstr "mal argumento --color-moved: %s"
-
-#: diff.c:5046
-#, c-format
-msgid "invalid mode '%s' in --color-moved-ws"
-msgstr "modo inválido '%s' en --color-moved-ws"
-
-#: diff.c:5086
-msgid ""
-"option diff-algorithm accepts \"myers\", \"minimal\", \"patience\" and "
-"\"histogram\""
-msgstr ""
-"opción diff-algorithm acepta \"myers\", \"minimal\", \"patience\" e "
-"\"histogram\""
-
-#: diff.c:5122 diff.c:5142
-#, c-format
-msgid "invalid argument to %s"
-msgstr "argumento inválido para %s"
-
-#: diff.c:5246
-#, c-format
-msgid "invalid regex given to -I: '%s'"
-msgstr "regex inválido para -I: '%s'"
-
-#: 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:5351
-#, c-format
-msgid "bad --word-diff argument: %s"
-msgstr "mal argumento --word-diff: %s"
-
-#: diff.c:5387
-msgid "Diff output format options"
-msgstr "Opciones de formato de salida para diff"
-
-#: diff.c:5389 diff.c:5395
-msgid "generate patch"
-msgstr "generar parche"
-
-#: diff.c:5392 builtin/log.c:179
-msgid "suppress diff output"
-msgstr "suprimir salida de diff"
-
-#: diff.c:5397 diff.c:5511 diff.c:5518
-msgid "<n>"
-msgstr "<n>"
-
-#: diff.c:5398 diff.c:5401
-msgid "generate diffs with <n> lines context"
-msgstr "generar diffs con <n> líneas de contexto"
-
-#: diff.c:5403
-msgid "generate the diff in raw format"
-msgstr "generar el diff en formato raw"
-
-#: diff.c:5406
-msgid "synonym for '-p --raw'"
-msgstr "sinónimo para '-p --raw'"
-
-#: diff.c:5410
-msgid "synonym for '-p --stat'"
-msgstr "sinónimo para '-p --stat'"
-
-#: diff.c:5414
-msgid "machine friendly --stat"
-msgstr "--stat amigable para máquina"
-
-#: diff.c:5417
-msgid "output only the last line of --stat"
-msgstr "mostrar solo la última línea para --stat"
-
-#: diff.c:5419 diff.c:5427
-msgid "<param1,param2>..."
-msgstr "<param1,param2>..."
-
-#: diff.c:5420
-msgid ""
-"output the distribution of relative amount of changes for each sub-directory"
-msgstr ""
-"mostrar la distribución de cantidades de cambios relativas para cada "
-"subdirectorio"
-
-#: diff.c:5424
-msgid "synonym for --dirstat=cumulative"
-msgstr "sinónimo para --dirstat=cumulative"
-
-#: diff.c:5428
-msgid "synonym for --dirstat=files,param1,param2..."
-msgstr "sinónimo para --dirstat=archivos,param1,param2..."
-
-#: diff.c:5432
-msgid "warn if changes introduce conflict markers or whitespace errors"
-msgstr ""
-"advertir si cambios introducen conflictos de markers o errores de espacios "
-"en blanco"
-
-#: 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:5438
-msgid "show only names of changed files"
-msgstr "mostrar solo nombres de archivos cambiados"
-
-#: diff.c:5441
-msgid "show only names and status of changed files"
-msgstr "mostrar solo nombres y estados de archivos cambiados"
-
-#: diff.c:5443
-msgid "<width>[,<name-width>[,<count>]]"
-msgstr "<ancho>[,<ancho-de-nombre>[,<cantidad>]]"
-
-#: diff.c:5444
-msgid "generate diffstat"
-msgstr "generar diffstat"
-
-#: diff.c:5446 diff.c:5449 diff.c:5452
-msgid "<width>"
-msgstr "<ancho>"
-
-#: 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:5456
-msgid "generate diffstat with limited lines"
-msgstr "generar diffstat con líneas limitadas"
-
-#: diff.c:5459
-msgid "generate compact summary in diffstat"
-msgstr "generar un resumen compacto de diffstat"
-
-#: diff.c:5462
-msgid "output a binary diff that can be applied"
-msgstr "mostrar un diff binario que puede ser aplicado"
-
-#: 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:5467
-msgid "show colored diff"
-msgstr "mostrar diff colorido"
-
-#: diff.c:5468
-msgid "<kind>"
-msgstr "<tipo>"
-
-#: diff.c:5469
-msgid ""
-"highlight whitespace errors in the 'context', 'old' or 'new' lines in the "
-"diff"
-msgstr ""
-"resaltar errores de espacios en blanco en las líneas 'context', 'old' o "
-"'new' del diff"
-
-#: diff.c:5472
-msgid ""
-"do not munge pathnames and use NULs as output field terminators in --raw or "
-"--numstat"
-msgstr ""
-"no consolidar los pathnames y usar NULs como terminadores de campos en --raw "
-"o --numstat"
-
-#: diff.c:5475 diff.c:5478 diff.c:5481 diff.c:5590
-msgid "<prefix>"
-msgstr "<prefijo>"
-
-#: 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:5479
-msgid "show the given destination prefix instead of \"b/\""
-msgstr "mostrar el prefijo de destino dado en lugar de \"b/\""
-
-#: 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:5485
-msgid "do not show any source or destination prefix"
-msgstr "no mostrar ningún prefijo de fuente o destino"
-
-#: diff.c:5488
-msgid "show context between diff hunks up to the specified number of lines"
-msgstr ""
-"mostrar el contexto entre hunks de diff hasta el número especificado de "
-"líneas"
-
-#: diff.c:5492 diff.c:5497 diff.c:5502
-msgid "<char>"
-msgstr "<char>"
-
-#: diff.c:5493
-msgid "specify the character to indicate a new line instead of '+'"
-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:5507
-msgid "<n>[/<m>]"
-msgstr "<n>[/<m>]"
-
-#: 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:5512
-msgid "detect renames"
-msgstr "detectar renombrados"
-
-#: diff.c:5516
-msgid "omit the preimage for deletes"
-msgstr "omitir la preimage para borrados"
-
-#: diff.c:5519
-msgid "detect copies"
-msgstr "detectar copias"
-
-#: diff.c:5523
-msgid "use unmodified files as source to find copies"
-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 ""
-"prevenir detección de renombramientos/copias si el número de destinos para "
-"renombramientos/copias excede el límite dado"
-
-#: diff.c:5535
-msgid "Diff algorithm options"
-msgstr "Opciones de algoritmos de diff"
-
-#: diff.c:5537
-msgid "produce the smallest possible diff"
-msgstr "producir el diff más pequeño posible"
-
-#: diff.c:5540
-msgid "ignore whitespace when comparing lines"
-msgstr "ignorar espacios en blanco cuando comparando líneas"
-
-#: diff.c:5543
-msgid "ignore changes in amount of whitespace"
-msgstr "ignorar cambios en la cantidad de líneas en blanco"
-
-#: diff.c:5546
-msgid "ignore changes in whitespace at EOL"
-msgstr "ignorar cambios en espacios en blanco en EOL"
-
-#: diff.c:5549
-msgid "ignore carrier-return at the end of line"
-msgstr "ignorar carrier-return al final de la línea"
-
-#: diff.c:5552
-msgid "ignore changes whose lines are all blank"
-msgstr "ignorar cambios cuyas líneas son todas en blanco"
-
-#: diff.c:5554 diff.c:5576 diff.c:5579 diff.c:5624
-msgid "<regex>"
-msgstr "<regex>"
-
-#: diff.c:5555
-msgid "ignore changes whose all lines match <regex>"
-msgstr "ignorar cambios cuyas líneas concuerdan con <regex>"
-
-#: 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:5561
-msgid "generate diff using the \"patience diff\" algorithm"
-msgstr "genera un diff usando algoritmo \"patience diff\""
-
-#: diff.c:5565
-msgid "generate diff using the \"histogram diff\" algorithm"
-msgstr "genera un diff usando algoritmo \"histogram diff\""
-
-#: diff.c:5567
-msgid "<algorithm>"
-msgstr "<algoritmo>"
-
-#: diff.c:5568
-msgid "choose a diff algorithm"
-msgstr "escoger un algoritmo para diff"
-
-#: diff.c:5570
-msgid "<text>"
-msgstr "<texto>"
-
-#: diff.c:5571
-msgid "generate diff using the \"anchored diff\" algorithm"
-msgstr "generar un diff usando algoritmo \"anchored diff\""
-
-#: diff.c:5573 diff.c:5582 diff.c:5585
-msgid "<mode>"
-msgstr "<modo>"
-
-#: diff.c:5574
-msgid "show word diff, using <mode> to delimit changed words"
-msgstr ""
-"mostrar diff por palabras usando <modo> para delimitar las palabras cambiadas"
-
-#: diff.c:5577
-msgid "use <regex> to decide what a word is"
-msgstr "usar <regex> para decidir qué es una palabra"
-
-#: 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:5583
-msgid "moved lines of code are colored differently"
-msgstr "líneas movidas de código están coloreadas diferente"
-
-#: diff.c:5586
-msgid "how white spaces are ignored in --color-moved"
-msgstr "como espacios en blanco son ignorados en --color-moved"
-
-#: diff.c:5589
-msgid "Other diff options"
-msgstr "Otras opciones de diff"
-
-#: diff.c:5591
-msgid "when run from subdir, exclude changes outside and show relative paths"
-msgstr ""
-"cuando ejecutado desde un subdir, excluir cambios del exterior y muestra "
-"paths relativos"
-
-#: diff.c:5595
-msgid "treat all files as text"
-msgstr "tratar todos los archivos como texto"
-
-#: diff.c:5597
-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:5608
-msgid "ignore changes to submodules in the diff generation"
-msgstr "ignorar cambios a submódulos en la generación de diff"
-
-#: diff.c:5611
-msgid "<format>"
-msgstr "<formato>"
-
-#: diff.c:5612
-msgid "specify how differences in submodules are shown"
-msgstr "especificar como son mostradas las diferencias en submódulos"
-
-#: diff.c:5616
-msgid "hide 'git add -N' entries from the index"
-msgstr "ocultar entradas 'git add -N' del índice"
-
-#: diff.c:5619
-msgid "treat 'git add -N' entries as real in the index"
-msgstr "tratar entradas 'git add -N' como reales en el índice"
-
-#: diff.c:5621
-msgid "<string>"
-msgstr "<string>"
-
-#: diff.c:5622
-msgid ""
-"look for differences that change the number of occurrences of the specified "
-"string"
-msgstr ""
-"buscar diferencias que cambien el número de ocurrencias del string "
-"especificado"
-
-#: diff.c:5625
-msgid ""
-"look for differences that change the number of occurrences of the specified "
-"regex"
-msgstr ""
-"buscar diferencias que cambien el número de ocurrencias del regex "
-"especificado"
-
-#: 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: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: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:5635 diff.c:5638
-msgid "<path>"
-msgstr "<ruta>"
-
-#: diff.c:5636
-msgid "show the change in the specified path first"
-msgstr "mostrar el cambio en la ruta especificada primero"
-
-#: diff.c:5639
-msgid "skip the output to the specified path"
-msgstr "saltar la salida de la ruta especificada"
-
-#: diff.c:5641
-msgid "<object-id>"
-msgstr "<id-de-objeto>"
-
-#: diff.c:5642
-msgid ""
-"look for differences that change the number of occurrences of the specified "
-"object"
-msgstr ""
-"buscar diferencias que cambien el número de ocurrencias para el objeto "
-"especificado"
-
-#: 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:5645
-msgid "select files by diff type"
-msgstr "seleccionar archivos por tipo de diff"
-
-#: diff.c:5647
-msgid "<file>"
-msgstr "<archivo>"
-
-#: diff.c:5648
-msgid "Output to a specific file"
-msgstr "Output a un archivo específico"
-
-#: 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: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:6312
-#, c-format
-msgid ""
-"you may want to set your %s variable to at least %d and retry the command."
-msgstr ""
-"tal vez quieras configurar la variable %s para por lo menos %d y volver a "
-"intentar el comando."
-
-#: diffcore-order.c:24
-#, c-format
-msgid "failed to read orderfile '%s'"
-msgstr "falló al leer archivo de orden '%s'"
-
-#: diffcore-rename.c:1564
-msgid "Performing inexact rename detection"
-msgstr "Realizando una detección de cambios de nombre inexacta"
-
-#: diffcore-rotate.c:29
-#, c-format
-msgid "No such path '%s' in the diff"
-msgstr "No hay ruta '%s' en el diff"
-
-#: dir.c:593
-#, c-format
-msgid "pathspec '%s' did not match any file(s) known to git"
-msgstr "ruta especificada '%s' no concordó con ningún archivo conocido por git"
-
-#: dir.c:733 dir.c:762 dir.c:775
-#, c-format
-msgid "unrecognized pattern: '%s'"
-msgstr "patrón desconocido: '%s'"
-
-#: dir.c:790 dir.c:804
-#, c-format
-msgid "unrecognized negative pattern: '%s'"
-msgstr "patrón negativo no reconocido: '%s'"
-
-#: dir.c:820
-#, c-format
-msgid "your sparse-checkout file may have issues: pattern '%s' is repeated"
-msgstr ""
-"tu archivo sparse-checkout tal vez tenga errores: patrón '%s' está repetido"
-
-#: dir.c:830
-msgid "disabling cone pattern matching"
-msgstr "deshabilitar coincidencia de patrónes cónica"
-
-#: dir.c:1214
-#, c-format
-msgid "cannot use %s as an exclude file"
-msgstr "no se puede usar %s como archivo de exclusión"
-
-#: dir.c:2464
-#, c-format
-msgid "could not open directory '%s'"
-msgstr "no se pudo abrir el directorio '%s'"
-
-#: 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:2890
-msgid "untracked cache is disabled on this system or location"
-msgstr "untracked cache está desactivado en este sistema o ubicación"
-
-#: 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:3884 dir.c:3889
-#, c-format
-msgid "could not create directories for %s"
-msgstr "no se pudo crear directorios para %s"
-
-#: 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: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:177
-msgid "Filtering content"
-msgstr "Filtrando contenido"
-
-#: entry.c:498
-#, c-format
-msgid "could not stat file '%s'"
-msgstr "no se pudo hacer stat en el archivo '%s'"
-
-#: environment.c:143
-#, c-format
-msgid "bad git namespace path \"%s\""
-msgstr "ruta de namespace de git mala \"%s\""
-
-#: exec-cmd.c:363
-#, c-format
-msgid "too many args to run %s"
-msgstr "demasiados argumentos para ejecutar %s"
-
-#: fetch-pack.c:193
-msgid "git fetch-pack: expected shallow list"
-msgstr "git fetch-pack: lista de superficiales esperada"
-
-#: 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: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: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:238
-msgid "unable to write to remote"
-msgstr "no se puede escribir al remoto"
-
-#: fetch-pack.c:299
-msgid "--stateless-rpc requires multi_ack_detailed"
-msgstr "--stateless-rpc requiere multi_ack_detailed"
-
-#: 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:400 fetch-pack.c:1440
-#, c-format
-msgid "invalid unshallow line: %s"
-msgstr "línea unshallow inválida: %s"
-
-#: fetch-pack.c:402 fetch-pack.c:1442
-#, c-format
-msgid "object not found: %s"
-msgstr "objeto no encontrado: %s"
-
-#: fetch-pack.c:405 fetch-pack.c:1445
-#, c-format
-msgid "error in object: %s"
-msgstr "error en objeto: %s"
-
-#: fetch-pack.c:407 fetch-pack.c:1447
-#, c-format
-msgid "no shallow found: %s"
-msgstr "shallow no encontrado: %s"
-
-#: 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:450
-#, c-format
-msgid "got %s %d %s"
-msgstr "se obtuvo %s %d %s"
-
-#: fetch-pack.c:467
-#, c-format
-msgid "invalid commit %s"
-msgstr "commit inválido %s"
-
-#: fetch-pack.c:498
-msgid "giving up"
-msgstr "rindiéndose"
-
-#: fetch-pack.c:511 progress.c:339
-msgid "done"
-msgstr "listo"
-
-#: fetch-pack.c:523
-#, c-format
-msgid "got %s (%d) %s"
-msgstr "se obtuvo %s (%d) %s"
-
-#: fetch-pack.c:559
-#, c-format
-msgid "Marking %s as complete"
-msgstr "Marcando %s como completa"
-
-#: fetch-pack.c:774
-#, c-format
-msgid "already have %s (%s)"
-msgstr "ya se tiene %s (%s)"
-
-#: 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:868
-msgid "protocol error: bad pack header"
-msgstr "error de protocolo: header de paquete erróneo"
-
-#: 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:968
-msgid "fetch-pack: invalid index-pack output"
-msgstr "fetch-pack: salida de index-pack no válida"
-
-#: fetch-pack.c:985
-#, c-format
-msgid "%s failed"
-msgstr "%s falló"
-
-#: fetch-pack.c:987
-msgid "error in sideband demultiplexer"
-msgstr "error en demultiplexor de banda lateral"
-
-#: fetch-pack.c:1030
-#, c-format
-msgid "Server version is %.*s"
-msgstr "Versión de servidor es %.*s"
-
-#: 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:1040
-msgid "Server does not support shallow clients"
-msgstr "El servidor no soporta clientes superficiales"
-
-#: fetch-pack.c:1100
-msgid "Server does not support --shallow-since"
-msgstr "El servidor no soporta --shallow-since"
-
-#: fetch-pack.c:1105
-msgid "Server does not support --shallow-exclude"
-msgstr "El servidor no soporta --shallow-exclude"
-
-#: fetch-pack.c:1109
-msgid "Server does not support --deepen"
-msgstr "El servidor no soporta --deepen"
-
-#: 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:1124
-msgid "no common commits"
-msgstr "no hay commits comunes"
-
-#: 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:1139 fetch-pack.c:1671
-msgid "git fetch-pack: fetch failed."
-msgstr "git fetch-pack: fetch falló."
-
-#: fetch-pack.c:1253
-#, c-format
-msgid "mismatched algorithms: client %s; server %s"
-msgstr "algoritmos no compatibles: cliente %s; servidor %s"
-
-#: 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:1290
-msgid "Server does not support shallow requests"
-msgstr "El servidor no soporta peticiones superficiales"
-
-#: fetch-pack.c:1297
-msgid "Server supports filter"
-msgstr "El servidor soporta filtración"
-
-#: 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:1358
-#, c-format
-msgid "error reading section header '%s'"
-msgstr "error al leer header de sección '%s'"
-
-#: fetch-pack.c:1364
-#, c-format
-msgid "expected '%s', received '%s'"
-msgstr "se esperaba '%s', se recibió '%s'"
-
-#: fetch-pack.c:1398
-#, c-format
-msgid "unexpected acknowledgment line: '%s'"
-msgstr "línea de confirmación inesperada: '%s'"
-
-#: fetch-pack.c:1403
-#, c-format
-msgid "error processing acks: %d"
-msgstr "error al procesar acks: %d"
-
-#: 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: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:1456
-#, c-format
-msgid "error processing shallow info: %d"
-msgstr "error al procesar información de superficiales: %d"
-
-#: fetch-pack.c:1505
-#, c-format
-msgid "expected wanted-ref, got '%s'"
-msgstr "se esperaba wanted-ref, se obtuvo '%s'"
-
-#: fetch-pack.c:1510
-#, c-format
-msgid "unexpected wanted-ref: '%s'"
-msgstr "wanted-ref inesperado: '%s'"
-
-#: fetch-pack.c:1515
-#, c-format
-msgid "error processing wanted refs: %d"
-msgstr "error al procesar refs deseadas: %d"
-
-#: 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:1949
-msgid "no matching remote head"
-msgstr "no concuerda el head remoto"
-
-#: 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:2075
-msgid "unexpected 'ready' from remote"
-msgstr "'listo' inesperado del remoto"
-
-#: fetch-pack.c:2098
-#, c-format
-msgid "no such remote ref %s"
-msgstr "no existe ref remota %s"
-
-#: 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: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: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: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:533
-msgid ""
-"given pattern contains NULL byte (via -f <file>). This is only supported "
-"with -P under PCRE v2"
-msgstr ""
-"el patrón provisto contiene bytes NULL (vía -f <archivo>). Esto solo es "
-"soportado con -P bajo PCRE v2"
-
-#: grep.c:1928
-#, c-format
-msgid "'%s': unable to read %s"
-msgstr "'%s': no es posible leer %s"
-
-#: 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:1956
-#, c-format
-msgid "'%s': short read"
-msgstr "'%s': lectura corta"
-
-#: help.c:24
-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 "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 "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 "grow, mark and tweak your common history"
-msgstr "crecer, marcar y ajustar tu historial común"
-
-#: 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:33
-msgid "Ancillary Commands / Manipulators"
-msgstr "Comandos auxiliares / Manipuladores"
-
-#: help.c:34
-msgid "Ancillary Commands / Interrogators"
-msgstr "Comandos auxiliares / Interrogadores"
-
-#: 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:37
-msgid "Low-level Commands / Interrogators"
-msgstr "Comandos de bajo nivel / Interrogadores"
-
-#: help.c:38
-msgid "Low-level Commands / Syncing Repositories"
-msgstr "Comandos de bajo nivel / Sincronización de repositorios"
-
-#: help.c:39
-msgid "Low-level Commands / Internal Helpers"
-msgstr "Comandos de bajo nivel / Auxiliares internos"
-
-#: help.c:313
-#, c-format
-msgid "available git commands in '%s'"
-msgstr "comandos disponibles de git en '%s'"
-
-#: 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:329
-msgid "These are common Git commands used in various situations:"
-msgstr "Estos son comandos comunes de Git usados en varias situaciones:"
-
-#: 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:418
-msgid "The Git concept guides are:"
-msgstr "Las guías de conceptos de Git son:"
-
-#: help.c:442
-msgid "See 'git help <command>' to read about a specific subcommand"
-msgstr "Mira 'git help <comando>' para leer sobre los subcomandos específicos"
-
-#: help.c:447
-msgid "External commands"
-msgstr "Comandos externos"
-
-#: help.c:462
-msgid "Command aliases"
-msgstr "Aliases de comando"
-
-#: 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 ""
-"'%s' parece ser un comando de git, pero no hemos\n"
-"podido ejecutarlo. ¿Tal vez git-%s se ha roto?"
-
-#: 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: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: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:640
-#, c-format
-msgid "Continuing under the assumption that you meant '%s'."
-msgstr "Continuando asumiendo que quisiste decir '%s'."
-
-#: 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:666
-msgid ""
-"\n"
-"The most similar command is"
-msgid_plural ""
-"\n"
-"The most similar commands are"
-msgstr[0] ""
-"\n"
-"El comando más similar es"
-msgstr[1] ""
-"\n"
-"Los comandos más similares son"
-
-#: help.c:706
-msgid "git version [<options>]"
-msgstr "git version [<opciones>]"
-
-#: help.c:761
-#, c-format
-msgid "%s: %s - %s"
-msgstr "%s: %s - %s"
-
-#: help.c:765
-msgid ""
-"\n"
-"Did you mean this?"
-msgid_plural ""
-"\n"
-"Did you mean one of these?"
-msgstr[0] ""
-"\n"
-"¿Quisiste decir esto?"
-msgstr[1] ""
-"\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"
-
-#: ident.c:356
-msgid "Committer identity unknown\n"
-msgstr "Se desconoce la identidad del autor\n"
-
-#: ident.c:362
-msgid ""
-"\n"
-"*** Please tell me who you are.\n"
-"\n"
-"Run\n"
-"\n"
-"  git config --global user.email \"you@example.com\"\n"
-"  git config --global user.name \"Your Name\"\n"
-"\n"
-"to set your account's default identity.\n"
-"Omit --global to set the identity only in this repository.\n"
-"\n"
-msgstr ""
-"\n"
-"*** Por favor cuéntame quién eres.\n"
-"\n"
-"Ejecuta\n"
-"\n"
-"  git config --global user.email \"you@example.com\"\n"
-"  git config --global user.name \"Tu Nombre\"\n"
-"\n"
-"para configurar la identidad por defecto de tu cuenta.\n"
-"Omite --global para configurar tu identidad solo en este repositorio.\n"
-"\n"
-
-#: ident.c:397
-msgid "no email was given and auto-detection is disabled"
-msgstr "no se entregó ningún email y la detección automática está desactivada"
-
-#: ident.c:402
-#, c-format
-msgid "unable to auto-detect email address (got '%s')"
-msgstr "no es posible auto-detectar la dirección de correo (se obtuvo '%s')"
-
-#: ident.c:419
-msgid "no name was given and auto-detection is disabled"
-msgstr "no se entregó ningún nombre y la detección automática está desactivada"
-
-#: ident.c:425
-#, c-format
-msgid "unable to auto-detect name (got '%s')"
-msgstr "no es posible auto-detectar el nombre (se obtuvo '%s')"
-
-#: ident.c:433
-#, c-format
-msgid "empty ident name (for <%s>) not allowed"
-msgstr "no se puede tener un nombre de identidad vacío (para <%s>)"
-
-#: ident.c:439
-#, c-format
-msgid "name consists only of disallowed characters: %s"
-msgstr "el nombre consiste solo de caracteres no permitidos: %s"
-
-#: ident.c:454 builtin/commit.c:648
-#, c-format
-msgid "invalid date format: %s"
-msgstr "formato de fecha inválido: %s"
-
-#: list-objects-filter-options.c:83
-msgid "expected 'tree:<depth>'"
-msgstr "se esperaba 'tree:<depth>'"
-
-#: list-objects-filter-options.c:98
-msgid "sparse:path filters support has been dropped"
-msgstr "soporte para filtros sparse:path ha sido discontinuado"
-
-#: list-objects-filter-options.c:105
-#, c-format
-msgid "'%s' for 'object:type=<type>' is not a valid object type"
-msgstr "'%s' para 'object:type=<type>' no es un objeto válido"
-
-#: list-objects-filter-options.c:124
-#, c-format
-msgid "invalid filter-spec '%s'"
-msgstr "especificación de filtro inválida '%s'"
-
-#: list-objects-filter-options.c:140
-#, c-format
-msgid "must escape char in sub-filter-spec: '%c'"
-msgstr "tienes que escapar el caracter en sub-filter-spec: '%c'"
-
-#: list-objects-filter-options.c:182
-msgid "expected something after combine:"
-msgstr "se espera algo luego de combine:"
-
-#: list-objects-filter-options.c:264
-msgid "multiple filter-specs cannot be combined"
-msgstr "no se pueden combinar múltiples tipos de especificaciones de filtro"
-
-#: list-objects-filter-options.c:376
-msgid "unable to upgrade repository format to support partial clone"
-msgstr ""
-"no es posible actualizar el formato del repositorio para soportar clonación "
-"parcial"
-
-#: list-objects-filter.c:532
-#, c-format
-msgid "unable to access sparse blob in '%s'"
-msgstr "no es posible acceder al blob en '%s'"
-
-#: list-objects-filter.c:535
-#, c-format
-msgid "unable to parse sparse filter data in %s"
-msgstr "incapaz de analizar filtro de data en %s"
-
-#: list-objects.c:127
-#, c-format
-msgid "entry '%s' in tree %s has tree mode, but is not a tree"
-msgstr "entrada '%s' en árbol %s tiene modo árbol, pero no lo es"
-
-#: list-objects.c:140
-#, c-format
-msgid "entry '%s' in tree %s has blob mode, but is not a blob"
-msgstr "entrada '%s' en árbol %s tiene modo blob, pero no lo es"
-
-#: list-objects.c:398
-#, c-format
-msgid "unable to load root tree for commit %s"
-msgstr "no se puede cargar árbol raíz para commit %s"
-
-#: lockfile.c:152
-#, c-format
-msgid ""
-"Unable to create '%s.lock': %s.\n"
-"\n"
-"Another git process seems to be running in this repository, e.g.\n"
-"an editor opened by 'git commit'. Please make sure all processes\n"
-"are terminated then try again. If it still fails, a git process\n"
-"may have crashed in this repository earlier:\n"
-"remove the file manually to continue."
-msgstr ""
-"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ú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"
-"borra el archivo manualmente para continuar."
-
-#: lockfile.c:160
-#, c-format
-msgid "Unable to create '%s.lock': %s"
-msgstr "No se pudo crear '%s.lock': %s"
-
-#: ls-refs.c:37
-#, c-format
-msgid "invalid value '%s' for lsrefs.unborn"
-msgstr "valor inválido '%s' para lsrefs.unborn"
-
-#: 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"
-
-#: mailinfo.c:1050
-msgid "quoted CRLF detected"
-msgstr "CRLF con comillas detectado"
-
-#: 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: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: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: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: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:1642
-#, c-format
-msgid "Failed to merge submodule %s"
-msgstr "Falló al fusionar el submódulo %s"
-
-#: merge-ort.c:1649
-#, c-format
-msgid ""
-"Failed to merge submodule %s, but a possible merge resolution exists:\n"
-"%s\n"
-msgstr ""
-"Falló al fusionar el submódulo %s, pero existen posibles soluciones de "
-"fusión:\n"
-"%s\n"
-
-#: merge-ort.c:1653 merge-recursive.c:1281
-#, c-format
-msgid ""
-"If this is correct simply add it to the index for example\n"
-"by using:\n"
-"\n"
-"  git update-index --cacheinfo 160000 %s \"%s\"\n"
-"\n"
-"which will accept this suggestion.\n"
-msgstr ""
-"Si esto es correcto simplemente agrégalo al índice por ejemplo\n"
-"usando:\n"
-"\n"
-"  git update-index --cacheinfo 160000 %s \"%s\"\n"
-"\n"
-"el cual aceptará esta sugerencia.\n"
-
-#: 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últiples fusiones "
-"posibles:\n"
-"%s"
-
-#: 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: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:1899 merge-recursive.c:1410
-#, c-format
-msgid "Auto-merging %s"
-msgstr "Auto-fusionando %s"
-
-#: 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 ""
-"CONFLICTO (cambio de nombre de directorio implícito): Archivo/directorio "
-"existente en %s se interpone con el cambio de nombres implícito, poniendo "
-"la(s) siguiente(s) ruta(s) aquí: %s."
-
-#: 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 ""
-"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:2106
-#, c-format
-msgid ""
-"CONFLICT (directory rename split): Unclear where to rename %s to; it was "
-"renamed to multiple other directories, with no destination getting a "
-"majority of the files."
-msgstr ""
-"CONFLICTO (división de cambio de nombre de directorio): No está claro a qué "
-"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:2260 merge-recursive.c:2478
-#, c-format
-msgid ""
-"WARNING: Avoiding applying %s -> %s rename to %s, because %s itself was "
-"renamed."
-msgstr ""
-"PELIGRO: Evitando aplicar %s -> %s renombrado a %s, porque %s mismo fue "
-"renombrado."
-
-#: 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 ""
-"Path actualizado: %s agregado en %s dentro de un directorio que fue "
-"renombrado en %s; moviéndolo a %s."
-
-#: 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 ""
-"Path actualizado: %s renombrado a %s en %s, dentro de un directorio que fue "
-"renombrado en %s; moviéndolo a %s."
-
-#: 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 ""
-"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: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 ""
-"CONFLICTO (ubicación de archivo): %s renombrado a %s en %s, dentro de un "
-"directorio que fue renombrado en %s, sugiriendo que tal vez debería ser "
-"movido a %s."
-
-#: 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: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."
-msgstr ""
-"CONFLICTO (cambio de nombre involucrado en colisión): cambio de nombre de %s "
-"->%s tiene conflictos de contenido Y colisiona con otra ruta; esto puede "
-"resultar en marcadores de conflicto anidados."
-
-#: 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:3212 merge-recursive.c:3022
-#, c-format
-msgid "cannot read object %s"
-msgstr "no se pudo leer el objeto %s"
-
-#: 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:3644
-#, c-format
-msgid ""
-"CONFLICT (file/directory): directory in the way of %s from %s; moving it to "
-"%s instead."
-msgstr ""
-"CONFLICTO (archivo / directorio): directorio en el camino de %s de %s; "
-"moviéndolo a %s en su lugar."
-
-#: 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 ""
-"CONFLICTO (tipos distintos): %s tenía tipos diferentes en cada lado; ambos "
-"fueron renombrados para que cada uno pueda ser grabado en algún lugar "
-"diferente."
-
-#: 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 ""
-"CONFLICTO (tipos distintos): %s tenía tipos diferentes en cada lado; uno de "
-"ellos fue renombrado para que cada uno pueda ser grabado en algún lugar "
-"diferente."
-
-#: merge-ort.c:3819 merge-recursive.c:3101
-msgid "content"
-msgstr "contenido"
-
-#: merge-ort.c:3821 merge-recursive.c:3105
-msgid "add/add"
-msgstr "agregar/agregar"
-
-#: merge-ort.c:3823 merge-recursive.c:3150
-msgid "submodule"
-msgstr "submódulo"
-
-#: 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:3856
-#, c-format
-msgid ""
-"CONFLICT (modify/delete): %s deleted in %s and modified in %s.  Version %s "
-"of %s left in tree."
-msgstr ""
-"CONFLICTO (modificar / eliminar): %s eliminado en %s y modificado en %s. "
-"Versión %s de %s restante en el árbol."
-
-#: 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 ""
-"Nota: %s no está actualizado y en conflicto con la versión; la copia antigua "
-"fue renombrada 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: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:3716
-#, c-format
-msgid ""
-"Your local changes to the following files would be overwritten by merge:\n"
-"  %s"
-msgstr ""
-"Los cambios locales de los siguientes archivos serán sobreescritos por "
-"merge:\n"
-"  %s"
-
-#: 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:353
-msgid "(bad commit)\n"
-msgstr "(commit erróneo)\n"
-
-#: 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: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:881
-#, c-format
-msgid "failed to create path '%s'%s"
-msgstr "falló al crear la ruta '%s'%s"
-
-#: 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:906 merge-recursive.c:925
-msgid ": perhaps a D/F conflict?"
-msgstr ": ¿tal vez un conflicto D/F?"
-
-#: 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: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:961
-#, c-format
-msgid "blob expected for %s '%s'"
-msgstr "se esperaba blob para %s '%s'"
-
-#: merge-recursive.c:986
-#, c-format
-msgid "failed to open '%s': %s"
-msgstr "falló al abrir '%s': %s"
-
-#: 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: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: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:1236 merge-recursive.c:1249
-#, c-format
-msgid "Fast-forwarding submodule %s"
-msgstr "Avance rápido en submódulo %s"
-
-#: 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: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: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: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: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:1506
-#, c-format
-msgid ""
-"CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s left "
-"in tree."
-msgstr ""
-"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: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 ""
-"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: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 ""
-"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: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 ""
-"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:1558
-msgid "rename"
-msgstr "renombrar"
-
-#: merge-recursive.c:1558
-msgid "renamed"
-msgstr "renombrado"
-
-#: 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: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: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: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: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:1740
-#, c-format
-msgid ""
-"CONFLICT (rename/rename): Rename \"%s\"->\"%s\" in branch \"%s\" rename \"%s"
-"\"->\"%s\" in \"%s\"%s"
-msgstr ""
-"CONFLICTO (renombrar/renombrar): Renombrar \"%s\"->\"%s\" en la rama \"%s\" "
-"renombrar \"%s\"->\"%s\" en \"%s\"%s"
-
-#: merge-recursive.c:1745
-msgid " (left unresolved)"
-msgstr " (dejado sin resolver)"
-
-#: 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:2100
-#, c-format
-msgid ""
-"CONFLICT (directory rename split): Unclear where to place %s because "
-"directory %s was renamed to multiple other directories, with no destination "
-"getting a majority of the files."
-msgstr ""
-"CONFLICTO (división de cambio de nombre de directorio): No es claro dónde "
-"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:2234
-#, c-format
-msgid ""
-"CONFLICT (rename/rename): Rename directory %s->%s in %s. Rename directory %s-"
-">%s in %s"
-msgstr ""
-"CONFLICTO (renombrar/renombrar): Renombrar directorio %s->%s en %s. "
-"Renombrar directorio %s->%s en %s"
-
-#: merge-recursive.c:3089
-msgid "modify"
-msgstr "modificar"
-
-#: merge-recursive.c:3089
-msgid "modified"
-msgstr "modificado"
-
-#: merge-recursive.c:3128
-#, c-format
-msgid "Skipped %s (merged same as existing)"
-msgstr "Saltado %s (fusionado como existente)"
-
-#: merge-recursive.c:3181
-#, c-format
-msgid "Adding as %s instead"
-msgstr "Agregando más bien como %s"
-
-#: merge-recursive.c:3385
-#, c-format
-msgid "Removing %s"
-msgstr "Eliminando %s"
-
-#: merge-recursive.c:3408
-msgid "file/directory"
-msgstr "archivo/directorio"
-
-#: merge-recursive.c:3413
-msgid "directory/file"
-msgstr "directorio/archivo"
-
-#: 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:3429
-#, c-format
-msgid "Adding %s"
-msgstr "Agregando %s"
-
-#: 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: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:3585
-msgid "Merging:"
-msgstr "Fusionando:"
-
-#: 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:3648
-msgid "merge returned no commit"
-msgstr "la fusión no devolvió ningún commit"
-
-#: merge-recursive.c:3816
-#, c-format
-msgid "Could not parse object '%s'"
-msgstr "No se pudo analizar el objeto '%s'"
-
-#: 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."
-
-#: merge.c:41
-msgid "failed to read the cache"
-msgstr "falló al leer la cache"
-
-#: 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: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: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: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:130
-#, c-format
-msgid "multi-pack-index version %d not recognized"
-msgstr "versión %d de multi-pack-index no reconocida"
-
-#: 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:152
-msgid "multi-pack-index missing required pack-name chunk"
-msgstr "a multi-pack-index le falta el conjunto pack-name requerido"
-
-#: 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:156
-msgid "multi-pack-index missing required OID lookup chunk"
-msgstr "a multi-pack-index le falta el conjunto OID fanout requerido"
-
-#: 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: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:221
-#, c-format
-msgid "bad pack-int-id: %u (%u total packs)"
-msgstr "mal pack-int-id: %u (%u paquetes totales)"
-
-#: 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:502
-#, c-format
-msgid "failed to add packfile '%s'"
-msgstr "falló al agregar packfile '%s'"
-
-#: midx.c:508
-#, c-format
-msgid "failed to open pack-index '%s'"
-msgstr "falló al abrir pack-index '%s'"
-
-#: midx.c:576
-#, c-format
-msgid "failed to locate object %d in packfile"
-msgstr "falló al ubicar objeto %d en packfile"
-
-#: midx.c:892
-msgid "cannot store reverse index file"
-msgstr "no se puede almacenar el archivo de índice inverso"
-
-#: 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: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:1244
-#, c-format
-msgid "unknown preferred pack: '%s'"
-msgstr "pack preferido desconocido: '%s'"
-
-#: 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:1380
-msgid "no pack files to index."
-msgstr "no hay archivos pack para indexar."
-
-#: 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:1517
-#, c-format
-msgid "failed to clear multi-pack-index at %s"
-msgstr "falló al limpiar multi-pack-index en %s"
-
-#: 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:1585
-msgid "incorrect checksum"
-msgstr "checksum incorrecto"
-
-#: midx.c:1588
-msgid "Looking for referenced packfiles"
-msgstr "Buscando packfiles referidos"
-
-#: 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:1608
-msgid "the midx contains no oid"
-msgstr "el midx no contiene oid"
-
-#: midx.c:1617
-msgid "Verifying OID order in multi-pack-index"
-msgstr "Verificando orden de OID en multi-pack-index"
-
-#: 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:1646
-msgid "Sorting objects by packfile"
-msgstr "Ordenando objetos por packfile"
-
-#: midx.c:1653
-msgid "Verifying object offsets"
-msgstr "Verificando offsets de objetos"
-
-#: 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:1675
-#, c-format
-msgid "failed to load pack-index for packfile %s"
-msgstr "falló al cargar el pack-index para packfile %s"
-
-#: 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:1709
-msgid "Counting referenced objects"
-msgstr "Contando objetos no referenciados"
-
-#: midx.c:1719
-msgid "Finding and deleting unreferenced packfiles"
-msgstr "Encontrando y borrando packfiles sin referencias"
-
-#: midx.c:1911
-msgid "could not start pack-objects"
-msgstr "no se pudo iniciar pack-objects"
-
-#: midx.c:1931
-msgid "could not finish pack-objects"
-msgstr "no se pudo finalizar pack-objects"
-
-#: name-hash.c:542
-#, c-format
-msgid "unable to create lazy_dir thread: %s"
-msgstr "no es posible crear hilo lazy_dir: %s"
-
-#: name-hash.c:564
-#, c-format
-msgid "unable to create lazy_name thread: %s"
-msgstr "no es posible crear hilo lazy_name: %s"
-
-#: name-hash.c:570
-#, c-format
-msgid "unable to join lazy_name thread: %s"
-msgstr "no es posible unir hilo lazy_name: %s"
-
-#: notes-merge.c:277
-#, 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."
-msgstr ""
-"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."
-
-#: notes-merge.c:284
-#, c-format
-msgid "You have not concluded your notes merge (%s exists)."
-msgstr "No has terminado tu fusión de notas (%s existe)."
-
-#: notes-utils.c:46
-msgid "Cannot commit uninitialized/unreferenced notes tree"
-msgstr ""
-"No se puede realizar commit, árbol de notas no inicializado o no referenciado"
-
-#: notes-utils.c:105
-#, c-format
-msgid "Bad notes.rewriteMode value: '%s'"
-msgstr "Valor erróneo para notes.rewriteMode: '%s'"
-
-#: notes-utils.c:115
-#, c-format
-msgid "Refusing to rewrite notes in %s (outside of refs/notes/)"
-msgstr "Rehusando reescribir notas en %s (fuera de refs/notes/)"
-
-#. 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 erróneo para %s: '%s'"
-
-#: 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:517
-#, c-format
-msgid "unable to normalize alternate object path: %s"
-msgstr "incapaz de normalizar la ruta de objeto alterno: %s"
-
-#: 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:598
-#, c-format
-msgid "unable to normalize object directory: %s"
-msgstr "incapaz de normalizar directorio de objetos: %s"
-
-#: object-file.c:641
-msgid "unable to fdopen alternates lockfile"
-msgstr "no es posible hacer fdopen en lockfile alternos"
-
-#: object-file.c:659
-msgid "unable to read alternates file"
-msgstr "no es posible leer el archivo de alternativos"
-
-#: 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:701
-#, c-format
-msgid "path '%s' does not exist"
-msgstr "ruta '%s' no existe"
-
-#: 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: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:734
-#, c-format
-msgid "reference repository '%s' is shallow"
-msgstr "repositorio de referencia '%s' es superficial (shallow)"
-
-#: object-file.c:742
-#, c-format
-msgid "reference repository '%s' is grafted"
-msgstr "repositorio de referencia '% s' está injertado"
-
-#: 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:973
-#, c-format
-msgid "attempting to mmap %<PRIuMAX> over limit %<PRIuMAX>"
-msgstr "intentando usar mmap %<PRIuMAX> sobre límite %<PRIuMAX>"
-
-#: object-file.c:1008
-#, c-format
-msgid "mmap failed%s"
-msgstr "mmap falló %s"
-
-#: object-file.c:1174
-#, c-format
-msgid "object file %s is empty"
-msgstr "archivo de objeto %s está vacío"
-
-#: object-file.c:1293 object-file.c:2499
-#, c-format
-msgid "corrupt loose object '%s'"
-msgstr "objeto suelto corrupto '%s'"
-
-#: 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:1417
-#, c-format
-msgid "unable to parse %s header"
-msgstr "incapaz de analizar header %s"
-
-#: 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:1668
-#, c-format
-msgid "replacement %s not found for %s"
-msgstr "reemplazo %s no encontrado para %s"
-
-#: 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:1676
-#, c-format
-msgid "packed object %s (stored in %s) is corrupt"
-msgstr "objeto empaquetado %s (guardado en %s) está corrompido"
-
-#: object-file.c:1781
-#, c-format
-msgid "unable to write file %s"
-msgstr "no es posible escribir archivo %s"
-
-#: object-file.c:1788
-#, c-format
-msgid "unable to set permission to '%s'"
-msgstr "no se pudo poner permisos a '%s'"
-
-#: object-file.c:1795
-msgid "file write error"
-msgstr "falló de escritura"
-
-#: object-file.c:1815
-msgid "error when closing loose object file"
-msgstr "error al cerrar el archivo de objeto suelto"
-
-#: 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:1884
-msgid "unable to create temporary file"
-msgstr "no es posible crear un archivo temporal"
-
-#: object-file.c:1908
-msgid "unable to write loose object file"
-msgstr "no es posible escribir el archivo de objeto suelto"
-
-#: 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:1918
-#, c-format
-msgid "deflateEnd on object %s failed (%d)"
-msgstr "deflateEnd en objeto %s falló (%d)"
-
-#: 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:1933 builtin/pack-objects.c:1243
-#, c-format
-msgid "failed utime() on %s"
-msgstr "falló utime() en %s"
-
-#: object-file.c:2011
-#, c-format
-msgid "cannot read object for %s"
-msgstr "no se pudo leer el objeto para %s"
-
-#: object-file.c:2062
-msgid "corrupt commit"
-msgstr "commit corrupto"
-
-#: object-file.c:2070
-msgid "corrupt tag"
-msgstr "tag corrupto"
-
-#: object-file.c:2170
-#, c-format
-msgid "read error while indexing %s"
-msgstr "error de lectura al indexar %s"
-
-#: object-file.c:2173
-#, c-format
-msgid "short read while indexing %s"
-msgstr "lectura corta al indexar %s"
-
-#: 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:2262
-#, c-format
-msgid "%s: unsupported file type"
-msgstr "%s: tipo de archivo no soportado"
-
-#: 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:2288
-#, c-format
-msgid "%s is not a valid '%s' object"
-msgstr "%s no es un objeto '%s' válido"
-
-#: object-file.c:2315
-#, c-format
-msgid "unable to open %s"
-msgstr "no es posible abrir %s"
-
-#: 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:2533
-#, c-format
-msgid "unable to mmap %s"
-msgstr "no es posible hacer mmap a %s"
-
-#: object-file.c:2539
-#, c-format
-msgid "unable to unpack header of %s"
-msgstr "incapaz de desempaquetar header de %s"
-
-#: object-file.c:2544
-#, c-format
-msgid "unable to parse header of %s"
-msgstr "incapaz de analizar header de %s"
-
-#: object-file.c:2555
-#, c-format
-msgid "unable to unpack contents of %s"
-msgstr "no es posible desempaquetar contenidos de %s"
-
-#: object-name.c:480
-#, c-format
-msgid "short object ID %s is ambiguous"
-msgstr "el ID de objeto corto %s es ambiguo"
-
-#: object-name.c:491
-msgid "The candidates are:"
-msgstr "Los candidatos son:"
-
-#: 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"
-"may be created by mistake. For example,\n"
-"\n"
-"  git switch -c $br $(git rev-parse ...)\n"
-"\n"
-"where \"$br\" is somehow empty and a 40-hex ref is created. Please\n"
-"examine these refs and maybe delete them. Turn this message off by\n"
-"running \"git config advice.objectNameWarning false\""
-msgstr ""
-"Git normalmente nunca crea una ref que termine con 40 caracteres hex\n"
-"porque esto sería ignorado cuando solo se especifiquen 40-hex. Estas refs\n"
-"tal vez sean creadas por error. Por ejemplo,\n"
-"\n"
-"  git switch -c $br $(git rev-parse ...)\n"
-"\n"
-"donde \"$br\" está de alguna manera vacía y una ref de 40-hex es creada. Por "
-"favor\n"
-"examina estas refs y tal vez bórralas. Silencia este mensaje\n"
-"ejecutando \"git config advice.objectNameWarning false\""
-
-#: object-name.c:910
-#, c-format
-msgid "log for '%.*s' only goes back to %s"
-msgstr "log para '%.*s' solo va hasta %s"
-
-#: object-name.c:918
-#, c-format
-msgid "log for '%.*s' only has %d entries"
-msgstr "log para '%.*s' solo tiene %d entradas"
-
-#: object-name.c:1696
-#, c-format
-msgid "path '%s' exists on disk, but not in '%.*s'"
-msgstr "la ruta '%s' existe en disco, pero no en '%.*s'"
-
-#: object-name.c:1702
-#, c-format
-msgid ""
-"path '%s' exists, but not '%s'\n"
-"hint: Did you mean '%.*s:%s' aka '%.*s:./%s'?"
-msgstr ""
-"ruta '%s' existe, pero no '%s'\n"
-"ayuda: ¿Quisiste decir '%.*s:%s' o '%.*s:./%s'?"
-
-#: object-name.c:1711
-#, c-format
-msgid "path '%s' does not exist in '%.*s'"
-msgstr "ruta '%s' no existe en '%.*s'"
-
-#: 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 ""
-"ruta '%s' está en el índice, pero no en stage %d\n"
-"ayuda: ¿Quisiste decir: '%d:%s'?"
-
-#: 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 ""
-"ruta '%s' está en el índice, pero no '%s'\n"
-"ayuda: ¿Quisiste decir ':%d:%s' o ':%d:./%s'?"
-
-#: object-name.c:1763
-#, c-format
-msgid "path '%s' exists on disk, but not in the index"
-msgstr "ruta '%s' existe en el disco, pero no en el índice"
-
-#: object-name.c:1765
-#, c-format
-msgid "path '%s' does not exist (neither on disk nor in the index)"
-msgstr "ruta '%s' no existe (ni en disco ni en el índice)"
-
-#: object-name.c:1778
-msgid "relative path syntax can't be used outside working tree"
-msgstr ""
-"la sintaxis de ruta relativa no se puede usar fuera del directorio de trabajo"
-
-#: object-name.c:1916
-#, c-format
-msgid "invalid object name '%.*s'."
-msgstr "nombre de objeto no válido: '%.*s'."
-
-#: object.c:53
-#, c-format
-msgid "invalid object type \"%s\""
-msgstr "tipo de objeto \"%s\" inválido"
-
-#: object.c:173
-#, c-format
-msgid "object %s is a %s, not a %s"
-msgstr "objeto %s es un %s, no un %s"
-
-#: object.c:250
-#, c-format
-msgid "object %s has unknown type id %d"
-msgstr "el objeto %s tiene un id de tipo desconocido %d"
-
-#: object.c:263
-#, c-format
-msgid "unable to parse object: %s"
-msgstr "incapaz de analizar objeto: %s"
-
-#: object.c:283 object.c:295
-#, c-format
-msgid "hash mismatch %s"
-msgstr "hash no concuerda %s"
-
-#: 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: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"
-
-#: pack-revindex.c:221
-#, c-format
-msgid "reverse-index file %s is too small"
-msgstr "el archivo de índice inverso %s es demasiado pequeño"
-
-#: pack-revindex.c:226
-#, c-format
-msgid "reverse-index file %s is corrupt"
-msgstr "el archivo de índice inverso %s está dañado"
-
-#: pack-revindex.c:234
-#, c-format
-msgid "reverse-index file %s has unknown signature"
-msgstr "el archivo de índice inverso %s tiene una firma desconocida"
-
-#: pack-revindex.c:238
-#, c-format
-msgid "reverse-index file %s has unsupported version %<PRIu32>"
-msgstr "archivo reverse-index %s tiene una versión no soportada %<PRIu32>"
-
-#: pack-revindex.c:243
-#, c-format
-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:251
-msgid "cannot both write and verify reverse index"
-msgstr "no puede escribir y verificar el índice inverso"
-
-#: pack-write.c:270
-#, c-format
-msgid "could not stat: %s"
-msgstr "no se pudo hacer stat: %s"
-
-#: pack-write.c:282
-#, c-format
-msgid "failed to make %s readable"
-msgstr "no pudo hacer %s legible"
-
-#: pack-write.c:520
-#, c-format
-msgid "could not write '%s' promisor file"
-msgstr "no se pudo escribir el archivo promisor '%s'"
-
-#: packfile.c:626
-msgid "offset before end of packfile (broken .idx?)"
-msgstr "offset antes del final del paquete (¿.idx roto?)"
-
-#: packfile.c:656
-#, c-format
-msgid "packfile %s cannot be mapped%s"
-msgstr "objeto %s no puede ser mapeado %s"
-
-#: 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: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 builtin/commit-graph.c:175
-#, c-format
-msgid "option `%s' expects a numerical value"
-msgstr "opción `%s' espera un valor numérico"
-
-#: parse-options-cb.c:41
-#, c-format
-msgid "malformed expiration date '%s'"
-msgstr "fecha de caducidad mal formada: '%s'"
-
-#: parse-options-cb.c:54
-#, c-format
-msgid "option `%s' expects \"always\", \"auto\", or \"never\""
-msgstr "opción `%s' puede usar \"always\", \"auto\", o \"never\""
-
-#: parse-options-cb.c:132 parse-options-cb.c:149
-#, c-format
-msgid "malformed object name '%s'"
-msgstr "nombre de objeto mal formado '%s'"
-
-#: parse-options.c:58
-#, c-format
-msgid "%s requires a value"
-msgstr "%s requiere un valor"
-
-#: parse-options.c:93
-#, c-format
-msgid "%s is incompatible with %s"
-msgstr "%s es incompatible con %s"
-
-#: parse-options.c:98
-#, c-format
-msgid "%s : incompatible with something else"
-msgstr "%s : incompatible con otra cosa"
-
-#: parse-options.c:112 parse-options.c:116
-#, c-format
-msgid "%s takes no value"
-msgstr "%s no toma valores"
-
-#: parse-options.c:114
-#, c-format
-msgid "%s isn't available"
-msgstr "%s no está disponible"
-
-#: 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: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: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:677 parse-options.c:1053
-#, c-format
-msgid "alias of --%s"
-msgstr "alias de --%s"
-
-#: parse-options.c:891
-#, c-format
-msgid "unknown option `%s'"
-msgstr "opción `%s' desconocida"
-
-#: parse-options.c:893
-#, c-format
-msgid "unknown switch `%c'"
-msgstr "switch desconocido `%c'"
-
-#: 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:919
-msgid "..."
-msgstr "..."
-
-#: parse-options.c:933
-#, c-format
-msgid "usage: %s"
-msgstr "uso: %s"
-
-#. TRANSLATORS: the colon here should align with the
-#. one in "usage: %s" translation.
-#.
-#: parse-options.c:948
-#, c-format
-msgid "   or: %s"
-msgstr "   o: %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:992
-#, c-format
-msgid "    %s"
-msgstr "    %s"
-
-#: parse-options.c:1039
-msgid "-NUM"
-msgstr "-NUM"
-
-#: 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: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:168
-msgid "Only one 'attr:' specification is allowed."
-msgstr "Solo se permite una única especificación 'attr'."
-
-#: pathspec.c:171
-msgid "attr spec must not be empty"
-msgstr "la especificación attr no puede estar vacía"
-
-#: pathspec.c:214
-#, c-format
-msgid "invalid attribute name %s"
-msgstr "nombre de atributo %s inválido"
-
-#: pathspec.c:279
-msgid "global 'glob' and 'noglob' pathspec settings are incompatible"
-msgstr ""
-"configuraciones globales de pathspec 'glob' y 'noglob' son incompatibles"
-
-#: pathspec.c:286
-msgid ""
-"global 'literal' pathspec setting is incompatible with all other global "
-"pathspec settings"
-msgstr ""
-"la configuración global de 'literal' para patrones de ruta es incompatible "
-"con las demás configuraciones globales de patrones de ruta"
-
-#: pathspec.c:326
-msgid "invalid parameter for pathspec magic 'prefix'"
-msgstr "parámetro no válido para la magia de pathspec 'prefix'"
-
-#: pathspec.c:347
-#, c-format
-msgid "Invalid pathspec magic '%.*s' in '%s'"
-msgstr "Magia de pathspec inválida '%.*s' en '%s'"
-
-#: 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:390
-#, c-format
-msgid "Unimplemented pathspec magic '%c' in '%s'"
-msgstr "Magia de pathspec '%c' no implementada en '%s'"
-
-#: pathspec.c:449
-#, c-format
-msgid "%s: 'literal' and 'glob' are incompatible"
-msgstr "%s: 'literal' y 'glob' son incompatibles"
-
-#: pathspec.c:465
-#, c-format
-msgid "%s: '%s' is outside repository at '%s'"
-msgstr "%s: '%s' está fuera del repositorio en '%s'"
-
-#: pathspec.c:541
-#, c-format
-msgid "'%s' (mnemonic: '%c')"
-msgstr "'%s' (nemotécnico: '%c')"
-
-#: 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: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:663
-#, c-format
-msgid "line is badly quoted: %s"
-msgstr "la línea está mal entrecomillada: %s"
-
-#: pkt-line.c:92
-msgid "unable to write flush packet"
-msgstr "no es posible escribir flush packet"
-
-#: pkt-line.c:99
-msgid "unable to write delim packet"
-msgstr "no es posible escribir delim packet"
-
-#: pkt-line.c:106
-msgid "unable to write response end packet"
-msgstr "no es posible escribir paquete de respuesta final"
-
-#: pkt-line.c:113
-msgid "flush packet write failed"
-msgstr "limpieza de escritura de paquetes falló"
-
-#: pkt-line.c:153
-msgid "protocol error: impossibly long line"
-msgstr "error de protocolo: línea imposiblemente larga"
-
-#: pkt-line.c:169 pkt-line.c:171
-msgid "packet write with format failed"
-msgstr "escritura de paquetes con formato falló"
-
-#: 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"
-
-#: pkt-line.c:222
-#, c-format
-msgid "packet write failed: %s"
-msgstr "escritura de paquetes falló: %s"
-
-#: pkt-line.c:349 pkt-line.c:350
-msgid "read error"
-msgstr "error de lectura"
-
-#: 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:390 pkt-line.c:392
-#, c-format
-msgid "protocol error: bad line length character: %.4s"
-msgstr "error de protocolo: mal carácter de largo de línea: %.4s"
-
-#: 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:434 sideband.c:165
-#, c-format
-msgid "remote error: %s"
-msgstr "error remoto: %s"
-
-#: preload-index.c:125
-msgid "Refreshing index"
-msgstr "Refrescando index"
-
-#: preload-index.c:144
-#, c-format
-msgid "unable to create threaded lstat: %s"
-msgstr "no es posible crear lstat hilado: %s"
-
-#: 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 fetch"
-
-#: promisor-remote.c:38 promisor-remote.c:40
-msgid "promisor-remote: could not write to fetch subprocess"
-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 al subproceso de fetch"
-
-#: promisor-remote.c:54
-#, c-format
-msgid "promisor remote name cannot begin with '/': %s"
-msgstr "nombre remoto promisor no puede comenzar con '/': %s"
-
-#: protocol-caps.c:103
-msgid "object-info: expected flush after arguments"
-msgstr "info de objeto: se espera flush tras argumentos"
-
-#: prune-packed.c:35
-msgid "Removing duplicate objects"
-msgstr "Quitando objetos duplicados"
-
-#: range-diff.c:67
-msgid "could not start `log`"
-msgstr "no se pudo comenzar `log`"
-
-#: range-diff.c:69
-msgid "could not read `log` output"
-msgstr "no se pudo leer salida de `log`"
-
-#: 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:111
-#, c-format
-msgid ""
-"could not parse first line of `log` output: did not start with 'commit ': "
-"'%s'"
-msgstr ""
-"no se pudo leer la primera línea de salida de `log`: no comienza con 'commit "
-"': '%s'"
-
-#: range-diff.c:137
-#, c-format
-msgid "could not parse git header '%.*s'"
-msgstr "no se puede analizar git header '%.*s'"
-
-#: range-diff.c:304
-msgid "failed to generate diff"
-msgstr "falló al generar diff"
-
-#: range-diff.c:559
-msgid "--left-only and --right-only are mutually exclusive"
-msgstr "--left-only y --right-only son mutuamente exclusivas"
-
-#: range-diff.c:562 range-diff.c:564
-#, c-format
-msgid "could not parse log for '%s'"
-msgstr "no se pudo leer el log para '%s'"
-
-#: read-cache.c:710
-#, c-format
-msgid "will not add file alias '%s' ('%s' already exists in index)"
-msgstr "no agregará alias de archivo '%s' ('%s' ya existe en el índice)"
-
-#: read-cache.c:726
-msgid "cannot create an empty blob in the object database"
-msgstr "no se puede crear un blob vacío en la base de datos de objetos"
-
-#: read-cache.c:748
-#, c-format
-msgid "%s: can only add regular files, symbolic links or git-directories"
-msgstr ""
-"%s: solo se pueden agregar archivos regulares, symbolic links o git-"
-"directories"
-
-#: 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"
-
-#: read-cache.c:805
-#, c-format
-msgid "unable to index file '%s'"
-msgstr "no es posible indexar archivo '%s'"
-
-#: read-cache.c:824
-#, c-format
-msgid "unable to add '%s' to index"
-msgstr "no es posible agregar '%s' al index"
-
-#: read-cache.c:835
-#, c-format
-msgid "unable to stat '%s'"
-msgstr "incapaz de hacer stat en '%s'"
-
-#: 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:1588
-msgid "Refresh index"
-msgstr "Refrescar index"
-
-#: read-cache.c:1720
-#, c-format
-msgid ""
-"index.version set, but the value is invalid.\n"
-"Using version %i"
-msgstr ""
-"index.version configurado, pero el valor no es válido.\n"
-"Usando versión %i"
-
-#: read-cache.c:1730
-#, c-format
-msgid ""
-"GIT_INDEX_VERSION set, but the value is invalid.\n"
-"Using version %i"
-msgstr ""
-"GIT_INDEX_VERSION configurado, pero el valor no es válido.\n"
-"Usando versión %i"
-
-#: read-cache.c:1786
-#, c-format
-msgid "bad signature 0x%08x"
-msgstr "mala firma 0x%08x"
-
-#: read-cache.c:1789
-#, c-format
-msgid "bad index version %d"
-msgstr "mala versión de índice %d"
-
-#: read-cache.c:1798
-msgid "bad index file sha1 signature"
-msgstr "mala firma sha1 del archivo index"
-
-#: 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:1834
-#, c-format
-msgid "ignoring %.4s extension"
-msgstr "ignorando extensión %.4s"
-
-#: read-cache.c:1871
-#, c-format
-msgid "unknown index entry format 0x%08x"
-msgstr "formato de índice desconocido 0x%08x"
-
-#: 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:1944
-msgid "unordered stage entries in index"
-msgstr "entradas en stage desordenadas en index"
-
-#: 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:1950
-#, c-format
-msgid "unordered stage entries for '%s'"
-msgstr "entradas de stage desordenadas para '%s'"
-
-#: 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: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: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:2255
-#, c-format
-msgid "%s: index file open failed"
-msgstr "%s: falló al abrir el archivo index"
-
-#: 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:2263
-#, c-format
-msgid "%s: index file smaller than expected"
-msgstr "%s: archivo index más pequeño de lo esperado"
-
-#: 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: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: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:2375
-#, c-format
-msgid "could not freshen shared index '%s'"
-msgstr "no se pudo refrescar el índice compartido '%s'"
-
-#: 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: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:3108
-msgid "failed to convert to a sparse-index"
-msgstr "falló al convertir a un índice sparse"
-
-#: read-cache.c:3179
-#, c-format
-msgid "could not stat '%s'"
-msgstr "no se pudo hacer stat en '%s'"
-
-#: 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:3204
-#, c-format
-msgid "unable to unlink: %s"
-msgstr "no es posible eliminar el vinculo: %s"
-
-#: 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:3390
-#, c-format
-msgid "%s: cannot drop to stage #0"
-msgstr "%s: no se puede eliminar hasta stage #0"
-
-#: rebase-interactive.c:11
-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 ""
-"Se puede arreglar esto con 'git rebase --edit-todo' y después ejecuta 'git "
-"rebase --continue'.\n"
-"O se puede abortar el rebase con 'git rebase --abort'.\n"
-
-#: rebase-interactive.c:33
-#, c-format
-msgid ""
-"unrecognized setting %s for option rebase.missingCommitsCheck. Ignoring."
-msgstr ""
-"opción %s no reconocida para la opción rebase.missingCommitsCheck. Ignorando."
-
-#: rebase-interactive.c:42
-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 [-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"
-"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"
-"\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> = 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"
-".       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"
-"Estas líneas pueden ser reordenadas; son ejecutadas desde arriba hacia "
-"abajo.\n"
-
-#: rebase-interactive.c:66
-#, c-format
-msgid "Rebase %s onto %s (%d command)"
-msgid_plural "Rebase %s onto %s (%d commands)"
-msgstr[0] "Rebase %s en %s (%d comando)"
-msgstr[1] "Rebase %s en %s (%d comandos)"
-
-#: rebase-interactive.c:75
-msgid ""
-"\n"
-"Do not remove any line. Use 'drop' explicitly to remove a commit.\n"
-msgstr ""
-"\n"
-"No elimines ninguna línea. Usa 'drop' explícitamente para borrar un commit.\n"
-
-#: rebase-interactive.c:78
-msgid ""
-"\n"
-"If you remove a line here THAT COMMIT WILL BE LOST.\n"
-msgstr ""
-"\n"
-"Si eliminas una línea aquí EL COMMIT SE PERDERÁ.\n"
-
-#: rebase-interactive.c:84
-msgid ""
-"\n"
-"You are editing the todo file of an ongoing interactive rebase.\n"
-"To continue rebase after editing, run:\n"
-"    git rebase --continue\n"
-"\n"
-msgstr ""
-"\n"
-"Estás editando el archivo TODO de un rebase interactivo.\n"
-"Para continuar el rebase después de editar, ejecuta:\n"
-"    git rebase --continue\n"
-"\n"
-
-#: rebase-interactive.c:89
-msgid ""
-"\n"
-"However, if you remove everything, the rebase will be aborted.\n"
-"\n"
-msgstr ""
-"\n"
-"Como sea, si quieres borrar todo, el rebase será abortado.\n"
-"\n"
-
-#: 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
-#, c-format
-msgid "could not write '%s'."
-msgstr "no se pudo escribir '%s'."
-
-#: rebase-interactive.c:196
-#, c-format
-msgid ""
-"Warning: some commits may have been dropped accidentally.\n"
-"Dropped commits (newer to older):\n"
-msgstr ""
-"Peligro: algunos commits pueden haber sido descartados de forma accidental.\n"
-"Commits descartados (empezando con el más nuevo):\n"
-
-#: rebase-interactive.c:203
-#, c-format
-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"
-"The possible behaviours are: ignore, warn, error.\n"
-"\n"
-msgstr ""
-"Para evitar este mensaje, usa \"drop\" para eliminar de forma explícita un "
-"commit.\n"
-"\n"
-"Usa 'git config rebase.missingCommitsCheck' para cambiar el nivel de "
-"advertencias.\n"
-"Los posibles comportamientos son: ignore, warn, error.\n"
-"\n"
-
-#: rebase.c:29
-#, c-format
-msgid "%s: 'preserve' superseded by 'merges'"
-msgstr "%s: 'preserve' es supercedido por 'merges'"
-
-#: ref-filter.c:42 wt-status.c:2036
-msgid "gone"
-msgstr "desaparecido"
-
-#: ref-filter.c:43
-#, c-format
-msgid "ahead %d"
-msgstr "adelante %d"
-
-#: ref-filter.c:44
-#, c-format
-msgid "behind %d"
-msgstr "detrás %d"
-
-#: ref-filter.c:45
-#, c-format
-msgid "ahead %d, behind %d"
-msgstr "delante %d, detrás %d"
-
-#: ref-filter.c:235
-#, c-format
-msgid "expected format: %%(color:<color>)"
-msgstr "formato esperado: %%(color:<color>)"
-
-#: ref-filter.c:237
-#, c-format
-msgid "unrecognized color: %%(color:%s)"
-msgstr "color no reconocido: %%(color:%s)"
-
-#: ref-filter.c:259
-#, c-format
-msgid "Integer value expected refname:lstrip=%s"
-msgstr "Valor entero esperado refname:lstrip=%s"
-
-#: ref-filter.c:263
-#, c-format
-msgid "Integer value expected refname:rstrip=%s"
-msgstr "Valor entero esperado refname:rstrip=%s"
-
-#: ref-filter.c:265
-#, c-format
-msgid "unrecognized %%(%s) argument: %s"
-msgstr "argumento %%(%s) no reconocido: %s"
-
-#: ref-filter.c:320
-#, c-format
-msgid "%%(objecttype) does not take arguments"
-msgstr "%%(objecttype) no toma ningún argumento"
-
-#: ref-filter.c:344
-#, c-format
-msgid "unrecognized %%(objectsize) argument: %s"
-msgstr "argumento %%(objectsize) no reconocido: %s"
-
-#: ref-filter.c:352
-#, c-format
-msgid "%%(deltabase) does not take arguments"
-msgstr "%%(deltabase) no toma argumentos"
-
-#: ref-filter.c:364
-#, c-format
-msgid "%%(body) does not take arguments"
-msgstr "%%(body) no toma ningún argumento"
-
-#: ref-filter.c:377
-#, c-format
-msgid "unrecognized %%(subject) argument: %s"
-msgstr "argumento %%(subject) no reconocido: %s"
-
-#: ref-filter.c:396
-#, c-format
-msgid "expected %%(trailers:key=<value>)"
-msgstr "se esperaba %%(trailers:key=<value>)"
-
-#: ref-filter.c:398
-#, c-format
-msgid "unknown %%(trailers) argument: %s"
-msgstr "argumento %%(trailers) desconocido: %s"
-
-#: ref-filter.c:429
-#, c-format
-msgid "positive value expected contents:lines=%s"
-msgstr "valor positivo esperado contents:lines=%s"
-
-#: ref-filter.c:431
-#, c-format
-msgid "unrecognized %%(contents) argument: %s"
-msgstr "argumento %%(contents) no reconocido: %s"
-
-#: 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:462
-#, c-format
-msgid "unrecognized argument '%s' in %%(%s)"
-msgstr "argumento '%s' no reconocido en %%(%s)"
-
-#: ref-filter.c:476
-#, c-format
-msgid "unrecognized email option: %s"
-msgstr "opción de email desconocida: %s"
-
-#: ref-filter.c:506
-#, c-format
-msgid "expected format: %%(align:<width>,<position>)"
-msgstr "formato esperado: %%(align:<ancho>,<posición>)"
-
-#: ref-filter.c:518
-#, c-format
-msgid "unrecognized position:%s"
-msgstr "posición desconocida: %s"
-
-#: ref-filter.c:525
-#, c-format
-msgid "unrecognized width:%s"
-msgstr "ancho desconocido: %s"
-
-#: ref-filter.c:534
-#, c-format
-msgid "unrecognized %%(align) argument: %s"
-msgstr "argumento no reconocido para %%(align): %s"
-
-#: 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:560
-#, c-format
-msgid "unrecognized %%(if) argument: %s"
-msgstr "argumento %%(if) no reconocido: %s"
-
-#: 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:707
-#, c-format
-msgid "unknown field name: %.*s"
-msgstr "nombre de campo desconocido: %.*s"
-
-#: ref-filter.c:711
-#, c-format
-msgid ""
-"not a git repository, but the field '%.*s' requires access to object data"
-msgstr ""
-"no es un repositorio git, pero el campo '%.*s' requiere acceso a los datos "
-"de objeto"
-
-#: 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:910
-#, c-format
-msgid "format: %%(then) atom used without an %%(if) atom"
-msgstr "formato: átomo %%(then) usado sin átomo %%(if)"
-
-#: 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:914
-#, c-format
-msgid "format: %%(then) atom used after %%(else)"
-msgstr "formato: átomo %%(then) usado después de %%(else)"
-
-#: 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:948
-#, c-format
-msgid "format: %%(else) atom used without a %%(then) atom"
-msgstr "formato: átomo %%(else) usado sin un átomo %%(then)"
-
-#: 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:965
-#, c-format
-msgid "format: %%(end) atom used without corresponding atom"
-msgstr "formato: átomo %%(end) usado sin átomo correspondiente"
-
-#: ref-filter.c:1027
-#, c-format
-msgid "malformed format string %s"
-msgstr "formato de cadena mal formado %s"
-
-#: 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:1709
-#, c-format
-msgid "(no branch, rebasing detached HEAD %s)"
-msgstr "(no hay rama, rebasando con HEAD desacoplado %s)"
-
-#: 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:1716
-#, c-format
-msgid "(HEAD detached at %s)"
-msgstr "(HEAD desacoplado en %s)"
-
-#: ref-filter.c:1719
-#, c-format
-msgid "(HEAD detached from %s)"
-msgstr "(HEAD desacoplado de %s)"
-
-#: ref-filter.c:1722
-msgid "(no branch)"
-msgstr "(sin rama)"
-
-#: 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:1764
-#, c-format
-msgid "parse_object_buffer failed on %s for %s"
-msgstr "parse_object_buffer falló en %s para %s"
-
-#: ref-filter.c:2155
-#, c-format
-msgid "malformed object at '%s'"
-msgstr "objeto mal formado en '%s'"
-
-#: ref-filter.c:2245
-#, c-format
-msgid "ignoring ref with broken name %s"
-msgstr "ignorando referencia con nombre roto %s"
-
-#: ref-filter.c:2250 refs.c:673
-#, c-format
-msgid "ignoring broken ref %s"
-msgstr "ignorando referencia rota %s"
-
-#: ref-filter.c:2623
-#, c-format
-msgid "format: %%(end) atom missing"
-msgstr "formato: falta átomo %%(end)"
-
-#: ref-filter.c:2726
-#, c-format
-msgid "malformed object name %s"
-msgstr "nombre de objeto mal formado %s"
-
-#: 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:261
-#, c-format
-msgid "%s does not point to a valid object!"
-msgstr "¡%s no apunta a ningún objeto válido!"
-
-#: refs.c:563
-#, 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"
-"of your new repositories, which will suppress this warning, call:\n"
-"\n"
-"\tgit config --global init.defaultBranch <name>\n"
-"\n"
-"Names commonly chosen instead of 'master' are 'main', 'trunk' and\n"
-"'development'. The just-created branch can be renamed via this command:\n"
-"\n"
-"\tgit branch -m <name>\n"
-msgstr ""
-"Usando '%s' como el nombre de la rama inicial. Este nombre de rama "
-"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, llama a:\n"
-"\n"
-"\tgit config --global init.defaultBranch <nombre>\n"
-"\n"
-"Los nombres comúnmente elegidos en lugar de 'master' son 'main', 'trunk' y\n"
-"'development'. Se puede cambiar el nombre de la rama recién creada mediante "
-"este comando:\n"
-"\n"
-"\tgit branch -m <nombre>\n"
-
-#: refs.c:585
-#, c-format
-msgid "could not retrieve `%s`"
-msgstr "no se pudo recibir `%s`"
-
-#: refs.c:595
-#, c-format
-msgid "invalid branch name: %s = %s"
-msgstr "nombre de rama inválido: %s = %s"
-
-#: refs.c:671
-#, c-format
-msgid "ignoring dangling symref %s"
-msgstr "ignorando referencia symbólica rota %s"
-
-#: 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:927
-#, c-format
-msgid "log for ref %s unexpectedly ended on %s"
-msgstr "log de ref %s finalizado inesperadamente en %s"
-
-#: refs.c:992
-#, c-format
-msgid "log for %s is empty"
-msgstr "log de %s está vacío"
-
-#: refs.c:1084
-#, c-format
-msgid "refusing to update ref with bad name '%s'"
-msgstr "rehusando actualizar ref con mal nombre '%s'"
-
-#: refs.c:1155
-#, c-format
-msgid "update_ref failed for ref '%s': %s"
-msgstr "update_ref falló para ref '%s': %s"
-
-#: 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:2142
-msgid "ref updates forbidden inside quarantine environment"
-msgstr "actualizaciones de ref prohibidas dentro de ambiente de cuarentena"
-
-#: refs.c:2153
-msgid "ref updates aborted by hook"
-msgstr "ref updates abortados por el hook"
-
-#: refs.c:2253 refs.c:2283
-#, c-format
-msgid "'%s' exists; cannot create '%s'"
-msgstr "'%s' existe; no se puede crear '%s'"
-
-#: 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:1271
-#, c-format
-msgid "could not remove reference %s"
-msgstr "no se pudo eliminar la referencia %s"
-
-#: 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:1288 refs/packed-backend.c:1562
-#, c-format
-msgid "could not delete references: %s"
-msgstr "no se pudo eliminar las referencias: %s"
-
-#: refspec.c:170
-#, c-format
-msgid "invalid refspec '%s'"
-msgstr "refspec inválido: '%s'"
-
-#: remote.c:351
-#, c-format
-msgid "config remote shorthand cannot begin with '/': %s"
-msgstr "config remote shorthand no puede comenzar con '/': %s"
-
-#: remote.c:399
-msgid "more than one receivepack given, using the first"
-msgstr "más de un receivepack dado, usando el primero"
-
-#: remote.c:407
-msgid "more than one uploadpack given, using the first"
-msgstr "más de un uploadpack dado, usando el primero"
-
-#: remote.c:590
-#, c-format
-msgid "Cannot fetch both %s and %s to %s"
-msgstr "No se pueden traer ambos %s y %s a %s"
-
-#: remote.c:594
-#, c-format
-msgid "%s usually tracks %s, not %s"
-msgstr "%s por lo general hace seguimiento a %s, no a %s"
-
-#: remote.c:598
-#, c-format
-msgid "%s tracks both %s and %s"
-msgstr "%s hace seguimiento tanto a %s como a %s"
-
-#: remote.c:666
-#, c-format
-msgid "key '%s' of pattern had no '*'"
-msgstr "llave '%s' de patrón no tuvo '*'"
-
-#: remote.c:676
-#, c-format
-msgid "value '%s' of pattern has no '*'"
-msgstr "valor '%s' del patrón no tiene '*'"
-
-#: remote.c:1083
-#, c-format
-msgid "src refspec %s does not match any"
-msgstr "src refspec %s no concuerda con ninguno"
-
-#: remote.c:1088
-#, c-format
-msgid "src refspec %s matches more than one"
-msgstr "src refspec %s concuerda con más de uno"
-
-#. TRANSLATORS: "matches '%s'%" is the <dst> part of "git push
-#. <remote> <src>:<dst>" push, and "being pushed ('%s')" is
-#. the <src>.
-#.
-#: remote.c:1103
-#, c-format
-msgid ""
-"The destination you provided is not a full refname (i.e.,\n"
-"starting with \"refs/\"). We tried to guess what you meant by:\n"
-"\n"
-"- Looking for a ref that matches '%s' on the remote side.\n"
-"- Checking if the <src> being pushed ('%s')\n"
-"  is a ref in \"refs/{heads,tags}/\". If so we add a corresponding\n"
-"  refs/{heads,tags}/ prefix on the remote side.\n"
-"\n"
-"Neither worked, so we gave up. You must fully qualify the ref."
-msgstr ""
-"El destino que has provisto no es un full refname (i.e.,\n"
-"uno que comience con \"refs/\"). Intentamos adivinar lo que quisiste decir:\n"
-"\n"
-"- Buscando un ref que concuerde con '%s' en el lado remoto.\n"
-"- Revisando si el <src> es usado en el push('%s')\n"
-"  es un ref en \"refs/{heads,tags}/\". Si es así, agregamos el prefijo\n"
-"  refs/{heads,tags}/ correspondiente al lado remoto.\n"
-"\n"
-"Ninguno funcionó así que nos dimos por vencidos. Tienes que especificar el "
-"full ref."
-
-#: remote.c:1123
-#, c-format
-msgid ""
-"The <src> part of the refspec is a commit object.\n"
-"Did you mean to create a new branch by pushing to\n"
-"'%s:refs/heads/%s'?"
-msgstr ""
-"La parte <src> del refspec es un objeto commit.\n"
-"¿Quisiste crear un branch nuevo mediante un push a\n"
-"'%s:refs/heads/%s'?"
-
-#: remote.c:1128
-#, c-format
-msgid ""
-"The <src> part of the refspec is a tag object.\n"
-"Did you mean to create a new tag by pushing to\n"
-"'%s:refs/tags/%s'?"
-msgstr ""
-"La parte <src> del refspec es un objeto etiqueta.\n"
-"¿Quisiste crear una etiqueta nueva mediante un push a\n"
-"'%s:refs/tags/%s'?"
-
-#: remote.c:1133
-#, c-format
-msgid ""
-"The <src> part of the refspec is a tree object.\n"
-"Did you mean to tag a new tree by pushing to\n"
-"'%s:refs/tags/%s'?"
-msgstr ""
-"La parte <src> del refspec es un objeto tree.\n"
-"¿Quisiste crear un tag nuevo mediante un push a\n"
-"'%s:refs/tags/%s'?"
-
-#: remote.c:1138
-#, c-format
-msgid ""
-"The <src> part of the refspec is a blob object.\n"
-"Did you mean to tag a new blob by pushing to\n"
-"'%s:refs/tags/%s'?"
-msgstr ""
-"La parte <src> del refspec es un objeto blob.\n"
-"¿Quisiste crear un tag nuevo mediante un push a\n"
-"'%s:refs/tags/%s'?"
-
-#: remote.c:1174
-#, c-format
-msgid "%s cannot be resolved to branch"
-msgstr "%s no puede ser resuelto a un branch"
-
-#: remote.c:1185
-#, c-format
-msgid "unable to delete '%s': remote ref does not exist"
-msgstr "no es posible borrar '%s': ref remoto no existe"
-
-#: remote.c:1197
-#, c-format
-msgid "dst refspec %s matches more than one"
-msgstr "dst refspec %s concuerda con más de uno"
-
-#: remote.c:1204
-#, c-format
-msgid "dst ref %s receives from more than one src"
-msgstr "dst ref %s recibe de más de un src"
-
-#: remote.c:1724 remote.c:1825
-msgid "HEAD does not point to a branch"
-msgstr "HEAD no apunta a ninguna rama"
-
-#: remote.c:1733
-#, c-format
-msgid "no such branch: '%s'"
-msgstr "no existe tal rama: '%s'"
-
-#: remote.c:1736
-#, c-format
-msgid "no upstream configured for branch '%s'"
-msgstr "no se ha configurado upstream para la rama '%s'"
-
-#: remote.c:1742
-#, c-format
-msgid "upstream branch '%s' not stored as a remote-tracking branch"
-msgstr "la rama '%s' de upstream no es guardada como rama de rastreo remoto"
-
-#: remote.c:1757
-#, c-format
-msgid "push destination '%s' on remote '%s' has no local tracking branch"
-msgstr ""
-"destino de push '%s' en el remoto '%s' no tiene una rama de rastreo local"
-
-#: remote.c:1769
-#, c-format
-msgid "branch '%s' has no remote for pushing"
-msgstr "la rama '%s' no tiene remoto para enviar"
-
-#: remote.c:1779
-#, c-format
-msgid "push refspecs for '%s' do not include '%s'"
-msgstr "refspecs del push para '%s' no incluyen '%s'"
-
-#: remote.c:1792
-msgid "push has no destination (push.default is 'nothing')"
-msgstr "push no tiene destino (push.default es 'nothing')"
-
-#: remote.c:1814
-msgid "cannot resolve 'simple' push to a single destination"
-msgstr "no se puede resolver push 'simple' para un destino único"
-
-#: remote.c:1943
-#, c-format
-msgid "couldn't find remote ref %s"
-msgstr "no se pudo encontrar ref remota %s"
-
-#: remote.c:1956
-#, c-format
-msgid "* Ignoring funny ref '%s' locally"
-msgstr "* Ignorando ref extraña '%s' localmente"
-
-#: remote.c:2119
-#, c-format
-msgid "Your branch is based on '%s', but the upstream is gone.\n"
-msgstr "Tu rama está basada en '%s', pero upstream ha desaparecido.\n"
-
-#: remote.c:2123
-msgid "  (use \"git branch --unset-upstream\" to fixup)\n"
-msgstr "  (usa \"git branch --unset-upstream\" para arreglar)\n"
-
-#: remote.c:2126
-#, c-format
-msgid "Your branch is up to date with '%s'.\n"
-msgstr "Tu rama está actualizada con '%s'.\n"
-
-#: remote.c:2130
-#, c-format
-msgid "Your branch and '%s' refer to different commits.\n"
-msgstr "Tu rama y '%s' refieren a commits diferentes.\n"
-
-#: remote.c:2133
-#, c-format
-msgid "  (use \"%s\" for details)\n"
-msgstr "  (usa \"%s\" para detalles)\n"
-
-#: remote.c:2137
-#, c-format
-msgid "Your branch is ahead of '%s' by %d commit.\n"
-msgid_plural "Your branch is ahead of '%s' by %d commits.\n"
-msgstr[0] "Tu rama está adelantada a '%s' por %d commit.\n"
-msgstr[1] "Tu rama está adelantada a '%s' por %d commits.\n"
-
-#: remote.c:2143
-msgid "  (use \"git push\" to publish your local commits)\n"
-msgstr "  (usa \"git push\" para publicar tus commits locales)\n"
-
-#: remote.c:2146
-#, c-format
-msgid "Your branch is behind '%s' by %d commit, and can be fast-forwarded.\n"
-msgid_plural ""
-"Your branch is behind '%s' by %d commits, and can be fast-forwarded.\n"
-msgstr[0] ""
-"Tu rama está detrás de '%s' por %d commit, y puede ser avanzada rápido.\n"
-msgstr[1] ""
-"Tu rama está detrás de '%s' por %d commits, y puede ser avanzada rápido.\n"
-
-#: remote.c:2154
-msgid "  (use \"git pull\" to update your local branch)\n"
-msgstr "  (usa \"git pull\" para actualizar tu rama local)\n"
-
-#: remote.c:2157
-#, c-format
-msgid ""
-"Your branch and '%s' have diverged,\n"
-"and have %d and %d different commit each, respectively.\n"
-msgid_plural ""
-"Your branch and '%s' have diverged,\n"
-"and have %d and %d different commits each, respectively.\n"
-msgstr[0] ""
-"Tu rama y '%s' han divergido,\n"
-"y tienen %d y %d commits diferentes cada una respectivamente.\n"
-msgstr[1] ""
-"Tu rama y '%s' han divergido,\n"
-"y tienen %d y %d commits diferentes cada una respectivamente.\n"
-
-#: remote.c:2167
-msgid "  (use \"git pull\" to merge the remote branch into yours)\n"
-msgstr "  (usa \"git pull\" para fusionar la rama remota en la tuya)\n"
-
-#: remote.c:2359
-#, c-format
-msgid "cannot parse expected object name '%s'"
-msgstr "no se puede leer el nombre de objeto '%s'"
-
-#: replace-object.c:21
-#, c-format
-msgid "bad replace ref name: %s"
-msgstr "mal nombre de ref de reemplazo: %s"
-
-#: replace-object.c:30
-#, c-format
-msgid "duplicate replace ref: %s"
-msgstr "duplicar ref de reemplazo: %s"
-
-#: replace-object.c:82
-#, c-format
-msgid "replace depth too high for object %s"
-msgstr "profundidad de reemplazo demasiada para objeto %s"
-
-#: rerere.c:201 rerere.c:210 rerere.c:213
-msgid "corrupt MERGE_RR"
-msgstr "MERGE_RR corrupto"
-
-#: rerere.c:248 rerere.c:253
-msgid "unable to write rerere record"
-msgstr "incapaz de escribir entrada rerere"
-
-#: rerere.c:479
-#, c-format
-msgid "there were errors while writing '%s' (%s)"
-msgstr "hubieron errores mientras se escribía '%s' (%s)"
-
-#: rerere.c:482 builtin/gc.c:2246 builtin/gc.c:2281
-#, c-format
-msgid "failed to flush '%s'"
-msgstr "falló al hacer flush '%s'"
-
-#: rerere.c:487 rerere.c:1023
-#, c-format
-msgid "could not parse conflict hunks in '%s'"
-msgstr "no se pudo analizar hunks en conflicto en '%s'"
-
-#: rerere.c:668
-#, c-format
-msgid "failed utime() on '%s'"
-msgstr "falló utime() en '%s'"
-
-#: rerere.c:678
-#, c-format
-msgid "writing '%s' failed"
-msgstr "escribiendo '%s' falló"
-
-#: rerere.c:698
-#, c-format
-msgid "Staged '%s' using previous resolution."
-msgstr "'%s' puesto en stage usando resolución previa."
-
-#: rerere.c:737
-#, c-format
-msgid "Recorded resolution for '%s'."
-msgstr "Resolución guardada para '%s'."
-
-#: rerere.c:772
-#, c-format
-msgid "Resolved '%s' using previous resolution."
-msgstr "'%s' resuelto usando resolución previa."
-
-#: rerere.c:787
-#, c-format
-msgid "cannot unlink stray '%s'"
-msgstr "no se puede desvincular stray '%s'"
-
-#: rerere.c:791
-#, c-format
-msgid "Recorded preimage for '%s'"
-msgstr "Preimagen grabada para '%s'"
-
-#: 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'"
-
-#: rerere.c:1041
-#, c-format
-msgid "failed to update conflicted state in '%s'"
-msgstr "falló al actualizar estado conflictivo en '%s'"
-
-#: rerere.c:1052 rerere.c:1059
-#, c-format
-msgid "no remembered resolution for '%s'"
-msgstr "resolución para '%s' no recordada"
-
-#: rerere.c:1061
-#, c-format
-msgid "cannot unlink '%s'"
-msgstr "no se puede desvincular '%s'"
-
-#: rerere.c:1071
-#, c-format
-msgid "Updated preimage for '%s'"
-msgstr "Preimagen actualizada para '%s'"
-
-#: rerere.c:1080
-#, c-format
-msgid "Forgot resolution for '%s'\n"
-msgstr "Se olvidó resolución para '%s'\n"
-
-#: rerere.c:1191
-msgid "unable to open rr-cache directory"
-msgstr "no es posible abrir directorio rr-cache"
-
-#: reset.c:42
-msgid "could not determine HEAD revision"
-msgstr "no se pudo determinar revisión HEAD"
-
-#: 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: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: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: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: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:1278
-#, c-format
-msgid "cannot create async thread: %s"
-msgstr "no es posible crear hilo async: %s"
-
-#: send-pack.c:150
-msgid "unexpected flush packet while reading remote unpack status"
-msgstr ""
-"flush packet inesperado mientras se leía estatus de desempaquetado remoto"
-
-#: send-pack.c:152
-#, c-format
-msgid "unable to parse remote unpack status: %s"
-msgstr "no es posible analizar el estado de desempaquetado remoto: %s"
-
-#: send-pack.c:154
-#, c-format
-msgid "remote unpack failed: %s"
-msgstr "desempaquetado remoto falló: %s"
-
-#: send-pack.c:378
-msgid "failed to sign the push certificate"
-msgstr "falló al firmar el certificado de push"
-
-#: 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:457
-msgid "push negotiation failed; proceeding anyway with push"
-msgstr "negociación push falló; procediendo con el push de todas formas"
-
-#: 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:537
-msgid "the receiving end does not support --signed push"
-msgstr "el final receptor no soporta push --signed"
-
-#: send-pack.c:539
-msgid ""
-"not sending a push certificate since the receiving end does not support --"
-"signed push"
-msgstr ""
-"no se manda un certificado de push ya que el destino no soporta push firmado "
-"(--signed)"
-
-#: 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:551
-msgid "the receiving end does not support push options"
-msgstr "el destino no soporta opciones de push"
-
-#: sequencer.c:197
-#, c-format
-msgid "invalid commit message cleanup mode '%s'"
-msgstr "mensaje de commit inválido, modo cleanup '%s'"
-
-#: sequencer.c:325
-#, c-format
-msgid "could not delete '%s'"
-msgstr "no se pudo borrar '%s'"
-
-#: 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:355
-msgid "revert"
-msgstr "revertir"
-
-#: sequencer.c:357
-msgid "cherry-pick"
-msgstr "cherry-pick"
-
-#: sequencer.c:359
-msgid "rebase"
-msgstr "rebase"
-
-#: sequencer.c:361
-#, c-format
-msgid "unknown action: %d"
-msgstr "acción desconocida: %d"
-
-#: sequencer.c:420
-msgid ""
-"after resolving the conflicts, mark the corrected paths\n"
-"with 'git add <paths>' or 'git rm <paths>'"
-msgstr ""
-"después de resolver los conflictos, marca las rutas corregidas\n"
-"con 'git add <rutas>' o 'git rm <rutas>'"
-
-#: sequencer.c:423
-msgid ""
-"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 ""
-"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: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: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:455
-#, c-format
-msgid "could not write eol to '%s'"
-msgstr "no se pudo escribir EOL en '%s'"
-
-#: 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:499
-#, c-format
-msgid "your local changes would be overwritten by %s."
-msgstr "tus cambios locales serán sobreescritos por %s."
-
-#: 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:535
-#, c-format
-msgid "%s: fast-forward"
-msgstr "%s: avance rápido"
-
-#: sequencer.c:574 builtin/tag.c:610
-#, c-format
-msgid "Invalid cleanup mode %s"
-msgstr "Modo cleanup inválido %s"
-
-#. TRANSLATORS: %s will be "revert", "cherry-pick" or
-#. "rebase".
-#.
-#: sequencer.c:685
-#, c-format
-msgid "%s: Unable to write new index file"
-msgstr "%s: Incapaz de escribir el nuevo archivo índice"
-
-#: sequencer.c:699
-msgid "unable to update cache tree"
-msgstr "no es posible actualizar el árbol de caché"
-
-#: sequencer.c:713
-msgid "could not resolve HEAD commit"
-msgstr "no se pudo resolver el commit de HEAD"
-
-#: sequencer.c:793
-#, c-format
-msgid "no key present in '%.*s'"
-msgstr "no hay llave presente en '%.*s'"
-
-#: sequencer.c:804
-#, c-format
-msgid "unable to dequote value of '%s'"
-msgstr "no es posible dequote valor de '%s'"
-
-#: 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:851
-msgid "'GIT_AUTHOR_NAME' already given"
-msgstr "'GIT_AUTHOR_NAME' ya proporcionado"
-
-#: sequencer.c:856
-msgid "'GIT_AUTHOR_EMAIL' already given"
-msgstr "'GIT_AUTHOR_EMAIL' ya proporcionado"
-
-#: sequencer.c:861
-msgid "'GIT_AUTHOR_DATE' already given"
-msgstr "'GIT_AUTHOR_DATE' ya proporcionado"
-
-#: sequencer.c:865
-#, c-format
-msgid "unknown variable '%s'"
-msgstr "variable desconocida '%s'"
-
-#: sequencer.c:870
-msgid "missing 'GIT_AUTHOR_NAME'"
-msgstr "falta 'GIT_AUTHOR_NAME'"
-
-#: sequencer.c:872
-msgid "missing 'GIT_AUTHOR_EMAIL'"
-msgstr "falta 'GIT_AUTHOR_EMAIL'"
-
-#: sequencer.c:874
-msgid "missing 'GIT_AUTHOR_DATE'"
-msgstr "falta 'GIT_AUTHOR_DATE'"
-
-#: sequencer.c:939
-#, c-format
-msgid ""
-"you have staged changes in your working tree\n"
-"If these changes are meant to be squashed into the previous commit, run:\n"
-"\n"
-"  git commit --amend %s\n"
-"\n"
-"If they are meant to go into a new commit, run:\n"
-"\n"
-"  git commit %s\n"
-"\n"
-"In both cases, once you're done, continue with:\n"
-"\n"
-"  git rebase --continue\n"
-msgstr ""
-"se ha aplicado un stage a los cambios en el árbol de trabajo\n"
-"si estos cambios están destinados a ser aplastados en el commit previo, "
-"ejecuta:\n"
-"\n"
-"  git commit --amend %s\n"
-"\n"
-"Si estos cambios están destinados a un nuevo commit, ejecuta:\n"
-"\n"
-"  git commit %s\n"
-"\n"
-"en ambos casos, cuando acabes, continúa con:\n"
-"\n"
-"  git rebase --continue\n"
-
-#: sequencer.c:1229
-msgid "'prepare-commit-msg' hook failed"
-msgstr "hook 'prepare-commit-msg' falló"
-
-#: 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"
-"You can suppress this message by setting them explicitly. Run the\n"
-"following command and follow the instructions in your editor to edit\n"
-"your configuration file:\n"
-"\n"
-"    git config --global --edit\n"
-"\n"
-"After doing this, you may fix the identity used for this commit with:\n"
-"\n"
-"    git commit --amend --reset-author\n"
-msgstr ""
-"Tu nombre y correo fueron configurados automáticamente basados\n"
-"en tu usuario y nombre de host. Por favor verifica que sean correctos.\n"
-"Tú puedes suprimir este mensaje configurándolos de forma explícita. Ejecuta "
-"el\n"
-"siguiente comando y sigue las instrucciones de tu editor\n"
-" para modificar tu archivo de configuración:\n"
-"\n"
-"    git config --global --edit\n"
-"\n"
-"Tras hacer esto, puedes arreglar la identidad usada para este commit con:\n"
-"\n"
-"    git commit --amend --reset-author\n"
-
-#: 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"
-"You can suppress this message by setting them explicitly:\n"
-"\n"
-"    git config --global user.name \"Your Name\"\n"
-"    git config --global user.email you@example.com\n"
-"\n"
-"After doing this, you may fix the identity used for this commit with:\n"
-"\n"
-"    git commit --amend --reset-author\n"
-msgstr ""
-"Tu nombre y correo fueron configurados automáticamente basados\n"
-"en tu usuario y nombre de host. Por favor verifica que sean correctos.\n"
-"Tú puedes suprimir este mensaje configurándolos de forma explícita:\n"
-"\n"
-"    git config --global user.name \"Tu nombre\"\n"
-"    git config --global user.email you@example.com\n"
-"\n"
-"Tras hacer esto, puedes arreglar tu identidad para este commit con:\n"
-"\n"
-"    git commit --amend --reset-author\n"
-
-#: sequencer.c:1290
-msgid "couldn't look up newly created commit"
-msgstr "no se pudo revisar el commit recién creado"
-
-#: sequencer.c:1292
-msgid "could not parse newly created commit"
-msgstr "no se pudo analizar el commit recién creado"
-
-#: sequencer.c:1338
-msgid "unable to resolve HEAD after creating commit"
-msgstr "no se pudo resolver HEAD tras crear el commit"
-
-#: sequencer.c:1340
-msgid "detached HEAD"
-msgstr "HEAD desacoplado"
-
-#: sequencer.c:1344
-msgid " (root-commit)"
-msgstr " (commit-raíz)"
-
-#: sequencer.c:1365
-msgid "could not parse HEAD"
-msgstr "no se pudo analizar HEAD"
-
-#: sequencer.c:1367
-#, c-format
-msgid "HEAD %s is not a commit!"
-msgstr "¡HEAD %s no es un commit!"
-
-#: 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:1427 sequencer.c:2312
-msgid "unable to parse commit author"
-msgstr "no es posible analizar el autor del commit"
-
-#: 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: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:1502 sequencer.c:1534
-#, c-format
-msgid "invalid author identity '%s'"
-msgstr "identidad de autor inválida '%s'"
-
-#: sequencer.c:1508
-msgid "corrupt author: missing date information"
-msgstr "autor corrupto: falta información de fecha"
-
-#: 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: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:1623
-#, c-format
-msgid "could not parse commit %s"
-msgstr "no se pudo analizar commit %s"
-
-#: sequencer.c:1628
-#, c-format
-msgid "could not parse parent commit %s"
-msgstr "no se pudo analizar el commit padre %s"
-
-#: sequencer.c:1711 sequencer.c:1992
-#, c-format
-msgid "unknown command: %d"
-msgstr "comando desconocido: %d"
-
-#: sequencer.c:1753
-msgid "This is the 1st commit message:"
-msgstr "Este es el mensaje del 1er commit:"
-
-#: sequencer.c:1754
-#, c-format
-msgid "This is the commit message #%d:"
-msgstr "Este es el mensaje del commit #%d:"
-
-#: sequencer.c:1755
-msgid "The 1st commit message will be skipped:"
-msgstr "El mensaje del 1er commit será saltado:"
-
-#: sequencer.c:1756
-#, c-format
-msgid "The commit message #%d will be skipped:"
-msgstr "El mensaje del commit #%d será saltado:"
-
-#: sequencer.c:1757
-#, c-format
-msgid "This is a combination of %d commits."
-msgstr "Esta es una combinación de %d commits."
-
-#: sequencer.c:1904 sequencer.c:1961
-#, c-format
-msgid "cannot write '%s'"
-msgstr "no se puede escribir '%s'"
-
-#: sequencer.c:1951
-msgid "need a HEAD to fixup"
-msgstr "se necesita un HEAD para arreglar"
-
-#: sequencer.c:1953 sequencer.c:3601
-msgid "could not read HEAD"
-msgstr "no se pudo leer HEAD"
-
-#: sequencer.c:1955
-msgid "could not read HEAD's commit message"
-msgstr "no se pudo leer el mensaje de commit de HEAD"
-
-#: 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:2089
-msgid "your index file is unmerged."
-msgstr "tu archivo índice no está fusionado."
-
-#: sequencer.c:2096
-msgid "cannot fixup root commit"
-msgstr "no se puede arreglar el commit raíz"
-
-#: 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: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: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:2156
-#, c-format
-msgid "%s: cannot parse parent commit %s"
-msgstr "%s: no se puede analizar el commit padre %s"
-
-#: sequencer.c:2222
-#, c-format
-msgid "could not rename '%s' to '%s'"
-msgstr "no se puede renombrar '%s' a '%s'"
-
-#: sequencer.c:2282
-#, c-format
-msgid "could not revert %s... %s"
-msgstr "no se pudo revertir %s... %s"
-
-#: sequencer.c:2283
-#, c-format
-msgid "could not apply %s... %s"
-msgstr "no se pudo aplicar %s... %s"
-
-#: 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:2362
-#, c-format
-msgid "git %s: failed to read the index"
-msgstr "git %s: falló al leer el índice"
-
-#: sequencer.c:2370
-#, c-format
-msgid "git %s: failed to refresh the index"
-msgstr "git %s: falló al refrescar el índice"
-
-#: sequencer.c:2450
-#, c-format
-msgid "%s does not accept arguments: '%s'"
-msgstr "%s no acepta argumentos: '%s'"
-
-#: sequencer.c:2459
-#, c-format
-msgid "missing arguments for %s"
-msgstr "faltan argumentos para %s"
-
-#: sequencer.c:2502
-#, c-format
-msgid "could not parse '%s'"
-msgstr "no se puede analizar '%s'"
-
-#: sequencer.c:2563
-#, c-format
-msgid "invalid line %d: %.*s"
-msgstr "línea inválida %d: %.*s"
-
-#: sequencer.c:2574
-#, c-format
-msgid "cannot '%s' without a previous commit"
-msgstr "no se puede '%s' sin un commit previo"
-
-#: 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:2669
-msgid "cancelling a revert in progress"
-msgstr "cancelando revert en progreso"
-
-#: sequencer.c:2709
-msgid "please fix this using 'git rebase --edit-todo'."
-msgstr "por favor arregla esto usando 'git rebase --edit-todo'."
-
-#: sequencer.c:2711
-#, c-format
-msgid "unusable instruction sheet: '%s'"
-msgstr "hoja de instrucciones inutilizable: '%s'"
-
-#: sequencer.c:2716
-msgid "no commits parsed."
-msgstr "ningún commit analizado."
-
-#: sequencer.c:2727
-msgid "cannot cherry-pick during a revert."
-msgstr "no se puede realizar cherry-pick durante un revert."
-
-#: sequencer.c:2729
-msgid "cannot revert during a cherry-pick."
-msgstr "no se puede realizar un revert durante un cherry-pick."
-
-#: sequencer.c:2807
-#, c-format
-msgid "invalid value for %s: %s"
-msgstr "valor inválido para %s: %s"
-
-#: sequencer.c:2916
-msgid "unusable squash-onto"
-msgstr "squash-onto inservible"
-
-#: sequencer.c:2936
-#, c-format
-msgid "malformed options sheet: '%s'"
-msgstr "hoja de opciones mal formada: '%s'"
-
-#: sequencer.c:3031 sequencer.c:4905
-msgid "empty commit set passed"
-msgstr "conjunto de commits vacío entregado"
-
-#: sequencer.c:3048
-msgid "revert is already in progress"
-msgstr "revert ya está en progreso"
-
-#: sequencer.c:3050
-#, c-format
-msgid "try \"git revert (--continue | %s--abort | --quit)\""
-msgstr "intenta \"git revert (--continue | %s--abort | --quit)\""
-
-#: sequencer.c:3053
-msgid "cherry-pick is already in progress"
-msgstr "cherry-pick ya está en progreso"
-
-#: 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:3069
-#, c-format
-msgid "could not create sequencer directory '%s'"
-msgstr "no se pudo crear un directorio secuenciador '%s'"
-
-#: sequencer.c:3084
-msgid "could not lock HEAD"
-msgstr "no se pudo bloquear HEAD"
-
-#: 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:3146 sequencer.c:3157
-msgid "cannot resolve HEAD"
-msgstr "no se puede resolver HEAD"
-
-#: 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:3178 builtin/grep.c:772
-#, c-format
-msgid "cannot open '%s'"
-msgstr "no se puede abrir '%s'"
-
-#: sequencer.c:3180
-#, c-format
-msgid "cannot read '%s': %s"
-msgstr "no se puede leer '%s': %s"
-
-#: sequencer.c:3181
-msgid "unexpected end of file"
-msgstr "final de archivo inesperado"
-
-#: 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: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:3239
-msgid "no revert in progress"
-msgstr "no hay revert en progreso"
-
-#: sequencer.c:3248
-msgid "no cherry-pick in progress"
-msgstr "ningún cherry-pick en progreso"
-
-#: sequencer.c:3258
-msgid "failed to skip the commit"
-msgstr "falló al escribir el commit"
-
-#: sequencer.c:3265
-msgid "there is nothing to skip"
-msgstr "no hay nada que saltar"
-
-#: sequencer.c:3268
-#, c-format
-msgid ""
-"have you committed already?\n"
-"try \"git %s --continue\""
-msgstr ""
-"¿ya has hecho el commit?\n"
-"intenta \"git %s --continue\""
-
-#: sequencer.c:3430 sequencer.c:4506
-msgid "cannot read HEAD"
-msgstr "no se puede leer HEAD"
-
-#: sequencer.c:3447
-#, c-format
-msgid "unable to copy '%s' to '%s'"
-msgstr "no se pudo copiar '%s' a '%s'"
-
-#: sequencer.c:3455
-#, c-format
-msgid ""
-"You can amend the commit now, with\n"
-"\n"
-"  git commit --amend %s\n"
-"\n"
-"Once you are satisfied with your changes, run\n"
-"\n"
-"  git rebase --continue\n"
-msgstr ""
-"Puedes enmendar el commit ahora, con\n"
-"\n"
-"  git commit --amend %s\n"
-"\n"
-"Una vez que estés satisfecho con los cambios, ejecuta\n"
-"\n"
-"  git rebase --continue\n"
-
-#: sequencer.c:3465
-#, c-format
-msgid "Could not apply %s... %.*s"
-msgstr "No se pudo aplicar %s... %.*s"
-
-#: sequencer.c:3472
-#, c-format
-msgid "Could not merge %.*s"
-msgstr "No se pudo fusionar %.*s"
-
-#: 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:3502
-#, c-format
-msgid "Executing: %s\n"
-msgstr "Ejecutando: %s\n"
-
-#: sequencer.c:3517
-#, c-format
-msgid ""
-"execution failed: %s\n"
-"%sYou can fix the problem, and then run\n"
-"\n"
-"  git rebase --continue\n"
-"\n"
-msgstr ""
-"ejecución fallida: %s\n"
-"%sPuedes arreglar el problema, y luego ejecutar\n"
-"\n"
-"  git rebase --continue\n"
-"\n"
-
-#: 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:3529
-#, c-format
-msgid ""
-"execution succeeded: %s\n"
-"but left changes to the index and/or the working tree\n"
-"Commit or stash your changes, and then run\n"
-"\n"
-"  git rebase --continue\n"
-"\n"
-msgstr ""
-"ejecución exitosa: %s\n"
-"pero todavía quedan cambios para el índice o árbol de trabajo.\n"
-"Realiza un commit o stash con tus cambios, y luego ejecuta\n"
-"\n"
-"  git rebase --continue\n"
-"\n"
-
-#: sequencer.c:3591
-#, c-format
-msgid "illegal label name: '%.*s'"
-msgstr "nombre de label ilegal: '%.*s'"
-
-#: sequencer.c:3664
-msgid "writing fake root commit"
-msgstr "escribiendo commit raíz falso"
-
-#: sequencer.c:3669
-msgid "writing squash-onto"
-msgstr "escribiendo squash-onto"
-
-#: sequencer.c:3748
-#, c-format
-msgid "could not resolve '%s'"
-msgstr "no se pudo resolver '%s'"
-
-#: sequencer.c:3780
-msgid "cannot merge without a current revision"
-msgstr "no se puede fusionar sin una versión actual"
-
-#: sequencer.c:3802
-#, c-format
-msgid "unable to parse '%.*s'"
-msgstr "no se puede analizar '%.*s'"
-
-#: sequencer.c:3811
-#, c-format
-msgid "nothing to merge: '%.*s'"
-msgstr "nada para fusionar: '%.*s'"
-
-#: 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:3878
-#, c-format
-msgid "could not get commit message of '%s'"
-msgstr "no se puede leer el mensaje del commit '%s'"
-
-#: sequencer.c:4024
-#, c-format
-msgid "could not even attempt to merge '%.*s'"
-msgstr "ni se pudo intentar fusionar '%.*s'"
-
-#: sequencer.c:4040
-msgid "merge: Unable to write new index file"
-msgstr "fusión: No se puede escribir el nuevo archivo índice"
-
-#: sequencer.c:4121
-msgid "Cannot autostash"
-msgstr "No se puede ejecutar autostash"
-
-#: sequencer.c:4124
-#, c-format
-msgid "Unexpected stash response: '%s'"
-msgstr "Respuesta de stash inesperada: '%s'"
-
-#: sequencer.c:4130
-#, c-format
-msgid "Could not create directory for '%s'"
-msgstr "No se pudo crear el directorio para '%s'"
-
-#: sequencer.c:4133
-#, c-format
-msgid "Created autostash: %s\n"
-msgstr "Autostash creado: %s\n"
-
-#: sequencer.c:4137
-msgid "could not reset --hard"
-msgstr "no se pudo reset --hard"
-
-#: sequencer.c:4162
-#, c-format
-msgid "Applied autostash.\n"
-msgstr "Autostash aplicado.\n"
-
-#: sequencer.c:4174
-#, c-format
-msgid "cannot store %s"
-msgstr "no se puede guardar %s"
-
-#: sequencer.c:4177
-#, c-format
-msgid ""
-"%s\n"
-"Your changes are safe in the stash.\n"
-"You can run \"git stash pop\" or \"git stash drop\" at any time.\n"
-msgstr ""
-"%s\n"
-"Tus cambios están seguros en el stash.\n"
-"Puedes ejecutar \"git stash pop\" o \"git stash drop\" en cualquier "
-"momento.\n"
-
-#: sequencer.c:4182
-msgid "Applying autostash resulted in conflicts."
-msgstr "Aplicar autostash resultó en conflictos."
-
-#: sequencer.c:4183
-msgid "Autostash exists; creating a new stash entry."
-msgstr "Autostash existe; creando una nueva entrada stash."
-
-#: sequencer.c:4255
-msgid "could not detach HEAD"
-msgstr "no se pudo desacoplar HEAD"
-
-#: sequencer.c:4270
-#, c-format
-msgid "Stopped at HEAD\n"
-msgstr "Detenido en HEAD\n"
-
-#: sequencer.c:4272
-#, c-format
-msgid "Stopped at %s\n"
-msgstr "Detenido en %s\n"
-
-#: sequencer.c:4304
-#, c-format
-msgid ""
-"Could not execute the todo command\n"
-"\n"
-"    %.*s\n"
-"It has been rescheduled; To edit the command before continuing, please\n"
-"edit the todo list first:\n"
-"\n"
-"    git rebase --edit-todo\n"
-"    git rebase --continue\n"
-msgstr ""
-"No se pudo ejecutar el comando \"todo\"\n"
-"\n"
-"    %.*s\n"
-"Ha sido reprogramado; Para editar el comando antes de continuar, por favor\n"
-"edita la lista de \"todo\" primero:\n"
-"\n"
-"    git rebase --edit-todo\n"
-"    git rebase --continue\n"
-
-#: sequencer.c:4350
-#, c-format
-msgid "Rebasing (%d/%d)%s"
-msgstr "Aplicando rebase (%d/%d)%s"
-
-#: sequencer.c:4396
-#, c-format
-msgid "Stopped at %s...  %.*s\n"
-msgstr "Detenido en %s...  %.*s\n"
-
-#: sequencer.c:4466
-#, c-format
-msgid "unknown command %d"
-msgstr "comando desconocido %d"
-
-#: sequencer.c:4514
-msgid "could not read orig-head"
-msgstr "no se pudo leer orig-head"
-
-#: sequencer.c:4519
-msgid "could not read 'onto'"
-msgstr "no se pudo leer 'onto'"
-
-#: sequencer.c:4533
-#, c-format
-msgid "could not update HEAD to %s"
-msgstr "no se pudo actualizar HEAD a %s"
-
-#: sequencer.c:4593
-#, c-format
-msgid "Successfully rebased and updated %s.\n"
-msgstr "Rebase aplicado satisfactoriamente y actualizado %s.\n"
-
-#: 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:4654
-msgid "cannot amend non-existing commit"
-msgstr "no se puede arreglar un commit no existente"
-
-#: sequencer.c:4656
-#, c-format
-msgid "invalid file: '%s'"
-msgstr "archivo inválido: '%s'"
-
-#: sequencer.c:4658
-#, c-format
-msgid "invalid contents: '%s'"
-msgstr "contenido inválido: '%s'"
-
-#: 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 ""
-"\n"
-"Tienes cambios fuera de un commit en tu árbol de trabajo. Por favor, realiza "
-"un commit con estos\n"
-"primero y luego ejecuta 'git rebase --continue' de nuevo."
-
-#: sequencer.c:4697 sequencer.c:4736
-#, c-format
-msgid "could not write file: '%s'"
-msgstr "no se pudo escribir el archivo: '%s'"
-
-#: sequencer.c:4752
-msgid "could not remove CHERRY_PICK_HEAD"
-msgstr "no se pudo eliminar CHERRY_PICK_HEAD"
-
-#: 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:4882
-#, c-format
-msgid "%s: can't cherry-pick a %s"
-msgstr "%s: no se puede aplicar cherry-pick a un %s"
-
-#: sequencer.c:4886
-#, c-format
-msgid "%s: bad revision"
-msgstr "%s: revisión errónea"
-
-#: sequencer.c:4921
-msgid "can't revert as initial commit"
-msgstr "no se puede revertir como commit inicial"
-
-#: 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:5411
-msgid "make_script: error preparing revisions"
-msgstr "make_script: error al preparar revisiones"
-
-#: sequencer.c:5669 sequencer.c:5686
-msgid "nothing to do"
-msgstr "nada que hacer"
-
-#: sequencer.c:5705
-msgid "could not skip unnecessary pick commands"
-msgstr "no se pudo saltar los comandos pick innecesarios"
-
-#: sequencer.c:5805
-msgid "the script was already rearranged."
-msgstr "este script ya fue reorganizado."
-
-#: setup.c:133
-#, c-format
-msgid "'%s' is outside repository at '%s'"
-msgstr "'%s' está fuera del repositorio en '%s'"
-
-#: setup.c:185
-#, c-format
-msgid ""
-"%s: no such path in the working tree.\n"
-"Use 'git <command> -- <path>...' to specify paths that do not exist locally."
-msgstr ""
-"%s: no existe la ruta en el árbol de trabajo.\n"
-"Usa 'git <comando> -- <ruta>...' para especificar rutas que no existen "
-"localmente."
-
-#: setup.c:198
-#, c-format
-msgid ""
-"ambiguous argument '%s': unknown revision or path not in the working tree.\n"
-"Use '--' to separate paths from revisions, like this:\n"
-"'git <command> [<revision>...] -- [<file>...]'"
-msgstr ""
-"argumento ambiguo '%s': revisión desconocida o ruta fuera del árbol de "
-"trabajo.\n"
-"Usa '--' para separar las rutas de las revisiones, de esta manera:\n"
-"'git <comando> [<revisión>...] -- [<archivo>...]'"
-
-#: setup.c:264
-#, c-format
-msgid "option '%s' must come before non-option arguments"
-msgstr "opción '%s' debe venir antes de argumentos no opcionales"
-
-#: setup.c:283
-#, c-format
-msgid ""
-"ambiguous argument '%s': both revision and filename\n"
-"Use '--' to separate paths from revisions, like this:\n"
-"'git <command> [<revision>...] -- [<file>...]'"
-msgstr ""
-"argumento ambiguo '%s': ambos revisión y nombre de archivo\n"
-"Usa '--' para separar rutas de revisiones, de esta manera:\n"
-"'git <comando> [<revisión>...] -- [<archivo>...]'"
-
-#: setup.c:419
-msgid "unable to set up work tree using invalid config"
-msgstr ""
-"no es posible configurar el directorio de trabajo usando una configuración "
-"inválida"
-
-#: setup.c:423 builtin/rev-parse.c:895
-msgid "this operation must be run in a work tree"
-msgstr "esta operación debe ser realizada en un árbol de trabajo"
-
-#: setup.c:658
-#, c-format
-msgid "Expected git repo version <= %d, found %d"
-msgstr "Se esperaba versión de git repo <= %d, se encontró %d"
-
-#: setup.c:666
-msgid "unknown repository extension found:"
-msgid_plural "unknown repository extensions found:"
-msgstr[0] "se encontró extensión de repositorio desconocida:"
-msgstr[1] "se encontraron extensiones de repositorio desconocidas:"
-
-#: 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] "versión de repo es 0, pero se encontró extensión v1-only:"
-msgstr[1] "versión de repo es 0, pero se encontraron extensiones v1-only:"
-
-#: setup.c:701
-#, c-format
-msgid "error opening '%s'"
-msgstr "error al abrir '%s'"
-
-#: setup.c:703
-#, c-format
-msgid "too large to be a .git file: '%s'"
-msgstr "demasiado grande para ser un archivo .git: '%s'"
-
-#: setup.c:705
-#, c-format
-msgid "error reading %s"
-msgstr "error al leer %s"
-
-#: setup.c:707
-#, c-format
-msgid "invalid gitfile format: %s"
-msgstr "formato gitfile inválido: %s"
-
-#: setup.c:709
-#, c-format
-msgid "no path in gitfile: %s"
-msgstr "no hay ruta en gitfile: %s"
-
-#: setup.c:711
-#, c-format
-msgid "not a git repository: %s"
-msgstr "no es un repositorio git: %s"
-
-#: setup.c:813
-#, c-format
-msgid "'$%s' too big"
-msgstr "'$%s' demasiado grande"
-
-#: setup.c:827
-#, c-format
-msgid "not a git repository: '%s'"
-msgstr "no es un repositorio git: '%s'"
-
-#: setup.c:856 setup.c:858 setup.c:889
-#, c-format
-msgid "cannot chdir to '%s'"
-msgstr "no se puede aplicar chdir a '%s'"
-
-#: setup.c:861 setup.c:917 setup.c:927 setup.c:966 setup.c:974
-msgid "cannot come back to cwd"
-msgstr "no se puede volver a cwd"
-
-#: setup.c:988
-#, c-format
-msgid "failed to stat '%*s%s%s'"
-msgstr "falló al determinar '%*s%s%s'"
-
-#: setup.c:1231
-msgid "Unable to read current working directory"
-msgstr "Incapaz de leer el directorio de trabajo actual"
-
-#: setup.c:1240 setup.c:1246
-#, c-format
-msgid "cannot change to '%s'"
-msgstr "no se puede cambiar a '%s'"
-
-#: setup.c:1251
-#, c-format
-msgid "not a git repository (or any of the parent directories): %s"
-msgstr ""
-"no es un repositorio git (ni ninguno de los directorios superiores): %s"
-
-#: 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 es un repositorio git (ni ningún padre en el punto de montaje %s)\n"
-"Parando a la frontera del sistema de archivos "
-"(GIT_DISCOVERY_ACROSS_FILESYSTEM no establecido)."
-
-#: 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 ""
-"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:1443
-msgid "fork failed"
-msgstr "falló fork"
-
-#: setup.c:1448
-msgid "setsid failed"
-msgstr "falló setsid"
-
-#: 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)"
-
-#. TRANSLATORS: IEC 80000-13:2008 gibibyte
-#: strbuf.c:850
-#, c-format
-msgid "%u.%2.2u GiB"
-msgstr "%u.%2.2u GiB"
-
-#. TRANSLATORS: IEC 80000-13:2008 gibibyte/second
-#: 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:860
-#, c-format
-msgid "%u.%2.2u MiB"
-msgstr "%u.%2.2u MiB"
-
-#. TRANSLATORS: IEC 80000-13:2008 mebibyte/second
-#: 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:869
-#, c-format
-msgid "%u.%2.2u KiB"
-msgstr "%u.%2.2u KiB"
-
-#. TRANSLATORS: IEC 80000-13:2008 kibibyte/second
-#: 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:877
-#, c-format
-msgid "%u byte"
-msgid_plural "%u bytes"
-msgstr[0] "%u byte"
-msgstr[1] "%u bytes"
-
-#. TRANSLATORS: IEC 80000-13:2008 byte/second
-#: strbuf.c:879
-#, c-format
-msgid "%u byte/s"
-msgid_plural "%u bytes/s"
-msgstr[0] "%u bytes/s"
-msgstr[1] "%u bytes/s"
-
-#: 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:1183
-#, c-format
-msgid "could not edit '%s'"
-msgstr "no se pudo editar '%s'"
-
-#: submodule-config.c:237
-#, c-format
-msgid "ignoring suspicious submodule name: %s"
-msgstr "ignorando nombre de submódulo sospechoso: %s"
-
-#: submodule-config.c:304
-msgid "negative values not allowed for submodule.fetchjobs"
-msgstr "no se permiten valores negativos para submodule.fetchjobs"
-
-#: submodule-config.c:402
-#, c-format
-msgid "ignoring '%s' which may be interpreted as a command-line option: %s"
-msgstr ""
-"ignorando '%s' ya que puede ser interpretado como una opción de línea de "
-"comando: %s"
-
-#: submodule-config.c:499
-#, c-format
-msgid "invalid value for %s"
-msgstr "valor inválido para %s"
-
-#: submodule-config.c:767
-#, c-format
-msgid "Could not update .gitmodules entry %s"
-msgstr "No se pudo actualizar la entrada %s de .gitmodules"
-
-#: submodule.c:114 submodule.c:143
-msgid "Cannot change unmerged .gitmodules, resolve merge conflicts first"
-msgstr ""
-"No se puede cambiar .gitmodules no fusionados, primero resuelve los "
-"conflictos de fusión"
-
-#: submodule.c:118 submodule.c:147
-#, c-format
-msgid "Could not find section in .gitmodules where path=%s"
-msgstr "No se pudo encontrar la sección en .gitmodules donde path=%s"
-
-#: submodule.c:154
-#, c-format
-msgid "Could not remove .gitmodules entry for %s"
-msgstr "No se pudo eliminar la entrada %s de .gitmodules"
-
-#: submodule.c:165
-msgid "staging updated .gitmodules failed"
-msgstr "falló realizar stage a los .gitmodules actualizados"
-
-#: submodule.c:358
-#, c-format
-msgid "in unpopulated submodule '%s'"
-msgstr "en el submódulo no poblado '%s'"
-
-#: 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:466
-#, c-format
-msgid "bad --ignore-submodules argument: %s"
-msgstr "mal argumento --ignore-submodules: %s"
-
-#: submodule.c:844
-#, c-format
-msgid ""
-"Submodule in commit %s at path: '%s' collides with a submodule named the "
-"same. Skipping it."
-msgstr ""
-"Submódulo en el commit %s en la ruta: '%s' colisiona con un submódulo "
-"llamado igual. Saltándolo."
-
-#: 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:1042
-#, c-format
-msgid ""
-"Could not run 'git rev-list <commits> --not --remotes -n 1' command in "
-"submodule %s"
-msgstr ""
-"No se pudo ejecutar comando 'git rev-list <commits> --not --remotes -n 1' en "
-"el submódulo %s"
-
-#: submodule.c:1165
-#, c-format
-msgid "process for submodule '%s' failed"
-msgstr "proceso para submódulo '%s' falló"
-
-#: 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:1205
-#, c-format
-msgid "Pushing submodule '%s'\n"
-msgstr "Empujando submódulo '%s'\n"
-
-#: 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:1491
-#, c-format
-msgid "Fetching submodule %s%s\n"
-msgstr "Haciendo fetch al submódulo %s%s\n"
-
-#: submodule.c:1525
-#, c-format
-msgid "Could not access submodule '%s'\n"
-msgstr "No se pudo acceder al submódulo '%s'\n"
-
-#: submodule.c:1680
-#, c-format
-msgid ""
-"Errors during submodule fetch:\n"
-"%s"
-msgstr ""
-"Errores durante el fetch del submódulo:\n"
-"%s"
-
-#: submodule.c:1705
-#, c-format
-msgid "'%s' not recognized as a git repository"
-msgstr "'%s' no reconocido como un repositorio git"
-
-#: 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: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: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: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: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: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:1917
-msgid "could not reset submodule index"
-msgstr "no se pudo reiniciar el índice del submódulo"
-
-#: submodule.c:1959
-#, c-format
-msgid "submodule '%s' has dirty index"
+#, fuzzy, c-format
+msgid "submodule '%s': unable to find submodule"
 msgstr "submódulo '%s' tiene un índice corrupto"
 
-#: submodule.c:2013
-#, c-format
-msgid "Submodule '%s' could not be updated."
-msgstr "Submódulo '%s' no pudo ser actualizado."
-
-#: 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:2102
-#, c-format
-msgid ""
-"relocate_gitdir for submodule '%s' with more than one worktree not supported"
-msgstr ""
-"relocate_gitdir para el submódulo '%s' con más de un árbol de trabajo no "
-"soportado"
-
-#: 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: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:2124
-#, c-format
-msgid ""
-"Migrating git directory of '%s%s' from\n"
-"'%s' to\n"
-"'%s'\n"
-msgstr ""
-"Migrando directorio git de '%s%s' desde\n"
-"'%s' hacia\n"
-"'%s'\n"
-
-#: submodule.c:2255
-msgid "could not start ls-files in .."
-msgstr "no se pudo comenzar ls-files en .."
-
-#: submodule.c:2295
-#, c-format
-msgid "ls-tree returned unexpected return code %d"
-msgstr "ls-tree devolvió un código %d inesperado"
-
-#: symlinks.c:244
-#, c-format
-msgid "failed to lstat '%s'"
-msgstr "falló al hacer lstat '%s'"
-
-#: trailer.c:244
-#, c-format
-msgid "running trailer command '%s' failed"
-msgstr "ejecución del comando de remolque '%s' falló"
-
-#: 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 "valor '%s' desconocido para la clave '%s'"
-
-#: 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 "más de un %s"
-
-#: trailer.c:743
-#, c-format
-msgid "empty trailer token in trailer '%.*s'"
-msgstr "token de remolque vacío en el trailer '%.*s'"
-
-#: trailer.c:763
-#, c-format
-msgid "could not read input file '%s'"
-msgstr "no se pudo leer el archivo de entrada '%s'"
-
-#: 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:684
-#, c-format
-msgid "could not stat %s"
-msgstr "no se pudo hacer stat en %s"
-
-#: trailer.c:1026
-#, c-format
-msgid "file %s is not a regular file"
-msgstr "el archivo %s no es un archivo regular"
-
-#: trailer.c:1028
-#, c-format
-msgid "file %s is not writable by user"
-msgstr "el archivo %s no puede ser escrito por el usuario"
-
-#: trailer.c:1040
-msgid "could not open temporary file"
-msgstr "no se pudo abrir el archivo temporal"
-
-#: trailer.c:1080
-#, c-format
-msgid "could not rename temporary file to %s"
-msgstr "no se pudo renombrar el archivo temporal a %s"
-
-#: transport-helper.c:62 transport-helper.c:91
-msgid "full write to remote helper failed"
-msgstr "escritura total al helper remoto falló"
-
-#: transport-helper.c:145
-#, c-format
-msgid "unable to find remote helper for '%s'"
-msgstr "no es posible encontrar helper remoto para '%s'"
-
-#: transport-helper.c:161 transport-helper.c:575
-msgid "can't dup helper output fd"
-msgstr "no se puede duplicar fd de salida del helper"
-
-#: transport-helper.c:214
-#, c-format
-msgid ""
-"unknown mandatory capability %s; this remote helper probably needs newer "
-"version of Git"
-msgstr ""
-"capacidad mandatoria desconocida %s; este helper remoto probablemente "
-"necesita una nueva versión de Git"
-
-#: transport-helper.c:220
-msgid "this remote helper should implement refspec capability"
-msgstr "este helper remoto debería implementar capacidad refspec"
-
-#: transport-helper.c:287 transport-helper.c:429
-#, c-format
-msgid "%s unexpectedly said: '%s'"
-msgstr "%s dijo inesperadamente: '%s'"
-
-#: transport-helper.c:417
-#, c-format
-msgid "%s also locked %s"
-msgstr "%s también bloqueó %s"
-
-#: transport-helper.c:497
-msgid "couldn't run fast-import"
-msgstr "no se pudo ejecutar fast-import"
-
-#: transport-helper.c:520
-msgid "error while running fast-import"
-msgstr "error al ejecutar fast-import"
-
-#: transport-helper.c:549 transport-helper.c:1251
-#, c-format
-msgid "could not read ref %s"
-msgstr "no se pudo leer la referencia %s"
-
-#: transport-helper.c:594
-#, c-format
-msgid "unknown response to connect: %s"
-msgstr "respuesta al conectar desconocida: %s"
-
-#: transport-helper.c:616
-msgid "setting remote service path not supported by protocol"
-msgstr "configurar servicio de ruta remota no soportado por el protocolo"
-
-#: transport-helper.c:618
-msgid "invalid remote service path"
-msgstr "ruta de servicio remoto inválida"
-
-#: transport-helper.c:661 transport.c:1475
-msgid "operation not supported by protocol"
-msgstr "operación no soportada por protocolo"
-
-#: transport-helper.c:664
-#, c-format
-msgid "can't connect to subservice %s"
-msgstr "no se puede conectar al subservicio %s"
-
-#: transport-helper.c:693 transport.c:404
-msgid "--negotiate-only requires protocol v2"
-msgstr "--negotiate-only requiere protocolo v2"
-
-#: transport-helper.c:755
-msgid "'option' without a matching 'ok/error' directive"
-msgstr "'opción' sin una directiva correspondiente 'ok/error'"
-
-#: transport-helper.c:798
-#, c-format
-msgid "expected ok/error, helper said '%s'"
-msgstr "se esperaba ok/error, helper dijo '%s'"
-
-#: transport-helper.c:859
-#, c-format
-msgid "helper reported unexpected status of %s"
-msgstr "helper reportó estado inesperado de %s"
-
-#: transport-helper.c:942
-#, c-format
-msgid "helper %s does not support dry-run"
-msgstr "helper %s no soporta dry-run"
-
-#: transport-helper.c:945
-#, c-format
-msgid "helper %s does not support --signed"
-msgstr "helper %s no soporta --signed"
-
-#: 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:953
-#, c-format
-msgid "helper %s does not support --atomic"
-msgstr "helper %s no soporta --atomic"
-
-#: transport-helper.c:957
-#, c-format
-msgid "helper %s does not support --%s"
-msgstr "helper %s no soporta --%s"
-
-#: transport-helper.c:964
-#, c-format
-msgid "helper %s does not support 'push-option'"
-msgstr "helper %s no soporta 'push-option'"
-
-#: 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:1069
-#, c-format
-msgid "helper %s does not support 'force'"
-msgstr "helper %s no soporta 'force'"
-
-#: transport-helper.c:1116
-msgid "couldn't run fast-export"
-msgstr "no se pudo ejecutar fast-export"
-
-#: transport-helper.c:1121
-msgid "error while running fast-export"
-msgstr "error al ejecutar fast-export"
-
-#: 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 ""
-"No hay refs comunes y ninguno especificado; no se hace nada.\n"
-"Tal vez deberías especificar un branch.\n"
-
-#: transport-helper.c:1228
-#, c-format
-msgid "unsupported object format '%s'"
-msgstr "formato de objeto no soportado '%s'"
-
-#: transport-helper.c:1237
-#, c-format
-msgid "malformed response in ref list: %s"
-msgstr "respuesta malformada en lista de refs: %s"
-
-#: transport-helper.c:1389
-#, c-format
-msgid "read(%s) failed"
-msgstr "read(%s) falló"
-
-#: transport-helper.c:1416
-#, c-format
-msgid "write(%s) failed"
-msgstr "write(%s) falló"
-
-#: transport-helper.c:1465
-#, c-format
-msgid "%s thread failed"
-msgstr "hilo %s falló"
-
-#: transport-helper.c:1469
-#, c-format
-msgid "%s thread failed to join: %s"
-msgstr "hilo %s falló al unirse: %s"
-
-#: 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:1529
-#, c-format
-msgid "%s process failed to wait"
-msgstr "proceso %s falló al esperar"
-
-#: transport-helper.c:1533
-#, c-format
-msgid "%s process failed"
-msgstr "proceso %s falló"
-
-#: 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"
-
-#: transport.c:116
-#, c-format
-msgid "Would set upstream of '%s' to '%s' of '%s'\n"
-msgstr "Configurará upstream de '%s' a '%s' de '%s'\n"
-
-#: transport.c:145
-#, c-format
-msgid "could not read bundle '%s'"
-msgstr "no se pudo leer el conjunto '%s'"
-
-#: transport.c:227
-#, c-format
-msgid "transport: invalid depth option '%s'"
-msgstr "transport: opción de profundidad inválida '%s'"
-
-#: transport.c:279
-msgid "see protocol.version in 'git help config' for more details"
-msgstr "mira protocol.version en 'git help config' para más información"
-
-#: 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:407
-msgid "server does not support wait-for-done"
-msgstr "el servidor no soporta wait-for-done"
-
-#: transport.c:759
-msgid "could not parse transport.color.* config"
-msgstr "no se pudo analizar valor de configuración transport.color.*"
-
-#: transport.c:834
-msgid "support for protocol v2 not implemented yet"
-msgstr "soporte para protocolo v2 no implementado todavía"
-
-#: transport.c:967
-#, c-format
-msgid "unknown value for config '%s': %s"
-msgstr "valor desconocido para configuración '%s': %s"
-
-#: transport.c:1033
-#, c-format
-msgid "transport '%s' not allowed"
-msgstr "transporte '%s' no permitido"
-
-#: transport.c:1082
-msgid "git-over-rsync is no longer supported"
-msgstr "git-over-rsync ya no es soportado"
-
-#: transport.c:1185
-#, c-format
-msgid ""
-"The following submodule paths contain changes that can\n"
-"not be found on any remote:\n"
-msgstr ""
-"La siguiente ruta de submódulo contiene cambios que no\n"
-"pueden ser encontrados en ningún remoto:\n"
-
-#: transport.c:1189
-#, c-format
-msgid ""
-"\n"
-"Please try\n"
-"\n"
-"\tgit push --recurse-submodules=on-demand\n"
-"\n"
-"or cd to the path and use\n"
-"\n"
-"\tgit push\n"
-"\n"
-"to push them to a remote.\n"
-"\n"
-msgstr ""
-"\n"
-"Por favor intenta\n"
-"\n"
-"\tgit push --recurse-submodules=on-demand\n"
-"\n"
-"o cd a la ruta y usa\n"
-"\n"
-"\tgit push\n"
-"\n"
-"para hacer un push al remoto.\n"
-"\n"
-
-#: transport.c:1197
-msgid "Aborting."
-msgstr "Abortando."
-
-#: transport.c:1344
-msgid "failed to push all needed submodules"
-msgstr "falló al hacer push a todos los submódulos necesarios"
-
-#: tree-walk.c:33
-msgid "too-short tree object"
-msgstr "objeto de árbol demasiado corto"
-
-#: tree-walk.c:39
-msgid "malformed mode in tree entry"
-msgstr "modo mal formado en la entrada de árbol"
-
-#: tree-walk.c:43
-msgid "empty filename in tree entry"
-msgstr "nombre de archivo vacío en la entrada de árbol"
-
-#: tree-walk.c:118
-msgid "too-short tree file"
-msgstr "archivo de árbol demasiado corto"
-
-#: unpack-trees.c:115
-#, c-format
-msgid ""
-"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 ""
-"Los cambios locales de los siguientes archivos serán sobrescritos por "
-"checkout:\n"
-"%%sPor favor realiza un commit con los cambios o un stash antes de cambiar "
-"de rama."
-
-#: unpack-trees.c:117
-#, c-format
-msgid ""
-"Your local changes to the following files would be overwritten by checkout:\n"
-"%%s"
-msgstr ""
-"Los cambios locales de los siguientes archivos serán sobreescritos por "
-"checkout:\n"
-"%%s"
-
-#: unpack-trees.c:120
-#, c-format
-msgid ""
-"Your local changes to the following files would be overwritten by merge:\n"
-"%%sPlease commit your changes or stash them before you merge."
-msgstr ""
-"Los cambios locales de los siguientes archivos serán sobrescritos al "
-"fusionar:\n"
-"%%sPor favor, confirma tus cambios o aguárdalos antes de fusionar."
-
-#: unpack-trees.c:122
-#, c-format
-msgid ""
-"Your local changes to the following files would be overwritten by merge:\n"
-"%%s"
-msgstr ""
-"Los cambios locales de los siguientes archivos serán sobreescritos por "
-"merge:\n"
-"%%s"
-
-#: unpack-trees.c:125
-#, c-format
-msgid ""
-"Your local changes to the following files would be overwritten by %s:\n"
-"%%sPlease commit your changes or stash them before you %s."
-msgstr ""
-"Los cambios locales de los siguientes archivos serán sobrescritos al %s:\n"
-"%%sPor favor, confirma tus cambios o guárdalos antes de %s."
-
-#: unpack-trees.c:127
-#, c-format
-msgid ""
-"Your local changes to the following files would be overwritten by %s:\n"
-"%%s"
-msgstr ""
-"Los cambios locales de los siguientes archivos serán sobreescritos por %s:\n"
-"%%s"
-
-#: unpack-trees.c:132
-#, c-format
-msgid ""
-"Updating the following directories would lose untracked files in them:\n"
-"%s"
-msgstr ""
-"Al actualizar los siguientes directorios se perderán los archivos sin "
-"seguimiento en ellos:\n"
-"%s"
-
-#: unpack-trees.c:136
-#, c-format
-msgid ""
-"The following untracked working tree files would be removed by checkout:\n"
-"%%sPlease move or remove them before you switch branches."
-msgstr ""
-"Los siguientes archivos sin seguimiento en el árbol de trabajo serán "
-"eliminados al actualizar el árbol de trabajo:\n"
-"%%sPor favor, muévelos o elimínalos antes de cambiar de rama."
-
-#: unpack-trees.c:138
-#, c-format
-msgid ""
-"The following untracked working tree files would be removed by checkout:\n"
-"%%s"
-msgstr ""
-"Los siguientes archivos sin seguimiento del árbol de trabajo serán "
-"eliminados al actualizar el árbol de trabajo:\n"
-"%%s"
-
-#: unpack-trees.c:141
-#, c-format
-msgid ""
-"The following untracked working tree files would be removed by merge:\n"
-"%%sPlease move or remove them before you merge."
-msgstr ""
-"Los siguientes archivos sin seguimiento en el árbol de trabajo serán "
-"eliminados al fusionar:\n"
-"%%sPor favor, muévelos o elimínalos antes de fusionar."
-
-#: unpack-trees.c:143
-#, c-format
-msgid ""
-"The following untracked working tree files would be removed by merge:\n"
-"%%s"
-msgstr ""
-"Los siguientes archivos sin seguimiento de árbol de trabajo serán eliminados "
-"al fusionar:\n"
-"%%s"
-
-#: unpack-trees.c:146
-#, c-format
-msgid ""
-"The following untracked working tree files would be removed by %s:\n"
-"%%sPlease move or remove them before you %s."
-msgstr ""
-"Los siguientes archivos sin seguimiento en el árbol de trabajo serán "
-"eliminados al %s:\n"
-"%%sPor favor, muévelos o elimínalos antes de %s."
-
-#: unpack-trees.c:148
-#, c-format
-msgid ""
-"The following untracked working tree files would be removed by %s:\n"
-"%%s"
-msgstr ""
-"Los siguientes archivos sin seguimiento en el árbol de trabajo serán "
-"eliminados al ejecutar %s:\n"
-"%%s"
-
-#: unpack-trees.c:154
-#, c-format
-msgid ""
-"The following untracked working tree files would be overwritten by "
-"checkout:\n"
-"%%sPlease move or remove them before you switch branches."
-msgstr ""
-"Los siguientes archivos sin seguimiento en el árbol de trabajo serán "
-"sobrescritos al actualizar el árbol de trabajo:\n"
-"%%sPor favor, muévelos o elimínalos antes de cambiar de rama."
-
-#: unpack-trees.c:156
-#, c-format
-msgid ""
-"The following untracked working tree files would be overwritten by "
-"checkout:\n"
-"%%s"
-msgstr ""
-"Los siguientes archivos sin seguimiento de árbol de trabajo serán "
-"sobrescritos al actualizar el árbol de trabajo:\n"
-"%%s"
-
-#: unpack-trees.c:159
-#, c-format
-msgid ""
-"The following untracked working tree files would be overwritten by merge:\n"
-"%%sPlease move or remove them before you merge."
-msgstr ""
-"Los siguientes archivos sin seguimiento en el árbol de trabajo serán "
-"sobrescritos al fusionar:\n"
-"%%sPor favor, muévelos o elimínalos antes de fusionar."
-
-#: unpack-trees.c:161
-#, c-format
-msgid ""
-"The following untracked working tree files would be overwritten by merge:\n"
-"%%s"
-msgstr ""
-"Los siguientes archivos sin seguimiento de árbol de trabajo serán "
-"sobrescritos al fusionar:\n"
-"%%s"
-
-#: unpack-trees.c:164
-#, c-format
-msgid ""
-"The following untracked working tree files would be overwritten by %s:\n"
-"%%sPlease move or remove them before you %s."
-msgstr ""
-"Los siguientes archivos sin seguimiento en el árbol de trabajo serán "
-"sobrescritos al %s:\n"
-"%%sPor favor, muévelos o elimínalos antes de %s."
-
-#: unpack-trees.c:166
-#, c-format
-msgid ""
-"The following untracked working tree files would be overwritten by %s:\n"
-"%%s"
-msgstr ""
-"Los siguientes archivos no rastreados en el árbol de trabajo serán "
-"eliminados por %s:\n"
-"%%s"
-
-#: unpack-trees.c:174
-#, c-format
-msgid "Entry '%s' overlaps with '%s'.  Cannot bind."
-msgstr "Entrada '%s' se solapa con '%s'.  No se pueden unir."
-
-#: unpack-trees.c:177
-#, c-format
-msgid ""
-"Cannot update submodule:\n"
-"%s"
-msgstr ""
-"No se puede actualizar el submódulo:\n"
-"%s"
-
-#: unpack-trees.c:180
-#, c-format
-msgid ""
-"The following paths are not up to date and were left despite sparse "
-"patterns:\n"
-"%s"
-msgstr ""
-"Las siguientes rutas no están actualizadas y fueron dejadas a pesar de los "
-"patrones sparse:\n"
-"%s"
-
-#: unpack-trees.c:182
-#, c-format
-msgid ""
-"The following paths are unmerged and were left despite sparse patterns:\n"
-"%s"
-msgstr ""
-"Las siguientes rutas son ignoradas y fueron dejadas a pesar de los patrones "
-"sparse:\n"
-"%s"
-
-#: unpack-trees.c:184
-#, c-format
-msgid ""
-"The following paths were already present and thus not updated despite sparse "
-"patterns:\n"
-"%s"
-msgstr ""
-"Las siguientes rutas ya estaban presentes y por eso no fueron actualizadas a "
-"pesar de los patrones sparse:\n"
-"%s"
-
-#: unpack-trees.c:264
-#, c-format
-msgid "Aborting\n"
-msgstr "Abortando\n"
-
-#: unpack-trees.c:291
-#, c-format
-msgid ""
-"After fixing the above paths, you may want to run `git sparse-checkout "
-"reapply`.\n"
-msgstr ""
-"Luego de arreglar las rutas mostradas, puede que quieras ejecutar `git "
-"sparse-checkout reapply`.\n"
-
-#: unpack-trees.c:352
-msgid "Updating files"
-msgstr "Actualizando archivos"
-
-#: 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"
-"colliding group is in the working tree:\n"
-msgstr ""
-"las siguientes rutas han colisionado (p.e. rutas case-sensitive\n"
-"en un filesystem case-insensitive) y solo una del grupo\n"
-"colisionando está en el árbol de trabajo:\n"
-
-#: unpack-trees.c:1620
-msgid "Updating index flags"
-msgstr "Actualizando flags del índice"
-
-#: 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:1561
-msgid "expected flush after fetch arguments"
-msgstr "se espera flush tras argumentos fetch"
-
-#: urlmatch.c:163
-msgid "invalid URL scheme name or missing '://' suffix"
-msgstr "nombre de URL inválido o sufijo '://' faltante"
-
-#: urlmatch.c:187 urlmatch.c:346 urlmatch.c:405
-#, c-format
-msgid "invalid %XX escape sequence"
-msgstr "secuencia de escape %XX inválida"
-
-#: urlmatch.c:215
-msgid "missing host and scheme is not 'file:'"
-msgstr "falta host y el esquema no es 'file:'"
-
-#: urlmatch.c:232
-msgid "a 'file:' URL may not have a port number"
-msgstr "un URL de 'file:' no puede tener número de puerto"
-
-#: urlmatch.c:247
-msgid "invalid characters in host name"
-msgstr "carácter inválido en el nombre del host"
-
-#: urlmatch.c:292 urlmatch.c:303
-msgid "invalid port number"
-msgstr "número de puerto inválido"
-
-#: urlmatch.c:371
-msgid "invalid '..' path segment"
-msgstr "segmento de ruta '..' inválido"
-
-#: walker.c:170
-msgid "Fetching objects"
-msgstr "Haciendo fetch a objetos"
-
-#: worktree.c:236 builtin/am.c:2154 builtin/bisect--helper.c:156
-#, c-format
-msgid "failed to read '%s'"
-msgstr "falló al leer '%s'"
-
-#: worktree.c:303
-#, c-format
-msgid "'%s' at main working tree is not the repository directory"
-msgstr ""
-"'%s' en el árbol de trabajo principal no es el directorio del repositorio"
-
-#: worktree.c:314
-#, c-format
-msgid "'%s' file does not contain absolute path to the working tree location"
-msgstr ""
-"archivo '%s' no contiene una ruta absoluta a la ubicación del árbol de "
-"trabajo"
-
-#: worktree.c:326
-#, c-format
-msgid "'%s' does not exist"
-msgstr "'%s' no existe"
-
-#: worktree.c:332
-#, c-format
-msgid "'%s' is not a .git file, error code %d"
-msgstr "'%s' no es un archivo .git, código de error %d"
-
-#: worktree.c:341
-#, c-format
-msgid "'%s' does not point back to '%s'"
-msgstr "'%s' no apunta de vuelta a '%s'"
-
-#: worktree.c:603
-msgid "not a directory"
-msgstr "no es un directorio"
-
-#: worktree.c:612
-msgid ".git is not a file"
-msgstr ".git no es un archivo"
-
-#: worktree.c:614
-msgid ".git file broken"
-msgstr "archivo .git roto"
-
-#: worktree.c:616
-msgid ".git file incorrect"
-msgstr "archivo .git incorrecto"
-
-#: worktree.c:722
-msgid "not a valid path"
-msgstr "no es una ruta válida"
-
-#: worktree.c:728
-msgid "unable to locate repository; .git is not a file"
-msgstr "no es posible ubicar el repositorio; .git no es un archivo"
-
-#: worktree.c:732
-msgid "unable to locate repository; .git file does not reference a repository"
-msgstr ""
-"incapaz de localizar el repositorio; el archivo .git no hace referencia a un "
-"repositorio"
-
-#: worktree.c:736
-msgid "unable to locate repository; .git file broken"
-msgstr "no es posible ubicar el repositorio; archivo .git roto"
-
-#: worktree.c:742
-msgid "gitdir unreadable"
-msgstr "gitdir ilegible"
-
-#: worktree.c:746
-msgid "gitdir incorrect"
-msgstr "gitdir incorrecto"
-
-#: worktree.c:771
-msgid "not a valid directory"
-msgstr "no en un directorio válido"
-
-#: worktree.c:777
-msgid "gitdir file does not exist"
-msgstr "archivo gitdir no existe"
-
-#: worktree.c:782 worktree.c:791
-#, c-format
-msgid "unable to read gitdir file (%s)"
-msgstr "no es posible leer archivo gitdir (%s)"
-
-#: worktree.c:801
-#, c-format
-msgid "short read (expected %<PRIuMAX> bytes, read %<PRIuMAX>)"
-msgstr "lectura corta (se esperaba %<PRIuMAX> bytes, se leyó %<PRIuMAX>)"
-
-#: worktree.c:809
-msgid "invalid gitdir file"
-msgstr "archivo gitdir inválido"
-
-#: worktree.c:817
-msgid "gitdir file points to non-existent location"
-msgstr "archivo gitdir apunta a una ubicación inexistente"
-
-#: 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:406 wrapper.c:607
-#, c-format
-msgid "unable to access '%s'"
-msgstr "no es posible acceder '%s'"
-
-#: wrapper.c:615
-msgid "unable to get current working directory"
-msgstr "no es posible obtener el directorio de trabajo actual"
-
-#: wt-status.c:158
-msgid "Unmerged paths:"
-msgstr "Rutas no fusionadas:"
-
-#: wt-status.c:187 wt-status.c:219
-msgid "  (use \"git restore --staged <file>...\" to unstage)"
-msgstr ""
-"  (usa \"git restore --staged <archivo>...\" para sacar del área de stage)"
-
-#: wt-status.c:190 wt-status.c:222
-#, c-format
-msgid "  (use \"git restore --source=%s --staged <file>...\" to unstage)"
-msgstr ""
-"  (usa \"git restore --source=%s --staged <archivo>...\" para sacar del área "
-"de stage)"
-
-#: wt-status.c:193 wt-status.c:225
-msgid "  (use \"git rm --cached <file>...\" to unstage)"
-msgstr "  (usa \"git rm --cached <archivo>...\" para sacar del área de stage)"
-
-#: wt-status.c:197
-msgid "  (use \"git add <file>...\" to mark resolution)"
-msgstr "  (usa \"git add <archivo>...\" para marcar una resolución)"
-
-#: wt-status.c:199 wt-status.c:203
-msgid "  (use \"git add/rm <file>...\" as appropriate to mark resolution)"
-msgstr ""
-"  (usa \"git add/rm <archivo>...\" como sea apropiado para marcar la "
-"resolución)"
-
-#: wt-status.c:201
-msgid "  (use \"git rm <file>...\" to mark resolution)"
-msgstr "  (usa \"git rm <file>...\" para marcar la resolución)"
-
-#: wt-status.c:211 wt-status.c:1125
-msgid "Changes to be committed:"
-msgstr "Cambios a ser confirmados:"
-
-#: wt-status.c:234 wt-status.c:1134
-msgid "Changes not staged for commit:"
-msgstr "Cambios no rastreados para el commit:"
-
-#: wt-status.c:238
-msgid "  (use \"git add <file>...\" to update what will be committed)"
-msgstr ""
-"  (usa \"git add <archivo>...\" para actualizar lo que será confirmado)"
-
-#: wt-status.c:240
-msgid "  (use \"git add/rm <file>...\" to update what will be committed)"
-msgstr ""
-"  (usa \"git add/rm <archivo>...\" para actualizar a lo que se le va a hacer "
-"commit)"
-
-#: wt-status.c:241
-msgid ""
-"  (use \"git restore <file>...\" to discard changes in working directory)"
-msgstr ""
-"  (usa \"git restore <archivo>...\" para descartar los cambios en el "
-"directorio de trabajo)"
-
-#: wt-status.c:243
-msgid "  (commit or discard the untracked or modified content in submodules)"
-msgstr ""
-"  (confirma o descarta el contenido sin seguimiento o modificado en los sub-"
-"módulos)"
-
-#: wt-status.c:254
-#, c-format
-msgid "  (use \"git %s <file>...\" to include in what will be committed)"
-msgstr ""
-"  (usa \"git %s <archivo>...\" para incluirlo a lo que se será confirmado)"
-
-#: wt-status.c:266
-msgid "both deleted:"
-msgstr "borrados por ambos:"
-
-#: wt-status.c:268
-msgid "added by us:"
-msgstr "agregados por nosotros:"
-
-#: wt-status.c:270
-msgid "deleted by them:"
-msgstr "borrados por ellos:"
-
-#: wt-status.c:272
-msgid "added by them:"
-msgstr "agregados por ellos:"
-
-#: wt-status.c:274
-msgid "deleted by us:"
-msgstr "borrados por nosotros:"
-
-#: wt-status.c:276
-msgid "both added:"
-msgstr "agregados por ambos:"
-
-#: wt-status.c:278
-msgid "both modified:"
-msgstr "modificados por ambos:"
-
-#: wt-status.c:288
-msgid "new file:"
-msgstr "nuevos archivos:"
-
-#: wt-status.c:290
-msgid "copied:"
-msgstr "copiados:"
-
-#: wt-status.c:292
-msgid "deleted:"
-msgstr "borrados:"
-
-#: wt-status.c:294
-msgid "modified:"
-msgstr "modificados:"
-
-#: wt-status.c:296
-msgid "renamed:"
-msgstr "renombrados:"
-
-#: wt-status.c:298
-msgid "typechange:"
-msgstr "cambios de tipo:"
-
-#: wt-status.c:300
-msgid "unknown:"
-msgstr "desconocido:"
-
-#: wt-status.c:302
-msgid "unmerged:"
-msgstr "sin fusión:"
-
-#: wt-status.c:382
-msgid "new commits, "
-msgstr "nuevos commits, "
-
-#: wt-status.c:384
-msgid "modified content, "
-msgstr "contenido modificado, "
-
-#: wt-status.c:386
-msgid "untracked content, "
-msgstr "contenido no rastreado, "
-
-#: wt-status.c:958
-#, c-format
-msgid "Your stash currently has %d entry"
-msgid_plural "Your stash currently has %d entries"
-msgstr[0] "Tu stash actualmente tiene %d entrada"
-msgstr[1] "Tu stash actualmente tiene %d entradas"
-
-#: wt-status.c:989
-msgid "Submodules changed but not updated:"
-msgstr "Submódulos cambiados pero no actualizados:"
-
-#: wt-status.c:991
-msgid "Submodule changes to be committed:"
-msgstr "Submódulos cambiados listos para realizar commit:"
-
-#: wt-status.c:1073
-msgid ""
-"Do not modify or remove the line above.\n"
-"Everything below it will be ignored."
-msgstr ""
-"No modifiques ni borres la línea de encima.\n"
-"Todo lo que esté por abajo será ignorado."
-
-#: wt-status.c:1165
 #, c-format
 msgid ""
-"\n"
-"It took %.2f seconds to compute the branch ahead/behind values.\n"
-"You can use '--no-ahead-behind' to avoid this.\n"
+"You may try updating the submodules using 'git checkout %s && git submodule "
+"update --init'"
 msgstr ""
-"\n"
-"Tomó %.2f segundos para calcular los valores anterior/posterior del branch.\n"
-"Puedes usar '--no-ahead-behind' para evitar esto.\n"
-
-#: wt-status.c:1195
-msgid "You have unmerged paths."
-msgstr "Tienes rutas no fusionadas."
-
-#: wt-status.c:1198
-msgid "  (fix conflicts and run \"git commit\")"
-msgstr "  (arregla los conflictos y ejecuta \"git commit\""
-
-#: wt-status.c:1200
-msgid "  (use \"git merge --abort\" to abort the merge)"
-msgstr "  (usa \"git merge --abort\" para abortar la fusion)"
-
-#: wt-status.c:1204
-msgid "All conflicts fixed but you are still merging."
-msgstr "Todos los conflictos resueltos pero sigues fusionando."
 
-#: wt-status.c:1207
-msgid "  (use \"git commit\" to conclude merge)"
-msgstr "  (usa \"git commit\" para concluir la fusión)"
-
-#: wt-status.c:1216
-msgid "You are in the middle of an am session."
-msgstr "Estás en medio de una sesión am."
-
-#: wt-status.c:1219
-msgid "The current patch is empty."
-msgstr "El parche actual está vacío."
-
-#: wt-status.c:1223
-msgid "  (fix conflicts and then run \"git am --continue\")"
-msgstr "  (arregla los conflictos y luego ejecuta \"git am --continue\""
-
-#: wt-status.c:1225
-msgid "  (use \"git am --skip\" to skip this patch)"
-msgstr "  (usa \"git am --skip\" para saltar este parche)"
-
-#: wt-status.c:1227
-msgid "  (use \"git am --abort\" to restore the original branch)"
-msgstr "  (usa \"git am --abort\" para restaurar la rama original)"
-
-#: wt-status.c:1360
-msgid "git-rebase-todo is missing."
-msgstr "git-rebase-todo no está presente."
-
-#: wt-status.c:1362
-msgid "No commands done."
-msgstr "No se realizaron los comandos."
-
-#: wt-status.c:1365
-#, c-format
-msgid "Last command done (%d command done):"
-msgid_plural "Last commands done (%d commands done):"
-msgstr[0] "El último comando realizado (%d comando realizado):"
-msgstr[1] "Los últimos comandos realizados (%d comandos realizados):"
-
-#: wt-status.c:1376
-#, c-format
-msgid "  (see more in file %s)"
-msgstr "  (ver más en el archivo %s)"
-
-#: wt-status.c:1381
-msgid "No commands remaining."
-msgstr "No quedan más comandos."
-
-#: 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] "Siguiente comando a realizar (%d comando restante):"
-msgstr[1] "Siguientes comandos a realizar (%d comandos faltantes):"
-
-#: wt-status.c:1392
-msgid "  (use \"git rebase --edit-todo\" to view and edit)"
-msgstr "  (usa \"git rebase --edit-todo\" para ver y editar)"
-
-#: wt-status.c:1404
-#, c-format
-msgid "You are currently rebasing branch '%s' on '%s'."
-msgstr "Estás aplicando un rebase de la rama '%s' sobre '%s."
-
-#: wt-status.c:1409
-msgid "You are currently rebasing."
-msgstr "Estás aplicando un rebase."
-
-#: wt-status.c:1422
-msgid "  (fix conflicts and then run \"git rebase --continue\")"
-msgstr "  (corrige los conflictos y ejecuta \"git rebase --continue\")"
-
-#: wt-status.c:1424
-msgid "  (use \"git rebase --skip\" to skip this patch)"
-msgstr "  (usa \"git rebase --skip\" para omitir este parche)"
-
-#: wt-status.c:1426
-msgid "  (use \"git rebase --abort\" to check out the original branch)"
-msgstr "  (usa \"git rebase --abort\" para volver a tu rama original)"
-
-#: wt-status.c:1433
-msgid "  (all conflicts fixed: run \"git rebase --continue\")"
-msgstr "  (todos los conflictos corregidos: ejecuta \"git rebase --continue\")"
-
-#: wt-status.c:1437
-#, c-format
-msgid ""
-"You are currently splitting a commit while rebasing branch '%s' on '%s'."
-msgstr ""
-"Estás dividiendo un commit mientras aplicas un rebase de la rama '%s' en "
-"'%s'."
-
-#: wt-status.c:1442
-msgid "You are currently splitting a commit during a rebase."
-msgstr "Estás dividiendo un commit durante un rebase."
-
-#: wt-status.c:1445
-msgid "  (Once your working directory is clean, run \"git rebase --continue\")"
-msgstr ""
-"  (Una vez que tu directorio de trabajo esté limpio, ejecuta \"git rebase --"
-"continue\")"
-
-#: wt-status.c:1449
-#, c-format
-msgid "You are currently editing a commit while rebasing branch '%s' on '%s'."
-msgstr ""
-"Estás editando un commit mientras se aplica un rebase de la rama '%s' sobre "
-"'%s'."
-
-#: wt-status.c:1454
-msgid "You are currently editing a commit during a rebase."
-msgstr "Estás editando un commit durante un rebase."
-
-#: wt-status.c:1457
-msgid "  (use \"git commit --amend\" to amend the current commit)"
-msgstr "  (usa \"git commit --amend\" para enmendar el commit actual)"
-
-#: wt-status.c:1459
-msgid ""
-"  (use \"git rebase --continue\" once you are satisfied with your changes)"
-msgstr ""
-"  (usa \"git rebase --continue\" una vez que estés satisfecho con tus "
-"cambios)"
-
-#: wt-status.c:1470
-msgid "Cherry-pick currently in progress."
-msgstr "Cherry-pick en progreso actualmente."
-
-#: wt-status.c:1473
-#, c-format
-msgid "You are currently cherry-picking commit %s."
-msgstr "Estás realizando un cherry-picking en el commit %s."
-
-#: wt-status.c:1480
-msgid "  (fix conflicts and run \"git cherry-pick --continue\")"
-msgstr "  (corrige los conflictos y ejecuta \"git cherry-pick --continue\")"
-
-#: wt-status.c:1483
-msgid "  (run \"git cherry-pick --continue\" to continue)"
-msgstr "  (ejecuta \"git cherry-pick --continue\" para continuar)"
-
-#: wt-status.c:1486
-msgid "  (all conflicts fixed: run \"git cherry-pick --continue\")"
-msgstr ""
-"  (todos los conflictos corregidos: ejecuta \"git cherry-pick --continue\")"
-
-#: wt-status.c:1488
-msgid "  (use \"git cherry-pick --skip\" to skip this patch)"
-msgstr "  (usa \"git cherry-pick --skip\" para saltar este parche)"
-
-#: wt-status.c:1490
-msgid "  (use \"git cherry-pick --abort\" to cancel the cherry-pick operation)"
-msgstr ""
-"  (usa \"git cherry-pick --abort\" para cancelar la operación cherry-pick)"
-
-#: wt-status.c:1500
-msgid "Revert currently in progress."
-msgstr "Reversión en progreso actualmente."
-
-#: wt-status.c:1503
-#, c-format
-msgid "You are currently reverting commit %s."
-msgstr "Estás revirtiendo el commit %s."
-
-#: wt-status.c:1509
-msgid "  (fix conflicts and run \"git revert --continue\")"
-msgstr "  (corrige los conflictos y ejecuta \"git revert --continue\")"
-
-#: wt-status.c:1512
-msgid "  (run \"git revert --continue\" to continue)"
-msgstr "  (ejecuta \"git revert --continue\" para continuar)"
-
-#: wt-status.c:1515
-msgid "  (all conflicts fixed: run \"git revert --continue\")"
-msgstr "  (todos los conflictos corregidos: ejecuta \"git revert --continue\")"
-
-#: wt-status.c:1517
-msgid "  (use \"git revert --skip\" to skip this patch)"
-msgstr "  (usa \"git revert --skip\" para omitir este parche)"
-
-#: wt-status.c:1519
-msgid "  (use \"git revert --abort\" to cancel the revert operation)"
-msgstr "  (usa \"git revert --abort\" para cancelar la operación de revertir)"
-
-#: wt-status.c:1529
-#, c-format
-msgid "You are currently bisecting, started from branch '%s'."
-msgstr "Estás aplicando un bisect, comenzando en la rama '%s'."
-
-#: wt-status.c:1533
-msgid "You are currently bisecting."
-msgstr "Estás aplicando un bisect."
-
-#: wt-status.c:1536
-msgid "  (use \"git bisect reset\" to get back to the original branch)"
-msgstr "  (usa \"git bisect reset\" para volver a la rama original)"
-
-#: wt-status.c:1547
-msgid "You are in a sparse checkout."
-msgstr "Estás en un sparse checkout."
-
-#: wt-status.c:1550
-#, c-format
-msgid "You are in a sparse checkout with %d%% of tracked files present."
-msgstr "Estás en un checkout de sparse con %d%% archivos rastreados presentes."
-
-#: wt-status.c:1794
-msgid "On branch "
-msgstr "En la rama "
-
-#: wt-status.c:1801
-msgid "interactive rebase in progress; onto "
-msgstr "rebase interactivo en progreso; sobre "
-
-#: wt-status.c:1803
-msgid "rebase in progress; onto "
-msgstr "rebase en progreso; sobre "
-
-#: wt-status.c:1808
-msgid "HEAD detached at "
-msgstr "HEAD desacoplada en "
-
-#: wt-status.c:1810
-msgid "HEAD detached from "
-msgstr "HEAD desacoplada de "
-
-#: wt-status.c:1813
-msgid "Not currently on any branch."
-msgstr "Actualmente no estás en ninguna rama."
-
-#: wt-status.c:1830
-msgid "Initial commit"
-msgstr "Confirmación inicial"
-
-#: wt-status.c:1831
-msgid "No commits yet"
-msgstr "No hay commits todavía"
-
-#: wt-status.c:1845
-msgid "Untracked files"
-msgstr "Archivos sin seguimiento"
-
-#: wt-status.c:1847
-msgid "Ignored files"
-msgstr "Archivos ignorados"
-
-#: wt-status.c:1851
-#, c-format
-msgid ""
-"It took %.2f seconds to enumerate untracked files. 'status -uno'\n"
-"may speed it up, but you have to be careful not to forget to add\n"
-"new files yourself (see 'git help status')."
-msgstr ""
-"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 (mira 'git help status')."
-
-#: wt-status.c:1857
-#, c-format
-msgid "Untracked files not listed%s"
-msgstr "Archivos no rastreados no son mostrados%s"
-
-#: wt-status.c:1859
-msgid " (use -u option to show untracked files)"
-msgstr " (usa la opción -u para mostrar los archivos sin seguimiento)"
-
-#: wt-status.c:1865
-msgid "No changes"
-msgstr "Sin cambios"
-
-#: wt-status.c:1870
-#, c-format
-msgid "no changes added to commit (use \"git add\" and/or \"git commit -a\")\n"
-msgstr ""
-"sin cambios agregados al commit (usa \"git add\" y/o \"git commit -a\")\n"
-
-#: wt-status.c:1874
-#, c-format
-msgid "no changes added to commit\n"
-msgstr "no se agregaron cambios al commit\n"
-
-#: wt-status.c:1878
-#, c-format
-msgid ""
-"nothing added to commit but untracked files present (use \"git add\" to "
-"track)\n"
-msgstr ""
-"no hay nada agregado al commit pero hay archivos sin seguimiento presentes "
-"(usa \"git add\" para hacerles seguimiento)\n"
-
-#: wt-status.c:1882
-#, c-format
-msgid "nothing added to commit but untracked files present\n"
-msgstr ""
-"no hay nada agregado para confirmar, pero hay archivos sin seguimiento "
-"presentes\n"
-
-#: wt-status.c:1886
-#, c-format
-msgid "nothing to commit (create/copy files and use \"git add\" to track)\n"
-msgstr ""
-"no hay nada para confirmar (crea/copia archivos y usa \"git add\" para "
-"hacerles seguimiento)\n"
-
-#: wt-status.c:1890 wt-status.c:1896
-#, c-format
-msgid "nothing to commit\n"
-msgstr "nada para hacer commit\n"
-
-#: wt-status.c:1893
-#, c-format
-msgid "nothing to commit (use -u to show untracked files)\n"
-msgstr ""
-"nada para hacer commit (usa -u para mostrar los archivos no rastreados)\n"
-
-#: wt-status.c:1898
-#, c-format
-msgid "nothing to commit, working tree clean\n"
-msgstr "nada para hacer commit, el árbol de trabajo está limpio\n"
-
-#: wt-status.c:2003
-msgid "No commits yet on "
-msgstr "No hay commits todavía en "
-
-#: wt-status.c:2007
-msgid "HEAD (no branch)"
-msgstr "HEAD (sin rama)"
-
-#: wt-status.c:2038
-msgid "different"
-msgstr "diferente"
-
-#: wt-status.c:2040 wt-status.c:2048
-msgid "behind "
-msgstr "detrás "
-
-#: wt-status.c:2043 wt-status.c:2046
-msgid "ahead "
-msgstr "adelante "
-
-#. TRANSLATORS: the action is e.g. "pull with rebase"
-#: wt-status.c:2569
-#, c-format
-msgid "cannot %s: You have unstaged changes."
-msgstr "no se puede %s: Tienes cambios sin marcar."
-
-#: wt-status.c:2575
-msgid "additionally, your index contains uncommitted changes."
-msgstr "adicionalmente, tu índice contiene cambios que no están en un commit."
-
-#: wt-status.c:2577
-#, c-format
-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:183
-msgid "could not send IPC command"
-msgstr "no se pudo enviar el comando IPC"
-
-#: 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:870
-#, c-format
-msgid "could not start accept_thread '%s'"
-msgstr "no se pudo iniciar el accept_thread '%s'"
+#, fuzzy, c-format
+msgid "submodule '%s': cannot create branch '%s'"
+msgstr "submódulo '%s' no puede agregar alterno: %s"
 
-#: 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'"
+msgid "'%s' is already checked out at '%s'"
+msgstr "'%s' ya ha sido marcado en '%s'"
 
-#: compat/precompose_utf8.c:58 builtin/clone.c:347
 #, c-format
-msgid "failed to unlink '%s'"
-msgstr "falló al desvincular '%s'"
+msgid "HEAD of working tree %s is not updated"
+msgstr "HEAD del árbol de trabajo %s no está actualizada"
 
-#: builtin/add.c:26
 msgid "git add [<options>] [--] <pathspec>..."
 msgstr "git add [<opciones>] [--] <especificación-de-ruta>..."
 
-#: builtin/add.c:64
 #, c-format
 msgid "cannot chmod %cx '%s'"
 msgstr "no se puede aplicar chmod %cx '%s'"
 
-#: builtin/add.c:106
 #, c-format
 msgid "unexpected diff status %c"
 msgstr "diff status inesperado %c"
 
-#: builtin/add.c:111 builtin/commit.c:298
 msgid "updating files failed"
 msgstr "falló la actualización de archivos"
 
-#: builtin/add.c:121
 #, c-format
 msgid "remove '%s'\n"
 msgstr "eliminar '%s'\n"
 
-#: 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:317 builtin/rev-parse.c:993
 msgid "Could not read the index"
 msgstr "No se pudo leer el índice"
 
-#: builtin/add.c:330
 msgid "Could not write patch"
 msgstr "No se puede escribir el parche"
 
-#: builtin/add.c:333
 msgid "editing patch failed"
 msgstr "falló la edición del parche"
 
-#: builtin/add.c:336
 #, c-format
 msgid "Could not stat '%s'"
 msgstr "No se pudo hacer stat en '%s'"
 
-#: builtin/add.c:338
 msgid "Empty patch. Aborted."
 msgstr "Parche vacío. Abortado."
 
-#: builtin/add.c:343
 #, c-format
 msgid "Could not apply '%s'"
 msgstr "No se pudo aplicar '%s'"
 
-#: 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: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 "dry run (ejecución en seco)"
 
-#: builtin/add.c:374
+msgid "be verbose"
+msgstr "ser verboso"
+
 msgid "interactive picking"
 msgstr "selección interactiva"
 
-#: 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:376
 msgid "edit current diff and apply"
 msgstr "editar diff actual y aplicar"
 
-#: builtin/add.c:377
 msgid "allow adding otherwise ignored files"
 msgstr "permitir agregar archivos que de otro modo se ignoren"
 
-#: builtin/add.c:378
 msgid "update tracked files"
 msgstr "actualizar los archivos rastreados"
 
-#: builtin/add.c:379
 msgid "renormalize EOL of tracked files (implies -u)"
 msgstr "renormalizar EOL de los archivos rastreados (implica -u)"
 
-#: 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: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: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:386
 msgid "don't add, only refresh the index"
 msgstr "no agregar, solo actualizar el índice"
 
-#: 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: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: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:393
 msgid "warn when adding an embedded repository"
 msgstr "avisar cuando se agrega un repositorio incrustado"
 
-#: builtin/add.c:395
-msgid "backend for `git stash -p`"
-msgstr "backend para `git stash -p`"
-
-#: builtin/add.c:413
 #, c-format
 msgid ""
 "You've added another git repository inside your current repository.\n"
@@ -10621,12 +1830,10 @@ msgstr ""
 "\n"
 "Mira \"git help submodule\" para más información."
 
-#: builtin/add.c:442
 #, c-format
 msgid "adding embedded git repository: %s"
 msgstr "agregando repositorio de git embebido: %s"
 
-#: builtin/add.c:462
 msgid ""
 "Use -f if you really want to add them.\n"
 "Turn this message off by running\n"
@@ -10636,51 +1843,21 @@ msgstr ""
 "Desactiva este mensaje ejecutando\n"
 "\"git config advice.addIgnoredFile false\""
 
-#: builtin/add.c:477
 msgid "adding files failed"
 msgstr "falló al agregar archivos"
 
-#: builtin/add.c:513
-msgid "--dry-run is incompatible with --interactive/--patch"
-msgstr "--dry-run es incompatible con --interactive/--patch"
-
-#: 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:532
-msgid "--pathspec-from-file is incompatible with --edit"
-msgstr "--pathspec-from-file es incompatible con --edit"
-
-#: builtin/add.c:544
-msgid "-A and -u are mutually incompatible"
-msgstr "-A y -u son mutuamente incompatibles"
-
-#: 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: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: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: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"
+#, fuzzy, c-format
+msgid "'%s' and pathspec arguments cannot be used together"
+msgstr "-x y -X no pueden ser usadas juntas"
 
-#: builtin/add.c:583
 #, c-format
 msgid "Nothing specified, nothing added.\n"
 msgstr "Nada especificado, nada agregado.\n"
 
-#: builtin/add.c:585
 msgid ""
 "Maybe you wanted to say 'git add .'?\n"
 "Turn this message off by running\n"
@@ -10690,110 +1867,120 @@ msgstr ""
 "Desactiva este mensage ejecutando\n"
 "\"git config advice.addEmptyPathspec false\""
 
-#: builtin/am.c:366
+msgid "index file corrupt"
+msgstr "archivo índice corrompido"
+
+#, c-format
+msgid "bad action '%s' for '%s'"
+msgstr "mala acción '%s' para '%s'"
+
+#, fuzzy, c-format
+msgid "invalid value for '%s': '%s'"
+msgstr "valor inválido para %s: %s"
+
+#, c-format
+msgid "could not read '%s'"
+msgstr "no se pudo leer '%s'"
+
 msgid "could not parse author script"
 msgstr "no se pudo analizar el script del autor"
 
-#: builtin/am.c:456
+#, c-format
+msgid "could not parse %s"
+msgstr "no se puede analizar %s"
+
 #, c-format
 msgid "'%s' was deleted by the applypatch-msg hook"
 msgstr "'%s' fue borrado por el hook de applypatch-msg"
 
-#: builtin/am.c:498
 #, c-format
 msgid "Malformed input line: '%s'."
 msgstr "Línea de entrada mal formada: '%s'."
 
-#: 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:562
 msgid "fseek failed"
 msgstr "fallo de fseek"
 
-#: builtin/am.c:750
+#, c-format
+msgid "could not open '%s' for reading"
+msgstr "no se pudo abrir '%s' para lectura"
+
+#, c-format
+msgid "could not open '%s' for writing"
+msgstr "no se pudo abrir '%s' para escritura"
+
 #, c-format
 msgid "could not parse patch '%s'"
 msgstr "no se pudo analizar el parche '%s'"
 
-#: 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:863
 msgid "invalid timestamp"
 msgstr "timestamp inválido"
 
-#: builtin/am.c:868 builtin/am.c:880
 msgid "invalid Date line"
 msgstr "línea Date inválida"
 
-#: builtin/am.c:875
 msgid "invalid timezone offset"
 msgstr "offset de zona horaria inválido"
 
-#: builtin/am.c:968
 msgid "Patch format detection failed."
 msgstr "Falló al detectar el formato del parche."
 
-#: 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:978
 msgid "Failed to split patches."
 msgstr "Falló al dividir parches."
 
-#: 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: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:1129
+#, fuzzy, c-format
+msgid "To record the empty patch as an empty commit, run \"%s --allow-empty\"."
+msgstr ""
+"Para restaurar la rama original y detener el parcheo, ejecuta \"%s --abort\"."
+
 #, c-format
 msgid "To restore the original branch and stop patching, run \"%s --abort\"."
 msgstr ""
 "Para restaurar la rama original y detener el parcheo, ejecuta \"%s --abort\"."
 
-#: 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:1252
-msgid "Patch is empty."
-msgstr "El parche está vacío."
-
-#: 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:1320
 #, c-format
 msgid "invalid ident line: %.*s"
 msgstr "línea de identificación no válida: %.*s"
 
-#: builtin/am.c:1539
+#, c-format
+msgid "unable to parse commit %s"
+msgstr "no es posible analizar el commit %s"
+
 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: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:1560
 msgid ""
 "Did you hand edit your patch?\n"
 "It does not apply to blobs recorded in its index."
@@ -10801,24 +1988,25 @@ msgstr ""
 "¿Editaste el parche a mano?\n"
 "No aplica a los blobs registrados en su índice."
 
-#: 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:1592
 msgid "Failed to merge in the changes."
 msgstr "Falló al fusionar los cambios."
 
-#: builtin/am.c:1624
+msgid "git write-tree failed to write a tree"
+msgstr "git write-tree falló al escribir el árbol"
+
 msgid "applying to an empty history"
 msgstr "aplicando a un historial vacío"
 
-#: builtin/am.c:1676 builtin/am.c:1680
+msgid "failed to write commit object"
+msgstr "falló al escribir el objeto commit"
+
 #, c-format
 msgid "cannot resume: %s does not exist."
 msgstr "no se puede continuar: %s no existe."
 
-#: builtin/am.c:1698
 msgid "Commit Body is:"
 msgstr "Cuerpo de commit es:"
 
@@ -10826,39 +2014,46 @@ msgstr "Cuerpo de commit es:"
 #. in your translation. The program will only accept English
 #. input at this point.
 #.
-#: 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:1754 builtin/commit.c:409
 msgid "unable to write index file"
 msgstr "no es posible escribir el archivo índice"
 
-#: 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:1798 builtin/am.c:1865
+#, fuzzy, c-format
+msgid "Skipping: %.*s"
+msgstr "Aplicando: %.*s"
+
+#, fuzzy, c-format
+msgid "Creating an empty commit: %.*s"
+msgstr "mantener commits redundantes, vacíos"
+
+msgid "Patch is empty."
+msgstr "El parche está vacío."
+
 #, c-format
 msgid "Applying: %.*s"
 msgstr "Aplicando: %.*s"
 
-#: builtin/am.c:1815
 msgid "No changes -- Patch already applied."
 msgstr "Sin cambios -- Parche ya aplicado."
 
-#: builtin/am.c:1821
 #, c-format
 msgid "Patch failed at %s %.*s"
 msgstr "El parche falló en %s %.*s"
 
-#: builtin/am.c:1825
 msgid "Use 'git am --show-current-patch=diff' to see the failed patch"
 msgstr "Usa 'git am --show-current-patch=diff' para ver el parche fallido"
 
-#: builtin/am.c:1868
+#, fuzzy
+msgid "No changes - recorded it as an empty commit."
+msgstr "no se agregaron cambios al commit\n"
+
 msgid ""
 "No changes - did you forget to use 'git add'?\n"
 "If there is nothing left to stage, chances are that something else\n"
@@ -10868,7 +2063,6 @@ msgstr ""
 "Si no hay nada en el área de stage, lo más probable es que algo más\n"
 "ya ha introducido el mismo cambio; tal vez quieras omitir este parche."
 
-#: 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 "
@@ -10881,17 +2075,16 @@ msgstr ""
 "Se puede ejecutar `git rm` en el archivo para aceptar \"borrado por ellos\" "
 "en él."
 
-#: builtin/am.c:1983 builtin/am.c:1987 builtin/am.c:1999 builtin/reset.c:353
-#: builtin/reset.c:361
+msgid "unable to write new index file"
+msgstr "no es posible escribir el archivo índice"
+
 #, c-format
 msgid "Could not parse object '%s'."
 msgstr "No se pudo analizar el objeto '%s'."
 
-#: builtin/am.c:2035 builtin/am.c:2111
 msgid "failed to clean index"
 msgstr "falló al limpiar el índice"
 
-#: builtin/am.c:2079
 msgid ""
 "You seem to have moved HEAD since the last 'am' failure.\n"
 "Not rewinding to ORIG_HEAD"
@@ -10899,160 +2092,115 @@ msgstr ""
 "Parece haber movido HEAD desde el último falló 'am'.\n"
 "No rebobinando a ORIG_HEAD"
 
-#: builtin/am.c:2187
-#, c-format
-msgid "Invalid value for --patch-format: %s"
-msgstr "Valor inválido para --patch-format: %s"
-
-#: builtin/am.c:2229
 #, c-format
-msgid "Invalid value for --show-current-patch: %s"
-msgstr "Valor inválido para --show-current-patch: %s"
+msgid "failed to read '%s'"
+msgstr "falló al leer '%s'"
 
-#: 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"
+#, fuzzy, c-format
+msgid "options '%s=%s' and '%s=%s' cannot be used together"
+msgstr "Opciones --squash y --fixup no pueden ser usadas juntas"
 
-#: builtin/am.c:2264
 msgid "git am [<options>] [(<mbox> | <Maildir>)...]"
 msgstr "git am [<opciones>] [(<mbox> | <Directorio-de-correo>)...]"
 
-#: builtin/am.c:2265
 msgid "git am [<options>] (--continue | --skip | --abort)"
 msgstr "git am [<opciones>] (--continue | --skip | --abort)"
 
-#: builtin/am.c:2271
 msgid "run interactively"
 msgstr "ejecutar de manera interactiva"
 
-#: builtin/am.c:2273
 msgid "historical option -- no-op"
 msgstr "opción histórica -- no-op"
 
-#: 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: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: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:2281
 msgid "recode into utf8 (default)"
 msgstr "recodificar en utf8 (default)"
 
-#: builtin/am.c:2283
 msgid "pass -k flag to git-mailinfo"
 msgstr "pasar flag -k a git-mailinfo"
 
-#: builtin/am.c:2285
 msgid "pass -b flag to git-mailinfo"
 msgstr "pasar flag -b a git-mailinfo"
 
-#: builtin/am.c:2287
 msgid "pass -m flag to git-mailinfo"
 msgstr "pasar flag -m a git-mailinfo"
 
-#: 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: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:2295
 msgid "strip everything before a scissors line"
 msgstr "descubrir todo antes de una línea de tijeras"
 
-#: builtin/am.c:2297
 msgid "pass it through git-mailinfo"
 msgstr "pasarlo a través de 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 "pasarlo a través de git-apply"
 
-#: 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: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: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:2324
 msgid "format the patch(es) are in"
 msgstr "formato de los parches"
 
-#: 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:2332
 msgid "continue applying patches after resolving a conflict"
 msgstr "continuar aplicando los parches tras resolver conflictos"
 
-#: builtin/am.c:2335
 msgid "synonyms for --continue"
 msgstr "sinónimos para --continue"
 
-#: builtin/am.c:2338
 msgid "skip the current patch"
 msgstr "saltar el parche actual"
 
-#: 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: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:2348
 msgid "show the patch being applied"
 msgstr "mostrar el parche siendo aplicado"
 
-#: builtin/am.c:2353
+msgid "record the empty patch as an empty commit"
+msgstr ""
+
 msgid "lie about committer date"
 msgstr "mentir sobre la fecha del committer"
 
-#: builtin/am.c:2355
 msgid "use current timestamp for author date"
 msgstr "usar el timestamp actual para la fecha del autor"
 
-#: 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:2358 builtin/rebase.c:1100
 msgid "GPG-sign commits"
 msgstr "firmar los commits con GPG"
 
-#: builtin/am.c:2361
+#, fuzzy
+msgid "how to handle empty patches"
+msgstr "mostrar el parche actual"
+
 msgid "(internal use for git-rebase)"
 msgstr "(uso interno para git-rebase)"
 
-#: 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."
@@ -11060,16 +2208,13 @@ msgstr ""
 "La opción -b/--binary ha estado deshabilitada por mucho tiempo, y\n"
 "será eliminada. Por favor no la uses más."
 
-#: builtin/am.c:2386
 msgid "failed to read the index"
 msgstr "falló al leer el índice"
 
-#: 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:2425
 #, c-format
 msgid ""
 "Stray %s directory found.\n"
@@ -11078,56 +2223,37 @@ msgstr ""
 "Directorio extraviado %s encontrado.\n"
 "Usa \"git am --abort\" para borrarlo."
 
-#: 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:2441
 msgid "interactive mode requires patches on the command line"
 msgstr "modo interactivo requiere parches en la línea de comando"
 
-#: builtin/apply.c:8
 msgid "git apply [<options>] [<patch>...]"
 msgstr "git apply [<opciones>] [<parche>...]"
 
-#: builtin/archive.c:18
 msgid "could not redirect output"
 msgstr "no se pudo redirigir la salida"
 
-#: builtin/archive.c:35
 msgid "git archive: Remote with no URL"
 msgstr "git archive: Remote sin URL"
 
-#: 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:62
 #, c-format
 msgid "git archive: NACK %s"
 msgstr "git archive: NACK %s"
 
-#: builtin/archive.c:63
 msgid "git archive: protocol error"
 msgstr "git archive: error de protocolo"
 
-#: builtin/archive.c:67
 msgid "git archive: expected a flush"
 msgstr "git archive: se esperaba un flush"
 
-#: builtin/bisect--helper.c:24
 msgid "git bisect--helper --bisect-reset [<commit>]"
 msgstr "git bisect--helper --bisect-reset [<commit>]"
 
-#: builtin/bisect--helper.c:25
-msgid ""
-"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-new]"
-
-#: builtin/bisect--helper.c:26
 msgid ""
 "git bisect--helper --bisect-start [--term-{new,bad}=<term> --term-{old,good}"
 "=<term>] [--no-checkout] [--first-parent] [<bad> [<good>...]] [--] "
@@ -11137,79 +2263,56 @@ msgstr ""
 "good}=<término>] [--no-checkout] [--first-parent] [<malo> [<bueno>...]] [--] "
 "[<rutas>...]"
 
-#: builtin/bisect--helper.c:28
-msgid "git bisect--helper --bisect-next"
-msgstr "git bisect--helper --bisect-next"
-
-#: builtin/bisect--helper.c:29
 msgid "git bisect--helper --bisect-state (bad|new) [<rev>]"
 msgstr "git bisect--helper --bisect-state (bad|new) [<rev>]"
 
-#: builtin/bisect--helper.c:30
 msgid "git bisect--helper --bisect-state (good|old) [<rev>...]"
 msgstr "git bisect--helper --bisect-state (good|old) [<rev>...]"
 
-#: builtin/bisect--helper.c:31
 msgid "git bisect--helper --bisect-replay <filename>"
 msgstr "git bisect--helper --bisect-replay <archivo>"
 
-#: builtin/bisect--helper.c:32
 msgid "git bisect--helper --bisect-skip [(<rev>|<range>)...]"
 msgstr "git bisect--helper --bisect-skip [(<rev>|<rango>)...]"
 
-#: 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:116
 #, c-format
 msgid "could not write to file '%s'"
 msgstr "no se pudo escribir al archivo '%s'"
 
-#: 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: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: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:194
 msgid "please use two different terms"
 msgstr "por favor usa dos términos diferentes"
 
-#: builtin/bisect--helper.c:210
 #, c-format
 msgid "We are not bisecting.\n"
 msgstr "No estamos bisecando.\n"
 
-#: 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:227
 #, c-format
 msgid ""
 "could not check out original HEAD '%s'. Try 'git bisect reset <commit>'."
@@ -11217,27 +2320,22 @@ msgstr ""
 "no se pudo hacer check out al HEAD original '%s'. Intenta 'git bisect reset "
 "<commit>'."
 
-#: builtin/bisect--helper.c:271
 #, c-format
 msgid "Bad bisect_write argument: %s"
 msgstr "Mal argumento bisect_write: %s"
 
-#: 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:288
 #, c-format
 msgid "couldn't open the file '%s'"
 msgstr "no se pudo abrir el archivo '%s'"
 
-#: 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:341
 #, c-format
 msgid ""
 "You need to give me at least one %s and %s revision.\n"
@@ -11246,7 +2344,6 @@ msgstr ""
 "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:345
 #, c-format
 msgid ""
 "You need to start by \"git bisect start\".\n"
@@ -11257,7 +2354,6 @@ msgstr ""
 "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:365
 #, c-format
 msgid "bisecting only with a %s commit"
 msgstr "haciendo bisect solo con un commit %s"
@@ -11266,15 +2362,24 @@ msgstr "haciendo bisect solo con un commit %s"
 #. translation. The program will only accept English input
 #. at this point.
 #.
-#: builtin/bisect--helper.c:373
 msgid "Are you sure [Y/n]? "
 msgstr "¿Estás seguro [Y/n]? "
 
-#: builtin/bisect--helper.c:434
+msgid "status: waiting for both good and bad commits\n"
+msgstr ""
+
+#, c-format
+msgid "status: waiting for bad commit, %d good commit known\n"
+msgid_plural "status: waiting for bad commit, %d good commits known\n"
+msgstr[0] ""
+msgstr[1] ""
+
+msgid "status: waiting for good commit(s), bad commit known\n"
+msgstr ""
+
 msgid "no terms defined"
 msgstr "no hay términos definidos"
 
-#: builtin/bisect--helper.c:437
 #, c-format
 msgid ""
 "Your current terms are %s for the old state\n"
@@ -11283,7 +2388,6 @@ msgstr ""
 "Tus términos actuales son %s para el estado viejo\n"
 "y %s para el estado nuevo.\n"
 
-#: builtin/bisect--helper.c:447
 #, c-format
 msgid ""
 "invalid argument %s for 'git bisect terms'.\n"
@@ -11292,53 +2396,42 @@ msgstr ""
 "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: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:536
 #, c-format
 msgid "could not open '%s' for appending"
 msgstr "no se pudo abrir '%s' en modo append"
 
-#: 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:678
 #, c-format
 msgid "unrecognized option: '%s'"
 msgstr "opción desconocida: '%s'"
 
-#: 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:713
 msgid "bad HEAD - I need a HEAD"
 msgstr "mal HEAD - Necesito un HEAD"
 
-#: builtin/bisect--helper.c:728
 #, c-format
 msgid "checking out '%s' failed. Try 'git bisect start <valid-branch>'."
 msgstr ""
 "error al hacer checkout '%s'. Intenta 'git bisect start <rama-válida>'."
 
-#: 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:752
 msgid "bad HEAD - strange symbolic ref"
 msgstr "mal HEAD - ref simbólico extraño"
 
-#: builtin/bisect--helper.c:772
 #, c-format
 msgid "invalid ref: '%s'"
 msgstr "ref inválido: '%s'"
 
-#: builtin/bisect--helper.c:830
 msgid "You need to start by \"git bisect start\"\n"
 msgstr "Debes iniciar con \"git bisect start\"\n"
 
@@ -11346,77 +2439,69 @@ msgstr "Debes iniciar con \"git bisect start\"\n"
 #. translation. The program will only accept English input
 #. at this point.
 #.
-#: 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:859
 msgid "Please call `--bisect-state` with at least one argument"
 msgstr "Por favor llama a `--bisect-state` con al menos un argumento"
 
-#: 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:884 builtin/bisect--helper.c:897
 #, c-format
 msgid "Bad rev input: %s"
 msgstr "Mala entrada rev: %s"
 
-#: 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:936
 msgid "We are not bisecting."
 msgstr "No estamos bisecando."
 
-#: 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:998
 #, c-format
 msgid "cannot read file '%s' for replaying"
 msgstr "no se puede leer '%s' para reproducir"
 
-#: builtin/bisect--helper.c:1107 builtin/bisect--helper.c:1274
+#, c-format
+msgid "running %s\n"
+msgstr "ejecutando %s\n"
+
 msgid "bisect run failed: no command provided."
 msgstr "bisect falló: no se proveyó comando."
 
-#: builtin/bisect--helper.c:1116
+#, fuzzy, c-format
+msgid "unable to verify '%s' on good revision"
+msgstr "no es posible escribir el archivo '%s' modo %o"
+
 #, c-format
-msgid "running %s\n"
-msgstr "ejecutando %s\n"
+msgid "bogus exit code %d for good revision"
+msgstr ""
 
-#: 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 "
@@ -11425,229 +2510,164 @@ 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:1194
 msgid "check whether bad or good terms exist"
 msgstr "revisar si existen términos malos o buenos"
 
-#: builtin/bisect--helper.c:1196
 msgid "print out the bisect terms"
 msgstr "imprimir los terms del bisect"
 
-#: builtin/bisect--helper.c:1198
 msgid "start the bisect session"
 msgstr "comenzar la sesión de bisect"
 
-#: builtin/bisect--helper.c:1200
 msgid "find the next bisection commit"
 msgstr "encontrar el siguiente commit de bisección"
 
-#: 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:1204
 msgid "list the bisection steps so far"
 msgstr "listar los pasos de bisección hasta ahora"
 
-#: 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:1208
 msgid "skip some commits for checkout"
 msgstr "saltar algunos commits para checkout"
 
-#: builtin/bisect--helper.c:1210
 msgid "visualize the bisection"
 msgstr "visualizar bisección"
 
-#: builtin/bisect--helper.c:1212
-msgid "use <cmd>... to automatically bisect."
+#, fuzzy
+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: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:1234
 msgid "--bisect-terms requires 0 or 1 argument"
 msgstr "--bisect-terms requiere 0 o 1 argumentos"
 
-#: builtin/bisect--helper.c:1243
 msgid "--bisect-next requires 0 arguments"
 msgstr "--bisect-next requiere 0 argumentos"
 
-#: builtin/bisect--helper.c:1254
 msgid "--bisect-log requires 0 arguments"
 msgstr "--bisect-log requiere 0 argumentos"
 
-#: builtin/bisect--helper.c:1259
 msgid "no logfile given"
 msgstr "ningún logfile proporcionado"
 
-#: builtin/blame.c:32
 msgid "git blame [<options>] [<rev-opts>] [<rev>] [--] <file>"
 msgstr "git blame [<opciones>] [<opciones-de-rev>] [<revisión>] [--] <archivo>"
 
-#: builtin/blame.c:37
 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:406
 #, c-format
 msgid "expecting a color: %s"
 msgstr "esperando un color: %s"
 
-#: builtin/blame.c:413
 msgid "must end with a color"
 msgstr "tiene que terminar con un color"
 
-#: 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:742
-msgid "invalid value for blame.coloring"
-msgstr "valor inválido para blame.coloring"
-
-#: 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:863
 msgid "show blame entries as we find them, incrementally"
 msgstr "mostrar las entradas blame como las encontramos, incrementalmente"
 
-#: 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:865
 msgid "do not treat root commits as boundaries (Default: off)"
 msgstr "no tratar commits raíces como extremos (Default: off)"
 
-#: builtin/blame.c:866
 msgid "show work cost statistics"
 msgstr "mostrar estadísticas de costo de trabajo"
 
-#: 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:868
 msgid "show output score for blame entries"
 msgstr "mostrar la puntuación de salida de las entradas de blame"
 
-#: builtin/blame.c:869
 msgid "show original filename (Default: auto)"
 msgstr "mostrar nombre original del archivo (Default: auto)"
 
-#: builtin/blame.c:870
 msgid "show original linenumber (Default: off)"
 msgstr "mostrar número de línea original (Default: off)"
 
-#: 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: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: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:874
 msgid "show raw timestamp (Default: off)"
 msgstr "mostrar timestamp en formato raw (Default: off)"
 
-#: builtin/blame.c:875
 msgid "show long commit SHA1 (Default: off)"
 msgstr "mostrar SHA1 del commit en formato largo (Default: off)"
 
-#: builtin/blame.c:876
 msgid "suppress author name and timestamp (Default: off)"
 msgstr "suprimir nombre del autor y timestamp (Default: off)"
 
-#: 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:878
 msgid "ignore whitespace differences"
 msgstr "ignorar diferencias de espacios en blanco"
 
-#: builtin/blame.c:879 builtin/log.c:1823
 msgid "rev"
 msgstr "rev"
 
-#: builtin/blame.c:879
 msgid "ignore <rev> when blaming"
 msgstr "ignorar <rev> durante el blame"
 
-#: builtin/blame.c:880
 msgid "ignore revisions from <file>"
 msgstr "ignorar revisiones de <archivo>"
 
-#: 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:882
 msgid "color lines by age"
 msgstr "colorear líneas por edad"
 
-#: builtin/blame.c:883
 msgid "spend extra cycles to find better match"
 msgstr "ocupar más ciclos para encontrar mejores resultados"
 
-#: builtin/blame.c:884
 msgid "use revisions from <file> instead of calling git-rev-list"
 msgstr "usar revisiones en <archivo> en lugar de llamar git-rev-list"
 
-#: builtin/blame.c:885
 msgid "use <file>'s contents as the final image"
 msgstr "usar contenido de <archivo> como imagen final"
 
-#: builtin/blame.c:886 builtin/blame.c:887
 msgid "score"
 msgstr "puntaje"
 
-#: 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: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:888
 msgid "range"
 msgstr "rango"
 
-#: 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:944
 msgid "--progress can't be used with --incremental or porcelain formats"
 msgstr ""
 "--progress no puede ser usado con --incremental o formatos de porcelana"
@@ -11660,50 +2680,46 @@ msgstr ""
 #. your language may need more or fewer display
 #. columns.
 #.
-#: builtin/blame.c:995
 msgid "4 years, 11 months ago"
 msgstr "hace 4 años, 11 meses"
 
-#: 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:1156
 msgid "Blaming lines"
 msgstr "Blaming a líneas"
 
-#: builtin/branch.c:29
 msgid "git branch [<options>] [-r | -a] [--merged] [--no-merged]"
 msgstr "git branch [<opciones>] [-r | -a] [--merged] [--no-merged]"
 
-#: builtin/branch.c:30
-msgid "git branch [<options>] [-l] [-f] <branch-name> [<start-point>]"
+#, fuzzy
+msgid ""
+"git branch [<options>] [-f] [--recurse-submodules] <branch-name> [<start-"
+"point>]"
 msgstr "git branch [<opciones>] [-l] [-f] <nombre-de-rama> [<punto-inicial>]"
 
-#: builtin/branch.c:31
+#, fuzzy
+msgid "git branch [<options>] [-l] [<pattern>...]"
+msgstr "git for-each-ref [<opciones>] [<patrón>]"
+
 msgid "git branch [<options>] [-r] (-d | -D) <branch-name>..."
 msgstr "git branch [<opciones>] [-r] (-d | -D) <nombre-de-rama>..."
 
-#: builtin/branch.c:32
 msgid "git branch [<options>] (-m | -M) [<old-branch>] <new-branch>"
 msgstr "git branch [<opciones>] (-m | -M) [<rama-vieja>] <rama-nueva>"
 
-#: builtin/branch.c:33
 msgid "git branch [<options>] (-c | -C) [<old-branch>] <new-branch>"
 msgstr "git branch [<opciones>] (-c | -C) [<rama-vieja>] <rama-nueva>"
 
-#: builtin/branch.c:34
 msgid "git branch [<options>] [-r | -a] [--points-at]"
 msgstr "git branch [<opciones>] [-r | -a] [--points-at]"
 
-#: builtin/branch.c:35
 msgid "git branch [<options>] [-r | -a] [--format]"
 msgstr "git branch [<opciones>] [-r | -a] [--formato]"
 
-#: builtin/branch.c:154
 #, c-format
 msgid ""
 "deleting branch '%s' that has been merged to\n"
@@ -11712,7 +2728,6 @@ msgstr ""
 "borrando la rama '%s' que ha sido fusionada en\n"
 "         '%s', pero aún no ha sido fusionada a HEAD."
 
-#: builtin/branch.c:158
 #, c-format
 msgid ""
 "not deleting branch '%s' that is not yet merged to\n"
@@ -11721,12 +2736,10 @@ msgstr ""
 "no borrando rama '%s' que todavía no ha sido fusionada a\n"
 "         '%s', aunque se ha fusionado con HEAD."
 
-#: builtin/branch.c:172
 #, c-format
 msgid "Couldn't look up commit object for '%s'"
 msgstr "No se pudo encontrar el objeto commit para '%s'"
 
-#: builtin/branch.c:176
 #, c-format
 msgid ""
 "The branch '%s' is not fully merged.\n"
@@ -11735,115 +2748,91 @@ msgstr ""
 "La rama '%s' no ha sido fusionada completamente.\n"
 "Si estás seguro de querer borrarla, ejecuta 'git branch -D %s'."
 
-#: builtin/branch.c:189
 msgid "Update of config-file failed"
 msgstr "Falló de actualización de config-file"
 
-#: builtin/branch.c:223
 msgid "cannot use -a with -d"
 msgstr "no se puede usar -a con -d"
 
-#: builtin/branch.c:230
 msgid "Couldn't look up commit object for HEAD"
 msgstr "No se pudo revisar el objeto commit para HEAD"
 
-#: builtin/branch.c:244
 #, c-format
 msgid "Cannot delete branch '%s' checked out at '%s'"
 msgstr "No se puede borrar rama '%s' que cuenta con checkout en '%s'"
 
-#: builtin/branch.c:259
 #, c-format
 msgid "remote-tracking branch '%s' not found."
 msgstr "rama de rastreo remoto '%s' no encontrada."
 
-#: builtin/branch.c:260
 #, c-format
 msgid "branch '%s' not found."
 msgstr "rama '%s' no encontrada."
 
-#: builtin/branch.c:291
 #, c-format
 msgid "Deleted remote-tracking branch %s (was %s).\n"
 msgstr "Eliminada la rama de rastreo remota %s (era %s).\n"
 
-#: builtin/branch.c:292
 #, c-format
 msgid "Deleted branch %s (was %s).\n"
 msgstr "Eliminada la rama %s (era %s).\n"
 
-#: 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:472
 msgid "could not resolve HEAD"
 msgstr "no se pudo resolver HEAD"
 
-#: 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:493
 #, c-format
 msgid "Branch %s is being rebased at %s"
 msgstr "Rama %s está siendo rebasada en %s"
 
-#: 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: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: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:527
 #, c-format
 msgid "Invalid branch name: '%s'"
 msgstr "Nombre de rama inválido: '%s'"
 
-#: builtin/branch.c:556
 msgid "Branch rename failed"
 msgstr "Cambio de nombre de rama fallido"
 
-#: builtin/branch.c:558
 msgid "Branch copy failed"
 msgstr "Duplicación de rama fallida"
 
-#: 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:565
 #, c-format
 msgid "Renamed a misnamed branch '%s' away"
 msgstr "Rama mal llamada '%s' renombrada"
 
-#: 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: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: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:598
 #, c-format
 msgid ""
 "Please edit the description for the branch\n"
@@ -11854,180 +2843,146 @@ msgstr ""
 "%s\n"
 "Las líneas que comiencen con '%c' serán eliminadas.\n"
 
-#: builtin/branch.c:632
 msgid "Generic options"
 msgstr "Opciones genéricas"
 
-#: 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:635
 msgid "suppress informational messages"
 msgstr "suprimir mensajes informativos"
 
-#: builtin/branch.c:636
-msgid "set up tracking mode (see git-pull(1))"
-msgstr "configurando modo tracking (mirar git-pull(1))"
+#, fuzzy
+msgid "set branch tracking configuration"
+msgstr "mostrar información de la rama"
 
-#: builtin/branch.c:638
 msgid "do not use"
 msgstr "no usar"
 
-#: builtin/branch.c:640
 msgid "upstream"
 msgstr "upstream"
 
-#: builtin/branch.c:640
 msgid "change the upstream info"
 msgstr "cambiar 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:643
 msgid "act on remote-tracking branches"
 msgstr "actuar en ramas de rastreo remoto"
 
-#: 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: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:651
 msgid "Specific git-branch actions:"
 msgstr "Acciones específicas de git-branch:"
 
-#: builtin/branch.c:652
 msgid "list both remote-tracking and local branches"
 msgstr "listar ramas de remote-tracking y locales"
 
-#: builtin/branch.c:654
 msgid "delete fully merged branch"
 msgstr "borrar ramas totalmente fusionadas"
 
-#: builtin/branch.c:655
 msgid "delete branch (even if not merged)"
 msgstr "borrar rama (incluso si no está fusionada)"
 
-#: builtin/branch.c:656
 msgid "move/rename a branch and its reflog"
 msgstr "mover/renombrar una rama y su reflog"
 
-#: 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:658
 msgid "copy a branch and its reflog"
 msgstr "copiar una rama y su reflog"
 
-#: builtin/branch.c:659
 msgid "copy a branch, even if target exists"
 msgstr "copiar una rama, incluso si el destino existe"
 
-#: builtin/branch.c:660
 msgid "list branch names"
 msgstr "listar nombres de ramas"
 
-#: builtin/branch.c:661
 msgid "show current branch name"
 msgstr "mostrar el nombre de branch actual"
 
-#: builtin/branch.c:662
 msgid "create the branch's reflog"
 msgstr "crear el reflog de la rama"
 
-#: builtin/branch.c:664
 msgid "edit the description for the branch"
 msgstr "editar la descripción de la rama"
 
-#: builtin/branch.c:665
 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 merged"
 msgstr "mostrar solo ramas que hayan sido fusionadas"
 
-#: builtin/branch.c:667
 msgid "print only branches that are not merged"
 msgstr "mostrar solo ramas que no han sido fusionadas"
 
-#: 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:671
 msgid "print only branches of the object"
 msgstr "imprimir solo las ramas del objeto"
 
-#: 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:673 builtin/for-each-ref.c:40 builtin/tag.c:480
-#: builtin/verify-tag.c:38
+msgid "recurse through submodules"
+msgstr "recurrir a través de submódulos"
+
 msgid "format to use for the output"
 msgstr "formato para usar para el output"
 
-#: builtin/branch.c:696 builtin/clone.c:678
+msgid "Failed to resolve HEAD as a valid ref."
+msgstr "Falló al resolver HEAD como un ref válido."
+
 msgid "HEAD not found below refs/heads!"
 msgstr "¡HEAD no encontrado dentro de refs/heads!"
 
-#: builtin/branch.c:720
-msgid "--column and --verbose are incompatible"
-msgstr "--column y --verbose son incompatibles"
+msgid ""
+"branch with --recurse-submodules can only be used if submodule."
+"propagateBranches is enabled"
+msgstr ""
+
+msgid "--recurse-submodules can only be used to create branches"
+msgstr ""
 
-#: 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:768
 msgid "Cannot give description to detached HEAD"
 msgstr "No se puede dar descripción al HEAD desacoplado"
 
-#: 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:780
 #, c-format
 msgid "No commit on branch '%s' yet."
 msgstr "Aún no hay commits en la rama '%s'."
 
-#: builtin/branch.c:783
 #, c-format
 msgid "No branch named '%s'."
 msgstr "No hay ninguna rama llamada '%s'."
 
-#: 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:807
 msgid "too many arguments for a rename operation"
 msgstr "demasiados argumentos para una operación de renombramiento"
 
-#: builtin/branch.c:812
 msgid "too many arguments to set new upstream"
 msgstr "demasiados argumentos para configurar un nuevo upstream"
 
-#: builtin/branch.c:816
 #, c-format
 msgid ""
 "could not set upstream of HEAD to %s when it does not point to any branch."
@@ -12035,32 +2990,26 @@ msgstr ""
 "no se pudo configurar upstream de HEAD a %s cuando este no apunta a ninguna "
 "rama."
 
-#: builtin/branch.c:819 builtin/branch.c:842
 #, c-format
 msgid "no such branch '%s'"
 msgstr "no hay tal rama '%s'"
 
-#: builtin/branch.c:823
 #, c-format
 msgid "branch '%s' does not exist"
 msgstr "la rama '%s' no existe"
 
-#: builtin/branch.c:836
 msgid "too many arguments to unset upstream"
 msgstr "demasiados argumentos para desconfigurar upstream"
 
-#: 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:846
 #, c-format
 msgid "Branch '%s' has no upstream information"
 msgstr "Rama '%s' no tiene información de upstream"
 
-#: 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>?"
@@ -12068,7 +3017,6 @@ msgstr ""
 "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:860
 msgid ""
 "the '--set-upstream' option is no longer supported. Please use '--track' or "
 "'--set-upstream-to' instead."
@@ -12076,33 +3024,26 @@ msgstr ""
 "la opción '--set-upstream' ya no es soportada. Considera usar '--track' o '--"
 "set-upstream-to' en cambio."
 
-#: builtin/bugreport.c:16
 msgid "git version:\n"
 msgstr "versión de git:\n"
 
-#: 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:32
 msgid "compiler info: "
 msgstr "información del compilador: "
 
-#: builtin/bugreport.c:35
 msgid "libc info: "
 msgstr "información de libc: "
 
-#: 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:62
 msgid "git bugreport [-o|--output-directory <file>] [-s|--suffix <format>]"
 msgstr ""
 "git bugreport [-o|--output-directory <archivo>] [-s|--suffix <formato>]"
 
-#: 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"
@@ -12138,429 +3079,428 @@ msgstr ""
 "Por favor revisa el resto del reporte abajo.\n"
 "Puedes borrar cualquier línea que no desees compartir.\n"
 
-#: 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: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:132
 #, c-format
 msgid "could not create leading directories for '%s'"
 msgstr "no se pudo crear directorios principales para '%s'"
 
-#: builtin/bugreport.c:139
 msgid "System Info"
 msgstr "Información del sistema"
 
-#: builtin/bugreport.c:142
 msgid "Enabled Hooks"
 msgstr "Hooks habilitados"
 
-#: builtin/bugreport.c:149
 #, c-format
 msgid "unable to write to %s"
 msgstr "no es posible escribir en %s"
 
-#: builtin/bugreport.c:159
 #, c-format
 msgid "Created new report at '%s'.\n"
 msgstr "Crear un nuevo reporte en '%s'.\n"
 
-#: builtin/bundle.c:15 builtin/bundle.c:23
 msgid "git bundle create [<options>] <file> <git-rev-list args>"
 msgstr "git bundle create [<opciones>] <file> <git-rev-list args>"
 
-#: builtin/bundle.c:16 builtin/bundle.c:28
 msgid "git bundle verify [<options>] <file>"
 msgstr "git bundle verify [<opciones>] <archivo>"
 
-#: builtin/bundle.c:17 builtin/bundle.c:33
 msgid "git bundle list-heads <file> [<refname>...]"
 msgstr "git bundle list-heads <archivo> [<nombre-de-ref>...]"
 
-#: builtin/bundle.c:18 builtin/bundle.c:38
 msgid "git bundle unbundle <file> [<refname>...]"
 msgstr "git bundle unbundle <archivo> [<nombre-de-ref>...]"
 
-#: builtin/bundle.c:65 builtin/pack-objects.c:3876
 msgid "do not show progress meter"
 msgstr "no mostrar medidor de progreso"
 
-#: 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: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: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:74
 msgid "specify bundle format version"
 msgstr "especificar la versión del formato del paquete"
 
-#: builtin/bundle.c:94
 msgid "Need a repository to create a bundle."
 msgstr "Se necesita un repositorio para agrupar."
 
-#: builtin/bundle.c:107
 msgid "do not show bundle details"
 msgstr "no mostrar detalles del bundle"
 
-#: builtin/bundle.c:126
 #, c-format
 msgid "%s is okay\n"
 msgstr "%s está bien\n"
 
-#: builtin/bundle.c:182
 msgid "Need a repository to unbundle."
 msgstr "Se necesita un repositorio para desagrupar."
 
-#: builtin/bundle.c:185
 msgid "Unbundling objects"
 msgstr "Desagrupando objetos"
 
-#: builtin/bundle.c:219 builtin/remote.c:1733
 #, c-format
 msgid "Unknown subcommand: %s"
 msgstr "Sub-comando desconocido: %s"
 
-#: 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>"
+#, c-format
+msgid "cannot read object %s '%s'"
+msgstr "no se puede leer el objeto %s '%s'"
+
+msgid "flush is only for --buffer mode"
+msgstr ""
+
+#, fuzzy
+msgid "empty command in input"
+msgstr "comando exec vacío"
+
+#, fuzzy, c-format
+msgid "whitespace before command: '%s'"
+msgstr "editar mensaje antes de realizar commit"
+
+#, fuzzy, c-format
+msgid "%s requires arguments"
+msgstr "-n requiere un argumento"
+
+#, fuzzy, c-format
+msgid "%s takes no arguments"
+msgstr "%s no toma valores"
+
+#, fuzzy, c-format
+msgid "unknown command: '%s'"
+msgstr "comando desconocido: %d"
+
+msgid "only one batch option may be specified"
+msgstr "solo se puede especificar una opción batch"
+
+#, fuzzy
+msgid "git cat-file <type> <object>"
+msgstr "git notes edit [<objeto>]"
+
+#, fuzzy
+msgid "git cat-file (-e | -p) <object>"
+msgstr "git notes edit [<objeto>]"
+
+msgid "git cat-file (-t | -s) [--allow-unknown-type] <object>"
 msgstr ""
-"git cat-file (-t [--allow-unknown-type] | -s [--allow-unknown-type] | -e | -"
-"p | <tipo> | --textconv | --filters) [--path=<ruta>] <objeto>"
 
-#: builtin/cat-file.c:623
+#, fuzzy
 msgid ""
-"git cat-file (--batch[=<format>] | --batch-check[=<format>]) [--follow-"
-"symlinks] [--textconv | --filters]"
+"git cat-file (--batch | --batch-check | --batch-command) [--batch-all-"
+"objects]\n"
+"             [--buffer] [--follow-symlinks] [--unordered]\n"
+"             [--textconv | --filters]"
 msgstr ""
 "git cat-file (--batch[=<formato>] | --batch-check[=<formato>]) [--follow-"
 "symlinks] [--textconv | --filters]"
 
-#: builtin/cat-file.c:644
-msgid "only one batch option may be specified"
-msgstr "solo se puede especificar una opción batch"
+msgid ""
+"git cat-file (--textconv | --filters)\n"
+"             [<rev>:<path|tree-ish> | --path=<path|tree-ish> <rev>]"
+msgstr ""
 
-#: builtin/cat-file.c:662
-msgid "<type> can be one of: blob, tree, commit, tag"
-msgstr "<tipo> puede ser: blob, tree, commit, tag"
+#, fuzzy
+msgid "Check object existence or emit object contents"
+msgstr "para objetos blob, ejecuta textconv en el contenido del objeto"
+
+#, fuzzy
+msgid "check if <object> exists"
+msgstr "Revisando objetos"
+
+#, fuzzy
+msgid "pretty-print <object> content"
+msgstr "realizar pretty-print del contenido del objeto"
+
+msgid "Emit [broken] object attributes"
+msgstr ""
 
-#: builtin/cat-file.c:663
-msgid "show object type"
-msgstr "mostrar el tipo del objeto"
+#, fuzzy
+msgid "show object type (one of 'blob', 'tree', 'commit', 'tag', ...)"
+msgstr "<tipo> puede ser: blob, tree, commit, tag"
 
-#: builtin/cat-file.c:664
 msgid "show object size"
 msgstr "mostrar el tamaño del objeto"
 
-#: builtin/cat-file.c:666
-msgid "exit with zero when there's no error"
-msgstr "salir con cero cuando no haya error"
+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:667
-msgid "pretty-print object's content"
-msgstr "realizar pretty-print del contenido del objeto"
+msgid "Batch objects requested on stdin (or --batch-all-objects)"
+msgstr ""
+
+msgid "show full <object> or <rev> contents"
+msgstr ""
+
+msgid "like --batch, but don't emit <contents>"
+msgstr ""
+
+#, fuzzy
+msgid "read commands from stdin"
+msgstr "leer packs de stdin"
+
+msgid "with --batch[-check]: ignores stdin, batches all known objects"
+msgstr ""
+
+msgid "Change or optimize batch output"
+msgstr ""
 
-#: builtin/cat-file.c:669
-msgid "for blob objects, run textconv on object's content"
+msgid "buffer --batch output"
+msgstr "salida buffer --batch"
+
+#, fuzzy
+msgid "follow in-tree symlinks"
+msgstr "no se pudo leer el symlink %s"
+
+#, fuzzy
+msgid "do not order objects before emitting them"
+msgstr "no se pudo leer el objeto %s para el symlink %s"
+
+msgid ""
+"Emit object (blob or tree) with conversion or filter (stand-alone, or with "
+"batch)"
+msgstr ""
+
+#, fuzzy
+msgid "run textconv on object's content"
 msgstr "para objetos blob, ejecuta textconv en el contenido del objeto"
 
-#: builtin/cat-file.c:671
-msgid "for blob objects, run filters on object's content"
+#, fuzzy
+msgid "run filters on object's content"
 msgstr "para objetos blob, ejecuta filters en el contenido del objeto"
 
-#: builtin/cat-file.c:672
-msgid "blob"
+#, fuzzy
+msgid "blob|tree"
 msgstr "blob"
 
-#: builtin/cat-file.c:673
-msgid "use a specific path for --textconv/--filters"
+#, fuzzy
+msgid "use a <path> for (--textconv | --filters); Not with 'batch'"
 msgstr "usar una ruta específica para --textconv/--filters"
 
-#: 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"
+#, c-format
+msgid "'%s=<%s>' needs '%s' or '%s'"
+msgstr ""
 
-#: builtin/cat-file.c:676
-msgid "buffer --batch output"
-msgstr "salida buffer --batch"
+#, fuzzy
+msgid "path|tree-ish"
+msgstr "árbol-ismo"
+
+#, fuzzy, c-format
+msgid "'%s' requires a batch mode"
+msgstr "%s requiere un valor"
 
-#: 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"
+#, fuzzy, c-format
+msgid "'-%c' is incompatible with batch mode"
+msgstr "%s es incompatible con %s"
 
-#: 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"
+#, fuzzy
+msgid "batch modes take no arguments"
+msgstr "esta opción no requiere argumentos"
 
-#: builtin/cat-file.c:686
-msgid "follow in-tree symlinks (used with --batch or --batch-check)"
+#, c-format
+msgid "<rev> required with '%s'"
 msgstr ""
-"seguir los enlaces simbólicos en el árbol (usado con --batch o --batch-check)"
 
-#: builtin/cat-file.c:688
-msgid "show all objects with --batch or --batch-check"
-msgstr "mostrar todos los objetos con --batch o --batch-check"
+#, c-format
+msgid "<object> required with '-%c'"
+msgstr ""
 
-#: builtin/cat-file.c:690
-msgid "do not order --batch-all-objects output"
-msgstr "no ordenar la salida de --batch-all-objects"
+msgid "too many arguments"
+msgstr "demasiados argumentos"
+
+#, c-format
+msgid "only two arguments allowed in <type> <object> mode, not %d"
+msgstr ""
 
-#: builtin/check-attr.c:13
 msgid "git check-attr [-a | --all | <attr>...] [--] <pathname>..."
 msgstr "git check-attr [-a | --all | <attr>...] [--] <nombre-de-ruta>..."
 
-#: builtin/check-attr.c:14
 msgid "git check-attr --stdin [-z] [-a | --all | <attr>...]"
 msgstr "git check-attr --stdin [-z] [-a | --all | <attr>...]"
 
-#: builtin/check-attr.c:21
 msgid "report all attributes set on file"
 msgstr "reportar todos los atributos configurados en el archivo"
 
-#: builtin/check-attr.c:22
 msgid "use .gitattributes only from the index"
 msgstr "usar .gitattributes solo desde el índice"
 
-#: 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"
 
-#: builtin/check-attr.c:25 builtin/check-ignore.c:27
 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:1513 builtin/gc.c:549
-#: builtin/worktree.c:494
 msgid "suppress progress reporting"
 msgstr "suprimir el reporte de progreso"
 
-#: builtin/check-ignore.c:29
 msgid "show non-matching input paths"
 msgstr "mostrar rutas de entrada que no concuerden"
 
-#: builtin/check-ignore.c:31
 msgid "ignore index when checking"
 msgstr "ignorar el índice cuando se revise"
 
-#: builtin/check-ignore.c:165
 msgid "cannot specify pathnames with --stdin"
 msgstr "no se puede especificar los nombres de rutas con --stdin"
 
-#: builtin/check-ignore.c:168
 msgid "-z only makes sense with --stdin"
 msgstr "-z solo tiene sentido con --stdin"
 
-#: builtin/check-ignore.c:170
 msgid "no path specified"
 msgstr "ruta no especificada"
 
-#: builtin/check-ignore.c:174
 msgid "--quiet is only valid with a single pathname"
 msgstr "--quiet solo es válido con un nombre de ruta único"
 
-#: builtin/check-ignore.c:176
 msgid "cannot have both --quiet and --verbose"
 msgstr "no se puede tener ambos --quiet y --verbose"
 
-#: builtin/check-ignore.c:179
 msgid "--non-matching is only valid with --verbose"
 msgstr "--non-matching solo es válida con --verbose"
 
-#: builtin/check-mailmap.c:9
 msgid "git check-mailmap [<options>] <contact>..."
 msgstr "git check-mailmap [<opciones>] <contacto>..."
 
-#: builtin/check-mailmap.c:14
 msgid "also read contacts from stdin"
 msgstr "también leer contactos desde stdin"
 
-#: builtin/check-mailmap.c:25
 #, c-format
 msgid "unable to parse contact: %s"
 msgstr "no es posible analizar el contacto: %s"
 
-#: builtin/check-mailmap.c:48
 msgid "no contacts specified"
 msgstr "contactos no especificados"
 
-#: builtin/checkout--worker.c:110
 msgid "git checkout--worker [<options>]"
 msgstr "git checkout--worker [<opciones>]"
 
-#: 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 "string"
 
-#: builtin/checkout--worker.c:119 builtin/checkout-index.c:202
 msgid "when creating files, prepend <string>"
 msgstr "cuando cree archivos, anteponer <string>"
 
-#: builtin/checkout-index.c:152
 msgid "git checkout-index [<options>] [--] [<file>...]"
 msgstr "git checkout-index [<opciones>] [--] [<archivo>...]"
 
-#: builtin/checkout-index.c:169
 msgid "stage should be between 1 and 3 or all"
 msgstr "stage tiene que estar entre 1 y 3 o all"
 
-#: builtin/checkout-index.c:187
 msgid "check out all files in the index"
 msgstr "revisar todos los archivos en el índice"
 
-#: builtin/checkout-index.c:188
+msgid "do not skip files with skip-worktree set"
+msgstr ""
+
 msgid "force overwrite of existing files"
 msgstr "forzar sobreescritura de los archivos existentes"
 
-#: builtin/checkout-index.c:190
 msgid "no warning for existing files and files not in index"
 msgstr ""
 "no hay advertencias para los archivos existentes y los archivos no están en "
 "el índice"
 
-#: builtin/checkout-index.c:192
 msgid "don't checkout new files"
 msgstr "no revisar archivos nuevos"
 
-#: builtin/checkout-index.c:194
 msgid "update stat information in the index file"
 msgstr "actualizar información de estado en el archivo índice"
 
-#: builtin/checkout-index.c:198
 msgid "read list of paths from the standard input"
 msgstr "leer lista de rutas desde standard input"
 
-#: builtin/checkout-index.c:200
 msgid "write the content to temporary files"
 msgstr "escribir el contenido en un archivo temporal"
 
-#: builtin/checkout-index.c:204
 msgid "copy out the files from named stage"
 msgstr "copiar los archivos del stage nombrado"
 
-#: builtin/checkout.c:33
 msgid "git checkout [<options>] <branch>"
 msgstr "git checkout [<opciones>]  <rama>"
 
-#: builtin/checkout.c:34
 msgid "git checkout [<options>] [<branch>] -- <file>..."
 msgstr "git checkout [<opciones>] [<rama>] -- <archivo>..."
 
-#: builtin/checkout.c:39
 msgid "git switch [<options>] [<branch>]"
 msgstr "git switch [<opciones>] [<rama>]"
 
-#: builtin/checkout.c:44
 msgid "git restore [<options>] [--source=<branch>] <file>..."
 msgstr "git restore [<opciones>] [--source=<rama>] -- <archivo>..."
 
-#: builtin/checkout.c:190 builtin/checkout.c:229
 #, c-format
 msgid "path '%s' does not have our version"
 msgstr "ruta '%s' no tiene nuestra versión"
 
-#: builtin/checkout.c:192 builtin/checkout.c:231
 #, c-format
 msgid "path '%s' does not have their version"
 msgstr "ruta '%s' no tiene su versión"
 
-#: builtin/checkout.c:208
 #, c-format
 msgid "path '%s' does not have all necessary versions"
 msgstr "ruta '%s' no tiene todas las versiones necesarias"
 
-#: builtin/checkout.c:261
 #, c-format
 msgid "path '%s' does not have necessary versions"
 msgstr "ruta '%s' no tiene versiones necesarias"
 
-#: builtin/checkout.c:278
 #, c-format
 msgid "path '%s': cannot merge"
 msgstr "ruta '%s': no se puede fusionar"
 
-#: builtin/checkout.c:294
 #, c-format
 msgid "Unable to add merge result for '%s'"
 msgstr "Incapaz de agregar resultados de fusión a '%s'"
 
-#: builtin/checkout.c:411
 #, c-format
 msgid "Recreated %d merge conflict"
 msgid_plural "Recreated %d merge conflicts"
 msgstr[0] "Recreado %d conflicto de merge"
 msgstr[1] "Recreados %d conflictos de merge"
 
-#: builtin/checkout.c:416
 #, c-format
 msgid "Updated %d path from %s"
 msgid_plural "Updated %d paths from %s"
 msgstr[0] "Actualizada %d ruta desde %s"
 msgstr[1] "Actualizadas %d rutas desde %s"
 
-#: builtin/checkout.c:423
 #, c-format
 msgid "Updated %d path from the index"
 msgid_plural "Updated %d paths from the index"
 msgstr[0] "Actualizada %d ruta desde el índice"
 msgstr[1] "Actualizadas %d rutas desde el índice"
 
-#: 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 puede ser usada con rutas actualizadas"
 
-#: builtin/checkout.c:459 builtin/checkout.c:462
-#, c-format
-msgid "'%s' cannot be used with %s"
-msgstr "'%s' no puede ser usado con %s"
-
-#: builtin/checkout.c:466
 #, c-format
 msgid "Cannot update paths and switch to branch '%s' at the same time."
 msgstr "No se puede actualizar rutas y cambiar a la rama '%s' al mismo tiempo."
 
-#: builtin/checkout.c:470
 #, c-format
 msgid "neither '%s' or '%s' is specified"
 msgstr "ni '%s' ni '%s' están especificados"
 
-#: builtin/checkout.c:474
 #, c-format
 msgid "'%s' must be used when '%s' is not specified"
 msgstr "'%s' tiene que ser usado cuando '%s' no es especificado"
 
-#: builtin/checkout.c:479 builtin/checkout.c:484
 #, c-format
 msgid "'%s' or '%s' cannot be used with %s"
 msgstr "'%s' o '%s' no puede ser usado con %s"
 
-#: builtin/checkout.c:558 builtin/checkout.c:565
 #, c-format
 msgid "path '%s' is unmerged"
 msgstr "ruta '%s' no está fusionada"
 
-#: builtin/checkout.c:736
 msgid "you need to resolve your current index first"
 msgstr "necesitas resolver tu índice actual primero"
 
-#: builtin/checkout.c:786
 #, c-format
 msgid ""
 "cannot continue with staged changes in the following files:\n"
@@ -12569,50 +3509,40 @@ msgstr ""
 "no se puede continuar con los cambios en stage en los siguientes archivos:\n"
 "%s"
 
-#: 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:921
 msgid "HEAD is now at"
 msgstr "HEAD está ahora en"
 
-#: 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:929
 #, c-format
 msgid "Reset branch '%s'\n"
 msgstr "Reiniciar rama '%s'\n"
 
-#: builtin/checkout.c:932
 #, c-format
 msgid "Already on '%s'\n"
 msgstr "Ya en '%s'\n"
 
-#: 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: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:940
 #, c-format
 msgid "Switched to branch '%s'\n"
 msgstr "Cambiado a rama '%s'\n"
 
-#: builtin/checkout.c:991
 #, c-format
 msgid " ... and %d more.\n"
 msgstr " ... y %d más.\n"
 
-#: builtin/checkout.c:997
 #, c-format
 msgid ""
 "Warning: you are leaving %d commit behind, not connected to\n"
@@ -12635,7 +3565,6 @@ msgstr[1] ""
 "\n"
 "%s\n"
 
-#: 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"
@@ -12662,19 +3591,15 @@ msgstr[1] ""
 " git branch <nombre-de-rama> %s\n"
 "\n"
 
-#: builtin/checkout.c:1051
 msgid "internal error in revision walk"
 msgstr "error interno en recorrido de revisiones"
 
-#: builtin/checkout.c:1055
 msgid "Previous HEAD position was"
 msgstr "La posición previa de HEAD era"
 
-#: 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:1177
 #, c-format
 msgid ""
 "'%s' could be both a local file and a tracking branch.\n"
@@ -12683,7 +3608,6 @@ msgstr ""
 "'%s' puede ser tanto un archivo local como una rama de rastreo.\n"
 "Por favor usa -- (y opcionalmente --no-guess) para desambiguar"
 
-#: 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"
@@ -12703,51 +3627,45 @@ msgstr ""
 "un remoto particular, como 'origin', considera configurar\n"
 "checkout.defaultRemote=origin en tu configuración."
 
-#: 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:1260
 msgid "only one reference expected"
 msgstr "solo una referencia esperada"
 
-#: builtin/checkout.c:1277
 #, c-format
 msgid "only one reference expected, %d given."
 msgstr "solo una referencia esperada, %d entregadas."
 
-#: 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: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:1383
 #, c-format
 msgid "a branch is expected, got tag '%s'"
 msgstr "se esperaba un branch, se obtuvo tag '%s'"
 
-#: 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:1386 builtin/checkout.c:1394
 #, c-format
 msgid "a branch is expected, got '%s'"
 msgstr "se esperaba branch, se obtuvo '%s'"
 
-#: 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:1405
+msgid ""
+"If you want to detach HEAD at the commit, try again with the --detach option."
+msgstr ""
+
 msgid ""
 "cannot switch branch while merging\n"
 "Consider \"git merge --quit\" or \"git worktree add\"."
@@ -12755,7 +3673,6 @@ msgstr ""
 "no se puede cambiar de branch durante un merge\n"
 "Considera \"git merge --quit\" o \"git worktree add\"."
 
-#: builtin/checkout.c:1409
 msgid ""
 "cannot switch branch in the middle of an am session\n"
 "Consider \"git am --quit\" or \"git worktree add\"."
@@ -12763,7 +3680,6 @@ msgstr ""
 "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:1413
 msgid ""
 "cannot switch branch while rebasing\n"
 "Consider \"git rebase --quit\" or \"git worktree add\"."
@@ -12771,7 +3687,6 @@ msgstr ""
 "no se puede cambiar de branch durante un rebase\n"
 "Considera \"git rebase --quit\" o \"git worktree add\"."
 
-#: builtin/checkout.c:1417
 msgid ""
 "cannot switch branch while cherry-picking\n"
 "Consider \"git cherry-pick --quit\" or \"git worktree add\"."
@@ -12779,7 +3694,6 @@ msgstr ""
 "no se puede cambiar de branch durante un cherry-pick\n"
 "Considera \"git cherry-pick --quit\" o \"git worktree add\"."
 
-#: builtin/checkout.c:1421
 msgid ""
 "cannot switch branch while reverting\n"
 "Consider \"git revert --quit\" or \"git worktree add\"."
@@ -12787,137 +3701,94 @@ msgstr ""
 "no se puede cambiar de branch durante un revert\n"
 "Considera \"git revert --quit\" o \"git worktree add\"."
 
-#: builtin/checkout.c:1425
 msgid "you are switching branch while bisecting"
 msgstr "estás cambiando de rama durante un bisect"
 
-#: 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: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: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:1460
 #, c-format
 msgid "'%s' cannot take <start-point>"
 msgstr "'%s' no puede tomar <punto de partida>"
 
-#: 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:1475
 msgid "missing branch or commit argument"
 msgstr "falta branch o commit como argumento"
 
-#: 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:1519 builtin/log.c:1810 parse-options.h:322
 msgid "style"
 msgstr "estilo"
 
-#: builtin/checkout.c:1520
-msgid "conflict style (merge or diff3)"
+#, fuzzy
+msgid "conflict style (merge, diff3, or zdiff3)"
 msgstr "estilo de conflictos (merge o diff3)"
 
-#: builtin/checkout.c:1532 builtin/worktree.c:489
 msgid "detach HEAD at named commit"
 msgstr "desacoplar HEAD en el commit nombrado"
 
-#: builtin/checkout.c:1533
-msgid "set upstream info for new branch"
-msgstr "configurar info de upstream para una rama nueva"
-
-#: builtin/checkout.c:1535
 msgid "force checkout (throw away local modifications)"
 msgstr "forzar el checkout (descartar modificaciones locales)"
 
-#: builtin/checkout.c:1537
 msgid "new-branch"
 msgstr "nueva-rama"
 
-#: builtin/checkout.c:1537
 msgid "new unparented branch"
 msgstr "nueva rama no emparentada"
 
-#: builtin/checkout.c:1539 builtin/merge.c:302
 msgid "update ignored files (default)"
 msgstr "actualizar archivos ignorados (default)"
 
-#: 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:1555
 msgid "checkout our version for unmerged files"
 msgstr "hacer checkout a nuestra versión para archivos sin fusionar"
 
-#: 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:1562
 msgid "do not limit pathspecs to sparse entries only"
 msgstr "no limitar pathspecs a entradas escasas solamente"
 
-#: 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:1624
-msgid "-p and --overlay are mutually exclusive"
-msgstr "-p y --overlay son mutuamente exclusivas"
+#, fuzzy, c-format
+msgid "options '-%c', '-%c', and '%s' cannot be used together"
+msgstr "Opciones --squash y --fixup no pueden ser usadas juntas"
 
-#: builtin/checkout.c:1661
 msgid "--track needs a branch name"
 msgstr "--track necesita el nombre de una rama"
 
-#: builtin/checkout.c:1666
 #, c-format
 msgid "missing branch name; try -%c"
 msgstr "falta nombre de rama; prueba -%c"
 
-#: builtin/checkout.c:1698
 #, c-format
 msgid "could not resolve %s"
 msgstr "no se pudo resolver %s"
 
-#: builtin/checkout.c:1714
 msgid "invalid path specification"
 msgstr "especificación de ruta inválida"
 
-#: 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: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:1734
-msgid "--pathspec-from-file is incompatible with --detach"
-msgstr "--pathspec-from-file es incompatible con --detach"
-
-#: 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:1750
 msgid ""
 "git checkout: --ours/--theirs, --force and --merge are incompatible when\n"
 "checking out of the index."
@@ -12925,106 +3796,91 @@ msgstr ""
 "git checkout: --ours/--theirs, --force y --merge son incompatibles cuando\n"
 "se revisa fuera del índice."
 
-#: builtin/checkout.c:1755
 msgid "you must specify path(s) to restore"
 msgstr "debes especificar path(s) para restaurar"
 
-#: 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:1782
 msgid "create and checkout a new branch"
 msgstr "crear y hacer checkout a una nueva rama"
 
-#: builtin/checkout.c:1784
 msgid "create/reset and checkout a branch"
 msgstr "crear/reiniciar y hacer checkout a una rama"
 
-#: builtin/checkout.c:1785
 msgid "create reflog for new branch"
 msgstr "crear un reflog para una nueva rama"
 
-#: builtin/checkout.c:1787
 msgid "second guess 'git checkout <no-such-branch>' (default)"
 msgstr "cuestionar opción 'git checkout <no-hay-tal-rama>' (default)"
 
-#: builtin/checkout.c:1788
 msgid "use overlay mode (default)"
 msgstr "usar modo overlay (default)"
 
-#: builtin/checkout.c:1833
 msgid "create and switch to a new branch"
 msgstr "crear y hacer switch a una nueva rama"
 
-#: builtin/checkout.c:1835
 msgid "create/reset and switch to a branch"
 msgstr "crear/reiniciar y hacer switch a una rama"
 
-#: builtin/checkout.c:1837
 msgid "second guess 'git switch <no-such-branch>'"
 msgstr "cuestionar opción 'git checkout <no-hay-tal-rama>'"
 
-#: builtin/checkout.c:1839
 msgid "throw away local modifications"
 msgstr "descartar modificaciones locales"
 
-#: builtin/checkout.c:1873
 msgid "which tree-ish to checkout from"
 msgstr "de qué árbol hacer el checkout"
 
-#: builtin/checkout.c:1875
 msgid "restore the index"
 msgstr "restaurar el índice"
 
-#: builtin/checkout.c:1877
 msgid "restore the working tree (default)"
 msgstr "restaurar el árbol de trabajo (default)"
 
-#: builtin/checkout.c:1879
 msgid "ignore unmerged entries"
 msgstr "ignorar entradas no fusionadas"
 
-#: builtin/checkout.c:1880
 msgid "use overlay mode"
 msgstr "usar modo overlay"
 
-#: builtin/clean.c:29
 msgid ""
 "git clean [-d] [-f] [-i] [-n] [-q] [-e <pattern>] [-x | -X] [--] <paths>..."
 msgstr ""
 "git clean [-d] [-f] [-i] [-n] [-q] [-e <patrón>] [-x | -X] [--] <rutas>..."
 
-#: builtin/clean.c:33
 #, c-format
 msgid "Removing %s\n"
 msgstr "Borrando %s\n"
 
-#: builtin/clean.c:34
 #, c-format
 msgid "Would remove %s\n"
 msgstr "Será borrado %s\n"
 
-#: builtin/clean.c:35
 #, c-format
 msgid "Skipping repository %s\n"
 msgstr "Saltando repositorio %s\n"
 
-#: builtin/clean.c:36
 #, c-format
 msgid "Would skip repository %s\n"
 msgstr "Se saltará repositorio %s\n"
 
-#: builtin/clean.c:38
+#, c-format
+msgid "failed to remove %s"
+msgstr "falló al borrar %s"
+
 #, c-format
 msgid "could not lstat %s\n"
 msgstr "no se pudo lstat %s\n"
 
-#: builtin/clean.c:300 git-add--interactive.perl:593
+#, fuzzy
+msgid "Refusing to remove current working directory\n"
+msgstr "no es posible obtener el directorio de trabajo actual"
+
+#, fuzzy
+msgid "Would refuse to remove current working directory\n"
+msgstr "no es posible obtener el directorio de trabajo actual"
+
 #, c-format
 msgid ""
 "Prompt help:\n"
@@ -13037,7 +3893,6 @@ msgstr ""
 "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
 #, c-format
 msgid ""
 "Prompt help:\n"
@@ -13058,33 +3913,26 @@ msgstr ""
 "*          - escoger todos los objetos\n"
 "           - (vacío) terminar selección\n"
 
-#: builtin/clean.c:519 git-add--interactive.perl:568
-#: git-add--interactive.perl:573
 #, c-format, perl-format
 msgid "Huh (%s)?\n"
 msgstr "¿Ahh (%s)?\n"
 
-#: builtin/clean.c:659
 #, c-format
 msgid "Input ignore patterns>> "
 msgstr "Ingresa los patrones que ignorar>> "
 
-#: builtin/clean.c:693
 #, c-format
 msgid "WARNING: Cannot find items matched by: %s"
 msgstr "PELIGRO: No se puede encontrar objetos que concuerden con: %s"
 
-#: builtin/clean.c:714
 msgid "Select items to delete"
 msgstr "Seleccionar objetos para borrar"
 
 #. TRANSLATORS: Make sure to keep [y/N] as is
-#: builtin/clean.c:755
 #, c-format
 msgid "Remove %s [y/N]? "
 msgstr "¿Borrar %s [y/N]? "
 
-#: builtin/clean.c:786
 msgid ""
 "clean               - start cleaning\n"
 "filter by pattern   - exclude items from deletion\n"
@@ -13102,52 +3950,38 @@ msgstr ""
 "help                - esta pantalla\n"
 "?                   - ayuda para selección de opciones"
 
-#: builtin/clean.c:822
 msgid "Would remove the following item:"
 msgid_plural "Would remove the following items:"
 msgstr[0] "Se eliminará el siguiente objeto:"
 msgstr[1] "Se eliminarán los siguientes objetos:"
 
-#: builtin/clean.c:838
 msgid "No more files to clean, exiting."
 msgstr "No hay más archivos para limpiar, saliendo."
 
-#: builtin/clean.c:900
 msgid "do not print names of files removed"
 msgstr "no imprimir nombres de archivos borrados"
 
-#: builtin/clean.c:902
 msgid "force"
 msgstr "forzar"
 
-#: builtin/clean.c:903
 msgid "interactive cleaning"
 msgstr "limpieza interactiva"
 
-#: builtin/clean.c:905
 msgid "remove whole directories"
 msgstr "borrar directorios completos"
 
-#: 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ón"
 
-#: builtin/clean.c:907
 msgid "add <pattern> to ignore rules"
 msgstr "agregar <patrón> a las reglas de ignorancia"
 
-#: builtin/clean.c:908
 msgid "remove ignored files, too"
 msgstr "borrar archivos ignorados, también"
 
-#: builtin/clean.c:910
 msgid "remove only ignored files"
 msgstr "borrar solo archivos ignorados"
 
-#: builtin/clean.c:925
 msgid ""
 "clean.requireForce set to true and neither -i, -n, nor -f given; refusing to "
 "clean"
@@ -13155,7 +3989,6 @@ msgstr ""
 "clean.requireForce configurado como true y ninguno de -i, -n, ni -f "
 "entregado; rehusando el clean"
 
-#: builtin/clean.c:928
 msgid ""
 "clean.requireForce defaults to true and neither -i, -n, nor -f given; "
 "refusing to clean"
@@ -13163,212 +3996,163 @@ msgstr ""
 "clean.requireForce default en true y ninguno de -i, -n, ni -f entregado; "
 "rehusando el clean"
 
-#: builtin/clean.c:940
 msgid "-x and -X cannot be used together"
 msgstr "-x y -X no pueden ser usadas juntas"
 
-#: builtin/clone.c:45
 msgid "git clone [<options>] [--] <repo> [<dir>]"
 msgstr "git clone [<opciones>] [--] <repo> [<directorio>]"
 
-#: builtin/clone.c:96
 msgid "don't clone shallow repository"
 msgstr "no clonar repositorios superficiales"
 
-#: builtin/clone.c:98
 msgid "don't create a checkout"
 msgstr "no crear checkout"
 
-#: builtin/clone.c:99 builtin/clone.c:101 builtin/init-db.c:542
 msgid "create a bare repository"
 msgstr "crear un repositorio vacío"
 
-#: builtin/clone.c:103
 msgid "create a mirror repository (implies bare)"
 msgstr "crear un repositorio espejo (implica bare)"
 
-#: builtin/clone.c:105
 msgid "to clone from a local repository"
 msgstr "clonar de un repositorio local"
 
-#: builtin/clone.c:107
 msgid "don't use local hardlinks, always copy"
 msgstr "no usar hardlinks, siempre copiar"
 
-#: builtin/clone.c:109
 msgid "setup as shared repository"
 msgstr "configurar como repositorio compartido"
 
-#: builtin/clone.c:111
 msgid "pathspec"
 msgstr "pathspec"
 
-#: builtin/clone.c:111
 msgid "initialize submodules in the clone"
 msgstr "inicializar submódulos en el clon"
 
-#: builtin/clone.c:115
 msgid "number of submodules cloned in parallel"
 msgstr "número de submódulos clonados en paralelo"
 
-#: builtin/clone.c:116 builtin/init-db.c:539
 msgid "template-directory"
 msgstr "directorio-template"
 
-#: builtin/clone.c:117 builtin/init-db.c:540
 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: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:1872
-#: builtin/submodule--helper.c:2515
 msgid "use --reference only while cloning"
 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: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 "usar <nombre> en lugar de 'origin' para rastrear upstream"
 
-#: builtin/clone.c:127
 msgid "checkout <branch> instead of the remote's HEAD"
 msgstr "checkout <rama> en lugar de HEAD remota"
 
-#: builtin/clone.c:129
 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:876
-#: builtin/pull.c:208
 msgid "depth"
 msgstr "profundidad"
 
-#: builtin/clone.c:131
 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:3933
-#: builtin/pull.c:211
 msgid "time"
 msgstr "tiempo"
 
-#: builtin/clone.c:133
 msgid "create a shallow clone since a specific time"
 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:1022
 msgid "revision"
 msgstr "revisión"
 
-#: builtin/clone.c:135 builtin/fetch.c:185 builtin/pull.c:215
 msgid "deepen history of shallow clone, excluding rev"
 msgstr "ahondar historia de clon superficial, excluyendo rev"
 
-#: 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"
 
-#: builtin/clone.c:139
 msgid "don't clone any tags, and make later fetches not to follow them"
 msgstr "no clonar ningún tag, y hacer que los subsiguientes fetch no los sigan"
 
-#: builtin/clone.c:141
 msgid "any cloned submodules will be shallow"
 msgstr "cualquier submódulo clonado será superficial"
 
-#: builtin/clone.c:142 builtin/init-db.c:548
 msgid "gitdir"
 msgstr "gitdir"
 
-#: builtin/clone.c:143 builtin/init-db.c:549
 msgid "separate git dir from working tree"
 msgstr "separar git dir del árbol de trabajo"
 
-#: builtin/clone.c:144
 msgid "key=value"
 msgstr "llave=valor"
 
-#: builtin/clone.c:145
 msgid "set config inside the new repository"
 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: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:201
 msgid "option to transmit"
 msgstr "opción para trasmitir"
 
-#: builtin/clone.c:148 builtin/fetch.c:203 builtin/pull.c:234
-#: builtin/push.c:576
 msgid "use IPv4 addresses only"
 msgstr "solo usar direcciones IPv4"
 
-#: builtin/clone.c:150 builtin/fetch.c:205 builtin/pull.c:237
-#: builtin/push.c:578
 msgid "use IPv6 addresses only"
 msgstr "solo usar direcciones IPv6"
 
-#: builtin/clone.c:154
+msgid "apply partial clone filters to submodules"
+msgstr ""
+
 msgid "any cloned submodules will use their remote-tracking branch"
 msgstr "cualquier submódulo clonado usará su branch de rastreo remoto"
 
-#: builtin/clone.c:156
 msgid "initialize sparse-checkout file to include only files at root"
 msgstr ""
 "inicializar archivo sparse-checkout para incluir solo archivos en la raíz"
 
-#: 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:304
+#, c-format
+msgid "failed to stat '%s'"
+msgstr "falló al hacer stat en '%s'"
+
 #, c-format
 msgid "%s exists and is not a directory"
 msgstr "%s existe pero no es un directorio"
 
-#: builtin/clone.c:322
 #, c-format
 msgid "failed to start iterator over '%s'"
 msgstr "falló al iniciar el iterador sobre '%s'"
 
-#: builtin/clone.c:353
+#, c-format
+msgid "failed to unlink '%s'"
+msgstr "falló al desvincular '%s'"
+
 #, c-format
 msgid "failed to create link '%s'"
 msgstr "falló al crear link '%s'"
 
-#: builtin/clone.c:357
 #, c-format
 msgid "failed to copy file to '%s'"
 msgstr "falló al copiar archivo a '%s'"
 
-#: builtin/clone.c:362
 #, c-format
 msgid "failed to iterate over '%s'"
 msgstr "falló al iterar sobre '%s'"
 
-#: builtin/clone.c:389
 #, c-format
 msgid "done.\n"
 msgstr "hecho.\n"
 
-#: builtin/clone.c:403
 msgid ""
 "Clone succeeded, but checkout failed.\n"
 "You can inspect what was checked out with 'git status'\n"
@@ -13378,105 +4162,82 @@ msgstr ""
 "Puedes inspeccionar a qué se hizo checkout con 'git status'\n"
 "y volver a intentarlo con 'git restore --source=HEAD :/'\n"
 
-#: 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:597
+msgid "remote did not send all necessary objects"
+msgstr "remoto no mandó todos los objetos necesarios"
+
 #, c-format
 msgid "unable to update %s"
 msgstr "incapaz de actualizar %s"
 
-#: builtin/clone.c:645
 msgid "failed to initialize sparse-checkout"
 msgstr "falló al inicializar sparse-checkout"
 
-#: 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:701
 msgid "unable to checkout working tree"
 msgstr "no es posible realizar checkout en el árbol de trabajo"
 
-#: 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:842
 msgid "cannot repack to clean up"
 msgstr "no se puede reempaquetar para limpiar"
 
-#: builtin/clone.c:844
 msgid "cannot unlink temporary alternates file"
 msgstr "no se puede desvincular archivo de alternos temporal"
 
-#: builtin/clone.c:886 builtin/receive-pack.c:2493
 msgid "Too many arguments."
 msgstr "Demasiados argumentos."
 
-#: builtin/clone.c:890
 msgid "You must specify a repository to clone."
 msgstr "Tienes que especificar un repositorio para clonar."
 
-#: 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:906
-msgid "--bare and --separate-git-dir are incompatible."
-msgstr "--bare y --separate-git-dir son incompatibles."
+#, fuzzy, c-format
+msgid "options '%s' and '%s %s' cannot be used together"
+msgstr "Opciones --squash y --fixup no pueden ser usadas juntas"
 
-#: builtin/clone.c:920
 #, c-format
 msgid "repository '%s' does not exist"
 msgstr "repositorio '%s' no existe"
 
-#: 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: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: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:954
 #, c-format
 msgid "working tree '%s' already exists."
 msgstr "directorio de trabajo '%s' ya existe."
 
-#: 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:974
 #, c-format
 msgid "could not create work tree dir '%s'"
 msgstr "no se pudo crear un árbol de trabajo '%s'"
 
-#: 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:996
 #, c-format
 msgid "Cloning into '%s'...\n"
 msgstr "Clonando en '%s'...\n"
 
-#: builtin/clone.c:1025
 msgid ""
 "clone --recursive is not compatible with both --reference and --reference-if-"
 "able"
@@ -13484,90 +4245,76 @@ msgstr ""
 "clone --recursive no es compatible con --reference y --reference-if-able al "
 "mismo tiempo"
 
-#: 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: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:1123
 msgid "--shallow-since is ignored in local clones; use file:// instead."
 msgstr ""
 "--shallow-since es ignorado en clonaciones locales; usa file:// en su lugar."
 
-#: builtin/clone.c:1125
 msgid "--shallow-exclude is ignored in local clones; use file:// instead."
 msgstr ""
 "--shallow-exclude es ignorado en clonaciones locales; usa file:// en su "
 "lugar."
 
-#: 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:1132
+msgid "source repository is shallow, reject to clone."
+msgstr "el repositorio fuente es superficial, rechazando clonado."
+
 msgid "source repository is shallow, ignoring --local"
 msgstr "repositorio fuente es superficial, ignorando --local"
 
-#: builtin/clone.c:1137
 msgid "--local is ignored"
 msgstr "--local es ignorado"
 
-#: builtin/clone.c:1216 builtin/clone.c:1276
+msgid "cannot clone from filtered bundle"
+msgstr ""
+
 msgid "remote transport reported error"
 msgstr "transporte remoto reportó error"
 
-#: 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:1242
 msgid "You appear to have cloned an empty repository."
 msgstr "Pareces haber clonado un repositorio sin contenido."
 
-#: builtin/column.c:10
 msgid "git column [<options>]"
 msgstr "git column [<opciones>]"
 
-#: builtin/column.c:27
 msgid "lookup config vars"
 msgstr "revisa las variables de configuración"
 
-#: builtin/column.c:28 builtin/column.c:29
 msgid "layout to use"
 msgstr "disposición a usar"
 
-#: builtin/column.c:30
 msgid "maximum width"
 msgstr "ancho máximo"
 
-#: builtin/column.c:31
 msgid "padding space on left border"
 msgstr "espacio padding en el borde izquierdo"
 
-#: builtin/column.c:32
 msgid "padding space on right border"
 msgstr "espacio padding en el borde derecho"
 
-#: builtin/column.c:33
 msgid "padding space between columns"
 msgstr "espacio padding entre columnas"
 
-#: builtin/column.c:51
 msgid "--command must be the first argument"
 msgstr "--command debe ser el primer argumento"
 
-#: 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:16
 msgid ""
 "git commit-graph write [--object-dir <objdir>] [--append] [--"
 "split[=<strategy>]] [--reachable|--stdin-packs|--stdin-commits] [--changed-"
@@ -13577,92 +4324,75 @@ msgstr ""
 "split[=<estrategia>]] [--reachable|--stdin-packs|--stdin-commits] [--changed-"
 "paths] [--[no-]max-new-filters <n>] [--[no-]progress] <opciones de split>"
 
-#: builtin/commit-graph.c:51 builtin/fetch.c:191 builtin/log.c:1779
 msgid "dir"
 msgstr "dir"
 
-#: 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: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:100
 #, c-format
 msgid "Could not open commit-graph '%s'"
 msgstr "No se pudo abrir commit-graph '%s'"
 
-#: builtin/commit-graph.c:137
 #, c-format
 msgid "unrecognized --split argument, %s"
 msgstr "argumento --split no reconocido, %s"
 
-#: 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:155
 #, c-format
 msgid "invalid object: %s"
 msgstr "no es un objeto válido: %s"
 
-#: builtin/commit-graph.c:205
+#, c-format
+msgid "option `%s' expects a numerical value"
+msgstr "opción `%s' espera un valor numérico"
+
 msgid "start walk at all refs"
 msgstr "comenzar recorrido en todas las refs"
 
-#: 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:209
 msgid "start walk at commits listed by stdin"
 msgstr "comenzar recorrido a los commits listados por stdin"
 
-#: builtin/commit-graph.c:211
 msgid "include all commits already in the commit-graph file"
 msgstr "incluir todos los commits que ya están en el archivo commit-graph"
 
-#: builtin/commit-graph.c:213
 msgid "enable computation for changed paths"
 msgstr "habilitar computación para rutas cambiadas"
 
-#: 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: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: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: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: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:251
 msgid "use at most one of --reachable, --stdin-commits, or --stdin-packs"
 msgstr "usa como máximo uno de --reachable, --stdin-commits, o --stdin-packs"
 
-#: 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 "
 "<file>)...] <tree>"
@@ -13670,80 +4400,61 @@ msgstr ""
 "git commit-tree [(-p <padre>)...] [-S[<keyid>]] [(-m <mensaje>)...] [(-F "
 "<archivo>)...] <árbol>"
 
-#: builtin/commit-tree.c:31
 #, c-format
 msgid "duplicate parent %s ignored"
 msgstr "padre duplicado %s ignorado"
 
-#: 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:94
 #, c-format
 msgid "git commit-tree: failed to read '%s'"
 msgstr "git commit-tree: falló al leer '%s'"
 
-#: 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:109
 msgid "parent"
 msgstr "padre"
 
-#: builtin/commit-tree.c:110
 msgid "id of a parent commit object"
 msgstr "id del objeto commit padre"
 
-#: 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:113 builtin/commit.c:1626
 msgid "commit message"
 msgstr "mensaje del commit"
 
-#: builtin/commit-tree.c:116
 msgid "read commit log message from file"
 msgstr "leer mensaje de commit desde un archivo"
 
-#: 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:131
 msgid "must give exactly one tree"
 msgstr "hay que dar exactamente un árbol"
 
-#: builtin/commit-tree.c:138
 msgid "git commit-tree: failed to read"
 msgstr "git commit-tree: falló al leer"
 
-#: builtin/commit.c:42
 msgid "git commit [<options>] [--] <pathspec>..."
 msgstr "git commit [<opciones>] [--] <especificación-de-ruta>..."
 
-#: builtin/commit.c:47
 msgid "git status [<options>] [--] <pathspec>..."
 msgstr "git status [<opciones>] [--] <especificación-de-ruta>..."
 
-#: 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 ""
-"Has solicitado un amend en tu commit más reciente, pero hacerlo lo\n"
+"Has solicitado enmendar tu commit más reciente, pero hacerlo lo\n"
 "vaciaría. Puedes repetir el comando con --allow-empty, o puedes eliminar\n"
 "el commit completamente con \"git reset HEAD^\".\n"
 
-#: 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"
@@ -13758,15 +4469,12 @@ msgstr ""
 "    git commit --allow-empty\n"
 "\n"
 
-#: 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:67
 msgid "Otherwise, please use 'git cherry-pick --skip'\n"
 msgstr "Caso contrario, por favor usa 'git cherry-pick --skip'\n"
 
-#: builtin/commit.c:70
 msgid ""
 "and then use:\n"
 "\n"
@@ -13788,73 +4496,57 @@ msgstr ""
 "     git cherry-pick --skip\n"
 "\n"
 
-#: builtin/commit.c:325
 msgid "failed to unpack HEAD tree object"
 msgstr "falló al desempaquetar objeto del árbol HEAD"
 
-#: 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:375
 msgid "No paths with --include/--only does not make sense."
 msgstr "--include/--only sin ruta no tiene sentido."
 
-#: builtin/commit.c:387
 msgid "unable to create temporary index"
 msgstr "no es posible crear un índice temporal"
 
-#: builtin/commit.c:396
 msgid "interactive add failed"
 msgstr "adición interactiva fallida"
 
-#: builtin/commit.c:411
 msgid "unable to update temporary index"
 msgstr "no es posible actualizar el índice temporal"
 
-#: builtin/commit.c:413
 msgid "Failed to update main cache tree"
 msgstr "Falló al actualizar el árbol de caché principal"
 
-#: 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: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: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:494
 msgid "cannot do a partial commit during a rebase."
 msgstr "no se puede realizar un commit parcial durante un rebase."
 
-#: builtin/commit.c:502
 msgid "cannot read the index"
 msgstr "no se puede leer el índice"
 
-#: builtin/commit.c:521
 msgid "unable to write temporary index file"
 msgstr "no es posible escribir el índice temporal"
 
-#: builtin/commit.c:619
 #, c-format
 msgid "commit '%s' lacks author header"
 msgstr "commit '%s' requiere cabecera de autor"
 
-#: 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:640
 msgid "malformed --author parameter"
 msgstr "parámetro --author mal formado"
 
-#: builtin/commit.c:693
+#, c-format
+msgid "invalid date format: %s"
+msgstr "formato de fecha inválido: %s"
+
 msgid ""
 "unable to select a comment character that is not used\n"
 "in the current commit message"
@@ -13862,43 +4554,38 @@ msgstr ""
 "no es posible seleccionar un carácter de comentario que no sea usado\n"
 "en el mensaje de commit actual"
 
-#: 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: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:761
 msgid "could not read log from standard input"
 msgstr "no se pudo leer log desde standard input"
 
-#: builtin/commit.c:765
 #, c-format
 msgid "could not read log file '%s'"
 msgstr "no se pudo leer el log '%s'"
 
-#: builtin/commit.c:802
-#, c-format
-msgid "cannot combine -m with --fixup:%s"
-msgstr "no se puede combinar -m con --fixup:%s"
+#, fuzzy, c-format
+msgid "options '%s' and '%s:%s' cannot be used together"
+msgstr "Opciones --squash y --fixup no pueden ser usadas juntas"
 
-#: builtin/commit.c:814 builtin/commit.c:830
 msgid "could not read SQUASH_MSG"
 msgstr "no se pudo leer SQUASH_MSG"
 
-#: builtin/commit.c:821
 msgid "could not read MERGE_MSG"
 msgstr "no se pudo leer MERGE_MSG"
 
-#: builtin/commit.c:881
+#, c-format
+msgid "could not open '%s'"
+msgstr "no se pudo abrir '%s'"
+
 msgid "could not write commit template"
 msgstr "no se pudo escribir el template del commit"
 
-#: builtin/commit.c:894
 #, c-format
 msgid ""
 "Please enter the commit message for your changes. Lines starting\n"
@@ -13907,7 +4594,6 @@ msgstr ""
 "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:896
 #, c-format
 msgid ""
 "Please enter the commit message for your changes. Lines starting\n"
@@ -13917,7 +4603,6 @@ msgstr ""
 " líneas que comiencen con '%c' serán ignoradas, y un mensaje\n"
 " vacío aborta el commit.\n"
 
-#: builtin/commit.c:900
 #, c-format
 msgid ""
 "Please enter the commit message for your changes. Lines starting\n"
@@ -13927,7 +4612,6 @@ msgstr ""
 " líneas que comiencen con '%c' serán guardadas; puedes eliminarlas\n"
 " tú mismo si lo deseas.\n"
 
-#: builtin/commit.c:904
 #, c-format
 msgid ""
 "Please enter the commit message for your changes. Lines starting\n"
@@ -13939,7 +4623,6 @@ msgstr ""
 " tú mismo si lo deseas.\n"
 "Un mensaje vacío aborta el commit.\n"
 
-#: builtin/commit.c:916
 msgid ""
 "\n"
 "It looks like you may be committing a merge.\n"
@@ -13953,7 +4636,6 @@ msgstr ""
 "\tgit update-ref -d MERGE_HEAD\n"
 "e intenta de nuevo.\n"
 
-#: builtin/commit.c:921
 msgid ""
 "\n"
 "It looks like you may be committing a cherry-pick.\n"
@@ -13967,177 +4649,114 @@ msgstr ""
 "\tgit update-ref -d CHERRY_PICK_HEAD\n"
 "e intenta de nuevo.\n"
 
-#: builtin/commit.c:948
 #, c-format
 msgid "%sAuthor:    %.*s <%.*s>"
 msgstr "%sAutor:     %.*s <%.*s>"
 
-#: builtin/commit.c:956
 #, c-format
 msgid "%sDate:      %s"
 msgstr "%sFecha:     %s"
 
-#: builtin/commit.c:963
 #, c-format
 msgid "%sCommitter: %.*s <%.*s>"
 msgstr "%sCommitter: %.*s <%.*s>"
 
-#: builtin/commit.c:981
 msgid "Cannot read index"
 msgstr "No se puede leer el índice"
 
-#: builtin/commit.c:1026
 msgid "unable to pass trailers to --trailers"
 msgstr "no se puede pasar trailers a --trailers"
 
-#: builtin/commit.c:1066
 msgid "Error building trees"
 msgstr "Error al construir los árboles"
 
-#: 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: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:1138
 #, c-format
 msgid "Invalid ignored mode '%s'"
 msgstr "Modo de ignorancia inválido '%s'"
 
-#: 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:1196
-msgid "--long and -z are incompatible"
-msgstr "--long y -z son incompatibles"
-
-#: 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."
+msgstr "Estás en medio de una fusión -- no se puede refrasear."
 
-#: builtin/commit.c:1229
 msgid "You are in the middle of a cherry-pick -- cannot reword."
-msgstr "Estás en medio de un cherry-pick -- no se puede renombrar."
+msgstr "Estás en medio de un cherry-pick -- no se puede refrasear."
 
-#: 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:1234
-msgid ""
-"reword option of --fixup is mutually exclusive with --patch/--interactive/--"
-"all/--include/--only"
-msgstr ""
-"opción de refraseado de --fixup es mutuamente exclusiva con --patch/--"
-"interactive/--all/--include/--only"
+#, fuzzy, c-format
+msgid "reword option of '%s' and path '%s' cannot be used together"
+msgstr "Opciones --squash y --fixup no pueden ser usadas juntas"
 
-#: 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"
+#, fuzzy, c-format
+msgid "reword option of '%s' and '%s' cannot be used together"
+msgstr "Opciones --squash y --fixup no pueden ser usadas juntas"
 
-#: builtin/commit.c:1260
 msgid "You have nothing to amend."
 msgstr "No tienes nada que enmendar."
 
-#: 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:1265
 msgid "You are in the middle of a cherry-pick -- cannot amend."
 msgstr "Estás en medio de un cherry-pick -- no se puede enmendar."
 
-#: 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:1270
-msgid "Options --squash and --fixup cannot be used together"
-msgstr "Opciones --squash y --fixup no pueden ser usadas juntas"
-
-#: 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: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: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: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:1337
 #, c-format
 msgid "unknown option: --fixup=%s:%s"
 msgstr "opción desconocida: --fixup=%s:%s"
 
-#: 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:1485 builtin/commit.c:1654
 msgid "show status concisely"
 msgstr "mostrar status de manera concisa"
 
-#: builtin/commit.c:1487 builtin/commit.c:1656
 msgid "show branch information"
 msgstr "mostrar información de la rama"
 
-#: builtin/commit.c:1489
 msgid "show stash information"
 msgstr "mostrar información del stash"
 
-#: 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:1493
 msgid "version"
 msgstr "versión"
 
-#: 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:1496 builtin/commit.c:1662
 msgid "show status in long format (default)"
 msgstr "mostrar status en formato largo (default)"
 
-#: builtin/commit.c:1499 builtin/commit.c:1665
 msgid "terminate entries with NUL"
 msgstr "terminar entradas con NUL"
 
-#: 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: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:1506
 msgid ""
 "show ignored files, optional modes: traditional, matching, no. (Default: "
 "traditional)"
@@ -14145,11 +4764,9 @@ msgstr ""
 "mostrar archivos ignorados, modos opcionales: traditional, matching, no. "
 "(Predeterminado: traditional)"
 
-#: builtin/commit.c:1508 parse-options.h:192
 msgid "when"
 msgstr "cuando"
 
-#: builtin/commit.c:1509
 msgid ""
 "ignore changes to submodules, optional when: all, dirty, untracked. "
 "(Default: all)"
@@ -14157,195 +4774,152 @@ msgstr ""
 "ignorar cambios en submódulos, opcional cuando: all, dirty, untracked. "
 "(Default: all)"
 
-#: builtin/commit.c:1511
 msgid "list untracked files in columns"
 msgstr "listar en columnas los archivos sin seguimiento"
 
-#: builtin/commit.c:1512
 msgid "do not detect renames"
 msgstr "no detectar renombrados"
 
-#: builtin/commit.c:1514
 msgid "detect renames, optionally set similarity index"
 msgstr "detectar renombrados, opcionalmente configurar similaridad de índice"
 
-#: 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:1619
 msgid "suppress summary after successful commit"
 msgstr "suprimir summary tras un commit exitoso"
 
-#: builtin/commit.c:1620
 msgid "show diff in commit message template"
 msgstr "mostrar diff en el template del mensaje de commit"
 
-#: builtin/commit.c:1622
 msgid "Commit message options"
 msgstr "Opciones para el mensaje del commit"
 
-#: 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:1624
 msgid "author"
 msgstr "autor"
 
-#: builtin/commit.c:1624
 msgid "override author for commit"
 msgstr "sobrescribir el autor del commit"
 
-#: builtin/commit.c:1625 builtin/gc.c:550
 msgid "date"
 msgstr "fecha"
 
-#: builtin/commit.c:1625
 msgid "override date for commit"
 msgstr "sobrescribir la fecha del commit"
 
-#: 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:1627
 msgid "reuse and edit message from specified commit"
 msgstr "reusar y editar el mensaje de un commit específico"
 
-#: 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:1633
 msgid "[(amend|reword):]commit"
 msgstr "[(amend|reword):]commit"
 
-#: 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 "
-"commit especificado"
+"usar mensaje de formato autosquash para arreglar o amend/reword el commit "
+"especificado"
 
-#: 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: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:1636 builtin/interpret-trailers.c:111
 msgid "trailer"
 msgstr "trailer"
 
-#: builtin/commit.c:1636
 msgid "add custom trailer(s)"
 msgstr "agregando trailer(s) personalizados"
 
-#: 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:1638
 msgid "use specified template file"
 msgstr "usar archivo de template especificado"
 
-#: builtin/commit.c:1639
 msgid "force edit of commit"
 msgstr "forzar la edición del commit"
 
-#: builtin/commit.c:1641
 msgid "include status in commit message template"
 msgstr "incluir status en el template del mensaje de commit"
 
-#: builtin/commit.c:1646
 msgid "Commit contents options"
 msgstr "Opciones para el contenido del commit"
 
-#: builtin/commit.c:1647
 msgid "commit all changed files"
 msgstr "confirmar todos los archivos cambiados"
 
-#: builtin/commit.c:1648
 msgid "add specified files to index for commit"
 msgstr "agregar archivos específicos al índice para confirmar"
 
-#: builtin/commit.c:1649
 msgid "interactively add files"
 msgstr "agregar archivos interactivamente"
 
-#: builtin/commit.c:1650
 msgid "interactively add changes"
 msgstr "agregar cambios interactivamente"
 
-#: builtin/commit.c:1651
 msgid "commit only specified files"
 msgstr "solo confirmar archivos específicos"
 
-#: 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:1653
 msgid "show what would be committed"
 msgstr "mostrar lo que sería incluido en el commit"
 
-#: builtin/commit.c:1666
 msgid "amend previous commit"
 msgstr "enmendar commit previo"
 
-#: builtin/commit.c:1667
 msgid "bypass post-rewrite hook"
 msgstr "saltar el gancho de postreescritura"
 
-#: builtin/commit.c:1674
 msgid "ok to record an empty change"
 msgstr "vale grabar un cambio vacío"
 
-#: 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:1752
+msgid "could not parse HEAD commit"
+msgstr "no se pudo analizar el commit de HEAD"
+
 #, c-format
 msgid "Corrupt MERGE_HEAD file (%s)"
 msgstr "Archivo MERGE_HEAD (%s) corrupto"
 
-#: builtin/commit.c:1759
 msgid "could not read MERGE_MODE"
 msgstr "no se pudo leer MERGE_MODE"
 
-#: 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: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: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: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:1839
 msgid ""
 "repository has been updated, but unable to write\n"
 "new_index file. Check that disk is not full and quota is\n"
@@ -14355,225 +4929,179 @@ msgstr ""
 "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
 msgid "git config [<options>]"
 msgstr "git config [<opciones>]"
 
-#: builtin/config.c:109 builtin/env--helper.c:27
 #, c-format
 msgid "unrecognized --type argument, %s"
 msgstr "argumento --type no reconocido, %s"
 
-#: builtin/config.c:121
 msgid "only one type at a time"
 msgstr "solo un tipo a la vez"
 
-#: builtin/config.c:130
 msgid "Config file location"
 msgstr "Ubicación del archivo de configuración"
 
-#: builtin/config.c:131
 msgid "use global config file"
 msgstr "usar archivo de config global"
 
-#: builtin/config.c:132
 msgid "use system config file"
 msgstr "usar archivo de config del sistema"
 
-#: builtin/config.c:133
 msgid "use repository config file"
 msgstr "usar archivo de config del repositorio"
 
-#: builtin/config.c:134
 msgid "use per-worktree config file"
 msgstr "usar archivo de config del árbol de trabajo"
 
-#: builtin/config.c:135
 msgid "use given config file"
 msgstr "usar archivo de config especificado"
 
-#: builtin/config.c:136
 msgid "blob-id"
 msgstr "blob-id"
 
-#: builtin/config.c:136
 msgid "read config from given blob object"
 msgstr "leer config del objeto blob suministrado"
 
-#: builtin/config.c:137
 msgid "Action"
 msgstr "Acción"
 
-#: builtin/config.c:138
 msgid "get value: name [value-pattern]"
 msgstr "obtener valor: nombre [patrón de valor]"
 
-#: builtin/config.c:139
 msgid "get all values: key [value-pattern]"
 msgstr "obtener todos los valores: clave [patrón de valor]"
 
-#: builtin/config.c:140
 msgid "get values for regexp: name-regex [value-pattern]"
 msgstr "obtener valores para regexp: name-regex [value-pattern]"
 
-#: builtin/config.c:141
 msgid "get value specific for the URL: section[.var] URL"
 msgstr "obtener valor específico para el URL: sección[.var] URL"
 
-#: builtin/config.c:142
 msgid "replace all matching variables: name value [value-pattern]"
 msgstr ""
 "reemplazar todas las variables coincidentes: nombre valor [valor-patrón]"
 
-#: builtin/config.c:143
 msgid "add a new variable: name value"
 msgstr "agregar nueva variable: nombre valor"
 
-#: builtin/config.c:144
 msgid "remove a variable: name [value-pattern]"
 msgstr "eliminar una variable: nombre [patrón de valor]"
 
-#: builtin/config.c:145
 msgid "remove all matches: name [value-pattern]"
 msgstr "eliminar todas las coincidencias: nombre [patrón de valor]"
 
-#: builtin/config.c:146
 msgid "rename section: old-name new-name"
 msgstr "renombrar sección: nombre-viejo nombre-nuevo"
 
-#: builtin/config.c:147
 msgid "remove a section: name"
 msgstr "borrar una sección: nombre"
 
-#: builtin/config.c:148
 msgid "list all"
 msgstr "listar todo"
 
-#: builtin/config.c:149
 msgid "use string equality when comparing values to 'value-pattern'"
 msgstr "usar la igualdad de cadenas al comparar valores con 'patrón de valor'"
 
-#: builtin/config.c:150
 msgid "open an editor"
 msgstr "abrir el editor"
 
-#: builtin/config.c:151
 msgid "find the color configured: slot [default]"
 msgstr "encontrar el color configurado: slot [default]"
 
-#: builtin/config.c:152
 msgid "find the color setting: slot [stdout-is-tty]"
 msgstr "encontrar las opciones del color: slot [stdout-es-tty]"
 
-#: builtin/config.c:153
 msgid "Type"
 msgstr "Tipo"
 
-#: builtin/config.c:154 builtin/env--helper.c:43
+msgid "type"
+msgstr "tipo"
+
 msgid "value is given this type"
 msgstr "al valor se ha dado este tipo"
 
-#: builtin/config.c:155
 msgid "value is \"true\" or \"false\""
 msgstr "valor es \"true\" o \"false\""
 
-#: builtin/config.c:156
 msgid "value is decimal number"
 msgstr "valor es un número decimal"
 
-#: builtin/config.c:157
 msgid "value is --bool or --int"
 msgstr "valor es --bool o --int"
 
-#: builtin/config.c:158
 msgid "value is --bool or string"
 msgstr "el valor es --bool o cadena"
 
-#: builtin/config.c:159
 msgid "value is a path (file or directory name)"
 msgstr "valor es una ruta (archivo o nombre de directorio)"
 
-#: builtin/config.c:160
 msgid "value is an expiry date"
 msgstr "valor es una fecha de caducidad"
 
-#: builtin/config.c:161
 msgid "Other"
 msgstr "Otro"
 
-#: builtin/config.c:162
 msgid "terminate values with NUL byte"
 msgstr "terminar valores con un byte NULL"
 
-#: builtin/config.c:163
 msgid "show variable names only"
 msgstr "mostrar solo nombres de variables"
 
-#: builtin/config.c:164
 msgid "respect include directives on lookup"
 msgstr "respetar directivas include en la búsqueda"
 
-#: builtin/config.c:165
 msgid "show origin of config (file, standard input, blob, command line)"
 msgstr ""
 "mostrar el origen de configuración (archivo, stdin, blob, línea de comandos)"
 
-#: builtin/config.c:166
 msgid "show scope of config (worktree, local, global, system, command)"
 msgstr ""
 "mostrar el scope de la configuración (worktree, local, global, system, "
 "command)"
 
-#: builtin/config.c:167 builtin/env--helper.c:45
 msgid "value"
 msgstr "valor"
 
-#: builtin/config.c:167
 msgid "with --get, use default value when missing entry"
 msgstr "con --get, usar el valor por defecto cuando falta una entrada"
 
-#: builtin/config.c:181
 #, c-format
 msgid "wrong number of arguments, should be %d"
 msgstr "número de argumentos inválidos, deberían ser %d"
 
-#: builtin/config.c:183
 #, c-format
 msgid "wrong number of arguments, should be from %d to %d"
 msgstr "número de argumentos inválidos, deberían ser de %d a %d"
 
-#: builtin/config.c:339
 #, c-format
 msgid "invalid key pattern: %s"
 msgstr "patrón de llave inválido: %s"
 
-#: builtin/config.c:377
+#, c-format
+msgid "invalid pattern: %s"
+msgstr "patrón inválido: %s"
+
 #, c-format
 msgid "failed to format default config value: %s"
 msgstr "falló al formatear el valor por defecto de configuración: %s"
 
-#: builtin/config.c:441
 #, c-format
 msgid "cannot parse color '%s'"
 msgstr "no se puede analizar color '%s'"
 
-#: builtin/config.c:483
 msgid "unable to parse default color value"
 msgstr "no es posible analizar el valor por defecto de color"
 
-#: builtin/config.c:536 builtin/config.c:833
 msgid "not in a git directory"
 msgstr "no en un directorio git"
 
-#: builtin/config.c:539
 msgid "writing to stdin is not supported"
 msgstr "escribir en stdin no está soportado"
 
-#: builtin/config.c:542
 msgid "writing config blobs is not supported"
 msgstr "escribir blobs de configuración no está soportado"
 
-#: builtin/config.c:627
 #, c-format
 msgid ""
 "# This is Git's per-user configuration file.\n"
@@ -14588,27 +5116,21 @@ msgstr ""
 "#\tname = %s\n"
 "#\temail = %s\n"
 
-#: builtin/config.c:652
 msgid "only one config file at a time"
 msgstr "solo un archivo de configuración a la vez"
 
-#: builtin/config.c:658
 msgid "--local can only be used inside a git repository"
 msgstr "--local solo puedo ser usado dentro de un repositorio"
 
-#: builtin/config.c:660
 msgid "--blob can only be used inside a git repository"
 msgstr "--blob solo puede ser usado dentro de un repositorio"
 
-#: builtin/config.c:662
 msgid "--worktree can only be used inside a git repository"
 msgstr "--worktree solo se puede usar dentro de un repositorio de git"
 
-#: builtin/config.c:684
 msgid "$HOME not set"
 msgstr "$HOME no está configurado"
 
-#: builtin/config.c:708
 msgid ""
 "--worktree cannot be used with multiple working trees unless the config\n"
 "extension worktreeConfig is enabled. Please read \"CONFIGURATION FILE\"\n"
@@ -14616,60 +5138,48 @@ msgid ""
 msgstr ""
 "--worktree no puede ser usado con múltiples árboles de trabajo a menos que "
 "la\n"
-"extensión worktreeConfig esté habilitada. Por favor lee \"CONFIGURATION FILE"
-"\"\n"
+"extensión worktreeConfig esté habilitada. Por favor lee \"CONFIGURATION "
+"FILE\"\n"
 "en \"git help worktree\" para más detalles"
 
-#: builtin/config.c:743
 msgid "--get-color and variable type are incoherent"
 msgstr "--get-color con tipo de variable es incoherente"
 
-#: builtin/config.c:748
 msgid "only one action at a time"
 msgstr "solo una acción a la vez"
 
-#: builtin/config.c:761
 msgid "--name-only is only applicable to --list or --get-regexp"
 msgstr "--name-only solo es aplicable para --list o --get-regexp"
 
-#: builtin/config.c:767
 msgid ""
 "--show-origin is only applicable to --get, --get-all, --get-regexp, and --"
 "list"
 msgstr ""
 "--show-origin solo es aplicable para --get, --get-all, --get-regexp, y --list"
 
-#: builtin/config.c:773
 msgid "--default is only applicable to --get"
 msgstr "--default solo es aplicable para --get"
 
-#: builtin/config.c:806
 msgid "--fixed-value only applies with 'value-pattern'"
 msgstr "--fixed-value solo se aplica con 'value-pattern'"
 
-#: builtin/config.c:822
 #, c-format
 msgid "unable to read config file '%s'"
 msgstr "no se puede leer el archivo de configuración '%s'"
 
-#: builtin/config.c:825
 msgid "error processing config file(s)"
 msgstr "error al procesar archivo(s) de configuración"
 
-#: builtin/config.c:835
 msgid "editing stdin is not supported"
 msgstr "editar stdin no está soportado"
 
-#: builtin/config.c:837
 msgid "editing blobs is not supported"
 msgstr "editar blobs no está soportado"
 
-#: builtin/config.c:851
 #, c-format
 msgid "cannot create configuration file %s"
 msgstr "no se puede crear el archivo de configuración %s"
 
-#: builtin/config.c:864
 #, c-format
 msgid ""
 "cannot overwrite multiple values with a single value\n"
@@ -14678,20 +5188,13 @@ msgstr ""
 "no se puede sobrescribir múltiples valores con un único valor\n"
 "       Usa una regexp, --add o --replace-all para cambiar %s."
 
-#: builtin/config.c:943 builtin/config.c:954
 #, c-format
 msgid "no such section: %s"
 msgstr "no existe la sección: %s"
 
-#: builtin/count-objects.c:90
-msgid "git count-objects [-v] [-H | --human-readable]"
-msgstr "git count-objects [-v] [-H | --human-readable]"
-
-#: builtin/count-objects.c:100
 msgid "print sizes in human readable format"
 msgstr "mostrar tamaños en formato legible para humano"
 
-#: builtin/credential-cache--daemon.c:227
 #, c-format
 msgid ""
 "The permissions on your socket directory are too loose; other\n"
@@ -14705,70 +5208,55 @@ msgstr ""
 "\n"
 "\tchmod 0700 %s"
 
-#: builtin/credential-cache--daemon.c:276
 msgid "print debugging messages to stderr"
 msgstr "mostrar mensajes de debug en stderr"
 
-#: builtin/credential-cache--daemon.c:316
 msgid "credential-cache--daemon unavailable; no unix socket support"
 msgstr "credential-cache--daemon no disponible; sin soporte de socket Unix"
 
-#: builtin/credential-cache.c:180
 msgid "credential-cache unavailable; no unix socket support"
 msgstr "credential-cache no disponible; sin soporte de socket Unix"
 
-#: builtin/credential-store.c:66
 #, c-format
 msgid "unable to get credential storage lock in %d ms"
 msgstr ""
 "no se puede obtener el bloqueo de almacenamiento de credenciales en %d ms"
 
-#: builtin/describe.c:26
 msgid "git describe [<options>] [<commit-ish>...]"
 msgstr "git describe [<opciones>] [<commit-ish>...]"
 
-#: builtin/describe.c:27
 msgid "git describe [<options>] --dirty"
 msgstr "git describe [<opciones>] --dirty"
 
-#: builtin/describe.c:63
 msgid "head"
 msgstr "head"
 
-#: builtin/describe.c:63
 msgid "lightweight"
 msgstr "ligero"
 
-#: builtin/describe.c:63
 msgid "annotated"
 msgstr "anotado"
 
-#: builtin/describe.c:277
 #, c-format
 msgid "annotated tag %s not available"
 msgstr "tag anotado %s no disponible"
 
-#: builtin/describe.c:281
 #, c-format
 msgid "tag '%s' is externally known as '%s'"
 msgstr "tag '%s' es externamente conocida como '%s'"
 
-#: builtin/describe.c:328
 #, c-format
 msgid "no tag exactly matches '%s'"
 msgstr "no hay tag que concuerde exactamente con '%s'"
 
-#: builtin/describe.c:330
 #, c-format
 msgid "No exact match on refs or tags, searching to describe\n"
 msgstr "No hay coincidencia exacta en refs o tags, buscando para describir\n"
 
-#: builtin/describe.c:397
 #, c-format
 msgid "finished search at %s\n"
 msgstr "búsqueda finalizada a %s\n"
 
-#: builtin/describe.c:424
 #, c-format
 msgid ""
 "No annotated tags can describe '%s'.\n"
@@ -14777,7 +5265,6 @@ msgstr ""
 "No hay tags anotados que puedan describir '%s'.\n"
 "Sin embargo, hubieron tags no anotados: intenta --tags."
 
-#: builtin/describe.c:428
 #, c-format
 msgid ""
 "No tags can describe '%s'.\n"
@@ -14786,12 +5273,10 @@ msgstr ""
 "Ningún tag puede describir '%s'.\n"
 "Intenta --always, o crea algunos tags."
 
-#: builtin/describe.c:458
 #, c-format
 msgid "traversed %lu commits\n"
 msgstr "%lu commits cruzados\n"
 
-#: builtin/describe.c:461
 #, c-format
 msgid ""
 "more than %i tags found; listed %i most recent\n"
@@ -14800,160 +5285,116 @@ msgstr ""
 "se encontró más de %i tags; se mostraron las %i más recientes\n"
 "fin de la búsqueda en %s\n"
 
-#: builtin/describe.c:529
 #, c-format
 msgid "describe %s\n"
 msgstr "describe %s\n"
 
-#: builtin/describe.c:532
 #, c-format
 msgid "Not a valid object name %s"
 msgstr "Nombre de objeto %s no válido"
 
-#: builtin/describe.c:540
 #, c-format
 msgid "%s is neither a commit nor blob"
 msgstr "%s no es un commit ni un blob"
 
-#: builtin/describe.c:554
 msgid "find the tag that comes after the commit"
 msgstr "encontrar el tag que viene después del commit"
 
-#: builtin/describe.c:555
 msgid "debug search strategy on stderr"
 msgstr "hacer debug a la estrategia de búsqueda en stderr"
 
-#: builtin/describe.c:556
 msgid "use any ref"
 msgstr "usar cualquier ref"
 
-#: builtin/describe.c:557
 msgid "use any tag, even unannotated"
 msgstr "usar cualquier tag, incluso los no anotados"
 
-#: builtin/describe.c:558
 msgid "always use long format"
 msgstr "siempre usar formato largo"
 
-#: builtin/describe.c:559
 msgid "only follow first parent"
 msgstr "solo seguir el primer padre"
 
-#: builtin/describe.c:562
 msgid "only output exact matches"
 msgstr "solo mostrar concordancias exactas"
 
-#: builtin/describe.c:564
 msgid "consider <n> most recent tags (default: 10)"
 msgstr "considerar <n> tags más recientes (default: 10)"
 
-#: builtin/describe.c:566
 msgid "only consider tags matching <pattern>"
 msgstr "solo considerar tags que concuerden con <patrón>"
 
-#: builtin/describe.c:568
 msgid "do not consider tags matching <pattern>"
 msgstr "no considerar tags que concuerden con <patrón>"
 
-#: builtin/describe.c:570 builtin/name-rev.c:535
 msgid "show abbreviated commit object as fallback"
 msgstr "mostrar el objeto commit abreviado como fallback"
 
-#: builtin/describe.c:571 builtin/describe.c:574
 msgid "mark"
 msgstr "marca"
 
-#: builtin/describe.c:572
 msgid "append <mark> on dirty working tree (default: \"-dirty\")"
 msgstr "adjuntar <marca> en el árbol de trabajo sucio (default: \"-dirty\")"
 
-#: builtin/describe.c:575
 msgid "append <mark> on broken working tree (default: \"-broken\")"
 msgstr "adjuntar <marca> en un árbol de trabajo roto (default: \"-broken\")"
 
-#: builtin/describe.c:593
-msgid "--long is incompatible with --abbrev=0"
-msgstr "--long es incompatible con --abbrev=0"
-
-#: builtin/describe.c:622
 msgid "No names found, cannot describe anything."
 msgstr "No se encontraron nombres, no se puede describir nada."
 
-#: builtin/describe.c:673
-msgid "--dirty is incompatible with commit-ishes"
-msgstr "--dirty es incompatible con commit-ismos"
-
-#: builtin/describe.c:675
-msgid "--broken is incompatible with commit-ishes"
-msgstr "--broken es incompatible con commit-ismos"
-
-#: builtin/diff-tree.c:155
-msgid "--stdin and --merge-base are mutually exclusive"
-msgstr "--stdin and --merge-base son mutuamente exclusivas"
+#, fuzzy, c-format
+msgid "option '%s' and commit-ishes cannot be used together"
+msgstr "Opciones --squash y --fixup no pueden ser usadas juntas"
 
-#: builtin/diff-tree.c:157
 msgid "--merge-base only works with two commits"
 msgstr "--merge-base solo funciona con dos commits"
 
-#: builtin/diff.c:92
 #, c-format
 msgid "'%s': not a regular file or symlink"
 msgstr "'%s': no es un archivo regular o un enlace simbólico"
 
-#: builtin/diff.c:259
 #, c-format
 msgid "invalid option: %s"
 msgstr "opción inválida: %s"
 
-#: builtin/diff.c:376
 #, c-format
 msgid "%s...%s: no merge base"
 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:698
 #, c-format
 msgid "invalid object '%s' given."
 msgstr "objeto '%s' entregado no es válido."
 
-#: builtin/diff.c:543
 #, c-format
 msgid "more than two blobs given: '%s'"
 msgstr "más de dos blobs entregados: '%s'"
 
-#: builtin/diff.c:548
 #, c-format
 msgid "unhandled object '%s' given."
 msgstr "objeto no manejado '%s' entregado."
 
-#: builtin/diff.c:582
 #, c-format
 msgid "%s...%s: multiple merge bases, using %s"
 msgstr "%s...%s: múltiples bases de fusión, usando %s"
 
-#: builtin/difftool.c:31
 msgid "git difftool [<options>] [<commit> [<commit>]] [--] [<path>...]"
 msgstr "git difftool [<opciones>] [<commit> [<commit>]] [--] [<ruta>...]"
 
-#: builtin/difftool.c:293
 #, c-format
 msgid "could not read symlink %s"
 msgstr "no se pudo leer el symlink %s"
 
-#: 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: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:427
 msgid ""
 "combined diff formats ('-c' and '--cc') are not supported in\n"
 "directory diff mode ('-d' and '--dir-diff')."
@@ -14961,59 +5402,50 @@ msgstr ""
 "formatos combinados de diff ('-c' y '--cc') no soportados en\n"
 "modo diff para directorio('-d' y '--dir-diff')."
 
-#: builtin/difftool.c:632
 #, c-format
 msgid "both files modified: '%s' and '%s'."
 msgstr "ambos archivos modificados: '%s' y '%s'."
 
-#: builtin/difftool.c:634
 msgid "working tree file has been left."
 msgstr "archivo del árbol de trabajo ha sido dejado."
 
-#: builtin/difftool.c:645
+#, c-format
+msgid "could not copy '%s' to '%s'"
+msgstr "no se pudo copiar '%s' a '%s'"
+
 #, c-format
 msgid "temporary files exist in '%s'."
 msgstr "archivo temporal existe en '%s'."
 
-#: builtin/difftool.c:646
 msgid "you may want to cleanup or recover these."
 msgstr "tal vez desees limpiar o recuperar estos."
 
-#: builtin/difftool.c:651
 #, c-format
 msgid "failed: %d"
 msgstr "falló: %d"
 
-#: 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:700
 msgid "do not prompt before launching a diff tool"
 msgstr "no mostrar antes de lanzar una herramienta de diff"
 
-#: builtin/difftool.c:705
 msgid "use symlinks in dir-diff mode"
 msgstr "usar enlaces simbólicos en modo dir-diff"
 
-#: builtin/difftool.c:706
 msgid "tool"
 msgstr "herramienta"
 
-#: builtin/difftool.c:707
 msgid "use the specified diff tool"
 msgstr "usar la herramienta de diff especificada"
 
-#: 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:712
 msgid ""
 "make 'git-difftool' exit when an invoked diff tool returns a non-zero exit "
 "code"
@@ -15021,311 +5453,227 @@ msgstr ""
 "hacer que 'git-difftool' salga cuando una herramienta de diff retorne un "
 "código de salida distinto de cero"
 
-#: builtin/difftool.c:715
 msgid "specify a custom command for viewing diffs"
 msgstr "especificar un comando personalizado para ver diffs"
 
-#: builtin/difftool.c:716
 msgid "passed to `diff`"
 msgstr "pasado a `diff`"
 
-#: builtin/difftool.c:732
 msgid "difftool requires worktree or --no-index"
 msgstr "difftool requiere un árbol de trabajo o --no-index"
 
-#: builtin/difftool.c:739
-msgid "--dir-diff is incompatible with --no-index"
-msgstr "--dir-diff es incompatible con --no-index"
-
-#: builtin/difftool.c:742
-msgid "--gui, --tool and --extcmd are mutually exclusive"
-msgstr "--gui, --tool y --extcmd son mutuamente exclusivas"
-
-#: builtin/difftool.c:750
 msgid "no <tool> given for --tool=<tool>"
 msgstr "no se ha proporcionado <herramienta> para --tool=<herramienta>"
 
-#: builtin/difftool.c:757
 msgid "no <cmd> given for --extcmd=<cmd>"
 msgstr "no se ha entregado <comando> para --extcmd=<comando>"
 
-#: builtin/env--helper.c:6
 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:96
-msgid "type"
-msgstr "tipo"
-
-#: builtin/env--helper.c:46
 msgid "default for git_env_*(...) to fall back on"
 msgstr "default para git_env_*(...) es hacer fallback en"
 
-#: builtin/env--helper.c:48
 msgid "be quiet only use git_env_*() value as exit code"
 msgstr "ser silencioso solo usar valor git_env_*() como código de salida"
 
-#: builtin/env--helper.c:67
 #, c-format
 msgid "option `--default' expects a boolean value with `--type=bool`, not `%s`"
 msgstr "opción `--default' espera un valor boolean con `--type=bool`, no `%s`"
 
-#: builtin/env--helper.c:82
 #, 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 ""
 "opción `--default' espera un valor unsigned long con `--type=ulong`, no `%s`"
 
-#: builtin/fast-export.c:29
-msgid "git fast-export [rev-list-opts]"
+#, fuzzy
+msgid "git fast-export [<rev-list-opts>]"
 msgstr "git fast-export [rev-list-opts]"
 
-#: 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:1178
 msgid "--anonymize-map token cannot be empty"
 msgstr "token --anonymize-map no puede estar vacío"
 
-#: builtin/fast-export.c:1198
 msgid "show progress after <n> objects"
 msgstr "mostrar progreso después de <n> objetos"
 
-#: builtin/fast-export.c:1200
 msgid "select handling of signed tags"
 msgstr "seleccionar el manejo de tags firmados"
 
-#: 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: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:1209
 msgid "dump marks to this file"
 msgstr "volcar marcas a este archivo"
 
-#: builtin/fast-export.c:1211
 msgid "import marks from this file"
 msgstr "importar marcas de este archivo"
 
-#: 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:1217
 msgid "fake a tagger when tags lack one"
 msgstr "falsificar un tagger cuando les falta uno"
 
-#: builtin/fast-export.c:1219
 msgid "output full tree for each commit"
 msgstr "mostrar todo el árbol para cada commit"
 
-#: builtin/fast-export.c:1221
 msgid "use the done feature to terminate the stream"
 msgstr "usar el feature done para terminar el stream"
 
-#: 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:1224
 msgid "apply refspec to exported refs"
 msgstr "aplicar refspec para los refs exportados"
 
-#: builtin/fast-export.c:1225
 msgid "anonymize output"
 msgstr "anonimizar la salida"
 
-#: builtin/fast-export.c:1226
 msgid "from:to"
 msgstr "de:para"
 
-#: 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: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:1232
 msgid "show original object ids of blobs/commits"
 msgstr "mostrar ids de objetos originales para blobs/commits"
 
-#: builtin/fast-export.c:1234
 msgid "label tags with mark ids"
 msgstr "marcar tags con ids de mark"
 
-#: 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: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"
-
-#: builtin/fast-import.c:3088
 #, c-format
 msgid "Missing from marks for submodule '%s'"
 msgstr "Faltan marcas from para el submódulo '%s'"
 
-#: builtin/fast-import.c:3090
 #, c-format
 msgid "Missing to marks for submodule '%s'"
 msgstr "Faltan marcas to para el submódulo '%s'"
 
-#: builtin/fast-import.c:3225
 #, c-format
 msgid "Expected 'mark' command, got %s"
 msgstr "Se esperaba comando 'mark', se obtuvo %s"
 
-#: builtin/fast-import.c:3230
 #, c-format
 msgid "Expected 'to' command, got %s"
 msgstr "Se esperaba comando 'to', se obtuvo %s"
 
-#: builtin/fast-import.c:3322
 msgid "Expected format name:filename for submodule rewrite option"
 msgstr ""
 "Formato esperado de nombre:nombre-de-archivo para la opción de sobreescribir "
 "submódulo"
 
-#: builtin/fast-import.c:3377
 #, c-format
 msgid "feature '%s' forbidden in input without --allow-unsafe-features"
 msgstr "característica '%s' prohibida en input sin --allow-unsafe-features"
 
-#: builtin/fetch-pack.c:242
 #, c-format
 msgid "Lockfile created but not reported: %s"
 msgstr "Lockfile creado pero no reportado: %s"
 
-#: builtin/fetch.c:35
 msgid "git fetch [<options>] [<repository> [<refspec>...]]"
 msgstr "git fetch [<opciones>] [<repositorio> [<refspec>...]]"
 
-#: builtin/fetch.c:36
 msgid "git fetch [<options>] <group>"
 msgstr "git fetch [<opciones>] <grupo>"
 
-#: builtin/fetch.c:37
 msgid "git fetch --multiple [<options>] [(<repository> | <group>)...]"
 msgstr "git fetch --multiple [<opciones>] [(<repositorio> | <grupo>)...]"
 
-#: builtin/fetch.c:38
 msgid "git fetch --all [<options>]"
 msgstr "git fetch --all [<opciones>]"
 
-#: builtin/fetch.c:122
 msgid "fetch.parallel cannot be negative"
 msgstr "fetch.parallel no puede ser negativo"
 
-#: builtin/fetch.c:145 builtin/pull.c:185
 msgid "fetch from all remotes"
 msgstr "extraer de todos los remotos"
 
-#: builtin/fetch.c:147 builtin/pull.c:245
 msgid "set upstream for git pull/fetch"
 msgstr "configurar upstream para git pull/fetch"
 
-#: builtin/fetch.c:149 builtin/pull.c:188
 msgid "append to .git/FETCH_HEAD instead of overwriting"
 msgstr "adjuntar a .git/FETCH_HEAD en lugar de sobrescribir"
 
-#: builtin/fetch.c:151
 msgid "use atomic transaction to update references"
 msgstr "usar transacción atómica para actualizar referencias"
 
-#: builtin/fetch.c:153 builtin/pull.c:191
 msgid "path to upload pack on remote end"
 msgstr "ruta al paquete al lado remoto"
 
-#: builtin/fetch.c:154
 msgid "force overwrite of local reference"
 msgstr "forzar sobrescritura de referencia local"
 
-#: builtin/fetch.c:156
 msgid "fetch from multiple remotes"
 msgstr "extraer de múltiples remotos"
 
-#: builtin/fetch.c:158 builtin/pull.c:195
 msgid "fetch all tags and associated objects"
 msgstr "extraer todos los tags y objetos asociados"
 
-#: builtin/fetch.c:160
 msgid "do not fetch all tags (--no-tags)"
 msgstr "no extraer todos los tags (--no-tags)"
 
-#: builtin/fetch.c:162
 msgid "number of submodules fetched in parallel"
 msgstr "número de submódulos extraídos en paralelo"
 
-#: builtin/fetch.c:164
 msgid "modify the refspec to place all refs within refs/prefetch/"
 msgstr ""
 "modificar el refspec para colocar todas las referencias en refs/preferch/"
 
-#: builtin/fetch.c:166 builtin/pull.c:198
 msgid "prune remote-tracking branches no longer on remote"
-msgstr "limpiar ramas remotas rastreadas que ya no están en el remoto"
+msgstr "recortar ramas remotas rastreadas que ya no están en el remoto"
 
-#: builtin/fetch.c:168
 msgid "prune local tags no longer on remote and clobber changed tags"
 msgstr ""
-"limpiar tags locales que no se encuentren en el remoto y eliminar tags "
+"recortar tags locales que no se encuentren en el remoto y sobrescribir tags "
 "cambiados"
 
-#: builtin/fetch.c:169 builtin/fetch.c:194 builtin/pull.c:122
 msgid "on-demand"
 msgstr "en demanda"
 
-#: builtin/fetch.c:170
 msgid "control recursive fetching of submodules"
 msgstr "controlar extracción recursiva de submódulos"
 
-#: builtin/fetch.c:175
 msgid "write fetched references to the FETCH_HEAD file"
 msgstr "escribir referencias obtenidas en el archivo FETCH_HEAD"
 
-#: builtin/fetch.c:176 builtin/pull.c:206
 msgid "keep downloaded pack"
 msgstr "mantener el paquete descargado"
 
-#: builtin/fetch.c:178
 msgid "allow updating of HEAD ref"
 msgstr "permitir actualizar la ref HEAD"
 
-#: builtin/fetch.c:181 builtin/fetch.c:187 builtin/pull.c:209
-#: builtin/pull.c:218
 msgid "deepen history of shallow clone"
 msgstr "profundizar la historia de un clon superficial"
 
-#: builtin/fetch.c:183 builtin/pull.c:212
 msgid "deepen history of shallow repository based on time"
 msgstr "profundizar la historia de un repositorio superficial hasta un tiempo"
 
-#: builtin/fetch.c:189 builtin/pull.c:221
 msgid "convert to a complete repository"
 msgstr "convertir a un repositorio completo"
 
-#: builtin/fetch.c:192
+msgid "re-fetch without negotiating common commits"
+msgstr ""
+
 msgid "prepend this to submodule path output"
 msgstr "anteponer esto a la salida de ruta del submódulo"
 
-#: builtin/fetch.c:195
 msgid ""
 "default for recursive fetching of submodules (lower priority than config "
 "files)"
@@ -15333,143 +5681,119 @@ msgstr ""
 "default para extracción recursiva de submódulos (menor prioridad que "
 "archivos de configuración)"
 
-#: builtin/fetch.c:199 builtin/pull.c:224
 msgid "accept refs that update .git/shallow"
 msgstr "aceptar refs que actualicen .git/shallow"
 
-#: builtin/fetch.c:200 builtin/pull.c:226
 msgid "refmap"
 msgstr "refmap"
 
-#: builtin/fetch.c:201 builtin/pull.c:227
 msgid "specify fetch refmap"
 msgstr "especificar extracción de refmap"
 
-#: builtin/fetch.c:208 builtin/pull.c:240
 msgid "report that we have only objects reachable from this object"
 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 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 "ejecutar 'maintenance --auto' después de buscar"
 
-#: builtin/fetch.c:217 builtin/pull.c:243
 msgid "check for forced-updates on all updated branches"
 msgstr "verificar updates forzados en todos los branch actualizados"
 
-#: builtin/fetch.c:219
 msgid "write the commit-graph after fetching"
 msgstr "escribir commit-graph luego del fetch"
 
-#: builtin/fetch.c:221
 msgid "accept refspecs from stdin"
 msgstr "aceptar refspecs de stdin"
 
-#: builtin/fetch.c:586
-msgid "Couldn't find remote ref HEAD"
+#, fuzzy
+msgid "couldn't find remote ref HEAD"
 msgstr "No se pudo encontrar ref remota HEAD"
 
-#: 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:862
 #, c-format
 msgid "object %s not found"
 msgstr "objeto %s no encontrado"
 
-#: builtin/fetch.c:866
 msgid "[up to date]"
 msgstr "[actualizado]"
 
-#: builtin/fetch.c:879 builtin/fetch.c:895 builtin/fetch.c:967
 msgid "[rejected]"
 msgstr "[rechazado]"
 
-#: builtin/fetch.c:880
 msgid "can't fetch in current branch"
 msgstr "no se puede traer en la rama actual"
 
-#: builtin/fetch.c:890
+#, fuzzy
+msgid "checked out in another worktree"
+msgstr "buscar en el índice en lugar del árbol de trabajo"
+
 msgid "[tag update]"
 msgstr "[actualización de tag]"
 
-#: 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:895
 msgid "would clobber existing tag"
 msgstr "sobrescribiría tag existente"
 
-#: builtin/fetch.c:917
 msgid "[new tag]"
 msgstr "[nuevo tag]"
 
-#: builtin/fetch.c:920
 msgid "[new branch]"
 msgstr "[nueva rama]"
 
-#: builtin/fetch.c:923
 msgid "[new ref]"
 msgstr "[nueva referencia]"
 
-#: builtin/fetch.c:962
 msgid "forced update"
 msgstr "actualización forzada"
 
-#: builtin/fetch.c:967
 msgid "non-fast-forward"
 msgstr "avance no rápido"
 
-#: builtin/fetch.c:1070
+#, c-format
+msgid "cannot open '%s'"
+msgstr "no se puede abrir '%s'"
+
+#, fuzzy
 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'."
+"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 usa '--"
 "show-forced-updates'\n"
 "o ejecuta 'git config fetch.showForcedUpdates true'."
 
-#: builtin/fetch.c:1074
-#, c-format
+#, fuzzy, c-format
 msgid ""
-"It took %.2f seconds to check forced updates. You can use\n"
+"it took %.2f seconds to check forced updates; you can use\n"
 "'--no-show-forced-updates' or run 'git config fetch.showForcedUpdates "
 "false'\n"
-" to avoid this check.\n"
+"to avoid this check\n"
 msgstr ""
 "Tomó %.2f segundos validar los updates forzados. Puedes usar\n"
 "'--no-show-forced-updates' o ejecutar 'git config fetch.showForcedUpdates "
 "false'\n"
 "para evitar esta validación.\n"
 
-#: 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: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:1223 builtin/fetch.c:1371
 #, c-format
 msgid "From %.*s\n"
 msgstr "Desde %.*s\n"
 
-#: builtin/fetch.c:1244
 #, c-format
 msgid ""
 "some local refs could not be updated; try running\n"
@@ -15478,141 +5802,124 @@ msgstr ""
 "algunos refs locales no pudieron ser actualizados; intenta ejecutar\n"
 " 'git remote prune %s' para eliminar cualquier rama vieja o conflictiva"
 
-#: builtin/fetch.c:1341
 #, c-format
 msgid "   (%s will become dangling)"
 msgstr "   (%s se volverá colgante)"
 
-#: builtin/fetch.c:1342
 #, c-format
 msgid "   (%s has become dangling)"
 msgstr "   (%s se ha vuelto colgante)"
 
-#: builtin/fetch.c:1374
 msgid "[deleted]"
 msgstr "[eliminado]"
 
-#: builtin/fetch.c:1375 builtin/remote.c:1128
 msgid "(none)"
 msgstr "(nada)"
 
-#: 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"
+#, fuzzy, c-format
+msgid "refusing to fetch into branch '%s' checked out at '%s'"
+msgstr "No se puede borrar rama '%s' que cuenta con checkout en '%s'"
 
-#: builtin/fetch.c:1417
-#, c-format
-msgid "Option \"%s\" value \"%s\" is not valid for %s"
+#, fuzzy, 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:1420
-#, c-format
-msgid "Option \"%s\" is ignored for %s\n"
+#, fuzzy, c-format
+msgid "option \"%s\" is ignored for %s\n"
 msgstr "Opción \"%s\" es ignorada por %s\n"
 
-#: builtin/fetch.c:1447
+#, c-format
+msgid "%s is not a valid object"
+msgstr "%s no es objeto válido"
+
 #, 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:1648
+#, fuzzy, c-format
+msgid ""
+"could not set upstream of HEAD to '%s' from '%s' when it does not point to "
+"any branch."
+msgstr ""
+"no se pudo configurar upstream de HEAD a %s cuando este no apunta a ninguna "
+"rama."
+
 msgid "not setting upstream for a remote remote-tracking branch"
 msgstr "no configurar upstream para una rama de rastreo remoto"
 
-#: builtin/fetch.c:1650
 msgid "not setting upstream for a remote tag"
 msgstr "no configurar upstream para un tag remoto"
 
-#: builtin/fetch.c:1652
 msgid "unknown branch type"
 msgstr "tipo de branch desconocido"
 
-#: builtin/fetch.c:1654
+#, fuzzy
 msgid ""
-"no source branch found.\n"
-"you need to specify exactly one branch with the --set-upstream option."
+"no source branch found;\n"
+"you need to specify exactly one branch with the --set-upstream option"
 msgstr ""
 "no se encontró rama fuente.\n"
 "tienes que especificar exactamente una rama con la opción --set-upstream."
 
-#: builtin/fetch.c:1783 builtin/fetch.c:1846
 #, c-format
 msgid "Fetching %s\n"
 msgstr "Extrayendo %s\n"
 
-#: builtin/fetch.c:1793 builtin/fetch.c:1848 builtin/remote.c:101
-#, c-format
-msgid "Could not fetch %s"
+#, fuzzy, c-format
+msgid "could not fetch %s"
 msgstr "No se pudo extraer %s"
 
-#: 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:1909
+#, fuzzy
 msgid ""
-"No remote repository specified.  Please, specify either a URL or a\n"
-"remote name from which new revisions should be fetched."
+"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, especifica un URL o un\n"
 "nombre remoto del cual las nuevas revisiones deben ser extraídas."
 
-#: builtin/fetch.c:1945
-msgid "You need to specify a tag name."
+#, fuzzy
+msgid "you need to specify a tag name"
 msgstr "Tienes que especificar un nombre de tag."
 
-#: builtin/fetch.c:2009
-msgid "--negotiate-only needs one or more --negotiate-tip=*"
+#, fuzzy
+msgid "--negotiate-only needs one or more --negotiation-tip=*"
 msgstr "--negotiate-only necesita uno o más --negotiate-tip=*"
 
-#: builtin/fetch.c:2013
-msgid "Negative depth in --deepen is not supported"
+#, fuzzy
+msgid "negative depth in --deepen is not supported"
 msgstr "Profundidad negativa en --deepen no soportada"
 
-#: builtin/fetch.c:2015
-msgid "--deepen and --depth are mutually exclusive"
-msgstr "--deepen y --depth son mutuamente exclusivas"
-
-#: builtin/fetch.c:2020
-msgid "--depth and --unshallow cannot be used together"
-msgstr "--depth y --unshallow no pueden ser usadas juntas"
-
-#: 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:2039
 msgid "fetch --all does not take a repository argument"
 msgstr "fetch --all no toma un argumento de repositorio"
 
-#: builtin/fetch.c:2041
 msgid "fetch --all does not make sense with refspecs"
 msgstr "fetch --all no tiene sentido con refspecs"
 
-#: builtin/fetch.c:2050
-#, c-format
-msgid "No such remote or remote group: %s"
+#, fuzzy, c-format
+msgid "no such remote or remote group: %s"
 msgstr "No existe el remoto o grupo remoto: %s"
 
-#: builtin/fetch.c:2057
-msgid "Fetching a group and specifying refspecs does not make sense"
+#, fuzzy
+msgid "fetching a group and specifying refspecs does not make sense"
 msgstr "Extraer un grupo y especificar refspecs no tiene sentido"
 
-#: 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:2078
-msgid "Protocol does not support --negotiate-only, exiting."
+#, fuzzy
+msgid "protocol does not support --negotiate-only, exiting"
 msgstr "Protocolo no soporta --negotiate-only, saliendo."
 
-#: builtin/fetch.c:2097
 msgid ""
 "--filter can only be used with the remote configured in extensions."
 "partialclone"
@@ -15620,142 +5927,113 @@ msgstr ""
 "--filter solo puede ser usado con el remoto configurado en extensions."
 "partialclone"
 
-#: 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: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"
 
-#: builtin/fmt-merge-msg.c:7
 msgid ""
 "git fmt-merge-msg [-m <message>] [--log[=<n>] | --no-log] [--file <file>]"
 msgstr ""
 "git fmt-merge-msg [-m <mensaje>] [--log[=<n>] | --no-log] [--file <archivo>]"
 
-#: builtin/fmt-merge-msg.c:18
 msgid "populate log with at most <n> entries from shortlog"
 msgstr "poblar el log con máximo <n> entradas del shorlog"
 
-#: builtin/fmt-merge-msg.c:21
 msgid "alias for --log (deprecated)"
 msgstr "alias para --log (deprecado)"
 
-#: builtin/fmt-merge-msg.c:24
 msgid "text"
 msgstr "texto"
 
-#: builtin/fmt-merge-msg.c:25
 msgid "use <text> as start of message"
 msgstr "usar <text> como comienzo de mensaje"
 
-#: builtin/fmt-merge-msg.c:26
+#, fuzzy
+msgid "use <name> instead of the real target branch"
+msgstr "usar <nombre> en lugar de 'origin' para rastrear upstream"
+
 msgid "file to read from"
 msgstr "archivo del cual leer"
 
-#: builtin/for-each-ref.c:10
 msgid "git for-each-ref [<options>] [<pattern>]"
 msgstr "git for-each-ref [<opciones>] [<patrón>]"
 
-#: builtin/for-each-ref.c:11
 msgid "git for-each-ref [--points-at <object>]"
 msgstr "git for-each-ref [--points-at <objeto>]"
 
-#: builtin/for-each-ref.c:12
 msgid "git for-each-ref [--merged [<commit>]] [--no-merged [<commit>]]"
 msgstr "git for-each-ref [--merged [<commit>]] [--no-merged [<commit>]]"
 
-#: 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>]]"
 
-#: builtin/for-each-ref.c:30
 msgid "quote placeholders suitably for 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 "entrecomillar los marcadores de posición adecuadamente para perl"
 
-#: builtin/for-each-ref.c:34
 msgid "quote placeholders suitably for python"
 msgstr "entrecomillar los marcadores de posición adecuadamente para python"
 
-#: builtin/for-each-ref.c:36
 msgid "quote placeholders suitably for 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:481
 msgid "respect format colors"
 msgstr "respetar los colores de formato"
 
-#: builtin/for-each-ref.c:44
 msgid "print only refs which points at the given object"
 msgstr "mostrar solo refs que apunten al objeto dado"
 
-#: builtin/for-each-ref.c:46
 msgid "print only refs that are merged"
 msgstr "mostrar solo refs que sean fusionadas"
 
-#: builtin/for-each-ref.c:47
 msgid "print only refs that are not merged"
 msgstr "mostrar solo refs que no sean fusionadas"
 
-#: builtin/for-each-ref.c:48
 msgid "print only refs which contain the commit"
 msgstr "mostrar solo refs que contengan el commit"
 
-#: builtin/for-each-ref.c:49
 msgid "print only refs which don't contain the commit"
 msgstr "mostrar solo refs que no contengan el commit"
 
-#: builtin/for-each-repo.c:9
 msgid "git for-each-repo --config=<config> <command-args>"
 msgstr "git for-each-repo --config=<config> <argumetnos-de-comando>"
 
-#: builtin/for-each-repo.c:34
 msgid "config"
 msgstr "config"
 
-#: builtin/for-each-repo.c:35
 msgid "config key storing a list of repository paths"
 msgstr "clave de configuración que almacena una lista de rutas de repositorio"
 
-#: builtin/for-each-repo.c:43
 msgid "missing --config=<config>"
 msgstr "falta --config=<config>"
 
-#: builtin/fsck.c:69 builtin/fsck.c:128 builtin/fsck.c:129
 msgid "unknown"
 msgstr "desconocido"
 
 #. 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 "error en %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 "peligro en %s %s: %s"
 
-#: builtin/fsck.c:124 builtin/fsck.c:127
 #, c-format
 msgid "broken link from %7s %s"
 msgstr "link roto de %7s %s"
 
-#: builtin/fsck.c:136
 msgid "wrong object type in link"
 msgstr "tipo de objeto equivocado en link"
 
-#: builtin/fsck.c:152
 #, c-format
 msgid ""
 "broken link from %7s %s\n"
@@ -15764,250 +6042,306 @@ msgstr ""
 "link roto de %7s %s\n"
 "              a %7s %s"
 
-#: builtin/fsck.c:264
+msgid "Checking connectivity"
+msgstr "Verificando conectividad"
+
 #, c-format
 msgid "missing %s %s"
 msgstr "falta %s %s"
 
-#: builtin/fsck.c:291
 #, c-format
 msgid "unreachable %s %s"
 msgstr "inalcanzable %s %s"
 
-#: builtin/fsck.c:311
 #, c-format
 msgid "dangling %s %s"
 msgstr "actualizando %s %s"
 
-#: builtin/fsck.c:321
 msgid "could not create lost-found"
 msgstr "no se pudo crear lost-found"
 
-#: builtin/fsck.c:332
+#, c-format
+msgid "could not write '%s'"
+msgstr "no se pudo escribir '%s'"
+
 #, c-format
 msgid "could not finish '%s'"
 msgstr "no se pudo finalizar '%s'"
 
-#: builtin/fsck.c:349
 #, c-format
 msgid "Checking %s"
 msgstr "Revisando %s"
 
-#: builtin/fsck.c:387
 #, c-format
 msgid "Checking connectivity (%d objects)"
 msgstr "Verificando conectividad (%d objetos)"
 
-#: builtin/fsck.c:406
 #, c-format
 msgid "Checking %s %s"
 msgstr "Revisando %s %s"
 
-#: builtin/fsck.c:411
 msgid "broken links"
 msgstr "links rotos"
 
-#: builtin/fsck.c:420
 #, c-format
 msgid "root %s"
 msgstr "raíz %s"
 
-#: builtin/fsck.c:428
 #, c-format
 msgid "tagged %s %s (%s) in %s"
 msgstr "tagged %s %s (%s) en %s"
 
-#: builtin/fsck.c:457
 #, c-format
 msgid "%s: object corrupt or missing"
 msgstr "%s: objecto corrupto o faltante"
 
-#: builtin/fsck.c:482
 #, c-format
 msgid "%s: invalid reflog entry %s"
 msgstr "%s: referencia inválida %s"
 
-#: builtin/fsck.c:496
 #, c-format
 msgid "Checking reflog %s->%s"
 msgstr "Revisando reflog %s->%s"
 
-#: builtin/fsck.c:530
 #, c-format
 msgid "%s: invalid sha1 pointer %s"
 msgstr "%s: puntero sha1 inválido %s"
 
-#: builtin/fsck.c:537
 #, c-format
 msgid "%s: not a commit"
 msgstr "%s: no es un commit"
 
-#: builtin/fsck.c:591
 msgid "notice: No default references"
 msgstr "aviso: No hay referencias por defecto"
 
-#: 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: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:664
 #, c-format
 msgid "bad sha1 file: %s"
 msgstr "mal sha1 de archivo: %s"
 
-#: builtin/fsck.c:685
 msgid "Checking object directory"
 msgstr "Revisando directorio de objetos"
 
-#: builtin/fsck.c:688
 msgid "Checking object directories"
 msgstr "Revisando objetos directorios"
 
-#: builtin/fsck.c:704
 #, c-format
 msgid "Checking %s link"
 msgstr "Revisando link %s"
 
-#: builtin/fsck.c:709 builtin/index-pack.c:859
 #, c-format
 msgid "invalid %s"
 msgstr "%s inválido"
 
-#: builtin/fsck.c:716
 #, c-format
 msgid "%s points to something strange (%s)"
 msgstr "%s apunta a algo extraño (%s)"
 
-#: builtin/fsck.c:722
 #, c-format
 msgid "%s: detached HEAD points at nothing"
 msgstr "%s: HEAD desacoplado no apunta a nada"
 
-#: 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:738
 msgid "Checking cache tree"
 msgstr "Revisando el tree caché"
 
-#: 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:752
 msgid "non-tree in cache-tree"
 msgstr "non-tree en cache-tree"
 
-#: builtin/fsck.c:783
 msgid "git fsck [<options>] [<object>...]"
 msgstr "git fsck [<opciones>] [<objeto>...]"
 
-#: builtin/fsck.c:789
 msgid "show unreachable objects"
 msgstr "mostrar objetos inalcanzables"
 
-#: builtin/fsck.c:790
 msgid "show dangling objects"
 msgstr "mostrar objetos colgantes"
 
-#: builtin/fsck.c:791
 msgid "report tags"
 msgstr "reportar tags"
 
-#: builtin/fsck.c:792
 msgid "report root nodes"
 msgstr "reportar nodos raíz"
 
-#: builtin/fsck.c:793
 msgid "make index objects head nodes"
 msgstr "hacer objetos índices cabezas de nodos"
 
-#: builtin/fsck.c:794
 msgid "make reflogs head nodes (default)"
 msgstr "hacer reflogs cabeza de nodos (default)"
 
-#: builtin/fsck.c:795
 msgid "also consider packs and alternate objects"
 msgstr "también considerar paquetes y objetos alternos"
 
-#: builtin/fsck.c:796
 msgid "check only connectivity"
 msgstr "revisar solo conectividad"
 
-#: builtin/fsck.c:797 builtin/mktag.c:76
 msgid "enable more strict checking"
 msgstr "habilitar revisión más estricta"
 
-#: builtin/fsck.c:799
 msgid "write dangling objects in .git/lost-found"
 msgstr "escribir objetos colgantes en .git/lost-found"
 
-#: builtin/fsck.c:800 builtin/prune.c:134
 msgid "show progress"
 msgstr "mostrar progreso"
 
-#: builtin/fsck.c:801
 msgid "show verbose names for reachable objects"
 msgstr "mostrar nombres verbosos de objetos alcanzables"
 
-#: builtin/fsck.c:861 builtin/index-pack.c:261
 msgid "Checking objects"
 msgstr "Revisando objetos"
 
-#: builtin/fsck.c:889
 #, c-format
 msgid "%s: object missing"
 msgstr "%s: objeto faltante"
 
-#: builtin/fsck.c:900
 #, c-format
 msgid "invalid parameter: expected sha1, got '%s'"
 msgstr "parámetro inválido: sha1 esperado, se obtuvo '%s'"
 
-#: builtin/gc.c:39
+#, fuzzy
+msgid "git fsmonitor--daemon start [<options>]"
+msgstr "git stash list [<opciones>]"
+
+#, fuzzy
+msgid "git fsmonitor--daemon run [<options>]"
+msgstr "git notes prune [<opciones>]"
+
+msgid "git fsmonitor--daemon stop"
+msgstr ""
+
+msgid "git fsmonitor--daemon status"
+msgstr ""
+
+#, fuzzy, c-format
+msgid "value of '%s' out of range: %d"
+msgstr "largo de abreviatura fuera de rango: %d"
+
+#, fuzzy, c-format
+msgid "value of '%s' not bool or int: %d"
+msgstr "valor es --bool o --int"
+
+#, c-format
+msgid "fsmonitor-daemon is watching '%s'\n"
+msgstr ""
+
+#, c-format
+msgid "fsmonitor-daemon is not watching '%s'\n"
+msgstr ""
+
+#, fuzzy, c-format
+msgid "could not create fsmonitor cookie '%s'"
+msgstr "no se pudo crear el archivo '%s'"
+
+#, c-format
+msgid "fsmonitor: cookie_result '%d' != SEEN"
+msgstr ""
+
+#, fuzzy, c-format
+msgid "could not start IPC thread pool on '%s'"
+msgstr "no se pudo iniciar el servidor en: '%s'"
+
+#, fuzzy
+msgid "could not start fsmonitor listener thread"
+msgstr "no se pudo comenzar ls-files en .."
+
+#, fuzzy
+msgid "could not start fsmonitor health thread"
+msgstr "no se pudo iniciar el accept_thread '%s'"
+
+#, fuzzy
+msgid "could not initialize listener thread"
+msgstr "no se pudo guardar el árbol de índice"
+
+#, fuzzy
+msgid "could not initialize health thread"
+msgstr "no se pudo normalizar la ruta %s"
+
+#, fuzzy, c-format
+msgid "could not cd home '%s'"
+msgstr "no se pudo cerrar '%s'"
+
+#, c-format
+msgid "fsmonitor--daemon is already running '%s'"
+msgstr ""
+
+#, c-format
+msgid "running fsmonitor-daemon in '%s'\n"
+msgstr ""
+
+#, fuzzy, c-format
+msgid "starting fsmonitor-daemon in '%s'\n"
+msgstr "Probando mtime en '%s' "
+
+msgid "daemon failed to start"
+msgstr "falló al iniciar demonio"
+
+msgid "daemon not online yet"
+msgstr "demonio no está en línea todavía"
+
+#, fuzzy
+msgid "daemon terminated"
+msgstr "no hay términos definidos"
+
+#, fuzzy
+msgid "detach from console"
+msgstr "HEAD desacoplada de "
+
+#, fuzzy
+msgid "use <n> ipc worker threads"
+msgstr "usar <n> hilos de trabajo"
+
+#, fuzzy
+msgid "max seconds to wait for background daemon startup"
+msgstr "segundos a esperar para que el dominio empiece o se detenga"
+
+#, fuzzy, c-format
+msgid "invalid 'ipc-threads' value (%d)"
+msgstr "valor --stat inválido: %s"
+
+#, fuzzy, c-format
+msgid "Unhandled subcommand '%s'"
+msgstr "subcomando no válido: %s"
+
+msgid "fsmonitor--daemon not supported on this platform"
+msgstr ""
+
 msgid "git gc [<options>]"
 msgstr "git gc [<opciones>]"
 
-#: builtin/gc.c:93
 #, c-format
 msgid "Failed to fstat %s: %s"
 msgstr "Falló el fstat %s: %s"
 
-#: builtin/gc.c:129
 #, c-format
 msgid "failed to parse '%s' value '%s'"
 msgstr "falló al analizar '%s' valor '%s'"
 
-#: builtin/gc.c:487 builtin/init-db.c:57
 #, c-format
 msgid "cannot stat '%s'"
 msgstr "no se puede hacer stat en '%s'"
 
-#: builtin/gc.c:496 builtin/notes.c:238 builtin/tag.c:574
-#, c-format
-msgid "cannot read '%s'"
-msgstr "no se puede leer '%s'"
-
-#: builtin/gc.c:503
 #, c-format
 msgid ""
 "The last gc run reported the following. Please correct the root cause\n"
@@ -16022,54 +6356,47 @@ msgstr ""
 "\n"
 "%s"
 
-#: builtin/gc.c:551
 msgid "prune unreferenced objects"
-msgstr "limpiar objetos no referenciados"
+msgstr "recortar objetos no referenciados"
+
+#, fuzzy
+msgid "pack unreferenced objects separately"
+msgstr "recortar objetos no referenciados"
 
-#: builtin/gc.c:553
 msgid "be more thorough (increased runtime)"
 msgstr "ser más exhaustivo (aumentar runtime)"
 
-#: builtin/gc.c:554
 msgid "enable auto-gc mode"
 msgstr "habilitar modo auto-gc"
 
-#: builtin/gc.c:557
 msgid "force running gc even if there may be another gc running"
 msgstr "forzar la ejecución de gc incluso si puede haber otro gc ejecutándose"
 
-#: builtin/gc.c:560
 msgid "repack all other packs except the largest pack"
 msgstr "reempaquetar todos los otros paquetes excepto el paquete más grande"
 
-#: builtin/gc.c:576
 #, c-format
 msgid "failed to parse gc.logexpiry value %s"
 msgstr "falló al analizar valor %s de gc.logexpiry"
 
-#: builtin/gc.c:587
 #, c-format
 msgid "failed to parse prune expiry value %s"
-msgstr "falló al analizar valor %s de prune expiry"
+msgstr "falló al analizar valor %s de caducidad para recorte"
 
-#: builtin/gc.c:607
 #, c-format
 msgid "Auto packing the repository in background for optimum performance.\n"
 msgstr ""
 "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 rendimiento óptimo.\n"
 
-#: builtin/gc.c:610
 #, c-format
 msgid "See \"git help gc\" for manual housekeeping.\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)"
@@ -16077,495 +6404,379 @@ msgstr ""
 "gc ya está ejecutándose en la máquina '%s' pid %<PRIuMAX> (usa --force si no "
 "es así)"
 
-#: builtin/gc.c:705
 msgid ""
 "There are too many unreachable loose objects; run 'git prune' to remove them."
 msgstr ""
 "Hay demasiados objetos sueltos inalcanzables; ejecute 'git prune' para "
 "eliminarlos."
 
-#: builtin/gc.c:715
 msgid ""
 "git maintenance run [--auto] [--[no-]quiet] [--task=<task>] [--schedule]"
 msgstr ""
 "git maintenance run [--auto] [--[no-]quiet] [--task=<task>] [--schedule]"
 
-#: builtin/gc.c:745
 msgid "--no-schedule is not allowed"
 msgstr "--no-schedule no está permitido"
 
-#: builtin/gc.c:750
 #, c-format
 msgid "unrecognized --schedule argument '%s'"
 msgstr "argumento --schedule no reconocido, '%s'"
 
-#: builtin/gc.c:868
 msgid "failed to write commit-graph"
 msgstr "no se pudo escribir el commit-graph"
 
-#: builtin/gc.c:904
 msgid "failed to prefetch remotes"
 msgstr "falló al hacer prefetch a los remotos"
 
-#: 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:1037
 msgid "failed to finish 'git pack-objects' process"
 msgstr "no se pudo finalizar el proceso 'git pack-objects'"
 
-#: 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:1104
 msgid "'git multi-pack-index expire' failed"
 msgstr "'git multi-pack-index expire' falló"
 
-#: builtin/gc.c:1163
 msgid "'git multi-pack-index repack' failed"
 msgstr "'git multi-pack-index repack' falló"
 
-#: 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:1276
 #, c-format
 msgid "lock file '%s' exists, skipping maintenance"
 msgstr "el archivo de bloqueo '%s' existe, omitiendo el mantenimiento"
 
-#: builtin/gc.c:1306
 #, c-format
 msgid "task '%s' failed"
 msgstr "tarea '%s' falló"
 
-#: builtin/gc.c:1388
 #, c-format
 msgid "'%s' is not a valid task"
 msgstr "'%s' no es una tarea válida"
 
-#: builtin/gc.c:1393
 #, c-format
 msgid "task '%s' cannot be selected multiple times"
 msgstr "tarea '%s' no puede ser seleccionada múltiples veces"
 
-#: 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:1409
 msgid "frequency"
 msgstr "frecuencia"
 
-#: builtin/gc.c:1410
 msgid "run tasks based on frequency"
 msgstr "ejecutar tareas basado en frecuencia"
 
-#: 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:1414
 msgid "task"
 msgstr "tarea"
 
-#: builtin/gc.c:1415
 msgid "run a specific task"
 msgstr "ejecutar una tarea específica"
 
-#: 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:1475
 msgid "failed to run 'git config'"
 msgstr "no pudo ejecutar 'git config'"
 
-#: builtin/gc.c:1627
 #, c-format
 msgid "failed to expand path '%s'"
 msgstr "falló al expandir la ruta '%s'"
 
-#: builtin/gc.c:1654 builtin/gc.c:1692
 msgid "failed to start launchctl"
 msgstr "falló al iniciar launchctl"
 
-#: 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:1794
 #, c-format
 msgid "failed to bootstrap service %s"
 msgstr "falló al generar el servicio %s"
 
-#: builtin/gc.c:1887
 msgid "failed to create temp xml file"
 msgstr "no se pudo crear el archivo temp xml"
 
-#: builtin/gc.c:1977
 msgid "failed to start schtasks"
 msgstr "no se pudo iniciar schtasks"
 
-#: 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: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:2067
 msgid "failed to open stdin of 'crontab'"
 msgstr "no se pudo abrir stdin de 'crontab'"
 
-#: builtin/gc.c:2109
 msgid "'crontab' died"
 msgstr "'crontab' murió"
 
-#: 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 "failed to flush '%s'"
+msgstr "falló al hacer flush '%s'"
+
 #, 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: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:2487
 msgid "git maintenance <subcommand> [<options>]"
 msgstr "git maintenance <subcomando> [<opciones>]"
 
-#: builtin/gc.c:2506
 #, c-format
 msgid "invalid subcommand: %s"
 msgstr "subcomando no válido: %s"
 
-#: builtin/grep.c:30
 msgid "git grep [<options>] [-e] <pattern> [<rev>...] [[--] <path>...]"
 msgstr "git grep [<opciones>] [-e] <patrón> [<rev>...] [[--] <ruta>...]"
 
-#: builtin/grep.c:239
 #, c-format
 msgid "grep: failed to create thread: %s"
 msgstr "grep: falló al crear el hilo: %s"
 
-#: 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"
 
+#. #-#-#-#-#  grep.c.po  #-#-#-#-#
 #. TRANSLATORS: %s is the configuration
 #. variable for tweaking threads, currently
 #. grep.threads
 #.
-#: 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: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: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:752
 #, c-format
 msgid "switch `%c' expects a numerical value"
 msgstr "switch `%c' espera un valor numérico"
 
-#: 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:853
 msgid "find in contents not managed by git"
 msgstr "buscar en contenidos no manejados por git"
 
-#: builtin/grep.c:855
 msgid "search in both tracked and untracked files"
 msgstr "buscar en archivos rastreados y no rastreados"
 
-#: builtin/grep.c:857
 msgid "ignore files specified via '.gitignore'"
 msgstr "ignorar archivos especificados vía '.gitignore'"
 
-#: builtin/grep.c:859
 msgid "recursively search in each submodule"
 msgstr "búsqueda recursiva en cada submódulo"
 
-#: builtin/grep.c:862
 msgid "show non-matching lines"
 msgstr "mostrar líneas que no concuerden"
 
-#: builtin/grep.c:864
 msgid "case insensitive matching"
 msgstr "búsqueda insensible a mayúsculas"
 
-#: 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:868
 msgid "process binary files as text"
 msgstr "procesar archivos binarios como texto"
 
-#: builtin/grep.c:870
 msgid "don't match patterns in binary files"
 msgstr "no concordar patrones en archivos binarios"
 
-#: builtin/grep.c:873
 msgid "process binary files with textconv filters"
 msgstr "procesar archivos binarios con filtros textconv"
 
-#: builtin/grep.c:875
 msgid "search in subdirectories (default)"
 msgstr "buscar en subdirectorios (default)"
 
-#: builtin/grep.c:877
 msgid "descend at most <depth> levels"
 msgstr "descender como máximo <valor-de-profundiad> niveles"
 
-#: builtin/grep.c:881
 msgid "use extended POSIX regular expressions"
 msgstr "usar expresiones regulares POSIX extendidas"
 
-#: builtin/grep.c:884
 msgid "use basic POSIX regular expressions (default)"
 msgstr "usar expresiones regulares POSIX (default)"
 
-#: builtin/grep.c:887
 msgid "interpret patterns as fixed strings"
 msgstr "interpretar patrones como strings fijos"
 
-#: builtin/grep.c:890
 msgid "use Perl-compatible regular expressions"
 msgstr "usar expresiones regulares compatibles con Perl"
 
-#: builtin/grep.c:893
 msgid "show line numbers"
 msgstr "mostrar números de línea"
 
-#: 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:895
 msgid "don't show filenames"
 msgstr "no mostrar nombres de archivo"
 
-#: builtin/grep.c:896
 msgid "show filenames"
 msgstr "mostrar nombres de archivo"
 
-#: builtin/grep.c:898
 msgid "show filenames relative to top directory"
 msgstr "mostrar nombres de archivo relativos al directorio superior"
 
-#: 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:902
 msgid "synonym for --files-with-matches"
 msgstr "sinónimo para --files-with-matches"
 
-#: 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:907
 msgid "print NUL after filenames"
 msgstr "imprimir NUL después del nombre de archivo"
 
-#: 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: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:913
 msgid "highlight matches"
 msgstr "resaltar concordancias"
 
-#: 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: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: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:923
 msgid "show <n> context lines before matches"
 msgstr "mostrar <n> líneas de contexto antes de las concordancias"
 
-#: 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:927
 msgid "use <n> worker threads"
 msgstr "usar <n> hilos de trabajo"
 
-#: builtin/grep.c:928
 msgid "shortcut for -C NUM"
 msgstr "atajo para -C NUM"
 
-#: 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:933
 msgid "show the surrounding function"
 msgstr "mostrar la función circundante"
 
-#: builtin/grep.c:936
 msgid "read patterns from file"
 msgstr "leer patrones del archivo"
 
-#: builtin/grep.c:938
 msgid "match <pattern>"
 msgstr "concordar <patrón>"
 
-#: builtin/grep.c:940
 msgid "combine patterns specified with -e"
 msgstr "combinar patrones especificados con -e"
 
-#: builtin/grep.c:952
 msgid "indicate hit with exit status without output"
 msgstr "indicar concordancia con exit status sin output"
 
-#: 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:957
 msgid "pager"
 msgstr "paginador"
 
-#: builtin/grep.c:957
 msgid "show matching files in the pager"
 msgstr "mostrar archivos concordantes en el paginador"
 
-#: 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:1027
 msgid "no pattern given"
 msgstr "no se ha entregado ningún patrón"
 
-#: 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:1071
 #, c-format
 msgid "unable to resolve revision: %s"
 msgstr "no es posible resolver revisión: %s"
 
-#: builtin/grep.c:1101
 msgid "--untracked not supported with --recurse-submodules"
 msgstr "--untracked no es soportada con --recurse-submodules"
 
-#: builtin/grep.c:1105
 msgid "invalid option combination, ignoring --threads"
 msgstr "combinación de opciones inválida, ignorando --threads"
 
-#: 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: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: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: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:1174
-msgid "--untracked cannot be used with --cached"
-msgstr "--untracked no se puede usar con --cached"
-
-#: 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:1188
 msgid "both --cached and trees are given"
 msgstr "ambos --cached y árboles han sido entregados"
 
-#: builtin/hash-object.c:83
 msgid ""
 "git hash-object [-t <type>] [-w] [--path=<file> | --no-filters] [--stdin] "
 "[--] <file>..."
@@ -16573,109 +6784,83 @@ msgstr ""
 "git hash-object [-t <tipo>] [-w] [--path=<archivo> | --no-filters] [--stdin] "
 "[--] <archivo>..."
 
-#: builtin/hash-object.c:84
-msgid "git hash-object  --stdin-paths"
-msgstr "git hash-object  --stdin-paths"
-
-#: builtin/hash-object.c:96
 msgid "object type"
 msgstr "tipo de objeto"
 
-#: 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:99
 msgid "read the object from stdin"
 msgstr "leer el objeto de stdin"
 
-#: builtin/hash-object.c:101
 msgid "store file as is without filters"
 msgstr "guardar el archivo tal cual sin filtros"
 
-#: 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:103
 msgid "process file as it were from this path"
 msgstr "procesar el archivo como si fuera de esta ruta"
 
-#: builtin/help.c:55
 msgid "print all available commands"
 msgstr "mostrar todos los comandos disponibles"
 
-#: builtin/help.c:57
+#, fuzzy
+msgid "show external commands in --all"
+msgstr "Comandos externos"
+
+#, fuzzy
+msgid "show aliases in --all"
+msgstr "mostrar lista de tags en columnas"
+
 msgid "exclude guides"
 msgstr "excluir las guias"
 
-#: builtin/help.c:58
 msgid "show man page"
 msgstr "mostrar la página del manual"
 
-#: builtin/help.c:59
 msgid "show manual in web browser"
 msgstr "mostrar la página del manual en un navegador web"
 
-#: builtin/help.c:61
 msgid "show info page"
 msgstr "mostrar la página de info"
 
-#: builtin/help.c:63
 msgid "print command description"
 msgstr "imprimir descripción del comando"
 
-#: builtin/help.c:65
 msgid "print list of useful guides"
 msgstr "mostrar una lista de guías útiles"
 
-#: 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>]"
+#, fuzzy
+msgid "git help [[-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:223
 msgid "Failed to start emacsclient."
 msgstr "Falló al iniciar emacsclient."
 
-#: builtin/help.c:236
 msgid "Failed to parse emacsclient version."
 msgstr "Falló al analizar la versión de emacsclient."
 
-#: 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: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:340
 #, c-format
 msgid ""
 "'%s': path for unsupported man viewer.\n"
@@ -16684,7 +6869,6 @@ msgstr ""
 "'%s': ruta para un visualizador del manual no soportado.\n"
 "Por favor considera usar 'man.<herramienta>.cmd'."
 
-#: builtin/help.c:352
 #, c-format
 msgid ""
 "'%s': cmd for supported man viewer.\n"
@@ -16693,415 +6877,332 @@ msgstr ""
 "'%s': comando para man viewer soportado.\n"
 "Por favor considera usar 'man.<herramienta>.path."
 
-#: builtin/help.c:467
 #, c-format
 msgid "'%s': unknown man viewer."
 msgstr "'%s': visualizador de man desconocido."
 
-#: builtin/help.c:483
 msgid "no man viewer handled the request"
 msgstr "ningún visualizador de manual procesó la petición"
 
-#: builtin/help.c:490
 msgid "no info viewer handled the request"
 msgstr "ningún visor de info manejó la petición"
 
-#: 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:565 git.c:380
 #, c-format
 msgid "bad alias.%s string: %s"
 msgstr "mal alias.%s string: %s"
 
-#: builtin/help.c:581
-msgid "this option doesn't take any other arguments"
+#, fuzzy, c-format
+msgid "the '%s' option doesn't take any non-option arguments"
 msgstr "esta opción no requiere argumentos"
 
-#: builtin/help.c:602 builtin/help.c:629
+msgid ""
+"the '--no-[external-commands|aliases]' options can only be used with '--all'"
+msgstr ""
+
 #, c-format
 msgid "usage: %s%s"
 msgstr "uso: %s%s"
 
-#: builtin/help.c:624
 msgid "'git help config' for more information"
 msgstr "'git help config' para más información"
 
-#: builtin/index-pack.c:221
+msgid "git hook run [--ignore-missing] <hook-name> [-- <hook-args>]"
+msgstr ""
+
+msgid "silently ignore missing requested <hook-name>"
+msgstr ""
+
 #, c-format
 msgid "object type mismatch at %s"
 msgstr "el tipo del objeto no concuerda en %s"
 
-#: 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:244
 #, c-format
 msgid "object %s: expected type %s, found %s"
 msgstr "objeto %s: tipo esperado %s, encontrado %s"
 
-#: 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:304
 msgid "early EOF"
 msgstr "EOF temprano"
 
-#: builtin/index-pack.c:305
 msgid "read error on input"
 msgstr "error al leer en input"
 
-#: 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: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:327 builtin/unpack-objects.c:95
-msgid "pack exceeds maximum allowed size"
+#, fuzzy, c-format
+msgid "pack exceeds maximum allowed size (%s)"
 msgstr "paquete excede el máximo tamaño permitido"
 
-#: builtin/index-pack.c:358
 msgid "pack signature mismatch"
 msgstr "firma del paquete no concuerda"
 
-#: builtin/index-pack.c:360
 #, c-format
 msgid "pack version %<PRIu32> unsupported"
 msgstr "versión de paquete %<PRIu32> no soportada"
 
-#: 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:482
 #, c-format
 msgid "inflate returned %d"
 msgstr "inflate devolvió %d"
 
-#: 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:539
 msgid "delta base offset is out of bound"
 msgstr "offset de base delta está fuera de límites"
 
-#: builtin/index-pack.c:547
 #, c-format
 msgid "unknown object type %d"
 msgstr "tipo de objeto %d desconocido"
 
-#: builtin/index-pack.c:578
 msgid "cannot pread pack file"
 msgstr "no se puede hacer pread en el paquete"
 
-#: 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:606
 msgid "serious inflate inconsistency"
 msgstr "inconsistencia seria en inflate"
 
-#: 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: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: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:826
 #, c-format
 msgid "cannot read existing object %s"
 msgstr "no se puede leer el objeto existente %s"
 
-#: builtin/index-pack.c:840
 #, c-format
 msgid "invalid blob object %s"
 msgstr "objeto blob %s inválido"
 
-#: 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: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:925 builtin/index-pack.c:972
 msgid "failed to apply delta"
 msgstr "falló al aplicar delta"
 
-#: builtin/index-pack.c:1156
 msgid "Receiving objects"
 msgstr "Recibiendo objetos"
 
-#: builtin/index-pack.c:1156
 msgid "Indexing objects"
 msgstr "Indexando objetos"
 
-#: builtin/index-pack.c:1190
 msgid "pack is corrupted (SHA1 mismatch)"
 msgstr "paquete está corrompido (SHA1 no concuerda)"
 
-#: builtin/index-pack.c:1195
 msgid "cannot fstat packfile"
 msgstr "no se puede fstat al archivo de paquete"
 
-#: builtin/index-pack.c:1198
 msgid "pack has junk at the end"
 msgstr "el paquete tiene basura al final"
 
-#: 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:1233
 msgid "Resolving deltas"
 msgstr "Resolviendo deltas"
 
-#: 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:1277
 msgid "confusion beyond insanity"
 msgstr "confusión más allá de la locura"
 
-#: 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: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: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:1323
 #, c-format
 msgid "unable to deflate appended object (%d)"
 msgstr "no es posible desinflar el objeto adjunto (%d)"
 
-#: builtin/index-pack.c:1419
 #, c-format
 msgid "local object %s is corrupt"
 msgstr "objeto local %s está corrompido"
 
-#: 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:1464
 #, c-format
 msgid "cannot write %s file '%s'"
 msgstr "no se puede escribir archivo '%2$s' de %1$s"
 
-#: 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: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:1573 builtin/pack-objects.c:3150
 #, c-format
 msgid "bad pack.indexversion=%<PRIu32>"
 msgstr "mal pack.indexversion=%<PRIu32>"
 
-#: 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: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: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: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:1742
 msgid "Cannot come back to cwd"
 msgstr "No se puede regresar a cwd"
 
-#: 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: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:1848
-msgid "--fix-thin cannot be used without --stdin"
-msgstr "--fix-thin no puede ser usada sin --stdin"
-
-#: builtin/index-pack.c:1850
 msgid "--stdin requires a git repository"
 msgstr "--stdin requiere un repositorio git"
 
-#: 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:1867
 msgid "--verify with no packfile name given"
 msgstr "--verify no recibió ningún nombre de archivo de paquete"
 
-#: builtin/index-pack.c:1933 builtin/unpack-objects.c:584
 msgid "fsck error in pack objects"
 msgstr "error de fsck en objetos paquete"
 
-#: builtin/init-db.c:63
 #, c-format
 msgid "cannot stat template '%s'"
 msgstr "no se pudo hacer stat en la template '%s'"
 
-#: builtin/init-db.c:68
 #, c-format
 msgid "cannot opendir '%s'"
 msgstr "no se puede abrir directorio '%s'"
 
-#: builtin/init-db.c:80
 #, c-format
 msgid "cannot readlink '%s'"
 msgstr "no se puede leer link '%s'"
 
-#: builtin/init-db.c:82
 #, c-format
 msgid "cannot symlink '%s' '%s'"
 msgstr "no se puede crear symlink '%s' '%s'"
 
-#: builtin/init-db.c:88
 #, c-format
 msgid "cannot copy '%s' to '%s'"
 msgstr "no se puede copiar '%s' a '%s'"
 
-#: builtin/init-db.c:92
 #, c-format
 msgid "ignoring template %s"
 msgstr "ignorando template %s"
 
-#: builtin/init-db.c:123
 #, c-format
 msgid "templates not found in %s"
 msgstr "template no encontrado en %s"
 
-#: builtin/init-db.c:138
 #, c-format
 msgid "not copying templates from '%s': %s"
 msgstr "no se copian templates de '%s': %s"
 
-#: builtin/init-db.c:263
 #, c-format
 msgid "invalid initial branch name: '%s'"
 msgstr "nombre de rama inicial inválido: '%s'"
 
-#: builtin/init-db.c:354
 #, c-format
 msgid "unable to handle file type %d"
 msgstr "no es posible manejar el tipo de archivo %d"
 
-#: builtin/init-db.c:357
 #, c-format
 msgid "unable to move %s to %s"
 msgstr "no se puede mover %s a %s"
 
-#: builtin/init-db.c:373
 msgid "attempt to reinitialize repository with different hash"
 msgstr "intento de reinicializar el repositorio con un hash diferente"
 
-#: builtin/init-db.c:397 builtin/init-db.c:400
 #, c-format
 msgid "%s already exists"
 msgstr "%s ya existe"
 
-#: builtin/init-db.c:432
 #, c-format
 msgid "re-init: ignored --initial-branch=%s"
 msgstr "re-init: ignorando --initial-branch=%s"
 
-#: builtin/init-db.c:463
 #, c-format
 msgid "Reinitialized existing shared Git repository in %s%s\n"
 msgstr "Reinicializado el repositorio Git compartido existente en %s%s\n"
 
-#: builtin/init-db.c:464
 #, c-format
 msgid "Reinitialized existing Git repository in %s%s\n"
 msgstr "Reinicializado el repositorio Git existente en %s%s\n"
 
-#: builtin/init-db.c:468
 #, c-format
 msgid "Initialized empty shared Git repository in %s%s\n"
 msgstr "Inicializado repositorio Git compartido vacío en %s%s\n"
 
-#: builtin/init-db.c:469
 #, c-format
 msgid "Initialized empty Git repository in %s%s\n"
 msgstr "Inicializado repositorio Git vacío en %s%s\n"
 
-#: builtin/init-db.c:518
 msgid ""
 "git init [-q | --quiet] [--bare] [--template=<template-directory>] [--"
 "shared[=<permissions>]] [<directory>]"
@@ -17109,42 +7210,30 @@ msgstr ""
 "git init [-q | --quiet] [--bare] [--template=<directorio-template>] [--"
 "shared[=<permisos>]] [<directorio>]"
 
-#: builtin/init-db.c:544
 msgid "permissions"
 msgstr "permisos"
 
-#: builtin/init-db.c:545
 msgid "specify that the git repository is to be shared amongst several users"
 msgstr ""
 "especificar que el repositorio de git será compartido entre varios usuarios"
 
-#: builtin/init-db.c:551
 msgid "override the name of the initial branch"
 msgstr "sobrescribir el nombre de la rama inicial"
 
-#: builtin/init-db.c:552 builtin/verify-pack.c:74
 msgid "hash"
 msgstr "hash"
 
-#: builtin/init-db.c:553 builtin/show-index.c:22 builtin/verify-pack.c:75
 msgid "specify the hash algorithm to use"
 msgstr "especificar el algoritmo hash a usar"
 
-#: builtin/init-db.c:560
-msgid "--separate-git-dir and --bare are mutually exclusive"
-msgstr "--separate-git-dir y --bare son mutuamente excluyentes"
-
-#: builtin/init-db.c:591 builtin/init-db.c:596
 #, c-format
 msgid "cannot mkdir %s"
 msgstr "no se puede crear directorio %s"
 
-#: builtin/init-db.c:600 builtin/init-db.c:655
 #, c-format
 msgid "cannot chdir to %s"
 msgstr "no se puede aplicar chdir a %s"
 
-#: builtin/init-db.c:627
 #, c-format
 msgid ""
 "%s (or --work-tree=<directory>) not allowed without specifying %s (or --git-"
@@ -17153,16 +7242,13 @@ msgstr ""
 "%s (o --work-tree=<directorio>) no se permite sin especificar %s (o --git-"
 "dir=<directorio>)"
 
-#: builtin/init-db.c:679
 #, c-format
 msgid "Cannot access work tree '%s'"
 msgstr "No se puede acceder al árbol de trabajo '%s'"
 
-#: builtin/init-db.c:684
 msgid "--separate-git-dir incompatible with bare repository"
 msgstr "--separate-git-dir incompatible con el repositorio desnudo"
 
-#: builtin/interpret-trailers.c:16
 msgid ""
 "git interpret-trailers [--in-place] [--trim-empty] [(--trailer "
 "<token>[(=|:)<value>])...] [<file>...]"
@@ -17170,92 +7256,73 @@ msgstr ""
 "git interpret-trailers [--in-place] [--trim-empty] [(--trailer "
 "<token>[(=|:)<valor>])...] [<archivo>...]"
 
-#: builtin/interpret-trailers.c:95
 msgid "edit files in place"
 msgstr "editar archivos en lugar"
 
-#: builtin/interpret-trailers.c:96
 msgid "trim empty trailers"
 msgstr "cortar trailers vacíos"
 
-#: builtin/interpret-trailers.c:99
 msgid "where to place the new trailer"
 msgstr "donde colocar el nuevo trailer"
 
-#: builtin/interpret-trailers.c:101
 msgid "action if trailer already exists"
 msgstr "acción si trailer ya existe"
 
-#: builtin/interpret-trailers.c:103
 msgid "action if trailer is missing"
 msgstr "acción si falta el trailer"
 
-#: builtin/interpret-trailers.c:105
 msgid "output only the trailers"
 msgstr "mostrar solo los trailers"
 
-#: builtin/interpret-trailers.c:106
 msgid "do not apply config rules"
 msgstr "no aplicar reglas de configuración"
 
-#: builtin/interpret-trailers.c:107
 msgid "join whitespace-continued values"
 msgstr "juntar valores con espacios en blanco contiguos"
 
-#: builtin/interpret-trailers.c:108
 msgid "set parsing options"
 msgstr "configurar opciones de análisis"
 
-#: builtin/interpret-trailers.c:110
 msgid "do not treat --- specially"
 msgstr "no tratar --- especialmente"
 
-#: builtin/interpret-trailers.c:112
 msgid "trailer(s) to add"
 msgstr "trailer(s) para agregar"
 
-#: builtin/interpret-trailers.c:123
 msgid "--trailer with --only-input does not make sense"
 msgstr "--trailer con --only-input no tiene sentido"
 
-#: builtin/interpret-trailers.c:133
 msgid "no input file given for in-place editing"
 msgstr "no se entregó archivo de entrada para edición en lugar"
 
-#: builtin/log.c:59
 msgid "git log [<options>] [<revision-range>] [[--] <path>...]"
 msgstr "git log [<opciones>] [<rango-de-revisiones>] [[--] <ruta>...]"
 
-#: builtin/log.c:60
 msgid "git show [<options>] <object>..."
 msgstr "git show [<opciones>] <objeto>..."
 
-#: builtin/log.c:113
 #, c-format
 msgid "invalid --decorate option: %s"
 msgstr "opción --decorate inválida: %s"
 
-#: builtin/log.c:180
+msgid "suppress diff output"
+msgstr "suprimir salida de diff"
+
 msgid "show source"
 msgstr "mostrar fuente"
 
-#: builtin/log.c:181
 msgid "use mail map file"
 msgstr "usar archivo de mapa de mail"
 
-#: builtin/log.c:184
 msgid "only decorate refs that match <pattern>"
 msgstr "solo decorar refs que concuerden con <patrón>"
 
-#: builtin/log.c:186
 msgid "do not decorate refs that match <pattern>"
 msgstr "no decorar refs que concuerden con <patrón>"
 
-#: builtin/log.c:187
 msgid "decorate options"
 msgstr "opciones de decoración"
 
-#: builtin/log.c:190
 msgid ""
 "trace the evolution of line range <start>,<end> or function :<funcname> in "
 "<file>"
@@ -17263,89 +7330,77 @@ msgstr ""
 "rastrear la evolución del rango de línea <inicio>,<fin> o función :<nombre-"
 "funcion> en <archivo>"
 
-#: builtin/log.c:213
+#, c-format
+msgid "unrecognized argument: %s"
+msgstr "argumento no reconocido: %s"
+
 msgid "-L<range>:<file> cannot be used with pathspec"
 msgstr "-L<rango>:<archivo> no se puede usar con pathspec"
 
-#: builtin/log.c:306
 #, c-format
 msgid "Final output: %d %s\n"
 msgstr "Salida final: %d %s\n"
 
-#: builtin/log.c:571
+#, fuzzy
+msgid "unable to create temporary object directory"
+msgstr "no es posible crear un archivo temporal"
+
 #, c-format
 msgid "git show %s: bad file"
 msgstr "git show %s: mal archivo"
 
-#: builtin/log.c:586 builtin/log.c:676
 #, c-format
 msgid "could not read object %s"
 msgstr "no se pudo leer objeto %s"
 
-#: builtin/log.c:701
 #, c-format
 msgid "unknown type: %d"
 msgstr "tipo desconocido: %d"
 
-#: builtin/log.c:846
 #, c-format
 msgid "%s: invalid cover from description mode"
 msgstr "%s: modo cover from description inválido"
 
-#: builtin/log.c:853
 msgid "format.headers without value"
 msgstr "format.headers sin valor"
 
-#: builtin/log.c:982
 #, c-format
 msgid "cannot open patch file %s"
 msgstr "no se puede abrir archivo patch %s"
 
-#: builtin/log.c:999
 msgid "need exactly one range"
 msgstr "se necesita exactamente un rango"
 
-#: builtin/log.c:1009
 msgid "not a range"
 msgstr "no es un rango"
 
-#: builtin/log.c:1173
 msgid "cover letter needs email format"
 msgstr "carta de portada necesita formato email"
 
-#: builtin/log.c:1179
 msgid "failed to create cover-letter file"
 msgstr "falló al crear los archivos cover-letter"
 
-#: builtin/log.c:1266
 #, c-format
 msgid "insane in-reply-to: %s"
 msgstr "insano in-reply-to: %s"
 
-#: builtin/log.c:1293
 msgid "git format-patch [<options>] [<since> | <revision-range>]"
 msgstr "git format-patch [<opciones>] [<desde> | <rango-de-revisiones>]"
 
-#: builtin/log.c:1351
 msgid "two output directories?"
 msgstr "¿dos directorios de salida?"
 
-#: builtin/log.c:1502 builtin/log.c:2328 builtin/log.c:2330 builtin/log.c:2342
 #, c-format
 msgid "unknown commit %s"
 msgstr "commit desconocido %s"
 
-#: 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 "falló al resolver '%s' como ref válida"
 
-#: builtin/log.c:1522
 msgid "could not find exact merge base"
 msgstr "no se pudo encontrar una base de fusión exacta"
 
-#: 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"
@@ -17357,294 +7412,220 @@ msgstr ""
 "O puedes especificar un commit base mediante --base=<id-commit-base> "
 "manualmente"
 
-#: builtin/log.c:1555
 msgid "failed to find exact merge base"
 msgstr "falló al encontrar una base de fusión exacta"
 
-#: builtin/log.c:1572
 msgid "base commit should be the ancestor of revision list"
 msgstr "el commit base debe ser el ancestro de la lista de revisión"
 
-#: builtin/log.c:1582
 msgid "base commit shouldn't be in revision list"
 msgstr "el commit base no debe estar en la lista de revisión"
 
-#: builtin/log.c:1640
 msgid "cannot get patch id"
 msgstr "no se puede obtener id de patch"
 
-#: builtin/log.c:1703
 msgid "failed to infer range-diff origin of current series"
 msgstr "falló al inferir rangos range-diff de la serie actual"
 
-#: builtin/log.c:1705
 #, c-format
 msgid "using '%s' as range-diff origin of current series"
 msgstr "usando '%s' como origen de diferencia de rango de la serie actual"
 
-#: builtin/log.c:1749
 msgid "use [PATCH n/m] even with a single patch"
 msgstr "usar [PATCH n/m] incluso con un único parche"
 
-#: builtin/log.c:1752
 msgid "use [PATCH] even with multiple patches"
 msgstr "usar [PATCH] incluso con múltiples parches"
 
-#: builtin/log.c:1756
 msgid "print patches to standard out"
 msgstr "mostrar parches en standard out"
 
-#: builtin/log.c:1758
 msgid "generate a cover letter"
 msgstr "generar carta de cover"
 
-#: builtin/log.c:1760
 msgid "use simple number sequence for output file names"
 msgstr ""
 "usar una secuencia simple de números para los nombres de archivos de salida"
 
-#: builtin/log.c:1761
 msgid "sfx"
 msgstr "sfx"
 
-#: builtin/log.c:1762
 msgid "use <sfx> instead of '.patch'"
 msgstr "usar <sfx> en lugar de '.patch'"
 
-#: builtin/log.c:1764
 msgid "start numbering patches at <n> instead of 1"
 msgstr "comenzar a numerar los parches desde <n> en lugar de 1"
 
-#: builtin/log.c:1765
 msgid "reroll-count"
 msgstr "reroll-count"
 
-#: builtin/log.c:1766
 msgid "mark the series as Nth re-roll"
 msgstr "marcar las series como Nth re-roll"
 
-#: builtin/log.c:1768
 msgid "max length of output filename"
 msgstr "tamaño máximo de nombre de archivo resultante"
 
-#: builtin/log.c:1770
 msgid "use [RFC PATCH] instead of [PATCH]"
 msgstr "usar [RFC PATCH] en lugar de [PATCH]"
 
-#: builtin/log.c:1773
 msgid "cover-from-description-mode"
 msgstr "modo-cover-from-description"
 
-#: builtin/log.c:1774
 msgid "generate parts of a cover letter based on a branch's description"
 msgstr ""
 "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 "usar [<prefijo>] en lugar de [PATCH]"
 
-#: builtin/log.c:1779
 msgid "store resulting files in <dir>"
 msgstr "guardar archivos resultantes en <dir>"
 
-#: builtin/log.c:1782
 msgid "don't strip/add [PATCH]"
 msgstr "no cortar/agregar [PATCH]"
 
-#: builtin/log.c:1785
 msgid "don't output binary diffs"
 msgstr "no mostrar diffs binarios"
 
-#: builtin/log.c:1787
 msgid "output all-zero hash in From header"
 msgstr "poner hash de todos ceros en la cabecera From"
 
-#: builtin/log.c:1789
 msgid "don't include a patch matching a commit 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)"
 msgstr "mostrar formato de parche en lugar del default (parche + stat)"
 
-#: builtin/log.c:1793
 msgid "Messaging"
 msgstr "Mensajería"
 
-#: builtin/log.c:1794
 msgid "header"
 msgstr "cabezal"
 
-#: builtin/log.c:1795
 msgid "add email header"
 msgstr "agregar cabecera email"
 
-#: builtin/log.c:1796 builtin/log.c:1797
 msgid "email"
 msgstr "email"
 
-#: builtin/log.c:1796
 msgid "add To: header"
 msgstr "agregar cabecera To:"
 
-#: builtin/log.c:1797
 msgid "add Cc: header"
 msgstr "agregar cabecera Cc:"
 
-#: builtin/log.c:1798
 msgid "ident"
 msgstr "ident"
 
-#: builtin/log.c:1799
 msgid "set From address to <ident> (or committer ident if absent)"
 msgstr ""
 "configurar dirección From a <ident> (o identidad de committer si está "
 "ausente)"
 
-#: builtin/log.c:1801
 msgid "message-id"
 msgstr "id de mensaje"
 
-#: builtin/log.c:1802
 msgid "make first mail a reply to <message-id>"
 msgstr "hacer primer mail una respuesta a <id de mensaje>"
 
-#: builtin/log.c:1803 builtin/log.c:1806
 msgid "boundary"
 msgstr "límite"
 
-#: builtin/log.c:1804
 msgid "attach the patch"
 msgstr "adjuntar el parche"
 
-#: builtin/log.c:1807
 msgid "inline the patch"
 msgstr "poner el parche en línea"
 
-#: builtin/log.c:1811
 msgid "enable message threading, styles: shallow, deep"
 msgstr "habilitar hilos de mensajes, estilos: superficial, profundo"
 
-#: builtin/log.c:1813
 msgid "signature"
 msgstr "firma"
 
-#: builtin/log.c:1814
 msgid "add a signature"
 msgstr "agregar una firma"
 
-#: builtin/log.c:1815
 msgid "base-commit"
 msgstr "commit-base"
 
-#: builtin/log.c:1816
 msgid "add prerequisite tree info to the patch series"
 msgstr ""
 "agregar información de árbol de requisitos previos a la serie de parches"
 
-#: builtin/log.c:1819
 msgid "add a signature from a file"
 msgstr "agregar una firma de un archivo"
 
-#: builtin/log.c:1820
 msgid "don't print the patch filenames"
 msgstr "no mostrar los nombres de archivos de los parches"
 
-#: builtin/log.c:1822
 msgid "show progress while generating patches"
 msgstr "mostrar medidor de progreso mientras se generan los parches"
 
-#: builtin/log.c:1824
 msgid "show changes against <rev> in cover letter or single patch"
 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 "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"
 msgstr "porcentaje por el cual la creación es pesada"
 
-#: builtin/log.c:1916
 #, c-format
 msgid "invalid ident line: %s"
 msgstr "línea de identificación inválida: %s"
 
-#: builtin/log.c:1931
-msgid "-n and -k are mutually exclusive"
-msgstr "-n y -k son mutuamente exclusivas"
-
-#: builtin/log.c:1933
-msgid "--subject-prefix/--rfc and -k are mutually exclusive"
-msgstr "--subject-prefix/--rfc y -k son mutuamente exclusivos"
-
-#: builtin/log.c:1941
 msgid "--name-only does not make sense"
 msgstr "--name-only no tiene sentido"
 
-#: builtin/log.c:1943
 msgid "--name-status does not make sense"
 msgstr "--name-status no tiene sentido"
 
-#: builtin/log.c:1945
 msgid "--check does not make sense"
 msgstr "--check no tiene sentido"
 
-#: builtin/log.c:1967
-msgid "--stdout, --output, and --output-directory are mutually exclusive"
-msgstr "--stdout, --output, and --output-directory son mutuamente exclusivas"
+#, fuzzy
+msgid "--remerge-diff does not make sense"
+msgstr "--name-only no tiene sentido"
+
+#, c-format
+msgid "could not create directory '%s'"
+msgstr "no se pudo crear el directorio '%s'"
 
-#: builtin/log.c:2089
 msgid "--interdiff requires --cover-letter or single patch"
 msgstr "--interdiff requiere --cover-letter o un parche único"
 
-#: builtin/log.c:2093
 msgid "Interdiff:"
 msgstr "Interdiff:"
 
-#: builtin/log.c:2094
 #, c-format
 msgid "Interdiff against v%d:"
 msgstr "Interdiff contra v%d:"
 
-#: builtin/log.c:2100
-msgid "--creation-factor requires --range-diff"
-msgstr "--creation-factor requiere --range-diff"
-
-#: builtin/log.c:2104
 msgid "--range-diff requires --cover-letter or single patch"
 msgstr "--range-diff requiere --cover-letter o parche único"
 
-#: builtin/log.c:2112
 msgid "Range-diff:"
 msgstr "Range-diff:"
 
-#: builtin/log.c:2113
 #, c-format
 msgid "Range-diff against v%d:"
 msgstr "Range-diff contra v%d:"
 
-#: builtin/log.c:2124
 #, c-format
 msgid "unable to read signature file '%s'"
 msgstr "no se puede leer la firma del archivo '%s'"
 
-#: builtin/log.c:2160
 msgid "Generating patches"
 msgstr "Generando parches"
 
-#: builtin/log.c:2204
 msgid "failed to create output files"
 msgstr "falló al crear los archivos de salida"
 
-#: builtin/log.c:2263
 msgid "git cherry [-v] [<upstream> [<head> [<limit>]]]"
 msgstr "git cherry [-v] [<upstream> [<head> [<límite>]]]"
 
-#: builtin/log.c:2317
 #, c-format
 msgid ""
 "Could not find a tracked remote branch, please specify <upstream> manually.\n"
@@ -17652,121 +7633,93 @@ msgstr ""
 "No se pudo encontrar una rama remota rastreada, por favor especifica "
 "<upstream> manualmente.\n"
 
-#: builtin/ls-files.c:561
 msgid "git ls-files [<options>] [<file>...]"
 msgstr "git ls-files [<opciones>] [<archivo>...]"
 
-#: 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: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:621
 msgid "use lowercase letters for 'fsmonitor clean' files"
 msgstr "usar letras minúsculas para archivos de 'fsmonitor clean'"
 
-#: 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:625
 msgid "show deleted files in the output"
 msgstr "mostrar archivos borrados en la salida"
 
-#: builtin/ls-files.c:627
 msgid "show modified files in the output"
 msgstr "mostrar archivos modificados en la salida"
 
-#: builtin/ls-files.c:629
 msgid "show other files in the output"
 msgstr "mostrar otros archivos en la salida"
 
-#: builtin/ls-files.c:631
 msgid "show ignored files in the output"
 msgstr "mostrar archivos ignorados en la salida"
 
-#: 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: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:638
 msgid "show 'other' directories' names only"
 msgstr "mostrar solo nombres de 'otros' directorios"
 
-#: builtin/ls-files.c:640
 msgid "show line endings of files"
 msgstr "mostrar finales de línea de archivos"
 
-#: builtin/ls-files.c:642
 msgid "don't show empty directories"
 msgstr "no mostrar directorios vacíos"
 
-#: builtin/ls-files.c:645
 msgid "show unmerged files in the output"
 msgstr "mostrar archivos no fusionados en la salida"
 
-#: builtin/ls-files.c:647
 msgid "show resolve-undo information"
 msgstr "mostrar información resolver-deshacer"
 
-#: builtin/ls-files.c:649
 msgid "skip files matching pattern"
 msgstr "saltar archivos que concuerden con el patrón"
 
-#: builtin/ls-files.c:652
 msgid "read exclude patterns from <file>"
 msgstr "leer patrones exclude del archivo <archivo>"
 
-#: 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:657
 msgid "add the standard git exclusions"
 msgstr "agregar las exclusiones standard de git"
 
-#: 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:664
-msgid "recurse through submodules"
-msgstr "recurrir a través de submódulos"
-
-#: 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:667
 msgid "tree-ish"
 msgstr "árbol-ismo"
 
-#: 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:670
 msgid "show debugging data"
 msgstr "mostrar data de debug"
 
-#: builtin/ls-files.c:672
 msgid "suppress duplicate entries"
 msgstr "suprimir entradas duplicadas"
 
-#: builtin/ls-remote.c:9
+#, fuzzy
+msgid "show sparse directories in the presence of a sparse index"
+msgstr "activar el uso de un índice sparse"
+
 msgid ""
 "git ls-remote [--heads] [--tags] [--refs] [--upload-pack=<exec>]\n"
 "              [-q | --quiet] [--exit-code] [--get-url]\n"
@@ -17776,174 +7729,160 @@ msgstr ""
 "              [-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:1103
 msgid "exec"
 msgstr "ejecutar"
 
-#: builtin/ls-remote.c:62 builtin/ls-remote.c:64
 msgid "path of git-upload-pack on the remote host"
 msgstr "ruta de git-upload-pack en el host remoto"
 
-#: builtin/ls-remote.c:66
 msgid "limit to tags"
 msgstr "limitar a tags"
 
-#: builtin/ls-remote.c:67
 msgid "limit to heads"
 msgstr "limitar a heads"
 
-#: builtin/ls-remote.c:68
 msgid "do not show peeled tags"
 msgstr "no mostrar tags pelados"
 
-#: builtin/ls-remote.c:70
 msgid "take url.<base>.insteadOf into account"
 msgstr "tomar url.<base>.insteadOf en cuenta"
 
-#: builtin/ls-remote.c:73
 msgid "exit with exit code 2 if no matching refs are found"
 msgstr "salir con código de salida 2 si no se encuentran refs que concuerden"
 
-#: builtin/ls-remote.c:76
 msgid "show underlying ref in addition to the object pointed by it"
 msgstr "mostrar ref subyacente en adición al objeto apuntado por él"
 
-#: builtin/ls-tree.c:30
 msgid "git ls-tree [<options>] <tree-ish> [<path>...]"
 msgstr "git ls-tree [<opciones>] <árbol-ismo> [<ruta>...]"
 
-#: builtin/ls-tree.c:128
+#, fuzzy, c-format
+msgid "could not get object info about '%s'"
+msgstr "no se pudo analizar el objeto '%s'"
+
+#, fuzzy, c-format
+msgid "bad ls-tree format: element '%s' does not start with '('"
+msgstr "el nombre del archivo de paquete '%s' no termina con '.%s'"
+
+#, fuzzy, c-format
+msgid "bad ls-tree format: element '%s' does not end in ')'"
+msgstr "el nombre del archivo de paquete '%s' no termina con '.%s'"
+
+#, fuzzy, c-format
+msgid "bad ls-tree format: %%%.*s"
+msgstr "formato inválido: %s"
+
 msgid "only show trees"
 msgstr "solo mostrar árboles"
 
-#: builtin/ls-tree.c:130
 msgid "recurse into subtrees"
 msgstr "recurrir en subárboles"
 
-#: builtin/ls-tree.c:132
 msgid "show trees when recursing"
 msgstr "mostrar árboles cuando se recurre"
 
-#: builtin/ls-tree.c:135
 msgid "terminate entries with NUL byte"
 msgstr "terminar entradas con byte NUL"
 
-#: builtin/ls-tree.c:136
 msgid "include object size"
 msgstr "incluir tamaño de objeto"
 
-#: builtin/ls-tree.c:138 builtin/ls-tree.c:140
 msgid "list only filenames"
 msgstr "listar solo nombres de archivos"
 
-#: builtin/ls-tree.c:143
+#, fuzzy
+msgid "list only objects"
+msgstr "Escribiendo objetos"
+
 msgid "use full path names"
 msgstr "usar rutas completas"
 
-#: builtin/ls-tree.c:145
 msgid "list entire tree; not just current directory (implies --full-name)"
 msgstr ""
 "mostrar todo el árbol; no solo el directorio actual (implica --full-name)"
 
+#, fuzzy
+msgid "--format can't be combined with other format-altering options"
+msgstr "--mirror no puede ser combinado con refspecs"
+
 #. TRANSLATORS: keep <> in "<" mail ">" info.
-#: builtin/mailinfo.c:14
 msgid "git mailinfo [<options>] <msg> <patch> < mail >info"
 msgstr "git mailinfo [<opciones>] <msg> <patch> < mail >info"
 
-#: builtin/mailinfo.c:58
 msgid "keep subject"
 msgstr "mantener sujeto"
 
-#: builtin/mailinfo.c:60
 msgid "keep non patch brackets in subject"
 msgstr "mantener parche sin brackets en el sujeto"
 
-#: builtin/mailinfo.c:62
 msgid "copy Message-ID to the end of commit message"
 msgstr "copiar Message-ID al final del mensaje del commit"
 
-#: builtin/mailinfo.c:64
 msgid "re-code metadata to i18n.commitEncoding"
 msgstr "re-codificar metadata en i18n.commitEncoding"
 
-#: builtin/mailinfo.c:67
 msgid "disable charset re-coding of metadata"
 msgstr "deshabilitar charset re-coding de metadata"
 
-#: builtin/mailinfo.c:69
 msgid "encoding"
 msgstr "codificación"
 
-#: builtin/mailinfo.c:70
 msgid "re-code metadata to this encoding"
 msgstr "re-codificar metadata en esta codificación"
 
-#: builtin/mailinfo.c:72
 msgid "use scissors"
 msgstr "usar tijeras"
 
-#: builtin/mailinfo.c:73
 msgid "<action>"
 msgstr "<acción>"
 
-#: builtin/mailinfo.c:74
 msgid "action when quoted CR is found"
 msgstr "actión cuando se encuentra un CR citado"
 
-#: builtin/mailinfo.c:77
 msgid "use headers in message's body"
 msgstr "usar cabeceras en el cuerpo del mensaje"
 
-#: builtin/mailsplit.c:239
+#, fuzzy
+msgid "reading patches from stdin/tty..."
+msgstr "leer actualizaciones de stdin"
+
 #, c-format
 msgid "empty mbox: '%s'"
 msgstr "mbox vacío: '%s'"
 
-#: builtin/merge-base.c:32
 msgid "git merge-base [-a | --all] <commit> <commit>..."
 msgstr "git merge-base [-a | --all] <commit> <commit>..."
 
-#: builtin/merge-base.c:33
 msgid "git merge-base [-a | --all] --octopus <commit>..."
 msgstr "git merge-base [-a | --all] --octopus <commit>..."
 
-#: builtin/merge-base.c:34
 msgid "git merge-base --independent <commit>..."
 msgstr "git merge-base --independent <commit>..."
 
-#: builtin/merge-base.c:35
 msgid "git merge-base --is-ancestor <commit> <commit>"
 msgstr "git merge-base --is-ancestor <commit> <commit>"
 
-#: builtin/merge-base.c:36
 msgid "git merge-base --fork-point <ref> [<commit>]"
 msgstr "git merge-base --fork-point <ref> [<commit>]"
 
-#: builtin/merge-base.c:143
 msgid "output all common ancestors"
 msgstr "mostrar todos los ancestros comunes"
 
-#: builtin/merge-base.c:145
 msgid "find ancestors for a single n-way merge"
 msgstr "encontrar ancestros para una única fusión de n vías"
 
-#: builtin/merge-base.c:147
 msgid "list revs not reachable from others"
 msgstr "listar revs no alcanzables desde otros"
 
-#: builtin/merge-base.c:149
 msgid "is the first one ancestor of the other?"
 msgstr "¿es el primero ancestro del otro?"
 
-#: builtin/merge-base.c:151
 msgid "find where <commit> forked from reflog of <ref>"
 msgstr "encontrar donde <commit> bifurcó del reflog de <ref>"
 
-#: builtin/merge-file.c:9
 msgid ""
 "git merge-file [<options>] [-L <name1> [-L <orig> [-L <name2>]]] <file1> "
 "<orig-file> <file2>"
@@ -17951,247 +7890,205 @@ msgstr ""
 "git merge-file [<opciones>] [-L <nombre1> [-L <origen> [-L <nombre2>]]] "
 "<archivo1> <archivo-origen> <archivo2>"
 
-#: builtin/merge-file.c:35
 msgid "send results to standard output"
 msgstr "mandar resultados a standard output"
 
-#: builtin/merge-file.c:36
 msgid "use a diff3 based merge"
 msgstr "usar una fusión basada en diff3"
 
-#: builtin/merge-file.c:37
+#, fuzzy
+msgid "use a zealous diff3 based merge"
+msgstr "usar una fusión basada en diff3"
+
 msgid "for conflicts, use our version"
 msgstr "por conflictos, usar nuestra versión"
 
-#: builtin/merge-file.c:39
 msgid "for conflicts, use their version"
 msgstr "por conflictos, usar la versión de ellos"
 
-#: builtin/merge-file.c:41
 msgid "for conflicts, use a union version"
 msgstr "por conflictos, usar una versión de unión"
 
-#: builtin/merge-file.c:44
 msgid "for conflicts, use this marker size"
 msgstr "por conflictos, usar este tamaño de marcador"
 
-#: builtin/merge-file.c:45
 msgid "do not warn about conflicts"
 msgstr "no advertir sobre conflictos"
 
-#: builtin/merge-file.c:47
 msgid "set labels for file1/orig-file/file2"
 msgstr "configurar labels para archivo1/orig-archivo/archivo2"
 
-#: builtin/merge-recursive.c:47
 #, c-format
 msgid "unknown option %s"
 msgstr "opción %s desconocida"
 
-#: builtin/merge-recursive.c:53
 #, c-format
 msgid "could not parse object '%s'"
 msgstr "no se pudo analizar el objeto '%s'"
 
-#: builtin/merge-recursive.c:57
 #, c-format
 msgid "cannot handle more than %d base. Ignoring %s."
 msgid_plural "cannot handle more than %d bases. Ignoring %s."
 msgstr[0] "no se puede manejar más de %d base. Ignorando %s."
 msgstr[1] "no se puede manejar más de %d bases. Ignorando %s."
 
-#: builtin/merge-recursive.c:65
 msgid "not handling anything other than two heads merge."
 msgstr "no manejando nada distinto a fusión de dos heads."
 
-#: builtin/merge-recursive.c:74 builtin/merge-recursive.c:76
 #, c-format
 msgid "could not resolve ref '%s'"
 msgstr "no se pudo resolver ref '%s'"
 
-#: builtin/merge-recursive.c:82
 #, c-format
 msgid "Merging %s with %s\n"
 msgstr "Fusionando %s con %s\n"
 
-#: builtin/merge.c:59
 msgid "git merge [<options>] [<commit>...]"
 msgstr "git merge [<opciones>] [<commit>...]"
 
-#: builtin/merge.c:124
 msgid "switch `m' requires a value"
 msgstr "opción `m' requiere un valor"
 
-#: builtin/merge.c:147
 #, c-format
 msgid "option `%s' requires a value"
 msgstr "opción `%s' requiere un valor"
 
-#: 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:201
 #, c-format
 msgid "Available strategies are:"
 msgstr "Estrategias disponibles son:"
 
-#: builtin/merge.c:206
 #, c-format
 msgid "Available custom strategies are:"
 msgstr "Estrategias personalizadas disponibles son:"
 
-#: 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: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:261 builtin/pull.c:139
 msgid "(synonym to --stat)"
 msgstr "(sinónimo para --stat)"
 
-#: 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: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: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:270 builtin/pull.c:154
 msgid "edit message before committing"
 msgstr "editar mensaje antes de realizar commit"
 
-#: builtin/merge.c:272
 msgid "allow fast-forward (default)"
 msgstr "permitir fast-forward (default)"
 
-#: 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: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:279 builtin/notes.c:785 builtin/pull.c:168
-#: builtin/rebase.c:1117 builtin/revert.c:114
 msgid "strategy"
 msgstr "estrategia"
 
-#: builtin/merge.c:280 builtin/pull.c:169
 msgid "merge strategy to use"
 msgstr "estrategia de fusión para usar"
 
-#: builtin/merge.c:281 builtin/pull.c:172
 msgid "option=value"
 msgstr "opción=valor"
 
-#: 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: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:291
+#, fuzzy
+msgid "use <name> instead of the real target"
+msgstr "usar <nombre> en lugar de 'origin' para rastrear upstream"
+
 msgid "abort the current in-progress merge"
 msgstr "abortar la fusión en progreso actual"
 
-#: 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:295
 msgid "continue the current in-progress merge"
 msgstr "continuar la fusión en progreso actual"
 
-#: builtin/merge.c:297 builtin/pull.c:180
 msgid "allow merging unrelated histories"
 msgstr "permitir fusionar historias no relacionadas"
 
-#: 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:321
 msgid "could not run stash."
 msgstr "no se pudo ejecutar stash."
 
-#: builtin/merge.c:326
 msgid "stash failed"
 msgstr "stash falló"
 
-#: builtin/merge.c:331
 #, c-format
 msgid "not a valid object: %s"
 msgstr "no es un objeto válido: %s"
 
-#: builtin/merge.c:353 builtin/merge.c:370
 msgid "read-tree failed"
 msgstr "lectura de árbol falló"
 
-#: builtin/merge.c:401
 msgid "Already up to date. (nothing to squash)"
-msgstr "Ya está actualizado. (nada para hacer squash)"
+msgstr "Ya está actualizado. (nada para aplastar)"
+
+msgid "Already up to date."
+msgstr "Ya está actualizado."
 
-#: builtin/merge.c:415
 #, c-format
 msgid "Squash commit -- not updating HEAD\n"
-msgstr "Commit de squash -- no actualizando HEAD\n"
+msgstr "Commit de aplastamiento -- no actualizando HEAD\n"
 
-#: 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"
 
-#: builtin/merge.c:515
 #, c-format
 msgid "'%s' does not point to a commit"
 msgstr "'%s' no apunta a ningún commit"
 
-#: builtin/merge.c:603
 #, c-format
 msgid "Bad branch.%s.mergeoptions string: %s"
 msgstr "Mal string branch.%s.mergeoptions: %s"
 
-#: builtin/merge.c:730
+msgid "Unable to write index."
+msgstr "Incapaz de escribir el índice."
+
 msgid "Not handling anything other than two heads merge."
 msgstr "No manejando nada más que fusión de dos heads."
 
-#: builtin/merge.c:743
 #, c-format
 msgid "unknown strategy option: -X%s"
 msgstr "opción de estrategia desconocida: -X%s"
 
-#: 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:814
 #, c-format
 msgid "Could not read from '%s'"
 msgstr "No se pudo leer de '%s'"
 
-#: 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; usa 'git commit' para completar la fusión.\n"
 
-#: 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"
@@ -18203,11 +8100,9 @@ msgstr ""
 "tópico.\n"
 "\n"
 
-#: builtin/merge.c:834
 msgid "An empty message aborts the commit.\n"
 msgstr "Un mensaje vacío aborta el commit.\n"
 
-#: builtin/merge.c:837
 #, c-format
 msgid ""
 "Lines starting with '%c' will be ignored, and an empty message aborts\n"
@@ -18216,74 +8111,62 @@ msgstr ""
 "Líneas comenzando con '%c' serán ignoradas, y un mensaje vacío aborta\n"
 "el commit.\n"
 
-#: builtin/merge.c:892
 msgid "Empty commit message."
 msgstr "Mensaje de commit vacío."
 
-#: builtin/merge.c:907
 #, c-format
 msgid "Wonderful.\n"
 msgstr "Maravilloso.\n"
 
-#: 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:1007
 msgid "No current branch."
 msgstr "No rama actual."
 
-#: builtin/merge.c:1009
 msgid "No remote for the current branch."
 msgstr "No hay remoto para la rama actual."
 
-#: 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: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:1073
 #, c-format
 msgid "Bad value '%s' in environment '%s'"
 msgstr "Valor erróneo '%s' en el entorno '%s'"
 
-#: builtin/merge.c:1174
+#, c-format
+msgid "could not close '%s'"
+msgstr "no se pudo cerrar '%s'"
+
 #, c-format
 msgid "not something we can merge in %s: %s"
 msgstr "nada que podamos fusionar en %s: %s"
 
-#: builtin/merge.c:1208
 msgid "not something we can merge"
 msgstr "nada que podamos fusionar"
 
-#: builtin/merge.c:1321
 msgid "--abort expects no arguments"
 msgstr "--abort no espera argumentos"
 
-#: 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:1343
 msgid "--quit expects no arguments"
 msgstr "--quit no espera argumentos"
 
-#: builtin/merge.c:1356
 msgid "--continue expects no arguments"
 msgstr "--continue no espera argumentos"
 
-#: 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:1376
 msgid ""
 "You have not concluded your merge (MERGE_HEAD exists).\n"
 "Please, commit your changes before you merge."
@@ -18291,7 +8174,6 @@ msgstr ""
 "No has concluido la fusión (existe MERGE_HEAD).\n"
 "Por favor, realiza un commit con los cambios antes de fusionar."
 
-#: builtin/merge.c:1383
 msgid ""
 "You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists).\n"
 "Please, commit your changes before you merge."
@@ -18299,148 +8181,107 @@ msgstr ""
 "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: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:1400
-msgid "You cannot combine --squash with --no-ff."
-msgstr "No se puede combinar --squash con --no-ff."
-
-#: builtin/merge.c:1402
-msgid "You cannot combine --squash with --commit."
-msgstr "No se puede combinar --squash con --commit."
-
-#: 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: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: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:1442
 #, c-format
 msgid "%s - not something we can merge"
 msgstr "%s - nada que podamos fusionar"
 
-#: 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:1531
 msgid "refusing to merge unrelated histories"
 msgstr "rehusando fusionar historias no relacionadas"
 
-#: builtin/merge.c:1550
 #, c-format
 msgid "Updating %s..%s\n"
 msgstr "Actualizando %s..%s\n"
 
-#: 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:1605
 #, c-format
 msgid "Nope.\n"
 msgstr "No.\n"
 
-#: 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:1668
 #, c-format
 msgid "Trying merge strategy %s...\n"
 msgstr "Intentando estrategia de fusión %s...\n"
 
-#: 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:1722
 #, c-format
 msgid "Merge with strategy %s failed.\n"
 msgstr "Fusionar con estrategia %s falló.\n"
 
-#: 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:1746
 #, c-format
 msgid "Automatic merge went well; stopped before committing as requested\n"
 msgstr ""
 "Fusión automática fue bien; detenida antes del commit como se solicitó\n"
 
-#: builtin/mktag.c:10
-msgid "git mktag"
-msgstr "git mktag"
-
-#: builtin/mktag.c:27
 #, c-format
 msgid "warning: tag input does not pass fsck: %s"
 msgstr "peligro: información de tag no pasa fsck: %s"
 
-#: builtin/mktag.c:38
 #, c-format
 msgid "error: tag input does not pass fsck: %s"
 msgstr "error: valor de tag no pasa fsck: %s"
 
-#: builtin/mktag.c:41
 #, c-format
 msgid "%d (FSCK_IGNORE?) should never trigger this callback"
 msgstr "%d (FSCK_IGNORE?) nunca debería activar esta devolución de llamada"
 
-#: builtin/mktag.c:56
 #, c-format
 msgid "could not read tagged object '%s'"
 msgstr "no se pudo leer objeto etiquetado '%s'"
 
-#: builtin/mktag.c:59
 #, c-format
 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:98
+msgid "could not read from stdin"
+msgstr "no se pudo leer desde stdin"
+
 msgid "tag on stdin did not pass our strict fsck check"
 msgstr "etiqueta en stdin no pasó nuestro estricto control fsck"
 
-#: 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:104 builtin/tag.c:243
 msgid "unable to write tag file"
 msgstr "incapaz de escribir el archivo de tag"
 
-#: builtin/mktree.c:66
-msgid "git mktree [-z] [--missing] [--batch]"
-msgstr "git mktree [-z] [--missing] [--batch]"
-
-#: builtin/mktree.c:154
 msgid "input is NUL terminated"
 msgstr "input es terminada con NUL"
 
-#: builtin/mktree.c:155 builtin/write-tree.c:26
 msgid "allow missing objects"
 msgstr "permitir objetos faltantes"
 
-#: builtin/mktree.c:156
 msgid "allow creation of more than one tree"
 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>][--refs-"
 "snapshot=<path>]"
@@ -18448,44 +8289,38 @@ msgstr ""
 "git multi-pack-index [<options>] write [--preferred-pack=<pack>][--refs-"
 "snapshot=<path>]"
 
-#: 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:17
 msgid "git multi-pack-index [<options>] expire"
 msgstr "git multi-pack-index [<opciones>] expire"
 
-#: 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:57
+#, fuzzy
+msgid "directory"
+msgstr "archivo/directorio"
+
 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:98
 msgid "preferred-pack"
 msgstr "pack preferido"
 
-#: 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: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"
@@ -18493,153 +8328,123 @@ msgstr ""
 "durante el repack, recolectar los pack-files de tamaño menor en un batch que "
 "sea más grande que este tamaño"
 
-#: builtin/mv.c:18
 msgid "git mv [<options>] <source>... <destination>"
 msgstr "git mv [<opciones>] <fuente>... <destino>"
 
-#: builtin/mv.c:83
 #, c-format
 msgid "Directory %s is in index and no submodule?"
 msgstr "¿Directorio %s está en el índice y no hay submódulo?"
 
-#: builtin/mv.c:85
 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/mv.c:103
 #, c-format
 msgid "%.*s is in index"
 msgstr "%.*s está en el índice"
 
-#: builtin/mv.c:125
 msgid "force move/rename even if target exists"
 msgstr "forzar mover/renombrar incluso si el destino existe"
 
-#: builtin/mv.c:127
 msgid "skip move/rename errors"
 msgstr "saltar errores de mover/renombrar"
 
-#: builtin/mv.c:172
 #, c-format
 msgid "destination '%s' is not a directory"
 msgstr "destino '%s' no es un directorio"
 
-#: 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:190
 msgid "bad source"
 msgstr "mala fuente"
 
-#: builtin/mv.c:193
 msgid "can not move directory into itself"
 msgstr "no se puede mover un directorio en sí mismo"
 
-#: builtin/mv.c:196
 msgid "cannot move directory over file"
 msgstr "no se puede mover un directorio dentro de un archivo"
 
-#: builtin/mv.c:205
 msgid "source directory is empty"
 msgstr "directorio de fuente está vacío"
 
-#: builtin/mv.c:231
 msgid "not under version control"
 msgstr "no se encuentra bajo control de versiones"
 
-#: builtin/mv.c:233
 msgid "conflicted"
 msgstr "en conflicto"
 
-#: builtin/mv.c:236
 msgid "destination exists"
 msgstr "destino existe"
 
-#: builtin/mv.c:244
 #, c-format
 msgid "overwriting '%s'"
 msgstr "sobrescribiendo '%s'"
 
-#: builtin/mv.c:247
 msgid "Cannot overwrite"
 msgstr "No se puede sobrescribir"
 
-#: builtin/mv.c:250
 msgid "multiple sources for the same target"
 msgstr "múltiples fuentes para el mismo destino"
 
-#: builtin/mv.c:252
 msgid "destination directory does not exist"
 msgstr "el directorio de destino no existe"
 
-#: builtin/mv.c:280
 #, c-format
 msgid "%s, source=%s, destination=%s"
 msgstr "%s, fuente=%s, destino=%s"
 
-#: builtin/mv.c:308
 #, c-format
 msgid "Renaming %s to %s\n"
 msgstr "Renombrando %s a %s\n"
 
-#: builtin/mv.c:314 builtin/remote.c:790 builtin/repack.c:853
 #, c-format
 msgid "renaming '%s' failed"
 msgstr "renombrar '%s' falló"
 
-#: builtin/name-rev.c:465
 msgid "git name-rev [<options>] <commit>..."
 msgstr "git name-rev [<opciones>] <commit>..."
 
-#: builtin/name-rev.c:466
 msgid "git name-rev [<options>] --all"
 msgstr "git name-rev [<opciones>] --all"
 
-#: builtin/name-rev.c:467
-msgid "git name-rev [<options>] --stdin"
+#, fuzzy
+msgid "git name-rev [<options>] --annotate-stdin"
 msgstr "git name-rev [<opciones>] --stdin"
 
-#: builtin/name-rev.c:524
 msgid "print only ref-based names (no object names)"
 msgstr "imprimir solo nombres basados en referencias (sin nombres de objetos)"
 
-#: builtin/name-rev.c:525
 msgid "only use tags to name the commits"
 msgstr "solo usar tags para nombrar commits"
 
-#: builtin/name-rev.c:527
 msgid "only use refs matching <pattern>"
 msgstr "solo usar refs que concuerden con <patrón>"
 
-#: builtin/name-rev.c:529
 msgid "ignore refs matching <pattern>"
 msgstr "ignorar refs que concuerden con <patrón>"
 
-#: builtin/name-rev.c:531
 msgid "list all commits reachable from all refs"
 msgstr "listar todos los commits alcanzables desde todas las referencias"
 
-#: builtin/name-rev.c:532
-msgid "read from stdin"
-msgstr "leer desde stdin"
+msgid "deprecated: use annotate-stdin instead"
+msgstr ""
+
+#, fuzzy
+msgid "annotate text from stdin"
+msgstr "leer el objeto de stdin"
 
-#: builtin/name-rev.c:533
 msgid "allow to print `undefined` names (default)"
 msgstr "permitir imprimir nombres `undefined` (predeterminado)"
 
-#: builtin/name-rev.c:539
 msgid "dereference tags in the input (internal use)"
 msgstr "desreferenciar tags en la entrada (uso interno)"
 
-#: builtin/notes.c:28
 msgid "git notes [--ref <notes-ref>] [list [<object>]]"
 msgstr "git notes [--ref <referencia-de-notas>] [list [<objeto>]]"
 
-#: builtin/notes.c:29
 msgid ""
 "git notes [--ref <notes-ref>] add [-f] [--allow-empty] [-m <msg> | -F <file> "
 "| (-c | -C) <object>] [<object>]"
@@ -18647,13 +8452,11 @@ msgstr ""
 "git notes [--ref <referencia-de-notas>] add [-f] [--allow-empty] [-m "
 "<mensaje> | -F <archivo> | (-c | -C) <objeto>] [<objeto>]"
 
-#: builtin/notes.c:30
 msgid "git notes [--ref <notes-ref>] copy [-f] <from-object> <to-object>"
 msgstr ""
 "git notes [--ref <referencia-de-notas>] copy [-f] <objeto-origen> <objeto-"
 "destino>"
 
-#: builtin/notes.c:31
 msgid ""
 "git notes [--ref <notes-ref>] append [--allow-empty] [-m <msg> | -F <file> | "
 "(-c | -C) <object>] [<object>]"
@@ -18661,153 +8464,108 @@ msgstr ""
 "git notes [--ref <referencia-de-notas>] append [--allow-empty] [-m <mensaje> "
 "| -F <archivo> | (-c | -C) <objeto>] [<objeto>]"
 
-#: builtin/notes.c:32
 msgid "git notes [--ref <notes-ref>] edit [--allow-empty] [<object>]"
 msgstr ""
 "git notes [--ref <referencia-de-notas>] edit [--allow-empty] [<objeto>]"
 
-#: builtin/notes.c:33
 msgid "git notes [--ref <notes-ref>] show [<object>]"
 msgstr "git notes [--ref <referencia-de-notas>] show [<objeto>]"
 
-#: builtin/notes.c:34
 msgid ""
 "git notes [--ref <notes-ref>] merge [-v | -q] [-s <strategy>] <notes-ref>"
 msgstr ""
 "git notes [--ref <referencia-de notas>] merge [-v | -q] [-s <estrategia>] "
 "<referencia-de-notas>"
 
-#: builtin/notes.c:35
-msgid "git notes merge --commit [-v | -q]"
-msgstr "git notes merge --commit [-v | -q]"
-
-#: builtin/notes.c:36
-msgid "git notes merge --abort [-v | -q]"
-msgstr "git notes merge --abort [-v | -q]"
-
-#: builtin/notes.c:37
 msgid "git notes [--ref <notes-ref>] remove [<object>...]"
 msgstr "git notes [--ref <referencia-de-notas>] remove [<objeto>...]"
 
-#: builtin/notes.c:38
 msgid "git notes [--ref <notes-ref>] prune [-n] [-v]"
 msgstr "git notes [--ref <referencia-de-notas>] prune [-n] [-v]"
 
-#: builtin/notes.c:39
 msgid "git notes [--ref <notes-ref>] get-ref"
 msgstr "git notes [--ref <referencia-de-notas>] get-ref"
 
-#: builtin/notes.c:44
 msgid "git notes [list [<object>]]"
 msgstr "git notes [list [<objeto>]]"
 
-#: builtin/notes.c:49
 msgid "git notes add [<options>] [<object>]"
 msgstr "git notes add [<opciones>] [<objeto>]"
 
-#: builtin/notes.c:54
 msgid "git notes copy [<options>] <from-object> <to-object>"
 msgstr "git notes copy [<opciones>] <objeto-origen> <objeto-destino>"
 
-#: builtin/notes.c:55
 msgid "git notes copy --stdin [<from-object> <to-object>]..."
 msgstr "git notes copy --stdin [<objeto-origen> <objeto-destino>]..."
 
-#: builtin/notes.c:60
 msgid "git notes append [<options>] [<object>]"
 msgstr "git notes append [<opciones>] [<objeto>]"
 
-#: builtin/notes.c:65
 msgid "git notes edit [<object>]"
 msgstr "git notes edit [<objeto>]"
 
-#: builtin/notes.c:70
 msgid "git notes show [<object>]"
 msgstr "git notes show [<objeto>]"
 
-#: builtin/notes.c:75
 msgid "git notes merge [<options>] <notes-ref>"
 msgstr "git notes merge [<opciones>] <referencia-de-notas>"
 
-#: builtin/notes.c:76
 msgid "git notes merge --commit [<options>]"
 msgstr "git notes merge --commit [<opciones>]"
 
-#: builtin/notes.c:77
 msgid "git notes merge --abort [<options>]"
 msgstr "git notes merge --abort [<opciones>]"
 
-#: builtin/notes.c:82
 msgid "git notes remove [<object>]"
 msgstr "git notes remove [<objeto>]"
 
-#: builtin/notes.c:87
 msgid "git notes prune [<options>]"
 msgstr "git notes prune [<opciones>]"
 
-#: builtin/notes.c:92
-msgid "git notes get-ref"
-msgstr "git notes get-ref"
-
-#: builtin/notes.c:97
 msgid "Write/edit the notes for the following object:"
 msgstr "Escribe/edita las notas para los siguientes objetos:"
 
-#: builtin/notes.c:150
 #, c-format
 msgid "unable to start 'show' for object '%s'"
 msgstr "incapaz de iniciar 'show' para el objeto '%s'"
 
-#: builtin/notes.c:154
 msgid "could not read 'show' output"
 msgstr "no se pudo leer salida de 'show'"
 
-#: builtin/notes.c:162
 #, c-format
 msgid "failed to finish 'show' for object '%s'"
 msgstr "falló la finalización de 'show' para el objeto '%s'"
 
-#: builtin/notes.c:195
 msgid "please supply the note contents using either -m or -F option"
 msgstr "por favor suministra los contenidos de nota usando la opción -m o -F"
 
-#: builtin/notes.c:204
 msgid "unable to write note object"
 msgstr "incapaz de escribir el objeto de nota"
 
-#: 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: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: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:263
 #, c-format
 msgid "failed to read object '%s'."
 msgstr "falló al leer objeto '%s'."
 
-#: 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:307
 #, c-format
 msgid "malformed input line: '%s'."
 msgstr "línea de entrada mal formada: '%s'."
 
-#: builtin/notes.c:322
 #, c-format
 msgid "failed to copy notes from '%s' to '%s'"
 msgstr "falló al copiar notas de '%s' a '%s'"
@@ -18815,48 +8573,32 @@ msgstr "falló al copiar notas de '%s' a '%s'"
 #. TRANSLATORS: the first %s will be replaced by a git
 #. notes command: 'add', 'merge', 'remove', etc.
 #.
-#: 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: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 "demasiados argumentos"
-
-#: 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:408 builtin/notes.c:574
 msgid "note contents as a string"
 msgstr "contenidos de la nota como cadena"
 
-#: 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:414 builtin/notes.c:580
 msgid "reuse and edit specified note object"
 msgstr "reutilizar y editar el objeto de nota especificado"
 
-#: builtin/notes.c:417 builtin/notes.c:583
 msgid "reuse specified note object"
 msgstr "reutilizar el objeto de nota especificado"
 
-#: builtin/notes.c:420 builtin/notes.c:586
 msgid "allow storing empty note"
 msgstr "permitir almacenar nota vacía"
 
-#: builtin/notes.c:421 builtin/notes.c:494
 msgid "replace existing notes"
 msgstr "reemplazar notas existentes"
 
-#: builtin/notes.c:446
 #, c-format
 msgid ""
 "Cannot add notes. Found existing notes for object %s. Use '-f' to overwrite "
@@ -18865,29 +8607,23 @@ msgstr ""
 "No se puede agregar notas. Se encontró notas existentes para objeto %s. Usa "
 "'-f' para sobrescribir las notas existentes"
 
-#: 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: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:495
 msgid "read objects from stdin"
 msgstr "leer objetos desde stdin"
 
-#: 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:515
 msgid "too few arguments"
 msgstr "demasiados pocos argumentos"
 
-#: builtin/notes.c:536
 #, c-format
 msgid ""
 "Cannot copy notes. Found existing notes for object %s. Use '-f' to overwrite "
@@ -18896,12 +8632,10 @@ msgstr ""
 "No se puede copiar notas. Se encontró notas existentes para el objeto %s. "
 "Usa '-f' para sobrescribir las notas existentes"
 
-#: 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:601
 #, c-format
 msgid ""
 "The -m/-F/-c/-C options have been deprecated for the 'edit' subcommand.\n"
@@ -18910,52 +8644,40 @@ msgstr ""
 "Las opciones -m/-F/-c/-C han sido deprecadas por el subcomando 'edit'.\n"
 "Por favor usa 'git notes add -f -m/-F/-c/-C' en cambio.\n"
 
-#: builtin/notes.c:696
 msgid "failed to delete ref NOTES_MERGE_PARTIAL"
 msgstr "falló al borrar ref NOTES_MERGE_PARTIAL"
 
-#: builtin/notes.c:698
 msgid "failed to delete ref NOTES_MERGE_REF"
 msgstr "falló al borrar ref NOTES_MERGE_REF"
 
-#: 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:720
 msgid "failed to read ref NOTES_MERGE_PARTIAL"
 msgstr "falló al leer ref NOTES_MERGE_PARTIAL"
 
-#: 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:724
 msgid "could not parse commit from NOTES_MERGE_PARTIAL."
 msgstr "no se pudo analizar commit de NOTES_MERGE_PARTIAL."
 
-#: builtin/notes.c:737
 msgid "failed to resolve NOTES_MERGE_REF"
 msgstr "falló al resolver NOTES_MERGE_REF"
 
-#: builtin/notes.c:740
 msgid "failed to finalize notes merge"
 msgstr "falló al finalizar la fusión de notas"
 
-#: builtin/notes.c:766
 #, c-format
 msgid "unknown notes merge strategy %s"
 msgstr "estrategia de fusión de notas %s desconocida"
 
-#: builtin/notes.c:782
 msgid "General options"
 msgstr "Opciones generales"
 
-#: builtin/notes.c:784
 msgid "Merge options"
 msgstr "Opciones de fusión"
 
-#: builtin/notes.c:786
 msgid ""
 "resolve notes conflicts using the given strategy (manual/ours/theirs/union/"
 "cat_sort_uniq)"
@@ -18963,47 +8685,37 @@ msgstr ""
 "resolver conflictos de notas usando la estrategia entregada (manual/ours/"
 "theirs/union/cat_sort_uniq)"
 
-#: builtin/notes.c:788
 msgid "Committing unmerged notes"
 msgstr "Realizando commit a las notas no fusionadas"
 
-#: 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:792
 msgid "Aborting notes merge resolution"
 msgstr "Abortando resolución de fusión de notas"
 
-#: builtin/notes.c:794
 msgid "abort notes merge"
 msgstr "abortar fusión de notas"
 
-#: 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:810
 msgid "must specify a notes ref to merge"
 msgstr "se debe especificar una ref de notas a fusionar"
 
-#: builtin/notes.c:834
 #, c-format
 msgid "unknown -s/--strategy: %s"
 msgstr "--strategy/-s desconocida: %s"
 
-#: 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: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:876
 #, c-format
 msgid ""
 "Automatic notes merge failed. Fix conflicts in %s and commit the result with "
@@ -19014,60 +8726,48 @@ msgstr ""
 "commit con el resultado 'git notes merge --commit', o aborta la fusión con "
 "'git notes merge --abort'.\n"
 
-#: 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:898
 #, c-format
 msgid "Object %s has no note\n"
 msgstr "El objeto %s no tiene notas\n"
 
-#: 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:913
 msgid "read object names from the standard input"
 msgstr "leer nombres de objetos de standard input"
 
-#: 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:953
 msgid "report pruned notes"
 msgstr "reportar notas recortadas"
 
-#: builtin/notes.c:996
 msgid "notes-ref"
 msgstr "referencia-de-notas"
 
-#: builtin/notes.c:997
 msgid "use notes from <notes-ref>"
 msgstr "usar notas desde <referencia-de-notas>"
 
-#: builtin/notes.c:1032 builtin/stash.c:1752
 #, c-format
 msgid "unknown subcommand: %s"
 msgstr "subcomando desconocido: %s"
 
-#: builtin/pack-objects.c:182
 msgid ""
 "git pack-objects --stdout [<options>...] [< <ref-list> | < <object-list>]"
 msgstr ""
 "git pack-objects --stdout [<opciones>...] [< <lista-de-ref> | < <lista-de-"
 "objetos>]"
 
-#: builtin/pack-objects.c:183
 msgid ""
 "git pack-objects [<options>...] <base-name> [< <ref-list> | < <object-list>]"
 msgstr ""
 "git pack-objects [<opciones>...] <nombre-base> [< <lista-de-refs> | < <lista-"
 "de-objetos>]"
 
-#: builtin/pack-objects.c:572
 #, c-format
 msgid ""
 "write_reuse_object: could not locate %s, expected at offset %<PRIuMAX> in "
@@ -19076,115 +8776,103 @@ msgstr ""
 "write_reuse_object: no se pudo localizar %s, se esperaba en el "
 "desplazamiento %<PRIuMAX> en el paquete %s"
 
-#: builtin/pack-objects.c:580
 #, c-format
 msgid "bad packed object CRC for %s"
 msgstr "mal CRC del paquete de objeto para %s"
 
-#: builtin/pack-objects.c:591
 #, c-format
 msgid "corrupt packed object for %s"
 msgstr "objeto empaquetado corrupto para %s"
 
-#: builtin/pack-objects.c:722
 #, c-format
 msgid "recursive delta detected for object %s"
 msgstr "delta recursiva encontrada para objeto %s"
 
-#: builtin/pack-objects.c:941
 #, c-format
 msgid "ordered %u objects, expected %<PRIu32>"
 msgstr "%u objetos ordenados, esperados %<PRIu32>"
 
-#: builtin/pack-objects.c:1036
 #, c-format
 msgid "expected object at offset %<PRIuMAX> in pack %s"
 msgstr "objeto esperado en el desplazamiento %<PRIuMAX> en el paquete %s"
 
-#: 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:1173
 msgid "Writing objects"
 msgstr "Escribiendo objetos"
 
-#: 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:1268
+#, c-format
+msgid "failed utime() on %s"
+msgstr "falló utime() en %s"
+
 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: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: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: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:2274
 msgid "Counting objects"
 msgstr "Contando objetos"
 
-#: builtin/pack-objects.c:2439
+#, c-format
+msgid "unable to get size of %s"
+msgstr "no se pudo obtener el tamaño de %s"
+
 #, c-format
 msgid "unable to parse object header of %s"
 msgstr "incapaz de analizar header del objeto %s"
 
-#: 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: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:2549
 msgid "suboptimal pack - out of memory"
 msgstr "suboptimal pack - fuera de memoria"
 
-#: 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: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:3089
+#, c-format
+msgid "unable to get type of object %s"
+msgstr "incapaz de obtener el tipo de objeto: %s"
+
 msgid "Compressing objects"
 msgstr "Comprimiendo objetos"
 
-#: builtin/pack-objects.c:3095
 msgid "inconsistency with delta count"
 msgstr "inconsistencia con la cuenta de delta"
 
-#: builtin/pack-objects.c:3174
 #, c-format
 msgid ""
 "value of uploadpack.blobpackfileuri must be of the form '<object-hash> <pack-"
@@ -19193,7 +8881,6 @@ msgstr ""
 "valor para uploadpack.blobpackfileuri tiene que ser de la forma '<hash-de-"
 "objeto> <hash-de-pack> <uri>' (se tuvo '%s')"
 
-#: builtin/pack-objects.c:3177
 #, c-format
 msgid ""
 "object already configured in another uploadpack.blobpackfileuri (got '%s')"
@@ -19201,18 +8888,30 @@ msgstr ""
 "objeto ya está configurado en otro uploadpack.blobpackfileuri (se obtuvo "
 "'%s')"
 
-#: 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: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:3408
+#, fuzzy, c-format
+msgid "packfile %s cannot be accessed"
+msgstr "objeto %s no puede ser mapeado %s"
+
+#, fuzzy
+msgid "Enumerating cruft objects"
+msgstr "Enumerando objetos"
+
+#, fuzzy
+msgid "unable to add cruft objects"
+msgstr "incapaz de añadir objetos recientes"
+
+#, fuzzy
+msgid "Traversing cruft objects"
+msgstr "Comprimiendo objetos"
+
 #, c-format
 msgid ""
 "expected edge object ID, got garbage:\n"
@@ -19221,7 +8920,6 @@ msgstr ""
 "se esperaba ID de objeto al borde, se obtuvo basura:\n"
 "%s"
 
-#: builtin/pack-objects.c:3414
 #, c-format
 msgid ""
 "expected object ID, got garbage:\n"
@@ -19230,251 +8928,214 @@ msgstr ""
 "se esperaba ID de objeto, se obtuvo basura:\n"
 "%s"
 
-#: builtin/pack-objects.c:3507
-msgid "invalid value for --missing"
-msgstr "valor inválido para --missing"
+#, fuzzy
+msgid "could not load cruft pack .mtimes"
+msgstr "no se pudo cargar pack"
 
-#: 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: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:3627
 msgid "unable to force loose object"
 msgstr "incapaz de forzar que el objecto se suelte"
 
-#: builtin/pack-objects.c:3757
 #, c-format
 msgid "not a rev '%s'"
 msgstr "no es una rev '%s'"
 
-#: 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:3788
 msgid "unable to add recent objects"
 msgstr "incapaz de añadir objetos recientes"
 
-#: builtin/pack-objects.c:3841
 #, c-format
 msgid "unsupported index version %s"
 msgstr "versión de índice no soportada %s"
 
-#: builtin/pack-objects.c:3845
 #, c-format
 msgid "bad index version '%s'"
 msgstr "mala versión del índice '%s'"
 
-#: builtin/pack-objects.c:3884
 msgid "<version>[,<offset>]"
 msgstr "<versión>[,<offset>]"
 
-#: 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:3888
 msgid "maximum size of each output pack file"
 msgstr "tamaño máximo de cada paquete resultante"
 
-#: 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:3892
 msgid "ignore packed objects"
 msgstr "ignorar objetos empaquetados"
 
-#: builtin/pack-objects.c:3894
 msgid "limit pack window by objects"
 msgstr "limitar ventana de paquete por objetos"
 
-#: 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: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:3900
 msgid "reuse existing deltas"
 msgstr "reusar deltas existentes"
 
-#: builtin/pack-objects.c:3902
 msgid "reuse existing objects"
 msgstr "reutilizar objetos existentes"
 
-#: builtin/pack-objects.c:3904
 msgid "use OFS_DELTA objects"
 msgstr "usar objetos OFS_DELTA"
 
-#: 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:3908
 msgid "do not create an empty pack output"
 msgstr "no crear un paquete resultante vacío"
 
-#: 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: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:3915
 msgid "include objects reachable from any reference"
 msgstr "incluir objetos alcanzables por cualquier referencia"
 
-#: builtin/pack-objects.c:3918
 msgid "include objects referred by reflog entries"
 msgstr "incluir objetos referidos por entradas de reflog"
 
-#: builtin/pack-objects.c:3921
 msgid "include objects referred to by the index"
 msgstr "incluir objetos referidos por el índice"
 
-#: builtin/pack-objects.c:3924
 msgid "read packs from stdin"
 msgstr "leer packs de stdin"
 
-#: builtin/pack-objects.c:3926
 msgid "output pack to stdout"
 msgstr "mostrar paquete en stdout"
 
-#: 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:3930
 msgid "keep unreachable objects"
 msgstr "mantener objetos inalcanzables"
 
-#: builtin/pack-objects.c:3932
 msgid "pack loose unreachable objects"
 msgstr "empaquetar objetos sueltos inalcanzables"
 
-#: 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:3937
+#, fuzzy
+msgid "create a cruft pack"
+msgstr "crear paquetes delgados"
+
+#, fuzzy
+msgid "expire cruft objects older than <time>"
+msgstr "caducar objetos más viejos a <tiempo>"
+
 msgid "use the sparse reachability algorithm"
 msgstr "usar el algoritmo sparse reachability"
 
-#: builtin/pack-objects.c:3939
 msgid "create thin packs"
 msgstr "crear paquetes delgados"
 
-#: builtin/pack-objects.c:3941
 msgid "create packs suitable for shallow fetches"
 msgstr "crear paquetes adecuados para fetches superficiales"
 
-#: 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:3945
 msgid "ignore this pack"
 msgstr "ignorar este paquete"
 
-#: builtin/pack-objects.c:3947
 msgid "pack compression level"
 msgstr "nivel de compresión del paquete"
 
-#: builtin/pack-objects.c:3949
 msgid "do not hide commits by grafts"
 msgstr "no ocultar commits por injertos"
 
-#: 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: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:3957
 msgid "write a bitmap index if possible"
 msgstr "escribir un índice de bitmap si es posible"
 
-#: builtin/pack-objects.c:3961
 msgid "handling for missing objects"
 msgstr "manejo de objetos perdidos"
 
-#: 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:3966
 msgid "respect islands during delta compression"
 msgstr "respetar islas durante la compresión delta"
 
-#: builtin/pack-objects.c:3968
 msgid "protocol"
 msgstr "protocolo"
 
-#: builtin/pack-objects.c:3969
 msgid "exclude any configured uploadpack.blobpackfileuri with this protocol"
 msgstr ""
 "excluir cualquier uploadpack.blobpackfileuri configurado con este protocolo"
 
-#: 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:4007
 #, c-format
 msgid "pack.deltaCacheLimit is too high, forcing %d"
 msgstr "pack.deltaCacheLimit es demasiado grande, forzando %d"
 
-#: builtin/pack-objects.c:4063
+#, c-format
+msgid "bad pack compression level %d"
+msgstr "nivel de compresión de pack erróneo %d"
+
 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:4065
 msgid "minimum pack size limit is 1 MiB"
 msgstr "tamaño mínimo del paquete es 1 MiB"
 
-#: 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:4073
-msgid "--keep-unreachable and --unpack-unreachable are incompatible"
-msgstr "--keep-unreachable y --unpack-unreachable son incompatibles"
-
-#: builtin/pack-objects.c:4079
 msgid "cannot use --filter without --stdout"
 msgstr "no se puede usar --filter sin --stdout"
 
-#: 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: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:4144
+#, fuzzy
+msgid "cannot use internal rev list with --cruft"
+msgstr "no se puede usar un lista interna de rev con --stdin-packs"
+
+#, fuzzy
+msgid "cannot use --stdin-packs with --cruft"
+msgstr "no se puede usar -a con -d"
+
+#, fuzzy
+msgid "cannot use --max-pack-size with --cruft"
+msgstr "no se puede usar -a con -d"
+
 msgid "Enumerating objects"
 msgstr "Enumerando objetos"
 
-#: builtin/pack-objects.c:4181
 #, c-format
 msgid ""
 "Total %<PRIu32> (delta %<PRIu32>), reused %<PRIu32> (delta %<PRIu32>), pack-"
@@ -19483,7 +9144,6 @@ msgstr ""
 "Total %<PRIu32> (delta %<PRIu32>), reusados %<PRIu32> (delta %<PRIu32>), "
 "pack-reusados %<PRIu32>"
 
-#: builtin/pack-redundant.c:601
 msgid ""
 "'git pack-redundant' is nominated for removal.\n"
 "If you still use this command, please add an extra\n"
@@ -19497,102 +9157,72 @@ msgstr ""
 "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
 msgid "git pack-refs [<options>]"
 msgstr "git pack-refs [<opciones>]"
 
-#: builtin/pack-refs.c:16
 msgid "pack everything"
 msgstr "empaquetar todo"
 
-#: builtin/pack-refs.c:17
 msgid "prune loose refs (default)"
 msgstr "recortar refs perdidos (default)"
 
-#: builtin/prune-packed.c:6
-msgid "git prune-packed [-n | --dry-run] [-q | --quiet]"
-msgstr "git prune-packed [-n | --dry-run] [-q | --quiet]"
-
-#: builtin/prune.c:14
 msgid "git prune [-n] [-v] [--progress] [--expire <time>] [--] [<head>...]"
 msgstr "git prune [-n] [-v] [--progress] [--expire <tiempo>] [--] [<head>...]"
 
-#: builtin/prune.c:133
 msgid "report pruned objects"
 msgstr "reportar objetos recortados"
 
-#: builtin/prune.c:136
 msgid "expire objects older than <time>"
 msgstr "caducar objetos más viejos a <tiempo>"
 
-#: builtin/prune.c:138
 msgid "limit traversal to objects outside promisor packfiles"
 msgstr "limitar el recorrido a objetos fuera de los paquetes del promisor"
 
-#: builtin/prune.c:151
 msgid "cannot prune in a precious-objects repo"
 msgstr "no se puede recortar en un repositorio de objetos preciosos"
 
-#: builtin/pull.c:45 builtin/pull.c:47
-#, c-format
-msgid "Invalid value for %s: %s"
-msgstr "Valor inválido para %s: %s"
-
-#: builtin/pull.c:67
 msgid "git pull [<options>] [<repository> [<refspec>...]]"
 msgstr ""
 "git pull [<opciones>] [<repositorio> [<especificación-de-referencia>...]]"
 
-#: builtin/pull.c:123
 msgid "control for recursive fetching of submodules"
 msgstr "control de fetch recursivo en submódulos"
 
-#: builtin/pull.c:127
 msgid "Options related to merging"
 msgstr "Opciones relacionadas a fusión"
 
-#: builtin/pull.c:130
 msgid "incorporate changes by rebasing rather than merging"
 msgstr "incorporar cambios por rebase en lugar de fusión"
 
-#: builtin/pull.c:158 builtin/revert.c:126
 msgid "allow fast-forward"
 msgstr "permitir fast-forward"
 
-#: builtin/pull.c:167 parse-options.h:339
+#, fuzzy
+msgid "control use of pre-merge-commit and commit-msg hooks"
+msgstr "hacer un bypass a hooks pre-merge-commit y commit-msg"
+
 msgid "automatically stash/stash pop before and after"
 msgstr "ejecutar automáticamente stash/stash pop antes y después"
 
-#: builtin/pull.c:183
 msgid "Options related to fetching"
 msgstr "Opciones relacionadas a fetch"
 
-#: builtin/pull.c:193
 msgid "force overwrite of local branch"
 msgstr "forzar sobrescritura de la rama local"
 
-#: builtin/pull.c:201
 msgid "number of submodules pulled in parallel"
 msgstr "número de submódulos que realizan pull en paralelo"
 
-#: builtin/pull.c:317
-#, c-format
-msgid "Invalid value for pull.ff: %s"
-msgstr "Valor inválido para pull.ff: %s"
-
-#: builtin/pull.c:445
 msgid ""
 "There is no candidate for rebasing against among the refs that you just "
 "fetched."
 msgstr "No hay candidato para rebasar entre las refs que has bajado con fetch."
 
-#: builtin/pull.c:447
 msgid ""
 "There are no candidates for merging among the refs that you just fetched."
 msgstr ""
 "No hay candidatos para fusionar entre las refs que has bajado con fetch."
 
-#: builtin/pull.c:448
 msgid ""
 "Generally this means that you provided a wildcard refspec which had no\n"
 "matches on the remote end."
@@ -19601,7 +9231,6 @@ msgstr ""
 "tiene\n"
 "concordancia en el lado remoto."
 
-#: builtin/pull.c:451
 #, c-format
 msgid ""
 "You asked to pull from the remote '%s', but did not specify\n"
@@ -19612,43 +9241,33 @@ msgstr ""
 "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:951
 msgid "You are not currently on a branch."
 msgstr "No te encuentras actualmente en una rama."
 
-#: builtin/pull.c:458 builtin/pull.c:473
 msgid "Please specify which branch you want to rebase against."
 msgstr "Por favor especifica a qué rama quieres rebasar."
 
-#: builtin/pull.c:460 builtin/pull.c:475
 msgid "Please specify which branch you want to merge with."
 msgstr "Por favor especifica a qué rama quieres fusionar."
 
-#: builtin/pull.c:461 builtin/pull.c:476
 msgid "See git-pull(1) for details."
 msgstr "Ver git-pull(1) para detalles."
 
-#: builtin/pull.c:463 builtin/pull.c:469 builtin/pull.c:478
-#: builtin/rebase.c:957
 msgid "<remote>"
 msgstr "<remoto>"
 
-#: builtin/pull.c:463 builtin/pull.c:478 builtin/pull.c:483
 msgid "<branch>"
 msgstr "<rama>"
 
-#: 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."
 
-#: builtin/pull.c:480
 msgid ""
 "If you wish to set tracking information for this branch you can do so with:"
 msgstr ""
 "Si deseas configurar la información de rastreo para esta rama, puedes "
 "hacerlo con:"
 
-#: builtin/pull.c:485
 #, c-format
 msgid ""
 "Your configuration specifies to merge with the ref '%s'\n"
@@ -19657,22 +9276,20 @@ msgstr ""
 "Tu configuración especifica fusionar con la ref '%s'\n"
 "del remoto, pero no se pudo hacer fetch a esa ref."
 
-#: builtin/pull.c:596
 #, c-format
 msgid "unable to access commit %s"
 msgstr "no es posible acceder al commit %s"
 
-#: builtin/pull.c:902
 msgid "ignoring --verify-signatures for rebase"
 msgstr "ignorando --verify-signatures para rebase"
 
-#: builtin/pull.c:936
+#, fuzzy
 msgid ""
 "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 false  # merge\n"
 "  git config pull.rebase true   # rebase\n"
 "  git config pull.ff only       # fast-forward only\n"
 "\n"
@@ -19695,19 +9312,15 @@ msgstr ""
 "--no-rebase, o --ff-only en el comando para sobrescribir la configuración\n"
 "por defecto en cada invocación.\n"
 
-#: 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:1014
 msgid "pull with rebase"
 msgstr "pull con rebase"
 
-#: builtin/pull.c:1015
 msgid "please commit or stash them."
 msgstr "por favor realiza un commit o un stash con ellos."
 
-#: builtin/pull.c:1040
 #, c-format
 msgid ""
 "fetch updated the current branch head.\n"
@@ -19718,7 +9331,6 @@ msgstr ""
 "realizando fast-forward al árbol de trabajo\n"
 "desde commit %s."
 
-#: builtin/pull.c:1046
 #, c-format
 msgid ""
 "Cannot fast-forward your working tree.\n"
@@ -19735,51 +9347,50 @@ msgstr ""
 "$ git reset --hard\n"
 "para recuperar."
 
-#: 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:1066
 msgid "Cannot rebase onto multiple branches."
 msgstr "No se puede rebasar en múltiples ramas."
 
-#: 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"
 
-#: builtin/push.c:19
 msgid "git push [<options>] [<repository> [<refspec>...]]"
 msgstr ""
 "git push [<opciones>] [<repositorio> [<especificación-de-referencia>...]]"
 
-#: builtin/push.c:111
 msgid "tag shorthand without <tag>"
 msgstr "taquigrafía de tag sin <tag>"
 
-#: builtin/push.c:119
 msgid "--delete only accepts plain target ref names"
 msgstr "--delete solo acepta como objetivos nombres de ref planos"
 
-#: builtin/push.c:164
+#, fuzzy
 msgid ""
 "\n"
-"To choose either option permanently, see push.default in 'git help config'."
+"To choose either option permanently, see push.default in 'git help config'.\n"
 msgstr ""
 "\n"
 "Para elegir si la opción es permanente, mira push.default en 'git help "
 "config'."
 
-#: builtin/push.c:167
-#, c-format
+msgid ""
+"\n"
+"To avoid automatically configuring upstream branches when their name\n"
+"doesn't match the local branch, see option 'simple' of branch."
+"autoSetupMerge\n"
+"in 'git help config'.\n"
+msgstr ""
+
+#, fuzzy, 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"
@@ -19790,20 +9401,19 @@ msgid ""
 "To push to the branch of the same name on the remote, use\n"
 "\n"
 "    git push %s HEAD\n"
-"%s"
+"%s%s"
 msgstr ""
 "La rama upstream de tu rama actual no concuerda\n"
-"con el nombre de tu rama actual. Para hacer un push a la rama upstream\n"
+"con el nombre de tu rama actual. Para empujar a la rama upstream\n"
 "en el remoto, ejecuta\n"
 "\n"
 "    git push %s HEAD:%s\n"
 "\n"
-"Para hacer un push a la rama del mismo nombre en el remoto, ejecuta\n"
+"Para empujar a la rama del mismo nombre en el remoto, ejecuta\n"
 "\n"
 "    git push %s HEAD\n"
 "%s"
 
-#: builtin/push.c:182
 #, c-format
 msgid ""
 "You are not currently on a branch.\n"
@@ -19813,49 +9423,49 @@ msgid ""
 "    git push %s HEAD:<name-of-remote-branch>\n"
 msgstr ""
 "Actualmente no estás en una rama.\n"
-"Para hacer un push a la historia que lleva al estado actual\n"
+"Para empujar la historia que lleva al estado actual\n"
 "(HEAD desacoplado), usa\n"
 "\n"
 "\tgit push %s HEAD:<nombre-de-rama-remota>\n"
 
-#: builtin/push.c:191
-#, c-format
+msgid ""
+"\n"
+"To have this happen automatically for branches without a tracking\n"
+"upstream, see 'push.autoSetupRemote' in 'git help config'.\n"
+msgstr ""
+
+#, fuzzy, c-format
 msgid ""
 "The current branch %s has no upstream branch.\n"
 "To push the current branch and set the remote as upstream, use\n"
 "\n"
 "    git push --set-upstream %s %s\n"
+"%s"
 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, usa\n"
+"Para empujar la rama actual y configurar el remoto como upstream, usa\n"
 "\n"
 "\tgit push --set-upstream %s %s\n"
 
-#: builtin/push.c:199
 #, c-format
 msgid "The current branch %s has multiple upstream branches, refusing to push."
 msgstr "La rama actual %s tiene múltiples ramas upstream, rechazando el push."
 
-#: builtin/push.c:217
 msgid ""
 "You didn't specify any refspecs to push, and push.default is \"nothing\"."
 msgstr ""
-"No se especificó ningún refspec para hacer push, y push.default es \"nothing"
-"\"."
+"No se especificó ningún refspec para empujar, y push.default es \"nothing\"."
 
-#: builtin/push.c:243
 #, c-format
 msgid ""
 "You are pushing to remote '%s', which is not the upstream of\n"
 "your current branch '%s', without telling me what to push\n"
 "to update which remote branch."
 msgstr ""
-"Estás haciendo un push al remoto '%s', el cual no es el upstream de\n"
-"la rama actual '%s', sin decirme qué poner en el push\n"
+"Estás empujando al remoto '%s', el cual no es el upstream de\n"
+"la rama actual '%s', sin decirme qué poner en el empuje\n"
 "para actualizar en qué rama de remoto."
 
-#: 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"
@@ -19864,23 +9474,22 @@ msgid ""
 msgstr ""
 "Actualizaciones fueron rechazadas porque la punta de tu rama actual está\n"
 "detrás de su contraparte remota. Integra los cambios remotos (es decir\n"
-"'git pull ...') antes de hacer push de nuevo.\n"
+"'git pull ...') antes de empujar de nuevo.\n"
 "Mira 'Note about fast-forwards' en 'git push --help' para más detalles."
 
-#: 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"
 "(e.g. 'git pull ...') before pushing again.\n"
 "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"
+"Actualizaciones fueron rechazadas porque una punta de rama en el empuje "
+"está\n"
 "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"
 "Mira las 'Notes about fast-forwards' en 'git push --help' para más detalles."
 
-#: 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"
@@ -19890,16 +9499,14 @@ msgid ""
 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 quieras integrar primero los cambios\n"
+"empujando a la misma ref. Quizás quieras integrar primero los cambios\n"
 "remotos (ej. 'git pull ...') antes de volver a hacer push.\n"
 "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."
 msgstr ""
 "Actualizaciones fueron rechazadas porque el tag ya existe en el remoto."
 
-#: 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"
@@ -19909,7 +9516,6 @@ msgstr ""
 "o actualizar un ref remoto para hacer que apunte a un objeto no commit,\n"
 "sin usar la opción '--force'.\n"
 
-#: 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"
@@ -19922,103 +9528,79 @@ msgstr ""
 "integrar esos cambios localmente (por ejemplo, 'git pull ...')\n"
 "antes de forzar una actualización.\n"
 
-#: builtin/push.c:355
 #, c-format
 msgid "Pushing to %s\n"
-msgstr "Haciendo push a %s\n"
+msgstr "Empujando a %s\n"
 
-#: builtin/push.c:362
 #, c-format
 msgid "failed to push some refs to '%s'"
-msgstr "falló el push de algunas referencias a '%s'"
+msgstr "falló el empuje de algunas referencias a '%s'"
+
+#, fuzzy, c-format
+msgid "invalid value for '%s'"
+msgstr "valor inválido para %s"
 
-#: builtin/push.c:544 builtin/submodule--helper.c:3258
 msgid "repository"
 msgstr "repositorio"
 
-#: builtin/push.c:545 builtin/send-pack.c:193
 msgid "push all refs"
-msgstr "realizar push a todas las refs"
+msgstr "empujar todas las refs"
 
-#: builtin/push.c:546 builtin/send-pack.c:195
 msgid "mirror all refs"
 msgstr "realizar mirror a todas las refs"
 
-#: builtin/push.c:548
 msgid "delete refs"
 msgstr "borrar refs"
 
-#: builtin/push.c:549
 msgid "push tags (can't be used with --all or --mirror)"
-msgstr "realizar push a tags (no puede ser usado con --all o --mirror)"
+msgstr "empujar tags (no puede ser usado con --all o --mirror)"
 
-#: builtin/push.c:552 builtin/send-pack.c:196
 msgid "force updates"
 msgstr "forzar actualizaciones"
 
-#: builtin/push.c:553 builtin/send-pack.c:208
 msgid "<refname>:<expect>"
 msgstr "<refname>:<expect>"
 
-#: builtin/push.c:554 builtin/send-pack.c:209
 msgid "require old value of ref to be at this value"
 msgstr "requerir que el valor viejo de ref sea este valor"
 
-#: builtin/push.c:557 builtin/send-pack.c:212
 msgid "require remote updates to be integrated locally"
 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"
+msgstr "controlar empuje recursivo de submódulos"
 
-#: 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:190
-#: builtin/send-pack.c:191
 msgid "receive pack program"
 msgstr "programa de recepción de paquetes"
 
-#: builtin/push.c:564
 msgid "set upstream for git pull/status"
 msgstr "configurar upstream para git pull/status"
 
-#: builtin/push.c:567
 msgid "prune locally removed refs"
 msgstr "recortar refs eliminadas localmente"
 
-#: builtin/push.c:569
 msgid "bypass pre-push hook"
 msgstr "hacer un bypass al hook pre-push"
 
-#: builtin/push.c:570
 msgid "push missing but relevant tags"
-msgstr "realizar push de tags faltantes pero relevantes"
+msgstr "empujar tags faltantes pero relevantes"
 
-#: builtin/push.c:572 builtin/send-pack.c:197
 msgid "GPG sign the push"
-msgstr "Firmar con GPG el push"
+msgstr "Firmar con GPG el empuje"
 
-#: 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"
 
-#: builtin/push.c:592
-msgid "--delete is incompatible with --all, --mirror and --tags"
-msgstr "--delete es incompatible con --all, --mirror y --tags"
-
-#: builtin/push.c:594
 msgid "--delete doesn't make sense without any refs"
 msgstr "--delete no tiene sentido sin ninguna referencia"
 
-#: builtin/push.c:614
 #, c-format
 msgid "bad repository '%s'"
 msgstr "mal repositorio '%s'"
 
-#: builtin/push.c:615
 msgid ""
 "No configured push destination.\n"
 "Either specify the URL from the command-line or configure a remote "
@@ -20030,88 +9612,61 @@ msgid ""
 "\n"
 "    git push <name>\n"
 msgstr ""
-"No se ha configurado un destino para el push.\n"
+"No se ha configurado un destino para el empuje.\n"
 "Puedes o especificar una URL desde la línea de comandos o configurar un "
 "repositorio remoto usando\n"
 "\n"
 "    git remote add <nombre> <url>\n"
 "\n"
-"y luego hacer push al nombre del remoto\n"
+"y luego empujar al nombre del remoto\n"
 "\n"
 "    git push <nombre>\n"
 
-#: builtin/push.c:630
-msgid "--all and --tags are incompatible"
-msgstr "--all y --tags son incompatibles"
-
-#: builtin/push.c:632
 msgid "--all can't be combined with refspecs"
 msgstr "--all no puede ser combinada con refspecs"
 
-#: builtin/push.c:636
-msgid "--mirror and --tags are incompatible"
-msgstr "--mirror y --tags son incompatibles"
-
-#: builtin/push.c:638
 msgid "--mirror can't be combined with refspecs"
 msgstr "--mirror no puede ser combinado con refspecs"
 
-#: builtin/push.c:641
-msgid "--all and --mirror are incompatible"
-msgstr "--all y --mirror son incompatibles"
-
-#: builtin/push.c:648
 msgid "push options must not have new line characters"
-msgstr "opciones de push no pueden tener carácteres de línea nueva"
+msgstr "opciones de empuje no pueden tener carácteres de línea nueva"
 
-#: builtin/range-diff.c:9
 msgid "git range-diff [<options>] <old-base>..<old-tip> <new-base>..<new-tip>"
 msgstr ""
 "git range-diff [<opciones>] <base-vieja>..<punta-vieja> <base-nueva>..<punta-"
 "nueva>"
 
-#: builtin/range-diff.c:10
 msgid "git range-diff [<options>] <old-tip>...<new-tip>"
 msgstr "git range-diff [<opciones>] <punta-vieja>...<punta-nueva>"
 
-#: builtin/range-diff.c:11
 msgid "git range-diff [<options>] <base> <old-tip> <new-tip>"
 msgstr "git range-diff [<opciones>] <base> <punta-vieja> <punta-nueva>"
 
-#: builtin/range-diff.c:30
 msgid "use simple diff colors"
 msgstr "usar colores simples de diff"
 
-#: builtin/range-diff.c:32
 msgid "notes"
 msgstr "notas"
 
-#: builtin/range-diff.c:32
 msgid "passed to 'git log'"
 msgstr "pasado a 'git log'"
 
-#: builtin/range-diff.c:35
 msgid "only emit output related to the first range"
 msgstr "solo emite salida relacionada con el primer rango"
 
-#: builtin/range-diff.c:37
 msgid "only emit output related to the second range"
 msgstr "solo emite salida relacionada con el segundo rango"
 
-#: builtin/range-diff.c:60 builtin/range-diff.c:64
 #, c-format
 msgid "not a commit range: '%s'"
 msgstr "no es un rango de commit: '%s'"
 
-#: builtin/range-diff.c:74
 msgid "single arg format must be symmetric range"
 msgstr "argumento único de formato debe ser un rango simétrico"
 
-#: builtin/range-diff.c:89
 msgid "need two commit ranges"
 msgstr "se necesitan dos rangos de commits"
 
-#: builtin/read-tree.c:41
 msgid ""
 "git read-tree [(-m [--trivial] [--aggressive] | --reset | --prefix=<prefix>) "
 "[-u | -i]] [--no-sparse-checkout] [--index-output=<file>] (--empty | <tree-"
@@ -20121,79 +9676,60 @@ msgstr ""
 "[-u | -i]] [--no-sparse-checkout] [--index-output=<file>] (--empty | <tree-"
 "ish1> [<tree-ish2> [<tree-ish3>]])"
 
-#: builtin/read-tree.c:116
 msgid "write resulting index to <file>"
 msgstr "escribir índice resultante en <archivo>"
 
-#: builtin/read-tree.c:119
 msgid "only empty the index"
 msgstr "solo vaciar el índice"
 
-#: builtin/read-tree.c:121
 msgid "Merging"
 msgstr "Fusionando"
 
-#: 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: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: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:129
 msgid "same as -m, but discard unmerged entries"
 msgstr "igual que -m, pero descarta entradas sin fusionar"
 
-#: builtin/read-tree.c:130
 msgid "<subdirectory>/"
 msgstr "<subdirectorio>/"
 
-#: builtin/read-tree.c:131
 msgid "read the tree into the index under <subdirectory>/"
 msgstr "leer el árbol en el índice bajo <subdirectorio>/"
 
-#: 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:136
 msgid "gitignore"
 msgstr "gitignore"
 
-#: 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:140
 msgid "don't check the working tree after merging"
 msgstr "no revisar el árbol de trabajo tras fusionar"
 
-#: 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:143
 msgid "skip applying sparse checkout filter"
 msgstr "saltar aplicación de filtro de sparse checkout"
 
-#: builtin/read-tree.c:145
 msgid "debug unpack-trees"
 msgstr "debug unpack-trees"
 
-#: builtin/read-tree.c:149
 msgid "suppress feedback messages"
 msgstr "suprimir mensajes de feedback"
 
-#: builtin/read-tree.c:183
 msgid "You need to resolve your current index first"
 msgstr "Necesitas resolver tu índice actual primero"
 
-#: builtin/rebase.c:35
 msgid ""
 "git rebase [-i] [options] [--exec <cmd>] [--onto <newbase> | --keep-base] "
 "[<upstream> [<branch>]]"
@@ -20201,54 +9737,48 @@ msgstr ""
 "git rebase [-i] [opciones] [--exec <cmd>] [--onto <newbase> | --keep-base] "
 "[<upstream> [<branch>]]"
 
-#: builtin/rebase.c:37
 msgid ""
 "git rebase [-i] [options] [--exec <cmd>] [--onto <newbase>] --root [<branch>]"
 msgstr ""
 "git rebase [-i] [opciones] [--exec <cmd>] [--onto <newbase>] --root[<rama>]"
 
-#: builtin/rebase.c:39
-msgid "git rebase --continue | --abort | --skip | --edit-todo"
-msgstr "git rebase --continue | --abort | --skip | --edit-todo"
+#, c-format
+msgid "could not read '%s'."
+msgstr "no se puede leer '%s'."
 
-#: builtin/rebase.c:230
 #, c-format
 msgid "could not create temporary %s"
 msgstr "no se pudo crear archivo temporal %s"
 
-#: builtin/rebase.c:236
 msgid "could not mark as interactive"
 msgstr "no se pudo marcar como interactivo"
 
-#: builtin/rebase.c:289
 msgid "could not generate todo list"
 msgstr "no se pudo generar lista de pendientes"
 
-#: 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:390
 #, c-format
 msgid "%s requires the merge backend"
 msgstr "%s requiere un backend de fusión"
 
-#: builtin/rebase.c:432
 #, c-format
 msgid "could not get 'onto': '%s'"
 msgstr "no se pudo conseguir 'onto': '%s'"
 
-#: builtin/rebase.c:449
 #, c-format
 msgid "invalid orig-head: '%s'"
 msgstr "orig-head inválido: '%s'"
 
-#: builtin/rebase.c:474
 #, c-format
 msgid "ignoring invalid allow_rerere_autoupdate: '%s'"
 msgstr "ignorando inválido allow_rerere_autoupdate: '%s'"
 
-#: builtin/rebase.c:597
+#, c-format
+msgid "could not remove '%s'"
+msgstr "no se pudo eliminar '%s'"
+
 msgid ""
 "Resolve all conflicts manually, mark them as resolved with\n"
 "\"git add/rm <conflicted_files>\", then run \"git rebase --continue\".\n"
@@ -20257,13 +9787,12 @@ msgid ""
 "abort\"."
 msgstr ""
 "Resuelve todos los conflictos manualmente ya sea con\n"
-"\"git add/rm <archivo_conflictivo>\", luego ejecuta \"git rebase --continue"
-"\".\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:680
 #, c-format
 msgid ""
 "\n"
@@ -20282,16 +9811,18 @@ msgstr ""
 "\n"
 "Como resultado, git no puede hacer rebase con ellos."
 
-#: builtin/rebase.c:925
+#, c-format
+msgid "could not switch to %s"
+msgstr "no se pudo cambiar a %s"
+
 #, c-format
 msgid ""
-"unrecognized empty type '%s'; valid values are \"drop\", \"keep\", and \"ask"
-"\"."
+"unrecognized empty type '%s'; valid values are \"drop\", \"keep\", and "
+"\"ask\"."
 msgstr ""
 "tipo '%s' vacío y desconocido; valores válidos son \"drop\", \"keep\", y "
 "\"ask\"."
 
-#: builtin/rebase.c:943
 #, c-format
 msgid ""
 "%s\n"
@@ -20308,7 +9839,6 @@ msgstr ""
 "    git rebase '<rama>'\n"
 "\n"
 
-#: builtin/rebase.c:959
 #, c-format
 msgid ""
 "If you wish to set tracking information for this branch you can do so with:\n"
@@ -20321,194 +9851,148 @@ msgstr ""
 "    git branch --set-upstream-to=%s/<rama> %s\n"
 "\n"
 
-#: builtin/rebase.c:989
 msgid "exec commands cannot contain newlines"
 msgstr "comandos exec no pueden contener newlines"
 
-#: builtin/rebase.c:993
 msgid "empty exec command"
 msgstr "comando exec vacío"
 
-#: 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: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:1027
 msgid "allow pre-rebase hook to run"
 msgstr "permitir ejecutar hook pre-rebase"
 
-#: builtin/rebase.c:1029
 msgid "be quiet. implies --no-stat"
 msgstr "ser silencioso. implica --no-stat"
 
-#: 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: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: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:1043
 msgid "ignore author date and use current date"
 msgstr "ignorar la fecha del autor y usar la fecha actual"
 
-#: builtin/rebase.c:1045
 msgid "synonym of --reset-author-date"
 msgstr "sinónimo para --reset-author-date"
 
-#: builtin/rebase.c:1047 builtin/rebase.c:1051
 msgid "passed to 'git apply'"
 msgstr "pasado a 'git apply'"
 
-#: builtin/rebase.c:1049
 msgid "ignore changes in whitespace"
 msgstr "ignorar cambios en espacios en blanco"
 
-#: 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:1058
 msgid "continue"
 msgstr "continuar"
 
-#: builtin/rebase.c:1061
 msgid "skip current patch and continue"
 msgstr "saltar el parche y continuar"
 
-#: builtin/rebase.c:1063
 msgid "abort and check out the original branch"
 msgstr "abortar y cambiar a la rama original"
 
-#: builtin/rebase.c:1066
 msgid "abort but keep HEAD where it is"
 msgstr "abortar pero mantiene HEAD donde está"
 
-#: 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:1070
 msgid "show the patch file being applied or merged"
 msgstr "mostrar el archivo parche siendo aplicado o fusionado"
 
-#: builtin/rebase.c:1073
 msgid "use apply strategies to rebase"
 msgstr "usar estrategias de apply para el rebase"
 
-#: builtin/rebase.c:1077
 msgid "use merging strategies to rebase"
 msgstr "usar estrategias de fusión para el rebase"
 
-#: 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:1085
-msgid "(DEPRECATED) try to recreate merges instead of ignoring them"
+#, fuzzy
+msgid "(REMOVED) was: try to recreate merges instead of ignoring them"
 msgstr "(DEPRECADO) intentar recrear merges en lugar de ignorarlos"
 
-#: builtin/rebase.c:1090
 msgid "how to handle commits that become empty"
 msgstr "como manejar commits que se vuelven vacíos"
 
-#: 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: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:1108
 msgid "allow rebasing commits with empty messages"
 msgstr "permitir rebase de commits con mensajes vacíos"
 
-#: 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:1115
 msgid "use 'merge-base --fork-point' to refine upstream"
 msgstr "usar 'merge-base --fork-point' para refinar upstream"
 
-#: builtin/rebase.c:1117
 msgid "use the given merge strategy"
 msgstr "usar la estrategia de merge dada"
 
-#: builtin/rebase.c:1119 builtin/revert.c:115
 msgid "option"
 msgstr "opción"
 
-#: 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: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: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: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:1180
-msgid "--preserve-merges was replaced by --rebase-merges"
-msgstr "--preserve-merges fue reemplazado por --rebase-merges"
-
-#: builtin/rebase.c:1193
-msgid "cannot combine '--keep-base' with '--onto'"
-msgstr "no se puede combinar '--keep-base' con '--onto'"
-
-#: builtin/rebase.c:1195
-msgid "cannot combine '--keep-base' with '--root'"
-msgstr "no se puede combinar '--keep-base' con '--root'"
+msgid ""
+"`rebase --preserve-merges` (-p) is no longer supported.\n"
+"Use `git rebase --abort` to terminate current rebase.\n"
+"Or downgrade to v2.33, or earlier, to complete the rebase."
+msgstr ""
 
-#: builtin/rebase.c:1199
-msgid "cannot combine '--root' with '--fork-point'"
-msgstr "no se puede combinar '--root' con '--fork-point'"
+msgid ""
+"--preserve-merges was replaced by --rebase-merges\n"
+"Note: Your `pull.rebase` configuration may also be  set to 'preserve',\n"
+"which is no longer supported; use 'merges' instead"
+msgstr ""
 
-#: builtin/rebase.c:1202
 msgid "No rebase in progress?"
 msgstr "¿No hay rebase en progreso?"
 
-#: 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:1229 t/helper/test-fast-rebase.c:122
 msgid "Cannot read HEAD"
 msgstr "No se puede leer el HEAD"
 
-#: builtin/rebase.c:1241
 msgid ""
 "You must edit all merge conflicts and then\n"
 "mark them as resolved using git add"
@@ -20516,16 +10000,13 @@ msgstr ""
 "Tienes que editar todos los conflictos de fusión y luego\n"
 "marcarlos como resueltos usando git add"
 
-#: builtin/rebase.c:1260
 msgid "could not discard worktree changes"
 msgstr "no se pudo descartar los cambios del árbol de trabajo"
 
-#: builtin/rebase.c:1279
 #, c-format
 msgid "could not move back to %s"
 msgstr "no se puede regresar a %s"
 
-#: builtin/rebase.c:1325
 #, c-format
 msgid ""
 "It seems that there is already a %s directory, and\n"
@@ -20546,133 +10027,101 @@ msgstr ""
 "y ejecútame nuevamente. Me estoy deteniendo en caso de que tengas\n"
 "algo de valor ahí.\n"
 
-#: builtin/rebase.c:1353
 msgid "switch `C' expects a numerical value"
 msgstr "switch `C' espera un valor numérico"
 
-#: builtin/rebase.c:1395
 #, c-format
 msgid "Unknown mode: %s"
 msgstr "Modo desconocido: %s"
 
-#: builtin/rebase.c:1434
 msgid "--strategy requires --merge or --interactive"
 msgstr "--strategy requiere --merge o --interactive"
 
-#: builtin/rebase.c:1463
-msgid "cannot combine apply options with merge options"
-msgstr "no se pueden combinar opciones de apply con opciones de merge"
+#, fuzzy
+msgid "apply options and merge options cannot be used together"
+msgstr "Opciones --add-file y --remote no pueden ser usadas juntas"
 
-#: builtin/rebase.c:1476
 #, c-format
 msgid "Unknown rebase backend: %s"
 msgstr "Backend de rebase desconocido: %s"
 
-#: builtin/rebase.c:1505
 msgid "--reschedule-failed-exec requires --exec or --interactive"
 msgstr "--reschedule-failed-exec requiere --exec o --interactive"
 
-#: builtin/rebase.c:1536
 #, c-format
 msgid "invalid upstream '%s'"
 msgstr "upstream inválido '%s'"
 
-#: builtin/rebase.c:1542
 msgid "Could not create new root commit"
 msgstr "No se pudo crear commit raíz nuevo"
 
-#: builtin/rebase.c:1568
+#, c-format
+msgid "no such branch/commit '%s'"
+msgstr "no existe la rama/commit: '%s'"
+
+#, c-format
+msgid "No such ref: %s"
+msgstr "No existe ref: %s"
+
+msgid "Could not resolve HEAD to a revision"
+msgstr "No se pudo resolver HEAD a una revisión"
+
 #, 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:1571
 #, c-format
 msgid "'%s': need exactly one merge base"
 msgstr "'%s': necesita exactamente una base de fusión"
 
-#: 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:1607
-#, c-format
-msgid "no such branch/commit '%s'"
-msgstr "no existe la rama/commit: '%s'"
-
-#: 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:1629
-msgid "Could not resolve HEAD to a revision"
-msgstr "No se pudo resolver HEAD a una revisión"
-
-#: builtin/rebase.c:1650
 msgid "Please commit or stash them."
 msgstr "Por favor, confírmalos o guárdalos."
 
-#: builtin/rebase.c:1686
-#, c-format
-msgid "could not switch to %s"
-msgstr "no se pudo cambiar a %s"
-
-#: builtin/rebase.c:1697
 msgid "HEAD is up to date."
 msgstr "HEAD está actualizado."
 
-#: 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:1707
 msgid "HEAD is up to date, rebase forced."
 msgstr "HEAD está actualizado, rebase forzado."
 
-#: 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:1717
 msgid "The pre-rebase hook refused to rebase."
 msgstr "El hook pre-rebase rechazó el rebase."
 
-#: builtin/rebase.c:1724
 #, c-format
 msgid "Changes to %s:\n"
 msgstr "Cambios a %s:\n"
 
-#: builtin/rebase.c:1727
 #, c-format
 msgid "Changes from %s to %s:\n"
 msgstr "Cambios desde %s a %s:\n"
 
-#: 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:1761
 msgid "Could not detach HEAD"
 msgstr "No se puede desacoplar HEAD"
 
-#: 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:35
 msgid "git receive-pack <git-dir>"
 msgstr "git receive-pack <git-dir>"
 
-#: 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"
@@ -20691,8 +10140,7 @@ msgstr ""
 "Por defecto, actualizar la rama actual en un repositorio no vacío\n"
 "está denegado, porque eso haría el índice y el árbol de trabajo "
 "inconsistentes\n"
-"con lo que ya se ha hecho push, y requeriría 'git reset --hard' para "
-"arreglar\n"
+"con lo que ya se ha empujado, y requeriría 'git reset --hard' para arreglar\n"
 "el árbol de trabajo con HEAD.\n"
 "\n"
 "Puedes configurar la variable de configuración 'receive.denyCurrentBranch'\n"
@@ -20700,12 +10148,11 @@ msgstr ""
 "su rama actual; Sin embargo, esto no se recomienda a menos que tú\n"
 "te hayas organizado para actualizar su árbol de trabajo para que coincida "
 "con lo que\n"
-"enviarás con el push de otra manera.\n"
+"enviarás con el empuje de otra manera.\n"
 "\n"
 "Para suprimir este mensaje y mantener el comportamiento predeterminado,\n"
 "configura 'receive.denyCurrentBranch' a 'refuse'."
 
-#: 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"
@@ -20726,79 +10173,97 @@ msgstr ""
 "\n"
 "Para suprimir este mensaje, puedes configurarlo en 'refuse'."
 
-#: builtin/receive-pack.c:2480
 msgid "quiet"
 msgstr "silencioso"
 
-#: builtin/receive-pack.c:2495
-msgid "You must specify a directory."
+#, fuzzy
+msgid "you must specify a directory"
 msgstr "Se tiene que especificar un directorio."
 
-#: builtin/reflog.c:17
+#, fuzzy
+msgid "git reflog [show] [<log-options>] [<ref>]"
+msgstr "git remote show [<opciones>] <nombre>"
+
+#, fuzzy
 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>]\n"
+"                  [--rewrite] [--updateref] [--stale-fix]\n"
+"                  [--dry-run | -n] [--verbose] [--all [--single-worktree] | "
+"<refs>...]"
 msgstr ""
 "git reflog expire [--expire=<tiempo>] [--expire-unreachable=<tiempo>] [--"
 "rewrite] [--updateref] [--stale-fix] [--dry-run | -n] [--verbose] [--all] "
 "<refs>..."
 
-#: builtin/reflog.c:22
+#, fuzzy
 msgid ""
-"git reflog delete [--rewrite] [--updateref] [--dry-run | -n] [--verbose] "
-"<refs>..."
+"git reflog delete [--rewrite] [--updateref]\n"
+"                  [--dry-run | -n] [--verbose] <ref>@{<specifier>}..."
 msgstr ""
 "git reflog delete [--rewrite] [--updateref] [--dry-run | -n] [--verbose] "
 "<refs>..."
 
-#: builtin/reflog.c:25
 msgid "git reflog exists <ref>"
 msgstr "git reflog existe <ref>"
 
-#: builtin/reflog.c:568 builtin/reflog.c:573
-#, c-format
-msgid "'%s' is not a valid timestamp"
-msgstr "'%s' no es una marca de tiempo válida"
+#, fuzzy, c-format
+msgid "invalid timestamp '%s' given to '--%s'"
+msgstr "regex inválido para -I: '%s'"
+
+#, fuzzy
+msgid "do not actually prune any entries"
+msgstr "no tocar entradas index-only"
+
+msgid ""
+"rewrite the old SHA1 with the new SHA1 of the entry that now precedes it"
+msgstr ""
+
+msgid "update the reference to the value of the top reflog entry"
+msgstr ""
+
+#, fuzzy
+msgid "print extra information on screen"
+msgstr "Información de output en cada ref"
+
+#, fuzzy
+msgid "timestamp"
+msgstr "timestamp inválido"
+
+#, fuzzy
+msgid "prune entries older than the specified time"
+msgstr "caducar árboles de trabajo más viejos a <tiempo>"
+
+msgid ""
+"prune entries older than <time> that are not reachable from the current tip "
+"of the branch"
+msgstr ""
+
+#, fuzzy
+msgid "prune any reflog entries that point to broken commits"
+msgstr "mostrar solo ramas que contengan el commit"
+
+#, fuzzy
+msgid "process the reflogs of all references"
+msgstr "forzar sobrescritura de referencia local"
+
+msgid "limits processing to reflogs from the current worktree only"
+msgstr ""
 
-#: builtin/reflog.c:609
 #, c-format
 msgid "Marking reachable objects..."
 msgstr "Marcando objectos alcanzables..."
 
-#: builtin/reflog.c:647
 #, c-format
 msgid "%s points nowhere!"
 msgstr "¡%s no apunta a ningún lado!"
 
-#: builtin/reflog.c:700
 msgid "no reflog specified to delete"
 msgstr "no reflog especificado para borrar"
 
-#: builtin/reflog.c:708
-#, c-format
-msgid "not a reflog: %s"
-msgstr "no es una reflog: %s"
-
-#: builtin/reflog.c:713
-#, c-format
-msgid "no reflog for '%s'"
-msgstr "no reflog para '%s'"
-
-#: builtin/reflog.c:759
 #, c-format
 msgid "invalid ref format: %s"
 msgstr "formato inválido: %s"
 
-#: builtin/reflog.c:768
-msgid "git reflog [ show | expire | delete | exists ]"
-msgstr "git reflog [ show | expire | delete | exists ]"
-
-#: builtin/remote.c:17
-msgid "git remote [-v | --verbose]"
-msgstr "git remote [-v | --verbose]"
-
-#: builtin/remote.c:18
 msgid ""
 "git remote add [-t <branch>] [-m <master>] [-f] [--tags | --no-tags] [--"
 "mirror=<fetch|push>] <name> <url>"
@@ -20806,82 +10271,68 @@ msgstr ""
 "git remote add [-t <rama>] [-m <master>] [-f] [--tags | --no-tags] [--"
 "mirror=<fetch|push>] <nombre> <url>"
 
-#: builtin/remote.c:19 builtin/remote.c:39
-msgid "git remote rename <old> <new>"
+#, fuzzy
+msgid "git remote rename [--[no-]progress] <old> <new>"
 msgstr "git remote rename <viejo> <nuevo>"
 
-#: builtin/remote.c:20 builtin/remote.c:44
 msgid "git remote remove <name>"
 msgstr "git remote remove <nombre>"
 
-#: builtin/remote.c:21 builtin/remote.c:49
 msgid "git remote set-head <name> (-a | --auto | -d | --delete | <branch>)"
 msgstr "git remote set-head <nombre> (-a | --auto | -d | --delete | <rama>)"
 
-#: builtin/remote.c:22
 msgid "git remote [-v | --verbose] show [-n] <name>"
 msgstr "git remote [-v | --verbose] show [-n] <nombre>"
 
-#: builtin/remote.c:23
 msgid "git remote prune [-n | --dry-run] <name>"
 msgstr "git remote prune [-n | --dry-run] <nombre>"
 
-#: builtin/remote.c:24
 msgid ""
 "git remote [-v | --verbose] update [-p | --prune] [(<group> | <remote>)...]"
 msgstr ""
 "git remote [-v | --verbose] update [-p | --prune] [(<grupo> | <remoto>)...]"
 
-#: builtin/remote.c:25
 msgid "git remote set-branches [--add] <name> <branch>..."
 msgstr "git remote set-branches [--add] <nombre> <rama>..."
 
-#: builtin/remote.c:26 builtin/remote.c:75
 msgid "git remote get-url [--push] [--all] <name>"
 msgstr "git remote get-url [--push] [--all] <nombre>"
 
-#: builtin/remote.c:27 builtin/remote.c:80
 msgid "git remote set-url [--push] <name> <newurl> [<oldurl>]"
 msgstr "git remote set-url [--push] <nombre> <nuevo-url> [<viejo-url>]"
 
-#: builtin/remote.c:28 builtin/remote.c:81
 msgid "git remote set-url --add <name> <newurl>"
 msgstr "git remote set-url --add <nombre> <nuevo-url>"
 
-#: builtin/remote.c:29 builtin/remote.c:82
 msgid "git remote set-url --delete <name> <url>"
 msgstr "git remote set-url --delete <nombre> <url>"
 
-#: builtin/remote.c:34
 msgid "git remote add [<options>] <name> <url>"
 msgstr "git remote add [<opciones>] <nombre> <url>"
 
-#: builtin/remote.c:54
 msgid "git remote set-branches <name> <branch>..."
 msgstr "git remote set-branches <nombre> <rama>..."
 
-#: builtin/remote.c:55
 msgid "git remote set-branches --add <name> <branch>..."
 msgstr "git remote set-branches --add <nombre> <rama>..."
 
-#: builtin/remote.c:60
 msgid "git remote show [<options>] <name>"
 msgstr "git remote show [<opciones>] <nombre>"
 
-#: builtin/remote.c:65
 msgid "git remote prune [<options>] <name>"
 msgstr "git remote prune [<opciones>] <nombre>"
 
-#: builtin/remote.c:70
 msgid "git remote update [<options>] [<group> | <remote>]..."
 msgstr "git remote update [<opciones>] [<grupo> | <remoto>]..."
 
-#: builtin/remote.c:99
 #, c-format
 msgid "Updating %s"
 msgstr "Actualizando %s"
 
-#: builtin/remote.c:131
+#, c-format
+msgid "Could not fetch %s"
+msgstr "No se pudo extraer %s"
+
 msgid ""
 "--mirror is dangerous and deprecated; please\n"
 "\t use --mirror=fetch or --mirror=push instead"
@@ -20889,79 +10340,69 @@ msgstr ""
 "Usar --mirror es peligroso y está desaprobado;\n"
 "\t usa más bien --mirror=fetch o --mirror=push"
 
-#: builtin/remote.c:148
 #, c-format
 msgid "unknown mirror argument: %s"
 msgstr "argumento mirror desconocido: %s"
 
-#: builtin/remote.c:164
 msgid "fetch the remote branches"
 msgstr "realizar fetch a las ramas remotas"
 
-#: builtin/remote.c:166
 msgid "import all tags and associated objects when fetching"
 msgstr "importar todos los tags y objetos asociados cuando realiza el fetch"
 
-#: builtin/remote.c:169
 msgid "or do not fetch any tag at all (--no-tags)"
 msgstr "o no realizar fetch a ningún tag (--no-tags)"
 
-#: builtin/remote.c:171
 msgid "branch(es) to track"
 msgstr "rama(s) para rastrear"
 
-#: builtin/remote.c:172
 msgid "master branch"
 msgstr "rama master"
 
-#: builtin/remote.c:174
 msgid "set up remote as a mirror to push to or fetch from"
 msgstr ""
-"configurar remote como mirror al cual realizar push o desde el cual realizar "
-"fetch"
+"configurar remote como mirror al cual empujar o desde el cual realizar fetch"
 
-#: builtin/remote.c:186
 msgid "specifying a master branch makes no sense with --mirror"
 msgstr "especificar una rama master no tiene sentido con --mirror"
 
-#: builtin/remote.c:188
 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:705
 #, c-format
 msgid "remote %s already exists."
 msgstr "remoto %s ya existe."
 
-#: builtin/remote.c:240
 #, c-format
 msgid "Could not setup master '%s'"
 msgstr "No se pudo configurar master '%s'"
 
-#: builtin/remote.c:322
+#, c-format
+msgid "more than one %s"
+msgstr "más de un %s"
+
 #, 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:460 builtin/remote.c:468
 msgid "(matching)"
 msgstr "(concordando)"
 
-#: builtin/remote.c:472
 msgid "(delete)"
 msgstr "(eliminar)"
 
-#: builtin/remote.c:660
 #, c-format
 msgid "could not set '%s'"
 msgstr "no se pudo configurar '%s'"
 
-#: builtin/remote.c:665
+#, c-format
+msgid "could not unset '%s'"
+msgstr "no se pudo desactivar '%s'"
+
 #, c-format
 msgid ""
 "The %s configuration remote.pushDefault in:\n"
@@ -20972,17 +10413,14 @@ msgstr ""
 "\t%s:%d\n"
 "ahora nombra al remoto inexistente '%s'"
 
-#: 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: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:735
 #, c-format
 msgid ""
 "Not updating non-default fetch refspec\n"
@@ -20993,17 +10431,18 @@ msgstr ""
 "\t%s\n"
 "\tPor favor actualiza la configuración manualmente si es necesario."
 
-#: builtin/remote.c:775
+#, fuzzy
+msgid "Renaming remote references"
+msgstr "no se pudo eliminar la referencia %s"
+
 #, c-format
 msgid "deleting '%s' failed"
 msgstr "borrar '%s' falló"
 
-#: builtin/remote.c:809
 #, c-format
 msgid "creating '%s' failed"
 msgstr "crear '%s' falló"
 
-#: builtin/remote.c:887
 msgid ""
 "Note: A branch outside the refs/remotes/ hierarchy was not removed;\n"
 "to delete it, use:"
@@ -21018,118 +10457,93 @@ msgstr[1] ""
 "eliminadas;\n"
 "para borrarlas, usa:"
 
-#: 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:1009
 #, c-format
 msgid " new (next fetch will store in remotes/%s)"
 msgstr " nuevo (siguiente fetch se guardará en remotes/%s)"
 
-#: builtin/remote.c:1012
 msgid " tracked"
 msgstr " rastreada"
 
-#: builtin/remote.c:1014
 msgid " stale (use 'git remote prune' to remove)"
 msgstr " viejo (usa 'git remote prune' para eliminar)"
 
-#: builtin/remote.c:1016
 msgid " ???"
 msgstr " ???"
 
-#: 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:1066
 #, c-format
 msgid "rebases interactively onto remote %s"
 msgstr "rebasa interactivamente en remoto %s"
 
-#: 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:1071
 #, c-format
 msgid "rebases onto remote %s"
 msgstr "rebasa sobre el remoto %s"
 
-#: builtin/remote.c:1075
 #, c-format
 msgid " merges with remote %s"
 msgstr " se fusiona con remoto %s"
 
-#: builtin/remote.c:1078
 #, c-format
 msgid "merges with remote %s"
 msgstr "fusiona con remoto %s"
 
-#: builtin/remote.c:1081
 #, c-format
 msgid "%-*s    and with remote %s\n"
 msgstr "%-*s y con el remoto %s\n"
 
-#: builtin/remote.c:1124
 msgid "create"
 msgstr "crear"
 
-#: builtin/remote.c:1127
 msgid "delete"
 msgstr "borrar"
 
-#: builtin/remote.c:1131
 msgid "up to date"
 msgstr "actualizado"
 
-#: builtin/remote.c:1134
 msgid "fast-forwardable"
 msgstr "se puede realizar fast-forward"
 
-#: builtin/remote.c:1137
 msgid "local out of date"
 msgstr "desactualizado local"
 
-#: builtin/remote.c:1144
 #, c-format
 msgid "    %-*s forces to %-*s (%s)"
 msgstr "    %-*s fuerza a %-*s (%s)"
 
-#: builtin/remote.c:1147
 #, c-format
 msgid "    %-*s pushes to %-*s (%s)"
 msgstr "    %-*s publica a %-*s (%s)"
 
-#: builtin/remote.c:1151
 #, c-format
 msgid "    %-*s forces to %s"
 msgstr "    %-*s fuerza a %s"
 
-#: builtin/remote.c:1154
 #, c-format
 msgid "    %-*s pushes to %s"
 msgstr "    %-*s publica a %s"
 
-#: builtin/remote.c:1222
 msgid "do not query remotes"
 msgstr "no consultar remotos"
 
-#: builtin/remote.c:1243
 #, c-format
 msgid "* remote %s"
 msgstr "* remoto %s"
 
-#: builtin/remote.c:1244
 #, c-format
 msgid "  Fetch URL: %s"
 msgstr "  URL  para obtener: %s"
 
-#: builtin/remote.c:1245 builtin/remote.c:1261 builtin/remote.c:1398
 msgid "(no URL)"
 msgstr "(sin URL)"
 
@@ -21137,189 +10551,149 @@ msgstr "(sin URL)"
 #. with the one in " Fetch URL: %s"
 #. translation.
 #.
-#: builtin/remote.c:1259 builtin/remote.c:1261
 #, c-format
 msgid "  Push  URL: %s"
-msgstr "  URL para publicar: %s"
+msgstr "  URL para empujar: %s"
 
-#: 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:1263
 msgid "(not queried)"
 msgstr "(no consultado)"
 
-#: builtin/remote.c:1265
 msgid "(unknown)"
 msgstr "(desconocido)"
 
-#: 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: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:1284 builtin/remote.c:1310
 msgid " (status not queried)"
 msgstr " (estado no consultado)"
 
-#: 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:1301
 msgid "  Local refs will be mirrored by 'git push'"
 msgstr "  Las referencias locales serán reflejadas por 'git push'"
 
-#: 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:1328
 msgid "set refs/remotes/<name>/HEAD according to remote"
 msgstr "configurar refs/remotes/<nombre>/HEAD de acuerdo al remoto"
 
-#: builtin/remote.c:1330
 msgid "delete refs/remotes/<name>/HEAD"
 msgstr "borrar refs/remotos/<nombre>/HEAD"
 
-#: builtin/remote.c:1344
 msgid "Cannot determine remote HEAD"
 msgstr "No se puede determinar el HEAD remoto"
 
-#: 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:1356
 #, c-format
 msgid "Could not delete %s"
 msgstr "No se pudo borrar %s"
 
-#: builtin/remote.c:1364
 #, c-format
 msgid "Not a valid ref: %s"
 msgstr "No es un ref válido: %s"
 
-#: builtin/remote.c:1366
 #, c-format
 msgid "Could not setup %s"
 msgstr "No se pudo configurar %s"
 
-#: builtin/remote.c:1384
 #, c-format
 msgid " %s will become dangling!"
 msgstr " ¡%s se volverá colgante!"
 
-#: builtin/remote.c:1385
 #, c-format
 msgid " %s has become dangling!"
 msgstr " ¡%s se ha vuelto colgante!"
 
-#: builtin/remote.c:1394
 #, c-format
 msgid "Pruning %s"
 msgstr "Recortando %s"
 
-#: builtin/remote.c:1395
 #, c-format
 msgid "URL: %s"
 msgstr "URL: %s"
 
-#: builtin/remote.c:1411
 #, c-format
 msgid " * [would prune] %s"
-msgstr " * [se acortará] %s"
+msgstr " * [se recortará] %s"
 
-#: builtin/remote.c:1414
 #, c-format
 msgid " * [pruned] %s"
-msgstr " * [prune realizado] %s"
+msgstr " * [recortada] %s"
 
-#: builtin/remote.c:1459
 msgid "prune remotes after fetching"
 msgstr "recortar remotos tras realizar fetch"
 
-#: 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:1541
 msgid "add branch"
 msgstr "agregar rama"
 
-#: builtin/remote.c:1548
 msgid "no remote specified"
 msgstr "no hay remotos especificados"
 
-#: builtin/remote.c:1565
 msgid "query push URLs rather than fetch URLs"
-msgstr "consultar URLs de push en lugar de URLs de fetch"
+msgstr "consultar URLs de empuje en lugar de URLs de fetch"
 
-#: builtin/remote.c:1567
 msgid "return all URLs"
 msgstr "retornar todos los URLs"
 
-#: builtin/remote.c:1597
 #, c-format
 msgid "no URLs configured for remote '%s'"
 msgstr "no hay URLs configurados para remoto '%s'"
 
-#: builtin/remote.c:1623
 msgid "manipulate push URLs"
-msgstr "manipular URLs de push"
+msgstr "manipular URLs de empuje"
 
-#: builtin/remote.c:1625
 msgid "add URL"
 msgstr "agregar URL"
 
-#: builtin/remote.c:1627
 msgid "delete URLs"
 msgstr "borrar URLs"
 
-#: builtin/remote.c:1634
 msgid "--add --delete doesn't make sense"
 msgstr "--add --delete no tiene sentido"
 
-#: builtin/remote.c:1675
 #, c-format
 msgid "Invalid old URL pattern: %s"
 msgstr "Patrón de URL viejo inválido: %s"
 
-#: builtin/remote.c:1683
 #, c-format
 msgid "No such URL found: %s"
 msgstr "No se encontró URL: %s"
 
-#: builtin/remote.c:1685
 msgid "Will not delete all non-push URLs"
-msgstr "No borrará todos los URLs no de push"
+msgstr "No borrará todos los URLs no de empuje"
 
-#: 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:33
 msgid ""
 "Incremental repacks are incompatible with bitmap indexes.  Use\n"
 "--no-write-bitmap-index or disable the pack.writebitmaps configuration."
@@ -21327,187 +10701,147 @@ msgstr ""
 "Reempaquetados incrementales son incompatibles con índices bitmap. Usa\n"
 "--no-write-bitmap-index o deshabilita la configuración pack.writebitmaps."
 
-#: 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: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: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:312
 #, c-format
 msgid "cannot open index for %s"
 msgstr "no se puede abrir index para %s"
 
-#: builtin/repack.c:371
 #, c-format
 msgid "pack %s too large to consider in geometric progression"
 msgstr ""
 "pack %s es demasiado grande para considerar en la progresión geométrica"
 
-#: 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 demasiado grande para hacer un roll up"
 
-#: 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:630
 msgid "same as -a, and turn unreachable objects loose"
 msgstr "lo mismo que -a, y soltar objetos inalcanzables"
 
-#: builtin/repack.c:633
+#, fuzzy
+msgid "same as -a, pack unreachable cruft objects separately"
+msgstr "lo mismo que -a, y soltar objetos inalcanzables"
+
+msgid "approxidate"
+msgstr "approxidate"
+
+#, fuzzy
+msgid "with -C, expire objects older than this"
+msgstr "caducar objetos más viejos a <tiempo>"
+
 msgid "remove redundant packs, and run git-prune-packed"
 msgstr "eliminar paquetes redundantes, y ejecutar git-prune-packed"
 
-#: 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:637
 msgid "pass --no-reuse-object to git-pack-objects"
 msgstr "pasar --no-reuse-object a git-pack-objects"
 
-#: builtin/repack.c:639
 msgid "do not run git-update-server-info"
 msgstr "no ejecutar git-update-server-info"
 
-#: builtin/repack.c:642
 msgid "pass --local to git-pack-objects"
 msgstr "pasar --local a git-pack-objects"
 
-#: builtin/repack.c:644
 msgid "write bitmap index"
 msgstr "escribir un índice de bitmap"
 
-#: builtin/repack.c:646
 msgid "pass --delta-islands to git-pack-objects"
 msgstr "pasar --delta-islands a git-pack-objects"
 
-#: builtin/repack.c:647
-msgid "approxidate"
-msgstr "approxidate"
-
-#: 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:650
 msgid "with -a, repack unreachable objects"
 msgstr "con -a, reempaquetar objetos inalcanzables"
 
-#: 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:653 builtin/repack.c:659
 msgid "bytes"
 msgstr "bytes"
 
-#: 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:656
 msgid "limits the maximum delta depth"
 msgstr "limita la profundidad máxima del delta"
 
-#: builtin/repack.c:658
 msgid "limits the maximum number of threads"
 msgstr "limita el número máximo de hilos"
 
-#: builtin/repack.c:660
 msgid "maximum size of each packfile"
 msgstr "tamaño máximo de cada paquete"
 
-#: builtin/repack.c:662
 msgid "repack objects in packs marked with .keep"
 msgstr "reempaquetar objetos en paquetes marcados con .keep"
 
-#: builtin/repack.c:664
 msgid "do not repack this pack"
 msgstr "no reempaquetar este paquete"
 
-#: 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: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:682
-msgid "--keep-unreachable and -A are incompatible"
-msgstr "--keep-unreachable y -A son incompatibles"
-
-#: builtin/repack.c:713
-msgid "--geometric is incompatible with -A, -a"
-msgstr "--geometric es incompatible con -A, -a"
-
-#: builtin/repack.c:825
 msgid "Nothing new to pack."
 msgstr "Nada nuevo para empaquetar."
 
-#: builtin/repack.c:855
+#, fuzzy, c-format
+msgid "pack prefix %s does not begin with objdir %s"
+msgstr "el nombre del archivo de paquete '%s' no termina con '.%s'"
+
 #, c-format
 msgid "missing required file: %s"
 msgstr "falta archivo requerido: %s"
 
-#: builtin/repack.c:857
 #, c-format
 msgid "could not unlink: %s"
 msgstr "no se pudo desvincular: %s"
 
-#: builtin/replace.c:22
 msgid "git replace [-f] <object> <replacement>"
 msgstr "git replace [-f] <objeto> <reemplazo>"
 
-#: builtin/replace.c:23
 msgid "git replace [-f] --edit <object>"
 msgstr "git replace [-f] --edit <objeto>"
 
-#: builtin/replace.c:24
 msgid "git replace [-f] --graft <commit> [<parent>...]"
 msgstr "git replace [-f] --graft <commit> [<padre>...]"
 
-#: builtin/replace.c:25
-msgid "git replace [-f] --convert-graft-file"
-msgstr "git replace [-f] --convert-graft-file"
-
-#: builtin/replace.c:26
 msgid "git replace -d <object>..."
 msgstr "git replace -d <objeto>..."
 
-#: builtin/replace.c:27
 msgid "git replace [--format=<format>] [-l [<pattern>]]"
 msgstr "git replace [--format=<formato>] [-l [<patrón>]]"
 
-#: builtin/replace.c:90
 #, c-format
 msgid ""
 "invalid replace format '%s'\n"
@@ -21516,27 +10850,22 @@ msgstr ""
 "formato de reemplazo inválido '%s'\n"
 "formatos válidos son 'short', 'medium' y 'long'"
 
-#: builtin/replace.c:125
 #, c-format
 msgid "replace ref '%s' not found"
 msgstr "referencia de reemplazo '%s' no encontrada"
 
-#: builtin/replace.c:141
 #, c-format
 msgid "Deleted replace ref '%s'"
 msgstr "Borrada replace ref '%s'"
 
-#: builtin/replace.c:153
 #, c-format
 msgid "'%s' is not a valid ref name"
 msgstr "'%s' no es un nombre de ref válido"
 
-#: builtin/replace.c:158
 #, c-format
 msgid "replace ref '%s' already exists"
 msgstr "ref de reemplazo '%s' ya existe"
 
-#: builtin/replace.c:178
 #, c-format
 msgid ""
 "Objects must be of the same type.\n"
@@ -21547,81 +10876,59 @@ msgstr ""
 "'%s' apunta a un objeto reemplazado de tipo '%s'\n"
 "mientras '%s' apunta a un objeto de reemplazo de tipo '%s'."
 
-#: builtin/replace.c:229
 #, c-format
 msgid "unable to open %s for writing"
 msgstr "no se pudo abrir %s para escritura"
 
-#: builtin/replace.c:242
 msgid "cat-file reported failure"
 msgstr "cat-file reportó un fallo"
 
-#: builtin/replace.c:258
 #, c-format
 msgid "unable to open %s for reading"
 msgstr "no se pudo abrir %s para lectura"
 
-#: builtin/replace.c:272
 msgid "unable to spawn mktree"
 msgstr "no es posible generar mktree"
 
-#: builtin/replace.c:276
 msgid "unable to read from mktree"
 msgstr "no es posible leer de mktree"
 
-#: builtin/replace.c:285
 msgid "mktree reported failure"
 msgstr "mktree reportó un error"
 
-#: builtin/replace.c:289
 msgid "mktree did not return an object name"
 msgstr "mktree no devolvió un nombre de objeto"
 
-#: builtin/replace.c:298
 #, c-format
 msgid "unable to fstat %s"
 msgstr "incapaz de ejecutar fstat %s"
 
-#: builtin/replace.c:303
 msgid "unable to write object to database"
 msgstr "incapaz de escribir el objeto en la base de datos"
 
-#: builtin/replace.c:322 builtin/replace.c:378 builtin/replace.c:424
-#: builtin/replace.c:454
-#, c-format
-msgid "not a valid object name: '%s'"
-msgstr "nombre de objeto no válido: '%s'"
-
-#: builtin/replace.c:326
 #, c-format
 msgid "unable to get object type for %s"
 msgstr "no se puede obtener tipo de objeto para %s"
 
-#: builtin/replace.c:342
 msgid "editing object file failed"
 msgstr "edición de archivo de objeto falló"
 
-#: builtin/replace.c:351
 #, c-format
 msgid "new object is the same as the old one: '%s'"
 msgstr "nuevo objeto es igual al antiguo: '%s'"
 
-#: builtin/replace.c:384
 #, c-format
 msgid "could not parse %s as a commit"
 msgstr "no se pudo analizar %s como un commit"
 
-#: builtin/replace.c:416
 #, c-format
 msgid "bad mergetag in commit '%s'"
 msgstr "mal mergetag en commit '%s'"
 
-#: builtin/replace.c:418
 #, c-format
 msgid "malformed mergetag in commit '%s'"
 msgstr "mergetag mal formado en commit '%s'"
 
-#: builtin/replace.c:430
 #, c-format
 msgid ""
 "original commit '%s' contains mergetag '%s' that is discarded; use --edit "
@@ -21630,31 +10937,25 @@ msgstr ""
 "commit original '%s' contiene un mergetag '%s' que es descartado; usa --edit "
 "en lugar de --graft"
 
-#: builtin/replace.c:469
 #, c-format
 msgid "the original commit '%s' has a gpg signature"
 msgstr "el commit original '%s' tiene una firma gpg"
 
-#: builtin/replace.c:470
 msgid "the signature will be removed in the replacement commit!"
 msgstr "¡la firma será eliminada en el commit de reemplazo!"
 
-#: builtin/replace.c:480
 #, c-format
 msgid "could not write replacement commit for: '%s'"
 msgstr "no se pudo escribir el commit de reemplazo: '%s'"
 
-#: builtin/replace.c:488
 #, c-format
 msgid "graft for '%s' unnecessary"
 msgstr "graft para '%s' innecesario"
 
-#: builtin/replace.c:492
 #, c-format
 msgid "new commit is the same as the old one: '%s'"
 msgstr "nuevo commit es el mismo que el antiguo: '%s'"
 
-#: builtin/replace.c:527
 #, c-format
 msgid ""
 "could not convert the following graft(s):\n"
@@ -21663,284 +10964,211 @@ msgstr ""
 "no se pudo convertir el siguiente graft(s):\n"
 "%s"
 
-#: builtin/replace.c:548
 msgid "list replace refs"
 msgstr "listar replace refs"
 
-#: builtin/replace.c:549
 msgid "delete replace refs"
 msgstr "borrar replace refs"
 
-#: builtin/replace.c:550
 msgid "edit existing object"
 msgstr "editar objeto existente"
 
-#: builtin/replace.c:551
 msgid "change a commit's parents"
 msgstr "cambiar los padres de un commit"
 
-#: builtin/replace.c:552
 msgid "convert existing graft file"
 msgstr "convertir archivo graft existente"
 
-#: builtin/replace.c:553
 msgid "replace the ref if it exists"
 msgstr "reemplazar el ref si este existe"
 
-#: builtin/replace.c:555
 msgid "do not pretty-print contents for --edit"
 msgstr "no imprimir bonitamente los contenidos para --edit"
 
-#: builtin/replace.c:556
 msgid "use this format"
 msgstr "usar este formato"
 
-#: builtin/replace.c:569
 msgid "--format cannot be used when not listing"
 msgstr "--format no puede ser usado cuando no se hace listing"
 
-#: builtin/replace.c:577
 msgid "-f only makes sense when writing a replacement"
 msgstr "-f solo tiene sentido cuando se escribe un reemplazo"
 
-#: builtin/replace.c:581
 msgid "--raw only makes sense with --edit"
 msgstr "--raw solo tiene sentido con --edit"
 
-#: builtin/replace.c:587
 msgid "-d needs at least one argument"
 msgstr "-d necesita al menos un argumento"
 
-#: builtin/replace.c:593
 msgid "bad number of arguments"
 msgstr "mal número de argumentos"
 
-#: builtin/replace.c:599
 msgid "-e needs exactly one argument"
 msgstr "-e necesita exactamente un argumento"
 
-#: builtin/replace.c:605
 msgid "-g needs at least one argument"
 msgstr "-g necesita al menos un argumento"
 
-#: builtin/replace.c:611
 msgid "--convert-graft-file takes no argument"
 msgstr "--convert-graft-file no toma argumentos"
 
-#: builtin/replace.c:617
 msgid "only one pattern can be given with -l"
 msgstr "solo se puede dar un patrón con -l"
 
-#: builtin/rerere.c:13
 msgid "git rerere [clear | forget <path>... | status | remaining | diff | gc]"
 msgstr "git rerere [clear | forget <ruta>... | status | remaining | diff | gc]"
 
-#: builtin/rerere.c:58
 msgid "register clean resolutions in index"
 msgstr "registrar resoluciones limpias en el índice"
 
-#: builtin/rerere.c:77
 msgid "'git rerere forget' without paths is deprecated"
 msgstr "'git rerere forget' sin rutas está deprecado"
 
-#: builtin/rerere.c:111
 #, c-format
 msgid "unable to generate diff for '%s'"
 msgstr "no es posible generar diff para '%s'"
 
-#: builtin/reset.c:32
 msgid ""
 "git reset [--mixed | --soft | --hard | --merge | --keep] [-q] [<commit>]"
 msgstr ""
 "git reset [--mixed | --soft | --hard | --merge | --keep] [-q] [<commit>]"
 
-#: builtin/reset.c:33
 msgid "git reset [-q] [<tree-ish>] [--] <pathspec>..."
 msgstr "git reset [-q] [<árbol-ismo>] [--] <pathspec>..."
 
-#: builtin/reset.c:34
 msgid ""
 "git reset [-q] [--pathspec-from-file [--pathspec-file-nul]] [<tree-ish>]"
 msgstr ""
 "git reset [-q] [--pathspec-from-file [--pathspec-file-nul]] [<árbol-ismo>]"
 
-#: builtin/reset.c:35
 msgid "git reset --patch [<tree-ish>] [--] [<pathspec>...]"
 msgstr "git reset --patch [<árbol-ismo>] [--] [<pathspec>...]"
 
-#: builtin/reset.c:41
 msgid "mixed"
 msgstr "mezclado"
 
-#: builtin/reset.c:41
 msgid "soft"
 msgstr "suave"
 
-#: builtin/reset.c:41
 msgid "hard"
 msgstr "duro"
 
-#: builtin/reset.c:41
 msgid "merge"
 msgstr "fusionar"
 
-#: builtin/reset.c:41
 msgid "keep"
 msgstr "mantener"
 
-#: builtin/reset.c:89
 msgid "You do not have a valid HEAD."
 msgstr "No hay un HEAD válido."
 
-#: builtin/reset.c:91
 msgid "Failed to find tree of HEAD."
 msgstr "Falló al encontrar el árbol de HEAD."
 
-#: builtin/reset.c:97
 #, c-format
 msgid "Failed to find tree of %s."
 msgstr "Falló al encontrar árbol de %s."
 
-#: builtin/reset.c:122
 #, c-format
 msgid "HEAD is now at %s"
 msgstr "HEAD está ahora en %s"
 
-#: 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: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:303
+msgid "skip refreshing the index after reset"
+msgstr ""
+
 msgid "reset HEAD and index"
 msgstr "reiniciar HEAD e índice"
 
-#: builtin/reset.c:304
 msgid "reset only HEAD"
 msgstr "reiniciar solo HEAD"
 
-#: 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:310
 msgid "reset HEAD but keep local changes"
 msgstr "reiniciar HEAD pero mantener cambios locales"
 
-#: 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: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: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:367
-msgid "--patch is incompatible with --{hard,mixed,soft}"
-msgstr "--patch es incompatible con --{hard,mixed,soft}"
-
-#: builtin/reset.c:377
 msgid "--mixed with paths is deprecated; use 'git reset -- <paths>' instead."
 msgstr ""
 "--mixed con rutas ha sido deprecado; usa 'git reset -- <rutas>' en cambio."
 
-#: 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: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:398
-msgid "-N can only be used with --mixed"
-msgstr "-N solo puede ser usada con --mixed"
-
-#: builtin/reset.c:419
 msgid "Unstaged changes after reset:"
 msgstr "Cambios fuera del área de stage tras el reset:"
 
-#: builtin/reset.c:422
-#, c-format
+#, fuzzy, c-format
 msgid ""
-"\n"
-"It 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"
+"It took %.2f seconds to refresh the index after reset.  You can use\n"
+"'--no-refresh' to avoid this."
 msgstr ""
 "\n"
-"Tomó %.2f segundos en enumerar cambios fuera de stage tras el reinicio.  "
-"Puedes\n"
-"usar '--quiet' para evitar esto.  Configura la opción reset.quiet a true\n"
-"para volverlo en el default.\n"
+"Tomó %.2f segundos para calcular los valores anterior/posterior del branch.\n"
+"Puedes usar '--no-ahead-behind' para evitar esto.\n"
 
-#: 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:445
 msgid "Could not write new index file."
 msgstr "No se puede escribir un nuevo archivo índice."
 
-#: builtin/rev-list.c:541
-msgid "cannot combine --exclude-promisor-objects and --missing"
-msgstr "no se puede combinar --exclude-promisor-objects y --missing"
-
-#: builtin/rev-list.c:602
-msgid "object filtering requires --objects"
-msgstr "filtración de objetos requiere --objects"
+#, c-format
+msgid "unable to get disk usage of %s"
+msgstr "no se puede obtener el uso de disco de %s"
 
-#: builtin/rev-list.c:674
 msgid "rev-list does not support display of notes"
 msgstr "rev-list no soporta mostrar notas"
 
-#: builtin/rev-list.c:679
-msgid "marked counting is incompatible with --objects"
-msgstr "conteo de marcas es incompatible con --objects"
+#, fuzzy, c-format
+msgid "marked counting and '%s' cannot be used together"
+msgstr "--reject y --3way no se pueden utilizar juntas."
 
-#: builtin/rev-parse.c:409
 msgid "git rev-parse --parseopt [<options>] -- [<args>...]"
 msgstr "git rev-parse --parseopt [<opciones>] -- [<args>...]"
 
-#: builtin/rev-parse.c:414
 msgid "keep the `--` passed as an arg"
 msgstr "mantener el `--` pasado como un arg"
 
-#: builtin/rev-parse.c:416
 msgid "stop parsing after the first non-option argument"
 msgstr "detener análisis tras el primer argumento que no sea opción"
 
-#: builtin/rev-parse.c:419
 msgid "output in stuck long form"
 msgstr "salida en forma larga ajuntada"
 
-#: builtin/rev-parse.c:438
 msgid "premature end of input"
 msgstr "fin de input prematuro"
 
-#: builtin/rev-parse.c:442
 msgid "no usage string given before the `--' separator"
 msgstr "no se ha entregado cadena antes del separador`--'"
 
-#: builtin/rev-parse.c:548
 msgid "Needed a single revision"
 msgstr "Se necesitó una revisión singular"
 
-#: builtin/rev-parse.c:552
 msgid ""
 "git rev-parse --parseopt [<options>] -- [<args>...]\n"
 "   or: git rev-parse --sq-quote [<arg>...]\n"
@@ -21955,145 +11183,117 @@ msgstr ""
 "Ejecuta \"git rev-parse --parseopt -h\" para más información sobre el primer "
 "uso."
 
-#: builtin/rev-parse.c:712
 msgid "--resolve-git-dir requires an argument"
 msgstr "--resolve-git-dir requiere un argumento"
 
-#: builtin/rev-parse.c:715
 #, c-format
 msgid "not a gitdir '%s'"
 msgstr "no es un gitdir '%s'"
 
-#: builtin/rev-parse.c:739
 msgid "--git-path requires an argument"
 msgstr "--git-path requiere un argumento"
 
-#: builtin/rev-parse.c:749
 msgid "-n requires an argument"
 msgstr "-n requiere un argumento"
 
-#: builtin/rev-parse.c:763
 msgid "--path-format requires an argument"
 msgstr "--path-format requiere un argumento"
 
-#: builtin/rev-parse.c:769
 #, c-format
 msgid "unknown argument to --path-format: %s"
 msgstr "argumento inválido para --path-format: %s"
 
-#: builtin/rev-parse.c:776
 msgid "--default requires an argument"
 msgstr "--default requiere un argumento"
 
-#: builtin/rev-parse.c:782
 msgid "--prefix requires an argument"
 msgstr "--prefix requiere un argumento"
 
-#: builtin/rev-parse.c:851
 #, c-format
 msgid "unknown mode for --abbrev-ref: %s"
 msgstr "modo desconocido para --abbrev-ref: %s"
 
-#: builtin/rev-parse.c:1023
+msgid "this operation must be run in a work tree"
+msgstr "esta operación debe ser realizada en un árbol de trabajo"
+
 #, c-format
 msgid "unknown mode for --show-object-format: %s"
 msgstr "modo desconocido para --show-object-format: %s"
 
-#: builtin/revert.c:24
 msgid "git revert [<options>] <commit-ish>..."
 msgstr "git revert [<opciones>] <commit-ish>..."
 
-#: builtin/revert.c:25
 msgid "git revert <subcommand>"
 msgstr "git revert <subcomando>"
 
-#: builtin/revert.c:30
 msgid "git cherry-pick [<options>] <commit-ish>..."
 msgstr "git cherry-pick [<opciones>] <commit-ish>..."
 
-#: builtin/revert.c:31
 msgid "git cherry-pick <subcommand>"
 msgstr "git cherry-pick <subcomando>"
 
-#: builtin/revert.c:72
 #, c-format
 msgid "option `%s' expects a number greater than zero"
 msgstr "opción `%s' espera un valor numérico mayor a cero"
 
-#: builtin/revert.c:92
 #, c-format
 msgid "%s: %s cannot be used with %s"
 msgstr "%s: %s no puede ser usado con %s"
 
-#: builtin/revert.c:102
 msgid "end revert or cherry-pick sequence"
 msgstr "finalizar secuencia revert o cherry-pick"
 
-#: builtin/revert.c:103
 msgid "resume revert or cherry-pick sequence"
 msgstr "resumir secuencia revert o cherry-pick"
 
-#: builtin/revert.c:104
 msgid "cancel revert or cherry-pick sequence"
 msgstr "cancelar secuencia revert o cherry-pick"
 
-#: builtin/revert.c:105
 msgid "skip current commit and continue"
 msgstr "saltar el commit actual y continuar"
 
-#: builtin/revert.c:107
 msgid "don't automatically commit"
 msgstr "no realizar commit de forma automática"
 
-#: builtin/revert.c:108
 msgid "edit the commit message"
 msgstr "editar el mensaje de commit"
 
-#: builtin/revert.c:111
 msgid "parent-number"
 msgstr "número-de-padre"
 
-#: builtin/revert.c:112
 msgid "select mainline parent"
 msgstr "seleccionar el padre principal"
 
-#: builtin/revert.c:114
 msgid "merge strategy"
 msgstr "estrategia de fusión"
 
-#: builtin/revert.c:116
 msgid "option for merge strategy"
 msgstr "opción para estrategia de fusión"
 
-#: builtin/revert.c:125
 msgid "append commit name"
 msgstr "adjuntar el nombre del commit"
 
-#: builtin/revert.c:127
 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:241
+msgid "use the 'reference' format to refer to commits"
+msgstr ""
+
 msgid "revert failed"
 msgstr "falló al revertir"
 
-#: builtin/revert.c:254
 msgid "cherry-pick failed"
 msgstr "cherry-pick falló"
 
-#: builtin/rm.c:20
 msgid "git rm [<options>] [--] <file>..."
 msgstr "git rm [<opciones>] [--] <archivo>..."
 
-#: builtin/rm.c:208
 msgid ""
 "the following file has staged content different from both the\n"
 "file and the HEAD:"
@@ -22107,7 +11307,6 @@ msgstr[1] ""
 "los siguientes archivos tienen contenido en stage diferente a los mismos\n"
 "y a HEAD:"
 
-#: builtin/rm.c:213
 msgid ""
 "\n"
 "(use -f to force removal)"
@@ -22115,13 +11314,11 @@ msgstr ""
 "\n"
 "(usa -f para forzar su eliminación)"
 
-#: 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] "el siguiente archivo tiene cambios en stage en el índice:"
 msgstr[1] "los siguientes archivos tienen cambios en stage en el índice:"
 
-#: builtin/rm.c:221 builtin/rm.c:230
 msgid ""
 "\n"
 "(use --cached to keep the file, or -f to force removal)"
@@ -22129,53 +11326,42 @@ msgstr ""
 "\n"
 "(usa --cached para conservar el archivo, o -f para forzar su eliminación)"
 
-#: builtin/rm.c:227
 msgid "the following file has local modifications:"
 msgid_plural "the following files have local modifications:"
 msgstr[0] "el siguiente archivo tiene modificaciones locales:"
 msgstr[1] "los siguientes archivos tienen modificaciones locales:"
 
-#: builtin/rm.c:245
 msgid "do not list removed files"
 msgstr "no listar archivos eliminados"
 
-#: builtin/rm.c:246
 msgid "only remove from the index"
 msgstr "solo eliminar del índice"
 
-#: 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:250
 msgid "exit with a zero status even if nothing matched"
 msgstr "salir con estado cero incluso si nada coincide"
 
-#: 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: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:337
 #, c-format
 msgid "not removing '%s' recursively without -r"
 msgstr "no eliminando '%s' de manera recursiva sin -r"
 
-#: 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 [--mirror] [--dry-run] [--force]\n"
 "              [--receive-pack=<git-receive-pack>]\n"
@@ -22187,80 +11373,61 @@ msgstr ""
 "              [--verbose] [--thin] [--atomic]\n"
 "              [<host>:]<directorio> (--all | <ref>...)"
 
-#: builtin/send-pack.c:192
 msgid "remote name"
 msgstr "nombre remoto"
 
-#: builtin/send-pack.c:205
 msgid "use stateless RPC protocol"
 msgstr "usar protocolo RPC sin estado"
 
-#: builtin/send-pack.c:206
 msgid "read refs from stdin"
 msgstr "leer refs de stdin"
 
-#: builtin/send-pack.c:207
 msgid "print status from remote helper"
 msgstr "mostrar status del remote helper"
 
-#: builtin/shortlog.c:16
 msgid "git shortlog [<options>] [<revision-range>] [[--] <path>...]"
 msgstr "git shortlog [<opciones>] [<rango-de-revisiones>] [[--] <ruta>...]"
 
-#: builtin/shortlog.c:17
 msgid "git log --pretty=short | git shortlog [<options>]"
 msgstr "git log --pretty=short | git shortlog [<opciones>]"
 
-#: builtin/shortlog.c:123
 msgid "using multiple --group options with stdin is not supported"
 msgstr "no se admite el uso de múltiples opciones de grupo --group con stdin"
 
-#: builtin/shortlog.c:133
 msgid "using --group=trailer with stdin is not supported"
 msgstr "el uso de --group=trailer con stdin no es compatible"
 
-#: builtin/shortlog.c:323
 #, c-format
 msgid "unknown group type: %s"
 msgstr "tipo de grupo desconocido: %s"
 
-#: builtin/shortlog.c:351
 msgid "group by committer rather than author"
 msgstr "agrupar por committer en lugar de autor"
 
-#: builtin/shortlog.c:354
 msgid "sort output according to the number of commits per author"
 msgstr "ordenar salida de acuerdo al número de commits por autor"
 
-#: builtin/shortlog.c:356
 msgid "suppress commit descriptions, only provides commit count"
 msgstr "suprimir descripción de commits, solo proveer cuenta de commits"
 
-#: builtin/shortlog.c:358
 msgid "show the email address of each author"
 msgstr "mostrar la dirección de correo de cada autor"
 
-#: builtin/shortlog.c:359
 msgid "<w>[,<i1>[,<i2>]]"
 msgstr "<w>[,<i1>[,<i2>]]"
 
-#: builtin/shortlog.c:360
 msgid "linewrap output"
 msgstr "ajustar las líneas de salida"
 
-#: builtin/shortlog.c:362
 msgid "field"
 msgstr "campo"
 
-#: builtin/shortlog.c:363
 msgid "group by field"
 msgstr "agrupar por campo"
 
-#: 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"
 "                [--current] [--color[=<when>] | --no-color] [--sparse]\n"
@@ -22272,138 +11439,103 @@ msgstr ""
 "                [--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>]"
 msgstr "git show-branch (-g | --reflog)[=<n>[,<base>]] [--list] [<ref>]"
 
-#: builtin/show-branch.c:395
 #, c-format
 msgid "ignoring %s; cannot handle more than %d ref"
 msgid_plural "ignoring %s; cannot handle more than %d refs"
 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:547
 #, c-format
 msgid "no matching refs with %s"
 msgstr "no hay refs que concuerden con %s"
 
-#: builtin/show-branch.c:644
 msgid "show remote-tracking and local branches"
 msgstr "mostrar ramas locales y de rastreo remoto"
 
-#: builtin/show-branch.c:646
 msgid "show remote-tracking branches"
 msgstr "mostrar ramas de rastreo remoto"
 
-#: builtin/show-branch.c:648
 msgid "color '*!+-' corresponding to the branch"
 msgstr "colorear '*!+-' correspondiendo a la rama"
 
-#: 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:652
 msgid "synonym to more=-1"
 msgstr "sinónimo de más=-1"
 
-#: builtin/show-branch.c:653
 msgid "suppress naming strings"
 msgstr "suprimir strings de nombre"
 
-#: builtin/show-branch.c:655
 msgid "include the current branch"
 msgstr "incluir la rama actual"
 
-#: builtin/show-branch.c:657
 msgid "name commits with their object names"
 msgstr "nombrar commits con sus nombres de objeto"
 
-#: builtin/show-branch.c:659
 msgid "show possible merge bases"
 msgstr "mostrar bases de fusión posibles"
 
-#: 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:663
 msgid "show commits in topological order"
 msgstr "mostrar commits en orden topológico"
 
-#: 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:668
 msgid "show merges reachable from only one tip"
 msgstr "mostrar fusiones alcanzables por solo una punta"
 
-#: 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:673
 msgid "<n>[,<base>]"
 msgstr "<n>[,<base>]"
 
-#: 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: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: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:737
 msgid "--reflog option needs one branch name"
 msgstr "opción --reflog necesita un nombre de rama"
 
-#: 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:744
 #, c-format
 msgid "no such ref %s"
 msgstr "no existe el ref %s"
 
-#: 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:832
 #, c-format
 msgid "'%s' is not a valid ref."
 msgstr "'%s' no es una ref válida."
 
-#: builtin/show-branch.c:835
 #, c-format
 msgid "cannot find commit %s (%s)"
 msgstr "no se puede encontrar el commit %s (%s)"
 
-#: builtin/show-index.c:21
 msgid "hash-algorithm"
 msgstr "algoritmo hash"
 
-#: builtin/show-index.c:31
 msgid "Unknown hash algorithm"
 msgstr "Algoritmo hash desconocido"
 
-#: builtin/show-ref.c:12
 msgid ""
 "git show-ref [-q | --quiet] [--verify] [--head] [-d | --dereference] [-s | --"
 "hash[=<n>]] [--abbrev[=<n>]] [--tags] [--heads] [--] [<pattern>...]"
@@ -22411,57 +11543,45 @@ msgstr ""
 "git show-ref [-q | --quiet] [--verify] [--head] [-d | --dereference] [-s | --"
 "hash[=<n>]] [--abbrev[=<n>]] [--tags] [--heads] [--] [<patrón>...]"
 
-#: builtin/show-ref.c:13
 msgid "git show-ref --exclude-existing[=<pattern>]"
 msgstr "git show-ref --exclude-existing[=<patrón>]"
 
-#: builtin/show-ref.c:162
 msgid "only show tags (can be combined with heads)"
 msgstr "solo mostrar tags (puede ser combinado con heads)"
 
-#: builtin/show-ref.c:163
 msgid "only show heads (can be combined with tags)"
 msgstr "solo mostrar heads (puede ser combinado con tags)"
 
-#: builtin/show-ref.c:164
 msgid "stricter reference checking, requires exact ref path"
 msgstr "revisar referencias más estrictamente, requiere ruta de ref exacta"
 
-#: builtin/show-ref.c:167 builtin/show-ref.c:169
 msgid "show the HEAD reference, even if it would be filtered out"
 msgstr "mostrar la referencia de HEAD, incluso si se filtrara"
 
-#: builtin/show-ref.c:171
 msgid "dereference tags into object IDs"
 msgstr "desreferenciar tags a IDs de objeto"
 
-#: builtin/show-ref.c:173
 msgid "only show SHA1 hash using <n> digits"
 msgstr "solo mostrar hash SHA1 usando <n> cifras"
 
-#: builtin/show-ref.c:177
 msgid "do not print results to stdout (useful with --verify)"
 msgstr "no mostrar resultados en stdout (útil con --verify)"
 
-#: builtin/show-ref.c:179
 msgid "show refs from stdin that aren't in local repository"
 msgstr "mostrar refs de stdin que no estén en el repositorio local"
 
-#: 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) <opciones>"
 
-#: builtin/sparse-checkout.c:46
-msgid "git sparse-checkout list"
-msgstr "git sparse-checkout list"
+#, fuzzy
+msgid "this worktree is not sparse"
+msgstr "HEAD del árbol de trabajo %s no está actualizada"
 
-#: builtin/sparse-checkout.c:72
 msgid "this worktree is not sparse (sparse-checkout file may not exist)"
 msgstr ""
 "este árbol de trabajo no es sparse (archivo sparse-checkout tal vez no "
 "existe)"
 
-#: builtin/sparse-checkout.c:173
 #, c-format
 msgid ""
 "directory '%s' contains untracked files, but is not in the sparse-checkout "
@@ -22470,103 +11590,123 @@ 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: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:364
-msgid "failed to set extensions.worktreeConfig setting"
-msgstr "falló al configurar opción extensions.worktreeConfig"
+#, fuzzy
+msgid "failed to initialize worktree config"
+msgstr "falló al inicializar sparse-checkout"
 
-#: builtin/sparse-checkout.c:384
-msgid "git sparse-checkout init [--cone] [--[no-]sparse-index]"
-msgstr "git sparse-checkout init [--cone] [--[no-]sparse-index]"
+msgid "failed to modify sparse-index config"
+msgstr "falló al modificar la configuración del índice sparse"
 
-#: 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:406
 msgid "toggle the use of a sparse index"
 msgstr "activar el uso de un índice sparse"
 
-#: builtin/sparse-checkout.c:434
-msgid "failed to modify sparse-index config"
-msgstr "falló al modificar la configuración del índice sparse"
+#, c-format
+msgid "unable to create leading directories of %s"
+msgstr "no se pudo crear directorios principales para %s"
 
-#: builtin/sparse-checkout.c:455
 #, c-format
 msgid "failed to open '%s'"
 msgstr "falló al abrir '%s'"
 
-#: 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:519
-msgid "git sparse-checkout (set|add) (--stdin | <patterns>)"
-msgstr "git sparse-checkout (set|add) (--stdin | <patrones>)"
-
-#: 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: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:667
+#, fuzzy
+msgid "existing sparse-checkout patterns do not use cone mode"
+msgstr "no se pudo cargar patrones de sparse-checkout existentes"
+
+msgid "please run from the toplevel directory in non-cone mode"
+msgstr ""
+
+msgid "specify directories rather than patterns (no leading slash)"
+msgstr ""
+
+msgid ""
+"specify directories rather than patterns.  If your directory starts with a "
+"'!', pass --skip-checks"
+msgstr ""
+
+msgid ""
+"specify directories rather than patterns.  If your directory really has any "
+"of '*?[]\\' in it, pass --skip-checks"
+msgstr ""
+
+#, c-format
+msgid ""
+"'%s' is not a directory; to treat it as a directory anyway, rerun with --"
+"skip-checks"
+msgstr ""
+
+#, c-format
+msgid ""
+"pass a leading slash before paths such as '%s' if you want a single file "
+"(see NON-CONE PROBLEMS in the git-sparse-checkout manual)."
+msgstr ""
+
+#, fuzzy
+msgid "git sparse-checkout add [--skip-checks] (--stdin | <patterns>)"
+msgstr "git sparse-checkout (set|add) (--stdin | <patrones>)"
+
+msgid ""
+"skip some sanity checks on the given paths that might give false positives"
+msgstr ""
+
 msgid "read patterns from standard in"
 msgstr "leer patrones de standard in"
 
-#: builtin/sparse-checkout.c:682
-msgid "git sparse-checkout reapply"
-msgstr "git sparse-checkout reapply"
+#, fuzzy
+msgid "no sparse-checkout to add to"
+msgstr "git sparse-checkout list"
+
+#, fuzzy
+msgid ""
+"git sparse-checkout set [--[no-]cone] [--[no-]sparse-index] [--skip-checks] "
+"(--stdin | <patterns>)"
+msgstr "git sparse-checkout init [--cone] [--[no-]sparse-index]"
 
-#: builtin/sparse-checkout.c:701
-msgid "git sparse-checkout disable"
-msgstr "git sparse-checkout disable"
+msgid "must be in a sparse-checkout to reapply sparsity patterns"
+msgstr ""
 
-#: builtin/sparse-checkout.c:732
 msgid "error while refreshing working directory"
 msgstr "error al refrescar directorio de trabajo"
 
-#: builtin/stash.c:24 builtin/stash.c:40
 msgid "git stash list [<options>]"
 msgstr "git stash list [<opciones>]"
 
-#: builtin/stash.c:25 builtin/stash.c:45
 msgid "git stash show [<options>] [<stash>]"
 msgstr "git stash show [<opciones>] [<stash>]"
 
-#: builtin/stash.c:26 builtin/stash.c:50
 msgid "git stash drop [-q|--quiet] [<stash>]"
 msgstr "git stash drop [-q|--quiet] [<stash>]"
 
-#: builtin/stash.c:27
 msgid "git stash ( pop | apply ) [--index] [-q|--quiet] [<stash>]"
 msgstr "git stash ( pop | apply ) [--index] [-q|--quiet] [<stash>]"
 
-#: builtin/stash.c:28 builtin/stash.c:65
 msgid "git stash branch <branchname> [<stash>]"
 msgstr "git stash branch <nombre-de-rama> [<stash>]"
 
-#: builtin/stash.c:30
+#, fuzzy
 msgid ""
-"git stash [push [-p|--patch] [-k|--[no-]keep-index] [-q|--quiet]\n"
+"git stash [push [-p|--patch] [-S|--staged] [-k|--[no-]keep-index] [-q|--"
+"quiet]\n"
 "          [-u|--include-untracked] [-a|--all] [-m|--message <message>]\n"
 "          [--pathspec-from-file=<file> [--pathspec-file-nul]]\n"
 "          [--] [<pathspec>...]]"
@@ -22576,27 +11716,24 @@ msgstr ""
 "          [--pathspec-from-file=<archivo> [--pathspec-file-nul]]\n"
 "          [--] [<pathspec>...]]"
 
-#: builtin/stash.c:34
+#, fuzzy
 msgid ""
-"git stash save [-p|--patch] [-k|--[no-]keep-index] [-q|--quiet]\n"
+"git stash save [-p|--patch] [-S|--staged] [-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:55
 msgid "git stash pop [--index] [-q|--quiet] [<stash>]"
 msgstr "git stash pop [--index] [-q|--quiet] [<stash>]"
 
-#: builtin/stash.c:60
 msgid "git stash apply [--index] [-q|--quiet] [<stash>]"
 msgstr "git stash apply [--index] [-q|--quiet] [<stash>]"
 
-#: builtin/stash.c:75
 msgid "git stash store [-m|--message <message>] [-q|--quiet] <commit>"
 msgstr "git stash store [-m|--message <mensaje>] [-q|--quiet] <commit>"
 
-#: 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"
@@ -22606,7 +11743,6 @@ msgstr ""
 "          [-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>]"
@@ -22614,30 +11750,24 @@ 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"
 msgstr "'%s' no es un commit de estilo stash"
 
-#: builtin/stash.c:150
 #, c-format
 msgid "Too many revisions specified:%s"
 msgstr "Se especificaron demasiadas revisiones: %s"
 
-#: builtin/stash.c:164
 msgid "No stash entries found."
 msgstr "No se encontraron entradas de stash."
 
-#: builtin/stash.c:178
 #, c-format
 msgid "%s is not a valid reference"
 msgstr "%s no es una referencia válida"
 
-#: builtin/stash.c:227
 msgid "git stash clear with arguments is unimplemented"
 msgstr "git stash clear con argumentos no está implementado"
 
-#: builtin/stash.c:447
 #, c-format
 msgid ""
 "WARNING: Untracked file in way of tracked file!  Renaming\n"
@@ -22649,205 +11779,153 @@ msgstr ""
 "             %s ->%s\n"
 "          Para hacer espacio.\n"
 
-#: 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:519
 #, c-format
 msgid "could not generate diff %s^!."
 msgstr "¡no se pudo generar diff %s^!."
 
-#: builtin/stash.c:526
 msgid "conflicts in index. Try without --index."
 msgstr "conflictos en índice. Intenta sin --index."
 
-#: builtin/stash.c:532
 msgid "could not save index tree"
 msgstr "no se pudo guardar el árbol de índice"
 
-#: builtin/stash.c:552
 #, c-format
 msgid "Merging %s with %s"
 msgstr "Fusionando %s con %s"
 
-#: builtin/stash.c:562
 msgid "Index was not unstashed."
 msgstr "El índice no fue sacado de stash."
 
-#: 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:651
 #, c-format
 msgid "Dropped %s (%s)"
 msgstr "Descartado %s (%s)"
 
-#: builtin/stash.c:654
 #, c-format
 msgid "%s: Could not drop stash entry"
 msgstr "%s: No se pudo borrar entrada stash"
 
-#: builtin/stash.c:667
 #, c-format
 msgid "'%s' is not a stash reference"
 msgstr "'%s' no es una referencia stash"
 
-#: 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:740
 msgid "No branch name specified"
 msgstr "No se especificó el nombre de la rama"
 
-#: builtin/stash.c:824
 msgid "failed to parse tree"
 msgstr "falló al analizar el árbol"
 
-#: builtin/stash.c:835
 msgid "failed to unpack trees"
 msgstr "falló al desempaquetar árboles"
 
-#: builtin/stash.c:855
 msgid "include untracked files in the stash"
 msgstr "incluir archivos no rastreados en el stash"
 
-#: builtin/stash.c:858
 msgid "only show untracked files in the stash"
 msgstr "solo mostrar archivos no rastreados en el stash"
 
-#: 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:963 builtin/stash.c:1619 builtin/stash.c:1684
 msgid "stash message"
 msgstr "mensaje de stash"
 
-#: builtin/stash.c:973
 msgid "\"git stash store\" requires one <commit> argument"
 msgstr "\"git stash store\" requiere un argumento <commit>"
 
-#: builtin/stash.c:1187
+#, fuzzy
+msgid "No staged changes"
+msgstr "Sin cambios"
+
 msgid "No changes selected"
 msgstr "Sin cambios seleccionados"
 
-#: builtin/stash.c:1287
 msgid "You do not have the initial commit yet"
 msgstr "Aún no tienes un commit inicial"
 
-#: builtin/stash.c:1314
 msgid "Cannot save the current index state"
 msgstr "No se puede guardar el estado actual del índice"
 
-#: builtin/stash.c:1323
 msgid "Cannot save the untracked files"
 msgstr "No se pueden guardar los archivos no rastreados"
 
-#: 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:1371
+#, fuzzy
+msgid "Cannot save the current staged state"
+msgstr "No se puede guardar el estado actual del índice"
+
 msgid "Cannot record working tree state"
 msgstr "No se puede grabar el estado del árbol de trabajo"
 
-#: 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:1438
+#, fuzzy
+msgid "Can't use --staged and --include-untracked or --all at the same time"
+msgstr "No se puede usar --patch y --include-untracked o --all al mismo tiempo"
+
 msgid "Did you forget to 'git add'?"
 msgstr "¿Olvidaste 'git add'?"
 
-#: builtin/stash.c:1453
 msgid "No local changes to save"
 msgstr "No hay cambios locales para guardar"
 
-#: builtin/stash.c:1460
 msgid "Cannot initialize stash"
 msgstr "No se puede inicializar stash"
 
-#: builtin/stash.c:1475
 msgid "Cannot save the current status"
 msgstr "No se puede guardar el estado actual"
 
-#: 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:1571
 msgid "Cannot remove worktree changes"
 msgstr "No se pueden eliminar cambios del árbol de trabajo"
 
-#: builtin/stash.c:1610 builtin/stash.c:1675
 msgid "keep index"
 msgstr "mantener index"
 
-#: builtin/stash.c:1612 builtin/stash.c:1677
+msgid "stash staged changes only"
+msgstr ""
+
 msgid "stash in patch mode"
 msgstr "stash en modo patch"
 
-#: builtin/stash.c:1613 builtin/stash.c:1678
 msgid "quiet mode"
 msgstr "modo tranquilo"
 
-#: builtin/stash.c:1615 builtin/stash.c:1680
 msgid "include untracked files in stash"
 msgstr "incluir archivos sin seguimiento en stash"
 
-#: builtin/stash.c:1617 builtin/stash.c:1682
 msgid "include ignore files"
 msgstr "incluir archivos ignorados"
 
-#: 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"
-"Mira su entrada en 'git help config' para detalles."
-
-#: builtin/stripspace.c:18
-msgid "git stripspace [-s | --strip-comments]"
-msgstr "git stripspace [-s | --strip-comments]"
-
-#: builtin/stripspace.c:19
-msgid "git stripspace [-c | --comment-lines]"
-msgstr "git stripspace [-c | --comment-lines]"
-
-#: builtin/stripspace.c:37
 msgid "skip and remove all lines starting with comment character"
 msgstr ""
 "saltar y borrar todas las líneas que comiencen con un carácter de comentario"
 
-#: builtin/stripspace.c:40
 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:2667
 #, c-format
 msgid "Expecting a full ref name, got %s"
 msgstr "Se esperaba un nombre de ref completo, se obtuvo %s"
 
-#: builtin/submodule--helper.c:63
-msgid "submodule--helper print-default-remote takes no arguments"
-msgstr "submodule--helper print-default-remote no toma argumentos"
-
-#: builtin/submodule--helper.c:101
-#, c-format
-msgid "cannot strip one component off url '%s'"
-msgstr "no se puede quitar un componente del url '%s'"
-
-#: builtin/submodule--helper.c:211
 #, c-format
 msgid ""
 "could not look up configuration '%s'. Assuming this repository is its own "
@@ -22856,26 +11934,20 @@ 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:410
 msgid "git submodule--helper list [--prefix=<path>] [<path>...]"
 msgstr "git submodule--helper list [--prefix=<ruta>] [<ruta>...]"
 
-#: 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:520
 #, c-format
 msgid "Entering '%s'\n"
 msgstr "Entrando '%s'\n"
 
-#: builtin/submodule--helper.c:523
 #, c-format
 msgid ""
 "run_command returned non-zero status for %s\n"
@@ -22884,7 +11956,6 @@ msgstr ""
 "run_command devolvió estado no cero para %s\n"
 "."
 
-#: builtin/submodule--helper.c:545
 #, c-format
 msgid ""
 "run_command returned non-zero status while recursing in the nested "
@@ -22895,70 +11966,55 @@ msgstr ""
 "anidados de %s\n"
 "."
 
-#: 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: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:568
 msgid "git submodule--helper foreach [--quiet] [--recursive] [--] <command>"
 msgstr "git submodule--helper foreach [--quiet] [--recursive] [--] <comando>"
 
-#: 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: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: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: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:685
 msgid "suppress output for initializing a submodule"
 msgstr "suprime la salida de inicializar un submódulo"
 
-#: builtin/submodule--helper.c:690
 msgid "git submodule--helper init [<options>] [<path>]"
 msgstr "git submodule--helper init [<opciones>] [<path>]"
 
-#: 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: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: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:862 builtin/submodule--helper.c:1589
 msgid "suppress submodule status output"
 msgstr "suprimir salida del estado del submódulo"
 
-#: builtin/submodule--helper.c:863
 msgid ""
 "use commit stored in the index instead of the one stored in the submodule "
 "HEAD"
@@ -22966,109 +12022,84 @@ msgstr ""
 "usar el commit guardado en el índice en lugar del guardado en el submódulo "
 "HEAD"
 
-#: 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:893
 msgid "git submodule--helper name <path>"
 msgstr "git submodule--helper name <ruta>"
 
-#: builtin/submodule--helper.c:965
 #, c-format
 msgid "* %s %s(blob)->%s(submodule)"
 msgstr "* %s %s(blob)->%s(submodule)"
 
-#: builtin/submodule--helper.c:968
 #, c-format
 msgid "* %s %s(submodule)->%s(blob)"
 msgstr "* %s %s(submodule)->%s(blob)"
 
-#: builtin/submodule--helper.c:981
 #, c-format
 msgid "%s"
 msgstr "%s"
 
-#: 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:1035
 #, c-format
 msgid "unexpected mode %o\n"
 msgstr "modo %o inesperado\n"
 
-#: 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: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: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:1282
 msgid "limit the summary size"
 msgstr "limitar el tamaño de resumen"
 
-#: 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:1311
 msgid "could not fetch a revision for HEAD"
 msgstr "no se puede obtener la revisión para HEAD"
 
-#: builtin/submodule--helper.c:1316
-msgid "--cached and --files are mutually exclusive"
-msgstr "--cached y --files son mutuamente exclusivos"
-
-#: 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: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: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: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:1451
 msgid "suppress output of synchronizing submodule url"
 msgstr "suprime la salida de sincronizar el url del submódulo"
 
-#: 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:1512
-#, c-format
+#, fuzzy, 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)"
+"Submodule work tree '%s' contains a .git directory. This will be replaced "
+"with a .git file by using absorbgitdirs."
 msgstr ""
 "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:1524
 #, c-format
 msgid ""
 "Submodule work tree '%s' contains local modifications; use '-f' to discard "
@@ -23077,46 +12108,37 @@ msgstr ""
 "El árbol de trabajo de submódulo '%s' contiene modificaciones locales; usa '-"
 "f' para descartarlas"
 
-#: builtin/submodule--helper.c:1532
 #, c-format
 msgid "Cleared directory '%s'\n"
 msgstr "Directorio '%s' limpiado\n"
 
-#: 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: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: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: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:1591
 msgid "unregister all submodules"
 msgstr "quitar todos los submódulos"
 
-#: 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: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: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"
@@ -23130,164 +12152,132 @@ msgstr ""
 "con\n"
 "'--reference-if-able' en lugar de '--reference'."
 
-#: 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: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: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: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: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:1817
 #, c-format
 msgid "directory not empty: '%s'"
 msgstr "directorio no está vacío: '%s'"
 
-#: 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:1861
 msgid "where the new submodule will be cloned to"
 msgstr "a donde el nuevo submódulo será clonado"
 
-#: builtin/submodule--helper.c:1864
 msgid "name of the new submodule"
 msgstr "nombre del nuevo submódulo"
 
-#: 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:1875 builtin/submodule--helper.c:3264
 msgid "depth for shallow clones"
 msgstr "profundidad para clones superficiales"
 
-#: 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: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:1887
+#, fuzzy
 msgid ""
 "git submodule--helper clone [--prefix=<path>] [--quiet] [--reference "
-"<repository>] [--name <name>] [--depth <depth>] [--single-branch] --url "
-"<url> --path <path>"
+"<repository>] [--name <name>] [--depth <depth>] [--single-branch] [--filter "
+"<filter-spec>] --url <url> --path <path>"
 msgstr ""
 "git submodule--helper clone [--prefix=<ruta>] [--quiet] [--reference "
 "<repositorio>] [--name <nombre>] [--depth <profundidad>] [--single-branch] --"
 "url <url> --path <ruta>"
 
-#: 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: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:2043
 #, c-format
 msgid "Submodule path '%s' not initialized"
 msgstr "Ruta de submódulo '%s' no inicializada"
 
-#: builtin/submodule--helper.c:2047
 msgid "Maybe you want to use 'update --init'?"
 msgstr "¿Tal vez quieres usar 'update --init'?"
 
-#: builtin/submodule--helper.c:2077
 #, c-format
 msgid "Skipping unmerged submodule %s"
 msgstr "Saltando submódulo %s no fusionado"
 
-#: builtin/submodule--helper.c:2106
 #, c-format
 msgid "Skipping submodule '%s'"
 msgstr "Saltando submódulo '%s'"
 
-#: 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: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: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 "
@@ -23296,184 +12286,163 @@ 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
+#, c-format
+msgid ""
+"Submodule (%s) branch configured to inherit branch from superproject, but "
+"the superproject is not on any branch"
+msgstr ""
+"Rama de submódulo (%s) configurada para heredar rama del superproyecto, pero "
+"el superproyecto no está en ninguna rama"
+
+#, 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'"
+
+#, fuzzy, c-format
+msgid "Unable to find current revision in submodule path '%s'"
+msgstr ""
+"No se pudo encontrar la revisión actual en la ruta de submódulo "
+"'$displaypath'"
+
+#, fuzzy, c-format
+msgid "Unable to fetch in submodule path '%s'"
+msgstr "No es posible realizar fetch en la ruta de submódulo '$sm_path'"
+
+#, fuzzy, c-format
+msgid "Unable to find %s revision in submodule path '%s'"
+msgstr ""
+"No se pudo encontrar la revisión actual en la ruta de submódulo "
+"'$displaypath'"
+
+#, fuzzy, c-format
+msgid "Failed to recurse into submodule path '%s'"
+msgstr "falló al recursar en el submódulo '%s'"
+
+msgid "force checkout updates"
+msgstr "forzar actualizaciones de checkout"
+
+#, fuzzy
+msgid "initialize uninitialized submodules before update"
+msgstr "inicializar submódulos en el clon"
+
+#, fuzzy
+msgid "use SHA-1 of submodule's remote tracking branch"
+msgstr "cualquier submódulo clonado usará su branch de rastreo remoto"
+
+msgid "traverse submodules recursively"
+msgstr ""
+
+msgid "don't fetch new objects from the remote site"
+msgstr "no recuperar objetos nuevos del sitio remoto"
+
 msgid "path into the working tree"
 msgstr "ruta al árbol de trabajo"
 
-#: 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:2511 builtin/submodule--helper.c:2577
 msgid "rebase, merge, checkout or none"
 msgstr "rebase, merge, checkout o none"
 
-#: 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:2520
 msgid "parallel jobs"
 msgstr "tareas paralelas"
 
-#: 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:2523
 msgid "don't print cloning progress"
 msgstr "no mostrar el progreso de clonación"
 
-#: 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:2547
-msgid "bad value for update parameter"
-msgstr "mal valor para parámetro update"
-
-#: 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 "
-"the superproject is not on any branch"
+"git submodule [--quiet] update [--init [--filter=<filter-spec>]] [--remote] "
+"[-N|--no-fetch] [-f|--force] [--checkout|--merge|--rebase] [--[no-]recommend-"
+"shallow] [--reference <repository>] [--recursive] [--[no-]single-branch] "
+"[--] [<path>...]"
 msgstr ""
-"Rama de submódulo (%s) configurada para heredar rama del superproyecto, pero "
-"el superproyecto no está en ninguna rama"
 
-#: 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'"
+msgid "bad value for update parameter"
+msgstr "mal valor para parámetro update"
 
-#: builtin/submodule--helper.c:2813
 msgid "recurse into submodules"
 msgstr "recurrir a submódulos"
 
-#: 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: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:2878
 msgid "unset the config in the .gitmodules file"
 msgstr "desconfigurar la opción en el archivo .gitmodules"
 
-#: builtin/submodule--helper.c:2883
 msgid "git submodule--helper config <name> [<value>]"
 msgstr "git submodule--helper config <nombre> [<valor>]"
 
-#: builtin/submodule--helper.c:2884
 msgid "git submodule--helper config --unset <name>"
 msgstr "git submodule--helper config --unset <nombre>"
 
-#: builtin/submodule--helper.c:2885
-msgid "git submodule--helper config --check-writeable"
-msgstr "git submodule--helper config --check-writeable"
-
-#: 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: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:2924
 msgid "git submodule--helper set-url [--quiet] <path> <newurl>"
 msgstr "git submodule--helper set-url [--quiet] <ruta> <nueva url>"
 
-#: 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:2959
 msgid "set the default tracking branch"
 msgstr "configurar la rama de rastreo por defecto"
 
-#: 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: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:2971
 msgid "--branch or --default required"
 msgstr "--branch o --default requerido"
 
-#: builtin/submodule--helper.c:2974
-msgid "--branch and --default are mutually exclusive"
-msgstr "--branch y --default son mutuamente exclusivos"
+msgid "print only error messages"
+msgstr "mostrar solo mensajes de error"
+
+msgid "force creation"
+msgstr ""
+
+#, fuzzy
+msgid "show whether the branch would be created"
+msgstr "mostrar lo que sería incluido en el commit"
+
+msgid ""
+"git submodule--helper create-branch [-f|--force] [--create-reflog] [-q|--"
+"quiet] [-t|--track] [-n|--dry-run] <name> <start-oid> <start-name>"
+msgstr ""
+
+#, fuzzy, c-format
+msgid "creating branch '%s'"
+msgstr "Reiniciar rama '%s'\n"
 
-#: 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: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:3053
 #, c-format
 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):\n"
 
-#: builtin/submodule--helper.c:3060
 #, c-format
 msgid ""
 "If you want to reuse this local git directory instead of cloning again from\n"
@@ -23491,120 +12460,96 @@ msgstr ""
 "o no estás seguro de lo que esto significa, escoge otro nombre con la opción "
 "'--name'."
 
-#: 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:3109
 #, c-format
 msgid "unable to checkout submodule '%s'"
 msgstr "no es posible hacer checkout al submódulo '%s'"
 
-#: 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: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
+#, c-format
+msgid "'%s' does not have a commit checked out"
+msgstr "'%s' no tiene un commit checked out"
+
 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 que de otro modo se ignora"
 
-#: 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
+#, fuzzy
 msgid ""
-"sets the submodule’s name to the given string instead of defaulting to its "
+"sets the submodule's name to the given string instead of defaulting to its "
 "path"
 msgstr ""
 "configura el nombre del submódulo para el string dado en lugar de ir a la "
 "ruta por defecto"
 
-#: 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:3410
 #, c-format
 msgid "'%s' is not a valid submodule--helper subcommand"
 msgstr "'%s' no es un comando submodule--helper válido"
 
-#: builtin/symbolic-ref.c:8
 msgid "git symbolic-ref [<options>] <name> [<ref>]"
 msgstr "git symbolic-ref [<opciones>] <nombre> [<referencia>]"
 
-#: builtin/symbolic-ref.c:9
 msgid "git symbolic-ref -d [-q] <name>"
 msgstr "git symbolic-ref -d [-q] <nombre>"
 
-#: builtin/symbolic-ref.c:42
 msgid "suppress error message for non-symbolic (detached) refs"
 msgstr "suprimir mensajes de error para refs no simbólicos (desacoplados)"
 
-#: builtin/symbolic-ref.c:43
 msgid "delete symbolic ref"
 msgstr "eliminar referencia simbólica"
 
-#: builtin/symbolic-ref.c:44
 msgid "shorten ref output"
 msgstr "salida de referencia más corta"
 
-#: builtin/symbolic-ref.c:45 builtin/update-ref.c:505
 msgid "reason"
 msgstr "razón"
 
-#: 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"
 "        <tagname> [<head>]"
@@ -23612,11 +12557,9 @@ msgstr ""
 "git tag [-a | -s | -u <key-id>] [-f] [-m <msg> | -F <file>]\n"
 "        <tagname> [<head>]"
 
-#: builtin/tag.c:27
 msgid "git tag -d <tagname>..."
 msgstr "git tag -d <nombre-de-tag>..."
 
-#: builtin/tag.c:28
 msgid ""
 "git tag -l [-n[<num>]] [--contains <commit>] [--no-contains <commit>] [--"
 "points-at <object>]\n"
@@ -23628,21 +12571,17 @@ msgstr ""
 "        [--format=<format>] [--merged <commit>] [--no-merged <commit>] "
 "[<pattern>...]"
 
-#: builtin/tag.c:30
 msgid "git tag -v [--format=<format>] <tagname>..."
 msgstr "git tag -v [--format=<formato>] <nombre-de-tag>..."
 
-#: builtin/tag.c:100
 #, c-format
 msgid "tag '%s' not found."
 msgstr "tag '%s' no encontrado."
 
-#: builtin/tag.c:135
 #, c-format
 msgid "Deleted tag '%s' (was %s)\n"
 msgstr "Etiqueta '%s' eliminada (era %s)\n"
 
-#: builtin/tag.c:170
 #, c-format
 msgid ""
 "\n"
@@ -23655,7 +12594,6 @@ msgstr ""
 "  %s\n"
 "Las líneas que comienzan con '%c' serán ignoradas.\n"
 
-#: builtin/tag.c:174
 #, c-format
 msgid ""
 "\n"
@@ -23670,11 +12608,9 @@ msgstr ""
 "Las líneas que comienzan con '%c' serán conservadas; puedes eliminarlas por "
 "ti mismo si quieres hacerlo.\n"
 
-#: builtin/tag.c:241
 msgid "unable to sign the tag"
 msgstr "incapaz de firmar tag"
 
-#: builtin/tag.c:259
 #, c-format
 msgid ""
 "You have created a nested tag. The object referred to by your new tag is\n"
@@ -23687,338 +12623,248 @@ msgstr ""
 "\n"
 "\tgit tag -f %s %s^{}"
 
-#: builtin/tag.c:275
 msgid "bad object type."
 msgstr "tipo de objeto erróneo."
 
-#: builtin/tag.c:326
 msgid "no tag message?"
 msgstr "¿sin mensaje de tag?"
 
-#: 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:444
 msgid "list tag names"
 msgstr "listar nombres de tags"
 
-#: 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:448
 msgid "delete tags"
 msgstr "eliminar tags"
 
-#: builtin/tag.c:449
 msgid "verify tags"
 msgstr "verificar tags"
 
-#: builtin/tag.c:451
 msgid "Tag creation options"
 msgstr "Opciones de creación de tags"
 
-#: builtin/tag.c:453
 msgid "annotated tag, needs a message"
 msgstr "tags anotadas necesitan un mensaje"
 
-#: builtin/tag.c:455
 msgid "tag message"
 msgstr "mensaje de tag"
 
-#: builtin/tag.c:457
 msgid "force edit of tag message"
 msgstr "forzar la edición del mensaje de tag"
 
-#: builtin/tag.c:458
 msgid "annotated and GPG-signed tag"
 msgstr "tag anotado y firmado con GPG"
 
-#: builtin/tag.c:461
 msgid "use another key to sign the tag"
 msgstr "usar otra clave para firmar el tag"
 
-#: builtin/tag.c:462
 msgid "replace the tag if exists"
 msgstr "remplazar tag si existe"
 
-#: builtin/tag.c:463 builtin/update-ref.c:511
 msgid "create a reflog"
 msgstr "crear un reflog"
 
-#: builtin/tag.c:465
 msgid "Tag listing options"
 msgstr "Opciones de listado de tag"
 
-#: builtin/tag.c:466
 msgid "show tag list in columns"
 msgstr "mostrar lista de tags en columnas"
 
-#: 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: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:471
 msgid "print only tags that are merged"
 msgstr "solo imprimir las tags que estén fusionadas"
 
-#: 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:476
 msgid "print only tags of the object"
 msgstr "solo imprimir tags del objeto"
 
-#: builtin/tag.c:525
-msgid "--column and -n are incompatible"
-msgstr "--column y -n son incompatibles"
-
-#: builtin/tag.c:546
-msgid "-n option is only allowed in list mode"
+#, fuzzy, c-format
+msgid "the '%s' option is only allowed in list mode"
 msgstr "opción -n solo es permitida en modo lista"
 
-#: 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: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: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: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:568
-msgid "only one -F or -m option is allowed."
-msgstr "solo se permite una de las opciones, -m o -F."
-
-#: 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:598
 #, c-format
 msgid "tag '%s' already exists"
 msgstr "el tag '%s' ya existe"
 
-#: builtin/tag.c:629
+#, c-format
+msgid "Invalid cleanup mode %s"
+msgstr "Modo cleanup inválido %s"
+
 #, c-format
 msgid "Updated tag '%s' (was %s)\n"
 msgstr "Etiqueta '%s' actualizada (era %s)\n"
 
-#: builtin/unpack-objects.c:504
+msgid "pack exceeds maximum allowed size"
+msgstr "paquete excede el máximo tamaño permitido"
+
 msgid "Unpacking objects"
 msgstr "Desempaquetando objetos"
 
-#: builtin/update-index.c:84
 #, c-format
 msgid "failed to create directory %s"
 msgstr "falló al crear directorio %s"
 
-#: builtin/update-index.c:106
 #, c-format
 msgid "failed to delete file %s"
 msgstr "falló al eliminar el archivo %s"
 
-#: 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:138
 #, c-format
 msgid "Testing mtime in '%s' "
 msgstr "Probando mtime en '%s' "
 
-#: 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: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: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: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: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: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:220
 msgid " OK"
 msgstr " OK"
 
-#: builtin/update-index.c:589
 msgid "git update-index [<options>] [--] [<file>...]"
 msgstr "git update-index [<opciones>] [--] [<archivo>...]"
 
-#: 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:977
 msgid "refresh: ignore submodules"
 msgstr "refresh: ignora submódulos"
 
-#: builtin/update-index.c:980
 msgid "do not ignore new files"
 msgstr "no ignorar archivos nuevos"
 
-#: 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:984
 msgid "notice files missing from worktree"
 msgstr "avisar de archivos faltando del árbol de trabajo"
 
-#: 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:989
 msgid "refresh stat information"
 msgstr "refrescar información de estado"
 
-#: 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:997
 msgid "<mode>,<object>,<path>"
 msgstr "<modo>,<objeto>,<ruta>"
 
-#: builtin/update-index.c:998
 msgid "add the specified entry to the index"
 msgstr "agregar la entrada especificada al índice"
 
-#: builtin/update-index.c:1008
 msgid "mark files as \"not changing\""
 msgstr "marcar archivos como \"not changing\""
 
-#: builtin/update-index.c:1011
 msgid "clear assumed-unchanged bit"
 msgstr "limpiar bit assumed-unchanged"
 
-#: builtin/update-index.c:1014
 msgid "mark files as \"index-only\""
 msgstr "marcar archivos como \"index-only\""
 
-#: builtin/update-index.c:1017
 msgid "clear skip-worktree bit"
 msgstr "limpiar bit skip-worktree"
 
-#: builtin/update-index.c:1020
 msgid "do not touch index-only entries"
 msgstr "no tocar entradas index-only"
 
-#: 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: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: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: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:1032
 msgid "add entries from standard input to the index"
 msgstr "agregar entradas de standard input al índice"
 
-#: 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:1040
 msgid "only update entries that differ from HEAD"
 msgstr "solo actualizar entradas que difieran de HEAD"
 
-#: builtin/update-index.c:1044
 msgid "ignore files missing from worktree"
 msgstr "ignorar archivos faltantes en el árbol de trabajo"
 
-#: builtin/update-index.c:1047
 msgid "report actions to standard output"
 msgstr "reportar acciones por standard output"
 
-#: 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:1053
 msgid "write index in this format"
 msgstr "escribir índice en este formato"
 
-#: builtin/update-index.c:1055
 msgid "enable or disable split index"
 msgstr "activar o desactivar índice dividido"
 
-#: builtin/update-index.c:1057
 msgid "enable/disable untracked cache"
 msgstr "habilitar o deshabilitar caché no rastreado"
 
-#: 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:1061
 msgid "enable untracked cache without testing the filesystem"
 msgstr "habilitar caché no rastreado sin probar el filesystem"
 
-#: 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:1065
 msgid "enable or disable file system monitor"
 msgstr "activar o desactivar monitor de sistema de archivos"
 
-#: builtin/update-index.c:1067
 msgid "mark files as fsmonitor valid"
 msgstr "marcar archivos como válidos para fsmonitor"
 
-#: builtin/update-index.c:1070
 msgid "clear fsmonitor valid bit"
 msgstr "limpiar el bit de validación fsmonitor"
 
-#: builtin/update-index.c:1173
 msgid ""
 "core.splitIndex is set to false; remove or change it, if you really want to "
 "enable split index"
@@ -24026,7 +12872,6 @@ msgstr ""
 "core.splitIndex está configurado en false; quítalo o cámbialo, si realmente "
 "quieres habilitar el índice partido"
 
-#: builtin/update-index.c:1182
 msgid ""
 "core.splitIndex is set to true; remove or change it, if you really want to "
 "disable split index"
@@ -24034,7 +12879,6 @@ msgstr ""
 "core.splitIndex está configurado en true; quítalo o cámbialo, si realmente "
 "quieres deshabilitar el índice partido"
 
-#: 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"
@@ -24042,11 +12886,9 @@ msgstr ""
 "core.untrackedCache está configurado en true; quítalo o cámbialo, si "
 "realmente quieres deshabilitar el chaché no rastreado"
 
-#: builtin/update-index.c:1198
 msgid "Untracked cache disabled"
 msgstr "Caché no rastreado deshabilitado"
 
-#: 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"
@@ -24054,174 +12896,135 @@ msgstr ""
 "core.untrackedCache está configurado en false; quítalo o cámbialo, si "
 "realmente quieres habilitar el caché no rastreado"
 
-#: builtin/update-index.c:1210
 #, c-format
 msgid "Untracked cache enabled for '%s'"
 msgstr "Caché no rastreado habilitado para '%s'"
 
-#: 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:1222
 msgid "fsmonitor enabled"
 msgstr "fsmonitor activado"
 
-#: 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:1229
 msgid "fsmonitor disabled"
 msgstr "fsmonitor desactivado"
 
-#: builtin/update-ref.c:10
 msgid "git update-ref [<options>] -d <refname> [<old-val>]"
 msgstr "git update-ref [<opciones>] -d <nombre-referencia> [<valor-anterior>]"
 
-#: builtin/update-ref.c:11
 msgid "git update-ref [<options>]    <refname> <new-val> [<old-val>]"
 msgstr ""
 "git update-ref [<opciones>] <nombre-referencia> <valor-nuevo> [<valor-"
 "anterior>]"
 
-#: builtin/update-ref.c:12
 msgid "git update-ref [<options>] --stdin [-z]"
 msgstr "git update-ref [<opciones>] --stdin [-z]"
 
-#: builtin/update-ref.c:506
 msgid "delete the reference"
 msgstr "eliminar la referencia"
 
-#: builtin/update-ref.c:508
 msgid "update <refname> not the one it points to"
 msgstr "actualizar <refname> no la a que apunta"
 
-#: builtin/update-ref.c:509
 msgid "stdin has NUL-terminated arguments"
 msgstr "stdin tiene argumentos terminados en NUL"
 
-#: builtin/update-ref.c:510
 msgid "read updates from stdin"
 msgstr "leer actualizaciones de stdin"
 
-#: builtin/update-server-info.c:7
-msgid "git update-server-info [--force]"
-msgstr "git update-server-info [--force]"
-
-#: builtin/update-server-info.c:15
 msgid "update the info files from scratch"
 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:24 t/helper/test-serve-v2.c:17
 msgid "quit after a single request/response exchange"
 msgstr "salir después de un solo intercambio petición/respuesta"
 
-#: 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"
 
-#: builtin/verify-commit.c:19
 msgid "git verify-commit [-v | --verbose] <commit>..."
 msgstr "git verify-commit [-v | --verbose] <commit>..."
 
-#: builtin/verify-commit.c:68
 msgid "print commit contents"
 msgstr "imprimir contenido del commit"
 
-#: builtin/verify-commit.c:69 builtin/verify-tag.c:37
 msgid "print raw gpg status output"
 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>..."
 msgstr "git verify-pack [-v | --verbose] [-s | --stat-only] <paquete>..."
 
-#: builtin/verify-pack.c:70
 msgid "verbose"
 msgstr "verboso"
 
-#: builtin/verify-pack.c:72
 msgid "show statistics only"
 msgstr "solo mostrar estadísticas"
 
-#: builtin/verify-tag.c:18
 msgid "git verify-tag [-v | --verbose] [--format=<format>] <tag>..."
 msgstr "git verify-tag [-v | --verbose] [--format=<formato>] <tag>..."
 
-#: builtin/verify-tag.c:36
 msgid "print tag contents"
 msgstr "imprimir contenido del tag"
 
-#: builtin/worktree.c:19
 msgid "git worktree add [<options>] <path> [<commit-ish>]"
 msgstr "git worktree add [<opciones>] <ruta> [<commit-ish>]"
 
-#: builtin/worktree.c:20
 msgid "git worktree list [<options>]"
 msgstr "git worktree list [<opciones>]"
 
-#: builtin/worktree.c:21
 msgid "git worktree lock [<options>] <path>"
 msgstr "git worktree lock [<opciones>] <ruta>"
 
-#: builtin/worktree.c:22
 msgid "git worktree move <worktree> <new-path>"
 msgstr "git worktree move <worktree> <nueva-ruta>"
 
-#: builtin/worktree.c:23
 msgid "git worktree prune [<options>]"
 msgstr "git worktree prune [<opciones>]"
 
-#: builtin/worktree.c:24
 msgid "git worktree remove [<options>] <worktree>"
 msgstr "git worktree remove [<opciones>] <worktree>"
 
-#: builtin/worktree.c:25
+#, fuzzy
+msgid "git worktree repair [<path>...]"
+msgstr "git worktree prune [<opciones>]"
+
 msgid "git worktree unlock <path>"
 msgstr "git worktree unlock <ruta>"
 
-#: builtin/worktree.c:75
 #, c-format
 msgid "Removing %s/%s: %s"
 msgstr "Eliminando %s/%s: %s"
 
-#: builtin/worktree.c:148
 msgid "report pruned working trees"
 msgstr "reportar árboles de trabajo recortados"
 
-#: builtin/worktree.c:150
 msgid "expire working trees older than <time>"
 msgstr "caducar árboles de trabajo más viejos a <tiempo>"
 
-#: builtin/worktree.c:220
 #, c-format
 msgid "'%s' already exists"
 msgstr "'%s' ya existe"
 
-#: builtin/worktree.c:229
 #, c-format
 msgid "unusable worktree destination '%s'"
 msgstr "destino de worktree inutilizable '%s'"
 
-#: builtin/worktree.c:234
 #, c-format
 msgid ""
 "'%s' is a missing but locked worktree;\n"
@@ -24231,7 +13034,6 @@ msgstr ""
 "usa '%s -f -f' para sobreescribir, o 'unlock' y 'prune' o 'remove' para "
 "limpiar"
 
-#: builtin/worktree.c:236
 #, c-format
 msgid ""
 "'%s' is a missing but already registered worktree;\n"
@@ -24240,144 +13042,123 @@ msgstr ""
 "'%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:287
+#, c-format
+msgid "failed to copy '%s' to '%s'; sparse-checkout may not work correctly"
+msgstr ""
+
+#, fuzzy, c-format
+msgid "failed to copy worktree config from '%s' to '%s'"
+msgstr "falló al copiar notas de '%s' a '%s'"
+
+#, fuzzy, c-format
+msgid "failed to unset '%s' in '%s'"
+msgstr "falló al mover '%s' a '%s'"
+
 #, c-format
 msgid "could not create directory of '%s'"
 msgstr "no se pudo crear directorio de '%s'"
 
-#: builtin/worktree.c:309
 msgid "initializing"
 msgstr "inicializando"
 
-#: 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: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:432
 #, c-format
 msgid "Preparing worktree (checking out '%s')"
 msgstr "Preparando árbol de trabajo (haciendo checkout a '%s')"
 
-#: builtin/worktree.c:438
 #, c-format
 msgid "Preparing worktree (detached HEAD %s)"
 msgstr "Preparando árbol de trabajo (HEAD desacoplado %s)"
 
-#: 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:486
 msgid "create a new branch"
 msgstr "crear una nueva rama"
 
-#: builtin/worktree.c:488
 msgid "create or reset a branch"
 msgstr "crear o restablecer una rama"
 
-#: builtin/worktree.c:490
 msgid "populate the new working tree"
 msgstr "popular el nuevo árbol de trabajo"
 
-#: builtin/worktree.c:491
 msgid "keep the new working tree locked"
 msgstr "mantener el nuevo árbol de trabajo bloqueado"
 
-#: builtin/worktree.c:493 builtin/worktree.c:730
 msgid "reason for locking"
 msgstr "razón para bloquear"
 
-#: builtin/worktree.c:496
 msgid "set up tracking mode (see git-branch(1))"
 msgstr "configurando modo tracking (mirar git-branch(1))"
 
-#: 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:507
-msgid "-b, -B, and --detach are mutually exclusive"
-msgstr "-b, -B, y --detach son mutuamente exclusivas"
-
-#: builtin/worktree.c:509
-msgid "--reason requires --lock"
-msgstr "--reason requiere --lock"
+#, fuzzy, c-format
+msgid "options '%s', '%s', and '%s' cannot be used together"
+msgstr "Opciones --squash y --fixup no pueden ser usadas juntas"
 
-#: builtin/worktree.c:513
 msgid "added with --lock"
 msgstr "agregado con --lock"
 
-#: 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:692
 msgid "show extended annotations and reasons, if available"
 msgstr "mostrar anotaciones ampliadas y motivos, si están disponibles"
 
-#: builtin/worktree.c:694
 msgid "add 'prunable' annotation to worktrees older than <time>"
 msgstr ""
 "agregar la anotación 'podable' a los árboles de trabajo anteriores a <tiempo>"
 
-#: builtin/worktree.c:703
-msgid "--verbose and --porcelain are mutually exclusive"
-msgstr "--verbose and --porcelain son mutuamente exclusivas"
+#, fuzzy
+msgid "terminate records with a NUL character"
+msgstr "terminar registros de entrada y salida con un carácter NUL"
 
-#: 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: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:749
 #, c-format
 msgid "'%s' is already locked, reason: %s"
 msgstr "'%s' ya está bloqueado; razón: %s"
 
-#: builtin/worktree.c:751
 #, c-format
 msgid "'%s' is already locked"
 msgstr "'%s' ya está bloqueado"
 
-#: builtin/worktree.c:779
 #, c-format
 msgid "'%s' is not locked"
 msgstr "'%s' no está bloqueado"
 
-#: 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: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: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: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:869
 #, c-format
 msgid ""
 "cannot move a locked working tree, lock reason: %s\n"
@@ -24386,7 +13167,6 @@ msgstr ""
 "no se puede mover un árbol de trabajo bloqueado, motivo del bloqueo: %s\n"
 "usa 'move -f -f' para forzar o desbloquear primero"
 
-#: builtin/worktree.c:871
 msgid ""
 "cannot move a locked working tree;\n"
 "use 'move -f -f' to override or unlock first"
@@ -24394,38 +13174,31 @@ msgstr ""
 "no se puede mover un árbol de trabajo bloqueado;\n"
 "usa 'move -f -f' para forzar o desbloquear primero"
 
-#: 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:879
 #, c-format
 msgid "failed to move '%s' to '%s'"
 msgstr "falló al mover '%s' a '%s'"
 
-#: 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:929
 #, c-format
 msgid "'%s' contains modified or untracked files, use --force to delete it"
 msgstr ""
 "'%s' contiene archivos modificados o no rastreados, usa --force para borrarlo"
 
-#: 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: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:980
 #, c-format
 msgid ""
 "cannot remove a locked working tree, lock reason: %s\n"
@@ -24434,7 +13207,6 @@ msgstr ""
 "no se puede eliminar árbol de trabajo bloqueado, razón del bloqueo: %s\n"
 "usa 'remove -f -f' para forzar o desbloquear primero"
 
-#: builtin/worktree.c:982
 msgid ""
 "cannot remove a locked working tree;\n"
 "use 'remove -f -f' to override or unlock first"
@@ -24442,1236 +13214,8067 @@ msgstr ""
 "no se pueden eliminar árbol de trabajo bloqueado;\n"
 "usa 'remove -f -f' para forzar o desbloquear primero"
 
-#: 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:1009
 #, c-format
 msgid "repair: %s: %s"
 msgstr "reparar: %s: %s"
 
-#: builtin/worktree.c:1012
 #, c-format
 msgid "error: %s: %s"
 msgstr "error: %s: %s"
 
-#: builtin/write-tree.c:15
 msgid "git write-tree [--missing-ok] [--prefix=<prefix>/]"
 msgstr "git write-tree [--missing-ok] [--prefix=<prefijo>/]"
 
-#: builtin/write-tree.c:28
 msgid "<prefix>/"
 msgstr "<prefijo>/"
 
-#: builtin/write-tree.c:29
 msgid "write tree object for a subdirectory <prefix>"
 msgstr "escribir objeto de árbol para un subdirectorio <prefijo>"
 
-#: builtin/write-tree.c:31
 msgid "only useful for debugging"
 msgstr "solo útil para depurar"
 
-#: git.c:28
-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"
-"           [--git-dir=<path>] [--work-tree=<path>] [--namespace=<name>]\n"
-"           [--super-prefix=<path>] [--config-env=<name>=<envvar>]\n"
-"           <command> [<args>]"
-msgstr ""
-"git [--version] [--help] [-C <ruta>] [-c <nombre>=<valor>]\n"
-"            [--exec-path [= <path>]] [--html-path] [--man-path] [--info-"
-"path]\n"
-"            [-p | --paginate | -P | --no-pager] [--no-replace-objects] [--"
-"bare]\n"
-"            [--git-dir=<ruta>] [--work-tree=<ruta>] [--namespace=<nombre>]\n"
-"            [--super-prefix=<ruta>] [--config-env=<nombre>=<envvar>]\n"
-"            <comando> [<args>]"
-
-#: git.c:36
-msgid ""
-"'git help -a' and 'git help -g' list available subcommands and some\n"
-"concept guides. See 'git help <command>' or 'git help <concept>'\n"
-"to read about a specific subcommand or concept.\n"
-"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. 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."
-
-#: git.c:188
-#, c-format
-msgid "no directory given for --git-dir\n"
-msgstr "no se entregó directorio para --git-dir\n"
-
-#: git.c:202
-#, c-format
-msgid "no namespace given for --namespace\n"
-msgstr "no se entregó namespace para --namespace\n"
-
-#: git.c:216
-#, c-format
-msgid "no directory given for --work-tree\n"
-msgstr "no se entregó directorio para --work-tree\n"
-
-#: git.c:230
-#, c-format
-msgid "no prefix given for --super-prefix\n"
-msgstr "no se entregó prefijo para --super-prefix\n"
-
-#: git.c:252
-#, c-format
-msgid "-c expects a configuration string\n"
-msgstr "-c espera un string de configuración\n"
-
-#: git.c:260
-#, c-format
-msgid "no config key given for --config-env\n"
-msgstr "no se entregó una llave de config para --config-env\n"
-
-#: git.c:300
-#, c-format
-msgid "no directory given for -C\n"
-msgstr "no se entregó directorio para -C\n"
-
-#: git.c:326
-#, c-format
-msgid "unknown option: %s\n"
-msgstr "opción %s desconocida\n"
-
-#: git.c:375
 #, c-format
-msgid "while expanding alias '%s': '%s'"
-msgstr "al expandir el alias '%s': '%s'"
-
-#: git.c:384
-#, c-format
-msgid ""
-"alias '%s' changes environment variables.\n"
-"You can use '!git' in the alias to do this"
-msgstr ""
-"alias '%s' cambia las variables de entorno.\n"
-"Puedes usar '!git' en el alias para hacer esto"
-
-#: git.c:391
-#, c-format
-msgid "empty alias for %s"
-msgstr "alias vacío para %s"
-
-#: git.c:394
-#, c-format
-msgid "recursive alias: %s"
-msgstr "alias recursivo: %s"
-
-#: git.c:476
-msgid "write failure on standard output"
-msgstr "error de escritura en standard output"
-
-#: git.c:478
-msgid "unknown write failure on standard output"
-msgstr "error desconocido de escritura en standard output"
-
-#: git.c:480
-msgid "close failed on standard output"
-msgstr "cierre falló en standard output"
-
-#: 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:882
-#, c-format
-msgid "cannot handle %s as a builtin"
-msgstr "no se puede manejar %s como un builtin"
-
-#: git.c:895
-#, c-format
-msgid ""
-"usage: %s\n"
-"\n"
-msgstr ""
-"uso: %s\n"
-"\n"
-"\n"
-"\n"
-
-#: 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:927
-#, c-format
-msgid "failed to run command '%s': %s\n"
-msgstr "falló al ejecutar comando '%s': %s\n"
-
-#: http-fetch.c:118
-#, c-format
-msgid "argument to --packfile must be a valid hash (got '%s')"
-msgstr "argumento para --packfile tiene que se un hash válido (se obtuvo '%s')"
-
-#: http-fetch.c:128
-msgid "not a git repository"
-msgstr "no es un repositorio git"
-
-#: http-fetch.c:134
-msgid "--packfile requires --index-pack-args"
-msgstr "--packfile requiere --index-pack-args"
-
-#: http-fetch.c:143
-msgid "--index-pack-args can only be used with --packfile"
-msgstr "--index-pack-args solo se puede usar con --packfile"
-
-#: t/helper/test-fast-rebase.c:141
-msgid "unhandled options"
-msgstr "opciones no manejadas"
-
-#: t/helper/test-fast-rebase.c:146
-msgid "error preparing revisions"
-msgstr "error al preparar revisiones"
-
-#: t/helper/test-reach.c:154
-#, c-format
-msgid "commit %s is not marked reachable"
-msgstr "commit %s no está marcado como alcanzable"
-
-#: t/helper/test-reach.c:164
-msgid "too many commits marked reachable"
-msgstr "demasiados commits marcados como alcanzables"
-
-#: t/helper/test-serve-v2.c:7
-msgid "test-tool serve-v2 [<options>]"
-msgstr "test-tool serve-v2 [<opciones>]"
-
-#: t/helper/test-serve-v2.c:19
-msgid "exit immediately after advertising capabilities"
-msgstr "salir inmediatamente tras anunciar capacidades"
-
-#: 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: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: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: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:585
-msgid "test-helper simple-ipc send         [<name>] [<token>]"
-msgstr "test-helper simple-ipc send         [<nombre>] [<token>]"
-
-#: 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:587
-msgid ""
-"test-helper simple-ipc multiple     [<name>] [<threads>] [<bytecount>] "
-"[<batchsize>]"
-msgstr ""
-"test-helper simple-ipc multiple     [<nombre>] [<hilos>] [<cuenta de bytes>] "
-"[<tamaño de batch>]"
-
-#: 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:597
-msgid "named-pipe name"
-msgstr "nombre de named-pipe"
-
-#: 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: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:602
-msgid "number of bytes"
-msgstr "número de bytes"
-
-#: t/helper/test-simple-ipc.c:603
-msgid "number of requests per thread"
-msgstr "número de peticiones por hilo"
-
-#: t/helper/test-simple-ipc.c:605
-msgid "byte"
-msgstr "byte"
-
-#: t/helper/test-simple-ipc.c:605
-msgid "ballast character"
-msgstr "carácter lastre"
-
-#: t/helper/test-simple-ipc.c:606
-msgid "token"
-msgstr "token"
-
-#: t/helper/test-simple-ipc.c:606
-msgid "command token to send to the server"
-msgstr "token de comando para enviar al servidor"
-
-#: 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: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: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: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:1016
-#, c-format
-msgid "Unsupported SSL backend '%s'. Supported SSL backends:"
-msgstr "Backend SSL no soportado '%s'. Backends SSL soportados:"
+msgid "unrecognized bundle hash algorithm: %s"
+msgstr "algoritmo bundle hash desconocido %s"
 
-#: 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"
+msgid "unknown capability '%s'"
+msgstr "capacidad desconocida '%s'"
 
-#: 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"
+msgid "'%s' does not look like a v2 or v3 bundle file"
+msgstr "'%s' no se ve como un archivo bundle v2 o v3"
 
-#: http.c:1876
 #, c-format
-msgid ""
-"unable to update url base from redirection:\n"
-"  asked for: %s\n"
-"   redirect: %s"
-msgstr ""
-"no se puede actualizar la base de url de la redirección:\n"
-"  preguntaba por: %s\n"
-"   redirección: %s"
+msgid "unrecognized header: %s%s (%d)"
+msgstr "header no reconocido %s%s (%d)"
 
-#: remote-curl.c:183
-#, c-format
-msgid "invalid quoting in push-option value: '%s'"
-msgstr "quoting inválido en valor de push-option: '%s'"
+msgid "Repository lacks these prerequisite commits:"
+msgstr "Al repositorio le faltan estos commits prerrequisitos:"
 
-#: 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?"
+msgid "need a repository to verify a bundle"
+msgstr "se necesita un repositorio para verificar un bundle"
 
-#: 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"
+#, fuzzy, c-format
+msgid "The bundle contains this ref:"
+msgid_plural "The bundle contains these %<PRIuMAX> refs:"
+msgstr[0] "El bundle contiene esta referencia:"
+msgstr[1] "El bundle contiene estas %d referencias:"
 
-#: remote-curl.c:436
-#, c-format
-msgid "invalid server response; got '%s'"
-msgstr "respuesta de servidor inválida; se obtuvo '%s'"
+msgid "The bundle records a complete history."
+msgstr "El bundle registra una historia completa."
 
-#: remote-curl.c:496
-#, c-format
-msgid "repository '%s' not found"
-msgstr "repositorio '%s' no encontrado"
+#, fuzzy, c-format
+msgid "The bundle requires this ref:"
+msgid_plural "The bundle requires these %<PRIuMAX> refs:"
+msgstr[0] "El bundle requiere esta referencia:"
+msgstr[1] "El bundle requiere estas %d referencias:"
 
-#: remote-curl.c:500
-#, c-format
-msgid "Authentication failed for '%s'"
-msgstr "Autenticación falló para '%s'"
+msgid "unable to dup bundle descriptor"
+msgstr "incapaz de duplicar bundle descriptor"
 
-#: 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"
+msgid "Could not spawn pack-objects"
+msgstr "No se pudo ejecutar pack-objects"
 
-#: remote-curl.c:508
-#, c-format
-msgid "unable to access '%s': %s"
-msgstr "no es posible acceder a '%s': %s"
+msgid "pack-objects died"
+msgstr "pack-objects murió"
 
-#: remote-curl.c:514
 #, c-format
-msgid "redirecting to %s"
-msgstr "redirigiendo a %s"
-
-#: 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:657
-msgid "remote server sent unexpected response end packet"
-msgstr "el servidor remoto envió una respuesta de fin de paquete inesperada"
-
-#: remote-curl.c:726
-msgid "unable to rewind rpc post data - try increasing http.postBuffer"
-msgstr ""
-"no es posible rebobinar rpc post data - intenta incrementar http.postBuffer"
+msgid "ref '%s' is excluded by the rev-list options"
+msgstr "referencia '%s' es excluida por las opciones de rev-list"
 
-#: 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:757
-msgid "remote-curl: unexpected response end packet"
-msgstr "remote-curl: packet de respuesta final inesperado"
+msgid "unsupported bundle version %d"
+msgstr "versión de bundle no soportada %d"
 
-#: remote-curl.c:833
 #, c-format
-msgid "RPC failed; %s"
-msgstr "RPC falló; %s"
+msgid "cannot write bundle version %d with algorithm %s"
+msgstr "no se puede escribir la versión de paquete %d con el algoritmo %s"
 
-#: remote-curl.c:873
-msgid "cannot handle pushes this big"
-msgstr "no se puede manejar pushes tan grandes"
+msgid "Refusing to create empty bundle."
+msgstr "Rechazando crear un bundle vacío."
 
-#: 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"
+msgid "cannot create '%s'"
+msgstr "no se puede crear '%s'"
 
-#: 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"
+msgid "index-pack died"
+msgstr "index-pack murió"
 
-#: remote-curl.c:1040
-#, c-format
-msgid "%d bytes of length header were received"
-msgstr "%d bytes de header de longitud fueron recibidos"
+msgid "terminating chunk id appears earlier than expected"
+msgstr "terminando porque el id del fragmento aparece antes de lo esperado"
 
-#: 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:1131
-msgid "dumb http transport does not support shallow capabilities"
-msgstr "dump http transport no soporta capacidades superficiales"
-
-#: remote-curl.c:1146
-msgid "fetch failed."
-msgstr "fetch falló."
-
-#: remote-curl.c:1192
-msgid "cannot fetch by sha1 over smart http"
-msgstr "no se puede hacer fetch por sha1 sobre smart http"
+msgid "improper chunk offset(s) %<PRIx64> and %<PRIx64>"
+msgstr "offsets de fragmento incorrectos %<PRIx64> y %<PRIx64>"
 
-#: 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'"
+msgid "duplicate chunk ID %<PRIx32> found"
+msgstr "se encontró ID de fragmento %<PRIx32> duplicado"
 
-#: 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:1290
-msgid "git-http-push failed"
-msgstr "git-http-push falló"
-
-#: 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:1510
-msgid "remote-curl: error reading command stream from git"
-msgstr "remote-curl: error al leer command stream de git"
+msgid "final chunk has non-zero id %<PRIx32>"
+msgstr "el fragmento final tiene un id no cero %<PRIx32>"
 
-#: remote-curl.c:1517
-msgid "remote-curl: fetch attempted without a local repo"
-msgstr "remote-curl: fetch intentado sin un repositorio local"
+msgid "invalid hash version"
+msgstr "versión de hash inválida"
 
-#: remote-curl.c:1558
 #, c-format
-msgid "remote-curl: unknown command '%s' from git"
-msgstr "remote-curl: comando '%s' desconocido de git"
-
-#: compat/compiler.h:26
-msgid "no compiler information available\n"
-msgstr "no hay información disponible del compilador\n"
-
-#: compat/compiler.h:38
-msgid "no libc information available\n"
-msgstr "no hay información disponible de libc\n"
-
-#: list-objects-filter-options.h:94
-msgid "args"
-msgstr "args"
-
-#: list-objects-filter-options.h:95
-msgid "object filtering"
-msgstr "filtrado de objeto"
-
-#: parse-options.h:183
-msgid "expiry-date"
-msgstr "fecha de caducidad"
-
-#: parse-options.h:197
-msgid "no-op (backward compatibility)"
-msgstr "no-op (compatibilidad con versiones anteriores)"
-
-#: parse-options.h:309
-msgid "be more verbose"
-msgstr "ser más verboso"
-
-#: parse-options.h:311
-msgid "be more quiet"
-msgstr "ser más callado"
-
-#: parse-options.h:317
-msgid "use <n> digits to display object names"
-msgstr "usar <n> cifras para mostrar los nombres de los objetos"
-
-#: 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:337
-msgid "read pathspec from file"
-msgstr "leer pathspec de archivo"
-
-#: 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 carácter "
-"NUL"
-
-#: ref-filter.h:101
-msgid "key"
-msgstr "clave"
-
-#: ref-filter.h:101
-msgid "field name to sort on"
-msgstr "nombre del campo por el cuál ordenar"
-
-#: rerere.h:44
-msgid "update the index with reused conflict resolution if possible"
-msgstr ""
-"actualizar el índice con la resolución de conflictos reutilizada si es "
-"posible"
+msgid "invalid color value: %.*s"
+msgstr "color inválido: %.*s"
 
-#: command-list.h:50
 msgid "Add file contents to the index"
 msgstr "Agregar contenido de archivos al índice"
 
-#: command-list.h:51
 msgid "Apply a series of patches from a mailbox"
 msgstr "Aplicar una serie de parches de un mailbox"
 
-#: command-list.h:52
 msgid "Annotate file lines with commit information"
 msgstr "Anotar líneas de archivo con información de commit"
 
-#: command-list.h:53
 msgid "Apply a patch to files and/or to the index"
 msgstr "Aplicar un parche a archivos y/o al índice"
 
-#: command-list.h:54
 msgid "Import a GNU Arch repository into Git"
 msgstr "Importar un repositorio GNU Arch en Git"
 
-#: command-list.h:55
 msgid "Create an archive of files from a named tree"
 msgstr "Crear una crónica de archivos de un árbol nombrado"
 
-#: command-list.h:56
 msgid "Use binary search to find the commit that introduced a 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"
 msgstr ""
 "Mostrar qué revisión y autor modificaron al último cada línea de un archivo"
 
-#: command-list.h:58
 msgid "List, create, or delete branches"
 msgstr "Listar, crear, o borrar ramas"
 
-#: command-list.h:59
 msgid "Collect information for user to file a bug report"
 msgstr "Recolectar información para el usuario para generar un reporte de bug"
 
-#: command-list.h:60
 msgid "Move objects and refs by archive"
 msgstr "Mover objetos y referencias por crónica"
 
-#: command-list.h:61
 msgid "Provide content or type and size information for repository objects"
 msgstr ""
 "Proveer contenido o información de tipo y tamaño de los objetos de "
 "repositorio"
 
-#: command-list.h:62
 msgid "Display gitattributes information"
 msgstr "Mostrar información de gitattributes"
 
-#: command-list.h:63
 msgid "Debug gitignore / exclude files"
 msgstr "Debug a gitignore / archivos de exclusión"
 
-#: command-list.h:64
 msgid "Show canonical names and email addresses of contacts"
 msgstr ""
 "Mostrar nombres canónicos y direcciones de correo electrónico de contactos"
 
-#: command-list.h:65
+msgid "Ensures that a reference name is well formed"
+msgstr "Asegurar que un nombre de referencia esté bien formado"
+
 msgid "Switch branches or restore working tree files"
 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"
 msgstr "Copiar archivos del índice al árbol de trabajo"
 
-#: command-list.h:67
-msgid "Ensures that a reference name is well formed"
-msgstr "Asegurar que un nombre de referencia esté bien formado"
-
-#: command-list.h:68
 msgid "Find commits yet to be applied to upstream"
 msgstr "Encontrar commits que falten aplicar en upstream"
 
-#: command-list.h:69
 msgid "Apply the changes introduced by some existing commits"
 msgstr "Aplicar los cambios introducidos por algunos commits existentes"
 
-#: command-list.h:70
 msgid "Graphical alternative to git-commit"
 msgstr "Opción gráfica a git-commit"
 
-#: command-list.h:71
 msgid "Remove untracked files from the working tree"
 msgstr "Quitar archivos no rastreados del árbol de trabajo"
 
-#: command-list.h:72
 msgid "Clone a repository into a new directory"
 msgstr "Clonar un repositorio dentro de un nuevo directorio"
 
-#: command-list.h:73
 msgid "Display data in columns"
 msgstr "Mostrar data en columnas"
 
-#: command-list.h:74
 msgid "Record changes to the repository"
 msgstr "Grabar los cambios al repositorio"
 
-#: command-list.h:75
 msgid "Write and verify Git commit-graph files"
 msgstr "Escribir y verificar los archivos commit-graph de Git"
 
-#: command-list.h:76
 msgid "Create a new commit object"
 msgstr "Crear un nuevo objeto commit"
 
-#: command-list.h:77
 msgid "Get and set repository or global options"
 msgstr "Configurar repositorio u opciones globales"
 
-#: command-list.h:78
 msgid "Count unpacked number of objects and their disk consumption"
 msgstr "Contar número de objetos no empaquetados y su consumo en disco"
 
-#: command-list.h:79
 msgid "Retrieve and store user credentials"
 msgstr "Obtener y guardar credenciales de usuario"
 
-#: command-list.h:80
 msgid "Helper to temporarily store passwords in memory"
 msgstr "Auxiliar para almacenar temporalmente contraseñas en memoria"
 
-#: command-list.h:81
 msgid "Helper to store credentials on disk"
 msgstr "Auxiliar para guardar credenciales en disco"
 
-#: command-list.h:82
 msgid "Export a single commit to 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 "Salvar tus datos de otro SCM que la gente adora odiar"
 
-#: command-list.h:84
 msgid "A CVS server emulator for Git"
 msgstr "Un emulador de servidor de CVS para Git"
 
-#: command-list.h:85
 msgid "A really simple server for Git repositories"
 msgstr "Un servidor realmente simple para repositorios Git"
 
-#: command-list.h:86
 msgid "Give an object a human readable name based on an available ref"
 msgstr ""
 "Dar a un objeto un nombre legible por humanos basado en una referencia "
 "disponible"
 
-#: command-list.h:87
 msgid "Show changes between commits, commit and working tree, 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 "Comparar archivos del árbol de trabajo y del índice"
 
-#: command-list.h:89
 msgid "Compare a tree to the working tree or index"
 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 ""
 "Comparar el contenido y el modo de blobs encontrados a través de dos objetos "
 "de árbol"
 
-#: command-list.h:91
 msgid "Show changes using common diff tools"
 msgstr "Mostrar cambios usando herramientas de diff comunes"
 
-#: command-list.h:92
 msgid "Git data exporter"
 msgstr "Exportador de data Git"
 
-#: command-list.h:93
 msgid "Backend for fast Git data importers"
 msgstr "Backend para importadores de data de Git rápidos"
 
-#: command-list.h:94
 msgid "Download objects and refs from another repository"
 msgstr "Descargar objetos y referencias de otro repositorio"
 
-#: command-list.h:95
 msgid "Receive missing objects from another repository"
 msgstr "Descargar objetos faltantes de otro repositorio"
 
-#: command-list.h:96
 msgid "Rewrite branches"
 msgstr "Reescribir ramas"
 
-#: command-list.h:97
 msgid "Produce a merge commit message"
 msgstr "Producir un mensaje de commit de fusión"
 
-#: command-list.h:98
 msgid "Output information on each ref"
 msgstr "Información de output en cada ref"
 
-#: command-list.h:99
 msgid "Run a Git command on a list of repositories"
 msgstr "Ejecutar un comando de Git en una lista de repositorios"
 
-#: command-list.h:100
 msgid "Prepare patches for e-mail submission"
 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 ""
 "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 "Limpiar archivos innecesarios y optimiza el repositorio local"
 
-#: command-list.h:103
 msgid "Extract commit ID from an archive created using 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 "Imprimir las líneas que concuerden con el patrón"
 
-#: command-list.h:105
 msgid "A portable graphical interface to Git"
 msgstr "Una interfaz gráfica portátil para Git"
 
-#: command-list.h:106
 msgid "Compute object ID and optionally creates a blob from a file"
 msgstr "Computar ID de objeto y, opcionalmente, crear un blob de un archivo"
 
-#: command-list.h:107
 msgid "Display help information about Git"
 msgstr "Mostrar información de ayuda sobre Git"
 
-#: command-list.h:108
+msgid "Run git hooks"
+msgstr ""
+
 msgid "Server side implementation of Git over HTTP"
 msgstr "Implementación de lado de servidor de Git por HTTP"
 
-#: command-list.h:109
 msgid "Download from a remote Git repository via 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 "Empujar objetos por HTTP/DAV a otro repositorio"
 
-#: command-list.h:111
 msgid "Send a collection of patches from stdin to an IMAP folder"
 msgstr "Enviar una colección de parches de stdin a una carpeta IMAP"
 
-#: command-list.h:112
 msgid "Build pack index file for an existing packed archive"
 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 "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"
 msgstr "Navegar instantáneamente tu repositorio de trabajo en gitweb"
 
-#: command-list.h:115
 msgid "Add or parse structured information in commit messages"
 msgstr "Agregar o analizar información estructurada en mensajes de commit"
 
-#: command-list.h:116
-msgid "The Git repository browser"
-msgstr "El navegador de repositorio Git"
-
-#: command-list.h:117
 msgid "Show commit logs"
 msgstr "Mostrar los logs de los commits"
 
-#: command-list.h:118
 msgid "Show information about files in the index and the working tree"
 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 "Listar referencias en un repositorio remoto"
 
-#: command-list.h:120
 msgid "List the contents of a tree object"
 msgstr "Listar los contenidos de un objeto árbol"
 
-#: command-list.h:121
 msgid "Extracts patch and authorship from a single e-mail message"
 msgstr "Extraer parche y autoría de un único mensaje de e-mail"
 
-#: command-list.h:122
 msgid "Simple UNIX mbox splitter program"
 msgstr "Programa divisor de mbox simple de UNIX"
 
-#: command-list.h:123
 msgid "Run tasks to optimize Git repository data"
 msgstr "Ejecutar tareas para optimizar los datos del repositorio de Git"
 
-#: command-list.h:124
 msgid "Join two or more development histories together"
 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 "Encontrar ancestros tan buenos como posible para una fusión"
 
-#: command-list.h:126
 msgid "Run a three-way file merge"
 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 "Ejecutar una fusión para archivos que la necesiten"
 
-#: command-list.h:128
 msgid "The standard helper program to use with git-merge-index"
 msgstr "El programa de ayuda estándar para usar con git-merge-index"
 
-#: command-list.h:129
+msgid "Show three-way merge without touching index"
+msgstr "Mostrar fusión de tres vías sin tocar el índice"
+
 msgid "Run merge conflict resolution tools to resolve merge conflicts"
 msgstr ""
 "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"
-msgstr "Mostrar fusión de tres vías sin tocar el índice"
-
-#: command-list.h:131
-msgid "Write and verify multi-pack-indexes"
-msgstr "Escribir y verificar archivos multi-pack-index"
-
-#: command-list.h:132
 msgid "Creates a tag object with extra validation"
 msgstr "Crear un objeto de etiqueta con validación adicional"
 
-#: command-list.h:133
 msgid "Build a tree-object from ls-tree formatted text"
 msgstr "Construir un objeto árbol de un texto en formato ls-tree"
 
-#: command-list.h:134
+msgid "Write and verify multi-pack-indexes"
+msgstr "Escribir y verificar archivos multi-pack-index"
+
 msgid "Move or rename a file, a directory, or a symlink"
 msgstr "Mover o cambiar el nombre a archivos, directorios o enlaces simbólicos"
 
-#: command-list.h:135
 msgid "Find symbolic names for given revs"
 msgstr "Encontrar nombres simbólicos para revs dados"
 
-#: command-list.h:136
 msgid "Add or inspect object notes"
 msgstr "Agregar o inspeccionar notas de objeto"
 
-#: command-list.h:137
 msgid "Import from and submit to Perforce repositories"
 msgstr "Importar desde y enviar a repositorios Perforce"
 
-#: command-list.h:138
 msgid "Create a packed archive of objects"
 msgstr "Crear una crónica de objetos empaquetada"
 
-#: command-list.h:139
 msgid "Find redundant pack files"
 msgstr "Encontrar archivos de paquete redundantes"
 
-#: command-list.h:140
 msgid "Pack heads and tags for efficient repository access"
 msgstr "Empaquetar heads y tags para un acceso eficiente al repositorio"
 
-#: command-list.h:141
 msgid "Compute unique ID for a patch"
 msgstr "Calcular ID único para un parche"
 
-#: command-list.h:142
 msgid "Prune all unreachable objects from the object database"
 msgstr ""
-"Limpiar todos los objetos no alcanzables de la base de datos de objetos"
+"Recortar 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"
 msgstr "Quitar objetos extras que ya estén en archivos empaquetados"
 
-#: command-list.h:144
 msgid "Fetch from and integrate with another repository or a local branch"
 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 "Actualizar referencias remotas junto con sus objetos asociados"
 
-#: command-list.h:146
 msgid "Applies a quilt patchset onto the current branch"
 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 "Comparar dos rangos de commits (por ejemplo dos versions de un branch)"
 
-#: command-list.h:148
 msgid "Reads tree information into the index"
 msgstr "Leer información del árbol al índice"
 
-#: command-list.h:149
 msgid "Reapply commits on top of another base tip"
 msgstr "Volver a aplicar commits en la punta de otra rama"
 
-#: command-list.h:150
 msgid "Receive what is pushed into the repository"
 msgstr "Recibir lo que es empujado en el respositorio"
 
-#: command-list.h:151
 msgid "Manage reflog information"
 msgstr "Gestionar información de reflog"
 
-#: command-list.h:152
 msgid "Manage set of tracked repositories"
 msgstr "Gestionar un conjunto de repositorios rastreados"
 
-#: command-list.h:153
 msgid "Pack unpacked objects in a repository"
 msgstr "Empaquetar objetos no empaquetados en un repositorio"
 
-#: command-list.h:154
 msgid "Create, list, delete refs to replace objects"
 msgstr "Crear, listar, borrar referencias para reemplazar objetos"
 
-#: command-list.h:155
 msgid "Generates a summary of pending changes"
 msgstr "Generar un resumen de cambios pendientes"
 
-#: command-list.h:156
 msgid "Reuse recorded resolution of conflicted merges"
 msgstr "Reutilizar la resolución registrada de fusiones conflictivas"
 
-#: command-list.h:157
 msgid "Reset current HEAD to the specified state"
 msgstr "Reiniciar el HEAD actual a un estado específico"
 
-#: command-list.h:158
 msgid "Restore working tree files"
 msgstr "Restaurar archivos del árbol de trabajo"
 
-#: command-list.h:159
-msgid "Revert some existing commits"
-msgstr "Reviertir algunos commits existentes"
-
-#: command-list.h:160
 msgid "Lists commit objects in reverse chronological order"
 msgstr "Listar objetos commit en orden cronológico inverso"
 
-#: command-list.h:161
 msgid "Pick out and massage parameters"
 msgstr "Seleccionar y masajear los parámetros"
 
-#: command-list.h:162
+msgid "Revert some existing commits"
+msgstr "Reviertir algunos commits existentes"
+
 msgid "Remove files from the working tree and from the index"
 msgstr "Borrar archivos del árbol de trabajo y del índice"
 
-#: command-list.h:163
 msgid "Send a collection of patches as emails"
 msgstr "Enviar una colección de parches como e-mails"
 
-#: command-list.h:164
 msgid "Push objects over Git protocol to another repository"
 msgstr "Empujar objetos por protocolo Git a otro repositorio"
 
-#: command-list.h:165
+msgid "Git's i18n setup code for shell scripts"
+msgstr "El código de configuración i18n de Git para scripts de shell"
+
+msgid "Common Git shell script setup code"
+msgstr "Código común de configuración de script de shell de Git"
+
 msgid "Restricted login shell for Git-only SSH access"
 msgstr "Shell de inicio de sesión restringido para acceso SSH exclusivo de Git"
 
-#: command-list.h:166
 msgid "Summarize 'git log' output"
 msgstr "Resumir la salida de 'git log'"
 
-#: command-list.h:167
 msgid "Show various types of objects"
 msgstr "Mostrar varios tipos de objetos"
 
-#: command-list.h:168
 msgid "Show branches and their commits"
 msgstr "Mostrar ramas y sus commits"
 
-#: command-list.h:169
 msgid "Show packed archive index"
 msgstr "Mostrar el índice de crónica empaquetado"
 
-#: command-list.h:170
 msgid "List references in a local repository"
 msgstr "Listar referencias en el repositorio local"
 
-#: command-list.h:171
-msgid "Git's i18n setup code for shell scripts"
-msgstr "El código de configuración i18n de Git para scripts de shell"
-
-#: command-list.h:172
-msgid "Common Git shell script setup code"
-msgstr "Código común de configuración de script de shell de Git"
+#, fuzzy
+msgid "Reduce your working tree to a subset of tracked files"
+msgstr " (usa la opción -u para mostrar los archivos sin seguimiento)"
 
-#: command-list.h:173
-msgid "Initialize and modify the sparse-checkout"
-msgstr "Inicializar y modificar el sparse-checkout"
+msgid "Add file contents to the staging area"
+msgstr "Agregar contenidos de un archivo al área de staging"
 
-#: command-list.h:174
 msgid "Stash the changes in a dirty working directory away"
 msgstr "Poner en un stash los cambios en un directorio de trabajo sucio"
 
-#: command-list.h:175
-msgid "Add file contents to the staging area"
-msgstr "Agregar contenidos de un archivo al área de staging"
-
-#: command-list.h:176
 msgid "Show the working tree status"
 msgstr "Mostrar el estado del árbol de trabajo"
 
-#: command-list.h:177
 msgid "Remove unnecessary whitespace"
 msgstr "Eliminar el espacio en blanco innecesario"
 
-#: command-list.h:178
 msgid "Initialize, update or inspect submodules"
 msgstr "Inicializar, actualizar o inspeccionar submódulos"
 
-#: command-list.h:179
 msgid "Bidirectional operation between a Subversion repository and Git"
 msgstr "Operación bidireccional entre un repositorio Subversion y Git"
 
-#: command-list.h:180
 msgid "Switch branches"
 msgstr "Cambiar de branch"
 
-#: command-list.h:181
 msgid "Read, modify and delete symbolic refs"
 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 "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 "Crear un archivo temporal con contenidos de un blob"
 
-#: command-list.h:184
 msgid "Unpack objects from a packed archive"
 msgstr "Desempaquetar objetos de una crónica empaquetada"
 
-#: command-list.h:185
 msgid "Register file contents in the working tree to the index"
 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 ""
 "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 ""
 "Actualizar el archivo de información auxiliar para ayudar a los servidores "
 "dumb"
 
-#: command-list.h:188
 msgid "Send archive back to git-archive"
 msgstr "Enviar crónica de vuelta a git-archive"
 
-#: command-list.h:189
 msgid "Send objects packed back to git-fetch-pack"
 msgstr "Enviar objetos empaquetados a git-fetch-pack"
 
-#: command-list.h:190
 msgid "Show a Git logical variable"
 msgstr "Mostrar una variable lógica de Git"
 
-#: command-list.h:191
 msgid "Check the GPG signature of commits"
 msgstr "Verificar firma GPG de commits"
 
-#: command-list.h:192
 msgid "Validate packed Git archive files"
 msgstr "Validar crónicas Git empaquetadas"
 
-#: command-list.h:193
 msgid "Check the GPG signature of tags"
 msgstr "Verificar la firma GPG de etiquetas"
 
-#: command-list.h:194
-msgid "Git web interface (web frontend to Git repositories)"
-msgstr "Interfaz web Git (interfaz web para repositorios Git)"
-
-#: command-list.h:195
 msgid "Show logs with difference each commit introduces"
 msgstr "Mostrar logs con las diferencias que cada commit introduce"
 
-#: command-list.h:196
 msgid "Manage multiple working trees"
 msgstr "Gestionar múltiples árboles de trabajo"
 
-#: command-list.h:197
 msgid "Create a tree object from the current index"
 msgstr "Crear un objeto árbol del índice actual"
 
-#: command-list.h:198
 msgid "Defining attributes per path"
 msgstr "Definir atributos por ruta"
 
-#: command-list.h:199
 msgid "Git command-line interface and conventions"
 msgstr "Interfaz y convenciones de línea de comandos de Git"
 
-#: command-list.h:200
 msgid "A Git core tutorial for developers"
 msgstr "Un tutorial básico de Git para desarrolladores"
 
-#: command-list.h:201
 msgid "Providing usernames and passwords to Git"
 msgstr "Proporcionar nombres de usuario y contraseñas a Git"
 
-#: command-list.h:202
 msgid "Git for CVS users"
 msgstr "Git para usuarios de CVS"
 
-#: command-list.h:203
 msgid "Tweaking diff output"
 msgstr "Afinar la salida de diff"
 
-#: command-list.h:204
 msgid "A useful minimum set of commands for Everyday Git"
 msgstr "Un conjunto mínimo útil de comandos cotidianos de Git"
 
-#: command-list.h:205
 msgid "Frequently asked questions about using Git"
 msgstr "Preguntas frecuentes sobre el uso de Git"
 
-#: command-list.h:206
 msgid "A Git Glossary"
 msgstr "Un Glosario de Git"
 
-#: command-list.h:207
 msgid "Hooks used by Git"
 msgstr "Hooks utilizados por Git"
 
-#: command-list.h:208
 msgid "Specifies intentionally untracked files to ignore"
 msgstr "Especificar de forma intencional archivos sin seguimiento a ignorar"
 
-#: command-list.h:209
+msgid "The Git repository browser"
+msgstr "El navegador de repositorio Git"
+
 msgid "Map author/committer names and/or E-Mail addresses"
 msgstr ""
 "Mapear nombres de autor/ nombre de commiter y/o direcciones de correo "
 "electrónico"
 
-#: command-list.h:210
 msgid "Defining submodule properties"
 msgstr "Definir las propiedades de submódulo"
 
-#: command-list.h:211
 msgid "Git namespaces"
 msgstr "Namespaces de Git"
 
-#: command-list.h:212
 msgid "Helper programs to interact with remote repositories"
 msgstr "Programas de ayuda para interactuar con repositorios remotos"
 
-#: command-list.h:213
 msgid "Git Repository Layout"
 msgstr "Disposición del repositorio Git"
 
-#: command-list.h:214
 msgid "Specifying revisions and ranges for Git"
 msgstr "Especificar revisiones y rangos para Git"
 
-#: command-list.h:215
 msgid "Mounting one repository inside another"
 msgstr "Montar un repositorio dentro de otro"
 
-#: command-list.h:216
+msgid "A tutorial introduction to Git"
+msgstr "Un tutorial de introducción a Git"
+
 msgid "A tutorial introduction to Git: part two"
 msgstr "Un tutorial de introducción a Git: parte dos"
 
-#: command-list.h:217
-msgid "A tutorial introduction to Git"
-msgstr "Un tutorial de introducción a Git"
+msgid "Git web interface (web frontend to Git repositories)"
+msgstr "Interfaz web Git (interfaz web para repositorios Git)"
 
-#: command-list.h:218
 msgid "An overview of recommended workflows with Git"
 msgstr "Una visión general de flujos de trabajo recomendados con Git"
 
-#: git-merge-octopus.sh:46
+msgid "commit-graph file is too small"
+msgstr "archivo commit-graph es demasiado pequeño"
+
+#, c-format
+msgid "commit-graph signature %X does not match signature %X"
+msgstr "firma %X en commit-graph no concuerda con firma %X"
+
+#, c-format
+msgid "commit-graph version %X does not match version %X"
+msgstr "versión de commit-graph %X no concuerda con versión %X"
+
+#, c-format
+msgid "commit-graph hash version %X does not match version %X"
+msgstr "versión de hash de commit-graph %X no concuerda con versión %X"
+
+#, c-format
+msgid "commit-graph file is too small to hold %u chunks"
+msgstr "commit-graph file es demasiado pequeño para almacenar %u fragmentos"
+
+msgid "commit-graph has no base graphs chunk"
+msgstr "commit-graph no tiene un fragmento de graphs de base"
+
+msgid "commit-graph chain does not match"
+msgstr "cadena commit-graph no concuerda"
+
+#, c-format
+msgid "invalid commit-graph chain: line '%s' not a hash"
+msgstr "cadena de commit-graph inválida: línea '%s' no es un hash"
+
+msgid "unable to find all commit-graph files"
+msgstr "no es posible encontrar los archivos commit-graph"
+
+msgid "invalid commit position. commit-graph is likely corrupt"
+msgstr "posición de commit inválida. commit-graph está probablemente corrupto"
+
+#, c-format
+msgid "could not find commit %s"
+msgstr "no se pudo encontrar commit %s"
+
+msgid "commit-graph requires overflow generation data but has none"
+msgstr ""
+"commit-graph requiere datos de generación de desbordamiento pero no tiene "
+"ninguno"
+
+msgid "Loading known commits in commit graph"
+msgstr "Cargando commits conocidos en commit graph"
+
+msgid "Expanding reachable commits in commit graph"
+msgstr "Expandiendo commits alcanzables en commit graph"
+
+msgid "Clearing commit marks in commit graph"
+msgstr "Limpiando marcas de commits en commit graph"
+
+msgid "Computing commit graph topological levels"
+msgstr "Calculando niveles topológicos de commit graph"
+
+msgid "Computing commit graph generation numbers"
+msgstr "Calculando números de generación de commit graph"
+
+msgid "Computing commit changed paths Bloom filters"
+msgstr "Calculando números de generación de commit graph"
+
+msgid "Collecting referenced commits"
+msgstr "Recolectando commits referenciados"
+
+#, fuzzy, c-format
+msgid "Finding commits for commit graph in %<PRIuMAX> pack"
+msgid_plural "Finding commits for commit graph in %<PRIuMAX> packs"
+msgstr[0] "Encontrando commits para commit graph en %d pack"
+msgstr[1] "Encontrando commits para commit graph en %d packs"
+
+#, c-format
+msgid "error adding pack %s"
+msgstr "error al agregar pack %s"
+
+#, c-format
+msgid "error opening index for %s"
+msgstr "error al abrir index para %s"
+
+msgid "Finding commits for commit graph among packed objects"
+msgstr "Encontrando commits para commit graph entre los objetos empaquetados"
+
+msgid "Finding extra edges in commit graph"
+msgstr "Encontrando esquinas extra en commit graph"
+
+msgid "failed to write correct number of base graph ids"
+msgstr "falló al escribir el número correcto de ids de base graph"
+
+msgid "unable to create temporary graph layer"
+msgstr "no es posible crear una capa de gráfico temporal"
+
+#, c-format
+msgid "unable to adjust shared permissions for '%s'"
+msgstr "no se pudo poner permisos compartidos a '%s'"
+
+#, 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"
+
+msgid "unable to open commit-graph chain file"
+msgstr "no se pudo abrir la cadena de archivos commit-graph"
+
+msgid "failed to rename base commit-graph file"
+msgstr "no se pudo renombrar el archivo base commit-graph"
+
+msgid "failed to rename temporary commit-graph file"
+msgstr "falló al renombrar el archivo temporal commit-graph"
+
+msgid "Scanning merged commits"
+msgstr "Escaneando commits fusionados"
+
+msgid "Merging commit-graph"
+msgstr "Fusionando commit-graph"
+
+msgid "attempting to write a commit-graph, but 'core.commitGraph' is disabled"
+msgstr ""
+"intentando escribir un commit-graph, pero 'core.commitGraph' está "
+"deshabilitado"
+
+msgid "too many commits to write graph"
+msgstr "demasiados commits para escribir el gráfico"
+
+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"
+
+#, c-format
+msgid "commit-graph has incorrect OID order: %s then %s"
+msgstr "commit-graph tiene un orden de OID incorrecto: %s luego %s"
+
+#, 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"
+
+#, c-format
+msgid "failed to parse commit %s from commit-graph"
+msgstr "falló al analizar commit %s para commit-graph"
+
+msgid "Verifying commits in commit graph"
+msgstr "Verificando commits en commit graph"
+
+#, 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"
+
+#, 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"
+
+#, 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"
+
+#, c-format
+msgid "commit-graph parent for %s is %s != %s"
+msgstr "padre de commit-graph para %s es %s != %s"
+
+#, c-format
+msgid "commit-graph parent list for commit %s terminates early"
+msgstr "lista de padres de commit-graph para commit %s termina prematuramente"
+
+#, c-format
+msgid ""
+"commit-graph has generation number zero for commit %s, but non-zero elsewhere"
+msgstr ""
+"commit-graph tiene número de generación cero para %s, pero no cero en otro "
+"lugar"
+
+#, c-format
+msgid ""
+"commit-graph has non-zero generation number for commit %s, but zero elsewhere"
+msgstr ""
+"commit-graph tiene número de generación no cero para %s, pero cero en otro "
+"lugar"
+
+#, c-format
+msgid "commit-graph generation for commit %s is %<PRIuMAX> < %<PRIuMAX>"
+msgstr "generación commit-graph para commit %s es %<PRIuMAX> < %<PRIuMAX>"
+
+#, 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>"
+
+#, c-format
+msgid "%s %s is not a commit!"
+msgstr "¡%s %s no es un commit!"
+
+msgid ""
+"Support for <GIT_DIR>/info/grafts is deprecated\n"
+"and will be removed in a future Git version.\n"
+"\n"
+"Please use \"git replace --convert-graft-file\"\n"
+"to convert the grafts into replace refs.\n"
+"\n"
+"Turn this message off by running\n"
+"\"git config advice.graftFileDeprecated false\""
+msgstr ""
+"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 usa \"git replace --convert-graft-file\"\n"
+"para convertir los grafts en refs.\n"
+"\n"
+"Apaga este mensaje ejecutando\n"
+"\"git config advice.graftFileDeprecated false\""
+
+#, 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."
+
+#, c-format
+msgid "Commit %s has a bad GPG signature allegedly by %s."
+msgstr "Commit %s tiene una mala firma GPG pretendidamente por %s."
+
+#, c-format
+msgid "Commit %s does not have a GPG signature."
+msgstr "Commit %s no tiene una firma GPG."
+
+#, 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"
+
+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"
+"variable i18n.commitencoding to the encoding your project uses.\n"
+msgstr ""
+"Peligro: el mensaje del commit no se ajusta a UTF-8.\n"
+"Tal vez quieras enmendarlo después de arreglar el mensaje, o arreglar la\n"
+"variable de configuración i18n.commitencoding para la codificación que use "
+"tu proyecto.\n"
+
+msgid "no compiler information available\n"
+msgstr "no hay información disponible del compilador\n"
+
+msgid "no libc information available\n"
+msgstr "no hay información disponible de libc\n"
+
+#, fuzzy, c-format
+msgid "[GLE %ld] health thread could not open '%ls'"
+msgstr "no se pudo abrir '%s'"
+
+#, c-format
+msgid "[GLE %ld] health thread getting BHFI for '%ls'"
+msgstr ""
+
+#, fuzzy, c-format
+msgid "could not convert to wide characters: '%s'"
+msgstr ""
+"no se pudo convertir el siguiente graft(s):\n"
+"%s"
+
+#, fuzzy, c-format
+msgid "BHFI changed '%ls'"
+msgstr "no se puede cambiar a '%s'"
+
+#, c-format
+msgid "unhandled case in 'has_worktree_moved': %d"
+msgstr ""
+
+#, c-format
+msgid "health thread wait failed [GLE %ld]"
+msgstr ""
+
+#, fuzzy
+msgid "Unable to create FSEventStream."
+msgstr "no es posible crear hilo: %s"
+
+#, fuzzy
+msgid "Failed to start the FSEventStream"
+msgstr "Falló al iniciar emacsclient."
+
+#, c-format
+msgid "[GLE %ld] could not convert path to UTF-8: '%.*ls'"
+msgstr ""
+
+#, fuzzy, c-format
+msgid "[GLE %ld] could not watch '%s'"
+msgstr "no se pudo hacer stat en '%s'"
+
+#, fuzzy, c-format
+msgid "[GLE %ld] could not get longname of '%s'"
+msgstr "no se pudo conseguir 'onto': '%s'"
+
+#, c-format
+msgid "ReadDirectoryChangedW failed on '%s' [GLE %ld]"
+msgstr ""
+
+#, c-format
+msgid "GetOverlappedResult failed on '%s' [GLE %ld]"
+msgstr ""
+
+#, fuzzy, c-format
+msgid "could not read directory changes [GLE %ld]"
+msgstr "no se pudo crear directorios para %s"
+
+#, fuzzy, c-format
+msgid "failed to copy SID (%ld)"
+msgstr "falló al copiar archivo a '%s'"
+
+#, fuzzy, c-format
+msgid "failed to get owner for '%s' (%ld)"
+msgstr "falló al iterar sobre '%s'"
+
+msgid "memory exhausted"
+msgstr "memoria agotada"
+
+msgid "Success"
+msgstr ""
+
+msgid "No match"
+msgstr ""
+
+#, fuzzy
+msgid "Invalid regular expression"
+msgstr "usar expresiones regulares POSIX extendidas"
+
+#, fuzzy
+msgid "Invalid collation character"
+msgstr "carácter lastre"
+
+#, fuzzy
+msgid "Invalid character class name"
+msgstr "carácter inválido en el nombre del host"
+
+msgid "Trailing backslash"
+msgstr ""
+
+#, fuzzy
+msgid "Invalid back reference"
+msgstr "referencia inválida: %s"
+
+msgid "Unmatched [ or [^"
+msgstr ""
+
+msgid "Unmatched ( or \\("
+msgstr ""
+
+msgid "Unmatched \\{"
+msgstr ""
+
+#, fuzzy
+msgid "Invalid content of \\{\\}"
+msgstr "contenido inválido: '%s'"
+
+#, fuzzy
+msgid "Invalid range end"
+msgstr "codificación de transferencia inválida"
+
+#, fuzzy
+msgid "Memory exhausted"
+msgstr "memoria agotada"
+
+#, fuzzy
+msgid "Invalid preceding regular expression"
+msgstr "usar expresiones regulares POSIX extendidas"
+
+#, fuzzy
+msgid "Premature end of regular expression"
+msgstr "usar expresiones regulares POSIX extendidas"
+
+msgid "Regular expression too big"
+msgstr ""
+
+msgid "Unmatched ) or \\)"
+msgstr ""
+
+#, fuzzy
+msgid "No previous regular expression"
+msgstr "usar expresiones regulares compatibles con Perl"
+
+msgid "could not send IPC command"
+msgstr "no se pudo enviar el comando IPC"
+
+msgid "could not read IPC response"
+msgstr "no se pudo leer la respuesta IPC"
+
+#, c-format
+msgid "could not start accept_thread '%s'"
+msgstr "no se pudo iniciar el accept_thread '%s'"
+
+#, c-format
+msgid "could not start worker[0] for '%s'"
+msgstr "no se pudo iniciar el worker[0] para '%s'"
+
+#, fuzzy, c-format
+msgid "ConnectNamedPipe failed for '%s' (%lu)"
+msgstr "uname() falló con error '%s' (%d)\n"
+
+#, fuzzy, c-format
+msgid "could not create fd from pipe for '%s'"
+msgstr "no se pudo crear directorios para %s"
+
+#, fuzzy, c-format
+msgid "could not start thread[0] for '%s'"
+msgstr "no se pudo iniciar el worker[0] para '%s'"
+
+#, fuzzy, c-format
+msgid "wait for hEvent failed for '%s'"
+msgstr "Autenticación falló para '%s'"
+
+msgid "cannot resume in the background, please use 'fg' to resume"
+msgstr ""
+
+#, fuzzy
+msgid "cannot restore terminal settings"
+msgstr "no se puede guardar el archivo índice"
+
+#, c-format
+msgid ""
+"exceeded maximum include depth (%d) while including\n"
+"\t%s\n"
+"from\n"
+"\t%s\n"
+"This might be due to circular includes."
+msgstr ""
+"profundidad máxima de inclusión excedida (%d) mientras se incluía\n"
+"\t%s\n"
+"de\n"
+"\t%s\n"
+"Esto puede ser causado por inclusiones circulares."
+
+#, c-format
+msgid "could not expand include path '%s'"
+msgstr "no se pudo expandir rutas de inclusión '%s'"
+
+msgid "relative config includes must come from files"
+msgstr "inclusiones de configuración relativas tienen que venir de archivos"
+
+msgid "relative config include conditionals must come from files"
+msgstr ""
+"la configuración relativa incluye condicionales que deben venir de archivos"
+
+msgid ""
+"remote URLs cannot be configured in file directly or indirectly included by "
+"includeIf.hasconfig:remote.*.url"
+msgstr ""
+
+#, c-format
+msgid "invalid config format: %s"
+msgstr "formato config inválido: %s"
+
+#, c-format
+msgid "missing environment variable name for configuration '%.*s'"
+msgstr "falta el nombre de la variable de entorno para la configuración '%.*s'"
+
+#, c-format
+msgid "missing environment variable '%s' for configuration '%.*s'"
+msgstr "falta la variable de entorno '%s' para la configuración '%.*s'"
+
+#, c-format
+msgid "key does not contain a section: %s"
+msgstr "llave no contiene una sección: %s"
+
+#, c-format
+msgid "key does not contain variable name: %s"
+msgstr "llave no contiene el nombre de variable: %s"
+
+#, c-format
+msgid "invalid key: %s"
+msgstr "llave inválida: %s"
+
+#, c-format
+msgid "invalid key (newline): %s"
+msgstr "llave inválida (nueva línea): %s"
+
+msgid "empty config key"
+msgstr "clave de config vacía"
+
+#, c-format
+msgid "bogus config parameter: %s"
+msgstr "parámetro de configuración malogrado: %s"
+
+#, c-format
+msgid "bogus format in %s"
+msgstr "formato malogrado en %s"
+
+#, c-format
+msgid "bogus count in %s"
+msgstr "conteo malogrado en %s"
+
+#, c-format
+msgid "too many entries in %s"
+msgstr "demasiadas entradas en %s"
+
+#, c-format
+msgid "missing config key %s"
+msgstr "llave de configuración faltante %s"
+
+#, c-format
+msgid "missing config value %s"
+msgstr "valor de config faltante para %s"
+
+#, c-format
+msgid "bad config line %d in blob %s"
+msgstr "mala línea de config %d en el blob %s"
+
+#, c-format
+msgid "bad config line %d in file %s"
+msgstr "mala línea de config %d en el archivo %s"
+
+#, c-format
+msgid "bad config line %d in standard input"
+msgstr "mala línea de config %d en la entrada standard"
+
+#, c-format
+msgid "bad config line %d in submodule-blob %s"
+msgstr "mala línea de config %d en el submódulo-blob %s"
+
+#, 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"
+
+#, c-format
+msgid "bad config line %d in %s"
+msgstr "mala línea de config %d en %s"
+
+msgid "out of range"
+msgstr "fuera de rango"
+
+msgid "invalid unit"
+msgstr "unidad inválida"
+
+#, c-format
+msgid "bad numeric config value '%s' for '%s': %s"
+msgstr "mal valor de config numérico '%s' para '%s': %s"
+
+#, 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"
+
+#, 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"
+
+#, 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"
+
+#, 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"
+
+#, 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"
+
+#, 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"
+
+#, fuzzy, c-format
+msgid "invalid value for variable %s"
+msgstr "valor inválido para %s"
+
+#, c-format
+msgid "ignoring unknown core.fsync component '%s'"
+msgstr ""
+
+#, c-format
+msgid "bad boolean config value '%s' for '%s'"
+msgstr "mal valor de config booleano '%s' para '%s'"
+
+#, c-format
+msgid "failed to expand user dir in: '%s'"
+msgstr "falló al expandir el directorio de usuario en: '%s'"
+
+#, c-format
+msgid "'%s' for '%s' is not a valid timestamp"
+msgstr "'%s' para '%s' no es una marca de tiempo válida"
+
+#, c-format
+msgid "abbrev length out of range: %d"
+msgstr "largo de abreviatura fuera de rango: %d"
+
+#, c-format
+msgid "bad zlib compression level %d"
+msgstr "nivel de compresión de zlib erróneo %d"
+
+msgid "core.commentChar should only be one character"
+msgstr "core.commentChar debería tener solo un carácter"
+
+#, c-format
+msgid "ignoring unknown core.fsyncMethod value '%s'"
+msgstr ""
+
+msgid "core.fsyncObjectFiles is deprecated; use core.fsync instead"
+msgstr ""
+
+#, c-format
+msgid "invalid mode for object creation: %s"
+msgstr "modo inválido de creación de objetos: %s"
+
+#, c-format
+msgid "malformed value for %s"
+msgstr "valor malformado para %s"
+
+#, c-format
+msgid "malformed value for %s: %s"
+msgstr "valor malformado para %s: %s"
+
+msgid "must be one of nothing, matching, simple, upstream or current"
+msgstr "debe ser uno de nothing, matching, simple, upstream o current"
+
+#, c-format
+msgid "unable to load config blob object '%s'"
+msgstr "incapaz de cargar configuración de objeto blob '%s'"
+
+#, c-format
+msgid "reference '%s' does not point to a blob"
+msgstr "referencia '%s' no apunta a un blob"
+
+#, c-format
+msgid "unable to resolve config blob '%s'"
+msgstr "no es posible resolver configuración de blob '%s'"
+
+#, c-format
+msgid "failed to parse %s"
+msgstr "no se pudo analizar %s"
+
+msgid "unable to parse command-line config"
+msgstr "no es posible analizar la configuración de la línea de comando"
+
+msgid "unknown error occurred while reading the configuration files"
+msgstr ""
+"error desconocido ocurrió mientras se leían los archivos de configuración"
+
+#, c-format
+msgid "Invalid %s: '%s'"
+msgstr "%s inválido: '%s'"
+
+#, c-format
+msgid "splitIndex.maxPercentChange value '%d' should be between 0 and 100"
+msgstr "valor splitIndex.maxPercentChange '%d' debe estar entre 0 y 100"
+
+#, 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"
+
+#, 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"
+
+#, c-format
+msgid "invalid section name '%s'"
+msgstr "nombre de sección inválido '%s'"
+
+#, c-format
+msgid "%s has multiple values"
+msgstr "%s tiene múltiples valores"
+
+#, c-format
+msgid "failed to write new configuration file %s"
+msgstr "falló al escribir nuevo archivo de configuración %s"
+
+#, c-format
+msgid "could not lock config file %s"
+msgstr "no se pudo bloquear archivo de configuración %s"
+
+#, c-format
+msgid "opening %s"
+msgstr "abriendo %s"
+
+#, c-format
+msgid "invalid config file %s"
+msgstr "archivo de configuración inválido: %s"
+
+#, c-format
+msgid "fstat on %s failed"
+msgstr "fstat en %s falló"
+
+#, c-format
+msgid "unable to mmap '%s'%s"
+msgstr "no es posible hacer mmap '%s'%s"
+
+#, c-format
+msgid "chmod on %s failed"
+msgstr "chmod en %s falló"
+
+#, c-format
+msgid "could not write config file %s"
+msgstr "no se pudo escribir el archivo de configuración %s"
+
+#, c-format
+msgid "could not set '%s' to '%s'"
+msgstr "no se pudo configurar '%s' a '%s'"
+
+#, c-format
+msgid "invalid section name: %s"
+msgstr "nombre de sección inválido: %s"
+
+#, c-format
+msgid "missing value for '%s'"
+msgstr "valor faltante para '%s'"
+
+msgid "the remote end hung up upon initial contact"
+msgstr "el remoto se colgó en el contacto inicial"
+
+msgid ""
+"Could not read from remote repository.\n"
+"\n"
+"Please make sure you have the correct access rights\n"
+"and the repository exists."
+msgstr ""
+"No se pudo leer del repositorio remoto.\n"
+"\n"
+"Por favor asegúrate de que tengas los permisos de acceso correctos\n"
+"y que el repositorio exista."
+
+#, c-format
+msgid "server doesn't support '%s'"
+msgstr "servidor no soporta '%s'"
+
+#, c-format
+msgid "server doesn't support feature '%s'"
+msgstr "servidor no soporta feature '%s'"
+
+msgid "expected flush after capabilities"
+msgstr "se espera flush tras capacidades"
+
+#, c-format
+msgid "ignoring capabilities after first line '%s'"
+msgstr "ignorando capacidades tras primera línea '%s'"
+
+msgid "protocol error: unexpected capabilities^{}"
+msgstr "error de protocolo: capacidades imprevistas^{}"
+
+#, c-format
+msgid "protocol error: expected shallow sha-1, got '%s'"
+msgstr "error de protocolo: sha-1 superficial esperado, se obtuvo '%s'"
+
+msgid "repository on the other end cannot be shallow"
+msgstr "el repositorio en el otro lado no puede ser superficial"
+
+msgid "invalid packet"
+msgstr "paquete inválido"
+
+#, c-format
+msgid "protocol error: unexpected '%s'"
+msgstr "error de protocolo: '%s' inesperado"
+
+#, c-format
+msgid "unknown object format '%s' specified by server"
+msgstr "formato de objeto desconocido '%s' ha sido provisto por el servidor"
+
+#, c-format
+msgid "invalid ls-refs response: %s"
+msgstr "respuesta de ls-refs inválida: %s"
+
+msgid "expected flush after ref listing"
+msgstr "flush esperado tras listado de refs"
+
+msgid "expected response end packet after ref listing"
+msgstr "se esperaba un paquete final luego del ref listing"
+
+#, c-format
+msgid "protocol '%s' is not supported"
+msgstr "protocolo '%s' no es soportado"
+
+msgid "unable to set SO_KEEPALIVE on socket"
+msgstr "no es posible configurar SO_KEEPALIVE en el socket"
+
+#, c-format
+msgid "Looking up %s ... "
+msgstr "Revisando %s... "
+
+#, 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 ... "
+#, c-format
+msgid ""
+"done.\n"
+"Connecting to %s (port %s) ... "
+msgstr ""
+"hecho.\n"
+"Conectando a %s (puerto %s) ... "
+
+#, c-format
+msgid ""
+"unable to connect to %s:\n"
+"%s"
+msgstr ""
+"no es posible conectar a %s:\n"
+"%s"
+
+#. TRANSLATORS: this is the end of "Connecting to %s (port %s) ... "
+msgid "done."
+msgstr "hecho."
+
+#, c-format
+msgid "unable to look up %s (%s)"
+msgstr "no es posible revisar %s (%s)"
+
+#, c-format
+msgid "unknown port %s"
+msgstr "puerto desconocido %s"
+
+#, c-format
+msgid "strange hostname '%s' blocked"
+msgstr "hostname extraño '%s' bloqueado"
+
+#, c-format
+msgid "strange port '%s' blocked"
+msgstr "puerto extraño '%s' bloqueado"
+
+#, c-format
+msgid "cannot start proxy %s"
+msgstr "no se puede comenzar proxy %s"
+
+msgid "no path specified; see 'git help pull' for valid url syntax"
+msgstr ""
+"no hay ruta especificada; mira 'git help pull' para sintaxis válida de url"
+
+msgid "newline is forbidden in git:// hosts and repo paths"
+msgstr "la nueva línea está prohibida en git://hosts y rutas de repositorio"
+
+msgid "ssh variant 'simple' does not support -4"
+msgstr "variante 'simple' de ssh no soporta -4"
+
+msgid "ssh variant 'simple' does not support -6"
+msgstr "variante 'simple' de ssh no soporta -6"
+
+msgid "ssh variant 'simple' does not support setting port"
+msgstr "variante ssh 'simple' no soporta configurar puerto"
+
+#, c-format
+msgid "strange pathname '%s' blocked"
+msgstr "ruta extraña '%s' bloqueada"
+
+msgid "unable to fork"
+msgstr "no es posible hacer fork"
+
+msgid "Could not run 'git rev-list'"
+msgstr "No se pudo ejecutar 'git rev-list'"
+
+msgid "failed write to rev-list"
+msgstr "falló escribir a rev-list"
+
+msgid "failed to close rev-list's stdin"
+msgstr "falló al cerrar la entrada standard de rev-list"
+
+#, c-format
+msgid "'%s' does not exist"
+msgstr "'%s' no existe"
+
+#, fuzzy
+msgid "need a working directory"
+msgstr "Incapaz de leer el directorio de trabajo actual"
+
+#, fuzzy
+msgid "could not find enlistment root"
+msgstr "no se pudo encontrar commit %s"
+
+#, fuzzy, c-format
+msgid "could not switch to '%s'"
+msgstr "no se pudo cambiar a %s"
+
+#, fuzzy, c-format
+msgid "could not configure %s=%s"
+msgstr "no se pudo bloquear archivo de configuración %s"
+
+msgid "could not configure log.excludeDecoration"
+msgstr ""
+
+msgid "Scalar enlistments require a worktree"
+msgstr ""
+
+#, c-format
+msgid "could not open directory '%s'"
+msgstr "no se pudo abrir el directorio '%s'"
+
+#, fuzzy, c-format
+msgid "skipping '%s', which is neither file nor directory"
+msgstr "destino '%s' no es un directorio"
+
+#, fuzzy, c-format
+msgid "could not determine free disk size for '%s'"
+msgstr "no se pudo crear un árbol de trabajo '%s'"
+
+#, fuzzy, c-format
+msgid "could not get info for '%s'"
+msgstr "no se pudo leer el log para '%s'"
+
+#, fuzzy, c-format
+msgid "remote HEAD is not a branch: '%.*s'"
+msgstr "  Rama HEAD: %s"
+
+msgid "failed to get default branch name from remote; using local default"
+msgstr ""
+
+#, fuzzy
+msgid "failed to get default branch name"
+msgstr "falló al formatear el valor por defecto de configuración: %s"
+
+#, fuzzy
+msgid "failed to unregister repository"
+msgstr "falló al crear directorio %s"
+
+#, fuzzy
+msgid "failed to delete enlistment directory"
+msgstr "falló al eliminar directorio %s"
+
+msgid "branch to checkout after clone"
+msgstr ""
+
+#, fuzzy
+msgid "when cloning, create full working directory"
+msgstr "no es posible obtener el directorio de trabajo actual"
+
+msgid "only download metadata for the branch that will be checked out"
+msgstr ""
+
+#, fuzzy
+msgid "scalar clone [<options>] [--] <repo> [<dir>]"
+msgstr "git clone [<opciones>] [--] <repo> [<directorio>]"
+
+#, fuzzy, c-format
+msgid "cannot deduce worktree name from '%s'"
+msgstr "No se puede acceder al árbol de trabajo '%s'"
+
+#, c-format
+msgid "directory '%s' exists already"
+msgstr ""
+
+#, fuzzy, c-format
+msgid "failed to get default branch for '%s'"
+msgstr "error al conseguir el remoto por defecto para el submódulo '%s'"
+
+#, fuzzy, c-format
+msgid "could not configure remote in '%s'"
+msgstr "no se pudo crear el archivo '%s'"
+
+#, fuzzy, c-format
+msgid "could not configure '%s'"
+msgstr "no se pudo cerrar '%s'"
+
+msgid "partial clone failed; attempting full clone"
+msgstr ""
+
+#, fuzzy
+msgid "could not configure for full clone"
+msgstr "no se pudo bloquear archivo de configuración %s"
+
+msgid "scalar diagnose [<enlistment>]"
+msgstr ""
+
+#, fuzzy, c-format
+msgid "could not create directory for '%s'"
+msgstr "No se pudo crear el directorio para '%s'"
+
+#, fuzzy
+msgid "could not duplicate stdout"
+msgstr "no se puede actualizar %s"
+
+#, fuzzy
+msgid "failed to write archive"
+msgstr "falló al leer la cache"
+
+#, fuzzy
+msgid "`scalar list` does not take arguments"
+msgstr "%%(rest) no toma ningún argumento"
+
+msgid "scalar register [<enlistment>]"
+msgstr ""
+
+msgid "reconfigure all registered enlistments"
+msgstr ""
+
+msgid "scalar reconfigure [--all | <enlistment>]"
+msgstr ""
+
+msgid "--all or <enlistment>, but not both"
+msgstr ""
+
+#, fuzzy, c-format
+msgid "git repository gone in '%s'"
+msgstr "no es un repositorio git: '%s'"
+
+msgid ""
+"scalar run <task> [<enlistment>]\n"
+"Tasks:\n"
+msgstr ""
+
+#, fuzzy, c-format
+msgid "no such task: '%s'"
+msgstr "no existe tal rama: '%s'"
+
+msgid "scalar unregister [<enlistment>]"
+msgstr ""
+
+msgid "scalar delete <enlistment>"
+msgstr ""
+
+#, fuzzy
+msgid "refusing to delete current working directory"
+msgstr "no es posible obtener el directorio de trabajo actual"
+
+#, fuzzy
+msgid "include Git version"
+msgstr "versión de hash inválida"
+
+msgid "include Git's build options"
+msgstr ""
+
+msgid "scalar verbose [-v | --verbose] [--build-options]"
+msgstr ""
+
+#, fuzzy
+msgid "-C requires a <directory>"
+msgstr "--stdin requiere un repositorio git"
+
+#, fuzzy, c-format
+msgid "could not change to '%s'"
+msgstr "no se puede cambiar a '%s'"
+
+#, fuzzy
+msgid "-c requires a <key>=<value> argument"
+msgstr "-n requiere un argumento"
+
+msgid ""
+"scalar [-C <directory>] [-c <key>=<value>] <command> [<options>]\n"
+"\n"
+"Commands:\n"
+msgstr ""
+
+#, c-format
+msgid "illegal crlf_action %d"
+msgstr "crlf_action %d ilegal"
+
+#, c-format
+msgid "CRLF would be replaced by LF in %s"
+msgstr "CRLF será reemplazado por LF en %s"
+
+#, c-format
+msgid ""
+"in the working copy of '%s', CRLF will be replaced by LF the next time Git "
+"touches it"
+msgstr ""
+
+#, c-format
+msgid "LF would be replaced by CRLF in %s"
+msgstr "LF será reemplazado por CRLF en %s"
+
+#, c-format
+msgid ""
+"in the working copy of '%s', LF will be replaced by CRLF the next time Git "
+"touches it"
+msgstr ""
+
+#, c-format
+msgid "BOM is prohibited in '%s' if encoded as %s"
+msgstr "BOM está prohibido en '%s' si es codificado como %s"
+
+#, c-format
+msgid ""
+"The file '%s' contains a byte order mark (BOM). Please use UTF-%.*s as "
+"working-tree-encoding."
+msgstr ""
+"El archivo '%s' contiene una marca de orden de bytes (BOM). Por favor usa "
+"UTF-%.*s como working-tree-encoding."
+
+#, c-format
+msgid "BOM is required in '%s' if encoded as %s"
+msgstr "BOM es requerido en '%s' si es codificado como %s"
+
+#, 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."
+msgstr ""
+"Al archivo '%s' le falta una marca de orden de bytes (BOM). Por favor usa "
+"UTF-%sBE o UTF-%sLE (dependiendo del orden de bytes) como working-tree-"
+"encoding."
+
+#, c-format
+msgid "failed to encode '%s' from %s to %s"
+msgstr "falló al codificar '%s' de %s a %s"
+
+#, c-format
+msgid "encoding '%s' from %s to %s and back is not the same"
+msgstr "codificación '%s' de %s a %s y de vuelta no son iguales"
+
+#, c-format
+msgid "cannot fork to run external filter '%s'"
+msgstr "no se puede hacer fork para ejecutar filtros externos '%s'"
+
+#, c-format
+msgid "cannot feed the input to external filter '%s'"
+msgstr "no se pueden alimentar de input a los filtros externos '%s'"
+
+#, c-format
+msgid "external filter '%s' failed %d"
+msgstr "filtro externo '%s' falló %d"
+
+#, c-format
+msgid "read from external filter '%s' failed"
+msgstr "lectura de filtro externo '%s' falló"
+
+#, c-format
+msgid "external filter '%s' failed"
+msgstr "filtro externo '%s' falló"
+
+msgid "unexpected filter type"
+msgstr "tipo de filtro inesperado"
+
+msgid "path name too long for external filter"
+msgstr "nombre de ruta demasiado largo para filtro externo"
+
+#, c-format
+msgid ""
+"external filter '%s' is not available anymore although not all paths have "
+"been filtered"
+msgstr ""
+"filtro externo '%s' ya no está disponible aunque no todas las rutas han sido "
+"filtradas"
+
+msgid "true/false are no valid working-tree-encodings"
+msgstr "true/false no son working-tree-encodings válidos"
+
+#, c-format
+msgid "%s: clean filter '%s' failed"
+msgstr "%s: falló al limpiar filtro '%s'"
+
+#, c-format
+msgid "%s: smudge filter %s failed"
+msgstr "%s: filtro smudge %s falló"
+
+#, c-format
+msgid "skipping credential lookup for key: credential.%s"
+msgstr "saltando revisión de credenciales para llave: credential.%s"
+
+msgid "refusing to work with credential missing host field"
+msgstr "rehusando trabajar con campo host faltante en la credencial"
+
+msgid "refusing to work with credential missing protocol field"
+msgstr "rehusando trabajar con campo protocolo faltante en la credencial"
+
+#, c-format
+msgid "url contains a newline in its %s component: %s"
+msgstr "url contiene una nueva línea en su componente %s: %s"
+
+#, c-format
+msgid "url has no scheme: %s"
+msgstr "url no tiene scheme: %s"
+
+#, c-format
+msgid "credential url cannot be parsed: %s"
+msgstr "url de credencial no puede ser analizada: %s"
+
+msgid "in the future"
+msgstr "en el futuro"
+
+#, c-format
+msgid "%<PRIuMAX> second ago"
+msgid_plural "%<PRIuMAX> seconds ago"
+msgstr[0] "hace %<PRIuMAX> segundo"
+msgstr[1] "hace %<PRIuMAX> segundos"
+
+#, c-format
+msgid "%<PRIuMAX> minute ago"
+msgid_plural "%<PRIuMAX> minutes ago"
+msgstr[0] "hace %<PRIuMAX> minuto"
+msgstr[1] "hace %<PRIuMAX> minutos"
+
+#, c-format
+msgid "%<PRIuMAX> hour ago"
+msgid_plural "%<PRIuMAX> hours ago"
+msgstr[0] "hace %<PRIuMAX> hora"
+msgstr[1] "hace %<PRIuMAX> horas"
+
+#, c-format
+msgid "%<PRIuMAX> day ago"
+msgid_plural "%<PRIuMAX> days ago"
+msgstr[0] "hace %<PRIuMAX> día"
+msgstr[1] "hace %<PRIuMAX> días"
+
+#, c-format
+msgid "%<PRIuMAX> week ago"
+msgid_plural "%<PRIuMAX> weeks ago"
+msgstr[0] "hace %<PRIuMAX> semana"
+msgstr[1] "hace %<PRIuMAX> semanas"
+
+#, c-format
+msgid "%<PRIuMAX> month ago"
+msgid_plural "%<PRIuMAX> months ago"
+msgstr[0] "hace %<PRIuMAX> mes"
+msgstr[1] "hace %<PRIuMAX> meses"
+
+#, c-format
+msgid "%<PRIuMAX> year"
+msgid_plural "%<PRIuMAX> years"
+msgstr[0] "%<PRIuMAX> año"
+msgstr[1] "%<PRIuMAX> años"
+
+#. TRANSLATORS: "%s" is "<n> years"
+#, c-format
+msgid "%s, %<PRIuMAX> month ago"
+msgid_plural "%s, %<PRIuMAX> months ago"
+msgstr[0] "%s, y %<PRIuMAX> mes atrás"
+msgstr[1] "%s, y %<PRIuMAX> meses atrás"
+
+#, c-format
+msgid "%<PRIuMAX> year ago"
+msgid_plural "%<PRIuMAX> years ago"
+msgstr[0] "hace %<PRIuMAX> año"
+msgstr[1] "hace %<PRIuMAX> años"
+
+msgid "Propagating island marks"
+msgstr "Propagando marcas isla"
+
+#, c-format
+msgid "bad tree object %s"
+msgstr "mal objeto árbol %s"
+
+#, c-format
+msgid "failed to load island regex for '%s': %s"
+msgstr "falló al cargar regex isla para '%s': %s"
+
+#, c-format
+msgid "island regex from config has too many capture groups (max=%d)"
+msgstr "regex isla de config tiene demasiados grupos de captura (max=%d)"
+
+#, c-format
+msgid "Marked %d islands, done.\n"
+msgstr "%d islas marcadas, listo.\n"
+
+msgid "--merge-base does not work with ranges"
+msgstr "--merge-base no funciona con rangos"
+
+msgid "--merge-base only works with commits"
+msgstr "--merge-base solo funciona con confirmaciones"
+
+msgid "unable to get HEAD"
+msgstr "no es posible obtener HEAD"
+
+msgid "no merge base found"
+msgstr "no se encontró base de fusión"
+
+msgid "multiple merge bases found"
+msgstr "múltiples bases de fusión encontradas"
+
+msgid "git diff --no-index [<options>] <path> <path>"
+msgstr "git diff --no-index [<opciones>] <path> <path>"
+
+msgid ""
+"Not a git repository. Use --no-index to compare two paths outside a working "
+"tree"
+msgstr ""
+"No es un repositorio git. Usa --no-index para comparar dos paths fuera del "
+"árbol de trabajo"
+
+#, c-format
+msgid "  Failed to parse dirstat cut-off percentage '%s'\n"
+msgstr "  Falló al analizar porcentaje de corte de dirstat '%s'\n"
+
+#, c-format
+msgid "  Unknown dirstat parameter '%s'\n"
+msgstr "  Parámetro '%s' de dirstat desconocido\n"
+
+msgid ""
+"color moved setting must be one of 'no', 'default', 'blocks', 'zebra', "
+"'dimmed-zebra', 'plain'"
+msgstr ""
+"opción de color tiene que ser una de 'no', 'default', 'blocks', 'zebra', "
+"'dimmed-zebra', 'plain'"
+
+#, 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 ""
+"modo color-moved-ws desconocido '%s', valores posibles son 'ignore-space-"
+"change', 'ignore-space-at-eol', 'ignore-all-space', 'allow-indentation-"
+"change'"
+
+msgid ""
+"color-moved-ws: allow-indentation-change cannot be combined with other "
+"whitespace modes"
+msgstr ""
+"color-moved-ws: allow-indentation-change no puede ser combinado con otros "
+"modos de espacios en blanco"
+
+#, c-format
+msgid "Unknown value for 'diff.submodule' config variable: '%s'"
+msgstr ""
+"Valor para la variable de configuración 'diff.submodule' desconocido: '%s'"
+
+#, c-format
+msgid ""
+"Found errors in 'diff.dirstat' config variable:\n"
+"%s"
+msgstr ""
+"Errores en la variable de config 'diff.dirstat' encontrados:\n"
+"%s"
+
+#, c-format
+msgid "external diff died, stopping at %s"
+msgstr "diff externo murió, deteniendo en %s"
+
+#, fuzzy, c-format
+msgid "options '%s', '%s', '%s', and '%s' cannot be used together"
+msgstr "Opciones --squash y --fixup no pueden ser usadas juntas"
+
+#, fuzzy, c-format
+msgid "options '%s' and '%s' cannot be used together, use '%s' with '%s'"
+msgstr "'%s' o '%s' no puede ser usado con %s"
+
+#, fuzzy, c-format
+msgid ""
+"options '%s' and '%s' cannot be used together, use '%s' with '%s' and '%s'"
+msgstr "'%s' o '%s' no puede ser usado con %s"
+
+msgid "--follow requires exactly one pathspec"
+msgstr "--follow requiere exactamente un pathspec"
+
+#, c-format
+msgid "invalid --stat value: %s"
+msgstr "valor --stat inválido: %s"
+
+#, c-format
+msgid "%s expects a numerical value"
+msgstr "%s espera un valor numérico"
+
+#, c-format
+msgid ""
+"Failed to parse --dirstat/-X option parameter:\n"
+"%s"
+msgstr ""
+"Falló al analizar parámetro de opción --dirstat/-X:\n"
+"%s"
+
+#, c-format
+msgid "unknown change class '%c' in --diff-filter=%s"
+msgstr "cambio de clase desconocido '%c' en --diff-filter=%s"
+
+#, c-format
+msgid "unknown value after ws-error-highlight=%.*s"
+msgstr "valor desconocido luego de ws-error-highlight=%.*s"
+
+#, c-format
+msgid "unable to resolve '%s'"
+msgstr "no se puede resolver '%s'"
+
+#, c-format
+msgid "%s expects <n>/<m> form"
+msgstr "%s espera forma <n>/<m>"
+
+#, c-format
+msgid "%s expects a character, got '%s'"
+msgstr "%s esperaba un char, se obtuvo '%s'"
+
+#, c-format
+msgid "bad --color-moved argument: %s"
+msgstr "mal argumento --color-moved: %s"
+
+#, c-format
+msgid "invalid mode '%s' in --color-moved-ws"
+msgstr "modo inválido '%s' en --color-moved-ws"
+
+msgid ""
+"option diff-algorithm accepts \"myers\", \"minimal\", \"patience\" and "
+"\"histogram\""
+msgstr ""
+"opción diff-algorithm acepta \"myers\", \"minimal\", \"patience\" e "
+"\"histogram\""
+
+#, c-format
+msgid "invalid argument to %s"
+msgstr "argumento inválido para %s"
+
+#, c-format
+msgid "invalid regex given to -I: '%s'"
+msgstr "regex inválido para -I: '%s'"
+
+#, c-format
+msgid "failed to parse --submodule option parameter: '%s'"
+msgstr "falló al analizar parámetro de opción --submodule: '%s'"
+
+#, c-format
+msgid "bad --word-diff argument: %s"
+msgstr "mal argumento --word-diff: %s"
+
+msgid "Diff output format options"
+msgstr "Opciones de formato de salida para diff"
+
+msgid "generate patch"
+msgstr "generar parche"
+
+msgid "<n>"
+msgstr "<n>"
+
+msgid "generate diffs with <n> lines context"
+msgstr "generar diffs con <n> líneas de contexto"
+
+msgid "generate the diff in raw format"
+msgstr "generar el diff en formato raw"
+
+msgid "synonym for '-p --raw'"
+msgstr "sinónimo para '-p --raw'"
+
+msgid "synonym for '-p --stat'"
+msgstr "sinónimo para '-p --stat'"
+
+msgid "machine friendly --stat"
+msgstr "--stat amigable para máquina"
+
+msgid "output only the last line of --stat"
+msgstr "mostrar solo la última línea para --stat"
+
+msgid "<param1,param2>..."
+msgstr "<param1,param2>..."
+
+msgid ""
+"output the distribution of relative amount of changes for each sub-directory"
+msgstr ""
+"mostrar la distribución de cantidades de cambios relativas para cada "
+"subdirectorio"
+
+msgid "synonym for --dirstat=cumulative"
+msgstr "sinónimo para --dirstat=cumulative"
+
+msgid "synonym for --dirstat=files,param1,param2..."
+msgstr "sinónimo para --dirstat=archivos,param1,param2..."
+
+msgid "warn if changes introduce conflict markers or whitespace errors"
+msgstr ""
+"advertir si cambios introducen conflictos de markers o errores de espacios "
+"en blanco"
+
+msgid "condensed summary such as creations, renames and mode changes"
+msgstr ""
+"resumen condensado de creaciones, cambios de nombres y cambios de modos"
+
+msgid "show only names of changed files"
+msgstr "mostrar solo nombres de archivos cambiados"
+
+msgid "show only names and status of changed files"
+msgstr "mostrar solo nombres y estados de archivos cambiados"
+
+msgid "<width>[,<name-width>[,<count>]]"
+msgstr "<ancho>[,<ancho-de-nombre>[,<cantidad>]]"
+
+msgid "generate diffstat"
+msgstr "generar diffstat"
+
+msgid "<width>"
+msgstr "<ancho>"
+
+msgid "generate diffstat with a given width"
+msgstr "generar diffstat con un ancho dado"
+
+msgid "generate diffstat with a given name width"
+msgstr "generar diffstat con un ancho de nombre dado"
+
+msgid "generate diffstat with a given graph width"
+msgstr "generar diffstat con un ancho de graph dado"
+
+msgid "<count>"
+msgstr "<cantidad>"
+
+msgid "generate diffstat with limited lines"
+msgstr "generar diffstat con líneas limitadas"
+
+msgid "generate compact summary in diffstat"
+msgstr "generar un resumen compacto de diffstat"
+
+msgid "output a binary diff that can be applied"
+msgstr "mostrar un diff binario que puede ser aplicado"
+
+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\""
+
+msgid "show colored diff"
+msgstr "mostrar diff colorido"
+
+msgid "<kind>"
+msgstr "<tipo>"
+
+msgid ""
+"highlight whitespace errors in the 'context', 'old' or 'new' lines in the "
+"diff"
+msgstr ""
+"resaltar errores de espacios en blanco en las líneas 'context', 'old' o "
+"'new' del diff"
+
+msgid ""
+"do not munge pathnames and use NULs as output field terminators in --raw or "
+"--numstat"
+msgstr ""
+"no consolidar los pathnames y usar NULs como terminadores de campos en --raw "
+"o --numstat"
+
+msgid "<prefix>"
+msgstr "<prefijo>"
+
+msgid "show the given source prefix instead of \"a/\""
+msgstr "mostrar el prefijo de fuente dado en lugar de \"a/\""
+
+msgid "show the given destination prefix instead of \"b/\""
+msgstr "mostrar el prefijo de destino dado en lugar de \"b/\""
+
+msgid "prepend an additional prefix to every line of output"
+msgstr "anteponer un prefijo adicional a cada línea mostrada"
+
+msgid "do not show any source or destination prefix"
+msgstr "no mostrar ningún prefijo de fuente o destino"
+
+msgid "show context between diff hunks up to the specified number of lines"
+msgstr ""
+"mostrar el contexto entre hunks de diff hasta el número especificado de "
+"líneas"
+
+msgid "<char>"
+msgstr "<char>"
+
+msgid "specify the character to indicate a new line instead of '+'"
+msgstr "especificar el char para indicar una nueva línea en lugar de '+'"
+
+msgid "specify the character to indicate an old line instead of '-'"
+msgstr "especificar el char para indicar una línea vieja en lugar de '-'"
+
+msgid "specify the character to indicate a context instead of ' '"
+msgstr "especificar el char para indicar un contexto en lugar de ' '"
+
+msgid "Diff rename options"
+msgstr "Opciones de diff rename"
+
+msgid "<n>[/<m>]"
+msgstr "<n>[/<m>]"
+
+msgid "break complete rewrite changes into pairs of delete and create"
+msgstr "descomponer los cambios de reescritura en pares de borrar y crear"
+
+msgid "detect renames"
+msgstr "detectar renombrados"
+
+msgid "omit the preimage for deletes"
+msgstr "omitir la preimage para borrados"
+
+msgid "detect copies"
+msgstr "detectar copias"
+
+msgid "use unmodified files as source to find copies"
+msgstr "usar archivos no modificados como fuente para encontrar copias"
+
+msgid "disable rename detection"
+msgstr "deshabilitar detección de renombrados"
+
+msgid "use empty blobs as rename source"
+msgstr "usar blobs vacíos como fuente de renombramiento"
+
+msgid "continue listing the history of a file beyond renames"
+msgstr ""
+"continuar listando el historial de un archivo más allá de renombramientos"
+
+msgid ""
+"prevent rename/copy detection if the number of rename/copy targets exceeds "
+"given limit"
+msgstr ""
+"prevenir detección de renombramientos/copias si el número de destinos para "
+"renombramientos/copias excede el límite dado"
+
+msgid "Diff algorithm options"
+msgstr "Opciones de algoritmos de diff"
+
+msgid "produce the smallest possible diff"
+msgstr "producir el diff más pequeño posible"
+
+msgid "ignore whitespace when comparing lines"
+msgstr "ignorar espacios en blanco cuando comparando líneas"
+
+msgid "ignore changes in amount of whitespace"
+msgstr "ignorar cambios en la cantidad de líneas en blanco"
+
+msgid "ignore changes in whitespace at EOL"
+msgstr "ignorar cambios en espacios en blanco en EOL"
+
+msgid "ignore carrier-return at the end of line"
+msgstr "ignorar carrier-return al final de la línea"
+
+msgid "ignore changes whose lines are all blank"
+msgstr "ignorar cambios cuyas líneas son todas en blanco"
+
+msgid "<regex>"
+msgstr "<regex>"
+
+msgid "ignore changes whose all lines match <regex>"
+msgstr "ignorar cambios cuyas líneas concuerdan con <regex>"
+
+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"
+
+msgid "generate diff using the \"patience diff\" algorithm"
+msgstr "genera un diff usando algoritmo \"patience diff\""
+
+msgid "generate diff using the \"histogram diff\" algorithm"
+msgstr "genera un diff usando algoritmo \"histogram diff\""
+
+msgid "<algorithm>"
+msgstr "<algoritmo>"
+
+msgid "choose a diff algorithm"
+msgstr "escoger un algoritmo para diff"
+
+msgid "<text>"
+msgstr "<texto>"
+
+msgid "generate diff using the \"anchored diff\" algorithm"
+msgstr "generar un diff usando algoritmo \"anchored diff\""
+
+msgid "<mode>"
+msgstr "<modo>"
+
+msgid "show word diff, using <mode> to delimit changed words"
+msgstr ""
+"mostrar diff por palabras usando <modo> para delimitar las palabras cambiadas"
+
+msgid "use <regex> to decide what a word is"
+msgstr "usar <regex> para decidir qué es una palabra"
+
+msgid "equivalent to --word-diff=color --word-diff-regex=<regex>"
+msgstr "equivalente a --word-diff=color --word-diff-regex=<regex>"
+
+msgid "moved lines of code are colored differently"
+msgstr "líneas movidas de código están coloreadas diferente"
+
+msgid "how white spaces are ignored in --color-moved"
+msgstr "como espacios en blanco son ignorados en --color-moved"
+
+msgid "Other diff options"
+msgstr "Otras opciones de diff"
+
+msgid "when run from subdir, exclude changes outside and show relative paths"
+msgstr ""
+"cuando ejecutado desde un subdir, excluir cambios del exterior y muestra "
+"paths relativos"
+
+msgid "treat all files as text"
+msgstr "tratar todos los archivos como texto"
+
+msgid "swap two inputs, reverse the diff"
+msgstr "cambiar dos inputs, invierte el diff"
+
+msgid "exit with 1 if there were differences, 0 otherwise"
+msgstr "terminar con 1 si hubieron diferencias, de lo contrario con 0"
+
+msgid "disable all output of the program"
+msgstr "deshabilitar toda la salida del programa"
+
+msgid "allow an external diff helper to be executed"
+msgstr "permitir la ejecución de un diff helper externo"
+
+msgid "run external text conversion filters when comparing binary files"
+msgstr ""
+"ejecutar filtros de conversión de texto externos cuando comparando binarios"
+
+msgid "<when>"
+msgstr "<cuando>"
+
+msgid "ignore changes to submodules in the diff generation"
+msgstr "ignorar cambios a submódulos en la generación de diff"
+
+msgid "<format>"
+msgstr "<formato>"
+
+msgid "specify how differences in submodules are shown"
+msgstr "especificar como son mostradas las diferencias en submódulos"
+
+msgid "hide 'git add -N' entries from the index"
+msgstr "ocultar entradas 'git add -N' del índice"
+
+msgid "treat 'git add -N' entries as real in the index"
+msgstr "tratar entradas 'git add -N' como reales en el índice"
+
+msgid "<string>"
+msgstr "<string>"
+
+msgid ""
+"look for differences that change the number of occurrences of the specified "
+"string"
+msgstr ""
+"buscar diferencias que cambien el número de ocurrencias del string "
+"especificado"
+
+msgid ""
+"look for differences that change the number of occurrences of the specified "
+"regex"
+msgstr ""
+"buscar diferencias que cambien el número de ocurrencias del regex "
+"especificado"
+
+msgid "show all changes in the changeset with -S or -G"
+msgstr "mostrar todos los cambios en el changeset con -S o -G"
+
+msgid "treat <string> in -S as extended POSIX regular expression"
+msgstr "tratar <string> en -S como una expresión regular extendida de POSIX"
+
+msgid "control the order in which files appear in the output"
+msgstr "controlar el orden en el que los archivos aparecen en la salida"
+
+msgid "<path>"
+msgstr "<ruta>"
+
+msgid "show the change in the specified path first"
+msgstr "mostrar el cambio en la ruta especificada primero"
+
+msgid "skip the output to the specified path"
+msgstr "saltar la salida de la ruta especificada"
+
+msgid "<object-id>"
+msgstr "<id-de-objeto>"
+
+msgid ""
+"look for differences that change the number of occurrences of the specified "
+"object"
+msgstr ""
+"buscar diferencias que cambien el número de ocurrencias para el objeto "
+"especificado"
+
+msgid "[(A|C|D|M|R|T|U|X|B)...[*]]"
+msgstr "[(A|C|D|M|R|T|U|X|B)...[*]]"
+
+msgid "select files by diff type"
+msgstr "seleccionar archivos por tipo de diff"
+
+msgid "<file>"
+msgstr "<archivo>"
+
+#, fuzzy
+msgid "output to a specific file"
+msgstr "Output a un archivo específico"
+
+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."
+
+msgid "only found copies from modified paths due to too many files."
+msgstr ""
+"solo se encontraron copias de rutas modificadas por haber demasiados "
+"archivos."
+
+#, c-format
+msgid ""
+"you may want to set your %s variable to at least %d and retry the command."
+msgstr ""
+"tal vez quieras configurar la variable %s para por lo menos %d y volver a "
+"intentar el comando."
+
+#, c-format
+msgid "failed to read orderfile '%s'"
+msgstr "falló al leer archivo de orden '%s'"
+
+msgid "Performing inexact rename detection"
+msgstr "Realizando una detección de cambios de nombre inexacta"
+
+#, c-format
+msgid "No such path '%s' in the diff"
+msgstr "No hay ruta '%s' en el diff"
+
+#, c-format
+msgid "pathspec '%s' did not match any file(s) known to git"
+msgstr "ruta especificada '%s' no concordó con ningún archivo conocido por git"
+
+#, c-format
+msgid "unrecognized pattern: '%s'"
+msgstr "patrón desconocido: '%s'"
+
+#, c-format
+msgid "unrecognized negative pattern: '%s'"
+msgstr "patrón negativo no reconocido: '%s'"
+
+#, c-format
+msgid "your sparse-checkout file may have issues: pattern '%s' is repeated"
+msgstr ""
+"tu archivo sparse-checkout tal vez tenga errores: patrón '%s' está repetido"
+
+msgid "disabling cone pattern matching"
+msgstr "deshabilitar coincidencia de patrónes cónica"
+
+#, c-format
+msgid "cannot use %s as an exclude file"
+msgstr "no se puede usar %s como archivo de exclusión"
+
+msgid "failed to get kernel name and information"
+msgstr "falló al conseguir el nombre y la información del kernel"
+
+msgid "untracked cache is disabled on this system or location"
+msgstr "untracked cache está desactivado en este sistema o ubicación"
+
+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"
+
+#, c-format
+msgid "index file corrupt in repo %s"
+msgstr "archivo índice corrompido en repositorio %s"
+
+#, c-format
+msgid "could not create directories for %s"
+msgstr "no se pudo crear directorios para %s"
+
+#, c-format
+msgid "could not migrate git directory from '%s' to '%s'"
+msgstr "no se pudo migrar el directorio git de '%s' a '%s'"
+
+#, c-format
+msgid "hint: Waiting for your editor to close the file...%c"
+msgstr "ayuda: Esperando que tu editor cierre el archivo ...%c"
+
+msgid "Filtering content"
+msgstr "Filtrando contenido"
+
+#, c-format
+msgid "could not stat file '%s'"
+msgstr "no se pudo hacer stat en el archivo '%s'"
+
+#, c-format
+msgid "bad git namespace path \"%s\""
+msgstr "ruta de namespace de git mala \"%s\""
+
+#, c-format
+msgid "too many args to run %s"
+msgstr "demasiados argumentos para ejecutar %s"
+
+msgid "git fetch-pack: expected shallow list"
+msgstr "git fetch-pack: lista de superficiales esperada"
+
+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"
+
+msgid "git fetch-pack: expected ACK/NAK, got a flush packet"
+msgstr "git fetch-pack: se esperaba ACK/NAK, se obtuvo un flush packet"
+
+#, c-format
+msgid "git fetch-pack: expected ACK/NAK, got '%s'"
+msgstr "git fetch-pack: se esperaba ACK/NAK, se obtuvo '%s'"
+
+msgid "unable to write to remote"
+msgstr "no se puede escribir al remoto"
+
+#, c-format
+msgid "invalid shallow line: %s"
+msgstr "línea shallow inválida: %s"
+
+#, c-format
+msgid "invalid unshallow line: %s"
+msgstr "línea unshallow inválida: %s"
+
+#, c-format
+msgid "object not found: %s"
+msgstr "objeto no encontrado: %s"
+
+#, c-format
+msgid "error in object: %s"
+msgstr "error en objeto: %s"
+
+#, c-format
+msgid "no shallow found: %s"
+msgstr "shallow no encontrado: %s"
+
+#, c-format
+msgid "expected shallow/unshallow, got %s"
+msgstr "se esperaba shallow/unshallow, se obtuvo %s"
+
+#, c-format
+msgid "got %s %d %s"
+msgstr "se obtuvo %s %d %s"
+
+#, c-format
+msgid "invalid commit %s"
+msgstr "commit inválido %s"
+
+msgid "giving up"
+msgstr "rindiéndose"
+
+msgid "done"
+msgstr "listo"
+
+#, c-format
+msgid "got %s (%d) %s"
+msgstr "se obtuvo %s (%d) %s"
+
+#, c-format
+msgid "Marking %s as complete"
+msgstr "Marcando %s como completa"
+
+#, c-format
+msgid "already have %s (%s)"
+msgstr "ya se tiene %s (%s)"
+
+msgid "fetch-pack: unable to fork off sideband demultiplexer"
+msgstr "fetch-pack: no se puede ejecutar un demultiplexor de banda lateral"
+
+msgid "protocol error: bad pack header"
+msgstr "error de protocolo: header de paquete erróneo"
+
+#, c-format
+msgid "fetch-pack: unable to fork off %s"
+msgstr "fetch-pack: no se puede ejecutar %s"
+
+msgid "fetch-pack: invalid index-pack output"
+msgstr "fetch-pack: salida de index-pack no válida"
+
+#, c-format
+msgid "%s failed"
+msgstr "%s falló"
+
+msgid "error in sideband demultiplexer"
+msgstr "error en demultiplexor de banda lateral"
+
+#, c-format
+msgid "Server version is %.*s"
+msgstr "Versión de servidor es %.*s"
+
+#, c-format
+msgid "Server supports %s"
+msgstr "El servidor soporta %s"
+
+msgid "Server does not support shallow clients"
+msgstr "El servidor no soporta clientes superficiales"
+
+msgid "Server does not support --shallow-since"
+msgstr "El servidor no soporta --shallow-since"
+
+msgid "Server does not support --shallow-exclude"
+msgstr "El servidor no soporta --shallow-exclude"
+
+msgid "Server does not support --deepen"
+msgstr "El servidor no soporta --deepen"
+
+msgid "Server does not support this repository's object format"
+msgstr "El servidor no soporta el formato de objetos de este repositorio"
+
+msgid "no common commits"
+msgstr "no hay commits comunes"
+
+msgid "git fetch-pack: fetch failed."
+msgstr "git fetch-pack: fetch falló."
+
+#, c-format
+msgid "mismatched algorithms: client %s; server %s"
+msgstr "algoritmos no compatibles: cliente %s; servidor %s"
+
+#, c-format
+msgid "the server does not support algorithm '%s'"
+msgstr "el servidor no soporta el algoritmo '%s'"
+
+msgid "Server does not support shallow requests"
+msgstr "El servidor no soporta peticiones superficiales"
+
+msgid "Server supports filter"
+msgstr "El servidor soporta filtración"
+
+msgid "unable to write request to remote"
+msgstr "no se puede escribir request al remoto"
+
+#, c-format
+msgid "expected '%s', received '%s'"
+msgstr "se esperaba '%s', se recibió '%s'"
+
+#, fuzzy, c-format
+msgid "expected '%s'"
+msgstr "línea inesperada: '%s'"
+
+#, c-format
+msgid "unexpected acknowledgment line: '%s'"
+msgstr "línea de confirmación inesperada: '%s'"
+
+#, c-format
+msgid "error processing acks: %d"
+msgstr "error al procesar acks: %d"
+
+#. TRANSLATORS: The parameter will be 'ready', a protocol
+#. keyword.
+#.
+#, fuzzy, c-format
+msgid "expected packfile to be sent after '%s'"
+msgstr "se esperaba que el packfile fuera enviado luego del 'listo'"
+
+#. TRANSLATORS: The parameter will be 'ready', a protocol
+#. keyword.
+#.
+#, fuzzy, c-format
+msgid "expected no other sections to be sent after no '%s'"
+msgstr "se esperaba que ninguna otra sección fuera enviada luego del 'listo'"
+
+#, c-format
+msgid "error processing shallow info: %d"
+msgstr "error al procesar información de superficiales: %d"
+
+#, c-format
+msgid "expected wanted-ref, got '%s'"
+msgstr "se esperaba wanted-ref, se obtuvo '%s'"
+
+#, c-format
+msgid "unexpected wanted-ref: '%s'"
+msgstr "wanted-ref inesperado: '%s'"
+
+#, c-format
+msgid "error processing wanted refs: %d"
+msgstr "error al procesar refs deseadas: %d"
+
+msgid "git fetch-pack: expected response end packet"
+msgstr "git fetch-pack: se esperaba un paquete final de respuesta"
+
+msgid "no matching remote head"
+msgstr "no concuerda el head remoto"
+
+msgid "unexpected 'ready' from remote"
+msgstr "'listo' inesperado del remoto"
+
+#, c-format
+msgid "no such remote ref %s"
+msgstr "no existe ref remota %s"
+
+#, c-format
+msgid "Server does not allow request for unadvertised object %s"
+msgstr "El servidor no permite solicitudes de objetos inadvertidos %s"
+
+#, c-format
+msgid "fsmonitor_ipc__send_query: invalid path '%s'"
+msgstr ""
+
+#, c-format
+msgid "fsmonitor_ipc__send_query: unspecified error on '%s'"
+msgstr ""
+
+msgid "fsmonitor--daemon is not running"
+msgstr ""
+
+#, fuzzy, c-format
+msgid "could not send '%s' command to fsmonitor--daemon"
+msgstr "no se pudo enviar el comando IPC"
+
+#, fuzzy, c-format
+msgid "bare repository '%s' is incompatible with fsmonitor"
+msgstr "%s es incompatible con %s"
+
+#, c-format
+msgid "repository '%s' is incompatible with fsmonitor due to errors"
+msgstr ""
+
+#, fuzzy, c-format
+msgid "remote repository '%s' is incompatible with fsmonitor"
+msgstr "%s es incompatible con %s"
+
+#, fuzzy, c-format
+msgid "virtual repository '%s' is incompatible with fsmonitor"
+msgstr "%s es incompatible con %s"
+
+#, c-format
+msgid ""
+"repository '%s' is incompatible with fsmonitor due to lack of Unix sockets"
+msgstr ""
+
+#, fuzzy
+msgid ""
+"git [-v | --version] [-h | --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"
+"           [--git-dir=<path>] [--work-tree=<path>] [--namespace=<name>]\n"
+"           [--super-prefix=<path>] [--config-env=<name>=<envvar>]\n"
+"           <command> [<args>]"
+msgstr ""
+"git [--version] [--help] [-C <ruta>] [-c <nombre>=<valor>]\n"
+"            [--exec-path [= <path>]] [--html-path] [--man-path] [--info-"
+"path]\n"
+"            [-p | --paginate | -P | --no-pager] [--no-replace-objects] [--"
+"bare]\n"
+"            [--git-dir=<ruta>] [--work-tree=<ruta>] [--namespace=<nombre>]\n"
+"            [--super-prefix=<ruta>] [--config-env=<nombre>=<envvar>]\n"
+"            <comando> [<args>]"
+
+msgid ""
+"'git help -a' and 'git help -g' list available subcommands and some\n"
+"concept guides. See 'git help <command>' or 'git help <concept>'\n"
+"to read about a specific subcommand or concept.\n"
+"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. 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."
+
+#, c-format
+msgid "unsupported command listing type '%s'"
+msgstr "tipo de listado de comandos no soportado '%s'"
+
+#, fuzzy, c-format
+msgid "no directory given for '%s' option\n"
+msgstr "no se entregó directorio para -C\n"
+
+#, c-format
+msgid "no namespace given for --namespace\n"
+msgstr "no se entregó namespace para --namespace\n"
+
+#, c-format
+msgid "no prefix given for --super-prefix\n"
+msgstr "no se entregó prefijo para --super-prefix\n"
+
+#, c-format
+msgid "-c expects a configuration string\n"
+msgstr "-c espera un string de configuración\n"
+
+#, c-format
+msgid "no config key given for --config-env\n"
+msgstr "no se entregó una llave de config para --config-env\n"
+
+#, c-format
+msgid "unknown option: %s\n"
+msgstr "opción %s desconocida\n"
+
+#, c-format
+msgid "while expanding alias '%s': '%s'"
+msgstr "al expandir el alias '%s': '%s'"
+
+#, c-format
+msgid ""
+"alias '%s' changes environment variables.\n"
+"You can use '!git' in the alias to do this"
+msgstr ""
+"alias '%s' cambia las variables de entorno.\n"
+"Puedes usar '!git' en el alias para hacer esto"
+
+#, c-format
+msgid "empty alias for %s"
+msgstr "alias vacío para %s"
+
+#, c-format
+msgid "recursive alias: %s"
+msgstr "alias recursivo: %s"
+
+msgid "write failure on standard output"
+msgstr "error de escritura en standard output"
+
+msgid "unknown write failure on standard output"
+msgstr "error desconocido de escritura en standard output"
+
+msgid "close failed on standard output"
+msgstr "cierre falló en standard output"
+
+#, 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"
+
+#, c-format
+msgid "cannot handle %s as a builtin"
+msgstr "no se puede manejar %s como un builtin"
+
+#, c-format
+msgid ""
+"usage: %s\n"
+"\n"
+msgstr ""
+"uso: %s\n"
+"\n"
+"\n"
+"\n"
+
+#, 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"
+
+#, c-format
+msgid "failed to run command '%s': %s\n"
+msgstr "falló al ejecutar comando '%s': %s\n"
+
+msgid "could not create temporary file"
+msgstr "no se pudo crear archivo temporal"
+
+#, c-format
+msgid "failed writing detached signature to '%s'"
+msgstr "falló al escribir la firma separada para '%s'"
+
+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"
+
+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+)"
+
+#, 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"
+
+#, c-format
+msgid "bad/incompatible signature '%s'"
+msgstr "firma mala/incompatible '%s'"
+
+#, c-format
+msgid "failed to get the ssh fingerprint for key '%s'"
+msgstr "error al conseguir la huella de ssh para la llave '%s'"
+
+msgid ""
+"either user.signingkey or gpg.ssh.defaultKeyCommand needs to be configured"
+msgstr "user.signingkey o gpg.ssh.defaultKeyCommand necesitan ser configurados"
+
+#, 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"
+
+#, c-format
+msgid "gpg.ssh.defaultKeyCommand failed: %s %s"
+msgstr "gpg.ssh.defaultKeyCommand falló: %s %s"
+
+msgid "gpg failed to sign the data"
+msgstr "gpg falló al firmar los datos"
+
+msgid "user.signingkey needs to be set for ssh signing"
+msgstr "user.signingkey necesita ser configurado para firmar con ssh"
+
+#, c-format
+msgid "failed writing ssh signing key to '%s'"
+msgstr "falló al escribir la llave de firma para '%s'"
+
+#, c-format
+msgid "failed writing ssh signing key buffer to '%s'"
+msgstr "falló al escribir el buffer para lla llave de firma para '%s'"
+
+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+)"
+
+#, c-format
+msgid "failed reading ssh signing data buffer from '%s'"
+msgstr "falló al leer la firma ssh desde '%s'"
+
+#, c-format
+msgid "ignored invalid color '%.*s' in log.graphColors"
+msgstr "ignorado color inválido '%.*s' en log.graphColors"
+
+msgid ""
+"given pattern contains NULL byte (via -f <file>). This is only supported "
+"with -P under PCRE v2"
+msgstr ""
+"el patrón provisto contiene bytes NULL (vía -f <archivo>). Esto solo es "
+"soportado con -P bajo PCRE v2"
+
+#, c-format
+msgid "'%s': unable to read %s"
+msgstr "'%s': no es posible leer %s"
+
+#, c-format
+msgid "'%s': short read"
+msgstr "'%s': lectura corta"
+
+msgid "start a working area (see also: git help tutorial)"
+msgstr "comenzar un área de trabajo (mira también: git help tutorial)"
+
+msgid "work on the current change (see also: git help everyday)"
+msgstr "trabajar en los cambios actuales (mira también: git help everyday)"
+
+msgid "examine the history and state (see also: git help revisions)"
+msgstr "examinar el historial y el estado (mira también: git help revisions)"
+
+msgid "grow, mark and tweak your common history"
+msgstr "crecer, marcar y ajustar tu historial común"
+
+msgid "collaborate (see also: git help workflows)"
+msgstr "colaborar (mira también: git help workflows)"
+
+msgid "Main Porcelain Commands"
+msgstr "Comandos de Porcelana principales"
+
+msgid "Ancillary Commands / Manipulators"
+msgstr "Comandos auxiliares / Manipuladores"
+
+msgid "Ancillary Commands / Interrogators"
+msgstr "Comandos auxiliares / Interrogadores"
+
+msgid "Interacting with Others"
+msgstr "Interactuar con Otros"
+
+msgid "Low-level Commands / Manipulators"
+msgstr "Comandos de bajo nivel / Manipuladores"
+
+msgid "Low-level Commands / Interrogators"
+msgstr "Comandos de bajo nivel / Interrogadores"
+
+msgid "Low-level Commands / Syncing Repositories"
+msgstr "Comandos de bajo nivel / Sincronización de repositorios"
+
+msgid "Low-level Commands / Internal Helpers"
+msgstr "Comandos de bajo nivel / Auxiliares internos"
+
+#, c-format
+msgid "available git commands in '%s'"
+msgstr "comandos disponibles de git en '%s'"
+
+msgid "git commands available from elsewhere on your $PATH"
+msgstr "comandos disponibles de git desde otro lugar en tu $PATH"
+
+msgid "These are common Git commands used in various situations:"
+msgstr "Estos son comandos comunes de Git usados en varias situaciones:"
+
+msgid "The Git concept guides are:"
+msgstr "Las guías de conceptos de Git son:"
+
+msgid "External commands"
+msgstr "Comandos externos"
+
+msgid "Command aliases"
+msgstr "Aliases de comando"
+
+msgid "See 'git help <command>' to read about a specific subcommand"
+msgstr "Mira 'git help <comando>' para leer sobre los subcomandos específicos"
+
+#, c-format
+msgid ""
+"'%s' appears to be a git command, but we were not\n"
+"able to execute it. Maybe git-%s is broken?"
+msgstr ""
+"'%s' parece ser un comando de git, pero no hemos\n"
+"podido ejecutarlo. ¿Tal vez git-%s se ha roto?"
+
+#, 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'."
+
+msgid "Uh oh. Your system reports no Git commands at all."
+msgstr "Oh oh. Tu sistema no reporta ningún comando de Git."
+
+#, 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."
+
+#, c-format
+msgid "Continuing under the assumption that you meant '%s'."
+msgstr "Continuando asumiendo que quisiste decir '%s'."
+
+#, fuzzy, c-format
+msgid "Run '%s' instead [y/N]? "
+msgstr "Ejecutar '%s' en su lugar? (y/N)"
+
+#, c-format
+msgid "Continuing in %0.1f seconds, assuming that you meant '%s'."
+msgstr "Continuando en %0.1f segundos, asumiendo que quisiste decir '%s'."
+
+msgid ""
+"\n"
+"The most similar command is"
+msgid_plural ""
+"\n"
+"The most similar commands are"
+msgstr[0] ""
+"\n"
+"El comando más similar es"
+msgstr[1] ""
+"\n"
+"Los comandos más similares son"
+
+msgid "git version [<options>]"
+msgstr "git version [<opciones>]"
+
+#, c-format
+msgid "%s: %s - %s"
+msgstr "%s: %s - %s"
+
+msgid ""
+"\n"
+"Did you mean this?"
+msgid_plural ""
+"\n"
+"Did you mean one of these?"
+msgstr[0] ""
+"\n"
+"¿Quisiste decir esto?"
+msgstr[1] ""
+"\n"
+"¿Quisiste decir alguno de estos?"
+
+#, 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`."
+
+#, fuzzy, c-format
+msgid "Couldn't start hook '%s'\n"
+msgstr "No se pudo hacer stat en '%s'"
+
+#, c-format
+msgid "argument to --packfile must be a valid hash (got '%s')"
+msgstr "argumento para --packfile tiene que se un hash válido (se obtuvo '%s')"
+
+msgid "not a git repository"
+msgstr "no es un repositorio git"
+
+#, c-format
+msgid "negative value for http.postbuffer; defaulting to %d"
+msgstr "valor negativo para http.postbuffer; poniendo el default %d"
+
+msgid "Delegation control is not supported with cURL < 7.22.0"
+msgstr "Delegación de control no es soportada con cURL < 7.22.0"
+
+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"
+
+msgid "CURLSSLOPT_NO_REVOKE not supported with cURL < 7.44.0"
+msgstr "CURLSSLOPT_NO_REVOKE no soportado con cURL < 7.44.0"
+
+#, c-format
+msgid "Unsupported SSL backend '%s'. Supported SSL backends:"
+msgstr "Backend SSL no soportado '%s'. Backends SSL soportados:"
+
+#, 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"
+
+#, c-format
+msgid "Could not set SSL backend to '%s': already set"
+msgstr "No se pudo configurar backend SSL para '%s': ya configurado"
+
+#, c-format
+msgid ""
+"unable to update url base from redirection:\n"
+"  asked for: %s\n"
+"   redirect: %s"
+msgstr ""
+"no se puede actualizar la base de url de la redirección:\n"
+"  preguntaba por: %s\n"
+"   redirección: %s"
+
+msgid "Author identity unknown\n"
+msgstr "Identidad del autor desconocido\n"
+
+msgid "Committer identity unknown\n"
+msgstr "Se desconoce la identidad del autor\n"
+
+msgid ""
+"\n"
+"*** Please tell me who you are.\n"
+"\n"
+"Run\n"
+"\n"
+"  git config --global user.email \"you@example.com\"\n"
+"  git config --global user.name \"Your Name\"\n"
+"\n"
+"to set your account's default identity.\n"
+"Omit --global to set the identity only in this repository.\n"
+"\n"
+msgstr ""
+"\n"
+"*** Por favor cuéntame quién eres.\n"
+"\n"
+"Ejecuta\n"
+"\n"
+"  git config --global user.email \"you@example.com\"\n"
+"  git config --global user.name \"Tu Nombre\"\n"
+"\n"
+"para configurar la identidad por defecto de tu cuenta.\n"
+"Omite --global para configurar tu identidad solo en este repositorio.\n"
+"\n"
+
+msgid "no email was given and auto-detection is disabled"
+msgstr "no se entregó ningún email y la detección automática está desactivada"
+
+#, c-format
+msgid "unable to auto-detect email address (got '%s')"
+msgstr "no es posible auto-detectar la dirección de correo (se obtuvo '%s')"
+
+msgid "no name was given and auto-detection is disabled"
+msgstr "no se entregó ningún nombre y la detección automática está desactivada"
+
+#, c-format
+msgid "unable to auto-detect name (got '%s')"
+msgstr "no es posible auto-detectar el nombre (se obtuvo '%s')"
+
+#, c-format
+msgid "empty ident name (for <%s>) not allowed"
+msgstr "no se puede tener un nombre de identidad vacío (para <%s>)"
+
+#, c-format
+msgid "name consists only of disallowed characters: %s"
+msgstr "el nombre consiste solo de caracteres no permitidos: %s"
+
+msgid "expected 'tree:<depth>'"
+msgstr "se esperaba 'tree:<depth>'"
+
+msgid "sparse:path filters support has been dropped"
+msgstr "soporte para filtros sparse:path ha sido discontinuado"
+
+#, c-format
+msgid "'%s' for 'object:type=<type>' is not a valid object type"
+msgstr "'%s' para 'object:type=<type>' no es un objeto válido"
+
+#, c-format
+msgid "invalid filter-spec '%s'"
+msgstr "especificación de filtro inválida '%s'"
+
+#, c-format
+msgid "must escape char in sub-filter-spec: '%c'"
+msgstr "tienes que escapar el caracter en sub-filter-spec: '%c'"
+
+msgid "expected something after combine:"
+msgstr "se espera algo luego de combine:"
+
+msgid "multiple filter-specs cannot be combined"
+msgstr "no se pueden combinar múltiples tipos de especificaciones de filtro"
+
+msgid "unable to upgrade repository format to support partial clone"
+msgstr ""
+"no es posible actualizar el formato del repositorio para soportar clonación "
+"parcial"
+
+msgid "args"
+msgstr "args"
+
+msgid "object filtering"
+msgstr "filtrado de objeto"
+
+#, c-format
+msgid "unable to access sparse blob in '%s'"
+msgstr "no es posible acceder al blob escaso en '%s'"
+
+#, c-format
+msgid "unable to parse sparse filter data in %s"
+msgstr "incapaz de analizar filtro de data en %s"
+
+#, c-format
+msgid "entry '%s' in tree %s has tree mode, but is not a tree"
+msgstr "entrada '%s' en árbol %s tiene modo árbol, pero no lo es"
+
+#, c-format
+msgid "entry '%s' in tree %s has blob mode, but is not a blob"
+msgstr "entrada '%s' en árbol %s tiene modo blob, pero no lo es"
+
+#, c-format
+msgid "unable to load root tree for commit %s"
+msgstr "no se puede cargar árbol raíz para commit %s"
+
+#, c-format
+msgid ""
+"Unable to create '%s.lock': %s.\n"
+"\n"
+"Another git process seems to be running in this repository, e.g.\n"
+"an editor opened by 'git commit'. Please make sure all processes\n"
+"are terminated then try again. If it still fails, a git process\n"
+"may have crashed in this repository earlier:\n"
+"remove the file manually to continue."
+msgstr ""
+"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ú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"
+"borra el archivo manualmente para continuar."
+
+#, c-format
+msgid "Unable to create '%s.lock': %s"
+msgstr "No se pudo crear '%s.lock': %s"
+
+#, c-format
+msgid "unexpected line: '%s'"
+msgstr "línea inesperada: '%s'"
+
+msgid "expected flush after ls-refs arguments"
+msgstr "se esperaba un flush luego de argumentos ls-refs"
+
+msgid "quoted CRLF detected"
+msgstr "CRLF con comillas detectado"
+
+#, c-format
+msgid ""
+"Your local changes to the following files would be overwritten by merge:\n"
+"  %s"
+msgstr ""
+"Los cambios locales de los siguientes archivos serán sobreescritos por "
+"merge:\n"
+"  %s"
+
+#, c-format
+msgid "Failed to merge submodule %s (not checked out)"
+msgstr "Falló al fusionar el submódulo %s (no revisado)"
+
+#, c-format
+msgid "Failed to merge submodule %s (commits not present)"
+msgstr "Falló al fusionar el submódulo %s (commits no presentes)"
+
+#, 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)"
+
+#, c-format
+msgid "Note: Fast-forwarding submodule %s to %s"
+msgstr "Nota: Fast-forward de submódulo %s a %s"
+
+#, c-format
+msgid "Failed to merge submodule %s"
+msgstr "Falló al fusionar el submódulo %s"
+
+#, c-format
+msgid ""
+"Failed to merge submodule %s, but a possible merge resolution exists:\n"
+"%s\n"
+msgstr ""
+"Falló al fusionar el submódulo %s, pero existen posibles soluciones de "
+"fusión:\n"
+"%s\n"
+
+#, c-format
+msgid ""
+"If this is correct simply add it to the index for example\n"
+"by using:\n"
+"\n"
+"  git update-index --cacheinfo 160000 %s \"%s\"\n"
+"\n"
+"which will accept this suggestion.\n"
+msgstr ""
+"Si esto es correcto simplemente agrégalo al índice por ejemplo\n"
+"usando:\n"
+"\n"
+"  git update-index --cacheinfo 160000 %s \"%s\"\n"
+"\n"
+"el cual aceptará esta sugerencia.\n"
+
+#, 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últiples fusiones "
+"posibles:\n"
+"%s"
+
+msgid "Failed to execute internal merge"
+msgstr "Falló al ejecutar la fusión interna"
+
+#, c-format
+msgid "Unable to add %s to database"
+msgstr "No es posible agregar %s a la base de datos"
+
+#, c-format
+msgid "Auto-merging %s"
+msgstr "Auto-fusionando %s"
+
+#, 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 ""
+"CONFLICTO (cambio de nombre de directorio implícito): Archivo/directorio "
+"existente en %s se interpone con el cambio de nombres implícito, poniendo "
+"la(s) siguiente(s) ruta(s) aquí: %s."
+
+#, 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 ""
+"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"
+
+#, c-format
+msgid ""
+"CONFLICT (directory rename split): Unclear where to rename %s to; it was "
+"renamed to multiple other directories, with no destination getting a "
+"majority of the files."
+msgstr ""
+"CONFLICTO (división de cambio de nombre de directorio): No está claro a qué "
+"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."
+
+#, c-format
+msgid ""
+"WARNING: Avoiding applying %s -> %s rename to %s, because %s itself was "
+"renamed."
+msgstr ""
+"PELIGRO: Evitando aplicar %s -> %s renombrado a %s, porque %s mismo fue "
+"renombrado."
+
+#, c-format
+msgid ""
+"Path updated: %s added in %s inside a directory that was renamed in %s; "
+"moving it to %s."
+msgstr ""
+"Path actualizado: %s agregado en %s dentro de un directorio que fue "
+"renombrado en %s; moviéndolo a %s."
+
+#, c-format
+msgid ""
+"Path updated: %s renamed to %s in %s, inside a directory that was renamed in "
+"%s; moving it to %s."
+msgstr ""
+"Path actualizado: %s renombrado a %s en %s, dentro de un directorio que fue "
+"renombrado en %s; moviéndolo a %s."
+
+#, 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 ""
+"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."
+
+#, 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 ""
+"CONFLICTO (ubicación de archivo): %s renombrado a %s en %s, dentro de un "
+"directorio que fue renombrado en %s, sugiriendo que tal vez debería ser "
+"movido a %s."
+
+#, 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."
+
+#, 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."
+msgstr ""
+"CONFLICTO (cambio de nombre involucrado en colisión): cambio de nombre de %s "
+"->%s tiene conflictos de contenido Y colisiona con otra ruta; esto puede "
+"resultar en marcadores de conflicto anidados."
+
+#, 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."
+
+#, c-format
+msgid "cannot read object %s"
+msgstr "no se pudo leer el objeto %s"
+
+#, c-format
+msgid "object %s is not a blob"
+msgstr "objeto %s no es un blob"
+
+#, c-format
+msgid ""
+"CONFLICT (file/directory): directory in the way of %s from %s; moving it to "
+"%s instead."
+msgstr ""
+"CONFLICTO (archivo / directorio): directorio en el camino de %s de %s; "
+"moviéndolo a %s en su lugar."
+
+#, c-format
+msgid ""
+"CONFLICT (distinct types): %s had different types on each side; renamed both "
+"of them so each can be recorded somewhere."
+msgstr ""
+"CONFLICTO (tipos distintos): %s tenía tipos diferentes en cada lado; ambos "
+"fueron renombrados para que cada uno pueda ser grabado en algún lugar "
+"diferente."
+
+#, c-format
+msgid ""
+"CONFLICT (distinct types): %s had different types on each side; renamed one "
+"of them so each can be recorded somewhere."
+msgstr ""
+"CONFLICTO (tipos distintos): %s tenía tipos diferentes en cada lado; uno de "
+"ellos fue renombrado para que cada uno pueda ser grabado en algún lugar "
+"diferente."
+
+msgid "content"
+msgstr "contenido"
+
+msgid "add/add"
+msgstr "agregar/agregar"
+
+msgid "submodule"
+msgstr "submódulo"
+
+#, c-format
+msgid "CONFLICT (%s): Merge conflict in %s"
+msgstr "CONFLICTO (%s): Conflicto de fusión en %s"
+
+#, c-format
+msgid ""
+"CONFLICT (modify/delete): %s deleted in %s and modified in %s.  Version %s "
+"of %s left in tree."
+msgstr ""
+"CONFLICTO (modificar / eliminar): %s eliminado en %s y modificado en %s. "
+"Versión %s de %s restante en el árbol."
+
+#, 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á actualizado y en conflicto con la versión; la copia antigua "
+"fue renombrada 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.
+#.
+#, 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"
+
+msgid "(bad commit)\n"
+msgstr "(commit erróneo)\n"
+
+#, c-format
+msgid "add_cacheinfo failed for path '%s'; merge aborting."
+msgstr "add_cacheinfo falló para la ruta '%s'; abortando fusión."
+
+#, 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."
+
+#, c-format
+msgid "failed to create path '%s'%s"
+msgstr "falló al crear la ruta '%s'%s"
+
+#, c-format
+msgid "Removing %s to make room for subdirectory\n"
+msgstr "Quitando %s para hacer espacio para un subdirectorio\n"
+
+msgid ": perhaps a D/F conflict?"
+msgstr ": ¿tal vez un conflicto D/F?"
+
+#, c-format
+msgid "refusing to lose untracked file at '%s'"
+msgstr "rehusando perder el archivo no rastreado en '%s'"
+
+#, c-format
+msgid "blob expected for %s '%s'"
+msgstr "se esperaba blob para %s '%s'"
+
+#, c-format
+msgid "failed to open '%s': %s"
+msgstr "falló al abrir '%s': %s"
+
+#, c-format
+msgid "failed to symlink '%s': %s"
+msgstr "falló al crear el enlace simbólico '%s': %s"
+
+#, c-format
+msgid "do not know what to do with %06o %s '%s'"
+msgstr "no sé qué hacer con %06o %s '%s'"
+
+#, c-format
+msgid "Fast-forwarding submodule %s to the following commit:"
+msgstr "Haciendo fast-forward a submódulo %s hasta el siguiente commit:"
+
+#, c-format
+msgid "Fast-forwarding submodule %s"
+msgstr "Avance rápido en submódulo %s"
+
+#, 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)"
+
+#, 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)"
+
+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"
+
+#, c-format
+msgid "Failed to merge submodule %s (multiple merges found)"
+msgstr "Falló al fusionar el submódulo %s (múltiples fusiones encontradas)"
+
+#, 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."
+
+#, c-format
+msgid ""
+"CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s left "
+"in tree."
+msgstr ""
+"CONFLICTO (%s/borrar): %s borrado en %s y %s en %s. Se dejó la versión %s de "
+"%s en el árbol."
+
+#, c-format
+msgid ""
+"CONFLICT (%s/delete): %s deleted in %s and %s to %s in %s. Version %s of %s "
+"left in tree."
+msgstr ""
+"CONFLICTO (%s/borrar): %s borrado en %s y %s para %s en %s. Versión %s de %s "
+"permanece en el árbol."
+
+#, c-format
+msgid ""
+"CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s left "
+"in tree at %s."
+msgstr ""
+"CONFLICTO (%s/eliminar): %s eliminado en %s y %s en %s. Versión %s de %s "
+"dejada en el árbol, en %s."
+
+#, 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 ""
+"CONFLICTO (%s/borrar): %s borrado en %s y %s para %s en %s. Versión %s de %s "
+"permanece en el árbol en %s."
+
+msgid "rename"
+msgstr "renombrar"
+
+msgid "renamed"
+msgstr "renombrado"
+
+#, c-format
+msgid "Refusing to lose dirty file at %s"
+msgstr "Rehusando perder el archivo sucio en %s"
+
+#, 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."
+
+#, 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"
+
+#, 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"
+
+#, 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"
+
+#, c-format
+msgid ""
+"CONFLICT (rename/rename): Rename \"%s\"->\"%s\" in branch \"%s\" rename "
+"\"%s\"->\"%s\" in \"%s\"%s"
+msgstr ""
+"CONFLICTO (renombrar/renombrar): Renombrar \"%s\"->\"%s\" en la rama \"%s\" "
+"renombrar \"%s\"->\"%s\" en \"%s\"%s"
+
+msgid " (left unresolved)"
+msgstr " (dejado sin resolver)"
+
+#, 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"
+
+#, c-format
+msgid ""
+"CONFLICT (directory rename split): Unclear where to place %s because "
+"directory %s was renamed to multiple other directories, with no destination "
+"getting a majority of the files."
+msgstr ""
+"CONFLICTO (división de cambio de nombre de directorio): No es claro dónde "
+"colocar %s porque el directorio %s fue renombrado a múltiples otros "
+"directorios, sin ningún que contenga la mayoría de archivos."
+
+#, c-format
+msgid ""
+"CONFLICT (rename/rename): Rename directory %s->%s in %s. Rename directory %s-"
+">%s in %s"
+msgstr ""
+"CONFLICTO (renombrar/renombrar): Renombrar directorio %s->%s en %s. "
+"Renombrar directorio %s->%s en %s"
+
+msgid "modify"
+msgstr "modificar"
+
+msgid "modified"
+msgstr "modificado"
+
+#, c-format
+msgid "Skipped %s (merged same as existing)"
+msgstr "Saltado %s (fusionado como existente)"
+
+#, c-format
+msgid "Adding as %s instead"
+msgstr "Agregando más bien como %s"
+
+#, c-format
+msgid "Removing %s"
+msgstr "Eliminando %s"
+
+msgid "file/directory"
+msgstr "archivo/directorio"
+
+msgid "directory/file"
+msgstr "directorio/archivo"
+
+#, 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"
+
+#, c-format
+msgid "Adding %s"
+msgstr "Agregando %s"
+
+#, c-format
+msgid "CONFLICT (add/add): Merge conflict in %s"
+msgstr "CONFLICTO (add/add): Conflicto de merge en %s"
+
+#, c-format
+msgid "merging of trees %s and %s failed"
+msgstr "falló la fusión de los árboles %s y %s"
+
+msgid "Merging:"
+msgstr "Fusionando:"
+
+#, 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:"
+
+msgid "merge returned no commit"
+msgstr "la fusión no devolvió ningún commit"
+
+#, c-format
+msgid "Could not parse object '%s'"
+msgstr "No se pudo analizar el objeto '%s'"
+
+msgid "failed to read the cache"
+msgstr "falló al leer la cache"
+
+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"
+
+#, c-format
+msgid "multi-pack-index file %s is too small"
+msgstr "el archivo multi-pack-index %s es demasiado pequeño"
+
+#, 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"
+
+#, c-format
+msgid "multi-pack-index version %d not recognized"
+msgstr "versión %d de multi-pack-index no reconocida"
+
+#, 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"
+
+msgid "multi-pack-index missing required pack-name chunk"
+msgstr "a multi-pack-index le falta el fragmento pack-name requerido"
+
+msgid "multi-pack-index missing required OID fanout chunk"
+msgstr "a multi-pack-index le falta el fragmento OID fanout requerido"
+
+msgid "multi-pack-index missing required OID lookup chunk"
+msgstr "a multi-pack-index le falta el fragmento OID lookup requerido"
+
+msgid "multi-pack-index missing required object offsets chunk"
+msgstr ""
+"a multi-pack-index le falta el fragmento de offsets de objeto requerido"
+
+#, 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'"
+
+#, c-format
+msgid "bad pack-int-id: %u (%u total packs)"
+msgstr "mal pack-int-id: %u (%u paquetes totales)"
+
+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"
+
+#, c-format
+msgid "failed to add packfile '%s'"
+msgstr "falló al agregar packfile '%s'"
+
+#, c-format
+msgid "failed to open pack-index '%s'"
+msgstr "falló al abrir pack-index '%s'"
+
+#, c-format
+msgid "failed to locate object %d in packfile"
+msgstr "falló al ubicar objeto %d en packfile"
+
+msgid "cannot store reverse index file"
+msgstr "no se puede almacenar el archivo de índice inverso"
+
+#, c-format
+msgid "could not parse line: %s"
+msgstr "no se puede analizar línea: %s"
+
+#, c-format
+msgid "malformed line: %s"
+msgstr "línea mal formada: %s"
+
+msgid "ignoring existing multi-pack-index; checksum mismatch"
+msgstr "ignorando el actual multi-pack-index; checksum no concuerda"
+
+msgid "could not load pack"
+msgstr "no se pudo cargar pack"
+
+#, c-format
+msgid "could not open index for %s"
+msgstr "no se puede abrir index para %s"
+
+msgid "Adding packfiles to multi-pack-index"
+msgstr "Agregando packfiles a multi-pack-index"
+
+#, c-format
+msgid "unknown preferred pack: '%s'"
+msgstr "pack preferido desconocido: '%s'"
+
+#, c-format
+msgid "cannot select preferred pack %s with no objects"
+msgstr "no se pueden seleccionar el paquete preferido %s sin objetos"
+
+#, c-format
+msgid "did not see pack-file %s to drop"
+msgstr "no se vió el pack-file que abandonar %s"
+
+#, c-format
+msgid "preferred pack '%s' is expired"
+msgstr "pack de referencia '% s' ha expirado"
+
+msgid "no pack files to index."
+msgstr "no hay archivos pack para indexar."
+
+#, fuzzy
+msgid "refusing to write multi-pack .bitmap without any objects"
+msgstr "no se pudo escribir bitmap multi-paquete"
+
+msgid "could not write multi-pack bitmap"
+msgstr "no se pudo escribir bitmap multi-paquete"
+
+msgid "could not write multi-pack-index"
+msgstr "no se pudo escribir multi-pack-index"
+
+#, c-format
+msgid "failed to clear multi-pack-index at %s"
+msgstr "falló al limpiar multi-pack-index en %s"
+
+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"
+
+msgid "incorrect checksum"
+msgstr "checksum incorrecto"
+
+msgid "Looking for referenced packfiles"
+msgstr "Buscando packfiles referidos"
+
+#, 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]"
+
+msgid "the midx contains no oid"
+msgstr "el midx no contiene oid"
+
+msgid "Verifying OID order in multi-pack-index"
+msgstr "Verificando orden de OID en multi-pack-index"
+
+#, 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]"
+
+msgid "Sorting objects by packfile"
+msgstr "Ordenando objetos por packfile"
+
+msgid "Verifying object offsets"
+msgstr "Verificando offsets de objetos"
+
+#, c-format
+msgid "failed to load pack entry for oid[%d] = %s"
+msgstr "fallo al cargar entrada pack para oid[%d] = %s"
+
+#, c-format
+msgid "failed to load pack-index for packfile %s"
+msgstr "falló al cargar el pack-index para packfile %s"
+
+#, c-format
+msgid "incorrect object offset for oid[%d] = %s: %<PRIx64> != %<PRIx64>"
+msgstr "offset para objeto incorrecto oid[%d] = %s: %<PRIx64> != %<PRIx64>"
+
+msgid "Counting referenced objects"
+msgstr "Contando objetos no referenciados"
+
+msgid "Finding and deleting unreferenced packfiles"
+msgstr "Encontrando y borrando packfiles sin referencias"
+
+msgid "could not start pack-objects"
+msgstr "no se pudo iniciar pack-objects"
+
+msgid "could not finish pack-objects"
+msgstr "no se pudo finalizar pack-objects"
+
+#, c-format
+msgid "unable to create lazy_dir thread: %s"
+msgstr "no es posible crear hilo lazy_dir: %s"
+
+#, c-format
+msgid "unable to create lazy_name thread: %s"
+msgstr "no es posible crear hilo lazy_name: %s"
+
+#, c-format
+msgid "unable to join lazy_name thread: %s"
+msgstr "no es posible unir hilo lazy_name: %s"
+
+#, 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."
+msgstr ""
+"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."
+
+#, c-format
+msgid "You have not concluded your notes merge (%s exists)."
+msgstr "No has terminado tu fusión de notas (%s existe)."
+
+msgid "Cannot commit uninitialized/unreferenced notes tree"
+msgstr ""
+"No se puede realizar commit, árbol de notas no inicializado o no referenciado"
+
+#, c-format
+msgid "Bad notes.rewriteMode value: '%s'"
+msgstr "Valor erróneo para notes.rewriteMode: '%s'"
+
+#, c-format
+msgid "Refusing to rewrite notes in %s (outside of refs/notes/)"
+msgstr "Rehusando reescribir notas en %s (fuera de refs/notes/)"
+
+#. TRANSLATORS: The first %s is the name of
+#. the environment variable, the second %s is
+#. its value.
+#.
+#, c-format
+msgid "Bad %s value: '%s'"
+msgstr "Valor erróneo para %s: '%s'"
+
+#, 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"
+
+#, c-format
+msgid "unable to normalize alternate object path: %s"
+msgstr "incapaz de normalizar la ruta de objeto alterno: %s"
+
+#, c-format
+msgid "%s: ignoring alternate object stores, nesting too deep"
+msgstr "%s: ignorando espacios de objetos alternos, anidado demasiado profundo"
+
+#, c-format
+msgid "unable to normalize object directory: %s"
+msgstr "incapaz de normalizar directorio de objetos: %s"
+
+msgid "unable to fdopen alternates lockfile"
+msgstr "no es posible hacer fdopen en lockfile alternos"
+
+msgid "unable to read alternates file"
+msgstr "no es posible leer el archivo de alternativos"
+
+msgid "unable to move new alternates file into place"
+msgstr "no es posible mover el nuevo archivo de alternativos al lugar"
+
+#, c-format
+msgid "path '%s' does not exist"
+msgstr "ruta '%s' no existe"
+
+#, 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."
+
+#, c-format
+msgid "reference repository '%s' is not a local repository."
+msgstr "repositorio de referencia '%s' no es un repositorio local."
+
+#, c-format
+msgid "reference repository '%s' is shallow"
+msgstr "repositorio de referencia '%s' es superficial (shallow)"
+
+#, c-format
+msgid "reference repository '%s' is grafted"
+msgstr "repositorio de referencia '% s' está injertado"
+
+#, c-format
+msgid "could not find object directory matching %s"
+msgstr "no se pudo encontrar el directorio de objetos concordante con %s"
+
+#, c-format
+msgid "invalid line while parsing alternate refs: %s"
+msgstr "línea inválida mientras se analizaban refs alternas: %s"
+
+#, c-format
+msgid "attempting to mmap %<PRIuMAX> over limit %<PRIuMAX>"
+msgstr "intentando usar mmap %<PRIuMAX> sobre límite %<PRIuMAX>"
+
+#, c-format
+msgid "mmap failed%s"
+msgstr "mmap falló %s"
+
+#, c-format
+msgid "object file %s is empty"
+msgstr "archivo de objeto %s está vacío"
+
+#, c-format
+msgid "corrupt loose object '%s'"
+msgstr "objeto suelto corrupto '%s'"
+
+#, c-format
+msgid "garbage at end of loose object '%s'"
+msgstr "basura al final del objeto suelto '%s'"
+
+#, c-format
+msgid "unable to parse %s header"
+msgstr "incapaz de analizar header %s"
+
+msgid "invalid object type"
+msgstr "tipo de objeto inválido"
+
+#, c-format
+msgid "unable to unpack %s header"
+msgstr "incapaz de desempaquetar header %s"
+
+#, c-format
+msgid "header for %s too long, exceeds %d bytes"
+msgstr "cabecera para %s es muy larga, excede %d bytes"
+
+#, c-format
+msgid "failed to read object %s"
+msgstr "falló al leer objeto %s"
+
+#, c-format
+msgid "replacement %s not found for %s"
+msgstr "reemplazo %s no encontrado para %s"
+
+#, c-format
+msgid "loose object %s (stored in %s) is corrupt"
+msgstr "objeto suelto %s (guardado en %s) está corrompido"
+
+#, c-format
+msgid "packed object %s (stored in %s) is corrupt"
+msgstr "objeto empaquetado %s (guardado en %s) está corrompido"
+
+#, c-format
+msgid "unable to write file %s"
+msgstr "no es posible escribir archivo %s"
+
+#, c-format
+msgid "unable to set permission to '%s'"
+msgstr "no se pudo poner permisos a '%s'"
+
+msgid "file write error"
+msgstr "falló de escritura"
+
+msgid "error when closing loose object file"
+msgstr "error al cerrar el archivo de objeto suelto"
+
+#, 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"
+
+msgid "unable to create temporary file"
+msgstr "no es posible crear un archivo temporal"
+
+msgid "unable to write loose object file"
+msgstr "no es posible escribir el archivo de objeto suelto"
+
+#, c-format
+msgid "unable to deflate new object %s (%d)"
+msgstr "no es posible desinflar el objeto nuevo %s (%d)"
+
+#, c-format
+msgid "deflateEnd on object %s failed (%d)"
+msgstr "deflateEnd en objeto %s falló (%d)"
+
+#, c-format
+msgid "confused by unstable object source data for %s"
+msgstr "confundido por fuente de data de objetos inestable para %s"
+
+#, c-format
+msgid "cannot read object for %s"
+msgstr "no se pudo leer el objeto para %s"
+
+msgid "corrupt commit"
+msgstr "commit corrupto"
+
+msgid "corrupt tag"
+msgstr "tag corrupto"
+
+#, c-format
+msgid "read error while indexing %s"
+msgstr "error de lectura al indexar %s"
+
+#, c-format
+msgid "short read while indexing %s"
+msgstr "lectura corta al indexar %s"
+
+#, c-format
+msgid "%s: failed to insert into database"
+msgstr "%s: falló al insertar en la base de datos"
+
+#, c-format
+msgid "%s: unsupported file type"
+msgstr "%s: tipo de archivo no soportado"
+
+#, c-format
+msgid "%s is not a valid '%s' object"
+msgstr "%s no es un objeto '%s' válido"
+
+#, c-format
+msgid "unable to open %s"
+msgstr "no es posible abrir %s"
+
+#, c-format
+msgid "hash mismatch for %s (expected %s)"
+msgstr "hash no concuerda para %s (se esperaba %s)"
+
+#, c-format
+msgid "unable to mmap %s"
+msgstr "no es posible hacer mmap a %s"
+
+#, c-format
+msgid "unable to unpack header of %s"
+msgstr "incapaz de desempaquetar header de %s"
+
+#, c-format
+msgid "unable to parse header of %s"
+msgstr "incapaz de analizar header de %s"
+
+#, c-format
+msgid "unable to unpack contents of %s"
+msgstr "no es posible desempaquetar contenidos de %s"
+
+#. TRANSLATORS: This is a line of ambiguous object
+#. output shown when we cannot look up or parse the
+#. object in question. E.g. "deadbeef [bad object]".
+#.
+#, fuzzy, c-format
+msgid "%s [bad object]"
+msgstr "tipo de objeto erróneo."
+
+#. TRANSLATORS: This is a line of ambiguous commit
+#. object output. E.g.:
+#. *
+#.    "deadbeef commit 2021-01-01 - Some Commit Message"
+#.
+#, fuzzy, c-format
+msgid "%s commit %s - %s"
+msgstr "%s: %s - %s"
+
+#. TRANSLATORS: This is a line of ambiguous
+#. tag object output. E.g.:
+#. *
+#.    "deadbeef tag 2022-01-01 - Some Tag Message"
+#. *
+#. The second argument is the YYYY-MM-DD found
+#. in the tag.
+#. *
+#. The third argument is the "tag" string
+#. from object.c.
+#.
+#, fuzzy, c-format
+msgid "%s tag %s - %s"
+msgstr "%s: %s - %s"
+
+#. TRANSLATORS: This is a line of ambiguous
+#. tag object output where we couldn't parse
+#. the tag itself. E.g.:
+#. *
+#.    "deadbeef [bad tag, could not parse it]"
+#.
+#, fuzzy, c-format
+msgid "%s [bad tag, could not parse it]"
+msgstr "%s: no se pudo analizar objeto: %s"
+
+#. TRANSLATORS: This is a line of ambiguous <type>
+#. object output. E.g. "deadbeef tree".
+#.
+#, fuzzy, c-format
+msgid "%s tree"
+msgstr "hilo %s falló"
+
+#. TRANSLATORS: This is a line of ambiguous <type>
+#. object output. E.g. "deadbeef blob".
+#.
+#, fuzzy, c-format
+msgid "%s blob"
+msgstr "blob"
+
+#, c-format
+msgid "short object ID %s is ambiguous"
+msgstr "el ID de objeto corto %s es ambiguo"
+
+#. TRANSLATORS: The argument is the list of ambiguous
+#. objects composed in show_ambiguous_object(). See
+#. its "TRANSLATORS" comments for details.
+#.
+#, fuzzy, c-format
+msgid ""
+"The candidates are:\n"
+"%s"
+msgstr "Los candidatos son:"
+
+msgid ""
+"Git normally never creates a ref that ends with 40 hex characters\n"
+"because it will be ignored when you just specify 40-hex. These refs\n"
+"may be created by mistake. For example,\n"
+"\n"
+"  git switch -c $br $(git rev-parse ...)\n"
+"\n"
+"where \"$br\" is somehow empty and a 40-hex ref is created. Please\n"
+"examine these refs and maybe delete them. Turn this message off by\n"
+"running \"git config advice.objectNameWarning false\""
+msgstr ""
+"Git normalmente nunca crea una ref que termine con 40 caracteres hex\n"
+"porque esto sería ignorado cuando solo se especifiquen 40-hex. Estas refs\n"
+"tal vez sean creadas por error. Por ejemplo,\n"
+"\n"
+"  git switch -c $br $(git rev-parse ...)\n"
+"\n"
+"donde \"$br\" está de alguna manera vacía y una ref de 40-hex es creada. Por "
+"favor\n"
+"examina estas refs y tal vez bórralas. Silencia este mensaje\n"
+"ejecutando \"git config advice.objectNameWarning false\""
+
+#, c-format
+msgid "log for '%.*s' only goes back to %s"
+msgstr "log para '%.*s' solo va hasta %s"
+
+#, c-format
+msgid "log for '%.*s' only has %d entries"
+msgstr "log para '%.*s' solo tiene %d entradas"
+
+#, c-format
+msgid "path '%s' exists on disk, but not in '%.*s'"
+msgstr "la ruta '%s' existe en disco, pero no en '%.*s'"
+
+#, c-format
+msgid ""
+"path '%s' exists, but not '%s'\n"
+"hint: Did you mean '%.*s:%s' aka '%.*s:./%s'?"
+msgstr ""
+"ruta '%s' existe, pero no '%s'\n"
+"ayuda: ¿Quisiste decir '%.*s:%s' o '%.*s:./%s'?"
+
+#, c-format
+msgid "path '%s' does not exist in '%.*s'"
+msgstr "ruta '%s' no existe en '%.*s'"
+
+#, c-format
+msgid ""
+"path '%s' is in the index, but not at stage %d\n"
+"hint: Did you mean ':%d:%s'?"
+msgstr ""
+"ruta '%s' está en el índice, pero no en stage %d\n"
+"ayuda: ¿Quisiste decir: '%d:%s'?"
+
+#, c-format
+msgid ""
+"path '%s' is in the index, but not '%s'\n"
+"hint: Did you mean ':%d:%s' aka ':%d:./%s'?"
+msgstr ""
+"ruta '%s' está en el índice, pero no '%s'\n"
+"ayuda: ¿Quisiste decir ':%d:%s' o ':%d:./%s'?"
+
+#, c-format
+msgid "path '%s' exists on disk, but not in the index"
+msgstr "ruta '%s' existe en el disco, pero no en el índice"
+
+#, c-format
+msgid "path '%s' does not exist (neither on disk nor in the index)"
+msgstr "ruta '%s' no existe (ni en disco ni en el índice)"
+
+msgid "relative path syntax can't be used outside working tree"
+msgstr ""
+"la sintaxis de ruta relativa no se puede usar fuera del directorio de trabajo"
+
+#, c-format
+msgid "<object>:<path> required, only <object> '%s' given"
+msgstr ""
+
+#, c-format
+msgid "invalid object name '%.*s'."
+msgstr "nombre de objeto no válido: '%.*s'."
+
+#, c-format
+msgid "invalid object type \"%s\""
+msgstr "tipo de objeto \"%s\" inválido"
+
+#, c-format
+msgid "object %s is a %s, not a %s"
+msgstr "objeto %s es un %s, no un %s"
+
+#, c-format
+msgid "object %s has unknown type id %d"
+msgstr "el objeto %s tiene un id de tipo desconocido %d"
+
+#, c-format
+msgid "unable to parse object: %s"
+msgstr "incapaz de analizar objeto: %s"
+
+#, c-format
+msgid "hash mismatch %s"
+msgstr "hash no concuerda %s"
+
+msgid "multi-pack bitmap is missing required reverse index"
+msgstr "a multi-pack-index le falta un índice reveretido"
+
+#, fuzzy, c-format
+msgid "could not open pack %s"
+msgstr "no se pudo abrir '%s'"
+
+#, fuzzy, c-format
+msgid "preferred pack (%s) is invalid"
+msgstr "pack de referencia '% s' ha expirado"
+
+#, 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>"
+
+#, fuzzy, c-format
+msgid "mtimes file %s is too small"
+msgstr "el archivo multi-pack-index %s es demasiado pequeño"
+
+#, fuzzy, c-format
+msgid "mtimes file %s has unknown signature"
+msgstr "el archivo de índice inverso %s tiene una firma desconocida"
+
+#, fuzzy, c-format
+msgid "mtimes file %s has unsupported version %<PRIu32>"
+msgstr "archivo reverse-index %s tiene una versión no soportada %<PRIu32>"
+
+#, fuzzy, c-format
+msgid "mtimes file %s has unsupported hash id %<PRIu32>"
+msgstr "archivo reverse-index %s tiene un id de hash no soportado %<PRIu32>"
+
+#, fuzzy, c-format
+msgid "mtimes file %s is corrupt"
+msgstr "el archivo de índice inverso %s está dañado"
+
+#, c-format
+msgid "reverse-index file %s is too small"
+msgstr "el archivo de índice inverso %s es demasiado pequeño"
+
+#, c-format
+msgid "reverse-index file %s is corrupt"
+msgstr "el archivo de índice inverso %s está dañado"
+
+#, c-format
+msgid "reverse-index file %s has unknown signature"
+msgstr "el archivo de índice inverso %s tiene una firma desconocida"
+
+#, c-format
+msgid "reverse-index file %s has unsupported version %<PRIu32>"
+msgstr "archivo reverse-index %s tiene una versión no soportada %<PRIu32>"
+
+#, c-format
+msgid "reverse-index file %s has unsupported hash id %<PRIu32>"
+msgstr "archivo reverse-index %s tiene un id de hash no soportado %<PRIu32>"
+
+msgid "cannot both write and verify reverse index"
+msgstr "no puede escribir y verificar el índice inverso"
+
+#, c-format
+msgid "could not stat: %s"
+msgstr "no se pudo hacer stat: %s"
+
+#, c-format
+msgid "failed to make %s readable"
+msgstr "no pudo hacer %s legible"
+
+#, c-format
+msgid "could not write '%s' promisor file"
+msgstr "no se pudo escribir el archivo promisor '%s'"
+
+msgid "offset before end of packfile (broken .idx?)"
+msgstr "offset antes del final del paquete (¿.idx roto?)"
+
+#, c-format
+msgid "packfile %s cannot be mapped%s"
+msgstr "objeto %s no puede ser mapeado %s"
+
+#, 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?)"
+
+#, 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?)"
+
+#, c-format
+msgid "malformed expiration date '%s'"
+msgstr "fecha de caducidad mal formada: '%s'"
+
+#, c-format
+msgid "option `%s' expects \"always\", \"auto\", or \"never\""
+msgstr "opción `%s' puede usar \"always\", \"auto\", o \"never\""
+
+#, c-format
+msgid "malformed object name '%s'"
+msgstr "nombre de objeto mal formado '%s'"
+
+#, fuzzy, c-format
+msgid "option `%s' expects \"%s\" or \"%s\""
+msgstr "opción `%s' puede usar \"always\", \"auto\", o \"never\""
+
+#, c-format
+msgid "%s requires a value"
+msgstr "%s requiere un valor"
+
+#, c-format
+msgid "%s is incompatible with %s"
+msgstr "%s es incompatible con %s"
+
+#, c-format
+msgid "%s : incompatible with something else"
+msgstr "%s : incompatible con otra cosa"
+
+#, c-format
+msgid "%s takes no value"
+msgstr "%s no toma valores"
+
+#, c-format
+msgid "%s isn't available"
+msgstr "%s no está disponible"
+
+#, 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"
+
+#, 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)"
+
+#, c-format
+msgid "did you mean `--%s` (with two dashes)?"
+msgstr "¿quisiste decir `--%s` (con dos guiones)?"
+
+#, c-format
+msgid "alias of --%s"
+msgstr "alias de --%s"
+
+#, c-format
+msgid "unknown option `%s'"
+msgstr "opción `%s' desconocida"
+
+#, c-format
+msgid "unknown switch `%c'"
+msgstr "switch desconocido `%c'"
+
+#, c-format
+msgid "unknown non-ascii option in string: `%s'"
+msgstr "opción desconocida en string no ascii: `%s'"
+
+msgid "..."
+msgstr "..."
+
+#, c-format
+msgid "usage: %s"
+msgstr "uso: %s"
+
+#. TRANSLATORS: the colon here should align with the
+#. one in "usage: %s" translation.
+#.
+#, c-format
+msgid "   or: %s"
+msgstr "   o: %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.
+#.
+#, c-format
+msgid "%*s%s"
+msgstr "%*s%s"
+
+#, c-format
+msgid "    %s"
+msgstr "    %s"
+
+msgid "-NUM"
+msgstr "-NUM"
+
+msgid "expiry-date"
+msgstr "fecha de caducidad"
+
+msgid "no-op (backward compatibility)"
+msgstr "no-op (compatibilidad con versiones anteriores)"
+
+msgid "be more verbose"
+msgstr "ser más verboso"
+
+msgid "be more quiet"
+msgstr "ser más callado"
+
+msgid "use <n> digits to display object names"
+msgstr "usar <n> cifras para mostrar los nombres de los objetos"
+
+msgid "how to strip spaces and #comments from message"
+msgstr "cómo quitar espacios y #comentarios de mensajes"
+
+msgid "read pathspec from file"
+msgstr "leer pathspec de archivo"
+
+msgid ""
+"with --pathspec-from-file, pathspec elements are separated with NUL character"
+msgstr ""
+"con --pathspec-from-file, elementos de pathspec son separados con carácter "
+"NUL"
+
+#, c-format
+msgid "Could not make %s writable by group"
+msgstr "No se pudo hacer que %s fuera escribible por el grupo"
+
+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"
+
+msgid "Only one 'attr:' specification is allowed."
+msgstr "Solo se permite una única especificación 'attr'."
+
+msgid "attr spec must not be empty"
+msgstr "la especificación attr no puede estar vacía"
+
+#, c-format
+msgid "invalid attribute name %s"
+msgstr "nombre de atributo %s inválido"
+
+msgid "global 'glob' and 'noglob' pathspec settings are incompatible"
+msgstr ""
+"configuraciones globales de pathspec 'glob' y 'noglob' son incompatibles"
+
+msgid ""
+"global 'literal' pathspec setting is incompatible with all other global "
+"pathspec settings"
+msgstr ""
+"la configuración global de 'literal' para patrones de ruta es incompatible "
+"con las demás configuraciones globales de patrones de ruta"
+
+msgid "invalid parameter for pathspec magic 'prefix'"
+msgstr "parámetro no válido para la magia de pathspec 'prefix'"
+
+#, c-format
+msgid "Invalid pathspec magic '%.*s' in '%s'"
+msgstr "Magia de pathspec inválida '%.*s' en '%s'"
+
+#, c-format
+msgid "Missing ')' at the end of pathspec magic in '%s'"
+msgstr "Falta ')' al final de la magia de pathspec en '%s'"
+
+#, c-format
+msgid "Unimplemented pathspec magic '%c' in '%s'"
+msgstr "Magia de pathspec '%c' no implementada en '%s'"
+
+#, c-format
+msgid "%s: 'literal' and 'glob' are incompatible"
+msgstr "%s: 'literal' y 'glob' son incompatibles"
+
+#, c-format
+msgid "%s: '%s' is outside repository at '%s'"
+msgstr "%s: '%s' está fuera del repositorio en '%s'"
+
+#, c-format
+msgid "'%s' (mnemonic: '%c')"
+msgstr "'%s' (nemotécnico: '%c')"
+
+#, c-format
+msgid "%s: pathspec magic not supported by this command: %s"
+msgstr "%s: magia de pathspec no soportada por este comando: %s"
+
+#, 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"
+
+#, c-format
+msgid "line is badly quoted: %s"
+msgstr "la línea está mal entrecomillada: %s"
+
+msgid "unable to write flush packet"
+msgstr "no es posible escribir flush packet"
+
+msgid "unable to write delim packet"
+msgstr "no es posible escribir delim packet"
+
+msgid "unable to write response end packet"
+msgstr "no es posible escribir paquete de respuesta final"
+
+msgid "flush packet write failed"
+msgstr "escritura de paquete de vaciamiento falló"
+
+msgid "protocol error: impossibly long line"
+msgstr "error de protocolo: línea imposiblemente larga"
+
+msgid "packet write with format failed"
+msgstr "escritura de paquetes con formato falló"
+
+msgid "packet write failed - data exceeds max packet size"
+msgstr "fallo al escribir paquete - la data excede al tamaño máximo de paquete"
+
+#, c-format
+msgid "packet write failed: %s"
+msgstr "escritura de paquetes falló: %s"
+
+msgid "read error"
+msgstr "error de lectura"
+
+msgid "the remote end hung up unexpectedly"
+msgstr "el remoto se colgó de manera inesperada"
+
+#, c-format
+msgid "protocol error: bad line length character: %.4s"
+msgstr "error de protocolo: mal carácter de largo de línea: %.4s"
+
+#, c-format
+msgid "protocol error: bad line length %d"
+msgstr "error de protocolo: mal largo de línea %d"
+
+#, c-format
+msgid "remote error: %s"
+msgstr "error remoto: %s"
+
+msgid "Refreshing index"
+msgstr "Refrescando index"
+
+#, c-format
+msgid "unable to create threaded lstat: %s"
+msgstr "no es posible crear lstat hilado: %s"
+
+msgid "unable to parse --pretty format"
+msgstr "incapaz de analizar el formato de --pretty"
+
+msgid "promisor-remote: unable to fork off fetch subprocess"
+msgstr "promisor-remote: no se puede bifurcar el subproceso de fetch"
+
+msgid "promisor-remote: could not write to fetch subprocess"
+msgstr "promisor-remote: no se pudo escribir al subproceso de fetch"
+
+msgid "promisor-remote: could not close stdin to fetch subprocess"
+msgstr "promisor-remote: no se pudo cerrar stdin al subproceso de fetch"
+
+#, c-format
+msgid "promisor remote name cannot begin with '/': %s"
+msgstr "nombre remoto promisor no puede comenzar con '/': %s"
+
+msgid "object-info: expected flush after arguments"
+msgstr "info de objeto: se espera flush tras argumentos"
+
+msgid "Removing duplicate objects"
+msgstr "Quitando objetos duplicados"
+
+msgid "could not start `log`"
+msgstr "no se pudo comenzar `log`"
+
+msgid "could not read `log` output"
+msgstr "no se pudo leer salida de `log`"
+
+#, c-format
+msgid "could not parse commit '%s'"
+msgstr "no se pudo analizar commit '%s'"
+
+#, c-format
+msgid ""
+"could not parse first line of `log` output: did not start with 'commit ': "
+"'%s'"
+msgstr ""
+"no se pudo leer la primera línea de salida de `log`: no comienza con 'commit "
+"': '%s'"
+
+#, c-format
+msgid "could not parse git header '%.*s'"
+msgstr "no se puede analizar git header '%.*s'"
+
+msgid "failed to generate diff"
+msgstr "falló al generar diff"
+
+#, c-format
+msgid "could not parse log for '%s'"
+msgstr "no se pudo leer el log para '%s'"
+
+#, c-format
+msgid "will not add file alias '%s' ('%s' already exists in index)"
+msgstr "no agregará alias de archivo '%s' ('%s' ya existe en el índice)"
+
+msgid "cannot create an empty blob in the object database"
+msgstr "no se puede crear un blob vacío en la base de datos de objetos"
+
+#, c-format
+msgid "%s: can only add regular files, symbolic links or git-directories"
+msgstr ""
+"%s: solo se pueden agregar archivos regulares, symbolic links o git-"
+"directories"
+
+#, c-format
+msgid "unable to index file '%s'"
+msgstr "no es posible indexar archivo '%s'"
+
+#, c-format
+msgid "unable to add '%s' to index"
+msgstr "no es posible agregar '%s' al index"
+
+#, c-format
+msgid "unable to stat '%s'"
+msgstr "incapaz de hacer stat en '%s'"
+
+#, 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"
+
+msgid "Refresh index"
+msgstr "Refrescar index"
+
+#, c-format
+msgid ""
+"index.version set, but the value is invalid.\n"
+"Using version %i"
+msgstr ""
+"index.version configurado, pero el valor no es válido.\n"
+"Usando versión %i"
+
+#, c-format
+msgid ""
+"GIT_INDEX_VERSION set, but the value is invalid.\n"
+"Using version %i"
+msgstr ""
+"GIT_INDEX_VERSION configurado, pero el valor no es válido.\n"
+"Usando versión %i"
+
+#, c-format
+msgid "bad signature 0x%08x"
+msgstr "mala firma 0x%08x"
+
+#, c-format
+msgid "bad index version %d"
+msgstr "mala versión de índice %d"
+
+msgid "bad index file sha1 signature"
+msgstr "mala firma sha1 del archivo index"
+
+#, c-format
+msgid "index uses %.4s extension, which we do not understand"
+msgstr "index usa la extensión %.4s, cosa que no entendemos"
+
+#, c-format
+msgid "ignoring %.4s extension"
+msgstr "ignorando extensión %.4s"
+
+#, c-format
+msgid "unknown index entry format 0x%08x"
+msgstr "formato de índice desconocido 0x%08x"
+
+#, c-format
+msgid "malformed name field in the index, near path '%s'"
+msgstr "campo nombre malformado en el índice, cerca de ruta '%s'"
+
+msgid "unordered stage entries in index"
+msgstr "entradas en stage desordenadas en index"
+
+#, c-format
+msgid "multiple stage entries for merged file '%s'"
+msgstr "múltiples entradas de stage para archivo fusionado '%s'"
+
+#, c-format
+msgid "unordered stage entries for '%s'"
+msgstr "entradas de stage desordenadas para '%s'"
+
+#, c-format
+msgid "unable to create load_cache_entries thread: %s"
+msgstr "no es posible crear hilo load_cache_entries: %s"
+
+#, c-format
+msgid "unable to join load_cache_entries thread: %s"
+msgstr "no es posible unir hilo load_cache_entries: %s"
+
+#, c-format
+msgid "%s: index file open failed"
+msgstr "%s: falló al abrir el archivo index"
+
+#, c-format
+msgid "%s: cannot stat the open index"
+msgstr "%s: no se puede hacer stat en el índice abierto"
+
+#, c-format
+msgid "%s: index file smaller than expected"
+msgstr "%s: archivo index más pequeño de lo esperado"
+
+#, c-format
+msgid "%s: unable to map index file%s"
+msgstr "%s: no se pudo mapear el archivo index %s"
+
+#, c-format
+msgid "unable to create load_index_extensions thread: %s"
+msgstr "no es posible crear hilo load_index_extensions: %s"
+
+#, c-format
+msgid "unable to join load_index_extensions thread: %s"
+msgstr "no es posible unir hilo load_index_extensions: %s"
+
+#, c-format
+msgid "could not freshen shared index '%s'"
+msgstr "no se pudo refrescar el índice compartido '%s'"
+
+#, c-format
+msgid "broken index, expect %s in %s, got %s"
+msgstr "index roto, se esperaba %s en %s, se obtuvo %s"
+
+#, fuzzy
+msgid "cannot write split index for a sparse index"
+msgstr "activar el uso de un índice sparse"
+
+msgid "failed to convert to a sparse-index"
+msgstr "falló al convertir a un índice sparse"
+
+#, c-format
+msgid "could not stat '%s'"
+msgstr "no se pudo hacer stat en '%s'"
+
+#, c-format
+msgid "unable to open git dir: %s"
+msgstr "no es posible abrir el directorio de git: %s"
+
+#, c-format
+msgid "unable to unlink: %s"
+msgstr "no es posible eliminar el vinculo: %s"
+
+#, c-format
+msgid "cannot fix permission bits on '%s'"
+msgstr "no se pudo arreglar bits de permisos en '%s'"
+
+#, c-format
+msgid "%s: cannot drop to stage #0"
+msgstr "%s: no se puede eliminar hasta stage #0"
+
+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 ""
+"Se puede arreglar esto con 'git rebase --edit-todo' y después ejecuta 'git "
+"rebase --continue'.\n"
+"O se puede abortar el rebase con 'git rebase --abort'.\n"
+
+#, c-format
+msgid ""
+"unrecognized setting %s for option rebase.missingCommitsCheck. Ignoring."
+msgstr ""
+"opción %s no reconocida para la opción rebase.missingCommitsCheck. Ignorando."
+
+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 [-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"
+"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 refrasear el mensaje de commit\n"
+"e, edit <commit> = usar commit, pero parar para enmendar\n"
+"s, squash <commit> = usar commit, pero aplastarlo en el commit previo\n"
+"f, fixup <commit> = como \"squash\", pero descarta el mensaje del log de "
+"este commit\n"
+"\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> = 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"
+".       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"
+"Estas líneas pueden ser reordenadas; son ejecutadas desde arriba hacia "
+"abajo.\n"
+
+#, c-format
+msgid "Rebase %s onto %s (%d command)"
+msgid_plural "Rebase %s onto %s (%d commands)"
+msgstr[0] "Rebase %s en %s (%d comando)"
+msgstr[1] "Rebase %s en %s (%d comandos)"
+
+msgid ""
+"\n"
+"Do not remove any line. Use 'drop' explicitly to remove a commit.\n"
+msgstr ""
+"\n"
+"No elimines ninguna línea. Usa 'drop' explícitamente para borrar un commit.\n"
+
+msgid ""
+"\n"
+"If you remove a line here THAT COMMIT WILL BE LOST.\n"
+msgstr ""
+"\n"
+"Si eliminas una línea aquí EL COMMIT SE PERDERÁ.\n"
+
+msgid ""
+"\n"
+"You are editing the todo file of an ongoing interactive rebase.\n"
+"To continue rebase after editing, run:\n"
+"    git rebase --continue\n"
+"\n"
+msgstr ""
+"\n"
+"Estás editando el archivo TODO de un rebase interactivo.\n"
+"Para continuar el rebase después de editar, ejecuta:\n"
+"    git rebase --continue\n"
+"\n"
+
+msgid ""
+"\n"
+"However, if you remove everything, the rebase will be aborted.\n"
+"\n"
+msgstr ""
+"\n"
+"Como sea, si quieres borrar todo, el rebase será abortado.\n"
+"\n"
+
+#, c-format
+msgid "could not write '%s'."
+msgstr "no se pudo escribir '%s'."
+
+#, c-format
+msgid ""
+"Warning: some commits may have been dropped accidentally.\n"
+"Dropped commits (newer to older):\n"
+msgstr ""
+"Peligro: algunos commits pueden haber sido descartados de forma accidental.\n"
+"Commits descartados (empezando con el más nuevo):\n"
+
+#, c-format
+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"
+"The possible behaviours are: ignore, warn, error.\n"
+"\n"
+msgstr ""
+"Para evitar este mensaje, usa \"drop\" para eliminar de forma explícita un "
+"commit.\n"
+"\n"
+"Usa 'git config rebase.missingCommitsCheck' para cambiar el nivel de "
+"advertencias.\n"
+"Los posibles comportamientos son: ignore, warn, error.\n"
+"\n"
+
+#, c-format
+msgid "%s: 'preserve' superseded by 'merges'"
+msgstr "%s: 'preserve' es supercedido por 'merges'"
+
+msgid "gone"
+msgstr "desaparecido"
+
+#, c-format
+msgid "ahead %d"
+msgstr "adelante %d"
+
+#, c-format
+msgid "behind %d"
+msgstr "detrás %d"
+
+#, c-format
+msgid "ahead %d, behind %d"
+msgstr "delante %d, detrás %d"
+
+#, c-format
+msgid "expected format: %%(color:<color>)"
+msgstr "formato esperado: %%(color:<color>)"
+
+#, c-format
+msgid "unrecognized color: %%(color:%s)"
+msgstr "color no reconocido: %%(color:%s)"
+
+#, c-format
+msgid "Integer value expected refname:lstrip=%s"
+msgstr "Valor entero esperado refname:lstrip=%s"
+
+#, c-format
+msgid "Integer value expected refname:rstrip=%s"
+msgstr "Valor entero esperado refname:rstrip=%s"
+
+#, c-format
+msgid "unrecognized %%(%s) argument: %s"
+msgstr "argumento %%(%s) no reconocido: %s"
+
+#, c-format
+msgid "%%(objecttype) does not take arguments"
+msgstr "%%(objecttype) no toma ningún argumento"
+
+#, c-format
+msgid "%%(deltabase) does not take arguments"
+msgstr "%%(deltabase) no toma argumentos"
+
+#, c-format
+msgid "%%(body) does not take arguments"
+msgstr "%%(body) no toma ningún argumento"
+
+#, c-format
+msgid "expected %%(trailers:key=<value>)"
+msgstr "se esperaba %%(trailers:key=<value>)"
+
+#, c-format
+msgid "unknown %%(trailers) argument: %s"
+msgstr "argumento %%(trailers) desconocido: %s"
+
+#, c-format
+msgid "positive value expected contents:lines=%s"
+msgstr "valor positivo esperado contents:lines=%s"
+
+#, c-format
+msgid "positive value expected '%s' in %%(%s)"
+msgstr "valor positivo esperado '%s' en %%(%s)"
+
+#, c-format
+msgid "unrecognized email option: %s"
+msgstr "opción de email desconocida: %s"
+
+#, c-format
+msgid "expected format: %%(align:<width>,<position>)"
+msgstr "formato esperado: %%(align:<ancho>,<posición>)"
+
+#, c-format
+msgid "unrecognized position:%s"
+msgstr "posición desconocida: %s"
+
+#, c-format
+msgid "unrecognized width:%s"
+msgstr "ancho desconocido: %s"
+
+#, c-format
+msgid "positive width expected with the %%(align) atom"
+msgstr "se esperaba un ancho positivo con el átomo %%(align)"
+
+#, c-format
+msgid "%%(rest) does not take arguments"
+msgstr "%%(rest) no toma ningún argumento"
+
+#, c-format
+msgid "malformed field name: %.*s"
+msgstr "nombre mal formado de campo: %.*s"
+
+#, c-format
+msgid "unknown field name: %.*s"
+msgstr "nombre de campo desconocido: %.*s"
+
+#, c-format
+msgid ""
+"not a git repository, but the field '%.*s' requires access to object data"
+msgstr ""
+"no es un repositorio git, pero el campo '%.*s' requiere acceso a los datos "
+"de objeto"
+
+#, fuzzy, c-format
+msgid "format: %%(%s) atom used without a %%(%s) atom"
+msgstr "formato: átomo %%(else) usado sin un átomo %%(if)"
+
+#, c-format
+msgid "format: %%(then) atom used more than once"
+msgstr "formato: átomo %%(then) usado más de una vez"
+
+#, c-format
+msgid "format: %%(then) atom used after %%(else)"
+msgstr "formato: átomo %%(then) usado después de %%(else)"
+
+#, c-format
+msgid "format: %%(else) atom used more than once"
+msgstr "formato: átomo %%(else) usado más de una vez"
+
+#, c-format
+msgid "format: %%(end) atom used without corresponding atom"
+msgstr "formato: átomo %%(end) usado sin átomo correspondiente"
+
+#, c-format
+msgid "malformed format string %s"
+msgstr "formato de cadena mal formado %s"
+
+#, c-format
+msgid "this command reject atom %%(%.*s)"
+msgstr "este comando rechaza el átomo %%(%.*s)"
+
+#, c-format
+msgid "--format=%.*s cannot be used with --python, --shell, --tcl"
+msgstr "--format=%.*s no se puede usar con --python, --shell, --tcl"
+
+#, c-format
+msgid "(no branch, rebasing %s)"
+msgstr "(no hay rama, rebasando %s)"
+
+#, c-format
+msgid "(no branch, rebasing detached HEAD %s)"
+msgstr "(no hay rama, rebasando con HEAD desacoplado %s)"
+
+#, c-format
+msgid "(no branch, bisect started on %s)"
+msgstr "(no hay rama, comenzando biseccón en %s)"
+
+#, c-format
+msgid "(HEAD detached at %s)"
+msgstr "(HEAD desacoplado en %s)"
+
+#, c-format
+msgid "(HEAD detached from %s)"
+msgstr "(HEAD desacoplado de %s)"
+
+msgid "(no branch)"
+msgstr "(sin rama)"
+
+#, c-format
+msgid "missing object %s for %s"
+msgstr "falta objeto %s para %s"
+
+#, c-format
+msgid "parse_object_buffer failed on %s for %s"
+msgstr "parse_object_buffer falló en %s para %s"
+
+#, c-format
+msgid "malformed object at '%s'"
+msgstr "objeto mal formado en '%s'"
+
+#, c-format
+msgid "ignoring ref with broken name %s"
+msgstr "ignorando referencia con nombre roto %s"
+
+#, c-format
+msgid "ignoring broken ref %s"
+msgstr "ignorando referencia rota %s"
+
+#, c-format
+msgid "format: %%(end) atom missing"
+msgstr "formato: falta átomo %%(end)"
+
+#, c-format
+msgid "malformed object name %s"
+msgstr "nombre de objeto mal formado %s"
+
+#, c-format
+msgid "option `%s' must point to a commit"
+msgstr "opción '%s' debe apuntar a un commit"
+
+msgid "key"
+msgstr "clave"
+
+msgid "field name to sort on"
+msgstr "nombre del campo por el cuál ordenar"
+
+#, c-format
+msgid "not a reflog: %s"
+msgstr "no es una reflog: %s"
+
+#, c-format
+msgid "no reflog for '%s'"
+msgstr "no reflog para '%s'"
+
+#, c-format
+msgid "%s does not point to a valid object!"
+msgstr "¡%s no apunta a ningún objeto válido!"
+
+#, 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"
+"of your new repositories, which will suppress this warning, call:\n"
+"\n"
+"\tgit config --global init.defaultBranch <name>\n"
+"\n"
+"Names commonly chosen instead of 'master' are 'main', 'trunk' and\n"
+"'development'. The just-created branch can be renamed via this command:\n"
+"\n"
+"\tgit branch -m <name>\n"
+msgstr ""
+"Usando '%s' como el nombre de la rama inicial. Este nombre de rama "
+"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, llama a:\n"
+"\n"
+"\tgit config --global init.defaultBranch <nombre>\n"
+"\n"
+"Los nombres comúnmente elegidos en lugar de 'master' son 'main', 'trunk' y\n"
+"'development'. Se puede cambiar el nombre de la rama recién creada mediante "
+"este comando:\n"
+"\n"
+"\tgit branch -m <nombre>\n"
+
+#, c-format
+msgid "could not retrieve `%s`"
+msgstr "no se pudo recibir `%s`"
+
+#, c-format
+msgid "invalid branch name: %s = %s"
+msgstr "nombre de rama inválido: %s = %s"
+
+#, c-format
+msgid "ignoring dangling symref %s"
+msgstr "ignorando referencia symbólica rota %s"
+
+#, c-format
+msgid "log for ref %s has gap after %s"
+msgstr "log de ref %s tiene un vacío tras %s"
+
+#, c-format
+msgid "log for ref %s unexpectedly ended on %s"
+msgstr "log de ref %s finalizado inesperadamente en %s"
+
+#, c-format
+msgid "log for %s is empty"
+msgstr "log de %s está vacío"
+
+#, c-format
+msgid "refusing to update ref with bad name '%s'"
+msgstr "rehusando actualizar ref con mal nombre '%s'"
+
+#, c-format
+msgid "update_ref failed for ref '%s': %s"
+msgstr "update_ref falló para ref '%s': %s"
+
+#, c-format
+msgid "multiple updates for ref '%s' not allowed"
+msgstr "no se permiten múltiples actualizaciones para ref '%s'"
+
+msgid "ref updates forbidden inside quarantine environment"
+msgstr "actualizaciones de ref prohibidas dentro de ambiente de cuarentena"
+
+msgid "ref updates aborted by hook"
+msgstr "ref updates abortados por el hook"
+
+#, c-format
+msgid "'%s' exists; cannot create '%s'"
+msgstr "'%s' existe; no se puede crear '%s'"
+
+#, c-format
+msgid "cannot process '%s' and '%s' at the same time"
+msgstr "no se puede procesar '%s' y '%s' al mismo tiempo"
+
+#, c-format
+msgid "could not remove reference %s"
+msgstr "no se pudo eliminar la referencia %s"
+
+#, c-format
+msgid "could not delete reference %s: %s"
+msgstr "no se pudo eliminar la referencia %s: %s"
+
+#, c-format
+msgid "could not delete references: %s"
+msgstr "no se pudo eliminar las referencias: %s"
+
+#, c-format
+msgid "invalid refspec '%s'"
+msgstr "refspec inválido: '%s'"
+
+#, c-format
+msgid "invalid quoting in push-option value: '%s'"
+msgstr "quoting inválido en valor de push-option: '%s'"
+
+#, c-format
+msgid "%sinfo/refs not valid: is this a git repository?"
+msgstr "%sinfo/refs no es válido: ¿es este un repositorio git?"
+
+msgid "invalid server response; expected service, got flush packet"
+msgstr ""
+"respuesta de servidor inválida; se esperaba servicio, se obtuvo un flush "
+"packet"
+
+#, c-format
+msgid "invalid server response; got '%s'"
+msgstr "respuesta de servidor inválida; se obtuvo '%s'"
+
+#, c-format
+msgid "repository '%s' not found"
+msgstr "repositorio '%s' no encontrado"
+
+#, c-format
+msgid "Authentication failed for '%s'"
+msgstr "Autenticación falló para '%s'"
+
+#, 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"
+
+#, c-format
+msgid "unable to access '%s': %s"
+msgstr "no es posible acceder a '%s': %s"
+
+#, c-format
+msgid "redirecting to %s"
+msgstr "redirigiendo a %s"
+
+msgid "shouldn't have EOF when not gentle on EOF"
+msgstr "no se debería tener EOF cuando no es laxo con EOF"
+
+msgid "remote server sent unexpected response end packet"
+msgstr "el servidor remoto envió una respuesta de fin de paquete inesperada"
+
+msgid "unable to rewind rpc post data - try increasing http.postBuffer"
+msgstr ""
+"no es posible rebobinar rpc post data - intenta incrementar http.postBuffer"
+
+#, c-format
+msgid "remote-curl: bad line length character: %.4s"
+msgstr "remote-curl: mal carácter de largo de línea: %.4s"
+
+msgid "remote-curl: unexpected response end packet"
+msgstr "remote-curl: packet de respuesta final inesperado"
+
+#, c-format
+msgid "RPC failed; %s"
+msgstr "RPC falló; %s"
+
+msgid "cannot handle pushes this big"
+msgstr "no se puede manejar empujes tan grandes"
+
+#, c-format
+msgid "cannot deflate request; zlib deflate error %d"
+msgstr "no se puede desinflar el request; zlib deflate error %d"
+
+#, c-format
+msgid "cannot deflate request; zlib end error %d"
+msgstr "no se puede desinflar el request; zlib end error %d"
+
+#, c-format
+msgid "%d bytes of length header were received"
+msgstr "%d bytes de header de longitud fueron recibidos"
+
+#, c-format
+msgid "%d bytes of body are still expected"
+msgstr "%d bytes de cuerpo se siguen esperando"
+
+msgid "dumb http transport does not support shallow capabilities"
+msgstr "dump http transport no soporta capacidades superficiales"
+
+msgid "fetch failed."
+msgstr "fetch falló."
+
+msgid "cannot fetch by sha1 over smart http"
+msgstr "no se puede hacer fetch por sha1 sobre smart http"
+
+#, c-format
+msgid "protocol error: expected sha/ref, got '%s'"
+msgstr "error de protocolo: se esperaba sha/ref, se obtuvo '%s'"
+
+#, c-format
+msgid "http transport does not support %s"
+msgstr "http transport no soporta %s"
+
+msgid "git-http-push failed"
+msgstr "git-http-push falló"
+
+msgid "remote-curl: usage: git remote-curl <remote> [<url>]"
+msgstr "remote-curl: uso: git remote-curl <remote> [<url>]"
+
+msgid "remote-curl: error reading command stream from git"
+msgstr "remote-curl: error al leer command stream de git"
+
+msgid "remote-curl: fetch attempted without a local repo"
+msgstr "remote-curl: fetch intentado sin un repositorio local"
+
+#, c-format
+msgid "remote-curl: unknown command '%s' from git"
+msgstr "remote-curl: comando '%s' desconocido de git"
+
+#, c-format
+msgid "config remote shorthand cannot begin with '/': %s"
+msgstr "config remote shorthand no puede comenzar con '/': %s"
+
+msgid "more than one receivepack given, using the first"
+msgstr "más de un receivepack dado, usando el primero"
+
+msgid "more than one uploadpack given, using the first"
+msgstr "más de un uploadpack dado, usando el primero"
+
+#, fuzzy, c-format
+msgid "unrecognized value fetch.credentialsInURL: '%s'"
+msgstr "patrón desconocido: '%s'"
+
+#, c-format
+msgid "URL '%s' uses plaintext credentials"
+msgstr ""
+
+#, c-format
+msgid "Cannot fetch both %s and %s to %s"
+msgstr "No se pueden traer ambos %s y %s a %s"
+
+#, c-format
+msgid "%s usually tracks %s, not %s"
+msgstr "%s por lo general hace seguimiento a %s, no a %s"
+
+#, c-format
+msgid "%s tracks both %s and %s"
+msgstr "%s hace seguimiento tanto a %s como a %s"
+
+#, c-format
+msgid "key '%s' of pattern had no '*'"
+msgstr "llave '%s' de patrón no tuvo '*'"
+
+#, c-format
+msgid "value '%s' of pattern has no '*'"
+msgstr "valor '%s' del patrón no tiene '*'"
+
+#, c-format
+msgid "src refspec %s does not match any"
+msgstr "src refspec %s no concuerda con ninguno"
+
+#, c-format
+msgid "src refspec %s matches more than one"
+msgstr "src refspec %s concuerda con más de uno"
+
+#. TRANSLATORS: "matches '%s'%" is the <dst> part of "git push
+#. <remote> <src>:<dst>" push, and "being pushed ('%s')" is
+#. the <src>.
+#.
+#, c-format
+msgid ""
+"The destination you provided is not a full refname (i.e.,\n"
+"starting with \"refs/\"). We tried to guess what you meant by:\n"
+"\n"
+"- Looking for a ref that matches '%s' on the remote side.\n"
+"- Checking if the <src> being pushed ('%s')\n"
+"  is a ref in \"refs/{heads,tags}/\". If so we add a corresponding\n"
+"  refs/{heads,tags}/ prefix on the remote side.\n"
+"\n"
+"Neither worked, so we gave up. You must fully qualify the ref."
+msgstr ""
+"El destino que has provisto no es un full refname (i.e.,\n"
+"uno que comience con \"refs/\"). Intentamos adivinar lo que quisiste decir:\n"
+"\n"
+"- Buscando un ref que concuerde con '%s' en el lado remoto.\n"
+"- Revisando si el <src> que es usado en el empuje ('%s')\n"
+"  es un ref en \"refs/{heads,tags}/\". Si es así, agregamos el prefijo\n"
+"  refs/{heads,tags}/ correspondiente al lado remoto.\n"
+"\n"
+"Ninguno funcionó así que nos dimos por vencidos. Tienes que especificar el "
+"full ref."
+
+#, c-format
+msgid ""
+"The <src> part of the refspec is a commit object.\n"
+"Did you mean to create a new branch by pushing to\n"
+"'%s:refs/heads/%s'?"
+msgstr ""
+"La parte <src> del refspec es un objeto commit.\n"
+"¿Quisiste crear un branch nuevo empujando a\n"
+"'%s:refs/heads/%s'?"
+
+#, c-format
+msgid ""
+"The <src> part of the refspec is a tag object.\n"
+"Did you mean to create a new tag by pushing to\n"
+"'%s:refs/tags/%s'?"
+msgstr ""
+"La parte <src> del refspec es un objeto etiqueta.\n"
+"¿Quisiste crear una etiqueta nueva empujando a\n"
+"'%s:refs/tags/%s'?"
+
+#, c-format
+msgid ""
+"The <src> part of the refspec is a tree object.\n"
+"Did you mean to tag a new tree by pushing to\n"
+"'%s:refs/tags/%s'?"
+msgstr ""
+"La parte <src> del refspec es un objeto tree.\n"
+"¿Quisiste crear un tag nuevo empujando a\n"
+"'%s:refs/tags/%s'?"
+
+#, c-format
+msgid ""
+"The <src> part of the refspec is a blob object.\n"
+"Did you mean to tag a new blob by pushing to\n"
+"'%s:refs/tags/%s'?"
+msgstr ""
+"La parte <src> del refspec es un objeto blob.\n"
+"¿Quisiste crear un tag nuevo empujando a\n"
+"'%s:refs/tags/%s'?"
+
+#, c-format
+msgid "%s cannot be resolved to branch"
+msgstr "%s no puede ser resuelto a un branch"
+
+#, c-format
+msgid "unable to delete '%s': remote ref does not exist"
+msgstr "no es posible borrar '%s': ref remoto no existe"
+
+#, c-format
+msgid "dst refspec %s matches more than one"
+msgstr "dst refspec %s concuerda con más de uno"
+
+#, c-format
+msgid "dst ref %s receives from more than one src"
+msgstr "dst ref %s recibe de más de un src"
+
+msgid "HEAD does not point to a branch"
+msgstr "HEAD no apunta a ninguna rama"
+
+#, c-format
+msgid "no such branch: '%s'"
+msgstr "no existe tal rama: '%s'"
+
+#, c-format
+msgid "no upstream configured for branch '%s'"
+msgstr "no se ha configurado upstream para la rama '%s'"
+
+#, c-format
+msgid "upstream branch '%s' not stored as a remote-tracking branch"
+msgstr "la rama '%s' de upstream no es guardada como rama de rastreo remoto"
+
+#, c-format
+msgid "push destination '%s' on remote '%s' has no local tracking branch"
+msgstr ""
+"destino de empuje '%s' en el remoto '%s' no tiene una rama de rastreo local"
+
+#, c-format
+msgid "branch '%s' has no remote for pushing"
+msgstr "la rama '%s' no tiene remoto para empujar"
+
+#, c-format
+msgid "push refspecs for '%s' do not include '%s'"
+msgstr "refspecs del empuje para '%s' no incluyen '%s'"
+
+msgid "push has no destination (push.default is 'nothing')"
+msgstr "el empuje no tiene destino (push.default es 'nothing')"
+
+msgid "cannot resolve 'simple' push to a single destination"
+msgstr "no se puede resolver empuje 'simple' para un destino único"
+
+#, c-format
+msgid "couldn't find remote ref %s"
+msgstr "no se pudo encontrar ref remota %s"
+
+#, c-format
+msgid "* Ignoring funny ref '%s' locally"
+msgstr "* Ignorando ref extraña '%s' localmente"
+
+#, c-format
+msgid "Your branch is based on '%s', but the upstream is gone.\n"
+msgstr "Tu rama está basada en '%s', pero upstream ha desaparecido.\n"
+
+msgid "  (use \"git branch --unset-upstream\" to fixup)\n"
+msgstr "  (usa \"git branch --unset-upstream\" para arreglar)\n"
+
+#, c-format
+msgid "Your branch is up to date with '%s'.\n"
+msgstr "Tu rama está actualizada con '%s'.\n"
+
+#, c-format
+msgid "Your branch and '%s' refer to different commits.\n"
+msgstr "Tu rama y '%s' refieren a commits diferentes.\n"
+
+#, c-format
+msgid "  (use \"%s\" for details)\n"
+msgstr "  (usa \"%s\" para detalles)\n"
+
+#, c-format
+msgid "Your branch is ahead of '%s' by %d commit.\n"
+msgid_plural "Your branch is ahead of '%s' by %d commits.\n"
+msgstr[0] "Tu rama está adelantada a '%s' por %d commit.\n"
+msgstr[1] "Tu rama está adelantada a '%s' por %d commits.\n"
+
+msgid "  (use \"git push\" to publish your local commits)\n"
+msgstr "  (usa \"git push\" para publicar tus commits locales)\n"
+
+#, c-format
+msgid "Your branch is behind '%s' by %d commit, and can be fast-forwarded.\n"
+msgid_plural ""
+"Your branch is behind '%s' by %d commits, and can be fast-forwarded.\n"
+msgstr[0] ""
+"Tu rama está detrás de '%s' por %d commit, y puede ser avanzada rápido.\n"
+msgstr[1] ""
+"Tu rama está detrás de '%s' por %d commits, y puede ser avanzada rápido.\n"
+
+msgid "  (use \"git pull\" to update your local branch)\n"
+msgstr "  (usa \"git pull\" para actualizar tu rama local)\n"
+
+#, c-format
+msgid ""
+"Your branch and '%s' have diverged,\n"
+"and have %d and %d different commit each, respectively.\n"
+msgid_plural ""
+"Your branch and '%s' have diverged,\n"
+"and have %d and %d different commits each, respectively.\n"
+msgstr[0] ""
+"Tu rama y '%s' han divergido,\n"
+"y tienen %d y %d commits diferentes cada una respectivamente.\n"
+msgstr[1] ""
+"Tu rama y '%s' han divergido,\n"
+"y tienen %d y %d commits diferentes cada una respectivamente.\n"
+
+msgid "  (use \"git pull\" to merge the remote branch into yours)\n"
+msgstr "  (usa \"git pull\" para fusionar la rama remota en la tuya)\n"
+
+#, c-format
+msgid "cannot parse expected object name '%s'"
+msgstr "no se puede leer el nombre de objeto '%s'"
+
+#, c-format
+msgid "cannot strip one component off url '%s'"
+msgstr "no se puede quitar un componente del url '%s'"
+
+#, c-format
+msgid "bad replace ref name: %s"
+msgstr "mal nombre de ref de reemplazo: %s"
+
+#, c-format
+msgid "duplicate replace ref: %s"
+msgstr "duplicar ref de reemplazo: %s"
+
+#, c-format
+msgid "replace depth too high for object %s"
+msgstr "profundidad de reemplazo demasiada para objeto %s"
+
+msgid "corrupt MERGE_RR"
+msgstr "MERGE_RR corrupto"
+
+msgid "unable to write rerere record"
+msgstr "incapaz de escribir entrada rerere"
+
+#, c-format
+msgid "there were errors while writing '%s' (%s)"
+msgstr "hubieron errores mientras se escribía '%s' (%s)"
+
+#, c-format
+msgid "could not parse conflict hunks in '%s'"
+msgstr "no se pudo analizar hunks en conflicto en '%s'"
+
+#, c-format
+msgid "failed utime() on '%s'"
+msgstr "falló utime() en '%s'"
+
+#, c-format
+msgid "writing '%s' failed"
+msgstr "escribiendo '%s' falló"
+
+#, c-format
+msgid "Staged '%s' using previous resolution."
+msgstr "'%s' puesto en stage usando resolución previa."
+
+#, c-format
+msgid "Recorded resolution for '%s'."
+msgstr "Resolución guardada para '%s'."
+
+#, c-format
+msgid "Resolved '%s' using previous resolution."
+msgstr "'%s' resuelto usando resolución previa."
+
+#, c-format
+msgid "cannot unlink stray '%s'"
+msgstr "no se puede desvincular stray '%s'"
+
+#, c-format
+msgid "Recorded preimage for '%s'"
+msgstr "Preimagen grabada para '%s'"
+
+#, c-format
+msgid "failed to update conflicted state in '%s'"
+msgstr "falló al actualizar estado conflictivo en '%s'"
+
+#, c-format
+msgid "no remembered resolution for '%s'"
+msgstr "resolución para '%s' no recordada"
+
+#, c-format
+msgid "cannot unlink '%s'"
+msgstr "no se puede desvincular '%s'"
+
+#, c-format
+msgid "Updated preimage for '%s'"
+msgstr "Preimagen actualizada para '%s'"
+
+#, c-format
+msgid "Forgot resolution for '%s'\n"
+msgstr "Se olvidó resolución para '%s'\n"
+
+msgid "unable to open rr-cache directory"
+msgstr "no es posible abrir directorio rr-cache"
+
+msgid "update the index with reused conflict resolution if possible"
+msgstr ""
+"actualizar el índice con la resolución de conflictos reutilizada si es "
+"posible"
+
+msgid "could not determine HEAD revision"
+msgstr "no se pudo determinar revisión HEAD"
+
+#, c-format
+msgid "failed to find tree of %s"
+msgstr "falló al encontrar árbol de %s"
+
+msgid "--unpacked=<packfile> no longer supported"
+msgstr "--unpacked=<packfile> ya no es soportado"
+
+msgid "your current branch appears to be broken"
+msgstr "tu rama actual parece estar rota"
+
+#, 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"
+
+msgid "object filtering requires --objects"
+msgstr "filtración de objetos requiere --objects"
+
+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"
+
+#, c-format
+msgid "cannot create async thread: %s"
+msgstr "no es posible crear hilo async: %s"
+
+msgid "unexpected flush packet while reading remote unpack status"
+msgstr ""
+"flush packet inesperado mientras se leía estatus de desempaquetado remoto"
+
+#, c-format
+msgid "unable to parse remote unpack status: %s"
+msgstr "no es posible analizar el estado de desempaquetado remoto: %s"
+
+#, c-format
+msgid "remote unpack failed: %s"
+msgstr "desempaquetado remoto falló: %s"
+
+msgid "failed to sign the push certificate"
+msgstr "falló al firmar el certificado de empuje"
+
+msgid "send-pack: unable to fork off fetch subprocess"
+msgstr ""
+"send-pack: no es posible bifurcar el proceso de búsqueda en un subproceso"
+
+msgid "push negotiation failed; proceeding anyway with push"
+msgstr "negociación de empuje falló; procediendo con el empuje de todas formas"
+
+msgid "the receiving end does not support this repository's hash algorithm"
+msgstr "el destino no soporta el algoritmo de hash de este repositorio"
+
+msgid "the receiving end does not support --signed push"
+msgstr "el final receptor no soporta push --signed"
+
+msgid ""
+"not sending a push certificate since the receiving end does not support --"
+"signed push"
+msgstr ""
+"no se manda un certificado de empuje ya que el destino no soporta empuje "
+"firmado (--signed)"
+
+msgid "the receiving end does not support --atomic push"
+msgstr "el destino no soporta empuje atómico (--atomic)"
+
+msgid "the receiving end does not support push options"
+msgstr "el destino no soporta opciones de empuje"
+
+#, c-format
+msgid "invalid commit message cleanup mode '%s'"
+msgstr "mensaje de commit inválido, modo cleanup '%s'"
+
+#, c-format
+msgid "could not delete '%s'"
+msgstr "no se pudo borrar '%s'"
+
+msgid "revert"
+msgstr "revertir"
+
+msgid "cherry-pick"
+msgstr "cherry-pick"
+
+msgid "rebase"
+msgstr "rebase"
+
+#, c-format
+msgid "unknown action: %d"
+msgstr "acción desconocida: %d"
+
+msgid ""
+"after resolving the conflicts, mark the corrected paths\n"
+"with 'git add <paths>' or 'git rm <paths>'"
+msgstr ""
+"después de resolver los conflictos, marca las rutas corregidas\n"
+"con 'git add <rutas>' o 'git rm <rutas>'"
+
+msgid ""
+"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 ""
+"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\"."
+
+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\"."
+
+#, c-format
+msgid "could not lock '%s'"
+msgstr "no se pudo bloquear '%s'"
+
+#, c-format
+msgid "could not write to '%s'"
+msgstr "no se pudo escribir en '%s'"
+
+#, c-format
+msgid "could not write eol to '%s'"
+msgstr "no se pudo escribir EOL en '%s'"
+
+#, c-format
+msgid "failed to finalize '%s'"
+msgstr "falló al finalizar '%s'"
+
+#, c-format
+msgid "your local changes would be overwritten by %s."
+msgstr "tus cambios locales serán sobreescritos por %s."
+
+msgid "commit your changes or stash them to proceed."
+msgstr "realiza un commit con tus cambios o haz un stash para proceder."
+
+#, c-format
+msgid "%s: fast-forward"
+msgstr "%s: avance rápido"
+
+#. TRANSLATORS: %s will be "revert", "cherry-pick" or
+#. "rebase".
+#.
+#, c-format
+msgid "%s: Unable to write new index file"
+msgstr "%s: Incapaz de escribir el nuevo archivo índice"
+
+msgid "unable to update cache tree"
+msgstr "no es posible actualizar el árbol de caché"
+
+msgid "could not resolve HEAD commit"
+msgstr "no se pudo resolver el commit de HEAD"
+
+#, c-format
+msgid "no key present in '%.*s'"
+msgstr "no hay llave presente en '%.*s'"
+
+#, c-format
+msgid "unable to dequote value of '%s'"
+msgstr "no es posible dequote valor de '%s'"
+
+msgid "'GIT_AUTHOR_NAME' already given"
+msgstr "'GIT_AUTHOR_NAME' ya proporcionado"
+
+msgid "'GIT_AUTHOR_EMAIL' already given"
+msgstr "'GIT_AUTHOR_EMAIL' ya proporcionado"
+
+msgid "'GIT_AUTHOR_DATE' already given"
+msgstr "'GIT_AUTHOR_DATE' ya proporcionado"
+
+#, c-format
+msgid "unknown variable '%s'"
+msgstr "variable desconocida '%s'"
+
+msgid "missing 'GIT_AUTHOR_NAME'"
+msgstr "falta 'GIT_AUTHOR_NAME'"
+
+msgid "missing 'GIT_AUTHOR_EMAIL'"
+msgstr "falta 'GIT_AUTHOR_EMAIL'"
+
+msgid "missing 'GIT_AUTHOR_DATE'"
+msgstr "falta 'GIT_AUTHOR_DATE'"
+
+#, c-format
+msgid ""
+"you have staged changes in your working tree\n"
+"If these changes are meant to be squashed into the previous commit, run:\n"
+"\n"
+"  git commit --amend %s\n"
+"\n"
+"If they are meant to go into a new commit, run:\n"
+"\n"
+"  git commit %s\n"
+"\n"
+"In both cases, once you're done, continue with:\n"
+"\n"
+"  git rebase --continue\n"
+msgstr ""
+"se ha aplicado un stage a los cambios en el árbol de trabajo\n"
+"si estos cambios están destinados a ser aplastados en el commit previo, "
+"ejecuta:\n"
+"\n"
+"  git commit --amend %s\n"
+"\n"
+"Si estos cambios están destinados a un nuevo commit, ejecuta:\n"
+"\n"
+"  git commit %s\n"
+"\n"
+"en ambos casos, cuando acabes, continúa con:\n"
+"\n"
+"  git rebase --continue\n"
+
+msgid "'prepare-commit-msg' hook failed"
+msgstr "hook 'prepare-commit-msg' falló"
+
+msgid ""
+"Your name and email address were configured automatically based\n"
+"on your username and hostname. Please check that they are accurate.\n"
+"You can suppress this message by setting them explicitly. Run the\n"
+"following command and follow the instructions in your editor to edit\n"
+"your configuration file:\n"
+"\n"
+"    git config --global --edit\n"
+"\n"
+"After doing this, you may fix the identity used for this commit with:\n"
+"\n"
+"    git commit --amend --reset-author\n"
+msgstr ""
+"Tu nombre y correo fueron configurados automáticamente basados\n"
+"en tu usuario y nombre de host. Por favor verifica que sean correctos.\n"
+"Tú puedes suprimir este mensaje configurándolos de forma explícita. Ejecuta "
+"el\n"
+"siguiente comando y sigue las instrucciones de tu editor\n"
+" para modificar tu archivo de configuración:\n"
+"\n"
+"    git config --global --edit\n"
+"\n"
+"Tras hacer esto, puedes arreglar la identidad usada para este commit con:\n"
+"\n"
+"    git commit --amend --reset-author\n"
+
+msgid ""
+"Your name and email address were configured automatically based\n"
+"on your username and hostname. Please check that they are accurate.\n"
+"You can suppress this message by setting them explicitly:\n"
+"\n"
+"    git config --global user.name \"Your Name\"\n"
+"    git config --global user.email you@example.com\n"
+"\n"
+"After doing this, you may fix the identity used for this commit with:\n"
+"\n"
+"    git commit --amend --reset-author\n"
+msgstr ""
+"Tu nombre y correo fueron configurados automáticamente basados\n"
+"en tu usuario y nombre de host. Por favor verifica que sean correctos.\n"
+"Tú puedes suprimir este mensaje configurándolos de forma explícita:\n"
+"\n"
+"    git config --global user.name \"Tu nombre\"\n"
+"    git config --global user.email you@example.com\n"
+"\n"
+"Tras hacer esto, puedes arreglar tu identidad para este commit con:\n"
+"\n"
+"    git commit --amend --reset-author\n"
+
+msgid "couldn't look up newly created commit"
+msgstr "no se pudo revisar el commit recién creado"
+
+msgid "could not parse newly created commit"
+msgstr "no se pudo analizar el commit recién creado"
+
+msgid "unable to resolve HEAD after creating commit"
+msgstr "no se pudo resolver HEAD tras crear el commit"
+
+msgid "detached HEAD"
+msgstr "HEAD desacoplado"
+
+msgid " (root-commit)"
+msgstr " (commit-raíz)"
+
+msgid "could not parse HEAD"
+msgstr "no se pudo analizar HEAD"
+
+#, c-format
+msgid "HEAD %s is not a commit!"
+msgstr "¡HEAD %s no es un commit!"
+
+msgid "unable to parse commit author"
+msgstr "no es posible analizar el autor del commit"
+
+#, c-format
+msgid "unable to read commit message from '%s'"
+msgstr "no se puede leer el mensaje del commit de '%s'"
+
+#, c-format
+msgid "invalid author identity '%s'"
+msgstr "identidad de autor inválida '%s'"
+
+msgid "corrupt author: missing date information"
+msgstr "autor corrupto: falta información de fecha"
+
+#, c-format
+msgid "could not update %s"
+msgstr "no se puede actualizar %s"
+
+#, c-format
+msgid "could not parse commit %s"
+msgstr "no se pudo analizar commit %s"
+
+#, c-format
+msgid "could not parse parent commit %s"
+msgstr "no se pudo analizar el commit padre %s"
+
+#, c-format
+msgid "unknown command: %d"
+msgstr "comando desconocido: %d"
+
+msgid "This is the 1st commit message:"
+msgstr "Este es el mensaje del 1er commit:"
+
+#, c-format
+msgid "This is the commit message #%d:"
+msgstr "Este es el mensaje del commit #%d:"
+
+msgid "The 1st commit message will be skipped:"
+msgstr "El mensaje del 1er commit será saltado:"
+
+#, c-format
+msgid "The commit message #%d will be skipped:"
+msgstr "El mensaje del commit #%d será saltado:"
+
+#, c-format
+msgid "This is a combination of %d commits."
+msgstr "Esta es una combinación de %d commits."
+
+#, c-format
+msgid "cannot write '%s'"
+msgstr "no se puede escribir '%s'"
+
+msgid "need a HEAD to fixup"
+msgstr "se necesita un HEAD para arreglar"
+
+msgid "could not read HEAD"
+msgstr "no se pudo leer HEAD"
+
+msgid "could not read HEAD's commit message"
+msgstr "no se pudo leer el mensaje de commit de HEAD"
+
+#, c-format
+msgid "could not read commit message of %s"
+msgstr "no se puede leer el mensaje del commit de %s"
+
+msgid "your index file is unmerged."
+msgstr "tu archivo índice no está fusionado."
+
+msgid "cannot fixup root commit"
+msgstr "no se puede arreglar el commit raíz"
+
+#, 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."
+
+#, c-format
+msgid "commit %s does not have parent %d"
+msgstr "el commit %s no tiene un padre %d"
+
+#, 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.
+#, c-format
+msgid "%s: cannot parse parent commit %s"
+msgstr "%s: no se puede analizar el commit padre %s"
+
+#, c-format
+msgid "could not rename '%s' to '%s'"
+msgstr "no se puede renombrar '%s' a '%s'"
+
+#, c-format
+msgid "could not revert %s... %s"
+msgstr "no se pudo revertir %s... %s"
+
+#, c-format
+msgid "could not apply %s... %s"
+msgstr "no se pudo aplicar %s... %s"
+
+#, c-format
+msgid "dropping %s %s -- patch contents already upstream\n"
+msgstr "descartando $%s %s -- contenidos del parche ya están en upstream\n"
+
+#, c-format
+msgid "git %s: failed to read the index"
+msgstr "git %s: falló al leer el índice"
+
+#, c-format
+msgid "git %s: failed to refresh the index"
+msgstr "git %s: falló al refrescar el índice"
+
+#, c-format
+msgid "%s does not accept arguments: '%s'"
+msgstr "%s no acepta argumentos: '%s'"
+
+#, c-format
+msgid "missing arguments for %s"
+msgstr "faltan argumentos para %s"
+
+#, c-format
+msgid "could not parse '%s'"
+msgstr "no se puede analizar '%s'"
+
+#, c-format
+msgid "invalid line %d: %.*s"
+msgstr "línea inválida %d: %.*s"
+
+#, c-format
+msgid "cannot '%s' without a previous commit"
+msgstr "no se puede '%s' sin un commit previo"
+
+msgid "cancelling a cherry picking in progress"
+msgstr "cancelando cherry-pick en progreso"
+
+msgid "cancelling a revert in progress"
+msgstr "cancelando revert en progreso"
+
+msgid "please fix this using 'git rebase --edit-todo'."
+msgstr "por favor arregla esto usando 'git rebase --edit-todo'."
+
+#, c-format
+msgid "unusable instruction sheet: '%s'"
+msgstr "hoja de instrucciones inutilizable: '%s'"
+
+msgid "no commits parsed."
+msgstr "ningún commit analizado."
+
+msgid "cannot cherry-pick during a revert."
+msgstr "no se puede realizar cherry-pick durante un revert."
+
+msgid "cannot revert during a cherry-pick."
+msgstr "no se puede realizar un revert durante un cherry-pick."
+
+msgid "unusable squash-onto"
+msgstr "squash-onto inservible"
+
+#, c-format
+msgid "malformed options sheet: '%s'"
+msgstr "hoja de opciones mal formada: '%s'"
+
+msgid "empty commit set passed"
+msgstr "conjunto de commits vacío entregado"
+
+msgid "revert is already in progress"
+msgstr "revert ya está en progreso"
+
+#, c-format
+msgid "try \"git revert (--continue | %s--abort | --quit)\""
+msgstr "intenta \"git revert (--continue | %s--abort | --quit)\""
+
+msgid "cherry-pick is already in progress"
+msgstr "cherry-pick ya está en progreso"
+
+#, c-format
+msgid "try \"git cherry-pick (--continue | %s--abort | --quit)\""
+msgstr "intenta \"git cherry-pick (--continue | %s--abort | --quit)\""
+
+#, c-format
+msgid "could not create sequencer directory '%s'"
+msgstr "no se pudo crear un directorio secuenciador '%s'"
+
+msgid "could not lock HEAD"
+msgstr "no se pudo bloquear HEAD"
+
+msgid "no cherry-pick or revert in progress"
+msgstr "ningún cherry-pick o revert en progreso"
+
+msgid "cannot resolve HEAD"
+msgstr "no se puede resolver HEAD"
+
+msgid "cannot abort from a branch yet to be born"
+msgstr "no se puede abortar de una rama por nacer"
+
+#, c-format
+msgid "cannot read '%s': %s"
+msgstr "no se puede leer '%s': %s"
+
+msgid "unexpected end of file"
+msgstr "final de archivo inesperado"
+
+#, c-format
+msgid "stored pre-cherry-pick HEAD file '%s' is corrupt"
+msgstr "archivo HEAD '%s' guardado antes de cherry-pick está corrupto"
+
+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!"
+
+msgid "no revert in progress"
+msgstr "no hay revert en progreso"
+
+msgid "no cherry-pick in progress"
+msgstr "ningún cherry-pick en progreso"
+
+msgid "failed to skip the commit"
+msgstr "falló al escribir el commit"
+
+msgid "there is nothing to skip"
+msgstr "no hay nada que saltar"
+
+#, c-format
+msgid ""
+"have you committed already?\n"
+"try \"git %s --continue\""
+msgstr ""
+"¿ya has hecho el commit?\n"
+"intenta \"git %s --continue\""
+
+msgid "cannot read HEAD"
+msgstr "no se puede leer HEAD"
+
+#, c-format
+msgid "unable to copy '%s' to '%s'"
+msgstr "no se pudo copiar '%s' a '%s'"
+
+#, c-format
+msgid ""
+"You can amend the commit now, with\n"
+"\n"
+"  git commit --amend %s\n"
+"\n"
+"Once you are satisfied with your changes, run\n"
+"\n"
+"  git rebase --continue\n"
+msgstr ""
+"Puedes enmendar el commit ahora, con\n"
+"\n"
+"  git commit --amend %s\n"
+"\n"
+"Una vez que estés satisfecho con los cambios, ejecuta\n"
+"\n"
+"  git rebase --continue\n"
+
+#, c-format
+msgid "Could not apply %s... %.*s"
+msgstr "No se pudo aplicar %s... %.*s"
+
+#, c-format
+msgid "Could not merge %.*s"
+msgstr "No se pudo fusionar %.*s"
+
+#, c-format
+msgid "Executing: %s\n"
+msgstr "Ejecutando: %s\n"
+
+#, c-format
+msgid ""
+"execution failed: %s\n"
+"%sYou can fix the problem, and then run\n"
+"\n"
+"  git rebase --continue\n"
+"\n"
+msgstr ""
+"ejecución fallida: %s\n"
+"%sPuedes arreglar el problema, y luego ejecutar\n"
+"\n"
+"  git rebase --continue\n"
+"\n"
+
+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"
+
+#, c-format
+msgid ""
+"execution succeeded: %s\n"
+"but left changes to the index and/or the working tree\n"
+"Commit or stash your changes, and then run\n"
+"\n"
+"  git rebase --continue\n"
+"\n"
+msgstr ""
+"ejecución exitosa: %s\n"
+"pero todavía quedan cambios para el índice o árbol de trabajo.\n"
+"Realiza un commit o stash con tus cambios, y luego ejecuta\n"
+"\n"
+"  git rebase --continue\n"
+"\n"
+
+#, c-format
+msgid "illegal label name: '%.*s'"
+msgstr "nombre de label ilegal: '%.*s'"
+
+msgid "writing fake root commit"
+msgstr "escribiendo commit raíz falso"
+
+msgid "writing squash-onto"
+msgstr "escribiendo squash-onto"
+
+#, c-format
+msgid "could not resolve '%s'"
+msgstr "no se pudo resolver '%s'"
+
+msgid "cannot merge without a current revision"
+msgstr "no se puede fusionar sin una versión actual"
+
+#, c-format
+msgid "unable to parse '%.*s'"
+msgstr "no se puede analizar '%.*s'"
+
+#, c-format
+msgid "nothing to merge: '%.*s'"
+msgstr "nada para fusionar: '%.*s'"
+
+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]"
+
+#, c-format
+msgid "could not get commit message of '%s'"
+msgstr "no se puede leer el mensaje del commit '%s'"
+
+#, c-format
+msgid "could not even attempt to merge '%.*s'"
+msgstr "ni se pudo intentar fusionar '%.*s'"
+
+msgid "merge: Unable to write new index file"
+msgstr "fusión: No se puede escribir el nuevo archivo índice"
+
+msgid "Cannot autostash"
+msgstr "No se puede ejecutar autostash"
+
+#, c-format
+msgid "Unexpected stash response: '%s'"
+msgstr "Respuesta de stash inesperada: '%s'"
+
+#, c-format
+msgid "Could not create directory for '%s'"
+msgstr "No se pudo crear el directorio para '%s'"
+
+#, c-format
+msgid "Created autostash: %s\n"
+msgstr "Autostash creado: %s\n"
+
+msgid "could not reset --hard"
+msgstr "no se pudo reset --hard"
+
+#, c-format
+msgid "Applied autostash.\n"
+msgstr "Autostash aplicado.\n"
+
+#, c-format
+msgid "cannot store %s"
+msgstr "no se puede guardar %s"
+
+#, c-format
+msgid ""
+"%s\n"
+"Your changes are safe in the stash.\n"
+"You can run \"git stash pop\" or \"git stash drop\" at any time.\n"
+msgstr ""
+"%s\n"
+"Tus cambios están seguros en el stash.\n"
+"Puedes ejecutar \"git stash pop\" o \"git stash drop\" en cualquier "
+"momento.\n"
+
+msgid "Applying autostash resulted in conflicts."
+msgstr "Aplicar autostash resultó en conflictos."
+
+msgid "Autostash exists; creating a new stash entry."
+msgstr "Autostash existe; creando una nueva entrada stash."
+
+msgid "could not detach HEAD"
+msgstr "no se pudo desacoplar HEAD"
+
+#, c-format
+msgid "Stopped at HEAD\n"
+msgstr "Detenido en HEAD\n"
+
+#, c-format
+msgid "Stopped at %s\n"
+msgstr "Detenido en %s\n"
+
+#, c-format
+msgid ""
+"Could not execute the todo command\n"
+"\n"
+"    %.*s\n"
+"It has been rescheduled; To edit the command before continuing, please\n"
+"edit the todo list first:\n"
+"\n"
+"    git rebase --edit-todo\n"
+"    git rebase --continue\n"
+msgstr ""
+"No se pudo ejecutar el comando \"todo\"\n"
+"\n"
+"    %.*s\n"
+"Ha sido reprogramado; Para editar el comando antes de continuar, por favor\n"
+"edita la lista de \"todo\" primero:\n"
+"\n"
+"    git rebase --edit-todo\n"
+"    git rebase --continue\n"
+
+#, c-format
+msgid "Rebasing (%d/%d)%s"
+msgstr "Aplicando rebase (%d/%d)%s"
+
+#, c-format
+msgid "Stopped at %s...  %.*s\n"
+msgstr "Detenido en %s...  %.*s\n"
+
+#, c-format
+msgid "unknown command %d"
+msgstr "comando desconocido %d"
+
+msgid "could not read orig-head"
+msgstr "no se pudo leer orig-head"
+
+msgid "could not read 'onto'"
+msgstr "no se pudo leer 'onto'"
+
+#, c-format
+msgid "could not update HEAD to %s"
+msgstr "no se pudo actualizar HEAD a %s"
+
+#, c-format
+msgid "Successfully rebased and updated %s.\n"
+msgstr "Rebase aplicado satisfactoriamente y actualizado %s.\n"
+
+msgid "cannot rebase: You have unstaged changes."
+msgstr "no se puede realizar rebase: Tienes cambios fuera del área de stage."
+
+msgid "cannot amend non-existing commit"
+msgstr "no se puede enmendar un commit no existente"
+
+#, c-format
+msgid "invalid file: '%s'"
+msgstr "archivo inválido: '%s'"
+
+#, c-format
+msgid "invalid contents: '%s'"
+msgstr "contenido inválido: '%s'"
+
+msgid ""
+"\n"
+"You have uncommitted changes in your working tree. Please, commit them\n"
+"first and then run 'git rebase --continue' again."
+msgstr ""
+"\n"
+"Tienes cambios fuera de un commit en tu árbol de trabajo. Por favor, realiza "
+"un commit con estos\n"
+"primero y luego ejecuta 'git rebase --continue' de nuevo."
+
+#, c-format
+msgid "could not write file: '%s'"
+msgstr "no se pudo escribir el archivo: '%s'"
+
+msgid "could not remove CHERRY_PICK_HEAD"
+msgstr "no se pudo eliminar CHERRY_PICK_HEAD"
+
+msgid "could not commit staged changes."
+msgstr "no se pudo realizar el commit con los cambios en el área de stage."
+
+#, c-format
+msgid "%s: can't cherry-pick a %s"
+msgstr "%s: no se puede aplicar cherry-pick a un %s"
+
+#, c-format
+msgid "%s: bad revision"
+msgstr "%s: revisión errónea"
+
+msgid "can't revert as initial commit"
+msgstr "no se puede revertir como commit inicial"
+
+#, c-format
+msgid "skipped previously applied commit %s"
+msgstr "se ha saltado el commit %s aplicado previamente"
+
+msgid "use --reapply-cherry-picks to include skipped commits"
+msgstr "use --reapply-cherry-picks para incluir los commits saltados"
+
+msgid "make_script: unhandled options"
+msgstr "make_script: opciones desconocidas"
+
+msgid "make_script: error preparing revisions"
+msgstr "make_script: error al preparar revisiones"
+
+msgid "nothing to do"
+msgstr "nada que hacer"
+
+msgid "could not skip unnecessary pick commands"
+msgstr "no se pudo saltar los comandos pick innecesarios"
+
+msgid "the script was already rearranged."
+msgstr "este script ya fue reorganizado."
+
+#, c-format
+msgid "'%s' is outside repository at '%s'"
+msgstr "'%s' está fuera del repositorio en '%s'"
+
+#, c-format
+msgid ""
+"%s: no such path in the working tree.\n"
+"Use 'git <command> -- <path>...' to specify paths that do not exist locally."
+msgstr ""
+"%s: no existe la ruta en el árbol de trabajo.\n"
+"Usa 'git <comando> -- <ruta>...' para especificar rutas que no existen "
+"localmente."
+
+#, c-format
+msgid ""
+"ambiguous argument '%s': unknown revision or path not in the working tree.\n"
+"Use '--' to separate paths from revisions, like this:\n"
+"'git <command> [<revision>...] -- [<file>...]'"
+msgstr ""
+"argumento ambiguo '%s': revisión desconocida o ruta fuera del árbol de "
+"trabajo.\n"
+"Usa '--' para separar las rutas de las revisiones, de esta manera:\n"
+"'git <comando> [<revisión>...] -- [<archivo>...]'"
+
+#, c-format
+msgid "option '%s' must come before non-option arguments"
+msgstr "opción '%s' debe venir antes de argumentos no opcionales"
+
+#, c-format
+msgid ""
+"ambiguous argument '%s': both revision and filename\n"
+"Use '--' to separate paths from revisions, like this:\n"
+"'git <command> [<revision>...] -- [<file>...]'"
+msgstr ""
+"argumento ambiguo '%s': ambos revisión y nombre de archivo\n"
+"Usa '--' para separar rutas de revisiones, de esta manera:\n"
+"'git <comando> [<revisión>...] -- [<archivo>...]'"
+
+msgid "unable to set up work tree using invalid config"
+msgstr ""
+"no es posible configurar el directorio de trabajo usando una configuración "
+"inválida"
+
+#, c-format
+msgid "Expected git repo version <= %d, found %d"
+msgstr "Se esperaba versión de git repo <= %d, se encontró %d"
+
+msgid "unknown repository extension found:"
+msgid_plural "unknown repository extensions found:"
+msgstr[0] "se encontró extensión de repositorio desconocida:"
+msgstr[1] "se encontraron extensiones de repositorio desconocidas:"
+
+msgid "repo version is 0, but v1-only extension found:"
+msgid_plural "repo version is 0, but v1-only extensions found:"
+msgstr[0] "versión de repo es 0, pero se encontró extensión v1-only:"
+msgstr[1] "versión de repo es 0, pero se encontraron extensiones v1-only:"
+
+#, c-format
+msgid "error opening '%s'"
+msgstr "error al abrir '%s'"
+
+#, c-format
+msgid "too large to be a .git file: '%s'"
+msgstr "demasiado grande para ser un archivo .git: '%s'"
+
+#, c-format
+msgid "error reading %s"
+msgstr "error al leer %s"
+
+#, c-format
+msgid "invalid gitfile format: %s"
+msgstr "formato gitfile inválido: %s"
+
+#, c-format
+msgid "no path in gitfile: %s"
+msgstr "no hay ruta en gitfile: %s"
+
+#, c-format
+msgid "not a git repository: %s"
+msgstr "no es un repositorio git: %s"
+
+#, c-format
+msgid "'$%s' too big"
+msgstr "'$%s' demasiado grande"
+
+#, c-format
+msgid "not a git repository: '%s'"
+msgstr "no es un repositorio git: '%s'"
+
+#, c-format
+msgid "cannot chdir to '%s'"
+msgstr "no se puede aplicar chdir a '%s'"
+
+msgid "cannot come back to cwd"
+msgstr "no se puede volver a cwd"
+
+#, c-format
+msgid "failed to stat '%*s%s%s'"
+msgstr "falló al determinar '%*s%s%s'"
+
+msgid "Unable to read current working directory"
+msgstr "Incapaz de leer el directorio de trabajo actual"
+
+#, c-format
+msgid "cannot change to '%s'"
+msgstr "no se puede cambiar a '%s'"
+
+#, c-format
+msgid "not a git repository (or any of the parent directories): %s"
+msgstr ""
+"no es un repositorio git (ni ninguno de los directorios superiores): %s"
+
+#, 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 es un repositorio git (ni ningún padre en el punto de montaje %s)\n"
+"Parando a la frontera del sistema de archivos "
+"(GIT_DISCOVERY_ACROSS_FILESYSTEM no establecido)."
+
+#, c-format
+msgid ""
+"unsafe repository ('%s' is owned by someone else)\n"
+"To add an exception for this directory, call:\n"
+"\n"
+"\tgit config --global --add safe.directory %s"
+msgstr ""
+
+#, c-format
+msgid ""
+"problem with core.sharedRepository filemode value (0%.3o).\n"
+"The owner of files must always have read and write permissions."
+msgstr ""
+"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."
+
+msgid "fork failed"
+msgstr "falló fork"
+
+msgid "setsid failed"
+msgstr "falló setsid"
+
+#, c-format
+msgid "index entry is a directory, but not sparse (%08x)"
+msgstr "la entrada de índice es un directorio, pero no escaso (%08x)"
+
+#, fuzzy
+msgid "cannot use split index with a sparse index"
+msgstr "no se puede leer el índice"
+
+#. TRANSLATORS: IEC 80000-13:2008 gibibyte
+#, c-format
+msgid "%u.%2.2u GiB"
+msgstr "%u.%2.2u GiB"
+
+#. TRANSLATORS: IEC 80000-13:2008 gibibyte/second
+#, c-format
+msgid "%u.%2.2u GiB/s"
+msgstr "%u.%2.2u GiB/s"
+
+#. TRANSLATORS: IEC 80000-13:2008 mebibyte
+#, c-format
+msgid "%u.%2.2u MiB"
+msgstr "%u.%2.2u MiB"
+
+#. TRANSLATORS: IEC 80000-13:2008 mebibyte/second
+#, c-format
+msgid "%u.%2.2u MiB/s"
+msgstr "%u.%2.2u MiB/s"
+
+#. TRANSLATORS: IEC 80000-13:2008 kibibyte
+#, c-format
+msgid "%u.%2.2u KiB"
+msgstr "%u.%2.2u KiB"
+
+#. TRANSLATORS: IEC 80000-13:2008 kibibyte/second
+#, c-format
+msgid "%u.%2.2u KiB/s"
+msgstr "%u.%2.2u KiB/s"
+
+#. TRANSLATORS: IEC 80000-13:2008 byte
+#, c-format
+msgid "%u byte"
+msgid_plural "%u bytes"
+msgstr[0] "%u byte"
+msgstr[1] "%u bytes"
+
+#. TRANSLATORS: IEC 80000-13:2008 byte/second
+#, c-format
+msgid "%u byte/s"
+msgid_plural "%u bytes/s"
+msgstr[0] "%u bytes/s"
+msgstr[1] "%u bytes/s"
+
+#, c-format
+msgid "could not edit '%s'"
+msgstr "no se pudo editar '%s'"
+
+#, c-format
+msgid "ignoring suspicious submodule name: %s"
+msgstr "ignorando nombre de submódulo sospechoso: %s"
+
+msgid "negative values not allowed for submodule.fetchjobs"
+msgstr "no se permiten valores negativos para submodule.fetchjobs"
+
+#, c-format
+msgid "ignoring '%s' which may be interpreted as a command-line option: %s"
+msgstr ""
+"ignorando '%s' ya que puede ser interpretado como una opción de línea de "
+"comando: %s"
+
+#, c-format
+msgid "Could not update .gitmodules entry %s"
+msgstr "No se pudo actualizar la entrada %s de .gitmodules"
+
+msgid "Cannot change unmerged .gitmodules, resolve merge conflicts first"
+msgstr ""
+"No se puede cambiar .gitmodules no fusionados, primero resuelve los "
+"conflictos de fusión"
+
+#, c-format
+msgid "Could not find section in .gitmodules where path=%s"
+msgstr "No se pudo encontrar la sección en .gitmodules donde path=%s"
+
+#, c-format
+msgid "Could not remove .gitmodules entry for %s"
+msgstr "No se pudo eliminar la entrada %s de .gitmodules"
+
+msgid "staging updated .gitmodules failed"
+msgstr "falló realizar stage a los .gitmodules actualizados"
+
+#, c-format
+msgid "in unpopulated submodule '%s'"
+msgstr "en el submódulo no poblado '%s'"
+
+#, c-format
+msgid "Pathspec '%s' is in submodule '%.*s'"
+msgstr "El patrón de ruta '%s' está en el submódulo '%.*s'"
+
+#, c-format
+msgid "bad --ignore-submodules argument: %s"
+msgstr "mal argumento --ignore-submodules: %s"
+
+#, c-format
+msgid ""
+"Submodule in commit %s at path: '%s' collides with a submodule named the "
+"same. Skipping it."
+msgstr ""
+"Submódulo en el commit %s en la ruta: '%s' colisiona con un submódulo "
+"llamado igual. Saltándolo."
+
+#, 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"
+
+#, c-format
+msgid ""
+"Could not run 'git rev-list <commits> --not --remotes -n 1' command in "
+"submodule %s"
+msgstr ""
+"No se pudo ejecutar comando 'git rev-list <commits> --not --remotes -n 1' en "
+"el submódulo %s"
+
+#, c-format
+msgid "process for submodule '%s' failed"
+msgstr "proceso para submódulo '%s' falló"
+
+#, c-format
+msgid "Pushing submodule '%s'\n"
+msgstr "Empujando submódulo '%s'\n"
+
+#, c-format
+msgid "Unable to push submodule '%s'\n"
+msgstr "No es posible empujar el submódulo '%s'\n"
+
+#, c-format
+msgid "Fetching submodule %s%s\n"
+msgstr "Haciendo fetch al submódulo %s%s\n"
+
+#, c-format
+msgid "Could not access submodule '%s'\n"
+msgstr "No se pudo acceder al submódulo '%s'\n"
+
+#, fuzzy, c-format
+msgid "Could not access submodule '%s' at commit %s\n"
+msgstr "No se pudo acceder al submódulo '%s'\n"
+
+#, fuzzy, c-format
+msgid "Fetching submodule %s%s at commit %s\n"
+msgstr "Haciendo fetch al submódulo %s%s\n"
+
+#, c-format
+msgid ""
+"Errors during submodule fetch:\n"
+"%s"
+msgstr ""
+"Errores durante el fetch del submódulo:\n"
+"%s"
+
+#, c-format
+msgid "'%s' not recognized as a git repository"
+msgstr "'%s' no reconocido como un repositorio git"
+
+#, 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"
+
+#, c-format
+msgid "'git status --porcelain=2' failed in submodule %s"
+msgstr "'git status --porcelain=2' falló en el submódulo %s"
+
+#, c-format
+msgid "could not start 'git status' in submodule '%s'"
+msgstr "no se pudo comenzar 'git status' en el submódulo '%s'"
+
+#, c-format
+msgid "could not run 'git status' in submodule '%s'"
+msgstr "no se pudo ejecutar 'git status' en el submódulo '%s'"
+
+#, 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'"
+
+#, c-format
+msgid "could not recurse into submodule '%s'"
+msgstr "no se pudo recursar en el submódulo '%s'"
+
+msgid "could not reset submodule index"
+msgstr "no se pudo reiniciar el índice del submódulo"
+
+#, c-format
+msgid "submodule '%s' has dirty index"
+msgstr "submódulo '%s' tiene un índice corrupto"
+
+#, c-format
+msgid "Submodule '%s' could not be updated."
+msgstr "Submódulo '%s' no pudo ser actualizado."
+
+#, 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'"
+
+#, c-format
+msgid ""
+"relocate_gitdir for submodule '%s' with more than one worktree not supported"
+msgstr ""
+"relocate_gitdir para el submódulo '%s' con más de un árbol de trabajo no "
+"soportado"
+
+#, c-format
+msgid "could not lookup name for submodule '%s'"
+msgstr "no se pudo resolver el nombre para el submódulo '%s'"
+
+#, c-format
+msgid "refusing to move '%s' into an existing git dir"
+msgstr "rechazando mover '%s' dentro de un directorio git existente"
+
+#, c-format
+msgid ""
+"Migrating git directory of '%s%s' from\n"
+"'%s' to\n"
+"'%s'\n"
+msgstr ""
+"Migrando directorio git de '%s%s' desde\n"
+"'%s' hacia\n"
+"'%s'\n"
+
+msgid "could not start ls-files in .."
+msgstr "no se pudo comenzar ls-files en .."
+
+#, c-format
+msgid "ls-tree returned unexpected return code %d"
+msgstr "ls-tree devolvió un código %d inesperado"
+
+#, c-format
+msgid "failed to lstat '%s'"
+msgstr "falló al hacer lstat '%s'"
+
+msgid "unhandled options"
+msgstr "opciones no manejadas"
+
+msgid "error preparing revisions"
+msgstr "error al preparar revisiones"
+
+#, c-format
+msgid "commit %s is not marked reachable"
+msgstr "commit %s no está marcado como alcanzable"
+
+msgid "too many commits marked reachable"
+msgstr "demasiados commits marcados como alcanzables"
+
+msgid "test-tool serve-v2 [<options>]"
+msgstr "test-tool serve-v2 [<opciones>]"
+
+msgid "exit immediately after advertising capabilities"
+msgstr "salir inmediatamente tras anunciar capacidades"
+
+msgid "test-helper simple-ipc is-active    [<name>] [<options>]"
+msgstr "test-helper simple-ipc is-active  [<nombre>] [<opciones>]"
+
+msgid "test-helper simple-ipc run-daemon   [<name>] [<threads>]"
+msgstr "test-helper simple-ipc run-daemon   [<nombre>] [<hilos>]"
+
+msgid "test-helper simple-ipc start-daemon [<name>] [<threads>] [<max-wait>]"
+msgstr ""
+"test-helper simple-ipc start-daemon [<nombre>] [<hilos>] [<espera-maxima>]"
+
+msgid "test-helper simple-ipc stop-daemon  [<name>] [<max-wait>]"
+msgstr "test-helper simple-ipc stop-daemon  [<nombre>] [<espera-maxima>]"
+
+msgid "test-helper simple-ipc send         [<name>] [<token>]"
+msgstr "test-helper simple-ipc send         [<nombre>] [<token>]"
+
+msgid "test-helper simple-ipc sendbytes    [<name>] [<bytecount>] [<byte>]"
+msgstr ""
+"test-helper simple-ipc sendbytes    [<nombre>] [<cuenta de bytes>] [<byte>]"
+
+msgid ""
+"test-helper simple-ipc multiple     [<name>] [<threads>] [<bytecount>] "
+"[<batchsize>]"
+msgstr ""
+"test-helper simple-ipc multiple     [<nombre>] [<hilos>] [<cuenta de bytes>] "
+"[<tamaño de batch>]"
+
+msgid "name or pathname of unix domain socket"
+msgstr "nombre o ruta de nombre de socket de dominio unix"
+
+msgid "named-pipe name"
+msgstr "nombre de named-pipe"
+
+msgid "number of threads in server thread pool"
+msgstr "número de hilos en el pool de hilos del servidor"
+
+msgid "seconds to wait for daemon to start or stop"
+msgstr "segundos a esperar para que el dominio empiece o se detenga"
+
+msgid "number of bytes"
+msgstr "número de bytes"
+
+msgid "number of requests per thread"
+msgstr "número de peticiones por hilo"
+
+msgid "byte"
+msgstr "byte"
+
+msgid "ballast character"
+msgstr "carácter lastre"
+
+msgid "token"
+msgstr "token"
+
+msgid "command token to send to the server"
+msgstr "token de comando para enviar al servidor"
+
+#, c-format
+msgid "running trailer command '%s' failed"
+msgstr "ejecución del comando de remolque '%s' falló"
+
+#, c-format
+msgid "unknown value '%s' for key '%s'"
+msgstr "valor '%s' desconocido para la clave '%s'"
+
+#, c-format
+msgid "empty trailer token in trailer '%.*s'"
+msgstr "token de remolque vacío en el trailer '%.*s'"
+
+#, c-format
+msgid "could not read input file '%s'"
+msgstr "no se pudo leer el archivo de entrada '%s'"
+
+#, c-format
+msgid "could not stat %s"
+msgstr "no se pudo hacer stat en %s"
+
+#, c-format
+msgid "file %s is not a regular file"
+msgstr "el archivo %s no es un archivo regular"
+
+#, c-format
+msgid "file %s is not writable by user"
+msgstr "el archivo %s no puede ser escrito por el usuario"
+
+msgid "could not open temporary file"
+msgstr "no se pudo abrir el archivo temporal"
+
+#, c-format
+msgid "could not rename temporary file to %s"
+msgstr "no se pudo renombrar el archivo temporal a %s"
+
+msgid "full write to remote helper failed"
+msgstr "escritura total al helper remoto falló"
+
+#, c-format
+msgid "unable to find remote helper for '%s'"
+msgstr "no es posible encontrar helper remoto para '%s'"
+
+msgid "can't dup helper output fd"
+msgstr "no se puede duplicar fd de salida del helper"
+
+#, c-format
+msgid ""
+"unknown mandatory capability %s; this remote helper probably needs newer "
+"version of Git"
+msgstr ""
+"capacidad mandatoria desconocida %s; este helper remoto probablemente "
+"necesita una nueva versión de Git"
+
+msgid "this remote helper should implement refspec capability"
+msgstr "este helper remoto debería implementar capacidad refspec"
+
+#, c-format
+msgid "%s unexpectedly said: '%s'"
+msgstr "%s dijo inesperadamente: '%s'"
+
+#, c-format
+msgid "%s also locked %s"
+msgstr "%s también bloqueó %s"
+
+msgid "couldn't run fast-import"
+msgstr "no se pudo ejecutar fast-import"
+
+msgid "error while running fast-import"
+msgstr "error al ejecutar fast-import"
+
+#, c-format
+msgid "could not read ref %s"
+msgstr "no se pudo leer la referencia %s"
+
+#, c-format
+msgid "unknown response to connect: %s"
+msgstr "respuesta al conectar desconocida: %s"
+
+msgid "setting remote service path not supported by protocol"
+msgstr "configurar servicio de ruta remota no soportado por el protocolo"
+
+msgid "invalid remote service path"
+msgstr "ruta de servicio remoto inválida"
+
+msgid "operation not supported by protocol"
+msgstr "operación no soportada por protocolo"
+
+#, c-format
+msgid "can't connect to subservice %s"
+msgstr "no se puede conectar al subservicio %s"
+
+msgid "--negotiate-only requires protocol v2"
+msgstr "--negotiate-only requiere protocolo v2"
+
+msgid "'option' without a matching 'ok/error' directive"
+msgstr "'opción' sin una directiva correspondiente 'ok/error'"
+
+#, c-format
+msgid "expected ok/error, helper said '%s'"
+msgstr "se esperaba ok/error, helper dijo '%s'"
+
+#, c-format
+msgid "helper reported unexpected status of %s"
+msgstr "helper reportó estado inesperado de %s"
+
+#, c-format
+msgid "helper %s does not support dry-run"
+msgstr "helper %s no soporta dry-run"
+
+#, c-format
+msgid "helper %s does not support --signed"
+msgstr "helper %s no soporta --signed"
+
+#, c-format
+msgid "helper %s does not support --signed=if-asked"
+msgstr "helper %s no soporta --signed=if-asked"
+
+#, c-format
+msgid "helper %s does not support --atomic"
+msgstr "helper %s no soporta --atomic"
+
+#, c-format
+msgid "helper %s does not support --%s"
+msgstr "helper %s no soporta --%s"
+
+#, c-format
+msgid "helper %s does not support 'push-option'"
+msgstr "helper %s no soporta 'push-option'"
+
+msgid "remote-helper doesn't support push; refspec needed"
+msgstr "el remote-helper no soporta empujar; se necesita refspec"
+
+#, c-format
+msgid "helper %s does not support 'force'"
+msgstr "helper %s no soporta 'force'"
+
+msgid "couldn't run fast-export"
+msgstr "no se pudo ejecutar fast-export"
+
+msgid "error while running fast-export"
+msgstr "error al ejecutar fast-export"
+
+#, c-format
+msgid ""
+"No refs in common and none specified; doing nothing.\n"
+"Perhaps you should specify a branch.\n"
+msgstr ""
+"No hay refs comunes y ninguno especificado; no se hace nada.\n"
+"Tal vez deberías especificar un branch.\n"
+
+#, c-format
+msgid "unsupported object format '%s'"
+msgstr "formato de objeto no soportado '%s'"
+
+#, c-format
+msgid "malformed response in ref list: %s"
+msgstr "respuesta malformada en lista de refs: %s"
+
+#, c-format
+msgid "read(%s) failed"
+msgstr "read(%s) falló"
+
+#, c-format
+msgid "write(%s) failed"
+msgstr "write(%s) falló"
+
+#, c-format
+msgid "%s thread failed"
+msgstr "hilo %s falló"
+
+#, c-format
+msgid "%s thread failed to join: %s"
+msgstr "hilo %s falló al unirse: %s"
+
+#, c-format
+msgid "can't start thread for copying data: %s"
+msgstr "no se puede iniciar el hilo para copiar data: %s"
+
+#, c-format
+msgid "%s process failed to wait"
+msgstr "proceso %s falló al esperar"
+
+#, c-format
+msgid "%s process failed"
+msgstr "proceso %s falló"
+
+msgid "can't start thread for copying data"
+msgstr "no se puede iniciar hilo para copiar data"
+
+#, c-format
+msgid "Would set upstream of '%s' to '%s' of '%s'\n"
+msgstr "Configurará upstream de '%s' a '%s' de '%s'\n"
+
+#, c-format
+msgid "could not read bundle '%s'"
+msgstr "no se pudo leer el conjunto '%s'"
+
+#, c-format
+msgid "transport: invalid depth option '%s'"
+msgstr "transport: opción de profundidad inválida '%s'"
+
+msgid "see protocol.version in 'git help config' for more details"
+msgstr "mira protocol.version en 'git help config' para más información"
+
+msgid "server options require protocol version 2 or later"
+msgstr "opciones del servidor requieren protocolo versión 2 o posterior"
+
+msgid "server does not support wait-for-done"
+msgstr "el servidor no soporta wait-for-done"
+
+msgid "could not parse transport.color.* config"
+msgstr "no se pudo analizar valor de configuración transport.color.*"
+
+msgid "support for protocol v2 not implemented yet"
+msgstr "soporte para protocolo v2 no implementado todavía"
+
+#, c-format
+msgid "unknown value for config '%s': %s"
+msgstr "valor desconocido para configuración '%s': %s"
+
+#, c-format
+msgid "transport '%s' not allowed"
+msgstr "transporte '%s' no permitido"
+
+msgid "git-over-rsync is no longer supported"
+msgstr "git-over-rsync ya no es soportado"
+
+#, c-format
+msgid ""
+"The following submodule paths contain changes that can\n"
+"not be found on any remote:\n"
+msgstr ""
+"La siguiente ruta de submódulo contiene cambios que no\n"
+"pueden ser encontrados en ningún remoto:\n"
+
+#, c-format
+msgid ""
+"\n"
+"Please try\n"
+"\n"
+"\tgit push --recurse-submodules=on-demand\n"
+"\n"
+"or cd to the path and use\n"
+"\n"
+"\tgit push\n"
+"\n"
+"to push them to a remote.\n"
+"\n"
+msgstr ""
+"\n"
+"Por favor intenta\n"
+"\n"
+"\tgit push --recurse-submodules=on-demand\n"
+"\n"
+"o cd a la ruta y usa\n"
+"\n"
+"\tgit push\n"
+"\n"
+"para hacer un push al remoto.\n"
+"\n"
+
+msgid "Aborting."
+msgstr "Abortando."
+
+msgid "failed to push all needed submodules"
+msgstr "falló al empujar todos los submódulos necesarios"
+
+msgid "too-short tree object"
+msgstr "objeto de árbol demasiado corto"
+
+msgid "malformed mode in tree entry"
+msgstr "modo mal formado en la entrada de árbol"
+
+msgid "empty filename in tree entry"
+msgstr "nombre de archivo vacío en la entrada de árbol"
+
+msgid "too-short tree file"
+msgstr "archivo de árbol demasiado corto"
+
+#, c-format
+msgid ""
+"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 ""
+"Los cambios locales de los siguientes archivos serán sobrescritos por "
+"checkout:\n"
+"%%sPor favor realiza un commit con los cambios o un stash antes de cambiar "
+"de rama."
+
+#, c-format
+msgid ""
+"Your local changes to the following files would be overwritten by checkout:\n"
+"%%s"
+msgstr ""
+"Los cambios locales de los siguientes archivos serán sobreescritos por "
+"checkout:\n"
+"%%s"
+
+#, c-format
+msgid ""
+"Your local changes to the following files would be overwritten by merge:\n"
+"%%sPlease commit your changes or stash them before you merge."
+msgstr ""
+"Los cambios locales de los siguientes archivos serán sobrescritos al "
+"fusionar:\n"
+"%%sPor favor, confirma tus cambios o aguárdalos antes de fusionar."
+
+#, c-format
+msgid ""
+"Your local changes to the following files would be overwritten by merge:\n"
+"%%s"
+msgstr ""
+"Los cambios locales de los siguientes archivos serán sobreescritos por "
+"merge:\n"
+"%%s"
+
+#, c-format
+msgid ""
+"Your local changes to the following files would be overwritten by %s:\n"
+"%%sPlease commit your changes or stash them before you %s."
+msgstr ""
+"Los cambios locales de los siguientes archivos serán sobrescritos al %s:\n"
+"%%sPor favor, confirma tus cambios o guárdalos antes de %s."
+
+#, c-format
+msgid ""
+"Your local changes to the following files would be overwritten by %s:\n"
+"%%s"
+msgstr ""
+"Los cambios locales de los siguientes archivos serán sobreescritos por %s:\n"
+"%%s"
+
+#, c-format
+msgid ""
+"Updating the following directories would lose untracked files in them:\n"
+"%s"
+msgstr ""
+"Al actualizar los siguientes directorios se perderán los archivos sin "
+"seguimiento en ellos:\n"
+"%s"
+
+#, fuzzy, c-format
+msgid ""
+"Refusing to remove the current working directory:\n"
+"%s"
+msgstr "no es posible obtener el directorio de trabajo actual"
+
+#, c-format
+msgid ""
+"The following untracked working tree files would be removed by checkout:\n"
+"%%sPlease move or remove them before you switch branches."
+msgstr ""
+"Los siguientes archivos sin seguimiento en el árbol de trabajo serán "
+"eliminados al actualizar el árbol de trabajo:\n"
+"%%sPor favor, muévelos o elimínalos antes de cambiar de rama."
+
+#, c-format
+msgid ""
+"The following untracked working tree files would be removed by checkout:\n"
+"%%s"
+msgstr ""
+"Los siguientes archivos sin seguimiento del árbol de trabajo serán "
+"eliminados al actualizar el árbol de trabajo:\n"
+"%%s"
+
+#, c-format
+msgid ""
+"The following untracked working tree files would be removed by merge:\n"
+"%%sPlease move or remove them before you merge."
+msgstr ""
+"Los siguientes archivos sin seguimiento en el árbol de trabajo serán "
+"eliminados al fusionar:\n"
+"%%sPor favor, muévelos o elimínalos antes de fusionar."
+
+#, c-format
+msgid ""
+"The following untracked working tree files would be removed by merge:\n"
+"%%s"
+msgstr ""
+"Los siguientes archivos sin seguimiento de árbol de trabajo serán eliminados "
+"al fusionar:\n"
+"%%s"
+
+#, c-format
+msgid ""
+"The following untracked working tree files would be removed by %s:\n"
+"%%sPlease move or remove them before you %s."
+msgstr ""
+"Los siguientes archivos sin seguimiento en el árbol de trabajo serán "
+"eliminados al %s:\n"
+"%%sPor favor, muévelos o elimínalos antes de %s."
+
+#, c-format
+msgid ""
+"The following untracked working tree files would be removed by %s:\n"
+"%%s"
+msgstr ""
+"Los siguientes archivos sin seguimiento en el árbol de trabajo serán "
+"eliminados al ejecutar %s:\n"
+"%%s"
+
+#, c-format
+msgid ""
+"The following untracked working tree files would be overwritten by "
+"checkout:\n"
+"%%sPlease move or remove them before you switch branches."
+msgstr ""
+"Los siguientes archivos sin seguimiento en el árbol de trabajo serán "
+"sobrescritos al actualizar el árbol de trabajo:\n"
+"%%sPor favor, muévelos o elimínalos antes de cambiar de rama."
+
+#, c-format
+msgid ""
+"The following untracked working tree files would be overwritten by "
+"checkout:\n"
+"%%s"
+msgstr ""
+"Los siguientes archivos sin seguimiento de árbol de trabajo serán "
+"sobrescritos al actualizar el árbol de trabajo:\n"
+"%%s"
+
+#, c-format
+msgid ""
+"The following untracked working tree files would be overwritten by merge:\n"
+"%%sPlease move or remove them before you merge."
+msgstr ""
+"Los siguientes archivos sin seguimiento en el árbol de trabajo serán "
+"sobrescritos al fusionar:\n"
+"%%sPor favor, muévelos o elimínalos antes de fusionar."
+
+#, c-format
+msgid ""
+"The following untracked working tree files would be overwritten by merge:\n"
+"%%s"
+msgstr ""
+"Los siguientes archivos sin seguimiento de árbol de trabajo serán "
+"sobrescritos al fusionar:\n"
+"%%s"
+
+#, c-format
+msgid ""
+"The following untracked working tree files would be overwritten by %s:\n"
+"%%sPlease move or remove them before you %s."
+msgstr ""
+"Los siguientes archivos sin seguimiento en el árbol de trabajo serán "
+"sobrescritos al %s:\n"
+"%%sPor favor, muévelos o elimínalos antes de %s."
+
+#, c-format
+msgid ""
+"The following untracked working tree files would be overwritten by %s:\n"
+"%%s"
+msgstr ""
+"Los siguientes archivos no rastreados en el árbol de trabajo serán "
+"eliminados por %s:\n"
+"%%s"
+
+#, c-format
+msgid "Entry '%s' overlaps with '%s'.  Cannot bind."
+msgstr "Entrada '%s' se solapa con '%s'.  No se pueden unir."
+
+#, c-format
+msgid ""
+"Cannot update submodule:\n"
+"%s"
+msgstr ""
+"No se puede actualizar el submódulo:\n"
+"%s"
+
+#, c-format
+msgid ""
+"The following paths are not up to date and were left despite sparse "
+"patterns:\n"
+"%s"
+msgstr ""
+"Las siguientes rutas no están actualizadas y fueron dejadas a pesar de los "
+"patrones sparse:\n"
+"%s"
+
+#, c-format
+msgid ""
+"The following paths are unmerged and were left despite sparse patterns:\n"
+"%s"
+msgstr ""
+"Las siguientes rutas son ignoradas y fueron dejadas a pesar de los patrones "
+"sparse:\n"
+"%s"
+
+#, c-format
+msgid ""
+"The following paths were already present and thus not updated despite sparse "
+"patterns:\n"
+"%s"
+msgstr ""
+"Las siguientes rutas ya estaban presentes y por eso no fueron actualizadas a "
+"pesar de los patrones sparse:\n"
+"%s"
+
+#, c-format
+msgid "Aborting\n"
+msgstr "Abortando\n"
+
+#, c-format
+msgid ""
+"After fixing the above paths, you may want to run `git sparse-checkout "
+"reapply`.\n"
+msgstr ""
+"Luego de arreglar las rutas mostradas, puede que quieras ejecutar `git "
+"sparse-checkout reapply`.\n"
+
+msgid "Updating files"
+msgstr "Actualizando archivos"
+
+msgid ""
+"the following paths have collided (e.g. case-sensitive paths\n"
+"on a case-insensitive filesystem) and only one from the same\n"
+"colliding group is in the working tree:\n"
+msgstr ""
+"las siguientes rutas han colisionado (p.e. rutas case-sensitive\n"
+"en un filesystem case-insensitive) y solo una del grupo\n"
+"colisionando está en el árbol de trabajo:\n"
+
+msgid "Updating index flags"
+msgstr "Actualizando flags del índice"
+
+#, c-format
+msgid "worktree and untracked commit have duplicate entries: %s"
+msgstr ""
+"el árbol de trabajo y commits no monitoreados tienen entradas duplicadas: %s"
+
+msgid "expected flush after fetch arguments"
+msgstr "se espera flush tras argumentos fetch"
+
+msgid "invalid URL scheme name or missing '://' suffix"
+msgstr "nombre de URL inválido o sufijo '://' faltante"
+
+#, c-format
+msgid "invalid %XX escape sequence"
+msgstr "secuencia de escape %XX inválida"
+
+msgid "missing host and scheme is not 'file:'"
+msgstr "falta host y el esquema no es 'file:'"
+
+msgid "a 'file:' URL may not have a port number"
+msgstr "un URL de 'file:' no puede tener número de puerto"
+
+msgid "invalid characters in host name"
+msgstr "carácter inválido en el nombre del host"
+
+msgid "invalid port number"
+msgstr "número de puerto inválido"
+
+msgid "invalid '..' path segment"
+msgstr "segmento de ruta '..' inválido"
+
+msgid "Fetching objects"
+msgstr "Haciendo fetch a objetos"
+
+#, c-format
+msgid "'%s' at main working tree is not the repository directory"
+msgstr ""
+"'%s' en el árbol de trabajo principal no es el directorio del repositorio"
+
+#, c-format
+msgid "'%s' file does not contain absolute path to the working tree location"
+msgstr ""
+"archivo '%s' no contiene una ruta absoluta a la ubicación del árbol de "
+"trabajo"
+
+#, c-format
+msgid "'%s' is not a .git file, error code %d"
+msgstr "'%s' no es un archivo .git, código de error %d"
+
+#, c-format
+msgid "'%s' does not point back to '%s'"
+msgstr "'%s' no apunta de vuelta a '%s'"
+
+msgid "not a directory"
+msgstr "no es un directorio"
+
+msgid ".git is not a file"
+msgstr ".git no es un archivo"
+
+msgid ".git file broken"
+msgstr "archivo .git roto"
+
+msgid ".git file incorrect"
+msgstr "archivo .git incorrecto"
+
+msgid "not a valid path"
+msgstr "no es una ruta válida"
+
+msgid "unable to locate repository; .git is not a file"
+msgstr "no es posible ubicar el repositorio; .git no es un archivo"
+
+msgid "unable to locate repository; .git file does not reference a repository"
+msgstr ""
+"incapaz de localizar el repositorio; el archivo .git no hace referencia a un "
+"repositorio"
+
+msgid "unable to locate repository; .git file broken"
+msgstr "no es posible ubicar el repositorio; archivo .git roto"
+
+msgid "gitdir unreadable"
+msgstr "gitdir ilegible"
+
+msgid "gitdir incorrect"
+msgstr "gitdir incorrecto"
+
+msgid "not a valid directory"
+msgstr "no en un directorio válido"
+
+msgid "gitdir file does not exist"
+msgstr "archivo gitdir no existe"
+
+#, c-format
+msgid "unable to read gitdir file (%s)"
+msgstr "no es posible leer archivo gitdir (%s)"
+
+#, c-format
+msgid "short read (expected %<PRIuMAX> bytes, read %<PRIuMAX>)"
+msgstr "lectura corta (se esperaba %<PRIuMAX> bytes, se leyó %<PRIuMAX>)"
+
+msgid "invalid gitdir file"
+msgstr "archivo gitdir inválido"
+
+msgid "gitdir file points to non-existent location"
+msgstr "archivo gitdir apunta a una ubicación inexistente"
+
+#, fuzzy, c-format
+msgid "unable to set %s in '%s'"
+msgstr "incapaz de hacer stat en '%s'"
+
+#, fuzzy, c-format
+msgid "unable to unset %s in '%s'"
+msgstr "no se pudo poner permisos a '%s'"
+
+msgid "failed to set extensions.worktreeConfig setting"
+msgstr "falló al configurar opción extensions.worktreeConfig"
+
+#, c-format
+msgid "could not setenv '%s'"
+msgstr "no se pudo establecer setenv '%s'"
+
+#, c-format
+msgid "unable to create '%s'"
+msgstr "no se puede crear '%s'"
+
+#, c-format
+msgid "could not open '%s' for reading and writing"
+msgstr "no se pudo abrir '%s' para lectura y escritura"
+
+#, c-format
+msgid "unable to access '%s'"
+msgstr "no es posible acceder '%s'"
+
+msgid "unable to get current working directory"
+msgstr "no es posible obtener el directorio de trabajo actual"
+
+msgid "Unmerged paths:"
+msgstr "Rutas no fusionadas:"
+
+msgid "  (use \"git restore --staged <file>...\" to unstage)"
+msgstr ""
+"  (usa \"git restore --staged <archivo>...\" para sacar del área de stage)"
+
+#, c-format
+msgid "  (use \"git restore --source=%s --staged <file>...\" to unstage)"
+msgstr ""
+"  (usa \"git restore --source=%s --staged <archivo>...\" para sacar del área "
+"de stage)"
+
+msgid "  (use \"git rm --cached <file>...\" to unstage)"
+msgstr "  (usa \"git rm --cached <archivo>...\" para sacar del área de stage)"
+
+msgid "  (use \"git add <file>...\" to mark resolution)"
+msgstr "  (usa \"git add <archivo>...\" para marcar una resolución)"
+
+msgid "  (use \"git add/rm <file>...\" as appropriate to mark resolution)"
+msgstr ""
+"  (usa \"git add/rm <archivo>...\" como sea apropiado para marcar la "
+"resolución)"
+
+msgid "  (use \"git rm <file>...\" to mark resolution)"
+msgstr "  (usa \"git rm <file>...\" para marcar la resolución)"
+
+msgid "Changes to be committed:"
+msgstr "Cambios a ser confirmados:"
+
+msgid "Changes not staged for commit:"
+msgstr "Cambios no rastreados para el commit:"
+
+msgid "  (use \"git add <file>...\" to update what will be committed)"
+msgstr ""
+"  (usa \"git add <archivo>...\" para actualizar lo que será confirmado)"
+
+msgid "  (use \"git add/rm <file>...\" to update what will be committed)"
+msgstr ""
+"  (usa \"git add/rm <archivo>...\" para actualizar a lo que se le va a hacer "
+"commit)"
+
+msgid ""
+"  (use \"git restore <file>...\" to discard changes in working directory)"
+msgstr ""
+"  (usa \"git restore <archivo>...\" para descartar los cambios en el "
+"directorio de trabajo)"
+
+msgid "  (commit or discard the untracked or modified content in submodules)"
+msgstr ""
+"  (confirma o descarta el contenido sin seguimiento o modificado en los sub-"
+"módulos)"
+
+#, c-format
+msgid "  (use \"git %s <file>...\" to include in what will be committed)"
+msgstr ""
+"  (usa \"git %s <archivo>...\" para incluirlo a lo que se será confirmado)"
+
+msgid "both deleted:"
+msgstr "borrados por ambos:"
+
+msgid "added by us:"
+msgstr "agregados por nosotros:"
+
+msgid "deleted by them:"
+msgstr "borrados por ellos:"
+
+msgid "added by them:"
+msgstr "agregados por ellos:"
+
+msgid "deleted by us:"
+msgstr "borrados por nosotros:"
+
+msgid "both added:"
+msgstr "agregados por ambos:"
+
+msgid "both modified:"
+msgstr "modificados por ambos:"
+
+msgid "new file:"
+msgstr "nuevos archivos:"
+
+msgid "copied:"
+msgstr "copiados:"
+
+msgid "deleted:"
+msgstr "borrados:"
+
+msgid "modified:"
+msgstr "modificados:"
+
+msgid "renamed:"
+msgstr "renombrados:"
+
+msgid "typechange:"
+msgstr "cambios de tipo:"
+
+msgid "unknown:"
+msgstr "desconocido:"
+
+msgid "unmerged:"
+msgstr "sin fusión:"
+
+msgid "new commits, "
+msgstr "nuevos commits, "
+
+msgid "modified content, "
+msgstr "contenido modificado, "
+
+msgid "untracked content, "
+msgstr "contenido no rastreado, "
+
+#, c-format
+msgid "Your stash currently has %d entry"
+msgid_plural "Your stash currently has %d entries"
+msgstr[0] "Tu stash actualmente tiene %d entrada"
+msgstr[1] "Tu stash actualmente tiene %d entradas"
+
+msgid "Submodules changed but not updated:"
+msgstr "Submódulos cambiados pero no actualizados:"
+
+msgid "Submodule changes to be committed:"
+msgstr "Submódulos cambiados listos para realizar commit:"
+
+msgid ""
+"Do not modify or remove the line above.\n"
+"Everything below it will be ignored."
+msgstr ""
+"No modifiques ni borres la línea de encima.\n"
+"Todo lo que esté por abajo será ignorado."
+
+#, c-format
+msgid ""
+"\n"
+"It took %.2f seconds to compute the branch ahead/behind values.\n"
+"You can use '--no-ahead-behind' to avoid this.\n"
+msgstr ""
+"\n"
+"Tomó %.2f segundos para calcular los valores anterior/posterior del branch.\n"
+"Puedes usar '--no-ahead-behind' para evitar esto.\n"
+
+msgid "You have unmerged paths."
+msgstr "Tienes rutas no fusionadas."
+
+msgid "  (fix conflicts and run \"git commit\")"
+msgstr "  (arregla los conflictos y ejecuta \"git commit\""
+
+msgid "  (use \"git merge --abort\" to abort the merge)"
+msgstr "  (usa \"git merge --abort\" para abortar la fusion)"
+
+msgid "All conflicts fixed but you are still merging."
+msgstr "Todos los conflictos resueltos pero sigues fusionando."
+
+msgid "  (use \"git commit\" to conclude merge)"
+msgstr "  (usa \"git commit\" para concluir la fusión)"
+
+msgid "You are in the middle of an am session."
+msgstr "Estás en medio de una sesión am."
+
+msgid "The current patch is empty."
+msgstr "El parche actual está vacío."
+
+msgid "  (fix conflicts and then run \"git am --continue\")"
+msgstr "  (arregla los conflictos y luego ejecuta \"git am --continue\""
+
+msgid "  (use \"git am --skip\" to skip this patch)"
+msgstr "  (usa \"git am --skip\" para saltar este parche)"
+
+#, fuzzy
+msgid ""
+"  (use \"git am --allow-empty\" to record this patch as an empty commit)"
+msgstr "  (usa \"git commit --amend\" para enmendar el commit actual)"
+
+msgid "  (use \"git am --abort\" to restore the original branch)"
+msgstr "  (usa \"git am --abort\" para restaurar la rama original)"
+
+msgid "git-rebase-todo is missing."
+msgstr "git-rebase-todo no está presente."
+
+msgid "No commands done."
+msgstr "No se realizaron los comandos."
+
+#, fuzzy, c-format
+msgid "Last command done (%<PRIuMAX> command done):"
+msgid_plural "Last commands done (%<PRIuMAX> commands done):"
+msgstr[0] "El último comando realizado (%d comando realizado):"
+msgstr[1] "Los últimos comandos realizados (%d comandos realizados):"
+
+#, c-format
+msgid "  (see more in file %s)"
+msgstr "  (ver más en el archivo %s)"
+
+msgid "No commands remaining."
+msgstr "No quedan más comandos."
+
+#, fuzzy, c-format
+msgid "Next command to do (%<PRIuMAX> remaining command):"
+msgid_plural "Next commands to do (%<PRIuMAX> remaining commands):"
+msgstr[0] "Siguiente comando a realizar (%d comando restante):"
+msgstr[1] "Siguientes comandos a realizar (%d comandos faltantes):"
+
+msgid "  (use \"git rebase --edit-todo\" to view and edit)"
+msgstr "  (usa \"git rebase --edit-todo\" para ver y editar)"
+
+#, c-format
+msgid "You are currently rebasing branch '%s' on '%s'."
+msgstr "Estás aplicando un rebase de la rama '%s' sobre '%s."
+
+msgid "You are currently rebasing."
+msgstr "Estás aplicando un rebase."
+
+msgid "  (fix conflicts and then run \"git rebase --continue\")"
+msgstr "  (corrige los conflictos y ejecuta \"git rebase --continue\")"
+
+msgid "  (use \"git rebase --skip\" to skip this patch)"
+msgstr "  (usa \"git rebase --skip\" para omitir este parche)"
+
+msgid "  (use \"git rebase --abort\" to check out the original branch)"
+msgstr "  (usa \"git rebase --abort\" para volver a tu rama original)"
+
+msgid "  (all conflicts fixed: run \"git rebase --continue\")"
+msgstr "  (todos los conflictos corregidos: ejecuta \"git rebase --continue\")"
+
+#, c-format
+msgid ""
+"You are currently splitting a commit while rebasing branch '%s' on '%s'."
+msgstr ""
+"Estás dividiendo un commit mientras aplicas un rebase de la rama '%s' en "
+"'%s'."
+
+msgid "You are currently splitting a commit during a rebase."
+msgstr "Estás dividiendo un commit durante un rebase."
+
+msgid "  (Once your working directory is clean, run \"git rebase --continue\")"
+msgstr ""
+"  (Una vez que tu directorio de trabajo esté limpio, ejecuta \"git rebase --"
+"continue\")"
+
+#, c-format
+msgid "You are currently editing a commit while rebasing branch '%s' on '%s'."
+msgstr ""
+"Estás editando un commit mientras se aplica un rebase de la rama '%s' sobre "
+"'%s'."
+
+msgid "You are currently editing a commit during a rebase."
+msgstr "Estás editando un commit durante un rebase."
+
+msgid "  (use \"git commit --amend\" to amend the current commit)"
+msgstr "  (usa \"git commit --amend\" para enmendar el commit actual)"
+
+msgid ""
+"  (use \"git rebase --continue\" once you are satisfied with your changes)"
+msgstr ""
+"  (usa \"git rebase --continue\" una vez que estés satisfecho con tus "
+"cambios)"
+
+msgid "Cherry-pick currently in progress."
+msgstr "Cherry-pick en progreso actualmente."
+
+#, c-format
+msgid "You are currently cherry-picking commit %s."
+msgstr "Estás realizando un cherry-picking en el commit %s."
+
+msgid "  (fix conflicts and run \"git cherry-pick --continue\")"
+msgstr "  (corrige los conflictos y ejecuta \"git cherry-pick --continue\")"
+
+msgid "  (run \"git cherry-pick --continue\" to continue)"
+msgstr "  (ejecuta \"git cherry-pick --continue\" para continuar)"
+
+msgid "  (all conflicts fixed: run \"git cherry-pick --continue\")"
+msgstr ""
+"  (todos los conflictos corregidos: ejecuta \"git cherry-pick --continue\")"
+
+msgid "  (use \"git cherry-pick --skip\" to skip this patch)"
+msgstr "  (usa \"git cherry-pick --skip\" para saltar este parche)"
+
+msgid "  (use \"git cherry-pick --abort\" to cancel the cherry-pick operation)"
+msgstr ""
+"  (usa \"git cherry-pick --abort\" para cancelar la operación cherry-pick)"
+
+msgid "Revert currently in progress."
+msgstr "Reversión en progreso actualmente."
+
+#, c-format
+msgid "You are currently reverting commit %s."
+msgstr "Estás revirtiendo el commit %s."
+
+msgid "  (fix conflicts and run \"git revert --continue\")"
+msgstr "  (corrige los conflictos y ejecuta \"git revert --continue\")"
+
+msgid "  (run \"git revert --continue\" to continue)"
+msgstr "  (ejecuta \"git revert --continue\" para continuar)"
+
+msgid "  (all conflicts fixed: run \"git revert --continue\")"
+msgstr "  (todos los conflictos corregidos: ejecuta \"git revert --continue\")"
+
+msgid "  (use \"git revert --skip\" to skip this patch)"
+msgstr "  (usa \"git revert --skip\" para omitir este parche)"
+
+msgid "  (use \"git revert --abort\" to cancel the revert operation)"
+msgstr "  (usa \"git revert --abort\" para cancelar la operación de revertir)"
+
+#, c-format
+msgid "You are currently bisecting, started from branch '%s'."
+msgstr "Estás aplicando un bisect, comenzando en la rama '%s'."
+
+msgid "You are currently bisecting."
+msgstr "Estás aplicando un bisect."
+
+msgid "  (use \"git bisect reset\" to get back to the original branch)"
+msgstr "  (usa \"git bisect reset\" para volver a la rama original)"
+
+msgid "You are in a sparse checkout."
+msgstr "Estás en un sparse checkout."
+
+#, c-format
+msgid "You are in a sparse checkout with %d%% of tracked files present."
+msgstr "Estás en un checkout de sparse con %d%% archivos rastreados presentes."
+
+msgid "On branch "
+msgstr "En la rama "
+
+msgid "interactive rebase in progress; onto "
+msgstr "rebase interactivo en progreso; sobre "
+
+msgid "rebase in progress; onto "
+msgstr "rebase en progreso; sobre "
+
+msgid "HEAD detached at "
+msgstr "HEAD desacoplada en "
+
+msgid "HEAD detached from "
+msgstr "HEAD desacoplada de "
+
+msgid "Not currently on any branch."
+msgstr "Actualmente no estás en ninguna rama."
+
+msgid "Initial commit"
+msgstr "Confirmación inicial"
+
+msgid "No commits yet"
+msgstr "No hay commits todavía"
+
+msgid "Untracked files"
+msgstr "Archivos sin seguimiento"
+
+msgid "Ignored files"
+msgstr "Archivos ignorados"
+
+#, c-format
+msgid ""
+"It took %.2f seconds to enumerate untracked files. 'status -uno'\n"
+"may speed it up, but you have to be careful not to forget to add\n"
+"new files yourself (see 'git help status')."
+msgstr ""
+"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 (mira 'git help status')."
+
+#, c-format
+msgid "Untracked files not listed%s"
+msgstr "Archivos no rastreados no son mostrados%s"
+
+msgid " (use -u option to show untracked files)"
+msgstr " (usa la opción -u para mostrar los archivos sin seguimiento)"
+
+msgid "No changes"
+msgstr "Sin cambios"
+
+#, c-format
+msgid "no changes added to commit (use \"git add\" and/or \"git commit -a\")\n"
+msgstr ""
+"sin cambios agregados al commit (usa \"git add\" y/o \"git commit -a\")\n"
+
+#, c-format
+msgid "no changes added to commit\n"
+msgstr "no se agregaron cambios al commit\n"
+
+#, c-format
+msgid ""
+"nothing added to commit but untracked files present (use \"git add\" to "
+"track)\n"
+msgstr ""
+"no hay nada agregado al commit pero hay archivos sin seguimiento presentes "
+"(usa \"git add\" para hacerles seguimiento)\n"
+
+#, c-format
+msgid "nothing added to commit but untracked files present\n"
+msgstr ""
+"no hay nada agregado para confirmar, pero hay archivos sin seguimiento "
+"presentes\n"
+
+#, c-format
+msgid "nothing to commit (create/copy files and use \"git add\" to track)\n"
+msgstr ""
+"no hay nada para confirmar (crea/copia archivos y usa \"git add\" para "
+"hacerles seguimiento)\n"
+
+#, c-format
+msgid "nothing to commit\n"
+msgstr "nada para hacer commit\n"
+
+#, c-format
+msgid "nothing to commit (use -u to show untracked files)\n"
+msgstr ""
+"nada para hacer commit (usa -u para mostrar los archivos no rastreados)\n"
+
+#, c-format
+msgid "nothing to commit, working tree clean\n"
+msgstr "nada para hacer commit, el árbol de trabajo está limpio\n"
+
+msgid "No commits yet on "
+msgstr "No hay commits todavía en "
+
+msgid "HEAD (no branch)"
+msgstr "HEAD (sin rama)"
+
+msgid "different"
+msgstr "diferente"
+
+msgid "behind "
+msgstr "detrás "
+
+msgid "ahead "
+msgstr "adelante "
+
+#. TRANSLATORS: the action is e.g. "pull with rebase"
+#, c-format
+msgid "cannot %s: You have unstaged changes."
+msgstr "no se puede %s: Tienes cambios sin marcar."
+
+msgid "additionally, your index contains uncommitted changes."
+msgstr "adicionalmente, tu índice contiene cambios que no están en un commit."
+
+#, c-format
+msgid "cannot %s: Your index contains uncommitted changes."
+msgstr "no se puede %s: Tu índice contiene cambios que no están en un commit."
+
 msgid ""
 "Error: Your local changes to the following files would be overwritten by "
 "merge"
@@ -25679,124 +21282,79 @@ msgstr ""
 "Error: Tus cambios locales de los siguientes archivos serán sobrescritos por "
 "la fusión"
 
-#: git-merge-octopus.sh:61
 msgid "Automated merge did not work."
 msgstr "Fusión automatizada no funcionó."
 
-#: git-merge-octopus.sh:62
 msgid "Should not be doing an octopus."
 msgstr "No se debería hacer un pulpo."
 
-#: git-merge-octopus.sh:73
 #, sh-format
 msgid "Unable to find common commit with $pretty_name"
 msgstr "No es posible encontrar commit común con $pretty_name"
 
-#: git-merge-octopus.sh:77
 #, sh-format
 msgid "Already up to date with $pretty_name"
 msgstr "Ya actualizado con $pretty_name"
 
-#: git-merge-octopus.sh:89
 #, sh-format
 msgid "Fast-forwarding to: $pretty_name"
 msgstr "Realizando fast-forward a: $pretty_name"
 
-#: git-merge-octopus.sh:97
 #, sh-format
 msgid "Trying simple merge with $pretty_name"
 msgstr "Intentando fusión simple con $pretty_name"
 
-#: git-merge-octopus.sh:102
 msgid "Simple merge did not work, trying automatic merge."
 msgstr "Fusión simple no funcionó, intentando fusión automática."
 
-#: 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: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:416
-#, sh-format
-msgid ""
-"Unable to find current ${remote_name}/${branch} revision in submodule path "
-"'$sm_path'"
-msgstr ""
-"No es posible encontrar revisión actual ${remote_name}/${branch} en la ruta "
-"de submódulo '$sm_path'"
-
-#: 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-sh-setup.sh:89 git-sh-setup.sh:94
 #, sh-format
 msgid "usage: $dashless $USAGE"
 msgstr "uso: $dashless $USAGE"
 
-#: git-sh-setup.sh:191
 #, sh-format
 msgid "Cannot chdir to $cdup, the toplevel of the working tree"
 msgstr ""
 "No se puede aplicar chdir a $cdup, el nivel máximo del árbol de trabajo"
 
-#: git-sh-setup.sh:200 git-sh-setup.sh:207
 #, sh-format
 msgid "fatal: $program_name cannot be used without a working tree."
 msgstr "fatal: $program_name no puede ser usado sin un árbol de trabajo."
 
-#: git-sh-setup.sh:221
 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: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: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: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: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:362
 msgid "Unable to determine absolute path of git directory"
 msgstr "Incapaz de determinar la ruta absoluta del directorio git"
 
 #. TRANSLATORS: you can adjust this to align "git add -i" status menu
-#: git-add--interactive.perl:212
 #, perl-format
 msgid "%12s %12s %s"
 msgstr "%12s %12s %s"
 
-#: git-add--interactive.perl:632
 #, perl-format
 msgid "touched %d path\n"
 msgid_plural "touched %d paths\n"
 msgstr[0] "touch hecho a %d ruta\n"
 msgstr[1] "touch hecho a %d rutas\n"
 
-#: git-add--interactive.perl:1056
 msgid ""
 "If the patch applies cleanly, the edited hunk will immediately be\n"
 "marked for staging."
@@ -25804,7 +21362,6 @@ msgstr ""
 "Si el parche aplica limpiamente, el fragmento editado será marcado\n"
 "inmediatamente para el área de stage."
 
-#: git-add--interactive.perl:1059
 msgid ""
 "If the patch applies cleanly, the edited hunk will immediately be\n"
 "marked for stashing."
@@ -25812,7 +21369,6 @@ msgstr ""
 "Si el parche aplica limpiamente, el fragmento editado será marcado\n"
 "inmediatamente para hacer stash."
 
-#: git-add--interactive.perl:1062
 msgid ""
 "If the patch applies cleanly, the edited hunk will immediately be\n"
 "marked for unstaging."
@@ -25820,8 +21376,6 @@ msgstr ""
 "Si el parche aplica limpiamente, el fragmento editado será marcado\n"
 "inmediatamente para sacar del área de stage."
 
-#: git-add--interactive.perl:1065 git-add--interactive.perl:1074
-#: git-add--interactive.perl:1080
 msgid ""
 "If the patch applies cleanly, the edited hunk will immediately be\n"
 "marked for applying."
@@ -25829,8 +21383,6 @@ msgstr ""
 "Si el parche aplica de forma limpia, el fragmento editado será marcado\n"
 "inmediatamente para aplicar."
 
-#: git-add--interactive.perl:1068 git-add--interactive.perl:1071
-#: git-add--interactive.perl:1077
 msgid ""
 "If the patch applies cleanly, the edited hunk will immediately be\n"
 "marked for discarding."
@@ -25838,12 +21390,10 @@ msgstr ""
 "Si el parche aplica de forma limpia, el fragmento editado será marcado\n"
 "inmediatamente para descarte."
 
-#: git-add--interactive.perl:1114
 #, perl-format
 msgid "failed to open hunk edit file for writing: %s"
 msgstr "falló al abrir el archivo de adición del fragmento para escritura: %s"
 
-#: git-add--interactive.perl:1121
 #, perl-format
 msgid ""
 "---\n"
@@ -25856,12 +21406,10 @@ msgstr ""
 "Para eliminar '%s' líneas, bórralas.\n"
 "Líneas comenzando con %s serán eliminadas.\n"
 
-#: git-add--interactive.perl:1143
 #, perl-format
 msgid "failed to open hunk edit file for reading: %s"
 msgstr "falló al abrir el archivo de edición del fragmento para lectura: %s"
 
-#: git-add--interactive.perl:1251
 msgid ""
 "y - stage this hunk\n"
 "n - do not stage this hunk\n"
@@ -25876,7 +21424,6 @@ msgstr ""
 "d - no aplicar stage a este fragmento ni a ninguno de los posteriores en "
 "este archivo"
 
-#: git-add--interactive.perl:1257
 msgid ""
 "y - stash this hunk\n"
 "n - do not stash this hunk\n"
@@ -25891,7 +21438,6 @@ msgstr ""
 "d - no hacer stash a este fragmento ni ninguno de los posteriores en el "
 "archivo"
 
-#: git-add--interactive.perl:1263
 msgid ""
 "y - unstage this hunk\n"
 "n - do not unstage this hunk\n"
@@ -25900,15 +21446,14 @@ msgid ""
 "d - do not unstage this hunk or any of the later hunks in the file"
 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 "
+"n - no sacar este fragmento del área de stage\n"
+"q - quit; no sacar del área de stage este fragmento ni ninguno de los "
 "restantes\n"
-"a - sacar del area de stage este fragmento y todos los posteriores en el "
+"a - sacar del área 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 "
+"d - no sacar del área de stage este fragmento ni ninguno de los posteriores "
 "en el archivo"
 
-#: git-add--interactive.perl:1269
 msgid ""
 "y - apply this hunk to index\n"
 "n - do not apply this hunk to index\n"
@@ -25922,7 +21467,6 @@ msgstr ""
 "a - aplicar este fragmento y todos los posteriores en el archivo\n"
 "d - no aplicar este fragmento ni ninguno de los posteriores en el archivo"
 
-#: git-add--interactive.perl:1275 git-add--interactive.perl:1293
 msgid ""
 "y - discard this hunk from worktree\n"
 "n - do not discard this hunk from worktree\n"
@@ -25936,7 +21480,6 @@ msgstr ""
 "a - descartar este fragmento y todos los posteriores en este archivo\n"
 "d - no descartar este fragmento ni ninguno de los posteriores en el archivo"
 
-#: git-add--interactive.perl:1281
 msgid ""
 "y - discard this hunk from index and worktree\n"
 "n - do not discard this hunk from index and worktree\n"
@@ -25950,7 +21493,6 @@ msgstr ""
 "a - descartar este fragmento y todos los posteriores en este archivo\n"
 "d - no descartar este fragmento ni ninguno posterior en el archivo"
 
-#: git-add--interactive.perl:1287
 msgid ""
 "y - apply this hunk to index and worktree\n"
 "n - do not apply this hunk to index and worktree\n"
@@ -25964,7 +21506,6 @@ msgstr ""
 "a - aplicar este fragmento y todos los posteriores en el archivo\n"
 "d - no aplicar este fragmento ni ninguno de los siguientes en este archivo"
 
-#: git-add--interactive.perl:1299
 msgid ""
 "y - apply this hunk to worktree\n"
 "n - do not apply this hunk to worktree\n"
@@ -25978,7 +21519,6 @@ msgstr ""
 "a - aplicar este fragmento y todos los posteriores en el archivo\n"
 "d - no aplicar este fragmento ni ninguno de los siguientes en este archivo"
 
-#: git-add--interactive.perl:1314
 msgid ""
 "g - select a hunk to go to\n"
 "/ - search for a hunk matching the given regex\n"
@@ -26000,90 +21540,72 @@ msgstr ""
 "e - editar manualmente el fragmento actual\n"
 "? - imprimir ayuda\n"
 
-#: git-add--interactive.perl:1345
 msgid "The selected hunks do not apply to the index!\n"
 msgstr "¡Los hunks seleccionados no aplican al índice!\n"
 
-#: git-add--interactive.perl:1360
 #, perl-format
 msgid "ignoring unmerged: %s\n"
 msgstr "ignorando lo no fusionado: %s\n"
 
-#: git-add--interactive.perl:1479
 #, perl-format
 msgid "Apply mode change to worktree [y,n,q,a,d%s,?]? "
 msgstr "¿Aplicar cambio de modo al árbol de trabajo [y,n,q,a,d%s,?]? "
 
-#: git-add--interactive.perl:1480
 #, perl-format
 msgid "Apply deletion to worktree [y,n,q,a,d%s,?]? "
 msgstr "¿Aplicar eliminación al árbol de trabajo [y,n,q,a,d%s,?]? "
 
-#: git-add--interactive.perl:1481
 #, perl-format
 msgid "Apply addition to worktree [y,n,q,a,d%s,?]? "
 msgstr "¿Aplicar adición al árbol de trabajo [y,n,q,a,d%s,?]? "
 
-#: git-add--interactive.perl:1482
 #, perl-format
 msgid "Apply this hunk to worktree [y,n,q,a,d%s,?]? "
 msgstr "¿Aplicar este fragmento al árbol de trabajo [y,n,q,a,d,/%s,?]? "
 
-#: git-add--interactive.perl:1599
 msgid "No other hunks to goto\n"
 msgstr "No hay más fragmentos a que ir\n"
 
-#: git-add--interactive.perl:1617
 #, perl-format
 msgid "Invalid number: '%s'\n"
 msgstr "Número inválido: '%s'\n"
 
-#: git-add--interactive.perl:1622
 #, perl-format
 msgid "Sorry, only %d hunk available.\n"
 msgid_plural "Sorry, only %d hunks available.\n"
 msgstr[0] "Lo siento, solo %d hunk disponible.\n"
 msgstr[1] "Lo siento, solo %d hunks disponibles.\n"
 
-#: git-add--interactive.perl:1657
 msgid "No other hunks to search\n"
 msgstr "No hay más fragmentos para buscar\n"
 
-#: git-add--interactive.perl:1674
 #, perl-format
 msgid "Malformed search regexp %s: %s\n"
 msgstr "Regexp para la búsqueda mal formado %s: %s\n"
 
-#: git-add--interactive.perl:1684
 msgid "No hunk matches the given pattern\n"
 msgstr "No hay fragmentos que concuerden con el patrón entregado.\n"
 
-#: git-add--interactive.perl:1696 git-add--interactive.perl:1718
 msgid "No previous hunk\n"
 msgstr "Sin hunk previo\n"
 
-#: git-add--interactive.perl:1705 git-add--interactive.perl:1724
 msgid "No next hunk\n"
 msgstr "Sin hunk siguiente\n"
 
-#: git-add--interactive.perl:1730
 msgid "Sorry, cannot split this hunk\n"
 msgstr "Perdón, no se puede dividir este pedazo\n"
 
-#: git-add--interactive.perl:1736
 #, perl-format
 msgid "Split into %d hunk.\n"
 msgid_plural "Split into %d hunks.\n"
 msgstr[0] "Cortar en %d fragmento.\n"
 msgstr[1] "Cortar en %d fragmentos.\n"
 
-#: git-add--interactive.perl:1746
 msgid "Sorry, cannot edit this hunk\n"
 msgstr "Perdón, no se puede editar este pedazo\n"
 
 #. TRANSLATORS: please do not translate the command names
 #. 'status', 'update', 'revert', etc.
-#: git-add--interactive.perl:1811
 msgid ""
 "status        - show paths with changes\n"
 "update        - add working tree state to the staged set of changes\n"
@@ -26101,59 +21623,45 @@ msgstr ""
 "patch         - seleccionar los hunks y actualiza de forma selectiva\n"
 "diff          - mirar la diff entre HEAD y el índice\n"
 "add untracked - agregar contenidos de archivos no rastreados al grupo de "
-"cambios del area de stage\n"
+"cambios del área de stage\n"
 
-#: git-add--interactive.perl:1828 git-add--interactive.perl:1840
-#: git-add--interactive.perl:1843 git-add--interactive.perl:1850
-#: git-add--interactive.perl:1853 git-add--interactive.perl:1860
-#: git-add--interactive.perl:1864 git-add--interactive.perl:1870
 msgid "missing --"
 msgstr "falta --"
 
-#: git-add--interactive.perl:1866
 #, perl-format
 msgid "unknown --patch mode: %s"
 msgstr "modo --patch desconocido: %s"
 
-#: git-add--interactive.perl:1872 git-add--interactive.perl:1878
 #, perl-format
 msgid "invalid argument %s, expecting --"
 msgstr "argumento inválido %s, se esperaba --"
 
-#: git-send-email.perl:129
 msgid "local zone differs from GMT by a non-minute interval\n"
 msgstr "la zona local difiere de GMT por un intervalo de minutos no entero\n"
 
-#: git-send-email.perl:136 git-send-email.perl:142
 msgid "local time offset greater than or equal to 24 hours\n"
 msgstr "el offset del tiempo local es mayor o igual a 24 horas\n"
 
-#: git-send-email.perl:214
 #, perl-format
 msgid "fatal: command '%s' died with exit code %d"
 msgstr "fatal: comando '%s' murió con código de salida %d"
 
-#: git-send-email.perl:227
 msgid "the editor exited uncleanly, aborting everything"
 msgstr "el editor se cerró inapropiadamente, abortando todo"
 
-#: git-send-email.perl:316
 #, perl-format
 msgid ""
 "'%s' contains an intermediate version of the email you were composing.\n"
 msgstr ""
 "'%s' contiene una versión intermedia del correo que se estaba generando.\n"
 
-#: git-send-email.perl:321
 #, perl-format
 msgid "'%s.final' contains the composed email.\n"
 msgstr "'%s.final' contiene el email generado.\n"
 
-#: git-send-email.perl:450
 msgid "--dump-aliases incompatible with other options\n"
 msgstr "--dump-aliases no es compatible con otras opciones.\n"
 
-#: 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"
@@ -26165,11 +21673,9 @@ msgstr ""
 "Establece sendemail.forbidSendmailVariables en false para deshabilitar esta "
 "verificación.\n"
 
-#: git-send-email.perl:530 git-send-email.perl:746
 msgid "Cannot run git format-patch from outside a repository\n"
 msgstr "No se puede ejecutar git format-patch desde fuera del repositorio.\n"
 
-#: git-send-email.perl:533
 msgid ""
 "`batch-size` and `relogin` must be specified together (via command-line or "
 "configuration option)\n"
@@ -26177,37 +21683,30 @@ msgstr ""
 "`batch-size` y `relogin` deben ser especificados juntos (vía la línea de "
 "comando o por opción de configuración)\n"
 
-#: git-send-email.perl:546
 #, perl-format
 msgid "Unknown --suppress-cc field: '%s'\n"
 msgstr "Campo --suppress-cc desconocido: '%s'\n"
 
-#: git-send-email.perl:577
 #, perl-format
 msgid "Unknown --confirm setting: '%s'\n"
 msgstr "Configuración --confirm desconocida: '%s'\n"
 
-#: git-send-email.perl:617
 #, perl-format
 msgid "warning: sendmail alias with quotes is not supported: %s\n"
 msgstr "peligro: alias de sendmail con comillas no es soportado: %s\n"
 
-#: git-send-email.perl:619
 #, perl-format
 msgid "warning: `:include:` not supported: %s\n"
 msgstr "peligro: `:include:` no soportado: %s\n"
 
-#: git-send-email.perl:621
 #, perl-format
 msgid "warning: `/file` or `|pipe` redirection not supported: %s\n"
 msgstr "advertencia: redirección `/file` o `|pipe` no soportada: %s\n"
 
-#: git-send-email.perl:626
 #, perl-format
 msgid "warning: sendmail line is not recognized: %s\n"
 msgstr "advertencia: línea sendmail no reconocida: %s\n"
 
-#: git-send-email.perl:711
 #, perl-format
 msgid ""
 "File '%s' exists but it could also be the range of commits\n"
@@ -26222,12 +21721,10 @@ msgstr ""
 "    * Diciendo \"./%s\" si se quiere decir un archivo; o\n"
 "    * Agregando la opción --format-patch si se quiere decir un rango.\n"
 
-#: git-send-email.perl:732
 #, perl-format
 msgid "Failed to opendir %s: %s"
 msgstr "Falló al abrir directorio %s: %s"
 
-#: git-send-email.perl:767
 msgid ""
 "\n"
 "No patch files specified!\n"
@@ -26237,17 +21734,14 @@ msgstr ""
 "¡No se especificaron parches!\n"
 "\n"
 
-#: git-send-email.perl:780
 #, perl-format
 msgid "No subject line in %s?"
 msgstr "¿No hay línea de subject en %s?"
 
-#: git-send-email.perl:791
 #, perl-format
 msgid "Failed to open for writing %s: %s"
 msgstr "Falló al abrir para escritura %s: %s"
 
-#: git-send-email.perl:802
 msgid ""
 "Lines beginning in \"GIT:\" will be removed.\n"
 "Consider including an overall diffstat or table of contents\n"
@@ -26261,27 +21755,22 @@ msgstr ""
 "\n"
 "Limpia el contenido de body si no deseas mandar un resumen.\n"
 
-#: git-send-email.perl:826
 #, perl-format
 msgid "Failed to open %s: %s"
 msgstr "Falló al abrir %s: %s"
 
-#: git-send-email.perl:843
 #, perl-format
 msgid "Failed to open %s.final: %s"
 msgstr "Falló al abrir %s.final: %s"
 
-#: git-send-email.perl:886
 msgid "Summary email is empty, skipping it\n"
 msgstr "Archivo de resumen está vacío, saltando al siguiente\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 "¿Estás seguro de que deseas usar <%s> [y/N]? "
 
-#: git-send-email.perl:990
 msgid ""
 "The following files are 8bit, but do not declare a Content-Transfer-"
 "Encoding.\n"
@@ -26289,11 +21778,9 @@ msgstr ""
 "Los siguientes archivos son 8bit, pero no declaran un Content-Transfer-"
 "Encoding.\n"
 
-#: git-send-email.perl:995
 msgid "Which 8bit encoding should I declare [UTF-8]? "
 msgstr "¿Qué codificación de 8 bits se debería declarar [UTF-8]? "
 
-#: git-send-email.perl:1003
 #, perl-format
 msgid ""
 "Refusing to send because the patch\n"
@@ -26306,22 +21793,18 @@ msgstr ""
 "tiene el asunto de template '*** SUBJECT HERE ***'. Agrega --force si "
 "realmente lo deseas mandar.\n"
 
-#: git-send-email.perl:1022
 msgid "To whom should the emails be sent (if anyone)?"
 msgstr "¿A quién se deben mandar los correos (si alguien hay)?"
 
-#: git-send-email.perl:1040
 #, perl-format
 msgid "fatal: alias '%s' expands to itself\n"
 msgstr "fatal: alias '%s' se expande a si mismo\n"
 
-#: git-send-email.perl:1052
 msgid "Message-ID to be used as In-Reply-To for the first email (if any)? "
 msgstr ""
 "¿Qué id de mensaje será usado como In-Reply-To en el primer email (si existe "
 "alguno)? "
 
-#: 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 es posible extraer una dirección válida de %s\n"
@@ -26329,16 +21812,13 @@ msgstr "error: no es posible extraer una dirección válida de %s\n"
 #. 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:1126
 msgid "What to do with this address? ([q]uit|[d]rop|[e]dit): "
 msgstr "¿Qué hacer con esta dirección? ([q]salir|[d]descartar|[e]ditar): "
 
-#: git-send-email.perl:1446
 #, perl-format
 msgid "CA path \"%s\" does not exist"
 msgstr "Ruta CA \"%s\" no existe"
 
-#: 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"
@@ -26365,117 +21845,93 @@ msgstr ""
 #. 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 "¿Mandar este email? ([y]si||[n]o|[e]editar|[q]salir|[a]todo): "
 
-#: git-send-email.perl:1547
 msgid "Send this email reply required"
 msgstr "Se requiere una respuesta a ¿Mandar este email?"
 
-#: git-send-email.perl:1581
 msgid "The required SMTP server is not properly defined."
 msgstr "El servidor SMTP no está definido adecuadamente."
 
-#: git-send-email.perl:1628
 #, perl-format
 msgid "Server does not support STARTTLS! %s"
 msgstr "¡El servidor no soporta STARTTLS! %s"
 
-#: git-send-email.perl:1633 git-send-email.perl:1637
 #, perl-format
 msgid "STARTTLS failed! %s"
 msgstr "¡Falló STARTTLS! %s"
 
-#: git-send-email.perl:1646
 msgid "Unable to initialize SMTP properly. Check config and use --smtp-debug."
 msgstr ""
 "No es posible inicializar SMTP adecuadamente. Verificar config y usar --smtp-"
 "debug."
 
-#: git-send-email.perl:1664
 #, perl-format
 msgid "Failed to send %s\n"
 msgstr "Falló al enviar %s\n"
 
-#: git-send-email.perl:1667
 #, perl-format
 msgid "Dry-Sent %s\n"
 msgstr "Dry-Sent %s\n"
 
-#: git-send-email.perl:1667
 #, perl-format
 msgid "Sent %s\n"
 msgstr "Enviado %s\n"
 
-#: git-send-email.perl:1669
 msgid "Dry-OK. Log says:\n"
 msgstr "Dry-OK. Log dice:\n"
 
-#: git-send-email.perl:1669
 msgid "OK. Log says:\n"
 msgstr "OK. Log dice:\n"
 
-#: git-send-email.perl:1688
 msgid "Result: "
 msgstr "Resultado: "
 
-#: git-send-email.perl:1691
 msgid "Result: OK\n"
 msgstr "Resultado: OK\n"
 
-#: git-send-email.perl:1708
 #, perl-format
 msgid "can't open file %s"
 msgstr "no se puede abrir el archivo %s"
 
-#: git-send-email.perl:1756 git-send-email.perl:1776
 #, perl-format
 msgid "(mbox) Adding cc: %s from line '%s'\n"
 msgstr "(mbox) Agregando cc: %s de la línea '%s'\n"
 
-#: git-send-email.perl:1762
 #, perl-format
 msgid "(mbox) Adding to: %s from line '%s'\n"
 msgstr "(mbox) Agregando para: %s de la línea '%s'\n"
 
-#: git-send-email.perl:1819
 #, perl-format
 msgid "(non-mbox) Adding cc: %s from line '%s'\n"
 msgstr "(non-mbox) Agregando cc: %s de la línea '%s'\n"
 
-#: git-send-email.perl:1854
 #, perl-format
 msgid "(body) Adding cc: %s from line '%s'\n"
 msgstr "(body) Agregando cc: %s de la línea '%s'\n"
 
-#: git-send-email.perl:1973
 #, perl-format
 msgid "(%s) Could not execute '%s'"
 msgstr "(%s) no se pudo ejecutar '%s'"
 
-#: 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:1984
 #, perl-format
 msgid "(%s) failed to close pipe to '%s'"
 msgstr "(%s) falló al cerrar el pipe a '%s'"
 
-#: git-send-email.perl:2014
 msgid "cannot send message as 7bit"
 msgstr "no se puede mandar mensaje como 7bit"
 
-#: git-send-email.perl:2022
 msgid "invalid transfer encoding"
 msgstr "codificación de transferencia inválida"
 
-#: git-send-email.perl:2059
-#, perl-format
+#, fuzzy, perl-format
 msgid ""
-"fatal: %s: rejected by sendemail-validate hook\n"
+"fatal: %s: rejected by %s hook\n"
 "%s\n"
 "warning: no patches were sent\n"
 msgstr ""
@@ -26483,12 +21939,10 @@ msgstr ""
 "%s\n"
 "peligro: no se mandaron parches\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 "no es posible abrir %s: %s\n"
 
-#: git-send-email.perl:2072
 #, perl-format
 msgid ""
 "fatal: %s:%d is longer than 998 characters\n"
@@ -26497,591 +21951,11 @@ msgstr ""
 "fatal: %s: %d es más grande que 998 caracteres\n"
 "peligro: no se mandaron parches\n"
 
-#: 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: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)"
-
-#~ 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 remoto envió un separador sin estado (stateless)"
diff --git a/po/fr.po b/po/fr.po
index 7f3ace8888..f601f40636 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -78,8 +78,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: git\n"
 "Report-Msgid-Bugs-To: Git Mailing List <git@vger.kernel.org>\n"
-"POT-Creation-Date: 2022-04-13 14:52+0800\n"
-"PO-Revision-Date: 2022-04-13 21:17+0200\n"
+"POT-Creation-Date: 2022-06-24 21:43+0200\n"
+"PO-Revision-Date: 2022-06-24 21:58+0200\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"
@@ -89,240 +89,178 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=n<=1 ?0 : 1;\n"
 "X-Generator: Poedit 3.0.1\n"
 
-#: add-interactive.c:382
 #, c-format
 msgid "Huh (%s)?"
 msgstr "Hein (%s) ?"
 
-#: add-interactive.c:535 add-interactive.c:836 reset.c:136 sequencer.c:3505
-#: sequencer.c:3970 sequencer.c:4127 builtin/rebase.c:1261
-#: builtin/rebase.c:1671
 msgid "could not read index"
 msgstr "impossible de lire l'index"
 
-#: add-interactive.c:590 git-add--interactive.perl:269
-#: git-add--interactive.perl:294
 msgid "binary"
 msgstr "binaire"
 
-#: add-interactive.c:648 git-add--interactive.perl:278
-#: git-add--interactive.perl:332
 msgid "nothing"
 msgstr "rien"
 
-#: add-interactive.c:649 git-add--interactive.perl:314
-#: git-add--interactive.perl:329
 msgid "unchanged"
 msgstr "inchangé"
 
-#: add-interactive.c:686 git-add--interactive.perl:641
 msgid "Update"
 msgstr "Mise à jour"
 
-#: add-interactive.c:703 add-interactive.c:891
 #, c-format
 msgid "could not stage '%s'"
 msgstr "impossible d'indexer '%s'"
 
-#: add-interactive.c:709 add-interactive.c:898 reset.c:160 sequencer.c:3709
 msgid "could not write index"
 msgstr "impossible d'écrire l'index"
 
-#: add-interactive.c:712 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:730 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:735 apply.c:4133 builtin/checkout.c:311
-#: builtin/reset.c:167
 #, c-format
 msgid "make_cache_entry failed for path '%s'"
 msgstr "échec de make_cache_entry pour le chemin '%s'"
 
-#: add-interactive.c:765 git-add--interactive.perl:653
 msgid "Revert"
 msgstr "Inverser"
 
-#: add-interactive.c:781
 msgid "Could not parse HEAD^{tree}"
 msgstr "Impossible d'analyser HEAD^{tree}"
 
-#: add-interactive.c:819 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:870 git-add--interactive.perl:693
 #, c-format
 msgid "No untracked files.\n"
 msgstr "Aucun Fichier non suivi.\n"
 
-#: add-interactive.c:874 git-add--interactive.perl:687
 msgid "Add untracked"
 msgstr "Ajouter un fichier non-suivi"
 
-#: add-interactive.c:901 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:931
 #, c-format
 msgid "ignoring unmerged: %s"
 msgstr "fichier non-fusionné ignoré : %s"
 
-#: add-interactive.c:943 add-patch.c:1758 git-add--interactive.perl:1371
 #, c-format
 msgid "Only binary files changed.\n"
 msgstr "Seuls des fichiers binaires ont changé.\n"
 
-#: add-interactive.c:945 add-patch.c:1756 git-add--interactive.perl:1373
 #, c-format
 msgid "No changes.\n"
 msgstr "Aucune modification.\n"
 
-#: add-interactive.c:949 git-add--interactive.perl:1381
 msgid "Patch update"
 msgstr "Mise à jour par patch"
 
-#: add-interactive.c:988 git-add--interactive.perl:1794
 msgid "Review diff"
 msgstr "Réviser la différence"
 
-#: add-interactive.c:1016
 msgid "show paths with changes"
 msgstr "afficher les chemins comprenant des modifications"
 
-#: add-interactive.c:1018
 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:1020
 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:1022
 msgid "pick hunks and update selectively"
 msgstr "sélection et mise à jour individuelle des sections"
 
-#: add-interactive.c:1024
 msgid "view diff between HEAD and index"
 msgstr "visualiser les diffs entre HEAD et l'index"
 
-#: add-interactive.c:1026
 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:1034 add-interactive.c:1083
 msgid "Prompt help:"
 msgstr "Aide :"
 
-#: add-interactive.c:1036
 msgid "select a single item"
 msgstr "sélectionner un seul élément"
 
-#: add-interactive.c:1038
 msgid "select a range of items"
 msgstr "sélectionner une plage d'éléments"
 
-#: add-interactive.c:1040
 msgid "select multiple ranges"
 msgstr "sélectionner plusieurs plages"
 
-#: add-interactive.c:1042 add-interactive.c:1087
 msgid "select item based on unique prefix"
 msgstr "sélectionner un élément basé sur une préfixe unique"
 
-#: add-interactive.c:1044
 msgid "unselect specified items"
 msgstr "désélectionner les éléments spécifiés"
 
-#: add-interactive.c:1046
 msgid "choose all items"
 msgstr "choisir tous les éléments"
 
-#: add-interactive.c:1048
 msgid "(empty) finish selecting"
 msgstr "(vide) arrêter de sélectionner"
 
-#: add-interactive.c:1085
 msgid "select a numbered item"
 msgstr "sélectionner un élément par son numéro"
 
-#: add-interactive.c:1089
 msgid "(empty) select nothing"
 msgstr "(vide) ne rien sélectionner"
 
-#: add-interactive.c:1097 builtin/clean.c:839 git-add--interactive.perl:1898
 msgid "*** Commands ***"
 msgstr "*** Commandes ***"
 
-#: add-interactive.c:1098 builtin/clean.c:840 git-add--interactive.perl:1895
 msgid "What now"
 msgstr "Et maintenant"
 
-#: add-interactive.c:1150 git-add--interactive.perl:213
 msgid "staged"
 msgstr "indexé"
 
-#: add-interactive.c:1150 git-add--interactive.perl:213
 msgid "unstaged"
 msgstr "non-indexé"
 
-#: add-interactive.c:1150 apply.c:5002 apply.c:5005 builtin/am.c:2370
-#: builtin/am.c:2373 builtin/bugreport.c:107 builtin/clone.c:132
-#: builtin/fetch.c:154 builtin/merge.c:287 builtin/pull.c:194
-#: builtin/submodule--helper.c:412 builtin/submodule--helper.c:1872
-#: builtin/submodule--helper.c:1875 builtin/submodule--helper.c:2709
-#: builtin/submodule--helper.c:2712 builtin/submodule--helper.c:2891
-#: git-add--interactive.perl:213
 msgid "path"
 msgstr "chemin"
 
-#: add-interactive.c:1157
 msgid "could not refresh index"
 msgstr "impossible de rafraîchir l'index"
 
-#: add-interactive.c:1171 builtin/clean.c:804 git-add--interactive.perl:1805
 #, c-format
 msgid "Bye.\n"
 msgstr "Au revoir.\n"
 
-#: add-patch.c:34 git-add--interactive.perl:1433
 #, c-format, perl-format
 msgid "Stage mode change [y,n,q,a,d%s,?]? "
 msgstr "Indexer le changement de mode [y,n,q,a,d%s,?] ? "
 
-#: add-patch.c:35 git-add--interactive.perl:1434
 #, c-format, perl-format
 msgid "Stage deletion [y,n,q,a,d%s,?]? "
 msgstr "Indexer la suppression [y,n,q,a,d%s,?] ? "
 
-#: add-patch.c:36 git-add--interactive.perl:1435
 #, c-format, perl-format
 msgid "Stage addition [y,n,q,a,d%s,?]? "
 msgstr "Indexer l'ajout [y,n,q,a,d%s,?] ? "
 
-#: add-patch.c:37 git-add--interactive.perl:1436
 #, c-format, perl-format
 msgid "Stage this hunk [y,n,q,a,d%s,?]? "
 msgstr "Indexer cette section [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."
@@ -330,7 +268,6 @@ msgstr ""
 "Si le patch s'applique proprement, la section éditée sera immédiatement "
 "marquée comme indexée."
 
-#: add-patch.c:42
 msgid ""
 "y - stage this hunk\n"
 "n - do not stage this hunk\n"
@@ -344,27 +281,22 @@ msgstr ""
 "a - indexer cette section et toutes les suivantes de ce fichier\n"
 "d - ne pas indexer cette section ni les suivantes de ce fichier\n"
 
-#: add-patch.c:56 git-add--interactive.perl:1439
 #, c-format, perl-format
 msgid "Stash mode change [y,n,q,a,d%s,?]? "
 msgstr "Remiser le changement de mode [y,n,q,a,d%s,?] ? "
 
-#: add-patch.c:57 git-add--interactive.perl:1440
 #, c-format, perl-format
 msgid "Stash deletion [y,n,q,a,d%s,?]? "
 msgstr "Remiser la suppression [y,n,q,a,d%s,?] ? "
 
-#: add-patch.c:58 git-add--interactive.perl:1441
 #, c-format, perl-format
 msgid "Stash addition [y,n,q,a,d%s,?]? "
 msgstr "Remiser l'ajout [y,n,q,a,d%s,?] ? "
 
-#: add-patch.c:59 git-add--interactive.perl:1442
 #, c-format, perl-format
 msgid "Stash this hunk [y,n,q,a,d%s,?]? "
 msgstr "Remiser cette section [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."
@@ -372,7 +304,6 @@ msgstr ""
 "Si le patch s'applique proprement, la section éditée sera immédiatement "
 "marquée comme remisée."
 
-#: add-patch.c:64
 msgid ""
 "y - stash this hunk\n"
 "n - do not stash this hunk\n"
@@ -386,27 +317,22 @@ msgstr ""
 "a - remiser cette section et toutes les suivantes de ce fichier\n"
 "d - ne pas remiser cette section ni les suivantes de ce fichier\n"
 
-#: add-patch.c:80 git-add--interactive.perl:1445
 #, c-format, perl-format
 msgid "Unstage mode change [y,n,q,a,d%s,?]? "
 msgstr "Désindexer le changement de mode [y,n,q,a,d%s,?] ? "
 
-#: add-patch.c:81 git-add--interactive.perl:1446
 #, c-format, perl-format
 msgid "Unstage deletion [y,n,q,a,d%s,?]? "
 msgstr "Désindexer la suppression [y,n,q,a,d%s,?] ? "
 
-#: add-patch.c:82 git-add--interactive.perl:1447
 #, c-format, perl-format
 msgid "Unstage addition [y,n,q,a,d%s,?]? "
 msgstr "Désindexer l'ajout [y,n,q,a,d%s,?] ? "
 
-#: add-patch.c:83 git-add--interactive.perl:1448
 #, c-format, perl-format
 msgid "Unstage this hunk [y,n,q,a,d%s,?]? "
 msgstr "Désindexer cette section [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."
@@ -414,7 +340,6 @@ msgstr ""
 "Si le patch s'applique proprement, la section éditée sera immédiatement "
 "marquée comme desindexée."
 
-#: add-patch.c:88
 msgid ""
 "y - unstage this hunk\n"
 "n - do not unstage this hunk\n"
@@ -428,27 +353,22 @@ msgstr ""
 "a - désindexer cette section et toutes les suivantes de ce fichier\n"
 "d - ne pas désindexer cette section ni les suivantes de ce fichier\n"
 
-#: add-patch.c:103 git-add--interactive.perl:1451
 #, c-format, perl-format
 msgid "Apply mode change to index [y,n,q,a,d%s,?]? "
 msgstr "Appliquer le changement de mode à l'index [y,n,q,a,d%s,?] ? "
 
-#: add-patch.c:104 git-add--interactive.perl:1452
 #, c-format, perl-format
 msgid "Apply deletion to index [y,n,q,a,d%s,?]? "
 msgstr "Appliquer la suppression à l'index [y,n,q,a,d%s,?] ? "
 
-#: add-patch.c:105 git-add--interactive.perl:1453
 #, c-format, perl-format
 msgid "Apply addition to index [y,n,q,a,d%s,?]? "
 msgstr "Appliquer l'ajout à l'index [y,n,q,a,d%s,?] ? "
 
-#: add-patch.c:106 git-add--interactive.perl:1454
 #, c-format, perl-format
 msgid "Apply this hunk to index [y,n,q,a,d%s,?]? "
 msgstr "Appliquer cette section à l'index [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."
@@ -456,7 +376,6 @@ msgstr ""
 "Si le patch s'applique proprement, la section éditée sera immédiatement "
 "marquée comme appliquée."
 
-#: add-patch.c:111
 msgid ""
 "y - apply this hunk to index\n"
 "n - do not apply this hunk to index\n"
@@ -470,31 +389,22 @@ msgstr ""
 "a - appliquer cette section et toutes les suivantes de ce fichier\n"
 "d - ne pas appliquer cette section ni les suivantes de ce fichier\n"
 
-#: add-patch.c:126 git-add--interactive.perl:1457
-#: git-add--interactive.perl:1475
 #, c-format, perl-format
 msgid "Discard mode change from worktree [y,n,q,a,d%s,?]? "
 msgstr "Abandonner le changement de mode dans l'arbre [y,n,q,a,d%s,?] ? "
 
-#: add-patch.c:127 git-add--interactive.perl:1458
-#: git-add--interactive.perl:1476
 #, c-format, perl-format
 msgid "Discard deletion from worktree [y,n,q,a,d%s,?]? "
 msgstr "Abandonner la suppression dans l'arbre [y,n,q,a,d%s,?] ? "
 
-#: add-patch.c:128 git-add--interactive.perl:1459
-#: git-add--interactive.perl:1477
 #, c-format, perl-format
 msgid "Discard addition from worktree [y,n,q,a,d%s,?]? "
 msgstr "Abandonner l'ajout dans l'arbre [y,n,q,a,d%s,?] ? "
 
-#: add-patch.c:129 git-add--interactive.perl:1460
-#: git-add--interactive.perl:1478
 #, c-format, perl-format
 msgid "Discard this hunk from worktree [y,n,q,a,d%s,?]? "
 msgstr "Abandonner cette section dans l'arbre [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."
@@ -502,7 +412,6 @@ msgstr ""
 "Si le patch s'applique proprement, la section éditée sera immédiatement "
 "marquée comme éliminée."
 
-#: add-patch.c:134 add-patch.c:202
 msgid ""
 "y - discard this hunk from worktree\n"
 "n - do not discard this hunk from worktree\n"
@@ -516,29 +425,24 @@ msgstr ""
 "a - supprimer cette section et toutes les suivantes de ce fichier\n"
 "d - ne pas supprimer cette section ni les suivantes de ce fichier\n"
 
-#: add-patch.c:149 add-patch.c:194 git-add--interactive.perl:1463
 #, c-format, perl-format
 msgid "Discard mode change from index and worktree [y,n,q,a,d%s,?]? "
 msgstr ""
 "Abandonner le changement de mode dans l'index et l'arbre [y,n,q,a,d%s,?] ? "
 
-#: add-patch.c:150 add-patch.c:195 git-add--interactive.perl:1464
 #, c-format, perl-format
 msgid "Discard deletion from index and worktree [y,n,q,a,d%s,?]? "
 msgstr "Abandonner la suppression de l'index et de l'arbre [y,n,q,a,d%s,?] ? "
 
-#: add-patch.c:151 add-patch.c:196 git-add--interactive.perl:1465
 #, c-format, perl-format
 msgid "Discard addition from index and worktree [y,n,q,a,d%s,?]? "
 msgstr "Abandonner l'ajout de l'index et de l'arbre [y,n,q,a,d%s,?] ? "
 
-#: add-patch.c:152 add-patch.c:197 git-add--interactive.perl:1466
 #, c-format, perl-format
 msgid "Discard this hunk from index and worktree [y,n,q,a,d%s,?]? "
 msgstr ""
 "Supprimer la section dans l'index et l'arbre de travail [y,n,q,a,d%s,?] ? "
 
-#: add-patch.c:157
 msgid ""
 "y - discard this hunk from index and worktree\n"
 "n - do not discard this hunk from index and worktree\n"
@@ -552,33 +456,28 @@ msgstr ""
 "a - éliminer cette section et toutes les suivantes de ce fichier\n"
 "d - ne pas éliminer cette section ni les suivantes de ce fichier\n"
 
-#: add-patch.c:171 add-patch.c:216 git-add--interactive.perl:1469
 #, c-format, perl-format
 msgid "Apply mode change to index and worktree [y,n,q,a,d%s,?]? "
 msgstr ""
 "Appliquer le changement de mode dans l'index et l'arbre de travail [y,n,q,a,"
 "d%s,?] ? "
 
-#: add-patch.c:172 add-patch.c:217 git-add--interactive.perl:1470
 #, c-format, perl-format
 msgid "Apply deletion to index and worktree [y,n,q,a,d%s,?]? "
 msgstr ""
 "Appliquer la suppression dans l'index et l'arbre de travail [y,n,q,a,"
 "d%s,?] ? "
 
-#: add-patch.c:173 add-patch.c:218 git-add--interactive.perl:1471
 #, c-format, perl-format
 msgid "Apply addition to index and worktree [y,n,q,a,d%s,?]? "
 msgstr ""
 "Appliquer l'ajout dans l'index et l'arbre de travail [y,n,q,a,d%s,?] ? "
 
-#: add-patch.c:174 add-patch.c:219 git-add--interactive.perl:1472
 #, c-format, perl-format
 msgid "Apply this hunk to index and worktree [y,n,q,a,d%s,?]? "
 msgstr ""
 "Appliquer la section à l'index et l'arbre de travail [y,n,q,a,d%s,?] ? "
 
-#: add-patch.c:179
 msgid ""
 "y - apply this hunk to index and worktree\n"
 "n - do not apply this hunk to index and worktree\n"
@@ -592,7 +491,6 @@ msgstr ""
 "a - appliquer cette section et toutes les suivantes de ce fichier\n"
 "d - ne pas appliquer cette section ni les suivantes de ce fichier\n"
 
-#: add-patch.c:224
 msgid ""
 "y - apply this hunk to worktree\n"
 "n - do not apply this hunk to worktree\n"
@@ -606,34 +504,27 @@ msgstr ""
 "a - appliquer cette section et toutes les suivantes de ce fichier\n"
 "d - ne pas appliquer cette section ni les suivantes de ce fichier\n"
 
-#: add-patch.c:343
 #, c-format
 msgid "could not parse hunk header '%.*s'"
 msgstr "impossible d'analyser l'entête de section '%.*s'"
 
-#: add-patch.c:362 add-patch.c:366
 #, c-format
 msgid "could not parse colored hunk header '%.*s'"
 msgstr "impossible d'analyser l'entête coloré de section '%.*s'"
 
-#: add-patch.c:431
 msgid "could not parse diff"
 msgstr "impossible d'analyser la diff"
 
-#: add-patch.c:450
 msgid "could not parse colored diff"
 msgstr "impossible d'analyser la diff colorée"
 
-#: add-patch.c:464
 #, c-format
 msgid "failed to run '%s'"
 msgstr "échec pour lancer '%s'"
 
-#: add-patch.c:618
 msgid "mismatched output from interactive.diffFilter"
 msgstr "sortie sans correspondance depuis interactive.diffFilter"
 
-#: add-patch.c:619
 msgid ""
 "Your filter must maintain a one-to-one correspondence\n"
 "between its input and output lines."
@@ -641,7 +532,6 @@ msgstr ""
 "Votre filtre doit maintenir une correspondance un-pour-un\n"
 "entre les lignes en entrée et en sortie."
 
-#: add-patch.c:797
 #, c-format
 msgid ""
 "expected context line #%d in\n"
@@ -650,7 +540,6 @@ msgstr ""
 "ligne de contexte attendue #%d dans\n"
 "%.*s"
 
-#: add-patch.c:812
 #, c-format
 msgid ""
 "hunks do not overlap:\n"
@@ -663,12 +552,10 @@ msgstr ""
 "\tne se termine pas par :\n"
 "%.*s"
 
-#: add-patch.c:1088 git-add--interactive.perl:1115
 msgid "Manual hunk edit mode -- see bottom for a quick guide.\n"
 msgstr ""
 "Mode d'édition manuelle de section -- voir ci-dessous pour un guide rapide.\n"
 
-#: add-patch.c:1092
 #, c-format
 msgid ""
 "---\n"
@@ -681,8 +568,8 @@ msgstr ""
 "Pour éliminer les lignes '%c', effacez-les.\n"
 "Les lignes commençant par %c seront éliminées.\n"
 
+#. #-#-#-#-#  git-add--interactive.perl.po  #-#-#-#-#
 #. TRANSLATORS: 'it' refers to the patch mentioned in the previous messages.
-#: add-patch.c:1106 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"
@@ -692,46 +579,41 @@ msgstr ""
 "l'éditer à nouveau. Si toutes les lignes de la section sont supprimées,\n"
 "alors l'édition sera abandonnée et la section conservée.\n"
 
-#: add-patch.c:1139
 msgid "could not parse hunk header"
 msgstr "impossible d'analyser l'entête de section"
 
-#: add-patch.c:1184
 msgid "'git apply --cached' failed"
 msgstr "'git apply --cached' a échoué"
 
+#. #-#-#-#-#  add-patch.c.po  #-#-#-#-#
 #. 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.
 #.
+#. #-#-#-#-#  git-add--interactive.perl.po  #-#-#-#-#
 #. 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:1253 git-add--interactive.perl:1244
 msgid ""
 "Your edited hunk does not apply. Edit again (saying \"no\" discards!) [y/n]? "
 msgstr ""
 "Votre section éditée ne s'applique pas. L'éditer à nouveau (\"no\" "
 "l'élimine !) [y|n] ? "
 
-#: add-patch.c:1296
 msgid "The selected hunks do not apply to the index!"
 msgstr "Les sections sélectionnées ne s'applique pas à l'index !"
 
-#: add-patch.c:1297 git-add--interactive.perl:1348
 msgid "Apply them to the worktree anyway? "
 msgstr "Les appliquer quand même à l'arbre de travail ? "
 
-#: add-patch.c:1304 git-add--interactive.perl:1351
 msgid "Nothing was applied.\n"
 msgstr "Rien n'a été appliqué.\n"
 
-#: add-patch.c:1361
 msgid ""
 "j - leave this hunk undecided, see next undecided hunk\n"
 "J - leave this hunk undecided, see next hunk\n"
@@ -753,73 +635,57 @@ msgstr ""
 "e - éditer manuellement la section actuelle\n"
 "? - afficher l'aide\n"
 
-#: add-patch.c:1523 add-patch.c:1533
 msgid "No previous hunk"
 msgstr "Pas de section précédente"
 
-#: add-patch.c:1528 add-patch.c:1538
 msgid "No next hunk"
 msgstr "Pas de section suivante"
 
-#: add-patch.c:1544
 msgid "No other hunks to goto"
 msgstr "Aucune autre section à atteindre"
 
-#: add-patch.c:1555 git-add--interactive.perl:1608
 msgid "go to which hunk (<ret> to see more)? "
 msgstr "aller à quelle section (<ret> pour voir plus) ? "
 
-#: add-patch.c:1556 git-add--interactive.perl:1610
 msgid "go to which hunk? "
 msgstr "aller à quelle section ? "
 
-#: add-patch.c:1567
 #, c-format
 msgid "Invalid number: '%s'"
 msgstr "Numéro invalide : '%s'"
 
-#: add-patch.c:1572
 #, c-format
 msgid "Sorry, only %d hunk available."
 msgid_plural "Sorry, only %d hunks available."
 msgstr[0] "Désolé, %d seule section disponible."
 msgstr[1] "Désolé, Seulement %d sections disponibles."
 
-#: add-patch.c:1581
 msgid "No other hunks to search"
 msgstr "Aucune autre section à rechercher"
 
-#: add-patch.c:1587 git-add--interactive.perl:1663
 msgid "search for regex? "
 msgstr "rechercher la regex ? "
 
-#: add-patch.c:1602
 #, c-format
 msgid "Malformed search regexp %s: %s"
 msgstr "Regex de recherche malformée %s : %s"
 
-#: add-patch.c:1619
 msgid "No hunk matches the given pattern"
 msgstr "Aucune section ne correspond au motif donné"
 
-#: add-patch.c:1626
 msgid "Sorry, cannot split this hunk"
 msgstr "Désolé, impossible de découper cette section"
 
-#: add-patch.c:1630
 #, c-format
 msgid "Split into %d hunks."
 msgstr "Découpée en %d sections."
 
-#: add-patch.c:1634
 msgid "Sorry, cannot edit this hunk"
 msgstr "Désolé, impossible d'éditer cette section"
 
-#: add-patch.c:1686
 msgid "'git apply' failed"
 msgstr "'git apply' a échoué"
 
-#: advice.c:81
 #, c-format
 msgid ""
 "\n"
@@ -828,37 +694,29 @@ msgstr ""
 "\n"
 "Désactivez ce message avec \"git config advice.%s false\""
 
-#: advice.c:97
 #, c-format
 msgid "%shint: %.*s%s\n"
 msgstr "%sastuce: %.*s%s\n"
 
-#: advice.c:181
 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:183
 msgid "Committing is not possible because you have unmerged files."
 msgstr "Impossible de valider car vous avez des fichiers non fusionnés."
 
-#: advice.c:185
 msgid "Merging is not possible because you have unmerged files."
 msgstr "Impossible de fusionner car vous avez des fichiers non fusionnés."
 
-#: advice.c:187
 msgid "Pulling is not possible because you have unmerged files."
 msgstr "Impossible de tirer car vous avez des fichiers non fusionnés."
 
-#: advice.c:189
 msgid "Reverting is not possible because you have unmerged files."
 msgstr "Impossible d'annuler car vous avez des fichiers non fusionnés."
 
-#: advice.c:191
 #, 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:199
 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."
@@ -866,27 +724,21 @@ msgstr ""
 "Corrigez-les puis lancez 'git add/rm <fichier>'\n"
 "si nécessaire pour marquer la résolution et valider."
 
-#: advice.c:207
 msgid "Exiting because of an unresolved conflict."
 msgstr "Abandon à cause de conflit non résolu."
 
-#: advice.c:212 builtin/merge.c:1388
 msgid "You have not concluded your merge (MERGE_HEAD exists)."
 msgstr "Vous n'avez pas terminé votre fusion (MERGE_HEAD existe)."
 
-#: advice.c:214
 msgid "Please, commit your changes before merging."
 msgstr "Veuillez valider vos changements avant de fusionner."
 
-#: advice.c:215
 msgid "Exiting because of unfinished merge."
 msgstr "Abandon à cause d'une fusion non terminée."
 
-#: advice.c:220
 msgid "Not possible to fast-forward, aborting."
 msgstr "Pas possible d'avancer rapidement, abandon."
 
-#: advice.c:230
 #, c-format
 msgid ""
 "The following paths and/or pathspecs matched paths that exist\n"
@@ -898,7 +750,6 @@ msgstr ""
 "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:237
 msgid ""
 "If you intend to update such entries, try one of the following:\n"
 "* Use the --sparse option.\n"
@@ -908,7 +759,6 @@ msgstr ""
 "* d'utiliser l'option --sparse,\n"
 "* de désactiver ou modifier les règles de choix clairsemé."
 
-#: advice.c:245
 #, c-format
 msgid ""
 "Note: switching to '%s'.\n"
@@ -953,108 +803,71 @@ msgstr ""
 "detachedHead à false\n"
 "\n"
 
-#: alias.c:50
 msgid "cmdline ends with \\"
 msgstr "cmdline se termine par \\"
 
-#: alias.c:51
 msgid "unclosed quote"
 msgstr "citation non fermée"
 
-#: apply.c:70
 #, c-format
 msgid "unrecognized whitespace option '%s'"
 msgstr "option d'espace non reconnue '%s'"
 
-#: apply.c:86
 #, c-format
 msgid "unrecognized whitespace ignore option '%s'"
 msgstr "option d'ignorance d'espace non reconnue '%s'"
 
-#: apply.c:138 archive.c:584 parse-options.c:1122 range-diff.c:555
-#: revision.c:2314 revision.c:2318 revision.c:2327 revision.c:2332
-#: revision.c:2560 revision.c:2895 revision.c:2899 revision.c:2907
-#: revision.c:2910 revision.c:2912 builtin/add.c:507 builtin/add.c:509
-#: builtin/add.c:515 builtin/add.c:527 builtin/branch.c:755
-#: builtin/checkout.c:472 builtin/checkout.c:475 builtin/checkout.c:1663
-#: builtin/checkout.c:1773 builtin/checkout.c:1776 builtin/clone.c:921
-#: builtin/commit.c:359 builtin/commit.c:362 builtin/commit.c:1200
-#: builtin/commit.c:1256 builtin/commit.c:1273 builtin/describe.c:593
-#: builtin/diff-tree.c:155 builtin/difftool.c:733 builtin/fast-export.c:1245
-#: builtin/fetch.c:2141 builtin/fetch.c:2162 builtin/fetch.c:2167
-#: builtin/help.c:602 builtin/index-pack.c:1858 builtin/init-db.c:560
-#: builtin/log.c:1968 builtin/log.c:1970 builtin/ls-files.c:778
-#: builtin/merge-base.c:163 builtin/merge-base.c:169 builtin/merge.c:1409
-#: builtin/merge.c:1411 builtin/pack-objects.c:4098 builtin/push.c:592
-#: builtin/push.c:630 builtin/push.c:636 builtin/push.c:641
-#: builtin/rebase.c:1221 builtin/rebase.c:1223 builtin/rebase.c:1227
-#: builtin/repack.c:688 builtin/repack.c:719 builtin/reset.c:433
-#: builtin/reset.c:469 builtin/rev-list.c:537 builtin/show-branch.c:711
-#: builtin/stash.c:1696 builtin/stash.c:1699 builtin/submodule--helper.c:1328
-#: builtin/submodule--helper.c:3054 builtin/tag.c:527 builtin/tag.c:573
-#: builtin/worktree.c:779
 #, c-format
 msgid "options '%s' and '%s' cannot be used together"
 msgstr "les options '%s' et '%s' ne peuvent pas être utilisées ensemble"
 
-#: apply.c:141 apply.c:152 apply.c:155
 #, c-format
 msgid "'%s' outside a repository"
 msgstr "'%s' hors d'un dépôt"
 
-#: apply.c:807
 #, c-format
 msgid "Cannot prepare timestamp regexp %s"
 msgstr "Impossible de préparer la regexp d'horodatage %s"
 
-#: apply.c:816
 #, c-format
 msgid "regexec returned %d for input: %s"
 msgstr "regexec a retourné %d pour l'entrée : %s"
 
-#: apply.c:890
 #, c-format
 msgid "unable to find filename in patch at line %d"
 msgstr "nom de fichier du patch introuvable à la ligne %d"
 
-#: apply.c:928
 #, c-format
 msgid "git apply: bad git-diff - expected /dev/null, got %s on line %d"
 msgstr ""
 "git apply : mauvais format de git-diff - /dev/null attendu, %s trouvé à la "
 "ligne %d"
 
-#: apply.c:934
 #, c-format
 msgid "git apply: bad git-diff - inconsistent new filename on line %d"
 msgstr ""
 "git apply : mauvais format de git-diff - nouveau nom de fichier inconsistant "
 "à la ligne %d"
 
-#: apply.c:935
 #, c-format
 msgid "git apply: bad git-diff - inconsistent old filename on line %d"
 msgstr ""
 "git apply : mauvais format de git-diff - ancien nom de fichier inconsistant "
 "à la ligne %d"
 
-#: apply.c:940
 #, c-format
 msgid "git apply: bad git-diff - expected /dev/null on line %d"
 msgstr ""
 "git apply : mauvais format de git-diff - /dev/null attendu à la ligne %d"
 
-#: apply.c:969
 #, c-format
 msgid "invalid mode on line %d: %s"
 msgstr "mode invalide dans la ligne %d : %s"
 
-#: apply.c:1288
 #, c-format
 msgid "inconsistent header lines %d and %d"
 msgstr "lignes d'entête inconsistantes %d et %d"
 
-#: apply.c:1378
 #, c-format
 msgid ""
 "git diff header lacks filename information when removing %d leading pathname "
@@ -1069,93 +882,75 @@ msgstr[1] ""
 "information de nom de fichier manquante dans l'en-tête de git diff lors de "
 "la suppression de %d composants de préfixe de chemin (ligne %d)"
 
-#: apply.c:1391
 #, c-format
 msgid "git diff header lacks filename information (line %d)"
 msgstr ""
 "information de nom de fichier manquante dans l'en-tête de git diff (ligne %d)"
 
-#: apply.c:1487
 #, c-format
 msgid "recount: unexpected line: %.*s"
 msgstr "recomptage : ligne inattendue : %.*s"
 
-#: apply.c:1556
 #, c-format
 msgid "patch fragment without header at line %d: %.*s"
 msgstr "fragment de patch sans en-tête à la ligne %d : %.*s"
 
-#: apply.c:1759
 msgid "new file depends on old contents"
 msgstr "le nouveau fichier dépend de contenus anciens"
 
-#: apply.c:1761
 msgid "deleted file still has contents"
 msgstr "le fichier supprimé a encore du contenu"
 
-#: apply.c:1795
 #, c-format
 msgid "corrupt patch at line %d"
 msgstr "patch corrompu à la ligne %d"
 
-#: apply.c:1832
 #, c-format
 msgid "new file %s depends on old contents"
 msgstr "le nouveau fichier %s dépend de contenus anciens"
 
-#: apply.c:1834
 #, c-format
 msgid "deleted file %s still has contents"
 msgstr "le fichier supprimé %s a encore du contenu"
 
-#: apply.c:1837
 #, c-format
 msgid "** warning: file %s becomes empty but is not deleted"
 msgstr "** attention : le fichier %s devient vide mais n'est pas supprimé"
 
-#: apply.c:1985
 #, c-format
 msgid "corrupt binary patch at line %d: %.*s"
 msgstr "patch binaire corrompu à la ligne %d : %.*s"
 
-#: apply.c:2022
 #, c-format
 msgid "unrecognized binary patch at line %d"
 msgstr "patch binaire non reconnu à la ligne %d"
 
-#: apply.c:2184
 #, c-format
 msgid "patch with only garbage at line %d"
 msgstr "patch totalement incompréhensible à la ligne %d"
 
-#: apply.c:2270
 #, c-format
 msgid "unable to read symlink %s"
 msgstr "lecture du lien symbolique %s impossible"
 
-#: apply.c:2274
 #, c-format
 msgid "unable to open or read %s"
 msgstr "ouverture ou lecture de %s impossible"
 
-#: apply.c:2943
 #, c-format
 msgid "invalid start of line: '%c'"
 msgstr "début de ligne invalide : '%c'"
 
-#: apply.c:3064
 #, 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:3076
 #, 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:3082
 #, c-format
 msgid ""
 "while searching for:\n"
@@ -1164,664 +959,525 @@ msgstr ""
 "pendant la recherche de :\n"
 "%.*s"
 
-#: apply.c:3104
 #, c-format
 msgid "missing binary patch data for '%s'"
 msgstr "données de patch binaire manquantes pour '%s'"
 
-#: apply.c:3112
 #, 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:3159
 #, 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:3170
 #, 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:3178
 #, 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:3196
 #, 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:3209
 #, c-format
 msgid "binary patch does not apply to '%s'"
 msgstr "le patch binaire ne s'applique par correctement à '%s'"
 
-#: apply.c:3216
 #, 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:3237
 #, c-format
 msgid "patch failed: %s:%ld"
 msgstr "le patch a échoué : %s:%ld"
 
-#: apply.c:3360
 #, c-format
 msgid "cannot checkout %s"
 msgstr "extraction de %s impossible"
 
-#: apply.c:3412 apply.c:3423 apply.c:3469 midx.c:105 pack-revindex.c:214
-#: setup.c:310
 #, c-format
 msgid "failed to read %s"
 msgstr "échec de la lecture de %s"
 
-#: apply.c:3420
 #, c-format
 msgid "reading from '%s' beyond a symbolic link"
 msgstr "lecture depuis '%s' au-delà d'un lien symbolique"
 
-#: apply.c:3449 apply.c:3721
 #, c-format
 msgid "path %s has been renamed/deleted"
 msgstr "le chemin %s a été renommé/supprimé"
 
-#: apply.c:3559 apply.c:3736
 #, c-format
 msgid "%s: does not exist in index"
 msgstr "%s : n'existe pas dans l'index"
 
-#: apply.c:3568 apply.c:3744 apply.c:3960
 #, c-format
 msgid "%s: does not match index"
 msgstr "%s : ne correspond pas à l'index"
 
-#: apply.c:3605
 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:3608
 #, c-format
 msgid "Performing three-way merge...\n"
 msgstr "Application d'une fusion à 3 points…\n"
 
-#: apply.c:3624 apply.c:3628
 #, c-format
 msgid "cannot read the current contents of '%s'"
 msgstr "impossible de lire le contenu actuel de '%s'"
 
-#: apply.c:3640
 #, c-format
 msgid "Failed to perform three-way merge...\n"
 msgstr "Échec de l'application de la fusion à 3 points…\n"
 
-#: apply.c:3654
 #, c-format
 msgid "Applied patch to '%s' with conflicts.\n"
 msgstr "Patch %s appliqué avec des conflits.\n"
 
-#: apply.c:3659
 #, c-format
 msgid "Applied patch to '%s' cleanly.\n"
 msgstr "Patch %s appliqué proprement.\n"
 
-#: apply.c:3676
 #, c-format
 msgid "Falling back to direct application...\n"
 msgstr "Retour à une application directe…\n"
 
-#: apply.c:3688
 msgid "removal patch leaves file contents"
 msgstr "le patch de suppression laisse un contenu dans le fichier"
 
-#: apply.c:3761
 #, c-format
 msgid "%s: wrong type"
 msgstr "%s : type erroné"
 
-#: apply.c:3763
 #, c-format
 msgid "%s has type %o, expected %o"
 msgstr "%s est de type %o, mais %o attendu"
 
-#: apply.c:3900 apply.c:3902 read-cache.c:903 read-cache.c:932
-#: read-cache.c:1399
 #, c-format
 msgid "invalid path '%s'"
 msgstr "chemin invalide '%s'"
 
-#: apply.c:3958
 #, c-format
 msgid "%s: already exists in index"
 msgstr "%s : existe déjà dans l'index"
 
-#: apply.c:3962
 #, c-format
 msgid "%s: already exists in working directory"
 msgstr "%s : existe déjà dans la copie de travail"
 
-#: apply.c:3982
 #, 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:3987
 #, 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:4007
 #, 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:4011
 #, c-format
 msgid "%s: patch does not apply"
 msgstr "%s : le patch ne s'applique pas"
 
-#: apply.c:4026
 #, c-format
 msgid "Checking patch %s..."
 msgstr "Vérification du patch %s..."
 
-#: apply.c:4118
 #, 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:4125
 #, 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:4128
 #, c-format
 msgid "sha1 information is lacking or useless (%s)."
 msgstr "l'information de sha1 est manquante ou inutilisable (%s)."
 
-#: apply.c:4137
 #, c-format
 msgid "could not add %s to temporary index"
 msgstr "impossible d'ajouter %s à l'index temporaire"
 
-#: apply.c:4147
 #, c-format
 msgid "could not write temporary index to %s"
 msgstr "impossible d'écrire l'index temporaire dans %s"
 
-#: apply.c:4285
 #, c-format
 msgid "unable to remove %s from index"
 msgstr "suppression de %s dans l'index impossible"
 
-#: apply.c:4319
 #, c-format
 msgid "corrupt patch for submodule %s"
 msgstr "patch corrompu pour le sous-module %s"
 
-#: apply.c:4325
 #, c-format
 msgid "unable to stat newly created file '%s'"
 msgstr "stat du fichier nouvellement créé '%s' impossible"
 
-#: apply.c:4333
 #, 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:4339 apply.c:4484
 #, c-format
 msgid "unable to add cache entry for %s"
 msgstr "ajout de l'élément de cache %s impossible"
 
-#: apply.c:4382 builtin/bisect--helper.c:540 builtin/gc.c:2258
-#: builtin/gc.c:2293
 #, c-format
 msgid "failed to write to '%s'"
 msgstr "échec de l'écriture dans '%s'"
 
-#: apply.c:4386
 #, c-format
 msgid "closing file '%s'"
 msgstr "fermeture du fichier '%s'"
 
-#: apply.c:4456
 #, c-format
 msgid "unable to write file '%s' mode %o"
 msgstr "écriture du fichier '%s' mode %o impossible"
 
-#: apply.c:4554
 #, c-format
 msgid "Applied patch %s cleanly."
 msgstr "Patch %s appliqué proprement."
 
-#: apply.c:4562
 msgid "internal error"
 msgstr "erreur interne"
 
-#: apply.c:4565
 #, 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:4576
 #, c-format
 msgid "truncating .rej filename to %.*s.rej"
 msgstr "troncature du nom de fichier .rej en %.*s.rej"
 
-#: apply.c:4584
 #, c-format
 msgid "cannot open %s"
 msgstr "impossible d'ouvrir %s"
 
-#: apply.c:4598
 #, c-format
 msgid "Hunk #%d applied cleanly."
 msgstr "Section n°%d appliquée proprement."
 
-#: apply.c:4602
 #, c-format
 msgid "Rejected hunk #%d."
 msgstr "Section n°%d rejetée."
 
-#: apply.c:4731
 #, c-format
 msgid "Skipped patch '%s'."
 msgstr "Chemin '%s' non traité."
 
-#: apply.c:4740
 msgid "No valid patches in input (allow with \"--allow-empty\")"
 msgstr "Pas de rustine valide sur l'entrée (permis avec \"--allow-empty\")"
 
-#: apply.c:4761
 msgid "unable to read index file"
 msgstr "lecture du fichier d'index impossible"
 
-#: apply.c:4918
 #, c-format
 msgid "can't open patch '%s': %s"
 msgstr "ouverture impossible du patch '%s' :%s"
 
-#: apply.c:4945
 #, 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:4951 apply.c:4966
 #, 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:4959
 #, 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:4975 builtin/add.c:690 builtin/mv.c:338 builtin/rm.c:430
 msgid "Unable to write new index file"
 msgstr "Impossible d'écrire le nouveau fichier d'index"
 
-#: apply.c:5003
 msgid "don't apply changes matching the given path"
 msgstr "ne pas appliquer les modifications qui correspondent au chemin donné"
 
-#: apply.c:5006
 msgid "apply changes matching the given path"
 msgstr "appliquer les modifications qui correspondent au chemin donné"
 
-#: apply.c:5008 builtin/am.c:2379
 msgid "num"
 msgstr "num"
 
-#: apply.c:5009
 msgid "remove <num> leading slashes from traditional diff paths"
 msgstr "supprimer <num> barres obliques des chemins traditionnels de diff"
 
-#: apply.c:5012
 msgid "ignore additions made by the patch"
 msgstr "ignorer les additions réalisées par le patch"
 
-#: apply.c:5014
 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:5018
 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:5020
 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:5022
 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:5024
 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:5026
 msgid "mark new files with `git add --intent-to-add`"
 msgstr "marquer les nouveaux fichiers `git add --intent-to-add`"
 
-#: apply.c:5028
 msgid "apply a patch without touching the working tree"
 msgstr "appliquer les patch sans toucher à la copie de travail"
 
-#: apply.c:5030
 msgid "accept a patch that touches outside the working area"
 msgstr "accepter un patch qui touche hors de la copie de travail"
 
-#: apply.c:5033
 msgid "also apply the patch (use with --stat/--summary/--check)"
 msgstr "appliquer aussi le patch (à utiliser avec --stat/--summary/--check)"
 
-#: apply.c:5035
 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:5037
 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:5040 builtin/checkout-index.c:230
 msgid "paths are separated with NUL character"
 msgstr "les chemins sont séparés par un caractère NUL"
 
-#: apply.c:5042
 msgid "ensure at least <n> lines of context match"
 msgstr "s'assurer d'au moins <n> lignes de correspondance de contexte"
 
-#: apply.c:5043 builtin/am.c:2355 builtin/am.c:2358
-#: builtin/interpret-trailers.c:98 builtin/interpret-trailers.c:100
-#: builtin/interpret-trailers.c:102 builtin/pack-objects.c:3983
-#: builtin/rebase.c:1079
 msgid "action"
 msgstr "action"
 
-#: apply.c:5044
 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:5047 apply.c:5050
 msgid "ignore changes in whitespace when finding context"
 msgstr "ignorer des modifications d'espace lors de la recherche de contexte"
 
-#: apply.c:5053
 msgid "apply the patch in reverse"
 msgstr "appliquer le patch en sens inverse"
 
-#: apply.c:5055
 msgid "don't expect at least one line of context"
 msgstr "ne pas s'attendre à au moins une ligne de contexte"
 
-#: apply.c:5057
 msgid "leave the rejected hunks in corresponding *.rej files"
 msgstr "laisser les sections rejetées dans les fichiers *.rej correspondants"
 
-#: apply.c:5059
 msgid "allow overlapping hunks"
 msgstr "accepter les recouvrements de sections"
 
-#: apply.c:5062
 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:5065
 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:5067 builtin/am.c:2367
 msgid "root"
 msgstr "racine"
 
-#: apply.c:5068
 msgid "prepend <root> to all filenames"
 msgstr "préfixer tous les noms de fichier avec <root>"
 
-#: apply.c:5071
 msgid "don't return error for empty patches"
 msgstr "ne pas renvoyer d'erreur pour les rustines vides"
 
-#: archive-tar.c:125 archive-zip.c:346
 #, c-format
 msgid "cannot stream blob %s"
 msgstr "impossible de transmettre le blob %s en flux"
 
-#: archive-tar.c:265 archive-zip.c:359
 #, c-format
 msgid "unsupported file mode: 0%o (SHA1: %s)"
 msgstr "mode de fichier non supporté :0%o (SHA1: %s)"
 
-#: archive-tar.c:447
 #, c-format
 msgid "unable to start '%s' filter"
 msgstr "impossible de démarrer le filtre '%s'"
 
-#: archive-tar.c:450
 msgid "unable to redirect descriptor"
 msgstr "impossible de rediriger un descripteur"
 
-#: archive-tar.c:457
 #, c-format
 msgid "'%s' filter reported error"
 msgstr "le filtre '%s' a retourné une erreur"
 
-#: archive-zip.c:319
 #, c-format
 msgid "path is not valid UTF-8: %s"
 msgstr "le chemin n'est pas codé en UTF-8 valide : %s"
 
-#: archive-zip.c:323
 #, c-format
 msgid "path too long (%d chars, SHA1: %s): %s"
 msgstr "le chemin est trop long (%d caractères, SHA1 : %s) : %s"
 
-#: archive-zip.c:470 builtin/pack-objects.c:363 builtin/pack-objects.c:366
 #, c-format
 msgid "deflate error (%d)"
 msgstr "erreur de compression (%d)"
 
-#: archive-zip.c:604
 #, c-format
 msgid "timestamp too large for this system: %<PRIuMAX>"
 msgstr "l'horodatage est trop grand pour ce système : %<PRIuMAX>"
 
-#: archive.c:14
 msgid "git archive [<options>] <tree-ish> [<path>...]"
 msgstr "git archive [<options>] <arbre ou apparenté> [<chemin>...]"
 
-#: archive.c:16
 msgid ""
 "git archive --remote <repo> [--exec <cmd>] [<options>] <tree-ish> [<path>...]"
 msgstr ""
 "git archive --remote <dépôt> [--exec <commande>] [<options>] <arbre ou "
 "apparenté> [<chemin>...]"
 
-#: archive.c:17
 msgid "git archive --remote <repo> [--exec <cmd>] --list"
 msgstr "git archive --remote <dépôt> [--exec <commande>] --list"
 
-#: archive.c:188 archive.c:341 builtin/gc.c:497 builtin/notes.c:238
-#: builtin/tag.c:579
 #, c-format
 msgid "cannot read '%s'"
 msgstr "impossible de lire '%s'"
 
-#: archive.c:426 builtin/add.c:214 builtin/add.c:657 builtin/rm.c:334
 #, c-format
 msgid "pathspec '%s' did not match any files"
 msgstr "le chemin '%s' ne correspond à aucun fichier"
 
-#: archive.c:450
 #, c-format
 msgid "no such ref: %.*s"
 msgstr "référence inexistante : %.*s"
 
-#: archive.c:456
 #, c-format
 msgid "not a valid object name: %s"
 msgstr "nom d'objet invalide : %s"
 
-#: archive.c:469
 #, c-format
 msgid "not a tree object: %s"
 msgstr "objet arbre invalide : %s"
 
-#: archive.c:481
 msgid "current working directory is untracked"
 msgstr "l'arbre de travail actuel est non-suivi"
 
-#: archive.c:522
 #, c-format
 msgid "File not found: %s"
 msgstr "Fichier non trouvé : %s"
 
-#: archive.c:524
 #, c-format
 msgid "Not a regular file: %s"
 msgstr "'%s' n'est pas un fichier normal"
 
-#: archive.c:551
+#, c-format
+msgid "unclosed quote: '%s'"
+msgstr "citation non fermée : '%s'"
+
+#, c-format
+msgid "missing colon: '%s'"
+msgstr "deux points manquants : '%s'"
+
+#, c-format
+msgid "empty file name: '%s'"
+msgstr "nom de fichier vide : '%s'"
+
 msgid "fmt"
 msgstr "fmt"
 
-#: archive.c:551
 msgid "archive format"
 msgstr "format d'archive"
 
-#: archive.c:552 builtin/log.c:1809
 msgid "prefix"
 msgstr "préfixe"
 
-#: archive.c:553
 msgid "prepend prefix to each pathname in the archive"
 msgstr "préfixer chaque chemin de fichier dans l'archive"
 
-#: archive.c:554 archive.c:557 builtin/blame.c:881 builtin/blame.c:885
-#: builtin/blame.c:886 builtin/commit-tree.c:115 builtin/config.c:135
-#: builtin/fast-export.c:1181 builtin/fast-export.c:1183
-#: builtin/fast-export.c:1187 builtin/grep.c:936 builtin/hash-object.c:104
-#: builtin/ls-files.c:654 builtin/ls-files.c:657 builtin/notes.c:410
-#: builtin/notes.c:576 builtin/read-tree.c:115 parse-options.h:195
 msgid "file"
 msgstr "fichier"
 
-#: archive.c:555
 msgid "add untracked file to archive"
 msgstr "ajouter les fichiers non suivis à l'archive"
 
-#: archive.c:558 builtin/archive.c:88
+msgid "path:content"
+msgstr "chemin:contenu"
+
 msgid "write the archive to this file"
 msgstr "écrire l'archive dans ce fichier"
 
-#: archive.c:560
 msgid "read .gitattributes in working directory"
 msgstr "lire .gitattributes dans le répertoire de travail"
 
-#: archive.c:561
 msgid "report archived files on stderr"
 msgstr "afficher les fichiers archivés sur stderr"
 
-#: archive.c:563
 msgid "set compression level"
 msgstr "régler le niveau de compression"
 
-#: archive.c:566
 msgid "list supported archive formats"
 msgstr "afficher les formats d'archive supportés"
 
-#: archive.c:568 builtin/archive.c:89 builtin/clone.c:122 builtin/clone.c:125
-#: builtin/submodule--helper.c:1884 builtin/submodule--helper.c:2718
 msgid "repo"
 msgstr "dépôt"
 
-#: 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:570 builtin/archive.c:91 builtin/difftool.c:708
-#: builtin/notes.c:496
 msgid "command"
 msgstr "commande"
 
-#: 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:578
 msgid "Unexpected option --remote"
 msgstr "Option --remote inattendue"
 
-#: archive.c:580 fetch-pack.c:300 revision.c:2914 builtin/add.c:530
-#: builtin/add.c:562 builtin/checkout.c:1782 builtin/clone.c:1099
-#: builtin/clone.c:1102 builtin/commit.c:371 builtin/fast-export.c:1230
-#: builtin/index-pack.c:1854 builtin/log.c:2140 builtin/reset.c:442
-#: builtin/reset.c:500 builtin/rm.c:281 builtin/stash.c:1708
-#: builtin/worktree.c:580 builtin/worktree.c:781 http-fetch.c:144
-#: http-fetch.c:153
 #, c-format
 msgid "the option '%s' requires '%s'"
 msgstr "l'option '%s' requiert '%s'"
 
-#: archive.c:582
 msgid "Unexpected option --output"
 msgstr "Option --output inattendue"
 
-#: archive.c:606
 #, c-format
 msgid "Unknown archive format '%s'"
 msgstr "Format d'archive inconnu '%s'"
 
-#: 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
 #, c-format
 msgid "%.*s is not a valid attribute name"
 msgstr "%.*s n'est pas un nom valide d'attribut"
 
-#: attr.c:363
 #, c-format
 msgid "%s not allowed: %s:%d"
 msgstr "%s non permis : %s : %d"
 
-#: attr.c:403
 msgid ""
 "Negative patterns are ignored in git attributes\n"
 "Use '\\!' for literal leading exclamation."
@@ -1829,22 +1485,18 @@ msgstr ""
 "Les motifs de négation sont ignorés dans les attributs git\n"
 "Utilisez '\\!' pour un point d'exclamation littéral."
 
-#: bisect.c:488
 #, c-format
 msgid "Badly quoted content in file '%s': %s"
 msgstr "Contenu mal cité dans le fichier '%s' : %s"
 
-#: bisect.c:698
 #, c-format
 msgid "We cannot bisect more!\n"
 msgstr "Impossible de pousser la bissection plus loin !\n"
 
-#: bisect.c:765
 #, c-format
 msgid "Not a valid commit name %s"
 msgstr "%s n'est pas un nom de commit valide"
 
-#: bisect.c:790
 #, c-format
 msgid ""
 "The merge base %s is bad.\n"
@@ -1853,7 +1505,6 @@ msgstr ""
 "La base de fusion %s est mauvaise.\n"
 "Cela signifie que le bogue été corrigé entre %s et [%s].\n"
 
-#: bisect.c:795
 #, c-format
 msgid ""
 "The merge base %s is new.\n"
@@ -1862,7 +1513,6 @@ msgstr ""
 "La base de fusion %s est nouvelle.\n"
 "La propriété a changé entre %s et [%s].\n"
 
-#: bisect.c:800
 #, c-format
 msgid ""
 "The merge base %s is %s.\n"
@@ -1871,7 +1521,6 @@ msgstr ""
 "La base de fusion %s est %s.\n"
 "Ceci signifie que le premier commit '%s' est entre %s et [%s].\n"
 
-#: bisect.c:808
 #, c-format
 msgid ""
 "Some %s revs are not ancestors of the %s rev.\n"
@@ -1882,7 +1531,6 @@ msgstr ""
 "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:821
 #, c-format
 msgid ""
 "the merge base between %s and [%s] must be skipped.\n"
@@ -1894,36 +1542,29 @@ msgstr ""
 "et %s.\n"
 "On continue tout de même."
 
-#: bisect.c:860
 #, c-format
 msgid "Bisecting: a merge base must be tested\n"
 msgstr "Bissection : une base de fusion doit être testée\n"
 
-#: bisect.c:910
 #, c-format
 msgid "a %s revision is needed"
 msgstr "une révision %s est nécessaire"
 
-#: bisect.c:940
 #, c-format
 msgid "could not create file '%s'"
 msgstr "impossible de créer le fichier '%s'"
 
-#: bisect.c:986 builtin/merge.c:155
 #, c-format
 msgid "could not read file '%s'"
 msgstr "impossible de lire le fichier '%s'"
 
-#: bisect.c:1026
 msgid "reading bisect refs failed"
 msgstr "impossible de lire les références de bissection"
 
-#: bisect.c:1056
 #, c-format
 msgid "%s was both %s and %s\n"
 msgstr "%s était à la fois %s et %s\n"
 
-#: bisect.c:1065
 #, c-format
 msgid ""
 "No testable commit found.\n"
@@ -1932,7 +1573,6 @@ msgstr ""
 "Aucun commit testable n'a été trouvé\n"
 "Peut-être avez-vous démarré avec un mauvais arguement de chemin ?\n"
 
-#: bisect.c:1094
 #, c-format
 msgid "(roughly %d step)"
 msgid_plural "(roughly %d steps)"
@@ -1942,54 +1582,40 @@ msgstr[1] "(à peu près %d étapes)"
 #. TRANSLATORS: the last %s will be replaced with "(roughly %d
 #. steps)" translation.
 #.
-#: bisect.c:1100
 #, 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"
 msgstr[0] "Bissection : %d révision à tester après ceci %s\n"
 msgstr[1] "Bissection : %d révisions à tester après ceci %s\n"
 
-#: blame.c:2773
 msgid "--contents and --reverse do not blend well."
 msgstr "--contents et --reverse ne font pas bon ménage."
 
-#: blame.c:2787
 msgid "cannot use --contents with final commit object name"
 msgstr "on ne peut pas utiliser --contents avec un nom d'objet commit final"
 
-#: blame.c:2808
 msgid "--reverse and --first-parent together require specified latest commit"
 msgstr ""
 "--reverse et --first-parent ensemble nécessitent la spécification d'un "
 "dernier commit"
 
-#: blame.c:2817 bundle.c:231 midx.c:1058 ref-filter.c:2371 remote.c:2157
-#: sequencer.c:2348 sequencer.c:4872 submodule.c:913 builtin/commit.c:1118
-#: builtin/log.c:437 builtin/log.c:1055 builtin/log.c:1663 builtin/log.c:2096
-#: builtin/log.c:2387 builtin/merge.c:431 builtin/pack-objects.c:3381
-#: builtin/pack-objects.c:3781 builtin/pack-objects.c:3796
-#: builtin/shortlog.c:255
 msgid "revision walk setup failed"
 msgstr "échec de la préparation du parcours des révisions"
 
-#: blame.c:2835
 msgid ""
 "--reverse --first-parent together require range along first-parent chain"
 msgstr ""
 "--reverse --first-parent ensemble nécessitent une portée avec la chaîne de "
 "premier parent"
 
-#: blame.c:2846
 #, c-format
 msgid "no such path %s in %s"
 msgstr "pas de chemin %s dans %s"
 
-#: blame.c:2857
 #, c-format
 msgid "cannot read blob %s for path %s"
 msgstr "impossible de lire le blob %s  pour le chemin %s"
 
-#: branch.c:93
 msgid ""
 "cannot inherit upstream tracking configuration of multiple refs when "
 "rebasing is requested"
@@ -1997,31 +1623,25 @@ msgstr ""
 "impossible d'hériter la configuration de suivi de référence amont depuis "
 "plusieurs références quand un rebasage est demandé"
 
-#: branch.c:104
 #, c-format
 msgid "not setting branch '%s' as its own upstream"
 msgstr "la branche %s ne peut pas être sa propre branche amont"
 
-#: branch.c:160
 #, c-format
 msgid "branch '%s' set up to track '%s' by rebasing."
 msgstr "la branche '%s' est paramétrée pour suivre '%s' en rebasant."
 
-#: branch.c:161
 #, c-format
 msgid "branch '%s' set up to track '%s'."
 msgstr "la branche '%s' est paramétrée pour suivre '%s'."
 
-#: branch.c:164
 #, c-format
 msgid "branch '%s' set up to track:"
 msgstr "la branche '%s' est paramétrée pour suivre :"
 
-#: branch.c:176
 msgid "unable to write upstream branch configuration"
 msgstr "échec de l'écriture de la configuration de branche amont"
 
-#: branch.c:178
 msgid ""
 "\n"
 "After fixing the error cause you may try to fix up\n"
@@ -2031,33 +1651,31 @@ msgstr ""
 "Après correction de la cause de l'erreur, vous pouvez essayer\n"
 "de corriger l'information de suivi distant en invoquant :"
 
-#: branch.c:219
 #, c-format
 msgid "asked to inherit tracking from '%s', but no remote is set"
 msgstr "héritage de suivi depuis '%s' demandé, mais pas de distant configuré"
 
-#: branch.c:225
 #, c-format
 msgid "asked to inherit tracking from '%s', but no merge configuration is set"
 msgstr ""
 "héritage de suivi depuis '%s' demandé, mais pas de configuration de fusion "
 "renseignée"
 
-#: branch.c:277
 #, c-format
 msgid "not tracking: ambiguous information for ref '%s'"
 msgstr "pas de suivi : information ambiguë pour la référence '%s'"
 
+#. #-#-#-#-#  branch.c.po  #-#-#-#-#
 #. TRANSLATORS: This is a line listing a remote with duplicate
 #. refspecs in the advice message below. For RTL languages you'll
 #. probably want to swap the "%s" and leading "  " space around.
 #.
+#. #-#-#-#-#  object-name.c.po  #-#-#-#-#
 #. TRANSLATORS: This is line item of ambiguous object output
 #. from describe_ambiguous_object() above. For RTL languages
 #. you'll probably want to swap the "%s" and leading " " space
 #. around.
 #.
-#: branch.c:289 object-name.c:464
 #, c-format
 msgid "  %s\n"
 msgstr "  %s\n"
@@ -2065,7 +1683,6 @@ msgstr "  %s\n"
 #. TRANSLATORS: The second argument is a \n-delimited list of
 #. duplicate refspecs, composed above.
 #.
-#: branch.c:295
 #, c-format
 msgid ""
 "There are multiple remotes whose fetch refspecs map to the remote\n"
@@ -2086,35 +1703,29 @@ msgstr ""
 "que des réfspecs de récupération de distants différents\n"
 "correspondent à des espaces de nommage de suivi différents."
 
-#: branch.c:344
 #, c-format
 msgid "'%s' is not a valid branch name"
 msgstr "'%s' n'est pas un nom de branche valide"
 
-#: branch.c:364
 #, c-format
 msgid "a branch named '%s' already exists"
 msgstr "Une branche nommée '%s' existe déjà"
 
-#: branch.c:370
 #, c-format
 msgid "cannot force update the branch '%s' checked out at '%s'"
 msgstr ""
 "impossible de forcer la mise à jour de la branche '%s' extraite dans '%s'"
 
-#: branch.c:393
 #, c-format
 msgid "cannot set up tracking information; starting point '%s' is not a branch"
 msgstr ""
 "Impossible de configurer le suivi de branche ; le point de départ '%s' n'est "
 "pas une branche"
 
-#: branch.c:395
 #, c-format
 msgid "the requested upstream branch '%s' does not exist"
 msgstr "la branche amont demandée '%s' n'existe pas"
 
-#: branch.c:397
 msgid ""
 "\n"
 "If you are planning on basing your work on an upstream\n"
@@ -2134,28 +1745,22 @@ msgstr ""
 "sa jumelle distante, vous pouvez utiliser \"git push -u\"\n"
 "pour paramétrer le suivi distant en même temps que vous poussez."
 
-#: branch.c:445 builtin/replace.c:321 builtin/replace.c:377
-#: builtin/replace.c:423 builtin/replace.c:453
 #, c-format
 msgid "not a valid object name: '%s'"
 msgstr "nom d'objet invalide : '%s'"
 
-#: branch.c:465
 #, c-format
 msgid "ambiguous object name: '%s'"
 msgstr "Nom d'objet ambigu : '%s'"
 
-#: branch.c:470
 #, c-format
 msgid "not a valid branch point: '%s'"
 msgstr "point d'embranchement invalide : '%s'"
 
-#: branch.c:658
 #, c-format
 msgid "submodule '%s': unable to find submodule"
 msgstr "sous-module '%s' : impossible de trouver le sous-module"
 
-#: branch.c:661
 #, c-format
 msgid ""
 "You may try updating the submodules using 'git checkout %s && git submodule "
@@ -2164,8831 +1769,119 @@ msgstr ""
 "Vous pouvez essayer de mettre à jour les sous-modules en utilisant 'git "
 "checkout %s && git submodule update --init'"
 
-#: branch.c:672 branch.c:698
 #, c-format
 msgid "submodule '%s': cannot create branch '%s'"
 msgstr "sous-module '%s' : impossible de créer la branche '%s'"
 
-#: branch.c:730
 #, c-format
 msgid "'%s' is already checked out at '%s'"
 msgstr "'%s' est déjà extrait dans '%s'"
 
-#: branch.c:755
 #, c-format
 msgid "HEAD of working tree %s is not updated"
 msgstr "la HEAD de la copie de travail %s n'est pas mise à jour"
 
-#: bundle.c:45
-#, c-format
-msgid "unrecognized bundle hash algorithm: %s"
-msgstr "algorithme d'empreinte du colis inconnu : %s"
-
-#: bundle.c:53
-#, c-format
-msgid "unknown capability '%s'"
-msgstr "capacité inconnue '%s'"
-
-#: bundle.c:79
-#, c-format
-msgid "'%s' does not look like a v2 or v3 bundle file"
-msgstr "'%s' ne semble pas être un fichier colis v2 our v3"
-
-#: bundle.c:118
-#, c-format
-msgid "unrecognized header: %s%s (%d)"
-msgstr "en-tête non reconnu : %s%s (%d)"
-
-#: bundle.c:145 rerere.c:464 rerere.c:675 sequencer.c:2616 sequencer.c:3402
-#: builtin/commit.c:865
-#, c-format
-msgid "could not open '%s'"
-msgstr "impossible d'ouvrir '%s'"
-
-#: bundle.c:203
-msgid "Repository lacks these prerequisite commits:"
-msgstr "Le dépôt ne dispose pas des commits prérequis suivants :"
-
-#: bundle.c:206
-msgid "need a repository to verify a bundle"
-msgstr "la vérification d'un colis requiert un dépôt"
-
-#: bundle.c:264
-#, c-format
-msgid "The bundle contains this ref:"
-msgid_plural "The bundle contains these %<PRIuMAX> refs:"
-msgstr[0] "Le colis contient cette référence :"
-msgstr[1] "Le colis contient ces %<PRIuMAX> références :"
-
-#: bundle.c:272
-msgid "The bundle records a complete history."
-msgstr "Le colis enregistre l'historique complet."
-
-#: bundle.c:274
-#, c-format
-msgid "The bundle requires this ref:"
-msgid_plural "The bundle requires these %<PRIuMAX> refs:"
-msgstr[0] "Le colis exige cette référence :"
-msgstr[1] "Le colis exige ces %<PRIuMAX> références :"
-
-#: bundle.c:350
-msgid "unable to dup bundle descriptor"
-msgstr "impossible de dupliquer le descripteur de liasse"
-
-#: bundle.c:357
-msgid "Could not spawn pack-objects"
-msgstr "Impossible de créer des objets groupés"
-
-#: bundle.c:368
-msgid "pack-objects died"
-msgstr "les objets groupés ont disparu"
-
-#: bundle.c:417
-#, c-format
-msgid "ref '%s' is excluded by the rev-list options"
-msgstr "la référence '%s' est exclue par les options de rev-list"
-
-#: bundle.c:533 builtin/log.c:211 builtin/log.c:1975 builtin/shortlog.c:400
-#, c-format
-msgid "unrecognized argument: %s"
-msgstr "argument non reconnu : %s"
-
-#: bundle.c:548
-#, c-format
-msgid "unsupported bundle version %d"
-msgstr "version de colis non supportée %d"
-
-#: bundle.c:550
-#, c-format
-msgid "cannot write bundle version %d with algorithm %s"
-msgstr "impossible d'écrire une version de colis %d avec l'algorithme %s"
-
-#: bundle.c:600
-msgid "Refusing to create empty bundle."
-msgstr "Refus de créer un colis vide."
-
-#: bundle.c:610
-#, c-format
-msgid "cannot create '%s'"
-msgstr "impossible de créer '%s'"
-
-#: bundle.c:639
-msgid "index-pack died"
-msgstr "l'index de groupe a disparu"
-
-#: chunk-format.c:117
-msgid "terminating chunk id appears earlier than expected"
-msgstr "l'identifiant de terminaison de tronçon apparaît plus tôt qu'attendu"
-
-#: chunk-format.c:126
-#, c-format
-msgid "improper chunk offset(s) %<PRIx64> and %<PRIx64>"
-msgstr "décalage(s) de section incorrect(s) %<PRIx64> et %<PRIx64>"
-
-#: chunk-format.c:133
-#, c-format
-msgid "duplicate chunk ID %<PRIx32> found"
-msgstr "ID de section dupliqué %<PRIx32>"
-
-#: chunk-format.c:147
-#, c-format
-msgid "final chunk has non-zero id %<PRIx32>"
-msgstr "la section finale a un id non nul %<PRIx32>"
-
-#: color.c:354
-#, c-format
-msgid "invalid color value: %.*s"
-msgstr "valeur invalide de couleur : %.*s"
-
-#: commit-graph.c:204 midx.c:52
-msgid "invalid hash version"
-msgstr "version d'empreinte invalide"
-
-#: commit-graph.c:262
-msgid "commit-graph file is too small"
-msgstr "le graphe de commit est trop petit"
-
-#: commit-graph.c:355
-#, c-format
-msgid "commit-graph signature %X does not match signature %X"
-msgstr ""
-"la signature du graphe de commit %X ne correspond pas à la signature %X"
-
-#: commit-graph.c:362
-#, c-format
-msgid "commit-graph version %X does not match version %X"
-msgstr "la version %X du graphe de commit ne correspond pas à la version %X"
-
-#: commit-graph.c:369
-#, c-format
-msgid "commit-graph hash version %X does not match version %X"
-msgstr ""
-"l'empreinte de la version %X du graphe de commit ne correspond pas à la "
-"version %X"
-
-#: commit-graph.c:386
-#, c-format
-msgid "commit-graph file is too small to hold %u chunks"
-msgstr "le graphe de commit est trop petit pour contenir %u sections"
-
-#: commit-graph.c:485
-msgid "commit-graph has no base graphs chunk"
-msgstr "le graphe de commit n'a pas de section de graphes de base"
-
-#: commit-graph.c:495
-msgid "commit-graph chain does not match"
-msgstr "la chaîne de graphe de commit ne correspond pas"
-
-#: commit-graph.c:543
-#, c-format
-msgid "invalid commit-graph chain: line '%s' not a hash"
-msgstr ""
-"chaîne de graphe de commit invalide : la ligne '%s' n'est pas une empreinte"
-
-#: commit-graph.c:567
-msgid "unable to find all commit-graph files"
-msgstr "impossible de trouver tous les fichiers du graphe de commit"
-
-#: commit-graph.c:752 commit-graph.c:789
-msgid "invalid commit position. commit-graph is likely corrupt"
-msgstr ""
-"position de commit invalide. Le graphe de commit est vraisemblablement "
-"corrompu"
-
-#: commit-graph.c:773
-#, c-format
-msgid "could not find commit %s"
-msgstr "impossible de trouver le commit %s"
-
-#: commit-graph.c:806
-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:1111 builtin/am.c:1370 builtin/checkout.c:775
-#: builtin/clone.c:705
-#, c-format
-msgid "unable to parse commit %s"
-msgstr "impossible d'analyser le commit %s"
-
-#: commit-graph.c:1373 builtin/pack-objects.c:3078
-#, c-format
-msgid "unable to get type of object %s"
-msgstr "impossible d'obtenir le type de l'objet %s"
-
-#: commit-graph.c:1404
-msgid "Loading known commits in commit graph"
-msgstr "Lecture des commits connus dans un graphe de commit"
-
-#: commit-graph.c:1421
-msgid "Expanding reachable commits in commit graph"
-msgstr "Expansion des commits joignables dans un graphe de commit"
-
-#: commit-graph.c:1441
-msgid "Clearing commit marks in commit graph"
-msgstr "Suppression les marques de commit dans le graphe de commits"
-
-#: commit-graph.c:1460
-msgid "Computing commit graph topological levels"
-msgstr "Calcul des niveaux topologiques du graphe de commits"
-
-#: commit-graph.c:1513
-msgid "Computing commit graph generation numbers"
-msgstr "Calcul des chiffres de génération du graphe de commits"
-
-#: commit-graph.c:1598
-msgid "Computing commit changed paths Bloom filters"
-msgstr "Calcul des filtres Bloom des chemins modifiés du commit"
-
-#: commit-graph.c:1675
-msgid "Collecting referenced commits"
-msgstr "Collecte des commits référencés"
-
-#: commit-graph.c:1701
-#, c-format
-msgid "Finding commits for commit graph in %<PRIuMAX> pack"
-msgid_plural "Finding commits for commit graph in %<PRIuMAX> packs"
-msgstr[0] ""
-"Recherche de commits pour un graphe de commits dans %<PRIuMAX> paquet"
-msgstr[1] ""
-"Recherche de commits pour un graphe de commits dans %<PRIuMAX> paquets"
-
-#: commit-graph.c:1714
-#, c-format
-msgid "error adding pack %s"
-msgstr "erreur à l'ajout du packet %s"
-
-#: commit-graph.c:1718
-#, c-format
-msgid "error opening index for %s"
-msgstr "erreur à l'ouverture de l'index pour %s"
-
-#: commit-graph.c:1756
-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:1774
-msgid "Finding extra edges in commit graph"
-msgstr "Recherche d'arêtes supplémentaires dans un graphe de commits"
-
-#: commit-graph.c:1823
-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:1854 midx.c:1168 builtin/sparse-checkout.c:475
-#, 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:1868
-msgid "unable to create temporary graph layer"
-msgstr "impossible de créer une couche de graphe temporaire"
-
-#: commit-graph.c:1873
-#, c-format
-msgid "unable to adjust shared permissions for '%s'"
-msgstr "impossible de régler les droits partagés pour '%s'"
-
-#: commit-graph.c:1930
-#, 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:1967
-msgid "unable to open commit-graph chain file"
-msgstr "impossible d'ouvrir le fichier de graphe de commit"
-
-#: commit-graph.c:1983
-msgid "failed to rename base commit-graph file"
-msgstr "échec du renommage du fichier de graphe de commits"
-
-#: commit-graph.c:2004
-msgid "failed to rename temporary commit-graph file"
-msgstr "impossible de renommer le fichier temporaire de graphe de commits"
-
-#: commit-graph.c:2137
-msgid "Scanning merged commits"
-msgstr "Analyse des commits de fusion"
-
-#: commit-graph.c:2181
-msgid "Merging commit-graph"
-msgstr "Fusion du graphe de commits"
-
-#: commit-graph.c:2289
-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:2396
-msgid "too many commits to write graph"
-msgstr "trop de commits pour écrire un graphe"
-
-#: commit-graph.c:2494
-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:2504
-#, 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:2514 commit-graph.c:2529
-#, 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:2521
-#, 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:2539
-msgid "Verifying commits in commit graph"
-msgstr "Verification des commits dans le graphe de commits"
-
-#: commit-graph.c:2554
-#, 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:2561
-#, 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:2571
-#, 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:2580
-#, 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:2594
-#, 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:2599
-#, c-format
-msgid ""
-"commit-graph has generation number zero for commit %s, but non-zero elsewhere"
-msgstr ""
-"le graphe de commit a un numéro de génération nul pour le commit %s, mais "
-"non-nul ailleurs"
-
-#: commit-graph.c:2603
-#, c-format
-msgid ""
-"commit-graph has non-zero generation number for commit %s, but zero elsewhere"
-msgstr ""
-"le graphe de commit a un numéro de génération non-nul pour le commit %s, "
-"mais nul ailleurs"
-
-#: commit-graph.c:2620
-#, 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:2626
-#, 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:54 sequencer.c:3105 builtin/am.c:400 builtin/am.c:445
-#: builtin/am.c:450 builtin/am.c:1449 builtin/am.c:2124 builtin/replace.c:456
-#, c-format
-msgid "could not parse %s"
-msgstr "impossible d'analyser %s"
-
-#: commit.c:56
-#, c-format
-msgid "%s %s is not a commit!"
-msgstr "%s %s n'est pas un commit !"
-
-#: commit.c:197
-msgid ""
-"Support for <GIT_DIR>/info/grafts is deprecated\n"
-"and will be removed in a future Git version.\n"
-"\n"
-"Please use \"git replace --convert-graft-file\"\n"
-"to convert the grafts into replace refs.\n"
-"\n"
-"Turn this message off by running\n"
-"\"git config advice.graftFileDeprecated false\""
-msgstr ""
-"Le support de <GIT_DIR>/info/grafts est déconseillé\n"
-"et sera supprimé dans une version future de Git.\n"
-"\n"
-"Veuillez utiliser \"git replace --convert-graft-file\"\n"
-"pour convertir les grafts en référence de remplacement.\n"
-"\n"
-"Supprimez ce message en lançant\n"
-"\"git config advice.graftFileDeprecated false\""
-
-#: commit.c:1252
-#, 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:1256
-#, 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:1259
-#, c-format
-msgid "Commit %s does not have a GPG signature."
-msgstr "La validation %s n'a pas de signature GPG."
-
-#: commit.c:1262
-#, 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:1516
-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"
-"variable i18n.commitencoding to the encoding your project uses.\n"
-msgstr ""
-"Avertissement : le message de validation ne se conforme pas à UTF-8.\n"
-"Vous souhaitez peut-être le modifier après correction du message ou régler "
-"la\n"
-"variable de configuration i18n.commitencoding à l'encodage utilisé par votre "
-"projet.\n"
-
-#: compat/obstack.c:406 compat/obstack.c:408
-msgid "memory exhausted"
-msgstr "plus de mémoire"
-
-#: compat/terminal.c:167
-msgid "cannot resume in the background, please use 'fg' to resume"
-msgstr ""
-"impossible de reprendre en arrière plan, veuillez utiliser 'fg' pour "
-"reprendre"
-
-#: compat/terminal.c:168
-msgid "cannot restore terminal settings"
-msgstr "impossible de restaurer les réglages du terminal"
-
-#: config.c:143
-#, c-format
-msgid ""
-"exceeded maximum include depth (%d) while including\n"
-"\t%s\n"
-"from\n"
-"\t%s\n"
-"This might be due to circular includes."
-msgstr ""
-"profondeur d'inclusion maximum (%d) dépassée à l'inclusion de\n"
-"\t%s\n"
-"depuis\n"
-"\t%s\n"
-"possibilité d'inclusions multiples."
-
-#: config.c:159
-#, c-format
-msgid "could not expand include path '%s'"
-msgstr "expansion impossible du chemin d'inclusion '%s'"
-
-#: config.c:170
-msgid "relative config includes must come from files"
-msgstr "les inclusions de configuration relatives doivent venir de fichiers"
-
-#: config.c:219
-msgid "relative config include conditionals must come from files"
-msgstr ""
-"les conditions d'inclusion de configuration relative doivent venir de "
-"fichiers"
-
-#: config.c:364
-msgid ""
-"remote URLs cannot be configured in file directly or indirectly included by "
-"includeIf.hasconfig:remote.*.url"
-msgstr ""
-"les URL distantes ne peuvent pas être configurées dans un fichier "
-"directement ou indirectement inclus par includeIf.hasconfig:remote.*.url"
-
-#: config.c:508
-#, c-format
-msgid "invalid config format: %s"
-msgstr "format de config invalide : %s"
-
-#: config.c:512
-#, c-format
-msgid "missing environment variable name for configuration '%.*s'"
-msgstr "nom de variable d'environnement manquant pour le configuration '%.*s'"
-
-#: config.c:517
-#, c-format
-msgid "missing environment variable '%s' for configuration '%.*s'"
-msgstr "variable d'environnement '%s' manquante pour le configuration '%.*s'"
-
-#: config.c:553
-#, c-format
-msgid "key does not contain a section: %s"
-msgstr "la clé ne contient pas de section: %s"
-
-#: config.c:558
-#, c-format
-msgid "key does not contain variable name: %s"
-msgstr "la clé ne contient pas de nom de variable : %s"
-
-#: config.c:580 sequencer.c:2802
-#, c-format
-msgid "invalid key: %s"
-msgstr "clé invalide : %s"
-
-#: config.c:585
-#, c-format
-msgid "invalid key (newline): %s"
-msgstr "clé invalide (retour chariot) : %s"
-
-#: config.c:605
-msgid "empty config key"
-msgstr "clé de configuration vide"
-
-#: config.c:623 config.c:635
-#, c-format
-msgid "bogus config parameter: %s"
-msgstr "paramètre de configuration mal formé: %s"
-
-#: config.c:649 config.c:666 config.c:673 config.c:682
-#, c-format
-msgid "bogus format in %s"
-msgstr "formatage mal formé dans %s"
-
-#: config.c:716
-#, c-format
-msgid "bogus count in %s"
-msgstr "compte faux dans %s"
-
-#: config.c:720
-#, c-format
-msgid "too many entries in %s"
-msgstr "trop d'entrées dans %s"
-
-#: config.c:730
-#, c-format
-msgid "missing config key %s"
-msgstr "clé de configuration %s manquante"
-
-#: config.c:738
-#, c-format
-msgid "missing config value %s"
-msgstr "valeur de config manquante %s"
-
-#: config.c:1089
-#, c-format
-msgid "bad config line %d in blob %s"
-msgstr "ligne %d de config incorrecte dans le blob %s"
-
-#: config.c:1093
-#, c-format
-msgid "bad config line %d in file %s"
-msgstr "ligne %d de config incorrecte dans le fichier %s"
-
-#: config.c:1097
-#, c-format
-msgid "bad config line %d in standard input"
-msgstr "ligne %d de config incorrecte dans l'entrée standard"
-
-#: config.c:1101
-#, 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:1105
-#, 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:1109
-#, c-format
-msgid "bad config line %d in %s"
-msgstr "ligne %d de config incorrecte dans %s"
-
-#: config.c:1246
-msgid "out of range"
-msgstr "hors plage"
-
-#: config.c:1246
-msgid "invalid unit"
-msgstr "unité invalide"
-
-#: config.c:1247
-#, c-format
-msgid "bad numeric config value '%s' for '%s': %s"
-msgstr "valeur numérique de configuration invalide '%s' pour '%s' : %s"
-
-#: config.c:1257
-#, 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:1260
-#, 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:1263
-#, 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:1266
-#, 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:1269
-#, 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:1272
-#, 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:1368
-#, c-format
-msgid "invalid value for variable %s"
-msgstr "valeur invalide pour la variable %s"
-
-#: config.c:1389
-#, c-format
-msgid "ignoring unknown core.fsync component '%s'"
-msgstr "ignore le composant core.fsync inconne '%s'"
-
-#: config.c:1425
-#, c-format
-msgid "bad boolean config value '%s' for '%s'"
-msgstr "valeur booléenne de configuration invalide '%s' pour '%s'"
-
-#: config.c:1443
-#, c-format
-msgid "failed to expand user dir in: '%s'"
-msgstr "impossible d'étendre le répertoire utilisateur dans : '%s'"
-
-#: config.c:1452
-#, c-format
-msgid "'%s' for '%s' is not a valid timestamp"
-msgstr "'%s' pour '%s' n'est pas un horodatage valide"
-
-#: config.c:1545
-#, c-format
-msgid "abbrev length out of range: %d"
-msgstr "longueur d'abbrev hors plage : %d"
-
-#: config.c:1559 config.c:1570
-#, c-format
-msgid "bad zlib compression level %d"
-msgstr "niveau de compression zlib incorrect %d"
-
-#: config.c:1660
-msgid "core.commentChar should only be one character"
-msgstr "core.commentChar ne devrait être qu'un unique caractère"
-
-#: config.c:1692
-#, c-format
-msgid "ignoring unknown core.fsyncMethod value '%s'"
-msgstr "valeur inconnue '%s' de core.fsyncMethod"
-
-#: config.c:1698
-msgid "core.fsyncObjectFiles is deprecated; use core.fsync instead"
-msgstr "core.fsyncObjectFiles est obsolète ; utilisez core.fsync à la place"
-
-#: config.c:1714
-#, c-format
-msgid "invalid mode for object creation: %s"
-msgstr "mode invalide pour la création d'objet : %s"
-
-#: config.c:1800
-#, c-format
-msgid "malformed value for %s"
-msgstr "valeur mal formée pour %s"
-
-#: config.c:1826
-#, c-format
-msgid "malformed value for %s: %s"
-msgstr "valeur mal formée pour %s : %s"
-
-#: config.c:1827
-msgid "must be one of nothing, matching, simple, upstream or current"
-msgstr "doit être parmi nothing, matching, simple, upstream ou current"
-
-#: config.c:1888 builtin/pack-objects.c:4078
-#, c-format
-msgid "bad pack compression level %d"
-msgstr "niveau de compression du paquet %d"
-
-#: config.c:2014
-#, c-format
-msgid "unable to load config blob object '%s'"
-msgstr "impossible de charger l'objet blob de config '%s'"
-
-#: config.c:2017
-#, 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:2035
-#, c-format
-msgid "unable to resolve config blob '%s'"
-msgstr "impossible de résoudre le blob de config '%s'"
-
-#: config.c:2080
-#, c-format
-msgid "failed to parse %s"
-msgstr "échec de l'analyse de %s"
-
-#: config.c:2136
-msgid "unable to parse command-line config"
-msgstr "lecture de la configuration de ligne de commande impossible"
-
-#: config.c:2512
-msgid "unknown error occurred while reading the configuration files"
-msgstr "erreur inconnue pendant la lecture des fichiers de configuration"
-
-#: config.c:2686
-#, c-format
-msgid "Invalid %s: '%s'"
-msgstr "%s invalide : '%s'"
-
-#: config.c:2731
-#, 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:2763
-#, 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:2765
-#, 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:2850
-#, c-format
-msgid "invalid section name '%s'"
-msgstr "nom de section invalide '%s'"
-
-#: config.c:2882
-#, c-format
-msgid "%s has multiple values"
-msgstr "%s a des valeurs multiples"
-
-#: config.c:2911
-#, c-format
-msgid "failed to write new configuration file %s"
-msgstr "impossible d'écrire le fichier de configuration %s"
-
-#: config.c:3177 config.c:3518
-#, c-format
-msgid "could not lock config file %s"
-msgstr "impossible de verrouiller le fichier de configuration %s"
-
-#: config.c:3188
-#, c-format
-msgid "opening %s"
-msgstr "ouverture de %s"
-
-#: config.c:3225 builtin/config.c:361
-#, c-format
-msgid "invalid pattern: %s"
-msgstr "motif invalide : %s"
-
-#: config.c:3250
-#, c-format
-msgid "invalid config file %s"
-msgstr "fichier de configuration invalide %s"
-
-#: config.c:3263 config.c:3531
-#, c-format
-msgid "fstat on %s failed"
-msgstr "échec de fstat sur %s"
-
-#: config.c:3274
-#, c-format
-msgid "unable to mmap '%s'%s"
-msgstr "impossible de réaliser un mmap de '%s'%s"
-
-#: config.c:3284 config.c:3536
-#, c-format
-msgid "chmod on %s failed"
-msgstr "échec de chmod sur %s"
-
-#: config.c:3369 config.c:3633
-#, c-format
-msgid "could not write config file %s"
-msgstr "impossible d'écrire le fichier de configuration %s"
-
-#: config.c:3403
-#, c-format
-msgid "could not set '%s' to '%s'"
-msgstr "impossible de régler '%s' à '%s'"
-
-#: config.c:3405 builtin/remote.c:666 builtin/remote.c:885 builtin/remote.c:893
-#, c-format
-msgid "could not unset '%s'"
-msgstr "impossible de désinitialiser '%s'"
-
-#: config.c:3509
-#, c-format
-msgid "invalid section name: %s"
-msgstr "nom de section invalide : %s"
-
-#: config.c:3676
-#, c-format
-msgid "missing value for '%s'"
-msgstr "valeur manquante pour '%s'"
-
-#: connect.c:61
-msgid "the remote end hung up upon initial contact"
-msgstr "l'hôte distant a fermé la connexion lors du contact initial"
-
-#: connect.c:63
-msgid ""
-"Could not read from remote repository.\n"
-"\n"
-"Please make sure you have the correct access rights\n"
-"and the repository exists."
-msgstr ""
-"Impossible de lire le dépôt distant.\n"
-"\n"
-"Veuillez vérifier que vous avez les droits d'accès\n"
-"et que le dépôt existe."
-
-#: connect.c:81
-#, c-format
-msgid "server doesn't support '%s'"
-msgstr "le serveur ne supporte pas '%s'"
-
-#: connect.c:118
-#, c-format
-msgid "server doesn't support feature '%s'"
-msgstr "le serveur ne supporte pas la fonctionnalité '%s'"
-
-#: connect.c:129
-msgid "expected flush after capabilities"
-msgstr "vidage attendu après les capacités"
-
-#: 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:286
-msgid "protocol error: unexpected capabilities^{}"
-msgstr "erreur de protocole : capabilities^{} inattendu"
-
-#: 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:310
-msgid "repository on the other end cannot be shallow"
-msgstr "le dépôt distant ne peut pas être superficiel"
-
-#: connect.c:349
-msgid "invalid packet"
-msgstr "paquet invalide"
-
-#: connect.c:369
-#, c-format
-msgid "protocol error: unexpected '%s'"
-msgstr "erreur de protocole : '%s' attendu"
-
-#: 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:528
-#, c-format
-msgid "invalid ls-refs response: %s"
-msgstr "réponse à ls-ref invalide : %s"
-
-#: connect.c:532
-msgid "expected flush after ref listing"
-msgstr "vidage attendu après le listage de références"
-
-#: 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:670
-#, c-format
-msgid "protocol '%s' is not supported"
-msgstr "le protocole '%s' n'est pas supporté"
-
-#: connect.c:721
-msgid "unable to set SO_KEEPALIVE on socket"
-msgstr "impossible de positionner SO_KEEPALIVE sur la socket"
-
-#: connect.c:761 connect.c:824
-#, c-format
-msgid "Looking up %s ... "
-msgstr "Recherche de %s… "
-
-#: 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:769 connect.c:840
-#, c-format
-msgid ""
-"done.\n"
-"Connecting to %s (port %s) ... "
-msgstr ""
-"fait.\n"
-"Connexion à %s (port %s)… "
-
-#: connect.c:791 connect.c:868
-#, c-format
-msgid ""
-"unable to connect to %s:\n"
-"%s"
-msgstr ""
-"impossible de se connecter à %s :\n"
-"%s"
-
-#. TRANSLATORS: this is the end of "Connecting to %s (port %s) ... "
-#: connect.c:797 connect.c:874
-msgid "done."
-msgstr "fait."
-
-#: connect.c:828
-#, c-format
-msgid "unable to look up %s (%s)"
-msgstr "impossible de rechercher %s (%s)"
-
-#: connect.c:834
-#, c-format
-msgid "unknown port %s"
-msgstr "port inconnu %s"
-
-#: connect.c:971 connect.c:1303
-#, c-format
-msgid "strange hostname '%s' blocked"
-msgstr "nom d'hôte étrange '%s' bloqué"
-
-#: connect.c:973
-#, c-format
-msgid "strange port '%s' blocked"
-msgstr "port étrange '%s' bloqué"
-
-#: connect.c:983
-#, c-format
-msgid "cannot start proxy %s"
-msgstr "impossible de démarrer un proxy %s"
-
-#: 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: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:1251
-msgid "ssh variant 'simple' does not support -4"
-msgstr "la variante ssh 'simple' ne supporte pas -4"
-
-#: connect.c:1263
-msgid "ssh variant 'simple' does not support -6"
-msgstr "la variante ssh 'simple' ne supporte pas -6"
-
-#: 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:1392
-#, c-format
-msgid "strange pathname '%s' blocked"
-msgstr "chemin étrange '%s' bloqué"
-
-#: connect.c:1440
-msgid "unable to fork"
-msgstr "fork impossible"
-
-#: connected.c:109 builtin/fsck.c:189 builtin/prune.c:57
-msgid "Checking connectivity"
-msgstr "Vérification de la connectivité"
-
-#: connected.c:122
-msgid "Could not run 'git rev-list'"
-msgstr "Impossible de lancer 'git rev-list'"
-
-#: connected.c:146
-msgid "failed write to rev-list"
-msgstr "impossible d'écrire dans la rev-list"
-
-#: connected.c:151
-msgid "failed to close rev-list's stdin"
-msgstr "impossible de fermer l'entrée standard du rev-list"
-
-#: convert.c:183
-#, c-format
-msgid "illegal crlf_action %d"
-msgstr "crlf_action illégal %d"
-
-#: convert.c:196
-#, c-format
-msgid "CRLF would be replaced by LF in %s"
-msgstr "Les CRLF seraient remplacés par des LF dans %s"
-
-#: convert.c:198
-#, c-format
-msgid ""
-"CRLF will be replaced by LF in %s.\n"
-"The file will have its original line endings in your working directory"
-msgstr ""
-"Les CRLF seront remplacés par des LF dans %s.\n"
-"Le fichier conservera ses fins de ligne d'origine dans votre copie de travail"
-
-#: convert.c:206
-#, c-format
-msgid "LF would be replaced by CRLF in %s"
-msgstr "Les LF seraient remplacés par des CRLF dans %s"
-
-#: convert.c:208
-#, c-format
-msgid ""
-"LF will be replaced by CRLF in %s.\n"
-"The file will have its original line endings in your working directory"
-msgstr ""
-"Les LF seront remplacés par des CRLF dans %s.\n"
-"Le fichier conservera ses fins de ligne d'origine dans votre copie de travail"
-
-#: convert.c:273
-#, c-format
-msgid "BOM is prohibited in '%s' if encoded as %s"
-msgstr "Aucun BOM n'est permis dans '%s' s'il est encodé comme %s"
-
-#: convert.c:280
-#, c-format
-msgid ""
-"The file '%s' contains a byte order mark (BOM). Please use UTF-%.*s as "
-"working-tree-encoding."
-msgstr ""
-"Le fichier '%s' contient un marqueur d'ordre d'octets (BOM). Veuillez "
-"utiliser UTF-%.*s comme encodage d'arbre de travail."
-
-#: convert.c:293
-#, c-format
-msgid "BOM is required in '%s' if encoded as %s"
-msgstr "Un BOM est obligatoire dans '%s' s'il est encodé comme %s"
-
-#: 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."
-msgstr ""
-"Il manque un marqueur d'ordre d'octets (BOM) au fichier '%s'. Veuillez "
-"utiliser UTF-%sBE ou UTF-%sLE (selon l'ordre désiré) comme encodage d'arbre "
-"de travail."
-
-#: convert.c:408 convert.c:479
-#, c-format
-msgid "failed to encode '%s' from %s to %s"
-msgstr "échec de l'encodage de '%s' de %s vers %s"
-
-#: convert.c:451
-#, c-format
-msgid "encoding '%s' from %s to %s and back is not the same"
-msgstr ""
-"encoder '%s' depuis %s vers %s puis inversement ne produit pas le même "
-"contenu"
-
-#: convert.c:654
-#, c-format
-msgid "cannot fork to run external filter '%s'"
-msgstr "impossible de forker pour lancer le filtre externe '%s'"
-
-#: convert.c:674
-#, c-format
-msgid "cannot feed the input to external filter '%s'"
-msgstr "impossible de fournir l'entrée au filtre externe '%s'"
-
-#: convert.c:681
-#, c-format
-msgid "external filter '%s' failed %d"
-msgstr "le filtre externe '%s' a échoué %d"
-
-#: convert.c:716 convert.c:719
-#, c-format
-msgid "read from external filter '%s' failed"
-msgstr "la lecture depuis le filtre externe '%s' a échoué"
-
-#: convert.c:722 convert.c:777
-#, c-format
-msgid "external filter '%s' failed"
-msgstr "le filtre externe '%s' a échoué"
-
-#: convert.c:826
-msgid "unexpected filter type"
-msgstr "type de filtre inattendu"
-
-#: convert.c:837
-msgid "path name too long for external filter"
-msgstr "nom de chemin trop long pour un filtre externe"
-
-#: convert.c:935
-#, c-format
-msgid ""
-"external filter '%s' is not available anymore although not all paths have "
-"been filtered"
-msgstr ""
-"le filtre externe '%s' n'est plus disponible bien que tous les chemins "
-"n'aient pas été filtrés"
-
-#: convert.c:1236
-msgid "true/false are no valid working-tree-encodings"
-msgstr "true/false ne sont pas des encodages d'arbre de travail valides"
-
-#: convert.c:1416 convert.c:1449
-#, c-format
-msgid "%s: clean filter '%s' failed"
-msgstr "%s : le filtre clean '%s' a échoué"
-
-#: convert.c:1492
-#, c-format
-msgid "%s: smudge filter %s failed"
-msgstr "%s : le filtre smudge '%s' a échoué"
-
-#: credential.c:96
-#, c-format
-msgid "skipping credential lookup for key: credential.%s"
-msgstr ""
-"vérification des informations d'identification sautée pour la clé : "
-"credential.%s"
-
-#: credential.c:112
-msgid "refusing to work with credential missing host field"
-msgstr "refus de travailler avec un champ host manquant dans l'identification"
-
-#: credential.c:114
-msgid "refusing to work with credential missing protocol field"
-msgstr ""
-"refus de travailler avec un champ protocol manquant dans l'identification"
-
-#: credential.c:396
-#, 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:440
-#, c-format
-msgid "url has no scheme: %s"
-msgstr "l'url n'a pas de schéma : %s"
-
-#: credential.c:513
-#, c-format
-msgid "credential url cannot be parsed: %s"
-msgstr "impossible d'analyser l'url d'identification : %s"
-
-#: date.c:139
-msgid "in the future"
-msgstr "dans le futur"
-
-#: date.c:145
-#, c-format
-msgid "%<PRIuMAX> second ago"
-msgid_plural "%<PRIuMAX> seconds ago"
-msgstr[0] "il y a %<PRIuMAX> seconde"
-msgstr[1] "il y a %<PRIuMAX> secondes"
-
-#: date.c:152
-#, c-format
-msgid "%<PRIuMAX> minute ago"
-msgid_plural "%<PRIuMAX> minutes ago"
-msgstr[0] "il y a %<PRIuMAX> minute"
-msgstr[1] "il y a %<PRIuMAX> minutes"
-
-#: date.c:159
-#, c-format
-msgid "%<PRIuMAX> hour ago"
-msgid_plural "%<PRIuMAX> hours ago"
-msgstr[0] "il y a %<PRIuMAX> heure"
-msgstr[1] "il y a %<PRIuMAX> heures"
-
-#: date.c:166
-#, c-format
-msgid "%<PRIuMAX> day ago"
-msgid_plural "%<PRIuMAX> days ago"
-msgstr[0] "il y a %<PRIuMAX> jour"
-msgstr[1] "il y a %<PRIuMAX> jours"
-
-#: date.c:172
-#, c-format
-msgid "%<PRIuMAX> week ago"
-msgid_plural "%<PRIuMAX> weeks ago"
-msgstr[0] "il y a %<PRIuMAX> semaine"
-msgstr[1] "il y a %<PRIuMAX> semaines"
-
-#: date.c:179
-#, c-format
-msgid "%<PRIuMAX> month ago"
-msgid_plural "%<PRIuMAX> months ago"
-msgstr[0] "il y a %<PRIuMAX> mois"
-msgstr[1] "il y a %<PRIuMAX> mois"
-
-#: date.c:190
-#, c-format
-msgid "%<PRIuMAX> year"
-msgid_plural "%<PRIuMAX> years"
-msgstr[0] "%<PRIuMAX> an"
-msgstr[1] "%<PRIuMAX> ans"
-
-#. TRANSLATORS: "%s" is "<n> years"
-#: date.c:193
-#, c-format
-msgid "%s, %<PRIuMAX> month ago"
-msgid_plural "%s, %<PRIuMAX> months ago"
-msgstr[0] "il y a %s et %<PRIuMAX> mois"
-msgstr[1] "il y a %s et %<PRIuMAX> mois"
-
-#: date.c:198 date.c:203
-#, c-format
-msgid "%<PRIuMAX> year ago"
-msgid_plural "%<PRIuMAX> years ago"
-msgstr[0] "il y a %<PRIuMAX> an"
-msgstr[1] "il y a %<PRIuMAX> ans"
-
-#: delta-islands.c:272
-msgid "Propagating island marks"
-msgstr "Propagation des marques d'îlots"
-
-#: delta-islands.c:290
-#, c-format
-msgid "bad tree object %s"
-msgstr "objet arbre invalide %s"
-
-#: delta-islands.c:334
-#, c-format
-msgid "failed to load island regex for '%s': %s"
-msgstr "impossible de charger la regex île pour '%s' : %s"
-
-#: delta-islands.c:390
-#, c-format
-msgid "island regex from config has too many capture groups (max=%d)"
-msgstr ""
-"l'expression rationnelle depuis la configuration a trop de groupes de "
-"capture (max=%d)"
-
-#: delta-islands.c:467
-#, c-format
-msgid "Marked %d islands, done.\n"
-msgstr "Marquage de %d îlots, fait.\n"
-
-#: diff-merges.c:81 gpg-interface.c:719 gpg-interface.c:734 ls-refs.c:37
-#: parallel-checkout.c:42 sequencer.c:2805 setup.c:563 builtin/am.c:203
-#: builtin/am.c:2243 builtin/am.c:2287 builtin/blame.c:724 builtin/blame.c:742
-#: builtin/fetch.c:792 builtin/pack-objects.c:3515 builtin/pull.c:45
-#: builtin/pull.c:47 builtin/pull.c:321
-#, c-format
-msgid "invalid value for '%s': '%s'"
-msgstr "valeur invalide pour '%s' : '%s'"
-
-#: diff-lib.c:561
-msgid "--merge-base does not work with ranges"
-msgstr "--merge-base ne fonctionne pas avec des plages"
-
-#: diff-lib.c:563
-msgid "--merge-base only works with commits"
-msgstr "--merge-base ne fonctionne qu'avec des commits"
-
-#: diff-lib.c:580
-msgid "unable to get HEAD"
-msgstr "impossible d'acquérir HEAD"
-
-#: diff-lib.c:587
-msgid "no merge base found"
-msgstr "aucune base de fusion trouvée"
-
-#: diff-lib.c:589
-msgid "multiple merge bases found"
-msgstr "bases multiples de fusion trouvées"
-
-#: diff-no-index.c:237
-msgid "git diff --no-index [<options>] <path> <path>"
-msgstr "git diff --no-index [<options>] <chemin> <chemin>"
-
-#: diff-no-index.c:262
-msgid ""
-"Not a git repository. Use --no-index to compare two paths outside a working "
-"tree"
-msgstr ""
-"Pas un dépôt git. Utilisez --no-index pour comparer deux chemins hors d'un "
-"arbre de travail"
-
-#: diff.c:159
-#, 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:164
-#, c-format
-msgid "  Unknown dirstat parameter '%s'\n"
-msgstr "  Paramètre dirstat inconnu '%s'\n"
-
-#: diff.c:300
-msgid ""
-"color moved setting must be one of 'no', 'default', 'blocks', 'zebra', "
-"'dimmed-zebra', 'plain'"
-msgstr ""
-"le paramètre de couleur de déplacement doit être parmi 'no', 'default', "
-"'blocks', 'zebra', 'dimmed-zebra' ou 'plain'"
-
-#: diff.c:328
-#, 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 ""
-"mode unknown color-moved-ws inconnu '%s', les valeurs possibles sont 'ignore-"
-"space-change', 'ignore-space-at-eol', 'ignore-all-space', 'allow-indentation-"
-"change'"
-
-#: diff.c:336
-msgid ""
-"color-moved-ws: allow-indentation-change cannot be combined with other "
-"whitespace modes"
-msgstr ""
-"color-moved-ws : allow-indentation-change ne peut pas être combiné avec "
-"d'autres modes d'espace"
-
-#: diff.c:413
-#, c-format
-msgid "Unknown value for 'diff.submodule' config variable: '%s'"
-msgstr ""
-"Valeur inconnue pour la variable de configuration 'diff.submodule' : '%s'"
-
-#: diff.c:473
-#, c-format
-msgid ""
-"Found errors in 'diff.dirstat' config variable:\n"
-"%s"
-msgstr ""
-"Erreurs dans la variable de configuration 'diff.dirstat' :\n"
-"%s"
-
-#: diff.c:4282
-#, c-format
-msgid "external diff died, stopping at %s"
-msgstr "l'application de diff externe a disparu, arrêt à %s"
-
-#: diff.c:4677 parse-options.c:1114
-#, c-format
-msgid "options '%s', '%s', '%s', and '%s' cannot be used together"
-msgstr ""
-"les options '%s', '%s', '%s' et '%s' ne peuvent pas être utilisées ensemble"
-
-#: diff.c:4681 parse-options.c:1118 builtin/worktree.c:578
-#, c-format
-msgid "options '%s', '%s', and '%s' cannot be used together"
-msgstr "les options '%s', '%s' et '%s' ne peuvent pas être utilisées ensemble"
-
-#: diff.c:4685
-#, c-format
-msgid "options '%s' and '%s' cannot be used together, use '%s' with '%s'"
-msgstr ""
-"les options '%s' et '%s' ne peuvent pas être utilisées ensemble, utilisez "
-"'%s' avec '%s'"
-
-#: diff.c:4689
-#, c-format
-msgid ""
-"options '%s' and '%s' cannot be used together, use '%s' with '%s' and '%s'"
-msgstr ""
-"les options '%s' et '%s' ne peuvent pas être utilisées ensemble, utilisez "
-"'%s' avec '%s' et '%s'"
-
-#: diff.c:4769
-msgid "--follow requires exactly one pathspec"
-msgstr "--follow a besoin d'une spécification de chemin unique"
-
-#: diff.c:4823
-#, c-format
-msgid "invalid --stat value: %s"
-msgstr "valeur invalide de --stat : %s"
-
-#: diff.c:4828 diff.c:4833 diff.c:4838 diff.c:4843 diff.c:5319
-#: 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:4860
-#, c-format
-msgid ""
-"Failed to parse --dirstat/-X option parameter:\n"
-"%s"
-msgstr ""
-"Impossible d'analyser le paramètre de l'option --dirstat/-X :\n"
-"%s"
-
-#: diff.c:4893
-#, c-format
-msgid "unknown change class '%c' in --diff-filter=%s"
-msgstr "classe de modification inconnue '%c' dans --diff-filter=%s"
-
-#: diff.c:4917
-#, c-format
-msgid "unknown value after ws-error-highlight=%.*s"
-msgstr "valeur inconnue après ws-error-highlight=%.*s"
-
-#: diff.c:4931
-#, c-format
-msgid "unable to resolve '%s'"
-msgstr "impossible de résoudre '%s'"
-
-#: diff.c:4981 diff.c:4987
-#, c-format
-msgid "%s expects <n>/<m> form"
-msgstr "forme <n>/<m> attendue par %s"
-
-#: diff.c:4999
-#, c-format
-msgid "%s expects a character, got '%s'"
-msgstr "caractère attendu par %s, '%s' trouvé"
-
-#: diff.c:5020
-#, c-format
-msgid "bad --color-moved argument: %s"
-msgstr "mauvais argument --color-moved : %s"
-
-#: diff.c:5039
-#, c-format
-msgid "invalid mode '%s' in --color-moved-ws"
-msgstr "mode invalide '%s' dans --color-moved-ws"
-
-#: diff.c:5079
-msgid ""
-"option diff-algorithm accepts \"myers\", \"minimal\", \"patience\" and "
-"\"histogram\""
-msgstr ""
-"l'option diff-algorithm accept \"myers\", \"minimal\", \"patience\" et "
-"\"histogram\""
-
-#: diff.c:5115 diff.c:5135
-#, c-format
-msgid "invalid argument to %s"
-msgstr "argument invalide pour %s"
-
-#: diff.c:5239
-#, c-format
-msgid "invalid regex given to -I: '%s'"
-msgstr "regex invalide fournie à -I : '%s'"
-
-#: diff.c:5288
-#, 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:5344
-#, c-format
-msgid "bad --word-diff argument: %s"
-msgstr "mauvais argument pour --word-diff : %s"
-
-#: diff.c:5380
-msgid "Diff output format options"
-msgstr "Options de format de sortie de diff"
-
-#: diff.c:5382 diff.c:5388
-msgid "generate patch"
-msgstr "générer la rustine"
-
-#: diff.c:5385 builtin/log.c:180
-msgid "suppress diff output"
-msgstr "supprimer la sortie des différences"
-
-#: diff.c:5390 diff.c:5504 diff.c:5511
-msgid "<n>"
-msgstr "<n>"
-
-#: diff.c:5391 diff.c:5394
-msgid "generate diffs with <n> lines context"
-msgstr "générer les diffs avec <n> lignes de contexte"
-
-#: diff.c:5396
-msgid "generate the diff in raw format"
-msgstr "générer le diff en format brut"
-
-#: diff.c:5399
-msgid "synonym for '-p --raw'"
-msgstr "synonyme de '-p --raw'"
-
-#: diff.c:5403
-msgid "synonym for '-p --stat'"
-msgstr "synonyme de '-p --stat'"
-
-#: diff.c:5407
-msgid "machine friendly --stat"
-msgstr "--stat pour traitement automatique"
-
-#: diff.c:5410
-msgid "output only the last line of --stat"
-msgstr "afficher seulement la dernière ligne de --stat"
-
-#: diff.c:5412 diff.c:5420
-msgid "<param1,param2>..."
-msgstr "<param1,param2>..."
-
-#: diff.c:5413
-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:5417
-msgid "synonym for --dirstat=cumulative"
-msgstr "synonyme pour --dirstat=cumulative"
-
-#: diff.c:5421
-msgid "synonym for --dirstat=files,param1,param2..."
-msgstr "synonyme pour --dirstat=files,param1,param2..."
-
-#: diff.c:5425
-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:5428
-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:5431
-msgid "show only names of changed files"
-msgstr "n'afficher que les noms de fichiers modifiés"
-
-#: diff.c:5434
-msgid "show only names and status of changed files"
-msgstr "n'afficher que les noms et les status des fichiers modifiés"
-
-#: diff.c:5436
-msgid "<width>[,<name-width>[,<count>]]"
-msgstr "<largeur>[,<largeur-de-nom>[,<compte>]]"
-
-#: diff.c:5437
-msgid "generate diffstat"
-msgstr "générer un diffstat"
-
-#: diff.c:5439 diff.c:5442 diff.c:5445
-msgid "<width>"
-msgstr "<largeur>"
-
-#: diff.c:5440
-msgid "generate diffstat with a given width"
-msgstr "générer un diffstat avec la largeur indiquée"
-
-#: diff.c:5443
-msgid "generate diffstat with a given name width"
-msgstr "génerer un diffstat avec la largeur de nom indiquée"
-
-#: diff.c:5446
-msgid "generate diffstat with a given graph width"
-msgstr "génerer un diffstat avec la largeur de graphe indiquée"
-
-#: diff.c:5448
-msgid "<count>"
-msgstr "<compte>"
-
-#: diff.c:5449
-msgid "generate diffstat with limited lines"
-msgstr "générer un diffstat avec des lignes limitées"
-
-#: diff.c:5452
-msgid "generate compact summary in diffstat"
-msgstr "générer une résumé compact dans le diffstat"
-
-#: diff.c:5455
-msgid "output a binary diff that can be applied"
-msgstr "produire un diff binaire qui peut être appliqué"
-
-#: diff.c:5458
-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:5460
-msgid "show colored diff"
-msgstr "afficher un diff coloré"
-
-#: diff.c:5461
-msgid "<kind>"
-msgstr "<sorte>"
-
-#: diff.c:5462
-msgid ""
-"highlight whitespace errors in the 'context', 'old' or 'new' lines in the "
-"diff"
-msgstr ""
-"surligner les erreurs d'espace dans les lignes 'contexte', 'ancien', "
-"'nouveau' dans le diff"
-
-#: diff.c:5465
-msgid ""
-"do not munge pathnames and use NULs as output field terminators in --raw or "
-"--numstat"
-msgstr ""
-"ne pas compresser les chemins et utiliser des NULs comme terminateurs de "
-"champs dans --raw ou --numstat"
-
-#: diff.c:5468 diff.c:5471 diff.c:5474 diff.c:5583
-msgid "<prefix>"
-msgstr "<préfixe>"
-
-#: diff.c:5469
-msgid "show the given source prefix instead of \"a/\""
-msgstr "afficher le préfixe de source indiqué au lieu de \"a/\""
-
-#: diff.c:5472
-msgid "show the given destination prefix instead of \"b/\""
-msgstr "afficher le préfixe de destination indiqué au lieu de \"b/\""
-
-#: diff.c:5475
-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:5478
-msgid "do not show any source or destination prefix"
-msgstr "n'afficher aucun préfixe, ni de source, ni de destination"
-
-#: diff.c:5481
-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:5485 diff.c:5490 diff.c:5495
-msgid "<char>"
-msgstr "<caractère>"
-
-#: diff.c:5486
-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:5491
-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:5496
-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:5499
-msgid "Diff rename options"
-msgstr "Options de renommage de diff"
-
-#: diff.c:5500
-msgid "<n>[/<m>]"
-msgstr "<n>[/<m>]"
-
-#: diff.c:5501
-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:5505
-msgid "detect renames"
-msgstr "détecter les renommages"
-
-#: diff.c:5509
-msgid "omit the preimage for deletes"
-msgstr "supprimer la pré-image pour les suppressions"
-
-#: diff.c:5512
-msgid "detect copies"
-msgstr "détecter les copies"
-
-#: diff.c:5516
-msgid "use unmodified files as source to find copies"
-msgstr ""
-"utiliser les fichiers non-modifiés comme sources pour trouver des copies"
-
-#: diff.c:5518
-msgid "disable rename detection"
-msgstr "désactiver la détection de renommage"
-
-#: diff.c:5521
-msgid "use empty blobs as rename source"
-msgstr "utiliser des blobs vides comme source de renommage"
-
-#: diff.c:5523
-msgid "continue listing the history of a file beyond renames"
-msgstr "continuer à afficher l'historique d'un fichier au delà des renommages"
-
-#: diff.c:5526
-msgid ""
-"prevent rename/copy detection if the number of rename/copy targets exceeds "
-"given limit"
-msgstr ""
-"empêcher la détection de renommage/copie si le nombre de cibles de renommage/"
-"copie excède la limite indiquée"
-
-#: diff.c:5528
-msgid "Diff algorithm options"
-msgstr "Options de l'algorithme de diff"
-
-#: diff.c:5530
-msgid "produce the smallest possible diff"
-msgstr "produire le diff le plus petit possible"
-
-#: diff.c:5533
-msgid "ignore whitespace when comparing lines"
-msgstr "ignorer les espaces lors de la comparaison de ligne"
-
-#: diff.c:5536
-msgid "ignore changes in amount of whitespace"
-msgstr "ignorer des modifications du nombre d'espaces"
-
-#: diff.c:5539
-msgid "ignore changes in whitespace at EOL"
-msgstr "ignorer des modifications d'espace en fin de ligne"
-
-#: diff.c:5542
-msgid "ignore carrier-return at the end of line"
-msgstr "ignore le retour chariot en fin de ligne"
-
-#: diff.c:5545
-msgid "ignore changes whose lines are all blank"
-msgstr "ignorer les modifications dont les lignes sont vides"
-
-#: diff.c:5547 diff.c:5569 diff.c:5572 diff.c:5617
-msgid "<regex>"
-msgstr "<regex>"
-
-#: diff.c:5548
-msgid "ignore changes whose all lines match <regex>"
-msgstr "ignorer les modifications dont les lignes correspondent à <regex>"
-
-#: diff.c:5551
-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:5554
-msgid "generate diff using the \"patience diff\" algorithm"
-msgstr "générer un diff en utilisant l'algorithme de différence \"patience\""
-
-#: diff.c:5558
-msgid "generate diff using the \"histogram diff\" algorithm"
-msgstr ""
-"générer un diff en utilisant l'algorithme de différence \"histogramme\""
-
-#: diff.c:5560
-msgid "<algorithm>"
-msgstr "<algorithme>"
-
-#: diff.c:5561
-msgid "choose a diff algorithm"
-msgstr "choisir un algorithme de différence"
-
-#: diff.c:5563
-msgid "<text>"
-msgstr "<texte>"
-
-#: diff.c:5564
-msgid "generate diff using the \"anchored diff\" algorithm"
-msgstr "générer un diff en utilisant l'algorithme de différence \"ancré\""
-
-#: diff.c:5566 diff.c:5575 diff.c:5578
-msgid "<mode>"
-msgstr "<mode>"
-
-#: diff.c:5567
-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:5570
-msgid "use <regex> to decide what a word is"
-msgstr "utiliser <regex> pour décider ce qu'est un mot"
-
-#: diff.c:5573
-msgid "equivalent to --word-diff=color --word-diff-regex=<regex>"
-msgstr "équivalent à --word-diff=color --word-diff-regex=<regex>"
-
-#: diff.c:5576
-msgid "moved lines of code are colored differently"
-msgstr "les lignes déplacées sont colorées différemment"
-
-#: diff.c:5579
-msgid "how white spaces are ignored in --color-moved"
-msgstr "comment les espaces sont ignorés dans --color-moved"
-
-#: diff.c:5582
-msgid "Other diff options"
-msgstr "Autres options diff"
-
-#: diff.c:5584
-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:5588
-msgid "treat all files as text"
-msgstr "traiter les fichiers comme texte"
-
-#: diff.c:5590
-msgid "swap two inputs, reverse the diff"
-msgstr "échanger les entrées, inverser le diff"
-
-#: diff.c:5592
-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:5594
-msgid "disable all output of the program"
-msgstr "désactiver tous les affichages du programme"
-
-#: diff.c:5596
-msgid "allow an external diff helper to be executed"
-msgstr "autoriser l'exécution d'un assistant externe de diff"
-
-#: diff.c:5598
-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:5600
-msgid "<when>"
-msgstr "<quand>"
-
-#: diff.c:5601
-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:5604
-msgid "<format>"
-msgstr "<format>"
-
-#: diff.c:5605
-msgid "specify how differences in submodules are shown"
-msgstr "spécifier comment les différences dans les sous-modules sont affichées"
-
-#: diff.c:5609
-msgid "hide 'git add -N' entries from the index"
-msgstr "masquer les entrées 'git add -N' de l'index"
-
-#: diff.c:5612
-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:5614
-msgid "<string>"
-msgstr "<chaîne>"
-
-#: diff.c:5615
-msgid ""
-"look for differences that change the number of occurrences of the specified "
-"string"
-msgstr ""
-"rechercher les différences qui modifient le nombre d'occurrences de la "
-"chaîne spécifiée"
-
-#: diff.c:5618
-msgid ""
-"look for differences that change the number of occurrences of the specified "
-"regex"
-msgstr ""
-"rechercher les différences qui modifient le nombre d'occurrences de la regex "
-"spécifiée"
-
-#: diff.c:5621
-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:5624
-msgid "treat <string> in -S as extended POSIX regular expression"
-msgstr ""
-"traiter <chaîne> dans -S comme une expression rationnelle POSIX étendue"
-
-#: diff.c:5627
-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:5628 diff.c:5631
-msgid "<path>"
-msgstr "<chemin>"
-
-#: diff.c:5629
-msgid "show the change in the specified path first"
-msgstr "afficher la modification dans le chemin spécifié en premier"
-
-#: diff.c:5632
-msgid "skip the output to the specified path"
-msgstr "sauter la sortie pour le chemin spécifié"
-
-#: diff.c:5634
-msgid "<object-id>"
-msgstr "<id-objet>"
-
-#: diff.c:5635
-msgid ""
-"look for differences that change the number of occurrences of the specified "
-"object"
-msgstr ""
-"rechercher les différences qui modifient le nombre d'occurrences de l'objet "
-"indiqué"
-
-#: diff.c:5637
-msgid "[(A|C|D|M|R|T|U|X|B)...[*]]"
-msgstr "[(A|C|D|M|R|T|U|X|B)...[*]]"
-
-#: diff.c:5638
-msgid "select files by diff type"
-msgstr "sélectionner les fichiers par types de diff"
-
-#: diff.c:5640
-msgid "<file>"
-msgstr "<fichier>"
-
-#: diff.c:5641
-msgid "output to a specific file"
-msgstr "sortie vers un fichier spécifique"
-
-#: diff.c:6321
-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:6324
-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:6327
-#, c-format
-msgid ""
-"you may want to set your %s variable to at least %d and retry the command."
-msgstr ""
-"vous souhaitez peut-être régler la variable %s à au moins %d et réessayer le "
-"commande."
-
-#: diffcore-order.c:24
-#, c-format
-msgid "failed to read orderfile '%s'"
-msgstr "impossible de lire le fichier de commande '%s'"
-
-#: diffcore-rename.c:1564
-msgid "Performing inexact rename detection"
-msgstr "Détection de renommage inexact en cours"
-
-#: diffcore-rotate.c:29
-#, c-format
-msgid "No such path '%s' in the diff"
-msgstr "Pas de chemin '%s' dans la diff"
-
-#: dir.c:593
-#, c-format
-msgid "pathspec '%s' did not match any file(s) known to git"
-msgstr ""
-"le spécificateur de chemin '%s' ne correspond à aucun fichier connu de git"
-
-#: dir.c:733 dir.c:762 dir.c:775
-#, c-format
-msgid "unrecognized pattern: '%s'"
-msgstr "motif non reconnu : '%s'"
-
-#: dir.c:790 dir.c:804
-#, c-format
-msgid "unrecognized negative pattern: '%s'"
-msgstr "motif négatif non reconnu : '%s'"
-
-#: dir.c:820
-#, c-format
-msgid "your sparse-checkout file may have issues: pattern '%s' is repeated"
-msgstr ""
-"votre fichier d'extraction partielle pourrait présenter des problèmes : le "
-"motif '%s' est répété"
-
-#: dir.c:828
-msgid "disabling cone pattern matching"
-msgstr "désactivation de la correspondance de motif de cone"
-
-#: dir.c:1212
-#, c-format
-msgid "cannot use %s as an exclude file"
-msgstr "impossible d'utiliser %s comme fichier d'exclusion"
-
-#: dir.c:2419
-#, c-format
-msgid "could not open directory '%s'"
-msgstr "impossible d'ouvrir le répertoire '%s'"
-
-#: dir.c:2721
-msgid "failed to get kernel name and information"
-msgstr "echec de l'obtention d'information de kernel"
-
-#: dir.c:2846
-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:3119
-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:3807
-#, c-format
-msgid "index file corrupt in repo %s"
-msgstr "fichier d'index corrompu dans le dépôt %s"
-
-#: dir.c:3854 dir.c:3859
-#, c-format
-msgid "could not create directories for %s"
-msgstr "impossible de créer les répertoires pour %s"
-
-#: dir.c:3888
-#, 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
-#, 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:179
-msgid "Filtering content"
-msgstr "Filtrage du contenu"
-
-#: entry.c:500
-#, c-format
-msgid "could not stat file '%s'"
-msgstr "impossible de stat le fichier '%s'"
-
-#: environment.c:147
-#, c-format
-msgid "bad git namespace path \"%s\""
-msgstr "espaces de nom de Git \"%s\""
-
-#: exec-cmd.c:363
-#, c-format
-msgid "too many args to run %s"
-msgstr "trop d'arguments pour lancer %s"
-
-#: fetch-pack.c:194
-msgid "git fetch-pack: expected shallow list"
-msgstr "git fetch-pack : liste superficielle attendue"
-
-#: fetch-pack.c:197
-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:208
-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:228
-#, c-format
-msgid "git fetch-pack: expected ACK/NAK, got '%s'"
-msgstr "git fetch-pack : ACK/NACK attendu, '%s' reçu"
-
-#: fetch-pack.c:239
-msgid "unable to write to remote"
-msgstr "impossible d'écrire sur un distant"
-
-#: fetch-pack.c:397 fetch-pack.c:1460
-#, c-format
-msgid "invalid shallow line: %s"
-msgstr "ligne de superficiel invalide : %s"
-
-#: fetch-pack.c:403 fetch-pack.c:1466
-#, c-format
-msgid "invalid unshallow line: %s"
-msgstr "ligne de fin de superficiel invalide : %s"
-
-#: fetch-pack.c:405 fetch-pack.c:1468
-#, c-format
-msgid "object not found: %s"
-msgstr "objet non trouvé : %s"
-
-#: fetch-pack.c:408 fetch-pack.c:1471
-#, c-format
-msgid "error in object: %s"
-msgstr "erreur dans l'objet : %s"
-
-#: fetch-pack.c:410 fetch-pack.c:1473
-#, c-format
-msgid "no shallow found: %s"
-msgstr "pas de superficiel trouvé : %s"
-
-#: fetch-pack.c:413 fetch-pack.c:1477
-#, c-format
-msgid "expected shallow/unshallow, got %s"
-msgstr "superficiel/non superficiel attendu, %s trouvé"
-
-#: fetch-pack.c:453
-#, c-format
-msgid "got %s %d %s"
-msgstr "réponse %s %d %s"
-
-#: fetch-pack.c:470
-#, c-format
-msgid "invalid commit %s"
-msgstr "commit invalide %s"
-
-#: fetch-pack.c:501
-msgid "giving up"
-msgstr "abandon"
-
-#: fetch-pack.c:514 progress.h:25
-msgid "done"
-msgstr "fait"
-
-#: fetch-pack.c:526
-#, c-format
-msgid "got %s (%d) %s"
-msgstr "%s trouvé (%d) %s"
-
-#: fetch-pack.c:562
-#, c-format
-msgid "Marking %s as complete"
-msgstr "Marquage de %s comme terminé"
-
-#: fetch-pack.c:784
-#, c-format
-msgid "already have %s (%s)"
-msgstr "%s déjà possédé (%s)"
-
-#: fetch-pack.c:870
-msgid "fetch-pack: unable to fork off sideband demultiplexer"
-msgstr "fetch-pack : impossible de dupliquer le démultiplexeur latéral"
-
-#: fetch-pack.c:878
-msgid "protocol error: bad pack header"
-msgstr "erreur de protocole : mauvais entête de paquet"
-
-#: fetch-pack.c:974
-#, c-format
-msgid "fetch-pack: unable to fork off %s"
-msgstr "fetch-pack : impossible de dupliquer %s"
-
-#: fetch-pack.c:980
-msgid "fetch-pack: invalid index-pack output"
-msgstr "fetch-pack : sortie d'index de pack invalide"
-
-#: fetch-pack.c:997
-#, c-format
-msgid "%s failed"
-msgstr "échec de %s"
-
-#: fetch-pack.c:999
-msgid "error in sideband demultiplexer"
-msgstr "erreur dans le démultiplexer latéral"
-
-#: fetch-pack.c:1048
-#, c-format
-msgid "Server version is %.*s"
-msgstr "La version du serveur est %.*s"
-
-#: fetch-pack.c:1056 fetch-pack.c:1062 fetch-pack.c:1065 fetch-pack.c:1071
-#: fetch-pack.c:1075 fetch-pack.c:1079 fetch-pack.c:1083 fetch-pack.c:1087
-#: fetch-pack.c:1091 fetch-pack.c:1095 fetch-pack.c:1099 fetch-pack.c:1103
-#: fetch-pack.c:1109 fetch-pack.c:1115 fetch-pack.c:1120 fetch-pack.c:1125
-#, c-format
-msgid "Server supports %s"
-msgstr "Le serveur supporte %s"
-
-#: fetch-pack.c:1058
-msgid "Server does not support shallow clients"
-msgstr "Le serveur ne supporte les clients superficiels"
-
-#: fetch-pack.c:1118
-msgid "Server does not support --shallow-since"
-msgstr "Le receveur ne gère pas --shallow-since"
-
-#: fetch-pack.c:1123
-msgid "Server does not support --shallow-exclude"
-msgstr "Le receveur ne gère pas --shallow-exclude"
-
-#: fetch-pack.c:1127
-msgid "Server does not support --deepen"
-msgstr "Le receveur ne gère pas --deepen"
-
-#: fetch-pack.c:1129
-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:1142
-msgid "no common commits"
-msgstr "pas de commit commun"
-
-#: fetch-pack.c:1151 fetch-pack.c:1506 builtin/clone.c:1166
-msgid "source repository is shallow, reject to clone."
-msgstr "le dépôt source est superficiel, clonage rejeté."
-
-#: fetch-pack.c:1157 fetch-pack.c:1705
-msgid "git fetch-pack: fetch failed."
-msgstr "git fetch-pack : échec de le récupération."
-
-#: fetch-pack.c:1271
-#, c-format
-msgid "mismatched algorithms: client %s; server %s"
-msgstr "non-correspondance des algorithmes : client %s ; serveur %s"
-
-#: fetch-pack.c:1275
-#, c-format
-msgid "the server does not support algorithm '%s'"
-msgstr "le serveur ne supporte pas l'algorithme '%s'"
-
-#: fetch-pack.c:1308
-msgid "Server does not support shallow requests"
-msgstr "Le serveur ne supporte pas les requêtes superficielles"
-
-#: fetch-pack.c:1315
-msgid "Server supports filter"
-msgstr "Le serveur supporte filter"
-
-#: fetch-pack.c:1358 fetch-pack.c:2087
-msgid "unable to write request to remote"
-msgstr "impossible d'écrire la requête sur le distant"
-
-#: fetch-pack.c:1376
-#, c-format
-msgid "error reading section header '%s'"
-msgstr "erreur à la lecture de l'entête de section '%s'"
-
-#: fetch-pack.c:1382
-#, c-format
-msgid "expected '%s', received '%s'"
-msgstr "'%s' attendu, '%s' reçu"
-
-#: fetch-pack.c:1416
-#, c-format
-msgid "unexpected acknowledgment line: '%s'"
-msgstr "ligne d'acquittement inattendue : '%s'"
-
-#: fetch-pack.c:1421
-#, c-format
-msgid "error processing acks: %d"
-msgstr "erreur lors du traitement des acquittements : %d"
-
-#. TRANSLATORS: The parameter will be 'ready', a protocol
-#. keyword.
-#.
-#: fetch-pack.c:1435
-#, c-format
-msgid "expected packfile to be sent after '%s'"
-msgstr "fichier paquet attendu à envoyer après '%s'"
-
-#. TRANSLATORS: The parameter will be 'ready', a protocol
-#. keyword.
-#.
-#: fetch-pack.c:1441
-#, c-format
-msgid "expected no other sections to be sent after no '%s'"
-msgstr "aucune autre section attendue à envoyer après absence de '%s'"
-
-#: fetch-pack.c:1482
-#, c-format
-msgid "error processing shallow info: %d"
-msgstr "erreur lors du traitement de l'information de superficialité : %d"
-
-#: fetch-pack.c:1531
-#, c-format
-msgid "expected wanted-ref, got '%s'"
-msgstr "wanted-ref attendu, '%s' trouvé"
-
-#: fetch-pack.c:1536
-#, c-format
-msgid "unexpected wanted-ref: '%s'"
-msgstr "wanted-ref inattendu : '%s'"
-
-#: fetch-pack.c:1541
-#, c-format
-msgid "error processing wanted refs: %d"
-msgstr "erreur lors du traitement des références voulues : %d"
-
-#: fetch-pack.c:1571
-msgid "git fetch-pack: expected response end packet"
-msgstr "git fetch-pack : paquet de fin de réponse attendu"
-
-#: fetch-pack.c:1983
-msgid "no matching remote head"
-msgstr "pas de HEAD distante correspondante"
-
-#: fetch-pack.c:2006 builtin/clone.c:587
-msgid "remote did not send all necessary objects"
-msgstr "le serveur distant n'a pas envoyé tous les objets nécessaires"
-
-#: fetch-pack.c:2109
-msgid "unexpected 'ready' from remote"
-msgstr "'ready' inattendu depuis le distant"
-
-#: fetch-pack.c:2132
-#, c-format
-msgid "no such remote ref %s"
-msgstr "référence distante inconnue %s"
-
-#: fetch-pack.c:2135
-#, 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é"
-
-#: fsmonitor-ipc.c:119
-#, c-format
-msgid "fsmonitor_ipc__send_query: invalid path '%s'"
-msgstr "fsmonitor_ipc__send_query : chemin invalide '%s'"
-
-#: fsmonitor-ipc.c:125
-#, c-format
-msgid "fsmonitor_ipc__send_query: unspecified error on '%s'"
-msgstr "fsmonitor_ipc__send_query : erreur non spécifiée sur '%s'"
-
-#: fsmonitor-ipc.c:155
-msgid "fsmonitor--daemon is not running"
-msgstr "fsmonitor--daemon n'est pas en cours d'exécution"
-
-#: fsmonitor-ipc.c:164
-#, c-format
-msgid "could not send '%s' command to fsmonitor--daemon"
-msgstr "impossible de lancer la commmand '%s' à fsmonitor--daemon"
-
-#: gpg-interface.c:329 gpg-interface.c:456 gpg-interface.c:995
-#: gpg-interface.c:1011
-msgid "could not create temporary file"
-msgstr "impossible de créer un fichier temporaire"
-
-#: gpg-interface.c:332 gpg-interface.c:459
-#, c-format
-msgid "failed writing detached signature to '%s'"
-msgstr "impossible d'écrire la signature détachée dans '%s'"
-
-#: gpg-interface.c:450
-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:479
-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:550
-#, 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:638
-#, c-format
-msgid "bad/incompatible signature '%s'"
-msgstr "signature incompatible ou mauvaise '%s'"
-
-#: gpg-interface.c:815 gpg-interface.c:820
-#, 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:843
-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:865
-#, 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:871
-#, c-format
-msgid "gpg.ssh.defaultKeyCommand failed: %s %s"
-msgstr "gpg.ssh.defaultKeyCommand a échoué : %s %s"
-
-#: gpg-interface.c:966
-msgid "gpg failed to sign the data"
-msgstr "gpg n'a pas pu signer les données"
-
-#: gpg-interface.c:988
-msgid "user.signingkey needs to be set for ssh signing"
-msgstr "user.signingkey doit être configuré pour pour signer avec ssh"
-
-#: gpg-interface.c:999
-#, c-format
-msgid "failed writing ssh signing key to '%s'"
-msgstr "impossible d'écrire la clé de signature ssh dans '%s'"
-
-#: gpg-interface.c:1017
-#, 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:1035
-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:1047
-#, 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:446
-msgid ""
-"given pattern contains NULL byte (via -f <file>). This is only supported "
-"with -P under PCRE v2"
-msgstr ""
-"le motif fourni contient des octets NUL (via -f <fichier>). Ce n'est "
-"supporté qu'avec -P avec PCRE v2"
-
-#: grep.c:1859
-#, c-format
-msgid "'%s': unable to read %s"
-msgstr "'%s' : lecture de %s impossible"
-
-#: grep.c:1876 setup.c:178 builtin/clone.c:308 builtin/diff.c:90
-#: builtin/rm.c:136
-#, c-format
-msgid "failed to stat '%s'"
-msgstr "échec du stat de '%s'"
-
-#: grep.c:1887
-#, c-format
-msgid "'%s': short read"
-msgstr "'%s' : lecture tronquée"
-
-#: help.c:25
-msgid "start a working area (see also: git help tutorial)"
-msgstr "démarrer une zone de travail (voir aussi : git help tutorial)"
-
-#: help.c:26
-msgid "work on the current change (see also: git help everyday)"
-msgstr ""
-"travailler sur la modification actuelle (voir aussi : git help revisions)"
-
-#: help.c:27
-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:28
-msgid "grow, mark and tweak your common history"
-msgstr "agrandir, marquer et modifier votre historique"
-
-#: help.c:29
-msgid "collaborate (see also: git help workflows)"
-msgstr "collaborer (voir aussi : git help workflows)"
-
-#: help.c:33
-msgid "Main Porcelain Commands"
-msgstr "Commandes Porcelaine Principales"
-
-#: help.c:34
-msgid "Ancillary Commands / Manipulators"
-msgstr "Commandes Auxiliaires / Manipulateurs"
-
-#: help.c:35
-msgid "Ancillary Commands / Interrogators"
-msgstr "Commandes Auxiliaires / Interrogateurs"
-
-#: help.c:36
-msgid "Interacting with Others"
-msgstr "Interaction avec d'autres développeurs"
-
-#: help.c:37
-msgid "Low-level Commands / Manipulators"
-msgstr "Commandes bas-niveau / Manipulateurs"
-
-#: help.c:38
-msgid "Low-level Commands / Interrogators"
-msgstr "Commandes bas niveau / Interrogateurs"
-
-#: help.c:39
-msgid "Low-level Commands / Syncing Repositories"
-msgstr "Commandes bas niveau / Synchronisation de dépôts"
-
-#: help.c:40
-msgid "Low-level Commands / Internal Helpers"
-msgstr "Commandes bas niveau / Assistants internes"
-
-#: help.c:316
-#, c-format
-msgid "available git commands in '%s'"
-msgstr "commandes git disponibles dans '%s'"
-
-#: help.c:323
-msgid "git commands available from elsewhere on your $PATH"
-msgstr "commandes git disponibles depuis un autre endroit de votre $PATH"
-
-#: help.c:332
-msgid "These are common Git commands used in various situations:"
-msgstr "Ci-dessous les commandes Git habituelles dans diverses situations :"
-
-#: help.c:382 git.c:100
-#, c-format
-msgid "unsupported command listing type '%s'"
-msgstr "type de liste de commandes non supporté '%s'"
-
-#: help.c:422
-msgid "The Git concept guides are:"
-msgstr "Les guides des concepts de Git sont :"
-
-#: help.c:446
-msgid "External commands"
-msgstr "Commandes externes"
-
-#: help.c:468
-msgid "Command aliases"
-msgstr "Alias de commande"
-
-#: help.c:486
-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:563
-#, c-format
-msgid ""
-"'%s' appears to be a git command, but we were not\n"
-"able to execute it. Maybe git-%s is broken?"
-msgstr ""
-"'%s' 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:585 help.c:682
-#, 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:633
-msgid "Uh oh. Your system reports no Git commands at all."
-msgstr "Ahem. Votre système n'indique aucune commande Git."
-
-#: help.c:655
-#, 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:660
-#, c-format
-msgid "Continuing under the assumption that you meant '%s'."
-msgstr "Continuons en supposant que vous avez voulu dire '%s'."
-
-#: help.c:666
-#, c-format
-msgid "Run '%s' instead [y/N]? "
-msgstr "Lancer '%s' à la place [y/N] ? "
-
-#: help.c:674
-#, 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:686
-msgid ""
-"\n"
-"The most similar command is"
-msgid_plural ""
-"\n"
-"The most similar commands are"
-msgstr[0] ""
-"\n"
-"La commande la plus ressemblante est"
-msgstr[1] ""
-"\n"
-"Les commandes les plus ressemblantes sont"
-
-#: help.c:729
-msgid "git version [<options>]"
-msgstr "git version [<options>]"
-
-#: help.c:784
-#, c-format
-msgid "%s: %s - %s"
-msgstr "%s: %s - %s"
-
-#: help.c:788
-msgid ""
-"\n"
-"Did you mean this?"
-msgid_plural ""
-"\n"
-"Did you mean one of these?"
-msgstr[0] ""
-"\n"
-"Vouliez-vous dire cela ?"
-msgstr[1] ""
-"\n"
-"Vouliez-vous dire un de ceux-là ?"
-
-#: hook.c:28
-#, 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`."
-
-#: hook.c:87
-#, c-format
-msgid "Couldn't start hook '%s'\n"
-msgstr "impossible de démarrer le crochet '%s'\n"
-
-#: ident.c:354
-msgid "Author identity unknown\n"
-msgstr "Identité d'auteur inconnue\n"
-
-#: ident.c:357
-msgid "Committer identity unknown\n"
-msgstr "Indentité de validateur inconnue\n"
-
-#: ident.c:363
-msgid ""
-"\n"
-"*** Please tell me who you are.\n"
-"\n"
-"Run\n"
-"\n"
-"  git config --global user.email \"you@example.com\"\n"
-"  git config --global user.name \"Your Name\"\n"
-"\n"
-"to set your account's default identity.\n"
-"Omit --global to set the identity only in this repository.\n"
-"\n"
-msgstr ""
-"\n"
-"*** Veuillez me dire qui vous êtes.\n"
-"\n"
-"Lancez\n"
-"\n"
-"  git config --global user.email \"Vous@exemple.com\"\n"
-"  git config --global user.name \"Votre Nom\"\n"
-"\n"
-"pour régler l'identité par défaut de votre compte.\n"
-"Éliminez --global pour ne faire les réglages que dans ce dépôt.\n"
-"\n"
-
-#: ident.c:398
-msgid "no email was given and auto-detection is disabled"
-msgstr "aucun courriel fourni et l'auto-détection est désactivée"
-
-#: ident.c:403
-#, c-format
-msgid "unable to auto-detect email address (got '%s')"
-msgstr "impossible de détecter automatiquement l'adresse ('%s' trouvé)"
-
-#: ident.c:420
-msgid "no name was given and auto-detection is disabled"
-msgstr "aucun nom fourni et l'auto-détection est désactivée"
-
-#: ident.c:426
-#, c-format
-msgid "unable to auto-detect name (got '%s')"
-msgstr "impossible de détecter automatiquement le nom ('%s' trouvé)"
-
-#: ident.c:434
-#, c-format
-msgid "empty ident name (for <%s>) not allowed"
-msgstr "nom d'identifiant vide (pour <%s>) non permis"
-
-#: ident.c:440
-#, c-format
-msgid "name consists only of disallowed characters: %s"
-msgstr "le nom n'est constitué que de caractères interdits : %s"
-
-#: ident.c:455 builtin/commit.c:649
-#, c-format
-msgid "invalid date format: %s"
-msgstr "format de date invalide : %s"
-
-#: list-objects-filter-options.c:68
-msgid "expected 'tree:<depth>'"
-msgstr "attendu : 'tree:<profondeur>'"
-
-#: list-objects-filter-options.c:83
-msgid "sparse:path filters support has been dropped"
-msgstr "sparse : le support des filtres de chemin a été abandonné"
-
-#: list-objects-filter-options.c:90
-#, c-format
-msgid "'%s' for 'object:type=<type>' is not a valid object type"
-msgstr "'%s' pour 'object:type=<type>' n'est pas un type d'objet valide"
-
-#: list-objects-filter-options.c:109
-#, c-format
-msgid "invalid filter-spec '%s'"
-msgstr "spécificateur de filtre invalide '%s'"
-
-#: list-objects-filter-options.c:125
-#, c-format
-msgid "must escape char in sub-filter-spec: '%c'"
-msgstr ""
-"le caractère doit être échappé dans le spécificateur de sous-filtre : '%c'"
-
-#: list-objects-filter-options.c:167
-msgid "expected something after combine:"
-msgstr "quelque chose attendu après combine :"
-
-#: list-objects-filter-options.c:249
-msgid "multiple filter-specs cannot be combined"
-msgstr "impossible de combiner des spécificateurs multiples de filtre"
-
-#: list-objects-filter-options.c:365
-msgid "unable to upgrade repository format to support partial clone"
-msgstr ""
-"impossible de mettre à jour le format de dépôt pour supporter les clones "
-"partiels"
-
-#: list-objects-filter.c:532
-#, c-format
-msgid "unable to access sparse blob in '%s'"
-msgstr "impossible d'accéder au blob clairsemé dans '%s'"
-
-#: list-objects-filter.c:535
-#, c-format
-msgid "unable to parse sparse filter data in %s"
-msgstr "impossible d'analyser la donnée de filtre clairsemé dans %s"
-
-#: list-objects.c:144
-#, c-format
-msgid "entry '%s' in tree %s has tree mode, but is not a tree"
-msgstr ""
-"l'entrée '%s' dans l'arbre %s a un mode d'arbre, mais n'est pas un arbre"
-
-#: list-objects.c:157
-#, c-format
-msgid "entry '%s' in tree %s has blob mode, but is not a blob"
-msgstr ""
-"l'entrée '%s' dans l'arbre %s a un mode de blob, mais n'est pas un blob"
-
-#: list-objects.c:415
-#, c-format
-msgid "unable to load root tree for commit %s"
-msgstr "impossible de charger l'arbre racine pour le commit %s"
-
-#: lockfile.c:152
-#, c-format
-msgid ""
-"Unable to create '%s.lock': %s.\n"
-"\n"
-"Another git process seems to be running in this repository, e.g.\n"
-"an editor opened by 'git commit'. Please make sure all processes\n"
-"are terminated then try again. If it still fails, a git process\n"
-"may have crashed in this repository earlier:\n"
-"remove the file manually to continue."
-msgstr ""
-"Impossible de créer '%s.lock' : %s.\n"
-"\n"
-"Il semble qu'un autre processus git est déjà lancé dans ce dépôt,\n"
-"par exemple un éditeur ouvert par 'git commit'. Veuillez vous assurer\n"
-"que tous les processus sont terminés et réessayez. Si l'échec persiste,\n"
-"un processus git peut avoir planté :\n"
-"supprimez le fichier manuellement pour poursuivre."
-
-#: lockfile.c:160
-#, c-format
-msgid "Unable to create '%s.lock': %s"
-msgstr "Impossible de créer '%s.lock' : %s"
-
-#: ls-refs.c:175
-#, c-format
-msgid "unexpected line: '%s'"
-msgstr "ligne inattendue : '%s'"
-
-#: ls-refs.c:179
-msgid "expected flush after ls-refs arguments"
-msgstr "vidage attendu après les arguments ls-refs"
-
-#: mailinfo.c:1050
-msgid "quoted CRLF detected"
-msgstr "CRLF citées détectées"
-
-#: mailinfo.c:1254 builtin/am.c:185 builtin/mailinfo.c:46
-#, c-format
-msgid "bad action '%s' for '%s'"
-msgstr "action invalide '%s' pour '%s'"
-
-#: merge-ort.c:1630 merge-recursive.c:1214
-#, 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:1639 merge-recursive.c:1221
-#, 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:1648 merge-recursive.c:1228
-#, 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:1658 merge-ort.c:1666
-#, c-format
-msgid "Note: Fast-forwarding submodule %s to %s"
-msgstr "Note : Avance rapide du sous-module %s à %s"
-
-#: merge-ort.c:1688
-#, c-format
-msgid "Failed to merge submodule %s"
-msgstr "Échec de la fusion du sous-module %s"
-
-#: merge-ort.c:1695
-#, c-format
-msgid ""
-"Failed to merge submodule %s, but a possible merge resolution exists:\n"
-"%s\n"
-msgstr ""
-"Échec de fusion du sous-module %s mais une résolution possible de fusion "
-"existe :\n"
-"%s\n"
-
-#: merge-ort.c:1699 merge-recursive.c:1284
-#, c-format
-msgid ""
-"If this is correct simply add it to the index for example\n"
-"by using:\n"
-"\n"
-"  git update-index --cacheinfo 160000 %s \"%s\"\n"
-"\n"
-"which will accept this suggestion.\n"
-msgstr ""
-"Si c'est correct, ajoutez le simplement à l'index\n"
-"en utilisant par exemple :\n"
-"\n"
-"  git update-index --cacheinfo 160000 %s \"%s\"\n"
-"\n"
-"qui acceptera cette suggestion.\n"
-
-#: merge-ort.c:1712
-#, c-format
-msgid ""
-"Failed to merge submodule %s, but multiple possible merges exist:\n"
-"%s"
-msgstr ""
-"Échec de fusion du sous-module %s mais de multiples solutions de fusion "
-"existent :\n"
-"%s"
-
-#: merge-ort.c:1937 merge-recursive.c:1375
-msgid "Failed to execute internal merge"
-msgstr "Échec à l'exécution de la fusion interne"
-
-#: merge-ort.c:1942 merge-recursive.c:1380
-#, c-format
-msgid "Unable to add %s to database"
-msgstr "Impossible d'ajouter %s à la base de données"
-
-#: merge-ort.c:1949 merge-recursive.c:1413
-#, c-format
-msgid "Auto-merging %s"
-msgstr "Fusion automatique de %s"
-
-#: merge-ort.c:2088 merge-recursive.c:2135
-#, 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 ""
-"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:2098 merge-recursive.c:2145
-#, 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 ""
-"CONFLIT (renommage implicite de répertoire) : impossible de transformer "
-"plusieurs chemins sur %s ; les chemins concernés sont : %s"
-
-#: merge-ort.c:2156
-#, c-format
-msgid ""
-"CONFLICT (directory rename split): Unclear where to rename %s to; it was "
-"renamed to multiple other directories, with no destination getting a "
-"majority of the files."
-msgstr ""
-"CONFLIT (renommage de répertoire coupé) : le renommage de %s n'est pas clair "
-"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:2310 merge-recursive.c:2481
-#, c-format
-msgid ""
-"WARNING: Avoiding applying %s -> %s rename to %s, because %s itself was "
-"renamed."
-msgstr ""
-"AVERTISSEMENT : ne renomme pas %s->%s dans %s, parce que %s lui-même a été "
-"renommé."
-
-#: merge-ort.c:2450 merge-recursive.c:3264
-#, c-format
-msgid ""
-"Path updated: %s added in %s inside a directory that was renamed in %s; "
-"moving it to %s."
-msgstr ""
-"Chemin mis à jour : %s ajouté dans %s dans un répertoire qui a été renommé "
-"en %s ; déplacé dans %s."
-
-#: merge-ort.c:2457 merge-recursive.c:3271
-#, c-format
-msgid ""
-"Path updated: %s renamed to %s in %s, inside a directory that was renamed in "
-"%s; moving it to %s."
-msgstr ""
-"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:2470 merge-recursive.c:3267
-#, 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 ""
-"CONFLIT (localisation de fichier) : %s ajouté dans %s dans un 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:2478 merge-recursive.c:3274
-#, 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 ""
-"CONFLIT (localisation de fichier) : %s renommé en %s dans %s, dans un "
-"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:2634
-#, 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:2729
-#, 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."
-msgstr ""
-"CONFLIT (renommage au sein d'une collision) : lre renommage de %s -> %s a "
-"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:2748 merge-ort.c:2772
-#, 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:3261 merge-recursive.c:3025
-#, c-format
-msgid "cannot read object %s"
-msgstr "impossible de lire l'objet %s"
-
-#: merge-ort.c:3264 merge-recursive.c:3028
-#, c-format
-msgid "object %s is not a blob"
-msgstr "l'objet %s n'est pas un blob"
-
-#: merge-ort.c:3693
-#, c-format
-msgid ""
-"CONFLICT (file/directory): directory in the way of %s from %s; moving it to "
-"%s instead."
-msgstr ""
-"CONFLIT (fichier/répertoire) : répertoire au milieu de %s depuis %s ; "
-"déplacement dans %s à la place."
-
-#: merge-ort.c:3770
-#, c-format
-msgid ""
-"CONFLICT (distinct types): %s had different types on each side; renamed both "
-"of them so each can be recorded somewhere."
-msgstr ""
-"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:3777
-#, c-format
-msgid ""
-"CONFLICT (distinct types): %s had different types on each side; renamed one "
-"of them so each can be recorded somewhere."
-msgstr ""
-"CONFLIT (types différents) : %s a des types différents des deux côtés ; "
-"renommé une d'entre elles de manière à pouvoir enregistrer les deux quelque "
-"part."
-
-#: merge-ort.c:3866 merge-recursive.c:3104
-msgid "content"
-msgstr "contenu"
-
-#: merge-ort.c:3868 merge-recursive.c:3108
-msgid "add/add"
-msgstr "ajout/ajout"
-
-#: merge-ort.c:3870 merge-recursive.c:3153
-msgid "submodule"
-msgstr "sous-module"
-
-#: merge-ort.c:3872 merge-recursive.c:3154
-#, c-format
-msgid "CONFLICT (%s): Merge conflict in %s"
-msgstr "CONFLIT (%s) : Conflit de fusion dans %s"
-
-#: merge-ort.c:3916
-#, c-format
-msgid ""
-"CONFLICT (modify/delete): %s deleted in %s and modified in %s.  Version %s "
-"of %s left in tree."
-msgstr ""
-"CONFLIT (modification/suppression) : %s supprimé dans %s et modifié dans %s. "
-"Version %s de %s laissée dans l'arbre."
-
-#: merge-ort.c:4212
-#, c-format
-msgid ""
-"Note: %s not up to date and in way of checking out conflicted version; old "
-"copy renamed to %s"
-msgstr ""
-"Note :%s pas à jour et au milieu de l'extraction d'une version "
-"conflictuelle ; la vielle copie a été renommée en %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:4586
-#, 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:3723
-#, c-format
-msgid ""
-"Your local changes to the following files would be overwritten by merge:\n"
-"  %s"
-msgstr ""
-"Vos modifications locales aux fichiers suivants seraient écrasées par la "
-"fusion :\n"
-"  %s"
-
-#: merge-ort-wrappers.c:33 merge-recursive.c:3485 builtin/merge.c:405
-msgid "Already up to date."
-msgstr "Déjà à jour."
-
-#: merge-recursive.c:353
-msgid "(bad commit)\n"
-msgstr "(mauvais commit)\n"
-
-#: 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: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:881
-#, c-format
-msgid "failed to create path '%s'%s"
-msgstr "impossible de créer le chemin '%s' %s"
-
-#: 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:906 merge-recursive.c:925
-msgid ": perhaps a D/F conflict?"
-msgstr ": peut-être un conflit D/F ?"
-
-#: 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:956 builtin/cat-file.c:47
-#, c-format
-msgid "cannot read object %s '%s'"
-msgstr "impossible de lire l'objet %s '%s'"
-
-#: merge-recursive.c:961
-#, c-format
-msgid "blob expected for %s '%s'"
-msgstr "blob attendu pour %s '%s'"
-
-#: merge-recursive.c:986
-#, c-format
-msgid "failed to open '%s': %s"
-msgstr "échec à l'ouverture de '%s' : %s"
-
-#: 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: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:1236 merge-recursive.c:1249
-#, c-format
-msgid "Fast-forwarding submodule %s to the following commit:"
-msgstr "Avance rapide du sous-module %s au commit suivant :"
-
-#: merge-recursive.c:1239 merge-recursive.c:1252
-#, c-format
-msgid "Fast-forwarding submodule %s"
-msgstr "Avance rapide du sous-module %s"
-
-#: merge-recursive.c:1276
-#, 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:1280
-#, 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:1281
-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:1293
-#, 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:1437
-#, 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:1509
-#, c-format
-msgid ""
-"CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s left "
-"in tree."
-msgstr ""
-"CONFLIT (%s/suppression) : %s supprimé dans %s et %s dans %s. Version %s de "
-"%s laissée dans l'arbre."
-
-#: merge-recursive.c:1514
-#, c-format
-msgid ""
-"CONFLICT (%s/delete): %s deleted in %s and %s to %s in %s. Version %s of %s "
-"left in tree."
-msgstr ""
-"CONFLIT (%s/suppression) : %s supprimé dans %s et %s à %s dans %s. Version "
-"%s de %s laissée dans l'arbre."
-
-#: merge-recursive.c:1521
-#, c-format
-msgid ""
-"CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s left "
-"in tree at %s."
-msgstr ""
-"CONFLIT (%s/suppression) : %s supprimé dans %s et %s dans %s. Version %s de "
-"%s laissée dans l'arbre dans le fichier %s."
-
-#: merge-recursive.c:1526
-#, 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 ""
-"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:1561
-msgid "rename"
-msgstr "renommage"
-
-#: merge-recursive.c:1561
-msgid "renamed"
-msgstr "renommé"
-
-#: merge-recursive.c:1612 merge-recursive.c:2518 merge-recursive.c:3181
-#, c-format
-msgid "Refusing to lose dirty file at %s"
-msgstr "Refus de perdre le fichier modifié %s"
-
-#: merge-recursive.c:1622
-#, 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:1680
-#, 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:1711
-#, 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:1716
-#, 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:1743
-#, c-format
-msgid ""
-"CONFLICT (rename/rename): Rename \"%s\"->\"%s\" in branch \"%s\" rename "
-"\"%s\"->\"%s\" in \"%s\"%s"
-msgstr ""
-"CONFLIT (renommage/renommage) : Renommage de \"%s\"->\"%s\" dans la branche "
-"\"%s\" et renommage \"%s\"->\"%s\" dans \"%s\"%s"
-
-#: merge-recursive.c:1748
-msgid " (left unresolved)"
-msgstr " (laissé non résolu)"
-
-#: merge-recursive.c:1840
-#, 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:2103
-#, c-format
-msgid ""
-"CONFLICT (directory rename split): Unclear where to place %s because "
-"directory %s was renamed to multiple other directories, with no destination "
-"getting a majority of the files."
-msgstr ""
-"CONFLIT (renommage de répertoire coupé) : la place de %s n'est pas claire "
-"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:2237
-#, c-format
-msgid ""
-"CONFLICT (rename/rename): Rename directory %s->%s in %s. Rename directory %s-"
-">%s in %s"
-msgstr ""
-"CONFLIT (renommage/renommage) : renommage du répertoire %s->%s dans %s. "
-"Renommage de répertoire %s->%s dans %s"
-
-#: merge-recursive.c:3092
-msgid "modify"
-msgstr "modification"
-
-#: merge-recursive.c:3092
-msgid "modified"
-msgstr "modifié"
-
-#: merge-recursive.c:3131
-#, c-format
-msgid "Skipped %s (merged same as existing)"
-msgstr "%s sauté (fusion identique à l'existant)"
-
-#: merge-recursive.c:3184
-#, c-format
-msgid "Adding as %s instead"
-msgstr "Ajout plutôt comme %s"
-
-#: merge-recursive.c:3388
-#, c-format
-msgid "Removing %s"
-msgstr "Suppression de %s"
-
-#: merge-recursive.c:3411
-msgid "file/directory"
-msgstr "fichier/répertoire"
-
-#: merge-recursive.c:3416
-msgid "directory/file"
-msgstr "répertoire/fichier"
-
-#: merge-recursive.c:3423
-#, 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:3432
-#, c-format
-msgid "Adding %s"
-msgstr "Ajout de %s"
-
-#: merge-recursive.c:3441
-#, c-format
-msgid "CONFLICT (add/add): Merge conflict in %s"
-msgstr "CONFLIT (ajout/ajout) : Conflit de fusion dans %s"
-
-#: merge-recursive.c:3494
-#, c-format
-msgid "merging of trees %s and %s failed"
-msgstr "échec de fusion des arbres %s et %s"
-
-#: merge-recursive.c:3588
-msgid "Merging:"
-msgstr "Fusion :"
-
-#: merge-recursive.c:3601
-#, 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:3651
-msgid "merge returned no commit"
-msgstr "la fusion n'a pas retourné de commit"
-
-#: merge-recursive.c:3823
-#, c-format
-msgid "Could not parse object '%s'"
-msgstr "Impossible d'analyser l'objet '%s'"
-
-#: merge-recursive.c:3841 builtin/merge.c:720 builtin/merge.c:912
-#: builtin/stash.c:489
-msgid "Unable to write index."
-msgstr "Impossible d'écrire l'index."
-
-#: merge.c:41
-msgid "failed to read the cache"
-msgstr "impossible de lire le cache"
-
-#: merge.c:102 rerere.c:705 builtin/am.c:1989 builtin/am.c:2023
-#: builtin/checkout.c:603 builtin/checkout.c:865 builtin/clone.c:714
-#: builtin/stash.c:269
-msgid "unable to write new index file"
-msgstr "impossible d'écrire le nouveau fichier d'index"
-
-#: midx.c:79
-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:112
-#, c-format
-msgid "multi-pack-index file %s is too small"
-msgstr "le fichier d'index multi-paquet %s est trop petit"
-
-#: midx.c:128
-#, 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:133
-#, c-format
-msgid "multi-pack-index version %d not recognized"
-msgstr "la version d'index multi-paquet %d n'est pas reconnue"
-
-#: midx.c:138
-#, 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:155
-msgid "multi-pack-index missing required pack-name chunk"
-msgstr "index multi-paquet manque de tronçon de nom de paquet"
-
-#: midx.c:157
-msgid "multi-pack-index missing required OID fanout chunk"
-msgstr "index multi-paquet manque de tronçon de d'étalement OID requis"
-
-#: midx.c:159
-msgid "multi-pack-index missing required OID lookup chunk"
-msgstr "index multi-paquet manque de tronçon de recherche OID requis"
-
-#: midx.c:161
-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:180
-#, 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:228
-#, c-format
-msgid "bad pack-int-id: %u (%u total packs)"
-msgstr "mauvais pack-int-id : %u (%u paquets au total)"
-
-#: midx.c:278
-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:509
-#, c-format
-msgid "failed to add packfile '%s'"
-msgstr "échec de l'ajout du fichier paquet '%s'"
-
-#: midx.c:515
-#, c-format
-msgid "failed to open pack-index '%s'"
-msgstr "échec à l'ouverture du fichier paquet '%s'"
-
-#: midx.c:583
-#, c-format
-msgid "failed to locate object %d in packfile"
-msgstr "échec de localisation de l'objet %d dans le fichier paquet"
-
-#: midx.c:911
-msgid "cannot store reverse index file"
-msgstr "impossible de stocker le fichier d'index inversé"
-
-#: midx.c:1009
-#, c-format
-msgid "could not parse line: %s"
-msgstr "impossible d'analyser la ligne : %s"
-
-#: midx.c:1011
-#, c-format
-msgid "malformed line: %s"
-msgstr "ligne malformée : %s"
-
-#: midx.c:1181
-msgid "ignoring existing multi-pack-index; checksum mismatch"
-msgstr ""
-"index multi-paquet existant ignoré ; non-concordance de la somme de contrôle"
-
-#: midx.c:1206
-msgid "could not load pack"
-msgstr "impossible de charger le paquet"
-
-#: midx.c:1212
-#, c-format
-msgid "could not open index for %s"
-msgstr "impossible d'ouvrir l'index pour %s"
-
-#: midx.c:1223
-msgid "Adding packfiles to multi-pack-index"
-msgstr "Ajout de fichiers paquet à un index multi-paquet"
-
-#: midx.c:1266
-#, c-format
-msgid "unknown preferred pack: '%s'"
-msgstr "paquet préféré inconnu : %s"
-
-#: midx.c:1311
-#, 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:1343
-#, c-format
-msgid "did not see pack-file %s to drop"
-msgstr "fichier paquet à éliminer %s non trouvé"
-
-#: midx.c:1389
-#, c-format
-msgid "preferred pack '%s' is expired"
-msgstr "le paquet préféré '%s' est expiré"
-
-#: midx.c:1402
-msgid "no pack files to index."
-msgstr "aucun fichier paquet à l'index."
-
-#: midx.c:1409
-msgid "refusing to write multi-pack .bitmap without any objects"
-msgstr "refus d'écrire le .bitmap multi-paquet sans aucun objet"
-
-#: midx.c:1451
-msgid "could not write multi-pack bitmap"
-msgstr "impossible d'écrire le bitmap multi-paquet"
-
-#: midx.c:1461
-msgid "could not write multi-pack-index"
-msgstr "échec de l'écriture de l'index de multi-paquet"
-
-#: midx.c:1520 builtin/clean.c:37
-#, c-format
-msgid "failed to remove %s"
-msgstr "échec de la suppression de %s"
-
-#: midx.c:1553
-#, c-format
-msgid "failed to clear multi-pack-index at %s"
-msgstr "échec du nettoyage de l'index de multi-paquet à %s"
-
-#: midx.c:1616
-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:1624
-msgid "incorrect checksum"
-msgstr "somme de contrôle incorrecte"
-
-#: midx.c:1627
-msgid "Looking for referenced packfiles"
-msgstr "Recherche de fichiers paquets référencés"
-
-#: midx.c:1642
-#, c-format
-msgid ""
-"oid fanout out of order: fanout[%d] = %<PRIx32> > %<PRIx32> = fanout[%d]"
-msgstr ""
-"étalement oid en désordre : étalement[%d] = %<PRIx32> > %<PRIx32> = "
-"étalement[%d]"
-
-#: midx.c:1647
-msgid "the midx contains no oid"
-msgstr "le midx ne contient aucun oid"
-
-#: midx.c:1656
-msgid "Verifying OID order in multi-pack-index"
-msgstr "Vérification de l'ordre des OID dans l'index multi-paquet"
-
-#: midx.c:1665
-#, 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:1685
-msgid "Sorting objects by packfile"
-msgstr "Classement des objets par fichier paquet"
-
-#: midx.c:1692
-msgid "Verifying object offsets"
-msgstr "Vérification des décalages des objets"
-
-#: midx.c:1708
-#, 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:1714
-#, c-format
-msgid "failed to load pack-index for packfile %s"
-msgstr "impossible de lire le fichier paquet %s"
-
-#: midx.c:1723
-#, 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:1750
-msgid "Counting referenced objects"
-msgstr "Comptage des objets référencés"
-
-#: midx.c:1760
-msgid "Finding and deleting unreferenced packfiles"
-msgstr "Recherche et effacement des fichiers paquets non-référencés"
-
-#: midx.c:1952
-msgid "could not start pack-objects"
-msgstr "impossible de démarrer le groupement d'objets"
-
-#: midx.c:1972
-msgid "could not finish pack-objects"
-msgstr "impossible de finir le groupement d'objets"
-
-#: name-hash.c:542
-#, c-format
-msgid "unable to create lazy_dir thread: %s"
-msgstr "impossible de créer le fil lazy_dir : %s"
-
-#: name-hash.c:564
-#, c-format
-msgid "unable to create lazy_name thread: %s"
-msgstr "impossible de créer le fil lazy_name : %s"
-
-#: name-hash.c:570
-#, c-format
-msgid "unable to join lazy_name thread: %s"
-msgstr "impossible de joindre le fil lazy_name : %s"
-
-#: notes-merge.c:276
-#, 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."
-msgstr ""
-"Vous n'avez pas terminé votre précédente fusion de notes (%s existe).\n"
-"Veuillez utiliser 'git notes merge --commit' ou 'git notes merge --abort' "
-"pour valider/abandonner la fusion en cours avant d'en démarrer une nouvelle."
-
-#: notes-merge.c:283
-#, c-format
-msgid "You have not concluded your notes merge (%s exists)."
-msgstr "Vous n'avez pas terminé votre fusion de notes (%s existe)."
-
-#: notes-utils.c:46
-msgid "Cannot commit uninitialized/unreferenced notes tree"
-msgstr "Impossible de valider un arbre de notes non initialisé/référencé"
-
-#: notes-utils.c:105
-#, c-format
-msgid "Bad notes.rewriteMode value: '%s'"
-msgstr "Mauvaise valeur de notes.rewriteMode : '%s'"
-
-#: notes-utils.c:115
-#, c-format
-msgid "Refusing to rewrite notes in %s (outside of refs/notes/)"
-msgstr "Refus de réécrire des notes dans %s (hors de refs/notes/)"
-
-#. 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 "Mauvaise valeur de %s : '%s'"
-
-#: object-file.c:457
-#, 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:515
-#, c-format
-msgid "unable to normalize alternate object path: %s"
-msgstr "impossible de normaliser le chemin d'objet alternatif : %s"
-
-#: object-file.c:589
-#, 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:596
-#, c-format
-msgid "unable to normalize object directory: %s"
-msgstr "impossible de normaliser le répertoire d'objet : %s"
-
-#: object-file.c:639
-msgid "unable to fdopen alternates lockfile"
-msgstr "impossible d'ouvrir (fdopen) le fichier verrou des alternatives"
-
-#: object-file.c:657
-msgid "unable to read alternates file"
-msgstr "lecture du fichier d'alternatives impossible"
-
-#: object-file.c:664
-msgid "unable to move new alternates file into place"
-msgstr "impossible de déplacer le nouveau fichier d'alternative"
-
-#: object-file.c:742
-#, c-format
-msgid "path '%s' does not exist"
-msgstr "le chemin '%s' n'existe pas"
-
-#: object-file.c:763
-#, 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:769
-#, 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:775
-#, c-format
-msgid "reference repository '%s' is shallow"
-msgstr "le dépôt de référence '%s' est superficiel"
-
-#: object-file.c:783
-#, c-format
-msgid "reference repository '%s' is grafted"
-msgstr "le dépôt de référence '%s' est greffé"
-
-#: object-file.c:814
-#, c-format
-msgid "could not find object directory matching %s"
-msgstr "impossible de trouver le répertoire objet correspondant à %s"
-
-#: object-file.c:864
-#, c-format
-msgid "invalid line while parsing alternate refs: %s"
-msgstr "ligne invalide pendant l'analyse des refs alternatives : %s"
-
-#: object-file.c:1014
-#, c-format
-msgid "attempting to mmap %<PRIuMAX> over limit %<PRIuMAX>"
-msgstr "essai de mmap %<PRIuMAX> au delà de la limite %<PRIuMAX>"
-
-#: object-file.c:1049
-#, c-format
-msgid "mmap failed%s"
-msgstr "échec de mmap%s"
-
-#: object-file.c:1230
-#, c-format
-msgid "object file %s is empty"
-msgstr "le fichier objet %s est vide"
-
-#: object-file.c:1349 object-file.c:2588
-#, c-format
-msgid "corrupt loose object '%s'"
-msgstr "objet libre corrompu '%s'"
-
-#: object-file.c:1351 object-file.c:2592
-#, c-format
-msgid "garbage at end of loose object '%s'"
-msgstr "données incorrectes à la fin de l'objet libre '%s'"
-
-#: object-file.c:1473
-#, c-format
-msgid "unable to parse %s header"
-msgstr "impossible d'analyser l'entête %s"
-
-#: object-file.c:1475
-msgid "invalid object type"
-msgstr "type d'objet invalide"
-
-#: object-file.c:1486
-#, c-format
-msgid "unable to unpack %s header"
-msgstr "impossible de dépaqueter l'entête %s"
-
-#: object-file.c:1490
-#, c-format
-msgid "header for %s too long, exceeds %d bytes"
-msgstr "entête de %s trop long, attendu %d octets"
-
-#: object-file.c:1720
-#, c-format
-msgid "failed to read object %s"
-msgstr "impossible de lire l'objet %s"
-
-#: object-file.c:1724
-#, c-format
-msgid "replacement %s not found for %s"
-msgstr "remplacement %s non trouvé pour %s"
-
-#: object-file.c:1728
-#, c-format
-msgid "loose object %s (stored in %s) is corrupt"
-msgstr "l'objet libre %s (stocké dans %s) est corrompu"
-
-#: object-file.c:1732
-#, c-format
-msgid "packed object %s (stored in %s) is corrupt"
-msgstr "l'objet empaqueté %s (stocké dans %s) est corrompu"
-
-#: object-file.c:1855
-#, c-format
-msgid "unable to write file %s"
-msgstr "impossible d'écrire le fichier %s"
-
-#: object-file.c:1862
-#, c-format
-msgid "unable to set permission to '%s'"
-msgstr "impossible de régler les droits de '%s'"
-
-#: object-file.c:1869
-msgid "file write error"
-msgstr "erreur d'écriture d'un fichier"
-
-#: object-file.c:1904
-msgid "error when closing loose object file"
-msgstr "erreur en fermeture du fichier d'objet esseulé"
-
-#: object-file.c:1971
-#, 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:1973
-msgid "unable to create temporary file"
-msgstr "impossible de créer un fichier temporaire"
-
-#: object-file.c:1997
-msgid "unable to write loose object file"
-msgstr "impossible d'écrire le fichier d'objet esseulé"
-
-#: object-file.c:2003
-#, c-format
-msgid "unable to deflate new object %s (%d)"
-msgstr "impossible de compresser le nouvel objet %s (%d)"
-
-#: object-file.c:2007
-#, c-format
-msgid "deflateEnd on object %s failed (%d)"
-msgstr "échec de deflateEnd sur l'objet %s (%d)"
-
-#: object-file.c:2011
-#, c-format
-msgid "confused by unstable object source data for %s"
-msgstr "données de source d'objet instable pour %s"
-
-#: object-file.c:2022 builtin/pack-objects.c:1251
-#, c-format
-msgid "failed utime() on %s"
-msgstr "échec de utime() sur %s"
-
-#: object-file.c:2100
-#, c-format
-msgid "cannot read object for %s"
-msgstr "impossible de lire l'objet pour %s"
-
-#: object-file.c:2151
-msgid "corrupt commit"
-msgstr "commit corrompu"
-
-#: object-file.c:2159
-msgid "corrupt tag"
-msgstr "étiquette corrompue"
-
-#: object-file.c:2259
-#, c-format
-msgid "read error while indexing %s"
-msgstr "erreur de lecture à l'indexation de %s"
-
-#: object-file.c:2262
-#, c-format
-msgid "short read while indexing %s"
-msgstr "lecture tronquée pendant l'indexation de %s"
-
-#: object-file.c:2335 object-file.c:2345
-#, c-format
-msgid "%s: failed to insert into database"
-msgstr "%s : échec de l'insertion dans la base de données"
-
-#: object-file.c:2351
-#, c-format
-msgid "%s: unsupported file type"
-msgstr "%s : type de fichier non supporté"
-
-#: object-file.c:2375 builtin/fetch.c:1494
-#, c-format
-msgid "%s is not a valid object"
-msgstr "%s n'est pas un objet valide"
-
-#: object-file.c:2377
-#, c-format
-msgid "%s is not a valid '%s' object"
-msgstr "%s n'est pas un objet '%s' valide"
-
-#: object-file.c:2404
-#, c-format
-msgid "unable to open %s"
-msgstr "impossible d'ouvrir %s"
-
-#: object-file.c:2599
-#, c-format
-msgid "hash mismatch for %s (expected %s)"
-msgstr "incohérence de hachage pour %s (%s attendu)"
-
-#: object-file.c:2622
-#, c-format
-msgid "unable to mmap %s"
-msgstr "impossible de mmap %s"
-
-#: object-file.c:2628
-#, c-format
-msgid "unable to unpack header of %s"
-msgstr "impossible de dépaqueter l'entête de %s"
-
-#: object-file.c:2633
-#, c-format
-msgid "unable to parse header of %s"
-msgstr "impossible d'analyser l'entête de %s"
-
-#: object-file.c:2644
-#, c-format
-msgid "unable to unpack contents of %s"
-msgstr "impossible de dépaqueter le contenu de %s"
-
-#. TRANSLATORS: This is a line of ambiguous object
-#. output shown when we cannot look up or parse the
-#. object in question. E.g. "deadbeef [bad object]".
-#.
-#: object-name.c:382
-#, c-format
-msgid "%s [bad object]"
-msgstr "%s [mauvais objet]"
-
-#. TRANSLATORS: This is a line of ambiguous commit
-#. object output. E.g.:
-#. *
-#.    "deadbeef commit 2021-01-01 - Some Commit Message"
-#.
-#: object-name.c:407
-#, c-format
-msgid "%s commit %s - %s"
-msgstr "%s commit %s - %s"
-
-#. TRANSLATORS: This is a line of ambiguous
-#. tag object output. E.g.:
-#. *
-#.    "deadbeef tag 2022-01-01 - Some Tag Message"
-#. *
-#. The second argument is the YYYY-MM-DD found
-#. in the tag.
-#. *
-#. The third argument is the "tag" string
-#. from object.c.
-#.
-#: object-name.c:428
-#, c-format
-msgid "%s tag %s - %s"
-msgstr "%s étiquette %s - %s"
-
-#. TRANSLATORS: This is a line of ambiguous
-#. tag object output where we couldn't parse
-#. the tag itself. E.g.:
-#. *
-#.    "deadbeef [bad tag, could not parse it]"
-#.
-#: object-name.c:439
-#, c-format
-msgid "%s [bad tag, could not parse it]"
-msgstr "%s [mauvaise étiquette, impossible à analyser]"
-
-#. TRANSLATORS: This is a line of ambiguous <type>
-#. object output. E.g. "deadbeef tree".
-#.
-#: object-name.c:447
-#, c-format
-msgid "%s tree"
-msgstr "arbre %s"
-
-#. TRANSLATORS: This is a line of ambiguous <type>
-#. object output. E.g. "deadbeef blob".
-#.
-#: object-name.c:453
-#, c-format
-msgid "%s blob"
-msgstr "blob %s"
-
-#: object-name.c:569
-#, c-format
-msgid "short object ID %s is ambiguous"
-msgstr "l'id court d'objet %s est ambigu"
-
-#. TRANSLATORS: The argument is the list of ambiguous
-#. objects composed in show_ambiguous_object(). See
-#. its "TRANSLATORS" comments for details.
-#.
-#: object-name.c:591
-#, c-format
-msgid ""
-"The candidates are:\n"
-"%s"
-msgstr ""
-"Les candidats sont :\n"
-"%s"
-
-#: object-name.c:888
-msgid ""
-"Git normally never creates a ref that ends with 40 hex characters\n"
-"because it will be ignored when you just specify 40-hex. These refs\n"
-"may be created by mistake. For example,\n"
-"\n"
-"  git switch -c $br $(git rev-parse ...)\n"
-"\n"
-"where \"$br\" is somehow empty and a 40-hex ref is created. Please\n"
-"examine these refs and maybe delete them. Turn this message off by\n"
-"running \"git config advice.objectNameWarning false\""
-msgstr ""
-"Git ne crée normalement jamais de référence qui se termine par 40\n"
-"caractères hexa car elle serait ignorée si vous spécifiez juste\n"
-"40-hexa. Ces références peuvent être créées par erreur. Par exemple,\n"
-"\n"
-"  git switch -c $br $(git rev-parse ...)\n"
-"\n"
-"où \"$br\" est d'une manière ou d'une autre vide et une référence 40-hexa "
-"est créée.\n"
-"Veuillez examiner ces références et peut-être les supprimer. Désactivez ce "
-"message\n"
-"en lançant \"git config advice.objectNameWarning false\""
-
-#: object-name.c:1008
-#, c-format
-msgid "log for '%.*s' only goes back to %s"
-msgstr "le journal de '%.*s' ne remonte qu'à %s"
-
-#: object-name.c:1016
-#, c-format
-msgid "log for '%.*s' only has %d entries"
-msgstr "le journal de '%.*s' n'a que %d entrées"
-
-#: object-name.c:1794
-#, c-format
-msgid "path '%s' exists on disk, but not in '%.*s'"
-msgstr "le chemin '%s' existe sur le disque, mais pas dans '%.*s'"
-
-#: object-name.c:1800
-#, c-format
-msgid ""
-"path '%s' exists, but not '%s'\n"
-"hint: Did you mean '%.*s:%s' aka '%.*s:./%s'?"
-msgstr ""
-"le chemin '%s' existe, mais pas '%s'\n"
-"conseil : peut-être vouliez-vous dire '%.*s:%s', soit '%.*s:./%s' ?"
-
-#: object-name.c:1809
-#, c-format
-msgid "path '%s' does not exist in '%.*s'"
-msgstr "le chemin '%s' n'existe pas dans '%.*s'"
-
-#: object-name.c:1837
-#, c-format
-msgid ""
-"path '%s' is in the index, but not at stage %d\n"
-"hint: Did you mean ':%d:%s'?"
-msgstr ""
-"le chemin '%s' est dans l'index, mais pas à l'étape %d\n"
-"conseil : vous vouliez peut-être dire ':%d:%s' ?"
-
-#: object-name.c:1853
-#, c-format
-msgid ""
-"path '%s' is in the index, but not '%s'\n"
-"hint: Did you mean ':%d:%s' aka ':%d:./%s'?"
-msgstr ""
-"le chemin '%s' est dans l'index, mais pas '%s'\n"
-"conseil : peut-être vouliez-vous dire ':%d:%s', soit '%d:./%s' ?"
-
-#: object-name.c:1861
-#, c-format
-msgid "path '%s' exists on disk, but not in the index"
-msgstr "le chemin '%s' existe sur le disque, mais pas dans l'index"
-
-#: object-name.c:1863
-#, c-format
-msgid "path '%s' does not exist (neither on disk nor in the index)"
-msgstr "le chemin '%s' n'existe pas (ni sur le disque, ni dans l'index)"
-
-#: object-name.c:1876
-msgid "relative path syntax can't be used outside working tree"
-msgstr ""
-"la syntaxe de chemin relatif ne peut pas être utilisée hors de l'arbre de "
-"travail"
-
-#: object-name.c:1901
-#, c-format
-msgid "<object>:<path> required, only <object> '%s' given"
-msgstr "<objet>:<chemin> nécessaire, seul <objet> '%s' a été fourni"
-
-#: object-name.c:2014
-#, c-format
-msgid "invalid object name '%.*s'."
-msgstr "nom d'objet invalide : '%.*s'."
-
-#: object.c:53
-#, c-format
-msgid "invalid object type \"%s\""
-msgstr "type d'objet invalide \"%s\""
-
-#: object.c:173
-#, c-format
-msgid "object %s is a %s, not a %s"
-msgstr "l'objet %s est de type %s, pas de type %s"
-
-#: object.c:250
-#, c-format
-msgid "object %s has unknown type id %d"
-msgstr "l'objet %s a un id de type inconnu %d"
-
-#: object.c:263
-#, c-format
-msgid "unable to parse object: %s"
-msgstr "impossible d'analyser l'objet : %s"
-
-#: object.c:283 object.c:294
-#, c-format
-msgid "hash mismatch %s"
-msgstr "incohérence de hachage %s"
-
-#: pack-bitmap.c:353
-msgid "multi-pack bitmap is missing required reverse index"
-msgstr "l'index inverse requis manque dans l'index multi-paquet"
-
-#: pack-bitmap.c:433
-msgid "load_reverse_index: could not open pack"
-msgstr "load_reverse_index : impossible d'ouvrir le paquet"
-
-#: pack-bitmap.c:1072 pack-bitmap.c:1078 builtin/pack-objects.c:2432
-#, c-format
-msgid "unable to get size of %s"
-msgstr "impossible de récupérer la taille de %s"
-
-#: pack-bitmap.c:1937
-#, 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:1973 builtin/rev-list.c:91
-#, c-format
-msgid "unable to get disk usage of %s"
-msgstr "impossible de récupérer l'utilisation du disque de %s"
-
-#: pack-revindex.c:221
-#, c-format
-msgid "reverse-index file %s is too small"
-msgstr "le fichier d'index inversé %s est trop petit"
-
-#: pack-revindex.c:226
-#, c-format
-msgid "reverse-index file %s is corrupt"
-msgstr "le fichier d'index inversé %s est corrompu"
-
-#: pack-revindex.c:234
-#, c-format
-msgid "reverse-index file %s has unknown signature"
-msgstr "le fichier d'index inversé %s a une signature inconnue"
-
-#: pack-revindex.c:238
-#, c-format
-msgid "reverse-index file %s has unsupported version %<PRIu32>"
-msgstr "le fichier d'index inverse %s a une version non gérée %<PRIu32>"
-
-#: pack-revindex.c:243
-#, c-format
-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:251
-msgid "cannot both write and verify reverse index"
-msgstr "impossible de lire et vérifier à la fois l'index inverse"
-
-#: pack-write.c:270
-#, c-format
-msgid "could not stat: %s"
-msgstr "stat impossible de %s"
-
-#: pack-write.c:282
-#, c-format
-msgid "failed to make %s readable"
-msgstr "échec de rendre %s lisible"
-
-#: pack-write.c:521
-#, c-format
-msgid "could not write '%s' promisor file"
-msgstr "impossible d'écrire le fichier de prometteur '%s'"
-
-#: packfile.c:627
-msgid "offset before end of packfile (broken .idx?)"
-msgstr "offset avant la fin du fichier paquet (.idx cassé ?)"
-
-#: packfile.c:657
-#, c-format
-msgid "packfile %s cannot be mapped%s"
-msgstr "le fichier paquet %s ne peut être mmap%s"
-
-#: packfile.c:1924
-#, 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:1928
-#, 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:21 parse-options-cb.c:25 builtin/commit-graph.c:175
-#, c-format
-msgid "option `%s' expects a numerical value"
-msgstr "l'option '%s' attend une valeur numérique"
-
-#: parse-options-cb.c:42
-#, c-format
-msgid "malformed expiration date '%s'"
-msgstr "date d'expiration malformée : '%s'"
-
-#: parse-options-cb.c:55
-#, c-format
-msgid "option `%s' expects \"always\", \"auto\", or \"never\""
-msgstr "l'option '%s' attend \"always\", \"auto\" ou \"never\""
-
-#: parse-options-cb.c:133 parse-options-cb.c:150
-#, c-format
-msgid "malformed object name '%s'"
-msgstr "nom d'objet malformé '%s'"
-
-#: parse-options-cb.c:307
-#, c-format
-msgid "option `%s' expects \"%s\" or \"%s\""
-msgstr "l'option '%s' attend \"%s\" ou \"%s\""
-
-#: parse-options.c:58
-#, c-format
-msgid "%s requires a value"
-msgstr "%s a besoin d'une valeur"
-
-#: parse-options.c:93
-#, c-format
-msgid "%s is incompatible with %s"
-msgstr "%s est incompatible avec %s"
-
-#: parse-options.c:98
-#, c-format
-msgid "%s : incompatible with something else"
-msgstr "%s est incompatible avec toute autre option"
-
-#: parse-options.c:112 parse-options.c:116
-#, c-format
-msgid "%s takes no value"
-msgstr "%s n'accepte aucune valeur"
-
-#: parse-options.c:114
-#, c-format
-msgid "%s isn't available"
-msgstr "%s n'est pas disponible"
-
-#: 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: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:428 parse-options.c:436
-#, c-format
-msgid "did you mean `--%s` (with two dashes)?"
-msgstr "vouliez-vous dire `--%s` (avec deux signes moins)?"
-
-#: parse-options.c:678 parse-options.c:1054
-#, c-format
-msgid "alias of --%s"
-msgstr "alias pour --%s"
-
-#: parse-options.c:892
-#, c-format
-msgid "unknown option `%s'"
-msgstr "option inconnue « %s »"
-
-#: parse-options.c:894
-#, c-format
-msgid "unknown switch `%c'"
-msgstr "bascule inconnue « %c »"
-
-#: parse-options.c:896
-#, c-format
-msgid "unknown non-ascii option in string: `%s'"
-msgstr "option non-ascii inconnue dans la chaîne : '%s'"
-
-#: parse-options.c:920
-msgid "..."
-msgstr "..."
-
-#: parse-options.c:934
-#, c-format
-msgid "usage: %s"
-msgstr "usage : %s"
-
-#. TRANSLATORS: the colon here should align with the
-#. one in "usage: %s" translation.
-#.
-#: parse-options.c:949
-#, c-format
-msgid "   or: %s"
-msgstr "   ou : %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:970
-#, c-format
-msgid "%*s%s"
-msgstr "%*s%s"
-
-#: parse-options.c:993
-#, c-format
-msgid "    %s"
-msgstr "    %s"
-
-#: parse-options.c:1040
-msgid "-NUM"
-msgstr "-NUM"
-
-#: path.c:922
-#, c-format
-msgid "Could not make %s writable by group"
-msgstr "Impossible de rendre %s inscriptible pour le groupe"
-
-#: 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:168
-msgid "Only one 'attr:' specification is allowed."
-msgstr "Une seule spécification 'attr:' est autorisée."
-
-#: pathspec.c:171
-msgid "attr spec must not be empty"
-msgstr "un spécificateur d'attribut ne peut pas être vide"
-
-#: pathspec.c:214
-#, c-format
-msgid "invalid attribute name %s"
-msgstr "nom d'attribut invalide %s"
-
-#: 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:286
-msgid ""
-"global 'literal' pathspec setting is incompatible with all other global "
-"pathspec settings"
-msgstr ""
-"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:326
-msgid "invalid parameter for pathspec magic 'prefix'"
-msgstr "paramètre invalide pour le spécificateur magique de chemin 'prefix'"
-
-#: 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: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:390
-#, c-format
-msgid "Unimplemented pathspec magic '%c' in '%s'"
-msgstr "Spécificateur magique '%c' non implémenté dans '%s'"
-
-#: pathspec.c:449
-#, c-format
-msgid "%s: 'literal' and 'glob' are incompatible"
-msgstr "%s : 'literal' et 'glob' sont incompatibles"
-
-#: 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:541
-#, c-format
-msgid "'%s' (mnemonic: '%c')"
-msgstr "'%s' (mnémonique : '%c')"
-
-#: 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:618
-#, c-format
-msgid "pathspec '%s' is beyond a symbolic link"
-msgstr "le chemin '%s' est au-delà d'un lien symbolique"
-
-#: pathspec.c:663
-#, c-format
-msgid "line is badly quoted: %s"
-msgstr "la ligne est mal citée : %s"
-
-#: pkt-line.c:92
-msgid "unable to write flush packet"
-msgstr "impossible d'écrire le paquet de vidage"
-
-#: pkt-line.c:99
-msgid "unable to write delim packet"
-msgstr "impossible d'écrire le paquet de délimitation"
-
-#: pkt-line.c:106
-msgid "unable to write response end packet"
-msgstr "impossible d'écrire le paquet de fin de réponse"
-
-#: pkt-line.c:113
-msgid "flush packet write failed"
-msgstr "échec de l'écriture du vidage de paquet"
-
-#: pkt-line.c:153
-msgid "protocol error: impossibly long line"
-msgstr "erreur de protocole : ligne impossiblement trop longue"
-
-#: pkt-line.c:169 pkt-line.c:171
-msgid "packet write with format failed"
-msgstr "échec de l'écriture d'un paquet avec format"
-
-#: 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 "
-"d'un paquet"
-
-#: pkt-line.c:222
-#, c-format
-msgid "packet write failed: %s"
-msgstr "échec de l'écriture d'un paquet : %s"
-
-#: pkt-line.c:349 pkt-line.c:350
-msgid "read error"
-msgstr "erreur de lecture"
-
-#: 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:417 pkt-line.c:419
-#, 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:434 pkt-line.c:436 pkt-line.c:442 pkt-line.c:444
-#, c-format
-msgid "protocol error: bad line length %d"
-msgstr "erreur de protocole : mauvaise longueur de ligne %d"
-
-#: pkt-line.c:472 sideband.c:165
-#, c-format
-msgid "remote error: %s"
-msgstr "erreur distante : %s"
-
-#: preload-index.c:125
-msgid "Refreshing index"
-msgstr "Rafraîchissement de l'index"
-
-#: preload-index.c:144
-#, c-format
-msgid "unable to create threaded lstat: %s"
-msgstr "impossible de créer le lstat en fil : %s"
-
-#: pretty.c:1051
-msgid "unable to parse --pretty format"
-msgstr "impossible d'analyser le format --pretty"
-
-#: promisor-remote.c:31
-msgid "promisor-remote: unable to fork off fetch subprocess"
-msgstr ""
-"promisor-remote : impossible de créer un sous-processus de récupération"
-
-#: promisor-remote.c:38 promisor-remote.c:40
-msgid "promisor-remote: could not write to fetch subprocess"
-msgstr ""
-"promisor-remote : impossible d'écrire vers un sous-processus de récupération"
-
-#: promisor-remote.c:44
-msgid "promisor-remote: could not close stdin to fetch subprocess"
-msgstr ""
-"promisor-remote : impossible de fermer l'entrée standard du sous-processus "
-"de récupération"
-
-#: promisor-remote.c:54
-#, c-format
-msgid "promisor remote name cannot begin with '/': %s"
-msgstr "un nom de prometteur distant ne peut pas commencer par '/' : %s"
-
-#: protocol-caps.c:103
-msgid "object-info: expected flush after arguments"
-msgstr "object-info : vidage attendu après les arguments"
-
-#: prune-packed.c:35
-msgid "Removing duplicate objects"
-msgstr "Suppression des objets dupliqués"
-
-#: range-diff.c:68
-msgid "could not start `log`"
-msgstr "impossible de démarrer `log`"
-
-#: range-diff.c:70
-msgid "could not read `log` output"
-msgstr "impossible de lire la sortie de `log`"
-
-#: range-diff.c:98 sequencer.c:5575
-#, c-format
-msgid "could not parse commit '%s'"
-msgstr "impossible d'analyser le commit '%s'"
-
-#: range-diff.c:109
-#, c-format
-msgid ""
-"could not parse first line of `log` output: did not start with 'commit ': "
-"'%s'"
-msgstr ""
-"impossible d'analyser la première ligne de la sortie de `log` : ne commence "
-"pas par 'commit' : '%s'"
-
-#: range-diff.c:132
-#, c-format
-msgid "could not parse git header '%.*s'"
-msgstr "impossible d'analyser l'entête git '%.*s'"
-
-#: range-diff.c:300
-msgid "failed to generate diff"
-msgstr "échec de la génération de diff"
-
-#: range-diff.c:558 range-diff.c:560
-#, c-format
-msgid "could not parse log for '%s'"
-msgstr "impossible d'analyser le journal pour '%s'"
-
-#: read-cache.c:737
-#, c-format
-msgid "will not add file alias '%s' ('%s' already exists in index)"
-msgstr "pas d'ajout d'alias de fichier '%s'(« %s » existe déjà dans l'index)"
-
-#: read-cache.c:753
-msgid "cannot create an empty blob in the object database"
-msgstr "impossible de créer un blob vide dans la base de donnée d'objets"
-
-#: read-cache.c:775
-#, c-format
-msgid "%s: can only add regular files, symbolic links or git-directories"
-msgstr ""
-"%s : ne peut ajouter que des fichiers normaux, des liens symboliques ou des "
-"répertoires git"
-
-#: read-cache.c:780 builtin/submodule--helper.c:3359
-#, c-format
-msgid "'%s' does not have a commit checked out"
-msgstr "'%s' n'a pas de commit extrait"
-
-#: read-cache.c:832
-#, c-format
-msgid "unable to index file '%s'"
-msgstr "indexation du fichier '%s' impossible"
-
-#: read-cache.c:851
-#, c-format
-msgid "unable to add '%s' to index"
-msgstr "impossible d'ajouter '%s' à l'index"
-
-#: read-cache.c:862
-#, c-format
-msgid "unable to stat '%s'"
-msgstr "fstat de '%s' impossible"
-
-#: read-cache.c:1404
-#, 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:1619
-msgid "Refresh index"
-msgstr "Rafraîchir l'index"
-
-#: read-cache.c:1751
-#, c-format
-msgid ""
-"index.version set, but the value is invalid.\n"
-"Using version %i"
-msgstr ""
-"index.version renseignée, mais la valeur est invalide.\n"
-"Utilisation de la version %i"
-
-#: read-cache.c:1761
-#, c-format
-msgid ""
-"GIT_INDEX_VERSION set, but the value is invalid.\n"
-"Using version %i"
-msgstr ""
-"GIT_INDEX_VERSION est renseigné, mais la valeur est invalide.\n"
-"Utilisation de la version %i"
-
-#: read-cache.c:1817
-#, c-format
-msgid "bad signature 0x%08x"
-msgstr "signature incorrecte 0x%08x"
-
-#: read-cache.c:1820
-#, c-format
-msgid "bad index version %d"
-msgstr "mauvaise version d'index %d"
-
-#: read-cache.c:1829
-msgid "bad index file sha1 signature"
-msgstr "mauvaise signature sha1 d'index"
-
-#: read-cache.c:1863
-#, 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:1865
-#, c-format
-msgid "ignoring %.4s extension"
-msgstr "extension %.4s ignorée"
-
-#: read-cache.c:1902
-#, c-format
-msgid "unknown index entry format 0x%08x"
-msgstr "format d'entrée d'index inconnu 0x%08x"
-
-#: read-cache.c:1918
-#, 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:1975
-msgid "unordered stage entries in index"
-msgstr "entrées de préparation non ordonnées dans l'index"
-
-#: read-cache.c:1978
-#, 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:1981
-#, c-format
-msgid "unordered stage entries for '%s'"
-msgstr "entrées de préparation non ordonnées pour '%s'"
-
-#: read-cache.c:2096 read-cache.c:2402 rerere.c:549 rerere.c:583 rerere.c:1096
-#: submodule.c:1831 builtin/add.c:586 builtin/check-ignore.c:183
-#: builtin/checkout.c:532 builtin/checkout.c:724 builtin/clean.c:1016
-#: builtin/commit.c:379 builtin/diff-tree.c:122 builtin/grep.c:521
-#: builtin/mv.c:148 builtin/reset.c:506 builtin/rm.c:293
-#: builtin/submodule--helper.c:335 builtin/submodule--helper.c:3319
-msgid "index file corrupt"
-msgstr "fichier d'index corrompu"
-
-#: read-cache.c:2240
-#, 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:2253
-#, c-format
-msgid "unable to join load_cache_entries thread: %s"
-msgstr "impossible de joindre le fil load_cache_entries : %s"
-
-#: read-cache.c:2286
-#, c-format
-msgid "%s: index file open failed"
-msgstr "%s : l'ouverture du fichier d'index a échoué"
-
-#: read-cache.c:2290
-#, c-format
-msgid "%s: cannot stat the open index"
-msgstr "%s : impossible de faire un stat sur l'index ouvert"
-
-#: read-cache.c:2294
-#, c-format
-msgid "%s: index file smaller than expected"
-msgstr "%s : fichier d'index plus petit qu'attendu"
-
-#: read-cache.c:2298
-#, c-format
-msgid "%s: unable to map index file%s"
-msgstr "%s : impossible de mapper le fichier d'index%s"
-
-#: read-cache.c:2341
-#, 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:2368
-#, c-format
-msgid "unable to join load_index_extensions thread: %s"
-msgstr "impossible de joindre le fil load_index_extensions : %s"
-
-#: read-cache.c:2414
-#, c-format
-msgid "could not freshen shared index '%s'"
-msgstr "impossible de rafraîchir l'index partagé '%s'"
-
-#: read-cache.c:2473
-#, c-format
-msgid "broken index, expect %s in %s, got %s"
-msgstr "index cassé, %s attendu dans %s, %s obtenu"
-
-#: read-cache.c:3032
-msgid "cannot write split index for a sparse index"
-msgstr "impossible d'écrire un index scindé pour un index clairsemé"
-
-#: read-cache.c:3114 strbuf.c:1192 wrapper.c:717 builtin/merge.c:1156
-#, c-format
-msgid "could not close '%s'"
-msgstr "impossible de fermer '%s'"
-
-#: read-cache.c:3157
-msgid "failed to convert to a sparse-index"
-msgstr "échec de conversion d'un index clairsemé"
-
-#: read-cache.c:3228
-#, c-format
-msgid "could not stat '%s'"
-msgstr "impossible de stat '%s'"
-
-#: read-cache.c:3241
-#, c-format
-msgid "unable to open git dir: %s"
-msgstr "impossible d'ouvrir le répertoire git : %s"
-
-#: read-cache.c:3253
-#, c-format
-msgid "unable to unlink: %s"
-msgstr "échec lors de l'unlink : %s"
-
-#: read-cache.c:3282
-#, c-format
-msgid "cannot fix permission bits on '%s'"
-msgstr "impossible de régler les bits de droit de '%s'"
-
-#: read-cache.c:3439
-#, c-format
-msgid "%s: cannot drop to stage #0"
-msgstr "%s : impossible de revenir à l'étape 0"
-
-#: rebase-interactive.c:11
-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 ""
-"Vous pouvez corriger ceci avec 'git rebase --edit-todo' puis lancez 'git "
-"rebase --continue'.\n"
-"Ou vous pouvez abandonner le rebasage avec 'git rebase --abort'.\n"
-
-#: rebase-interactive.c:33
-#, c-format
-msgid ""
-"unrecognized setting %s for option rebase.missingCommitsCheck. Ignoring."
-msgstr ""
-"paramètre non reconnu %s pour l'option rebase.missingCommitsCheck. Ignoré."
-
-#: rebase-interactive.c:42
-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 [-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"
-"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 [-C | -c] <commit> = comme \"squash\", mais en ne gardant que le "
-"message\n"
-"                    du commit précédent, à moins que -C ne soit utilisé, "
-"auquel cas, conserver\n"
-"                    ne conserver que le message de ce commit ; -c est "
-"identique à -C mais ouvre\n"
-"                    un éditeur\n"
-" x, exec <commit> = lancer la commande (reste de la ligne) dans un shell\n"
-" b, break = s'arrêter ici (on peut continuer ensuite avec 'git rebase --"
-"continue')\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"
-
-#: rebase-interactive.c:66
-#, c-format
-msgid "Rebase %s onto %s (%d command)"
-msgid_plural "Rebase %s onto %s (%d commands)"
-msgstr[0] "Rebasage de %s sur %s (%d commande)"
-msgstr[1] "Rebasage de %s sur %s (%d commandes)"
-
-#: rebase-interactive.c:75
-msgid ""
-"\n"
-"Do not remove any line. Use 'drop' explicitly to remove a commit.\n"
-msgstr ""
-"\n"
-"Ne supprimez aucune ligne. Utilisez 'drop' explicitement pour supprimer un "
-"commit.\n"
-
-#: rebase-interactive.c:78
-msgid ""
-"\n"
-"If you remove a line here THAT COMMIT WILL BE LOST.\n"
-msgstr ""
-"\n"
-"Si vous éliminez une ligne ici, LE COMMIT CORRESPONDANT SERA PERDU.\n"
-
-#: rebase-interactive.c:84
-msgid ""
-"\n"
-"You are editing the todo file of an ongoing interactive rebase.\n"
-"To continue rebase after editing, run:\n"
-"    git rebase --continue\n"
-"\n"
-msgstr ""
-"\n"
-"Vous êtes en train d'éditer le fichier todo d'un rebasage interactif en "
-"cours.\n"
-"Pour continuer le rebasage après édition, lancez :\n"
-"    git rebase --continue\n"
-"\n"
-
-#: rebase-interactive.c:89
-msgid ""
-"\n"
-"However, if you remove everything, the rebase will be aborted.\n"
-"\n"
-msgstr ""
-"\n"
-"Cependant, si vous effacez tout, le rebasage sera annulé.\n"
-"\n"
-
-#: rebase-interactive.c:113 rerere.c:469 rerere.c:677 sequencer.c:3879
-#: sequencer.c:3905 sequencer.c:5681 builtin/fsck.c:328 builtin/gc.c:1791
-#: builtin/rebase.c:191
-#, c-format
-msgid "could not write '%s'"
-msgstr "impossible d'écrire '%s'"
-
-#: rebase-interactive.c:119
-#, c-format
-msgid "could not write '%s'."
-msgstr "impossible d'écrire '%s'."
-
-#: rebase-interactive.c:196
-#, c-format
-msgid ""
-"Warning: some commits may have been dropped accidentally.\n"
-"Dropped commits (newer to older):\n"
-msgstr ""
-"Attention : certains commits ont pu être accidentellement supprimés.\n"
-"Commits supprimés (du plus jeune au plus vieux) :\n"
-
-#: rebase-interactive.c:203
-#, c-format
-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"
-"The possible behaviours are: ignore, warn, error.\n"
-"\n"
-msgstr ""
-"Pour éviter ce message, utilisez \"drop\" pour supprimer explicitement un "
-"commit.\n"
-"\n"
-"Utilisez 'git config rebase.missingCommitsCheck' pour changer le niveau "
-"d'avertissements.\n"
-"Les comportements disponibles sont : ignore, warn, error.\n"
-"\n"
-
-#: rebase.c:29
-#, c-format
-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:2057
-msgid "gone"
-msgstr "disparue"
-
-#: ref-filter.c:43
-#, c-format
-msgid "ahead %d"
-msgstr "en avance de %d"
-
-#: ref-filter.c:44
-#, c-format
-msgid "behind %d"
-msgstr "en retard de %d"
-
-#: ref-filter.c:45
-#, c-format
-msgid "ahead %d, behind %d"
-msgstr "en avance de %d, en retard de %d"
-
-#: ref-filter.c:235
-#, c-format
-msgid "expected format: %%(color:<color>)"
-msgstr "format attendu : %%(color:<couleur>)"
-
-#: ref-filter.c:237
-#, c-format
-msgid "unrecognized color: %%(color:%s)"
-msgstr "couleur non reconnue : %%(color:%s)"
-
-#: ref-filter.c:259
-#, c-format
-msgid "Integer value expected refname:lstrip=%s"
-msgstr "Valeur entière attendue refname:lstrip=%s"
-
-#: ref-filter.c:263
-#, c-format
-msgid "Integer value expected refname:rstrip=%s"
-msgstr "Valeur entière attendue refname:rstrip=%s"
-
-#: ref-filter.c:265 ref-filter.c:344 ref-filter.c:377 ref-filter.c:431
-#: ref-filter.c:443 ref-filter.c:462 ref-filter.c:534 ref-filter.c:560
-#, c-format
-msgid "unrecognized %%(%s) argument: %s"
-msgstr "argument %%(%s) non reconnu : %s"
-
-#: ref-filter.c:320
-#, c-format
-msgid "%%(objecttype) does not take arguments"
-msgstr "%%(objecttype) n'accepte pas d'argument"
-
-#: ref-filter.c:352
-#, c-format
-msgid "%%(deltabase) does not take arguments"
-msgstr "%%(deltabase) n'accepte pas d'argument"
-
-#: ref-filter.c:364
-#, c-format
-msgid "%%(body) does not take arguments"
-msgstr "%%(body) n'accepte pas d'argument"
-
-#: ref-filter.c:396
-#, c-format
-msgid "expected %%(trailers:key=<value>)"
-msgstr "%%(trailers:key=<value>) attendu"
-
-#: ref-filter.c:398
-#, c-format
-msgid "unknown %%(trailers) argument: %s"
-msgstr "argument %%(trailers) inconnu : %s"
-
-#: ref-filter.c:429
-#, c-format
-msgid "positive value expected contents:lines=%s"
-msgstr "valeur positive attendue contents:lines=%s"
-
-#: ref-filter.c:458
-#, c-format
-msgid "positive value expected '%s' in %%(%s)"
-msgstr "valeur positive attendue '%s' dans %%(%s)"
-
-#: ref-filter.c:476
-#, c-format
-msgid "unrecognized email option: %s"
-msgstr "option de courriel non reconnue : %s"
-
-#: ref-filter.c:506
-#, c-format
-msgid "expected format: %%(align:<width>,<position>)"
-msgstr "format attendu : %%(align:<largeur>,<position>)"
-
-#: ref-filter.c:518
-#, c-format
-msgid "unrecognized position:%s"
-msgstr "position non reconnue : %s"
-
-#: ref-filter.c:525
-#, c-format
-msgid "unrecognized width:%s"
-msgstr "largeur non reconnue : %s"
-
-#: 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: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:707
-#, c-format
-msgid "unknown field name: %.*s"
-msgstr "nom de champ inconnu : %.*s"
-
-#: 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:844 ref-filter.c:910 ref-filter.c:946 ref-filter.c:948
-#, c-format
-msgid "format: %%(%s) atom used without a %%(%s) atom"
-msgstr "format : atome %%(%s) utilisé sans un atome %%(%s)"
-
-#: 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:914
-#, c-format
-msgid "format: %%(then) atom used after %%(else)"
-msgstr "format: atome %%(then) utilisé après %%(else)"
-
-#: 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:965
-#, c-format
-msgid "format: %%(end) atom used without corresponding atom"
-msgstr "format : atome %%(end) utilisé sans atome correspondant"
-
-#: ref-filter.c:1027
-#, c-format
-msgid "malformed format string %s"
-msgstr "chaîne de formatage mal formée %s"
-
-#: 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:1707
-#, c-format
-msgid "(no branch, rebasing %s)"
-msgstr "(aucune branche, rebasage de %s)"
-
-#: ref-filter.c:1710
-#, c-format
-msgid "(no branch, rebasing detached HEAD %s)"
-msgstr "(aucune branche, rebasage de la HEAD détachée %s)"
-
-#: ref-filter.c:1713
-#, c-format
-msgid "(no branch, bisect started on %s)"
-msgstr "(aucune branche, bisect a démarré sur %s)"
-
-#: ref-filter.c:1717
-#, c-format
-msgid "(HEAD detached at %s)"
-msgstr "(HEAD détachée sur %s)"
-
-#: ref-filter.c:1720
-#, c-format
-msgid "(HEAD detached from %s)"
-msgstr "(HEAD détachée depuis %s)"
-
-#: ref-filter.c:1723
-msgid "(no branch)"
-msgstr "(aucune branche)"
-
-#: ref-filter.c:1755 ref-filter.c:1973
-#, c-format
-msgid "missing object %s for %s"
-msgstr "objet manquant %s pour %s"
-
-#: ref-filter.c:1765
-#, c-format
-msgid "parse_object_buffer failed on %s for %s"
-msgstr "échec de parse_object_buffer sur %s pour %s"
-
-#: ref-filter.c:2156
-#, c-format
-msgid "malformed object at '%s'"
-msgstr "objet malformé à '%s'"
-
-#: ref-filter.c:2246
-#, c-format
-msgid "ignoring ref with broken name %s"
-msgstr "réf avec un nom cassé %s ignoré"
-
-#: ref-filter.c:2251 refs.c:672
-#, c-format
-msgid "ignoring broken ref %s"
-msgstr "réf cassé %s ignoré"
-
-#: ref-filter.c:2630
-#, c-format
-msgid "format: %%(end) atom missing"
-msgstr "format: atome %%(end) manquant"
-
-#: ref-filter.c:2741
-#, c-format
-msgid "malformed object name %s"
-msgstr "nom d'objet malformé %s"
-
-#: ref-filter.c:2746
-#, c-format
-msgid "option `%s' must point to a commit"
-msgstr "l'option '%s' doit pointer sur un commit"
-
-#: reflog.c:407
-#, c-format
-msgid "not a reflog: %s"
-msgstr "'%s' n'est pas un journal de références"
-
-#: reflog.c:410
-#, c-format
-msgid "no reflog for '%s'"
-msgstr "pas de journal de références pour '%s'"
-
-#: refs.c:262
-#, c-format
-msgid "%s does not point to a valid object!"
-msgstr "%s ne pointe pas sur un objet valide!"
-
-#: refs.c:561
-#, 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"
-"of your new repositories, which will suppress this warning, call:\n"
-"\n"
-"\tgit config --global init.defaultBranch <name>\n"
-"\n"
-"Names commonly chosen instead of 'master' are 'main', 'trunk' and\n"
-"'development'. The just-created branch can be renamed via this command:\n"
-"\n"
-"\tgit branch -m <name>\n"
-msgstr ""
-"Utilisation de '%s' comme nom de la branche initiale. Le nom de la branche\n"
-"par défaut peut changer. Pour configurer le nom de la branche initiale\n"
-"pour tous les nouveaux dépôts, et supprimer cet avertissement, lancez :\n"
-"\n"
-"\tgit config --global init.defaultBranch <nom>\n"
-"\n"
-"Les noms les plus utilisés à la place de 'master' sont 'main', 'trunk' et\n"
-"'development'. La branche nouvellement créée peut être rénommée avec :\n"
-"\n"
-"\tgit branch -m <nom>\n"
-
-#: refs.c:583
-#, c-format
-msgid "could not retrieve `%s`"
-msgstr "impossible de récupérer `%s`"
-
-#: refs.c:593
-#, c-format
-msgid "invalid branch name: %s = %s"
-msgstr "nom de branche invalide : %s = %s"
-
-#: refs.c:670
-#, c-format
-msgid "ignoring dangling symref %s"
-msgstr "symref pendant %s ignoré"
-
-#: refs.c:919
-#, 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:926
-#, 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:991
-#, c-format
-msgid "log for %s is empty"
-msgstr "le journal pour la réf %s est vide"
-
-#: refs.c:1086
-#, 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:1164
-#, c-format
-msgid "update_ref failed for ref '%s': %s"
-msgstr "échec de update_ref pour la réf '%s' : %s"
-
-#: refs.c:2059
-#, c-format
-msgid "multiple updates for ref '%s' not allowed"
-msgstr "mises à jour multiples pour la réf '%s' non permises"
-
-#: refs.c:2145
-msgid "ref updates forbidden inside quarantine environment"
-msgstr "mises à jour des références interdites en environnement de quarantaine"
-
-#: refs.c:2156
-msgid "ref updates aborted by hook"
-msgstr "mises à jour des références annulées par le crochet"
-
-#: refs.c:2264 refs.c:2294
-#, c-format
-msgid "'%s' exists; cannot create '%s'"
-msgstr "'%s' existe ; impossible de créer '%s'"
-
-#: refs.c:2270 refs.c:2305
-#, 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:1295
-#, c-format
-msgid "could not remove reference %s"
-msgstr "impossible de supprimer la référence %s"
-
-#: refs/files-backend.c:1310 refs/packed-backend.c:1565
-#: refs/packed-backend.c:1575
-#, c-format
-msgid "could not delete reference %s: %s"
-msgstr "impossible de supprimer la référence %s : %s"
-
-#: refs/files-backend.c:1313 refs/packed-backend.c:1578
-#, c-format
-msgid "could not delete references: %s"
-msgstr "impossible de supprimer les références : %s"
-
-#: refspec.c:170
-#, c-format
-msgid "invalid refspec '%s'"
-msgstr "spécificateur de réference invalide : '%s'"
-
-#: remote.c:402
-#, c-format
-msgid "config remote shorthand cannot begin with '/': %s"
-msgstr ""
-"un raccourci de configuration de distant ne peut pas commencer par '/' : %s"
-
-#: remote.c:450
-msgid "more than one receivepack given, using the first"
-msgstr "plus d'un receivepack fournis, utilisation du premier"
-
-#: remote.c:458
-msgid "more than one uploadpack given, using the first"
-msgstr "plus d'un uploadpack fournis, utilisation du premier"
-
-#: remote.c:698
-#, c-format
-msgid "Cannot fetch both %s and %s to %s"
-msgstr "Impossible de récupérer à la fois %s et %s pour %s"
-
-#: remote.c:702
-#, c-format
-msgid "%s usually tracks %s, not %s"
-msgstr "%s suit habituellement %s, pas %s"
-
-#: remote.c:706
-#, c-format
-msgid "%s tracks both %s and %s"
-msgstr "%s suit à la fois %s et %s"
-
-#: remote.c:774
-#, c-format
-msgid "key '%s' of pattern had no '*'"
-msgstr "la clé '%s' du modèle n'a pas de '*'"
-
-#: remote.c:784
-#, c-format
-msgid "value '%s' of pattern has no '*'"
-msgstr "la valeur '%s' du modèle n'a pas de '*'"
-
-#: remote.c:1191
-#, c-format
-msgid "src refspec %s does not match any"
-msgstr ""
-"le spécificateur de référence source %s ne correspond à aucune référence"
-
-#: remote.c:1196
-#, c-format
-msgid "src refspec %s matches more than one"
-msgstr ""
-"le spécificateur de référence source %s correspond à plus d'une référence"
-
-#. TRANSLATORS: "matches '%s'%" is the <dst> part of "git push
-#. <remote> <src>:<dst>" push, and "being pushed ('%s')" is
-#. the <src>.
-#.
-#: remote.c:1211
-#, c-format
-msgid ""
-"The destination you provided is not a full refname (i.e.,\n"
-"starting with \"refs/\"). We tried to guess what you meant by:\n"
-"\n"
-"- Looking for a ref that matches '%s' on the remote side.\n"
-"- Checking if the <src> being pushed ('%s')\n"
-"  is a ref in \"refs/{heads,tags}/\". If so we add a corresponding\n"
-"  refs/{heads,tags}/ prefix on the remote side.\n"
-"\n"
-"Neither worked, so we gave up. You must fully qualify the ref."
-msgstr ""
-"La destination que vous avez fournie n'est pas un nom de référence complète\n"
-"(c'est-à-dire commençant par \"ref/\"). Essai d'approximation par :\n"
-"\n"
-"- Recherche d'une référence qui correspond à '%s' sur le serveur distant.\n"
-"- Vérification si la <source> en cours de poussée ('%s')\n"
-"  est une référence dans \"refs/{heads,tags}/\". Si oui, ajout du préfixe\n"
-"  refs/{heads,tags}/ correspondant du côté distant.\n"
-"\n"
-"Aucune n'a fonctionné, donc abandon. Veuillez spécifier une référence "
-"totalement qualifiée."
-
-#: remote.c:1231
-#, c-format
-msgid ""
-"The <src> part of the refspec is a commit object.\n"
-"Did you mean to create a new branch by pushing to\n"
-"'%s:refs/heads/%s'?"
-msgstr ""
-"La partie <source> du spécificateur de référence est un objet commit.\n"
-"Souhaitiez-vous créer une nouvelle branche en poussant sur\n"
-"'%s:refs/heads/%s' ?"
-
-#: remote.c:1236
-#, c-format
-msgid ""
-"The <src> part of the refspec is a tag object.\n"
-"Did you mean to create a new tag by pushing to\n"
-"'%s:refs/tags/%s'?"
-msgstr ""
-"La partie <source> du spécificateur de référence est un objet étiquette.\n"
-"Souhaitiez-vous créer une nouvelle étiquette en poussant sur\n"
-"'%s:refs/tags/%s' ?"
-
-#: remote.c:1241
-#, c-format
-msgid ""
-"The <src> part of the refspec is a tree object.\n"
-"Did you mean to tag a new tree by pushing to\n"
-"'%s:refs/tags/%s'?"
-msgstr ""
-"La partie <source> du spécificateur de référence est un objet arbre.\n"
-"Souhaitiez-vous créer un nouvel arbre en poussant sur\n"
-"'%s:refs/tags/%s' ?"
-
-#: remote.c:1246
-#, c-format
-msgid ""
-"The <src> part of the refspec is a blob object.\n"
-"Did you mean to tag a new blob by pushing to\n"
-"'%s:refs/tags/%s'?"
-msgstr ""
-"La partie <source> du spécificateur de référence est un objet blob.\n"
-"Souhaitiez-vous créer un nouveau blob en poussant sur\n"
-"'%s:refs/tags/%s' ?"
-
-#: remote.c:1282
-#, c-format
-msgid "%s cannot be resolved to branch"
-msgstr "'%s' ne peut pas être résolue comme une branche"
-
-#: remote.c:1293
-#, c-format
-msgid "unable to delete '%s': remote ref does not exist"
-msgstr "suppression de '%s' impossible : la référence distante n'existe pas"
-
-#: remote.c:1305
-#, c-format
-msgid "dst refspec %s matches more than one"
-msgstr ""
-"le spécificateur de référence dst %s correspond à plus d'un spécificateur de "
-"références"
-
-#: remote.c:1312
-#, c-format
-msgid "dst ref %s receives from more than one src"
-msgstr "le spécificateur de référence dst %s reçoit depuis plus d'une source"
-
-#: remote.c:1833 remote.c:1940
-msgid "HEAD does not point to a branch"
-msgstr "HEAD ne pointe pas sur une branche"
-
-#: remote.c:1842
-#, c-format
-msgid "no such branch: '%s'"
-msgstr "pas de branche '%s'"
-
-#: remote.c:1845
-#, c-format
-msgid "no upstream configured for branch '%s'"
-msgstr "aucune branche amont configurée pour la branche '%s'"
-
-#: remote.c:1851
-#, c-format
-msgid "upstream branch '%s' not stored as a remote-tracking branch"
-msgstr "la branche amont '%s' n'est pas stockée comme branche de suivi"
-
-#: remote.c:1866
-#, c-format
-msgid "push destination '%s' on remote '%s' has no local tracking branch"
-msgstr ""
-"la destination de poussée '%s' sur le serveur distant '%s' n'a pas de "
-"branche locale de suivi"
-
-#: remote.c:1881
-#, c-format
-msgid "branch '%s' has no remote for pushing"
-msgstr "la branche '%s' n'a aucune branche distante de poussée"
-
-#: remote.c:1891
-#, c-format
-msgid "push refspecs for '%s' do not include '%s'"
-msgstr "les références de spec pour '%s' n'incluent pas '%s'"
-
-#: remote.c:1904
-msgid "push has no destination (push.default is 'nothing')"
-msgstr "la poussée n'a pas de destination (push.default vaut 'nothing')"
-
-#: remote.c:1926
-msgid "cannot resolve 'simple' push to a single destination"
-msgstr ""
-"impossible de résoudre une poussée 'simple' pour une destination unique"
-
-#: remote.c:2059
-#, c-format
-msgid "couldn't find remote ref %s"
-msgstr "impossible de trouver la référence distante %s"
-
-#: remote.c:2072
-#, c-format
-msgid "* Ignoring funny ref '%s' locally"
-msgstr "* Référence bizarre '%s' ignorée localement"
-
-#: remote.c:2235
-#, c-format
-msgid "Your branch is based on '%s', but the upstream is gone.\n"
-msgstr "Votre branche est basée sur '%s', mais la branche amont a disparu.\n"
-
-#: remote.c:2239
-msgid "  (use \"git branch --unset-upstream\" to fixup)\n"
-msgstr "  (utilisez \"git branch --unset-upstream\" pour corriger)\n"
-
-#: remote.c:2242
-#, c-format
-msgid "Your branch is up to date with '%s'.\n"
-msgstr "Votre branche est à jour avec '%s'.\n"
-
-#: remote.c:2246
-#, c-format
-msgid "Your branch and '%s' refer to different commits.\n"
-msgstr "Votre branche et '%s' font référence à des commits différents.\n"
-
-#: remote.c:2249
-#, c-format
-msgid "  (use \"%s\" for details)\n"
-msgstr "  (utilisez \"%s\" pour plus de détails)\n"
-
-#: remote.c:2253
-#, c-format
-msgid "Your branch is ahead of '%s' by %d commit.\n"
-msgid_plural "Your branch is ahead of '%s' by %d commits.\n"
-msgstr[0] "Votre branche est en avance sur '%s' de %d commit.\n"
-msgstr[1] "Votre branche est en avance sur '%s' de %d commits.\n"
-
-#: remote.c:2259
-msgid "  (use \"git push\" to publish your local commits)\n"
-msgstr "  (utilisez \"git push\" pour publier vos commits locaux)\n"
-
-#: remote.c:2262
-#, c-format
-msgid "Your branch is behind '%s' by %d commit, and can be fast-forwarded.\n"
-msgid_plural ""
-"Your branch is behind '%s' by %d commits, and can be fast-forwarded.\n"
-msgstr[0] ""
-"Votre branche est en retard sur '%s' de %d commit, et peut être mise à jour "
-"en avance rapide.\n"
-msgstr[1] ""
-"Votre branche est en retard sur '%s' de %d commits, et peut être mise à jour "
-"en avance rapide.\n"
-
-#: remote.c:2270
-msgid "  (use \"git pull\" to update your local branch)\n"
-msgstr "  (utilisez \"git pull\" pour mettre à jour votre branche locale)\n"
-
-#: remote.c:2273
-#, c-format
-msgid ""
-"Your branch and '%s' have diverged,\n"
-"and have %d and %d different commit each, respectively.\n"
-msgid_plural ""
-"Your branch and '%s' have diverged,\n"
-"and have %d and %d different commits each, respectively.\n"
-msgstr[0] ""
-"Votre branche et '%s' ont divergé,\n"
-"et ont %d et %d commit différent chacune respectivement.\n"
-msgstr[1] ""
-"Votre branche et '%s' ont divergé,\n"
-"et ont %d et %d commits différents chacune respectivement.\n"
-
-#: remote.c:2283
-msgid "  (use \"git pull\" to merge the remote branch into yours)\n"
-msgstr ""
-"  (utilisez \"git pull\" pour fusionner la branche distante dans la vôtre)\n"
-
-#: remote.c:2475
-#, c-format
-msgid "cannot parse expected object name '%s'"
-msgstr "impossible d'analyser le nom attendu d'objet '%s'"
-
-#: replace-object.c:21
-#, c-format
-msgid "bad replace ref name: %s"
-msgstr "mauvaise références de remplacement : %s"
-
-#: replace-object.c:30
-#, c-format
-msgid "duplicate replace ref: %s"
-msgstr "référence de remplacement dupliquée : %s"
-
-#: replace-object.c:82
-#, c-format
-msgid "replace depth too high for object %s"
-msgstr "profondeur de remplacement trop grande pour l'objet %s"
-
-#: rerere.c:201 rerere.c:210 rerere.c:213
-msgid "corrupt MERGE_RR"
-msgstr "MERGE_RR corrompu"
-
-#: rerere.c:248 rerere.c:253
-msgid "unable to write rerere record"
-msgstr "impossible d'écrire l'enregistrement rerere"
-
-#: rerere.c:479
-#, c-format
-msgid "there were errors while writing '%s' (%s)"
-msgstr "il y a eu des erreurs à l'écriture de '%s' (%s)"
-
-#: rerere.c:482 builtin/gc.c:2263 builtin/gc.c:2298
-#, c-format
-msgid "failed to flush '%s'"
-msgstr "échec du flush de '%s'"
-
-#: rerere.c:487 rerere.c:1024
-#, c-format
-msgid "could not parse conflict hunks in '%s'"
-msgstr "impossible d'analyser la section en conflit dans '%s'"
-
-#: rerere.c:669
-#, c-format
-msgid "failed utime() on '%s'"
-msgstr "échec de utime() sur '%s'"
-
-#: rerere.c:679
-#, c-format
-msgid "writing '%s' failed"
-msgstr "échec de l'écriture de '%s'"
-
-#: rerere.c:699
-#, c-format
-msgid "Staged '%s' using previous resolution."
-msgstr "'%s' indexé en utilisant la résolution pré-existante."
-
-#: rerere.c:738
-#, c-format
-msgid "Recorded resolution for '%s'."
-msgstr "Résolution enregistrée pour '%s'."
-
-#: rerere.c:773
-#, c-format
-msgid "Resolved '%s' using previous resolution."
-msgstr "'%s' résolu en utilisant la résolution pré-existante."
-
-#: rerere.c:788
-#, c-format
-msgid "cannot unlink stray '%s'"
-msgstr "impossible de délier '%s' qui est errant"
-
-#: rerere.c:792
-#, c-format
-msgid "Recorded preimage for '%s'"
-msgstr "Pré-image enregistrée pour '%s'"
-
-#: rerere.c:866 submodule.c:2290 builtin/log.c:2042
-#: builtin/submodule--helper.c:1786 builtin/submodule--helper.c:1833
-#, c-format
-msgid "could not create directory '%s'"
-msgstr "impossible de créer le répertoire '%s'"
-
-#: rerere.c:1042
-#, c-format
-msgid "failed to update conflicted state in '%s'"
-msgstr "échec de la mise à jour de l'état en conflit dans '%s'"
-
-#: rerere.c:1053 rerere.c:1060
-#, c-format
-msgid "no remembered resolution for '%s'"
-msgstr "aucune résolution enregistrée pour '%s'"
-
-#: rerere.c:1062
-#, c-format
-msgid "cannot unlink '%s'"
-msgstr "impossible de délier '%s'"
-
-#: rerere.c:1072
-#, c-format
-msgid "Updated preimage for '%s'"
-msgstr "Pré-image mise à jour pour '%s'"
-
-#: rerere.c:1081
-#, c-format
-msgid "Forgot resolution for '%s'\n"
-msgstr "Résolution  pour '%s' oubliée\n"
-
-#: rerere.c:1192
-msgid "unable to open rr-cache directory"
-msgstr "impossible d'ouvrir le répertoire rr-cache"
-
-#: reset.c:112
-msgid "could not determine HEAD revision"
-msgstr "impossible de déterminer la révision HEAD"
-
-#: reset.c:141 reset.c:147 sequencer.c:3696
-#, c-format
-msgid "failed to find tree of %s"
-msgstr "impossible de trouver l'arbre de %s"
-
-#: revision.c:2358
-msgid "--unpacked=<packfile> no longer supported"
-msgstr "--unpacked=<fichier-paquet> n'est plus géré"
-
-#: revision.c:2712
-msgid "your current branch appears to be broken"
-msgstr "votre branche actuelle semble cassée"
-
-#: revision.c:2715
-#, 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:2901
-msgid "object filtering requires --objects"
-msgstr "le filtrage d'objet exige --objects"
-
-#: revision.c:2918
-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:1262
-#, c-format
-msgid "cannot create async thread: %s"
-msgstr "impossible de créer un fil asynchrone : %s"
-
-#: send-pack.c:150
-msgid "unexpected flush packet while reading remote unpack status"
-msgstr ""
-"paquet de nettoyage inattendu pendant la lecture de l'état de dépaquetage "
-"distant"
-
-#: send-pack.c:152
-#, c-format
-msgid "unable to parse remote unpack status: %s"
-msgstr "impossible d'analyser l'état de dépaquetage distant : %s"
-
-#: send-pack.c:154
-#, c-format
-msgid "remote unpack failed: %s"
-msgstr "le dépaquetage a échoué : %s"
-
-#: send-pack.c:378
-msgid "failed to sign the push certificate"
-msgstr "impossible de signer le certificat de poussée"
-
-#: 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: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: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: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:539
-msgid ""
-"not sending a push certificate since the receiving end does not support --"
-"signed push"
-msgstr ""
-"pas d'envoi de certificat de poussée car le receveur ne gère pas les "
-"poussées avec --signed"
-
-#: 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:551
-msgid "the receiving end does not support push options"
-msgstr "le receveur ne gère pas les options de poussées"
-
-#: sequencer.c:197
-#, c-format
-msgid "invalid commit message cleanup mode '%s'"
-msgstr "mode de nettoyage invalide de message de validation '%s'"
-
-#: sequencer.c:325
-#, c-format
-msgid "could not delete '%s'"
-msgstr "impossible de supprimer '%s'"
-
-#: sequencer.c:345 sequencer.c:4724 builtin/rebase.c:564 builtin/rebase.c:1326
-#: builtin/rm.c:409
-#, c-format
-msgid "could not remove '%s'"
-msgstr "impossible de supprimer '%s'"
-
-#: sequencer.c:355
-msgid "revert"
-msgstr "revert"
-
-#: sequencer.c:357
-msgid "cherry-pick"
-msgstr "cherry-pick"
-
-#: sequencer.c:359
-msgid "rebase"
-msgstr "rebase"
-
-#: sequencer.c:361
-#, c-format
-msgid "unknown action: %d"
-msgstr "action inconnue : %d"
-
-#: sequencer.c:420
-msgid ""
-"after resolving the conflicts, mark the corrected paths\n"
-"with 'git add <paths>' or 'git rm <paths>'"
-msgstr ""
-"après résolution des conflits, marquez les chemins corrigés\n"
-"avec 'git add <chemins>' ou 'git rm <chemins>'"
-
-#: sequencer.c:423
-msgid ""
-"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 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: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:3288
-#, c-format
-msgid "could not lock '%s'"
-msgstr "impossible de verrouiller '%s'"
-
-#: sequencer.c:450 sequencer.c:3087 sequencer.c:3292 sequencer.c:3306
-#: sequencer.c:3557 sequencer.c:5591 strbuf.c:1189 wrapper.c:715
-#, c-format
-msgid "could not write to '%s'"
-msgstr "impossible d'écrire dans '%s'"
-
-#: sequencer.c:455
-#, c-format
-msgid "could not write eol to '%s'"
-msgstr "impossible d'écrire la fin de ligne dans '%s'"
-
-#: sequencer.c:460 sequencer.c:3092 sequencer.c:3294 sequencer.c:3308
-#: sequencer.c:3565
-#, c-format
-msgid "failed to finalize '%s'"
-msgstr "échec lors de la finalisation de '%s'"
-
-#: sequencer.c:473 sequencer.c:1930 sequencer.c:3112 sequencer.c:3547
-#: sequencer.c:3675 builtin/am.c:290 builtin/commit.c:837 builtin/merge.c:1154
-#, c-format
-msgid "could not read '%s'"
-msgstr "impossible de lire '%s'"
-
-#: 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:503
-msgid "commit your changes or stash them to proceed."
-msgstr "validez vos modifications ou les remiser pour continuer."
-
-#: sequencer.c:535
-#, c-format
-msgid "%s: fast-forward"
-msgstr "%s : avance rapide"
-
-#: sequencer.c:574 builtin/tag.c:615
-#, c-format
-msgid "Invalid cleanup mode %s"
-msgstr "Mode de nettoyage invalide %s"
-
-#. TRANSLATORS: %s will be "revert", "cherry-pick" or
-#. "rebase".
-#.
-#: sequencer.c:685
-#, c-format
-msgid "%s: Unable to write new index file"
-msgstr "%s: Impossible d'écrire le nouveau fichier index"
-
-#: sequencer.c:699
-msgid "unable to update cache tree"
-msgstr "impossible de mettre à jour l'arbre de cache"
-
-#: sequencer.c:713
-msgid "could not resolve HEAD commit"
-msgstr "impossible de résoudre le commit HEAD"
-
-#: sequencer.c:793
-#, c-format
-msgid "no key present in '%.*s'"
-msgstr "aucune clé présente dans '%.*s'"
-
-#: sequencer.c:804
-#, c-format
-msgid "unable to dequote value of '%s'"
-msgstr "impossible de décoter la valeur de '%s'"
-
-#: sequencer.c:841 wrapper.c:219 wrapper.c:389 builtin/am.c:757
-#: builtin/am.c:849 builtin/rebase.c:699
-#, c-format
-msgid "could not open '%s' for reading"
-msgstr "impossible d'ouvrir '%s' en lecture"
-
-#: sequencer.c:851
-msgid "'GIT_AUTHOR_NAME' already given"
-msgstr "'GIT_AUTHOR_NAME' déjà fourni"
-
-#: sequencer.c:856
-msgid "'GIT_AUTHOR_EMAIL' already given"
-msgstr "'GIT_AUTHOR_EMAIL' déjà fourni"
-
-#: sequencer.c:861
-msgid "'GIT_AUTHOR_DATE' already given"
-msgstr "'GIT_AUTHOR_DATE' déjà fourni"
-
-#: sequencer.c:865
-#, c-format
-msgid "unknown variable '%s'"
-msgstr "variable inconnue '%s'"
-
-#: sequencer.c:870
-msgid "missing 'GIT_AUTHOR_NAME'"
-msgstr "'GIT_AUTHOR_NAME' manquant"
-
-#: sequencer.c:872
-msgid "missing 'GIT_AUTHOR_EMAIL'"
-msgstr "'GIT_AUTHOR_EMAIL' manquant"
-
-#: sequencer.c:874
-msgid "missing 'GIT_AUTHOR_DATE'"
-msgstr "'GIT_AUTHOR_DATE' manquant"
-
-#: sequencer.c:939
-#, c-format
-msgid ""
-"you have staged changes in your working tree\n"
-"If these changes are meant to be squashed into the previous commit, run:\n"
-"\n"
-"  git commit --amend %s\n"
-"\n"
-"If they are meant to go into a new commit, run:\n"
-"\n"
-"  git commit %s\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 elles devaient être ajoutées dans le commit précédent, lancez :\n"
-"\n"
-"  git commit --amend %s\n"
-"\n"
-"Si elles devaient aller dans un nouveau commit, lancez :\n"
-"\n"
-"  git commit %s\n"
-"\n"
-"Dans les deux cas, une fois fini, continuez avec :\n"
-"\n"
-"  git rebase --continue\n"
-
-#: sequencer.c:1225
-msgid "'prepare-commit-msg' hook failed"
-msgstr "échec du crochet 'prepare-commit-msg'"
-
-#: sequencer.c:1231
-msgid ""
-"Your name and email address were configured automatically based\n"
-"on your username and hostname. Please check that they are accurate.\n"
-"You can suppress this message by setting them explicitly. Run the\n"
-"following command and follow the instructions in your editor to edit\n"
-"your configuration file:\n"
-"\n"
-"    git config --global --edit\n"
-"\n"
-"After doing this, you may fix the identity used for this commit with:\n"
-"\n"
-"    git commit --amend --reset-author\n"
-msgstr ""
-"Votre nom et votre adresse courriel ont été configurés automatiquement en "
-"se\n"
-"fondant sur votre nom d'utilisateur et le nom de votre machine. Veuillez \n"
-"vérifier qu'ils sont corrects. Vous pouvez supprimer ce message en les \n"
-"paramétrant explicitement. Lancez les commandes suivantes et suivez les\n"
-"instructions dans votre éditeur pour éditer votre fichier de "
-"configuration :\n"
-"\n"
-"    git config --global --edit\n"
-"\n"
-"Après ceci, vous pouvez corriger l'identité utilisée pour cette validation "
-"avec :\n"
-"\n"
-"    git commit --amend --reset-author\n"
-
-#: sequencer.c:1244
-msgid ""
-"Your name and email address were configured automatically based\n"
-"on your username and hostname. Please check that they are accurate.\n"
-"You can suppress this message by setting them explicitly:\n"
-"\n"
-"    git config --global user.name \"Your Name\"\n"
-"    git config --global user.email you@example.com\n"
-"\n"
-"After doing this, you may fix the identity used for this commit with:\n"
-"\n"
-"    git commit --amend --reset-author\n"
-msgstr ""
-"Votre nom et votre adresse courriel ont été configurés automatiquement en se "
-"fondant\n"
-"sur votre nom d'utilisateur et le nom de votre machine. Veuillez vérifier "
-"qu'ils sont corrects.\n"
-"Vous pouvez supprimer ce message en les paramétrant explicitement :\n"
-"\n"
-"    git config --global user.name \"Votre Nom\"\n"
-"    git config --global user.email vous@exemple.com\n"
-"\n"
-"Après ceci, vous pouvez corriger l'identité utilisée pour ce commit avec :\n"
-"\n"
-"    git commit --amend --reset-author\n"
-
-#: sequencer.c:1287
-msgid "couldn't look up newly created commit"
-msgstr "impossible de retrouver le commit nouvellement créé"
-
-#: sequencer.c:1289
-msgid "could not parse newly created commit"
-msgstr "impossible d'analyser le commit nouvellement créé"
-
-#: sequencer.c:1336
-msgid "unable to resolve HEAD after creating commit"
-msgstr "impossible de résoudre HEAD après création du commit"
-
-#: sequencer.c:1338
-msgid "detached HEAD"
-msgstr "HEAD détachée"
-
-#: sequencer.c:1342
-msgid " (root-commit)"
-msgstr " (commit racine)"
-
-#: sequencer.c:1363
-msgid "could not parse HEAD"
-msgstr "impossible de lire HEAD"
-
-#: sequencer.c:1365
-#, c-format
-msgid "HEAD %s is not a commit!"
-msgstr "HEAD %s n'est pas un commit !"
-
-#: sequencer.c:1369 sequencer.c:1447 builtin/commit.c:1707
-msgid "could not parse HEAD commit"
-msgstr "impossible d'analyser le commit HEAD"
-
-#: sequencer.c:1425 sequencer.c:2310
-msgid "unable to parse commit author"
-msgstr "impossible d'analyser l'auteur du commit"
-
-#: sequencer.c:1436 builtin/am.c:1644 builtin/merge.c:710
-msgid "git write-tree failed to write a tree"
-msgstr "git write-tree a échoué à écrire un arbre"
-
-#: sequencer.c:1469 sequencer.c:1589
-#, c-format
-msgid "unable to read commit message from '%s'"
-msgstr "impossible de lire le message de validation de '%s'"
-
-#: sequencer.c:1500 sequencer.c:1532
-#, c-format
-msgid "invalid author identity '%s'"
-msgstr "identité d'auteur invalide '%s'"
-
-#: sequencer.c:1506
-msgid "corrupt author: missing date information"
-msgstr "auteur corrompu : information de date manquante"
-
-#: sequencer.c:1545 builtin/am.c:1671 builtin/commit.c:1821 builtin/merge.c:921
-#: builtin/merge.c:946 t/helper/test-fast-rebase.c:78
-msgid "failed to write commit object"
-msgstr "échec de l'écriture de l'objet commit"
-
-#: sequencer.c:1572 sequencer.c:4496 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:1621
-#, c-format
-msgid "could not parse commit %s"
-msgstr "impossible d'analyser le commit %s"
-
-#: sequencer.c:1626
-#, c-format
-msgid "could not parse parent commit %s"
-msgstr "impossible d'analyser le commit parent %s"
-
-#: sequencer.c:1709 sequencer.c:1990
-#, c-format
-msgid "unknown command: %d"
-msgstr "commande inconnue : %d"
-
-#: sequencer.c:1751
-msgid "This is the 1st commit message:"
-msgstr "Ceci est le premier message de validation :"
-
-#: sequencer.c:1752
-#, c-format
-msgid "This is the commit message #%d:"
-msgstr "Ceci est le message de validation numéro %d :"
-
-#: sequencer.c:1753
-msgid "The 1st commit message will be skipped:"
-msgstr "Le premier message de validation sera ignoré :"
-
-#: sequencer.c:1754
-#, c-format
-msgid "The commit message #%d will be skipped:"
-msgstr "Le message de validation %d sera ignoré :"
-
-#: sequencer.c:1755
-#, c-format
-msgid "This is a combination of %d commits."
-msgstr "Ceci est la combinaison de %d commits."
-
-#: sequencer.c:1902 sequencer.c:1959
-#, c-format
-msgid "cannot write '%s'"
-msgstr "impossible d'écrire '%s'"
-
-#: sequencer.c:1949
-msgid "need a HEAD to fixup"
-msgstr "une HEAD est nécessaire à la correction"
-
-#: sequencer.c:1951 sequencer.c:3592
-msgid "could not read HEAD"
-msgstr "impossible de lire HEAD"
-
-#: sequencer.c:1953
-msgid "could not read HEAD's commit message"
-msgstr "impossible de lire le message de validation de HEAD"
-
-#: sequencer.c:1977
-#, c-format
-msgid "could not read commit message of %s"
-msgstr "impossible de lire le message de validation de %s"
-
-#: sequencer.c:2087
-msgid "your index file is unmerged."
-msgstr "votre fichier d'index n'est pas fusionné."
-
-#: sequencer.c:2094
-msgid "cannot fixup root commit"
-msgstr "impossible de réparer le commit racine"
-
-#: sequencer.c:2113
-#, 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:2121 sequencer.c:2129
-#, c-format
-msgid "commit %s does not have parent %d"
-msgstr "le commit %s n'a pas de parent %d"
-
-#: sequencer.c:2135
-#, 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:2154
-#, c-format
-msgid "%s: cannot parse parent commit %s"
-msgstr "%s : impossible d'analyser le commit parent %s"
-
-#: sequencer.c:2220
-#, c-format
-msgid "could not rename '%s' to '%s'"
-msgstr "impossible de renommer '%s' en '%s'"
-
-#: sequencer.c:2280
-#, c-format
-msgid "could not revert %s... %s"
-msgstr "impossible d'annuler %s... %s"
-
-#: sequencer.c:2281
-#, c-format
-msgid "could not apply %s... %s"
-msgstr "impossible d'appliquer %s... %s"
-
-#: sequencer.c:2302
-#, 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:2360
-#, c-format
-msgid "git %s: failed to read the index"
-msgstr "git %s : échec à la lecture de l'index"
-
-#: sequencer.c:2368
-#, c-format
-msgid "git %s: failed to refresh the index"
-msgstr "git %s : échec du rafraîchissement de l'index"
-
-#: sequencer.c:2448
-#, c-format
-msgid "%s does not accept arguments: '%s'"
-msgstr "%s n'accepte pas d'argument : '%s'"
-
-#: sequencer.c:2457
-#, c-format
-msgid "missing arguments for %s"
-msgstr "argument manquant pour %s"
-
-#: sequencer.c:2500
-#, c-format
-msgid "could not parse '%s'"
-msgstr "impossible d'analyser '%s'"
-
-#: sequencer.c:2561
-#, c-format
-msgid "invalid line %d: %.*s"
-msgstr "ligne %d invalide : %.*s"
-
-#: sequencer.c:2572
-#, c-format
-msgid "cannot '%s' without a previous commit"
-msgstr "'%s' impossible avec le commit précédent"
-
-#: sequencer.c:2620 builtin/rebase.c:185
-#, c-format
-msgid "could not read '%s'."
-msgstr "impossible de lire '%s'."
-
-#: sequencer.c:2658
-msgid "cancelling a cherry picking in progress"
-msgstr "annulation d'un picorage en cours"
-
-#: sequencer.c:2667
-msgid "cancelling a revert in progress"
-msgstr "annulation d'un retour en cours"
-
-#: sequencer.c:2707
-msgid "please fix this using 'git rebase --edit-todo'."
-msgstr "veuillez corriger ceci en utilisant 'git rebase --edit-todo'."
-
-#: sequencer.c:2709
-#, c-format
-msgid "unusable instruction sheet: '%s'"
-msgstr "feuille d'instruction inutilisable : '%s'"
-
-#: sequencer.c:2714
-msgid "no commits parsed."
-msgstr "aucun commit analysé."
-
-#: sequencer.c:2725
-msgid "cannot cherry-pick during a revert."
-msgstr "impossible de picorer pendant l'annulation d'un commit."
-
-#: sequencer.c:2727
-msgid "cannot revert during a cherry-pick."
-msgstr "impossible d'annuler un commit pendant un picorage."
-
-#: sequencer.c:2914
-msgid "unusable squash-onto"
-msgstr "\"écrase-sur\" inutilisable"
-
-#: sequencer.c:2934
-#, c-format
-msgid "malformed options sheet: '%s'"
-msgstr "feuille d'options malformée : %s"
-
-#: sequencer.c:3029 sequencer.c:4875
-msgid "empty commit set passed"
-msgstr "l'ensemble de commits spécifié est vide"
-
-#: sequencer.c:3046
-msgid "revert is already in progress"
-msgstr "un retour est déjà en cours"
-
-#: sequencer.c:3048
-#, c-format
-msgid "try \"git revert (--continue | %s--abort | --quit)\""
-msgstr "essayez \"git revert (--continue | %s--abort | --quit)\""
-
-#: sequencer.c:3051
-msgid "cherry-pick is already in progress"
-msgstr "un picorage est déjà en cours"
-
-#: sequencer.c:3053
-#, c-format
-msgid "try \"git cherry-pick (--continue | %s--abort | --quit)\""
-msgstr "essayez \"git cherry-pick (--continue | %s--abort | --quit)\""
-
-#: sequencer.c:3067
-#, c-format
-msgid "could not create sequencer directory '%s'"
-msgstr "impossible de créer le répertoire de séquenceur '%s'"
-
-#: sequencer.c:3082
-msgid "could not lock HEAD"
-msgstr "impossible de verrouiller HEAD"
-
-#: sequencer.c:3142 sequencer.c:4585
-msgid "no cherry-pick or revert in progress"
-msgstr "aucun picorage ou retour en cours"
-
-#: sequencer.c:3144 sequencer.c:3155
-msgid "cannot resolve HEAD"
-msgstr "impossible de résoudre HEAD"
-
-#: sequencer.c:3146 sequencer.c:3190
-msgid "cannot abort from a branch yet to be born"
-msgstr "impossible d'abandonner depuis une branche non encore créée"
-
-#: sequencer.c:3176 builtin/fetch.c:1030 builtin/fetch.c:1457
-#: builtin/grep.c:774
-#, c-format
-msgid "cannot open '%s'"
-msgstr "impossible d'ouvrir '%s'"
-
-#: sequencer.c:3178
-#, c-format
-msgid "cannot read '%s': %s"
-msgstr "impossible de lire '%s' : %s"
-
-#: sequencer.c:3179
-msgid "unexpected end of file"
-msgstr "fin de fichier inattendue"
-
-#: sequencer.c:3185
-#, 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:3196
-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:3237
-msgid "no revert in progress"
-msgstr "pas de retour en cours"
-
-#: sequencer.c:3246
-msgid "no cherry-pick in progress"
-msgstr "aucun picorage en cours"
-
-#: sequencer.c:3256
-msgid "failed to skip the commit"
-msgstr "échec du saut de commit"
-
-#: sequencer.c:3263
-msgid "there is nothing to skip"
-msgstr "il n'y a rien à sauter"
-
-#: sequencer.c:3266
-#, c-format
-msgid ""
-"have you committed already?\n"
-"try \"git %s --continue\""
-msgstr ""
-"avez-vous déjà validé ?\n"
-"essayez \"git %s --continue\""
-
-#: sequencer.c:3428 sequencer.c:4476
-msgid "cannot read HEAD"
-msgstr "impossible de lire HEAD"
-
-#: sequencer.c:3445
-#, c-format
-msgid "unable to copy '%s' to '%s'"
-msgstr "impossible de copier '%s' vers '%s'"
-
-#: sequencer.c:3453
-#, c-format
-msgid ""
-"You can amend the commit now, with\n"
-"\n"
-"  git commit --amend %s\n"
-"\n"
-"Once you are satisfied with your changes, run\n"
-"\n"
-"  git rebase --continue\n"
-msgstr ""
-"Vous pouvez corriger le commit maintenant, avec\n"
-"\n"
-"  git commit --amend %s\n"
-"\n"
-"après avoir réalisé vos modifications, lancez\n"
-"\n"
-"  git rebase --continue\n"
-
-#: sequencer.c:3463
-#, c-format
-msgid "Could not apply %s... %.*s"
-msgstr "Impossible d'appliquer %s... %.*s"
-
-#: sequencer.c:3470
-#, c-format
-msgid "Could not merge %.*s"
-msgstr "Impossible de fusionner %.*s"
-
-#: sequencer.c:3484 sequencer.c:3488 builtin/difftool.c:633
-#, c-format
-msgid "could not copy '%s' to '%s'"
-msgstr "impossible de copier '%s' vers '%s'"
-
-#: sequencer.c:3499
-#, c-format
-msgid "Executing: %s\n"
-msgstr "Exécution : %s\n"
-
-#: sequencer.c:3510
-#, c-format
-msgid ""
-"execution failed: %s\n"
-"%sYou can fix the problem, and then run\n"
-"\n"
-"  git rebase --continue\n"
-"\n"
-msgstr ""
-"échec d'exécution : %s\n"
-"%sVous pouvez corriger le problème, puis lancer\n"
-"\n"
-"git rebase --continue\n"
-"\n"
-
-#: sequencer.c:3516
-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:3522
-#, c-format
-msgid ""
-"execution succeeded: %s\n"
-"but left changes to the index and/or the working tree\n"
-"Commit or stash your changes, and then run\n"
-"\n"
-"  git rebase --continue\n"
-"\n"
-msgstr ""
-"l'exécution a réussi : %s\n"
-"mais a laissé des modifications dans l'index ou la copie de travail\n"
-"Validez ou remisez vos modification, puis lancez\n"
-"\n"
-"  git rebase --continue\n"
-"\n"
-
-#: sequencer.c:3582
-#, c-format
-msgid "illegal label name: '%.*s'"
-msgstr "nom de label illégal '%.*s'"
-
-#: sequencer.c:3655
-msgid "writing fake root commit"
-msgstr "écriture d'un commit racine bidon"
-
-#: sequencer.c:3660
-msgid "writing squash-onto"
-msgstr "écriture de 'écraser-sur'"
-
-#: sequencer.c:3739
-#, c-format
-msgid "could not resolve '%s'"
-msgstr "impossible de résoudre '%s'"
-
-#: sequencer.c:3771
-msgid "cannot merge without a current revision"
-msgstr "impossible de fusionner avec une révision courante"
-
-#: sequencer.c:3793
-#, c-format
-msgid "unable to parse '%.*s'"
-msgstr "impossible d'analyser '%.*s'"
-
-#: sequencer.c:3802
-#, c-format
-msgid "nothing to merge: '%.*s'"
-msgstr "rien à fusionner : '%.*s'"
-
-#: sequencer.c:3814
-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:3869
-#, c-format
-msgid "could not get commit message of '%s'"
-msgstr "impossible de lire le message de validation de '%s'"
-
-#: sequencer.c:4013
-#, c-format
-msgid "could not even attempt to merge '%.*s'"
-msgstr "impossible de seulement essayer de fusionner '%.*s'"
-
-#: sequencer.c:4029
-msgid "merge: Unable to write new index file"
-msgstr "fusion : Impossible d'écrire le nouveau fichier index"
-
-#: sequencer.c:4110
-msgid "Cannot autostash"
-msgstr "Autoremisage impossible"
-
-#: sequencer.c:4113
-#, c-format
-msgid "Unexpected stash response: '%s'"
-msgstr "Réponse de remisage inattendue : '%s'"
-
-#: sequencer.c:4119
-#, c-format
-msgid "Could not create directory for '%s'"
-msgstr "Impossible de créer le répertoire pour '%s'"
-
-#: sequencer.c:4122
-#, c-format
-msgid "Created autostash: %s\n"
-msgstr "Autoremisage créé : %s\n"
-
-#: sequencer.c:4124
-msgid "could not reset --hard"
-msgstr "impossible de réinitialiser --hard"
-
-#: sequencer.c:4148
-#, c-format
-msgid "Applied autostash.\n"
-msgstr "Autoremisage appliqué.\n"
-
-#: sequencer.c:4160
-#, c-format
-msgid "cannot store %s"
-msgstr "impossible de stocker %s"
-
-#: sequencer.c:4163
-#, c-format
-msgid ""
-"%s\n"
-"Your changes are safe in the stash.\n"
-"You can run \"git stash pop\" or \"git stash drop\" at any time.\n"
-msgstr ""
-"%s\n"
-"Vos  modifications sont à l'abri dans la remise.\n"
-"Vous pouvez lancer \"git stash pop\" ou \"git stash drop\" à tout moment.\n"
-
-#: sequencer.c:4168
-msgid "Applying autostash resulted in conflicts."
-msgstr "L'application du remisage automatique a créé des conflits."
-
-#: sequencer.c:4169
-msgid "Autostash exists; creating a new stash entry."
-msgstr ""
-"Un remisage automatique existe ; création d'une nouvelle entrée de remisage."
-
-#: sequencer.c:4225
-msgid "could not detach HEAD"
-msgstr "impossible de détacher HEAD"
-
-#: sequencer.c:4240
-#, c-format
-msgid "Stopped at HEAD\n"
-msgstr "Arrêt à HEAD\n"
-
-#: sequencer.c:4242
-#, c-format
-msgid "Stopped at %s\n"
-msgstr "Arrêté à %s\n"
-
-#: sequencer.c:4274
-#, c-format
-msgid ""
-"Could not execute the todo command\n"
-"\n"
-"    %.*s\n"
-"It has been rescheduled; To edit the command before continuing, please\n"
-"edit the todo list first:\n"
-"\n"
-"    git rebase --edit-todo\n"
-"    git rebase --continue\n"
-msgstr ""
-"Impossible d'exécuter la commande\n"
-"\n"
-"    %.*s\n"
-"Elle a été reprogrammée ; pour éditer la commande avant de poursuivre,\n"
-"veuillez éditer la liste de commandes en premier :\n"
-"\n"
-"    git rebase --edit-todo\n"
-"    git rebase --continue\n"
-
-#: sequencer.c:4320
-#, c-format
-msgid "Rebasing (%d/%d)%s"
-msgstr "Rebasage (%d/%d)%s"
-
-#: sequencer.c:4366
-#, c-format
-msgid "Stopped at %s...  %.*s\n"
-msgstr "Arrêt à %s... %.*s\n"
-
-#: sequencer.c:4436
-#, c-format
-msgid "unknown command %d"
-msgstr "commande inconnue %d"
-
-#: sequencer.c:4484
-msgid "could not read orig-head"
-msgstr "impossible de lire orig-head"
-
-#: sequencer.c:4489
-msgid "could not read 'onto'"
-msgstr "impossible de lire 'onto'"
-
-#: sequencer.c:4503
-#, c-format
-msgid "could not update HEAD to %s"
-msgstr "impossible de mettre à jour HEAD sur %s"
-
-#: sequencer.c:4563
-#, c-format
-msgid "Successfully rebased and updated %s.\n"
-msgstr "Rebasage et mise à jour de %s avec succès.\n"
-
-#: sequencer.c:4615
-msgid "cannot rebase: You have unstaged changes."
-msgstr "impossible de rebaser : vous avez des modifications non indexées."
-
-#: sequencer.c:4624
-msgid "cannot amend non-existing commit"
-msgstr "impossible de corriger un commit non-existant"
-
-#: sequencer.c:4626
-#, c-format
-msgid "invalid file: '%s'"
-msgstr "fichier invalide : '%s'"
-
-#: sequencer.c:4628
-#, c-format
-msgid "invalid contents: '%s'"
-msgstr "contenu invalide : '%s'"
-
-#: sequencer.c:4631
-msgid ""
-"\n"
-"You have uncommitted changes in your working tree. Please, commit them\n"
-"first and then run 'git rebase --continue' again."
-msgstr ""
-"\n"
-"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:4667 sequencer.c:4706
-#, c-format
-msgid "could not write file: '%s'"
-msgstr "impossible d'écrire le fichier : '%s'"
-
-#: sequencer.c:4722
-msgid "could not remove CHERRY_PICK_HEAD"
-msgstr "impossible de supprimer CHERRY_PICK_HEAD"
-
-#: sequencer.c:4732
-msgid "could not commit staged changes."
-msgstr "impossible de valider les modifications indexées."
-
-#: sequencer.c:4852
-#, c-format
-msgid "%s: can't cherry-pick a %s"
-msgstr "%s : impossible de picorer un %s"
-
-#: sequencer.c:4856
-#, c-format
-msgid "%s: bad revision"
-msgstr "%s : mauvaise révision"
-
-#: sequencer.c:4891
-msgid "can't revert as initial commit"
-msgstr "impossible d'annuler en tant que commit initial"
-
-#: sequencer.c:5162 sequencer.c:5391
-#, c-format
-msgid "skipped previously applied commit %s"
-msgstr "le commit %s appliqué précédemment a été sauté"
-
-#: sequencer.c:5232 sequencer.c:5407
-msgid "use --reapply-cherry-picks to include skipped commits"
-msgstr "utilisez --reapply-cherry-picks pour inclure les commits sautés"
-
-#: sequencer.c:5378
-msgid "make_script: unhandled options"
-msgstr "make_script : options non gérées"
-
-#: sequencer.c:5381
-msgid "make_script: error preparing revisions"
-msgstr "make_script : erreur lors de la préparation des révisions"
-
-#: sequencer.c:5639 sequencer.c:5656
-msgid "nothing to do"
-msgstr "rien à faire"
-
-#: sequencer.c:5675
-msgid "could not skip unnecessary pick commands"
-msgstr "impossible d'éviter les commandes de picorage non nécessaires"
-
-#: sequencer.c:5775
-msgid "the script was already rearranged."
-msgstr "le script a déjà été réarrangé."
-
-#: setup.c:135
-#, c-format
-msgid "'%s' is outside repository at '%s'"
-msgstr "'%s' est hors du dépôt à '%s'"
-
-#: setup.c:187
-#, c-format
-msgid ""
-"%s: no such path in the working tree.\n"
-"Use 'git <command> -- <path>...' to specify paths that do not exist locally."
-msgstr ""
-"%s : ce chemin n'existe pas dans la copie de travail.\n"
-"Utilisez 'git <commande> -- <chemin>...' pour spécifier des chemins qui "
-"n'existent pas localement."
-
-#: setup.c:200
-#, c-format
-msgid ""
-"ambiguous argument '%s': unknown revision or path not in the working tree.\n"
-"Use '--' to separate paths from revisions, like this:\n"
-"'git <command> [<revision>...] -- [<file>...]'"
-msgstr ""
-"argument '%s' ambigu : révision inconnue ou chemin inexistant.\n"
-"Utilisez '--' pour séparer les chemins des révisions, comme ceci :\n"
-"'git <commande> [<révision>...] -- [<chemin>...]'"
-
-#: setup.c:266
-#, c-format
-msgid "option '%s' must come before non-option arguments"
-msgstr ""
-"l'option '%s' doit être présente avant les arguments qui ne sont pas des "
-"options"
-
-#: setup.c:285
-#, c-format
-msgid ""
-"ambiguous argument '%s': both revision and filename\n"
-"Use '--' to separate paths from revisions, like this:\n"
-"'git <command> [<revision>...] -- [<file>...]'"
-msgstr ""
-"argument '%s' ambigu : révision et chemin spécifiés.\n"
-"Utilisez '--' pour séparer les chemins des révisions, comme ceci :\n"
-"'git <commande> [<révision>...] -- [<chemin>...]'"
-
-#: setup.c:421
-msgid "unable to set up work tree using invalid config"
-msgstr ""
-"impossible de mettre en place le répertoire de travail en utilisant une "
-"configuration invalide"
-
-#: setup.c:425 builtin/rev-parse.c:895
-msgid "this operation must be run in a work tree"
-msgstr "cette opération doit être effectuée dans un arbre de travail"
-
-#: setup.c:724
-#, c-format
-msgid "Expected git repo version <= %d, found %d"
-msgstr "Version attendue du dépôt git <= %d, %d trouvée"
-
-#: setup.c:732
-msgid "unknown repository extension found:"
-msgid_plural "unknown repository extensions found:"
-msgstr[0] "extension de dépôt inconnue trouvée :"
-msgstr[1] "extensions de dépôt inconnues trouvées :"
-
-#: setup.c:746
-msgid "repo version is 0, but v1-only extension found:"
-msgid_plural "repo version is 0, but v1-only extensions found:"
-msgstr[0] ""
-"la version du dépôt est 0, mais une extension uniquement v1 trouvée :"
-msgstr[1] ""
-"la version du dépôt est 0, mais des extensions uniquement v1 trouvées :"
-
-#: setup.c:767
-#, c-format
-msgid "error opening '%s'"
-msgstr "erreur à l'ouverture de '%s'"
-
-#: setup.c:769
-#, c-format
-msgid "too large to be a .git file: '%s'"
-msgstr "trop gros pour être une fichier .git : '%s'"
-
-#: setup.c:771
-#, c-format
-msgid "error reading %s"
-msgstr "erreur à la lecture de %s"
-
-#: setup.c:773
-#, c-format
-msgid "invalid gitfile format: %s"
-msgstr "format de fichier git invalide : %s"
-
-#: setup.c:775
-#, c-format
-msgid "no path in gitfile: %s"
-msgstr "aucun chemin dans le fichier git : %s"
-
-#: setup.c:777
-#, c-format
-msgid "not a git repository: %s"
-msgstr "ce n'est pas un dépôt git : %s"
-
-#: setup.c:879
-#, c-format
-msgid "'$%s' too big"
-msgstr "'$%s' trop gros"
-
-#: setup.c:893
-#, c-format
-msgid "not a git repository: '%s'"
-msgstr "ce n'est pas un dépôt git : '%s'"
-
-#: setup.c:922 setup.c:924 setup.c:955
-#, c-format
-msgid "cannot chdir to '%s'"
-msgstr "impossible de se déplacer vers le répertoire (chdir) '%s'"
-
-#: setup.c:927 setup.c:983 setup.c:993 setup.c:1032 setup.c:1040
-msgid "cannot come back to cwd"
-msgstr "impossible de revenir au répertoire de travail courant"
-
-#: setup.c:1054
-#, c-format
-msgid "failed to stat '%*s%s%s'"
-msgstr "échec du stat de '%*s%s%s'"
-
-#: setup.c:1338
-msgid "Unable to read current working directory"
-msgstr "Impossible d'accéder au répertoire de travail courant"
-
-#: setup.c:1347 setup.c:1353
-#, c-format
-msgid "cannot change to '%s'"
-msgstr "impossible de modifier en '%s'"
-
-#: setup.c:1358
-#, c-format
-msgid "not a git repository (or any of the parent directories): %s"
-msgstr "ni ceci ni aucun de ses répertoires parents n'est un dépôt git : %s"
-
-#: setup.c:1364
-#, 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 ""
-"ni ceci ni aucun de ses répertoires parents (jusqu'au point de montage %s) "
-"n'est un dépôt git\n"
-"Arrêt à la limite du système de fichiers (GIT_DISCOVERY_ACROSS_FILESYSTEM "
-"n'est pas défini)."
-
-#: setup.c:1374
-#, c-format
-msgid ""
-"unsafe repository ('%s' is owned by someone else)\n"
-"To add an exception for this directory, call:\n"
-"\n"
-"\tgit config --global --add safe.directory %s"
-msgstr ""
-"dépôt non sécurisé ('%s' appartient à quelqu'un d'autre)\n"
-"Pour ajouter une exception pour ce dépôt, lancez :\n"
-"\n"
-"\tgit config --global --add safe.directory %s"
-
-#: setup.c:1502
-#, c-format
-msgid ""
-"problem with core.sharedRepository filemode value (0%.3o).\n"
-"The owner of files must always have read and write permissions."
-msgstr ""
-"problème avec la valeur de core.sharedRepository (0%.3o).\n"
-"Le propriétaire des fichiers doit toujours avoir les droits en lecture et "
-"écriture."
-
-#: setup.c:1564
-msgid "fork failed"
-msgstr "échec de la bifurcation"
-
-#: setup.c:1569
-msgid "setsid failed"
-msgstr "échec du setsid"
-
-#: sparse-index.c:285
-#, 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)"
-
-#: split-index.c:9
-msgid "cannot use split index with a sparse index"
-msgstr "impossible d'utiliser l'index scindé avec un index clairsemé"
-
-#. TRANSLATORS: IEC 80000-13:2008 gibibyte
-#: strbuf.c:851
-#, c-format
-msgid "%u.%2.2u GiB"
-msgstr "%u.%2.2u Gio"
-
-#. TRANSLATORS: IEC 80000-13:2008 gibibyte/second
-#: strbuf.c:853
-#, c-format
-msgid "%u.%2.2u GiB/s"
-msgstr "%u.%2.2u Gio/s"
-
-#. TRANSLATORS: IEC 80000-13:2008 mebibyte
-#: strbuf.c:861
-#, c-format
-msgid "%u.%2.2u MiB"
-msgstr "%u.%2.2u Mio"
-
-#. TRANSLATORS: IEC 80000-13:2008 mebibyte/second
-#: strbuf.c:863
-#, c-format
-msgid "%u.%2.2u MiB/s"
-msgstr "%u.%2.2u Mio/s"
-
-#. TRANSLATORS: IEC 80000-13:2008 kibibyte
-#: strbuf.c:870
-#, c-format
-msgid "%u.%2.2u KiB"
-msgstr "%u.%2.2u Kio"
-
-#. TRANSLATORS: IEC 80000-13:2008 kibibyte/second
-#: strbuf.c:872
-#, c-format
-msgid "%u.%2.2u KiB/s"
-msgstr "%u.%2.2u Kio/s"
-
-#. TRANSLATORS: IEC 80000-13:2008 byte
-#: strbuf.c:878
-#, c-format
-msgid "%u byte"
-msgid_plural "%u bytes"
-msgstr[0] "%u octet"
-msgstr[1] "%u octets"
-
-#. TRANSLATORS: IEC 80000-13:2008 byte/second
-#: strbuf.c:880
-#, c-format
-msgid "%u byte/s"
-msgid_plural "%u bytes/s"
-msgstr[0] "%u octet/s"
-msgstr[1] "%u octets/s"
-
-#: strbuf.c:1187 wrapper.c:217 wrapper.c:387 builtin/am.c:766
-#: builtin/rebase.c:653
-#, c-format
-msgid "could not open '%s' for writing"
-msgstr "impossible d'ouvrir '%s' en écriture"
-
-#: strbuf.c:1196
-#, c-format
-msgid "could not edit '%s'"
-msgstr "impossible d'éditer '%s'"
-
-#: submodule-config.c:238
-#, c-format
-msgid "ignoring suspicious submodule name: %s"
-msgstr "nom de sous-module suspicieux %s ignoré"
-
-#: submodule-config.c:305
-msgid "negative values not allowed for submodule.fetchjobs"
-msgstr "les valeurs négatives ne sont pas permises pour submodule.fetchjobs"
-
-#: submodule-config.c:403
-#, c-format
-msgid "ignoring '%s' which may be interpreted as a command-line option: %s"
-msgstr ""
-"'%s' ignoré et qui peut être interprété comme une option de ligne de "
-"commande : %s"
-
-#: submodule-config.c:500 builtin/push.c:489 builtin/send-pack.c:148
-#, c-format
-msgid "invalid value for '%s'"
-msgstr "valeur invalide pour '%s'"
-
-#: submodule-config.c:828
-#, c-format
-msgid "Could not update .gitmodules entry %s"
-msgstr "Impossible de mettre à jour l'élément %s de .gitmodules"
-
-#: submodule.c:115 submodule.c:144
-msgid "Cannot change unmerged .gitmodules, resolve merge conflicts first"
-msgstr ""
-"Modification impossible de .gitmodules non fusionné, résolvez les conflits "
-"d'abord"
-
-#: submodule.c:119 submodule.c:148
-#, c-format
-msgid "Could not find section in .gitmodules where path=%s"
-msgstr "Impossible de trouver une section où path=%s dans .gitmodules"
-
-# ici %s est un chemin
-#: submodule.c:155
-#, c-format
-msgid "Could not remove .gitmodules entry for %s"
-msgstr "Impossible de supprimer l'élément de .gitmodules pour %s"
-
-#: submodule.c:166
-msgid "staging updated .gitmodules failed"
-msgstr "échec de la mise en index du .gitmodules mis à jour"
-
-#: submodule.c:346
-#, c-format
-msgid "in unpopulated submodule '%s'"
-msgstr "dans le sous-module '%s' non populé"
-
-#: submodule.c:377
-#, c-format
-msgid "Pathspec '%s' is in submodule '%.*s'"
-msgstr "Le chemin '%s' est dans le sous-module '%.*s'"
-
-#: submodule.c:454
-#, c-format
-msgid "bad --ignore-submodules argument: %s"
-msgstr "mauvais argument --ignore-submodules : %s"
-
-#: submodule.c:866
-#, c-format
-msgid ""
-"Submodule in commit %s at path: '%s' collides with a submodule named the "
-"same. Skipping it."
-msgstr ""
-"Le sous-module dans le commit %s au chemin : '%s' entre en collision avec un "
-"sous-module du même nom. Ignoré."
-
-#: submodule.c:987
-#, 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:1069
-#, c-format
-msgid ""
-"Could not run 'git rev-list <commits> --not --remotes -n 1' command in "
-"submodule %s"
-msgstr ""
-"Impossible de lancer la commande 'git rev-list <commits> --not --remotes -n "
-"1' dans le sous-module %s"
-
-#: submodule.c:1192
-#, c-format
-msgid "process for submodule '%s' failed"
-msgstr "le processus pour le sous-module '%s' a échoué"
-
-#: submodule.c:1221 builtin/branch.c:714 builtin/submodule--helper.c:2827
-msgid "Failed to resolve HEAD as a valid ref."
-msgstr "Échec de résolution de HEAD comme référence valide."
-
-#: submodule.c:1232
-#, c-format
-msgid "Pushing submodule '%s'\n"
-msgstr "Poussée du sous-module '%s'\n"
-
-#: submodule.c:1235
-#, c-format
-msgid "Unable to push submodule '%s'\n"
-msgstr "Impossible de pousser le sous-module '%s'\n"
-
-#: submodule.c:1567
-#, c-format
-msgid "Fetching submodule %s%s\n"
-msgstr "Récupération du sous-module %s%s\n"
-
-#: submodule.c:1589
-#, c-format
-msgid "Could not access submodule '%s'\n"
-msgstr "Impossible d'accéder au sous-module '%s'\n"
-
-#: submodule.c:1618
-#, c-format
-msgid "Could not access submodule '%s' at commit %s\n"
-msgstr "Impossible d'accéder au sous-module '%s' au commit %s\n"
-
-#: submodule.c:1629
-#, c-format
-msgid "Fetching submodule %s%s at commit %s\n"
-msgstr "Récupération du sous-module %s%s au commit %s\n"
-
-#: submodule.c:1849
-#, c-format
-msgid ""
-"Errors during submodule fetch:\n"
-"%s"
-msgstr ""
-"Erreurs pendant la récupération du sous-module :\n"
-"%s"
-
-#: submodule.c:1874
-#, c-format
-msgid "'%s' not recognized as a git repository"
-msgstr "'%s' n'est pas reconnu comme dépôt git"
-
-#: submodule.c:1891
-#, 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:1932
-#, 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:2007
-#, 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:2020
-#, c-format
-msgid "could not run 'git status' in submodule '%s'"
-msgstr "impossible de lancer 'git status' dans le sous-module '%s'"
-
-#: submodule.c:2037
-#, 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:2064 submodule.c:2379
-#, c-format
-msgid "could not recurse into submodule '%s'"
-msgstr "récursion impossible dans le sous-module '%s'"
-
-#: submodule.c:2086
-msgid "could not reset submodule index"
-msgstr "impossible de réinitialiser l'index du sous-module"
-
-#: submodule.c:2128
-#, c-format
-msgid "submodule '%s' has dirty index"
-msgstr "le sous-module '%s' a un index sale"
-
-#: submodule.c:2182
-#, c-format
-msgid "Submodule '%s' could not be updated."
-msgstr "Le sous-module '%s' n'a pas pu être mis à jour."
-
-#: submodule.c:2250
-#, 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:2271
-#, c-format
-msgid ""
-"relocate_gitdir for submodule '%s' with more than one worktree not supported"
-msgstr ""
-"relocate_gitdir pour le sous-module '%s' avec plus d'un arbre de travail "
-"n'est pas supporté"
-
-#: submodule.c:2283 submodule.c:2343
-#, c-format
-msgid "could not lookup name for submodule '%s'"
-msgstr "impossible de trouve le nom pour le sous-module '%s'"
-
-#: submodule.c:2287
-#, 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:2293
-#, c-format
-msgid ""
-"Migrating git directory of '%s%s' from\n"
-"'%s' to\n"
-"'%s'\n"
-msgstr ""
-"Migration du répertoire git de '%s%s' depuis\n"
-"'%s' sur\n"
-"'%s'\n"
-
-#: submodule.c:2424
-msgid "could not start ls-files in .."
-msgstr "impossible de démarrer ls-files dans .."
-
-#: submodule.c:2464
-#, c-format
-msgid "ls-tree returned unexpected return code %d"
-msgstr "ls-tree a renvoyé un code de retour inattendu %d"
-
-#: symlinks.c:244
-#, c-format
-msgid "failed to lstat '%s'"
-msgstr "échec du lstat de '%s'"
-
-#: trailer.c:244
-#, c-format
-msgid "running trailer command '%s' failed"
-msgstr "échec de la commande trailer '%s'"
-
-#: 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 "valeur inconnue '%s' pour la clé '%s'"
-
-#: trailer.c:547 trailer.c:552 trailer.c:557 builtin/remote.c:300
-#: builtin/remote.c:328
-#, c-format
-msgid "more than one %s"
-msgstr "plus d'un %s"
-
-#: trailer.c:743
-#, c-format
-msgid "empty trailer token in trailer '%.*s'"
-msgstr "symbole vide dans la ligne de fin '%.*s'"
-
-#: trailer.c:763
-#, c-format
-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:1563
-msgid "could not read from stdin"
-msgstr "impossible de lire depuis l'entrée standard"
-
-#: trailer.c:1024 wrapper.c:760
-#, c-format
-msgid "could not stat %s"
-msgstr "stat impossible de %s"
-
-#: trailer.c:1026
-#, c-format
-msgid "file %s is not a regular file"
-msgstr "%s n'est pas un fichier régulier"
-
-#: trailer.c:1028
-#, c-format
-msgid "file %s is not writable by user"
-msgstr "le fichier %s n'est pas inscriptible par l'utilisateur"
-
-#: trailer.c:1040
-msgid "could not open temporary file"
-msgstr "impossible de créer un fichier temporaire"
-
-#: trailer.c:1080
-#, c-format
-msgid "could not rename temporary file to %s"
-msgstr "impossible de renommer un fichier temporaire en %s"
-
-#: transport-helper.c:62 transport-helper.c:91
-msgid "full write to remote helper failed"
-msgstr "échec de l'écriture totale sur l'assistant distant"
-
-#: transport-helper.c:145
-#, c-format
-msgid "unable to find remote helper for '%s'"
-msgstr "impossible de trouver un assistant distant pour '%s'"
-
-#: transport-helper.c:161 transport-helper.c:575
-msgid "can't dup helper output fd"
-msgstr ""
-"impossible de dupliquer le descripteur de flux de sortie de l'assistant"
-
-#: transport-helper.c:214
-#, c-format
-msgid ""
-"unknown mandatory capability %s; this remote helper probably needs newer "
-"version of Git"
-msgstr ""
-"capacité obligatoire inconnue %s ; cet assistant distant requiert "
-"probablement une une nouvelle version de Git"
-
-#: transport-helper.c:220
-msgid "this remote helper should implement refspec capability"
-msgstr "cet assistant distant devrait supporter la capacité refspec"
-
-#: transport-helper.c:287 transport-helper.c:429
-#, c-format
-msgid "%s unexpectedly said: '%s'"
-msgstr "%s a dit de manière inattendue : '%s'"
-
-#: transport-helper.c:417
-#, c-format
-msgid "%s also locked %s"
-msgstr "%s a aussi verrouillé %s"
-
-#: transport-helper.c:497
-msgid "couldn't run fast-import"
-msgstr "impossible de lancer fast-import"
-
-#: transport-helper.c:520
-msgid "error while running fast-import"
-msgstr "erreur au lancement de fast-import"
-
-#: transport-helper.c:549 transport-helper.c:1254
-#, c-format
-msgid "could not read ref %s"
-msgstr "impossible de lire la réf %s"
-
-#: transport-helper.c:594
-#, c-format
-msgid "unknown response to connect: %s"
-msgstr "réponse inconnue à connect : %s"
-
-#: transport-helper.c:616
-msgid "setting remote service path not supported by protocol"
-msgstr ""
-"la spécification du chemin de service distant n'est pas supportée par le "
-"protocole"
-
-#: transport-helper.c:618
-msgid "invalid remote service path"
-msgstr "chemin de service distant invalide"
-
-#: transport-helper.c:661 transport.c:1496
-msgid "operation not supported by protocol"
-msgstr "option non supportée par le protocole"
-
-#: transport-helper.c:664
-#, c-format
-msgid "can't connect to subservice %s"
-msgstr "impossible de se connecter au sous-service %s"
-
-#: transport-helper.c:693 transport.c:415
-msgid "--negotiate-only requires protocol v2"
-msgstr "--negotiate-only requiert le protocole v2"
-
-#: transport-helper.c:758
-msgid "'option' without a matching 'ok/error' directive"
-msgstr "'option' sans directive 'ok/error' correspondante"
-
-#: transport-helper.c:801
-#, c-format
-msgid "expected ok/error, helper said '%s'"
-msgstr "ok/error attendu, l'assistant a dit '%s'"
-
-#: transport-helper.c:862
-#, c-format
-msgid "helper reported unexpected status of %s"
-msgstr "l'assistant a renvoyé un statut de retour inattendu %s"
-
-#: transport-helper.c:945
-#, c-format
-msgid "helper %s does not support dry-run"
-msgstr "l'assistant %s ne gère pas dry-run"
-
-#: transport-helper.c:948
-#, c-format
-msgid "helper %s does not support --signed"
-msgstr "l'assistant %s ne gère pas --signed"
-
-#: transport-helper.c:951
-#, 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:956
-#, c-format
-msgid "helper %s does not support --atomic"
-msgstr "l'assistant %s ne gère pas --atomic"
-
-#: transport-helper.c:960
-#, c-format
-msgid "helper %s does not support --%s"
-msgstr "l'assistant %s ne gère pas --%s"
-
-#: transport-helper.c:967
-#, c-format
-msgid "helper %s does not support 'push-option'"
-msgstr "l'assistant %s ne gère pas 'push-option'"
-
-#: transport-helper.c:1067
-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:1072
-#, c-format
-msgid "helper %s does not support 'force'"
-msgstr "l'assistant %s ne gère pas 'force'"
-
-#: transport-helper.c:1119
-msgid "couldn't run fast-export"
-msgstr "impossible de lancer fast-export"
-
-#: transport-helper.c:1124
-msgid "error while running fast-export"
-msgstr "erreur au lancement de fast-export"
-
-#: transport-helper.c:1149
-#, c-format
-msgid ""
-"No refs in common and none specified; doing nothing.\n"
-"Perhaps you should specify a branch.\n"
-msgstr ""
-"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:1231
-#, c-format
-msgid "unsupported object format '%s'"
-msgstr "format d'objet non géré '%s'"
-
-#: transport-helper.c:1240
-#, c-format
-msgid "malformed response in ref list: %s"
-msgstr "réponse malformée dans le liste de réfs : %s"
-
-#: transport-helper.c:1392
-#, c-format
-msgid "read(%s) failed"
-msgstr "échec de read(%s)"
-
-#: transport-helper.c:1419
-#, c-format
-msgid "write(%s) failed"
-msgstr "échec de write(%s)"
-
-#: transport-helper.c:1468
-#, c-format
-msgid "%s thread failed"
-msgstr "échec du fil d'exécution %s"
-
-#: transport-helper.c:1472
-#, c-format
-msgid "%s thread failed to join: %s"
-msgstr "échec de jonction du fil d'exécution %s : %s"
-
-#: transport-helper.c:1491 transport-helper.c:1495
-#, 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:1532
-#, c-format
-msgid "%s process failed to wait"
-msgstr "échec du processus %s pour l'attente"
-
-#: transport-helper.c:1536
-#, c-format
-msgid "%s process failed"
-msgstr "échec du processus %s"
-
-#: transport-helper.c:1554 transport-helper.c:1563
-msgid "can't start thread for copying data"
-msgstr "impossible de démarrer le fil d'exécution pour copier les données"
-
-#: transport.c:116
-#, c-format
-msgid "Would set upstream of '%s' to '%s' of '%s'\n"
-msgstr "Positionnerait la branche amont de '%s' sur '%s' de '%s'\n"
-
-#: transport.c:138
-#, c-format
-msgid "could not read bundle '%s'"
-msgstr "impossible de lire la liasse '%s'"
-
-#: transport.c:234
-#, c-format
-msgid "transport: invalid depth option '%s'"
-msgstr "transport : option de profondeur invalide '%s'"
-
-#: transport.c:289
-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:290
-msgid "server options require protocol version 2 or later"
-msgstr "les options de serveur exigent une version 2 ou supérieure"
-
-#: transport.c:418
-msgid "server does not support wait-for-done"
-msgstr "le serveur ne prend pas en charge wait-for-done"
-
-#: transport.c:770
-msgid "could not parse transport.color.* config"
-msgstr "impossible d'analyser la configuration transport.color.*"
-
-#: transport.c:845
-msgid "support for protocol v2 not implemented yet"
-msgstr "le support du protocole v2 n'est pas encore implanté"
-
-#: transport.c:978
-#, c-format
-msgid "unknown value for config '%s': %s"
-msgstr "valeur inconnue pour la config '%s' : %s"
-
-#: transport.c:1044
-#, c-format
-msgid "transport '%s' not allowed"
-msgstr "transport '%s' non permis"
-
-#: transport.c:1093
-msgid "git-over-rsync is no longer supported"
-msgstr "git-over-rsync n'est plus supporté"
-
-#: transport.c:1196
-#, c-format
-msgid ""
-"The following submodule paths contain changes that can\n"
-"not be found on any remote:\n"
-msgstr ""
-"Les chemins suivants de sous-module contiennent des modifications\n"
-"qui ne peuvent être trouvées sur aucun distant :\n"
-
-#: transport.c:1200
-#, c-format
-msgid ""
-"\n"
-"Please try\n"
-"\n"
-"\tgit push --recurse-submodules=on-demand\n"
-"\n"
-"or cd to the path and use\n"
-"\n"
-"\tgit push\n"
-"\n"
-"to push them to a remote.\n"
-"\n"
-msgstr ""
-"\n"
-"Veuillez essayer\n"
-"\n"
-"\tgit push --recurse-submodules=on-demand\n"
-"\n"
-"ou bien changez de répertoire et utilisez\n"
-"\n"
-"\tgit push\n"
-"\n"
-"pour les pousser vers un serveur distant.\n"
-"\n"
-
-#: transport.c:1208
-msgid "Aborting."
-msgstr "Abandon."
-
-#: transport.c:1354
-msgid "failed to push all needed submodules"
-msgstr "échec de la poussée de tous les sous-modules nécessaires"
-
-#: tree-walk.c:33
-msgid "too-short tree object"
-msgstr "objet arbre trop court"
-
-#: tree-walk.c:39
-msgid "malformed mode in tree entry"
-msgstr "mode invalide dans l'entrée d'arbre"
-
-#: tree-walk.c:43
-msgid "empty filename in tree entry"
-msgstr "nom de fichier vide dans une entrée de l'arbre"
-
-#: tree-walk.c:118
-msgid "too-short tree file"
-msgstr "fichier arbre trop court"
-
-#: unpack-trees.c:118
-#, c-format
-msgid ""
-"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 ""
-"Vos modifications locales aux fichiers suivants seraient écrasées par "
-"l'extraction :\n"
-"%%sVeuillez valider ou remiser vos modifications avant de basculer de "
-"branche."
-
-#: unpack-trees.c:120
-#, c-format
-msgid ""
-"Your local changes to the following files would be overwritten by checkout:\n"
-"%%s"
-msgstr ""
-"Vos modifications locales aux fichiers suivants seraient écrasées par "
-"l'extraction :\n"
-"%%s"
-
-#: unpack-trees.c:123
-#, c-format
-msgid ""
-"Your local changes to the following files would be overwritten by merge:\n"
-"%%sPlease commit your changes or stash them before you merge."
-msgstr ""
-"Vos modifications locales aux fichiers suivants seraient écrasées par la "
-"fusion :\n"
-"%%sVeuillez valider ou remiser vos modifications avant la fusion."
-
-#: unpack-trees.c:125
-#, c-format
-msgid ""
-"Your local changes to the following files would be overwritten by merge:\n"
-"%%s"
-msgstr ""
-"Vos modifications locales aux fichiers suivants seraient écrasées par la "
-"fusion :\n"
-"%%s"
-
-#: unpack-trees.c:128
-#, c-format
-msgid ""
-"Your local changes to the following files would be overwritten by %s:\n"
-"%%sPlease commit your changes or stash them before you %s."
-msgstr ""
-"Vos modifications locales aux fichiers suivants seraient écrasées par %s :\n"
-"%%sVeuillez valider ou remiser vos modifications avant %s."
-
-#: unpack-trees.c:130
-#, c-format
-msgid ""
-"Your local changes to the following files would be overwritten by %s:\n"
-"%%s"
-msgstr ""
-"Vos modifications locales aux fichiers suivants seraient écrasées par %s :\n"
-"%%s"
-
-#: unpack-trees.c:135
-#, c-format
-msgid ""
-"Updating the following directories would lose untracked files in them:\n"
-"%s"
-msgstr ""
-"La mise à jour des répertoires suivants effacerait les fichiers non suivis "
-"contenus :\n"
-"%s"
-
-#: unpack-trees.c:138
-#, c-format
-msgid ""
-"Refusing to remove the current working directory:\n"
-"%s"
-msgstr ""
-"impossible de supprimer le répertoire de travail actuel :\n"
-"%s"
-
-#: unpack-trees.c:142
-#, c-format
-msgid ""
-"The following untracked working tree files would be removed by checkout:\n"
-"%%sPlease move or remove them before you switch branches."
-msgstr ""
-"Les fichiers suivants non suivis de la copie de travail seraient effacés par "
-"l'extraction :\n"
-"%%sVeuillez renommer ou effacer ces fichiers avant de basculer de branche."
-
-#: unpack-trees.c:144
-#, c-format
-msgid ""
-"The following untracked working tree files would be removed by checkout:\n"
-"%%s"
-msgstr ""
-"Les fichiers suivants non suivis seraient effacés par l'extraction :\n"
-"%%s"
-
-#: unpack-trees.c:147
-#, c-format
-msgid ""
-"The following untracked working tree files would be removed by merge:\n"
-"%%sPlease move or remove them before you merge."
-msgstr ""
-"Les fichiers suivants non suivis de la copie de travail seraient effacés par "
-"la fusion :\n"
-"%%sVeuillez renommer ou effacer ces fichiers avant la fusion."
-
-#: unpack-trees.c:149
-#, c-format
-msgid ""
-"The following untracked working tree files would be removed by merge:\n"
-"%%s"
-msgstr ""
-"Les fichiers suivants non suivis seraient effacés par la fusion :\n"
-"%%s"
-
-#: unpack-trees.c:152
-#, c-format
-msgid ""
-"The following untracked working tree files would be removed by %s:\n"
-"%%sPlease move or remove them before you %s."
-msgstr ""
-"Les fichiers suivants non suivis de la copie de travail seraient effacés par "
-"%s :\n"
-"%%sVeuillez renommer ou effacer ces fichiers avant %s."
-
-#: unpack-trees.c:154
-#, c-format
-msgid ""
-"The following untracked working tree files would be removed by %s:\n"
-"%%s"
-msgstr ""
-"Les fichiers suivants non suivis seraient effacés par %s :\n"
-"%%s"
-
-#: unpack-trees.c:160
-#, c-format
-msgid ""
-"The following untracked working tree files would be overwritten by "
-"checkout:\n"
-"%%sPlease move or remove them before you switch branches."
-msgstr ""
-"Les fichiers suivants non suivis de la copie de travail seraient écrasés par "
-"l'extraction :\n"
-"%%sVeuillez renommer ou effacer ces fichiers avant de basculer de branche."
-
-#: unpack-trees.c:162
-#, c-format
-msgid ""
-"The following untracked working tree files would be overwritten by "
-"checkout:\n"
-"%%s"
-msgstr ""
-"Les fichiers suivants non suivis seraient écrasés par l'extraction :\n"
-"%%s"
-
-#: unpack-trees.c:165
-#, c-format
-msgid ""
-"The following untracked working tree files would be overwritten by merge:\n"
-"%%sPlease move or remove them before you merge."
-msgstr ""
-"Les fichiers suivants non suivis de la copie de travail seraient effacés par "
-"la fusion :\n"
-"%%sVeuillez renommer ou effacer ces fichiers avant la fusion."
-
-#: unpack-trees.c:167
-#, c-format
-msgid ""
-"The following untracked working tree files would be overwritten by merge:\n"
-"%%s"
-msgstr ""
-"Les fichiers suivants non suivis seraient écrasés par la fusion :\n"
-"%%s"
-
-#: unpack-trees.c:170
-#, c-format
-msgid ""
-"The following untracked working tree files would be overwritten by %s:\n"
-"%%sPlease move or remove them before you %s."
-msgstr ""
-"Les fichiers suivants non suivis de la copie de travail seraient écrasés par "
-"%s :\n"
-"%%sVeuillez renommer ou effacer ces fichiers avant %s."
-
-#: unpack-trees.c:172
-#, c-format
-msgid ""
-"The following untracked working tree files would be overwritten by %s:\n"
-"%%s"
-msgstr ""
-"Les fichiers suivants non suivis seraient écrasés par %s :\n"
-"%%s"
-
-#: unpack-trees.c:180
-#, c-format
-msgid "Entry '%s' overlaps with '%s'.  Cannot bind."
-msgstr "L'entrée '%s' surcharge avec '%s'. Affectation impossible."
-
-#: unpack-trees.c:183
-#, c-format
-msgid ""
-"Cannot update submodule:\n"
-"%s"
-msgstr ""
-"Mise à jour impossible pour le sous-module :\n"
-"%s"
-
-#: unpack-trees.c:186
-#, c-format
-msgid ""
-"The following paths are not up to date and were left despite sparse "
-"patterns:\n"
-"%s"
-msgstr ""
-"Les chemins suivants ne sont pas à jour et ont été laissés malgré les motifs "
-"clairsemés :\n"
-"%s"
-
-#: unpack-trees.c:188
-#, c-format
-msgid ""
-"The following paths are unmerged and were left despite sparse patterns:\n"
-"%s"
-msgstr ""
-"Les chemins suivants ne sont pas fusionnés et ont été laissés malgré les "
-"motifs clairsemés :\n"
-"%s"
-
-#: unpack-trees.c:190
-#, c-format
-msgid ""
-"The following paths were already present and thus not updated despite sparse "
-"patterns:\n"
-"%s"
-msgstr ""
-"Les chemins suivants étaient déjà présents et ont été laissés malgré les "
-"motifs clairsemés :\n"
-"%s"
-
-#: unpack-trees.c:270
-#, c-format
-msgid "Aborting\n"
-msgstr "Abandon\n"
-
-#: unpack-trees.c:297
-#, c-format
-msgid ""
-"After fixing the above paths, you may want to run `git sparse-checkout "
-"reapply`.\n"
-msgstr ""
-"Après correction des chemins ci-dessus, vous voulez peut-être lancer `git "
-"sparse-checkout reapply`.\n"
-
-#: unpack-trees.c:358
-msgid "Updating files"
-msgstr "Mise à jour des fichiers"
-
-#: unpack-trees.c:390
-msgid ""
-"the following paths have collided (e.g. case-sensitive paths\n"
-"on a case-insensitive filesystem) and only one from the same\n"
-"colliding group is in the working tree:\n"
-msgstr ""
-"les chemins suivants sont en collision (par exemple par des chemins\n"
-"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:1664
-msgid "Updating index flags"
-msgstr "Mise à jour des drapeaux de l'index"
-
-#: unpack-trees.c:2925
-#, 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:1579
-msgid "expected flush after fetch arguments"
-msgstr "vidage attendu après les arguments de récupération"
-
-#: urlmatch.c:163
-msgid "invalid URL scheme name or missing '://' suffix"
-msgstr "nom de schéma d'URL invalide ou suffixe '://' manquant"
-
-#: urlmatch.c:187 urlmatch.c:346 urlmatch.c:405
-#, c-format
-msgid "invalid %XX escape sequence"
-msgstr "séquence d'échappement %XX invalide"
-
-#: urlmatch.c:215
-msgid "missing host and scheme is not 'file:'"
-msgstr "hôte manquant et le schéma n'est pas 'file:'"
-
-#: urlmatch.c:232
-msgid "a 'file:' URL may not have a port number"
-msgstr "une URL 'file:' ne peut pas contenir de numéro de port"
-
-#: urlmatch.c:247
-msgid "invalid characters in host name"
-msgstr "caractères invalides dans le nom d'hôte"
-
-#: urlmatch.c:292 urlmatch.c:303
-msgid "invalid port number"
-msgstr "numéro de port invalide"
-
-#: urlmatch.c:371
-msgid "invalid '..' path segment"
-msgstr "segment de chemin '..' invalide"
-
-#: walker.c:170
-msgid "Fetching objects"
-msgstr "Récupération des objets"
-
-#: worktree.c:237 builtin/am.c:2210 builtin/bisect--helper.c:156
-#, c-format
-msgid "failed to read '%s'"
-msgstr "échec de la lecture de '%s'"
-
-#: worktree.c:304
-#, c-format
-msgid "'%s' at main working tree is not the repository directory"
-msgstr ""
-"'%s' dans l'arbre de travail principal n'est pas le répertoire de dépôt"
-
-#: worktree.c:315
-#, c-format
-msgid "'%s' file does not contain absolute path to the working tree location"
-msgstr ""
-"le fichier '%s' ne contient pas de chemin absolu à l'emplacement de l'arbre "
-"de travail"
-
-#: worktree.c:327
-#, c-format
-msgid "'%s' does not exist"
-msgstr "'%s' n'existe pas"
-
-#: worktree.c:333
-#, c-format
-msgid "'%s' is not a .git file, error code %d"
-msgstr "'%s' n'est pas un fichier .git, code d'erreur %d"
-
-#: worktree.c:342
-#, c-format
-msgid "'%s' does not point back to '%s'"
-msgstr "'%s' ne pointe pas en retour sur '%s'"
-
-#: worktree.c:600
-msgid "not a directory"
-msgstr "pas un répertoire"
-
-#: worktree.c:609
-msgid ".git is not a file"
-msgstr ".git n'est pas un fichier"
-
-#: worktree.c:611
-msgid ".git file broken"
-msgstr "fichier .git cassé"
-
-#: worktree.c:613
-msgid ".git file incorrect"
-msgstr "fichier .git incorrect"
-
-#: worktree.c:719
-msgid "not a valid path"
-msgstr "pas un chemin valide"
-
-#: worktree.c:725
-msgid "unable to locate repository; .git is not a file"
-msgstr "impossible de localiser le dépôt ; .git n'est pas un fichier"
-
-#: worktree.c:729
-msgid "unable to locate repository; .git file does not reference a repository"
-msgstr ""
-"impossible de localiser le dépôt ; .git ne fait pas référence à un dépôt"
-
-#: worktree.c:733
-msgid "unable to locate repository; .git file broken"
-msgstr "impossible de localiser le dépôt ; fichier .git cassé"
-
-#: worktree.c:739
-msgid "gitdir unreadable"
-msgstr "gitdir non lisible"
-
-#: worktree.c:743
-msgid "gitdir incorrect"
-msgstr "gitdir incorrect"
-
-#: worktree.c:768
-msgid "not a valid directory"
-msgstr "pas un répertoire valide"
-
-#: worktree.c:774
-msgid "gitdir file does not exist"
-msgstr "le fichier gitdir n'existe pas"
-
-#: worktree.c:779 worktree.c:788
-#, c-format
-msgid "unable to read gitdir file (%s)"
-msgstr "impossible de lire le fichier gitdir (%s)"
-
-#: worktree.c:798
-#, c-format
-msgid "short read (expected %<PRIuMAX> bytes, read %<PRIuMAX>)"
-msgstr ""
-"lecture trop courte ( %<PRIuMAX> octets attendus, %<PRIuMAX> octets lus)"
-
-#: worktree.c:806
-msgid "invalid gitdir file"
-msgstr "fichier gitdir invalide"
-
-#: worktree.c:814
-msgid "gitdir file points to non-existent location"
-msgstr "le fichier gitdir pointe sur un endroit inexistant"
-
-#: worktree.c:830
-#, c-format
-msgid "unable to set %s in '%s'"
-msgstr "impossible de définir la clé %s dans '%s'"
-
-#: worktree.c:832
-#, c-format
-msgid "unable to unset %s in '%s'"
-msgstr "impossible de désinitialiser %s dans '%s'"
-
-#: worktree.c:852
-msgid "failed to set extensions.worktreeConfig setting"
-msgstr "échec de paramétrage extensions.worktreeConfig"
-
-#: wrapper.c:161
-#, c-format
-msgid "could not setenv '%s'"
-msgstr "impossible de configurer l'environnement '%s'"
-
-#: wrapper.c:213
-#, c-format
-msgid "unable to create '%s'"
-msgstr "impossible de créer '%s'"
-
-#: wrapper.c:215 wrapper.c:385
-#, c-format
-msgid "could not open '%s' for reading and writing"
-msgstr "impossible d'ouvrir '%s' en lecture/écriture"
-
-#: wrapper.c:416 wrapper.c:683
-#, c-format
-msgid "unable to access '%s'"
-msgstr "impossible d'accéder à '%s'"
-
-#: wrapper.c:691
-msgid "unable to get current working directory"
-msgstr "impossible d'accéder au répertoire de travail courant"
-
-#: wt-status.c:158
-msgid "Unmerged paths:"
-msgstr "Chemins non fusionnés :"
-
-#: wt-status.c:187 wt-status.c:219
-msgid "  (use \"git restore --staged <file>...\" to unstage)"
-msgstr "  (utilisez \"git restore --staged <fichier>...\" pour désindexer)"
-
-#: wt-status.c:190 wt-status.c:222
-#, c-format
-msgid "  (use \"git restore --source=%s --staged <file>...\" to unstage)"
-msgstr ""
-"  (utilisez \"git restore --source=%s --staged <fichier>...\" pour "
-"désindexer)"
-
-#: wt-status.c:193 wt-status.c:225
-msgid "  (use \"git rm --cached <file>...\" to unstage)"
-msgstr "  (utilisez \"git rm --cached <fichier>...\" pour désindexer)"
-
-#: wt-status.c:197
-msgid "  (use \"git add <file>...\" to mark resolution)"
-msgstr "  (utilisez \"git add <fichier>...\" pour marquer comme résolu)"
-
-#: wt-status.c:199 wt-status.c:203
-msgid "  (use \"git add/rm <file>...\" as appropriate to mark resolution)"
-msgstr ""
-"  (utilisez \"git add/rm <fichier>...\" si nécessaire pour marquer comme "
-"résolu)"
-
-#: wt-status.c:201
-msgid "  (use \"git rm <file>...\" to mark resolution)"
-msgstr "  (utilisez \"git rm <fichier>...\" pour marquer comme résolu)"
-
-#: wt-status.c:211 wt-status.c:1140
-msgid "Changes to be committed:"
-msgstr "Modifications qui seront validées :"
-
-#: wt-status.c:234 wt-status.c:1149
-msgid "Changes not staged for commit:"
-msgstr "Modifications qui ne seront pas validées :"
-
-#: wt-status.c:238
-msgid "  (use \"git add <file>...\" to update what will be committed)"
-msgstr ""
-"  (utilisez \"git add <fichier>...\" pour mettre à jour ce qui sera validé)"
-
-#: wt-status.c:240
-msgid "  (use \"git add/rm <file>...\" to update what will be committed)"
-msgstr ""
-"  (utilisez \"git add/rm <fichier>...\" pour mettre à jour ce qui sera "
-"validé)"
-
-#: wt-status.c:241
-msgid ""
-"  (use \"git restore <file>...\" to discard changes in working directory)"
-msgstr ""
-"  (utilisez \"git restore <fichier>...\" pour annuler les modifications dans "
-"le répertoire de travail)"
-
-#: wt-status.c:243
-msgid "  (commit or discard the untracked or modified content in submodules)"
-msgstr ""
-"  (valider ou annuler le contenu non suivi ou modifié dans les sous-modules)"
-
-#: wt-status.c:254
-#, c-format
-msgid "  (use \"git %s <file>...\" to include in what will be committed)"
-msgstr ""
-"  (utilisez \"git %s <fichier>...\" pour inclure dans ce qui sera validé)"
-
-#: wt-status.c:266
-msgid "both deleted:"
-msgstr "supprimé des deux côtés :"
-
-#: wt-status.c:268
-msgid "added by us:"
-msgstr "ajouté par nous :"
-
-#: wt-status.c:270
-msgid "deleted by them:"
-msgstr "supprimé par eux :"
-
-#: wt-status.c:272
-msgid "added by them:"
-msgstr "ajouté par eux :"
-
-#: wt-status.c:274
-msgid "deleted by us:"
-msgstr "supprimé par nous :"
-
-#: wt-status.c:276
-msgid "both added:"
-msgstr "ajouté de deux côtés :"
-
-#: wt-status.c:278
-msgid "both modified:"
-msgstr "modifié des deux côtés :"
-
-#: wt-status.c:288
-msgid "new file:"
-msgstr "nouveau fichier :"
-
-#: wt-status.c:290
-msgid "copied:"
-msgstr "copié :"
-
-#: wt-status.c:292
-msgid "deleted:"
-msgstr "supprimé :"
-
-#: wt-status.c:294
-msgid "modified:"
-msgstr "modifié :"
-
-#: wt-status.c:296
-msgid "renamed:"
-msgstr "renommé :"
-
-#: wt-status.c:298
-msgid "typechange:"
-msgstr "modif. type :"
-
-#: wt-status.c:300
-msgid "unknown:"
-msgstr "inconnu :"
-
-#: wt-status.c:302
-msgid "unmerged:"
-msgstr "non fusionné :"
-
-#: wt-status.c:382
-msgid "new commits, "
-msgstr "nouveaux commits, "
-
-#: wt-status.c:384
-msgid "modified content, "
-msgstr "contenu modifié, "
-
-#: wt-status.c:386
-msgid "untracked content, "
-msgstr "contenu non suivi, "
-
-#: wt-status.c:973
-#, c-format
-msgid "Your stash currently has %d entry"
-msgid_plural "Your stash currently has %d entries"
-msgstr[0] "Votre remisage contient actuellement %d entrée"
-msgstr[1] "Votre remisage contient actuellement %d entrées"
-
-#: wt-status.c:1004
-msgid "Submodules changed but not updated:"
-msgstr "Sous-modules modifiés mais non mis à jour :"
-
-#: wt-status.c:1006
-msgid "Submodule changes to be committed:"
-msgstr "Changements du sous-module à valider :"
-
-#: wt-status.c:1088
-msgid ""
-"Do not modify or remove the line above.\n"
-"Everything below it will be ignored."
-msgstr ""
-"Ne touchez pas à la ligne ci-dessus.\n"
-"Tout ce qui suit sera éliminé."
-
-#: wt-status.c:1180
-#, c-format
-msgid ""
-"\n"
-"It took %.2f seconds to compute the branch ahead/behind values.\n"
-"You can use '--no-ahead-behind' to avoid this.\n"
-msgstr ""
-"\n"
-"%.2f secondes ont été nécessaires pour calculer les valeurs d'avance/retard "
-"de la branche.\n"
-"Vous pouvez utiliser '--no-ahead-behind' pour éviter ceci.\n"
-
-#: wt-status.c:1210
-msgid "You have unmerged paths."
-msgstr "Vous avez des chemins non fusionnés."
-
-#: wt-status.c:1213
-msgid "  (fix conflicts and run \"git commit\")"
-msgstr "  (réglez les conflits puis lancez \"git commit\")"
-
-#: wt-status.c:1215
-msgid "  (use \"git merge --abort\" to abort the merge)"
-msgstr "  (utilisez \"git merge --abort\" pour annuler la fusion)"
-
-#: wt-status.c:1219
-msgid "All conflicts fixed but you are still merging."
-msgstr "Tous les conflits sont réglés mais la fusion n'est pas terminée."
-
-#: wt-status.c:1222
-msgid "  (use \"git commit\" to conclude merge)"
-msgstr "  (utilisez \"git commit\" pour terminer la fusion)"
-
-#: wt-status.c:1233
-msgid "You are in the middle of an am session."
-msgstr "Vous êtes au milieu d'une session am."
-
-#: wt-status.c:1236
-msgid "The current patch is empty."
-msgstr "Le patch actuel est vide."
-
-#: wt-status.c:1241
-msgid "  (fix conflicts and then run \"git am --continue\")"
-msgstr "  (réglez les conflits puis lancez \"git am --continue\")"
-
-#: wt-status.c:1243
-msgid "  (use \"git am --skip\" to skip this patch)"
-msgstr "  (utilisez \"git am --skip\" pour sauter ce patch)"
-
-#: wt-status.c:1246
-msgid ""
-"  (use \"git am --allow-empty\" to record this patch as an empty commit)"
-msgstr ""
-"  (utilisez \"git am --allow-empty\" pour enregistrer la rustine comme un "
-"commit vide)"
-
-#: wt-status.c:1248
-msgid "  (use \"git am --abort\" to restore the original branch)"
-msgstr "  (utilisez \"git am --abort\" pour restaurer la branche d'origine)"
-
-#: wt-status.c:1381
-msgid "git-rebase-todo is missing."
-msgstr "git-rebase-todo est manquant."
-
-#: wt-status.c:1383
-msgid "No commands done."
-msgstr "Aucune commande réalisée."
-
-#: wt-status.c:1386
-#, c-format
-msgid "Last command done (%<PRIuMAX> command done):"
-msgid_plural "Last commands done (%<PRIuMAX> commands done):"
-msgstr[0] "Dernière commande effectuée (%<PRIuMAX> commande effectuée) :"
-msgstr[1] "Dernières commandes effectuées (%<PRIuMAX> commandes effectuées) :"
-
-#: wt-status.c:1397
-#, c-format
-msgid "  (see more in file %s)"
-msgstr "  (voir plus dans le fichier %s)"
-
-#: wt-status.c:1402
-msgid "No commands remaining."
-msgstr "Aucune commande restante."
-
-#: wt-status.c:1405
-#, c-format
-msgid "Next command to do (%<PRIuMAX> remaining command):"
-msgid_plural "Next commands to do (%<PRIuMAX> remaining commands):"
-msgstr[0] "Prochaine commande à effectuer (%<PRIuMAX> commande restante) :"
-msgstr[1] "Prochaines commandes à effectuer (%<PRIuMAX> commandes restantes) :"
-
-#: wt-status.c:1413
-msgid "  (use \"git rebase --edit-todo\" to view and edit)"
-msgstr "  (utilisez \"git rebase --edit-todo\" pour voir et éditer)"
-
-#: wt-status.c:1425
-#, c-format
-msgid "You are currently rebasing branch '%s' on '%s'."
-msgstr "Vous êtes en train de rebaser la branche '%s' sur '%s'."
-
-#: wt-status.c:1430
-msgid "You are currently rebasing."
-msgstr "Vous êtes en train de rebaser."
-
-#: wt-status.c:1443
-msgid "  (fix conflicts and then run \"git rebase --continue\")"
-msgstr "  (réglez les conflits puis lancez \"git rebase --continue\")"
-
-#: wt-status.c:1445
-msgid "  (use \"git rebase --skip\" to skip this patch)"
-msgstr "  (utilisez \"git rebase --skip\" pour sauter ce patch)"
-
-#: wt-status.c:1447
-msgid "  (use \"git rebase --abort\" to check out the original branch)"
-msgstr "  (utilisez \"git rebase --abort\" pour extraire la branche d'origine)"
-
-#: wt-status.c:1454
-msgid "  (all conflicts fixed: run \"git rebase --continue\")"
-msgstr "  (tous les conflits sont réglés : lancez \"git rebase --continue\")"
-
-#: wt-status.c:1458
-#, c-format
-msgid ""
-"You are currently splitting a commit while rebasing branch '%s' on '%s'."
-msgstr ""
-"Vous êtes actuellement en train de fractionner un commit pendant un rebasage "
-"de la branche '%s' sur '%s'."
-
-#: wt-status.c:1463
-msgid "You are currently splitting a commit during a rebase."
-msgstr ""
-"Vous êtes actuellement en train de fractionner un commit pendant un rebasage."
-
-#: wt-status.c:1466
-msgid "  (Once your working directory is clean, run \"git rebase --continue\")"
-msgstr ""
-"  (Une fois la copie de travail nettoyée, lancez \"git rebase --continue\")"
-
-#: wt-status.c:1470
-#, c-format
-msgid "You are currently editing a commit while rebasing branch '%s' on '%s'."
-msgstr ""
-"Vous êtes actuellement en train d'éditer un commit pendant un rebasage de la "
-"branche '%s' sur '%s'."
-
-#: wt-status.c:1475
-msgid "You are currently editing a commit during a rebase."
-msgstr ""
-"Vous êtes actuellement en train d'éditer un commit pendant un rebasage."
-
-#: wt-status.c:1478
-msgid "  (use \"git commit --amend\" to amend the current commit)"
-msgstr "  (utilisez \"git commit --amend\" pour corriger le commit actuel)"
-
-#: wt-status.c:1480
-msgid ""
-"  (use \"git rebase --continue\" once you are satisfied with your changes)"
-msgstr ""
-"  (utilisez \"git rebase --continue\" quand vous avez effectué toutes vos "
-"modifications)"
-
-#: wt-status.c:1491
-msgid "Cherry-pick currently in progress."
-msgstr "Picorage en cours."
-
-#: wt-status.c:1494
-#, c-format
-msgid "You are currently cherry-picking commit %s."
-msgstr "Vous êtes actuellement en train de picorer le commit %s."
-
-#: wt-status.c:1501
-msgid "  (fix conflicts and run \"git cherry-pick --continue\")"
-msgstr "  (réglez les conflits puis lancez \"git cherry-pick --continue\")"
-
-#: wt-status.c:1504
-msgid "  (run \"git cherry-pick --continue\" to continue)"
-msgstr "  (lancez \"git cherry-pick --continue\" pour continuer)"
-
-#: wt-status.c:1507
-msgid "  (all conflicts fixed: run \"git cherry-pick --continue\")"
-msgstr ""
-"  (tous les conflits sont réglés : lancez \"git cherry-pick --continue\")"
-
-#: wt-status.c:1509
-msgid "  (use \"git cherry-pick --skip\" to skip this patch)"
-msgstr "  (utilisez \"git cherry-pick --skip\" pour sauter ce patch)"
-
-#: wt-status.c:1511
-msgid "  (use \"git cherry-pick --abort\" to cancel the cherry-pick operation)"
-msgstr "  (utilisez \"git cherry-pick --abort\" pour annuler le picorage)"
-
-#: wt-status.c:1521
-msgid "Revert currently in progress."
-msgstr "Rétablissement en cours."
-
-#: wt-status.c:1524
-#, c-format
-msgid "You are currently reverting commit %s."
-msgstr "Vous êtes actuellement en train de rétablir le commit %s."
-
-#: wt-status.c:1530
-msgid "  (fix conflicts and run \"git revert --continue\")"
-msgstr "  (réglez les conflits puis lancez \"git revert --continue\")"
-
-#: wt-status.c:1533
-msgid "  (run \"git revert --continue\" to continue)"
-msgstr "  (lancez \"git revert --continue\" pour continuer)"
-
-#: wt-status.c:1536
-msgid "  (all conflicts fixed: run \"git revert --continue\")"
-msgstr "  (tous les conflits sont réglés : lancez \"git revert --continue\")"
-
-#: wt-status.c:1538
-msgid "  (use \"git revert --skip\" to skip this patch)"
-msgstr "  (utilisez \"git revert --skip\" pour sauter ce patch)"
-
-#: wt-status.c:1540
-msgid "  (use \"git revert --abort\" to cancel the revert operation)"
-msgstr "  (utilisez \"git revert --abort\" pour annuler le rétablissement)"
-
-#: wt-status.c:1550
-#, c-format
-msgid "You are currently bisecting, started from branch '%s'."
-msgstr "Vous êtes en cours de bissection, depuis la branche '%s'."
-
-#: wt-status.c:1554
-msgid "You are currently bisecting."
-msgstr "Vous êtes en cours de bissection."
-
-#: wt-status.c:1557
-msgid "  (use \"git bisect reset\" to get back to the original branch)"
-msgstr "  (utilisez \"git bisect reset\" pour revenir à la branche d'origine)"
-
-#: wt-status.c:1568
-msgid "You are in a sparse checkout."
-msgstr "Vous êtes dans une extraction clairsemée."
-
-#: wt-status.c:1571
-#, c-format
-msgid "You are in a sparse checkout with %d%% of tracked files present."
-msgstr ""
-"Vous êtes dans une extraction partielle avec %d %% de fichiers suivis "
-"présents."
-
-#: wt-status.c:1815
-msgid "On branch "
-msgstr "Sur la branche "
-
-#: wt-status.c:1822
-msgid "interactive rebase in progress; onto "
-msgstr "rebasage interactif en cours ; sur "
-
-#: wt-status.c:1824
-msgid "rebase in progress; onto "
-msgstr "rebasage en cours ; sur "
-
-#: wt-status.c:1829
-msgid "HEAD detached at "
-msgstr "HEAD détachée sur "
-
-#: wt-status.c:1831
-msgid "HEAD detached from "
-msgstr "HEAD détachée depuis "
-
-#: wt-status.c:1834
-msgid "Not currently on any branch."
-msgstr "Actuellement sur aucun branche."
-
-#: wt-status.c:1851
-msgid "Initial commit"
-msgstr "Validation initiale"
-
-#: wt-status.c:1852
-msgid "No commits yet"
-msgstr "Aucun commit"
-
-#: wt-status.c:1866
-msgid "Untracked files"
-msgstr "Fichiers non suivis"
-
-#: wt-status.c:1868
-msgid "Ignored files"
-msgstr "Fichiers ignorés"
-
-#: wt-status.c:1872
-#, c-format
-msgid ""
-"It took %.2f seconds to enumerate untracked files. 'status -uno'\n"
-"may speed it up, but you have to be careful not to forget to add\n"
-"new files yourself (see 'git help status')."
-msgstr ""
-"L'énumération des fichiers non suivis a duré %.2f secondes. 'status -uno'\n"
-"peut l'accélérer, mais vous devez alors faire attention à ne pas\n"
-"oublier d'ajouter les nouveaux fichiers par vous-même (voir 'git help "
-"status')."
-
-#: wt-status.c:1878
-#, c-format
-msgid "Untracked files not listed%s"
-msgstr "Fichiers non suivis non affichés%s"
-
-#: wt-status.c:1880
-msgid " (use -u option to show untracked files)"
-msgstr " (utilisez -u pour afficher les fichiers non suivis)"
-
-#: wt-status.c:1886
-msgid "No changes"
-msgstr "Aucune modification"
-
-#: wt-status.c:1891
-#, c-format
-msgid "no changes added to commit (use \"git add\" and/or \"git commit -a\")\n"
-msgstr ""
-"aucune modification n'a été ajoutée à la validation (utilisez \"git add\" ou "
-"\"git commit -a\")\n"
-
-#: wt-status.c:1895
-#, c-format
-msgid "no changes added to commit\n"
-msgstr "aucune modification ajoutée à la validation\n"
-
-#: wt-status.c:1899
-#, c-format
-msgid ""
-"nothing added to commit but untracked files present (use \"git add\" to "
-"track)\n"
-msgstr ""
-"aucune modification ajoutée à la validation mais des fichiers non suivis "
-"sont présents (utilisez \"git add\" pour les suivre)\n"
-
-#: wt-status.c:1903
-#, c-format
-msgid "nothing added to commit but untracked files present\n"
-msgstr ""
-"aucune modification ajoutée à la validation mais des fichiers non suivis "
-"sont présents\n"
-
-#: wt-status.c:1907
-#, c-format
-msgid "nothing to commit (create/copy files and use \"git add\" to track)\n"
-msgstr ""
-"rien à valider (créez/copiez des fichiers et utilisez \"git add\" pour les "
-"suivre)\n"
-
-#: wt-status.c:1911 wt-status.c:1917
-#, c-format
-msgid "nothing to commit\n"
-msgstr "rien à valider\n"
-
-#: wt-status.c:1914
-#, c-format
-msgid "nothing to commit (use -u to show untracked files)\n"
-msgstr "rien à valider (utilisez -u pour afficher les fichiers non suivis)\n"
-
-#: wt-status.c:1919
-#, c-format
-msgid "nothing to commit, working tree clean\n"
-msgstr "rien à valider, la copie de travail est propre\n"
-
-#: wt-status.c:2024
-msgid "No commits yet on "
-msgstr "Encore aucun commit sur "
-
-#: wt-status.c:2028
-msgid "HEAD (no branch)"
-msgstr "HEAD (aucune branche)"
-
-#: wt-status.c:2059
-msgid "different"
-msgstr "différent"
-
-#: wt-status.c:2061 wt-status.c:2069
-msgid "behind "
-msgstr "derrière "
-
-#: wt-status.c:2064 wt-status.c:2067
-msgid "ahead "
-msgstr "devant "
-
-#. TRANSLATORS: the action is e.g. "pull with rebase"
-#: wt-status.c:2605
-#, c-format
-msgid "cannot %s: You have unstaged changes."
-msgstr "impossible de %s : vous avez des modifications non indexées."
-
-#: wt-status.c:2611
-msgid "additionally, your index contains uncommitted changes."
-msgstr "de plus, votre index contient des modifications non validées."
-
-#: wt-status.c:2613
-#, c-format
-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:205
-msgid "could not send IPC command"
-msgstr "impossible de trouver le commit %"
-
-#: compat/simple-ipc/ipc-unix-socket.c:212
-msgid "could not read IPC response"
-msgstr "impossible de lire la réponse IPC"
-
-#: compat/simple-ipc/ipc-unix-socket.c:892
-#, c-format
-msgid "could not start accept_thread '%s'"
-msgstr "impossible de démarrer accept_thread '%s'"
-
-#: compat/simple-ipc/ipc-unix-socket.c:904
-#, 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:353
-#, c-format
-msgid "failed to unlink '%s'"
-msgstr "échec pour délier '%s'"
-
-#: compat/fsmonitor/fsm-listen-darwin.c:355
-msgid "Unable to create FSEventStream."
-msgstr "impossible de créer FSEVEntStream."
-
-#: compat/fsmonitor/fsm-listen-darwin.c:403
-msgid "Failed to start the FSEventStream"
-msgstr "Échec de démarrage de FSEVEntStream"
-
-#: builtin/add.c:26
 msgid "git add [<options>] [--] <pathspec>..."
 msgstr "git add [<options>] [--] <chemin>..."
 
-#: builtin/add.c:63
 #, c-format
 msgid "cannot chmod %cx '%s'"
 msgstr "impossible de chmod %cx '%s'"
 
-#: builtin/add.c:105
 #, c-format
 msgid "unexpected diff status %c"
 msgstr "état de diff inattendu %c"
 
-#: builtin/add.c:110 builtin/commit.c:299
 msgid "updating files failed"
 msgstr "échec de la mise à jour des fichiers"
 
-#: builtin/add.c:120
 #, c-format
 msgid "remove '%s'\n"
 msgstr "suppression de '%s'\n"
 
-#: builtin/add.c:204
 msgid "Unstaged changes after refreshing the index:"
 msgstr "Modifications non indexées après rafraîchissement de l'index :"
 
-#: builtin/add.c:312 builtin/rev-parse.c:993
 msgid "Could not read the index"
 msgstr "Impossible de lire l'index"
 
-#: builtin/add.c:325
 msgid "Could not write patch"
 msgstr "Impossible d'écrire le patch"
 
-#: builtin/add.c:328
 msgid "editing patch failed"
 msgstr "échec de l'édition du patch"
 
-#: builtin/add.c:331
 #, c-format
 msgid "Could not stat '%s'"
 msgstr "Stat de '%s' impossible"
 
-#: builtin/add.c:333
 msgid "Empty patch. Aborted."
 msgstr "Patch vide. Abandon."
 
-#: builtin/add.c:339
 #, c-format
 msgid "Could not apply '%s'"
 msgstr "Impossible d'appliquer '%s'"
 
-#: builtin/add.c:347
 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:367 builtin/clean.c:927 builtin/fetch.c:175 builtin/mv.c:124
-#: builtin/prune-packed.c:14 builtin/pull.c:208 builtin/push.c:550
-#: builtin/remote.c:1454 builtin/rm.c:244 builtin/send-pack.c:194
 msgid "dry run"
 msgstr "simuler l'action"
 
-#: builtin/add.c:368 builtin/check-ignore.c:22 builtin/commit.c:1483
-#: builtin/count-objects.c:98 builtin/fsck.c:789 builtin/log.c:2338
-#: builtin/mv.c:123 builtin/read-tree.c:120
 msgid "be verbose"
 msgstr "mode verbeux"
 
-#: builtin/add.c:370
 msgid "interactive picking"
 msgstr "sélection interactive"
 
-#: builtin/add.c:371 builtin/checkout.c:1599 builtin/reset.c:417
 msgid "select hunks interactively"
 msgstr "sélection interactive des sections"
 
-#: builtin/add.c:372
 msgid "edit current diff and apply"
 msgstr "édition du diff actuel et application"
 
-#: builtin/add.c:373
 msgid "allow adding otherwise ignored files"
 msgstr "permettre l'ajout de fichiers ignorés"
 
-#: builtin/add.c:374
 msgid "update tracked files"
 msgstr "mettre à jour les fichiers suivis"
 
-#: builtin/add.c:375
 msgid "renormalize EOL of tracked files (implies -u)"
 msgstr ""
 "renormaliser les fins de lignes (EOL) des fichiers suivis (implique -u)"
 
-#: builtin/add.c:376
 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:377
 msgid "add changes from all tracked and untracked files"
 msgstr "ajouter les modifications de tous les fichiers suivis et non suivis"
 
-#: builtin/add.c:380
 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:382
 msgid "don't add, only refresh the index"
 msgstr "ne pas ajouter, juste rafraîchir l'index"
 
-#: builtin/add.c:383
 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:384
 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:385 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:387 builtin/update-index.c:1023
 msgid "override the executable bit of the listed files"
 msgstr "outrepasser le bit exécutable pour les fichiers listés"
 
-#: builtin/add.c:389
 msgid "warn when adding an embedded repository"
 msgstr "avertir lors de l'ajout d'un dépôt embarqué"
 
-#: builtin/add.c:407
 #, c-format
 msgid ""
 "You've added another git repository inside your current repository.\n"
@@ -11019,12 +1912,10 @@ msgstr ""
 "\n"
 "Référez-vous à \"git help submodule\" pour plus d'information."
 
-#: builtin/add.c:436
 #, c-format
 msgid "adding embedded git repository: %s"
 msgstr "dépôt git embarqué ajouté : %s"
 
-#: builtin/add.c:456
 msgid ""
 "Use -f if you really want to add them.\n"
 "Turn this message off by running\n"
@@ -11034,29 +1925,23 @@ msgstr ""
 "Éliminez ce message en lançant\n"
 "\"git config advice.addIgnoredFile false\""
 
-#: builtin/add.c:471
 msgid "adding files failed"
 msgstr "échec de l'ajout de fichiers"
 
-#: builtin/add.c:534
 #, 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:555 builtin/checkout.c:1770 builtin/commit.c:365
-#: builtin/reset.c:436 builtin/rm.c:275 builtin/stash.c:1702
 #, c-format
 msgid "'%s' and pathspec arguments cannot be used together"
 msgstr ""
 "'%s' et les arguments de spécificateur de chemin ne peuvent pas être "
 "utilisés ensemble"
 
-#: builtin/add.c:566
 #, c-format
 msgid "Nothing specified, nothing added.\n"
 msgstr "Rien de spécifié, rien n'a été ajouté.\n"
 
-#: builtin/add.c:568
 msgid ""
 "Maybe you wanted to say 'git add .'?\n"
 "Turn this message off by running\n"
@@ -11066,115 +1951,123 @@ msgstr ""
 "Éliminez ce message en lançant\n"
 "\"git config advice.addEmptyPathspec false\""
 
-#: builtin/am.c:393
+msgid "index file corrupt"
+msgstr "fichier d'index corrompu"
+
+#, c-format
+msgid "bad action '%s' for '%s'"
+msgstr "action invalide '%s' pour '%s'"
+
+#, c-format
+msgid "invalid value for '%s': '%s'"
+msgstr "valeur invalide pour '%s' : '%s'"
+
+#, c-format
+msgid "could not read '%s'"
+msgstr "impossible de lire '%s'"
+
 msgid "could not parse author script"
 msgstr "impossible d'analyser l'auteur du script"
 
-#: builtin/am.c:483
+#, c-format
+msgid "could not parse %s"
+msgstr "impossible d'analyser %s"
+
 #, c-format
 msgid "'%s' was deleted by the applypatch-msg hook"
 msgstr "'%s' a été effacé par le crochet applypatch-msg"
 
-#: builtin/am.c:525
 #, c-format
 msgid "Malformed input line: '%s'."
 msgstr "Ligne en entrée malformée : '%s'."
 
-#: builtin/am.c:563
 #, c-format
 msgid "Failed to copy notes from '%s' to '%s'"
 msgstr "Impossible de copier les notes de '%s' vers '%s'"
 
-#: builtin/am.c:589
 msgid "fseek failed"
 msgstr "échec de fseek"
 
-#: builtin/am.c:777
+#, c-format
+msgid "could not open '%s' for reading"
+msgstr "impossible d'ouvrir '%s' en lecture"
+
+#, c-format
+msgid "could not open '%s' for writing"
+msgstr "impossible d'ouvrir '%s' en écriture"
+
 #, c-format
 msgid "could not parse patch '%s'"
 msgstr "impossible d'analyser le patch '%s'"
 
-#: builtin/am.c:842
 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:890
 msgid "invalid timestamp"
 msgstr "horodatage invalide"
 
-#: builtin/am.c:895 builtin/am.c:907
 msgid "invalid Date line"
 msgstr "ligne de Date invalide"
 
-#: builtin/am.c:902
 msgid "invalid timezone offset"
 msgstr "décalage horaire invalide"
 
-#: builtin/am.c:995
 msgid "Patch format detection failed."
 msgstr "Échec de détection du format du patch."
 
-#: builtin/am.c:1000 builtin/clone.c:306
 #, c-format
 msgid "failed to create directory '%s'"
 msgstr "échec de la création du répertoire '%s'"
 
-#: builtin/am.c:1005
 msgid "Failed to split patches."
 msgstr "Échec de découpage des patchs."
 
-#: builtin/am.c:1154
 #, 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:1155
 #, 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:1160
 #, c-format
 msgid "To record the empty patch as an empty commit, run \"%s --allow-empty\"."
 msgstr ""
 "Pour enregistrer la rustine vide comme un commit vide, lancez \"%s --allow-"
 "empty\"."
 
-#: builtin/am.c:1162
 #, 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:1257
 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:1345
 #, c-format
 msgid "missing author line in commit %s"
 msgstr "ligne d'auteur manquante dans le commit %s"
 
-#: builtin/am.c:1348
 #, c-format
 msgid "invalid ident line: %.*s"
 msgstr "ligne d'identification invalide : %.*s"
 
-#: builtin/am.c:1567
+#, c-format
+msgid "unable to parse commit %s"
+msgstr "impossible d'analyser le commit %s"
+
 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:1569
 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:1588
 msgid ""
 "Did you hand edit your patch?\n"
 "It does not apply to blobs recorded in its index."
@@ -11182,24 +2075,25 @@ msgstr ""
 "Avez-vous édité le patch à la main ?\n"
 "Il ne s'applique pas aux blobs enregistrés dans son index."
 
-#: builtin/am.c:1594
 msgid "Falling back to patching base and 3-way merge..."
 msgstr "Retour à un patch de la base et fusion à 3 points..."
 
-#: builtin/am.c:1620
 msgid "Failed to merge in the changes."
 msgstr "Échec d'intégration des modifications."
 
-#: builtin/am.c:1652
+msgid "git write-tree failed to write a tree"
+msgstr "git write-tree a échoué à écrire un arbre"
+
 msgid "applying to an empty history"
 msgstr "application à un historique vide"
 
-#: builtin/am.c:1704 builtin/am.c:1708
+msgid "failed to write commit object"
+msgstr "échec de l'écriture de l'objet commit"
+
 #, c-format
 msgid "cannot resume: %s does not exist."
 msgstr "impossible de continuer : %s n'existe pas."
 
-#: builtin/am.c:1726
 msgid "Commit Body is:"
 msgstr "Le corps de la validation est :"
 
@@ -11207,58 +2101,46 @@ msgstr "Le corps de la validation est :"
 #. in your translation. The program will only accept English
 #. input at this point.
 #.
-#: builtin/am.c:1736
 #, 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:1782 builtin/commit.c:410
 msgid "unable to write index file"
 msgstr "impossible d'écrire le fichier d'index"
 
-#: builtin/am.c:1786
 #, c-format
 msgid "Dirty index: cannot apply patches (dirty: %s)"
 msgstr "Index sale : impossible d'appliquer des patchs (sales : %s)"
 
-#: builtin/am.c:1828
 #, c-format
 msgid "Skipping: %.*s"
 msgstr "Ignoré : %.*s"
 
-#: builtin/am.c:1833
 #, c-format
 msgid "Creating an empty commit: %.*s"
 msgstr "Création d'un commit vide : %.*s"
 
-#: builtin/am.c:1837
 msgid "Patch is empty."
 msgstr "Le patch actuel est vide."
 
-#: builtin/am.c:1848 builtin/am.c:1917
 #, c-format
 msgid "Applying: %.*s"
 msgstr "Application de  %.*s"
 
-#: builtin/am.c:1865
 msgid "No changes -- Patch already applied."
 msgstr "Pas de changement -- Patch déjà appliqué."
 
-#: builtin/am.c:1871
 #, c-format
 msgid "Patch failed at %s %.*s"
 msgstr "l'application de la rustine a échoué à %s %.*s"
 
-#: builtin/am.c:1875
 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"
 
-#: builtin/am.c:1921
 msgid "No changes - recorded it as an empty commit."
 msgstr "aucune modification - enregistré comme un commit vide."
 
-#: builtin/am.c:1923
 msgid ""
 "No changes - did you forget to use 'git add'?\n"
 "If there is nothing left to stage, chances are that something else\n"
@@ -11269,7 +2151,6 @@ msgstr ""
 "introduit les mêmes changements ; vous pourriez avoir envie de sauter ce "
 "patch."
 
-#: builtin/am.c:1931
 msgid ""
 "You still have unmerged paths in your index.\n"
 "You should 'git add' each file with resolved conflicts to mark them as "
@@ -11282,17 +2163,16 @@ msgstr ""
 "Vous pouvez lancer 'git rm' sur un fichier \"supprimé par eux\" pour "
 "accepter son état."
 
-#: builtin/am.c:2039 builtin/am.c:2043 builtin/am.c:2055 builtin/reset.c:455
-#: builtin/reset.c:463
+msgid "unable to write new index file"
+msgstr "impossible d'écrire le nouveau fichier d'index"
+
 #, c-format
 msgid "Could not parse object '%s'."
 msgstr "Impossible d'analyser l'objet '%s'."
 
-#: builtin/am.c:2091 builtin/am.c:2167
 msgid "failed to clean index"
 msgstr "échec du nettoyage de l'index"
 
-#: builtin/am.c:2135
 msgid ""
 "You seem to have moved HEAD since the last 'am' failure.\n"
 "Not rewinding to ORIG_HEAD"
@@ -11300,159 +2180,114 @@ msgstr ""
 "Vous semblez avoir déplacé la HEAD depuis le dernier échec de 'am'.\n"
 "Pas de retour à ORIG_HEAD"
 
-#: builtin/am.c:2292
+#, c-format
+msgid "failed to read '%s'"
+msgstr "échec de la lecture de '%s'"
+
 #, c-format
 msgid "options '%s=%s' and '%s=%s' cannot be used together"
 msgstr "les options '%s=%s' et '%s=%s' ne peuvent pas être utilisées ensemble"
 
-#: builtin/am.c:2323
 msgid "git am [<options>] [(<mbox> | <Maildir>)...]"
 msgstr "git am [<options>] [(<mbox> | <Maildir>)...]"
 
-#: builtin/am.c:2324
 msgid "git am [<options>] (--continue | --skip | --abort)"
 msgstr "git am [<options>] (--continue | --skip | --abort)"
 
-#: builtin/am.c:2330
 msgid "run interactively"
 msgstr "exécution interactive"
 
-#: builtin/am.c:2332
 msgid "historical option -- no-op"
 msgstr "option historique -- no-op"
 
-#: builtin/am.c:2334
 msgid "allow fall back on 3way merging if needed"
 msgstr "permettre de revenir à une fusion à 3 points si nécessaire"
 
-#: builtin/am.c:2335 builtin/init-db.c:547 builtin/prune-packed.c:16
-#: builtin/repack.c:646 builtin/stash.c:946
 msgid "be quiet"
 msgstr "être silencieux"
 
-#: builtin/am.c:2337
 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:2340
 msgid "recode into utf8 (default)"
 msgstr "recoder en utf-8 (par défaut)"
 
-#: builtin/am.c:2342
 msgid "pass -k flag to git-mailinfo"
 msgstr "passer l'option -k à git-mailinfo"
 
-#: builtin/am.c:2344
 msgid "pass -b flag to git-mailinfo"
 msgstr "passer l'option -b à git-mailinfo"
 
-#: builtin/am.c:2346
 msgid "pass -m flag to git-mailinfo"
 msgstr "passer l'option -m à git-mailinfo"
 
-#: builtin/am.c:2348
 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:2351
 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:2354
 msgid "strip everything before a scissors line"
 msgstr "retirer tout le contenu avant la ligne des ciseaux"
 
-#: builtin/am.c:2356
 msgid "pass it through git-mailinfo"
 msgstr "le passer à travers git-mailinfo"
 
-#: builtin/am.c:2359 builtin/am.c:2362 builtin/am.c:2365 builtin/am.c:2368
-#: builtin/am.c:2371 builtin/am.c:2374 builtin/am.c:2377 builtin/am.c:2380
-#: builtin/am.c:2386
 msgid "pass it through git-apply"
 msgstr "le passer jusqu'à git-apply"
 
-#: builtin/am.c:2376 builtin/commit.c:1514 builtin/fmt-merge-msg.c:18
-#: builtin/fmt-merge-msg.c:21 builtin/grep.c:920 builtin/merge.c:263
-#: builtin/pull.c:142 builtin/pull.c:204 builtin/pull.c:221
-#: builtin/rebase.c:1074 builtin/repack.c:657 builtin/repack.c:661
-#: builtin/repack.c:663 builtin/show-branch.c:650 builtin/show-ref.c:172
-#: builtin/tag.c:446 parse-options.h:159 parse-options.h:180
-#: parse-options.h:348
 msgid "n"
 msgstr "n"
 
-#: builtin/am.c:2382 builtin/branch.c:695 builtin/bugreport.c:109
-#: builtin/cat-file.c:848 builtin/cat-file.c:852 builtin/cat-file.c:856
-#: builtin/for-each-ref.c:41 builtin/ls-tree.c:357 builtin/replace.c:555
-#: builtin/tag.c:480 builtin/verify-tag.c:38
 msgid "format"
 msgstr "format"
 
-#: builtin/am.c:2383
 msgid "format the patch(es) are in"
 msgstr "format de présentation des patchs"
 
-#: builtin/am.c:2389
 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:2391
 msgid "continue applying patches after resolving a conflict"
 msgstr "continuer à appliquer les patchs après résolution d'un conflit"
 
-#: builtin/am.c:2394
 msgid "synonyms for --continue"
 msgstr "synonymes de --continue"
 
-#: builtin/am.c:2397
 msgid "skip the current patch"
 msgstr "sauter le patch courant"
 
-#: builtin/am.c:2400
 msgid "restore the original branch and abort the patching operation"
 msgstr "restaurer la branche originale et abandonner les applications de patch"
 
-#: builtin/am.c:2403
 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:2407
 msgid "show the patch being applied"
 msgstr "afficher le patch en cours d'application"
 
-#: builtin/am.c:2411
 msgid "record the empty patch as an empty commit"
 msgstr "enregistrer la rustine vide comme un commit vide"
 
-#: builtin/am.c:2415
 msgid "lie about committer date"
 msgstr "mentir sur la date de validation"
 
-#: builtin/am.c:2417
 msgid "use current timestamp for author date"
 msgstr "utiliser l'horodatage actuel pour la date d'auteur"
 
-#: builtin/am.c:2419 builtin/commit-tree.c:118 builtin/commit.c:1642
-#: builtin/merge.c:302 builtin/pull.c:179 builtin/rebase.c:1127
-#: builtin/revert.c:117 builtin/tag.c:461
 msgid "key-id"
 msgstr "id-clé"
 
-#: builtin/am.c:2420 builtin/rebase.c:1128
 msgid "GPG-sign commits"
 msgstr "signer les commits avec GPG"
 
-#: builtin/am.c:2423
 msgid "how to handle empty patches"
 msgstr "comment gérer les rustines vides"
 
-#: builtin/am.c:2426
 msgid "(internal use for git-rebase)"
 msgstr "(utilisation interne pour git-rebase)"
 
-#: builtin/am.c:2444
 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."
@@ -11460,17 +2295,14 @@ msgstr ""
 "L'option -b/--binary ne fait plus rien depuis longtemps,\n"
 "et elle sera supprimée. Veuillez ne plus l'utiliser."
 
-#: builtin/am.c:2451
 msgid "failed to read the index"
 msgstr "échec à la lecture de l'index"
 
-#: builtin/am.c:2466
 #, 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:2490
 #, c-format
 msgid ""
 "Stray %s directory found.\n"
@@ -11479,50 +2311,39 @@ msgstr ""
 "Répertoire abandonné %s trouvé.\n"
 "Utilisez \"git am --abort\" pour le supprimer."
 
-#: builtin/am.c:2496
 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:2506
 msgid "interactive mode requires patches on the command line"
 msgstr "le mode interactif requiert des rustines sur la ligne de commande"
 
-#: builtin/apply.c:8
 msgid "git apply [<options>] [<patch>...]"
 msgstr "git apply [<options>] [<patch>...]"
 
-#: builtin/archive.c:18
 msgid "could not redirect output"
 msgstr "impossible de rediriger la sortie"
 
-#: builtin/archive.c:35
 msgid "git archive: Remote with no URL"
 msgstr "git archive : Dépôt distant sans URL"
 
-#: 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:62
 #, c-format
 msgid "git archive: NACK %s"
 msgstr "git archive : NACK %s"
 
-#: builtin/archive.c:63
 msgid "git archive: protocol error"
 msgstr "git archive : erreur de protocole"
 
-#: builtin/archive.c:67
 msgid "git archive: expected a flush"
 msgstr "git archive : vidage attendu"
 
-#: builtin/bisect--helper.c:24
 msgid "git bisect--helper --bisect-reset [<commit>]"
 msgstr "git bisect--helper --bisect-reset [<commit>]"
 
-#: builtin/bisect--helper.c:26
 msgid ""
 "git bisect--helper --bisect-start [--term-{new,bad}=<term> --term-{old,good}"
 "=<term>] [--no-checkout] [--first-parent] [<bad> [<good>...]] [--] "
@@ -11532,71 +2353,56 @@ msgstr ""
 "=<terme>][--no-checkout] [--first-parent] [<mauvais> [<bon>...]] [--] "
 "[<chemins>...]"
 
-#: builtin/bisect--helper.c:29
 msgid "git bisect--helper --bisect-state (bad|new) [<rev>]"
 msgstr "git bisect--helper --bisect-state (bad|new) [<rév>]"
 
-#: builtin/bisect--helper.c:30
 msgid "git bisect--helper --bisect-state (good|old) [<rev>...]"
 msgstr "git bisect--helper --bisect-state (good|old) [<rév>...]"
 
-#: builtin/bisect--helper.c:31
 msgid "git bisect--helper --bisect-replay <filename>"
 msgstr "git bisect--helper --bisect-replay <nom-de-fichier>"
 
-#: builtin/bisect--helper.c:32
 msgid "git bisect--helper --bisect-skip [(<rev>|<range>)...]"
 msgstr "git bisect--helper --bisect-skip [(<rév>|<plage>)...]"
 
-#: 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:116
 #, c-format
 msgid "could not write to file '%s'"
 msgstr "impossible d'écrire le fichier '%s'"
 
-#: 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: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: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:194
 msgid "please use two different terms"
 msgstr "veuillez utiliser deux termes différents"
 
-#: builtin/bisect--helper.c:210
 #, c-format
 msgid "We are not bisecting.\n"
 msgstr "Pas de bissection en cours.\n"
 
-#: 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:227
 #, c-format
 msgid ""
 "could not check out original HEAD '%s'. Try 'git bisect reset <commit>'."
@@ -11604,27 +2410,22 @@ msgstr ""
 "échec d'extraction de la HEAD d'origine '%s'. Essayez 'git bisect reset "
 "<commit>'."
 
-#: builtin/bisect--helper.c:271
 #, c-format
 msgid "Bad bisect_write argument: %s"
 msgstr "Mauvais argument pour bisect_write : %s"
 
-#: 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:288
 #, c-format
 msgid "couldn't open the file '%s'"
 msgstr "impossible d'ouvrir le fichier '%s'"
 
-#: 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:341
 #, c-format
 msgid ""
 "You need to give me at least one %s and %s revision.\n"
@@ -11633,7 +2434,6 @@ msgstr ""
 "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:345
 #, c-format
 msgid ""
 "You need to start by \"git bisect start\".\n"
@@ -11644,7 +2444,6 @@ msgstr ""
 "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:365
 #, c-format
 msgid "bisecting only with a %s commit"
 msgstr "bissection avec seulement un commit %s"
@@ -11653,15 +2452,24 @@ msgstr "bissection avec seulement un commit %s"
 #. translation. The program will only accept English input
 #. at this point.
 #.
-#: builtin/bisect--helper.c:373
 msgid "Are you sure [Y/n]? "
 msgstr "Confirmez-vous [Y/n] ? "
 
-#: builtin/bisect--helper.c:434
+msgid "status: waiting for both good and bad commits\n"
+msgstr "status : en attente d'un commit bon et d'un commit mauvais\n"
+
+#, c-format
+msgid "status: waiting for bad commit, %d good commit known\n"
+msgid_plural "status: waiting for bad commit, %d good commits known\n"
+msgstr[0] "status : en attente d'un mauvais commit, %d commit bon connu\n"
+msgstr[1] "status : en attente d'un mauvais commit, %d commits bons connus\n"
+
+msgid "status: waiting for good commit(s), bad commit known\n"
+msgstr "status : en attente de bon(s) commit(s), un mauvais commit connu\n"
+
 msgid "no terms defined"
 msgstr "aucun terme défini"
 
-#: builtin/bisect--helper.c:437
 #, c-format
 msgid ""
 "Your current terms are %s for the old state\n"
@@ -11670,7 +2478,6 @@ msgstr ""
 "Vos termes actuels sont %s pour l'état ancien\n"
 "et %s pour le nouvel état.\n"
 
-#: builtin/bisect--helper.c:447
 #, c-format
 msgid ""
 "invalid argument %s for 'git bisect terms'.\n"
@@ -11680,53 +2487,42 @@ msgstr ""
 "Les options supportées sont : --term-good|--term-old et --term-bad|--term-"
 "new."
 
-#: 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:536
 #, c-format
 msgid "could not open '%s' for appending"
 msgstr "impossible d'ouvrir '%s' en ajout"
 
-#: 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:678
 #, c-format
 msgid "unrecognized option: '%s'"
 msgstr "option non reconnue : '%s'"
 
-#: 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:713
 msgid "bad HEAD - I need a HEAD"
 msgstr "mauvaise HEAD - j'ai besoin d'une HEAD"
 
-#: 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:749
 msgid "won't bisect on cg-seek'ed tree"
 msgstr "refus de bissecter sur un arbre 'cg-seeked'"
 
-#: builtin/bisect--helper.c:752
 msgid "bad HEAD - strange symbolic ref"
 msgstr "mauvaise HEAD - référence symbolique douteuse"
 
-#: builtin/bisect--helper.c:772
 #, c-format
 msgid "invalid ref: '%s'"
 msgstr "réference invalide : '%s'"
 
-#: 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"
 
@@ -11734,87 +2530,69 @@ msgstr "Vous devez démarrer avec \"git bisect start\"\n"
 #. translation. The program will only accept English input
 #. at this point.
 #.
-#: 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: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: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: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: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:936
 msgid "We are not bisecting."
 msgstr "Pas de bissection en cours."
 
-#: builtin/bisect--helper.c:986
 #, c-format
 msgid "'%s'?? what are you talking about?"
 msgstr "'%s' ?? de quoi parlez-vous ?"
 
-#: 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:1120 builtin/bisect--helper.c:1152
 #, c-format
 msgid "running %s\n"
 msgstr "Lancement de %s\n"
 
-#: builtin/bisect--helper.c:1145 builtin/bisect--helper.c:1335
 msgid "bisect run failed: no command provided."
 msgstr "la bissection a échoué : aucune commande fournie."
 
-#: builtin/bisect--helper.c:1166
 #, c-format
 msgid "unable to verify '%s' on good revision"
 msgstr "impossible de vérifier '%s' sur une bonne révision"
 
-#: builtin/bisect--helper.c:1172
 #, c-format
 msgid "bogus exit code %d for good revision"
 msgstr "code de sortie %d erroné pour une bonne révision"
 
-#: builtin/bisect--helper.c:1180
 #, 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:1195
 #, c-format
 msgid "cannot open file '%s' for writing"
 msgstr "impossible d'ouvrir '%s' en écriture"
 
-#: builtin/bisect--helper.c:1213
 msgid "bisect run cannot continue any more"
 msgstr "la bissection ne peut plus continuer"
 
-#: builtin/bisect--helper.c:1215
 #, c-format
 msgid "bisect run success"
 msgstr "succès de la bissection"
 
-#: builtin/bisect--helper.c:1218
 #, c-format
 msgid "bisect found first bad commit"
 msgstr "la bissection a trouvé le premier mauvais commit"
 
-#: builtin/bisect--helper.c:1221
 #, c-format
 msgid ""
 "bisect run failed: 'git bisect--helper --bisect-state %s' exited with error "
@@ -11823,228 +2601,171 @@ msgstr ""
 "la bissection a échoué : 'git bisect--helper --bisect-state %s' a retourné "
 "le code erreur %d"
 
-#: builtin/bisect--helper.c:1253
 msgid "reset the bisection state"
 msgstr "réinitialiser l'état de la bissection"
 
-#: builtin/bisect--helper.c:1255
 msgid "check whether bad or good terms exist"
 msgstr "vérifier si les termes bons ou mauvais existent"
 
-#: builtin/bisect--helper.c:1257
 msgid "print out the bisect terms"
 msgstr "afficher les termes de bissection"
 
-#: builtin/bisect--helper.c:1259
 msgid "start the bisect session"
 msgstr "démarrer une session de bissection"
 
-#: builtin/bisect--helper.c:1261
 msgid "find the next bisection commit"
 msgstr "trouver le prochain commit de bissection"
 
-#: builtin/bisect--helper.c:1263
 msgid "mark the state of ref (or refs)"
 msgstr "marquer l'état d'une références (ou plusieurs)"
 
-#: builtin/bisect--helper.c:1265
 msgid "list the bisection steps so far"
 msgstr "lister les étapes de bissection jusqu'ici"
 
-#: builtin/bisect--helper.c:1267
 msgid "replay the bisection process from the given file"
 msgstr "rejouer le processus de bissection depuis le fichier fourni"
 
-#: builtin/bisect--helper.c:1269
 msgid "skip some commits for checkout"
 msgstr "sauter certains commits pour l'extraction"
 
-#: builtin/bisect--helper.c:1271
 msgid "visualize the bisection"
 msgstr "visualiser la bissection"
 
-#: builtin/bisect--helper.c:1273
 msgid "use <cmd>... to automatically bisect"
 msgstr "utiliser <cmd>... pour bissecter automatiquement"
 
-#: builtin/bisect--helper.c:1275
 msgid "no log for BISECT_WRITE"
 msgstr "pas de journal pour BISECT_WRITE"
 
-#: builtin/bisect--helper.c:1290
 msgid "--bisect-reset requires either no argument or a commit"
 msgstr "--bisect-reset supporte soit aucun argument, soit un commit"
 
-#: builtin/bisect--helper.c:1295
 msgid "--bisect-terms requires 0 or 1 argument"
 msgstr "--bisect-terms exige 0 ou 1 argument"
 
-#: builtin/bisect--helper.c:1304
 msgid "--bisect-next requires 0 arguments"
 msgstr "--bisect-next exige 0 argument"
 
-#: builtin/bisect--helper.c:1315
 msgid "--bisect-log requires 0 arguments"
 msgstr "--bisect-log exige 0 argument"
 
-#: builtin/bisect--helper.c:1320
 msgid "no logfile given"
 msgstr "pas de fichier de log donné"
 
-#: builtin/blame.c:32
 msgid "git blame [<options>] [<rev-opts>] [<rev>] [--] <file>"
 msgstr "git blame [<options>] [<rev-opts>] [<rev>] [--] <fichier>"
 
-#: builtin/blame.c:37
 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:406
 #, c-format
 msgid "expecting a color: %s"
 msgstr "couleur attendue : %s"
 
-#: builtin/blame.c:413
 msgid "must end with a color"
 msgstr "doit finir avec une couleur"
 
-#: builtin/blame.c:842
 #, c-format
 msgid "cannot find revision %s to ignore"
 msgstr "référence à ignorer %s introuvable"
 
-#: builtin/blame.c:864
 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:865
 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:866
 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:867
 msgid "show work cost statistics"
 msgstr "montrer les statistiques de coût d'activité"
 
-#: builtin/blame.c:868 builtin/checkout.c:1554 builtin/clone.c:98
-#: builtin/commit-graph.c:75 builtin/commit-graph.c:228 builtin/fetch.c:181
-#: builtin/merge.c:301 builtin/multi-pack-index.c:103
-#: builtin/multi-pack-index.c:154 builtin/multi-pack-index.c:180
-#: builtin/multi-pack-index.c:208 builtin/pull.c:120 builtin/push.c:566
-#: builtin/remote.c:683 builtin/send-pack.c:202
 msgid "force progress reporting"
 msgstr "forcer l'affichage de l'état d'avancement"
 
-#: builtin/blame.c:869
 msgid "show output score for blame entries"
 msgstr "montrer le score de sortie pour les éléments de blâme"
 
-#: builtin/blame.c:870
 msgid "show original filename (Default: auto)"
 msgstr "montrer les noms de fichier originaux (Défaut : auto)"
 
-#: builtin/blame.c:871
 msgid "show original linenumber (Default: off)"
 msgstr "montrer les numéros de lignes originaux (Défaut : désactivé)"
 
-#: builtin/blame.c:872
 msgid "show in a format designed for machine consumption"
 msgstr "afficher dans un format propice à la consommation par machine"
 
-#: builtin/blame.c:873
 msgid "show porcelain format with per-line commit information"
 msgstr "afficher en format porcelaine avec l'information de commit par ligne"
 
-#: builtin/blame.c:874
 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:875
 msgid "show raw timestamp (Default: off)"
 msgstr "afficher les horodatages bruts (Défaut : désactivé)"
 
-#: builtin/blame.c:876
 msgid "show long commit SHA1 (Default: off)"
 msgstr "afficher les longs SHA1 de commits (Défaut : désactivé)"
 
-#: builtin/blame.c:877
 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:878
 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:879
 msgid "ignore whitespace differences"
 msgstr "ignorer les différences d'espace"
 
-#: builtin/blame.c:880 builtin/log.c:1857
 msgid "rev"
 msgstr "rév"
 
-#: builtin/blame.c:880
 msgid "ignore <rev> when blaming"
 msgstr "ignorer <rev> pendant le blâme"
 
-#: builtin/blame.c:881
 msgid "ignore revisions from <file>"
 msgstr "ignorer les révisions listées dans <fichier>"
 
-#: builtin/blame.c:882
 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:883
 msgid "color lines by age"
 msgstr "colorier les lignes par âge"
 
-#: builtin/blame.c:884
 msgid "spend extra cycles to find better match"
 msgstr ""
 "dépenser des cycles supplémentaires pour trouver une meilleure correspondance"
 
-#: builtin/blame.c:885
 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:886
 msgid "use <file>'s contents as the final image"
 msgstr "utiliser le contenu de <fichier> comme image finale"
 
-#: builtin/blame.c:887 builtin/blame.c:888
 msgid "score"
 msgstr "score"
 
-#: builtin/blame.c:887
 msgid "find line copies within and across files"
 msgstr "trouver les copies de ligne dans et entre les fichiers"
 
-#: builtin/blame.c:888
 msgid "find line movements within and across files"
 msgstr "trouver les mouvements de ligne dans et entre les fichiers"
 
-#: builtin/blame.c:889
 msgid "range"
 msgstr "plage"
 
-#: builtin/blame.c:890
 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:949
 msgid "--progress can't be used with --incremental or porcelain formats"
 msgstr ""
 "--progress ne peut pas être utilisé avec --incremental ou les formats "
@@ -12058,26 +2779,21 @@ msgstr ""
 #. your language may need more or fewer display
 #. columns.
 #.
-#: builtin/blame.c:1000
 msgid "4 years, 11 months ago"
 msgstr "il y a 10 ans et 11 mois"
 
-#: builtin/blame.c:1116
 #, 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:1161
 msgid "Blaming lines"
 msgstr "Assignation de blâme aux lignes"
 
-#: builtin/branch.c:29
 msgid "git branch [<options>] [-r | -a] [--merged] [--no-merged]"
 msgstr "git branch [<options>] [-r | -a] [--merged | --no-merged]"
 
-#: builtin/branch.c:30
 msgid ""
 "git branch [<options>] [-f] [--recurse-submodules] <branch-name> [<start-"
 "point>]"
@@ -12085,33 +2801,26 @@ msgstr ""
 "git branch [<options>] [-f] [--recurse-submodules] <nom-de-branche> [<point-"
 "de-départ>]"
 
-#: builtin/branch.c:31
 msgid "git branch [<options>] [-l] [<pattern>...]"
 msgstr "git branch [<options>] [-l] [<motif>...]"
 
-#: builtin/branch.c:32
 msgid "git branch [<options>] [-r] (-d | -D) <branch-name>..."
 msgstr "git branch [<options>] [-r] (-d | -D) <nom-de-branche>..."
 
-#: builtin/branch.c:33
 msgid "git branch [<options>] (-m | -M) [<old-branch>] <new-branch>"
 msgstr ""
 "git branch [<options>] (-m | -M) [<ancienne-branche>] <nouvelle-branche>"
 
-#: builtin/branch.c:34
 msgid "git branch [<options>] (-c | -C) [<old-branch>] <new-branch>"
 msgstr ""
 "git branch [<options>] (-c | -C) [<ancienne-branche>] <nouvelle-branche>"
 
-#: builtin/branch.c:35
 msgid "git branch [<options>] [-r | -a] [--points-at]"
 msgstr "git branch [<options>] [-r | -a] [--points-at]"
 
-#: builtin/branch.c:36
 msgid "git branch [<options>] [-r | -a] [--format]"
 msgstr "git branch [<options>] [-r | -a] [--format]"
 
-#: builtin/branch.c:165
 #, c-format
 msgid ""
 "deleting branch '%s' that has been merged to\n"
@@ -12120,7 +2829,6 @@ msgstr ""
 "suppression de la branche '%s' qui a été fusionnée dans\n"
 "         '%s', mais pas dans HEAD."
 
-#: builtin/branch.c:169
 #, c-format
 msgid ""
 "not deleting branch '%s' that is not yet merged to\n"
@@ -12129,12 +2837,10 @@ msgstr ""
 "branche '%s' non supprimée car elle n'a pas été fusionnée dans\n"
 "         '%s', même si elle est fusionnée dans HEAD."
 
-#: builtin/branch.c:183
 #, c-format
 msgid "Couldn't look up commit object for '%s'"
 msgstr "Impossible de rechercher l'objet commit pour '%s'"
 
-#: builtin/branch.c:187
 #, c-format
 msgid ""
 "The branch '%s' is not fully merged.\n"
@@ -12143,115 +2849,91 @@ msgstr ""
 "La branche '%s' n'est pas totalement fusionnée.\n"
 "Si vous souhaitez réellement la supprimer, lancez 'git branch -D %s'."
 
-#: builtin/branch.c:200
 msgid "Update of config-file failed"
 msgstr "Échec de la mise à jour du fichier de configuration"
 
-#: builtin/branch.c:235
 msgid "cannot use -a with -d"
 msgstr "impossible d'utiliser -a avec -d"
 
-#: builtin/branch.c:242
 msgid "Couldn't look up commit object for HEAD"
 msgstr "Impossible de rechercher l'objet commit pour HEAD"
 
-#: builtin/branch.c:259
 #, c-format
 msgid "Cannot delete branch '%s' checked out at '%s'"
 msgstr "Impossible de supprimer la branche '%s' extraite dans '%s'"
 
-#: builtin/branch.c:274
 #, c-format
 msgid "remote-tracking branch '%s' not found."
 msgstr "branche de suivi '%s' non trouvée."
 
-#: builtin/branch.c:275
 #, c-format
 msgid "branch '%s' not found."
 msgstr "branche '%s' non trouvée."
 
-#: builtin/branch.c:306
 #, c-format
 msgid "Deleted remote-tracking branch %s (was %s).\n"
 msgstr "Branche de suivi %s supprimée (précédemment %s).\n"
 
-#: builtin/branch.c:307
 #, c-format
 msgid "Deleted branch %s (was %s).\n"
 msgstr "Branche %s supprimée (précédemment %s).\n"
 
-#: builtin/branch.c:457 builtin/tag.c:64
 msgid "unable to parse format string"
 msgstr "impossible d'analyser la chaîne de format"
 
-#: builtin/branch.c:488
 msgid "could not resolve HEAD"
 msgstr "impossible de résoudre HEAD"
 
-#: builtin/branch.c:494
 #, c-format
 msgid "HEAD (%s) points outside of refs/heads/"
 msgstr "HEAD (%s) pointe hors de refs/heads/"
 
-#: builtin/branch.c:509
 #, c-format
 msgid "Branch %s is being rebased at %s"
 msgstr "La branche %s est en cours de rebasage sur %s"
 
-#: builtin/branch.c:513
 #, c-format
 msgid "Branch %s is being bisected at %s"
 msgstr "La branche %s est en cours de bissection sur %s"
 
-#: builtin/branch.c:530
 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:532
 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:543
 #, c-format
 msgid "Invalid branch name: '%s'"
 msgstr "Nom de branche invalide : '%s'"
 
-#: builtin/branch.c:572
 msgid "Branch rename failed"
 msgstr "Échec de renommage de la branche"
 
-#: builtin/branch.c:574
 msgid "Branch copy failed"
 msgstr "Échec de copie de la branche"
 
-#: builtin/branch.c:578
 #, 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:581
 #, c-format
 msgid "Renamed a misnamed branch '%s' away"
 msgstr "Renommage d'une branche mal nommée '%s'"
 
-#: builtin/branch.c:587
 #, 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:596
 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:598
 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:614
 #, c-format
 msgid ""
 "Please edit the description for the branch\n"
@@ -12262,147 +2944,111 @@ msgstr ""
 "  %s\n"
 "Les lignes commençant par '%c' seront ignorées.\n"
 
-#: builtin/branch.c:651
 msgid "Generic options"
 msgstr "Options génériques"
 
-#: builtin/branch.c:653
 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:654
 msgid "suppress informational messages"
 msgstr "supprimer les messages d'information"
 
-#: builtin/branch.c:656 builtin/checkout.c:1571
-#: builtin/submodule--helper.c:3077
 msgid "set branch tracking configuration"
 msgstr "règler la configuration des branches de suivi"
 
-#: builtin/branch.c:659
 msgid "do not use"
 msgstr "ne pas utiliser"
 
-#: builtin/branch.c:661
 msgid "upstream"
 msgstr "amont"
 
-#: builtin/branch.c:661
 msgid "change the upstream info"
 msgstr "modifier l'information amont"
 
-#: builtin/branch.c:662
 msgid "unset the upstream info"
 msgstr "désactiver l'information amont"
 
-#: builtin/branch.c:663
 msgid "use colored output"
 msgstr "utiliser la coloration dans la sortie"
 
-#: builtin/branch.c:664
 msgid "act on remote-tracking branches"
 msgstr "agir sur les branches de suivi distantes"
 
-#: builtin/branch.c:666 builtin/branch.c:668
 msgid "print only branches that contain the commit"
 msgstr "afficher seulement les branches qui contiennent le commit"
 
-#: builtin/branch.c:667 builtin/branch.c:669
 msgid "print only branches that don't contain the commit"
 msgstr "afficher seulement les branches qui ne contiennent pas le commit"
 
-#: builtin/branch.c:672
 msgid "Specific git-branch actions:"
 msgstr "Actions spécifiques à git-branch :"
 
-#: builtin/branch.c:673
 msgid "list both remote-tracking and local branches"
 msgstr "afficher à la fois les branches de suivi et les branches locales"
 
-#: builtin/branch.c:675
 msgid "delete fully merged branch"
 msgstr "supprimer une branche totalement fusionnée"
 
-#: builtin/branch.c:676
 msgid "delete branch (even if not merged)"
 msgstr "supprimer une branche (même non fusionnée)"
 
-#: builtin/branch.c:677
 msgid "move/rename a branch and its reflog"
 msgstr "déplacer/renommer une branche et son reflog"
 
-#: builtin/branch.c:678
 msgid "move/rename a branch, even if target exists"
 msgstr "déplacer/renommer une branche, même si la cible existe"
 
-#: builtin/branch.c:679
 msgid "copy a branch and its reflog"
 msgstr "copier une branche et son reflog"
 
-#: builtin/branch.c:680
 msgid "copy a branch, even if target exists"
 msgstr "copier une branche, même si la cible existe"
 
-#: builtin/branch.c:681
 msgid "list branch names"
 msgstr "afficher les noms des branches"
 
-#: builtin/branch.c:682
 msgid "show current branch name"
 msgstr "afficher le nom de la branche courante"
 
-#: builtin/branch.c:683 builtin/submodule--helper.c:3075
 msgid "create the branch's reflog"
 msgstr "créer le reflog de la branche"
 
-#: builtin/branch.c:685
 msgid "edit the description for the branch"
 msgstr "éditer la description de la branche"
 
-#: builtin/branch.c:686
 msgid "force creation, move/rename, deletion"
 msgstr "forcer la création, le déplacement/renommage, ou la suppression"
 
-#: builtin/branch.c:687
 msgid "print only branches that are merged"
 msgstr "afficher seulement les branches qui sont fusionnées"
 
-#: builtin/branch.c:688
 msgid "print only branches that are not merged"
 msgstr "afficher seulement les branches qui ne sont pas fusionnées"
 
-#: builtin/branch.c:689
 msgid "list branches in columns"
 msgstr "afficher les branches en colonnes"
 
-#: builtin/branch.c:691 builtin/for-each-ref.c:45 builtin/notes.c:413
-#: builtin/notes.c:416 builtin/notes.c:579 builtin/notes.c:582
-#: builtin/tag.c:476
 msgid "object"
 msgstr "objet"
 
-#: builtin/branch.c:692
 msgid "print only branches of the object"
 msgstr "afficher seulement les branches de l'objet"
 
-#: builtin/branch.c:693 builtin/for-each-ref.c:51 builtin/tag.c:483
 msgid "sorting and filtering are case insensitive"
 msgstr "le tri et le filtrage sont non-sensibles à la casse"
 
-#: builtin/branch.c:694 builtin/ls-files.c:667
 msgid "recurse through submodules"
 msgstr "parcourir récursivement les sous-modules"
 
-#: builtin/branch.c:695 builtin/for-each-ref.c:41 builtin/ls-tree.c:358
-#: builtin/tag.c:481 builtin/verify-tag.c:38
 msgid "format to use for the output"
 msgstr "format à utiliser pour la sortie"
 
-#: builtin/branch.c:718 builtin/clone.c:684
+msgid "Failed to resolve HEAD as a valid ref."
+msgstr "Échec de résolution de HEAD comme référence valide."
+
 msgid "HEAD not found below refs/heads!"
 msgstr "HEAD non trouvée sous refs/heads !"
 
-#: builtin/branch.c:739
 msgid ""
 "branch with --recurse-submodules can only be used if submodule."
 "propagateBranches is enabled"
@@ -12410,45 +3056,35 @@ msgstr ""
 "brancher avec --recurse-submodules ne peut être utilisé que si submodule."
 "propagateBranches est activé"
 
-#: builtin/branch.c:741
 msgid "--recurse-submodules can only be used to create branches"
 msgstr "--recurse-submodules ne peut être utilisé que pour créer des branches"
 
-#: builtin/branch.c:770 builtin/branch.c:826 builtin/branch.c:835
 msgid "branch name required"
 msgstr "le nom de branche est requis"
 
-#: builtin/branch.c:802
 msgid "Cannot give description to detached HEAD"
 msgstr "Impossible de décrire une HEAD détachée"
 
-#: builtin/branch.c:807
 msgid "cannot edit description of more than one branch"
 msgstr "impossible d'éditer la description de plus d'une branche"
 
-#: builtin/branch.c:814
 #, c-format
 msgid "No commit on branch '%s' yet."
 msgstr "Aucun commit sur la branche '%s'."
 
-#: builtin/branch.c:817
 #, c-format
 msgid "No branch named '%s'."
 msgstr "Aucune branche nommée '%s'."
 
-#: builtin/branch.c:832
 msgid "too many branches for a copy operation"
 msgstr "trop de branches pour une opération de copie"
 
-#: builtin/branch.c:841
 msgid "too many arguments for a rename operation"
 msgstr "trop d'arguments pour une opération de renommage"
 
-#: builtin/branch.c:846
 msgid "too many arguments to set new upstream"
 msgstr "trop d'arguments pour spécifier une branche amont"
 
-#: builtin/branch.c:850
 #, c-format
 msgid ""
 "could not set upstream of HEAD to %s when it does not point to any branch."
@@ -12456,32 +3092,26 @@ msgstr ""
 "impossible de spécifier une branche amont de HEAD par %s qui ne pointe sur "
 "aucune branche."
 
-#: builtin/branch.c:853 builtin/branch.c:873
 #, c-format
 msgid "no such branch '%s'"
 msgstr "pas de branche '%s'"
 
-#: builtin/branch.c:857
 #, c-format
 msgid "branch '%s' does not exist"
 msgstr "la branche '%s' n'existe pas"
 
-#: builtin/branch.c:867
 msgid "too many arguments to unset upstream"
 msgstr "trop d'arguments pour désactiver un amont"
 
-#: builtin/branch.c:871
 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:877
 #, c-format
 msgid "Branch '%s' has no upstream information"
 msgstr "La branche '%s' n'a aucune information de branche amont"
 
-#: builtin/branch.c:890
 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>?"
@@ -12490,7 +3120,6 @@ msgstr ""
 "branche.\n"
 "Vouliez-vous plutôt dire -a|-r --list <motif> ?"
 
-#: builtin/branch.c:894
 msgid ""
 "the '--set-upstream' option is no longer supported. Please use '--track' or "
 "'--set-upstream-to' instead."
@@ -12498,32 +3127,25 @@ msgstr ""
 "l'option '--set-upstream' est obsolète. Utilisez '--track' ou '--set-"
 "upstream-to' à la place."
 
-#: builtin/bugreport.c:16
 msgid "git version:\n"
 msgstr "version git ::\n"
 
-#: 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:32
 msgid "compiler info: "
 msgstr "info compilateur : "
 
-#: builtin/bugreport.c:35
 msgid "libc info: "
 msgstr "info libc : "
 
-#: 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:62
 msgid "git bugreport [-o|--output-directory <file>] [-s|--suffix <format>]"
 msgstr "git bugreport [-o|--output-directory <fichier>] [-s|--suffix <format>]"
 
-#: 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"
@@ -12560,144 +3182,115 @@ msgstr ""
 "Veuillez relire le rapport de bogue ci-dessous.\n"
 "Vous pouvez supprimer toute ligne que vous ne souhaitez pas envoyer.\n"
 
-#: 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: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: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:139
 msgid "System Info"
 msgstr "Info système"
 
-#: builtin/bugreport.c:142
 msgid "Enabled Hooks"
 msgstr "Crochets activés"
 
-#: builtin/bugreport.c:149
 #, c-format
 msgid "unable to write to %s"
 msgstr "impossible d'écrire dans %s"
 
-#: builtin/bugreport.c:159
 #, c-format
 msgid "Created new report at '%s'.\n"
 msgstr "Nouveau rapport créé à '%s'.\n"
 
-#: builtin/bundle.c:15 builtin/bundle.c:23
 msgid "git bundle create [<options>] <file> <git-rev-list args>"
 msgstr "git bundle create [<options>] <fichier> <args git-rev-list>"
 
-#: builtin/bundle.c:16 builtin/bundle.c:28
 msgid "git bundle verify [<options>] <file>"
 msgstr "git bundle verify [<options>] <fichier>"
 
-#: builtin/bundle.c:17 builtin/bundle.c:33
 msgid "git bundle list-heads <file> [<refname>...]"
 msgstr "git bundle list-heads <fichier> [<nom-de-ref>...]"
 
-#: builtin/bundle.c:18 builtin/bundle.c:38
 msgid "git bundle unbundle <file> [<refname>...]"
 msgstr "git bundle unbundle <fichier> [<nom-de-ref>...]"
 
-#: builtin/bundle.c:65 builtin/pack-objects.c:3899
 msgid "do not show progress meter"
 msgstr "ne pas afficher la barre de progression"
 
-#: builtin/bundle.c:67 builtin/bundle.c:168 builtin/pack-objects.c:3901
 msgid "show progress meter"
 msgstr "afficher la barre de progression"
 
-#: builtin/bundle.c:69 builtin/pack-objects.c:3903
 msgid "show progress meter during object writing phase"
 msgstr "afficher la barre de progression durant la phase d'écrite des objets"
 
-#: builtin/bundle.c:72 builtin/pack-objects.c:3906
 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:74
 msgid "specify bundle format version"
 msgstr "spécifier la version du format de colis"
 
-#: 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:108
 msgid "do not show bundle details"
 msgstr "ne pas afficher les détails du colis"
 
-#: builtin/bundle.c:127
 #, c-format
 msgid "%s is okay\n"
 msgstr "%s est correct\n"
 
-#: builtin/bundle.c:183
 msgid "Need a repository to unbundle."
 msgstr "Le dépaquetage d'un colis requiert un dépôt."
 
-#: builtin/bundle.c:186
 msgid "Unbundling objects"
 msgstr "Dépaquetage d'objets"
 
-#: builtin/bundle.c:220 builtin/remote.c:1758
 #, c-format
 msgid "Unknown subcommand: %s"
 msgstr "Sous-commande inconnue : %s"
 
-#: builtin/cat-file.c:568
+#, c-format
+msgid "cannot read object %s '%s'"
+msgstr "impossible de lire l'objet %s '%s'"
+
 msgid "flush is only for --buffer mode"
 msgstr "flush n'est que pour le mode --buffer"
 
-#: builtin/cat-file.c:612
 msgid "empty command in input"
 msgstr "commande vide dans l'entrée"
 
-#: builtin/cat-file.c:614
 #, c-format
 msgid "whitespace before command: '%s'"
 msgstr "caractère espace devant la commande : '%s'"
 
-#: builtin/cat-file.c:623
 #, c-format
 msgid "%s requires arguments"
 msgstr "%s nécessite des arguments"
 
-#: builtin/cat-file.c:628
 #, c-format
 msgid "%s takes no arguments"
 msgstr "%s n'accepte aucune argument"
 
-#: builtin/cat-file.c:636
 #, c-format
 msgid "unknown command: '%s'"
 msgstr "commande inconnue : %s"
 
-#: builtin/cat-file.c:795
 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:824
 msgid "git cat-file <type> <object>"
 msgstr "git cat-file <type> <objet>"
 
-#: builtin/cat-file.c:825
 msgid "git cat-file (-e | -p) <object>"
 msgstr "git cat-file (-e | -p) <objet>"
 
-#: builtin/cat-file.c:826
 msgid "git cat-file (-t | -s) [--allow-unknown-type] <object>"
 msgstr "git cat-file (-t | -s) [--allow-unknown-type] <objet>"
 
-#: builtin/cat-file.c:827
 msgid ""
 "git cat-file (--batch | --batch-check | --batch-command) [--batch-all-"
 "objects]\n"
@@ -12709,7 +3302,6 @@ msgstr ""
 "             [--buffer] [--follow-symlinks] [--unordered]\n"
 "             [--textconv | --filters]"
 
-#: builtin/cat-file.c:830
 msgid ""
 "git cat-file (--textconv | --filters)\n"
 "             [<rev>:<path|tree-ish> | --path=<path|tree-ish> <rev>]"
@@ -12717,72 +3309,55 @@ msgstr ""
 "git cat-file (--textconv | --filters)\n"
 "             [<rev>:<chemin|arbresque> | --path=<chemin|arbresque> <rev>]"
 
-#: builtin/cat-file.c:836
 msgid "Check object existence or emit object contents"
 msgstr "Vérifie l'existence d'un objet ou émettre le contenu de l'objet"
 
-#: builtin/cat-file.c:838
 msgid "check if <object> exists"
 msgstr "Vérification si <objet> existe"
 
-#: builtin/cat-file.c:839
 msgid "pretty-print <object> content"
 msgstr "affichage propre du contenu de <objet>"
 
-#: builtin/cat-file.c:841
 msgid "Emit [broken] object attributes"
 msgstr "Émet les attributs [broken] d'un objet"
 
-#: builtin/cat-file.c:842
 msgid "show object type (one of 'blob', 'tree', 'commit', 'tag', ...)"
 msgstr "montrer le type de l'objet (parmi 'blob', 'tree', 'commit', 'tag' ...)"
 
-#: builtin/cat-file.c:843
 msgid "show object size"
 msgstr "afficher la taille de l'objet"
 
-#: builtin/cat-file.c:845
 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:847
 msgid "Batch objects requested on stdin (or --batch-all-objects)"
 msgstr "Traiter par lot les objets demandés sur stdin (ou --batch-all-objects)"
 
-#: builtin/cat-file.c:849
 msgid "show full <object> or <rev> contents"
 msgstr "afficher tout le contenu de <objet> ou <rev>"
 
-#: builtin/cat-file.c:853
 msgid "like --batch, but don't emit <contents>"
 msgstr "comme --batch, mais ne pas émettre <contenu>"
 
-#: builtin/cat-file.c:857
 msgid "read commands from stdin"
 msgstr "lire les commandes depuis l'entrée standard"
 
-#: builtin/cat-file.c:861
 msgid "with --batch[-check]: ignores stdin, batches all known objects"
 msgstr ""
 "avec --batch[-check] : ignore stdin, gère tous les objets connus par lots"
 
-#: builtin/cat-file.c:863
 msgid "Change or optimize batch output"
 msgstr "Changer ou optimiser la sortie de traitement"
 
-#: builtin/cat-file.c:864
 msgid "buffer --batch output"
 msgstr "bufferiser la sortie de --batch"
 
-#: builtin/cat-file.c:866
 msgid "follow in-tree symlinks"
 msgstr "suivi des liens symboliques dans l'arbre"
 
-#: builtin/cat-file.c:868
 msgid "do not order objects before emitting them"
 msgstr "ne pas ordonner les objets avant de les émettre"
 
-#: builtin/cat-file.c:870
 msgid ""
 "Emit object (blob or tree) with conversion or filter (stand-alone, or with "
 "batch)"
@@ -12790,316 +3365,239 @@ msgstr ""
 "Émet l'objet (blob ou arbre) avec une conversion ou un filtre (autonome ou "
 "en lot)"
 
-#: builtin/cat-file.c:872
 msgid "run textconv on object's content"
 msgstr "lancer textconv sur le contenu de l'objet"
 
-#: builtin/cat-file.c:874
 msgid "run filters on object's content"
 msgstr "lancer les filtres sur le contenu de l'objet"
 
-#: builtin/cat-file.c:875
 msgid "blob|tree"
 msgstr "blob|arbre"
 
-#: builtin/cat-file.c:876
 msgid "use a <path> for (--textconv | --filters); Not with 'batch'"
 msgstr ""
 "utiliser un <chemin> spécifique pour (--textconv | --filters); pas pour les "
 "lots"
 
-#: builtin/cat-file.c:894
 #, c-format
 msgid "'%s=<%s>' needs '%s' or '%s'"
 msgstr "'%s=<%s>' a besoin de  '%s' ou '%s'"
 
-#: builtin/cat-file.c:896
 msgid "path|tree-ish"
 msgstr "blob|arbre-esque"
 
-#: builtin/cat-file.c:903 builtin/cat-file.c:906 builtin/cat-file.c:909
 #, c-format
 msgid "'%s' requires a batch mode"
 msgstr "%s a besoin d'un mode par lots"
 
-#: builtin/cat-file.c:921
 #, c-format
 msgid "'-%c' is incompatible with batch mode"
 msgstr "'-%c' est incompatible avec le mode par lots"
 
-#: builtin/cat-file.c:924
 msgid "batch modes take no arguments"
 msgstr "les modes par lot n'acceptent aucun argument"
 
-#: builtin/cat-file.c:932 builtin/cat-file.c:935
 #, c-format
 msgid "<rev> required with '%s'"
 msgstr "<rev> nécessaire avec '%s'"
 
-#: builtin/cat-file.c:938
 #, c-format
 msgid "<object> required with '-%c'"
 msgstr "<objet> nécessaire avec '-%c'"
 
-#: builtin/cat-file.c:943 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:965
-#: builtin/notes.c:987 builtin/prune-packed.c:25 builtin/receive-pack.c:2489
-#: builtin/tag.c:592
 msgid "too many arguments"
 msgstr "trop d'arguments"
 
-#: builtin/cat-file.c:947
 #, c-format
 msgid "only two arguments allowed in <type> <object> mode, not %d"
 msgstr "deux arguments seulement permis dans le mode <type> <objet>, pas %d"
 
-#: builtin/check-attr.c:13
 msgid "git check-attr [-a | --all | <attr>...] [--] <pathname>..."
 msgstr "git check-attr [-a | --all | <attr>...] [--] <chemin>..."
 
-#: builtin/check-attr.c:14
 msgid "git check-attr --stdin [-z] [-a | --all | <attr>...]"
 msgstr "git check-attr --stdin [-z] [-a | --all | <attr>...]"
 
-#: builtin/check-attr.c:21
 msgid "report all attributes set on file"
 msgstr "afficher tous les attributs associés au fichier"
 
-#: builtin/check-attr.c:22
 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:101
 msgid "read file names from stdin"
 msgstr "lire les noms de fichier depuis l'entrée standard"
 
-#: builtin/check-attr.c:25 builtin/check-ignore.c:27
 msgid "terminate input and output records by a NUL character"
 msgstr ""
 "terminer les enregistrements en entrée et en sortie par un caractère NUL"
 
-#: builtin/check-ignore.c:21 builtin/checkout.c:1550 builtin/gc.c:550
-#: builtin/worktree.c:565
 msgid "suppress progress reporting"
 msgstr "supprimer l'état d'avancement"
 
-#: builtin/check-ignore.c:29
 msgid "show non-matching input paths"
 msgstr "afficher les chemins en entrée qui ne correspondent pas"
 
-#: builtin/check-ignore.c:31
 msgid "ignore index when checking"
 msgstr "ignorer l'index pendant la vérification"
 
-#: builtin/check-ignore.c:165
 msgid "cannot specify pathnames with --stdin"
 msgstr "impossible de spécifier les chemins avec --stdin"
 
-#: builtin/check-ignore.c:168
 msgid "-z only makes sense with --stdin"
 msgstr "-z n'a de sens qu'avec l'option --stdin"
 
-#: builtin/check-ignore.c:170
 msgid "no path specified"
 msgstr "aucun chemin spécifié"
 
-#: builtin/check-ignore.c:174
 msgid "--quiet is only valid with a single pathname"
 msgstr "--quiet n'est valide qu'avec un seul chemin"
 
-#: builtin/check-ignore.c:176
 msgid "cannot have both --quiet and --verbose"
 msgstr "impossible d'avoir --quiet et --verbose"
 
-#: builtin/check-ignore.c:179
 msgid "--non-matching is only valid with --verbose"
 msgstr "--non-matching n'est valide qu'avec --verbose"
 
-#: builtin/check-mailmap.c:9
 msgid "git check-mailmap [<options>] <contact>..."
 msgstr "git check-mailmap [<options>] <contact>..."
 
-#: builtin/check-mailmap.c:14
 msgid "also read contacts from stdin"
 msgstr "lire aussi les contacts depuis l'entrée standard"
 
-#: builtin/check-mailmap.c:25
 #, c-format
 msgid "unable to parse contact: %s"
 msgstr "impossible d'analyser le contact : %s"
 
-#: builtin/check-mailmap.c:48
 msgid "no contacts specified"
 msgstr "aucun contact spécifié"
 
-#: builtin/checkout--worker.c:110
 msgid "git checkout--worker [<options>]"
 msgstr "git checkout--worker [<options>]"
 
-#: builtin/checkout--worker.c:118 builtin/checkout-index.c:235
-#: builtin/column.c:31 builtin/column.c:32 builtin/submodule--helper.c:1878
-#: builtin/submodule--helper.c:1881 builtin/submodule--helper.c:1889
-#: builtin/submodule--helper.c:2716 builtin/worktree.c:563
-#: builtin/worktree.c:808
 msgid "string"
 msgstr "chaîne"
 
-#: builtin/checkout--worker.c:119 builtin/checkout-index.c:236
 msgid "when creating files, prepend <string>"
 msgstr "lors de la création de fichiers, préfixer par <chaîne>"
 
-#: builtin/checkout-index.c:184
 msgid "git checkout-index [<options>] [--] [<file>...]"
 msgstr "git checkout-index [<options>] [--] [<fichier>...]"
 
-#: builtin/checkout-index.c:201
 msgid "stage should be between 1 and 3 or all"
 msgstr "stage doit valoir entre 1 et 3, ou all"
 
-#: builtin/checkout-index.c:219
 msgid "check out all files in the index"
 msgstr "extraire tous les fichiers présents dans l'index"
 
-#: builtin/checkout-index.c:221
 msgid "do not skip files with skip-worktree set"
 msgstr "ne pas sauter des fichiers avec un ensemble skip-worktree"
 
-#: builtin/checkout-index.c:222
 msgid "force overwrite of existing files"
 msgstr "forcer l'écrasement des fichiers existants"
 
-#: builtin/checkout-index.c:224
 msgid "no warning for existing files and files not in index"
 msgstr ""
 "pas d'avertissement pour les fichiers existants et les fichiers absents de "
 "l'index"
 
-#: builtin/checkout-index.c:226
 msgid "don't checkout new files"
 msgstr "ne pas extraire les nouveaux fichiers"
 
-#: builtin/checkout-index.c:228
 msgid "update stat information in the index file"
 msgstr "mettre à jour l'information de stat dans le fichier d'index"
 
-#: builtin/checkout-index.c:232
 msgid "read list of paths from the standard input"
 msgstr "lire la liste des chemins depuis l'entrée standard"
 
-#: builtin/checkout-index.c:234
 msgid "write the content to temporary files"
 msgstr "écrire le contenu dans des fichiers temporaires"
 
-#: builtin/checkout-index.c:238
 msgid "copy out the files from named stage"
 msgstr "copier les fichiers depuis l'index nommé"
 
-#: builtin/checkout.c:34
 msgid "git checkout [<options>] <branch>"
 msgstr "git checkout [<options>] <branche>"
 
-#: builtin/checkout.c:35
 msgid "git checkout [<options>] [<branch>] -- <file>..."
 msgstr "git checkout [<options>] [<branche>] -- <fichier>..."
 
-#: builtin/checkout.c:40
 msgid "git switch [<options>] [<branch>]"
 msgstr "git switch [<options>] <branche>"
 
-#: builtin/checkout.c:45
 msgid "git restore [<options>] [--source=<branch>] <file>..."
 msgstr "git restore [<options>] [--source=<branche>] <fichier>..."
 
-#: builtin/checkout.c:199 builtin/checkout.c:238
 #, c-format
 msgid "path '%s' does not have our version"
 msgstr "le chemin '%s' n'a pas notre version"
 
-#: builtin/checkout.c:201 builtin/checkout.c:240
 #, c-format
 msgid "path '%s' does not have their version"
 msgstr "le chemin '%s' n'a pas leur version"
 
-#: builtin/checkout.c:217
 #, c-format
 msgid "path '%s' does not have all necessary versions"
 msgstr "le chemin '%s' n'a aucune des versions nécessaires"
 
-#: builtin/checkout.c:271
 #, c-format
 msgid "path '%s' does not have necessary versions"
 msgstr "le chemin '%s' n'a pas les versions nécessaires"
 
-#: builtin/checkout.c:291
 #, c-format
 msgid "path '%s': cannot merge"
 msgstr "chemin '%s' : impossible de fusionner"
 
-#: builtin/checkout.c:307
 #, c-format
 msgid "Unable to add merge result for '%s'"
 msgstr "Impossible d'ajouter le résultat de fusion pour '%s'"
 
-#: builtin/checkout.c:424
 #, c-format
 msgid "Recreated %d merge conflict"
 msgid_plural "Recreated %d merge conflicts"
 msgstr[0] "%d conflit du fusion recréé"
 msgstr[1] "%d conflits du fusion recréés"
 
-#: builtin/checkout.c:429
 #, c-format
 msgid "Updated %d path from %s"
 msgid_plural "Updated %d paths from %s"
 msgstr[0] "%d chemin mis à jour depuis %s"
 msgstr[1] "%d chemins mis à jour depuis %s"
 
-#: builtin/checkout.c:436
 #, c-format
 msgid "Updated %d path from the index"
 msgid_plural "Updated %d paths from the index"
 msgstr[0] "%d chemin mis à jour depuis l'index"
 msgstr[1] "%d chemins mis à jour depuis l'index"
 
-#: builtin/checkout.c:459 builtin/checkout.c:462 builtin/checkout.c:465
-#: builtin/checkout.c:469
 #, c-format
 msgid "'%s' cannot be used with updating paths"
 msgstr "'%s' ne peut pas être utilisé avec des mises à jour de chemins"
 
-#: builtin/checkout.c:479
 #, c-format
 msgid "Cannot update paths and switch to branch '%s' at the same time."
 msgstr ""
 "Impossible de mettre à jour les chemins et basculer sur la branche '%s' en "
 "même temps."
 
-#: builtin/checkout.c:483
 #, c-format
 msgid "neither '%s' or '%s' is specified"
 msgstr "ni '%s', ni '%s' spécifié"
 
-#: builtin/checkout.c:487
 #, c-format
 msgid "'%s' must be used when '%s' is not specified"
 msgstr "'%s' ne peut pas être utilisé quand '%s' n'est pas spécifié"
 
-#: builtin/checkout.c:492 builtin/checkout.c:497
 #, c-format
 msgid "'%s' or '%s' cannot be used with %s"
 msgstr "'%s' ou '%s' ne peut pas être utilisé avec %s"
 
-#: builtin/checkout.c:571 builtin/checkout.c:578
 #, c-format
 msgid "path '%s' is unmerged"
 msgstr "le chemin '%s' n'est pas fusionné"
 
-#: builtin/checkout.c:753
 msgid "you need to resolve your current index first"
 msgstr "vous devez d'abord résoudre votre index courant"
 
-#: builtin/checkout.c:809
 #, c-format
 msgid ""
 "cannot continue with staged changes in the following files:\n"
@@ -13109,50 +3607,40 @@ msgstr ""
 "suivants :\n"
 "%s"
 
-#: builtin/checkout.c:902
 #, c-format
 msgid "Can not do reflog for '%s': %s\n"
 msgstr "Impossible de faire un reflog pour '%s' : %s\n"
 
-#: builtin/checkout.c:947
 msgid "HEAD is now at"
 msgstr "HEAD est maintenant sur"
 
-#: builtin/checkout.c:951 builtin/clone.c:615 t/helper/test-fast-rebase.c:203
 msgid "unable to update HEAD"
 msgstr "impossible de mettre à jour HEAD"
 
-#: builtin/checkout.c:955
 #, c-format
 msgid "Reset branch '%s'\n"
 msgstr "Remise à zéro de la branche '%s'\n"
 
-#: builtin/checkout.c:958
 #, c-format
 msgid "Already on '%s'\n"
 msgstr "Déjà sur '%s'\n"
 
-#: builtin/checkout.c:962
 #, c-format
 msgid "Switched to and reset branch '%s'\n"
 msgstr "Basculement et remise à zéro de la branche '%s'\n"
 
-#: builtin/checkout.c:964 builtin/checkout.c:1398
 #, c-format
 msgid "Switched to a new branch '%s'\n"
 msgstr "Basculement sur la nouvelle branche '%s'\n"
 
-#: builtin/checkout.c:966
 #, c-format
 msgid "Switched to branch '%s'\n"
 msgstr "Basculement sur la branche '%s'\n"
 
-#: builtin/checkout.c:1017
 #, c-format
 msgid " ... and %d more.\n"
 msgstr " ... et %d en plus.\n"
 
-#: builtin/checkout.c:1023
 #, c-format
 msgid ""
 "Warning: you are leaving %d commit behind, not connected to\n"
@@ -13175,7 +3663,6 @@ msgstr[1] ""
 "\n"
 "%s\n"
 
-#: builtin/checkout.c:1042
 #, c-format
 msgid ""
 "If you want to keep it by creating a new branch, this may be a good time\n"
@@ -13204,19 +3691,15 @@ msgstr[1] ""
 "git branch <nouvelle-branche> %s\n"
 "\n"
 
-#: builtin/checkout.c:1077
 msgid "internal error in revision walk"
 msgstr "erreur interne lors du parcours des révisions"
 
-#: builtin/checkout.c:1081
 msgid "Previous HEAD position was"
 msgstr "La position précédente de HEAD était sur"
 
-#: builtin/checkout.c:1124 builtin/checkout.c:1393
 msgid "You are on a branch yet to be born"
 msgstr "Vous êtes sur une branche qui doit encore naître"
 
-#: builtin/checkout.c:1206
 #, c-format
 msgid ""
 "'%s' could be both a local file and a tracking branch.\n"
@@ -13225,7 +3708,6 @@ msgstr ""
 "'%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:1213
 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"
@@ -13245,58 +3727,47 @@ msgstr ""
 "ambigu, vous pouvez positionner checkout.defaultRemote=origin dans\n"
 "votre config."
 
-#: builtin/checkout.c:1223
 #, c-format
 msgid "'%s' matched multiple (%d) remote tracking branches"
 msgstr "'%s' correspond à plusieurs (%d) branches de suivi à distance"
 
-#: builtin/checkout.c:1289
 msgid "only one reference expected"
 msgstr "une seule référence attendue"
 
-#: builtin/checkout.c:1306
 #, c-format
 msgid "only one reference expected, %d given."
 msgstr "une seule référence attendue, %d fournies."
 
-#: builtin/checkout.c:1352 builtin/worktree.c:338 builtin/worktree.c:508
 #, c-format
 msgid "invalid reference: %s"
 msgstr "référence invalide : %s"
 
-#: builtin/checkout.c:1365 builtin/checkout.c:1744
 #, c-format
 msgid "reference is not a tree: %s"
 msgstr "la référence n'est pas un arbre : %s"
 
-#: builtin/checkout.c:1413
 #, c-format
 msgid "a branch is expected, got tag '%s'"
 msgstr "branche attendue, mais étiquette '%s' reçue"
 
-#: builtin/checkout.c:1415
 #, 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:1417 builtin/checkout.c:1426
 #, c-format
 msgid "a branch is expected, got '%s'"
 msgstr "une branche est attendue, mais '%s' a été reçue"
 
-#: builtin/checkout.c:1420
 #, 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:1429
 msgid ""
 "If you want to detach HEAD at the commit, try again with the --detach option."
 msgstr ""
 "Si vous souhaitez détacher HEAD à ce commit, réessayez avec l'option --"
 "detach."
 
-#: builtin/checkout.c:1442
 msgid ""
 "cannot switch branch while merging\n"
 "Consider \"git merge --quit\" or \"git worktree add\"."
@@ -13304,7 +3775,6 @@ msgstr ""
 "impossible de basculer de branche pendant une fusion\n"
 "Envisagez \"git merge --quit\" ou \"git worktree add\"."
 
-#: builtin/checkout.c:1446
 msgid ""
 "cannot switch branch in the middle of an am session\n"
 "Consider \"git am --quit\" or \"git worktree add\"."
@@ -13312,7 +3782,6 @@ msgstr ""
 "impossible de basculer de branche pendant une session am\n"
 "Envisagez \"git am --quit\" ou \"git worktree add\"."
 
-#: builtin/checkout.c:1450
 msgid ""
 "cannot switch branch while rebasing\n"
 "Consider \"git rebase --quit\" or \"git worktree add\"."
@@ -13320,7 +3789,6 @@ msgstr ""
 "impossible de basculer de branche pendant un rebasage\n"
 "Envisagez \"git rebase --quit\" ou \"git worktree add\"."
 
-#: builtin/checkout.c:1454
 msgid ""
 "cannot switch branch while cherry-picking\n"
 "Consider \"git cherry-pick --quit\" or \"git worktree add\"."
@@ -13328,7 +3796,6 @@ msgstr ""
 "impossible de basculer de branche pendant un picorage\n"
 "Envisagez \"git cherry-pick --quit\" ou \"git worktree add\"."
 
-#: builtin/checkout.c:1458
 msgid ""
 "cannot switch branch while reverting\n"
 "Consider \"git revert --quit\" or \"git worktree add\"."
@@ -13336,124 +3803,96 @@ msgstr ""
 "impossible de basculer de branche pendant un retour\n"
 "Envisagez \"git revert --quit\" ou \"git worktree add\"."
 
-#: builtin/checkout.c:1462
 msgid "you are switching branch while bisecting"
 msgstr "vous basculez de branche en cours de bissection"
 
-#: builtin/checkout.c:1469
 msgid "paths cannot be used with switching branches"
 msgstr "impossible d'utiliser des chemins avec un basculement de branches"
 
-#: builtin/checkout.c:1472 builtin/checkout.c:1476 builtin/checkout.c:1480
 #, 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:1484 builtin/checkout.c:1487 builtin/checkout.c:1490
-#: builtin/checkout.c:1495 builtin/checkout.c:1500
 #, c-format
 msgid "'%s' cannot be used with '%s'"
 msgstr "'%s' ne peut pas être utilisé avec '%s'"
 
-#: builtin/checkout.c:1497
 #, c-format
 msgid "'%s' cannot take <start-point>"
 msgstr "'%s' n'accepte pas <point-de-départ>"
 
-#: builtin/checkout.c:1505
 #, 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:1512
 msgid "missing branch or commit argument"
 msgstr "argument de branche ou de commit manquant"
 
-#: builtin/checkout.c:1555
 msgid "perform a 3-way merge with the new branch"
 msgstr "effectuer une fusion à 3 points avec la nouvelle branche"
 
-#: builtin/checkout.c:1556 builtin/log.c:1844 parse-options.h:354
 msgid "style"
 msgstr "style"
 
-#: builtin/checkout.c:1557
 msgid "conflict style (merge, diff3, or zdiff3)"
 msgstr "style de conflit (merge (fusion), diff3 ou zdiff3)"
 
-#: builtin/checkout.c:1569 builtin/worktree.c:560
 msgid "detach HEAD at named commit"
 msgstr "détacher la HEAD au commit nommé"
 
-#: builtin/checkout.c:1574
 msgid "force checkout (throw away local modifications)"
 msgstr "forcer l'extraction (laisser tomber les modifications locales)"
 
-#: builtin/checkout.c:1576
 msgid "new-branch"
 msgstr "nouvelle branche"
 
-#: builtin/checkout.c:1576
 msgid "new unparented branch"
 msgstr "nouvelle branche sans parent"
 
-#: builtin/checkout.c:1578 builtin/merge.c:305
 msgid "update ignored files (default)"
 msgstr "mettre à jour les fichiers ignorés (par défaut)"
 
-#: builtin/checkout.c:1581
 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:1594
 msgid "checkout our version for unmerged files"
 msgstr "extraire notre version pour les fichiers non fusionnés"
 
-#: builtin/checkout.c:1597
 msgid "checkout their version for unmerged files"
 msgstr "extraire leur version pour les fichiers non fusionnés"
 
-#: builtin/checkout.c:1601
 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:1659
 #, c-format
 msgid "options '-%c', '-%c', and '%s' cannot be used together"
 msgstr ""
 "les options '-%c', '-%c' et '%s' ne peuvent pas être utilisées ensemble"
 
-#: builtin/checkout.c:1700
 msgid "--track needs a branch name"
 msgstr "--track requiert un nom de branche"
 
-#: builtin/checkout.c:1705
 #, c-format
 msgid "missing branch name; try -%c"
 msgstr "nom de branche manquant ; essayez -%c"
 
-#: builtin/checkout.c:1737
 #, c-format
 msgid "could not resolve %s"
 msgstr "impossible de résoudre %s"
 
-#: builtin/checkout.c:1753
 msgid "invalid path specification"
 msgstr "spécification de chemin invalide"
 
-#: builtin/checkout.c:1760
 #, 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:1764
 #, 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:1789
 msgid ""
 "git checkout: --ours/--theirs, --force and --merge are incompatible when\n"
 "checking out of the index."
@@ -13461,115 +3900,90 @@ msgstr ""
 "git checkout: --ours/--theirs, --force et --merge sont incompatibles lors\n"
 "de l'extraction de l'index."
 
-#: builtin/checkout.c:1794
 msgid "you must specify path(s) to restore"
 msgstr "vous devez spécifier un ou des chemins à restaurer"
 
-#: builtin/checkout.c:1819 builtin/checkout.c:1821 builtin/checkout.c:1873
-#: builtin/checkout.c:1875 builtin/clone.c:130 builtin/remote.c:171
-#: builtin/remote.c:173 builtin/submodule--helper.c:3038
-#: builtin/submodule--helper.c:3371 builtin/worktree.c:556
-#: builtin/worktree.c:558
 msgid "branch"
 msgstr "branche"
 
-#: builtin/checkout.c:1820
 msgid "create and checkout a new branch"
 msgstr "créer et extraire une nouvelle branche"
 
-#: builtin/checkout.c:1822
 msgid "create/reset and checkout a branch"
 msgstr "créer/réinitialiser et extraire une branche"
 
-#: builtin/checkout.c:1823
 msgid "create reflog for new branch"
 msgstr "créer un reflog pour une nouvelle branche"
 
-#: builtin/checkout.c:1825
 msgid "second guess 'git checkout <no-such-branch>' (default)"
 msgstr ""
 "essayer d'interpréter 'git checkout <branche-inexistante>' (par défaut)"
 
-#: builtin/checkout.c:1826
 msgid "use overlay mode (default)"
 msgstr "utiliser le mode de superposition (défaut)"
 
-#: builtin/checkout.c:1874
 msgid "create and switch to a new branch"
 msgstr "créer et basculer sur une nouvelle branche"
 
-#: builtin/checkout.c:1876
 msgid "create/reset and switch to a branch"
 msgstr "créer/réinitialiser et basculer sur une branche"
 
-#: builtin/checkout.c:1878
 msgid "second guess 'git switch <no-such-branch>'"
 msgstr "interpréter 'git switch <branche-inexistante>'"
 
-#: builtin/checkout.c:1880
 msgid "throw away local modifications"
 msgstr "laisser tomber les modifications locales"
 
-#: builtin/checkout.c:1916
 msgid "which tree-ish to checkout from"
 msgstr "de quel <arbre-esque> faire l'extraction"
 
-#: builtin/checkout.c:1918
 msgid "restore the index"
 msgstr "restaurer l'index"
 
-#: builtin/checkout.c:1920
 msgid "restore the working tree (default)"
 msgstr "restaurer l'arbre de travail (par défaut)"
 
-#: builtin/checkout.c:1922
 msgid "ignore unmerged entries"
 msgstr "ignorer les entrées non-fusionnées"
 
-#: builtin/checkout.c:1923
 msgid "use overlay mode"
 msgstr "utiliser le mode de superposition"
 
-#: builtin/clean.c:29
 msgid ""
 "git clean [-d] [-f] [-i] [-n] [-q] [-e <pattern>] [-x | -X] [--] <paths>..."
 msgstr ""
 "git clean [-d] [-f] [-i] [-n] [-q] [-e <motif>] [-x | -X] [--] <chemins>..."
 
-#: builtin/clean.c:33
 #, c-format
 msgid "Removing %s\n"
 msgstr "Suppression de %s\n"
 
-#: builtin/clean.c:34
 #, c-format
 msgid "Would remove %s\n"
 msgstr "Supprimerait %s\n"
 
-#: builtin/clean.c:35
 #, c-format
 msgid "Skipping repository %s\n"
 msgstr "Ignore le dépôt %s\n"
 
-#: builtin/clean.c:36
 #, c-format
 msgid "Would skip repository %s\n"
 msgstr "Ignorerait le dépôt %s\n"
 
-#: builtin/clean.c:38
+#, c-format
+msgid "failed to remove %s"
+msgstr "échec de la suppression de %s"
+
 #, c-format
 msgid "could not lstat %s\n"
 msgstr "lstat de %s impossible\n"
 
-#: builtin/clean.c:39
 msgid "Refusing to remove current working directory\n"
 msgstr "Refus de supprimer le répertoire de travail actuel\n"
 
-#: builtin/clean.c:40
 msgid "Would refuse to remove current working directory\n"
 msgstr "Refuserait de supprimer le répertoire de travail actuel\n"
 
-#: builtin/clean.c:326 git-add--interactive.perl:593
 #, c-format
 msgid ""
 "Prompt help:\n"
@@ -13582,7 +3996,6 @@ msgstr ""
 "foo         - sélectionner un élément par un préfixe unique\n"
 "            - (vide) ne rien sélectionner\n"
 
-#: builtin/clean.c:330 git-add--interactive.perl:602
 #, c-format
 msgid ""
 "Prompt help:\n"
@@ -13603,33 +4016,26 @@ msgstr ""
 "*          - choisir tous les éléments\n"
 "           - (vide) terminer la sélection\n"
 
-#: builtin/clean.c:545 git-add--interactive.perl:568
-#: git-add--interactive.perl:573
 #, c-format, perl-format
 msgid "Huh (%s)?\n"
 msgstr "Hein (%s) ?\n"
 
-#: builtin/clean.c:685
 #, c-format
 msgid "Input ignore patterns>> "
 msgstr "Entrez les motifs à ignorer>> "
 
-#: builtin/clean.c:719
 #, c-format
 msgid "WARNING: Cannot find items matched by: %s"
 msgstr "ATTENTION : Impossible de trouver les éléments correspondant à : %s"
 
-#: builtin/clean.c:740
 msgid "Select items to delete"
 msgstr "Sélectionner les éléments à supprimer"
 
 #. TRANSLATORS: Make sure to keep [y/N] as is
-#: builtin/clean.c:781
 #, c-format
 msgid "Remove %s [y/N]? "
 msgstr "Supprimer %s [y/N] ? "
 
-#: builtin/clean.c:812
 msgid ""
 "clean               - start cleaning\n"
 "filter by pattern   - exclude items from deletion\n"
@@ -13647,52 +4053,38 @@ msgstr ""
 "help                - cet écran\n"
 "?                   - aide pour la sélection en ligne"
 
-#: builtin/clean.c:848
 msgid "Would remove the following item:"
 msgid_plural "Would remove the following items:"
 msgstr[0] "Supprimerait l'élément suivant :"
 msgstr[1] "Supprimerait les éléments suivants :"
 
-#: builtin/clean.c:864
 msgid "No more files to clean, exiting."
 msgstr "Plus de fichier à nettoyer, sortie."
 
-#: builtin/clean.c:926
 msgid "do not print names of files removed"
 msgstr "ne pas afficher les noms des fichiers supprimés"
 
-#: builtin/clean.c:928
 msgid "force"
 msgstr "forcer"
 
-#: builtin/clean.c:929
 msgid "interactive cleaning"
 msgstr "nettoyage interactif"
 
-#: builtin/clean.c:931
 msgid "remove whole directories"
 msgstr "supprimer les répertoires entiers"
 
-#: builtin/clean.c:932 builtin/describe.c:565 builtin/describe.c:567
-#: builtin/grep.c:938 builtin/log.c:185 builtin/log.c:187
-#: builtin/ls-files.c:651 builtin/name-rev.c:585 builtin/name-rev.c:587
-#: builtin/show-ref.c:179
 msgid "pattern"
 msgstr "motif"
 
-#: builtin/clean.c:933
 msgid "add <pattern> to ignore rules"
 msgstr "ajouter <motif> aux règles ignore"
 
-#: builtin/clean.c:934
 msgid "remove ignored files, too"
 msgstr "supprimer les fichiers ignorés, aussi"
 
-#: builtin/clean.c:936
 msgid "remove only ignored files"
 msgstr "supprimer seulement les fichiers ignorés"
 
-#: builtin/clean.c:951
 msgid ""
 "clean.requireForce set to true and neither -i, -n, nor -f given; refusing to "
 "clean"
@@ -13700,7 +4092,6 @@ msgstr ""
 "clean.requireForce positionné à true et ni -i, -n ou -f fourni ; refus de "
 "nettoyer"
 
-#: builtin/clean.c:954
 msgid ""
 "clean.requireForce defaults to true and neither -i, -n, nor -f given; "
 "refusing to clean"
@@ -13708,222 +4099,168 @@ msgstr ""
 "clean.requireForce à true par défaut et ni -i, -n ou -f fourni ; refus de "
 "nettoyer"
 
-#: builtin/clean.c:966
 msgid "-x and -X cannot be used together"
 msgstr "-x et -X ne peuvent pas être utilisés ensemble"
 
-#: builtin/clone.c:47
 msgid "git clone [<options>] [--] <repo> [<dir>]"
 msgstr "git clone [<options>] [--] <dépôt> [<répertoire>]"
 
-#: builtin/clone.c:100
 msgid "don't clone shallow repository"
 msgstr "ne pas cloner un dépôt superficiel"
 
-#: builtin/clone.c:102
 msgid "don't create a checkout"
 msgstr "ne pas créer d'extraction"
 
-#: builtin/clone.c:103 builtin/clone.c:105 builtin/init-db.c:542
 msgid "create a bare repository"
 msgstr "créer un dépôt nu"
 
-#: builtin/clone.c:107
 msgid "create a mirror repository (implies bare)"
 msgstr "créer un dépôt miroir (implique dépôt nu)"
 
-#: builtin/clone.c:109
 msgid "to clone from a local repository"
 msgstr "pour cloner depuis un dépôt local"
 
-#: builtin/clone.c:111
 msgid "don't use local hardlinks, always copy"
 msgstr "ne pas utiliser de liens durs locaux, toujours copier"
 
-#: builtin/clone.c:113
 msgid "setup as shared repository"
 msgstr "régler comme dépôt partagé"
 
-#: builtin/clone.c:115
 msgid "pathspec"
 msgstr "spécificateur de chemin"
 
-#: builtin/clone.c:115
 msgid "initialize submodules in the clone"
 msgstr "initialiser les sous-modules dans le clone"
 
-#: builtin/clone.c:119
 msgid "number of submodules cloned in parallel"
 msgstr "nombre de sous-modules clonés en parallèle"
 
-#: builtin/clone.c:120 builtin/init-db.c:539
 msgid "template-directory"
 msgstr "répertoire-modèle"
 
-#: builtin/clone.c:121 builtin/init-db.c:540
 msgid "directory from which templates will be used"
 msgstr "répertoire depuis lequel les modèles vont être utilisés"
 
-#: builtin/clone.c:123 builtin/clone.c:125 builtin/submodule--helper.c:1885
-#: builtin/submodule--helper.c:2719 builtin/submodule--helper.c:3378
 msgid "reference repository"
 msgstr "dépôt de référence"
 
-#: builtin/clone.c:127 builtin/submodule--helper.c:1887
-#: builtin/submodule--helper.c:2721
 msgid "use --reference only while cloning"
 msgstr "utiliser seulement --reference pour cloner"
 
-#: builtin/clone.c:128 builtin/column.c:27 builtin/fmt-merge-msg.c:27
-#: builtin/init-db.c:550 builtin/merge-file.c:48 builtin/merge.c:290
-#: builtin/pack-objects.c:3967 builtin/repack.c:669
-#: builtin/submodule--helper.c:3380 t/helper/test-simple-ipc.c:595
-#: t/helper/test-simple-ipc.c:597
 msgid "name"
 msgstr "nom"
 
-#: builtin/clone.c:129
 msgid "use <name> instead of 'origin' to track upstream"
 msgstr "utiliser <nom> au lieu de 'origin' pour suivre la branche amont"
 
-#: builtin/clone.c:131
 msgid "checkout <branch> instead of the remote's HEAD"
 msgstr "extraire <branche> au lieu de la HEAD du répertoire distant"
 
-#: builtin/clone.c:133
 msgid "path to git-upload-pack on the remote"
 msgstr "chemin vers git-upload-pack sur le serveur distant"
 
-#: builtin/clone.c:134 builtin/fetch.c:182 builtin/grep.c:877
-#: builtin/pull.c:212
 msgid "depth"
 msgstr "profondeur"
 
-#: builtin/clone.c:135
 msgid "create a shallow clone of that depth"
 msgstr "créer un clone superficiel de cette profondeur"
 
-#: builtin/clone.c:136 builtin/fetch.c:184 builtin/pack-objects.c:3956
-#: builtin/pull.c:215
 msgid "time"
 msgstr "heure"
 
-#: builtin/clone.c:137
 msgid "create a shallow clone since a specific time"
 msgstr "créer un clone superficiel depuis une date spécifique"
 
-#: builtin/clone.c:138 builtin/fetch.c:186 builtin/fetch.c:212
-#: builtin/pull.c:218 builtin/pull.c:243 builtin/rebase.c:1050
 msgid "revision"
 msgstr "révision"
 
-#: builtin/clone.c:139 builtin/fetch.c:187 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:141 builtin/submodule--helper.c:1897
-#: builtin/submodule--helper.c:2735
 msgid "clone only one branch, HEAD or --branch"
 msgstr "cloner seulement une branche, HEAD ou --branch"
 
-#: builtin/clone.c:143
 msgid "don't clone any tags, and make later fetches not to follow them"
 msgstr ""
 "ne pas cloner les tags et indiquer aux récupérations futures de ne pas le "
 "faire"
 
-#: builtin/clone.c:145
 msgid "any cloned submodules will be shallow"
 msgstr "tous les sous-modules clonés seront superficiels"
 
-#: builtin/clone.c:146 builtin/init-db.c:548
 msgid "gitdir"
 msgstr "gitdir"
 
-#: builtin/clone.c:147 builtin/init-db.c:549
 msgid "separate git dir from working tree"
 msgstr "séparer le répertoire git de la copie de travail"
 
-#: builtin/clone.c:148
 msgid "key=value"
 msgstr "clé=valeur"
 
-#: builtin/clone.c:149
 msgid "set config inside the new repository"
 msgstr "régler la configuration dans le nouveau dépôt"
 
-#: builtin/clone.c:151 builtin/fetch.c:207 builtin/ls-remote.c:77
-#: builtin/pull.c:234 builtin/push.c:575 builtin/send-pack.c:200
 msgid "server-specific"
 msgstr "spécifique au serveur"
 
-#: builtin/clone.c:151 builtin/fetch.c:207 builtin/ls-remote.c:77
-#: builtin/pull.c:235 builtin/push.c:575 builtin/send-pack.c:201
 msgid "option to transmit"
 msgstr "option à transmettre"
 
-#: builtin/clone.c:152 builtin/fetch.c:208 builtin/pull.c:238
-#: builtin/push.c:576
 msgid "use IPv4 addresses only"
 msgstr "n'utiliser que des adresses IPv4"
 
-#: builtin/clone.c:154 builtin/fetch.c:210 builtin/pull.c:241
-#: builtin/push.c:578
 msgid "use IPv6 addresses only"
 msgstr "n'utiliser que des adresses IPv6"
 
-#: builtin/clone.c:158
 msgid "apply partial clone filters to submodules"
 msgstr "appliquer les filtres de clone partiel aux sous-modules"
 
-#: builtin/clone.c:160
 msgid "any cloned submodules will use their remote-tracking branch"
 msgstr ""
 "tous les sous-modules clonés utiliseront leur branche de suivi à distance"
 
-#: builtin/clone.c:162
 msgid "initialize sparse-checkout file to include only files at root"
 msgstr ""
 "initialiser le fichier d'extraction clairsemée pour n'inclure que les "
 "fichiers à la racine"
 
-#: builtin/clone.c:237
 #, 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:310
+#, c-format
+msgid "failed to stat '%s'"
+msgstr "échec du stat de '%s'"
+
 #, c-format
 msgid "%s exists and is not a directory"
 msgstr "%s existe et n'est pas un répertoire"
 
-#: builtin/clone.c:328
 #, c-format
 msgid "failed to start iterator over '%s'"
 msgstr "échec du démarrage un itérateur sur '%s'"
 
-#: builtin/clone.c:359
+#, c-format
+msgid "failed to unlink '%s'"
+msgstr "échec pour délier '%s'"
+
 #, c-format
 msgid "failed to create link '%s'"
 msgstr "échec de la création du lien '%s'"
 
-#: builtin/clone.c:363
 #, c-format
 msgid "failed to copy file to '%s'"
 msgstr "échec de la copie vers '%s'"
 
-#: builtin/clone.c:368
 #, c-format
 msgid "failed to iterate over '%s'"
 msgstr "échec de l'itération sur '%s'"
 
-#: builtin/clone.c:395
 #, c-format
 msgid "done.\n"
 msgstr "fait.\n"
 
-#: builtin/clone.c:409
 msgid ""
 "Clone succeeded, but checkout failed.\n"
 "You can inspect what was checked out with 'git status'\n"
@@ -13933,103 +4270,84 @@ msgstr ""
 "Vous pouvez inspecter ce qui a été extrait avec 'git status'\n"
 "et réessayer avec 'git restore --source=HEAD :/'\n"
 
-#: builtin/clone.c:486
 #, c-format
 msgid "Could not find remote branch %s to clone."
 msgstr "Impossible de trouver la branche distante '%s' à cloner."
 
-#: builtin/clone.c:603
+msgid "remote did not send all necessary objects"
+msgstr "le serveur distant n'a pas envoyé tous les objets nécessaires"
+
 #, c-format
 msgid "unable to update %s"
 msgstr "impossible de mettre à jour %s"
 
-#: builtin/clone.c:651
 msgid "failed to initialize sparse-checkout"
 msgstr "échec lors de l'initialisation l'extraction clairsemée"
 
-#: builtin/clone.c:674
 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:709
 msgid "unable to checkout working tree"
 msgstr "impossible d'extraire la copie de travail"
 
-#: builtin/clone.c:793
 msgid "unable to write parameters to config file"
 msgstr "impossible d'écrire les paramètres dans le fichier de configuration"
 
-#: builtin/clone.c:856
 msgid "cannot repack to clean up"
 msgstr "impossible de remballer pour nettoyer"
 
-#: builtin/clone.c:858
 msgid "cannot unlink temporary alternates file"
 msgstr "impossible de délier le fichier temporaire alternates"
 
-#: builtin/clone.c:901
 msgid "Too many arguments."
 msgstr "Trop d'arguments."
 
-#: builtin/clone.c:905 contrib/scalar/scalar.c:413
 msgid "You must specify a repository to clone."
 msgstr "Vous devez spécifier un dépôt à cloner."
 
-#: builtin/clone.c:918
 #, c-format
 msgid "options '%s' and '%s %s' cannot be used together"
 msgstr "les options '%s' et '%s %s' ne peuvent pas être utilisées ensemble"
 
-#: builtin/clone.c:935
 #, c-format
 msgid "repository '%s' does not exist"
 msgstr "le dépôt '%s' n'existe pas"
 
-#: builtin/clone.c:939 builtin/fetch.c:2176
 #, c-format
 msgid "depth %s is not a positive number"
 msgstr "la profondeur %s n'est pas un entier positif"
 
-#: builtin/clone.c:949
 #, 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:955
 #, 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:969
 #, c-format
 msgid "working tree '%s' already exists."
 msgstr "la copie de travail '%s' existe déjà."
 
-#: builtin/clone.c:984 builtin/clone.c:1005 builtin/difftool.c:256
-#: builtin/log.c:2037 builtin/worktree.c:350 builtin/worktree.c:382
 #, 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:989
 #, 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:1009
 #, c-format
 msgid "Cloning into bare repository '%s'...\n"
 msgstr "Clonage dans le dépôt nu '%s'\n"
 
-#: builtin/clone.c:1011
 #, c-format
 msgid "Cloning into '%s'...\n"
 msgstr "Clonage dans '%s'...\n"
 
-#: builtin/clone.c:1040
 msgid ""
 "clone --recursive is not compatible with both --reference and --reference-if-"
 "able"
@@ -14037,96 +4355,78 @@ msgstr ""
 "clone --recursive n'est pas compatible avec à la fois --reference et --"
 "reference-if-able"
 
-#: builtin/clone.c:1116 builtin/remote.c:201 builtin/remote.c:721
 #, c-format
 msgid "'%s' is not a valid remote name"
 msgstr "'%s' n'est pas un nom valide de distante"
 
-#: builtin/clone.c:1157
 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:1159
 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:1161
 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:1163
 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:1168
+msgid "source repository is shallow, reject to clone."
+msgstr "le dépôt source est superficiel, clonage rejeté."
+
 msgid "source repository is shallow, ignoring --local"
 msgstr "le dépôt source est superficiel, option --local ignorée"
 
-#: builtin/clone.c:1173
 msgid "--local is ignored"
 msgstr "--local est ignoré"
 
-#: builtin/clone.c:1185
 msgid "cannot clone from filtered bundle"
 msgstr "impossible de cloner depuis un colis filtré"
 
-#: builtin/clone.c:1265 builtin/clone.c:1324
 msgid "remote transport reported error"
 msgstr "le transport distant a retourné une erreur"
 
-#: builtin/clone.c:1277 builtin/clone.c:1289
 #, 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:1292
 msgid "You appear to have cloned an empty repository."
 msgstr "Vous semblez avoir cloné un dépôt vide."
 
-#: builtin/column.c:10
 msgid "git column [<options>]"
 msgstr "git column [<options>]"
 
-#: builtin/column.c:27
 msgid "lookup config vars"
 msgstr "rechercher les variables de configuration"
 
-#: builtin/column.c:28 builtin/column.c:29
 msgid "layout to use"
 msgstr "mise en page à utiliser"
 
-#: builtin/column.c:30
 msgid "maximum width"
 msgstr "largeur maximale"
 
-#: builtin/column.c:31
 msgid "padding space on left border"
 msgstr "remplissage d'espace sur la bordure gauche"
 
-#: builtin/column.c:32
 msgid "padding space on right border"
 msgstr "remplissage d'espace sur le côté droit"
 
-#: builtin/column.c:33
 msgid "padding space between columns"
 msgstr "remplissage d'espace entre les colonnes"
 
-#: builtin/column.c:51
 msgid "--command must be the first argument"
 msgstr "--command doit être le premier argument"
 
-#: 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:16
 msgid ""
 "git commit-graph write [--object-dir <objdir>] [--append] [--"
 "split[=<strategy>]] [--reachable|--stdin-packs|--stdin-commits] [--changed-"
@@ -14136,95 +4436,78 @@ msgstr ""
 "split[=<stratégie>]] [--reachable|--stdin-packs|--stdin-commits] [--changed-"
 "paths] [--[no-]max-new-filters <n>] [--[no-]progress] <options de division>"
 
-#: builtin/commit-graph.c:51 builtin/fetch.c:196 builtin/log.c:1813
 msgid "dir"
 msgstr "répertoire"
 
-#: 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: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:100
 #, c-format
 msgid "Could not open commit-graph '%s'"
 msgstr "Impossible d'ouvrir le graphe de commit '%s'"
 
-#: builtin/commit-graph.c:137
 #, c-format
 msgid "unrecognized --split argument, %s"
 msgstr "argument de --split non reconnu, %s"
 
-#: 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:155
 #, c-format
 msgid "invalid object: %s"
 msgstr "objet invalide : %s"
 
-#: builtin/commit-graph.c:205
+#, c-format
+msgid "option `%s' expects a numerical value"
+msgstr "l'option '%s' attend une valeur numérique"
+
 msgid "start walk at all refs"
 msgstr "commencer le parcours à toutes les réfs"
 
-#: 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:209
 msgid "start walk at commits listed by stdin"
 msgstr "commencer le parcours aux commits listés sur stdin"
 
-#: 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:213
 msgid "enable computation for changed paths"
 msgstr "activer le calcul pour les chemins modifiés"
 
-#: 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: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: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: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: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: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:282
 msgid "Collecting commits from input"
 msgstr "Collecte des commits depuis l'entrée"
 
-#: builtin/commit-graph.c:328 builtin/multi-pack-index.c:259
 #, 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 "
 "<file>)...] <tree>"
@@ -14232,70 +4515,52 @@ msgstr ""
 "git commit-tree [(-p <parent>)...] [-S[<idclé>]] [(-m <message>)...] [(-F "
 "<fichier>)...] <arbre>"
 
-#: builtin/commit-tree.c:31
 #, c-format
 msgid "duplicate parent %s ignored"
 msgstr "le parent dupliqué %s est ignoré"
 
-#: builtin/commit-tree.c:56 builtin/commit-tree.c:134 builtin/log.c:590
 #, c-format
 msgid "not a valid object name %s"
 msgstr "nom d'objet invalide %s"
 
-#: 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: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:109
 msgid "parent"
 msgstr "parent"
 
-#: builtin/commit-tree.c:110
 msgid "id of a parent commit object"
 msgstr "id d'un objet commit parent"
 
-#: builtin/commit-tree.c:112 builtin/commit.c:1626 builtin/merge.c:284
-#: builtin/notes.c:407 builtin/notes.c:573 builtin/stash.c:1666
-#: builtin/tag.c:455
 msgid "message"
 msgstr "message"
 
-#: builtin/commit-tree.c:113 builtin/commit.c:1626
 msgid "commit message"
 msgstr "message de validation"
 
-#: 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:119 builtin/commit.c:1643 builtin/merge.c:303
-#: builtin/pull.c:180 builtin/revert.c:118
 msgid "GPG sign commit"
 msgstr "signer la validation avec GPG"
 
-#: builtin/commit-tree.c:131
 msgid "must give exactly one tree"
 msgstr "exactement un arbre obligatoire"
 
-#: builtin/commit-tree.c:138
 msgid "git commit-tree: failed to read"
 msgstr "git commit-tree : échec de la lecture"
 
-#: builtin/commit.c:43
 msgid "git commit [<options>] [--] <pathspec>..."
 msgstr "git commit [<options>] [--] <spécification-de-chemin>..."
 
-#: builtin/commit.c:48
 msgid "git status [<options>] [--] <pathspec>..."
 msgstr "git status [<options>] [--] <spécification-de-chemin>..."
 
-#: builtin/commit.c:53
 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"
@@ -14306,7 +4571,6 @@ msgstr ""
 "vide. Vous pouvez répéter votre commande avec --allow-empty, ou vous pouvez\n"
 "supprimer complètement le commit avec \"git reset HEAD^\".\n"
 
-#: builtin/commit.c:58
 msgid ""
 "The previous cherry-pick is now empty, possibly due to conflict resolution.\n"
 "If you wish to commit it anyway, use:\n"
@@ -14321,15 +4585,12 @@ msgstr ""
 "    git commit --allow-empty\n"
 "\n"
 
-#: builtin/commit.c:65
 msgid "Otherwise, please use 'git rebase --skip'\n"
 msgstr "Sinon, veuillez utiliser 'git rebase --skip'\n"
 
-#: builtin/commit.c:68
 msgid "Otherwise, please use 'git cherry-pick --skip'\n"
 msgstr "Sinon, veuillez utiliser 'git cherry-pick --skip'\n"
 
-#: builtin/commit.c:71
 msgid ""
 "and then use:\n"
 "\n"
@@ -14351,69 +4612,57 @@ msgstr ""
 "    git cherry-pick --skip\n"
 "\n"
 
-#: builtin/commit.c:326
 msgid "failed to unpack HEAD tree object"
 msgstr "échec du dépaquetage de l'objet arbre HEAD"
 
-#: builtin/commit.c:376
 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:388
 msgid "unable to create temporary index"
 msgstr "impossible de créer l'index temporaire"
 
-#: builtin/commit.c:397
 msgid "interactive add failed"
 msgstr "échec de l'ajout interactif"
 
-#: builtin/commit.c:412
 msgid "unable to update temporary index"
 msgstr "impossible de mettre à jour l'index temporaire"
 
-#: builtin/commit.c:414
 msgid "Failed to update main cache tree"
 msgstr "Impossible de mettre à jour l'arbre de cache principal"
 
-#: builtin/commit.c:439 builtin/commit.c:462 builtin/commit.c:510
 msgid "unable to write new_index file"
 msgstr "impossible d'écrire le fichier new_index"
 
-#: builtin/commit.c:491
 msgid "cannot do a partial commit during a merge."
 msgstr "impossible de faire une validation partielle pendant une fusion."
 
-#: builtin/commit.c:493
 msgid "cannot do a partial commit during a cherry-pick."
 msgstr "impossible de faire une validation partielle pendant un picorage."
 
-#: builtin/commit.c:495
 msgid "cannot do a partial commit during a rebase."
 msgstr "impossible de faire une validation partielle pendant un rebasage."
 
-#: builtin/commit.c:503
 msgid "cannot read the index"
 msgstr "impossible de lire l'index"
 
-#: builtin/commit.c:522
 msgid "unable to write temporary index file"
 msgstr "impossible d'écrire le fichier d'index temporaire"
 
-#: builtin/commit.c:620
 #, c-format
 msgid "commit '%s' lacks author header"
 msgstr "entête d'auteur manquant dans le commit '%s'"
 
-#: builtin/commit.c:622
 #, c-format
 msgid "commit '%s' has malformed author line"
 msgstr "le commit '%s' a une ligne d'auteur malformée"
 
-#: builtin/commit.c:641
 msgid "malformed --author parameter"
 msgstr "paramètre --author mal formé"
 
-#: builtin/commit.c:694
+#, c-format
+msgid "invalid date format: %s"
+msgstr "format de date invalide : %s"
+
 msgid ""
 "unable to select a comment character that is not used\n"
 "in the current commit message"
@@ -14421,43 +4670,38 @@ msgstr ""
 "impossible de sélectionner un caractère de commentaire\n"
 "qui n'est pas utilisé dans le message de validation actuel"
 
-#: builtin/commit.c:750 builtin/commit.c:784 builtin/commit.c:1170
 #, c-format
 msgid "could not lookup commit %s"
 msgstr "impossible de rechercher le commit %s"
 
-#: builtin/commit.c:762 builtin/shortlog.c:417
 #, 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:764
 msgid "could not read log from standard input"
 msgstr "impossible de lire le journal depuis l'entrée standard"
 
-#: builtin/commit.c:768
 #, c-format
 msgid "could not read log file '%s'"
 msgstr "impossible de lire le fichier de journal '%s'"
 
-#: builtin/commit.c:805
 #, c-format
 msgid "options '%s' and '%s:%s' cannot be used together"
 msgstr "les options '%s' et '%s.%s' ne peuvent pas être utilisées ensemble"
 
-#: builtin/commit.c:817 builtin/commit.c:833
 msgid "could not read SQUASH_MSG"
 msgstr "impossible de lire SQUASH_MSG"
 
-#: builtin/commit.c:824
 msgid "could not read MERGE_MSG"
 msgstr "impossible de lire MERGE_MSG"
 
-#: builtin/commit.c:884
+#, c-format
+msgid "could not open '%s'"
+msgstr "impossible d'ouvrir '%s'"
+
 msgid "could not write commit template"
 msgstr "impossible d'écrire le modèle de commit"
 
-#: builtin/commit.c:897
 #, c-format
 msgid ""
 "Please enter the commit message for your changes. Lines starting\n"
@@ -14466,7 +4710,6 @@ msgstr ""
 "Veuillez saisir le message de validation pour vos modifications. Les lignes\n"
 "commençant par '%c' seront ignorées.\n"
 
-#: builtin/commit.c:899
 #, c-format
 msgid ""
 "Please enter the commit message for your changes. Lines starting\n"
@@ -14476,7 +4719,6 @@ msgstr ""
 "commençant par '%c' seront ignorées, et un message vide abandonne la "
 "validation.\n"
 
-#: builtin/commit.c:903
 #, c-format
 msgid ""
 "Please enter the commit message for your changes. Lines starting\n"
@@ -14487,7 +4729,6 @@ msgstr ""
 "par '%c' seront conservées ; vous pouvez les supprimer vous-même si vous le "
 "souhaitez.\n"
 
-#: builtin/commit.c:907
 #, c-format
 msgid ""
 "Please enter the commit message for your changes. Lines starting\n"
@@ -14498,7 +4739,6 @@ msgstr ""
 "commençant par '%c' seront conservées ; vous pouvez les supprimer vous-même\n"
 "si vous le souhaitez. Un message vide abandonne la validation.\n"
 
-#: builtin/commit.c:919
 msgid ""
 "\n"
 "It looks like you may be committing a merge.\n"
@@ -14512,7 +4752,6 @@ msgstr ""
 "\tgit update-ref -d MERGE_HEAD\n"
 "et essayez à nouveau.\n"
 
-#: builtin/commit.c:924
 msgid ""
 "\n"
 "It looks like you may be committing a cherry-pick.\n"
@@ -14526,153 +4765,118 @@ msgstr ""
 "\tgit update-ref -d CHERRY_PICK_HEAD\n"
 "et essayez à nouveau.\n"
 
-#: builtin/commit.c:951
 #, c-format
 msgid "%sAuthor:    %.*s <%.*s>"
 msgstr "%sAuteur :     %.*s <%.*s>"
 
-#: builtin/commit.c:959
 #, c-format
 msgid "%sDate:      %s"
 msgstr "%sDate :       %s"
 
-#: builtin/commit.c:966
 #, c-format
 msgid "%sCommitter: %.*s <%.*s>"
 msgstr "%sValidateur : %.*s <%.*s>"
 
-#: builtin/commit.c:984
 msgid "Cannot read index"
 msgstr "Impossible de lire l'index"
 
-#: builtin/commit.c:1029
 msgid "unable to pass trailers to --trailers"
 msgstr "impossible de passer les lignes finales à --trailers"
 
-#: builtin/commit.c:1069
 msgid "Error building trees"
 msgstr "Erreur lors de la construction des arbres"
 
-#: builtin/commit.c:1083 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:1128
 #, 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:1142
 #, c-format
 msgid "Invalid ignored mode '%s'"
 msgstr "Mode de fichier ignoré invalide '%s'"
 
-#: builtin/commit.c:1160 builtin/commit.c:1450
 #, c-format
 msgid "Invalid untracked files mode '%s'"
 msgstr "Mode de fichier non suivi invalide '%s'"
 
-#: builtin/commit.c:1231
 msgid "You are in the middle of a merge -- cannot reword."
 msgstr "Vous êtes en pleine fusion -- impossible de reformuler."
 
-#: builtin/commit.c:1233
 msgid "You are in the middle of a cherry-pick -- cannot reword."
 msgstr "Vous êtes en plein picorage -- impossible de reformuler."
 
-#: builtin/commit.c:1236
 #, c-format
 msgid "reword option of '%s' and path '%s' cannot be used together"
 msgstr ""
 "l'option de reformulation de '%s' et le chemin '%s' ne peuvent pas être "
 "utilisés ensemble"
 
-#: builtin/commit.c:1238
 #, c-format
 msgid "reword option of '%s' and '%s' cannot be used together"
 msgstr ""
 "l'option de reformulation de '%s' et '%s' ne peuvent pas être utilisés "
 "ensemble"
 
-#: builtin/commit.c:1263
 msgid "You have nothing to amend."
 msgstr "Il n'y a rien à corriger."
 
-#: builtin/commit.c:1266
 msgid "You are in the middle of a merge -- cannot amend."
 msgstr "Vous êtes en pleine fusion -- impossible de corriger (amend)."
 
-#: builtin/commit.c:1268
 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:1270
 msgid "You are in the middle of a rebase -- cannot amend."
 msgstr "Vous êtes en plein rebasage -- impossible de corriger (amend)."
 
-#: builtin/commit.c:1290
 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:1337
 #, c-format
 msgid "unknown option: --fixup=%s:%s"
 msgstr "option inconnue : --fixup=%s:%s"
 
-#: 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:1485 builtin/commit.c:1654
 msgid "show status concisely"
 msgstr "afficher l'état avec concision"
 
-#: builtin/commit.c:1487 builtin/commit.c:1656
 msgid "show branch information"
 msgstr "afficher l'information de branche"
 
-#: builtin/commit.c:1489
 msgid "show stash information"
 msgstr "afficher l'information de remisage"
 
-#: 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:1493
 msgid "version"
 msgstr "version"
 
-#: builtin/commit.c:1493 builtin/commit.c:1660 builtin/push.c:551
-#: builtin/worktree.c:765
 msgid "machine-readable output"
 msgstr "sortie pour traitement automatique"
 
-#: 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:1499 builtin/commit.c:1665
 msgid "terminate entries with NUL"
 msgstr "terminer les éléments par NUL"
 
-#: builtin/commit.c:1501 builtin/commit.c:1505 builtin/commit.c:1668
-#: builtin/fast-export.c:1172 builtin/fast-export.c:1175
-#: builtin/fast-export.c:1178 builtin/rebase.c:1139 parse-options.h:368
 msgid "mode"
 msgstr "mode"
 
-#: 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:1506
 msgid ""
 "show ignored files, optional modes: traditional, matching, no. (Default: "
 "traditional)"
@@ -14680,11 +4884,9 @@ msgstr ""
 "afficher les fichiers ignorés, \"mode\" facultatif : traditional "
 "(traditionnel), matching (correspondant), no. (Défaut : traditional)"
 
-#: builtin/commit.c:1508 parse-options.h:197
 msgid "when"
 msgstr "quand"
 
-#: builtin/commit.c:1509
 msgid ""
 "ignore changes to submodules, optional when: all, dirty, untracked. "
 "(Default: all)"
@@ -14692,198 +4894,155 @@ msgstr ""
 "ignorer les modifications dans les sous-modules, \"quand\" facultatif : all "
 "(tous), dirty (sale), untracked (non suivi). (Défaut : all)"
 
-#: builtin/commit.c:1511
 msgid "list untracked files in columns"
 msgstr "afficher les fichiers non suivis en colonnes"
 
-#: builtin/commit.c:1512
 msgid "do not detect renames"
 msgstr "ne pas détecter les renommages"
 
-#: 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: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:1619
 msgid "suppress summary after successful commit"
 msgstr "supprimer le résumé après une validation réussie"
 
-#: 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:1622
 msgid "Commit message options"
 msgstr "Options du message de validation"
 
-#: builtin/commit.c:1623 builtin/merge.c:288 builtin/tag.c:457
 msgid "read message from file"
 msgstr "lire le message depuis un fichier"
 
-#: builtin/commit.c:1624
 msgid "author"
 msgstr "auteur"
 
-#: builtin/commit.c:1624
 msgid "override author for commit"
 msgstr "remplacer l'auteur pour la validation"
 
-#: builtin/commit.c:1625 builtin/gc.c:551
 msgid "date"
 msgstr "date"
 
-#: builtin/commit.c:1625
 msgid "override date for commit"
 msgstr "remplacer la date pour la validation"
 
-#: builtin/commit.c:1627 builtin/commit.c:1628 builtin/commit.c:1634
-#: parse-options.h:360 ref-filter.h:89
 msgid "commit"
 msgstr "commit"
 
-#: 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: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:1633
 msgid "[(amend|reword):]commit"
 msgstr "[(amend|reword):]commit"
 
-#: 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: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: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:1636 builtin/interpret-trailers.c:111
 msgid "trailer"
 msgstr "ligne de fin"
 
-#: builtin/commit.c:1636
 msgid "add custom trailer(s)"
 msgstr "ajouter des lignes terminales personnaliser"
 
-#: builtin/commit.c:1637 builtin/log.c:1788 builtin/merge.c:306
-#: 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:1638
 msgid "use specified template file"
 msgstr "utiliser le fichier de modèle spécifié"
 
-#: builtin/commit.c:1639
 msgid "force edit of commit"
 msgstr "forcer l'édition du commit"
 
-#: 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:1646
 msgid "Commit contents options"
 msgstr "Valider les options des contenus"
 
-#: builtin/commit.c:1647
 msgid "commit all changed files"
 msgstr "valider tous les fichiers modifiés"
 
-#: 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:1649
 msgid "interactively add files"
 msgstr "ajouter des fichiers en mode interactif"
 
-#: builtin/commit.c:1650
 msgid "interactively add changes"
 msgstr "ajouter les modifications en mode interactif"
 
-#: builtin/commit.c:1651
 msgid "commit only specified files"
 msgstr "valider seulement les fichiers spécifiés"
 
-#: 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:1653
 msgid "show what would be committed"
 msgstr "afficher ce qui serait validé"
 
-#: builtin/commit.c:1666
 msgid "amend previous commit"
 msgstr "corriger la validation précédente"
 
-#: builtin/commit.c:1667
 msgid "bypass post-rewrite hook"
 msgstr "éviter d'utiliser le crochet post-rewrite"
 
-#: builtin/commit.c:1674
 msgid "ok to record an empty change"
 msgstr "accepter d'enregistrer une modification vide"
 
-#: 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:1752
+msgid "could not parse HEAD commit"
+msgstr "impossible d'analyser le commit HEAD"
+
 #, c-format
 msgid "Corrupt MERGE_HEAD file (%s)"
 msgstr "Fichier MERGE_HEAD corrompu (%s)"
 
-#: builtin/commit.c:1759
 msgid "could not read MERGE_MODE"
 msgstr "impossible de lire MERGE_MODE"
 
-#: 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: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: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: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:1839
 msgid ""
 "repository has been updated, but unable to write\n"
 "new_index file. Check that disk is not full and quota is\n"
@@ -14893,231 +5052,181 @@ msgstr ""
 "new_index. Vérifiez que le disque n'est pas plein ou que le quota\n"
 "n'a pas été dépassé, puis lancez \"git restore --staged :/\" pour réparer."
 
-#: builtin/config.c:11
 msgid "git config [<options>]"
 msgstr "git config [<options>]"
 
-#: builtin/config.c:109 builtin/env--helper.c:27
 #, c-format
 msgid "unrecognized --type argument, %s"
 msgstr "argument --type non reconnu, %s"
 
-#: builtin/config.c:121
 msgid "only one type at a time"
 msgstr "qu'un seul type à la fois"
 
-#: builtin/config.c:130
 msgid "Config file location"
 msgstr "Emplacement du fichier de configuration"
 
-#: builtin/config.c:131
 msgid "use global config file"
 msgstr "utiliser les fichier de configuration global"
 
-#: builtin/config.c:132
 msgid "use system config file"
 msgstr "utiliser le fichier de configuration du système"
 
-#: builtin/config.c:133
 msgid "use repository config file"
 msgstr "utiliser le fichier de configuration du dépôt"
 
-#: builtin/config.c:134
 msgid "use per-worktree config file"
 msgstr "utiliser un fichier de configuration par arbre de travail"
 
-#: builtin/config.c:135
 msgid "use given config file"
 msgstr "utiliser le fichier de configuration spécifié"
 
-#: builtin/config.c:136
 msgid "blob-id"
 msgstr "blob-id"
 
-#: builtin/config.c:136
 msgid "read config from given blob object"
 msgstr "lire la configuration depuis l'objet blob fourni"
 
-#: builtin/config.c:137
 msgid "Action"
 msgstr "Action"
 
-#: builtin/config.c:138
 msgid "get value: name [value-pattern]"
 msgstr "obtenir la valeur : nom [motif-de-valeur]"
 
-#: builtin/config.c:139
 msgid "get all values: key [value-pattern]"
 msgstr "obtenir toutes les valeurs : clé [motif-de-valeur]"
 
-#: builtin/config.c:140
 msgid "get values for regexp: name-regex [value-pattern]"
 msgstr "obtenir les valeur pour la regexp : regex-de-nom [motif-de-valeur]"
 
-#: builtin/config.c:141
 msgid "get value specific for the URL: section[.var] URL"
 msgstr "obtenir la valeur spécifique pour l'URL : section[.var] URL"
 
-#: builtin/config.c:142
 msgid "replace all matching variables: name value [value-pattern]"
 msgstr ""
 "remplacer toutes les variables correspondant : nom valeur [motif-de-valeur]"
 
-#: builtin/config.c:143
 msgid "add a new variable: name value"
 msgstr "ajouter une nouvelle variable : nom valeur"
 
-#: builtin/config.c:144
 msgid "remove a variable: name [value-pattern]"
 msgstr "supprimer une variable : nom [motif-de-valeur]"
 
-#: builtin/config.c:145
 msgid "remove all matches: name [value-pattern]"
 msgstr "supprimer toutes les correspondances nom [motif-de-valeur]"
 
-#: builtin/config.c:146
 msgid "rename section: old-name new-name"
 msgstr "renommer une section : ancien-nom nouveau-nom"
 
-#: builtin/config.c:147
 msgid "remove a section: name"
 msgstr "supprimer une section : nom"
 
-#: builtin/config.c:148
 msgid "list all"
 msgstr "afficher tout"
 
-#: builtin/config.c:149
 msgid "use string equality when comparing values to 'value-pattern'"
 msgstr ""
 "utiliser l'égalité de chaînes lors de la comparaison de 'motif-de-valeur'"
 
-#: builtin/config.c:150
 msgid "open an editor"
 msgstr "ouvrir un éditeur"
 
-#: builtin/config.c:151
 msgid "find the color configured: slot [default]"
 msgstr "trouver la couleur configurée : slot [par défaut]"
 
-#: builtin/config.c:152
 msgid "find the color setting: slot [stdout-is-tty]"
 msgstr "trouver le réglage de la couleur : slot [stdout-est-tty]"
 
-#: builtin/config.c:153
 msgid "Type"
 msgstr "Type"
 
-#: builtin/config.c:154 builtin/env--helper.c:42 builtin/hash-object.c:97
 msgid "type"
 msgstr "type"
 
-#: builtin/config.c:154 builtin/env--helper.c:43
 msgid "value is given this type"
 msgstr "ce type est assigné à la valeur"
 
-#: builtin/config.c:155
 msgid "value is \"true\" or \"false\""
 msgstr "la valeur est \"true\" (vrai) ou \"false\" (faux)"
 
-#: builtin/config.c:156
 msgid "value is decimal number"
 msgstr "la valeur est un nombre décimal"
 
-#: builtin/config.c:157
 msgid "value is --bool or --int"
 msgstr "la valeur est --bool ou --int"
 
-#: builtin/config.c:158
 msgid "value is --bool or string"
 msgstr "la valeur est --bool ou une chaîne"
 
-#: builtin/config.c:159
 msgid "value is a path (file or directory name)"
 msgstr "la valeur est un chemin (vers un fichier ou un répertoire)"
 
-#: builtin/config.c:160
 msgid "value is an expiry date"
 msgstr "la valeur est une date d'expiration"
 
-#: builtin/config.c:161
 msgid "Other"
 msgstr "Autre"
 
-#: builtin/config.c:162
 msgid "terminate values with NUL byte"
 msgstr "terminer les valeurs avec un caractère NUL"
 
-#: builtin/config.c:163
 msgid "show variable names only"
 msgstr "n'afficher que les noms de variable"
 
-#: builtin/config.c:164
 msgid "respect include directives on lookup"
 msgstr "respecter les directives d'inclusion lors de la recherche"
 
-#: builtin/config.c:165
 msgid "show origin of config (file, standard input, blob, command line)"
 msgstr ""
 "afficher l'origine de la configuration (fichier, entrée standard, blob, "
 "ligne de commande)"
 
-#: builtin/config.c:166
 msgid "show scope of config (worktree, local, global, system, command)"
 msgstr ""
 "afficher la portée de configuration (arbre de travail, local, global, "
 "système, commande)"
 
-#: builtin/config.c:167 builtin/env--helper.c:45
 msgid "value"
 msgstr "valeur"
 
-#: builtin/config.c:167
 msgid "with --get, use default value when missing entry"
 msgstr "avec --get, utiliser le valeur par défaut quand l'entrée n'existe pas"
 
-#: builtin/config.c:181
 #, c-format
 msgid "wrong number of arguments, should be %d"
 msgstr "mauvais nombre d'arguments, devrait être %d"
 
-#: builtin/config.c:183
 #, c-format
 msgid "wrong number of arguments, should be from %d to %d"
 msgstr "mauvais nombre d'arguments, devrait être entre %d et %d"
 
-#: builtin/config.c:339
 #, c-format
 msgid "invalid key pattern: %s"
 msgstr "motif de clé invalide : %s"
 
-#: builtin/config.c:377
+#, c-format
+msgid "invalid pattern: %s"
+msgstr "motif invalide : %s"
+
 #, c-format
 msgid "failed to format default config value: %s"
 msgstr "échec du formatage de la valeur de config par défaut : %s"
 
-#: builtin/config.c:441
 #, c-format
 msgid "cannot parse color '%s'"
 msgstr "impossible d'analyser la couleur '%s'"
 
-#: builtin/config.c:483
 msgid "unable to parse default color value"
 msgstr "impossible de lire la valeur de couleur par défaut"
 
-#: builtin/config.c:536 builtin/config.c:833
 msgid "not in a git directory"
 msgstr "pas dans un répertoire git"
 
-#: builtin/config.c:539
 msgid "writing to stdin is not supported"
 msgstr "l'écriture sur stdin n'est pas supportée"
 
-#: builtin/config.c:542
 msgid "writing config blobs is not supported"
 msgstr "l'écriture de blob de configuration n'est pas supportée<"
 
-#: builtin/config.c:627
 #, c-format
 msgid ""
 "# This is Git's per-user configuration file.\n"
@@ -15132,27 +5241,21 @@ msgstr ""
 "#\tname = %s\n"
 "#\temail = %s\n"
 
-#: builtin/config.c:652
 msgid "only one config file at a time"
 msgstr "un seul fichier de configuration à la fois"
 
-#: builtin/config.c:658
 msgid "--local can only be used inside a git repository"
 msgstr "--local ne peut être utilisé qu'à l'intérieur d'un dépôt git"
 
-#: builtin/config.c:660
 msgid "--blob can only be used inside a git repository"
 msgstr "--blob ne peut être utilisé qu'à l'intérieur d'un dépôt git"
 
-#: builtin/config.c:662
 msgid "--worktree can only be used inside a git repository"
 msgstr "--worktree ne peut être utilisé qu'à l'intérieur d'un dépôt git"
 
-#: builtin/config.c:684
 msgid "$HOME not set"
 msgstr "$HOME n'est pas défini"
 
-#: builtin/config.c:708
 msgid ""
 "--worktree cannot be used with multiple working trees unless the config\n"
 "extension worktreeConfig is enabled. Please read \"CONFIGURATION FILE\"\n"
@@ -15163,19 +5266,15 @@ msgstr ""
 "la section \"CONFIGURATION FILE\" de \"git help worktree\" pour plus de "
 "détails"
 
-#: builtin/config.c:743
 msgid "--get-color and variable type are incoherent"
 msgstr "--get-color et le type de la variable sont incohérents"
 
-#: builtin/config.c:748
 msgid "only one action at a time"
 msgstr "une seule action à la fois"
 
-#: builtin/config.c:761
 msgid "--name-only is only applicable to --list or --get-regexp"
 msgstr "--name-only n'est applicable qu'avec --list ou --get-regexp"
 
-#: builtin/config.c:767
 msgid ""
 "--show-origin is only applicable to --get, --get-all, --get-regexp, and --"
 "list"
@@ -15183,37 +5282,29 @@ msgstr ""
 "--show-origin n'est applicable qu'avec --get, --get-all, --get-regexp ou --"
 "list"
 
-#: builtin/config.c:773
 msgid "--default is only applicable to --get"
 msgstr "--default n'est applicable qu'avec --get"
 
-#: builtin/config.c:806
 msgid "--fixed-value only applies with 'value-pattern'"
 msgstr "--fixed-value ne s'applique qu'à 'motif-de-valeur'"
 
-#: builtin/config.c:822
 #, c-format
 msgid "unable to read config file '%s'"
 msgstr "lecture du fichier de configuration '%s' impossible"
 
-#: builtin/config.c:825
 msgid "error processing config file(s)"
 msgstr "erreur lors du traitement de fichier(s) de configuration"
 
-#: builtin/config.c:835
 msgid "editing stdin is not supported"
 msgstr "l'édition de stdin n'est pas supportée"
 
-#: builtin/config.c:837
 msgid "editing blobs is not supported"
 msgstr "l'édition de blobs n'est pas supportée"
 
-#: builtin/config.c:851
 #, c-format
 msgid "cannot create configuration file %s"
 msgstr "création impossible du fichier de configuration '%s'"
 
-#: builtin/config.c:864
 #, c-format
 msgid ""
 "cannot overwrite multiple values with a single value\n"
@@ -15222,16 +5313,13 @@ msgstr ""
 "impossible de surcharger des valeurs multiples avec une seule valeur\n"
 "       Utilisez une regexp, --add ou --replace-all pour modifier %s."
 
-#: builtin/config.c:943 builtin/config.c:954
 #, c-format
 msgid "no such section: %s"
 msgstr "section inexistante : %s"
 
-#: builtin/count-objects.c:100
 msgid "print sizes in human readable format"
 msgstr "affiche les tailles dans un format humainement lisible"
 
-#: builtin/credential-cache--daemon.c:227
 #, c-format
 msgid ""
 "The permissions on your socket directory are too loose; other\n"
@@ -15244,72 +5332,57 @@ msgstr ""
 "\n"
 "    chmod 0700 %s"
 
-#: builtin/credential-cache--daemon.c:276
 msgid "print debugging messages to stderr"
 msgstr "afficher les messages de debug sur stderr"
 
-#: builtin/credential-cache--daemon.c:316
 msgid "credential-cache--daemon unavailable; no unix socket support"
 msgstr ""
 "credential-cache--daemon non disponible ; pas de gestion des sockets unix"
 
-#: builtin/credential-cache.c:180
 msgid "credential-cache unavailable; no unix socket support"
 msgstr "credential-cache non disponible ; pas de gestion des socket unix"
 
-#: builtin/credential-store.c:66
 #, c-format
 msgid "unable to get credential storage lock in %d ms"
 msgstr "impossible d'accéder au verrou de stockage d'identification en %d ms"
 
-#: builtin/describe.c:26
 msgid "git describe [<options>] [<commit-ish>...]"
 msgstr "git describe [<options>] <commit ou apparenté>*"
 
-#: builtin/describe.c:27
 msgid "git describe [<options>] --dirty"
 msgstr "git describe [<options>] --dirty"
 
-#: builtin/describe.c:63
 msgid "head"
 msgstr "tête"
 
-#: builtin/describe.c:63
 msgid "lightweight"
 msgstr "léger"
 
-#: builtin/describe.c:63
 msgid "annotated"
 msgstr "annoté"
 
-#: builtin/describe.c:277
 #, c-format
 msgid "annotated tag %s not available"
 msgstr "l'étiquette annotée %s n'est pas disponible"
 
-#: builtin/describe.c:281
 #, c-format
 msgid "tag '%s' is externally known as '%s'"
 msgstr "l'étiquette '%s' est connue à l'extérieur comme '%s'"
 
-#: builtin/describe.c:328
 #, c-format
 msgid "no tag exactly matches '%s'"
 msgstr "aucune étiquette ne correspond parfaitement à '%s'"
 
-#: builtin/describe.c:330
 #, c-format
 msgid "No exact match on refs or tags, searching to describe\n"
 msgstr ""
 "Pas de correspondance exacte sur des réfs ou des étiquettes, recherche par "
 "describe\n"
 
-#: builtin/describe.c:397
 #, c-format
 msgid "finished search at %s\n"
 msgstr "recherche terminée à %s\n"
 
-#: builtin/describe.c:424
 #, c-format
 msgid ""
 "No annotated tags can describe '%s'.\n"
@@ -15318,7 +5391,6 @@ msgstr ""
 "Aucune étiquette annotée ne peut décrire '%s'.\n"
 "Cependant, il existe des étiquettes non-annotées : essayez avec --tags."
 
-#: builtin/describe.c:428
 #, c-format
 msgid ""
 "No tags can describe '%s'.\n"
@@ -15327,12 +5399,10 @@ msgstr ""
 "Aucune étiquette ne peut décrire '%s'.\n"
 "Essayez --always, ou créez des étiquettes."
 
-#: builtin/describe.c:458
 #, c-format
 msgid "traversed %lu commits\n"
 msgstr "%lu commits parcourus\n"
 
-#: builtin/describe.c:461
 #, c-format
 msgid ""
 "more than %i tags found; listed %i most recent\n"
@@ -15342,152 +5412,119 @@ msgstr ""
 "affichées\n"
 "abandon de la recherche à %s\n"
 
-#: builtin/describe.c:529
 #, c-format
 msgid "describe %s\n"
 msgstr "décrire %s\n"
 
-#: builtin/describe.c:532
 #, c-format
 msgid "Not a valid object name %s"
 msgstr "%s n'est pas un nom d'objet valide"
 
-#: builtin/describe.c:540
 #, c-format
 msgid "%s is neither a commit nor blob"
 msgstr "%s n'est ni un commit ni un blob"
 
-#: builtin/describe.c:554
 msgid "find the tag that comes after the commit"
 msgstr "rechercher l'étiquette qui suit le commit"
 
-#: builtin/describe.c:555
 msgid "debug search strategy on stderr"
 msgstr "déboguer la stratégie de recherche sur stderr"
 
-#: builtin/describe.c:556
 msgid "use any ref"
 msgstr "utiliser n'importe quelle référence"
 
-#: builtin/describe.c:557
 msgid "use any tag, even unannotated"
 msgstr "utiliser n'importe quelle étiquette, même non-annotée"
 
-#: builtin/describe.c:558
 msgid "always use long format"
 msgstr "toujours utiliser le format long"
 
-#: builtin/describe.c:559
 msgid "only follow first parent"
 msgstr "ne suivre que le premier parent"
 
-#: builtin/describe.c:562
 msgid "only output exact matches"
 msgstr "n'afficher que les correspondances exactes"
 
-#: builtin/describe.c:564
 msgid "consider <n> most recent tags (default: 10)"
 msgstr ""
 "considérer uniquement les <n> étiquettes le plus récentes (défaut : 10)"
 
-#: builtin/describe.c:566
 msgid "only consider tags matching <pattern>"
 msgstr "ne considérer que les étiquettes correspondant à <motif>"
 
-#: builtin/describe.c:568
 msgid "do not consider tags matching <pattern>"
 msgstr "ne pas considérer les étiquettes correspondant à <motif>"
 
-#: builtin/describe.c:570 builtin/name-rev.c:595
 msgid "show abbreviated commit object as fallback"
 msgstr "afficher les objets commits abrégés en dernier recours"
 
-#: builtin/describe.c:571 builtin/describe.c:574
 msgid "mark"
 msgstr "marque"
 
-#: builtin/describe.c:572
 msgid "append <mark> on dirty working tree (default: \"-dirty\")"
 msgstr "ajouter <marque> si la copie de travail est sale (défaut : \"-dirty\")"
 
-#: builtin/describe.c:575
 msgid "append <mark> on broken working tree (default: \"-broken\")"
 msgstr ""
 "ajouter <marque> si la copie de travail est cassée (défaut : \"-broken\")"
 
-#: builtin/describe.c:622
 msgid "No names found, cannot describe anything."
 msgstr "Aucun nom trouvé, impossible de décrire quoi que ce soit."
 
-#: builtin/describe.c:673 builtin/describe.c:675
 #, c-format
 msgid "option '%s' and commit-ishes cannot be used together"
 msgstr ""
 "l'option '%s' et des commit-esques ne peuvent pas être utilisées ensemble"
 
-#: builtin/diff-tree.c:157
 msgid "--merge-base only works with two commits"
 msgstr "--merge-base ne fonctionne qu'avec deux commits"
 
-#: builtin/diff.c:92
 #, c-format
 msgid "'%s': not a regular file or symlink"
 msgstr "'%s' : n'est pas un fichier régulier ni un lien symbolique"
 
-#: builtin/diff.c:259
 #, c-format
 msgid "invalid option: %s"
 msgstr "option invalide : %s"
 
-#: builtin/diff.c:376
 #, c-format
 msgid "%s...%s: no merge base"
 msgstr "%s..%s: pas de base de fusion"
 
-#: builtin/diff.c:491
 msgid "Not a git repository"
 msgstr "Ce n'est pas un dépôt git"
 
-#: builtin/diff.c:537 builtin/grep.c:700
 #, c-format
 msgid "invalid object '%s' given."
 msgstr "objet spécifié '%s' invalide."
 
-#: builtin/diff.c:548
 #, c-format
 msgid "more than two blobs given: '%s'"
 msgstr "plus de deux blobs spécifiés : '%s'"
 
-#: builtin/diff.c:553
 #, c-format
 msgid "unhandled object '%s' given."
 msgstr "objet non géré '%s' spécifié."
 
-#: builtin/diff.c:587
 #, c-format
 msgid "%s...%s: multiple merge bases, using %s"
 msgstr "\"%s...%s\" : bases multiples de fusion, utilisation de %s"
 
-#: builtin/difftool.c:31
 msgid "git difftool [<options>] [<commit> [<commit>]] [--] [<path>...]"
 msgstr "git difftool [<options>] [<commit> [<commit>]] [--] [<chemin>...]"
 
-#: builtin/difftool.c:287
 #, c-format
 msgid "could not read symlink %s"
 msgstr "lecture du lien symbolique %s impossible"
 
-#: builtin/difftool.c:289
 #, c-format
 msgid "could not read symlink file %s"
 msgstr "impossible de lire le fichier symlink %s"
 
-#: builtin/difftool.c:297
 #, 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:421
 msgid ""
 "combined diff formats ('-c' and '--cc') are not supported in\n"
 "directory diff mode ('-d' and '--dir-diff')."
@@ -15495,58 +5532,49 @@ 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:626
 #, c-format
 msgid "both files modified: '%s' and '%s'."
 msgstr "les deux fichiers sont modifiés : '%s' et '%s'."
 
-#: builtin/difftool.c:628
 msgid "working tree file has been left."
 msgstr "le fichier dans l'arbre de travail a été laissé."
 
-#: builtin/difftool.c:639
+#, c-format
+msgid "could not copy '%s' to '%s'"
+msgstr "impossible de copier '%s' vers '%s'"
+
 #, c-format
 msgid "temporary files exist in '%s'."
 msgstr "des fichiers temporaires existent dans '%s'."
 
-#: builtin/difftool.c:640
 msgid "you may want to cleanup or recover these."
 msgstr "vous pourriez souhaiter les nettoyer ou les récupérer."
 
-#: builtin/difftool.c:645
 #, c-format
 msgid "failed: %d"
 msgstr "échec : %d"
 
-#: builtin/difftool.c:690
 msgid "use `diff.guitool` instead of `diff.tool`"
 msgstr "utiliser `diff.guitool` au lieu de `diff.tool`"
 
-#: builtin/difftool.c:692
 msgid "perform a full-directory diff"
 msgstr "réalise un diff de répertoire complet"
 
-#: builtin/difftool.c:694
 msgid "do not prompt before launching a diff tool"
 msgstr "ne pas confirmer avant de lancer l'outil de diff"
 
-#: builtin/difftool.c:699
 msgid "use symlinks in dir-diff mode"
 msgstr "utiliser les liens symboliques en mode de diff de répertoire"
 
-#: builtin/difftool.c:700
 msgid "tool"
 msgstr "outil"
 
-#: builtin/difftool.c:701
 msgid "use the specified diff tool"
 msgstr "utiliser l'outil de diff spécifié"
 
-#: builtin/difftool.c:703
 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:706
 msgid ""
 "make 'git-difftool' exit when an invoked diff tool returns a non-zero exit "
 "code"
@@ -15554,47 +5582,37 @@ msgstr ""
 "provoque la fin de 'git-difftool' si l'outil de diff invoqué renvoie un code "
 "de sortie non-nul"
 
-#: builtin/difftool.c:709
 msgid "specify a custom command for viewing diffs"
 msgstr "spécifier une commande personnalisée pour visualiser les différences"
 
-#: builtin/difftool.c:710
 msgid "passed to `diff`"
 msgstr "passé à `diff`"
 
-#: builtin/difftool.c:726
 msgid "difftool requires worktree or --no-index"
 msgstr "difftool exige un arbre de travail ou --no-index"
 
-#: builtin/difftool.c:745
 msgid "no <tool> given for --tool=<tool>"
 msgstr "pas d'<outil> spécifié pour --tool=<outil>"
 
-#: builtin/difftool.c:752
 msgid "no <cmd> given for --extcmd=<cmd>"
 msgstr "pas de <commande> spécifié pour --extcmd=<commande>"
 
-#: builtin/env--helper.c:6
 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:46
 msgid "default for git_env_*(...) to fall back on"
 msgstr "valeur par défaut pour git_env_*(...) en cas d'absence"
 
-#: builtin/env--helper.c:48
 msgid "be quiet only use git_env_*() value as exit code"
 msgstr ""
 "mode silencieux n'utilisant la valeur de git_env_*() que pour le code de "
 "sortie"
 
-#: builtin/env--helper.c:67
 #, c-format
 msgid "option `--default' expects a boolean value with `--type=bool`, not `%s`"
 msgstr ""
 "l'option `--default` attend une valeur booléenne avec `--type=bool`, pas `%s`"
 
-#: builtin/env--helper.c:82
 #, c-format
 msgid ""
 "option `--default' expects an unsigned long value with `--type=ulong`, not "
@@ -15603,258 +5621,199 @@ msgstr ""
 "l'option `--default` attend une valeur entier long non signé avec `--"
 "type=ulong`, pas `%s`"
 
-#: builtin/fast-export.c:29
 msgid "git fast-export [<rev-list-opts>]"
 msgstr "git fast-export [<options-de-liste-de-révisions>]"
 
-#: builtin/fast-export.c:843
 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:1152
 msgid "--anonymize-map token cannot be empty"
 msgstr "le jeton --anonymize-map ne peut pas être vide"
 
-#: builtin/fast-export.c:1171
 msgid "show progress after <n> objects"
 msgstr "afficher la progression après <n> objets"
 
-#: builtin/fast-export.c:1173
 msgid "select handling of signed tags"
 msgstr "sélectionner la gestion des étiquettes signées"
 
-#: builtin/fast-export.c:1176
 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:1179
 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:1182
 msgid "dump marks to this file"
 msgstr "enregistrer les marques dans ce fichier"
 
-#: builtin/fast-export.c:1184
 msgid "import marks from this file"
 msgstr "importer les marques depuis ce fichier"
 
-#: builtin/fast-export.c:1188
 msgid "import marks from this file if it exists"
 msgstr "importer les marques depuis ce fichier s'il existe"
 
-#: builtin/fast-export.c:1190
 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:1192
 msgid "output full tree for each commit"
 msgstr "afficher l'arbre complet pour chaque commit"
 
-#: builtin/fast-export.c:1194
 msgid "use the done feature to terminate the stream"
 msgstr "utiliser la fonction \"done\" pour terminer le flux"
 
-#: builtin/fast-export.c:1195
 msgid "skip output of blob data"
 msgstr "sauter l'affichage de données de blob"
 
-#: builtin/fast-export.c:1196 builtin/log.c:1860
 msgid "refspec"
 msgstr "spécificateur de référence"
 
-#: builtin/fast-export.c:1197
 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:1198
 msgid "anonymize output"
 msgstr "anonymise la sortie"
 
-#: builtin/fast-export.c:1199
 msgid "from:to"
 msgstr "depuis:vers"
 
-#: builtin/fast-export.c:1200
 msgid "convert <from> to <to> in anonymized output"
 msgstr "convertit <depuis> en <vers> dans la sortie anonymisée"
 
-#: builtin/fast-export.c:1203
 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:1205
 msgid "show original object ids of blobs/commits"
 msgstr "afficher les ids d'objet originaux des blobs/commits"
 
-#: builtin/fast-export.c:1207
 msgid "label tags with mark ids"
 msgstr "marquer les étiquettes avec des ids de marque"
 
-#: builtin/fast-import.c:3097
 #, c-format
 msgid "Missing from marks for submodule '%s'"
 msgstr "Champs from manquants pour le sous-module '%s'"
 
-#: builtin/fast-import.c:3099
 #, c-format
 msgid "Missing to marks for submodule '%s'"
 msgstr "Champs 'to' manquants pour le sous-module '%s'"
 
-#: builtin/fast-import.c:3234
 #, c-format
 msgid "Expected 'mark' command, got %s"
 msgstr "Commande 'mark' attendue, %s trouvé"
 
-#: builtin/fast-import.c:3239
 #, c-format
 msgid "Expected 'to' command, got %s"
 msgstr "Commande 'to' attendue, %s trouvé"
 
-#: builtin/fast-import.c:3331
 msgid "Expected format name:filename for submodule rewrite option"
 msgstr ""
 "Format attendu nom:<nom de fichier> pour l'option de réécriture de sous-"
 "module"
 
-#: builtin/fast-import.c:3386
 #, c-format
 msgid "feature '%s' forbidden in input without --allow-unsafe-features"
 msgstr ""
 "la fonctionnalité '%s' est interdite en entrée sans --allow-unsafe-features"
 
-#: builtin/fetch-pack.c:246
 #, c-format
 msgid "Lockfile created but not reported: %s"
 msgstr "Fichier verrou créé mais non reporté : %s"
 
-#: builtin/fetch.c:36
 msgid "git fetch [<options>] [<repository> [<refspec>...]]"
 msgstr "git fetch [<options>] [<dépôt> [<spécification-de-référence>...]]"
 
-#: builtin/fetch.c:37
 msgid "git fetch [<options>] <group>"
 msgstr "git fetch [<options>] <groupe>"
 
-#: builtin/fetch.c:38
 msgid "git fetch --multiple [<options>] [(<repository> | <group>)...]"
 msgstr "git fetch --multiple [<options>] [(<dépôt> | <groupe>)...]"
 
-#: builtin/fetch.c:39
 msgid "git fetch --all [<options>]"
 msgstr "git fetch --all [<options>]"
 
-#: builtin/fetch.c:124
 msgid "fetch.parallel cannot be negative"
 msgstr "fetch.parallel ne peut pas être négatif"
 
-#: builtin/fetch.c:147 builtin/pull.c:189
 msgid "fetch from all remotes"
 msgstr "récupérer depuis tous les dépôts distants"
 
-#: builtin/fetch.c:149 builtin/pull.c:249
 msgid "set upstream for git pull/fetch"
 msgstr "définir la branche amont pour git pull/fetch"
 
-#: builtin/fetch.c:151 builtin/pull.c:192
 msgid "append to .git/FETCH_HEAD instead of overwriting"
 msgstr "ajouter à .git/FETCH_HEAD au lieu de l'écraser"
 
-#: builtin/fetch.c:153
 msgid "use atomic transaction to update references"
 msgstr "utiliser une transaction atomique pour mettre à jour les références"
 
-#: builtin/fetch.c:155 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"
 
-#: builtin/fetch.c:156
 msgid "force overwrite of local reference"
 msgstr "forcer l'écrasement de la branche locale"
 
-#: builtin/fetch.c:158
 msgid "fetch from multiple remotes"
 msgstr "récupérer depuis plusieurs dépôts distants"
 
-#: builtin/fetch.c:160 builtin/pull.c:199
 msgid "fetch all tags and associated objects"
 msgstr "récupérer toutes les étiquettes et leurs objets associés"
 
-#: builtin/fetch.c:162
 msgid "do not fetch all tags (--no-tags)"
 msgstr "ne pas récupérer toutes les étiquettes (--no-tags)"
 
-#: builtin/fetch.c:164
 msgid "number of submodules fetched in parallel"
 msgstr "nombre de sous-modules récupérés en parallèle"
 
-#: builtin/fetch.c:166
 msgid "modify the refspec to place all refs within refs/prefetch/"
 msgstr ""
 "modifier le spécificateur de référence pour placer les références dans refs/"
 "prefetch/"
 
-#: builtin/fetch.c:168 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 "
 "dépôt distant"
 
-#: builtin/fetch.c:170
 msgid "prune local tags no longer on remote and clobber changed tags"
 msgstr ""
 "éliminer les étiquettes locales qui ont disparu du dépôt distant et qui "
 "encombrent les étiquettes modifiées"
 
-#: builtin/fetch.c:171 builtin/fetch.c:199 builtin/pull.c:123
 msgid "on-demand"
 msgstr "à la demande"
 
-#: builtin/fetch.c:172
 msgid "control recursive fetching of submodules"
 msgstr "contrôler la récupération récursive dans les sous-modules"
 
-#: builtin/fetch.c:177
 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:178 builtin/pull.c:210
 msgid "keep downloaded pack"
 msgstr "conserver le paquet téléchargé"
 
-#: builtin/fetch.c:180
 msgid "allow updating of HEAD ref"
 msgstr "permettre la mise à jour de la référence HEAD"
 
-#: builtin/fetch.c:183 builtin/fetch.c:189 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:185 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:191 builtin/pull.c:225
 msgid "convert to a complete repository"
 msgstr "convertir en un dépôt complet"
 
-#: builtin/fetch.c:194
 msgid "re-fetch without negotiating common commits"
 msgstr "re-récupérer sans négocier les commits communs"
 
-#: builtin/fetch.c:197
 msgid "prepend this to submodule path output"
 msgstr "préfixer ceci à la sortie du chemin du sous-module"
 
-#: builtin/fetch.c:200
 msgid ""
 "default for recursive fetching of submodules (lower priority than config "
 "files)"
@@ -15862,105 +5821,84 @@ msgstr ""
 "par défaut pour la récupération récursive de sous-modules (priorité plus "
 "basse que les fichiers de config)"
 
-#: builtin/fetch.c:204 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:205 builtin/pull.c:230
 msgid "refmap"
 msgstr "correspondance de référence"
 
-#: builtin/fetch.c:206 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:213 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"
 
-#: builtin/fetch.c:215
 msgid "do not fetch a packfile; instead, print ancestors of negotiation tips"
 msgstr ""
 "ne pas récupérer le fichier paquet ; à la place, afficher les ancêtres des "
 "sommets de négociation"
 
-#: builtin/fetch.c:218 builtin/fetch.c:220
 msgid "run 'maintenance --auto' after fetching"
 msgstr "lancer 'maintenance --auto' après la récupération"
 
-#: builtin/fetch.c:222 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 "
 "mises à jour"
 
-#: builtin/fetch.c:224
 msgid "write the commit-graph after fetching"
 msgstr "écrire le graphe de commits après le rapatriement"
 
-#: builtin/fetch.c:226
 msgid "accept refspecs from stdin"
 msgstr "lire les spécificateurs de référence depuis l'entrée standard"
 
-#: builtin/fetch.c:618
 msgid "couldn't find remote ref HEAD"
 msgstr "impossible de trouver la référence HEAD distante"
 
-#: builtin/fetch.c:893
 #, c-format
 msgid "object %s not found"
 msgstr "objet %s non trouvé"
 
-#: builtin/fetch.c:897
 msgid "[up to date]"
 msgstr "[à jour]"
 
-#: builtin/fetch.c:909 builtin/fetch.c:927 builtin/fetch.c:999
 msgid "[rejected]"
 msgstr "[rejeté]"
 
-#: builtin/fetch.c:911
 msgid "can't fetch in current branch"
 msgstr "impossible de récupérer dans la branche actuelle"
 
-#: builtin/fetch.c:912
 msgid "checked out in another worktree"
 msgstr "extrait dans un autre arbre de travail"
 
-#: builtin/fetch.c:922
 msgid "[tag update]"
 msgstr "[mise à jour de l'étiquette]"
 
-#: builtin/fetch.c:923 builtin/fetch.c:960 builtin/fetch.c:982
-#: builtin/fetch.c:994
 msgid "unable to update local ref"
 msgstr "impossible de mettre à jour la référence locale"
 
-#: builtin/fetch.c:927
 msgid "would clobber existing tag"
 msgstr "écraserait l'étiquette existante"
 
-#: builtin/fetch.c:949
 msgid "[new tag]"
 msgstr "[nouvelle étiquette]"
 
-#: builtin/fetch.c:952
 msgid "[new branch]"
 msgstr "[nouvelle branche]"
 
-#: builtin/fetch.c:955
 msgid "[new ref]"
 msgstr "[nouvelle référence]"
 
-#: builtin/fetch.c:994
 msgid "forced update"
 msgstr "mise à jour forcée"
 
-#: builtin/fetch.c:999
 msgid "non-fast-forward"
 msgstr "pas en avance rapide"
 
-#: builtin/fetch.c:1102
+#, c-format
+msgid "cannot open '%s'"
+msgstr "impossible d'ouvrir '%s'"
+
 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"
@@ -15970,7 +5908,6 @@ msgstr ""
 "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:1106
 #, c-format
 msgid ""
 "it took %.2f seconds to check forced updates; you can use\n"
@@ -15982,24 +5919,20 @@ msgstr ""
 "Vous pouvez utiliser '--no-show-forced-updates' ou lancer\n"
 "'git config fetch.showForcedUpdates false' pour éviter cette vérification\n"
 
-#: builtin/fetch.c:1136
 #, 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:1156
 #, 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:1259 builtin/fetch.c:1418
 #, c-format
 msgid "From %.*s\n"
 msgstr "Depuis %.*s\n"
 
-#: builtin/fetch.c:1269
 #, c-format
 msgid ""
 "some local refs could not be updated; try running\n"
@@ -16008,49 +5941,43 @@ msgstr ""
 "des références locales n'ont pas pu être mises à jour ; essayez de lancer\n"
 " 'git remote prune %s' pour supprimer des branches anciennes en conflit"
 
-#: builtin/fetch.c:1377
 #, c-format
 msgid "   (%s will become dangling)"
 msgstr "   (%s sera en suspens)"
 
-#: builtin/fetch.c:1378
 #, c-format
 msgid "   (%s has become dangling)"
 msgstr "   (%s est devenu en suspens)"
 
-#: builtin/fetch.c:1421
 msgid "[deleted]"
 msgstr "[supprimé]"
 
-#: builtin/fetch.c:1422 builtin/remote.c:1153
 msgid "(none)"
 msgstr "(aucun(e))"
 
-#: builtin/fetch.c:1446
 #, c-format
 msgid "refusing to fetch into branch '%s' checked out at '%s'"
 msgstr "refus de récupérer dans la branche '%s' extraite dans '%s'"
 
-#: builtin/fetch.c:1466
 #, 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:1469
 #, c-format
 msgid "option \"%s\" is ignored for %s\n"
 msgstr "l'option \"%s\" est ignorée pour %s\n"
 
-#: builtin/fetch.c:1496
+#, c-format
+msgid "%s is not a valid object"
+msgstr "%s n'est pas un objet valide"
+
 #, c-format
 msgid "the object %s does not exist"
 msgstr "l'objet %s n'existe pas"
 
-#: builtin/fetch.c:1748
 msgid "multiple branches detected, incompatible with --set-upstream"
 msgstr "branches multiples détectées, imcompatible avec --set-upstream"
 
-#: builtin/fetch.c:1760
 #, c-format
 msgid ""
 "could not set upstream of HEAD to '%s' from '%s' when it does not point to "
@@ -16059,19 +5986,15 @@ msgstr ""
 "impossible de régler la branche amont de HEAD à '%s' depuis '%s' qui ne "
 "pointe sur aucune branche."
 
-#: builtin/fetch.c:1773
 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:1775
 msgid "not setting upstream for a remote tag"
 msgstr "dépôt amont non défini pour l'étiquette distante"
 
-#: builtin/fetch.c:1777
 msgid "unknown branch type"
 msgstr "type de branche inconnu"
 
-#: builtin/fetch.c:1779
 msgid ""
 "no source branch found;\n"
 "you need to specify exactly one branch with the --set-upstream option"
@@ -16079,22 +6002,18 @@ msgstr ""
 "aucune branche source trouvée.\n"
 "Vous devez spécifier exactement une branche avec l'option --set-upstream"
 
-#: builtin/fetch.c:1904 builtin/fetch.c:1967
 #, c-format
 msgid "Fetching %s\n"
 msgstr "Récupération de %s\n"
 
-#: builtin/fetch.c:1914 builtin/fetch.c:1969
 #, c-format
 msgid "could not fetch %s"
 msgstr "impossible de récupérer %s"
 
-#: builtin/fetch.c:1926
 #, 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:2030
 msgid ""
 "no remote repository specified; please specify either a URL or a\n"
 "remote name from which new revisions should be fetched"
@@ -16102,50 +6021,39 @@ msgstr ""
 "Aucun dépôt distant spécifié. Veuillez spécifier une URL ou un nom\n"
 "distant depuis lesquels les nouvelles révisions devraient être récupérées"
 
-#: builtin/fetch.c:2066
 msgid "you need to specify a tag name"
 msgstr "Vous devez spécifier un nom d'étiquette"
 
-#: builtin/fetch.c:2156
 msgid "--negotiate-only needs one or more --negotiation-tip=*"
 msgstr "--negotiate-only nécessite au moins un --negotiation-tip=*"
 
-#: builtin/fetch.c:2160
 msgid "negative depth in --deepen is not supported"
 msgstr "une profondeur négative dans --deepen n'est pas supportée"
 
-#: builtin/fetch.c:2169
 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:2186
 msgid "fetch --all does not take a repository argument"
 msgstr "fetch --all n'accepte pas d'argument de dépôt"
 
-#: builtin/fetch.c:2188
 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:2197
 #, c-format
 msgid "no such remote or remote group: %s"
 msgstr "distant ou groupe distant inexistant : %s"
 
-#: builtin/fetch.c:2205
 msgid "fetching a group and specifying refspecs does not make sense"
 msgstr ""
 "la récupération d'un groupe avec des spécifications de référence n'a pas de "
 "sens"
 
-#: builtin/fetch.c:2221
 msgid "must supply remote when using --negotiate-only"
 msgstr "le distant doit être fourni lors de l'utilisation de --negotiate-only"
 
-#: builtin/fetch.c:2226
 msgid "protocol does not support --negotiate-only, exiting"
 msgstr "Le protocole ne prend pas en charge --negotiate-only, abandon"
 
-#: builtin/fetch.c:2246
 msgid ""
 "--filter can only be used with the remote configured in extensions."
 "partialclone"
@@ -16153,146 +6061,112 @@ msgstr ""
 "--filter ne peut être utilisé qu'avec le dépôt distant configuré dans "
 "extensions.partialclone"
 
-#: builtin/fetch.c:2250
 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:2254
 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"
 
-#: builtin/fmt-merge-msg.c:7
 msgid ""
 "git fmt-merge-msg [-m <message>] [--log[=<n>] | --no-log] [--file <file>]"
 msgstr ""
 "git fmt-merge-msg [-m <message>] [--log[=<n>] | --no-log] [--file <fichier>]"
 
-#: builtin/fmt-merge-msg.c:19
 msgid "populate log with at most <n> entries from shortlog"
 msgstr "peupler le journal avec au plus <n> éléments depuis le journal court"
 
-#: builtin/fmt-merge-msg.c:22
 msgid "alias for --log (deprecated)"
 msgstr "alias pour --log (obsolète)"
 
-#: builtin/fmt-merge-msg.c:25
 msgid "text"
 msgstr "texte"
 
-#: builtin/fmt-merge-msg.c:26
 msgid "use <text> as start of message"
 msgstr "utiliser <texte> comme début de message"
 
-#: builtin/fmt-merge-msg.c:28
 msgid "use <name> instead of the real target branch"
 msgstr "utiliser <nom> au lieu de la branche cible reélle"
 
-#: builtin/fmt-merge-msg.c:29
 msgid "file to read from"
 msgstr "fichier d'où lire"
 
-#: builtin/for-each-ref.c:10
 msgid "git for-each-ref [<options>] [<pattern>]"
 msgstr "git for-each-ref [<options>] [<motif>]"
 
-#: builtin/for-each-ref.c:11
 msgid "git for-each-ref [--points-at <object>]"
 msgstr "git for-each-ref [--points-at <objet>]"
 
-#: builtin/for-each-ref.c:12
 msgid "git for-each-ref [--merged [<commit>]] [--no-merged [<commit>]]"
 msgstr "git for-each-ref [--merged [<commit>]] [--no-merged [<commit>]]"
 
-#: 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>]]"
 
-#: builtin/for-each-ref.c:31
 msgid "quote placeholders suitably for shells"
 msgstr "échapper les champs réservés pour les interpréteurs de commandes"
 
-#: builtin/for-each-ref.c:33
 msgid "quote placeholders suitably for perl"
 msgstr "échapper les champs réservés pour perl"
 
-#: builtin/for-each-ref.c:35
 msgid "quote placeholders suitably for python"
 msgstr "échapper les champs réservés pour python"
 
-#: builtin/for-each-ref.c:37
 msgid "quote placeholders suitably for Tcl"
 msgstr "échapper les champs réservés pour compatibilité avec Tcl"
 
-#: builtin/for-each-ref.c:40
 msgid "show only <n> matched refs"
 msgstr "n'afficher que <n> références correspondant"
 
-#: builtin/for-each-ref.c:42 builtin/tag.c:482
 msgid "respect format colors"
 msgstr "respecter les couleurs de formatage"
 
-#: builtin/for-each-ref.c:45
 msgid "print only refs which points at the given object"
 msgstr "afficher seulement les références pointant sur l'objet"
 
-#: builtin/for-each-ref.c:47
 msgid "print only refs that are merged"
 msgstr "afficher seulement les références qui sont fusionnées"
 
-#: builtin/for-each-ref.c:48
 msgid "print only refs that are not merged"
 msgstr "afficher seulement les références qui ne sont pas fusionnées"
 
-#: builtin/for-each-ref.c:49
 msgid "print only refs which contain the commit"
 msgstr "afficher seulement les références qui contiennent le commit"
 
-#: builtin/for-each-ref.c:50
 msgid "print only refs which don't contain the commit"
 msgstr "afficher seulement les références qui ne contiennent pas le commit"
 
-#: builtin/for-each-repo.c:9
 msgid "git for-each-repo --config=<config> <command-args>"
 msgstr "git for-each-repo --config=<config> <arguments-de-commande>"
 
-#: builtin/for-each-repo.c:34
 msgid "config"
 msgstr "config"
 
-#: builtin/for-each-repo.c:35
 msgid "config key storing a list of repository paths"
 msgstr "clé de config qui stocke la liste des chemins de dépôts"
 
-#: builtin/for-each-repo.c:43
 msgid "missing --config=<config>"
 msgstr "--config=<config> manquant"
 
-#: builtin/fsck.c:69 builtin/fsck.c:128 builtin/fsck.c:129
 msgid "unknown"
 msgstr "inconnu"
 
 #. 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 "erreur dans l'objet %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 "avertissement dans l'objet %s %s : %s"
 
-#: builtin/fsck.c:124 builtin/fsck.c:127
 #, c-format
 msgid "broken link from %7s %s"
 msgstr "lien cassé dans l'objet %7s %s"
 
-#: builtin/fsck.c:136
 msgid "wrong object type in link"
 msgstr "type d'objet inconnu dans le lien"
 
-#: builtin/fsck.c:152
 #, c-format
 msgid ""
 "broken link from %7s %s\n"
@@ -16301,358 +6175,297 @@ msgstr ""
 "lien cassé depuis %7s %s\n"
 "             vers %7s %s"
 
-#: builtin/fsck.c:264
+msgid "Checking connectivity"
+msgstr "Vérification de la connectivité"
+
 #, c-format
 msgid "missing %s %s"
 msgstr "objet %s manquant %s"
 
-#: builtin/fsck.c:291
 #, c-format
 msgid "unreachable %s %s"
 msgstr "objet %s inatteignable %s"
 
-#: builtin/fsck.c:311
 #, c-format
 msgid "dangling %s %s"
 msgstr "objet %s fantôme %s"
 
-#: builtin/fsck.c:321
 msgid "could not create lost-found"
 msgstr "impossible de créer le fichier lost-found"
 
-#: builtin/fsck.c:332
+#, c-format
+msgid "could not write '%s'"
+msgstr "impossible d'écrire '%s'"
+
 #, c-format
 msgid "could not finish '%s'"
 msgstr "impossible de finir '%s'"
 
-#: builtin/fsck.c:349
 #, c-format
 msgid "Checking %s"
 msgstr "Vérification de l'objet %s"
 
-#: builtin/fsck.c:387
 #, c-format
 msgid "Checking connectivity (%d objects)"
 msgstr "Vérification de la connectivité (%d objets)"
 
-#: builtin/fsck.c:406
 #, c-format
 msgid "Checking %s %s"
 msgstr "Vérification de l'objet %s %s"
 
-#: builtin/fsck.c:411
 msgid "broken links"
 msgstr "liens cassés"
 
-#: builtin/fsck.c:420
 #, c-format
 msgid "root %s"
 msgstr "racine %s"
 
-#: builtin/fsck.c:428
 #, c-format
 msgid "tagged %s %s (%s) in %s"
 msgstr "étiquetage de l'objet %s %s (%s) dans %s"
 
-#: builtin/fsck.c:457
 #, c-format
 msgid "%s: object corrupt or missing"
 msgstr "%s : objet corrompu ou manquant"
 
-#: builtin/fsck.c:482
 #, c-format
 msgid "%s: invalid reflog entry %s"
 msgstr "%s : entrée %s de journal de références invalide"
 
-#: builtin/fsck.c:496
 #, c-format
 msgid "Checking reflog %s->%s"
 msgstr "Vérification du journal de réferences %s-> %s"
 
-#: builtin/fsck.c:530
 #, c-format
 msgid "%s: invalid sha1 pointer %s"
 msgstr "%s : pointeur de sha1 invalide %s"
 
-#: builtin/fsck.c:537
 #, c-format
 msgid "%s: not a commit"
 msgstr "l'objet %s n'est pas un commit"
 
-#: builtin/fsck.c:591
 msgid "notice: No default references"
 msgstr "note : pas de référence par défaut"
 
-#: 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: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:645
 #, c-format
 msgid "%s: object could not be parsed: %s"
 msgstr "%s : impossible d'analyser : %s"
 
-#: builtin/fsck.c:665
 #, c-format
 msgid "bad sha1 file: %s"
 msgstr "mauvais fichier de sha1 : %s"
 
-#: builtin/fsck.c:686
 msgid "Checking object directory"
 msgstr "Vérification du répertoire d'objet"
 
-#: builtin/fsck.c:689
 msgid "Checking object directories"
 msgstr "Vérification des répertoires d'objet"
 
-#: builtin/fsck.c:705
 #, c-format
 msgid "Checking %s link"
 msgstr "Vérification du lien %s"
 
-#: builtin/fsck.c:710 builtin/index-pack.c:862
 #, c-format
 msgid "invalid %s"
 msgstr "%s invalide"
 
-#: builtin/fsck.c:717
 #, c-format
 msgid "%s points to something strange (%s)"
 msgstr "%s pointe sur quelque chose bizarre (%s)"
 
-#: builtin/fsck.c:723
 #, c-format
 msgid "%s: detached HEAD points at nothing"
 msgstr "%s : la HEAD détachée ne pointe sur rien"
 
-#: builtin/fsck.c:727
 #, 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:739
 msgid "Checking cache tree"
 msgstr "Vérification de l'arbre cache"
 
-#: builtin/fsck.c:744
 #, c-format
 msgid "%s: invalid sha1 pointer in cache-tree"
 msgstr "%s : pointer sha1 invalide dans l'arbre de cache"
 
-#: builtin/fsck.c:753
 msgid "non-tree in cache-tree"
 msgstr "non-arbre dans l'arbre de cache"
 
-#: builtin/fsck.c:784
 msgid "git fsck [<options>] [<object>...]"
 msgstr "git fsck [<options>] [<objet>...]"
 
-#: builtin/fsck.c:790
 msgid "show unreachable objects"
 msgstr "afficher les objets inaccessibles"
 
-#: builtin/fsck.c:791
 msgid "show dangling objects"
 msgstr "afficher les objets en suspens"
 
-#: builtin/fsck.c:792
 msgid "report tags"
 msgstr "afficher les étiquettes"
 
-#: builtin/fsck.c:793
 msgid "report root nodes"
 msgstr "signaler les nœuds racines"
 
-#: builtin/fsck.c:794
 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:795
 msgid "make reflogs head nodes (default)"
 msgstr "considérer les reflogs comme nœuds tête (par défaut)"
 
-#: builtin/fsck.c:796
 msgid "also consider packs and alternate objects"
 msgstr "inspecter aussi les objets pack et alternatifs"
 
-#: builtin/fsck.c:797
 msgid "check only connectivity"
 msgstr "ne vérifier que la connectivité"
 
-#: builtin/fsck.c:798 builtin/mktag.c:75
 msgid "enable more strict checking"
 msgstr "activer une vérification plus strict"
 
-#: builtin/fsck.c:800
 msgid "write dangling objects in .git/lost-found"
 msgstr "écrire les objets en suspens dans .git/lost-found"
 
-#: builtin/fsck.c:801 builtin/prune.c:146
 msgid "show progress"
 msgstr "afficher la progression"
 
-#: builtin/fsck.c:802
 msgid "show verbose names for reachable objects"
 msgstr "afficher les noms étendus pour les objets inaccessibles"
 
-#: builtin/fsck.c:862 builtin/index-pack.c:261
 msgid "Checking objects"
 msgstr "Vérification des objets"
 
-#: builtin/fsck.c:890
 #, c-format
 msgid "%s: object missing"
 msgstr "%s : objet manquant"
 
-#: builtin/fsck.c:901
 #, c-format
 msgid "invalid parameter: expected sha1, got '%s'"
 msgstr "paramètre invalide : sha-1 attendu, '%s' trouvé"
 
-#: builtin/fsmonitor--daemon.c:13
 msgid "git fsmonitor--daemon start [<options>]"
 msgstr "git fsmonitor--daemon start [<options>]"
 
-#: builtin/fsmonitor--daemon.c:14
 msgid "git fsmonitor--daemon run [<options>]"
 msgstr "git fsmonitor--daemon run [<options>]"
 
-#: builtin/fsmonitor--daemon.c:15
 msgid "git fsmonitor--daemon stop"
 msgstr "git fsmonitor--daemon stop"
 
-#: builtin/fsmonitor--daemon.c:16
 msgid "git fsmonitor--daemon status"
 msgstr "git fsmonitor--daemon status"
 
-#: builtin/fsmonitor--daemon.c:38 builtin/fsmonitor--daemon.c:47
 #, c-format
 msgid "value of '%s' out of range: %d"
 msgstr "valeur de '%s' hors de gamme : %d"
 
-#: builtin/fsmonitor--daemon.c:57
 #, c-format
 msgid "value of '%s' not bool or int: %d"
 msgstr "la valeur de '%s' n'est ni bool ni int : %d"
 
-#: builtin/fsmonitor--daemon.c:99
 #, c-format
 msgid "fsmonitor-daemon is watching '%s'\n"
 msgstr "fsmonitor-daemon surveille '%s'\n"
 
-#: builtin/fsmonitor--daemon.c:104
 #, c-format
 msgid "fsmonitor-daemon is not watching '%s'\n"
 msgstr "fsmonitor-daemon ne surveille pas '%s'\n"
 
-#: builtin/fsmonitor--daemon.c:170
 #, c-format
 msgid "could not create fsmonitor cookie '%s'"
 msgstr "impossible de créer le cookie fsmonitor '%s'"
 
-#: builtin/fsmonitor--daemon.c:753
 #, c-format
 msgid "fsmonitor: cookie_result '%d' != SEEN"
 msgstr "fsmonitor: cookie_result '%d' != SEEN"
 
-#: builtin/fsmonitor--daemon.c:1187
 #, c-format
 msgid "could not start IPC thread pool on '%s'"
 msgstr "impossible de démarrer le stock de fils IPC sur '%s'"
 
-#: builtin/fsmonitor--daemon.c:1199
 msgid "could not start fsmonitor listener thread"
 msgstr "impossible de démarrer le fil d'écoute fsmonitor"
 
-#: builtin/fsmonitor--daemon.c:1297
+msgid "could not start fsmonitor health thread"
+msgstr "impossible de démarrer le fil de santé fsmonitor"
+
 msgid "could not initialize listener thread"
 msgstr "impossible de démarrer le fil d'écoute"
 
-#: builtin/fsmonitor--daemon.c:1328 builtin/fsmonitor--daemon.c:1383
+msgid "could not initialize health thread"
+msgstr "impossible de démarrer le fil de santé"
+
+#, c-format
+msgid "could not cd home '%s'"
+msgstr "impossible de changer de répertoire à la maison '%s'"
+
 #, c-format
 msgid "fsmonitor--daemon is already running '%s'"
 msgstr "fsmonitor--daemon exécute déjà '%s'"
 
-#: builtin/fsmonitor--daemon.c:1332
 #, c-format
 msgid "running fsmonitor-daemon in '%s'\n"
 msgstr "lancement du fil fsmonitor-daemon dans '%s'\n"
 
-#: builtin/fsmonitor--daemon.c:1387
 #, c-format
 msgid "starting fsmonitor-daemon in '%s'\n"
 msgstr "démarrer fsmonitor-daemon dans '%s'\n"
 
-#: builtin/fsmonitor--daemon.c:1413
 msgid "daemon failed to start"
 msgstr "échec du démarrage du daemon"
 
-#: builtin/fsmonitor--daemon.c:1416
 msgid "daemon not online yet"
 msgstr "le daemon n'est pas encore en ligne"
 
-#: builtin/fsmonitor--daemon.c:1419
 msgid "daemon terminated"
 msgstr "le daemon s'est terminé"
 
-#: builtin/fsmonitor--daemon.c:1429
 msgid "detach from console"
 msgstr "détacher de la console"
 
-#: builtin/fsmonitor--daemon.c:1432
 msgid "use <n> ipc worker threads"
 msgstr "utiliser <n> fils de travail ipc"
 
-#: builtin/fsmonitor--daemon.c:1435
 msgid "max seconds to wait for background daemon startup"
 msgstr "nombre max de secondes à attendre que le daemon démarre"
 
-#: builtin/fsmonitor--daemon.c:1449
 #, c-format
 msgid "invalid 'ipc-threads' value (%d)"
 msgstr "valeur invalide de 'ipc-threads' (%d)"
 
-#: builtin/fsmonitor--daemon.c:1464
 #, c-format
 msgid "Unhandled subcommand '%s'"
 msgstr "Sous-commande non-gérée '%s'"
 
-#: builtin/fsmonitor--daemon.c:1477
 msgid "fsmonitor--daemon not supported on this platform"
 msgstr "fsmonitor--daemon non géré sur cette plateforme"
 
-#: builtin/gc.c:39
 msgid "git gc [<options>]"
 msgstr "git gc [<options>]"
 
-#: builtin/gc.c:93
 #, c-format
 msgid "Failed to fstat %s: %s"
 msgstr "Échec du stat de %s : %s"
 
-#: builtin/gc.c:129
 #, c-format
 msgid "failed to parse '%s' value '%s'"
 msgstr "échec de l'analyse de '%s' valeur '%s'"
 
-#: builtin/gc.c:488 builtin/init-db.c:57
 #, c-format
 msgid "cannot stat '%s'"
 msgstr "impossible de faire un stat de '%s'"
 
-#: builtin/gc.c:504
 #, c-format
 msgid ""
 "The last gc run reported the following. Please correct the root cause\n"
@@ -16668,56 +6481,48 @@ msgstr ""
 "\n"
 "%s"
 
-#: builtin/gc.c:552
 msgid "prune unreferenced objects"
 msgstr "éliminer les objets non référencés"
 
-#: builtin/gc.c:554
+msgid "pack unreferenced objects separately"
+msgstr "empaqueter les objets non référencés séparément"
+
 msgid "be more thorough (increased runtime)"
 msgstr "être plus consciencieux (durée de traitement allongée)"
 
-#: builtin/gc.c:555
 msgid "enable auto-gc mode"
 msgstr "activer le mode auto-gc"
 
-#: builtin/gc.c:558
 msgid "force running gc even if there may be another gc running"
 msgstr ""
 "forcer le lancement du ramasse-miettes même si un autre ramasse-miettes "
 "tourne déjà"
 
-#: builtin/gc.c:561
 msgid "repack all other packs except the largest pack"
 msgstr "recompacter tous les autres paquets excepté le plus gros paquet"
 
-#: builtin/gc.c:577
 #, c-format
-msgid "failed to parse gc.logexpiry value %s"
-msgstr "impossible d'analyser gc.logexpiry %s"
+msgid "failed to parse gc.logExpiry value %s"
+msgstr "impossible d'analyser gc.logExpiry %s"
 
-#: builtin/gc.c:588
 #, c-format
 msgid "failed to parse prune expiry value %s"
 msgstr "impossible d'analyser la valeur d'expiration d'élagage %s"
 
-#: builtin/gc.c:608
 #, c-format
 msgid "Auto packing the repository in background for optimum performance.\n"
 msgstr ""
 "Compression automatique du dépôt en tâche de fond pour optimiser les "
 "performances.\n"
 
-#: builtin/gc.c:610
 #, c-format
 msgid "Auto packing the repository for optimum performance.\n"
 msgstr "Compression du dépôt pour optimiser les performances.\n"
 
-#: builtin/gc.c:611
 #, c-format
 msgid "See \"git help gc\" for manual housekeeping.\n"
 msgstr "Voir \"git help gc\" pour toute information sur le nettoyage manuel.\n"
 
-#: builtin/gc.c:652
 #, c-format
 msgid ""
 "gc is already running on machine '%s' pid %<PRIuMAX> (use --force if not)"
@@ -16725,494 +6530,386 @@ msgstr ""
 "un ramasse-miettes est déjà en cours sur la machine '%s' pid %<PRIuMAX> "
 "(utilisez --force si ce n'est pas le cas)"
 
-#: builtin/gc.c:707
 msgid ""
 "There are too many unreachable loose objects; run 'git prune' to remove them."
 msgstr ""
 "Il y a trop d'objets seuls inaccessibles ; lancez 'git prune' pour les "
 "supprimer."
 
-#: builtin/gc.c:717
 msgid ""
 "git maintenance run [--auto] [--[no-]quiet] [--task=<task>] [--schedule]"
 msgstr ""
 "git maintenance run [--auto] [--[no-]quiet] [--task=<tâche>] [--schedule]"
 
-#: builtin/gc.c:747
 msgid "--no-schedule is not allowed"
 msgstr "--no-schedule n'est pas accepté"
 
-#: builtin/gc.c:752
 #, c-format
 msgid "unrecognized --schedule argument '%s'"
 msgstr "argument de --schedule non reconnu, '%s'"
 
-#: builtin/gc.c:870
 msgid "failed to write commit-graph"
 msgstr "échec de l'écriture du graphe de commits"
 
-#: builtin/gc.c:906
 msgid "failed to prefetch remotes"
 msgstr "échec de la pré-récupération des distants"
 
-#: builtin/gc.c:1022
 msgid "failed to start 'git pack-objects' process"
 msgstr "impossible de démarrer le processus 'git pack-objects'"
 
-#: builtin/gc.c:1039
 msgid "failed to finish 'git pack-objects' process"
 msgstr "impossible de finir le processus 'git pack-objects'"
 
-#: builtin/gc.c:1090
 msgid "failed to write multi-pack-index"
 msgstr "échec de l'écriture de l'index de multi-paquet"
 
-#: builtin/gc.c:1106
 msgid "'git multi-pack-index expire' failed"
 msgstr "échec de 'git multi-pack-index expire'"
 
-#: builtin/gc.c:1165
 msgid "'git multi-pack-index repack' failed"
 msgstr "échec de 'git multi-pack-index repack'"
 
-#: builtin/gc.c:1174
 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:1278
 #, c-format
 msgid "lock file '%s' exists, skipping maintenance"
 msgstr "le fichier verrou '%s' existe, pas de maintenance"
 
-#: builtin/gc.c:1308
 #, c-format
 msgid "task '%s' failed"
 msgstr "échec de la tâche '%s'"
 
-#: builtin/gc.c:1390
 #, c-format
 msgid "'%s' is not a valid task"
 msgstr "'%s' n'est pas une tâche valide"
 
-#: builtin/gc.c:1395
 #, 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:1410
 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:1411
 msgid "frequency"
 msgstr "fréquence"
 
-#: builtin/gc.c:1412
 msgid "run tasks based on frequency"
 msgstr "lancer les tâches selon une fréquence"
 
-#: builtin/gc.c:1415
 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:1416
 msgid "task"
 msgstr "tâche"
 
-#: builtin/gc.c:1417
 msgid "run a specific task"
 msgstr "lancer une tâche spécifique"
 
-#: builtin/gc.c:1434
 msgid "use at most one of --auto and --schedule=<frequency>"
 msgstr "--auto et --schedule=<fréquence> sont mutuellement exclusifs"
 
-#: builtin/gc.c:1477
 msgid "failed to run 'git config'"
 msgstr "échec du lancement de 'git config'"
 
-#: builtin/gc.c:1629
 #, c-format
 msgid "failed to expand path '%s'"
 msgstr "impossible d'étendre le chemin '%s'"
 
-#: builtin/gc.c:1656 builtin/gc.c:1694
 msgid "failed to start launchctl"
 msgstr "échec de démarrage de launchctl"
 
-#: builtin/gc.c:1769 builtin/gc.c:2237
 #, c-format
 msgid "failed to create directories for '%s'"
 msgstr "échec de la création des répertoires pour '%s'"
 
-#: builtin/gc.c:1796
 #, c-format
 msgid "failed to bootstrap service %s"
 msgstr "échec de l'amorçage du service %s"
 
-#: builtin/gc.c:1889
 msgid "failed to create temp xml file"
 msgstr "échec de création du fichier temporaire xml"
 
-#: builtin/gc.c:1979
 msgid "failed to start schtasks"
 msgstr "échec du démarrage de schtasks"
 
-#: builtin/gc.c:2063
 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:2080
 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:2084
 msgid "failed to open stdin of 'crontab'"
 msgstr "échec à l'ouverture de stdin de 'crontab'"
 
-#: builtin/gc.c:2126
 msgid "'crontab' died"
 msgstr "'crontab' est mort"
 
-#: builtin/gc.c:2191
 msgid "failed to start systemctl"
 msgstr "échec du démarrage de systemctl"
 
-#: builtin/gc.c:2201
 msgid "failed to run systemctl"
 msgstr "échec pour lancer systemctl"
 
-#: builtin/gc.c:2210 builtin/gc.c:2215 builtin/worktree.c:63
-#: builtin/worktree.c:1024
 #, c-format
 msgid "failed to delete '%s'"
 msgstr "échec de la suppression de '%s'"
 
-#: builtin/gc.c:2395
+#, c-format
+msgid "failed to flush '%s'"
+msgstr "échec du flush de '%s'"
+
 #, c-format
 msgid "unrecognized --scheduler argument '%s'"
 msgstr "argument '%s' de --scheduler non reconnu"
 
-#: builtin/gc.c:2420
 msgid "neither systemd timers nor crontab are available"
 msgstr "ni les minuteurs systemd ni crontab ne sont disponibles"
 
-#: builtin/gc.c:2435
 #, c-format
 msgid "%s scheduler is not available"
 msgstr "le planificateur %s n'est pas disponible"
 
-#: builtin/gc.c:2449
 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:2471
 msgid "git maintenance start [--scheduler=<scheduler>]"
 msgstr "git maintenance start [--scheduler=<planificateur>]"
 
-#: builtin/gc.c:2480
 msgid "scheduler"
 msgstr "planificateur"
 
-#: builtin/gc.c:2481
 msgid "scheduler to trigger git maintenance run"
 msgstr "planificateur qui lancera les maintenances git"
 
-#: builtin/gc.c:2495
 msgid "failed to add repo to global config"
 msgstr "échec de l'ajout du dépôt à la config globale"
 
-#: builtin/gc.c:2504
 msgid "git maintenance <subcommand> [<options>]"
 msgstr "git maintenance <subcommand> [<options>]"
 
-#: builtin/gc.c:2523
 #, c-format
 msgid "invalid subcommand: %s"
 msgstr "sous-commande invalide : %s"
 
-#: builtin/grep.c:32
 msgid "git grep [<options>] [-e] <pattern> [<rev>...] [[--] <path>...]"
 msgstr "git grep [<options>] [-e] <motif> [<révision>...] [[--] <chemin>...]"
 
-#: builtin/grep.c:241
 #, c-format
 msgid "grep: failed to create thread: %s"
 msgstr "grep : échec de création du fil: %s"
 
-#: builtin/grep.c:295
 #, c-format
 msgid "invalid number of threads specified (%d) for %s"
 msgstr "nombre de fils spécifié invalide (%d) pour %s"
 
+#. #-#-#-#-#  grep.c.po  #-#-#-#-#
 #. TRANSLATORS: %s is the configuration
 #. variable for tweaking threads, currently
 #. grep.threads
 #.
-#: builtin/grep.c:303 builtin/index-pack.c:1587 builtin/index-pack.c:1791
-#: builtin/pack-objects.c:3150
 #, c-format
 msgid "no threads support, ignoring %s"
 msgstr "pas de support des fils, ignore %s"
 
-#: builtin/grep.c:490 builtin/grep.c:619 builtin/grep.c:659
 #, c-format
 msgid "unable to read tree (%s)"
 msgstr "impossible de lire l'arbre (%s)"
 
-#: builtin/grep.c:674
 #, 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:754
 #, c-format
 msgid "switch `%c' expects a numerical value"
 msgstr "l'option '%c' attend une valeur numérique"
 
-#: builtin/grep.c:852
 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:854
 msgid "find in contents not managed by git"
 msgstr "rechercher dans les contenus non gérés par git"
 
-#: builtin/grep.c:856
 msgid "search in both tracked and untracked files"
 msgstr "rechercher dans les fichiers suivis et non-suivis"
 
-#: builtin/grep.c:858
 msgid "ignore files specified via '.gitignore'"
 msgstr "ignorer les fichiers spécifiés via '.gitignore'"
 
-#: builtin/grep.c:860
 msgid "recursively search in each submodule"
 msgstr "rechercher récursivement dans chaque sous-module"
 
-#: builtin/grep.c:863
 msgid "show non-matching lines"
 msgstr "afficher les lignes qui ne correspondent pas"
 
-#: builtin/grep.c:865
 msgid "case insensitive matching"
 msgstr "correspondance insensible à la casse"
 
-#: builtin/grep.c:867
 msgid "match patterns only at word boundaries"
 msgstr "rechercher les motifs aux séparateurs de mots"
 
-#: builtin/grep.c:869
 msgid "process binary files as text"
 msgstr "traiter les fichiers binaires comme texte"
 
-#: builtin/grep.c:871
 msgid "don't match patterns in binary files"
 msgstr "ne pas chercher les motifs dans les fichiers binaires"
 
-#: builtin/grep.c:874
 msgid "process binary files with textconv filters"
 msgstr "traiter les fichiers binaires avec les filtres textconv"
 
-#: builtin/grep.c:876
 msgid "search in subdirectories (default)"
 msgstr "rechercher dans les sous-répertoires (défaut)"
 
-#: builtin/grep.c:878
 msgid "descend at most <depth> levels"
 msgstr "descendre au plus de <profondeur> dans l'arborescence"
 
-#: builtin/grep.c:882
 msgid "use extended POSIX regular expressions"
 msgstr "utiliser des expressions régulières étendues POSIX"
 
-#: builtin/grep.c:885
 msgid "use basic POSIX regular expressions (default)"
 msgstr "utiliser des expressions régulières basiques POSIX (par défaut)"
 
-#: builtin/grep.c:888
 msgid "interpret patterns as fixed strings"
 msgstr "interpréter les motifs comme de chaînes fixes"
 
-#: builtin/grep.c:891
 msgid "use Perl-compatible regular expressions"
 msgstr "utiliser des expressions régulières compatibles avec Perl"
 
-#: builtin/grep.c:894
 msgid "show line numbers"
 msgstr "afficher les numéros de ligne"
 
-#: builtin/grep.c:895
 msgid "show column number of first match"
 msgstr "afficher le numéro de colonne de la première correspondance"
 
-#: builtin/grep.c:896
 msgid "don't show filenames"
 msgstr "ne pas pas afficher les noms de fichier"
 
-#: builtin/grep.c:897
 msgid "show filenames"
 msgstr "afficher les noms de fichier"
 
-#: builtin/grep.c:899
 msgid "show filenames relative to top directory"
 msgstr "afficher les noms de fichiers relativement au répertoire de base"
 
-#: builtin/grep.c:901
 msgid "show only filenames instead of matching lines"
 msgstr "n'afficher que les noms de fichiers au lieu des lignes correspondant"
 
-#: builtin/grep.c:903
 msgid "synonym for --files-with-matches"
 msgstr "synonyme pour --files-with-matches"
 
-#: builtin/grep.c:906
 msgid "show only the names of files without match"
 msgstr "n'afficher que les noms des fichiers sans correspondance"
 
-#: builtin/grep.c:908
 msgid "print NUL after filenames"
 msgstr "imprimer une caractère NUL après le noms de fichier"
 
-#: builtin/grep.c:911
 msgid "show only matching parts of a line"
 msgstr "n'afficher que les parties correspondantes d'une ligne"
 
-#: builtin/grep.c:913
 msgid "show the number of matches instead of matching lines"
 msgstr "afficher le nombre de correspondances au lieu des lignes correspondant"
 
-#: builtin/grep.c:914
 msgid "highlight matches"
 msgstr "mettre en évidence les correspondances"
 
-#: builtin/grep.c:916
 msgid "print empty line between matches from different files"
 msgstr ""
 "imprimer une ligne vide entre les correspondances de fichiers différents"
 
-#: builtin/grep.c:918
 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:921
 msgid "show <n> context lines before and after matches"
 msgstr "afficher <n> lignes de contexte avant et après les correspondances"
 
-#: builtin/grep.c:924
 msgid "show <n> context lines before matches"
 msgstr "afficher <n> lignes de contexte avant les correspondances"
 
-#: builtin/grep.c:926
 msgid "show <n> context lines after matches"
 msgstr "afficher <n> lignes de contexte après les correspondances"
 
-#: builtin/grep.c:928
 msgid "use <n> worker threads"
 msgstr "utiliser <n> fils de travail"
 
-#: builtin/grep.c:929
 msgid "shortcut for -C NUM"
 msgstr "raccourci pour -C NUM"
 
-#: builtin/grep.c:932
 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:934
 msgid "show the surrounding function"
 msgstr "afficher la fonction contenante"
 
-#: builtin/grep.c:937
 msgid "read patterns from file"
 msgstr "lire les motifs depuis fichier"
 
-#: builtin/grep.c:939
 msgid "match <pattern>"
 msgstr "rechercher <motif>"
 
-#: builtin/grep.c:941
 msgid "combine patterns specified with -e"
 msgstr "combiner les motifs spécifiés par -e"
 
-#: builtin/grep.c:953
 msgid "indicate hit with exit status without output"
 msgstr ""
 "indiquer des correspondances avec le code de sortie mais sans rien afficher"
 
-#: builtin/grep.c:955
 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:958
 msgid "pager"
 msgstr "pagineur"
 
-#: builtin/grep.c:958
 msgid "show matching files in the pager"
 msgstr "afficher les fichiers correspondant dans le pagineur"
 
-#: builtin/grep.c:962
 msgid "allow calling of grep(1) (ignored by this build)"
 msgstr "permettre l'appel de grep(1) (ignoré par ce build)"
 
-#: builtin/grep.c:1028
 msgid "no pattern given"
 msgstr "aucun motif fourni"
 
-#: builtin/grep.c:1064
 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:1072
 #, c-format
 msgid "unable to resolve revision: %s"
 msgstr "impossible de résoudre la révision : %s"
 
-#: builtin/grep.c:1102
 msgid "--untracked not supported with --recurse-submodules"
 msgstr "--untracked non supportée avec --recurse-submodules"
 
-#: builtin/grep.c:1106
 msgid "invalid option combination, ignoring --threads"
 msgstr "option de combinaison invalide, ignore --threads"
 
-#: builtin/grep.c:1109 builtin/pack-objects.c:4084
 msgid "no threads support, ignoring --threads"
 msgstr "pas de support des fils, ignore --threads"
 
-#: builtin/grep.c:1112 builtin/index-pack.c:1584 builtin/pack-objects.c:3147
 #, c-format
 msgid "invalid number of threads specified (%d)"
 msgstr "nombre de fils spécifié invalide (%d)"
 
-#: builtin/grep.c:1146
 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:1179
 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:1187
 msgid "both --cached and trees are given"
 msgstr "--cached et des arbres sont fournis en même temps"
 
-#: builtin/hash-object.c:83
 msgid ""
 "git hash-object [-t <type>] [-w] [--path=<file> | --no-filters] [--stdin] "
 "[--] <file>..."
@@ -17220,101 +6917,78 @@ msgstr ""
 "git hash-object [-t <type>] [-w] [--path=<fichier> | --no-filters] [--stdin] "
 "[--] <fichier>..."
 
-#: builtin/hash-object.c:97
 msgid "object type"
 msgstr "type d'objet"
 
-#: builtin/hash-object.c:98
 msgid "write the object into the object database"
 msgstr "écrire l'objet dans la base de donnée d'objets"
 
-#: builtin/hash-object.c:100
 msgid "read the object from stdin"
 msgstr "lire l'objet depuis l'entrée standard"
 
-#: builtin/hash-object.c:102
 msgid "store file as is without filters"
 msgstr "stocker le fichier tel quel sans filtrage"
 
-#: builtin/hash-object.c:103
 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:104
 msgid "process file as it were from this path"
 msgstr "traiter le fichier comme s'il venait de ce chemin"
 
-#: builtin/help.c:57
 msgid "print all available commands"
 msgstr "afficher toutes les commandes disponibles"
 
-#: builtin/help.c:60
 msgid "show external commands in --all"
 msgstr "afficher les commandes externes dans --all"
 
-#: builtin/help.c:61
 msgid "show aliases in --all"
 msgstr "afficher les alias dans --all"
 
-#: builtin/help.c:62
 msgid "exclude guides"
 msgstr "exclure les guides"
 
-#: builtin/help.c:63
 msgid "show man page"
 msgstr "afficher la page de manuel"
 
-#: builtin/help.c:64
 msgid "show manual in web browser"
 msgstr "afficher le manuel dans un navigateur web"
 
-#: builtin/help.c:66
 msgid "show info page"
 msgstr "afficher la page info"
 
-#: builtin/help.c:68
 msgid "print command description"
 msgstr "afficher la description de la commande"
 
-#: builtin/help.c:70
 msgid "print list of useful guides"
 msgstr "afficher une liste de guides utiles"
 
-#: builtin/help.c:72
 msgid "print all configuration variable names"
 msgstr "afficher tous les noms de variables de configuration"
 
-#: builtin/help.c:84
 msgid "git help [[-i|--info] [-m|--man] [-w|--web]] [<command>]"
 msgstr "git help [[-i|--info] [-m|--man] [-w|--web]] [<commande>]"
 
-#: builtin/help.c:201
 #, c-format
 msgid "unrecognized help format '%s'"
 msgstr "format d'aide non reconnu '%s'"
 
-#: builtin/help.c:227
 msgid "Failed to start emacsclient."
 msgstr "Échec de démarrage d'emacsclient."
 
-#: builtin/help.c:240
 msgid "Failed to parse emacsclient version."
 msgstr "Échec d'analyse de la version d'emacsclient."
 
-#: builtin/help.c:248
 #, c-format
 msgid "emacsclient version '%d' too old (< 22)."
 msgstr "la version d'emacsclient '%d' est trop ancienne (<22)."
 
-#: builtin/help.c:266 builtin/help.c:288 builtin/help.c:298 builtin/help.c:306
 #, c-format
 msgid "failed to exec '%s'"
 msgstr "échec de l'exécution de '%s'"
 
-#: builtin/help.c:344
 #, c-format
 msgid ""
 "'%s': path for unsupported man viewer.\n"
@@ -17323,7 +6997,6 @@ msgstr ""
 "'%s' : chemin pour l'utilitaire de visualisation de manuel non supporté.\n"
 "Veuillez utiliser plutôt 'man.<outil>.cmd'."
 
-#: builtin/help.c:356
 #, c-format
 msgid ""
 "'%s': cmd for supported man viewer.\n"
@@ -17332,426 +7005,336 @@ msgstr ""
 "'%s' : chemin pour l'utilitaire de visualisation de manuel supporté.\n"
 "Veuillez utiliser plutôt 'man.<outil>.cmd'."
 
-#: builtin/help.c:471
 #, c-format
 msgid "'%s': unknown man viewer."
 msgstr "'%s' : visualiseur de manuel inconnu."
 
-#: builtin/help.c:487
 msgid "no man viewer handled the request"
 msgstr "aucun visualiseur de manuel n'a pris en charge la demande"
 
-#: builtin/help.c:494
 msgid "no info viewer handled the request"
 msgstr "aucun visualiseur de 'info' n'a pris en charge la demande"
 
-#: builtin/help.c:555 builtin/help.c:566 git.c:348
 #, c-format
 msgid "'%s' is aliased to '%s'"
 msgstr "'%s' est un alias de '%s'"
 
-#: builtin/help.c:569 git.c:380
 #, c-format
 msgid "bad alias.%s string: %s"
 msgstr "mauvais chaîne alias.%s : %s"
 
-#: builtin/help.c:611
 #, c-format
 msgid "the '%s' option doesn't take any non-option arguments"
 msgstr "l'option '%s' n'accepte pas d'argument sans option"
 
-#: builtin/help.c:631
 msgid ""
 "the '--no-[external-commands|aliases]' options can only be used with '--all'"
 msgstr ""
 "les options '--no-[external-commands|aliases]' ne peuvent être utilisées "
 "qu'avec '--all'"
 
-#: builtin/help.c:643 builtin/help.c:671
 #, c-format
 msgid "usage: %s%s"
 msgstr "usage : %s%s"
 
-#: builtin/help.c:666
 msgid "'git help config' for more information"
 msgstr "'git help config' pour plus d'information"
 
-#: builtin/hook.c:10
 msgid "git hook run [--ignore-missing] <hook-name> [-- <hook-args>]"
 msgstr ""
 "git hook run [--ignore-missing] <nom-de-crochet> [-- <arguments-de-crochet>]"
 
-#: builtin/hook.c:30
 msgid "silently ignore missing requested <hook-name>"
 msgstr "ignorer silencieusement le <nom-de-crochet> requis manquant"
 
-#: builtin/index-pack.c:221
 #, c-format
 msgid "object type mismatch at %s"
 msgstr "type d'objet non correspondant à %s"
 
-#: 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:244
 #, c-format
 msgid "object %s: expected type %s, found %s"
 msgstr "objet %s : type attendu %s, reçu %s"
 
-#: 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:304
 msgid "early EOF"
 msgstr "fin de fichier prématurée"
 
-#: builtin/index-pack.c:305
 msgid "read error on input"
 msgstr "erreur de lecture sur l'entrée"
 
-#: builtin/index-pack.c:317
 msgid "used more bytes than were available"
 msgstr "plus d'octets utilisés que disponibles"
 
-#: builtin/index-pack.c:324 builtin/pack-objects.c:754
 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:329
 #, c-format
 msgid "pack exceeds maximum allowed size (%s)"
 msgstr "le paquet dépasse la taille maximale permise (%s)"
 
-#: builtin/index-pack.c:362
 msgid "pack signature mismatch"
 msgstr "la signature du paquet ne correspond pas"
 
-#: builtin/index-pack.c:364
 #, c-format
 msgid "pack version %<PRIu32> unsupported"
 msgstr "la version de paquet %<PRIu32> non supportée"
 
-#: builtin/index-pack.c:380
 #, 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:485
 #, c-format
 msgid "inflate returned %d"
 msgstr "la décompression (inflate) a retourné %d"
 
-#: builtin/index-pack.c:534
 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:542
 msgid "delta base offset is out of bound"
 msgstr "l'objet delta de base est hors limite"
 
-#: builtin/index-pack.c:550
 #, c-format
 msgid "unknown object type %d"
 msgstr "type d'objet inconnu %d"
 
-#: builtin/index-pack.c:581
 msgid "cannot pread pack file"
 msgstr "impossible de lire (pread) le fichier paquet"
 
-#: builtin/index-pack.c:583
 #, 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:609
 msgid "serious inflate inconsistency"
 msgstr "grave incohérence dans la décompression (inflate)"
 
-#: builtin/index-pack.c:754 builtin/index-pack.c:760 builtin/index-pack.c:784
-#: builtin/index-pack.c:823 builtin/index-pack.c:832
 #, c-format
 msgid "SHA1 COLLISION FOUND WITH %s !"
 msgstr "COLLISION SHA1 TROUVÉE AVEC %s !"
 
-#: builtin/index-pack.c:757 builtin/pack-objects.c:290
-#: builtin/pack-objects.c:350 builtin/pack-objects.c:456
 #, c-format
 msgid "unable to read %s"
 msgstr "impossible de lire %s"
 
-#: builtin/index-pack.c:821
 #, c-format
 msgid "cannot read existing object info %s"
 msgstr "impossible de lire l'information existante de l'objet %s"
 
-#: builtin/index-pack.c:829
 #, c-format
 msgid "cannot read existing object %s"
 msgstr "impossible de lire l'objet existant %s"
 
-#: builtin/index-pack.c:843
 #, c-format
 msgid "invalid blob object %s"
 msgstr "objet blob invalide %s"
 
-#: builtin/index-pack.c:846 builtin/index-pack.c:865
 msgid "fsck error in packed object"
 msgstr "erreur de fsck dans l'objet empaqueté"
 
-#: builtin/index-pack.c:867
 #, 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:928 builtin/index-pack.c:975
 msgid "failed to apply delta"
 msgstr "échec d'application du delta"
 
-#: builtin/index-pack.c:1161
 msgid "Receiving objects"
 msgstr "Réception d'objets"
 
-#: builtin/index-pack.c:1161
 msgid "Indexing objects"
 msgstr "Indexation d'objets"
 
-#: builtin/index-pack.c:1195
 msgid "pack is corrupted (SHA1 mismatch)"
 msgstr "le paquet est corrompu (SHA1 ne correspond pas)"
 
-#: builtin/index-pack.c:1200
 msgid "cannot fstat packfile"
 msgstr "impossible d'obtenir le statut (fstat) du fichier paquet"
 
-#: builtin/index-pack.c:1203
 msgid "pack has junk at the end"
 msgstr "le paquet est invalide à la fin"
 
-#: builtin/index-pack.c:1215
 msgid "confusion beyond insanity in parse_pack_objects()"
 msgstr "confusion extrême dans parse_pack_objects()"
 
-#: builtin/index-pack.c:1238
 msgid "Resolving deltas"
 msgstr "Résolution des deltas"
 
-#: builtin/index-pack.c:1249 builtin/pack-objects.c:2913
 #, c-format
 msgid "unable to create thread: %s"
 msgstr "impossible de créer le fil : %s"
 
-#: builtin/index-pack.c:1282
 msgid "confusion beyond insanity"
 msgstr "confusion extrême"
 
-#: builtin/index-pack.c:1288
 #, 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:1300
 #, 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:1304
 #, 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:1328
 #, c-format
 msgid "unable to deflate appended object (%d)"
 msgstr "impossible de compresser l'objet ajouté (%d)"
 
-#: builtin/index-pack.c:1423
 #, c-format
 msgid "local object %s is corrupt"
 msgstr "l'objet local %s est corrompu"
 
-#: builtin/index-pack.c:1445
 #, 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:1469
 #, c-format
 msgid "cannot write %s file '%s'"
 msgstr "impossible d'écrire le fichier %s '%s'"
 
-#: builtin/index-pack.c:1477
 #, c-format
 msgid "cannot close written %s file '%s'"
 msgstr "impossible de fermer le fichier %s écrit '%s'"
 
-#: builtin/index-pack.c:1494
 #, 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:1519
 msgid "error while closing pack file"
 msgstr "erreur en fermeture du fichier paquet"
 
-#: builtin/index-pack.c:1578 builtin/pack-objects.c:3158
 #, c-format
-msgid "bad pack.indexversion=%<PRIu32>"
-msgstr "mauvais pack.indexversion=%<PRIu32>"
+msgid "bad pack.indexVersion=%<PRIu32>"
+msgstr "mauvais pack.indexVersion=%<PRIu32>"
 
-#: builtin/index-pack.c:1648
 #, c-format
 msgid "Cannot open existing pack file '%s'"
 msgstr "Impossible d'ouvrir le fichier paquet existant '%s'"
 
-#: builtin/index-pack.c:1650
 #, 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:1698
 #, 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:1705
 #, 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
 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:1825 builtin/index-pack.c:1829
 #, c-format
 msgid "bad %s"
 msgstr "mauvais %s"
 
-#: builtin/index-pack.c:1835 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:1856
 msgid "--stdin requires a git repository"
 msgstr "--stdin requiert un dépôt git"
 
-#: builtin/index-pack.c:1873
 msgid "--verify with no packfile name given"
 msgstr "--verify sans nom de fichier paquet donné"
 
-#: builtin/index-pack.c:1939 builtin/unpack-objects.c:584
 msgid "fsck error in pack objects"
 msgstr "erreur de fsck dans les objets paquets"
 
-#: builtin/init-db.c:63
 #, c-format
 msgid "cannot stat template '%s'"
 msgstr "impossible de faire un stat du modèle '%s'"
 
-#: builtin/init-db.c:68
 #, c-format
 msgid "cannot opendir '%s'"
 msgstr "impossible d'ouvrir le répertoire '%s'"
 
-#: builtin/init-db.c:80
 #, c-format
 msgid "cannot readlink '%s'"
 msgstr "impossible de lire le lien '%s'"
 
-#: builtin/init-db.c:82
 #, c-format
 msgid "cannot symlink '%s' '%s'"
 msgstr "impossible de créer un lien symbolique de '%s' '%s'"
 
-#: builtin/init-db.c:88
 #, c-format
 msgid "cannot copy '%s' to '%s'"
 msgstr "impossible de copier '%s' vers '%s'"
 
-#: builtin/init-db.c:92
 #, c-format
 msgid "ignoring template %s"
 msgstr "modèle %s ignoré"
 
-#: builtin/init-db.c:123
 #, c-format
 msgid "templates not found in %s"
 msgstr "modèles non trouvés dans %s"
 
-#: builtin/init-db.c:138
 #, c-format
 msgid "not copying templates from '%s': %s"
 msgstr "pas de copie des modèles depuis '%s' : %s"
 
-#: builtin/init-db.c:263
 #, c-format
 msgid "invalid initial branch name: '%s'"
 msgstr "nom de branche initiale invalide : '%s'"
 
-#: builtin/init-db.c:354
 #, c-format
 msgid "unable to handle file type %d"
 msgstr "impossible de traiter le fichier de type %d"
 
-#: builtin/init-db.c:357
 #, c-format
 msgid "unable to move %s to %s"
 msgstr "impossible de déplacer %s vers %s"
 
-#: builtin/init-db.c:373
 msgid "attempt to reinitialize repository with different hash"
 msgstr "essai de réinitialisation du dépôt avec une empreinte différente"
 
-#: builtin/init-db.c:397 builtin/init-db.c:400
 #, c-format
 msgid "%s already exists"
 msgstr "%s existe déjà"
 
-#: builtin/init-db.c:432
 #, c-format
 msgid "re-init: ignored --initial-branch=%s"
 msgstr "re-initialisation : --initial-branch=%s ignoré"
 
-#: builtin/init-db.c:463
 #, c-format
 msgid "Reinitialized existing shared Git repository in %s%s\n"
 msgstr "Dépôt Git existant partagé réinitialisé dans %s%s\n"
 
-#: builtin/init-db.c:464
 #, c-format
 msgid "Reinitialized existing Git repository in %s%s\n"
 msgstr "Dépôt Git existant réinitialisé dans %s%s\n"
 
-#: builtin/init-db.c:468
 #, c-format
 msgid "Initialized empty shared Git repository in %s%s\n"
 msgstr "Dépôt Git vide partagé initialisé dans %s%s\n"
 
-#: builtin/init-db.c:469
 #, c-format
 msgid "Initialized empty Git repository in %s%s\n"
 msgstr "Dépôt Git vide initialisé dans %s%s\n"
 
-#: builtin/init-db.c:518
 msgid ""
 "git init [-q | --quiet] [--bare] [--template=<template-directory>] [--"
 "shared[=<permissions>]] [<directory>]"
@@ -17759,37 +7342,29 @@ msgstr ""
 "git init [-q | --quiet] [--bare] [--template=<répertoire-modèle>] [--"
 "shared[=<permissions>]] [<répertoire>]"
 
-#: builtin/init-db.c:544
 msgid "permissions"
 msgstr "permissions"
 
-#: builtin/init-db.c:545
 msgid "specify that the git repository is to be shared amongst several users"
 msgstr "spécifier que le dépôt git sera partagé entre plusieurs utilisateurs"
 
-#: builtin/init-db.c:551
 msgid "override the name of the initial branch"
 msgstr "outrepasser le nom de la branche initiale"
 
-#: builtin/init-db.c:552 builtin/verify-pack.c:74
 msgid "hash"
 msgstr "empreinte"
 
-#: builtin/init-db.c:553 builtin/show-index.c:22 builtin/verify-pack.c:75
 msgid "specify the hash algorithm to use"
 msgstr "spécifier l'algorithme d'empreinte à utiliser"
 
-#: builtin/init-db.c:591 builtin/init-db.c:596
 #, c-format
 msgid "cannot mkdir %s"
 msgstr "impossible de créer le répertoire (mkdir) %s"
 
-#: builtin/init-db.c:600 builtin/init-db.c:655
 #, c-format
 msgid "cannot chdir to %s"
 msgstr "impossible de se déplacer vers le répertoire (chdir) %s"
 
-#: builtin/init-db.c:627
 #, c-format
 msgid ""
 "%s (or --work-tree=<directory>) not allowed without specifying %s (or --git-"
@@ -17798,16 +7373,13 @@ msgstr ""
 "%s (ou --work-tree=<répertoire>) n'est pas autorisé sans spécifier %s (ou --"
 "git-dir=<répertoire>)"
 
-#: builtin/init-db.c:679
 #, c-format
 msgid "Cannot access work tree '%s'"
 msgstr "Impossible d'accéder à l'arbre de travail '%s'"
 
-#: builtin/init-db.c:684
 msgid "--separate-git-dir incompatible with bare repository"
 msgstr "--separate-git-dir est incompatible avec un dépôt nu"
 
-#: builtin/interpret-trailers.c:16
 msgid ""
 "git interpret-trailers [--in-place] [--trim-empty] [(--trailer "
 "<token>[(=|:)<value>])...] [<file>...]"
@@ -17815,92 +7387,73 @@ msgstr ""
 "git interpret-trailers [--in-place] [--trim-empty] [(--trailer "
 "<symbole>[(=|:)<valeur>])...] [<fichier>...]"
 
-#: builtin/interpret-trailers.c:95
 msgid "edit files in place"
 msgstr "éditer les fichiers sur place"
 
-#: builtin/interpret-trailers.c:96
 msgid "trim empty trailers"
 msgstr "éliminer les lignes de fin vides"
 
-#: builtin/interpret-trailers.c:99
 msgid "where to place the new trailer"
 msgstr "où placer les nouvelles lignes terminales"
 
-#: builtin/interpret-trailers.c:101
 msgid "action if trailer already exists"
 msgstr "action si les lignes terminales existent déjà"
 
-#: builtin/interpret-trailers.c:103
 msgid "action if trailer is missing"
 msgstr "action si les lignes terminales manquent"
 
-#: builtin/interpret-trailers.c:105
 msgid "output only the trailers"
 msgstr "éliminer les lignes terminales vides"
 
-#: builtin/interpret-trailers.c:106
 msgid "do not apply config rules"
 msgstr "ne pas appliquer les règles de la configuration"
 
-#: builtin/interpret-trailers.c:107
 msgid "join whitespace-continued values"
 msgstr "joindre les valeurs continuées avec des caractères blancs"
 
-#: builtin/interpret-trailers.c:108
 msgid "set parsing options"
 msgstr "paramètres d'analyse"
 
-#: builtin/interpret-trailers.c:110
 msgid "do not treat --- specially"
 msgstr "ne pas traiter spécialement ---"
 
-#: builtin/interpret-trailers.c:112
 msgid "trailer(s) to add"
 msgstr "ligne(s) de fin à ajouter"
 
-#: builtin/interpret-trailers.c:123
 msgid "--trailer with --only-input does not make sense"
 msgstr "--trailer n'a aucune signification avec --only-input"
 
-#: builtin/interpret-trailers.c:133
 msgid "no input file given for in-place editing"
 msgstr "aucun fichier en entrée pour l'éditon sur place"
 
-#: builtin/log.c:60
 msgid "git log [<options>] [<revision-range>] [[--] <path>...]"
 msgstr "git log [<options>] [<plage de révisions>] [[--] <chemin>...]"
 
-#: builtin/log.c:61
 msgid "git show [<options>] <object>..."
 msgstr "git show [<options>] <objet>..."
 
-#: builtin/log.c:114
 #, c-format
 msgid "invalid --decorate option: %s"
 msgstr "option --decorate invalide : %s"
 
-#: builtin/log.c:181
+msgid "suppress diff output"
+msgstr "supprimer la sortie des différences"
+
 msgid "show source"
 msgstr "afficher la source"
 
-#: builtin/log.c:182
 msgid "use mail map file"
 msgstr "utiliser le fichier de correspondance de mail"
 
-#: builtin/log.c:185
 msgid "only decorate refs that match <pattern>"
 msgstr "décorer seulement les références correspondant à <motif>"
 
-#: builtin/log.c:187
 msgid "do not decorate refs that match <pattern>"
 msgstr "ne pas décorer les références correspondant à <motif>"
 
-#: builtin/log.c:188
 msgid "decorate options"
 msgstr "décorer les options"
 
-#: builtin/log.c:191
 msgid ""
 "trace the evolution of line range <start>,<end> or function :<funcname> in "
 "<file>"
@@ -17908,94 +7461,77 @@ msgstr ""
 "tracer l'évolution d'une plage <début>,<fin> ou d'une fonction <nom-de-"
 "fonction> dans <fichier>"
 
-#: builtin/log.c:214
+#, c-format
+msgid "unrecognized argument: %s"
+msgstr "argument non reconnu : %s"
+
 msgid "-L<range>:<file> cannot be used with pathspec"
 msgstr ""
 "-L<plage>:<fichier> ne peut pas être utilisé avec une spécificateur de chemin"
 
-#: builtin/log.c:322
 #, c-format
 msgid "Final output: %d %s\n"
 msgstr "Sortie finale : %d %s\n"
 
-#: builtin/log.c:429
 msgid "unable to create temporary object directory"
 msgstr "impossible de créer un répertoire d'objets temporaire"
 
-#: builtin/log.c:599
 #, c-format
 msgid "git show %s: bad file"
 msgstr "git show %s : fichier incorrect"
 
-#: builtin/log.c:614 builtin/log.c:706
 #, c-format
 msgid "could not read object %s"
 msgstr "impossible de lire l'objet %s"
 
-#: builtin/log.c:731
 #, c-format
 msgid "unknown type: %d"
 msgstr "type inconnu : %d"
 
-#: builtin/log.c:880
 #, c-format
 msgid "%s: invalid cover from description mode"
 msgstr "%s : couverture invalide pour le mode de description"
 
-#: builtin/log.c:887
 msgid "format.headers without value"
 msgstr "format.headers sans valeur"
 
-#: builtin/log.c:1016
 #, c-format
 msgid "cannot open patch file %s"
 msgstr "impossible d'ouvrir le fichier correctif %s"
 
-#: builtin/log.c:1033
 msgid "need exactly one range"
 msgstr "exactement une plage nécessaire"
 
-#: builtin/log.c:1043
 msgid "not a range"
 msgstr "ceci n'est pas une plage"
 
-#: builtin/log.c:1207
 msgid "cover letter needs email format"
 msgstr "la lettre de motivation doit être au format courriel"
 
-#: builtin/log.c:1213
 msgid "failed to create cover-letter file"
 msgstr "échec de création du fichier de lettre de motivation"
 
-#: builtin/log.c:1300
 #, c-format
 msgid "insane in-reply-to: %s"
 msgstr "in-reply-to aberrant : %s"
 
-#: builtin/log.c:1327
 msgid "git format-patch [<options>] [<since> | <revision-range>]"
 msgstr "git format-patch [<options>] [<depuis> | <plage de révisions>]"
 
-#: builtin/log.c:1385
 msgid "two output directories?"
 msgstr "deux répertoires de sortie ?"
 
-#: builtin/log.c:1536 builtin/log.c:2369 builtin/log.c:2371 builtin/log.c:2383
 #, c-format
 msgid "unknown commit %s"
 msgstr "commit inconnu %s"
 
-#: builtin/log.c:1547 builtin/replace.c:58 builtin/replace.c:207
-#: builtin/replace.c:210
 #, c-format
 msgid "failed to resolve '%s' as a valid ref"
 msgstr "échec à résoudre '%s' comme une référence valide"
 
-#: builtin/log.c:1556
 msgid "could not find exact merge base"
 msgstr "impossible de trouver la base de fusion exacte"
 
-#: builtin/log.c:1566
 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"
@@ -18008,289 +7544,226 @@ msgstr ""
 "Ou vous pouvez spécifier le commit de base par --base=<id-du-commit-de-base> "
 "manuellement"
 
-#: builtin/log.c:1589
 msgid "failed to find exact merge base"
 msgstr "échec à trouver la base de fusion exacte"
 
-#: builtin/log.c:1606
 msgid "base commit should be the ancestor of revision list"
 msgstr "le commit de base devrait être l'ancêtre de la liste de révisions"
 
-#: builtin/log.c:1616
 msgid "base commit shouldn't be in revision list"
 msgstr "le commit de base ne devrait pas faire partie de la liste de révisions"
 
-#: builtin/log.c:1674
 msgid "cannot get patch id"
 msgstr "impossible d'obtenir l'id du patch"
 
-#: builtin/log.c:1737
 msgid "failed to infer range-diff origin of current series"
 msgstr ""
 "échec d'inférence de l'origine de différence d'intervalles de la série "
 "actuelle"
 
-#: builtin/log.c:1739
 #, c-format
 msgid "using '%s' as range-diff origin of current series"
 msgstr ""
 "utilisation de '%s' comme une différence d'intervalle pour la série actuelle"
 
-#: builtin/log.c:1783
 msgid "use [PATCH n/m] even with a single patch"
 msgstr "utiliser [PATCH n/m] même avec un patch unique"
 
-#: builtin/log.c:1786
 msgid "use [PATCH] even with multiple patches"
 msgstr "utiliser [PATCH] même avec des patchs multiples"
 
-#: builtin/log.c:1790
 msgid "print patches to standard out"
 msgstr "afficher les patchs sur la sortie standard"
 
-#: builtin/log.c:1792
 msgid "generate a cover letter"
 msgstr "générer une lettre de motivation"
 
-#: builtin/log.c:1794
 msgid "use simple number sequence for output file names"
 msgstr ""
 "utiliser une séquence simple de nombres pour les nom des fichiers de sortie"
 
-#: builtin/log.c:1795
 msgid "sfx"
 msgstr "sfx"
 
-#: builtin/log.c:1796
 msgid "use <sfx> instead of '.patch'"
 msgstr "utiliser <sfx> au lieu de '.patch'"
 
-#: builtin/log.c:1798
 msgid "start numbering patches at <n> instead of 1"
 msgstr "démarrer la numérotation des patchs à <n> au lieu de 1"
 
-#: builtin/log.c:1799
 msgid "reroll-count"
 msgstr "reroll-count"
 
-#: builtin/log.c:1800
 msgid "mark the series as Nth re-roll"
 msgstr "marquer la série comme une Nième réédition"
 
-#: builtin/log.c:1802
 msgid "max length of output filename"
 msgstr "taille maximum du nom du fichier de sortie"
 
-#: builtin/log.c:1804
 msgid "use [RFC PATCH] instead of [PATCH]"
 msgstr "utiliser [RFC PATCH] au lieu de [PATCH]"
 
-#: builtin/log.c:1807
 msgid "cover-from-description-mode"
 msgstr "cover-from-description-mode"
 
-#: builtin/log.c:1808
 msgid "generate parts of a cover letter based on a branch's description"
 msgstr ""
 "générer des parties de la lettre d'introduction à partir de la description "
 "de la branche"
 
-#: builtin/log.c:1810
 msgid "use [<prefix>] instead of [PATCH]"
 msgstr "utiliser [<préfixe>] au lieu de [PATCH]"
 
-#: builtin/log.c:1813
 msgid "store resulting files in <dir>"
 msgstr "stocker les fichiers résultats dans <répertoire>"
 
-#: builtin/log.c:1816
 msgid "don't strip/add [PATCH]"
 msgstr "ne pas retirer/ajouter [PATCH]"
 
-#: builtin/log.c:1819
 msgid "don't output binary diffs"
 msgstr "ne pas imprimer les diffs binaires"
 
-#: builtin/log.c:1821
 msgid "output all-zero hash in From header"
 msgstr "écrire une empreinte à zéro dans l'entête From"
 
-#: builtin/log.c:1823
 msgid "don't include a patch matching a commit upstream"
 msgstr "ne pas inclure un patch correspondant à un commit amont"
 
-#: builtin/log.c:1825
 msgid "show patch format instead of default (patch + stat)"
 msgstr "afficher le format du patch au lieu du défaut (patch + stat)"
 
-#: builtin/log.c:1827
 msgid "Messaging"
 msgstr "Communication"
 
-#: builtin/log.c:1828
 msgid "header"
 msgstr "en-tête"
 
-#: builtin/log.c:1829
 msgid "add email header"
 msgstr "ajouter l'en-tête de courriel"
 
-#: builtin/log.c:1830 builtin/log.c:1831
 msgid "email"
 msgstr "courriel"
 
-#: builtin/log.c:1830
 msgid "add To: header"
 msgstr "ajouter l'en-tête \"To:\""
 
-#: builtin/log.c:1831
 msgid "add Cc: header"
 msgstr "ajouter l'en-tête \"Cc:\""
 
-#: builtin/log.c:1832
 msgid "ident"
 msgstr "ident"
 
-#: builtin/log.c:1833
 msgid "set From address to <ident> (or committer ident if absent)"
 msgstr ""
 "renseigner l'adresse From à <ident> (ou à l'ident du validateur si absent)"
 
-#: builtin/log.c:1835
 msgid "message-id"
 msgstr "id-message"
 
-#: builtin/log.c:1836
 msgid "make first mail a reply to <message-id>"
 msgstr "répondre dans le premier message à <id-message>"
 
-#: builtin/log.c:1837 builtin/log.c:1840
 msgid "boundary"
 msgstr "limite"
 
-#: builtin/log.c:1838
 msgid "attach the patch"
 msgstr "attacher le patch"
 
-#: builtin/log.c:1841
 msgid "inline the patch"
 msgstr "patch à l'intérieur"
 
-#: builtin/log.c:1845
 msgid "enable message threading, styles: shallow, deep"
 msgstr ""
 "activer l'enfilage de message, styles : shallow (superficiel), deep (profond)"
 
-#: builtin/log.c:1847
 msgid "signature"
 msgstr "signature"
 
-#: builtin/log.c:1848
 msgid "add a signature"
 msgstr "ajouter une signature"
 
-#: builtin/log.c:1849
 msgid "base-commit"
 msgstr "commit-de-base"
 
-#: builtin/log.c:1850
 msgid "add prerequisite tree info to the patch series"
 msgstr "ajouter un arbre prérequis à la série de patchs"
 
-#: builtin/log.c:1853
 msgid "add a signature from a file"
 msgstr "ajouter une signature depuis un fichier"
 
-#: builtin/log.c:1854
 msgid "don't print the patch filenames"
 msgstr "ne pas afficher les noms de fichiers des patchs"
 
-#: builtin/log.c:1856
 msgid "show progress while generating patches"
 msgstr ""
 "afficher la barre de progression durant la phase de génération des patchs"
 
-#: builtin/log.c:1858
 msgid "show changes against <rev> in cover letter or single patch"
 msgstr ""
 "afficher les modifications par rapport à <rév> dans la première page ou une "
 "rustine"
 
-#: builtin/log.c:1861
 msgid "show changes against <refspec> in cover letter or single patch"
 msgstr ""
 "afficher les modifications par rapport à <refspec> dans la première page ou "
 "une rustine"
 
-#: builtin/log.c:1863 builtin/range-diff.c:28
 msgid "percentage by which creation is weighted"
 msgstr "pourcentage par lequel la création est pondérée"
 
-#: builtin/log.c:1953
 #, c-format
 msgid "invalid ident line: %s"
 msgstr "ligne d'identification invalide : %s"
 
-#: builtin/log.c:1978
 msgid "--name-only does not make sense"
 msgstr "--name-only n'a pas de sens"
 
-#: builtin/log.c:1980
 msgid "--name-status does not make sense"
 msgstr "--name-status n'a pas de sens"
 
-#: builtin/log.c:1982
 msgid "--check does not make sense"
 msgstr "--check n'a pas de sens"
 
-#: builtin/log.c:1984
 msgid "--remerge-diff does not make sense"
 msgstr "--remerge-diff n'a pas de sens"
 
-#: builtin/log.c:2129
+#, c-format
+msgid "could not create directory '%s'"
+msgstr "impossible de créer le répertoire '%s'"
+
 msgid "--interdiff requires --cover-letter or single patch"
 msgstr "--interdiff requiert --cover-letter ou une rustine unique"
 
-#: builtin/log.c:2133
 msgid "Interdiff:"
 msgstr "Interdiff :"
 
-#: builtin/log.c:2134
 #, c-format
 msgid "Interdiff against v%d:"
 msgstr "Interdiff contre v%d :"
 
-#: builtin/log.c:2144
 msgid "--range-diff requires --cover-letter or single patch"
 msgstr "--range-diff requiert --cover-letter ou une rustine unique"
 
-#: builtin/log.c:2152
 msgid "Range-diff:"
 msgstr "Diff-intervalle :"
 
-#: builtin/log.c:2153
 #, c-format
 msgid "Range-diff against v%d:"
 msgstr "Diff-intervalle contre v%d :"
 
-#: builtin/log.c:2164
 #, c-format
 msgid "unable to read signature file '%s'"
 msgstr "lecture du fichier de signature '%s' impossible"
 
-#: builtin/log.c:2200
 msgid "Generating patches"
 msgstr "Génération des patchs"
 
-#: builtin/log.c:2244
 msgid "failed to create output files"
 msgstr "échec de création des fichiers en sortie"
 
-#: builtin/log.c:2304
 msgid "git cherry [-v] [<upstream> [<head> [<limit>]]]"
 msgstr "git cherry [-v] [<branche_amont> [<head> [<limite>]]]"
 
-#: builtin/log.c:2358
 #, c-format
 msgid ""
 "Could not find a tracked remote branch, please specify <upstream> manually.\n"
@@ -18298,122 +7771,93 @@ msgstr ""
 "Impossible de trouver une branche distante suivie, merci de spécifier "
 "<branche_amont> manuellement.\n"
 
-#: builtin/ls-files.c:564
 msgid "git ls-files [<options>] [<file>...]"
 msgstr "git ls-files [<options>] [<fichier>...]"
 
-#: builtin/ls-files.c:618
 msgid "separate paths with the NUL character"
 msgstr "séparer les chemins par un caractère NUL"
 
-#: builtin/ls-files.c:620
 msgid "identify the file status with tags"
 msgstr "identifier l'état de fichier avec les étiquettes"
 
-#: builtin/ls-files.c:622
 msgid "use lowercase letters for 'assume unchanged' files"
 msgstr "utiliser des minuscules pour les fichiers 'assumés inchangés'"
 
-#: builtin/ls-files.c:624
 msgid "use lowercase letters for 'fsmonitor clean' files"
 msgstr "utiliser des minuscules pour les fichiers 'fsmonitor clean'"
 
-#: builtin/ls-files.c:626
 msgid "show cached files in the output (default)"
 msgstr "afficher les fichiers mis en cache dans la sortie (défaut)"
 
-#: builtin/ls-files.c:628
 msgid "show deleted files in the output"
 msgstr "afficher les fichiers supprimés dans la sortie"
 
-#: builtin/ls-files.c:630
 msgid "show modified files in the output"
 msgstr "afficher les fichiers modifiés dans la sortie"
 
-#: builtin/ls-files.c:632
 msgid "show other files in the output"
 msgstr "afficher les autres fichiers dans la sortie"
 
-#: builtin/ls-files.c:634
 msgid "show ignored files in the output"
 msgstr "afficher les fichiers ignorés dans la sortie"
 
-#: builtin/ls-files.c:637
 msgid "show staged contents' object name in the output"
 msgstr "afficher les nom des objets indexés dans la sortie"
 
-#: builtin/ls-files.c:639
 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:641
 msgid "show 'other' directories' names only"
 msgstr "afficher seulement les noms des répertoires 'other'"
 
-#: builtin/ls-files.c:643
 msgid "show line endings of files"
 msgstr "afficher les fins de lignes des fichiers"
 
-#: builtin/ls-files.c:645
 msgid "don't show empty directories"
 msgstr "ne pas afficher les répertoires vides"
 
-#: builtin/ls-files.c:648
 msgid "show unmerged files in the output"
 msgstr "afficher les fichiers non fusionnés dans la sortie"
 
-#: builtin/ls-files.c:650
 msgid "show resolve-undo information"
 msgstr "afficher l'information resolv-undo"
 
-#: builtin/ls-files.c:652
 msgid "skip files matching pattern"
 msgstr "sauter les fichiers correspondant au motif"
 
-#: builtin/ls-files.c:655
 msgid "read exclude patterns from <file>"
 msgstr "lire les motifs d'exclusion depuis <fichier>"
 
-#: builtin/ls-files.c:658
 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:660
 msgid "add the standard git exclusions"
 msgstr "ajouter les exclusions git standard"
 
-#: builtin/ls-files.c:664
 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:669
 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:670
 msgid "tree-ish"
 msgstr "arbre ou apparenté"
 
-#: builtin/ls-files.c:671
 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:673
 msgid "show debugging data"
 msgstr "afficher les données de débogage"
 
-#: builtin/ls-files.c:675
 msgid "suppress duplicate entries"
 msgstr "supprimer les entrées dupliquées"
 
-#: builtin/ls-files.c:677
 msgid "show sparse directories in the presence of a sparse index"
 msgstr "afficher les répertoires clairsemés en présence d'un index clairsemé"
 
-#: builtin/ls-remote.c:9
 msgid ""
 "git ls-remote [--heads] [--tags] [--refs] [--upload-pack=<exec>]\n"
 "              [-q | --quiet] [--exit-code] [--get-url]\n"
@@ -18423,211 +7867,162 @@ msgstr ""
 "              [-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:1131
 msgid "exec"
 msgstr "exécutable"
 
-#: builtin/ls-remote.c:62 builtin/ls-remote.c:64
 msgid "path of git-upload-pack on the remote host"
 msgstr "chemin vers git-upload-pack sur le serveur distant"
 
-#: builtin/ls-remote.c:66
 msgid "limit to tags"
 msgstr "limiter aux étiquettes"
 
-#: builtin/ls-remote.c:67
 msgid "limit to heads"
 msgstr "limiter aux heads"
 
-#: builtin/ls-remote.c:68
 msgid "do not show peeled tags"
 msgstr "ne pas afficher les étiquettes pelées"
 
-#: builtin/ls-remote.c:70
 msgid "take url.<base>.insteadOf into account"
 msgstr "prendre en compte url.<base>.insteadOf"
 
-#: builtin/ls-remote.c:73
 msgid "exit with exit code 2 if no matching refs are found"
 msgstr ""
 "sortir avec un code d'erreur 2 si aucune correspondance de référence n'est "
 "trouvée"
 
-#: builtin/ls-remote.c:76
 msgid "show underlying ref in addition to the object pointed by it"
 msgstr "afficher la réf sous-jacente en plus de l'objet pointé par elle"
 
-#: builtin/ls-tree.c:36
 msgid "git ls-tree [<options>] <tree-ish> [<path>...]"
 msgstr "git ls-tree [<options>] <arbre ou apparenté> [<chemin>...]"
 
-#: builtin/ls-tree.c:54
 #, c-format
 msgid "could not get object info about '%s'"
 msgstr "impossible d'obtenir l'information d'objet pour '%s'"
 
-#: builtin/ls-tree.c:79
 #, c-format
 msgid "bad ls-tree format: element '%s' does not start with '('"
 msgstr "mauvais format ls-tree : l'élément '%s' ne commence pas par '('"
 
-#: builtin/ls-tree.c:83
 #, c-format
 msgid "bad ls-tree format: element '%s' does not end in ')'"
 msgstr "mauvais format ls-tree : l'élément '%s' ne se termine pas ')'"
 
-#: builtin/ls-tree.c:109
 #, c-format
 msgid "bad ls-tree format: %%%.*s"
 msgstr "mauvais format ls-tree : %%%.*s"
 
-#: builtin/ls-tree.c:336
 msgid "only show trees"
 msgstr "afficher seulement les arbres"
 
-#: builtin/ls-tree.c:338
 msgid "recurse into subtrees"
 msgstr "parcourir les sous-arbres"
 
-#: builtin/ls-tree.c:340
 msgid "show trees when recursing"
 msgstr "afficher les arbres en les parcourant"
 
-#: builtin/ls-tree.c:343
 msgid "terminate entries with NUL byte"
 msgstr "terminer les éléments avec un octet NUL"
 
-#: builtin/ls-tree.c:344
 msgid "include object size"
 msgstr "inclure la taille d'objet"
 
-#: builtin/ls-tree.c:346 builtin/ls-tree.c:348
 msgid "list only filenames"
 msgstr "afficher seulement les noms de fichiers"
 
-#: builtin/ls-tree.c:350
 msgid "list only objects"
 msgstr "ne lister que les objets"
 
-#: builtin/ls-tree.c:353
 msgid "use full path names"
 msgstr "utiliser les noms de chemins complets"
 
-#: builtin/ls-tree.c:355
 msgid "list entire tree; not just current directory (implies --full-name)"
 msgstr ""
 "afficher l'arbre entier ; pas seulement le répertoire courant (implique --"
 "full-name)"
 
-#: builtin/ls-tree.c:391
 msgid "--format can't be combined with other format-altering options"
 msgstr ""
 "--format ne peut pas être combiné avec d'autres options de modification de "
 "format"
 
 #. TRANSLATORS: keep <> in "<" mail ">" info.
-#: builtin/mailinfo.c:14
 msgid "git mailinfo [<options>] <msg> <patch> < mail >info"
 msgstr "git mailinfo [<options>] <msg> <rustine> < mail >info"
 
-#: builtin/mailinfo.c:58
 msgid "keep subject"
 msgstr "garder le sujet"
 
-#: builtin/mailinfo.c:60
 msgid "keep non patch brackets in subject"
 msgstr "conserver les crochets autres que ceux autour de PATCH dans le sujet"
 
-#: builtin/mailinfo.c:62
 msgid "copy Message-ID to the end of commit message"
 msgstr "copier le Message-ID à la fin du message de validation"
 
-#: builtin/mailinfo.c:64
 msgid "re-code metadata to i18n.commitEncoding"
 msgstr "ré-encoder les méta-données en i18n.commitEncoding"
 
-#: builtin/mailinfo.c:67
 msgid "disable charset re-coding of metadata"
 msgstr "désactiver le ré-encodage de jeu de caractère des méta-données"
 
-#: builtin/mailinfo.c:69
 msgid "encoding"
 msgstr "jeu de caractère"
 
-#: builtin/mailinfo.c:70
 msgid "re-code metadata to this encoding"
 msgstr "ré-encoder les méta-données dans ce jeu de caractère"
 
-#: builtin/mailinfo.c:72
 msgid "use scissors"
 msgstr "utiliser les ciseaux"
 
-#: builtin/mailinfo.c:73
 msgid "<action>"
 msgstr "<action>"
 
-#: builtin/mailinfo.c:74
 msgid "action when quoted CR is found"
 msgstr "action lorsqu'un CR cité est trouvé"
 
-#: builtin/mailinfo.c:77
 msgid "use headers in message's body"
 msgstr "utiliser l'entête dans le corps de message"
 
-#: builtin/mailsplit.c:227
 msgid "reading patches from stdin/tty..."
 msgstr "lecture les mises à jour depuis l'entrée standard/la console..."
 
-#: builtin/mailsplit.c:242
 #, c-format
 msgid "empty mbox: '%s'"
 msgstr "mbox vide : '%s'"
 
-#: builtin/merge-base.c:32
 msgid "git merge-base [-a | --all] <commit> <commit>..."
 msgstr "git merge-base [-a | --all] <commit> <commit>..."
 
-#: builtin/merge-base.c:33
 msgid "git merge-base [-a | --all] --octopus <commit>..."
 msgstr "git merge-base [-a | --all] --octopus <commit>..."
 
-#: builtin/merge-base.c:34
 msgid "git merge-base --independent <commit>..."
 msgstr "git merge-base --independent <validation>..."
 
-#: builtin/merge-base.c:35
 msgid "git merge-base --is-ancestor <commit> <commit>"
 msgstr "git merge-base --is-ancestor <validation> <validation>"
 
-#: builtin/merge-base.c:36
 msgid "git merge-base --fork-point <ref> [<commit>]"
 msgstr "git merge-base --fork-point <référence> [<validation>]"
 
-#: builtin/merge-base.c:144
 msgid "output all common ancestors"
 msgstr "afficher tous les ancêtres communs"
 
-#: builtin/merge-base.c:146
 msgid "find ancestors for a single n-way merge"
 msgstr "trouver les ancêtres pour une fusion simple à n points"
 
-#: builtin/merge-base.c:148
 msgid "list revs not reachable from others"
 msgstr "afficher les révisions inaccessibles depuis les autres"
 
-#: builtin/merge-base.c:150
 msgid "is the first one ancestor of the other?"
 msgstr "est le premier ancêtre de l'autre ?"
 
-#: builtin/merge-base.c:152
 msgid "find where <commit> forked from reflog of <ref>"
 msgstr "trouver où <validation> a divergé du reflog de <référence>"
 
-#: builtin/merge-file.c:9
 msgid ""
 "git merge-file [<options>] [-L <name1> [-L <orig> [-L <name2>]]] <file1> "
 "<orig-file> <file2>"
@@ -18635,257 +8030,205 @@ msgstr ""
 "git merge-file [<options>] [-L <nom1> [-L <orig> [-L <nom2>]]] <fichier1> "
 "<fichier-orig> <fichier2>"
 
-#: builtin/merge-file.c:35
 msgid "send results to standard output"
 msgstr "envoyer les résultats sur la sortie standard"
 
-#: builtin/merge-file.c:36
 msgid "use a diff3 based merge"
 msgstr "utiliser une fusion basée sur diff3"
 
-#: builtin/merge-file.c:37
 msgid "use a zealous diff3 based merge"
 msgstr "utiliser une fusion basée sur un diff3 zélée"
 
-#: builtin/merge-file.c:39
 msgid "for conflicts, use our version"
 msgstr "pour les conflits, utiliser notre version (our)"
 
-#: builtin/merge-file.c:41
 msgid "for conflicts, use their version"
 msgstr "pour les conflits, utiliser leur version (their)"
 
-#: builtin/merge-file.c:43
 msgid "for conflicts, use a union version"
 msgstr "pour les conflits, utiliser l'ensemble des versions"
 
-#: builtin/merge-file.c:46
 msgid "for conflicts, use this marker size"
 msgstr "pour les conflits, utiliser cette taille de marqueur"
 
-#: builtin/merge-file.c:47
 msgid "do not warn about conflicts"
 msgstr "ne pas avertir à propos des conflits"
 
-#: builtin/merge-file.c:49
 msgid "set labels for file1/orig-file/file2"
 msgstr "définir les labels pour fichier1/fichier-orig/fichier2"
 
-#: builtin/merge-recursive.c:47
 #, c-format
 msgid "unknown option %s"
 msgstr "option inconnue %s"
 
-#: builtin/merge-recursive.c:53
 #, c-format
 msgid "could not parse object '%s'"
 msgstr "impossible d'analyser l'objet '%s'"
 
-#: builtin/merge-recursive.c:57
 #, c-format
 msgid "cannot handle more than %d base. Ignoring %s."
 msgid_plural "cannot handle more than %d bases. Ignoring %s."
 msgstr[0] "impossible de gérer plus de %d base. %s ignoré."
 msgstr[1] "impossible de gérer plus de %d bases. %s ignoré."
 
-#: builtin/merge-recursive.c:65
 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-recursive.c:74 builtin/merge-recursive.c:76
 #, c-format
 msgid "could not resolve ref '%s'"
 msgstr "impossible de résoudre la référence '%s'"
 
-#: builtin/merge-recursive.c:82
 #, c-format
 msgid "Merging %s with %s\n"
 msgstr "Fusion de %s avec %s\n"
 
-#: builtin/merge.c:59
 msgid "git merge [<options>] [<commit>...]"
 msgstr "git merge [<options>] [<commit>...]"
 
-#: builtin/merge.c:125
 msgid "switch `m' requires a value"
 msgstr "le commutateur `m' a besoin d'une valeur"
 
-#: builtin/merge.c:148
 #, c-format
 msgid "option `%s' requires a value"
 msgstr "le commutateur '%s' a besoin d'une valeur"
 
-#: builtin/merge.c:201
 #, c-format
 msgid "Could not find merge strategy '%s'.\n"
 msgstr "Impossible de trouver la stratégie de fusion '%s'.\n"
 
-#: builtin/merge.c:202
 #, c-format
 msgid "Available strategies are:"
 msgstr "Les stratégies disponibles sont :"
 
-#: builtin/merge.c:207
 #, c-format
 msgid "Available custom strategies are:"
 msgstr "Les stratégies personnalisées sont :"
 
-#: builtin/merge.c:258 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:261 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:262 builtin/pull.c:140
 msgid "(synonym to --stat)"
 msgstr "(synonyme de --stat)"
 
-#: builtin/merge.c:264 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:267 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:269 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:271 builtin/pull.c:155
 msgid "edit message before committing"
 msgstr "éditer le message avant la validation"
 
-#: builtin/merge.c:273
 msgid "allow fast-forward (default)"
 msgstr "autoriser l'avance rapide (défaut)"
 
-#: builtin/merge.c:275 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:279 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:280 builtin/notes.c:785 builtin/pull.c:172
-#: builtin/rebase.c:1145 builtin/revert.c:114
 msgid "strategy"
 msgstr "stratégie"
 
-#: builtin/merge.c:281 builtin/pull.c:173
 msgid "merge strategy to use"
 msgstr "stratégie de fusion à utiliser"
 
-#: builtin/merge.c:282 builtin/pull.c:176
 msgid "option=value"
 msgstr "option=valeur"
 
-#: builtin/merge.c:283 builtin/pull.c:177
 msgid "option for selected merge strategy"
 msgstr "option pour la stratégie de fusion sélectionnée"
 
-#: builtin/merge.c:285
 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:291
 msgid "use <name> instead of the real target"
 msgstr "utiliser <nom> au lieu de la cible réelle"
 
-#: builtin/merge.c:294
 msgid "abort the current in-progress merge"
 msgstr "abandonner la fusion en cours"
 
-#: builtin/merge.c:296
 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:298
 msgid "continue the current in-progress merge"
 msgstr "continuer la fusion en cours"
 
-#: builtin/merge.c:300 builtin/pull.c:184
 msgid "allow merging unrelated histories"
 msgstr "permettre la fusion d'historiques sans rapport"
 
-#: builtin/merge.c:307
 msgid "bypass pre-merge-commit and commit-msg hooks"
 msgstr "ne pas utiliser les crochets pre-merge-commit et commit-msg"
 
-#: builtin/merge.c:323
 msgid "could not run stash."
 msgstr "impossible de lancer le remisage."
 
-#: builtin/merge.c:328
 msgid "stash failed"
 msgstr "échec du remisage"
 
-#: builtin/merge.c:333
 #, c-format
 msgid "not a valid object: %s"
 msgstr "pas un objet valide : %s"
 
-#: builtin/merge.c:355 builtin/merge.c:372
 msgid "read-tree failed"
 msgstr "read-tree a échoué"
 
-#: builtin/merge.c:403
 msgid "Already up to date. (nothing to squash)"
 msgstr "Déjà à jour. (rien à compresser)"
 
-#: builtin/merge.c:417
+msgid "Already up to date."
+msgstr "Déjà à jour."
+
 #, c-format
 msgid "Squash commit -- not updating HEAD\n"
 msgstr "Validation compressée -- HEAD non mise à jour\n"
 
-#: builtin/merge.c:467
 #, c-format
 msgid "No merge message -- not updating HEAD\n"
 msgstr "Pas de message de fusion -- pas de mise à jour de HEAD\n"
 
-#: builtin/merge.c:517
 #, c-format
 msgid "'%s' does not point to a commit"
 msgstr "'%s' ne pointe pas sur un commit"
 
-#: builtin/merge.c:605
 #, c-format
 msgid "Bad branch.%s.mergeoptions string: %s"
 msgstr "Mauvaise chaîne branch.%s.mergeoptions : %s"
 
-#: builtin/merge.c:732
+msgid "Unable to write index."
+msgstr "Impossible d'écrire l'index."
+
 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:745
 #, c-format
 msgid "unknown strategy option: -X%s"
 msgstr "option de stratégie inconnue : -X%s"
 
-#: builtin/merge.c:764 t/helper/test-fast-rebase.c:223
 #, c-format
 msgid "unable to write %s"
 msgstr "impossible d'écrire %s"
 
-#: builtin/merge.c:816
 #, c-format
 msgid "Could not read from '%s'"
 msgstr "Impossible de lire depuis '%s'"
 
-#: builtin/merge.c:825
 #, 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:831
 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"
@@ -18897,11 +8240,9 @@ msgstr ""
 "branche de sujet.\n"
 "\n"
 
-#: builtin/merge.c:836
 msgid "An empty message aborts the commit.\n"
 msgstr "Un message vide abandonne la validation.\n"
 
-#: builtin/merge.c:839
 #, c-format
 msgid ""
 "Lines starting with '%c' will be ignored, and an empty message aborts\n"
@@ -18910,74 +8251,62 @@ msgstr ""
 "Les lignes commençant par '%c' seront ignorées, et un message vide\n"
 "abandonne la validation.\n"
 
-#: builtin/merge.c:900
 msgid "Empty commit message."
 msgstr "Message de validation vide."
 
-#: builtin/merge.c:915
 #, c-format
 msgid "Wonderful.\n"
 msgstr "Merveilleux.\n"
 
-#: builtin/merge.c:976
 #, 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:1015
 msgid "No current branch."
 msgstr "Pas de branche courante."
 
-#: builtin/merge.c:1017
 msgid "No remote for the current branch."
 msgstr "Pas de branche distante pour la branche courante."
 
-#: builtin/merge.c:1019
 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:1024
 #, c-format
 msgid "No remote-tracking branch for %s from %s"
 msgstr "Pas de branche de suivi pour %s depuis %s"
 
-#: builtin/merge.c:1081
 #, c-format
 msgid "Bad value '%s' in environment '%s'"
 msgstr "Mauvaise valeur '%s' dans l'environnement '%s'"
 
-#: builtin/merge.c:1183
+#, c-format
+msgid "could not close '%s'"
+msgstr "impossible de fermer '%s'"
+
 #, c-format
 msgid "not something we can merge in %s: %s"
 msgstr "pas possible de fusionner ceci dans %s : %s"
 
-#: builtin/merge.c:1217
 msgid "not something we can merge"
 msgstr "pas possible de fusionner ceci"
 
-#: builtin/merge.c:1330
 msgid "--abort expects no arguments"
 msgstr "--abort n'accepte pas d'argument"
 
-#: builtin/merge.c:1334
 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:1352
 msgid "--quit expects no arguments"
 msgstr "--quit n'accepte pas d'argument"
 
-#: builtin/merge.c:1365
 msgid "--continue expects no arguments"
 msgstr "--continue ne supporte aucun argument"
 
-#: builtin/merge.c:1369
 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:1385
 msgid ""
 "You have not concluded your merge (MERGE_HEAD exists).\n"
 "Please, commit your changes before you merge."
@@ -18985,7 +8314,6 @@ msgstr ""
 "Vous n'avez pas terminé votre fusion (MERGE_HEAD existe).\n"
 "Veuillez valider vos modifications avant de pouvoir fusionner."
 
-#: builtin/merge.c:1392
 msgid ""
 "You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists).\n"
 "Please, commit your changes before you merge."
@@ -18993,133 +8321,108 @@ msgstr ""
 "Vous n'avez pas terminé votre picorage (CHERRY_PICK_HEAD existe).\n"
 "Veuillez valider vos modifications avant de pouvoir fusionner."
 
-#: builtin/merge.c:1395
 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:1427
 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:1444
 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:1446
 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:1451
 #, c-format
 msgid "%s - not something we can merge"
 msgstr "%s - pas possible de fusionner ceci"
 
-#: builtin/merge.c:1453
 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:1540
 msgid "refusing to merge unrelated histories"
 msgstr "refus de fusionner des historiques sans relation"
 
-#: builtin/merge.c:1559
 #, c-format
 msgid "Updating %s..%s\n"
 msgstr "Mise à jour %s..%s\n"
 
-#: builtin/merge.c:1606
 #, c-format
 msgid "Trying really trivial in-index merge...\n"
 msgstr "Essai de fusion vraiment triviale dans l'index...\n"
 
-#: builtin/merge.c:1613
 #, c-format
 msgid "Nope.\n"
 msgstr "Non.\n"
 
-#: builtin/merge.c:1671 builtin/merge.c:1737
 #, c-format
 msgid "Rewinding the tree to pristine...\n"
 msgstr "Retour de l'arbre à l'original...\n"
 
-#: builtin/merge.c:1675
 #, c-format
 msgid "Trying merge strategy %s...\n"
 msgstr "Essai de la stratégie de fusion %s...\n"
 
-#: builtin/merge.c:1727
 #, 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:1729
 #, c-format
 msgid "Merge with strategy %s failed.\n"
 msgstr "La fusion avec la stratégie %s a échoué.\n"
 
-#: builtin/merge.c:1739
 #, 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:1753
 #, c-format
 msgid "Automatic merge went well; stopped before committing as requested\n"
 msgstr ""
 "La fusion automatique a réussi ; stoppée avant la validation comme demandé\n"
 
-#: builtin/mktag.c:27
 #, c-format
 msgid "warning: tag input does not pass fsck: %s"
 msgstr "attention : l'entrée d'étiquette ne passe pas fsck : %s"
 
-#: builtin/mktag.c:38
 #, c-format
 msgid "error: tag input does not pass fsck: %s"
 msgstr "erreur : l'entrée d'étiquette ne passe pas fsck : %s"
 
-#: builtin/mktag.c:41
 #, c-format
 msgid "%d (FSCK_IGNORE?) should never trigger this callback"
 msgstr "%d (FSCK_IGNORE?) ne devrait jamais rappeler cette fonction"
 
-#: builtin/mktag.c:56
 #, c-format
 msgid "could not read tagged object '%s'"
 msgstr "impossible de lire l'objet étiqueté '%s'"
 
-#: builtin/mktag.c:59
 #, c-format
 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
+msgid "could not read from stdin"
+msgstr "impossible de lire depuis l'entrée standard"
+
 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
 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
 msgid "unable to write tag file"
 msgstr "impossible d'écrire le fichier d'étiquettes"
 
-#: builtin/mktree.c:154
 msgid "input is NUL terminated"
 msgstr "l'entrée se termine par NUL"
 
-#: builtin/mktree.c:155 builtin/write-tree.c:26
 msgid "allow missing objects"
 msgstr "autoriser les objets manquants"
 
-#: builtin/mktree.c:156
 msgid "allow creation of more than one tree"
 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>][--refs-"
 "snapshot=<path>]"
@@ -19127,45 +8430,38 @@ msgstr ""
 "git multi-pack-index [<options>] write [--preferred-pack=<paquet>][--refs-"
 "snapshot=<chemin>]"
 
-#: 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:17
 msgid "git multi-pack-index [<options>] expire"
 msgstr "git multi-pack-index [<options>] expire"
 
-#: 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:57
+msgid "directory"
+msgstr "répertoire"
+
 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:98
 msgid "preferred-pack"
 msgstr "paquet-préféré"
 
-#: 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: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:206
 msgid ""
 "during repack, collect pack-files of smaller size into a batch that is "
 "larger than this size"
@@ -19173,159 +8469,123 @@ msgstr ""
 "pendant le repaquetage, collecter les fichiers paquet de plus petite taille "
 "dans un lot plus grand que cette taille"
 
-#: builtin/mv.c:18
 msgid "git mv [<options>] <source>... <destination>"
 msgstr "git mv [<options>] <source>... <destination>"
 
-#: builtin/mv.c:83
 #, c-format
 msgid "Directory %s is in index and no submodule?"
 msgstr "Le répertoire %s est dans l'index et pourtant aucun sous-module ?"
 
-#: builtin/mv.c:85
 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/mv.c:103
 #, c-format
 msgid "%.*s is in index"
 msgstr "%.*s est dans l'index"
 
-#: builtin/mv.c:125
 msgid "force move/rename even if target exists"
 msgstr "forcer le déplacement/renommage même si la cible existe"
 
-#: builtin/mv.c:127
 msgid "skip move/rename errors"
 msgstr "sauter les erreurs de déplacement/renommage"
 
-#: 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:184
 #, c-format
 msgid "Checking rename of '%s' to '%s'\n"
 msgstr "Vérification du renommage de '%s' en '%s'\n"
 
-#: builtin/mv.c:190
 msgid "bad source"
 msgstr "mauvaise source"
 
-#: 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:196
 msgid "cannot move directory over file"
 msgstr "impossible de déplacer un répertoire sur un fichier"
 
-#: builtin/mv.c:205
 msgid "source directory is empty"
 msgstr "le répertoire source est vide"
 
-#: builtin/mv.c:231
 msgid "not under version control"
 msgstr "pas sous le contrôle de version"
 
-#: builtin/mv.c:233
 msgid "conflicted"
 msgstr "en conflit"
 
-#: builtin/mv.c:236
 msgid "destination exists"
 msgstr "la destination existe"
 
-#: builtin/mv.c:244
 #, c-format
 msgid "overwriting '%s'"
 msgstr "écrasement de '%s'"
 
-#: builtin/mv.c:247
 msgid "Cannot overwrite"
 msgstr "Impossible d'écraser"
 
-#: builtin/mv.c:250
 msgid "multiple sources for the same target"
 msgstr "multiples sources pour la même destination"
 
-#: builtin/mv.c:252
 msgid "destination directory does not exist"
 msgstr "le répertoire de destination n'existe pas"
 
-#: builtin/mv.c:280
 #, c-format
 msgid "%s, source=%s, destination=%s"
 msgstr "%s, source=%s, destination=%s"
 
-#: builtin/mv.c:308
 #, c-format
 msgid "Renaming %s to %s\n"
 msgstr "Renommage de %s en %s\n"
 
-#: builtin/mv.c:314 builtin/remote.c:812 builtin/repack.c:861
 #, c-format
 msgid "renaming '%s' failed"
 msgstr "le renommage de '%s' a échoué"
 
-#: builtin/name-rev.c:524
 msgid "git name-rev [<options>] <commit>..."
 msgstr "git name-rev [<options>] <validation>..."
 
-#: builtin/name-rev.c:525
 msgid "git name-rev [<options>] --all"
 msgstr "git name-rev [<options>] --all"
 
-#: builtin/name-rev.c:526
 msgid "git name-rev [<options>] --annotate-stdin"
 msgstr "git name-rev [<options>] --annotate-stdin"
 
-#: builtin/name-rev.c:583
 msgid "print only ref-based names (no object names)"
 msgstr ""
 "afficher seulement les noms basés sur des références (pas de nom d'objet)"
 
-#: builtin/name-rev.c:584
 msgid "only use tags to name the commits"
 msgstr "utiliser seulement les étiquettes pour nommer les validations"
 
-#: builtin/name-rev.c:586
 msgid "only use refs matching <pattern>"
 msgstr "utiliser seulement les références correspondant à <motif>"
 
-#: builtin/name-rev.c:588
 msgid "ignore refs matching <pattern>"
 msgstr "ignorer les références correspondant à <motif>"
 
-#: builtin/name-rev.c:590
 msgid "list all commits reachable from all refs"
 msgstr ""
 "afficher toutes les validations accessibles depuis toutes les références"
 
-#: builtin/name-rev.c:591
-msgid "deprecated: use annotate-stdin instead"
-msgstr "obsolète : utilisez annotate-stdin à la place"
+msgid "deprecated: use --annotate-stdin instead"
+msgstr "obsolète : utilisez --annotate-stdin à la place"
 
-#: builtin/name-rev.c:592
 msgid "annotate text from stdin"
 msgstr "annoter le texte depuis l'entrée standard"
 
-#: builtin/name-rev.c:593
 msgid "allow to print `undefined` names (default)"
 msgstr "autoriser l'affichage des noms `non définis` (par défaut)"
 
-#: builtin/name-rev.c:599
 msgid "dereference tags in the input (internal use)"
 msgstr "déréférencer les étiquettes en entrée (usage interne)"
 
-#: builtin/notes.c:28
 msgid "git notes [--ref <notes-ref>] [list [<object>]]"
 msgstr "git notes [--ref <références-notes>] [list [<object>]]"
 
-#: builtin/notes.c:29
 msgid ""
 "git notes [--ref <notes-ref>] add [-f] [--allow-empty] [-m <msg> | -F <file> "
 "| (-c | -C) <object>] [<object>]"
@@ -19333,12 +8593,10 @@ msgstr ""
 "git notes [--ref <références-notes>] add [-f] [--allow-empty] [-m <message> "
 "| -F <fichier> | (-c | -C) <objet>] [<objet>]"
 
-#: builtin/notes.c:30
 msgid "git notes [--ref <notes-ref>] copy [-f] <from-object> <to-object>"
 msgstr ""
 "git notes [--ref <références-notes>] copy [-f] <depuis-objet> <vers-objet>"
 
-#: builtin/notes.c:31
 msgid ""
 "git notes [--ref <notes-ref>] append [--allow-empty] [-m <msg> | -F <file> | "
 "(-c | -C) <object>] [<object>]"
@@ -19346,140 +8604,107 @@ msgstr ""
 "git notes [--ref <références-notes>] append [--allow-empty] [-m <message> | -"
 "F <fichier> | (-c | -C) <objet>] [<objet>]"
 
-#: builtin/notes.c:32
 msgid "git notes [--ref <notes-ref>] edit [--allow-empty] [<object>]"
 msgstr "git notes [--ref <références-notes>] edit [--allow-empty] [<objet>]"
 
-#: builtin/notes.c:33
 msgid "git notes [--ref <notes-ref>] show [<object>]"
 msgstr "git notes [--ref <références-notes>] show [<objet>]"
 
-#: builtin/notes.c:34
 msgid ""
 "git notes [--ref <notes-ref>] merge [-v | -q] [-s <strategy>] <notes-ref>"
 msgstr ""
 "git notes [--ref <références-notes>] merge [-v | -q] [-s <stratégie> ] "
 "<références-notes>"
 
-#: builtin/notes.c:37
 msgid "git notes [--ref <notes-ref>] remove [<object>...]"
 msgstr "git notes [--ref <références-notes>] remove [<objet>...]"
 
-#: builtin/notes.c:38
 msgid "git notes [--ref <notes-ref>] prune [-n] [-v]"
 msgstr "git notes [--ref <référence-notes>] prune [-n] [-v]"
 
-#: builtin/notes.c:39
 msgid "git notes [--ref <notes-ref>] get-ref"
 msgstr "git notes [--ref <références-notes>] get-ref"
 
-#: builtin/notes.c:44
 msgid "git notes [list [<object>]]"
 msgstr "git notes [list [<objet>]]"
 
-#: builtin/notes.c:49
 msgid "git notes add [<options>] [<object>]"
 msgstr "git notes add [<options>] [<objet>]"
 
-#: builtin/notes.c:54
 msgid "git notes copy [<options>] <from-object> <to-object>"
 msgstr "git notes copy [<options>] <depuis-objet> <vers-objet>"
 
-#: builtin/notes.c:55
 msgid "git notes copy --stdin [<from-object> <to-object>]..."
 msgstr "git notes copy --stdin [<depuis-objet> <vers-objet>]..."
 
-#: builtin/notes.c:60
 msgid "git notes append [<options>] [<object>]"
 msgstr "git notes append [<options>] [<objet>]"
 
-#: builtin/notes.c:65
 msgid "git notes edit [<object>]"
 msgstr "git notes edit [<objet>]"
 
-#: builtin/notes.c:70
 msgid "git notes show [<object>]"
 msgstr "git notes show [<objet>]"
 
-#: builtin/notes.c:75
 msgid "git notes merge [<options>] <notes-ref>"
 msgstr "git notes merge [<options>] <références-notes>"
 
-#: builtin/notes.c:76
 msgid "git notes merge --commit [<options>]"
 msgstr "git notes merge --commit [<options>]"
 
-#: builtin/notes.c:77
 msgid "git notes merge --abort [<options>]"
 msgstr "git notes merge --abort [<options>]"
 
-#: builtin/notes.c:82
 msgid "git notes remove [<object>]"
 msgstr "git notes remove [<objet>]"
 
-#: builtin/notes.c:87
 msgid "git notes prune [<options>]"
 msgstr "git notes prune [<options>]"
 
-#: builtin/notes.c:97
 msgid "Write/edit the notes for the following object:"
 msgstr "Écrire/éditer les notes pour l'objet suivant :"
 
-#: builtin/notes.c:149
 #, c-format
 msgid "unable to start 'show' for object '%s'"
 msgstr "impossible de démarrer 'show' pour l'objet '%s'"
 
-#: builtin/notes.c:153
 msgid "could not read 'show' output"
 msgstr "impossible de lire la sortie de 'show'"
 
-#: builtin/notes.c:161
 #, c-format
 msgid "failed to finish 'show' for object '%s'"
 msgstr "impossible de finir 'show' pour l'objet '%s'"
 
-#: builtin/notes.c:194
 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:203
 msgid "unable to write note object"
 msgstr "impossible d'écrire l'objet note"
 
-#: 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:240 builtin/tag.c:582
 #, c-format
 msgid "could not open or read '%s'"
 msgstr "impossible d'ouvrir ou lire '%s'"
 
-#: 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:263
 #, c-format
 msgid "failed to read object '%s'."
 msgstr "impossible de lire l'objet '%s'."
 
-#: 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:307
 #, c-format
 msgid "malformed input line: '%s'."
 msgstr "ligne en entrée malformée : '%s'."
 
-#: 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'"
@@ -19487,41 +8712,32 @@ msgstr "impossible de copier les notes de '%s' vers '%s'"
 #. TRANSLATORS: the first %s will be replaced by a git
 #. notes command: 'add', 'merge', 'remove', etc.
 #.
-#: 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: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:408 builtin/notes.c:574
 msgid "note contents as a string"
 msgstr "contenu de la note sous forme de chaîne"
 
-#: 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: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:417 builtin/notes.c:583
 msgid "reuse specified note object"
 msgstr "réutiliser l'objet de note spécifié"
 
-#: builtin/notes.c:420 builtin/notes.c:586
 msgid "allow storing empty note"
 msgstr "permettre de stocker une note vide"
 
-#: builtin/notes.c:421 builtin/notes.c:494
 msgid "replace existing notes"
 msgstr "remplacer les notes existantes"
 
-#: builtin/notes.c:446
 #, c-format
 msgid ""
 "Cannot add notes. Found existing notes for object %s. Use '-f' to overwrite "
@@ -19530,30 +8746,24 @@ msgstr ""
 "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: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:473 builtin/notes.c:635 builtin/notes.c:904
 #, c-format
 msgid "Removing note for object %s\n"
 msgstr "Suppression de la note pour l'objet %s\n"
 
-#: builtin/notes.c:495
 msgid "read objects from stdin"
 msgstr "lire les objets depuis l'entrée standard"
 
-#: 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:515
 msgid "too few arguments"
 msgstr "trop peu d'arguments"
 
-#: builtin/notes.c:536
 #, c-format
 msgid ""
 "Cannot copy notes. Found existing notes for object %s. Use '-f' to overwrite "
@@ -19562,12 +8772,10 @@ msgstr ""
 "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: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:601
 #, c-format
 msgid ""
 "The -m/-F/-c/-C options have been deprecated for the 'edit' subcommand.\n"
@@ -19576,52 +8784,40 @@ msgstr ""
 "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: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: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: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: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:722
 msgid "could not find commit from NOTES_MERGE_PARTIAL."
 msgstr "impossible de trouver le commit de NOTES_MERGE_PARTIAL."
 
-#: 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:737
 msgid "failed to resolve NOTES_MERGE_REF"
 msgstr "échec de la résolution de NOTES_MERGE_REF"
 
-#: builtin/notes.c:740
 msgid "failed to finalize notes merge"
 msgstr "impossible de finaliser la fusion de notes"
 
-#: builtin/notes.c:766
 #, c-format
 msgid "unknown notes merge strategy %s"
 msgstr "stratégie de fusion de notes inconnue %s"
 
-#: builtin/notes.c:782
 msgid "General options"
 msgstr "Options générales"
 
-#: builtin/notes.c:784
 msgid "Merge options"
 msgstr "Options de fusion"
 
-#: builtin/notes.c:786
 msgid ""
 "resolve notes conflicts using the given strategy (manual/ours/theirs/union/"
 "cat_sort_uniq)"
@@ -19629,47 +8825,37 @@ msgstr ""
 "résoudre les conflits de notes en utilisant la stratégie donnée (manual/ours/"
 "theirs/union/cat_sort_uniq)"
 
-#: builtin/notes.c:788
 msgid "Committing unmerged notes"
 msgstr "Validation des notes non fusionnées"
 
-#: 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:792
 msgid "Aborting notes merge resolution"
 msgstr "Abandon de la résolution de fusion des notes"
 
-#: builtin/notes.c:794
 msgid "abort notes merge"
 msgstr "abandonner la fusion de notes"
 
-#: builtin/notes.c:805
 msgid "cannot mix --commit, --abort or -s/--strategy"
 msgstr "--commit, --abort et -s/--strategy sont mutuellement incompatibles"
 
-#: 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:834
 #, c-format
 msgid "unknown -s/--strategy: %s"
 msgstr "-s/--strategy inconnu : %s"
 
-#: builtin/notes.c:874
 #, 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:878
 #, 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:880
 #, c-format
 msgid ""
 "Automatic notes merge failed. Fix conflicts in %s and commit the result with "
@@ -19680,61 +8866,49 @@ msgstr ""
 "validez le résultat avec 'git notes merges --commit', ou abandonnez la "
 "fusion avec 'git notes merge --abort'.\n"
 
-#: builtin/notes.c:899 builtin/tag.c:595
 #, 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:902
 #, c-format
 msgid "Object %s has no note\n"
 msgstr "L'objet %s n'a pas de note\n"
 
-#: builtin/notes.c:914
 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:917
 msgid "read object names from the standard input"
 msgstr "lire les noms d'objet depuis l'entrée standard"
 
-#: builtin/notes.c:956 builtin/prune.c:144 builtin/worktree.c:148
 msgid "do not remove, show only"
 msgstr "ne pas supprimer, afficher seulement"
 
-#: builtin/notes.c:957
 msgid "report pruned notes"
 msgstr "afficher les notes éliminées"
 
-#: builtin/notes.c:1000
 msgid "notes-ref"
 msgstr "références-notes"
 
-#: builtin/notes.c:1001
 msgid "use notes from <notes-ref>"
 msgstr "utiliser les notes depuis <références-notes>"
 
-#: builtin/notes.c:1036 builtin/stash.c:1802
 #, c-format
 msgid "unknown subcommand: %s"
 msgstr "sous-commande inconnue : %s"
 
-#: builtin/pack-objects.c:182
 msgid ""
 "git pack-objects --stdout [<options>...] [< <ref-list> | < <object-list>]"
 msgstr ""
 "git pack-objects --stdout [options...] [< <liste-références> | < <liste-"
 "objets>]"
 
-#: builtin/pack-objects.c:183
 msgid ""
 "git pack-objects [<options>...] <base-name> [< <ref-list> | < <object-list>]"
 msgstr ""
 "git pack-objects [options...] base-name [< <liste-références> | < <liste-"
 "objets>]"
 
-#: builtin/pack-objects.c:570
 #, c-format
 msgid ""
 "write_reuse_object: could not locate %s, expected at offset %<PRIuMAX> in "
@@ -19743,115 +8917,103 @@ msgstr ""
 "write_reuse_object : impossible de localiser %s, attendu à l'offset "
 "%<PRIuMAX> dans le paquet %s"
 
-#: builtin/pack-objects.c:578
 #, c-format
 msgid "bad packed object CRC for %s"
 msgstr "mauvais CRC d'objet empaqueté pour %s"
 
-#: builtin/pack-objects.c:589
 #, c-format
 msgid "corrupt packed object for %s"
 msgstr "objet empaqueté corrompu pour %s"
 
-#: builtin/pack-objects.c:720
 #, c-format
 msgid "recursive delta detected for object %s"
 msgstr "delta récursif détecté pour l'objet %s"
 
-#: builtin/pack-objects.c:939
 #, c-format
 msgid "ordered %u objects, expected %<PRIu32>"
 msgstr "%u objets commandés, %<PRIu32> attendus"
 
-#: builtin/pack-objects.c:1034
 #, c-format
 msgid "expected object at offset %<PRIuMAX> in pack %s"
 msgstr "objet attendu à l'offset %<PRIuMAX> dans le paquet %s"
 
-#: builtin/pack-objects.c:1158
 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:1171
 msgid "Writing objects"
 msgstr "Écriture des objets"
 
-#: builtin/pack-objects.c:1243 builtin/update-index.c:90
 #, c-format
 msgid "failed to stat %s"
 msgstr "échec du stat de %s"
 
-#: builtin/pack-objects.c:1276
+#, c-format
+msgid "failed utime() on %s"
+msgstr "échec de utime() sur %s"
+
 msgid "failed to write bitmap index"
 msgstr "écrire un index de bitmap"
 
-#: builtin/pack-objects.c:1302
 #, c-format
 msgid "wrote %<PRIu32> objects while expecting %<PRIu32>"
 msgstr "%<PRIu32> objets écrits, %<PRIu32> attendus"
 
-#: builtin/pack-objects.c:1544
 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:1992
 #, 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:2001
 #, 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:2282
 msgid "Counting objects"
 msgstr "Décompte des objets"
 
-#: builtin/pack-objects.c:2447
+#, c-format
+msgid "unable to get size of %s"
+msgstr "impossible de récupérer la taille de %s"
+
 #, 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:2517 builtin/pack-objects.c:2533
-#: builtin/pack-objects.c:2543
 #, c-format
 msgid "object %s cannot be read"
 msgstr "l'objet %s ne peut être lu"
 
-#: builtin/pack-objects.c:2520 builtin/pack-objects.c:2547
 #, 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:2557
 msgid "suboptimal pack - out of memory"
 msgstr "paquet sous-optimal - mémoire insuffisante"
 
-#: builtin/pack-objects.c:2872
 #, 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:3011
 #, 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:3097
+#, c-format
+msgid "unable to get type of object %s"
+msgstr "impossible d'obtenir le type de l'objet %s"
+
 msgid "Compressing objects"
 msgstr "Compression des objets"
 
-#: builtin/pack-objects.c:3103
 msgid "inconsistency with delta count"
 msgstr "inconsistance dans le compte de delta"
 
-#: builtin/pack-objects.c:3182
 #, c-format
 msgid ""
 "value of uploadpack.blobpackfileuri must be of the form '<object-hash> <pack-"
@@ -19860,7 +9022,6 @@ msgstr ""
 "la valeur de uploadpack.blobpackfileuri doit être de la forme '<empreinte-d-"
 "objet> <empreinte-de-pack> <uri>' ('%s' reçu)"
 
-#: builtin/pack-objects.c:3185
 #, c-format
 msgid ""
 "object already configured in another uploadpack.blobpackfileuri (got '%s')"
@@ -19868,18 +9029,27 @@ msgstr ""
 "l'objet est déjà configuré dans un autre uploadpack.blobpackfileuri ('%s' "
 "reçu)"
 
-#: builtin/pack-objects.c:3220
 #, 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:3348 builtin/pack-objects.c:3359
-#: builtin/pack-objects.c:3373
 #, c-format
 msgid "could not find pack '%s'"
 msgstr "impossible de trouver le paquet '%s'"
 
-#: builtin/pack-objects.c:3416
+#, c-format
+msgid "packfile %s cannot be accessed"
+msgstr "le fichier paquet %s ne peut être accédé"
+
+msgid "Enumerating cruft objects"
+msgstr "Énumération des objets déchets"
+
+msgid "unable to add cruft objects"
+msgstr "impossible d'ajouter les objets déchets"
+
+msgid "Traversing cruft objects"
+msgstr "Traversée des objets"
+
 #, c-format
 msgid ""
 "expected edge object ID, got garbage:\n"
@@ -19888,7 +9058,6 @@ msgstr ""
 "ID d'objet de bord attendu, reçu des données illisibles :\n"
 "%s"
 
-#: builtin/pack-objects.c:3422
 #, c-format
 msgid ""
 "expected object ID, got garbage:\n"
@@ -19897,248 +9066,214 @@ msgstr ""
 "ID d'objet attendu, reçu des données illisibles :\n"
 "%s"
 
-#: builtin/pack-objects.c:3540 builtin/pack-objects.c:3627
+msgid "could not load cruft pack .mtimes"
+msgstr "impossible de charger le paquet déchet des mtimes"
+
 msgid "cannot open pack index"
 msgstr "impossible d'ouvrir l'index de paquet"
 
-#: builtin/pack-objects.c:3549
 #, 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:3635
 msgid "unable to force loose object"
 msgstr "impossible de forcer l'objet libre"
 
-#: builtin/pack-objects.c:3763
 #, c-format
 msgid "not a rev '%s'"
 msgstr "'%s' n'est pas une révision"
 
-#: builtin/pack-objects.c:3766 builtin/rev-parse.c:1061
 #, c-format
 msgid "bad revision '%s'"
 msgstr "mauvaise révision '%s'"
 
-#: builtin/pack-objects.c:3794
 msgid "unable to add recent objects"
 msgstr "impossible d'ajouter les objets récents"
 
-#: builtin/pack-objects.c:3847
 #, c-format
 msgid "unsupported index version %s"
 msgstr "version d'index non supportée %s"
 
-#: builtin/pack-objects.c:3851
 #, c-format
 msgid "bad index version '%s'"
 msgstr "mauvaise version d'index '%s'"
 
-#: builtin/pack-objects.c:3907
 msgid "<version>[,<offset>]"
 msgstr "<version>[,<décalage>]"
 
-#: builtin/pack-objects.c:3908
 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:3911
 msgid "maximum size of each output pack file"
 msgstr "taille maximum de chaque fichier paquet en sortie"
 
-#: builtin/pack-objects.c:3913
 msgid "ignore borrowed objects from alternate object store"
 msgstr "ignorer les objets empruntés à un autre magasin d'objets"
 
-#: builtin/pack-objects.c:3915
 msgid "ignore packed objects"
 msgstr "ignorer les objets empaquetés"
 
-#: builtin/pack-objects.c:3917
 msgid "limit pack window by objects"
 msgstr "limiter la fenêtre d'empaquetage par objets"
 
-#: builtin/pack-objects.c:3919
 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:3921
 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:3923
 msgid "reuse existing deltas"
 msgstr "réutiliser les deltas existants"
 
-#: builtin/pack-objects.c:3925
 msgid "reuse existing objects"
 msgstr "réutiliser les objets existants"
 
-#: builtin/pack-objects.c:3927
 msgid "use OFS_DELTA objects"
 msgstr "utiliser les objets OFS_DELTA"
 
-#: builtin/pack-objects.c:3929
 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:3931
 msgid "do not create an empty pack output"
 msgstr "ne pas créer un paquet vide"
 
-#: builtin/pack-objects.c:3933
 msgid "read revision arguments from standard input"
 msgstr "lire les paramètres de révision depuis l'entrée standard"
 
-#: builtin/pack-objects.c:3935
 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:3938
 msgid "include objects reachable from any reference"
 msgstr "inclure les objets accessibles depuis toute référence"
 
-#: builtin/pack-objects.c:3941
 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:3944
 msgid "include objects referred to by the index"
 msgstr "inclure les objets référencés par l'index"
 
-#: builtin/pack-objects.c:3947
 msgid "read packs from stdin"
 msgstr "lire les paquets depuis l'entrée standard"
 
-#: builtin/pack-objects.c:3949
 msgid "output pack to stdout"
 msgstr "afficher l'empaquetage sur la sortie standard"
 
-#: builtin/pack-objects.c:3951
 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:3953
 msgid "keep unreachable objects"
 msgstr "garder les objets inaccessibles"
 
-#: builtin/pack-objects.c:3955
 msgid "pack loose unreachable objects"
 msgstr "empaqueter les objets inaccessibles détachés"
 
-#: builtin/pack-objects.c:3957
 msgid "unpack unreachable objects newer than <time>"
 msgstr "dépaqueter les objets inaccessibles plus récents que <heure>"
 
-#: builtin/pack-objects.c:3960
+msgid "create a cruft pack"
+msgstr "créer un paquet déchet"
+
+msgid "expire cruft objects older than <time>"
+msgstr "faire expirer les objets déchets plus vieux que <heure>"
+
 msgid "use the sparse reachability algorithm"
 msgstr "utiliser l'algorithme de joignabilité creuse"
 
-#: builtin/pack-objects.c:3962
 msgid "create thin packs"
 msgstr "créer des paquets légers"
 
-#: builtin/pack-objects.c:3964
 msgid "create packs suitable for shallow fetches"
 msgstr "créer des paquets permettant des récupérations superficielles"
 
-#: builtin/pack-objects.c:3966
 msgid "ignore packs that have companion .keep file"
 msgstr "ignorer les paquets qui ont un fichier .keep"
 
-#: builtin/pack-objects.c:3968
 msgid "ignore this pack"
 msgstr "ignorer ce paquet"
 
-#: builtin/pack-objects.c:3970
 msgid "pack compression level"
 msgstr "niveau de compression du paquet"
 
-#: builtin/pack-objects.c:3972
 msgid "do not hide commits by grafts"
 msgstr "ne pas cacher les validations par greffes"
 
-#: builtin/pack-objects.c:3974
 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:3976
 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:3980
 msgid "write a bitmap index if possible"
 msgstr "écrire un index de bitmap si possible"
 
-#: builtin/pack-objects.c:3984
 msgid "handling for missing objects"
 msgstr "gestion des objets manquants"
 
-#: builtin/pack-objects.c:3987
 msgid "do not pack objects in promisor packfiles"
 msgstr "ne pas empaqueter les objets dans les fichiers paquets prometteurs"
 
-#: builtin/pack-objects.c:3989
 msgid "respect islands during delta compression"
 msgstr "respecter les îlots pendant la compression des deltas"
 
-#: builtin/pack-objects.c:3991
 msgid "protocol"
 msgstr "protocole"
 
-#: builtin/pack-objects.c:3992
 msgid "exclude any configured uploadpack.blobpackfileuri with this protocol"
 msgstr "exclure tout uploadpack.blobpackfileuri configuré avec ce protocole"
 
-#: builtin/pack-objects.c:4027
 #, 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:4032
 #, c-format
 msgid "pack.deltaCacheLimit is too high, forcing %d"
 msgstr "pack.deltaCacheLimit est trop grand, forcé à %d"
 
-#: builtin/pack-objects.c:4088
+#, c-format
+msgid "bad pack compression level %d"
+msgstr "niveau de compression du paquet %d"
+
 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:4090
 msgid "minimum pack size limit is 1 MiB"
 msgstr "la taille limite minimale d'un paquet est 1 MiB"
 
-#: builtin/pack-objects.c:4095
 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
 msgid "cannot use --filter without --stdout"
 msgstr "impossible d'utiliser --filter sans --stdout"
 
-#: builtin/pack-objects.c:4106
 msgid "cannot use --filter with --stdin-packs"
 msgstr "impossible d'utiliser --filter avec --stdin-packs"
 
-#: builtin/pack-objects.c:4110
 msgid "cannot use internal rev list with --stdin-packs"
-msgstr "impossible d'utiliser un liste interne de révisions avec --stdin-packs"
+msgstr ""
+"impossible d'utiliser une liste interne de révisions avec --stdin-packs"
+
+msgid "cannot use internal rev list with --cruft"
+msgstr "impossible d'utiliser une liste interne de révisions avec --cruft"
+
+msgid "cannot use --stdin-packs with --cruft"
+msgstr "impossible d'utiliser --stdin-packs avec --cruft"
+
+msgid "cannot use --max-pack-size with --cruft"
+msgstr "impossible d'utiliser --max-pack-size avec --cruft"
 
-#: builtin/pack-objects.c:4169
 msgid "Enumerating objects"
 msgstr "Énumération des objets"
 
-#: builtin/pack-objects.c:4210
 #, c-format
 msgid ""
 "Total %<PRIu32> (delta %<PRIu32>), reused %<PRIu32> (delta %<PRIu32>), pack-"
@@ -20147,7 +9282,6 @@ msgstr ""
 "Total %<PRIu32> (delta %<PRIu32>), réutilisés %<PRIu32> (delta %<PRIu32>), "
 "réutilisés du pack %<PRIu32>"
 
-#: builtin/pack-redundant.c:601
 msgid ""
 "'git pack-redundant' is nominated for removal.\n"
 "If you still use this command, please add an extra\n"
@@ -20161,79 +9295,60 @@ msgstr ""
 "sur la ligne de commande pour nous avertir par\n"
 "un courriel à <git@vger.kernel.org>. Merci.\n"
 
-#: builtin/pack-refs.c:8
 msgid "git pack-refs [<options>]"
 msgstr "git pack-refs [<options>]"
 
-#: builtin/pack-refs.c:16
 msgid "pack everything"
 msgstr "empaqueter tout"
 
-#: builtin/pack-refs.c:17
 msgid "prune loose refs (default)"
 msgstr "éliminer les références perdues (défaut)"
 
-#: builtin/prune.c:14
 msgid "git prune [-n] [-v] [--progress] [--expire <time>] [--] [<head>...]"
 msgstr "git prune [-n] [-v] [--progress] [--expire <heure>] [--] [<head>…]"
 
-#: builtin/prune.c:145
 msgid "report pruned objects"
 msgstr "afficher les objets éliminés"
 
-#: builtin/prune.c:148
 msgid "expire objects older than <time>"
 msgstr "faire expirer les objets plus vieux que <heure>"
 
-#: builtin/prune.c:150
 msgid "limit traversal to objects outside promisor packfiles"
 msgstr "limiter la traversée aux objets hors des fichiers paquets prometteurs"
 
-#: builtin/prune.c:163
 msgid "cannot prune in a precious-objects repo"
 msgstr "impossible de nettoyer dans un dépôt d'objets précieux"
 
-#: builtin/pull.c:67
 msgid "git pull [<options>] [<repository> [<refspec>...]]"
 msgstr "git pull [<options>] [<dépôt> [<spécification-de-référence>...]]"
 
-#: 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:128
 msgid "Options related to merging"
 msgstr "Options relatives à la fusion"
 
-#: 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:159 builtin/revert.c:126
 msgid "allow fast-forward"
 msgstr "autoriser l'avance rapide"
 
-#: 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:371
 msgid "automatically stash/stash pop before and after"
 msgstr "remiser et réappliquer automatiquement avant et après"
 
-#: builtin/pull.c:187
 msgid "Options related to fetching"
 msgstr "Options relatives au rapatriement"
 
-#: builtin/pull.c:197
 msgid "force overwrite of local branch"
 msgstr "forcer l'écrasement de la branche locale"
 
-#: builtin/pull.c:205
 msgid "number of submodules pulled in parallel"
 msgstr "nombre de sous-modules tirés en parallèle"
 
-#: builtin/pull.c:449
 msgid ""
 "There is no candidate for rebasing against among the refs that you just "
 "fetched."
@@ -20241,14 +9356,12 @@ msgstr ""
 "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: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:452
 msgid ""
 "Generally this means that you provided a wildcard refspec which had no\n"
 "matches on the remote end."
@@ -20256,7 +9369,6 @@ msgstr ""
 "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:455
 #, c-format
 msgid ""
 "You asked to pull from the remote '%s', but did not specify\n"
@@ -20268,44 +9380,33 @@ msgstr ""
 "configuration\n"
 "pour la branche actuelle, vous devez spécifier la branche avec la commande."
 
-#: builtin/pull.c:460 builtin/rebase.c:978
 msgid "You are not currently on a branch."
 msgstr "Vous n'êtes actuellement sur aucune branche."
 
-#: 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: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: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:467 builtin/pull.c:473 builtin/pull.c:482
-#: builtin/rebase.c:984
 msgid "<remote>"
 msgstr "<distant>"
 
-#: builtin/pull.c:467 builtin/pull.c:482 builtin/pull.c:487
-#: contrib/scalar/scalar.c:374
 msgid "<branch>"
 msgstr "<branche>"
 
-#: builtin/pull.c:475 builtin/rebase.c:976
 msgid "There is no tracking information for the current branch."
 msgstr "Pas d'information de suivi distant pour la branche actuelle."
 
-#: 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:489
 #, c-format
 msgid ""
 "Your configuration specifies to merge with the ref '%s'\n"
@@ -20315,16 +9416,13 @@ msgstr ""
 "'%s'\n"
 "du serveur distant, mais cette référence n'a pas été récupérée."
 
-#: builtin/pull.c:600
 #, c-format
 msgid "unable to access commit %s"
 msgstr "impossible d'accéder le commit %s"
 
-#: builtin/pull.c:908
 msgid "ignoring --verify-signatures for rebase"
 msgstr "--verify-signatures est ignoré pour un rebasage"
 
-#: builtin/pull.c:969
 msgid ""
 "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"
@@ -20353,21 +9451,17 @@ msgstr ""
 "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:1047
 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:1051
 msgid "pull with rebase"
 msgstr "tirer avec un rebasage"
 
-#: builtin/pull.c:1052
 msgid "please commit or stash them."
 msgstr "veuillez les valider ou les remiser."
 
-#: builtin/pull.c:1077
 #, c-format
 msgid ""
 "fetch updated the current branch head.\n"
@@ -20378,7 +9472,6 @@ msgstr ""
 "avance rapide de votre copie de travail\n"
 "depuis le commit %s."
 
-#: builtin/pull.c:1083
 #, c-format
 msgid ""
 "Cannot fast-forward your working tree.\n"
@@ -20395,50 +9488,53 @@ msgstr ""
 "$ git reset --hard\n"
 "pour régénérer."
 
-#: builtin/pull.c:1098
 msgid "Cannot merge multiple branches into empty head."
 msgstr "Impossible de fusionner de multiples branches sur une tête vide."
 
-#: builtin/pull.c:1103
 msgid "Cannot rebase onto multiple branches."
 msgstr "Impossible de rebaser sur de multiples branches."
 
-#: builtin/pull.c:1105
 msgid "Cannot fast-forward to multiple branches."
 msgstr "Impossible d'aller en avance rapide sur de multiples branches."
 
-#: builtin/pull.c:1120
 msgid "Need to specify how to reconcile divergent branches."
 msgstr "Besoin de spécifier comment réconcilier des branches divergentes."
 
-#: builtin/pull.c:1134
 msgid "cannot rebase with locally recorded submodule modifications"
 msgstr ""
 "impossible de rebaser avec des modifications de sous-modules enregistrées "
 "localement"
 
-#: builtin/push.c:19
 msgid "git push [<options>] [<repository> [<refspec>...]]"
 msgstr "git push [<options>] [<dépôt> [<spécification-de-référence>...]]"
 
-#: builtin/push.c:111
 msgid "tag shorthand without <tag>"
 msgstr "raccourci d'étiquette sans <étiquette>"
 
-#: builtin/push.c:119
 msgid "--delete only accepts plain target ref names"
 msgstr "--delete accepte seulement des noms entiers de références cibles"
 
-#: builtin/push.c:164
 msgid ""
 "\n"
-"To choose either option permanently, see push.default in 'git help config'."
+"To choose either option permanently, see push.default in 'git help config'.\n"
 msgstr ""
 "\n"
 "Pour choisir l'option de manière permanente, voir push.default dans 'git "
-"help config'."
+"help config'.\n"
+
+msgid ""
+"\n"
+"To avoid automatically configuring upstream branches when their name\n"
+"doesn't match the local branch, see option 'simple' of branch."
+"autoSetupMerge\n"
+"in 'git help config'.\n"
+msgstr ""
+"\n"
+"Pour éviter de configurer automatiquement les branches amonts quand leur "
+"nom\n"
+"ne correspond pas à la branche locale, voir l'option 'simple'\n"
+"de branch.autoSetupMerge dans 'git help config'.\n"
 
-#: builtin/push.c:167
 #, c-format
 msgid ""
 "The upstream branch of your current branch does not match\n"
@@ -20450,10 +9546,10 @@ msgid ""
 "To push to the branch of the same name on the remote, use\n"
 "\n"
 "    git push %s HEAD\n"
-"%s"
+"%s%s"
 msgstr ""
 "La branche amont de votre branche courante ne correspond pas\n"
-"au nom de votre branche courante.  Pour pousser vers la branche amont\n"
+"au nom de votre branche courante. Pour pousser vers la branche amont\n"
 "sur le serveur distant, utilisez\n"
 "\n"
 "    git push %s HEAD:%s\n"
@@ -20461,9 +9557,8 @@ msgstr ""
 "Pour pousser vers la branche du même nom sur le serveur distant, utilisez\n"
 "\n"
 "    git push %s HEAD\n"
-"%s"
+"%s%s"
 
-#: builtin/push.c:182
 #, c-format
 msgid ""
 "You are not currently on a branch.\n"
@@ -20478,34 +9573,41 @@ msgstr ""
 "\n"
 "    git push %s HEAD:<nom-de-la-branche-amont>\n"
 
-#: builtin/push.c:191
+msgid ""
+"\n"
+"To have this happen automatically for branches without a tracking\n"
+"upstream, see 'push.autoSetupRemote' in 'git help config'.\n"
+msgstr ""
+"\n"
+"Pour que cela soit fait automatiquement pour les branches sans\n"
+"suivi distant, voir \"push.autoSetupRemote' dans 'git help config'.\n"
+
 #, c-format
 msgid ""
 "The current branch %s has no upstream branch.\n"
 "To push the current branch and set the remote as upstream, use\n"
 "\n"
 "    git push --set-upstream %s %s\n"
+"%s"
 msgstr ""
 "La branche courante %s n'a pas de branche amont.\n"
 "Pour pousser la branche courante et définir la distante comme amont, "
 "utilisez\n"
 "\n"
 "    git push --set-upstream %s %s\n"
+"%s"
 
-#: builtin/push.c:199
 #, c-format
 msgid "The current branch %s has multiple upstream branches, refusing to push."
 msgstr ""
 "La branche courante %s a de multiples branches amont, impossible de pousser."
 
-#: builtin/push.c:217
 msgid ""
 "You didn't specify any refspecs to push, and push.default is \"nothing\"."
 msgstr ""
 "Vous n'avez pas spécifié de spécifications de référence à pousser, et push."
 "default est \"nothing\"."
 
-#: builtin/push.c:243
 #, c-format
 msgid ""
 "You are pushing to remote '%s', which is not the upstream of\n"
@@ -20516,7 +9618,6 @@ msgstr ""
 "qui n'est pas l'amont de votre branche courante '%s', sans\n"
 "me dire quoi pousser pour mettre à jour quelle branche amont."
 
-#: 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"
@@ -20531,7 +9632,6 @@ msgstr ""
 "Voir la 'Note à propos des avances rapides' dans 'git push --help' pour plus "
 "d'information."
 
-#: 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"
@@ -20546,7 +9646,6 @@ msgstr ""
 "Voir la 'Note à propos des avances rapides' dans 'git push --help' pour plus "
 "d'information."
 
-#: 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"
@@ -20564,13 +9663,11 @@ msgstr ""
 "Voir la 'Note à propos des avances rapides' dans 'git push --help' pour plus "
 "d'information."
 
-#: builtin/push.c:277
 msgid "Updates were rejected because the tag already exists in the remote."
 msgstr ""
 "Les mises à jour ont été rejetées car l'étiquette existe déjà dans la "
 "branche distante."
 
-#: builtin/push.c: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"
@@ -20582,7 +9679,6 @@ msgstr ""
 "pointer\n"
 "vers un objet qui n'est pas un commit, sans utiliser l'option '--force'.\n"
 
-#: 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"
@@ -20594,100 +9690,80 @@ msgstr ""
 "ces changements localement (par exemple 'git pull ...') avant de\n"
 "forcer à nouveau une mise à jour.\n"
 
-#: builtin/push.c:355
 #, c-format
 msgid "Pushing to %s\n"
 msgstr "Poussée vers %s\n"
 
-#: builtin/push.c:362
 #, c-format
 msgid "failed to push some refs to '%s'"
 msgstr "impossible de pousser des références vers '%s'"
 
-#: builtin/push.c:544 builtin/submodule--helper.c:3377
+#, c-format
+msgid "invalid value for '%s'"
+msgstr "valeur invalide pour '%s'"
+
 msgid "repository"
 msgstr "dépôt"
 
-#: 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:195
 msgid "mirror all refs"
 msgstr "refléter toutes les références"
 
-#: builtin/push.c:548
 msgid "delete refs"
 msgstr "supprimer les références"
 
-#: builtin/push.c:549
 msgid "push tags (can't be used with --all or --mirror)"
 msgstr ""
 "pousser les étiquettes (ne peut pas être utilisé avec --all ou --mirror)"
 
-#: builtin/push.c:552 builtin/send-pack.c:196
 msgid "force updates"
 msgstr "forcer les mises à jour"
 
-#: 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: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:212
 msgid "require remote updates to be integrated locally"
 msgstr "exiger des mises à jours distantes pour une intégration locale"
 
-#: builtin/push.c:560
 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:203
 msgid "use thin pack"
 msgstr "utiliser un empaquetage léger"
 
-#: 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"
 
-#: builtin/push.c:564
 msgid "set upstream for git pull/status"
 msgstr "définir la branche amont pour git pull/status"
 
-#: builtin/push.c:567
 msgid "prune locally removed refs"
 msgstr "éliminer les références locales supprimées"
 
-#: builtin/push.c:569
 msgid "bypass pre-push hook"
 msgstr "éviter d'utiliser le crochet pre-push"
 
-#: builtin/push.c:570
 msgid "push missing but relevant tags"
 msgstr "pousser les étiquettes manquantes mais pertinentes"
 
-#: 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:204
 msgid "request atomic transaction on remote side"
 msgstr "demande une transaction atomique sur le serveur distant"
 
-#: builtin/push.c:594
 msgid "--delete doesn't make sense without any refs"
 msgstr "--delete n'a pas de sens sans aucune référence"
 
-#: builtin/push.c:614
 #, c-format
 msgid "bad repository '%s'"
 msgstr "mauvais dépôt '%s'"
 
-#: builtin/push.c:615
 msgid ""
 "No configured push destination.\n"
 "Either specify the URL from the command-line or configure a remote "
@@ -20709,68 +9785,53 @@ msgstr ""
 "\n"
 "    git push <nom>\n"
 
-#: builtin/push.c:632
 msgid "--all can't be combined with refspecs"
 msgstr "--all ne peut pas être combiné avec des spécifications de référence"
 
-#: builtin/push.c:638
 msgid "--mirror can't be combined with refspecs"
 msgstr "--mirror ne peut pas être combiné avec des spécifications de référence"
 
-#: builtin/push.c:648
 msgid "push options must not have new line characters"
 msgstr ""
 "les options de poussée ne peuvent pas contenir de caractères de nouvelle "
 "ligne"
 
-#: builtin/range-diff.c:9
 msgid "git range-diff [<options>] <old-base>..<old-tip> <new-base>..<new-tip>"
 msgstr ""
 "git range-diff [<options>] <ancienne-base>..<ancien-sommet> <nouvelle-base>.."
 "<nouveau-sommet>"
 
-#: builtin/range-diff.c:10
 msgid "git range-diff [<options>] <old-tip>...<new-tip>"
 msgstr "git range-diff [<options>] <ancien-sommet>...<nouveau-sommet>"
 
-#: builtin/range-diff.c:11
 msgid "git range-diff [<options>] <base> <old-tip> <new-tip>"
 msgstr "git range-diff [<options>] <base> <ancien-sommet> <nouveau-sommet>"
 
-#: builtin/range-diff.c:30
 msgid "use simple diff colors"
 msgstr "utiliser des couleurs de diff simples"
 
-#: builtin/range-diff.c:32
 msgid "notes"
 msgstr "notes"
 
-#: builtin/range-diff.c:32
 msgid "passed to 'git log'"
 msgstr "passé à 'git log'"
 
-#: builtin/range-diff.c:35
 msgid "only emit output related to the first range"
 msgstr "afficher seulement les sorties liées à la première plage"
 
-#: builtin/range-diff.c:37
 msgid "only emit output related to the second range"
 msgstr "afficher seulement les sorties liées à la deuxième plage"
 
-#: builtin/range-diff.c:60 builtin/range-diff.c:64
 #, c-format
 msgid "not a commit range: '%s'"
 msgstr "pas une plage de commit : '%s'"
 
-#: builtin/range-diff.c:74
 msgid "single arg format must be symmetric range"
 msgstr "un format d'argument unique doit être une plage symétrique"
 
-#: builtin/range-diff.c:89
 msgid "need two commit ranges"
 msgstr "plage entre deux commits requise"
 
-#: builtin/read-tree.c:41
 msgid ""
 "git read-tree [(-m [--trivial] [--aggressive] | --reset | --prefix=<prefix>) "
 "[-u | -i]] [--no-sparse-checkout] [--index-output=<file>] (--empty | <tree-"
@@ -20781,79 +9842,60 @@ msgstr ""
 "output=<fichier>] (--empty | <arbre-esque1> [<arbre-esque2> [<arbre-"
 "esque3>]])"
 
-#: builtin/read-tree.c:116
 msgid "write resulting index to <file>"
 msgstr "écrire l'index résultant dans <fichier>"
 
-#: builtin/read-tree.c:119
 msgid "only empty the index"
 msgstr "juste vider l'index"
 
-#: builtin/read-tree.c:121
 msgid "Merging"
 msgstr "Fusion"
 
-#: 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: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: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:129
 msgid "same as -m, but discard unmerged entries"
 msgstr "comme -m, mais annule les éléments non fusionnés"
 
-#: builtin/read-tree.c:130
 msgid "<subdirectory>/"
 msgstr "<sous-répertoire>/"
 
-#: 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: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:136
 msgid "gitignore"
 msgstr "gitignore"
 
-#: 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: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: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:143
 msgid "skip applying sparse checkout filter"
 msgstr "sauter l'application du filtre d'extraction creuse"
 
-#: builtin/read-tree.c:145
 msgid "debug unpack-trees"
 msgstr "déboguer unpack-trees"
 
-#: builtin/read-tree.c:149
 msgid "suppress feedback messages"
 msgstr "supprimer les messages d'information de suivi"
 
-#: builtin/read-tree.c:190
 msgid "You need to resolve your current index first"
 msgstr "Vous devez d'abord résoudre votre index courant"
 
-#: builtin/rebase.c:36
 msgid ""
 "git rebase [-i] [options] [--exec <cmd>] [--onto <newbase> | --keep-base] "
 "[<upstream> [<branch>]]"
@@ -20861,51 +9903,49 @@ msgstr ""
 "git rebase [-i] [options] [--exec <cmd>] [--onto <nouvelle-base> | --keep-"
 "base] [<amont> [<branche>]]"
 
-#: builtin/rebase.c:38
 msgid ""
 "git rebase [-i] [options] [--exec <cmd>] [--onto <newbase>] --root [<branch>]"
 msgstr ""
 "git rebase [-i] [options] [--exec <cmd>] [--onto <nouvelle-base>] --root "
 "[<branche>]"
 
-#: builtin/rebase.c:231
+#, c-format
+msgid "could not read '%s'."
+msgstr "impossible de lire '%s'."
+
 #, c-format
 msgid "could not create temporary %s"
 msgstr "impossible de créer un fichier temporaire %s"
 
-#: builtin/rebase.c:237
 msgid "could not mark as interactive"
 msgstr "impossible de marquer comme interactif"
 
-#: builtin/rebase.c:290
 msgid "could not generate todo list"
 msgstr "impossible de générer la liste à-faire"
 
-#: builtin/rebase.c:332
 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:391
 #, c-format
 msgid "%s requires the merge backend"
 msgstr "%s requiert un moteur de fusion"
 
-#: builtin/rebase.c:433
 #, c-format
 msgid "could not get 'onto': '%s'"
 msgstr "impossible d'accéder 'onto' : '%s'"
 
-#: builtin/rebase.c:450
 #, c-format
 msgid "invalid orig-head: '%s'"
 msgstr "orig-head invalide : '%s'"
 
-#: builtin/rebase.c:475
 #, c-format
 msgid "ignoring invalid allow_rerere_autoupdate: '%s'"
 msgstr "allow_rerere_autoupdate invalide ignoré : '%s'"
 
-#: builtin/rebase.c:600
+#, c-format
+msgid "could not remove '%s'"
+msgstr "impossible de supprimer '%s'"
+
 msgid ""
 "Resolve all conflicts manually, mark them as resolved with\n"
 "\"git add/rm <conflicted_files>\", then run \"git rebase --continue\".\n"
@@ -20919,7 +9959,6 @@ msgstr ""
 "arrêter\n"
 "et revenir à l'état antérieur à la commande, lancez \"git rebase --abort\"."
 
-#: builtin/rebase.c:685
 #, c-format
 msgid ""
 "\n"
@@ -20938,12 +9977,10 @@ msgstr ""
 "\n"
 "Résultat, git ne peut pas les rebaser."
 
-#: builtin/rebase.c:836
 #, c-format
 msgid "could not switch to %s"
 msgstr "impossible de basculer vers %s"
 
-#: builtin/rebase.c:952
 #, c-format
 msgid ""
 "unrecognized empty type '%s'; valid values are \"drop\", \"keep\", and "
@@ -20952,7 +9989,6 @@ msgstr ""
 "type vide non connu '%s' ; les valeurs valides sont \"drop\" (abandonner), "
 "\"keep\" (garder) et \"ask\" (demander)."
 
-#: builtin/rebase.c:970
 #, c-format
 msgid ""
 "%s\n"
@@ -20969,7 +10005,6 @@ msgstr ""
 "    git rebase '<branche>'\n"
 "\n"
 
-#: builtin/rebase.c:986
 #, c-format
 msgid ""
 "If you wish to set tracking information for this branch you can do so with:\n"
@@ -20983,183 +10018,154 @@ msgstr ""
 "    git branch --set-upstream-to=%s/<branche> %s\n"
 "\n"
 
-#: builtin/rebase.c:1016
 msgid "exec commands cannot contain newlines"
 msgstr "les commandes exec ne peut pas contenir de retour à la ligne"
 
-#: builtin/rebase.c:1020
 msgid "empty exec command"
 msgstr "commande exec vide"
 
-#: builtin/rebase.c:1051
 msgid "rebase onto given branch instead of upstream"
 msgstr "rebaser sur la branche %s au lieu de la branche amont"
 
-#: builtin/rebase.c:1053
 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:1055
 msgid "allow pre-rebase hook to run"
 msgstr "permettre le lancement du crochet pre-rebase"
 
-#: builtin/rebase.c:1057
 msgid "be quiet. implies --no-stat"
 msgstr "être silencieux. implique --no-stat"
 
-#: builtin/rebase.c:1060
 msgid "display a diffstat of what changed upstream"
 msgstr "afficher un diffstat de ce qui a changé en amont"
 
-#: builtin/rebase.c:1063
 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:1066
 msgid "add a Signed-off-by trailer to each commit"
 msgstr "ajouter une ligne Signed-off-by à chaque message de validation"
 
-#: builtin/rebase.c:1069
 msgid "make committer date match author date"
 msgstr "mettre la date de validateur à la date auteur"
 
-#: builtin/rebase.c:1071
 msgid "ignore author date and use current date"
 msgstr "ignorer la date d'auteur et utilise la date actuelle"
 
-#: builtin/rebase.c:1073
 msgid "synonym of --reset-author-date"
 msgstr "synonyme pour --reset-author-date"
 
-#: builtin/rebase.c:1075 builtin/rebase.c:1079
 msgid "passed to 'git apply'"
 msgstr "passé jusqu'à git apply"
 
-#: builtin/rebase.c:1077
 msgid "ignore changes in whitespace"
 msgstr "ignorer des modifications d'espaces"
 
-#: builtin/rebase.c:1081 builtin/rebase.c:1084
 msgid "cherry-pick all commits, even if unchanged"
 msgstr "picorer tous les commits, même sans modifiant"
 
-#: builtin/rebase.c:1086
 msgid "continue"
 msgstr "continuer"
 
-#: builtin/rebase.c:1089
 msgid "skip current patch and continue"
 msgstr "sauter le patch courant et continuer"
 
-#: builtin/rebase.c:1091
 msgid "abort and check out the original branch"
 msgstr "abandonner et extraire la branche d'origine"
 
-#: builtin/rebase.c:1094
 msgid "abort but keep HEAD where it is"
 msgstr "abandonne mais garde HEAD où il est"
 
-#: builtin/rebase.c:1095
 msgid "edit the todo list during an interactive rebase"
 msgstr "éditer la liste à faire lors d'un rebasage interactif"
 
-#: builtin/rebase.c:1098
 msgid "show the patch file being applied or merged"
 msgstr "afficher le patch en cours d'application ou de fusion"
 
-#: builtin/rebase.c:1101
 msgid "use apply strategies to rebase"
 msgstr "utiliser des stratégies d'application pour rebaser"
 
-#: builtin/rebase.c:1105
 msgid "use merging strategies to rebase"
 msgstr "utiliser des stratégies de fusion pour rebaser"
 
-#: builtin/rebase.c:1109
 msgid "let the user edit the list of commits to rebase"
 msgstr "laisser l'utilisateur éditer la liste des commits à rebaser"
 
-#: builtin/rebase.c:1113
-msgid "(DEPRECATED) try to recreate merges instead of ignoring them"
-msgstr "(DÉCONSEILLÉ) essayer de recréer les fusions au lieu de les ignorer"
+msgid "(REMOVED) was: try to recreate merges instead of ignoring them"
+msgstr "(EFFACÉ) était : essayer de recréer les fusions au lieu de les ignorer"
 
-#: builtin/rebase.c:1118
 msgid "how to handle commits that become empty"
 msgstr "comment gérer les commits qui deviennent vides"
 
-#: builtin/rebase.c:1121
 msgid "keep commits which start empty"
 msgstr "conserver les commits qui commencent vides"
 
-#: builtin/rebase.c:1125
 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:1132
 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:1136
 msgid "allow rebasing commits with empty messages"
 msgstr "autoriser les commits de rebasage avec des messages vides"
 
-#: builtin/rebase.c:1140
 msgid "try to rebase merges instead of skipping them"
 msgstr "essayer de rebaser les fusions au lieu de les garder"
 
-#: builtin/rebase.c:1143
 msgid "use 'merge-base --fork-point' to refine upstream"
 msgstr "utiliser 'merge-base --fork-point' pour raffiner l'amont"
 
-#: builtin/rebase.c:1145
 msgid "use the given merge strategy"
 msgstr "utiliser la stratégie de fusion indiquée"
 
-#: builtin/rebase.c:1147 builtin/revert.c:115
 msgid "option"
 msgstr "option"
 
-#: builtin/rebase.c:1148
 msgid "pass the argument through to the merge strategy"
 msgstr "passer les arguments jusqu'à la stratégie de fusion"
 
-#: builtin/rebase.c:1151
 msgid "rebase all reachable commits up to the root(s)"
 msgstr "rebaser tous les objets inatteignables depuis les racines"
 
-#: builtin/rebase.c:1154
 msgid "automatically re-schedule any `exec` that fails"
 msgstr "re-planifier automatiquement tout `exec` qui échoue"
 
-#: builtin/rebase.c:1156
 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:1177
 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:1208
-msgid "--preserve-merges was replaced by --rebase-merges"
-msgstr "--preserve-merges a été remplacé par --rebase-merges"
+msgid ""
+"`rebase --preserve-merges` (-p) is no longer supported.\n"
+"Use `git rebase --abort` to terminate current rebase.\n"
+"Or downgrade to v2.33, or earlier, to complete the rebase."
+msgstr ""
+"`rebase --preserve-merges` (-p) n'est plus géré. Utilisez\n"
+"`git rebase --abort` pour terminer le rebasage en cours. Ou redescendez\n"
+"à la version 2.33 ou plus récente, pour terminer le rebasage."
+
+msgid ""
+"--preserve-merges was replaced by --rebase-merges\n"
+"Note: Your `pull.rebase` configuration may also be set to 'preserve',\n"
+"which is no longer supported; use 'merges' instead"
+msgstr ""
+"--preserve-merges a été remplacé par --rebase-merges\n"
+"Note : votre configuration `pull.rebase` peut aussi être 'preserve',\n"
+"qui n'est plus géré ; utilisez 'merges' à la place"
 
-#: builtin/rebase.c:1230
 msgid "No rebase in progress?"
 msgstr "Pas de rebasage en cours ?"
 
-#: builtin/rebase.c:1234
 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:1257 t/helper/test-fast-rebase.c:122
 msgid "Cannot read HEAD"
 msgstr "Impossible de lire HEAD"
 
-#: builtin/rebase.c:1269
 msgid ""
 "You must edit all merge conflicts and then\n"
 "mark them as resolved using git add"
@@ -21167,16 +10173,13 @@ msgstr ""
 "Vous devez éditer tous les conflits de fusion et\n"
 "les marquer comme résolus avec git add"
 
-#: builtin/rebase.c:1287
 msgid "could not discard worktree changes"
 msgstr "impossible de supprimer les changements de l'arbre de travail"
 
-#: builtin/rebase.c:1308
 #, c-format
 msgid "could not move back to %s"
 msgstr "impossible de revenir à %s"
 
-#: builtin/rebase.c:1354
 #, c-format
 msgid ""
 "It seems that there is already a %s directory, and\n"
@@ -21198,129 +10201,101 @@ msgstr ""
 "chose\n"
 "d'important ici.\n"
 
-#: builtin/rebase.c:1382
 msgid "switch `C' expects a numerical value"
 msgstr "l'option `C' attend un valeur numérique"
 
-#: builtin/rebase.c:1424
 #, c-format
 msgid "Unknown mode: %s"
 msgstr "Mode inconnu : %s"
 
-#: builtin/rebase.c:1463
 msgid "--strategy requires --merge or --interactive"
 msgstr "--strategy requiert --merge ou --interactive"
 
-#: builtin/rebase.c:1492
 msgid "apply options and merge options cannot be used together"
 msgstr ""
 "Les options d'apply et celles de merge ne peuvent pas être utilisées ensemble"
 
-#: builtin/rebase.c:1505
 #, c-format
 msgid "Unknown rebase backend: %s"
 msgstr "Backend de rebasage inconnu : %s"
 
-#: builtin/rebase.c:1534
 msgid "--reschedule-failed-exec requires --exec or --interactive"
 msgstr "--reschedule-failed-exec requiert --exec ou --interactive"
 
-#: builtin/rebase.c:1565
 #, c-format
 msgid "invalid upstream '%s'"
 msgstr "amont invalide '%s'"
 
-#: builtin/rebase.c:1571
 msgid "Could not create new root commit"
 msgstr "Impossible de créer un nouveau commit racine"
 
-#: builtin/rebase.c:1597
+#, c-format
+msgid "no such branch/commit '%s'"
+msgstr "pas de branche ou commit '%s'"
+
+#, c-format
+msgid "No such ref: %s"
+msgstr "Référence inexistante : %s"
+
+msgid "Could not resolve HEAD to a revision"
+msgstr "Impossible de résoudre le commit HEAD vers un révision"
+
 #, 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:1600
 #, c-format
 msgid "'%s': need exactly one merge base"
 msgstr "'%s': exactement une base de fusion nécessaire"
 
-#: builtin/rebase.c:1609
 #, c-format
 msgid "Does not point to a valid commit '%s'"
 msgstr "Ne pointe pas sur une validation valide : '%s'"
 
-#: builtin/rebase.c:1636
-#, c-format
-msgid "no such branch/commit '%s'"
-msgstr "pas de branche ou commit '%s'"
-
-#: builtin/rebase.c:1647 builtin/submodule--helper.c:43
-#: builtin/submodule--helper.c:2477
-#, c-format
-msgid "No such ref: %s"
-msgstr "Référence inexistante : %s"
-
-#: builtin/rebase.c:1658
-msgid "Could not resolve HEAD to a revision"
-msgstr "Impossible de résoudre le commit HEAD vers un révision"
-
-#: builtin/rebase.c:1679
 msgid "Please commit or stash them."
 msgstr "Veuillez les valider ou les remiser."
 
-#: builtin/rebase.c:1714
 msgid "HEAD is up to date."
 msgstr "HEAD est à jour."
 
-#: builtin/rebase.c:1716
 #, c-format
 msgid "Current branch %s is up to date.\n"
 msgstr "La branche courante %s est à jour.\n"
 
-#: builtin/rebase.c:1724
 msgid "HEAD is up to date, rebase forced."
 msgstr "HEAD est à jour, rebasage forcé."
 
-#: builtin/rebase.c:1726
 #, 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:1734
 msgid "The pre-rebase hook refused to rebase."
 msgstr "Le crochet pre-rebase a refusé de rebaser."
 
-#: builtin/rebase.c:1741
 #, c-format
 msgid "Changes to %s:\n"
 msgstr "Changements vers %s :\n"
 
-#: builtin/rebase.c:1744
 #, c-format
 msgid "Changes from %s to %s:\n"
 msgstr "Changements de %s sur %s :\n"
 
-#: builtin/rebase.c:1769
 #, 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:1781
 msgid "Could not detach HEAD"
 msgstr "Impossible de détacher HEAD"
 
-#: builtin/rebase.c:1790
 #, c-format
 msgid "Fast-forwarded %s to %s.\n"
 msgstr "Avance rapide de %s sur %s.\n"
 
-#: builtin/receive-pack.c:35
 msgid "git receive-pack <git-dir>"
 msgstr "git receive-pack <répertoire-git>"
 
-#: builtin/receive-pack.c:1263
 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"
@@ -21350,7 +10325,6 @@ msgstr ""
 "Pour éliminer ce message et conserver le comportement par défaut,\n"
 "réglez « receive.denyCurrentBranch » à 'refuse'."
 
-#: builtin/receive-pack.c:1283
 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"
@@ -21370,19 +10344,15 @@ msgstr ""
 "\n"
 "Pour éliminer ce message, réglez-le à 'refuse'."
 
-#: builtin/receive-pack.c:2476
 msgid "quiet"
 msgstr "quiet"
 
-#: builtin/receive-pack.c:2491
 msgid "you must specify a directory"
 msgstr "Vous devez spécifier un répertoire"
 
-#: builtin/reflog.c:9
 msgid "git reflog [show] [<log-options>] [<ref>]"
 msgstr "git reflog [show] [<options-de-journal>] [<réf>]"
 
-#: builtin/reflog.c:12
 msgid ""
 "git reflog expire [--expire=<time>] [--expire-unreachable=<time>]\n"
 "                  [--rewrite] [--updateref] [--stale-fix]\n"
@@ -21394,7 +10364,6 @@ msgstr ""
 "                  [--dry-run | -n] [--verbose] [--all [--single-worktree] | "
 "<réfs>...]"
 
-#: builtin/reflog.c:17
 msgid ""
 "git reflog delete [--rewrite] [--updateref]\n"
 "                  [--dry-run | -n] [--verbose] <ref>@{<specifier>}..."
@@ -21402,44 +10371,35 @@ msgstr ""
 "git reflog delete [--rewrite] [--updateref]\n"
 "                  [--dry-run | -n] [--verbose] <réf>@{<spécificateur>}..."
 
-#: builtin/reflog.c:21
 msgid "git reflog exists <ref>"
 msgstr "git reflog exists <référence>"
 
-#: builtin/reflog.c:197 builtin/reflog.c:211
 #, c-format
 msgid "invalid timestamp '%s' given to '--%s'"
 msgstr "horodatage invalide '%s' fourni à '--%s'"
 
-#: builtin/reflog.c:240 builtin/reflog.c:359
 msgid "do not actually prune any entries"
 msgstr "ne pas réellement élaguer des entrées"
 
-#: builtin/reflog.c:243 builtin/reflog.c:362
 msgid ""
 "rewrite the old SHA1 with the new SHA1 of the entry that now precedes it"
 msgstr ""
 "réécrire l'ancien SHA1 avec le nouveau SHA1 de l'entrée qui la précède "
 "maintenant"
 
-#: builtin/reflog.c:246 builtin/reflog.c:365
 msgid "update the reference to the value of the top reflog entry"
 msgstr ""
 "mettre à jour la référence avec la valeur de l'entrée en tête de reflog"
 
-#: builtin/reflog.c:248 builtin/reflog.c:367
 msgid "print extra information on screen"
 msgstr "Afficher de l'informations supplémentaires"
 
-#: builtin/reflog.c:249 builtin/reflog.c:253
 msgid "timestamp"
 msgstr "horodatage"
 
-#: builtin/reflog.c:250
 msgid "prune entries older than the specified time"
 msgstr "élaguer les entrées plus vieilles que <temps>"
 
-#: builtin/reflog.c:254
 msgid ""
 "prune entries older than <time> that are not reachable from the current tip "
 "of the branch"
@@ -21447,38 +10407,30 @@ msgstr ""
 "élaguer les entrées plus anciennes que <temps> qui ne sont pas joignables "
 "depuis le sommet actuel de la branche"
 
-#: builtin/reflog.c:258
 msgid "prune any reflog entries that point to broken commits"
 msgstr "élaguer les entrées de reflog qui pointent sur des commits cassés"
 
-#: builtin/reflog.c:259
 msgid "process the reflogs of all references"
 msgstr "traiter les reflogs de toutes les références"
 
-#: builtin/reflog.c:261
 msgid "limits processing to reflogs from the current worktree only"
 msgstr "limite le traitement des reflogs seulement à l'arbre de travail actuel"
 
-#: builtin/reflog.c:294
 #, c-format
 msgid "Marking reachable objects..."
 msgstr "Marquage des objets inaccessibles..."
 
-#: builtin/reflog.c:338
 #, c-format
 msgid "%s points nowhere!"
 msgstr "%s ne pointe nulle part !"
 
-#: builtin/reflog.c:374
 msgid "no reflog specified to delete"
 msgstr "pas de journal de références à supprimer spécifié"
 
-#: builtin/reflog.c:396
 #, c-format
 msgid "invalid ref format: %s"
 msgstr "format de référence invalide : %s"
 
-#: builtin/remote.c:19
 msgid ""
 "git remote add [-t <branch>] [-m <master>] [-f] [--tags | --no-tags] [--"
 "mirror=<fetch|push>] <name> <url>"
@@ -21486,88 +10438,68 @@ msgstr ""
 "git remote add [-t <branche>] [-m <master>] [-f] [--tags | --no-tags] [--"
 "mirror=<fetch|push>] <nom> <url>"
 
-#: builtin/remote.c:20 builtin/remote.c:40
 msgid "git remote rename [--[no-]progress] <old> <new>"
 msgstr "git remote rename [--[no-]progress] <ancien> <nouveau>"
 
-#: builtin/remote.c:21 builtin/remote.c:45
 msgid "git remote remove <name>"
 msgstr "git remote remove <nom>"
 
-#: builtin/remote.c:22 builtin/remote.c:50
 msgid "git remote set-head <name> (-a | --auto | -d | --delete | <branch>)"
 msgstr "git remote set-head <nom> (-a | --auto | -d | --delete | <branche>)"
 
-#: builtin/remote.c:23
 msgid "git remote [-v | --verbose] show [-n] <name>"
 msgstr "git remote [-v | --verbose] show [-n] <nom>"
 
-#: builtin/remote.c:24
 msgid "git remote prune [-n | --dry-run] <name>"
 msgstr "git remote prune [-n | --dry-run] <nom>"
 
-#: builtin/remote.c:25
 msgid ""
 "git remote [-v | --verbose] update [-p | --prune] [(<group> | <remote>)...]"
 msgstr ""
 "git remote [-v | --verbose] update [-p | --prune] [(<groupe> | "
 "<distante>)...]"
 
-#: builtin/remote.c:26
 msgid "git remote set-branches [--add] <name> <branch>..."
 msgstr "git remote set-branches [--add] <nom> <branche>..."
 
-#: builtin/remote.c:27 builtin/remote.c:76
 msgid "git remote get-url [--push] [--all] <name>"
 msgstr "git remote get-url [--push] [--all] <nom>"
 
-#: builtin/remote.c:28 builtin/remote.c:81
 msgid "git remote set-url [--push] <name> <newurl> [<oldurl>]"
 msgstr "git remote set-url [--push] <nom> <nouvelle-URL> [<ancienne-URL>]"
 
-#: builtin/remote.c:29 builtin/remote.c:82
 msgid "git remote set-url --add <name> <newurl>"
 msgstr "git remote set-url --add <nom> <nouvelle-URL>"
 
-#: builtin/remote.c:30 builtin/remote.c:83
 msgid "git remote set-url --delete <name> <url>"
 msgstr "git remote set-url --delete <nom> <url>"
 
-#: builtin/remote.c:35
 msgid "git remote add [<options>] <name> <url>"
 msgstr "git remote add [<options>] <nom> <URL>"
 
-#: builtin/remote.c:55
 msgid "git remote set-branches <name> <branch>..."
 msgstr "git remote set-branches <nom> <branche>..."
 
-#: builtin/remote.c:56
 msgid "git remote set-branches --add <name> <branch>..."
 msgstr "git remote set-branches --add <nom> <branche>..."
 
-#: builtin/remote.c:61
 msgid "git remote show [<options>] <name>"
 msgstr "git remote show [<options>] <nom>"
 
-#: builtin/remote.c:66
 msgid "git remote prune [<options>] <name>"
 msgstr "git remote prune [<options>] <nom>"
 
-#: builtin/remote.c:71
 msgid "git remote update [<options>] [<group> | <remote>]..."
 msgstr "git remote update [<options>] [<groupe> | <distante>]..."
 
-#: builtin/remote.c:100
 #, c-format
 msgid "Updating %s"
 msgstr "Mise à jour de %s"
 
-#: builtin/remote.c:102
 #, c-format
 msgid "Could not fetch %s"
 msgstr "Impossible de récupérer %s"
 
-#: builtin/remote.c:132
 msgid ""
 "--mirror is dangerous and deprecated; please\n"
 "\t use --mirror=fetch or --mirror=push instead"
@@ -21575,83 +10507,74 @@ msgstr ""
 "--mirror est dangereux et obsolète ; merci\n"
 "\t d'utiliser --mirror=fetch ou --mirror=push à la place"
 
-#: builtin/remote.c:149
 #, c-format
 msgid "unknown mirror argument: %s"
 msgstr "argument miroir inconnu : %s"
 
-#: builtin/remote.c:165
 msgid "fetch the remote branches"
 msgstr "rapatrier les branches distantes"
 
-#: builtin/remote.c:167
 msgid "import all tags and associated objects when fetching"
 msgstr ""
 "importer toutes les étiquettes et les objets associés lors du rapatriement"
 
-#: builtin/remote.c:170
 msgid "or do not fetch any tag at all (--no-tags)"
 msgstr "ou ne rapatrier aucune étiquette (--no-tags)"
 
-#: builtin/remote.c:172
 msgid "branch(es) to track"
 msgstr "branche(s) à suivre"
 
-#: builtin/remote.c:173
 msgid "master branch"
 msgstr "branche maîtresse"
 
-#: builtin/remote.c:175
 msgid "set up remote as a mirror to push to or fetch from"
 msgstr ""
 "paramétrer la distante comme miroir pour pousser ou pour rapatrier depuis"
 
-#: builtin/remote.c:187
 msgid "specifying a master branch makes no sense with --mirror"
 msgstr "spécifier une branche maîtresse n'a pas de sens avec --mirror"
 
-#: builtin/remote.c:189
 msgid "specifying branches to track makes sense only with fetch mirrors"
 msgstr ""
 "spécifier les branches à suivre n'a de sens qu'avec des miroirs de "
 "rapatriement"
 
-#: builtin/remote.c:196 builtin/remote.c:716
 #, c-format
 msgid "remote %s already exists."
 msgstr "la distante %s existe déjà."
 
-#: builtin/remote.c:241
 #, c-format
 msgid "Could not setup master '%s'"
 msgstr "Impossible de paramétrer la maîtresse '%s'"
 
-#: builtin/remote.c:323
+#, c-format
+msgid "more than one %s"
+msgstr "plus d'un %s"
+
 #, c-format
 msgid "unhandled branch.%s.rebase=%s; assuming 'true'"
 msgstr "branch.%s.rebase=%s non géré ; 'true' supposé"
 
-#: builtin/remote.c:367
 #, 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:461 builtin/remote.c:469
 msgid "(matching)"
 msgstr "(correspond)"
 
-#: builtin/remote.c:473
 msgid "(delete)"
 msgstr "(supprimer)"
 
-#: builtin/remote.c:664
 #, c-format
 msgid "could not set '%s'"
 msgstr "impossible d'assigner '%s'"
 
-#: builtin/remote.c:669
+#, c-format
+msgid "could not unset '%s'"
+msgstr "impossible de désinitialiser '%s'"
+
 #, c-format
 msgid ""
 "The %s configuration remote.pushDefault in:\n"
@@ -21662,17 +10585,14 @@ msgstr ""
 "\t%s%d\n"
 "nomme à présent le distant inexistant '%s'"
 
-#: builtin/remote.c:707 builtin/remote.c:866 builtin/remote.c:973
 #, c-format
 msgid "No such remote: '%s'"
 msgstr "Pas de serveur remote : '%s'"
 
-#: builtin/remote.c:726
 #, 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:746
 #, c-format
 msgid ""
 "Not updating non-default fetch refspec\n"
@@ -21683,21 +10603,17 @@ msgstr ""
 "\t%s\n"
 "\tVeuillez mettre à jour la configuration manuellement si nécessaire."
 
-#: builtin/remote.c:783
 msgid "Renaming remote references"
 msgstr "Renommage des références distantes"
 
-#: builtin/remote.c:794
 #, c-format
 msgid "deleting '%s' failed"
 msgstr "échec de suppression de '%s'"
 
-#: builtin/remote.c:832
 #, c-format
 msgid "creating '%s' failed"
 msgstr "échec de création de '%s'"
 
-#: builtin/remote.c:912
 msgid ""
 "Note: A branch outside the refs/remotes/ hierarchy was not removed;\n"
 "to delete it, use:"
@@ -21712,118 +10628,93 @@ msgstr[1] ""
 "supprimées ;\n"
 "pour les supprimer, utilisez :"
 
-#: builtin/remote.c:926
 #, c-format
 msgid "Could not remove config section '%s'"
 msgstr "Impossible de supprimer la section de configuration '%s'"
 
-#: builtin/remote.c:1034
 #, c-format
 msgid " new (next fetch will store in remotes/%s)"
 msgstr " nouveau (le prochain rapatriement (fetch) stockera dans remotes/%s)"
 
-#: builtin/remote.c:1037
 msgid " tracked"
 msgstr " suivi"
 
-#: builtin/remote.c:1039
 msgid " stale (use 'git remote prune' to remove)"
 msgstr " dépassé (utilisez 'git remote prune' pour supprimer)"
 
-#: builtin/remote.c:1041
 msgid " ???"
 msgstr " ???"
 
-#: builtin/remote.c:1082
 #, 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:1091
 #, c-format
 msgid "rebases interactively onto remote %s"
 msgstr "rebase de manière interactive sur la distante %s"
 
-#: builtin/remote.c:1093
 #, 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:1096
 #, c-format
 msgid "rebases onto remote %s"
 msgstr "rebase sur la distante %s"
 
-#: builtin/remote.c:1100
 #, c-format
 msgid " merges with remote %s"
 msgstr " fusionne avec la distante %s"
 
-#: builtin/remote.c:1103
 #, c-format
 msgid "merges with remote %s"
 msgstr "fusionne avec la distante %s"
 
-#: builtin/remote.c:1106
 #, c-format
 msgid "%-*s    and with remote %s\n"
 msgstr "%-*s    et avec la distante %s\n"
 
-#: builtin/remote.c:1149
 msgid "create"
 msgstr "créer"
 
-#: builtin/remote.c:1152
 msgid "delete"
 msgstr "supprimer"
 
-#: builtin/remote.c:1156
 msgid "up to date"
 msgstr "à jour"
 
-#: builtin/remote.c:1159
 msgid "fast-forwardable"
 msgstr "peut être mis à jour en avance rapide"
 
-#: builtin/remote.c:1162
 msgid "local out of date"
 msgstr "le local n'est pas à jour"
 
-#: builtin/remote.c:1169
 #, c-format
 msgid "    %-*s forces to %-*s (%s)"
 msgstr "    %-*s force vers %-*s (%s)"
 
-#: builtin/remote.c:1172
 #, c-format
 msgid "    %-*s pushes to %-*s (%s)"
 msgstr "    %-*s pousse vers %-*s (%s)"
 
-#: builtin/remote.c:1176
 #, c-format
 msgid "    %-*s forces to %s"
 msgstr "    %-*s force vers %s"
 
-#: builtin/remote.c:1179
 #, c-format
 msgid "    %-*s pushes to %s"
 msgstr "    %-*s pousse vers %s"
 
-#: builtin/remote.c:1247
 msgid "do not query remotes"
 msgstr "ne pas interroger les distantes"
 
-#: builtin/remote.c:1268
 #, c-format
 msgid "* remote %s"
 msgstr "* distant %s"
 
-#: builtin/remote.c:1269
 #, c-format
 msgid "  Fetch URL: %s"
 msgstr "  URL de rapatriement : %s"
 
-#: builtin/remote.c:1270 builtin/remote.c:1286 builtin/remote.c:1423
 msgid "(no URL)"
 msgstr "(pas d'URL)"
 
@@ -21831,25 +10722,20 @@ msgstr "(pas d'URL)"
 #. with the one in " Fetch URL: %s"
 #. translation.
 #.
-#: builtin/remote.c:1284 builtin/remote.c:1286
 #, c-format
 msgid "  Push  URL: %s"
 msgstr "  URL push : %s"
 
-#: builtin/remote.c:1288 builtin/remote.c:1290 builtin/remote.c:1292
 #, c-format
 msgid "  HEAD branch: %s"
 msgstr "  Branche HEAD : %s"
 
-#: builtin/remote.c:1288
 msgid "(not queried)"
 msgstr "(non demandé)"
 
-#: builtin/remote.c:1290
 msgid "(unknown)"
 msgstr "(inconnu)"
 
-#: builtin/remote.c:1294
 #, c-format
 msgid ""
 "  HEAD branch (remote HEAD is ambiguous, may be one of the following):\n"
@@ -21857,345 +10743,281 @@ msgstr ""
 "  Branche HEAD (la HEAD distante est ambiguë, peut être l'une des "
 "suivantes) :\n"
 
-#: builtin/remote.c:1306
 #, c-format
 msgid "  Remote branch:%s"
 msgid_plural "  Remote branches:%s"
 msgstr[0] "  Branche distante :%s"
 msgstr[1] "  Branches distantes :%s"
 
-#: builtin/remote.c:1309 builtin/remote.c:1335
 msgid " (status not queried)"
 msgstr " (état non demandé)"
 
-#: builtin/remote.c:1318
 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:1326
 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:1332
 #, 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:1353
 msgid "set refs/remotes/<name>/HEAD according to remote"
 msgstr "définir refs/remotes/<nom>/HEAD selon la distante"
 
-#: builtin/remote.c:1355
 msgid "delete refs/remotes/<name>/HEAD"
 msgstr "supprimer refs/remotes/<nom>/HEAD"
 
-#: builtin/remote.c:1369
 msgid "Cannot determine remote HEAD"
 msgstr "Impossible de déterminer la HEAD distante"
 
-#: builtin/remote.c:1371
 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:1381
 #, c-format
 msgid "Could not delete %s"
 msgstr "Impossible de supprimer %s"
 
-#: builtin/remote.c:1389
 #, c-format
 msgid "Not a valid ref: %s"
 msgstr "Référence non valide : %s"
 
-#: builtin/remote.c:1391
 #, c-format
 msgid "Could not setup %s"
 msgstr "Impossible de paramétrer %s"
 
-#: builtin/remote.c:1409
 #, c-format
 msgid " %s will become dangling!"
 msgstr " %s se retrouvera en suspens !"
 
-#: builtin/remote.c:1410
 #, c-format
 msgid " %s has become dangling!"
 msgstr " %s se retrouve en suspens !"
 
-#: builtin/remote.c:1419
 #, c-format
 msgid "Pruning %s"
 msgstr "Élimination de %s"
 
-#: builtin/remote.c:1420
 #, c-format
 msgid "URL: %s"
 msgstr "URL : %s"
 
-#: builtin/remote.c:1436
 #, c-format
 msgid " * [would prune] %s"
 msgstr " * [serait éliminé] %s"
 
-#: builtin/remote.c:1439
 #, c-format
 msgid " * [pruned] %s"
 msgstr " * [éliminé] %s"
 
-#: builtin/remote.c:1484
 msgid "prune remotes after fetching"
 msgstr "éliminer les distants après le rapatriement"
 
-#: builtin/remote.c:1548 builtin/remote.c:1604 builtin/remote.c:1674
 #, c-format
 msgid "No such remote '%s'"
 msgstr "Pas de serveur remote '%s'"
 
-#: builtin/remote.c:1566
 msgid "add branch"
 msgstr "ajouter une branche"
 
-#: builtin/remote.c:1573
 msgid "no remote specified"
 msgstr "pas de serveur distant spécifié"
 
-#: builtin/remote.c:1590
 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:1592
 msgid "return all URLs"
 msgstr "retourner toutes les URLs"
 
-#: builtin/remote.c:1622
 #, c-format
 msgid "no URLs configured for remote '%s'"
 msgstr "aucune URL configurée pour le dépôt distant '%s'"
 
-#: builtin/remote.c:1648
 msgid "manipulate push URLs"
 msgstr "manipuler les URLs push"
 
-#: builtin/remote.c:1650
 msgid "add URL"
 msgstr "ajouter une URL"
 
-#: builtin/remote.c:1652
 msgid "delete URLs"
 msgstr "supprimer des URLs"
 
-#: builtin/remote.c:1659
 msgid "--add --delete doesn't make sense"
 msgstr "--add --delete n'a aucun sens"
 
-#: builtin/remote.c:1700
 #, c-format
 msgid "Invalid old URL pattern: %s"
 msgstr "Motif d'URL ancien invalide : %s"
 
-#: builtin/remote.c:1708
 #, c-format
 msgid "No such URL found: %s"
 msgstr "Pas d'URL trouvée : %s"
 
-#: builtin/remote.c:1710
 msgid "Will not delete all non-push URLs"
 msgstr "Pas de suppression de toutes les URLs non-push"
 
-#: builtin/remote.c:1727
 msgid "be verbose; must be placed before a subcommand"
 msgstr "être verbeux : doit être placé avant une sous-commande"
 
-#: builtin/repack.c:29
 msgid "git repack [<options>]"
 msgstr "git repack [<options>]"
 
-#: builtin/repack.c:34
 msgid ""
 "Incremental repacks are incompatible with bitmap indexes.  Use\n"
-"--no-write-bitmap-index or disable the pack.writebitmaps configuration."
+"--no-write-bitmap-index or disable the pack.writeBitmaps configuration."
 msgstr ""
 "Les repaquetages incrémentaux sont incompatibles avec les index bitmap. "
 "Utilisez\n"
-"--no-write-bitmap-index ou désactivez le paramètre pack.writebitmaps."
+"--no-write-bitmap-index ou désactivez le paramètre pack.writeBitmaps."
 
-#: builtin/repack.c:206
 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:280 builtin/repack.c:824
 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:304
 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:319
 #, c-format
 msgid "cannot open index for %s"
 msgstr "impossible d'ouvrir l'index pour %s"
 
-#: builtin/repack.c:378
 #, 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:411 builtin/repack.c:418 builtin/repack.c:423
 #, c-format
 msgid "pack %s too large to roll up"
 msgstr "le paquet %s est trop gros à enrouler"
 
-#: builtin/repack.c:503
 #, c-format
 msgid "could not open tempfile %s for writing"
 msgstr "impossible d'ouvrir le fichier temporaire %s en écriture"
 
-#: builtin/repack.c:521
 msgid "could not close refs snapshot tempfile"
 msgstr "impossible de fermer le fichier temporaire d'instantané des réfs"
 
-#: builtin/repack.c:634
 msgid "pack everything in a single pack"
 msgstr "empaqueter tout dans un seul paquet"
 
-#: builtin/repack.c:636
 msgid "same as -a, and turn unreachable objects loose"
 msgstr "identique à -a et transformer les objets inaccessibles en suspens"
 
-#: builtin/repack.c:639
+msgid "same as -a, pack unreachable cruft objects separately"
+msgstr ""
+"identique à -a, empaqueter les objets déchets non joignables séparément"
+
+msgid "approxidate"
+msgstr "date approximative"
+
+msgid "with -C, expire objects older than this"
+msgstr "avec -C, faire expirer les objets plus vieux que celui-ci"
+
 msgid "remove redundant packs, and run git-prune-packed"
 msgstr "supprimer les paquets redondants et lancer git-prune-packed"
 
-#: builtin/repack.c:641
 msgid "pass --no-reuse-delta to git-pack-objects"
 msgstr "passer --no-reuse-delta à git-pack-objects"
 
-#: builtin/repack.c:643
 msgid "pass --no-reuse-object to git-pack-objects"
 msgstr "passer --no-reuse-object à git-pack-objects"
 
-#: builtin/repack.c:645
 msgid "do not run git-update-server-info"
 msgstr "ne pas lancer git-update-server-info"
 
-#: builtin/repack.c:648
 msgid "pass --local to git-pack-objects"
 msgstr "passer --local à git-pack-objects"
 
-#: builtin/repack.c:650
 msgid "write bitmap index"
 msgstr "écrire un index en bitmap"
 
-#: builtin/repack.c:652
 msgid "pass --delta-islands to git-pack-objects"
 msgstr "passer --delta-islands à git-pack-objects"
 
-#: builtin/repack.c:653
-msgid "approxidate"
-msgstr "date approximative"
-
-#: builtin/repack.c:654
 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:656
 msgid "with -a, repack unreachable objects"
 msgstr "avec -a, repaquétiser les objets inaccessibles"
 
-#: builtin/repack.c:658
 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:659 builtin/repack.c:665
 msgid "bytes"
 msgstr "octets"
 
-#: builtin/repack.c:660
 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:662
 msgid "limits the maximum delta depth"
 msgstr "limite la profondeur maximale des deltas"
 
-#: builtin/repack.c:664
 msgid "limits the maximum number of threads"
 msgstr "limite le nombre maximal de fils"
 
-#: builtin/repack.c:666
 msgid "maximum size of each packfile"
 msgstr "taille maximum de chaque fichier paquet"
 
-#: builtin/repack.c:668
 msgid "repack objects in packs marked with .keep"
 msgstr "réempaqueter les objets dans des paquets marqués avec .keep"
 
-#: builtin/repack.c:670
 msgid "do not repack this pack"
 msgstr "ne pas rempaqueter ce paquet"
 
-#: builtin/repack.c:672
 msgid "find a geometric progression with factor <N>"
 msgstr "trouver une progression géométrique avec un facteur <N>"
 
-#: builtin/repack.c:674
 msgid "write a multi-pack index of the resulting packs"
 msgstr "écrire un index de multi-paquet des paquets résultants"
 
-#: builtin/repack.c:684
 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:833
 msgid "Nothing new to pack."
 msgstr "Rien de neuf à empaqueter."
 
-#: builtin/repack.c:863
+#, c-format
+msgid "pack prefix %s does not begin with objdir %s"
+msgstr "le préfixe %s ne commence pas avec objdir %s"
+
 #, c-format
 msgid "missing required file: %s"
 msgstr "fichier nécessaire manquant : %s"
 
-#: builtin/repack.c:865
 #, c-format
 msgid "could not unlink: %s"
 msgstr "impossible de délier : '%s'"
 
-#: builtin/replace.c:22
 msgid "git replace [-f] <object> <replacement>"
 msgstr "git replace [-f] <objet> <remplacement>"
 
-#: builtin/replace.c:23
 msgid "git replace [-f] --edit <object>"
 msgstr "git replace [-f] --edit <objet>"
 
-#: builtin/replace.c:24
 msgid "git replace [-f] --graft <commit> [<parent>...]"
 msgstr "git replace [-f] --graft <commit> [<parent>...]"
 
-#: builtin/replace.c:26
 msgid "git replace -d <object>..."
 msgstr "git replace -d <objet>..."
 
-#: builtin/replace.c:27
 msgid "git replace [--format=<format>] [-l [<pattern>]]"
 msgstr "git replace [--format=<format>] [-l [<motif>]]"
 
-#: builtin/replace.c:90
 #, c-format
 msgid ""
 "invalid replace format '%s'\n"
@@ -22204,27 +11026,22 @@ msgstr ""
 "format de remplacement invalide '%s'\n"
 "les formats valides sont 'short', 'medium' et 'long'"
 
-#: builtin/replace.c:125
 #, c-format
 msgid "replace ref '%s' not found"
 msgstr "réf de remplacement '%s' non trouvée"
 
-#: builtin/replace.c:141
 #, c-format
 msgid "Deleted replace ref '%s'"
 msgstr "Référence de remplacement '%s' supprimée"
 
-#: builtin/replace.c:153
 #, c-format
 msgid "'%s' is not a valid ref name"
 msgstr "'%s' n'est pas un nom valide de référence"
 
-#: builtin/replace.c:158
 #, c-format
 msgid "replace ref '%s' already exists"
 msgstr "la référence de remplacement '%s' existe déjà"
 
-#: builtin/replace.c:178
 #, c-format
 msgid ""
 "Objects must be of the same type.\n"
@@ -22235,75 +11052,59 @@ msgstr ""
 "'%s' pointe sur un objet remplacé de type '%s' tandis que\n"
 "'%s' pointe sur un objet remplaçant de type '%s'."
 
-#: builtin/replace.c:229
 #, c-format
 msgid "unable to open %s for writing"
 msgstr "impossible d'ouvrir %s en écriture"
 
-#: builtin/replace.c:242
 msgid "cat-file reported failure"
 msgstr "cat-file a retourné un échec"
 
-#: builtin/replace.c:258
 #, c-format
 msgid "unable to open %s for reading"
 msgstr "impossible d'ouvrir %s en écriture"
 
-#: builtin/replace.c:271
 msgid "unable to spawn mktree"
 msgstr "impossible de lire l'arbre (%s)"
 
-#: builtin/replace.c:275
 msgid "unable to read from mktree"
 msgstr "impossible de lire depui mktree"
 
-#: builtin/replace.c:284
 msgid "mktree reported failure"
 msgstr "mktree a échoué"
 
-#: builtin/replace.c:288
 msgid "mktree did not return an object name"
 msgstr "mktree n'a pas retourné de nom d'objet"
 
-#: builtin/replace.c:297
 #, c-format
 msgid "unable to fstat %s"
 msgstr "fstat de %s impossible"
 
-#: builtin/replace.c:302
 msgid "unable to write object to database"
 msgstr "impossible d'écrire l'objet dans la base de données"
 
-#: builtin/replace.c:325
 #, c-format
 msgid "unable to get object type for %s"
 msgstr "impossible d'obtenir le type de l'objet pour %s"
 
-#: builtin/replace.c:341
 msgid "editing object file failed"
 msgstr "échec de l'édition du fichier d'objet"
 
-#: builtin/replace.c:350
 #, c-format
 msgid "new object is the same as the old one: '%s'"
 msgstr "le nouvel objet est identique à l'ancien : '%s'"
 
-#: builtin/replace.c:383
 #, c-format
 msgid "could not parse %s as a commit"
 msgstr "impossible d'analyser %s comme commit"
 
-#: builtin/replace.c:415
 #, c-format
 msgid "bad mergetag in commit '%s'"
 msgstr "mauvaise étiquette de fusion dans le commit '%s'"
 
-#: builtin/replace.c:417
 #, c-format
 msgid "malformed mergetag in commit '%s'"
 msgstr "étiquette de fusion malformée dans le commit '%s'"
 
-#: builtin/replace.c:429
 #, c-format
 msgid ""
 "original commit '%s' contains mergetag '%s' that is discarded; use --edit "
@@ -22312,31 +11113,25 @@ msgstr ""
 "le commit original '%s' contient l'étiquette de fusion '%s' qui a disparu ; "
 "utilisez --edit au lieu de --graft"
 
-#: builtin/replace.c:468
 #, c-format
 msgid "the original commit '%s' has a gpg signature"
 msgstr "le commit original '%s' contient une signature GPG"
 
-#: builtin/replace.c:469
 msgid "the signature will be removed in the replacement commit!"
 msgstr "la signature sera éliminée dans la validation de remplacement !"
 
-#: builtin/replace.c:479
 #, c-format
 msgid "could not write replacement commit for: '%s'"
 msgstr "impossible d'écrire le commit de remplacement pour '%s'"
 
-#: builtin/replace.c:487
 #, c-format
 msgid "graft for '%s' unnecessary"
 msgstr "graft pour '%s' non nécessaire"
 
-#: builtin/replace.c:491
 #, c-format
 msgid "new commit is the same as the old one: '%s'"
 msgstr "le nouveau commit est identique à l'ancien : '%s'"
 
-#: builtin/replace.c:526
 #, c-format
 msgid ""
 "could not convert the following graft(s):\n"
@@ -22345,218 +11140,168 @@ msgstr ""
 "impossible de convertir la(les) greffe(s) suivante(s) :\n"
 "%s"
 
-#: builtin/replace.c:547
 msgid "list replace refs"
 msgstr "afficher les références de remplacement"
 
-#: builtin/replace.c:548
 msgid "delete replace refs"
 msgstr "supprimer les références de remplacement"
 
-#: builtin/replace.c:549
 msgid "edit existing object"
 msgstr "éditer l'objet existant"
 
-#: builtin/replace.c:550
 msgid "change a commit's parents"
 msgstr "modifier les parents d'un commit"
 
-#: builtin/replace.c:551
 msgid "convert existing graft file"
 msgstr "convertir le fichier de greffe existant"
 
-#: builtin/replace.c:552
 msgid "replace the ref if it exists"
 msgstr "remplacer la référence si elle existe"
 
-#: builtin/replace.c:554
 msgid "do not pretty-print contents for --edit"
 msgstr "afficher sans mise en forme pour --edit"
 
-#: builtin/replace.c:555
 msgid "use this format"
 msgstr "utiliser ce format"
 
-#: builtin/replace.c:568
 msgid "--format cannot be used when not listing"
 msgstr "--format ne peut pas être utilisé sans lister"
 
-#: builtin/replace.c:576
 msgid "-f only makes sense when writing a replacement"
 msgstr "-f n'a de sens qu'en écrivant un remplacement"
 
-#: builtin/replace.c:580
 msgid "--raw only makes sense with --edit"
 msgstr "--raw n'a de sens qu'avec l'option --edit"
 
-#: builtin/replace.c:586
 msgid "-d needs at least one argument"
 msgstr "-d requiert au moins un argument"
 
-#: builtin/replace.c:592
 msgid "bad number of arguments"
 msgstr "mauvais nombre d'arguments"
 
-#: builtin/replace.c:598
 msgid "-e needs exactly one argument"
 msgstr "-e requiert un seul argument"
 
-#: builtin/replace.c:604
 msgid "-g needs at least one argument"
 msgstr "-g requiert au moins un argument"
 
-#: builtin/replace.c:610
 msgid "--convert-graft-file takes no argument"
 msgstr "--convert-graft-file ne supporte aucun argument"
 
-#: builtin/replace.c:616
 msgid "only one pattern can be given with -l"
 msgstr "-l n'accepte qu'un motifs"
 
-#: builtin/rerere.c:13
 msgid "git rerere [clear | forget <path>... | status | remaining | diff | gc]"
 msgstr ""
 "git rerere [clear | forget <chemin>... | status | remaining | diff | gc]"
 
-#: builtin/rerere.c:58
 msgid "register clean resolutions in index"
 msgstr "enregistrer des résolutions propres dans l'index"
 
-#: builtin/rerere.c:77
 msgid "'git rerere forget' without paths is deprecated"
 msgstr "'git rerere forget' sans chemin est obsolète"
 
-#: builtin/rerere.c:111
 #, c-format
 msgid "unable to generate diff for '%s'"
 msgstr "échec de la génération de diff pour '%s'"
 
-#: builtin/reset.c:33
 msgid ""
 "git reset [--mixed | --soft | --hard | --merge | --keep] [-q] [<commit>]"
 msgstr ""
 "git reset [--mixed | --soft | --hard | --merge | --keep] [-q] [<commit>]"
 
-#: builtin/reset.c:34
 msgid "git reset [-q] [<tree-ish>] [--] <pathspec>..."
 msgstr ""
 "git reset [-q] [<arbre ou apparenté>] [--] <spécificateur-de-chemin>..."
 
-#: builtin/reset.c:35
 msgid ""
 "git reset [-q] [--pathspec-from-file [--pathspec-file-nul]] [<tree-ish>]"
 msgstr ""
 "git reset [-q] [--pathspec-from-file [--pathspec-file-nul]] [<arbre-esque>]"
 
-#: builtin/reset.c:36
 msgid "git reset --patch [<tree-ish>] [--] [<pathspec>...]"
 msgstr "git reset --patch [<arbre-esque>] [--] [<spéc.-de-chemin>...]"
 
-#: builtin/reset.c:42
 msgid "mixed"
 msgstr "mixed"
 
-#: builtin/reset.c:42
 msgid "soft"
 msgstr "soft"
 
-#: builtin/reset.c:42
 msgid "hard"
 msgstr "hard"
 
-#: builtin/reset.c:42
 msgid "merge"
 msgstr "merge"
 
-#: builtin/reset.c:42
 msgid "keep"
 msgstr "keep"
 
-#: builtin/reset.c:90
 msgid "You do not have a valid HEAD."
 msgstr "Vous n'avez pas une HEAD valide."
 
-#: builtin/reset.c:92
 msgid "Failed to find tree of HEAD."
 msgstr "Impossible de trouver l'arbre pour HEAD."
 
-#: builtin/reset.c:98
 #, c-format
 msgid "Failed to find tree of %s."
 msgstr "Impossible de trouver l'arbre pour %s."
 
-#: builtin/reset.c:123
 #, c-format
 msgid "HEAD is now at %s"
 msgstr "HEAD est maintenant à %s"
 
-#: builtin/reset.c:304
 #, 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:402 builtin/stash.c:606 builtin/stash.c:669
-#: builtin/stash.c:693
 msgid "be quiet, only report errors"
 msgstr "être silencieux, afficher seulement les erreurs"
 
-#: builtin/reset.c:404
 msgid "skip refreshing the index after reset"
 msgstr "sauter le rafraîchissement de l'index après la réinitialisation"
 
-#: builtin/reset.c:406
 msgid "reset HEAD and index"
 msgstr "réinitialiser HEAD et l'index"
 
-#: builtin/reset.c:407
 msgid "reset only HEAD"
 msgstr "réinitialiser seulement HEAD"
 
-#: builtin/reset.c:409 builtin/reset.c:411
 msgid "reset HEAD, index and working tree"
 msgstr "réinitialiser HEAD, l'index et la copie de travail"
 
-#: builtin/reset.c:413
 msgid "reset HEAD but keep local changes"
 msgstr "réinitialiser HEAD mais garder les changements locaux"
 
-#: builtin/reset.c:419
 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:452
 #, 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:460
 #, 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:479
 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:481
 #, c-format
 msgid "Cannot do %s reset with paths."
 msgstr "Impossible de faire un \"%s reset\" avec des chemins."
 
-#: builtin/reset.c:496
 #, 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:527
 msgid "Unstaged changes after reset:"
 msgstr "Modifications non indexées après reset :"
 
-#: builtin/reset.c:530
 #, c-format
 msgid ""
 "It took %.2f seconds to refresh the index after reset.  You can use\n"
@@ -22566,53 +11311,45 @@ msgstr ""
 "réinitialisation.\n"
 "Vous pouvez utiliser '--no-refresh' pour éviter ceci."
 
-#: builtin/reset.c:547
 #, 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:552
 msgid "Could not write new index file."
 msgstr "Impossible d'écrire le nouveau fichier d'index."
 
-#: builtin/rev-list.c:659
+#, c-format
+msgid "unable to get disk usage of %s"
+msgstr "impossible de récupérer l'utilisation du disque de %s"
+
 msgid "rev-list does not support display of notes"
 msgstr "rev-list ne supporte l'affichage des notes"
 
-#: builtin/rev-list.c:664
 #, c-format
 msgid "marked counting and '%s' cannot be used together"
 msgstr "le comptage marqué et '%s' ne peuvent pas être utilisés ensemble"
 
-#: builtin/rev-parse.c:409
 msgid "git rev-parse --parseopt [<options>] -- [<args>...]"
 msgstr "git rev-parse --parseopt [<options>] -- [<arguments>...]"
 
-#: builtin/rev-parse.c:414
 msgid "keep the `--` passed as an arg"
 msgstr "garder le `--` passé en argument"
 
-#: builtin/rev-parse.c:416
 msgid "stop parsing after the first non-option argument"
 msgstr "arrêt de l'analyse après le premier argument qui n'est pas une option"
 
-#: builtin/rev-parse.c:419
 msgid "output in stuck long form"
 msgstr "sortie en forme longue fixée"
 
-#: builtin/rev-parse.c:438
 msgid "premature end of input"
 msgstr "fin prématurée de l'entrée"
 
-#: builtin/rev-parse.c:442
 msgid "no usage string given before the `--' separator"
 msgstr "pas de chaîne d'usage fournie avant le séparateur `--'"
 
-#: builtin/rev-parse.c:548
 msgid "Needed a single revision"
 msgstr "Une seule révision attendue"
 
-#: builtin/rev-parse.c:552
 msgid ""
 "git rev-parse --parseopt [<options>] -- [<args>...]\n"
 "   or: git rev-parse --sq-quote [<arg>...]\n"
@@ -22627,145 +11364,117 @@ msgstr ""
 "Lancez \"git rev-parse --parseopt -h\" pour plus d'information sur "
 "l'utilisation principale."
 
-#: builtin/rev-parse.c:712
 msgid "--resolve-git-dir requires an argument"
 msgstr "--resolve-git-dir exige un argument"
 
-#: builtin/rev-parse.c:715
 #, c-format
 msgid "not a gitdir '%s'"
 msgstr "'%s' n'est pas un gitdir"
 
-#: builtin/rev-parse.c:739
 msgid "--git-path requires an argument"
 msgstr "--git-path exige un argument"
 
-#: builtin/rev-parse.c:749
 msgid "-n requires an argument"
 msgstr "-n exige un argument"
 
-#: builtin/rev-parse.c:763
 msgid "--path-format requires an argument"
 msgstr "--path-format exige un argument"
 
-#: builtin/rev-parse.c:769
 #, c-format
 msgid "unknown argument to --path-format: %s"
 msgstr "argument inconnu pour --path-format : %s"
 
-#: builtin/rev-parse.c:776
 msgid "--default requires an argument"
 msgstr "--default exige un argument"
 
-#: builtin/rev-parse.c:782
 msgid "--prefix requires an argument"
 msgstr "--prefix exige un argument"
 
-#: builtin/rev-parse.c:851
 #, c-format
 msgid "unknown mode for --abbrev-ref: %s"
 msgstr "mode inconnu pour --abbrev-ref : %s"
 
-#: builtin/rev-parse.c:1023
+msgid "this operation must be run in a work tree"
+msgstr "cette opération doit être effectuée dans un arbre de travail"
+
 #, c-format
 msgid "unknown mode for --show-object-format: %s"
 msgstr "mode inconnu pour --show-object-format : %s"
 
-#: builtin/revert.c:24
 msgid "git revert [<options>] <commit-ish>..."
 msgstr "git revert [<options>] <commit ou apparenté>..."
 
-#: builtin/revert.c:25
 msgid "git revert <subcommand>"
 msgstr "git revert <sous-commande>"
 
-#: builtin/revert.c:30
 msgid "git cherry-pick [<options>] <commit-ish>..."
 msgstr "git cherry-pick [<options>] <commit ou apparenté>..."
 
-#: builtin/revert.c:31
 msgid "git cherry-pick <subcommand>"
 msgstr "git cherry-pick <sous-commande>"
 
-#: builtin/revert.c:72
 #, c-format
 msgid "option `%s' expects a number greater than zero"
 msgstr "l'option '%s' attend un nombre supérieur à zéro"
 
-#: builtin/revert.c:92
 #, c-format
 msgid "%s: %s cannot be used with %s"
 msgstr "%s : %s ne peut pas être utilisé avec %s"
 
-#: builtin/revert.c:102
 msgid "end revert or cherry-pick sequence"
 msgstr "mettre fin au retour ou picorage"
 
-#: builtin/revert.c:103
 msgid "resume revert or cherry-pick sequence"
 msgstr "reprendre le retour ou picorage"
 
-#: builtin/revert.c:104
 msgid "cancel revert or cherry-pick sequence"
 msgstr "annuler le retour ou picorage"
 
-#: builtin/revert.c:105
 msgid "skip current commit and continue"
 msgstr "sauter le commit courant et continuer"
 
-#: builtin/revert.c:107
 msgid "don't automatically commit"
 msgstr "ne pas valider automatiquement"
 
-#: builtin/revert.c:108
 msgid "edit the commit message"
 msgstr "éditer le message de validation"
 
-#: builtin/revert.c:111
 msgid "parent-number"
 msgstr "numéro-de-parent"
 
-#: builtin/revert.c:112
 msgid "select mainline parent"
 msgstr "sélectionner le parent principal"
 
-#: builtin/revert.c:114
 msgid "merge strategy"
 msgstr "stratégie de fusion"
 
-#: builtin/revert.c:116
 msgid "option for merge strategy"
 msgstr "option pour la stratégie de fusion"
 
-#: builtin/revert.c:125
 msgid "append commit name"
 msgstr "ajouter le nom de validation"
 
-#: builtin/revert.c:127
 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:241
+msgid "use the 'reference' format to refer to commits"
+msgstr "utiliser le format 'reference' pour se référer aux commits"
+
 msgid "revert failed"
 msgstr "revert a échoué"
 
-#: builtin/revert.c:254
 msgid "cherry-pick failed"
 msgstr "le picorage a échoué"
 
-#: builtin/rm.c:20
 msgid "git rm [<options>] [--] <file>..."
 msgstr "git rm [<options>] [--] <fichier>..."
 
-#: builtin/rm.c:208
 msgid ""
 "the following file has staged content different from both the\n"
 "file and the HEAD:"
@@ -22779,7 +11488,6 @@ msgstr[1] ""
 "les fichiers suivants ont du contenu indexé différent\n"
 "du fichier et de HEAD :"
 
-#: builtin/rm.c:213
 msgid ""
 "\n"
 "(use -f to force removal)"
@@ -22787,13 +11495,11 @@ msgstr ""
 "\n"
 "(utilisez -f pour forcer la suppression)"
 
-#: 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] "le fichier suivant a des changements indexés :"
 msgstr[1] "les fichiers suivants ont des changements indexés :"
 
-#: builtin/rm.c:221 builtin/rm.c:230
 msgid ""
 "\n"
 "(use --cached to keep the file, or -f to force removal)"
@@ -22801,54 +11507,43 @@ msgstr ""
 "\n"
 "(utilisez --cached pour garder le fichier, ou -f pour forcer la suppression)"
 
-#: builtin/rm.c:227
 msgid "the following file has local modifications:"
 msgid_plural "the following files have local modifications:"
 msgstr[0] "le fichier suivant a des modifications locales :"
 msgstr[1] "les fichiers suivants ont des modifications locales :"
 
-#: builtin/rm.c:245
 msgid "do not list removed files"
 msgstr "ne pas afficher les fichiers supprimés"
 
-#: builtin/rm.c:246
 msgid "only remove from the index"
 msgstr "supprimer seulement de l'index"
 
-#: builtin/rm.c:247
 msgid "override the up-to-date check"
 msgstr "outrepasser la vérification des fichiers à jour"
 
-#: builtin/rm.c:248
 msgid "allow recursive removal"
 msgstr "autoriser la suppression récursive"
 
-#: 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: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: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:337
 #, c-format
 msgid "not removing '%s' recursively without -r"
 msgstr "pas de suppression récursive de '%s' sans -r"
 
-#: 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 [--mirror] [--dry-run] [--force]\n"
 "              [--receive-pack=<git-receive-pack>]\n"
@@ -22860,83 +11555,64 @@ msgstr ""
 "              [--verbose] [--thin] [--atomic]\n"
 "              [<hôte>:]<répertoire> (--all | <réf>...)"
 
-#: builtin/send-pack.c:192
 msgid "remote name"
 msgstr "nom distant"
 
-#: builtin/send-pack.c:205
 msgid "use stateless RPC protocol"
 msgstr "utiliser un protocole RPC sans état"
 
-#: 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:207
 msgid "print status from remote helper"
 msgstr "afficher les messages du greffon de protocole distant"
 
-#: builtin/shortlog.c:16
 msgid "git shortlog [<options>] [<revision-range>] [[--] <path>...]"
 msgstr "git shortlog [<options>] [<intervalle-révisions>] [[--] <chemin>...]"
 
-#: builtin/shortlog.c:17
 msgid "git log --pretty=short | git shortlog [<options>]"
 msgstr "git log --pretty=short | git shortlog [<options>]"
 
-#: builtin/shortlog.c:123
 msgid "using multiple --group options with stdin is not supported"
 msgstr ""
 "l'utilisation de plusieurs options --group avec stdin n'est pas supportée"
 
-#: builtin/shortlog.c:133
 msgid "using --group=trailer with stdin is not supported"
 msgstr "l'utilisation de --group=trailer avec stdin n'est pas supportée"
 
-#: builtin/shortlog.c:323
 #, c-format
 msgid "unknown group type: %s"
 msgstr "type de groupe inconnu : %s"
 
-#: builtin/shortlog.c:351
 msgid "group by committer rather than author"
 msgstr "grouper par validateur plutôt que par auteur"
 
-#: builtin/shortlog.c:354
 msgid "sort output according to the number of commits per author"
 msgstr "trier la sortie sur le nombre de validations par auteur"
 
-#: builtin/shortlog.c:356
 msgid "suppress commit descriptions, only provides commit count"
 msgstr ""
 "supprimer les descriptions de validation, fournit seulement le nombre de "
 "validations"
 
-#: builtin/shortlog.c:358
 msgid "show the email address of each author"
 msgstr "afficher l'adresse courriel de chaque auteur"
 
-#: builtin/shortlog.c:359
 msgid "<w>[,<i1>[,<i2>]]"
 msgstr "<w>[,<i1>[,<i2>]]"
 
-#: builtin/shortlog.c:360
 msgid "linewrap output"
 msgstr "couper les lignes"
 
-#: builtin/shortlog.c:362
 msgid "field"
 msgstr "champ"
 
-#: builtin/shortlog.c:363
 msgid "group by field"
 msgstr "grouper par champ"
 
-#: builtin/shortlog.c:395
 msgid "too many arguments given outside repository"
 msgstr "trop d'arguments fournis hors d'un dépôt"
 
-#: builtin/show-branch.c:14
 msgid ""
 "git show-branch [-a | --all] [-r | --remotes] [--topo-order | --date-order]\n"
 "                [--current] [--color[=<when>] | --no-color] [--sparse]\n"
@@ -22948,134 +11624,105 @@ msgstr ""
 "                [--more=<n> | --list | --independent | --merge-base]\n"
 "                [--no-name | --sha1-name] [--topics] [(<rév> | <glob>)...]"
 
-#: builtin/show-branch.c:18
 msgid "git show-branch (-g | --reflog)[=<n>[,<base>]] [--list] [<ref>]"
 msgstr "git show-branch (-g | --reflog)[=<n>[,<base>]] [--list] [<référence>]"
 
-#: builtin/show-branch.c:396
 #, c-format
 msgid "ignoring %s; cannot handle more than %d ref"
 msgid_plural "ignoring %s; cannot handle more than %d refs"
 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
 #, c-format
 msgid "no matching refs with %s"
 msgstr "aucune référence correspond à %s"
 
-#: builtin/show-branch.c:645
 msgid "show remote-tracking and local branches"
 msgstr "afficher les branches de suivi distantes et les branches locales"
 
-#: builtin/show-branch.c:647
 msgid "show remote-tracking branches"
 msgstr "afficher les branches de suivi distantes"
 
-#: builtin/show-branch.c:649
 msgid "color '*!+-' corresponding to the branch"
 msgstr "couleur '*!+-' correspondant à la branche"
 
-#: builtin/show-branch.c:651
 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
 msgid "synonym to more=-1"
 msgstr "synonyme de more=-1"
 
-#: builtin/show-branch.c:654
 msgid "suppress naming strings"
 msgstr "supprimer les chaînes de nommage"
 
-#: builtin/show-branch.c:656
 msgid "include the current branch"
 msgstr "inclure la branche courante"
 
-#: builtin/show-branch.c:658
 msgid "name commits with their object names"
 msgstr "nommer les validations avec leurs noms d'objet"
 
-#: builtin/show-branch.c:660
 msgid "show possible merge bases"
 msgstr "afficher les bases possibles de fusion"
 
-#: builtin/show-branch.c:662
 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
 msgid "show commits in topological order"
 msgstr "afficher les validations dans l'ordre topologique"
 
-#: builtin/show-branch.c:667
 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
 msgid "show merges reachable from only one tip"
 msgstr "afficher les fusions accessibles depuis une seule pointe"
 
-#: builtin/show-branch.c:671
 msgid "topologically sort, maintaining date order where possible"
 msgstr "tri topologique, maintenant l'ordre par date si possible"
 
-#: builtin/show-branch.c:674
 msgid "<n>[,<base>]"
 msgstr "<n>[,<base>]"
 
-#: builtin/show-branch.c:675
 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:735
 msgid "no branches given, and HEAD is not valid"
 msgstr "aucune branche spécifiée, et HEAD est invalide"
 
-#: builtin/show-branch.c:738
 msgid "--reflog option needs one branch name"
 msgstr "--reflog requiert un nom de branche"
 
-#: builtin/show-branch.c:741
 #, 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
 #, c-format
 msgid "no such ref %s"
 msgstr "référence inexistante %s"
 
-#: builtin/show-branch.c:831
 #, 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
 #, c-format
 msgid "'%s' is not a valid ref."
 msgstr "'%s' n'est pas une référence valide."
 
-#: builtin/show-branch.c:838
 #, c-format
 msgid "cannot find commit %s (%s)"
 msgstr "impossible de trouver le commit %s (%s)"
 
-#: builtin/show-index.c:21
 msgid "hash-algorithm"
 msgstr "algorithme d'empreinte"
 
-#: builtin/show-index.c:31
 msgid "Unknown hash algorithm"
 msgstr "Algorithme d'empreinte inconnu"
 
-#: builtin/show-ref.c:12
 msgid ""
 "git show-ref [-q | --quiet] [--verify] [--head] [-d | --dereference] [-s | --"
 "hash[=<n>]] [--abbrev[=<n>]] [--tags] [--heads] [--] [<pattern>...]"
@@ -23083,62 +11730,49 @@ msgstr ""
 "git show-ref [-q | --quiet] [--verify] [--head] [-d | --dereference] [-s | --"
 "hash[=<n>]] [--abbrev[=<n>]] [--tags] [--heads] [--] [<motif>...]"
 
-#: builtin/show-ref.c:13
 msgid "git show-ref --exclude-existing[=<pattern>]"
 msgstr "git show-ref --exclude-existing[=<motif>]"
 
-#: builtin/show-ref.c:162
 msgid "only show tags (can be combined with heads)"
 msgstr "afficher seulement les étiquettes (peut être combiné avec heads)"
 
-#: builtin/show-ref.c:163
 msgid "only show heads (can be combined with tags)"
 msgstr "afficher seulement les têtes (peut être combiné avec tags)"
 
-#: builtin/show-ref.c:164
 msgid "stricter reference checking, requires exact ref path"
 msgstr ""
 "vérification de référence plus stricte, nécessite un chemin de référence "
 "exact"
 
-#: builtin/show-ref.c:167 builtin/show-ref.c:169
 msgid "show the HEAD reference, even if it would be filtered out"
 msgstr "afficher la référence HEAD, même si elle serait filtrée"
 
-#: builtin/show-ref.c:171
 msgid "dereference tags into object IDs"
 msgstr "déréférencer les étiquettes en IDs d'objet"
 
-#: builtin/show-ref.c:173
 msgid "only show SHA1 hash using <n> digits"
 msgstr "afficher seulement le hachage SHA1 en utilisant <n> chiffres"
 
-#: builtin/show-ref.c:177
 msgid "do not print results to stdout (useful with --verify)"
 msgstr ""
 "ne pas afficher les résultats sur la sortie standard (pratique avec --verify)"
 
-#: builtin/show-ref.c:179
 msgid "show refs from stdin that aren't in local repository"
 msgstr ""
 "afficher les références de l'entrée standard qui ne sont pas dans le dépôt "
 "local"
 
-#: builtin/sparse-checkout.c:23
 msgid "git sparse-checkout (init|list|set|add|reapply|disable) <options>"
 msgstr "git sparse-checkout (init|list|set|add|reapply|disable) <options>"
 
-#: builtin/sparse-checkout.c:61
 msgid "this worktree is not sparse"
 msgstr "cet arbre de travail n'est pas clairsemé"
 
-#: builtin/sparse-checkout.c:76
 msgid "this worktree is not sparse (sparse-checkout file may not exist)"
 msgstr ""
 "cet arbre de travail n'est pas clairsemé (le fichier sparse-checkout "
 "pourrait ne pas exister)"
 
-#: builtin/sparse-checkout.c:177
 #, c-format
 msgid ""
 "directory '%s' contains untracked files, but is not in the sparse-checkout "
@@ -23147,69 +11781,57 @@ msgstr ""
 "le dossier '%s' contient des fichiers non-suivis, mais n'est pas dans le "
 "cone d'extraction clairsemée"
 
-#: builtin/sparse-checkout.c:185
 #, c-format
 msgid "failed to remove directory '%s'"
 msgstr "échec de suppression du répertoire '%s'"
 
-#: builtin/sparse-checkout.c:327
 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:366
 msgid "failed to initialize worktree config"
 msgstr "échec lors de l'initialisation de la configuration d'arbre de travail"
 
-#: builtin/sparse-checkout.c:411
 msgid "failed to modify sparse-index config"
 msgstr "impossible de modifier la configuration d'index clairsemé"
 
-#: builtin/sparse-checkout.c:441 builtin/sparse-checkout.c:793
-#: builtin/sparse-checkout.c:847
 msgid "initialize the sparse-checkout in cone mode"
 msgstr "initialiser l'extraction clairsemée en mode cone"
 
-#: builtin/sparse-checkout.c:443 builtin/sparse-checkout.c:795
-#: builtin/sparse-checkout.c:849
 msgid "toggle the use of a sparse index"
 msgstr "bascule l'utilisation d'index clairsemé"
 
-#: builtin/sparse-checkout.c:479
+#, c-format
+msgid "unable to create leading directories of %s"
+msgstr "impossible de créer les répertoires de premier niveau de %s"
+
 #, c-format
 msgid "failed to open '%s'"
 msgstr "échec à l'ouverture de '%s'"
 
-#: builtin/sparse-checkout.c:531
 #, c-format
 msgid "could not normalize path %s"
 msgstr "impossible de normaliser le chemin '%s'"
 
-#: builtin/sparse-checkout.c:560
 #, 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:615 builtin/sparse-checkout.c:643
 msgid "unable to load existing sparse-checkout patterns"
 msgstr "impossible de charger les motifs de l'extraction clairsemée existants"
 
-#: builtin/sparse-checkout.c:619
 msgid "existing sparse-checkout patterns do not use cone mode"
 msgstr ""
 "les motifs de l'extraction clairsemée existants n'utilisent pas le mode cone"
 
-#: builtin/sparse-checkout.c:707
 msgid "please run from the toplevel directory in non-cone mode"
 msgstr ""
 "veuillez lancer depuis le répertoire de niveau supérieur en mode non-cone"
 
-#: builtin/sparse-checkout.c:712
 msgid "specify directories rather than patterns (no leading slash)"
 msgstr ""
 "spécifier les répertoires plutôt que les motifs (sans barre oblique au début)"
 
-#: builtin/sparse-checkout.c:714
 msgid ""
 "specify directories rather than patterns.  If your directory starts with a "
 "'!', pass --skip-checks"
@@ -23217,7 +11839,6 @@ msgstr ""
 "spécifier les répertoires plutôt que les motifs. Si votre répertoire "
 "commence par un '!', passez --skip-checks"
 
-#: builtin/sparse-checkout.c:716
 msgid ""
 "specify directories rather than patterns.  If your directory really has any "
 "of '*?[]\\' in it, pass --skip-checks"
@@ -23225,7 +11846,6 @@ msgstr ""
 "spécifier les répertoires plutôt que les motifs. Si votre répertoire "
 "contient au moins caractère '*?[]\\\\', passez --skip-checks"
 
-#: builtin/sparse-checkout.c:732
 #, c-format
 msgid ""
 "'%s' is not a directory; to treat it as a directory anyway, rerun with --"
@@ -23234,7 +11854,6 @@ msgstr ""
 "'%s' n'est pas un répertoire ; pour le traiter tout de même comme un "
 "répertoire, relancez avec --skip-checks"
 
-#: builtin/sparse-checkout.c:734
 #, c-format
 msgid ""
 "pass a leading slash before paths such as '%s' if you want a single file "
@@ -23244,26 +11863,21 @@ msgstr ""
 "un seul fichier (voir PROBLÈMES DE NON-CONE dans la page de manuel de git-"
 "sparse-checkout)."
 
-#: builtin/sparse-checkout.c:739
 msgid "git sparse-checkout add [--skip-checks] (--stdin | <patterns>)"
 msgstr "git sparse-checkout add [--skip-checks] (--stdin | <motifs>)"
 
-#: builtin/sparse-checkout.c:752 builtin/sparse-checkout.c:797
 msgid ""
 "skip some sanity checks on the given paths that might give false positives"
 msgstr ""
 "sauter certaines vérifications sanitaires sur les chemins indiqués qui "
 "pourraient provoquer ds faux positifs"
 
-#: builtin/sparse-checkout.c:755 builtin/sparse-checkout.c:800
 msgid "read patterns from standard in"
 msgstr "lire les motifs depuis l'entrée standard"
 
-#: builtin/sparse-checkout.c:760
 msgid "no sparse-checkout to add to"
 msgstr "aucun sparse-checkout auquel on peut ajouter"
 
-#: builtin/sparse-checkout.c:775
 msgid ""
 "git sparse-checkout set [--[no-]cone] [--[no-]sparse-index] [--skip-checks] "
 "(--stdin | <patterns>)"
@@ -23271,37 +11885,29 @@ msgstr ""
 "git sparse-checkout set [--[no-]cone] [--[no-]sparse-index] [--skip-checks] "
 "(--stdin | <motifs>)"
 
-#: builtin/sparse-checkout.c:854
 msgid "must be in a sparse-checkout to reapply sparsity patterns"
 msgstr ""
 "extraction clairsemée nécessaire pour pouvoir réappliquer les motifs de "
 "clairsemage"
 
-#: builtin/sparse-checkout.c:914
 msgid "error while refreshing working directory"
 msgstr "erreur lors du rafraîchissement du répertoire de travail"
 
-#: builtin/stash.c:24 builtin/stash.c:40
 msgid "git stash list [<options>]"
 msgstr "git stash list [<options>]"
 
-#: builtin/stash.c:25 builtin/stash.c:45
 msgid "git stash show [<options>] [<stash>]"
 msgstr "git stash show [<options>] [<remise>]"
 
-#: builtin/stash.c:26 builtin/stash.c:50
 msgid "git stash drop [-q|--quiet] [<stash>]"
 msgstr "git stash drop [-q|--quiet] [<remise>]"
 
-#: builtin/stash.c:27
 msgid "git stash ( pop | apply ) [--index] [-q|--quiet] [<stash>]"
 msgstr "git stash ( pop | apply ) [--index] [-q|--quiet] [<remise>]"
 
-#: builtin/stash.c:28 builtin/stash.c:65
 msgid "git stash branch <branchname> [<stash>]"
 msgstr "git stash branch <nom-de-branche> [<remise>]"
 
-#: builtin/stash.c:30
 msgid ""
 "git stash [push [-p|--patch] [-S|--staged] [-k|--[no-]keep-index] [-q|--"
 "quiet]\n"
@@ -23315,7 +11921,6 @@ msgstr ""
 "          [--pathspec-from-file=<fichier> [--pathspec-file-nul]]\n"
 "          [--] [<spécificateur-de-chemin>...]]"
 
-#: builtin/stash.c:34
 msgid ""
 "git stash save [-p|--patch] [-S|--staged] [-k|--[no-]keep-index] [-q|--"
 "quiet]\n"
@@ -23325,19 +11930,15 @@ msgstr ""
 "quiet]\n"
 "          [-u|--include-untracked] [-a|--all] [<message>]"
 
-#: builtin/stash.c:55
 msgid "git stash pop [--index] [-q|--quiet] [<stash>]"
 msgstr "git stash pop [--index] [-q|--quiet] [<remise>]"
 
-#: builtin/stash.c:60
 msgid "git stash apply [--index] [-q|--quiet] [<stash>]"
 msgstr "git stash apply [--index] [-q|--quiet] [<remise>]"
 
-#: builtin/stash.c:75
 msgid "git stash store [-m|--message <message>] [-q|--quiet] <commit>"
 msgstr "git stash store [-m|--message <message>] [-q|--quiet] <remise>"
 
-#: 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"
@@ -23347,7 +11948,6 @@ msgstr ""
 "          [-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>]"
@@ -23355,30 +11955,24 @@ 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"
 msgstr "'%s' n'est pas une validation de type remisage"
 
-#: builtin/stash.c:150
 #, c-format
 msgid "Too many revisions specified:%s"
 msgstr "Trop de révisions spécifiées : %s"
 
-#: builtin/stash.c:164
 msgid "No stash entries found."
 msgstr "Aucune entrée de remisage trouvée."
 
-#: builtin/stash.c:178
 #, c-format
 msgid "%s is not a valid reference"
 msgstr "%s n'est pas une référence valide"
 
-#: builtin/stash.c:227
 msgid "git stash clear with arguments is unimplemented"
 msgstr "git stash clear avec des arguments n'est pas implémenté"
 
-#: builtin/stash.c:447
 #, c-format
 msgid ""
 "WARNING: Untracked file in way of tracked file!  Renaming\n"
@@ -23390,205 +11984,154 @@ msgstr ""
 "            %s -> %s\n"
 "         pour faire de la place.\n"
 
-#: 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:519
 #, c-format
 msgid "could not generate diff %s^!."
 msgstr "impossible de générer %s^!."
 
-#: builtin/stash.c:526
 msgid "conflicts in index. Try without --index."
 msgstr "conflits dans l'index. Essayez sans --index."
 
-#: builtin/stash.c:532
 msgid "could not save index tree"
 msgstr "impossible de sauvegarder l'arbre d'index"
 
-#: builtin/stash.c:552
 #, c-format
 msgid "Merging %s with %s"
 msgstr "Fusion de %s avec %s"
 
-#: builtin/stash.c:562
 msgid "Index was not unstashed."
 msgstr "L'index n'a pas été sorti de remise."
 
-#: builtin/stash.c:576
 msgid "could not restore untracked files from stash"
 msgstr "impossible de restaurer les fichiers non-suivis depuis le remisage"
 
-#: builtin/stash.c:608 builtin/stash.c:695
 msgid "attempt to recreate the index"
 msgstr "tentative de recréer l'index"
 
-#: builtin/stash.c:641
 #, c-format
 msgid "Dropped %s (%s)"
 msgstr "%s supprimé (%s)"
 
-#: builtin/stash.c:644
 #, c-format
 msgid "%s: Could not drop stash entry"
 msgstr "%s : Impossible de supprimer l'élément de stash"
 
-#: builtin/stash.c:657
 #, c-format
 msgid "'%s' is not a stash reference"
 msgstr "'%s' n'est pas une référence de remisage"
 
-#: builtin/stash.c:707
 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:730
 msgid "No branch name specified"
 msgstr "Aucune branche spécifiée"
 
-#: builtin/stash.c:809
 msgid "failed to parse tree"
 msgstr "échec de l'analyse de l'arbre"
 
-#: builtin/stash.c:820
 msgid "failed to unpack trees"
 msgstr "échec du dépaquetage des arbres"
 
-#: builtin/stash.c:840
 msgid "include untracked files in the stash"
 msgstr "inclure les fichiers non suivis dans le remisage"
 
-#: builtin/stash.c:843
 msgid "only show untracked files in the stash"
 msgstr "ne montrer que les fichiers non suivis dans le remisage"
 
-#: builtin/stash.c:930 builtin/stash.c:967
 #, c-format
 msgid "Cannot update %s with %s"
 msgstr "Impossible de mettre à jour %s avec %s"
 
-#: builtin/stash.c:948 builtin/stash.c:1667 builtin/stash.c:1739
 msgid "stash message"
 msgstr "message pour le remisage"
 
-#: builtin/stash.c:958
 msgid "\"git stash store\" requires one <commit> argument"
 msgstr "\"git stash store\" exige un argument <commit>"
 
-#: builtin/stash.c:1143
 msgid "No staged changes"
 msgstr "Aucune modification indexée"
 
-#: builtin/stash.c:1204
 msgid "No changes selected"
 msgstr "Aucun changement sélectionné"
 
-#: builtin/stash.c:1304
 msgid "You do not have the initial commit yet"
 msgstr "Vous n'avez pas encore la validation initiale"
 
-#: builtin/stash.c:1331
 msgid "Cannot save the current index state"
 msgstr "Impossible de sauver l'état courant de l'index"
 
-#: builtin/stash.c:1340
 msgid "Cannot save the untracked files"
 msgstr "Impossible de sauver les fichiers non-suivis"
 
-#: builtin/stash.c:1351 builtin/stash.c:1370
 msgid "Cannot save the current worktree state"
 msgstr "Impossible de sauver l'état courant de la copie de travail"
 
-#: builtin/stash.c:1361
 msgid "Cannot save the current staged state"
 msgstr "Impossible de sauver l'état actuel de l'index"
 
-#: builtin/stash.c:1398
 msgid "Cannot record working tree state"
 msgstr "Impossible d'enregistrer l'état de la copie de travail"
 
-#: builtin/stash.c:1447
 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:1458
 msgid "Can't use --staged and --include-untracked or --all at the same time"
 msgstr ""
 "Impossible d'utiliser --staged et --include-untracked ou --all en même temps"
 
-#: builtin/stash.c:1476
 msgid "Did you forget to 'git add'?"
 msgstr "Vous avez sûrement oublié 'git add' ?"
 
-#: builtin/stash.c:1491
 msgid "No local changes to save"
 msgstr "Pas de modifications locales à sauver"
 
-#: builtin/stash.c:1498
 msgid "Cannot initialize stash"
 msgstr "Impossible d'initialiser le remisage"
 
-#: builtin/stash.c:1513
 msgid "Cannot save the current status"
 msgstr "Impossible de sauver l'état courant"
 
-#: builtin/stash.c:1518
 #, 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:1615
 msgid "Cannot remove worktree changes"
 msgstr "Impossible de supprimer les changements de la copie de travail"
 
-#: builtin/stash.c:1656 builtin/stash.c:1728
 msgid "keep index"
 msgstr "conserver l'index"
 
-#: builtin/stash.c:1658 builtin/stash.c:1730
 msgid "stash staged changes only"
 msgstr "remiser seulement les modifications indexées"
 
-#: builtin/stash.c:1660 builtin/stash.c:1732
 msgid "stash in patch mode"
 msgstr "remiser une mode rustine"
 
-#: builtin/stash.c:1661 builtin/stash.c:1733
 msgid "quiet mode"
 msgstr "mode silencieux"
 
-#: builtin/stash.c:1663 builtin/stash.c:1735
 msgid "include untracked files in stash"
 msgstr "inclure les fichiers non suivis dans la remise"
 
-#: builtin/stash.c:1665 builtin/stash.c:1737
 msgid "include ignore files"
 msgstr "inclure les fichiers ignorés"
 
-#: builtin/stripspace.c:37
 msgid "skip and remove all lines starting with comment character"
 msgstr ""
 "sauter et supprimer toutes les lignes commençant par le caractère de "
 "commentaire"
 
-#: builtin/stripspace.c:40
 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:50 builtin/submodule--helper.c:2486
 #, c-format
 msgid "Expecting a full ref name, got %s"
 msgstr "Nom de référence complet attendu, %s obtenu"
 
-#: builtin/submodule--helper.c:103
-#, c-format
-msgid "cannot strip one component off url '%s'"
-msgstr "impossible de supprimer un composant de l'URL '%s'"
-
-#: builtin/submodule--helper.c:213
 #, c-format
 msgid ""
 "could not look up configuration '%s'. Assuming this repository is its own "
@@ -23597,26 +12140,20 @@ msgstr ""
 "impossible de trouver la configuration '%s'. Ce dépôt est considéré comme "
 "son propre amont d'autorité."
 
-#: builtin/submodule--helper.c:413 builtin/submodule--helper.c:1873
 msgid "alternative anchor for relative paths"
 msgstr "ancre alternative pour les chemins relatifs"
 
-#: builtin/submodule--helper.c:418
 msgid "git submodule--helper list [--prefix=<path>] [<path>...]"
 msgstr "git submodule--helper list [--prefix=<chemin>] [<chemin>...]"
 
-#: builtin/submodule--helper.c:476 builtin/submodule--helper.c:617
-#: builtin/submodule--helper.c:640
 #, 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:528
 #, c-format
 msgid "Entering '%s'\n"
 msgstr "Entrée dans '%s'\n"
 
-#: builtin/submodule--helper.c:531
 #, c-format
 msgid ""
 "run_command returned non-zero status for %s\n"
@@ -23625,7 +12162,6 @@ msgstr ""
 "run_command a retourné un statut non-nul pour %s\n"
 "."
 
-#: builtin/submodule--helper.c:553
 #, c-format
 msgid ""
 "run_command returned non-zero status while recursing in the nested "
@@ -23636,74 +12172,59 @@ msgstr ""
 "modules inclus de %s\n"
 "."
 
-#: builtin/submodule--helper.c:569
 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:571 builtin/submodule--helper.c:876
-#: builtin/submodule--helper.c:1458
 msgid "recurse into nested submodules"
 msgstr "parcourir récursivement les sous-modules"
 
-#: builtin/submodule--helper.c:576
 msgid "git submodule--helper foreach [--quiet] [--recursive] [--] <command>"
 msgstr "git submodule--helper foreach [--quiet] [--recursive] [--] <commande>"
 
-#: builtin/submodule--helper.c:654
 #, 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:658
 #, 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:668
 #, 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:675
 #, 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:697
 msgid "suppress output for initializing a submodule"
 msgstr "supprimer la sortie lors de l'initialisation d'un sous-module"
 
-#: builtin/submodule--helper.c:702
 msgid "git submodule--helper init [<options>] [<path>]"
 msgstr "git submodule--helper init [<options>] [<chemin>]"
 
-#: builtin/submodule--helper.c:775 builtin/submodule--helper.c:910
 #, 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:823
 #, 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:850 builtin/submodule--helper.c:1428
 #, c-format
 msgid "failed to recurse into submodule '%s'"
 msgstr "récursion impossible dans le sous-module '%s'"
 
-#: builtin/submodule--helper.c:874 builtin/submodule--helper.c:1595
 msgid "suppress submodule status output"
 msgstr "supprimer la sortie d'état du sous-module"
 
-#: builtin/submodule--helper.c:875
 msgid ""
 "use commit stored in the index instead of the one stored in the submodule "
 "HEAD"
@@ -23711,94 +12232,74 @@ msgstr ""
 "utiliser le commit stocké dans l'index au lieu de celui stocké dans la HEAD "
 "du sous-module"
 
-#: builtin/submodule--helper.c:881
 msgid "git submodule status [--quiet] [--cached] [--recursive] [<path>...]"
 msgstr "git submodule status [--quiet] [--cached] [--recursive] [<chemin>...]"
 
-#: builtin/submodule--helper.c:905
 msgid "git submodule--helper name <path>"
 msgstr "git submodule--helper <nom> <chemin>"
 
-#: builtin/submodule--helper.c:977
 #, c-format
 msgid "* %s %s(blob)->%s(submodule)"
 msgstr "* %s %s(blob)->%s(submodule)"
 
-#: builtin/submodule--helper.c:980
 #, c-format
 msgid "* %s %s(submodule)->%s(blob)"
 msgstr "* %s %s(submodule)->%s(blob)"
 
-#: builtin/submodule--helper.c:993
 #, c-format
 msgid "%s"
 msgstr "%s"
 
-#: builtin/submodule--helper.c:1043
 #, c-format
 msgid "couldn't hash object from '%s'"
 msgstr "impossible de calculer l'empreinte de l'objet depuis '%s'"
 
-#: builtin/submodule--helper.c:1047
 #, c-format
 msgid "unexpected mode %o\n"
 msgstr "mode %o inattendu\n"
 
-#: builtin/submodule--helper.c:1288
 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:1290
 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:1292
 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:1294
 msgid "limit the summary size"
 msgstr "limiter la taille du résumé"
 
-#: builtin/submodule--helper.c:1299
 msgid "git submodule--helper summary [<options>] [<commit>] [--] [<path>]"
 msgstr "git submodule--helper summary [<options>] [<commit>] [--] [<chemin>]"
 
-#: builtin/submodule--helper.c:1323
 msgid "could not fetch a revision for HEAD"
 msgstr "impossible de récupérer une révision pour HEAD"
 
-#: builtin/submodule--helper.c:1384
 #, c-format
 msgid "Synchronizing submodule url for '%s'\n"
 msgstr "Synchronisation de l'URL sous-module pour '%s'\n"
 
-#: builtin/submodule--helper.c:1390
 #, 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:1399
 #, 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:1409
 #, 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:1456
 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:1463
 msgid "git submodule--helper sync [--quiet] [--recursive] [<path>]"
 msgstr "git submodule--helper sync [--quiet] [--recursive] [<chemin>]"
 
-#: builtin/submodule--helper.c:1513
 #, c-format
 msgid ""
 "Submodule work tree '%s' contains a .git directory. This will be replaced "
@@ -23807,7 +12308,6 @@ msgstr ""
 "L'arbre de travail du sous-module '%s' contient un répertoire .git. Il sera "
 "remplacé par un fichier .git en utilisant absorbgitdirs."
 
-#: builtin/submodule--helper.c:1530
 #, c-format
 msgid ""
 "Submodule work tree '%s' contains local modifications; use '-f' to discard "
@@ -23816,48 +12316,39 @@ msgstr ""
 "L'arbre de travail du sous-module '%s' contient des modifications locales ; "
 "utilisez '-f' pour les annuler"
 
-#: builtin/submodule--helper.c:1538
 #, c-format
 msgid "Cleared directory '%s'\n"
 msgstr "Répertoire '%s' nettoyé\n"
 
-#: builtin/submodule--helper.c:1540
 #, 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:1551
 #, 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:1567
 #, 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:1596
 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:1597
 msgid "unregister all submodules"
 msgstr "désenregistrer tous les sous-modules"
 
-#: builtin/submodule--helper.c:1602
 msgid ""
 "git submodule deinit [--quiet] [-f | --force] [--all | [--] [<path>...]]"
 msgstr ""
 "git submodule deinit [--quiet] [-f | --force] [--all | [--] [<chemin>...]]"
 
-#: builtin/submodule--helper.c:1616
 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:1665
 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"
@@ -23869,163 +12360,133 @@ msgstr ""
 "submodule.alternateErrorStrategy à 'info', ou de manière équivalente,\n"
 "clonez avec '--reference-if-able' au lieu de '--reference'."
 
-#: builtin/submodule--helper.c:1710 builtin/submodule--helper.c:1713
 #, 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:1749
 #, 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:1756
 #, 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:1781
 #, 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:1826
 #, 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:1831
 #, c-format
 msgid "directory not empty: '%s'"
 msgstr "le répertoire n'est pas vide : '%s'"
 
-#: builtin/submodule--helper.c:1843
 #, 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:1876
 msgid "where the new submodule will be cloned to"
 msgstr "emplacement où le sous-module sera cloné"
 
-#: builtin/submodule--helper.c:1879
 msgid "name of the new submodule"
 msgstr "nom du nouveau sous-module"
 
-#: builtin/submodule--helper.c:1882
 msgid "url where to clone the submodule from"
 msgstr "url depuis laquelle cloner le sous-module"
 
-#: builtin/submodule--helper.c:1890 builtin/submodule--helper.c:3383
 msgid "depth for shallow clones"
 msgstr "profondeur de l'historique des clones superficiels"
 
-#: builtin/submodule--helper.c:1893 builtin/submodule--helper.c:2731
-#: builtin/submodule--helper.c:3376
 msgid "force cloning progress"
 msgstr "forcer l'affichage de la progression du clonage"
 
-#: builtin/submodule--helper.c:1895 builtin/submodule--helper.c:2733
 msgid "disallow cloning into non-empty directory"
 msgstr "interdire de cloner dans un répertoire non-vide"
 
-#: builtin/submodule--helper.c:1903
 msgid ""
 "git submodule--helper clone [--prefix=<path>] [--quiet] [--reference "
 "<repository>] [--name <name>] [--depth <depth>] [--single-branch] [--filter "
 "<filter-spec>] --url <url> --path <path>"
-msgstr "git submodule--helper clone [--prefix=<chemin>] [--quiet] [--reference <dépôt>] [--name <nom>] [--depth <profondeur>] [--single-branch] [--filter <spécificateur-de-filtre>]--url <url> --path <chemin>"
+msgstr ""
+"git submodule--helper clone [--prefix=<chemin>] [--quiet] [--reference "
+"<dépôt>] [--name <nom>] [--depth <profondeur>] [--single-branch] [--filter "
+"<spécificateur-de-filtre>]--url <url> --path <chemin>"
 
-#: builtin/submodule--helper.c:1943
 #, 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:1947
 #, 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:2041
 #, c-format
 msgid "Submodule path '%s' not initialized"
 msgstr "Le chemin de sous-module '%s' n'est pas initialisé"
 
-#: builtin/submodule--helper.c:2045
 msgid "Maybe you want to use 'update --init'?"
 msgstr "Vous voudriez sûrement utiliser 'update --init' ?"
 
-#: builtin/submodule--helper.c:2075
 #, c-format
 msgid "Skipping unmerged submodule %s"
 msgstr "Sous-module non fusionné %s non traité"
 
-#: builtin/submodule--helper.c:2104
 #, c-format
 msgid "Skipping submodule '%s'"
 msgstr "Sous-module '%s' non traité"
 
-#: builtin/submodule--helper.c:2257
 #, c-format
 msgid "Failed to clone '%s'. Retry scheduled"
 msgstr "Impossible de cloner '%s'. Réessai prévu"
 
-#: builtin/submodule--helper.c:2268
 #, 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:2371
 #, 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:2375
 #, 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:2379
 #, 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:2383
 #, 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:2402
 #, c-format
 msgid "Submodule path '%s': checked out '%s'\n"
 msgstr "Chemin de sous-module '%s' : '%s' extrait\n"
 
-#: builtin/submodule--helper.c:2406
 #, c-format
 msgid "Submodule path '%s': rebased into '%s'\n"
 msgstr "Chemin de sous-module '%s' : rebasé dans '%s'\n"
 
-#: builtin/submodule--helper.c:2410
 #, c-format
 msgid "Submodule path '%s': merged in '%s'\n"
 msgstr "Chemin de sous-module '%s' : fusionné dans '%s'\n"
 
-#: builtin/submodule--helper.c:2414
 #, c-format
 msgid "Submodule path '%s': '%s %s'\n"
 msgstr "Le chemin de sous-module '%s' : '%s %s'\n"
 
-#: builtin/submodule--helper.c:2438
 #, 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:2447
 #, c-format
 msgid ""
 "Fetched in submodule path '%s', but it did not contain %s. Direct fetching "
@@ -24034,7 +12495,6 @@ 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:2481
 #, c-format
 msgid ""
 "Submodule (%s) branch configured to inherit branch from superproject, but "
@@ -24043,83 +12503,65 @@ msgstr ""
 "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:2499
 #, 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:2588
 #, c-format
 msgid "Unable to find current revision in submodule path '%s'"
 msgstr ""
 "Impossible de trouver la révision actuelle dans le chemin de sous-module '%s'"
 
-#: builtin/submodule--helper.c:2599
 #, c-format
 msgid "Unable to fetch in submodule path '%s'"
 msgstr "Impossible de rapatrier dans le chemin de sous-module '%s'"
 
-#: builtin/submodule--helper.c:2604
 #, c-format
 msgid "Unable to find %s revision in submodule path '%s'"
 msgstr ""
 "Impossible de trouver la révision %s dans le chemin de sous-module '%s'"
 
-#: builtin/submodule--helper.c:2640
 #, c-format
 msgid "Failed to recurse into submodule path '%s'"
 msgstr "Échec de la récursion dans le chemin de sous-module '%s'"
 
-#: builtin/submodule--helper.c:2699
 msgid "force checkout updates"
 msgstr "forcer les mises à jour d'extraction"
 
-#: builtin/submodule--helper.c:2701
 msgid "initialize uninitialized submodules before update"
 msgstr "initialiser les sous-modules non-initialisés avant la mise à jour"
 
-#: builtin/submodule--helper.c:2703
 msgid "use SHA-1 of submodule's remote tracking branch"
 msgstr "utiliser les SHA-1 de la branche de suivi distante du sous-module"
 
-#: builtin/submodule--helper.c:2705
 msgid "traverse submodules recursively"
 msgstr "traverser les sous-modules récursivement"
 
-#: builtin/submodule--helper.c:2707
 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:2710 builtin/submodule--helper.c:2892
 msgid "path into the working tree"
 msgstr "chemin dans la copie de travail"
 
-#: builtin/submodule--helper.c:2713
 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:2717
 msgid "rebase, merge, checkout or none"
 msgstr "valeurs possibles : rebase, merge, checkout ou none"
 
-#: builtin/submodule--helper.c:2723
 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:2726
 msgid "parallel jobs"
 msgstr "jobs parallèles"
 
-#: builtin/submodule--helper.c:2728
 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:2729
 msgid "don't print cloning progress"
 msgstr "ne pas afficher la progression du clonage"
 
-#: builtin/submodule--helper.c:2741
 msgid ""
 "git submodule [--quiet] update [--init [--filter=<filter-spec>]] [--remote] "
 "[-N|--no-fetch] [-f|--force] [--checkout|--merge|--rebase] [--[no-]recommend-"
@@ -24131,84 +12573,64 @@ msgstr ""
 "[no-]recommend-shallow] [--reference <dépôt>] [--recursive] [--[no-]single-"
 "branch] [--] [<chemin>...]"
 
-#: builtin/submodule--helper.c:2767
 msgid "bad value for update parameter"
 msgstr "valeur invalide pour la mise à jour du paramètre"
 
-#: builtin/submodule--helper.c:2893
 msgid "recurse into submodules"
 msgstr "parcourir récursivement les sous-modules"
 
-#: builtin/submodule--helper.c:2899
 msgid "git submodule--helper absorb-git-dirs [<options>] [<path>...]"
 msgstr "git submodule--helper absorb-git-dirs [<options>] [<chemin>...]"
 
-#: builtin/submodule--helper.c:2955
 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:2958
 msgid "unset the config in the .gitmodules file"
 msgstr "désactiver la configuration dans le fichier .gitmodules"
 
-#: builtin/submodule--helper.c:2963
 msgid "git submodule--helper config <name> [<value>]"
 msgstr "git submodule--helper config name [<valeur>]"
 
-#: builtin/submodule--helper.c:2964
 msgid "git submodule--helper config --unset <name>"
 msgstr "git submodule--helper config --unset <nom>"
 
-#: builtin/submodule--helper.c:2984 builtin/submodule--helper.c:3238
-#: builtin/submodule--helper.c:3395
 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:3000
 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:3004
 msgid "git submodule--helper set-url [--quiet] <path> <newurl>"
 msgstr "git submodule--helper sync [--quiet] <chemin> <nouvelle-url>"
 
-#: builtin/submodule--helper.c:3037
 msgid "set the default tracking branch to master"
 msgstr "régler la branche de suivi par défaut à master"
 
-#: builtin/submodule--helper.c:3039
 msgid "set the default tracking branch"
 msgstr "régler la branche de suivi par défaut"
 
-#: builtin/submodule--helper.c:3043
 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:3044
 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:3051
 msgid "--branch or --default required"
 msgstr "--branch ou --default requis"
 
-#: builtin/submodule--helper.c:3072 builtin/submodule--helper.c:3375
 msgid "print only error messages"
 msgstr "afficher seulement les messages d'erreur"
 
-#: builtin/submodule--helper.c:3073
 msgid "force creation"
 msgstr "forcer la création"
 
-#: builtin/submodule--helper.c:3081
 msgid "show whether the branch would be created"
 msgstr "afficher si la branche serait créée"
 
-#: builtin/submodule--helper.c:3085
 msgid ""
 "git submodule--helper create-branch [-f|--force] [--create-reflog] [-q|--"
 "quiet] [-t|--track] [-n|--dry-run] <name> <start-oid> <start-name>"
@@ -24216,29 +12638,24 @@ msgstr ""
 "git submodule--helper create-branch [-f|--force] [--create-reflog] [-q|--"
 "quiet] [-t|--track] [-n|--dry-run] <nom> <oid-départ> <nom-de-départ>"
 
-#: builtin/submodule--helper.c:3097
 #, c-format
 msgid "creating branch '%s'"
 msgstr "création de la branche '%s'"
 
-#: builtin/submodule--helper.c:3155
 #, 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:3158
 #, 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:3171
 #, c-format
 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:3178
 #, c-format
 msgid ""
 "If you want to reuse this local git directory instead of cloning again from\n"
@@ -24255,117 +12672,96 @@ msgstr ""
 "correct\n"
 "ou si ceci n'est pas clair, choisissez un autre nom avec l'option '--name'."
 
-#: builtin/submodule--helper.c:3190
 #, 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:3227
 #, c-format
 msgid "unable to checkout submodule '%s'"
 msgstr "Impossible d'extraire le sous-module '%s'"
 
-#: builtin/submodule--helper.c:3266
 #, c-format
 msgid "Failed to add submodule '%s'"
 msgstr "Échec d'ajout du sous-module '%s'"
 
-#: builtin/submodule--helper.c:3270 builtin/submodule--helper.c:3275
-#: builtin/submodule--helper.c:3283
 #, c-format
 msgid "Failed to register submodule '%s'"
 msgstr "Échec d'enregistrement du sous-module '%s'"
 
-#: builtin/submodule--helper.c:3339
 #, c-format
 msgid "'%s' already exists in the index"
 msgstr "'%s' existe déjà dans l'index"
 
-#: builtin/submodule--helper.c:3342
 #, 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:3372
+#, c-format
+msgid "'%s' does not have a commit checked out"
+msgstr "'%s' n'a pas de commit extrait"
+
 msgid "branch of repository to add as submodule"
 msgstr "la branche du dépôt à ajouter comme sous-module"
 
-#: builtin/submodule--helper.c:3373
 msgid "allow adding an otherwise ignored submodule path"
 msgstr "permettre l'ajout des chemins de modules ignorés par ailleurs"
 
-#: builtin/submodule--helper.c:3379
 msgid "borrow the objects from reference repositories"
 msgstr "emprunter les objets depuis des dépôts de références"
 
-#: builtin/submodule--helper.c:3381
 msgid ""
-"sets the submodule’s name to the given string instead of defaulting to its "
+"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 "
+"configurer le nom du sous-module avec la chaîne passée au lieu d'utiliser "
 "par défaut son chemin"
 
-#: builtin/submodule--helper.c:3388
 msgid "git submodule--helper add [<options>] [--] <repository> [<path>]"
 msgstr "git submodule--helper add [<options>] [--] <dépôt> [<chemin>]"
 
-#: builtin/submodule--helper.c:3416
 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:3425
 #, 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:3460
 #, 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:3520 git.c:453 git.c:729
 #, c-format
 msgid "%s doesn't support --super-prefix"
 msgstr "%s ne gère pas --super-prefix"
 
-#: builtin/submodule--helper.c:3526
 #, 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>]"
 
-#: builtin/symbolic-ref.c:9
 msgid "git symbolic-ref -d [-q] <name>"
 msgstr "git symbolic-ref -d [-q] <nom>"
 
-#: builtin/symbolic-ref.c:42
 msgid "suppress error message for non-symbolic (detached) refs"
 msgstr ""
 "supprimer le message d'erreur pour une référence non symbolique (détachée)"
 
-#: builtin/symbolic-ref.c:43
 msgid "delete symbolic ref"
 msgstr "supprimer la référence symbolique"
 
-#: builtin/symbolic-ref.c:44
 msgid "shorten ref output"
 msgstr "raccourcir l'affichage de la référence"
 
-#: builtin/symbolic-ref.c:45 builtin/update-ref.c:505
 msgid "reason"
 msgstr "raison"
 
-#: builtin/symbolic-ref.c:45 builtin/update-ref.c:505
 msgid "reason of the update"
 msgstr "raison de la mise à jour"
 
-#: builtin/tag.c:26
 msgid ""
 "git tag [-a | -s | -u <key-id>] [-f] [-m <msg> | -F <file>]\n"
 "        <tagname> [<head>]"
@@ -24373,11 +12769,9 @@ msgstr ""
 "git tag [-a | -s | -u <id-clé>] [-f] [-m <msg> | -F <fichier>]\n"
 "        <nom-d-étiquette> [<tête>]"
 
-#: builtin/tag.c:28
 msgid "git tag -d <tagname>..."
 msgstr "git tag -d <nom-d-étiquette>..."
 
-#: builtin/tag.c:29
 msgid ""
 "git tag -l [-n[<num>]] [--contains <commit>] [--no-contains <commit>] [--"
 "points-at <object>]\n"
@@ -24389,21 +12783,17 @@ msgstr ""
 "        [--format=<format>] [--merged <commit>] [--no-merged <commit>] "
 "[<motif>...]"
 
-#: builtin/tag.c:31
 msgid "git tag -v [--format=<format>] <tagname>..."
 msgstr "git tag -v [--format=<format>] <nom-d-étiquette>..."
 
-#: builtin/tag.c:101
 #, c-format
 msgid "tag '%s' not found."
 msgstr "étiquette '%s' non trouvée."
 
-#: builtin/tag.c:136
 #, c-format
 msgid "Deleted tag '%s' (was %s)\n"
 msgstr "Étiquette '%s' supprimée (elle était sur %s)\n"
 
-#: builtin/tag.c:171
 #, c-format
 msgid ""
 "\n"
@@ -24416,7 +12806,6 @@ msgstr ""
 "  %s\n"
 "Les lignes commençant par '%c' seront ignorées.\n"
 
-#: builtin/tag.c:175
 #, c-format
 msgid ""
 "\n"
@@ -24431,11 +12820,9 @@ msgstr ""
 "Les lignes commençant par '%c' seront gardées ; vous pouvez les retirer vous-"
 "même si vous le souhaitez.\n"
 
-#: builtin/tag.c:241
 msgid "unable to sign the tag"
 msgstr "impossible de signer l'étiquette"
 
-#: builtin/tag.c:259
 #, c-format
 msgid ""
 "You have created a nested tag. The object referred to by your new tag is\n"
@@ -24450,326 +12837,255 @@ msgstr ""
 "\n"
 "\tgit tag -f %s %s^{}"
 
-#: builtin/tag.c:275
 msgid "bad object type."
 msgstr "mauvais type d'objet."
 
-#: builtin/tag.c:326
 msgid "no tag message?"
 msgstr "pas de message pour l'étiquette ?"
 
-#: 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:445
 msgid "list tag names"
 msgstr "afficher les noms des étiquettes"
 
-#: builtin/tag.c:447
 msgid "print <n> lines of each tag message"
 msgstr "affiche <n> lignes de chaque message d'étiquette"
 
-#: builtin/tag.c:449
 msgid "delete tags"
 msgstr "supprimer des étiquettes"
 
-#: builtin/tag.c:450
 msgid "verify tags"
 msgstr "vérifier des étiquettes"
 
-#: builtin/tag.c:452
 msgid "Tag creation options"
 msgstr "Options de création de l'étiquette"
 
-#: builtin/tag.c:454
 msgid "annotated tag, needs a message"
 msgstr "étiquette annotée, nécessite un message"
 
-#: builtin/tag.c:456
 msgid "tag message"
 msgstr "message pour l'étiquette"
 
-#: builtin/tag.c:458
 msgid "force edit of tag message"
 msgstr "forcer l'édition du message d'étiquetage"
 
-#: builtin/tag.c:459
 msgid "annotated and GPG-signed tag"
 msgstr "étiquette annotée et signée avec GPG"
 
-#: builtin/tag.c:462
 msgid "use another key to sign the tag"
 msgstr "utiliser une autre clé pour signer l'étiquette"
 
-#: builtin/tag.c:463
 msgid "replace the tag if exists"
 msgstr "remplacer l'étiquette si elle existe"
 
-#: builtin/tag.c:464 builtin/update-ref.c:511
 msgid "create a reflog"
 msgstr "créer un reflog"
 
-#: builtin/tag.c:466
 msgid "Tag listing options"
 msgstr "Options d'affichage des étiquettes"
 
-#: builtin/tag.c:467
 msgid "show tag list in columns"
 msgstr "afficher la liste des étiquettes sous forme de colonnes"
 
-#: builtin/tag.c:468 builtin/tag.c:470
 msgid "print only tags that contain the commit"
 msgstr "afficher seulement les étiquettes qui contiennent la validation"
 
-#: builtin/tag.c:469 builtin/tag.c:471
 msgid "print only tags that don't contain the commit"
 msgstr "afficher seulement les étiquettes qui ne contiennent pas la validation"
 
-#: builtin/tag.c:472
 msgid "print only tags that are merged"
 msgstr "afficher seulement les étiquettes qui sont fusionnées"
 
-#: builtin/tag.c:473
 msgid "print only tags that are not merged"
 msgstr "afficher seulement les étiquettes qui ne sont pas fusionnées"
 
-#: builtin/tag.c:477
 msgid "print only tags of the object"
 msgstr "afficher seulement les étiquettes de l'objet"
 
-#: builtin/tag.c:559
 #, c-format
 msgid "the '%s' option is only allowed in list mode"
 msgstr "l'option '%s' est autorisée seulement en mode de liste"
 
-#: builtin/tag.c:598
 #, c-format
 msgid "'%s' is not a valid tag name."
 msgstr "'%s' n'est pas un nom d'étiquette valide."
 
-#: builtin/tag.c:603
 #, c-format
 msgid "tag '%s' already exists"
 msgstr "l'étiquette '%s' existe déjà"
 
-#: builtin/tag.c:634
+#, c-format
+msgid "Invalid cleanup mode %s"
+msgstr "Mode de nettoyage invalide %s"
+
 #, c-format
 msgid "Updated tag '%s' (was %s)\n"
 msgstr "Étiquette '%s' mise à jour (elle était sur %s)\n"
 
-#: builtin/unpack-objects.c:95
 msgid "pack exceeds maximum allowed size"
 msgstr "le paquet dépasse la taille maximale permise"
 
-#: builtin/unpack-objects.c:504
 msgid "Unpacking objects"
 msgstr "Dépaquetage des objets"
 
-#: builtin/update-index.c:84
 #, c-format
 msgid "failed to create directory %s"
 msgstr "échec de la création du répertoire %s"
 
-#: 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: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:138
 #, c-format
 msgid "Testing mtime in '%s' "
 msgstr "Test du mtime dans '%s' "
 
-#: 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: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: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: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: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: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:220
 msgid " OK"
 msgstr " OK"
 
-#: builtin/update-index.c:589
 msgid "git update-index [<options>] [--] [<file>...]"
 msgstr "git update-index [<options>] [--] [<fichier>...]"
 
-#: builtin/update-index.c:993
 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:996
 msgid "refresh: ignore submodules"
 msgstr "rafraîchir : ignorer les sous-modules"
 
-#: builtin/update-index.c:999
 msgid "do not ignore new files"
 msgstr "ne pas ignorer les nouveaux fichiers"
 
-#: builtin/update-index.c:1001
 msgid "let files replace directories and vice-versa"
 msgstr "laisser les fichiers remplacer des répertoires et vice-versa"
 
-#: builtin/update-index.c:1003
 msgid "notice files missing from worktree"
 msgstr "aviser des fichiers manquants dans la copie de travail"
 
-#: builtin/update-index.c:1005
 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:1008
 msgid "refresh stat information"
 msgstr "rafraîchir l'information de stat"
 
-#: builtin/update-index.c:1012
 msgid "like --refresh, but ignore assume-unchanged setting"
 msgstr "comme --refresh, mais en ignorant l'option assume-unchanged"
 
-#: builtin/update-index.c:1016
 msgid "<mode>,<object>,<path>"
 msgstr "<mode>, <objet>, <chemin>"
 
-#: builtin/update-index.c:1017
 msgid "add the specified entry to the index"
 msgstr "ajouter l'élément spécifié dans l'index"
 
-#: builtin/update-index.c:1027
 msgid "mark files as \"not changing\""
 msgstr "marquer les fichiers comme \"non changeants\""
 
-#: builtin/update-index.c:1030
 msgid "clear assumed-unchanged bit"
 msgstr "mettre à zéro le bit supposé-non-modifié"
 
-#: builtin/update-index.c:1033
 msgid "mark files as \"index-only\""
 msgstr "marquer les fichiers comme \"index seulement\""
 
-#: builtin/update-index.c:1036
 msgid "clear skip-worktree bit"
 msgstr "mettre à zéro le bit sauter-la-copie-de travail"
 
-#: builtin/update-index.c:1039
 msgid "do not touch index-only entries"
 msgstr "ne pas toucher aux entrées restreintes à l'index"
 
-#: builtin/update-index.c:1041
 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:1043
 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:1045
 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:1047
 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:1051
 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:1055
 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:1059
 msgid "only update entries that differ from HEAD"
 msgstr "mettre à jour seulement les éléments qui diffèrent de HEAD"
 
-#: builtin/update-index.c:1063
 msgid "ignore files missing from worktree"
 msgstr "ignorer les fichiers manquants dans la copie de travail"
 
-#: builtin/update-index.c:1066
 msgid "report actions to standard output"
 msgstr "afficher les actions sur la sortie standard"
 
-#: builtin/update-index.c:1068
 msgid "(for porcelains) forget saved unresolved conflicts"
 msgstr "(pour porcelaines) oublier les conflits sauvés et non résolus"
 
-#: builtin/update-index.c:1072
 msgid "write index in this format"
 msgstr "écrire l'index dans ce format"
 
-#: builtin/update-index.c:1074
 msgid "enable or disable split index"
 msgstr "activer ou désactiver l'index scindé"
 
-#: builtin/update-index.c:1076
 msgid "enable/disable untracked cache"
 msgstr "activer ou désactiver le cache de non-suivis"
 
-#: builtin/update-index.c:1078
 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:1080
 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:1082
 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:1084
 msgid "enable or disable file system monitor"
 msgstr ""
 "activer ou désactiver la surveillance du système de fichier (fsmonitor)"
 
-#: builtin/update-index.c:1086
 msgid "mark files as fsmonitor valid"
 msgstr "marquer les fichiers comme valides pour fsmonitor"
 
-#: builtin/update-index.c:1089
 msgid "clear fsmonitor valid bit"
 msgstr "effacer le bit de validité fsmonitor"
 
-#: builtin/update-index.c:1195
 msgid ""
 "core.splitIndex is set to false; remove or change it, if you really want to "
 "enable split index"
@@ -24777,7 +13093,6 @@ msgstr ""
 "core.splitIndex est réglé à false ; supprimez-le ou changez-le si vous "
 "souhaitez vraiment activer l'index scindé"
 
-#: builtin/update-index.c:1204
 msgid ""
 "core.splitIndex is set to true; remove or change it, if you really want to "
 "disable split index"
@@ -24785,7 +13100,6 @@ msgstr ""
 "core.splitIndex est réglé à vrai ; supprimez-le ou changez-le si vous "
 "souhaitez vraiment désactiver l'index scindé"
 
-#: builtin/update-index.c:1216
 msgid ""
 "core.untrackedCache is set to true; remove or change it, if you really want "
 "to disable the untracked cache"
@@ -24793,11 +13107,9 @@ msgstr ""
 "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:1220
 msgid "Untracked cache disabled"
 msgstr "Le cache non suivi est désactivé"
 
-#: builtin/update-index.c:1228
 msgid ""
 "core.untrackedCache is set to false; remove or change it, if you really want "
 "to enable the untracked cache"
@@ -24805,175 +13117,135 @@ msgstr ""
 "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:1232
 #, c-format
 msgid "Untracked cache enabled for '%s'"
 msgstr "Le cache non suivi est activé pour '%s'"
 
-#: builtin/update-index.c:1241
 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:1246
 msgid "fsmonitor enabled"
 msgstr "fsmonitor activé"
 
-#: builtin/update-index.c:1250
 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:1254
 msgid "fsmonitor disabled"
 msgstr "fsmonitor désactivé"
 
-#: builtin/update-ref.c:10
 msgid "git update-ref [<options>] -d <refname> [<old-val>]"
 msgstr "git update-ref [<options>] -d <nom-référence> [<ancienne-valeur>]"
 
-#: builtin/update-ref.c:11
 msgid "git update-ref [<options>]    <refname> <new-val> [<old-val>]"
 msgstr ""
 "git update-ref [<options>]    <nom-référence> <nouvelle-valeur> [<ancienne-"
 "valeur>]"
 
-#: builtin/update-ref.c:12
 msgid "git update-ref [<options>] --stdin [-z]"
 msgstr "git update-ref [<options>] --stdin [-z]"
 
-#: builtin/update-ref.c:506
 msgid "delete the reference"
 msgstr "supprimer la référence"
 
-#: 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:509
 msgid "stdin has NUL-terminated arguments"
 msgstr "l'entrée standard a des arguments qui se terminent par NUL"
 
-#: builtin/update-ref.c:510
 msgid "read updates from stdin"
 msgstr "lire les mises à jour depuis l'entrée standard"
 
-#: builtin/update-server-info.c:15
 msgid "update the info files from scratch"
 msgstr "mettre à jour les fichiers d'information à partir de zéro"
 
-#: builtin/upload-pack.c:11
 msgid "git upload-pack [<options>] <dir>"
 msgstr "git upload-pack [<options>] <répertoire>"
 
-#: 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: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: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:31
 msgid "interrupt transfer after <n> seconds of inactivity"
 msgstr "interrompre le transfert après <n> secondes d'inactivité"
 
-#: builtin/verify-commit.c:19
 msgid "git verify-commit [-v | --verbose] <commit>..."
 msgstr "git verify-commit [-v | --verbose] <commit>..."
 
-#: builtin/verify-commit.c:68
 msgid "print commit contents"
 msgstr "afficher le contenu du commit"
 
-#: builtin/verify-commit.c:69 builtin/verify-tag.c:37
 msgid "print raw gpg status output"
 msgstr "afficher les messages bruts de gpg"
 
-#: 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>..."
 
-#: builtin/verify-pack.c:70
 msgid "verbose"
 msgstr "verbeux"
 
-#: builtin/verify-pack.c:72
 msgid "show statistics only"
 msgstr "afficher seulement les statistiques"
 
-#: builtin/verify-tag.c:18
 msgid "git verify-tag [-v | --verbose] [--format=<format>] <tag>..."
 msgstr "git verify-tag [-v | --verbose] [--format=<format>] <étiquette>..."
 
-#: builtin/verify-tag.c:36
 msgid "print tag contents"
 msgstr "afficher le contenu de l'étiquette"
 
-#: builtin/worktree.c:19
 msgid "git worktree add [<options>] <path> [<commit-ish>]"
 msgstr "git worktree add [<options>] <chemin> [<commit>]"
 
-#: builtin/worktree.c:20
 msgid "git worktree list [<options>]"
 msgstr "git worktree list [<options>]"
 
-#: builtin/worktree.c:21
 msgid "git worktree lock [<options>] <path>"
 msgstr "git worktree lock [<options>] <chemin>"
 
-#: builtin/worktree.c:22
 msgid "git worktree move <worktree> <new-path>"
 msgstr "git worktree move <arbre-de-travail> <nouveau-chemin>"
 
-#: builtin/worktree.c:23
 msgid "git worktree prune [<options>]"
 msgstr "git worktree prune [<options>]"
 
-#: builtin/worktree.c:24
 msgid "git worktree remove [<options>] <worktree>"
 msgstr "git worktree remove [<options>] <arbre-de-travail>"
 
-#: builtin/worktree.c:25
 msgid "git worktree repair [<path>...]"
 msgstr "git worktree repair [<chemin>...]"
 
-#: builtin/worktree.c:26
 msgid "git worktree unlock <path>"
 msgstr "git worktree unlock <chemin>"
 
-#: builtin/worktree.c:76
 #, c-format
 msgid "Removing %s/%s: %s"
 msgstr "Suppression de %s/%s : %s"
 
-#: builtin/worktree.c:149
 msgid "report pruned working trees"
 msgstr "afficher les arbres de travail éliminés"
 
-#: builtin/worktree.c:151
 msgid "expire working trees older than <time>"
 msgstr "faire expirer les arbres de travail plus vieux que <temps>"
 
-#: builtin/worktree.c:221
 #, c-format
 msgid "'%s' already exists"
 msgstr "'%s' existe déjà"
 
-#: builtin/worktree.c:230
 #, c-format
 msgid "unusable worktree destination '%s'"
 msgstr "arbre de travail destination '%s' inutilisable"
 
-#: builtin/worktree.c:235
 #, c-format
 msgid ""
 "'%s' is a missing but locked worktree;\n"
@@ -24983,7 +13255,6 @@ msgstr ""
 "utilisez '%s -f -f' pour passer outre, ou 'unlock' et 'prune' ou 'remove' "
 "pour corriger"
 
-#: builtin/worktree.c:237
 #, c-format
 msgid ""
 "'%s' is a missing but already registered worktree;\n"
@@ -24992,159 +13263,130 @@ msgstr ""
 "'%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:248
 #, c-format
 msgid "failed to copy '%s' to '%s'; sparse-checkout may not work correctly"
 msgstr ""
 "échec de la copie de '%s' vers '%s' ; les extractions clairsemées pourraient "
 "ne pas fonctionner correctement"
 
-#: builtin/worktree.c:268
 #, c-format
 msgid "failed to copy worktree config from '%s' to '%s'"
 msgstr ""
 "impossible de copier la configuration d'arbre de travail de '%s' vers '%s'"
 
-#: builtin/worktree.c:280 builtin/worktree.c:285
 #, c-format
 msgid "failed to unset '%s' in '%s'"
 msgstr "échec de désinitialisation de '%s' dans '%s'"
 
-#: builtin/worktree.c:356
 #, c-format
 msgid "could not create directory of '%s'"
 msgstr "impossible de créer le répertoire de '%s'"
 
-#: builtin/worktree.c:378
 msgid "initializing"
 msgstr "initialisation"
 
-#: builtin/worktree.c:492 builtin/worktree.c:498
 #, c-format
 msgid "Preparing worktree (new branch '%s')"
 msgstr "Préparation de l'arbre de travail (nouvelle branche '%s')"
 
-#: builtin/worktree.c:494
 #, 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:503
 #, c-format
 msgid "Preparing worktree (checking out '%s')"
 msgstr "Préparation de l'arbre de travail (extraction de '%s')"
 
-#: builtin/worktree.c:509
 #, c-format
 msgid "Preparing worktree (detached HEAD %s)"
 msgstr "Préparation de l'arbre de travail (HEAD détachée %s)"
 
-#: builtin/worktree.c:554
 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:557
 msgid "create a new branch"
 msgstr "créer une nouvelle branche"
 
-#: builtin/worktree.c:559
 msgid "create or reset a branch"
 msgstr "créer ou réinitialiser une branche"
 
-#: builtin/worktree.c:561
 msgid "populate the new working tree"
 msgstr "remplissage de la nouvelle copie de travail"
 
-#: builtin/worktree.c:562
 msgid "keep the new working tree locked"
 msgstr "conserver le verrou sur le nouvel arbre de travail"
 
-#: builtin/worktree.c:564 builtin/worktree.c:809
 msgid "reason for locking"
 msgstr "raison du verrouillage"
 
-#: builtin/worktree.c:567
 msgid "set up tracking mode (see git-branch(1))"
 msgstr "régler le mode de suivi (voir git-branch(1))"
 
-#: builtin/worktree.c:570
 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:584
+#, c-format
+msgid "options '%s', '%s', and '%s' cannot be used together"
+msgstr "les options '%s', '%s' et '%s' ne peuvent pas être utilisées ensemble"
+
 msgid "added with --lock"
 msgstr "ajouté avec --lock"
 
-#: builtin/worktree.c:646
 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:766
 msgid "show extended annotations and reasons, if available"
 msgstr "afficher les annotations étendues et les raisons, si disponible"
 
-#: builtin/worktree.c:768
 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:770
 msgid "terminate records with a NUL character"
 msgstr "terminer les enregistrements par un caractère NUL"
 
-#: builtin/worktree.c:821 builtin/worktree.c:854 builtin/worktree.c:928
-#: builtin/worktree.c:1052
 #, c-format
 msgid "'%s' is not a working tree"
 msgstr "'%s' n'est pas une copie de travail"
 
-#: builtin/worktree.c:823 builtin/worktree.c:856
 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:828
 #, c-format
 msgid "'%s' is already locked, reason: %s"
 msgstr "'%s' est déjà verrouillé, car '%s'"
 
-#: builtin/worktree.c:830
 #, c-format
 msgid "'%s' is already locked"
 msgstr "'%s' est déjà verrouillé"
 
-#: builtin/worktree.c:858
 #, c-format
 msgid "'%s' is not locked"
 msgstr "'%s' n'est pas verrouillé"
 
-#: builtin/worktree.c:899
 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:907
 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:930 builtin/worktree.c:1054
 #, c-format
 msgid "'%s' is a main working tree"
 msgstr "'%s' est un arbre de travail principal"
 
-#: builtin/worktree.c:935
 #, 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:948
 #, c-format
 msgid ""
 "cannot move a locked working tree, lock reason: %s\n"
@@ -25154,7 +13396,6 @@ msgstr ""
 "verrouillage : %s\n"
 "utilisez 'move -f -f' pour outrepasser ou déverrouiller avant"
 
-#: builtin/worktree.c:950
 msgid ""
 "cannot move a locked working tree;\n"
 "use 'move -f -f' to override or unlock first"
@@ -25162,39 +13403,32 @@ msgstr ""
 "impossible de déplacer un arbre de travail verrouillé;\n"
 "utilisez 'move -f -f' pour outrepasser ou déverrouiller avant"
 
-#: builtin/worktree.c:953
 #, 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:958
 #, c-format
 msgid "failed to move '%s' to '%s'"
 msgstr "échec au déplacement de '%s' vers '%s'"
 
-#: builtin/worktree.c:1004
 #, c-format
 msgid "failed to run 'git status' on '%s'"
 msgstr "échec du lancement de 'git status' sur '%s'"
 
-#: builtin/worktree.c:1008
 #, 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:1013
 #, 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:1036
 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:1059
 #, c-format
 msgid ""
 "cannot remove a locked working tree, lock reason: %s\n"
@@ -25204,7 +13438,6 @@ msgstr ""
 "verrouillage : %s\n"
 "utilisez 'move -f -f' pour outrepasser ou déverrouiller avant"
 
-#: builtin/worktree.c:1061
 msgid ""
 "cannot remove a locked working tree;\n"
 "use 'remove -f -f' to override or unlock first"
@@ -25212,1418 +13445,8167 @@ msgstr ""
 "impossible de supprimer un arbre de travail verrouillé;\n"
 "utilisez 'move -f -f' pour outrepasser ou déverrouiller avant"
 
-#: builtin/worktree.c:1064
 #, 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:1088
 #, c-format
 msgid "repair: %s: %s"
 msgstr "réparation : %s : '%s'"
 
-#: builtin/worktree.c:1091
 #, c-format
 msgid "error: %s: %s"
 msgstr "erreur : %s : %s"
 
-#: builtin/write-tree.c:15
 msgid "git write-tree [--missing-ok] [--prefix=<prefix>/]"
 msgstr "git write-tree [--missing-ok] [--prefix=<préfixe>/]"
 
-#: builtin/write-tree.c:28
 msgid "<prefix>/"
 msgstr "<préfixe>/"
 
-#: builtin/write-tree.c:29
 msgid "write tree object for a subdirectory <prefix>"
 msgstr "écrire l'objet arbre pour un sous-répertoire <préfixe>"
 
-#: builtin/write-tree.c:31
 msgid "only useful for debugging"
 msgstr "seulement utile pour le débogage"
 
-#: git.c:28
-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"
-"           [--git-dir=<path>] [--work-tree=<path>] [--namespace=<name>]\n"
-"           [--super-prefix=<path>] [--config-env=<name>=<envvar>]\n"
-"           <command> [<args>]"
-msgstr ""
-"git [--version] [--help] [-C <chemin>] [-c <nom>=<valeur>]\n"
-"           [--exec-path[=<chemin>]] [--html-path] [--man-path] [--info-"
-"path]\n"
-"           [-p | --paginate | -P | --no-pager] [--no-replace-objects] [--"
-"bare]\n"
-"           [--git-dir=<chemin>] [--work-tree=<chemin>] [--namespace=<nom>]\n"
-"           [--super-prefix=<chemin>] [--config-env=<nom>=<variable-d-"
-"environnement>]\n"
-"           <commande> [<args>]"
-
-#: git.c:36
-msgid ""
-"'git help -a' and 'git help -g' list available subcommands and some\n"
-"concept guides. See 'git help <command>' or 'git help <concept>'\n"
-"to read about a specific subcommand or concept.\n"
-"See 'git help git' for an overview of the system."
-msgstr ""
-"'git help -a' et 'git help -g' listent les sous-commandes disponibles et\n"
-"quelques concepts. Voir 'git help <commande>' ou 'git help <concept>'\n"
-"pour en lire plus à propos d'une commande spécifique ou d'un concept.\n"
-"Voir 'git help git' pour un survol du système."
-
-#: git.c:188 git.c:216 git.c:300
-#, c-format
-msgid "no directory given for '%s' option\n"
-msgstr "aucun répertoire fourni pour l'option '%s'\n"
-
-#: git.c:202
-#, c-format
-msgid "no namespace given for --namespace\n"
-msgstr "aucun espace de nom fournit pour --namespace\n"
-
-#: git.c:230
-#, c-format
-msgid "no prefix given for --super-prefix\n"
-msgstr "aucun préfixe fourni pour --super-prefix\n"
-
-#: git.c:252
-#, c-format
-msgid "-c expects a configuration string\n"
-msgstr "-c requiert une chaîne de configuration\n"
-
-#: git.c:260
-#, c-format
-msgid "no config key given for --config-env\n"
-msgstr "aucune clé de configuration fournie pour --config-env\n"
-
-#: git.c:326
-#, c-format
-msgid "unknown option: %s\n"
-msgstr "option inconnue : %s\n"
-
-#: git.c:375
-#, c-format
-msgid "while expanding alias '%s': '%s'"
-msgstr "lors de l'expansion de l'alias '%s' : '%s'"
-
-#: git.c:384
-#, c-format
-msgid ""
-"alias '%s' changes environment variables.\n"
-"You can use '!git' in the alias to do this"
-msgstr ""
-"l'alias '%s' modifie les variables d'environnement.\n"
-"Vous pouvez utiliser '!git' dans l'alias pour le faire"
-
-#: git.c:391
-#, c-format
-msgid "empty alias for %s"
-msgstr "alias vide pour %s"
-
-#: git.c:394
-#, c-format
-msgid "recursive alias: %s"
-msgstr "alias recursif : %s"
-
-#: git.c:480
-msgid "write failure on standard output"
-msgstr "échec d'écriture sur la sortie standard"
-
-#: git.c:482
-msgid "unknown write failure on standard output"
-msgstr "échec inconnu d'écriture sur la sortie standard"
-
-#: git.c:484
-msgid "close failed on standard output"
-msgstr "échec de fermeture de la sortie standard"
-
-#: git.c:838
-#, 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:888
-#, c-format
-msgid "cannot handle %s as a builtin"
-msgstr "impossible d'utiliser %s comme une fonction intégrée"
-
-#: git.c:901
-#, c-format
-msgid ""
-"usage: %s\n"
-"\n"
-msgstr ""
-"usage : %s\n"
-"\n"
-
-#: git.c:921
-#, 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:933
-#, c-format
-msgid "failed to run command '%s': %s\n"
-msgstr "échec au lancement de la commande '%s' : %s\n"
-
-#: http-fetch.c:128
-#, c-format
-msgid "argument to --packfile must be a valid hash (got '%s')"
-msgstr "l'argument de --packfile doit être une empreinte valide ('%s' reçu)"
-
-#: http-fetch.c:138
-msgid "not a git repository"
-msgstr "pas un dépôt git"
-
-#: t/helper/test-fast-rebase.c:141
-msgid "unhandled options"
-msgstr "options non gérées"
-
-#: t/helper/test-fast-rebase.c:146
-msgid "error preparing revisions"
-msgstr "erreur lors de la préparation des révisions"
-
-#: t/helper/test-reach.c:154
-#, c-format
-msgid "commit %s is not marked reachable"
-msgstr "le commit %s n'est pas marqué joignable"
-
-#: t/helper/test-reach.c:164
-msgid "too many commits marked reachable"
-msgstr "trop de commits marqués joignables"
-
-#: t/helper/test-serve-v2.c:7
-msgid "test-tool serve-v2 [<options>]"
-msgstr "test-tool serve-v2 [<options>]"
-
-#: t/helper/test-serve-v2.c:19
-msgid "exit immediately after advertising capabilities"
-msgstr "sortir immédiatement après l'annonce des capacités"
-
-#: 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: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: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: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:585
-msgid "test-helper simple-ipc send         [<name>] [<token>]"
-msgstr "test-helper simple-ipc send         [<nom>] [<jeton>]"
-
-#: 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:587
-msgid ""
-"test-helper simple-ipc multiple     [<name>] [<threads>] [<bytecount>] "
-"[<batchsize>]"
-msgstr ""
-"test-helper simple-ipc multiple     [<nom>] [<fils-d'exécution>] [<nombre-"
-"d'octets>] [<taille-de-lot>]"
-
-#: 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:597
-msgid "named-pipe name"
-msgstr "nom du pipe nommé"
-
-#: 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: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:602
-msgid "number of bytes"
-msgstr "nombre d'octets"
-
-#: 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:605
-msgid "byte"
-msgstr "octet"
-
-#: t/helper/test-simple-ipc.c:605
-msgid "ballast character"
-msgstr "caractère ballast"
-
-#: t/helper/test-simple-ipc.c:606
-msgid "token"
-msgstr "jeton"
-
-#: t/helper/test-simple-ipc.c:606
-msgid "command token to send to the server"
-msgstr "jeton de commande à envoyer au serveur"
-
-#: 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: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: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: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:1016
-#, c-format
-msgid "Unsupported SSL backend '%s'. Supported SSL backends:"
-msgstr "Dorsale SSL '%s' non supportée. Dorsales SSL supportées :"
-
-#: 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: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:1876
-#, c-format
-msgid ""
-"unable to update url base from redirection:\n"
-"  asked for: %s\n"
-"   redirect: %s"
-msgstr ""
-"impossible de mettre à jour la base de l'url depuis la redirection :\n"
-"      demandé : %s\n"
-"  redirection : %s"
-
-#: remote-curl.c:184
-#, c-format
-msgid "invalid quoting in push-option value: '%s'"
-msgstr "citation invalide dans la valeur push-option : '%s'"
-
-#: remote-curl.c:308
 #, 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:409
-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:440
-#, c-format
-msgid "invalid server response; got '%s'"
-msgstr "réponse du serveur invalide ; '%s' reçu"
-
-#: remote-curl.c:500
-#, c-format
-msgid "repository '%s' not found"
-msgstr "dépôt '%s' non trouvé"
-
-#: remote-curl.c:504
-#, c-format
-msgid "Authentication failed for '%s'"
-msgstr "Échec d'authentification pour '%s'"
-
-#: remote-curl.c:508
-#, 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:512
-#, c-format
-msgid "unable to access '%s': %s"
-msgstr "impossible d'accéder à '%s' : %s"
-
-#: remote-curl.c:518
-#, c-format
-msgid "redirecting to %s"
-msgstr "redirection vers %s"
-
-#: remote-curl.c:649
-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:661
-msgid "remote server sent unexpected response end packet"
-msgstr "le serveur distant a envoyé un paquet de fin de réponse inattendu"
-
-#: remote-curl.c:730
-msgid "unable to rewind rpc post data - try increasing http.postBuffer"
-msgstr ""
-"impossible de rembobiner le données post rpc - essayer d'augmenter http."
-"postBuffer"
+msgid "unrecognized bundle hash algorithm: %s"
+msgstr "algorithme d'empreinte du colis inconnu : %s"
 
-#: remote-curl.c:759
 #, c-format
-msgid "remote-curl: bad line length character: %.4s"
-msgstr "remote-curl : mauvais caractère de longueur de ligne : %.4s"
-
-#: remote-curl.c:761
-msgid "remote-curl: unexpected response end packet"
-msgstr "remote-curl : paquet de fin de réponse inattendu"
+msgid "unknown capability '%s'"
+msgstr "capacité inconnue '%s'"
 
-#: remote-curl.c:837
 #, c-format
-msgid "RPC failed; %s"
-msgstr "échec RPC ; %s"
-
-#: remote-curl.c:877
-msgid "cannot handle pushes this big"
-msgstr "impossible de gérer des poussées aussi grosses"
+msgid "'%s' does not look like a v2 or v3 bundle file"
+msgstr "'%s' ne semble pas être un fichier colis v2 our v3"
 
-#: remote-curl.c:990
 #, c-format
-msgid "cannot deflate request; zlib deflate error %d"
-msgstr "impossible de compresser la requête ; erreur de compression zlib %d"
+msgid "unrecognized header: %s%s (%d)"
+msgstr "en-tête non reconnu : %s%s (%d)"
 
-#: remote-curl.c:994
-#, c-format
-msgid "cannot deflate request; zlib end error %d"
-msgstr "impossible de compresser la requête ; erreur de fin zlib %d"
+msgid "Repository lacks these prerequisite commits:"
+msgstr "Le dépôt ne dispose pas des commits prérequis suivants :"
 
-#: remote-curl.c:1044
-#, c-format
-msgid "%d bytes of length header were received"
-msgstr "%d octets de longueur d'entête ont été reçus"
+msgid "need a repository to verify a bundle"
+msgstr "la vérification d'un colis requiert un dépôt"
 
-#: remote-curl.c:1046
 #, c-format
-msgid "%d bytes of body are still expected"
-msgstr "%d octets de corps sont encore attendus"
-
-#: remote-curl.c:1135
-msgid "dumb http transport does not support shallow capabilities"
-msgstr "le protocole http idiot ne supporte la capacité superficielle"
-
-#: remote-curl.c:1150
-msgid "fetch failed."
-msgstr "échec du récupération."
-
-#: remote-curl.c:1198
-msgid "cannot fetch by sha1 over smart http"
-msgstr "impossible de récupérer par sha1 sur http intelligent"
+msgid "The bundle contains this ref:"
+msgid_plural "The bundle contains these %<PRIuMAX> refs:"
+msgstr[0] "Le colis contient cette référence :"
+msgstr[1] "Le colis contient ces %<PRIuMAX> références :"
 
-#: remote-curl.c:1242 remote-curl.c:1248
-#, c-format
-msgid "protocol error: expected sha/ref, got '%s'"
-msgstr "erreur de protocole : sha/ref attendu, '%s' trouvé"
+msgid "The bundle records a complete history."
+msgstr "Le colis enregistre l'historique complet."
 
-#: remote-curl.c:1260 remote-curl.c:1378
 #, c-format
-msgid "http transport does not support %s"
-msgstr "le transport http ne supporte pas %s"
-
-#: remote-curl.c:1296
-msgid "git-http-push failed"
-msgstr "échec de git-http-push"
-
-#: remote-curl.c:1485
-msgid "remote-curl: usage: git remote-curl <remote> [<url>]"
-msgstr "remote-curl: usage: git remote-curl <distant> [<url>]"
-
-#: remote-curl.c:1517
-msgid "remote-curl: error reading command stream from git"
-msgstr "remote-curl : erreur de lecture du flux de commande depuis git"
-
-#: remote-curl.c:1524
-msgid "remote-curl: fetch attempted without a local repo"
-msgstr "remote-curl : récupération tentée sans dépôt local"
+msgid "The bundle requires this ref:"
+msgid_plural "The bundle requires these %<PRIuMAX> refs:"
+msgstr[0] "Le colis exige cette référence :"
+msgstr[1] "Le colis exige ces %<PRIuMAX> références :"
 
-#: remote-curl.c:1565
-#, c-format
-msgid "remote-curl: unknown command '%s' from git"
-msgstr "remote-curl : commande inconnue '%s' depuis git"
+msgid "unable to dup bundle descriptor"
+msgstr "impossible de dupliquer le descripteur de liasse"
 
-#: contrib/scalar/scalar.c:49
-msgid "need a working directory"
-msgstr "répertoire de travail nécessaire"
+msgid "Could not spawn pack-objects"
+msgstr "Impossible de créer des objets groupés"
 
-#: contrib/scalar/scalar.c:86
-msgid "could not find enlistment root"
-msgstr "impossible de trouver la racine d'enrôlement"
+msgid "pack-objects died"
+msgstr "les objets groupés ont disparu"
 
-#: contrib/scalar/scalar.c:89 contrib/scalar/scalar.c:350
-#: contrib/scalar/scalar.c:435 contrib/scalar/scalar.c:578
 #, c-format
-msgid "could not switch to '%s'"
-msgstr "impossible de basculer vers '%s'"
+msgid "ref '%s' is excluded by the rev-list options"
+msgstr "la référence '%s' est exclue par les options de rev-list"
 
-#: contrib/scalar/scalar.c:179
 #, c-format
-msgid "could not configure %s=%s"
-msgstr "impossible de configurer %s=%s"
-
-#: contrib/scalar/scalar.c:197
-msgid "could not configure log.excludeDecoration"
-msgstr "impossible de configurer log.excludeDecoration"
-
-#: contrib/scalar/scalar.c:218
-msgid "Scalar enlistments require a worktree"
-msgstr "Les enrôlements scalaires requièrent un arbre de travail"
+msgid "unsupported bundle version %d"
+msgstr "version de colis non supportée %d"
 
-#: contrib/scalar/scalar.c:310
 #, c-format
-msgid "remote HEAD is not a branch: '%.*s'"
-msgstr "la HEAD distante n'est pas une branche : '%.*s'"
-
-#: contrib/scalar/scalar.c:316
-msgid "failed to get default branch name from remote; using local default"
-msgstr ""
-"échec de récupération de la branche par défaut depuis le distant ; "
-"utilisation de la valeur par défaut locale"
-
-#: contrib/scalar/scalar.c:329
-msgid "failed to get default branch name"
-msgstr "échec de l'obtention du nom de branche par défaut"
-
-#: contrib/scalar/scalar.c:340
-msgid "failed to unregister repository"
-msgstr "échec du désenregistrement du dépôt"
-
-#: contrib/scalar/scalar.c:355
-msgid "failed to delete enlistment directory"
-msgstr "échec de la suppression du répertoire d'enrôlement"
-
-#: contrib/scalar/scalar.c:375
-msgid "branch to checkout after clone"
-msgstr "branche à extraire après le clonage"
-
-#: contrib/scalar/scalar.c:377
-msgid "when cloning, create full working directory"
-msgstr "lors d'un clonage, créer un répertoire de travail complet"
-
-#: contrib/scalar/scalar.c:379
-msgid "only download metadata for the branch that will be checked out"
-msgstr "ne télécharger les méta-données que pour la branche qui sera extraite"
-
-#: contrib/scalar/scalar.c:384
-msgid "scalar clone [<options>] [--] <repo> [<dir>]"
-msgstr "scalar clone [<options>] [--] <dépôt> [<répertoire>]"
+msgid "cannot write bundle version %d with algorithm %s"
+msgstr "impossible d'écrire une version de colis %d avec l'algorithme %s"
 
-#: contrib/scalar/scalar.c:409
-#, c-format
-msgid "cannot deduce worktree name from '%s'"
-msgstr "impossible de déduire le nom de l'arbre de travail depuis '%s'"
+msgid "Refusing to create empty bundle."
+msgstr "Refus de créer un colis vide."
 
-#: contrib/scalar/scalar.c:418
 #, c-format
-msgid "directory '%s' exists already"
-msgstr "le répertoire '%s' existe déjà"
+msgid "cannot create '%s'"
+msgstr "impossible de créer '%s'"
 
-#: contrib/scalar/scalar.c:445
-#, c-format
-msgid "failed to get default branch for '%s'"
-msgstr "échec d'obtention de la branche par défaut pour '%s'"
+msgid "index-pack died"
+msgstr "l'index de groupe a disparu"
 
-#: contrib/scalar/scalar.c:456
-#, c-format
-msgid "could not configure remote in '%s'"
-msgstr "impossible de paramétrer le distant dans '%s'"
+msgid "terminating chunk id appears earlier than expected"
+msgstr "l'identifiant de terminaison de tronçon apparaît plus tôt qu'attendu"
 
-#: contrib/scalar/scalar.c:465
 #, c-format
-msgid "could not configure '%s'"
-msgstr "impossible de configurer '%s'"
-
-#: contrib/scalar/scalar.c:468
-msgid "partial clone failed; attempting full clone"
-msgstr "échec du clonage partiel ; tentative de clonage complet"
-
-#: contrib/scalar/scalar.c:472
-msgid "could not configure for full clone"
-msgstr "impossible de configurer pour le clonage complet"
-
-#: contrib/scalar/scalar.c:504
-msgid "`scalar list` does not take arguments"
-msgstr "`scalar list` n'accepte pas d'argument"
-
-#: contrib/scalar/scalar.c:517
-msgid "scalar register [<enlistment>]"
-msgstr "scalar register [<enrôlement>]"
-
-#: contrib/scalar/scalar.c:544
-msgid "reconfigure all registered enlistments"
-msgstr "reconfigurer tous les enrôlements enregistrés"
-
-#: contrib/scalar/scalar.c:548
-msgid "scalar reconfigure [--all | <enlistment>]"
-msgstr "scala reconfigure [--all|<enrôlement>]"
-
-#: contrib/scalar/scalar.c:566
-msgid "--all or <enlistment>, but not both"
-msgstr "--all ou <enrôlement>, mais pas les deux"
+msgid "improper chunk offset(s) %<PRIx64> and %<PRIx64>"
+msgstr "décalage(s) de section incorrect(s) %<PRIx64> et %<PRIx64>"
 
-#: contrib/scalar/scalar.c:581
 #, c-format
-msgid "git repository gone in '%s'"
-msgstr "dépôt git parti dans '%s'"
-
-#: contrib/scalar/scalar.c:621
-msgid ""
-"scalar run <task> [<enlistment>]\n"
-"Tasks:\n"
-msgstr ""
-"scalar run <tâche> [<enrôlement>]\n"
-"Tâches :\n"
+msgid "duplicate chunk ID %<PRIx32> found"
+msgstr "ID de section dupliqué %<PRIx32>"
 
-#: contrib/scalar/scalar.c:639
 #, c-format
-msgid "no such task: '%s'"
-msgstr "pas de tâche : '%s'"
-
-#: contrib/scalar/scalar.c:689
-msgid "scalar unregister [<enlistment>]"
-msgstr "scalar unregister [<enrôlement>]"
-
-#: contrib/scalar/scalar.c:736
-msgid "scalar delete <enlistment>"
-msgstr "scalar delete <enrôlement>"
-
-#: contrib/scalar/scalar.c:751
-msgid "refusing to delete current working directory"
-msgstr "refus de la suppression du répertoire de travail actuel"
-
-#: contrib/scalar/scalar.c:766
-msgid "include Git version"
-msgstr "inclure la version Git"
-
-#: contrib/scalar/scalar.c:768
-msgid "include Git's build options"
-msgstr "inclure les options de construction de Git"
-
-#: contrib/scalar/scalar.c:772
-msgid "scalar verbose [-v | --verbose] [--build-options]"
-msgstr "scalar verbose [-v | --verbose] [--build-options]"
+msgid "final chunk has non-zero id %<PRIx32>"
+msgstr "la section finale a un id non nul %<PRIx32>"
 
-#: contrib/scalar/scalar.c:813
-msgid "-C requires a <directory>"
-msgstr "-C requiert un <répertoire>"
+msgid "invalid hash version"
+msgstr "version d'empreinte invalide"
 
-#: contrib/scalar/scalar.c:815
 #, c-format
-msgid "could not change to '%s'"
-msgstr "échec de modification en '%s'"
-
-#: contrib/scalar/scalar.c:821
-msgid "-c requires a <key>=<value> argument"
-msgstr "-c exige un argument <clé>=<valeur>"
-
-#: contrib/scalar/scalar.c:839
-msgid ""
-"scalar [-C <directory>] [-c <key>=<value>] <command> [<options>]\n"
-"\n"
-"Commands:\n"
-msgstr ""
-"scalar [-C <répertoire>] [-c <clé>=<valeur>] <commande> [<options>]\n"
-"\n"
-"Commandes :\n"
-
-#: compat/compiler.h:26
-msgid "no compiler information available\n"
-msgstr "aucune information de compilateur disponible\n"
-
-#: compat/compiler.h:38
-msgid "no libc information available\n"
-msgstr "aucune information de libc disponible\n"
-
-#: list-objects-filter-options.h:126
-msgid "args"
-msgstr "args"
-
-#: list-objects-filter-options.h:127
-msgid "object filtering"
-msgstr "filtrage d'objet"
-
-#: parse-options.h:188
-msgid "expiry-date"
-msgstr "date-d'expiration"
-
-#: parse-options.h:202
-msgid "no-op (backward compatibility)"
-msgstr "sans action (rétrocompatibilité)"
-
-#: parse-options.h:341
-msgid "be more verbose"
-msgstr "être plus verbeux"
-
-#: parse-options.h:343
-msgid "be more quiet"
-msgstr "être plus silencieux"
-
-#: parse-options.h:349
-msgid "use <n> digits to display object names"
-msgstr "utiliser <n> chiffres pour afficher les noms des objets"
-
-#: parse-options.h:368
-msgid "how to strip spaces and #comments from message"
-msgstr "comment éliminer les espaces et les commentaires # du message"
-
-#: parse-options.h:369
-msgid "read pathspec from file"
-msgstr "lire les spécificateurs de fichier depuis fichier"
-
-#: parse-options.h:370
-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:98
-msgid "key"
-msgstr "clé"
-
-#: ref-filter.h:98
-msgid "field name to sort on"
-msgstr "nom du champ servant à trier"
-
-#: rerere.h:44
-msgid "update the index with reused conflict resolution if possible"
-msgstr ""
-"met à jour l'index avec les résolutions de conflit réutilisées si possible"
+msgid "invalid color value: %.*s"
+msgstr "valeur invalide de couleur : %.*s"
 
-#: command-list.h:50
 msgid "Add file contents to the index"
 msgstr "Ajouter le contenu de fichiers dans l'index"
 
-#: command-list.h:51
 msgid "Apply a series of patches from a mailbox"
 msgstr "Appliquer une série de patchs depuis une boîte mail"
 
-#: command-list.h:52
 msgid "Annotate file lines with commit information"
 msgstr "Annoter les lignes du fichier avec l'information de commit"
 
-#: command-list.h:53
 msgid "Apply a patch to files and/or to the index"
 msgstr "Appliquer une patch à des fichiers ou à l'index"
 
-#: command-list.h:54
 msgid "Import a GNU Arch repository into Git"
 msgstr "Importer dans Git un dépôt GNU Arch"
 
-#: command-list.h:55
 msgid "Create an archive of files from a named tree"
 msgstr "Créer une archive des fichiers depuis un arbre nommé"
 
-#: command-list.h:56
 msgid "Use binary search to find the commit that introduced a bug"
 msgstr "Trouver par recherche binaire la modification qui a introduit un bogue"
 
-#: command-list.h:57
 msgid "Show what revision and author last modified each line of a file"
 msgstr ""
 "Montrer la révision et l'auteur qui ont modifié en dernier chaque ligne d'un "
 "fichier"
 
-#: command-list.h:58
 msgid "List, create, or delete branches"
 msgstr "Lister, créer ou supprimer des branches"
 
-#: command-list.h:59
 msgid "Collect information for user to file a bug report"
 msgstr ""
 "Collecter l'information pour l'utilisateur pour remplir un rapport de bogue"
 
-#: command-list.h:60
 msgid "Move objects and refs by archive"
 msgstr "Déplacer les objets et références par archive"
 
-#: command-list.h:61
 msgid "Provide content or type and size information for repository objects"
 msgstr ""
 "Fournir le contenu ou l'information de type et taille pour les objets du "
 "dépôt"
 
-#: command-list.h:62
 msgid "Display gitattributes information"
 msgstr "Afficher les informations gitattributes"
 
-#: command-list.h:63
 msgid "Debug gitignore / exclude files"
 msgstr "Déboguer gitignore / les fichiers d'exclusion"
 
-#: command-list.h:64
 msgid "Show canonical names and email addresses of contacts"
 msgstr "Afficher les noms canoniques et les adresses courriel des contacts"
 
-#: command-list.h:65
 msgid "Ensures that a reference name is well formed"
 msgstr "S'assurer qu'un nom de référence est bien formé"
 
-#: command-list.h:66
 msgid "Switch branches or restore working tree files"
 msgstr "Basculer de branche ou restaurer la copie de travail"
 
-#: command-list.h:67
 msgid "Copy files from the index to the working tree"
 msgstr "Copier les fichiers depuis l'index dans la copie de travail"
 
-#: command-list.h:68
 msgid "Find commits yet to be applied to upstream"
 msgstr "Trouver les commits à appliquer en amont"
 
-#: command-list.h:69
 msgid "Apply the changes introduced by some existing commits"
 msgstr "Appliquer les modifications introduites par des commits existants"
 
-#: command-list.h:70
 msgid "Graphical alternative to git-commit"
 msgstr "Alternative graphique à git-commit"
 
-#: command-list.h:71
 msgid "Remove untracked files from the working tree"
 msgstr "Supprimer les fichiers non-suivis de l'arbre de travail"
 
-#: command-list.h:72
 msgid "Clone a repository into a new directory"
 msgstr "Cloner un dépôt dans un nouveau répertoire"
 
-#: command-list.h:73
 msgid "Display data in columns"
 msgstr "Afficher les données en colonnes"
 
-#: command-list.h:74
 msgid "Record changes to the repository"
 msgstr "Enregistrer les modifications dans le dépôt"
 
-#: command-list.h:75
 msgid "Write and verify Git commit-graph files"
 msgstr "Écrire et vérifier les fichiers de graphe de commit Git"
 
-#: command-list.h:76
 msgid "Create a new commit object"
 msgstr "Créer un nouvel objet commit"
 
-#: command-list.h:77
 msgid "Get and set repository or global options"
 msgstr "Voir et régler les options globales ou de dépôt"
 
-#: command-list.h:78
 msgid "Count unpacked number of objects and their disk consumption"
 msgstr ""
 "Compter le nombre d'objets non-empaquetés et leur consommation d'espace "
 "disque"
 
-#: command-list.h:79
 msgid "Retrieve and store user credentials"
 msgstr "Récupérer et sauvegarder les certificats d'utilisateur"
 
-#: command-list.h:80
 msgid "Helper to temporarily store passwords in memory"
 msgstr "Assistant pour maintenir temporairement en mémoire les mots de passe"
 
-#: command-list.h:81
 msgid "Helper to store credentials on disk"
 msgstr "Assistant pour sauvegarder les certificats sur disque"
 
-#: command-list.h:82
 msgid "Export a single commit to a CVS checkout"
 msgstr "Exporter un commit unique en extraction CVS"
 
-#: command-list.h:83
 msgid "Salvage your data out of another SCM people love to hate"
 msgstr "Sauver vos données depuis un autre SCM qu'on aime à haïr"
 
-#: command-list.h:84
 msgid "A CVS server emulator for Git"
 msgstr "Un émulateur de serveur CVS pour Git"
 
-#: command-list.h:85
 msgid "A really simple server for Git repositories"
 msgstr "Un serveur vraiment simple pour les dépôts Git"
 
-#: command-list.h:86
 msgid "Give an object a human readable name based on an available ref"
 msgstr ""
 "Baptiser un objet avec un nom lisible à partir d'une référence disponible"
 
-#: command-list.h:87
 msgid "Show changes between commits, commit and working tree, etc"
 msgstr ""
 "Afficher les changements entre les validations, entre validation et copie de "
 "travail, etc"
 
-#: command-list.h:88
 msgid "Compares files in the working tree and the index"
 msgstr "Compare des fichiers de l'arbre de travail et de l'index"
 
-#: command-list.h:89
 msgid "Compare a tree to the working tree or index"
 msgstr "Comparer un arbre avec l'arbre de travail ou l'index"
 
-#: command-list.h:90
 msgid "Compares the content and mode of blobs found via two tree objects"
 msgstr "Compare le contenu et le mode des blobs trouvés via deux objets arbre"
 
-#: command-list.h:91
 msgid "Show changes using common diff tools"
 msgstr "Afficher les modifications en utilisant les outils habituel de diff"
 
-#: command-list.h:92
 msgid "Git data exporter"
 msgstr "Exporteur de données Git"
 
-#: command-list.h:93
 msgid "Backend for fast Git data importers"
 msgstr "Moteur pour les importateurs rapides de données Git"
 
-#: command-list.h:94
 msgid "Download objects and refs from another repository"
 msgstr "Télécharger les objets et références depuis un autre dépôt"
 
-#: command-list.h:95
 msgid "Receive missing objects from another repository"
 msgstr "Télécharger les objets manquants depuis un autre dépôt"
 
-#: command-list.h:96
 msgid "Rewrite branches"
 msgstr "Réécrire les branches"
 
-#: command-list.h:97
 msgid "Produce a merge commit message"
 msgstr "Produire un message de validation de fusion"
 
-#: command-list.h:98
 msgid "Output information on each ref"
 msgstr "Afficher de l'information sur chaque référence"
 
-#: command-list.h:99
 msgid "Run a Git command on a list of repositories"
 msgstr "Lance une commande Git sur une liste de dépôts"
 
-#: command-list.h:100
 msgid "Prepare patches for e-mail submission"
 msgstr "Préparer les patchs pour soumission par courriel"
 
-#: command-list.h:101
 msgid "Verifies the connectivity and validity of the objects in the database"
 msgstr ""
 "Vérifier la connectivité et la validité des objets dans la base de données"
 
-#: command-list.h:102
 msgid "Cleanup unnecessary files and optimize the local repository"
 msgstr "Effacer les fichiers non-nécessaires et optimiser le dépôt local"
 
-#: command-list.h:103
 msgid "Extract commit ID from an archive created using git-archive"
 msgstr "Extraire l'ID du commit depuis une archive créée par git-archive"
 
-#: command-list.h:104
 msgid "Print lines matching a pattern"
 msgstr "Afficher les lignes correspondant à un motif"
 
-#: command-list.h:105
 msgid "A portable graphical interface to Git"
 msgstr "Une interface graphique portable pour Git"
 
-#: command-list.h:106
 msgid "Compute object ID and optionally creates a blob from a file"
 msgstr ""
 "Calculer l'ID d'objet et créer optionnellement un blob depuis un fichier"
 
-#: command-list.h:107
 msgid "Display help information about Git"
 msgstr "Afficher l'information d'aide à propos de Git"
 
-#: command-list.h:108
 msgid "Run git hooks"
 msgstr "Lance les crochets git"
 
-#: command-list.h:109
 msgid "Server side implementation of Git over HTTP"
 msgstr "Implantation côté serveur de Git sur HTTP"
 
-#: command-list.h:110
 msgid "Download from a remote Git repository via HTTP"
 msgstr "Télécharger depuis un dépôt Git distant via HTTP"
 
-#: command-list.h:111
 msgid "Push objects over HTTP/DAV to another repository"
 msgstr "Pousser les objets sur un autre dépôt via HTTP/DAV"
 
-#: command-list.h:112
 msgid "Send a collection of patches from stdin to an IMAP folder"
 msgstr "Envoyer un ensemble de rustines depuis stdin vers un répertoire IMAP"
 
-#: command-list.h:113
 msgid "Build pack index file for an existing packed archive"
 msgstr ""
 "Construire un fichier d'index pack depuis une archive compactée existante"
 
-#: command-list.h:114
 msgid "Create an empty Git repository or reinitialize an existing one"
 msgstr "Créer un dépôt Git vide ou réinitialiser un existant"
 
-#: command-list.h:115
 msgid "Instantly browse your working repository in gitweb"
 msgstr "Naviguer instantanément votre dépôt de travail dans gitweb"
 
-#: command-list.h:116
 msgid "Add or parse structured information in commit messages"
 msgstr ""
 "Ajouter ou analyser l'information structurée dans les messages de validation"
 
-#: command-list.h:117
 msgid "Show commit logs"
 msgstr "Afficher l'historique des validations"
 
-#: command-list.h:118
 msgid "Show information about files in the index and the working tree"
 msgstr ""
 "Afficher l'information à propos des fichiers dans l'index ou l'arbre de "
 "travail"
 
-#: command-list.h:119
 msgid "List references in a remote repository"
 msgstr "Lister les références dans un dépôt distant"
 
-#: command-list.h:120
 msgid "List the contents of a tree object"
 msgstr "Afficher le contenu d'un objet arbre"
 
-#: command-list.h:121
 msgid "Extracts patch and authorship from a single e-mail message"
 msgstr ""
 "Extraire le patch et l'information de d'auteur depuis un simple message de "
 "courriel"
 
-#: command-list.h:122
 msgid "Simple UNIX mbox splitter program"
 msgstr "Programme simple de découpage de mbox UNIX"
 
-#: command-list.h:123
 msgid "Run tasks to optimize Git repository data"
 msgstr "Lancer les tâches pour optimiser les données du depôt Git"
 
-#: command-list.h:124
 msgid "Join two or more development histories together"
 msgstr "Fusionner deux ou plusieurs historiques de développement ensemble"
 
-#: command-list.h:125
 msgid "Find as good common ancestors as possible for a merge"
 msgstr "Trouver un ancêtre aussi bon que possible pour une fusion"
 
-#: command-list.h:126
 msgid "Run a three-way file merge"
 msgstr "Lancer une fusion à 3 points"
 
-#: command-list.h:127
 msgid "Run a merge for files needing merging"
 msgstr "Lancer une fusion à 3 points pour les fichiers à fusionner"
 
-#: command-list.h:128
 msgid "The standard helper program to use with git-merge-index"
 msgstr "Le programme assistant standard à utiliser avec git-merge-index"
 
-#: command-list.h:129
 msgid "Show three-way merge without touching index"
 msgstr "Afficher la fusion à trois points sans modifier l'index"
 
-#: command-list.h:130
 msgid "Run merge conflict resolution tools to resolve merge conflicts"
 msgstr ""
 "Lancer les outils de résolution de conflit de fusion pour résoudre les "
 "conflits de fusion"
 
-#: command-list.h:131
 msgid "Creates a tag object with extra validation"
 msgstr "Créer un objet étiquette avec validation supplémentaire"
 
-#: command-list.h:132
 msgid "Build a tree-object from ls-tree formatted text"
 msgstr "Construire un objet arbre depuis une texte formaté comme ls-tree"
 
-#: command-list.h:133
 msgid "Write and verify multi-pack-indexes"
 msgstr "Écrire et vérifier les index multi-paquet"
 
-#: command-list.h:134
 msgid "Move or rename a file, a directory, or a symlink"
 msgstr "Déplacer ou renommer un fichier, un répertoire, ou un lien symbolique"
 
-#: command-list.h:135
 msgid "Find symbolic names for given revs"
 msgstr "Trouver les noms symboliques pour des révisions données"
 
-#: command-list.h:136
 msgid "Add or inspect object notes"
 msgstr "Ajouter ou inspecter les notes d'un objet"
 
-#: command-list.h:137
 msgid "Import from and submit to Perforce repositories"
 msgstr "Importer et soumettre à des dépôt Perforce"
 
-#: command-list.h:138
 msgid "Create a packed archive of objects"
 msgstr "Créer une archive compactée d'objets"
 
-#: command-list.h:139
 msgid "Find redundant pack files"
 msgstr "Trouver les fichiers pack redondants"
 
-#: command-list.h:140
 msgid "Pack heads and tags for efficient repository access"
 msgstr "Empaqueter les têtes et les étiquettes pour un accès efficace au dépôt"
 
-#: command-list.h:141
 msgid "Compute unique ID for a patch"
 msgstr "Calculer l'ID unique d'un patch"
 
-#: command-list.h:142
 msgid "Prune all unreachable objects from the object database"
 msgstr ""
 "Éliminer les objets inatteignables depuis la base de données des objets"
 
-#: command-list.h:143
 msgid "Remove extra objects that are already in pack files"
 msgstr "Éliminer les objets qui sont déjà présents dans les fichiers pack"
 
-#: command-list.h:144
 msgid "Fetch from and integrate with another repository or a local branch"
 msgstr "Rapatrier et intégrer un autre dépôt ou une branche locale"
 
-#: command-list.h:145
 msgid "Update remote refs along with associated objects"
 msgstr "Mettre à jour les références distantes ainsi que les objets associés"
 
-#: command-list.h:146
 msgid "Applies a quilt patchset onto the current branch"
 msgstr "Appliquer un patchset quilt sur la branche courante"
 
-#: command-list.h:147
 msgid "Compare two commit ranges (e.g. two versions of a branch)"
 msgstr ""
 "Comparer deux plages de commits (par exemple deux versions d'une branche)"
 
-#: command-list.h:148
 msgid "Reads tree information into the index"
 msgstr "Lire l'information d'arbre dans l'index"
 
-#: command-list.h:149
 msgid "Reapply commits on top of another base tip"
 msgstr "Réapplication des commits sur le sommet de l'autre base"
 
-#: command-list.h:150
 msgid "Receive what is pushed into the repository"
 msgstr "Recevoir ce qui est poussé dans le dépôt"
 
-#: command-list.h:151
 msgid "Manage reflog information"
 msgstr "Gérer l'information de reflog"
 
-#: command-list.h:152
 msgid "Manage set of tracked repositories"
 msgstr "Gérer un ensemble de dépôts suivis"
 
-#: command-list.h:153
 msgid "Pack unpacked objects in a repository"
 msgstr "Empaqueter les objets non-empaquetés d'un dépôt"
 
-#: command-list.h:154
 msgid "Create, list, delete refs to replace objects"
 msgstr "Créer, lister, supprimer des référence pour remplacer des objets"
 
-#: command-list.h:155
 msgid "Generates a summary of pending changes"
 msgstr "Générer une résumé des modifications en attentes"
 
-#: command-list.h:156
 msgid "Reuse recorded resolution of conflicted merges"
 msgstr "Réutiliser une résolution enregistrée de fusions conflictuelles"
 
-#: command-list.h:157
 msgid "Reset current HEAD to the specified state"
 msgstr "Réinitialiser la HEAD courante à l'état spécifié"
 
-#: command-list.h:158
 msgid "Restore working tree files"
 msgstr "Restaurer les fichiers l'arbre de travail"
 
-#: command-list.h:159
 msgid "Lists commit objects in reverse chronological order"
 msgstr "Afficher les objets commit dans l'ordre chronologique inverse"
 
-#: command-list.h:160
 msgid "Pick out and massage parameters"
 msgstr "Analyser et préparer les paramètres"
 
-#: command-list.h:161
 msgid "Revert some existing commits"
 msgstr "Inverser des commits existants"
 
-#: command-list.h:162
 msgid "Remove files from the working tree and from the index"
 msgstr "Supprimer des fichiers de la copie de travail et de l'index"
 
-#: command-list.h:163
 msgid "Send a collection of patches as emails"
 msgstr "Envoyer un ensemble de patchs comme courriels"
 
-#: command-list.h:164
 msgid "Push objects over Git protocol to another repository"
 msgstr "Pousser les objets sur un autre dépôt via le protocole Git"
 
-#: command-list.h:165
 msgid "Git's i18n setup code for shell scripts"
 msgstr "Le code d'initialisation i18n pour les scripts shell"
 
-#: command-list.h:166
 msgid "Common Git shell script setup code"
 msgstr "Le code d'initialisation commun aux scripts shell Git"
 
-#: command-list.h:167
 msgid "Restricted login shell for Git-only SSH access"
 msgstr "Shell de login restreint pour un accès SSH vers Git seulement"
 
-#: command-list.h:168
 msgid "Summarize 'git log' output"
 msgstr "Résumer la sortie de 'git log'"
 
-#: command-list.h:169
 msgid "Show various types of objects"
 msgstr "Afficher différents types d'objets"
 
-#: command-list.h:170
 msgid "Show branches and their commits"
 msgstr "Afficher les branches et leurs commits"
 
-#: command-list.h:171
 msgid "Show packed archive index"
 msgstr "Afficher l'index de l'archive empaquetée"
 
-#: command-list.h:172
 msgid "List references in a local repository"
 msgstr "Lister les références du dépôt local"
 
-#: command-list.h:173
 msgid "Reduce your working tree to a subset of tracked files"
 msgstr "Réduit votre arbre de travail à un sous-ensemble de fichiers suivis"
 
-#: command-list.h:174
 msgid "Add file contents to the staging area"
 msgstr "Ajouter le contenu de fichiers à l'index"
 
-#: command-list.h:175
 msgid "Stash the changes in a dirty working directory away"
 msgstr "Remiser les modifications d'un répertoire de travail sale"
 
-#: command-list.h:176
 msgid "Show the working tree status"
 msgstr "Afficher l'état de la copie de travail"
 
-#: command-list.h:177
 msgid "Remove unnecessary whitespace"
 msgstr "Retirer les espaces inutiles"
 
-#: command-list.h:178
 msgid "Initialize, update or inspect submodules"
 msgstr "Initialiser, mettre à jour et inspecter les sous-modules"
 
-#: command-list.h:179
 msgid "Bidirectional operation between a Subversion repository and Git"
 msgstr "Opération Bidirectionnelle entre un dépôt Subversion et Git"
 
-#: command-list.h:180
 msgid "Switch branches"
 msgstr "Basculer de branche"
 
-#: command-list.h:181
 msgid "Read, modify and delete symbolic refs"
 msgstr "Lire, modifier et supprimer les références symboliques"
 
-#: command-list.h:182
 msgid "Create, list, delete or verify a tag object signed with GPG"
 msgstr ""
 "Créer, lister, supprimer ou vérifier un objet d'étiquette signé avec GPG"
 
-#: command-list.h:183
 msgid "Creates a temporary file with a blob's contents"
 msgstr "Créer un fichier temporaire avec le contenu d'un blob"
 
-#: command-list.h:184
 msgid "Unpack objects from a packed archive"
 msgstr "Dépaqueter les objets depuis une archive empaquetée"
 
-#: command-list.h:185
 msgid "Register file contents in the working tree to the index"
 msgstr "Enregistrer le contenu d'un fichier de l'arbre de travail dans l'index"
 
-#: command-list.h:186
 msgid "Update the object name stored in a ref safely"
 msgstr ""
 "Mettre à jour le nom d'objet stocké dans une référence en toute sécurité"
 
-#: command-list.h:187
 msgid "Update auxiliary info file to help dumb servers"
 msgstr ""
 "Mettre à jour le fichier d'informations auxiliaires pour aider les serveurs "
 "idiots"
 
-#: command-list.h:188
 msgid "Send archive back to git-archive"
 msgstr "Renvoyer une archive dans git-archive"
 
-#: command-list.h:189
 msgid "Send objects packed back to git-fetch-pack"
 msgstr "Renvoyer des objets empaquetés dans git-fetch-pack"
 
-#: command-list.h:190
 msgid "Show a Git logical variable"
 msgstr "Afficher un variable logique de Git"
 
-#: command-list.h:191
 msgid "Check the GPG signature of commits"
 msgstr "Vérifier la signature GPG de commits"
 
-#: command-list.h:192
 msgid "Validate packed Git archive files"
 msgstr "Valider des fichiers d'archive Git empaquetés"
 
-#: command-list.h:193
 msgid "Check the GPG signature of tags"
 msgstr "Vérifier la signature GPG d'étiquettes"
 
-#: command-list.h:194
 msgid "Show logs with difference each commit introduces"
 msgstr "Afficher les journaux avec la différence que chaque commit introduit"
 
-#: command-list.h:195
 msgid "Manage multiple working trees"
 msgstr "Gérer des arbres de travail multiples"
 
-#: command-list.h:196
 msgid "Create a tree object from the current index"
 msgstr "Créer un objet arbre depuis l'index courant"
 
-#: command-list.h:197
 msgid "Defining attributes per path"
 msgstr "Définition des attributs par chemin"
 
-#: command-list.h:198
 msgid "Git command-line interface and conventions"
 msgstr "Interface en ligne de commande et conventions de Git"
 
-#: command-list.h:199
 msgid "A Git core tutorial for developers"
 msgstr "Tutoriel du cœur de Git pour les développeurs"
 
-#: command-list.h:200
 msgid "Providing usernames and passwords to Git"
 msgstr "Fourniture des noms d'utilisateurs et des mots de passe à Git"
 
-#: command-list.h:201
 msgid "Git for CVS users"
 msgstr "Git pour les utilisateurs de CVS"
 
-#: command-list.h:202
 msgid "Tweaking diff output"
 msgstr "Bidouillage de la sortie diff"
 
-#: command-list.h:203
 msgid "A useful minimum set of commands for Everyday Git"
 msgstr "Un ensemble minimal utile des commandes de Git pour tous les jours"
 
-#: command-list.h:204
 msgid "Frequently asked questions about using Git"
 msgstr "Foire aux questions sur l'utilisation de Git"
 
-#: command-list.h:205
 msgid "A Git Glossary"
 msgstr "Un glossaire Git"
 
-#: command-list.h:206
 msgid "Hooks used by Git"
 msgstr "Crochets utilisés par Git"
 
-#: command-list.h:207
 msgid "Specifies intentionally untracked files to ignore"
 msgstr "Spécifie les fichiers non-suivis à ignorer intentionnellement"
 
-#: command-list.h:208
 msgid "The Git repository browser"
 msgstr "Le navigateur de dépôt Git"
 
-#: command-list.h:209
 msgid "Map author/committer names and/or E-Mail addresses"
 msgstr ""
 "Fait correspondre les noms d'auteur/validateur avec les adresses de courriel"
 
-#: command-list.h:210
 msgid "Defining submodule properties"
 msgstr "Définition des propriétés de sous-module"
 
-#: command-list.h:211
 msgid "Git namespaces"
 msgstr "Espaces de nom de Git"
 
-#: command-list.h:212
 msgid "Helper programs to interact with remote repositories"
 msgstr "Programmes assistants pour interagir avec des dépôts distants"
 
-#: command-list.h:213
 msgid "Git Repository Layout"
 msgstr "Disposition d'un dépôt Git"
 
-#: command-list.h:214
 msgid "Specifying revisions and ranges for Git"
 msgstr "Spécification des révisions et portées pour Git"
 
-#: command-list.h:215
 msgid "Mounting one repository inside another"
 msgstr "Montage d'un dépôt dans un autre dépôt"
 
-#: command-list.h:216
 msgid "A tutorial introduction to Git"
 msgstr "Une introduction pratique à Git"
 
-#: command-list.h:217
 msgid "A tutorial introduction to Git: part two"
 msgstr "Une introduction pratique à Git : deuxième partie"
 
-#: command-list.h:218
 msgid "Git web interface (web frontend to Git repositories)"
 msgstr "Interface web de Git"
 
-#: command-list.h:219
 msgid "An overview of recommended workflows with Git"
 msgstr "Un aperçu des flux de travail recommandés avec Git"
 
-#: git-merge-octopus.sh:46
+msgid "commit-graph file is too small"
+msgstr "le graphe de commit est trop petit"
+
+#, c-format
+msgid "commit-graph signature %X does not match signature %X"
+msgstr ""
+"la signature du graphe de commit %X ne correspond pas à la signature %X"
+
+#, c-format
+msgid "commit-graph version %X does not match version %X"
+msgstr "la version %X du graphe de commit ne correspond pas à la version %X"
+
+#, c-format
+msgid "commit-graph hash version %X does not match version %X"
+msgstr ""
+"l'empreinte de la version %X du graphe de commit ne correspond pas à la "
+"version %X"
+
+#, c-format
+msgid "commit-graph file is too small to hold %u chunks"
+msgstr "le graphe de commit est trop petit pour contenir %u sections"
+
+msgid "commit-graph has no base graphs chunk"
+msgstr "le graphe de commit n'a pas de section de graphes de base"
+
+msgid "commit-graph chain does not match"
+msgstr "la chaîne de graphe de commit ne correspond pas"
+
+#, c-format
+msgid "invalid commit-graph chain: line '%s' not a hash"
+msgstr ""
+"chaîne de graphe de commit invalide : la ligne '%s' n'est pas une empreinte"
+
+msgid "unable to find all commit-graph files"
+msgstr "impossible de trouver tous les fichiers du graphe de commit"
+
+msgid "invalid commit position. commit-graph is likely corrupt"
+msgstr ""
+"position de commit invalide. Le graphe de commit est vraisemblablement "
+"corrompu"
+
+#, c-format
+msgid "could not find commit %s"
+msgstr "impossible de trouver le commit %s"
+
+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"
+
+msgid "Loading known commits in commit graph"
+msgstr "Lecture des commits connus dans un graphe de commit"
+
+msgid "Expanding reachable commits in commit graph"
+msgstr "Expansion des commits joignables dans un graphe de commit"
+
+msgid "Clearing commit marks in commit graph"
+msgstr "Suppression les marques de commit dans le graphe de commits"
+
+msgid "Computing commit graph topological levels"
+msgstr "Calcul des niveaux topologiques du graphe de commits"
+
+msgid "Computing commit graph generation numbers"
+msgstr "Calcul des chiffres de génération du graphe de commits"
+
+msgid "Computing commit changed paths Bloom filters"
+msgstr "Calcul des filtres Bloom des chemins modifiés du commit"
+
+msgid "Collecting referenced commits"
+msgstr "Collecte des commits référencés"
+
+#, c-format
+msgid "Finding commits for commit graph in %<PRIuMAX> pack"
+msgid_plural "Finding commits for commit graph in %<PRIuMAX> packs"
+msgstr[0] ""
+"Recherche de commits pour un graphe de commits dans %<PRIuMAX> paquet"
+msgstr[1] ""
+"Recherche de commits pour un graphe de commits dans %<PRIuMAX> paquets"
+
+#, c-format
+msgid "error adding pack %s"
+msgstr "erreur à l'ajout du packet %s"
+
+#, c-format
+msgid "error opening index for %s"
+msgstr "erreur à l'ouverture de l'index pour %s"
+
+msgid "Finding commits for commit graph among packed objects"
+msgstr ""
+"Recherche de commits pour un graphe de commits parmi les objets empaquetés"
+
+msgid "Finding extra edges in commit graph"
+msgstr "Recherche d'arêtes supplémentaires dans un graphe de commits"
+
+msgid "failed to write correct number of base graph ids"
+msgstr "échec à l'écriture le nombre correct d'id de base de fusion"
+
+msgid "unable to create temporary graph layer"
+msgstr "impossible de créer une couche de graphe temporaire"
+
+#, c-format
+msgid "unable to adjust shared permissions for '%s'"
+msgstr "impossible de régler les droits partagés pour '%s'"
+
+#, 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"
+
+msgid "unable to open commit-graph chain file"
+msgstr "impossible d'ouvrir le fichier de graphe de commit"
+
+msgid "failed to rename base commit-graph file"
+msgstr "échec du renommage du fichier de graphe de commits"
+
+msgid "failed to rename temporary commit-graph file"
+msgstr "impossible de renommer le fichier temporaire de graphe de commits"
+
+msgid "Scanning merged commits"
+msgstr "Analyse des commits de fusion"
+
+msgid "Merging commit-graph"
+msgstr "Fusion du graphe de commits"
+
+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é"
+
+msgid "too many commits to write graph"
+msgstr "trop de commits pour écrire un graphe"
+
+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"
+
+#, 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"
+
+#, 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"
+
+#, c-format
+msgid "failed to parse commit %s from commit-graph"
+msgstr "échec de l'analyse le commit %s depuis le graphe de commits"
+
+msgid "Verifying commits in commit graph"
+msgstr "Verification des commits dans le graphe de commits"
+
+#, 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"
+
+#, 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"
+
+#, 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"
+
+#, c-format
+msgid "commit-graph parent for %s is %s != %s"
+msgstr "le parent du graphe de commit pour %s est %s != %s"
+
+#, 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"
+
+#, c-format
+msgid ""
+"commit-graph has generation number zero for commit %s, but non-zero elsewhere"
+msgstr ""
+"le graphe de commit a un numéro de génération nul pour le commit %s, mais "
+"non-nul ailleurs"
+
+#, c-format
+msgid ""
+"commit-graph has non-zero generation number for commit %s, but zero elsewhere"
+msgstr ""
+"le graphe de commit a un numéro de génération non-nul pour le commit %s, "
+"mais nul ailleurs"
+
+#, 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>"
+
+#, 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>"
+
+#, c-format
+msgid "%s %s is not a commit!"
+msgstr "%s %s n'est pas un commit !"
+
+msgid ""
+"Support for <GIT_DIR>/info/grafts is deprecated\n"
+"and will be removed in a future Git version.\n"
+"\n"
+"Please use \"git replace --convert-graft-file\"\n"
+"to convert the grafts into replace refs.\n"
+"\n"
+"Turn this message off by running\n"
+"\"git config advice.graftFileDeprecated false\""
+msgstr ""
+"Le support de <GIT_DIR>/info/grafts est déconseillé\n"
+"et sera supprimé dans une version future de Git.\n"
+"\n"
+"Veuillez utiliser \"git replace --convert-graft-file\"\n"
+"pour convertir les grafts en référence de remplacement.\n"
+"\n"
+"Supprimez ce message en lançant\n"
+"\"git config advice.graftFileDeprecated false\""
+
+#, 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."
+
+#, 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."
+
+#, c-format
+msgid "Commit %s does not have a GPG signature."
+msgstr "La validation %s n'a pas de signature GPG."
+
+#, 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"
+
+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"
+"variable i18n.commitEncoding to the encoding your project uses.\n"
+msgstr ""
+"Avertissement : le message de ce commit n'est pas conforme à UTF-8.\n"
+"Vous souhaitez peut-être le modifier pour corriger le message ou régler la\n"
+"variable de configuration i18n.commitencoding à l'encodage utilisé par votre "
+"projet.\n"
+
+msgid "no compiler information available\n"
+msgstr "aucune information de compilateur disponible\n"
+
+msgid "no libc information available\n"
+msgstr "aucune information de libc disponible\n"
+
+#, c-format
+msgid "[GLE %ld] health thread could not open '%ls'"
+msgstr "[GLE %ld] le fil de santé n'a pas pu ouvrir '%ls'"
+
+#, c-format
+msgid "[GLE %ld] health thread getting BHFI for '%ls'"
+msgstr "[GLE %ld] le fil de santé récupère la BHFI pour '%ls'"
+
+#, c-format
+msgid "could not convert to wide characters: '%s'"
+msgstr "impossible de convertir en caractères étendus : '%s'"
+
+#, c-format
+msgid "BHFI changed '%ls'"
+msgstr "La BHFI a changé '%ls'"
+
+#, c-format
+msgid "unhandled case in 'has_worktree_moved': %d"
+msgstr "cas non géré dans 'has_worktree_moved': %d"
+
+#, c-format
+msgid "health thread wait failed [GLE %ld]"
+msgstr "l'attente du fil de santé a échoué [GLE %ld]"
+
+msgid "Unable to create FSEventStream."
+msgstr "impossible de créer FSEVEntStream."
+
+msgid "Failed to start the FSEventStream"
+msgstr "Échec de démarrage de FSEVEntStream"
+
+#, c-format
+msgid "[GLE %ld] could not convert path to UTF-8: '%.*ls'"
+msgstr "[GLE %ld] impossible de convertir le chemin en UTF-8 : '%.*ls'"
+
+#, c-format
+msgid "[GLE %ld] could not watch '%s'"
+msgstr "[GLE %ld] impossible de lancer watch sur '%s'"
+
+#, c-format
+msgid "[GLE %ld] could not get longname of '%s'"
+msgstr "[GLE %ld] impossible de récupérer le nom long de '%s'"
+
+#, c-format
+msgid "ReadDirectoryChangedW failed on '%s' [GLE %ld]"
+msgstr "ReadDirectoryChangedW a échoué sur '%s' [GLE %ld]"
+
+#, c-format
+msgid "GetOverlappedResult failed on '%s' [GLE %ld]"
+msgstr "GetOverlappedResult a échoué sur '%s' [GLE %ld]"
+
+#, c-format
+msgid "could not read directory changes [GLE %ld]"
+msgstr "impossible de lire les modifications du répertoire [GLE %ld]"
+
+#, c-format
+msgid "failed to copy SID (%ld)"
+msgstr "échec de la copie du SID (%ld)"
+
+#, c-format
+msgid "failed to get owner for '%s' (%ld)"
+msgstr "échec d'obtention du propriétaire pour '%s' (%ld)"
+
+msgid "memory exhausted"
+msgstr "plus de mémoire"
+
+msgid "Success"
+msgstr "Succès"
+
+msgid "No match"
+msgstr "Pas de correspondance"
+
+msgid "Invalid regular expression"
+msgstr "Expression régulière invalide"
+
+msgid "Invalid collation character"
+msgstr "Caractère de comparaison invalide"
+
+msgid "Invalid character class name"
+msgstr "Nom de classe de caractères invalide"
+
+msgid "Trailing backslash"
+msgstr "caractère anti barre oblique de fin de ligne"
+
+msgid "Invalid back reference"
+msgstr "Référence arrière invalide"
+
+msgid "Unmatched [ or [^"
+msgstr "[ ou [^ sans correspondance"
+
+msgid "Unmatched ( or \\("
+msgstr "( ou \\( sans correspondance"
+
+msgid "Unmatched \\{"
+msgstr "\\{ sans correspondance"
+
+msgid "Invalid content of \\{\\}"
+msgstr "Contenu invalide de \\{\\}"
+
+msgid "Invalid range end"
+msgstr "Fin de gamme invalide"
+
+msgid "Memory exhausted"
+msgstr "Plus de mémoire"
+
+msgid "Invalid preceding regular expression"
+msgstr "Expressions régulière précédente invalide"
+
+msgid "Premature end of regular expression"
+msgstr "Fin d'expression régulière prématurée"
+
+msgid "Regular expression too big"
+msgstr "L'expression régulière est trop grosse"
+
+msgid "Unmatched ) or \\)"
+msgstr ") ou \\) sans correspondance"
+
+msgid "No previous regular expression"
+msgstr "Pas d'expression régulière précédente"
+
+msgid "could not send IPC command"
+msgstr "impossible de trouver le commit %"
+
+msgid "could not read IPC response"
+msgstr "impossible de lire la réponse IPC"
+
+#, c-format
+msgid "could not start accept_thread '%s'"
+msgstr "impossible de démarrer accept_thread '%s'"
+
+#, c-format
+msgid "could not start worker[0] for '%s'"
+msgstr "impossible de démarrer worker[0] pour '%s'"
+
+#, c-format
+msgid "ConnectNamedPipe failed for '%s' (%lu)"
+msgstr "ConnectNamedPipe a échoué pour '%s' (%lu)"
+
+#, c-format
+msgid "could not create fd from pipe for '%s'"
+msgstr "impossible de créer le fd depuis le tube pour '%s'"
+
+#, c-format
+msgid "could not start thread[0] for '%s'"
+msgstr "impossible de démarrer thread[0] pour '%s'"
+
+#, c-format
+msgid "wait for hEvent failed for '%s'"
+msgstr "échec de l'attente de hEvent pour '%s'"
+
+msgid "cannot resume in the background, please use 'fg' to resume"
+msgstr ""
+"impossible de reprendre en arrière plan, veuillez utiliser 'fg' pour "
+"reprendre"
+
+msgid "cannot restore terminal settings"
+msgstr "impossible de restaurer les réglages du terminal"
+
+#, c-format
+msgid ""
+"exceeded maximum include depth (%d) while including\n"
+"\t%s\n"
+"from\n"
+"\t%s\n"
+"This might be due to circular includes."
+msgstr ""
+"profondeur d'inclusion maximum (%d) dépassée à l'inclusion de\n"
+"\t%s\n"
+"depuis\n"
+"\t%s\n"
+"possibilité d'inclusions multiples."
+
+#, c-format
+msgid "could not expand include path '%s'"
+msgstr "expansion impossible du chemin d'inclusion '%s'"
+
+msgid "relative config includes must come from files"
+msgstr "les inclusions de configuration relatives doivent venir de fichiers"
+
+msgid "relative config include conditionals must come from files"
+msgstr ""
+"les conditions d'inclusion de configuration relative doivent venir de "
+"fichiers"
+
+msgid ""
+"remote URLs cannot be configured in file directly or indirectly included by "
+"includeIf.hasconfig:remote.*.url"
+msgstr ""
+"les URL distantes ne peuvent pas être configurées dans un fichier "
+"directement ou indirectement inclus par includeIf.hasconfig:remote.*.url"
+
+#, c-format
+msgid "invalid config format: %s"
+msgstr "format de config invalide : %s"
+
+#, c-format
+msgid "missing environment variable name for configuration '%.*s'"
+msgstr "nom de variable d'environnement manquant pour le configuration '%.*s'"
+
+#, c-format
+msgid "missing environment variable '%s' for configuration '%.*s'"
+msgstr "variable d'environnement '%s' manquante pour le configuration '%.*s'"
+
+#, c-format
+msgid "key does not contain a section: %s"
+msgstr "la clé ne contient pas de section: %s"
+
+#, c-format
+msgid "key does not contain variable name: %s"
+msgstr "la clé ne contient pas de nom de variable : %s"
+
+#, c-format
+msgid "invalid key: %s"
+msgstr "clé invalide : %s"
+
+#, c-format
+msgid "invalid key (newline): %s"
+msgstr "clé invalide (retour chariot) : %s"
+
+msgid "empty config key"
+msgstr "clé de configuration vide"
+
+#, c-format
+msgid "bogus config parameter: %s"
+msgstr "paramètre de configuration mal formé: %s"
+
+#, c-format
+msgid "bogus format in %s"
+msgstr "formatage mal formé dans %s"
+
+#, c-format
+msgid "bogus count in %s"
+msgstr "compte faux dans %s"
+
+#, c-format
+msgid "too many entries in %s"
+msgstr "trop d'entrées dans %s"
+
+#, c-format
+msgid "missing config key %s"
+msgstr "clé de configuration %s manquante"
+
+#, c-format
+msgid "missing config value %s"
+msgstr "valeur de config manquante %s"
+
+#, c-format
+msgid "bad config line %d in blob %s"
+msgstr "ligne %d de config incorrecte dans le blob %s"
+
+#, c-format
+msgid "bad config line %d in file %s"
+msgstr "ligne %d de config incorrecte dans le fichier %s"
+
+#, c-format
+msgid "bad config line %d in standard input"
+msgstr "ligne %d de config incorrecte dans l'entrée standard"
+
+#, c-format
+msgid "bad config line %d in submodule-blob %s"
+msgstr "ligne %d de config incorrecte dans le blob de sous-module %s"
+
+#, c-format
+msgid "bad config line %d in command line %s"
+msgstr "ligne %d de config incorrecte dans la ligne de commande %s"
+
+#, c-format
+msgid "bad config line %d in %s"
+msgstr "ligne %d de config incorrecte dans %s"
+
+msgid "out of range"
+msgstr "hors plage"
+
+msgid "invalid unit"
+msgstr "unité invalide"
+
+#, c-format
+msgid "bad numeric config value '%s' for '%s': %s"
+msgstr "valeur numérique de configuration invalide '%s' pour '%s' : %s"
+
+#, 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"
+
+#, 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"
+
+#, 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"
+
+#, 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"
+
+#, 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"
+
+#, 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"
+
+#, c-format
+msgid "invalid value for variable %s"
+msgstr "valeur invalide pour la variable %s"
+
+#, c-format
+msgid "ignoring unknown core.fsync component '%s'"
+msgstr "ignore le composant core.fsync inconne '%s'"
+
+#, c-format
+msgid "bad boolean config value '%s' for '%s'"
+msgstr "valeur booléenne de configuration invalide '%s' pour '%s'"
+
+#, c-format
+msgid "failed to expand user dir in: '%s'"
+msgstr "impossible d'étendre le répertoire utilisateur dans : '%s'"
+
+#, c-format
+msgid "'%s' for '%s' is not a valid timestamp"
+msgstr "'%s' pour '%s' n'est pas un horodatage valide"
+
+#, c-format
+msgid "abbrev length out of range: %d"
+msgstr "longueur d'abbrev hors plage : %d"
+
+#, c-format
+msgid "bad zlib compression level %d"
+msgstr "niveau de compression zlib incorrect %d"
+
+msgid "core.commentChar should only be one character"
+msgstr "core.commentChar ne devrait être qu'un unique caractère"
+
+#, c-format
+msgid "ignoring unknown core.fsyncMethod value '%s'"
+msgstr "valeur inconnue '%s' de core.fsyncMethod"
+
+msgid "core.fsyncObjectFiles is deprecated; use core.fsync instead"
+msgstr "core.fsyncObjectFiles est obsolète ; utilisez core.fsync à la place"
+
+#, c-format
+msgid "invalid mode for object creation: %s"
+msgstr "mode invalide pour la création d'objet : %s"
+
+#, c-format
+msgid "malformed value for %s"
+msgstr "valeur mal formée pour %s"
+
+#, c-format
+msgid "malformed value for %s: %s"
+msgstr "valeur mal formée pour %s : %s"
+
+msgid "must be one of nothing, matching, simple, upstream or current"
+msgstr "doit être parmi nothing, matching, simple, upstream ou current"
+
+#, c-format
+msgid "unable to load config blob object '%s'"
+msgstr "impossible de charger l'objet blob de config '%s'"
+
+#, c-format
+msgid "reference '%s' does not point to a blob"
+msgstr "la référence '%s' ne pointe pas sur un blob"
+
+#, c-format
+msgid "unable to resolve config blob '%s'"
+msgstr "impossible de résoudre le blob de config '%s'"
+
+#, c-format
+msgid "failed to parse %s"
+msgstr "échec de l'analyse de %s"
+
+msgid "unable to parse command-line config"
+msgstr "lecture de la configuration de ligne de commande impossible"
+
+msgid "unknown error occurred while reading the configuration files"
+msgstr "erreur inconnue pendant la lecture des fichiers de configuration"
+
+#, c-format
+msgid "Invalid %s: '%s'"
+msgstr "%s invalide : '%s'"
+
+#, 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"
+
+#, c-format
+msgid "unable to parse '%s' from command-line config"
+msgstr ""
+"impossible d'analyser '%s' depuis le configuration en ligne de commande"
+
+#, 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"
+
+#, c-format
+msgid "invalid section name '%s'"
+msgstr "nom de section invalide '%s'"
+
+#, c-format
+msgid "%s has multiple values"
+msgstr "%s a des valeurs multiples"
+
+#, c-format
+msgid "failed to write new configuration file %s"
+msgstr "impossible d'écrire le fichier de configuration %s"
+
+#, c-format
+msgid "could not lock config file %s"
+msgstr "impossible de verrouiller le fichier de configuration %s"
+
+#, c-format
+msgid "opening %s"
+msgstr "ouverture de %s"
+
+#, c-format
+msgid "invalid config file %s"
+msgstr "fichier de configuration invalide %s"
+
+#, c-format
+msgid "fstat on %s failed"
+msgstr "échec de fstat sur %s"
+
+#, c-format
+msgid "unable to mmap '%s'%s"
+msgstr "impossible de réaliser un mmap de '%s'%s"
+
+#, c-format
+msgid "chmod on %s failed"
+msgstr "échec de chmod sur %s"
+
+#, c-format
+msgid "could not write config file %s"
+msgstr "impossible d'écrire le fichier de configuration %s"
+
+#, c-format
+msgid "could not set '%s' to '%s'"
+msgstr "impossible de régler '%s' à '%s'"
+
+#, c-format
+msgid "invalid section name: %s"
+msgstr "nom de section invalide : %s"
+
+#, c-format
+msgid "missing value for '%s'"
+msgstr "valeur manquante pour '%s'"
+
+msgid "the remote end hung up upon initial contact"
+msgstr "l'hôte distant a fermé la connexion lors du contact initial"
+
+msgid ""
+"Could not read from remote repository.\n"
+"\n"
+"Please make sure you have the correct access rights\n"
+"and the repository exists."
+msgstr ""
+"Impossible de lire le dépôt distant.\n"
+"\n"
+"Veuillez vérifier que vous avez les droits d'accès\n"
+"et que le dépôt existe."
+
+#, c-format
+msgid "server doesn't support '%s'"
+msgstr "le serveur ne supporte pas '%s'"
+
+#, c-format
+msgid "server doesn't support feature '%s'"
+msgstr "le serveur ne supporte pas la fonctionnalité '%s'"
+
+msgid "expected flush after capabilities"
+msgstr "vidage attendu après les capacités"
+
+#, c-format
+msgid "ignoring capabilities after first line '%s'"
+msgstr "capacités ignorées après la première ligne '%s'"
+
+msgid "protocol error: unexpected capabilities^{}"
+msgstr "erreur de protocole : capabilities^{} inattendu"
+
+#, c-format
+msgid "protocol error: expected shallow sha-1, got '%s'"
+msgstr "erreur de protocole : shallow sha-1 attendu, '%s' trouvé"
+
+msgid "repository on the other end cannot be shallow"
+msgstr "le dépôt distant ne peut pas être superficiel"
+
+msgid "invalid packet"
+msgstr "paquet invalide"
+
+#, c-format
+msgid "protocol error: unexpected '%s'"
+msgstr "erreur de protocole : '%s' attendu"
+
+#, c-format
+msgid "unknown object format '%s' specified by server"
+msgstr "format d'objet spécifié par le serveur inconnu '%s'"
+
+#, c-format
+msgid "invalid ls-refs response: %s"
+msgstr "réponse à ls-ref invalide : %s"
+
+msgid "expected flush after ref listing"
+msgstr "vidage attendu après le listage de références"
+
+msgid "expected response end packet after ref listing"
+msgstr "paquet de fin de réponse attendu après le listage de références"
+
+#, c-format
+msgid "protocol '%s' is not supported"
+msgstr "le protocole '%s' n'est pas supporté"
+
+msgid "unable to set SO_KEEPALIVE on socket"
+msgstr "impossible de positionner SO_KEEPALIVE sur la socket"
+
+#, c-format
+msgid "Looking up %s ... "
+msgstr "Recherche de %s… "
+
+#, 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 ... "
+#, c-format
+msgid ""
+"done.\n"
+"Connecting to %s (port %s) ... "
+msgstr ""
+"fait.\n"
+"Connexion à %s (port %s)… "
+
+#, c-format
+msgid ""
+"unable to connect to %s:\n"
+"%s"
+msgstr ""
+"impossible de se connecter à %s :\n"
+"%s"
+
+#. TRANSLATORS: this is the end of "Connecting to %s (port %s) ... "
+msgid "done."
+msgstr "fait."
+
+#, c-format
+msgid "unable to look up %s (%s)"
+msgstr "impossible de rechercher %s (%s)"
+
+#, c-format
+msgid "unknown port %s"
+msgstr "port inconnu %s"
+
+#, c-format
+msgid "strange hostname '%s' blocked"
+msgstr "nom d'hôte étrange '%s' bloqué"
+
+#, c-format
+msgid "strange port '%s' blocked"
+msgstr "port étrange '%s' bloqué"
+
+#, c-format
+msgid "cannot start proxy %s"
+msgstr "impossible de démarrer un proxy %s"
+
+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"
+
+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"
+
+msgid "ssh variant 'simple' does not support -4"
+msgstr "la variante ssh 'simple' ne supporte pas -4"
+
+msgid "ssh variant 'simple' does not support -6"
+msgstr "la variante ssh 'simple' ne supporte pas -6"
+
+msgid "ssh variant 'simple' does not support setting port"
+msgstr "la variante ssh 'simple' ne supporte pas de spécifier le port"
+
+#, c-format
+msgid "strange pathname '%s' blocked"
+msgstr "chemin étrange '%s' bloqué"
+
+msgid "unable to fork"
+msgstr "fork impossible"
+
+msgid "Could not run 'git rev-list'"
+msgstr "Impossible de lancer 'git rev-list'"
+
+msgid "failed write to rev-list"
+msgstr "impossible d'écrire dans la rev-list"
+
+msgid "failed to close rev-list's stdin"
+msgstr "impossible de fermer l'entrée standard du rev-list"
+
+#, c-format
+msgid "'%s' does not exist"
+msgstr "'%s' n'existe pas"
+
+msgid "need a working directory"
+msgstr "répertoire de travail nécessaire"
+
+msgid "could not find enlistment root"
+msgstr "impossible de trouver la racine d'enrôlement"
+
+#, c-format
+msgid "could not switch to '%s'"
+msgstr "impossible de basculer vers '%s'"
+
+#, c-format
+msgid "could not configure %s=%s"
+msgstr "impossible de configurer %s=%s"
+
+msgid "could not configure log.excludeDecoration"
+msgstr "impossible de configurer log.excludeDecoration"
+
+msgid "Scalar enlistments require a worktree"
+msgstr "Les enrôlements scalaires requièrent un arbre de travail"
+
+#, c-format
+msgid "could not open directory '%s'"
+msgstr "impossible d'ouvrir le répertoire '%s'"
+
+#, c-format
+msgid "skipping '%s', which is neither file nor directory"
+msgstr "'%s' sauté, qui n'est ni un fichier ni un répertoire"
+
+#, c-format
+msgid "could not determine free disk size for '%s'"
+msgstr "impossible de déterminer l'espace libre du disque pour '%s'"
+
+#, c-format
+msgid "could not get info for '%s'"
+msgstr "impossible d'avoir des informations pour '%s'"
+
+#, c-format
+msgid "remote HEAD is not a branch: '%.*s'"
+msgstr "la HEAD distante n'est pas une branche : '%.*s'"
+
+msgid "failed to get default branch name from remote; using local default"
+msgstr ""
+"échec de récupération de la branche par défaut depuis le distant ; "
+"utilisation de la valeur par défaut locale"
+
+msgid "failed to get default branch name"
+msgstr "échec de l'obtention du nom de branche par défaut"
+
+msgid "failed to unregister repository"
+msgstr "échec du désenregistrement du dépôt"
+
+msgid "failed to delete enlistment directory"
+msgstr "échec de la suppression du répertoire d'enrôlement"
+
+msgid "branch to checkout after clone"
+msgstr "branche à extraire après le clonage"
+
+msgid "when cloning, create full working directory"
+msgstr "lors d'un clonage, créer un répertoire de travail complet"
+
+msgid "only download metadata for the branch that will be checked out"
+msgstr "ne télécharger les méta-données que pour la branche qui sera extraite"
+
+msgid "scalar clone [<options>] [--] <repo> [<dir>]"
+msgstr "scalar clone [<options>] [--] <dépôt> [<répertoire>]"
+
+#, c-format
+msgid "cannot deduce worktree name from '%s'"
+msgstr "impossible de déduire le nom de l'arbre de travail depuis '%s'"
+
+#, c-format
+msgid "directory '%s' exists already"
+msgstr "le répertoire '%s' existe déjà"
+
+#, c-format
+msgid "failed to get default branch for '%s'"
+msgstr "échec d'obtention de la branche par défaut pour '%s'"
+
+#, c-format
+msgid "could not configure remote in '%s'"
+msgstr "impossible de paramétrer le distant dans '%s'"
+
+#, c-format
+msgid "could not configure '%s'"
+msgstr "impossible de configurer '%s'"
+
+msgid "partial clone failed; attempting full clone"
+msgstr "échec du clonage partiel ; tentative de clonage complet"
+
+msgid "could not configure for full clone"
+msgstr "impossible de configurer pour le clonage complet"
+
+msgid "scalar diagnose [<enlistment>]"
+msgstr "scalar diagnose [<enrôlement>]"
+
+#, c-format
+msgid "could not create directory for '%s'"
+msgstr "impossible de créer le répertoire pour '%s'"
+
+msgid "could not duplicate stdout"
+msgstr "impossible de dupliquer stdout"
+
+msgid "failed to write archive"
+msgstr "impossible d'écrire l'archive"
+
+msgid "`scalar list` does not take arguments"
+msgstr "`scalar list` n'accepte pas d'argument"
+
+msgid "scalar register [<enlistment>]"
+msgstr "scalar register [<enrôlement>]"
+
+msgid "reconfigure all registered enlistments"
+msgstr "reconfigurer tous les enrôlements enregistrés"
+
+msgid "scalar reconfigure [--all | <enlistment>]"
+msgstr "scala reconfigure [--all|<enrôlement>]"
+
+msgid "--all or <enlistment>, but not both"
+msgstr "--all ou <enrôlement>, mais pas les deux"
+
+#, c-format
+msgid "git repository gone in '%s'"
+msgstr "dépôt git parti dans '%s'"
+
+msgid ""
+"scalar run <task> [<enlistment>]\n"
+"Tasks:\n"
+msgstr ""
+"scalar run <tâche> [<enrôlement>]\n"
+"Tâches :\n"
+
+#, c-format
+msgid "no such task: '%s'"
+msgstr "pas de tâche : '%s'"
+
+msgid "scalar unregister [<enlistment>]"
+msgstr "scalar unregister [<enrôlement>]"
+
+msgid "scalar delete <enlistment>"
+msgstr "scalar delete <enrôlement>"
+
+msgid "refusing to delete current working directory"
+msgstr "refus de la suppression du répertoire de travail actuel"
+
+msgid "include Git version"
+msgstr "inclure la version Git"
+
+msgid "include Git's build options"
+msgstr "inclure les options de construction de Git"
+
+msgid "scalar verbose [-v | --verbose] [--build-options]"
+msgstr "scalar verbose [-v | --verbose] [--build-options]"
+
+msgid "-C requires a <directory>"
+msgstr "-C requiert un <répertoire>"
+
+#, c-format
+msgid "could not change to '%s'"
+msgstr "échec de modification en '%s'"
+
+msgid "-c requires a <key>=<value> argument"
+msgstr "-c exige un argument <clé>=<valeur>"
+
+msgid ""
+"scalar [-C <directory>] [-c <key>=<value>] <command> [<options>]\n"
+"\n"
+"Commands:\n"
+msgstr ""
+"scalar [-C <répertoire>] [-c <clé>=<valeur>] <commande> [<options>]\n"
+"\n"
+"Commandes :\n"
+
+#, c-format
+msgid "illegal crlf_action %d"
+msgstr "crlf_action illégal %d"
+
+#, c-format
+msgid "CRLF would be replaced by LF in %s"
+msgstr "Les CRLF seraient remplacés par des LF dans %s"
+
+#, c-format
+msgid ""
+"in the working copy of '%s', CRLF will be replaced by LF the next time Git "
+"touches it"
+msgstr ""
+"dans la copie de travail pour '%s', CRLF sera remplacé par LF la prochaine "
+"fois que Git le touche"
+
+#, c-format
+msgid "LF would be replaced by CRLF in %s"
+msgstr "Les LF seraient remplacés par des CRLF dans %s"
+
+#, c-format
+msgid ""
+"in the working copy of '%s', LF will be replaced by CRLF the next time Git "
+"touches it"
+msgstr ""
+"dans la copie de travail de '%s', LF sera remplacé par CRLF la prochaine "
+"fois que Git le touche"
+
+#, c-format
+msgid "BOM is prohibited in '%s' if encoded as %s"
+msgstr "Aucun BOM n'est permis dans '%s' s'il est encodé comme %s"
+
+#, c-format
+msgid ""
+"The file '%s' contains a byte order mark (BOM). Please use UTF-%.*s as "
+"working-tree-encoding."
+msgstr ""
+"Le fichier '%s' contient un marqueur d'ordre d'octets (BOM). Veuillez "
+"utiliser UTF-%.*s comme encodage d'arbre de travail."
+
+#, c-format
+msgid "BOM is required in '%s' if encoded as %s"
+msgstr "Un BOM est obligatoire dans '%s' s'il est encodé comme %s"
+
+#, 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."
+msgstr ""
+"Il manque un marqueur d'ordre d'octets (BOM) au fichier '%s'. Veuillez "
+"utiliser UTF-%sBE ou UTF-%sLE (selon l'ordre désiré) comme encodage d'arbre "
+"de travail."
+
+#, c-format
+msgid "failed to encode '%s' from %s to %s"
+msgstr "échec de l'encodage de '%s' de %s vers %s"
+
+#, c-format
+msgid "encoding '%s' from %s to %s and back is not the same"
+msgstr ""
+"encoder '%s' depuis %s vers %s puis inversement ne produit pas le même "
+"contenu"
+
+#, c-format
+msgid "cannot fork to run external filter '%s'"
+msgstr "impossible de forker pour lancer le filtre externe '%s'"
+
+#, c-format
+msgid "cannot feed the input to external filter '%s'"
+msgstr "impossible de fournir l'entrée au filtre externe '%s'"
+
+#, c-format
+msgid "external filter '%s' failed %d"
+msgstr "le filtre externe '%s' a échoué %d"
+
+#, c-format
+msgid "read from external filter '%s' failed"
+msgstr "la lecture depuis le filtre externe '%s' a échoué"
+
+#, c-format
+msgid "external filter '%s' failed"
+msgstr "le filtre externe '%s' a échoué"
+
+msgid "unexpected filter type"
+msgstr "type de filtre inattendu"
+
+msgid "path name too long for external filter"
+msgstr "nom de chemin trop long pour un filtre externe"
+
+#, c-format
+msgid ""
+"external filter '%s' is not available anymore although not all paths have "
+"been filtered"
+msgstr ""
+"le filtre externe '%s' n'est plus disponible bien que tous les chemins "
+"n'aient pas été filtrés"
+
+msgid "true/false are no valid working-tree-encodings"
+msgstr "true/false ne sont pas des encodages d'arbre de travail valides"
+
+#, c-format
+msgid "%s: clean filter '%s' failed"
+msgstr "%s : le filtre clean '%s' a échoué"
+
+#, c-format
+msgid "%s: smudge filter %s failed"
+msgstr "%s : le filtre smudge '%s' a échoué"
+
+#, c-format
+msgid "skipping credential lookup for key: credential.%s"
+msgstr ""
+"vérification des informations d'identification sautée pour la clé : "
+"credential.%s"
+
+msgid "refusing to work with credential missing host field"
+msgstr "refus de travailler avec un champ host manquant dans l'identification"
+
+msgid "refusing to work with credential missing protocol field"
+msgstr ""
+"refus de travailler avec un champ protocol manquant dans l'identification"
+
+#, c-format
+msgid "url contains a newline in its %s component: %s"
+msgstr "l'url contient un retour chariot dans composant %s : %s"
+
+#, c-format
+msgid "url has no scheme: %s"
+msgstr "l'url n'a pas de schéma : %s"
+
+#, c-format
+msgid "credential url cannot be parsed: %s"
+msgstr "impossible d'analyser l'url d'identification : %s"
+
+msgid "in the future"
+msgstr "dans le futur"
+
+#, c-format
+msgid "%<PRIuMAX> second ago"
+msgid_plural "%<PRIuMAX> seconds ago"
+msgstr[0] "il y a %<PRIuMAX> seconde"
+msgstr[1] "il y a %<PRIuMAX> secondes"
+
+#, c-format
+msgid "%<PRIuMAX> minute ago"
+msgid_plural "%<PRIuMAX> minutes ago"
+msgstr[0] "il y a %<PRIuMAX> minute"
+msgstr[1] "il y a %<PRIuMAX> minutes"
+
+#, c-format
+msgid "%<PRIuMAX> hour ago"
+msgid_plural "%<PRIuMAX> hours ago"
+msgstr[0] "il y a %<PRIuMAX> heure"
+msgstr[1] "il y a %<PRIuMAX> heures"
+
+#, c-format
+msgid "%<PRIuMAX> day ago"
+msgid_plural "%<PRIuMAX> days ago"
+msgstr[0] "il y a %<PRIuMAX> jour"
+msgstr[1] "il y a %<PRIuMAX> jours"
+
+#, c-format
+msgid "%<PRIuMAX> week ago"
+msgid_plural "%<PRIuMAX> weeks ago"
+msgstr[0] "il y a %<PRIuMAX> semaine"
+msgstr[1] "il y a %<PRIuMAX> semaines"
+
+#, c-format
+msgid "%<PRIuMAX> month ago"
+msgid_plural "%<PRIuMAX> months ago"
+msgstr[0] "il y a %<PRIuMAX> mois"
+msgstr[1] "il y a %<PRIuMAX> mois"
+
+#, c-format
+msgid "%<PRIuMAX> year"
+msgid_plural "%<PRIuMAX> years"
+msgstr[0] "%<PRIuMAX> an"
+msgstr[1] "%<PRIuMAX> ans"
+
+#. TRANSLATORS: "%s" is "<n> years"
+#, c-format
+msgid "%s, %<PRIuMAX> month ago"
+msgid_plural "%s, %<PRIuMAX> months ago"
+msgstr[0] "il y a %s et %<PRIuMAX> mois"
+msgstr[1] "il y a %s et %<PRIuMAX> mois"
+
+#, c-format
+msgid "%<PRIuMAX> year ago"
+msgid_plural "%<PRIuMAX> years ago"
+msgstr[0] "il y a %<PRIuMAX> an"
+msgstr[1] "il y a %<PRIuMAX> ans"
+
+msgid "Propagating island marks"
+msgstr "Propagation des marques d'îlots"
+
+#, c-format
+msgid "bad tree object %s"
+msgstr "objet arbre invalide %s"
+
+#, c-format
+msgid "failed to load island regex for '%s': %s"
+msgstr "impossible de charger la regex île pour '%s' : %s"
+
+#, c-format
+msgid "island regex from config has too many capture groups (max=%d)"
+msgstr ""
+"l'expression rationnelle depuis la configuration a trop de groupes de "
+"capture (max=%d)"
+
+#, c-format
+msgid "Marked %d islands, done.\n"
+msgstr "Marquage de %d îlots, fait.\n"
+
+msgid "--merge-base does not work with ranges"
+msgstr "--merge-base ne fonctionne pas avec des plages"
+
+msgid "--merge-base only works with commits"
+msgstr "--merge-base ne fonctionne qu'avec des commits"
+
+msgid "unable to get HEAD"
+msgstr "impossible d'acquérir HEAD"
+
+msgid "no merge base found"
+msgstr "aucune base de fusion trouvée"
+
+msgid "multiple merge bases found"
+msgstr "bases multiples de fusion trouvées"
+
+msgid "git diff --no-index [<options>] <path> <path>"
+msgstr "git diff --no-index [<options>] <chemin> <chemin>"
+
+msgid ""
+"Not a git repository. Use --no-index to compare two paths outside a working "
+"tree"
+msgstr ""
+"Pas un dépôt git. Utilisez --no-index pour comparer deux chemins hors d'un "
+"arbre de travail"
+
+#, c-format
+msgid "  Failed to parse dirstat cut-off percentage '%s'\n"
+msgstr ""
+"  Impossible d'analyser le pourcentage de modification de dirstat '%s'\n"
+
+#, c-format
+msgid "  Unknown dirstat parameter '%s'\n"
+msgstr "  Paramètre dirstat inconnu '%s'\n"
+
+msgid ""
+"color moved setting must be one of 'no', 'default', 'blocks', 'zebra', "
+"'dimmed-zebra', 'plain'"
+msgstr ""
+"le paramètre de couleur de déplacement doit être parmi 'no', 'default', "
+"'blocks', 'zebra', 'dimmed-zebra' ou 'plain'"
+
+#, 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 ""
+"mode unknown color-moved-ws inconnu '%s', les valeurs possibles sont 'ignore-"
+"space-change', 'ignore-space-at-eol', 'ignore-all-space', 'allow-indentation-"
+"change'"
+
+msgid ""
+"color-moved-ws: allow-indentation-change cannot be combined with other "
+"whitespace modes"
+msgstr ""
+"color-moved-ws : allow-indentation-change ne peut pas être combiné avec "
+"d'autres modes d'espace"
+
+#, c-format
+msgid "Unknown value for 'diff.submodule' config variable: '%s'"
+msgstr ""
+"Valeur inconnue pour la variable de configuration 'diff.submodule' : '%s'"
+
+#, c-format
+msgid ""
+"Found errors in 'diff.dirstat' config variable:\n"
+"%s"
+msgstr ""
+"Erreurs dans la variable de configuration 'diff.dirstat' :\n"
+"%s"
+
+#, c-format
+msgid "external diff died, stopping at %s"
+msgstr "l'application de diff externe a disparu, arrêt à %s"
+
+#, c-format
+msgid "options '%s', '%s', '%s', and '%s' cannot be used together"
+msgstr ""
+"les options '%s', '%s', '%s' et '%s' ne peuvent pas être utilisées ensemble"
+
+#, c-format
+msgid "options '%s' and '%s' cannot be used together, use '%s' with '%s'"
+msgstr ""
+"les options '%s' et '%s' ne peuvent pas être utilisées ensemble, utilisez "
+"'%s' avec '%s'"
+
+#, c-format
+msgid ""
+"options '%s' and '%s' cannot be used together, use '%s' with '%s' and '%s'"
+msgstr ""
+"les options '%s' et '%s' ne peuvent pas être utilisées ensemble, utilisez "
+"'%s' avec '%s' et '%s'"
+
+msgid "--follow requires exactly one pathspec"
+msgstr "--follow a besoin d'une spécification de chemin unique"
+
+#, c-format
+msgid "invalid --stat value: %s"
+msgstr "valeur invalide de --stat : %s"
+
+#, c-format
+msgid "%s expects a numerical value"
+msgstr "%s attend une valeur numérique"
+
+#, c-format
+msgid ""
+"Failed to parse --dirstat/-X option parameter:\n"
+"%s"
+msgstr ""
+"Impossible d'analyser le paramètre de l'option --dirstat/-X :\n"
+"%s"
+
+#, c-format
+msgid "unknown change class '%c' in --diff-filter=%s"
+msgstr "classe de modification inconnue '%c' dans --diff-filter=%s"
+
+#, c-format
+msgid "unknown value after ws-error-highlight=%.*s"
+msgstr "valeur inconnue après ws-error-highlight=%.*s"
+
+#, c-format
+msgid "unable to resolve '%s'"
+msgstr "impossible de résoudre '%s'"
+
+#, c-format
+msgid "%s expects <n>/<m> form"
+msgstr "forme <n>/<m> attendue par %s"
+
+#, c-format
+msgid "%s expects a character, got '%s'"
+msgstr "caractère attendu par %s, '%s' trouvé"
+
+#, c-format
+msgid "bad --color-moved argument: %s"
+msgstr "mauvais argument --color-moved : %s"
+
+#, c-format
+msgid "invalid mode '%s' in --color-moved-ws"
+msgstr "mode invalide '%s' dans --color-moved-ws"
+
+msgid ""
+"option diff-algorithm accepts \"myers\", \"minimal\", \"patience\" and "
+"\"histogram\""
+msgstr ""
+"l'option diff-algorithm accept \"myers\", \"minimal\", \"patience\" et "
+"\"histogram\""
+
+#, c-format
+msgid "invalid argument to %s"
+msgstr "argument invalide pour %s"
+
+#, c-format
+msgid "invalid regex given to -I: '%s'"
+msgstr "regex invalide fournie à -I : '%s'"
+
+#, c-format
+msgid "failed to parse --submodule option parameter: '%s'"
+msgstr "échec de l'analyse du paramètre de l'option --submodule : '%s'"
+
+#, c-format
+msgid "bad --word-diff argument: %s"
+msgstr "mauvais argument pour --word-diff : %s"
+
+msgid "Diff output format options"
+msgstr "Options de format de sortie de diff"
+
+msgid "generate patch"
+msgstr "générer la rustine"
+
+msgid "<n>"
+msgstr "<n>"
+
+msgid "generate diffs with <n> lines context"
+msgstr "générer les diffs avec <n> lignes de contexte"
+
+msgid "generate the diff in raw format"
+msgstr "générer le diff en format brut"
+
+msgid "synonym for '-p --raw'"
+msgstr "synonyme de '-p --raw'"
+
+msgid "synonym for '-p --stat'"
+msgstr "synonyme de '-p --stat'"
+
+msgid "machine friendly --stat"
+msgstr "--stat pour traitement automatique"
+
+msgid "output only the last line of --stat"
+msgstr "afficher seulement la dernière ligne de --stat"
+
+msgid "<param1,param2>..."
+msgstr "<param1,param2>..."
+
+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"
+
+msgid "synonym for --dirstat=cumulative"
+msgstr "synonyme pour --dirstat=cumulative"
+
+msgid "synonym for --dirstat=files,param1,param2..."
+msgstr "synonyme pour --dirstat=files,param1,param2..."
+
+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"
+
+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"
+
+msgid "show only names of changed files"
+msgstr "n'afficher que les noms de fichiers modifiés"
+
+msgid "show only names and status of changed files"
+msgstr "n'afficher que les noms et les status des fichiers modifiés"
+
+msgid "<width>[,<name-width>[,<count>]]"
+msgstr "<largeur>[,<largeur-de-nom>[,<compte>]]"
+
+msgid "generate diffstat"
+msgstr "générer un diffstat"
+
+msgid "<width>"
+msgstr "<largeur>"
+
+msgid "generate diffstat with a given width"
+msgstr "générer un diffstat avec la largeur indiquée"
+
+msgid "generate diffstat with a given name width"
+msgstr "génerer un diffstat avec la largeur de nom indiquée"
+
+msgid "generate diffstat with a given graph width"
+msgstr "génerer un diffstat avec la largeur de graphe indiquée"
+
+msgid "<count>"
+msgstr "<compte>"
+
+msgid "generate diffstat with limited lines"
+msgstr "générer un diffstat avec des lignes limitées"
+
+msgid "generate compact summary in diffstat"
+msgstr "générer une résumé compact dans le diffstat"
+
+msgid "output a binary diff that can be applied"
+msgstr "produire un diff binaire qui peut être appliqué"
+
+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\""
+
+msgid "show colored diff"
+msgstr "afficher un diff coloré"
+
+msgid "<kind>"
+msgstr "<sorte>"
+
+msgid ""
+"highlight whitespace errors in the 'context', 'old' or 'new' lines in the "
+"diff"
+msgstr ""
+"surligner les erreurs d'espace dans les lignes 'contexte', 'ancien', "
+"'nouveau' dans le diff"
+
+msgid ""
+"do not munge pathnames and use NULs as output field terminators in --raw or "
+"--numstat"
+msgstr ""
+"ne pas compresser les chemins et utiliser des NULs comme terminateurs de "
+"champs dans --raw ou --numstat"
+
+msgid "<prefix>"
+msgstr "<préfixe>"
+
+msgid "show the given source prefix instead of \"a/\""
+msgstr "afficher le préfixe de source indiqué au lieu de \"a/\""
+
+msgid "show the given destination prefix instead of \"b/\""
+msgstr "afficher le préfixe de destination indiqué au lieu de \"b/\""
+
+msgid "prepend an additional prefix to every line of output"
+msgstr "préfixer toutes les lignes en sortie avec la chaîne indiquée"
+
+msgid "do not show any source or destination prefix"
+msgstr "n'afficher aucun préfixe, ni de source, ni de destination"
+
+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é"
+
+msgid "<char>"
+msgstr "<caractère>"
+
+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 '+'"
+
+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 '-'"
+
+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 ' '"
+
+msgid "Diff rename options"
+msgstr "Options de renommage de diff"
+
+msgid "<n>[/<m>]"
+msgstr "<n>[/<m>]"
+
+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"
+
+msgid "detect renames"
+msgstr "détecter les renommages"
+
+msgid "omit the preimage for deletes"
+msgstr "supprimer la pré-image pour les suppressions"
+
+msgid "detect copies"
+msgstr "détecter les copies"
+
+msgid "use unmodified files as source to find copies"
+msgstr ""
+"utiliser les fichiers non-modifiés comme sources pour trouver des copies"
+
+msgid "disable rename detection"
+msgstr "désactiver la détection de renommage"
+
+msgid "use empty blobs as rename source"
+msgstr "utiliser des blobs vides comme source de renommage"
+
+msgid "continue listing the history of a file beyond renames"
+msgstr "continuer à afficher l'historique d'un fichier au delà des renommages"
+
+msgid ""
+"prevent rename/copy detection if the number of rename/copy targets exceeds "
+"given limit"
+msgstr ""
+"empêcher la détection de renommage/copie si le nombre de cibles de renommage/"
+"copie excède la limite indiquée"
+
+msgid "Diff algorithm options"
+msgstr "Options de l'algorithme de diff"
+
+msgid "produce the smallest possible diff"
+msgstr "produire le diff le plus petit possible"
+
+msgid "ignore whitespace when comparing lines"
+msgstr "ignorer les espaces lors de la comparaison de ligne"
+
+msgid "ignore changes in amount of whitespace"
+msgstr "ignorer des modifications du nombre d'espaces"
+
+msgid "ignore changes in whitespace at EOL"
+msgstr "ignorer des modifications d'espace en fin de ligne"
+
+msgid "ignore carrier-return at the end of line"
+msgstr "ignore le retour chariot en fin de ligne"
+
+msgid "ignore changes whose lines are all blank"
+msgstr "ignorer les modifications dont les lignes sont vides"
+
+msgid "<regex>"
+msgstr "<regex>"
+
+msgid "ignore changes whose all lines match <regex>"
+msgstr "ignorer les modifications dont les lignes correspondent à <regex>"
+
+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"
+
+msgid "generate diff using the \"patience diff\" algorithm"
+msgstr "générer un diff en utilisant l'algorithme de différence \"patience\""
+
+msgid "generate diff using the \"histogram diff\" algorithm"
+msgstr ""
+"générer un diff en utilisant l'algorithme de différence \"histogramme\""
+
+msgid "<algorithm>"
+msgstr "<algorithme>"
+
+msgid "choose a diff algorithm"
+msgstr "choisir un algorithme de différence"
+
+msgid "<text>"
+msgstr "<texte>"
+
+msgid "generate diff using the \"anchored diff\" algorithm"
+msgstr "générer un diff en utilisant l'algorithme de différence \"ancré\""
+
+msgid "<mode>"
+msgstr "<mode>"
+
+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"
+
+msgid "use <regex> to decide what a word is"
+msgstr "utiliser <regex> pour décider ce qu'est un mot"
+
+msgid "equivalent to --word-diff=color --word-diff-regex=<regex>"
+msgstr "équivalent à --word-diff=color --word-diff-regex=<regex>"
+
+msgid "moved lines of code are colored differently"
+msgstr "les lignes déplacées sont colorées différemment"
+
+msgid "how white spaces are ignored in --color-moved"
+msgstr "comment les espaces sont ignorés dans --color-moved"
+
+msgid "Other diff options"
+msgstr "Autres options diff"
+
+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"
+
+msgid "treat all files as text"
+msgstr "traiter les fichiers comme texte"
+
+msgid "swap two inputs, reverse the diff"
+msgstr "échanger les entrées, inverser le diff"
+
+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"
+
+msgid "disable all output of the program"
+msgstr "désactiver tous les affichages du programme"
+
+msgid "allow an external diff helper to be executed"
+msgstr "autoriser l'exécution d'un assistant externe de diff"
+
+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"
+
+msgid "<when>"
+msgstr "<quand>"
+
+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"
+
+msgid "<format>"
+msgstr "<format>"
+
+msgid "specify how differences in submodules are shown"
+msgstr "spécifier comment les différences dans les sous-modules sont affichées"
+
+msgid "hide 'git add -N' entries from the index"
+msgstr "masquer les entrées 'git add -N' de l'index"
+
+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"
+
+msgid "<string>"
+msgstr "<chaîne>"
+
+msgid ""
+"look for differences that change the number of occurrences of the specified "
+"string"
+msgstr ""
+"rechercher les différences qui modifient le nombre d'occurrences de la "
+"chaîne spécifiée"
+
+msgid ""
+"look for differences that change the number of occurrences of the specified "
+"regex"
+msgstr ""
+"rechercher les différences qui modifient le nombre d'occurrences de la regex "
+"spécifiée"
+
+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"
+
+msgid "treat <string> in -S as extended POSIX regular expression"
+msgstr ""
+"traiter <chaîne> dans -S comme une expression rationnelle POSIX étendue"
+
+msgid "control the order in which files appear in the output"
+msgstr "contrôler l'ordre dans lequel les fichiers apparaissent dans la sortie"
+
+msgid "<path>"
+msgstr "<chemin>"
+
+msgid "show the change in the specified path first"
+msgstr "afficher la modification dans le chemin spécifié en premier"
+
+msgid "skip the output to the specified path"
+msgstr "sauter la sortie pour le chemin spécifié"
+
+msgid "<object-id>"
+msgstr "<id-objet>"
+
+msgid ""
+"look for differences that change the number of occurrences of the specified "
+"object"
+msgstr ""
+"rechercher les différences qui modifient le nombre d'occurrences de l'objet "
+"indiqué"
+
+msgid "[(A|C|D|M|R|T|U|X|B)...[*]]"
+msgstr "[(A|C|D|M|R|T|U|X|B)...[*]]"
+
+msgid "select files by diff type"
+msgstr "sélectionner les fichiers par types de diff"
+
+msgid "<file>"
+msgstr "<fichier>"
+
+msgid "output to a specific file"
+msgstr "sortie vers un fichier spécifique"
+
+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."
+
+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."
+
+#, c-format
+msgid ""
+"you may want to set your %s variable to at least %d and retry the command."
+msgstr ""
+"vous souhaitez peut-être régler la variable %s à au moins %d et réessayer le "
+"commande."
+
+#, c-format
+msgid "failed to read orderfile '%s'"
+msgstr "impossible de lire le fichier de commande '%s'"
+
+msgid "Performing inexact rename detection"
+msgstr "Détection de renommage inexact en cours"
+
+#, c-format
+msgid "No such path '%s' in the diff"
+msgstr "Pas de chemin '%s' dans la diff"
+
+#, c-format
+msgid "pathspec '%s' did not match any file(s) known to git"
+msgstr ""
+"le spécificateur de chemin '%s' ne correspond à aucun fichier connu de git"
+
+#, c-format
+msgid "unrecognized pattern: '%s'"
+msgstr "motif non reconnu : '%s'"
+
+#, c-format
+msgid "unrecognized negative pattern: '%s'"
+msgstr "motif négatif non reconnu : '%s'"
+
+#, c-format
+msgid "your sparse-checkout file may have issues: pattern '%s' is repeated"
+msgstr ""
+"votre fichier d'extraction partielle pourrait présenter des problèmes : le "
+"motif '%s' est répété"
+
+msgid "disabling cone pattern matching"
+msgstr "désactivation de la correspondance de motif de cone"
+
+#, c-format
+msgid "cannot use %s as an exclude file"
+msgstr "impossible d'utiliser %s comme fichier d'exclusion"
+
+msgid "failed to get kernel name and information"
+msgstr "echec de l'obtention d'information de kernel"
+
+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"
+
+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"
+
+#, c-format
+msgid "index file corrupt in repo %s"
+msgstr "fichier d'index corrompu dans le dépôt %s"
+
+#, c-format
+msgid "could not create directories for %s"
+msgstr "impossible de créer les répertoires pour %s"
+
+#, c-format
+msgid "could not migrate git directory from '%s' to '%s'"
+msgstr "impossible de migrer le répertoire git de '%s' vers '%s'"
+
+#, 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"
+
+msgid "Filtering content"
+msgstr "Filtrage du contenu"
+
+#, c-format
+msgid "could not stat file '%s'"
+msgstr "impossible de stat le fichier '%s'"
+
+#, c-format
+msgid "bad git namespace path \"%s\""
+msgstr "espaces de nom de Git \"%s\""
+
+#, c-format
+msgid "too many args to run %s"
+msgstr "trop d'arguments pour lancer %s"
+
+msgid "git fetch-pack: expected shallow list"
+msgstr "git fetch-pack : liste superficielle attendue"
+
+msgid "git fetch-pack: expected a flush packet after shallow list"
+msgstr ""
+"git fetch-pack : paquet de vidage attendu après une liste superficielle"
+
+msgid "git fetch-pack: expected ACK/NAK, got a flush packet"
+msgstr "git fetch-pack : ACK/NACK attendu, paquet de nettoyage reçu"
+
+#, c-format
+msgid "git fetch-pack: expected ACK/NAK, got '%s'"
+msgstr "git fetch-pack : ACK/NACK attendu, '%s' reçu"
+
+msgid "unable to write to remote"
+msgstr "impossible d'écrire sur un distant"
+
+#, c-format
+msgid "invalid shallow line: %s"
+msgstr "ligne de superficiel invalide : %s"
+
+#, c-format
+msgid "invalid unshallow line: %s"
+msgstr "ligne de fin de superficiel invalide : %s"
+
+#, c-format
+msgid "object not found: %s"
+msgstr "objet non trouvé : %s"
+
+#, c-format
+msgid "error in object: %s"
+msgstr "erreur dans l'objet : %s"
+
+#, c-format
+msgid "no shallow found: %s"
+msgstr "pas de superficiel trouvé : %s"
+
+#, c-format
+msgid "expected shallow/unshallow, got %s"
+msgstr "superficiel/non superficiel attendu, %s trouvé"
+
+#, c-format
+msgid "got %s %d %s"
+msgstr "réponse %s %d %s"
+
+#, c-format
+msgid "invalid commit %s"
+msgstr "commit invalide %s"
+
+msgid "giving up"
+msgstr "abandon"
+
+msgid "done"
+msgstr "fait"
+
+#, c-format
+msgid "got %s (%d) %s"
+msgstr "%s trouvé (%d) %s"
+
+#, c-format
+msgid "Marking %s as complete"
+msgstr "Marquage de %s comme terminé"
+
+#, c-format
+msgid "already have %s (%s)"
+msgstr "%s déjà possédé (%s)"
+
+msgid "fetch-pack: unable to fork off sideband demultiplexer"
+msgstr "fetch-pack : impossible de dupliquer le démultiplexeur latéral"
+
+msgid "protocol error: bad pack header"
+msgstr "erreur de protocole : mauvais entête de paquet"
+
+#, c-format
+msgid "fetch-pack: unable to fork off %s"
+msgstr "fetch-pack : impossible de dupliquer %s"
+
+msgid "fetch-pack: invalid index-pack output"
+msgstr "fetch-pack : sortie d'index de pack invalide"
+
+#, c-format
+msgid "%s failed"
+msgstr "échec de %s"
+
+msgid "error in sideband demultiplexer"
+msgstr "erreur dans le démultiplexer latéral"
+
+#, c-format
+msgid "Server version is %.*s"
+msgstr "La version du serveur est %.*s"
+
+#, c-format
+msgid "Server supports %s"
+msgstr "Le serveur supporte %s"
+
+msgid "Server does not support shallow clients"
+msgstr "Le serveur ne supporte les clients superficiels"
+
+msgid "Server does not support --shallow-since"
+msgstr "Le receveur ne gère pas --shallow-since"
+
+msgid "Server does not support --shallow-exclude"
+msgstr "Le receveur ne gère pas --shallow-exclude"
+
+msgid "Server does not support --deepen"
+msgstr "Le receveur ne gère pas --deepen"
+
+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"
+
+msgid "no common commits"
+msgstr "pas de commit commun"
+
+msgid "git fetch-pack: fetch failed."
+msgstr "git fetch-pack : échec de le récupération."
+
+#, c-format
+msgid "mismatched algorithms: client %s; server %s"
+msgstr "non-correspondance des algorithmes : client %s ; serveur %s"
+
+#, c-format
+msgid "the server does not support algorithm '%s'"
+msgstr "le serveur ne supporte pas l'algorithme '%s'"
+
+msgid "Server does not support shallow requests"
+msgstr "Le serveur ne supporte pas les requêtes superficielles"
+
+msgid "Server supports filter"
+msgstr "Le serveur supporte filter"
+
+msgid "unable to write request to remote"
+msgstr "impossible d'écrire la requête sur le distant"
+
+#, c-format
+msgid "expected '%s', received '%s'"
+msgstr "'%s' attendu, '%s' reçu"
+
+#, c-format
+msgid "expected '%s'"
+msgstr "'%s' attendu"
+
+#, c-format
+msgid "unexpected acknowledgment line: '%s'"
+msgstr "ligne d'acquittement inattendue : '%s'"
+
+#, c-format
+msgid "error processing acks: %d"
+msgstr "erreur lors du traitement des acquittements : %d"
+
+#. TRANSLATORS: The parameter will be 'ready', a protocol
+#. keyword.
+#.
+#, c-format
+msgid "expected packfile to be sent after '%s'"
+msgstr "fichier paquet attendu à envoyer après '%s'"
+
+#. TRANSLATORS: The parameter will be 'ready', a protocol
+#. keyword.
+#.
+#, c-format
+msgid "expected no other sections to be sent after no '%s'"
+msgstr "aucune autre section attendue à envoyer après absence de '%s'"
+
+#, c-format
+msgid "error processing shallow info: %d"
+msgstr "erreur lors du traitement de l'information de superficialité : %d"
+
+#, c-format
+msgid "expected wanted-ref, got '%s'"
+msgstr "wanted-ref attendu, '%s' trouvé"
+
+#, c-format
+msgid "unexpected wanted-ref: '%s'"
+msgstr "wanted-ref inattendu : '%s'"
+
+#, c-format
+msgid "error processing wanted refs: %d"
+msgstr "erreur lors du traitement des références voulues : %d"
+
+msgid "git fetch-pack: expected response end packet"
+msgstr "git fetch-pack : paquet de fin de réponse attendu"
+
+msgid "no matching remote head"
+msgstr "pas de HEAD distante correspondante"
+
+msgid "unexpected 'ready' from remote"
+msgstr "'ready' inattendu depuis le distant"
+
+#, c-format
+msgid "no such remote ref %s"
+msgstr "référence distante inconnue %s"
+
+#, 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é"
+
+#, c-format
+msgid "fsmonitor_ipc__send_query: invalid path '%s'"
+msgstr "fsmonitor_ipc__send_query : chemin invalide '%s'"
+
+#, c-format
+msgid "fsmonitor_ipc__send_query: unspecified error on '%s'"
+msgstr "fsmonitor_ipc__send_query : erreur non spécifiée sur '%s'"
+
+msgid "fsmonitor--daemon is not running"
+msgstr "fsmonitor--daemon n'est pas en cours d'exécution"
+
+#, c-format
+msgid "could not send '%s' command to fsmonitor--daemon"
+msgstr "impossible de lancer la commmand '%s' à fsmonitor--daemon"
+
+#, c-format
+msgid "bare repository '%s' is incompatible with fsmonitor"
+msgstr "le dépôit nu '%s' est incompatible avec fsmonitor"
+
+#, c-format
+msgid "repository '%s' is incompatible with fsmonitor due to errors"
+msgstr "le dépôt '%s' est incompatible avec fsmonitor à cause d'erreurs"
+
+#, c-format
+msgid "remote repository '%s' is incompatible with fsmonitor"
+msgstr "le dépôt distant '%s' est incompatible avec fsmonitor"
+
+#, c-format
+msgid "virtual repository '%s' is incompatible with fsmonitor"
+msgstr "le dépôt virtuel '%s' est incompatible avec fsmonitor"
+
+#, c-format
+msgid ""
+"repository '%s' is incompatible with fsmonitor due to lack of Unix sockets"
+msgstr ""
+"le dépôt '%s' est incompatible avec fsmonitor par manque de sockets Unix"
+
+msgid ""
+"git [-v | --version] [-h | --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"
+"           [--git-dir=<path>] [--work-tree=<path>] [--namespace=<name>]\n"
+"           [--super-prefix=<path>] [--config-env=<name>=<envvar>]\n"
+"           <command> [<args>]"
+msgstr ""
+"git [--version] [-h | --help] [-C <chemin>] [-c <nom>=<valeur>]\n"
+"           [--exec-path[=<chemin>]] [--html-path] [--man-path] [--info-"
+"path]\n"
+"           [-p | --paginate | -P | --no-pager] [--no-replace-objects] [--"
+"bare]\n"
+"           [--git-dir=<chemin>] [--work-tree=<chemin>] [--namespace=<nom>]\n"
+"           [--super-prefix=<chemin>] [--config-env=<nom>=<variable-d-"
+"environnement>]\n"
+"           <commande> [<args>]"
+
+msgid ""
+"'git help -a' and 'git help -g' list available subcommands and some\n"
+"concept guides. See 'git help <command>' or 'git help <concept>'\n"
+"to read about a specific subcommand or concept.\n"
+"See 'git help git' for an overview of the system."
+msgstr ""
+"'git help -a' et 'git help -g' listent les sous-commandes disponibles et\n"
+"quelques concepts. Voir 'git help <commande>' ou 'git help <concept>'\n"
+"pour en lire plus à propos d'une commande spécifique ou d'un concept.\n"
+"Voir 'git help git' pour un survol du système."
+
+#, c-format
+msgid "unsupported command listing type '%s'"
+msgstr "type de liste de commandes non supporté '%s'"
+
+#, c-format
+msgid "no directory given for '%s' option\n"
+msgstr "aucun répertoire fourni pour l'option '%s'\n"
+
+#, c-format
+msgid "no namespace given for --namespace\n"
+msgstr "aucun espace de nom fournit pour --namespace\n"
+
+#, c-format
+msgid "no prefix given for --super-prefix\n"
+msgstr "aucun préfixe fourni pour --super-prefix\n"
+
+#, c-format
+msgid "-c expects a configuration string\n"
+msgstr "-c requiert une chaîne de configuration\n"
+
+#, c-format
+msgid "no config key given for --config-env\n"
+msgstr "aucune clé de configuration fournie pour --config-env\n"
+
+#, c-format
+msgid "unknown option: %s\n"
+msgstr "option inconnue : %s\n"
+
+#, c-format
+msgid "while expanding alias '%s': '%s'"
+msgstr "lors de l'expansion de l'alias '%s' : '%s'"
+
+#, c-format
+msgid ""
+"alias '%s' changes environment variables.\n"
+"You can use '!git' in the alias to do this"
+msgstr ""
+"l'alias '%s' modifie les variables d'environnement.\n"
+"Vous pouvez utiliser '!git' dans l'alias pour le faire"
+
+#, c-format
+msgid "empty alias for %s"
+msgstr "alias vide pour %s"
+
+#, c-format
+msgid "recursive alias: %s"
+msgstr "alias recursif : %s"
+
+msgid "write failure on standard output"
+msgstr "échec d'écriture sur la sortie standard"
+
+msgid "unknown write failure on standard output"
+msgstr "échec inconnu d'écriture sur la sortie standard"
+
+msgid "close failed on standard output"
+msgstr "échec de fermeture de la sortie standard"
+
+#, 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"
+
+#, c-format
+msgid "cannot handle %s as a builtin"
+msgstr "impossible d'utiliser %s comme une fonction intégrée"
+
+#, c-format
+msgid ""
+"usage: %s\n"
+"\n"
+msgstr ""
+"usage : %s\n"
+"\n"
+
+#, 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"
+
+#, c-format
+msgid "failed to run command '%s': %s\n"
+msgstr "échec au lancement de la commande '%s' : %s\n"
+
+msgid "could not create temporary file"
+msgstr "impossible de créer un fichier temporaire"
+
+#, c-format
+msgid "failed writing detached signature to '%s'"
+msgstr "impossible d'écrire la signature détachée dans '%s'"
+
+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"
+
+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+)"
+
+#, 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"
+
+#, c-format
+msgid "bad/incompatible signature '%s'"
+msgstr "signature incompatible ou mauvaise '%s'"
+
+#, c-format
+msgid "failed to get the ssh fingerprint for key '%s'"
+msgstr "échec d'obtention de l'empreinte ssh pour la clé '%s'"
+
+msgid ""
+"either user.signingkey or gpg.ssh.defaultKeyCommand needs to be configured"
+msgstr "soit user.signingkey ou gpg.ssh.defaultKeyCommand doit être configuré"
+
+#, 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"
+
+#, c-format
+msgid "gpg.ssh.defaultKeyCommand failed: %s %s"
+msgstr "gpg.ssh.defaultKeyCommand a échoué : %s %s"
+
+msgid "gpg failed to sign the data"
+msgstr "gpg n'a pas pu signer les données"
+
+msgid "user.signingKey needs to be set for ssh signing"
+msgstr "user.signingKey doit être configuré pour signer avec ssh"
+
+#, c-format
+msgid "failed writing ssh signing key to '%s'"
+msgstr "impossible d'écrire la clé de signature ssh dans '%s'"
+
+#, 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'"
+
+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+)"
+
+#, 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'"
+
+#, c-format
+msgid "ignored invalid color '%.*s' in log.graphColors"
+msgstr "couleur invalide '%.*s' ignorée dans log.graphColors"
+
+msgid ""
+"given pattern contains NULL byte (via -f <file>). This is only supported "
+"with -P under PCRE v2"
+msgstr ""
+"le motif fourni contient des octets NUL (via -f <fichier>). Ce n'est "
+"supporté qu'avec -P avec PCRE v2"
+
+#, c-format
+msgid "'%s': unable to read %s"
+msgstr "'%s' : lecture de %s impossible"
+
+#, c-format
+msgid "'%s': short read"
+msgstr "'%s' : lecture tronquée"
+
+msgid "start a working area (see also: git help tutorial)"
+msgstr "démarrer une zone de travail (voir aussi : git help tutorial)"
+
+msgid "work on the current change (see also: git help everyday)"
+msgstr ""
+"travailler sur la modification actuelle (voir aussi : git help revisions)"
+
+msgid "examine the history and state (see also: git help revisions)"
+msgstr "examiner l'historique et l'état (voir aussi : git help revisions)"
+
+msgid "grow, mark and tweak your common history"
+msgstr "agrandir, marquer et modifier votre historique"
+
+msgid "collaborate (see also: git help workflows)"
+msgstr "collaborer (voir aussi : git help workflows)"
+
+msgid "Main Porcelain Commands"
+msgstr "Commandes Porcelaine Principales"
+
+msgid "Ancillary Commands / Manipulators"
+msgstr "Commandes Auxiliaires / Manipulateurs"
+
+msgid "Ancillary Commands / Interrogators"
+msgstr "Commandes Auxiliaires / Interrogateurs"
+
+msgid "Interacting with Others"
+msgstr "Interaction avec d'autres développeurs"
+
+msgid "Low-level Commands / Manipulators"
+msgstr "Commandes bas-niveau / Manipulateurs"
+
+msgid "Low-level Commands / Interrogators"
+msgstr "Commandes bas niveau / Interrogateurs"
+
+msgid "Low-level Commands / Syncing Repositories"
+msgstr "Commandes bas niveau / Synchronisation de dépôts"
+
+msgid "Low-level Commands / Internal Helpers"
+msgstr "Commandes bas niveau / Assistants internes"
+
+#, c-format
+msgid "available git commands in '%s'"
+msgstr "commandes git disponibles dans '%s'"
+
+msgid "git commands available from elsewhere on your $PATH"
+msgstr "commandes git disponibles depuis un autre endroit de votre $PATH"
+
+msgid "These are common Git commands used in various situations:"
+msgstr "Ci-dessous les commandes Git habituelles dans diverses situations :"
+
+msgid "The Git concept guides are:"
+msgstr "Les guides des concepts de Git sont :"
+
+msgid "External commands"
+msgstr "Commandes externes"
+
+msgid "Command aliases"
+msgstr "Alias de commande"
+
+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"
+
+#, c-format
+msgid ""
+"'%s' appears to be a git command, but we were not\n"
+"able to execute it. Maybe git-%s is broken?"
+msgstr ""
+"'%s' semble être une commande git, mais elle n'a pas pu\n"
+"être exécutée. Peut-être git-%s est-elle cassée ?"
+
+#, 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'."
+
+msgid "Uh oh. Your system reports no Git commands at all."
+msgstr "Ahem. Votre système n'indique aucune commande Git."
+
+#, 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."
+
+#, c-format
+msgid "Continuing under the assumption that you meant '%s'."
+msgstr "Continuons en supposant que vous avez voulu dire '%s'."
+
+#, c-format
+msgid "Run '%s' instead [y/N]? "
+msgstr "Lancer '%s' à la place [y/N] ? "
+
+#, 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'."
+
+msgid ""
+"\n"
+"The most similar command is"
+msgid_plural ""
+"\n"
+"The most similar commands are"
+msgstr[0] ""
+"\n"
+"La commande la plus ressemblante est"
+msgstr[1] ""
+"\n"
+"Les commandes les plus ressemblantes sont"
+
+msgid "git version [<options>]"
+msgstr "git version [<options>]"
+
+#, c-format
+msgid "%s: %s - %s"
+msgstr "%s: %s - %s"
+
+msgid ""
+"\n"
+"Did you mean this?"
+msgid_plural ""
+"\n"
+"Did you mean one of these?"
+msgstr[0] ""
+"\n"
+"Vouliez-vous dire cela ?"
+msgstr[1] ""
+"\n"
+"Vouliez-vous dire un de ceux-là ?"
+
+#, 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`."
+
+#, c-format
+msgid "Couldn't start hook '%s'\n"
+msgstr "impossible de démarrer le crochet '%s'\n"
+
+#, c-format
+msgid "argument to --packfile must be a valid hash (got '%s')"
+msgstr "l'argument de --packfile doit être une empreinte valide ('%s' reçu)"
+
+msgid "not a git repository"
+msgstr "pas un dépôt git"
+
+#, 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"
+
+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"
+
+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"
+
+msgid "CURLSSLOPT_NO_REVOKE not supported with cURL < 7.44.0"
+msgstr "CURLSSLOPT_NO_REVOKE n'est pas supporté avec cuRL < 7.44.0"
+
+#, c-format
+msgid "Unsupported SSL backend '%s'. Supported SSL backends:"
+msgstr "Dorsale SSL '%s' non supportée. Dorsales SSL supportées :"
+
+#, 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"
+
+#, 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é"
+
+#, c-format
+msgid ""
+"unable to update url base from redirection:\n"
+"  asked for: %s\n"
+"   redirect: %s"
+msgstr ""
+"impossible de mettre à jour la base de l'url depuis la redirection :\n"
+"      demandé : %s\n"
+"  redirection : %s"
+
+msgid "Author identity unknown\n"
+msgstr "Identité d'auteur inconnue\n"
+
+msgid "Committer identity unknown\n"
+msgstr "Indentité de validateur inconnue\n"
+
+msgid ""
+"\n"
+"*** Please tell me who you are.\n"
+"\n"
+"Run\n"
+"\n"
+"  git config --global user.email \"you@example.com\"\n"
+"  git config --global user.name \"Your Name\"\n"
+"\n"
+"to set your account's default identity.\n"
+"Omit --global to set the identity only in this repository.\n"
+"\n"
+msgstr ""
+"\n"
+"*** Veuillez me dire qui vous êtes.\n"
+"\n"
+"Lancez\n"
+"\n"
+"  git config --global user.email \"Vous@exemple.com\"\n"
+"  git config --global user.name \"Votre Nom\"\n"
+"\n"
+"pour régler l'identité par défaut de votre compte.\n"
+"Éliminez --global pour ne faire les réglages que dans ce dépôt.\n"
+"\n"
+
+msgid "no email was given and auto-detection is disabled"
+msgstr "aucun courriel fourni et l'auto-détection est désactivée"
+
+#, c-format
+msgid "unable to auto-detect email address (got '%s')"
+msgstr "impossible de détecter automatiquement l'adresse ('%s' trouvé)"
+
+msgid "no name was given and auto-detection is disabled"
+msgstr "aucun nom fourni et l'auto-détection est désactivée"
+
+#, c-format
+msgid "unable to auto-detect name (got '%s')"
+msgstr "impossible de détecter automatiquement le nom ('%s' trouvé)"
+
+#, c-format
+msgid "empty ident name (for <%s>) not allowed"
+msgstr "nom d'identifiant vide (pour <%s>) non permis"
+
+#, c-format
+msgid "name consists only of disallowed characters: %s"
+msgstr "le nom n'est constitué que de caractères interdits : %s"
+
+msgid "expected 'tree:<depth>'"
+msgstr "attendu : 'tree:<profondeur>'"
+
+msgid "sparse:path filters support has been dropped"
+msgstr "sparse : le support des filtres de chemin a été abandonné"
+
+#, c-format
+msgid "'%s' for 'object:type=<type>' is not a valid object type"
+msgstr "'%s' pour 'object:type=<type>' n'est pas un type d'objet valide"
+
+#, c-format
+msgid "invalid filter-spec '%s'"
+msgstr "spécificateur de filtre invalide '%s'"
+
+#, c-format
+msgid "must escape char in sub-filter-spec: '%c'"
+msgstr ""
+"le caractère doit être échappé dans le spécificateur de sous-filtre : '%c'"
+
+msgid "expected something after combine:"
+msgstr "quelque chose attendu après combine :"
+
+msgid "multiple filter-specs cannot be combined"
+msgstr "impossible de combiner des spécificateurs multiples de filtre"
+
+msgid "unable to upgrade repository format to support partial clone"
+msgstr ""
+"impossible de mettre à jour le format de dépôt pour supporter les clones "
+"partiels"
+
+msgid "args"
+msgstr "args"
+
+msgid "object filtering"
+msgstr "filtrage d'objet"
+
+#, c-format
+msgid "unable to access sparse blob in '%s'"
+msgstr "impossible d'accéder au blob clairsemé dans '%s'"
+
+#, c-format
+msgid "unable to parse sparse filter data in %s"
+msgstr "impossible d'analyser la donnée de filtre clairsemé dans %s"
+
+#, c-format
+msgid "entry '%s' in tree %s has tree mode, but is not a tree"
+msgstr ""
+"l'entrée '%s' dans l'arbre %s a un mode d'arbre, mais n'est pas un arbre"
+
+#, c-format
+msgid "entry '%s' in tree %s has blob mode, but is not a blob"
+msgstr ""
+"l'entrée '%s' dans l'arbre %s a un mode de blob, mais n'est pas un blob"
+
+#, c-format
+msgid "unable to load root tree for commit %s"
+msgstr "impossible de charger l'arbre racine pour le commit %s"
+
+#, c-format
+msgid ""
+"Unable to create '%s.lock': %s.\n"
+"\n"
+"Another git process seems to be running in this repository, e.g.\n"
+"an editor opened by 'git commit'. Please make sure all processes\n"
+"are terminated then try again. If it still fails, a git process\n"
+"may have crashed in this repository earlier:\n"
+"remove the file manually to continue."
+msgstr ""
+"Impossible de créer '%s.lock' : %s.\n"
+"\n"
+"Il semble qu'un autre processus git est déjà lancé dans ce dépôt,\n"
+"par exemple un éditeur ouvert par 'git commit'. Veuillez vous assurer\n"
+"que tous les processus sont terminés et réessayez. Si l'échec persiste,\n"
+"un processus git peut avoir planté :\n"
+"supprimez le fichier manuellement pour poursuivre."
+
+#, c-format
+msgid "Unable to create '%s.lock': %s"
+msgstr "Impossible de créer '%s.lock' : %s"
+
+#, c-format
+msgid "unexpected line: '%s'"
+msgstr "ligne inattendue : '%s'"
+
+msgid "expected flush after ls-refs arguments"
+msgstr "vidage attendu après les arguments ls-refs"
+
+msgid "quoted CRLF detected"
+msgstr "CRLF citées détectées"
+
+#, c-format
+msgid ""
+"Your local changes to the following files would be overwritten by merge:\n"
+"  %s"
+msgstr ""
+"Vos modifications locales aux fichiers suivants seraient écrasées par la "
+"fusion :\n"
+"  %s"
+
+#, c-format
+msgid "Failed to merge submodule %s (not checked out)"
+msgstr "Échec de la fusion du sous-module %s (non extrait)"
+
+#, c-format
+msgid "Failed to merge submodule %s (commits not present)"
+msgstr "Échec de fusion du sous-module %s (commits non présents)"
+
+#, 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)"
+
+#, c-format
+msgid "Note: Fast-forwarding submodule %s to %s"
+msgstr "Note : Avance rapide du sous-module %s à %s"
+
+#, c-format
+msgid "Failed to merge submodule %s"
+msgstr "Échec de la fusion du sous-module %s"
+
+#, c-format
+msgid ""
+"Failed to merge submodule %s, but a possible merge resolution exists:\n"
+"%s\n"
+msgstr ""
+"Échec de fusion du sous-module %s mais une résolution possible de fusion "
+"existe :\n"
+"%s\n"
+
+#, c-format
+msgid ""
+"If this is correct simply add it to the index for example\n"
+"by using:\n"
+"\n"
+"  git update-index --cacheinfo 160000 %s \"%s\"\n"
+"\n"
+"which will accept this suggestion.\n"
+msgstr ""
+"Si c'est correct, ajoutez le simplement à l'index\n"
+"en utilisant par exemple :\n"
+"\n"
+"  git update-index --cacheinfo 160000 %s \"%s\"\n"
+"\n"
+"qui acceptera cette suggestion.\n"
+
+#, c-format
+msgid ""
+"Failed to merge submodule %s, but multiple possible merges exist:\n"
+"%s"
+msgstr ""
+"Échec de fusion du sous-module %s mais de multiples solutions de fusion "
+"existent :\n"
+"%s"
+
+msgid "Failed to execute internal merge"
+msgstr "Échec à l'exécution de la fusion interne"
+
+#, c-format
+msgid "Unable to add %s to database"
+msgstr "Impossible d'ajouter %s à la base de données"
+
+#, c-format
+msgid "Auto-merging %s"
+msgstr "Fusion automatique de %s"
+
+#, 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 ""
+"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."
+
+#, 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 ""
+"CONFLIT (renommage implicite de répertoire) : impossible de transformer "
+"plusieurs chemins sur %s ; les chemins concernés sont : %s"
+
+#, c-format
+msgid ""
+"CONFLICT (directory rename split): Unclear where to rename %s to; it was "
+"renamed to multiple other directories, with no destination getting a "
+"majority of the files."
+msgstr ""
+"CONFLIT (renommage de répertoire coupé) : le renommage de %s n'est pas clair "
+"parce que le répertoire a été renommé en plusieurs autres répertoires, sans "
+"aucune destination récupérant la majorité des fichiers."
+
+#, c-format
+msgid ""
+"WARNING: Avoiding applying %s -> %s rename to %s, because %s itself was "
+"renamed."
+msgstr ""
+"AVERTISSEMENT : ne renomme pas %s->%s dans %s, parce que %s lui-même a été "
+"renommé."
+
+#, c-format
+msgid ""
+"Path updated: %s added in %s inside a directory that was renamed in %s; "
+"moving it to %s."
+msgstr ""
+"Chemin mis à jour : %s ajouté dans %s dans un répertoire qui a été renommé "
+"en %s ; déplacé dans %s."
+
+#, c-format
+msgid ""
+"Path updated: %s renamed to %s in %s, inside a directory that was renamed in "
+"%s; moving it to %s."
+msgstr ""
+"Chemin mis à jour : %s renommé en %s dans %s, dans un répertoire qui a été "
+"renommé en %s ; déplacé dans %s."
+
+#, 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 ""
+"CONFLIT (localisation de fichier) : %s ajouté dans %s dans un répertoire qui "
+"a été renommé dans %s, ce qui suggère qu'il devrait peut-être être déplacé "
+"vers %s."
+
+#, 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 ""
+"CONFLIT (localisation de fichier) : %s renommé en %s dans %s, dans un "
+"répertoire qui a été renommé dans %s, ce qui suggère qu'il devrait peut-être "
+"être déplacé vers %s."
+
+#, 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."
+
+#, 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."
+msgstr ""
+"CONFLIT (renommage au sein d'une collision) : lre renommage de %s -> %s a "
+"des conflits de contenu ET entre en collision avec un autre chemin ; ceci "
+"peut resulter en des marqueurs de conflit imbriqués."
+
+#, 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."
+
+#, c-format
+msgid "cannot read object %s"
+msgstr "impossible de lire l'objet %s"
+
+#, c-format
+msgid "object %s is not a blob"
+msgstr "l'objet %s n'est pas un blob"
+
+#, c-format
+msgid ""
+"CONFLICT (file/directory): directory in the way of %s from %s; moving it to "
+"%s instead."
+msgstr ""
+"CONFLIT (fichier/répertoire) : répertoire au milieu de %s depuis %s ; "
+"déplacement dans %s à la place."
+
+#, c-format
+msgid ""
+"CONFLICT (distinct types): %s had different types on each side; renamed both "
+"of them so each can be recorded somewhere."
+msgstr ""
+"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."
+
+#, c-format
+msgid ""
+"CONFLICT (distinct types): %s had different types on each side; renamed one "
+"of them so each can be recorded somewhere."
+msgstr ""
+"CONFLIT (types différents) : %s a des types différents des deux côtés ; "
+"renommé une d'entre elles de manière à pouvoir enregistrer les deux quelque "
+"part."
+
+msgid "content"
+msgstr "contenu"
+
+msgid "add/add"
+msgstr "ajout/ajout"
+
+msgid "submodule"
+msgstr "sous-module"
+
+#, c-format
+msgid "CONFLICT (%s): Merge conflict in %s"
+msgstr "CONFLIT (%s) : Conflit de fusion dans %s"
+
+#, c-format
+msgid ""
+"CONFLICT (modify/delete): %s deleted in %s and modified in %s.  Version %s "
+"of %s left in tree."
+msgstr ""
+"CONFLIT (modification/suppression) : %s supprimé dans %s et modifié dans %s. "
+"Version %s de %s laissée dans l'arbre."
+
+#, c-format
+msgid ""
+"Note: %s not up to date and in way of checking out conflicted version; old "
+"copy renamed to %s"
+msgstr ""
+"Note :%s pas à jour et au milieu de l'extraction d'une version "
+"conflictuelle ; la vielle copie a été renommée en %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.
+#.
+#, 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"
+
+msgid "(bad commit)\n"
+msgstr "(mauvais commit)\n"
+
+#, c-format
+msgid "add_cacheinfo failed for path '%s'; merge aborting."
+msgstr "échec de add_cacheinfo pour le chemin '%s' ; abandon de la fusion."
+
+#, 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."
+
+#, c-format
+msgid "failed to create path '%s'%s"
+msgstr "impossible de créer le chemin '%s' %s"
+
+#, 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"
+
+msgid ": perhaps a D/F conflict?"
+msgstr ": peut-être un conflit D/F ?"
+
+#, c-format
+msgid "refusing to lose untracked file at '%s'"
+msgstr "refus de perdre le fichier non suivi '%s'"
+
+#, c-format
+msgid "blob expected for %s '%s'"
+msgstr "blob attendu pour %s '%s'"
+
+#, c-format
+msgid "failed to open '%s': %s"
+msgstr "échec à l'ouverture de '%s' : %s"
+
+#, c-format
+msgid "failed to symlink '%s': %s"
+msgstr "échec à la création du lien symbolique '%s' : %s"
+
+#, c-format
+msgid "do not know what to do with %06o %s '%s'"
+msgstr "ne sait pas traiter %06o %s '%s'"
+
+#, c-format
+msgid "Fast-forwarding submodule %s to the following commit:"
+msgstr "Avance rapide du sous-module %s au commit suivant :"
+
+#, c-format
+msgid "Fast-forwarding submodule %s"
+msgstr "Avance rapide du sous-module %s"
+
+#, 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)"
+
+#, c-format
+msgid "Failed to merge submodule %s (not fast-forward)"
+msgstr "Échec de fusion du sous-module %s (pas en avance rapide)"
+
+msgid "Found a possible merge resolution for the submodule:\n"
+msgstr "Résolution possible de fusion trouvée pour le sous-module :\n"
+
+#, c-format
+msgid "Failed to merge submodule %s (multiple merges found)"
+msgstr "Échec de fusion du sous-module %s (plusieurs fusions trouvées)"
+
+#, 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."
+
+#, c-format
+msgid ""
+"CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s left "
+"in tree."
+msgstr ""
+"CONFLIT (%s/suppression) : %s supprimé dans %s et %s dans %s. Version %s de "
+"%s laissée dans l'arbre."
+
+#, c-format
+msgid ""
+"CONFLICT (%s/delete): %s deleted in %s and %s to %s in %s. Version %s of %s "
+"left in tree."
+msgstr ""
+"CONFLIT (%s/suppression) : %s supprimé dans %s et %s à %s dans %s. Version "
+"%s de %s laissée dans l'arbre."
+
+#, c-format
+msgid ""
+"CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s left "
+"in tree at %s."
+msgstr ""
+"CONFLIT (%s/suppression) : %s supprimé dans %s et %s dans %s. Version %s de "
+"%s laissée dans l'arbre dans le fichier %s."
+
+#, 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 ""
+"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."
+
+msgid "rename"
+msgstr "renommage"
+
+msgid "renamed"
+msgstr "renommé"
+
+#, c-format
+msgid "Refusing to lose dirty file at %s"
+msgstr "Refus de perdre le fichier modifié %s"
+
+#, 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."
+
+#, 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"
+
+#, 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"
+
+#, 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"
+
+#, c-format
+msgid ""
+"CONFLICT (rename/rename): Rename \"%s\"->\"%s\" in branch \"%s\" rename "
+"\"%s\"->\"%s\" in \"%s\"%s"
+msgstr ""
+"CONFLIT (renommage/renommage) : Renommage de \"%s\"->\"%s\" dans la branche "
+"\"%s\" et renommage \"%s\"->\"%s\" dans \"%s\"%s"
+
+msgid " (left unresolved)"
+msgstr " (laissé non résolu)"
+
+#, 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"
+
+#, c-format
+msgid ""
+"CONFLICT (directory rename split): Unclear where to place %s because "
+"directory %s was renamed to multiple other directories, with no destination "
+"getting a majority of the files."
+msgstr ""
+"CONFLIT (renommage de répertoire coupé) : la place de %s n'est pas claire "
+"parce que le répertoire %s a été renommé en plusieurs autres répertoires, "
+"sans aucune destination récupérant la majorité des fichiers."
+
+#, c-format
+msgid ""
+"CONFLICT (rename/rename): Rename directory %s->%s in %s. Rename directory %s-"
+">%s in %s"
+msgstr ""
+"CONFLIT (renommage/renommage) : renommage du répertoire %s->%s dans %s. "
+"Renommage de répertoire %s->%s dans %s"
+
+msgid "modify"
+msgstr "modification"
+
+msgid "modified"
+msgstr "modifié"
+
+#, c-format
+msgid "Skipped %s (merged same as existing)"
+msgstr "%s sauté (fusion identique à l'existant)"
+
+#, c-format
+msgid "Adding as %s instead"
+msgstr "Ajout plutôt comme %s"
+
+#, c-format
+msgid "Removing %s"
+msgstr "Suppression de %s"
+
+msgid "file/directory"
+msgstr "fichier/répertoire"
+
+msgid "directory/file"
+msgstr "répertoire/fichier"
+
+#, 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"
+
+#, c-format
+msgid "Adding %s"
+msgstr "Ajout de %s"
+
+#, c-format
+msgid "CONFLICT (add/add): Merge conflict in %s"
+msgstr "CONFLIT (ajout/ajout) : Conflit de fusion dans %s"
+
+#, c-format
+msgid "merging of trees %s and %s failed"
+msgstr "échec de fusion des arbres %s et %s"
+
+msgid "Merging:"
+msgstr "Fusion :"
+
+#, 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 :"
+
+msgid "merge returned no commit"
+msgstr "la fusion n'a pas retourné de commit"
+
+#, c-format
+msgid "Could not parse object '%s'"
+msgstr "Impossible d'analyser l'objet '%s'"
+
+msgid "failed to read the cache"
+msgstr "impossible de lire le cache"
+
+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"
+
+#, c-format
+msgid "multi-pack-index file %s is too small"
+msgstr "le fichier d'index multi-paquet %s est trop petit"
+
+#, 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"
+
+#, c-format
+msgid "multi-pack-index version %d not recognized"
+msgstr "la version d'index multi-paquet %d n'est pas reconnue"
+
+#, 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"
+
+msgid "multi-pack-index missing required pack-name chunk"
+msgstr "index multi-paquet manque de tronçon de nom de paquet"
+
+msgid "multi-pack-index missing required OID fanout chunk"
+msgstr "index multi-paquet manque de tronçon de d'étalement OID requis"
+
+msgid "multi-pack-index missing required OID lookup chunk"
+msgstr "index multi-paquet manque de tronçon de recherche OID requis"
+
+msgid "multi-pack-index missing required object offsets chunk"
+msgstr "index multi-paquet manque de tronçon de décalage d'objet requis"
+
+#, 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'"
+
+#, c-format
+msgid "bad pack-int-id: %u (%u total packs)"
+msgstr "mauvais pack-int-id : %u (%u paquets au total)"
+
+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"
+
+#, c-format
+msgid "failed to add packfile '%s'"
+msgstr "échec de l'ajout du fichier paquet '%s'"
+
+#, c-format
+msgid "failed to open pack-index '%s'"
+msgstr "échec à l'ouverture du fichier paquet '%s'"
+
+#, c-format
+msgid "failed to locate object %d in packfile"
+msgstr "échec de localisation de l'objet %d dans le fichier paquet"
+
+msgid "cannot store reverse index file"
+msgstr "impossible de stocker le fichier d'index inversé"
+
+#, c-format
+msgid "could not parse line: %s"
+msgstr "impossible d'analyser la ligne : %s"
+
+#, c-format
+msgid "malformed line: %s"
+msgstr "ligne malformée : %s"
+
+msgid "ignoring existing multi-pack-index; checksum mismatch"
+msgstr ""
+"index multi-paquet existant ignoré ; non-concordance de la somme de contrôle"
+
+msgid "could not load pack"
+msgstr "impossible de charger le paquet"
+
+#, c-format
+msgid "could not open index for %s"
+msgstr "impossible d'ouvrir l'index pour %s"
+
+msgid "Adding packfiles to multi-pack-index"
+msgstr "Ajout de fichiers paquet à un index multi-paquet"
+
+#, c-format
+msgid "unknown preferred pack: '%s'"
+msgstr "paquet préféré inconnu : %s"
+
+#, 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"
+
+#, c-format
+msgid "did not see pack-file %s to drop"
+msgstr "fichier paquet à éliminer %s non trouvé"
+
+#, c-format
+msgid "preferred pack '%s' is expired"
+msgstr "le paquet préféré '%s' est expiré"
+
+msgid "no pack files to index."
+msgstr "aucun fichier paquet à l'index."
+
+msgid "refusing to write multi-pack .bitmap without any objects"
+msgstr "refus d'écrire le .bitmap multi-paquet sans aucun objet"
+
+msgid "could not write multi-pack bitmap"
+msgstr "impossible d'écrire le bitmap multi-paquet"
+
+msgid "could not write multi-pack-index"
+msgstr "échec de l'écriture de l'index de multi-paquet"
+
+#, c-format
+msgid "failed to clear multi-pack-index at %s"
+msgstr "échec du nettoyage de l'index de multi-paquet à %s"
+
+msgid "multi-pack-index file exists, but failed to parse"
+msgstr "le fichier d'index multi-paquet existe mais n'a pu être analysé"
+
+msgid "incorrect checksum"
+msgstr "somme de contrôle incorrecte"
+
+msgid "Looking for referenced packfiles"
+msgstr "Recherche de fichiers paquets référencés"
+
+#, c-format
+msgid ""
+"oid fanout out of order: fanout[%d] = %<PRIx32> > %<PRIx32> = fanout[%d]"
+msgstr ""
+"étalement oid en désordre : étalement[%d] = %<PRIx32> > %<PRIx32> = "
+"étalement[%d]"
+
+msgid "the midx contains no oid"
+msgstr "le midx ne contient aucun oid"
+
+msgid "Verifying OID order in multi-pack-index"
+msgstr "Vérification de l'ordre des OID dans l'index multi-paquet"
+
+#, 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]"
+
+msgid "Sorting objects by packfile"
+msgstr "Classement des objets par fichier paquet"
+
+msgid "Verifying object offsets"
+msgstr "Vérification des décalages des objets"
+
+#, 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"
+
+#, c-format
+msgid "failed to load pack-index for packfile %s"
+msgstr "impossible de lire le fichier paquet %s"
+
+#, c-format
+msgid "incorrect object offset for oid[%d] = %s: %<PRIx64> != %<PRIx64>"
+msgstr "décalage d'objet incorrect pour oid[%d] = %s : %<PRIx64> != %<PRIx64>"
+
+msgid "Counting referenced objects"
+msgstr "Comptage des objets référencés"
+
+msgid "Finding and deleting unreferenced packfiles"
+msgstr "Recherche et effacement des fichiers paquets non-référencés"
+
+msgid "could not start pack-objects"
+msgstr "impossible de démarrer le groupement d'objets"
+
+msgid "could not finish pack-objects"
+msgstr "impossible de finir le groupement d'objets"
+
+#, c-format
+msgid "unable to create lazy_dir thread: %s"
+msgstr "impossible de créer le fil lazy_dir : %s"
+
+#, c-format
+msgid "unable to create lazy_name thread: %s"
+msgstr "impossible de créer le fil lazy_name : %s"
+
+#, c-format
+msgid "unable to join lazy_name thread: %s"
+msgstr "impossible de joindre le fil lazy_name : %s"
+
+#, 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."
+msgstr ""
+"Vous n'avez pas terminé votre précédente fusion de notes (%s existe).\n"
+"Veuillez utiliser 'git notes merge --commit' ou 'git notes merge --abort' "
+"pour valider/abandonner la fusion en cours avant d'en démarrer une nouvelle."
+
+#, c-format
+msgid "You have not concluded your notes merge (%s exists)."
+msgstr "Vous n'avez pas terminé votre fusion de notes (%s existe)."
+
+msgid "Cannot commit uninitialized/unreferenced notes tree"
+msgstr "Impossible de valider un arbre de notes non initialisé/référencé"
+
+#, c-format
+msgid "Bad notes.rewriteMode value: '%s'"
+msgstr "Mauvaise valeur de notes.rewriteMode : '%s'"
+
+#, c-format
+msgid "Refusing to rewrite notes in %s (outside of refs/notes/)"
+msgstr "Refus de réécrire des notes dans %s (hors de refs/notes/)"
+
+#. TRANSLATORS: The first %s is the name of
+#. the environment variable, the second %s is
+#. its value.
+#.
+#, c-format
+msgid "Bad %s value: '%s'"
+msgstr "Mauvaise valeur de %s : '%s'"
+
+#, 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"
+
+#, c-format
+msgid "unable to normalize alternate object path: %s"
+msgstr "impossible de normaliser le chemin d'objet alternatif : %s"
+
+#, c-format
+msgid "%s: ignoring alternate object stores, nesting too deep"
+msgstr "%s : magasins d'objets alternatifs ignorés, récursion trop profonde"
+
+#, c-format
+msgid "unable to normalize object directory: %s"
+msgstr "impossible de normaliser le répertoire d'objet : %s"
+
+msgid "unable to fdopen alternates lockfile"
+msgstr "impossible d'ouvrir (fdopen) le fichier verrou des alternatives"
+
+msgid "unable to read alternates file"
+msgstr "lecture du fichier d'alternatives impossible"
+
+msgid "unable to move new alternates file into place"
+msgstr "impossible de déplacer le nouveau fichier d'alternative"
+
+#, c-format
+msgid "path '%s' does not exist"
+msgstr "le chemin '%s' n'existe pas"
+
+#, 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é."
+
+#, 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."
+
+#, c-format
+msgid "reference repository '%s' is shallow"
+msgstr "le dépôt de référence '%s' est superficiel"
+
+#, c-format
+msgid "reference repository '%s' is grafted"
+msgstr "le dépôt de référence '%s' est greffé"
+
+#, c-format
+msgid "could not find object directory matching %s"
+msgstr "impossible de trouver le répertoire objet correspondant à %s"
+
+#, c-format
+msgid "invalid line while parsing alternate refs: %s"
+msgstr "ligne invalide pendant l'analyse des refs alternatives : %s"
+
+#, c-format
+msgid "attempting to mmap %<PRIuMAX> over limit %<PRIuMAX>"
+msgstr "essai de mmap %<PRIuMAX> au delà de la limite %<PRIuMAX>"
+
+#, c-format
+msgid "mmap failed%s"
+msgstr "échec de mmap%s"
+
+#, c-format
+msgid "object file %s is empty"
+msgstr "le fichier objet %s est vide"
+
+#, c-format
+msgid "corrupt loose object '%s'"
+msgstr "objet libre corrompu '%s'"
+
+#, c-format
+msgid "garbage at end of loose object '%s'"
+msgstr "données incorrectes à la fin de l'objet libre '%s'"
+
+#, c-format
+msgid "unable to parse %s header"
+msgstr "impossible d'analyser l'entête %s"
+
+msgid "invalid object type"
+msgstr "type d'objet invalide"
+
+#, c-format
+msgid "unable to unpack %s header"
+msgstr "impossible de dépaqueter l'entête %s"
+
+#, c-format
+msgid "header for %s too long, exceeds %d bytes"
+msgstr "entête de %s trop long, attendu %d octets"
+
+#, c-format
+msgid "failed to read object %s"
+msgstr "impossible de lire l'objet %s"
+
+#, c-format
+msgid "replacement %s not found for %s"
+msgstr "remplacement %s non trouvé pour %s"
+
+#, c-format
+msgid "loose object %s (stored in %s) is corrupt"
+msgstr "l'objet libre %s (stocké dans %s) est corrompu"
+
+#, c-format
+msgid "packed object %s (stored in %s) is corrupt"
+msgstr "l'objet empaqueté %s (stocké dans %s) est corrompu"
+
+#, c-format
+msgid "unable to write file %s"
+msgstr "impossible d'écrire le fichier %s"
+
+#, c-format
+msgid "unable to set permission to '%s'"
+msgstr "impossible de régler les droits de '%s'"
+
+msgid "file write error"
+msgstr "erreur d'écriture d'un fichier"
+
+msgid "error when closing loose object file"
+msgstr "erreur en fermeture du fichier d'objet esseulé"
+
+#, 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"
+
+msgid "unable to create temporary file"
+msgstr "impossible de créer un fichier temporaire"
+
+msgid "unable to write loose object file"
+msgstr "impossible d'écrire le fichier d'objet esseulé"
+
+#, c-format
+msgid "unable to deflate new object %s (%d)"
+msgstr "impossible de compresser le nouvel objet %s (%d)"
+
+#, c-format
+msgid "deflateEnd on object %s failed (%d)"
+msgstr "échec de deflateEnd sur l'objet %s (%d)"
+
+#, c-format
+msgid "confused by unstable object source data for %s"
+msgstr "données de source d'objet instable pour %s"
+
+#, c-format
+msgid "cannot read object for %s"
+msgstr "impossible de lire l'objet pour %s"
+
+msgid "corrupt commit"
+msgstr "commit corrompu"
+
+msgid "corrupt tag"
+msgstr "étiquette corrompue"
+
+#, c-format
+msgid "read error while indexing %s"
+msgstr "erreur de lecture à l'indexation de %s"
+
+#, c-format
+msgid "short read while indexing %s"
+msgstr "lecture tronquée pendant l'indexation de %s"
+
+#, c-format
+msgid "%s: failed to insert into database"
+msgstr "%s : échec de l'insertion dans la base de données"
+
+#, c-format
+msgid "%s: unsupported file type"
+msgstr "%s : type de fichier non supporté"
+
+#, c-format
+msgid "%s is not a valid '%s' object"
+msgstr "%s n'est pas un objet '%s' valide"
+
+#, c-format
+msgid "unable to open %s"
+msgstr "impossible d'ouvrir %s"
+
+#, c-format
+msgid "hash mismatch for %s (expected %s)"
+msgstr "incohérence de hachage pour %s (%s attendu)"
+
+#, c-format
+msgid "unable to mmap %s"
+msgstr "impossible de mmap %s"
+
+#, c-format
+msgid "unable to unpack header of %s"
+msgstr "impossible de dépaqueter l'entête de %s"
+
+#, c-format
+msgid "unable to parse header of %s"
+msgstr "impossible d'analyser l'entête de %s"
+
+#, c-format
+msgid "unable to unpack contents of %s"
+msgstr "impossible de dépaqueter le contenu de %s"
+
+#. TRANSLATORS: This is a line of ambiguous object
+#. output shown when we cannot look up or parse the
+#. object in question. E.g. "deadbeef [bad object]".
+#.
+#, c-format
+msgid "%s [bad object]"
+msgstr "%s [mauvais objet]"
+
+#. TRANSLATORS: This is a line of ambiguous commit
+#. object output. E.g.:
+#. *
+#.    "deadbeef commit 2021-01-01 - Some Commit Message"
+#.
+#, c-format
+msgid "%s commit %s - %s"
+msgstr "%s commit %s - %s"
+
+#. TRANSLATORS: This is a line of ambiguous
+#. tag object output. E.g.:
+#. *
+#.    "deadbeef tag 2022-01-01 - Some Tag Message"
+#. *
+#. The second argument is the YYYY-MM-DD found
+#. in the tag.
+#. *
+#. The third argument is the "tag" string
+#. from object.c.
+#.
+#, c-format
+msgid "%s tag %s - %s"
+msgstr "%s étiquette %s - %s"
+
+#. TRANSLATORS: This is a line of ambiguous
+#. tag object output where we couldn't parse
+#. the tag itself. E.g.:
+#. *
+#.    "deadbeef [bad tag, could not parse it]"
+#.
+#, c-format
+msgid "%s [bad tag, could not parse it]"
+msgstr "%s [mauvaise étiquette, impossible à analyser]"
+
+#. TRANSLATORS: This is a line of ambiguous <type>
+#. object output. E.g. "deadbeef tree".
+#.
+#, c-format
+msgid "%s tree"
+msgstr "arbre %s"
+
+#. TRANSLATORS: This is a line of ambiguous <type>
+#. object output. E.g. "deadbeef blob".
+#.
+#, c-format
+msgid "%s blob"
+msgstr "blob %s"
+
+#, c-format
+msgid "short object ID %s is ambiguous"
+msgstr "l'id court d'objet %s est ambigu"
+
+#. TRANSLATORS: The argument is the list of ambiguous
+#. objects composed in show_ambiguous_object(). See
+#. its "TRANSLATORS" comments for details.
+#.
+#, c-format
+msgid ""
+"The candidates are:\n"
+"%s"
+msgstr ""
+"Les candidats sont :\n"
+"%s"
+
+msgid ""
+"Git normally never creates a ref that ends with 40 hex characters\n"
+"because it will be ignored when you just specify 40-hex. These refs\n"
+"may be created by mistake. For example,\n"
+"\n"
+"  git switch -c $br $(git rev-parse ...)\n"
+"\n"
+"where \"$br\" is somehow empty and a 40-hex ref is created. Please\n"
+"examine these refs and maybe delete them. Turn this message off by\n"
+"running \"git config advice.objectNameWarning false\""
+msgstr ""
+"Git ne crée normalement jamais de référence qui se termine par 40\n"
+"caractères hexa car elle serait ignorée si vous spécifiez juste\n"
+"40-hexa. Ces références peuvent être créées par erreur. Par exemple,\n"
+"\n"
+"  git switch -c $br $(git rev-parse ...)\n"
+"\n"
+"où \"$br\" est d'une manière ou d'une autre vide et une référence 40-hexa "
+"est créée.\n"
+"Veuillez examiner ces références et peut-être les supprimer. Désactivez ce "
+"message\n"
+"en lançant \"git config advice.objectNameWarning false\""
+
+#, c-format
+msgid "log for '%.*s' only goes back to %s"
+msgstr "le journal de '%.*s' ne remonte qu'à %s"
+
+#, c-format
+msgid "log for '%.*s' only has %d entries"
+msgstr "le journal de '%.*s' n'a que %d entrées"
+
+#, c-format
+msgid "path '%s' exists on disk, but not in '%.*s'"
+msgstr "le chemin '%s' existe sur le disque, mais pas dans '%.*s'"
+
+#, c-format
+msgid ""
+"path '%s' exists, but not '%s'\n"
+"hint: Did you mean '%.*s:%s' aka '%.*s:./%s'?"
+msgstr ""
+"le chemin '%s' existe, mais pas '%s'\n"
+"conseil : peut-être vouliez-vous dire '%.*s:%s', soit '%.*s:./%s' ?"
+
+#, c-format
+msgid "path '%s' does not exist in '%.*s'"
+msgstr "le chemin '%s' n'existe pas dans '%.*s'"
+
+#, c-format
+msgid ""
+"path '%s' is in the index, but not at stage %d\n"
+"hint: Did you mean ':%d:%s'?"
+msgstr ""
+"le chemin '%s' est dans l'index, mais pas à l'étape %d\n"
+"conseil : vous vouliez peut-être dire ':%d:%s' ?"
+
+#, c-format
+msgid ""
+"path '%s' is in the index, but not '%s'\n"
+"hint: Did you mean ':%d:%s' aka ':%d:./%s'?"
+msgstr ""
+"le chemin '%s' est dans l'index, mais pas '%s'\n"
+"conseil : peut-être vouliez-vous dire ':%d:%s', soit '%d:./%s' ?"
+
+#, c-format
+msgid "path '%s' exists on disk, but not in the index"
+msgstr "le chemin '%s' existe sur le disque, mais pas dans l'index"
+
+#, c-format
+msgid "path '%s' does not exist (neither on disk nor in the index)"
+msgstr "le chemin '%s' n'existe pas (ni sur le disque, ni dans l'index)"
+
+msgid "relative path syntax can't be used outside working tree"
+msgstr ""
+"la syntaxe de chemin relatif ne peut pas être utilisée hors de l'arbre de "
+"travail"
+
+#, c-format
+msgid "<object>:<path> required, only <object> '%s' given"
+msgstr "<objet>:<chemin> nécessaire, seul <objet> '%s' a été fourni"
+
+#, c-format
+msgid "invalid object name '%.*s'."
+msgstr "nom d'objet invalide : '%.*s'."
+
+#, c-format
+msgid "invalid object type \"%s\""
+msgstr "type d'objet invalide \"%s\""
+
+#, c-format
+msgid "object %s is a %s, not a %s"
+msgstr "l'objet %s est de type %s, pas de type %s"
+
+#, c-format
+msgid "object %s has unknown type id %d"
+msgstr "l'objet %s a un id de type inconnu %d"
+
+#, c-format
+msgid "unable to parse object: %s"
+msgstr "impossible d'analyser l'objet : %s"
+
+#, c-format
+msgid "hash mismatch %s"
+msgstr "incohérence de hachage %s"
+
+msgid "multi-pack bitmap is missing required reverse index"
+msgstr "l'index inverse requis manque dans l'index multi-paquet"
+
+#, c-format
+msgid "could not open pack %s"
+msgstr "impossible d'ouvrir le paquet '%s'"
+
+#, c-format
+msgid "preferred pack (%s) is invalid"
+msgstr "le paquet préféré (%s) est invalide"
+
+#, 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>"
+
+#, c-format
+msgid "mtimes file %s is too small"
+msgstr "le fichier de mtimes %s est trop petit"
+
+#, c-format
+msgid "mtimes file %s has unknown signature"
+msgstr "le fichier de mtimes %s a une signature inconnue"
+
+#, c-format
+msgid "mtimes file %s has unsupported version %<PRIu32>"
+msgstr "le fichier de mtimes %s a une version non gérée %<PRIu32>"
+
+#, c-format
+msgid "mtimes file %s has unsupported hash id %<PRIu32>"
+msgstr "le fichier de mtimes %s a un id d'empreinte non géré %<PRIu32>"
+
+#, c-format
+msgid "mtimes file %s is corrupt"
+msgstr "le fichier de mtimes %s est corrompu"
+
+#, c-format
+msgid "reverse-index file %s is too small"
+msgstr "le fichier d'index inversé %s est trop petit"
+
+#, c-format
+msgid "reverse-index file %s is corrupt"
+msgstr "le fichier d'index inversé %s est corrompu"
+
+#, c-format
+msgid "reverse-index file %s has unknown signature"
+msgstr "le fichier d'index inversé %s a une signature inconnue"
+
+#, c-format
+msgid "reverse-index file %s has unsupported version %<PRIu32>"
+msgstr "le fichier d'index inverse %s a une version non gérée %<PRIu32>"
+
+#, c-format
+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>"
+
+msgid "cannot both write and verify reverse index"
+msgstr "impossible de lire et vérifier à la fois l'index inverse"
+
+#, c-format
+msgid "could not stat: %s"
+msgstr "stat impossible de %s"
+
+#, c-format
+msgid "failed to make %s readable"
+msgstr "échec de rendre %s lisible"
+
+#, c-format
+msgid "could not write '%s' promisor file"
+msgstr "impossible d'écrire le fichier de prometteur '%s'"
+
+msgid "offset before end of packfile (broken .idx?)"
+msgstr "offset avant la fin du fichier paquet (.idx cassé ?)"
+
+#, c-format
+msgid "packfile %s cannot be mapped%s"
+msgstr "le fichier paquet %s ne peut être mmap%s"
+
+#, 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 ?)"
+
+#, 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é ?)"
+
+#, c-format
+msgid "malformed expiration date '%s'"
+msgstr "date d'expiration malformée : '%s'"
+
+#, c-format
+msgid "option `%s' expects \"always\", \"auto\", or \"never\""
+msgstr "l'option '%s' attend \"always\", \"auto\" ou \"never\""
+
+#, c-format
+msgid "malformed object name '%s'"
+msgstr "nom d'objet malformé '%s'"
+
+#, c-format
+msgid "option `%s' expects \"%s\" or \"%s\""
+msgstr "l'option '%s' attend \"%s\" ou \"%s\""
+
+#, c-format
+msgid "%s requires a value"
+msgstr "%s a besoin d'une valeur"
+
+#, c-format
+msgid "%s is incompatible with %s"
+msgstr "%s est incompatible avec %s"
+
+#, c-format
+msgid "%s : incompatible with something else"
+msgstr "%s est incompatible avec toute autre option"
+
+#, c-format
+msgid "%s takes no value"
+msgstr "%s n'accepte aucune valeur"
+
+#, c-format
+msgid "%s isn't available"
+msgstr "%s n'est pas disponible"
+
+#, 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"
+
+#, 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)"
+
+#, c-format
+msgid "did you mean `--%s` (with two dashes)?"
+msgstr "vouliez-vous dire `--%s` (avec deux signes moins)?"
+
+#, c-format
+msgid "alias of --%s"
+msgstr "alias pour --%s"
+
+#, c-format
+msgid "unknown option `%s'"
+msgstr "option inconnue « %s »"
+
+#, c-format
+msgid "unknown switch `%c'"
+msgstr "bascule inconnue « %c »"
+
+#, c-format
+msgid "unknown non-ascii option in string: `%s'"
+msgstr "option non-ascii inconnue dans la chaîne : '%s'"
+
+msgid "..."
+msgstr "..."
+
+#, c-format
+msgid "usage: %s"
+msgstr "usage : %s"
+
+#. TRANSLATORS: the colon here should align with the
+#. one in "usage: %s" translation.
+#.
+#, c-format
+msgid "   or: %s"
+msgstr "   ou : %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.
+#.
+#, c-format
+msgid "%*s%s"
+msgstr "%*s%s"
+
+#, c-format
+msgid "    %s"
+msgstr "    %s"
+
+msgid "-NUM"
+msgstr "-NUM"
+
+msgid "expiry-date"
+msgstr "date-d'expiration"
+
+msgid "no-op (backward compatibility)"
+msgstr "sans action (rétrocompatibilité)"
+
+msgid "be more verbose"
+msgstr "être plus verbeux"
+
+msgid "be more quiet"
+msgstr "être plus silencieux"
+
+msgid "use <n> digits to display object names"
+msgstr "utiliser <n> chiffres pour afficher les noms des objets"
+
+msgid "how to strip spaces and #comments from message"
+msgstr "comment éliminer les espaces et les commentaires # du message"
+
+msgid "read pathspec from file"
+msgstr "lire les spécificateurs de fichier depuis fichier"
+
+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"
+
+#, c-format
+msgid "Could not make %s writable by group"
+msgstr "Impossible de rendre %s inscriptible pour le groupe"
+
+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"
+
+msgid "Only one 'attr:' specification is allowed."
+msgstr "Une seule spécification 'attr:' est autorisée."
+
+msgid "attr spec must not be empty"
+msgstr "un spécificateur d'attribut ne peut pas être vide"
+
+#, c-format
+msgid "invalid attribute name %s"
+msgstr "nom d'attribut invalide %s"
+
+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"
+
+msgid ""
+"global 'literal' pathspec setting is incompatible with all other global "
+"pathspec settings"
+msgstr ""
+"le réglage global de spécificateur de chemin 'literal' est incompatible avec "
+"tous les autres réglages globaux de spécificateur de chemin"
+
+msgid "invalid parameter for pathspec magic 'prefix'"
+msgstr "paramètre invalide pour le spécificateur magique de chemin 'prefix'"
+
+#, c-format
+msgid "Invalid pathspec magic '%.*s' in '%s'"
+msgstr "La spécification magique de chemin '%.*s' est invalide dans '%s'"
+
+#, c-format
+msgid "Missing ')' at the end of pathspec magic in '%s'"
+msgstr "')' manquante à la fin du spécificateur magique de chemin dans '%s'"
+
+#, c-format
+msgid "Unimplemented pathspec magic '%c' in '%s'"
+msgstr "Spécificateur magique '%c' non implémenté dans '%s'"
+
+#, c-format
+msgid "%s: 'literal' and 'glob' are incompatible"
+msgstr "%s : 'literal' et 'glob' sont incompatibles"
+
+#, c-format
+msgid "%s: '%s' is outside repository at '%s'"
+msgstr "%s : '%s' est hors du dépôt à '%s'"
+
+#, c-format
+msgid "'%s' (mnemonic: '%c')"
+msgstr "'%s' (mnémonique : '%c')"
+
+#, 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"
+
+#, c-format
+msgid "pathspec '%s' is beyond a symbolic link"
+msgstr "le chemin '%s' est au-delà d'un lien symbolique"
+
+#, c-format
+msgid "line is badly quoted: %s"
+msgstr "la ligne est mal citée : %s"
+
+msgid "unable to write flush packet"
+msgstr "impossible d'écrire le paquet de vidage"
+
+msgid "unable to write delim packet"
+msgstr "impossible d'écrire le paquet de délimitation"
+
+msgid "unable to write response end packet"
+msgstr "impossible d'écrire le paquet de fin de réponse"
+
+msgid "flush packet write failed"
+msgstr "échec de l'écriture du vidage de paquet"
+
+msgid "protocol error: impossibly long line"
+msgstr "erreur de protocole : ligne impossiblement trop longue"
+
+msgid "packet write with format failed"
+msgstr "échec de l'écriture d'un paquet avec format"
+
+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 "
+"d'un paquet"
+
+#, c-format
+msgid "packet write failed: %s"
+msgstr "échec de l'écriture d'un paquet : %s"
+
+msgid "read error"
+msgstr "erreur de lecture"
+
+msgid "the remote end hung up unexpectedly"
+msgstr "l'hôte distant a fermé la connexion de manière inattendue"
+
+#, c-format
+msgid "protocol error: bad line length character: %.4s"
+msgstr "erreur de protocole : mauvais caractère de longueur de ligne : %.4s"
+
+#, c-format
+msgid "protocol error: bad line length %d"
+msgstr "erreur de protocole : mauvaise longueur de ligne %d"
+
+#, c-format
+msgid "remote error: %s"
+msgstr "erreur distante : %s"
+
+msgid "Refreshing index"
+msgstr "Rafraîchissement de l'index"
+
+#, c-format
+msgid "unable to create threaded lstat: %s"
+msgstr "impossible de créer le lstat en fil : %s"
+
+msgid "unable to parse --pretty format"
+msgstr "impossible d'analyser le format --pretty"
+
+msgid "promisor-remote: unable to fork off fetch subprocess"
+msgstr ""
+"promisor-remote : impossible de créer un sous-processus de récupération"
+
+msgid "promisor-remote: could not write to fetch subprocess"
+msgstr ""
+"promisor-remote : impossible d'écrire vers un sous-processus de récupération"
+
+msgid "promisor-remote: could not close stdin to fetch subprocess"
+msgstr ""
+"promisor-remote : impossible de fermer l'entrée standard du sous-processus "
+"de récupération"
+
+#, c-format
+msgid "promisor remote name cannot begin with '/': %s"
+msgstr "un nom de prometteur distant ne peut pas commencer par '/' : %s"
+
+msgid "object-info: expected flush after arguments"
+msgstr "object-info : vidage attendu après les arguments"
+
+msgid "Removing duplicate objects"
+msgstr "Suppression des objets dupliqués"
+
+msgid "could not start `log`"
+msgstr "impossible de démarrer `log`"
+
+msgid "could not read `log` output"
+msgstr "impossible de lire la sortie de `log`"
+
+#, c-format
+msgid "could not parse commit '%s'"
+msgstr "impossible d'analyser le commit '%s'"
+
+#, c-format
+msgid ""
+"could not parse first line of `log` output: did not start with 'commit ': "
+"'%s'"
+msgstr ""
+"impossible d'analyser la première ligne de la sortie de `log` : ne commence "
+"pas par 'commit' : '%s'"
+
+#, c-format
+msgid "could not parse git header '%.*s'"
+msgstr "impossible d'analyser l'entête git '%.*s'"
+
+msgid "failed to generate diff"
+msgstr "échec de la génération de diff"
+
+#, c-format
+msgid "could not parse log for '%s'"
+msgstr "impossible d'analyser le journal pour '%s'"
+
+#, c-format
+msgid "will not add file alias '%s' ('%s' already exists in index)"
+msgstr "pas d'ajout d'alias de fichier '%s'(« %s » existe déjà dans l'index)"
+
+msgid "cannot create an empty blob in the object database"
+msgstr "impossible de créer un blob vide dans la base de donnée d'objets"
+
+#, c-format
+msgid "%s: can only add regular files, symbolic links or git-directories"
+msgstr ""
+"%s : ne peut ajouter que des fichiers normaux, des liens symboliques ou des "
+"répertoires git"
+
+#, c-format
+msgid "unable to index file '%s'"
+msgstr "indexation du fichier '%s' impossible"
+
+#, c-format
+msgid "unable to add '%s' to index"
+msgstr "impossible d'ajouter '%s' à l'index"
+
+#, c-format
+msgid "unable to stat '%s'"
+msgstr "fstat de '%s' impossible"
+
+#, 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"
+
+msgid "Refresh index"
+msgstr "Rafraîchir l'index"
+
+#, c-format
+msgid ""
+"index.version set, but the value is invalid.\n"
+"Using version %i"
+msgstr ""
+"index.version renseignée, mais la valeur est invalide.\n"
+"Utilisation de la version %i"
+
+#, c-format
+msgid ""
+"GIT_INDEX_VERSION set, but the value is invalid.\n"
+"Using version %i"
+msgstr ""
+"GIT_INDEX_VERSION est renseigné, mais la valeur est invalide.\n"
+"Utilisation de la version %i"
+
+#, c-format
+msgid "bad signature 0x%08x"
+msgstr "signature incorrecte 0x%08x"
+
+#, c-format
+msgid "bad index version %d"
+msgstr "mauvaise version d'index %d"
+
+msgid "bad index file sha1 signature"
+msgstr "mauvaise signature sha1 d'index"
+
+#, c-format
+msgid "index uses %.4s extension, which we do not understand"
+msgstr "l'index utilise l'extension %.4s qui n'est pas comprise"
+
+#, c-format
+msgid "ignoring %.4s extension"
+msgstr "extension %.4s ignorée"
+
+#, c-format
+msgid "unknown index entry format 0x%08x"
+msgstr "format d'entrée d'index inconnu 0x%08x"
+
+#, 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'"
+
+msgid "unordered stage entries in index"
+msgstr "entrées de préparation non ordonnées dans l'index"
+
+#, c-format
+msgid "multiple stage entries for merged file '%s'"
+msgstr "entrées multiples de préparation pour le fichier fusionné '%s'"
+
+#, c-format
+msgid "unordered stage entries for '%s'"
+msgstr "entrées de préparation non ordonnées pour '%s'"
+
+#, c-format
+msgid "unable to create load_cache_entries thread: %s"
+msgstr "impossible de créer le fil load_cache_entries : %s"
+
+#, c-format
+msgid "unable to join load_cache_entries thread: %s"
+msgstr "impossible de joindre le fil load_cache_entries : %s"
+
+#, c-format
+msgid "%s: index file open failed"
+msgstr "%s : l'ouverture du fichier d'index a échoué"
+
+#, c-format
+msgid "%s: cannot stat the open index"
+msgstr "%s : impossible de faire un stat sur l'index ouvert"
+
+#, c-format
+msgid "%s: index file smaller than expected"
+msgstr "%s : fichier d'index plus petit qu'attendu"
+
+#, c-format
+msgid "%s: unable to map index file%s"
+msgstr "%s : impossible de mapper le fichier d'index%s"
+
+#, c-format
+msgid "unable to create load_index_extensions thread: %s"
+msgstr "impossible de créer le fil load_index_extensions : %s"
+
+#, c-format
+msgid "unable to join load_index_extensions thread: %s"
+msgstr "impossible de joindre le fil load_index_extensions : %s"
+
+#, c-format
+msgid "could not freshen shared index '%s'"
+msgstr "impossible de rafraîchir l'index partagé '%s'"
+
+#, c-format
+msgid "broken index, expect %s in %s, got %s"
+msgstr "index cassé, %s attendu dans %s, %s obtenu"
+
+msgid "cannot write split index for a sparse index"
+msgstr "impossible d'écrire un index scindé pour un index clairsemé"
+
+msgid "failed to convert to a sparse-index"
+msgstr "échec de conversion d'un index clairsemé"
+
+#, c-format
+msgid "could not stat '%s'"
+msgstr "impossible de stat '%s'"
+
+#, c-format
+msgid "unable to open git dir: %s"
+msgstr "impossible d'ouvrir le répertoire git : %s"
+
+#, c-format
+msgid "unable to unlink: %s"
+msgstr "échec lors de l'unlink : %s"
+
+#, c-format
+msgid "cannot fix permission bits on '%s'"
+msgstr "impossible de régler les bits de droit de '%s'"
+
+#, c-format
+msgid "%s: cannot drop to stage #0"
+msgstr "%s : impossible de revenir à l'étape 0"
+
+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 ""
+"Vous pouvez corriger ceci avec 'git rebase --edit-todo' puis lancez 'git "
+"rebase --continue'.\n"
+"Ou vous pouvez abandonner le rebasage avec 'git rebase --abort'.\n"
+
+#, c-format
+msgid ""
+"unrecognized setting %s for option rebase.missingCommitsCheck. Ignoring."
+msgstr ""
+"paramètre non reconnu %s pour l'option rebase.missingCommitsCheck. Ignoré."
+
+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 [-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"
+"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 [-C | -c] <commit> = comme \"squash\", mais en ne gardant que le "
+"message\n"
+"                    du commit précédent, à moins que -C ne soit utilisé, "
+"auquel cas, conserver\n"
+"                    ne conserver que le message de ce commit ; -c est "
+"identique à -C mais ouvre\n"
+"                    un éditeur\n"
+" x, exec <commit> = lancer la commande (reste de la ligne) dans un shell\n"
+" b, break = s'arrêter ici (on peut continuer ensuite avec 'git rebase --"
+"continue')\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"
+
+#, c-format
+msgid "Rebase %s onto %s (%d command)"
+msgid_plural "Rebase %s onto %s (%d commands)"
+msgstr[0] "Rebasage de %s sur %s (%d commande)"
+msgstr[1] "Rebasage de %s sur %s (%d commandes)"
+
+msgid ""
+"\n"
+"Do not remove any line. Use 'drop' explicitly to remove a commit.\n"
+msgstr ""
+"\n"
+"Ne supprimez aucune ligne. Utilisez 'drop' explicitement pour supprimer un "
+"commit.\n"
+
+msgid ""
+"\n"
+"If you remove a line here THAT COMMIT WILL BE LOST.\n"
+msgstr ""
+"\n"
+"Si vous éliminez une ligne ici, LE COMMIT CORRESPONDANT SERA PERDU.\n"
+
+msgid ""
+"\n"
+"You are editing the todo file of an ongoing interactive rebase.\n"
+"To continue rebase after editing, run:\n"
+"    git rebase --continue\n"
+"\n"
+msgstr ""
+"\n"
+"Vous êtes en train d'éditer le fichier todo d'un rebasage interactif en "
+"cours.\n"
+"Pour continuer le rebasage après édition, lancez :\n"
+"    git rebase --continue\n"
+"\n"
+
+msgid ""
+"\n"
+"However, if you remove everything, the rebase will be aborted.\n"
+"\n"
+msgstr ""
+"\n"
+"Cependant, si vous effacez tout, le rebasage sera annulé.\n"
+"\n"
+
+#, c-format
+msgid "could not write '%s'."
+msgstr "impossible d'écrire '%s'."
+
+#, c-format
+msgid ""
+"Warning: some commits may have been dropped accidentally.\n"
+"Dropped commits (newer to older):\n"
+msgstr ""
+"Attention : certains commits ont pu être accidentellement supprimés.\n"
+"Commits supprimés (du plus jeune au plus vieux) :\n"
+
+#, c-format
+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"
+"The possible behaviours are: ignore, warn, error.\n"
+"\n"
+msgstr ""
+"Pour éviter ce message, utilisez \"drop\" pour supprimer explicitement un "
+"commit.\n"
+"\n"
+"Utilisez 'git config rebase.missingCommitsCheck' pour changer le niveau "
+"d'avertissements.\n"
+"Les comportements disponibles sont : ignore, warn, error.\n"
+"\n"
+
+#, c-format
+msgid "%s: 'preserve' superseded by 'merges'"
+msgstr "%s : 'preserve' a été remplacé par 'merges'"
+
+# à priori on parle d'une branche ici
+msgid "gone"
+msgstr "disparue"
+
+#, c-format
+msgid "ahead %d"
+msgstr "en avance de %d"
+
+#, c-format
+msgid "behind %d"
+msgstr "en retard de %d"
+
+#, c-format
+msgid "ahead %d, behind %d"
+msgstr "en avance de %d, en retard de %d"
+
+#, c-format
+msgid "expected format: %%(color:<color>)"
+msgstr "format attendu : %%(color:<couleur>)"
+
+#, c-format
+msgid "unrecognized color: %%(color:%s)"
+msgstr "couleur non reconnue : %%(color:%s)"
+
+#, c-format
+msgid "Integer value expected refname:lstrip=%s"
+msgstr "Valeur entière attendue refname:lstrip=%s"
+
+#, c-format
+msgid "Integer value expected refname:rstrip=%s"
+msgstr "Valeur entière attendue refname:rstrip=%s"
+
+#, c-format
+msgid "unrecognized %%(%s) argument: %s"
+msgstr "argument %%(%s) non reconnu : %s"
+
+#, c-format
+msgid "%%(objecttype) does not take arguments"
+msgstr "%%(objecttype) n'accepte pas d'argument"
+
+#, c-format
+msgid "%%(deltabase) does not take arguments"
+msgstr "%%(deltabase) n'accepte pas d'argument"
+
+#, c-format
+msgid "%%(body) does not take arguments"
+msgstr "%%(body) n'accepte pas d'argument"
+
+#, c-format
+msgid "expected %%(trailers:key=<value>)"
+msgstr "%%(trailers:key=<value>) attendu"
+
+#, c-format
+msgid "unknown %%(trailers) argument: %s"
+msgstr "argument %%(trailers) inconnu : %s"
+
+#, c-format
+msgid "positive value expected contents:lines=%s"
+msgstr "valeur positive attendue contents:lines=%s"
+
+#, c-format
+msgid "positive value expected '%s' in %%(%s)"
+msgstr "valeur positive attendue '%s' dans %%(%s)"
+
+#, c-format
+msgid "unrecognized email option: %s"
+msgstr "option de courriel non reconnue : %s"
+
+#, c-format
+msgid "expected format: %%(align:<width>,<position>)"
+msgstr "format attendu : %%(align:<largeur>,<position>)"
+
+#, c-format
+msgid "unrecognized position:%s"
+msgstr "position non reconnue : %s"
+
+#, c-format
+msgid "unrecognized width:%s"
+msgstr "largeur non reconnue : %s"
+
+#, c-format
+msgid "positive width expected with the %%(align) atom"
+msgstr "valeur positive attendue avec l'atome %%(align)"
+
+#, c-format
+msgid "%%(rest) does not take arguments"
+msgstr "%%(rest) n'accepte pas d'argument"
+
+#, c-format
+msgid "malformed field name: %.*s"
+msgstr "nom de champ malformé %.*s"
+
+#, c-format
+msgid "unknown field name: %.*s"
+msgstr "nom de champ inconnu : %.*s"
+
+#, 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"
+
+#, c-format
+msgid "format: %%(%s) atom used without a %%(%s) atom"
+msgstr "format : atome %%(%s) utilisé sans un atome %%(%s)"
+
+#, c-format
+msgid "format: %%(then) atom used more than once"
+msgstr "format : atome %%(then) utilisé plus d'une fois"
+
+#, c-format
+msgid "format: %%(then) atom used after %%(else)"
+msgstr "format: atome %%(then) utilisé après %%(else)"
+
+#, c-format
+msgid "format: %%(else) atom used more than once"
+msgstr "format : atome %%(else) utilisé plus d'une fois"
+
+#, c-format
+msgid "format: %%(end) atom used without corresponding atom"
+msgstr "format : atome %%(end) utilisé sans atome correspondant"
+
+#, c-format
+msgid "malformed format string %s"
+msgstr "chaîne de formatage mal formée %s"
+
+#, c-format
+msgid "this command reject atom %%(%.*s)"
+msgstr "cette commande rejette l'atome %%(%.*s)"
+
+#, c-format
+msgid "--format=%.*s cannot be used with --python, --shell, --tcl"
+msgstr "--format=%.*s ne peut pas être utilisé avec --python, --shell, --tcl"
+
+#, c-format
+msgid "(no branch, rebasing %s)"
+msgstr "(aucune branche, rebasage de %s)"
+
+#, c-format
+msgid "(no branch, rebasing detached HEAD %s)"
+msgstr "(aucune branche, rebasage de la HEAD détachée %s)"
+
+#, c-format
+msgid "(no branch, bisect started on %s)"
+msgstr "(aucune branche, bisect a démarré sur %s)"
+
+#, c-format
+msgid "(HEAD detached at %s)"
+msgstr "(HEAD détachée sur %s)"
+
+#, c-format
+msgid "(HEAD detached from %s)"
+msgstr "(HEAD détachée depuis %s)"
+
+msgid "(no branch)"
+msgstr "(aucune branche)"
+
+#, c-format
+msgid "missing object %s for %s"
+msgstr "objet manquant %s pour %s"
+
+#, c-format
+msgid "parse_object_buffer failed on %s for %s"
+msgstr "échec de parse_object_buffer sur %s pour %s"
+
+#, c-format
+msgid "malformed object at '%s'"
+msgstr "objet malformé à '%s'"
+
+#, c-format
+msgid "ignoring ref with broken name %s"
+msgstr "réf avec un nom cassé %s ignoré"
+
+#, c-format
+msgid "ignoring broken ref %s"
+msgstr "réf cassé %s ignoré"
+
+#, c-format
+msgid "format: %%(end) atom missing"
+msgstr "format: atome %%(end) manquant"
+
+#, c-format
+msgid "malformed object name %s"
+msgstr "nom d'objet malformé %s"
+
+#, c-format
+msgid "option `%s' must point to a commit"
+msgstr "l'option '%s' doit pointer sur un commit"
+
+msgid "key"
+msgstr "clé"
+
+msgid "field name to sort on"
+msgstr "nom du champ servant à trier"
+
+#, c-format
+msgid "not a reflog: %s"
+msgstr "'%s' n'est pas un journal de références"
+
+#, c-format
+msgid "no reflog for '%s'"
+msgstr "pas de journal de références pour '%s'"
+
+#, c-format
+msgid "%s does not point to a valid object!"
+msgstr "%s ne pointe pas sur un objet valide!"
+
+#, 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"
+"of your new repositories, which will suppress this warning, call:\n"
+"\n"
+"\tgit config --global init.defaultBranch <name>\n"
+"\n"
+"Names commonly chosen instead of 'master' are 'main', 'trunk' and\n"
+"'development'. The just-created branch can be renamed via this command:\n"
+"\n"
+"\tgit branch -m <name>\n"
+msgstr ""
+"Utilisation de '%s' comme nom de la branche initiale. Le nom de la branche\n"
+"par défaut peut changer. Pour configurer le nom de la branche initiale\n"
+"pour tous les nouveaux dépôts, et supprimer cet avertissement, lancez :\n"
+"\n"
+"\tgit config --global init.defaultBranch <nom>\n"
+"\n"
+"Les noms les plus utilisés à la place de 'master' sont 'main', 'trunk' et\n"
+"'development'. La branche nouvellement créée peut être rénommée avec :\n"
+"\n"
+"\tgit branch -m <nom>\n"
+
+#, c-format
+msgid "could not retrieve `%s`"
+msgstr "impossible de récupérer `%s`"
+
+#, c-format
+msgid "invalid branch name: %s = %s"
+msgstr "nom de branche invalide : %s = %s"
+
+#, c-format
+msgid "ignoring dangling symref %s"
+msgstr "symref pendant %s ignoré"
+
+#, 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"
+
+#, 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"
+
+#, c-format
+msgid "log for %s is empty"
+msgstr "le journal pour la réf %s est vide"
+
+#, c-format
+msgid "refusing to update ref with bad name '%s'"
+msgstr "refus de mettre à jour une réf avec un nom cassé '%s'"
+
+#, c-format
+msgid "update_ref failed for ref '%s': %s"
+msgstr "échec de update_ref pour la réf '%s' : %s"
+
+#, c-format
+msgid "multiple updates for ref '%s' not allowed"
+msgstr "mises à jour multiples pour la réf '%s' non permises"
+
+msgid "ref updates forbidden inside quarantine environment"
+msgstr "mises à jour des références interdites en environnement de quarantaine"
+
+msgid "ref updates aborted by hook"
+msgstr "mises à jour des références annulées par le crochet"
+
+#, c-format
+msgid "'%s' exists; cannot create '%s'"
+msgstr "'%s' existe ; impossible de créer '%s'"
+
+#, c-format
+msgid "cannot process '%s' and '%s' at the same time"
+msgstr "impossible de traiter '%s' et '%s' en même temps"
+
+#, c-format
+msgid "could not remove reference %s"
+msgstr "impossible de supprimer la référence %s"
+
+#, c-format
+msgid "could not delete reference %s: %s"
+msgstr "impossible de supprimer la référence %s : %s"
+
+#, c-format
+msgid "could not delete references: %s"
+msgstr "impossible de supprimer les références : %s"
+
+#, c-format
+msgid "invalid refspec '%s'"
+msgstr "spécificateur de réference invalide : '%s'"
+
+#, c-format
+msgid "invalid quoting in push-option value: '%s'"
+msgstr "citation invalide dans la valeur push-option : '%s'"
+
+#, 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 ?"
+
+msgid "invalid server response; expected service, got flush packet"
+msgstr "réponse du serveur invalide ; service attendu, paquet de vidage reçu"
+
+#, c-format
+msgid "invalid server response; got '%s'"
+msgstr "réponse du serveur invalide ; '%s' reçu"
+
+#, c-format
+msgid "repository '%s' not found"
+msgstr "dépôt '%s' non trouvé"
+
+#, c-format
+msgid "Authentication failed for '%s'"
+msgstr "Échec d'authentification pour '%s'"
+
+#, c-format
+msgid "unable to access '%s' with http.pinnedPubkey configuration: %s"
+msgstr ""
+"impossible d'accéder à '%s' avec la configuration http.pinnedPubkey : %s"
+
+#, c-format
+msgid "unable to access '%s': %s"
+msgstr "impossible d'accéder à '%s' : %s"
+
+#, c-format
+msgid "redirecting to %s"
+msgstr "redirection vers %s"
+
+msgid "shouldn't have EOF when not gentle on EOF"
+msgstr "ne devrait pas recevoir OEF quand on n'est pas gentil sur EOF"
+
+msgid "remote server sent unexpected response end packet"
+msgstr "le serveur distant a envoyé un paquet de fin de réponse inattendu"
+
+msgid "unable to rewind rpc post data - try increasing http.postBuffer"
+msgstr ""
+"impossible de rembobiner le données post rpc - essayer d'augmenter http."
+"postBuffer"
+
+#, c-format
+msgid "remote-curl: bad line length character: %.4s"
+msgstr "remote-curl : mauvais caractère de longueur de ligne : %.4s"
+
+msgid "remote-curl: unexpected response end packet"
+msgstr "remote-curl : paquet de fin de réponse inattendu"
+
+#, c-format
+msgid "RPC failed; %s"
+msgstr "échec RPC ; %s"
+
+msgid "cannot handle pushes this big"
+msgstr "impossible de gérer des poussées aussi grosses"
+
+#, c-format
+msgid "cannot deflate request; zlib deflate error %d"
+msgstr "impossible de compresser la requête ; erreur de compression zlib %d"
+
+#, c-format
+msgid "cannot deflate request; zlib end error %d"
+msgstr "impossible de compresser la requête ; erreur de fin zlib %d"
+
+#, c-format
+msgid "%d bytes of length header were received"
+msgstr "%d octets de longueur d'entête ont été reçus"
+
+#, c-format
+msgid "%d bytes of body are still expected"
+msgstr "%d octets de corps sont encore attendus"
+
+msgid "dumb http transport does not support shallow capabilities"
+msgstr "le protocole http idiot ne supporte la capacité superficielle"
+
+msgid "fetch failed."
+msgstr "échec du récupération."
+
+msgid "cannot fetch by sha1 over smart http"
+msgstr "impossible de récupérer par sha1 sur http intelligent"
+
+#, c-format
+msgid "protocol error: expected sha/ref, got '%s'"
+msgstr "erreur de protocole : sha/ref attendu, '%s' trouvé"
+
+#, c-format
+msgid "http transport does not support %s"
+msgstr "le transport http ne supporte pas %s"
+
+msgid "git-http-push failed"
+msgstr "échec de git-http-push"
+
+msgid "remote-curl: usage: git remote-curl <remote> [<url>]"
+msgstr "remote-curl: usage: git remote-curl <distant> [<url>]"
+
+msgid "remote-curl: error reading command stream from git"
+msgstr "remote-curl : erreur de lecture du flux de commande depuis git"
+
+msgid "remote-curl: fetch attempted without a local repo"
+msgstr "remote-curl : récupération tentée sans dépôt local"
+
+#, c-format
+msgid "remote-curl: unknown command '%s' from git"
+msgstr "remote-curl : commande inconnue '%s' depuis git"
+
+#, c-format
+msgid "config remote shorthand cannot begin with '/': %s"
+msgstr ""
+"un raccourci de configuration de distant ne peut pas commencer par '/' : %s"
+
+msgid "more than one receivepack given, using the first"
+msgstr "plus d'un receivepack fournis, utilisation du premier"
+
+msgid "more than one uploadpack given, using the first"
+msgstr "plus d'un uploadpack fournis, utilisation du premier"
+
+#, c-format
+msgid "unrecognized value transfer.credentialsInUrl: '%s'"
+msgstr "valeur non reconnue transfer.credentialsInUrl : '%s'"
+
+#, c-format
+msgid "URL '%s' uses plaintext credentials"
+msgstr "l'URL '%s' utilise des authentications en clair"
+
+#, c-format
+msgid "Cannot fetch both %s and %s to %s"
+msgstr "Impossible de récupérer à la fois %s et %s pour %s"
+
+#, c-format
+msgid "%s usually tracks %s, not %s"
+msgstr "%s suit habituellement %s, pas %s"
+
+#, c-format
+msgid "%s tracks both %s and %s"
+msgstr "%s suit à la fois %s et %s"
+
+#, c-format
+msgid "key '%s' of pattern had no '*'"
+msgstr "la clé '%s' du modèle n'a pas de '*'"
+
+#, c-format
+msgid "value '%s' of pattern has no '*'"
+msgstr "la valeur '%s' du modèle n'a pas de '*'"
+
+#, c-format
+msgid "src refspec %s does not match any"
+msgstr ""
+"le spécificateur de référence source %s ne correspond à aucune référence"
+
+#, c-format
+msgid "src refspec %s matches more than one"
+msgstr ""
+"le spécificateur de référence source %s correspond à plus d'une référence"
+
+#. TRANSLATORS: "matches '%s'%" is the <dst> part of "git push
+#. <remote> <src>:<dst>" push, and "being pushed ('%s')" is
+#. the <src>.
+#.
+#, c-format
+msgid ""
+"The destination you provided is not a full refname (i.e.,\n"
+"starting with \"refs/\"). We tried to guess what you meant by:\n"
+"\n"
+"- Looking for a ref that matches '%s' on the remote side.\n"
+"- Checking if the <src> being pushed ('%s')\n"
+"  is a ref in \"refs/{heads,tags}/\". If so we add a corresponding\n"
+"  refs/{heads,tags}/ prefix on the remote side.\n"
+"\n"
+"Neither worked, so we gave up. You must fully qualify the ref."
+msgstr ""
+"La destination que vous avez fournie n'est pas un nom de référence complète\n"
+"(c'est-à-dire commençant par \"ref/\"). Essai d'approximation par :\n"
+"\n"
+"- Recherche d'une référence qui correspond à '%s' sur le serveur distant.\n"
+"- Vérification si la <source> en cours de poussée ('%s')\n"
+"  est une référence dans \"refs/{heads,tags}/\". Si oui, ajout du préfixe\n"
+"  refs/{heads,tags}/ correspondant du côté distant.\n"
+"\n"
+"Aucune n'a fonctionné, donc abandon. Veuillez spécifier une référence "
+"totalement qualifiée."
+
+#, c-format
+msgid ""
+"The <src> part of the refspec is a commit object.\n"
+"Did you mean to create a new branch by pushing to\n"
+"'%s:refs/heads/%s'?"
+msgstr ""
+"La partie <source> du spécificateur de référence est un objet commit.\n"
+"Souhaitiez-vous créer une nouvelle branche en poussant sur\n"
+"'%s:refs/heads/%s' ?"
+
+#, c-format
+msgid ""
+"The <src> part of the refspec is a tag object.\n"
+"Did you mean to create a new tag by pushing to\n"
+"'%s:refs/tags/%s'?"
+msgstr ""
+"La partie <source> du spécificateur de référence est un objet étiquette.\n"
+"Souhaitiez-vous créer une nouvelle étiquette en poussant sur\n"
+"'%s:refs/tags/%s' ?"
+
+#, c-format
+msgid ""
+"The <src> part of the refspec is a tree object.\n"
+"Did you mean to tag a new tree by pushing to\n"
+"'%s:refs/tags/%s'?"
+msgstr ""
+"La partie <source> du spécificateur de référence est un objet arbre.\n"
+"Souhaitiez-vous créer un nouvel arbre en poussant sur\n"
+"'%s:refs/tags/%s' ?"
+
+#, c-format
+msgid ""
+"The <src> part of the refspec is a blob object.\n"
+"Did you mean to tag a new blob by pushing to\n"
+"'%s:refs/tags/%s'?"
+msgstr ""
+"La partie <source> du spécificateur de référence est un objet blob.\n"
+"Souhaitiez-vous créer un nouveau blob en poussant sur\n"
+"'%s:refs/tags/%s' ?"
+
+#, c-format
+msgid "%s cannot be resolved to branch"
+msgstr "'%s' ne peut pas être résolue comme une branche"
+
+#, c-format
+msgid "unable to delete '%s': remote ref does not exist"
+msgstr "suppression de '%s' impossible : la référence distante n'existe pas"
+
+#, c-format
+msgid "dst refspec %s matches more than one"
+msgstr ""
+"le spécificateur de référence dst %s correspond à plus d'un spécificateur de "
+"références"
+
+#, c-format
+msgid "dst ref %s receives from more than one src"
+msgstr "le spécificateur de référence dst %s reçoit depuis plus d'une source"
+
+msgid "HEAD does not point to a branch"
+msgstr "HEAD ne pointe pas sur une branche"
+
+#, c-format
+msgid "no such branch: '%s'"
+msgstr "pas de branche '%s'"
+
+#, c-format
+msgid "no upstream configured for branch '%s'"
+msgstr "aucune branche amont configurée pour la branche '%s'"
+
+#, c-format
+msgid "upstream branch '%s' not stored as a remote-tracking branch"
+msgstr "la branche amont '%s' n'est pas stockée comme branche de suivi"
+
+#, c-format
+msgid "push destination '%s' on remote '%s' has no local tracking branch"
+msgstr ""
+"la destination de poussée '%s' sur le serveur distant '%s' n'a pas de "
+"branche locale de suivi"
+
+#, c-format
+msgid "branch '%s' has no remote for pushing"
+msgstr "la branche '%s' n'a aucune branche distante de poussée"
+
+#, c-format
+msgid "push refspecs for '%s' do not include '%s'"
+msgstr "les références de spec pour '%s' n'incluent pas '%s'"
+
+msgid "push has no destination (push.default is 'nothing')"
+msgstr "la poussée n'a pas de destination (push.default vaut 'nothing')"
+
+msgid "cannot resolve 'simple' push to a single destination"
+msgstr ""
+"impossible de résoudre une poussée 'simple' pour une destination unique"
+
+#, c-format
+msgid "couldn't find remote ref %s"
+msgstr "impossible de trouver la référence distante %s"
+
+#, c-format
+msgid "* Ignoring funny ref '%s' locally"
+msgstr "* Référence bizarre '%s' ignorée localement"
+
+#, c-format
+msgid "Your branch is based on '%s', but the upstream is gone.\n"
+msgstr "Votre branche est basée sur '%s', mais la branche amont a disparu.\n"
+
+msgid "  (use \"git branch --unset-upstream\" to fixup)\n"
+msgstr "  (utilisez \"git branch --unset-upstream\" pour corriger)\n"
+
+#, c-format
+msgid "Your branch is up to date with '%s'.\n"
+msgstr "Votre branche est à jour avec '%s'.\n"
+
+#, c-format
+msgid "Your branch and '%s' refer to different commits.\n"
+msgstr "Votre branche et '%s' font référence à des commits différents.\n"
+
+#, c-format
+msgid "  (use \"%s\" for details)\n"
+msgstr "  (utilisez \"%s\" pour plus de détails)\n"
+
+#, c-format
+msgid "Your branch is ahead of '%s' by %d commit.\n"
+msgid_plural "Your branch is ahead of '%s' by %d commits.\n"
+msgstr[0] "Votre branche est en avance sur '%s' de %d commit.\n"
+msgstr[1] "Votre branche est en avance sur '%s' de %d commits.\n"
+
+msgid "  (use \"git push\" to publish your local commits)\n"
+msgstr "  (utilisez \"git push\" pour publier vos commits locaux)\n"
+
+#, c-format
+msgid "Your branch is behind '%s' by %d commit, and can be fast-forwarded.\n"
+msgid_plural ""
+"Your branch is behind '%s' by %d commits, and can be fast-forwarded.\n"
+msgstr[0] ""
+"Votre branche est en retard sur '%s' de %d commit, et peut être mise à jour "
+"en avance rapide.\n"
+msgstr[1] ""
+"Votre branche est en retard sur '%s' de %d commits, et peut être mise à jour "
+"en avance rapide.\n"
+
+msgid "  (use \"git pull\" to update your local branch)\n"
+msgstr "  (utilisez \"git pull\" pour mettre à jour votre branche locale)\n"
+
+#, c-format
+msgid ""
+"Your branch and '%s' have diverged,\n"
+"and have %d and %d different commit each, respectively.\n"
+msgid_plural ""
+"Your branch and '%s' have diverged,\n"
+"and have %d and %d different commits each, respectively.\n"
+msgstr[0] ""
+"Votre branche et '%s' ont divergé,\n"
+"et ont %d et %d commit différent chacune respectivement.\n"
+msgstr[1] ""
+"Votre branche et '%s' ont divergé,\n"
+"et ont %d et %d commits différents chacune respectivement.\n"
+
+msgid "  (use \"git pull\" to merge the remote branch into yours)\n"
+msgstr ""
+"  (utilisez \"git pull\" pour fusionner la branche distante dans la vôtre)\n"
+
+#, c-format
+msgid "cannot parse expected object name '%s'"
+msgstr "impossible d'analyser le nom attendu d'objet '%s'"
+
+#, c-format
+msgid "cannot strip one component off url '%s'"
+msgstr "impossible de supprimer un composant de l'URL '%s'"
+
+#, c-format
+msgid "bad replace ref name: %s"
+msgstr "mauvaise références de remplacement : %s"
+
+#, c-format
+msgid "duplicate replace ref: %s"
+msgstr "référence de remplacement dupliquée : %s"
+
+#, c-format
+msgid "replace depth too high for object %s"
+msgstr "profondeur de remplacement trop grande pour l'objet %s"
+
+msgid "corrupt MERGE_RR"
+msgstr "MERGE_RR corrompu"
+
+msgid "unable to write rerere record"
+msgstr "impossible d'écrire l'enregistrement rerere"
+
+#, c-format
+msgid "there were errors while writing '%s' (%s)"
+msgstr "il y a eu des erreurs à l'écriture de '%s' (%s)"
+
+#, c-format
+msgid "could not parse conflict hunks in '%s'"
+msgstr "impossible d'analyser la section en conflit dans '%s'"
+
+#, c-format
+msgid "failed utime() on '%s'"
+msgstr "échec de utime() sur '%s'"
+
+#, c-format
+msgid "writing '%s' failed"
+msgstr "échec de l'écriture de '%s'"
+
+#, c-format
+msgid "Staged '%s' using previous resolution."
+msgstr "'%s' indexé en utilisant la résolution pré-existante."
+
+#, c-format
+msgid "Recorded resolution for '%s'."
+msgstr "Résolution enregistrée pour '%s'."
+
+#, c-format
+msgid "Resolved '%s' using previous resolution."
+msgstr "'%s' résolu en utilisant la résolution pré-existante."
+
+#, c-format
+msgid "cannot unlink stray '%s'"
+msgstr "impossible de délier '%s' qui est errant"
+
+#, c-format
+msgid "Recorded preimage for '%s'"
+msgstr "Pré-image enregistrée pour '%s'"
+
+#, c-format
+msgid "failed to update conflicted state in '%s'"
+msgstr "échec de la mise à jour de l'état en conflit dans '%s'"
+
+#, c-format
+msgid "no remembered resolution for '%s'"
+msgstr "aucune résolution enregistrée pour '%s'"
+
+#, c-format
+msgid "cannot unlink '%s'"
+msgstr "impossible de délier '%s'"
+
+#, c-format
+msgid "Updated preimage for '%s'"
+msgstr "Pré-image mise à jour pour '%s'"
+
+#, c-format
+msgid "Forgot resolution for '%s'\n"
+msgstr "Résolution  pour '%s' oubliée\n"
+
+msgid "unable to open rr-cache directory"
+msgstr "impossible d'ouvrir le répertoire rr-cache"
+
+msgid "update the index with reused conflict resolution if possible"
+msgstr ""
+"met à jour l'index avec les résolutions de conflit réutilisées si possible"
+
+msgid "could not determine HEAD revision"
+msgstr "impossible de déterminer la révision HEAD"
+
+#, c-format
+msgid "failed to find tree of %s"
+msgstr "impossible de trouver l'arbre de %s"
+
+msgid "--unpacked=<packfile> no longer supported"
+msgstr "--unpacked=<fichier-paquet> n'est plus géré"
+
+msgid "your current branch appears to be broken"
+msgstr "votre branche actuelle semble cassée"
+
+#, c-format
+msgid "your current branch '%s' does not have any commits yet"
+msgstr "votre branche actuelle '%s' ne contient encore aucun commit"
+
+msgid "object filtering requires --objects"
+msgstr "le filtrage d'objet exige --objects"
+
+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"
+
+#, c-format
+msgid "cannot create async thread: %s"
+msgstr "impossible de créer un fil asynchrone : %s"
+
+msgid "unexpected flush packet while reading remote unpack status"
+msgstr ""
+"paquet de nettoyage inattendu pendant la lecture de l'état de dépaquetage "
+"distant"
+
+#, c-format
+msgid "unable to parse remote unpack status: %s"
+msgstr "impossible d'analyser l'état de dépaquetage distant : %s"
+
+#, c-format
+msgid "remote unpack failed: %s"
+msgstr "le dépaquetage a échoué : %s"
+
+msgid "failed to sign the push certificate"
+msgstr "impossible de signer le certificat de poussée"
+
+msgid "send-pack: unable to fork off fetch subprocess"
+msgstr "send-pack : impossible de créer un sous-processus de récupération"
+
+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"
+
+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"
+
+msgid "the receiving end does not support --signed push"
+msgstr "le receveur ne gère pas les poussées avec --signed"
+
+msgid ""
+"not sending a push certificate since the receiving end does not support --"
+"signed push"
+msgstr ""
+"pas d'envoi de certificat de poussée car le receveur ne gère pas les "
+"poussées avec --signed"
+
+msgid "the receiving end does not support --atomic push"
+msgstr "le receveur ne gère pas les poussées avec --atomic"
+
+msgid "the receiving end does not support push options"
+msgstr "le receveur ne gère pas les options de poussées"
+
+#, c-format
+msgid "invalid commit message cleanup mode '%s'"
+msgstr "mode de nettoyage invalide de message de validation '%s'"
+
+#, c-format
+msgid "could not delete '%s'"
+msgstr "impossible de supprimer '%s'"
+
+msgid "revert"
+msgstr "revert"
+
+msgid "cherry-pick"
+msgstr "cherry-pick"
+
+msgid "rebase"
+msgstr "rebase"
+
+#, c-format
+msgid "unknown action: %d"
+msgstr "action inconnue : %d"
+
+msgid ""
+"after resolving the conflicts, mark the corrected paths\n"
+"with 'git add <paths>' or 'git rm <paths>'"
+msgstr ""
+"après résolution des conflits, marquez les chemins corrigés\n"
+"avec 'git add <chemins>' ou 'git rm <chemins>'"
+
+msgid ""
+"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 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\"."
+
+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\"."
+
+#, c-format
+msgid "could not lock '%s'"
+msgstr "impossible de verrouiller '%s'"
+
+#, c-format
+msgid "could not write to '%s'"
+msgstr "impossible d'écrire dans '%s'"
+
+#, c-format
+msgid "could not write eol to '%s'"
+msgstr "impossible d'écrire la fin de ligne dans '%s'"
+
+#, c-format
+msgid "failed to finalize '%s'"
+msgstr "échec lors de la finalisation de '%s'"
+
+#, c-format
+msgid "your local changes would be overwritten by %s."
+msgstr "vos modifications locales seraient écrasées par %s."
+
+msgid "commit your changes or stash them to proceed."
+msgstr "validez vos modifications ou les remiser pour continuer."
+
+#, c-format
+msgid "%s: fast-forward"
+msgstr "%s : avance rapide"
+
+#. TRANSLATORS: %s will be "revert", "cherry-pick" or
+#. "rebase".
+#.
+#, c-format
+msgid "%s: Unable to write new index file"
+msgstr "%s: Impossible d'écrire le nouveau fichier index"
+
+msgid "unable to update cache tree"
+msgstr "impossible de mettre à jour l'arbre de cache"
+
+msgid "could not resolve HEAD commit"
+msgstr "impossible de résoudre le commit HEAD"
+
+#, c-format
+msgid "no key present in '%.*s'"
+msgstr "aucune clé présente dans '%.*s'"
+
+#, c-format
+msgid "unable to dequote value of '%s'"
+msgstr "impossible de décoter la valeur de '%s'"
+
+msgid "'GIT_AUTHOR_NAME' already given"
+msgstr "'GIT_AUTHOR_NAME' déjà fourni"
+
+msgid "'GIT_AUTHOR_EMAIL' already given"
+msgstr "'GIT_AUTHOR_EMAIL' déjà fourni"
+
+msgid "'GIT_AUTHOR_DATE' already given"
+msgstr "'GIT_AUTHOR_DATE' déjà fourni"
+
+#, c-format
+msgid "unknown variable '%s'"
+msgstr "variable inconnue '%s'"
+
+msgid "missing 'GIT_AUTHOR_NAME'"
+msgstr "'GIT_AUTHOR_NAME' manquant"
+
+msgid "missing 'GIT_AUTHOR_EMAIL'"
+msgstr "'GIT_AUTHOR_EMAIL' manquant"
+
+msgid "missing 'GIT_AUTHOR_DATE'"
+msgstr "'GIT_AUTHOR_DATE' manquant"
+
+#, c-format
+msgid ""
+"you have staged changes in your working tree\n"
+"If these changes are meant to be squashed into the previous commit, run:\n"
+"\n"
+"  git commit --amend %s\n"
+"\n"
+"If they are meant to go into a new commit, run:\n"
+"\n"
+"  git commit %s\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 elles devaient être ajoutées dans le commit précédent, lancez :\n"
+"\n"
+"  git commit --amend %s\n"
+"\n"
+"Si elles devaient aller dans un nouveau commit, lancez :\n"
+"\n"
+"  git commit %s\n"
+"\n"
+"Dans les deux cas, une fois fini, continuez avec :\n"
+"\n"
+"  git rebase --continue\n"
+
+msgid "'prepare-commit-msg' hook failed"
+msgstr "échec du crochet 'prepare-commit-msg'"
+
+msgid ""
+"Your name and email address were configured automatically based\n"
+"on your username and hostname. Please check that they are accurate.\n"
+"You can suppress this message by setting them explicitly. Run the\n"
+"following command and follow the instructions in your editor to edit\n"
+"your configuration file:\n"
+"\n"
+"    git config --global --edit\n"
+"\n"
+"After doing this, you may fix the identity used for this commit with:\n"
+"\n"
+"    git commit --amend --reset-author\n"
+msgstr ""
+"Votre nom et votre adresse courriel ont été configurés automatiquement en "
+"se\n"
+"fondant sur votre nom d'utilisateur et le nom de votre machine. Veuillez \n"
+"vérifier qu'ils sont corrects. Vous pouvez supprimer ce message en les \n"
+"paramétrant explicitement. Lancez les commandes suivantes et suivez les\n"
+"instructions dans votre éditeur pour éditer votre fichier de "
+"configuration :\n"
+"\n"
+"    git config --global --edit\n"
+"\n"
+"Après ceci, vous pouvez corriger l'identité utilisée pour cette validation "
+"avec :\n"
+"\n"
+"    git commit --amend --reset-author\n"
+
+msgid ""
+"Your name and email address were configured automatically based\n"
+"on your username and hostname. Please check that they are accurate.\n"
+"You can suppress this message by setting them explicitly:\n"
+"\n"
+"    git config --global user.name \"Your Name\"\n"
+"    git config --global user.email you@example.com\n"
+"\n"
+"After doing this, you may fix the identity used for this commit with:\n"
+"\n"
+"    git commit --amend --reset-author\n"
+msgstr ""
+"Votre nom et votre adresse courriel ont été configurés automatiquement en se "
+"fondant\n"
+"sur votre nom d'utilisateur et le nom de votre machine. Veuillez vérifier "
+"qu'ils sont corrects.\n"
+"Vous pouvez supprimer ce message en les paramétrant explicitement :\n"
+"\n"
+"    git config --global user.name \"Votre Nom\"\n"
+"    git config --global user.email vous@exemple.com\n"
+"\n"
+"Après ceci, vous pouvez corriger l'identité utilisée pour ce commit avec :\n"
+"\n"
+"    git commit --amend --reset-author\n"
+
+msgid "couldn't look up newly created commit"
+msgstr "impossible de retrouver le commit nouvellement créé"
+
+msgid "could not parse newly created commit"
+msgstr "impossible d'analyser le commit nouvellement créé"
+
+msgid "unable to resolve HEAD after creating commit"
+msgstr "impossible de résoudre HEAD après création du commit"
+
+msgid "detached HEAD"
+msgstr "HEAD détachée"
+
+msgid " (root-commit)"
+msgstr " (commit racine)"
+
+msgid "could not parse HEAD"
+msgstr "impossible de lire HEAD"
+
+#, c-format
+msgid "HEAD %s is not a commit!"
+msgstr "HEAD %s n'est pas un commit !"
+
+msgid "unable to parse commit author"
+msgstr "impossible d'analyser l'auteur du commit"
+
+#, c-format
+msgid "unable to read commit message from '%s'"
+msgstr "impossible de lire le message de validation de '%s'"
+
+#, c-format
+msgid "invalid author identity '%s'"
+msgstr "identité d'auteur invalide '%s'"
+
+msgid "corrupt author: missing date information"
+msgstr "auteur corrompu : information de date manquante"
+
+#, c-format
+msgid "could not update %s"
+msgstr "impossible de mettre à jour %s"
+
+#, c-format
+msgid "could not parse commit %s"
+msgstr "impossible d'analyser le commit %s"
+
+#, c-format
+msgid "could not parse parent commit %s"
+msgstr "impossible d'analyser le commit parent %s"
+
+#, c-format
+msgid "unknown command: %d"
+msgstr "commande inconnue : %d"
+
+msgid "This is the 1st commit message:"
+msgstr "Ceci est le premier message de validation :"
+
+#, c-format
+msgid "This is the commit message #%d:"
+msgstr "Ceci est le message de validation numéro %d :"
+
+msgid "The 1st commit message will be skipped:"
+msgstr "Le premier message de validation sera ignoré :"
+
+#, c-format
+msgid "The commit message #%d will be skipped:"
+msgstr "Le message de validation %d sera ignoré :"
+
+#, c-format
+msgid "This is a combination of %d commits."
+msgstr "Ceci est la combinaison de %d commits."
+
+#, c-format
+msgid "cannot write '%s'"
+msgstr "impossible d'écrire '%s'"
+
+msgid "need a HEAD to fixup"
+msgstr "une HEAD est nécessaire à la correction"
+
+msgid "could not read HEAD"
+msgstr "impossible de lire HEAD"
+
+msgid "could not read HEAD's commit message"
+msgstr "impossible de lire le message de validation de HEAD"
+
+#, c-format
+msgid "could not read commit message of %s"
+msgstr "impossible de lire le message de validation de %s"
+
+msgid "your index file is unmerged."
+msgstr "votre fichier d'index n'est pas fusionné."
+
+msgid "cannot fixup root commit"
+msgstr "impossible de réparer le commit racine"
+
+#, 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."
+
+#, c-format
+msgid "commit %s does not have parent %d"
+msgstr "le commit %s n'a pas de parent %d"
+
+#, 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.
+#, c-format
+msgid "%s: cannot parse parent commit %s"
+msgstr "%s : impossible d'analyser le commit parent %s"
+
+#, c-format
+msgid "could not rename '%s' to '%s'"
+msgstr "impossible de renommer '%s' en '%s'"
+
+#, c-format
+msgid "could not revert %s... %s"
+msgstr "impossible d'annuler %s... %s"
+
+#, c-format
+msgid "could not apply %s... %s"
+msgstr "impossible d'appliquer %s... %s"
+
+#, 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"
+
+#, c-format
+msgid "git %s: failed to read the index"
+msgstr "git %s : échec à la lecture de l'index"
+
+#, c-format
+msgid "git %s: failed to refresh the index"
+msgstr "git %s : échec du rafraîchissement de l'index"
+
+#, c-format
+msgid "%s does not accept arguments: '%s'"
+msgstr "%s n'accepte pas d'argument : '%s'"
+
+#, c-format
+msgid "missing arguments for %s"
+msgstr "argument manquant pour %s"
+
+#, c-format
+msgid "could not parse '%s'"
+msgstr "impossible d'analyser '%s'"
+
+#, c-format
+msgid "invalid line %d: %.*s"
+msgstr "ligne %d invalide : %.*s"
+
+#, c-format
+msgid "cannot '%s' without a previous commit"
+msgstr "'%s' impossible avec le commit précédent"
+
+msgid "cancelling a cherry picking in progress"
+msgstr "annulation d'un picorage en cours"
+
+msgid "cancelling a revert in progress"
+msgstr "annulation d'un retour en cours"
+
+msgid "please fix this using 'git rebase --edit-todo'."
+msgstr "veuillez corriger ceci en utilisant 'git rebase --edit-todo'."
+
+#, c-format
+msgid "unusable instruction sheet: '%s'"
+msgstr "feuille d'instruction inutilisable : '%s'"
+
+msgid "no commits parsed."
+msgstr "aucun commit analysé."
+
+msgid "cannot cherry-pick during a revert."
+msgstr "impossible de picorer pendant l'annulation d'un commit."
+
+msgid "cannot revert during a cherry-pick."
+msgstr "impossible d'annuler un commit pendant un picorage."
+
+msgid "unusable squash-onto"
+msgstr "\"écrase-sur\" inutilisable"
+
+#, c-format
+msgid "malformed options sheet: '%s'"
+msgstr "feuille d'options malformée : %s"
+
+msgid "empty commit set passed"
+msgstr "l'ensemble de commits spécifié est vide"
+
+msgid "revert is already in progress"
+msgstr "un retour est déjà en cours"
+
+#, c-format
+msgid "try \"git revert (--continue | %s--abort | --quit)\""
+msgstr "essayez \"git revert (--continue | %s--abort | --quit)\""
+
+msgid "cherry-pick is already in progress"
+msgstr "un picorage est déjà en cours"
+
+#, c-format
+msgid "try \"git cherry-pick (--continue | %s--abort | --quit)\""
+msgstr "essayez \"git cherry-pick (--continue | %s--abort | --quit)\""
+
+#, c-format
+msgid "could not create sequencer directory '%s'"
+msgstr "impossible de créer le répertoire de séquenceur '%s'"
+
+msgid "could not lock HEAD"
+msgstr "impossible de verrouiller HEAD"
+
+msgid "no cherry-pick or revert in progress"
+msgstr "aucun picorage ou retour en cours"
+
+msgid "cannot resolve HEAD"
+msgstr "impossible de résoudre HEAD"
+
+msgid "cannot abort from a branch yet to be born"
+msgstr "impossible d'abandonner depuis une branche non encore créée"
+
+#, c-format
+msgid "cannot read '%s': %s"
+msgstr "impossible de lire '%s' : %s"
+
+msgid "unexpected end of file"
+msgstr "fin de fichier inattendue"
+
+#, c-format
+msgid "stored pre-cherry-pick HEAD file '%s' is corrupt"
+msgstr "le fichier HEAD de préparation de picorage '%s' est corrompu"
+
+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 !"
+
+msgid "no revert in progress"
+msgstr "pas de retour en cours"
+
+msgid "no cherry-pick in progress"
+msgstr "aucun picorage en cours"
+
+msgid "failed to skip the commit"
+msgstr "échec du saut de commit"
+
+msgid "there is nothing to skip"
+msgstr "il n'y a rien à sauter"
+
+#, c-format
+msgid ""
+"have you committed already?\n"
+"try \"git %s --continue\""
+msgstr ""
+"avez-vous déjà validé ?\n"
+"essayez \"git %s --continue\""
+
+msgid "cannot read HEAD"
+msgstr "impossible de lire HEAD"
+
+#, c-format
+msgid "unable to copy '%s' to '%s'"
+msgstr "impossible de copier '%s' vers '%s'"
+
+#, c-format
+msgid ""
+"You can amend the commit now, with\n"
+"\n"
+"  git commit --amend %s\n"
+"\n"
+"Once you are satisfied with your changes, run\n"
+"\n"
+"  git rebase --continue\n"
+msgstr ""
+"Vous pouvez corriger le commit maintenant, avec\n"
+"\n"
+"  git commit --amend %s\n"
+"\n"
+"après avoir réalisé vos modifications, lancez\n"
+"\n"
+"  git rebase --continue\n"
+
+#, c-format
+msgid "Could not apply %s... %.*s"
+msgstr "Impossible d'appliquer %s... %.*s"
+
+#, c-format
+msgid "Could not merge %.*s"
+msgstr "Impossible de fusionner %.*s"
+
+#, c-format
+msgid "Executing: %s\n"
+msgstr "Exécution : %s\n"
+
+#, c-format
+msgid ""
+"execution failed: %s\n"
+"%sYou can fix the problem, and then run\n"
+"\n"
+"  git rebase --continue\n"
+"\n"
+msgstr ""
+"échec d'exécution : %s\n"
+"%sVous pouvez corriger le problème, puis lancer\n"
+"\n"
+"git rebase --continue\n"
+"\n"
+
+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"
+
+#, c-format
+msgid ""
+"execution succeeded: %s\n"
+"but left changes to the index and/or the working tree\n"
+"Commit or stash your changes, and then run\n"
+"\n"
+"  git rebase --continue\n"
+"\n"
+msgstr ""
+"l'exécution a réussi : %s\n"
+"mais a laissé des modifications dans l'index ou la copie de travail\n"
+"Validez ou remisez vos modification, puis lancez\n"
+"\n"
+"  git rebase --continue\n"
+"\n"
+
+#, c-format
+msgid "illegal label name: '%.*s'"
+msgstr "nom de label illégal '%.*s'"
+
+msgid "writing fake root commit"
+msgstr "écriture d'un commit racine bidon"
+
+msgid "writing squash-onto"
+msgstr "écriture de 'écraser-sur'"
+
+#, c-format
+msgid "could not resolve '%s'"
+msgstr "impossible de résoudre '%s'"
+
+msgid "cannot merge without a current revision"
+msgstr "impossible de fusionner avec une révision courante"
+
+#, c-format
+msgid "unable to parse '%.*s'"
+msgstr "impossible d'analyser '%.*s'"
+
+#, c-format
+msgid "nothing to merge: '%.*s'"
+msgstr "rien à fusionner : '%.*s'"
+
+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"
+
+#, c-format
+msgid "could not get commit message of '%s'"
+msgstr "impossible de lire le message de validation de '%s'"
+
+#, c-format
+msgid "could not even attempt to merge '%.*s'"
+msgstr "impossible de seulement essayer de fusionner '%.*s'"
+
+msgid "merge: Unable to write new index file"
+msgstr "fusion : Impossible d'écrire le nouveau fichier index"
+
+msgid "Cannot autostash"
+msgstr "Autoremisage impossible"
+
+#, c-format
+msgid "Unexpected stash response: '%s'"
+msgstr "Réponse de remisage inattendue : '%s'"
+
+#, c-format
+msgid "Could not create directory for '%s'"
+msgstr "Impossible de créer le répertoire pour '%s'"
+
+#, c-format
+msgid "Created autostash: %s\n"
+msgstr "Autoremisage créé : %s\n"
+
+msgid "could not reset --hard"
+msgstr "impossible de réinitialiser --hard"
+
+#, c-format
+msgid "Applied autostash.\n"
+msgstr "Autoremisage appliqué.\n"
+
+#, c-format
+msgid "cannot store %s"
+msgstr "impossible de stocker %s"
+
+#, c-format
+msgid ""
+"%s\n"
+"Your changes are safe in the stash.\n"
+"You can run \"git stash pop\" or \"git stash drop\" at any time.\n"
+msgstr ""
+"%s\n"
+"Vos  modifications sont à l'abri dans la remise.\n"
+"Vous pouvez lancer \"git stash pop\" ou \"git stash drop\" à tout moment.\n"
+
+msgid "Applying autostash resulted in conflicts."
+msgstr "L'application du remisage automatique a créé des conflits."
+
+msgid "Autostash exists; creating a new stash entry."
+msgstr ""
+"Un remisage automatique existe ; création d'une nouvelle entrée de remisage."
+
+msgid "could not detach HEAD"
+msgstr "impossible de détacher HEAD"
+
+#, c-format
+msgid "Stopped at HEAD\n"
+msgstr "Arrêt à HEAD\n"
+
+#, c-format
+msgid "Stopped at %s\n"
+msgstr "Arrêté à %s\n"
+
+#, c-format
+msgid ""
+"Could not execute the todo command\n"
+"\n"
+"    %.*s\n"
+"It has been rescheduled; To edit the command before continuing, please\n"
+"edit the todo list first:\n"
+"\n"
+"    git rebase --edit-todo\n"
+"    git rebase --continue\n"
+msgstr ""
+"Impossible d'exécuter la commande\n"
+"\n"
+"    %.*s\n"
+"Elle a été reprogrammée ; pour éditer la commande avant de poursuivre,\n"
+"veuillez éditer la liste de commandes en premier :\n"
+"\n"
+"    git rebase --edit-todo\n"
+"    git rebase --continue\n"
+
+#, c-format
+msgid "Rebasing (%d/%d)%s"
+msgstr "Rebasage (%d/%d)%s"
+
+#, c-format
+msgid "Stopped at %s...  %.*s\n"
+msgstr "Arrêt à %s... %.*s\n"
+
+#, c-format
+msgid "unknown command %d"
+msgstr "commande inconnue %d"
+
+msgid "could not read orig-head"
+msgstr "impossible de lire orig-head"
+
+msgid "could not read 'onto'"
+msgstr "impossible de lire 'onto'"
+
+#, c-format
+msgid "could not update HEAD to %s"
+msgstr "impossible de mettre à jour HEAD sur %s"
+
+#, c-format
+msgid "Successfully rebased and updated %s.\n"
+msgstr "Rebasage et mise à jour de %s avec succès.\n"
+
+msgid "cannot rebase: You have unstaged changes."
+msgstr "impossible de rebaser : vous avez des modifications non indexées."
+
+msgid "cannot amend non-existing commit"
+msgstr "impossible de corriger un commit non-existant"
+
+#, c-format
+msgid "invalid file: '%s'"
+msgstr "fichier invalide : '%s'"
+
+#, c-format
+msgid "invalid contents: '%s'"
+msgstr "contenu invalide : '%s'"
+
+msgid ""
+"\n"
+"You have uncommitted changes in your working tree. Please, commit them\n"
+"first and then run 'git rebase --continue' again."
+msgstr ""
+"\n"
+"Vous avez des modifications non validées dans votre copie de travail.\n"
+"Veuillez les valider d'abord, puis relancer 'git rebase --continue'."
+
+#, c-format
+msgid "could not write file: '%s'"
+msgstr "impossible d'écrire le fichier : '%s'"
+
+msgid "could not remove CHERRY_PICK_HEAD"
+msgstr "impossible de supprimer CHERRY_PICK_HEAD"
+
+msgid "could not commit staged changes."
+msgstr "impossible de valider les modifications indexées."
+
+#, c-format
+msgid "%s: can't cherry-pick a %s"
+msgstr "%s : impossible de picorer un %s"
+
+#, c-format
+msgid "%s: bad revision"
+msgstr "%s : mauvaise révision"
+
+msgid "can't revert as initial commit"
+msgstr "impossible d'annuler en tant que commit initial"
+
+#, c-format
+msgid "skipped previously applied commit %s"
+msgstr "le commit %s appliqué précédemment a été sauté"
+
+msgid "use --reapply-cherry-picks to include skipped commits"
+msgstr "utilisez --reapply-cherry-picks pour inclure les commits sautés"
+
+msgid "make_script: unhandled options"
+msgstr "make_script : options non gérées"
+
+msgid "make_script: error preparing revisions"
+msgstr "make_script : erreur lors de la préparation des révisions"
+
+msgid "nothing to do"
+msgstr "rien à faire"
+
+msgid "could not skip unnecessary pick commands"
+msgstr "impossible d'éviter les commandes de picorage non nécessaires"
+
+msgid "the script was already rearranged."
+msgstr "le script a déjà été réarrangé."
+
+#, c-format
+msgid "'%s' is outside repository at '%s'"
+msgstr "'%s' est hors du dépôt à '%s'"
+
+#, c-format
+msgid ""
+"%s: no such path in the working tree.\n"
+"Use 'git <command> -- <path>...' to specify paths that do not exist locally."
+msgstr ""
+"%s : ce chemin n'existe pas dans la copie de travail.\n"
+"Utilisez 'git <commande> -- <chemin>...' pour spécifier des chemins qui "
+"n'existent pas localement."
+
+#, c-format
+msgid ""
+"ambiguous argument '%s': unknown revision or path not in the working tree.\n"
+"Use '--' to separate paths from revisions, like this:\n"
+"'git <command> [<revision>...] -- [<file>...]'"
+msgstr ""
+"argument '%s' ambigu : révision inconnue ou chemin inexistant.\n"
+"Utilisez '--' pour séparer les chemins des révisions, comme ceci :\n"
+"'git <commande> [<révision>...] -- [<chemin>...]'"
+
+#, c-format
+msgid "option '%s' must come before non-option arguments"
+msgstr ""
+"l'option '%s' doit être présente avant les arguments qui ne sont pas des "
+"options"
+
+#, c-format
+msgid ""
+"ambiguous argument '%s': both revision and filename\n"
+"Use '--' to separate paths from revisions, like this:\n"
+"'git <command> [<revision>...] -- [<file>...]'"
+msgstr ""
+"argument '%s' ambigu : révision et chemin spécifiés.\n"
+"Utilisez '--' pour séparer les chemins des révisions, comme ceci :\n"
+"'git <commande> [<révision>...] -- [<chemin>...]'"
+
+msgid "unable to set up work tree using invalid config"
+msgstr ""
+"impossible de mettre en place le répertoire de travail en utilisant une "
+"configuration invalide"
+
+#, c-format
+msgid "Expected git repo version <= %d, found %d"
+msgstr "Version attendue du dépôt git <= %d, %d trouvée"
+
+msgid "unknown repository extension found:"
+msgid_plural "unknown repository extensions found:"
+msgstr[0] "extension de dépôt inconnue trouvée :"
+msgstr[1] "extensions de dépôt inconnues trouvées :"
+
+msgid "repo version is 0, but v1-only extension found:"
+msgid_plural "repo version is 0, but v1-only extensions found:"
+msgstr[0] ""
+"la version du dépôt est 0, mais une extension uniquement v1 trouvée :"
+msgstr[1] ""
+"la version du dépôt est 0, mais des extensions uniquement v1 trouvées :"
+
+#, c-format
+msgid "error opening '%s'"
+msgstr "erreur à l'ouverture de '%s'"
+
+#, c-format
+msgid "too large to be a .git file: '%s'"
+msgstr "trop gros pour être une fichier .git : '%s'"
+
+#, c-format
+msgid "error reading %s"
+msgstr "erreur à la lecture de %s"
+
+#, c-format
+msgid "invalid gitfile format: %s"
+msgstr "format de fichier git invalide : %s"
+
+#, c-format
+msgid "no path in gitfile: %s"
+msgstr "aucun chemin dans le fichier git : %s"
+
+#, c-format
+msgid "not a git repository: %s"
+msgstr "ce n'est pas un dépôt git : %s"
+
+#, c-format
+msgid "'$%s' too big"
+msgstr "'$%s' trop gros"
+
+#, c-format
+msgid "not a git repository: '%s'"
+msgstr "ce n'est pas un dépôt git : '%s'"
+
+#, c-format
+msgid "cannot chdir to '%s'"
+msgstr "impossible de se déplacer vers le répertoire (chdir) '%s'"
+
+msgid "cannot come back to cwd"
+msgstr "impossible de revenir au répertoire de travail courant"
+
+#, c-format
+msgid "failed to stat '%*s%s%s'"
+msgstr "échec du stat de '%*s%s%s'"
+
+msgid "Unable to read current working directory"
+msgstr "Impossible d'accéder au répertoire de travail courant"
+
+#, c-format
+msgid "cannot change to '%s'"
+msgstr "impossible de modifier en '%s'"
+
+#, c-format
+msgid "not a git repository (or any of the parent directories): %s"
+msgstr "ni ceci ni aucun de ses répertoires parents n'est un dépôt git : %s"
+
+#, 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 ""
+"ni ceci ni aucun de ses répertoires parents (jusqu'au point de montage %s) "
+"n'est un dépôt git\n"
+"Arrêt à la limite du système de fichiers (GIT_DISCOVERY_ACROSS_FILESYSTEM "
+"n'est pas défini)."
+
+#, c-format
+msgid ""
+"unsafe repository ('%s' is owned by someone else)\n"
+"To add an exception for this directory, call:\n"
+"\n"
+"\tgit config --global --add safe.directory %s"
+msgstr ""
+"dépôt non sécurisé ('%s' appartient à quelqu'un d'autre)\n"
+"Pour ajouter une exception pour ce dépôt, lancez :\n"
+"\n"
+"\tgit config --global --add safe.directory %s"
+
+#, c-format
+msgid ""
+"problem with core.sharedRepository filemode value (0%.3o).\n"
+"The owner of files must always have read and write permissions."
+msgstr ""
+"problème avec la valeur de core.sharedRepository (0%.3o).\n"
+"Le propriétaire des fichiers doit toujours avoir les droits en lecture et "
+"écriture."
+
+msgid "fork failed"
+msgstr "échec de la bifurcation"
+
+msgid "setsid failed"
+msgstr "échec du setsid"
+
+#, 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)"
+
+msgid "cannot use split index with a sparse index"
+msgstr "impossible d'utiliser l'index scindé avec un index clairsemé"
+
+#. TRANSLATORS: IEC 80000-13:2008 gibibyte
+#, c-format
+msgid "%u.%2.2u GiB"
+msgstr "%u.%2.2u Gio"
+
+#. TRANSLATORS: IEC 80000-13:2008 gibibyte/second
+#, c-format
+msgid "%u.%2.2u GiB/s"
+msgstr "%u.%2.2u Gio/s"
+
+#. TRANSLATORS: IEC 80000-13:2008 mebibyte
+#, c-format
+msgid "%u.%2.2u MiB"
+msgstr "%u.%2.2u Mio"
+
+#. TRANSLATORS: IEC 80000-13:2008 mebibyte/second
+#, c-format
+msgid "%u.%2.2u MiB/s"
+msgstr "%u.%2.2u Mio/s"
+
+#. TRANSLATORS: IEC 80000-13:2008 kibibyte
+#, c-format
+msgid "%u.%2.2u KiB"
+msgstr "%u.%2.2u Kio"
+
+#. TRANSLATORS: IEC 80000-13:2008 kibibyte/second
+#, c-format
+msgid "%u.%2.2u KiB/s"
+msgstr "%u.%2.2u Kio/s"
+
+#. TRANSLATORS: IEC 80000-13:2008 byte
+#, c-format
+msgid "%u byte"
+msgid_plural "%u bytes"
+msgstr[0] "%u octet"
+msgstr[1] "%u octets"
+
+#. TRANSLATORS: IEC 80000-13:2008 byte/second
+#, c-format
+msgid "%u byte/s"
+msgid_plural "%u bytes/s"
+msgstr[0] "%u octet/s"
+msgstr[1] "%u octets/s"
+
+#, c-format
+msgid "could not edit '%s'"
+msgstr "impossible d'éditer '%s'"
+
+#, c-format
+msgid "ignoring suspicious submodule name: %s"
+msgstr "nom de sous-module suspicieux %s ignoré"
+
+msgid "negative values not allowed for submodule.fetchJobs"
+msgstr "les valeurs négatives ne sont pas permises pour submodule.fetchJobs"
+
+#, c-format
+msgid "ignoring '%s' which may be interpreted as a command-line option: %s"
+msgstr ""
+"'%s' ignoré et qui peut être interprété comme une option de ligne de "
+"commande : %s"
+
+#, c-format
+msgid "Could not update .gitmodules entry %s"
+msgstr "Impossible de mettre à jour l'élément %s de .gitmodules"
+
+msgid "Cannot change unmerged .gitmodules, resolve merge conflicts first"
+msgstr ""
+"Modification impossible de .gitmodules non fusionné, résolvez les conflits "
+"d'abord"
+
+#, c-format
+msgid "Could not find section in .gitmodules where path=%s"
+msgstr "Impossible de trouver une section où path=%s dans .gitmodules"
+
+# ici %s est un chemin
+#, c-format
+msgid "Could not remove .gitmodules entry for %s"
+msgstr "Impossible de supprimer l'élément de .gitmodules pour %s"
+
+msgid "staging updated .gitmodules failed"
+msgstr "échec de la mise en index du .gitmodules mis à jour"
+
+#, c-format
+msgid "in unpopulated submodule '%s'"
+msgstr "dans le sous-module '%s' non populé"
+
+#, c-format
+msgid "Pathspec '%s' is in submodule '%.*s'"
+msgstr "Le chemin '%s' est dans le sous-module '%.*s'"
+
+#, c-format
+msgid "bad --ignore-submodules argument: %s"
+msgstr "mauvais argument --ignore-submodules : %s"
+
+#, c-format
+msgid ""
+"Submodule in commit %s at path: '%s' collides with a submodule named the "
+"same. Skipping it."
+msgstr ""
+"Le sous-module dans le commit %s au chemin : '%s' entre en collision avec un "
+"sous-module du même nom. Ignoré."
+
+#, 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"
+
+#, c-format
+msgid ""
+"Could not run 'git rev-list <commits> --not --remotes -n 1' command in "
+"submodule %s"
+msgstr ""
+"Impossible de lancer la commande 'git rev-list <commits> --not --remotes -n "
+"1' dans le sous-module %s"
+
+#, c-format
+msgid "process for submodule '%s' failed"
+msgstr "le processus pour le sous-module '%s' a échoué"
+
+#, c-format
+msgid "Pushing submodule '%s'\n"
+msgstr "Poussée du sous-module '%s'\n"
+
+#, c-format
+msgid "Unable to push submodule '%s'\n"
+msgstr "Impossible de pousser le sous-module '%s'\n"
+
+#, c-format
+msgid "Fetching submodule %s%s\n"
+msgstr "Récupération du sous-module %s%s\n"
+
+#, c-format
+msgid "Could not access submodule '%s'\n"
+msgstr "Impossible d'accéder au sous-module '%s'\n"
+
+#, c-format
+msgid "Could not access submodule '%s' at commit %s\n"
+msgstr "Impossible d'accéder au sous-module '%s' au commit %s\n"
+
+#, c-format
+msgid "Fetching submodule %s%s at commit %s\n"
+msgstr "Récupération du sous-module %s%s au commit %s\n"
+
+#, c-format
+msgid ""
+"Errors during submodule fetch:\n"
+"%s"
+msgstr ""
+"Erreurs pendant la récupération du sous-module :\n"
+"%s"
+
+#, c-format
+msgid "'%s' not recognized as a git repository"
+msgstr "'%s' n'est pas reconnu comme dépôt git"
+
+#, 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"
+
+#, c-format
+msgid "'git status --porcelain=2' failed in submodule %s"
+msgstr "'git status --porcelain=2' a échoué dans le sous-module %s"
+
+#, c-format
+msgid "could not start 'git status' in submodule '%s'"
+msgstr "impossible de démarrer 'git status' dans le sous-module '%s'"
+
+#, c-format
+msgid "could not run 'git status' in submodule '%s'"
+msgstr "impossible de lancer 'git status' dans le sous-module '%s'"
+
+#, c-format
+msgid "Could not unset core.worktree setting in submodule '%s'"
+msgstr "Impossible de désactiver core.worktree dans le sous-module '%s'"
+
+#, c-format
+msgid "could not recurse into submodule '%s'"
+msgstr "récursion impossible dans le sous-module '%s'"
+
+msgid "could not reset submodule index"
+msgstr "impossible de réinitialiser l'index du sous-module"
+
+#, c-format
+msgid "submodule '%s' has dirty index"
+msgstr "le sous-module '%s' a un index sale"
+
+#, c-format
+msgid "Submodule '%s' could not be updated."
+msgstr "Le sous-module '%s' n'a pas pu être mis à jour."
+
+#, 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'"
+
+#, c-format
+msgid ""
+"relocate_gitdir for submodule '%s' with more than one worktree not supported"
+msgstr ""
+"relocate_gitdir pour le sous-module '%s' avec plus d'un arbre de travail "
+"n'est pas supporté"
+
+#, c-format
+msgid "could not lookup name for submodule '%s'"
+msgstr "impossible de trouve le nom pour le sous-module '%s'"
+
+#, c-format
+msgid "refusing to move '%s' into an existing git dir"
+msgstr "refus de déplacer '%s' dans une répertoire git existant"
+
+#, c-format
+msgid ""
+"Migrating git directory of '%s%s' from\n"
+"'%s' to\n"
+"'%s'\n"
+msgstr ""
+"Migration du répertoire git de '%s%s' depuis\n"
+"'%s' sur\n"
+"'%s'\n"
+
+msgid "could not start ls-files in .."
+msgstr "impossible de démarrer ls-files dans .."
+
+#, c-format
+msgid "ls-tree returned unexpected return code %d"
+msgstr "ls-tree a renvoyé un code de retour inattendu %d"
+
+#, c-format
+msgid "failed to lstat '%s'"
+msgstr "échec du lstat de '%s'"
+
+msgid "unhandled options"
+msgstr "options non gérées"
+
+msgid "error preparing revisions"
+msgstr "erreur lors de la préparation des révisions"
+
+#, c-format
+msgid "commit %s is not marked reachable"
+msgstr "le commit %s n'est pas marqué joignable"
+
+msgid "too many commits marked reachable"
+msgstr "trop de commits marqués joignables"
+
+msgid "test-tool serve-v2 [<options>]"
+msgstr "test-tool serve-v2 [<options>]"
+
+msgid "exit immediately after advertising capabilities"
+msgstr "sortir immédiatement après l'annonce des capacités"
+
+msgid "test-helper simple-ipc is-active    [<name>] [<options>]"
+msgstr "test-helper simple-ipc-is-active [<nom>] [<options>]"
+
+msgid "test-helper simple-ipc run-daemon   [<name>] [<threads>]"
+msgstr "test-helper simple-ipc run-daemon   [<nom>] [<fils-d'exécution>]"
+
+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>]"
+
+msgid "test-helper simple-ipc stop-daemon  [<name>] [<max-wait>]"
+msgstr "test-helper simple-ipc stop-daemon  [<nom>] [<attente-max>]"
+
+msgid "test-helper simple-ipc send         [<name>] [<token>]"
+msgstr "test-helper simple-ipc send         [<nom>] [<jeton>]"
+
+msgid "test-helper simple-ipc sendbytes    [<name>] [<bytecount>] [<byte>]"
+msgstr ""
+"test-helper simple-ipc sendbytes    [<nom>] [<nombre-d'octets>] [<octets>]"
+
+msgid ""
+"test-helper simple-ipc multiple     [<name>] [<threads>] [<bytecount>] "
+"[<batchsize>]"
+msgstr ""
+"test-helper simple-ipc multiple     [<nom>] [<fils-d'exécution>] [<nombre-"
+"d'octets>] [<taille-de-lot>]"
+
+msgid "name or pathname of unix domain socket"
+msgstr "nom ou nom de chemin du socket unix"
+
+msgid "named-pipe name"
+msgstr "nom du pipe nommé"
+
+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"
+
+msgid "seconds to wait for daemon to start or stop"
+msgstr "nombre de secondes à attendre que le daemon démarre ou s'arrête"
+
+msgid "number of bytes"
+msgstr "nombre d'octets"
+
+msgid "number of requests per thread"
+msgstr "nombre de requêtes par fil d'exécution"
+
+msgid "byte"
+msgstr "octet"
+
+msgid "ballast character"
+msgstr "caractère ballast"
+
+msgid "token"
+msgstr "jeton"
+
+msgid "command token to send to the server"
+msgstr "jeton de commande à envoyer au serveur"
+
+#, c-format
+msgid "running trailer command '%s' failed"
+msgstr "échec de la commande trailer '%s'"
+
+#, c-format
+msgid "unknown value '%s' for key '%s'"
+msgstr "valeur inconnue '%s' pour la clé '%s'"
+
+#, c-format
+msgid "empty trailer token in trailer '%.*s'"
+msgstr "symbole vide dans la ligne de fin '%.*s'"
+
+#, c-format
+msgid "could not read input file '%s'"
+msgstr "impossible de lire le fichier d'entrée '%s'"
+
+#, c-format
+msgid "could not stat %s"
+msgstr "stat impossible de %s"
+
+#, c-format
+msgid "file %s is not a regular file"
+msgstr "%s n'est pas un fichier régulier"
+
+#, c-format
+msgid "file %s is not writable by user"
+msgstr "le fichier %s n'est pas inscriptible par l'utilisateur"
+
+msgid "could not open temporary file"
+msgstr "impossible de créer un fichier temporaire"
+
+#, c-format
+msgid "could not rename temporary file to %s"
+msgstr "impossible de renommer un fichier temporaire en %s"
+
+msgid "full write to remote helper failed"
+msgstr "échec de l'écriture totale sur l'assistant distant"
+
+#, c-format
+msgid "unable to find remote helper for '%s'"
+msgstr "impossible de trouver un assistant distant pour '%s'"
+
+msgid "can't dup helper output fd"
+msgstr ""
+"impossible de dupliquer le descripteur de flux de sortie de l'assistant"
+
+#, c-format
+msgid ""
+"unknown mandatory capability %s; this remote helper probably needs newer "
+"version of Git"
+msgstr ""
+"capacité obligatoire inconnue %s ; cet assistant distant requiert "
+"probablement une une nouvelle version de Git"
+
+msgid "this remote helper should implement refspec capability"
+msgstr "cet assistant distant devrait supporter la capacité refspec"
+
+#, c-format
+msgid "%s unexpectedly said: '%s'"
+msgstr "%s a dit de manière inattendue : '%s'"
+
+#, c-format
+msgid "%s also locked %s"
+msgstr "%s a aussi verrouillé %s"
+
+msgid "couldn't run fast-import"
+msgstr "impossible de lancer fast-import"
+
+msgid "error while running fast-import"
+msgstr "erreur au lancement de fast-import"
+
+#, c-format
+msgid "could not read ref %s"
+msgstr "impossible de lire la réf %s"
+
+#, c-format
+msgid "unknown response to connect: %s"
+msgstr "réponse inconnue à connect : %s"
+
+msgid "setting remote service path not supported by protocol"
+msgstr ""
+"la spécification du chemin de service distant n'est pas supportée par le "
+"protocole"
+
+msgid "invalid remote service path"
+msgstr "chemin de service distant invalide"
+
+msgid "operation not supported by protocol"
+msgstr "option non supportée par le protocole"
+
+#, c-format
+msgid "can't connect to subservice %s"
+msgstr "impossible de se connecter au sous-service %s"
+
+msgid "--negotiate-only requires protocol v2"
+msgstr "--negotiate-only requiert le protocole v2"
+
+msgid "'option' without a matching 'ok/error' directive"
+msgstr "'option' sans directive 'ok/error' correspondante"
+
+#, c-format
+msgid "expected ok/error, helper said '%s'"
+msgstr "ok/error attendu, l'assistant a dit '%s'"
+
+#, c-format
+msgid "helper reported unexpected status of %s"
+msgstr "l'assistant a renvoyé un statut de retour inattendu %s"
+
+#, c-format
+msgid "helper %s does not support dry-run"
+msgstr "l'assistant %s ne gère pas dry-run"
+
+#, c-format
+msgid "helper %s does not support --signed"
+msgstr "l'assistant %s ne gère pas --signed"
+
+#, c-format
+msgid "helper %s does not support --signed=if-asked"
+msgstr "l'assistant %s ne gère pas --signed=if-asked"
+
+#, c-format
+msgid "helper %s does not support --atomic"
+msgstr "l'assistant %s ne gère pas --atomic"
+
+#, c-format
+msgid "helper %s does not support --%s"
+msgstr "l'assistant %s ne gère pas --%s"
+
+#, c-format
+msgid "helper %s does not support 'push-option'"
+msgstr "l'assistant %s ne gère pas 'push-option'"
+
+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"
+
+#, c-format
+msgid "helper %s does not support 'force'"
+msgstr "l'assistant %s ne gère pas 'force'"
+
+msgid "couldn't run fast-export"
+msgstr "impossible de lancer fast-export"
+
+msgid "error while running fast-export"
+msgstr "erreur au lancement de fast-export"
+
+#, c-format
+msgid ""
+"No refs in common and none specified; doing nothing.\n"
+"Perhaps you should specify a branch.\n"
+msgstr ""
+"Aucune référence en commun et aucune spécfiée ; rien à faire.\n"
+"Vous devriez peut-être spécifier une branche.\n"
+
+#, c-format
+msgid "unsupported object format '%s'"
+msgstr "format d'objet non géré '%s'"
+
+#, c-format
+msgid "malformed response in ref list: %s"
+msgstr "réponse malformée dans le liste de réfs : %s"
+
+#, c-format
+msgid "read(%s) failed"
+msgstr "échec de read(%s)"
+
+#, c-format
+msgid "write(%s) failed"
+msgstr "échec de write(%s)"
+
+#, c-format
+msgid "%s thread failed"
+msgstr "échec du fil d'exécution %s"
+
+#, c-format
+msgid "%s thread failed to join: %s"
+msgstr "échec de jonction du fil d'exécution %s : %s"
+
+#, 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"
+
+#, c-format
+msgid "%s process failed to wait"
+msgstr "échec du processus %s pour l'attente"
+
+#, c-format
+msgid "%s process failed"
+msgstr "échec du processus %s"
+
+msgid "can't start thread for copying data"
+msgstr "impossible de démarrer le fil d'exécution pour copier les données"
+
+#, c-format
+msgid "Would set upstream of '%s' to '%s' of '%s'\n"
+msgstr "Positionnerait la branche amont de '%s' sur '%s' de '%s'\n"
+
+#, c-format
+msgid "could not read bundle '%s'"
+msgstr "impossible de lire la liasse '%s'"
+
+#, c-format
+msgid "transport: invalid depth option '%s'"
+msgstr "transport : option de profondeur invalide '%s'"
+
+msgid "see protocol.version in 'git help config' for more details"
+msgstr "voir protocol.version dans 'git help config' pour plus d'information"
+
+msgid "server options require protocol version 2 or later"
+msgstr "les options de serveur exigent une version 2 ou supérieure"
+
+msgid "server does not support wait-for-done"
+msgstr "le serveur ne prend pas en charge wait-for-done"
+
+msgid "could not parse transport.color.* config"
+msgstr "impossible d'analyser la configuration transport.color.*"
+
+msgid "support for protocol v2 not implemented yet"
+msgstr "le support du protocole v2 n'est pas encore implanté"
+
+#, c-format
+msgid "unknown value for config '%s': %s"
+msgstr "valeur inconnue pour la config '%s' : %s"
+
+#, c-format
+msgid "transport '%s' not allowed"
+msgstr "transport '%s' non permis"
+
+msgid "git-over-rsync is no longer supported"
+msgstr "git-over-rsync n'est plus supporté"
+
+#, c-format
+msgid ""
+"The following submodule paths contain changes that can\n"
+"not be found on any remote:\n"
+msgstr ""
+"Les chemins suivants de sous-module contiennent des modifications\n"
+"qui ne peuvent être trouvées sur aucun distant :\n"
+
+#, c-format
+msgid ""
+"\n"
+"Please try\n"
+"\n"
+"\tgit push --recurse-submodules=on-demand\n"
+"\n"
+"or cd to the path and use\n"
+"\n"
+"\tgit push\n"
+"\n"
+"to push them to a remote.\n"
+"\n"
+msgstr ""
+"\n"
+"Veuillez essayer\n"
+"\n"
+"\tgit push --recurse-submodules=on-demand\n"
+"\n"
+"ou bien changez de répertoire et utilisez\n"
+"\n"
+"\tgit push\n"
+"\n"
+"pour les pousser vers un serveur distant.\n"
+"\n"
+
+msgid "Aborting."
+msgstr "Abandon."
+
+msgid "failed to push all needed submodules"
+msgstr "échec de la poussée de tous les sous-modules nécessaires"
+
+msgid "too-short tree object"
+msgstr "objet arbre trop court"
+
+msgid "malformed mode in tree entry"
+msgstr "mode invalide dans l'entrée d'arbre"
+
+msgid "empty filename in tree entry"
+msgstr "nom de fichier vide dans une entrée de l'arbre"
+
+msgid "too-short tree file"
+msgstr "fichier arbre trop court"
+
+#, c-format
+msgid ""
+"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 ""
+"Vos modifications locales aux fichiers suivants seraient écrasées par "
+"l'extraction :\n"
+"%%sVeuillez valider ou remiser vos modifications avant de basculer de "
+"branche."
+
+#, c-format
+msgid ""
+"Your local changes to the following files would be overwritten by checkout:\n"
+"%%s"
+msgstr ""
+"Vos modifications locales aux fichiers suivants seraient écrasées par "
+"l'extraction :\n"
+"%%s"
+
+#, c-format
+msgid ""
+"Your local changes to the following files would be overwritten by merge:\n"
+"%%sPlease commit your changes or stash them before you merge."
+msgstr ""
+"Vos modifications locales aux fichiers suivants seraient écrasées par la "
+"fusion :\n"
+"%%sVeuillez valider ou remiser vos modifications avant la fusion."
+
+#, c-format
+msgid ""
+"Your local changes to the following files would be overwritten by merge:\n"
+"%%s"
+msgstr ""
+"Vos modifications locales aux fichiers suivants seraient écrasées par la "
+"fusion :\n"
+"%%s"
+
+#, c-format
+msgid ""
+"Your local changes to the following files would be overwritten by %s:\n"
+"%%sPlease commit your changes or stash them before you %s."
+msgstr ""
+"Vos modifications locales aux fichiers suivants seraient écrasées par %s :\n"
+"%%sVeuillez valider ou remiser vos modifications avant %s."
+
+#, c-format
+msgid ""
+"Your local changes to the following files would be overwritten by %s:\n"
+"%%s"
+msgstr ""
+"Vos modifications locales aux fichiers suivants seraient écrasées par %s :\n"
+"%%s"
+
+#, c-format
+msgid ""
+"Updating the following directories would lose untracked files in them:\n"
+"%s"
+msgstr ""
+"La mise à jour des répertoires suivants effacerait les fichiers non suivis "
+"contenus :\n"
+"%s"
+
+#, c-format
+msgid ""
+"Refusing to remove the current working directory:\n"
+"%s"
+msgstr ""
+"impossible de supprimer le répertoire de travail actuel :\n"
+"%s"
+
+#, c-format
+msgid ""
+"The following untracked working tree files would be removed by checkout:\n"
+"%%sPlease move or remove them before you switch branches."
+msgstr ""
+"Les fichiers suivants non suivis de la copie de travail seraient effacés par "
+"l'extraction :\n"
+"%%sVeuillez renommer ou effacer ces fichiers avant de basculer de branche."
+
+#, c-format
+msgid ""
+"The following untracked working tree files would be removed by checkout:\n"
+"%%s"
+msgstr ""
+"Les fichiers suivants non suivis seraient effacés par l'extraction :\n"
+"%%s"
+
+#, c-format
+msgid ""
+"The following untracked working tree files would be removed by merge:\n"
+"%%sPlease move or remove them before you merge."
+msgstr ""
+"Les fichiers suivants non suivis de la copie de travail seraient effacés par "
+"la fusion :\n"
+"%%sVeuillez renommer ou effacer ces fichiers avant la fusion."
+
+#, c-format
+msgid ""
+"The following untracked working tree files would be removed by merge:\n"
+"%%s"
+msgstr ""
+"Les fichiers suivants non suivis seraient effacés par la fusion :\n"
+"%%s"
+
+#, c-format
+msgid ""
+"The following untracked working tree files would be removed by %s:\n"
+"%%sPlease move or remove them before you %s."
+msgstr ""
+"Les fichiers suivants non suivis de la copie de travail seraient effacés par "
+"%s :\n"
+"%%sVeuillez renommer ou effacer ces fichiers avant %s."
+
+#, c-format
+msgid ""
+"The following untracked working tree files would be removed by %s:\n"
+"%%s"
+msgstr ""
+"Les fichiers suivants non suivis seraient effacés par %s :\n"
+"%%s"
+
+#, c-format
+msgid ""
+"The following untracked working tree files would be overwritten by "
+"checkout:\n"
+"%%sPlease move or remove them before you switch branches."
+msgstr ""
+"Les fichiers suivants non suivis de la copie de travail seraient écrasés par "
+"l'extraction :\n"
+"%%sVeuillez renommer ou effacer ces fichiers avant de basculer de branche."
+
+#, c-format
+msgid ""
+"The following untracked working tree files would be overwritten by "
+"checkout:\n"
+"%%s"
+msgstr ""
+"Les fichiers suivants non suivis seraient écrasés par l'extraction :\n"
+"%%s"
+
+#, c-format
+msgid ""
+"The following untracked working tree files would be overwritten by merge:\n"
+"%%sPlease move or remove them before you merge."
+msgstr ""
+"Les fichiers suivants non suivis de la copie de travail seraient effacés par "
+"la fusion :\n"
+"%%sVeuillez renommer ou effacer ces fichiers avant la fusion."
+
+#, c-format
+msgid ""
+"The following untracked working tree files would be overwritten by merge:\n"
+"%%s"
+msgstr ""
+"Les fichiers suivants non suivis seraient écrasés par la fusion :\n"
+"%%s"
+
+#, c-format
+msgid ""
+"The following untracked working tree files would be overwritten by %s:\n"
+"%%sPlease move or remove them before you %s."
+msgstr ""
+"Les fichiers suivants non suivis de la copie de travail seraient écrasés par "
+"%s :\n"
+"%%sVeuillez renommer ou effacer ces fichiers avant %s."
+
+#, c-format
+msgid ""
+"The following untracked working tree files would be overwritten by %s:\n"
+"%%s"
+msgstr ""
+"Les fichiers suivants non suivis seraient écrasés par %s :\n"
+"%%s"
+
+#, c-format
+msgid "Entry '%s' overlaps with '%s'.  Cannot bind."
+msgstr "L'entrée '%s' surcharge avec '%s'. Affectation impossible."
+
+#, c-format
+msgid ""
+"Cannot update submodule:\n"
+"%s"
+msgstr ""
+"Mise à jour impossible pour le sous-module :\n"
+"%s"
+
+#, c-format
+msgid ""
+"The following paths are not up to date and were left despite sparse "
+"patterns:\n"
+"%s"
+msgstr ""
+"Les chemins suivants ne sont pas à jour et ont été laissés malgré les motifs "
+"clairsemés :\n"
+"%s"
+
+#, c-format
+msgid ""
+"The following paths are unmerged and were left despite sparse patterns:\n"
+"%s"
+msgstr ""
+"Les chemins suivants ne sont pas fusionnés et ont été laissés malgré les "
+"motifs clairsemés :\n"
+"%s"
+
+#, c-format
+msgid ""
+"The following paths were already present and thus not updated despite sparse "
+"patterns:\n"
+"%s"
+msgstr ""
+"Les chemins suivants étaient déjà présents et ont été laissés malgré les "
+"motifs clairsemés :\n"
+"%s"
+
+#, c-format
+msgid "Aborting\n"
+msgstr "Abandon\n"
+
+#, c-format
+msgid ""
+"After fixing the above paths, you may want to run `git sparse-checkout "
+"reapply`.\n"
+msgstr ""
+"Après correction des chemins ci-dessus, vous voulez peut-être lancer `git "
+"sparse-checkout reapply`.\n"
+
+msgid "Updating files"
+msgstr "Mise à jour des fichiers"
+
+msgid ""
+"the following paths have collided (e.g. case-sensitive paths\n"
+"on a case-insensitive filesystem) and only one from the same\n"
+"colliding group is in the working tree:\n"
+msgstr ""
+"les chemins suivants sont en collision (par exemple par des chemins\n"
+"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"
+
+msgid "Updating index flags"
+msgstr "Mise à jour des drapeaux de l'index"
+
+#, 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"
+
+msgid "expected flush after fetch arguments"
+msgstr "vidage attendu après les arguments de récupération"
+
+msgid "invalid URL scheme name or missing '://' suffix"
+msgstr "nom de schéma d'URL invalide ou suffixe '://' manquant"
+
+#, c-format
+msgid "invalid %XX escape sequence"
+msgstr "séquence d'échappement %XX invalide"
+
+msgid "missing host and scheme is not 'file:'"
+msgstr "hôte manquant et le schéma n'est pas 'file:'"
+
+msgid "a 'file:' URL may not have a port number"
+msgstr "une URL 'file:' ne peut pas contenir de numéro de port"
+
+msgid "invalid characters in host name"
+msgstr "caractères invalides dans le nom d'hôte"
+
+msgid "invalid port number"
+msgstr "numéro de port invalide"
+
+msgid "invalid '..' path segment"
+msgstr "segment de chemin '..' invalide"
+
+msgid "Fetching objects"
+msgstr "Récupération des objets"
+
+#, c-format
+msgid "'%s' at main working tree is not the repository directory"
+msgstr ""
+"'%s' dans l'arbre de travail principal n'est pas le répertoire de dépôt"
+
+#, c-format
+msgid "'%s' file does not contain absolute path to the working tree location"
+msgstr ""
+"le fichier '%s' ne contient pas de chemin absolu à l'emplacement de l'arbre "
+"de travail"
+
+#, c-format
+msgid "'%s' is not a .git file, error code %d"
+msgstr "'%s' n'est pas un fichier .git, code d'erreur %d"
+
+#, c-format
+msgid "'%s' does not point back to '%s'"
+msgstr "'%s' ne pointe pas en retour sur '%s'"
+
+msgid "not a directory"
+msgstr "pas un répertoire"
+
+msgid ".git is not a file"
+msgstr ".git n'est pas un fichier"
+
+msgid ".git file broken"
+msgstr "fichier .git cassé"
+
+msgid ".git file incorrect"
+msgstr "fichier .git incorrect"
+
+msgid "not a valid path"
+msgstr "pas un chemin valide"
+
+msgid "unable to locate repository; .git is not a file"
+msgstr "impossible de localiser le dépôt ; .git n'est pas un fichier"
+
+msgid "unable to locate repository; .git file does not reference a repository"
+msgstr ""
+"impossible de localiser le dépôt ; .git ne fait pas référence à un dépôt"
+
+msgid "unable to locate repository; .git file broken"
+msgstr "impossible de localiser le dépôt ; fichier .git cassé"
+
+msgid "gitdir unreadable"
+msgstr "gitdir non lisible"
+
+msgid "gitdir incorrect"
+msgstr "gitdir incorrect"
+
+msgid "not a valid directory"
+msgstr "pas un répertoire valide"
+
+msgid "gitdir file does not exist"
+msgstr "le fichier gitdir n'existe pas"
+
+#, c-format
+msgid "unable to read gitdir file (%s)"
+msgstr "impossible de lire le fichier gitdir (%s)"
+
+#, c-format
+msgid "short read (expected %<PRIuMAX> bytes, read %<PRIuMAX>)"
+msgstr ""
+"lecture trop courte ( %<PRIuMAX> octets attendus, %<PRIuMAX> octets lus)"
+
+msgid "invalid gitdir file"
+msgstr "fichier gitdir invalide"
+
+msgid "gitdir file points to non-existent location"
+msgstr "le fichier gitdir pointe sur un endroit inexistant"
+
+#, c-format
+msgid "unable to set %s in '%s'"
+msgstr "impossible de définir la clé %s dans '%s'"
+
+#, c-format
+msgid "unable to unset %s in '%s'"
+msgstr "impossible de désinitialiser %s dans '%s'"
+
+msgid "failed to set extensions.worktreeConfig setting"
+msgstr "échec de paramétrage extensions.worktreeConfig"
+
+#, c-format
+msgid "could not setenv '%s'"
+msgstr "impossible de configurer l'environnement '%s'"
+
+#, c-format
+msgid "unable to create '%s'"
+msgstr "impossible de créer '%s'"
+
+#, c-format
+msgid "could not open '%s' for reading and writing"
+msgstr "impossible d'ouvrir '%s' en lecture/écriture"
+
+#, c-format
+msgid "unable to access '%s'"
+msgstr "impossible d'accéder à '%s'"
+
+msgid "unable to get current working directory"
+msgstr "impossible d'accéder au répertoire de travail courant"
+
+msgid "Unmerged paths:"
+msgstr "Chemins non fusionnés :"
+
+msgid "  (use \"git restore --staged <file>...\" to unstage)"
+msgstr "  (utilisez \"git restore --staged <fichier>...\" pour désindexer)"
+
+#, c-format
+msgid "  (use \"git restore --source=%s --staged <file>...\" to unstage)"
+msgstr ""
+"  (utilisez \"git restore --source=%s --staged <fichier>...\" pour "
+"désindexer)"
+
+msgid "  (use \"git rm --cached <file>...\" to unstage)"
+msgstr "  (utilisez \"git rm --cached <fichier>...\" pour désindexer)"
+
+msgid "  (use \"git add <file>...\" to mark resolution)"
+msgstr "  (utilisez \"git add <fichier>...\" pour marquer comme résolu)"
+
+msgid "  (use \"git add/rm <file>...\" as appropriate to mark resolution)"
+msgstr ""
+"  (utilisez \"git add/rm <fichier>...\" si nécessaire pour marquer comme "
+"résolu)"
+
+msgid "  (use \"git rm <file>...\" to mark resolution)"
+msgstr "  (utilisez \"git rm <fichier>...\" pour marquer comme résolu)"
+
+msgid "Changes to be committed:"
+msgstr "Modifications qui seront validées :"
+
+msgid "Changes not staged for commit:"
+msgstr "Modifications qui ne seront pas validées :"
+
+msgid "  (use \"git add <file>...\" to update what will be committed)"
+msgstr ""
+"  (utilisez \"git add <fichier>...\" pour mettre à jour ce qui sera validé)"
+
+msgid "  (use \"git add/rm <file>...\" to update what will be committed)"
+msgstr ""
+"  (utilisez \"git add/rm <fichier>...\" pour mettre à jour ce qui sera "
+"validé)"
+
+msgid ""
+"  (use \"git restore <file>...\" to discard changes in working directory)"
+msgstr ""
+"  (utilisez \"git restore <fichier>...\" pour annuler les modifications dans "
+"le répertoire de travail)"
+
+msgid "  (commit or discard the untracked or modified content in submodules)"
+msgstr ""
+"  (valider ou annuler le contenu non suivi ou modifié dans les sous-modules)"
+
+#, c-format
+msgid "  (use \"git %s <file>...\" to include in what will be committed)"
+msgstr ""
+"  (utilisez \"git %s <fichier>...\" pour inclure dans ce qui sera validé)"
+
+msgid "both deleted:"
+msgstr "supprimé des deux côtés :"
+
+msgid "added by us:"
+msgstr "ajouté par nous :"
+
+msgid "deleted by them:"
+msgstr "supprimé par eux :"
+
+msgid "added by them:"
+msgstr "ajouté par eux :"
+
+msgid "deleted by us:"
+msgstr "supprimé par nous :"
+
+msgid "both added:"
+msgstr "ajouté de deux côtés :"
+
+msgid "both modified:"
+msgstr "modifié des deux côtés :"
+
+msgid "new file:"
+msgstr "nouveau fichier :"
+
+msgid "copied:"
+msgstr "copié :"
+
+msgid "deleted:"
+msgstr "supprimé :"
+
+msgid "modified:"
+msgstr "modifié :"
+
+msgid "renamed:"
+msgstr "renommé :"
+
+msgid "typechange:"
+msgstr "modif. type :"
+
+msgid "unknown:"
+msgstr "inconnu :"
+
+msgid "unmerged:"
+msgstr "non fusionné :"
+
+msgid "new commits, "
+msgstr "nouveaux commits, "
+
+msgid "modified content, "
+msgstr "contenu modifié, "
+
+msgid "untracked content, "
+msgstr "contenu non suivi, "
+
+#, c-format
+msgid "Your stash currently has %d entry"
+msgid_plural "Your stash currently has %d entries"
+msgstr[0] "Votre remisage contient actuellement %d entrée"
+msgstr[1] "Votre remisage contient actuellement %d entrées"
+
+msgid "Submodules changed but not updated:"
+msgstr "Sous-modules modifiés mais non mis à jour :"
+
+msgid "Submodule changes to be committed:"
+msgstr "Changements du sous-module à valider :"
+
+msgid ""
+"Do not modify or remove the line above.\n"
+"Everything below it will be ignored."
+msgstr ""
+"Ne touchez pas à la ligne ci-dessus.\n"
+"Tout ce qui suit sera éliminé."
+
+#, c-format
+msgid ""
+"\n"
+"It took %.2f seconds to compute the branch ahead/behind values.\n"
+"You can use '--no-ahead-behind' to avoid this.\n"
+msgstr ""
+"\n"
+"%.2f secondes ont été nécessaires pour calculer les valeurs d'avance/retard "
+"de la branche.\n"
+"Vous pouvez utiliser '--no-ahead-behind' pour éviter ceci.\n"
+
+msgid "You have unmerged paths."
+msgstr "Vous avez des chemins non fusionnés."
+
+msgid "  (fix conflicts and run \"git commit\")"
+msgstr "  (réglez les conflits puis lancez \"git commit\")"
+
+msgid "  (use \"git merge --abort\" to abort the merge)"
+msgstr "  (utilisez \"git merge --abort\" pour annuler la fusion)"
+
+msgid "All conflicts fixed but you are still merging."
+msgstr "Tous les conflits sont réglés mais la fusion n'est pas terminée."
+
+msgid "  (use \"git commit\" to conclude merge)"
+msgstr "  (utilisez \"git commit\" pour terminer la fusion)"
+
+msgid "You are in the middle of an am session."
+msgstr "Vous êtes au milieu d'une session am."
+
+msgid "The current patch is empty."
+msgstr "Le patch actuel est vide."
+
+msgid "  (fix conflicts and then run \"git am --continue\")"
+msgstr "  (réglez les conflits puis lancez \"git am --continue\")"
+
+msgid "  (use \"git am --skip\" to skip this patch)"
+msgstr "  (utilisez \"git am --skip\" pour sauter ce patch)"
+
+msgid ""
+"  (use \"git am --allow-empty\" to record this patch as an empty commit)"
+msgstr ""
+"  (utilisez \"git am --allow-empty\" pour enregistrer la rustine comme un "
+"commit vide)"
+
+msgid "  (use \"git am --abort\" to restore the original branch)"
+msgstr "  (utilisez \"git am --abort\" pour restaurer la branche d'origine)"
+
+msgid "git-rebase-todo is missing."
+msgstr "git-rebase-todo est manquant."
+
+msgid "No commands done."
+msgstr "Aucune commande réalisée."
+
+#, c-format
+msgid "Last command done (%<PRIuMAX> command done):"
+msgid_plural "Last commands done (%<PRIuMAX> commands done):"
+msgstr[0] "Dernière commande effectuée (%<PRIuMAX> commande effectuée) :"
+msgstr[1] "Dernières commandes effectuées (%<PRIuMAX> commandes effectuées) :"
+
+#, c-format
+msgid "  (see more in file %s)"
+msgstr "  (voir plus dans le fichier %s)"
+
+msgid "No commands remaining."
+msgstr "Aucune commande restante."
+
+#, c-format
+msgid "Next command to do (%<PRIuMAX> remaining command):"
+msgid_plural "Next commands to do (%<PRIuMAX> remaining commands):"
+msgstr[0] "Prochaine commande à effectuer (%<PRIuMAX> commande restante) :"
+msgstr[1] "Prochaines commandes à effectuer (%<PRIuMAX> commandes restantes) :"
+
+msgid "  (use \"git rebase --edit-todo\" to view and edit)"
+msgstr "  (utilisez \"git rebase --edit-todo\" pour voir et éditer)"
+
+#, c-format
+msgid "You are currently rebasing branch '%s' on '%s'."
+msgstr "Vous êtes en train de rebaser la branche '%s' sur '%s'."
+
+msgid "You are currently rebasing."
+msgstr "Vous êtes en train de rebaser."
+
+msgid "  (fix conflicts and then run \"git rebase --continue\")"
+msgstr "  (réglez les conflits puis lancez \"git rebase --continue\")"
+
+msgid "  (use \"git rebase --skip\" to skip this patch)"
+msgstr "  (utilisez \"git rebase --skip\" pour sauter ce patch)"
+
+msgid "  (use \"git rebase --abort\" to check out the original branch)"
+msgstr "  (utilisez \"git rebase --abort\" pour extraire la branche d'origine)"
+
+msgid "  (all conflicts fixed: run \"git rebase --continue\")"
+msgstr "  (tous les conflits sont réglés : lancez \"git rebase --continue\")"
+
+#, c-format
+msgid ""
+"You are currently splitting a commit while rebasing branch '%s' on '%s'."
+msgstr ""
+"Vous êtes actuellement en train de fractionner un commit pendant un rebasage "
+"de la branche '%s' sur '%s'."
+
+msgid "You are currently splitting a commit during a rebase."
+msgstr ""
+"Vous êtes actuellement en train de fractionner un commit pendant un rebasage."
+
+msgid "  (Once your working directory is clean, run \"git rebase --continue\")"
+msgstr ""
+"  (Une fois la copie de travail nettoyée, lancez \"git rebase --continue\")"
+
+#, c-format
+msgid "You are currently editing a commit while rebasing branch '%s' on '%s'."
+msgstr ""
+"Vous êtes actuellement en train d'éditer un commit pendant un rebasage de la "
+"branche '%s' sur '%s'."
+
+msgid "You are currently editing a commit during a rebase."
+msgstr ""
+"Vous êtes actuellement en train d'éditer un commit pendant un rebasage."
+
+msgid "  (use \"git commit --amend\" to amend the current commit)"
+msgstr "  (utilisez \"git commit --amend\" pour corriger le commit actuel)"
+
+msgid ""
+"  (use \"git rebase --continue\" once you are satisfied with your changes)"
+msgstr ""
+"  (utilisez \"git rebase --continue\" quand vous avez effectué toutes vos "
+"modifications)"
+
+msgid "Cherry-pick currently in progress."
+msgstr "Picorage en cours."
+
+#, c-format
+msgid "You are currently cherry-picking commit %s."
+msgstr "Vous êtes actuellement en train de picorer le commit %s."
+
+msgid "  (fix conflicts and run \"git cherry-pick --continue\")"
+msgstr "  (réglez les conflits puis lancez \"git cherry-pick --continue\")"
+
+msgid "  (run \"git cherry-pick --continue\" to continue)"
+msgstr "  (lancez \"git cherry-pick --continue\" pour continuer)"
+
+msgid "  (all conflicts fixed: run \"git cherry-pick --continue\")"
+msgstr ""
+"  (tous les conflits sont réglés : lancez \"git cherry-pick --continue\")"
+
+msgid "  (use \"git cherry-pick --skip\" to skip this patch)"
+msgstr "  (utilisez \"git cherry-pick --skip\" pour sauter ce patch)"
+
+msgid "  (use \"git cherry-pick --abort\" to cancel the cherry-pick operation)"
+msgstr "  (utilisez \"git cherry-pick --abort\" pour annuler le picorage)"
+
+msgid "Revert currently in progress."
+msgstr "Rétablissement en cours."
+
+#, c-format
+msgid "You are currently reverting commit %s."
+msgstr "Vous êtes actuellement en train de rétablir le commit %s."
+
+msgid "  (fix conflicts and run \"git revert --continue\")"
+msgstr "  (réglez les conflits puis lancez \"git revert --continue\")"
+
+msgid "  (run \"git revert --continue\" to continue)"
+msgstr "  (lancez \"git revert --continue\" pour continuer)"
+
+msgid "  (all conflicts fixed: run \"git revert --continue\")"
+msgstr "  (tous les conflits sont réglés : lancez \"git revert --continue\")"
+
+msgid "  (use \"git revert --skip\" to skip this patch)"
+msgstr "  (utilisez \"git revert --skip\" pour sauter ce patch)"
+
+msgid "  (use \"git revert --abort\" to cancel the revert operation)"
+msgstr "  (utilisez \"git revert --abort\" pour annuler le rétablissement)"
+
+#, c-format
+msgid "You are currently bisecting, started from branch '%s'."
+msgstr "Vous êtes en cours de bissection, depuis la branche '%s'."
+
+msgid "You are currently bisecting."
+msgstr "Vous êtes en cours de bissection."
+
+msgid "  (use \"git bisect reset\" to get back to the original branch)"
+msgstr "  (utilisez \"git bisect reset\" pour revenir à la branche d'origine)"
+
+msgid "You are in a sparse checkout."
+msgstr "Vous êtes dans une extraction clairsemée."
+
+#, c-format
+msgid "You are in a sparse checkout with %d%% of tracked files present."
+msgstr ""
+"Vous êtes dans une extraction partielle avec %d %% de fichiers suivis "
+"présents."
+
+msgid "On branch "
+msgstr "Sur la branche "
+
+msgid "interactive rebase in progress; onto "
+msgstr "rebasage interactif en cours ; sur "
+
+msgid "rebase in progress; onto "
+msgstr "rebasage en cours ; sur "
+
+msgid "HEAD detached at "
+msgstr "HEAD détachée sur "
+
+msgid "HEAD detached from "
+msgstr "HEAD détachée depuis "
+
+msgid "Not currently on any branch."
+msgstr "Actuellement sur aucun branche."
+
+msgid "Initial commit"
+msgstr "Validation initiale"
+
+msgid "No commits yet"
+msgstr "Aucun commit"
+
+msgid "Untracked files"
+msgstr "Fichiers non suivis"
+
+msgid "Ignored files"
+msgstr "Fichiers ignorés"
+
+#, c-format
+msgid ""
+"It took %.2f seconds to enumerate untracked files. 'status -uno'\n"
+"may speed it up, but you have to be careful not to forget to add\n"
+"new files yourself (see 'git help status')."
+msgstr ""
+"L'énumération des fichiers non suivis a duré %.2f secondes. 'status -uno'\n"
+"peut l'accélérer, mais vous devez alors faire attention à ne pas\n"
+"oublier d'ajouter les nouveaux fichiers par vous-même (voir 'git help "
+"status')."
+
+#, c-format
+msgid "Untracked files not listed%s"
+msgstr "Fichiers non suivis non affichés%s"
+
+msgid " (use -u option to show untracked files)"
+msgstr " (utilisez -u pour afficher les fichiers non suivis)"
+
+msgid "No changes"
+msgstr "Aucune modification"
+
+#, c-format
+msgid "no changes added to commit (use \"git add\" and/or \"git commit -a\")\n"
+msgstr ""
+"aucune modification n'a été ajoutée à la validation (utilisez \"git add\" ou "
+"\"git commit -a\")\n"
+
+#, c-format
+msgid "no changes added to commit\n"
+msgstr "aucune modification ajoutée à la validation\n"
+
+#, c-format
+msgid ""
+"nothing added to commit but untracked files present (use \"git add\" to "
+"track)\n"
+msgstr ""
+"aucune modification ajoutée à la validation mais des fichiers non suivis "
+"sont présents (utilisez \"git add\" pour les suivre)\n"
+
+#, c-format
+msgid "nothing added to commit but untracked files present\n"
+msgstr ""
+"aucune modification ajoutée à la validation mais des fichiers non suivis "
+"sont présents\n"
+
+#, c-format
+msgid "nothing to commit (create/copy files and use \"git add\" to track)\n"
+msgstr ""
+"rien à valider (créez/copiez des fichiers et utilisez \"git add\" pour les "
+"suivre)\n"
+
+#, c-format
+msgid "nothing to commit\n"
+msgstr "rien à valider\n"
+
+#, c-format
+msgid "nothing to commit (use -u to show untracked files)\n"
+msgstr "rien à valider (utilisez -u pour afficher les fichiers non suivis)\n"
+
+#, c-format
+msgid "nothing to commit, working tree clean\n"
+msgstr "rien à valider, la copie de travail est propre\n"
+
+msgid "No commits yet on "
+msgstr "Encore aucun commit sur "
+
+msgid "HEAD (no branch)"
+msgstr "HEAD (aucune branche)"
+
+msgid "different"
+msgstr "différent"
+
+msgid "behind "
+msgstr "derrière "
+
+msgid "ahead "
+msgstr "devant "
+
+#. TRANSLATORS: the action is e.g. "pull with rebase"
+#, c-format
+msgid "cannot %s: You have unstaged changes."
+msgstr "impossible de %s : vous avez des modifications non indexées."
+
+msgid "additionally, your index contains uncommitted changes."
+msgstr "de plus, votre index contient des modifications non validées."
+
+#, c-format
+msgid "cannot %s: Your index contains uncommitted changes."
+msgstr "%s impossible : votre index contient des modifications non validées."
+
 msgid ""
 "Error: Your local changes to the following files would be overwritten by "
 "merge"
@@ -26631,99 +21613,80 @@ msgstr ""
 "Erreur : vos modifications locales aux fichiers suivants seraient écrasées "
 "par la fusion"
 
-#: git-merge-octopus.sh:61
 msgid "Automated merge did not work."
 msgstr "La fusion automatique a échoué."
 
-#: git-merge-octopus.sh:62
 msgid "Should not be doing an octopus."
 msgstr "L'Octopus ne devrait pas arriver."
 
-#: git-merge-octopus.sh:73
 #, sh-format
 msgid "Unable to find common commit with $pretty_name"
 msgstr "Impossible de trouver un commit commun avec $pretty_name"
 
-#: git-merge-octopus.sh:77
 #, sh-format
 msgid "Already up to date with $pretty_name"
 msgstr "Déjà à jour avec $pretty_name"
 
-#: git-merge-octopus.sh:89
 #, sh-format
 msgid "Fast-forwarding to: $pretty_name"
 msgstr "Mise à jour en avance rapide sur $pretty_name"
 
-#: git-merge-octopus.sh:97
 #, sh-format
 msgid "Trying simple merge with $pretty_name"
 msgstr "Essai de fusion simple avec $pretty_name"
 
-#: git-merge-octopus.sh:102
 msgid "Simple merge did not work, trying automatic merge."
 msgstr "La fusion simple a échoué, essai avec la fusion automatique."
 
-#: git-sh-setup.sh:89 git-sh-setup.sh:94
 #, sh-format
 msgid "usage: $dashless $USAGE"
 msgstr "usage : $dashless $USAGE"
 
-#: git-sh-setup.sh:182
 #, sh-format
 msgid "Cannot chdir to $cdup, the toplevel of the working tree"
 msgstr ""
 "Impossible de se placer dans le répertoire $cdup, la racine de la copie de "
 "travail"
 
-#: git-sh-setup.sh:191 git-sh-setup.sh:198
 #, sh-format
 msgid "fatal: $program_name cannot be used without a working tree."
 msgstr "fatal : $program_name ne peut pas être utilisé sans copie de travail."
 
-#: git-sh-setup.sh:212
 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:215
 #, sh-format
 msgid "Cannot $action: You have unstaged changes."
 msgstr "$action est impossible : vous avez des modifications non indexées."
 
-#: git-sh-setup.sh:226
 #, 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:228
 msgid "Additionally, your index contains uncommitted changes."
 msgstr "De plus, votre index contient des modifications non validées."
 
-#: git-sh-setup.sh:348
 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:353
 msgid "Unable to determine absolute path of git directory"
 msgstr "Impossible de déterminer le chemin absolu du répertoire git"
 
 #. TRANSLATORS: you can adjust this to align "git add -i" status menu
-#: git-add--interactive.perl:212
 #, perl-format
 msgid "%12s %12s %s"
 msgstr "%12s %s12s %s"
 
-#: git-add--interactive.perl:632
 #, perl-format
 msgid "touched %d path\n"
 msgid_plural "touched %d paths\n"
 msgstr[0] "%d chemin touché\n"
 msgstr[1] "%d chemins touchés\n"
 
-#: git-add--interactive.perl:1056
 msgid ""
 "If the patch applies cleanly, the edited hunk will immediately be\n"
 "marked for staging."
@@ -26731,7 +21694,6 @@ msgstr ""
 "Si le patch s'applique proprement, la section éditée sera\n"
 "immédiatement marquée comme indexée."
 
-#: git-add--interactive.perl:1059
 msgid ""
 "If the patch applies cleanly, the edited hunk will immediately be\n"
 "marked for stashing."
@@ -26739,7 +21701,6 @@ msgstr ""
 "Si le patch s'applique proprement, la section éditée sera\n"
 "immédiatement marquée comme remisée."
 
-#: git-add--interactive.perl:1062
 msgid ""
 "If the patch applies cleanly, the edited hunk will immediately be\n"
 "marked for unstaging."
@@ -26747,8 +21708,6 @@ msgstr ""
 "Si le patch s'applique proprement, la section éditée sera\n"
 "immédiatement marquée comme desindexée."
 
-#: git-add--interactive.perl:1065 git-add--interactive.perl:1074
-#: git-add--interactive.perl:1080
 msgid ""
 "If the patch applies cleanly, the edited hunk will immediately be\n"
 "marked for applying."
@@ -26756,8 +21715,6 @@ msgstr ""
 "Si le patch s'applique proprement, la section éditée sera\n"
 "immédiatement marquée comme appliquée."
 
-#: git-add--interactive.perl:1068 git-add--interactive.perl:1071
-#: git-add--interactive.perl:1077
 msgid ""
 "If the patch applies cleanly, the edited hunk will immediately be\n"
 "marked for discarding."
@@ -26765,12 +21722,10 @@ msgstr ""
 "Si le patch s'applique proprement, la section éditée sera\n"
 "immédiatement marquée comme éliminée."
 
-#: git-add--interactive.perl:1114
 #, perl-format
 msgid "failed to open hunk edit file for writing: %s"
 msgstr "impossible d'ouvrir le fichier d'édition de section en écriture : %s"
 
-#: git-add--interactive.perl:1121
 #, perl-format
 msgid ""
 "---\n"
@@ -26783,12 +21738,10 @@ msgstr ""
 "Pour éliminer les lignes '%s', effacez-les.\n"
 "Les lignes commençant par %s seront éliminées.\n"
 
-#: git-add--interactive.perl:1143
 #, perl-format
 msgid "failed to open hunk edit file for reading: %s"
 msgstr "échec de l'ouverture du fichier d'édition de section en lecture : %s"
 
-#: git-add--interactive.perl:1253
 msgid ""
 "y - stage this hunk\n"
 "n - do not stage this hunk\n"
@@ -26802,7 +21755,6 @@ msgstr ""
 "a - indexer cette section et toutes les suivantes de ce fichier\n"
 "d - ne pas indexer cette section ni les suivantes de ce fichier"
 
-#: git-add--interactive.perl:1259
 msgid ""
 "y - stash this hunk\n"
 "n - do not stash this hunk\n"
@@ -26816,7 +21768,6 @@ msgstr ""
 "a - remiser cette section et toutes les suivantes de ce fichier\n"
 "d - ne pas remiser cette section ni les suivantes de ce fichier"
 
-#: git-add--interactive.perl:1265
 msgid ""
 "y - unstage this hunk\n"
 "n - do not unstage this hunk\n"
@@ -26830,7 +21781,6 @@ msgstr ""
 "a - désindexer cette section et toutes les suivantes de ce fichier\n"
 "d - ne pas désindexer cette section ni les suivantes de ce fichier"
 
-#: git-add--interactive.perl:1271
 msgid ""
 "y - apply this hunk to index\n"
 "n - do not apply this hunk to index\n"
@@ -26844,7 +21794,6 @@ msgstr ""
 "a - appliquer cette section et toutes les suivantes de ce fichier\n"
 "d - ne pas appliquer cette section ni les suivantes de ce fichier"
 
-#: git-add--interactive.perl:1277 git-add--interactive.perl:1295
 msgid ""
 "y - discard this hunk from worktree\n"
 "n - do not discard this hunk from worktree\n"
@@ -26858,7 +21807,6 @@ msgstr ""
 "a - supprimer cette section et toutes les suivantes de ce fichier\n"
 "d - ne pas supprimer cette section ni les suivantes de ce fichier"
 
-#: git-add--interactive.perl:1283
 msgid ""
 "y - discard this hunk from index and worktree\n"
 "n - do not discard this hunk from index and worktree\n"
@@ -26872,7 +21820,6 @@ msgstr ""
 "a - éliminer cette section et toutes les suivantes de ce fichier\n"
 "d - ne pas éliminer cette section ni les suivantes de ce fichier"
 
-#: git-add--interactive.perl:1289
 msgid ""
 "y - apply this hunk to index and worktree\n"
 "n - do not apply this hunk to index and worktree\n"
@@ -26886,7 +21833,6 @@ msgstr ""
 "a - appliquer cette section et toutes les suivantes de ce fichier\n"
 "d - ne pas appliquer cette section ni les suivantes de ce fichier"
 
-#: git-add--interactive.perl:1301
 msgid ""
 "y - apply this hunk to worktree\n"
 "n - do not apply this hunk to worktree\n"
@@ -26900,7 +21846,6 @@ msgstr ""
 "a - appliquer cette section et toutes les suivantes de ce fichier\n"
 "d - ne pas appliquer cette section ni les suivantes de ce fichier"
 
-#: git-add--interactive.perl:1316
 msgid ""
 "g - select a hunk to go to\n"
 "/ - search for a hunk matching the given regex\n"
@@ -26922,91 +21867,73 @@ msgstr ""
 "e - éditer manuellement la section actuelle\n"
 "? - afficher l'aide\n"
 
-#: git-add--interactive.perl:1347
 msgid "The selected hunks do not apply to the index!\n"
 msgstr "Les sections sélectionnées ne s'applique pas à l'index !\n"
 
-#: git-add--interactive.perl:1362
 #, perl-format
 msgid "ignoring unmerged: %s\n"
 msgstr "fichier non-fusionné ignoré : %s\n"
 
-#: git-add--interactive.perl:1481
 #, perl-format
 msgid "Apply mode change to worktree [y,n,q,a,d%s,?]? "
 msgstr ""
 "Appliquer le changement de mode dans l'arbre de travail [y,n,q,a,d%s,?] ? "
 
-#: git-add--interactive.perl:1482
 #, perl-format
 msgid "Apply deletion to worktree [y,n,q,a,d%s,?]? "
 msgstr "Appliquer la suppression dans l'arbre de travail [y,n,q,a,d%s,?] ? "
 
-#: git-add--interactive.perl:1483
 #, perl-format
 msgid "Apply addition to worktree [y,n,q,a,d%s,?]? "
 msgstr "Appliquer l'ajout dans l'arbre de travail [y,n,q,a,d%s,?] ? "
 
-#: git-add--interactive.perl:1484
 #, perl-format
 msgid "Apply this hunk to worktree [y,n,q,a,d%s,?]? "
 msgstr "Appliquer la section à l'arbre de travail [y,n,q,a,d%s,?] ? "
 
-#: git-add--interactive.perl:1601
 msgid "No other hunks to goto\n"
 msgstr "Aucune autre section à atteindre\n"
 
-#: git-add--interactive.perl:1619
 #, perl-format
 msgid "Invalid number: '%s'\n"
 msgstr "Nombre invalide : '%s'\n"
 
-#: git-add--interactive.perl:1624
 #, perl-format
 msgid "Sorry, only %d hunk available.\n"
 msgid_plural "Sorry, only %d hunks available.\n"
 msgstr[0] "Désolé, %d seule section disponible.\n"
 msgstr[1] "Désolé, Seulement %d sections disponibles.\n"
 
-#: git-add--interactive.perl:1659
 msgid "No other hunks to search\n"
 msgstr "Aucune autre section à rechercher\n"
 
-#: git-add--interactive.perl:1676
 #, perl-format
 msgid "Malformed search regexp %s: %s\n"
 msgstr "Regex de recherche malformée %s : %s\n"
 
-#: git-add--interactive.perl:1686
 msgid "No hunk matches the given pattern\n"
 msgstr "Aucune section ne correspond au motif donné\n"
 
-#: git-add--interactive.perl:1698 git-add--interactive.perl:1720
 msgid "No previous hunk\n"
 msgstr "Pas de section précédente\n"
 
-#: git-add--interactive.perl:1707 git-add--interactive.perl:1726
 msgid "No next hunk\n"
 msgstr "Pas de section suivante\n"
 
-#: git-add--interactive.perl:1732
 msgid "Sorry, cannot split this hunk\n"
 msgstr "Désolé, impossible de découper cette section\n"
 
-#: git-add--interactive.perl:1738
 #, perl-format
 msgid "Split into %d hunk.\n"
 msgid_plural "Split into %d hunks.\n"
 msgstr[0] "Découpée en %d section.\n"
 msgstr[1] "Découpée en %d sections.\n"
 
-#: git-add--interactive.perl:1748
 msgid "Sorry, cannot edit this hunk\n"
 msgstr "Désolé, impossible d'éditer cette section\n"
 
 #. TRANSLATORS: please do not translate the command names
 #. 'status', 'update', 'revert', etc.
-#: git-add--interactive.perl:1813
 msgid ""
 "status        - show paths with changes\n"
 "update        - add working tree state to the staged set of changes\n"
@@ -27024,58 +21951,44 @@ msgstr ""
 "diff          - visualiser les diff entre HEAD et l'index\n"
 "add untracked - ajouter les fichiers non-suivis aux modifications à indexer\n"
 
-#: git-add--interactive.perl:1830 git-add--interactive.perl:1842
-#: git-add--interactive.perl:1845 git-add--interactive.perl:1852
-#: git-add--interactive.perl:1855 git-add--interactive.perl:1862
-#: git-add--interactive.perl:1866 git-add--interactive.perl:1872
 msgid "missing --"
 msgstr "-- manquant"
 
-#: git-add--interactive.perl:1868
 #, perl-format
 msgid "unknown --patch mode: %s"
 msgstr "mode de --patch inconnu : %s"
 
-#: git-add--interactive.perl:1874 git-add--interactive.perl:1880
 #, perl-format
 msgid "invalid argument %s, expecting --"
 msgstr "argument invalide %s, -- attendu"
 
-#: git-send-email.perl:159
 msgid "local zone differs from GMT by a non-minute interval\n"
 msgstr ""
 "la zone locale diffère du GMT par un intervalle supérieur à une minute\n"
 
-#: git-send-email.perl:166 git-send-email.perl:172
 msgid "local time offset greater than or equal to 24 hours\n"
 msgstr "le décalage de temps local est plus grand ou égal à 24 heures\n"
 
-#: git-send-email.perl:244
 #, perl-format
 msgid "fatal: command '%s' died with exit code %d"
 msgstr "fatal : la commande '%s' s'est interrompue avec le code %d"
 
-#: git-send-email.perl:257
 msgid "the editor exited uncleanly, aborting everything"
 msgstr "l'éditeur est sorti en erreur, abandon total"
 
-#: git-send-email.perl:346
 #, perl-format
 msgid ""
 "'%s' contains an intermediate version of the email you were composing.\n"
 msgstr ""
 "'%s' contient une version intermédiaire du courriel que vous composiez.\n"
 
-#: git-send-email.perl:351
 #, perl-format
 msgid "'%s.final' contains the composed email.\n"
 msgstr "'%s.final' contient le courriel composé.\n"
 
-#: git-send-email.perl:484
 msgid "--dump-aliases incompatible with other options\n"
 msgstr "--dump-aliases est incompatible avec d'autres options\n"
 
-#: git-send-email.perl:561
 msgid ""
 "fatal: found configuration options for 'sendmail'\n"
 "git-send-email is configured with the sendemail.* options - note the 'e'.\n"
@@ -27087,11 +22000,9 @@ msgstr ""
 "Positionnez sendemail.forbidSendmailVariables à false pour désactiver cette "
 "vérification.\n"
 
-#: git-send-email.perl:566 git-send-email.perl:782
 msgid "Cannot run git format-patch from outside a repository\n"
 msgstr "Lancement de git format-patch impossible à l'extérieur d'un dépôt\n"
 
-#: git-send-email.perl:569
 msgid ""
 "`batch-size` and `relogin` must be specified together (via command-line or "
 "configuration option)\n"
@@ -27099,39 +22010,32 @@ msgstr ""
 "`batch-size` et `relogin` doivent être spécifiés ensembles (via la ligne de "
 "commande ou des options de configuration)\n"
 
-#: git-send-email.perl:582
 #, perl-format
 msgid "Unknown --suppress-cc field: '%s'\n"
 msgstr "Champ de --suppress-cc inconnu : '%s'\n"
 
-#: git-send-email.perl:613
 #, perl-format
 msgid "Unknown --confirm setting: '%s'\n"
 msgstr "Paramètre de --confirm inconnu : '%s'\n"
 
-#: git-send-email.perl:653
 #, perl-format
 msgid "warning: sendmail alias with quotes is not supported: %s\n"
 msgstr ""
 "attention : les guillemets ne sont pas supportés dans alias sendmail : %s\n"
 
-#: git-send-email.perl:655
 #, perl-format
 msgid "warning: `:include:` not supported: %s\n"
 msgstr "attention : `:include:` n'est pas supporté : %s\n"
 
-#: git-send-email.perl:657
 #, perl-format
 msgid "warning: `/file` or `|pipe` redirection not supported: %s\n"
 msgstr ""
 "attention : les redirections `/file` ou `|pipe` ne sont pas supportées : %s\n"
 
-#: git-send-email.perl:662
 #, perl-format
 msgid "warning: sendmail line is not recognized: %s\n"
 msgstr "attention : ligne sendmail non reconnue : %s\n"
 
-#: git-send-email.perl:747
 #, perl-format
 msgid ""
 "File '%s' exists but it could also be the range of commits\n"
@@ -27146,12 +22050,10 @@ msgstr ""
 "    * en indiquant \"./%s\" si vous désignez un fichier, ou\n"
 "    * en fournissant l'option --format-patch pour une plage.\n"
 
-#: git-send-email.perl:768
 #, perl-format
 msgid "Failed to opendir %s: %s"
 msgstr "Échec à l'ouverture du répertoire %s : %s"
 
-#: git-send-email.perl:803
 msgid ""
 "\n"
 "No patch files specified!\n"
@@ -27161,17 +22063,14 @@ msgstr ""
 "Aucun fichier patch spécifié !\n"
 "\n"
 
-#: git-send-email.perl:816
 #, perl-format
 msgid "No subject line in %s?"
 msgstr "Ligne de sujet non trouvée dans %s ?"
 
-#: git-send-email.perl:827
 #, perl-format
 msgid "Failed to open for writing %s: %s"
 msgstr "Impossible d'ouvrir %s en écriture : %s"
 
-#: git-send-email.perl:838
 msgid ""
 "Lines beginning in \"GIT:\" will be removed.\n"
 "Consider including an overall diffstat or table of contents\n"
@@ -27185,27 +22084,22 @@ msgstr ""
 "\n"
 "Effacez le corps si vous ne souhaitez pas envoyer un résumé.\n"
 
-#: git-send-email.perl:862
 #, perl-format
 msgid "Failed to open %s: %s"
 msgstr "Échec à l'ouverture de %s : %s"
 
-#: git-send-email.perl:879
 #, perl-format
 msgid "Failed to open %s.final: %s"
 msgstr "Échec à l'ouverture de %s.final : %s"
 
-#: git-send-email.perl:922
 msgid "Summary email is empty, skipping it\n"
 msgstr "Le courriel de résumé étant vide, il a été ignoré\n"
 
 #. TRANSLATORS: please keep [y/N] as is.
-#: git-send-email.perl:971
 #, perl-format
 msgid "Are you sure you want to use <%s> [y/N]? "
 msgstr "Êtes-vous sur de vouloir utiliser <%s> [y/N] ? "
 
-#: git-send-email.perl:1026
 msgid ""
 "The following files are 8bit, but do not declare a Content-Transfer-"
 "Encoding.\n"
@@ -27213,11 +22107,9 @@ msgstr ""
 "Les fichiers suivants sont 8bit mais ne déclarent pas de champs Content-"
 "Transfer-Encoding.\n"
 
-#: git-send-email.perl:1031
 msgid "Which 8bit encoding should I declare [UTF-8]? "
 msgstr "Quel encodage 8bit doit être déclaré [UTF8] ? "
 
-#: git-send-email.perl:1039
 #, perl-format
 msgid ""
 "Refusing to send because the patch\n"
@@ -27230,22 +22122,18 @@ msgstr ""
 "a un sujet modèle '*** SUBJECT HERE ***'. Passez --force is vous souhaitez "
 "vraiment envoyer.\n"
 
-#: git-send-email.perl:1058
 msgid "To whom should the emails be sent (if anyone)?"
 msgstr "À qui les courriels doivent-ils être envoyés (s'il y en a) ?"
 
-#: git-send-email.perl:1076
 #, perl-format
 msgid "fatal: alias '%s' expands to itself\n"
 msgstr "fatal : l'alias '%s' se développe en lui-même\n"
 
-#: git-send-email.perl:1088
 msgid "Message-ID to be used as In-Reply-To for the first email (if any)? "
 msgstr ""
 "Message-ID à utiliser comme In-Reply-To pour le premier courriel (s'il y en "
 "a) ? "
 
-#: git-send-email.perl:1150 git-send-email.perl:1158
 #, perl-format
 msgid "error: unable to extract a valid address from: %s\n"
 msgstr "erreur : impossible d'extraire une adresse valide depuis : %s\n"
@@ -27253,16 +22141,13 @@ msgstr "erreur : impossible d'extraire une adresse valide depuis : %s\n"
 #. 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:1162
 msgid "What to do with this address? ([q]uit|[d]rop|[e]dit): "
 msgstr "Que faire de cette adresse ? ([q]uitter|[d]élaisser|[e]diter): "
 
-#: git-send-email.perl:1482
 #, perl-format
 msgid "CA path \"%s\" does not exist"
 msgstr "Le chemin vers la CA \"%s\" n'existe pas"
 
-#: git-send-email.perl:1565
 msgid ""
 "    The Cc list above has been expanded by additional\n"
 "    addresses found in the patch commit message. By default\n"
@@ -27289,114 +22174,90 @@ msgstr ""
 #. 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:1580
 msgid "Send this email? ([y]es|[n]o|[e]dit|[q]uit|[a]ll): "
 msgstr "Envoyer ce courriel ? ([y]es|[n]o|[e]dit|[q]uit|[a]ll) : "
 
-#: git-send-email.perl:1583
 msgid "Send this email reply required"
 msgstr "Une réponse est nécessaire"
 
-#: git-send-email.perl:1617
 msgid "The required SMTP server is not properly defined."
 msgstr "Le serveur SMTP nécessaire n'est pas défini correctement."
 
-#: git-send-email.perl:1664
 #, perl-format
 msgid "Server does not support STARTTLS! %s"
 msgstr "Le serveur ne supporte pas STARTTLS ! %s"
 
-#: git-send-email.perl:1669 git-send-email.perl:1673
 #, perl-format
 msgid "STARTTLS failed! %s"
 msgstr "échec de STARTTLS ! %s"
 
-#: git-send-email.perl:1682
 msgid "Unable to initialize SMTP properly. Check config and use --smtp-debug."
 msgstr ""
 "Impossible d'initialiser SMTP. Vérifiez la configuration et utilisez --smtp-"
 "debug."
 
-#: git-send-email.perl:1700
 #, perl-format
 msgid "Failed to send %s\n"
 msgstr "Échec de l'envoi de %s\n"
 
-#: git-send-email.perl:1703
 #, perl-format
 msgid "Dry-Sent %s\n"
 msgstr "Envoi simulé de %s\n"
 
-#: git-send-email.perl:1703
 #, perl-format
 msgid "Sent %s\n"
 msgstr "%s envoyé\n"
 
-#: git-send-email.perl:1705
 msgid "Dry-OK. Log says:\n"
 msgstr "Simulation OK. Le journal indique :\n"
 
-#: git-send-email.perl:1705
 msgid "OK. Log says:\n"
 msgstr "OK. Le journal indique :\n"
 
-#: git-send-email.perl:1724
 msgid "Result: "
 msgstr "Résultat : "
 
-#: git-send-email.perl:1727
 msgid "Result: OK\n"
 msgstr "Résultat : OK\n"
 
-#: git-send-email.perl:1744
 #, perl-format
 msgid "can't open file %s"
 msgstr "impossible d'ouvrir le fichier %s"
 
-#: git-send-email.perl:1792 git-send-email.perl:1812
 #, perl-format
 msgid "(mbox) Adding cc: %s from line '%s'\n"
 msgstr "(mbox) Ajout de cc: %s depuis la ligne '%s'\n"
 
-#: git-send-email.perl:1798
 #, perl-format
 msgid "(mbox) Adding to: %s from line '%s'\n"
 msgstr "(mbox) Ajout de to: %s depuis la ligne '%s'\n"
 
-#: git-send-email.perl:1855
 #, perl-format
 msgid "(non-mbox) Adding cc: %s from line '%s'\n"
 msgstr "(non-mbox) Ajout de cc: %s depuis la ligne '%s'\n"
 
-#: git-send-email.perl:1890
 #, perl-format
 msgid "(body) Adding cc: %s from line '%s'\n"
 msgstr "(corps) Ajout de cc: %s depuis la ligne '%s'\n"
 
-#: git-send-email.perl:2009
 #, perl-format
 msgid "(%s) Could not execute '%s'"
 msgstr "(%s) Impossible d'exécuter '%s'"
 
-#: git-send-email.perl:2016
 #, perl-format
 msgid "(%s) Adding %s: %s from: '%s'\n"
 msgstr "(%s) Ajout de %s : %s depuis : '%s'\n"
 
-#: git-send-email.perl:2020
 #, perl-format
 msgid "(%s) failed to close pipe to '%s'"
 msgstr "(%s) échec de la fermeture du pipe vers '%s'"
 
-#: git-send-email.perl:2050
 msgid "cannot send message as 7bit"
 msgstr "impossible d'envoyer un message comme 7bit"
 
-#: git-send-email.perl:2058
 msgid "invalid transfer encoding"
 msgstr "codage de transfert invalide"
 
-#: git-send-email.perl:2100
 #, perl-format
 msgid ""
 "fatal: %s: rejected by %s hook\n"
@@ -27407,12 +22268,10 @@ msgstr ""
 "%s\n"
 "attention : aucun patch envoyé\n"
 
-#: git-send-email.perl:2110 git-send-email.perl:2163 git-send-email.perl:2173
 #, perl-format
 msgid "unable to open %s: %s\n"
 msgstr "impossible d'ouvrir %s :%s\n"
 
-#: git-send-email.perl:2113
 #, perl-format
 msgid ""
 "fatal: %s:%d is longer than 998 characters\n"
@@ -27421,666 +22280,14 @@ msgstr ""
 "fatal : %s : %d est plus long que 998 caractères \n"
 "attention : aucun patch envoyé\n"
 
-#: git-send-email.perl:2131
 #, 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:2135
 #, perl-format
 msgid "Do you really want to send %s? [y|N]: "
 msgstr "Souhaitez-vous réellement envoyer %s ?[y|N] : "
 
-#, perl-format
-#~ msgid "fatal: %s: rejected by %s hook\n"
-#~ msgstr "fatal : %s : rejetée par le crocher %s\n"
-
-#~ msgid "git archive --list"
-#~ msgstr "git archive --list"
-
-#, c-format
-#~ msgid "unknown value for --diff-merges: %s"
-#~ msgstr "valeur inconnue pour --diff-merges : %s"
-
-#, c-format
-#~ msgid "invalid value '%s' for lsrefs.unborn"
-#~ msgstr "valeur invalide '%s' pour lsrefs.unborn"
-
-#~ msgid "backend for `git stash -p`"
-#~ msgstr "backend pour `git stash -p`"
-
-#, c-format
-#~ msgid "Invalid value for --empty: %s"
-#~ msgstr "Valeur invalide pour --empty : %s"
-
-#, c-format
-#~ msgid "Invalid value for --patch-format: %s"
-#~ msgstr "Valeur invalide pour --patch-format : %s"
-
-#, c-format
-#~ msgid "Invalid value for --show-current-patch: %s"
-#~ msgstr "Valeur invalide pour --show-current-patch : %s"
-
-#~ msgid ""
-#~ "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-new]"
-
-#~ msgid "git bisect--helper --bisect-next"
-#~ msgstr "git bisect--helper --bisect-next"
-
-#~ msgid "git bisect--helper --bisect-visualize"
-#~ msgstr "git bisect--helper --bisect-visualize"
-
-#, c-format
-#~ msgid "invalid color '%s' in color.blame.repeatedLines"
-#~ msgstr "couleur invalide '%s' dans color.blame.repeatedLines"
-
-#~ msgid "invalid value for blame.coloring"
-#~ msgstr "valeur invalide pour blame.coloring"
-
-#~ 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-unknow-type] | -s [--allow-unknow-type] | -e | -"
-#~ "p | <type> | --textconv | --filters) [--path=<chemin>] <objet>"
-
-#~ msgid "show object type"
-#~ msgstr "afficher le type de l'objet"
-
-#~ msgid "exit with zero when there's no error"
-#~ msgstr "sortir avec un code d'erreur nul quand il n'y a aucune erreur"
-
-#~ 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"
-
-#~ msgid "show info about objects fed from the standard input"
-#~ msgstr "afficher l'information des objets passés en entrée standard"
-
-#~ 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)"
-
-#~ msgid "show all objects with --batch or --batch-check"
-#~ msgstr "montrer tous les objets avec --batch ou --batch-check"
-
-#~ msgid "do not order --batch-all-objects output"
-#~ msgstr "ne pas ordonner la sortie de --batch-all-objects"
-
-#~ msgid "set up tracking mode (see git-pull(1))"
-#~ msgstr "régler le mode de suivi (voir git-pull(1))"
-
-#~ 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"
-
-#~ msgid "Options --squash and --fixup cannot be used together"
-#~ msgstr ""
-#~ "Les options --squash et --fixup ne peuvent pas être utilisées ensemble"
-
-#~ msgid "Only one of -c/-C/-F/--fixup can be used."
-#~ msgstr "Une seule option parmi -c/-C/-F/--fixup peut être utilisée."
-
-#~ msgid "Option -m cannot be combined with -c/-C/-F."
-#~ msgstr "L'option -m ne peut pas être combinée avec -c/-C/-F."
-
-#~ 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."
-
-#~ msgid "git count-objects [-v] [-H | --human-readable]"
-#~ msgstr "git count-objects [-v] [-H | --human-readable]"
-
-#, c-format
-#~ msgid "configuration fetch.output contains invalid value %s"
-#~ msgstr ""
-#~ "le paramètre de configuration fetch.output contient une valeur invalide %s"
-
-#~ msgid "--cached or --untracked cannot be used with --no-index"
-#~ msgstr ""
-#~ "--cached ou --untracked ne peuvent pas être utilisés avec --no-index"
-
-#~ msgid "--untracked cannot be used with --cached"
-#~ msgstr "--untracked ne peut pas être utilisé avec --cached"
-
-#~ msgid "git hash-object  --stdin-paths"
-#~ msgstr "git hash-object  --stdin-paths"
-
-#~ msgid "git help [-g|--guides]"
-#~ msgstr "git help [-g|--guides]"
-
-#~ msgid "git help [-c|--config]"
-#~ msgstr "git help [-c|--config]"
-
-#~ msgid "git mktag"
-#~ msgstr "git mktag"
-
-#~ msgid "git mktree [-z] [--missing] [--batch]"
-#~ msgstr "git mktree [-z] [--missing] [--batch]"
-
-#~ msgid "read from stdin"
-#~ msgstr "lire depuis l'entrée standard"
-
-#~ msgid "git notes merge --commit [-v | -q]"
-#~ msgstr "git notes merge --commit [-v | -q]"
-
-#~ msgid "git notes merge --abort [-v | -q]"
-#~ msgstr "git notes merge --abort [-v | -q]"
-
-#~ msgid "git notes get-ref"
-#~ msgstr "git notes get-ref"
-
-#~ msgid "invalid value for --missing"
-#~ msgstr "valeur invalide pour --missing"
-
-#~ msgid "git prune-packed [-n | --dry-run] [-q | --quiet]"
-#~ msgstr "git prune-packed [-n | --dry-run] [-q | --quiet]"
-
-#, c-format
-#~ msgid "Invalid value for %s: %s"
-#~ msgstr "Valeur invalide pour %s : %s"
-
-#, c-format
-#~ msgid "Invalid value for pull.ff: %s"
-#~ msgstr "Valeur invalide pour pull.ff : %s"
-
-#~ msgid "git rebase --continue | --abort | --skip | --edit-todo"
-#~ msgstr "git rebase --continue | --abort | --skip | --edit-todo"
-
-#, c-format
-#~ msgid "'%s' is not a valid timestamp"
-#~ msgstr "'%s' n'est pas un horodatage valide"
-
-#~ msgid "git reflog [ show | expire | delete | exists ]"
-#~ msgstr "git reflog [ show | expire | delete | exists ]"
-
-#~ msgid "git remote [-v | --verbose]"
-#~ msgstr "git remote [-v | --verbose]"
-
-#~ msgid "git replace [-f] --convert-graft-file"
-#~ msgstr "git replace [-f] --convert-graft-file"
-
-#, c-format
-#~ msgid ""
-#~ "\n"
-#~ "It 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"
-#~ msgstr ""
-#~ "\n"
-#~ "Les modifications non-indexées ont pris %.2f secondes à énumérer après "
-#~ "reset.\n"
-#~ "Vous pouvez utiliser '--quiet' pour éviter ce message. Réglez le "
-#~ "paramètre de\n"
-#~ "config reset.quiet à true pour avoir ce comportement en permanence.\n"
-
-#~ msgid "git sparse-checkout list"
-#~ msgstr "git sparse-checkout list"
-
-#~ msgid "unable to upgrade repository format to enable worktreeConfig"
-#~ msgstr ""
-#~ "impossible de mettre à jour le format de dépôt pour activer worktreeConfig"
-
-#~ msgid "git sparse-checkout init [--cone] [--[no-]sparse-index]"
-#~ msgstr "git sparse-checkout init [--cone] [--[no-]sparse-index]"
-
-#~ msgid "git sparse-checkout reapply [--[no-]cone] [--[no-]sparse-index]"
-#~ msgstr "git sparse-checkout reapply [--[no-]cone] [--[no-]sparse-index]"
-
-#~ msgid "git sparse-checkout disable"
-#~ msgstr "git sparse-checkout disable"
-
-#~ msgid ""
-#~ "the stash.useBuiltin support has been removed!\n"
-#~ "See its entry in 'git help config' for details."
-#~ msgstr ""
-#~ "la prise en charge de stash.useBuiltin a été supprimée !\n"
-#~ "Voir son entrée dans 'git help config' pour plus de détails."
-
-#~ msgid "git stripspace [-s | --strip-comments]"
-#~ msgstr "git stripspace [-s | --strip-comments]"
-
-#~ msgid "git stripspace [-c | --comment-lines]"
-#~ msgstr "git stripspace [-c | --comment-lines]"
-
-#~ msgid "submodule--helper print-default-remote takes no arguments"
-#~ msgstr "submodule--helper  print-default-remote n'accepte aucun argument"
-
-#~ msgid "git submodule--helper update-clone [--prefix=<path>] [<path>...]"
-#~ msgstr ""
-#~ "git submodule--helper update-clone [--prefix=<chemin>] [<chemin>...]"
-
-#~ msgid "suppress output for update by rebase or merge"
-#~ msgstr ""
-#~ "supprimer la sortie lors de la mise à jour par un rebasage ou une fusion"
-
-#~ 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"
-
-#~ msgid "depth for shallow fetch"
-#~ msgstr "profondeur pour une récupération superficielle"
-
-#~ msgid "sha1"
-#~ msgstr "sha1"
-
-#~ msgid "SHA1 expected by superproject"
-#~ msgstr "SHA1 attendu par le super-projet"
-
-#~ msgid "subsha1"
-#~ msgstr "sous-sha1"
-
-#~ msgid "SHA1 of submodule's HEAD"
-#~ msgstr "SHA1 de la HEAD du sous-module"
-
-#~ msgid "git submodule--helper run-update-procedure [<options>] <path>"
-#~ msgstr "git submodule--helper run-update-procedure [<options>] <chemin>"
-
-#~ msgid "git submodule--helper config --check-writeable"
-#~ msgstr "git submodule--helper config --check-writeable"
-
-#~ msgid "git update-server-info [--force]"
-#~ msgstr "git update-server-info [--force]"
-
-#~ msgid "Initialize and modify the sparse-checkout"
-#~ msgstr "Initialiser et modifier l'extraction clairsemée"
-
-#, sh-format
-#~ msgid ""
-#~ "Unable to find current ${remote_name}/${branch} revision in submodule "
-#~ "path '$sm_path'"
-#~ msgstr ""
-#~ "Impossible de trouver la révision courante ${remote_name}/${branch} dans "
-#~ "le chemin de sous-module '$sm_path'"
-
-#, sh-format
-#~ msgid "Failed to recurse into submodule path '$displaypath'"
-#~ msgstr "Échec de parcours dans le chemin du sous-module '$displaypath'"
-
-#~ msgid "--index outside a repository"
-#~ msgstr "--index hors d'un dépôt"
-
-#~ msgid "--cached outside a repository"
-#~ msgstr "--cached hors d'un dépôt"
-
-#~ msgid "unrecognized input"
-#~ msgstr "entrée non reconnue"
-
-#, c-format
-#~ msgid "cannot read %s"
-#~ msgstr "impossible de lire %s"
-
-#~ 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"
-
-#, c-format
-#~ msgid ""
-#~ "Branch '%s' set up to track remote branch '%s' from '%s' by rebasing."
-#~ msgstr ""
-#~ "La branche '%s' est paramétrée pour suivre la branche distante '%s' de "
-#~ "'%s' en rebasant."
-
-#, c-format
-#~ msgid "Branch '%s' set up to track remote branch '%s' from '%s'."
-#~ msgstr ""
-#~ "La branche '%s' est paramétrée pour suivre la branche distante '%s' "
-#~ "depuis '%s'."
-
-#, c-format
-#~ msgid "Branch '%s' set up to track local branch '%s' by rebasing."
-#~ msgstr ""
-#~ "La branche '%s' est paramétrée pour suivre la branche locale '%'s en "
-#~ "rebasant."
-
-#, c-format
-#~ msgid "Branch '%s' set up to track local branch '%s'."
-#~ msgstr "La branche '%s' est paramétrée pour suivre la branche locale '%s'."
-
-#, c-format
-#~ msgid "Branch '%s' set up to track remote ref '%s' by rebasing."
-#~ msgstr ""
-#~ "La branche '%s' est paramétrée pour suivre la référence distante '%s' en "
-#~ "rebasant."
-
-#, c-format
-#~ msgid "Branch '%s' set up to track remote ref '%s'."
-#~ msgstr ""
-#~ "La branche '%s' est paramétrée pour suivre la référence distante '%s'."
-
-#~ msgid "Cannot force update the current branch."
-#~ msgstr "Impossible de forcer la mise à jour de la branche courante."
-
-#, c-format
-#~ msgid "Not a valid object name: '%s'."
-#~ msgstr "Nom d'objet invalide : '%s'."
-
-#~ msgid "--name-only, --name-status, --check and -s are mutually exclusive"
-#~ msgstr ""
-#~ "--name-only, --name-status, --check et -s sont mutuellement exclusifs"
-
-#~ msgid "-G, -S and --find-object are mutually exclusive"
-#~ msgstr "-G, -S et --find-object sont mutuellement exclusifs"
-
-#~ 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"
-
-#~ msgid ""
-#~ "--pickaxe-all and --find-object are mutually exclusive, use --pickaxe-all "
-#~ "with -G and -S"
-#~ msgstr ""
-#~ "--pickaxe-all et  --find-object sont mutuellement exclusifs, utilisez --"
-#~ "pickaxe-all avec -G et -S"
-
-#~ msgid "--stateless-rpc requires multi_ack_detailed"
-#~ msgstr "--stateless-rpc nécessite multi_ack_detailed"
-
-#~ msgid "--left-only and --right-only are mutually exclusive"
-#~ msgstr "--left-only et --right-only sont mutuellement exclusifs"
-
-#, c-format
-#~ msgid "unrecognized %%(objectsize) argument: %s"
-#~ msgstr "argument %%(objectsize) non reconnu : %s"
-
-#, c-format
-#~ msgid "unrecognized %%(subject) argument: %s"
-#~ msgstr "argument %%(subject) non reconnu : %s"
-
-#, c-format
-#~ msgid "unrecognized %%(contents) argument: %s"
-#~ msgstr "argument %%(contents) non reconnu : %s"
-
-#, c-format
-#~ msgid "unrecognized %%(raw) argument: %s"
-#~ msgstr "argument %%(raw) non reconnu : %s"
-
-#, c-format
-#~ msgid "unrecognized argument '%s' in %%(%s)"
-#~ msgstr "argument '%s' non reconnu dans %%(%s)"
-
-#, c-format
-#~ msgid "unrecognized %%(align) argument: %s"
-#~ msgstr "argument %%(align) non reconnu : %s"
-
-#, c-format
-#~ msgid "unrecognized %%(if) argument: %s"
-#~ msgstr "argument %%(if) non reconnu : %s"
-
-#, c-format
-#~ msgid "format: %%(if) atom used without a %%(then) atom"
-#~ msgstr "format : atome %%(if) utilisé sans un atome %%(then)"
-
-#, c-format
-#~ msgid "format: %%(then) atom used without an %%(if) atom"
-#~ msgstr "format : atome %%(then) utilisé sans un atome %%(if)"
-
-#, c-format
-#~ msgid "format: %%(else) atom used without a %%(then) atom"
-#~ msgstr "format : atome %%(else) utilisé sans un atome %%(then)"
-
-#~ msgid "--unsorted-input is incompatible with --no-walk"
-#~ msgstr "--unsorted-input est incompatible avec --no-walk"
-
-#~ msgid "--no-walk is incompatible with --unsorted-input"
-#~ msgstr "--no-walk est incompatible avec --unsorted-input"
-
-#~ msgid "--dry-run is incompatible with --interactive/--patch"
-#~ msgstr "--dry-run est incompatible avec --interactive/--patch"
-
-#~ msgid "--pathspec-from-file is incompatible with --interactive/--patch"
-#~ msgstr "--pathspec-from-file est incompatible avec --interactive/--patch"
-
-#~ msgid "--pathspec-from-file is incompatible with --edit"
-#~ msgstr "--pathspec-from-file est incompatible avec --edit"
-
-#~ msgid "-A and -u are mutually incompatible"
-#~ msgstr "-A et -u sont mutuellement incompatibles"
-
-#~ 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"
-
-#~ msgid "--pathspec-from-file is incompatible with pathspec arguments"
-#~ msgstr "--pathspec-from-file est incompatible avec pathspec arguments"
-
-#~ msgid "--pathspec-file-nul requires --pathspec-from-file"
-#~ msgstr "--pathspec-file-nul nécessite --pathspec-from-file"
-
-#, 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"
-
-#~ msgid "--column and --verbose are incompatible"
-#~ msgstr "--column et --verbose sont incompatibles"
-
-#, c-format
-#~ msgid "'%s' cannot be used with %s"
-#~ msgstr "'%s' ne peut pas être utilisé avec %s"
-
-#~ msgid "set upstream info for new branch"
-#~ msgstr ""
-#~ "paramétrer les coordonnées de branche amont pour une nouvelle branche"
-
-#, c-format
-#~ msgid "-%c, -%c and --orphan are mutually exclusive"
-#~ msgstr "-%c, -%c et --orphan sont mutuellement exclusifs"
-
-#~ msgid "-p and --overlay are mutually exclusive"
-#~ msgstr "-p et --overlay sont mutuellement exclusifs"
-
-#~ msgid "--pathspec-from-file is incompatible with --detach"
-#~ msgstr "--pathspec-from-file est incompatible avec --detach"
-
-#~ msgid "--pathspec-from-file is incompatible with --patch"
-#~ msgstr "--pathspec-from-file est incompatible avec --patch"
-
-#, c-format
-#~ msgid "--bare and --origin %s options are incompatible."
-#~ msgstr "les options --bare et --origin %s sont incompatibles."
-
-#~ msgid "--bare and --separate-git-dir are incompatible."
-#~ msgstr "--bare et --separate-git-dir sont incompatibles."
-
-#~ msgid "--pathspec-from-file with -a does not make sense"
-#~ msgstr "--pathspec-from-file avec l'option -a n'a pas de sens"
-
-#, c-format
-#~ msgid "cannot combine -m with --fixup:%s"
-#~ msgstr "impossible de combiner -m avec --fixup:%s"
-
-#~ msgid "--long and -z are incompatible"
-#~ msgstr "--long et -z sont incompatibles"
-
-#, 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'"
-
-#~ msgid ""
-#~ "reword option of --fixup is mutually exclusive with --patch/--"
-#~ "interactive/--all/--include/--only"
-#~ msgstr ""
-#~ "l'option reword de --fixup est mutuellement exclusive avec --patch/--"
-#~ "interactive/--all/--include/--only"
-
-#~ msgid "--long is incompatible with --abbrev=0"
-#~ msgstr "--long et --abbrev=0 sont incompatibles"
-
-#~ msgid "--dirty is incompatible with commit-ishes"
-#~ msgstr ""
-#~ "--dirty est incompatible avec la spécification de commits ou assimilés"
-
-#~ msgid "--broken is incompatible with commit-ishes"
-#~ msgstr "--broken est incompatible avec les commits ou assimilés"
-
-#~ msgid "--stdin and --merge-base are mutually exclusive"
-#~ msgstr "--stdin et --merge-base sont mutuellement exclusifs"
-
-#~ msgid "--dir-diff is incompatible with --no-index"
-#~ msgstr "--dir-diff est incompatible avec --no-index"
-
-#~ msgid "--gui, --tool and --extcmd are mutually exclusive"
-#~ msgstr "--gui, --tool et --extcmd sont mutuellement exclusifs"
-
-#~ msgid "--anonymize-map without --anonymize does not make sense"
-#~ msgstr "--anonymize-map n'a aucune signification sans --anonymize"
-
-#~ msgid "Cannot pass both --import-marks and --import-marks-if-exists"
-#~ msgstr ""
-#~ "Impossible d'utiliser à la fois --import-marks et --import-marks-if-exists"
-
-#, 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"
-
-#~ msgid "--deepen and --depth are mutually exclusive"
-#~ msgstr "--deepen et --depth sont mutuellement exclusifs"
-
-#~ msgid "--depth and --unshallow cannot be used together"
-#~ msgstr "--depth et --unshallow ne peuvent pas être utilisés ensemble"
-
-#~ msgid "--fix-thin cannot be used without --stdin"
-#~ msgstr "--fix-thin ne peut pas être utilisé sans --stdin"
-
-#~ msgid "--object-format cannot be used with --stdin"
-#~ msgstr "--object-format ne peut pas être utilisé avec --stdin"
-
-#~ msgid "--separate-git-dir and --bare are mutually exclusive"
-#~ msgstr "--separate-git-dir et --bare sont mutuellement exclusifs"
-
-#~ msgid "-n and -k are mutually exclusive"
-#~ msgstr "-n et -k sont mutuellement exclusifs"
-
-#~ msgid "--subject-prefix/--rfc and -k are mutually exclusive"
-#~ msgstr "--subject-prefix/--rfc et -k sont mutuellement exclusifs"
-
-#~ msgid "--stdout, --output, and --output-directory are mutually exclusive"
-#~ msgstr ""
-#~ "--stdout, --output, et --output-directory sont mutuellement exclusifs"
-
-#~ msgid "--creation-factor requires --range-diff"
-#~ msgstr "--creation-factor requiert --range-diff"
-
-#~ msgid "You cannot combine --squash with --no-ff."
-#~ msgstr "Vous ne pouvez pas combiner --squash avec --no-ff."
-
-#~ msgid "You cannot combine --squash with --commit."
-#~ msgstr "Vous ne pouvez pas combiner --squash avec --commit."
-
-#~ msgid "--keep-unreachable and --unpack-unreachable are incompatible"
-#~ msgstr "--keep-unreachable et --unpack-unreachable sont incompatibles"
-
-#~ msgid "--delete is incompatible with --all, --mirror and --tags"
-#~ msgstr "--delete est incompatible avec --all, --mirror et --tags"
-
-#~ msgid "--all and --tags are incompatible"
-#~ msgstr "--all et --tags sont incompatibles"
-
-#~ msgid "--mirror and --tags are incompatible"
-#~ msgstr "--mirror et --tags sont incompatibles"
-
-#~ msgid "--all and --mirror are incompatible"
-#~ msgstr "--all et --mirror sont incompatibles"
-
-#~ msgid "cannot combine '--keep-base' with '--onto'"
-#~ msgstr "impossible de combiner '--keep-base' avec '--onto'"
-
-#~ msgid "cannot combine '--keep-base' with '--root'"
-#~ msgstr "impossible de combiner '--keep-base' avec '--root'"
-
-#~ msgid "cannot combine '--root' with '--fork-point'"
-#~ msgstr "impossible de combiner '--root' avec '--fork-point'"
-
-#~ msgid "cannot combine apply options with merge options"
-#~ msgstr ""
-#~ "impossible de combiner les options d'application avec les options de "
-#~ "fusion"
-
-#~ msgid "--keep-unreachable and -A are incompatible"
-#~ msgstr "--keep-unreachable et -A sont incompatibles"
-
-#~ msgid "--geometric is incompatible with -A, -a"
-#~ msgstr "--geometric est incompatible avec -A, -a"
-
-#~ msgid "--patch is incompatible with --{hard,mixed,soft}"
-#~ msgstr "--patch est incompatible avec --{hard,mixed,soft}"
-
-#~ msgid "-N can only be used with --mixed"
-#~ msgstr "-N ne peut être utilisé qu'avec --mixed"
-
-#~ msgid "cannot combine --exclude-promisor-objects and --missing"
-#~ msgstr "impossible de combiner --exclude-promisor-objects et --missing"
-
-#~ msgid "marked counting is incompatible with --objects"
-#~ msgstr "le comptage marqué est incompatible avec --objects"
-
-#~ msgid ""
-#~ "--reflog is incompatible with --all, --remotes, --independent or --merge-"
-#~ "base"
-#~ msgstr ""
-#~ "--reflog est incompatible avec --all, --remotes, --independent et --merge-"
-#~ "base"
-
-#~ msgid "git sparse-checkout reapply"
-#~ msgstr "git sparse-checkout reapply"
-
-#~ msgid "--cached and --files are mutually exclusive"
-#~ msgstr "--cached et --files sont mutuellement exclusifs"
-
-#~ msgid "--branch and --default are mutually exclusive"
-#~ msgstr "--branch et --default sont mutuellement exclusifs"
-
-#~ msgid "--column and -n are incompatible"
-#~ msgstr "--column et -n sont incompatibles"
-
-#~ msgid "--contains option is only allowed in list mode"
-#~ msgstr "l'option --contains est autorisée seulement en mode de liste"
-
-#~ msgid "--no-contains option is only allowed in list mode"
-#~ msgstr "l'option --no-contains est autorisée seulement en mode liste"
-
-#~ msgid "--points-at option is only allowed in list mode"
-#~ msgstr "l'option --points-at est autorisée seulement en mode liste"
-
-#~ 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"
-
-#~ msgid "only one -F or -m option is allowed."
-#~ msgstr "une seule option -F ou -m est autorisée."
-
-#~ msgid "-b, -B, and --detach are mutually exclusive"
-#~ msgstr "-b, -B et --detach sont mutuellement exclusifs"
-
-#~ msgid "--reason requires --lock"
-#~ msgstr "--reason exige --lock"
-
-#~ msgid "--verbose and --porcelain are mutually exclusive"
-#~ msgstr "--verbose et --porcelain sont mutuellement exclusifs"
-
-#, c-format
-#~ msgid "no directory given for --git-dir\n"
-#~ msgstr "aucun répertoire fourni pour --git-dir\n"
-
-#, c-format
-#~ msgid "no directory given for --work-tree\n"
-#~ msgstr "aucun répertoire fourni pour --work-tree\n"
-
-#~ msgid "--packfile requires --index-pack-args"
-#~ msgstr "--packfile nécessite --index-pack-args"
-
-#~ msgid "--index-pack-args can only be used with --packfile"
-#~ msgstr "--index-pack-args ne peut être utilisé qu'avec --packfile"
+#~ msgid "--preserve-merges was replaced by --rebase-merges"
+#~ msgstr "--preserve-merges a été remplacé par --rebase-merges"
diff --git a/po/git.pot b/po/git.pot
deleted file mode 100644
index 054cb99c06..0000000000
--- a/po/git.pot
+++ /dev/null
@@ -1,25151 +0,0 @@
-# SOME DESCRIPTIVE TITLE.
-# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
-# This file is distributed under the same license as the PACKAGE package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
-#
-#, fuzzy
-msgid ""
-msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: Git Mailing List <git@vger.kernel.org>\n"
-"POT-Creation-Date: 2022-04-13 14:52+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=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\n"
-
-#: add-interactive.c:382
-#, c-format
-msgid "Huh (%s)?"
-msgstr ""
-
-#: add-interactive.c:535 add-interactive.c:836 reset.c:136 sequencer.c:3505
-#: sequencer.c:3970 sequencer.c:4127 builtin/rebase.c:1261
-#: builtin/rebase.c:1671
-msgid "could not read index"
-msgstr ""
-
-#: add-interactive.c:590 git-add--interactive.perl:269
-#: git-add--interactive.perl:294
-msgid "binary"
-msgstr ""
-
-#: add-interactive.c:648 git-add--interactive.perl:278
-#: git-add--interactive.perl:332
-msgid "nothing"
-msgstr ""
-
-#: add-interactive.c:649 git-add--interactive.perl:314
-#: git-add--interactive.perl:329
-msgid "unchanged"
-msgstr ""
-
-#: add-interactive.c:686 git-add--interactive.perl:641
-msgid "Update"
-msgstr ""
-
-#: add-interactive.c:703 add-interactive.c:891
-#, c-format
-msgid "could not stage '%s'"
-msgstr ""
-
-#: add-interactive.c:709 add-interactive.c:898 reset.c:160 sequencer.c:3709
-msgid "could not write index"
-msgstr ""
-
-#: add-interactive.c:712 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:730 git-add--interactive.perl:676
-#, c-format, perl-format
-msgid "note: %s is untracked now.\n"
-msgstr ""
-
-#: add-interactive.c:735 apply.c:4133 builtin/checkout.c:311
-#: builtin/reset.c:167
-#, c-format
-msgid "make_cache_entry failed for path '%s'"
-msgstr ""
-
-#: add-interactive.c:765 git-add--interactive.perl:653
-msgid "Revert"
-msgstr ""
-
-#: add-interactive.c:781
-msgid "Could not parse HEAD^{tree}"
-msgstr ""
-
-#: add-interactive.c:819 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:870 git-add--interactive.perl:693
-#, c-format
-msgid "No untracked files.\n"
-msgstr ""
-
-#: add-interactive.c:874 git-add--interactive.perl:687
-msgid "Add untracked"
-msgstr ""
-
-#: add-interactive.c:901 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:931
-#, c-format
-msgid "ignoring unmerged: %s"
-msgstr ""
-
-#: add-interactive.c:943 add-patch.c:1758 git-add--interactive.perl:1371
-#, c-format
-msgid "Only binary files changed.\n"
-msgstr ""
-
-#: add-interactive.c:945 add-patch.c:1756 git-add--interactive.perl:1373
-#, c-format
-msgid "No changes.\n"
-msgstr ""
-
-#: add-interactive.c:949 git-add--interactive.perl:1381
-msgid "Patch update"
-msgstr ""
-
-#: add-interactive.c:988 git-add--interactive.perl:1794
-msgid "Review diff"
-msgstr ""
-
-#: add-interactive.c:1016
-msgid "show paths with changes"
-msgstr ""
-
-#: add-interactive.c:1018
-msgid "add working tree state to the staged set of changes"
-msgstr ""
-
-#: add-interactive.c:1020
-msgid "revert staged set of changes back to the HEAD version"
-msgstr ""
-
-#: add-interactive.c:1022
-msgid "pick hunks and update selectively"
-msgstr ""
-
-#: add-interactive.c:1024
-msgid "view diff between HEAD and index"
-msgstr ""
-
-#: add-interactive.c:1026
-msgid "add contents of untracked files to the staged set of changes"
-msgstr ""
-
-#: add-interactive.c:1034 add-interactive.c:1083
-msgid "Prompt help:"
-msgstr ""
-
-#: add-interactive.c:1036
-msgid "select a single item"
-msgstr ""
-
-#: add-interactive.c:1038
-msgid "select a range of items"
-msgstr ""
-
-#: add-interactive.c:1040
-msgid "select multiple ranges"
-msgstr ""
-
-#: add-interactive.c:1042 add-interactive.c:1087
-msgid "select item based on unique prefix"
-msgstr ""
-
-#: add-interactive.c:1044
-msgid "unselect specified items"
-msgstr ""
-
-#: add-interactive.c:1046
-msgid "choose all items"
-msgstr ""
-
-#: add-interactive.c:1048
-msgid "(empty) finish selecting"
-msgstr ""
-
-#: add-interactive.c:1085
-msgid "select a numbered item"
-msgstr ""
-
-#: add-interactive.c:1089
-msgid "(empty) select nothing"
-msgstr ""
-
-#: add-interactive.c:1097 builtin/clean.c:839 git-add--interactive.perl:1898
-msgid "*** Commands ***"
-msgstr ""
-
-#: add-interactive.c:1098 builtin/clean.c:840 git-add--interactive.perl:1895
-msgid "What now"
-msgstr ""
-
-#: add-interactive.c:1150 git-add--interactive.perl:213
-msgid "staged"
-msgstr ""
-
-#: add-interactive.c:1150 git-add--interactive.perl:213
-msgid "unstaged"
-msgstr ""
-
-#: add-interactive.c:1150 apply.c:5002 apply.c:5005 builtin/am.c:2370
-#: builtin/am.c:2373 builtin/bugreport.c:107 builtin/clone.c:132
-#: builtin/fetch.c:154 builtin/merge.c:287 builtin/pull.c:194
-#: builtin/submodule--helper.c:412 builtin/submodule--helper.c:1872
-#: builtin/submodule--helper.c:1875 builtin/submodule--helper.c:2709
-#: builtin/submodule--helper.c:2712 builtin/submodule--helper.c:2891
-#: git-add--interactive.perl:213
-msgid "path"
-msgstr ""
-
-#: add-interactive.c:1157
-msgid "could not refresh index"
-msgstr ""
-
-#: add-interactive.c:1171 builtin/clean.c:804 git-add--interactive.perl:1805
-#, c-format
-msgid "Bye.\n"
-msgstr ""
-
-#: add-patch.c:34 git-add--interactive.perl:1433
-#, c-format, perl-format
-msgid "Stage mode change [y,n,q,a,d%s,?]? "
-msgstr ""
-
-#: add-patch.c:35 git-add--interactive.perl:1434
-#, c-format, perl-format
-msgid "Stage deletion [y,n,q,a,d%s,?]? "
-msgstr ""
-
-#: add-patch.c:36 git-add--interactive.perl:1435
-#, c-format, perl-format
-msgid "Stage addition [y,n,q,a,d%s,?]? "
-msgstr ""
-
-#: add-patch.c:37 git-add--interactive.perl:1436
-#, c-format, perl-format
-msgid "Stage this hunk [y,n,q,a,d%s,?]? "
-msgstr ""
-
-#: add-patch.c:39
-msgid ""
-"If the patch applies cleanly, the edited hunk will immediately be marked for "
-"staging."
-msgstr ""
-
-#: add-patch.c:42
-msgid ""
-"y - stage this hunk\n"
-"n - do not stage this hunk\n"
-"q - quit; do not stage this hunk or any of the remaining ones\n"
-"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 ""
-
-#: add-patch.c:56 git-add--interactive.perl:1439
-#, c-format, perl-format
-msgid "Stash mode change [y,n,q,a,d%s,?]? "
-msgstr ""
-
-#: add-patch.c:57 git-add--interactive.perl:1440
-#, c-format, perl-format
-msgid "Stash deletion [y,n,q,a,d%s,?]? "
-msgstr ""
-
-#: add-patch.c:58 git-add--interactive.perl:1441
-#, c-format, perl-format
-msgid "Stash addition [y,n,q,a,d%s,?]? "
-msgstr ""
-
-#: add-patch.c:59 git-add--interactive.perl:1442
-#, c-format, perl-format
-msgid "Stash this hunk [y,n,q,a,d%s,?]? "
-msgstr ""
-
-#: add-patch.c:61
-msgid ""
-"If the patch applies cleanly, the edited hunk will immediately be marked for "
-"stashing."
-msgstr ""
-
-#: add-patch.c:64
-msgid ""
-"y - stash this hunk\n"
-"n - do not stash this hunk\n"
-"q - quit; do not stash this hunk or any of the remaining ones\n"
-"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 ""
-
-#: add-patch.c:80 git-add--interactive.perl:1445
-#, c-format, perl-format
-msgid "Unstage mode change [y,n,q,a,d%s,?]? "
-msgstr ""
-
-#: add-patch.c:81 git-add--interactive.perl:1446
-#, c-format, perl-format
-msgid "Unstage deletion [y,n,q,a,d%s,?]? "
-msgstr ""
-
-#: add-patch.c:82 git-add--interactive.perl:1447
-#, c-format, perl-format
-msgid "Unstage addition [y,n,q,a,d%s,?]? "
-msgstr ""
-
-#: add-patch.c:83 git-add--interactive.perl:1448
-#, c-format, perl-format
-msgid "Unstage this hunk [y,n,q,a,d%s,?]? "
-msgstr ""
-
-#: add-patch.c:85
-msgid ""
-"If the patch applies cleanly, the edited hunk will immediately be marked for "
-"unstaging."
-msgstr ""
-
-#: add-patch.c:88
-msgid ""
-"y - unstage this hunk\n"
-"n - do not unstage this hunk\n"
-"q - quit; do not unstage this hunk or any of the remaining ones\n"
-"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 ""
-
-#: add-patch.c:103 git-add--interactive.perl:1451
-#, c-format, perl-format
-msgid "Apply mode change to index [y,n,q,a,d%s,?]? "
-msgstr ""
-
-#: add-patch.c:104 git-add--interactive.perl:1452
-#, c-format, perl-format
-msgid "Apply deletion to index [y,n,q,a,d%s,?]? "
-msgstr ""
-
-#: add-patch.c:105 git-add--interactive.perl:1453
-#, c-format, perl-format
-msgid "Apply addition to index [y,n,q,a,d%s,?]? "
-msgstr ""
-
-#: add-patch.c:106 git-add--interactive.perl:1454
-#, c-format, perl-format
-msgid "Apply this hunk to index [y,n,q,a,d%s,?]? "
-msgstr ""
-
-#: 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 ""
-
-#: add-patch.c:111
-msgid ""
-"y - apply this hunk to index\n"
-"n - do not apply this hunk to index\n"
-"q - quit; do not apply this hunk or any of the remaining ones\n"
-"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 ""
-
-#: add-patch.c:126 git-add--interactive.perl:1457
-#: git-add--interactive.perl:1475
-#, c-format, perl-format
-msgid "Discard mode change from worktree [y,n,q,a,d%s,?]? "
-msgstr ""
-
-#: add-patch.c:127 git-add--interactive.perl:1458
-#: git-add--interactive.perl:1476
-#, c-format, perl-format
-msgid "Discard deletion from worktree [y,n,q,a,d%s,?]? "
-msgstr ""
-
-#: add-patch.c:128 git-add--interactive.perl:1459
-#: git-add--interactive.perl:1477
-#, c-format, perl-format
-msgid "Discard addition from worktree [y,n,q,a,d%s,?]? "
-msgstr ""
-
-#: add-patch.c:129 git-add--interactive.perl:1460
-#: git-add--interactive.perl:1478
-#, c-format, perl-format
-msgid "Discard this hunk from worktree [y,n,q,a,d%s,?]? "
-msgstr ""
-
-#: 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 ""
-
-#: add-patch.c:134 add-patch.c:202
-msgid ""
-"y - discard this hunk from worktree\n"
-"n - do not discard this hunk from worktree\n"
-"q - quit; do not discard this hunk or any of the remaining ones\n"
-"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 ""
-
-#: add-patch.c:149 add-patch.c:194 git-add--interactive.perl:1463
-#, c-format, perl-format
-msgid "Discard mode change from index and worktree [y,n,q,a,d%s,?]? "
-msgstr ""
-
-#: add-patch.c:150 add-patch.c:195 git-add--interactive.perl:1464
-#, c-format, perl-format
-msgid "Discard deletion from index and worktree [y,n,q,a,d%s,?]? "
-msgstr ""
-
-#: add-patch.c:151 add-patch.c:196 git-add--interactive.perl:1465
-#, c-format, perl-format
-msgid "Discard addition from index and worktree [y,n,q,a,d%s,?]? "
-msgstr ""
-
-#: add-patch.c:152 add-patch.c:197 git-add--interactive.perl:1466
-#, c-format, perl-format
-msgid "Discard this hunk from index and worktree [y,n,q,a,d%s,?]? "
-msgstr ""
-
-#: add-patch.c:157
-msgid ""
-"y - discard this hunk from index and worktree\n"
-"n - do not discard this hunk from index and worktree\n"
-"q - quit; do not discard this hunk or any of the remaining ones\n"
-"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 ""
-
-#: add-patch.c:171 add-patch.c:216 git-add--interactive.perl:1469
-#, c-format, perl-format
-msgid "Apply mode change to index and worktree [y,n,q,a,d%s,?]? "
-msgstr ""
-
-#: add-patch.c:172 add-patch.c:217 git-add--interactive.perl:1470
-#, c-format, perl-format
-msgid "Apply deletion to index and worktree [y,n,q,a,d%s,?]? "
-msgstr ""
-
-#: add-patch.c:173 add-patch.c:218 git-add--interactive.perl:1471
-#, c-format, perl-format
-msgid "Apply addition to index and worktree [y,n,q,a,d%s,?]? "
-msgstr ""
-
-#: add-patch.c:174 add-patch.c:219 git-add--interactive.perl:1472
-#, c-format, perl-format
-msgid "Apply this hunk to index and worktree [y,n,q,a,d%s,?]? "
-msgstr ""
-
-#: add-patch.c:179
-msgid ""
-"y - apply this hunk to index and worktree\n"
-"n - do not apply this hunk to index and worktree\n"
-"q - quit; do not apply this hunk or any of the remaining ones\n"
-"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 ""
-
-#: add-patch.c:224
-msgid ""
-"y - apply this hunk to worktree\n"
-"n - do not apply this hunk to worktree\n"
-"q - quit; do not apply this hunk or any of the remaining ones\n"
-"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 ""
-
-#: add-patch.c:343
-#, c-format
-msgid "could not parse hunk header '%.*s'"
-msgstr ""
-
-#: add-patch.c:362 add-patch.c:366
-#, c-format
-msgid "could not parse colored hunk header '%.*s'"
-msgstr ""
-
-#: add-patch.c:431
-msgid "could not parse diff"
-msgstr ""
-
-#: add-patch.c:450
-msgid "could not parse colored diff"
-msgstr ""
-
-#: add-patch.c:464
-#, c-format
-msgid "failed to run '%s'"
-msgstr ""
-
-#: add-patch.c:618
-msgid "mismatched output from interactive.diffFilter"
-msgstr ""
-
-#: add-patch.c:619
-msgid ""
-"Your filter must maintain a one-to-one correspondence\n"
-"between its input and output lines."
-msgstr ""
-
-#: add-patch.c:797
-#, c-format
-msgid ""
-"expected context line #%d in\n"
-"%.*s"
-msgstr ""
-
-#: add-patch.c:812
-#, c-format
-msgid ""
-"hunks do not overlap:\n"
-"%.*s\n"
-"\tdoes not end with:\n"
-"%.*s"
-msgstr ""
-
-#: add-patch.c:1088 git-add--interactive.perl:1115
-msgid "Manual hunk edit mode -- see bottom for a quick guide.\n"
-msgstr ""
-
-#: add-patch.c:1092
-#, c-format
-msgid ""
-"---\n"
-"To remove '%c' lines, make them ' ' lines (context).\n"
-"To remove '%c' lines, delete them.\n"
-"Lines starting with %c will be removed.\n"
-msgstr ""
-
-#. TRANSLATORS: 'it' refers to the patch mentioned in the previous messages.
-#: add-patch.c:1106 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"
-"aborted and the hunk is left unchanged.\n"
-msgstr ""
-
-#: add-patch.c:1139
-msgid "could not parse hunk header"
-msgstr ""
-
-#: add-patch.c:1184
-msgid "'git apply --cached' failed"
-msgstr ""
-
-#. 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.
-#.
-#. 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:1253 git-add--interactive.perl:1244
-msgid ""
-"Your edited hunk does not apply. Edit again (saying \"no\" discards!) [y/n]? "
-msgstr ""
-
-#: add-patch.c:1296
-msgid "The selected hunks do not apply to the index!"
-msgstr ""
-
-#: add-patch.c:1297 git-add--interactive.perl:1348
-msgid "Apply them to the worktree anyway? "
-msgstr ""
-
-#: add-patch.c:1304 git-add--interactive.perl:1351
-msgid "Nothing was applied.\n"
-msgstr ""
-
-#: add-patch.c:1361
-msgid ""
-"j - leave this hunk undecided, see next undecided hunk\n"
-"J - leave this hunk undecided, see next hunk\n"
-"k - leave this hunk undecided, see previous undecided hunk\n"
-"K - leave this hunk undecided, see previous hunk\n"
-"g - select a hunk to go to\n"
-"/ - search for a hunk matching the given regex\n"
-"s - split the current hunk into smaller hunks\n"
-"e - manually edit the current hunk\n"
-"? - print help\n"
-msgstr ""
-
-#: add-patch.c:1523 add-patch.c:1533
-msgid "No previous hunk"
-msgstr ""
-
-#: add-patch.c:1528 add-patch.c:1538
-msgid "No next hunk"
-msgstr ""
-
-#: add-patch.c:1544
-msgid "No other hunks to goto"
-msgstr ""
-
-#: add-patch.c:1555 git-add--interactive.perl:1608
-msgid "go to which hunk (<ret> to see more)? "
-msgstr ""
-
-#: add-patch.c:1556 git-add--interactive.perl:1610
-msgid "go to which hunk? "
-msgstr ""
-
-#: add-patch.c:1567
-#, c-format
-msgid "Invalid number: '%s'"
-msgstr ""
-
-#: add-patch.c:1572
-#, c-format
-msgid "Sorry, only %d hunk available."
-msgid_plural "Sorry, only %d hunks available."
-msgstr[0] ""
-msgstr[1] ""
-
-#: add-patch.c:1581
-msgid "No other hunks to search"
-msgstr ""
-
-#: add-patch.c:1587 git-add--interactive.perl:1663
-msgid "search for regex? "
-msgstr ""
-
-#: add-patch.c:1602
-#, c-format
-msgid "Malformed search regexp %s: %s"
-msgstr ""
-
-#: add-patch.c:1619
-msgid "No hunk matches the given pattern"
-msgstr ""
-
-#: add-patch.c:1626
-msgid "Sorry, cannot split this hunk"
-msgstr ""
-
-#: add-patch.c:1630
-#, c-format
-msgid "Split into %d hunks."
-msgstr ""
-
-#: add-patch.c:1634
-msgid "Sorry, cannot edit this hunk"
-msgstr ""
-
-#: add-patch.c:1686
-msgid "'git apply' failed"
-msgstr ""
-
-#: advice.c:81
-#, c-format
-msgid ""
-"\n"
-"Disable this message with \"git config advice.%s false\""
-msgstr ""
-
-#: advice.c:97
-#, c-format
-msgid "%shint: %.*s%s\n"
-msgstr ""
-
-#: advice.c:181
-msgid "Cherry-picking is not possible because you have unmerged files."
-msgstr ""
-
-#: advice.c:183
-msgid "Committing is not possible because you have unmerged files."
-msgstr ""
-
-#: advice.c:185
-msgid "Merging is not possible because you have unmerged files."
-msgstr ""
-
-#: advice.c:187
-msgid "Pulling is not possible because you have unmerged files."
-msgstr ""
-
-#: advice.c:189
-msgid "Reverting is not possible because you have unmerged files."
-msgstr ""
-
-#: advice.c:191
-#, c-format
-msgid "It is not possible to %s because you have unmerged files."
-msgstr ""
-
-#: advice.c:199
-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:207
-msgid "Exiting because of an unresolved conflict."
-msgstr ""
-
-#: advice.c:212 builtin/merge.c:1388
-msgid "You have not concluded your merge (MERGE_HEAD exists)."
-msgstr ""
-
-#: advice.c:214
-msgid "Please, commit your changes before merging."
-msgstr ""
-
-#: advice.c:215
-msgid "Exiting because of unfinished merge."
-msgstr ""
-
-#: advice.c:220
-msgid "Not possible to fast-forward, aborting."
-msgstr ""
-
-#: advice.c:230
-#, 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 ""
-
-#: advice.c:237
-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 ""
-
-#: advice.c:245
-#, c-format
-msgid ""
-"Note: switching to '%s'.\n"
-"\n"
-"You are in 'detached HEAD' state. You can look around, make experimental\n"
-"changes and commit them, and you can discard any commits you make in this\n"
-"state without impacting any branches by switching back to a branch.\n"
-"\n"
-"If you want to create a new branch to retain commits you create, you may\n"
-"do so (now or later) by using -c with the switch command. Example:\n"
-"\n"
-"  git switch -c <new-branch-name>\n"
-"\n"
-"Or undo this operation with:\n"
-"\n"
-"  git switch -\n"
-"\n"
-"Turn off this advice by setting config variable advice.detachedHead to "
-"false\n"
-"\n"
-msgstr ""
-
-#: alias.c:50
-msgid "cmdline ends with \\"
-msgstr ""
-
-#: alias.c:51
-msgid "unclosed quote"
-msgstr ""
-
-#: apply.c:70
-#, c-format
-msgid "unrecognized whitespace option '%s'"
-msgstr ""
-
-#: apply.c:86
-#, c-format
-msgid "unrecognized whitespace ignore option '%s'"
-msgstr ""
-
-#: apply.c:138 archive.c:584 parse-options.c:1122 range-diff.c:555
-#: revision.c:2314 revision.c:2318 revision.c:2327 revision.c:2332
-#: revision.c:2560 revision.c:2895 revision.c:2899 revision.c:2907
-#: revision.c:2910 revision.c:2912 builtin/add.c:507 builtin/add.c:509
-#: builtin/add.c:515 builtin/add.c:527 builtin/branch.c:755
-#: builtin/checkout.c:472 builtin/checkout.c:475 builtin/checkout.c:1663
-#: builtin/checkout.c:1773 builtin/checkout.c:1776 builtin/clone.c:921
-#: builtin/commit.c:359 builtin/commit.c:362 builtin/commit.c:1200
-#: builtin/commit.c:1256 builtin/commit.c:1273 builtin/describe.c:593
-#: builtin/diff-tree.c:155 builtin/difftool.c:733 builtin/fast-export.c:1245
-#: builtin/fetch.c:2141 builtin/fetch.c:2162 builtin/fetch.c:2167
-#: builtin/help.c:602 builtin/index-pack.c:1858 builtin/init-db.c:560
-#: builtin/log.c:1968 builtin/log.c:1970 builtin/ls-files.c:778
-#: builtin/merge-base.c:163 builtin/merge-base.c:169 builtin/merge.c:1409
-#: builtin/merge.c:1411 builtin/pack-objects.c:4098 builtin/push.c:592
-#: builtin/push.c:630 builtin/push.c:636 builtin/push.c:641
-#: builtin/rebase.c:1221 builtin/rebase.c:1223 builtin/rebase.c:1227
-#: builtin/repack.c:688 builtin/repack.c:719 builtin/reset.c:433
-#: builtin/reset.c:469 builtin/rev-list.c:537 builtin/show-branch.c:711
-#: builtin/stash.c:1696 builtin/stash.c:1699 builtin/submodule--helper.c:1328
-#: builtin/submodule--helper.c:3054 builtin/tag.c:527 builtin/tag.c:573
-#: builtin/worktree.c:779
-#, c-format
-msgid "options '%s' and '%s' cannot be used together"
-msgstr ""
-
-#: apply.c:141 apply.c:152 apply.c:155
-#, c-format
-msgid "'%s' outside a repository"
-msgstr ""
-
-#: apply.c:807
-#, c-format
-msgid "Cannot prepare timestamp regexp %s"
-msgstr ""
-
-#: apply.c:816
-#, c-format
-msgid "regexec returned %d for input: %s"
-msgstr ""
-
-#: apply.c:890
-#, c-format
-msgid "unable to find filename in patch at line %d"
-msgstr ""
-
-#: apply.c:928
-#, c-format
-msgid "git apply: bad git-diff - expected /dev/null, got %s on line %d"
-msgstr ""
-
-#: apply.c:934
-#, c-format
-msgid "git apply: bad git-diff - inconsistent new filename on line %d"
-msgstr ""
-
-#: apply.c:935
-#, c-format
-msgid "git apply: bad git-diff - inconsistent old filename on line %d"
-msgstr ""
-
-#: apply.c:940
-#, c-format
-msgid "git apply: bad git-diff - expected /dev/null on line %d"
-msgstr ""
-
-#: apply.c:969
-#, c-format
-msgid "invalid mode on line %d: %s"
-msgstr ""
-
-#: apply.c:1288
-#, c-format
-msgid "inconsistent header lines %d and %d"
-msgstr ""
-
-#: apply.c:1378
-#, c-format
-msgid ""
-"git diff header lacks filename information when removing %d leading pathname "
-"component (line %d)"
-msgid_plural ""
-"git diff header lacks filename information when removing %d leading pathname "
-"components (line %d)"
-msgstr[0] ""
-msgstr[1] ""
-
-#: apply.c:1391
-#, c-format
-msgid "git diff header lacks filename information (line %d)"
-msgstr ""
-
-#: apply.c:1487
-#, c-format
-msgid "recount: unexpected line: %.*s"
-msgstr ""
-
-#: apply.c:1556
-#, c-format
-msgid "patch fragment without header at line %d: %.*s"
-msgstr ""
-
-#: apply.c:1759
-msgid "new file depends on old contents"
-msgstr ""
-
-#: apply.c:1761
-msgid "deleted file still has contents"
-msgstr ""
-
-#: apply.c:1795
-#, c-format
-msgid "corrupt patch at line %d"
-msgstr ""
-
-#: apply.c:1832
-#, c-format
-msgid "new file %s depends on old contents"
-msgstr ""
-
-#: apply.c:1834
-#, c-format
-msgid "deleted file %s still has contents"
-msgstr ""
-
-#: apply.c:1837
-#, c-format
-msgid "** warning: file %s becomes empty but is not deleted"
-msgstr ""
-
-#: apply.c:1985
-#, c-format
-msgid "corrupt binary patch at line %d: %.*s"
-msgstr ""
-
-#: apply.c:2022
-#, c-format
-msgid "unrecognized binary patch at line %d"
-msgstr ""
-
-#: apply.c:2184
-#, c-format
-msgid "patch with only garbage at line %d"
-msgstr ""
-
-#: apply.c:2270
-#, c-format
-msgid "unable to read symlink %s"
-msgstr ""
-
-#: apply.c:2274
-#, c-format
-msgid "unable to open or read %s"
-msgstr ""
-
-#: apply.c:2943
-#, c-format
-msgid "invalid start of line: '%c'"
-msgstr ""
-
-#: apply.c:3064
-#, 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:3076
-#, c-format
-msgid "Context reduced to (%ld/%ld) to apply fragment at %d"
-msgstr ""
-
-#: apply.c:3082
-#, c-format
-msgid ""
-"while searching for:\n"
-"%.*s"
-msgstr ""
-
-#: apply.c:3104
-#, c-format
-msgid "missing binary patch data for '%s'"
-msgstr ""
-
-#: apply.c:3112
-#, c-format
-msgid "cannot reverse-apply a binary patch without the reverse hunk to '%s'"
-msgstr ""
-
-#: apply.c:3159
-#, c-format
-msgid "cannot apply binary patch to '%s' without full index line"
-msgstr ""
-
-#: apply.c:3170
-#, c-format
-msgid ""
-"the patch applies to '%s' (%s), which does not match the current contents."
-msgstr ""
-
-#: apply.c:3178
-#, c-format
-msgid "the patch applies to an empty '%s' but it is not empty"
-msgstr ""
-
-#: apply.c:3196
-#, c-format
-msgid "the necessary postimage %s for '%s' cannot be read"
-msgstr ""
-
-#: apply.c:3209
-#, c-format
-msgid "binary patch does not apply to '%s'"
-msgstr ""
-
-#: apply.c:3216
-#, c-format
-msgid "binary patch to '%s' creates incorrect result (expecting %s, got %s)"
-msgstr ""
-
-#: apply.c:3237
-#, c-format
-msgid "patch failed: %s:%ld"
-msgstr ""
-
-#: apply.c:3360
-#, c-format
-msgid "cannot checkout %s"
-msgstr ""
-
-#: apply.c:3412 apply.c:3423 apply.c:3469 midx.c:105 pack-revindex.c:214
-#: setup.c:310
-#, c-format
-msgid "failed to read %s"
-msgstr ""
-
-#: apply.c:3420
-#, c-format
-msgid "reading from '%s' beyond a symbolic link"
-msgstr ""
-
-#: apply.c:3449 apply.c:3721
-#, c-format
-msgid "path %s has been renamed/deleted"
-msgstr ""
-
-#: apply.c:3559 apply.c:3736
-#, c-format
-msgid "%s: does not exist in index"
-msgstr ""
-
-#: apply.c:3568 apply.c:3744 apply.c:3960
-#, c-format
-msgid "%s: does not match index"
-msgstr ""
-
-#: apply.c:3605
-msgid "repository lacks the necessary blob to perform 3-way merge."
-msgstr ""
-
-#: apply.c:3608
-#, c-format
-msgid "Performing three-way merge...\n"
-msgstr ""
-
-#: apply.c:3624 apply.c:3628
-#, c-format
-msgid "cannot read the current contents of '%s'"
-msgstr ""
-
-#: apply.c:3640
-#, c-format
-msgid "Failed to perform three-way merge...\n"
-msgstr ""
-
-#: apply.c:3654
-#, c-format
-msgid "Applied patch to '%s' with conflicts.\n"
-msgstr ""
-
-#: apply.c:3659
-#, c-format
-msgid "Applied patch to '%s' cleanly.\n"
-msgstr ""
-
-#: apply.c:3676
-#, c-format
-msgid "Falling back to direct application...\n"
-msgstr ""
-
-#: apply.c:3688
-msgid "removal patch leaves file contents"
-msgstr ""
-
-#: apply.c:3761
-#, c-format
-msgid "%s: wrong type"
-msgstr ""
-
-#: apply.c:3763
-#, c-format
-msgid "%s has type %o, expected %o"
-msgstr ""
-
-#: apply.c:3900 apply.c:3902 read-cache.c:903 read-cache.c:932
-#: read-cache.c:1399
-#, c-format
-msgid "invalid path '%s'"
-msgstr ""
-
-#: apply.c:3958
-#, c-format
-msgid "%s: already exists in index"
-msgstr ""
-
-#: apply.c:3962
-#, c-format
-msgid "%s: already exists in working directory"
-msgstr ""
-
-#: apply.c:3982
-#, c-format
-msgid "new mode (%o) of %s does not match old mode (%o)"
-msgstr ""
-
-#: apply.c:3987
-#, c-format
-msgid "new mode (%o) of %s does not match old mode (%o) of %s"
-msgstr ""
-
-#: apply.c:4007
-#, c-format
-msgid "affected file '%s' is beyond a symbolic link"
-msgstr ""
-
-#: apply.c:4011
-#, c-format
-msgid "%s: patch does not apply"
-msgstr ""
-
-#: apply.c:4026
-#, c-format
-msgid "Checking patch %s..."
-msgstr ""
-
-#: apply.c:4118
-#, c-format
-msgid "sha1 information is lacking or useless for submodule %s"
-msgstr ""
-
-#: apply.c:4125
-#, c-format
-msgid "mode change for %s, which is not in current HEAD"
-msgstr ""
-
-#: apply.c:4128
-#, c-format
-msgid "sha1 information is lacking or useless (%s)."
-msgstr ""
-
-#: apply.c:4137
-#, c-format
-msgid "could not add %s to temporary index"
-msgstr ""
-
-#: apply.c:4147
-#, c-format
-msgid "could not write temporary index to %s"
-msgstr ""
-
-#: apply.c:4285
-#, c-format
-msgid "unable to remove %s from index"
-msgstr ""
-
-#: apply.c:4319
-#, c-format
-msgid "corrupt patch for submodule %s"
-msgstr ""
-
-#: apply.c:4325
-#, c-format
-msgid "unable to stat newly created file '%s'"
-msgstr ""
-
-#: apply.c:4333
-#, c-format
-msgid "unable to create backing store for newly created file %s"
-msgstr ""
-
-#: apply.c:4339 apply.c:4484
-#, c-format
-msgid "unable to add cache entry for %s"
-msgstr ""
-
-#: apply.c:4382 builtin/bisect--helper.c:540 builtin/gc.c:2258
-#: builtin/gc.c:2293
-#, c-format
-msgid "failed to write to '%s'"
-msgstr ""
-
-#: apply.c:4386
-#, c-format
-msgid "closing file '%s'"
-msgstr ""
-
-#: apply.c:4456
-#, c-format
-msgid "unable to write file '%s' mode %o"
-msgstr ""
-
-#: apply.c:4554
-#, c-format
-msgid "Applied patch %s cleanly."
-msgstr ""
-
-#: apply.c:4562
-msgid "internal error"
-msgstr ""
-
-#: apply.c:4565
-#, c-format
-msgid "Applying patch %%s with %d reject..."
-msgid_plural "Applying patch %%s with %d rejects..."
-msgstr[0] ""
-msgstr[1] ""
-
-#: apply.c:4576
-#, c-format
-msgid "truncating .rej filename to %.*s.rej"
-msgstr ""
-
-#: apply.c:4584
-#, c-format
-msgid "cannot open %s"
-msgstr ""
-
-#: apply.c:4598
-#, c-format
-msgid "Hunk #%d applied cleanly."
-msgstr ""
-
-#: apply.c:4602
-#, c-format
-msgid "Rejected hunk #%d."
-msgstr ""
-
-#: apply.c:4731
-#, c-format
-msgid "Skipped patch '%s'."
-msgstr ""
-
-#: apply.c:4740
-msgid "No valid patches in input (allow with \"--allow-empty\")"
-msgstr ""
-
-#: apply.c:4761
-msgid "unable to read index file"
-msgstr ""
-
-#: apply.c:4918
-#, c-format
-msgid "can't open patch '%s': %s"
-msgstr ""
-
-#: apply.c:4945
-#, c-format
-msgid "squelched %d whitespace error"
-msgid_plural "squelched %d whitespace errors"
-msgstr[0] ""
-msgstr[1] ""
-
-#: apply.c:4951 apply.c:4966
-#, c-format
-msgid "%d line adds whitespace errors."
-msgid_plural "%d lines add whitespace errors."
-msgstr[0] ""
-msgstr[1] ""
-
-#: apply.c:4959
-#, 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:4975 builtin/add.c:690 builtin/mv.c:338 builtin/rm.c:430
-msgid "Unable to write new index file"
-msgstr ""
-
-#: apply.c:5003
-msgid "don't apply changes matching the given path"
-msgstr ""
-
-#: apply.c:5006
-msgid "apply changes matching the given path"
-msgstr ""
-
-#: apply.c:5008 builtin/am.c:2379
-msgid "num"
-msgstr ""
-
-#: apply.c:5009
-msgid "remove <num> leading slashes from traditional diff paths"
-msgstr ""
-
-#: apply.c:5012
-msgid "ignore additions made by the patch"
-msgstr ""
-
-#: apply.c:5014
-msgid "instead of applying the patch, output diffstat for the input"
-msgstr ""
-
-#: apply.c:5018
-msgid "show number of added and deleted lines in decimal notation"
-msgstr ""
-
-#: apply.c:5020
-msgid "instead of applying the patch, output a summary for the input"
-msgstr ""
-
-#: apply.c:5022
-msgid "instead of applying the patch, see if the patch is applicable"
-msgstr ""
-
-#: apply.c:5024
-msgid "make sure the patch is applicable to the current index"
-msgstr ""
-
-#: apply.c:5026
-msgid "mark new files with `git add --intent-to-add`"
-msgstr ""
-
-#: apply.c:5028
-msgid "apply a patch without touching the working tree"
-msgstr ""
-
-#: apply.c:5030
-msgid "accept a patch that touches outside the working area"
-msgstr ""
-
-#: apply.c:5033
-msgid "also apply the patch (use with --stat/--summary/--check)"
-msgstr ""
-
-#: apply.c:5035
-msgid "attempt three-way merge, fall back on normal patch if that fails"
-msgstr ""
-
-#: apply.c:5037
-msgid "build a temporary index based on embedded index information"
-msgstr ""
-
-#: apply.c:5040 builtin/checkout-index.c:230
-msgid "paths are separated with NUL character"
-msgstr ""
-
-#: apply.c:5042
-msgid "ensure at least <n> lines of context match"
-msgstr ""
-
-#: apply.c:5043 builtin/am.c:2355 builtin/am.c:2358
-#: builtin/interpret-trailers.c:98 builtin/interpret-trailers.c:100
-#: builtin/interpret-trailers.c:102 builtin/pack-objects.c:3983
-#: builtin/rebase.c:1079
-msgid "action"
-msgstr ""
-
-#: apply.c:5044
-msgid "detect new or modified lines that have whitespace errors"
-msgstr ""
-
-#: apply.c:5047 apply.c:5050
-msgid "ignore changes in whitespace when finding context"
-msgstr ""
-
-#: apply.c:5053
-msgid "apply the patch in reverse"
-msgstr ""
-
-#: apply.c:5055
-msgid "don't expect at least one line of context"
-msgstr ""
-
-#: apply.c:5057
-msgid "leave the rejected hunks in corresponding *.rej files"
-msgstr ""
-
-#: apply.c:5059
-msgid "allow overlapping hunks"
-msgstr ""
-
-#: apply.c:5062
-msgid "tolerate incorrectly detected missing new-line at the end of file"
-msgstr ""
-
-#: apply.c:5065
-msgid "do not trust the line counts in the hunk headers"
-msgstr ""
-
-#: apply.c:5067 builtin/am.c:2367
-msgid "root"
-msgstr ""
-
-#: apply.c:5068
-msgid "prepend <root> to all filenames"
-msgstr ""
-
-#: apply.c:5071
-msgid "don't return error for empty patches"
-msgstr ""
-
-#: archive-tar.c:125 archive-zip.c:346
-#, c-format
-msgid "cannot stream blob %s"
-msgstr ""
-
-#: archive-tar.c:265 archive-zip.c:359
-#, c-format
-msgid "unsupported file mode: 0%o (SHA1: %s)"
-msgstr ""
-
-#: archive-tar.c:447
-#, c-format
-msgid "unable to start '%s' filter"
-msgstr ""
-
-#: archive-tar.c:450
-msgid "unable to redirect descriptor"
-msgstr ""
-
-#: archive-tar.c:457
-#, c-format
-msgid "'%s' filter reported error"
-msgstr ""
-
-#: archive-zip.c:319
-#, c-format
-msgid "path is not valid UTF-8: %s"
-msgstr ""
-
-#: archive-zip.c:323
-#, c-format
-msgid "path too long (%d chars, SHA1: %s): %s"
-msgstr ""
-
-#: archive-zip.c:470 builtin/pack-objects.c:363 builtin/pack-objects.c:366
-#, c-format
-msgid "deflate error (%d)"
-msgstr ""
-
-#: archive-zip.c:604
-#, c-format
-msgid "timestamp too large for this system: %<PRIuMAX>"
-msgstr ""
-
-#: archive.c:14
-msgid "git archive [<options>] <tree-ish> [<path>...]"
-msgstr ""
-
-#: archive.c:16
-msgid ""
-"git archive --remote <repo> [--exec <cmd>] [<options>] <tree-ish> [<path>...]"
-msgstr ""
-
-#: archive.c:17
-msgid "git archive --remote <repo> [--exec <cmd>] --list"
-msgstr ""
-
-#: archive.c:188 archive.c:341 builtin/gc.c:497 builtin/notes.c:238
-#: builtin/tag.c:579
-#, c-format
-msgid "cannot read '%s'"
-msgstr ""
-
-#: archive.c:426 builtin/add.c:214 builtin/add.c:657 builtin/rm.c:334
-#, c-format
-msgid "pathspec '%s' did not match any files"
-msgstr ""
-
-#: archive.c:450
-#, c-format
-msgid "no such ref: %.*s"
-msgstr ""
-
-#: archive.c:456
-#, c-format
-msgid "not a valid object name: %s"
-msgstr ""
-
-#: archive.c:469
-#, c-format
-msgid "not a tree object: %s"
-msgstr ""
-
-#: archive.c:481
-msgid "current working directory is untracked"
-msgstr ""
-
-#: archive.c:522
-#, c-format
-msgid "File not found: %s"
-msgstr ""
-
-#: archive.c:524
-#, c-format
-msgid "Not a regular file: %s"
-msgstr ""
-
-#: archive.c:551
-msgid "fmt"
-msgstr ""
-
-#: archive.c:551
-msgid "archive format"
-msgstr ""
-
-#: archive.c:552 builtin/log.c:1809
-msgid "prefix"
-msgstr ""
-
-#: archive.c:553
-msgid "prepend prefix to each pathname in the archive"
-msgstr ""
-
-#: archive.c:554 archive.c:557 builtin/blame.c:881 builtin/blame.c:885
-#: builtin/blame.c:886 builtin/commit-tree.c:115 builtin/config.c:135
-#: builtin/fast-export.c:1181 builtin/fast-export.c:1183
-#: builtin/fast-export.c:1187 builtin/grep.c:936 builtin/hash-object.c:104
-#: builtin/ls-files.c:654 builtin/ls-files.c:657 builtin/notes.c:410
-#: builtin/notes.c:576 builtin/read-tree.c:115 parse-options.h:195
-msgid "file"
-msgstr ""
-
-#: archive.c:555
-msgid "add untracked file to archive"
-msgstr ""
-
-#: archive.c:558 builtin/archive.c:88
-msgid "write the archive to this file"
-msgstr ""
-
-#: archive.c:560
-msgid "read .gitattributes in working directory"
-msgstr ""
-
-#: archive.c:561
-msgid "report archived files on stderr"
-msgstr ""
-
-#: archive.c:563
-msgid "set compression level"
-msgstr ""
-
-#: archive.c:566
-msgid "list supported archive formats"
-msgstr ""
-
-#: archive.c:568 builtin/archive.c:89 builtin/clone.c:122 builtin/clone.c:125
-#: builtin/submodule--helper.c:1884 builtin/submodule--helper.c:2718
-msgid "repo"
-msgstr ""
-
-#: archive.c:569 builtin/archive.c:90
-msgid "retrieve the archive from remote repository <repo>"
-msgstr ""
-
-#: archive.c:570 builtin/archive.c:91 builtin/difftool.c:708
-#: builtin/notes.c:496
-msgid "command"
-msgstr ""
-
-#: archive.c:571 builtin/archive.c:92
-msgid "path to the remote git-upload-archive command"
-msgstr ""
-
-#: archive.c:578
-msgid "Unexpected option --remote"
-msgstr ""
-
-#: archive.c:580 fetch-pack.c:300 revision.c:2914 builtin/add.c:530
-#: builtin/add.c:562 builtin/checkout.c:1782 builtin/clone.c:1099
-#: builtin/clone.c:1102 builtin/commit.c:371 builtin/fast-export.c:1230
-#: builtin/index-pack.c:1854 builtin/log.c:2140 builtin/reset.c:442
-#: builtin/reset.c:500 builtin/rm.c:281 builtin/stash.c:1708
-#: builtin/worktree.c:580 builtin/worktree.c:781 http-fetch.c:144
-#: http-fetch.c:153
-#, c-format
-msgid "the option '%s' requires '%s'"
-msgstr ""
-
-#: archive.c:582
-msgid "Unexpected option --output"
-msgstr ""
-
-#: archive.c:606
-#, c-format
-msgid "Unknown archive format '%s'"
-msgstr ""
-
-#: archive.c:615
-#, c-format
-msgid "Argument not supported for format '%s': -%d"
-msgstr ""
-
-#: attr.c:202
-#, c-format
-msgid "%.*s is not a valid attribute name"
-msgstr ""
-
-#: attr.c:363
-#, c-format
-msgid "%s not allowed: %s:%d"
-msgstr ""
-
-#: attr.c:403
-msgid ""
-"Negative patterns are ignored in git attributes\n"
-"Use '\\!' for literal leading exclamation."
-msgstr ""
-
-#: bisect.c:488
-#, c-format
-msgid "Badly quoted content in file '%s': %s"
-msgstr ""
-
-#: bisect.c:698
-#, c-format
-msgid "We cannot bisect more!\n"
-msgstr ""
-
-#: bisect.c:765
-#, c-format
-msgid "Not a valid commit name %s"
-msgstr ""
-
-#: bisect.c:790
-#, 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:795
-#, c-format
-msgid ""
-"The merge base %s is new.\n"
-"The property has changed between %s and [%s].\n"
-msgstr ""
-
-#: bisect.c:800
-#, 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:808
-#, c-format
-msgid ""
-"Some %s revs are not ancestors of the %s rev.\n"
-"git bisect cannot work properly in this case.\n"
-"Maybe you mistook %s and %s revs?\n"
-msgstr ""
-
-#: bisect.c:821
-#, c-format
-msgid ""
-"the merge base between %s and [%s] must be skipped.\n"
-"So we cannot be sure the first %s commit is between %s and %s.\n"
-"We continue anyway."
-msgstr ""
-
-#: bisect.c:860
-#, c-format
-msgid "Bisecting: a merge base must be tested\n"
-msgstr ""
-
-#: bisect.c:910
-#, c-format
-msgid "a %s revision is needed"
-msgstr ""
-
-#: bisect.c:940
-#, c-format
-msgid "could not create file '%s'"
-msgstr ""
-
-#: bisect.c:986 builtin/merge.c:155
-#, c-format
-msgid "could not read file '%s'"
-msgstr ""
-
-#: bisect.c:1026
-msgid "reading bisect refs failed"
-msgstr ""
-
-#: bisect.c:1056
-#, c-format
-msgid "%s was both %s and %s\n"
-msgstr ""
-
-#: bisect.c:1065
-#, c-format
-msgid ""
-"No testable commit found.\n"
-"Maybe you started with bad path arguments?\n"
-msgstr ""
-
-#: bisect.c:1094
-#, c-format
-msgid "(roughly %d step)"
-msgid_plural "(roughly %d steps)"
-msgstr[0] ""
-msgstr[1] ""
-
-#. TRANSLATORS: the last %s will be replaced with "(roughly %d
-#. steps)" translation.
-#.
-#: bisect.c:1100
-#, 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"
-msgstr[0] ""
-msgstr[1] ""
-
-#: blame.c:2773
-msgid "--contents and --reverse do not blend well."
-msgstr ""
-
-#: blame.c:2787
-msgid "cannot use --contents with final commit object name"
-msgstr ""
-
-#: blame.c:2808
-msgid "--reverse and --first-parent together require specified latest commit"
-msgstr ""
-
-#: blame.c:2817 bundle.c:231 midx.c:1058 ref-filter.c:2371 remote.c:2157
-#: sequencer.c:2348 sequencer.c:4872 submodule.c:913 builtin/commit.c:1118
-#: builtin/log.c:437 builtin/log.c:1055 builtin/log.c:1663 builtin/log.c:2096
-#: builtin/log.c:2387 builtin/merge.c:431 builtin/pack-objects.c:3381
-#: builtin/pack-objects.c:3781 builtin/pack-objects.c:3796
-#: builtin/shortlog.c:255
-msgid "revision walk setup failed"
-msgstr ""
-
-#: blame.c:2835
-msgid ""
-"--reverse --first-parent together require range along first-parent chain"
-msgstr ""
-
-#: blame.c:2846
-#, c-format
-msgid "no such path %s in %s"
-msgstr ""
-
-#: blame.c:2857
-#, c-format
-msgid "cannot read blob %s for path %s"
-msgstr ""
-
-#: branch.c:93
-msgid ""
-"cannot inherit upstream tracking configuration of multiple refs when "
-"rebasing is requested"
-msgstr ""
-
-#: branch.c:104
-#, c-format
-msgid "not setting branch '%s' as its own upstream"
-msgstr ""
-
-#: branch.c:160
-#, c-format
-msgid "branch '%s' set up to track '%s' by rebasing."
-msgstr ""
-
-#: branch.c:161
-#, c-format
-msgid "branch '%s' set up to track '%s'."
-msgstr ""
-
-#: branch.c:164
-#, c-format
-msgid "branch '%s' set up to track:"
-msgstr ""
-
-#: branch.c:176
-msgid "unable to write upstream branch configuration"
-msgstr ""
-
-#: branch.c:178
-msgid ""
-"\n"
-"After fixing the error cause you may try to fix up\n"
-"the remote tracking information by invoking:"
-msgstr ""
-
-#: branch.c:219
-#, c-format
-msgid "asked to inherit tracking from '%s', but no remote is set"
-msgstr ""
-
-#: branch.c:225
-#, c-format
-msgid "asked to inherit tracking from '%s', but no merge configuration is set"
-msgstr ""
-
-#: branch.c:277
-#, c-format
-msgid "not tracking: ambiguous information for ref '%s'"
-msgstr ""
-
-#. TRANSLATORS: This is a line listing a remote with duplicate
-#. refspecs in the advice message below. For RTL languages you'll
-#. probably want to swap the "%s" and leading "  " space around.
-#.
-#. TRANSLATORS: This is line item of ambiguous object output
-#. from describe_ambiguous_object() above. For RTL languages
-#. you'll probably want to swap the "%s" and leading " " space
-#. around.
-#.
-#: branch.c:289 object-name.c:464
-#, c-format
-msgid "  %s\n"
-msgstr ""
-
-#. TRANSLATORS: The second argument is a \n-delimited list of
-#. duplicate refspecs, composed above.
-#.
-#: branch.c:295
-#, c-format
-msgid ""
-"There are multiple remotes whose fetch refspecs map to the remote\n"
-"tracking ref '%s':\n"
-"%s\n"
-"This is typically a configuration error.\n"
-"\n"
-"To support setting up tracking branches, ensure that\n"
-"different remotes' fetch refspecs map into different\n"
-"tracking namespaces."
-msgstr ""
-
-#: branch.c:344
-#, c-format
-msgid "'%s' is not a valid branch name"
-msgstr ""
-
-#: branch.c:364
-#, c-format
-msgid "a branch named '%s' already exists"
-msgstr ""
-
-#: branch.c:370
-#, c-format
-msgid "cannot force update the branch '%s' checked out at '%s'"
-msgstr ""
-
-#: branch.c:393
-#, c-format
-msgid "cannot set up tracking information; starting point '%s' is not a branch"
-msgstr ""
-
-#: branch.c:395
-#, c-format
-msgid "the requested upstream branch '%s' does not exist"
-msgstr ""
-
-#: branch.c:397
-msgid ""
-"\n"
-"If you are planning on basing your work on an upstream\n"
-"branch that already exists at the remote, you may need to\n"
-"run \"git fetch\" to retrieve it.\n"
-"\n"
-"If you are planning to push out a new local branch that\n"
-"will track its remote counterpart, you may want to use\n"
-"\"git push -u\" to set the upstream config as you push."
-msgstr ""
-
-#: branch.c:445 builtin/replace.c:321 builtin/replace.c:377
-#: builtin/replace.c:423 builtin/replace.c:453
-#, c-format
-msgid "not a valid object name: '%s'"
-msgstr ""
-
-#: branch.c:465
-#, c-format
-msgid "ambiguous object name: '%s'"
-msgstr ""
-
-#: branch.c:470
-#, c-format
-msgid "not a valid branch point: '%s'"
-msgstr ""
-
-#: branch.c:658
-#, c-format
-msgid "submodule '%s': unable to find submodule"
-msgstr ""
-
-#: branch.c:661
-#, c-format
-msgid ""
-"You may try updating the submodules using 'git checkout %s && git submodule "
-"update --init'"
-msgstr ""
-
-#: branch.c:672 branch.c:698
-#, c-format
-msgid "submodule '%s': cannot create branch '%s'"
-msgstr ""
-
-#: branch.c:730
-#, c-format
-msgid "'%s' is already checked out at '%s'"
-msgstr ""
-
-#: branch.c:755
-#, c-format
-msgid "HEAD of working tree %s is not updated"
-msgstr ""
-
-#: bundle.c:45
-#, c-format
-msgid "unrecognized bundle hash algorithm: %s"
-msgstr ""
-
-#: bundle.c:53
-#, c-format
-msgid "unknown capability '%s'"
-msgstr ""
-
-#: bundle.c:79
-#, c-format
-msgid "'%s' does not look like a v2 or v3 bundle file"
-msgstr ""
-
-#: bundle.c:118
-#, c-format
-msgid "unrecognized header: %s%s (%d)"
-msgstr ""
-
-#: bundle.c:145 rerere.c:464 rerere.c:675 sequencer.c:2616 sequencer.c:3402
-#: builtin/commit.c:865
-#, c-format
-msgid "could not open '%s'"
-msgstr ""
-
-#: bundle.c:203
-msgid "Repository lacks these prerequisite commits:"
-msgstr ""
-
-#: bundle.c:206
-msgid "need a repository to verify a bundle"
-msgstr ""
-
-#: bundle.c:264
-#, c-format
-msgid "The bundle contains this ref:"
-msgid_plural "The bundle contains these %<PRIuMAX> refs:"
-msgstr[0] ""
-msgstr[1] ""
-
-#: bundle.c:272
-msgid "The bundle records a complete history."
-msgstr ""
-
-#: bundle.c:274
-#, c-format
-msgid "The bundle requires this ref:"
-msgid_plural "The bundle requires these %<PRIuMAX> refs:"
-msgstr[0] ""
-msgstr[1] ""
-
-#: bundle.c:350
-msgid "unable to dup bundle descriptor"
-msgstr ""
-
-#: bundle.c:357
-msgid "Could not spawn pack-objects"
-msgstr ""
-
-#: bundle.c:368
-msgid "pack-objects died"
-msgstr ""
-
-#: bundle.c:417
-#, c-format
-msgid "ref '%s' is excluded by the rev-list options"
-msgstr ""
-
-#: bundle.c:533 builtin/log.c:211 builtin/log.c:1975 builtin/shortlog.c:400
-#, c-format
-msgid "unrecognized argument: %s"
-msgstr ""
-
-#: bundle.c:548
-#, c-format
-msgid "unsupported bundle version %d"
-msgstr ""
-
-#: bundle.c:550
-#, c-format
-msgid "cannot write bundle version %d with algorithm %s"
-msgstr ""
-
-#: bundle.c:600
-msgid "Refusing to create empty bundle."
-msgstr ""
-
-#: bundle.c:610
-#, c-format
-msgid "cannot create '%s'"
-msgstr ""
-
-#: bundle.c:639
-msgid "index-pack died"
-msgstr ""
-
-#: chunk-format.c:117
-msgid "terminating chunk id appears earlier than expected"
-msgstr ""
-
-#: chunk-format.c:126
-#, c-format
-msgid "improper chunk offset(s) %<PRIx64> and %<PRIx64>"
-msgstr ""
-
-#: chunk-format.c:133
-#, c-format
-msgid "duplicate chunk ID %<PRIx32> found"
-msgstr ""
-
-#: chunk-format.c:147
-#, c-format
-msgid "final chunk has non-zero id %<PRIx32>"
-msgstr ""
-
-#: color.c:354
-#, c-format
-msgid "invalid color value: %.*s"
-msgstr ""
-
-#: commit-graph.c:204 midx.c:52
-msgid "invalid hash version"
-msgstr ""
-
-#: commit-graph.c:262
-msgid "commit-graph file is too small"
-msgstr ""
-
-#: commit-graph.c:355
-#, c-format
-msgid "commit-graph signature %X does not match signature %X"
-msgstr ""
-
-#: commit-graph.c:362
-#, c-format
-msgid "commit-graph version %X does not match version %X"
-msgstr ""
-
-#: commit-graph.c:369
-#, c-format
-msgid "commit-graph hash version %X does not match version %X"
-msgstr ""
-
-#: commit-graph.c:386
-#, c-format
-msgid "commit-graph file is too small to hold %u chunks"
-msgstr ""
-
-#: commit-graph.c:485
-msgid "commit-graph has no base graphs chunk"
-msgstr ""
-
-#: commit-graph.c:495
-msgid "commit-graph chain does not match"
-msgstr ""
-
-#: commit-graph.c:543
-#, c-format
-msgid "invalid commit-graph chain: line '%s' not a hash"
-msgstr ""
-
-#: commit-graph.c:567
-msgid "unable to find all commit-graph files"
-msgstr ""
-
-#: commit-graph.c:752 commit-graph.c:789
-msgid "invalid commit position. commit-graph is likely corrupt"
-msgstr ""
-
-#: commit-graph.c:773
-#, c-format
-msgid "could not find commit %s"
-msgstr ""
-
-#: commit-graph.c:806
-msgid "commit-graph requires overflow generation data but has none"
-msgstr ""
-
-#: commit-graph.c:1111 builtin/am.c:1370 builtin/checkout.c:775
-#: builtin/clone.c:705
-#, c-format
-msgid "unable to parse commit %s"
-msgstr ""
-
-#: commit-graph.c:1373 builtin/pack-objects.c:3078
-#, c-format
-msgid "unable to get type of object %s"
-msgstr ""
-
-#: commit-graph.c:1404
-msgid "Loading known commits in commit graph"
-msgstr ""
-
-#: commit-graph.c:1421
-msgid "Expanding reachable commits in commit graph"
-msgstr ""
-
-#: commit-graph.c:1441
-msgid "Clearing commit marks in commit graph"
-msgstr ""
-
-#: commit-graph.c:1460
-msgid "Computing commit graph topological levels"
-msgstr ""
-
-#: commit-graph.c:1513
-msgid "Computing commit graph generation numbers"
-msgstr ""
-
-#: commit-graph.c:1598
-msgid "Computing commit changed paths Bloom filters"
-msgstr ""
-
-#: commit-graph.c:1675
-msgid "Collecting referenced commits"
-msgstr ""
-
-#: commit-graph.c:1701
-#, c-format
-msgid "Finding commits for commit graph in %<PRIuMAX> pack"
-msgid_plural "Finding commits for commit graph in %<PRIuMAX> packs"
-msgstr[0] ""
-msgstr[1] ""
-
-#: commit-graph.c:1714
-#, c-format
-msgid "error adding pack %s"
-msgstr ""
-
-#: commit-graph.c:1718
-#, c-format
-msgid "error opening index for %s"
-msgstr ""
-
-#: commit-graph.c:1756
-msgid "Finding commits for commit graph among packed objects"
-msgstr ""
-
-#: commit-graph.c:1774
-msgid "Finding extra edges in commit graph"
-msgstr ""
-
-#: commit-graph.c:1823
-msgid "failed to write correct number of base graph ids"
-msgstr ""
-
-#: commit-graph.c:1854 midx.c:1168 builtin/sparse-checkout.c:475
-#, c-format
-msgid "unable to create leading directories of %s"
-msgstr ""
-
-#: commit-graph.c:1868
-msgid "unable to create temporary graph layer"
-msgstr ""
-
-#: commit-graph.c:1873
-#, c-format
-msgid "unable to adjust shared permissions for '%s'"
-msgstr ""
-
-#: commit-graph.c:1930
-#, 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:1967
-msgid "unable to open commit-graph chain file"
-msgstr ""
-
-#: commit-graph.c:1983
-msgid "failed to rename base commit-graph file"
-msgstr ""
-
-#: commit-graph.c:2004
-msgid "failed to rename temporary commit-graph file"
-msgstr ""
-
-#: commit-graph.c:2137
-msgid "Scanning merged commits"
-msgstr ""
-
-#: commit-graph.c:2181
-msgid "Merging commit-graph"
-msgstr ""
-
-#: commit-graph.c:2289
-msgid "attempting to write a commit-graph, but 'core.commitGraph' is disabled"
-msgstr ""
-
-#: commit-graph.c:2396
-msgid "too many commits to write graph"
-msgstr ""
-
-#: commit-graph.c:2494
-msgid "the commit-graph file has incorrect checksum and is likely corrupt"
-msgstr ""
-
-#: commit-graph.c:2504
-#, c-format
-msgid "commit-graph has incorrect OID order: %s then %s"
-msgstr ""
-
-#: commit-graph.c:2514 commit-graph.c:2529
-#, c-format
-msgid "commit-graph has incorrect fanout value: fanout[%d] = %u != %u"
-msgstr ""
-
-#: commit-graph.c:2521
-#, c-format
-msgid "failed to parse commit %s from commit-graph"
-msgstr ""
-
-#: commit-graph.c:2539
-msgid "Verifying commits in commit graph"
-msgstr ""
-
-#: commit-graph.c:2554
-#, c-format
-msgid "failed to parse commit %s from object database for commit-graph"
-msgstr ""
-
-#: commit-graph.c:2561
-#, c-format
-msgid "root tree OID for commit %s in commit-graph is %s != %s"
-msgstr ""
-
-#: commit-graph.c:2571
-#, c-format
-msgid "commit-graph parent list for commit %s is too long"
-msgstr ""
-
-#: commit-graph.c:2580
-#, c-format
-msgid "commit-graph parent for %s is %s != %s"
-msgstr ""
-
-#: commit-graph.c:2594
-#, c-format
-msgid "commit-graph parent list for commit %s terminates early"
-msgstr ""
-
-#: commit-graph.c:2599
-#, c-format
-msgid ""
-"commit-graph has generation number zero for commit %s, but non-zero elsewhere"
-msgstr ""
-
-#: commit-graph.c:2603
-#, c-format
-msgid ""
-"commit-graph has non-zero generation number for commit %s, but zero elsewhere"
-msgstr ""
-
-#: commit-graph.c:2620
-#, c-format
-msgid "commit-graph generation for commit %s is %<PRIuMAX> < %<PRIuMAX>"
-msgstr ""
-
-#: commit-graph.c:2626
-#, c-format
-msgid "commit date for commit %s in commit-graph is %<PRIuMAX> != %<PRIuMAX>"
-msgstr ""
-
-#: commit.c:54 sequencer.c:3105 builtin/am.c:400 builtin/am.c:445
-#: builtin/am.c:450 builtin/am.c:1449 builtin/am.c:2124 builtin/replace.c:456
-#, c-format
-msgid "could not parse %s"
-msgstr ""
-
-#: commit.c:56
-#, c-format
-msgid "%s %s is not a commit!"
-msgstr ""
-
-#: commit.c:197
-msgid ""
-"Support for <GIT_DIR>/info/grafts is deprecated\n"
-"and will be removed in a future Git version.\n"
-"\n"
-"Please use \"git replace --convert-graft-file\"\n"
-"to convert the grafts into replace refs.\n"
-"\n"
-"Turn this message off by running\n"
-"\"git config advice.graftFileDeprecated false\""
-msgstr ""
-
-#: commit.c:1252
-#, c-format
-msgid "Commit %s has an untrusted GPG signature, allegedly by %s."
-msgstr ""
-
-#: commit.c:1256
-#, c-format
-msgid "Commit %s has a bad GPG signature allegedly by %s."
-msgstr ""
-
-#: commit.c:1259
-#, c-format
-msgid "Commit %s does not have a GPG signature."
-msgstr ""
-
-#: commit.c:1262
-#, c-format
-msgid "Commit %s has a good GPG signature by %s\n"
-msgstr ""
-
-#: commit.c:1516
-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"
-"variable i18n.commitencoding to the encoding your project uses.\n"
-msgstr ""
-
-#: compat/obstack.c:406 compat/obstack.c:408
-msgid "memory exhausted"
-msgstr ""
-
-#: compat/terminal.c:167
-msgid "cannot resume in the background, please use 'fg' to resume"
-msgstr ""
-
-#: compat/terminal.c:168
-msgid "cannot restore terminal settings"
-msgstr ""
-
-#: config.c:143
-#, c-format
-msgid ""
-"exceeded maximum include depth (%d) while including\n"
-"\t%s\n"
-"from\n"
-"\t%s\n"
-"This might be due to circular includes."
-msgstr ""
-
-#: config.c:159
-#, c-format
-msgid "could not expand include path '%s'"
-msgstr ""
-
-#: config.c:170
-msgid "relative config includes must come from files"
-msgstr ""
-
-#: config.c:219
-msgid "relative config include conditionals must come from files"
-msgstr ""
-
-#: config.c:364
-msgid ""
-"remote URLs cannot be configured in file directly or indirectly included by "
-"includeIf.hasconfig:remote.*.url"
-msgstr ""
-
-#: config.c:508
-#, c-format
-msgid "invalid config format: %s"
-msgstr ""
-
-#: config.c:512
-#, c-format
-msgid "missing environment variable name for configuration '%.*s'"
-msgstr ""
-
-#: config.c:517
-#, c-format
-msgid "missing environment variable '%s' for configuration '%.*s'"
-msgstr ""
-
-#: config.c:553
-#, c-format
-msgid "key does not contain a section: %s"
-msgstr ""
-
-#: config.c:558
-#, c-format
-msgid "key does not contain variable name: %s"
-msgstr ""
-
-#: config.c:580 sequencer.c:2802
-#, c-format
-msgid "invalid key: %s"
-msgstr ""
-
-#: config.c:585
-#, c-format
-msgid "invalid key (newline): %s"
-msgstr ""
-
-#: config.c:605
-msgid "empty config key"
-msgstr ""
-
-#: config.c:623 config.c:635
-#, c-format
-msgid "bogus config parameter: %s"
-msgstr ""
-
-#: config.c:649 config.c:666 config.c:673 config.c:682
-#, c-format
-msgid "bogus format in %s"
-msgstr ""
-
-#: config.c:716
-#, c-format
-msgid "bogus count in %s"
-msgstr ""
-
-#: config.c:720
-#, c-format
-msgid "too many entries in %s"
-msgstr ""
-
-#: config.c:730
-#, c-format
-msgid "missing config key %s"
-msgstr ""
-
-#: config.c:738
-#, c-format
-msgid "missing config value %s"
-msgstr ""
-
-#: config.c:1089
-#, c-format
-msgid "bad config line %d in blob %s"
-msgstr ""
-
-#: config.c:1093
-#, c-format
-msgid "bad config line %d in file %s"
-msgstr ""
-
-#: config.c:1097
-#, c-format
-msgid "bad config line %d in standard input"
-msgstr ""
-
-#: config.c:1101
-#, c-format
-msgid "bad config line %d in submodule-blob %s"
-msgstr ""
-
-#: config.c:1105
-#, c-format
-msgid "bad config line %d in command line %s"
-msgstr ""
-
-#: config.c:1109
-#, c-format
-msgid "bad config line %d in %s"
-msgstr ""
-
-#: config.c:1246
-msgid "out of range"
-msgstr ""
-
-#: config.c:1246
-msgid "invalid unit"
-msgstr ""
-
-#: config.c:1247
-#, c-format
-msgid "bad numeric config value '%s' for '%s': %s"
-msgstr ""
-
-#: config.c:1257
-#, c-format
-msgid "bad numeric config value '%s' for '%s' in blob %s: %s"
-msgstr ""
-
-#: config.c:1260
-#, c-format
-msgid "bad numeric config value '%s' for '%s' in file %s: %s"
-msgstr ""
-
-#: config.c:1263
-#, c-format
-msgid "bad numeric config value '%s' for '%s' in standard input: %s"
-msgstr ""
-
-#: config.c:1266
-#, c-format
-msgid "bad numeric config value '%s' for '%s' in submodule-blob %s: %s"
-msgstr ""
-
-#: config.c:1269
-#, c-format
-msgid "bad numeric config value '%s' for '%s' in command line %s: %s"
-msgstr ""
-
-#: config.c:1272
-#, c-format
-msgid "bad numeric config value '%s' for '%s' in %s: %s"
-msgstr ""
-
-#: config.c:1368
-#, c-format
-msgid "invalid value for variable %s"
-msgstr ""
-
-#: config.c:1389
-#, c-format
-msgid "ignoring unknown core.fsync component '%s'"
-msgstr ""
-
-#: config.c:1425
-#, c-format
-msgid "bad boolean config value '%s' for '%s'"
-msgstr ""
-
-#: config.c:1443
-#, c-format
-msgid "failed to expand user dir in: '%s'"
-msgstr ""
-
-#: config.c:1452
-#, c-format
-msgid "'%s' for '%s' is not a valid timestamp"
-msgstr ""
-
-#: config.c:1545
-#, c-format
-msgid "abbrev length out of range: %d"
-msgstr ""
-
-#: config.c:1559 config.c:1570
-#, c-format
-msgid "bad zlib compression level %d"
-msgstr ""
-
-#: config.c:1660
-msgid "core.commentChar should only be one character"
-msgstr ""
-
-#: config.c:1692
-#, c-format
-msgid "ignoring unknown core.fsyncMethod value '%s'"
-msgstr ""
-
-#: config.c:1698
-msgid "core.fsyncObjectFiles is deprecated; use core.fsync instead"
-msgstr ""
-
-#: config.c:1714
-#, c-format
-msgid "invalid mode for object creation: %s"
-msgstr ""
-
-#: config.c:1800
-#, c-format
-msgid "malformed value for %s"
-msgstr ""
-
-#: config.c:1826
-#, c-format
-msgid "malformed value for %s: %s"
-msgstr ""
-
-#: config.c:1827
-msgid "must be one of nothing, matching, simple, upstream or current"
-msgstr ""
-
-#: config.c:1888 builtin/pack-objects.c:4078
-#, c-format
-msgid "bad pack compression level %d"
-msgstr ""
-
-#: config.c:2014
-#, c-format
-msgid "unable to load config blob object '%s'"
-msgstr ""
-
-#: config.c:2017
-#, c-format
-msgid "reference '%s' does not point to a blob"
-msgstr ""
-
-#: config.c:2035
-#, c-format
-msgid "unable to resolve config blob '%s'"
-msgstr ""
-
-#: config.c:2080
-#, c-format
-msgid "failed to parse %s"
-msgstr ""
-
-#: config.c:2136
-msgid "unable to parse command-line config"
-msgstr ""
-
-#: config.c:2512
-msgid "unknown error occurred while reading the configuration files"
-msgstr ""
-
-#: config.c:2686
-#, c-format
-msgid "Invalid %s: '%s'"
-msgstr ""
-
-#: config.c:2731
-#, c-format
-msgid "splitIndex.maxPercentChange value '%d' should be between 0 and 100"
-msgstr ""
-
-#: config.c:2763
-#, c-format
-msgid "unable to parse '%s' from command-line config"
-msgstr ""
-
-#: config.c:2765
-#, c-format
-msgid "bad config variable '%s' in file '%s' at line %d"
-msgstr ""
-
-#: config.c:2850
-#, c-format
-msgid "invalid section name '%s'"
-msgstr ""
-
-#: config.c:2882
-#, c-format
-msgid "%s has multiple values"
-msgstr ""
-
-#: config.c:2911
-#, c-format
-msgid "failed to write new configuration file %s"
-msgstr ""
-
-#: config.c:3177 config.c:3518
-#, c-format
-msgid "could not lock config file %s"
-msgstr ""
-
-#: config.c:3188
-#, c-format
-msgid "opening %s"
-msgstr ""
-
-#: config.c:3225 builtin/config.c:361
-#, c-format
-msgid "invalid pattern: %s"
-msgstr ""
-
-#: config.c:3250
-#, c-format
-msgid "invalid config file %s"
-msgstr ""
-
-#: config.c:3263 config.c:3531
-#, c-format
-msgid "fstat on %s failed"
-msgstr ""
-
-#: config.c:3274
-#, c-format
-msgid "unable to mmap '%s'%s"
-msgstr ""
-
-#: config.c:3284 config.c:3536
-#, c-format
-msgid "chmod on %s failed"
-msgstr ""
-
-#: config.c:3369 config.c:3633
-#, c-format
-msgid "could not write config file %s"
-msgstr ""
-
-#: config.c:3403
-#, c-format
-msgid "could not set '%s' to '%s'"
-msgstr ""
-
-#: config.c:3405 builtin/remote.c:666 builtin/remote.c:885 builtin/remote.c:893
-#, c-format
-msgid "could not unset '%s'"
-msgstr ""
-
-#: config.c:3509
-#, c-format
-msgid "invalid section name: %s"
-msgstr ""
-
-#: config.c:3676
-#, c-format
-msgid "missing value for '%s'"
-msgstr ""
-
-#: connect.c:61
-msgid "the remote end hung up upon initial contact"
-msgstr ""
-
-#: connect.c:63
-msgid ""
-"Could not read from remote repository.\n"
-"\n"
-"Please make sure you have the correct access rights\n"
-"and the repository exists."
-msgstr ""
-
-#: connect.c:81
-#, c-format
-msgid "server doesn't support '%s'"
-msgstr ""
-
-#: connect.c:118
-#, c-format
-msgid "server doesn't support feature '%s'"
-msgstr ""
-
-#: connect.c:129
-msgid "expected flush after capabilities"
-msgstr ""
-
-#: connect.c:265
-#, c-format
-msgid "ignoring capabilities after first line '%s'"
-msgstr ""
-
-#: connect.c:286
-msgid "protocol error: unexpected capabilities^{}"
-msgstr ""
-
-#: connect.c:308
-#, c-format
-msgid "protocol error: expected shallow sha-1, got '%s'"
-msgstr ""
-
-#: connect.c:310
-msgid "repository on the other end cannot be shallow"
-msgstr ""
-
-#: connect.c:349
-msgid "invalid packet"
-msgstr ""
-
-#: connect.c:369
-#, c-format
-msgid "protocol error: unexpected '%s'"
-msgstr ""
-
-#: connect.c:499
-#, c-format
-msgid "unknown object format '%s' specified by server"
-msgstr ""
-
-#: connect.c:528
-#, c-format
-msgid "invalid ls-refs response: %s"
-msgstr ""
-
-#: connect.c:532
-msgid "expected flush after ref listing"
-msgstr ""
-
-#: connect.c:535
-msgid "expected response end packet after ref listing"
-msgstr ""
-
-#: connect.c:670
-#, c-format
-msgid "protocol '%s' is not supported"
-msgstr ""
-
-#: connect.c:721
-msgid "unable to set SO_KEEPALIVE on socket"
-msgstr ""
-
-#: connect.c:761 connect.c:824
-#, c-format
-msgid "Looking up %s ... "
-msgstr ""
-
-#: 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:769 connect.c:840
-#, c-format
-msgid ""
-"done.\n"
-"Connecting to %s (port %s) ... "
-msgstr ""
-
-#: connect.c:791 connect.c:868
-#, c-format
-msgid ""
-"unable to connect to %s:\n"
-"%s"
-msgstr ""
-
-#. TRANSLATORS: this is the end of "Connecting to %s (port %s) ... "
-#: connect.c:797 connect.c:874
-msgid "done."
-msgstr ""
-
-#: connect.c:828
-#, c-format
-msgid "unable to look up %s (%s)"
-msgstr ""
-
-#: connect.c:834
-#, c-format
-msgid "unknown port %s"
-msgstr ""
-
-#: connect.c:971 connect.c:1303
-#, c-format
-msgid "strange hostname '%s' blocked"
-msgstr ""
-
-#: connect.c:973
-#, c-format
-msgid "strange port '%s' blocked"
-msgstr ""
-
-#: connect.c:983
-#, c-format
-msgid "cannot start proxy %s"
-msgstr ""
-
-#: connect.c:1054
-msgid "no path specified; see 'git help pull' for valid url syntax"
-msgstr ""
-
-#: connect.c:1194
-msgid "newline is forbidden in git:// hosts and repo paths"
-msgstr ""
-
-#: connect.c:1251
-msgid "ssh variant 'simple' does not support -4"
-msgstr ""
-
-#: connect.c:1263
-msgid "ssh variant 'simple' does not support -6"
-msgstr ""
-
-#: connect.c:1280
-msgid "ssh variant 'simple' does not support setting port"
-msgstr ""
-
-#: connect.c:1392
-#, c-format
-msgid "strange pathname '%s' blocked"
-msgstr ""
-
-#: connect.c:1440
-msgid "unable to fork"
-msgstr ""
-
-#: connected.c:109 builtin/fsck.c:189 builtin/prune.c:57
-msgid "Checking connectivity"
-msgstr ""
-
-#: connected.c:122
-msgid "Could not run 'git rev-list'"
-msgstr ""
-
-#: connected.c:146
-msgid "failed write to rev-list"
-msgstr ""
-
-#: connected.c:151
-msgid "failed to close rev-list's stdin"
-msgstr ""
-
-#: convert.c:183
-#, c-format
-msgid "illegal crlf_action %d"
-msgstr ""
-
-#: convert.c:196
-#, c-format
-msgid "CRLF would be replaced by LF in %s"
-msgstr ""
-
-#: convert.c:198
-#, c-format
-msgid ""
-"CRLF will be replaced by LF in %s.\n"
-"The file will have its original line endings in your working directory"
-msgstr ""
-
-#: convert.c:206
-#, c-format
-msgid "LF would be replaced by CRLF in %s"
-msgstr ""
-
-#: convert.c:208
-#, c-format
-msgid ""
-"LF will be replaced by CRLF in %s.\n"
-"The file will have its original line endings in your working directory"
-msgstr ""
-
-#: convert.c:273
-#, c-format
-msgid "BOM is prohibited in '%s' if encoded as %s"
-msgstr ""
-
-#: convert.c:280
-#, c-format
-msgid ""
-"The file '%s' contains a byte order mark (BOM). Please use UTF-%.*s as "
-"working-tree-encoding."
-msgstr ""
-
-#: convert.c:293
-#, c-format
-msgid "BOM is required in '%s' if encoded as %s"
-msgstr ""
-
-#: 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."
-msgstr ""
-
-#: convert.c:408 convert.c:479
-#, c-format
-msgid "failed to encode '%s' from %s to %s"
-msgstr ""
-
-#: convert.c:451
-#, c-format
-msgid "encoding '%s' from %s to %s and back is not the same"
-msgstr ""
-
-#: convert.c:654
-#, c-format
-msgid "cannot fork to run external filter '%s'"
-msgstr ""
-
-#: convert.c:674
-#, c-format
-msgid "cannot feed the input to external filter '%s'"
-msgstr ""
-
-#: convert.c:681
-#, c-format
-msgid "external filter '%s' failed %d"
-msgstr ""
-
-#: convert.c:716 convert.c:719
-#, c-format
-msgid "read from external filter '%s' failed"
-msgstr ""
-
-#: convert.c:722 convert.c:777
-#, c-format
-msgid "external filter '%s' failed"
-msgstr ""
-
-#: convert.c:826
-msgid "unexpected filter type"
-msgstr ""
-
-#: convert.c:837
-msgid "path name too long for external filter"
-msgstr ""
-
-#: convert.c:935
-#, c-format
-msgid ""
-"external filter '%s' is not available anymore although not all paths have "
-"been filtered"
-msgstr ""
-
-#: convert.c:1236
-msgid "true/false are no valid working-tree-encodings"
-msgstr ""
-
-#: convert.c:1416 convert.c:1449
-#, c-format
-msgid "%s: clean filter '%s' failed"
-msgstr ""
-
-#: convert.c:1492
-#, c-format
-msgid "%s: smudge filter %s failed"
-msgstr ""
-
-#: credential.c:96
-#, c-format
-msgid "skipping credential lookup for key: credential.%s"
-msgstr ""
-
-#: credential.c:112
-msgid "refusing to work with credential missing host field"
-msgstr ""
-
-#: credential.c:114
-msgid "refusing to work with credential missing protocol field"
-msgstr ""
-
-#: credential.c:396
-#, c-format
-msgid "url contains a newline in its %s component: %s"
-msgstr ""
-
-#: credential.c:440
-#, c-format
-msgid "url has no scheme: %s"
-msgstr ""
-
-#: credential.c:513
-#, c-format
-msgid "credential url cannot be parsed: %s"
-msgstr ""
-
-#: date.c:139
-msgid "in the future"
-msgstr ""
-
-#: date.c:145
-#, c-format
-msgid "%<PRIuMAX> second ago"
-msgid_plural "%<PRIuMAX> seconds ago"
-msgstr[0] ""
-msgstr[1] ""
-
-#: date.c:152
-#, c-format
-msgid "%<PRIuMAX> minute ago"
-msgid_plural "%<PRIuMAX> minutes ago"
-msgstr[0] ""
-msgstr[1] ""
-
-#: date.c:159
-#, c-format
-msgid "%<PRIuMAX> hour ago"
-msgid_plural "%<PRIuMAX> hours ago"
-msgstr[0] ""
-msgstr[1] ""
-
-#: date.c:166
-#, c-format
-msgid "%<PRIuMAX> day ago"
-msgid_plural "%<PRIuMAX> days ago"
-msgstr[0] ""
-msgstr[1] ""
-
-#: date.c:172
-#, c-format
-msgid "%<PRIuMAX> week ago"
-msgid_plural "%<PRIuMAX> weeks ago"
-msgstr[0] ""
-msgstr[1] ""
-
-#: date.c:179
-#, c-format
-msgid "%<PRIuMAX> month ago"
-msgid_plural "%<PRIuMAX> months ago"
-msgstr[0] ""
-msgstr[1] ""
-
-#: date.c:190
-#, c-format
-msgid "%<PRIuMAX> year"
-msgid_plural "%<PRIuMAX> years"
-msgstr[0] ""
-msgstr[1] ""
-
-#. TRANSLATORS: "%s" is "<n> years"
-#: date.c:193
-#, c-format
-msgid "%s, %<PRIuMAX> month ago"
-msgid_plural "%s, %<PRIuMAX> months ago"
-msgstr[0] ""
-msgstr[1] ""
-
-#: date.c:198 date.c:203
-#, c-format
-msgid "%<PRIuMAX> year ago"
-msgid_plural "%<PRIuMAX> years ago"
-msgstr[0] ""
-msgstr[1] ""
-
-#: delta-islands.c:272
-msgid "Propagating island marks"
-msgstr ""
-
-#: delta-islands.c:290
-#, c-format
-msgid "bad tree object %s"
-msgstr ""
-
-#: delta-islands.c:334
-#, c-format
-msgid "failed to load island regex for '%s': %s"
-msgstr ""
-
-#: delta-islands.c:390
-#, c-format
-msgid "island regex from config has too many capture groups (max=%d)"
-msgstr ""
-
-#: delta-islands.c:467
-#, c-format
-msgid "Marked %d islands, done.\n"
-msgstr ""
-
-#: diff-merges.c:81 gpg-interface.c:719 gpg-interface.c:734 ls-refs.c:37
-#: parallel-checkout.c:42 sequencer.c:2805 setup.c:563 builtin/am.c:203
-#: builtin/am.c:2243 builtin/am.c:2287 builtin/blame.c:724 builtin/blame.c:742
-#: builtin/fetch.c:792 builtin/pack-objects.c:3515 builtin/pull.c:45
-#: builtin/pull.c:47 builtin/pull.c:321
-#, c-format
-msgid "invalid value for '%s': '%s'"
-msgstr ""
-
-#: diff-lib.c:561
-msgid "--merge-base does not work with ranges"
-msgstr ""
-
-#: diff-lib.c:563
-msgid "--merge-base only works with commits"
-msgstr ""
-
-#: diff-lib.c:580
-msgid "unable to get HEAD"
-msgstr ""
-
-#: diff-lib.c:587
-msgid "no merge base found"
-msgstr ""
-
-#: diff-lib.c:589
-msgid "multiple merge bases found"
-msgstr ""
-
-#: diff-no-index.c:237
-msgid "git diff --no-index [<options>] <path> <path>"
-msgstr ""
-
-#: diff-no-index.c:262
-msgid ""
-"Not a git repository. Use --no-index to compare two paths outside a working "
-"tree"
-msgstr ""
-
-#: diff.c:159
-#, c-format
-msgid "  Failed to parse dirstat cut-off percentage '%s'\n"
-msgstr ""
-
-#: diff.c:164
-#, c-format
-msgid "  Unknown dirstat parameter '%s'\n"
-msgstr ""
-
-#: diff.c:300
-msgid ""
-"color moved setting must be one of 'no', 'default', 'blocks', 'zebra', "
-"'dimmed-zebra', 'plain'"
-msgstr ""
-
-#: diff.c:328
-#, 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:336
-msgid ""
-"color-moved-ws: allow-indentation-change cannot be combined with other "
-"whitespace modes"
-msgstr ""
-
-#: diff.c:413
-#, c-format
-msgid "Unknown value for 'diff.submodule' config variable: '%s'"
-msgstr ""
-
-#: diff.c:473
-#, c-format
-msgid ""
-"Found errors in 'diff.dirstat' config variable:\n"
-"%s"
-msgstr ""
-
-#: diff.c:4282
-#, c-format
-msgid "external diff died, stopping at %s"
-msgstr ""
-
-#: diff.c:4677 parse-options.c:1114
-#, c-format
-msgid "options '%s', '%s', '%s', and '%s' cannot be used together"
-msgstr ""
-
-#: diff.c:4681 parse-options.c:1118 builtin/worktree.c:578
-#, c-format
-msgid "options '%s', '%s', and '%s' cannot be used together"
-msgstr ""
-
-#: diff.c:4685
-#, c-format
-msgid "options '%s' and '%s' cannot be used together, use '%s' with '%s'"
-msgstr ""
-
-#: diff.c:4689
-#, c-format
-msgid ""
-"options '%s' and '%s' cannot be used together, use '%s' with '%s' and '%s'"
-msgstr ""
-
-#: diff.c:4769
-msgid "--follow requires exactly one pathspec"
-msgstr ""
-
-#: diff.c:4823
-#, c-format
-msgid "invalid --stat value: %s"
-msgstr ""
-
-#: diff.c:4828 diff.c:4833 diff.c:4838 diff.c:4843 diff.c:5319
-#: parse-options.c:217 parse-options.c:221
-#, c-format
-msgid "%s expects a numerical value"
-msgstr ""
-
-#: diff.c:4860
-#, c-format
-msgid ""
-"Failed to parse --dirstat/-X option parameter:\n"
-"%s"
-msgstr ""
-
-#: diff.c:4893
-#, c-format
-msgid "unknown change class '%c' in --diff-filter=%s"
-msgstr ""
-
-#: diff.c:4917
-#, c-format
-msgid "unknown value after ws-error-highlight=%.*s"
-msgstr ""
-
-#: diff.c:4931
-#, c-format
-msgid "unable to resolve '%s'"
-msgstr ""
-
-#: diff.c:4981 diff.c:4987
-#, c-format
-msgid "%s expects <n>/<m> form"
-msgstr ""
-
-#: diff.c:4999
-#, c-format
-msgid "%s expects a character, got '%s'"
-msgstr ""
-
-#: diff.c:5020
-#, c-format
-msgid "bad --color-moved argument: %s"
-msgstr ""
-
-#: diff.c:5039
-#, c-format
-msgid "invalid mode '%s' in --color-moved-ws"
-msgstr ""
-
-#: diff.c:5079
-msgid ""
-"option diff-algorithm accepts \"myers\", \"minimal\", \"patience\" and "
-"\"histogram\""
-msgstr ""
-
-#: diff.c:5115 diff.c:5135
-#, c-format
-msgid "invalid argument to %s"
-msgstr ""
-
-#: diff.c:5239
-#, c-format
-msgid "invalid regex given to -I: '%s'"
-msgstr ""
-
-#: diff.c:5288
-#, c-format
-msgid "failed to parse --submodule option parameter: '%s'"
-msgstr ""
-
-#: diff.c:5344
-#, c-format
-msgid "bad --word-diff argument: %s"
-msgstr ""
-
-#: diff.c:5380
-msgid "Diff output format options"
-msgstr ""
-
-#: diff.c:5382 diff.c:5388
-msgid "generate patch"
-msgstr ""
-
-#: diff.c:5385 builtin/log.c:180
-msgid "suppress diff output"
-msgstr ""
-
-#: diff.c:5390 diff.c:5504 diff.c:5511
-msgid "<n>"
-msgstr ""
-
-#: diff.c:5391 diff.c:5394
-msgid "generate diffs with <n> lines context"
-msgstr ""
-
-#: diff.c:5396
-msgid "generate the diff in raw format"
-msgstr ""
-
-#: diff.c:5399
-msgid "synonym for '-p --raw'"
-msgstr ""
-
-#: diff.c:5403
-msgid "synonym for '-p --stat'"
-msgstr ""
-
-#: diff.c:5407
-msgid "machine friendly --stat"
-msgstr ""
-
-#: diff.c:5410
-msgid "output only the last line of --stat"
-msgstr ""
-
-#: diff.c:5412 diff.c:5420
-msgid "<param1,param2>..."
-msgstr ""
-
-#: diff.c:5413
-msgid ""
-"output the distribution of relative amount of changes for each sub-directory"
-msgstr ""
-
-#: diff.c:5417
-msgid "synonym for --dirstat=cumulative"
-msgstr ""
-
-#: diff.c:5421
-msgid "synonym for --dirstat=files,param1,param2..."
-msgstr ""
-
-#: diff.c:5425
-msgid "warn if changes introduce conflict markers or whitespace errors"
-msgstr ""
-
-#: diff.c:5428
-msgid "condensed summary such as creations, renames and mode changes"
-msgstr ""
-
-#: diff.c:5431
-msgid "show only names of changed files"
-msgstr ""
-
-#: diff.c:5434
-msgid "show only names and status of changed files"
-msgstr ""
-
-#: diff.c:5436
-msgid "<width>[,<name-width>[,<count>]]"
-msgstr ""
-
-#: diff.c:5437
-msgid "generate diffstat"
-msgstr ""
-
-#: diff.c:5439 diff.c:5442 diff.c:5445
-msgid "<width>"
-msgstr ""
-
-#: diff.c:5440
-msgid "generate diffstat with a given width"
-msgstr ""
-
-#: diff.c:5443
-msgid "generate diffstat with a given name width"
-msgstr ""
-
-#: diff.c:5446
-msgid "generate diffstat with a given graph width"
-msgstr ""
-
-#: diff.c:5448
-msgid "<count>"
-msgstr ""
-
-#: diff.c:5449
-msgid "generate diffstat with limited lines"
-msgstr ""
-
-#: diff.c:5452
-msgid "generate compact summary in diffstat"
-msgstr ""
-
-#: diff.c:5455
-msgid "output a binary diff that can be applied"
-msgstr ""
-
-#: diff.c:5458
-msgid "show full pre- and post-image object names on the \"index\" lines"
-msgstr ""
-
-#: diff.c:5460
-msgid "show colored diff"
-msgstr ""
-
-#: diff.c:5461
-msgid "<kind>"
-msgstr ""
-
-#: diff.c:5462
-msgid ""
-"highlight whitespace errors in the 'context', 'old' or 'new' lines in the "
-"diff"
-msgstr ""
-
-#: diff.c:5465
-msgid ""
-"do not munge pathnames and use NULs as output field terminators in --raw or "
-"--numstat"
-msgstr ""
-
-#: diff.c:5468 diff.c:5471 diff.c:5474 diff.c:5583
-msgid "<prefix>"
-msgstr ""
-
-#: diff.c:5469
-msgid "show the given source prefix instead of \"a/\""
-msgstr ""
-
-#: diff.c:5472
-msgid "show the given destination prefix instead of \"b/\""
-msgstr ""
-
-#: diff.c:5475
-msgid "prepend an additional prefix to every line of output"
-msgstr ""
-
-#: diff.c:5478
-msgid "do not show any source or destination prefix"
-msgstr ""
-
-#: diff.c:5481
-msgid "show context between diff hunks up to the specified number of lines"
-msgstr ""
-
-#: diff.c:5485 diff.c:5490 diff.c:5495
-msgid "<char>"
-msgstr ""
-
-#: diff.c:5486
-msgid "specify the character to indicate a new line instead of '+'"
-msgstr ""
-
-#: diff.c:5491
-msgid "specify the character to indicate an old line instead of '-'"
-msgstr ""
-
-#: diff.c:5496
-msgid "specify the character to indicate a context instead of ' '"
-msgstr ""
-
-#: diff.c:5499
-msgid "Diff rename options"
-msgstr ""
-
-#: diff.c:5500
-msgid "<n>[/<m>]"
-msgstr ""
-
-#: diff.c:5501
-msgid "break complete rewrite changes into pairs of delete and create"
-msgstr ""
-
-#: diff.c:5505
-msgid "detect renames"
-msgstr ""
-
-#: diff.c:5509
-msgid "omit the preimage for deletes"
-msgstr ""
-
-#: diff.c:5512
-msgid "detect copies"
-msgstr ""
-
-#: diff.c:5516
-msgid "use unmodified files as source to find copies"
-msgstr ""
-
-#: diff.c:5518
-msgid "disable rename detection"
-msgstr ""
-
-#: diff.c:5521
-msgid "use empty blobs as rename source"
-msgstr ""
-
-#: diff.c:5523
-msgid "continue listing the history of a file beyond renames"
-msgstr ""
-
-#: diff.c:5526
-msgid ""
-"prevent rename/copy detection if the number of rename/copy targets exceeds "
-"given limit"
-msgstr ""
-
-#: diff.c:5528
-msgid "Diff algorithm options"
-msgstr ""
-
-#: diff.c:5530
-msgid "produce the smallest possible diff"
-msgstr ""
-
-#: diff.c:5533
-msgid "ignore whitespace when comparing lines"
-msgstr ""
-
-#: diff.c:5536
-msgid "ignore changes in amount of whitespace"
-msgstr ""
-
-#: diff.c:5539
-msgid "ignore changes in whitespace at EOL"
-msgstr ""
-
-#: diff.c:5542
-msgid "ignore carrier-return at the end of line"
-msgstr ""
-
-#: diff.c:5545
-msgid "ignore changes whose lines are all blank"
-msgstr ""
-
-#: diff.c:5547 diff.c:5569 diff.c:5572 diff.c:5617
-msgid "<regex>"
-msgstr ""
-
-#: diff.c:5548
-msgid "ignore changes whose all lines match <regex>"
-msgstr ""
-
-#: diff.c:5551
-msgid "heuristic to shift diff hunk boundaries for easy reading"
-msgstr ""
-
-#: diff.c:5554
-msgid "generate diff using the \"patience diff\" algorithm"
-msgstr ""
-
-#: diff.c:5558
-msgid "generate diff using the \"histogram diff\" algorithm"
-msgstr ""
-
-#: diff.c:5560
-msgid "<algorithm>"
-msgstr ""
-
-#: diff.c:5561
-msgid "choose a diff algorithm"
-msgstr ""
-
-#: diff.c:5563
-msgid "<text>"
-msgstr ""
-
-#: diff.c:5564
-msgid "generate diff using the \"anchored diff\" algorithm"
-msgstr ""
-
-#: diff.c:5566 diff.c:5575 diff.c:5578
-msgid "<mode>"
-msgstr ""
-
-#: diff.c:5567
-msgid "show word diff, using <mode> to delimit changed words"
-msgstr ""
-
-#: diff.c:5570
-msgid "use <regex> to decide what a word is"
-msgstr ""
-
-#: diff.c:5573
-msgid "equivalent to --word-diff=color --word-diff-regex=<regex>"
-msgstr ""
-
-#: diff.c:5576
-msgid "moved lines of code are colored differently"
-msgstr ""
-
-#: diff.c:5579
-msgid "how white spaces are ignored in --color-moved"
-msgstr ""
-
-#: diff.c:5582
-msgid "Other diff options"
-msgstr ""
-
-#: diff.c:5584
-msgid "when run from subdir, exclude changes outside and show relative paths"
-msgstr ""
-
-#: diff.c:5588
-msgid "treat all files as text"
-msgstr ""
-
-#: diff.c:5590
-msgid "swap two inputs, reverse the diff"
-msgstr ""
-
-#: diff.c:5592
-msgid "exit with 1 if there were differences, 0 otherwise"
-msgstr ""
-
-#: diff.c:5594
-msgid "disable all output of the program"
-msgstr ""
-
-#: diff.c:5596
-msgid "allow an external diff helper to be executed"
-msgstr ""
-
-#: diff.c:5598
-msgid "run external text conversion filters when comparing binary files"
-msgstr ""
-
-#: diff.c:5600
-msgid "<when>"
-msgstr ""
-
-#: diff.c:5601
-msgid "ignore changes to submodules in the diff generation"
-msgstr ""
-
-#: diff.c:5604
-msgid "<format>"
-msgstr ""
-
-#: diff.c:5605
-msgid "specify how differences in submodules are shown"
-msgstr ""
-
-#: diff.c:5609
-msgid "hide 'git add -N' entries from the index"
-msgstr ""
-
-#: diff.c:5612
-msgid "treat 'git add -N' entries as real in the index"
-msgstr ""
-
-#: diff.c:5614
-msgid "<string>"
-msgstr ""
-
-#: diff.c:5615
-msgid ""
-"look for differences that change the number of occurrences of the specified "
-"string"
-msgstr ""
-
-#: diff.c:5618
-msgid ""
-"look for differences that change the number of occurrences of the specified "
-"regex"
-msgstr ""
-
-#: diff.c:5621
-msgid "show all changes in the changeset with -S or -G"
-msgstr ""
-
-#: diff.c:5624
-msgid "treat <string> in -S as extended POSIX regular expression"
-msgstr ""
-
-#: diff.c:5627
-msgid "control the order in which files appear in the output"
-msgstr ""
-
-#: diff.c:5628 diff.c:5631
-msgid "<path>"
-msgstr ""
-
-#: diff.c:5629
-msgid "show the change in the specified path first"
-msgstr ""
-
-#: diff.c:5632
-msgid "skip the output to the specified path"
-msgstr ""
-
-#: diff.c:5634
-msgid "<object-id>"
-msgstr ""
-
-#: diff.c:5635
-msgid ""
-"look for differences that change the number of occurrences of the specified "
-"object"
-msgstr ""
-
-#: diff.c:5637
-msgid "[(A|C|D|M|R|T|U|X|B)...[*]]"
-msgstr ""
-
-#: diff.c:5638
-msgid "select files by diff type"
-msgstr ""
-
-#: diff.c:5640
-msgid "<file>"
-msgstr ""
-
-#: diff.c:5641
-msgid "output to a specific file"
-msgstr ""
-
-#: diff.c:6321
-msgid "exhaustive rename detection was skipped due to too many files."
-msgstr ""
-
-#: diff.c:6324
-msgid "only found copies from modified paths due to too many files."
-msgstr ""
-
-#: diff.c:6327
-#, c-format
-msgid ""
-"you may want to set your %s variable to at least %d and retry the command."
-msgstr ""
-
-#: diffcore-order.c:24
-#, c-format
-msgid "failed to read orderfile '%s'"
-msgstr ""
-
-#: diffcore-rename.c:1564
-msgid "Performing inexact rename detection"
-msgstr ""
-
-#: diffcore-rotate.c:29
-#, c-format
-msgid "No such path '%s' in the diff"
-msgstr ""
-
-#: dir.c:593
-#, c-format
-msgid "pathspec '%s' did not match any file(s) known to git"
-msgstr ""
-
-#: dir.c:733 dir.c:762 dir.c:775
-#, c-format
-msgid "unrecognized pattern: '%s'"
-msgstr ""
-
-#: dir.c:790 dir.c:804
-#, c-format
-msgid "unrecognized negative pattern: '%s'"
-msgstr ""
-
-#: dir.c:820
-#, c-format
-msgid "your sparse-checkout file may have issues: pattern '%s' is repeated"
-msgstr ""
-
-#: dir.c:828
-msgid "disabling cone pattern matching"
-msgstr ""
-
-#: dir.c:1212
-#, c-format
-msgid "cannot use %s as an exclude file"
-msgstr ""
-
-#: dir.c:2419
-#, c-format
-msgid "could not open directory '%s'"
-msgstr ""
-
-#: dir.c:2721
-msgid "failed to get kernel name and information"
-msgstr ""
-
-#: dir.c:2846
-msgid "untracked cache is disabled on this system or location"
-msgstr ""
-
-#: dir.c:3119
-msgid ""
-"No directory name could be guessed.\n"
-"Please specify a directory on the command line"
-msgstr ""
-
-#: dir.c:3807
-#, c-format
-msgid "index file corrupt in repo %s"
-msgstr ""
-
-#: dir.c:3854 dir.c:3859
-#, c-format
-msgid "could not create directories for %s"
-msgstr ""
-
-#: dir.c:3888
-#, c-format
-msgid "could not migrate git directory from '%s' to '%s'"
-msgstr ""
-
-#: editor.c:74
-#, c-format
-msgid "hint: Waiting for your editor to close the file...%c"
-msgstr ""
-
-#: entry.c:179
-msgid "Filtering content"
-msgstr ""
-
-#: entry.c:500
-#, c-format
-msgid "could not stat file '%s'"
-msgstr ""
-
-#: environment.c:147
-#, c-format
-msgid "bad git namespace path \"%s\""
-msgstr ""
-
-#: exec-cmd.c:363
-#, c-format
-msgid "too many args to run %s"
-msgstr ""
-
-#: fetch-pack.c:194
-msgid "git fetch-pack: expected shallow list"
-msgstr ""
-
-#: fetch-pack.c:197
-msgid "git fetch-pack: expected a flush packet after shallow list"
-msgstr ""
-
-#: fetch-pack.c:208
-msgid "git fetch-pack: expected ACK/NAK, got a flush packet"
-msgstr ""
-
-#: fetch-pack.c:228
-#, c-format
-msgid "git fetch-pack: expected ACK/NAK, got '%s'"
-msgstr ""
-
-#: fetch-pack.c:239
-msgid "unable to write to remote"
-msgstr ""
-
-#: fetch-pack.c:397 fetch-pack.c:1460
-#, c-format
-msgid "invalid shallow line: %s"
-msgstr ""
-
-#: fetch-pack.c:403 fetch-pack.c:1466
-#, c-format
-msgid "invalid unshallow line: %s"
-msgstr ""
-
-#: fetch-pack.c:405 fetch-pack.c:1468
-#, c-format
-msgid "object not found: %s"
-msgstr ""
-
-#: fetch-pack.c:408 fetch-pack.c:1471
-#, c-format
-msgid "error in object: %s"
-msgstr ""
-
-#: fetch-pack.c:410 fetch-pack.c:1473
-#, c-format
-msgid "no shallow found: %s"
-msgstr ""
-
-#: fetch-pack.c:413 fetch-pack.c:1477
-#, c-format
-msgid "expected shallow/unshallow, got %s"
-msgstr ""
-
-#: fetch-pack.c:453
-#, c-format
-msgid "got %s %d %s"
-msgstr ""
-
-#: fetch-pack.c:470
-#, c-format
-msgid "invalid commit %s"
-msgstr ""
-
-#: fetch-pack.c:501
-msgid "giving up"
-msgstr ""
-
-#: fetch-pack.c:514 progress.h:25
-msgid "done"
-msgstr ""
-
-#: fetch-pack.c:526
-#, c-format
-msgid "got %s (%d) %s"
-msgstr ""
-
-#: fetch-pack.c:562
-#, c-format
-msgid "Marking %s as complete"
-msgstr ""
-
-#: fetch-pack.c:784
-#, c-format
-msgid "already have %s (%s)"
-msgstr ""
-
-#: fetch-pack.c:870
-msgid "fetch-pack: unable to fork off sideband demultiplexer"
-msgstr ""
-
-#: fetch-pack.c:878
-msgid "protocol error: bad pack header"
-msgstr ""
-
-#: fetch-pack.c:974
-#, c-format
-msgid "fetch-pack: unable to fork off %s"
-msgstr ""
-
-#: fetch-pack.c:980
-msgid "fetch-pack: invalid index-pack output"
-msgstr ""
-
-#: fetch-pack.c:997
-#, c-format
-msgid "%s failed"
-msgstr ""
-
-#: fetch-pack.c:999
-msgid "error in sideband demultiplexer"
-msgstr ""
-
-#: fetch-pack.c:1048
-#, c-format
-msgid "Server version is %.*s"
-msgstr ""
-
-#: fetch-pack.c:1056 fetch-pack.c:1062 fetch-pack.c:1065 fetch-pack.c:1071
-#: fetch-pack.c:1075 fetch-pack.c:1079 fetch-pack.c:1083 fetch-pack.c:1087
-#: fetch-pack.c:1091 fetch-pack.c:1095 fetch-pack.c:1099 fetch-pack.c:1103
-#: fetch-pack.c:1109 fetch-pack.c:1115 fetch-pack.c:1120 fetch-pack.c:1125
-#, c-format
-msgid "Server supports %s"
-msgstr ""
-
-#: fetch-pack.c:1058
-msgid "Server does not support shallow clients"
-msgstr ""
-
-#: fetch-pack.c:1118
-msgid "Server does not support --shallow-since"
-msgstr ""
-
-#: fetch-pack.c:1123
-msgid "Server does not support --shallow-exclude"
-msgstr ""
-
-#: fetch-pack.c:1127
-msgid "Server does not support --deepen"
-msgstr ""
-
-#: fetch-pack.c:1129
-msgid "Server does not support this repository's object format"
-msgstr ""
-
-#: fetch-pack.c:1142
-msgid "no common commits"
-msgstr ""
-
-#: fetch-pack.c:1151 fetch-pack.c:1506 builtin/clone.c:1166
-msgid "source repository is shallow, reject to clone."
-msgstr ""
-
-#: fetch-pack.c:1157 fetch-pack.c:1705
-msgid "git fetch-pack: fetch failed."
-msgstr ""
-
-#: fetch-pack.c:1271
-#, c-format
-msgid "mismatched algorithms: client %s; server %s"
-msgstr ""
-
-#: fetch-pack.c:1275
-#, c-format
-msgid "the server does not support algorithm '%s'"
-msgstr ""
-
-#: fetch-pack.c:1308
-msgid "Server does not support shallow requests"
-msgstr ""
-
-#: fetch-pack.c:1315
-msgid "Server supports filter"
-msgstr ""
-
-#: fetch-pack.c:1358 fetch-pack.c:2087
-msgid "unable to write request to remote"
-msgstr ""
-
-#: fetch-pack.c:1376
-#, c-format
-msgid "error reading section header '%s'"
-msgstr ""
-
-#: fetch-pack.c:1382
-#, c-format
-msgid "expected '%s', received '%s'"
-msgstr ""
-
-#: fetch-pack.c:1416
-#, c-format
-msgid "unexpected acknowledgment line: '%s'"
-msgstr ""
-
-#: fetch-pack.c:1421
-#, c-format
-msgid "error processing acks: %d"
-msgstr ""
-
-#. TRANSLATORS: The parameter will be 'ready', a protocol
-#. keyword.
-#.
-#: fetch-pack.c:1435
-#, c-format
-msgid "expected packfile to be sent after '%s'"
-msgstr ""
-
-#. TRANSLATORS: The parameter will be 'ready', a protocol
-#. keyword.
-#.
-#: fetch-pack.c:1441
-#, c-format
-msgid "expected no other sections to be sent after no '%s'"
-msgstr ""
-
-#: fetch-pack.c:1482
-#, c-format
-msgid "error processing shallow info: %d"
-msgstr ""
-
-#: fetch-pack.c:1531
-#, c-format
-msgid "expected wanted-ref, got '%s'"
-msgstr ""
-
-#: fetch-pack.c:1536
-#, c-format
-msgid "unexpected wanted-ref: '%s'"
-msgstr ""
-
-#: fetch-pack.c:1541
-#, c-format
-msgid "error processing wanted refs: %d"
-msgstr ""
-
-#: fetch-pack.c:1571
-msgid "git fetch-pack: expected response end packet"
-msgstr ""
-
-#: fetch-pack.c:1983
-msgid "no matching remote head"
-msgstr ""
-
-#: fetch-pack.c:2006 builtin/clone.c:587
-msgid "remote did not send all necessary objects"
-msgstr ""
-
-#: fetch-pack.c:2109
-msgid "unexpected 'ready' from remote"
-msgstr ""
-
-#: fetch-pack.c:2132
-#, c-format
-msgid "no such remote ref %s"
-msgstr ""
-
-#: fetch-pack.c:2135
-#, c-format
-msgid "Server does not allow request for unadvertised object %s"
-msgstr ""
-
-#: fsmonitor-ipc.c:119
-#, c-format
-msgid "fsmonitor_ipc__send_query: invalid path '%s'"
-msgstr ""
-
-#: fsmonitor-ipc.c:125
-#, c-format
-msgid "fsmonitor_ipc__send_query: unspecified error on '%s'"
-msgstr ""
-
-#: fsmonitor-ipc.c:155
-msgid "fsmonitor--daemon is not running"
-msgstr ""
-
-#: fsmonitor-ipc.c:164
-#, c-format
-msgid "could not send '%s' command to fsmonitor--daemon"
-msgstr ""
-
-#: gpg-interface.c:329 gpg-interface.c:456 gpg-interface.c:995
-#: gpg-interface.c:1011
-msgid "could not create temporary file"
-msgstr ""
-
-#: gpg-interface.c:332 gpg-interface.c:459
-#, c-format
-msgid "failed writing detached signature to '%s'"
-msgstr ""
-
-#: gpg-interface.c:450
-msgid ""
-"gpg.ssh.allowedSignersFile needs to be configured and exist for ssh "
-"signature verification"
-msgstr ""
-
-#: gpg-interface.c:479
-msgid ""
-"ssh-keygen -Y find-principals/verify is needed for ssh signature "
-"verification (available in openssh version 8.2p1+)"
-msgstr ""
-
-#: gpg-interface.c:550
-#, c-format
-msgid "ssh signing revocation file configured but not found: %s"
-msgstr ""
-
-#: gpg-interface.c:638
-#, c-format
-msgid "bad/incompatible signature '%s'"
-msgstr ""
-
-#: gpg-interface.c:815 gpg-interface.c:820
-#, c-format
-msgid "failed to get the ssh fingerprint for key '%s'"
-msgstr ""
-
-#: gpg-interface.c:843
-msgid ""
-"either user.signingkey or gpg.ssh.defaultKeyCommand needs to be configured"
-msgstr ""
-
-#: gpg-interface.c:865
-#, c-format
-msgid "gpg.ssh.defaultKeyCommand succeeded but returned no keys: %s %s"
-msgstr ""
-
-#: gpg-interface.c:871
-#, c-format
-msgid "gpg.ssh.defaultKeyCommand failed: %s %s"
-msgstr ""
-
-#: gpg-interface.c:966
-msgid "gpg failed to sign the data"
-msgstr ""
-
-#: gpg-interface.c:988
-msgid "user.signingkey needs to be set for ssh signing"
-msgstr ""
-
-#: gpg-interface.c:999
-#, c-format
-msgid "failed writing ssh signing key to '%s'"
-msgstr ""
-
-#: gpg-interface.c:1017
-#, c-format
-msgid "failed writing ssh signing key buffer to '%s'"
-msgstr ""
-
-#: gpg-interface.c:1035
-msgid ""
-"ssh-keygen -Y sign is needed for ssh signing (available in openssh version "
-"8.2p1+)"
-msgstr ""
-
-#: gpg-interface.c:1047
-#, 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:446
-msgid ""
-"given pattern contains NULL byte (via -f <file>). This is only supported "
-"with -P under PCRE v2"
-msgstr ""
-
-#: grep.c:1859
-#, c-format
-msgid "'%s': unable to read %s"
-msgstr ""
-
-#: grep.c:1876 setup.c:178 builtin/clone.c:308 builtin/diff.c:90
-#: builtin/rm.c:136
-#, c-format
-msgid "failed to stat '%s'"
-msgstr ""
-
-#: grep.c:1887
-#, c-format
-msgid "'%s': short read"
-msgstr ""
-
-#: help.c:25
-msgid "start a working area (see also: git help tutorial)"
-msgstr ""
-
-#: help.c:26
-msgid "work on the current change (see also: git help everyday)"
-msgstr ""
-
-#: help.c:27
-msgid "examine the history and state (see also: git help revisions)"
-msgstr ""
-
-#: help.c:28
-msgid "grow, mark and tweak your common history"
-msgstr ""
-
-#: help.c:29
-msgid "collaborate (see also: git help workflows)"
-msgstr ""
-
-#: help.c:33
-msgid "Main Porcelain Commands"
-msgstr ""
-
-#: help.c:34
-msgid "Ancillary Commands / Manipulators"
-msgstr ""
-
-#: help.c:35
-msgid "Ancillary Commands / Interrogators"
-msgstr ""
-
-#: help.c:36
-msgid "Interacting with Others"
-msgstr ""
-
-#: help.c:37
-msgid "Low-level Commands / Manipulators"
-msgstr ""
-
-#: help.c:38
-msgid "Low-level Commands / Interrogators"
-msgstr ""
-
-#: help.c:39
-msgid "Low-level Commands / Syncing Repositories"
-msgstr ""
-
-#: help.c:40
-msgid "Low-level Commands / Internal Helpers"
-msgstr ""
-
-#: help.c:316
-#, c-format
-msgid "available git commands in '%s'"
-msgstr ""
-
-#: help.c:323
-msgid "git commands available from elsewhere on your $PATH"
-msgstr ""
-
-#: help.c:332
-msgid "These are common Git commands used in various situations:"
-msgstr ""
-
-#: help.c:382 git.c:100
-#, c-format
-msgid "unsupported command listing type '%s'"
-msgstr ""
-
-#: help.c:422
-msgid "The Git concept guides are:"
-msgstr ""
-
-#: help.c:446
-msgid "External commands"
-msgstr ""
-
-#: help.c:468
-msgid "Command aliases"
-msgstr ""
-
-#: help.c:486
-msgid "See 'git help <command>' to read about a specific subcommand"
-msgstr ""
-
-#: help.c:563
-#, 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:585 help.c:682
-#, c-format
-msgid "git: '%s' is not a git command. See 'git --help'."
-msgstr ""
-
-#: help.c:633
-msgid "Uh oh. Your system reports no Git commands at all."
-msgstr ""
-
-#: help.c:655
-#, c-format
-msgid "WARNING: You called a Git command named '%s', which does not exist."
-msgstr ""
-
-#: help.c:660
-#, c-format
-msgid "Continuing under the assumption that you meant '%s'."
-msgstr ""
-
-#: help.c:666
-#, c-format
-msgid "Run '%s' instead [y/N]? "
-msgstr ""
-
-#: help.c:674
-#, c-format
-msgid "Continuing in %0.1f seconds, assuming that you meant '%s'."
-msgstr ""
-
-#: help.c:686
-msgid ""
-"\n"
-"The most similar command is"
-msgid_plural ""
-"\n"
-"The most similar commands are"
-msgstr[0] ""
-msgstr[1] ""
-
-#: help.c:729
-msgid "git version [<options>]"
-msgstr ""
-
-#: help.c:784
-#, c-format
-msgid "%s: %s - %s"
-msgstr ""
-
-#: help.c:788
-msgid ""
-"\n"
-"Did you mean this?"
-msgid_plural ""
-"\n"
-"Did you mean one of these?"
-msgstr[0] ""
-msgstr[1] ""
-
-#: hook.c:28
-#, 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 ""
-
-#: hook.c:87
-#, c-format
-msgid "Couldn't start hook '%s'\n"
-msgstr ""
-
-#: ident.c:354
-msgid "Author identity unknown\n"
-msgstr ""
-
-#: ident.c:357
-msgid "Committer identity unknown\n"
-msgstr ""
-
-#: ident.c:363
-msgid ""
-"\n"
-"*** Please tell me who you are.\n"
-"\n"
-"Run\n"
-"\n"
-"  git config --global user.email \"you@example.com\"\n"
-"  git config --global user.name \"Your Name\"\n"
-"\n"
-"to set your account's default identity.\n"
-"Omit --global to set the identity only in this repository.\n"
-"\n"
-msgstr ""
-
-#: ident.c:398
-msgid "no email was given and auto-detection is disabled"
-msgstr ""
-
-#: ident.c:403
-#, c-format
-msgid "unable to auto-detect email address (got '%s')"
-msgstr ""
-
-#: ident.c:420
-msgid "no name was given and auto-detection is disabled"
-msgstr ""
-
-#: ident.c:426
-#, c-format
-msgid "unable to auto-detect name (got '%s')"
-msgstr ""
-
-#: ident.c:434
-#, c-format
-msgid "empty ident name (for <%s>) not allowed"
-msgstr ""
-
-#: ident.c:440
-#, c-format
-msgid "name consists only of disallowed characters: %s"
-msgstr ""
-
-#: ident.c:455 builtin/commit.c:649
-#, c-format
-msgid "invalid date format: %s"
-msgstr ""
-
-#: list-objects-filter-options.c:68
-msgid "expected 'tree:<depth>'"
-msgstr ""
-
-#: list-objects-filter-options.c:83
-msgid "sparse:path filters support has been dropped"
-msgstr ""
-
-#: list-objects-filter-options.c:90
-#, c-format
-msgid "'%s' for 'object:type=<type>' is not a valid object type"
-msgstr ""
-
-#: list-objects-filter-options.c:109
-#, c-format
-msgid "invalid filter-spec '%s'"
-msgstr ""
-
-#: list-objects-filter-options.c:125
-#, c-format
-msgid "must escape char in sub-filter-spec: '%c'"
-msgstr ""
-
-#: list-objects-filter-options.c:167
-msgid "expected something after combine:"
-msgstr ""
-
-#: list-objects-filter-options.c:249
-msgid "multiple filter-specs cannot be combined"
-msgstr ""
-
-#: list-objects-filter-options.c:365
-msgid "unable to upgrade repository format to support partial clone"
-msgstr ""
-
-#: list-objects-filter.c:532
-#, c-format
-msgid "unable to access sparse blob in '%s'"
-msgstr ""
-
-#: list-objects-filter.c:535
-#, c-format
-msgid "unable to parse sparse filter data in %s"
-msgstr ""
-
-#: list-objects.c:144
-#, c-format
-msgid "entry '%s' in tree %s has tree mode, but is not a tree"
-msgstr ""
-
-#: list-objects.c:157
-#, c-format
-msgid "entry '%s' in tree %s has blob mode, but is not a blob"
-msgstr ""
-
-#: list-objects.c:415
-#, c-format
-msgid "unable to load root tree for commit %s"
-msgstr ""
-
-#: lockfile.c:152
-#, c-format
-msgid ""
-"Unable to create '%s.lock': %s.\n"
-"\n"
-"Another git process seems to be running in this repository, e.g.\n"
-"an editor opened by 'git commit'. Please make sure all processes\n"
-"are terminated then try again. If it still fails, a git process\n"
-"may have crashed in this repository earlier:\n"
-"remove the file manually to continue."
-msgstr ""
-
-#: lockfile.c:160
-#, c-format
-msgid "Unable to create '%s.lock': %s"
-msgstr ""
-
-#: ls-refs.c:175
-#, c-format
-msgid "unexpected line: '%s'"
-msgstr ""
-
-#: ls-refs.c:179
-msgid "expected flush after ls-refs arguments"
-msgstr ""
-
-#: mailinfo.c:1050
-msgid "quoted CRLF detected"
-msgstr ""
-
-#: mailinfo.c:1254 builtin/am.c:185 builtin/mailinfo.c:46
-#, c-format
-msgid "bad action '%s' for '%s'"
-msgstr ""
-
-#: merge-ort.c:1630 merge-recursive.c:1214
-#, c-format
-msgid "Failed to merge submodule %s (not checked out)"
-msgstr ""
-
-#: merge-ort.c:1639 merge-recursive.c:1221
-#, c-format
-msgid "Failed to merge submodule %s (commits not present)"
-msgstr ""
-
-#: merge-ort.c:1648 merge-recursive.c:1228
-#, c-format
-msgid "Failed to merge submodule %s (commits don't follow merge-base)"
-msgstr ""
-
-#: merge-ort.c:1658 merge-ort.c:1666
-#, c-format
-msgid "Note: Fast-forwarding submodule %s to %s"
-msgstr ""
-
-#: merge-ort.c:1688
-#, c-format
-msgid "Failed to merge submodule %s"
-msgstr ""
-
-#: merge-ort.c:1695
-#, c-format
-msgid ""
-"Failed to merge submodule %s, but a possible merge resolution exists:\n"
-"%s\n"
-msgstr ""
-
-#: merge-ort.c:1699 merge-recursive.c:1284
-#, c-format
-msgid ""
-"If this is correct simply add it to the index for example\n"
-"by using:\n"
-"\n"
-"  git update-index --cacheinfo 160000 %s \"%s\"\n"
-"\n"
-"which will accept this suggestion.\n"
-msgstr ""
-
-#: merge-ort.c:1712
-#, c-format
-msgid ""
-"Failed to merge submodule %s, but multiple possible merges exist:\n"
-"%s"
-msgstr ""
-
-#: merge-ort.c:1937 merge-recursive.c:1375
-msgid "Failed to execute internal merge"
-msgstr ""
-
-#: merge-ort.c:1942 merge-recursive.c:1380
-#, c-format
-msgid "Unable to add %s to database"
-msgstr ""
-
-#: merge-ort.c:1949 merge-recursive.c:1413
-#, c-format
-msgid "Auto-merging %s"
-msgstr ""
-
-#: merge-ort.c:2088 merge-recursive.c:2135
-#, 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:2098 merge-recursive.c:2145
-#, 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:2156
-#, c-format
-msgid ""
-"CONFLICT (directory rename split): Unclear where to rename %s to; it was "
-"renamed to multiple other directories, with no destination getting a "
-"majority of the files."
-msgstr ""
-
-#: merge-ort.c:2310 merge-recursive.c:2481
-#, c-format
-msgid ""
-"WARNING: Avoiding applying %s -> %s rename to %s, because %s itself was "
-"renamed."
-msgstr ""
-
-#: merge-ort.c:2450 merge-recursive.c:3264
-#, 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:2457 merge-recursive.c:3271
-#, 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:2470 merge-recursive.c:3267
-#, 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:2478 merge-recursive.c:3274
-#, 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:2634
-#, c-format
-msgid "CONFLICT (rename/rename): %s renamed to %s in %s and to %s in %s."
-msgstr ""
-
-#: merge-ort.c:2729
-#, 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."
-msgstr ""
-
-#: merge-ort.c:2748 merge-ort.c:2772
-#, c-format
-msgid "CONFLICT (rename/delete): %s renamed to %s in %s, but deleted in %s."
-msgstr ""
-
-#: merge-ort.c:3261 merge-recursive.c:3025
-#, c-format
-msgid "cannot read object %s"
-msgstr ""
-
-#: merge-ort.c:3264 merge-recursive.c:3028
-#, c-format
-msgid "object %s is not a blob"
-msgstr ""
-
-#: merge-ort.c:3693
-#, c-format
-msgid ""
-"CONFLICT (file/directory): directory in the way of %s from %s; moving it to "
-"%s instead."
-msgstr ""
-
-#: merge-ort.c:3770
-#, 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:3777
-#, 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:3866 merge-recursive.c:3104
-msgid "content"
-msgstr ""
-
-#: merge-ort.c:3868 merge-recursive.c:3108
-msgid "add/add"
-msgstr ""
-
-#: merge-ort.c:3870 merge-recursive.c:3153
-msgid "submodule"
-msgstr ""
-
-#: merge-ort.c:3872 merge-recursive.c:3154
-#, c-format
-msgid "CONFLICT (%s): Merge conflict in %s"
-msgstr ""
-
-#: merge-ort.c:3916
-#, 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:4212
-#, c-format
-msgid ""
-"Note: %s not up to date and in way of checking out conflicted version; old "
-"copy renamed to %s"
-msgstr ""
-
-#. 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:4586
-#, c-format
-msgid "collecting merge info failed for trees %s, %s, %s"
-msgstr ""
-
-#: merge-ort-wrappers.c:13 merge-recursive.c:3723
-#, 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:3485 builtin/merge.c:405
-msgid "Already up to date."
-msgstr ""
-
-#: merge-recursive.c:353
-msgid "(bad commit)\n"
-msgstr ""
-
-#: merge-recursive.c:381
-#, c-format
-msgid "add_cacheinfo failed for path '%s'; merge aborting."
-msgstr ""
-
-#: merge-recursive.c:390
-#, c-format
-msgid "add_cacheinfo failed to refresh for path '%s'; merge aborting."
-msgstr ""
-
-#: merge-recursive.c:881
-#, c-format
-msgid "failed to create path '%s'%s"
-msgstr ""
-
-#: merge-recursive.c:892
-#, c-format
-msgid "Removing %s to make room for subdirectory\n"
-msgstr ""
-
-#: merge-recursive.c:906 merge-recursive.c:925
-msgid ": perhaps a D/F conflict?"
-msgstr ""
-
-#: merge-recursive.c:915
-#, c-format
-msgid "refusing to lose untracked file at '%s'"
-msgstr ""
-
-#: merge-recursive.c:956 builtin/cat-file.c:47
-#, c-format
-msgid "cannot read object %s '%s'"
-msgstr ""
-
-#: merge-recursive.c:961
-#, c-format
-msgid "blob expected for %s '%s'"
-msgstr ""
-
-#: merge-recursive.c:986
-#, c-format
-msgid "failed to open '%s': %s"
-msgstr ""
-
-#: merge-recursive.c:997
-#, c-format
-msgid "failed to symlink '%s': %s"
-msgstr ""
-
-#: merge-recursive.c:1002
-#, c-format
-msgid "do not know what to do with %06o %s '%s'"
-msgstr ""
-
-#: merge-recursive.c:1236 merge-recursive.c:1249
-#, c-format
-msgid "Fast-forwarding submodule %s to the following commit:"
-msgstr ""
-
-#: merge-recursive.c:1239 merge-recursive.c:1252
-#, c-format
-msgid "Fast-forwarding submodule %s"
-msgstr ""
-
-#: merge-recursive.c:1276
-#, c-format
-msgid "Failed to merge submodule %s (merge following commits not found)"
-msgstr ""
-
-#: merge-recursive.c:1280
-#, c-format
-msgid "Failed to merge submodule %s (not fast-forward)"
-msgstr ""
-
-#: merge-recursive.c:1281
-msgid "Found a possible merge resolution for the submodule:\n"
-msgstr ""
-
-#: merge-recursive.c:1293
-#, c-format
-msgid "Failed to merge submodule %s (multiple merges found)"
-msgstr ""
-
-#: merge-recursive.c:1437
-#, c-format
-msgid "Error: Refusing to lose untracked file at %s; writing to %s instead."
-msgstr ""
-
-#: merge-recursive.c:1509
-#, 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:1514
-#, 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:1521
-#, 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:1526
-#, 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:1561
-msgid "rename"
-msgstr ""
-
-#: merge-recursive.c:1561
-msgid "renamed"
-msgstr ""
-
-#: merge-recursive.c:1612 merge-recursive.c:2518 merge-recursive.c:3181
-#, c-format
-msgid "Refusing to lose dirty file at %s"
-msgstr ""
-
-#: merge-recursive.c:1622
-#, c-format
-msgid "Refusing to lose untracked file at %s, even though it's in the way."
-msgstr ""
-
-#: merge-recursive.c:1680
-#, c-format
-msgid "CONFLICT (rename/add): Rename %s->%s in %s.  Added %s in %s"
-msgstr ""
-
-#: merge-recursive.c:1711
-#, c-format
-msgid "%s is a directory in %s adding as %s instead"
-msgstr ""
-
-#: merge-recursive.c:1716
-#, c-format
-msgid "Refusing to lose untracked file at %s; adding as %s instead"
-msgstr ""
-
-#: merge-recursive.c:1743
-#, c-format
-msgid ""
-"CONFLICT (rename/rename): Rename \"%s\"->\"%s\" in branch \"%s\" rename \"%s"
-"\"->\"%s\" in \"%s\"%s"
-msgstr ""
-
-#: merge-recursive.c:1748
-msgid " (left unresolved)"
-msgstr ""
-
-#: merge-recursive.c:1840
-#, c-format
-msgid "CONFLICT (rename/rename): Rename %s->%s in %s. Rename %s->%s in %s"
-msgstr ""
-
-#: merge-recursive.c:2103
-#, c-format
-msgid ""
-"CONFLICT (directory rename split): Unclear where to place %s because "
-"directory %s was renamed to multiple other directories, with no destination "
-"getting a majority of the files."
-msgstr ""
-
-#: merge-recursive.c:2237
-#, c-format
-msgid ""
-"CONFLICT (rename/rename): Rename directory %s->%s in %s. Rename directory %s-"
-">%s in %s"
-msgstr ""
-
-#: merge-recursive.c:3092
-msgid "modify"
-msgstr ""
-
-#: merge-recursive.c:3092
-msgid "modified"
-msgstr ""
-
-#: merge-recursive.c:3131
-#, c-format
-msgid "Skipped %s (merged same as existing)"
-msgstr ""
-
-#: merge-recursive.c:3184
-#, c-format
-msgid "Adding as %s instead"
-msgstr ""
-
-#: merge-recursive.c:3388
-#, c-format
-msgid "Removing %s"
-msgstr ""
-
-#: merge-recursive.c:3411
-msgid "file/directory"
-msgstr ""
-
-#: merge-recursive.c:3416
-msgid "directory/file"
-msgstr ""
-
-#: merge-recursive.c:3423
-#, c-format
-msgid "CONFLICT (%s): There is a directory with name %s in %s. Adding %s as %s"
-msgstr ""
-
-#: merge-recursive.c:3432
-#, c-format
-msgid "Adding %s"
-msgstr ""
-
-#: merge-recursive.c:3441
-#, c-format
-msgid "CONFLICT (add/add): Merge conflict in %s"
-msgstr ""
-
-#: merge-recursive.c:3494
-#, c-format
-msgid "merging of trees %s and %s failed"
-msgstr ""
-
-#: merge-recursive.c:3588
-msgid "Merging:"
-msgstr ""
-
-#: merge-recursive.c:3601
-#, c-format
-msgid "found %u common ancestor:"
-msgid_plural "found %u common ancestors:"
-msgstr[0] ""
-msgstr[1] ""
-
-#: merge-recursive.c:3651
-msgid "merge returned no commit"
-msgstr ""
-
-#: merge-recursive.c:3823
-#, c-format
-msgid "Could not parse object '%s'"
-msgstr ""
-
-#: merge-recursive.c:3841 builtin/merge.c:720 builtin/merge.c:912
-#: builtin/stash.c:489
-msgid "Unable to write index."
-msgstr ""
-
-#: merge.c:41
-msgid "failed to read the cache"
-msgstr ""
-
-#: merge.c:102 rerere.c:705 builtin/am.c:1989 builtin/am.c:2023
-#: builtin/checkout.c:603 builtin/checkout.c:865 builtin/clone.c:714
-#: builtin/stash.c:269
-msgid "unable to write new index file"
-msgstr ""
-
-#: midx.c:79
-msgid "multi-pack-index OID fanout is of the wrong size"
-msgstr ""
-
-#: midx.c:112
-#, c-format
-msgid "multi-pack-index file %s is too small"
-msgstr ""
-
-#: midx.c:128
-#, c-format
-msgid "multi-pack-index signature 0x%08x does not match signature 0x%08x"
-msgstr ""
-
-#: midx.c:133
-#, c-format
-msgid "multi-pack-index version %d not recognized"
-msgstr ""
-
-#: midx.c:138
-#, c-format
-msgid "multi-pack-index hash version %u does not match version %u"
-msgstr ""
-
-#: midx.c:155
-msgid "multi-pack-index missing required pack-name chunk"
-msgstr ""
-
-#: midx.c:157
-msgid "multi-pack-index missing required OID fanout chunk"
-msgstr ""
-
-#: midx.c:159
-msgid "multi-pack-index missing required OID lookup chunk"
-msgstr ""
-
-#: midx.c:161
-msgid "multi-pack-index missing required object offsets chunk"
-msgstr ""
-
-#: midx.c:180
-#, c-format
-msgid "multi-pack-index pack names out of order: '%s' before '%s'"
-msgstr ""
-
-#: midx.c:228
-#, c-format
-msgid "bad pack-int-id: %u (%u total packs)"
-msgstr ""
-
-#: midx.c:278
-msgid "multi-pack-index stores a 64-bit offset, but off_t is too small"
-msgstr ""
-
-#: midx.c:509
-#, c-format
-msgid "failed to add packfile '%s'"
-msgstr ""
-
-#: midx.c:515
-#, c-format
-msgid "failed to open pack-index '%s'"
-msgstr ""
-
-#: midx.c:583
-#, c-format
-msgid "failed to locate object %d in packfile"
-msgstr ""
-
-#: midx.c:911
-msgid "cannot store reverse index file"
-msgstr ""
-
-#: midx.c:1009
-#, c-format
-msgid "could not parse line: %s"
-msgstr ""
-
-#: midx.c:1011
-#, c-format
-msgid "malformed line: %s"
-msgstr ""
-
-#: midx.c:1181
-msgid "ignoring existing multi-pack-index; checksum mismatch"
-msgstr ""
-
-#: midx.c:1206
-msgid "could not load pack"
-msgstr ""
-
-#: midx.c:1212
-#, c-format
-msgid "could not open index for %s"
-msgstr ""
-
-#: midx.c:1223
-msgid "Adding packfiles to multi-pack-index"
-msgstr ""
-
-#: midx.c:1266
-#, c-format
-msgid "unknown preferred pack: '%s'"
-msgstr ""
-
-#: midx.c:1311
-#, c-format
-msgid "cannot select preferred pack %s with no objects"
-msgstr ""
-
-#: midx.c:1343
-#, c-format
-msgid "did not see pack-file %s to drop"
-msgstr ""
-
-#: midx.c:1389
-#, c-format
-msgid "preferred pack '%s' is expired"
-msgstr ""
-
-#: midx.c:1402
-msgid "no pack files to index."
-msgstr ""
-
-#: midx.c:1409
-msgid "refusing to write multi-pack .bitmap without any objects"
-msgstr ""
-
-#: midx.c:1451
-msgid "could not write multi-pack bitmap"
-msgstr ""
-
-#: midx.c:1461
-msgid "could not write multi-pack-index"
-msgstr ""
-
-#: midx.c:1520 builtin/clean.c:37
-#, c-format
-msgid "failed to remove %s"
-msgstr ""
-
-#: midx.c:1553
-#, c-format
-msgid "failed to clear multi-pack-index at %s"
-msgstr ""
-
-#: midx.c:1616
-msgid "multi-pack-index file exists, but failed to parse"
-msgstr ""
-
-#: midx.c:1624
-msgid "incorrect checksum"
-msgstr ""
-
-#: midx.c:1627
-msgid "Looking for referenced packfiles"
-msgstr ""
-
-#: midx.c:1642
-#, c-format
-msgid ""
-"oid fanout out of order: fanout[%d] = %<PRIx32> > %<PRIx32> = fanout[%d]"
-msgstr ""
-
-#: midx.c:1647
-msgid "the midx contains no oid"
-msgstr ""
-
-#: midx.c:1656
-msgid "Verifying OID order in multi-pack-index"
-msgstr ""
-
-#: midx.c:1665
-#, c-format
-msgid "oid lookup out of order: oid[%d] = %s >= %s = oid[%d]"
-msgstr ""
-
-#: midx.c:1685
-msgid "Sorting objects by packfile"
-msgstr ""
-
-#: midx.c:1692
-msgid "Verifying object offsets"
-msgstr ""
-
-#: midx.c:1708
-#, c-format
-msgid "failed to load pack entry for oid[%d] = %s"
-msgstr ""
-
-#: midx.c:1714
-#, c-format
-msgid "failed to load pack-index for packfile %s"
-msgstr ""
-
-#: midx.c:1723
-#, c-format
-msgid "incorrect object offset for oid[%d] = %s: %<PRIx64> != %<PRIx64>"
-msgstr ""
-
-#: midx.c:1750
-msgid "Counting referenced objects"
-msgstr ""
-
-#: midx.c:1760
-msgid "Finding and deleting unreferenced packfiles"
-msgstr ""
-
-#: midx.c:1952
-msgid "could not start pack-objects"
-msgstr ""
-
-#: midx.c:1972
-msgid "could not finish pack-objects"
-msgstr ""
-
-#: name-hash.c:542
-#, c-format
-msgid "unable to create lazy_dir thread: %s"
-msgstr ""
-
-#: name-hash.c:564
-#, c-format
-msgid "unable to create lazy_name thread: %s"
-msgstr ""
-
-#: name-hash.c:570
-#, c-format
-msgid "unable to join lazy_name thread: %s"
-msgstr ""
-
-#: notes-merge.c:276
-#, 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."
-msgstr ""
-
-#: notes-merge.c:283
-#, c-format
-msgid "You have not concluded your notes merge (%s exists)."
-msgstr ""
-
-#: notes-utils.c:46
-msgid "Cannot commit uninitialized/unreferenced notes tree"
-msgstr ""
-
-#: notes-utils.c:105
-#, c-format
-msgid "Bad notes.rewriteMode value: '%s'"
-msgstr ""
-
-#: notes-utils.c:115
-#, c-format
-msgid "Refusing to rewrite notes in %s (outside of refs/notes/)"
-msgstr ""
-
-#. TRANSLATORS: The first %s is the name of
-#. the environment variable, the second %s is
-#. its value.
-#.
-#: notes-utils.c:145
-#, c-format
-msgid "Bad %s value: '%s'"
-msgstr ""
-
-#: object-file.c:457
-#, c-format
-msgid "object directory %s does not exist; check .git/objects/info/alternates"
-msgstr ""
-
-#: object-file.c:515
-#, c-format
-msgid "unable to normalize alternate object path: %s"
-msgstr ""
-
-#: object-file.c:589
-#, c-format
-msgid "%s: ignoring alternate object stores, nesting too deep"
-msgstr ""
-
-#: object-file.c:596
-#, c-format
-msgid "unable to normalize object directory: %s"
-msgstr ""
-
-#: object-file.c:639
-msgid "unable to fdopen alternates lockfile"
-msgstr ""
-
-#: object-file.c:657
-msgid "unable to read alternates file"
-msgstr ""
-
-#: object-file.c:664
-msgid "unable to move new alternates file into place"
-msgstr ""
-
-#: object-file.c:742
-#, c-format
-msgid "path '%s' does not exist"
-msgstr ""
-
-#: object-file.c:763
-#, c-format
-msgid "reference repository '%s' as a linked checkout is not supported yet."
-msgstr ""
-
-#: object-file.c:769
-#, c-format
-msgid "reference repository '%s' is not a local repository."
-msgstr ""
-
-#: object-file.c:775
-#, c-format
-msgid "reference repository '%s' is shallow"
-msgstr ""
-
-#: object-file.c:783
-#, c-format
-msgid "reference repository '%s' is grafted"
-msgstr ""
-
-#: object-file.c:814
-#, c-format
-msgid "could not find object directory matching %s"
-msgstr ""
-
-#: object-file.c:864
-#, c-format
-msgid "invalid line while parsing alternate refs: %s"
-msgstr ""
-
-#: object-file.c:1014
-#, c-format
-msgid "attempting to mmap %<PRIuMAX> over limit %<PRIuMAX>"
-msgstr ""
-
-#: object-file.c:1049
-#, c-format
-msgid "mmap failed%s"
-msgstr ""
-
-#: object-file.c:1230
-#, c-format
-msgid "object file %s is empty"
-msgstr ""
-
-#: object-file.c:1349 object-file.c:2588
-#, c-format
-msgid "corrupt loose object '%s'"
-msgstr ""
-
-#: object-file.c:1351 object-file.c:2592
-#, c-format
-msgid "garbage at end of loose object '%s'"
-msgstr ""
-
-#: object-file.c:1473
-#, c-format
-msgid "unable to parse %s header"
-msgstr ""
-
-#: object-file.c:1475
-msgid "invalid object type"
-msgstr ""
-
-#: object-file.c:1486
-#, c-format
-msgid "unable to unpack %s header"
-msgstr ""
-
-#: object-file.c:1490
-#, c-format
-msgid "header for %s too long, exceeds %d bytes"
-msgstr ""
-
-#: object-file.c:1720
-#, c-format
-msgid "failed to read object %s"
-msgstr ""
-
-#: object-file.c:1724
-#, c-format
-msgid "replacement %s not found for %s"
-msgstr ""
-
-#: object-file.c:1728
-#, c-format
-msgid "loose object %s (stored in %s) is corrupt"
-msgstr ""
-
-#: object-file.c:1732
-#, c-format
-msgid "packed object %s (stored in %s) is corrupt"
-msgstr ""
-
-#: object-file.c:1855
-#, c-format
-msgid "unable to write file %s"
-msgstr ""
-
-#: object-file.c:1862
-#, c-format
-msgid "unable to set permission to '%s'"
-msgstr ""
-
-#: object-file.c:1869
-msgid "file write error"
-msgstr ""
-
-#: object-file.c:1904
-msgid "error when closing loose object file"
-msgstr ""
-
-#: object-file.c:1971
-#, c-format
-msgid "insufficient permission for adding an object to repository database %s"
-msgstr ""
-
-#: object-file.c:1973
-msgid "unable to create temporary file"
-msgstr ""
-
-#: object-file.c:1997
-msgid "unable to write loose object file"
-msgstr ""
-
-#: object-file.c:2003
-#, c-format
-msgid "unable to deflate new object %s (%d)"
-msgstr ""
-
-#: object-file.c:2007
-#, c-format
-msgid "deflateEnd on object %s failed (%d)"
-msgstr ""
-
-#: object-file.c:2011
-#, c-format
-msgid "confused by unstable object source data for %s"
-msgstr ""
-
-#: object-file.c:2022 builtin/pack-objects.c:1251
-#, c-format
-msgid "failed utime() on %s"
-msgstr ""
-
-#: object-file.c:2100
-#, c-format
-msgid "cannot read object for %s"
-msgstr ""
-
-#: object-file.c:2151
-msgid "corrupt commit"
-msgstr ""
-
-#: object-file.c:2159
-msgid "corrupt tag"
-msgstr ""
-
-#: object-file.c:2259
-#, c-format
-msgid "read error while indexing %s"
-msgstr ""
-
-#: object-file.c:2262
-#, c-format
-msgid "short read while indexing %s"
-msgstr ""
-
-#: object-file.c:2335 object-file.c:2345
-#, c-format
-msgid "%s: failed to insert into database"
-msgstr ""
-
-#: object-file.c:2351
-#, c-format
-msgid "%s: unsupported file type"
-msgstr ""
-
-#: object-file.c:2375 builtin/fetch.c:1494
-#, c-format
-msgid "%s is not a valid object"
-msgstr ""
-
-#: object-file.c:2377
-#, c-format
-msgid "%s is not a valid '%s' object"
-msgstr ""
-
-#: object-file.c:2404
-#, c-format
-msgid "unable to open %s"
-msgstr ""
-
-#: object-file.c:2599
-#, c-format
-msgid "hash mismatch for %s (expected %s)"
-msgstr ""
-
-#: object-file.c:2622
-#, c-format
-msgid "unable to mmap %s"
-msgstr ""
-
-#: object-file.c:2628
-#, c-format
-msgid "unable to unpack header of %s"
-msgstr ""
-
-#: object-file.c:2633
-#, c-format
-msgid "unable to parse header of %s"
-msgstr ""
-
-#: object-file.c:2644
-#, c-format
-msgid "unable to unpack contents of %s"
-msgstr ""
-
-#. TRANSLATORS: This is a line of ambiguous object
-#. output shown when we cannot look up or parse the
-#. object in question. E.g. "deadbeef [bad object]".
-#.
-#: object-name.c:382
-#, c-format
-msgid "%s [bad object]"
-msgstr ""
-
-#. TRANSLATORS: This is a line of ambiguous commit
-#. object output. E.g.:
-#. *
-#.    "deadbeef commit 2021-01-01 - Some Commit Message"
-#.
-#: object-name.c:407
-#, c-format
-msgid "%s commit %s - %s"
-msgstr ""
-
-#. TRANSLATORS: This is a line of ambiguous
-#. tag object output. E.g.:
-#. *
-#.    "deadbeef tag 2022-01-01 - Some Tag Message"
-#. *
-#. The second argument is the YYYY-MM-DD found
-#. in the tag.
-#. *
-#. The third argument is the "tag" string
-#. from object.c.
-#.
-#: object-name.c:428
-#, c-format
-msgid "%s tag %s - %s"
-msgstr ""
-
-#. TRANSLATORS: This is a line of ambiguous
-#. tag object output where we couldn't parse
-#. the tag itself. E.g.:
-#. *
-#.    "deadbeef [bad tag, could not parse it]"
-#.
-#: object-name.c:439
-#, c-format
-msgid "%s [bad tag, could not parse it]"
-msgstr ""
-
-#. TRANSLATORS: This is a line of ambiguous <type>
-#. object output. E.g. "deadbeef tree".
-#.
-#: object-name.c:447
-#, c-format
-msgid "%s tree"
-msgstr ""
-
-#. TRANSLATORS: This is a line of ambiguous <type>
-#. object output. E.g. "deadbeef blob".
-#.
-#: object-name.c:453
-#, c-format
-msgid "%s blob"
-msgstr ""
-
-#: object-name.c:569
-#, c-format
-msgid "short object ID %s is ambiguous"
-msgstr ""
-
-#. TRANSLATORS: The argument is the list of ambiguous
-#. objects composed in show_ambiguous_object(). See
-#. its "TRANSLATORS" comments for details.
-#.
-#: object-name.c:591
-#, c-format
-msgid ""
-"The candidates are:\n"
-"%s"
-msgstr ""
-
-#: object-name.c:888
-msgid ""
-"Git normally never creates a ref that ends with 40 hex characters\n"
-"because it will be ignored when you just specify 40-hex. These refs\n"
-"may be created by mistake. For example,\n"
-"\n"
-"  git switch -c $br $(git rev-parse ...)\n"
-"\n"
-"where \"$br\" is somehow empty and a 40-hex ref is created. Please\n"
-"examine these refs and maybe delete them. Turn this message off by\n"
-"running \"git config advice.objectNameWarning false\""
-msgstr ""
-
-#: object-name.c:1008
-#, c-format
-msgid "log for '%.*s' only goes back to %s"
-msgstr ""
-
-#: object-name.c:1016
-#, c-format
-msgid "log for '%.*s' only has %d entries"
-msgstr ""
-
-#: object-name.c:1794
-#, c-format
-msgid "path '%s' exists on disk, but not in '%.*s'"
-msgstr ""
-
-#: object-name.c:1800
-#, c-format
-msgid ""
-"path '%s' exists, but not '%s'\n"
-"hint: Did you mean '%.*s:%s' aka '%.*s:./%s'?"
-msgstr ""
-
-#: object-name.c:1809
-#, c-format
-msgid "path '%s' does not exist in '%.*s'"
-msgstr ""
-
-#: object-name.c:1837
-#, c-format
-msgid ""
-"path '%s' is in the index, but not at stage %d\n"
-"hint: Did you mean ':%d:%s'?"
-msgstr ""
-
-#: object-name.c:1853
-#, c-format
-msgid ""
-"path '%s' is in the index, but not '%s'\n"
-"hint: Did you mean ':%d:%s' aka ':%d:./%s'?"
-msgstr ""
-
-#: object-name.c:1861
-#, c-format
-msgid "path '%s' exists on disk, but not in the index"
-msgstr ""
-
-#: object-name.c:1863
-#, c-format
-msgid "path '%s' does not exist (neither on disk nor in the index)"
-msgstr ""
-
-#: object-name.c:1876
-msgid "relative path syntax can't be used outside working tree"
-msgstr ""
-
-#: object-name.c:1901
-#, c-format
-msgid "<object>:<path> required, only <object> '%s' given"
-msgstr ""
-
-#: object-name.c:2014
-#, c-format
-msgid "invalid object name '%.*s'."
-msgstr ""
-
-#: object.c:53
-#, c-format
-msgid "invalid object type \"%s\""
-msgstr ""
-
-#: object.c:173
-#, c-format
-msgid "object %s is a %s, not a %s"
-msgstr ""
-
-#: object.c:250
-#, c-format
-msgid "object %s has unknown type id %d"
-msgstr ""
-
-#: object.c:263
-#, c-format
-msgid "unable to parse object: %s"
-msgstr ""
-
-#: object.c:283 object.c:294
-#, c-format
-msgid "hash mismatch %s"
-msgstr ""
-
-#: pack-bitmap.c:353
-msgid "multi-pack bitmap is missing required reverse index"
-msgstr ""
-
-#: pack-bitmap.c:433
-msgid "load_reverse_index: could not open pack"
-msgstr ""
-
-#: pack-bitmap.c:1072 pack-bitmap.c:1078 builtin/pack-objects.c:2432
-#, c-format
-msgid "unable to get size of %s"
-msgstr ""
-
-#: pack-bitmap.c:1937
-#, c-format
-msgid "could not find %s in pack %s at offset %<PRIuMAX>"
-msgstr ""
-
-#: pack-bitmap.c:1973 builtin/rev-list.c:91
-#, c-format
-msgid "unable to get disk usage of %s"
-msgstr ""
-
-#: pack-revindex.c:221
-#, c-format
-msgid "reverse-index file %s is too small"
-msgstr ""
-
-#: pack-revindex.c:226
-#, c-format
-msgid "reverse-index file %s is corrupt"
-msgstr ""
-
-#: pack-revindex.c:234
-#, c-format
-msgid "reverse-index file %s has unknown signature"
-msgstr ""
-
-#: pack-revindex.c:238
-#, c-format
-msgid "reverse-index file %s has unsupported version %<PRIu32>"
-msgstr ""
-
-#: pack-revindex.c:243
-#, c-format
-msgid "reverse-index file %s has unsupported hash id %<PRIu32>"
-msgstr ""
-
-#: pack-write.c:251
-msgid "cannot both write and verify reverse index"
-msgstr ""
-
-#: pack-write.c:270
-#, c-format
-msgid "could not stat: %s"
-msgstr ""
-
-#: pack-write.c:282
-#, c-format
-msgid "failed to make %s readable"
-msgstr ""
-
-#: pack-write.c:521
-#, c-format
-msgid "could not write '%s' promisor file"
-msgstr ""
-
-#: packfile.c:627
-msgid "offset before end of packfile (broken .idx?)"
-msgstr ""
-
-#: packfile.c:657
-#, c-format
-msgid "packfile %s cannot be mapped%s"
-msgstr ""
-
-#: packfile.c:1924
-#, c-format
-msgid "offset before start of pack index for %s (corrupt index?)"
-msgstr ""
-
-#: packfile.c:1928
-#, c-format
-msgid "offset beyond end of pack index for %s (truncated index?)"
-msgstr ""
-
-#: parse-options-cb.c:21 parse-options-cb.c:25 builtin/commit-graph.c:175
-#, c-format
-msgid "option `%s' expects a numerical value"
-msgstr ""
-
-#: parse-options-cb.c:42
-#, c-format
-msgid "malformed expiration date '%s'"
-msgstr ""
-
-#: parse-options-cb.c:55
-#, c-format
-msgid "option `%s' expects \"always\", \"auto\", or \"never\""
-msgstr ""
-
-#: parse-options-cb.c:133 parse-options-cb.c:150
-#, c-format
-msgid "malformed object name '%s'"
-msgstr ""
-
-#: parse-options-cb.c:307
-#, c-format
-msgid "option `%s' expects \"%s\" or \"%s\""
-msgstr ""
-
-#: parse-options.c:58
-#, c-format
-msgid "%s requires a value"
-msgstr ""
-
-#: parse-options.c:93
-#, c-format
-msgid "%s is incompatible with %s"
-msgstr ""
-
-#: parse-options.c:98
-#, c-format
-msgid "%s : incompatible with something else"
-msgstr ""
-
-#: parse-options.c:112 parse-options.c:116
-#, c-format
-msgid "%s takes no value"
-msgstr ""
-
-#: parse-options.c:114
-#, c-format
-msgid "%s isn't available"
-msgstr ""
-
-#: 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:393
-#, c-format
-msgid "ambiguous option: %s (could be --%s%s or --%s%s)"
-msgstr ""
-
-#: parse-options.c:428 parse-options.c:436
-#, c-format
-msgid "did you mean `--%s` (with two dashes)?"
-msgstr ""
-
-#: parse-options.c:678 parse-options.c:1054
-#, c-format
-msgid "alias of --%s"
-msgstr ""
-
-#: parse-options.c:892
-#, c-format
-msgid "unknown option `%s'"
-msgstr ""
-
-#: parse-options.c:894
-#, c-format
-msgid "unknown switch `%c'"
-msgstr ""
-
-#: parse-options.c:896
-#, c-format
-msgid "unknown non-ascii option in string: `%s'"
-msgstr ""
-
-#: parse-options.c:920
-msgid "..."
-msgstr ""
-
-#: parse-options.c:934
-#, c-format
-msgid "usage: %s"
-msgstr ""
-
-#. TRANSLATORS: the colon here should align with the
-#. one in "usage: %s" translation.
-#.
-#: parse-options.c:949
-#, c-format
-msgid "   or: %s"
-msgstr ""
-
-#. 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:970
-#, c-format
-msgid "%*s%s"
-msgstr ""
-
-#: parse-options.c:993
-#, c-format
-msgid "    %s"
-msgstr ""
-
-#: parse-options.c:1040
-msgid "-NUM"
-msgstr ""
-
-#: path.c:922
-#, c-format
-msgid "Could not make %s writable by group"
-msgstr ""
-
-#: pathspec.c:150
-msgid "Escape character '\\' not allowed as last character in attr value"
-msgstr ""
-
-#: pathspec.c:168
-msgid "Only one 'attr:' specification is allowed."
-msgstr ""
-
-#: pathspec.c:171
-msgid "attr spec must not be empty"
-msgstr ""
-
-#: pathspec.c:214
-#, c-format
-msgid "invalid attribute name %s"
-msgstr ""
-
-#: pathspec.c:279
-msgid "global 'glob' and 'noglob' pathspec settings are incompatible"
-msgstr ""
-
-#: pathspec.c:286
-msgid ""
-"global 'literal' pathspec setting is incompatible with all other global "
-"pathspec settings"
-msgstr ""
-
-#: pathspec.c:326
-msgid "invalid parameter for pathspec magic 'prefix'"
-msgstr ""
-
-#: pathspec.c:347
-#, c-format
-msgid "Invalid pathspec magic '%.*s' in '%s'"
-msgstr ""
-
-#: pathspec.c:352
-#, c-format
-msgid "Missing ')' at the end of pathspec magic in '%s'"
-msgstr ""
-
-#: pathspec.c:390
-#, c-format
-msgid "Unimplemented pathspec magic '%c' in '%s'"
-msgstr ""
-
-#: pathspec.c:449
-#, c-format
-msgid "%s: 'literal' and 'glob' are incompatible"
-msgstr ""
-
-#: pathspec.c:465
-#, c-format
-msgid "%s: '%s' is outside repository at '%s'"
-msgstr ""
-
-#: pathspec.c:541
-#, c-format
-msgid "'%s' (mnemonic: '%c')"
-msgstr ""
-
-#: pathspec.c:551
-#, c-format
-msgid "%s: pathspec magic not supported by this command: %s"
-msgstr ""
-
-#: pathspec.c:618
-#, c-format
-msgid "pathspec '%s' is beyond a symbolic link"
-msgstr ""
-
-#: pathspec.c:663
-#, c-format
-msgid "line is badly quoted: %s"
-msgstr ""
-
-#: pkt-line.c:92
-msgid "unable to write flush packet"
-msgstr ""
-
-#: pkt-line.c:99
-msgid "unable to write delim packet"
-msgstr ""
-
-#: pkt-line.c:106
-msgid "unable to write response end packet"
-msgstr ""
-
-#: pkt-line.c:113
-msgid "flush packet write failed"
-msgstr ""
-
-#: pkt-line.c:153
-msgid "protocol error: impossibly long line"
-msgstr ""
-
-#: pkt-line.c:169 pkt-line.c:171
-msgid "packet write with format failed"
-msgstr ""
-
-#: pkt-line.c:204 pkt-line.c:252
-msgid "packet write failed - data exceeds max packet size"
-msgstr ""
-
-#: pkt-line.c:222
-#, c-format
-msgid "packet write failed: %s"
-msgstr ""
-
-#: pkt-line.c:349 pkt-line.c:350
-msgid "read error"
-msgstr ""
-
-#: pkt-line.c:360 pkt-line.c:361
-msgid "the remote end hung up unexpectedly"
-msgstr ""
-
-#: pkt-line.c:417 pkt-line.c:419
-#, c-format
-msgid "protocol error: bad line length character: %.4s"
-msgstr ""
-
-#: pkt-line.c:434 pkt-line.c:436 pkt-line.c:442 pkt-line.c:444
-#, c-format
-msgid "protocol error: bad line length %d"
-msgstr ""
-
-#: pkt-line.c:472 sideband.c:165
-#, c-format
-msgid "remote error: %s"
-msgstr ""
-
-#: preload-index.c:125
-msgid "Refreshing index"
-msgstr ""
-
-#: preload-index.c:144
-#, c-format
-msgid "unable to create threaded lstat: %s"
-msgstr ""
-
-#: pretty.c:1051
-msgid "unable to parse --pretty format"
-msgstr ""
-
-#: promisor-remote.c:31
-msgid "promisor-remote: unable to fork off fetch subprocess"
-msgstr ""
-
-#: promisor-remote.c:38 promisor-remote.c:40
-msgid "promisor-remote: could not write to fetch subprocess"
-msgstr ""
-
-#: promisor-remote.c:44
-msgid "promisor-remote: could not close stdin to fetch subprocess"
-msgstr ""
-
-#: promisor-remote.c:54
-#, c-format
-msgid "promisor remote name cannot begin with '/': %s"
-msgstr ""
-
-#: protocol-caps.c:103
-msgid "object-info: expected flush after arguments"
-msgstr ""
-
-#: prune-packed.c:35
-msgid "Removing duplicate objects"
-msgstr ""
-
-#: range-diff.c:68
-msgid "could not start `log`"
-msgstr ""
-
-#: range-diff.c:70
-msgid "could not read `log` output"
-msgstr ""
-
-#: range-diff.c:98 sequencer.c:5575
-#, c-format
-msgid "could not parse commit '%s'"
-msgstr ""
-
-#: range-diff.c:109
-#, c-format
-msgid ""
-"could not parse first line of `log` output: did not start with 'commit ': "
-"'%s'"
-msgstr ""
-
-#: range-diff.c:132
-#, c-format
-msgid "could not parse git header '%.*s'"
-msgstr ""
-
-#: range-diff.c:300
-msgid "failed to generate diff"
-msgstr ""
-
-#: range-diff.c:558 range-diff.c:560
-#, c-format
-msgid "could not parse log for '%s'"
-msgstr ""
-
-#: read-cache.c:737
-#, c-format
-msgid "will not add file alias '%s' ('%s' already exists in index)"
-msgstr ""
-
-#: read-cache.c:753
-msgid "cannot create an empty blob in the object database"
-msgstr ""
-
-#: read-cache.c:775
-#, c-format
-msgid "%s: can only add regular files, symbolic links or git-directories"
-msgstr ""
-
-#: read-cache.c:780 builtin/submodule--helper.c:3359
-#, c-format
-msgid "'%s' does not have a commit checked out"
-msgstr ""
-
-#: read-cache.c:832
-#, c-format
-msgid "unable to index file '%s'"
-msgstr ""
-
-#: read-cache.c:851
-#, c-format
-msgid "unable to add '%s' to index"
-msgstr ""
-
-#: read-cache.c:862
-#, c-format
-msgid "unable to stat '%s'"
-msgstr ""
-
-#: read-cache.c:1404
-#, c-format
-msgid "'%s' appears as both a file and as a directory"
-msgstr ""
-
-#: read-cache.c:1619
-msgid "Refresh index"
-msgstr ""
-
-#: read-cache.c:1751
-#, c-format
-msgid ""
-"index.version set, but the value is invalid.\n"
-"Using version %i"
-msgstr ""
-
-#: read-cache.c:1761
-#, c-format
-msgid ""
-"GIT_INDEX_VERSION set, but the value is invalid.\n"
-"Using version %i"
-msgstr ""
-
-#: read-cache.c:1817
-#, c-format
-msgid "bad signature 0x%08x"
-msgstr ""
-
-#: read-cache.c:1820
-#, c-format
-msgid "bad index version %d"
-msgstr ""
-
-#: read-cache.c:1829
-msgid "bad index file sha1 signature"
-msgstr ""
-
-#: read-cache.c:1863
-#, c-format
-msgid "index uses %.4s extension, which we do not understand"
-msgstr ""
-
-#: read-cache.c:1865
-#, c-format
-msgid "ignoring %.4s extension"
-msgstr ""
-
-#: read-cache.c:1902
-#, c-format
-msgid "unknown index entry format 0x%08x"
-msgstr ""
-
-#: read-cache.c:1918
-#, c-format
-msgid "malformed name field in the index, near path '%s'"
-msgstr ""
-
-#: read-cache.c:1975
-msgid "unordered stage entries in index"
-msgstr ""
-
-#: read-cache.c:1978
-#, c-format
-msgid "multiple stage entries for merged file '%s'"
-msgstr ""
-
-#: read-cache.c:1981
-#, c-format
-msgid "unordered stage entries for '%s'"
-msgstr ""
-
-#: read-cache.c:2096 read-cache.c:2402 rerere.c:549 rerere.c:583 rerere.c:1096
-#: submodule.c:1831 builtin/add.c:586 builtin/check-ignore.c:183
-#: builtin/checkout.c:532 builtin/checkout.c:724 builtin/clean.c:1016
-#: builtin/commit.c:379 builtin/diff-tree.c:122 builtin/grep.c:521
-#: builtin/mv.c:148 builtin/reset.c:506 builtin/rm.c:293
-#: builtin/submodule--helper.c:335 builtin/submodule--helper.c:3319
-msgid "index file corrupt"
-msgstr ""
-
-#: read-cache.c:2240
-#, c-format
-msgid "unable to create load_cache_entries thread: %s"
-msgstr ""
-
-#: read-cache.c:2253
-#, c-format
-msgid "unable to join load_cache_entries thread: %s"
-msgstr ""
-
-#: read-cache.c:2286
-#, c-format
-msgid "%s: index file open failed"
-msgstr ""
-
-#: read-cache.c:2290
-#, c-format
-msgid "%s: cannot stat the open index"
-msgstr ""
-
-#: read-cache.c:2294
-#, c-format
-msgid "%s: index file smaller than expected"
-msgstr ""
-
-#: read-cache.c:2298
-#, c-format
-msgid "%s: unable to map index file%s"
-msgstr ""
-
-#: read-cache.c:2341
-#, c-format
-msgid "unable to create load_index_extensions thread: %s"
-msgstr ""
-
-#: read-cache.c:2368
-#, c-format
-msgid "unable to join load_index_extensions thread: %s"
-msgstr ""
-
-#: read-cache.c:2414
-#, c-format
-msgid "could not freshen shared index '%s'"
-msgstr ""
-
-#: read-cache.c:2473
-#, c-format
-msgid "broken index, expect %s in %s, got %s"
-msgstr ""
-
-#: read-cache.c:3032
-msgid "cannot write split index for a sparse index"
-msgstr ""
-
-#: read-cache.c:3114 strbuf.c:1192 wrapper.c:717 builtin/merge.c:1156
-#, c-format
-msgid "could not close '%s'"
-msgstr ""
-
-#: read-cache.c:3157
-msgid "failed to convert to a sparse-index"
-msgstr ""
-
-#: read-cache.c:3228
-#, c-format
-msgid "could not stat '%s'"
-msgstr ""
-
-#: read-cache.c:3241
-#, c-format
-msgid "unable to open git dir: %s"
-msgstr ""
-
-#: read-cache.c:3253
-#, c-format
-msgid "unable to unlink: %s"
-msgstr ""
-
-#: read-cache.c:3282
-#, c-format
-msgid "cannot fix permission bits on '%s'"
-msgstr ""
-
-#: read-cache.c:3439
-#, c-format
-msgid "%s: cannot drop to stage #0"
-msgstr ""
-
-#: rebase-interactive.c:11
-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 ""
-
-#: rebase-interactive.c:33
-#, c-format
-msgid ""
-"unrecognized setting %s for option rebase.missingCommitsCheck. Ignoring."
-msgstr ""
-
-#: rebase-interactive.c:42
-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 [-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"
-"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 ""
-
-#: 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] ""
-
-#: rebase-interactive.c:75
-msgid ""
-"\n"
-"Do not remove any line. Use 'drop' explicitly to remove a commit.\n"
-msgstr ""
-
-#: rebase-interactive.c:78
-msgid ""
-"\n"
-"If you remove a line here THAT COMMIT WILL BE LOST.\n"
-msgstr ""
-
-#: rebase-interactive.c:84
-msgid ""
-"\n"
-"You are editing the todo file of an ongoing interactive rebase.\n"
-"To continue rebase after editing, run:\n"
-"    git rebase --continue\n"
-"\n"
-msgstr ""
-
-#: 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:677 sequencer.c:3879
-#: sequencer.c:3905 sequencer.c:5681 builtin/fsck.c:328 builtin/gc.c:1791
-#: builtin/rebase.c:191
-#, c-format
-msgid "could not write '%s'"
-msgstr ""
-
-#: rebase-interactive.c:119
-#, c-format
-msgid "could not write '%s'."
-msgstr ""
-
-#: rebase-interactive.c:196
-#, c-format
-msgid ""
-"Warning: some commits may have been dropped accidentally.\n"
-"Dropped commits (newer to older):\n"
-msgstr ""
-
-#: rebase-interactive.c:203
-#, c-format
-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"
-"The possible behaviours are: ignore, warn, error.\n"
-"\n"
-msgstr ""
-
-#: rebase.c:29
-#, c-format
-msgid "%s: 'preserve' superseded by 'merges'"
-msgstr ""
-
-#: ref-filter.c:42 wt-status.c:2057
-msgid "gone"
-msgstr ""
-
-#: ref-filter.c:43
-#, c-format
-msgid "ahead %d"
-msgstr ""
-
-#: ref-filter.c:44
-#, c-format
-msgid "behind %d"
-msgstr ""
-
-#: ref-filter.c:45
-#, c-format
-msgid "ahead %d, behind %d"
-msgstr ""
-
-#: ref-filter.c:235
-#, c-format
-msgid "expected format: %%(color:<color>)"
-msgstr ""
-
-#: ref-filter.c:237
-#, c-format
-msgid "unrecognized color: %%(color:%s)"
-msgstr ""
-
-#: ref-filter.c:259
-#, c-format
-msgid "Integer value expected refname:lstrip=%s"
-msgstr ""
-
-#: ref-filter.c:263
-#, c-format
-msgid "Integer value expected refname:rstrip=%s"
-msgstr ""
-
-#: ref-filter.c:265 ref-filter.c:344 ref-filter.c:377 ref-filter.c:431
-#: ref-filter.c:443 ref-filter.c:462 ref-filter.c:534 ref-filter.c:560
-#, c-format
-msgid "unrecognized %%(%s) argument: %s"
-msgstr ""
-
-#: ref-filter.c:320
-#, c-format
-msgid "%%(objecttype) does not take arguments"
-msgstr ""
-
-#: ref-filter.c:352
-#, c-format
-msgid "%%(deltabase) does not take arguments"
-msgstr ""
-
-#: ref-filter.c:364
-#, c-format
-msgid "%%(body) does not take arguments"
-msgstr ""
-
-#: ref-filter.c:396
-#, c-format
-msgid "expected %%(trailers:key=<value>)"
-msgstr ""
-
-#: ref-filter.c:398
-#, c-format
-msgid "unknown %%(trailers) argument: %s"
-msgstr ""
-
-#: ref-filter.c:429
-#, c-format
-msgid "positive value expected contents:lines=%s"
-msgstr ""
-
-#: ref-filter.c:458
-#, c-format
-msgid "positive value expected '%s' in %%(%s)"
-msgstr ""
-
-#: ref-filter.c:476
-#, c-format
-msgid "unrecognized email option: %s"
-msgstr ""
-
-#: ref-filter.c:506
-#, c-format
-msgid "expected format: %%(align:<width>,<position>)"
-msgstr ""
-
-#: ref-filter.c:518
-#, c-format
-msgid "unrecognized position:%s"
-msgstr ""
-
-#: ref-filter.c:525
-#, c-format
-msgid "unrecognized width:%s"
-msgstr ""
-
-#: ref-filter.c:542
-#, c-format
-msgid "positive width expected with the %%(align) atom"
-msgstr ""
-
-#: 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:707
-#, c-format
-msgid "unknown field name: %.*s"
-msgstr ""
-
-#: ref-filter.c:711
-#, c-format
-msgid ""
-"not a git repository, but the field '%.*s' requires access to object data"
-msgstr ""
-
-#: ref-filter.c:844 ref-filter.c:910 ref-filter.c:946 ref-filter.c:948
-#, c-format
-msgid "format: %%(%s) atom used without a %%(%s) atom"
-msgstr ""
-
-#: ref-filter.c:912
-#, c-format
-msgid "format: %%(then) atom used more than once"
-msgstr ""
-
-#: ref-filter.c:914
-#, c-format
-msgid "format: %%(then) atom used after %%(else)"
-msgstr ""
-
-#: ref-filter.c:950
-#, c-format
-msgid "format: %%(else) atom used more than once"
-msgstr ""
-
-#: ref-filter.c:965
-#, c-format
-msgid "format: %%(end) atom used without corresponding atom"
-msgstr ""
-
-#: ref-filter.c:1027
-#, c-format
-msgid "malformed format string %s"
-msgstr ""
-
-#: 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:1707
-#, c-format
-msgid "(no branch, rebasing %s)"
-msgstr ""
-
-#: ref-filter.c:1710
-#, c-format
-msgid "(no branch, rebasing detached HEAD %s)"
-msgstr ""
-
-#: ref-filter.c:1713
-#, c-format
-msgid "(no branch, bisect started on %s)"
-msgstr ""
-
-#: ref-filter.c:1717
-#, c-format
-msgid "(HEAD detached at %s)"
-msgstr ""
-
-#: ref-filter.c:1720
-#, c-format
-msgid "(HEAD detached from %s)"
-msgstr ""
-
-#: ref-filter.c:1723
-msgid "(no branch)"
-msgstr ""
-
-#: ref-filter.c:1755 ref-filter.c:1973
-#, c-format
-msgid "missing object %s for %s"
-msgstr ""
-
-#: ref-filter.c:1765
-#, c-format
-msgid "parse_object_buffer failed on %s for %s"
-msgstr ""
-
-#: ref-filter.c:2156
-#, c-format
-msgid "malformed object at '%s'"
-msgstr ""
-
-#: ref-filter.c:2246
-#, c-format
-msgid "ignoring ref with broken name %s"
-msgstr ""
-
-#: ref-filter.c:2251 refs.c:672
-#, c-format
-msgid "ignoring broken ref %s"
-msgstr ""
-
-#: ref-filter.c:2630
-#, c-format
-msgid "format: %%(end) atom missing"
-msgstr ""
-
-#: ref-filter.c:2741
-#, c-format
-msgid "malformed object name %s"
-msgstr ""
-
-#: ref-filter.c:2746
-#, c-format
-msgid "option `%s' must point to a commit"
-msgstr ""
-
-#: reflog.c:407
-#, c-format
-msgid "not a reflog: %s"
-msgstr ""
-
-#: reflog.c:410
-#, c-format
-msgid "no reflog for '%s'"
-msgstr ""
-
-#: refs.c:262
-#, c-format
-msgid "%s does not point to a valid object!"
-msgstr ""
-
-#: refs.c:561
-#, 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"
-"of your new repositories, which will suppress this warning, call:\n"
-"\n"
-"\tgit config --global init.defaultBranch <name>\n"
-"\n"
-"Names commonly chosen instead of 'master' are 'main', 'trunk' and\n"
-"'development'. The just-created branch can be renamed via this command:\n"
-"\n"
-"\tgit branch -m <name>\n"
-msgstr ""
-
-#: refs.c:583
-#, c-format
-msgid "could not retrieve `%s`"
-msgstr ""
-
-#: refs.c:593
-#, c-format
-msgid "invalid branch name: %s = %s"
-msgstr ""
-
-#: refs.c:670
-#, c-format
-msgid "ignoring dangling symref %s"
-msgstr ""
-
-#: refs.c:919
-#, c-format
-msgid "log for ref %s has gap after %s"
-msgstr ""
-
-#: refs.c:926
-#, c-format
-msgid "log for ref %s unexpectedly ended on %s"
-msgstr ""
-
-#: refs.c:991
-#, c-format
-msgid "log for %s is empty"
-msgstr ""
-
-#: refs.c:1086
-#, c-format
-msgid "refusing to update ref with bad name '%s'"
-msgstr ""
-
-#: refs.c:1164
-#, c-format
-msgid "update_ref failed for ref '%s': %s"
-msgstr ""
-
-#: refs.c:2059
-#, c-format
-msgid "multiple updates for ref '%s' not allowed"
-msgstr ""
-
-#: refs.c:2145
-msgid "ref updates forbidden inside quarantine environment"
-msgstr ""
-
-#: refs.c:2156
-msgid "ref updates aborted by hook"
-msgstr ""
-
-#: refs.c:2264 refs.c:2294
-#, c-format
-msgid "'%s' exists; cannot create '%s'"
-msgstr ""
-
-#: refs.c:2270 refs.c:2305
-#, c-format
-msgid "cannot process '%s' and '%s' at the same time"
-msgstr ""
-
-#: refs/files-backend.c:1295
-#, c-format
-msgid "could not remove reference %s"
-msgstr ""
-
-#: refs/files-backend.c:1310 refs/packed-backend.c:1565
-#: refs/packed-backend.c:1575
-#, c-format
-msgid "could not delete reference %s: %s"
-msgstr ""
-
-#: refs/files-backend.c:1313 refs/packed-backend.c:1578
-#, c-format
-msgid "could not delete references: %s"
-msgstr ""
-
-#: refspec.c:170
-#, c-format
-msgid "invalid refspec '%s'"
-msgstr ""
-
-#: remote.c:402
-#, c-format
-msgid "config remote shorthand cannot begin with '/': %s"
-msgstr ""
-
-#: remote.c:450
-msgid "more than one receivepack given, using the first"
-msgstr ""
-
-#: remote.c:458
-msgid "more than one uploadpack given, using the first"
-msgstr ""
-
-#: remote.c:698
-#, c-format
-msgid "Cannot fetch both %s and %s to %s"
-msgstr ""
-
-#: remote.c:702
-#, c-format
-msgid "%s usually tracks %s, not %s"
-msgstr ""
-
-#: remote.c:706
-#, c-format
-msgid "%s tracks both %s and %s"
-msgstr ""
-
-#: remote.c:774
-#, c-format
-msgid "key '%s' of pattern had no '*'"
-msgstr ""
-
-#: remote.c:784
-#, c-format
-msgid "value '%s' of pattern has no '*'"
-msgstr ""
-
-#: remote.c:1191
-#, c-format
-msgid "src refspec %s does not match any"
-msgstr ""
-
-#: remote.c:1196
-#, c-format
-msgid "src refspec %s matches more than one"
-msgstr ""
-
-#. TRANSLATORS: "matches '%s'%" is the <dst> part of "git push
-#. <remote> <src>:<dst>" push, and "being pushed ('%s')" is
-#. the <src>.
-#.
-#: remote.c:1211
-#, c-format
-msgid ""
-"The destination you provided is not a full refname (i.e.,\n"
-"starting with \"refs/\"). We tried to guess what you meant by:\n"
-"\n"
-"- Looking for a ref that matches '%s' on the remote side.\n"
-"- Checking if the <src> being pushed ('%s')\n"
-"  is a ref in \"refs/{heads,tags}/\". If so we add a corresponding\n"
-"  refs/{heads,tags}/ prefix on the remote side.\n"
-"\n"
-"Neither worked, so we gave up. You must fully qualify the ref."
-msgstr ""
-
-#: remote.c:1231
-#, c-format
-msgid ""
-"The <src> part of the refspec is a commit object.\n"
-"Did you mean to create a new branch by pushing to\n"
-"'%s:refs/heads/%s'?"
-msgstr ""
-
-#: remote.c:1236
-#, c-format
-msgid ""
-"The <src> part of the refspec is a tag object.\n"
-"Did you mean to create a new tag by pushing to\n"
-"'%s:refs/tags/%s'?"
-msgstr ""
-
-#: remote.c:1241
-#, c-format
-msgid ""
-"The <src> part of the refspec is a tree object.\n"
-"Did you mean to tag a new tree by pushing to\n"
-"'%s:refs/tags/%s'?"
-msgstr ""
-
-#: remote.c:1246
-#, c-format
-msgid ""
-"The <src> part of the refspec is a blob object.\n"
-"Did you mean to tag a new blob by pushing to\n"
-"'%s:refs/tags/%s'?"
-msgstr ""
-
-#: remote.c:1282
-#, c-format
-msgid "%s cannot be resolved to branch"
-msgstr ""
-
-#: remote.c:1293
-#, c-format
-msgid "unable to delete '%s': remote ref does not exist"
-msgstr ""
-
-#: remote.c:1305
-#, c-format
-msgid "dst refspec %s matches more than one"
-msgstr ""
-
-#: remote.c:1312
-#, c-format
-msgid "dst ref %s receives from more than one src"
-msgstr ""
-
-#: remote.c:1833 remote.c:1940
-msgid "HEAD does not point to a branch"
-msgstr ""
-
-#: remote.c:1842
-#, c-format
-msgid "no such branch: '%s'"
-msgstr ""
-
-#: remote.c:1845
-#, c-format
-msgid "no upstream configured for branch '%s'"
-msgstr ""
-
-#: remote.c:1851
-#, c-format
-msgid "upstream branch '%s' not stored as a remote-tracking branch"
-msgstr ""
-
-#: remote.c:1866
-#, c-format
-msgid "push destination '%s' on remote '%s' has no local tracking branch"
-msgstr ""
-
-#: remote.c:1881
-#, c-format
-msgid "branch '%s' has no remote for pushing"
-msgstr ""
-
-#: remote.c:1891
-#, c-format
-msgid "push refspecs for '%s' do not include '%s'"
-msgstr ""
-
-#: remote.c:1904
-msgid "push has no destination (push.default is 'nothing')"
-msgstr ""
-
-#: remote.c:1926
-msgid "cannot resolve 'simple' push to a single destination"
-msgstr ""
-
-#: remote.c:2059
-#, c-format
-msgid "couldn't find remote ref %s"
-msgstr ""
-
-#: remote.c:2072
-#, c-format
-msgid "* Ignoring funny ref '%s' locally"
-msgstr ""
-
-#: remote.c:2235
-#, c-format
-msgid "Your branch is based on '%s', but the upstream is gone.\n"
-msgstr ""
-
-#: remote.c:2239
-msgid "  (use \"git branch --unset-upstream\" to fixup)\n"
-msgstr ""
-
-#: remote.c:2242
-#, c-format
-msgid "Your branch is up to date with '%s'.\n"
-msgstr ""
-
-#: remote.c:2246
-#, c-format
-msgid "Your branch and '%s' refer to different commits.\n"
-msgstr ""
-
-#: remote.c:2249
-#, c-format
-msgid "  (use \"%s\" for details)\n"
-msgstr ""
-
-#: remote.c:2253
-#, c-format
-msgid "Your branch is ahead of '%s' by %d commit.\n"
-msgid_plural "Your branch is ahead of '%s' by %d commits.\n"
-msgstr[0] ""
-msgstr[1] ""
-
-#: remote.c:2259
-msgid "  (use \"git push\" to publish your local commits)\n"
-msgstr ""
-
-#: remote.c:2262
-#, c-format
-msgid "Your branch is behind '%s' by %d commit, and can be fast-forwarded.\n"
-msgid_plural ""
-"Your branch is behind '%s' by %d commits, and can be fast-forwarded.\n"
-msgstr[0] ""
-msgstr[1] ""
-
-#: remote.c:2270
-msgid "  (use \"git pull\" to update your local branch)\n"
-msgstr ""
-
-#: remote.c:2273
-#, c-format
-msgid ""
-"Your branch and '%s' have diverged,\n"
-"and have %d and %d different commit each, respectively.\n"
-msgid_plural ""
-"Your branch and '%s' have diverged,\n"
-"and have %d and %d different commits each, respectively.\n"
-msgstr[0] ""
-msgstr[1] ""
-
-#: remote.c:2283
-msgid "  (use \"git pull\" to merge the remote branch into yours)\n"
-msgstr ""
-
-#: remote.c:2475
-#, c-format
-msgid "cannot parse expected object name '%s'"
-msgstr ""
-
-#: replace-object.c:21
-#, c-format
-msgid "bad replace ref name: %s"
-msgstr ""
-
-#: replace-object.c:30
-#, c-format
-msgid "duplicate replace ref: %s"
-msgstr ""
-
-#: replace-object.c:82
-#, c-format
-msgid "replace depth too high for object %s"
-msgstr ""
-
-#: rerere.c:201 rerere.c:210 rerere.c:213
-msgid "corrupt MERGE_RR"
-msgstr ""
-
-#: rerere.c:248 rerere.c:253
-msgid "unable to write rerere record"
-msgstr ""
-
-#: rerere.c:479
-#, c-format
-msgid "there were errors while writing '%s' (%s)"
-msgstr ""
-
-#: rerere.c:482 builtin/gc.c:2263 builtin/gc.c:2298
-#, c-format
-msgid "failed to flush '%s'"
-msgstr ""
-
-#: rerere.c:487 rerere.c:1024
-#, c-format
-msgid "could not parse conflict hunks in '%s'"
-msgstr ""
-
-#: rerere.c:669
-#, c-format
-msgid "failed utime() on '%s'"
-msgstr ""
-
-#: rerere.c:679
-#, c-format
-msgid "writing '%s' failed"
-msgstr ""
-
-#: rerere.c:699
-#, c-format
-msgid "Staged '%s' using previous resolution."
-msgstr ""
-
-#: rerere.c:738
-#, c-format
-msgid "Recorded resolution for '%s'."
-msgstr ""
-
-#: rerere.c:773
-#, c-format
-msgid "Resolved '%s' using previous resolution."
-msgstr ""
-
-#: rerere.c:788
-#, c-format
-msgid "cannot unlink stray '%s'"
-msgstr ""
-
-#: rerere.c:792
-#, c-format
-msgid "Recorded preimage for '%s'"
-msgstr ""
-
-#: rerere.c:866 submodule.c:2290 builtin/log.c:2042
-#: builtin/submodule--helper.c:1786 builtin/submodule--helper.c:1833
-#, c-format
-msgid "could not create directory '%s'"
-msgstr ""
-
-#: rerere.c:1042
-#, c-format
-msgid "failed to update conflicted state in '%s'"
-msgstr ""
-
-#: rerere.c:1053 rerere.c:1060
-#, c-format
-msgid "no remembered resolution for '%s'"
-msgstr ""
-
-#: rerere.c:1062
-#, c-format
-msgid "cannot unlink '%s'"
-msgstr ""
-
-#: rerere.c:1072
-#, c-format
-msgid "Updated preimage for '%s'"
-msgstr ""
-
-#: rerere.c:1081
-#, c-format
-msgid "Forgot resolution for '%s'\n"
-msgstr ""
-
-#: rerere.c:1192
-msgid "unable to open rr-cache directory"
-msgstr ""
-
-#: reset.c:112
-msgid "could not determine HEAD revision"
-msgstr ""
-
-#: reset.c:141 reset.c:147 sequencer.c:3696
-#, c-format
-msgid "failed to find tree of %s"
-msgstr ""
-
-#: revision.c:2358
-msgid "--unpacked=<packfile> no longer supported"
-msgstr ""
-
-#: revision.c:2712
-msgid "your current branch appears to be broken"
-msgstr ""
-
-#: revision.c:2715
-#, c-format
-msgid "your current branch '%s' does not have any commits yet"
-msgstr ""
-
-#: revision.c:2901
-msgid "object filtering requires --objects"
-msgstr ""
-
-#: revision.c:2918
-msgid "-L does not yet support diff formats besides -p and -s"
-msgstr ""
-
-#: run-command.c:1262
-#, c-format
-msgid "cannot create async thread: %s"
-msgstr ""
-
-#: send-pack.c:150
-msgid "unexpected flush packet while reading remote unpack status"
-msgstr ""
-
-#: send-pack.c:152
-#, c-format
-msgid "unable to parse remote unpack status: %s"
-msgstr ""
-
-#: send-pack.c:154
-#, c-format
-msgid "remote unpack failed: %s"
-msgstr ""
-
-#: send-pack.c:378
-msgid "failed to sign the push certificate"
-msgstr ""
-
-#: send-pack.c:435
-msgid "send-pack: unable to fork off fetch subprocess"
-msgstr ""
-
-#: send-pack.c:457
-msgid "push negotiation failed; proceeding anyway with push"
-msgstr ""
-
-#: send-pack.c:528
-msgid "the receiving end does not support this repository's hash algorithm"
-msgstr ""
-
-#: send-pack.c:537
-msgid "the receiving end does not support --signed push"
-msgstr ""
-
-#: send-pack.c:539
-msgid ""
-"not sending a push certificate since the receiving end does not support --"
-"signed push"
-msgstr ""
-
-#: send-pack.c:546
-msgid "the receiving end does not support --atomic push"
-msgstr ""
-
-#: send-pack.c:551
-msgid "the receiving end does not support push options"
-msgstr ""
-
-#: sequencer.c:197
-#, c-format
-msgid "invalid commit message cleanup mode '%s'"
-msgstr ""
-
-#: sequencer.c:325
-#, c-format
-msgid "could not delete '%s'"
-msgstr ""
-
-#: sequencer.c:345 sequencer.c:4724 builtin/rebase.c:564 builtin/rebase.c:1326
-#: builtin/rm.c:409
-#, c-format
-msgid "could not remove '%s'"
-msgstr ""
-
-#: sequencer.c:355
-msgid "revert"
-msgstr ""
-
-#: sequencer.c:357
-msgid "cherry-pick"
-msgstr ""
-
-#: sequencer.c:359
-msgid "rebase"
-msgstr ""
-
-#: sequencer.c:361
-#, c-format
-msgid "unknown action: %d"
-msgstr ""
-
-#: sequencer.c:420
-msgid ""
-"after resolving the conflicts, mark the corrected paths\n"
-"with 'git add <paths>' or 'git rm <paths>'"
-msgstr ""
-
-#: sequencer.c:423
-msgid ""
-"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: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:3288
-#, c-format
-msgid "could not lock '%s'"
-msgstr ""
-
-#: sequencer.c:450 sequencer.c:3087 sequencer.c:3292 sequencer.c:3306
-#: sequencer.c:3557 sequencer.c:5591 strbuf.c:1189 wrapper.c:715
-#, c-format
-msgid "could not write to '%s'"
-msgstr ""
-
-#: sequencer.c:455
-#, c-format
-msgid "could not write eol to '%s'"
-msgstr ""
-
-#: sequencer.c:460 sequencer.c:3092 sequencer.c:3294 sequencer.c:3308
-#: sequencer.c:3565
-#, c-format
-msgid "failed to finalize '%s'"
-msgstr ""
-
-#: sequencer.c:473 sequencer.c:1930 sequencer.c:3112 sequencer.c:3547
-#: sequencer.c:3675 builtin/am.c:290 builtin/commit.c:837 builtin/merge.c:1154
-#, c-format
-msgid "could not read '%s'"
-msgstr ""
-
-#: sequencer.c:499
-#, c-format
-msgid "your local changes would be overwritten by %s."
-msgstr ""
-
-#: sequencer.c:503
-msgid "commit your changes or stash them to proceed."
-msgstr ""
-
-#: sequencer.c:535
-#, c-format
-msgid "%s: fast-forward"
-msgstr ""
-
-#: sequencer.c:574 builtin/tag.c:615
-#, c-format
-msgid "Invalid cleanup mode %s"
-msgstr ""
-
-#. TRANSLATORS: %s will be "revert", "cherry-pick" or
-#. "rebase".
-#.
-#: sequencer.c:685
-#, c-format
-msgid "%s: Unable to write new index file"
-msgstr ""
-
-#: sequencer.c:699
-msgid "unable to update cache tree"
-msgstr ""
-
-#: sequencer.c:713
-msgid "could not resolve HEAD commit"
-msgstr ""
-
-#: sequencer.c:793
-#, c-format
-msgid "no key present in '%.*s'"
-msgstr ""
-
-#: sequencer.c:804
-#, c-format
-msgid "unable to dequote value of '%s'"
-msgstr ""
-
-#: sequencer.c:841 wrapper.c:219 wrapper.c:389 builtin/am.c:757
-#: builtin/am.c:849 builtin/rebase.c:699
-#, c-format
-msgid "could not open '%s' for reading"
-msgstr ""
-
-#: sequencer.c:851
-msgid "'GIT_AUTHOR_NAME' already given"
-msgstr ""
-
-#: sequencer.c:856
-msgid "'GIT_AUTHOR_EMAIL' already given"
-msgstr ""
-
-#: sequencer.c:861
-msgid "'GIT_AUTHOR_DATE' already given"
-msgstr ""
-
-#: sequencer.c:865
-#, c-format
-msgid "unknown variable '%s'"
-msgstr ""
-
-#: sequencer.c:870
-msgid "missing 'GIT_AUTHOR_NAME'"
-msgstr ""
-
-#: sequencer.c:872
-msgid "missing 'GIT_AUTHOR_EMAIL'"
-msgstr ""
-
-#: sequencer.c:874
-msgid "missing 'GIT_AUTHOR_DATE'"
-msgstr ""
-
-#: sequencer.c:939
-#, c-format
-msgid ""
-"you have staged changes in your working tree\n"
-"If these changes are meant to be squashed into the previous commit, run:\n"
-"\n"
-"  git commit --amend %s\n"
-"\n"
-"If they are meant to go into a new commit, run:\n"
-"\n"
-"  git commit %s\n"
-"\n"
-"In both cases, once you're done, continue with:\n"
-"\n"
-"  git rebase --continue\n"
-msgstr ""
-
-#: sequencer.c:1225
-msgid "'prepare-commit-msg' hook failed"
-msgstr ""
-
-#: sequencer.c:1231
-msgid ""
-"Your name and email address were configured automatically based\n"
-"on your username and hostname. Please check that they are accurate.\n"
-"You can suppress this message by setting them explicitly. Run the\n"
-"following command and follow the instructions in your editor to edit\n"
-"your configuration file:\n"
-"\n"
-"    git config --global --edit\n"
-"\n"
-"After doing this, you may fix the identity used for this commit with:\n"
-"\n"
-"    git commit --amend --reset-author\n"
-msgstr ""
-
-#: sequencer.c:1244
-msgid ""
-"Your name and email address were configured automatically based\n"
-"on your username and hostname. Please check that they are accurate.\n"
-"You can suppress this message by setting them explicitly:\n"
-"\n"
-"    git config --global user.name \"Your Name\"\n"
-"    git config --global user.email you@example.com\n"
-"\n"
-"After doing this, you may fix the identity used for this commit with:\n"
-"\n"
-"    git commit --amend --reset-author\n"
-msgstr ""
-
-#: sequencer.c:1287
-msgid "couldn't look up newly created commit"
-msgstr ""
-
-#: sequencer.c:1289
-msgid "could not parse newly created commit"
-msgstr ""
-
-#: sequencer.c:1336
-msgid "unable to resolve HEAD after creating commit"
-msgstr ""
-
-#: sequencer.c:1338
-msgid "detached HEAD"
-msgstr ""
-
-#: sequencer.c:1342
-msgid " (root-commit)"
-msgstr ""
-
-#: sequencer.c:1363
-msgid "could not parse HEAD"
-msgstr ""
-
-#: sequencer.c:1365
-#, c-format
-msgid "HEAD %s is not a commit!"
-msgstr ""
-
-#: sequencer.c:1369 sequencer.c:1447 builtin/commit.c:1707
-msgid "could not parse HEAD commit"
-msgstr ""
-
-#: sequencer.c:1425 sequencer.c:2310
-msgid "unable to parse commit author"
-msgstr ""
-
-#: sequencer.c:1436 builtin/am.c:1644 builtin/merge.c:710
-msgid "git write-tree failed to write a tree"
-msgstr ""
-
-#: sequencer.c:1469 sequencer.c:1589
-#, c-format
-msgid "unable to read commit message from '%s'"
-msgstr ""
-
-#: sequencer.c:1500 sequencer.c:1532
-#, c-format
-msgid "invalid author identity '%s'"
-msgstr ""
-
-#: sequencer.c:1506
-msgid "corrupt author: missing date information"
-msgstr ""
-
-#: sequencer.c:1545 builtin/am.c:1671 builtin/commit.c:1821 builtin/merge.c:921
-#: builtin/merge.c:946 t/helper/test-fast-rebase.c:78
-msgid "failed to write commit object"
-msgstr ""
-
-#: sequencer.c:1572 sequencer.c:4496 t/helper/test-fast-rebase.c:199
-#: t/helper/test-fast-rebase.c:217
-#, c-format
-msgid "could not update %s"
-msgstr ""
-
-#: sequencer.c:1621
-#, c-format
-msgid "could not parse commit %s"
-msgstr ""
-
-#: sequencer.c:1626
-#, c-format
-msgid "could not parse parent commit %s"
-msgstr ""
-
-#: sequencer.c:1709 sequencer.c:1990
-#, c-format
-msgid "unknown command: %d"
-msgstr ""
-
-#: sequencer.c:1751
-msgid "This is the 1st commit message:"
-msgstr ""
-
-#: sequencer.c:1752
-#, c-format
-msgid "This is the commit message #%d:"
-msgstr ""
-
-#: sequencer.c:1753
-msgid "The 1st commit message will be skipped:"
-msgstr ""
-
-#: sequencer.c:1754
-#, c-format
-msgid "The commit message #%d will be skipped:"
-msgstr ""
-
-#: sequencer.c:1755
-#, c-format
-msgid "This is a combination of %d commits."
-msgstr ""
-
-#: sequencer.c:1902 sequencer.c:1959
-#, c-format
-msgid "cannot write '%s'"
-msgstr ""
-
-#: sequencer.c:1949
-msgid "need a HEAD to fixup"
-msgstr ""
-
-#: sequencer.c:1951 sequencer.c:3592
-msgid "could not read HEAD"
-msgstr ""
-
-#: sequencer.c:1953
-msgid "could not read HEAD's commit message"
-msgstr ""
-
-#: sequencer.c:1977
-#, c-format
-msgid "could not read commit message of %s"
-msgstr ""
-
-#: sequencer.c:2087
-msgid "your index file is unmerged."
-msgstr ""
-
-#: sequencer.c:2094
-msgid "cannot fixup root commit"
-msgstr ""
-
-#: sequencer.c:2113
-#, c-format
-msgid "commit %s is a merge but no -m option was given."
-msgstr ""
-
-#: sequencer.c:2121 sequencer.c:2129
-#, c-format
-msgid "commit %s does not have parent %d"
-msgstr ""
-
-#: sequencer.c:2135
-#, 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:2154
-#, c-format
-msgid "%s: cannot parse parent commit %s"
-msgstr ""
-
-#: sequencer.c:2220
-#, c-format
-msgid "could not rename '%s' to '%s'"
-msgstr ""
-
-#: sequencer.c:2280
-#, c-format
-msgid "could not revert %s... %s"
-msgstr ""
-
-#: sequencer.c:2281
-#, c-format
-msgid "could not apply %s... %s"
-msgstr ""
-
-#: sequencer.c:2302
-#, c-format
-msgid "dropping %s %s -- patch contents already upstream\n"
-msgstr ""
-
-#: sequencer.c:2360
-#, c-format
-msgid "git %s: failed to read the index"
-msgstr ""
-
-#: sequencer.c:2368
-#, c-format
-msgid "git %s: failed to refresh the index"
-msgstr ""
-
-#: sequencer.c:2448
-#, c-format
-msgid "%s does not accept arguments: '%s'"
-msgstr ""
-
-#: sequencer.c:2457
-#, c-format
-msgid "missing arguments for %s"
-msgstr ""
-
-#: sequencer.c:2500
-#, c-format
-msgid "could not parse '%s'"
-msgstr ""
-
-#: sequencer.c:2561
-#, c-format
-msgid "invalid line %d: %.*s"
-msgstr ""
-
-#: sequencer.c:2572
-#, c-format
-msgid "cannot '%s' without a previous commit"
-msgstr ""
-
-#: sequencer.c:2620 builtin/rebase.c:185
-#, c-format
-msgid "could not read '%s'."
-msgstr ""
-
-#: sequencer.c:2658
-msgid "cancelling a cherry picking in progress"
-msgstr ""
-
-#: sequencer.c:2667
-msgid "cancelling a revert in progress"
-msgstr ""
-
-#: sequencer.c:2707
-msgid "please fix this using 'git rebase --edit-todo'."
-msgstr ""
-
-#: sequencer.c:2709
-#, c-format
-msgid "unusable instruction sheet: '%s'"
-msgstr ""
-
-#: sequencer.c:2714
-msgid "no commits parsed."
-msgstr ""
-
-#: sequencer.c:2725
-msgid "cannot cherry-pick during a revert."
-msgstr ""
-
-#: sequencer.c:2727
-msgid "cannot revert during a cherry-pick."
-msgstr ""
-
-#: sequencer.c:2914
-msgid "unusable squash-onto"
-msgstr ""
-
-#: sequencer.c:2934
-#, c-format
-msgid "malformed options sheet: '%s'"
-msgstr ""
-
-#: sequencer.c:3029 sequencer.c:4875
-msgid "empty commit set passed"
-msgstr ""
-
-#: sequencer.c:3046
-msgid "revert is already in progress"
-msgstr ""
-
-#: sequencer.c:3048
-#, c-format
-msgid "try \"git revert (--continue | %s--abort | --quit)\""
-msgstr ""
-
-#: sequencer.c:3051
-msgid "cherry-pick is already in progress"
-msgstr ""
-
-#: sequencer.c:3053
-#, c-format
-msgid "try \"git cherry-pick (--continue | %s--abort | --quit)\""
-msgstr ""
-
-#: sequencer.c:3067
-#, c-format
-msgid "could not create sequencer directory '%s'"
-msgstr ""
-
-#: sequencer.c:3082
-msgid "could not lock HEAD"
-msgstr ""
-
-#: sequencer.c:3142 sequencer.c:4585
-msgid "no cherry-pick or revert in progress"
-msgstr ""
-
-#: sequencer.c:3144 sequencer.c:3155
-msgid "cannot resolve HEAD"
-msgstr ""
-
-#: sequencer.c:3146 sequencer.c:3190
-msgid "cannot abort from a branch yet to be born"
-msgstr ""
-
-#: sequencer.c:3176 builtin/fetch.c:1030 builtin/fetch.c:1457
-#: builtin/grep.c:774
-#, c-format
-msgid "cannot open '%s'"
-msgstr ""
-
-#: sequencer.c:3178
-#, c-format
-msgid "cannot read '%s': %s"
-msgstr ""
-
-#: sequencer.c:3179
-msgid "unexpected end of file"
-msgstr ""
-
-#: sequencer.c:3185
-#, c-format
-msgid "stored pre-cherry-pick HEAD file '%s' is corrupt"
-msgstr ""
-
-#: sequencer.c:3196
-msgid "You seem to have moved HEAD. Not rewinding, check your HEAD!"
-msgstr ""
-
-#: sequencer.c:3237
-msgid "no revert in progress"
-msgstr ""
-
-#: sequencer.c:3246
-msgid "no cherry-pick in progress"
-msgstr ""
-
-#: sequencer.c:3256
-msgid "failed to skip the commit"
-msgstr ""
-
-#: sequencer.c:3263
-msgid "there is nothing to skip"
-msgstr ""
-
-#: sequencer.c:3266
-#, c-format
-msgid ""
-"have you committed already?\n"
-"try \"git %s --continue\""
-msgstr ""
-
-#: sequencer.c:3428 sequencer.c:4476
-msgid "cannot read HEAD"
-msgstr ""
-
-#: sequencer.c:3445
-#, c-format
-msgid "unable to copy '%s' to '%s'"
-msgstr ""
-
-#: sequencer.c:3453
-#, c-format
-msgid ""
-"You can amend the commit now, with\n"
-"\n"
-"  git commit --amend %s\n"
-"\n"
-"Once you are satisfied with your changes, run\n"
-"\n"
-"  git rebase --continue\n"
-msgstr ""
-
-#: sequencer.c:3463
-#, c-format
-msgid "Could not apply %s... %.*s"
-msgstr ""
-
-#: sequencer.c:3470
-#, c-format
-msgid "Could not merge %.*s"
-msgstr ""
-
-#: sequencer.c:3484 sequencer.c:3488 builtin/difftool.c:633
-#, c-format
-msgid "could not copy '%s' to '%s'"
-msgstr ""
-
-#: sequencer.c:3499
-#, c-format
-msgid "Executing: %s\n"
-msgstr ""
-
-#: sequencer.c:3510
-#, c-format
-msgid ""
-"execution failed: %s\n"
-"%sYou can fix the problem, and then run\n"
-"\n"
-"  git rebase --continue\n"
-"\n"
-msgstr ""
-
-#: sequencer.c:3516
-msgid "and made changes to the index and/or the working tree\n"
-msgstr ""
-
-#: sequencer.c:3522
-#, c-format
-msgid ""
-"execution succeeded: %s\n"
-"but left changes to the index and/or the working tree\n"
-"Commit or stash your changes, and then run\n"
-"\n"
-"  git rebase --continue\n"
-"\n"
-msgstr ""
-
-#: sequencer.c:3582
-#, c-format
-msgid "illegal label name: '%.*s'"
-msgstr ""
-
-#: sequencer.c:3655
-msgid "writing fake root commit"
-msgstr ""
-
-#: sequencer.c:3660
-msgid "writing squash-onto"
-msgstr ""
-
-#: sequencer.c:3739
-#, c-format
-msgid "could not resolve '%s'"
-msgstr ""
-
-#: sequencer.c:3771
-msgid "cannot merge without a current revision"
-msgstr ""
-
-#: sequencer.c:3793
-#, c-format
-msgid "unable to parse '%.*s'"
-msgstr ""
-
-#: sequencer.c:3802
-#, c-format
-msgid "nothing to merge: '%.*s'"
-msgstr ""
-
-#: sequencer.c:3814
-msgid "octopus merge cannot be executed on top of a [new root]"
-msgstr ""
-
-#: sequencer.c:3869
-#, c-format
-msgid "could not get commit message of '%s'"
-msgstr ""
-
-#: sequencer.c:4013
-#, c-format
-msgid "could not even attempt to merge '%.*s'"
-msgstr ""
-
-#: sequencer.c:4029
-msgid "merge: Unable to write new index file"
-msgstr ""
-
-#: sequencer.c:4110
-msgid "Cannot autostash"
-msgstr ""
-
-#: sequencer.c:4113
-#, c-format
-msgid "Unexpected stash response: '%s'"
-msgstr ""
-
-#: sequencer.c:4119
-#, c-format
-msgid "Could not create directory for '%s'"
-msgstr ""
-
-#: sequencer.c:4122
-#, c-format
-msgid "Created autostash: %s\n"
-msgstr ""
-
-#: sequencer.c:4124
-msgid "could not reset --hard"
-msgstr ""
-
-#: sequencer.c:4148
-#, c-format
-msgid "Applied autostash.\n"
-msgstr ""
-
-#: sequencer.c:4160
-#, c-format
-msgid "cannot store %s"
-msgstr ""
-
-#: sequencer.c:4163
-#, c-format
-msgid ""
-"%s\n"
-"Your changes are safe in the stash.\n"
-"You can run \"git stash pop\" or \"git stash drop\" at any time.\n"
-msgstr ""
-
-#: sequencer.c:4168
-msgid "Applying autostash resulted in conflicts."
-msgstr ""
-
-#: sequencer.c:4169
-msgid "Autostash exists; creating a new stash entry."
-msgstr ""
-
-#: sequencer.c:4225
-msgid "could not detach HEAD"
-msgstr ""
-
-#: sequencer.c:4240
-#, c-format
-msgid "Stopped at HEAD\n"
-msgstr ""
-
-#: sequencer.c:4242
-#, c-format
-msgid "Stopped at %s\n"
-msgstr ""
-
-#: sequencer.c:4274
-#, c-format
-msgid ""
-"Could not execute the todo command\n"
-"\n"
-"    %.*s\n"
-"It has been rescheduled; To edit the command before continuing, please\n"
-"edit the todo list first:\n"
-"\n"
-"    git rebase --edit-todo\n"
-"    git rebase --continue\n"
-msgstr ""
-
-#: sequencer.c:4320
-#, c-format
-msgid "Rebasing (%d/%d)%s"
-msgstr ""
-
-#: sequencer.c:4366
-#, c-format
-msgid "Stopped at %s...  %.*s\n"
-msgstr ""
-
-#: sequencer.c:4436
-#, c-format
-msgid "unknown command %d"
-msgstr ""
-
-#: sequencer.c:4484
-msgid "could not read orig-head"
-msgstr ""
-
-#: sequencer.c:4489
-msgid "could not read 'onto'"
-msgstr ""
-
-#: sequencer.c:4503
-#, c-format
-msgid "could not update HEAD to %s"
-msgstr ""
-
-#: sequencer.c:4563
-#, c-format
-msgid "Successfully rebased and updated %s.\n"
-msgstr ""
-
-#: sequencer.c:4615
-msgid "cannot rebase: You have unstaged changes."
-msgstr ""
-
-#: sequencer.c:4624
-msgid "cannot amend non-existing commit"
-msgstr ""
-
-#: sequencer.c:4626
-#, c-format
-msgid "invalid file: '%s'"
-msgstr ""
-
-#: sequencer.c:4628
-#, c-format
-msgid "invalid contents: '%s'"
-msgstr ""
-
-#: sequencer.c:4631
-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:4667 sequencer.c:4706
-#, c-format
-msgid "could not write file: '%s'"
-msgstr ""
-
-#: sequencer.c:4722
-msgid "could not remove CHERRY_PICK_HEAD"
-msgstr ""
-
-#: sequencer.c:4732
-msgid "could not commit staged changes."
-msgstr ""
-
-#: sequencer.c:4852
-#, c-format
-msgid "%s: can't cherry-pick a %s"
-msgstr ""
-
-#: sequencer.c:4856
-#, c-format
-msgid "%s: bad revision"
-msgstr ""
-
-#: sequencer.c:4891
-msgid "can't revert as initial commit"
-msgstr ""
-
-#: sequencer.c:5162 sequencer.c:5391
-#, c-format
-msgid "skipped previously applied commit %s"
-msgstr ""
-
-#: sequencer.c:5232 sequencer.c:5407
-msgid "use --reapply-cherry-picks to include skipped commits"
-msgstr ""
-
-#: sequencer.c:5378
-msgid "make_script: unhandled options"
-msgstr ""
-
-#: sequencer.c:5381
-msgid "make_script: error preparing revisions"
-msgstr ""
-
-#: sequencer.c:5639 sequencer.c:5656
-msgid "nothing to do"
-msgstr ""
-
-#: sequencer.c:5675
-msgid "could not skip unnecessary pick commands"
-msgstr ""
-
-#: sequencer.c:5775
-msgid "the script was already rearranged."
-msgstr ""
-
-#: setup.c:135
-#, c-format
-msgid "'%s' is outside repository at '%s'"
-msgstr ""
-
-#: setup.c:187
-#, c-format
-msgid ""
-"%s: no such path in the working tree.\n"
-"Use 'git <command> -- <path>...' to specify paths that do not exist locally."
-msgstr ""
-
-#: setup.c:200
-#, c-format
-msgid ""
-"ambiguous argument '%s': unknown revision or path not in the working tree.\n"
-"Use '--' to separate paths from revisions, like this:\n"
-"'git <command> [<revision>...] -- [<file>...]'"
-msgstr ""
-
-#: setup.c:266
-#, c-format
-msgid "option '%s' must come before non-option arguments"
-msgstr ""
-
-#: setup.c:285
-#, c-format
-msgid ""
-"ambiguous argument '%s': both revision and filename\n"
-"Use '--' to separate paths from revisions, like this:\n"
-"'git <command> [<revision>...] -- [<file>...]'"
-msgstr ""
-
-#: setup.c:421
-msgid "unable to set up work tree using invalid config"
-msgstr ""
-
-#: setup.c:425 builtin/rev-parse.c:895
-msgid "this operation must be run in a work tree"
-msgstr ""
-
-#: setup.c:724
-#, c-format
-msgid "Expected git repo version <= %d, found %d"
-msgstr ""
-
-#: setup.c:732
-msgid "unknown repository extension found:"
-msgid_plural "unknown repository extensions found:"
-msgstr[0] ""
-msgstr[1] ""
-
-#: setup.c:746
-msgid "repo version is 0, but v1-only extension found:"
-msgid_plural "repo version is 0, but v1-only extensions found:"
-msgstr[0] ""
-msgstr[1] ""
-
-#: setup.c:767
-#, c-format
-msgid "error opening '%s'"
-msgstr ""
-
-#: setup.c:769
-#, c-format
-msgid "too large to be a .git file: '%s'"
-msgstr ""
-
-#: setup.c:771
-#, c-format
-msgid "error reading %s"
-msgstr ""
-
-#: setup.c:773
-#, c-format
-msgid "invalid gitfile format: %s"
-msgstr ""
-
-#: setup.c:775
-#, c-format
-msgid "no path in gitfile: %s"
-msgstr ""
-
-#: setup.c:777
-#, c-format
-msgid "not a git repository: %s"
-msgstr ""
-
-#: setup.c:879
-#, c-format
-msgid "'$%s' too big"
-msgstr ""
-
-#: setup.c:893
-#, c-format
-msgid "not a git repository: '%s'"
-msgstr ""
-
-#: setup.c:922 setup.c:924 setup.c:955
-#, c-format
-msgid "cannot chdir to '%s'"
-msgstr ""
-
-#: setup.c:927 setup.c:983 setup.c:993 setup.c:1032 setup.c:1040
-msgid "cannot come back to cwd"
-msgstr ""
-
-#: setup.c:1054
-#, c-format
-msgid "failed to stat '%*s%s%s'"
-msgstr ""
-
-#: setup.c:1338
-msgid "Unable to read current working directory"
-msgstr ""
-
-#: setup.c:1347 setup.c:1353
-#, c-format
-msgid "cannot change to '%s'"
-msgstr ""
-
-#: setup.c:1358
-#, c-format
-msgid "not a git repository (or any of the parent directories): %s"
-msgstr ""
-
-#: setup.c:1364
-#, 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 ""
-
-#: setup.c:1374
-#, c-format
-msgid ""
-"unsafe repository ('%s' is owned by someone else)\n"
-"To add an exception for this directory, call:\n"
-"\n"
-"\tgit config --global --add safe.directory %s"
-msgstr ""
-
-#: setup.c:1502
-#, c-format
-msgid ""
-"problem with core.sharedRepository filemode value (0%.3o).\n"
-"The owner of files must always have read and write permissions."
-msgstr ""
-
-#: setup.c:1564
-msgid "fork failed"
-msgstr ""
-
-#: setup.c:1569
-msgid "setsid failed"
-msgstr ""
-
-#: sparse-index.c:285
-#, c-format
-msgid "index entry is a directory, but not sparse (%08x)"
-msgstr ""
-
-#: split-index.c:9
-msgid "cannot use split index with a sparse index"
-msgstr ""
-
-#. TRANSLATORS: IEC 80000-13:2008 gibibyte
-#: strbuf.c:851
-#, c-format
-msgid "%u.%2.2u GiB"
-msgstr ""
-
-#. TRANSLATORS: IEC 80000-13:2008 gibibyte/second
-#: strbuf.c:853
-#, c-format
-msgid "%u.%2.2u GiB/s"
-msgstr ""
-
-#. TRANSLATORS: IEC 80000-13:2008 mebibyte
-#: strbuf.c:861
-#, c-format
-msgid "%u.%2.2u MiB"
-msgstr ""
-
-#. TRANSLATORS: IEC 80000-13:2008 mebibyte/second
-#: strbuf.c:863
-#, c-format
-msgid "%u.%2.2u MiB/s"
-msgstr ""
-
-#. TRANSLATORS: IEC 80000-13:2008 kibibyte
-#: strbuf.c:870
-#, c-format
-msgid "%u.%2.2u KiB"
-msgstr ""
-
-#. TRANSLATORS: IEC 80000-13:2008 kibibyte/second
-#: strbuf.c:872
-#, c-format
-msgid "%u.%2.2u KiB/s"
-msgstr ""
-
-#. TRANSLATORS: IEC 80000-13:2008 byte
-#: strbuf.c:878
-#, c-format
-msgid "%u byte"
-msgid_plural "%u bytes"
-msgstr[0] ""
-msgstr[1] ""
-
-#. TRANSLATORS: IEC 80000-13:2008 byte/second
-#: strbuf.c:880
-#, c-format
-msgid "%u byte/s"
-msgid_plural "%u bytes/s"
-msgstr[0] ""
-msgstr[1] ""
-
-#: strbuf.c:1187 wrapper.c:217 wrapper.c:387 builtin/am.c:766
-#: builtin/rebase.c:653
-#, c-format
-msgid "could not open '%s' for writing"
-msgstr ""
-
-#: strbuf.c:1196
-#, c-format
-msgid "could not edit '%s'"
-msgstr ""
-
-#: submodule-config.c:238
-#, c-format
-msgid "ignoring suspicious submodule name: %s"
-msgstr ""
-
-#: submodule-config.c:305
-msgid "negative values not allowed for submodule.fetchjobs"
-msgstr ""
-
-#: submodule-config.c:403
-#, c-format
-msgid "ignoring '%s' which may be interpreted as a command-line option: %s"
-msgstr ""
-
-#: submodule-config.c:500 builtin/push.c:489 builtin/send-pack.c:148
-#, c-format
-msgid "invalid value for '%s'"
-msgstr ""
-
-#: submodule-config.c:828
-#, c-format
-msgid "Could not update .gitmodules entry %s"
-msgstr ""
-
-#: submodule.c:115 submodule.c:144
-msgid "Cannot change unmerged .gitmodules, resolve merge conflicts first"
-msgstr ""
-
-#: submodule.c:119 submodule.c:148
-#, c-format
-msgid "Could not find section in .gitmodules where path=%s"
-msgstr ""
-
-#: submodule.c:155
-#, c-format
-msgid "Could not remove .gitmodules entry for %s"
-msgstr ""
-
-#: submodule.c:166
-msgid "staging updated .gitmodules failed"
-msgstr ""
-
-#: submodule.c:346
-#, c-format
-msgid "in unpopulated submodule '%s'"
-msgstr ""
-
-#: submodule.c:377
-#, c-format
-msgid "Pathspec '%s' is in submodule '%.*s'"
-msgstr ""
-
-#: submodule.c:454
-#, c-format
-msgid "bad --ignore-submodules argument: %s"
-msgstr ""
-
-#: submodule.c:866
-#, c-format
-msgid ""
-"Submodule in commit %s at path: '%s' collides with a submodule named the "
-"same. Skipping it."
-msgstr ""
-
-#: submodule.c:987
-#, c-format
-msgid "submodule entry '%s' (%s) is a %s, not a commit"
-msgstr ""
-
-#: submodule.c:1069
-#, c-format
-msgid ""
-"Could not run 'git rev-list <commits> --not --remotes -n 1' command in "
-"submodule %s"
-msgstr ""
-
-#: submodule.c:1192
-#, c-format
-msgid "process for submodule '%s' failed"
-msgstr ""
-
-#: submodule.c:1221 builtin/branch.c:714 builtin/submodule--helper.c:2827
-msgid "Failed to resolve HEAD as a valid ref."
-msgstr ""
-
-#: submodule.c:1232
-#, c-format
-msgid "Pushing submodule '%s'\n"
-msgstr ""
-
-#: submodule.c:1235
-#, c-format
-msgid "Unable to push submodule '%s'\n"
-msgstr ""
-
-#: submodule.c:1567
-#, c-format
-msgid "Fetching submodule %s%s\n"
-msgstr ""
-
-#: submodule.c:1589
-#, c-format
-msgid "Could not access submodule '%s'\n"
-msgstr ""
-
-#: submodule.c:1618
-#, c-format
-msgid "Could not access submodule '%s' at commit %s\n"
-msgstr ""
-
-#: submodule.c:1629
-#, c-format
-msgid "Fetching submodule %s%s at commit %s\n"
-msgstr ""
-
-#: submodule.c:1849
-#, c-format
-msgid ""
-"Errors during submodule fetch:\n"
-"%s"
-msgstr ""
-
-#: submodule.c:1874
-#, c-format
-msgid "'%s' not recognized as a git repository"
-msgstr ""
-
-#: submodule.c:1891
-#, c-format
-msgid "Could not run 'git status --porcelain=2' in submodule %s"
-msgstr ""
-
-#: submodule.c:1932
-#, c-format
-msgid "'git status --porcelain=2' failed in submodule %s"
-msgstr ""
-
-#: submodule.c:2007
-#, c-format
-msgid "could not start 'git status' in submodule '%s'"
-msgstr ""
-
-#: submodule.c:2020
-#, c-format
-msgid "could not run 'git status' in submodule '%s'"
-msgstr ""
-
-#: submodule.c:2037
-#, c-format
-msgid "Could not unset core.worktree setting in submodule '%s'"
-msgstr ""
-
-#: submodule.c:2064 submodule.c:2379
-#, c-format
-msgid "could not recurse into submodule '%s'"
-msgstr ""
-
-#: submodule.c:2086
-msgid "could not reset submodule index"
-msgstr ""
-
-#: submodule.c:2128
-#, c-format
-msgid "submodule '%s' has dirty index"
-msgstr ""
-
-#: submodule.c:2182
-#, c-format
-msgid "Submodule '%s' could not be updated."
-msgstr ""
-
-#: submodule.c:2250
-#, c-format
-msgid "submodule git dir '%s' is inside git dir '%.*s'"
-msgstr ""
-
-#: submodule.c:2271
-#, c-format
-msgid ""
-"relocate_gitdir for submodule '%s' with more than one worktree not supported"
-msgstr ""
-
-#: submodule.c:2283 submodule.c:2343
-#, c-format
-msgid "could not lookup name for submodule '%s'"
-msgstr ""
-
-#: submodule.c:2287
-#, c-format
-msgid "refusing to move '%s' into an existing git dir"
-msgstr ""
-
-#: submodule.c:2293
-#, c-format
-msgid ""
-"Migrating git directory of '%s%s' from\n"
-"'%s' to\n"
-"'%s'\n"
-msgstr ""
-
-#: submodule.c:2424
-msgid "could not start ls-files in .."
-msgstr ""
-
-#: submodule.c:2464
-#, c-format
-msgid "ls-tree returned unexpected return code %d"
-msgstr ""
-
-#: symlinks.c:244
-#, c-format
-msgid "failed to lstat '%s'"
-msgstr ""
-
-#: trailer.c:244
-#, c-format
-msgid "running trailer command '%s' failed"
-msgstr ""
-
-#: 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 ""
-
-#: trailer.c:547 trailer.c:552 trailer.c:557 builtin/remote.c:300
-#: builtin/remote.c:328
-#, c-format
-msgid "more than one %s"
-msgstr ""
-
-#: trailer.c:743
-#, c-format
-msgid "empty trailer token in trailer '%.*s'"
-msgstr ""
-
-#: trailer.c:763
-#, c-format
-msgid "could not read input file '%s'"
-msgstr ""
-
-#: trailer.c:766 builtin/mktag.c:88 imap-send.c:1563
-msgid "could not read from stdin"
-msgstr ""
-
-#: trailer.c:1024 wrapper.c:760
-#, c-format
-msgid "could not stat %s"
-msgstr ""
-
-#: trailer.c:1026
-#, c-format
-msgid "file %s is not a regular file"
-msgstr ""
-
-#: trailer.c:1028
-#, c-format
-msgid "file %s is not writable by user"
-msgstr ""
-
-#: trailer.c:1040
-msgid "could not open temporary file"
-msgstr ""
-
-#: trailer.c:1080
-#, c-format
-msgid "could not rename temporary file to %s"
-msgstr ""
-
-#: transport-helper.c:62 transport-helper.c:91
-msgid "full write to remote helper failed"
-msgstr ""
-
-#: transport-helper.c:145
-#, c-format
-msgid "unable to find remote helper for '%s'"
-msgstr ""
-
-#: transport-helper.c:161 transport-helper.c:575
-msgid "can't dup helper output fd"
-msgstr ""
-
-#: transport-helper.c:214
-#, c-format
-msgid ""
-"unknown mandatory capability %s; this remote helper probably needs newer "
-"version of Git"
-msgstr ""
-
-#: transport-helper.c:220
-msgid "this remote helper should implement refspec capability"
-msgstr ""
-
-#: transport-helper.c:287 transport-helper.c:429
-#, c-format
-msgid "%s unexpectedly said: '%s'"
-msgstr ""
-
-#: transport-helper.c:417
-#, c-format
-msgid "%s also locked %s"
-msgstr ""
-
-#: transport-helper.c:497
-msgid "couldn't run fast-import"
-msgstr ""
-
-#: transport-helper.c:520
-msgid "error while running fast-import"
-msgstr ""
-
-#: transport-helper.c:549 transport-helper.c:1254
-#, c-format
-msgid "could not read ref %s"
-msgstr ""
-
-#: transport-helper.c:594
-#, c-format
-msgid "unknown response to connect: %s"
-msgstr ""
-
-#: transport-helper.c:616
-msgid "setting remote service path not supported by protocol"
-msgstr ""
-
-#: transport-helper.c:618
-msgid "invalid remote service path"
-msgstr ""
-
-#: transport-helper.c:661 transport.c:1496
-msgid "operation not supported by protocol"
-msgstr ""
-
-#: transport-helper.c:664
-#, c-format
-msgid "can't connect to subservice %s"
-msgstr ""
-
-#: transport-helper.c:693 transport.c:415
-msgid "--negotiate-only requires protocol v2"
-msgstr ""
-
-#: transport-helper.c:758
-msgid "'option' without a matching 'ok/error' directive"
-msgstr ""
-
-#: transport-helper.c:801
-#, c-format
-msgid "expected ok/error, helper said '%s'"
-msgstr ""
-
-#: transport-helper.c:862
-#, c-format
-msgid "helper reported unexpected status of %s"
-msgstr ""
-
-#: transport-helper.c:945
-#, c-format
-msgid "helper %s does not support dry-run"
-msgstr ""
-
-#: transport-helper.c:948
-#, c-format
-msgid "helper %s does not support --signed"
-msgstr ""
-
-#: transport-helper.c:951
-#, c-format
-msgid "helper %s does not support --signed=if-asked"
-msgstr ""
-
-#: transport-helper.c:956
-#, c-format
-msgid "helper %s does not support --atomic"
-msgstr ""
-
-#: transport-helper.c:960
-#, c-format
-msgid "helper %s does not support --%s"
-msgstr ""
-
-#: transport-helper.c:967
-#, c-format
-msgid "helper %s does not support 'push-option'"
-msgstr ""
-
-#: transport-helper.c:1067
-msgid "remote-helper doesn't support push; refspec needed"
-msgstr ""
-
-#: transport-helper.c:1072
-#, c-format
-msgid "helper %s does not support 'force'"
-msgstr ""
-
-#: transport-helper.c:1119
-msgid "couldn't run fast-export"
-msgstr ""
-
-#: transport-helper.c:1124
-msgid "error while running fast-export"
-msgstr ""
-
-#: transport-helper.c:1149
-#, c-format
-msgid ""
-"No refs in common and none specified; doing nothing.\n"
-"Perhaps you should specify a branch.\n"
-msgstr ""
-
-#: transport-helper.c:1231
-#, c-format
-msgid "unsupported object format '%s'"
-msgstr ""
-
-#: transport-helper.c:1240
-#, c-format
-msgid "malformed response in ref list: %s"
-msgstr ""
-
-#: transport-helper.c:1392
-#, c-format
-msgid "read(%s) failed"
-msgstr ""
-
-#: transport-helper.c:1419
-#, c-format
-msgid "write(%s) failed"
-msgstr ""
-
-#: transport-helper.c:1468
-#, c-format
-msgid "%s thread failed"
-msgstr ""
-
-#: transport-helper.c:1472
-#, c-format
-msgid "%s thread failed to join: %s"
-msgstr ""
-
-#: transport-helper.c:1491 transport-helper.c:1495
-#, c-format
-msgid "can't start thread for copying data: %s"
-msgstr ""
-
-#: transport-helper.c:1532
-#, c-format
-msgid "%s process failed to wait"
-msgstr ""
-
-#: transport-helper.c:1536
-#, c-format
-msgid "%s process failed"
-msgstr ""
-
-#: transport-helper.c:1554 transport-helper.c:1563
-msgid "can't start thread for copying data"
-msgstr ""
-
-#: transport.c:116
-#, c-format
-msgid "Would set upstream of '%s' to '%s' of '%s'\n"
-msgstr ""
-
-#: transport.c:138
-#, c-format
-msgid "could not read bundle '%s'"
-msgstr ""
-
-#: transport.c:234
-#, c-format
-msgid "transport: invalid depth option '%s'"
-msgstr ""
-
-#: transport.c:289
-msgid "see protocol.version in 'git help config' for more details"
-msgstr ""
-
-#: transport.c:290
-msgid "server options require protocol version 2 or later"
-msgstr ""
-
-#: transport.c:418
-msgid "server does not support wait-for-done"
-msgstr ""
-
-#: transport.c:770
-msgid "could not parse transport.color.* config"
-msgstr ""
-
-#: transport.c:845
-msgid "support for protocol v2 not implemented yet"
-msgstr ""
-
-#: transport.c:978
-#, c-format
-msgid "unknown value for config '%s': %s"
-msgstr ""
-
-#: transport.c:1044
-#, c-format
-msgid "transport '%s' not allowed"
-msgstr ""
-
-#: transport.c:1093
-msgid "git-over-rsync is no longer supported"
-msgstr ""
-
-#: transport.c:1196
-#, c-format
-msgid ""
-"The following submodule paths contain changes that can\n"
-"not be found on any remote:\n"
-msgstr ""
-
-#: transport.c:1200
-#, c-format
-msgid ""
-"\n"
-"Please try\n"
-"\n"
-"\tgit push --recurse-submodules=on-demand\n"
-"\n"
-"or cd to the path and use\n"
-"\n"
-"\tgit push\n"
-"\n"
-"to push them to a remote.\n"
-"\n"
-msgstr ""
-
-#: transport.c:1208
-msgid "Aborting."
-msgstr ""
-
-#: transport.c:1354
-msgid "failed to push all needed submodules"
-msgstr ""
-
-#: tree-walk.c:33
-msgid "too-short tree object"
-msgstr ""
-
-#: tree-walk.c:39
-msgid "malformed mode in tree entry"
-msgstr ""
-
-#: tree-walk.c:43
-msgid "empty filename in tree entry"
-msgstr ""
-
-#: tree-walk.c:118
-msgid "too-short tree file"
-msgstr ""
-
-#: unpack-trees.c:118
-#, c-format
-msgid ""
-"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 ""
-
-#: unpack-trees.c:120
-#, c-format
-msgid ""
-"Your local changes to the following files would be overwritten by checkout:\n"
-"%%s"
-msgstr ""
-
-#: unpack-trees.c:123
-#, c-format
-msgid ""
-"Your local changes to the following files would be overwritten by merge:\n"
-"%%sPlease commit your changes or stash them before you merge."
-msgstr ""
-
-#: unpack-trees.c:125
-#, c-format
-msgid ""
-"Your local changes to the following files would be overwritten by merge:\n"
-"%%s"
-msgstr ""
-
-#: unpack-trees.c:128
-#, c-format
-msgid ""
-"Your local changes to the following files would be overwritten by %s:\n"
-"%%sPlease commit your changes or stash them before you %s."
-msgstr ""
-
-#: unpack-trees.c:130
-#, c-format
-msgid ""
-"Your local changes to the following files would be overwritten by %s:\n"
-"%%s"
-msgstr ""
-
-#: unpack-trees.c:135
-#, c-format
-msgid ""
-"Updating the following directories would lose untracked files in them:\n"
-"%s"
-msgstr ""
-
-#: unpack-trees.c:138
-#, c-format
-msgid ""
-"Refusing to remove the current working directory:\n"
-"%s"
-msgstr ""
-
-#: unpack-trees.c:142
-#, c-format
-msgid ""
-"The following untracked working tree files would be removed by checkout:\n"
-"%%sPlease move or remove them before you switch branches."
-msgstr ""
-
-#: unpack-trees.c:144
-#, c-format
-msgid ""
-"The following untracked working tree files would be removed by checkout:\n"
-"%%s"
-msgstr ""
-
-#: unpack-trees.c:147
-#, c-format
-msgid ""
-"The following untracked working tree files would be removed by merge:\n"
-"%%sPlease move or remove them before you merge."
-msgstr ""
-
-#: unpack-trees.c:149
-#, c-format
-msgid ""
-"The following untracked working tree files would be removed by merge:\n"
-"%%s"
-msgstr ""
-
-#: unpack-trees.c:152
-#, c-format
-msgid ""
-"The following untracked working tree files would be removed by %s:\n"
-"%%sPlease move or remove them before you %s."
-msgstr ""
-
-#: unpack-trees.c:154
-#, c-format
-msgid ""
-"The following untracked working tree files would be removed by %s:\n"
-"%%s"
-msgstr ""
-
-#: unpack-trees.c:160
-#, c-format
-msgid ""
-"The following untracked working tree files would be overwritten by "
-"checkout:\n"
-"%%sPlease move or remove them before you switch branches."
-msgstr ""
-
-#: unpack-trees.c:162
-#, c-format
-msgid ""
-"The following untracked working tree files would be overwritten by "
-"checkout:\n"
-"%%s"
-msgstr ""
-
-#: unpack-trees.c:165
-#, c-format
-msgid ""
-"The following untracked working tree files would be overwritten by merge:\n"
-"%%sPlease move or remove them before you merge."
-msgstr ""
-
-#: unpack-trees.c:167
-#, c-format
-msgid ""
-"The following untracked working tree files would be overwritten by merge:\n"
-"%%s"
-msgstr ""
-
-#: unpack-trees.c:170
-#, c-format
-msgid ""
-"The following untracked working tree files would be overwritten by %s:\n"
-"%%sPlease move or remove them before you %s."
-msgstr ""
-
-#: unpack-trees.c:172
-#, c-format
-msgid ""
-"The following untracked working tree files would be overwritten by %s:\n"
-"%%s"
-msgstr ""
-
-#: unpack-trees.c:180
-#, c-format
-msgid "Entry '%s' overlaps with '%s'.  Cannot bind."
-msgstr ""
-
-#: unpack-trees.c:183
-#, c-format
-msgid ""
-"Cannot update submodule:\n"
-"%s"
-msgstr ""
-
-#: unpack-trees.c:186
-#, c-format
-msgid ""
-"The following paths are not up to date and were left despite sparse "
-"patterns:\n"
-"%s"
-msgstr ""
-
-#: unpack-trees.c:188
-#, c-format
-msgid ""
-"The following paths are unmerged and were left despite sparse patterns:\n"
-"%s"
-msgstr ""
-
-#: unpack-trees.c:190
-#, c-format
-msgid ""
-"The following paths were already present and thus not updated despite sparse "
-"patterns:\n"
-"%s"
-msgstr ""
-
-#: unpack-trees.c:270
-#, c-format
-msgid "Aborting\n"
-msgstr ""
-
-#: unpack-trees.c:297
-#, c-format
-msgid ""
-"After fixing the above paths, you may want to run `git sparse-checkout "
-"reapply`.\n"
-msgstr ""
-
-#: unpack-trees.c:358
-msgid "Updating files"
-msgstr ""
-
-#: unpack-trees.c:390
-msgid ""
-"the following paths have collided (e.g. case-sensitive paths\n"
-"on a case-insensitive filesystem) and only one from the same\n"
-"colliding group is in the working tree:\n"
-msgstr ""
-
-#: unpack-trees.c:1664
-msgid "Updating index flags"
-msgstr ""
-
-#: unpack-trees.c:2925
-#, c-format
-msgid "worktree and untracked commit have duplicate entries: %s"
-msgstr ""
-
-#: upload-pack.c:1579
-msgid "expected flush after fetch arguments"
-msgstr ""
-
-#: urlmatch.c:163
-msgid "invalid URL scheme name or missing '://' suffix"
-msgstr ""
-
-#: urlmatch.c:187 urlmatch.c:346 urlmatch.c:405
-#, c-format
-msgid "invalid %XX escape sequence"
-msgstr ""
-
-#: urlmatch.c:215
-msgid "missing host and scheme is not 'file:'"
-msgstr ""
-
-#: urlmatch.c:232
-msgid "a 'file:' URL may not have a port number"
-msgstr ""
-
-#: urlmatch.c:247
-msgid "invalid characters in host name"
-msgstr ""
-
-#: urlmatch.c:292 urlmatch.c:303
-msgid "invalid port number"
-msgstr ""
-
-#: urlmatch.c:371
-msgid "invalid '..' path segment"
-msgstr ""
-
-#: walker.c:170
-msgid "Fetching objects"
-msgstr ""
-
-#: worktree.c:237 builtin/am.c:2210 builtin/bisect--helper.c:156
-#, c-format
-msgid "failed to read '%s'"
-msgstr ""
-
-#: worktree.c:304
-#, c-format
-msgid "'%s' at main working tree is not the repository directory"
-msgstr ""
-
-#: worktree.c:315
-#, c-format
-msgid "'%s' file does not contain absolute path to the working tree location"
-msgstr ""
-
-#: worktree.c:327
-#, c-format
-msgid "'%s' does not exist"
-msgstr ""
-
-#: worktree.c:333
-#, c-format
-msgid "'%s' is not a .git file, error code %d"
-msgstr ""
-
-#: worktree.c:342
-#, c-format
-msgid "'%s' does not point back to '%s'"
-msgstr ""
-
-#: worktree.c:600
-msgid "not a directory"
-msgstr ""
-
-#: worktree.c:609
-msgid ".git is not a file"
-msgstr ""
-
-#: worktree.c:611
-msgid ".git file broken"
-msgstr ""
-
-#: worktree.c:613
-msgid ".git file incorrect"
-msgstr ""
-
-#: worktree.c:719
-msgid "not a valid path"
-msgstr ""
-
-#: worktree.c:725
-msgid "unable to locate repository; .git is not a file"
-msgstr ""
-
-#: worktree.c:729
-msgid "unable to locate repository; .git file does not reference a repository"
-msgstr ""
-
-#: worktree.c:733
-msgid "unable to locate repository; .git file broken"
-msgstr ""
-
-#: worktree.c:739
-msgid "gitdir unreadable"
-msgstr ""
-
-#: worktree.c:743
-msgid "gitdir incorrect"
-msgstr ""
-
-#: worktree.c:768
-msgid "not a valid directory"
-msgstr ""
-
-#: worktree.c:774
-msgid "gitdir file does not exist"
-msgstr ""
-
-#: worktree.c:779 worktree.c:788
-#, c-format
-msgid "unable to read gitdir file (%s)"
-msgstr ""
-
-#: worktree.c:798
-#, c-format
-msgid "short read (expected %<PRIuMAX> bytes, read %<PRIuMAX>)"
-msgstr ""
-
-#: worktree.c:806
-msgid "invalid gitdir file"
-msgstr ""
-
-#: worktree.c:814
-msgid "gitdir file points to non-existent location"
-msgstr ""
-
-#: worktree.c:830
-#, c-format
-msgid "unable to set %s in '%s'"
-msgstr ""
-
-#: worktree.c:832
-#, c-format
-msgid "unable to unset %s in '%s'"
-msgstr ""
-
-#: worktree.c:852
-msgid "failed to set extensions.worktreeConfig setting"
-msgstr ""
-
-#: wrapper.c:161
-#, c-format
-msgid "could not setenv '%s'"
-msgstr ""
-
-#: wrapper.c:213
-#, c-format
-msgid "unable to create '%s'"
-msgstr ""
-
-#: wrapper.c:215 wrapper.c:385
-#, c-format
-msgid "could not open '%s' for reading and writing"
-msgstr ""
-
-#: wrapper.c:416 wrapper.c:683
-#, c-format
-msgid "unable to access '%s'"
-msgstr ""
-
-#: wrapper.c:691
-msgid "unable to get current working directory"
-msgstr ""
-
-#: wt-status.c:158
-msgid "Unmerged paths:"
-msgstr ""
-
-#: wt-status.c:187 wt-status.c:219
-msgid "  (use \"git restore --staged <file>...\" to unstage)"
-msgstr ""
-
-#: wt-status.c:190 wt-status.c:222
-#, c-format
-msgid "  (use \"git restore --source=%s --staged <file>...\" to unstage)"
-msgstr ""
-
-#: wt-status.c:193 wt-status.c:225
-msgid "  (use \"git rm --cached <file>...\" to unstage)"
-msgstr ""
-
-#: wt-status.c:197
-msgid "  (use \"git add <file>...\" to mark resolution)"
-msgstr ""
-
-#: wt-status.c:199 wt-status.c:203
-msgid "  (use \"git add/rm <file>...\" as appropriate to mark resolution)"
-msgstr ""
-
-#: wt-status.c:201
-msgid "  (use \"git rm <file>...\" to mark resolution)"
-msgstr ""
-
-#: wt-status.c:211 wt-status.c:1140
-msgid "Changes to be committed:"
-msgstr ""
-
-#: wt-status.c:234 wt-status.c:1149
-msgid "Changes not staged for commit:"
-msgstr ""
-
-#: wt-status.c:238
-msgid "  (use \"git add <file>...\" to update what will be committed)"
-msgstr ""
-
-#: wt-status.c:240
-msgid "  (use \"git add/rm <file>...\" to update what will be committed)"
-msgstr ""
-
-#: wt-status.c:241
-msgid ""
-"  (use \"git restore <file>...\" to discard changes in working directory)"
-msgstr ""
-
-#: wt-status.c:243
-msgid "  (commit or discard the untracked or modified content in submodules)"
-msgstr ""
-
-#: wt-status.c:254
-#, c-format
-msgid "  (use \"git %s <file>...\" to include in what will be committed)"
-msgstr ""
-
-#: wt-status.c:266
-msgid "both deleted:"
-msgstr ""
-
-#: wt-status.c:268
-msgid "added by us:"
-msgstr ""
-
-#: wt-status.c:270
-msgid "deleted by them:"
-msgstr ""
-
-#: wt-status.c:272
-msgid "added by them:"
-msgstr ""
-
-#: wt-status.c:274
-msgid "deleted by us:"
-msgstr ""
-
-#: wt-status.c:276
-msgid "both added:"
-msgstr ""
-
-#: wt-status.c:278
-msgid "both modified:"
-msgstr ""
-
-#: wt-status.c:288
-msgid "new file:"
-msgstr ""
-
-#: wt-status.c:290
-msgid "copied:"
-msgstr ""
-
-#: wt-status.c:292
-msgid "deleted:"
-msgstr ""
-
-#: wt-status.c:294
-msgid "modified:"
-msgstr ""
-
-#: wt-status.c:296
-msgid "renamed:"
-msgstr ""
-
-#: wt-status.c:298
-msgid "typechange:"
-msgstr ""
-
-#: wt-status.c:300
-msgid "unknown:"
-msgstr ""
-
-#: wt-status.c:302
-msgid "unmerged:"
-msgstr ""
-
-#: wt-status.c:382
-msgid "new commits, "
-msgstr ""
-
-#: wt-status.c:384
-msgid "modified content, "
-msgstr ""
-
-#: wt-status.c:386
-msgid "untracked content, "
-msgstr ""
-
-#: wt-status.c:973
-#, c-format
-msgid "Your stash currently has %d entry"
-msgid_plural "Your stash currently has %d entries"
-msgstr[0] ""
-msgstr[1] ""
-
-#: wt-status.c:1004
-msgid "Submodules changed but not updated:"
-msgstr ""
-
-#: wt-status.c:1006
-msgid "Submodule changes to be committed:"
-msgstr ""
-
-#: wt-status.c:1088
-msgid ""
-"Do not modify or remove the line above.\n"
-"Everything below it will be ignored."
-msgstr ""
-
-#: wt-status.c:1180
-#, c-format
-msgid ""
-"\n"
-"It took %.2f seconds to compute the branch ahead/behind values.\n"
-"You can use '--no-ahead-behind' to avoid this.\n"
-msgstr ""
-
-#: wt-status.c:1210
-msgid "You have unmerged paths."
-msgstr ""
-
-#: wt-status.c:1213
-msgid "  (fix conflicts and run \"git commit\")"
-msgstr ""
-
-#: wt-status.c:1215
-msgid "  (use \"git merge --abort\" to abort the merge)"
-msgstr ""
-
-#: wt-status.c:1219
-msgid "All conflicts fixed but you are still merging."
-msgstr ""
-
-#: wt-status.c:1222
-msgid "  (use \"git commit\" to conclude merge)"
-msgstr ""
-
-#: wt-status.c:1233
-msgid "You are in the middle of an am session."
-msgstr ""
-
-#: wt-status.c:1236
-msgid "The current patch is empty."
-msgstr ""
-
-#: wt-status.c:1241
-msgid "  (fix conflicts and then run \"git am --continue\")"
-msgstr ""
-
-#: wt-status.c:1243
-msgid "  (use \"git am --skip\" to skip this patch)"
-msgstr ""
-
-#: wt-status.c:1246
-msgid ""
-"  (use \"git am --allow-empty\" to record this patch as an empty commit)"
-msgstr ""
-
-#: wt-status.c:1248
-msgid "  (use \"git am --abort\" to restore the original branch)"
-msgstr ""
-
-#: wt-status.c:1381
-msgid "git-rebase-todo is missing."
-msgstr ""
-
-#: wt-status.c:1383
-msgid "No commands done."
-msgstr ""
-
-#: wt-status.c:1386
-#, c-format
-msgid "Last command done (%<PRIuMAX> command done):"
-msgid_plural "Last commands done (%<PRIuMAX> commands done):"
-msgstr[0] ""
-msgstr[1] ""
-
-#: wt-status.c:1397
-#, c-format
-msgid "  (see more in file %s)"
-msgstr ""
-
-#: wt-status.c:1402
-msgid "No commands remaining."
-msgstr ""
-
-#: wt-status.c:1405
-#, c-format
-msgid "Next command to do (%<PRIuMAX> remaining command):"
-msgid_plural "Next commands to do (%<PRIuMAX> remaining commands):"
-msgstr[0] ""
-msgstr[1] ""
-
-#: wt-status.c:1413
-msgid "  (use \"git rebase --edit-todo\" to view and edit)"
-msgstr ""
-
-#: wt-status.c:1425
-#, c-format
-msgid "You are currently rebasing branch '%s' on '%s'."
-msgstr ""
-
-#: wt-status.c:1430
-msgid "You are currently rebasing."
-msgstr ""
-
-#: wt-status.c:1443
-msgid "  (fix conflicts and then run \"git rebase --continue\")"
-msgstr ""
-
-#: wt-status.c:1445
-msgid "  (use \"git rebase --skip\" to skip this patch)"
-msgstr ""
-
-#: wt-status.c:1447
-msgid "  (use \"git rebase --abort\" to check out the original branch)"
-msgstr ""
-
-#: wt-status.c:1454
-msgid "  (all conflicts fixed: run \"git rebase --continue\")"
-msgstr ""
-
-#: wt-status.c:1458
-#, c-format
-msgid ""
-"You are currently splitting a commit while rebasing branch '%s' on '%s'."
-msgstr ""
-
-#: wt-status.c:1463
-msgid "You are currently splitting a commit during a rebase."
-msgstr ""
-
-#: wt-status.c:1466
-msgid "  (Once your working directory is clean, run \"git rebase --continue\")"
-msgstr ""
-
-#: wt-status.c:1470
-#, c-format
-msgid "You are currently editing a commit while rebasing branch '%s' on '%s'."
-msgstr ""
-
-#: wt-status.c:1475
-msgid "You are currently editing a commit during a rebase."
-msgstr ""
-
-#: wt-status.c:1478
-msgid "  (use \"git commit --amend\" to amend the current commit)"
-msgstr ""
-
-#: wt-status.c:1480
-msgid ""
-"  (use \"git rebase --continue\" once you are satisfied with your changes)"
-msgstr ""
-
-#: wt-status.c:1491
-msgid "Cherry-pick currently in progress."
-msgstr ""
-
-#: wt-status.c:1494
-#, c-format
-msgid "You are currently cherry-picking commit %s."
-msgstr ""
-
-#: wt-status.c:1501
-msgid "  (fix conflicts and run \"git cherry-pick --continue\")"
-msgstr ""
-
-#: wt-status.c:1504
-msgid "  (run \"git cherry-pick --continue\" to continue)"
-msgstr ""
-
-#: wt-status.c:1507
-msgid "  (all conflicts fixed: run \"git cherry-pick --continue\")"
-msgstr ""
-
-#: wt-status.c:1509
-msgid "  (use \"git cherry-pick --skip\" to skip this patch)"
-msgstr ""
-
-#: wt-status.c:1511
-msgid "  (use \"git cherry-pick --abort\" to cancel the cherry-pick operation)"
-msgstr ""
-
-#: wt-status.c:1521
-msgid "Revert currently in progress."
-msgstr ""
-
-#: wt-status.c:1524
-#, c-format
-msgid "You are currently reverting commit %s."
-msgstr ""
-
-#: wt-status.c:1530
-msgid "  (fix conflicts and run \"git revert --continue\")"
-msgstr ""
-
-#: wt-status.c:1533
-msgid "  (run \"git revert --continue\" to continue)"
-msgstr ""
-
-#: wt-status.c:1536
-msgid "  (all conflicts fixed: run \"git revert --continue\")"
-msgstr ""
-
-#: wt-status.c:1538
-msgid "  (use \"git revert --skip\" to skip this patch)"
-msgstr ""
-
-#: wt-status.c:1540
-msgid "  (use \"git revert --abort\" to cancel the revert operation)"
-msgstr ""
-
-#: wt-status.c:1550
-#, c-format
-msgid "You are currently bisecting, started from branch '%s'."
-msgstr ""
-
-#: wt-status.c:1554
-msgid "You are currently bisecting."
-msgstr ""
-
-#: wt-status.c:1557
-msgid "  (use \"git bisect reset\" to get back to the original branch)"
-msgstr ""
-
-#: wt-status.c:1568
-msgid "You are in a sparse checkout."
-msgstr ""
-
-#: wt-status.c:1571
-#, c-format
-msgid "You are in a sparse checkout with %d%% of tracked files present."
-msgstr ""
-
-#: wt-status.c:1815
-msgid "On branch "
-msgstr ""
-
-#: wt-status.c:1822
-msgid "interactive rebase in progress; onto "
-msgstr ""
-
-#: wt-status.c:1824
-msgid "rebase in progress; onto "
-msgstr ""
-
-#: wt-status.c:1829
-msgid "HEAD detached at "
-msgstr ""
-
-#: wt-status.c:1831
-msgid "HEAD detached from "
-msgstr ""
-
-#: wt-status.c:1834
-msgid "Not currently on any branch."
-msgstr ""
-
-#: wt-status.c:1851
-msgid "Initial commit"
-msgstr ""
-
-#: wt-status.c:1852
-msgid "No commits yet"
-msgstr ""
-
-#: wt-status.c:1866
-msgid "Untracked files"
-msgstr ""
-
-#: wt-status.c:1868
-msgid "Ignored files"
-msgstr ""
-
-#: wt-status.c:1872
-#, c-format
-msgid ""
-"It took %.2f seconds to enumerate untracked files. 'status -uno'\n"
-"may speed it up, but you have to be careful not to forget to add\n"
-"new files yourself (see 'git help status')."
-msgstr ""
-
-#: wt-status.c:1878
-#, c-format
-msgid "Untracked files not listed%s"
-msgstr ""
-
-#: wt-status.c:1880
-msgid " (use -u option to show untracked files)"
-msgstr ""
-
-#: wt-status.c:1886
-msgid "No changes"
-msgstr ""
-
-#: wt-status.c:1891
-#, c-format
-msgid "no changes added to commit (use \"git add\" and/or \"git commit -a\")\n"
-msgstr ""
-
-#: wt-status.c:1895
-#, c-format
-msgid "no changes added to commit\n"
-msgstr ""
-
-#: wt-status.c:1899
-#, c-format
-msgid ""
-"nothing added to commit but untracked files present (use \"git add\" to "
-"track)\n"
-msgstr ""
-
-#: wt-status.c:1903
-#, c-format
-msgid "nothing added to commit but untracked files present\n"
-msgstr ""
-
-#: wt-status.c:1907
-#, c-format
-msgid "nothing to commit (create/copy files and use \"git add\" to track)\n"
-msgstr ""
-
-#: wt-status.c:1911 wt-status.c:1917
-#, c-format
-msgid "nothing to commit\n"
-msgstr ""
-
-#: wt-status.c:1914
-#, c-format
-msgid "nothing to commit (use -u to show untracked files)\n"
-msgstr ""
-
-#: wt-status.c:1919
-#, c-format
-msgid "nothing to commit, working tree clean\n"
-msgstr ""
-
-#: wt-status.c:2024
-msgid "No commits yet on "
-msgstr ""
-
-#: wt-status.c:2028
-msgid "HEAD (no branch)"
-msgstr ""
-
-#: wt-status.c:2059
-msgid "different"
-msgstr ""
-
-#: wt-status.c:2061 wt-status.c:2069
-msgid "behind "
-msgstr ""
-
-#: wt-status.c:2064 wt-status.c:2067
-msgid "ahead "
-msgstr ""
-
-#. TRANSLATORS: the action is e.g. "pull with rebase"
-#: wt-status.c:2605
-#, c-format
-msgid "cannot %s: You have unstaged changes."
-msgstr ""
-
-#: wt-status.c:2611
-msgid "additionally, your index contains uncommitted changes."
-msgstr ""
-
-#: wt-status.c:2613
-#, c-format
-msgid "cannot %s: Your index contains uncommitted changes."
-msgstr ""
-
-#: compat/simple-ipc/ipc-unix-socket.c:205
-msgid "could not send IPC command"
-msgstr ""
-
-#: compat/simple-ipc/ipc-unix-socket.c:212
-msgid "could not read IPC response"
-msgstr ""
-
-#: compat/simple-ipc/ipc-unix-socket.c:892
-#, c-format
-msgid "could not start accept_thread '%s'"
-msgstr ""
-
-#: compat/simple-ipc/ipc-unix-socket.c:904
-#, c-format
-msgid "could not start worker[0] for '%s'"
-msgstr ""
-
-#: compat/precompose_utf8.c:58 builtin/clone.c:353
-#, c-format
-msgid "failed to unlink '%s'"
-msgstr ""
-
-#: compat/fsmonitor/fsm-listen-darwin.c:355
-msgid "Unable to create FSEventStream."
-msgstr ""
-
-#: compat/fsmonitor/fsm-listen-darwin.c:403
-msgid "Failed to start the FSEventStream"
-msgstr ""
-
-#: builtin/add.c:26
-msgid "git add [<options>] [--] <pathspec>..."
-msgstr ""
-
-#: builtin/add.c:63
-#, c-format
-msgid "cannot chmod %cx '%s'"
-msgstr ""
-
-#: builtin/add.c:105
-#, c-format
-msgid "unexpected diff status %c"
-msgstr ""
-
-#: builtin/add.c:110 builtin/commit.c:299
-msgid "updating files failed"
-msgstr ""
-
-#: builtin/add.c:120
-#, c-format
-msgid "remove '%s'\n"
-msgstr ""
-
-#: builtin/add.c:204
-msgid "Unstaged changes after refreshing the index:"
-msgstr ""
-
-#: builtin/add.c:312 builtin/rev-parse.c:993
-msgid "Could not read the index"
-msgstr ""
-
-#: builtin/add.c:325
-msgid "Could not write patch"
-msgstr ""
-
-#: builtin/add.c:328
-msgid "editing patch failed"
-msgstr ""
-
-#: builtin/add.c:331
-#, c-format
-msgid "Could not stat '%s'"
-msgstr ""
-
-#: builtin/add.c:333
-msgid "Empty patch. Aborted."
-msgstr ""
-
-#: builtin/add.c:339
-#, c-format
-msgid "Could not apply '%s'"
-msgstr ""
-
-#: builtin/add.c:347
-msgid "The following paths are ignored by one of your .gitignore files:\n"
-msgstr ""
-
-#: builtin/add.c:367 builtin/clean.c:927 builtin/fetch.c:175 builtin/mv.c:124
-#: builtin/prune-packed.c:14 builtin/pull.c:208 builtin/push.c:550
-#: builtin/remote.c:1454 builtin/rm.c:244 builtin/send-pack.c:194
-msgid "dry run"
-msgstr ""
-
-#: builtin/add.c:368 builtin/check-ignore.c:22 builtin/commit.c:1483
-#: builtin/count-objects.c:98 builtin/fsck.c:789 builtin/log.c:2338
-#: builtin/mv.c:123 builtin/read-tree.c:120
-msgid "be verbose"
-msgstr ""
-
-#: builtin/add.c:370
-msgid "interactive picking"
-msgstr ""
-
-#: builtin/add.c:371 builtin/checkout.c:1599 builtin/reset.c:417
-msgid "select hunks interactively"
-msgstr ""
-
-#: builtin/add.c:372
-msgid "edit current diff and apply"
-msgstr ""
-
-#: builtin/add.c:373
-msgid "allow adding otherwise ignored files"
-msgstr ""
-
-#: builtin/add.c:374
-msgid "update tracked files"
-msgstr ""
-
-#: builtin/add.c:375
-msgid "renormalize EOL of tracked files (implies -u)"
-msgstr ""
-
-#: builtin/add.c:376
-msgid "record only the fact that the path will be added later"
-msgstr ""
-
-#: builtin/add.c:377
-msgid "add changes from all tracked and untracked files"
-msgstr ""
-
-#: builtin/add.c:380
-msgid "ignore paths removed in the working tree (same as --no-all)"
-msgstr ""
-
-#: builtin/add.c:382
-msgid "don't add, only refresh the index"
-msgstr ""
-
-#: builtin/add.c:383
-msgid "just skip files which cannot be added because of errors"
-msgstr ""
-
-#: builtin/add.c:384
-msgid "check if - even missing - files are ignored in dry run"
-msgstr ""
-
-#: builtin/add.c:385 builtin/mv.c:128 builtin/rm.c:251
-msgid "allow updating entries outside of the sparse-checkout cone"
-msgstr ""
-
-#: builtin/add.c:387 builtin/update-index.c:1023
-msgid "override the executable bit of the listed files"
-msgstr ""
-
-#: builtin/add.c:389
-msgid "warn when adding an embedded repository"
-msgstr ""
-
-#: builtin/add.c:407
-#, c-format
-msgid ""
-"You've added another git repository inside your current repository.\n"
-"Clones of the outer repository will not contain the contents of\n"
-"the embedded repository and will not know how to obtain it.\n"
-"If you meant to add a submodule, use:\n"
-"\n"
-"\tgit submodule add <url> %s\n"
-"\n"
-"If you added this path by mistake, you can remove it from the\n"
-"index with:\n"
-"\n"
-"\tgit rm --cached %s\n"
-"\n"
-"See \"git help submodule\" for more information."
-msgstr ""
-
-#: builtin/add.c:436
-#, c-format
-msgid "adding embedded git repository: %s"
-msgstr ""
-
-#: builtin/add.c:456
-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:471
-msgid "adding files failed"
-msgstr ""
-
-#: builtin/add.c:534
-#, c-format
-msgid "--chmod param '%s' must be either -x or +x"
-msgstr ""
-
-#: builtin/add.c:555 builtin/checkout.c:1770 builtin/commit.c:365
-#: builtin/reset.c:436 builtin/rm.c:275 builtin/stash.c:1702
-#, c-format
-msgid "'%s' and pathspec arguments cannot be used together"
-msgstr ""
-
-#: builtin/add.c:566
-#, c-format
-msgid "Nothing specified, nothing added.\n"
-msgstr ""
-
-#: builtin/add.c:568
-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:393
-msgid "could not parse author script"
-msgstr ""
-
-#: builtin/am.c:483
-#, c-format
-msgid "'%s' was deleted by the applypatch-msg hook"
-msgstr ""
-
-#: builtin/am.c:525
-#, c-format
-msgid "Malformed input line: '%s'."
-msgstr ""
-
-#: builtin/am.c:563
-#, c-format
-msgid "Failed to copy notes from '%s' to '%s'"
-msgstr ""
-
-#: builtin/am.c:589
-msgid "fseek failed"
-msgstr ""
-
-#: builtin/am.c:777
-#, c-format
-msgid "could not parse patch '%s'"
-msgstr ""
-
-#: builtin/am.c:842
-msgid "Only one StGIT patch series can be applied at once"
-msgstr ""
-
-#: builtin/am.c:890
-msgid "invalid timestamp"
-msgstr ""
-
-#: builtin/am.c:895 builtin/am.c:907
-msgid "invalid Date line"
-msgstr ""
-
-#: builtin/am.c:902
-msgid "invalid timezone offset"
-msgstr ""
-
-#: builtin/am.c:995
-msgid "Patch format detection failed."
-msgstr ""
-
-#: builtin/am.c:1000 builtin/clone.c:306
-#, c-format
-msgid "failed to create directory '%s'"
-msgstr ""
-
-#: builtin/am.c:1005
-msgid "Failed to split patches."
-msgstr ""
-
-#: builtin/am.c:1154
-#, c-format
-msgid "When you have resolved this problem, run \"%s --continue\"."
-msgstr ""
-
-#: builtin/am.c:1155
-#, c-format
-msgid "If you prefer to skip this patch, run \"%s --skip\" instead."
-msgstr ""
-
-#: builtin/am.c:1160
-#, c-format
-msgid "To record the empty patch as an empty commit, run \"%s --allow-empty\"."
-msgstr ""
-
-#: builtin/am.c:1162
-#, c-format
-msgid "To restore the original branch and stop patching, run \"%s --abort\"."
-msgstr ""
-
-#: builtin/am.c:1257
-msgid "Patch sent with format=flowed; space at the end of lines might be lost."
-msgstr ""
-
-#: builtin/am.c:1345
-#, c-format
-msgid "missing author line in commit %s"
-msgstr ""
-
-#: builtin/am.c:1348
-#, c-format
-msgid "invalid ident line: %.*s"
-msgstr ""
-
-#: builtin/am.c:1567
-msgid "Repository lacks necessary blobs to fall back on 3-way merge."
-msgstr ""
-
-#: builtin/am.c:1569
-msgid "Using index info to reconstruct a base tree..."
-msgstr ""
-
-#: builtin/am.c:1588
-msgid ""
-"Did you hand edit your patch?\n"
-"It does not apply to blobs recorded in its index."
-msgstr ""
-
-#: builtin/am.c:1594
-msgid "Falling back to patching base and 3-way merge..."
-msgstr ""
-
-#: builtin/am.c:1620
-msgid "Failed to merge in the changes."
-msgstr ""
-
-#: builtin/am.c:1652
-msgid "applying to an empty history"
-msgstr ""
-
-#: builtin/am.c:1704 builtin/am.c:1708
-#, c-format
-msgid "cannot resume: %s does not exist."
-msgstr ""
-
-#: builtin/am.c:1726
-msgid "Commit Body is:"
-msgstr ""
-
-#. TRANSLATORS: Make sure to include [y], [n], [e], [v] and [a]
-#. in your translation. The program will only accept English
-#. input at this point.
-#.
-#: builtin/am.c:1736
-#, c-format
-msgid "Apply? [y]es/[n]o/[e]dit/[v]iew patch/[a]ccept all: "
-msgstr ""
-
-#: builtin/am.c:1782 builtin/commit.c:410
-msgid "unable to write index file"
-msgstr ""
-
-#: builtin/am.c:1786
-#, c-format
-msgid "Dirty index: cannot apply patches (dirty: %s)"
-msgstr ""
-
-#: builtin/am.c:1828
-#, c-format
-msgid "Skipping: %.*s"
-msgstr ""
-
-#: builtin/am.c:1833
-#, c-format
-msgid "Creating an empty commit: %.*s"
-msgstr ""
-
-#: builtin/am.c:1837
-msgid "Patch is empty."
-msgstr ""
-
-#: builtin/am.c:1848 builtin/am.c:1917
-#, c-format
-msgid "Applying: %.*s"
-msgstr ""
-
-#: builtin/am.c:1865
-msgid "No changes -- Patch already applied."
-msgstr ""
-
-#: builtin/am.c:1871
-#, c-format
-msgid "Patch failed at %s %.*s"
-msgstr ""
-
-#: builtin/am.c:1875
-msgid "Use 'git am --show-current-patch=diff' to see the failed patch"
-msgstr ""
-
-#: builtin/am.c:1921
-msgid "No changes - recorded it as an empty commit."
-msgstr ""
-
-#: builtin/am.c:1923
-msgid ""
-"No changes - did you forget to use 'git add'?\n"
-"If there is nothing left to stage, chances are that something else\n"
-"already introduced the same changes; you might want to skip this patch."
-msgstr ""
-
-#: builtin/am.c:1931
-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 might run `git rm` on a file to accept \"deleted by them\" for it."
-msgstr ""
-
-#: builtin/am.c:2039 builtin/am.c:2043 builtin/am.c:2055 builtin/reset.c:455
-#: builtin/reset.c:463
-#, c-format
-msgid "Could not parse object '%s'."
-msgstr ""
-
-#: builtin/am.c:2091 builtin/am.c:2167
-msgid "failed to clean index"
-msgstr ""
-
-#: builtin/am.c:2135
-msgid ""
-"You seem to have moved HEAD since the last 'am' failure.\n"
-"Not rewinding to ORIG_HEAD"
-msgstr ""
-
-#: builtin/am.c:2292
-#, c-format
-msgid "options '%s=%s' and '%s=%s' cannot be used together"
-msgstr ""
-
-#: builtin/am.c:2323
-msgid "git am [<options>] [(<mbox> | <Maildir>)...]"
-msgstr ""
-
-#: builtin/am.c:2324
-msgid "git am [<options>] (--continue | --skip | --abort)"
-msgstr ""
-
-#: builtin/am.c:2330
-msgid "run interactively"
-msgstr ""
-
-#: builtin/am.c:2332
-msgid "historical option -- no-op"
-msgstr ""
-
-#: builtin/am.c:2334
-msgid "allow fall back on 3way merging if needed"
-msgstr ""
-
-#: builtin/am.c:2335 builtin/init-db.c:547 builtin/prune-packed.c:16
-#: builtin/repack.c:646 builtin/stash.c:946
-msgid "be quiet"
-msgstr ""
-
-#: builtin/am.c:2337
-msgid "add a Signed-off-by trailer to the commit message"
-msgstr ""
-
-#: builtin/am.c:2340
-msgid "recode into utf8 (default)"
-msgstr ""
-
-#: builtin/am.c:2342
-msgid "pass -k flag to git-mailinfo"
-msgstr ""
-
-#: builtin/am.c:2344
-msgid "pass -b flag to git-mailinfo"
-msgstr ""
-
-#: builtin/am.c:2346
-msgid "pass -m flag to git-mailinfo"
-msgstr ""
-
-#: builtin/am.c:2348
-msgid "pass --keep-cr flag to git-mailsplit for mbox format"
-msgstr ""
-
-#: builtin/am.c:2351
-msgid "do not pass --keep-cr flag to git-mailsplit independent of am.keepcr"
-msgstr ""
-
-#: builtin/am.c:2354
-msgid "strip everything before a scissors line"
-msgstr ""
-
-#: builtin/am.c:2356
-msgid "pass it through git-mailinfo"
-msgstr ""
-
-#: builtin/am.c:2359 builtin/am.c:2362 builtin/am.c:2365 builtin/am.c:2368
-#: builtin/am.c:2371 builtin/am.c:2374 builtin/am.c:2377 builtin/am.c:2380
-#: builtin/am.c:2386
-msgid "pass it through git-apply"
-msgstr ""
-
-#: builtin/am.c:2376 builtin/commit.c:1514 builtin/fmt-merge-msg.c:18
-#: builtin/fmt-merge-msg.c:21 builtin/grep.c:920 builtin/merge.c:263
-#: builtin/pull.c:142 builtin/pull.c:204 builtin/pull.c:221
-#: builtin/rebase.c:1074 builtin/repack.c:657 builtin/repack.c:661
-#: builtin/repack.c:663 builtin/show-branch.c:650 builtin/show-ref.c:172
-#: builtin/tag.c:446 parse-options.h:159 parse-options.h:180
-#: parse-options.h:348
-msgid "n"
-msgstr ""
-
-#: builtin/am.c:2382 builtin/branch.c:695 builtin/bugreport.c:109
-#: builtin/cat-file.c:848 builtin/cat-file.c:852 builtin/cat-file.c:856
-#: builtin/for-each-ref.c:41 builtin/ls-tree.c:357 builtin/replace.c:555
-#: builtin/tag.c:480 builtin/verify-tag.c:38
-msgid "format"
-msgstr ""
-
-#: builtin/am.c:2383
-msgid "format the patch(es) are in"
-msgstr ""
-
-#: builtin/am.c:2389
-msgid "override error message when patch failure occurs"
-msgstr ""
-
-#: builtin/am.c:2391
-msgid "continue applying patches after resolving a conflict"
-msgstr ""
-
-#: builtin/am.c:2394
-msgid "synonyms for --continue"
-msgstr ""
-
-#: builtin/am.c:2397
-msgid "skip the current patch"
-msgstr ""
-
-#: builtin/am.c:2400
-msgid "restore the original branch and abort the patching operation"
-msgstr ""
-
-#: builtin/am.c:2403
-msgid "abort the patching operation but keep HEAD where it is"
-msgstr ""
-
-#: builtin/am.c:2407
-msgid "show the patch being applied"
-msgstr ""
-
-#: builtin/am.c:2411
-msgid "record the empty patch as an empty commit"
-msgstr ""
-
-#: builtin/am.c:2415
-msgid "lie about committer date"
-msgstr ""
-
-#: builtin/am.c:2417
-msgid "use current timestamp for author date"
-msgstr ""
-
-#: builtin/am.c:2419 builtin/commit-tree.c:118 builtin/commit.c:1642
-#: builtin/merge.c:302 builtin/pull.c:179 builtin/rebase.c:1127
-#: builtin/revert.c:117 builtin/tag.c:461
-msgid "key-id"
-msgstr ""
-
-#: builtin/am.c:2420 builtin/rebase.c:1128
-msgid "GPG-sign commits"
-msgstr ""
-
-#: builtin/am.c:2423
-msgid "how to handle empty patches"
-msgstr ""
-
-#: builtin/am.c:2426
-msgid "(internal use for git-rebase)"
-msgstr ""
-
-#: builtin/am.c:2444
-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:2451
-msgid "failed to read the index"
-msgstr ""
-
-#: builtin/am.c:2466
-#, c-format
-msgid "previous rebase directory %s still exists but mbox given."
-msgstr ""
-
-#: builtin/am.c:2490
-#, c-format
-msgid ""
-"Stray %s directory found.\n"
-"Use \"git am --abort\" to remove it."
-msgstr ""
-
-#: builtin/am.c:2496
-msgid "Resolve operation not in progress, we are not resuming."
-msgstr ""
-
-#: builtin/am.c:2506
-msgid "interactive mode requires patches on the command line"
-msgstr ""
-
-#: builtin/apply.c:8
-msgid "git apply [<options>] [<patch>...]"
-msgstr ""
-
-#: builtin/archive.c:18
-msgid "could not redirect output"
-msgstr ""
-
-#: builtin/archive.c:35
-msgid "git archive: Remote with no URL"
-msgstr ""
-
-#: builtin/archive.c:59
-msgid "git archive: expected ACK/NAK, got a flush packet"
-msgstr ""
-
-#: builtin/archive.c:62
-#, c-format
-msgid "git archive: NACK %s"
-msgstr ""
-
-#: builtin/archive.c:63
-msgid "git archive: protocol error"
-msgstr ""
-
-#: builtin/archive.c:67
-msgid "git archive: expected a flush"
-msgstr ""
-
-#: builtin/bisect--helper.c:24
-msgid "git bisect--helper --bisect-reset [<commit>]"
-msgstr ""
-
-#: builtin/bisect--helper.c:26
-msgid ""
-"git bisect--helper --bisect-start [--term-{new,bad}=<term> --term-{old,good}"
-"=<term>] [--no-checkout] [--first-parent] [<bad> [<good>...]] [--] "
-"[<paths>...]"
-msgstr ""
-
-#: builtin/bisect--helper.c:29
-msgid "git bisect--helper --bisect-state (bad|new) [<rev>]"
-msgstr ""
-
-#: builtin/bisect--helper.c:30
-msgid "git bisect--helper --bisect-state (good|old) [<rev>...]"
-msgstr ""
-
-#: builtin/bisect--helper.c:31
-msgid "git bisect--helper --bisect-replay <filename>"
-msgstr ""
-
-#: builtin/bisect--helper.c:32
-msgid "git bisect--helper --bisect-skip [(<rev>|<range>)...]"
-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:116
-#, c-format
-msgid "could not write to file '%s'"
-msgstr ""
-
-#: 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:174
-#, c-format
-msgid "can't use the builtin command '%s' as a term"
-msgstr ""
-
-#: builtin/bisect--helper.c:184
-#, c-format
-msgid "can't change the meaning of the term '%s'"
-msgstr ""
-
-#: builtin/bisect--helper.c:194
-msgid "please use two different terms"
-msgstr ""
-
-#: builtin/bisect--helper.c:210
-#, c-format
-msgid "We are not bisecting.\n"
-msgstr ""
-
-#: builtin/bisect--helper.c:218
-#, c-format
-msgid "'%s' is not a valid commit"
-msgstr ""
-
-#: 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:271
-#, c-format
-msgid "Bad bisect_write argument: %s"
-msgstr ""
-
-#: builtin/bisect--helper.c:276
-#, c-format
-msgid "couldn't get the oid of the rev '%s'"
-msgstr ""
-
-#: builtin/bisect--helper.c:288
-#, c-format
-msgid "couldn't open the file '%s'"
-msgstr ""
-
-#: builtin/bisect--helper.c:314
-#, c-format
-msgid "Invalid command: you're currently in a %s/%s bisect"
-msgstr ""
-
-#: 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:345
-#, 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 ""
-
-#: builtin/bisect--helper.c:365
-#, c-format
-msgid "bisecting only with a %s commit"
-msgstr ""
-
-#. 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:373
-msgid "Are you sure [Y/n]? "
-msgstr ""
-
-#: builtin/bisect--helper.c:434
-msgid "no terms defined"
-msgstr ""
-
-#: 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: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:514 builtin/bisect--helper.c:1038
-msgid "revision walk setup failed\n"
-msgstr ""
-
-#: builtin/bisect--helper.c:536
-#, c-format
-msgid "could not open '%s' for appending"
-msgstr ""
-
-#: builtin/bisect--helper.c:655 builtin/bisect--helper.c:668
-msgid "'' is not a valid term"
-msgstr ""
-
-#: builtin/bisect--helper.c:678
-#, c-format
-msgid "unrecognized option: '%s'"
-msgstr ""
-
-#: builtin/bisect--helper.c:682
-#, c-format
-msgid "'%s' does not appear to be a valid revision"
-msgstr ""
-
-#: builtin/bisect--helper.c:713
-msgid "bad HEAD - I need a HEAD"
-msgstr ""
-
-#: builtin/bisect--helper.c:728
-#, c-format
-msgid "checking out '%s' failed. Try 'git bisect start <valid-branch>'."
-msgstr ""
-
-#: builtin/bisect--helper.c:749
-msgid "won't bisect on cg-seek'ed tree"
-msgstr ""
-
-#: builtin/bisect--helper.c:752
-msgid "bad HEAD - strange symbolic ref"
-msgstr ""
-
-#: builtin/bisect--helper.c:772
-#, c-format
-msgid "invalid ref: '%s'"
-msgstr ""
-
-#: builtin/bisect--helper.c:830
-msgid "You need to start by \"git bisect start\"\n"
-msgstr ""
-
-#. 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:841
-msgid "Do you want me to do it for you [Y/n]? "
-msgstr ""
-
-#: builtin/bisect--helper.c:859
-msgid "Please call `--bisect-state` with at least one argument"
-msgstr ""
-
-#: builtin/bisect--helper.c:872
-#, c-format
-msgid "'git bisect %s' can take only one argument."
-msgstr ""
-
-#: builtin/bisect--helper.c:884 builtin/bisect--helper.c:897
-#, c-format
-msgid "Bad rev input: %s"
-msgstr ""
-
-#: builtin/bisect--helper.c:904
-#, c-format
-msgid "Bad rev input (not a commit): %s"
-msgstr ""
-
-#: builtin/bisect--helper.c:936
-msgid "We are not bisecting."
-msgstr ""
-
-#: builtin/bisect--helper.c:986
-#, c-format
-msgid "'%s'?? what are you talking about?"
-msgstr ""
-
-#: builtin/bisect--helper.c:998
-#, c-format
-msgid "cannot read file '%s' for replaying"
-msgstr ""
-
-#: builtin/bisect--helper.c:1120 builtin/bisect--helper.c:1152
-#, c-format
-msgid "running %s\n"
-msgstr ""
-
-#: builtin/bisect--helper.c:1145 builtin/bisect--helper.c:1335
-msgid "bisect run failed: no command provided."
-msgstr ""
-
-#: builtin/bisect--helper.c:1166
-#, c-format
-msgid "unable to verify '%s' on good revision"
-msgstr ""
-
-#: builtin/bisect--helper.c:1172
-#, c-format
-msgid "bogus exit code %d for good revision"
-msgstr ""
-
-#: builtin/bisect--helper.c:1180
-#, c-format
-msgid "bisect run failed: exit code %d from '%s' is < 0 or >= 128"
-msgstr ""
-
-#: builtin/bisect--helper.c:1195
-#, c-format
-msgid "cannot open file '%s' for writing"
-msgstr ""
-
-#: builtin/bisect--helper.c:1213
-msgid "bisect run cannot continue any more"
-msgstr ""
-
-#: builtin/bisect--helper.c:1215
-#, c-format
-msgid "bisect run success"
-msgstr ""
-
-#: builtin/bisect--helper.c:1218
-#, c-format
-msgid "bisect found first bad commit"
-msgstr ""
-
-#: builtin/bisect--helper.c:1221
-#, c-format
-msgid ""
-"bisect run failed: 'git bisect--helper --bisect-state %s' exited with error "
-"code %d"
-msgstr ""
-
-#: builtin/bisect--helper.c:1253
-msgid "reset the bisection state"
-msgstr ""
-
-#: builtin/bisect--helper.c:1255
-msgid "check whether bad or good terms exist"
-msgstr ""
-
-#: builtin/bisect--helper.c:1257
-msgid "print out the bisect terms"
-msgstr ""
-
-#: builtin/bisect--helper.c:1259
-msgid "start the bisect session"
-msgstr ""
-
-#: builtin/bisect--helper.c:1261
-msgid "find the next bisection commit"
-msgstr ""
-
-#: builtin/bisect--helper.c:1263
-msgid "mark the state of ref (or refs)"
-msgstr ""
-
-#: builtin/bisect--helper.c:1265
-msgid "list the bisection steps so far"
-msgstr ""
-
-#: builtin/bisect--helper.c:1267
-msgid "replay the bisection process from the given file"
-msgstr ""
-
-#: builtin/bisect--helper.c:1269
-msgid "skip some commits for checkout"
-msgstr ""
-
-#: builtin/bisect--helper.c:1271
-msgid "visualize the bisection"
-msgstr ""
-
-#: builtin/bisect--helper.c:1273
-msgid "use <cmd>... to automatically bisect"
-msgstr ""
-
-#: builtin/bisect--helper.c:1275
-msgid "no log for BISECT_WRITE"
-msgstr ""
-
-#: builtin/bisect--helper.c:1290
-msgid "--bisect-reset requires either no argument or a commit"
-msgstr ""
-
-#: builtin/bisect--helper.c:1295
-msgid "--bisect-terms requires 0 or 1 argument"
-msgstr ""
-
-#: builtin/bisect--helper.c:1304
-msgid "--bisect-next requires 0 arguments"
-msgstr ""
-
-#: builtin/bisect--helper.c:1315
-msgid "--bisect-log requires 0 arguments"
-msgstr ""
-
-#: builtin/bisect--helper.c:1320
-msgid "no logfile given"
-msgstr ""
-
-#: builtin/blame.c:32
-msgid "git blame [<options>] [<rev-opts>] [<rev>] [--] <file>"
-msgstr ""
-
-#: builtin/blame.c:37
-msgid "<rev-opts> are documented in git-rev-list(1)"
-msgstr ""
-
-#: builtin/blame.c:406
-#, c-format
-msgid "expecting a color: %s"
-msgstr ""
-
-#: builtin/blame.c:413
-msgid "must end with a color"
-msgstr ""
-
-#: builtin/blame.c:842
-#, c-format
-msgid "cannot find revision %s to ignore"
-msgstr ""
-
-#: builtin/blame.c:864
-msgid "show blame entries as we find them, incrementally"
-msgstr ""
-
-#: builtin/blame.c:865
-msgid "do not show object names of boundary commits (Default: off)"
-msgstr ""
-
-#: builtin/blame.c:866
-msgid "do not treat root commits as boundaries (Default: off)"
-msgstr ""
-
-#: builtin/blame.c:867
-msgid "show work cost statistics"
-msgstr ""
-
-#: builtin/blame.c:868 builtin/checkout.c:1554 builtin/clone.c:98
-#: builtin/commit-graph.c:75 builtin/commit-graph.c:228 builtin/fetch.c:181
-#: builtin/merge.c:301 builtin/multi-pack-index.c:103
-#: builtin/multi-pack-index.c:154 builtin/multi-pack-index.c:180
-#: builtin/multi-pack-index.c:208 builtin/pull.c:120 builtin/push.c:566
-#: builtin/remote.c:683 builtin/send-pack.c:202
-msgid "force progress reporting"
-msgstr ""
-
-#: builtin/blame.c:869
-msgid "show output score for blame entries"
-msgstr ""
-
-#: builtin/blame.c:870
-msgid "show original filename (Default: auto)"
-msgstr ""
-
-#: builtin/blame.c:871
-msgid "show original linenumber (Default: off)"
-msgstr ""
-
-#: builtin/blame.c:872
-msgid "show in a format designed for machine consumption"
-msgstr ""
-
-#: builtin/blame.c:873
-msgid "show porcelain format with per-line commit information"
-msgstr ""
-
-#: builtin/blame.c:874
-msgid "use the same output mode as git-annotate (Default: off)"
-msgstr ""
-
-#: builtin/blame.c:875
-msgid "show raw timestamp (Default: off)"
-msgstr ""
-
-#: builtin/blame.c:876
-msgid "show long commit SHA1 (Default: off)"
-msgstr ""
-
-#: builtin/blame.c:877
-msgid "suppress author name and timestamp (Default: off)"
-msgstr ""
-
-#: builtin/blame.c:878
-msgid "show author email instead of name (Default: off)"
-msgstr ""
-
-#: builtin/blame.c:879
-msgid "ignore whitespace differences"
-msgstr ""
-
-#: builtin/blame.c:880 builtin/log.c:1857
-msgid "rev"
-msgstr ""
-
-#: builtin/blame.c:880
-msgid "ignore <rev> when blaming"
-msgstr ""
-
-#: builtin/blame.c:881
-msgid "ignore revisions from <file>"
-msgstr ""
-
-#: builtin/blame.c:882
-msgid "color redundant metadata from previous line differently"
-msgstr ""
-
-#: builtin/blame.c:883
-msgid "color lines by age"
-msgstr ""
-
-#: builtin/blame.c:884
-msgid "spend extra cycles to find better match"
-msgstr ""
-
-#: builtin/blame.c:885
-msgid "use revisions from <file> instead of calling git-rev-list"
-msgstr ""
-
-#: builtin/blame.c:886
-msgid "use <file>'s contents as the final image"
-msgstr ""
-
-#: builtin/blame.c:887 builtin/blame.c:888
-msgid "score"
-msgstr ""
-
-#: builtin/blame.c:887
-msgid "find line copies within and across files"
-msgstr ""
-
-#: builtin/blame.c:888
-msgid "find line movements within and across files"
-msgstr ""
-
-#: builtin/blame.c:889
-msgid "range"
-msgstr ""
-
-#: builtin/blame.c:890
-msgid "process only line range <start>,<end> or function :<funcname>"
-msgstr ""
-
-#: builtin/blame.c:949
-msgid "--progress can't be used with --incremental or porcelain formats"
-msgstr ""
-
-#. TRANSLATORS: This string is used to tell us the
-#. maximum display width for a relative timestamp in
-#. "git blame" output.  For C locale, "4 years, 11
-#. months ago", which takes 22 places, is the longest
-#. among various forms of relative timestamps, but
-#. your language may need more or fewer display
-#. columns.
-#.
-#: builtin/blame.c:1000
-msgid "4 years, 11 months ago"
-msgstr ""
-
-#: builtin/blame.c:1116
-#, c-format
-msgid "file %s has only %lu line"
-msgid_plural "file %s has only %lu lines"
-msgstr[0] ""
-msgstr[1] ""
-
-#: builtin/blame.c:1161
-msgid "Blaming lines"
-msgstr ""
-
-#: builtin/branch.c:29
-msgid "git branch [<options>] [-r | -a] [--merged] [--no-merged]"
-msgstr ""
-
-#: builtin/branch.c:30
-msgid ""
-"git branch [<options>] [-f] [--recurse-submodules] <branch-name> [<start-"
-"point>]"
-msgstr ""
-
-#: builtin/branch.c:31
-msgid "git branch [<options>] [-l] [<pattern>...]"
-msgstr ""
-
-#: builtin/branch.c:32
-msgid "git branch [<options>] [-r] (-d | -D) <branch-name>..."
-msgstr ""
-
-#: builtin/branch.c:33
-msgid "git branch [<options>] (-m | -M) [<old-branch>] <new-branch>"
-msgstr ""
-
-#: builtin/branch.c:34
-msgid "git branch [<options>] (-c | -C) [<old-branch>] <new-branch>"
-msgstr ""
-
-#: builtin/branch.c:35
-msgid "git branch [<options>] [-r | -a] [--points-at]"
-msgstr ""
-
-#: builtin/branch.c:36
-msgid "git branch [<options>] [-r | -a] [--format]"
-msgstr ""
-
-#: builtin/branch.c:165
-#, c-format
-msgid ""
-"deleting branch '%s' that has been merged to\n"
-"         '%s', but not yet merged to HEAD."
-msgstr ""
-
-#: builtin/branch.c:169
-#, c-format
-msgid ""
-"not deleting branch '%s' that is not yet merged to\n"
-"         '%s', even though it is merged to HEAD."
-msgstr ""
-
-#: builtin/branch.c:183
-#, c-format
-msgid "Couldn't look up commit object for '%s'"
-msgstr ""
-
-#: builtin/branch.c:187
-#, c-format
-msgid ""
-"The branch '%s' is not fully merged.\n"
-"If you are sure you want to delete it, run 'git branch -D %s'."
-msgstr ""
-
-#: builtin/branch.c:200
-msgid "Update of config-file failed"
-msgstr ""
-
-#: builtin/branch.c:235
-msgid "cannot use -a with -d"
-msgstr ""
-
-#: builtin/branch.c:242
-msgid "Couldn't look up commit object for HEAD"
-msgstr ""
-
-#: builtin/branch.c:259
-#, c-format
-msgid "Cannot delete branch '%s' checked out at '%s'"
-msgstr ""
-
-#: builtin/branch.c:274
-#, c-format
-msgid "remote-tracking branch '%s' not found."
-msgstr ""
-
-#: builtin/branch.c:275
-#, c-format
-msgid "branch '%s' not found."
-msgstr ""
-
-#: builtin/branch.c:306
-#, c-format
-msgid "Deleted remote-tracking branch %s (was %s).\n"
-msgstr ""
-
-#: builtin/branch.c:307
-#, c-format
-msgid "Deleted branch %s (was %s).\n"
-msgstr ""
-
-#: builtin/branch.c:457 builtin/tag.c:64
-msgid "unable to parse format string"
-msgstr ""
-
-#: builtin/branch.c:488
-msgid "could not resolve HEAD"
-msgstr ""
-
-#: builtin/branch.c:494
-#, c-format
-msgid "HEAD (%s) points outside of refs/heads/"
-msgstr ""
-
-#: builtin/branch.c:509
-#, c-format
-msgid "Branch %s is being rebased at %s"
-msgstr ""
-
-#: builtin/branch.c:513
-#, c-format
-msgid "Branch %s is being bisected at %s"
-msgstr ""
-
-#: builtin/branch.c:530
-msgid "cannot copy the current branch while not on any."
-msgstr ""
-
-#: builtin/branch.c:532
-msgid "cannot rename the current branch while not on any."
-msgstr ""
-
-#: builtin/branch.c:543
-#, c-format
-msgid "Invalid branch name: '%s'"
-msgstr ""
-
-#: builtin/branch.c:572
-msgid "Branch rename failed"
-msgstr ""
-
-#: builtin/branch.c:574
-msgid "Branch copy failed"
-msgstr ""
-
-#: builtin/branch.c:578
-#, c-format
-msgid "Created a copy of a misnamed branch '%s'"
-msgstr ""
-
-#: builtin/branch.c:581
-#, c-format
-msgid "Renamed a misnamed branch '%s' away"
-msgstr ""
-
-#: builtin/branch.c:587
-#, c-format
-msgid "Branch renamed to %s, but HEAD is not updated!"
-msgstr ""
-
-#: builtin/branch.c:596
-msgid "Branch is renamed, but update of config-file failed"
-msgstr ""
-
-#: builtin/branch.c:598
-msgid "Branch is copied, but update of config-file failed"
-msgstr ""
-
-#: builtin/branch.c:614
-#, c-format
-msgid ""
-"Please edit the description for the branch\n"
-"  %s\n"
-"Lines starting with '%c' will be stripped.\n"
-msgstr ""
-
-#: builtin/branch.c:651
-msgid "Generic options"
-msgstr ""
-
-#: builtin/branch.c:653
-msgid "show hash and subject, give twice for upstream branch"
-msgstr ""
-
-#: builtin/branch.c:654
-msgid "suppress informational messages"
-msgstr ""
-
-#: builtin/branch.c:656 builtin/checkout.c:1571
-#: builtin/submodule--helper.c:3077
-msgid "set branch tracking configuration"
-msgstr ""
-
-#: builtin/branch.c:659
-msgid "do not use"
-msgstr ""
-
-#: builtin/branch.c:661
-msgid "upstream"
-msgstr ""
-
-#: builtin/branch.c:661
-msgid "change the upstream info"
-msgstr ""
-
-#: builtin/branch.c:662
-msgid "unset the upstream info"
-msgstr ""
-
-#: builtin/branch.c:663
-msgid "use colored output"
-msgstr ""
-
-#: builtin/branch.c:664
-msgid "act on remote-tracking branches"
-msgstr ""
-
-#: builtin/branch.c:666 builtin/branch.c:668
-msgid "print only branches that contain the commit"
-msgstr ""
-
-#: builtin/branch.c:667 builtin/branch.c:669
-msgid "print only branches that don't contain the commit"
-msgstr ""
-
-#: builtin/branch.c:672
-msgid "Specific git-branch actions:"
-msgstr ""
-
-#: builtin/branch.c:673
-msgid "list both remote-tracking and local branches"
-msgstr ""
-
-#: builtin/branch.c:675
-msgid "delete fully merged branch"
-msgstr ""
-
-#: builtin/branch.c:676
-msgid "delete branch (even if not merged)"
-msgstr ""
-
-#: builtin/branch.c:677
-msgid "move/rename a branch and its reflog"
-msgstr ""
-
-#: builtin/branch.c:678
-msgid "move/rename a branch, even if target exists"
-msgstr ""
-
-#: builtin/branch.c:679
-msgid "copy a branch and its reflog"
-msgstr ""
-
-#: builtin/branch.c:680
-msgid "copy a branch, even if target exists"
-msgstr ""
-
-#: builtin/branch.c:681
-msgid "list branch names"
-msgstr ""
-
-#: builtin/branch.c:682
-msgid "show current branch name"
-msgstr ""
-
-#: builtin/branch.c:683 builtin/submodule--helper.c:3075
-msgid "create the branch's reflog"
-msgstr ""
-
-#: builtin/branch.c:685
-msgid "edit the description for the branch"
-msgstr ""
-
-#: builtin/branch.c:686
-msgid "force creation, move/rename, deletion"
-msgstr ""
-
-#: builtin/branch.c:687
-msgid "print only branches that are merged"
-msgstr ""
-
-#: builtin/branch.c:688
-msgid "print only branches that are not merged"
-msgstr ""
-
-#: builtin/branch.c:689
-msgid "list branches in columns"
-msgstr ""
-
-#: builtin/branch.c:691 builtin/for-each-ref.c:45 builtin/notes.c:413
-#: builtin/notes.c:416 builtin/notes.c:579 builtin/notes.c:582
-#: builtin/tag.c:476
-msgid "object"
-msgstr ""
-
-#: builtin/branch.c:692
-msgid "print only branches of the object"
-msgstr ""
-
-#: builtin/branch.c:693 builtin/for-each-ref.c:51 builtin/tag.c:483
-msgid "sorting and filtering are case insensitive"
-msgstr ""
-
-#: builtin/branch.c:694 builtin/ls-files.c:667
-msgid "recurse through submodules"
-msgstr ""
-
-#: builtin/branch.c:695 builtin/for-each-ref.c:41 builtin/ls-tree.c:358
-#: builtin/tag.c:481 builtin/verify-tag.c:38
-msgid "format to use for the output"
-msgstr ""
-
-#: builtin/branch.c:718 builtin/clone.c:684
-msgid "HEAD not found below refs/heads!"
-msgstr ""
-
-#: builtin/branch.c:739
-msgid ""
-"branch with --recurse-submodules can only be used if submodule."
-"propagateBranches is enabled"
-msgstr ""
-
-#: builtin/branch.c:741
-msgid "--recurse-submodules can only be used to create branches"
-msgstr ""
-
-#: builtin/branch.c:770 builtin/branch.c:826 builtin/branch.c:835
-msgid "branch name required"
-msgstr ""
-
-#: builtin/branch.c:802
-msgid "Cannot give description to detached HEAD"
-msgstr ""
-
-#: builtin/branch.c:807
-msgid "cannot edit description of more than one branch"
-msgstr ""
-
-#: builtin/branch.c:814
-#, c-format
-msgid "No commit on branch '%s' yet."
-msgstr ""
-
-#: builtin/branch.c:817
-#, c-format
-msgid "No branch named '%s'."
-msgstr ""
-
-#: builtin/branch.c:832
-msgid "too many branches for a copy operation"
-msgstr ""
-
-#: builtin/branch.c:841
-msgid "too many arguments for a rename operation"
-msgstr ""
-
-#: builtin/branch.c:846
-msgid "too many arguments to set new upstream"
-msgstr ""
-
-#: builtin/branch.c:850
-#, c-format
-msgid ""
-"could not set upstream of HEAD to %s when it does not point to any branch."
-msgstr ""
-
-#: builtin/branch.c:853 builtin/branch.c:873
-#, c-format
-msgid "no such branch '%s'"
-msgstr ""
-
-#: builtin/branch.c:857
-#, c-format
-msgid "branch '%s' does not exist"
-msgstr ""
-
-#: builtin/branch.c:867
-msgid "too many arguments to unset upstream"
-msgstr ""
-
-#: builtin/branch.c:871
-msgid "could not unset upstream of HEAD when it does not point to any branch."
-msgstr ""
-
-#: builtin/branch.c:877
-#, c-format
-msgid "Branch '%s' has no upstream information"
-msgstr ""
-
-#: builtin/branch.c:890
-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:894
-msgid ""
-"the '--set-upstream' option is no longer supported. Please use '--track' or "
-"'--set-upstream-to' instead."
-msgstr ""
-
-#: builtin/bugreport.c:16
-msgid "git version:\n"
-msgstr ""
-
-#: builtin/bugreport.c:22
-#, c-format
-msgid "uname() failed with error '%s' (%d)\n"
-msgstr ""
-
-#: builtin/bugreport.c:32
-msgid "compiler info: "
-msgstr ""
-
-#: builtin/bugreport.c:35
-msgid "libc info: "
-msgstr ""
-
-#: builtin/bugreport.c:49
-msgid "not run from a git repository - no hooks to show\n"
-msgstr ""
-
-#: builtin/bugreport.c:62
-msgid "git bugreport [-o|--output-directory <file>] [-s|--suffix <format>]"
-msgstr ""
-
-#: 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"
-"\n"
-"What did you do before the bug happened? (Steps to reproduce your issue)\n"
-"\n"
-"What did you expect to happen? (Expected behavior)\n"
-"\n"
-"What happened instead? (Actual behavior)\n"
-"\n"
-"What's different between what you expected and what actually happened?\n"
-"\n"
-"Anything else you want to add:\n"
-"\n"
-"Please review the rest of the bug report below.\n"
-"You can delete any lines you don't wish to share.\n"
-msgstr ""
-
-#: builtin/bugreport.c:108
-msgid "specify a destination for the bugreport file"
-msgstr ""
-
-#: builtin/bugreport.c:110
-msgid "specify a strftime format suffix for the filename"
-msgstr ""
-
-#: builtin/bugreport.c:132
-#, c-format
-msgid "could not create leading directories for '%s'"
-msgstr ""
-
-#: builtin/bugreport.c:139
-msgid "System Info"
-msgstr ""
-
-#: builtin/bugreport.c:142
-msgid "Enabled Hooks"
-msgstr ""
-
-#: builtin/bugreport.c:149
-#, c-format
-msgid "unable to write to %s"
-msgstr ""
-
-#: 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 ""
-
-#: builtin/bundle.c:16 builtin/bundle.c:28
-msgid "git bundle verify [<options>] <file>"
-msgstr ""
-
-#: builtin/bundle.c:17 builtin/bundle.c:33
-msgid "git bundle list-heads <file> [<refname>...]"
-msgstr ""
-
-#: builtin/bundle.c:18 builtin/bundle.c:38
-msgid "git bundle unbundle <file> [<refname>...]"
-msgstr ""
-
-#: builtin/bundle.c:65 builtin/pack-objects.c:3899
-msgid "do not show progress meter"
-msgstr ""
-
-#: builtin/bundle.c:67 builtin/bundle.c:168 builtin/pack-objects.c:3901
-msgid "show progress meter"
-msgstr ""
-
-#: builtin/bundle.c:69 builtin/pack-objects.c:3903
-msgid "show progress meter during object writing phase"
-msgstr ""
-
-#: builtin/bundle.c:72 builtin/pack-objects.c:3906
-msgid "similar to --all-progress when progress meter is shown"
-msgstr ""
-
-#: builtin/bundle.c:74
-msgid "specify bundle format version"
-msgstr ""
-
-#: builtin/bundle.c:94
-msgid "Need a repository to create a bundle."
-msgstr ""
-
-#: builtin/bundle.c:108
-msgid "do not show bundle details"
-msgstr ""
-
-#: builtin/bundle.c:127
-#, c-format
-msgid "%s is okay\n"
-msgstr ""
-
-#: builtin/bundle.c:183
-msgid "Need a repository to unbundle."
-msgstr ""
-
-#: builtin/bundle.c:186
-msgid "Unbundling objects"
-msgstr ""
-
-#: builtin/bundle.c:220 builtin/remote.c:1758
-#, c-format
-msgid "Unknown subcommand: %s"
-msgstr ""
-
-#: builtin/cat-file.c:568
-msgid "flush is only for --buffer mode"
-msgstr ""
-
-#: builtin/cat-file.c:612
-msgid "empty command in input"
-msgstr ""
-
-#: builtin/cat-file.c:614
-#, c-format
-msgid "whitespace before command: '%s'"
-msgstr ""
-
-#: builtin/cat-file.c:623
-#, c-format
-msgid "%s requires arguments"
-msgstr ""
-
-#: builtin/cat-file.c:628
-#, c-format
-msgid "%s takes no arguments"
-msgstr ""
-
-#: builtin/cat-file.c:636
-#, c-format
-msgid "unknown command: '%s'"
-msgstr ""
-
-#: builtin/cat-file.c:795
-msgid "only one batch option may be specified"
-msgstr ""
-
-#: builtin/cat-file.c:824
-msgid "git cat-file <type> <object>"
-msgstr ""
-
-#: builtin/cat-file.c:825
-msgid "git cat-file (-e | -p) <object>"
-msgstr ""
-
-#: builtin/cat-file.c:826
-msgid "git cat-file (-t | -s) [--allow-unknown-type] <object>"
-msgstr ""
-
-#: builtin/cat-file.c:827
-msgid ""
-"git cat-file (--batch | --batch-check | --batch-command) [--batch-all-"
-"objects]\n"
-"             [--buffer] [--follow-symlinks] [--unordered]\n"
-"             [--textconv | --filters]"
-msgstr ""
-
-#: builtin/cat-file.c:830
-msgid ""
-"git cat-file (--textconv | --filters)\n"
-"             [<rev>:<path|tree-ish> | --path=<path|tree-ish> <rev>]"
-msgstr ""
-
-#: builtin/cat-file.c:836
-msgid "Check object existence or emit object contents"
-msgstr ""
-
-#: builtin/cat-file.c:838
-msgid "check if <object> exists"
-msgstr ""
-
-#: builtin/cat-file.c:839
-msgid "pretty-print <object> content"
-msgstr ""
-
-#: builtin/cat-file.c:841
-msgid "Emit [broken] object attributes"
-msgstr ""
-
-#: builtin/cat-file.c:842
-msgid "show object type (one of 'blob', 'tree', 'commit', 'tag', ...)"
-msgstr ""
-
-#: builtin/cat-file.c:843
-msgid "show object size"
-msgstr ""
-
-#: builtin/cat-file.c:845
-msgid "allow -s and -t to work with broken/corrupt objects"
-msgstr ""
-
-#: builtin/cat-file.c:847
-msgid "Batch objects requested on stdin (or --batch-all-objects)"
-msgstr ""
-
-#: builtin/cat-file.c:849
-msgid "show full <object> or <rev> contents"
-msgstr ""
-
-#: builtin/cat-file.c:853
-msgid "like --batch, but don't emit <contents>"
-msgstr ""
-
-#: builtin/cat-file.c:857
-msgid "read commands from stdin"
-msgstr ""
-
-#: builtin/cat-file.c:861
-msgid "with --batch[-check]: ignores stdin, batches all known objects"
-msgstr ""
-
-#: builtin/cat-file.c:863
-msgid "Change or optimize batch output"
-msgstr ""
-
-#: builtin/cat-file.c:864
-msgid "buffer --batch output"
-msgstr ""
-
-#: builtin/cat-file.c:866
-msgid "follow in-tree symlinks"
-msgstr ""
-
-#: builtin/cat-file.c:868
-msgid "do not order objects before emitting them"
-msgstr ""
-
-#: builtin/cat-file.c:870
-msgid ""
-"Emit object (blob or tree) with conversion or filter (stand-alone, or with "
-"batch)"
-msgstr ""
-
-#: builtin/cat-file.c:872
-msgid "run textconv on object's content"
-msgstr ""
-
-#: builtin/cat-file.c:874
-msgid "run filters on object's content"
-msgstr ""
-
-#: builtin/cat-file.c:875
-msgid "blob|tree"
-msgstr ""
-
-#: builtin/cat-file.c:876
-msgid "use a <path> for (--textconv | --filters); Not with 'batch'"
-msgstr ""
-
-#: builtin/cat-file.c:894
-#, c-format
-msgid "'%s=<%s>' needs '%s' or '%s'"
-msgstr ""
-
-#: builtin/cat-file.c:896
-msgid "path|tree-ish"
-msgstr ""
-
-#: builtin/cat-file.c:903 builtin/cat-file.c:906 builtin/cat-file.c:909
-#, c-format
-msgid "'%s' requires a batch mode"
-msgstr ""
-
-#: builtin/cat-file.c:921
-#, c-format
-msgid "'-%c' is incompatible with batch mode"
-msgstr ""
-
-#: builtin/cat-file.c:924
-msgid "batch modes take no arguments"
-msgstr ""
-
-#: builtin/cat-file.c:932 builtin/cat-file.c:935
-#, c-format
-msgid "<rev> required with '%s'"
-msgstr ""
-
-#: builtin/cat-file.c:938
-#, c-format
-msgid "<object> required with '-%c'"
-msgstr ""
-
-#: builtin/cat-file.c:943 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:965
-#: builtin/notes.c:987 builtin/prune-packed.c:25 builtin/receive-pack.c:2489
-#: builtin/tag.c:592
-msgid "too many arguments"
-msgstr ""
-
-#: builtin/cat-file.c:947
-#, c-format
-msgid "only two arguments allowed in <type> <object> mode, not %d"
-msgstr ""
-
-#: builtin/check-attr.c:13
-msgid "git check-attr [-a | --all | <attr>...] [--] <pathname>..."
-msgstr ""
-
-#: builtin/check-attr.c:14
-msgid "git check-attr --stdin [-z] [-a | --all | <attr>...]"
-msgstr ""
-
-#: builtin/check-attr.c:21
-msgid "report all attributes set on file"
-msgstr ""
-
-#: builtin/check-attr.c:22
-msgid "use .gitattributes only from the index"
-msgstr ""
-
-#: builtin/check-attr.c:23 builtin/check-ignore.c:25 builtin/hash-object.c:101
-msgid "read file names from stdin"
-msgstr ""
-
-#: builtin/check-attr.c:25 builtin/check-ignore.c:27
-msgid "terminate input and output records by a NUL character"
-msgstr ""
-
-#: builtin/check-ignore.c:21 builtin/checkout.c:1550 builtin/gc.c:550
-#: builtin/worktree.c:565
-msgid "suppress progress reporting"
-msgstr ""
-
-#: builtin/check-ignore.c:29
-msgid "show non-matching input paths"
-msgstr ""
-
-#: builtin/check-ignore.c:31
-msgid "ignore index when checking"
-msgstr ""
-
-#: builtin/check-ignore.c:165
-msgid "cannot specify pathnames with --stdin"
-msgstr ""
-
-#: builtin/check-ignore.c:168
-msgid "-z only makes sense with --stdin"
-msgstr ""
-
-#: builtin/check-ignore.c:170
-msgid "no path specified"
-msgstr ""
-
-#: builtin/check-ignore.c:174
-msgid "--quiet is only valid with a single pathname"
-msgstr ""
-
-#: builtin/check-ignore.c:176
-msgid "cannot have both --quiet and --verbose"
-msgstr ""
-
-#: builtin/check-ignore.c:179
-msgid "--non-matching is only valid with --verbose"
-msgstr ""
-
-#: builtin/check-mailmap.c:9
-msgid "git check-mailmap [<options>] <contact>..."
-msgstr ""
-
-#: builtin/check-mailmap.c:14
-msgid "also read contacts from stdin"
-msgstr ""
-
-#: builtin/check-mailmap.c:25
-#, c-format
-msgid "unable to parse contact: %s"
-msgstr ""
-
-#: builtin/check-mailmap.c:48
-msgid "no contacts specified"
-msgstr ""
-
-#: builtin/checkout--worker.c:110
-msgid "git checkout--worker [<options>]"
-msgstr ""
-
-#: builtin/checkout--worker.c:118 builtin/checkout-index.c:235
-#: builtin/column.c:31 builtin/column.c:32 builtin/submodule--helper.c:1878
-#: builtin/submodule--helper.c:1881 builtin/submodule--helper.c:1889
-#: builtin/submodule--helper.c:2716 builtin/worktree.c:563
-#: builtin/worktree.c:808
-msgid "string"
-msgstr ""
-
-#: builtin/checkout--worker.c:119 builtin/checkout-index.c:236
-msgid "when creating files, prepend <string>"
-msgstr ""
-
-#: builtin/checkout-index.c:184
-msgid "git checkout-index [<options>] [--] [<file>...]"
-msgstr ""
-
-#: builtin/checkout-index.c:201
-msgid "stage should be between 1 and 3 or all"
-msgstr ""
-
-#: builtin/checkout-index.c:219
-msgid "check out all files in the index"
-msgstr ""
-
-#: builtin/checkout-index.c:221
-msgid "do not skip files with skip-worktree set"
-msgstr ""
-
-#: builtin/checkout-index.c:222
-msgid "force overwrite of existing files"
-msgstr ""
-
-#: builtin/checkout-index.c:224
-msgid "no warning for existing files and files not in index"
-msgstr ""
-
-#: builtin/checkout-index.c:226
-msgid "don't checkout new files"
-msgstr ""
-
-#: builtin/checkout-index.c:228
-msgid "update stat information in the index file"
-msgstr ""
-
-#: builtin/checkout-index.c:232
-msgid "read list of paths from the standard input"
-msgstr ""
-
-#: builtin/checkout-index.c:234
-msgid "write the content to temporary files"
-msgstr ""
-
-#: builtin/checkout-index.c:238
-msgid "copy out the files from named stage"
-msgstr ""
-
-#: builtin/checkout.c:34
-msgid "git checkout [<options>] <branch>"
-msgstr ""
-
-#: builtin/checkout.c:35
-msgid "git checkout [<options>] [<branch>] -- <file>..."
-msgstr ""
-
-#: builtin/checkout.c:40
-msgid "git switch [<options>] [<branch>]"
-msgstr ""
-
-#: builtin/checkout.c:45
-msgid "git restore [<options>] [--source=<branch>] <file>..."
-msgstr ""
-
-#: builtin/checkout.c:199 builtin/checkout.c:238
-#, c-format
-msgid "path '%s' does not have our version"
-msgstr ""
-
-#: builtin/checkout.c:201 builtin/checkout.c:240
-#, c-format
-msgid "path '%s' does not have their version"
-msgstr ""
-
-#: builtin/checkout.c:217
-#, c-format
-msgid "path '%s' does not have all necessary versions"
-msgstr ""
-
-#: builtin/checkout.c:271
-#, c-format
-msgid "path '%s' does not have necessary versions"
-msgstr ""
-
-#: builtin/checkout.c:291
-#, c-format
-msgid "path '%s': cannot merge"
-msgstr ""
-
-#: builtin/checkout.c:307
-#, c-format
-msgid "Unable to add merge result for '%s'"
-msgstr ""
-
-#: builtin/checkout.c:424
-#, c-format
-msgid "Recreated %d merge conflict"
-msgid_plural "Recreated %d merge conflicts"
-msgstr[0] ""
-msgstr[1] ""
-
-#: builtin/checkout.c:429
-#, c-format
-msgid "Updated %d path from %s"
-msgid_plural "Updated %d paths from %s"
-msgstr[0] ""
-msgstr[1] ""
-
-#: builtin/checkout.c:436
-#, c-format
-msgid "Updated %d path from the index"
-msgid_plural "Updated %d paths from the index"
-msgstr[0] ""
-msgstr[1] ""
-
-#: builtin/checkout.c:459 builtin/checkout.c:462 builtin/checkout.c:465
-#: builtin/checkout.c:469
-#, c-format
-msgid "'%s' cannot be used with updating paths"
-msgstr ""
-
-#: builtin/checkout.c:479
-#, c-format
-msgid "Cannot update paths and switch to branch '%s' at the same time."
-msgstr ""
-
-#: builtin/checkout.c:483
-#, c-format
-msgid "neither '%s' or '%s' is specified"
-msgstr ""
-
-#: builtin/checkout.c:487
-#, c-format
-msgid "'%s' must be used when '%s' is not specified"
-msgstr ""
-
-#: builtin/checkout.c:492 builtin/checkout.c:497
-#, c-format
-msgid "'%s' or '%s' cannot be used with %s"
-msgstr ""
-
-#: builtin/checkout.c:571 builtin/checkout.c:578
-#, c-format
-msgid "path '%s' is unmerged"
-msgstr ""
-
-#: builtin/checkout.c:753
-msgid "you need to resolve your current index first"
-msgstr ""
-
-#: builtin/checkout.c:809
-#, c-format
-msgid ""
-"cannot continue with staged changes in the following files:\n"
-"%s"
-msgstr ""
-
-#: builtin/checkout.c:902
-#, c-format
-msgid "Can not do reflog for '%s': %s\n"
-msgstr ""
-
-#: builtin/checkout.c:947
-msgid "HEAD is now at"
-msgstr ""
-
-#: builtin/checkout.c:951 builtin/clone.c:615 t/helper/test-fast-rebase.c:203
-msgid "unable to update HEAD"
-msgstr ""
-
-#: builtin/checkout.c:955
-#, c-format
-msgid "Reset branch '%s'\n"
-msgstr ""
-
-#: builtin/checkout.c:958
-#, c-format
-msgid "Already on '%s'\n"
-msgstr ""
-
-#: builtin/checkout.c:962
-#, c-format
-msgid "Switched to and reset branch '%s'\n"
-msgstr ""
-
-#: builtin/checkout.c:964 builtin/checkout.c:1398
-#, c-format
-msgid "Switched to a new branch '%s'\n"
-msgstr ""
-
-#: builtin/checkout.c:966
-#, c-format
-msgid "Switched to branch '%s'\n"
-msgstr ""
-
-#: builtin/checkout.c:1017
-#, c-format
-msgid " ... and %d more.\n"
-msgstr ""
-
-#: builtin/checkout.c:1023
-#, c-format
-msgid ""
-"Warning: you are leaving %d commit behind, not connected to\n"
-"any of your branches:\n"
-"\n"
-"%s\n"
-msgid_plural ""
-"Warning: you are leaving %d commits behind, not connected to\n"
-"any of your branches:\n"
-"\n"
-"%s\n"
-msgstr[0] ""
-msgstr[1] ""
-
-#: builtin/checkout.c:1042
-#, c-format
-msgid ""
-"If you want to keep it by creating a new branch, this may be a good time\n"
-"to do so with:\n"
-"\n"
-" git branch <new-branch-name> %s\n"
-"\n"
-msgid_plural ""
-"If you want to keep them by creating a new branch, this may be a good time\n"
-"to do so with:\n"
-"\n"
-" git branch <new-branch-name> %s\n"
-"\n"
-msgstr[0] ""
-msgstr[1] ""
-
-#: builtin/checkout.c:1077
-msgid "internal error in revision walk"
-msgstr ""
-
-#: builtin/checkout.c:1081
-msgid "Previous HEAD position was"
-msgstr ""
-
-#: builtin/checkout.c:1124 builtin/checkout.c:1393
-msgid "You are on a branch yet to be born"
-msgstr ""
-
-#: builtin/checkout.c:1206
-#, 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:1213
-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"
-"\n"
-"    git checkout --track origin/<name>\n"
-"\n"
-"If you'd like to always have checkouts of an ambiguous <name> prefer\n"
-"one remote, e.g. the 'origin' remote, consider setting\n"
-"checkout.defaultRemote=origin in your config."
-msgstr ""
-
-#: builtin/checkout.c:1223
-#, c-format
-msgid "'%s' matched multiple (%d) remote tracking branches"
-msgstr ""
-
-#: builtin/checkout.c:1289
-msgid "only one reference expected"
-msgstr ""
-
-#: builtin/checkout.c:1306
-#, c-format
-msgid "only one reference expected, %d given."
-msgstr ""
-
-#: builtin/checkout.c:1352 builtin/worktree.c:338 builtin/worktree.c:508
-#, c-format
-msgid "invalid reference: %s"
-msgstr ""
-
-#: builtin/checkout.c:1365 builtin/checkout.c:1744
-#, c-format
-msgid "reference is not a tree: %s"
-msgstr ""
-
-#: builtin/checkout.c:1413
-#, c-format
-msgid "a branch is expected, got tag '%s'"
-msgstr ""
-
-#: builtin/checkout.c:1415
-#, c-format
-msgid "a branch is expected, got remote branch '%s'"
-msgstr ""
-
-#: builtin/checkout.c:1417 builtin/checkout.c:1426
-#, c-format
-msgid "a branch is expected, got '%s'"
-msgstr ""
-
-#: builtin/checkout.c:1420
-#, c-format
-msgid "a branch is expected, got commit '%s'"
-msgstr ""
-
-#: builtin/checkout.c:1429
-msgid ""
-"If you want to detach HEAD at the commit, try again with the --detach option."
-msgstr ""
-
-#: builtin/checkout.c:1442
-msgid ""
-"cannot switch branch while merging\n"
-"Consider \"git merge --quit\" or \"git worktree add\"."
-msgstr ""
-
-#: builtin/checkout.c:1446
-msgid ""
-"cannot switch branch in the middle of an am session\n"
-"Consider \"git am --quit\" or \"git worktree add\"."
-msgstr ""
-
-#: builtin/checkout.c:1450
-msgid ""
-"cannot switch branch while rebasing\n"
-"Consider \"git rebase --quit\" or \"git worktree add\"."
-msgstr ""
-
-#: builtin/checkout.c:1454
-msgid ""
-"cannot switch branch while cherry-picking\n"
-"Consider \"git cherry-pick --quit\" or \"git worktree add\"."
-msgstr ""
-
-#: builtin/checkout.c:1458
-msgid ""
-"cannot switch branch while reverting\n"
-"Consider \"git revert --quit\" or \"git worktree add\"."
-msgstr ""
-
-#: builtin/checkout.c:1462
-msgid "you are switching branch while bisecting"
-msgstr ""
-
-#: builtin/checkout.c:1469
-msgid "paths cannot be used with switching branches"
-msgstr ""
-
-#: builtin/checkout.c:1472 builtin/checkout.c:1476 builtin/checkout.c:1480
-#, c-format
-msgid "'%s' cannot be used with switching branches"
-msgstr ""
-
-#: builtin/checkout.c:1484 builtin/checkout.c:1487 builtin/checkout.c:1490
-#: builtin/checkout.c:1495 builtin/checkout.c:1500
-#, c-format
-msgid "'%s' cannot be used with '%s'"
-msgstr ""
-
-#: builtin/checkout.c:1497
-#, c-format
-msgid "'%s' cannot take <start-point>"
-msgstr ""
-
-#: builtin/checkout.c:1505
-#, c-format
-msgid "Cannot switch branch to a non-commit '%s'"
-msgstr ""
-
-#: builtin/checkout.c:1512
-msgid "missing branch or commit argument"
-msgstr ""
-
-#: builtin/checkout.c:1555
-msgid "perform a 3-way merge with the new branch"
-msgstr ""
-
-#: builtin/checkout.c:1556 builtin/log.c:1844 parse-options.h:354
-msgid "style"
-msgstr ""
-
-#: builtin/checkout.c:1557
-msgid "conflict style (merge, diff3, or zdiff3)"
-msgstr ""
-
-#: builtin/checkout.c:1569 builtin/worktree.c:560
-msgid "detach HEAD at named commit"
-msgstr ""
-
-#: builtin/checkout.c:1574
-msgid "force checkout (throw away local modifications)"
-msgstr ""
-
-#: builtin/checkout.c:1576
-msgid "new-branch"
-msgstr ""
-
-#: builtin/checkout.c:1576
-msgid "new unparented branch"
-msgstr ""
-
-#: builtin/checkout.c:1578 builtin/merge.c:305
-msgid "update ignored files (default)"
-msgstr ""
-
-#: builtin/checkout.c:1581
-msgid "do not check if another worktree is holding the given ref"
-msgstr ""
-
-#: builtin/checkout.c:1594
-msgid "checkout our version for unmerged files"
-msgstr ""
-
-#: builtin/checkout.c:1597
-msgid "checkout their version for unmerged files"
-msgstr ""
-
-#: builtin/checkout.c:1601
-msgid "do not limit pathspecs to sparse entries only"
-msgstr ""
-
-#: builtin/checkout.c:1659
-#, c-format
-msgid "options '-%c', '-%c', and '%s' cannot be used together"
-msgstr ""
-
-#: builtin/checkout.c:1700
-msgid "--track needs a branch name"
-msgstr ""
-
-#: builtin/checkout.c:1705
-#, c-format
-msgid "missing branch name; try -%c"
-msgstr ""
-
-#: builtin/checkout.c:1737
-#, c-format
-msgid "could not resolve %s"
-msgstr ""
-
-#: builtin/checkout.c:1753
-msgid "invalid path specification"
-msgstr ""
-
-#: builtin/checkout.c:1760
-#, c-format
-msgid "'%s' is not a commit and a branch '%s' cannot be created from it"
-msgstr ""
-
-#: builtin/checkout.c:1764
-#, c-format
-msgid "git checkout: --detach does not take a path argument '%s'"
-msgstr ""
-
-#: builtin/checkout.c:1789
-msgid ""
-"git checkout: --ours/--theirs, --force and --merge are incompatible when\n"
-"checking out of the index."
-msgstr ""
-
-#: builtin/checkout.c:1794
-msgid "you must specify path(s) to restore"
-msgstr ""
-
-#: builtin/checkout.c:1819 builtin/checkout.c:1821 builtin/checkout.c:1873
-#: builtin/checkout.c:1875 builtin/clone.c:130 builtin/remote.c:171
-#: builtin/remote.c:173 builtin/submodule--helper.c:3038
-#: builtin/submodule--helper.c:3371 builtin/worktree.c:556
-#: builtin/worktree.c:558
-msgid "branch"
-msgstr ""
-
-#: builtin/checkout.c:1820
-msgid "create and checkout a new branch"
-msgstr ""
-
-#: builtin/checkout.c:1822
-msgid "create/reset and checkout a branch"
-msgstr ""
-
-#: builtin/checkout.c:1823
-msgid "create reflog for new branch"
-msgstr ""
-
-#: builtin/checkout.c:1825
-msgid "second guess 'git checkout <no-such-branch>' (default)"
-msgstr ""
-
-#: builtin/checkout.c:1826
-msgid "use overlay mode (default)"
-msgstr ""
-
-#: builtin/checkout.c:1874
-msgid "create and switch to a new branch"
-msgstr ""
-
-#: builtin/checkout.c:1876
-msgid "create/reset and switch to a branch"
-msgstr ""
-
-#: builtin/checkout.c:1878
-msgid "second guess 'git switch <no-such-branch>'"
-msgstr ""
-
-#: builtin/checkout.c:1880
-msgid "throw away local modifications"
-msgstr ""
-
-#: builtin/checkout.c:1916
-msgid "which tree-ish to checkout from"
-msgstr ""
-
-#: builtin/checkout.c:1918
-msgid "restore the index"
-msgstr ""
-
-#: builtin/checkout.c:1920
-msgid "restore the working tree (default)"
-msgstr ""
-
-#: builtin/checkout.c:1922
-msgid "ignore unmerged entries"
-msgstr ""
-
-#: builtin/checkout.c:1923
-msgid "use overlay mode"
-msgstr ""
-
-#: builtin/clean.c:29
-msgid ""
-"git clean [-d] [-f] [-i] [-n] [-q] [-e <pattern>] [-x | -X] [--] <paths>..."
-msgstr ""
-
-#: builtin/clean.c:33
-#, c-format
-msgid "Removing %s\n"
-msgstr ""
-
-#: builtin/clean.c:34
-#, c-format
-msgid "Would remove %s\n"
-msgstr ""
-
-#: builtin/clean.c:35
-#, c-format
-msgid "Skipping repository %s\n"
-msgstr ""
-
-#: builtin/clean.c:36
-#, c-format
-msgid "Would skip repository %s\n"
-msgstr ""
-
-#: builtin/clean.c:38
-#, c-format
-msgid "could not lstat %s\n"
-msgstr ""
-
-#: builtin/clean.c:39
-msgid "Refusing to remove current working directory\n"
-msgstr ""
-
-#: builtin/clean.c:40
-msgid "Would refuse to remove current working directory\n"
-msgstr ""
-
-#: builtin/clean.c:326 git-add--interactive.perl:593
-#, c-format
-msgid ""
-"Prompt help:\n"
-"1          - select a numbered item\n"
-"foo        - select item based on unique prefix\n"
-"           - (empty) select nothing\n"
-msgstr ""
-
-#: builtin/clean.c:330 git-add--interactive.perl:602
-#, c-format
-msgid ""
-"Prompt help:\n"
-"1          - select a single item\n"
-"3-5        - select a range of items\n"
-"2-3,6-9    - select multiple ranges\n"
-"foo        - select item based on unique prefix\n"
-"-...       - unselect specified items\n"
-"*          - choose all items\n"
-"           - (empty) finish selecting\n"
-msgstr ""
-
-#: builtin/clean.c:545 git-add--interactive.perl:568
-#: git-add--interactive.perl:573
-#, c-format, perl-format
-msgid "Huh (%s)?\n"
-msgstr ""
-
-#: builtin/clean.c:685
-#, c-format
-msgid "Input ignore patterns>> "
-msgstr ""
-
-#: builtin/clean.c:719
-#, c-format
-msgid "WARNING: Cannot find items matched by: %s"
-msgstr ""
-
-#: builtin/clean.c:740
-msgid "Select items to delete"
-msgstr ""
-
-#. TRANSLATORS: Make sure to keep [y/N] as is
-#: builtin/clean.c:781
-#, c-format
-msgid "Remove %s [y/N]? "
-msgstr ""
-
-#: builtin/clean.c:812
-msgid ""
-"clean               - start cleaning\n"
-"filter by pattern   - exclude items from deletion\n"
-"select by numbers   - select items to be deleted by numbers\n"
-"ask each            - confirm each deletion (like \"rm -i\")\n"
-"quit                - stop cleaning\n"
-"help                - this screen\n"
-"?                   - help for prompt selection"
-msgstr ""
-
-#: builtin/clean.c:848
-msgid "Would remove the following item:"
-msgid_plural "Would remove the following items:"
-msgstr[0] ""
-msgstr[1] ""
-
-#: builtin/clean.c:864
-msgid "No more files to clean, exiting."
-msgstr ""
-
-#: builtin/clean.c:926
-msgid "do not print names of files removed"
-msgstr ""
-
-#: builtin/clean.c:928
-msgid "force"
-msgstr ""
-
-#: builtin/clean.c:929
-msgid "interactive cleaning"
-msgstr ""
-
-#: builtin/clean.c:931
-msgid "remove whole directories"
-msgstr ""
-
-#: builtin/clean.c:932 builtin/describe.c:565 builtin/describe.c:567
-#: builtin/grep.c:938 builtin/log.c:185 builtin/log.c:187
-#: builtin/ls-files.c:651 builtin/name-rev.c:585 builtin/name-rev.c:587
-#: builtin/show-ref.c:179
-msgid "pattern"
-msgstr ""
-
-#: builtin/clean.c:933
-msgid "add <pattern> to ignore rules"
-msgstr ""
-
-#: builtin/clean.c:934
-msgid "remove ignored files, too"
-msgstr ""
-
-#: builtin/clean.c:936
-msgid "remove only ignored files"
-msgstr ""
-
-#: builtin/clean.c:951
-msgid ""
-"clean.requireForce set to true and neither -i, -n, nor -f given; refusing to "
-"clean"
-msgstr ""
-
-#: builtin/clean.c:954
-msgid ""
-"clean.requireForce defaults to true and neither -i, -n, nor -f given; "
-"refusing to clean"
-msgstr ""
-
-#: builtin/clean.c:966
-msgid "-x and -X cannot be used together"
-msgstr ""
-
-#: builtin/clone.c:47
-msgid "git clone [<options>] [--] <repo> [<dir>]"
-msgstr ""
-
-#: builtin/clone.c:100
-msgid "don't clone shallow repository"
-msgstr ""
-
-#: builtin/clone.c:102
-msgid "don't create a checkout"
-msgstr ""
-
-#: builtin/clone.c:103 builtin/clone.c:105 builtin/init-db.c:542
-msgid "create a bare repository"
-msgstr ""
-
-#: builtin/clone.c:107
-msgid "create a mirror repository (implies bare)"
-msgstr ""
-
-#: builtin/clone.c:109
-msgid "to clone from a local repository"
-msgstr ""
-
-#: builtin/clone.c:111
-msgid "don't use local hardlinks, always copy"
-msgstr ""
-
-#: builtin/clone.c:113
-msgid "setup as shared repository"
-msgstr ""
-
-#: builtin/clone.c:115
-msgid "pathspec"
-msgstr ""
-
-#: builtin/clone.c:115
-msgid "initialize submodules in the clone"
-msgstr ""
-
-#: builtin/clone.c:119
-msgid "number of submodules cloned in parallel"
-msgstr ""
-
-#: builtin/clone.c:120 builtin/init-db.c:539
-msgid "template-directory"
-msgstr ""
-
-#: builtin/clone.c:121 builtin/init-db.c:540
-msgid "directory from which templates will be used"
-msgstr ""
-
-#: builtin/clone.c:123 builtin/clone.c:125 builtin/submodule--helper.c:1885
-#: builtin/submodule--helper.c:2719 builtin/submodule--helper.c:3378
-msgid "reference repository"
-msgstr ""
-
-#: builtin/clone.c:127 builtin/submodule--helper.c:1887
-#: builtin/submodule--helper.c:2721
-msgid "use --reference only while cloning"
-msgstr ""
-
-#: builtin/clone.c:128 builtin/column.c:27 builtin/fmt-merge-msg.c:27
-#: builtin/init-db.c:550 builtin/merge-file.c:48 builtin/merge.c:290
-#: builtin/pack-objects.c:3967 builtin/repack.c:669
-#: builtin/submodule--helper.c:3380 t/helper/test-simple-ipc.c:595
-#: t/helper/test-simple-ipc.c:597
-msgid "name"
-msgstr ""
-
-#: builtin/clone.c:129
-msgid "use <name> instead of 'origin' to track upstream"
-msgstr ""
-
-#: builtin/clone.c:131
-msgid "checkout <branch> instead of the remote's HEAD"
-msgstr ""
-
-#: builtin/clone.c:133
-msgid "path to git-upload-pack on the remote"
-msgstr ""
-
-#: builtin/clone.c:134 builtin/fetch.c:182 builtin/grep.c:877
-#: builtin/pull.c:212
-msgid "depth"
-msgstr ""
-
-#: builtin/clone.c:135
-msgid "create a shallow clone of that depth"
-msgstr ""
-
-#: builtin/clone.c:136 builtin/fetch.c:184 builtin/pack-objects.c:3956
-#: builtin/pull.c:215
-msgid "time"
-msgstr ""
-
-#: builtin/clone.c:137
-msgid "create a shallow clone since a specific time"
-msgstr ""
-
-#: builtin/clone.c:138 builtin/fetch.c:186 builtin/fetch.c:212
-#: builtin/pull.c:218 builtin/pull.c:243 builtin/rebase.c:1050
-msgid "revision"
-msgstr ""
-
-#: builtin/clone.c:139 builtin/fetch.c:187 builtin/pull.c:219
-msgid "deepen history of shallow clone, excluding rev"
-msgstr ""
-
-#: builtin/clone.c:141 builtin/submodule--helper.c:1897
-#: builtin/submodule--helper.c:2735
-msgid "clone only one branch, HEAD or --branch"
-msgstr ""
-
-#: builtin/clone.c:143
-msgid "don't clone any tags, and make later fetches not to follow them"
-msgstr ""
-
-#: builtin/clone.c:145
-msgid "any cloned submodules will be shallow"
-msgstr ""
-
-#: builtin/clone.c:146 builtin/init-db.c:548
-msgid "gitdir"
-msgstr ""
-
-#: builtin/clone.c:147 builtin/init-db.c:549
-msgid "separate git dir from working tree"
-msgstr ""
-
-#: builtin/clone.c:148
-msgid "key=value"
-msgstr ""
-
-#: builtin/clone.c:149
-msgid "set config inside the new repository"
-msgstr ""
-
-#: builtin/clone.c:151 builtin/fetch.c:207 builtin/ls-remote.c:77
-#: builtin/pull.c:234 builtin/push.c:575 builtin/send-pack.c:200
-msgid "server-specific"
-msgstr ""
-
-#: builtin/clone.c:151 builtin/fetch.c:207 builtin/ls-remote.c:77
-#: builtin/pull.c:235 builtin/push.c:575 builtin/send-pack.c:201
-msgid "option to transmit"
-msgstr ""
-
-#: builtin/clone.c:152 builtin/fetch.c:208 builtin/pull.c:238
-#: builtin/push.c:576
-msgid "use IPv4 addresses only"
-msgstr ""
-
-#: builtin/clone.c:154 builtin/fetch.c:210 builtin/pull.c:241
-#: builtin/push.c:578
-msgid "use IPv6 addresses only"
-msgstr ""
-
-#: builtin/clone.c:158
-msgid "apply partial clone filters to submodules"
-msgstr ""
-
-#: builtin/clone.c:160
-msgid "any cloned submodules will use their remote-tracking branch"
-msgstr ""
-
-#: builtin/clone.c:162
-msgid "initialize sparse-checkout file to include only files at root"
-msgstr ""
-
-#: builtin/clone.c:237
-#, c-format
-msgid "info: Could not add alternate for '%s': %s\n"
-msgstr ""
-
-#: builtin/clone.c:310
-#, c-format
-msgid "%s exists and is not a directory"
-msgstr ""
-
-#: builtin/clone.c:328
-#, c-format
-msgid "failed to start iterator over '%s'"
-msgstr ""
-
-#: builtin/clone.c:359
-#, c-format
-msgid "failed to create link '%s'"
-msgstr ""
-
-#: builtin/clone.c:363
-#, c-format
-msgid "failed to copy file to '%s'"
-msgstr ""
-
-#: builtin/clone.c:368
-#, c-format
-msgid "failed to iterate over '%s'"
-msgstr ""
-
-#: builtin/clone.c:395
-#, c-format
-msgid "done.\n"
-msgstr ""
-
-#: builtin/clone.c:409
-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:486
-#, c-format
-msgid "Could not find remote branch %s to clone."
-msgstr ""
-
-#: builtin/clone.c:603
-#, c-format
-msgid "unable to update %s"
-msgstr ""
-
-#: builtin/clone.c:651
-msgid "failed to initialize sparse-checkout"
-msgstr ""
-
-#: builtin/clone.c:674
-msgid "remote HEAD refers to nonexistent ref, unable to checkout.\n"
-msgstr ""
-
-#: builtin/clone.c:709
-msgid "unable to checkout working tree"
-msgstr ""
-
-#: builtin/clone.c:793
-msgid "unable to write parameters to config file"
-msgstr ""
-
-#: builtin/clone.c:856
-msgid "cannot repack to clean up"
-msgstr ""
-
-#: builtin/clone.c:858
-msgid "cannot unlink temporary alternates file"
-msgstr ""
-
-#: builtin/clone.c:901
-msgid "Too many arguments."
-msgstr ""
-
-#: builtin/clone.c:905 contrib/scalar/scalar.c:413
-msgid "You must specify a repository to clone."
-msgstr ""
-
-#: builtin/clone.c:918
-#, c-format
-msgid "options '%s' and '%s %s' cannot be used together"
-msgstr ""
-
-#: builtin/clone.c:935
-#, c-format
-msgid "repository '%s' does not exist"
-msgstr ""
-
-#: builtin/clone.c:939 builtin/fetch.c:2176
-#, c-format
-msgid "depth %s is not a positive number"
-msgstr ""
-
-#: builtin/clone.c:949
-#, c-format
-msgid "destination path '%s' already exists and is not an empty directory."
-msgstr ""
-
-#: builtin/clone.c:955
-#, c-format
-msgid "repository path '%s' already exists and is not an empty directory."
-msgstr ""
-
-#: builtin/clone.c:969
-#, c-format
-msgid "working tree '%s' already exists."
-msgstr ""
-
-#: builtin/clone.c:984 builtin/clone.c:1005 builtin/difftool.c:256
-#: builtin/log.c:2037 builtin/worktree.c:350 builtin/worktree.c:382
-#, c-format
-msgid "could not create leading directories of '%s'"
-msgstr ""
-
-#: builtin/clone.c:989
-#, c-format
-msgid "could not create work tree dir '%s'"
-msgstr ""
-
-#: builtin/clone.c:1009
-#, c-format
-msgid "Cloning into bare repository '%s'...\n"
-msgstr ""
-
-#: builtin/clone.c:1011
-#, c-format
-msgid "Cloning into '%s'...\n"
-msgstr ""
-
-#: builtin/clone.c:1040
-msgid ""
-"clone --recursive is not compatible with both --reference and --reference-if-"
-"able"
-msgstr ""
-
-#: builtin/clone.c:1116 builtin/remote.c:201 builtin/remote.c:721
-#, c-format
-msgid "'%s' is not a valid remote name"
-msgstr ""
-
-#: builtin/clone.c:1157
-msgid "--depth is ignored in local clones; use file:// instead."
-msgstr ""
-
-#: builtin/clone.c:1159
-msgid "--shallow-since is ignored in local clones; use file:// instead."
-msgstr ""
-
-#: builtin/clone.c:1161
-msgid "--shallow-exclude is ignored in local clones; use file:// instead."
-msgstr ""
-
-#: builtin/clone.c:1163
-msgid "--filter is ignored in local clones; use file:// instead."
-msgstr ""
-
-#: builtin/clone.c:1168
-msgid "source repository is shallow, ignoring --local"
-msgstr ""
-
-#: builtin/clone.c:1173
-msgid "--local is ignored"
-msgstr ""
-
-#: builtin/clone.c:1185
-msgid "cannot clone from filtered bundle"
-msgstr ""
-
-#: builtin/clone.c:1265 builtin/clone.c:1324
-msgid "remote transport reported error"
-msgstr ""
-
-#: builtin/clone.c:1277 builtin/clone.c:1289
-#, c-format
-msgid "Remote branch %s not found in upstream %s"
-msgstr ""
-
-#: builtin/clone.c:1292
-msgid "You appear to have cloned an empty repository."
-msgstr ""
-
-#: builtin/column.c:10
-msgid "git column [<options>]"
-msgstr ""
-
-#: builtin/column.c:27
-msgid "lookup config vars"
-msgstr ""
-
-#: builtin/column.c:28 builtin/column.c:29
-msgid "layout to use"
-msgstr ""
-
-#: builtin/column.c:30
-msgid "maximum width"
-msgstr ""
-
-#: builtin/column.c:31
-msgid "padding space on left border"
-msgstr ""
-
-#: builtin/column.c:32
-msgid "padding space on right border"
-msgstr ""
-
-#: builtin/column.c:33
-msgid "padding space between columns"
-msgstr ""
-
-#: builtin/column.c:51
-msgid "--command must be the first argument"
-msgstr ""
-
-#: builtin/commit-graph.c:13
-msgid ""
-"git commit-graph verify [--object-dir <objdir>] [--shallow] [--[no-]progress]"
-msgstr ""
-
-#: 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:51 builtin/fetch.c:196 builtin/log.c:1813
-msgid "dir"
-msgstr ""
-
-#: builtin/commit-graph.c:52
-msgid "the object directory to store the graph"
-msgstr ""
-
-#: builtin/commit-graph.c:73
-msgid "if the commit-graph is split, only verify the tip file"
-msgstr ""
-
-#: builtin/commit-graph.c:100
-#, c-format
-msgid "Could not open commit-graph '%s'"
-msgstr ""
-
-#: builtin/commit-graph.c:137
-#, c-format
-msgid "unrecognized --split argument, %s"
-msgstr ""
-
-#: builtin/commit-graph.c:150
-#, c-format
-msgid "unexpected non-hex object ID: %s"
-msgstr ""
-
-#: builtin/commit-graph.c:155
-#, c-format
-msgid "invalid object: %s"
-msgstr ""
-
-#: builtin/commit-graph.c:205
-msgid "start walk at all refs"
-msgstr ""
-
-#: builtin/commit-graph.c:207
-msgid "scan pack-indexes listed by stdin for commits"
-msgstr ""
-
-#: builtin/commit-graph.c:209
-msgid "start walk at commits listed by stdin"
-msgstr ""
-
-#: builtin/commit-graph.c:211
-msgid "include all commits already in the commit-graph file"
-msgstr ""
-
-#: builtin/commit-graph.c:213
-msgid "enable computation for changed paths"
-msgstr ""
-
-#: builtin/commit-graph.c:215
-msgid "allow writing an incremental commit-graph file"
-msgstr ""
-
-#: builtin/commit-graph.c:219
-msgid "maximum number of commits in a non-base split commit-graph"
-msgstr ""
-
-#: builtin/commit-graph.c:221
-msgid "maximum ratio between two levels of a split commit-graph"
-msgstr ""
-
-#: builtin/commit-graph.c:223
-msgid "only expire files older than a given date-time"
-msgstr ""
-
-#: builtin/commit-graph.c:225
-msgid "maximum number of changed-path Bloom filters to compute"
-msgstr ""
-
-#: builtin/commit-graph.c:251
-msgid "use at most one of --reachable, --stdin-commits, or --stdin-packs"
-msgstr ""
-
-#: builtin/commit-graph.c:282
-msgid "Collecting commits from input"
-msgstr ""
-
-#: builtin/commit-graph.c:328 builtin/multi-pack-index.c:259
-#, 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 ""
-
-#: builtin/commit-tree.c:31
-#, c-format
-msgid "duplicate parent %s ignored"
-msgstr ""
-
-#: builtin/commit-tree.c:56 builtin/commit-tree.c:134 builtin/log.c:590
-#, c-format
-msgid "not a valid object name %s"
-msgstr ""
-
-#: builtin/commit-tree.c:94
-#, c-format
-msgid "git commit-tree: failed to read '%s'"
-msgstr ""
-
-#: builtin/commit-tree.c:96
-#, c-format
-msgid "git commit-tree: failed to close '%s'"
-msgstr ""
-
-#: builtin/commit-tree.c:109
-msgid "parent"
-msgstr ""
-
-#: builtin/commit-tree.c:110
-msgid "id of a parent commit object"
-msgstr ""
-
-#: builtin/commit-tree.c:112 builtin/commit.c:1626 builtin/merge.c:284
-#: builtin/notes.c:407 builtin/notes.c:573 builtin/stash.c:1666
-#: builtin/tag.c:455
-msgid "message"
-msgstr ""
-
-#: builtin/commit-tree.c:113 builtin/commit.c:1626
-msgid "commit message"
-msgstr ""
-
-#: builtin/commit-tree.c:116
-msgid "read commit log message from file"
-msgstr ""
-
-#: builtin/commit-tree.c:119 builtin/commit.c:1643 builtin/merge.c:303
-#: builtin/pull.c:180 builtin/revert.c:118
-msgid "GPG sign commit"
-msgstr ""
-
-#: builtin/commit-tree.c:131
-msgid "must give exactly one tree"
-msgstr ""
-
-#: builtin/commit-tree.c:138
-msgid "git commit-tree: failed to read"
-msgstr ""
-
-#: builtin/commit.c:43
-msgid "git commit [<options>] [--] <pathspec>..."
-msgstr ""
-
-#: builtin/commit.c:48
-msgid "git status [<options>] [--] <pathspec>..."
-msgstr ""
-
-#: builtin/commit.c:53
-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:58
-msgid ""
-"The previous cherry-pick is now empty, possibly due to conflict resolution.\n"
-"If you wish to commit it anyway, use:\n"
-"\n"
-"    git commit --allow-empty\n"
-"\n"
-msgstr ""
-
-#: builtin/commit.c:65
-msgid "Otherwise, please use 'git rebase --skip'\n"
-msgstr ""
-
-#: builtin/commit.c:68
-msgid "Otherwise, please use 'git cherry-pick --skip'\n"
-msgstr ""
-
-#: builtin/commit.c:71
-msgid ""
-"and then use:\n"
-"\n"
-"    git cherry-pick --continue\n"
-"\n"
-"to resume cherry-picking the remaining commits.\n"
-"If you wish to skip this commit, use:\n"
-"\n"
-"    git cherry-pick --skip\n"
-"\n"
-msgstr ""
-
-#: builtin/commit.c:326
-msgid "failed to unpack HEAD tree object"
-msgstr ""
-
-#: builtin/commit.c:376
-msgid "No paths with --include/--only does not make sense."
-msgstr ""
-
-#: builtin/commit.c:388
-msgid "unable to create temporary index"
-msgstr ""
-
-#: builtin/commit.c:397
-msgid "interactive add failed"
-msgstr ""
-
-#: builtin/commit.c:412
-msgid "unable to update temporary index"
-msgstr ""
-
-#: builtin/commit.c:414
-msgid "Failed to update main cache tree"
-msgstr ""
-
-#: builtin/commit.c:439 builtin/commit.c:462 builtin/commit.c:510
-msgid "unable to write new_index file"
-msgstr ""
-
-#: builtin/commit.c:491
-msgid "cannot do a partial commit during a merge."
-msgstr ""
-
-#: builtin/commit.c:493
-msgid "cannot do a partial commit during a cherry-pick."
-msgstr ""
-
-#: builtin/commit.c:495
-msgid "cannot do a partial commit during a rebase."
-msgstr ""
-
-#: builtin/commit.c:503
-msgid "cannot read the index"
-msgstr ""
-
-#: builtin/commit.c:522
-msgid "unable to write temporary index file"
-msgstr ""
-
-#: builtin/commit.c:620
-#, c-format
-msgid "commit '%s' lacks author header"
-msgstr ""
-
-#: builtin/commit.c:622
-#, c-format
-msgid "commit '%s' has malformed author line"
-msgstr ""
-
-#: builtin/commit.c:641
-msgid "malformed --author parameter"
-msgstr ""
-
-#: builtin/commit.c:694
-msgid ""
-"unable to select a comment character that is not used\n"
-"in the current commit message"
-msgstr ""
-
-#: builtin/commit.c:750 builtin/commit.c:784 builtin/commit.c:1170
-#, c-format
-msgid "could not lookup commit %s"
-msgstr ""
-
-#: builtin/commit.c:762 builtin/shortlog.c:417
-#, c-format
-msgid "(reading log message from standard input)\n"
-msgstr ""
-
-#: builtin/commit.c:764
-msgid "could not read log from standard input"
-msgstr ""
-
-#: builtin/commit.c:768
-#, c-format
-msgid "could not read log file '%s'"
-msgstr ""
-
-#: builtin/commit.c:805
-#, c-format
-msgid "options '%s' and '%s:%s' cannot be used together"
-msgstr ""
-
-#: builtin/commit.c:817 builtin/commit.c:833
-msgid "could not read SQUASH_MSG"
-msgstr ""
-
-#: builtin/commit.c:824
-msgid "could not read MERGE_MSG"
-msgstr ""
-
-#: builtin/commit.c:884
-msgid "could not write commit template"
-msgstr ""
-
-#: builtin/commit.c:897
-#, c-format
-msgid ""
-"Please enter the commit message for your changes. Lines starting\n"
-"with '%c' will be ignored.\n"
-msgstr ""
-
-#: builtin/commit.c:899
-#, 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:903
-#, 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:907
-#, 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 ""
-
-#: builtin/commit.c:919
-msgid ""
-"\n"
-"It looks like you may be committing a merge.\n"
-"If this is not correct, please run\n"
-"\tgit update-ref -d MERGE_HEAD\n"
-"and try again.\n"
-msgstr ""
-
-#: builtin/commit.c:924
-msgid ""
-"\n"
-"It looks like you may be committing a cherry-pick.\n"
-"If this is not correct, please run\n"
-"\tgit update-ref -d CHERRY_PICK_HEAD\n"
-"and try again.\n"
-msgstr ""
-
-#: builtin/commit.c:951
-#, c-format
-msgid "%sAuthor:    %.*s <%.*s>"
-msgstr ""
-
-#: builtin/commit.c:959
-#, c-format
-msgid "%sDate:      %s"
-msgstr ""
-
-#: builtin/commit.c:966
-#, c-format
-msgid "%sCommitter: %.*s <%.*s>"
-msgstr ""
-
-#: builtin/commit.c:984
-msgid "Cannot read index"
-msgstr ""
-
-#: builtin/commit.c:1029
-msgid "unable to pass trailers to --trailers"
-msgstr ""
-
-#: builtin/commit.c:1069
-msgid "Error building trees"
-msgstr ""
-
-#: builtin/commit.c:1083 builtin/tag.c:317
-#, c-format
-msgid "Please supply the message using either -m or -F option.\n"
-msgstr ""
-
-#: builtin/commit.c:1128
-#, c-format
-msgid "--author '%s' is not 'Name <email>' and matches no existing author"
-msgstr ""
-
-#: builtin/commit.c:1142
-#, c-format
-msgid "Invalid ignored mode '%s'"
-msgstr ""
-
-#: builtin/commit.c:1160 builtin/commit.c:1450
-#, c-format
-msgid "Invalid untracked files mode '%s'"
-msgstr ""
-
-#: builtin/commit.c:1231
-msgid "You are in the middle of a merge -- cannot reword."
-msgstr ""
-
-#: builtin/commit.c:1233
-msgid "You are in the middle of a cherry-pick -- cannot reword."
-msgstr ""
-
-#: builtin/commit.c:1236
-#, c-format
-msgid "reword option of '%s' and path '%s' cannot be used together"
-msgstr ""
-
-#: builtin/commit.c:1238
-#, c-format
-msgid "reword option of '%s' and '%s' cannot be used together"
-msgstr ""
-
-#: builtin/commit.c:1263
-msgid "You have nothing to amend."
-msgstr ""
-
-#: builtin/commit.c:1266
-msgid "You are in the middle of a merge -- cannot amend."
-msgstr ""
-
-#: builtin/commit.c:1268
-msgid "You are in the middle of a cherry-pick -- cannot amend."
-msgstr ""
-
-#: builtin/commit.c:1270
-msgid "You are in the middle of a rebase -- cannot amend."
-msgstr ""
-
-#: builtin/commit.c:1290
-msgid "--reset-author can be used only with -C, -c or --amend."
-msgstr ""
-
-#: builtin/commit.c:1337
-#, c-format
-msgid "unknown option: --fixup=%s:%s"
-msgstr ""
-
-#: builtin/commit.c:1354
-#, c-format
-msgid "paths '%s ...' with -a does not make sense"
-msgstr ""
-
-#: builtin/commit.c:1485 builtin/commit.c:1654
-msgid "show status concisely"
-msgstr ""
-
-#: builtin/commit.c:1487 builtin/commit.c:1656
-msgid "show branch information"
-msgstr ""
-
-#: builtin/commit.c:1489
-msgid "show stash information"
-msgstr ""
-
-#: builtin/commit.c:1491 builtin/commit.c:1658
-msgid "compute full ahead/behind values"
-msgstr ""
-
-#: builtin/commit.c:1493
-msgid "version"
-msgstr ""
-
-#: builtin/commit.c:1493 builtin/commit.c:1660 builtin/push.c:551
-#: builtin/worktree.c:765
-msgid "machine-readable output"
-msgstr ""
-
-#: builtin/commit.c:1496 builtin/commit.c:1662
-msgid "show status in long format (default)"
-msgstr ""
-
-#: builtin/commit.c:1499 builtin/commit.c:1665
-msgid "terminate entries with NUL"
-msgstr ""
-
-#: builtin/commit.c:1501 builtin/commit.c:1505 builtin/commit.c:1668
-#: builtin/fast-export.c:1172 builtin/fast-export.c:1175
-#: builtin/fast-export.c:1178 builtin/rebase.c:1139 parse-options.h:368
-msgid "mode"
-msgstr ""
-
-#: builtin/commit.c:1502 builtin/commit.c:1668
-msgid "show untracked files, optional modes: all, normal, no. (Default: all)"
-msgstr ""
-
-#: builtin/commit.c:1506
-msgid ""
-"show ignored files, optional modes: traditional, matching, no. (Default: "
-"traditional)"
-msgstr ""
-
-#: builtin/commit.c:1508 parse-options.h:197
-msgid "when"
-msgstr ""
-
-#: builtin/commit.c:1509
-msgid ""
-"ignore changes to submodules, optional when: all, dirty, untracked. "
-"(Default: all)"
-msgstr ""
-
-#: builtin/commit.c:1511
-msgid "list untracked files in columns"
-msgstr ""
-
-#: builtin/commit.c:1512
-msgid "do not detect renames"
-msgstr ""
-
-#: builtin/commit.c:1514
-msgid "detect renames, optionally set similarity index"
-msgstr ""
-
-#: builtin/commit.c:1537
-msgid "Unsupported combination of ignored and untracked-files arguments"
-msgstr ""
-
-#: builtin/commit.c:1619
-msgid "suppress summary after successful commit"
-msgstr ""
-
-#: builtin/commit.c:1620
-msgid "show diff in commit message template"
-msgstr ""
-
-#: builtin/commit.c:1622
-msgid "Commit message options"
-msgstr ""
-
-#: builtin/commit.c:1623 builtin/merge.c:288 builtin/tag.c:457
-msgid "read message from file"
-msgstr ""
-
-#: builtin/commit.c:1624
-msgid "author"
-msgstr ""
-
-#: builtin/commit.c:1624
-msgid "override author for commit"
-msgstr ""
-
-#: builtin/commit.c:1625 builtin/gc.c:551
-msgid "date"
-msgstr ""
-
-#: builtin/commit.c:1625
-msgid "override date for commit"
-msgstr ""
-
-#: builtin/commit.c:1627 builtin/commit.c:1628 builtin/commit.c:1634
-#: parse-options.h:360 ref-filter.h:89
-msgid "commit"
-msgstr ""
-
-#: builtin/commit.c:1627
-msgid "reuse and edit message from specified commit"
-msgstr ""
-
-#: builtin/commit.c:1628
-msgid "reuse message from specified commit"
-msgstr ""
-
-#. TRANSLATORS: Leave "[(amend|reword):]" as-is,
-#. and only translate <commit>.
-#.
-#: builtin/commit.c:1633
-msgid "[(amend|reword):]commit"
-msgstr ""
-
-#: builtin/commit.c:1633
-msgid ""
-"use autosquash formatted message to fixup or amend/reword specified commit"
-msgstr ""
-
-#: builtin/commit.c:1634
-msgid "use autosquash formatted message to squash specified commit"
-msgstr ""
-
-#: builtin/commit.c:1635
-msgid "the commit is authored by me now (used with -C/-c/--amend)"
-msgstr ""
-
-#: builtin/commit.c:1636 builtin/interpret-trailers.c:111
-msgid "trailer"
-msgstr ""
-
-#: builtin/commit.c:1636
-msgid "add custom trailer(s)"
-msgstr ""
-
-#: builtin/commit.c:1637 builtin/log.c:1788 builtin/merge.c:306
-#: builtin/pull.c:146 builtin/revert.c:110
-msgid "add a Signed-off-by trailer"
-msgstr ""
-
-#: builtin/commit.c:1638
-msgid "use specified template file"
-msgstr ""
-
-#: builtin/commit.c:1639
-msgid "force edit of commit"
-msgstr ""
-
-#: builtin/commit.c:1641
-msgid "include status in commit message template"
-msgstr ""
-
-#: builtin/commit.c:1646
-msgid "Commit contents options"
-msgstr ""
-
-#: builtin/commit.c:1647
-msgid "commit all changed files"
-msgstr ""
-
-#: builtin/commit.c:1648
-msgid "add specified files to index for commit"
-msgstr ""
-
-#: builtin/commit.c:1649
-msgid "interactively add files"
-msgstr ""
-
-#: builtin/commit.c:1650
-msgid "interactively add changes"
-msgstr ""
-
-#: builtin/commit.c:1651
-msgid "commit only specified files"
-msgstr ""
-
-#: builtin/commit.c:1652
-msgid "bypass pre-commit and commit-msg hooks"
-msgstr ""
-
-#: builtin/commit.c:1653
-msgid "show what would be committed"
-msgstr ""
-
-#: builtin/commit.c:1666
-msgid "amend previous commit"
-msgstr ""
-
-#: builtin/commit.c:1667
-msgid "bypass post-rewrite hook"
-msgstr ""
-
-#: builtin/commit.c:1674
-msgid "ok to record an empty change"
-msgstr ""
-
-#: builtin/commit.c:1676
-msgid "ok to record a change with an empty message"
-msgstr ""
-
-#: builtin/commit.c:1752
-#, c-format
-msgid "Corrupt MERGE_HEAD file (%s)"
-msgstr ""
-
-#: builtin/commit.c:1759
-msgid "could not read MERGE_MODE"
-msgstr ""
-
-#: builtin/commit.c:1780
-#, c-format
-msgid "could not read commit message: %s"
-msgstr ""
-
-#: builtin/commit.c:1787
-#, c-format
-msgid "Aborting commit due to empty commit message.\n"
-msgstr ""
-
-#: builtin/commit.c:1792
-#, c-format
-msgid "Aborting commit; you did not edit the message.\n"
-msgstr ""
-
-#: builtin/commit.c:1803
-#, c-format
-msgid "Aborting commit due to empty commit message body.\n"
-msgstr ""
-
-#: 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 ""
-
-#: builtin/config.c:11
-msgid "git config [<options>]"
-msgstr ""
-
-#: builtin/config.c:109 builtin/env--helper.c:27
-#, c-format
-msgid "unrecognized --type argument, %s"
-msgstr ""
-
-#: builtin/config.c:121
-msgid "only one type at a time"
-msgstr ""
-
-#: builtin/config.c:130
-msgid "Config file location"
-msgstr ""
-
-#: builtin/config.c:131
-msgid "use global config file"
-msgstr ""
-
-#: builtin/config.c:132
-msgid "use system config file"
-msgstr ""
-
-#: builtin/config.c:133
-msgid "use repository config file"
-msgstr ""
-
-#: builtin/config.c:134
-msgid "use per-worktree config file"
-msgstr ""
-
-#: builtin/config.c:135
-msgid "use given config file"
-msgstr ""
-
-#: builtin/config.c:136
-msgid "blob-id"
-msgstr ""
-
-#: builtin/config.c:136
-msgid "read config from given blob object"
-msgstr ""
-
-#: builtin/config.c:137
-msgid "Action"
-msgstr ""
-
-#: builtin/config.c:138
-msgid "get value: name [value-pattern]"
-msgstr ""
-
-#: builtin/config.c:139
-msgid "get all values: key [value-pattern]"
-msgstr ""
-
-#: builtin/config.c:140
-msgid "get values for regexp: name-regex [value-pattern]"
-msgstr ""
-
-#: builtin/config.c:141
-msgid "get value specific for the URL: section[.var] URL"
-msgstr ""
-
-#: builtin/config.c:142
-msgid "replace all matching variables: name value [value-pattern]"
-msgstr ""
-
-#: builtin/config.c:143
-msgid "add a new variable: name value"
-msgstr ""
-
-#: builtin/config.c:144
-msgid "remove a variable: name [value-pattern]"
-msgstr ""
-
-#: builtin/config.c:145
-msgid "remove all matches: name [value-pattern]"
-msgstr ""
-
-#: builtin/config.c:146
-msgid "rename section: old-name new-name"
-msgstr ""
-
-#: builtin/config.c:147
-msgid "remove a section: name"
-msgstr ""
-
-#: builtin/config.c:148
-msgid "list all"
-msgstr ""
-
-#: builtin/config.c:149
-msgid "use string equality when comparing values to 'value-pattern'"
-msgstr ""
-
-#: builtin/config.c:150
-msgid "open an editor"
-msgstr ""
-
-#: builtin/config.c:151
-msgid "find the color configured: slot [default]"
-msgstr ""
-
-#: builtin/config.c:152
-msgid "find the color setting: slot [stdout-is-tty]"
-msgstr ""
-
-#: builtin/config.c:153
-msgid "Type"
-msgstr ""
-
-#: builtin/config.c:154 builtin/env--helper.c:42 builtin/hash-object.c:97
-msgid "type"
-msgstr ""
-
-#: builtin/config.c:154 builtin/env--helper.c:43
-msgid "value is given this type"
-msgstr ""
-
-#: builtin/config.c:155
-msgid "value is \"true\" or \"false\""
-msgstr ""
-
-#: builtin/config.c:156
-msgid "value is decimal number"
-msgstr ""
-
-#: builtin/config.c:157
-msgid "value is --bool or --int"
-msgstr ""
-
-#: builtin/config.c:158
-msgid "value is --bool or string"
-msgstr ""
-
-#: builtin/config.c:159
-msgid "value is a path (file or directory name)"
-msgstr ""
-
-#: builtin/config.c:160
-msgid "value is an expiry date"
-msgstr ""
-
-#: builtin/config.c:161
-msgid "Other"
-msgstr ""
-
-#: builtin/config.c:162
-msgid "terminate values with NUL byte"
-msgstr ""
-
-#: builtin/config.c:163
-msgid "show variable names only"
-msgstr ""
-
-#: builtin/config.c:164
-msgid "respect include directives on lookup"
-msgstr ""
-
-#: builtin/config.c:165
-msgid "show origin of config (file, standard input, blob, command line)"
-msgstr ""
-
-#: builtin/config.c:166
-msgid "show scope of config (worktree, local, global, system, command)"
-msgstr ""
-
-#: builtin/config.c:167 builtin/env--helper.c:45
-msgid "value"
-msgstr ""
-
-#: builtin/config.c:167
-msgid "with --get, use default value when missing entry"
-msgstr ""
-
-#: builtin/config.c:181
-#, c-format
-msgid "wrong number of arguments, should be %d"
-msgstr ""
-
-#: builtin/config.c:183
-#, c-format
-msgid "wrong number of arguments, should be from %d to %d"
-msgstr ""
-
-#: builtin/config.c:339
-#, c-format
-msgid "invalid key pattern: %s"
-msgstr ""
-
-#: builtin/config.c:377
-#, c-format
-msgid "failed to format default config value: %s"
-msgstr ""
-
-#: builtin/config.c:441
-#, c-format
-msgid "cannot parse color '%s'"
-msgstr ""
-
-#: builtin/config.c:483
-msgid "unable to parse default color value"
-msgstr ""
-
-#: builtin/config.c:536 builtin/config.c:833
-msgid "not in a git directory"
-msgstr ""
-
-#: builtin/config.c:539
-msgid "writing to stdin is not supported"
-msgstr ""
-
-#: builtin/config.c:542
-msgid "writing config blobs is not supported"
-msgstr ""
-
-#: builtin/config.c:627
-#, c-format
-msgid ""
-"# This is Git's per-user configuration file.\n"
-"[user]\n"
-"# Please adapt and uncomment the following lines:\n"
-"#\tname = %s\n"
-"#\temail = %s\n"
-msgstr ""
-
-#: builtin/config.c:652
-msgid "only one config file at a time"
-msgstr ""
-
-#: builtin/config.c:658
-msgid "--local can only be used inside a git repository"
-msgstr ""
-
-#: builtin/config.c:660
-msgid "--blob can only be used inside a git repository"
-msgstr ""
-
-#: builtin/config.c:662
-msgid "--worktree can only be used inside a git repository"
-msgstr ""
-
-#: builtin/config.c:684
-msgid "$HOME not set"
-msgstr ""
-
-#: builtin/config.c:708
-msgid ""
-"--worktree cannot be used with multiple working trees unless the config\n"
-"extension worktreeConfig is enabled. Please read \"CONFIGURATION FILE\"\n"
-"section in \"git help worktree\" for details"
-msgstr ""
-
-#: builtin/config.c:743
-msgid "--get-color and variable type are incoherent"
-msgstr ""
-
-#: builtin/config.c:748
-msgid "only one action at a time"
-msgstr ""
-
-#: builtin/config.c:761
-msgid "--name-only is only applicable to --list or --get-regexp"
-msgstr ""
-
-#: builtin/config.c:767
-msgid ""
-"--show-origin is only applicable to --get, --get-all, --get-regexp, and --"
-"list"
-msgstr ""
-
-#: builtin/config.c:773
-msgid "--default is only applicable to --get"
-msgstr ""
-
-#: builtin/config.c:806
-msgid "--fixed-value only applies with 'value-pattern'"
-msgstr ""
-
-#: builtin/config.c:822
-#, c-format
-msgid "unable to read config file '%s'"
-msgstr ""
-
-#: builtin/config.c:825
-msgid "error processing config file(s)"
-msgstr ""
-
-#: builtin/config.c:835
-msgid "editing stdin is not supported"
-msgstr ""
-
-#: builtin/config.c:837
-msgid "editing blobs is not supported"
-msgstr ""
-
-#: builtin/config.c:851
-#, c-format
-msgid "cannot create configuration file %s"
-msgstr ""
-
-#: builtin/config.c:864
-#, c-format
-msgid ""
-"cannot overwrite multiple values with a single value\n"
-"       Use a regexp, --add or --replace-all to change %s."
-msgstr ""
-
-#: builtin/config.c:943 builtin/config.c:954
-#, c-format
-msgid "no such section: %s"
-msgstr ""
-
-#: builtin/count-objects.c:100
-msgid "print sizes in human readable format"
-msgstr ""
-
-#: builtin/credential-cache--daemon.c:227
-#, c-format
-msgid ""
-"The permissions on your socket directory are too loose; other\n"
-"users may be able to read your cached credentials. Consider running:\n"
-"\n"
-"\tchmod 0700 %s"
-msgstr ""
-
-#: builtin/credential-cache--daemon.c:276
-msgid "print debugging messages to stderr"
-msgstr ""
-
-#: builtin/credential-cache--daemon.c:316
-msgid "credential-cache--daemon unavailable; no unix socket support"
-msgstr ""
-
-#: builtin/credential-cache.c:180
-msgid "credential-cache unavailable; no unix socket support"
-msgstr ""
-
-#: builtin/credential-store.c:66
-#, c-format
-msgid "unable to get credential storage lock in %d ms"
-msgstr ""
-
-#: builtin/describe.c:26
-msgid "git describe [<options>] [<commit-ish>...]"
-msgstr ""
-
-#: builtin/describe.c:27
-msgid "git describe [<options>] --dirty"
-msgstr ""
-
-#: builtin/describe.c:63
-msgid "head"
-msgstr ""
-
-#: builtin/describe.c:63
-msgid "lightweight"
-msgstr ""
-
-#: builtin/describe.c:63
-msgid "annotated"
-msgstr ""
-
-#: builtin/describe.c:277
-#, c-format
-msgid "annotated tag %s not available"
-msgstr ""
-
-#: builtin/describe.c:281
-#, c-format
-msgid "tag '%s' is externally known as '%s'"
-msgstr ""
-
-#: builtin/describe.c:328
-#, c-format
-msgid "no tag exactly matches '%s'"
-msgstr ""
-
-#: builtin/describe.c:330
-#, c-format
-msgid "No exact match on refs or tags, searching to describe\n"
-msgstr ""
-
-#: builtin/describe.c:397
-#, c-format
-msgid "finished search at %s\n"
-msgstr ""
-
-#: builtin/describe.c:424
-#, c-format
-msgid ""
-"No annotated tags can describe '%s'.\n"
-"However, there were unannotated tags: try --tags."
-msgstr ""
-
-#: builtin/describe.c:428
-#, c-format
-msgid ""
-"No tags can describe '%s'.\n"
-"Try --always, or create some tags."
-msgstr ""
-
-#: builtin/describe.c:458
-#, c-format
-msgid "traversed %lu commits\n"
-msgstr ""
-
-#: builtin/describe.c:461
-#, c-format
-msgid ""
-"more than %i tags found; listed %i most recent\n"
-"gave up search at %s\n"
-msgstr ""
-
-#: builtin/describe.c:529
-#, c-format
-msgid "describe %s\n"
-msgstr ""
-
-#: builtin/describe.c:532
-#, c-format
-msgid "Not a valid object name %s"
-msgstr ""
-
-#: builtin/describe.c:540
-#, c-format
-msgid "%s is neither a commit nor blob"
-msgstr ""
-
-#: builtin/describe.c:554
-msgid "find the tag that comes after the commit"
-msgstr ""
-
-#: builtin/describe.c:555
-msgid "debug search strategy on stderr"
-msgstr ""
-
-#: builtin/describe.c:556
-msgid "use any ref"
-msgstr ""
-
-#: builtin/describe.c:557
-msgid "use any tag, even unannotated"
-msgstr ""
-
-#: builtin/describe.c:558
-msgid "always use long format"
-msgstr ""
-
-#: builtin/describe.c:559
-msgid "only follow first parent"
-msgstr ""
-
-#: builtin/describe.c:562
-msgid "only output exact matches"
-msgstr ""
-
-#: builtin/describe.c:564
-msgid "consider <n> most recent tags (default: 10)"
-msgstr ""
-
-#: builtin/describe.c:566
-msgid "only consider tags matching <pattern>"
-msgstr ""
-
-#: builtin/describe.c:568
-msgid "do not consider tags matching <pattern>"
-msgstr ""
-
-#: builtin/describe.c:570 builtin/name-rev.c:595
-msgid "show abbreviated commit object as fallback"
-msgstr ""
-
-#: builtin/describe.c:571 builtin/describe.c:574
-msgid "mark"
-msgstr ""
-
-#: builtin/describe.c:572
-msgid "append <mark> on dirty working tree (default: \"-dirty\")"
-msgstr ""
-
-#: builtin/describe.c:575
-msgid "append <mark> on broken working tree (default: \"-broken\")"
-msgstr ""
-
-#: builtin/describe.c:622
-msgid "No names found, cannot describe anything."
-msgstr ""
-
-#: builtin/describe.c:673 builtin/describe.c:675
-#, c-format
-msgid "option '%s' and commit-ishes cannot be used together"
-msgstr ""
-
-#: builtin/diff-tree.c:157
-msgid "--merge-base only works with two commits"
-msgstr ""
-
-#: builtin/diff.c:92
-#, c-format
-msgid "'%s': not a regular file or symlink"
-msgstr ""
-
-#: builtin/diff.c:259
-#, c-format
-msgid "invalid option: %s"
-msgstr ""
-
-#: builtin/diff.c:376
-#, c-format
-msgid "%s...%s: no merge base"
-msgstr ""
-
-#: builtin/diff.c:491
-msgid "Not a git repository"
-msgstr ""
-
-#: builtin/diff.c:537 builtin/grep.c:700
-#, c-format
-msgid "invalid object '%s' given."
-msgstr ""
-
-#: builtin/diff.c:548
-#, c-format
-msgid "more than two blobs given: '%s'"
-msgstr ""
-
-#: builtin/diff.c:553
-#, c-format
-msgid "unhandled object '%s' given."
-msgstr ""
-
-#: builtin/diff.c:587
-#, c-format
-msgid "%s...%s: multiple merge bases, using %s"
-msgstr ""
-
-#: builtin/difftool.c:31
-msgid "git difftool [<options>] [<commit> [<commit>]] [--] [<path>...]"
-msgstr ""
-
-#: builtin/difftool.c:287
-#, c-format
-msgid "could not read symlink %s"
-msgstr ""
-
-#: builtin/difftool.c:289
-#, c-format
-msgid "could not read symlink file %s"
-msgstr ""
-
-#: builtin/difftool.c:297
-#, c-format
-msgid "could not read object %s for symlink %s"
-msgstr ""
-
-#: builtin/difftool.c:421
-msgid ""
-"combined diff formats ('-c' and '--cc') are not supported in\n"
-"directory diff mode ('-d' and '--dir-diff')."
-msgstr ""
-
-#: builtin/difftool.c:626
-#, c-format
-msgid "both files modified: '%s' and '%s'."
-msgstr ""
-
-#: builtin/difftool.c:628
-msgid "working tree file has been left."
-msgstr ""
-
-#: builtin/difftool.c:639
-#, c-format
-msgid "temporary files exist in '%s'."
-msgstr ""
-
-#: builtin/difftool.c:640
-msgid "you may want to cleanup or recover these."
-msgstr ""
-
-#: builtin/difftool.c:645
-#, c-format
-msgid "failed: %d"
-msgstr ""
-
-#: builtin/difftool.c:690
-msgid "use `diff.guitool` instead of `diff.tool`"
-msgstr ""
-
-#: builtin/difftool.c:692
-msgid "perform a full-directory diff"
-msgstr ""
-
-#: builtin/difftool.c:694
-msgid "do not prompt before launching a diff tool"
-msgstr ""
-
-#: builtin/difftool.c:699
-msgid "use symlinks in dir-diff mode"
-msgstr ""
-
-#: builtin/difftool.c:700
-msgid "tool"
-msgstr ""
-
-#: builtin/difftool.c:701
-msgid "use the specified diff tool"
-msgstr ""
-
-#: builtin/difftool.c:703
-msgid "print a list of diff tools that may be used with `--tool`"
-msgstr ""
-
-#: builtin/difftool.c:706
-msgid ""
-"make 'git-difftool' exit when an invoked diff tool returns a non-zero exit "
-"code"
-msgstr ""
-
-#: builtin/difftool.c:709
-msgid "specify a custom command for viewing diffs"
-msgstr ""
-
-#: builtin/difftool.c:710
-msgid "passed to `diff`"
-msgstr ""
-
-#: builtin/difftool.c:726
-msgid "difftool requires worktree or --no-index"
-msgstr ""
-
-#: builtin/difftool.c:745
-msgid "no <tool> given for --tool=<tool>"
-msgstr ""
-
-#: builtin/difftool.c:752
-msgid "no <cmd> given for --extcmd=<cmd>"
-msgstr ""
-
-#: builtin/env--helper.c:6
-msgid "git env--helper --type=[bool|ulong] <options> <env-var>"
-msgstr ""
-
-#: builtin/env--helper.c:46
-msgid "default for git_env_*(...) to fall back on"
-msgstr ""
-
-#: builtin/env--helper.c:48
-msgid "be quiet only use git_env_*() value as exit code"
-msgstr ""
-
-#: builtin/env--helper.c:67
-#, c-format
-msgid "option `--default' expects a boolean value with `--type=bool`, not `%s`"
-msgstr ""
-
-#: builtin/env--helper.c:82
-#, c-format
-msgid ""
-"option `--default' expects an unsigned long value with `--type=ulong`, not `"
-"%s`"
-msgstr ""
-
-#: builtin/fast-export.c:29
-msgid "git fast-export [<rev-list-opts>]"
-msgstr ""
-
-#: builtin/fast-export.c:843
-msgid "Error: Cannot export nested tags unless --mark-tags is specified."
-msgstr ""
-
-#: builtin/fast-export.c:1152
-msgid "--anonymize-map token cannot be empty"
-msgstr ""
-
-#: builtin/fast-export.c:1171
-msgid "show progress after <n> objects"
-msgstr ""
-
-#: builtin/fast-export.c:1173
-msgid "select handling of signed tags"
-msgstr ""
-
-#: builtin/fast-export.c:1176
-msgid "select handling of tags that tag filtered objects"
-msgstr ""
-
-#: builtin/fast-export.c:1179
-msgid "select handling of commit messages in an alternate encoding"
-msgstr ""
-
-#: builtin/fast-export.c:1182
-msgid "dump marks to this file"
-msgstr ""
-
-#: builtin/fast-export.c:1184
-msgid "import marks from this file"
-msgstr ""
-
-#: builtin/fast-export.c:1188
-msgid "import marks from this file if it exists"
-msgstr ""
-
-#: builtin/fast-export.c:1190
-msgid "fake a tagger when tags lack one"
-msgstr ""
-
-#: builtin/fast-export.c:1192
-msgid "output full tree for each commit"
-msgstr ""
-
-#: builtin/fast-export.c:1194
-msgid "use the done feature to terminate the stream"
-msgstr ""
-
-#: builtin/fast-export.c:1195
-msgid "skip output of blob data"
-msgstr ""
-
-#: builtin/fast-export.c:1196 builtin/log.c:1860
-msgid "refspec"
-msgstr ""
-
-#: builtin/fast-export.c:1197
-msgid "apply refspec to exported refs"
-msgstr ""
-
-#: builtin/fast-export.c:1198
-msgid "anonymize output"
-msgstr ""
-
-#: builtin/fast-export.c:1199
-msgid "from:to"
-msgstr ""
-
-#: builtin/fast-export.c:1200
-msgid "convert <from> to <to> in anonymized output"
-msgstr ""
-
-#: builtin/fast-export.c:1203
-msgid "reference parents which are not in fast-export stream by object id"
-msgstr ""
-
-#: builtin/fast-export.c:1205
-msgid "show original object ids of blobs/commits"
-msgstr ""
-
-#: builtin/fast-export.c:1207
-msgid "label tags with mark ids"
-msgstr ""
-
-#: builtin/fast-import.c:3097
-#, c-format
-msgid "Missing from marks for submodule '%s'"
-msgstr ""
-
-#: builtin/fast-import.c:3099
-#, c-format
-msgid "Missing to marks for submodule '%s'"
-msgstr ""
-
-#: builtin/fast-import.c:3234
-#, c-format
-msgid "Expected 'mark' command, got %s"
-msgstr ""
-
-#: builtin/fast-import.c:3239
-#, c-format
-msgid "Expected 'to' command, got %s"
-msgstr ""
-
-#: builtin/fast-import.c:3331
-msgid "Expected format name:filename for submodule rewrite option"
-msgstr ""
-
-#: builtin/fast-import.c:3386
-#, c-format
-msgid "feature '%s' forbidden in input without --allow-unsafe-features"
-msgstr ""
-
-#: builtin/fetch-pack.c:246
-#, c-format
-msgid "Lockfile created but not reported: %s"
-msgstr ""
-
-#: builtin/fetch.c:36
-msgid "git fetch [<options>] [<repository> [<refspec>...]]"
-msgstr ""
-
-#: builtin/fetch.c:37
-msgid "git fetch [<options>] <group>"
-msgstr ""
-
-#: builtin/fetch.c:38
-msgid "git fetch --multiple [<options>] [(<repository> | <group>)...]"
-msgstr ""
-
-#: builtin/fetch.c:39
-msgid "git fetch --all [<options>]"
-msgstr ""
-
-#: builtin/fetch.c:124
-msgid "fetch.parallel cannot be negative"
-msgstr ""
-
-#: builtin/fetch.c:147 builtin/pull.c:189
-msgid "fetch from all remotes"
-msgstr ""
-
-#: builtin/fetch.c:149 builtin/pull.c:249
-msgid "set upstream for git pull/fetch"
-msgstr ""
-
-#: builtin/fetch.c:151 builtin/pull.c:192
-msgid "append to .git/FETCH_HEAD instead of overwriting"
-msgstr ""
-
-#: builtin/fetch.c:153
-msgid "use atomic transaction to update references"
-msgstr ""
-
-#: builtin/fetch.c:155 builtin/pull.c:195
-msgid "path to upload pack on remote end"
-msgstr ""
-
-#: builtin/fetch.c:156
-msgid "force overwrite of local reference"
-msgstr ""
-
-#: builtin/fetch.c:158
-msgid "fetch from multiple remotes"
-msgstr ""
-
-#: builtin/fetch.c:160 builtin/pull.c:199
-msgid "fetch all tags and associated objects"
-msgstr ""
-
-#: builtin/fetch.c:162
-msgid "do not fetch all tags (--no-tags)"
-msgstr ""
-
-#: builtin/fetch.c:164
-msgid "number of submodules fetched in parallel"
-msgstr ""
-
-#: builtin/fetch.c:166
-msgid "modify the refspec to place all refs within refs/prefetch/"
-msgstr ""
-
-#: builtin/fetch.c:168 builtin/pull.c:202
-msgid "prune remote-tracking branches no longer on remote"
-msgstr ""
-
-#: builtin/fetch.c:170
-msgid "prune local tags no longer on remote and clobber changed tags"
-msgstr ""
-
-#: builtin/fetch.c:171 builtin/fetch.c:199 builtin/pull.c:123
-msgid "on-demand"
-msgstr ""
-
-#: builtin/fetch.c:172
-msgid "control recursive fetching of submodules"
-msgstr ""
-
-#: builtin/fetch.c:177
-msgid "write fetched references to the FETCH_HEAD file"
-msgstr ""
-
-#: builtin/fetch.c:178 builtin/pull.c:210
-msgid "keep downloaded pack"
-msgstr ""
-
-#: builtin/fetch.c:180
-msgid "allow updating of HEAD ref"
-msgstr ""
-
-#: builtin/fetch.c:183 builtin/fetch.c:189 builtin/pull.c:213
-#: builtin/pull.c:222
-msgid "deepen history of shallow clone"
-msgstr ""
-
-#: builtin/fetch.c:185 builtin/pull.c:216
-msgid "deepen history of shallow repository based on time"
-msgstr ""
-
-#: builtin/fetch.c:191 builtin/pull.c:225
-msgid "convert to a complete repository"
-msgstr ""
-
-#: builtin/fetch.c:194
-msgid "re-fetch without negotiating common commits"
-msgstr ""
-
-#: builtin/fetch.c:197
-msgid "prepend this to submodule path output"
-msgstr ""
-
-#: builtin/fetch.c:200
-msgid ""
-"default for recursive fetching of submodules (lower priority than config "
-"files)"
-msgstr ""
-
-#: builtin/fetch.c:204 builtin/pull.c:228
-msgid "accept refs that update .git/shallow"
-msgstr ""
-
-#: builtin/fetch.c:205 builtin/pull.c:230
-msgid "refmap"
-msgstr ""
-
-#: builtin/fetch.c:206 builtin/pull.c:231
-msgid "specify fetch refmap"
-msgstr ""
-
-#: builtin/fetch.c:213 builtin/pull.c:244
-msgid "report that we have only objects reachable from this object"
-msgstr ""
-
-#: builtin/fetch.c:215
-msgid "do not fetch a packfile; instead, print ancestors of negotiation tips"
-msgstr ""
-
-#: builtin/fetch.c:218 builtin/fetch.c:220
-msgid "run 'maintenance --auto' after fetching"
-msgstr ""
-
-#: builtin/fetch.c:222 builtin/pull.c:247
-msgid "check for forced-updates on all updated branches"
-msgstr ""
-
-#: builtin/fetch.c:224
-msgid "write the commit-graph after fetching"
-msgstr ""
-
-#: builtin/fetch.c:226
-msgid "accept refspecs from stdin"
-msgstr ""
-
-#: builtin/fetch.c:618
-msgid "couldn't find remote ref HEAD"
-msgstr ""
-
-#: builtin/fetch.c:893
-#, c-format
-msgid "object %s not found"
-msgstr ""
-
-#: builtin/fetch.c:897
-msgid "[up to date]"
-msgstr ""
-
-#: builtin/fetch.c:909 builtin/fetch.c:927 builtin/fetch.c:999
-msgid "[rejected]"
-msgstr ""
-
-#: builtin/fetch.c:911
-msgid "can't fetch in current branch"
-msgstr ""
-
-#: builtin/fetch.c:912
-msgid "checked out in another worktree"
-msgstr ""
-
-#: builtin/fetch.c:922
-msgid "[tag update]"
-msgstr ""
-
-#: builtin/fetch.c:923 builtin/fetch.c:960 builtin/fetch.c:982
-#: builtin/fetch.c:994
-msgid "unable to update local ref"
-msgstr ""
-
-#: builtin/fetch.c:927
-msgid "would clobber existing tag"
-msgstr ""
-
-#: builtin/fetch.c:949
-msgid "[new tag]"
-msgstr ""
-
-#: builtin/fetch.c:952
-msgid "[new branch]"
-msgstr ""
-
-#: builtin/fetch.c:955
-msgid "[new ref]"
-msgstr ""
-
-#: builtin/fetch.c:994
-msgid "forced update"
-msgstr ""
-
-#: builtin/fetch.c:999
-msgid "non-fast-forward"
-msgstr ""
-
-#: builtin/fetch.c:1102
-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:1106
-#, 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"
-"to avoid this check\n"
-msgstr ""
-
-#: builtin/fetch.c:1136
-#, c-format
-msgid "%s did not send all necessary objects\n"
-msgstr ""
-
-#: builtin/fetch.c:1156
-#, c-format
-msgid "rejected %s because shallow roots are not allowed to be updated"
-msgstr ""
-
-#: builtin/fetch.c:1259 builtin/fetch.c:1418
-#, c-format
-msgid "From %.*s\n"
-msgstr ""
-
-#: builtin/fetch.c:1269
-#, 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:1377
-#, c-format
-msgid "   (%s will become dangling)"
-msgstr ""
-
-#: builtin/fetch.c:1378
-#, c-format
-msgid "   (%s has become dangling)"
-msgstr ""
-
-#: builtin/fetch.c:1421
-msgid "[deleted]"
-msgstr ""
-
-#: builtin/fetch.c:1422 builtin/remote.c:1153
-msgid "(none)"
-msgstr ""
-
-#: builtin/fetch.c:1446
-#, c-format
-msgid "refusing to fetch into branch '%s' checked out at '%s'"
-msgstr ""
-
-#: builtin/fetch.c:1466
-#, c-format
-msgid "option \"%s\" value \"%s\" is not valid for %s"
-msgstr ""
-
-#: builtin/fetch.c:1469
-#, c-format
-msgid "option \"%s\" is ignored for %s\n"
-msgstr ""
-
-#: builtin/fetch.c:1496
-#, c-format
-msgid "the object %s does not exist"
-msgstr ""
-
-#: builtin/fetch.c:1748
-msgid "multiple branches detected, incompatible with --set-upstream"
-msgstr ""
-
-#: builtin/fetch.c:1760
-#, c-format
-msgid ""
-"could not set upstream of HEAD to '%s' from '%s' when it does not point to "
-"any branch."
-msgstr ""
-
-#: builtin/fetch.c:1773
-msgid "not setting upstream for a remote remote-tracking branch"
-msgstr ""
-
-#: builtin/fetch.c:1775
-msgid "not setting upstream for a remote tag"
-msgstr ""
-
-#: builtin/fetch.c:1777
-msgid "unknown branch type"
-msgstr ""
-
-#: builtin/fetch.c:1779
-msgid ""
-"no source branch found;\n"
-"you need to specify exactly one branch with the --set-upstream option"
-msgstr ""
-
-#: builtin/fetch.c:1904 builtin/fetch.c:1967
-#, c-format
-msgid "Fetching %s\n"
-msgstr ""
-
-#: builtin/fetch.c:1914 builtin/fetch.c:1969
-#, c-format
-msgid "could not fetch %s"
-msgstr ""
-
-#: builtin/fetch.c:1926
-#, c-format
-msgid "could not fetch '%s' (exit code: %d)\n"
-msgstr ""
-
-#: builtin/fetch.c:2030
-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:2066
-msgid "you need to specify a tag name"
-msgstr ""
-
-#: builtin/fetch.c:2156
-msgid "--negotiate-only needs one or more --negotiation-tip=*"
-msgstr ""
-
-#: builtin/fetch.c:2160
-msgid "negative depth in --deepen is not supported"
-msgstr ""
-
-#: builtin/fetch.c:2169
-msgid "--unshallow on a complete repository does not make sense"
-msgstr ""
-
-#: builtin/fetch.c:2186
-msgid "fetch --all does not take a repository argument"
-msgstr ""
-
-#: builtin/fetch.c:2188
-msgid "fetch --all does not make sense with refspecs"
-msgstr ""
-
-#: builtin/fetch.c:2197
-#, c-format
-msgid "no such remote or remote group: %s"
-msgstr ""
-
-#: builtin/fetch.c:2205
-msgid "fetching a group and specifying refspecs does not make sense"
-msgstr ""
-
-#: builtin/fetch.c:2221
-msgid "must supply remote when using --negotiate-only"
-msgstr ""
-
-#: builtin/fetch.c:2226
-msgid "protocol does not support --negotiate-only, exiting"
-msgstr ""
-
-#: builtin/fetch.c:2246
-msgid ""
-"--filter can only be used with the remote configured in extensions."
-"partialclone"
-msgstr ""
-
-#: builtin/fetch.c:2250
-msgid "--atomic can only be used when fetching from one remote"
-msgstr ""
-
-#: builtin/fetch.c:2254
-msgid "--stdin can only be used when fetching from one remote"
-msgstr ""
-
-#: builtin/fmt-merge-msg.c:7
-msgid ""
-"git fmt-merge-msg [-m <message>] [--log[=<n>] | --no-log] [--file <file>]"
-msgstr ""
-
-#: builtin/fmt-merge-msg.c:19
-msgid "populate log with at most <n> entries from shortlog"
-msgstr ""
-
-#: builtin/fmt-merge-msg.c:22
-msgid "alias for --log (deprecated)"
-msgstr ""
-
-#: builtin/fmt-merge-msg.c:25
-msgid "text"
-msgstr ""
-
-#: builtin/fmt-merge-msg.c:26
-msgid "use <text> as start of message"
-msgstr ""
-
-#: builtin/fmt-merge-msg.c:28
-msgid "use <name> instead of the real target branch"
-msgstr ""
-
-#: builtin/fmt-merge-msg.c:29
-msgid "file to read from"
-msgstr ""
-
-#: builtin/for-each-ref.c:10
-msgid "git for-each-ref [<options>] [<pattern>]"
-msgstr ""
-
-#: builtin/for-each-ref.c:11
-msgid "git for-each-ref [--points-at <object>]"
-msgstr ""
-
-#: builtin/for-each-ref.c:12
-msgid "git for-each-ref [--merged [<commit>]] [--no-merged [<commit>]]"
-msgstr ""
-
-#: builtin/for-each-ref.c:13
-msgid "git for-each-ref [--contains [<commit>]] [--no-contains [<commit>]]"
-msgstr ""
-
-#: builtin/for-each-ref.c:31
-msgid "quote placeholders suitably for shells"
-msgstr ""
-
-#: builtin/for-each-ref.c:33
-msgid "quote placeholders suitably for perl"
-msgstr ""
-
-#: builtin/for-each-ref.c:35
-msgid "quote placeholders suitably for python"
-msgstr ""
-
-#: builtin/for-each-ref.c:37
-msgid "quote placeholders suitably for Tcl"
-msgstr ""
-
-#: builtin/for-each-ref.c:40
-msgid "show only <n> matched refs"
-msgstr ""
-
-#: builtin/for-each-ref.c:42 builtin/tag.c:482
-msgid "respect format colors"
-msgstr ""
-
-#: builtin/for-each-ref.c:45
-msgid "print only refs which points at the given object"
-msgstr ""
-
-#: builtin/for-each-ref.c:47
-msgid "print only refs that are merged"
-msgstr ""
-
-#: builtin/for-each-ref.c:48
-msgid "print only refs that are not merged"
-msgstr ""
-
-#: builtin/for-each-ref.c:49
-msgid "print only refs which contain the commit"
-msgstr ""
-
-#: builtin/for-each-ref.c:50
-msgid "print only refs which don't contain the commit"
-msgstr ""
-
-#: builtin/for-each-repo.c:9
-msgid "git for-each-repo --config=<config> <command-args>"
-msgstr ""
-
-#: builtin/for-each-repo.c:34
-msgid "config"
-msgstr ""
-
-#: builtin/for-each-repo.c:35
-msgid "config key storing a list of repository paths"
-msgstr ""
-
-#: builtin/for-each-repo.c:43
-msgid "missing --config=<config>"
-msgstr ""
-
-#: builtin/fsck.c:69 builtin/fsck.c:128 builtin/fsck.c:129
-msgid "unknown"
-msgstr ""
-
-#. 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 ""
-
-#. TRANSLATORS: e.g. warning in tree 01bfda: <more explanation>
-#: builtin/fsck.c:94
-#, c-format
-msgid "warning in %s %s: %s"
-msgstr ""
-
-#: builtin/fsck.c:124 builtin/fsck.c:127
-#, c-format
-msgid "broken link from %7s %s"
-msgstr ""
-
-#: builtin/fsck.c:136
-msgid "wrong object type in link"
-msgstr ""
-
-#: builtin/fsck.c:152
-#, c-format
-msgid ""
-"broken link from %7s %s\n"
-"              to %7s %s"
-msgstr ""
-
-#: builtin/fsck.c:264
-#, c-format
-msgid "missing %s %s"
-msgstr ""
-
-#: builtin/fsck.c:291
-#, c-format
-msgid "unreachable %s %s"
-msgstr ""
-
-#: builtin/fsck.c:311
-#, c-format
-msgid "dangling %s %s"
-msgstr ""
-
-#: builtin/fsck.c:321
-msgid "could not create lost-found"
-msgstr ""
-
-#: builtin/fsck.c:332
-#, c-format
-msgid "could not finish '%s'"
-msgstr ""
-
-#: builtin/fsck.c:349
-#, c-format
-msgid "Checking %s"
-msgstr ""
-
-#: builtin/fsck.c:387
-#, c-format
-msgid "Checking connectivity (%d objects)"
-msgstr ""
-
-#: builtin/fsck.c:406
-#, c-format
-msgid "Checking %s %s"
-msgstr ""
-
-#: builtin/fsck.c:411
-msgid "broken links"
-msgstr ""
-
-#: builtin/fsck.c:420
-#, c-format
-msgid "root %s"
-msgstr ""
-
-#: builtin/fsck.c:428
-#, c-format
-msgid "tagged %s %s (%s) in %s"
-msgstr ""
-
-#: builtin/fsck.c:457
-#, c-format
-msgid "%s: object corrupt or missing"
-msgstr ""
-
-#: builtin/fsck.c:482
-#, c-format
-msgid "%s: invalid reflog entry %s"
-msgstr ""
-
-#: builtin/fsck.c:496
-#, c-format
-msgid "Checking reflog %s->%s"
-msgstr ""
-
-#: builtin/fsck.c:530
-#, c-format
-msgid "%s: invalid sha1 pointer %s"
-msgstr ""
-
-#: builtin/fsck.c:537
-#, c-format
-msgid "%s: not a commit"
-msgstr ""
-
-#: builtin/fsck.c:591
-msgid "notice: No default references"
-msgstr ""
-
-#: 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:628
-#, c-format
-msgid "%s: object is of unknown type '%s': %s"
-msgstr ""
-
-#: builtin/fsck.c:645
-#, c-format
-msgid "%s: object could not be parsed: %s"
-msgstr ""
-
-#: builtin/fsck.c:665
-#, c-format
-msgid "bad sha1 file: %s"
-msgstr ""
-
-#: builtin/fsck.c:686
-msgid "Checking object directory"
-msgstr ""
-
-#: builtin/fsck.c:689
-msgid "Checking object directories"
-msgstr ""
-
-#: builtin/fsck.c:705
-#, c-format
-msgid "Checking %s link"
-msgstr ""
-
-#: builtin/fsck.c:710 builtin/index-pack.c:862
-#, c-format
-msgid "invalid %s"
-msgstr ""
-
-#: builtin/fsck.c:717
-#, c-format
-msgid "%s points to something strange (%s)"
-msgstr ""
-
-#: builtin/fsck.c:723
-#, c-format
-msgid "%s: detached HEAD points at nothing"
-msgstr ""
-
-#: builtin/fsck.c:727
-#, c-format
-msgid "notice: %s points to an unborn branch (%s)"
-msgstr ""
-
-#: builtin/fsck.c:739
-msgid "Checking cache tree"
-msgstr ""
-
-#: builtin/fsck.c:744
-#, c-format
-msgid "%s: invalid sha1 pointer in cache-tree"
-msgstr ""
-
-#: builtin/fsck.c:753
-msgid "non-tree in cache-tree"
-msgstr ""
-
-#: builtin/fsck.c:784
-msgid "git fsck [<options>] [<object>...]"
-msgstr ""
-
-#: builtin/fsck.c:790
-msgid "show unreachable objects"
-msgstr ""
-
-#: builtin/fsck.c:791
-msgid "show dangling objects"
-msgstr ""
-
-#: builtin/fsck.c:792
-msgid "report tags"
-msgstr ""
-
-#: builtin/fsck.c:793
-msgid "report root nodes"
-msgstr ""
-
-#: builtin/fsck.c:794
-msgid "make index objects head nodes"
-msgstr ""
-
-#: builtin/fsck.c:795
-msgid "make reflogs head nodes (default)"
-msgstr ""
-
-#: builtin/fsck.c:796
-msgid "also consider packs and alternate objects"
-msgstr ""
-
-#: builtin/fsck.c:797
-msgid "check only connectivity"
-msgstr ""
-
-#: builtin/fsck.c:798 builtin/mktag.c:75
-msgid "enable more strict checking"
-msgstr ""
-
-#: builtin/fsck.c:800
-msgid "write dangling objects in .git/lost-found"
-msgstr ""
-
-#: builtin/fsck.c:801 builtin/prune.c:146
-msgid "show progress"
-msgstr ""
-
-#: builtin/fsck.c:802
-msgid "show verbose names for reachable objects"
-msgstr ""
-
-#: builtin/fsck.c:862 builtin/index-pack.c:261
-msgid "Checking objects"
-msgstr ""
-
-#: builtin/fsck.c:890
-#, c-format
-msgid "%s: object missing"
-msgstr ""
-
-#: builtin/fsck.c:901
-#, c-format
-msgid "invalid parameter: expected sha1, got '%s'"
-msgstr ""
-
-#: builtin/fsmonitor--daemon.c:13
-msgid "git fsmonitor--daemon start [<options>]"
-msgstr ""
-
-#: builtin/fsmonitor--daemon.c:14
-msgid "git fsmonitor--daemon run [<options>]"
-msgstr ""
-
-#: builtin/fsmonitor--daemon.c:15
-msgid "git fsmonitor--daemon stop"
-msgstr ""
-
-#: builtin/fsmonitor--daemon.c:16
-msgid "git fsmonitor--daemon status"
-msgstr ""
-
-#: builtin/fsmonitor--daemon.c:38 builtin/fsmonitor--daemon.c:47
-#, c-format
-msgid "value of '%s' out of range: %d"
-msgstr ""
-
-#: builtin/fsmonitor--daemon.c:57
-#, c-format
-msgid "value of '%s' not bool or int: %d"
-msgstr ""
-
-#: builtin/fsmonitor--daemon.c:99
-#, c-format
-msgid "fsmonitor-daemon is watching '%s'\n"
-msgstr ""
-
-#: builtin/fsmonitor--daemon.c:104
-#, c-format
-msgid "fsmonitor-daemon is not watching '%s'\n"
-msgstr ""
-
-#: builtin/fsmonitor--daemon.c:170
-#, c-format
-msgid "could not create fsmonitor cookie '%s'"
-msgstr ""
-
-#: builtin/fsmonitor--daemon.c:753
-#, c-format
-msgid "fsmonitor: cookie_result '%d' != SEEN"
-msgstr ""
-
-#: builtin/fsmonitor--daemon.c:1187
-#, c-format
-msgid "could not start IPC thread pool on '%s'"
-msgstr ""
-
-#: builtin/fsmonitor--daemon.c:1199
-msgid "could not start fsmonitor listener thread"
-msgstr ""
-
-#: builtin/fsmonitor--daemon.c:1297
-msgid "could not initialize listener thread"
-msgstr ""
-
-#: builtin/fsmonitor--daemon.c:1328 builtin/fsmonitor--daemon.c:1383
-#, c-format
-msgid "fsmonitor--daemon is already running '%s'"
-msgstr ""
-
-#: builtin/fsmonitor--daemon.c:1332
-#, c-format
-msgid "running fsmonitor-daemon in '%s'\n"
-msgstr ""
-
-#: builtin/fsmonitor--daemon.c:1387
-#, c-format
-msgid "starting fsmonitor-daemon in '%s'\n"
-msgstr ""
-
-#: builtin/fsmonitor--daemon.c:1413
-msgid "daemon failed to start"
-msgstr ""
-
-#: builtin/fsmonitor--daemon.c:1416
-msgid "daemon not online yet"
-msgstr ""
-
-#: builtin/fsmonitor--daemon.c:1419
-msgid "daemon terminated"
-msgstr ""
-
-#: builtin/fsmonitor--daemon.c:1429
-msgid "detach from console"
-msgstr ""
-
-#: builtin/fsmonitor--daemon.c:1432
-msgid "use <n> ipc worker threads"
-msgstr ""
-
-#: builtin/fsmonitor--daemon.c:1435
-msgid "max seconds to wait for background daemon startup"
-msgstr ""
-
-#: builtin/fsmonitor--daemon.c:1449
-#, c-format
-msgid "invalid 'ipc-threads' value (%d)"
-msgstr ""
-
-#: builtin/fsmonitor--daemon.c:1464
-#, c-format
-msgid "Unhandled subcommand '%s'"
-msgstr ""
-
-#: builtin/fsmonitor--daemon.c:1477
-msgid "fsmonitor--daemon not supported on this platform"
-msgstr ""
-
-#: builtin/gc.c:39
-msgid "git gc [<options>]"
-msgstr ""
-
-#: builtin/gc.c:93
-#, c-format
-msgid "Failed to fstat %s: %s"
-msgstr ""
-
-#: builtin/gc.c:129
-#, c-format
-msgid "failed to parse '%s' value '%s'"
-msgstr ""
-
-#: builtin/gc.c:488 builtin/init-db.c:57
-#, c-format
-msgid "cannot stat '%s'"
-msgstr ""
-
-#: builtin/gc.c:504
-#, c-format
-msgid ""
-"The last gc run reported the following. Please correct the root cause\n"
-"and remove %s\n"
-"Automatic cleanup will not be performed until the file is removed.\n"
-"\n"
-"%s"
-msgstr ""
-
-#: builtin/gc.c:552
-msgid "prune unreferenced objects"
-msgstr ""
-
-#: builtin/gc.c:554
-msgid "be more thorough (increased runtime)"
-msgstr ""
-
-#: builtin/gc.c:555
-msgid "enable auto-gc mode"
-msgstr ""
-
-#: builtin/gc.c:558
-msgid "force running gc even if there may be another gc running"
-msgstr ""
-
-#: builtin/gc.c:561
-msgid "repack all other packs except the largest pack"
-msgstr ""
-
-#: builtin/gc.c:577
-#, c-format
-msgid "failed to parse gc.logexpiry value %s"
-msgstr ""
-
-#: builtin/gc.c:588
-#, c-format
-msgid "failed to parse prune expiry value %s"
-msgstr ""
-
-#: builtin/gc.c:608
-#, c-format
-msgid "Auto packing the repository in background for optimum performance.\n"
-msgstr ""
-
-#: builtin/gc.c:610
-#, c-format
-msgid "Auto packing the repository for optimum performance.\n"
-msgstr ""
-
-#: builtin/gc.c:611
-#, c-format
-msgid "See \"git help gc\" for manual housekeeping.\n"
-msgstr ""
-
-#: builtin/gc.c:652
-#, c-format
-msgid ""
-"gc is already running on machine '%s' pid %<PRIuMAX> (use --force if not)"
-msgstr ""
-
-#: builtin/gc.c:707
-msgid ""
-"There are too many unreachable loose objects; run 'git prune' to remove them."
-msgstr ""
-
-#: builtin/gc.c:717
-msgid ""
-"git maintenance run [--auto] [--[no-]quiet] [--task=<task>] [--schedule]"
-msgstr ""
-
-#: builtin/gc.c:747
-msgid "--no-schedule is not allowed"
-msgstr ""
-
-#: builtin/gc.c:752
-#, c-format
-msgid "unrecognized --schedule argument '%s'"
-msgstr ""
-
-#: builtin/gc.c:870
-msgid "failed to write commit-graph"
-msgstr ""
-
-#: builtin/gc.c:906
-msgid "failed to prefetch remotes"
-msgstr ""
-
-#: builtin/gc.c:1022
-msgid "failed to start 'git pack-objects' process"
-msgstr ""
-
-#: builtin/gc.c:1039
-msgid "failed to finish 'git pack-objects' process"
-msgstr ""
-
-#: builtin/gc.c:1090
-msgid "failed to write multi-pack-index"
-msgstr ""
-
-#: builtin/gc.c:1106
-msgid "'git multi-pack-index expire' failed"
-msgstr ""
-
-#: builtin/gc.c:1165
-msgid "'git multi-pack-index repack' failed"
-msgstr ""
-
-#: builtin/gc.c:1174
-msgid ""
-"skipping incremental-repack task because core.multiPackIndex is disabled"
-msgstr ""
-
-#: builtin/gc.c:1278
-#, c-format
-msgid "lock file '%s' exists, skipping maintenance"
-msgstr ""
-
-#: builtin/gc.c:1308
-#, c-format
-msgid "task '%s' failed"
-msgstr ""
-
-#: builtin/gc.c:1390
-#, c-format
-msgid "'%s' is not a valid task"
-msgstr ""
-
-#: builtin/gc.c:1395
-#, c-format
-msgid "task '%s' cannot be selected multiple times"
-msgstr ""
-
-#: builtin/gc.c:1410
-msgid "run tasks based on the state of the repository"
-msgstr ""
-
-#: builtin/gc.c:1411
-msgid "frequency"
-msgstr ""
-
-#: builtin/gc.c:1412
-msgid "run tasks based on frequency"
-msgstr ""
-
-#: builtin/gc.c:1415
-msgid "do not report progress or other information over stderr"
-msgstr ""
-
-#: builtin/gc.c:1416
-msgid "task"
-msgstr ""
-
-#: builtin/gc.c:1417
-msgid "run a specific task"
-msgstr ""
-
-#: builtin/gc.c:1434
-msgid "use at most one of --auto and --schedule=<frequency>"
-msgstr ""
-
-#: builtin/gc.c:1477
-msgid "failed to run 'git config'"
-msgstr ""
-
-#: builtin/gc.c:1629
-#, c-format
-msgid "failed to expand path '%s'"
-msgstr ""
-
-#: builtin/gc.c:1656 builtin/gc.c:1694
-msgid "failed to start launchctl"
-msgstr ""
-
-#: builtin/gc.c:1769 builtin/gc.c:2237
-#, c-format
-msgid "failed to create directories for '%s'"
-msgstr ""
-
-#: builtin/gc.c:1796
-#, c-format
-msgid "failed to bootstrap service %s"
-msgstr ""
-
-#: builtin/gc.c:1889
-msgid "failed to create temp xml file"
-msgstr ""
-
-#: builtin/gc.c:1979
-msgid "failed to start schtasks"
-msgstr ""
-
-#: builtin/gc.c:2063
-msgid "failed to run 'crontab -l'; your system might not support 'cron'"
-msgstr ""
-
-#: builtin/gc.c:2080
-msgid "failed to run 'crontab'; your system might not support 'cron'"
-msgstr ""
-
-#: builtin/gc.c:2084
-msgid "failed to open stdin of 'crontab'"
-msgstr ""
-
-#: builtin/gc.c:2126
-msgid "'crontab' died"
-msgstr ""
-
-#: builtin/gc.c:2191
-msgid "failed to start systemctl"
-msgstr ""
-
-#: builtin/gc.c:2201
-msgid "failed to run systemctl"
-msgstr ""
-
-#: builtin/gc.c:2210 builtin/gc.c:2215 builtin/worktree.c:63
-#: builtin/worktree.c:1024
-#, c-format
-msgid "failed to delete '%s'"
-msgstr ""
-
-#: builtin/gc.c:2395
-#, c-format
-msgid "unrecognized --scheduler argument '%s'"
-msgstr ""
-
-#: builtin/gc.c:2420
-msgid "neither systemd timers nor crontab are available"
-msgstr ""
-
-#: builtin/gc.c:2435
-#, c-format
-msgid "%s scheduler is not available"
-msgstr ""
-
-#: builtin/gc.c:2449
-msgid "another process is scheduling background maintenance"
-msgstr ""
-
-#: builtin/gc.c:2471
-msgid "git maintenance start [--scheduler=<scheduler>]"
-msgstr ""
-
-#: builtin/gc.c:2480
-msgid "scheduler"
-msgstr ""
-
-#: builtin/gc.c:2481
-msgid "scheduler to trigger git maintenance run"
-msgstr ""
-
-#: builtin/gc.c:2495
-msgid "failed to add repo to global config"
-msgstr ""
-
-#: builtin/gc.c:2504
-msgid "git maintenance <subcommand> [<options>]"
-msgstr ""
-
-#: builtin/gc.c:2523
-#, c-format
-msgid "invalid subcommand: %s"
-msgstr ""
-
-#: builtin/grep.c:32
-msgid "git grep [<options>] [-e] <pattern> [<rev>...] [[--] <path>...]"
-msgstr ""
-
-#: builtin/grep.c:241
-#, c-format
-msgid "grep: failed to create thread: %s"
-msgstr ""
-
-#: builtin/grep.c:295
-#, c-format
-msgid "invalid number of threads specified (%d) for %s"
-msgstr ""
-
-#. TRANSLATORS: %s is the configuration
-#. variable for tweaking threads, currently
-#. grep.threads
-#.
-#: builtin/grep.c:303 builtin/index-pack.c:1587 builtin/index-pack.c:1791
-#: builtin/pack-objects.c:3150
-#, c-format
-msgid "no threads support, ignoring %s"
-msgstr ""
-
-#: builtin/grep.c:490 builtin/grep.c:619 builtin/grep.c:659
-#, c-format
-msgid "unable to read tree (%s)"
-msgstr ""
-
-#: builtin/grep.c:674
-#, c-format
-msgid "unable to grep from object of type %s"
-msgstr ""
-
-#: builtin/grep.c:754
-#, c-format
-msgid "switch `%c' expects a numerical value"
-msgstr ""
-
-#: builtin/grep.c:852
-msgid "search in index instead of in the work tree"
-msgstr ""
-
-#: builtin/grep.c:854
-msgid "find in contents not managed by git"
-msgstr ""
-
-#: builtin/grep.c:856
-msgid "search in both tracked and untracked files"
-msgstr ""
-
-#: builtin/grep.c:858
-msgid "ignore files specified via '.gitignore'"
-msgstr ""
-
-#: builtin/grep.c:860
-msgid "recursively search in each submodule"
-msgstr ""
-
-#: builtin/grep.c:863
-msgid "show non-matching lines"
-msgstr ""
-
-#: builtin/grep.c:865
-msgid "case insensitive matching"
-msgstr ""
-
-#: builtin/grep.c:867
-msgid "match patterns only at word boundaries"
-msgstr ""
-
-#: builtin/grep.c:869
-msgid "process binary files as text"
-msgstr ""
-
-#: builtin/grep.c:871
-msgid "don't match patterns in binary files"
-msgstr ""
-
-#: builtin/grep.c:874
-msgid "process binary files with textconv filters"
-msgstr ""
-
-#: builtin/grep.c:876
-msgid "search in subdirectories (default)"
-msgstr ""
-
-#: builtin/grep.c:878
-msgid "descend at most <depth> levels"
-msgstr ""
-
-#: builtin/grep.c:882
-msgid "use extended POSIX regular expressions"
-msgstr ""
-
-#: builtin/grep.c:885
-msgid "use basic POSIX regular expressions (default)"
-msgstr ""
-
-#: builtin/grep.c:888
-msgid "interpret patterns as fixed strings"
-msgstr ""
-
-#: builtin/grep.c:891
-msgid "use Perl-compatible regular expressions"
-msgstr ""
-
-#: builtin/grep.c:894
-msgid "show line numbers"
-msgstr ""
-
-#: builtin/grep.c:895
-msgid "show column number of first match"
-msgstr ""
-
-#: builtin/grep.c:896
-msgid "don't show filenames"
-msgstr ""
-
-#: builtin/grep.c:897
-msgid "show filenames"
-msgstr ""
-
-#: builtin/grep.c:899
-msgid "show filenames relative to top directory"
-msgstr ""
-
-#: builtin/grep.c:901
-msgid "show only filenames instead of matching lines"
-msgstr ""
-
-#: builtin/grep.c:903
-msgid "synonym for --files-with-matches"
-msgstr ""
-
-#: builtin/grep.c:906
-msgid "show only the names of files without match"
-msgstr ""
-
-#: builtin/grep.c:908
-msgid "print NUL after filenames"
-msgstr ""
-
-#: builtin/grep.c:911
-msgid "show only matching parts of a line"
-msgstr ""
-
-#: builtin/grep.c:913
-msgid "show the number of matches instead of matching lines"
-msgstr ""
-
-#: builtin/grep.c:914
-msgid "highlight matches"
-msgstr ""
-
-#: builtin/grep.c:916
-msgid "print empty line between matches from different files"
-msgstr ""
-
-#: builtin/grep.c:918
-msgid "show filename only once above matches from same file"
-msgstr ""
-
-#: builtin/grep.c:921
-msgid "show <n> context lines before and after matches"
-msgstr ""
-
-#: builtin/grep.c:924
-msgid "show <n> context lines before matches"
-msgstr ""
-
-#: builtin/grep.c:926
-msgid "show <n> context lines after matches"
-msgstr ""
-
-#: builtin/grep.c:928
-msgid "use <n> worker threads"
-msgstr ""
-
-#: builtin/grep.c:929
-msgid "shortcut for -C NUM"
-msgstr ""
-
-#: builtin/grep.c:932
-msgid "show a line with the function name before matches"
-msgstr ""
-
-#: builtin/grep.c:934
-msgid "show the surrounding function"
-msgstr ""
-
-#: builtin/grep.c:937
-msgid "read patterns from file"
-msgstr ""
-
-#: builtin/grep.c:939
-msgid "match <pattern>"
-msgstr ""
-
-#: builtin/grep.c:941
-msgid "combine patterns specified with -e"
-msgstr ""
-
-#: builtin/grep.c:953
-msgid "indicate hit with exit status without output"
-msgstr ""
-
-#: builtin/grep.c:955
-msgid "show only matches from files that match all patterns"
-msgstr ""
-
-#: builtin/grep.c:958
-msgid "pager"
-msgstr ""
-
-#: builtin/grep.c:958
-msgid "show matching files in the pager"
-msgstr ""
-
-#: builtin/grep.c:962
-msgid "allow calling of grep(1) (ignored by this build)"
-msgstr ""
-
-#: builtin/grep.c:1028
-msgid "no pattern given"
-msgstr ""
-
-#: builtin/grep.c:1064
-msgid "--no-index or --untracked cannot be used with revs"
-msgstr ""
-
-#: builtin/grep.c:1072
-#, c-format
-msgid "unable to resolve revision: %s"
-msgstr ""
-
-#: builtin/grep.c:1102
-msgid "--untracked not supported with --recurse-submodules"
-msgstr ""
-
-#: builtin/grep.c:1106
-msgid "invalid option combination, ignoring --threads"
-msgstr ""
-
-#: builtin/grep.c:1109 builtin/pack-objects.c:4084
-msgid "no threads support, ignoring --threads"
-msgstr ""
-
-#: builtin/grep.c:1112 builtin/index-pack.c:1584 builtin/pack-objects.c:3147
-#, c-format
-msgid "invalid number of threads specified (%d)"
-msgstr ""
-
-#: builtin/grep.c:1146
-msgid "--open-files-in-pager only works on the worktree"
-msgstr ""
-
-#: builtin/grep.c:1179
-msgid "--[no-]exclude-standard cannot be used for tracked contents"
-msgstr ""
-
-#: builtin/grep.c:1187
-msgid "both --cached and trees are given"
-msgstr ""
-
-#: builtin/hash-object.c:83
-msgid ""
-"git hash-object [-t <type>] [-w] [--path=<file> | --no-filters] [--stdin] "
-"[--] <file>..."
-msgstr ""
-
-#: builtin/hash-object.c:97
-msgid "object type"
-msgstr ""
-
-#: builtin/hash-object.c:98
-msgid "write the object into the object database"
-msgstr ""
-
-#: builtin/hash-object.c:100
-msgid "read the object from stdin"
-msgstr ""
-
-#: builtin/hash-object.c:102
-msgid "store file as is without filters"
-msgstr ""
-
-#: builtin/hash-object.c:103
-msgid ""
-"just hash any random garbage to create corrupt objects for debugging Git"
-msgstr ""
-
-#: builtin/hash-object.c:104
-msgid "process file as it were from this path"
-msgstr ""
-
-#: builtin/help.c:57
-msgid "print all available commands"
-msgstr ""
-
-#: builtin/help.c:60
-msgid "show external commands in --all"
-msgstr ""
-
-#: builtin/help.c:61
-msgid "show aliases in --all"
-msgstr ""
-
-#: builtin/help.c:62
-msgid "exclude guides"
-msgstr ""
-
-#: builtin/help.c:63
-msgid "show man page"
-msgstr ""
-
-#: builtin/help.c:64
-msgid "show manual in web browser"
-msgstr ""
-
-#: builtin/help.c:66
-msgid "show info page"
-msgstr ""
-
-#: builtin/help.c:68
-msgid "print command description"
-msgstr ""
-
-#: builtin/help.c:70
-msgid "print list of useful guides"
-msgstr ""
-
-#: builtin/help.c:72
-msgid "print all configuration variable names"
-msgstr ""
-
-#: builtin/help.c:84
-msgid "git help [[-i|--info] [-m|--man] [-w|--web]] [<command>]"
-msgstr ""
-
-#: builtin/help.c:201
-#, c-format
-msgid "unrecognized help format '%s'"
-msgstr ""
-
-#: builtin/help.c:227
-msgid "Failed to start emacsclient."
-msgstr ""
-
-#: builtin/help.c:240
-msgid "Failed to parse emacsclient version."
-msgstr ""
-
-#: builtin/help.c:248
-#, c-format
-msgid "emacsclient version '%d' too old (< 22)."
-msgstr ""
-
-#: builtin/help.c:266 builtin/help.c:288 builtin/help.c:298 builtin/help.c:306
-#, c-format
-msgid "failed to exec '%s'"
-msgstr ""
-
-#: builtin/help.c:344
-#, c-format
-msgid ""
-"'%s': path for unsupported man viewer.\n"
-"Please consider using 'man.<tool>.cmd' instead."
-msgstr ""
-
-#: builtin/help.c:356
-#, c-format
-msgid ""
-"'%s': cmd for supported man viewer.\n"
-"Please consider using 'man.<tool>.path' instead."
-msgstr ""
-
-#: builtin/help.c:471
-#, c-format
-msgid "'%s': unknown man viewer."
-msgstr ""
-
-#: builtin/help.c:487
-msgid "no man viewer handled the request"
-msgstr ""
-
-#: builtin/help.c:494
-msgid "no info viewer handled the request"
-msgstr ""
-
-#: builtin/help.c:555 builtin/help.c:566 git.c:348
-#, c-format
-msgid "'%s' is aliased to '%s'"
-msgstr ""
-
-#: builtin/help.c:569 git.c:380
-#, c-format
-msgid "bad alias.%s string: %s"
-msgstr ""
-
-#: builtin/help.c:611
-#, c-format
-msgid "the '%s' option doesn't take any non-option arguments"
-msgstr ""
-
-#: builtin/help.c:631
-msgid ""
-"the '--no-[external-commands|aliases]' options can only be used with '--all'"
-msgstr ""
-
-#: builtin/help.c:643 builtin/help.c:671
-#, c-format
-msgid "usage: %s%s"
-msgstr ""
-
-#: builtin/help.c:666
-msgid "'git help config' for more information"
-msgstr ""
-
-#: builtin/hook.c:10
-msgid "git hook run [--ignore-missing] <hook-name> [-- <hook-args>]"
-msgstr ""
-
-#: builtin/hook.c:30
-msgid "silently ignore missing requested <hook-name>"
-msgstr ""
-
-#: builtin/index-pack.c:221
-#, c-format
-msgid "object type mismatch at %s"
-msgstr ""
-
-#: builtin/index-pack.c:241
-#, c-format
-msgid "did not receive expected object %s"
-msgstr ""
-
-#: builtin/index-pack.c:244
-#, c-format
-msgid "object %s: expected type %s, found %s"
-msgstr ""
-
-#: 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:304
-msgid "early EOF"
-msgstr ""
-
-#: builtin/index-pack.c:305
-msgid "read error on input"
-msgstr ""
-
-#: builtin/index-pack.c:317
-msgid "used more bytes than were available"
-msgstr ""
-
-#: builtin/index-pack.c:324 builtin/pack-objects.c:754
-msgid "pack too large for current definition of off_t"
-msgstr ""
-
-#: builtin/index-pack.c:329
-#, c-format
-msgid "pack exceeds maximum allowed size (%s)"
-msgstr ""
-
-#: builtin/index-pack.c:362
-msgid "pack signature mismatch"
-msgstr ""
-
-#: builtin/index-pack.c:364
-#, c-format
-msgid "pack version %<PRIu32> unsupported"
-msgstr ""
-
-#: builtin/index-pack.c:380
-#, c-format
-msgid "pack has bad object at offset %<PRIuMAX>: %s"
-msgstr ""
-
-#: builtin/index-pack.c:485
-#, c-format
-msgid "inflate returned %d"
-msgstr ""
-
-#: builtin/index-pack.c:534
-msgid "offset value overflow for delta base object"
-msgstr ""
-
-#: builtin/index-pack.c:542
-msgid "delta base offset is out of bound"
-msgstr ""
-
-#: builtin/index-pack.c:550
-#, c-format
-msgid "unknown object type %d"
-msgstr ""
-
-#: builtin/index-pack.c:581
-msgid "cannot pread pack file"
-msgstr ""
-
-#: builtin/index-pack.c:583
-#, 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:609
-msgid "serious inflate inconsistency"
-msgstr ""
-
-#: builtin/index-pack.c:754 builtin/index-pack.c:760 builtin/index-pack.c:784
-#: builtin/index-pack.c:823 builtin/index-pack.c:832
-#, c-format
-msgid "SHA1 COLLISION FOUND WITH %s !"
-msgstr ""
-
-#: builtin/index-pack.c:757 builtin/pack-objects.c:290
-#: builtin/pack-objects.c:350 builtin/pack-objects.c:456
-#, c-format
-msgid "unable to read %s"
-msgstr ""
-
-#: builtin/index-pack.c:821
-#, c-format
-msgid "cannot read existing object info %s"
-msgstr ""
-
-#: builtin/index-pack.c:829
-#, c-format
-msgid "cannot read existing object %s"
-msgstr ""
-
-#: builtin/index-pack.c:843
-#, c-format
-msgid "invalid blob object %s"
-msgstr ""
-
-#: builtin/index-pack.c:846 builtin/index-pack.c:865
-msgid "fsck error in packed object"
-msgstr ""
-
-#: builtin/index-pack.c:867
-#, c-format
-msgid "Not all child objects of %s are reachable"
-msgstr ""
-
-#: builtin/index-pack.c:928 builtin/index-pack.c:975
-msgid "failed to apply delta"
-msgstr ""
-
-#: builtin/index-pack.c:1161
-msgid "Receiving objects"
-msgstr ""
-
-#: builtin/index-pack.c:1161
-msgid "Indexing objects"
-msgstr ""
-
-#: builtin/index-pack.c:1195
-msgid "pack is corrupted (SHA1 mismatch)"
-msgstr ""
-
-#: builtin/index-pack.c:1200
-msgid "cannot fstat packfile"
-msgstr ""
-
-#: builtin/index-pack.c:1203
-msgid "pack has junk at the end"
-msgstr ""
-
-#: builtin/index-pack.c:1215
-msgid "confusion beyond insanity in parse_pack_objects()"
-msgstr ""
-
-#: builtin/index-pack.c:1238
-msgid "Resolving deltas"
-msgstr ""
-
-#: builtin/index-pack.c:1249 builtin/pack-objects.c:2913
-#, c-format
-msgid "unable to create thread: %s"
-msgstr ""
-
-#: builtin/index-pack.c:1282
-msgid "confusion beyond insanity"
-msgstr ""
-
-#: builtin/index-pack.c:1288
-#, c-format
-msgid "completed with %d local object"
-msgid_plural "completed with %d local objects"
-msgstr[0] ""
-msgstr[1] ""
-
-#: builtin/index-pack.c:1300
-#, c-format
-msgid "Unexpected tail checksum for %s (disk corruption?)"
-msgstr ""
-
-#: builtin/index-pack.c:1304
-#, c-format
-msgid "pack has %d unresolved delta"
-msgid_plural "pack has %d unresolved deltas"
-msgstr[0] ""
-msgstr[1] ""
-
-#: builtin/index-pack.c:1328
-#, c-format
-msgid "unable to deflate appended object (%d)"
-msgstr ""
-
-#: builtin/index-pack.c:1423
-#, c-format
-msgid "local object %s is corrupt"
-msgstr ""
-
-#: builtin/index-pack.c:1445
-#, c-format
-msgid "packfile name '%s' does not end with '.%s'"
-msgstr ""
-
-#: builtin/index-pack.c:1469
-#, c-format
-msgid "cannot write %s file '%s'"
-msgstr ""
-
-#: builtin/index-pack.c:1477
-#, c-format
-msgid "cannot close written %s file '%s'"
-msgstr ""
-
-#: builtin/index-pack.c:1494
-#, c-format
-msgid "unable to rename temporary '*.%s' file to '%s'"
-msgstr ""
-
-#: builtin/index-pack.c:1519
-msgid "error while closing pack file"
-msgstr ""
-
-#: builtin/index-pack.c:1578 builtin/pack-objects.c:3158
-#, c-format
-msgid "bad pack.indexversion=%<PRIu32>"
-msgstr ""
-
-#: builtin/index-pack.c:1648
-#, c-format
-msgid "Cannot open existing pack file '%s'"
-msgstr ""
-
-#: builtin/index-pack.c:1650
-#, c-format
-msgid "Cannot open existing pack idx file for '%s'"
-msgstr ""
-
-#: builtin/index-pack.c:1698
-#, c-format
-msgid "non delta: %d object"
-msgid_plural "non delta: %d objects"
-msgstr[0] ""
-msgstr[1] ""
-
-#: builtin/index-pack.c:1705
-#, c-format
-msgid "chain length = %d: %lu object"
-msgid_plural "chain length = %d: %lu objects"
-msgstr[0] ""
-msgstr[1] ""
-
-#: builtin/index-pack.c:1748
-msgid "Cannot come back to cwd"
-msgstr ""
-
-#: builtin/index-pack.c:1802 builtin/index-pack.c:1805
-#: builtin/index-pack.c:1825 builtin/index-pack.c:1829
-#, c-format
-msgid "bad %s"
-msgstr ""
-
-#: builtin/index-pack.c:1835 builtin/init-db.c:379 builtin/init-db.c:614
-#, c-format
-msgid "unknown hash algorithm '%s'"
-msgstr ""
-
-#: builtin/index-pack.c:1856
-msgid "--stdin requires a git repository"
-msgstr ""
-
-#: builtin/index-pack.c:1873
-msgid "--verify with no packfile name given"
-msgstr ""
-
-#: builtin/index-pack.c:1939 builtin/unpack-objects.c:584
-msgid "fsck error in pack objects"
-msgstr ""
-
-#: builtin/init-db.c:63
-#, c-format
-msgid "cannot stat template '%s'"
-msgstr ""
-
-#: builtin/init-db.c:68
-#, c-format
-msgid "cannot opendir '%s'"
-msgstr ""
-
-#: builtin/init-db.c:80
-#, c-format
-msgid "cannot readlink '%s'"
-msgstr ""
-
-#: builtin/init-db.c:82
-#, c-format
-msgid "cannot symlink '%s' '%s'"
-msgstr ""
-
-#: builtin/init-db.c:88
-#, c-format
-msgid "cannot copy '%s' to '%s'"
-msgstr ""
-
-#: builtin/init-db.c:92
-#, c-format
-msgid "ignoring template %s"
-msgstr ""
-
-#: builtin/init-db.c:123
-#, c-format
-msgid "templates not found in %s"
-msgstr ""
-
-#: builtin/init-db.c:138
-#, c-format
-msgid "not copying templates from '%s': %s"
-msgstr ""
-
-#: builtin/init-db.c:263
-#, c-format
-msgid "invalid initial branch name: '%s'"
-msgstr ""
-
-#: builtin/init-db.c:354
-#, c-format
-msgid "unable to handle file type %d"
-msgstr ""
-
-#: builtin/init-db.c:357
-#, c-format
-msgid "unable to move %s to %s"
-msgstr ""
-
-#: builtin/init-db.c:373
-msgid "attempt to reinitialize repository with different hash"
-msgstr ""
-
-#: builtin/init-db.c:397 builtin/init-db.c:400
-#, c-format
-msgid "%s already exists"
-msgstr ""
-
-#: builtin/init-db.c:432
-#, c-format
-msgid "re-init: ignored --initial-branch=%s"
-msgstr ""
-
-#: builtin/init-db.c:463
-#, c-format
-msgid "Reinitialized existing shared Git repository in %s%s\n"
-msgstr ""
-
-#: builtin/init-db.c:464
-#, c-format
-msgid "Reinitialized existing Git repository in %s%s\n"
-msgstr ""
-
-#: builtin/init-db.c:468
-#, c-format
-msgid "Initialized empty shared Git repository in %s%s\n"
-msgstr ""
-
-#: builtin/init-db.c:469
-#, c-format
-msgid "Initialized empty Git repository in %s%s\n"
-msgstr ""
-
-#: builtin/init-db.c:518
-msgid ""
-"git init [-q | --quiet] [--bare] [--template=<template-directory>] [--"
-"shared[=<permissions>]] [<directory>]"
-msgstr ""
-
-#: builtin/init-db.c:544
-msgid "permissions"
-msgstr ""
-
-#: builtin/init-db.c:545
-msgid "specify that the git repository is to be shared amongst several users"
-msgstr ""
-
-#: builtin/init-db.c:551
-msgid "override the name of the initial branch"
-msgstr ""
-
-#: builtin/init-db.c:552 builtin/verify-pack.c:74
-msgid "hash"
-msgstr ""
-
-#: builtin/init-db.c:553 builtin/show-index.c:22 builtin/verify-pack.c:75
-msgid "specify the hash algorithm to use"
-msgstr ""
-
-#: builtin/init-db.c:591 builtin/init-db.c:596
-#, c-format
-msgid "cannot mkdir %s"
-msgstr ""
-
-#: builtin/init-db.c:600 builtin/init-db.c:655
-#, c-format
-msgid "cannot chdir to %s"
-msgstr ""
-
-#: builtin/init-db.c:627
-#, c-format
-msgid ""
-"%s (or --work-tree=<directory>) not allowed without specifying %s (or --git-"
-"dir=<directory>)"
-msgstr ""
-
-#: builtin/init-db.c:679
-#, c-format
-msgid "Cannot access work tree '%s'"
-msgstr ""
-
-#: builtin/init-db.c:684
-msgid "--separate-git-dir incompatible with bare repository"
-msgstr ""
-
-#: builtin/interpret-trailers.c:16
-msgid ""
-"git interpret-trailers [--in-place] [--trim-empty] [(--trailer "
-"<token>[(=|:)<value>])...] [<file>...]"
-msgstr ""
-
-#: builtin/interpret-trailers.c:95
-msgid "edit files in place"
-msgstr ""
-
-#: builtin/interpret-trailers.c:96
-msgid "trim empty trailers"
-msgstr ""
-
-#: builtin/interpret-trailers.c:99
-msgid "where to place the new trailer"
-msgstr ""
-
-#: builtin/interpret-trailers.c:101
-msgid "action if trailer already exists"
-msgstr ""
-
-#: builtin/interpret-trailers.c:103
-msgid "action if trailer is missing"
-msgstr ""
-
-#: builtin/interpret-trailers.c:105
-msgid "output only the trailers"
-msgstr ""
-
-#: builtin/interpret-trailers.c:106
-msgid "do not apply config rules"
-msgstr ""
-
-#: builtin/interpret-trailers.c:107
-msgid "join whitespace-continued values"
-msgstr ""
-
-#: builtin/interpret-trailers.c:108
-msgid "set parsing options"
-msgstr ""
-
-#: builtin/interpret-trailers.c:110
-msgid "do not treat --- specially"
-msgstr ""
-
-#: builtin/interpret-trailers.c:112
-msgid "trailer(s) to add"
-msgstr ""
-
-#: builtin/interpret-trailers.c:123
-msgid "--trailer with --only-input does not make sense"
-msgstr ""
-
-#: builtin/interpret-trailers.c:133
-msgid "no input file given for in-place editing"
-msgstr ""
-
-#: builtin/log.c:60
-msgid "git log [<options>] [<revision-range>] [[--] <path>...]"
-msgstr ""
-
-#: builtin/log.c:61
-msgid "git show [<options>] <object>..."
-msgstr ""
-
-#: builtin/log.c:114
-#, c-format
-msgid "invalid --decorate option: %s"
-msgstr ""
-
-#: builtin/log.c:181
-msgid "show source"
-msgstr ""
-
-#: builtin/log.c:182
-msgid "use mail map file"
-msgstr ""
-
-#: builtin/log.c:185
-msgid "only decorate refs that match <pattern>"
-msgstr ""
-
-#: builtin/log.c:187
-msgid "do not decorate refs that match <pattern>"
-msgstr ""
-
-#: builtin/log.c:188
-msgid "decorate options"
-msgstr ""
-
-#: builtin/log.c:191
-msgid ""
-"trace the evolution of line range <start>,<end> or function :<funcname> in "
-"<file>"
-msgstr ""
-
-#: builtin/log.c:214
-msgid "-L<range>:<file> cannot be used with pathspec"
-msgstr ""
-
-#: builtin/log.c:322
-#, c-format
-msgid "Final output: %d %s\n"
-msgstr ""
-
-#: builtin/log.c:429
-msgid "unable to create temporary object directory"
-msgstr ""
-
-#: builtin/log.c:599
-#, c-format
-msgid "git show %s: bad file"
-msgstr ""
-
-#: builtin/log.c:614 builtin/log.c:706
-#, c-format
-msgid "could not read object %s"
-msgstr ""
-
-#: builtin/log.c:731
-#, c-format
-msgid "unknown type: %d"
-msgstr ""
-
-#: builtin/log.c:880
-#, c-format
-msgid "%s: invalid cover from description mode"
-msgstr ""
-
-#: builtin/log.c:887
-msgid "format.headers without value"
-msgstr ""
-
-#: builtin/log.c:1016
-#, c-format
-msgid "cannot open patch file %s"
-msgstr ""
-
-#: builtin/log.c:1033
-msgid "need exactly one range"
-msgstr ""
-
-#: builtin/log.c:1043
-msgid "not a range"
-msgstr ""
-
-#: builtin/log.c:1207
-msgid "cover letter needs email format"
-msgstr ""
-
-#: builtin/log.c:1213
-msgid "failed to create cover-letter file"
-msgstr ""
-
-#: builtin/log.c:1300
-#, c-format
-msgid "insane in-reply-to: %s"
-msgstr ""
-
-#: builtin/log.c:1327
-msgid "git format-patch [<options>] [<since> | <revision-range>]"
-msgstr ""
-
-#: builtin/log.c:1385
-msgid "two output directories?"
-msgstr ""
-
-#: builtin/log.c:1536 builtin/log.c:2369 builtin/log.c:2371 builtin/log.c:2383
-#, c-format
-msgid "unknown commit %s"
-msgstr ""
-
-#: builtin/log.c:1547 builtin/replace.c:58 builtin/replace.c:207
-#: builtin/replace.c:210
-#, c-format
-msgid "failed to resolve '%s' as a valid ref"
-msgstr ""
-
-#: builtin/log.c:1556
-msgid "could not find exact merge base"
-msgstr ""
-
-#: builtin/log.c:1566
-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"
-"Or you could specify base commit by --base=<base-commit-id> manually"
-msgstr ""
-
-#: builtin/log.c:1589
-msgid "failed to find exact merge base"
-msgstr ""
-
-#: builtin/log.c:1606
-msgid "base commit should be the ancestor of revision list"
-msgstr ""
-
-#: builtin/log.c:1616
-msgid "base commit shouldn't be in revision list"
-msgstr ""
-
-#: builtin/log.c:1674
-msgid "cannot get patch id"
-msgstr ""
-
-#: builtin/log.c:1737
-msgid "failed to infer range-diff origin of current series"
-msgstr ""
-
-#: builtin/log.c:1739
-#, c-format
-msgid "using '%s' as range-diff origin of current series"
-msgstr ""
-
-#: builtin/log.c:1783
-msgid "use [PATCH n/m] even with a single patch"
-msgstr ""
-
-#: builtin/log.c:1786
-msgid "use [PATCH] even with multiple patches"
-msgstr ""
-
-#: builtin/log.c:1790
-msgid "print patches to standard out"
-msgstr ""
-
-#: builtin/log.c:1792
-msgid "generate a cover letter"
-msgstr ""
-
-#: builtin/log.c:1794
-msgid "use simple number sequence for output file names"
-msgstr ""
-
-#: builtin/log.c:1795
-msgid "sfx"
-msgstr ""
-
-#: builtin/log.c:1796
-msgid "use <sfx> instead of '.patch'"
-msgstr ""
-
-#: builtin/log.c:1798
-msgid "start numbering patches at <n> instead of 1"
-msgstr ""
-
-#: builtin/log.c:1799
-msgid "reroll-count"
-msgstr ""
-
-#: builtin/log.c:1800
-msgid "mark the series as Nth re-roll"
-msgstr ""
-
-#: builtin/log.c:1802
-msgid "max length of output filename"
-msgstr ""
-
-#: builtin/log.c:1804
-msgid "use [RFC PATCH] instead of [PATCH]"
-msgstr ""
-
-#: builtin/log.c:1807
-msgid "cover-from-description-mode"
-msgstr ""
-
-#: builtin/log.c:1808
-msgid "generate parts of a cover letter based on a branch's description"
-msgstr ""
-
-#: builtin/log.c:1810
-msgid "use [<prefix>] instead of [PATCH]"
-msgstr ""
-
-#: builtin/log.c:1813
-msgid "store resulting files in <dir>"
-msgstr ""
-
-#: builtin/log.c:1816
-msgid "don't strip/add [PATCH]"
-msgstr ""
-
-#: builtin/log.c:1819
-msgid "don't output binary diffs"
-msgstr ""
-
-#: builtin/log.c:1821
-msgid "output all-zero hash in From header"
-msgstr ""
-
-#: builtin/log.c:1823
-msgid "don't include a patch matching a commit upstream"
-msgstr ""
-
-#: builtin/log.c:1825
-msgid "show patch format instead of default (patch + stat)"
-msgstr ""
-
-#: builtin/log.c:1827
-msgid "Messaging"
-msgstr ""
-
-#: builtin/log.c:1828
-msgid "header"
-msgstr ""
-
-#: builtin/log.c:1829
-msgid "add email header"
-msgstr ""
-
-#: builtin/log.c:1830 builtin/log.c:1831
-msgid "email"
-msgstr ""
-
-#: builtin/log.c:1830
-msgid "add To: header"
-msgstr ""
-
-#: builtin/log.c:1831
-msgid "add Cc: header"
-msgstr ""
-
-#: builtin/log.c:1832
-msgid "ident"
-msgstr ""
-
-#: builtin/log.c:1833
-msgid "set From address to <ident> (or committer ident if absent)"
-msgstr ""
-
-#: builtin/log.c:1835
-msgid "message-id"
-msgstr ""
-
-#: builtin/log.c:1836
-msgid "make first mail a reply to <message-id>"
-msgstr ""
-
-#: builtin/log.c:1837 builtin/log.c:1840
-msgid "boundary"
-msgstr ""
-
-#: builtin/log.c:1838
-msgid "attach the patch"
-msgstr ""
-
-#: builtin/log.c:1841
-msgid "inline the patch"
-msgstr ""
-
-#: builtin/log.c:1845
-msgid "enable message threading, styles: shallow, deep"
-msgstr ""
-
-#: builtin/log.c:1847
-msgid "signature"
-msgstr ""
-
-#: builtin/log.c:1848
-msgid "add a signature"
-msgstr ""
-
-#: builtin/log.c:1849
-msgid "base-commit"
-msgstr ""
-
-#: builtin/log.c:1850
-msgid "add prerequisite tree info to the patch series"
-msgstr ""
-
-#: builtin/log.c:1853
-msgid "add a signature from a file"
-msgstr ""
-
-#: builtin/log.c:1854
-msgid "don't print the patch filenames"
-msgstr ""
-
-#: builtin/log.c:1856
-msgid "show progress while generating patches"
-msgstr ""
-
-#: builtin/log.c:1858
-msgid "show changes against <rev> in cover letter or single patch"
-msgstr ""
-
-#: builtin/log.c:1861
-msgid "show changes against <refspec> in cover letter or single patch"
-msgstr ""
-
-#: builtin/log.c:1863 builtin/range-diff.c:28
-msgid "percentage by which creation is weighted"
-msgstr ""
-
-#: builtin/log.c:1953
-#, c-format
-msgid "invalid ident line: %s"
-msgstr ""
-
-#: builtin/log.c:1978
-msgid "--name-only does not make sense"
-msgstr ""
-
-#: builtin/log.c:1980
-msgid "--name-status does not make sense"
-msgstr ""
-
-#: builtin/log.c:1982
-msgid "--check does not make sense"
-msgstr ""
-
-#: builtin/log.c:1984
-msgid "--remerge-diff does not make sense"
-msgstr ""
-
-#: builtin/log.c:2129
-msgid "--interdiff requires --cover-letter or single patch"
-msgstr ""
-
-#: builtin/log.c:2133
-msgid "Interdiff:"
-msgstr ""
-
-#: builtin/log.c:2134
-#, c-format
-msgid "Interdiff against v%d:"
-msgstr ""
-
-#: builtin/log.c:2144
-msgid "--range-diff requires --cover-letter or single patch"
-msgstr ""
-
-#: builtin/log.c:2152
-msgid "Range-diff:"
-msgstr ""
-
-#: builtin/log.c:2153
-#, c-format
-msgid "Range-diff against v%d:"
-msgstr ""
-
-#: builtin/log.c:2164
-#, c-format
-msgid "unable to read signature file '%s'"
-msgstr ""
-
-#: builtin/log.c:2200
-msgid "Generating patches"
-msgstr ""
-
-#: builtin/log.c:2244
-msgid "failed to create output files"
-msgstr ""
-
-#: builtin/log.c:2304
-msgid "git cherry [-v] [<upstream> [<head> [<limit>]]]"
-msgstr ""
-
-#: builtin/log.c:2358
-#, c-format
-msgid ""
-"Could not find a tracked remote branch, please specify <upstream> manually.\n"
-msgstr ""
-
-#: builtin/ls-files.c:564
-msgid "git ls-files [<options>] [<file>...]"
-msgstr ""
-
-#: builtin/ls-files.c:618
-msgid "separate paths with the NUL character"
-msgstr ""
-
-#: builtin/ls-files.c:620
-msgid "identify the file status with tags"
-msgstr ""
-
-#: builtin/ls-files.c:622
-msgid "use lowercase letters for 'assume unchanged' files"
-msgstr ""
-
-#: builtin/ls-files.c:624
-msgid "use lowercase letters for 'fsmonitor clean' files"
-msgstr ""
-
-#: builtin/ls-files.c:626
-msgid "show cached files in the output (default)"
-msgstr ""
-
-#: builtin/ls-files.c:628
-msgid "show deleted files in the output"
-msgstr ""
-
-#: builtin/ls-files.c:630
-msgid "show modified files in the output"
-msgstr ""
-
-#: builtin/ls-files.c:632
-msgid "show other files in the output"
-msgstr ""
-
-#: builtin/ls-files.c:634
-msgid "show ignored files in the output"
-msgstr ""
-
-#: builtin/ls-files.c:637
-msgid "show staged contents' object name in the output"
-msgstr ""
-
-#: builtin/ls-files.c:639
-msgid "show files on the filesystem that need to be removed"
-msgstr ""
-
-#: builtin/ls-files.c:641
-msgid "show 'other' directories' names only"
-msgstr ""
-
-#: builtin/ls-files.c:643
-msgid "show line endings of files"
-msgstr ""
-
-#: builtin/ls-files.c:645
-msgid "don't show empty directories"
-msgstr ""
-
-#: builtin/ls-files.c:648
-msgid "show unmerged files in the output"
-msgstr ""
-
-#: builtin/ls-files.c:650
-msgid "show resolve-undo information"
-msgstr ""
-
-#: builtin/ls-files.c:652
-msgid "skip files matching pattern"
-msgstr ""
-
-#: builtin/ls-files.c:655
-msgid "read exclude patterns from <file>"
-msgstr ""
-
-#: builtin/ls-files.c:658
-msgid "read additional per-directory exclude patterns in <file>"
-msgstr ""
-
-#: builtin/ls-files.c:660
-msgid "add the standard git exclusions"
-msgstr ""
-
-#: builtin/ls-files.c:664
-msgid "make the output relative to the project top directory"
-msgstr ""
-
-#: builtin/ls-files.c:669
-msgid "if any <file> is not in the index, treat this as an error"
-msgstr ""
-
-#: builtin/ls-files.c:670
-msgid "tree-ish"
-msgstr ""
-
-#: builtin/ls-files.c:671
-msgid "pretend that paths removed since <tree-ish> are still present"
-msgstr ""
-
-#: builtin/ls-files.c:673
-msgid "show debugging data"
-msgstr ""
-
-#: builtin/ls-files.c:675
-msgid "suppress duplicate entries"
-msgstr ""
-
-#: builtin/ls-files.c:677
-msgid "show sparse directories in the presence of a sparse index"
-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>...]]"
-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:1131
-msgid "exec"
-msgstr ""
-
-#: builtin/ls-remote.c:62 builtin/ls-remote.c:64
-msgid "path of git-upload-pack on the remote host"
-msgstr ""
-
-#: builtin/ls-remote.c:66
-msgid "limit to tags"
-msgstr ""
-
-#: builtin/ls-remote.c:67
-msgid "limit to heads"
-msgstr ""
-
-#: builtin/ls-remote.c:68
-msgid "do not show peeled tags"
-msgstr ""
-
-#: builtin/ls-remote.c:70
-msgid "take url.<base>.insteadOf into account"
-msgstr ""
-
-#: builtin/ls-remote.c:73
-msgid "exit with exit code 2 if no matching refs are found"
-msgstr ""
-
-#: builtin/ls-remote.c:76
-msgid "show underlying ref in addition to the object pointed by it"
-msgstr ""
-
-#: builtin/ls-tree.c:36
-msgid "git ls-tree [<options>] <tree-ish> [<path>...]"
-msgstr ""
-
-#: builtin/ls-tree.c:54
-#, c-format
-msgid "could not get object info about '%s'"
-msgstr ""
-
-#: builtin/ls-tree.c:79
-#, c-format
-msgid "bad ls-tree format: element '%s' does not start with '('"
-msgstr ""
-
-#: builtin/ls-tree.c:83
-#, c-format
-msgid "bad ls-tree format: element '%s' does not end in ')'"
-msgstr ""
-
-#: builtin/ls-tree.c:109
-#, c-format
-msgid "bad ls-tree format: %%%.*s"
-msgstr ""
-
-#: builtin/ls-tree.c:336
-msgid "only show trees"
-msgstr ""
-
-#: builtin/ls-tree.c:338
-msgid "recurse into subtrees"
-msgstr ""
-
-#: builtin/ls-tree.c:340
-msgid "show trees when recursing"
-msgstr ""
-
-#: builtin/ls-tree.c:343
-msgid "terminate entries with NUL byte"
-msgstr ""
-
-#: builtin/ls-tree.c:344
-msgid "include object size"
-msgstr ""
-
-#: builtin/ls-tree.c:346 builtin/ls-tree.c:348
-msgid "list only filenames"
-msgstr ""
-
-#: builtin/ls-tree.c:350
-msgid "list only objects"
-msgstr ""
-
-#: builtin/ls-tree.c:353
-msgid "use full path names"
-msgstr ""
-
-#: builtin/ls-tree.c:355
-msgid "list entire tree; not just current directory (implies --full-name)"
-msgstr ""
-
-#: builtin/ls-tree.c:391
-msgid "--format can't be combined with other format-altering options"
-msgstr ""
-
-#. TRANSLATORS: keep <> in "<" mail ">" info.
-#: builtin/mailinfo.c:14
-msgid "git mailinfo [<options>] <msg> <patch> < mail >info"
-msgstr ""
-
-#: builtin/mailinfo.c:58
-msgid "keep subject"
-msgstr ""
-
-#: builtin/mailinfo.c:60
-msgid "keep non patch brackets in subject"
-msgstr ""
-
-#: builtin/mailinfo.c:62
-msgid "copy Message-ID to the end of commit message"
-msgstr ""
-
-#: builtin/mailinfo.c:64
-msgid "re-code metadata to i18n.commitEncoding"
-msgstr ""
-
-#: builtin/mailinfo.c:67
-msgid "disable charset re-coding of metadata"
-msgstr ""
-
-#: builtin/mailinfo.c:69
-msgid "encoding"
-msgstr ""
-
-#: builtin/mailinfo.c:70
-msgid "re-code metadata to this encoding"
-msgstr ""
-
-#: builtin/mailinfo.c:72
-msgid "use scissors"
-msgstr ""
-
-#: builtin/mailinfo.c:73
-msgid "<action>"
-msgstr ""
-
-#: builtin/mailinfo.c:74
-msgid "action when quoted CR is found"
-msgstr ""
-
-#: builtin/mailinfo.c:77
-msgid "use headers in message's body"
-msgstr ""
-
-#: builtin/mailsplit.c:227
-msgid "reading patches from stdin/tty..."
-msgstr ""
-
-#: builtin/mailsplit.c:242
-#, c-format
-msgid "empty mbox: '%s'"
-msgstr ""
-
-#: builtin/merge-base.c:32
-msgid "git merge-base [-a | --all] <commit> <commit>..."
-msgstr ""
-
-#: builtin/merge-base.c:33
-msgid "git merge-base [-a | --all] --octopus <commit>..."
-msgstr ""
-
-#: builtin/merge-base.c:34
-msgid "git merge-base --independent <commit>..."
-msgstr ""
-
-#: builtin/merge-base.c:35
-msgid "git merge-base --is-ancestor <commit> <commit>"
-msgstr ""
-
-#: builtin/merge-base.c:36
-msgid "git merge-base --fork-point <ref> [<commit>]"
-msgstr ""
-
-#: builtin/merge-base.c:144
-msgid "output all common ancestors"
-msgstr ""
-
-#: builtin/merge-base.c:146
-msgid "find ancestors for a single n-way merge"
-msgstr ""
-
-#: builtin/merge-base.c:148
-msgid "list revs not reachable from others"
-msgstr ""
-
-#: builtin/merge-base.c:150
-msgid "is the first one ancestor of the other?"
-msgstr ""
-
-#: builtin/merge-base.c:152
-msgid "find where <commit> forked from reflog of <ref>"
-msgstr ""
-
-#: builtin/merge-file.c:9
-msgid ""
-"git merge-file [<options>] [-L <name1> [-L <orig> [-L <name2>]]] <file1> "
-"<orig-file> <file2>"
-msgstr ""
-
-#: builtin/merge-file.c:35
-msgid "send results to standard output"
-msgstr ""
-
-#: builtin/merge-file.c:36
-msgid "use a diff3 based merge"
-msgstr ""
-
-#: builtin/merge-file.c:37
-msgid "use a zealous diff3 based merge"
-msgstr ""
-
-#: builtin/merge-file.c:39
-msgid "for conflicts, use our version"
-msgstr ""
-
-#: builtin/merge-file.c:41
-msgid "for conflicts, use their version"
-msgstr ""
-
-#: builtin/merge-file.c:43
-msgid "for conflicts, use a union version"
-msgstr ""
-
-#: builtin/merge-file.c:46
-msgid "for conflicts, use this marker size"
-msgstr ""
-
-#: builtin/merge-file.c:47
-msgid "do not warn about conflicts"
-msgstr ""
-
-#: builtin/merge-file.c:49
-msgid "set labels for file1/orig-file/file2"
-msgstr ""
-
-#: builtin/merge-recursive.c:47
-#, c-format
-msgid "unknown option %s"
-msgstr ""
-
-#: builtin/merge-recursive.c:53
-#, c-format
-msgid "could not parse object '%s'"
-msgstr ""
-
-#: builtin/merge-recursive.c:57
-#, c-format
-msgid "cannot handle more than %d base. Ignoring %s."
-msgid_plural "cannot handle more than %d bases. Ignoring %s."
-msgstr[0] ""
-msgstr[1] ""
-
-#: builtin/merge-recursive.c:65
-msgid "not handling anything other than two heads merge."
-msgstr ""
-
-#: builtin/merge-recursive.c:74 builtin/merge-recursive.c:76
-#, c-format
-msgid "could not resolve ref '%s'"
-msgstr ""
-
-#: builtin/merge-recursive.c:82
-#, c-format
-msgid "Merging %s with %s\n"
-msgstr ""
-
-#: builtin/merge.c:59
-msgid "git merge [<options>] [<commit>...]"
-msgstr ""
-
-#: builtin/merge.c:125
-msgid "switch `m' requires a value"
-msgstr ""
-
-#: builtin/merge.c:148
-#, c-format
-msgid "option `%s' requires a value"
-msgstr ""
-
-#: builtin/merge.c:201
-#, c-format
-msgid "Could not find merge strategy '%s'.\n"
-msgstr ""
-
-#: builtin/merge.c:202
-#, c-format
-msgid "Available strategies are:"
-msgstr ""
-
-#: builtin/merge.c:207
-#, c-format
-msgid "Available custom strategies are:"
-msgstr ""
-
-#: builtin/merge.c:258 builtin/pull.c:134
-msgid "do not show a diffstat at the end of the merge"
-msgstr ""
-
-#: builtin/merge.c:261 builtin/pull.c:137
-msgid "show a diffstat at the end of the merge"
-msgstr ""
-
-#: builtin/merge.c:262 builtin/pull.c:140
-msgid "(synonym to --stat)"
-msgstr ""
-
-#: builtin/merge.c:264 builtin/pull.c:143
-msgid "add (at most <n>) entries from shortlog to merge commit message"
-msgstr ""
-
-#: builtin/merge.c:267 builtin/pull.c:149
-msgid "create a single commit instead of doing a merge"
-msgstr ""
-
-#: builtin/merge.c:269 builtin/pull.c:152
-msgid "perform a commit if the merge succeeds (default)"
-msgstr ""
-
-#: builtin/merge.c:271 builtin/pull.c:155
-msgid "edit message before committing"
-msgstr ""
-
-#: builtin/merge.c:273
-msgid "allow fast-forward (default)"
-msgstr ""
-
-#: builtin/merge.c:275 builtin/pull.c:162
-msgid "abort if fast-forward is not possible"
-msgstr ""
-
-#: builtin/merge.c:279 builtin/pull.c:168
-msgid "verify that the named commit has a valid GPG signature"
-msgstr ""
-
-#: builtin/merge.c:280 builtin/notes.c:785 builtin/pull.c:172
-#: builtin/rebase.c:1145 builtin/revert.c:114
-msgid "strategy"
-msgstr ""
-
-#: builtin/merge.c:281 builtin/pull.c:173
-msgid "merge strategy to use"
-msgstr ""
-
-#: builtin/merge.c:282 builtin/pull.c:176
-msgid "option=value"
-msgstr ""
-
-#: builtin/merge.c:283 builtin/pull.c:177
-msgid "option for selected merge strategy"
-msgstr ""
-
-#: builtin/merge.c:285
-msgid "merge commit message (for a non-fast-forward merge)"
-msgstr ""
-
-#: builtin/merge.c:291
-msgid "use <name> instead of the real target"
-msgstr ""
-
-#: builtin/merge.c:294
-msgid "abort the current in-progress merge"
-msgstr ""
-
-#: builtin/merge.c:296
-msgid "--abort but leave index and working tree alone"
-msgstr ""
-
-#: builtin/merge.c:298
-msgid "continue the current in-progress merge"
-msgstr ""
-
-#: builtin/merge.c:300 builtin/pull.c:184
-msgid "allow merging unrelated histories"
-msgstr ""
-
-#: builtin/merge.c:307
-msgid "bypass pre-merge-commit and commit-msg hooks"
-msgstr ""
-
-#: builtin/merge.c:323
-msgid "could not run stash."
-msgstr ""
-
-#: builtin/merge.c:328
-msgid "stash failed"
-msgstr ""
-
-#: builtin/merge.c:333
-#, c-format
-msgid "not a valid object: %s"
-msgstr ""
-
-#: builtin/merge.c:355 builtin/merge.c:372
-msgid "read-tree failed"
-msgstr ""
-
-#: builtin/merge.c:403
-msgid "Already up to date. (nothing to squash)"
-msgstr ""
-
-#: builtin/merge.c:417
-#, c-format
-msgid "Squash commit -- not updating HEAD\n"
-msgstr ""
-
-#: builtin/merge.c:467
-#, c-format
-msgid "No merge message -- not updating HEAD\n"
-msgstr ""
-
-#: builtin/merge.c:517
-#, c-format
-msgid "'%s' does not point to a commit"
-msgstr ""
-
-#: builtin/merge.c:605
-#, c-format
-msgid "Bad branch.%s.mergeoptions string: %s"
-msgstr ""
-
-#: builtin/merge.c:732
-msgid "Not handling anything other than two heads merge."
-msgstr ""
-
-#: builtin/merge.c:745
-#, c-format
-msgid "unknown strategy option: -X%s"
-msgstr ""
-
-#: builtin/merge.c:764 t/helper/test-fast-rebase.c:223
-#, c-format
-msgid "unable to write %s"
-msgstr ""
-
-#: builtin/merge.c:816
-#, c-format
-msgid "Could not read from '%s'"
-msgstr ""
-
-#: builtin/merge.c:825
-#, c-format
-msgid "Not committing merge; use 'git commit' to complete the merge.\n"
-msgstr ""
-
-#: builtin/merge.c:831
-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:836
-msgid "An empty message aborts the commit.\n"
-msgstr ""
-
-#: builtin/merge.c:839
-#, c-format
-msgid ""
-"Lines starting with '%c' will be ignored, and an empty message aborts\n"
-"the commit.\n"
-msgstr ""
-
-#: builtin/merge.c:900
-msgid "Empty commit message."
-msgstr ""
-
-#: builtin/merge.c:915
-#, c-format
-msgid "Wonderful.\n"
-msgstr ""
-
-#: builtin/merge.c:976
-#, c-format
-msgid "Automatic merge failed; fix conflicts and then commit the result.\n"
-msgstr ""
-
-#: builtin/merge.c:1015
-msgid "No current branch."
-msgstr ""
-
-#: builtin/merge.c:1017
-msgid "No remote for the current branch."
-msgstr ""
-
-#: builtin/merge.c:1019
-msgid "No default upstream defined for the current branch."
-msgstr ""
-
-#: builtin/merge.c:1024
-#, c-format
-msgid "No remote-tracking branch for %s from %s"
-msgstr ""
-
-#: builtin/merge.c:1081
-#, c-format
-msgid "Bad value '%s' in environment '%s'"
-msgstr ""
-
-#: builtin/merge.c:1183
-#, c-format
-msgid "not something we can merge in %s: %s"
-msgstr ""
-
-#: builtin/merge.c:1217
-msgid "not something we can merge"
-msgstr ""
-
-#: builtin/merge.c:1330
-msgid "--abort expects no arguments"
-msgstr ""
-
-#: builtin/merge.c:1334
-msgid "There is no merge to abort (MERGE_HEAD missing)."
-msgstr ""
-
-#: builtin/merge.c:1352
-msgid "--quit expects no arguments"
-msgstr ""
-
-#: builtin/merge.c:1365
-msgid "--continue expects no arguments"
-msgstr ""
-
-#: builtin/merge.c:1369
-msgid "There is no merge in progress (MERGE_HEAD missing)."
-msgstr ""
-
-#: builtin/merge.c:1385
-msgid ""
-"You have not concluded your merge (MERGE_HEAD exists).\n"
-"Please, commit your changes before you merge."
-msgstr ""
-
-#: builtin/merge.c:1392
-msgid ""
-"You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists).\n"
-"Please, commit your changes before you merge."
-msgstr ""
-
-#: builtin/merge.c:1395
-msgid "You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists)."
-msgstr ""
-
-#: builtin/merge.c:1427
-msgid "No commit specified and merge.defaultToUpstream not set."
-msgstr ""
-
-#: builtin/merge.c:1444
-msgid "Squash commit into empty head not supported yet"
-msgstr ""
-
-#: builtin/merge.c:1446
-msgid "Non-fast-forward commit does not make sense into an empty head"
-msgstr ""
-
-#: builtin/merge.c:1451
-#, c-format
-msgid "%s - not something we can merge"
-msgstr ""
-
-#: builtin/merge.c:1453
-msgid "Can merge only exactly one commit into empty head"
-msgstr ""
-
-#: builtin/merge.c:1540
-msgid "refusing to merge unrelated histories"
-msgstr ""
-
-#: builtin/merge.c:1559
-#, c-format
-msgid "Updating %s..%s\n"
-msgstr ""
-
-#: builtin/merge.c:1606
-#, c-format
-msgid "Trying really trivial in-index merge...\n"
-msgstr ""
-
-#: builtin/merge.c:1613
-#, c-format
-msgid "Nope.\n"
-msgstr ""
-
-#: builtin/merge.c:1671 builtin/merge.c:1737
-#, c-format
-msgid "Rewinding the tree to pristine...\n"
-msgstr ""
-
-#: builtin/merge.c:1675
-#, c-format
-msgid "Trying merge strategy %s...\n"
-msgstr ""
-
-#: builtin/merge.c:1727
-#, c-format
-msgid "No merge strategy handled the merge.\n"
-msgstr ""
-
-#: builtin/merge.c:1729
-#, c-format
-msgid "Merge with strategy %s failed.\n"
-msgstr ""
-
-#: builtin/merge.c:1739
-#, c-format
-msgid "Using the %s strategy to prepare resolving by hand.\n"
-msgstr ""
-
-#: builtin/merge.c:1753
-#, c-format
-msgid "Automatic merge went well; stopped before committing as requested\n"
-msgstr ""
-
-#: builtin/mktag.c:27
-#, c-format
-msgid "warning: tag input does not pass fsck: %s"
-msgstr ""
-
-#: builtin/mktag.c:38
-#, c-format
-msgid "error: tag input does not pass fsck: %s"
-msgstr ""
-
-#: builtin/mktag.c:41
-#, c-format
-msgid "%d (FSCK_IGNORE?) should never trigger this callback"
-msgstr ""
-
-#: builtin/mktag.c:56
-#, c-format
-msgid "could not read tagged object '%s'"
-msgstr ""
-
-#: builtin/mktag.c:59
-#, c-format
-msgid "object '%s' tagged as '%s', but is a '%s' type"
-msgstr ""
-
-#: builtin/mktag.c:97
-msgid "tag on stdin did not pass our strict fsck check"
-msgstr ""
-
-#: builtin/mktag.c:100
-msgid "tag on stdin did not refer to a valid object"
-msgstr ""
-
-#: builtin/mktag.c:103 builtin/tag.c:243
-msgid "unable to write tag file"
-msgstr ""
-
-#: builtin/mktree.c:154
-msgid "input is NUL terminated"
-msgstr ""
-
-#: builtin/mktree.c:155 builtin/write-tree.c:26
-msgid "allow missing objects"
-msgstr ""
-
-#: builtin/mktree.c:156
-msgid "allow creation of more than one tree"
-msgstr ""
-
-#: builtin/multi-pack-index.c:10
-msgid ""
-"git multi-pack-index [<options>] write [--preferred-pack=<pack>][--refs-"
-"snapshot=<path>]"
-msgstr ""
-
-#: builtin/multi-pack-index.c:14
-msgid "git multi-pack-index [<options>] verify"
-msgstr ""
-
-#: builtin/multi-pack-index.c:17
-msgid "git multi-pack-index [<options>] expire"
-msgstr ""
-
-#: builtin/multi-pack-index.c:20
-msgid "git multi-pack-index [<options>] repack [--batch-size=<size>]"
-msgstr ""
-
-#: builtin/multi-pack-index.c:57
-msgid "object directory containing set of packfile and pack-index pairs"
-msgstr ""
-
-#: builtin/multi-pack-index.c:98
-msgid "preferred-pack"
-msgstr ""
-
-#: builtin/multi-pack-index.c:99
-msgid "pack for reuse when computing a multi-pack bitmap"
-msgstr ""
-
-#: 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:206
-msgid ""
-"during repack, collect pack-files of smaller size into a batch that is "
-"larger than this size"
-msgstr ""
-
-#: builtin/mv.c:18
-msgid "git mv [<options>] <source>... <destination>"
-msgstr ""
-
-#: builtin/mv.c:83
-#, c-format
-msgid "Directory %s is in index and no submodule?"
-msgstr ""
-
-#: builtin/mv.c:85
-msgid "Please stage your changes to .gitmodules or stash them to proceed"
-msgstr ""
-
-#: builtin/mv.c:103
-#, c-format
-msgid "%.*s is in index"
-msgstr ""
-
-#: builtin/mv.c:125
-msgid "force move/rename even if target exists"
-msgstr ""
-
-#: builtin/mv.c:127
-msgid "skip move/rename errors"
-msgstr ""
-
-#: builtin/mv.c:172
-#, c-format
-msgid "destination '%s' is not a directory"
-msgstr ""
-
-#: builtin/mv.c:184
-#, c-format
-msgid "Checking rename of '%s' to '%s'\n"
-msgstr ""
-
-#: builtin/mv.c:190
-msgid "bad source"
-msgstr ""
-
-#: builtin/mv.c:193
-msgid "can not move directory into itself"
-msgstr ""
-
-#: builtin/mv.c:196
-msgid "cannot move directory over file"
-msgstr ""
-
-#: builtin/mv.c:205
-msgid "source directory is empty"
-msgstr ""
-
-#: builtin/mv.c:231
-msgid "not under version control"
-msgstr ""
-
-#: builtin/mv.c:233
-msgid "conflicted"
-msgstr ""
-
-#: builtin/mv.c:236
-msgid "destination exists"
-msgstr ""
-
-#: builtin/mv.c:244
-#, c-format
-msgid "overwriting '%s'"
-msgstr ""
-
-#: builtin/mv.c:247
-msgid "Cannot overwrite"
-msgstr ""
-
-#: builtin/mv.c:250
-msgid "multiple sources for the same target"
-msgstr ""
-
-#: builtin/mv.c:252
-msgid "destination directory does not exist"
-msgstr ""
-
-#: builtin/mv.c:280
-#, c-format
-msgid "%s, source=%s, destination=%s"
-msgstr ""
-
-#: builtin/mv.c:308
-#, c-format
-msgid "Renaming %s to %s\n"
-msgstr ""
-
-#: builtin/mv.c:314 builtin/remote.c:812 builtin/repack.c:861
-#, c-format
-msgid "renaming '%s' failed"
-msgstr ""
-
-#: builtin/name-rev.c:524
-msgid "git name-rev [<options>] <commit>..."
-msgstr ""
-
-#: builtin/name-rev.c:525
-msgid "git name-rev [<options>] --all"
-msgstr ""
-
-#: builtin/name-rev.c:526
-msgid "git name-rev [<options>] --annotate-stdin"
-msgstr ""
-
-#: builtin/name-rev.c:583
-msgid "print only ref-based names (no object names)"
-msgstr ""
-
-#: builtin/name-rev.c:584
-msgid "only use tags to name the commits"
-msgstr ""
-
-#: builtin/name-rev.c:586
-msgid "only use refs matching <pattern>"
-msgstr ""
-
-#: builtin/name-rev.c:588
-msgid "ignore refs matching <pattern>"
-msgstr ""
-
-#: builtin/name-rev.c:590
-msgid "list all commits reachable from all refs"
-msgstr ""
-
-#: builtin/name-rev.c:591
-msgid "deprecated: use annotate-stdin instead"
-msgstr ""
-
-#: builtin/name-rev.c:592
-msgid "annotate text from stdin"
-msgstr ""
-
-#: builtin/name-rev.c:593
-msgid "allow to print `undefined` names (default)"
-msgstr ""
-
-#: builtin/name-rev.c:599
-msgid "dereference tags in the input (internal use)"
-msgstr ""
-
-#: builtin/notes.c:28
-msgid "git notes [--ref <notes-ref>] [list [<object>]]"
-msgstr ""
-
-#: builtin/notes.c:29
-msgid ""
-"git notes [--ref <notes-ref>] add [-f] [--allow-empty] [-m <msg> | -F <file> "
-"| (-c | -C) <object>] [<object>]"
-msgstr ""
-
-#: builtin/notes.c:30
-msgid "git notes [--ref <notes-ref>] copy [-f] <from-object> <to-object>"
-msgstr ""
-
-#: builtin/notes.c:31
-msgid ""
-"git notes [--ref <notes-ref>] append [--allow-empty] [-m <msg> | -F <file> | "
-"(-c | -C) <object>] [<object>]"
-msgstr ""
-
-#: builtin/notes.c:32
-msgid "git notes [--ref <notes-ref>] edit [--allow-empty] [<object>]"
-msgstr ""
-
-#: builtin/notes.c:33
-msgid "git notes [--ref <notes-ref>] show [<object>]"
-msgstr ""
-
-#: builtin/notes.c:34
-msgid ""
-"git notes [--ref <notes-ref>] merge [-v | -q] [-s <strategy>] <notes-ref>"
-msgstr ""
-
-#: builtin/notes.c:37
-msgid "git notes [--ref <notes-ref>] remove [<object>...]"
-msgstr ""
-
-#: builtin/notes.c:38
-msgid "git notes [--ref <notes-ref>] prune [-n] [-v]"
-msgstr ""
-
-#: builtin/notes.c:39
-msgid "git notes [--ref <notes-ref>] get-ref"
-msgstr ""
-
-#: builtin/notes.c:44
-msgid "git notes [list [<object>]]"
-msgstr ""
-
-#: builtin/notes.c:49
-msgid "git notes add [<options>] [<object>]"
-msgstr ""
-
-#: builtin/notes.c:54
-msgid "git notes copy [<options>] <from-object> <to-object>"
-msgstr ""
-
-#: builtin/notes.c:55
-msgid "git notes copy --stdin [<from-object> <to-object>]..."
-msgstr ""
-
-#: builtin/notes.c:60
-msgid "git notes append [<options>] [<object>]"
-msgstr ""
-
-#: builtin/notes.c:65
-msgid "git notes edit [<object>]"
-msgstr ""
-
-#: builtin/notes.c:70
-msgid "git notes show [<object>]"
-msgstr ""
-
-#: builtin/notes.c:75
-msgid "git notes merge [<options>] <notes-ref>"
-msgstr ""
-
-#: builtin/notes.c:76
-msgid "git notes merge --commit [<options>]"
-msgstr ""
-
-#: builtin/notes.c:77
-msgid "git notes merge --abort [<options>]"
-msgstr ""
-
-#: builtin/notes.c:82
-msgid "git notes remove [<object>]"
-msgstr ""
-
-#: builtin/notes.c:87
-msgid "git notes prune [<options>]"
-msgstr ""
-
-#: builtin/notes.c:97
-msgid "Write/edit the notes for the following object:"
-msgstr ""
-
-#: builtin/notes.c:149
-#, c-format
-msgid "unable to start 'show' for object '%s'"
-msgstr ""
-
-#: builtin/notes.c:153
-msgid "could not read 'show' output"
-msgstr ""
-
-#: builtin/notes.c:161
-#, c-format
-msgid "failed to finish 'show' for object '%s'"
-msgstr ""
-
-#: builtin/notes.c:194
-msgid "please supply the note contents using either -m or -F option"
-msgstr ""
-
-#: builtin/notes.c:203
-msgid "unable to write note object"
-msgstr ""
-
-#: builtin/notes.c:206
-#, c-format
-msgid "the note contents have been left in %s"
-msgstr ""
-
-#: builtin/notes.c:240 builtin/tag.c:582
-#, c-format
-msgid "could not open or read '%s'"
-msgstr ""
-
-#: 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:263
-#, c-format
-msgid "failed to read object '%s'."
-msgstr ""
-
-#: builtin/notes.c:266
-#, c-format
-msgid "cannot read note data from non-blob object '%s'."
-msgstr ""
-
-#: builtin/notes.c:307
-#, c-format
-msgid "malformed input line: '%s'."
-msgstr ""
-
-#: builtin/notes.c:322
-#, c-format
-msgid "failed to copy notes from '%s' to '%s'"
-msgstr ""
-
-#. TRANSLATORS: the first %s will be replaced by a git
-#. notes command: 'add', 'merge', 'remove', etc.
-#.
-#: builtin/notes.c:354
-#, c-format
-msgid "refusing to %s notes in %s (outside of refs/notes/)"
-msgstr ""
-
-#: builtin/notes.c:387 builtin/notes.c:676
-#, c-format
-msgid "no note found for object %s."
-msgstr ""
-
-#: builtin/notes.c:408 builtin/notes.c:574
-msgid "note contents as a string"
-msgstr ""
-
-#: builtin/notes.c:411 builtin/notes.c:577
-msgid "note contents in a file"
-msgstr ""
-
-#: builtin/notes.c:414 builtin/notes.c:580
-msgid "reuse and edit specified note object"
-msgstr ""
-
-#: builtin/notes.c:417 builtin/notes.c:583
-msgid "reuse specified note object"
-msgstr ""
-
-#: builtin/notes.c:420 builtin/notes.c:586
-msgid "allow storing empty note"
-msgstr ""
-
-#: builtin/notes.c:421 builtin/notes.c:494
-msgid "replace existing notes"
-msgstr ""
-
-#: 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:461 builtin/notes.c:542
-#, c-format
-msgid "Overwriting existing notes for object %s\n"
-msgstr ""
-
-#: builtin/notes.c:473 builtin/notes.c:635 builtin/notes.c:904
-#, c-format
-msgid "Removing note for object %s\n"
-msgstr ""
-
-#: builtin/notes.c:495
-msgid "read objects from stdin"
-msgstr ""
-
-#: builtin/notes.c:497
-msgid "load rewriting config for <command> (implies --stdin)"
-msgstr ""
-
-#: builtin/notes.c:515
-msgid "too few arguments"
-msgstr ""
-
-#: 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:548
-#, c-format
-msgid "missing notes on source object %s. Cannot copy."
-msgstr ""
-
-#: 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:696
-msgid "failed to delete ref NOTES_MERGE_PARTIAL"
-msgstr ""
-
-#: builtin/notes.c:698
-msgid "failed to delete ref NOTES_MERGE_REF"
-msgstr ""
-
-#: builtin/notes.c:700
-msgid "failed to remove 'git notes merge' worktree"
-msgstr ""
-
-#: builtin/notes.c:720
-msgid "failed to read ref NOTES_MERGE_PARTIAL"
-msgstr ""
-
-#: builtin/notes.c:722
-msgid "could not find commit from NOTES_MERGE_PARTIAL."
-msgstr ""
-
-#: builtin/notes.c:724
-msgid "could not parse commit from NOTES_MERGE_PARTIAL."
-msgstr ""
-
-#: builtin/notes.c:737
-msgid "failed to resolve NOTES_MERGE_REF"
-msgstr ""
-
-#: builtin/notes.c:740
-msgid "failed to finalize notes merge"
-msgstr ""
-
-#: builtin/notes.c:766
-#, c-format
-msgid "unknown notes merge strategy %s"
-msgstr ""
-
-#: builtin/notes.c:782
-msgid "General options"
-msgstr ""
-
-#: builtin/notes.c:784
-msgid "Merge options"
-msgstr ""
-
-#: builtin/notes.c:786
-msgid ""
-"resolve notes conflicts using the given strategy (manual/ours/theirs/union/"
-"cat_sort_uniq)"
-msgstr ""
-
-#: builtin/notes.c:788
-msgid "Committing unmerged notes"
-msgstr ""
-
-#: builtin/notes.c:790
-msgid "finalize notes merge by committing unmerged notes"
-msgstr ""
-
-#: builtin/notes.c:792
-msgid "Aborting notes merge resolution"
-msgstr ""
-
-#: builtin/notes.c:794
-msgid "abort notes merge"
-msgstr ""
-
-#: builtin/notes.c:805
-msgid "cannot mix --commit, --abort or -s/--strategy"
-msgstr ""
-
-#: builtin/notes.c:810
-msgid "must specify a notes ref to merge"
-msgstr ""
-
-#: builtin/notes.c:834
-#, c-format
-msgid "unknown -s/--strategy: %s"
-msgstr ""
-
-#: builtin/notes.c:874
-#, c-format
-msgid "a notes merge into %s is already in-progress at %s"
-msgstr ""
-
-#: builtin/notes.c:878
-#, c-format
-msgid "failed to store link to current notes ref (%s)"
-msgstr ""
-
-#: builtin/notes.c:880
-#, 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 ""
-
-#: builtin/notes.c:899 builtin/tag.c:595
-#, c-format
-msgid "Failed to resolve '%s' as a valid ref."
-msgstr ""
-
-#: builtin/notes.c:902
-#, c-format
-msgid "Object %s has no note\n"
-msgstr ""
-
-#: builtin/notes.c:914
-msgid "attempt to remove non-existent note is not an error"
-msgstr ""
-
-#: builtin/notes.c:917
-msgid "read object names from the standard input"
-msgstr ""
-
-#: builtin/notes.c:956 builtin/prune.c:144 builtin/worktree.c:148
-msgid "do not remove, show only"
-msgstr ""
-
-#: builtin/notes.c:957
-msgid "report pruned notes"
-msgstr ""
-
-#: builtin/notes.c:1000
-msgid "notes-ref"
-msgstr ""
-
-#: builtin/notes.c:1001
-msgid "use notes from <notes-ref>"
-msgstr ""
-
-#: builtin/notes.c:1036 builtin/stash.c:1802
-#, c-format
-msgid "unknown subcommand: %s"
-msgstr ""
-
-#: builtin/pack-objects.c:182
-msgid ""
-"git pack-objects --stdout [<options>...] [< <ref-list> | < <object-list>]"
-msgstr ""
-
-#: builtin/pack-objects.c:183
-msgid ""
-"git pack-objects [<options>...] <base-name> [< <ref-list> | < <object-list>]"
-msgstr ""
-
-#: builtin/pack-objects.c:570
-#, c-format
-msgid ""
-"write_reuse_object: could not locate %s, expected at offset %<PRIuMAX> in "
-"pack %s"
-msgstr ""
-
-#: builtin/pack-objects.c:578
-#, c-format
-msgid "bad packed object CRC for %s"
-msgstr ""
-
-#: builtin/pack-objects.c:589
-#, c-format
-msgid "corrupt packed object for %s"
-msgstr ""
-
-#: builtin/pack-objects.c:720
-#, c-format
-msgid "recursive delta detected for object %s"
-msgstr ""
-
-#: builtin/pack-objects.c:939
-#, c-format
-msgid "ordered %u objects, expected %<PRIu32>"
-msgstr ""
-
-#: builtin/pack-objects.c:1034
-#, c-format
-msgid "expected object at offset %<PRIuMAX> in pack %s"
-msgstr ""
-
-#: builtin/pack-objects.c:1158
-msgid "disabling bitmap writing, packs are split due to pack.packSizeLimit"
-msgstr ""
-
-#: builtin/pack-objects.c:1171
-msgid "Writing objects"
-msgstr ""
-
-#: builtin/pack-objects.c:1243 builtin/update-index.c:90
-#, c-format
-msgid "failed to stat %s"
-msgstr ""
-
-#: builtin/pack-objects.c:1276
-msgid "failed to write bitmap index"
-msgstr ""
-
-#: builtin/pack-objects.c:1302
-#, c-format
-msgid "wrote %<PRIu32> objects while expecting %<PRIu32>"
-msgstr ""
-
-#: builtin/pack-objects.c:1544
-msgid "disabling bitmap writing, as some objects are not being packed"
-msgstr ""
-
-#: builtin/pack-objects.c:1992
-#, c-format
-msgid "delta base offset overflow in pack for %s"
-msgstr ""
-
-#: builtin/pack-objects.c:2001
-#, c-format
-msgid "delta base offset out of bound for %s"
-msgstr ""
-
-#: builtin/pack-objects.c:2282
-msgid "Counting objects"
-msgstr ""
-
-#: builtin/pack-objects.c:2447
-#, c-format
-msgid "unable to parse object header of %s"
-msgstr ""
-
-#: builtin/pack-objects.c:2517 builtin/pack-objects.c:2533
-#: builtin/pack-objects.c:2543
-#, c-format
-msgid "object %s cannot be read"
-msgstr ""
-
-#: builtin/pack-objects.c:2520 builtin/pack-objects.c:2547
-#, c-format
-msgid "object %s inconsistent object length (%<PRIuMAX> vs %<PRIuMAX>)"
-msgstr ""
-
-#: builtin/pack-objects.c:2557
-msgid "suboptimal pack - out of memory"
-msgstr ""
-
-#: builtin/pack-objects.c:2872
-#, c-format
-msgid "Delta compression using up to %d threads"
-msgstr ""
-
-#: builtin/pack-objects.c:3011
-#, c-format
-msgid "unable to pack objects reachable from tag %s"
-msgstr ""
-
-#: builtin/pack-objects.c:3097
-msgid "Compressing objects"
-msgstr ""
-
-#: builtin/pack-objects.c:3103
-msgid "inconsistency with delta count"
-msgstr ""
-
-#: builtin/pack-objects.c:3182
-#, c-format
-msgid ""
-"value of uploadpack.blobpackfileuri must be of the form '<object-hash> <pack-"
-"hash> <uri>' (got '%s')"
-msgstr ""
-
-#: builtin/pack-objects.c:3185
-#, c-format
-msgid ""
-"object already configured in another uploadpack.blobpackfileuri (got '%s')"
-msgstr ""
-
-#: builtin/pack-objects.c:3220
-#, c-format
-msgid "could not get type of object %s in pack %s"
-msgstr ""
-
-#: builtin/pack-objects.c:3348 builtin/pack-objects.c:3359
-#: builtin/pack-objects.c:3373
-#, c-format
-msgid "could not find pack '%s'"
-msgstr ""
-
-#: builtin/pack-objects.c:3416
-#, c-format
-msgid ""
-"expected edge object ID, got garbage:\n"
-" %s"
-msgstr ""
-
-#: builtin/pack-objects.c:3422
-#, c-format
-msgid ""
-"expected object ID, got garbage:\n"
-" %s"
-msgstr ""
-
-#: builtin/pack-objects.c:3540 builtin/pack-objects.c:3627
-msgid "cannot open pack index"
-msgstr ""
-
-#: builtin/pack-objects.c:3549
-#, c-format
-msgid "loose object at %s could not be examined"
-msgstr ""
-
-#: builtin/pack-objects.c:3635
-msgid "unable to force loose object"
-msgstr ""
-
-#: builtin/pack-objects.c:3763
-#, c-format
-msgid "not a rev '%s'"
-msgstr ""
-
-#: builtin/pack-objects.c:3766 builtin/rev-parse.c:1061
-#, c-format
-msgid "bad revision '%s'"
-msgstr ""
-
-#: builtin/pack-objects.c:3794
-msgid "unable to add recent objects"
-msgstr ""
-
-#: builtin/pack-objects.c:3847
-#, c-format
-msgid "unsupported index version %s"
-msgstr ""
-
-#: builtin/pack-objects.c:3851
-#, c-format
-msgid "bad index version '%s'"
-msgstr ""
-
-#: builtin/pack-objects.c:3907
-msgid "<version>[,<offset>]"
-msgstr ""
-
-#: builtin/pack-objects.c:3908
-msgid "write the pack index file in the specified idx format version"
-msgstr ""
-
-#: builtin/pack-objects.c:3911
-msgid "maximum size of each output pack file"
-msgstr ""
-
-#: builtin/pack-objects.c:3913
-msgid "ignore borrowed objects from alternate object store"
-msgstr ""
-
-#: builtin/pack-objects.c:3915
-msgid "ignore packed objects"
-msgstr ""
-
-#: builtin/pack-objects.c:3917
-msgid "limit pack window by objects"
-msgstr ""
-
-#: builtin/pack-objects.c:3919
-msgid "limit pack window by memory in addition to object limit"
-msgstr ""
-
-#: builtin/pack-objects.c:3921
-msgid "maximum length of delta chain allowed in the resulting pack"
-msgstr ""
-
-#: builtin/pack-objects.c:3923
-msgid "reuse existing deltas"
-msgstr ""
-
-#: builtin/pack-objects.c:3925
-msgid "reuse existing objects"
-msgstr ""
-
-#: builtin/pack-objects.c:3927
-msgid "use OFS_DELTA objects"
-msgstr ""
-
-#: builtin/pack-objects.c:3929
-msgid "use threads when searching for best delta matches"
-msgstr ""
-
-#: builtin/pack-objects.c:3931
-msgid "do not create an empty pack output"
-msgstr ""
-
-#: builtin/pack-objects.c:3933
-msgid "read revision arguments from standard input"
-msgstr ""
-
-#: builtin/pack-objects.c:3935
-msgid "limit the objects to those that are not yet packed"
-msgstr ""
-
-#: builtin/pack-objects.c:3938
-msgid "include objects reachable from any reference"
-msgstr ""
-
-#: builtin/pack-objects.c:3941
-msgid "include objects referred by reflog entries"
-msgstr ""
-
-#: builtin/pack-objects.c:3944
-msgid "include objects referred to by the index"
-msgstr ""
-
-#: builtin/pack-objects.c:3947
-msgid "read packs from stdin"
-msgstr ""
-
-#: builtin/pack-objects.c:3949
-msgid "output pack to stdout"
-msgstr ""
-
-#: builtin/pack-objects.c:3951
-msgid "include tag objects that refer to objects to be packed"
-msgstr ""
-
-#: builtin/pack-objects.c:3953
-msgid "keep unreachable objects"
-msgstr ""
-
-#: builtin/pack-objects.c:3955
-msgid "pack loose unreachable objects"
-msgstr ""
-
-#: builtin/pack-objects.c:3957
-msgid "unpack unreachable objects newer than <time>"
-msgstr ""
-
-#: builtin/pack-objects.c:3960
-msgid "use the sparse reachability algorithm"
-msgstr ""
-
-#: builtin/pack-objects.c:3962
-msgid "create thin packs"
-msgstr ""
-
-#: builtin/pack-objects.c:3964
-msgid "create packs suitable for shallow fetches"
-msgstr ""
-
-#: builtin/pack-objects.c:3966
-msgid "ignore packs that have companion .keep file"
-msgstr ""
-
-#: builtin/pack-objects.c:3968
-msgid "ignore this pack"
-msgstr ""
-
-#: builtin/pack-objects.c:3970
-msgid "pack compression level"
-msgstr ""
-
-#: builtin/pack-objects.c:3972
-msgid "do not hide commits by grafts"
-msgstr ""
-
-#: builtin/pack-objects.c:3974
-msgid "use a bitmap index if available to speed up counting objects"
-msgstr ""
-
-#: builtin/pack-objects.c:3976
-msgid "write a bitmap index together with the pack index"
-msgstr ""
-
-#: builtin/pack-objects.c:3980
-msgid "write a bitmap index if possible"
-msgstr ""
-
-#: builtin/pack-objects.c:3984
-msgid "handling for missing objects"
-msgstr ""
-
-#: builtin/pack-objects.c:3987
-msgid "do not pack objects in promisor packfiles"
-msgstr ""
-
-#: builtin/pack-objects.c:3989
-msgid "respect islands during delta compression"
-msgstr ""
-
-#: builtin/pack-objects.c:3991
-msgid "protocol"
-msgstr ""
-
-#: builtin/pack-objects.c:3992
-msgid "exclude any configured uploadpack.blobpackfileuri with this protocol"
-msgstr ""
-
-#: builtin/pack-objects.c:4027
-#, c-format
-msgid "delta chain depth %d is too deep, forcing %d"
-msgstr ""
-
-#: builtin/pack-objects.c:4032
-#, c-format
-msgid "pack.deltaCacheLimit is too high, forcing %d"
-msgstr ""
-
-#: builtin/pack-objects.c:4088
-msgid "--max-pack-size cannot be used to build a pack for transfer"
-msgstr ""
-
-#: builtin/pack-objects.c:4090
-msgid "minimum pack size limit is 1 MiB"
-msgstr ""
-
-#: builtin/pack-objects.c:4095
-msgid "--thin cannot be used to build an indexable pack"
-msgstr ""
-
-#: builtin/pack-objects.c:4104
-msgid "cannot use --filter without --stdout"
-msgstr ""
-
-#: builtin/pack-objects.c:4106
-msgid "cannot use --filter with --stdin-packs"
-msgstr ""
-
-#: builtin/pack-objects.c:4110
-msgid "cannot use internal rev list with --stdin-packs"
-msgstr ""
-
-#: builtin/pack-objects.c:4169
-msgid "Enumerating objects"
-msgstr ""
-
-#: builtin/pack-objects.c:4210
-#, c-format
-msgid ""
-"Total %<PRIu32> (delta %<PRIu32>), reused %<PRIu32> (delta %<PRIu32>), pack-"
-"reused %<PRIu32>"
-msgstr ""
-
-#: builtin/pack-redundant.c:601
-msgid ""
-"'git pack-redundant' is nominated for removal.\n"
-"If you still use this command, please add an extra\n"
-"option, '--i-still-use-this', on the command line\n"
-"and let us know you still use it by sending an e-mail\n"
-"to <git@vger.kernel.org>.  Thanks.\n"
-msgstr ""
-
-#: builtin/pack-refs.c:8
-msgid "git pack-refs [<options>]"
-msgstr ""
-
-#: builtin/pack-refs.c:16
-msgid "pack everything"
-msgstr ""
-
-#: builtin/pack-refs.c:17
-msgid "prune loose refs (default)"
-msgstr ""
-
-#: builtin/prune.c:14
-msgid "git prune [-n] [-v] [--progress] [--expire <time>] [--] [<head>...]"
-msgstr ""
-
-#: builtin/prune.c:145
-msgid "report pruned objects"
-msgstr ""
-
-#: builtin/prune.c:148
-msgid "expire objects older than <time>"
-msgstr ""
-
-#: builtin/prune.c:150
-msgid "limit traversal to objects outside promisor packfiles"
-msgstr ""
-
-#: builtin/prune.c:163
-msgid "cannot prune in a precious-objects repo"
-msgstr ""
-
-#: builtin/pull.c:67
-msgid "git pull [<options>] [<repository> [<refspec>...]]"
-msgstr ""
-
-#: builtin/pull.c:124
-msgid "control for recursive fetching of submodules"
-msgstr ""
-
-#: builtin/pull.c:128
-msgid "Options related to merging"
-msgstr ""
-
-#: builtin/pull.c:131
-msgid "incorporate changes by rebasing rather than merging"
-msgstr ""
-
-#: builtin/pull.c:159 builtin/revert.c:126
-msgid "allow fast-forward"
-msgstr ""
-
-#: builtin/pull.c:165
-msgid "control use of pre-merge-commit and commit-msg hooks"
-msgstr ""
-
-#: builtin/pull.c:171 parse-options.h:371
-msgid "automatically stash/stash pop before and after"
-msgstr ""
-
-#: builtin/pull.c:187
-msgid "Options related to fetching"
-msgstr ""
-
-#: builtin/pull.c:197
-msgid "force overwrite of local branch"
-msgstr ""
-
-#: builtin/pull.c:205
-msgid "number of submodules pulled in parallel"
-msgstr ""
-
-#: builtin/pull.c:449
-msgid ""
-"There is no candidate for rebasing against among the refs that you just "
-"fetched."
-msgstr ""
-
-#: builtin/pull.c:451
-msgid ""
-"There are no candidates for merging among the refs that you just fetched."
-msgstr ""
-
-#: 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:455
-#, c-format
-msgid ""
-"You asked to pull from the remote '%s', but did not specify\n"
-"a branch. Because this is not the default configured remote\n"
-"for your current branch, you must specify a branch on the command line."
-msgstr ""
-
-#: builtin/pull.c:460 builtin/rebase.c:978
-msgid "You are not currently on a branch."
-msgstr ""
-
-#: builtin/pull.c:462 builtin/pull.c:477
-msgid "Please specify which branch you want to rebase against."
-msgstr ""
-
-#: builtin/pull.c:464 builtin/pull.c:479
-msgid "Please specify which branch you want to merge with."
-msgstr ""
-
-#: builtin/pull.c:465 builtin/pull.c:480
-msgid "See git-pull(1) for details."
-msgstr ""
-
-#: builtin/pull.c:467 builtin/pull.c:473 builtin/pull.c:482
-#: builtin/rebase.c:984
-msgid "<remote>"
-msgstr ""
-
-#: builtin/pull.c:467 builtin/pull.c:482 builtin/pull.c:487
-#: contrib/scalar/scalar.c:374
-msgid "<branch>"
-msgstr ""
-
-#: builtin/pull.c:475 builtin/rebase.c:976
-msgid "There is no tracking information for the current branch."
-msgstr ""
-
-#: builtin/pull.c:484
-msgid ""
-"If you wish to set tracking information for this branch you can do so with:"
-msgstr ""
-
-#: 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:600
-#, c-format
-msgid "unable to access commit %s"
-msgstr ""
-
-#: builtin/pull.c:908
-msgid "ignoring --verify-signatures for rebase"
-msgstr ""
-
-#: builtin/pull.c:969
-msgid ""
-"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\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"
-"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"
-msgstr ""
-
-#: builtin/pull.c:1047
-msgid "Updating an unborn branch with changes added to the index."
-msgstr ""
-
-#: builtin/pull.c:1051
-msgid "pull with rebase"
-msgstr ""
-
-#: builtin/pull.c:1052
-msgid "please commit or stash them."
-msgstr ""
-
-#: builtin/pull.c:1077
-#, c-format
-msgid ""
-"fetch updated the current branch head.\n"
-"fast-forwarding your working tree from\n"
-"commit %s."
-msgstr ""
-
-#: builtin/pull.c:1083
-#, c-format
-msgid ""
-"Cannot fast-forward your working tree.\n"
-"After making sure that you saved anything precious from\n"
-"$ git diff %s\n"
-"output, run\n"
-"$ git reset --hard\n"
-"to recover."
-msgstr ""
-
-#: builtin/pull.c:1098
-msgid "Cannot merge multiple branches into empty head."
-msgstr ""
-
-#: builtin/pull.c:1103
-msgid "Cannot rebase onto multiple branches."
-msgstr ""
-
-#: builtin/pull.c:1105
-msgid "Cannot fast-forward to multiple branches."
-msgstr ""
-
-#: builtin/pull.c:1120
-msgid "Need to specify how to reconcile divergent branches."
-msgstr ""
-
-#: builtin/pull.c:1134
-msgid "cannot rebase with locally recorded submodule modifications"
-msgstr ""
-
-#: builtin/push.c:19
-msgid "git push [<options>] [<repository> [<refspec>...]]"
-msgstr ""
-
-#: builtin/push.c:111
-msgid "tag shorthand without <tag>"
-msgstr ""
-
-#: builtin/push.c:119
-msgid "--delete only accepts plain target ref names"
-msgstr ""
-
-#: builtin/push.c:164
-msgid ""
-"\n"
-"To choose either option permanently, see push.default in 'git help config'."
-msgstr ""
-
-#: builtin/push.c:167
-#, c-format
-msgid ""
-"The upstream branch of your current branch does not match\n"
-"the name of your current branch.  To push to the upstream branch\n"
-"on the remote, use\n"
-"\n"
-"    git push %s HEAD:%s\n"
-"\n"
-"To push to the branch of the same name on the remote, use\n"
-"\n"
-"    git push %s HEAD\n"
-"%s"
-msgstr ""
-
-#: builtin/push.c:182
-#, c-format
-msgid ""
-"You are not currently on a branch.\n"
-"To push the history leading to the current (detached HEAD)\n"
-"state now, use\n"
-"\n"
-"    git push %s HEAD:<name-of-remote-branch>\n"
-msgstr ""
-
-#: builtin/push.c:191
-#, c-format
-msgid ""
-"The current branch %s has no upstream branch.\n"
-"To push the current branch and set the remote as upstream, use\n"
-"\n"
-"    git push --set-upstream %s %s\n"
-msgstr ""
-
-#: builtin/push.c:199
-#, c-format
-msgid "The current branch %s has multiple upstream branches, refusing to push."
-msgstr ""
-
-#: builtin/push.c:217
-msgid ""
-"You didn't specify any refspecs to push, and push.default is \"nothing\"."
-msgstr ""
-
-#: builtin/push.c:243
-#, c-format
-msgid ""
-"You are pushing to remote '%s', which is not the upstream of\n"
-"your current branch '%s', without telling me what to push\n"
-"to update which remote branch."
-msgstr ""
-
-#: 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"
-"'git pull ...') before pushing again.\n"
-"See the 'Note about fast-forwards' in 'git push --help' for details."
-msgstr ""
-
-#: 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"
-"(e.g. 'git pull ...') before pushing again.\n"
-"See the 'Note about fast-forwards' in 'git push --help' for details."
-msgstr ""
-
-#: 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"
-"to the same ref. You may want to first integrate the remote changes\n"
-"(e.g., 'git pull ...') before pushing again.\n"
-"See the 'Note about fast-forwards' in 'git push --help' for details."
-msgstr ""
-
-#: builtin/push.c:277
-msgid "Updates were rejected because the tag already exists in the remote."
-msgstr ""
-
-#: 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"
-"without using the '--force' option.\n"
-msgstr ""
-
-#: 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"
-"to integrate those changes locally (e.g., 'git pull ...')\n"
-"before forcing an update.\n"
-msgstr ""
-
-#: builtin/push.c:355
-#, c-format
-msgid "Pushing to %s\n"
-msgstr ""
-
-#: builtin/push.c:362
-#, c-format
-msgid "failed to push some refs to '%s'"
-msgstr ""
-
-#: builtin/push.c:544 builtin/submodule--helper.c:3377
-msgid "repository"
-msgstr ""
-
-#: builtin/push.c:545 builtin/send-pack.c:193
-msgid "push all refs"
-msgstr ""
-
-#: builtin/push.c:546 builtin/send-pack.c:195
-msgid "mirror all refs"
-msgstr ""
-
-#: builtin/push.c:548
-msgid "delete refs"
-msgstr ""
-
-#: builtin/push.c:549
-msgid "push tags (can't be used with --all or --mirror)"
-msgstr ""
-
-#: builtin/push.c:552 builtin/send-pack.c:196
-msgid "force updates"
-msgstr ""
-
-#: builtin/push.c:553 builtin/send-pack.c:208
-msgid "<refname>:<expect>"
-msgstr ""
-
-#: 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:212
-msgid "require remote updates to be integrated locally"
-msgstr ""
-
-#: builtin/push.c:560
-msgid "control recursive pushing of submodules"
-msgstr ""
-
-#: 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:190
-#: builtin/send-pack.c:191
-msgid "receive pack program"
-msgstr ""
-
-#: builtin/push.c:564
-msgid "set upstream for git pull/status"
-msgstr ""
-
-#: builtin/push.c:567
-msgid "prune locally removed refs"
-msgstr ""
-
-#: builtin/push.c:569
-msgid "bypass pre-push hook"
-msgstr ""
-
-#: builtin/push.c:570
-msgid "push missing but relevant tags"
-msgstr ""
-
-#: builtin/push.c:572 builtin/send-pack.c:197
-msgid "GPG sign the push"
-msgstr ""
-
-#: builtin/push.c:574 builtin/send-pack.c:204
-msgid "request atomic transaction on remote side"
-msgstr ""
-
-#: builtin/push.c:594
-msgid "--delete doesn't make sense without any refs"
-msgstr ""
-
-#: builtin/push.c:614
-#, c-format
-msgid "bad repository '%s'"
-msgstr ""
-
-#: 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"
-"\n"
-"    git remote add <name> <url>\n"
-"\n"
-"and then push using the remote name\n"
-"\n"
-"    git push <name>\n"
-msgstr ""
-
-#: builtin/push.c:632
-msgid "--all can't be combined with refspecs"
-msgstr ""
-
-#: builtin/push.c:638
-msgid "--mirror can't be combined with refspecs"
-msgstr ""
-
-#: builtin/push.c:648
-msgid "push options must not have new line characters"
-msgstr ""
-
-#: builtin/range-diff.c:9
-msgid "git range-diff [<options>] <old-base>..<old-tip> <new-base>..<new-tip>"
-msgstr ""
-
-#: builtin/range-diff.c:10
-msgid "git range-diff [<options>] <old-tip>...<new-tip>"
-msgstr ""
-
-#: builtin/range-diff.c:11
-msgid "git range-diff [<options>] <base> <old-tip> <new-tip>"
-msgstr ""
-
-#: builtin/range-diff.c:30
-msgid "use simple diff colors"
-msgstr ""
-
-#: builtin/range-diff.c:32
-msgid "notes"
-msgstr ""
-
-#: builtin/range-diff.c:32
-msgid "passed to 'git log'"
-msgstr ""
-
-#: builtin/range-diff.c:35
-msgid "only emit output related to the first range"
-msgstr ""
-
-#: builtin/range-diff.c:37
-msgid "only emit output related to the second range"
-msgstr ""
-
-#: builtin/range-diff.c:60 builtin/range-diff.c:64
-#, c-format
-msgid "not a commit range: '%s'"
-msgstr ""
-
-#: builtin/range-diff.c:74
-msgid "single arg format must be symmetric range"
-msgstr ""
-
-#: builtin/range-diff.c:89
-msgid "need two commit ranges"
-msgstr ""
-
-#: builtin/read-tree.c:41
-msgid ""
-"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 ""
-
-#: builtin/read-tree.c:116
-msgid "write resulting index to <file>"
-msgstr ""
-
-#: builtin/read-tree.c:119
-msgid "only empty the index"
-msgstr ""
-
-#: builtin/read-tree.c:121
-msgid "Merging"
-msgstr ""
-
-#: builtin/read-tree.c:123
-msgid "perform a merge in addition to a read"
-msgstr ""
-
-#: builtin/read-tree.c:125
-msgid "3-way merge if no file level merging required"
-msgstr ""
-
-#: builtin/read-tree.c:127
-msgid "3-way merge in presence of adds and removes"
-msgstr ""
-
-#: builtin/read-tree.c:129
-msgid "same as -m, but discard unmerged entries"
-msgstr ""
-
-#: builtin/read-tree.c:130
-msgid "<subdirectory>/"
-msgstr ""
-
-#: builtin/read-tree.c:131
-msgid "read the tree into the index under <subdirectory>/"
-msgstr ""
-
-#: builtin/read-tree.c:134
-msgid "update working tree with merge result"
-msgstr ""
-
-#: builtin/read-tree.c:136
-msgid "gitignore"
-msgstr ""
-
-#: builtin/read-tree.c:137
-msgid "allow explicitly ignored files to be overwritten"
-msgstr ""
-
-#: builtin/read-tree.c:140
-msgid "don't check the working tree after merging"
-msgstr ""
-
-#: builtin/read-tree.c:141
-msgid "don't update the index or the work tree"
-msgstr ""
-
-#: builtin/read-tree.c:143
-msgid "skip applying sparse checkout filter"
-msgstr ""
-
-#: builtin/read-tree.c:145
-msgid "debug unpack-trees"
-msgstr ""
-
-#: builtin/read-tree.c:149
-msgid "suppress feedback messages"
-msgstr ""
-
-#: builtin/read-tree.c:190
-msgid "You need to resolve your current index first"
-msgstr ""
-
-#: builtin/rebase.c:36
-msgid ""
-"git rebase [-i] [options] [--exec <cmd>] [--onto <newbase> | --keep-base] "
-"[<upstream> [<branch>]]"
-msgstr ""
-
-#: builtin/rebase.c:38
-msgid ""
-"git rebase [-i] [options] [--exec <cmd>] [--onto <newbase>] --root [<branch>]"
-msgstr ""
-
-#: builtin/rebase.c:231
-#, c-format
-msgid "could not create temporary %s"
-msgstr ""
-
-#: builtin/rebase.c:237
-msgid "could not mark as interactive"
-msgstr ""
-
-#: builtin/rebase.c:290
-msgid "could not generate todo list"
-msgstr ""
-
-#: builtin/rebase.c:332
-msgid "a base commit must be provided with --upstream or --onto"
-msgstr ""
-
-#: builtin/rebase.c:391
-#, c-format
-msgid "%s requires the merge backend"
-msgstr ""
-
-#: builtin/rebase.c:433
-#, c-format
-msgid "could not get 'onto': '%s'"
-msgstr ""
-
-#: builtin/rebase.c:450
-#, c-format
-msgid "invalid orig-head: '%s'"
-msgstr ""
-
-#: builtin/rebase.c:475
-#, c-format
-msgid "ignoring invalid allow_rerere_autoupdate: '%s'"
-msgstr ""
-
-#: builtin/rebase.c:600
-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\"."
-msgstr ""
-
-#: builtin/rebase.c:685
-#, c-format
-msgid ""
-"\n"
-"git encountered an error while preparing the patches to replay\n"
-"these revisions:\n"
-"\n"
-"    %s\n"
-"\n"
-"As a result, git cannot rebase them."
-msgstr ""
-
-#: builtin/rebase.c:836
-#, c-format
-msgid "could not switch to %s"
-msgstr ""
-
-#: builtin/rebase.c:952
-#, c-format
-msgid ""
-"unrecognized empty type '%s'; valid values are \"drop\", \"keep\", and \"ask"
-"\"."
-msgstr ""
-
-#: builtin/rebase.c:970
-#, c-format
-msgid ""
-"%s\n"
-"Please specify which branch you want to rebase against.\n"
-"See git-rebase(1) for details.\n"
-"\n"
-"    git rebase '<branch>'\n"
-"\n"
-msgstr ""
-
-#: builtin/rebase.c:986
-#, c-format
-msgid ""
-"If you wish to set tracking information for this branch you can do so with:\n"
-"\n"
-"    git branch --set-upstream-to=%s/<branch> %s\n"
-"\n"
-msgstr ""
-
-#: builtin/rebase.c:1016
-msgid "exec commands cannot contain newlines"
-msgstr ""
-
-#: builtin/rebase.c:1020
-msgid "empty exec command"
-msgstr ""
-
-#: builtin/rebase.c:1051
-msgid "rebase onto given branch instead of upstream"
-msgstr ""
-
-#: builtin/rebase.c:1053
-msgid "use the merge-base of upstream and branch as the current base"
-msgstr ""
-
-#: builtin/rebase.c:1055
-msgid "allow pre-rebase hook to run"
-msgstr ""
-
-#: builtin/rebase.c:1057
-msgid "be quiet. implies --no-stat"
-msgstr ""
-
-#: builtin/rebase.c:1060
-msgid "display a diffstat of what changed upstream"
-msgstr ""
-
-#: builtin/rebase.c:1063
-msgid "do not show diffstat of what changed upstream"
-msgstr ""
-
-#: builtin/rebase.c:1066
-msgid "add a Signed-off-by trailer to each commit"
-msgstr ""
-
-#: builtin/rebase.c:1069
-msgid "make committer date match author date"
-msgstr ""
-
-#: builtin/rebase.c:1071
-msgid "ignore author date and use current date"
-msgstr ""
-
-#: builtin/rebase.c:1073
-msgid "synonym of --reset-author-date"
-msgstr ""
-
-#: builtin/rebase.c:1075 builtin/rebase.c:1079
-msgid "passed to 'git apply'"
-msgstr ""
-
-#: builtin/rebase.c:1077
-msgid "ignore changes in whitespace"
-msgstr ""
-
-#: builtin/rebase.c:1081 builtin/rebase.c:1084
-msgid "cherry-pick all commits, even if unchanged"
-msgstr ""
-
-#: builtin/rebase.c:1086
-msgid "continue"
-msgstr ""
-
-#: builtin/rebase.c:1089
-msgid "skip current patch and continue"
-msgstr ""
-
-#: builtin/rebase.c:1091
-msgid "abort and check out the original branch"
-msgstr ""
-
-#: builtin/rebase.c:1094
-msgid "abort but keep HEAD where it is"
-msgstr ""
-
-#: builtin/rebase.c:1095
-msgid "edit the todo list during an interactive rebase"
-msgstr ""
-
-#: builtin/rebase.c:1098
-msgid "show the patch file being applied or merged"
-msgstr ""
-
-#: builtin/rebase.c:1101
-msgid "use apply strategies to rebase"
-msgstr ""
-
-#: builtin/rebase.c:1105
-msgid "use merging strategies to rebase"
-msgstr ""
-
-#: builtin/rebase.c:1109
-msgid "let the user edit the list of commits to rebase"
-msgstr ""
-
-#: builtin/rebase.c:1113
-msgid "(DEPRECATED) try to recreate merges instead of ignoring them"
-msgstr ""
-
-#: builtin/rebase.c:1118
-msgid "how to handle commits that become empty"
-msgstr ""
-
-#: builtin/rebase.c:1121
-msgid "keep commits which start empty"
-msgstr ""
-
-#: builtin/rebase.c:1125
-msgid "move commits that begin with squash!/fixup! under -i"
-msgstr ""
-
-#: builtin/rebase.c:1132
-msgid "add exec lines after each commit of the editable list"
-msgstr ""
-
-#: builtin/rebase.c:1136
-msgid "allow rebasing commits with empty messages"
-msgstr ""
-
-#: builtin/rebase.c:1140
-msgid "try to rebase merges instead of skipping them"
-msgstr ""
-
-#: builtin/rebase.c:1143
-msgid "use 'merge-base --fork-point' to refine upstream"
-msgstr ""
-
-#: builtin/rebase.c:1145
-msgid "use the given merge strategy"
-msgstr ""
-
-#: builtin/rebase.c:1147 builtin/revert.c:115
-msgid "option"
-msgstr ""
-
-#: builtin/rebase.c:1148
-msgid "pass the argument through to the merge strategy"
-msgstr ""
-
-#: builtin/rebase.c:1151
-msgid "rebase all reachable commits up to the root(s)"
-msgstr ""
-
-#: builtin/rebase.c:1154
-msgid "automatically re-schedule any `exec` that fails"
-msgstr ""
-
-#: builtin/rebase.c:1156
-msgid "apply all changes, even those already present upstream"
-msgstr ""
-
-#: builtin/rebase.c:1177
-msgid "It looks like 'git am' is in progress. Cannot rebase."
-msgstr ""
-
-#: builtin/rebase.c:1208
-msgid "--preserve-merges was replaced by --rebase-merges"
-msgstr ""
-
-#: builtin/rebase.c:1230
-msgid "No rebase in progress?"
-msgstr ""
-
-#: builtin/rebase.c:1234
-msgid "The --edit-todo action can only be used during interactive rebase."
-msgstr ""
-
-#: builtin/rebase.c:1257 t/helper/test-fast-rebase.c:122
-msgid "Cannot read HEAD"
-msgstr ""
-
-#: builtin/rebase.c:1269
-msgid ""
-"You must edit all merge conflicts and then\n"
-"mark them as resolved using git add"
-msgstr ""
-
-#: builtin/rebase.c:1287
-msgid "could not discard worktree changes"
-msgstr ""
-
-#: builtin/rebase.c:1308
-#, c-format
-msgid "could not move back to %s"
-msgstr ""
-
-#: builtin/rebase.c:1354
-#, 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"
-"case, please try\n"
-"\t%s\n"
-"If that is not the case, please\n"
-"\t%s\n"
-"and run me again.  I am stopping in case you still have something\n"
-"valuable there.\n"
-msgstr ""
-
-#: builtin/rebase.c:1382
-msgid "switch `C' expects a numerical value"
-msgstr ""
-
-#: builtin/rebase.c:1424
-#, c-format
-msgid "Unknown mode: %s"
-msgstr ""
-
-#: builtin/rebase.c:1463
-msgid "--strategy requires --merge or --interactive"
-msgstr ""
-
-#: builtin/rebase.c:1492
-msgid "apply options and merge options cannot be used together"
-msgstr ""
-
-#: builtin/rebase.c:1505
-#, c-format
-msgid "Unknown rebase backend: %s"
-msgstr ""
-
-#: builtin/rebase.c:1534
-msgid "--reschedule-failed-exec requires --exec or --interactive"
-msgstr ""
-
-#: builtin/rebase.c:1565
-#, c-format
-msgid "invalid upstream '%s'"
-msgstr ""
-
-#: builtin/rebase.c:1571
-msgid "Could not create new root commit"
-msgstr ""
-
-#: builtin/rebase.c:1597
-#, c-format
-msgid "'%s': need exactly one merge base with branch"
-msgstr ""
-
-#: builtin/rebase.c:1600
-#, c-format
-msgid "'%s': need exactly one merge base"
-msgstr ""
-
-#: builtin/rebase.c:1609
-#, c-format
-msgid "Does not point to a valid commit '%s'"
-msgstr ""
-
-#: builtin/rebase.c:1636
-#, c-format
-msgid "no such branch/commit '%s'"
-msgstr ""
-
-#: builtin/rebase.c:1647 builtin/submodule--helper.c:43
-#: builtin/submodule--helper.c:2477
-#, c-format
-msgid "No such ref: %s"
-msgstr ""
-
-#: builtin/rebase.c:1658
-msgid "Could not resolve HEAD to a revision"
-msgstr ""
-
-#: builtin/rebase.c:1679
-msgid "Please commit or stash them."
-msgstr ""
-
-#: builtin/rebase.c:1714
-msgid "HEAD is up to date."
-msgstr ""
-
-#: builtin/rebase.c:1716
-#, c-format
-msgid "Current branch %s is up to date.\n"
-msgstr ""
-
-#: builtin/rebase.c:1724
-msgid "HEAD is up to date, rebase forced."
-msgstr ""
-
-#: builtin/rebase.c:1726
-#, c-format
-msgid "Current branch %s is up to date, rebase forced.\n"
-msgstr ""
-
-#: builtin/rebase.c:1734
-msgid "The pre-rebase hook refused to rebase."
-msgstr ""
-
-#: builtin/rebase.c:1741
-#, c-format
-msgid "Changes to %s:\n"
-msgstr ""
-
-#: builtin/rebase.c:1744
-#, c-format
-msgid "Changes from %s to %s:\n"
-msgstr ""
-
-#: builtin/rebase.c:1769
-#, c-format
-msgid "First, rewinding head to replay your work on top of it...\n"
-msgstr ""
-
-#: builtin/rebase.c:1781
-msgid "Could not detach HEAD"
-msgstr ""
-
-#: builtin/rebase.c:1790
-#, c-format
-msgid "Fast-forwarded %s to %s.\n"
-msgstr ""
-
-#: builtin/receive-pack.c:35
-msgid "git receive-pack <git-dir>"
-msgstr ""
-
-#: builtin/receive-pack.c:1263
-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"
-"with what you pushed, and will require 'git reset --hard' to match\n"
-"the work tree to HEAD.\n"
-"\n"
-"You can set the 'receive.denyCurrentBranch' configuration variable\n"
-"to 'ignore' or 'warn' in the remote repository to allow pushing into\n"
-"its current branch; however, this is not recommended unless you\n"
-"arranged to update its work tree to match what you pushed in some\n"
-"other way.\n"
-"\n"
-"To squelch this message and still keep the default behaviour, set\n"
-"'receive.denyCurrentBranch' configuration variable to 'refuse'."
-msgstr ""
-
-#: builtin/receive-pack.c:1283
-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"
-"\n"
-"You can set 'receive.denyDeleteCurrent' configuration variable to\n"
-"'warn' or 'ignore' in the remote repository to allow deleting the\n"
-"current branch, with or without a warning message.\n"
-"\n"
-"To squelch this message, you can set it to 'refuse'."
-msgstr ""
-
-#: builtin/receive-pack.c:2476
-msgid "quiet"
-msgstr ""
-
-#: builtin/receive-pack.c:2491
-msgid "you must specify a directory"
-msgstr ""
-
-#: builtin/reflog.c:9
-msgid "git reflog [show] [<log-options>] [<ref>]"
-msgstr ""
-
-#: builtin/reflog.c:12
-msgid ""
-"git reflog expire [--expire=<time>] [--expire-unreachable=<time>]\n"
-"                  [--rewrite] [--updateref] [--stale-fix]\n"
-"                  [--dry-run | -n] [--verbose] [--all [--single-worktree] | "
-"<refs>...]"
-msgstr ""
-
-#: builtin/reflog.c:17
-msgid ""
-"git reflog delete [--rewrite] [--updateref]\n"
-"                  [--dry-run | -n] [--verbose] <ref>@{<specifier>}..."
-msgstr ""
-
-#: builtin/reflog.c:21
-msgid "git reflog exists <ref>"
-msgstr ""
-
-#: builtin/reflog.c:197 builtin/reflog.c:211
-#, c-format
-msgid "invalid timestamp '%s' given to '--%s'"
-msgstr ""
-
-#: builtin/reflog.c:240 builtin/reflog.c:359
-msgid "do not actually prune any entries"
-msgstr ""
-
-#: builtin/reflog.c:243 builtin/reflog.c:362
-msgid ""
-"rewrite the old SHA1 with the new SHA1 of the entry that now precedes it"
-msgstr ""
-
-#: builtin/reflog.c:246 builtin/reflog.c:365
-msgid "update the reference to the value of the top reflog entry"
-msgstr ""
-
-#: builtin/reflog.c:248 builtin/reflog.c:367
-msgid "print extra information on screen"
-msgstr ""
-
-#: builtin/reflog.c:249 builtin/reflog.c:253
-msgid "timestamp"
-msgstr ""
-
-#: builtin/reflog.c:250
-msgid "prune entries older than the specified time"
-msgstr ""
-
-#: builtin/reflog.c:254
-msgid ""
-"prune entries older than <time> that are not reachable from the current tip "
-"of the branch"
-msgstr ""
-
-#: builtin/reflog.c:258
-msgid "prune any reflog entries that point to broken commits"
-msgstr ""
-
-#: builtin/reflog.c:259
-msgid "process the reflogs of all references"
-msgstr ""
-
-#: builtin/reflog.c:261
-msgid "limits processing to reflogs from the current worktree only"
-msgstr ""
-
-#: builtin/reflog.c:294
-#, c-format
-msgid "Marking reachable objects..."
-msgstr ""
-
-#: builtin/reflog.c:338
-#, c-format
-msgid "%s points nowhere!"
-msgstr ""
-
-#: builtin/reflog.c:374
-msgid "no reflog specified to delete"
-msgstr ""
-
-#: builtin/reflog.c:396
-#, c-format
-msgid "invalid ref format: %s"
-msgstr ""
-
-#: builtin/remote.c:19
-msgid ""
-"git remote add [-t <branch>] [-m <master>] [-f] [--tags | --no-tags] [--"
-"mirror=<fetch|push>] <name> <url>"
-msgstr ""
-
-#: builtin/remote.c:20 builtin/remote.c:40
-msgid "git remote rename [--[no-]progress] <old> <new>"
-msgstr ""
-
-#: builtin/remote.c:21 builtin/remote.c:45
-msgid "git remote remove <name>"
-msgstr ""
-
-#: builtin/remote.c:22 builtin/remote.c:50
-msgid "git remote set-head <name> (-a | --auto | -d | --delete | <branch>)"
-msgstr ""
-
-#: builtin/remote.c:23
-msgid "git remote [-v | --verbose] show [-n] <name>"
-msgstr ""
-
-#: builtin/remote.c:24
-msgid "git remote prune [-n | --dry-run] <name>"
-msgstr ""
-
-#: builtin/remote.c:25
-msgid ""
-"git remote [-v | --verbose] update [-p | --prune] [(<group> | <remote>)...]"
-msgstr ""
-
-#: builtin/remote.c:26
-msgid "git remote set-branches [--add] <name> <branch>..."
-msgstr ""
-
-#: builtin/remote.c:27 builtin/remote.c:76
-msgid "git remote get-url [--push] [--all] <name>"
-msgstr ""
-
-#: builtin/remote.c:28 builtin/remote.c:81
-msgid "git remote set-url [--push] <name> <newurl> [<oldurl>]"
-msgstr ""
-
-#: builtin/remote.c:29 builtin/remote.c:82
-msgid "git remote set-url --add <name> <newurl>"
-msgstr ""
-
-#: builtin/remote.c:30 builtin/remote.c:83
-msgid "git remote set-url --delete <name> <url>"
-msgstr ""
-
-#: builtin/remote.c:35
-msgid "git remote add [<options>] <name> <url>"
-msgstr ""
-
-#: builtin/remote.c:55
-msgid "git remote set-branches <name> <branch>..."
-msgstr ""
-
-#: builtin/remote.c:56
-msgid "git remote set-branches --add <name> <branch>..."
-msgstr ""
-
-#: builtin/remote.c:61
-msgid "git remote show [<options>] <name>"
-msgstr ""
-
-#: builtin/remote.c:66
-msgid "git remote prune [<options>] <name>"
-msgstr ""
-
-#: builtin/remote.c:71
-msgid "git remote update [<options>] [<group> | <remote>]..."
-msgstr ""
-
-#: builtin/remote.c:100
-#, c-format
-msgid "Updating %s"
-msgstr ""
-
-#: builtin/remote.c:102
-#, c-format
-msgid "Could not fetch %s"
-msgstr ""
-
-#: builtin/remote.c:132
-msgid ""
-"--mirror is dangerous and deprecated; please\n"
-"\t use --mirror=fetch or --mirror=push instead"
-msgstr ""
-
-#: builtin/remote.c:149
-#, c-format
-msgid "unknown mirror argument: %s"
-msgstr ""
-
-#: builtin/remote.c:165
-msgid "fetch the remote branches"
-msgstr ""
-
-#: builtin/remote.c:167
-msgid "import all tags and associated objects when fetching"
-msgstr ""
-
-#: builtin/remote.c:170
-msgid "or do not fetch any tag at all (--no-tags)"
-msgstr ""
-
-#: builtin/remote.c:172
-msgid "branch(es) to track"
-msgstr ""
-
-#: builtin/remote.c:173
-msgid "master branch"
-msgstr ""
-
-#: builtin/remote.c:175
-msgid "set up remote as a mirror to push to or fetch from"
-msgstr ""
-
-#: builtin/remote.c:187
-msgid "specifying a master branch makes no sense with --mirror"
-msgstr ""
-
-#: builtin/remote.c:189
-msgid "specifying branches to track makes sense only with fetch mirrors"
-msgstr ""
-
-#: builtin/remote.c:196 builtin/remote.c:716
-#, c-format
-msgid "remote %s already exists."
-msgstr ""
-
-#: builtin/remote.c:241
-#, c-format
-msgid "Could not setup master '%s'"
-msgstr ""
-
-#: builtin/remote.c:323
-#, c-format
-msgid "unhandled branch.%s.rebase=%s; assuming 'true'"
-msgstr ""
-
-#: builtin/remote.c:367
-#, c-format
-msgid "Could not get fetch map for refspec %s"
-msgstr ""
-
-#: builtin/remote.c:461 builtin/remote.c:469
-msgid "(matching)"
-msgstr ""
-
-#: builtin/remote.c:473
-msgid "(delete)"
-msgstr ""
-
-#: builtin/remote.c:664
-#, c-format
-msgid "could not set '%s'"
-msgstr ""
-
-#: builtin/remote.c:669
-#, c-format
-msgid ""
-"The %s configuration remote.pushDefault in:\n"
-"\t%s:%d\n"
-"now names the non-existent remote '%s'"
-msgstr ""
-
-#: builtin/remote.c:707 builtin/remote.c:866 builtin/remote.c:973
-#, c-format
-msgid "No such remote: '%s'"
-msgstr ""
-
-#: builtin/remote.c:726
-#, c-format
-msgid "Could not rename config section '%s' to '%s'"
-msgstr ""
-
-#: builtin/remote.c:746
-#, c-format
-msgid ""
-"Not updating non-default fetch refspec\n"
-"\t%s\n"
-"\tPlease update the configuration manually if necessary."
-msgstr ""
-
-#: builtin/remote.c:783
-msgid "Renaming remote references"
-msgstr ""
-
-#: builtin/remote.c:794
-#, c-format
-msgid "deleting '%s' failed"
-msgstr ""
-
-#: builtin/remote.c:832
-#, c-format
-msgid "creating '%s' failed"
-msgstr ""
-
-#: builtin/remote.c:912
-msgid ""
-"Note: A branch outside the refs/remotes/ hierarchy was not removed;\n"
-"to delete it, use:"
-msgid_plural ""
-"Note: Some branches outside the refs/remotes/ hierarchy were not removed;\n"
-"to delete them, use:"
-msgstr[0] ""
-msgstr[1] ""
-
-#: builtin/remote.c:926
-#, c-format
-msgid "Could not remove config section '%s'"
-msgstr ""
-
-#: builtin/remote.c:1034
-#, c-format
-msgid " new (next fetch will store in remotes/%s)"
-msgstr ""
-
-#: builtin/remote.c:1037
-msgid " tracked"
-msgstr ""
-
-#: builtin/remote.c:1039
-msgid " stale (use 'git remote prune' to remove)"
-msgstr ""
-
-#: builtin/remote.c:1041
-msgid " ???"
-msgstr ""
-
-#: builtin/remote.c:1082
-#, c-format
-msgid "invalid branch.%s.merge; cannot rebase onto > 1 branch"
-msgstr ""
-
-#: builtin/remote.c:1091
-#, c-format
-msgid "rebases interactively onto remote %s"
-msgstr ""
-
-#: builtin/remote.c:1093
-#, c-format
-msgid "rebases interactively (with merges) onto remote %s"
-msgstr ""
-
-#: builtin/remote.c:1096
-#, c-format
-msgid "rebases onto remote %s"
-msgstr ""
-
-#: builtin/remote.c:1100
-#, c-format
-msgid " merges with remote %s"
-msgstr ""
-
-#: builtin/remote.c:1103
-#, c-format
-msgid "merges with remote %s"
-msgstr ""
-
-#: builtin/remote.c:1106
-#, c-format
-msgid "%-*s    and with remote %s\n"
-msgstr ""
-
-#: builtin/remote.c:1149
-msgid "create"
-msgstr ""
-
-#: builtin/remote.c:1152
-msgid "delete"
-msgstr ""
-
-#: builtin/remote.c:1156
-msgid "up to date"
-msgstr ""
-
-#: builtin/remote.c:1159
-msgid "fast-forwardable"
-msgstr ""
-
-#: builtin/remote.c:1162
-msgid "local out of date"
-msgstr ""
-
-#: builtin/remote.c:1169
-#, c-format
-msgid "    %-*s forces to %-*s (%s)"
-msgstr ""
-
-#: builtin/remote.c:1172
-#, c-format
-msgid "    %-*s pushes to %-*s (%s)"
-msgstr ""
-
-#: builtin/remote.c:1176
-#, c-format
-msgid "    %-*s forces to %s"
-msgstr ""
-
-#: builtin/remote.c:1179
-#, c-format
-msgid "    %-*s pushes to %s"
-msgstr ""
-
-#: builtin/remote.c:1247
-msgid "do not query remotes"
-msgstr ""
-
-#: builtin/remote.c:1268
-#, c-format
-msgid "* remote %s"
-msgstr ""
-
-#: builtin/remote.c:1269
-#, c-format
-msgid "  Fetch URL: %s"
-msgstr ""
-
-#: builtin/remote.c:1270 builtin/remote.c:1286 builtin/remote.c:1423
-msgid "(no URL)"
-msgstr ""
-
-#. TRANSLATORS: the colon ':' should align
-#. with the one in " Fetch URL: %s"
-#. translation.
-#.
-#: builtin/remote.c:1284 builtin/remote.c:1286
-#, c-format
-msgid "  Push  URL: %s"
-msgstr ""
-
-#: builtin/remote.c:1288 builtin/remote.c:1290 builtin/remote.c:1292
-#, c-format
-msgid "  HEAD branch: %s"
-msgstr ""
-
-#: builtin/remote.c:1288
-msgid "(not queried)"
-msgstr ""
-
-#: builtin/remote.c:1290
-msgid "(unknown)"
-msgstr ""
-
-#: builtin/remote.c:1294
-#, c-format
-msgid ""
-"  HEAD branch (remote HEAD is ambiguous, may be one of the following):\n"
-msgstr ""
-
-#: builtin/remote.c:1306
-#, c-format
-msgid "  Remote branch:%s"
-msgid_plural "  Remote branches:%s"
-msgstr[0] ""
-msgstr[1] ""
-
-#: builtin/remote.c:1309 builtin/remote.c:1335
-msgid " (status not queried)"
-msgstr ""
-
-#: builtin/remote.c:1318
-msgid "  Local branch configured for 'git pull':"
-msgid_plural "  Local branches configured for 'git pull':"
-msgstr[0] ""
-msgstr[1] ""
-
-#: builtin/remote.c:1326
-msgid "  Local refs will be mirrored by 'git push'"
-msgstr ""
-
-#: builtin/remote.c:1332
-#, 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:1353
-msgid "set refs/remotes/<name>/HEAD according to remote"
-msgstr ""
-
-#: builtin/remote.c:1355
-msgid "delete refs/remotes/<name>/HEAD"
-msgstr ""
-
-#: builtin/remote.c:1369
-msgid "Cannot determine remote HEAD"
-msgstr ""
-
-#: builtin/remote.c:1371
-msgid "Multiple remote HEAD branches. Please choose one explicitly with:"
-msgstr ""
-
-#: builtin/remote.c:1381
-#, c-format
-msgid "Could not delete %s"
-msgstr ""
-
-#: builtin/remote.c:1389
-#, c-format
-msgid "Not a valid ref: %s"
-msgstr ""
-
-#: builtin/remote.c:1391
-#, c-format
-msgid "Could not setup %s"
-msgstr ""
-
-#: builtin/remote.c:1409
-#, c-format
-msgid " %s will become dangling!"
-msgstr ""
-
-#: builtin/remote.c:1410
-#, c-format
-msgid " %s has become dangling!"
-msgstr ""
-
-#: builtin/remote.c:1419
-#, c-format
-msgid "Pruning %s"
-msgstr ""
-
-#: builtin/remote.c:1420
-#, c-format
-msgid "URL: %s"
-msgstr ""
-
-#: builtin/remote.c:1436
-#, c-format
-msgid " * [would prune] %s"
-msgstr ""
-
-#: builtin/remote.c:1439
-#, c-format
-msgid " * [pruned] %s"
-msgstr ""
-
-#: builtin/remote.c:1484
-msgid "prune remotes after fetching"
-msgstr ""
-
-#: builtin/remote.c:1548 builtin/remote.c:1604 builtin/remote.c:1674
-#, c-format
-msgid "No such remote '%s'"
-msgstr ""
-
-#: builtin/remote.c:1566
-msgid "add branch"
-msgstr ""
-
-#: builtin/remote.c:1573
-msgid "no remote specified"
-msgstr ""
-
-#: builtin/remote.c:1590
-msgid "query push URLs rather than fetch URLs"
-msgstr ""
-
-#: builtin/remote.c:1592
-msgid "return all URLs"
-msgstr ""
-
-#: builtin/remote.c:1622
-#, c-format
-msgid "no URLs configured for remote '%s'"
-msgstr ""
-
-#: builtin/remote.c:1648
-msgid "manipulate push URLs"
-msgstr ""
-
-#: builtin/remote.c:1650
-msgid "add URL"
-msgstr ""
-
-#: builtin/remote.c:1652
-msgid "delete URLs"
-msgstr ""
-
-#: builtin/remote.c:1659
-msgid "--add --delete doesn't make sense"
-msgstr ""
-
-#: builtin/remote.c:1700
-#, c-format
-msgid "Invalid old URL pattern: %s"
-msgstr ""
-
-#: builtin/remote.c:1708
-#, c-format
-msgid "No such URL found: %s"
-msgstr ""
-
-#: builtin/remote.c:1710
-msgid "Will not delete all non-push URLs"
-msgstr ""
-
-#: builtin/remote.c:1727
-msgid "be verbose; must be placed before a subcommand"
-msgstr ""
-
-#: builtin/repack.c:29
-msgid "git repack [<options>]"
-msgstr ""
-
-#: builtin/repack.c:34
-msgid ""
-"Incremental repacks are incompatible with bitmap indexes.  Use\n"
-"--no-write-bitmap-index or disable the pack.writebitmaps configuration."
-msgstr ""
-
-#: builtin/repack.c:206
-msgid "could not start pack-objects to repack promisor objects"
-msgstr ""
-
-#: builtin/repack.c:280 builtin/repack.c:824
-msgid "repack: Expecting full hex object ID lines only from pack-objects."
-msgstr ""
-
-#: builtin/repack.c:304
-msgid "could not finish pack-objects to repack promisor objects"
-msgstr ""
-
-#: builtin/repack.c:319
-#, c-format
-msgid "cannot open index for %s"
-msgstr ""
-
-#: builtin/repack.c:378
-#, c-format
-msgid "pack %s too large to consider in geometric progression"
-msgstr ""
-
-#: builtin/repack.c:411 builtin/repack.c:418 builtin/repack.c:423
-#, c-format
-msgid "pack %s too large to roll up"
-msgstr ""
-
-#: builtin/repack.c:503
-#, c-format
-msgid "could not open tempfile %s for writing"
-msgstr ""
-
-#: builtin/repack.c:521
-msgid "could not close refs snapshot tempfile"
-msgstr ""
-
-#: builtin/repack.c:634
-msgid "pack everything in a single pack"
-msgstr ""
-
-#: builtin/repack.c:636
-msgid "same as -a, and turn unreachable objects loose"
-msgstr ""
-
-#: builtin/repack.c:639
-msgid "remove redundant packs, and run git-prune-packed"
-msgstr ""
-
-#: builtin/repack.c:641
-msgid "pass --no-reuse-delta to git-pack-objects"
-msgstr ""
-
-#: builtin/repack.c:643
-msgid "pass --no-reuse-object to git-pack-objects"
-msgstr ""
-
-#: builtin/repack.c:645
-msgid "do not run git-update-server-info"
-msgstr ""
-
-#: builtin/repack.c:648
-msgid "pass --local to git-pack-objects"
-msgstr ""
-
-#: builtin/repack.c:650
-msgid "write bitmap index"
-msgstr ""
-
-#: builtin/repack.c:652
-msgid "pass --delta-islands to git-pack-objects"
-msgstr ""
-
-#: builtin/repack.c:653
-msgid "approxidate"
-msgstr ""
-
-#: builtin/repack.c:654
-msgid "with -A, do not loosen objects older than this"
-msgstr ""
-
-#: builtin/repack.c:656
-msgid "with -a, repack unreachable objects"
-msgstr ""
-
-#: builtin/repack.c:658
-msgid "size of the window used for delta compression"
-msgstr ""
-
-#: builtin/repack.c:659 builtin/repack.c:665
-msgid "bytes"
-msgstr ""
-
-#: builtin/repack.c:660
-msgid "same as the above, but limit memory size instead of entries count"
-msgstr ""
-
-#: builtin/repack.c:662
-msgid "limits the maximum delta depth"
-msgstr ""
-
-#: builtin/repack.c:664
-msgid "limits the maximum number of threads"
-msgstr ""
-
-#: builtin/repack.c:666
-msgid "maximum size of each packfile"
-msgstr ""
-
-#: builtin/repack.c:668
-msgid "repack objects in packs marked with .keep"
-msgstr ""
-
-#: builtin/repack.c:670
-msgid "do not repack this pack"
-msgstr ""
-
-#: builtin/repack.c:672
-msgid "find a geometric progression with factor <N>"
-msgstr ""
-
-#: builtin/repack.c:674
-msgid "write a multi-pack index of the resulting packs"
-msgstr ""
-
-#: builtin/repack.c:684
-msgid "cannot delete packs in a precious-objects repo"
-msgstr ""
-
-#: builtin/repack.c:833
-msgid "Nothing new to pack."
-msgstr ""
-
-#: builtin/repack.c:863
-#, c-format
-msgid "missing required file: %s"
-msgstr ""
-
-#: builtin/repack.c:865
-#, c-format
-msgid "could not unlink: %s"
-msgstr ""
-
-#: builtin/replace.c:22
-msgid "git replace [-f] <object> <replacement>"
-msgstr ""
-
-#: builtin/replace.c:23
-msgid "git replace [-f] --edit <object>"
-msgstr ""
-
-#: builtin/replace.c:24
-msgid "git replace [-f] --graft <commit> [<parent>...]"
-msgstr ""
-
-#: builtin/replace.c:26
-msgid "git replace -d <object>..."
-msgstr ""
-
-#: builtin/replace.c:27
-msgid "git replace [--format=<format>] [-l [<pattern>]]"
-msgstr ""
-
-#: builtin/replace.c:90
-#, c-format
-msgid ""
-"invalid replace format '%s'\n"
-"valid formats are 'short', 'medium' and 'long'"
-msgstr ""
-
-#: builtin/replace.c:125
-#, c-format
-msgid "replace ref '%s' not found"
-msgstr ""
-
-#: builtin/replace.c:141
-#, c-format
-msgid "Deleted replace ref '%s'"
-msgstr ""
-
-#: builtin/replace.c:153
-#, c-format
-msgid "'%s' is not a valid ref name"
-msgstr ""
-
-#: builtin/replace.c:158
-#, c-format
-msgid "replace ref '%s' already exists"
-msgstr ""
-
-#: builtin/replace.c:178
-#, c-format
-msgid ""
-"Objects must be of the same type.\n"
-"'%s' points to a replaced object of type '%s'\n"
-"while '%s' points to a replacement object of type '%s'."
-msgstr ""
-
-#: builtin/replace.c:229
-#, c-format
-msgid "unable to open %s for writing"
-msgstr ""
-
-#: builtin/replace.c:242
-msgid "cat-file reported failure"
-msgstr ""
-
-#: builtin/replace.c:258
-#, c-format
-msgid "unable to open %s for reading"
-msgstr ""
-
-#: builtin/replace.c:271
-msgid "unable to spawn mktree"
-msgstr ""
-
-#: builtin/replace.c:275
-msgid "unable to read from mktree"
-msgstr ""
-
-#: builtin/replace.c:284
-msgid "mktree reported failure"
-msgstr ""
-
-#: builtin/replace.c:288
-msgid "mktree did not return an object name"
-msgstr ""
-
-#: builtin/replace.c:297
-#, c-format
-msgid "unable to fstat %s"
-msgstr ""
-
-#: builtin/replace.c:302
-msgid "unable to write object to database"
-msgstr ""
-
-#: builtin/replace.c:325
-#, c-format
-msgid "unable to get object type for %s"
-msgstr ""
-
-#: builtin/replace.c:341
-msgid "editing object file failed"
-msgstr ""
-
-#: builtin/replace.c:350
-#, c-format
-msgid "new object is the same as the old one: '%s'"
-msgstr ""
-
-#: builtin/replace.c:383
-#, c-format
-msgid "could not parse %s as a commit"
-msgstr ""
-
-#: builtin/replace.c:415
-#, c-format
-msgid "bad mergetag in commit '%s'"
-msgstr ""
-
-#: builtin/replace.c:417
-#, c-format
-msgid "malformed mergetag in commit '%s'"
-msgstr ""
-
-#: builtin/replace.c:429
-#, c-format
-msgid ""
-"original commit '%s' contains mergetag '%s' that is discarded; use --edit "
-"instead of --graft"
-msgstr ""
-
-#: builtin/replace.c:468
-#, c-format
-msgid "the original commit '%s' has a gpg signature"
-msgstr ""
-
-#: builtin/replace.c:469
-msgid "the signature will be removed in the replacement commit!"
-msgstr ""
-
-#: builtin/replace.c:479
-#, c-format
-msgid "could not write replacement commit for: '%s'"
-msgstr ""
-
-#: builtin/replace.c:487
-#, c-format
-msgid "graft for '%s' unnecessary"
-msgstr ""
-
-#: builtin/replace.c:491
-#, c-format
-msgid "new commit is the same as the old one: '%s'"
-msgstr ""
-
-#: builtin/replace.c:526
-#, c-format
-msgid ""
-"could not convert the following graft(s):\n"
-"%s"
-msgstr ""
-
-#: builtin/replace.c:547
-msgid "list replace refs"
-msgstr ""
-
-#: builtin/replace.c:548
-msgid "delete replace refs"
-msgstr ""
-
-#: builtin/replace.c:549
-msgid "edit existing object"
-msgstr ""
-
-#: builtin/replace.c:550
-msgid "change a commit's parents"
-msgstr ""
-
-#: builtin/replace.c:551
-msgid "convert existing graft file"
-msgstr ""
-
-#: builtin/replace.c:552
-msgid "replace the ref if it exists"
-msgstr ""
-
-#: builtin/replace.c:554
-msgid "do not pretty-print contents for --edit"
-msgstr ""
-
-#: builtin/replace.c:555
-msgid "use this format"
-msgstr ""
-
-#: builtin/replace.c:568
-msgid "--format cannot be used when not listing"
-msgstr ""
-
-#: builtin/replace.c:576
-msgid "-f only makes sense when writing a replacement"
-msgstr ""
-
-#: builtin/replace.c:580
-msgid "--raw only makes sense with --edit"
-msgstr ""
-
-#: builtin/replace.c:586
-msgid "-d needs at least one argument"
-msgstr ""
-
-#: builtin/replace.c:592
-msgid "bad number of arguments"
-msgstr ""
-
-#: builtin/replace.c:598
-msgid "-e needs exactly one argument"
-msgstr ""
-
-#: builtin/replace.c:604
-msgid "-g needs at least one argument"
-msgstr ""
-
-#: builtin/replace.c:610
-msgid "--convert-graft-file takes no argument"
-msgstr ""
-
-#: builtin/replace.c:616
-msgid "only one pattern can be given with -l"
-msgstr ""
-
-#: builtin/rerere.c:13
-msgid "git rerere [clear | forget <path>... | status | remaining | diff | gc]"
-msgstr ""
-
-#: builtin/rerere.c:58
-msgid "register clean resolutions in index"
-msgstr ""
-
-#: builtin/rerere.c:77
-msgid "'git rerere forget' without paths is deprecated"
-msgstr ""
-
-#: builtin/rerere.c:111
-#, c-format
-msgid "unable to generate diff for '%s'"
-msgstr ""
-
-#: builtin/reset.c:33
-msgid ""
-"git reset [--mixed | --soft | --hard | --merge | --keep] [-q] [<commit>]"
-msgstr ""
-
-#: builtin/reset.c:34
-msgid "git reset [-q] [<tree-ish>] [--] <pathspec>..."
-msgstr ""
-
-#: builtin/reset.c:35
-msgid ""
-"git reset [-q] [--pathspec-from-file [--pathspec-file-nul]] [<tree-ish>]"
-msgstr ""
-
-#: builtin/reset.c:36
-msgid "git reset --patch [<tree-ish>] [--] [<pathspec>...]"
-msgstr ""
-
-#: builtin/reset.c:42
-msgid "mixed"
-msgstr ""
-
-#: builtin/reset.c:42
-msgid "soft"
-msgstr ""
-
-#: builtin/reset.c:42
-msgid "hard"
-msgstr ""
-
-#: builtin/reset.c:42
-msgid "merge"
-msgstr ""
-
-#: builtin/reset.c:42
-msgid "keep"
-msgstr ""
-
-#: builtin/reset.c:90
-msgid "You do not have a valid HEAD."
-msgstr ""
-
-#: builtin/reset.c:92
-msgid "Failed to find tree of HEAD."
-msgstr ""
-
-#: builtin/reset.c:98
-#, c-format
-msgid "Failed to find tree of %s."
-msgstr ""
-
-#: builtin/reset.c:123
-#, c-format
-msgid "HEAD is now at %s"
-msgstr ""
-
-#: builtin/reset.c:304
-#, c-format
-msgid "Cannot do a %s reset in the middle of a merge."
-msgstr ""
-
-#: builtin/reset.c:402 builtin/stash.c:606 builtin/stash.c:669
-#: builtin/stash.c:693
-msgid "be quiet, only report errors"
-msgstr ""
-
-#: builtin/reset.c:404
-msgid "skip refreshing the index after reset"
-msgstr ""
-
-#: builtin/reset.c:406
-msgid "reset HEAD and index"
-msgstr ""
-
-#: builtin/reset.c:407
-msgid "reset only HEAD"
-msgstr ""
-
-#: builtin/reset.c:409 builtin/reset.c:411
-msgid "reset HEAD, index and working tree"
-msgstr ""
-
-#: builtin/reset.c:413
-msgid "reset HEAD but keep local changes"
-msgstr ""
-
-#: builtin/reset.c:419
-msgid "record only the fact that removed paths will be added later"
-msgstr ""
-
-#: builtin/reset.c:452
-#, c-format
-msgid "Failed to resolve '%s' as a valid revision."
-msgstr ""
-
-#: builtin/reset.c:460
-#, c-format
-msgid "Failed to resolve '%s' as a valid tree."
-msgstr ""
-
-#: builtin/reset.c:479
-msgid "--mixed with paths is deprecated; use 'git reset -- <paths>' instead."
-msgstr ""
-
-#: builtin/reset.c:481
-#, c-format
-msgid "Cannot do %s reset with paths."
-msgstr ""
-
-#: builtin/reset.c:496
-#, c-format
-msgid "%s reset is not allowed in a bare repository"
-msgstr ""
-
-#: builtin/reset.c:527
-msgid "Unstaged changes after reset:"
-msgstr ""
-
-#: builtin/reset.c:530
-#, c-format
-msgid ""
-"It took %.2f seconds to refresh the index after reset.  You can use\n"
-"'--no-refresh' to avoid this."
-msgstr ""
-
-#: builtin/reset.c:547
-#, c-format
-msgid "Could not reset index file to revision '%s'."
-msgstr ""
-
-#: builtin/reset.c:552
-msgid "Could not write new index file."
-msgstr ""
-
-#: builtin/rev-list.c:659
-msgid "rev-list does not support display of notes"
-msgstr ""
-
-#: builtin/rev-list.c:664
-#, c-format
-msgid "marked counting and '%s' cannot be used together"
-msgstr ""
-
-#: builtin/rev-parse.c:409
-msgid "git rev-parse --parseopt [<options>] -- [<args>...]"
-msgstr ""
-
-#: builtin/rev-parse.c:414
-msgid "keep the `--` passed as an arg"
-msgstr ""
-
-#: builtin/rev-parse.c:416
-msgid "stop parsing after the first non-option argument"
-msgstr ""
-
-#: builtin/rev-parse.c:419
-msgid "output in stuck long form"
-msgstr ""
-
-#: builtin/rev-parse.c:438
-msgid "premature end of input"
-msgstr ""
-
-#: builtin/rev-parse.c:442
-msgid "no usage string given before the `--' separator"
-msgstr ""
-
-#: builtin/rev-parse.c:548
-msgid "Needed a single revision"
-msgstr ""
-
-#: builtin/rev-parse.c:552
-msgid ""
-"git rev-parse --parseopt [<options>] -- [<args>...]\n"
-"   or: git rev-parse --sq-quote [<arg>...]\n"
-"   or: git rev-parse [<options>] [<arg>...]\n"
-"\n"
-"Run \"git rev-parse --parseopt -h\" for more information on the first usage."
-msgstr ""
-
-#: builtin/rev-parse.c:712
-msgid "--resolve-git-dir requires an argument"
-msgstr ""
-
-#: builtin/rev-parse.c:715
-#, c-format
-msgid "not a gitdir '%s'"
-msgstr ""
-
-#: builtin/rev-parse.c:739
-msgid "--git-path requires an argument"
-msgstr ""
-
-#: builtin/rev-parse.c:749
-msgid "-n requires an argument"
-msgstr ""
-
-#: builtin/rev-parse.c:763
-msgid "--path-format requires an argument"
-msgstr ""
-
-#: builtin/rev-parse.c:769
-#, c-format
-msgid "unknown argument to --path-format: %s"
-msgstr ""
-
-#: builtin/rev-parse.c:776
-msgid "--default requires an argument"
-msgstr ""
-
-#: builtin/rev-parse.c:782
-msgid "--prefix requires an argument"
-msgstr ""
-
-#: builtin/rev-parse.c:851
-#, c-format
-msgid "unknown mode for --abbrev-ref: %s"
-msgstr ""
-
-#: builtin/rev-parse.c:1023
-#, c-format
-msgid "unknown mode for --show-object-format: %s"
-msgstr ""
-
-#: builtin/revert.c:24
-msgid "git revert [<options>] <commit-ish>..."
-msgstr ""
-
-#: builtin/revert.c:25
-msgid "git revert <subcommand>"
-msgstr ""
-
-#: builtin/revert.c:30
-msgid "git cherry-pick [<options>] <commit-ish>..."
-msgstr ""
-
-#: builtin/revert.c:31
-msgid "git cherry-pick <subcommand>"
-msgstr ""
-
-#: builtin/revert.c:72
-#, c-format
-msgid "option `%s' expects a number greater than zero"
-msgstr ""
-
-#: builtin/revert.c:92
-#, c-format
-msgid "%s: %s cannot be used with %s"
-msgstr ""
-
-#: builtin/revert.c:102
-msgid "end revert or cherry-pick sequence"
-msgstr ""
-
-#: builtin/revert.c:103
-msgid "resume revert or cherry-pick sequence"
-msgstr ""
-
-#: builtin/revert.c:104
-msgid "cancel revert or cherry-pick sequence"
-msgstr ""
-
-#: builtin/revert.c:105
-msgid "skip current commit and continue"
-msgstr ""
-
-#: builtin/revert.c:107
-msgid "don't automatically commit"
-msgstr ""
-
-#: builtin/revert.c:108
-msgid "edit the commit message"
-msgstr ""
-
-#: builtin/revert.c:111
-msgid "parent-number"
-msgstr ""
-
-#: builtin/revert.c:112
-msgid "select mainline parent"
-msgstr ""
-
-#: builtin/revert.c:114
-msgid "merge strategy"
-msgstr ""
-
-#: builtin/revert.c:116
-msgid "option for merge strategy"
-msgstr ""
-
-#: builtin/revert.c:125
-msgid "append commit name"
-msgstr ""
-
-#: builtin/revert.c:127
-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:241
-msgid "revert failed"
-msgstr ""
-
-#: builtin/revert.c:254
-msgid "cherry-pick failed"
-msgstr ""
-
-#: builtin/rm.c:20
-msgid "git rm [<options>] [--] <file>..."
-msgstr ""
-
-#: builtin/rm.c:208
-msgid ""
-"the following file has staged content different from both the\n"
-"file and the HEAD:"
-msgid_plural ""
-"the following files have staged content different from both the\n"
-"file and the HEAD:"
-msgstr[0] ""
-msgstr[1] ""
-
-#: builtin/rm.c:213
-msgid ""
-"\n"
-"(use -f to force removal)"
-msgstr ""
-
-#: 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] ""
-msgstr[1] ""
-
-#: builtin/rm.c:221 builtin/rm.c:230
-msgid ""
-"\n"
-"(use --cached to keep the file, or -f to force removal)"
-msgstr ""
-
-#: builtin/rm.c:227
-msgid "the following file has local modifications:"
-msgid_plural "the following files have local modifications:"
-msgstr[0] ""
-msgstr[1] ""
-
-#: builtin/rm.c:245
-msgid "do not list removed files"
-msgstr ""
-
-#: builtin/rm.c:246
-msgid "only remove from the index"
-msgstr ""
-
-#: builtin/rm.c:247
-msgid "override the up-to-date check"
-msgstr ""
-
-#: builtin/rm.c:248
-msgid "allow recursive removal"
-msgstr ""
-
-#: builtin/rm.c:250
-msgid "exit with a zero status even if nothing matched"
-msgstr ""
-
-#: builtin/rm.c:285
-msgid "No pathspec was given. Which files should I remove?"
-msgstr ""
-
-#: builtin/rm.c:315
-msgid "please stage your changes to .gitmodules or stash them to proceed"
-msgstr ""
-
-#: builtin/rm.c:337
-#, c-format
-msgid "not removing '%s' recursively without -r"
-msgstr ""
-
-#: builtin/rm.c:385
-#, c-format
-msgid "git rm: unable to remove %s"
-msgstr ""
-
-#: builtin/send-pack.c:20
-msgid ""
-"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:192
-msgid "remote name"
-msgstr ""
-
-#: builtin/send-pack.c:205
-msgid "use stateless RPC protocol"
-msgstr ""
-
-#: builtin/send-pack.c:206
-msgid "read refs from stdin"
-msgstr ""
-
-#: builtin/send-pack.c:207
-msgid "print status from remote helper"
-msgstr ""
-
-#: builtin/shortlog.c:16
-msgid "git shortlog [<options>] [<revision-range>] [[--] <path>...]"
-msgstr ""
-
-#: builtin/shortlog.c:17
-msgid "git log --pretty=short | git shortlog [<options>]"
-msgstr ""
-
-#: builtin/shortlog.c:123
-msgid "using multiple --group options with stdin is not supported"
-msgstr ""
-
-#: builtin/shortlog.c:133
-msgid "using --group=trailer with stdin is not supported"
-msgstr ""
-
-#: builtin/shortlog.c:323
-#, c-format
-msgid "unknown group type: %s"
-msgstr ""
-
-#: builtin/shortlog.c:351
-msgid "group by committer rather than author"
-msgstr ""
-
-#: builtin/shortlog.c:354
-msgid "sort output according to the number of commits per author"
-msgstr ""
-
-#: builtin/shortlog.c:356
-msgid "suppress commit descriptions, only provides commit count"
-msgstr ""
-
-#: builtin/shortlog.c:358
-msgid "show the email address of each author"
-msgstr ""
-
-#: builtin/shortlog.c:359
-msgid "<w>[,<i1>[,<i2>]]"
-msgstr ""
-
-#: builtin/shortlog.c:360
-msgid "linewrap output"
-msgstr ""
-
-#: builtin/shortlog.c:362
-msgid "field"
-msgstr ""
-
-#: builtin/shortlog.c:363
-msgid "group by field"
-msgstr ""
-
-#: builtin/shortlog.c:395
-msgid "too many arguments given outside repository"
-msgstr ""
-
-#: builtin/show-branch.c:14
-msgid ""
-"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>)...]"
-msgstr ""
-
-#: builtin/show-branch.c:18
-msgid "git show-branch (-g | --reflog)[=<n>[,<base>]] [--list] [<ref>]"
-msgstr ""
-
-#: builtin/show-branch.c:396
-#, c-format
-msgid "ignoring %s; cannot handle more than %d ref"
-msgid_plural "ignoring %s; cannot handle more than %d refs"
-msgstr[0] ""
-msgstr[1] ""
-
-#: builtin/show-branch.c:548
-#, c-format
-msgid "no matching refs with %s"
-msgstr ""
-
-#: builtin/show-branch.c:645
-msgid "show remote-tracking and local branches"
-msgstr ""
-
-#: builtin/show-branch.c:647
-msgid "show remote-tracking branches"
-msgstr ""
-
-#: builtin/show-branch.c:649
-msgid "color '*!+-' corresponding to the branch"
-msgstr ""
-
-#: builtin/show-branch.c:651
-msgid "show <n> more commits after the common ancestor"
-msgstr ""
-
-#: builtin/show-branch.c:653
-msgid "synonym to more=-1"
-msgstr ""
-
-#: builtin/show-branch.c:654
-msgid "suppress naming strings"
-msgstr ""
-
-#: builtin/show-branch.c:656
-msgid "include the current branch"
-msgstr ""
-
-#: builtin/show-branch.c:658
-msgid "name commits with their object names"
-msgstr ""
-
-#: builtin/show-branch.c:660
-msgid "show possible merge bases"
-msgstr ""
-
-#: builtin/show-branch.c:662
-msgid "show refs unreachable from any other ref"
-msgstr ""
-
-#: builtin/show-branch.c:664
-msgid "show commits in topological order"
-msgstr ""
-
-#: builtin/show-branch.c:667
-msgid "show only commits not on the first branch"
-msgstr ""
-
-#: builtin/show-branch.c:669
-msgid "show merges reachable from only one tip"
-msgstr ""
-
-#: builtin/show-branch.c:671
-msgid "topologically sort, maintaining date order where possible"
-msgstr ""
-
-#: builtin/show-branch.c:674
-msgid "<n>[,<base>]"
-msgstr ""
-
-#: builtin/show-branch.c:675
-msgid "show <n> most recent ref-log entries starting at base"
-msgstr ""
-
-#: builtin/show-branch.c:735
-msgid "no branches given, and HEAD is not valid"
-msgstr ""
-
-#: builtin/show-branch.c:738
-msgid "--reflog option needs one branch name"
-msgstr ""
-
-#: builtin/show-branch.c:741
-#, 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
-#, c-format
-msgid "no such ref %s"
-msgstr ""
-
-#: builtin/show-branch.c:831
-#, 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
-#, c-format
-msgid "'%s' is not a valid ref."
-msgstr ""
-
-#: builtin/show-branch.c:838
-#, c-format
-msgid "cannot find commit %s (%s)"
-msgstr ""
-
-#: builtin/show-index.c:21
-msgid "hash-algorithm"
-msgstr ""
-
-#: builtin/show-index.c:31
-msgid "Unknown hash algorithm"
-msgstr ""
-
-#: builtin/show-ref.c:12
-msgid ""
-"git show-ref [-q | --quiet] [--verify] [--head] [-d | --dereference] [-s | --"
-"hash[=<n>]] [--abbrev[=<n>]] [--tags] [--heads] [--] [<pattern>...]"
-msgstr ""
-
-#: builtin/show-ref.c:13
-msgid "git show-ref --exclude-existing[=<pattern>]"
-msgstr ""
-
-#: builtin/show-ref.c:162
-msgid "only show tags (can be combined with heads)"
-msgstr ""
-
-#: builtin/show-ref.c:163
-msgid "only show heads (can be combined with tags)"
-msgstr ""
-
-#: builtin/show-ref.c:164
-msgid "stricter reference checking, requires exact ref path"
-msgstr ""
-
-#: builtin/show-ref.c:167 builtin/show-ref.c:169
-msgid "show the HEAD reference, even if it would be filtered out"
-msgstr ""
-
-#: builtin/show-ref.c:171
-msgid "dereference tags into object IDs"
-msgstr ""
-
-#: builtin/show-ref.c:173
-msgid "only show SHA1 hash using <n> digits"
-msgstr ""
-
-#: builtin/show-ref.c:177
-msgid "do not print results to stdout (useful with --verify)"
-msgstr ""
-
-#: builtin/show-ref.c:179
-msgid "show refs from stdin that aren't in local repository"
-msgstr ""
-
-#: builtin/sparse-checkout.c:23
-msgid "git sparse-checkout (init|list|set|add|reapply|disable) <options>"
-msgstr ""
-
-#: builtin/sparse-checkout.c:61
-msgid "this worktree is not sparse"
-msgstr ""
-
-#: builtin/sparse-checkout.c:76
-msgid "this worktree is not sparse (sparse-checkout file may not exist)"
-msgstr ""
-
-#: builtin/sparse-checkout.c:177
-#, c-format
-msgid ""
-"directory '%s' contains untracked files, but is not in the sparse-checkout "
-"cone"
-msgstr ""
-
-#: builtin/sparse-checkout.c:185
-#, c-format
-msgid "failed to remove directory '%s'"
-msgstr ""
-
-#: builtin/sparse-checkout.c:327
-msgid "failed to create directory for sparse-checkout file"
-msgstr ""
-
-#: builtin/sparse-checkout.c:366
-msgid "failed to initialize worktree config"
-msgstr ""
-
-#: builtin/sparse-checkout.c:411
-msgid "failed to modify sparse-index config"
-msgstr ""
-
-#: builtin/sparse-checkout.c:441 builtin/sparse-checkout.c:793
-#: builtin/sparse-checkout.c:847
-msgid "initialize the sparse-checkout in cone mode"
-msgstr ""
-
-#: builtin/sparse-checkout.c:443 builtin/sparse-checkout.c:795
-#: builtin/sparse-checkout.c:849
-msgid "toggle the use of a sparse index"
-msgstr ""
-
-#: builtin/sparse-checkout.c:479
-#, c-format
-msgid "failed to open '%s'"
-msgstr ""
-
-#: builtin/sparse-checkout.c:531
-#, c-format
-msgid "could not normalize path %s"
-msgstr ""
-
-#: builtin/sparse-checkout.c:560
-#, c-format
-msgid "unable to unquote C-style string '%s'"
-msgstr ""
-
-#: builtin/sparse-checkout.c:615 builtin/sparse-checkout.c:643
-msgid "unable to load existing sparse-checkout patterns"
-msgstr ""
-
-#: builtin/sparse-checkout.c:619
-msgid "existing sparse-checkout patterns do not use cone mode"
-msgstr ""
-
-#: builtin/sparse-checkout.c:707
-msgid "please run from the toplevel directory in non-cone mode"
-msgstr ""
-
-#: builtin/sparse-checkout.c:712
-msgid "specify directories rather than patterns (no leading slash)"
-msgstr ""
-
-#: builtin/sparse-checkout.c:714
-msgid ""
-"specify directories rather than patterns.  If your directory starts with a "
-"'!', pass --skip-checks"
-msgstr ""
-
-#: builtin/sparse-checkout.c:716
-msgid ""
-"specify directories rather than patterns.  If your directory really has any "
-"of '*?[]\\' in it, pass --skip-checks"
-msgstr ""
-
-#: builtin/sparse-checkout.c:732
-#, c-format
-msgid ""
-"'%s' is not a directory; to treat it as a directory anyway, rerun with --"
-"skip-checks"
-msgstr ""
-
-#: builtin/sparse-checkout.c:734
-#, c-format
-msgid ""
-"pass a leading slash before paths such as '%s' if you want a single file "
-"(see NON-CONE PROBLEMS in the git-sparse-checkout manual)."
-msgstr ""
-
-#: builtin/sparse-checkout.c:739
-msgid "git sparse-checkout add [--skip-checks] (--stdin | <patterns>)"
-msgstr ""
-
-#: builtin/sparse-checkout.c:752 builtin/sparse-checkout.c:797
-msgid ""
-"skip some sanity checks on the given paths that might give false positives"
-msgstr ""
-
-#: builtin/sparse-checkout.c:755 builtin/sparse-checkout.c:800
-msgid "read patterns from standard in"
-msgstr ""
-
-#: builtin/sparse-checkout.c:760
-msgid "no sparse-checkout to add to"
-msgstr ""
-
-#: builtin/sparse-checkout.c:775
-msgid ""
-"git sparse-checkout set [--[no-]cone] [--[no-]sparse-index] [--skip-checks] "
-"(--stdin | <patterns>)"
-msgstr ""
-
-#: builtin/sparse-checkout.c:854
-msgid "must be in a sparse-checkout to reapply sparsity patterns"
-msgstr ""
-
-#: builtin/sparse-checkout.c:914
-msgid "error while refreshing working directory"
-msgstr ""
-
-#: builtin/stash.c:24 builtin/stash.c:40
-msgid "git stash list [<options>]"
-msgstr ""
-
-#: builtin/stash.c:25 builtin/stash.c:45
-msgid "git stash show [<options>] [<stash>]"
-msgstr ""
-
-#: builtin/stash.c:26 builtin/stash.c:50
-msgid "git stash drop [-q|--quiet] [<stash>]"
-msgstr ""
-
-#: builtin/stash.c:27
-msgid "git stash ( pop | apply ) [--index] [-q|--quiet] [<stash>]"
-msgstr ""
-
-#: builtin/stash.c:28 builtin/stash.c:65
-msgid "git stash branch <branchname> [<stash>]"
-msgstr ""
-
-#: builtin/stash.c:30
-msgid ""
-"git stash [push [-p|--patch] [-S|--staged] [-k|--[no-]keep-index] [-q|--"
-"quiet]\n"
-"          [-u|--include-untracked] [-a|--all] [-m|--message <message>]\n"
-"          [--pathspec-from-file=<file> [--pathspec-file-nul]]\n"
-"          [--] [<pathspec>...]]"
-msgstr ""
-
-#: builtin/stash.c:34
-msgid ""
-"git stash save [-p|--patch] [-S|--staged] [-k|--[no-]keep-index] [-q|--"
-"quiet]\n"
-"          [-u|--include-untracked] [-a|--all] [<message>]"
-msgstr ""
-
-#: builtin/stash.c:55
-msgid "git stash pop [--index] [-q|--quiet] [<stash>]"
-msgstr ""
-
-#: builtin/stash.c:60
-msgid "git stash apply [--index] [-q|--quiet] [<stash>]"
-msgstr ""
-
-#: builtin/stash.c:75
-msgid "git stash store [-m|--message <message>] [-q|--quiet] <commit>"
-msgstr ""
-
-#: 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"
-"          [--] [<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"
-msgstr ""
-
-#: builtin/stash.c:150
-#, c-format
-msgid "Too many revisions specified:%s"
-msgstr ""
-
-#: builtin/stash.c:164
-msgid "No stash entries found."
-msgstr ""
-
-#: builtin/stash.c:178
-#, c-format
-msgid "%s is not a valid reference"
-msgstr ""
-
-#: builtin/stash.c:227
-msgid "git stash clear with arguments is unimplemented"
-msgstr ""
-
-#: builtin/stash.c:447
-#, c-format
-msgid ""
-"WARNING: Untracked file in way of tracked file!  Renaming\n"
-"            %s -> %s\n"
-"         to make room.\n"
-msgstr ""
-
-#: builtin/stash.c:508
-msgid "cannot apply a stash in the middle of a merge"
-msgstr ""
-
-#: builtin/stash.c:519
-#, c-format
-msgid "could not generate diff %s^!."
-msgstr ""
-
-#: builtin/stash.c:526
-msgid "conflicts in index. Try without --index."
-msgstr ""
-
-#: builtin/stash.c:532
-msgid "could not save index tree"
-msgstr ""
-
-#: builtin/stash.c:552
-#, c-format
-msgid "Merging %s with %s"
-msgstr ""
-
-#: builtin/stash.c:562
-msgid "Index was not unstashed."
-msgstr ""
-
-#: builtin/stash.c:576
-msgid "could not restore untracked files from stash"
-msgstr ""
-
-#: builtin/stash.c:608 builtin/stash.c:695
-msgid "attempt to recreate the index"
-msgstr ""
-
-#: builtin/stash.c:641
-#, c-format
-msgid "Dropped %s (%s)"
-msgstr ""
-
-#: builtin/stash.c:644
-#, c-format
-msgid "%s: Could not drop stash entry"
-msgstr ""
-
-#: builtin/stash.c:657
-#, c-format
-msgid "'%s' is not a stash reference"
-msgstr ""
-
-#: builtin/stash.c:707
-msgid "The stash entry is kept in case you need it again."
-msgstr ""
-
-#: builtin/stash.c:730
-msgid "No branch name specified"
-msgstr ""
-
-#: builtin/stash.c:809
-msgid "failed to parse tree"
-msgstr ""
-
-#: builtin/stash.c:820
-msgid "failed to unpack trees"
-msgstr ""
-
-#: builtin/stash.c:840
-msgid "include untracked files in the stash"
-msgstr ""
-
-#: builtin/stash.c:843
-msgid "only show untracked files in the stash"
-msgstr ""
-
-#: builtin/stash.c:930 builtin/stash.c:967
-#, c-format
-msgid "Cannot update %s with %s"
-msgstr ""
-
-#: builtin/stash.c:948 builtin/stash.c:1667 builtin/stash.c:1739
-msgid "stash message"
-msgstr ""
-
-#: builtin/stash.c:958
-msgid "\"git stash store\" requires one <commit> argument"
-msgstr ""
-
-#: builtin/stash.c:1143
-msgid "No staged changes"
-msgstr ""
-
-#: builtin/stash.c:1204
-msgid "No changes selected"
-msgstr ""
-
-#: builtin/stash.c:1304
-msgid "You do not have the initial commit yet"
-msgstr ""
-
-#: builtin/stash.c:1331
-msgid "Cannot save the current index state"
-msgstr ""
-
-#: builtin/stash.c:1340
-msgid "Cannot save the untracked files"
-msgstr ""
-
-#: builtin/stash.c:1351 builtin/stash.c:1370
-msgid "Cannot save the current worktree state"
-msgstr ""
-
-#: builtin/stash.c:1361
-msgid "Cannot save the current staged state"
-msgstr ""
-
-#: builtin/stash.c:1398
-msgid "Cannot record working tree state"
-msgstr ""
-
-#: builtin/stash.c:1447
-msgid "Can't use --patch and --include-untracked or --all at the same time"
-msgstr ""
-
-#: builtin/stash.c:1458
-msgid "Can't use --staged and --include-untracked or --all at the same time"
-msgstr ""
-
-#: builtin/stash.c:1476
-msgid "Did you forget to 'git add'?"
-msgstr ""
-
-#: builtin/stash.c:1491
-msgid "No local changes to save"
-msgstr ""
-
-#: builtin/stash.c:1498
-msgid "Cannot initialize stash"
-msgstr ""
-
-#: builtin/stash.c:1513
-msgid "Cannot save the current status"
-msgstr ""
-
-#: builtin/stash.c:1518
-#, c-format
-msgid "Saved working directory and index state %s"
-msgstr ""
-
-#: builtin/stash.c:1615
-msgid "Cannot remove worktree changes"
-msgstr ""
-
-#: builtin/stash.c:1656 builtin/stash.c:1728
-msgid "keep index"
-msgstr ""
-
-#: builtin/stash.c:1658 builtin/stash.c:1730
-msgid "stash staged changes only"
-msgstr ""
-
-#: builtin/stash.c:1660 builtin/stash.c:1732
-msgid "stash in patch mode"
-msgstr ""
-
-#: builtin/stash.c:1661 builtin/stash.c:1733
-msgid "quiet mode"
-msgstr ""
-
-#: builtin/stash.c:1663 builtin/stash.c:1735
-msgid "include untracked files in stash"
-msgstr ""
-
-#: builtin/stash.c:1665 builtin/stash.c:1737
-msgid "include ignore files"
-msgstr ""
-
-#: builtin/stripspace.c:37
-msgid "skip and remove all lines starting with comment character"
-msgstr ""
-
-#: builtin/stripspace.c:40
-msgid "prepend comment character and space to each line"
-msgstr ""
-
-#: builtin/submodule--helper.c:50 builtin/submodule--helper.c:2486
-#, c-format
-msgid "Expecting a full ref name, got %s"
-msgstr ""
-
-#: builtin/submodule--helper.c:103
-#, c-format
-msgid "cannot strip one component off url '%s'"
-msgstr ""
-
-#: builtin/submodule--helper.c:213
-#, c-format
-msgid ""
-"could not look up configuration '%s'. Assuming this repository is its own "
-"authoritative upstream."
-msgstr ""
-
-#: builtin/submodule--helper.c:413 builtin/submodule--helper.c:1873
-msgid "alternative anchor for relative paths"
-msgstr ""
-
-#: builtin/submodule--helper.c:418
-msgid "git submodule--helper list [--prefix=<path>] [<path>...]"
-msgstr ""
-
-#: builtin/submodule--helper.c:476 builtin/submodule--helper.c:617
-#: builtin/submodule--helper.c:640
-#, c-format
-msgid "No url found for submodule path '%s' in .gitmodules"
-msgstr ""
-
-#: builtin/submodule--helper.c:528
-#, c-format
-msgid "Entering '%s'\n"
-msgstr ""
-
-#: builtin/submodule--helper.c:531
-#, c-format
-msgid ""
-"run_command returned non-zero status for %s\n"
-"."
-msgstr ""
-
-#: builtin/submodule--helper.c:553
-#, c-format
-msgid ""
-"run_command returned non-zero status while recursing in the nested "
-"submodules of %s\n"
-"."
-msgstr ""
-
-#: builtin/submodule--helper.c:569
-msgid "suppress output of entering each submodule command"
-msgstr ""
-
-#: builtin/submodule--helper.c:571 builtin/submodule--helper.c:876
-#: builtin/submodule--helper.c:1458
-msgid "recurse into nested submodules"
-msgstr ""
-
-#: builtin/submodule--helper.c:576
-msgid "git submodule--helper foreach [--quiet] [--recursive] [--] <command>"
-msgstr ""
-
-#: builtin/submodule--helper.c:654
-#, c-format
-msgid "Failed to register url for submodule path '%s'"
-msgstr ""
-
-#: builtin/submodule--helper.c:658
-#, c-format
-msgid "Submodule '%s' (%s) registered for path '%s'\n"
-msgstr ""
-
-#: builtin/submodule--helper.c:668
-#, c-format
-msgid "warning: command update mode suggested for submodule '%s'\n"
-msgstr ""
-
-#: builtin/submodule--helper.c:675
-#, c-format
-msgid "Failed to register update mode for submodule path '%s'"
-msgstr ""
-
-#: builtin/submodule--helper.c:697
-msgid "suppress output for initializing a submodule"
-msgstr ""
-
-#: builtin/submodule--helper.c:702
-msgid "git submodule--helper init [<options>] [<path>]"
-msgstr ""
-
-#: builtin/submodule--helper.c:775 builtin/submodule--helper.c:910
-#, c-format
-msgid "no submodule mapping found in .gitmodules for path '%s'"
-msgstr ""
-
-#: builtin/submodule--helper.c:823
-#, c-format
-msgid "could not resolve HEAD ref inside the submodule '%s'"
-msgstr ""
-
-#: builtin/submodule--helper.c:850 builtin/submodule--helper.c:1428
-#, c-format
-msgid "failed to recurse into submodule '%s'"
-msgstr ""
-
-#: builtin/submodule--helper.c:874 builtin/submodule--helper.c:1595
-msgid "suppress submodule status output"
-msgstr ""
-
-#: builtin/submodule--helper.c:875
-msgid ""
-"use commit stored in the index instead of the one stored in the submodule "
-"HEAD"
-msgstr ""
-
-#: builtin/submodule--helper.c:881
-msgid "git submodule status [--quiet] [--cached] [--recursive] [<path>...]"
-msgstr ""
-
-#: builtin/submodule--helper.c:905
-msgid "git submodule--helper name <path>"
-msgstr ""
-
-#: builtin/submodule--helper.c:977
-#, c-format
-msgid "* %s %s(blob)->%s(submodule)"
-msgstr ""
-
-#: builtin/submodule--helper.c:980
-#, c-format
-msgid "* %s %s(submodule)->%s(blob)"
-msgstr ""
-
-#: builtin/submodule--helper.c:993
-#, c-format
-msgid "%s"
-msgstr ""
-
-#: builtin/submodule--helper.c:1043
-#, c-format
-msgid "couldn't hash object from '%s'"
-msgstr ""
-
-#: builtin/submodule--helper.c:1047
-#, c-format
-msgid "unexpected mode %o\n"
-msgstr ""
-
-#: builtin/submodule--helper.c:1288
-msgid "use the commit stored in the index instead of the submodule HEAD"
-msgstr ""
-
-#: builtin/submodule--helper.c:1290
-msgid "compare the commit in the index with that in the submodule HEAD"
-msgstr ""
-
-#: builtin/submodule--helper.c:1292
-msgid "skip submodules with 'ignore_config' value set to 'all'"
-msgstr ""
-
-#: builtin/submodule--helper.c:1294
-msgid "limit the summary size"
-msgstr ""
-
-#: builtin/submodule--helper.c:1299
-msgid "git submodule--helper summary [<options>] [<commit>] [--] [<path>]"
-msgstr ""
-
-#: builtin/submodule--helper.c:1323
-msgid "could not fetch a revision for HEAD"
-msgstr ""
-
-#: builtin/submodule--helper.c:1384
-#, c-format
-msgid "Synchronizing submodule url for '%s'\n"
-msgstr ""
-
-#: builtin/submodule--helper.c:1390
-#, c-format
-msgid "failed to register url for submodule path '%s'"
-msgstr ""
-
-#: builtin/submodule--helper.c:1399
-#, c-format
-msgid "failed to get the default remote for submodule '%s'"
-msgstr ""
-
-#: builtin/submodule--helper.c:1409
-#, c-format
-msgid "failed to update remote for submodule '%s'"
-msgstr ""
-
-#: builtin/submodule--helper.c:1456
-msgid "suppress output of synchronizing submodule url"
-msgstr ""
-
-#: builtin/submodule--helper.c:1463
-msgid "git submodule--helper sync [--quiet] [--recursive] [<path>]"
-msgstr ""
-
-#: builtin/submodule--helper.c:1513
-#, c-format
-msgid ""
-"Submodule work tree '%s' contains a .git directory. This will be replaced "
-"with a .git file by using absorbgitdirs."
-msgstr ""
-
-#: builtin/submodule--helper.c:1530
-#, c-format
-msgid ""
-"Submodule work tree '%s' contains local modifications; use '-f' to discard "
-"them"
-msgstr ""
-
-#: builtin/submodule--helper.c:1538
-#, c-format
-msgid "Cleared directory '%s'\n"
-msgstr ""
-
-#: builtin/submodule--helper.c:1540
-#, c-format
-msgid "Could not remove submodule work tree '%s'\n"
-msgstr ""
-
-#: builtin/submodule--helper.c:1551
-#, c-format
-msgid "could not create empty submodule directory %s"
-msgstr ""
-
-#: builtin/submodule--helper.c:1567
-#, c-format
-msgid "Submodule '%s' (%s) unregistered for path '%s'\n"
-msgstr ""
-
-#: builtin/submodule--helper.c:1596
-msgid "remove submodule working trees even if they contain local changes"
-msgstr ""
-
-#: builtin/submodule--helper.c:1597
-msgid "unregister all submodules"
-msgstr ""
-
-#: builtin/submodule--helper.c:1602
-msgid ""
-"git submodule deinit [--quiet] [-f | --force] [--all | [--] [<path>...]]"
-msgstr ""
-
-#: builtin/submodule--helper.c:1616
-msgid "Use '--all' if you really want to deinitialize all submodules"
-msgstr ""
-
-#: builtin/submodule--helper.c:1665
-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"
-"submodule.alternateErrorStrategy to 'info' or, equivalently, clone with\n"
-"'--reference-if-able' instead of '--reference'."
-msgstr ""
-
-#: builtin/submodule--helper.c:1710 builtin/submodule--helper.c:1713
-#, c-format
-msgid "submodule '%s' cannot add alternate: %s"
-msgstr ""
-
-#: builtin/submodule--helper.c:1749
-#, c-format
-msgid "Value '%s' for submodule.alternateErrorStrategy is not recognized"
-msgstr ""
-
-#: builtin/submodule--helper.c:1756
-#, c-format
-msgid "Value '%s' for submodule.alternateLocation is not recognized"
-msgstr ""
-
-#: builtin/submodule--helper.c:1781
-#, c-format
-msgid "refusing to create/use '%s' in another submodule's git dir"
-msgstr ""
-
-#: builtin/submodule--helper.c:1826
-#, c-format
-msgid "clone of '%s' into submodule path '%s' failed"
-msgstr ""
-
-#: builtin/submodule--helper.c:1831
-#, c-format
-msgid "directory not empty: '%s'"
-msgstr ""
-
-#: builtin/submodule--helper.c:1843
-#, c-format
-msgid "could not get submodule directory for '%s'"
-msgstr ""
-
-#: builtin/submodule--helper.c:1876
-msgid "where the new submodule will be cloned to"
-msgstr ""
-
-#: builtin/submodule--helper.c:1879
-msgid "name of the new submodule"
-msgstr ""
-
-#: builtin/submodule--helper.c:1882
-msgid "url where to clone the submodule from"
-msgstr ""
-
-#: builtin/submodule--helper.c:1890 builtin/submodule--helper.c:3383
-msgid "depth for shallow clones"
-msgstr ""
-
-#: builtin/submodule--helper.c:1893 builtin/submodule--helper.c:2731
-#: builtin/submodule--helper.c:3376
-msgid "force cloning progress"
-msgstr ""
-
-#: builtin/submodule--helper.c:1895 builtin/submodule--helper.c:2733
-msgid "disallow cloning into non-empty directory"
-msgstr ""
-
-#: builtin/submodule--helper.c:1903
-msgid ""
-"git submodule--helper clone [--prefix=<path>] [--quiet] [--reference "
-"<repository>] [--name <name>] [--depth <depth>] [--single-branch] [--filter "
-"<filter-spec>] --url <url> --path <path>"
-msgstr ""
-
-#: builtin/submodule--helper.c:1943
-#, c-format
-msgid "Invalid update mode '%s' for submodule path '%s'"
-msgstr ""
-
-#: builtin/submodule--helper.c:1947
-#, c-format
-msgid "Invalid update mode '%s' configured for submodule path '%s'"
-msgstr ""
-
-#: builtin/submodule--helper.c:2041
-#, c-format
-msgid "Submodule path '%s' not initialized"
-msgstr ""
-
-#: builtin/submodule--helper.c:2045
-msgid "Maybe you want to use 'update --init'?"
-msgstr ""
-
-#: builtin/submodule--helper.c:2075
-#, c-format
-msgid "Skipping unmerged submodule %s"
-msgstr ""
-
-#: builtin/submodule--helper.c:2104
-#, c-format
-msgid "Skipping submodule '%s'"
-msgstr ""
-
-#: builtin/submodule--helper.c:2257
-#, c-format
-msgid "Failed to clone '%s'. Retry scheduled"
-msgstr ""
-
-#: builtin/submodule--helper.c:2268
-#, c-format
-msgid "Failed to clone '%s' a second time, aborting"
-msgstr ""
-
-#: builtin/submodule--helper.c:2371
-#, c-format
-msgid "Unable to checkout '%s' in submodule path '%s'"
-msgstr ""
-
-#: builtin/submodule--helper.c:2375
-#, c-format
-msgid "Unable to rebase '%s' in submodule path '%s'"
-msgstr ""
-
-#: builtin/submodule--helper.c:2379
-#, c-format
-msgid "Unable to merge '%s' in submodule path '%s'"
-msgstr ""
-
-#: builtin/submodule--helper.c:2383
-#, c-format
-msgid "Execution of '%s %s' failed in submodule path '%s'"
-msgstr ""
-
-#: builtin/submodule--helper.c:2402
-#, c-format
-msgid "Submodule path '%s': checked out '%s'\n"
-msgstr ""
-
-#: builtin/submodule--helper.c:2406
-#, c-format
-msgid "Submodule path '%s': rebased into '%s'\n"
-msgstr ""
-
-#: builtin/submodule--helper.c:2410
-#, c-format
-msgid "Submodule path '%s': merged in '%s'\n"
-msgstr ""
-
-#: builtin/submodule--helper.c:2414
-#, c-format
-msgid "Submodule path '%s': '%s %s'\n"
-msgstr ""
-
-#: builtin/submodule--helper.c:2438
-#, c-format
-msgid "Unable to fetch in submodule path '%s'; trying to directly fetch %s:"
-msgstr ""
-
-#: builtin/submodule--helper.c:2447
-#, 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:2481
-#, 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:2499
-#, c-format
-msgid "could not get a repository handle for submodule '%s'"
-msgstr ""
-
-#: builtin/submodule--helper.c:2588
-#, c-format
-msgid "Unable to find current revision in submodule path '%s'"
-msgstr ""
-
-#: builtin/submodule--helper.c:2599
-#, c-format
-msgid "Unable to fetch in submodule path '%s'"
-msgstr ""
-
-#: builtin/submodule--helper.c:2604
-#, c-format
-msgid "Unable to find %s revision in submodule path '%s'"
-msgstr ""
-
-#: builtin/submodule--helper.c:2640
-#, c-format
-msgid "Failed to recurse into submodule path '%s'"
-msgstr ""
-
-#: builtin/submodule--helper.c:2699
-msgid "force checkout updates"
-msgstr ""
-
-#: builtin/submodule--helper.c:2701
-msgid "initialize uninitialized submodules before update"
-msgstr ""
-
-#: builtin/submodule--helper.c:2703
-msgid "use SHA-1 of submodule's remote tracking branch"
-msgstr ""
-
-#: builtin/submodule--helper.c:2705
-msgid "traverse submodules recursively"
-msgstr ""
-
-#: builtin/submodule--helper.c:2707
-msgid "don't fetch new objects from the remote site"
-msgstr ""
-
-#: builtin/submodule--helper.c:2710 builtin/submodule--helper.c:2892
-msgid "path into the working tree"
-msgstr ""
-
-#: builtin/submodule--helper.c:2713
-msgid "path into the working tree, across nested submodule boundaries"
-msgstr ""
-
-#: builtin/submodule--helper.c:2717
-msgid "rebase, merge, checkout or none"
-msgstr ""
-
-#: builtin/submodule--helper.c:2723
-msgid "create a shallow clone truncated to the specified number of revisions"
-msgstr ""
-
-#: builtin/submodule--helper.c:2726
-msgid "parallel jobs"
-msgstr ""
-
-#: builtin/submodule--helper.c:2728
-msgid "whether the initial clone should follow the shallow recommendation"
-msgstr ""
-
-#: builtin/submodule--helper.c:2729
-msgid "don't print cloning progress"
-msgstr ""
-
-#: builtin/submodule--helper.c:2741
-msgid ""
-"git submodule [--quiet] update [--init [--filter=<filter-spec>]] [--remote] "
-"[-N|--no-fetch] [-f|--force] [--checkout|--merge|--rebase] [--[no-]recommend-"
-"shallow] [--reference <repository>] [--recursive] [--[no-]single-branch] "
-"[--] [<path>...]"
-msgstr ""
-
-#: builtin/submodule--helper.c:2767
-msgid "bad value for update parameter"
-msgstr ""
-
-#: builtin/submodule--helper.c:2893
-msgid "recurse into submodules"
-msgstr ""
-
-#: builtin/submodule--helper.c:2899
-msgid "git submodule--helper absorb-git-dirs [<options>] [<path>...]"
-msgstr ""
-
-#: builtin/submodule--helper.c:2955
-msgid "check if it is safe to write to the .gitmodules file"
-msgstr ""
-
-#: builtin/submodule--helper.c:2958
-msgid "unset the config in the .gitmodules file"
-msgstr ""
-
-#: builtin/submodule--helper.c:2963
-msgid "git submodule--helper config <name> [<value>]"
-msgstr ""
-
-#: builtin/submodule--helper.c:2964
-msgid "git submodule--helper config --unset <name>"
-msgstr ""
-
-#: builtin/submodule--helper.c:2984 builtin/submodule--helper.c:3238
-#: builtin/submodule--helper.c:3395
-msgid "please make sure that the .gitmodules file is in the working tree"
-msgstr ""
-
-#: builtin/submodule--helper.c:3000
-msgid "suppress output for setting url of a submodule"
-msgstr ""
-
-#: builtin/submodule--helper.c:3004
-msgid "git submodule--helper set-url [--quiet] <path> <newurl>"
-msgstr ""
-
-#: builtin/submodule--helper.c:3037
-msgid "set the default tracking branch to master"
-msgstr ""
-
-#: builtin/submodule--helper.c:3039
-msgid "set the default tracking branch"
-msgstr ""
-
-#: builtin/submodule--helper.c:3043
-msgid "git submodule--helper set-branch [-q|--quiet] (-d|--default) <path>"
-msgstr ""
-
-#: builtin/submodule--helper.c:3044
-msgid ""
-"git submodule--helper set-branch [-q|--quiet] (-b|--branch) <branch> <path>"
-msgstr ""
-
-#: builtin/submodule--helper.c:3051
-msgid "--branch or --default required"
-msgstr ""
-
-#: builtin/submodule--helper.c:3072 builtin/submodule--helper.c:3375
-msgid "print only error messages"
-msgstr ""
-
-#: builtin/submodule--helper.c:3073
-msgid "force creation"
-msgstr ""
-
-#: builtin/submodule--helper.c:3081
-msgid "show whether the branch would be created"
-msgstr ""
-
-#: builtin/submodule--helper.c:3085
-msgid ""
-"git submodule--helper create-branch [-f|--force] [--create-reflog] [-q|--"
-"quiet] [-t|--track] [-n|--dry-run] <name> <start-oid> <start-name>"
-msgstr ""
-
-#: builtin/submodule--helper.c:3097
-#, c-format
-msgid "creating branch '%s'"
-msgstr ""
-
-#: builtin/submodule--helper.c:3155
-#, c-format
-msgid "Adding existing repo at '%s' to the index\n"
-msgstr ""
-
-#: builtin/submodule--helper.c:3158
-#, c-format
-msgid "'%s' already exists and is not a valid git repo"
-msgstr ""
-
-#: builtin/submodule--helper.c:3171
-#, c-format
-msgid "A git directory for '%s' is found locally with remote(s):\n"
-msgstr ""
-
-#: builtin/submodule--helper.c:3178
-#, 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 ""
-
-#: builtin/submodule--helper.c:3190
-#, c-format
-msgid "Reactivating local git directory for submodule '%s'\n"
-msgstr ""
-
-#: builtin/submodule--helper.c:3227
-#, c-format
-msgid "unable to checkout submodule '%s'"
-msgstr ""
-
-#: builtin/submodule--helper.c:3266
-#, c-format
-msgid "Failed to add submodule '%s'"
-msgstr ""
-
-#: builtin/submodule--helper.c:3270 builtin/submodule--helper.c:3275
-#: builtin/submodule--helper.c:3283
-#, c-format
-msgid "Failed to register submodule '%s'"
-msgstr ""
-
-#: builtin/submodule--helper.c:3339
-#, c-format
-msgid "'%s' already exists in the index"
-msgstr ""
-
-#: builtin/submodule--helper.c:3342
-#, c-format
-msgid "'%s' already exists in the index and is not a submodule"
-msgstr ""
-
-#: builtin/submodule--helper.c:3372
-msgid "branch of repository to add as submodule"
-msgstr ""
-
-#: builtin/submodule--helper.c:3373
-msgid "allow adding an otherwise ignored submodule path"
-msgstr ""
-
-#: builtin/submodule--helper.c:3379
-msgid "borrow the objects from reference repositories"
-msgstr ""
-
-#: builtin/submodule--helper.c:3381
-msgid ""
-"sets the submodule’s name to the given string instead of defaulting to its "
-"path"
-msgstr ""
-
-#: builtin/submodule--helper.c:3388
-msgid "git submodule--helper add [<options>] [--] <repository> [<path>]"
-msgstr ""
-
-#: builtin/submodule--helper.c:3416
-msgid "Relative path can only be used from the toplevel of the working tree"
-msgstr ""
-
-#: builtin/submodule--helper.c:3425
-#, c-format
-msgid "repo URL: '%s' must be absolute or begin with ./|../"
-msgstr ""
-
-#: builtin/submodule--helper.c:3460
-#, c-format
-msgid "'%s' is not a valid submodule name"
-msgstr ""
-
-#: builtin/submodule--helper.c:3520 git.c:453 git.c:729
-#, c-format
-msgid "%s doesn't support --super-prefix"
-msgstr ""
-
-#: builtin/submodule--helper.c:3526
-#, c-format
-msgid "'%s' is not a valid submodule--helper subcommand"
-msgstr ""
-
-#: builtin/symbolic-ref.c:8
-msgid "git symbolic-ref [<options>] <name> [<ref>]"
-msgstr ""
-
-#: builtin/symbolic-ref.c:9
-msgid "git symbolic-ref -d [-q] <name>"
-msgstr ""
-
-#: builtin/symbolic-ref.c:42
-msgid "suppress error message for non-symbolic (detached) refs"
-msgstr ""
-
-#: builtin/symbolic-ref.c:43
-msgid "delete symbolic ref"
-msgstr ""
-
-#: builtin/symbolic-ref.c:44
-msgid "shorten ref output"
-msgstr ""
-
-#: builtin/symbolic-ref.c:45 builtin/update-ref.c:505
-msgid "reason"
-msgstr ""
-
-#: builtin/symbolic-ref.c:45 builtin/update-ref.c:505
-msgid "reason of the update"
-msgstr ""
-
-#: builtin/tag.c:26
-msgid ""
-"git tag [-a | -s | -u <key-id>] [-f] [-m <msg> | -F <file>]\n"
-"        <tagname> [<head>]"
-msgstr ""
-
-#: builtin/tag.c:28
-msgid "git tag -d <tagname>..."
-msgstr ""
-
-#: builtin/tag.c:29
-msgid ""
-"git tag -l [-n[<num>]] [--contains <commit>] [--no-contains <commit>] [--"
-"points-at <object>]\n"
-"        [--format=<format>] [--merged <commit>] [--no-merged <commit>] "
-"[<pattern>...]"
-msgstr ""
-
-#: builtin/tag.c:31
-msgid "git tag -v [--format=<format>] <tagname>..."
-msgstr ""
-
-#: builtin/tag.c:101
-#, c-format
-msgid "tag '%s' not found."
-msgstr ""
-
-#: builtin/tag.c:136
-#, c-format
-msgid "Deleted tag '%s' (was %s)\n"
-msgstr ""
-
-#: builtin/tag.c:171
-#, c-format
-msgid ""
-"\n"
-"Write a message for tag:\n"
-"  %s\n"
-"Lines starting with '%c' will be ignored.\n"
-msgstr ""
-
-#: builtin/tag.c:175
-#, c-format
-msgid ""
-"\n"
-"Write a message for tag:\n"
-"  %s\n"
-"Lines starting with '%c' will be kept; you may remove them yourself if you "
-"want to.\n"
-msgstr ""
-
-#: builtin/tag.c:241
-msgid "unable to sign the tag"
-msgstr ""
-
-#: builtin/tag.c:259
-#, c-format
-msgid ""
-"You have created a nested tag. The object referred to by your new tag is\n"
-"already a tag. If you meant to tag the object that it points to, use:\n"
-"\n"
-"\tgit tag -f %s %s^{}"
-msgstr ""
-
-#: builtin/tag.c:275
-msgid "bad object type."
-msgstr ""
-
-#: builtin/tag.c:326
-msgid "no tag message?"
-msgstr ""
-
-#: builtin/tag.c:333
-#, c-format
-msgid "The tag message has been left in %s\n"
-msgstr ""
-
-#: builtin/tag.c:445
-msgid "list tag names"
-msgstr ""
-
-#: builtin/tag.c:447
-msgid "print <n> lines of each tag message"
-msgstr ""
-
-#: builtin/tag.c:449
-msgid "delete tags"
-msgstr ""
-
-#: builtin/tag.c:450
-msgid "verify tags"
-msgstr ""
-
-#: builtin/tag.c:452
-msgid "Tag creation options"
-msgstr ""
-
-#: builtin/tag.c:454
-msgid "annotated tag, needs a message"
-msgstr ""
-
-#: builtin/tag.c:456
-msgid "tag message"
-msgstr ""
-
-#: builtin/tag.c:458
-msgid "force edit of tag message"
-msgstr ""
-
-#: builtin/tag.c:459
-msgid "annotated and GPG-signed tag"
-msgstr ""
-
-#: builtin/tag.c:462
-msgid "use another key to sign the tag"
-msgstr ""
-
-#: builtin/tag.c:463
-msgid "replace the tag if exists"
-msgstr ""
-
-#: builtin/tag.c:464 builtin/update-ref.c:511
-msgid "create a reflog"
-msgstr ""
-
-#: builtin/tag.c:466
-msgid "Tag listing options"
-msgstr ""
-
-#: builtin/tag.c:467
-msgid "show tag list in columns"
-msgstr ""
-
-#: builtin/tag.c:468 builtin/tag.c:470
-msgid "print only tags that contain the commit"
-msgstr ""
-
-#: builtin/tag.c:469 builtin/tag.c:471
-msgid "print only tags that don't contain the commit"
-msgstr ""
-
-#: builtin/tag.c:472
-msgid "print only tags that are merged"
-msgstr ""
-
-#: builtin/tag.c:473
-msgid "print only tags that are not merged"
-msgstr ""
-
-#: builtin/tag.c:477
-msgid "print only tags of the object"
-msgstr ""
-
-#: builtin/tag.c:559
-#, c-format
-msgid "the '%s' option is only allowed in list mode"
-msgstr ""
-
-#: builtin/tag.c:598
-#, c-format
-msgid "'%s' is not a valid tag name."
-msgstr ""
-
-#: builtin/tag.c:603
-#, c-format
-msgid "tag '%s' already exists"
-msgstr ""
-
-#: builtin/tag.c:634
-#, c-format
-msgid "Updated tag '%s' (was %s)\n"
-msgstr ""
-
-#: builtin/unpack-objects.c:95
-msgid "pack exceeds maximum allowed size"
-msgstr ""
-
-#: builtin/unpack-objects.c:504
-msgid "Unpacking objects"
-msgstr ""
-
-#: builtin/update-index.c:84
-#, c-format
-msgid "failed to create directory %s"
-msgstr ""
-
-#: builtin/update-index.c:106
-#, c-format
-msgid "failed to delete file %s"
-msgstr ""
-
-#: builtin/update-index.c:113 builtin/update-index.c:219
-#, c-format
-msgid "failed to delete directory %s"
-msgstr ""
-
-#: builtin/update-index.c:138
-#, c-format
-msgid "Testing mtime in '%s' "
-msgstr ""
-
-#: builtin/update-index.c:152
-msgid "directory stat info does not change after adding a new file"
-msgstr ""
-
-#: builtin/update-index.c:165
-msgid "directory stat info does not change after adding a new directory"
-msgstr ""
-
-#: builtin/update-index.c:178
-msgid "directory stat info changes after updating a file"
-msgstr ""
-
-#: builtin/update-index.c:189
-msgid "directory stat info changes after adding a file inside subdirectory"
-msgstr ""
-
-#: builtin/update-index.c:200
-msgid "directory stat info does not change after deleting a file"
-msgstr ""
-
-#: builtin/update-index.c:213
-msgid "directory stat info does not change after deleting a directory"
-msgstr ""
-
-#: builtin/update-index.c:220
-msgid " OK"
-msgstr ""
-
-#: builtin/update-index.c:589
-msgid "git update-index [<options>] [--] [<file>...]"
-msgstr ""
-
-#: builtin/update-index.c:993
-msgid "continue refresh even when index needs update"
-msgstr ""
-
-#: builtin/update-index.c:996
-msgid "refresh: ignore submodules"
-msgstr ""
-
-#: builtin/update-index.c:999
-msgid "do not ignore new files"
-msgstr ""
-
-#: builtin/update-index.c:1001
-msgid "let files replace directories and vice-versa"
-msgstr ""
-
-#: builtin/update-index.c:1003
-msgid "notice files missing from worktree"
-msgstr ""
-
-#: builtin/update-index.c:1005
-msgid "refresh even if index contains unmerged entries"
-msgstr ""
-
-#: builtin/update-index.c:1008
-msgid "refresh stat information"
-msgstr ""
-
-#: builtin/update-index.c:1012
-msgid "like --refresh, but ignore assume-unchanged setting"
-msgstr ""
-
-#: builtin/update-index.c:1016
-msgid "<mode>,<object>,<path>"
-msgstr ""
-
-#: builtin/update-index.c:1017
-msgid "add the specified entry to the index"
-msgstr ""
-
-#: builtin/update-index.c:1027
-msgid "mark files as \"not changing\""
-msgstr ""
-
-#: builtin/update-index.c:1030
-msgid "clear assumed-unchanged bit"
-msgstr ""
-
-#: builtin/update-index.c:1033
-msgid "mark files as \"index-only\""
-msgstr ""
-
-#: builtin/update-index.c:1036
-msgid "clear skip-worktree bit"
-msgstr ""
-
-#: builtin/update-index.c:1039
-msgid "do not touch index-only entries"
-msgstr ""
-
-#: builtin/update-index.c:1041
-msgid "add to index only; do not add content to object database"
-msgstr ""
-
-#: builtin/update-index.c:1043
-msgid "remove named paths even if present in worktree"
-msgstr ""
-
-#: builtin/update-index.c:1045
-msgid "with --stdin: input lines are terminated by null bytes"
-msgstr ""
-
-#: builtin/update-index.c:1047
-msgid "read list of paths to be updated from standard input"
-msgstr ""
-
-#: builtin/update-index.c:1051
-msgid "add entries from standard input to the index"
-msgstr ""
-
-#: builtin/update-index.c:1055
-msgid "repopulate stages #2 and #3 for the listed paths"
-msgstr ""
-
-#: builtin/update-index.c:1059
-msgid "only update entries that differ from HEAD"
-msgstr ""
-
-#: builtin/update-index.c:1063
-msgid "ignore files missing from worktree"
-msgstr ""
-
-#: builtin/update-index.c:1066
-msgid "report actions to standard output"
-msgstr ""
-
-#: builtin/update-index.c:1068
-msgid "(for porcelains) forget saved unresolved conflicts"
-msgstr ""
-
-#: builtin/update-index.c:1072
-msgid "write index in this format"
-msgstr ""
-
-#: builtin/update-index.c:1074
-msgid "enable or disable split index"
-msgstr ""
-
-#: builtin/update-index.c:1076
-msgid "enable/disable untracked cache"
-msgstr ""
-
-#: builtin/update-index.c:1078
-msgid "test if the filesystem supports untracked cache"
-msgstr ""
-
-#: builtin/update-index.c:1080
-msgid "enable untracked cache without testing the filesystem"
-msgstr ""
-
-#: builtin/update-index.c:1082
-msgid "write out the index even if is not flagged as changed"
-msgstr ""
-
-#: builtin/update-index.c:1084
-msgid "enable or disable file system monitor"
-msgstr ""
-
-#: builtin/update-index.c:1086
-msgid "mark files as fsmonitor valid"
-msgstr ""
-
-#: builtin/update-index.c:1089
-msgid "clear fsmonitor valid bit"
-msgstr ""
-
-#: builtin/update-index.c:1195
-msgid ""
-"core.splitIndex is set to false; remove or change it, if you really want to "
-"enable split index"
-msgstr ""
-
-#: builtin/update-index.c:1204
-msgid ""
-"core.splitIndex is set to true; remove or change it, if you really want to "
-"disable split index"
-msgstr ""
-
-#: builtin/update-index.c:1216
-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:1220
-msgid "Untracked cache disabled"
-msgstr ""
-
-#: builtin/update-index.c:1228
-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:1232
-#, c-format
-msgid "Untracked cache enabled for '%s'"
-msgstr ""
-
-#: builtin/update-index.c:1241
-msgid "core.fsmonitor is unset; set it if you really want to enable fsmonitor"
-msgstr ""
-
-#: builtin/update-index.c:1246
-msgid "fsmonitor enabled"
-msgstr ""
-
-#: builtin/update-index.c:1250
-msgid ""
-"core.fsmonitor is set; remove it if you really want to disable fsmonitor"
-msgstr ""
-
-#: builtin/update-index.c:1254
-msgid "fsmonitor disabled"
-msgstr ""
-
-#: builtin/update-ref.c:10
-msgid "git update-ref [<options>] -d <refname> [<old-val>]"
-msgstr ""
-
-#: builtin/update-ref.c:11
-msgid "git update-ref [<options>]    <refname> <new-val> [<old-val>]"
-msgstr ""
-
-#: builtin/update-ref.c:12
-msgid "git update-ref [<options>] --stdin [-z]"
-msgstr ""
-
-#: builtin/update-ref.c:506
-msgid "delete the reference"
-msgstr ""
-
-#: builtin/update-ref.c:508
-msgid "update <refname> not the one it points to"
-msgstr ""
-
-#: builtin/update-ref.c:509
-msgid "stdin has NUL-terminated arguments"
-msgstr ""
-
-#: builtin/update-ref.c:510
-msgid "read updates from stdin"
-msgstr ""
-
-#: builtin/update-server-info.c:15
-msgid "update the info files from scratch"
-msgstr ""
-
-#: builtin/upload-pack.c:11
-msgid "git upload-pack [<options>] <dir>"
-msgstr ""
-
-#: 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: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 ""
-
-#: builtin/verify-commit.c:19
-msgid "git verify-commit [-v | --verbose] <commit>..."
-msgstr ""
-
-#: builtin/verify-commit.c:68
-msgid "print commit contents"
-msgstr ""
-
-#: builtin/verify-commit.c:69 builtin/verify-tag.c:37
-msgid "print raw gpg status output"
-msgstr ""
-
-#: builtin/verify-pack.c:59
-msgid "git verify-pack [-v | --verbose] [-s | --stat-only] <pack>..."
-msgstr ""
-
-#: builtin/verify-pack.c:70
-msgid "verbose"
-msgstr ""
-
-#: builtin/verify-pack.c:72
-msgid "show statistics only"
-msgstr ""
-
-#: builtin/verify-tag.c:18
-msgid "git verify-tag [-v | --verbose] [--format=<format>] <tag>..."
-msgstr ""
-
-#: builtin/verify-tag.c:36
-msgid "print tag contents"
-msgstr ""
-
-#: builtin/worktree.c:19
-msgid "git worktree add [<options>] <path> [<commit-ish>]"
-msgstr ""
-
-#: builtin/worktree.c:20
-msgid "git worktree list [<options>]"
-msgstr ""
-
-#: builtin/worktree.c:21
-msgid "git worktree lock [<options>] <path>"
-msgstr ""
-
-#: builtin/worktree.c:22
-msgid "git worktree move <worktree> <new-path>"
-msgstr ""
-
-#: builtin/worktree.c:23
-msgid "git worktree prune [<options>]"
-msgstr ""
-
-#: builtin/worktree.c:24
-msgid "git worktree remove [<options>] <worktree>"
-msgstr ""
-
-#: builtin/worktree.c:25
-msgid "git worktree repair [<path>...]"
-msgstr ""
-
-#: builtin/worktree.c:26
-msgid "git worktree unlock <path>"
-msgstr ""
-
-#: builtin/worktree.c:76
-#, c-format
-msgid "Removing %s/%s: %s"
-msgstr ""
-
-#: builtin/worktree.c:149
-msgid "report pruned working trees"
-msgstr ""
-
-#: builtin/worktree.c:151
-msgid "expire working trees older than <time>"
-msgstr ""
-
-#: builtin/worktree.c:221
-#, c-format
-msgid "'%s' already exists"
-msgstr ""
-
-#: builtin/worktree.c:230
-#, c-format
-msgid "unusable worktree destination '%s'"
-msgstr ""
-
-#: builtin/worktree.c:235
-#, 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:237
-#, 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:248
-#, c-format
-msgid "failed to copy '%s' to '%s'; sparse-checkout may not work correctly"
-msgstr ""
-
-#: builtin/worktree.c:268
-#, c-format
-msgid "failed to copy worktree config from '%s' to '%s'"
-msgstr ""
-
-#: builtin/worktree.c:280 builtin/worktree.c:285
-#, c-format
-msgid "failed to unset '%s' in '%s'"
-msgstr ""
-
-#: builtin/worktree.c:356
-#, c-format
-msgid "could not create directory of '%s'"
-msgstr ""
-
-#: builtin/worktree.c:378
-msgid "initializing"
-msgstr ""
-
-#: builtin/worktree.c:492 builtin/worktree.c:498
-#, c-format
-msgid "Preparing worktree (new branch '%s')"
-msgstr ""
-
-#: builtin/worktree.c:494
-#, c-format
-msgid "Preparing worktree (resetting branch '%s'; was at %s)"
-msgstr ""
-
-#: builtin/worktree.c:503
-#, c-format
-msgid "Preparing worktree (checking out '%s')"
-msgstr ""
-
-#: builtin/worktree.c:509
-#, c-format
-msgid "Preparing worktree (detached HEAD %s)"
-msgstr ""
-
-#: builtin/worktree.c:554
-msgid "checkout <branch> even if already checked out in other worktree"
-msgstr ""
-
-#: builtin/worktree.c:557
-msgid "create a new branch"
-msgstr ""
-
-#: builtin/worktree.c:559
-msgid "create or reset a branch"
-msgstr ""
-
-#: builtin/worktree.c:561
-msgid "populate the new working tree"
-msgstr ""
-
-#: builtin/worktree.c:562
-msgid "keep the new working tree locked"
-msgstr ""
-
-#: builtin/worktree.c:564 builtin/worktree.c:809
-msgid "reason for locking"
-msgstr ""
-
-#: builtin/worktree.c:567
-msgid "set up tracking mode (see git-branch(1))"
-msgstr ""
-
-#: builtin/worktree.c:570
-msgid "try to match the new branch name with a remote-tracking branch"
-msgstr ""
-
-#: builtin/worktree.c:584
-msgid "added with --lock"
-msgstr ""
-
-#: builtin/worktree.c:646
-msgid "--[no-]track can only be used if a new branch is created"
-msgstr ""
-
-#: builtin/worktree.c:766
-msgid "show extended annotations and reasons, if available"
-msgstr ""
-
-#: builtin/worktree.c:768
-msgid "add 'prunable' annotation to worktrees older than <time>"
-msgstr ""
-
-#: builtin/worktree.c:770
-msgid "terminate records with a NUL character"
-msgstr ""
-
-#: builtin/worktree.c:821 builtin/worktree.c:854 builtin/worktree.c:928
-#: builtin/worktree.c:1052
-#, c-format
-msgid "'%s' is not a working tree"
-msgstr ""
-
-#: builtin/worktree.c:823 builtin/worktree.c:856
-msgid "The main working tree cannot be locked or unlocked"
-msgstr ""
-
-#: builtin/worktree.c:828
-#, c-format
-msgid "'%s' is already locked, reason: %s"
-msgstr ""
-
-#: builtin/worktree.c:830
-#, c-format
-msgid "'%s' is already locked"
-msgstr ""
-
-#: builtin/worktree.c:858
-#, c-format
-msgid "'%s' is not locked"
-msgstr ""
-
-#: builtin/worktree.c:899
-msgid "working trees containing submodules cannot be moved or removed"
-msgstr ""
-
-#: builtin/worktree.c:907
-msgid "force move even if worktree is dirty or locked"
-msgstr ""
-
-#: builtin/worktree.c:930 builtin/worktree.c:1054
-#, c-format
-msgid "'%s' is a main working tree"
-msgstr ""
-
-#: builtin/worktree.c:935
-#, c-format
-msgid "could not figure out destination name from '%s'"
-msgstr ""
-
-#: builtin/worktree.c:948
-#, 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:950
-msgid ""
-"cannot move a locked working tree;\n"
-"use 'move -f -f' to override or unlock first"
-msgstr ""
-
-#: builtin/worktree.c:953
-#, c-format
-msgid "validation failed, cannot move working tree: %s"
-msgstr ""
-
-#: builtin/worktree.c:958
-#, c-format
-msgid "failed to move '%s' to '%s'"
-msgstr ""
-
-#: builtin/worktree.c:1004
-#, c-format
-msgid "failed to run 'git status' on '%s'"
-msgstr ""
-
-#: builtin/worktree.c:1008
-#, c-format
-msgid "'%s' contains modified or untracked files, use --force to delete it"
-msgstr ""
-
-#: builtin/worktree.c:1013
-#, c-format
-msgid "failed to run 'git status' on '%s', code %d"
-msgstr ""
-
-#: builtin/worktree.c:1036
-msgid "force removal even if worktree is dirty or locked"
-msgstr ""
-
-#: builtin/worktree.c:1059
-#, 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:1061
-msgid ""
-"cannot remove a locked working tree;\n"
-"use 'remove -f -f' to override or unlock first"
-msgstr ""
-
-#: builtin/worktree.c:1064
-#, c-format
-msgid "validation failed, cannot remove working tree: %s"
-msgstr ""
-
-#: builtin/worktree.c:1088
-#, c-format
-msgid "repair: %s: %s"
-msgstr ""
-
-#: builtin/worktree.c:1091
-#, c-format
-msgid "error: %s: %s"
-msgstr ""
-
-#: builtin/write-tree.c:15
-msgid "git write-tree [--missing-ok] [--prefix=<prefix>/]"
-msgstr ""
-
-#: builtin/write-tree.c:28
-msgid "<prefix>/"
-msgstr ""
-
-#: builtin/write-tree.c:29
-msgid "write tree object for a subdirectory <prefix>"
-msgstr ""
-
-#: builtin/write-tree.c:31
-msgid "only useful for debugging"
-msgstr ""
-
-#: git.c:28
-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"
-"           [--git-dir=<path>] [--work-tree=<path>] [--namespace=<name>]\n"
-"           [--super-prefix=<path>] [--config-env=<name>=<envvar>]\n"
-"           <command> [<args>]"
-msgstr ""
-
-#: git.c:36
-msgid ""
-"'git help -a' and 'git help -g' list available subcommands and some\n"
-"concept guides. See 'git help <command>' or 'git help <concept>'\n"
-"to read about a specific subcommand or concept.\n"
-"See 'git help git' for an overview of the system."
-msgstr ""
-
-#: git.c:188 git.c:216 git.c:300
-#, c-format
-msgid "no directory given for '%s' option\n"
-msgstr ""
-
-#: git.c:202
-#, c-format
-msgid "no namespace given for --namespace\n"
-msgstr ""
-
-#: git.c:230
-#, c-format
-msgid "no prefix given for --super-prefix\n"
-msgstr ""
-
-#: git.c:252
-#, c-format
-msgid "-c expects a configuration string\n"
-msgstr ""
-
-#: git.c:260
-#, c-format
-msgid "no config key given for --config-env\n"
-msgstr ""
-
-#: git.c:326
-#, c-format
-msgid "unknown option: %s\n"
-msgstr ""
-
-#: git.c:375
-#, c-format
-msgid "while expanding alias '%s': '%s'"
-msgstr ""
-
-#: git.c:384
-#, c-format
-msgid ""
-"alias '%s' changes environment variables.\n"
-"You can use '!git' in the alias to do this"
-msgstr ""
-
-#: git.c:391
-#, c-format
-msgid "empty alias for %s"
-msgstr ""
-
-#: git.c:394
-#, c-format
-msgid "recursive alias: %s"
-msgstr ""
-
-#: git.c:480
-msgid "write failure on standard output"
-msgstr ""
-
-#: git.c:482
-msgid "unknown write failure on standard output"
-msgstr ""
-
-#: git.c:484
-msgid "close failed on standard output"
-msgstr ""
-
-#: git.c:838
-#, c-format
-msgid "alias loop detected: expansion of '%s' does not terminate:%s"
-msgstr ""
-
-#: git.c:888
-#, c-format
-msgid "cannot handle %s as a builtin"
-msgstr ""
-
-#: git.c:901
-#, c-format
-msgid ""
-"usage: %s\n"
-"\n"
-msgstr ""
-
-#: git.c:921
-#, c-format
-msgid "expansion of alias '%s' failed; '%s' is not a git command\n"
-msgstr ""
-
-#: git.c:933
-#, c-format
-msgid "failed to run command '%s': %s\n"
-msgstr ""
-
-#: http-fetch.c:128
-#, c-format
-msgid "argument to --packfile must be a valid hash (got '%s')"
-msgstr ""
-
-#: http-fetch.c:138
-msgid "not a git repository"
-msgstr ""
-
-#: t/helper/test-fast-rebase.c:141
-msgid "unhandled options"
-msgstr ""
-
-#: t/helper/test-fast-rebase.c:146
-msgid "error preparing revisions"
-msgstr ""
-
-#: t/helper/test-reach.c:154
-#, c-format
-msgid "commit %s is not marked reachable"
-msgstr ""
-
-#: t/helper/test-reach.c:164
-msgid "too many commits marked reachable"
-msgstr ""
-
-#: t/helper/test-serve-v2.c:7
-msgid "test-tool serve-v2 [<options>]"
-msgstr ""
-
-#: t/helper/test-serve-v2.c:19
-msgid "exit immediately after advertising capabilities"
-msgstr ""
-
-#: t/helper/test-simple-ipc.c:581
-msgid "test-helper simple-ipc is-active    [<name>] [<options>]"
-msgstr ""
-
-#: t/helper/test-simple-ipc.c:582
-msgid "test-helper simple-ipc run-daemon   [<name>] [<threads>]"
-msgstr ""
-
-#: 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:584
-msgid "test-helper simple-ipc stop-daemon  [<name>] [<max-wait>]"
-msgstr ""
-
-#: t/helper/test-simple-ipc.c:585
-msgid "test-helper simple-ipc send         [<name>] [<token>]"
-msgstr ""
-
-#: t/helper/test-simple-ipc.c:586
-msgid "test-helper simple-ipc sendbytes    [<name>] [<bytecount>] [<byte>]"
-msgstr ""
-
-#: t/helper/test-simple-ipc.c:587
-msgid ""
-"test-helper simple-ipc multiple     [<name>] [<threads>] [<bytecount>] "
-"[<batchsize>]"
-msgstr ""
-
-#: t/helper/test-simple-ipc.c:595
-msgid "name or pathname of unix domain socket"
-msgstr ""
-
-#: t/helper/test-simple-ipc.c:597
-msgid "named-pipe name"
-msgstr ""
-
-#: t/helper/test-simple-ipc.c:599
-msgid "number of threads in server thread pool"
-msgstr ""
-
-#: t/helper/test-simple-ipc.c:600
-msgid "seconds to wait for daemon to start or stop"
-msgstr ""
-
-#: t/helper/test-simple-ipc.c:602
-msgid "number of bytes"
-msgstr ""
-
-#: t/helper/test-simple-ipc.c:603
-msgid "number of requests per thread"
-msgstr ""
-
-#: t/helper/test-simple-ipc.c:605
-msgid "byte"
-msgstr ""
-
-#: t/helper/test-simple-ipc.c:605
-msgid "ballast character"
-msgstr ""
-
-#: t/helper/test-simple-ipc.c:606
-msgid "token"
-msgstr ""
-
-#: t/helper/test-simple-ipc.c:606
-msgid "command token to send to the server"
-msgstr ""
-
-#: http.c:350
-#, c-format
-msgid "negative value for http.postbuffer; defaulting to %d"
-msgstr ""
-
-#: http.c:371
-msgid "Delegation control is not supported with cURL < 7.22.0"
-msgstr ""
-
-#: http.c:380
-msgid "Public key pinning not supported with cURL < 7.39.0"
-msgstr ""
-
-#: http.c:812
-msgid "CURLSSLOPT_NO_REVOKE not supported with cURL < 7.44.0"
-msgstr ""
-
-#: http.c:1016
-#, c-format
-msgid "Unsupported SSL backend '%s'. Supported SSL backends:"
-msgstr ""
-
-#: http.c:1023
-#, c-format
-msgid "Could not set SSL backend to '%s': cURL was built without SSL backends"
-msgstr ""
-
-#: http.c:1027
-#, c-format
-msgid "Could not set SSL backend to '%s': already set"
-msgstr ""
-
-#: http.c:1876
-#, c-format
-msgid ""
-"unable to update url base from redirection:\n"
-"  asked for: %s\n"
-"   redirect: %s"
-msgstr ""
-
-#: remote-curl.c:184
-#, c-format
-msgid "invalid quoting in push-option value: '%s'"
-msgstr ""
-
-#: remote-curl.c:308
-#, c-format
-msgid "%sinfo/refs not valid: is this a git repository?"
-msgstr ""
-
-#: remote-curl.c:409
-msgid "invalid server response; expected service, got flush packet"
-msgstr ""
-
-#: remote-curl.c:440
-#, c-format
-msgid "invalid server response; got '%s'"
-msgstr ""
-
-#: remote-curl.c:500
-#, c-format
-msgid "repository '%s' not found"
-msgstr ""
-
-#: remote-curl.c:504
-#, c-format
-msgid "Authentication failed for '%s'"
-msgstr ""
-
-#: remote-curl.c:508
-#, c-format
-msgid "unable to access '%s' with http.pinnedPubkey configuration: %s"
-msgstr ""
-
-#: remote-curl.c:512
-#, c-format
-msgid "unable to access '%s': %s"
-msgstr ""
-
-#: remote-curl.c:518
-#, c-format
-msgid "redirecting to %s"
-msgstr ""
-
-#: remote-curl.c:649
-msgid "shouldn't have EOF when not gentle on EOF"
-msgstr ""
-
-#: remote-curl.c:661
-msgid "remote server sent unexpected response end packet"
-msgstr ""
-
-#: remote-curl.c:730
-msgid "unable to rewind rpc post data - try increasing http.postBuffer"
-msgstr ""
-
-#: remote-curl.c:759
-#, c-format
-msgid "remote-curl: bad line length character: %.4s"
-msgstr ""
-
-#: remote-curl.c:761
-msgid "remote-curl: unexpected response end packet"
-msgstr ""
-
-#: remote-curl.c:837
-#, c-format
-msgid "RPC failed; %s"
-msgstr ""
-
-#: remote-curl.c:877
-msgid "cannot handle pushes this big"
-msgstr ""
-
-#: remote-curl.c:990
-#, c-format
-msgid "cannot deflate request; zlib deflate error %d"
-msgstr ""
-
-#: remote-curl.c:994
-#, c-format
-msgid "cannot deflate request; zlib end error %d"
-msgstr ""
-
-#: remote-curl.c:1044
-#, c-format
-msgid "%d bytes of length header were received"
-msgstr ""
-
-#: remote-curl.c:1046
-#, c-format
-msgid "%d bytes of body are still expected"
-msgstr ""
-
-#: remote-curl.c:1135
-msgid "dumb http transport does not support shallow capabilities"
-msgstr ""
-
-#: remote-curl.c:1150
-msgid "fetch failed."
-msgstr ""
-
-#: remote-curl.c:1198
-msgid "cannot fetch by sha1 over smart http"
-msgstr ""
-
-#: remote-curl.c:1242 remote-curl.c:1248
-#, c-format
-msgid "protocol error: expected sha/ref, got '%s'"
-msgstr ""
-
-#: remote-curl.c:1260 remote-curl.c:1378
-#, c-format
-msgid "http transport does not support %s"
-msgstr ""
-
-#: remote-curl.c:1296
-msgid "git-http-push failed"
-msgstr ""
-
-#: remote-curl.c:1485
-msgid "remote-curl: usage: git remote-curl <remote> [<url>]"
-msgstr ""
-
-#: remote-curl.c:1517
-msgid "remote-curl: error reading command stream from git"
-msgstr ""
-
-#: remote-curl.c:1524
-msgid "remote-curl: fetch attempted without a local repo"
-msgstr ""
-
-#: remote-curl.c:1565
-#, c-format
-msgid "remote-curl: unknown command '%s' from git"
-msgstr ""
-
-#: contrib/scalar/scalar.c:49
-msgid "need a working directory"
-msgstr ""
-
-#: contrib/scalar/scalar.c:86
-msgid "could not find enlistment root"
-msgstr ""
-
-#: contrib/scalar/scalar.c:89 contrib/scalar/scalar.c:350
-#: contrib/scalar/scalar.c:435 contrib/scalar/scalar.c:578
-#, c-format
-msgid "could not switch to '%s'"
-msgstr ""
-
-#: contrib/scalar/scalar.c:179
-#, c-format
-msgid "could not configure %s=%s"
-msgstr ""
-
-#: contrib/scalar/scalar.c:197
-msgid "could not configure log.excludeDecoration"
-msgstr ""
-
-#: contrib/scalar/scalar.c:218
-msgid "Scalar enlistments require a worktree"
-msgstr ""
-
-#: contrib/scalar/scalar.c:310
-#, c-format
-msgid "remote HEAD is not a branch: '%.*s'"
-msgstr ""
-
-#: contrib/scalar/scalar.c:316
-msgid "failed to get default branch name from remote; using local default"
-msgstr ""
-
-#: contrib/scalar/scalar.c:329
-msgid "failed to get default branch name"
-msgstr ""
-
-#: contrib/scalar/scalar.c:340
-msgid "failed to unregister repository"
-msgstr ""
-
-#: contrib/scalar/scalar.c:355
-msgid "failed to delete enlistment directory"
-msgstr ""
-
-#: contrib/scalar/scalar.c:375
-msgid "branch to checkout after clone"
-msgstr ""
-
-#: contrib/scalar/scalar.c:377
-msgid "when cloning, create full working directory"
-msgstr ""
-
-#: contrib/scalar/scalar.c:379
-msgid "only download metadata for the branch that will be checked out"
-msgstr ""
-
-#: contrib/scalar/scalar.c:384
-msgid "scalar clone [<options>] [--] <repo> [<dir>]"
-msgstr ""
-
-#: contrib/scalar/scalar.c:409
-#, c-format
-msgid "cannot deduce worktree name from '%s'"
-msgstr ""
-
-#: contrib/scalar/scalar.c:418
-#, c-format
-msgid "directory '%s' exists already"
-msgstr ""
-
-#: contrib/scalar/scalar.c:445
-#, c-format
-msgid "failed to get default branch for '%s'"
-msgstr ""
-
-#: contrib/scalar/scalar.c:456
-#, c-format
-msgid "could not configure remote in '%s'"
-msgstr ""
-
-#: contrib/scalar/scalar.c:465
-#, c-format
-msgid "could not configure '%s'"
-msgstr ""
-
-#: contrib/scalar/scalar.c:468
-msgid "partial clone failed; attempting full clone"
-msgstr ""
-
-#: contrib/scalar/scalar.c:472
-msgid "could not configure for full clone"
-msgstr ""
-
-#: contrib/scalar/scalar.c:504
-msgid "`scalar list` does not take arguments"
-msgstr ""
-
-#: contrib/scalar/scalar.c:517
-msgid "scalar register [<enlistment>]"
-msgstr ""
-
-#: contrib/scalar/scalar.c:544
-msgid "reconfigure all registered enlistments"
-msgstr ""
-
-#: contrib/scalar/scalar.c:548
-msgid "scalar reconfigure [--all | <enlistment>]"
-msgstr ""
-
-#: contrib/scalar/scalar.c:566
-msgid "--all or <enlistment>, but not both"
-msgstr ""
-
-#: contrib/scalar/scalar.c:581
-#, c-format
-msgid "git repository gone in '%s'"
-msgstr ""
-
-#: contrib/scalar/scalar.c:621
-msgid ""
-"scalar run <task> [<enlistment>]\n"
-"Tasks:\n"
-msgstr ""
-
-#: contrib/scalar/scalar.c:639
-#, c-format
-msgid "no such task: '%s'"
-msgstr ""
-
-#: contrib/scalar/scalar.c:689
-msgid "scalar unregister [<enlistment>]"
-msgstr ""
-
-#: contrib/scalar/scalar.c:736
-msgid "scalar delete <enlistment>"
-msgstr ""
-
-#: contrib/scalar/scalar.c:751
-msgid "refusing to delete current working directory"
-msgstr ""
-
-#: contrib/scalar/scalar.c:766
-msgid "include Git version"
-msgstr ""
-
-#: contrib/scalar/scalar.c:768
-msgid "include Git's build options"
-msgstr ""
-
-#: contrib/scalar/scalar.c:772
-msgid "scalar verbose [-v | --verbose] [--build-options]"
-msgstr ""
-
-#: contrib/scalar/scalar.c:813
-msgid "-C requires a <directory>"
-msgstr ""
-
-#: contrib/scalar/scalar.c:815
-#, c-format
-msgid "could not change to '%s'"
-msgstr ""
-
-#: contrib/scalar/scalar.c:821
-msgid "-c requires a <key>=<value> argument"
-msgstr ""
-
-#: contrib/scalar/scalar.c:839
-msgid ""
-"scalar [-C <directory>] [-c <key>=<value>] <command> [<options>]\n"
-"\n"
-"Commands:\n"
-msgstr ""
-
-#: compat/compiler.h:26
-msgid "no compiler information available\n"
-msgstr ""
-
-#: compat/compiler.h:38
-msgid "no libc information available\n"
-msgstr ""
-
-#: list-objects-filter-options.h:126
-msgid "args"
-msgstr ""
-
-#: list-objects-filter-options.h:127
-msgid "object filtering"
-msgstr ""
-
-#: parse-options.h:188
-msgid "expiry-date"
-msgstr ""
-
-#: parse-options.h:202
-msgid "no-op (backward compatibility)"
-msgstr ""
-
-#: parse-options.h:341
-msgid "be more verbose"
-msgstr ""
-
-#: parse-options.h:343
-msgid "be more quiet"
-msgstr ""
-
-#: parse-options.h:349
-msgid "use <n> digits to display object names"
-msgstr ""
-
-#: parse-options.h:368
-msgid "how to strip spaces and #comments from message"
-msgstr ""
-
-#: parse-options.h:369
-msgid "read pathspec from file"
-msgstr ""
-
-#: parse-options.h:370
-msgid ""
-"with --pathspec-from-file, pathspec elements are separated with NUL character"
-msgstr ""
-
-#: ref-filter.h:98
-msgid "key"
-msgstr ""
-
-#: ref-filter.h:98
-msgid "field name to sort on"
-msgstr ""
-
-#: rerere.h:44
-msgid "update the index with reused conflict resolution if possible"
-msgstr ""
-
-#: command-list.h:50
-msgid "Add file contents to the index"
-msgstr ""
-
-#: command-list.h:51
-msgid "Apply a series of patches from a mailbox"
-msgstr ""
-
-#: command-list.h:52
-msgid "Annotate file lines with commit information"
-msgstr ""
-
-#: command-list.h:53
-msgid "Apply a patch to files and/or to the index"
-msgstr ""
-
-#: command-list.h:54
-msgid "Import a GNU Arch repository into Git"
-msgstr ""
-
-#: command-list.h:55
-msgid "Create an archive of files from a named tree"
-msgstr ""
-
-#: command-list.h:56
-msgid "Use binary search to find the commit that introduced a bug"
-msgstr ""
-
-#: command-list.h:57
-msgid "Show what revision and author last modified each line of a file"
-msgstr ""
-
-#: command-list.h:58
-msgid "List, create, or delete branches"
-msgstr ""
-
-#: command-list.h:59
-msgid "Collect information for user to file a bug report"
-msgstr ""
-
-#: command-list.h:60
-msgid "Move objects and refs by archive"
-msgstr ""
-
-#: command-list.h:61
-msgid "Provide content or type and size information for repository objects"
-msgstr ""
-
-#: command-list.h:62
-msgid "Display gitattributes information"
-msgstr ""
-
-#: command-list.h:63
-msgid "Debug gitignore / exclude files"
-msgstr ""
-
-#: command-list.h:64
-msgid "Show canonical names and email addresses of contacts"
-msgstr ""
-
-#: command-list.h:65
-msgid "Ensures that a reference name is well formed"
-msgstr ""
-
-#: command-list.h:66
-msgid "Switch branches or restore working tree files"
-msgstr ""
-
-#: command-list.h:67
-msgid "Copy files from the index to the working tree"
-msgstr ""
-
-#: command-list.h:68
-msgid "Find commits yet to be applied to upstream"
-msgstr ""
-
-#: command-list.h:69
-msgid "Apply the changes introduced by some existing commits"
-msgstr ""
-
-#: command-list.h:70
-msgid "Graphical alternative to git-commit"
-msgstr ""
-
-#: command-list.h:71
-msgid "Remove untracked files from the working tree"
-msgstr ""
-
-#: command-list.h:72
-msgid "Clone a repository into a new directory"
-msgstr ""
-
-#: command-list.h:73
-msgid "Display data in columns"
-msgstr ""
-
-#: command-list.h:74
-msgid "Record changes to the repository"
-msgstr ""
-
-#: command-list.h:75
-msgid "Write and verify Git commit-graph files"
-msgstr ""
-
-#: command-list.h:76
-msgid "Create a new commit object"
-msgstr ""
-
-#: command-list.h:77
-msgid "Get and set repository or global options"
-msgstr ""
-
-#: command-list.h:78
-msgid "Count unpacked number of objects and their disk consumption"
-msgstr ""
-
-#: command-list.h:79
-msgid "Retrieve and store user credentials"
-msgstr ""
-
-#: command-list.h:80
-msgid "Helper to temporarily store passwords in memory"
-msgstr ""
-
-#: command-list.h:81
-msgid "Helper to store credentials on disk"
-msgstr ""
-
-#: command-list.h:82
-msgid "Export a single commit to a CVS checkout"
-msgstr ""
-
-#: command-list.h:83
-msgid "Salvage your data out of another SCM people love to hate"
-msgstr ""
-
-#: command-list.h:84
-msgid "A CVS server emulator for Git"
-msgstr ""
-
-#: command-list.h:85
-msgid "A really simple server for Git repositories"
-msgstr ""
-
-#: command-list.h:86
-msgid "Give an object a human readable name based on an available ref"
-msgstr ""
-
-#: command-list.h:87
-msgid "Show changes between commits, commit and working tree, etc"
-msgstr ""
-
-#: command-list.h:88
-msgid "Compares files in the working tree and the index"
-msgstr ""
-
-#: command-list.h:89
-msgid "Compare a tree to the working tree or index"
-msgstr ""
-
-#: command-list.h:90
-msgid "Compares the content and mode of blobs found via two tree objects"
-msgstr ""
-
-#: command-list.h:91
-msgid "Show changes using common diff tools"
-msgstr ""
-
-#: command-list.h:92
-msgid "Git data exporter"
-msgstr ""
-
-#: command-list.h:93
-msgid "Backend for fast Git data importers"
-msgstr ""
-
-#: command-list.h:94
-msgid "Download objects and refs from another repository"
-msgstr ""
-
-#: command-list.h:95
-msgid "Receive missing objects from another repository"
-msgstr ""
-
-#: command-list.h:96
-msgid "Rewrite branches"
-msgstr ""
-
-#: command-list.h:97
-msgid "Produce a merge commit message"
-msgstr ""
-
-#: command-list.h:98
-msgid "Output information on each ref"
-msgstr ""
-
-#: command-list.h:99
-msgid "Run a Git command on a list of repositories"
-msgstr ""
-
-#: command-list.h:100
-msgid "Prepare patches for e-mail submission"
-msgstr ""
-
-#: command-list.h:101
-msgid "Verifies the connectivity and validity of the objects in the database"
-msgstr ""
-
-#: command-list.h:102
-msgid "Cleanup unnecessary files and optimize the local repository"
-msgstr ""
-
-#: command-list.h:103
-msgid "Extract commit ID from an archive created using git-archive"
-msgstr ""
-
-#: command-list.h:104
-msgid "Print lines matching a pattern"
-msgstr ""
-
-#: command-list.h:105
-msgid "A portable graphical interface to Git"
-msgstr ""
-
-#: command-list.h:106
-msgid "Compute object ID and optionally creates a blob from a file"
-msgstr ""
-
-#: command-list.h:107
-msgid "Display help information about Git"
-msgstr ""
-
-#: command-list.h:108
-msgid "Run git hooks"
-msgstr ""
-
-#: command-list.h:109
-msgid "Server side implementation of Git over HTTP"
-msgstr ""
-
-#: command-list.h:110
-msgid "Download from a remote Git repository via HTTP"
-msgstr ""
-
-#: command-list.h:111
-msgid "Push objects over HTTP/DAV to another repository"
-msgstr ""
-
-#: command-list.h:112
-msgid "Send a collection of patches from stdin to an IMAP folder"
-msgstr ""
-
-#: command-list.h:113
-msgid "Build pack index file for an existing packed archive"
-msgstr ""
-
-#: command-list.h:114
-msgid "Create an empty Git repository or reinitialize an existing one"
-msgstr ""
-
-#: command-list.h:115
-msgid "Instantly browse your working repository in gitweb"
-msgstr ""
-
-#: command-list.h:116
-msgid "Add or parse structured information in commit messages"
-msgstr ""
-
-#: command-list.h:117
-msgid "Show commit logs"
-msgstr ""
-
-#: command-list.h:118
-msgid "Show information about files in the index and the working tree"
-msgstr ""
-
-#: command-list.h:119
-msgid "List references in a remote repository"
-msgstr ""
-
-#: command-list.h:120
-msgid "List the contents of a tree object"
-msgstr ""
-
-#: command-list.h:121
-msgid "Extracts patch and authorship from a single e-mail message"
-msgstr ""
-
-#: command-list.h:122
-msgid "Simple UNIX mbox splitter program"
-msgstr ""
-
-#: command-list.h:123
-msgid "Run tasks to optimize Git repository data"
-msgstr ""
-
-#: command-list.h:124
-msgid "Join two or more development histories together"
-msgstr ""
-
-#: command-list.h:125
-msgid "Find as good common ancestors as possible for a merge"
-msgstr ""
-
-#: command-list.h:126
-msgid "Run a three-way file merge"
-msgstr ""
-
-#: command-list.h:127
-msgid "Run a merge for files needing merging"
-msgstr ""
-
-#: command-list.h:128
-msgid "The standard helper program to use with git-merge-index"
-msgstr ""
-
-#: command-list.h:129
-msgid "Show three-way merge without touching index"
-msgstr ""
-
-#: command-list.h:130
-msgid "Run merge conflict resolution tools to resolve merge conflicts"
-msgstr ""
-
-#: command-list.h:131
-msgid "Creates a tag object with extra validation"
-msgstr ""
-
-#: command-list.h:132
-msgid "Build a tree-object from ls-tree formatted text"
-msgstr ""
-
-#: command-list.h:133
-msgid "Write and verify multi-pack-indexes"
-msgstr ""
-
-#: command-list.h:134
-msgid "Move or rename a file, a directory, or a symlink"
-msgstr ""
-
-#: command-list.h:135
-msgid "Find symbolic names for given revs"
-msgstr ""
-
-#: command-list.h:136
-msgid "Add or inspect object notes"
-msgstr ""
-
-#: command-list.h:137
-msgid "Import from and submit to Perforce repositories"
-msgstr ""
-
-#: command-list.h:138
-msgid "Create a packed archive of objects"
-msgstr ""
-
-#: command-list.h:139
-msgid "Find redundant pack files"
-msgstr ""
-
-#: command-list.h:140
-msgid "Pack heads and tags for efficient repository access"
-msgstr ""
-
-#: command-list.h:141
-msgid "Compute unique ID for a patch"
-msgstr ""
-
-#: command-list.h:142
-msgid "Prune all unreachable objects from the object database"
-msgstr ""
-
-#: command-list.h:143
-msgid "Remove extra objects that are already in pack files"
-msgstr ""
-
-#: command-list.h:144
-msgid "Fetch from and integrate with another repository or a local branch"
-msgstr ""
-
-#: command-list.h:145
-msgid "Update remote refs along with associated objects"
-msgstr ""
-
-#: command-list.h:146
-msgid "Applies a quilt patchset onto the current branch"
-msgstr ""
-
-#: command-list.h:147
-msgid "Compare two commit ranges (e.g. two versions of a branch)"
-msgstr ""
-
-#: command-list.h:148
-msgid "Reads tree information into the index"
-msgstr ""
-
-#: command-list.h:149
-msgid "Reapply commits on top of another base tip"
-msgstr ""
-
-#: command-list.h:150
-msgid "Receive what is pushed into the repository"
-msgstr ""
-
-#: command-list.h:151
-msgid "Manage reflog information"
-msgstr ""
-
-#: command-list.h:152
-msgid "Manage set of tracked repositories"
-msgstr ""
-
-#: command-list.h:153
-msgid "Pack unpacked objects in a repository"
-msgstr ""
-
-#: command-list.h:154
-msgid "Create, list, delete refs to replace objects"
-msgstr ""
-
-#: command-list.h:155
-msgid "Generates a summary of pending changes"
-msgstr ""
-
-#: command-list.h:156
-msgid "Reuse recorded resolution of conflicted merges"
-msgstr ""
-
-#: command-list.h:157
-msgid "Reset current HEAD to the specified state"
-msgstr ""
-
-#: command-list.h:158
-msgid "Restore working tree files"
-msgstr ""
-
-#: command-list.h:159
-msgid "Lists commit objects in reverse chronological order"
-msgstr ""
-
-#: command-list.h:160
-msgid "Pick out and massage parameters"
-msgstr ""
-
-#: command-list.h:161
-msgid "Revert some existing commits"
-msgstr ""
-
-#: command-list.h:162
-msgid "Remove files from the working tree and from the index"
-msgstr ""
-
-#: command-list.h:163
-msgid "Send a collection of patches as emails"
-msgstr ""
-
-#: command-list.h:164
-msgid "Push objects over Git protocol to another repository"
-msgstr ""
-
-#: command-list.h:165
-msgid "Git's i18n setup code for shell scripts"
-msgstr ""
-
-#: command-list.h:166
-msgid "Common Git shell script setup code"
-msgstr ""
-
-#: command-list.h:167
-msgid "Restricted login shell for Git-only SSH access"
-msgstr ""
-
-#: command-list.h:168
-msgid "Summarize 'git log' output"
-msgstr ""
-
-#: command-list.h:169
-msgid "Show various types of objects"
-msgstr ""
-
-#: command-list.h:170
-msgid "Show branches and their commits"
-msgstr ""
-
-#: command-list.h:171
-msgid "Show packed archive index"
-msgstr ""
-
-#: command-list.h:172
-msgid "List references in a local repository"
-msgstr ""
-
-#: command-list.h:173
-msgid "Reduce your working tree to a subset of tracked files"
-msgstr ""
-
-#: command-list.h:174
-msgid "Add file contents to the staging area"
-msgstr ""
-
-#: command-list.h:175
-msgid "Stash the changes in a dirty working directory away"
-msgstr ""
-
-#: command-list.h:176
-msgid "Show the working tree status"
-msgstr ""
-
-#: command-list.h:177
-msgid "Remove unnecessary whitespace"
-msgstr ""
-
-#: command-list.h:178
-msgid "Initialize, update or inspect submodules"
-msgstr ""
-
-#: command-list.h:179
-msgid "Bidirectional operation between a Subversion repository and Git"
-msgstr ""
-
-#: command-list.h:180
-msgid "Switch branches"
-msgstr ""
-
-#: command-list.h:181
-msgid "Read, modify and delete symbolic refs"
-msgstr ""
-
-#: command-list.h:182
-msgid "Create, list, delete or verify a tag object signed with GPG"
-msgstr ""
-
-#: command-list.h:183
-msgid "Creates a temporary file with a blob's contents"
-msgstr ""
-
-#: command-list.h:184
-msgid "Unpack objects from a packed archive"
-msgstr ""
-
-#: command-list.h:185
-msgid "Register file contents in the working tree to the index"
-msgstr ""
-
-#: command-list.h:186
-msgid "Update the object name stored in a ref safely"
-msgstr ""
-
-#: command-list.h:187
-msgid "Update auxiliary info file to help dumb servers"
-msgstr ""
-
-#: command-list.h:188
-msgid "Send archive back to git-archive"
-msgstr ""
-
-#: command-list.h:189
-msgid "Send objects packed back to git-fetch-pack"
-msgstr ""
-
-#: command-list.h:190
-msgid "Show a Git logical variable"
-msgstr ""
-
-#: command-list.h:191
-msgid "Check the GPG signature of commits"
-msgstr ""
-
-#: command-list.h:192
-msgid "Validate packed Git archive files"
-msgstr ""
-
-#: command-list.h:193
-msgid "Check the GPG signature of tags"
-msgstr ""
-
-#: command-list.h:194
-msgid "Show logs with difference each commit introduces"
-msgstr ""
-
-#: command-list.h:195
-msgid "Manage multiple working trees"
-msgstr ""
-
-#: command-list.h:196
-msgid "Create a tree object from the current index"
-msgstr ""
-
-#: command-list.h:197
-msgid "Defining attributes per path"
-msgstr ""
-
-#: command-list.h:198
-msgid "Git command-line interface and conventions"
-msgstr ""
-
-#: command-list.h:199
-msgid "A Git core tutorial for developers"
-msgstr ""
-
-#: command-list.h:200
-msgid "Providing usernames and passwords to Git"
-msgstr ""
-
-#: command-list.h:201
-msgid "Git for CVS users"
-msgstr ""
-
-#: command-list.h:202
-msgid "Tweaking diff output"
-msgstr ""
-
-#: command-list.h:203
-msgid "A useful minimum set of commands for Everyday Git"
-msgstr ""
-
-#: command-list.h:204
-msgid "Frequently asked questions about using Git"
-msgstr ""
-
-#: command-list.h:205
-msgid "A Git Glossary"
-msgstr ""
-
-#: command-list.h:206
-msgid "Hooks used by Git"
-msgstr ""
-
-#: command-list.h:207
-msgid "Specifies intentionally untracked files to ignore"
-msgstr ""
-
-#: command-list.h:208
-msgid "The Git repository browser"
-msgstr ""
-
-#: command-list.h:209
-msgid "Map author/committer names and/or E-Mail addresses"
-msgstr ""
-
-#: command-list.h:210
-msgid "Defining submodule properties"
-msgstr ""
-
-#: command-list.h:211
-msgid "Git namespaces"
-msgstr ""
-
-#: command-list.h:212
-msgid "Helper programs to interact with remote repositories"
-msgstr ""
-
-#: command-list.h:213
-msgid "Git Repository Layout"
-msgstr ""
-
-#: command-list.h:214
-msgid "Specifying revisions and ranges for Git"
-msgstr ""
-
-#: command-list.h:215
-msgid "Mounting one repository inside another"
-msgstr ""
-
-#: command-list.h:216
-msgid "A tutorial introduction to Git"
-msgstr ""
-
-#: command-list.h:217
-msgid "A tutorial introduction to Git: part two"
-msgstr ""
-
-#: command-list.h:218
-msgid "Git web interface (web frontend to Git repositories)"
-msgstr ""
-
-#: command-list.h:219
-msgid "An overview of recommended workflows with Git"
-msgstr ""
-
-#: git-merge-octopus.sh:46
-msgid ""
-"Error: Your local changes to the following files would be overwritten by "
-"merge"
-msgstr ""
-
-#: git-merge-octopus.sh:61
-msgid "Automated merge did not work."
-msgstr ""
-
-#: git-merge-octopus.sh:62
-msgid "Should not be doing an octopus."
-msgstr ""
-
-#: git-merge-octopus.sh:73
-#, sh-format
-msgid "Unable to find common commit with $pretty_name"
-msgstr ""
-
-#: git-merge-octopus.sh:77
-#, sh-format
-msgid "Already up to date with $pretty_name"
-msgstr ""
-
-#: git-merge-octopus.sh:89
-#, sh-format
-msgid "Fast-forwarding to: $pretty_name"
-msgstr ""
-
-#: git-merge-octopus.sh:97
-#, sh-format
-msgid "Trying simple merge with $pretty_name"
-msgstr ""
-
-#: git-merge-octopus.sh:102
-msgid "Simple merge did not work, trying automatic merge."
-msgstr ""
-
-#: git-sh-setup.sh:89 git-sh-setup.sh:94
-#, sh-format
-msgid "usage: $dashless $USAGE"
-msgstr ""
-
-#: git-sh-setup.sh:182
-#, sh-format
-msgid "Cannot chdir to $cdup, the toplevel of the working tree"
-msgstr ""
-
-#: git-sh-setup.sh:191 git-sh-setup.sh:198
-#, sh-format
-msgid "fatal: $program_name cannot be used without a working tree."
-msgstr ""
-
-#: git-sh-setup.sh:212
-msgid "Cannot rewrite branches: You have unstaged changes."
-msgstr ""
-
-#: git-sh-setup.sh:215
-#, sh-format
-msgid "Cannot $action: You have unstaged changes."
-msgstr ""
-
-#: git-sh-setup.sh:226
-#, sh-format
-msgid "Cannot $action: Your index contains uncommitted changes."
-msgstr ""
-
-#: git-sh-setup.sh:228
-msgid "Additionally, your index contains uncommitted changes."
-msgstr ""
-
-#: git-sh-setup.sh:348
-msgid "You need to run this command from the toplevel of the working tree."
-msgstr ""
-
-#: git-sh-setup.sh:353
-msgid "Unable to determine absolute path of git directory"
-msgstr ""
-
-#. TRANSLATORS: you can adjust this to align "git add -i" status menu
-#: git-add--interactive.perl:212
-#, perl-format
-msgid "%12s %12s %s"
-msgstr ""
-
-#: git-add--interactive.perl:632
-#, perl-format
-msgid "touched %d path\n"
-msgid_plural "touched %d paths\n"
-msgstr[0] ""
-msgstr[1] ""
-
-#: git-add--interactive.perl:1056
-msgid ""
-"If the patch applies cleanly, the edited hunk will immediately be\n"
-"marked for staging."
-msgstr ""
-
-#: git-add--interactive.perl:1059
-msgid ""
-"If the patch applies cleanly, the edited hunk will immediately be\n"
-"marked for stashing."
-msgstr ""
-
-#: git-add--interactive.perl:1062
-msgid ""
-"If the patch applies cleanly, the edited hunk will immediately be\n"
-"marked for unstaging."
-msgstr ""
-
-#: git-add--interactive.perl:1065 git-add--interactive.perl:1074
-#: git-add--interactive.perl:1080
-msgid ""
-"If the patch applies cleanly, the edited hunk will immediately be\n"
-"marked for applying."
-msgstr ""
-
-#: git-add--interactive.perl:1068 git-add--interactive.perl:1071
-#: git-add--interactive.perl:1077
-msgid ""
-"If the patch applies cleanly, the edited hunk will immediately be\n"
-"marked for discarding."
-msgstr ""
-
-#: git-add--interactive.perl:1114
-#, perl-format
-msgid "failed to open hunk edit file for writing: %s"
-msgstr ""
-
-#: git-add--interactive.perl:1121
-#, perl-format
-msgid ""
-"---\n"
-"To remove '%s' lines, make them ' ' lines (context).\n"
-"To remove '%s' lines, delete them.\n"
-"Lines starting with %s will be removed.\n"
-msgstr ""
-
-#: git-add--interactive.perl:1143
-#, perl-format
-msgid "failed to open hunk edit file for reading: %s"
-msgstr ""
-
-#: git-add--interactive.perl:1253
-msgid ""
-"y - stage this hunk\n"
-"n - do not stage this hunk\n"
-"q - quit; do not stage this hunk or any of the remaining ones\n"
-"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"
-msgstr ""
-
-#: git-add--interactive.perl:1259
-msgid ""
-"y - stash this hunk\n"
-"n - do not stash this hunk\n"
-"q - quit; do not stash this hunk or any of the remaining ones\n"
-"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"
-msgstr ""
-
-#: git-add--interactive.perl:1265
-msgid ""
-"y - unstage this hunk\n"
-"n - do not unstage this hunk\n"
-"q - quit; do not unstage this hunk or any of the remaining ones\n"
-"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"
-msgstr ""
-
-#: git-add--interactive.perl:1271
-msgid ""
-"y - apply this hunk to index\n"
-"n - do not apply this hunk to index\n"
-"q - quit; do not apply this hunk or any of the remaining ones\n"
-"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"
-msgstr ""
-
-#: git-add--interactive.perl:1277 git-add--interactive.perl:1295
-msgid ""
-"y - discard this hunk from worktree\n"
-"n - do not discard this hunk from worktree\n"
-"q - quit; do not discard this hunk or any of the remaining ones\n"
-"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"
-msgstr ""
-
-#: git-add--interactive.perl:1283
-msgid ""
-"y - discard this hunk from index and worktree\n"
-"n - do not discard this hunk from index and worktree\n"
-"q - quit; do not discard this hunk or any of the remaining ones\n"
-"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"
-msgstr ""
-
-#: git-add--interactive.perl:1289
-msgid ""
-"y - apply this hunk to index and worktree\n"
-"n - do not apply this hunk to index and worktree\n"
-"q - quit; do not apply this hunk or any of the remaining ones\n"
-"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"
-msgstr ""
-
-#: git-add--interactive.perl:1301
-msgid ""
-"y - apply this hunk to worktree\n"
-"n - do not apply this hunk to worktree\n"
-"q - quit; do not apply this hunk or any of the remaining ones\n"
-"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"
-msgstr ""
-
-#: git-add--interactive.perl:1316
-msgid ""
-"g - select a hunk to go to\n"
-"/ - search for a hunk matching the given regex\n"
-"j - leave this hunk undecided, see next undecided hunk\n"
-"J - leave this hunk undecided, see next hunk\n"
-"k - leave this hunk undecided, see previous undecided hunk\n"
-"K - leave this hunk undecided, see previous hunk\n"
-"s - split the current hunk into smaller hunks\n"
-"e - manually edit the current hunk\n"
-"? - print help\n"
-msgstr ""
-
-#: git-add--interactive.perl:1347
-msgid "The selected hunks do not apply to the index!\n"
-msgstr ""
-
-#: git-add--interactive.perl:1362
-#, perl-format
-msgid "ignoring unmerged: %s\n"
-msgstr ""
-
-#: git-add--interactive.perl:1481
-#, perl-format
-msgid "Apply mode change to worktree [y,n,q,a,d%s,?]? "
-msgstr ""
-
-#: git-add--interactive.perl:1482
-#, perl-format
-msgid "Apply deletion to worktree [y,n,q,a,d%s,?]? "
-msgstr ""
-
-#: git-add--interactive.perl:1483
-#, perl-format
-msgid "Apply addition to worktree [y,n,q,a,d%s,?]? "
-msgstr ""
-
-#: git-add--interactive.perl:1484
-#, perl-format
-msgid "Apply this hunk to worktree [y,n,q,a,d%s,?]? "
-msgstr ""
-
-#: git-add--interactive.perl:1601
-msgid "No other hunks to goto\n"
-msgstr ""
-
-#: git-add--interactive.perl:1619
-#, perl-format
-msgid "Invalid number: '%s'\n"
-msgstr ""
-
-#: git-add--interactive.perl:1624
-#, perl-format
-msgid "Sorry, only %d hunk available.\n"
-msgid_plural "Sorry, only %d hunks available.\n"
-msgstr[0] ""
-msgstr[1] ""
-
-#: git-add--interactive.perl:1659
-msgid "No other hunks to search\n"
-msgstr ""
-
-#: git-add--interactive.perl:1676
-#, perl-format
-msgid "Malformed search regexp %s: %s\n"
-msgstr ""
-
-#: git-add--interactive.perl:1686
-msgid "No hunk matches the given pattern\n"
-msgstr ""
-
-#: git-add--interactive.perl:1698 git-add--interactive.perl:1720
-msgid "No previous hunk\n"
-msgstr ""
-
-#: git-add--interactive.perl:1707 git-add--interactive.perl:1726
-msgid "No next hunk\n"
-msgstr ""
-
-#: git-add--interactive.perl:1732
-msgid "Sorry, cannot split this hunk\n"
-msgstr ""
-
-#: git-add--interactive.perl:1738
-#, perl-format
-msgid "Split into %d hunk.\n"
-msgid_plural "Split into %d hunks.\n"
-msgstr[0] ""
-msgstr[1] ""
-
-#: git-add--interactive.perl:1748
-msgid "Sorry, cannot edit this hunk\n"
-msgstr ""
-
-#. TRANSLATORS: please do not translate the command names
-#. 'status', 'update', 'revert', etc.
-#: git-add--interactive.perl:1813
-msgid ""
-"status        - show paths with changes\n"
-"update        - add working tree state to the staged set of changes\n"
-"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"
-msgstr ""
-
-#: git-add--interactive.perl:1830 git-add--interactive.perl:1842
-#: git-add--interactive.perl:1845 git-add--interactive.perl:1852
-#: git-add--interactive.perl:1855 git-add--interactive.perl:1862
-#: git-add--interactive.perl:1866 git-add--interactive.perl:1872
-msgid "missing --"
-msgstr ""
-
-#: git-add--interactive.perl:1868
-#, perl-format
-msgid "unknown --patch mode: %s"
-msgstr ""
-
-#: git-add--interactive.perl:1874 git-add--interactive.perl:1880
-#, perl-format
-msgid "invalid argument %s, expecting --"
-msgstr ""
-
-#: git-send-email.perl:159
-msgid "local zone differs from GMT by a non-minute interval\n"
-msgstr ""
-
-#: git-send-email.perl:166 git-send-email.perl:172
-msgid "local time offset greater than or equal to 24 hours\n"
-msgstr ""
-
-#: git-send-email.perl:244
-#, perl-format
-msgid "fatal: command '%s' died with exit code %d"
-msgstr ""
-
-#: git-send-email.perl:257
-msgid "the editor exited uncleanly, aborting everything"
-msgstr ""
-
-#: git-send-email.perl:346
-#, perl-format
-msgid ""
-"'%s' contains an intermediate version of the email you were composing.\n"
-msgstr ""
-
-#: git-send-email.perl:351
-#, perl-format
-msgid "'%s.final' contains the composed email.\n"
-msgstr ""
-
-#: git-send-email.perl:484
-msgid "--dump-aliases incompatible with other options\n"
-msgstr ""
-
-#: git-send-email.perl:561
-msgid ""
-"fatal: found configuration options for 'sendmail'\n"
-"git-send-email is configured with the sendemail.* options - note the 'e'.\n"
-"Set sendemail.forbidSendmailVariables to false to disable this check.\n"
-msgstr ""
-
-#: git-send-email.perl:566 git-send-email.perl:782
-msgid "Cannot run git format-patch from outside a repository\n"
-msgstr ""
-
-#: git-send-email.perl:569
-msgid ""
-"`batch-size` and `relogin` must be specified together (via command-line or "
-"configuration option)\n"
-msgstr ""
-
-#: git-send-email.perl:582
-#, perl-format
-msgid "Unknown --suppress-cc field: '%s'\n"
-msgstr ""
-
-#: git-send-email.perl:613
-#, perl-format
-msgid "Unknown --confirm setting: '%s'\n"
-msgstr ""
-
-#: git-send-email.perl:653
-#, perl-format
-msgid "warning: sendmail alias with quotes is not supported: %s\n"
-msgstr ""
-
-#: git-send-email.perl:655
-#, perl-format
-msgid "warning: `:include:` not supported: %s\n"
-msgstr ""
-
-#: git-send-email.perl:657
-#, perl-format
-msgid "warning: `/file` or `|pipe` redirection not supported: %s\n"
-msgstr ""
-
-#: git-send-email.perl:662
-#, perl-format
-msgid "warning: sendmail line is not recognized: %s\n"
-msgstr ""
-
-#: git-send-email.perl:747
-#, perl-format
-msgid ""
-"File '%s' exists but it could also be the range of commits\n"
-"to produce patches for.  Please disambiguate by...\n"
-"\n"
-"    * Saying \"./%s\" if you mean a file; or\n"
-"    * Giving --format-patch option if you mean a range.\n"
-msgstr ""
-
-#: git-send-email.perl:768
-#, perl-format
-msgid "Failed to opendir %s: %s"
-msgstr ""
-
-#: git-send-email.perl:803
-msgid ""
-"\n"
-"No patch files specified!\n"
-"\n"
-msgstr ""
-
-#: git-send-email.perl:816
-#, perl-format
-msgid "No subject line in %s?"
-msgstr ""
-
-#: git-send-email.perl:827
-#, perl-format
-msgid "Failed to open for writing %s: %s"
-msgstr ""
-
-#: git-send-email.perl:838
-msgid ""
-"Lines beginning in \"GIT:\" will be removed.\n"
-"Consider including an overall diffstat or table of contents\n"
-"for the patch you are writing.\n"
-"\n"
-"Clear the body content if you don't wish to send a summary.\n"
-msgstr ""
-
-#: git-send-email.perl:862
-#, perl-format
-msgid "Failed to open %s: %s"
-msgstr ""
-
-#: git-send-email.perl:879
-#, perl-format
-msgid "Failed to open %s.final: %s"
-msgstr ""
-
-#: git-send-email.perl:922
-msgid "Summary email is empty, skipping it\n"
-msgstr ""
-
-#. TRANSLATORS: please keep [y/N] as is.
-#: git-send-email.perl:971
-#, perl-format
-msgid "Are you sure you want to use <%s> [y/N]? "
-msgstr ""
-
-#: git-send-email.perl:1026
-msgid ""
-"The following files are 8bit, but do not declare a Content-Transfer-"
-"Encoding.\n"
-msgstr ""
-
-#: git-send-email.perl:1031
-msgid "Which 8bit encoding should I declare [UTF-8]? "
-msgstr ""
-
-#: git-send-email.perl:1039
-#, 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"
-msgstr ""
-
-#: git-send-email.perl:1058
-msgid "To whom should the emails be sent (if anyone)?"
-msgstr ""
-
-#: git-send-email.perl:1076
-#, perl-format
-msgid "fatal: alias '%s' expands to itself\n"
-msgstr ""
-
-#: git-send-email.perl:1088
-msgid "Message-ID to be used as In-Reply-To for the first email (if any)? "
-msgstr ""
-
-#: git-send-email.perl:1150 git-send-email.perl:1158
-#, perl-format
-msgid "error: unable to extract a valid address from: %s\n"
-msgstr ""
-
-#. 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:1162
-msgid "What to do with this address? ([q]uit|[d]rop|[e]dit): "
-msgstr ""
-
-#: git-send-email.perl:1482
-#, perl-format
-msgid "CA path \"%s\" does not exist"
-msgstr ""
-
-#: git-send-email.perl:1565
-msgid ""
-"    The Cc list above has been expanded by additional\n"
-"    addresses found in the patch commit message. By default\n"
-"    send-email prompts before sending whenever this occurs.\n"
-"    This behavior is controlled by the sendemail.confirm\n"
-"    configuration setting.\n"
-"\n"
-"    For additional information, run 'git send-email --help'.\n"
-"    To retain the current behavior, but squelch this message,\n"
-"    run 'git config --global sendemail.confirm auto'.\n"
-"\n"
-msgstr ""
-
-#. 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:1580
-msgid "Send this email? ([y]es|[n]o|[e]dit|[q]uit|[a]ll): "
-msgstr ""
-
-#: git-send-email.perl:1583
-msgid "Send this email reply required"
-msgstr ""
-
-#: git-send-email.perl:1617
-msgid "The required SMTP server is not properly defined."
-msgstr ""
-
-#: git-send-email.perl:1664
-#, perl-format
-msgid "Server does not support STARTTLS! %s"
-msgstr ""
-
-#: git-send-email.perl:1669 git-send-email.perl:1673
-#, perl-format
-msgid "STARTTLS failed! %s"
-msgstr ""
-
-#: git-send-email.perl:1682
-msgid "Unable to initialize SMTP properly. Check config and use --smtp-debug."
-msgstr ""
-
-#: git-send-email.perl:1700
-#, perl-format
-msgid "Failed to send %s\n"
-msgstr ""
-
-#: git-send-email.perl:1703
-#, perl-format
-msgid "Dry-Sent %s\n"
-msgstr ""
-
-#: git-send-email.perl:1703
-#, perl-format
-msgid "Sent %s\n"
-msgstr ""
-
-#: git-send-email.perl:1705
-msgid "Dry-OK. Log says:\n"
-msgstr ""
-
-#: git-send-email.perl:1705
-msgid "OK. Log says:\n"
-msgstr ""
-
-#: git-send-email.perl:1724
-msgid "Result: "
-msgstr ""
-
-#: git-send-email.perl:1727
-msgid "Result: OK\n"
-msgstr ""
-
-#: git-send-email.perl:1744
-#, perl-format
-msgid "can't open file %s"
-msgstr ""
-
-#: git-send-email.perl:1792 git-send-email.perl:1812
-#, perl-format
-msgid "(mbox) Adding cc: %s from line '%s'\n"
-msgstr ""
-
-#: git-send-email.perl:1798
-#, perl-format
-msgid "(mbox) Adding to: %s from line '%s'\n"
-msgstr ""
-
-#: git-send-email.perl:1855
-#, perl-format
-msgid "(non-mbox) Adding cc: %s from line '%s'\n"
-msgstr ""
-
-#: git-send-email.perl:1890
-#, perl-format
-msgid "(body) Adding cc: %s from line '%s'\n"
-msgstr ""
-
-#: git-send-email.perl:2009
-#, perl-format
-msgid "(%s) Could not execute '%s'"
-msgstr ""
-
-#: git-send-email.perl:2016
-#, perl-format
-msgid "(%s) Adding %s: %s from: '%s'\n"
-msgstr ""
-
-#: git-send-email.perl:2020
-#, perl-format
-msgid "(%s) failed to close pipe to '%s'"
-msgstr ""
-
-#: git-send-email.perl:2050
-msgid "cannot send message as 7bit"
-msgstr ""
-
-#: git-send-email.perl:2058
-msgid "invalid transfer encoding"
-msgstr ""
-
-#: git-send-email.perl:2100
-#, perl-format
-msgid ""
-"fatal: %s: rejected by %s hook\n"
-"%s\n"
-"warning: no patches were sent\n"
-msgstr ""
-
-#: git-send-email.perl:2110 git-send-email.perl:2163 git-send-email.perl:2173
-#, perl-format
-msgid "unable to open %s: %s\n"
-msgstr ""
-
-#: git-send-email.perl:2113
-#, perl-format
-msgid ""
-"fatal: %s:%d is longer than 998 characters\n"
-"warning: no patches were sent\n"
-msgstr ""
-
-#: git-send-email.perl:2131
-#, perl-format
-msgid "Skipping %s with backup suffix '%s'.\n"
-msgstr ""
-
-#. TRANSLATORS: please keep "[y|N]" as is.
-#: git-send-email.perl:2135
-#, perl-format
-msgid "Do you really want to send %s? [y|N]: "
-msgstr ""
diff --git a/po/id.po b/po/id.po
index 76284fe8e6..794bf8f1c5 100644
--- a/po/id.po
+++ b/po/id.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Git\n"
 "Report-Msgid-Bugs-To: Git Mailing List <git@vger.kernel.org>\n"
-"POT-Creation-Date: 2022-04-13 14:52+0800\n"
-"PO-Revision-Date: 2021-08-14 09:35+0700\n"
+"POT-Creation-Date: 2022-06-21 20:20+0000\n"
+"PO-Revision-Date: 2022-06-18 16:30+0700\n"
 "Last-Translator: Bagas Sanjaya <bagasdotme@gmail.com>\n"
 "Language-Team: Indonesian\n"
 "Language: id\n"
@@ -17,237 +17,227 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: add-interactive.c:382
+#: add-interactive.c
 #, c-format
 msgid "Huh (%s)?"
 msgstr "Huh (%s)?"
 
-#: add-interactive.c:535 add-interactive.c:836 reset.c:136 sequencer.c:3505
-#: sequencer.c:3970 sequencer.c:4127 builtin/rebase.c:1261
-#: builtin/rebase.c:1671
+#: add-interactive.c builtin/rebase.c reset.c sequencer.c
 msgid "could not read index"
 msgstr "tidak dapat membaca indeks"
 
-#: add-interactive.c:590 git-add--interactive.perl:269
-#: git-add--interactive.perl:294
+#: add-interactive.c git-add--interactive.perl
 msgid "binary"
 msgstr "biner"
 
-#: add-interactive.c:648 git-add--interactive.perl:278
-#: git-add--interactive.perl:332
+#: add-interactive.c git-add--interactive.perl
 msgid "nothing"
 msgstr "tidak ada"
 
-#: add-interactive.c:649 git-add--interactive.perl:314
-#: git-add--interactive.perl:329
+#: add-interactive.c git-add--interactive.perl
 msgid "unchanged"
 msgstr "tak berubah"
 
-#: add-interactive.c:686 git-add--interactive.perl:641
+#: add-interactive.c git-add--interactive.perl
 msgid "Update"
 msgstr "Perbarui"
 
-#: add-interactive.c:703 add-interactive.c:891
+#: add-interactive.c
 #, c-format
 msgid "could not stage '%s'"
 msgstr "tidak dapat menggelar '%s'"
 
-#: add-interactive.c:709 add-interactive.c:898 reset.c:160 sequencer.c:3709
+#: add-interactive.c builtin/stash.c reset.c sequencer.c
 msgid "could not write index"
 msgstr "tidak dapat menulis indeks"
 
-#: add-interactive.c:712 git-add--interactive.perl:626
+#: add-interactive.c git-add--interactive.perl
 #, 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:730 git-add--interactive.perl:676
+#: add-interactive.c git-add--interactive.perl
 #, c-format, perl-format
 msgid "note: %s is untracked now.\n"
 msgstr "catatan: %s sekarang tak terlacak.\n"
 
-#: add-interactive.c:735 apply.c:4133 builtin/checkout.c:311
-#: builtin/reset.c:167
+#: add-interactive.c apply.c builtin/checkout.c builtin/reset.c
 #, c-format
 msgid "make_cache_entry failed for path '%s'"
 msgstr "make_cache_entry gagal untuk jalur '%s'"
 
-#: add-interactive.c:765 git-add--interactive.perl:653
+#: add-interactive.c git-add--interactive.perl
 msgid "Revert"
 msgstr "Kembalikan"
 
-#: add-interactive.c:781
+#: add-interactive.c
 msgid "Could not parse HEAD^{tree}"
 msgstr "Tidak dapat menguraikan HEAD^{tree}"
 
-#: add-interactive.c:819 git-add--interactive.perl:629
+#: add-interactive.c git-add--interactive.perl
 #, 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:870 git-add--interactive.perl:693
+#: add-interactive.c git-add--interactive.perl
 #, c-format
 msgid "No untracked files.\n"
 msgstr "Tidak ada berkas tak terlacak.\n"
 
-#: add-interactive.c:874 git-add--interactive.perl:687
+#: add-interactive.c git-add--interactive.perl
 msgid "Add untracked"
 msgstr "Tambahkan tak terlacak"
 
-#: add-interactive.c:901 git-add--interactive.perl:623
+#: add-interactive.c git-add--interactive.perl
 #, 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:931
+#: add-interactive.c
 #, c-format
 msgid "ignoring unmerged: %s"
 msgstr "mengabaikan tak tergabung: %s"
 
-#: add-interactive.c:943 add-patch.c:1758 git-add--interactive.perl:1371
+#: add-interactive.c add-patch.c git-add--interactive.perl
 #, c-format
 msgid "Only binary files changed.\n"
 msgstr "Hanya berkas biner yang berubah.\n"
 
-#: add-interactive.c:945 add-patch.c:1756 git-add--interactive.perl:1373
+#: add-interactive.c add-patch.c git-add--interactive.perl
 #, c-format
 msgid "No changes.\n"
 msgstr "Tidak ada perubahan.\n"
 
-#: add-interactive.c:949 git-add--interactive.perl:1381
+#: add-interactive.c git-add--interactive.perl
 msgid "Patch update"
 msgstr "Pembaruan tambalan"
 
-#: add-interactive.c:988 git-add--interactive.perl:1794
+#: add-interactive.c git-add--interactive.perl
 msgid "Review diff"
 msgstr "Tinjau diff"
 
-#: add-interactive.c:1016
+#: add-interactive.c
 msgid "show paths with changes"
 msgstr "perlihatkan jalur dengan perubahan"
 
-#: add-interactive.c:1018
+#: add-interactive.c
 msgid "add working tree state to the staged set of changes"
 msgstr "tambahkan keadaan pohon kerja ke set perubahan yang tergelar"
 
-#: add-interactive.c:1020
+#: add-interactive.c
 msgid "revert staged set of changes back to the HEAD version"
 msgstr "kembalikan set perubahan yang tergelar kembali ke versi HEAD"
 
-#: add-interactive.c:1022
+#: add-interactive.c
 msgid "pick hunks and update selectively"
 msgstr "ambil bingkah dan perbarui secara selektif"
 
-#: add-interactive.c:1024
+#: add-interactive.c
 msgid "view diff between HEAD and index"
 msgstr "lihat diff antara HEAD dan indeks"
 
-#: add-interactive.c:1026
+#: add-interactive.c
 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:1034 add-interactive.c:1083
+#: add-interactive.c
 msgid "Prompt help:"
 msgstr "Permintaan bantuan:"
 
-#: add-interactive.c:1036
+#: add-interactive.c
 msgid "select a single item"
 msgstr "pilih satu item"
 
-#: add-interactive.c:1038
+#: add-interactive.c
 msgid "select a range of items"
 msgstr "pilih kisaran item"
 
-#: add-interactive.c:1040
+#: add-interactive.c
 msgid "select multiple ranges"
 msgstr "pilih banyak kisaran"
 
-#: add-interactive.c:1042 add-interactive.c:1087
+#: add-interactive.c
 msgid "select item based on unique prefix"
 msgstr "pilih item berdasarkan prefiks unik"
 
-#: add-interactive.c:1044
+#: add-interactive.c
 msgid "unselect specified items"
 msgstr "batal pilih item yang disebutkan"
 
-#: add-interactive.c:1046
+#: add-interactive.c
 msgid "choose all items"
 msgstr "pilih semua item"
 
-#: add-interactive.c:1048
+#: add-interactive.c
 msgid "(empty) finish selecting"
 msgstr "(kosong) sudah memilih"
 
-#: add-interactive.c:1085
+#: add-interactive.c
 msgid "select a numbered item"
 msgstr "pilih item bernomor"
 
-#: add-interactive.c:1089
+#: add-interactive.c
 msgid "(empty) select nothing"
 msgstr "(empty) tidak pilih apapun"
 
-#: add-interactive.c:1097 builtin/clean.c:839 git-add--interactive.perl:1898
+#: add-interactive.c builtin/clean.c git-add--interactive.perl
 msgid "*** Commands ***"
 msgstr "*** Perintah ***"
 
-#: add-interactive.c:1098 builtin/clean.c:840 git-add--interactive.perl:1895
+#: add-interactive.c builtin/clean.c git-add--interactive.perl
 msgid "What now"
 msgstr "Apa sekarang"
 
-#: add-interactive.c:1150 git-add--interactive.perl:213
+#: add-interactive.c git-add--interactive.perl
 msgid "staged"
 msgstr "tergelar"
 
-#: add-interactive.c:1150 git-add--interactive.perl:213
+#: add-interactive.c git-add--interactive.perl
 msgid "unstaged"
 msgstr "tak tergelar"
 
-#: add-interactive.c:1150 apply.c:5002 apply.c:5005 builtin/am.c:2370
-#: builtin/am.c:2373 builtin/bugreport.c:107 builtin/clone.c:132
-#: builtin/fetch.c:154 builtin/merge.c:287 builtin/pull.c:194
-#: builtin/submodule--helper.c:412 builtin/submodule--helper.c:1872
-#: builtin/submodule--helper.c:1875 builtin/submodule--helper.c:2709
-#: builtin/submodule--helper.c:2712 builtin/submodule--helper.c:2891
-#: git-add--interactive.perl:213
+#: add-interactive.c apply.c builtin/am.c builtin/bugreport.c builtin/clone.c
+#: builtin/fetch.c builtin/merge.c builtin/pull.c builtin/submodule--helper.c
+#: git-add--interactive.perl
 msgid "path"
 msgstr "jalur"
 
-#: add-interactive.c:1157
+#: add-interactive.c
 msgid "could not refresh index"
 msgstr "tidak dapat menyegarkan indeks"
 
-#: add-interactive.c:1171 builtin/clean.c:804 git-add--interactive.perl:1805
+#: add-interactive.c builtin/clean.c git-add--interactive.perl
 #, c-format
 msgid "Bye.\n"
 msgstr "Sampai jumpa.\n"
 
-#: add-patch.c:34 git-add--interactive.perl:1433
+#: add-patch.c git-add--interactive.perl
 #, c-format, perl-format
 msgid "Stage mode change [y,n,q,a,d%s,?]? "
 msgstr "Gelar perubahan mode [y,n,q,a,d%s,?]? "
 
-#: add-patch.c:35 git-add--interactive.perl:1434
+#: add-patch.c git-add--interactive.perl
 #, c-format, perl-format
 msgid "Stage deletion [y,n,q,a,d%s,?]? "
 msgstr "Gelar penghapusan [y,n,q,a,d%s,?]? "
 
-#: add-patch.c:36 git-add--interactive.perl:1435
+#: add-patch.c git-add--interactive.perl
 #, c-format, perl-format
 msgid "Stage addition [y,n,q,a,d%s,?]? "
 msgstr "Gelar penambahan [y,n,q,a,d%s,?]? "
 
-#: add-patch.c:37 git-add--interactive.perl:1436
+#: add-patch.c git-add--interactive.perl
 #, c-format, perl-format
 msgid "Stage this hunk [y,n,q,a,d%s,?]? "
 msgstr "Gelar bingkah ini [y,n,q,a,d%s,?]? "
 
-#: add-patch.c:39
+#: add-patch.c
 msgid ""
 "If the patch applies cleanly, the edited hunk will immediately be marked for "
 "staging."
@@ -255,7 +245,7 @@ msgstr ""
 "Jika tambalan diterapkan bersih, bingkah yang disunting akan langsung "
 "ditandai untuk digelar."
 
-#: add-patch.c:42
+#: add-patch.c
 msgid ""
 "y - stage this hunk\n"
 "n - do not stage this hunk\n"
@@ -269,27 +259,27 @@ msgstr ""
 "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:1439
+#: add-patch.c git-add--interactive.perl
 #, c-format, perl-format
 msgid "Stash mode change [y,n,q,a,d%s,?]? "
 msgstr "Stase perubahan mode [y,n,q,a,d%s,?]? "
 
-#: add-patch.c:57 git-add--interactive.perl:1440
+#: add-patch.c git-add--interactive.perl
 #, c-format, perl-format
 msgid "Stash deletion [y,n,q,a,d%s,?]? "
 msgstr "Stase penghapusan [y,n,q,a,d%s,?]? "
 
-#: add-patch.c:58 git-add--interactive.perl:1441
+#: add-patch.c git-add--interactive.perl
 #, c-format, perl-format
 msgid "Stash addition [y,n,q,a,d%s,?]? "
 msgstr "Stase penambahan [y,n,q,a,d%s,?]? "
 
-#: add-patch.c:59 git-add--interactive.perl:1442
+#: add-patch.c git-add--interactive.perl
 #, c-format, perl-format
 msgid "Stash this hunk [y,n,q,a,d%s,?]? "
 msgstr "Stase bingkah ini [y,n,q,a,d%s,?]? "
 
-#: add-patch.c:61
+#: add-patch.c
 msgid ""
 "If the patch applies cleanly, the edited hunk will immediately be marked for "
 "stashing."
@@ -297,7 +287,7 @@ msgstr ""
 "Jika tambalan diterapkan bersih, bingkah yang disunting akan langsung "
 "ditandai untuk distase."
 
-#: add-patch.c:64
+#: add-patch.c
 msgid ""
 "y - stash this hunk\n"
 "n - do not stash this hunk\n"
@@ -311,27 +301,27 @@ msgstr ""
 "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:1445
+#: add-patch.c git-add--interactive.perl
 #, c-format, perl-format
 msgid "Unstage mode change [y,n,q,a,d%s,?]? "
 msgstr "Batal gelar perubahan mode [y,n,q,a,d%s,?]? "
 
-#: add-patch.c:81 git-add--interactive.perl:1446
+#: add-patch.c git-add--interactive.perl
 #, c-format, perl-format
 msgid "Unstage deletion [y,n,q,a,d%s,?]? "
 msgstr "Batal gelar penghapusan [y,n,q,a,d%s,?]? "
 
-#: add-patch.c:82 git-add--interactive.perl:1447
+#: add-patch.c git-add--interactive.perl
 #, c-format, perl-format
 msgid "Unstage addition [y,n,q,a,d%s,?]? "
 msgstr "Batal gelar penambahan [y,n,q,a,d%s,?]? "
 
-#: add-patch.c:83 git-add--interactive.perl:1448
+#: add-patch.c git-add--interactive.perl
 #, c-format, perl-format
 msgid "Unstage this hunk [y,n,q,a,d%s,?]? "
 msgstr "Batal gelar bingkah ini [y,n,q,a,d%s,?]? "
 
-#: add-patch.c:85
+#: add-patch.c
 msgid ""
 "If the patch applies cleanly, the edited hunk will immediately be marked for "
 "unstaging."
@@ -339,7 +329,7 @@ msgstr ""
 "Jika tambalan diterapkan bersih, bingkah yang disunting akan langsung "
 "ditandai untuk dibatalgelarkan."
 
-#: add-patch.c:88
+#: add-patch.c
 msgid ""
 "y - unstage this hunk\n"
 "n - do not unstage this hunk\n"
@@ -353,27 +343,27 @@ msgstr ""
 "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:1451
+#: add-patch.c git-add--interactive.perl
 #, c-format, perl-format
 msgid "Apply mode change to index [y,n,q,a,d%s,?]? "
 msgstr "Terapkan perubahan mode ke indeks [y,n,q,a,d%s,?]? "
 
-#: add-patch.c:104 git-add--interactive.perl:1452
+#: add-patch.c git-add--interactive.perl
 #, c-format, perl-format
 msgid "Apply deletion to index [y,n,q,a,d%s,?]? "
 msgstr "Terapkan penghapusan ke indeks [y,n,q,a,d%s,?]? "
 
-#: add-patch.c:105 git-add--interactive.perl:1453
+#: add-patch.c git-add--interactive.perl
 #, c-format, perl-format
 msgid "Apply addition to index [y,n,q,a,d%s,?]? "
 msgstr "Terapkan penambahan ke indeks [y,n,q,a,d%s,?]? "
 
-#: add-patch.c:106 git-add--interactive.perl:1454
+#: add-patch.c git-add--interactive.perl
 #, c-format, perl-format
 msgid "Apply this hunk to index [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
+#: add-patch.c
 msgid ""
 "If the patch applies cleanly, the edited hunk will immediately be marked for "
 "applying."
@@ -381,7 +371,7 @@ msgstr ""
 "Jika tambalan diterapkan bersih, bingkah yang disunting akan langsung "
 "ditandai untuk diterapkan."
 
-#: add-patch.c:111
+#: add-patch.c
 msgid ""
 "y - apply this hunk to index\n"
 "n - do not apply this hunk to index\n"
@@ -395,31 +385,27 @@ msgstr ""
 "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:1457
-#: git-add--interactive.perl:1475
+#: add-patch.c git-add--interactive.perl
 #, c-format, perl-format
 msgid "Discard mode change from worktree [y,n,q,a,d%s,?]? "
 msgstr "Buang perubahan mode dari pohon kerja [y,n,q,a,d%s,?]? "
 
-#: add-patch.c:127 git-add--interactive.perl:1458
-#: git-add--interactive.perl:1476
+#: add-patch.c git-add--interactive.perl
 #, c-format, perl-format
 msgid "Discard deletion from worktree [y,n,q,a,d%s,?]? "
 msgstr "Buang penghapusan dari pohon kerja [y,n,q,a,d%s,?]? "
 
-#: add-patch.c:128 git-add--interactive.perl:1459
-#: git-add--interactive.perl:1477
+#: add-patch.c git-add--interactive.perl
 #, c-format, perl-format
 msgid "Discard addition from worktree [y,n,q,a,d%s,?]? "
 msgstr "Buang penambahan dari pohon kerja [y,n,q,a,d%s,?]? "
 
-#: add-patch.c:129 git-add--interactive.perl:1460
-#: git-add--interactive.perl:1478
+#: add-patch.c git-add--interactive.perl
 #, c-format, perl-format
 msgid "Discard this hunk from worktree [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
+#: add-patch.c
 msgid ""
 "If the patch applies cleanly, the edited hunk will immediately be marked for "
 "discarding."
@@ -427,7 +413,7 @@ msgstr ""
 "Jika tambalan diterapkan bersih, bingkah yang disunting akan langsung "
 "ditandai untuk dibuang."
 
-#: add-patch.c:134 add-patch.c:202
+#: add-patch.c
 msgid ""
 "y - discard this hunk from worktree\n"
 "n - do not discard this hunk from worktree\n"
@@ -441,27 +427,27 @@ msgstr ""
 "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:1463
+#: add-patch.c git-add--interactive.perl
 #, c-format, perl-format
 msgid "Discard mode change from index and worktree [y,n,q,a,d%s,?]? "
 msgstr "Buang perubahan mode dari indeks dan pohon kerja [y,n,q,a,d%s,?]? "
 
-#: add-patch.c:150 add-patch.c:195 git-add--interactive.perl:1464
+#: add-patch.c git-add--interactive.perl
 #, c-format, perl-format
 msgid "Discard deletion from index and worktree [y,n,q,a,d%s,?]? "
 msgstr "Buang penghapusan dari indeks dan pohon kerja [y,n,q,a,d%s,?]? "
 
-#: add-patch.c:151 add-patch.c:196 git-add--interactive.perl:1465
+#: add-patch.c git-add--interactive.perl
 #, c-format, perl-format
 msgid "Discard addition from index and worktree [y,n,q,a,d%s,?]? "
 msgstr "Buang penambahan dari indeks dan pohon kerja [y,n,q,a,d%s,?]? "
 
-#: add-patch.c:152 add-patch.c:197 git-add--interactive.perl:1466
+#: add-patch.c git-add--interactive.perl
 #, c-format, perl-format
 msgid "Discard this hunk from index and worktree [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
+#: add-patch.c
 msgid ""
 "y - discard this hunk from index and worktree\n"
 "n - do not discard this hunk from index and worktree\n"
@@ -475,27 +461,27 @@ msgstr ""
 "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:1469
+#: add-patch.c git-add--interactive.perl
 #, c-format, perl-format
 msgid "Apply mode change to index and worktree [y,n,q,a,d%s,?]? "
 msgstr "Terapkan perubahan mode ke indeks dan pohon kerja [y,n,q,a,d%s,?]? "
 
-#: add-patch.c:172 add-patch.c:217 git-add--interactive.perl:1470
+#: add-patch.c git-add--interactive.perl
 #, c-format, perl-format
 msgid "Apply deletion to index and worktree [y,n,q,a,d%s,?]? "
 msgstr "Terapkan penghapusan ke indeks dan pohon kerja [y,n,q,a,d%s,?]? "
 
-#: add-patch.c:173 add-patch.c:218 git-add--interactive.perl:1471
+#: add-patch.c git-add--interactive.perl
 #, c-format, perl-format
 msgid "Apply addition to index and worktree [y,n,q,a,d%s,?]? "
 msgstr "Terapkan penambahan ke indeks dan pohon kerja [y,n,q,a,d%s,?]? "
 
-#: add-patch.c:174 add-patch.c:219 git-add--interactive.perl:1472
+#: add-patch.c git-add--interactive.perl
 #, c-format, perl-format
 msgid "Apply this hunk to index and worktree [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
+#: add-patch.c
 msgid ""
 "y - apply this hunk to index and worktree\n"
 "n - do not apply this hunk to index and worktree\n"
@@ -509,7 +495,7 @@ msgstr ""
 "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
+#: add-patch.c
 msgid ""
 "y - apply this hunk to worktree\n"
 "n - do not apply this hunk to worktree\n"
@@ -523,34 +509,34 @@ msgstr ""
 "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
+#: add-patch.c
 #, c-format
 msgid "could not parse hunk header '%.*s'"
 msgstr "tidak dapat menguraikan kepala bingkah '%.*s'"
 
-#: add-patch.c:362 add-patch.c:366
+#: add-patch.c
 #, c-format
 msgid "could not parse colored hunk header '%.*s'"
 msgstr "tidak dapat menguraikan kepala bingkah berwarna '%.*s'"
 
-#: add-patch.c:431
+#: add-patch.c
 msgid "could not parse diff"
 msgstr "tidak dapat menguraikan diff"
 
-#: add-patch.c:450
+#: add-patch.c
 msgid "could not parse colored diff"
 msgstr "tidak dapat menguraikan diff berwarna"
 
-#: add-patch.c:464
+#: add-patch.c
 #, c-format
 msgid "failed to run '%s'"
 msgstr "gagal menjalankan '%s'"
 
-#: add-patch.c:618
+#: add-patch.c
 msgid "mismatched output from interactive.diffFilter"
 msgstr "keluaran tak cocok dari interactive.diffFilter"
 
-#: add-patch.c:619
+#: add-patch.c
 msgid ""
 "Your filter must maintain a one-to-one correspondence\n"
 "between its input and output lines."
@@ -558,7 +544,7 @@ msgstr ""
 "Saringan Anda haru menjaga korespondensi satu-satu antara masukannya\n"
 "dan baris keluaran."
 
-#: add-patch.c:797
+#: add-patch.c
 #, c-format
 msgid ""
 "expected context line #%d in\n"
@@ -567,7 +553,7 @@ msgstr ""
 "baris konteks #%d diharapkan dalam\n"
 "%.*s"
 
-#: add-patch.c:812
+#: add-patch.c
 #, c-format
 msgid ""
 "hunks do not overlap:\n"
@@ -580,11 +566,11 @@ msgstr ""
 "tidak berakhir dengan:\n"
 "%.*s"
 
-#: add-patch.c:1088 git-add--interactive.perl:1115
+#: add-patch.c git-add--interactive.perl
 msgid "Manual hunk edit mode -- see bottom for a quick guide.\n"
 msgstr "Mode sunting bingkah manual -- lihat dibawah untuk panduan cepat.\n"
 
-#: add-patch.c:1092
+#: add-patch.c
 #, c-format
 msgid ""
 "---\n"
@@ -594,11 +580,12 @@ msgid ""
 msgstr ""
 "---\n"
 "Untuk menghapus baris '%c', buatlah menjadi baris ' ' (konteks).\n"
-"Untuk menghapus baris '%c', hapuslah itu.\n"
+"Untuk menghapus baris '%c', hapuslahnya.\n"
 "Baris yang diawali dengan %c akan dihapus.\n"
 
+#. #-#-#-#-#  git-add--interactive.perl.po  #-#-#-#-#
 #. TRANSLATORS: 'it' refers to the patch mentioned in the previous messages.
-#: add-patch.c:1106 git-add--interactive.perl:1129
+#: add-patch.c git-add--interactive.perl
 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"
@@ -608,46 +595,48 @@ msgstr ""
 "untuk menyunting lagi. Jika semua baris dalam bingkah dihapus, suntingan\n"
 "dibatalkan dan bingkah tetap tidak berubah.\n"
 
-#: add-patch.c:1139
+#: add-patch.c
 msgid "could not parse hunk header"
 msgstr "tidak dapat menguraikan kepala bingkah"
 
-#: add-patch.c:1184
+#: add-patch.c
 msgid "'git apply --cached' failed"
 msgstr "'git apply --cached' gagal"
 
+#. #-#-#-#-#  add-patch.c.po  #-#-#-#-#
 #. 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.
 #.
+#. #-#-#-#-#  git-add--interactive.perl.po  #-#-#-#-#
 #. 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:1253 git-add--interactive.perl:1244
+#: add-patch.c git-add--interactive.perl
 msgid ""
 "Your edited hunk does not apply. Edit again (saying \"no\" discards!) [y/n]? "
 msgstr ""
 "Bingkah Anda tak diterapkan. Sunting lagi (bilang \"n\" untuk \"tidak\" "
 "buang!) [y/n]?"
 
-#: add-patch.c:1296
+#: add-patch.c
 msgid "The selected hunks do not apply to the index!"
 msgstr "Bingkah yang dipilih tidak diterapkan ke indeks!"
 
-#: add-patch.c:1297 git-add--interactive.perl:1348
+#: add-patch.c git-add--interactive.perl
 msgid "Apply them to the worktree anyway? "
 msgstr "Tetap terapkan itu ke pohon kerja? "
 
-#: add-patch.c:1304 git-add--interactive.perl:1351
+#: add-patch.c git-add--interactive.perl
 msgid "Nothing was applied.\n"
 msgstr "Tidak ada yang diterapkan.\n"
 
-#: add-patch.c:1361
+#: add-patch.c
 msgid ""
 "j - leave this hunk undecided, see next undecided hunk\n"
 "J - leave this hunk undecided, see next hunk\n"
@@ -669,73 +658,73 @@ msgstr ""
 "e - sunting bingkah saat ini secara manual\n"
 "? - cetak bantuan\n"
 
-#: add-patch.c:1523 add-patch.c:1533
+#: add-patch.c
 msgid "No previous hunk"
 msgstr "Tidak ada bingkah sebelumnya"
 
-#: add-patch.c:1528 add-patch.c:1538
+#: add-patch.c
 msgid "No next hunk"
 msgstr "Tidak ada bingkah selanjutnya"
 
-#: add-patch.c:1544
+#: add-patch.c
 msgid "No other hunks to goto"
 msgstr "Tidak ada bingkah lainnya untuk dikunjungi"
 
-#: add-patch.c:1555 git-add--interactive.perl:1608
+#: add-patch.c git-add--interactive.perl
 msgid "go to which hunk (<ret> to see more)? "
 msgstr "pergi ke bingkah yang mana (<ret> untuk lihat lebih)? "
 
-#: add-patch.c:1556 git-add--interactive.perl:1610
+#: add-patch.c git-add--interactive.perl
 msgid "go to which hunk? "
 msgstr "pergi ke bingkah yang mana?"
 
-#: add-patch.c:1567
+#: add-patch.c
 #, c-format
 msgid "Invalid number: '%s'"
 msgstr "Angka tidak valid: '%s'"
 
-#: add-patch.c:1572
+#: add-patch.c
 #, c-format
 msgid "Sorry, only %d hunk available."
 msgid_plural "Sorry, only %d hunks available."
 msgstr[0] "Maaf, hanya %d bingkah yang tersedia."
 msgstr[1] "Maaf, hanya %d bingkah yang tersedia."
 
-#: add-patch.c:1581
+#: add-patch.c
 msgid "No other hunks to search"
 msgstr "Tidak ada bingkah lainnya untuk dicari"
 
-#: add-patch.c:1587 git-add--interactive.perl:1663
+#: add-patch.c git-add--interactive.perl
 msgid "search for regex? "
 msgstr "cari untuk regex? "
 
-#: add-patch.c:1602
+#: add-patch.c
 #, c-format
 msgid "Malformed search regexp %s: %s"
 msgstr "regexp pencarian %s cacat: %s"
 
-#: add-patch.c:1619
+#: add-patch.c
 msgid "No hunk matches the given pattern"
 msgstr "Tidak ada bingkah yang cocok dengan pola yang diberikan"
 
-#: add-patch.c:1626
+#: add-patch.c
 msgid "Sorry, cannot split this hunk"
 msgstr "Maaf, tidak dapat membelah bingkah ini"
 
-#: add-patch.c:1630
+#: add-patch.c
 #, c-format
 msgid "Split into %d hunks."
 msgstr "Terbelah ke dalam %d bingkah."
 
-#: add-patch.c:1634
+#: add-patch.c
 msgid "Sorry, cannot edit this hunk"
 msgstr "Maaf, tidak dapat menyunting bingkah ini"
 
-#: add-patch.c:1686
+#: add-patch.c
 msgid "'git apply' failed"
 msgstr "'git apply' gagal"
 
-#: advice.c:81
+#: advice.c
 #, c-format
 msgid ""
 "\n"
@@ -744,37 +733,37 @@ msgstr ""
 "\n"
 "Nonaktifkan pesan ini dengan \"git config advice.%s false\""
 
-#: advice.c:97
+#: advice.c
 #, c-format
 msgid "%shint: %.*s%s\n"
 msgstr "%shint: %.*s%s\n"
 
-#: advice.c:181
+#: advice.c
 msgid "Cherry-picking is not possible because you have unmerged files."
 msgstr "Pemetikan ceri tidak mungkin sebab Anda punya berkas tak tergabung."
 
-#: advice.c:183
+#: advice.c
 msgid "Committing is not possible because you have unmerged files."
 msgstr "Pengkomitan tidak mungkin sebab Anda punya berkas tak tergabung."
 
-#: advice.c:185
+#: advice.c
 msgid "Merging is not possible because you have unmerged files."
 msgstr "Penggabungan tidak mungkin sebab Anda punya berkas tak tergabung."
 
-#: advice.c:187
+#: advice.c
 msgid "Pulling is not possible because you have unmerged files."
 msgstr "Penarikan tidak mungkin sebab Anda punya berkas tak tergabung."
 
-#: advice.c:189
+#: advice.c
 msgid "Reverting is not possible because you have unmerged files."
 msgstr "Pembalikkan tidak mungkin sebab Anda punya berkas tak tergabung."
 
-#: advice.c:191
+#: advice.c
 #, c-format
 msgid "It is not possible to %s because you have unmerged files."
 msgstr "Tidak mungkin untuk %s sebab Anda punya berkas tak tergabung."
 
-#: advice.c:199
+#: advice.c
 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."
@@ -782,27 +771,27 @@ msgstr ""
 "Perbaiki di dalam pohon kerja, lalu gunakan 'git add/rm <berkas>'\n"
 "sebagaimana mestinya untuk menandai resolusi dan membuat sebuah komit."
 
-#: advice.c:207
+#: advice.c
 msgid "Exiting because of an unresolved conflict."
 msgstr "Keluar karena sebuah konflik tak terselesaikan."
 
-#: advice.c:212 builtin/merge.c:1388
+#: advice.c builtin/merge.c
 msgid "You have not concluded your merge (MERGE_HEAD exists)."
 msgstr "Anda belum mengakhiri penggabungan Anda (MERGE_HEAD ada)."
 
-#: advice.c:214
+#: advice.c
 msgid "Please, commit your changes before merging."
 msgstr "Mohon komit perubahan Anda sebelum menggabungkan."
 
-#: advice.c:215
+#: advice.c
 msgid "Exiting because of unfinished merge."
 msgstr "Keluar karena penggabungan belum selesai."
 
-#: advice.c:220
+#: advice.c
 msgid "Not possible to fast-forward, aborting."
 msgstr "Tidak mungkin untuk maju cepat, batalkan."
 
-#: advice.c:230
+#: advice.c
 #, c-format
 msgid ""
 "The following paths and/or pathspecs matched paths that exist\n"
@@ -813,7 +802,7 @@ msgstr ""
 "di luar definisi checkout tipis Anda, jadi tidak akan diperbarui\n"
 "di dalam indeks:\n"
 
-#: advice.c:237
+#: advice.c
 msgid ""
 "If you intend to update such entries, try one of the following:\n"
 "* Use the --sparse option.\n"
@@ -823,7 +812,7 @@ msgstr ""
 "* Gunakan opsi --sparse\n"
 "* Nonaktifkan atau modifikasi aturan kejarangan."
 
-#: advice.c:245
+#: advice.c
 #, c-format
 msgid ""
 "Note: switching to '%s'.\n"
@@ -868,103 +857,89 @@ msgstr ""
 "ke false\n"
 "\n"
 
-#: alias.c:50
+#: alias.c
 msgid "cmdline ends with \\"
 msgstr "baris perintah diakhiri dengan \\"
 
-#: alias.c:51
+#: alias.c
 msgid "unclosed quote"
 msgstr "tanda kutip tak ditutup"
 
-#: apply.c:70
+#: apply.c
 #, c-format
 msgid "unrecognized whitespace option '%s'"
 msgstr "opsi spasi putih tidak dikenal '%s'"
 
-#: apply.c:86
+#: apply.c
 #, c-format
 msgid "unrecognized whitespace ignore option '%s'"
 msgstr "opsi abai spasi putih tidak dikenal '%s'"
 
-#: apply.c:138 archive.c:584 parse-options.c:1122 range-diff.c:555
-#: revision.c:2314 revision.c:2318 revision.c:2327 revision.c:2332
-#: revision.c:2560 revision.c:2895 revision.c:2899 revision.c:2907
-#: revision.c:2910 revision.c:2912 builtin/add.c:507 builtin/add.c:509
-#: builtin/add.c:515 builtin/add.c:527 builtin/branch.c:755
-#: builtin/checkout.c:472 builtin/checkout.c:475 builtin/checkout.c:1663
-#: builtin/checkout.c:1773 builtin/checkout.c:1776 builtin/clone.c:921
-#: builtin/commit.c:359 builtin/commit.c:362 builtin/commit.c:1200
-#: builtin/commit.c:1256 builtin/commit.c:1273 builtin/describe.c:593
-#: builtin/diff-tree.c:155 builtin/difftool.c:733 builtin/fast-export.c:1245
-#: builtin/fetch.c:2141 builtin/fetch.c:2162 builtin/fetch.c:2167
-#: builtin/help.c:602 builtin/index-pack.c:1858 builtin/init-db.c:560
-#: builtin/log.c:1968 builtin/log.c:1970 builtin/ls-files.c:778
-#: builtin/merge-base.c:163 builtin/merge-base.c:169 builtin/merge.c:1409
-#: builtin/merge.c:1411 builtin/pack-objects.c:4098 builtin/push.c:592
-#: builtin/push.c:630 builtin/push.c:636 builtin/push.c:641
-#: builtin/rebase.c:1221 builtin/rebase.c:1223 builtin/rebase.c:1227
-#: builtin/repack.c:688 builtin/repack.c:719 builtin/reset.c:433
-#: builtin/reset.c:469 builtin/rev-list.c:537 builtin/show-branch.c:711
-#: builtin/stash.c:1696 builtin/stash.c:1699 builtin/submodule--helper.c:1328
-#: builtin/submodule--helper.c:3054 builtin/tag.c:527 builtin/tag.c:573
-#: builtin/worktree.c:779
+#: apply.c archive.c builtin/add.c builtin/branch.c builtin/checkout.c
+#: builtin/clone.c builtin/commit.c builtin/describe.c builtin/diff-tree.c
+#: builtin/difftool.c builtin/fast-export.c builtin/fetch.c builtin/help.c
+#: builtin/index-pack.c builtin/init-db.c builtin/log.c builtin/ls-files.c
+#: builtin/merge-base.c builtin/merge.c builtin/pack-objects.c builtin/push.c
+#: builtin/rebase.c builtin/repack.c builtin/reset.c builtin/rev-list.c
+#: builtin/show-branch.c builtin/stash.c builtin/submodule--helper.c
+#: builtin/tag.c builtin/worktree.c parse-options.c range-diff.c revision.c
 #, c-format
 msgid "options '%s' and '%s' cannot be used together"
 msgstr "Opsi '%s' dan '%s' tidak dapat digunakan bersamaan"
 
-#: apply.c:141 apply.c:152 apply.c:155
+#: apply.c
 #, c-format
 msgid "'%s' outside a repository"
 msgstr "'%s' di luar repositori"
 
-#: apply.c:807
+#: apply.c
 #, c-format
 msgid "Cannot prepare timestamp regexp %s"
 msgstr "Tidak dapat menyiapkan ekspresi reguler stempel waktu %s"
 
-#: apply.c:816
+#: apply.c
 #, c-format
 msgid "regexec returned %d for input: %s"
 msgstr "regexec kembalikan %d untuk input: %s"
 
-#: apply.c:890
+#: apply.c
 #, c-format
 msgid "unable to find filename in patch at line %d"
 msgstr "tidak dapat menemukan nama berkas dalam tambalan pada baris %d"
 
-#: apply.c:928
+#: apply.c
 #, c-format
 msgid "git apply: bad git-diff - expected /dev/null, got %s on line %d"
 msgstr "git apply: git-diff jelek - berharap /dev/null, dapat %s pada baris %d"
 
-#: apply.c:934
+#: apply.c
 #, 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:935
+#: apply.c
 #, 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:940
+#: apply.c
 #, c-format
 msgid "git apply: bad git-diff - expected /dev/null on line %d"
 msgstr "git apply: git-diff jelek - berharap /dev/null pada baris %d"
 
-#: apply.c:969
+#: apply.c
 #, c-format
 msgid "invalid mode on line %d: %s"
 msgstr "mode tidak valid pada baris %d: %s"
 
-#: apply.c:1288
+#: apply.c
 #, c-format
 msgid "inconsistent header lines %d and %d"
 msgstr "kepala baris %d dan %d tidak konsisten"
 
-#: apply.c:1378
+#: apply.c
 #, c-format
 msgid ""
 "git diff header lacks filename information when removing %d leading pathname "
@@ -979,92 +954,92 @@ msgstr[1] ""
 "kepala git diff kekurangan informasi nama berkas ketika menghapus %d "
 "komponen nama jalur terkemuka (baris %d)"
 
-#: apply.c:1391
+#: apply.c
 #, c-format
 msgid "git diff header lacks filename information (line %d)"
 msgstr "kepala git diff kekurangan informasi nama berkas (baris %d)"
 
-#: apply.c:1487
+#: apply.c
 #, c-format
 msgid "recount: unexpected line: %.*s"
 msgstr "recount: baris tidak diharapkan: %.*s"
 
-#: apply.c:1556
+#: apply.c
 #, c-format
 msgid "patch fragment without header at line %d: %.*s"
 msgstr "pecahan tambalan tanpa kepala pada baris %d: %.*s"
 
-#: apply.c:1759
+#: apply.c
 msgid "new file depends on old contents"
 msgstr "berkas baru bergantung pada konten yang lama"
 
-#: apply.c:1761
+#: apply.c
 msgid "deleted file still has contents"
 msgstr "berkas terhapus masih ada konten"
 
-#: apply.c:1795
+#: apply.c
 #, c-format
 msgid "corrupt patch at line %d"
 msgstr "tambalan rusak pada baris %d"
 
-#: apply.c:1832
+#: apply.c
 #, c-format
 msgid "new file %s depends on old contents"
 msgstr "berkas baru %s bergantung pada konten yang lama"
 
-#: apply.c:1834
+#: apply.c
 #, c-format
 msgid "deleted file %s still has contents"
 msgstr "berkas yang dihapus %s masih ada konten"
 
-#: apply.c:1837
+#: apply.c
 #, c-format
 msgid "** warning: file %s becomes empty but is not deleted"
 msgstr "** peringatan: berkas %s menjadi kosong tetapi tidak dihapus"
 
-#: apply.c:1985
+#: apply.c
 #, c-format
 msgid "corrupt binary patch at line %d: %.*s"
 msgstr "tambalan biner rusak pada baris %d: %.*s"
 
-#: apply.c:2022
+#: apply.c
 #, c-format
 msgid "unrecognized binary patch at line %d"
 msgstr "tambalan biner tidak dikenal pada baris %d"
 
-#: apply.c:2184
+#: apply.c
 #, c-format
 msgid "patch with only garbage at line %d"
 msgstr "tambal dengan hanya sampah pada baris %d"
 
-#: apply.c:2270
+#: apply.c
 #, c-format
 msgid "unable to read symlink %s"
 msgstr "tidak dapat membaca tautan simbolik %s"
 
-#: apply.c:2274
+#: apply.c
 #, c-format
 msgid "unable to open or read %s"
 msgstr "tidak dapat membuka atau membaca %s"
 
-#: apply.c:2943
+#: apply.c
 #, c-format
 msgid "invalid start of line: '%c'"
 msgstr "awal baris tidak valid: '%c'"
 
-#: apply.c:3064
+#: apply.c
 #, c-format
 msgid "Hunk #%d succeeded at %d (offset %d line)."
 msgid_plural "Hunk #%d succeeded at %d (offset %d lines)."
 msgstr[0] "Bingkah #%d berhasil pada %d (ganti %d baris)."
 msgstr[1] "Bingkah #%d berhasil pada %d (ganti %d baris)."
 
-#: apply.c:3076
+#: apply.c
 #, c-format
 msgid "Context reduced to (%ld/%ld) to apply fragment at %d"
 msgstr "Konteks dikurangi menjadi (%ld/%ld) untuk terapkan pecahan pada %d"
 
-#: apply.c:3082
+#: apply.c
 #, c-format
 msgid ""
 "while searching for:\n"
@@ -1073,674 +1048,682 @@ msgstr ""
 "ketika mencari:\n"
 "%.*s"
 
-#: apply.c:3104
+#: apply.c
 #, c-format
 msgid "missing binary patch data for '%s'"
 msgstr "data tambalan biner hilang untuk '%s'"
 
-#: apply.c:3112
+#: apply.c
 #, 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:3159
+#: apply.c
 #, c-format
 msgid "cannot apply binary patch to '%s' without full index line"
 msgstr "tidak dapat menerapkan tambalan biner ke '%s' tanpa baris indeks penuh"
 
-#: apply.c:3170
+#: apply.c
 #, 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:3178
+#: apply.c
 #, c-format
 msgid "the patch applies to an empty '%s' but it is not empty"
 msgstr "tambalan diterapkan ke '%s' kosong tapi tidak kosong"
 
-#: apply.c:3196
+#: apply.c
 #, c-format
 msgid "the necessary postimage %s for '%s' cannot be read"
 msgstr "pascacitra %s yang diperlukan untuk '%s' tidak dapat dibaca"
 
-#: apply.c:3209
+#: apply.c
 #, c-format
 msgid "binary patch does not apply to '%s'"
 msgstr "tambalan biner tidak dapat diterapkan ke '%s'"
 
-#: apply.c:3216
+#: apply.c
 #, 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:3237
+#: apply.c
 #, c-format
 msgid "patch failed: %s:%ld"
 msgstr "tambalan gagal: %s:%ld"
 
-#: apply.c:3360
+#: apply.c
 #, c-format
 msgid "cannot checkout %s"
 msgstr "tidak dapat men-checkout %s"
 
-#: apply.c:3412 apply.c:3423 apply.c:3469 midx.c:105 pack-revindex.c:214
-#: setup.c:310
+#: apply.c midx.c pack-mtimes.c pack-revindex.c setup.c
 #, c-format
 msgid "failed to read %s"
 msgstr "gagal membaca %s"
 
-#: apply.c:3420
+#: apply.c
 #, c-format
 msgid "reading from '%s' beyond a symbolic link"
 msgstr "membaca dari '%s' diluar tautan simbolik"
 
-#: apply.c:3449 apply.c:3721
+#: apply.c
 #, c-format
 msgid "path %s has been renamed/deleted"
 msgstr "jalus %s sudah dinamai ulang/dihapus"
 
-#: apply.c:3559 apply.c:3736
+#: apply.c
 #, c-format
 msgid "%s: does not exist in index"
 msgstr "%s: tidak ada di indeks"
 
-#: apply.c:3568 apply.c:3744 apply.c:3960
+#: apply.c
 #, c-format
 msgid "%s: does not match index"
 msgstr "%s: tidak cocok dengan indeks"
 
-#: apply.c:3605
+#: apply.c
 msgid "repository lacks the necessary blob to perform 3-way merge."
 msgstr ""
 "repositori kekurangan blob yang diperlukan untuk melakukan penggabungan 3 "
 "arah."
 
-#: apply.c:3608
+#: apply.c
 #, c-format
 msgid "Performing three-way merge...\n"
 msgstr "Melakukan penggabungan 3 arah...\n"
 
-#: apply.c:3624 apply.c:3628
+#: apply.c
 #, c-format
 msgid "cannot read the current contents of '%s'"
 msgstr "tidak dapat membaca konten saat ini dari '%s'"
 
-#: apply.c:3640
+#: apply.c
 #, c-format
 msgid "Failed to perform three-way merge...\n"
 msgstr "Gagal melakukan penggabungan 3 arah...\n"
 
-#: apply.c:3654
+#: apply.c
 #, c-format
 msgid "Applied patch to '%s' with conflicts.\n"
 msgstr "Tambalan diterapkan ke '%s' dengan konflik.\n"
 
-#: apply.c:3659
+#: apply.c
 #, c-format
 msgid "Applied patch to '%s' cleanly.\n"
 msgstr "Tambalan diterapkan ke '%s' dengan rapi.\n"
 
-#: apply.c:3676
+#: apply.c
 #, c-format
 msgid "Falling back to direct application...\n"
 msgstr "Mundur ke penerapan langsung...\n"
 
-#: apply.c:3688
+#: apply.c
 msgid "removal patch leaves file contents"
 msgstr "tambalan penghapusan meninggalkan isi berkas"
 
-#: apply.c:3761
+#: apply.c
 #, c-format
 msgid "%s: wrong type"
 msgstr "%s: salah tipe"
 
-#: apply.c:3763
+#: apply.c
 #, c-format
 msgid "%s has type %o, expected %o"
 msgstr "%s bertipe %o, diharapkan %o"
 
-#: apply.c:3900 apply.c:3902 read-cache.c:903 read-cache.c:932
-#: read-cache.c:1399
+#: apply.c read-cache.c
 #, c-format
 msgid "invalid path '%s'"
 msgstr "jalur tidak valid '%s'"
 
-#: apply.c:3958
+#: apply.c
 #, c-format
 msgid "%s: already exists in index"
 msgstr "%s: sudah ada di indeks"
 
-#: apply.c:3962
+#: apply.c
 #, c-format
 msgid "%s: already exists in working directory"
 msgstr "%s: sudah ada di direktori kerja"
 
-#: apply.c:3982
+#: apply.c
 #, c-format
 msgid "new mode (%o) of %s does not match old mode (%o)"
 msgstr "mode baru (%o) dari %s tidak cocok dengan mode lama (%o)"
 
-#: apply.c:3987
+#: apply.c
 #, c-format
 msgid "new mode (%o) of %s does not match old mode (%o) of %s"
 msgstr "mode baru (%o) dari %s tidak cocok dengan mode lama (%o) dari %s"
 
-#: apply.c:4007
+#: apply.c
 #, c-format
 msgid "affected file '%s' is beyond a symbolic link"
 msgstr "berkas yang terpengaruh '%s' diluar tautan simbolik"
 
-#: apply.c:4011
+#: apply.c
 #, c-format
 msgid "%s: patch does not apply"
 msgstr "%s: tambalan tak diterapkan"
 
-#: apply.c:4026
+#: apply.c
 #, c-format
 msgid "Checking patch %s..."
 msgstr "Memeriksa tambalan %s..."
 
-#: apply.c:4118
+#: apply.c
 #, c-format
 msgid "sha1 information is lacking or useless for submodule %s"
 msgstr "informasi sha1 kurang atau tidak berguna untuk submodul %s"
 
-#: apply.c:4125
+#: apply.c
 #, c-format
 msgid "mode change for %s, which is not in current HEAD"
 msgstr "perubahan mode untuk %s, yang bukan dalam HEAD saat ini"
 
-#: apply.c:4128
+#: apply.c
 #, c-format
 msgid "sha1 information is lacking or useless (%s)."
 msgstr "informasi sha1 kurang atau tidak berguna (%s)"
 
-#: apply.c:4137
+#: apply.c
 #, c-format
 msgid "could not add %s to temporary index"
 msgstr "tidak dapat menambahkan %s ke indeks sementara"
 
-#: apply.c:4147
+#: apply.c
 #, c-format
 msgid "could not write temporary index to %s"
 msgstr "tidak dapat menulis indeks sementara ke %s"
 
-#: apply.c:4285
+#: apply.c
 #, c-format
 msgid "unable to remove %s from index"
 msgstr "tidak dapat menghapus %s dari indeks"
 
-#: apply.c:4319
+#: apply.c
 #, c-format
 msgid "corrupt patch for submodule %s"
 msgstr "tambalan rusak untuk submodul %s"
 
-#: apply.c:4325
+#: apply.c
 #, c-format
 msgid "unable to stat newly created file '%s'"
 msgstr "tidak dapat men-stat berkas yang baru dibuat '%s'"
 
-#: apply.c:4333
+#: apply.c
 #, 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:4339 apply.c:4484
+#: apply.c
 #, c-format
 msgid "unable to add cache entry for %s"
 msgstr "tidak dapat menambahkan entri tembolok untuk %s"
 
-#: apply.c:4382 builtin/bisect--helper.c:540 builtin/gc.c:2258
-#: builtin/gc.c:2293
+#: apply.c builtin/bisect--helper.c builtin/gc.c
 #, c-format
 msgid "failed to write to '%s'"
 msgstr "gagal menulis ke '%s'"
 
-#: apply.c:4386
+#: apply.c
 #, c-format
 msgid "closing file '%s'"
 msgstr "menutup berkas '%s'"
 
-#: apply.c:4456
+#: apply.c
 #, c-format
 msgid "unable to write file '%s' mode %o"
 msgstr "tidak dapat menulis berkas '%s' mode %o"
 
-#: apply.c:4554
+#: apply.c
 #, c-format
 msgid "Applied patch %s cleanly."
 msgstr "Tambalan %s diterapkan dengan rapi."
 
-#: apply.c:4562
+#: apply.c
 msgid "internal error"
 msgstr "kesalahan internal"
 
-#: apply.c:4565
+#: apply.c
 #, c-format
 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:4576
+#: apply.c
 #, c-format
 msgid "truncating .rej filename to %.*s.rej"
 msgstr "memotong nama berkas .rej ke %.*s.rej"
 
-#: apply.c:4584
+#: apply.c
 #, c-format
 msgid "cannot open %s"
 msgstr "tidak dapat membuka %s"
 
-#: apply.c:4598
+#: apply.c
 #, c-format
 msgid "Hunk #%d applied cleanly."
 msgstr "Bingkah #%d diterapkan dengan rapi."
 
-#: apply.c:4602
+#: apply.c
 #, c-format
 msgid "Rejected hunk #%d."
 msgstr "Bingkah #%d ditolak."
 
-#: apply.c:4731
+#: apply.c
 #, c-format
 msgid "Skipped patch '%s'."
 msgstr "Tambalan '%s' dilewatkan."
 
-#: apply.c:4740
+#: apply.c
 msgid "No valid patches in input (allow with \"--allow-empty\")"
 msgstr ""
+"Tidak ada tambalan valid dalam masukan (perbolehkan dengan \"--allow-empty\")"
 
-#: apply.c:4761
+#: apply.c
 msgid "unable to read index file"
 msgstr "tidak dapa membaca berkas indeks"
 
-#: apply.c:4918
+#: apply.c
 #, c-format
 msgid "can't open patch '%s': %s"
 msgstr "tidak dapat membuka tambalan '%s': %s"
 
-#: apply.c:4945
+#: apply.c
 #, c-format
 msgid "squelched %d whitespace error"
 msgid_plural "squelched %d whitespace errors"
 msgstr[0] "%d kesalahan spasi putih dipadamkan"
 msgstr[1] "%d kesalahan spasi putih dipadamkan"
 
-#: apply.c:4951 apply.c:4966
+#: apply.c
 #, c-format
 msgid "%d line adds whitespace errors."
 msgid_plural "%d lines add whitespace errors."
 msgstr[0] "%d baris menambahkan kesalahan spasi putih."
 msgstr[1] "%d baris menambahkan kesalahan spasi putih."
 
-#: apply.c:4959
+#: apply.c
 #, c-format
 msgid "%d line applied after fixing whitespace errors."
 msgid_plural "%d lines applied after fixing whitespace errors."
 msgstr[0] "%d baris diterapkan setelah memperbaiki kesalahan spasi putih."
 msgstr[1] "%d baris diterapkan setelah memperbaiki kesalahan spasi putih."
 
-#: apply.c:4975 builtin/add.c:690 builtin/mv.c:338 builtin/rm.c:430
+#: apply.c builtin/add.c builtin/mv.c builtin/rm.c
 msgid "Unable to write new index file"
 msgstr "Tidak dapat menulis berkas indeks baru"
 
-#: apply.c:5003
+#: apply.c
 msgid "don't apply changes matching the given path"
 msgstr "jangan terapkan perubahan yang cocok dengan jalur yang diberikan"
 
-#: apply.c:5006
+#: apply.c
 msgid "apply changes matching the given path"
 msgstr "terapkan perubahan yang cocok dengan jalur yang diberikan"
 
-#: apply.c:5008 builtin/am.c:2379
+#: apply.c builtin/am.c
 msgid "num"
 msgstr "jumlah"
 
-#: apply.c:5009
+#: apply.c
 msgid "remove <num> leading slashes from traditional diff paths"
 msgstr "hapus <jumlah> garis miring terkemuka dari jalur diff tradisional"
 
-#: apply.c:5012
+#: apply.c
 msgid "ignore additions made by the patch"
 msgstr "abaikan penambahan yang dibuat oleh tambalan"
 
-#: apply.c:5014
+#: apply.c
 msgid "instead of applying the patch, output diffstat for the input"
 msgstr "daripada menerapkan tambalan, keluarkan diffstat untuk masukan"
 
-#: apply.c:5018
+#: apply.c
 msgid "show number of added and deleted lines in decimal notation"
 msgstr ""
 "perlihatkan jumlah baris yang ditambahkan dan dihapuskan dalam notasi desimal"
 
-#: apply.c:5020
+#: apply.c
 msgid "instead of applying the patch, output a summary for the input"
 msgstr "daripada menerapkan tambalan, keluarkan ringkasan untuk masukan"
 
-#: apply.c:5022
+#: apply.c
 msgid "instead of applying the patch, see if the patch is applicable"
 msgstr "daripada menerapkan tambalan, lihat jika tambalan bisa diterapkan"
 
-#: apply.c:5024
+#: apply.c
 msgid "make sure the patch is applicable to the current index"
 msgstr "pastikan tambalan bisa diterapkan ke indeks saat ini"
 
-#: apply.c:5026
+#: apply.c
 msgid "mark new files with `git add --intent-to-add`"
 msgstr "tandai berkas baru dengan `git add --intent-to-add`"
 
-#: apply.c:5028
+#: apply.c
 msgid "apply a patch without touching the working tree"
 msgstr "terapkan sebuah tambalan tanpa menyentuh pohon kerja"
 
-#: apply.c:5030
+#: apply.c
 msgid "accept a patch that touches outside the working area"
 msgstr "terima sebuah tambalan yang menyentuh di luar area kerja"
 
-#: apply.c:5033
+#: apply.c
 msgid "also apply the patch (use with --stat/--summary/--check)"
 msgstr "juga terapkan tambalan (gunakan dengan --stat/--summary/--check)"
 
-#: apply.c:5035
+#: apply.c
 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:5037
+#: apply.c
 msgid "build a temporary index based on embedded index information"
 msgstr "bangun sebuah indeks sementara berdasarkan informasi indeks tertanam"
 
-#: apply.c:5040 builtin/checkout-index.c:230
+#: apply.c builtin/checkout-index.c
 msgid "paths are separated with NUL character"
 msgstr "jalur dipisahkan dengan karakter NUL"
 
-#: apply.c:5042
+#: apply.c
 msgid "ensure at least <n> lines of context match"
 msgstr "pastikan setidaknya <n> baris dari konteks cocokan"
 
-#: apply.c:5043 builtin/am.c:2355 builtin/am.c:2358
-#: builtin/interpret-trailers.c:98 builtin/interpret-trailers.c:100
-#: builtin/interpret-trailers.c:102 builtin/pack-objects.c:3983
-#: builtin/rebase.c:1079
+#: apply.c builtin/am.c builtin/interpret-trailers.c builtin/pack-objects.c
+#: builtin/rebase.c
 msgid "action"
 msgstr "aksi"
 
-#: apply.c:5044
+#: apply.c
 msgid "detect new or modified lines that have whitespace errors"
 msgstr "deteksi baris baru atau yang diubah yang ada kesalahan spasi putih"
 
-#: apply.c:5047 apply.c:5050
+#: apply.c
 msgid "ignore changes in whitespace when finding context"
 msgstr "abaikan perubahan spasi putih ketika menemukan konteks"
 
-#: apply.c:5053
+#: apply.c
 msgid "apply the patch in reverse"
 msgstr "terapkan tambalan terbalik"
 
-#: apply.c:5055
+#: apply.c
 msgid "don't expect at least one line of context"
 msgstr "jangan harap setidaknya satu baris konteks"
 
-#: apply.c:5057
+#: apply.c
 msgid "leave the rejected hunks in corresponding *.rej files"
 msgstr "tinggalkan bingkah yang ditolak pada berkas *.rej yang bersesuaian"
 
-#: apply.c:5059
+#: apply.c
 msgid "allow overlapping hunks"
 msgstr "perbolehkan bingkah yang tumpang tindih"
 
-#: apply.c:5062
+#: apply.c
 msgid "tolerate incorrectly detected missing new-line at the end of file"
 msgstr "tolerir baris baru hilang yang salah dideteksi pada akhir berkas"
 
-#: apply.c:5065
+#: apply.c
 msgid "do not trust the line counts in the hunk headers"
 msgstr "jangan percaya hitungan baris pada kepala bingkah"
 
-#: apply.c:5067 builtin/am.c:2367
+#: apply.c builtin/am.c
 msgid "root"
 msgstr "akar"
 
-#: apply.c:5068
+#: apply.c
 msgid "prepend <root> to all filenames"
 msgstr "tambahkan <akar> di depan semua nama berkas"
 
-#: apply.c:5071
+#: apply.c
 msgid "don't return error for empty patches"
 msgstr "jangan kembalikan kesalahan untuk tambalan kosong"
 
-#: archive-tar.c:125 archive-zip.c:346
+#: archive-tar.c archive-zip.c
 #, c-format
 msgid "cannot stream blob %s"
 msgstr "tidak dapat mengaruskan blob %s"
 
-#: archive-tar.c:265 archive-zip.c:359
+#: archive-tar.c archive-zip.c
 #, c-format
 msgid "unsupported file mode: 0%o (SHA1: %s)"
 msgstr "mode berkas tidak didukung: 0%o (SHA1: %s)"
 
-#: archive-tar.c:447
+#: archive-tar.c
 #, c-format
 msgid "unable to start '%s' filter"
 msgstr "tidak dapat memulai saringan '%s'"
 
-#: archive-tar.c:450
+#: archive-tar.c
 msgid "unable to redirect descriptor"
 msgstr "tidak dapat mengalihkan pendeskripsi"
 
-#: archive-tar.c:457
+#: archive-tar.c
 #, c-format
 msgid "'%s' filter reported error"
 msgstr "saringan '%s' melaporkan kesalahan"
 
-#: archive-zip.c:319
+#: archive-zip.c
 #, c-format
 msgid "path is not valid UTF-8: %s"
 msgstr "jalur bukan UTF-8 valid: %s"
 
-#: archive-zip.c:323
+#: archive-zip.c
 #, c-format
 msgid "path too long (%d chars, SHA1: %s): %s"
 msgstr "jalur terlalu panjang (%d karakter, SHA1: %s): %s"
 
-#: archive-zip.c:470 builtin/pack-objects.c:363 builtin/pack-objects.c:366
+#: archive-zip.c builtin/pack-objects.c
 #, c-format
 msgid "deflate error (%d)"
 msgstr "kesalahan deflasi (%d)"
 
-#: archive-zip.c:604
+#: archive-zip.c
 #, c-format
 msgid "timestamp too large for this system: %<PRIuMAX>"
 msgstr "stempel waktu terlalu besar untuk sistem ini: %<PRIuMAX>"
 
-#: archive.c:14
+#: archive.c
 msgid "git archive [<options>] <tree-ish> [<path>...]"
 msgstr "git archive [<opsi>] <mirip pohon> [<jalur>...]"
 
-#: archive.c:16
+#: archive.c
 msgid ""
 "git archive --remote <repo> [--exec <cmd>] [<options>] <tree-ish> [<path>...]"
 msgstr ""
 "git archive --remote <repo> [--exec <perintah>] [<opsi>] <mirip pohon> "
 "[<jalur>...]"
 
-#: archive.c:17
+#: archive.c
 msgid "git archive --remote <repo> [--exec <cmd>] --list"
 msgstr "git archive --remote <repo> [--exec <perintah>] --list"
 
-#: archive.c:188 archive.c:341 builtin/gc.c:497 builtin/notes.c:238
-#: builtin/tag.c:579
+#: archive.c builtin/gc.c builtin/notes.c builtin/tag.c
 #, c-format
 msgid "cannot read '%s'"
 msgstr "tidak dapat membaca '%s'"
 
-#: archive.c:426 builtin/add.c:214 builtin/add.c:657 builtin/rm.c:334
+#: archive.c builtin/add.c builtin/rm.c
 #, c-format
 msgid "pathspec '%s' did not match any files"
 msgstr "spek jalur '%s' tidak cocok dengan berkas apapun"
 
-#: archive.c:450
+#: archive.c
 #, c-format
 msgid "no such ref: %.*s"
 msgstr "tidak ada referensi seperti: %.*s"
 
-#: archive.c:456
+#: archive.c
 #, c-format
 msgid "not a valid object name: %s"
 msgstr "bukan nama objek valid: %s"
 
-#: archive.c:469
+#: archive.c
 #, c-format
 msgid "not a tree object: %s"
 msgstr "bukan objek pohon: %s"
 
-#: archive.c:481
+#: archive.c
 msgid "current working directory is untracked"
 msgstr "direktori kerja saat ini tak terlacak"
 
-#: archive.c:522
+#: archive.c
 #, c-format
 msgid "File not found: %s"
 msgstr "Berkas tidak ditemukan: %s"
 
-#: archive.c:524
+#: archive.c
 #, c-format
 msgid "Not a regular file: %s"
 msgstr "Bukan berkas reguler: %s"
 
-#: archive.c:551
+#: archive.c
+#, c-format
+msgid "unclosed quote: '%s'"
+msgstr "tanda kutip tak ditutup: '%s'"
+
+#: archive.c
+#, c-format
+msgid "missing colon: '%s'"
+msgstr "titik dua hilang: '%s'"
+
+#: archive.c
+#, c-format
+msgid "empty file name: '%s'"
+msgstr "nama berkas kosong: '%s'"
+
+#: archive.c
 msgid "fmt"
 msgstr "fmt"
 
-#: archive.c:551
+#: archive.c
 msgid "archive format"
 msgstr "format arsip"
 
-#: archive.c:552 builtin/log.c:1809
+#: archive.c builtin/log.c
 msgid "prefix"
 msgstr "prefiks"
 
-#: archive.c:553
+#: archive.c
 msgid "prepend prefix to each pathname in the archive"
 msgstr "tambahkan prefiks di depan setiap nama jalur dalam arsip"
 
-#: archive.c:554 archive.c:557 builtin/blame.c:881 builtin/blame.c:885
-#: builtin/blame.c:886 builtin/commit-tree.c:115 builtin/config.c:135
-#: builtin/fast-export.c:1181 builtin/fast-export.c:1183
-#: builtin/fast-export.c:1187 builtin/grep.c:936 builtin/hash-object.c:104
-#: builtin/ls-files.c:654 builtin/ls-files.c:657 builtin/notes.c:410
-#: builtin/notes.c:576 builtin/read-tree.c:115 parse-options.h:195
+#: archive.c builtin/blame.c builtin/commit-tree.c builtin/config.c
+#: builtin/fast-export.c builtin/grep.c builtin/hash-object.c
+#: builtin/ls-files.c builtin/notes.c builtin/read-tree.c parse-options.h
 msgid "file"
 msgstr "berkas"
 
-#: archive.c:555
+#: archive.c
 msgid "add untracked file to archive"
 msgstr "tambahkan berkas tak terlacak ke arsip"
 
-#: archive.c:558 builtin/archive.c:88
+#: archive.c
+msgid "path:content"
+msgstr "jalur:konten"
+
+#: archive.c builtin/archive.c
 msgid "write the archive to this file"
 msgstr "tulis arsip ke berkas ini"
 
-#: archive.c:560
+#: archive.c
 msgid "read .gitattributes in working directory"
 msgstr "baca .gitattributes dalam direktori kerja"
 
-#: archive.c:561
+#: archive.c
 msgid "report archived files on stderr"
 msgstr "laporkan berkas terarsip ke error standar"
 
-#: archive.c:563
+#: archive.c
 msgid "set compression level"
 msgstr "setel level kompresi"
 
-#: archive.c:566
+#: archive.c
 msgid "list supported archive formats"
 msgstr "daftar format arsip yang didukung"
 
-#: archive.c:568 builtin/archive.c:89 builtin/clone.c:122 builtin/clone.c:125
-#: builtin/submodule--helper.c:1884 builtin/submodule--helper.c:2718
+#: archive.c builtin/archive.c builtin/clone.c builtin/submodule--helper.c
 msgid "repo"
 msgstr "repositori"
 
-#: archive.c:569 builtin/archive.c:90
+#: archive.c builtin/archive.c
 msgid "retrieve the archive from remote repository <repo>"
 msgstr "ambil arsip dari repositori remote <repo>"
 
-#: archive.c:570 builtin/archive.c:91 builtin/difftool.c:708
-#: builtin/notes.c:496
+#: archive.c builtin/archive.c builtin/difftool.c builtin/notes.c
 msgid "command"
 msgstr "perintah"
 
-#: archive.c:571 builtin/archive.c:92
+#: archive.c builtin/archive.c
 msgid "path to the remote git-upload-archive command"
 msgstr "jalur ke perintah git-upload-archive remote"
 
-#: archive.c:578
+#: archive.c
 msgid "Unexpected option --remote"
 msgstr "Opsi --remote tak diharapkan"
 
-#: archive.c:580 fetch-pack.c:300 revision.c:2914 builtin/add.c:530
-#: builtin/add.c:562 builtin/checkout.c:1782 builtin/clone.c:1099
-#: builtin/clone.c:1102 builtin/commit.c:371 builtin/fast-export.c:1230
-#: builtin/index-pack.c:1854 builtin/log.c:2140 builtin/reset.c:442
-#: builtin/reset.c:500 builtin/rm.c:281 builtin/stash.c:1708
-#: builtin/worktree.c:580 builtin/worktree.c:781 http-fetch.c:144
-#: http-fetch.c:153
+#: archive.c builtin/add.c builtin/checkout.c builtin/clone.c builtin/commit.c
+#: builtin/fast-export.c builtin/index-pack.c builtin/log.c builtin/reset.c
+#: builtin/rm.c builtin/stash.c builtin/worktree.c fetch-pack.c http-fetch.c
+#: revision.c
 #, c-format
 msgid "the option '%s' requires '%s'"
 msgstr "opsi `%s' butuh '%s'"
 
-#: archive.c:582
+#: archive.c
 msgid "Unexpected option --output"
 msgstr "Opsi --output tak diharapkan"
 
-#: archive.c:606
+#: archive.c
 #, c-format
 msgid "Unknown archive format '%s'"
 msgstr "Format arsip tidak dikenal '%s'"
 
-#: archive.c:615
+#: archive.c
 #, c-format
 msgid "Argument not supported for format '%s': -%d"
 msgstr "Argumen tidak didukung untuk format '%s': -%d"
 
-#: attr.c:202
+#: attr.c
 #, c-format
 msgid "%.*s is not a valid attribute name"
-msgstr ""
+msgstr "%.*s bukan sebuah nama atribut valid"
 
-#: attr.c:363
+#: attr.c
 #, c-format
 msgid "%s not allowed: %s:%d"
-msgstr ""
+msgstr "%s tidak diperbolehkan: %s:%d"
 
-#: attr.c:403
+#: attr.c
 msgid ""
 "Negative patterns are ignored in git attributes\n"
 "Use '\\!' for literal leading exclamation."
 msgstr ""
+"Pola negatif diabaikan di atribut git\n"
+"Gunakan '\\!' untuk tanda seru awal literal."
 
-#: bisect.c:488
+#: bisect.c
 #, c-format
 msgid "Badly quoted content in file '%s': %s"
 msgstr "Kontent terkutip jelek dalam berkas '%s': %s"
 
-#: bisect.c:698
+#: bisect.c
 #, c-format
 msgid "We cannot bisect more!\n"
 msgstr "Kami tidak dapat membagi dua lagi!\n"
 
-#: bisect.c:765
+#: bisect.c
 #, c-format
 msgid "Not a valid commit name %s"
 msgstr "Bukan sebuah nama komit yang valid %s"
 
-#: bisect.c:790
+#: bisect.c
 #, c-format
 msgid ""
 "The merge base %s is bad.\n"
@@ -1749,7 +1732,7 @@ msgstr ""
 "Dasar penggabungan %s jelek.\n"
 "Ini berarti bug telah diperbaiki antara %s dan [%s].\n"
 
-#: bisect.c:795
+#: bisect.c
 #, c-format
 msgid ""
 "The merge base %s is new.\n"
@@ -1758,7 +1741,7 @@ msgstr ""
 "Dasar penggabungan %s baru.\n"
 "Properti telah berubah antara %s dan [%s].\n"
 
-#: bisect.c:800
+#: bisect.c
 #, c-format
 msgid ""
 "The merge base %s is %s.\n"
@@ -1767,7 +1750,7 @@ msgstr ""
 "Dasar penggabungan %s adalah %s.\n"
 "Ini berarti komit '%s' pertama adalah di antara %s dan [%s].\n"
 
-#: bisect.c:808
+#: bisect.c
 #, c-format
 msgid ""
 "Some %s revs are not ancestors of the %s rev.\n"
@@ -1778,7 +1761,7 @@ msgstr ""
 "git bisect tidak dapat bekerja dengan benar pada kasus ini.\n"
 "Mungkin Anda salah mengira revisi %s dan %s?\n"
 
-#: bisect.c:821
+#: bisect.c
 #, c-format
 msgid ""
 "the merge base between %s and [%s] must be skipped.\n"
@@ -1789,36 +1772,36 @@ msgstr ""
 "Jadi kami tidak dapat yakin komit %s pertama di antara %s dan %s.\n"
 "Kami tetap lanjutkan."
 
-#: bisect.c:860
+#: bisect.c
 #, c-format
 msgid "Bisecting: a merge base must be tested\n"
 msgstr "Membagi dua: dasar penggabungan harus diuji\n"
 
-#: bisect.c:910
+#: bisect.c
 #, c-format
 msgid "a %s revision is needed"
 msgstr "sebuah revisi %s diperlukan"
 
-#: bisect.c:940
+#: bisect.c
 #, c-format
 msgid "could not create file '%s'"
 msgstr "tidak dapat membuat berkas '%s'"
 
-#: bisect.c:986 builtin/merge.c:155
+#: bisect.c builtin/merge.c
 #, c-format
 msgid "could not read file '%s'"
 msgstr "tidak dapat membaca berkas '%s'"
 
-#: bisect.c:1026
+#: bisect.c
 msgid "reading bisect refs failed"
 msgstr "gagal membaca berkas referensi bagi dua"
 
-#: bisect.c:1056
+#: bisect.c
 #, c-format
 msgid "%s was both %s and %s\n"
 msgstr "%s sama-sama %s dan %s\n"
 
-#: bisect.c:1065
+#: bisect.c
 #, c-format
 msgid ""
 "No testable commit found.\n"
@@ -1827,7 +1810,7 @@ msgstr ""
 "Tidak ada komit yang bisa diuji ditemukan.\n"
 "Mungkin Anda mulai dengan argumen jalur jelek?\n"
 
-#: bisect.c:1094
+#: bisect.c
 #, c-format
 msgid "(roughly %d step)"
 msgid_plural "(roughly %d steps)"
@@ -1837,53 +1820,50 @@ msgstr[1] "(kira-kira %d langkah)"
 #. TRANSLATORS: the last %s will be replaced with "(roughly %d
 #. steps)" translation.
 #.
-#: bisect.c:1100
+#: bisect.c
 #, 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"
 msgstr[0] "Membagi dua: %d revisi tersisa untuk diuji setelah ini %s\n"
 msgstr[1] "Membagi dua: %d revisi tersisa untuk diuji setelah ini %s\n"
 
-#: blame.c:2773
+#: blame.c
 msgid "--contents and --reverse do not blend well."
 msgstr "--contents dan --reverse tidak dapat dipadu dengan baik."
 
-#: blame.c:2787
+#: blame.c
 msgid "cannot use --contents with final commit object name"
 msgstr "tidak dapat menggunakan --contents dengan nama objek komit final"
 
-#: blame.c:2808
+#: blame.c
 msgid "--reverse and --first-parent together require specified latest commit"
 msgstr ""
 "--reverse dan --first-parent bersama-sama butuh komit terbaru yang disebutkan"
 
-#: blame.c:2817 bundle.c:231 midx.c:1058 ref-filter.c:2371 remote.c:2157
-#: sequencer.c:2348 sequencer.c:4872 submodule.c:913 builtin/commit.c:1118
-#: builtin/log.c:437 builtin/log.c:1055 builtin/log.c:1663 builtin/log.c:2096
-#: builtin/log.c:2387 builtin/merge.c:431 builtin/pack-objects.c:3381
-#: builtin/pack-objects.c:3781 builtin/pack-objects.c:3796
-#: builtin/shortlog.c:255
+#: blame.c builtin/commit.c builtin/log.c builtin/merge.c
+#: builtin/pack-objects.c builtin/shortlog.c bundle.c midx.c ref-filter.c
+#: remote.c sequencer.c submodule.c
 msgid "revision walk setup failed"
 msgstr "persiapan jalan revisi gagal"
 
-#: blame.c:2835
+#: blame.c
 msgid ""
 "--reverse --first-parent together require range along first-parent chain"
 msgstr ""
 "--reverse --first-parent bersama-sama butuh rentang bersama rantai induk "
 "pertama"
 
-#: blame.c:2846
+#: blame.c
 #, c-format
 msgid "no such path %s in %s"
 msgstr "tidak ada jalur seperti %s di %s"
 
-#: blame.c:2857
+#: blame.c
 #, c-format
 msgid "cannot read blob %s for path %s"
 msgstr "tidak dapat membaca blob %s untuk jalur %s"
 
-#: branch.c:93
+#: branch.c
 msgid ""
 "cannot inherit upstream tracking configuration of multiple refs when "
 "rebasing is requested"
@@ -1891,31 +1871,31 @@ msgstr ""
 "tidak dapat mewariskan konfigurasi pelacakan hulu banyak referensi ketika "
 "pendasaran ulang diminta"
 
-#: branch.c:104
+#: branch.c
 #, c-format
 msgid "not setting branch '%s' as its own upstream"
 msgstr "tidak menyetel '%s' sebagai hulunya"
 
-#: branch.c:160
+#: branch.c
 #, c-format
 msgid "branch '%s' set up to track '%s' by rebasing."
 msgstr "cabang '%s' disiapkan untuk melacak '%s' oleh pendasaran ulang."
 
-#: branch.c:161
+#: branch.c
 #, c-format
 msgid "branch '%s' set up to track '%s'."
 msgstr "cabang '%s' disiapkan untuk melacak '%s'."
 
-#: branch.c:164
+#: branch.c
 #, c-format
 msgid "branch '%s' set up to track:"
 msgstr "cabang '%s' disiapkan untuk melacak:"
 
-#: branch.c:176
+#: branch.c
 msgid "unable to write upstream branch configuration"
 msgstr "tidak dapat menulis konfigurasi cabang hulu"
 
-#: branch.c:178
+#: branch.c
 msgid ""
 "\n"
 "After fixing the error cause you may try to fix up\n"
@@ -1925,34 +1905,36 @@ msgstr ""
 "Setelah memperbaiki penyebab kesalahan Anda dapat mencoba memperbaiki\n"
 "informasi pelacakan remote dengan menjalankan:"
 
-#: branch.c:219
+#: branch.c
 #, c-format
 msgid "asked to inherit tracking from '%s', but no remote is set"
 msgstr ""
 "diminta mewariskan pelacakan dari '%s', tetapi tidak ada remote yang disetel"
 
-#: branch.c:225
+#: branch.c
 #, c-format
 msgid "asked to inherit tracking from '%s', but no merge configuration is set"
 msgstr ""
 "diminta mewariskan pelacakan dari '%s', tetapi tidak ada konfigurasi "
 "penggabungan yang disetel"
 
-#: branch.c:277
+#: branch.c
 #, c-format
 msgid "not tracking: ambiguous information for ref '%s'"
 msgstr "tak melacak: informasi ambigu untuk referensi '%s'"
 
+#. #-#-#-#-#  branch.c.po  #-#-#-#-#
 #. TRANSLATORS: This is a line listing a remote with duplicate
 #. refspecs in the advice message below. For RTL languages you'll
 #. probably want to swap the "%s" and leading "  " space around.
 #.
+#. #-#-#-#-#  object-name.c.po  #-#-#-#-#
 #. TRANSLATORS: This is line item of ambiguous object output
 #. from describe_ambiguous_object() above. For RTL languages
 #. you'll probably want to swap the "%s" and leading " " space
 #. around.
 #.
-#: branch.c:289 object-name.c:464
+#: branch.c object-name.c
 #, c-format
 msgid "  %s\n"
 msgstr ""
@@ -1960,7 +1942,7 @@ msgstr ""
 #. TRANSLATORS: The second argument is a \n-delimited list of
 #. duplicate refspecs, composed above.
 #.
-#: branch.c:295
+#: branch.c
 #, c-format
 msgid ""
 "There are multiple remotes whose fetch refspecs map to the remote\n"
@@ -1973,34 +1955,34 @@ msgid ""
 "tracking namespaces."
 msgstr ""
 
-#: branch.c:344
+#: branch.c
 #, c-format
 msgid "'%s' is not a valid branch name"
 msgstr "'%s' bukan nama cabang valid"
 
-#: branch.c:364
+#: branch.c
 #, c-format
 msgid "a branch named '%s' already exists"
 msgstr "sebuah cabang bernama '%s' sudah ada"
 
-#: branch.c:370
+#: branch.c
 #, c-format
 msgid "cannot force update the branch '%s' checked out at '%s'"
 msgstr "tidak dapat memperbarui paksa cabang '%s' yang ter-check out pada '%s'"
 
-#: branch.c:393
+#: branch.c
 #, c-format
 msgid "cannot set up tracking information; starting point '%s' is not a branch"
 msgstr ""
 "tidak dapat menyiapkan informasi pelacakan; titik awal '%s' bukan sebuah "
 "cabang"
 
-#: branch.c:395
+#: branch.c
 #, c-format
 msgid "the requested upstream branch '%s' does not exist"
 msgstr "cabang hulu yang diminta '%s' tidak ada"
 
-#: branch.c:397
+#: branch.c
 msgid ""
 "\n"
 "If you are planning on basing your work on an upstream\n"
@@ -2012,28 +1994,27 @@ msgid ""
 "\"git push -u\" to set the upstream config as you push."
 msgstr ""
 
-#: branch.c:445 builtin/replace.c:321 builtin/replace.c:377
-#: builtin/replace.c:423 builtin/replace.c:453
+#: branch.c builtin/replace.c
 #, c-format
 msgid "not a valid object name: '%s'"
 msgstr "bukan nama objek valid: '%s'"
 
-#: branch.c:465
+#: branch.c
 #, c-format
 msgid "ambiguous object name: '%s'"
 msgstr "nama objek ambigu: '%s'"
 
-#: branch.c:470
+#: branch.c
 #, c-format
 msgid "not a valid branch point: '%s'"
 msgstr "bukan sebuah titik cabang valid: '%s'"
 
-#: branch.c:658
+#: branch.c
 #, c-format
 msgid "submodule '%s': unable to find submodule"
 msgstr "submodul '%s': tidak dapat menemukan submodul"
 
-#: branch.c:661
+#: branch.c
 #, c-format
 msgid ""
 "You may try updating the submodules using 'git checkout %s && git submodule "
@@ -2042,8495 +2023,151 @@ msgstr ""
 "Anda dapat mencoba memperbarui submodul dengan 'git checkout %s && git "
 "submodule update --init'"
 
-#: branch.c:672 branch.c:698
+#: branch.c
 #, c-format
 msgid "submodule '%s': cannot create branch '%s'"
 msgstr "submodul '%s': tidak dapat membuat cabang '%s'"
 
-#: branch.c:730
+#: branch.c
 #, c-format
 msgid "'%s' is already checked out at '%s'"
 msgstr "'%s' sudah di-checkout pada '%s'"
 
-#: branch.c:755
+#: branch.c
 #, c-format
 msgid "HEAD of working tree %s is not updated"
 msgstr "HEAD dari pohon kerja %s tidak diperbarui"
 
-#: bundle.c:45
-#, c-format
-msgid "unrecognized bundle hash algorithm: %s"
-msgstr "algoritma hash bundel tidak dikenal: %s"
-
-#: bundle.c:53
-#, c-format
-msgid "unknown capability '%s'"
-msgstr "kapabilitas '%s' tidak dikenal"
-
-#: bundle.c:79
-#, c-format
-msgid "'%s' does not look like a v2 or v3 bundle file"
-msgstr "'%s' tidak terlihat seperti berkas bundel v2 atau v3"
-
-#: bundle.c:118
-#, c-format
-msgid "unrecognized header: %s%s (%d)"
-msgstr "kepala tidak dikenal: %s%s (%d)"
-
-#: bundle.c:145 rerere.c:464 rerere.c:675 sequencer.c:2616 sequencer.c:3402
-#: builtin/commit.c:865
-#, c-format
-msgid "could not open '%s'"
-msgstr "tidak dapat membuka '%s'"
-
-#: bundle.c:203
-msgid "Repository lacks these prerequisite commits:"
-msgstr "Repositori kekurangan komit prasyarat berikut:"
-
-#: bundle.c:206
-msgid "need a repository to verify a bundle"
-msgstr "perlu sebuah repositori untuk verifikasi bundel"
-
-#: bundle.c:264
-#, c-format
-msgid "The bundle contains this ref:"
-msgid_plural "The bundle contains these %<PRIuMAX> refs:"
-msgstr[0] "Bundel berisi referensi ini:"
-msgstr[1] "Bundel berisi %<PRIuMAX> referensi berikut:"
-
-#: bundle.c:272
-msgid "The bundle records a complete history."
-msgstr "Bundel merekam riwayat penuh."
-
-#: bundle.c:274
-#, c-format
-msgid "The bundle requires this ref:"
-msgid_plural "The bundle requires these %<PRIuMAX> refs:"
-msgstr[0] "Bundel membutuhkan referensi ini:"
-msgstr[1] "Bundel membutuhkan %<PRIuMAX> referensi berikut:"
-
-#: bundle.c:350
-msgid "unable to dup bundle descriptor"
-msgstr "tidak dapat men-dup pendeskripsi bundel"
-
-#: bundle.c:357
-msgid "Could not spawn pack-objects"
-msgstr "Tidak dapat menghidupkan pack-objects"
-
-#: bundle.c:368
-msgid "pack-objects died"
-msgstr "pack-objects mati"
-
-#: bundle.c:417
-#, c-format
-msgid "ref '%s' is excluded by the rev-list options"
-msgstr "referensi '%s' dikecualikan oleh opsi rev-list"
-
-#: bundle.c:533 builtin/log.c:211 builtin/log.c:1975 builtin/shortlog.c:400
-#, c-format
-msgid "unrecognized argument: %s"
-msgstr "argumen tidak dikenal: %s"
-
-#: bundle.c:548
-#, c-format
-msgid "unsupported bundle version %d"
-msgstr "versi bundle %d tidak didukung"
-
-#: bundle.c:550
-#, c-format
-msgid "cannot write bundle version %d with algorithm %s"
-msgstr "tidak dapat menulis versi bundel %d dengan algoritma %s"
-
-#: bundle.c:600
-msgid "Refusing to create empty bundle."
-msgstr "Menolak memuat bundel kosong."
-
-#: bundle.c:610
-#, c-format
-msgid "cannot create '%s'"
-msgstr "tidak dapat membuat '%s'"
-
-#: bundle.c:639
-msgid "index-pack died"
-msgstr "index-pack mati"
-
-#: chunk-format.c:117
-msgid "terminating chunk id appears earlier than expected"
-msgstr ""
-
-#: chunk-format.c:126
-#, c-format
-msgid "improper chunk offset(s) %<PRIx64> and %<PRIx64>"
-msgstr ""
-
-#: chunk-format.c:133
-#, c-format
-msgid "duplicate chunk ID %<PRIx32> found"
-msgstr ""
-
-#: chunk-format.c:147
-#, c-format
-msgid "final chunk has non-zero id %<PRIx32>"
-msgstr ""
-
-#: color.c:354
-#, c-format
-msgid "invalid color value: %.*s"
-msgstr ""
-
-#: commit-graph.c:204 midx.c:52
-msgid "invalid hash version"
-msgstr ""
-
-#: commit-graph.c:262
-msgid "commit-graph file is too small"
-msgstr ""
-
-#: commit-graph.c:355
-#, c-format
-msgid "commit-graph signature %X does not match signature %X"
-msgstr ""
-
-#: commit-graph.c:362
-#, c-format
-msgid "commit-graph version %X does not match version %X"
-msgstr ""
-
-#: commit-graph.c:369
-#, c-format
-msgid "commit-graph hash version %X does not match version %X"
-msgstr ""
-
-#: commit-graph.c:386
-#, c-format
-msgid "commit-graph file is too small to hold %u chunks"
-msgstr ""
-
-#: commit-graph.c:485
-msgid "commit-graph has no base graphs chunk"
-msgstr ""
-
-#: commit-graph.c:495
-msgid "commit-graph chain does not match"
-msgstr ""
-
-#: commit-graph.c:543
-#, c-format
-msgid "invalid commit-graph chain: line '%s' not a hash"
-msgstr ""
-
-#: commit-graph.c:567
-msgid "unable to find all commit-graph files"
-msgstr ""
-
-#: commit-graph.c:752 commit-graph.c:789
-msgid "invalid commit position. commit-graph is likely corrupt"
-msgstr ""
-
-#: commit-graph.c:773
-#, c-format
-msgid "could not find commit %s"
-msgstr ""
-
-#: commit-graph.c:806
-msgid "commit-graph requires overflow generation data but has none"
-msgstr ""
-
-#: commit-graph.c:1111 builtin/am.c:1370 builtin/checkout.c:775
-#: builtin/clone.c:705
-#, c-format
-msgid "unable to parse commit %s"
-msgstr ""
-
-#: commit-graph.c:1373 builtin/pack-objects.c:3078
-#, c-format
-msgid "unable to get type of object %s"
-msgstr ""
-
-#: commit-graph.c:1404
-msgid "Loading known commits in commit graph"
-msgstr ""
-
-#: commit-graph.c:1421
-msgid "Expanding reachable commits in commit graph"
-msgstr ""
-
-#: commit-graph.c:1441
-msgid "Clearing commit marks in commit graph"
-msgstr ""
-
-#: commit-graph.c:1460
-msgid "Computing commit graph topological levels"
-msgstr ""
-
-#: commit-graph.c:1513
-msgid "Computing commit graph generation numbers"
-msgstr ""
-
-#: commit-graph.c:1598
-msgid "Computing commit changed paths Bloom filters"
-msgstr ""
-
-#: commit-graph.c:1675
-msgid "Collecting referenced commits"
-msgstr ""
-
-#: commit-graph.c:1701
-#, c-format
-msgid "Finding commits for commit graph in %<PRIuMAX> pack"
-msgid_plural "Finding commits for commit graph in %<PRIuMAX> packs"
-msgstr[0] ""
-msgstr[1] ""
-
-#: commit-graph.c:1714
-#, c-format
-msgid "error adding pack %s"
-msgstr ""
-
-#: commit-graph.c:1718
-#, c-format
-msgid "error opening index for %s"
-msgstr ""
-
-#: commit-graph.c:1756
-msgid "Finding commits for commit graph among packed objects"
-msgstr ""
-
-#: commit-graph.c:1774
-msgid "Finding extra edges in commit graph"
-msgstr ""
-
-#: commit-graph.c:1823
-msgid "failed to write correct number of base graph ids"
-msgstr ""
-
-#: commit-graph.c:1854 midx.c:1168 builtin/sparse-checkout.c:475
-#, c-format
-msgid "unable to create leading directories of %s"
-msgstr ""
-
-#: commit-graph.c:1868
-msgid "unable to create temporary graph layer"
-msgstr ""
-
-#: commit-graph.c:1873
-#, c-format
-msgid "unable to adjust shared permissions for '%s'"
-msgstr ""
-
-#: commit-graph.c:1930
-#, 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:1967
-msgid "unable to open commit-graph chain file"
-msgstr ""
-
-#: commit-graph.c:1983
-msgid "failed to rename base commit-graph file"
-msgstr ""
-
-#: commit-graph.c:2004
-msgid "failed to rename temporary commit-graph file"
-msgstr ""
-
-#: commit-graph.c:2137
-msgid "Scanning merged commits"
-msgstr ""
-
-#: commit-graph.c:2181
-msgid "Merging commit-graph"
-msgstr ""
-
-#: commit-graph.c:2289
-msgid "attempting to write a commit-graph, but 'core.commitGraph' is disabled"
-msgstr ""
-
-#: commit-graph.c:2396
-msgid "too many commits to write graph"
-msgstr ""
-
-#: commit-graph.c:2494
-msgid "the commit-graph file has incorrect checksum and is likely corrupt"
-msgstr ""
-
-#: commit-graph.c:2504
-#, c-format
-msgid "commit-graph has incorrect OID order: %s then %s"
-msgstr ""
-
-#: commit-graph.c:2514 commit-graph.c:2529
-#, c-format
-msgid "commit-graph has incorrect fanout value: fanout[%d] = %u != %u"
-msgstr ""
-
-#: commit-graph.c:2521
-#, c-format
-msgid "failed to parse commit %s from commit-graph"
-msgstr ""
-
-#: commit-graph.c:2539
-msgid "Verifying commits in commit graph"
-msgstr ""
-
-#: commit-graph.c:2554
-#, c-format
-msgid "failed to parse commit %s from object database for commit-graph"
-msgstr ""
-
-#: commit-graph.c:2561
-#, c-format
-msgid "root tree OID for commit %s in commit-graph is %s != %s"
-msgstr ""
-
-#: commit-graph.c:2571
-#, c-format
-msgid "commit-graph parent list for commit %s is too long"
-msgstr ""
-
-#: commit-graph.c:2580
-#, c-format
-msgid "commit-graph parent for %s is %s != %s"
-msgstr ""
-
-#: commit-graph.c:2594
-#, c-format
-msgid "commit-graph parent list for commit %s terminates early"
-msgstr ""
-
-#: commit-graph.c:2599
-#, c-format
-msgid ""
-"commit-graph has generation number zero for commit %s, but non-zero elsewhere"
-msgstr ""
-
-#: commit-graph.c:2603
-#, c-format
-msgid ""
-"commit-graph has non-zero generation number for commit %s, but zero elsewhere"
-msgstr ""
-
-#: commit-graph.c:2620
-#, c-format
-msgid "commit-graph generation for commit %s is %<PRIuMAX> < %<PRIuMAX>"
-msgstr ""
-
-#: commit-graph.c:2626
-#, c-format
-msgid "commit date for commit %s in commit-graph is %<PRIuMAX> != %<PRIuMAX>"
-msgstr ""
-
-#: commit.c:54 sequencer.c:3105 builtin/am.c:400 builtin/am.c:445
-#: builtin/am.c:450 builtin/am.c:1449 builtin/am.c:2124 builtin/replace.c:456
-#, c-format
-msgid "could not parse %s"
-msgstr ""
-
-#: commit.c:56
-#, c-format
-msgid "%s %s is not a commit!"
-msgstr ""
-
-#: commit.c:197
-msgid ""
-"Support for <GIT_DIR>/info/grafts is deprecated\n"
-"and will be removed in a future Git version.\n"
-"\n"
-"Please use \"git replace --convert-graft-file\"\n"
-"to convert the grafts into replace refs.\n"
-"\n"
-"Turn this message off by running\n"
-"\"git config advice.graftFileDeprecated false\""
-msgstr ""
-
-#: commit.c:1252
-#, c-format
-msgid "Commit %s has an untrusted GPG signature, allegedly by %s."
-msgstr ""
-
-#: commit.c:1256
-#, c-format
-msgid "Commit %s has a bad GPG signature allegedly by %s."
-msgstr ""
-
-#: commit.c:1259
-#, c-format
-msgid "Commit %s does not have a GPG signature."
-msgstr ""
-
-#: commit.c:1262
-#, c-format
-msgid "Commit %s has a good GPG signature by %s\n"
-msgstr ""
-
-#: commit.c:1516
-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"
-"variable i18n.commitencoding to the encoding your project uses.\n"
-msgstr ""
-
-#: compat/obstack.c:406 compat/obstack.c:408
-msgid "memory exhausted"
-msgstr ""
-
-#: compat/terminal.c:167
-msgid "cannot resume in the background, please use 'fg' to resume"
-msgstr ""
-
-#: compat/terminal.c:168
-msgid "cannot restore terminal settings"
-msgstr ""
-
-#: config.c:143
-#, c-format
-msgid ""
-"exceeded maximum include depth (%d) while including\n"
-"\t%s\n"
-"from\n"
-"\t%s\n"
-"This might be due to circular includes."
-msgstr ""
-"melebihi kedalaman include maksimum (%d) ketika memasukkan\n"
-"\t%s\n"
-"dari\n"
-"\t%s\n"
-"Ini mungkin disebabkan oleh include sirkular."
-
-#: config.c:159
-#, c-format
-msgid "could not expand include path '%s'"
-msgstr "tidak dapat menjabarkan jalur include '%s'"
-
-#: config.c:170
-msgid "relative config includes must come from files"
-msgstr "include konfigurasi relatif harus dari berkas"
-
-#: config.c:219
-msgid "relative config include conditionals must come from files"
-msgstr "kondisional include konfigurasi relative harus dari berkas"
-
-#: config.c:364
-msgid ""
-"remote URLs cannot be configured in file directly or indirectly included by "
-"includeIf.hasconfig:remote.*.url"
-msgstr ""
-"URL remote tidak dapat dikonfigurasikan langsung di dalam berkas maupun "
-"dimasukkan secara tidak langsung oleh includeIf.hasconfig:remote.*.url"
-
-#: config.c:508
-#, c-format
-msgid "invalid config format: %s"
-msgstr "format konfigurasi tidak valid: %s"
-
-#: config.c:512
-#, c-format
-msgid "missing environment variable name for configuration '%.*s'"
-msgstr "nama variabel lingkungan untuk konfigurasi hilang '%.*s'"
-
-#: config.c:517
-#, c-format
-msgid "missing environment variable '%s' for configuration '%.*s'"
-msgstr "variabel lingkungan '%s' untuk konfigurasi '%.*s'"
-
-#: config.c:553
-#, c-format
-msgid "key does not contain a section: %s"
-msgstr "kunci tidak berisi bagian: %s"
-
-#: config.c:558
-#, c-format
-msgid "key does not contain variable name: %s"
-msgstr "kunci tidak berisi nama variabel: %s"
-
-#: config.c:580 sequencer.c:2802
-#, c-format
-msgid "invalid key: %s"
-msgstr "kunci tidak valid: %s"
-
-#: config.c:585
-#, c-format
-msgid "invalid key (newline): %s"
-msgstr "kunci tidak valid (barisbaru): %s"
-
-#: config.c:605
-msgid "empty config key"
-msgstr "kunci konfigurasi kosong"
-
-#: config.c:623 config.c:635
-#, c-format
-msgid "bogus config parameter: %s"
-msgstr "parameter konfigurasi gadungan: %s"
-
-#: config.c:649 config.c:666 config.c:673 config.c:682
-#, c-format
-msgid "bogus format in %s"
-msgstr "format gadungan dalam %s"
-
-#: config.c:716
-#, c-format
-msgid "bogus count in %s"
-msgstr "hitungan gadungan dalam %s"
-
-#: config.c:720
-#, c-format
-msgid "too many entries in %s"
-msgstr "terlalu banyak entri di %s"
-
-#: config.c:730
-#, c-format
-msgid "missing config key %s"
-msgstr "kunci konfigurasi %s hilang"
-
-#: config.c:738
-#, c-format
-msgid "missing config value %s"
-msgstr "nilai konfigurasi %s hilang"
-
-#: config.c:1089
-#, c-format
-msgid "bad config line %d in blob %s"
-msgstr "baris konfigurasi %d jelek dalam blob %s"
-
-#: config.c:1093
-#, c-format
-msgid "bad config line %d in file %s"
-msgstr "baris konfigurasi %d jelek dalam berkas %s"
-
-#: config.c:1097
-#, c-format
-msgid "bad config line %d in standard input"
-msgstr "baris konfigurasi %d jelek pada masukan standar"
-
-#: config.c:1101
-#, c-format
-msgid "bad config line %d in submodule-blob %s"
-msgstr "baris konfigurasi %d jelek dalam blob submodul %s"
-
-#: config.c:1105
-#, c-format
-msgid "bad config line %d in command line %s"
-msgstr "baris konfigurasi %d jelek pada baris perintah %s"
-
-#: config.c:1109
-#, c-format
-msgid "bad config line %d in %s"
-msgstr "baris konfigurasi %d jelek dalam %s"
-
-#: config.c:1246
-msgid "out of range"
-msgstr "di luar rentang"
-
-#: config.c:1246
-msgid "invalid unit"
-msgstr "satuan tidak valid"
-
-#: config.c:1247
-#, c-format
-msgid "bad numeric config value '%s' for '%s': %s"
-msgstr "nilai konfigurasi numerik '%s' jelek untuk '%s': %s"
-
-#: config.c:1257
-#, 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:1260
-#, 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:1263
-#, 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:1266
-#, 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:1269
-#, 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:1272
-#, 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:1368
-#, c-format
-msgid "invalid value for variable %s"
-msgstr "nilai tidak valid untuk variabel %s"
-
-#: config.c:1389
-#, c-format
-msgid "ignoring unknown core.fsync component '%s'"
-msgstr "mengabaikan komponen core.fsync tidak dikenal '%s'"
-
-#: config.c:1425
-#, c-format
-msgid "bad boolean config value '%s' for '%s'"
-msgstr "nilai konfigurasi boolean '%s' jelek untuk '%s'"
-
-#: config.c:1443
-#, c-format
-msgid "failed to expand user dir in: '%s'"
-msgstr "gagal menjabarkan direktori pengguna di: '%s'"
-
-#: config.c:1452
-#, c-format
-msgid "'%s' for '%s' is not a valid timestamp"
-msgstr "'%s' untuk '%s' bukan stempel waktu valid"
-
-#: config.c:1545
-#, c-format
-msgid "abbrev length out of range: %d"
-msgstr "panjang singkatan di luar rentang: %d"
-
-#: config.c:1559 config.c:1570
-#, c-format
-msgid "bad zlib compression level %d"
-msgstr "level kompresi zlib jelek %d"
-
-#: config.c:1660
-msgid "core.commentChar should only be one character"
-msgstr "core.commentChar harusnya hanya satu karakter"
-
-#: config.c:1692
-#, c-format
-msgid "ignoring unknown core.fsyncMethod value '%s'"
-msgstr "mengabaikan nilai core.fsyncMethod tidak dikenal '%s'"
-
-#: config.c:1698
-msgid "core.fsyncObjectFiles is deprecated; use core.fsync instead"
-msgstr "core.fsyncObjectFiles usang; gunakan core.fsync sebagai gantinya"
-
-#: config.c:1714
-#, c-format
-msgid "invalid mode for object creation: %s"
-msgstr "mode tidak valid untuk pembuatan objek: %s"
-
-#: config.c:1800
-#, c-format
-msgid "malformed value for %s"
-msgstr "nilai rusak untuk %s"
-
-#: config.c:1826
-#, c-format
-msgid "malformed value for %s: %s"
-msgstr "nilai rusak untuk %s: %s"
-
-#: config.c:1827
-msgid "must be one of nothing, matching, simple, upstream or current"
-msgstr "harus salah satu dari nothing, matching, simple, upstream atau current"
-
-#: config.c:1888 builtin/pack-objects.c:4078
-#, c-format
-msgid "bad pack compression level %d"
-msgstr "level kompresi pak jelek %d"
-
-#: config.c:2014
-#, c-format
-msgid "unable to load config blob object '%s'"
-msgstr "tidak dapat memuat objek blob konfigurasi '%s'"
-
-#: config.c:2017
-#, c-format
-msgid "reference '%s' does not point to a blob"
-msgstr "referensi '%s' tidak menunjuk pada sebuah blob"
-
-#: config.c:2035
-#, c-format
-msgid "unable to resolve config blob '%s'"
-msgstr "tidak dapat menguraikan blob konfigurasi '%s'"
-
-#: config.c:2080
-#, c-format
-msgid "failed to parse %s"
-msgstr "gagal menguraikan %s"
-
-#: config.c:2136
-msgid "unable to parse command-line config"
-msgstr "gagal menguraikan konfigurasi baris perintah"
-
-#: config.c:2512
-msgid "unknown error occurred while reading the configuration files"
-msgstr "error tidak diketahui ketika membaca berkas konfigurasi"
-
-#: config.c:2686
-#, c-format
-msgid "Invalid %s: '%s'"
-msgstr "%s tidak valid: '%s'"
-
-#: config.c:2731
-#, 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:2763
-#, c-format
-msgid "unable to parse '%s' from command-line config"
-msgstr "tidak dapat menguraikan '%s' dari konfigurasi baris perintah"
-
-#: config.c:2765
-#, 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:2850
-#, c-format
-msgid "invalid section name '%s'"
-msgstr "nama bagian '%s' tidak valid"
-
-#: config.c:2882
-#, c-format
-msgid "%s has multiple values"
-msgstr "%s punya banyak nilai"
-
-#: config.c:2911
-#, c-format
-msgid "failed to write new configuration file %s"
-msgstr "gagal menulis berkas konfigurasi baru %s"
-
-#: config.c:3177 config.c:3518
-#, c-format
-msgid "could not lock config file %s"
-msgstr "tidak dapat mengunci berkas konfigurasi %s"
-
-#: config.c:3188
-#, c-format
-msgid "opening %s"
-msgstr "membuka %s"
-
-#: config.c:3225 builtin/config.c:361
-#, c-format
-msgid "invalid pattern: %s"
-msgstr "pola tidak valid: %s"
-
-#: config.c:3250
-#, c-format
-msgid "invalid config file %s"
-msgstr "berkas konfigurasi %s tidak valid"
-
-#: config.c:3263 config.c:3531
-#, c-format
-msgid "fstat on %s failed"
-msgstr "fstat pada %s gagal"
-
-#: config.c:3274
-#, c-format
-msgid "unable to mmap '%s'%s"
-msgstr "tidak dapat me-mmap '%s'%s"
-
-#: config.c:3284 config.c:3536
-#, c-format
-msgid "chmod on %s failed"
-msgstr "chmod pada %s gagal"
-
-#: config.c:3369 config.c:3633
-#, c-format
-msgid "could not write config file %s"
-msgstr "tidak dapat menulis berkas konfigurasi %s"
-
-#: config.c:3403
-#, c-format
-msgid "could not set '%s' to '%s'"
-msgstr "tidak dapat menyetel '%s' ke '%s'"
-
-#: config.c:3405 builtin/remote.c:666 builtin/remote.c:885 builtin/remote.c:893
-#, c-format
-msgid "could not unset '%s'"
-msgstr "tidak dapat mem-batal setel '%s'"
-
-#: config.c:3509
-#, c-format
-msgid "invalid section name: %s"
-msgstr "nama bagian tidak valid: %s"
-
-#: config.c:3676
-#, c-format
-msgid "missing value for '%s'"
-msgstr "nilai hilang untuk '%s'"
-
-#: connect.c:61
-msgid "the remote end hung up upon initial contact"
-msgstr "remote berakhir menggantung saat kontak pertama"
-
-#: connect.c:63
-msgid ""
-"Could not read from remote repository.\n"
-"\n"
-"Please make sure you have the correct access rights\n"
-"and the repository exists."
-msgstr ""
-"Tidak dapat membaca dari repositori remote.\n"
-"\n"
-"Mohon pastikan Anda punya hak akses yang benar dan repositori ada."
-
-#: connect.c:81
-#, c-format
-msgid "server doesn't support '%s'"
-msgstr "peladen tidak mendukung '%s'"
-
-#: connect.c:118
-#, c-format
-msgid "server doesn't support feature '%s'"
-msgstr "peladen tidak mendukung fitur '%s'"
-
-#: connect.c:129
-msgid "expected flush after capabilities"
-msgstr "bilasan diharapkan setelah kemampuan"
-
-#: connect.c:265
-#, c-format
-msgid "ignoring capabilities after first line '%s'"
-msgstr "mengabaikan kemampuan setelah baris pertama '%s'"
-
-#: connect.c:286
-msgid "protocol error: unexpected capabilities^{}"
-msgstr "kesalahan protokol: capabilities^{} tidak diharapkan"
-
-#: connect.c:308
-#, c-format
-msgid "protocol error: expected shallow sha-1, got '%s'"
-msgstr "kesalahan protokol: sha-1 dangkal diharapkan, dapat '%s'"
-
-#: connect.c:310
-msgid "repository on the other end cannot be shallow"
-msgstr "repositori pada ujung lainnya tidak boleh dangkal"
-
-#: connect.c:349
-msgid "invalid packet"
-msgstr "paket tidak valid"
-
-#: connect.c:369
-#, c-format
-msgid "protocol error: unexpected '%s'"
-msgstr "kesalahan protokol: '%s' tidak diharapkan"
-
-#: connect.c:499
-#, c-format
-msgid "unknown object format '%s' specified by server"
-msgstr "format objek tidak dikenal '%s' disebutkan oleh peladen"
-
-#: connect.c:528
-#, c-format
-msgid "invalid ls-refs response: %s"
-msgstr "jawaban ls-refs tidak valid: %s"
-
-#: connect.c:532
-msgid "expected flush after ref listing"
-msgstr "bilasan diharapkan setelah penyebutan referensi"
-
-#: connect.c:535
-msgid "expected response end packet after ref listing"
-msgstr "jawaban akhir paket diharapkan setelah penyebutan referensi"
-
-#: connect.c:670
-#, c-format
-msgid "protocol '%s' is not supported"
-msgstr "protokol '%s' tidak didukung"
-
-#: connect.c:721
-msgid "unable to set SO_KEEPALIVE on socket"
-msgstr "tidak dapat menyetel SO_KEEPALIVE pada soket"
-
-#: connect.c:761 connect.c:824
-#, c-format
-msgid "Looking up %s ... "
-msgstr "Mencari %s ... "
-
-#: connect.c:765
-#, c-format
-msgid "unable to look up %s (port %s) (%s)"
-msgstr "tidak dapat mencari %s (port %s) (%s)"
-
-#. TRANSLATORS: this is the end of "Looking up %s ... "
-#: connect.c:769 connect.c:840
-#, c-format
-msgid ""
-"done.\n"
-"Connecting to %s (port %s) ... "
-msgstr ""
-"selesai.\n"
-"Menghubungkan ke %s (port %s) ... "
-
-#: connect.c:791 connect.c:868
-#, c-format
-msgid ""
-"unable to connect to %s:\n"
-"%s"
-msgstr ""
-"tidak dapat menghubungkan ke %s:\n"
-"%s"
-
-#. TRANSLATORS: this is the end of "Connecting to %s (port %s) ... "
-#: connect.c:797 connect.c:874
-msgid "done."
-msgstr "selesai."
-
-#: connect.c:828
-#, c-format
-msgid "unable to look up %s (%s)"
-msgstr "tidak dapat mencari %s (%s)"
-
-#: connect.c:834
-#, c-format
-msgid "unknown port %s"
-msgstr "port tidak dikenal %s"
-
-#: connect.c:971 connect.c:1303
-#, c-format
-msgid "strange hostname '%s' blocked"
-msgstr "nama host aneh '%s' diblokir"
-
-#: connect.c:973
-#, c-format
-msgid "strange port '%s' blocked"
-msgstr "port aneh '%s' diblokir"
-
-#: connect.c:983
-#, c-format
-msgid "cannot start proxy %s"
-msgstr "tidak dapat memulai proksi %s"
-
-#: connect.c:1054
-msgid "no path specified; see 'git help pull' for valid url syntax"
-msgstr ""
-"tidak ada jalur yang disebutkan; lihat 'git help pull' untuk sintaks url "
-"yang valid"
-
-#: connect.c:1194
-msgid "newline is forbidden in git:// hosts and repo paths"
-msgstr "baris baru dilarang di host git:// dan jalur repositori"
-
-#: connect.c:1251
-msgid "ssh variant 'simple' does not support -4"
-msgstr "varian ssh 'simple' tidak mendukung -4"
-
-#: connect.c:1263
-msgid "ssh variant 'simple' does not support -6"
-msgstr "varian ssh 'simple' tidak mendukung -6"
-
-#: connect.c:1280
-msgid "ssh variant 'simple' does not support setting port"
-msgstr "varian ssh 'simple' tidak mendukung penyetelan port"
-
-#: connect.c:1392
-#, c-format
-msgid "strange pathname '%s' blocked"
-msgstr "nama jalur aneh '%s' diblokir"
-
-#: connect.c:1440
-msgid "unable to fork"
-msgstr "tidak dapat menggarpu"
-
-#: connected.c:109 builtin/fsck.c:189 builtin/prune.c:57
-msgid "Checking connectivity"
-msgstr "Memeriksa konektivitas"
-
-#: connected.c:122
-msgid "Could not run 'git rev-list'"
-msgstr "Tidak dapat menjalankan 'git rev-list'"
-
-#: connected.c:146
-msgid "failed write to rev-list"
-msgstr "gagal menulis ke rev-list"
-
-#: connected.c:151
-msgid "failed to close rev-list's stdin"
-msgstr "gagal menutup masukan standar rev-list"
-
-#: convert.c:183
-#, c-format
-msgid "illegal crlf_action %d"
-msgstr ""
-
-#: convert.c:196
-#, c-format
-msgid "CRLF would be replaced by LF in %s"
-msgstr ""
-
-#: convert.c:198
-#, c-format
-msgid ""
-"CRLF will be replaced by LF in %s.\n"
-"The file will have its original line endings in your working directory"
-msgstr ""
-
-#: convert.c:206
-#, c-format
-msgid "LF would be replaced by CRLF in %s"
-msgstr ""
-
-#: convert.c:208
-#, c-format
-msgid ""
-"LF will be replaced by CRLF in %s.\n"
-"The file will have its original line endings in your working directory"
-msgstr ""
-
-#: convert.c:273
-#, c-format
-msgid "BOM is prohibited in '%s' if encoded as %s"
-msgstr ""
-
-#: convert.c:280
-#, c-format
-msgid ""
-"The file '%s' contains a byte order mark (BOM). Please use UTF-%.*s as "
-"working-tree-encoding."
-msgstr ""
-
-#: convert.c:293
-#, c-format
-msgid "BOM is required in '%s' if encoded as %s"
-msgstr ""
-
-#: 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."
-msgstr ""
-
-#: convert.c:408 convert.c:479
-#, c-format
-msgid "failed to encode '%s' from %s to %s"
-msgstr ""
-
-#: convert.c:451
-#, c-format
-msgid "encoding '%s' from %s to %s and back is not the same"
-msgstr ""
-
-#: convert.c:654
-#, c-format
-msgid "cannot fork to run external filter '%s'"
-msgstr ""
-
-#: convert.c:674
-#, c-format
-msgid "cannot feed the input to external filter '%s'"
-msgstr ""
-
-#: convert.c:681
-#, c-format
-msgid "external filter '%s' failed %d"
-msgstr ""
-
-#: convert.c:716 convert.c:719
-#, c-format
-msgid "read from external filter '%s' failed"
-msgstr ""
-
-#: convert.c:722 convert.c:777
-#, c-format
-msgid "external filter '%s' failed"
-msgstr ""
-
-#: convert.c:826
-msgid "unexpected filter type"
-msgstr ""
-
-#: convert.c:837
-msgid "path name too long for external filter"
-msgstr ""
-
-#: convert.c:935
-#, c-format
-msgid ""
-"external filter '%s' is not available anymore although not all paths have "
-"been filtered"
-msgstr ""
-
-#: convert.c:1236
-msgid "true/false are no valid working-tree-encodings"
-msgstr ""
-
-#: convert.c:1416 convert.c:1449
-#, c-format
-msgid "%s: clean filter '%s' failed"
-msgstr ""
-
-#: convert.c:1492
-#, c-format
-msgid "%s: smudge filter %s failed"
-msgstr ""
-
-#: credential.c:96
-#, c-format
-msgid "skipping credential lookup for key: credential.%s"
-msgstr ""
-
-#: credential.c:112
-msgid "refusing to work with credential missing host field"
-msgstr ""
-
-#: credential.c:114
-msgid "refusing to work with credential missing protocol field"
-msgstr ""
-
-#: credential.c:396
-#, c-format
-msgid "url contains a newline in its %s component: %s"
-msgstr ""
-
-#: credential.c:440
-#, c-format
-msgid "url has no scheme: %s"
-msgstr ""
-
-#: credential.c:513
-#, c-format
-msgid "credential url cannot be parsed: %s"
-msgstr ""
-
-#: date.c:139
-msgid "in the future"
-msgstr "di masa depan"
-
-#: date.c:145
-#, c-format
-msgid "%<PRIuMAX> second ago"
-msgid_plural "%<PRIuMAX> seconds ago"
-msgstr[0] "%<PRIuMAX> detik yang lalu"
-msgstr[1] "%<PRIuMAX> detik yang lalu"
-
-#: date.c:152
-#, c-format
-msgid "%<PRIuMAX> minute ago"
-msgid_plural "%<PRIuMAX> minutes ago"
-msgstr[0] "%<PRIuMAX> menit yang lalu"
-msgstr[1] "%<PRIuMAX> menit yang lalu"
-
-#: date.c:159
-#, c-format
-msgid "%<PRIuMAX> hour ago"
-msgid_plural "%<PRIuMAX> hours ago"
-msgstr[0] "%<PRIuMAX> jam yang lalu"
-msgstr[1] "%<PRIuMAX> jam yang lalu"
-
-#: date.c:166
-#, c-format
-msgid "%<PRIuMAX> day ago"
-msgid_plural "%<PRIuMAX> days ago"
-msgstr[0] "%<PRIuMAX> hari yang lalu"
-msgstr[1] "%<PRIuMAX> hari yang lalu"
-
-#: date.c:172
-#, c-format
-msgid "%<PRIuMAX> week ago"
-msgid_plural "%<PRIuMAX> weeks ago"
-msgstr[0] "%<PRIuMAX> minggu yang lalu"
-msgstr[1] "%<PRIuMAX> minggu yang lalu"
-
-#: date.c:179
-#, c-format
-msgid "%<PRIuMAX> month ago"
-msgid_plural "%<PRIuMAX> months ago"
-msgstr[0] "%<PRIuMAX> bulan yang lalu"
-msgstr[1] "%<PRIuMAX> bulan yang lalu"
-
-#: date.c:190
-#, c-format
-msgid "%<PRIuMAX> year"
-msgid_plural "%<PRIuMAX> years"
-msgstr[0] "%<PRIuMAX> tahun"
-msgstr[1] "%<PRIuMAX> tahun"
-
-#. TRANSLATORS: "%s" is "<n> years"
-#: date.c:193
-#, c-format
-msgid "%s, %<PRIuMAX> month ago"
-msgid_plural "%s, %<PRIuMAX> months ago"
-msgstr[0] "%s, %<PRIuMAX> bulan yang lalu"
-msgstr[1] "%s, %<PRIuMAX> bulan yang lalu"
-
-#: date.c:198 date.c:203
-#, c-format
-msgid "%<PRIuMAX> year ago"
-msgid_plural "%<PRIuMAX> years ago"
-msgstr[0] "%<PRIuMAX> tahun yang lalu"
-msgstr[1] "%<PRIuMAX> tahun yang lalu"
-
-#: delta-islands.c:272
-msgid "Propagating island marks"
-msgstr ""
-
-#: delta-islands.c:290
-#, c-format
-msgid "bad tree object %s"
-msgstr ""
-
-#: delta-islands.c:334
-#, c-format
-msgid "failed to load island regex for '%s': %s"
-msgstr ""
-
-#: delta-islands.c:390
-#, c-format
-msgid "island regex from config has too many capture groups (max=%d)"
-msgstr ""
-
-#: delta-islands.c:467
-#, c-format
-msgid "Marked %d islands, done.\n"
-msgstr ""
-
-#: diff-merges.c:81 gpg-interface.c:719 gpg-interface.c:734 ls-refs.c:37
-#: parallel-checkout.c:42 sequencer.c:2805 setup.c:563 builtin/am.c:203
-#: builtin/am.c:2243 builtin/am.c:2287 builtin/blame.c:724 builtin/blame.c:742
-#: builtin/fetch.c:792 builtin/pack-objects.c:3515 builtin/pull.c:45
-#: builtin/pull.c:47 builtin/pull.c:321
-#, c-format
-msgid "invalid value for '%s': '%s'"
-msgstr ""
-
-#: diff-lib.c:561
-msgid "--merge-base does not work with ranges"
-msgstr ""
-
-#: diff-lib.c:563
-msgid "--merge-base only works with commits"
-msgstr ""
-
-#: diff-lib.c:580
-msgid "unable to get HEAD"
-msgstr ""
-
-#: diff-lib.c:587
-msgid "no merge base found"
-msgstr ""
-
-#: diff-lib.c:589
-msgid "multiple merge bases found"
-msgstr ""
-
-#: diff-no-index.c:237
-msgid "git diff --no-index [<options>] <path> <path>"
-msgstr ""
-
-#: diff-no-index.c:262
-msgid ""
-"Not a git repository. Use --no-index to compare two paths outside a working "
-"tree"
-msgstr ""
-
-#: diff.c:159
-#, c-format
-msgid "  Failed to parse dirstat cut-off percentage '%s'\n"
-msgstr "  Gagal mengurai persentase potongan dirstat '%s'\n"
-
-#: diff.c:164
-#, c-format
-msgid "  Unknown dirstat parameter '%s'\n"
-msgstr "  Parameter dirstat tidak ditketahui '%s'\n"
-
-#: diff.c:300
-msgid ""
-"color moved setting must be one of 'no', 'default', 'blocks', 'zebra', "
-"'dimmed-zebra', 'plain'"
-msgstr ""
-"Setelan warna berpindah harus salah satu dari 'no', 'default', 'blocks', "
-"'dimmed-zebra', 'plain'"
-
-#: diff.c:328
-#, 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 ""
-"mode color-moved-ws tidak dikenal '%s', nilai yang mungkin yaitu 'ignore-"
-"space-change', 'ignore-space-at-eol', 'ignore-all-space', 'allow-indentation-"
-"change'"
-
-#: diff.c:336
-msgid ""
-"color-moved-ws: allow-indentation-change cannot be combined with other "
-"whitespace modes"
-msgstr ""
-"color-moved-ws: allow-indentation-change tidak dapat digabungkan dengan mode "
-"spasi yang lainnya"
-
-#: diff.c:413
-#, c-format
-msgid "Unknown value for 'diff.submodule' config variable: '%s'"
-msgstr "Nilai tidak dikenal untuk variabel konfigurasi 'diff.submodule': '%s'"
-
-#: diff.c:473
-#, c-format
-msgid ""
-"Found errors in 'diff.dirstat' config variable:\n"
-"%s"
-msgstr ""
-"Ditemukan error dalam variable konfigurasi 'diff.dirstat':\n"
-"%s"
-
-#: diff.c:4282
-#, c-format
-msgid "external diff died, stopping at %s"
-msgstr "diff eksternal mati, berhenti pada %s"
-
-#: diff.c:4677 parse-options.c:1114
-#, c-format
-msgid "options '%s', '%s', '%s', and '%s' cannot be used together"
-msgstr "Opsi '%s', '%s', '%s', dan '%s' tidak dapat digunakan bersamaan"
-
-#: diff.c:4681 parse-options.c:1118 builtin/worktree.c:578
-#, c-format
-msgid "options '%s', '%s', and '%s' cannot be used together"
-msgstr "Opsi '%s', '%s', dan '%s' tidak dapat digunakan bersamaan"
-
-#: diff.c:4685
-#, c-format
-msgid "options '%s' and '%s' cannot be used together, use '%s' with '%s'"
-msgstr ""
-"opsi '%s' dan '%s' tidak dapat digunakan bersamaan, gunakan '%s' dengan '%s'"
-
-#: diff.c:4689
-#, c-format
-msgid ""
-"options '%s' and '%s' cannot be used together, use '%s' with '%s' and '%s'"
-msgstr ""
-"opsi '%s' dan '%s' tidak dapat digunakan bersamaan, gunakan '%s' dengan '%s' "
-"dan '%s'"
-
-#: diff.c:4769
-msgid "--follow requires exactly one pathspec"
-msgstr "--follow butuh tepatnya satu spek jalur"
-
-#: diff.c:4823
-#, c-format
-msgid "invalid --stat value: %s"
-msgstr "nilai --stat tidak valid: %s"
-
-#: diff.c:4828 diff.c:4833 diff.c:4838 diff.c:4843 diff.c:5319
-#: parse-options.c:217 parse-options.c:221
-#, c-format
-msgid "%s expects a numerical value"
-msgstr "%s harap nilai numerik"
-
-#: diff.c:4860
-#, c-format
-msgid ""
-"Failed to parse --dirstat/-X option parameter:\n"
-"%s"
-msgstr ""
-"Gagal menguraikan parameter opsi --dirstat/-X:\n"
-"%s"
-
-#: diff.c:4893
-#, c-format
-msgid "unknown change class '%c' in --diff-filter=%s"
-msgstr "kelas perubahan '%c' tidak dikenal dalam --diff-filter=%s"
-
-#: diff.c:4917
-#, c-format
-msgid "unknown value after ws-error-highlight=%.*s"
-msgstr "nilai tidak dikenal setelah ws-error-highlight=%.*s"
-
-#: diff.c:4931
-#, c-format
-msgid "unable to resolve '%s'"
-msgstr "tidak dapat menguraikan '%s'"
-
-#: diff.c:4981 diff.c:4987
-#, c-format
-msgid "%s expects <n>/<m> form"
-msgstr "%s butuh bentuk <n>/<m>"
-
-#: diff.c:4999
-#, c-format
-msgid "%s expects a character, got '%s'"
-msgstr "%s butuh sebuah karakter, dapat '%s'"
-
-#: diff.c:5020
-#, c-format
-msgid "bad --color-moved argument: %s"
-msgstr "argumen --color-moved jelek: %s"
-
-#: diff.c:5039
-#, c-format
-msgid "invalid mode '%s' in --color-moved-ws"
-msgstr "mode tidak valid '%s' dalam --color-moved-ws"
-
-#: diff.c:5079
-msgid ""
-"option diff-algorithm accepts \"myers\", \"minimal\", \"patience\" and "
-"\"histogram\""
-msgstr ""
-"opsi diff-algorithm terima \"myers\", \"minimal\", \"patience\" dan "
-"\"histogram\""
-
-#: diff.c:5115 diff.c:5135
-#, c-format
-msgid "invalid argument to %s"
-msgstr "argumen tidak valid ke %s"
-
-#: diff.c:5239
-#, c-format
-msgid "invalid regex given to -I: '%s'"
-msgstr "regex tidak valid diberikan ke -I: '%s'"
-
-#: diff.c:5288
-#, c-format
-msgid "failed to parse --submodule option parameter: '%s'"
-msgstr "gagal menguraikan parameter opsi --submodule: '%s'"
-
-#: diff.c:5344
-#, c-format
-msgid "bad --word-diff argument: %s"
-msgstr "argumen --word-diff jelek: %s"
-
-#: diff.c:5380
-msgid "Diff output format options"
-msgstr "Opsi format keluaran diff"
-
-#: diff.c:5382 diff.c:5388
-msgid "generate patch"
-msgstr "buat tambalan"
-
-#: diff.c:5385 builtin/log.c:180
-msgid "suppress diff output"
-msgstr "sembunyikan keluaran diff"
-
-#: diff.c:5390 diff.c:5504 diff.c:5511
-msgid "<n>"
-msgstr "<n>"
-
-#: diff.c:5391 diff.c:5394
-msgid "generate diffs with <n> lines context"
-msgstr "buat diff dengan <n> baris konteks"
-
-#: diff.c:5396
-msgid "generate the diff in raw format"
-msgstr "buat diff dalam format mentah"
-
-#: diff.c:5399
-msgid "synonym for '-p --raw'"
-msgstr "sinonim untuk '-p --raw'"
-
-#: diff.c:5403
-msgid "synonym for '-p --stat'"
-msgstr "sinonim untuk '-p --stat'"
-
-#: diff.c:5407
-msgid "machine friendly --stat"
-msgstr "--stat yang ramah mesin"
-
-#: diff.c:5410
-msgid "output only the last line of --stat"
-msgstr "keluarkan hanya baris terakhir --stat"
-
-#: diff.c:5412 diff.c:5420
-msgid "<param1,param2>..."
-msgstr "<parameter 1,parameter 2>..."
-
-#: diff.c:5413
-msgid ""
-"output the distribution of relative amount of changes for each sub-directory"
-msgstr ""
-"keluarkan distribusi jumlah perubahan relatif untuk setiap subdirektori"
-
-#: diff.c:5417
-msgid "synonym for --dirstat=cumulative"
-msgstr "sinonim untuk --dirstat=cumulative"
-
-#: diff.c:5421
-msgid "synonym for --dirstat=files,param1,param2..."
-msgstr "sinonim untuk --dirstat=files,param1,param2..."
-
-#: diff.c:5425
-msgid "warn if changes introduce conflict markers or whitespace errors"
-msgstr ""
-"peringatkan bila perubahan memasukkan penanda konflik atau kesalahan spasi"
-
-#: diff.c:5428
-msgid "condensed summary such as creations, renames and mode changes"
-msgstr ""
-"ringkasan singkat seperti pembuatan, penggantian nama dan perubahan mode"
-
-#: diff.c:5431
-msgid "show only names of changed files"
-msgstr "perlihatkan hanya nama berkas yang berubah"
-
-#: diff.c:5434
-msgid "show only names and status of changed files"
-msgstr "perlihatkan hanya nama dan status berkas yang berubah"
-
-#: diff.c:5436
-msgid "<width>[,<name-width>[,<count>]]"
-msgstr "<lebar>[,<nama lebar>[,<hitungan>]]"
-
-#: diff.c:5437
-msgid "generate diffstat"
-msgstr "buat diffstat"
-
-#: diff.c:5439 diff.c:5442 diff.c:5445
-msgid "<width>"
-msgstr "<lebar>"
-
-#: diff.c:5440
-msgid "generate diffstat with a given width"
-msgstr "buat diffstat dengan lebar yang diberikan"
-
-#: diff.c:5443
-msgid "generate diffstat with a given name width"
-msgstr "buat diffstat dengan nama lebar yang diberikan"
-
-#: diff.c:5446
-msgid "generate diffstat with a given graph width"
-msgstr "buat diffstat dengan lebar grafik yang diberikan"
-
-#: diff.c:5448
-msgid "<count>"
-msgstr "<hitungan>"
-
-#: diff.c:5449
-msgid "generate diffstat with limited lines"
-msgstr "buat diffstat dengan baris yang terbatas"
-
-#: diff.c:5452
-msgid "generate compact summary in diffstat"
-msgstr "buat ringkasan singkat dalam diffstat"
-
-#: diff.c:5455
-msgid "output a binary diff that can be applied"
-msgstr "keluarkan diff biner yang dapat diterapkan"
-
-#: diff.c:5458
-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:5460
-msgid "show colored diff"
-msgstr "perlihatkan diff berwarna"
-
-#: diff.c:5461
-msgid "<kind>"
-msgstr "<tipe>"
-
-#: diff.c:5462
-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:5465
-msgid ""
-"do not munge pathnames and use NULs as output field terminators in --raw or "
-"--numstat"
-msgstr ""
-"jangan tengkar jalur nama dan gunakan NUL sebagai pembatas bidang keluaran "
-"pada --raw atau --numstat"
-
-#: diff.c:5468 diff.c:5471 diff.c:5474 diff.c:5583
-msgid "<prefix>"
-msgstr "<prefiks>"
-
-#: diff.c:5469
-msgid "show the given source prefix instead of \"a/\""
-msgstr "perlihatkan prefiks sumber yang diberikan daripada \"a/\""
-
-#: diff.c:5472
-msgid "show the given destination prefix instead of \"b/\""
-msgstr "perlihatkan prefiks tujuan daripada \"b/\""
-
-#: diff.c:5475
-msgid "prepend an additional prefix to every line of output"
-msgstr "tambah depan prefiks tambahan pada setiap baris keluaran"
-
-#: diff.c:5478
-msgid "do not show any source or destination prefix"
-msgstr "jangan perlihatkan prefiks sumber atau tujuan apapun"
-
-#: diff.c:5481
-msgid "show context between diff hunks up to the specified number of lines"
-msgstr ""
-"perlihatkan konteks diantara bingkah diff hingga jumlah baris yang disebutkan"
-
-#: diff.c:5485 diff.c:5490 diff.c:5495
-msgid "<char>"
-msgstr "<karakter>"
-
-#: diff.c:5486
-msgid "specify the character to indicate a new line instead of '+'"
-msgstr "sebutkan karakter yang menandai baris baru daripada '+'"
-
-#: diff.c:5491
-msgid "specify the character to indicate an old line instead of '-'"
-msgstr "sebutkan karakter yang menandai baris lama daripada '-'"
-
-#: diff.c:5496
-msgid "specify the character to indicate a context instead of ' '"
-msgstr "sebutkan karakter yang menandai konteks daripada ' '"
-
-#: diff.c:5499
-msgid "Diff rename options"
-msgstr "Opsi penamaan ulang diff"
-
-#: diff.c:5500
-msgid "<n>[/<m>]"
-msgstr "<n>[/<m>]"
-
-#: diff.c:5501
-msgid "break complete rewrite changes into pairs of delete and create"
-msgstr ""
-"pisahkan perubahan penulisan ulang penuh kedalam pasangan penghapusan dan "
-"pembuatan"
-
-#: diff.c:5505
-msgid "detect renames"
-msgstr "deteksi penamaan ulang"
-
-#: diff.c:5509
-msgid "omit the preimage for deletes"
-msgstr "lewati pracitra untuk penghapusan"
-
-#: diff.c:5512
-msgid "detect copies"
-msgstr "deteksi penyalinan"
-
-#: diff.c:5516
-msgid "use unmodified files as source to find copies"
-msgstr ""
-"gunakan berkas tak termodifikasi sebagai sumber untuk menemukan salinan"
-
-#: diff.c:5518
-msgid "disable rename detection"
-msgstr "nonaktifkan deteksi penamaan ulang"
-
-#: diff.c:5521
-msgid "use empty blobs as rename source"
-msgstr "gunakan blob kosong sebagai sumber penamaan ulang"
-
-#: diff.c:5523
-msgid "continue listing the history of a file beyond renames"
-msgstr "lanjutkan daftarkan riwayat berkas di luar penamaan ulang"
-
-#: diff.c:5526
-msgid ""
-"prevent rename/copy detection if the number of rename/copy targets exceeds "
-"given limit"
-msgstr ""
-"cegah pendeteksian penamaan ulang/penyalinan jika jumlah target penamaan "
-"ulang/penyalinan melebihi batas yang diberikan"
-
-#: diff.c:5528
-msgid "Diff algorithm options"
-msgstr "Opsi algoritma diff"
-
-#: diff.c:5530
-msgid "produce the smallest possible diff"
-msgstr "hasilkan diff yang paling kecil yang dimungkinkan"
-
-#: diff.c:5533
-msgid "ignore whitespace when comparing lines"
-msgstr "abaikan spasi saat membandingkan baris"
-
-#: diff.c:5536
-msgid "ignore changes in amount of whitespace"
-msgstr "abaikan perubahan dalam jumlah spasi"
-
-#: diff.c:5539
-msgid "ignore changes in whitespace at EOL"
-msgstr "abaikan perubahan spasi pada EOL"
-
-#: diff.c:5542
-msgid "ignore carrier-return at the end of line"
-msgstr "abaikan kembalian-kurir pada akhir baris"
-
-#: diff.c:5545
-msgid "ignore changes whose lines are all blank"
-msgstr "abaikan perubahan yang semua baris kosong"
-
-#: diff.c:5547 diff.c:5569 diff.c:5572 diff.c:5617
-msgid "<regex>"
-msgstr "<regex>"
-
-#: diff.c:5548
-msgid "ignore changes whose all lines match <regex>"
-msgstr "abaikan perubahan yang semua baris cocok dengan <regex>"
-
-#: diff.c:5551
-msgid "heuristic to shift diff hunk boundaries for easy reading"
-msgstr ""
-"heuristik untuk geser perbatasan bingkah diff untuk pembacaan yang mudah"
-
-#: diff.c:5554
-msgid "generate diff using the \"patience diff\" algorithm"
-msgstr "buat diff menggunakan algoritma \"diff sabar\""
-
-#: diff.c:5558
-msgid "generate diff using the \"histogram diff\" algorithm"
-msgstr "buat diff menggunakan algoritma \"diff histogram\""
-
-#: diff.c:5560
-msgid "<algorithm>"
-msgstr "<algoritma>"
-
-#: diff.c:5561
-msgid "choose a diff algorithm"
-msgstr "pilih algoritma diff"
-
-#: diff.c:5563
-msgid "<text>"
-msgstr "<teks>"
-
-#: diff.c:5564
-msgid "generate diff using the \"anchored diff\" algorithm"
-msgstr "buat diff menggunakan algoritma \"diff terlabuh\""
-
-#: diff.c:5566 diff.c:5575 diff.c:5578
-msgid "<mode>"
-msgstr "<mode>"
-
-#: diff.c:5567
-msgid "show word diff, using <mode> to delimit changed words"
-msgstr ""
-"perlihatkan diff kata, menggunakan <mode> untuk batasi kata yang berubah"
-
-#: diff.c:5570
-msgid "use <regex> to decide what a word is"
-msgstr "gunakan <regex> untuk menentukan apa itu kata"
-
-#: diff.c:5573
-msgid "equivalent to --word-diff=color --word-diff-regex=<regex>"
-msgstr "sama dengan --word-diff=color --word-diff-regex=<regex>"
-
-#: diff.c:5576
-msgid "moved lines of code are colored differently"
-msgstr "baris kode yang berpindah diwarnai berbeda"
-
-#: diff.c:5579
-msgid "how white spaces are ignored in --color-moved"
-msgstr "bagaimana spasi diabaikan di --color-moved"
-
-#: diff.c:5582
-msgid "Other diff options"
-msgstr "Opsi diff yang lainnya"
-
-#: diff.c:5584
-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:5588
-msgid "treat all files as text"
-msgstr "perlakukan semua berkas sebagai teks"
-
-#: diff.c:5590
-msgid "swap two inputs, reverse the diff"
-msgstr "tukar dua masukkan, balikkan diff"
-
-#: diff.c:5592
-msgid "exit with 1 if there were differences, 0 otherwise"
-msgstr "keluar dengan 1 jika ada perbedaan, selain itu 0"
-
-#: diff.c:5594
-msgid "disable all output of the program"
-msgstr "nonaktifkan semua keluaran program"
-
-#: diff.c:5596
-msgid "allow an external diff helper to be executed"
-msgstr "perbolehkan pembantu diff eksternal untuk dieksekusi"
-
-#: diff.c:5598
-msgid "run external text conversion filters when comparing binary files"
-msgstr ""
-"jalankan saringan konversi teks eksternal ketika membandingkan berkas biner"
-
-#: diff.c:5600
-msgid "<when>"
-msgstr "<kapan>"
-
-#: diff.c:5601
-msgid "ignore changes to submodules in the diff generation"
-msgstr "abaikan perubahan submodul dalam pembuatan diff"
-
-#: diff.c:5604
-msgid "<format>"
-msgstr "<format>"
-
-#: diff.c:5605
-msgid "specify how differences in submodules are shown"
-msgstr "sebutkan bagaimana perbedaan dalam submodul diperlihatkan"
-
-#: diff.c:5609
-msgid "hide 'git add -N' entries from the index"
-msgstr "sembunyikan entri 'git add -N' dari indeks"
-
-#: diff.c:5612
-msgid "treat 'git add -N' entries as real in the index"
-msgstr "perlakukan entri 'git add -N' sebagai nyata dalam indeks"
-
-#: diff.c:5614
-msgid "<string>"
-msgstr "<untai>"
-
-#: diff.c:5615
-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:5618
-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:5621
-msgid "show all changes in the changeset with -S or -G"
-msgstr "perlihatkan semua perubahan dalam set perubahan dengan -S atau -G"
-
-#: diff.c:5624
-msgid "treat <string> in -S as extended POSIX regular expression"
-msgstr ""
-"perlakukan <string> di -S sebagai ekspresi reguler POSIX yang diperluas"
-
-#: diff.c:5627
-msgid "control the order in which files appear in the output"
-msgstr "kontrol urutan berkas yang muncul dalam keluaran"
-
-#: diff.c:5628 diff.c:5631
-msgid "<path>"
-msgstr "<jalur>"
-
-#: diff.c:5629
-msgid "show the change in the specified path first"
-msgstr "perlihatkan perubahan dalam jalur yang disebutkan terlebih dahulu"
-
-#: diff.c:5632
-msgid "skip the output to the specified path"
-msgstr "lewati keluaran ke jalur yang disebutkan"
-
-#: diff.c:5634
-msgid "<object-id>"
-msgstr "<id objek>"
-
-#: diff.c:5635
-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:5637
-msgid "[(A|C|D|M|R|T|U|X|B)...[*]]"
-msgstr "[(A|C|D|M|R|T|U|X|B)...[*]]"
-
-#: diff.c:5638
-msgid "select files by diff type"
-msgstr "pilih berkas oleh tipe diff"
-
-#: diff.c:5640
-msgid "<file>"
-msgstr "<berkas>"
-
-#: diff.c:5641
-msgid "output to a specific file"
-msgstr "keluarkan ke berkas yang disebutkan"
-
-#: diff.c:6321
-msgid "exhaustive rename detection was skipped due to too many files."
-msgstr "deteksi penamaan ulang lengkap dilewati karena terlalu banyak berkas."
-
-#: diff.c:6324
-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:6327
-#, c-format
-msgid ""
-"you may want to set your %s variable to at least %d and retry the command."
-msgstr ""
-"mungkin Anda ingin menyetel variabel %s Anda ke setidaknya %d dan coba lagi "
-"perintah."
-
-#: diffcore-order.c:24
-#, c-format
-msgid "failed to read orderfile '%s'"
-msgstr ""
-
-#: diffcore-rename.c:1564
-msgid "Performing inexact rename detection"
-msgstr ""
-
-#: diffcore-rotate.c:29
-#, c-format
-msgid "No such path '%s' in the diff"
-msgstr ""
-
-#: dir.c:593
-#, c-format
-msgid "pathspec '%s' did not match any file(s) known to git"
-msgstr ""
-
-#: dir.c:733 dir.c:762 dir.c:775
-#, c-format
-msgid "unrecognized pattern: '%s'"
-msgstr ""
-
-#: dir.c:790 dir.c:804
-#, c-format
-msgid "unrecognized negative pattern: '%s'"
-msgstr ""
-
-#: dir.c:820
-#, c-format
-msgid "your sparse-checkout file may have issues: pattern '%s' is repeated"
-msgstr ""
-
-#: dir.c:828
-msgid "disabling cone pattern matching"
-msgstr ""
-
-#: dir.c:1212
-#, c-format
-msgid "cannot use %s as an exclude file"
-msgstr ""
-
-#: dir.c:2419
-#, c-format
-msgid "could not open directory '%s'"
-msgstr ""
-
-#: dir.c:2721
-msgid "failed to get kernel name and information"
-msgstr ""
-
-#: dir.c:2846
-msgid "untracked cache is disabled on this system or location"
-msgstr ""
-
-#: dir.c:3119
-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:3807
-#, c-format
-msgid "index file corrupt in repo %s"
-msgstr ""
-
-#: dir.c:3854 dir.c:3859
-#, c-format
-msgid "could not create directories for %s"
-msgstr ""
-
-#: dir.c:3888
-#, c-format
-msgid "could not migrate git directory from '%s' to '%s'"
-msgstr ""
-
-#: editor.c:74
-#, c-format
-msgid "hint: Waiting for your editor to close the file...%c"
-msgstr ""
-
-#: entry.c:179
-msgid "Filtering content"
-msgstr ""
-
-#: entry.c:500
-#, c-format
-msgid "could not stat file '%s'"
-msgstr ""
-
-#: environment.c:147
-#, c-format
-msgid "bad git namespace path \"%s\""
-msgstr ""
-
-#: exec-cmd.c:363
-#, c-format
-msgid "too many args to run %s"
-msgstr ""
-
-#: fetch-pack.c:194
-msgid "git fetch-pack: expected shallow list"
-msgstr "git fetch-pack: daftar dangkal diharapkan"
-
-#: fetch-pack.c:197
-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:208
-msgid "git fetch-pack: expected ACK/NAK, got a flush packet"
-msgstr "git fetch-pack: ACK/NAK diharapkan, dapat paket bilasan"
-
-#: fetch-pack.c:228
-#, c-format
-msgid "git fetch-pack: expected ACK/NAK, got '%s'"
-msgstr "git fetch-pack: ACK/NAK diharapkan, dapat '%s'"
-
-#: fetch-pack.c:239
-msgid "unable to write to remote"
-msgstr "tidak dapat menulis ke remote"
-
-#: fetch-pack.c:397 fetch-pack.c:1460
-#, c-format
-msgid "invalid shallow line: %s"
-msgstr "baris dangkal tidak valid: %s"
-
-#: fetch-pack.c:403 fetch-pack.c:1466
-#, c-format
-msgid "invalid unshallow line: %s"
-msgstr "baris dangkal-balik tidak valid: %s"
-
-#: fetch-pack.c:405 fetch-pack.c:1468
-#, c-format
-msgid "object not found: %s"
-msgstr "object tidak ditemukan: %s"
-
-#: fetch-pack.c:408 fetch-pack.c:1471
-#, c-format
-msgid "error in object: %s"
-msgstr "kesalahan dalam objek: %s"
-
-#: fetch-pack.c:410 fetch-pack.c:1473
-#, c-format
-msgid "no shallow found: %s"
-msgstr "tidak ada dangkal yang ditemukan: %s"
-
-#: fetch-pack.c:413 fetch-pack.c:1477
-#, c-format
-msgid "expected shallow/unshallow, got %s"
-msgstr "dangkal/dangkal-balik diharapkan, dapat %s"
-
-#: fetch-pack.c:453
-#, c-format
-msgid "got %s %d %s"
-msgstr "dapat %s %d %s"
-
-#: fetch-pack.c:470
-#, c-format
-msgid "invalid commit %s"
-msgstr "komit tidak valid %s"
-
-#: fetch-pack.c:501
-msgid "giving up"
-msgstr "menyerah"
-
-#: fetch-pack.c:514 progress.h:25
-msgid "done"
-msgstr "selesai"
-
-#: fetch-pack.c:526
-#, c-format
-msgid "got %s (%d) %s"
-msgstr "dapat %s (%d) %s"
-
-#: fetch-pack.c:562
-#, c-format
-msgid "Marking %s as complete"
-msgstr "Menandai %s sebagai lengkap"
-
-#: fetch-pack.c:784
-#, c-format
-msgid "already have %s (%s)"
-msgstr "sudah punya %s (%s)"
-
-#: fetch-pack.c:870
-msgid "fetch-pack: unable to fork off sideband demultiplexer"
-msgstr "fetch-pack: tidak dapat menggarpu pemultipleks-balik pita samping"
-
-#: fetch-pack.c:878
-msgid "protocol error: bad pack header"
-msgstr "kesalahan protokol: kepala pak jelek"
-
-#: fetch-pack.c:974
-#, c-format
-msgid "fetch-pack: unable to fork off %s"
-msgstr "fetch-pack: tidak dapat menggarpu %s"
-
-#: fetch-pack.c:980
-msgid "fetch-pack: invalid index-pack output"
-msgstr "fetch-pack: keluaran index-pack tidak valid"
-
-#: fetch-pack.c:997
-#, c-format
-msgid "%s failed"
-msgstr "%s gagal"
-
-#: fetch-pack.c:999
-msgid "error in sideband demultiplexer"
-msgstr "kesalahan dalam pemultipleks-balik pita samping"
-
-#: fetch-pack.c:1048
-#, c-format
-msgid "Server version is %.*s"
-msgstr "Versi peladen %.*s"
-
-#: fetch-pack.c:1056 fetch-pack.c:1062 fetch-pack.c:1065 fetch-pack.c:1071
-#: fetch-pack.c:1075 fetch-pack.c:1079 fetch-pack.c:1083 fetch-pack.c:1087
-#: fetch-pack.c:1091 fetch-pack.c:1095 fetch-pack.c:1099 fetch-pack.c:1103
-#: fetch-pack.c:1109 fetch-pack.c:1115 fetch-pack.c:1120 fetch-pack.c:1125
-#, c-format
-msgid "Server supports %s"
-msgstr "Peladen mendukung %s"
-
-#: fetch-pack.c:1058
-msgid "Server does not support shallow clients"
-msgstr "Peladen tidak mendukung klien dangkal"
-
-#: fetch-pack.c:1118
-msgid "Server does not support --shallow-since"
-msgstr "Peladen tidak mendukung --shallow-since"
-
-#: fetch-pack.c:1123
-msgid "Server does not support --shallow-exclude"
-msgstr "Peladen tidak mendukung --shallow-exclude"
-
-#: fetch-pack.c:1127
-msgid "Server does not support --deepen"
-msgstr "Peladen tidak mendukung --deepen"
-
-#: fetch-pack.c:1129
-msgid "Server does not support this repository's object format"
-msgstr "Peladen tidak mendukung objek format repositori ini"
-
-#: fetch-pack.c:1142
-msgid "no common commits"
-msgstr "tidak ada komit umum"
-
-#: fetch-pack.c:1151 fetch-pack.c:1506 builtin/clone.c:1166
-msgid "source repository is shallow, reject to clone."
-msgstr "repositori sumber dangkal, menolak mengkloning."
-
-#: fetch-pack.c:1157 fetch-pack.c:1705
-msgid "git fetch-pack: fetch failed."
-msgstr "git fetch-pack: pengambilan gagal."
-
-#: fetch-pack.c:1271
-#, c-format
-msgid "mismatched algorithms: client %s; server %s"
-msgstr "algoritma tidak cocok: klien %s; peladen %s"
-
-#: fetch-pack.c:1275
-#, c-format
-msgid "the server does not support algorithm '%s'"
-msgstr "peladen tidak mendukung algoritma '%s'"
-
-#: fetch-pack.c:1308
-msgid "Server does not support shallow requests"
-msgstr "Peladen tidak mendukung permintaan dangkal"
-
-#: fetch-pack.c:1315
-msgid "Server supports filter"
-msgstr "Peladen mendukung saringan"
-
-#: fetch-pack.c:1358 fetch-pack.c:2087
-msgid "unable to write request to remote"
-msgstr "tidak dapat menulis permintaan kepada remote"
-
-#: fetch-pack.c:1376
-#, c-format
-msgid "error reading section header '%s'"
-msgstr "kesalahan membaca kepala seksi '%s'"
-
-#: fetch-pack.c:1382
-#, c-format
-msgid "expected '%s', received '%s'"
-msgstr "diharapkan '%s', diterima '%s'"
-
-#: fetch-pack.c:1416
-#, c-format
-msgid "unexpected acknowledgment line: '%s'"
-msgstr "baris pengakuan tidak diharapkan: %s"
-
-#: fetch-pack.c:1421
-#, c-format
-msgid "error processing acks: %d"
-msgstr "kesalahan memproses ack: %d"
-
-#. TRANSLATORS: The parameter will be 'ready', a protocol
-#. keyword.
-#.
-#: fetch-pack.c:1435
-#, c-format
-msgid "expected packfile to be sent after '%s'"
-msgstr "berkas pak diharapkan dikirim setelah '%s'"
-
-#. TRANSLATORS: The parameter will be 'ready', a protocol
-#. keyword.
-#.
-#: fetch-pack.c:1441
-#, c-format
-msgid "expected no other sections to be sent after no '%s'"
-msgstr ""
-"tidak ada bagian lainnya yang diharapkan dikirim setelah tidak ada '%s'"
-
-#: fetch-pack.c:1482
-#, c-format
-msgid "error processing shallow info: %d"
-msgstr "gagal memproses info dangkal: %d"
-
-#: fetch-pack.c:1531
-#, c-format
-msgid "expected wanted-ref, got '%s'"
-msgstr "wanted-ref diharapkan, dapat '%s'"
-
-#: fetch-pack.c:1536
-#, c-format
-msgid "unexpected wanted-ref: '%s'"
-msgstr "wanted-ref tidak diharapkan: '%s'"
-
-#: fetch-pack.c:1541
-#, c-format
-msgid "error processing wanted refs: %d"
-msgstr "kesalahan memproses referensi yang diminta: %d"
-
-#: fetch-pack.c:1571
-msgid "git fetch-pack: expected response end packet"
-msgstr "git fetch-pack: paket jawaban akhir diharapkan"
-
-#: fetch-pack.c:1983
-msgid "no matching remote head"
-msgstr "tidak ada kepala remote yang cocok"
-
-#: fetch-pack.c:2006 builtin/clone.c:587
-msgid "remote did not send all necessary objects"
-msgstr "remote tidak mengirim semua objek yang dibutuhkan"
-
-#: fetch-pack.c:2109
-msgid "unexpected 'ready' from remote"
-msgstr "'ready' tidak diharapkan dari remote"
-
-#: fetch-pack.c:2132
-#, c-format
-msgid "no such remote ref %s"
-msgstr "tidak ada referensi remote seperti %s"
-
-#: fetch-pack.c:2135
-#, c-format
-msgid "Server does not allow request for unadvertised object %s"
-msgstr "Peladen tidak memperbolehkan permintaan untuk objek tak diiklankan %s"
-
-#: fsmonitor-ipc.c:119
-#, c-format
-msgid "fsmonitor_ipc__send_query: invalid path '%s'"
-msgstr ""
-
-#: fsmonitor-ipc.c:125
-#, c-format
-msgid "fsmonitor_ipc__send_query: unspecified error on '%s'"
-msgstr ""
-
-#: fsmonitor-ipc.c:155
-msgid "fsmonitor--daemon is not running"
-msgstr ""
-
-#: fsmonitor-ipc.c:164
-#, c-format
-msgid "could not send '%s' command to fsmonitor--daemon"
-msgstr ""
-
-#: gpg-interface.c:329 gpg-interface.c:456 gpg-interface.c:995
-#: gpg-interface.c:1011
-msgid "could not create temporary file"
-msgstr "tidak dapat membuat berkas sementara"
-
-#: gpg-interface.c:332 gpg-interface.c:459
-#, c-format
-msgid "failed writing detached signature to '%s'"
-msgstr "gagal menulis tandatangan terlepas ke '%s'"
-
-#: gpg-interface.c:450
-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:479
-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:550
-#, 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:638
-#, c-format
-msgid "bad/incompatible signature '%s'"
-msgstr "tanda tangan '%s' jelek/tidak kompatibel"
-
-#: gpg-interface.c:815 gpg-interface.c:820
-#, c-format
-msgid "failed to get the ssh fingerprint for key '%s'"
-msgstr "gagal mendapatkan sidik jari ssh untuk kunci '%s'"
-
-#: gpg-interface.c:843
-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:865
-#, 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:871
-#, c-format
-msgid "gpg.ssh.defaultKeyCommand failed: %s %s"
-msgstr "gpg.ssh.defaultKeyCommand gagal: %s %s"
-
-#: gpg-interface.c:966
-msgid "gpg failed to sign the data"
-msgstr "gpg gagal menandatangani data"
-
-#: gpg-interface.c:988
-msgid "user.signingkey needs to be set for ssh signing"
-msgstr "user.signingkey perlu disetel untuk penandatanganan ssh"
-
-#: gpg-interface.c:999
-#, c-format
-msgid "failed writing ssh signing key to '%s'"
-msgstr "gagal menulis kunci penandatanganan ssh ke '%s'"
-
-#: gpg-interface.c:1017
-#, c-format
-msgid "failed writing ssh signing key buffer to '%s'"
-msgstr "gagal menulis penyangga kunci penandatanganan ssh ke '%s'"
-
-#: gpg-interface.c:1035
-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:1047
-#, 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 "warna tidak valid '%.*s' diabaikan di log.graphColors"
-
-#: grep.c:446
-msgid ""
-"given pattern contains NULL byte (via -f <file>). This is only supported "
-"with -P under PCRE v2"
-msgstr ""
-"pola yang diberikan berisi bita NULL (via -f <berkas>). Hal ini hanya "
-"didukung dengan -P di bawah PCRE v2"
-
-#: grep.c:1859
-#, c-format
-msgid "'%s': unable to read %s"
-msgstr "'%s': tidak dapat membaca %s"
-
-#: grep.c:1876 setup.c:178 builtin/clone.c:308 builtin/diff.c:90
-#: builtin/rm.c:136
-#, c-format
-msgid "failed to stat '%s'"
-msgstr "gagal men-stat '%s'"
-
-#: grep.c:1887
-#, c-format
-msgid "'%s': short read"
-msgstr "'%s': baca pendek"
-
-#: help.c:25
-msgid "start a working area (see also: git help tutorial)"
-msgstr "mulai area kerja (lihat pula: git help tutorial)"
-
-#: help.c:26
-msgid "work on the current change (see also: git help everyday)"
-msgstr "bekerja pada perubahan saat ini (lihat pula: git help everyday)"
-
-#: help.c:27
-msgid "examine the history and state (see also: git help revisions)"
-msgstr "periksa riwayat dan keadaan (lihat pula: git help revisions)"
-
-#: help.c:28
-msgid "grow, mark and tweak your common history"
-msgstr "tumbuhkan, tandai, dan cubit riwayat umum Anda"
-
-#: help.c:29
-msgid "collaborate (see also: git help workflows)"
-msgstr "kolaborasi (lihat pula: git help workflows)"
-
-#: help.c:33
-msgid "Main Porcelain Commands"
-msgstr "Perintah Porselen Utama"
-
-#: help.c:34
-msgid "Ancillary Commands / Manipulators"
-msgstr "Perintah Tambahan / Peubah"
-
-#: help.c:35
-msgid "Ancillary Commands / Interrogators"
-msgstr "Perintah Tambahan / Pemeriksa"
-
-#: help.c:36
-msgid "Interacting with Others"
-msgstr "Berinteraksi dengan yang Lain"
-
-#: help.c:37
-msgid "Low-level Commands / Manipulators"
-msgstr "Perintah Tingkat Rendah / Peubah"
-
-#: help.c:38
-msgid "Low-level Commands / Interrogators"
-msgstr "Perintah Tingkat Rendah / Pemeriksa"
-
-#: help.c:39
-msgid "Low-level Commands / Syncing Repositories"
-msgstr "Perintah Tingkat Rendah / Sinkronisasi Repositori"
-
-#: help.c:40
-msgid "Low-level Commands / Internal Helpers"
-msgstr "Perintah Tingak Rendah / Pembantu Internal"
-
-#: help.c:316
-#, c-format
-msgid "available git commands in '%s'"
-msgstr "perintah git yang tersedia di '%s'"
-
-#: help.c:323
-msgid "git commands available from elsewhere on your $PATH"
-msgstr "perintah git yang tersedia dari tempat lain pada $PATH Anda"
-
-#: help.c:332
-msgid "These are common Git commands used in various situations:"
-msgstr "Berikut ini perintah Git umum yang digunakan dalam beragam situasi:"
-
-#: help.c:382 git.c:100
-#, c-format
-msgid "unsupported command listing type '%s'"
-msgstr "tipe daftar perintah '%s' tidak didukung"
-
-#: help.c:422
-msgid "The Git concept guides are:"
-msgstr "Panduan konsep Git adalah:"
-
-#: help.c:446
-msgid "External commands"
-msgstr "Perintah eksternal"
-
-#: help.c:468
-msgid "Command aliases"
-msgstr "Alias perintah"
-
-#: help.c:486
-msgid "See 'git help <command>' to read about a specific subcommand"
-msgstr "Lihat 'git help <perintah>' untuk baca tentang subperintah spesifik"
-
-#: help.c:563
-#, c-format
-msgid ""
-"'%s' appears to be a git command, but we were not\n"
-"able to execute it. Maybe git-%s is broken?"
-msgstr ""
-"'%s' sepertinya perintah git, tetapi kami tidak dapat\n"
-"menjalankannya. Mungkin git-%s rusak?"
-
-#: help.c:585 help.c:682
-#, c-format
-msgid "git: '%s' is not a git command. See 'git --help'."
-msgstr "git: '%s' bukan perintah git. Lihat 'git --help'."
-
-#: help.c:633
-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:655
-#, 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:660
-#, c-format
-msgid "Continuing under the assumption that you meant '%s'."
-msgstr "Melanjutkan di bawah asumsi bahwa maksud Anda '%s'."
-
-#: help.c:666
-#, c-format
-msgid "Run '%s' instead [y/N]? "
-msgstr "Jalankan '%s' sebagai gantinya [y/N]?"
-
-#: help.c:674
-#, 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:686
-msgid ""
-"\n"
-"The most similar command is"
-msgid_plural ""
-"\n"
-"The most similar commands are"
-msgstr[0] ""
-"\n"
-"Perintah paling mirip adalah"
-msgstr[1] ""
-"\n"
-"Perintah paling mirip adalah"
-
-#: help.c:729
-msgid "git version [<options>]"
-msgstr "git version [<opsi>]"
-
-#: help.c:784
-#, c-format
-msgid "%s: %s - %s"
-msgstr "%s: %s - %s"
-
-#: help.c:788
-msgid ""
-"\n"
-"Did you mean this?"
-msgid_plural ""
-"\n"
-"Did you mean one of these?"
-msgstr[0] ""
-"\n"
-"Mungkin maksud Anda yang ini?"
-msgstr[1] ""
-"\n"
-"Mungkin maksud Anda salah satu dari yang ini?"
-
-#: hook.c:28
-#, 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 ""
-"Kait '%s' diabaikan karena tidak disetel sebagai dapat dieksekusi.\n"
-"Anda dapat menonaktifkan peringatan ini dengan `git config advice."
-"ignoredHook false`."
-
-#: hook.c:87
-#, c-format
-msgid "Couldn't start hook '%s'\n"
-msgstr "Tidak dapat memulai kait '%s'\n"
-
-#: ident.c:354
-msgid "Author identity unknown\n"
-msgstr "Identitas pengarang tidak dikenal\n"
-
-#: ident.c:357
-msgid "Committer identity unknown\n"
-msgstr "Identitas pengkomit tidak dikenal\n"
-
-#: ident.c:363
-msgid ""
-"\n"
-"*** Please tell me who you are.\n"
-"\n"
-"Run\n"
-"\n"
-"  git config --global user.email \"you@example.com\"\n"
-"  git config --global user.name \"Your Name\"\n"
-"\n"
-"to set your account's default identity.\n"
-"Omit --global to set the identity only in this repository.\n"
-"\n"
-msgstr ""
-"\n"
-"*** Mohon beri tahu saya siapa Anda.\n"
-"\n"
-"Jalankan\n"
-"\n"
-"  git config --global user.email \"anda@example.com\"\n"
-"  git config --global user.name \"Nama Anda\"\n"
-"\n"
-"untuk menyetel identitas asali akun Anda.\n"
-"Abaikan --global untuk menyetel identitas hanya di dalam repositori ini.\n"
-"\n"
-
-#: ident.c:398
-msgid "no email was given and auto-detection is disabled"
-msgstr "tidak ada email yang diberikan dan deteksi otomatis dimatikan"
-
-#: ident.c:403
-#, c-format
-msgid "unable to auto-detect email address (got '%s')"
-msgstr "tidak dapat mendeteksi otomatis alamat email (dapat '%s')"
-
-#: ident.c:420
-msgid "no name was given and auto-detection is disabled"
-msgstr "tidak ada nama yang diberikan dan deteksi otomatis dimatikan"
-
-#: ident.c:426
-#, c-format
-msgid "unable to auto-detect name (got '%s')"
-msgstr "tidak dapat mendeteksi otomatis nama (dapat '%s')"
-
-#: ident.c:434
-#, c-format
-msgid "empty ident name (for <%s>) not allowed"
-msgstr "nama identitas kosong (untuk <%s>) tidak diperbolehkan"
-
-#: ident.c:440
-#, c-format
-msgid "name consists only of disallowed characters: %s"
-msgstr "nama hanya terdiri dari karakter yang tidak diperbolehkan: %s"
-
-#: ident.c:455 builtin/commit.c:649
-#, c-format
-msgid "invalid date format: %s"
-msgstr "format tanggal tidak valid: %s"
-
-#: list-objects-filter-options.c:68
-msgid "expected 'tree:<depth>'"
-msgstr ""
-
-#: list-objects-filter-options.c:83
-msgid "sparse:path filters support has been dropped"
-msgstr ""
-
-#: list-objects-filter-options.c:90
-#, c-format
-msgid "'%s' for 'object:type=<type>' is not a valid object type"
-msgstr ""
-
-#: list-objects-filter-options.c:109
-#, c-format
-msgid "invalid filter-spec '%s'"
-msgstr ""
-
-#: list-objects-filter-options.c:125
-#, c-format
-msgid "must escape char in sub-filter-spec: '%c'"
-msgstr ""
-
-#: list-objects-filter-options.c:167
-msgid "expected something after combine:"
-msgstr ""
-
-#: list-objects-filter-options.c:249
-msgid "multiple filter-specs cannot be combined"
-msgstr ""
-
-#: list-objects-filter-options.c:365
-msgid "unable to upgrade repository format to support partial clone"
-msgstr ""
-
-#: list-objects-filter.c:532
-#, c-format
-msgid "unable to access sparse blob in '%s'"
-msgstr ""
-
-#: list-objects-filter.c:535
-#, c-format
-msgid "unable to parse sparse filter data in %s"
-msgstr ""
-
-#: list-objects.c:144
-#, c-format
-msgid "entry '%s' in tree %s has tree mode, but is not a tree"
-msgstr ""
-
-#: list-objects.c:157
-#, c-format
-msgid "entry '%s' in tree %s has blob mode, but is not a blob"
-msgstr ""
-
-#: list-objects.c:415
-#, c-format
-msgid "unable to load root tree for commit %s"
-msgstr ""
-
-#: lockfile.c:152
-#, c-format
-msgid ""
-"Unable to create '%s.lock': %s.\n"
-"\n"
-"Another git process seems to be running in this repository, e.g.\n"
-"an editor opened by 'git commit'. Please make sure all processes\n"
-"are terminated then try again. If it still fails, a git process\n"
-"may have crashed in this repository earlier:\n"
-"remove the file manually to continue."
-msgstr ""
-
-#: lockfile.c:160
-#, c-format
-msgid "Unable to create '%s.lock': %s"
-msgstr ""
-
-#: ls-refs.c:175
-#, c-format
-msgid "unexpected line: '%s'"
-msgstr ""
-
-#: ls-refs.c:179
-msgid "expected flush after ls-refs arguments"
-msgstr ""
-
-#: mailinfo.c:1050
-msgid "quoted CRLF detected"
-msgstr ""
-
-#: mailinfo.c:1254 builtin/am.c:185 builtin/mailinfo.c:46
-#, c-format
-msgid "bad action '%s' for '%s'"
-msgstr ""
-
-#: merge-ort.c:1630 merge-recursive.c:1214
-#, c-format
-msgid "Failed to merge submodule %s (not checked out)"
-msgstr "Gagal menggabungkan submodul %s (tidak di-checkout)"
-
-#: merge-ort.c:1639 merge-recursive.c:1221
-#, c-format
-msgid "Failed to merge submodule %s (commits not present)"
-msgstr "Gagal menggabungkan submodul %s (komit tidak ada)"
-
-#: merge-ort.c:1648 merge-recursive.c:1228
-#, c-format
-msgid "Failed to merge submodule %s (commits don't follow merge-base)"
-msgstr ""
-"Gagal menggabungkan submodul %s (komit tidak mengikuti dasar penggabungan)"
-
-#: merge-ort.c:1658 merge-ort.c:1666
-#, c-format
-msgid "Note: Fast-forwarding submodule %s to %s"
-msgstr "Catatan: Memaju-cepat submodul %s ke %s"
-
-#: merge-ort.c:1688
-#, c-format
-msgid "Failed to merge submodule %s"
-msgstr "Gagal menggabungkan submodul %s"
-
-#: merge-ort.c:1695
-#, c-format
-msgid ""
-"Failed to merge submodule %s, but a possible merge resolution exists:\n"
-"%s\n"
-msgstr ""
-"Gagal menggabungkan submodul %s, tetapi sebuah penyelesaian penggabungan "
-"yang mungkin ada:\n"
-"%s\n"
-
-#: merge-ort.c:1699 merge-recursive.c:1284
-#, c-format
-msgid ""
-"If this is correct simply add it to the index for example\n"
-"by using:\n"
-"\n"
-"  git update-index --cacheinfo 160000 %s \"%s\"\n"
-"\n"
-"which will accept this suggestion.\n"
-msgstr ""
-"Jika benar, cukup misalkan tambahkan ke indeks dengan menggunakan:\n"
-"\n"
-"  git update-index --cacheinfo 160000 %s \"%s\"\n"
-"\n"
-"yang akan menerima saran ini.\n"
-
-#: merge-ort.c:1712
-#, c-format
-msgid ""
-"Failed to merge submodule %s, but multiple possible merges exist:\n"
-"%s"
-msgstr ""
-"Gagal menggabungkan submodul %s, tetapi ada banyak penggabungan yang "
-"mungkin:\n"
-"%s"
-
-#: merge-ort.c:1937 merge-recursive.c:1375
-msgid "Failed to execute internal merge"
-msgstr "Gagal menjalankan penggabungan internal"
-
-#: merge-ort.c:1942 merge-recursive.c:1380
-#, c-format
-msgid "Unable to add %s to database"
-msgstr "Tidak dapat menambahkan %s ke basis data"
-
-#: merge-ort.c:1949 merge-recursive.c:1413
-#, c-format
-msgid "Auto-merging %s"
-msgstr "Menggabungkan otomatis %s"
-
-#: merge-ort.c:2088 merge-recursive.c:2135
-#, 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 ""
-"KONFLIK (penamaan ulang direktori implisit): Berkas/direktori yang sudah ada "
-"pada %s saat penamaan ulang direktori menempatkan jalur berikut di sana: %s."
-
-#: merge-ort.c:2098 merge-recursive.c:2145
-#, 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 ""
-"KONFLIK (penamaan ulang direktori implisit): Tidak dapat memetakan lebih "
-"dari satu jalur ke %s; penamaan ulang direktori implisit mencoba menempatkan "
-"jalur tersebut di sana: %s"
-
-#: merge-ort.c:2156
-#, c-format
-msgid ""
-"CONFLICT (directory rename split): Unclear where to rename %s to; it was "
-"renamed to multiple other directories, with no destination getting a "
-"majority of the files."
-msgstr ""
-"KONFLIK (pemecahan penamaan ulang direktori): Tidak jelas kemana menamakan "
-"ulang %s; itu dinamai ulang ke banyak direktori lainnya, dengan tiada tujuan "
-"mendapatkan mayoritas berkas."
-
-#: merge-ort.c:2310 merge-recursive.c:2481
-#, c-format
-msgid ""
-"WARNING: Avoiding applying %s -> %s rename to %s, because %s itself was "
-"renamed."
-msgstr ""
-"PERINGATAN: Menghindari menerapkan penamaan ulang %s -> %s ke %s, karena %s-"
-"nya sendiri dinamai ulang."
-
-#: merge-ort.c:2450 merge-recursive.c:3264
-#, c-format
-msgid ""
-"Path updated: %s added in %s inside a directory that was renamed in %s; "
-"moving it to %s."
-msgstr ""
-"Jalur diperbarui: %s menambahkan %s di dalam sebuah direktori yang dinamai "
-"ulang di %s; memindahkan ke %s."
-
-#: merge-ort.c:2457 merge-recursive.c:3271
-#, c-format
-msgid ""
-"Path updated: %s renamed to %s in %s, inside a directory that was renamed in "
-"%s; moving it to %s."
-msgstr ""
-"Jalur diperbarui: %s dinamai ulang ke %s di %s, di dalam sebuah direktori "
-"yang dinamai ulang di %s; memindahkan ke %s."
-
-#: merge-ort.c:2470 merge-recursive.c:3267
-#, 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 ""
-"KONFLIK (lokasi berkas): %s menambahkan %s di dalam sebuah direktori yang "
-"dinamai ulang di %s, menyarankan mungkin dipindahkan ke %s."
-
-#: merge-ort.c:2478 merge-recursive.c:3274
-#, 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 ""
-"KONFLIK (lokasi berkas): %s dinamai ulang ke %s di %s, di dalam sebuah "
-"direktori yang dinamai ulang di %s, menyarankan mungkin dipindahkan ke %s. "
-
-#: merge-ort.c:2634
-#, c-format
-msgid "CONFLICT (rename/rename): %s renamed to %s in %s and to %s in %s."
-msgstr ""
-"KONFLIK (penamaan ulang/penamaan ulang): %s dinamai ulang ke %s di %s dan ke "
-"%s di %s."
-
-#: merge-ort.c:2729
-#, 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."
-msgstr ""
-"KONFLIK (penamaan ulang terlibat di dalam tabrakan): penamaan ulang %s -> %s "
-"punya konflik konten DAN bertabrakan dengan jalur yang lain; ini mungkin "
-"menghasilkan penanda konflik bersarang."
-
-#: merge-ort.c:2748 merge-ort.c:2772
-#, c-format
-msgid "CONFLICT (rename/delete): %s renamed to %s in %s, but deleted in %s."
-msgstr ""
-"KONFLIK (penamaan ulang/penghapusan): %s dinamai ulang ke %s di %s, tetapi "
-"dihapus di %s."
-
-#: merge-ort.c:3261 merge-recursive.c:3025
-#, c-format
-msgid "cannot read object %s"
-msgstr "tidak dapat membaca objek %s"
-
-#: merge-ort.c:3264 merge-recursive.c:3028
-#, c-format
-msgid "object %s is not a blob"
-msgstr "objek %s bukanlah sebuah blob"
-
-#: merge-ort.c:3693
-#, c-format
-msgid ""
-"CONFLICT (file/directory): directory in the way of %s from %s; moving it to "
-"%s instead."
-msgstr ""
-"KONFLIK (berkas/direktori): direktori di jalan %s dari %s; memindahkan ke %s "
-"sebagai gantinya."
-
-#: merge-ort.c:3770
-#, c-format
-msgid ""
-"CONFLICT (distinct types): %s had different types on each side; renamed both "
-"of them so each can be recorded somewhere."
-msgstr ""
-"KONFLIK (tipe berbeda): %s punya tipe berbeda pada setiap sisi; kedua-duanya "
-"dinamai ulang sehingga masing-masing dapat direkam di suatu tempat."
-
-#: merge-ort.c:3777
-#, c-format
-msgid ""
-"CONFLICT (distinct types): %s had different types on each side; renamed one "
-"of them so each can be recorded somewhere."
-msgstr ""
-"KONFLIK (tipe berbeda): %s punya tipe berbeda pada setiap sisi; salah "
-"satunya dinamai ulang sehingga masing-masing dapat direkam di suatu tempat."
-
-#: merge-ort.c:3866 merge-recursive.c:3104
-msgid "content"
-msgstr "konten"
-
-#: merge-ort.c:3868 merge-recursive.c:3108
-msgid "add/add"
-msgstr "penambahan/penambahan"
-
-#: merge-ort.c:3870 merge-recursive.c:3153
-msgid "submodule"
-msgstr "submodul"
-
-#: merge-ort.c:3872 merge-recursive.c:3154
-#, c-format
-msgid "CONFLICT (%s): Merge conflict in %s"
-msgstr "KONFLIK (%s): Konflik penggabungan di %s"
-
-#: merge-ort.c:3916
-#, c-format
-msgid ""
-"CONFLICT (modify/delete): %s deleted in %s and modified in %s.  Version %s "
-"of %s left in tree."
-msgstr ""
-"KONFLIK (pengubahan/penghapusan): %s dihapus di %s dan diubah di %s. Versi "
-"%s dari %s ditinggalkan di dalam pohon."
-
-#: merge-ort.c:4212
-#, c-format
-msgid ""
-"Note: %s not up to date and in way of checking out conflicted version; old "
-"copy renamed to %s"
-msgstr ""
-"Catatan: %s tidak terbaru dan dalam men-checkout versi berkonflik; salinan "
-"lama dinamai ulang ke %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:4586
-#, c-format
-msgid "collecting merge info failed for trees %s, %s, %s"
-msgstr "pengumpulan info penggabungan gagal untuk pohon %s, %s, dan %s"
-
-#: merge-ort-wrappers.c:13 merge-recursive.c:3723
-#, c-format
-msgid ""
-"Your local changes to the following files would be overwritten by merge:\n"
-"  %s"
-msgstr ""
-"Perubahan lokal Anda terhadap berkas berikut akan ditimpa oleh "
-"penggabungan:\n"
-"  %s"
-
-#: merge-ort-wrappers.c:33 merge-recursive.c:3485 builtin/merge.c:405
-msgid "Already up to date."
-msgstr "Sudah terbaru."
-
-#: merge-recursive.c:353
-msgid "(bad commit)\n"
-msgstr "(komit jelek)\n"
-
-#: merge-recursive.c:381
-#, c-format
-msgid "add_cacheinfo failed for path '%s'; merge aborting."
-msgstr "add_cacheinfo gagal untuk jalur '%s'; penggabungan dibatalkan."
-
-#: merge-recursive.c:390
-#, c-format
-msgid "add_cacheinfo failed to refresh for path '%s'; merge aborting."
-msgstr ""
-"add_cacheinfo gagal menyegarkan untuk jalur '%s'; penggabungan dibatalkan."
-
-#: merge-recursive.c:881
-#, c-format
-msgid "failed to create path '%s'%s"
-msgstr "gagal membuat jalur '%s'%s"
-
-#: merge-recursive.c:892
-#, c-format
-msgid "Removing %s to make room for subdirectory\n"
-msgstr "Menghapus %s untuk membuat ruang untuk subdirektori\n"
-
-#: merge-recursive.c:906 merge-recursive.c:925
-msgid ": perhaps a D/F conflict?"
-msgstr ": mungkin konflik direktori/berkas?"
-
-#: merge-recursive.c:915
-#, c-format
-msgid "refusing to lose untracked file at '%s'"
-msgstr "menolak menghilangkan berkas tak terlacak pada '%s'"
-
-#: merge-recursive.c:956 builtin/cat-file.c:47
-#, c-format
-msgid "cannot read object %s '%s'"
-msgstr "tidak dapat membaca objek %s '%s'"
-
-#: merge-recursive.c:961
-#, c-format
-msgid "blob expected for %s '%s'"
-msgstr "blob diharapkan untuk %s '%s'"
-
-#: merge-recursive.c:986
-#, c-format
-msgid "failed to open '%s': %s"
-msgstr "gagal membuka '%s': %s"
-
-#: merge-recursive.c:997
-#, c-format
-msgid "failed to symlink '%s': %s"
-msgstr "gagal menautkan simbolik '%s': %s"
-
-#: merge-recursive.c:1002
-#, c-format
-msgid "do not know what to do with %06o %s '%s'"
-msgstr "tidak tahu apa yang dilakukan dengan %06o %s '%s'"
-
-#: merge-recursive.c:1236 merge-recursive.c:1249
-#, c-format
-msgid "Fast-forwarding submodule %s to the following commit:"
-msgstr "Memaju-cepat submodul %s ke komit berikut:"
-
-#: merge-recursive.c:1239 merge-recursive.c:1252
-#, c-format
-msgid "Fast-forwarding submodule %s"
-msgstr "Memaju-cepat submodul %s"
-
-#: merge-recursive.c:1276
-#, c-format
-msgid "Failed to merge submodule %s (merge following commits not found)"
-msgstr ""
-"Gagal menggabungkan submodul %s (penggabungan komit berikutnya tidak "
-"ditemukan)"
-
-#: merge-recursive.c:1280
-#, c-format
-msgid "Failed to merge submodule %s (not fast-forward)"
-msgstr "Gagal menggabungkan submodul %s (bukan maju-cepat)"
-
-#: merge-recursive.c:1281
-msgid "Found a possible merge resolution for the submodule:\n"
-msgstr "Sebuah resolusi penggabungan yang mungkin ditemukan untuk submodul:\n"
-
-#: merge-recursive.c:1293
-#, c-format
-msgid "Failed to merge submodule %s (multiple merges found)"
-msgstr "Gagal menggabungkan submodul %s (banyak penggabungan ditemukan)"
-
-#: merge-recursive.c:1437
-#, c-format
-msgid "Error: Refusing to lose untracked file at %s; writing to %s instead."
-msgstr ""
-"Kesalahan: Menolak menghilangkan berkas tak terlacak pada %s; menulis ke %s "
-"sebagai gantinya."
-
-#: merge-recursive.c:1509
-#, c-format
-msgid ""
-"CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s left "
-"in tree."
-msgstr ""
-"KONFLIK (%s/penghapusan): %s dihapus di %s dan %s di %s. Versi %s dari %s "
-"ditinggalkan di dalam pohon."
-
-#: merge-recursive.c:1514
-#, c-format
-msgid ""
-"CONFLICT (%s/delete): %s deleted in %s and %s to %s in %s. Version %s of %s "
-"left in tree."
-msgstr ""
-"KONFLIK (%s/penghapusan): %s dihapus di %s dan %s ke %s di %s. Versi %s dari "
-"%s ditinggalkan di dalam pohon."
-
-#: merge-recursive.c:1521
-#, c-format
-msgid ""
-"CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s left "
-"in tree at %s."
-msgstr ""
-"KONFLIK (%s/penghapusan): %s dihapus di %s dan %s di %s. Versi %s dari %s "
-"ditinggalkan di dalam pohon pada %s."
-
-#: merge-recursive.c:1526
-#, 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 ""
-"KONFLIK (%s/penghapusan): %s dihapus di %s dan %s ke %s di %s. Versi %s dari "
-"%s ditinggalkan di dalam pohon pada %s."
-
-#: merge-recursive.c:1561
-msgid "rename"
-msgstr "penamaan ulang"
-
-#: merge-recursive.c:1561
-msgid "renamed"
-msgstr "dinamai ulang"
-
-#: merge-recursive.c:1612 merge-recursive.c:2518 merge-recursive.c:3181
-#, c-format
-msgid "Refusing to lose dirty file at %s"
-msgstr "Menolak menghilangkan berkas kotor pada %s"
-
-#: merge-recursive.c:1622
-#, c-format
-msgid "Refusing to lose untracked file at %s, even though it's in the way."
-msgstr ""
-"Menolak menghilangkan berkas tak terlacak pada %s, bahkan jika itu berjalan."
-
-#: merge-recursive.c:1680
-#, c-format
-msgid "CONFLICT (rename/add): Rename %s->%s in %s.  Added %s in %s"
-msgstr ""
-"KONFLIK (penamaan ulang/penambahan): Penamaan ulang %s-%s di %s. %s "
-"ditambahkan di %s"
-
-#: merge-recursive.c:1711
-#, c-format
-msgid "%s is a directory in %s adding as %s instead"
-msgstr ""
-"%s adalah sebuah direktori dalam %s menambahkan sebagai %s sebagai gantinya"
-
-#: merge-recursive.c:1716
-#, c-format
-msgid "Refusing to lose untracked file at %s; adding as %s instead"
-msgstr ""
-"Menolak menghilangkan berkas tak terlacak pada %s; menambahkan sebagai %s "
-"sebagai gantinya"
-
-#: merge-recursive.c:1743
-#, c-format
-msgid ""
-"CONFLICT (rename/rename): Rename \"%s\"->\"%s\" in branch \"%s\" rename \"%s"
-"\"->\"%s\" in \"%s\"%s"
-msgstr ""
-"KONFLIK (penamaan ulang/penamaan ulang): Penamaan ulang \"%s\"->\"%s\" di "
-"dalam cabang \"%s\" penamaan ulang \"%s\"->\"%s\" di \"%s\"%s"
-
-#: merge-recursive.c:1748
-msgid " (left unresolved)"
-msgstr " dibiarkan tak diselesaikan"
-
-#: merge-recursive.c:1840
-#, c-format
-msgid "CONFLICT (rename/rename): Rename %s->%s in %s. Rename %s->%s in %s"
-msgstr ""
-"KONFLIK (penamaan ulang/penamaan ulang): Penamaan ulang %s->%s di %s. "
-"Penamaan ulang %s->%s di %s"
-
-#: merge-recursive.c:2103
-#, c-format
-msgid ""
-"CONFLICT (directory rename split): Unclear where to place %s because "
-"directory %s was renamed to multiple other directories, with no destination "
-"getting a majority of the files."
-msgstr ""
-"KONFLIK (pemecahan penamaan ulang direktori): Tidak jelas dimana untuk "
-"menempatkan %s karena direktori %s dinamai ulang ke banyak direktori "
-"lainnya, dengan tidak ada tujuan yang mendapatkan mayoritas berkas."
-
-#: merge-recursive.c:2237
-#, c-format
-msgid ""
-"CONFLICT (rename/rename): Rename directory %s->%s in %s. Rename directory %s-"
-">%s in %s"
-msgstr ""
-"KONFLIK (penamaan ulang/penamaan ulang): Penamaan ulang direktori %s->%s di "
-"%s. Penamaan ulang %s->%s di %s"
-
-#: merge-recursive.c:3092
-msgid "modify"
-msgstr "ubah"
-
-#: merge-recursive.c:3092
-msgid "modified"
-msgstr "diubah"
-
-#: merge-recursive.c:3131
-#, c-format
-msgid "Skipped %s (merged same as existing)"
-msgstr "%s dilewatkan (digabungkan sama seperti yang ada)"
-
-#: merge-recursive.c:3184
-#, c-format
-msgid "Adding as %s instead"
-msgstr "Menambahkan sebagai %s sebagai gantinya"
-
-#: merge-recursive.c:3388
-#, c-format
-msgid "Removing %s"
-msgstr "Menghapus %s"
-
-#: merge-recursive.c:3411
-msgid "file/directory"
-msgstr "berkas/direktori"
-
-#: merge-recursive.c:3416
-msgid "directory/file"
-msgstr "direktori/berkas"
-
-#: merge-recursive.c:3423
-#, c-format
-msgid "CONFLICT (%s): There is a directory with name %s in %s. Adding %s as %s"
-msgstr ""
-"KONFLIK (%s): Ada direktori dengan nama %s di %s. Menambahakn %s sebagai %s"
-
-#: merge-recursive.c:3432
-#, c-format
-msgid "Adding %s"
-msgstr "Menambahkan %s"
-
-#: merge-recursive.c:3441
-#, c-format
-msgid "CONFLICT (add/add): Merge conflict in %s"
-msgstr "KONFLIK (penambahan/penambahan): Konflik penggabungan di %s"
-
-#: merge-recursive.c:3494
-#, c-format
-msgid "merging of trees %s and %s failed"
-msgstr "penggabungan pohon %s dan %s gagal"
-
-#: merge-recursive.c:3588
-msgid "Merging:"
-msgstr "Menggabungkan:"
-
-#: merge-recursive.c:3601
-#, c-format
-msgid "found %u common ancestor:"
-msgid_plural "found %u common ancestors:"
-msgstr[0] "%u leluhur umum ditemukan:"
-msgstr[1] "%u leluhur umum ditemukan:"
-
-#: merge-recursive.c:3651
-msgid "merge returned no commit"
-msgstr "penggabungan tidak mengembalikan komit"
-
-#: merge-recursive.c:3823
-#, c-format
-msgid "Could not parse object '%s'"
-msgstr "Tidak dapat menguraikan objek '%s'"
-
-#: merge-recursive.c:3841 builtin/merge.c:720 builtin/merge.c:912
-#: builtin/stash.c:489
-msgid "Unable to write index."
-msgstr "Tidak dapat menulis indeks."
-
-#: merge.c:41
-msgid "failed to read the cache"
-msgstr "gagal membaca tembolok"
-
-#: merge.c:102 rerere.c:705 builtin/am.c:1989 builtin/am.c:2023
-#: builtin/checkout.c:603 builtin/checkout.c:865 builtin/clone.c:714
-#: builtin/stash.c:269
-msgid "unable to write new index file"
-msgstr "gagal menulis berkas indeks baru"
-
-#: midx.c:79
-msgid "multi-pack-index OID fanout is of the wrong size"
-msgstr "OID kipas-keluar indeks multipak salah ukuran"
-
-#: midx.c:112
-#, c-format
-msgid "multi-pack-index file %s is too small"
-msgstr "berkas indeks multipak %s terlalu kecil"
-
-#: midx.c:128
-#, c-format
-msgid "multi-pack-index signature 0x%08x does not match signature 0x%08x"
-msgstr ""
-"tanda tangan indeks multipak 0x%08x tidak cocok dengan tanda tangan 0x%08x"
-
-#: midx.c:133
-#, c-format
-msgid "multi-pack-index version %d not recognized"
-msgstr "versi indeks multipak %d tidak dikenal"
-
-#: midx.c:138
-#, c-format
-msgid "multi-pack-index hash version %u does not match version %u"
-msgstr "versi hash indeks multipak %u tidak cocok dengan versi %u"
-
-#: midx.c:155
-msgid "multi-pack-index missing required pack-name chunk"
-msgstr "indeks multipak kehilangan bingkah pack-name yang diperlukan"
-
-#: midx.c:157
-msgid "multi-pack-index missing required OID fanout chunk"
-msgstr "indeks multipak kehilangan bingkah OID kipas keluar yang diperlukan"
-
-#: midx.c:159
-msgid "multi-pack-index missing required OID lookup chunk"
-msgstr "indeks multipak kehilangan bingkah pencarian OID yang diperlukan"
-
-#: midx.c:161
-msgid "multi-pack-index missing required object offsets chunk"
-msgstr "indeks multipak kehilangan bingkah offset objek yang diperlukan"
-
-#: midx.c:180
-#, c-format
-msgid "multi-pack-index pack names out of order: '%s' before '%s'"
-msgstr "nama pak indeks multipak tidak berurutan: '%s' sebelum '%s'"
-
-#: midx.c:228
-#, c-format
-msgid "bad pack-int-id: %u (%u total packs)"
-msgstr "pack-int-id jelek: %u (total pak %u)"
-
-#: midx.c:278
-msgid "multi-pack-index stores a 64-bit offset, but off_t is too small"
-msgstr "indeks multipak simpan offset 64-bit, tapi off_t terlalu kecil"
-
-#: midx.c:509
-#, c-format
-msgid "failed to add packfile '%s'"
-msgstr "gagal menambah berkas pak '%s'"
-
-#: midx.c:515
-#, c-format
-msgid "failed to open pack-index '%s'"
-msgstr "gagal membuka indeks pak '%s'"
-
-#: midx.c:583
-#, c-format
-msgid "failed to locate object %d in packfile"
-msgstr "gagal melokasi objek %d di dalam berkas pak"
-
-#: midx.c:911
-msgid "cannot store reverse index file"
-msgstr "tidak dapat menyimpan berkas indeks balik"
-
-#: midx.c:1009
-#, c-format
-msgid "could not parse line: %s"
-msgstr "tidak dapat menguraikan baris: %s"
-
-#: midx.c:1011
-#, c-format
-msgid "malformed line: %s"
-msgstr "baris jelek '%s'."
-
-#: midx.c:1181
-msgid "ignoring existing multi-pack-index; checksum mismatch"
-msgstr "abaikan indeks multipak yang sudah ada; checksum tidak cocok"
-
-#: midx.c:1206
-msgid "could not load pack"
-msgstr "tidak dapat memuat pak"
-
-#: midx.c:1212
-#, c-format
-msgid "could not open index for %s"
-msgstr "tidak dapat membuka indeks untuk %s"
-
-#: midx.c:1223
-msgid "Adding packfiles to multi-pack-index"
-msgstr "Menambahkan berkas pak ke indeks multipak"
-
-#: midx.c:1266
-#, c-format
-msgid "unknown preferred pack: '%s'"
-msgstr "pak yang disukai tidak dikenal: '%s'"
-
-#: midx.c:1311
-#, c-format
-msgid "cannot select preferred pack %s with no objects"
-msgstr "tidak dapat memilih pak yang disukai %s tanpa objek"
-
-#: midx.c:1343
-#, c-format
-msgid "did not see pack-file %s to drop"
-msgstr "tidak melihat berkas pak %s untuk dijeblokkan"
-
-#: midx.c:1389
-#, c-format
-msgid "preferred pack '%s' is expired"
-msgstr "pak yang disukai '%s' kadaluarsa"
-
-#: midx.c:1402
-msgid "no pack files to index."
-msgstr "tidak ada berkas pak untuk diindeks."
-
-#: midx.c:1409
-msgid "refusing to write multi-pack .bitmap without any objects"
-msgstr "menolak menulis .bitmap multipak tanpa objek apapun"
-
-#: midx.c:1451
-msgid "could not write multi-pack bitmap"
-msgstr "tidak dapat menulis bitmap multipak"
-
-#: midx.c:1461
-msgid "could not write multi-pack-index"
-msgstr "gagal menulis indeks multipak"
-
-#: midx.c:1520 builtin/clean.c:37
-#, c-format
-msgid "failed to remove %s"
-msgstr "gagal menghapus %s"
-
-#: midx.c:1553
-#, c-format
-msgid "failed to clear multi-pack-index at %s"
-msgstr "gagal membersihkan indeks multipak pada %s"
-
-#: midx.c:1616
-msgid "multi-pack-index file exists, but failed to parse"
-msgstr "berkas indeks multipak ada, tetapi gagal diurai"
-
-#: midx.c:1624
-msgid "incorrect checksum"
-msgstr "checksum salah"
-
-#: midx.c:1627
-msgid "Looking for referenced packfiles"
-msgstr "Mencari berkas pak yang direferensikan"
-
-#: midx.c:1642
-#, 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:1647
-msgid "the midx contains no oid"
-msgstr "midx tidak berisi oid"
-
-#: midx.c:1656
-msgid "Verifying OID order in multi-pack-index"
-msgstr "Memverifikasi urutan OID di dalam indeks multipak"
-
-#: midx.c:1665
-#, c-format
-msgid "oid lookup out of order: oid[%d] = %s >= %s = oid[%d]"
-msgstr "urutan pencarian oid tidak berurutan: oid[%d] = %s >= %s = oid[%d]"
-
-#: midx.c:1685
-msgid "Sorting objects by packfile"
-msgstr "Mengurutkan objek oleh berkas pak"
-
-#: midx.c:1692
-msgid "Verifying object offsets"
-msgstr "Memverifikasi offset objek"
-
-#: midx.c:1708
-#, c-format
-msgid "failed to load pack entry for oid[%d] = %s"
-msgstr "gagal memuat entri pak untuk oid[%d] = %s"
-
-#: midx.c:1714
-#, c-format
-msgid "failed to load pack-index for packfile %s"
-msgstr "gagal memuat indeks pak untuk berkas pak %s"
-
-#: midx.c:1723
-#, c-format
-msgid "incorrect object offset for oid[%d] = %s: %<PRIx64> != %<PRIx64>"
-msgstr "offset objek salah untuk oid[%d] = %s: %<PRIx64> != %<PRIx64>"
-
-#: midx.c:1750
-msgid "Counting referenced objects"
-msgstr "Menghitung objek tereferensi"
-
-#: midx.c:1760
-msgid "Finding and deleting unreferenced packfiles"
-msgstr "Mencari dan menghapus berkas pak tak tereferensi"
-
-#: midx.c:1952
-msgid "could not start pack-objects"
-msgstr "tidak dapat memulai pack-objects"
-
-#: midx.c:1972
-msgid "could not finish pack-objects"
-msgstr "tidak dapat menyelesaikan pack-objects"
-
-#: name-hash.c:542
-#, c-format
-msgid "unable to create lazy_dir thread: %s"
-msgstr ""
-
-#: name-hash.c:564
-#, c-format
-msgid "unable to create lazy_name thread: %s"
-msgstr ""
-
-#: name-hash.c:570
-#, c-format
-msgid "unable to join lazy_name thread: %s"
-msgstr ""
-
-#: notes-merge.c:276
-#, 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."
-msgstr ""
-
-#: notes-merge.c:283
-#, c-format
-msgid "You have not concluded your notes merge (%s exists)."
-msgstr ""
-
-#: notes-utils.c:46
-msgid "Cannot commit uninitialized/unreferenced notes tree"
-msgstr ""
-
-#: notes-utils.c:105
-#, c-format
-msgid "Bad notes.rewriteMode value: '%s'"
-msgstr ""
-
-#: notes-utils.c:115
-#, c-format
-msgid "Refusing to rewrite notes in %s (outside of refs/notes/)"
-msgstr ""
-
-#. TRANSLATORS: The first %s is the name of
-#. the environment variable, the second %s is
-#. its value.
-#.
-#: notes-utils.c:145
-#, c-format
-msgid "Bad %s value: '%s'"
-msgstr ""
-
-#: object-file.c:457
-#, c-format
-msgid "object directory %s does not exist; check .git/objects/info/alternates"
-msgstr ""
-
-#: object-file.c:515
-#, c-format
-msgid "unable to normalize alternate object path: %s"
-msgstr ""
-
-#: object-file.c:589
-#, c-format
-msgid "%s: ignoring alternate object stores, nesting too deep"
-msgstr ""
-
-#: object-file.c:596
-#, c-format
-msgid "unable to normalize object directory: %s"
-msgstr ""
-
-#: object-file.c:639
-msgid "unable to fdopen alternates lockfile"
-msgstr ""
-
-#: object-file.c:657
-msgid "unable to read alternates file"
-msgstr ""
-
-#: object-file.c:664
-msgid "unable to move new alternates file into place"
-msgstr ""
-
-#: object-file.c:742
-#, c-format
-msgid "path '%s' does not exist"
-msgstr ""
-
-#: object-file.c:763
-#, c-format
-msgid "reference repository '%s' as a linked checkout is not supported yet."
-msgstr ""
-
-#: object-file.c:769
-#, c-format
-msgid "reference repository '%s' is not a local repository."
-msgstr ""
-
-#: object-file.c:775
-#, c-format
-msgid "reference repository '%s' is shallow"
-msgstr ""
-
-#: object-file.c:783
-#, c-format
-msgid "reference repository '%s' is grafted"
-msgstr ""
-
-#: object-file.c:814
-#, c-format
-msgid "could not find object directory matching %s"
-msgstr ""
-
-#: object-file.c:864
-#, c-format
-msgid "invalid line while parsing alternate refs: %s"
-msgstr ""
-
-#: object-file.c:1014
-#, c-format
-msgid "attempting to mmap %<PRIuMAX> over limit %<PRIuMAX>"
-msgstr ""
-
-#: object-file.c:1049
-#, c-format
-msgid "mmap failed%s"
-msgstr ""
-
-#: object-file.c:1230
-#, c-format
-msgid "object file %s is empty"
-msgstr ""
-
-#: object-file.c:1349 object-file.c:2588
-#, c-format
-msgid "corrupt loose object '%s'"
-msgstr ""
-
-#: object-file.c:1351 object-file.c:2592
-#, c-format
-msgid "garbage at end of loose object '%s'"
-msgstr ""
-
-#: object-file.c:1473
-#, c-format
-msgid "unable to parse %s header"
-msgstr ""
-
-#: object-file.c:1475
-msgid "invalid object type"
-msgstr ""
-
-#: object-file.c:1486
-#, c-format
-msgid "unable to unpack %s header"
-msgstr ""
-
-#: object-file.c:1490
-#, c-format
-msgid "header for %s too long, exceeds %d bytes"
-msgstr ""
-
-#: object-file.c:1720
-#, c-format
-msgid "failed to read object %s"
-msgstr ""
-
-#: object-file.c:1724
-#, c-format
-msgid "replacement %s not found for %s"
-msgstr ""
-
-#: object-file.c:1728
-#, c-format
-msgid "loose object %s (stored in %s) is corrupt"
-msgstr ""
-
-#: object-file.c:1732
-#, c-format
-msgid "packed object %s (stored in %s) is corrupt"
-msgstr ""
-
-#: object-file.c:1855
-#, c-format
-msgid "unable to write file %s"
-msgstr ""
-
-#: object-file.c:1862
-#, c-format
-msgid "unable to set permission to '%s'"
-msgstr ""
-
-#: object-file.c:1869
-msgid "file write error"
-msgstr ""
-
-#: object-file.c:1904
-msgid "error when closing loose object file"
-msgstr ""
-
-#: object-file.c:1971
-#, c-format
-msgid "insufficient permission for adding an object to repository database %s"
-msgstr ""
-
-#: object-file.c:1973
-msgid "unable to create temporary file"
-msgstr ""
-
-#: object-file.c:1997
-msgid "unable to write loose object file"
-msgstr ""
-
-#: object-file.c:2003
-#, c-format
-msgid "unable to deflate new object %s (%d)"
-msgstr ""
-
-#: object-file.c:2007
-#, c-format
-msgid "deflateEnd on object %s failed (%d)"
-msgstr ""
-
-#: object-file.c:2011
-#, c-format
-msgid "confused by unstable object source data for %s"
-msgstr ""
-
-#: object-file.c:2022 builtin/pack-objects.c:1251
-#, c-format
-msgid "failed utime() on %s"
-msgstr ""
-
-#: object-file.c:2100
-#, c-format
-msgid "cannot read object for %s"
-msgstr ""
-
-#: object-file.c:2151
-msgid "corrupt commit"
-msgstr ""
-
-#: object-file.c:2159
-msgid "corrupt tag"
-msgstr ""
-
-#: object-file.c:2259
-#, c-format
-msgid "read error while indexing %s"
-msgstr ""
-
-#: object-file.c:2262
-#, c-format
-msgid "short read while indexing %s"
-msgstr ""
-
-#: object-file.c:2335 object-file.c:2345
-#, c-format
-msgid "%s: failed to insert into database"
-msgstr ""
-
-#: object-file.c:2351
-#, c-format
-msgid "%s: unsupported file type"
-msgstr ""
-
-#: object-file.c:2375 builtin/fetch.c:1494
-#, c-format
-msgid "%s is not a valid object"
-msgstr ""
-
-#: object-file.c:2377
-#, c-format
-msgid "%s is not a valid '%s' object"
-msgstr ""
-
-#: object-file.c:2404
-#, c-format
-msgid "unable to open %s"
-msgstr "tidak dapat membuka %s"
-
-#: object-file.c:2599
-#, c-format
-msgid "hash mismatch for %s (expected %s)"
-msgstr ""
-
-#: object-file.c:2622
-#, c-format
-msgid "unable to mmap %s"
-msgstr ""
-
-#: object-file.c:2628
-#, c-format
-msgid "unable to unpack header of %s"
-msgstr ""
-
-#: object-file.c:2633
-#, c-format
-msgid "unable to parse header of %s"
-msgstr ""
-
-#: object-file.c:2644
-#, c-format
-msgid "unable to unpack contents of %s"
-msgstr ""
-
-#. TRANSLATORS: This is a line of ambiguous object
-#. output shown when we cannot look up or parse the
-#. object in question. E.g. "deadbeef [bad object]".
-#.
-#: object-name.c:382
-#, c-format
-msgid "%s [bad object]"
-msgstr ""
-
-#. TRANSLATORS: This is a line of ambiguous commit
-#. object output. E.g.:
-#. *
-#.    "deadbeef commit 2021-01-01 - Some Commit Message"
-#.
-#: object-name.c:407
-#, c-format
-msgid "%s commit %s - %s"
-msgstr ""
-
-#. TRANSLATORS: This is a line of ambiguous
-#. tag object output. E.g.:
-#. *
-#.    "deadbeef tag 2022-01-01 - Some Tag Message"
-#. *
-#. The second argument is the YYYY-MM-DD found
-#. in the tag.
-#. *
-#. The third argument is the "tag" string
-#. from object.c.
-#.
-#: object-name.c:428
-#, c-format
-msgid "%s tag %s - %s"
-msgstr ""
-
-#. TRANSLATORS: This is a line of ambiguous
-#. tag object output where we couldn't parse
-#. the tag itself. E.g.:
-#. *
-#.    "deadbeef [bad tag, could not parse it]"
-#.
-#: object-name.c:439
-#, c-format
-msgid "%s [bad tag, could not parse it]"
-msgstr ""
-
-#. TRANSLATORS: This is a line of ambiguous <type>
-#. object output. E.g. "deadbeef tree".
-#.
-#: object-name.c:447
-#, c-format
-msgid "%s tree"
-msgstr ""
-
-#. TRANSLATORS: This is a line of ambiguous <type>
-#. object output. E.g. "deadbeef blob".
-#.
-#: object-name.c:453
-#, c-format
-msgid "%s blob"
-msgstr ""
-
-#: object-name.c:569
-#, c-format
-msgid "short object ID %s is ambiguous"
-msgstr ""
-
-#. TRANSLATORS: The argument is the list of ambiguous
-#. objects composed in show_ambiguous_object(). See
-#. its "TRANSLATORS" comments for details.
-#.
-#: object-name.c:591
-#, c-format
-msgid ""
-"The candidates are:\n"
-"%s"
-msgstr ""
-
-#: object-name.c:888
-msgid ""
-"Git normally never creates a ref that ends with 40 hex characters\n"
-"because it will be ignored when you just specify 40-hex. These refs\n"
-"may be created by mistake. For example,\n"
-"\n"
-"  git switch -c $br $(git rev-parse ...)\n"
-"\n"
-"where \"$br\" is somehow empty and a 40-hex ref is created. Please\n"
-"examine these refs and maybe delete them. Turn this message off by\n"
-"running \"git config advice.objectNameWarning false\""
-msgstr ""
-
-#: object-name.c:1008
-#, c-format
-msgid "log for '%.*s' only goes back to %s"
-msgstr ""
-
-#: object-name.c:1016
-#, c-format
-msgid "log for '%.*s' only has %d entries"
-msgstr ""
-
-#: object-name.c:1794
-#, c-format
-msgid "path '%s' exists on disk, but not in '%.*s'"
-msgstr ""
-
-#: object-name.c:1800
-#, c-format
-msgid ""
-"path '%s' exists, but not '%s'\n"
-"hint: Did you mean '%.*s:%s' aka '%.*s:./%s'?"
-msgstr ""
-
-#: object-name.c:1809
-#, c-format
-msgid "path '%s' does not exist in '%.*s'"
-msgstr ""
-
-#: object-name.c:1837
-#, c-format
-msgid ""
-"path '%s' is in the index, but not at stage %d\n"
-"hint: Did you mean ':%d:%s'?"
-msgstr ""
-
-#: object-name.c:1853
-#, c-format
-msgid ""
-"path '%s' is in the index, but not '%s'\n"
-"hint: Did you mean ':%d:%s' aka ':%d:./%s'?"
-msgstr ""
-
-#: object-name.c:1861
-#, c-format
-msgid "path '%s' exists on disk, but not in the index"
-msgstr ""
-
-#: object-name.c:1863
-#, c-format
-msgid "path '%s' does not exist (neither on disk nor in the index)"
-msgstr ""
-
-#: object-name.c:1876
-msgid "relative path syntax can't be used outside working tree"
-msgstr ""
-
-#: object-name.c:1901
-#, c-format
-msgid "<object>:<path> required, only <object> '%s' given"
-msgstr ""
-
-#: object-name.c:2014
-#, c-format
-msgid "invalid object name '%.*s'."
-msgstr ""
-
-#: object.c:53
-#, c-format
-msgid "invalid object type \"%s\""
-msgstr ""
-
-#: object.c:173
-#, c-format
-msgid "object %s is a %s, not a %s"
-msgstr ""
-
-#: object.c:250
-#, c-format
-msgid "object %s has unknown type id %d"
-msgstr ""
-
-#: object.c:263
-#, c-format
-msgid "unable to parse object: %s"
-msgstr ""
-
-#: object.c:283 object.c:294
-#, c-format
-msgid "hash mismatch %s"
-msgstr ""
-
-#: pack-bitmap.c:353
-msgid "multi-pack bitmap is missing required reverse index"
-msgstr ""
-
-#: pack-bitmap.c:433
-msgid "load_reverse_index: could not open pack"
-msgstr ""
-
-#: pack-bitmap.c:1072 pack-bitmap.c:1078 builtin/pack-objects.c:2432
-#, c-format
-msgid "unable to get size of %s"
-msgstr ""
-
-#: pack-bitmap.c:1937
-#, c-format
-msgid "could not find %s in pack %s at offset %<PRIuMAX>"
-msgstr ""
-
-#: pack-bitmap.c:1973 builtin/rev-list.c:91
-#, c-format
-msgid "unable to get disk usage of %s"
-msgstr ""
-
-#: pack-revindex.c:221
-#, c-format
-msgid "reverse-index file %s is too small"
-msgstr ""
-
-#: pack-revindex.c:226
-#, c-format
-msgid "reverse-index file %s is corrupt"
-msgstr ""
-
-#: pack-revindex.c:234
-#, c-format
-msgid "reverse-index file %s has unknown signature"
-msgstr ""
-
-#: pack-revindex.c:238
-#, c-format
-msgid "reverse-index file %s has unsupported version %<PRIu32>"
-msgstr ""
-
-#: pack-revindex.c:243
-#, c-format
-msgid "reverse-index file %s has unsupported hash id %<PRIu32>"
-msgstr ""
-
-#: pack-write.c:251
-msgid "cannot both write and verify reverse index"
-msgstr ""
-
-#: pack-write.c:270
-#, c-format
-msgid "could not stat: %s"
-msgstr ""
-
-#: pack-write.c:282
-#, c-format
-msgid "failed to make %s readable"
-msgstr ""
-
-#: pack-write.c:521
-#, c-format
-msgid "could not write '%s' promisor file"
-msgstr ""
-
-#: packfile.c:627
-msgid "offset before end of packfile (broken .idx?)"
-msgstr ""
-
-#: packfile.c:657
-#, c-format
-msgid "packfile %s cannot be mapped%s"
-msgstr ""
-
-#: packfile.c:1924
-#, c-format
-msgid "offset before start of pack index for %s (corrupt index?)"
-msgstr ""
-
-#: packfile.c:1928
-#, c-format
-msgid "offset beyond end of pack index for %s (truncated index?)"
-msgstr ""
-
-#: parse-options-cb.c:21 parse-options-cb.c:25 builtin/commit-graph.c:175
-#, c-format
-msgid "option `%s' expects a numerical value"
-msgstr ""
-
-#: parse-options-cb.c:42
-#, c-format
-msgid "malformed expiration date '%s'"
-msgstr ""
-
-#: parse-options-cb.c:55
-#, c-format
-msgid "option `%s' expects \"always\", \"auto\", or \"never\""
-msgstr ""
-
-#: parse-options-cb.c:133 parse-options-cb.c:150
-#, c-format
-msgid "malformed object name '%s'"
-msgstr ""
-
-#: parse-options-cb.c:307
-#, c-format
-msgid "option `%s' expects \"%s\" or \"%s\""
-msgstr ""
-
-#: parse-options.c:58
-#, c-format
-msgid "%s requires a value"
-msgstr ""
-
-#: parse-options.c:93
-#, c-format
-msgid "%s is incompatible with %s"
-msgstr ""
-
-#: parse-options.c:98
-#, c-format
-msgid "%s : incompatible with something else"
-msgstr ""
-
-#: parse-options.c:112 parse-options.c:116
-#, c-format
-msgid "%s takes no value"
-msgstr ""
-
-#: parse-options.c:114
-#, c-format
-msgid "%s isn't available"
-msgstr ""
-
-#: 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:393
-#, c-format
-msgid "ambiguous option: %s (could be --%s%s or --%s%s)"
-msgstr ""
-
-#: parse-options.c:428 parse-options.c:436
-#, c-format
-msgid "did you mean `--%s` (with two dashes)?"
-msgstr ""
-
-#: parse-options.c:678 parse-options.c:1054
-#, c-format
-msgid "alias of --%s"
-msgstr ""
-
-#: parse-options.c:892
-#, c-format
-msgid "unknown option `%s'"
-msgstr ""
-
-#: parse-options.c:894
-#, c-format
-msgid "unknown switch `%c'"
-msgstr ""
-
-#: parse-options.c:896
-#, c-format
-msgid "unknown non-ascii option in string: `%s'"
-msgstr ""
-
-#: parse-options.c:920
-msgid "..."
-msgstr ""
-
-#: parse-options.c:934
-#, c-format
-msgid "usage: %s"
-msgstr ""
-
-#. TRANSLATORS: the colon here should align with the
-#. one in "usage: %s" translation.
-#.
-#: parse-options.c:949
-#, c-format
-msgid "   or: %s"
-msgstr ""
-
-#. 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:970
-#, c-format
-msgid "%*s%s"
-msgstr ""
-
-#: parse-options.c:993
-#, c-format
-msgid "    %s"
-msgstr ""
-
-#: parse-options.c:1040
-msgid "-NUM"
-msgstr ""
-
-#: path.c:922
-#, c-format
-msgid "Could not make %s writable by group"
-msgstr ""
-
-#: pathspec.c:150
-msgid "Escape character '\\' not allowed as last character in attr value"
-msgstr ""
-
-#: pathspec.c:168
-msgid "Only one 'attr:' specification is allowed."
-msgstr ""
-
-#: pathspec.c:171
-msgid "attr spec must not be empty"
-msgstr ""
-
-#: pathspec.c:214
-#, c-format
-msgid "invalid attribute name %s"
-msgstr ""
-
-#: pathspec.c:279
-msgid "global 'glob' and 'noglob' pathspec settings are incompatible"
-msgstr ""
-
-#: pathspec.c:286
-msgid ""
-"global 'literal' pathspec setting is incompatible with all other global "
-"pathspec settings"
-msgstr ""
-
-#: pathspec.c:326
-msgid "invalid parameter for pathspec magic 'prefix'"
-msgstr ""
-
-#: pathspec.c:347
-#, c-format
-msgid "Invalid pathspec magic '%.*s' in '%s'"
-msgstr ""
-
-#: pathspec.c:352
-#, c-format
-msgid "Missing ')' at the end of pathspec magic in '%s'"
-msgstr ""
-
-#: pathspec.c:390
-#, c-format
-msgid "Unimplemented pathspec magic '%c' in '%s'"
-msgstr ""
-
-#: pathspec.c:449
-#, c-format
-msgid "%s: 'literal' and 'glob' are incompatible"
-msgstr ""
-
-#: pathspec.c:465
-#, c-format
-msgid "%s: '%s' is outside repository at '%s'"
-msgstr ""
-
-#: pathspec.c:541
-#, c-format
-msgid "'%s' (mnemonic: '%c')"
-msgstr ""
-
-#: pathspec.c:551
-#, c-format
-msgid "%s: pathspec magic not supported by this command: %s"
-msgstr ""
-
-#: pathspec.c:618
-#, c-format
-msgid "pathspec '%s' is beyond a symbolic link"
-msgstr ""
-
-#: pathspec.c:663
-#, c-format
-msgid "line is badly quoted: %s"
-msgstr ""
-
-#: pkt-line.c:92
-msgid "unable to write flush packet"
-msgstr ""
-
-#: pkt-line.c:99
-msgid "unable to write delim packet"
-msgstr ""
-
-#: pkt-line.c:106
-msgid "unable to write response end packet"
-msgstr ""
-
-#: pkt-line.c:113
-msgid "flush packet write failed"
-msgstr ""
-
-#: pkt-line.c:153
-msgid "protocol error: impossibly long line"
-msgstr ""
-
-#: pkt-line.c:169 pkt-line.c:171
-msgid "packet write with format failed"
-msgstr ""
-
-#: pkt-line.c:204 pkt-line.c:252
-msgid "packet write failed - data exceeds max packet size"
-msgstr ""
-
-#: pkt-line.c:222
-#, c-format
-msgid "packet write failed: %s"
-msgstr ""
-
-#: pkt-line.c:349 pkt-line.c:350
-msgid "read error"
-msgstr ""
-
-#: pkt-line.c:360 pkt-line.c:361
-msgid "the remote end hung up unexpectedly"
-msgstr ""
-
-#: pkt-line.c:417 pkt-line.c:419
-#, c-format
-msgid "protocol error: bad line length character: %.4s"
-msgstr ""
-
-#: pkt-line.c:434 pkt-line.c:436 pkt-line.c:442 pkt-line.c:444
-#, c-format
-msgid "protocol error: bad line length %d"
-msgstr ""
-
-#: pkt-line.c:472 sideband.c:165
-#, c-format
-msgid "remote error: %s"
-msgstr ""
-
-#: preload-index.c:125
-msgid "Refreshing index"
-msgstr ""
-
-#: preload-index.c:144
-#, c-format
-msgid "unable to create threaded lstat: %s"
-msgstr ""
-
-#: pretty.c:1051
-msgid "unable to parse --pretty format"
-msgstr ""
-
-#: promisor-remote.c:31
-msgid "promisor-remote: unable to fork off fetch subprocess"
-msgstr ""
-
-#: promisor-remote.c:38 promisor-remote.c:40
-msgid "promisor-remote: could not write to fetch subprocess"
-msgstr ""
-
-#: promisor-remote.c:44
-msgid "promisor-remote: could not close stdin to fetch subprocess"
-msgstr ""
-
-#: promisor-remote.c:54
-#, c-format
-msgid "promisor remote name cannot begin with '/': %s"
-msgstr ""
-
-#: protocol-caps.c:103
-msgid "object-info: expected flush after arguments"
-msgstr ""
-
-#: prune-packed.c:35
-msgid "Removing duplicate objects"
-msgstr ""
-
-#: range-diff.c:68
-msgid "could not start `log`"
-msgstr ""
-
-#: range-diff.c:70
-msgid "could not read `log` output"
-msgstr ""
-
-#: range-diff.c:98 sequencer.c:5575
-#, c-format
-msgid "could not parse commit '%s'"
-msgstr ""
-
-#: range-diff.c:109
-#, c-format
-msgid ""
-"could not parse first line of `log` output: did not start with 'commit ': "
-"'%s'"
-msgstr ""
-
-#: range-diff.c:132
-#, c-format
-msgid "could not parse git header '%.*s'"
-msgstr ""
-
-#: range-diff.c:300
-msgid "failed to generate diff"
-msgstr ""
-
-#: range-diff.c:558 range-diff.c:560
-#, c-format
-msgid "could not parse log for '%s'"
-msgstr ""
-
-#: read-cache.c:737
-#, c-format
-msgid "will not add file alias '%s' ('%s' already exists in index)"
-msgstr ""
-
-#: read-cache.c:753
-msgid "cannot create an empty blob in the object database"
-msgstr ""
-
-#: read-cache.c:775
-#, c-format
-msgid "%s: can only add regular files, symbolic links or git-directories"
-msgstr ""
-
-#: read-cache.c:780 builtin/submodule--helper.c:3359
-#, c-format
-msgid "'%s' does not have a commit checked out"
-msgstr ""
-
-#: read-cache.c:832
-#, c-format
-msgid "unable to index file '%s'"
-msgstr ""
-
-#: read-cache.c:851
-#, c-format
-msgid "unable to add '%s' to index"
-msgstr ""
-
-#: read-cache.c:862
-#, c-format
-msgid "unable to stat '%s'"
-msgstr ""
-
-#: read-cache.c:1404
-#, c-format
-msgid "'%s' appears as both a file and as a directory"
-msgstr ""
-
-#: read-cache.c:1619
-msgid "Refresh index"
-msgstr ""
-
-#: read-cache.c:1751
-#, c-format
-msgid ""
-"index.version set, but the value is invalid.\n"
-"Using version %i"
-msgstr ""
-
-#: read-cache.c:1761
-#, c-format
-msgid ""
-"GIT_INDEX_VERSION set, but the value is invalid.\n"
-"Using version %i"
-msgstr ""
-
-#: read-cache.c:1817
-#, c-format
-msgid "bad signature 0x%08x"
-msgstr ""
-
-#: read-cache.c:1820
-#, c-format
-msgid "bad index version %d"
-msgstr ""
-
-#: read-cache.c:1829
-msgid "bad index file sha1 signature"
-msgstr ""
-
-#: read-cache.c:1863
-#, c-format
-msgid "index uses %.4s extension, which we do not understand"
-msgstr ""
-
-#: read-cache.c:1865
-#, c-format
-msgid "ignoring %.4s extension"
-msgstr ""
-
-#: read-cache.c:1902
-#, c-format
-msgid "unknown index entry format 0x%08x"
-msgstr ""
-
-#: read-cache.c:1918
-#, c-format
-msgid "malformed name field in the index, near path '%s'"
-msgstr ""
-
-#: read-cache.c:1975
-msgid "unordered stage entries in index"
-msgstr ""
-
-#: read-cache.c:1978
-#, c-format
-msgid "multiple stage entries for merged file '%s'"
-msgstr ""
-
-#: read-cache.c:1981
-#, c-format
-msgid "unordered stage entries for '%s'"
-msgstr ""
-
-#: read-cache.c:2096 read-cache.c:2402 rerere.c:549 rerere.c:583 rerere.c:1096
-#: submodule.c:1831 builtin/add.c:586 builtin/check-ignore.c:183
-#: builtin/checkout.c:532 builtin/checkout.c:724 builtin/clean.c:1016
-#: builtin/commit.c:379 builtin/diff-tree.c:122 builtin/grep.c:521
-#: builtin/mv.c:148 builtin/reset.c:506 builtin/rm.c:293
-#: builtin/submodule--helper.c:335 builtin/submodule--helper.c:3319
-msgid "index file corrupt"
-msgstr ""
-
-#: read-cache.c:2240
-#, c-format
-msgid "unable to create load_cache_entries thread: %s"
-msgstr ""
-
-#: read-cache.c:2253
-#, c-format
-msgid "unable to join load_cache_entries thread: %s"
-msgstr ""
-
-#: read-cache.c:2286
-#, c-format
-msgid "%s: index file open failed"
-msgstr ""
-
-#: read-cache.c:2290
-#, c-format
-msgid "%s: cannot stat the open index"
-msgstr ""
-
-#: read-cache.c:2294
-#, c-format
-msgid "%s: index file smaller than expected"
-msgstr ""
-
-#: read-cache.c:2298
-#, c-format
-msgid "%s: unable to map index file%s"
-msgstr ""
-
-#: read-cache.c:2341
-#, c-format
-msgid "unable to create load_index_extensions thread: %s"
-msgstr ""
-
-#: read-cache.c:2368
-#, c-format
-msgid "unable to join load_index_extensions thread: %s"
-msgstr ""
-
-#: read-cache.c:2414
-#, c-format
-msgid "could not freshen shared index '%s'"
-msgstr ""
-
-#: read-cache.c:2473
-#, c-format
-msgid "broken index, expect %s in %s, got %s"
-msgstr ""
-
-#: read-cache.c:3032
-msgid "cannot write split index for a sparse index"
-msgstr ""
-
-#: read-cache.c:3114 strbuf.c:1192 wrapper.c:717 builtin/merge.c:1156
-#, c-format
-msgid "could not close '%s'"
-msgstr ""
-
-#: read-cache.c:3157
-msgid "failed to convert to a sparse-index"
-msgstr ""
-
-#: read-cache.c:3228
-#, c-format
-msgid "could not stat '%s'"
-msgstr ""
-
-#: read-cache.c:3241
-#, c-format
-msgid "unable to open git dir: %s"
-msgstr ""
-
-#: read-cache.c:3253
-#, c-format
-msgid "unable to unlink: %s"
-msgstr ""
-
-#: read-cache.c:3282
-#, c-format
-msgid "cannot fix permission bits on '%s'"
-msgstr ""
-
-#: read-cache.c:3439
-#, c-format
-msgid "%s: cannot drop to stage #0"
-msgstr ""
-
-#: rebase-interactive.c:11
-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 ""
-"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 ""
-"\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 [-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"
-"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"
-"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 penyuntingx, 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] "Dasarkan ulang %s kepada %s (%d perintah)"
-msgstr[1] "Dasarkan ulang %s kepada %s (%d perintah)"
-
-#: 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
-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
-msgid ""
-"\n"
-"You are editing the todo file of an ongoing interactive rebase.\n"
-"To continue rebase after editing, run:\n"
-"    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
-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:677 sequencer.c:3879
-#: sequencer.c:3905 sequencer.c:5681 builtin/fsck.c:328 builtin/gc.c:1791
-#: builtin/rebase.c:191
-#, c-format
-msgid "could not write '%s'"
-msgstr "tidak dapat menulis '%s'"
-
-#: rebase-interactive.c:119
-#, c-format
-msgid "could not write '%s'."
-msgstr "tidak dapat menulis '%s'."
-
-#: rebase-interactive.c:196
-#, c-format
-msgid ""
-"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
-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"
-"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.c:29
-#, c-format
-msgid "%s: 'preserve' superseded by 'merges'"
-msgstr "%s: 'preserve' digantikan oleh 'merges'"
-
-#: ref-filter.c:42 wt-status.c:2057
-msgid "gone"
-msgstr ""
-
-#: ref-filter.c:43
-#, c-format
-msgid "ahead %d"
-msgstr ""
-
-#: ref-filter.c:44
-#, c-format
-msgid "behind %d"
-msgstr ""
-
-#: ref-filter.c:45
-#, c-format
-msgid "ahead %d, behind %d"
-msgstr ""
-
-#: ref-filter.c:235
-#, c-format
-msgid "expected format: %%(color:<color>)"
-msgstr ""
-
-#: ref-filter.c:237
-#, c-format
-msgid "unrecognized color: %%(color:%s)"
-msgstr ""
-
-#: ref-filter.c:259
-#, c-format
-msgid "Integer value expected refname:lstrip=%s"
-msgstr ""
-
-#: ref-filter.c:263
-#, c-format
-msgid "Integer value expected refname:rstrip=%s"
-msgstr ""
-
-#: ref-filter.c:265 ref-filter.c:344 ref-filter.c:377 ref-filter.c:431
-#: ref-filter.c:443 ref-filter.c:462 ref-filter.c:534 ref-filter.c:560
-#, c-format
-msgid "unrecognized %%(%s) argument: %s"
-msgstr ""
-
-#: ref-filter.c:320
-#, c-format
-msgid "%%(objecttype) does not take arguments"
-msgstr ""
-
-#: ref-filter.c:352
-#, c-format
-msgid "%%(deltabase) does not take arguments"
-msgstr ""
-
-#: ref-filter.c:364
-#, c-format
-msgid "%%(body) does not take arguments"
-msgstr ""
-
-#: ref-filter.c:396
-#, c-format
-msgid "expected %%(trailers:key=<value>)"
-msgstr ""
-
-#: ref-filter.c:398
-#, c-format
-msgid "unknown %%(trailers) argument: %s"
-msgstr ""
-
-#: ref-filter.c:429
-#, c-format
-msgid "positive value expected contents:lines=%s"
-msgstr ""
-
-#: ref-filter.c:458
-#, c-format
-msgid "positive value expected '%s' in %%(%s)"
-msgstr ""
-
-#: ref-filter.c:476
-#, c-format
-msgid "unrecognized email option: %s"
-msgstr ""
-
-#: ref-filter.c:506
-#, c-format
-msgid "expected format: %%(align:<width>,<position>)"
-msgstr ""
-
-#: ref-filter.c:518
-#, c-format
-msgid "unrecognized position:%s"
-msgstr ""
-
-#: ref-filter.c:525
-#, c-format
-msgid "unrecognized width:%s"
-msgstr ""
-
-#: ref-filter.c:542
-#, c-format
-msgid "positive width expected with the %%(align) atom"
-msgstr ""
-
-#: 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:707
-#, c-format
-msgid "unknown field name: %.*s"
-msgstr ""
-
-#: ref-filter.c:711
-#, c-format
-msgid ""
-"not a git repository, but the field '%.*s' requires access to object data"
-msgstr ""
-
-#: ref-filter.c:844 ref-filter.c:910 ref-filter.c:946 ref-filter.c:948
-#, c-format
-msgid "format: %%(%s) atom used without a %%(%s) atom"
-msgstr ""
-
-#: ref-filter.c:912
-#, c-format
-msgid "format: %%(then) atom used more than once"
-msgstr ""
-
-#: ref-filter.c:914
-#, c-format
-msgid "format: %%(then) atom used after %%(else)"
-msgstr ""
-
-#: ref-filter.c:950
-#, c-format
-msgid "format: %%(else) atom used more than once"
-msgstr ""
-
-#: ref-filter.c:965
-#, c-format
-msgid "format: %%(end) atom used without corresponding atom"
-msgstr ""
-
-#: ref-filter.c:1027
-#, c-format
-msgid "malformed format string %s"
-msgstr ""
-
-#: 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:1707
-#, c-format
-msgid "(no branch, rebasing %s)"
-msgstr ""
-
-#: ref-filter.c:1710
-#, c-format
-msgid "(no branch, rebasing detached HEAD %s)"
-msgstr ""
-
-#: ref-filter.c:1713
-#, c-format
-msgid "(no branch, bisect started on %s)"
-msgstr ""
-
-#: ref-filter.c:1717
-#, c-format
-msgid "(HEAD detached at %s)"
-msgstr ""
-
-#: ref-filter.c:1720
-#, c-format
-msgid "(HEAD detached from %s)"
-msgstr ""
-
-#: ref-filter.c:1723
-msgid "(no branch)"
-msgstr ""
-
-#: ref-filter.c:1755 ref-filter.c:1973
-#, c-format
-msgid "missing object %s for %s"
-msgstr ""
-
-#: ref-filter.c:1765
-#, c-format
-msgid "parse_object_buffer failed on %s for %s"
-msgstr ""
-
-#: ref-filter.c:2156
-#, c-format
-msgid "malformed object at '%s'"
-msgstr ""
-
-#: ref-filter.c:2246
-#, c-format
-msgid "ignoring ref with broken name %s"
-msgstr ""
-
-#: ref-filter.c:2251 refs.c:672
-#, c-format
-msgid "ignoring broken ref %s"
-msgstr ""
-
-#: ref-filter.c:2630
-#, c-format
-msgid "format: %%(end) atom missing"
-msgstr ""
-
-#: ref-filter.c:2741
-#, c-format
-msgid "malformed object name %s"
-msgstr ""
-
-#: ref-filter.c:2746
-#, c-format
-msgid "option `%s' must point to a commit"
-msgstr ""
-
-#: reflog.c:407
-#, c-format
-msgid "not a reflog: %s"
-msgstr "bukan sebuah log referensi: %s"
-
-#: reflog.c:410
-#, c-format
-msgid "no reflog for '%s'"
-msgstr "tidak ada log referensi untuk '%s'"
-
-#: refs.c:262
-#, c-format
-msgid "%s does not point to a valid object!"
-msgstr "%s tidak menunjuk ke sebuah objek valid!"
-
-#: refs.c:561
-#, 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"
-"of your new repositories, which will suppress this warning, call:\n"
-"\n"
-"\tgit config --global init.defaultBranch <name>\n"
-"\n"
-"Names commonly chosen instead of 'master' are 'main', 'trunk' and\n"
-"'development'. The just-created branch can be renamed via this command:\n"
-"\n"
-"\tgit branch -m <name>\n"
-msgstr ""
-"Menggunakan '%s' sebagai nama cabang awal. Nama cabang asali ini dapat\n"
-"berubah. Untuk menyetel nama cabang awal untuk digunakan pada semua\n"
-"repositori baru Anda, dimana akan mematikan peringatan ini, panggil:\n"
-"\n"
-"\tgit config --global init.defaultBranch <nama>\n"
-"\n"
-"Nama-nama yang umumnya dipilih selain 'master' adalah 'main', 'trunk' dan\n"
-"'development'. Cabang yang baru saja dibuat bisa dinamai ulang lewat "
-"perintah\n"
-"ini:\n"
-"\n"
-"\tgit branch -m <nama>\n"
-
-#: refs.c:583
-#, c-format
-msgid "could not retrieve `%s`"
-msgstr "tidak dapat mengambil `%s`"
-
-#: refs.c:593
-#, c-format
-msgid "invalid branch name: %s = %s"
-msgstr "nama cabang tidak valid: %s = %s"
-
-#: refs.c:670
-#, c-format
-msgid "ignoring dangling symref %s"
-msgstr "abaikan referensi simbolik teruntai %s"
-
-#: refs.c:919
-#, c-format
-msgid "log for ref %s has gap after %s"
-msgstr "log untuk referensi %s ada celah setelah %s"
-
-#: refs.c:926
-#, c-format
-msgid "log for ref %s unexpectedly ended on %s"
-msgstr "log untuk referensi %s sayangnya berakhir pada %s"
-
-#: refs.c:991
-#, c-format
-msgid "log for %s is empty"
-msgstr "log untuk %s kosong"
-
-#: refs.c:1086
-#, c-format
-msgid "refusing to update ref with bad name '%s'"
-msgstr "menolak memperbarui referensi dengan nama jelek '%s'"
-
-#: refs.c:1164
-#, c-format
-msgid "update_ref failed for ref '%s': %s"
-msgstr "update_ref gagal untuk referensi '%s': %s"
-
-#: refs.c:2059
-#, c-format
-msgid "multiple updates for ref '%s' not allowed"
-msgstr "pembaruan berlipat untuk referensi '%s' tidak diperbolehkan"
-
-#: refs.c:2145
-msgid "ref updates forbidden inside quarantine environment"
-msgstr "pembaruan referensi tidak diperbolehkan di dalam lingkungan karantina"
-
-#: refs.c:2156
-msgid "ref updates aborted by hook"
-msgstr "pembaruan referensi dihentikan oleh kait"
-
-#: refs.c:2264 refs.c:2294
-#, c-format
-msgid "'%s' exists; cannot create '%s'"
-msgstr "'%s' ada; tidak dapat membuat '%s'"
-
-#: refs.c:2270 refs.c:2305
-#, c-format
-msgid "cannot process '%s' and '%s' at the same time"
-msgstr "tidak dapat memproses '%s' dan '%s' pada waktu yang bersamaan"
-
-#: refs/files-backend.c:1295
-#, c-format
-msgid "could not remove reference %s"
-msgstr "tidak dapat menghapus referensi %s"
-
-#: refs/files-backend.c:1310 refs/packed-backend.c:1565
-#: refs/packed-backend.c:1575
-#, c-format
-msgid "could not delete reference %s: %s"
-msgstr "tidak dapat menghapus referensi %s: %s"
-
-#: refs/files-backend.c:1313 refs/packed-backend.c:1578
-#, c-format
-msgid "could not delete references: %s"
-msgstr "tidak dapat menghapus referensi: %s"
-
-#: refspec.c:170
-#, c-format
-msgid "invalid refspec '%s'"
-msgstr "spek referensi tidak valid '%s'"
-
-#: remote.c:402
-#, c-format
-msgid "config remote shorthand cannot begin with '/': %s"
-msgstr "pintasan konfigurasi remote tidak dapat diawali dengan '/': %s"
-
-#: remote.c:450
-msgid "more than one receivepack given, using the first"
-msgstr "lebih dari satu paket terima diberikan, gunakan yang pertama"
-
-#: remote.c:458
-msgid "more than one uploadpack given, using the first"
-msgstr "lebih dari satu paket unggah diberikan, gunakan yang pertama"
-
-#: remote.c:698
-#, c-format
-msgid "Cannot fetch both %s and %s to %s"
-msgstr "tidak dapat mengambil baik %s dan %s ke %s"
-
-#: remote.c:702
-#, c-format
-msgid "%s usually tracks %s, not %s"
-msgstr "%s biasanya melacak %s, bukan %s"
-
-#: remote.c:706
-#, c-format
-msgid "%s tracks both %s and %s"
-msgstr "%s melacak baik %s dan %s"
-
-#: remote.c:774
-#, c-format
-msgid "key '%s' of pattern had no '*'"
-msgstr "kunci '%s' dari pola tidak ada '*'"
-
-#: remote.c:784
-#, c-format
-msgid "value '%s' of pattern has no '*'"
-msgstr "nilai '%s' dari pola tidak ada '*'"
-
-#: remote.c:1191
-#, c-format
-msgid "src refspec %s does not match any"
-msgstr "spek referensi sumber %s tidak cocok dengan apapun"
-
-#: remote.c:1196
-#, c-format
-msgid "src refspec %s matches more than one"
-msgstr "spek referensi sumber %s cocok dengan lebih dari satu"
-
-#. TRANSLATORS: "matches '%s'%" is the <dst> part of "git push
-#. <remote> <src>:<dst>" push, and "being pushed ('%s')" is
-#. the <src>.
-#.
-#: remote.c:1211
-#, c-format
-msgid ""
-"The destination you provided is not a full refname (i.e.,\n"
-"starting with \"refs/\"). We tried to guess what you meant by:\n"
-"\n"
-"- Looking for a ref that matches '%s' on the remote side.\n"
-"- Checking if the <src> being pushed ('%s')\n"
-"  is a ref in \"refs/{heads,tags}/\". If so we add a corresponding\n"
-"  refs/{heads,tags}/ prefix on the remote side.\n"
-"\n"
-"Neither worked, so we gave up. You must fully qualify the ref."
-msgstr ""
-"Tujuan yang Anda berikan bukan nama referensi penuh (seperti \n"
-"dimulai dengan \"refs/\"). Kami mencoba menebak maksud Anda dengan:\n"
-"- Cari referensi yang cocok dengan '%s' pada sisi remote.\n"
-"- Perika apakah <src> yang sedang didorong ('%s') adalah \n"
-"  referensi pada \"refs/{heads,tags}\". Bila demikian kami \n"
-"  menambahkan awalan refs/{heads,tags}/ yang bersesuaian pada sisi \n"
-"  remote.\n"
-"\n"
-"Kedua-duanya tidak bekerja, jadi kami menyerah. Anda harus kualifikasi\n"
-"penuh referensi."
-
-#: remote.c:1231
-#, c-format
-msgid ""
-"The <src> part of the refspec is a commit object.\n"
-"Did you mean to create a new branch by pushing to\n"
-"'%s:refs/heads/%s'?"
-msgstr ""
-"Bagian <src> dari spek referensi adalah objek komit.\n"
-"Apakah maksud Anda buat cabang baru dengan mendorong ke\n"
-"'%s:refs/heads/%s'?"
-
-#: remote.c:1236
-#, c-format
-msgid ""
-"The <src> part of the refspec is a tag object.\n"
-"Did you mean to create a new tag by pushing to\n"
-"'%s:refs/tags/%s'?"
-msgstr ""
-"Bagian <src> dari spek referensi adalah objek tag.\n"
-"Apakah maksud Anda buat tag baru dengan mendorong ke\n"
-"'%s:refs/tags/%s'?"
-
-#: remote.c:1241
-#, c-format
-msgid ""
-"The <src> part of the refspec is a tree object.\n"
-"Did you mean to tag a new tree by pushing to\n"
-"'%s:refs/tags/%s'?"
-msgstr ""
-"Bagian <src> dari spek referensi adalah objek pohon.\n"
-"Apakah maksud Anda tag pohon dengan mendorong ke\n"
-"'%s:refs/tags/%s'?"
-
-#: remote.c:1246
-#, c-format
-msgid ""
-"The <src> part of the refspec is a blob object.\n"
-"Did you mean to tag a new blob by pushing to\n"
-"'%s:refs/tags/%s'?"
-msgstr ""
-"Bagian <src> dari spek referensi adalah objek blob.\n"
-"Apakah maksud Anda tag blob baru dengan mendorong ke\n"
-"'%s:refs/tags/%s'?"
-
-#: remote.c:1282
-#, c-format
-msgid "%s cannot be resolved to branch"
-msgstr "%s tidak dapat diselesaikan ke cabang"
-
-#: remote.c:1293
-#, c-format
-msgid "unable to delete '%s': remote ref does not exist"
-msgstr "tidak dapat menghapus '%s': referensi remote tidak ada"
-
-#: remote.c:1305
-#, c-format
-msgid "dst refspec %s matches more than one"
-msgstr "spek referensi tujuan %s cocok dengan lebih dari satu"
-
-#: remote.c:1312
-#, c-format
-msgid "dst ref %s receives from more than one src"
-msgstr "referensi tujuan %s menerima dari lebih dari satu sumber"
-
-#: remote.c:1833 remote.c:1940
-msgid "HEAD does not point to a branch"
-msgstr "HEAD tidak menunjuk ke cabang"
-
-#: remote.c:1842
-#, c-format
-msgid "no such branch: '%s'"
-msgstr "tidak ada cabang seperti: '%s'"
-
-#: remote.c:1845
-#, c-format
-msgid "no upstream configured for branch '%s'"
-msgstr "tidak ada hulu yang terkonfigurasi untuk cabang '%s'"
-
-#: remote.c:1851
-#, c-format
-msgid "upstream branch '%s' not stored as a remote-tracking branch"
-msgstr "cabang hulu '%s' tidak disimpan sebagai cabang pelacak remote"
-
-#: remote.c:1866
-#, c-format
-msgid "push destination '%s' on remote '%s' has no local tracking branch"
-msgstr "tujuan dorong '%s' pada remote '%s' tidak ada cabang pelacak lokal"
-
-#: remote.c:1881
-#, c-format
-msgid "branch '%s' has no remote for pushing"
-msgstr "cabang '%s' tidak ada remote untuk didorong"
-
-#: remote.c:1891
-#, c-format
-msgid "push refspecs for '%s' do not include '%s'"
-msgstr "spek referensi dorong untuk '%s' tidak termasuk '%s'"
-
-#: remote.c:1904
-msgid "push has no destination (push.default is 'nothing')"
-msgstr "dorong tidak ada tujuan (push.default yaitu 'nothing')"
-
-#: remote.c:1926
-msgid "cannot resolve 'simple' push to a single destination"
-msgstr "tidak dapat menyelesaikan dorongan 'sederhana' ke satu tujuan"
-
-#: remote.c:2059
-#, c-format
-msgid "couldn't find remote ref %s"
-msgstr "tidak dapat menemukan referensi remote %s"
-
-#: remote.c:2072
-#, c-format
-msgid "* Ignoring funny ref '%s' locally"
-msgstr "* Abaikan referensi lucu '%s' secara lokal"
-
-#: remote.c:2235
-#, c-format
-msgid "Your branch is based on '%s', but the upstream is gone.\n"
-msgstr "Cabang Anda didasarkan pada '%s', tapi hulu sudah tiada.\n"
-
-#: remote.c:2239
-msgid "  (use \"git branch --unset-upstream\" to fixup)\n"
-msgstr "  (gunakan \"git branch --unset-upstream\" untuk perbaiki)\n"
-
-#: remote.c:2242
-#, c-format
-msgid "Your branch is up to date with '%s'.\n"
-msgstr "Cabang Anda mutakhir dengan '%s'.\n"
-
-#: remote.c:2246
-#, c-format
-msgid "Your branch and '%s' refer to different commits.\n"
-msgstr "Cabang Anda dan '%s' merujuk pada komit yang berbeda.\n"
-
-#: remote.c:2249
-#, c-format
-msgid "  (use \"%s\" for details)\n"
-msgstr "  (gunakan \"%s\" untuk selengkapnya)\n"
-
-#: remote.c:2253
-#, c-format
-msgid "Your branch is ahead of '%s' by %d commit.\n"
-msgid_plural "Your branch is ahead of '%s' by %d commits.\n"
-msgstr[0] ""
-msgstr[1] ""
-
-#: remote.c:2259
-msgid "  (use \"git push\" to publish your local commits)\n"
-msgstr "  (gunakan \"git push\" untuk terbitkan komit lokal Anda)\n"
-
-#: remote.c:2262
-#, c-format
-msgid "Your branch is behind '%s' by %d commit, and can be fast-forwarded.\n"
-msgid_plural ""
-"Your branch is behind '%s' by %d commits, and can be fast-forwarded.\n"
-msgstr[0] ""
-msgstr[1] ""
-
-#: remote.c:2270
-msgid "  (use \"git pull\" to update your local branch)\n"
-msgstr "  (gunakan \"git pull\" untuk perbarui cabang lokal Anda)\n"
-
-#: remote.c:2273
-#, c-format
-msgid ""
-"Your branch and '%s' have diverged,\n"
-"and have %d and %d different commit each, respectively.\n"
-msgid_plural ""
-"Your branch and '%s' have diverged,\n"
-"and have %d and %d different commits each, respectively.\n"
-msgstr[0] ""
-msgstr[1] ""
-
-#: remote.c:2283
-msgid "  (use \"git pull\" to merge the remote branch into yours)\n"
-msgstr "  (gunakan \"git pull\" untuk gabungkan cabang remote ke milik Anda)\n"
-
-#: remote.c:2475
-#, c-format
-msgid "cannot parse expected object name '%s'"
-msgstr "tidak dapat mengurai nama object yang diharapkan '%s'"
-
-#: replace-object.c:21
-#, c-format
-msgid "bad replace ref name: %s"
-msgstr ""
-
-#: replace-object.c:30
-#, c-format
-msgid "duplicate replace ref: %s"
-msgstr ""
-
-#: replace-object.c:82
-#, c-format
-msgid "replace depth too high for object %s"
-msgstr ""
-
-#: rerere.c:201 rerere.c:210 rerere.c:213
-msgid "corrupt MERGE_RR"
-msgstr "MERGE_RR rusak"
-
-#: rerere.c:248 rerere.c:253
-msgid "unable to write rerere record"
-msgstr "tidak dapat menulis rekaman rerere"
-
-#: rerere.c:479
-#, c-format
-msgid "there were errors while writing '%s' (%s)"
-msgstr "ada kesalahan saat menulis '%s' (%s)"
-
-#: rerere.c:482 builtin/gc.c:2263 builtin/gc.c:2298
-#, c-format
-msgid "failed to flush '%s'"
-msgstr "gagal membilas '%s'"
-
-#: rerere.c:487 rerere.c:1024
-#, c-format
-msgid "could not parse conflict hunks in '%s'"
-msgstr "tidak dapat mengurai bingkah konflik di '%s'"
-
-#: rerere.c:669
-#, c-format
-msgid "failed utime() on '%s'"
-msgstr "utime() gagal pada '%s'"
-
-#: rerere.c:679
-#, c-format
-msgid "writing '%s' failed"
-msgstr "gagal menulis '%s'"
-
-#: rerere.c:699
-#, c-format
-msgid "Staged '%s' using previous resolution."
-msgstr "'%s' digelarkan menggunakan resolusi sebelumnya."
-
-#: rerere.c:738
-#, c-format
-msgid "Recorded resolution for '%s'."
-msgstr "Resolusi direkam untuk '%s'."
-
-#: rerere.c:773
-#, c-format
-msgid "Resolved '%s' using previous resolution."
-msgstr "'%s' diselesaikan menggunakan resolusi sebelumnya."
-
-#: rerere.c:788
-#, c-format
-msgid "cannot unlink stray '%s'"
-msgstr "tidak dapat batal taut simpangan '%s'"
-
-#: rerere.c:792
-#, c-format
-msgid "Recorded preimage for '%s'"
-msgstr "Pracitra direkam untuk '%s'"
-
-#: rerere.c:866 submodule.c:2290 builtin/log.c:2042
-#: builtin/submodule--helper.c:1786 builtin/submodule--helper.c:1833
-#, c-format
-msgid "could not create directory '%s'"
-msgstr "tidak dapat membuat direktori '%s'"
-
-#: rerere.c:1042
-#, c-format
-msgid "failed to update conflicted state in '%s'"
-msgstr "gagal memperbarui keadaan konflik di '%s'"
-
-#: rerere.c:1053 rerere.c:1060
-#, c-format
-msgid "no remembered resolution for '%s'"
-msgstr "tidak ada resolusi yang diingat untuk '%s'"
-
-#: rerere.c:1062
-#, c-format
-msgid "cannot unlink '%s'"
-msgstr "tidak dapat batal taut '%s'"
-
-#: rerere.c:1072
-#, c-format
-msgid "Updated preimage for '%s'"
-msgstr "Pracitra diperbarui untuk '%s'"
-
-#: rerere.c:1081
-#, c-format
-msgid "Forgot resolution for '%s'\n"
-msgstr "Resolusi dilupakan untuk '%s'\n"
-
-#: rerere.c:1192
-msgid "unable to open rr-cache directory"
-msgstr "tidak dapat membuka direktori rr-cache"
-
-#: reset.c:112
-msgid "could not determine HEAD revision"
-msgstr "tidak dapat menentukan revisi HEAD"
-
-#: reset.c:141 reset.c:147 sequencer.c:3696
-#, c-format
-msgid "failed to find tree of %s"
-msgstr "gagal menemukan pohon %s"
-
-#: revision.c:2358
-msgid "--unpacked=<packfile> no longer supported"
-msgstr "--unpacked=<berkas pak> tidak didukung lagi"
-
-#: revision.c:2712
-msgid "your current branch appears to be broken"
-msgstr "sepertinya cabang Anda saat ini rusak"
-
-#: revision.c:2715
-#, c-format
-msgid "your current branch '%s' does not have any commits yet"
-msgstr "cabang Anda saat ini '%s' belum memiliki komit apapun"
-
-#: revision.c:2901
-msgid "object filtering requires --objects"
-msgstr "penyaringan objek memerlukan --objects"
-
-#: revision.c:2918
-msgid "-L does not yet support diff formats besides -p and -s"
-msgstr "-L belum mendukung format diff selain -p dan -s"
-
-#: run-command.c:1262
-#, c-format
-msgid "cannot create async thread: %s"
-msgstr ""
-
-#: send-pack.c:150
-msgid "unexpected flush packet while reading remote unpack status"
-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 "tidak dapat menguraikan status pembongkaran remote: %s"
-
-#: send-pack.c:154
-#, c-format
-msgid "remote unpack failed: %s"
-msgstr "pembongkaran remote gagal: %s"
-
-#: send-pack.c:378
-msgid "failed to sign the push certificate"
-msgstr "gagal menandatangani sertifikat dorong"
-
-#: send-pack.c:435
-msgid "send-pack: unable to fork off fetch subprocess"
-msgstr "send-pack: tidak dapat menggarpu subproses pengambilan"
-
-#: send-pack.c:457
-msgid "push negotiation failed; proceeding anyway with push"
-msgstr "negosiasi pendorongan gagal; langsung dilanjutkan dengan mendorong"
-
-#: send-pack.c:528
-msgid "the receiving end does not support this repository's hash algorithm"
-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:546
-msgid "the receiving end does not support --atomic push"
-msgstr "ujung penerima tidak mendukung dorongan --atomic"
-
-#: send-pack.c:551
-msgid "the receiving end does not support push options"
-msgstr "ujung penerima tidak mendukung opsi dorong"
-
-#: sequencer.c:197
-#, c-format
-msgid "invalid commit message cleanup mode '%s'"
-msgstr "mode pembersihan pesan komit tidak valid '%s'"
-
-#: sequencer.c:325
-#, c-format
-msgid "could not delete '%s'"
-msgstr "tidak dapat menghapus '%s'"
-
-#: sequencer.c:345 sequencer.c:4724 builtin/rebase.c:564 builtin/rebase.c:1326
-#: builtin/rm.c:409
-#, c-format
-msgid "could not remove '%s'"
-msgstr "tidak dapat menghapus '%s'"
-
-#: sequencer.c:355
-msgid "revert"
-msgstr "balik"
-
-#: sequencer.c:357
-msgid "cherry-pick"
-msgstr "petik ceri"
-
-#: sequencer.c:359
-msgid "rebase"
-msgstr "dasar ulang"
-
-#: sequencer.c:361
-#, c-format
-msgid "unknown action: %d"
-msgstr "aksi tidak dikenal: %d"
-
-#: sequencer.c:420
-msgid ""
-"after resolving the conflicts, mark the corrected paths\n"
-"with 'git add <paths>' or 'git rm <paths>'"
-msgstr ""
-"setelah menyelesaikan konflik, tandai jalur yang terkoreksi\n"
-"dengan 'git add <jalur>' atau 'git rm <jalur>'"
-
-#: sequencer.c:423
-msgid ""
-"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 ""
-"Setelah menyelesaikan konflik, tandai dengan\n"
-"\"git add/rm <spek jalur\", lalu jalankan\n"
-"\"git cherry-pick --continue\".\n"
-"Atau Anda dapat melewati komit ini dengan \"git cherry-pick --skip\".\n"
-"Untuk membatalkan dan kembali ke keadaan sebelum \"git cherry-pick\",\n"
-"jalankan \"git cherry-pick --abort\"."
-
-#: 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 ""
-"Setelah menyelesaikan konflik, tandai dengan\n"
-"\"git add/rm <spek jalur>\", lalu jalankan\n"
-"\"git revert --continue\".\n"
-"Atau Anda dapat melewati komit ini dengan \"git revert --skip\".\n"
-"Untuk membatalkan dan kembali ke keadaan sebelum \"git revert\",\n"
-"jalankan \"git revert --abort\"."
-
-#: sequencer.c:448 sequencer.c:3288
-#, c-format
-msgid "could not lock '%s'"
-msgstr "tidak dapat mengunci '%s'"
-
-#: sequencer.c:450 sequencer.c:3087 sequencer.c:3292 sequencer.c:3306
-#: sequencer.c:3557 sequencer.c:5591 strbuf.c:1189 wrapper.c:715
-#, c-format
-msgid "could not write to '%s'"
-msgstr "tidak dapat menulis ke '%s'"
-
-#: sequencer.c:455
-#, c-format
-msgid "could not write eol to '%s'"
-msgstr "tidak dapat menulis akhir baris ke '%s'"
-
-#: sequencer.c:460 sequencer.c:3092 sequencer.c:3294 sequencer.c:3308
-#: sequencer.c:3565
-#, c-format
-msgid "failed to finalize '%s'"
-msgstr "gagal mengakhiri '%s'"
-
-#: sequencer.c:473 sequencer.c:1930 sequencer.c:3112 sequencer.c:3547
-#: sequencer.c:3675 builtin/am.c:290 builtin/commit.c:837 builtin/merge.c:1154
-#, c-format
-msgid "could not read '%s'"
-msgstr "tidak dapat membaca '%s'"
-
-#: sequencer.c:499
-#, c-format
-msgid "your local changes would be overwritten by %s."
-msgstr "perubahan lokal Anda akan ditimpa oleh %s."
-
-#: sequencer.c:503
-msgid "commit your changes or stash them to proceed."
-msgstr "komit perubahan Anda atau stase untuk melanjutkan."
-
-#: sequencer.c:535
-#, c-format
-msgid "%s: fast-forward"
-msgstr "%s: maju-cepat"
-
-#: sequencer.c:574 builtin/tag.c:615
-#, c-format
-msgid "Invalid cleanup mode %s"
-msgstr "Mode pembersihan tidak valid %s"
-
-#. TRANSLATORS: %s will be "revert", "cherry-pick" or
-#. "rebase".
-#.
-#: sequencer.c:685
-#, c-format
-msgid "%s: Unable to write new index file"
-msgstr "%s: Tidak dapat menulis berkas indeks baru"
-
-#: sequencer.c:699
-msgid "unable to update cache tree"
-msgstr "tidak dapat memperbarui pohon tembolok"
-
-#: sequencer.c:713
-msgid "could not resolve HEAD commit"
-msgstr "tidak dapat menguraikan komit HEAD"
-
-#: sequencer.c:793
-#, c-format
-msgid "no key present in '%.*s'"
-msgstr "tidak ada kunci yang ada di pada '%.*s'"
-
-#: sequencer.c:804
-#, c-format
-msgid "unable to dequote value of '%s'"
-msgstr "tidak dapat membatal-kutip nilai dari '%s'"
-
-#: sequencer.c:841 wrapper.c:219 wrapper.c:389 builtin/am.c:757
-#: builtin/am.c:849 builtin/rebase.c:699
-#, c-format
-msgid "could not open '%s' for reading"
-msgstr "tidak dapat membuka '%s' untuk dibaca"
-
-#: sequencer.c:851
-msgid "'GIT_AUTHOR_NAME' already given"
-msgstr "'GIT_AUTHOR_NAME' sudah diberikan"
-
-#: sequencer.c:856
-msgid "'GIT_AUTHOR_EMAIL' already given"
-msgstr "'GIT_AUTHOR_EMAIL' sudah diberikan"
-
-#: sequencer.c:861
-msgid "'GIT_AUTHOR_DATE' already given"
-msgstr "'GIT_AUTHOR_DATE' sudah diberikan"
-
-#: sequencer.c:865
-#, c-format
-msgid "unknown variable '%s'"
-msgstr "variabel tidak dikenal '%s'"
-
-#: sequencer.c:870
-msgid "missing 'GIT_AUTHOR_NAME'"
-msgstr "'GIT_AUTHOR_NAME' hilang"
-
-#: sequencer.c:872
-msgid "missing 'GIT_AUTHOR_EMAIL'"
-msgstr "'GIT_AUTHOR_EMAIL' hilang"
-
-#: sequencer.c:874
-msgid "missing 'GIT_AUTHOR_DATE'"
-msgstr "'GIT_AUTHOR_DATE' hilang"
-
-#: sequencer.c:939
-#, c-format
-msgid ""
-"you have staged changes in your working tree\n"
-"If these changes are meant to be squashed into the previous commit, run:\n"
-"\n"
-"  git commit --amend %s\n"
-"\n"
-"If they are meant to go into a new commit, run:\n"
-"\n"
-"  git commit %s\n"
-"\n"
-"In both cases, once you're done, continue with:\n"
-"\n"
-"  git rebase --continue\n"
-msgstr ""
-"Anda punya perubahan tergelar di dalam pohon kerja Anda.\n"
-"Apabila perubahan tersebut dimaksudkan untuk dilumat ke komit sebelumnya, "
-"jalankan:\n"
-"\n"
-"  git commit --amend %s\n"
-"\n"
-"Apabila dimaksudkan untuk masuk ke komit baru, jalankan:\n"
-"\n"
-"  git commit %s\n"
-"Pada kedua kasus tersebut, setelah selesai, lanjutkan dengan:\n"
-"\n"
-"  git rebase --continue\n"
-
-#: sequencer.c:1225
-msgid "'prepare-commit-msg' hook failed"
-msgstr "kait 'prepare-commit-msg' gagal"
-
-#: sequencer.c:1231
-msgid ""
-"Your name and email address were configured automatically based\n"
-"on your username and hostname. Please check that they are accurate.\n"
-"You can suppress this message by setting them explicitly. Run the\n"
-"following command and follow the instructions in your editor to edit\n"
-"your configuration file:\n"
-"\n"
-"    git config --global --edit\n"
-"\n"
-"After doing this, you may fix the identity used for this commit with:\n"
-"\n"
-"    git commit --amend --reset-author\n"
-msgstr ""
-"Nama dan email Anda dikonfigurasikan otomatis berdasarkan nama pengguna\n"
-"dan nama host Anda. Periksa jika itu benar. Anda dapat mematikan pesan\n"
-"ini dengan menyetel secara eksplisit. Jalankan perintah berikut dan ikuti\n"
-"petunjuk di dalam penyunting untuk menyunting berkas konfigurasi Anda:\n"
-"\n"
-"    git config --global --edit\n"
-"\n"
-"Setelah itu, Anda dapat memperbaiki identitas yang digunakan untuk komit\n"
-"ini dengan:\n"
-"\n"
-"    git commit --amend --reset-author\n"
-
-#: sequencer.c:1244
-msgid ""
-"Your name and email address were configured automatically based\n"
-"on your username and hostname. Please check that they are accurate.\n"
-"You can suppress this message by setting them explicitly:\n"
-"\n"
-"    git config --global user.name \"Your Name\"\n"
-"    git config --global user.email you@example.com\n"
-"\n"
-"After doing this, you may fix the identity used for this commit with:\n"
-"\n"
-"    git commit --amend --reset-author\n"
-msgstr ""
-"Nama dan email Anda dikonfigurasikan otomatis berdasarkan nama pengguna\n"
-"dan nama host Anda. Periksa jika itu benar. Anda dapat mematikan pesan\n"
-"ini dengan menyetel secara eksplisit:\n"
-"\n"
-"    git config --global user.name \"Nama Anda\"\n"
-"    git config --global user.email anda@example.com\n"
-"\n"
-"Setelah itu, Anda dapat memperbaiki identitas yang digunakan untuk komit\n"
-"ini dengan:\n"
-"\n"
-"    git commit --amend --reset-author\n"
-
-#: sequencer.c:1287
-msgid "couldn't look up newly created commit"
-msgstr "tidak dapat mencari komit yang baru saja dibuat"
-
-#: sequencer.c:1289
-msgid "could not parse newly created commit"
-msgstr "tidak dapat menguraikan komit yang baru saja dibuat"
-
-#: sequencer.c:1336
-msgid "unable to resolve HEAD after creating commit"
-msgstr "tidak dapat menguraikan HEAD setelah membuat komit"
-
-#: sequencer.c:1338
-msgid "detached HEAD"
-msgstr "HEAD terpisah"
-
-#: sequencer.c:1342
-msgid " (root-commit)"
-msgstr " (komit-akar)"
-
-#: sequencer.c:1363
-msgid "could not parse HEAD"
-msgstr "tidak dapat menguraikan HEAD"
-
-#: sequencer.c:1365
-#, c-format
-msgid "HEAD %s is not a commit!"
-msgstr "HEAD %s bukan sebuah komit!"
-
-#: sequencer.c:1369 sequencer.c:1447 builtin/commit.c:1707
-msgid "could not parse HEAD commit"
-msgstr "tidak dapat menguraikan komit HEAD"
-
-#: sequencer.c:1425 sequencer.c:2310
-msgid "unable to parse commit author"
-msgstr "tidak dapat menguraikan pengarang komit"
-
-#: sequencer.c:1436 builtin/am.c:1644 builtin/merge.c:710
-msgid "git write-tree failed to write a tree"
-msgstr "git write-tree gagal menulis sebuah pohon"
-
-#: sequencer.c:1469 sequencer.c:1589
-#, c-format
-msgid "unable to read commit message from '%s'"
-msgstr "tidak dapat membaca pesan komit dari '%s'"
-
-#: sequencer.c:1500 sequencer.c:1532
-#, c-format
-msgid "invalid author identity '%s'"
-msgstr "identitas pengarang tidak valid '%s'"
-
-#: sequencer.c:1506
-msgid "corrupt author: missing date information"
-msgstr "pengarang rusak: informasi tanggal hilang"
-
-#: sequencer.c:1545 builtin/am.c:1671 builtin/commit.c:1821 builtin/merge.c:921
-#: builtin/merge.c:946 t/helper/test-fast-rebase.c:78
-msgid "failed to write commit object"
-msgstr "gagal menulis objek komit"
-
-#: sequencer.c:1572 sequencer.c:4496 t/helper/test-fast-rebase.c:199
-#: t/helper/test-fast-rebase.c:217
-#, c-format
-msgid "could not update %s"
-msgstr "tidak dapat memperbarui %s"
-
-#: sequencer.c:1621
-#, c-format
-msgid "could not parse commit %s"
-msgstr "tidak dapat menguraikan komit %s"
-
-#: sequencer.c:1626
-#, c-format
-msgid "could not parse parent commit %s"
-msgstr "tidak dapat menguraikan komit induk %s"
-
-#: sequencer.c:1709 sequencer.c:1990
-#, c-format
-msgid "unknown command: %d"
-msgstr "perintah tidak dikenal: %d"
-
-#: sequencer.c:1751
-msgid "This is the 1st commit message:"
-msgstr "Ini komit pertama:"
-
-#: sequencer.c:1752
-#, c-format
-msgid "This is the commit message #%d:"
-msgstr "Ini komit ke-%d:"
-
-#: sequencer.c:1753
-msgid "The 1st commit message will be skipped:"
-msgstr "Pesan komit pertama akan dilewati:"
-
-#: sequencer.c:1754
-#, c-format
-msgid "The commit message #%d will be skipped:"
-msgstr "Pesan komit ke-%d akan dilewati"
-
-#: sequencer.c:1755
-#, c-format
-msgid "This is a combination of %d commits."
-msgstr "Ini kombinasi dari %d komit."
-
-#: sequencer.c:1902 sequencer.c:1959
-#, c-format
-msgid "cannot write '%s'"
-msgstr "tidak dapat menulis '%s'"
-
-#: sequencer.c:1949
-msgid "need a HEAD to fixup"
-msgstr "butuh sebuah HEAD untuk memperbaiki"
-
-#: sequencer.c:1951 sequencer.c:3592
-msgid "could not read HEAD"
-msgstr "tidak dapat membaca HEAD"
-
-#: sequencer.c:1953
-msgid "could not read HEAD's commit message"
-msgstr "tidak dapat membaca pesan komit HEAD"
-
-#: sequencer.c:1977
-#, c-format
-msgid "could not read commit message of %s"
-msgstr "tidak dapat membaca pesan komit %s"
-
-#: sequencer.c:2087
-msgid "your index file is unmerged."
-msgstr "berkas indeks Anda tak tergabung."
-
-#: sequencer.c:2094
-msgid "cannot fixup root commit"
-msgstr "tidak dapat memperbaiki komit akar"
-
-#: sequencer.c:2113
-#, c-format
-msgid "commit %s is a merge but no -m option was given."
-msgstr "komit %s adalah penggabungan tetapi opsi -m tidak diberikan."
-
-#: sequencer.c:2121 sequencer.c:2129
-#, c-format
-msgid "commit %s does not have parent %d"
-msgstr "komit %s tidak punya induk %d"
-
-#: sequencer.c:2135
-#, c-format
-msgid "cannot get commit message for %s"
-msgstr "tidak dapat mendapatkan pesan komit untuk %s"
-
-#. TRANSLATORS: The first %s will be a "todo" command like
-#. "revert" or "pick", the second %s a SHA1.
-#: sequencer.c:2154
-#, c-format
-msgid "%s: cannot parse parent commit %s"
-msgstr "%s: tidak dapat menguraikan komit induk %s"
-
-#: sequencer.c:2220
-#, c-format
-msgid "could not rename '%s' to '%s'"
-msgstr "tidak dapat menamai ulang '%s' ke '%s'"
-
-#: sequencer.c:2280
-#, c-format
-msgid "could not revert %s... %s"
-msgstr "tidak dapat membalikkan %s... %s"
-
-#: sequencer.c:2281
-#, c-format
-msgid "could not apply %s... %s"
-msgstr "tidak dapat menerapkan %s... %s"
-
-#: sequencer.c:2302
-#, c-format
-msgid "dropping %s %s -- patch contents already upstream\n"
-msgstr "menjatuhkan %s %s -- isi tambalan sudah di hulu\n"
-
-#: sequencer.c:2360
-#, c-format
-msgid "git %s: failed to read the index"
-msgstr "git %s: gagal membaca indeks"
-
-#: sequencer.c:2368
-#, c-format
-msgid "git %s: failed to refresh the index"
-msgstr "git %s: gagal menyegarkan indeks"
-
-#: sequencer.c:2448
-#, c-format
-msgid "%s does not accept arguments: '%s'"
-msgstr "%s tidak menerima argumen: '%s'"
-
-#: sequencer.c:2457
-#, c-format
-msgid "missing arguments for %s"
-msgstr "argumen hilang untuk %s"
-
-#: sequencer.c:2500
-#, c-format
-msgid "could not parse '%s'"
-msgstr "tidak dapat menguraikan '%s'"
-
-#: sequencer.c:2561
-#, c-format
-msgid "invalid line %d: %.*s"
-msgstr "baris %d tidak valid: %.*s"
-
-#: sequencer.c:2572
-#, c-format
-msgid "cannot '%s' without a previous commit"
-msgstr "tidak dapat '%s' tanpa komit sebelumnya"
-
-#: sequencer.c:2620 builtin/rebase.c:185
-#, c-format
-msgid "could not read '%s'."
-msgstr "tidak dapat membaca '%s'."
-
-#: sequencer.c:2658
-msgid "cancelling a cherry picking in progress"
-msgstr "membatalkan pemetikan ceri yang sedang berlangsung"
-
-#: sequencer.c:2667
-msgid "cancelling a revert in progress"
-msgstr "membatalkan pembalikkan yang sedang berlangsung"
-
-#: sequencer.c:2707
-msgid "please fix this using 'git rebase --edit-todo'."
-msgstr "mohon perbaiki menggunakan 'git rebase --edit-todo'."
-
-#: sequencer.c:2709
-#, c-format
-msgid "unusable instruction sheet: '%s'"
-msgstr "lembar perintah tidak dapat digunakan: '%s'"
-
-#: sequencer.c:2714
-msgid "no commits parsed."
-msgstr "tidak ada komit yang diuraikan."
-
-#: sequencer.c:2725
-msgid "cannot cherry-pick during a revert."
-msgstr "tidak dapat memetik ceri selama pembalikkan."
-
-#: sequencer.c:2727
-msgid "cannot revert during a cherry-pick."
-msgstr "tidak dapat membalikkan selama petik ceri."
-
-#: sequencer.c:2914
-msgid "unusable squash-onto"
-msgstr "squash-onto tidak dapat digunakan"
-
-#: sequencer.c:2934
-#, c-format
-msgid "malformed options sheet: '%s'"
-msgstr "lembar opsi jelek: '%s'"
-
-#: sequencer.c:3029 sequencer.c:4875
-msgid "empty commit set passed"
-msgstr "himpunan komit kosong dilewatkan"
-
-#: sequencer.c:3046
-msgid "revert is already in progress"
-msgstr "pembalikkan sudah berjalan"
-
-#: sequencer.c:3048
-#, c-format
-msgid "try \"git revert (--continue | %s--abort | --quit)\""
-msgstr "coba \"git revert (--continue | %s--abort | --quit)\""
-
-#: sequencer.c:3051
-msgid "cherry-pick is already in progress"
-msgstr "pemetikan ceri sudah berjalan"
-
-#: sequencer.c:3053
-#, c-format
-msgid "try \"git cherry-pick (--continue | %s--abort | --quit)\""
-msgstr "coba \"git cherry-pick (--continue | %s--abort | --quit)\""
-
-#: sequencer.c:3067
-#, c-format
-msgid "could not create sequencer directory '%s'"
-msgstr "tidak dapat membuat direktori pembaris '%s'"
-
-#: sequencer.c:3082
-msgid "could not lock HEAD"
-msgstr "tidak dapat mengunci HEAD"
-
-#: sequencer.c:3142 sequencer.c:4585
-msgid "no cherry-pick or revert in progress"
-msgstr "tidak ada pemetikan ceri atau pembalikkan yang sedang berjalan"
-
-#: sequencer.c:3144 sequencer.c:3155
-msgid "cannot resolve HEAD"
-msgstr "tidak dapat menguraikan HEAD"
-
-#: sequencer.c:3146 sequencer.c:3190
-msgid "cannot abort from a branch yet to be born"
-msgstr "tidak dapat membatalkan dari cabang yang belum lahir"
-
-#: sequencer.c:3176 builtin/fetch.c:1030 builtin/fetch.c:1457
-#: builtin/grep.c:774
-#, c-format
-msgid "cannot open '%s'"
-msgstr "tidak dapat membuka '%s'"
-
-#: sequencer.c:3178
-#, c-format
-msgid "cannot read '%s': %s"
-msgstr "tidak dapat membaca '%s': %s"
-
-#: sequencer.c:3179
-msgid "unexpected end of file"
-msgstr "akhir berkas tidak diharapkan"
-
-#: sequencer.c:3185
-#, c-format
-msgid "stored pre-cherry-pick HEAD file '%s' is corrupt"
-msgstr "berkas HEAD pra-petik-ceri yang tersimpan '%s' rusak"
-
-#: sequencer.c:3196
-msgid "You seem to have moved HEAD. Not rewinding, check your HEAD!"
-msgstr ""
-"Sepertinya Anda sudah memindahkan HEAD. Tidak memutar ulang, periksa HEAD "
-"Anda!"
-
-#: sequencer.c:3237
-msgid "no revert in progress"
-msgstr "tidak ada pembalikkan yang sedang berjalan"
-
-#: sequencer.c:3246
-msgid "no cherry-pick in progress"
-msgstr "tidak ada pemetikan ceri yang sedang berjalan"
-
-#: sequencer.c:3256
-msgid "failed to skip the commit"
-msgstr "gagal melewati komit"
-
-#: sequencer.c:3263
-msgid "there is nothing to skip"
-msgstr "tidak ada yang dilewati"
-
-#: sequencer.c:3266
-#, c-format
-msgid ""
-"have you committed already?\n"
-"try \"git %s --continue\""
-msgstr ""
-"sudahkah Anda komit?\n"
-"coba \"git %s --continue\""
-
-#: sequencer.c:3428 sequencer.c:4476
-msgid "cannot read HEAD"
-msgstr "tidak dapat membaca HEAD"
-
-#: sequencer.c:3445
-#, c-format
-msgid "unable to copy '%s' to '%s'"
-msgstr "tidak dapat menyalin '%s' ke '%s'"
-
-#: sequencer.c:3453
-#, c-format
-msgid ""
-"You can amend the commit now, with\n"
-"\n"
-"  git commit --amend %s\n"
-"\n"
-"Once you are satisfied with your changes, run\n"
-"\n"
-"  git rebase --continue\n"
-msgstr ""
-"Anda dapat mengubah komit sekarang, dengan\n"
-"\n"
-"  git commit --amend %s\n"
-"\n"
-"Setelah Anda puas dengan perubahan Anda, jalankan\n"
-"\n"
-"  git rebase --continue\n"
-
-#: sequencer.c:3463
-#, c-format
-msgid "Could not apply %s... %.*s"
-msgstr "Tidak dapat menerapkan %s... %.*s"
-
-#: sequencer.c:3470
-#, c-format
-msgid "Could not merge %.*s"
-msgstr "Tidak dapat menggabungkan %.*s"
-
-#: sequencer.c:3484 sequencer.c:3488 builtin/difftool.c:633
-#, c-format
-msgid "could not copy '%s' to '%s'"
-msgstr "tidak dapat menyalin '%s' ke '%s'"
-
-#: sequencer.c:3499
-#, c-format
-msgid "Executing: %s\n"
-msgstr "Mengeksekusi: %s\n"
-
-#: sequencer.c:3510
-#, c-format
-msgid ""
-"execution failed: %s\n"
-"%sYou can fix the problem, and then run\n"
-"\n"
-"  git rebase --continue\n"
-"\n"
-msgstr ""
-"eksekusi gagal: %s\n"
-"%sAnda dapat memperbaiki masalah, lalu jalankan\n"
-"\n"
-"  git rebase --continue\n"
-"\n"
-
-#: sequencer.c:3516
-msgid "and made changes to the index and/or the working tree\n"
-msgstr "dan buat perubahan ke indeks dan/atau pohon kerja\n"
-
-#: sequencer.c:3522
-#, c-format
-msgid ""
-"execution succeeded: %s\n"
-"but left changes to the index and/or the working tree\n"
-"Commit or stash your changes, and then run\n"
-"\n"
-"  git rebase --continue\n"
-"\n"
-msgstr ""
-"eksekusi berhasil: %s\n"
-"tapi meninggalkan perubahan ke indeks dan/atau pohon kerja\n"
-"Komit atau stase perubahan Anda, lalu jalankan\n"
-"\n"
-"  git rebase --continue\n"
-"\n"
-
-#: sequencer.c:3582
-#, c-format
-msgid "illegal label name: '%.*s'"
-msgstr "nama label ilegal: '%.*s'"
-
-#: sequencer.c:3655
-msgid "writing fake root commit"
-msgstr "menulis komit akar palsu"
-
-#: sequencer.c:3660
-msgid "writing squash-onto"
-msgstr "menulis squash-onto"
-
-#: sequencer.c:3739
-#, c-format
-msgid "could not resolve '%s'"
-msgstr "tidak dapat menguraikan '%s'"
-
-#: sequencer.c:3771
-msgid "cannot merge without a current revision"
-msgstr "tidak dapat menggabungkan tanpa revisi saat ini"
-
-#: sequencer.c:3793
-#, c-format
-msgid "unable to parse '%.*s'"
-msgstr "tidak dapat menguraikan '%.*s'"
-
-#: sequencer.c:3802
-#, c-format
-msgid "nothing to merge: '%.*s'"
-msgstr "tidak ada yang digabungkan: '%.*s'"
-
-#: sequencer.c:3814
-msgid "octopus merge cannot be executed on top of a [new root]"
-msgstr "penggabungan gurita tidak dapat dieksekusi di atas sebuah [akar baru]"
-
-#: sequencer.c:3869
-#, c-format
-msgid "could not get commit message of '%s'"
-msgstr "tidak dapat mendapatkan pesan komit dari '%s'"
-
-#: sequencer.c:4013
-#, c-format
-msgid "could not even attempt to merge '%.*s'"
-msgstr "bahkan tidak dapat mencoba menggabungkan '%.*s'"
-
-#: sequencer.c:4029
-msgid "merge: Unable to write new index file"
-msgstr "merge: Tidak dapat menulis berkas indeks baru"
-
-#: sequencer.c:4110
-msgid "Cannot autostash"
-msgstr "Tidak dapat menstase otomatis"
-
-#: sequencer.c:4113
-#, c-format
-msgid "Unexpected stash response: '%s'"
-msgstr "Respons stase tidak diharapkan: '%s'"
-
-#: sequencer.c:4119
-#, c-format
-msgid "Could not create directory for '%s'"
-msgstr "Tidak dapat membuat direktori untuk '%s'"
-
-#: sequencer.c:4122
-#, c-format
-msgid "Created autostash: %s\n"
-msgstr "Stase otomatis dibuat: %s\n"
-
-#: sequencer.c:4124
-msgid "could not reset --hard"
-msgstr "tidak dapat reset --hard"
-
-#: sequencer.c:4148
-#, c-format
-msgid "Applied autostash.\n"
-msgstr "Stase otomatis diterapkan.\n"
-
-#: sequencer.c:4160
-#, c-format
-msgid "cannot store %s"
-msgstr "tidak dapat menyimpan %s"
-
-#: sequencer.c:4163
-#, c-format
-msgid ""
-"%s\n"
-"Your changes are safe in the stash.\n"
-"You can run \"git stash pop\" or \"git stash drop\" at any time.\n"
-msgstr ""
-"%s\n"
-"Perubahan Anda aman di dalam stase.\n"
-"Anda dapat menjalankan \"git stash pop\" atau \"git stash drop\" kapanpun.\n"
-
-#: sequencer.c:4168
-msgid "Applying autostash resulted in conflicts."
-msgstr "Menerapkan stase otomatis menghasilkan konflik."
-
-#: sequencer.c:4169
-msgid "Autostash exists; creating a new stash entry."
-msgstr "Stase otomatis sudah ada; membuat entri stase baru."
-
-#: sequencer.c:4225
-msgid "could not detach HEAD"
-msgstr "tidak dapat melepas HEAD"
-
-#: sequencer.c:4240
-#, c-format
-msgid "Stopped at HEAD\n"
-msgstr "Berhenti pada HEAD\n"
-
-#: sequencer.c:4242
-#, c-format
-msgid "Stopped at %s\n"
-msgstr "Berhenti pada %s\n"
-
-#: sequencer.c:4274
-#, c-format
-msgid ""
-"Could not execute the todo command\n"
-"\n"
-"    %.*s\n"
-"It has been rescheduled; To edit the command before continuing, please\n"
-"edit the todo list first:\n"
-"\n"
-"    git rebase --edit-todo\n"
-"    git rebase --continue\n"
-msgstr ""
-"Tidak dapat mengeksekusi perintah todo\n"
-"\n"
-"    %.*s\n"
-"Itu sudah dijadwalkan ulang; Untuk menyunting perintah sebelum melanjutkan,\n"
-"mohon sunting daftar todo terlebih dahulu:\n"
-"\n"
-"    git rebase --edit-todo\n"
-"    git rebase --continue\n"
-
-#: sequencer.c:4320
-#, c-format
-msgid "Rebasing (%d/%d)%s"
-msgstr "Mendasarkan ulang (%d/%d)%s"
-
-#: sequencer.c:4366
-#, c-format
-msgid "Stopped at %s...  %.*s\n"
-msgstr "Berhenti pada %s... %.*s\n"
-
-#: sequencer.c:4436
-#, c-format
-msgid "unknown command %d"
-msgstr "perintah tidak dikenal %d"
-
-#: sequencer.c:4484
-msgid "could not read orig-head"
-msgstr "tidak dapat membaca orig-head"
-
-#: sequencer.c:4489
-msgid "could not read 'onto'"
-msgstr "tidak dapat membaca 'onto'"
-
-#: sequencer.c:4503
-#, c-format
-msgid "could not update HEAD to %s"
-msgstr "tidak dapat memperbarui HEAD ke %s"
-
-#: sequencer.c:4563
-#, c-format
-msgid "Successfully rebased and updated %s.\n"
-msgstr "%s didasarkan ulang dan diperbarui dengan sukses.\n"
-
-#: sequencer.c:4615
-msgid "cannot rebase: You have unstaged changes."
-msgstr "tidak dapat mendasarkan ulang: Anda punya perubahan tak tergelar."
-
-#: sequencer.c:4624
-msgid "cannot amend non-existing commit"
-msgstr "tidak dapat mengubah komit yang tidak ada"
-
-#: sequencer.c:4626
-#, c-format
-msgid "invalid file: '%s'"
-msgstr "berkas tidak valid: '%s'"
-
-#: sequencer.c:4628
-#, c-format
-msgid "invalid contents: '%s'"
-msgstr "konten tidak valid: '%s'"
-
-#: sequencer.c:4631
-msgid ""
-"\n"
-"You have uncommitted changes in your working tree. Please, commit them\n"
-"first and then run 'git rebase --continue' again."
-msgstr ""
-"\n"
-"Anda punya perubahan tak tergelar di dalam pohon kerja Anda. Mohon komit\n"
-"terlebih dahulu dan jalankan 'git rebase --continue' lagi."
-
-#: sequencer.c:4667 sequencer.c:4706
-#, c-format
-msgid "could not write file: '%s'"
-msgstr "tidak dapat menulis berkas: '%s'"
-
-#: sequencer.c:4722
-msgid "could not remove CHERRY_PICK_HEAD"
-msgstr "tidak dapat menghapus CHERRY_PICK_HEAD"
-
-#: sequencer.c:4732
-msgid "could not commit staged changes."
-msgstr "tidak dapat mengkomit perubahan tergelar."
-
-#: sequencer.c:4852
-#, c-format
-msgid "%s: can't cherry-pick a %s"
-msgstr "%s: tidak dapat memetik ceri sebuah %s"
-
-#: sequencer.c:4856
-#, c-format
-msgid "%s: bad revision"
-msgstr "%s: revisi jelek"
-
-#: sequencer.c:4891
-msgid "can't revert as initial commit"
-msgstr "tidak dapat membalikkan sebagai komit awal"
-
-#: sequencer.c:5162 sequencer.c:5391
-#, c-format
-msgid "skipped previously applied commit %s"
-msgstr "melewatkan komit yang sudah diterapkan sebelumnya %s"
-
-#: sequencer.c:5232 sequencer.c:5407
-msgid "use --reapply-cherry-picks to include skipped commits"
-msgstr "gunakan --reapply-cherry-picks untuk memasukkan komit yang terlewat"
-
-#: sequencer.c:5378
-msgid "make_script: unhandled options"
-msgstr "make_script: opsi tak ditangani"
-
-#: sequencer.c:5381
-msgid "make_script: error preparing revisions"
-msgstr "make_script: kesalahan membuat revisi"
-
-#: sequencer.c:5639 sequencer.c:5656
-msgid "nothing to do"
-msgstr "tidak ada yang dilakukan"
-
-#: sequencer.c:5675
-msgid "could not skip unnecessary pick commands"
-msgstr "tidak dapat melewatkan perintah pick yang tidak perlu"
-
-#: sequencer.c:5775
-msgid "the script was already rearranged."
-msgstr "skrip sudah ditata ulang."
-
-#: setup.c:135
-#, c-format
-msgid "'%s' is outside repository at '%s'"
-msgstr "'%s' di luar repositori pada '%s'"
-
-#: setup.c:187
-#, c-format
-msgid ""
-"%s: no such path in the working tree.\n"
-"Use 'git <command> -- <path>...' to specify paths that do not exist locally."
-msgstr ""
-"%s: tidak ada jalur di pohon kerja.\n"
-"Gunakan 'git <perintah> -- <jalur>...' untuk menyebutkan jalur yang tidak ada secara lokal."
-
-#: setup.c:200
-#, c-format
-msgid ""
-"ambiguous argument '%s': unknown revision or path not in the working tree.\n"
-"Use '--' to separate paths from revisions, like this:\n"
-"'git <command> [<revision>...] -- [<file>...]'"
-msgstr ""
-"argumen ambigu '%s': revisi tidak dikenal atau jalur tidak ada di dalam pohon "
-"kerja.\n"
-"Gunakan '--' untuk memisahkan jalur dari revisi, seperti ini:\n"
-"'git <perintah> [<revisi>...] -- [<berkas>...]'"
-
-#: setup.c:266
-#, c-format
-msgid "option '%s' must come before non-option arguments"
-msgstr "opsi '%s' harus ada sebelum argumen bukan opsi"
-
-#: setup.c:285
-#, c-format
-msgid ""
-"ambiguous argument '%s': both revision and filename\n"
-"Use '--' to separate paths from revisions, like this:\n"
-"'git <command> [<revision>...] -- [<file>...]'"
-msgstr ""
-"argumen ambigu '%s': kedua-duanya revisi dan nama berkas\n"
-"Gunakan '--' untuk memisahkan jalur dari revisi, seperti ini:\n"
-"'git <perintah> [<revisi>...] -- [<berkas>]'"
-
-#: setup.c:421
-msgid "unable to set up work tree using invalid config"
-msgstr "tidak dapat memasang pohon kerja menggunakan konfigurasi tidak valid"
-
-#: setup.c:425 builtin/rev-parse.c:895
-msgid "this operation must be run in a work tree"
-msgstr "operasi ini harus dijalankan di dalam pohon kerja"
-
-#: setup.c:724
-#, c-format
-msgid "Expected git repo version <= %d, found %d"
-msgstr "Versi repositori git diharapkan <= %d, dapat %d"
-
-#: setup.c:732
-msgid "unknown repository extension found:"
-msgid_plural "unknown repository extensions found:"
-msgstr[0] "ekstensi repositori tidak dikenal ditemukan:"
-msgstr[1] "ekstensi repositori tidak dikenal ditemukan:"
-
-#: setup.c:746
-msgid "repo version is 0, but v1-only extension found:"
-msgid_plural "repo version is 0, but v1-only extensions found:"
-msgstr[0] "versi repositori 0, tetapi ekstensi hanya v1 ditemukan:"
-msgstr[1] "versi repositori 0, tetapi ekstensi hanya v1 ditemukan:"
-
-#: setup.c:767
-#, c-format
-msgid "error opening '%s'"
-msgstr "kesalahan membuka '%s'"
-
-#: setup.c:769
-#, c-format
-msgid "too large to be a .git file: '%s'"
-msgstr "terlalu besar untuk jadi berkas .git: '%s'"
-
-#: setup.c:771
-#, c-format
-msgid "error reading %s"
-msgstr "kesalahan membaca %s"
-
-#: setup.c:773
-#, c-format
-msgid "invalid gitfile format: %s"
-msgstr "format gitfile tidak valid: %s"
-
-#: setup.c:775
-#, c-format
-msgid "no path in gitfile: %s"
-msgstr "tidak ada jalur di dalam gitfile: %s"
-
-#: setup.c:777
-#, c-format
-msgid "not a git repository: %s"
-msgstr "bukan sebuah repositori git: %s"
-
-#: setup.c:879
-#, c-format
-msgid "'$%s' too big"
-msgstr "'$%s' terlalu besar"
-
-#: setup.c:893
-#, c-format
-msgid "not a git repository: '%s'"
-msgstr "bukan sebuah repositori git: '%s'"
-
-#: setup.c:922 setup.c:924 setup.c:955
-#, c-format
-msgid "cannot chdir to '%s'"
-msgstr "tidak dapat chdir ke '%s'"
-
-#: setup.c:927 setup.c:983 setup.c:993 setup.c:1032 setup.c:1040
-msgid "cannot come back to cwd"
-msgstr "tidak dapat kembali ke cwd"
-
-#: setup.c:1054
-#, c-format
-msgid "failed to stat '%*s%s%s'"
-msgstr "gagal men-stat '%*s%s%s'"
-
-#: setup.c:1338
-msgid "Unable to read current working directory"
-msgstr "tidak dapat membaca direktori kerja saat ini"
-
-#: setup.c:1347 setup.c:1353
-#, c-format
-msgid "cannot change to '%s'"
-msgstr "tidak dapat berganti ke '%s'"
-
-#: setup.c:1358
-#, c-format
-msgid "not a git repository (or any of the parent directories): %s"
-msgstr "bukan sebuah repositori git (atau direktori induk apapun): %s"
-
-#: setup.c:1364
-#, 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 ""
-"bukan sebuah repositori git (atau induk apapun hingga ke titik pasang %s)\n"
-"Berhenti pada perbatasan sistem berkas (GIT_DISCOVERY_ACROSS_FILESYSTEM tidak disetel)."
-
-#: setup.c:1374
-#, c-format
-msgid ""
-"unsafe repository ('%s' is owned by someone else)\n"
-"To add an exception for this directory, call:\n"
-"\n"
-"\tgit config --global --add safe.directory %s"
-msgstr ""
-"repositori tidak aman ('%s' dimiliki oleh orang lain)\n"
-"Untuk menambahkan pengecualian untuk direktori ini, panggil:\n"
-"\n"
-"\tgit config --global --add safe.directory %s"
-
-#: setup.c:1502
-#, c-format
-msgid ""
-"problem with core.sharedRepository filemode value (0%.3o).\n"
-"The owner of files must always have read and write permissions."
-msgstr ""
-"masalah dengan nilai mode berkas core.sharedRepository (0%.3o).\n"
-"Pemilik berkas harus selalu punya perizinan baca dan tulis."
-
-#: setup.c:1564
-msgid "fork failed"
-msgstr "penggarpuan gagal"
-
-#: setup.c:1569
-msgid "setsid failed"
-msgstr "setsid gagal"
-
-#: sparse-index.c:285
-#, c-format
-msgid "index entry is a directory, but not sparse (%08x)"
-msgstr "entri indeks adalah direktori, tapi bukan tipis (%08x)"
-
-#: split-index.c:9
-msgid "cannot use split index with a sparse index"
-msgstr "tidak dapat menggunakan indeks terpisah dengan indeks tipis"
-
-#. TRANSLATORS: IEC 80000-13:2008 gibibyte
-#: strbuf.c:851
-#, c-format
-msgid "%u.%2.2u GiB"
-msgstr "%u.%2.2u gibibita"
-
-#. TRANSLATORS: IEC 80000-13:2008 gibibyte/second
-#: strbuf.c:853
-#, c-format
-msgid "%u.%2.2u GiB/s"
-msgstr "%u.%2.2u gibibita/detik"
-
-#. TRANSLATORS: IEC 80000-13:2008 mebibyte
-#: strbuf.c:861
-#, c-format
-msgid "%u.%2.2u MiB"
-msgstr "%u.%2.2u mebibita"
-
-#. TRANSLATORS: IEC 80000-13:2008 mebibyte/second
-#: strbuf.c:863
-#, c-format
-msgid "%u.%2.2u MiB/s"
-msgstr "%u.%2.2u mebibita/detik"
-
-#. TRANSLATORS: IEC 80000-13:2008 kibibyte
-#: strbuf.c:870
-#, c-format
-msgid "%u.%2.2u KiB"
-msgstr "%u.%2.2u kibibita"
-
-#. TRANSLATORS: IEC 80000-13:2008 kibibyte/second
-#: strbuf.c:872
-#, c-format
-msgid "%u.%2.2u KiB/s"
-msgstr "%u.%2.2u kibibita/detik"
-
-#. TRANSLATORS: IEC 80000-13:2008 byte
-#: strbuf.c:878
-#, c-format
-msgid "%u byte"
-msgid_plural "%u bytes"
-msgstr[0] "%u bita"
-msgstr[1] "%u bita"
-
-#. TRANSLATORS: IEC 80000-13:2008 byte/second
-#: strbuf.c:880
-#, c-format
-msgid "%u byte/s"
-msgid_plural "%u bytes/s"
-msgstr[0] "%u bita/detik"
-msgstr[1] "%u bita/detik"
-
-#: strbuf.c:1187 wrapper.c:217 wrapper.c:387 builtin/am.c:766
-#: builtin/rebase.c:653
-#, c-format
-msgid "could not open '%s' for writing"
-msgstr "tidak dapat membuka '%s' untuk ditulis"
-
-#: strbuf.c:1196
-#, c-format
-msgid "could not edit '%s'"
-msgstr "tidak dapat menyunting '%s'"
-
-#: submodule-config.c:238
-#, c-format
-msgid "ignoring suspicious submodule name: %s"
-msgstr "abaikan nama submodul dicurigai: %s"
-
-#: submodule-config.c:305
-msgid "negative values not allowed for submodule.fetchjobs"
-msgstr "nilai negatif tidak diperbolehkan untuk submodule.fetchjobs"
-
-#: submodule-config.c:403
-#, c-format
-msgid "ignoring '%s' which may be interpreted as a command-line option: %s"
-msgstr "abaikan '%s' yang mungkin ditafsirkan sebagai opsi baris perintah: %s"
-
-#: submodule-config.c:500 builtin/push.c:489 builtin/send-pack.c:148
-#, c-format
-msgid "invalid value for '%s'"
-msgstr "nilai tidak valid untuk '%s'"
-
-#: submodule-config.c:828
-#, c-format
-msgid "Could not update .gitmodules entry %s"
-msgstr "Tidak dapat memperbarui entri .gitmodules %s"
-
-#: submodule.c:115 submodule.c:144
-msgid "Cannot change unmerged .gitmodules, resolve merge conflicts first"
-msgstr ""
-"Tidak dapat mengubah .gitmodules yang tak tergabung, selesaikan konflik "
-"penggabungan terlebih dahulu"
-
-#: submodule.c:119 submodule.c:148
-#, c-format
-msgid "Could not find section in .gitmodules where path=%s"
-msgstr "Tidak dapat menemukan bagian .gitmodules dimana path=%s"
-
-#: submodule.c:155
-#, c-format
-msgid "Could not remove .gitmodules entry for %s"
-msgstr "Tidak dapat menghapus entri .gitmodules untuk %s"
-
-#: submodule.c:166
-msgid "staging updated .gitmodules failed"
-msgstr "gagal menggelar .gitmodules terbarui"
-
-#: submodule.c:346
-#, c-format
-msgid "in unpopulated submodule '%s'"
-msgstr "dalam submodul tak terisi '%s'"
-
-#: submodule.c:377
-#, c-format
-msgid "Pathspec '%s' is in submodule '%.*s'"
-msgstr "Spek jalur '%s' di dalam submodul '%.*s'"
-
-#: submodule.c:454
-#, c-format
-msgid "bad --ignore-submodules argument: %s"
-msgstr "argumen --ignore-submodules jelek: %s"
-
-#: submodule.c:866
-#, c-format
-msgid ""
-"Submodule in commit %s at path: '%s' collides with a submodule named the "
-"same. Skipping it."
-msgstr ""
-"Submodul dalam komit %s pada jalur '%s' bertabrakan dengan submodul yang "
-"bernama sama. Melewati itu."
-
-#: submodule.c:987
-#, c-format
-msgid "submodule entry '%s' (%s) is a %s, not a commit"
-msgstr "entri submodul '%s' (%s) adalah %s, bukan komit"
-
-#: submodule.c:1069
-#, c-format
-msgid ""
-"Could not run 'git rev-list <commits> --not --remotes -n 1' command in "
-"submodule %s"
-msgstr ""
-"Tidak dapat menjalankan perintah 'git rev-list <komit> --not --remotes -n 1' "
-"dalam submodul %s"
-
-#: submodule.c:1192
-#, c-format
-msgid "process for submodule '%s' failed"
-msgstr "proses untuk submodul '%s' gagal"
-
-#: submodule.c:1221 builtin/branch.c:714 builtin/submodule--helper.c:2827
-msgid "Failed to resolve HEAD as a valid ref."
-msgstr "Gagal menguraikan HEAD sebagai referensi valid."
-
-#: submodule.c:1232
-#, c-format
-msgid "Pushing submodule '%s'\n"
-msgstr "Mendorong submodul '%s'\n"
-
-#: submodule.c:1235
-#, c-format
-msgid "Unable to push submodule '%s'\n"
-msgstr "Tidak dapat mendorong submodul '%s'\n"
-
-#: submodule.c:1567
-#, c-format
-msgid "Fetching submodule %s%s\n"
-msgstr "Mengambil submodul %s%s\n"
-
-#: submodule.c:1589
-#, c-format
-msgid "Could not access submodule '%s'\n"
-msgstr "Tidak dapat mengakses submodul '%s'\n"
-
-#: submodule.c:1618
-#, c-format
-msgid "Could not access submodule '%s' at commit %s\n"
-msgstr "Tidak dapat mengakses submodul '%s' pada komit %s\n"
-
-#: submodule.c:1629
-#, c-format
-msgid "Fetching submodule %s%s at commit %s\n"
-msgstr "Mengambil submodul %s%s pada komit %s\n"
-
-#: submodule.c:1849
-#, c-format
-msgid ""
-"Errors during submodule fetch:\n"
-"%s"
-msgstr ""
-"Kesalahan saat pengambilan submodul:\n"
-"%s"
-
-#: submodule.c:1874
-#, c-format
-msgid "'%s' not recognized as a git repository"
-msgstr "'%s' tak dikenal sebagai repositori git"
-
-#: submodule.c:1891
-#, 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:1932
-#, c-format
-msgid "'git status --porcelain=2' failed in submodule %s"
-msgstr "'git status --porcelain=2' gagal dalam submodul %s"
-
-#: submodule.c:2007
-#, c-format
-msgid "could not start 'git status' in submodule '%s'"
-msgstr "Tidak dalat memulai 'git status' dalam submodul '%s'"
-
-#: submodule.c:2020
-#, c-format
-msgid "could not run 'git status' in submodule '%s'"
-msgstr "tidak dapat menjalankan 'git status' dalam submodul '%s'"
-
-#: submodule.c:2037
-#, 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:2064 submodule.c:2379
-#, c-format
-msgid "could not recurse into submodule '%s'"
-msgstr "tidak dapat rekursi ke dalam submodul '%s'"
-
-#: submodule.c:2086
-msgid "could not reset submodule index"
-msgstr "tidak dapat reset indeks submodul"
-
-#: submodule.c:2128
-#, c-format
-msgid "submodule '%s' has dirty index"
-msgstr "submodul '%s' punya indeks kotor"
-
-#: submodule.c:2182
-#, c-format
-msgid "Submodule '%s' could not be updated."
-msgstr "Submodul '%s' tidak dapat diperbarui."
-
-#: submodule.c:2250
-#, c-format
-msgid "submodule git dir '%s' is inside git dir '%.*s'"
-msgstr "direktori submodul git '%s' di dalam direktori git '%.*s'"
-
-#: submodule.c:2271
-#, c-format
-msgid ""
-"relocate_gitdir for submodule '%s' with more than one worktree not supported"
-msgstr ""
-"relocate_gitdir untuk submodul '%s' dengan lebih dari satu pohon kerja tidak "
-"didukung"
-
-#: submodule.c:2283 submodule.c:2343
-#, c-format
-msgid "could not lookup name for submodule '%s'"
-msgstr "tidak dapat mencari nama untuk submodul '%s'"
-
-#: submodule.c:2287
-#, c-format
-msgid "refusing to move '%s' into an existing git dir"
-msgstr "menolak memindahkan '%s' ke dalam direktori git yang ada"
-
-#: submodule.c:2293
-#, c-format
-msgid ""
-"Migrating git directory of '%s%s' from\n"
-"'%s' to\n"
-"'%s'\n"
-msgstr ""
-"Memigrasikan direktori git '%s%s' dari\n"
-"'%s' ke\n"
-"'%s'\n"
-
-#: submodule.c:2424
-msgid "could not start ls-files in .."
-msgstr "tidak dapat memulai ls-files dalam .."
-
-#: submodule.c:2464
-#, c-format
-msgid "ls-tree returned unexpected return code %d"
-msgstr "ls-tree kembalikan kode kembali %d yang tak diharapkan"
-
-#: symlinks.c:244
-#, c-format
-msgid "failed to lstat '%s'"
-msgstr "gagal men-lstat '%s'"
-
-#: trailer.c:244
-#, c-format
-msgid "running trailer command '%s' failed"
-msgstr "gagal menjalankan perintah trailer '%s'"
-
-#: 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 "nilai tidak dikenal '%s' untuk kunci '%s'"
-
-#: trailer.c:547 trailer.c:552 trailer.c:557 builtin/remote.c:300
-#: builtin/remote.c:328
-#, c-format
-msgid "more than one %s"
-msgstr "lebih dari satu %s"
-
-#: trailer.c:743
-#, c-format
-msgid "empty trailer token in trailer '%.*s'"
-msgstr "token trailer kosong dalam trailer '%.*s'"
-
-#: trailer.c:763
-#, c-format
-msgid "could not read input file '%s'"
-msgstr "tidak dapat membaca berkas masukan '%s'"
-
-#: trailer.c:766 builtin/mktag.c:88 imap-send.c:1563
-msgid "could not read from stdin"
-msgstr "tidak dapat membaca dari masukan standar"
-
-#: trailer.c:1024 wrapper.c:760
-#, c-format
-msgid "could not stat %s"
-msgstr "tidak dapat membaca %s"
-
-#: trailer.c:1026
-#, c-format
-msgid "file %s is not a regular file"
-msgstr "berkas %s bukan sebuah berkas reguler"
-
-#: trailer.c:1028
-#, c-format
-msgid "file %s is not writable by user"
-msgstr "berkas %s tidak dapat ditulis oleh pengguna"
-
-#: trailer.c:1040
-msgid "could not open temporary file"
-msgstr "tidak dapat membuka berkas sementara"
-
-#: trailer.c:1080
-#, c-format
-msgid "could not rename temporary file to %s"
-msgstr "tidak dapat menamai ulang berkas sementara ke %s"
-
-#: transport-helper.c:62 transport-helper.c:91
-msgid "full write to remote helper failed"
-msgstr ""
-
-#: transport-helper.c:145
-#, c-format
-msgid "unable to find remote helper for '%s'"
-msgstr ""
-
-#: transport-helper.c:161 transport-helper.c:575
-msgid "can't dup helper output fd"
-msgstr ""
-
-#: transport-helper.c:214
-#, c-format
-msgid ""
-"unknown mandatory capability %s; this remote helper probably needs newer "
-"version of Git"
-msgstr ""
-
-#: transport-helper.c:220
-msgid "this remote helper should implement refspec capability"
-msgstr ""
-
-#: transport-helper.c:287 transport-helper.c:429
-#, c-format
-msgid "%s unexpectedly said: '%s'"
-msgstr ""
-
-#: transport-helper.c:417
-#, c-format
-msgid "%s also locked %s"
-msgstr ""
-
-#: transport-helper.c:497
-msgid "couldn't run fast-import"
-msgstr ""
-
-#: transport-helper.c:520
-msgid "error while running fast-import"
-msgstr ""
-
-#: transport-helper.c:549 transport-helper.c:1254
-#, c-format
-msgid "could not read ref %s"
-msgstr ""
-
-#: transport-helper.c:594
-#, c-format
-msgid "unknown response to connect: %s"
-msgstr ""
-
-#: transport-helper.c:616
-msgid "setting remote service path not supported by protocol"
-msgstr ""
-
-#: transport-helper.c:618
-msgid "invalid remote service path"
-msgstr ""
-
-#: transport-helper.c:661 transport.c:1496
-msgid "operation not supported by protocol"
-msgstr ""
-
-#: transport-helper.c:664
-#, c-format
-msgid "can't connect to subservice %s"
-msgstr ""
-
-#: transport-helper.c:693 transport.c:415
-msgid "--negotiate-only requires protocol v2"
-msgstr ""
-
-#: transport-helper.c:758
-msgid "'option' without a matching 'ok/error' directive"
-msgstr ""
-
-#: transport-helper.c:801
-#, c-format
-msgid "expected ok/error, helper said '%s'"
-msgstr ""
-
-#: transport-helper.c:862
-#, c-format
-msgid "helper reported unexpected status of %s"
-msgstr ""
-
-#: transport-helper.c:945
-#, c-format
-msgid "helper %s does not support dry-run"
-msgstr ""
-
-#: transport-helper.c:948
-#, c-format
-msgid "helper %s does not support --signed"
-msgstr ""
-
-#: transport-helper.c:951
-#, c-format
-msgid "helper %s does not support --signed=if-asked"
-msgstr ""
-
-#: transport-helper.c:956
-#, c-format
-msgid "helper %s does not support --atomic"
-msgstr ""
-
-#: transport-helper.c:960
-#, c-format
-msgid "helper %s does not support --%s"
-msgstr ""
-
-#: transport-helper.c:967
-#, c-format
-msgid "helper %s does not support 'push-option'"
-msgstr ""
-
-#: transport-helper.c:1067
-msgid "remote-helper doesn't support push; refspec needed"
-msgstr ""
-
-#: transport-helper.c:1072
-#, c-format
-msgid "helper %s does not support 'force'"
-msgstr ""
-
-#: transport-helper.c:1119
-msgid "couldn't run fast-export"
-msgstr ""
-
-#: transport-helper.c:1124
-msgid "error while running fast-export"
-msgstr ""
-
-#: transport-helper.c:1149
-#, c-format
-msgid ""
-"No refs in common and none specified; doing nothing.\n"
-"Perhaps you should specify a branch.\n"
-msgstr ""
-
-#: transport-helper.c:1231
-#, c-format
-msgid "unsupported object format '%s'"
-msgstr ""
-
-#: transport-helper.c:1240
-#, c-format
-msgid "malformed response in ref list: %s"
-msgstr ""
-
-#: transport-helper.c:1392
-#, c-format
-msgid "read(%s) failed"
-msgstr ""
-
-#: transport-helper.c:1419
-#, c-format
-msgid "write(%s) failed"
-msgstr ""
-
-#: transport-helper.c:1468
-#, c-format
-msgid "%s thread failed"
-msgstr ""
-
-#: transport-helper.c:1472
-#, c-format
-msgid "%s thread failed to join: %s"
-msgstr ""
-
-#: transport-helper.c:1491 transport-helper.c:1495
-#, c-format
-msgid "can't start thread for copying data: %s"
-msgstr ""
-
-#: transport-helper.c:1532
-#, c-format
-msgid "%s process failed to wait"
-msgstr ""
-
-#: transport-helper.c:1536
-#, c-format
-msgid "%s process failed"
-msgstr ""
-
-#: transport-helper.c:1554 transport-helper.c:1563
-msgid "can't start thread for copying data"
-msgstr ""
-
-#: transport.c:116
-#, c-format
-msgid "Would set upstream of '%s' to '%s' of '%s'\n"
-msgstr ""
-
-#: transport.c:138
-#, c-format
-msgid "could not read bundle '%s'"
-msgstr ""
-
-#: transport.c:234
-#, c-format
-msgid "transport: invalid depth option '%s'"
-msgstr ""
-
-#: transport.c:289
-msgid "see protocol.version in 'git help config' for more details"
-msgstr ""
-
-#: transport.c:290
-msgid "server options require protocol version 2 or later"
-msgstr ""
-
-#: transport.c:418
-msgid "server does not support wait-for-done"
-msgstr ""
-
-#: transport.c:770
-msgid "could not parse transport.color.* config"
-msgstr ""
-
-#: transport.c:845
-msgid "support for protocol v2 not implemented yet"
-msgstr ""
-
-#: transport.c:978
-#, c-format
-msgid "unknown value for config '%s': %s"
-msgstr ""
-
-#: transport.c:1044
-#, c-format
-msgid "transport '%s' not allowed"
-msgstr ""
-
-#: transport.c:1093
-msgid "git-over-rsync is no longer supported"
-msgstr ""
-
-#: transport.c:1196
-#, c-format
-msgid ""
-"The following submodule paths contain changes that can\n"
-"not be found on any remote:\n"
-msgstr ""
-
-#: transport.c:1200
-#, c-format
-msgid ""
-"\n"
-"Please try\n"
-"\n"
-"\tgit push --recurse-submodules=on-demand\n"
-"\n"
-"or cd to the path and use\n"
-"\n"
-"\tgit push\n"
-"\n"
-"to push them to a remote.\n"
-"\n"
-msgstr ""
-
-#: transport.c:1208
-msgid "Aborting."
-msgstr ""
-
-#: transport.c:1354
-msgid "failed to push all needed submodules"
-msgstr ""
-
-#: tree-walk.c:33
-msgid "too-short tree object"
-msgstr ""
-
-#: tree-walk.c:39
-msgid "malformed mode in tree entry"
-msgstr ""
-
-#: tree-walk.c:43
-msgid "empty filename in tree entry"
-msgstr ""
-
-#: tree-walk.c:118
-msgid "too-short tree file"
-msgstr ""
-
-#: unpack-trees.c:118
-#, c-format
-msgid ""
-"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 ""
-
-#: unpack-trees.c:120
-#, c-format
-msgid ""
-"Your local changes to the following files would be overwritten by checkout:\n"
-"%%s"
-msgstr ""
-
-#: unpack-trees.c:123
-#, c-format
-msgid ""
-"Your local changes to the following files would be overwritten by merge:\n"
-"%%sPlease commit your changes or stash them before you merge."
-msgstr ""
-
-#: unpack-trees.c:125
-#, c-format
-msgid ""
-"Your local changes to the following files would be overwritten by merge:\n"
-"%%s"
-msgstr ""
-
-#: unpack-trees.c:128
-#, c-format
-msgid ""
-"Your local changes to the following files would be overwritten by %s:\n"
-"%%sPlease commit your changes or stash them before you %s."
-msgstr ""
-
-#: unpack-trees.c:130
-#, c-format
-msgid ""
-"Your local changes to the following files would be overwritten by %s:\n"
-"%%s"
-msgstr ""
-
-#: unpack-trees.c:135
-#, c-format
-msgid ""
-"Updating the following directories would lose untracked files in them:\n"
-"%s"
-msgstr ""
-
-#: unpack-trees.c:138
-#, c-format
-msgid ""
-"Refusing to remove the current working directory:\n"
-"%s"
-msgstr ""
-
-#: unpack-trees.c:142
-#, c-format
-msgid ""
-"The following untracked working tree files would be removed by checkout:\n"
-"%%sPlease move or remove them before you switch branches."
-msgstr ""
-
-#: unpack-trees.c:144
-#, c-format
-msgid ""
-"The following untracked working tree files would be removed by checkout:\n"
-"%%s"
-msgstr ""
-
-#: unpack-trees.c:147
-#, c-format
-msgid ""
-"The following untracked working tree files would be removed by merge:\n"
-"%%sPlease move or remove them before you merge."
-msgstr ""
-
-#: unpack-trees.c:149
-#, c-format
-msgid ""
-"The following untracked working tree files would be removed by merge:\n"
-"%%s"
-msgstr ""
-
-#: unpack-trees.c:152
-#, c-format
-msgid ""
-"The following untracked working tree files would be removed by %s:\n"
-"%%sPlease move or remove them before you %s."
-msgstr ""
-
-#: unpack-trees.c:154
-#, c-format
-msgid ""
-"The following untracked working tree files would be removed by %s:\n"
-"%%s"
-msgstr ""
-
-#: unpack-trees.c:160
-#, c-format
-msgid ""
-"The following untracked working tree files would be overwritten by "
-"checkout:\n"
-"%%sPlease move or remove them before you switch branches."
-msgstr ""
-
-#: unpack-trees.c:162
-#, c-format
-msgid ""
-"The following untracked working tree files would be overwritten by "
-"checkout:\n"
-"%%s"
-msgstr ""
-
-#: unpack-trees.c:165
-#, c-format
-msgid ""
-"The following untracked working tree files would be overwritten by merge:\n"
-"%%sPlease move or remove them before you merge."
-msgstr ""
-
-#: unpack-trees.c:167
-#, c-format
-msgid ""
-"The following untracked working tree files would be overwritten by merge:\n"
-"%%s"
-msgstr ""
-
-#: unpack-trees.c:170
-#, c-format
-msgid ""
-"The following untracked working tree files would be overwritten by %s:\n"
-"%%sPlease move or remove them before you %s."
-msgstr ""
-
-#: unpack-trees.c:172
-#, c-format
-msgid ""
-"The following untracked working tree files would be overwritten by %s:\n"
-"%%s"
-msgstr ""
-
-#: unpack-trees.c:180
-#, c-format
-msgid "Entry '%s' overlaps with '%s'.  Cannot bind."
-msgstr ""
-
-#: unpack-trees.c:183
-#, c-format
-msgid ""
-"Cannot update submodule:\n"
-"%s"
-msgstr ""
-
-#: unpack-trees.c:186
-#, c-format
-msgid ""
-"The following paths are not up to date and were left despite sparse "
-"patterns:\n"
-"%s"
-msgstr ""
-
-#: unpack-trees.c:188
-#, c-format
-msgid ""
-"The following paths are unmerged and were left despite sparse patterns:\n"
-"%s"
-msgstr ""
-
-#: unpack-trees.c:190
-#, c-format
-msgid ""
-"The following paths were already present and thus not updated despite sparse "
-"patterns:\n"
-"%s"
-msgstr ""
-
-#: unpack-trees.c:270
-#, c-format
-msgid "Aborting\n"
-msgstr ""
-
-#: unpack-trees.c:297
-#, c-format
-msgid ""
-"After fixing the above paths, you may want to run `git sparse-checkout "
-"reapply`.\n"
-msgstr ""
-
-#: unpack-trees.c:358
-msgid "Updating files"
-msgstr ""
-
-#: unpack-trees.c:390
-msgid ""
-"the following paths have collided (e.g. case-sensitive paths\n"
-"on a case-insensitive filesystem) and only one from the same\n"
-"colliding group is in the working tree:\n"
-msgstr ""
-
-#: unpack-trees.c:1664
-msgid "Updating index flags"
-msgstr ""
-
-#: unpack-trees.c:2925
-#, c-format
-msgid "worktree and untracked commit have duplicate entries: %s"
-msgstr ""
-
-#: upload-pack.c:1579
-msgid "expected flush after fetch arguments"
-msgstr "bilasan diharapkan setelah argumen pengambilan"
-
-#: urlmatch.c:163
-msgid "invalid URL scheme name or missing '://' suffix"
-msgstr ""
-
-#: urlmatch.c:187 urlmatch.c:346 urlmatch.c:405
-#, c-format
-msgid "invalid %XX escape sequence"
-msgstr ""
-
-#: urlmatch.c:215
-msgid "missing host and scheme is not 'file:'"
-msgstr ""
-
-#: urlmatch.c:232
-msgid "a 'file:' URL may not have a port number"
-msgstr ""
-
-#: urlmatch.c:247
-msgid "invalid characters in host name"
-msgstr ""
-
-#: urlmatch.c:292 urlmatch.c:303
-msgid "invalid port number"
-msgstr ""
-
-#: urlmatch.c:371
-msgid "invalid '..' path segment"
-msgstr ""
-
-#: walker.c:170
-msgid "Fetching objects"
-msgstr ""
-
-#: worktree.c:237 builtin/am.c:2210 builtin/bisect--helper.c:156
-#, c-format
-msgid "failed to read '%s'"
-msgstr "gagal membaca '%s'"
-
-#: worktree.c:304
-#, c-format
-msgid "'%s' at main working tree is not the repository directory"
-msgstr "'%s' pada pohon kerja utama bukan direktori repositori"
-
-#: worktree.c:315
-#, c-format
-msgid "'%s' file does not contain absolute path to the working tree location"
-msgstr "berkas '%s' tidak berisi jalur absolut ke lokasi pohon kerja"
-
-#: worktree.c:327
-#, c-format
-msgid "'%s' does not exist"
-msgstr "'%s' tidak ada"
-
-#: worktree.c:333
-#, c-format
-msgid "'%s' is not a .git file, error code %d"
-msgstr "'%s' bukan berkas .git, kode error %d"
-
-#: worktree.c:342
-#, c-format
-msgid "'%s' does not point back to '%s'"
-msgstr "'%s' tidak menunjuk kembali ke '%s'"
-
-#: worktree.c:600
-msgid "not a directory"
-msgstr "bukan direktori"
-
-#: worktree.c:609
-msgid ".git is not a file"
-msgstr ".git bukan berkas"
-
-#: worktree.c:611
-msgid ".git file broken"
-msgstr "berkas .git rusak"
-
-#: worktree.c:613
-msgid ".git file incorrect"
-msgstr "berkas .git salah"
-
-#: worktree.c:719
-msgid "not a valid path"
-msgstr "bukan jalur valid"
-
-#: worktree.c:725
-msgid "unable to locate repository; .git is not a file"
-msgstr "tidak dapat menempatkan repositori; .git bukan berkas"
-
-#: worktree.c:729
-msgid "unable to locate repository; .git file does not reference a repository"
-msgstr ""
-"tidak dapat menempatkan repositori; berkas .git tidak merujuk repositori"
-
-#: worktree.c:733
-msgid "unable to locate repository; .git file broken"
-msgstr "tidak dapat menempatkan repositori; berkas .git rusak"
-
-#: worktree.c:739
-msgid "gitdir unreadable"
-msgstr "gitdir tidak dapat dibaca"
-
-#: worktree.c:743
-msgid "gitdir incorrect"
-msgstr "gitdir salah"
-
-#: worktree.c:768
-msgid "not a valid directory"
-msgstr "bukan direktori valid"
-
-#: worktree.c:774
-msgid "gitdir file does not exist"
-msgstr "berkas gitdir tidak ada"
-
-#: worktree.c:779 worktree.c:788
-#, c-format
-msgid "unable to read gitdir file (%s)"
-msgstr "tidak dapat membaca berkas gitdir (%s)"
-
-#: worktree.c:798
-#, c-format
-msgid "short read (expected %<PRIuMAX> bytes, read %<PRIuMAX>)"
-msgstr "baca singkat (diharapkan %<PRIuMAX> bita, terbaca %<PRIuMAX>)"
-
-#: worktree.c:806
-msgid "invalid gitdir file"
-msgstr "berkas gitdir tidak valid"
-
-#: worktree.c:814
-msgid "gitdir file points to non-existent location"
-msgstr "berkas gitdir menunjuk ke lokasi yang tidak ada"
-
-#: worktree.c:830
-#, c-format
-msgid "unable to set %s in '%s'"
-msgstr "tidak dapat menyetel %s di '%s'"
-
-#: worktree.c:832
-#, c-format
-msgid "unable to unset %s in '%s'"
-msgstr "tidak dapat menyetel balik %s di '%s'"
-
-#: worktree.c:852
-msgid "failed to set extensions.worktreeConfig setting"
-msgstr "gagal menyetel setelan extensions.worktreeConfig"
-
-#: wrapper.c:161
-#, c-format
-msgid "could not setenv '%s'"
-msgstr ""
-
-#: wrapper.c:213
-#, c-format
-msgid "unable to create '%s'"
-msgstr "tidak dapat membuat '%s'"
-
-#: wrapper.c:215 wrapper.c:385
-#, c-format
-msgid "could not open '%s' for reading and writing"
-msgstr ""
-
-#: wrapper.c:416 wrapper.c:683
-#, c-format
-msgid "unable to access '%s'"
-msgstr ""
-
-#: wrapper.c:691
-msgid "unable to get current working directory"
-msgstr ""
-
-#: wt-status.c:158
-msgid "Unmerged paths:"
-msgstr "Jalur yang tak tergabung:"
-
-#: wt-status.c:187 wt-status.c:219
-msgid "  (use \"git restore --staged <file>...\" to unstage)"
-msgstr "  (gunakan \"git restore --staged <berkas>...\" untuk menggelar balik)"
-
-#: wt-status.c:190 wt-status.c:222
-#, c-format
-msgid "  (use \"git restore --source=%s --staged <file>...\" to unstage)"
-msgstr ""
-"  (gunakan \"git restore --source=%s --staged <berkas>..\" untuk menggelar "
-"balik)"
-
-#: wt-status.c:193 wt-status.c:225
-msgid "  (use \"git rm --cached <file>...\" to unstage)"
-msgstr "  (gunakan \"git rm --cached <berkas>...\" untuk menggelar balik)"
-
-#: wt-status.c:197
-msgid "  (use \"git add <file>...\" to mark resolution)"
-msgstr "  (gunakan \"git add <berkas>...\" untuk menandai penyelesaian)"
-
-#: wt-status.c:199 wt-status.c:203
-msgid "  (use \"git add/rm <file>...\" as appropriate to mark resolution)"
-msgstr ""
-"  (gunakan \"git add/rm <berkas>...\" sebagaimana mestinya untuk menandai "
-"penyelesaian)"
-
-#: wt-status.c:201
-msgid "  (use \"git rm <file>...\" to mark resolution)"
-msgstr "  (gunakan \"git rm <berkas>\" untuk menandai penyelesaian)"
-
-#: wt-status.c:211 wt-status.c:1140
-msgid "Changes to be committed:"
-msgstr "Perubahan yang akan dikomit:"
-
-#: wt-status.c:234 wt-status.c:1149
-msgid "Changes not staged for commit:"
-msgstr "Perubahan yang tidak digelar untuk komit:"
-
-#: wt-status.c:238
-msgid "  (use \"git add <file>...\" to update what will be committed)"
-msgstr ""
-"  (gunakan \"git add <berkas>...\" untuk memperbarui apa yang akan dikomit)"
-
-#: wt-status.c:240
-msgid "  (use \"git add/rm <file>...\" to update what will be committed)"
-msgstr ""
-"  (gunakan \"git add/rm <berkas>...\" untuk memperbarui apa yang akan "
-"dikomit)"
-
-#: wt-status.c:241
-msgid ""
-"  (use \"git restore <file>...\" to discard changes in working directory)"
-msgstr ""
-"  (gunakan \"git restore <berkas>...\" untuk membuang perubahan di direktori "
-"kerja)"
-
-#: wt-status.c:243
-msgid "  (commit or discard the untracked or modified content in submodules)"
-msgstr ""
-"  (komit atau buang konten yang tak dilacak atau diubah dalam submodul)"
-
-#: wt-status.c:254
-#, c-format
-msgid "  (use \"git %s <file>...\" to include in what will be committed)"
-msgstr "  (use \"git %s <berkas>...\" untuk menyertakan apa yang akan dikomit)"
-
-#: wt-status.c:266
-msgid "both deleted:"
-msgstr "kedua-duanya dihapus:"
-
-#: wt-status.c:268
-msgid "added by us:"
-msgstr "ditambahkan oleh kami:"
-
-#: wt-status.c:270
-msgid "deleted by them:"
-msgstr "dihapus oleh mereka:"
-
-#: wt-status.c:272
-msgid "added by them:"
-msgstr "ditambahkan oleh mereka:"
-
-#: wt-status.c:274
-msgid "deleted by us:"
-msgstr "dihapus oleh kami:"
-
-#: wt-status.c:276
-msgid "both added:"
-msgstr "kedua-duanya ditambah:"
-
-#: wt-status.c:278
-msgid "both modified:"
-msgstr "kedua-duanya diubah:"
-
-#: wt-status.c:288
-msgid "new file:"
-msgstr "berkas baru:"
-
-#: wt-status.c:290
-msgid "copied:"
-msgstr "tersalin:"
-
-#: wt-status.c:292
-msgid "deleted:"
-msgstr "terhapus:"
-
-#: wt-status.c:294
-msgid "modified:"
-msgstr "terubah:"
-
-#: wt-status.c:296
-msgid "renamed:"
-msgstr "terganti nama:"
-
-#: wt-status.c:298
-msgid "typechange:"
-msgstr "tipe perubahan:"
-
-#: wt-status.c:300
-msgid "unknown:"
-msgstr "tidak diketahui:"
-
-#: wt-status.c:302
-msgid "unmerged:"
-msgstr "tidak digabung:"
-
-#: wt-status.c:382
-msgid "new commits, "
-msgstr "komit baru, "
-
-#: wt-status.c:384
-msgid "modified content, "
-msgstr "konten yang dimodifikasi, "
-
-#: wt-status.c:386
-msgid "untracked content, "
-msgstr "konten yang tak dilacak, "
-
-#: wt-status.c:973
-#, c-format
-msgid "Your stash currently has %d entry"
-msgid_plural "Your stash currently has %d entries"
-msgstr[0] "Simpanan Anda saat ini ada %d entri"
-msgstr[1] "Simpanan Anda saat ini ada %d entri"
-
-#: wt-status.c:1004
-msgid "Submodules changed but not updated:"
-msgstr "Submodul berubah tapi tak diperbarui:"
-
-#: wt-status.c:1006
-msgid "Submodule changes to be committed:"
-msgstr "Perubahan submodul yang akan dikomit:"
-
-#: wt-status.c:1088
-msgid ""
-"Do not modify or remove the line above.\n"
-"Everything below it will be ignored."
-msgstr ""
-"Jangan ubah atau hapus baris diatas.\n"
-"Semua dibawahnya akan diabaikan."
-
-#: wt-status.c:1180
-#, c-format
-msgid ""
-"\n"
-"It took %.2f seconds to compute the branch ahead/behind values.\n"
-"You can use '--no-ahead-behind' to avoid this.\n"
-msgstr ""
-"\n"
-"Butuh %.2f detik untuk menghitung cabang di depan/di belakang nilai.\n"
-"Anda bisa gunakan '--no-ahead-behind' untuk menghindari hal tersebut.\n"
-
-#: wt-status.c:1210
-msgid "You have unmerged paths."
-msgstr "Anda punya jalur yang tak tergabung."
-
-#: wt-status.c:1213
-msgid "  (fix conflicts and run \"git commit\")"
-msgstr "  (selesaikan konflik dan jalankan \"git commit\")"
-
-#: wt-status.c:1215
-msgid "  (use \"git merge --abort\" to abort the merge)"
-msgstr "  (gunakan \"git merge --abort\" untuk membatalkan penggabungan)"
-
-#: wt-status.c:1219
-msgid "All conflicts fixed but you are still merging."
-msgstr "Semua konflik sudah selesai tapi Anda masih menggabungkan."
-
-#: wt-status.c:1222
-msgid "  (use \"git commit\" to conclude merge)"
-msgstr "  (gunakan \"git commit\" untuk mengakhiri penggabungan)"
-
-#: wt-status.c:1233
-msgid "You are in the middle of an am session."
-msgstr "Anda berada ditengah-tengah sesi am."
-
-#: wt-status.c:1236
-msgid "The current patch is empty."
-msgstr "Jalur saat ini kosong"
-
-#: wt-status.c:1241
-msgid "  (fix conflicts and then run \"git am --continue\")"
-msgstr "  (selesaikan konflik lalu jalankan \"git am --continue\")"
-
-#: wt-status.c:1243
-msgid "  (use \"git am --skip\" to skip this patch)"
-msgstr "  (gunakan \"git am --skip\" untuk lewati tambalan ini)"
-
-#: wt-status.c:1246
-msgid ""
-"  (use \"git am --allow-empty\" to record this patch as an empty commit)"
-msgstr ""
-"  (gunakan \"git am --allow-empty\" untuk merekam tambalan ini sebagai komit "
-"kosong)"
-
-#: wt-status.c:1248
-msgid "  (use \"git am --abort\" to restore the original branch)"
-msgstr "  (gunakan \"git am --abort\" untuk mengembalikan cabang asal)"
-
-#: wt-status.c:1381
-msgid "git-rebase-todo is missing."
-msgstr "git-rebase-todo hilang."
-
-#: wt-status.c:1383
-msgid "No commands done."
-msgstr "Tidak ada perintah selesai."
-
-#: wt-status.c:1386
-#, c-format
-msgid "Last command done (%<PRIuMAX> command done):"
-msgid_plural "Last commands done (%<PRIuMAX> commands done):"
-msgstr[0] "Perintah yang selesai (%<PRIuMAX> perintah):"
-msgstr[1] "Perintah yang selesai (%<PRIuMAX> perintah):"
-
-#: wt-status.c:1397
-#, c-format
-msgid "  (see more in file %s)"
-msgstr "  (lihat lebih lanjut di berkas %s)"
-
-#: wt-status.c:1402
-msgid "No commands remaining."
-msgstr "Tidak ada perintah yang tersisa."
-
-#: wt-status.c:1405
-#, c-format
-msgid "Next command to do (%<PRIuMAX> remaining command):"
-msgid_plural "Next commands to do (%<PRIuMAX> remaining commands):"
-msgstr[0] "Perintah berikutnya (%<PRIuMAX> perintah tersisa):"
-msgstr[1] "Perintah berikutnya (%<PRIuMAX> perintah tersisa):"
-
-#: wt-status.c:1413
-msgid "  (use \"git rebase --edit-todo\" to view and edit)"
-msgstr "  (gunakan \"git rebase --edit-todo\" untuk lihat dan sunting)"
-
-#: wt-status.c:1425
-#, c-format
-msgid "You are currently rebasing branch '%s' on '%s'."
-msgstr "Anda sedang mendasarkan ulang cabang '%s' pada '%s'."
-
-#: wt-status.c:1430
-msgid "You are currently rebasing."
-msgstr "Anda sedang mendasarkan ulang."
-
-#: wt-status.c:1443
-msgid "  (fix conflicts and then run \"git rebase --continue\")"
-msgstr "  (selesaikan konflik lalu jalankan \"git rebase --continue\")"
-
-#: wt-status.c:1445
-msgid "  (use \"git rebase --skip\" to skip this patch)"
-msgstr "  (gunakan \"git rebase --skip\" untuk lewati tambalan ini)"
-
-#: wt-status.c:1447
-msgid "  (use \"git rebase --abort\" to check out the original branch)"
-msgstr "  (gunakan \"git rebase --abort\" untuk check out cabang asal)"
-
-#: wt-status.c:1454
-msgid "  (all conflicts fixed: run \"git rebase --continue\")"
-msgstr "  (semua konflik sudah selesai: jalankan \"git rebase --continue\")"
-
-#: wt-status.c:1458
-#, c-format
-msgid ""
-"You are currently splitting a commit while rebasing branch '%s' on '%s'."
-msgstr ""
-"Anda sedang membelah komit saat mendasarkan ulang cabang '%s' pada '%s'."
-
-#: wt-status.c:1463
-msgid "You are currently splitting a commit during a rebase."
-msgstr "Anda sedang membelah komit saat mendasarkan ulang."
-
-#: wt-status.c:1466
-msgid "  (Once your working directory is clean, run \"git rebase --continue\")"
-msgstr ""
-"  (Setelah direktori kerja Anda bersih, jalankan \"git rebase --continue\")"
-
-#: wt-status.c:1470
-#, c-format
-msgid "You are currently editing a commit while rebasing branch '%s' on '%s'."
-msgstr ""
-"Anda sedang menyunting komit saat mendasarkan ulang cabang '%s' pada '%s'."
-
-#: wt-status.c:1475
-msgid "You are currently editing a commit during a rebase."
-msgstr "Anda sedang menyunting komit saat mendasarkan ulang."
-
-#: wt-status.c:1478
-msgid "  (use \"git commit --amend\" to amend the current commit)"
-msgstr "  (gunakan \"git commit --amend\" untuk mengubah komit saat ini)"
-
-#: wt-status.c:1480
-msgid ""
-"  (use \"git rebase --continue\" once you are satisfied with your changes)"
-msgstr ""
-"  (gunakan \"git rebase --continue\" begitu Anda puas dengan perubahan Anda)"
-
-#: wt-status.c:1491
-msgid "Cherry-pick currently in progress."
-msgstr "Petik ceri sedang berjalan."
-
-#: wt-status.c:1494
-#, c-format
-msgid "You are currently cherry-picking commit %s."
-msgstr "Anda sedang memetik ceri komit %s."
-
-#: wt-status.c:1501
-msgid "  (fix conflicts and run \"git cherry-pick --continue\")"
-msgstr "  (selesaikan konflik dan jalankan \"git cherry-pick --continue\")"
-
-#: wt-status.c:1504
-msgid "  (run \"git cherry-pick --continue\" to continue)"
-msgstr "  (jalankan \"git cherry-pick --continue\" untuk melanjutkan)"
-
-#: wt-status.c:1507
-msgid "  (all conflicts fixed: run \"git cherry-pick --continue\")"
-msgstr ""
-"  (semua konflik sudah selesai: jalankan \"git cherry-pick --continue\")"
-
-#: wt-status.c:1509
-msgid "  (use \"git cherry-pick --skip\" to skip this patch)"
-msgstr "  (gunakan \"git cherry-pick --skip\" untuk lewati tambalan ini)"
-
-#: wt-status.c:1511
-msgid "  (use \"git cherry-pick --abort\" to cancel the cherry-pick operation)"
-msgstr ""
-"  (gunakan \"git cherry-pick --abort\" untuk membatalkan operasi petik ceri)"
-
-#: wt-status.c:1521
-msgid "Revert currently in progress."
-msgstr "Pengembalian sedang berjalang."
-
-#: wt-status.c:1524
-#, c-format
-msgid "You are currently reverting commit %s."
-msgstr "Anda sedang mengembalikan komit %s."
-
-#: wt-status.c:1530
-msgid "  (fix conflicts and run \"git revert --continue\")"
-msgstr "  (selesaikan konflik dan jalankan \"git revert --continue\")"
-
-#: wt-status.c:1533
-msgid "  (run \"git revert --continue\" to continue)"
-msgstr "  (jalankan \"git revert --continue\" untuk melanjutkan)"
-
-#: wt-status.c:1536
-msgid "  (all conflicts fixed: run \"git revert --continue\")"
-msgstr "  (semua konflik sudah selesai: jalankan \"git revert --continue\")"
-
-#: wt-status.c:1538
-msgid "  (use \"git revert --skip\" to skip this patch)"
-msgstr "  (gunakan \"git revert --skip\" untuk lewati tambalan ini)"
-
-#: wt-status.c:1540
-msgid "  (use \"git revert --abort\" to cancel the revert operation)"
-msgstr ""
-"  (gunakan \"git revert --abort\" untuk membatalkan operasi pengembalian)"
-
-#: wt-status.c:1550
-#, c-format
-msgid "You are currently bisecting, started from branch '%s'."
-msgstr "Anda sedang membagi dua, dimulai dari cabang '%s'."
-
-#: wt-status.c:1554
-msgid "You are currently bisecting."
-msgstr "Anda sedang membagi dua."
-
-#: wt-status.c:1557
-msgid "  (use \"git bisect reset\" to get back to the original branch)"
-msgstr "  (gunakan \"git bisect reset\" untuk kembali ke cabang asal)"
-
-#: wt-status.c:1568
-msgid "You are in a sparse checkout."
-msgstr "Anda berada dalam checkout tipis."
-
-#: wt-status.c:1571
-#, c-format
-msgid "You are in a sparse checkout with %d%% of tracked files present."
-msgstr "Anda berada dalam checkout tipis dengan %d%% berkas terlacak ada."
-
-#: wt-status.c:1815
-msgid "On branch "
-msgstr "Pada cabang "
-
-#: wt-status.c:1822
-msgid "interactive rebase in progress; onto "
-msgstr "sedang mendasarkan ulang interaktif; ke "
-
-#: wt-status.c:1824
-msgid "rebase in progress; onto "
-msgstr "sedang mendasarkan ulang; ke "
-
-#: wt-status.c:1829
-msgid "HEAD detached at "
-msgstr ""
-
-#: wt-status.c:1831
-msgid "HEAD detached from "
-msgstr ""
-
-#: wt-status.c:1834
-msgid "Not currently on any branch."
-msgstr "Tidak sedang berada pada cabang apapun."
-
-#: wt-status.c:1851
-msgid "Initial commit"
-msgstr "Komit awal"
-
-#: wt-status.c:1852
-msgid "No commits yet"
-msgstr "Tidak ada komit"
-
-#: wt-status.c:1866
-msgid "Untracked files"
-msgstr "Berkas tak terlacak"
-
-#: wt-status.c:1868
-msgid "Ignored files"
-msgstr "Berkas yang diabaikan"
-
-#: wt-status.c:1872
-#, c-format
-msgid ""
-"It took %.2f seconds to enumerate untracked files. 'status -uno'\n"
-"may speed it up, but you have to be careful not to forget to add\n"
-"new files yourself (see 'git help status')."
-msgstr ""
-"Butuh %.2f detik untuk menghitung berkas tak terlacak. 'status -uno'\n"
-"mungkin bisa mempercepat, tapi Anda harus berhati-hati jangan sampai lupa\n"
-"untuk tambahkan berkas baru sendiri (lihat 'git help status')."
-
-#: wt-status.c:1878
-#, c-format
-msgid "Untracked files not listed%s"
-msgstr "Berkas tak terlacak yang tak disebutkan%s"
-
-#: wt-status.c:1880
-msgid " (use -u option to show untracked files)"
-msgstr " (gunakan opsi -u untuk melihat berkas yang tak terlacak)"
-
-#: wt-status.c:1886
-msgid "No changes"
-msgstr "Tidak ada perubahan"
-
-#: wt-status.c:1891
-#, c-format
-msgid "no changes added to commit (use \"git add\" and/or \"git commit -a\")\n"
-msgstr ""
-"tidak ada perubahan untuk dikomit (gunakan \"git add\" dan/atau \"git commit "
-"-a\")\n"
-
-#: wt-status.c:1895
-#, c-format
-msgid "no changes added to commit\n"
-msgstr "tidak ada perubahan untuk dikomit\n"
-
-#: wt-status.c:1899
-#, c-format
-msgid ""
-"nothing added to commit but untracked files present (use \"git add\" to "
-"track)\n"
-msgstr ""
-"tidak ada perubahan untuk dikomit tapi berkas yang tak terlacak ada(gunakan "
-"\"git add\" untuk lacak)\n"
-
-#: wt-status.c:1903
-#, c-format
-msgid "nothing added to commit but untracked files present\n"
-msgstr "tidak ada perubahan untuk dikomit tapi berkas yang tak terlacak ada\n"
-
-#: wt-status.c:1907
-#, c-format
-msgid "nothing to commit (create/copy files and use \"git add\" to track)\n"
-msgstr ""
-"tidak ada yang dikomit (buat/salin berkas dan gunakan \"git add\" untuk "
-"lacak)\n"
-
-#: wt-status.c:1911 wt-status.c:1917
-#, c-format
-msgid "nothing to commit\n"
-msgstr "tidak ada yang dikomit\n"
-
-#: wt-status.c:1914
-#, c-format
-msgid "nothing to commit (use -u to show untracked files)\n"
-msgstr "tidak ada yang dikomit (gunakan -u untuk lihat berkas tak terlacak)\n"
-
-#: wt-status.c:1919
-#, c-format
-msgid "nothing to commit, working tree clean\n"
-msgstr "tidak ada yang dikomit, pohon kerja bersih\n"
-
-#: wt-status.c:2024
-msgid "No commits yet on "
-msgstr "Tidak ada komit apapun pada "
-
-#: wt-status.c:2028
-msgid "HEAD (no branch)"
-msgstr "HEAD (tanpa cabang)"
-
-#: wt-status.c:2059
-msgid "different"
-msgstr "berbeda"
-
-#: wt-status.c:2061 wt-status.c:2069
-msgid "behind "
-msgstr "di belakang "
-
-#: wt-status.c:2064 wt-status.c:2067
-msgid "ahead "
-msgstr "di depan "
-
-#. TRANSLATORS: the action is e.g. "pull with rebase"
-#: wt-status.c:2605
-#, c-format
-msgid "cannot %s: You have unstaged changes."
-msgstr "tidak dapat %s: Anda punya perubahan yang tidak digelar."
-
-#: wt-status.c:2611
-msgid "additionally, your index contains uncommitted changes."
-msgstr "juga indeks Anda berisi perubahan yang belum dikomit."
-
-#: wt-status.c:2613
-#, c-format
-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:205
-msgid "could not send IPC command"
-msgstr ""
-
-#: compat/simple-ipc/ipc-unix-socket.c:212
-msgid "could not read IPC response"
-msgstr ""
-
-#: compat/simple-ipc/ipc-unix-socket.c:892
-#, c-format
-msgid "could not start accept_thread '%s'"
-msgstr ""
-
-#: compat/simple-ipc/ipc-unix-socket.c:904
-#, c-format
-msgid "could not start worker[0] for '%s'"
-msgstr ""
-
-#: compat/precompose_utf8.c:58 builtin/clone.c:353
-#, c-format
-msgid "failed to unlink '%s'"
-msgstr "gagal menghapus tautan '%s'"
-
-#: compat/fsmonitor/fsm-listen-darwin.c:355
-msgid "Unable to create FSEventStream."
-msgstr ""
-
-#: compat/fsmonitor/fsm-listen-darwin.c:403
-msgid "Failed to start the FSEventStream"
-msgstr ""
-
-#: builtin/add.c:26
+#: builtin/add.c
 msgid "git add [<options>] [--] <pathspec>..."
 msgstr "git add [<opsi>] [--] <pathspec>..."
 
-#: builtin/add.c:63
+#: builtin/add.c
 #, c-format
 msgid "cannot chmod %cx '%s'"
 msgstr "tidak dapat chmod %cx '%s'"
 
-#: builtin/add.c:105
+#: builtin/add.c
 #, c-format
 msgid "unexpected diff status %c"
 msgstr "status diff tak diharapkan %c"
 
-#: builtin/add.c:110 builtin/commit.c:299
+#: builtin/add.c builtin/commit.c
 msgid "updating files failed"
 msgstr "gagal memperbarui berkas"
 
-#: builtin/add.c:120
+#: builtin/add.c
 #, c-format
 msgid "remove '%s'\n"
 msgstr "hapus '%s'\n"
 
-#: builtin/add.c:204
+#: builtin/add.c
 msgid "Unstaged changes after refreshing the index:"
 msgstr "Perubahan tak tergelar setelah menyegarkan indeks:"
 
-#: builtin/add.c:312 builtin/rev-parse.c:993
+#: builtin/add.c builtin/rev-parse.c
 msgid "Could not read the index"
 msgstr "Tidak dapat membaca indeks"
 
-#: builtin/add.c:325
+#: builtin/add.c
 msgid "Could not write patch"
 msgstr "Tidak dapat menulis tambalan"
 
-#: builtin/add.c:328
+#: builtin/add.c
 msgid "editing patch failed"
 msgstr "Gagal menyunting tambalan"
 
-#: builtin/add.c:331
+#: builtin/add.c
 #, c-format
 msgid "Could not stat '%s'"
 msgstr "Tidak dapat men-stat '%s'"
 
-#: builtin/add.c:333
+#: builtin/add.c
 msgid "Empty patch. Aborted."
 msgstr "Tambalan kosong. Dibatalkan."
 
-#: builtin/add.c:339
+#: builtin/add.c
 #, c-format
 msgid "Could not apply '%s'"
 msgstr "Tidak dapat terapkan '%s'"
 
-#: builtin/add.c:347
+#: builtin/add.c
 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:367 builtin/clean.c:927 builtin/fetch.c:175 builtin/mv.c:124
-#: builtin/prune-packed.c:14 builtin/pull.c:208 builtin/push.c:550
-#: builtin/remote.c:1454 builtin/rm.c:244 builtin/send-pack.c:194
+#: builtin/add.c builtin/clean.c builtin/fetch.c builtin/mv.c
+#: builtin/prune-packed.c builtin/pull.c builtin/push.c builtin/remote.c
+#: builtin/rm.c builtin/send-pack.c
 msgid "dry run"
 msgstr "latihan"
 
-#: builtin/add.c:368 builtin/check-ignore.c:22 builtin/commit.c:1483
-#: builtin/count-objects.c:98 builtin/fsck.c:789 builtin/log.c:2338
-#: builtin/mv.c:123 builtin/read-tree.c:120
+#: builtin/add.c builtin/check-ignore.c builtin/commit.c
+#: builtin/count-objects.c builtin/fsck.c builtin/log.c builtin/mv.c
+#: builtin/read-tree.c
 msgid "be verbose"
 msgstr "jadi berkata-kata"
 
-#: builtin/add.c:370
+#: builtin/add.c
 msgid "interactive picking"
 msgstr "pengambilan interaktif"
 
-#: builtin/add.c:371 builtin/checkout.c:1599 builtin/reset.c:417
+#: builtin/add.c builtin/checkout.c builtin/reset.c
 msgid "select hunks interactively"
 msgstr "pilih bingkah secara interaktif"
 
-#: builtin/add.c:372
+#: builtin/add.c
 msgid "edit current diff and apply"
 msgstr "sunting diff saat ini dan terapkan"
 
-#: builtin/add.c:373
+#: builtin/add.c
 msgid "allow adding otherwise ignored files"
 msgstr "perbolehkan tambah berkas yang diabaikan"
 
-#: builtin/add.c:374
+#: builtin/add.c
 msgid "update tracked files"
 msgstr "perbarui berkas terlacak"
 
-#: builtin/add.c:375
+#: builtin/add.c
 msgid "renormalize EOL of tracked files (implies -u)"
 msgstr "normalisasi ulang EOL berkas terlacak (menyiratkan -u)"
 
-#: builtin/add.c:376
+#: builtin/add.c
 msgid "record only the fact that the path will be added later"
 msgstr "rekam hanya fakta bahwa jalur akan ditambahkan nanti"
 
-#: builtin/add.c:377
+#: builtin/add.c
 msgid "add changes from all tracked and untracked files"
 msgstr "tambahkan perubahan dari semua berkas terlacak dan tak terlacak"
 
-#: builtin/add.c:380
+#: builtin/add.c
 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:382
+#: builtin/add.c
 msgid "don't add, only refresh the index"
 msgstr "jangan tambahkan, hanya segarkan indeks"
 
-#: builtin/add.c:383
+#: builtin/add.c
 msgid "just skip files which cannot be added because of errors"
 msgstr "hanya lewatkan berkas yang tidak dapat ditambah karena error"
 
-#: builtin/add.c:384
+#: builtin/add.c
 msgid "check if - even missing - files are ignored in dry run"
 msgstr "periksa bahwa berkas yang - bahkan hilang - diabaikan dalam latihan"
 
-#: builtin/add.c:385 builtin/mv.c:128 builtin/rm.c:251
+#: builtin/add.c builtin/mv.c builtin/rm.c
 msgid "allow updating entries outside of the sparse-checkout cone"
 msgstr "perbolehkan perbarui entri di luar kerucut checkout tipis"
 
-#: builtin/add.c:387 builtin/update-index.c:1023
+#: builtin/add.c builtin/update-index.c
 msgid "override the executable bit of the listed files"
 msgstr "timpa bit yang dapat dieksekusi dari berkas terdaftar"
 
-#: builtin/add.c:389
+#: builtin/add.c
 msgid "warn when adding an embedded repository"
 msgstr "peringatkan ketika menambahkan repositori tertanam"
 
-#: builtin/add.c:407
+#: builtin/add.c
 #, c-format
 msgid ""
 "You've added another git repository inside your current repository.\n"
@@ -10561,42 +2198,42 @@ msgstr ""
 "\n"
 "Lihat \"git help submodule\" untuk selengkapnya."
 
-#: builtin/add.c:436
+#: builtin/add.c
 #, c-format
 msgid "adding embedded git repository: %s"
 msgstr "menambahkan repositori git tertanam: %s"
 
-#: builtin/add.c:456
+#: builtin/add.c
 msgid ""
 "Use -f if you really want to add them.\n"
 "Turn this message off by running\n"
 "\"git config advice.addIgnoredFile false\""
 msgstr ""
-"Gunakan -f jika Anda benar-benar ingin tambahkan itu.\n"
+"Gunakan -f jika Anda benar-benar ingin menambahkannya.\n"
 "Matikan pesan ini dengan menjalankan\n"
 "\"git config advice.addIgnoredFile false\""
 
-#: builtin/add.c:471
+#: builtin/add.c
 msgid "adding files failed"
 msgstr "gagal menambahkan berkas"
 
-#: builtin/add.c:534
+#: builtin/add.c
 #, c-format
 msgid "--chmod param '%s' must be either -x or +x"
 msgstr "--chmod param '%s' harus berupa -x atau +x"
 
-#: builtin/add.c:555 builtin/checkout.c:1770 builtin/commit.c:365
-#: builtin/reset.c:436 builtin/rm.c:275 builtin/stash.c:1702
+#: builtin/add.c builtin/checkout.c builtin/commit.c builtin/reset.c
+#: builtin/rm.c builtin/stash.c
 #, c-format
 msgid "'%s' and pathspec arguments cannot be used together"
 msgstr "'%s' dan argumen spek jalur tidak dapat digunakan bersamaan"
 
-#: builtin/add.c:566
+#: builtin/add.c
 #, c-format
 msgid "Nothing specified, nothing added.\n"
 msgstr "Tidak ada yang disebutkan, tidak ada yang ditambahkan.\n"
 
-#: builtin/add.c:568
+#: builtin/add.c
 msgid ""
 "Maybe you wanted to say 'git add .'?\n"
 "Turn this message off by running\n"
@@ -10606,116 +2243,160 @@ msgstr ""
 "Matikan pesan ini dengan menjalankan\n"
 "\"git config advice.addEmptyPathspec false\""
 
-#: builtin/am.c:393
+#: builtin/add.c builtin/check-ignore.c builtin/checkout.c builtin/clean.c
+#: builtin/commit.c builtin/diff-tree.c builtin/grep.c builtin/mv.c
+#: builtin/reset.c builtin/rm.c builtin/submodule--helper.c read-cache.c
+#: rerere.c submodule.c
+msgid "index file corrupt"
+msgstr ""
+
+#: builtin/am.c builtin/mailinfo.c mailinfo.c
+#, c-format
+msgid "bad action '%s' for '%s'"
+msgstr ""
+
+#: builtin/am.c builtin/blame.c builtin/fetch.c builtin/pack-objects.c
+#: builtin/pull.c diff-merges.c gpg-interface.c ls-refs.c parallel-checkout.c
+#: sequencer.c setup.c
+#, c-format
+msgid "invalid value for '%s': '%s'"
+msgstr ""
+
+#: builtin/am.c builtin/commit.c builtin/merge.c sequencer.c
+#, c-format
+msgid "could not read '%s'"
+msgstr "tidak dapat membaca '%s'"
+
+#: builtin/am.c
 msgid "could not parse author script"
 msgstr "tidak dapat mengurai skrip pengarang"
 
-#: builtin/am.c:483
+#: builtin/am.c builtin/replace.c commit.c sequencer.c
+#, c-format
+msgid "could not parse %s"
+msgstr ""
+
+#: builtin/am.c
 #, c-format
 msgid "'%s' was deleted by the applypatch-msg hook"
 msgstr "'%s' dihapus oleh kail applypatch-msg"
 
-#: builtin/am.c:525
+#: builtin/am.c
 #, c-format
 msgid "Malformed input line: '%s'."
 msgstr "Baris masukan salah format: '%s'."
 
-#: builtin/am.c:563
+#: builtin/am.c
 #, c-format
 msgid "Failed to copy notes from '%s' to '%s'"
 msgstr "Gagal menyalin catatan dari '%s' ke '%s'"
 
-#: builtin/am.c:589
+#: builtin/am.c
 msgid "fseek failed"
 msgstr "fseek gagal"
 
-#: builtin/am.c:777
+#: builtin/am.c builtin/rebase.c sequencer.c wrapper.c
+#, c-format
+msgid "could not open '%s' for reading"
+msgstr "tidak dapat membuka '%s' untuk dibaca"
+
+#: builtin/am.c builtin/rebase.c strbuf.c wrapper.c
+#, c-format
+msgid "could not open '%s' for writing"
+msgstr "tidak dapat membuka '%s' untuk ditulis"
+
+#: builtin/am.c
 #, c-format
 msgid "could not parse patch '%s'"
 msgstr "tidak dapat mengurai tambalan '%s'"
 
-#: builtin/am.c:842
+#: builtin/am.c
 msgid "Only one StGIT patch series can be applied at once"
 msgstr "Hanya satu rangkaian tambalan StGIT yang bisa diterapkan sekaligus"
 
-#: builtin/am.c:890
+#: builtin/am.c
 msgid "invalid timestamp"
 msgstr "stempel waktu tidak valid"
 
-#: builtin/am.c:895 builtin/am.c:907
+#: builtin/am.c
 msgid "invalid Date line"
 msgstr "baris Date tidak valid"
 
-#: builtin/am.c:902
+#: builtin/am.c
 msgid "invalid timezone offset"
 msgstr "offset zona waktu tidak valid"
 
-#: builtin/am.c:995
+#: builtin/am.c
 msgid "Patch format detection failed."
 msgstr "Pendeteksian format tambalan gagal."
 
-#: builtin/am.c:1000 builtin/clone.c:306
+#: builtin/am.c builtin/clone.c
 #, c-format
 msgid "failed to create directory '%s'"
 msgstr "gagal membuat direktori '%s'"
 
-#: builtin/am.c:1005
+#: builtin/am.c
 msgid "Failed to split patches."
 msgstr "Gagal memecah tambalan."
 
-#: builtin/am.c:1154
+#: builtin/am.c
 #, c-format
 msgid "When you have resolved this problem, run \"%s --continue\"."
 msgstr "Saat Anda sudah menyelesaikan masalah ini, jalankan \"%s --continue\"."
 
-#: builtin/am.c:1155
+#: builtin/am.c
 #, 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:1160
+#: builtin/am.c
 #, c-format
 msgid "To record the empty patch as an empty commit, run \"%s --allow-empty\"."
 msgstr ""
 "Untuk merekam tambalan kosong sebagai komit kosong, jalankan \"%s --allow-"
 "empty\"."
 
-#: builtin/am.c:1162
+#: builtin/am.c
 #, 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:1257
+#: builtin/am.c
 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:1345
+#: builtin/am.c
 #, c-format
 msgid "missing author line in commit %s"
 msgstr "baris pengarang hilang dalam komit %s"
 
-#: builtin/am.c:1348
+#: builtin/am.c
 #, c-format
 msgid "invalid ident line: %.*s"
 msgstr "baris identitas tidak valid: %.*s"
 
-#: builtin/am.c:1567
+#: builtin/am.c builtin/checkout.c builtin/clone.c commit-graph.c
+#, c-format
+msgid "unable to parse commit %s"
+msgstr ""
+
+#: builtin/am.c
 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:1569
+#: builtin/am.c
 msgid "Using index info to reconstruct a base tree..."
 msgstr "Menggunakan info indeks untuk membangun ulang sebuah pohon dasar..."
 
-#: builtin/am.c:1588
+#: builtin/am.c
 msgid ""
 "Did you hand edit your patch?\n"
 "It does not apply to blobs recorded in its index."
@@ -10723,24 +2404,33 @@ msgstr ""
 "Apakah Anda menyunting tambalan Anda?\n"
 "Itu tidak diterapkan ke blob yang direkam dalam indeksnya."
 
-#: builtin/am.c:1594
+#: builtin/am.c
 msgid "Falling back to patching base and 3-way merge..."
 msgstr "Mundur ke penambalan dasar dan penggabungan 3 arah..."
 
-#: builtin/am.c:1620
+#: builtin/am.c
 msgid "Failed to merge in the changes."
 msgstr "Gagal menggabungkan perubahan."
 
-#: builtin/am.c:1652
+#: builtin/am.c builtin/merge.c sequencer.c
+msgid "git write-tree failed to write a tree"
+msgstr "git write-tree gagal menulis sebuah pohon"
+
+#: builtin/am.c
 msgid "applying to an empty history"
 msgstr "menerapkan ke sebuah riwayat kosong"
 
-#: builtin/am.c:1704 builtin/am.c:1708
+#: builtin/am.c builtin/commit.c builtin/merge.c sequencer.c
+#: t/helper/test-fast-rebase.c
+msgid "failed to write commit object"
+msgstr "gagal menulis objek komit"
+
+#: builtin/am.c
 #, c-format
 msgid "cannot resume: %s does not exist."
 msgstr "tidak dapat melanjutkan: %s tidak ada."
 
-#: builtin/am.c:1726
+#: builtin/am.c
 msgid "Commit Body is:"
 msgstr "Badan komit adalah:"
 
@@ -10748,59 +2438,59 @@ msgstr "Badan komit adalah:"
 #. in your translation. The program will only accept English
 #. input at this point.
 #.
-#: builtin/am.c:1736
+#: builtin/am.c
 #, 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:1782 builtin/commit.c:410
+#: builtin/am.c builtin/commit.c
 msgid "unable to write index file"
 msgstr "tidak dapat menulis berkas indeks"
 
-#: builtin/am.c:1786
+#: builtin/am.c
 #, c-format
 msgid "Dirty index: cannot apply patches (dirty: %s)"
 msgstr "Indeks kotor: tidak dapat menerapkan tambalan (kotor: %s)"
 
-#: builtin/am.c:1828
+#: builtin/am.c
 #, c-format
 msgid "Skipping: %.*s"
 msgstr "Melewatkan: %.*s"
 
-#: builtin/am.c:1833
+#: builtin/am.c
 #, c-format
 msgid "Creating an empty commit: %.*s"
 msgstr "Membuat sebuah komit kosong: %.*s"
 
-#: builtin/am.c:1837
+#: builtin/am.c
 msgid "Patch is empty."
 msgstr "Tambalan kosong."
 
-#: builtin/am.c:1848 builtin/am.c:1917
+#: builtin/am.c
 #, c-format
 msgid "Applying: %.*s"
 msgstr "Menerapkan: %.*s"
 
-#: builtin/am.c:1865
+#: builtin/am.c
 msgid "No changes -- Patch already applied."
 msgstr "Tidak ada perubahan -- tambalan sudah diterapkan"
 
-#: builtin/am.c:1871
+#: builtin/am.c
 #, c-format
 msgid "Patch failed at %s %.*s"
 msgstr "Penambalan gagal pada %s %.*s"
 
-#: builtin/am.c:1875
+#: builtin/am.c
 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:1921
+#: builtin/am.c
 msgid "No changes - recorded it as an empty commit."
 msgstr "Tidak ada perubahan - direkam sebagai komit kosong."
 
-#: builtin/am.c:1923
+#: builtin/am.c
 msgid ""
 "No changes - did you forget to use 'git add'?\n"
 "If there is nothing left to stage, chances are that something else\n"
@@ -10810,7 +2500,7 @@ msgstr ""
 "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:1931
+#: builtin/am.c
 msgid ""
 "You still have unmerged paths in your index.\n"
 "You should 'git add' each file with resolved conflicts to mark them as "
@@ -10823,17 +2513,21 @@ msgstr ""
 "Anda mungkin jalankan `git rm` pada berkas untuk menerima \"penghapusan oleh "
 "mereka\" untuk itu."
 
-#: builtin/am.c:2039 builtin/am.c:2043 builtin/am.c:2055 builtin/reset.c:455
-#: builtin/reset.c:463
+#: builtin/am.c builtin/checkout.c builtin/clone.c builtin/stash.c merge.c
+#: rerere.c
+msgid "unable to write new index file"
+msgstr "gagal menulis berkas indeks baru"
+
+#: builtin/am.c builtin/reset.c
 #, c-format
 msgid "Could not parse object '%s'."
 msgstr "Tidak dapat mengurai objek '%s'."
 
-#: builtin/am.c:2091 builtin/am.c:2167
+#: builtin/am.c
 msgid "failed to clean index"
 msgstr "gagal membersihkan indeks"
 
-#: builtin/am.c:2135
+#: builtin/am.c
 msgid ""
 "You seem to have moved HEAD since the last 'am' failure.\n"
 "Not rewinding to ORIG_HEAD"
@@ -10841,159 +2535,156 @@ msgstr ""
 "Sepertinya Anda telah memindahkan HEAD sejak kegagalan 'am' terakhir.\n"
 "Tidak memutar ulang ke ORIG_HEAD"
 
-#: builtin/am.c:2292
+#: builtin/am.c builtin/bisect--helper.c worktree.c
+#, c-format
+msgid "failed to read '%s'"
+msgstr "gagal membaca '%s'"
+
+#: builtin/am.c
 #, c-format
 msgid "options '%s=%s' and '%s=%s' cannot be used together"
 msgstr "Opsi '%s=%s' dan '%s=%s' tidak dapat digunakan bersamaan"
 
-#: builtin/am.c:2323
+#: builtin/am.c
 msgid "git am [<options>] [(<mbox> | <Maildir>)...]"
 msgstr "git am [<opsi>] [(<mbox> | <Maildir>)...]"
 
-#: builtin/am.c:2324
+#: builtin/am.c
 msgid "git am [<options>] (--continue | --skip | --abort)"
 msgstr "git am [<opsi>] (--continue | --skip | --abort)"
 
-#: builtin/am.c:2330
+#: builtin/am.c
 msgid "run interactively"
 msgstr "jalankan secara interaktif"
 
-#: builtin/am.c:2332
+#: builtin/am.c
 msgid "historical option -- no-op"
 msgstr "opsi bersejarah -- no-op"
 
-#: builtin/am.c:2334
+#: builtin/am.c
 msgid "allow fall back on 3way merging if needed"
 msgstr "perbolehkan mundur ke penggabungan 3 arah jika diperlukan"
 
-#: builtin/am.c:2335 builtin/init-db.c:547 builtin/prune-packed.c:16
-#: builtin/repack.c:646 builtin/stash.c:946
+#: builtin/am.c builtin/init-db.c builtin/prune-packed.c builtin/repack.c
+#: builtin/stash.c
 msgid "be quiet"
 msgstr "jadi senyap"
 
-#: builtin/am.c:2337
+#: builtin/am.c
 msgid "add a Signed-off-by trailer to the commit message"
 msgstr "tambahkan trailer Signed-off-by kepada pesan komit"
 
-#: builtin/am.c:2340
+#: builtin/am.c
 msgid "recode into utf8 (default)"
 msgstr "koding ulang ke dalam utf8 (asali)"
 
-#: builtin/am.c:2342
+#: builtin/am.c
 msgid "pass -k flag to git-mailinfo"
 msgstr "lewatkan opsi -k ke git-mailinfo"
 
-#: builtin/am.c:2344
+#: builtin/am.c
 msgid "pass -b flag to git-mailinfo"
 msgstr "lewatkan opsi -b ke git-mailinfo"
 
-#: builtin/am.c:2346
+#: builtin/am.c
 msgid "pass -m flag to git-mailinfo"
 msgstr "lewatkan opsi -m ke git-mailinfo"
 
-#: builtin/am.c:2348
+#: builtin/am.c
 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:2351
+#: builtin/am.c
 msgid "do not pass --keep-cr flag to git-mailsplit independent of am.keepcr"
 msgstr ""
 "jangan lewatkan opsi --keep-cr ke git-mailsplit tak bergantung pada am.keepcr"
 
-#: builtin/am.c:2354
+#: builtin/am.c
 msgid "strip everything before a scissors line"
 msgstr "copot semuanya sebelum garis gunting"
 
-#: builtin/am.c:2356
+#: builtin/am.c
 msgid "pass it through git-mailinfo"
 msgstr "lewatkannya melalui git-mailinfo"
 
-#: builtin/am.c:2359 builtin/am.c:2362 builtin/am.c:2365 builtin/am.c:2368
-#: builtin/am.c:2371 builtin/am.c:2374 builtin/am.c:2377 builtin/am.c:2380
-#: builtin/am.c:2386
+#: builtin/am.c
 msgid "pass it through git-apply"
 msgstr "lewatkannya melalui git-apply"
 
-#: builtin/am.c:2376 builtin/commit.c:1514 builtin/fmt-merge-msg.c:18
-#: builtin/fmt-merge-msg.c:21 builtin/grep.c:920 builtin/merge.c:263
-#: builtin/pull.c:142 builtin/pull.c:204 builtin/pull.c:221
-#: builtin/rebase.c:1074 builtin/repack.c:657 builtin/repack.c:661
-#: builtin/repack.c:663 builtin/show-branch.c:650 builtin/show-ref.c:172
-#: builtin/tag.c:446 parse-options.h:159 parse-options.h:180
-#: parse-options.h:348
+#: builtin/am.c builtin/commit.c builtin/fmt-merge-msg.c builtin/grep.c
+#: builtin/merge.c builtin/pull.c builtin/rebase.c builtin/repack.c
+#: builtin/show-branch.c builtin/show-ref.c builtin/tag.c parse-options.h
 msgid "n"
 msgstr "n"
 
-#: builtin/am.c:2382 builtin/branch.c:695 builtin/bugreport.c:109
-#: builtin/cat-file.c:848 builtin/cat-file.c:852 builtin/cat-file.c:856
-#: builtin/for-each-ref.c:41 builtin/ls-tree.c:357 builtin/replace.c:555
-#: builtin/tag.c:480 builtin/verify-tag.c:38
+#: builtin/am.c builtin/branch.c builtin/bugreport.c builtin/cat-file.c
+#: builtin/for-each-ref.c builtin/ls-tree.c builtin/replace.c builtin/tag.c
+#: builtin/verify-tag.c
 msgid "format"
 msgstr "format"
 
-#: builtin/am.c:2383
+#: builtin/am.c
 msgid "format the patch(es) are in"
 msgstr "format tambalan yang ada di"
 
-#: builtin/am.c:2389
+#: builtin/am.c
 msgid "override error message when patch failure occurs"
 msgstr "timpa pesan error ketika kegagalan penambalan terjadi"
 
-#: builtin/am.c:2391
+#: builtin/am.c
 msgid "continue applying patches after resolving a conflict"
 msgstr "lanjutkan penerapan tambalan setelah menyelesaikan konflik"
 
-#: builtin/am.c:2394
+#: builtin/am.c
 msgid "synonyms for --continue"
 msgstr "sinonim untuk --continue"
 
-#: builtin/am.c:2397
+#: builtin/am.c
 msgid "skip the current patch"
 msgstr "lewati tambalan saat ini"
 
-#: builtin/am.c:2400
+#: builtin/am.c
 msgid "restore the original branch and abort the patching operation"
 msgstr "kembalikan cabang asli dan batalkan operasi penambalan"
 
-#: builtin/am.c:2403
+#: builtin/am.c
 msgid "abort the patching operation but keep HEAD where it is"
 msgstr "batalkan operasi penambalan tetapi simpan HEAD dimanapun itu"
 
-#: builtin/am.c:2407
+#: builtin/am.c
 msgid "show the patch being applied"
 msgstr "perlihatkan tambalan yang diterapkan"
 
-#: builtin/am.c:2411
+#: builtin/am.c
 msgid "record the empty patch as an empty commit"
 msgstr "rekam tambalan kosong sebagai komit kosong"
 
-#: builtin/am.c:2415
+#: builtin/am.c
 msgid "lie about committer date"
 msgstr "berbohong soal tanggal pengkomit"
 
-#: builtin/am.c:2417
+#: builtin/am.c
 msgid "use current timestamp for author date"
 msgstr "gunakan stempel waktu saat ini untuk tanggal pengarang"
 
-#: builtin/am.c:2419 builtin/commit-tree.c:118 builtin/commit.c:1642
-#: builtin/merge.c:302 builtin/pull.c:179 builtin/rebase.c:1127
-#: builtin/revert.c:117 builtin/tag.c:461
+#: builtin/am.c builtin/commit-tree.c builtin/commit.c builtin/merge.c
+#: builtin/pull.c builtin/rebase.c builtin/revert.c builtin/tag.c
 msgid "key-id"
 msgstr "key-id"
 
-#: builtin/am.c:2420 builtin/rebase.c:1128
+#: builtin/am.c builtin/rebase.c
 msgid "GPG-sign commits"
 msgstr "tandatangani komit dengan GPG"
 
-#: builtin/am.c:2423
+#: builtin/am.c
 msgid "how to handle empty patches"
 msgstr "bagaimana cara menangani tambalan kosong"
 
-#: builtin/am.c:2426
+#: builtin/am.c
 msgid "(internal use for git-rebase)"
 msgstr "(penggunaan internal untuk git-rebase)"
 
-#: builtin/am.c:2444
+#: builtin/am.c
 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."
@@ -11001,17 +2692,17 @@ 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:2451
+#: builtin/am.c
 msgid "failed to read the index"
 msgstr "gagal membaca indeks"
 
-#: builtin/am.c:2466
+#: builtin/am.c
 #, 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:2490
+#: builtin/am.c
 #, c-format
 msgid ""
 "Stray %s directory found.\n"
@@ -11020,48 +2711,48 @@ msgstr ""
 "Direktori menyimpang %s ditemukan.\n"
 "Gunakan \"git am --abort\" untuk menghapusnya."
 
-#: builtin/am.c:2496
+#: builtin/am.c
 msgid "Resolve operation not in progress, we are not resuming."
 msgstr "Operasi penguraian tidak berjalan, kami tidak melanjutkan."
 
-#: builtin/am.c:2506
+#: builtin/am.c
 msgid "interactive mode requires patches on the command line"
 msgstr "mode interaktif butuh tambalan pada baris perintah"
 
-#: builtin/apply.c:8
+#: builtin/apply.c
 msgid "git apply [<options>] [<patch>...]"
 msgstr "git apply [<opsi>] [<tambalan>...]"
 
-#: builtin/archive.c:18
+#: builtin/archive.c contrib/scalar/scalar.c
 msgid "could not redirect output"
 msgstr "tidak dapat mengalihkan keluaran"
 
-#: builtin/archive.c:35
+#: builtin/archive.c
 msgid "git archive: Remote with no URL"
 msgstr "git archive: Remote tanpa URL"
 
-#: builtin/archive.c:59
+#: builtin/archive.c
 msgid "git archive: expected ACK/NAK, got a flush packet"
 msgstr "git archive: ACK/NAK diharapkan, dapat paket bilasan"
 
-#: builtin/archive.c:62
+#: builtin/archive.c
 #, c-format
 msgid "git archive: NACK %s"
 msgstr "git archive: NACK %s"
 
-#: builtin/archive.c:63
+#: builtin/archive.c
 msgid "git archive: protocol error"
 msgstr "git archive: kesalahan protokol"
 
-#: builtin/archive.c:67
+#: builtin/archive.c
 msgid "git archive: expected a flush"
 msgstr "git archive: sebuah bilasan diharapkan"
 
-#: builtin/bisect--helper.c:24
+#: builtin/bisect--helper.c
 msgid "git bisect--helper --bisect-reset [<commit>]"
 msgstr "git bisect--helper --bisect-reset [<komit>]"
 
-#: builtin/bisect--helper.c:26
+#: builtin/bisect--helper.c
 msgid ""
 "git bisect--helper --bisect-start [--term-{new,bad}=<term> --term-{old,good}"
 "=<term>] [--no-checkout] [--first-parent] [<bad> [<good>...]] [--] "
@@ -11071,98 +2762,98 @@ msgstr ""
 "good}=<istilah>] [--no-checkout] [--first-parent] [<jelek> [<bagus>...]] "
 "[--] [<jalur>...]"
 
-#: builtin/bisect--helper.c:29
+#: builtin/bisect--helper.c
 msgid "git bisect--helper --bisect-state (bad|new) [<rev>]"
 msgstr "git bisect--helper --bisect-state (bad|new) [<revisi>]"
 
-#: builtin/bisect--helper.c:30
+#: builtin/bisect--helper.c
 msgid "git bisect--helper --bisect-state (good|old) [<rev>...]"
 msgstr "git bisect--helper --bisect-state (good|old) [<revisi>...]"
 
-#: builtin/bisect--helper.c:31
+#: builtin/bisect--helper.c
 msgid "git bisect--helper --bisect-replay <filename>"
 msgstr "git bisect--helper --bisect-replay <nama berkas>"
 
-#: builtin/bisect--helper.c:32
+#: builtin/bisect--helper.c
 msgid "git bisect--helper --bisect-skip [(<rev>|<range>)...]"
 msgstr "git bisect--helper --bisect-skip [(<revisi>|<rentang>)...]"
 
-#: builtin/bisect--helper.c:34
+#: builtin/bisect--helper.c
 msgid "git bisect--helper --bisect-run <cmd>..."
 msgstr "git bisect--helper --bisect-run <perintah>..."
 
-#: builtin/bisect--helper.c:109
+#: builtin/bisect--helper.c
 #, c-format
 msgid "cannot open file '%s' in mode '%s'"
 msgstr "tidak dapat membuka berkas '%s' dalam mode '%s'"
 
-#: builtin/bisect--helper.c:116
+#: builtin/bisect--helper.c
 #, c-format
 msgid "could not write to file '%s'"
 msgstr "tidak dapat menulis ke berkas '%s'"
 
-#: builtin/bisect--helper.c:154
+#: builtin/bisect--helper.c
 #, c-format
 msgid "cannot open file '%s' for reading"
 msgstr "tidak dapat membuka berkas '%s' untuk dibaca"
 
-#: builtin/bisect--helper.c:170
+#: builtin/bisect--helper.c
 #, c-format
 msgid "'%s' is not a valid term"
 msgstr "'%s' bukan istilah yang valid"
 
-#: builtin/bisect--helper.c:174
+#: builtin/bisect--helper.c
 #, 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:184
+#: builtin/bisect--helper.c
 #, c-format
 msgid "can't change the meaning of the term '%s'"
 msgstr "tidak dapat mengubah makna istilah '%s'"
 
-#: builtin/bisect--helper.c:194
+#: builtin/bisect--helper.c
 msgid "please use two different terms"
 msgstr "mohon gunakan dua istilah yang berbeda"
 
-#: builtin/bisect--helper.c:210
+#: builtin/bisect--helper.c
 #, c-format
 msgid "We are not bisecting.\n"
 msgstr "Kami tidak sedang membagi dua.\n"
 
-#: builtin/bisect--helper.c:218
+#: builtin/bisect--helper.c
 #, c-format
 msgid "'%s' is not a valid commit"
 msgstr "'%s' bukan sebuah komit yang valid"
 
-#: builtin/bisect--helper.c:227
+#: builtin/bisect--helper.c
 #, 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:271
+#: builtin/bisect--helper.c
 #, c-format
 msgid "Bad bisect_write argument: %s"
 msgstr "argument bisect_write jelek: %s"
 
-#: builtin/bisect--helper.c:276
+#: builtin/bisect--helper.c
 #, c-format
 msgid "couldn't get the oid of the rev '%s'"
 msgstr "tidak dapat mendapatkan oid revisi '%s'"
 
-#: builtin/bisect--helper.c:288
+#: builtin/bisect--helper.c
 #, c-format
 msgid "couldn't open the file '%s'"
 msgstr "tidak dapat membuka berkas '%s'"
 
-#: builtin/bisect--helper.c:314
+#: builtin/bisect--helper.c
 #, 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:341
+#: builtin/bisect--helper.c
 #, c-format
 msgid ""
 "You need to give me at least one %s and %s revision.\n"
@@ -11171,7 +2862,7 @@ msgstr ""
 "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:345
+#: builtin/bisect--helper.c
 #, c-format
 msgid ""
 "You need to start by \"git bisect start\".\n"
@@ -11182,7 +2873,7 @@ msgstr ""
 "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:365
+#: builtin/bisect--helper.c
 #, c-format
 msgid "bisecting only with a %s commit"
 msgstr "membagi dua hanya dengan sebuah komit %s"
@@ -11191,15 +2882,30 @@ msgstr "membagi dua hanya dengan sebuah komit %s"
 #. translation. The program will only accept English input
 #. at this point.
 #.
-#: builtin/bisect--helper.c:373
+#: builtin/bisect--helper.c
 msgid "Are you sure [Y/n]? "
 msgstr "Anda yakin [Y/n]?"
 
-#: builtin/bisect--helper.c:434
+#: builtin/bisect--helper.c
+msgid "status: waiting for both good and bad commits\n"
+msgstr "status: menunggu komit bagus dan jelek\n"
+
+#: builtin/bisect--helper.c
+#, c-format
+msgid "status: waiting for bad commit, %d good commit known\n"
+msgid_plural "status: waiting for bad commit, %d good commits known\n"
+msgstr[0] "status: menunggu komit jelek, %d komit bagus diketahui\n"
+msgstr[1] "status: menunggu komit jelek, %d komit bagus diketahui\n"
+
+#: builtin/bisect--helper.c
+msgid "status: waiting for good commit(s), bad commit known\n"
+msgstr "status: menunggu komit bagus, komit jelek diketahui\n"
+
+#: builtin/bisect--helper.c
 msgid "no terms defined"
 msgstr "tidak ada istilah yang didefinisikan"
 
-#: builtin/bisect--helper.c:437
+#: builtin/bisect--helper.c
 #, c-format
 msgid ""
 "Your current terms are %s for the old state\n"
@@ -11208,7 +2914,7 @@ msgstr ""
 "Istilah Anda saat ini adalah %s untuk keadaan lama\n"
 "dan %s untuk keadaan baru.\n"
 
-#: builtin/bisect--helper.c:447
+#: builtin/bisect--helper.c
 #, c-format
 msgid ""
 "invalid argument %s for 'git bisect terms'.\n"
@@ -11217,52 +2923,52 @@ msgstr ""
 "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:514 builtin/bisect--helper.c:1038
+#: builtin/bisect--helper.c
 msgid "revision walk setup failed\n"
 msgstr "setup jalan revisi gagal\n"
 
-#: builtin/bisect--helper.c:536
+#: builtin/bisect--helper.c
 #, c-format
 msgid "could not open '%s' for appending"
 msgstr "tidak dapat membuka '%s' untuk menambahkan"
 
-#: builtin/bisect--helper.c:655 builtin/bisect--helper.c:668
+#: builtin/bisect--helper.c
 msgid "'' is not a valid term"
 msgstr "'' bukan istilah yang valid"
 
-#: builtin/bisect--helper.c:678
+#: builtin/bisect--helper.c
 #, c-format
 msgid "unrecognized option: '%s'"
 msgstr "opsi tidak dikenal: '%s'"
 
-#: builtin/bisect--helper.c:682
+#: builtin/bisect--helper.c
 #, c-format
 msgid "'%s' does not appear to be a valid revision"
 msgstr "'%s' sepertinya bukan revisi valid"
 
-#: builtin/bisect--helper.c:713
+#: builtin/bisect--helper.c
 msgid "bad HEAD - I need a HEAD"
 msgstr "HEAD jelek - saya butuh HEAD"
 
-#: builtin/bisect--helper.c:728
+#: builtin/bisect--helper.c
 #, 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:749
+#: builtin/bisect--helper.c
 msgid "won't bisect on cg-seek'ed tree"
 msgstr "tidak akan membagi dua pada pohon yang di-cg-seek"
 
-#: builtin/bisect--helper.c:752
+#: builtin/bisect--helper.c
 msgid "bad HEAD - strange symbolic ref"
 msgstr "HEAD jelek - referensi simbolik aneh"
 
-#: builtin/bisect--helper.c:772
+#: builtin/bisect--helper.c
 #, c-format
 msgid "invalid ref: '%s'"
 msgstr "referensi tidak valid: '%s'"
 
-#: builtin/bisect--helper.c:830
+#: builtin/bisect--helper.c
 msgid "You need to start by \"git bisect start\"\n"
 msgstr "Anda perlu memulai dengan \"git bisect start\"\n"
 
@@ -11270,87 +2976,87 @@ msgstr "Anda perlu memulai dengan \"git bisect start\"\n"
 #. translation. The program will only accept English input
 #. at this point.
 #.
-#: builtin/bisect--helper.c:841
+#: builtin/bisect--helper.c
 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:859
+#: builtin/bisect--helper.c
 msgid "Please call `--bisect-state` with at least one argument"
 msgstr "Mohon panggil `--bisect-state` dengan setidaknya satu argumen"
 
-#: builtin/bisect--helper.c:872
+#: builtin/bisect--helper.c
 #, c-format
 msgid "'git bisect %s' can take only one argument."
 msgstr "'git bisect %s' hanya dapat mengambil satu argumen."
 
-#: builtin/bisect--helper.c:884 builtin/bisect--helper.c:897
+#: builtin/bisect--helper.c
 #, c-format
 msgid "Bad rev input: %s"
 msgstr "Masukan revisi jelek: %s"
 
-#: builtin/bisect--helper.c:904
+#: builtin/bisect--helper.c
 #, c-format
 msgid "Bad rev input (not a commit): %s"
 msgstr "Masukan revisi jelek (bukan sebuah komit): %s"
 
-#: builtin/bisect--helper.c:936
+#: builtin/bisect--helper.c
 msgid "We are not bisecting."
 msgstr "Kami tidak sedang membagi dua."
 
-#: builtin/bisect--helper.c:986
+#: builtin/bisect--helper.c
 #, c-format
 msgid "'%s'?? what are you talking about?"
 msgstr "'%s'?? Anda bilang tentang apa?"
 
-#: builtin/bisect--helper.c:998
+#: builtin/bisect--helper.c
 #, c-format
 msgid "cannot read file '%s' for replaying"
 msgstr "tidak dapat membuka berkas '%s' untuk memainkan ulang"
 
-#: builtin/bisect--helper.c:1120 builtin/bisect--helper.c:1152
+#: builtin/bisect--helper.c
 #, c-format
 msgid "running %s\n"
 msgstr "menjalankan %s\n"
 
-#: builtin/bisect--helper.c:1145 builtin/bisect--helper.c:1335
+#: builtin/bisect--helper.c
 msgid "bisect run failed: no command provided."
 msgstr "bisect run gagal: tidak ada perintah yang diberikan"
 
-#: builtin/bisect--helper.c:1166
+#: builtin/bisect--helper.c
 #, c-format
 msgid "unable to verify '%s' on good revision"
 msgstr "tidak dapat memverifikasi '%s' pada revisi bagus"
 
-#: builtin/bisect--helper.c:1172
+#: builtin/bisect--helper.c
 #, c-format
 msgid "bogus exit code %d for good revision"
 msgstr "kode keluar gadungan %d untuk revisi bagu"
 
-#: builtin/bisect--helper.c:1180
+#: builtin/bisect--helper.c
 #, 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:1195
+#: builtin/bisect--helper.c
 #, c-format
 msgid "cannot open file '%s' for writing"
 msgstr "tidak dapat membuka berkas '%s' untuk ditulis"
 
-#: builtin/bisect--helper.c:1213
+#: builtin/bisect--helper.c
 msgid "bisect run cannot continue any more"
 msgstr "bisect run tidak dapat dilanjutkan lagi"
 
-#: builtin/bisect--helper.c:1215
+#: builtin/bisect--helper.c
 #, c-format
 msgid "bisect run success"
 msgstr "bisect run sukses"
 
-#: builtin/bisect--helper.c:1218
+#: builtin/bisect--helper.c
 #, c-format
 msgid "bisect found first bad commit"
 msgstr "pembagian dua menemukan komit jelek pertama"
 
-#: builtin/bisect--helper.c:1221
+#: builtin/bisect--helper.c
 #, c-format
 msgid ""
 "bisect run failed: 'git bisect--helper --bisect-state %s' exited with error "
@@ -11359,218 +3065,215 @@ msgstr ""
 "bisect run gagal: 'git bisect--helper --bisect-state %s' keluar dengan kode "
 "keluar %d"
 
-#: builtin/bisect--helper.c:1253
+#: builtin/bisect--helper.c
 msgid "reset the bisection state"
 msgstr "setel ulang keadaan pembagian dua"
 
-#: builtin/bisect--helper.c:1255
+#: builtin/bisect--helper.c
 msgid "check whether bad or good terms exist"
 msgstr "periksa apakah ada istilah jelek atau bagus"
 
-#: builtin/bisect--helper.c:1257
+#: builtin/bisect--helper.c
 msgid "print out the bisect terms"
 msgstr "cetak istilah pembagian dua"
 
-#: builtin/bisect--helper.c:1259
+#: builtin/bisect--helper.c
 msgid "start the bisect session"
 msgstr "mulai sesi pembagian dua"
 
-#: builtin/bisect--helper.c:1261
+#: builtin/bisect--helper.c
 msgid "find the next bisection commit"
 msgstr "temukan komit pembagian dua berikutnya"
 
-#: builtin/bisect--helper.c:1263
+#: builtin/bisect--helper.c
 msgid "mark the state of ref (or refs)"
 msgstr "tandai keadaan referensi"
 
-#: builtin/bisect--helper.c:1265
+#: builtin/bisect--helper.c
 msgid "list the bisection steps so far"
 msgstr "daftar langkah pembagian dua sejauh ini"
 
-#: builtin/bisect--helper.c:1267
+#: builtin/bisect--helper.c
 msgid "replay the bisection process from the given file"
 msgstr "mainkan ulang proses pembagian dua dari berkas yang diberikan"
 
-#: builtin/bisect--helper.c:1269
+#: builtin/bisect--helper.c
 msgid "skip some commits for checkout"
 msgstr "lewati beberapa komit untuk checkout"
 
-#: builtin/bisect--helper.c:1271
+#: builtin/bisect--helper.c
 msgid "visualize the bisection"
 msgstr "visualisasikan pembagian dua"
 
-#: builtin/bisect--helper.c:1273
+#: builtin/bisect--helper.c
 msgid "use <cmd>... to automatically bisect"
 msgstr "gunakan <cmd>... untuk bagi dua otomatis."
 
-#: builtin/bisect--helper.c:1275
+#: builtin/bisect--helper.c
 msgid "no log for BISECT_WRITE"
 msgstr "tidak ada log untuk BISECT_WRITE"
 
-#: builtin/bisect--helper.c:1290
+#: builtin/bisect--helper.c
 msgid "--bisect-reset requires either no argument or a commit"
 msgstr "--bisect-reset butuh baik tanpa argumen atau sebuah komit"
 
-#: builtin/bisect--helper.c:1295
+#: builtin/bisect--helper.c
 msgid "--bisect-terms requires 0 or 1 argument"
 msgstr "--bisect-terms butuh 0 atau 1 argumen"
 
-#: builtin/bisect--helper.c:1304
+#: builtin/bisect--helper.c
 msgid "--bisect-next requires 0 arguments"
 msgstr "--bisect-next butuh 0 argumen"
 
-#: builtin/bisect--helper.c:1315
+#: builtin/bisect--helper.c
 msgid "--bisect-log requires 0 arguments"
 msgstr "--bisect-log butuh 0 argumen"
 
-#: builtin/bisect--helper.c:1320
+#: builtin/bisect--helper.c
 msgid "no logfile given"
 msgstr "tidak ada berkas log yang diberikan"
 
-#: builtin/blame.c:32
+#: builtin/blame.c
 msgid "git blame [<options>] [<rev-opts>] [<rev>] [--] <file>"
 msgstr "git blame [<opsi>] [<opsi revisi>] [<revisi>] [--] <berkas>"
 
-#: builtin/blame.c:37
+#: builtin/blame.c
 msgid "<rev-opts> are documented in git-rev-list(1)"
 msgstr "<opsi revisi> didokumentasikan dalam git-rev-list(1)"
 
-#: builtin/blame.c:406
+#: builtin/blame.c
 #, c-format
 msgid "expecting a color: %s"
 msgstr "mengharapkan warna: %s"
 
-#: builtin/blame.c:413
+#: builtin/blame.c
 msgid "must end with a color"
 msgstr "harus berakhir dengan warna"
 
-#: builtin/blame.c:842
+#: builtin/blame.c
 #, c-format
 msgid "cannot find revision %s to ignore"
 msgstr "tidak dapat menemukan revisi %s untuk diabaikan"
 
-#: builtin/blame.c:864
+#: builtin/blame.c
 msgid "show blame entries as we find them, incrementally"
 msgstr "perlihatkan entri penyalahan seperti yang kami temukan secara bertahap"
 
-#: builtin/blame.c:865
+#: builtin/blame.c
 msgid "do not show object names of boundary commits (Default: off)"
 msgstr "jangan perlihatkan nama objek dari komit perbatasan (asali: off)"
 
-#: builtin/blame.c:866
+#: builtin/blame.c
 msgid "do not treat root commits as boundaries (Default: off)"
 msgstr "jangan perlakukan komit akar sebagai perbatasan (asali: off)"
 
-#: builtin/blame.c:867
+#: builtin/blame.c
 msgid "show work cost statistics"
 msgstr "perlihatkan statistik biaya usaha"
 
-#: builtin/blame.c:868 builtin/checkout.c:1554 builtin/clone.c:98
-#: builtin/commit-graph.c:75 builtin/commit-graph.c:228 builtin/fetch.c:181
-#: builtin/merge.c:301 builtin/multi-pack-index.c:103
-#: builtin/multi-pack-index.c:154 builtin/multi-pack-index.c:180
-#: builtin/multi-pack-index.c:208 builtin/pull.c:120 builtin/push.c:566
-#: builtin/remote.c:683 builtin/send-pack.c:202
+#: builtin/blame.c builtin/checkout.c builtin/clone.c builtin/commit-graph.c
+#: builtin/fetch.c builtin/merge.c builtin/multi-pack-index.c builtin/pull.c
+#: builtin/push.c builtin/remote.c builtin/send-pack.c
 msgid "force progress reporting"
 msgstr "paksa laporkan perkembangan"
 
-#: builtin/blame.c:869
+#: builtin/blame.c
 msgid "show output score for blame entries"
 msgstr "perlihatkan nilai keluaran untuk entri penyalahan"
 
-#: builtin/blame.c:870
+#: builtin/blame.c
 msgid "show original filename (Default: auto)"
 msgstr "perlihatkan nama berkas asli (asali: auto)"
 
-#: builtin/blame.c:871
+#: builtin/blame.c
 msgid "show original linenumber (Default: off)"
 msgstr "perlihatkan nomor baris asli (asali: off)"
 
-#: builtin/blame.c:872
+#: builtin/blame.c
 msgid "show in a format designed for machine consumption"
 msgstr "perlihatkan dalam format yang didesain untuk konsumsi mesin"
 
-#: builtin/blame.c:873
+#: builtin/blame.c
 msgid "show porcelain format with per-line commit information"
 msgstr "perlihatkan format porselen dengan informasi komit per baris"
 
-#: builtin/blame.c:874
+#: builtin/blame.c
 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:875
+#: builtin/blame.c
 msgid "show raw timestamp (Default: off)"
 msgstr "perlihatkan stempel waktu mentah (asali: off)"
 
-#: builtin/blame.c:876
+#: builtin/blame.c
 msgid "show long commit SHA1 (Default: off)"
 msgstr "perlihatkan SHA1 komit panjang (asali: off)"
 
-#: builtin/blame.c:877
+#: builtin/blame.c
 msgid "suppress author name and timestamp (Default: off)"
 msgstr "sembunyikan nama pengarang dan stempel waktu (asali: off)"
 
-#: builtin/blame.c:878
+#: builtin/blame.c
 msgid "show author email instead of name (Default: off)"
 msgstr "perlihatkan email pengarang daripada nama (asali: off)"
 
-#: builtin/blame.c:879
+#: builtin/blame.c
 msgid "ignore whitespace differences"
 msgstr "abaikan perbedaan spasi putih"
 
-#: builtin/blame.c:880 builtin/log.c:1857
+#: builtin/blame.c builtin/log.c
 msgid "rev"
 msgstr "revisi"
 
-#: builtin/blame.c:880
+#: builtin/blame.c
 msgid "ignore <rev> when blaming"
 msgstr "abaikan <revisi> ketika menyalahkan"
 
-#: builtin/blame.c:881
+#: builtin/blame.c
 msgid "ignore revisions from <file>"
 msgstr "abaikan revisi dari <berkas>"
 
-#: builtin/blame.c:882
+#: builtin/blame.c
 msgid "color redundant metadata from previous line differently"
 msgstr "metadata warna berlebihan dari baris sebelumnya secara berbeda"
 
-#: builtin/blame.c:883
+#: builtin/blame.c
 msgid "color lines by age"
 msgstr "warnai baris oleh umur"
 
-#: builtin/blame.c:884
+#: builtin/blame.c
 msgid "spend extra cycles to find better match"
 msgstr "perlihatkan siklus ekstra untuk menemukan cocokan yang lebih baik"
 
-#: builtin/blame.c:885
+#: builtin/blame.c
 msgid "use revisions from <file> instead of calling git-rev-list"
 msgstr "gunakan revisi dari <berkas> daripada memanggil git-rev-list"
 
-#: builtin/blame.c:886
+#: builtin/blame.c
 msgid "use <file>'s contents as the final image"
 msgstr "gunakan konten <berkas> sebagai citra final"
 
-#: builtin/blame.c:887 builtin/blame.c:888
+#: builtin/blame.c
 msgid "score"
 msgstr "nilai"
 
-#: builtin/blame.c:887
+#: builtin/blame.c
 msgid "find line copies within and across files"
 msgstr "temukan salinan baris di dalam dan di seluruh berkas"
 
-#: builtin/blame.c:888
+#: builtin/blame.c
 msgid "find line movements within and across files"
 msgstr "temukan gerakan baris di dalam dan di seluruh baris"
 
-#: builtin/blame.c:889
+#: builtin/blame.c
 msgid "range"
 msgstr "rentang"
 
-#: builtin/blame.c:890
+#: builtin/blame.c
 msgid "process only line range <start>,<end> or function :<funcname>"
 msgstr "hanya proses rentang baris <awal>,<akhir> atau fungsi :<nama fungsi>"
 
-#: builtin/blame.c:949
+#: builtin/blame.c
 msgid "--progress can't be used with --incremental or porcelain formats"
 msgstr ""
 "--progress tidak dapat digunakan dengan --incremental atau format porselen"
@@ -11583,57 +3286,57 @@ msgstr ""
 #. your language may need more or fewer display
 #. columns.
 #.
-#: builtin/blame.c:1000
+#: builtin/blame.c
 msgid "4 years, 11 months ago"
 msgstr "4 tahun, 11 bulan yang lalu"
 
-#: builtin/blame.c:1116
+#: builtin/blame.c
 #, 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:1161
+#: builtin/blame.c
 msgid "Blaming lines"
 msgstr "Menyalahkan baris"
 
-#: builtin/branch.c:29
+#: builtin/branch.c
 msgid "git branch [<options>] [-r | -a] [--merged] [--no-merged]"
 msgstr "git branch [<opsi>] [-r | -a] [--merged] [--no-merged]"
 
-#: builtin/branch.c:30
+#: builtin/branch.c
 msgid ""
 "git branch [<options>] [-f] [--recurse-submodules] <branch-name> [<start-"
 "point>]"
 msgstr ""
 "git branch [<opsi>] [-f] [--recurse-submodules] <nama-cabang> [<titik-awal>]"
 
-#: builtin/branch.c:31
+#: builtin/branch.c
 msgid "git branch [<options>] [-l] [<pattern>...]"
 msgstr "git branch [<opsi>] [-l] [<pola>...]"
 
-#: builtin/branch.c:32
+#: builtin/branch.c
 msgid "git branch [<options>] [-r] (-d | -D) <branch-name>..."
 msgstr "git branch [<opsi> [-r] (-d | -D) <nama-cabang>...]"
 
-#: builtin/branch.c:33
+#: builtin/branch.c
 msgid "git branch [<options>] (-m | -M) [<old-branch>] <new-branch>"
 msgstr "git branch [<opsi>] (-m | -M) [<cabang-lama>] <cabang-baru>"
 
-#: builtin/branch.c:34
+#: builtin/branch.c
 msgid "git branch [<options>] (-c | -C) [<old-branch>] <new-branch>"
 msgstr "git branch [<opsi>] (-c | -C) [<cabang-lama>] <cabang-baru>"
 
-#: builtin/branch.c:35
+#: builtin/branch.c
 msgid "git branch [<options>] [-r | -a] [--points-at]"
 msgstr "git branch [<opsi>] [-r | -a] [--points-at]"
 
-#: builtin/branch.c:36
+#: builtin/branch.c
 msgid "git branch [<options>] [-r | -a] [--format]"
 msgstr "git branch [<opsi>] [-r | -a] [--format]"
 
-#: builtin/branch.c:165
+#: builtin/branch.c
 #, c-format
 msgid ""
 "deleting branch '%s' that has been merged to\n"
@@ -11642,7 +3345,7 @@ msgstr ""
 "menghapus cabang '%s' yang sudah digabungkan ke\n"
 "         '%s', tapi belum digabungkan ke HEAD."
 
-#: builtin/branch.c:169
+#: builtin/branch.c
 #, c-format
 msgid ""
 "not deleting branch '%s' that is not yet merged to\n"
@@ -11651,125 +3354,125 @@ msgstr ""
 "tidak menghapus cabang '%s' yang belum digabungkan ke\n"
 "         '%s', walaupun tergabung ke HEAD."
 
-#: builtin/branch.c:183
+#: builtin/branch.c
 #, c-format
 msgid "Couldn't look up commit object for '%s'"
 msgstr "Tidak dapat mencari objek komit untuk '%s'"
 
-#: builtin/branch.c:187
+#: builtin/branch.c
 #, c-format
 msgid ""
 "The branch '%s' is not fully merged.\n"
 "If you are sure you want to delete it, run 'git branch -D %s'."
 msgstr ""
 "Cabang '%s' belum sepenuhnya tergabung.\n"
-"Kalau Anda yakin ingin menghapus itu, jalankan 'git branch -D %s'."
+"Kalau Anda yakin ingin menghapusnya, jalankan 'git branch -D %s'."
 
-#: builtin/branch.c:200
+#: builtin/branch.c
 msgid "Update of config-file failed"
 msgstr "Pembaruan berkas konfigurasi gagal"
 
-#: builtin/branch.c:235
+#: builtin/branch.c
 msgid "cannot use -a with -d"
 msgstr "tidak dapat gunakan -a dengan -d"
 
-#: builtin/branch.c:242
+#: builtin/branch.c
 msgid "Couldn't look up commit object for HEAD"
 msgstr "Tidak dapat mencari objek komit untuk HEAD"
 
-#: builtin/branch.c:259
+#: builtin/branch.c
 #, c-format
 msgid "Cannot delete branch '%s' checked out at '%s'"
 msgstr "Tidak dapat menghapus cabang '%s' yang ter-checkout pada '%s'"
 
-#: builtin/branch.c:274
+#: builtin/branch.c
 #, c-format
 msgid "remote-tracking branch '%s' not found."
 msgstr "cabang pelacak remote '%s' tidak ditemukan."
 
-#: builtin/branch.c:275
+#: builtin/branch.c
 #, c-format
 msgid "branch '%s' not found."
 msgstr "cabang '%s' tidak ditemukan."
 
-#: builtin/branch.c:306
+#: builtin/branch.c
 #, c-format
 msgid "Deleted remote-tracking branch %s (was %s).\n"
 msgstr "Cabang pelacak remote %s (yaitu %s) dihapus.\n"
 
-#: builtin/branch.c:307
+#: builtin/branch.c
 #, c-format
 msgid "Deleted branch %s (was %s).\n"
 msgstr "Cabang %s (yaitu %s) dihapus.\n"
 
-#: builtin/branch.c:457 builtin/tag.c:64
+#: builtin/branch.c builtin/tag.c
 msgid "unable to parse format string"
 msgstr "tidak dapat menguraikan untai format"
 
-#: builtin/branch.c:488
+#: builtin/branch.c
 msgid "could not resolve HEAD"
 msgstr "tidak dapat menguraikan HEAD"
 
-#: builtin/branch.c:494
+#: builtin/branch.c
 #, c-format
 msgid "HEAD (%s) points outside of refs/heads/"
 msgstr "HEAD (%s) merujuk diluar refs/heads/"
 
-#: builtin/branch.c:509
+#: builtin/branch.c
 #, c-format
 msgid "Branch %s is being rebased at %s"
 msgstr "Cabang %s sedang didasarkan ulang pada %s"
 
-#: builtin/branch.c:513
+#: builtin/branch.c
 #, c-format
 msgid "Branch %s is being bisected at %s"
 msgstr "Cabang %s sedang dibagi dua pada %s"
 
-#: builtin/branch.c:530
+#: builtin/branch.c
 msgid "cannot copy the current branch while not on any."
 msgstr "tidak dapat menyalin cabang saat ini ketika tidak ada."
 
-#: builtin/branch.c:532
+#: builtin/branch.c
 msgid "cannot rename the current branch while not on any."
 msgstr "tidak dapat mengganti nama cabang saat ini ketika tidak ada."
 
-#: builtin/branch.c:543
+#: builtin/branch.c
 #, c-format
 msgid "Invalid branch name: '%s'"
 msgstr "Nama cabang tidak valid: '%s'"
 
-#: builtin/branch.c:572
+#: builtin/branch.c
 msgid "Branch rename failed"
 msgstr "Penggantian nama cabang gagal"
 
-#: builtin/branch.c:574
+#: builtin/branch.c
 msgid "Branch copy failed"
 msgstr "Penyalinan cabang gagal"
 
-#: builtin/branch.c:578
+#: builtin/branch.c
 #, c-format
 msgid "Created a copy of a misnamed branch '%s'"
 msgstr "Salinan cabang salah nama '%s' dibuat"
 
-#: builtin/branch.c:581
+#: builtin/branch.c
 #, c-format
 msgid "Renamed a misnamed branch '%s' away"
 msgstr "Cabang salah nama '%s' berganti nama"
 
-#: builtin/branch.c:587
+#: builtin/branch.c
 #, 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:596
+#: builtin/branch.c
 msgid "Branch is renamed, but update of config-file failed"
 msgstr "Cabang berganti nama, tapi pembaruan berkas konfigurasi gagal"
 
-#: builtin/branch.c:598
+#: builtin/branch.c
 msgid "Branch is copied, but update of config-file failed"
 msgstr "Cabang disalin, tapi pembaruan berkas konfigurasi gagal"
 
-#: builtin/branch.c:614
+#: builtin/branch.c
 #, c-format
 msgid ""
 "Please edit the description for the branch\n"
@@ -11780,147 +3483,148 @@ msgstr ""
 "  %s\n"
 "Baris yang diawali dengan '%c' akan dicopot.\n"
 
-#: builtin/branch.c:651
+#: builtin/branch.c
 msgid "Generic options"
 msgstr "Opsi generik"
 
-#: builtin/branch.c:653
+#: builtin/branch.c
 msgid "show hash and subject, give twice for upstream branch"
 msgstr "perlihatkan hash dan subjek, berikan dua kali untuk cabang hulu"
 
-#: builtin/branch.c:654
+#: builtin/branch.c
 msgid "suppress informational messages"
 msgstr "sembunyikan pesan informasi"
 
-#: builtin/branch.c:656 builtin/checkout.c:1571
-#: builtin/submodule--helper.c:3077
+#: builtin/branch.c builtin/checkout.c builtin/submodule--helper.c
 msgid "set branch tracking configuration"
 msgstr "setel konfigurasi pelacakan cabang"
 
-#: builtin/branch.c:659
+#: builtin/branch.c
 msgid "do not use"
 msgstr "jangan gunakan"
 
-#: builtin/branch.c:661
+#: builtin/branch.c
 msgid "upstream"
 msgstr "hulu"
 
-#: builtin/branch.c:661
+#: builtin/branch.c
 msgid "change the upstream info"
 msgstr "ubah info hulu"
 
-#: builtin/branch.c:662
+#: builtin/branch.c
 msgid "unset the upstream info"
 msgstr "batal-setel info hulu"
 
-#: builtin/branch.c:663
+#: builtin/branch.c
 msgid "use colored output"
 msgstr "gunakan keluaran berwarna"
 
-#: builtin/branch.c:664
+#: builtin/branch.c
 msgid "act on remote-tracking branches"
 msgstr "lakukan pada cabang pelacak remote"
 
-#: builtin/branch.c:666 builtin/branch.c:668
+#: builtin/branch.c
 msgid "print only branches that contain the commit"
 msgstr "cetak hanya cabang yang berisi komit"
 
-#: builtin/branch.c:667 builtin/branch.c:669
+#: builtin/branch.c
 msgid "print only branches that don't contain the commit"
 msgstr "cetak hanya cabang yang tak berisi komit"
 
-#: builtin/branch.c:672
+#: builtin/branch.c
 msgid "Specific git-branch actions:"
 msgstr "Aksi git-branch spesifik:"
 
-#: builtin/branch.c:673
+#: builtin/branch.c
 msgid "list both remote-tracking and local branches"
 msgstr "sebut baik cabang pelacak remote dan cabang lokal"
 
-#: builtin/branch.c:675
+#: builtin/branch.c
 msgid "delete fully merged branch"
 msgstr "hapus cabang yang tergabung sepenuhnya"
 
-#: builtin/branch.c:676
+#: builtin/branch.c
 msgid "delete branch (even if not merged)"
 msgstr "hapus cabang (walaupun tak tergabung)"
 
-#: builtin/branch.c:677
+#: builtin/branch.c
 msgid "move/rename a branch and its reflog"
 msgstr "pindah/ganti nama cabang dan reflog-nya"
 
-#: builtin/branch.c:678
+#: builtin/branch.c
 msgid "move/rename a branch, even if target exists"
 msgstr "pindah/ganti nama cabang, walaupun target ada"
 
-#: builtin/branch.c:679
+#: builtin/branch.c
 msgid "copy a branch and its reflog"
 msgstr "salin cabang dan reflog-nya"
 
-#: builtin/branch.c:680
+#: builtin/branch.c
 msgid "copy a branch, even if target exists"
 msgstr "salin cabang, walapun target ada"
 
-#: builtin/branch.c:681
+#: builtin/branch.c
 msgid "list branch names"
 msgstr "sebut nama cabang"
 
-#: builtin/branch.c:682
+#: builtin/branch.c
 msgid "show current branch name"
 msgstr "perlihatkan nama cabang saat ini"
 
-#: builtin/branch.c:683 builtin/submodule--helper.c:3075
+#: builtin/branch.c builtin/submodule--helper.c
 msgid "create the branch's reflog"
 msgstr "buat reflog cabang"
 
-#: builtin/branch.c:685
+#: builtin/branch.c
 msgid "edit the description for the branch"
 msgstr "sunting deskripsi cabang"
 
-#: builtin/branch.c:686
+#: builtin/branch.c
 msgid "force creation, move/rename, deletion"
 msgstr "paksa buat, pindah/ganti nama, hapus"
 
-#: builtin/branch.c:687
+#: builtin/branch.c
 msgid "print only branches that are merged"
 msgstr "cetak hanya cabang yang tergabung"
 
-#: builtin/branch.c:688
+#: builtin/branch.c
 msgid "print only branches that are not merged"
 msgstr "cetak hanya cabang yang tak tergabung"
 
-#: builtin/branch.c:689
+#: builtin/branch.c
 msgid "list branches in columns"
 msgstr "sebut cabang dalam kolom"
 
-#: builtin/branch.c:691 builtin/for-each-ref.c:45 builtin/notes.c:413
-#: builtin/notes.c:416 builtin/notes.c:579 builtin/notes.c:582
-#: builtin/tag.c:476
+#: builtin/branch.c builtin/for-each-ref.c builtin/notes.c builtin/tag.c
 msgid "object"
 msgstr "objek"
 
-#: builtin/branch.c:692
+#: builtin/branch.c
 msgid "print only branches of the object"
 msgstr "cetak hanya cabang objek"
 
-#: builtin/branch.c:693 builtin/for-each-ref.c:51 builtin/tag.c:483
+#: builtin/branch.c builtin/for-each-ref.c builtin/tag.c
 msgid "sorting and filtering are case insensitive"
 msgstr "pengurutan dan penyaringan tak peka kapital"
 
-#: builtin/branch.c:694 builtin/ls-files.c:667
+#: builtin/branch.c builtin/ls-files.c
 msgid "recurse through submodules"
 msgstr "rekursi melalui submodul"
 
-#: builtin/branch.c:695 builtin/for-each-ref.c:41 builtin/ls-tree.c:358
-#: builtin/tag.c:481 builtin/verify-tag.c:38
+#: builtin/branch.c builtin/for-each-ref.c builtin/ls-tree.c builtin/tag.c
+#: builtin/verify-tag.c
 msgid "format to use for the output"
 msgstr "format yang digunakan untuk keluaran"
 
-#: builtin/branch.c:718 builtin/clone.c:684
+#: builtin/branch.c builtin/submodule--helper.c submodule.c
+msgid "Failed to resolve HEAD as a valid ref."
+msgstr "Gagal menguraikan HEAD sebagai referensi valid."
+
+#: builtin/branch.c builtin/clone.c
 msgid "HEAD not found below refs/heads!"
 msgstr "HEAD tidak ditemukan di bawah refs/heads!"
 
-#: builtin/branch.c:739
+#: builtin/branch.c
 msgid ""
 "branch with --recurse-submodules can only be used if submodule."
 "propagateBranches is enabled"
@@ -11928,45 +3632,45 @@ msgstr ""
 "cabang dengan --recurse-submodules hanya dapat digunakan jika submodule."
 "propagateBranches diaktifkan"
 
-#: builtin/branch.c:741
+#: builtin/branch.c
 msgid "--recurse-submodules can only be used to create branches"
 msgstr "--recurse-submodules hanya dapat digunakan untuk membuat cabang"
 
-#: builtin/branch.c:770 builtin/branch.c:826 builtin/branch.c:835
+#: builtin/branch.c
 msgid "branch name required"
 msgstr "nama cabang diperlukan"
 
-#: builtin/branch.c:802
+#: builtin/branch.c
 msgid "Cannot give description to detached HEAD"
 msgstr "Tidak dapat memberikan deskripsi ke HEAD terpisah"
 
-#: builtin/branch.c:807
+#: builtin/branch.c
 msgid "cannot edit description of more than one branch"
 msgstr "tidak dapat menyunting deskripsi lebih dari satu cabang"
 
-#: builtin/branch.c:814
+#: builtin/branch.c
 #, c-format
 msgid "No commit on branch '%s' yet."
 msgstr "Belum ada komit pada cabang '%s'."
 
-#: builtin/branch.c:817
+#: builtin/branch.c
 #, c-format
 msgid "No branch named '%s'."
 msgstr "Tidak ada cabang bernama '%s'."
 
-#: builtin/branch.c:832
+#: builtin/branch.c
 msgid "too many branches for a copy operation"
 msgstr "terlalu banyak cabang untuk operasi penyalinan"
 
-#: builtin/branch.c:841
+#: builtin/branch.c
 msgid "too many arguments for a rename operation"
 msgstr "terlalu banyak argumen untuk operasi penggantian nama"
 
-#: builtin/branch.c:846
+#: builtin/branch.c
 msgid "too many arguments to set new upstream"
 msgstr "terlalu banyak argumen untuk menyetel hulu baru"
 
-#: builtin/branch.c:850
+#: builtin/branch.c
 #, c-format
 msgid ""
 "could not set upstream of HEAD to %s when it does not point to any branch."
@@ -11974,32 +3678,32 @@ msgstr ""
 "tidak dapat menyetel hulu HEAD ke %s ketika itu tak menunjuk pada cabang "
 "apapun."
 
-#: builtin/branch.c:853 builtin/branch.c:873
+#: builtin/branch.c
 #, c-format
 msgid "no such branch '%s'"
 msgstr "tidak ada cabang '%s'"
 
-#: builtin/branch.c:857
+#: builtin/branch.c
 #, c-format
 msgid "branch '%s' does not exist"
 msgstr "cabang '%s' tidak ada"
 
-#: builtin/branch.c:867
+#: builtin/branch.c
 msgid "too many arguments to unset upstream"
 msgstr "terlalu banyak argumen untuk batal-setel hulu"
 
-#: builtin/branch.c:871
+#: builtin/branch.c
 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:877
+#: builtin/branch.c
 #, c-format
 msgid "Branch '%s' has no upstream information"
 msgstr "Cabang '%s' tidak ada informasi hulu"
 
-#: builtin/branch.c:890
+#: builtin/branch.c
 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>?"
@@ -12007,7 +3711,7 @@ msgstr ""
 "Opsi -a dan -r tidak mengambil nama cabang.\n"
 "Mungkin maksud Anda gunakan: -a|-r --list <pola>?"
 
-#: builtin/branch.c:894
+#: builtin/branch.c
 msgid ""
 "the '--set-upstream' option is no longer supported. Please use '--track' or "
 "'--set-upstream-to' instead."
@@ -12015,32 +3719,32 @@ msgstr ""
 "opsi '--set-upstream' tidak lagi didukung. Mohon gunakan '--track' atau '--"
 "set-upstream-to' sebagai gantinya."
 
-#: builtin/bugreport.c:16
+#: builtin/bugreport.c
 msgid "git version:\n"
 msgstr ""
 
-#: builtin/bugreport.c:22
+#: builtin/bugreport.c
 #, c-format
 msgid "uname() failed with error '%s' (%d)\n"
 msgstr ""
 
-#: builtin/bugreport.c:32
+#: builtin/bugreport.c
 msgid "compiler info: "
 msgstr ""
 
-#: builtin/bugreport.c:35
+#: builtin/bugreport.c
 msgid "libc info: "
 msgstr ""
 
-#: builtin/bugreport.c:49
+#: builtin/bugreport.c
 msgid "not run from a git repository - no hooks to show\n"
 msgstr ""
 
-#: builtin/bugreport.c:62
+#: builtin/bugreport.c
 msgid "git bugreport [-o|--output-directory <file>] [-s|--suffix <format>]"
 msgstr ""
 
-#: builtin/bugreport.c:69
+#: builtin/bugreport.c
 msgid ""
 "Thank you for filling out a Git bug report!\n"
 "Please answer the following questions to help us understand your issue.\n"
@@ -12059,144 +3763,149 @@ msgid ""
 "You can delete any lines you don't wish to share.\n"
 msgstr ""
 
-#: builtin/bugreport.c:108
+#: builtin/bugreport.c
 msgid "specify a destination for the bugreport file"
 msgstr ""
 
-#: builtin/bugreport.c:110
+#: builtin/bugreport.c
 msgid "specify a strftime format suffix for the filename"
 msgstr ""
 
-#: builtin/bugreport.c:132
+#: builtin/bugreport.c
 #, c-format
 msgid "could not create leading directories for '%s'"
 msgstr ""
 
-#: builtin/bugreport.c:139
+#: builtin/bugreport.c
 msgid "System Info"
 msgstr ""
 
-#: builtin/bugreport.c:142
+#: builtin/bugreport.c
 msgid "Enabled Hooks"
 msgstr ""
 
-#: builtin/bugreport.c:149
+#: builtin/bugreport.c
 #, c-format
 msgid "unable to write to %s"
 msgstr ""
 
-#: builtin/bugreport.c:159
+#: builtin/bugreport.c
 #, c-format
 msgid "Created new report at '%s'.\n"
 msgstr ""
 
-#: builtin/bundle.c:15 builtin/bundle.c:23
+#: builtin/bundle.c
 msgid "git bundle create [<options>] <file> <git-rev-list args>"
 msgstr "git bundle create [<opsi>] <berkas> <argumen git-rev-list>"
 
-#: builtin/bundle.c:16 builtin/bundle.c:28
+#: builtin/bundle.c
 msgid "git bundle verify [<options>] <file>"
 msgstr "git bundle verify [<opsi>] <berkas>"
 
-#: builtin/bundle.c:17 builtin/bundle.c:33
+#: builtin/bundle.c
 msgid "git bundle list-heads <file> [<refname>...]"
 msgstr "git bundle list-heads <berkas> [<nama referensi>...]"
 
-#: builtin/bundle.c:18 builtin/bundle.c:38
+#: builtin/bundle.c
 msgid "git bundle unbundle <file> [<refname>...]"
 msgstr "git bundle unbundle <berkas> [<nama referensi>...]"
 
-#: builtin/bundle.c:65 builtin/pack-objects.c:3899
+#: builtin/bundle.c builtin/pack-objects.c
 msgid "do not show progress meter"
 msgstr "jangan perlihatkan meteran perkembangan"
 
-#: builtin/bundle.c:67 builtin/bundle.c:168 builtin/pack-objects.c:3901
+#: builtin/bundle.c builtin/pack-objects.c
 msgid "show progress meter"
 msgstr "perlihatkan meteran perkembangan"
 
-#: builtin/bundle.c:69 builtin/pack-objects.c:3903
+#: builtin/bundle.c builtin/pack-objects.c
 msgid "show progress meter during object writing phase"
 msgstr "perlihatkan meteran perkembangan saat fase penulisan objek"
 
-#: builtin/bundle.c:72 builtin/pack-objects.c:3906
+#: builtin/bundle.c builtin/pack-objects.c
 msgid "similar to --all-progress when progress meter is shown"
 msgstr "sama seperti --all-progress ketika meteran perkembangan diperlihatkan"
 
-#: builtin/bundle.c:74
+#: builtin/bundle.c
 msgid "specify bundle format version"
 msgstr "sebutkan versi format bundel"
 
-#: builtin/bundle.c:94
+#: builtin/bundle.c
 msgid "Need a repository to create a bundle."
 msgstr "Perlu sebuah repositori untuk membuat bundel."
 
-#: builtin/bundle.c:108
+#: builtin/bundle.c
 msgid "do not show bundle details"
 msgstr "jangan perlihatkan detail bundel"
 
-#: builtin/bundle.c:127
+#: builtin/bundle.c
 #, c-format
 msgid "%s is okay\n"
 msgstr "%s oke \n"
 
-#: builtin/bundle.c:183
+#: builtin/bundle.c
 msgid "Need a repository to unbundle."
 msgstr "Perlu sebuah repositori untuk membongkar bundel."
 
-#: builtin/bundle.c:186
+#: builtin/bundle.c
 msgid "Unbundling objects"
 msgstr "Membongkar bundel objek"
 
-#: builtin/bundle.c:220 builtin/remote.c:1758
+#: builtin/bundle.c builtin/remote.c
 #, c-format
 msgid "Unknown subcommand: %s"
 msgstr "Subperintah tidak dikenal: %s"
 
-#: builtin/cat-file.c:568
+#: builtin/cat-file.c merge-recursive.c
+#, c-format
+msgid "cannot read object %s '%s'"
+msgstr "tidak dapat membaca objek %s '%s'"
+
+#: builtin/cat-file.c
 msgid "flush is only for --buffer mode"
 msgstr "bilas hanya untuk mode --buffer"
 
-#: builtin/cat-file.c:612
+#: builtin/cat-file.c
 msgid "empty command in input"
 msgstr "perintah kosong pada masukan"
 
-#: builtin/cat-file.c:614
+#: builtin/cat-file.c
 #, c-format
 msgid "whitespace before command: '%s'"
 msgstr "spasi sebelum perintah: '%s'"
 
-#: builtin/cat-file.c:623
+#: builtin/cat-file.c
 #, c-format
 msgid "%s requires arguments"
 msgstr "%s butuh sebuah argumen"
 
-#: builtin/cat-file.c:628
+#: builtin/cat-file.c
 #, c-format
 msgid "%s takes no arguments"
 msgstr "%s tidak mengambil argumen"
 
-#: builtin/cat-file.c:636
+#: builtin/cat-file.c
 #, c-format
 msgid "unknown command: '%s'"
 msgstr "perintah tidak dikenal: '%s'"
 
-#: builtin/cat-file.c:795
+#: builtin/cat-file.c
 msgid "only one batch option may be specified"
 msgstr "hanya satu opsi setumpuk yang mungkin disebutkan"
 
-#: builtin/cat-file.c:824
+#: builtin/cat-file.c
 msgid "git cat-file <type> <object>"
 msgstr "git cat-file <tipe> <objek>"
 
-#: builtin/cat-file.c:825
+#: builtin/cat-file.c
 msgid "git cat-file (-e | -p) <object>"
 msgstr "git cat-file (-e | -p) <objek>"
 
-#: builtin/cat-file.c:826
+#: builtin/cat-file.c
 msgid "git cat-file (-t | -s) [--allow-unknown-type] <object>"
 msgstr "git cat-file (-t | -s) [--allow-unknown-type] <objek>"
 
-#: builtin/cat-file.c:827
+#: builtin/cat-file.c
 msgid ""
 "git cat-file (--batch | --batch-check | --batch-command) [--batch-all-"
 "objects]\n"
@@ -12208,7 +3917,7 @@ msgstr ""
 "             [--buffer] [--follow-symlinks] [--unordered]\n"
 "             [--textconv | --filters]"
 
-#: builtin/cat-file.c:830
+#: builtin/cat-file.c
 msgid ""
 "git cat-file (--textconv | --filters)\n"
 "             [<rev>:<path|tree-ish> | --path=<path|tree-ish> <rev>]"
@@ -12217,73 +3926,73 @@ msgstr ""
 "             [<revisi>:<jalur|mirip-pohon> | --path=<jalur|mirip-pohon>] "
 "<revisi>"
 
-#: builtin/cat-file.c:836
+#: builtin/cat-file.c
 msgid "Check object existence or emit object contents"
 msgstr "Periksa keberadaan objek atau keluarkan isi objek"
 
-#: builtin/cat-file.c:838
+#: builtin/cat-file.c
 msgid "check if <object> exists"
 msgstr "periksa jika <objek> ada"
 
-#: builtin/cat-file.c:839
+#: builtin/cat-file.c
 msgid "pretty-print <object> content"
 msgstr "cetak-cantik isi <objek>"
 
-#: builtin/cat-file.c:841
+#: builtin/cat-file.c
 msgid "Emit [broken] object attributes"
 msgstr "Keluarkan atribut objek [rusak]"
 
-#: builtin/cat-file.c:842
+#: builtin/cat-file.c
 msgid "show object type (one of 'blob', 'tree', 'commit', 'tag', ...)"
 msgstr "perlihatkan tipe objek (salah satu dari 'blob', 'commit', 'tag', ...)"
 
-#: builtin/cat-file.c:843
+#: builtin/cat-file.c
 msgid "show object size"
 msgstr "perlihatkan ukuran objek"
 
-#: builtin/cat-file.c:845
+#: builtin/cat-file.c
 msgid "allow -s and -t to work with broken/corrupt objects"
 msgstr "perbolehkan -s dan -t bekerja dengan objek rusak"
 
-#: builtin/cat-file.c:847
+#: builtin/cat-file.c
 msgid "Batch objects requested on stdin (or --batch-all-objects)"
 msgstr "Objek batch diminta pada masukan standar (atau --batch-all-objects)"
 
-#: builtin/cat-file.c:849
+#: builtin/cat-file.c
 msgid "show full <object> or <rev> contents"
 msgstr "perlihatkan isi <objek> atau <revisi> penuh"
 
-#: builtin/cat-file.c:853
+#: builtin/cat-file.c
 msgid "like --batch, but don't emit <contents>"
 msgstr "seperti --batch, tapi jangan keluarkan <isi>"
 
-#: builtin/cat-file.c:857
+#: builtin/cat-file.c
 msgid "read commands from stdin"
 msgstr "baca perintah dari masukan standar"
 
-#: builtin/cat-file.c:861
+#: builtin/cat-file.c
 msgid "with --batch[-check]: ignores stdin, batches all known objects"
 msgstr ""
 "dengan --batch[-check]: abaikan masukan standar, batch semua objek yang "
 "dikenal"
 
-#: builtin/cat-file.c:863
+#: builtin/cat-file.c
 msgid "Change or optimize batch output"
 msgstr "Ubah atau optimalkan keluaran batch"
 
-#: builtin/cat-file.c:864
+#: builtin/cat-file.c
 msgid "buffer --batch output"
 msgstr "sannga keluaran --batch"
 
-#: builtin/cat-file.c:866
+#: builtin/cat-file.c
 msgid "follow in-tree symlinks"
 msgstr "ikuti tautan simbolik dalam pohon"
 
-#: builtin/cat-file.c:868
+#: builtin/cat-file.c
 msgid "do not order objects before emitting them"
 msgstr "jangan urutkan objek sebelum dikeluarkan"
 
-#: builtin/cat-file.c:870
+#: builtin/cat-file.c
 msgid ""
 "Emit object (blob or tree) with conversion or filter (stand-alone, or with "
 "batch)"
@@ -12291,312 +4000,304 @@ msgstr ""
 "Keluarkan objek (blob atau pohon) dengan konversi atau saringan (berdiri "
 "sendiri atau dengan batch)"
 
-#: builtin/cat-file.c:872
+#: builtin/cat-file.c
 msgid "run textconv on object's content"
 msgstr "jalankan textconv pada isi objek"
 
-#: builtin/cat-file.c:874
+#: builtin/cat-file.c
 msgid "run filters on object's content"
 msgstr "jalankan penyaring pada isi objek"
 
-#: builtin/cat-file.c:875
+#: builtin/cat-file.c
 msgid "blob|tree"
 msgstr "blob|tree"
 
-#: builtin/cat-file.c:876
+#: builtin/cat-file.c
 msgid "use a <path> for (--textconv | --filters); Not with 'batch'"
 msgstr "gunakan <jalur> untuk (--textconv | --filters); tidak dengan 'batch'"
 
-#: builtin/cat-file.c:894
+#: builtin/cat-file.c
 #, c-format
 msgid "'%s=<%s>' needs '%s' or '%s'"
 msgstr "'%s=<%s>' butuh '%s' atau '%s'"
 
-#: builtin/cat-file.c:896
+#: builtin/cat-file.c
 msgid "path|tree-ish"
 msgstr "jalur|mirip-pohon"
 
-#: builtin/cat-file.c:903 builtin/cat-file.c:906 builtin/cat-file.c:909
+#: builtin/cat-file.c
 #, c-format
 msgid "'%s' requires a batch mode"
 msgstr "opsi '%s' butuh sebuah mode batch"
 
-#: builtin/cat-file.c:921
+#: builtin/cat-file.c
 #, c-format
 msgid "'-%c' is incompatible with batch mode"
 msgstr "'-%c' tidak kompatibel dengan mode batch"
 
-#: builtin/cat-file.c:924
+#: builtin/cat-file.c
 msgid "batch modes take no arguments"
 msgstr "mode batch tidak mengambil argumen"
 
-#: builtin/cat-file.c:932 builtin/cat-file.c:935
+#: builtin/cat-file.c
 #, c-format
 msgid "<rev> required with '%s'"
 msgstr "<revisi> diperlukan dengan '%s'"
 
-#: builtin/cat-file.c:938
+#: builtin/cat-file.c
 #, c-format
 msgid "<object> required with '-%c'"
 msgstr "<objek> diperlukan dengan '-%c'"
 
-#: builtin/cat-file.c:943 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:965
-#: builtin/notes.c:987 builtin/prune-packed.c:25 builtin/receive-pack.c:2489
-#: builtin/tag.c:592
+#: builtin/cat-file.c builtin/notes.c builtin/prune-packed.c
+#: builtin/receive-pack.c builtin/tag.c
 msgid "too many arguments"
 msgstr "terlalu banyak argumen"
 
-#: builtin/cat-file.c:947
+#: builtin/cat-file.c
 #, c-format
 msgid "only two arguments allowed in <type> <object> mode, not %d"
 msgstr ""
 "hanya dua argumen yang diperbolehkan di dalam mode <tipe> <objek>, bukan %d"
 
-#: builtin/check-attr.c:13
+#: builtin/check-attr.c
 msgid "git check-attr [-a | --all | <attr>...] [--] <pathname>..."
 msgstr ""
 
-#: builtin/check-attr.c:14
+#: builtin/check-attr.c
 msgid "git check-attr --stdin [-z] [-a | --all | <attr>...]"
 msgstr ""
 
-#: builtin/check-attr.c:21
+#: builtin/check-attr.c
 msgid "report all attributes set on file"
 msgstr ""
 
-#: builtin/check-attr.c:22
+#: builtin/check-attr.c
 msgid "use .gitattributes only from the index"
 msgstr ""
 
-#: builtin/check-attr.c:23 builtin/check-ignore.c:25 builtin/hash-object.c:101
+#: builtin/check-attr.c builtin/check-ignore.c builtin/hash-object.c
 msgid "read file names from stdin"
 msgstr ""
 
-#: builtin/check-attr.c:25 builtin/check-ignore.c:27
+#: builtin/check-attr.c builtin/check-ignore.c
 msgid "terminate input and output records by a NUL character"
 msgstr ""
 
-#: builtin/check-ignore.c:21 builtin/checkout.c:1550 builtin/gc.c:550
-#: builtin/worktree.c:565
+#: builtin/check-ignore.c builtin/checkout.c builtin/gc.c builtin/worktree.c
 msgid "suppress progress reporting"
 msgstr ""
 
-#: builtin/check-ignore.c:29
+#: builtin/check-ignore.c
 msgid "show non-matching input paths"
 msgstr ""
 
-#: builtin/check-ignore.c:31
+#: builtin/check-ignore.c
 msgid "ignore index when checking"
 msgstr ""
 
-#: builtin/check-ignore.c:165
+#: builtin/check-ignore.c
 msgid "cannot specify pathnames with --stdin"
 msgstr ""
 
-#: builtin/check-ignore.c:168
+#: builtin/check-ignore.c
 msgid "-z only makes sense with --stdin"
 msgstr ""
 
-#: builtin/check-ignore.c:170
+#: builtin/check-ignore.c
 msgid "no path specified"
 msgstr ""
 
-#: builtin/check-ignore.c:174
+#: builtin/check-ignore.c
 msgid "--quiet is only valid with a single pathname"
 msgstr ""
 
-#: builtin/check-ignore.c:176
+#: builtin/check-ignore.c
 msgid "cannot have both --quiet and --verbose"
 msgstr ""
 
-#: builtin/check-ignore.c:179
+#: builtin/check-ignore.c
 msgid "--non-matching is only valid with --verbose"
 msgstr ""
 
-#: builtin/check-mailmap.c:9
+#: builtin/check-mailmap.c
 msgid "git check-mailmap [<options>] <contact>..."
 msgstr ""
 
-#: builtin/check-mailmap.c:14
+#: builtin/check-mailmap.c
 msgid "also read contacts from stdin"
 msgstr ""
 
-#: builtin/check-mailmap.c:25
+#: builtin/check-mailmap.c
 #, c-format
 msgid "unable to parse contact: %s"
 msgstr ""
 
-#: builtin/check-mailmap.c:48
+#: builtin/check-mailmap.c
 msgid "no contacts specified"
 msgstr ""
 
-#: builtin/checkout--worker.c:110
+#: builtin/checkout--worker.c
 msgid "git checkout--worker [<options>]"
 msgstr ""
 
-#: builtin/checkout--worker.c:118 builtin/checkout-index.c:235
-#: builtin/column.c:31 builtin/column.c:32 builtin/submodule--helper.c:1878
-#: builtin/submodule--helper.c:1881 builtin/submodule--helper.c:1889
-#: builtin/submodule--helper.c:2716 builtin/worktree.c:563
-#: builtin/worktree.c:808
+#: builtin/checkout--worker.c builtin/checkout-index.c builtin/column.c
+#: builtin/submodule--helper.c builtin/worktree.c
 msgid "string"
 msgstr ""
 
-#: builtin/checkout--worker.c:119 builtin/checkout-index.c:236
+#: builtin/checkout--worker.c builtin/checkout-index.c
 msgid "when creating files, prepend <string>"
 msgstr ""
 
-#: builtin/checkout-index.c:184
+#: builtin/checkout-index.c
 msgid "git checkout-index [<options>] [--] [<file>...]"
 msgstr ""
 
-#: builtin/checkout-index.c:201
+#: builtin/checkout-index.c
 msgid "stage should be between 1 and 3 or all"
 msgstr ""
 
-#: builtin/checkout-index.c:219
+#: builtin/checkout-index.c
 msgid "check out all files in the index"
 msgstr ""
 
-#: builtin/checkout-index.c:221
+#: builtin/checkout-index.c
 msgid "do not skip files with skip-worktree set"
 msgstr ""
 
-#: builtin/checkout-index.c:222
+#: builtin/checkout-index.c
 msgid "force overwrite of existing files"
 msgstr ""
 
-#: builtin/checkout-index.c:224
+#: builtin/checkout-index.c
 msgid "no warning for existing files and files not in index"
 msgstr ""
 
-#: builtin/checkout-index.c:226
+#: builtin/checkout-index.c
 msgid "don't checkout new files"
 msgstr ""
 
-#: builtin/checkout-index.c:228
+#: builtin/checkout-index.c
 msgid "update stat information in the index file"
 msgstr ""
 
-#: builtin/checkout-index.c:232
+#: builtin/checkout-index.c
 msgid "read list of paths from the standard input"
 msgstr ""
 
-#: builtin/checkout-index.c:234
+#: builtin/checkout-index.c
 msgid "write the content to temporary files"
 msgstr ""
 
-#: builtin/checkout-index.c:238
+#: builtin/checkout-index.c
 msgid "copy out the files from named stage"
 msgstr ""
 
-#: builtin/checkout.c:34
+#: builtin/checkout.c
 msgid "git checkout [<options>] <branch>"
 msgstr "git checkout [<opsi>] <cabang>"
 
-#: builtin/checkout.c:35
+#: builtin/checkout.c
 msgid "git checkout [<options>] [<branch>] -- <file>..."
 msgstr "git checkout [<opsi>] [<cabang>] -- <berkas>..."
 
-#: builtin/checkout.c:40
+#: builtin/checkout.c
 msgid "git switch [<options>] [<branch>]"
 msgstr "git switch [<opsi>] [<cabang>]"
 
-#: builtin/checkout.c:45
+#: builtin/checkout.c
 msgid "git restore [<options>] [--source=<branch>] <file>..."
 msgstr "git restore [<opsi>] [--source=<cabang>] <berkas>..."
 
-#: builtin/checkout.c:199 builtin/checkout.c:238
+#: builtin/checkout.c
 #, c-format
 msgid "path '%s' does not have our version"
 msgstr "jalur '%s' tidak punya versi kami"
 
-#: builtin/checkout.c:201 builtin/checkout.c:240
+#: builtin/checkout.c
 #, c-format
 msgid "path '%s' does not have their version"
 msgstr "jalur '%s' tidak punya versi mereka"
 
-#: builtin/checkout.c:217
+#: builtin/checkout.c
 #, c-format
 msgid "path '%s' does not have all necessary versions"
 msgstr "jalur '%s' tidak punya semua versi yang diperlukan"
 
-#: builtin/checkout.c:271
+#: builtin/checkout.c
 #, c-format
 msgid "path '%s' does not have necessary versions"
 msgstr "jalur '%s' tidak punya versi yang diperlukan"
 
-#: builtin/checkout.c:291
+#: builtin/checkout.c
 #, c-format
 msgid "path '%s': cannot merge"
 msgstr "jalur '%s': tidak dapat gabung"
 
-#: builtin/checkout.c:307
+#: builtin/checkout.c
 #, c-format
 msgid "Unable to add merge result for '%s'"
 msgstr "Tidak dapat menambahkan hasil penggabungan untuk '%s'"
 
-#: builtin/checkout.c:424
+#: builtin/checkout.c
 #, c-format
 msgid "Recreated %d merge conflict"
 msgid_plural "Recreated %d merge conflicts"
 msgstr[0] "Konflik penggabungan %d dibuat ulang"
 msgstr[1] "Konflik penggabungan %d dibuat ulang"
 
-#: builtin/checkout.c:429
+#: builtin/checkout.c
 #, c-format
 msgid "Updated %d path from %s"
 msgid_plural "Updated %d paths from %s"
 msgstr[0] "%d jalur diperbarui dari %s"
 msgstr[1] "%d jalur diperbarui dari %s"
 
-#: builtin/checkout.c:436
+#: builtin/checkout.c
 #, c-format
 msgid "Updated %d path from the index"
 msgid_plural "Updated %d paths from the index"
 msgstr[0] "%d jalur diperbarui dari indeks"
 msgstr[1] "%d jalur diperbarui dari indeks"
 
-#: builtin/checkout.c:459 builtin/checkout.c:462 builtin/checkout.c:465
-#: builtin/checkout.c:469
+#: builtin/checkout.c
 #, c-format
 msgid "'%s' cannot be used with updating paths"
 msgstr "'%s' tidak dapat digunakan untuk memperbarui jalur"
 
-#: builtin/checkout.c:479
+#: builtin/checkout.c
 #, c-format
 msgid "Cannot update paths and switch to branch '%s' at the same time."
 msgstr ""
 "Tidak dapat memperbarui jalur dan mengganti ke cabang '%s' dalam waktu yang "
 "bersamaan."
 
-#: builtin/checkout.c:483
+#: builtin/checkout.c
 #, c-format
 msgid "neither '%s' or '%s' is specified"
 msgstr "baik '%s' atau '%s' tidak disebutkan"
 
-#: builtin/checkout.c:487
+#: builtin/checkout.c
 #, c-format
 msgid "'%s' must be used when '%s' is not specified"
 msgstr "'%s' harus disebutkan ketika '%s' tidak disebutkan"
 
-#: builtin/checkout.c:492 builtin/checkout.c:497
+#: builtin/checkout.c
 #, c-format
 msgid "'%s' or '%s' cannot be used with %s"
 msgstr "'%s' atau '%s' tidak dapat digunakan untuk %s"
 
-#: builtin/checkout.c:571 builtin/checkout.c:578
+#: builtin/checkout.c
 #, c-format
 msgid "path '%s' is unmerged"
 msgstr "jalur '%s' tak tergabung"
 
-#: builtin/checkout.c:753
+#: builtin/checkout.c
 msgid "you need to resolve your current index first"
 msgstr "Anda perlu selesaikan dulu indeks Anda saat ini"
 
-#: builtin/checkout.c:809
+#: builtin/checkout.c
 #, c-format
 msgid ""
 "cannot continue with staged changes in the following files:\n"
@@ -12606,50 +4307,50 @@ msgstr ""
 "berikut:\n"
 "%s"
 
-#: builtin/checkout.c:902
+#: builtin/checkout.c
 #, c-format
 msgid "Can not do reflog for '%s': %s\n"
 msgstr "Tidak dapat melakukan reflog untuk '%s': %s\n"
 
-#: builtin/checkout.c:947
+#: builtin/checkout.c
 msgid "HEAD is now at"
 msgstr "HEAD sekarang berada di"
 
-#: builtin/checkout.c:951 builtin/clone.c:615 t/helper/test-fast-rebase.c:203
+#: builtin/checkout.c builtin/clone.c t/helper/test-fast-rebase.c
 msgid "unable to update HEAD"
 msgstr "tidak dapat memperbarui HEAD"
 
-#: builtin/checkout.c:955
+#: builtin/checkout.c
 #, c-format
 msgid "Reset branch '%s'\n"
 msgstr "Ganti ulang cabang '%s'\n"
 
-#: builtin/checkout.c:958
+#: builtin/checkout.c
 #, c-format
 msgid "Already on '%s'\n"
 msgstr "Sudah berada pada '%s'\n"
 
-#: builtin/checkout.c:962
+#: builtin/checkout.c
 #, c-format
 msgid "Switched to and reset branch '%s'\n"
 msgstr "Ganti ke dan ganti cabang '%s'\n"
 
-#: builtin/checkout.c:964 builtin/checkout.c:1398
+#: builtin/checkout.c
 #, c-format
 msgid "Switched to a new branch '%s'\n"
 msgstr "Ganti ke cabang baru '%s'\n"
 
-#: builtin/checkout.c:966
+#: builtin/checkout.c
 #, c-format
 msgid "Switched to branch '%s'\n"
 msgstr "Ganti ke cabang '%s'\n"
 
-#: builtin/checkout.c:1017
+#: builtin/checkout.c
 #, c-format
 msgid " ... and %d more.\n"
 msgstr "... dan %d lainnya.\n"
 
-#: builtin/checkout.c:1023
+#: builtin/checkout.c
 #, c-format
 msgid ""
 "Warning: you are leaving %d commit behind, not connected to\n"
@@ -12672,7 +4373,7 @@ msgstr[1] ""
 "\n"
 "%s\n"
 
-#: builtin/checkout.c:1042
+#: builtin/checkout.c
 #, c-format
 msgid ""
 "If you want to keep it by creating a new branch, this may be a good time\n"
@@ -12687,27 +4388,27 @@ msgid_plural ""
 " git branch <new-branch-name> %s\n"
 "\n"
 msgstr[0] ""
-"Jika Anda ingin memelihara itu dengan membuat cabang baru, ini mungkin\n"
+"Jika Anda ingin memeliharanya dengan membuat cabang baru, ini mungkin\n"
 "saat yang tepat untuk dilakukan dengan:\n"
 "git branch <nama-cabang-baru> %s\n"
 msgstr[1] ""
-"Jika Anda ingin memelihara itu dengan membuat cabang baru, ini mungkin\n"
+"Jika Anda ingin memeliharanya dengan membuat cabang baru, ini mungkin\n"
 "saat yang tepat untuk dilakukan dengan:\n"
 "git branch <nama-cabang-baru> %s\n"
 
-#: builtin/checkout.c:1077
+#: builtin/checkout.c
 msgid "internal error in revision walk"
 msgstr "kesalahan internal dalam jalan revisi"
 
-#: builtin/checkout.c:1081
+#: builtin/checkout.c
 msgid "Previous HEAD position was"
 msgstr "Posisi HEAD sebelumnya adalah"
 
-#: builtin/checkout.c:1124 builtin/checkout.c:1393
+#: builtin/checkout.c
 msgid "You are on a branch yet to be born"
 msgstr "Anda berada pada cabang yang belum lahir"
 
-#: builtin/checkout.c:1206
+#: builtin/checkout.c
 #, c-format
 msgid ""
 "'%s' could be both a local file and a tracking branch.\n"
@@ -12716,7 +4417,7 @@ msgstr ""
 "'%s' bisa jadi berkas lokal dan cabang pelacak.\n"
 "Mohon gunakan -- (dan secara opsional --no-guess) untuk disambiguasi"
 
-#: builtin/checkout.c:1213
+#: builtin/checkout.c
 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"
@@ -12736,56 +4437,56 @@ msgstr ""
 "seperti remote 'origin', pertimbangkan untuk menyetel\n"
 "checkout.defaultRemote=origin di konfigurasi Anda"
 
-#: builtin/checkout.c:1223
+#: builtin/checkout.c
 #, c-format
 msgid "'%s' matched multiple (%d) remote tracking branches"
 msgstr "'%s' cocok dengan banyak (%d) cabang pelacak remote"
 
-#: builtin/checkout.c:1289
+#: builtin/checkout.c
 msgid "only one reference expected"
 msgstr "hanya satu referensi yang diharapkan"
 
-#: builtin/checkout.c:1306
+#: builtin/checkout.c
 #, c-format
 msgid "only one reference expected, %d given."
 msgstr "hanya satu referensi yang diharapkan, %d diberikan"
 
-#: builtin/checkout.c:1352 builtin/worktree.c:338 builtin/worktree.c:508
+#: builtin/checkout.c builtin/worktree.c
 #, c-format
 msgid "invalid reference: %s"
 msgstr "referensi tidak valid: %s"
 
-#: builtin/checkout.c:1365 builtin/checkout.c:1744
+#: builtin/checkout.c
 #, c-format
 msgid "reference is not a tree: %s"
 msgstr "referensi bukan pohon: %s"
 
-#: builtin/checkout.c:1413
+#: builtin/checkout.c
 #, c-format
 msgid "a branch is expected, got tag '%s'"
 msgstr "sebuah cabang diharapkan, dapat tag '%s'"
 
-#: builtin/checkout.c:1415
+#: builtin/checkout.c
 #, c-format
 msgid "a branch is expected, got remote branch '%s'"
 msgstr "sebuah cabang diharapkan, dapat cabang remote '%s'"
 
-#: builtin/checkout.c:1417 builtin/checkout.c:1426
+#: builtin/checkout.c
 #, c-format
 msgid "a branch is expected, got '%s'"
 msgstr "sebuah cabang diharapkan, dapat '%s'"
 
-#: builtin/checkout.c:1420
+#: builtin/checkout.c
 #, c-format
 msgid "a branch is expected, got commit '%s'"
 msgstr "sebuah cabang diharapkan, dapat komit '%s'"
 
-#: builtin/checkout.c:1429
+#: builtin/checkout.c
 msgid ""
 "If you want to detach HEAD at the commit, try again with the --detach option."
 msgstr "Jika Anda ingin lepas HEAD pada komit, coba lagi dengan opsi --detach."
 
-#: builtin/checkout.c:1442
+#: builtin/checkout.c
 msgid ""
 "cannot switch branch while merging\n"
 "Consider \"git merge --quit\" or \"git worktree add\"."
@@ -12794,7 +4495,7 @@ msgstr ""
 "Pertimbangkan untuk menggunakan \"git merge --quit\" atau \"git worktree add"
 "\"."
 
-#: builtin/checkout.c:1446
+#: builtin/checkout.c
 msgid ""
 "cannot switch branch in the middle of an am session\n"
 "Consider \"git am --quit\" or \"git worktree add\"."
@@ -12802,7 +4503,7 @@ msgstr ""
 "tidak dapat mengganti cabang di tengah sesi am\n"
 "Pertimbangkan untuk menggunakan \"git am --quit\" atau \"git worktree add\"."
 
-#: builtin/checkout.c:1450
+#: builtin/checkout.c
 msgid ""
 "cannot switch branch while rebasing\n"
 "Consider \"git rebase --quit\" or \"git worktree add\"."
@@ -12811,7 +4512,7 @@ msgstr ""
 "Pertimbangkan untuk menggunakan \"git rebase --quit\" atau \"git worktree add"
 "\"."
 
-#: builtin/checkout.c:1454
+#: builtin/checkout.c
 msgid ""
 "cannot switch branch while cherry-picking\n"
 "Consider \"git cherry-pick --quit\" or \"git worktree add\"."
@@ -12820,7 +4521,7 @@ msgstr ""
 "Pertimbangkan untuk menggunakan \"git cherry-pick --quit\" atau \"git "
 "worktree add\"."
 
-#: builtin/checkout.c:1458
+#: builtin/checkout.c
 msgid ""
 "cannot switch branch while reverting\n"
 "Consider \"git revert --quit\" or \"git worktree add\"."
@@ -12829,122 +4530,121 @@ msgstr ""
 "Pertimbangkan untuk menggunakan \"git revert --quit\" atau \"git worktree add"
 "\"."
 
-#: builtin/checkout.c:1462
+#: builtin/checkout.c
 msgid "you are switching branch while bisecting"
 msgstr "Anda mengganti cabang saat pembagian dua"
 
-#: builtin/checkout.c:1469
+#: builtin/checkout.c
 msgid "paths cannot be used with switching branches"
 msgstr "jalur tidak dapat digunakan dengan mengganti cabang"
 
-#: builtin/checkout.c:1472 builtin/checkout.c:1476 builtin/checkout.c:1480
+#: builtin/checkout.c
 #, c-format
 msgid "'%s' cannot be used with switching branches"
 msgstr "'%s' tidak dapat digunakan dengan mengganti cabang"
 
-#: builtin/checkout.c:1484 builtin/checkout.c:1487 builtin/checkout.c:1490
-#: builtin/checkout.c:1495 builtin/checkout.c:1500
+#: builtin/checkout.c
 #, c-format
 msgid "'%s' cannot be used with '%s'"
 msgstr "'%s' tidak dapat digunakan dengan '%s'"
 
-#: builtin/checkout.c:1497
+#: builtin/checkout.c
 #, c-format
 msgid "'%s' cannot take <start-point>"
 msgstr "'%s' tidak bisa mengambil <titik-awal>"
 
-#: builtin/checkout.c:1505
+#: builtin/checkout.c
 #, c-format
 msgid "Cannot switch branch to a non-commit '%s'"
 msgstr "Tidak dapat mengganti cabang ke bukan komit '%s'"
 
-#: builtin/checkout.c:1512
+#: builtin/checkout.c
 msgid "missing branch or commit argument"
 msgstr "kehilangan argumen cabang atau komit"
 
-#: builtin/checkout.c:1555
+#: builtin/checkout.c
 msgid "perform a 3-way merge with the new branch"
 msgstr "lakukan penggabungan 3 arah dengan cabang baru"
 
-#: builtin/checkout.c:1556 builtin/log.c:1844 parse-options.h:354
+#: builtin/checkout.c builtin/log.c parse-options.h
 msgid "style"
 msgstr "gaya"
 
-#: builtin/checkout.c:1557
+#: builtin/checkout.c
 msgid "conflict style (merge, diff3, or zdiff3)"
 msgstr "gaya konflik (merge, diff3, atau zdiff3)"
 
-#: builtin/checkout.c:1569 builtin/worktree.c:560
+#: builtin/checkout.c builtin/worktree.c
 msgid "detach HEAD at named commit"
 msgstr "lepas HEAD pada komit bernama"
 
-#: builtin/checkout.c:1574
+#: builtin/checkout.c
 msgid "force checkout (throw away local modifications)"
 msgstr "paksa checkout (buang modifikasi lokal)"
 
-#: builtin/checkout.c:1576
+#: builtin/checkout.c
 msgid "new-branch"
 msgstr "cabang baru"
 
-#: builtin/checkout.c:1576
+#: builtin/checkout.c
 msgid "new unparented branch"
 msgstr "cabang baru tanpa induk"
 
-#: builtin/checkout.c:1578 builtin/merge.c:305
+#: builtin/checkout.c builtin/merge.c
 msgid "update ignored files (default)"
 msgstr "perbarui berkas yang diabaikan (default)"
 
-#: builtin/checkout.c:1581
+#: builtin/checkout.c
 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:1594
+#: builtin/checkout.c
 msgid "checkout our version for unmerged files"
 msgstr "checkout versi kami untuk berkas yang tak tergabung"
 
-#: builtin/checkout.c:1597
+#: builtin/checkout.c
 msgid "checkout their version for unmerged files"
 msgstr "checkout versi mereka untuk berkas yang tak tergabung"
 
-#: builtin/checkout.c:1601
+#: builtin/checkout.c
 msgid "do not limit pathspecs to sparse entries only"
 msgstr "jangan batasi jalur spek hanya ke entri tipis"
 
-#: builtin/checkout.c:1659
+#: builtin/checkout.c
 #, c-format
 msgid "options '-%c', '-%c', and '%s' cannot be used together"
 msgstr "opsi '-%c', '-%c', dan '%s' tidak dapat digunakan bersamaan"
 
-#: builtin/checkout.c:1700
+#: builtin/checkout.c
 msgid "--track needs a branch name"
 msgstr "--track butuh nama cabang"
 
-#: builtin/checkout.c:1705
+#: builtin/checkout.c
 #, c-format
 msgid "missing branch name; try -%c"
 msgstr "kehilangan nama cabang; coba -%c"
 
-#: builtin/checkout.c:1737
+#: builtin/checkout.c
 #, c-format
 msgid "could not resolve %s"
 msgstr "tidak dapat menyelesaikan %s"
 
-#: builtin/checkout.c:1753
+#: builtin/checkout.c
 msgid "invalid path specification"
 msgstr "spesifikasi jalur tidak valid"
 
-#: builtin/checkout.c:1760
+#: builtin/checkout.c
 #, 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:1764
+#: builtin/checkout.c
 #, 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:1789
+#: builtin/checkout.c
 msgid ""
 "git checkout: --ours/--theirs, --force and --merge are incompatible when\n"
 "checking out of the index."
@@ -12952,114 +4652,116 @@ msgstr ""
 "git checkout: --ours/--theirs, --force dan --merge tidak kompatibel saat\n"
 "men-checkout index"
 
-#: builtin/checkout.c:1794
+#: builtin/checkout.c
 msgid "you must specify path(s) to restore"
 msgstr "Anda harus sebutkan jalur untuk dipulihkan"
 
-#: builtin/checkout.c:1819 builtin/checkout.c:1821 builtin/checkout.c:1873
-#: builtin/checkout.c:1875 builtin/clone.c:130 builtin/remote.c:171
-#: builtin/remote.c:173 builtin/submodule--helper.c:3038
-#: builtin/submodule--helper.c:3371 builtin/worktree.c:556
-#: builtin/worktree.c:558
+#: builtin/checkout.c builtin/clone.c builtin/remote.c
+#: builtin/submodule--helper.c builtin/worktree.c
 msgid "branch"
 msgstr "cabang"
 
-#: builtin/checkout.c:1820
+#: builtin/checkout.c
 msgid "create and checkout a new branch"
 msgstr "buat dan checkout cabang baru"
 
-#: builtin/checkout.c:1822
+#: builtin/checkout.c
 msgid "create/reset and checkout a branch"
 msgstr "buat/setel ulang dan checkout cabang"
 
-#: builtin/checkout.c:1823
+#: builtin/checkout.c
 msgid "create reflog for new branch"
 msgstr "buat reflog untuk cabang baru"
 
-#: builtin/checkout.c:1825
+#: builtin/checkout.c
 msgid "second guess 'git checkout <no-such-branch>' (default)"
 msgstr "tebakan kedua 'git checkout <tidak-ada-cabang-seperti-itu>' (default)"
 
-#: builtin/checkout.c:1826
+#: builtin/checkout.c
 msgid "use overlay mode (default)"
 msgstr "gunakan mode hamparan (default)"
 
-#: builtin/checkout.c:1874
+#: builtin/checkout.c
 msgid "create and switch to a new branch"
 msgstr "buat dan ganti ke cabang baru"
 
-#: builtin/checkout.c:1876
+#: builtin/checkout.c
 msgid "create/reset and switch to a branch"
 msgstr "buat/setel ulang dan ganti ke cabang"
 
-#: builtin/checkout.c:1878
+#: builtin/checkout.c
 msgid "second guess 'git switch <no-such-branch>'"
 msgstr "tebakan kedua 'git switch <tidak-ada-cabang-seperti-itu>'"
 
-#: builtin/checkout.c:1880
+#: builtin/checkout.c
 msgid "throw away local modifications"
 msgstr "buang modifikasi lokal"
 
-#: builtin/checkout.c:1916
+#: builtin/checkout.c
 msgid "which tree-ish to checkout from"
 msgstr "mana mirip-cabang untuk di-checkout"
 
-#: builtin/checkout.c:1918
+#: builtin/checkout.c
 msgid "restore the index"
 msgstr "pulihkan indeks"
 
-#: builtin/checkout.c:1920
+#: builtin/checkout.c
 msgid "restore the working tree (default)"
 msgstr "pulihkan pohon kerja (default)"
 
-#: builtin/checkout.c:1922
+#: builtin/checkout.c
 msgid "ignore unmerged entries"
 msgstr "abaikan entri yang tak tergabung"
 
-#: builtin/checkout.c:1923
+#: builtin/checkout.c
 msgid "use overlay mode"
 msgstr "gunakan mode hamparan"
 
-#: builtin/clean.c:29
+#: builtin/clean.c
 msgid ""
 "git clean [-d] [-f] [-i] [-n] [-q] [-e <pattern>] [-x | -X] [--] <paths>..."
 msgstr ""
 "git clean [-d] [-f] [-i] [-n] [-q] [-e <pola>] [-x | -X] [--] <jalur>..."
 
-#: builtin/clean.c:33
+#: builtin/clean.c
 #, c-format
 msgid "Removing %s\n"
 msgstr "Menghapus %s\n"
 
-#: builtin/clean.c:34
+#: builtin/clean.c
 #, c-format
 msgid "Would remove %s\n"
 msgstr "Akan hapus %s\n"
 
-#: builtin/clean.c:35
+#: builtin/clean.c
 #, c-format
 msgid "Skipping repository %s\n"
 msgstr "Melewatkan repositori %s\n"
 
-#: builtin/clean.c:36
+#: builtin/clean.c
 #, c-format
 msgid "Would skip repository %s\n"
 msgstr "Akan melewatkan repositori %s\n"
 
-#: builtin/clean.c:38
+#: builtin/clean.c midx.c
+#, c-format
+msgid "failed to remove %s"
+msgstr "gagal menghapus %s"
+
+#: builtin/clean.c
 #, c-format
 msgid "could not lstat %s\n"
 msgstr "tidak dapat me-lstat %s\n"
 
-#: builtin/clean.c:39
+#: builtin/clean.c
 msgid "Refusing to remove current working directory\n"
 msgstr "Menolak menghapus direktori kerja saat ini\n"
 
-#: builtin/clean.c:40
+#: builtin/clean.c
 msgid "Would refuse to remove current working directory\n"
 msgstr "Akan menolak menghapus direktori kerja saat ini\n"
 
-#: builtin/clean.c:326 git-add--interactive.perl:593
+#: builtin/clean.c git-add--interactive.perl
 #, c-format
 msgid ""
 "Prompt help:\n"
@@ -13072,7 +4774,7 @@ msgstr ""
 "foo        - pilih item berdasarkan prefiks unik\n"
 "           - (kosong) tidak pilih apa-apa\n"
 
-#: builtin/clean.c:330 git-add--interactive.perl:602
+#: builtin/clean.c git-add--interactive.perl
 #, c-format
 msgid ""
 "Prompt help:\n"
@@ -13093,33 +4795,32 @@ msgstr ""
 "*          - pilih semua item\n"
 "           - (kosong) selesai memilih\n"
 
-#: builtin/clean.c:545 git-add--interactive.perl:568
-#: git-add--interactive.perl:573
+#: builtin/clean.c git-add--interactive.perl
 #, c-format, perl-format
 msgid "Huh (%s)?\n"
 msgstr "Huh (%s)?\n"
 
-#: builtin/clean.c:685
+#: builtin/clean.c
 #, c-format
 msgid "Input ignore patterns>> "
 msgstr "Masukkan pola pengabaian>> "
 
-#: builtin/clean.c:719
+#: builtin/clean.c
 #, c-format
 msgid "WARNING: Cannot find items matched by: %s"
 msgstr "PERINGATAN: Tidak dapat menemukan item yang cocok dengan: %s"
 
-#: builtin/clean.c:740
+#: builtin/clean.c
 msgid "Select items to delete"
 msgstr "Pilih item untuk dihapus"
 
 #. TRANSLATORS: Make sure to keep [y/N] as is
-#: builtin/clean.c:781
+#: builtin/clean.c
 #, c-format
 msgid "Remove %s [y/N]? "
 msgstr "Hapus %s [y/N]? "
 
-#: builtin/clean.c:812
+#: builtin/clean.c
 msgid ""
 "clean               - start cleaning\n"
 "filter by pattern   - exclude items from deletion\n"
@@ -13137,52 +4838,50 @@ msgstr ""
 "help                - layar ini\n"
 "?                   - bantuan untuk bisik pemilihan"
 
-#: builtin/clean.c:848
+#: builtin/clean.c
 msgid "Would remove the following item:"
 msgid_plural "Would remove the following items:"
 msgstr[0] "Akan menghapus item berikut:"
 msgstr[1] "Akan menghapus item berikut:"
 
-#: builtin/clean.c:864
+#: builtin/clean.c
 msgid "No more files to clean, exiting."
 msgstr "Tidak ada lagi berkas untuk dibersihkan, keluar."
 
-#: builtin/clean.c:926
+#: builtin/clean.c
 msgid "do not print names of files removed"
 msgstr "jangan cetak nama berkas yang dihapus"
 
-#: builtin/clean.c:928
+#: builtin/clean.c
 msgid "force"
 msgstr "paksa"
 
-#: builtin/clean.c:929
+#: builtin/clean.c
 msgid "interactive cleaning"
 msgstr "pembersihan interaktif"
 
-#: builtin/clean.c:931
+#: builtin/clean.c
 msgid "remove whole directories"
 msgstr "hapus keseluruhan direktori"
 
-#: builtin/clean.c:932 builtin/describe.c:565 builtin/describe.c:567
-#: builtin/grep.c:938 builtin/log.c:185 builtin/log.c:187
-#: builtin/ls-files.c:651 builtin/name-rev.c:585 builtin/name-rev.c:587
-#: builtin/show-ref.c:179
+#: builtin/clean.c builtin/describe.c builtin/grep.c builtin/log.c
+#: builtin/ls-files.c builtin/name-rev.c builtin/show-ref.c
 msgid "pattern"
 msgstr "pola"
 
-#: builtin/clean.c:933
+#: builtin/clean.c
 msgid "add <pattern> to ignore rules"
 msgstr "tambahkan <pola> ke aturan pengabaian"
 
-#: builtin/clean.c:934
+#: builtin/clean.c
 msgid "remove ignored files, too"
 msgstr "juga hapus berkas terabaikan"
 
-#: builtin/clean.c:936
+#: builtin/clean.c
 msgid "remove only ignored files"
 msgstr "hanya hapus berkas terabaikan"
 
-#: builtin/clean.c:951
+#: builtin/clean.c
 msgid ""
 "clean.requireForce set to true and neither -i, -n, nor -f given; refusing to "
 "clean"
@@ -13190,7 +4889,7 @@ msgstr ""
 "clean.requireForce disetel ke true dan baik -i, -n, atau -f tidak diberikan; "
 "menolak membersihkan"
 
-#: builtin/clean.c:954
+#: builtin/clean.c
 msgid ""
 "clean.requireForce defaults to true and neither -i, -n, nor -f given; "
 "refusing to clean"
@@ -13198,217 +4897,217 @@ msgstr ""
 "clean.requireForce asal ke true dan baik -i, -n, atau -f tidak diberikan; "
 "menolak membersihkan"
 
-#: builtin/clean.c:966
+#: builtin/clean.c
 msgid "-x and -X cannot be used together"
 msgstr "-x dan -X tidak dapat digunakan bersamaan"
 
-#: builtin/clone.c:47
+#: builtin/clone.c
 msgid "git clone [<options>] [--] <repo> [<dir>]"
 msgstr "git clone [<opsi>] [--] <repo> [<direktori>]"
 
-#: builtin/clone.c:100
+#: builtin/clone.c
 msgid "don't clone shallow repository"
 msgstr "jangan kloning repositori dangkal"
 
-#: builtin/clone.c:102
+#: builtin/clone.c
 msgid "don't create a checkout"
 msgstr "jangan buat checkout"
 
-#: builtin/clone.c:103 builtin/clone.c:105 builtin/init-db.c:542
+#: builtin/clone.c builtin/init-db.c
 msgid "create a bare repository"
 msgstr "buat repositori bare"
 
-#: builtin/clone.c:107
+#: builtin/clone.c
 msgid "create a mirror repository (implies bare)"
 msgstr "buat repositori cermin (implikasikan bare)"
 
-#: builtin/clone.c:109
+#: builtin/clone.c
 msgid "to clone from a local repository"
 msgstr "kloning dari repositori lokal"
 
-#: builtin/clone.c:111
+#: builtin/clone.c
 msgid "don't use local hardlinks, always copy"
 msgstr "jangan gunakan tautan keras lokal, selalu salin"
 
-#: builtin/clone.c:113
+#: builtin/clone.c
 msgid "setup as shared repository"
 msgstr "siapkan sebagai repositori berbagi"
 
-#: builtin/clone.c:115
+#: builtin/clone.c
 msgid "pathspec"
 msgstr "spek jalur"
 
-#: builtin/clone.c:115
+#: builtin/clone.c
 msgid "initialize submodules in the clone"
 msgstr "inisialisasi submodul dalam klon"
 
-#: builtin/clone.c:119
+#: builtin/clone.c
 msgid "number of submodules cloned in parallel"
 msgstr "jumlah submodul yang diklon secara paralel"
 
-#: builtin/clone.c:120 builtin/init-db.c:539
+#: builtin/clone.c builtin/init-db.c
 msgid "template-directory"
 msgstr "direktori templat"
 
-#: builtin/clone.c:121 builtin/init-db.c:540
+#: builtin/clone.c builtin/init-db.c
 msgid "directory from which templates will be used"
 msgstr "direktori dimana templat akan digunakan"
 
-#: builtin/clone.c:123 builtin/clone.c:125 builtin/submodule--helper.c:1885
-#: builtin/submodule--helper.c:2719 builtin/submodule--helper.c:3378
+#: builtin/clone.c builtin/submodule--helper.c
 msgid "reference repository"
 msgstr "repositori rujukan"
 
-#: builtin/clone.c:127 builtin/submodule--helper.c:1887
-#: builtin/submodule--helper.c:2721
+#: builtin/clone.c builtin/submodule--helper.c
 msgid "use --reference only while cloning"
 msgstr "gunakan --reference hanya pada saat kloning"
 
-#: builtin/clone.c:128 builtin/column.c:27 builtin/fmt-merge-msg.c:27
-#: builtin/init-db.c:550 builtin/merge-file.c:48 builtin/merge.c:290
-#: builtin/pack-objects.c:3967 builtin/repack.c:669
-#: builtin/submodule--helper.c:3380 t/helper/test-simple-ipc.c:595
-#: t/helper/test-simple-ipc.c:597
+#: builtin/clone.c builtin/column.c builtin/fmt-merge-msg.c builtin/init-db.c
+#: builtin/merge-file.c builtin/merge.c builtin/pack-objects.c builtin/repack.c
+#: builtin/submodule--helper.c t/helper/test-simple-ipc.c
 msgid "name"
 msgstr "nama"
 
-#: builtin/clone.c:129
+#: builtin/clone.c
 msgid "use <name> instead of 'origin' to track upstream"
 msgstr "gunakan <nama> daripada 'origin' untuk lacak hulu"
 
-#: builtin/clone.c:131
+#: builtin/clone.c
 msgid "checkout <branch> instead of the remote's HEAD"
 msgstr "checkout <cabang> daripada HEAD remote"
 
-#: builtin/clone.c:133
+#: builtin/clone.c
 msgid "path to git-upload-pack on the remote"
 msgstr "jalur ke git-upload-pack pada remote"
 
-#: builtin/clone.c:134 builtin/fetch.c:182 builtin/grep.c:877
-#: builtin/pull.c:212
+#: builtin/clone.c builtin/fetch.c builtin/grep.c builtin/pull.c
 msgid "depth"
 msgstr "kedalaman"
 
-#: builtin/clone.c:135
+#: builtin/clone.c
 msgid "create a shallow clone of that depth"
 msgstr "buat klon dangkal sedalam kedalaman tersebut"
 
-#: builtin/clone.c:136 builtin/fetch.c:184 builtin/pack-objects.c:3956
-#: builtin/pull.c:215
+#: builtin/clone.c builtin/fetch.c builtin/pack-objects.c builtin/pull.c
 msgid "time"
 msgstr "waktu"
 
-#: builtin/clone.c:137
+#: builtin/clone.c
 msgid "create a shallow clone since a specific time"
 msgstr "buat klon dangkal sejak waktu yang disebutkan"
 
-#: builtin/clone.c:138 builtin/fetch.c:186 builtin/fetch.c:212
-#: builtin/pull.c:218 builtin/pull.c:243 builtin/rebase.c:1050
+#: builtin/clone.c builtin/fetch.c builtin/pull.c builtin/rebase.c
 msgid "revision"
 msgstr "revisi"
 
-#: builtin/clone.c:139 builtin/fetch.c:187 builtin/pull.c:219
+#: builtin/clone.c builtin/fetch.c builtin/pull.c
 msgid "deepen history of shallow clone, excluding rev"
 msgstr "perdalam riwayat klon dangkal, tidak termasuk rev"
 
-#: builtin/clone.c:141 builtin/submodule--helper.c:1897
-#: builtin/submodule--helper.c:2735
+#: builtin/clone.c builtin/submodule--helper.c
 msgid "clone only one branch, HEAD or --branch"
 msgstr "klon hanya satu cabang, HEAD atau --branch"
 
-#: builtin/clone.c:143
+#: builtin/clone.c
 msgid "don't clone any tags, and make later fetches not to follow them"
 msgstr "jangan klon tag apapun, dan buat pengambilan nanti tidak mengikutinya"
 
-#: builtin/clone.c:145
+#: builtin/clone.c
 msgid "any cloned submodules will be shallow"
 msgstr "submodul yang diklon akan dangkal"
 
-#: builtin/clone.c:146 builtin/init-db.c:548
+#: builtin/clone.c builtin/init-db.c
 msgid "gitdir"
 msgstr "direktori git"
 
-#: builtin/clone.c:147 builtin/init-db.c:549
+#: builtin/clone.c builtin/init-db.c
 msgid "separate git dir from working tree"
 msgstr "pisahkan direktori git dari pohon kerja"
 
-#: builtin/clone.c:148
+#: builtin/clone.c
 msgid "key=value"
 msgstr "kunci=nilai"
 
-#: builtin/clone.c:149
+#: builtin/clone.c
 msgid "set config inside the new repository"
 msgstr "setel konfigurasi di dalam repositori baru"
 
-#: builtin/clone.c:151 builtin/fetch.c:207 builtin/ls-remote.c:77
-#: builtin/pull.c:234 builtin/push.c:575 builtin/send-pack.c:200
+#: builtin/clone.c builtin/fetch.c builtin/ls-remote.c builtin/pull.c
+#: builtin/push.c builtin/send-pack.c
 msgid "server-specific"
 msgstr "spesifik ke server"
 
-#: builtin/clone.c:151 builtin/fetch.c:207 builtin/ls-remote.c:77
-#: builtin/pull.c:235 builtin/push.c:575 builtin/send-pack.c:201
+#: builtin/clone.c builtin/fetch.c builtin/ls-remote.c builtin/pull.c
+#: builtin/push.c builtin/send-pack.c
 msgid "option to transmit"
 msgstr "opsi untuk transmisi"
 
-#: builtin/clone.c:152 builtin/fetch.c:208 builtin/pull.c:238
-#: builtin/push.c:576
+#: builtin/clone.c builtin/fetch.c builtin/pull.c builtin/push.c
 msgid "use IPv4 addresses only"
 msgstr "gunakan hanya alamat IPv4"
 
-#: builtin/clone.c:154 builtin/fetch.c:210 builtin/pull.c:241
-#: builtin/push.c:578
+#: builtin/clone.c builtin/fetch.c builtin/pull.c builtin/push.c
 msgid "use IPv6 addresses only"
 msgstr "gunakan hanya alamat IPv6"
 
-#: builtin/clone.c:158
+#: builtin/clone.c
 msgid "apply partial clone filters to submodules"
 msgstr "terapkan saringan kloning parsial ke submodul"
 
-#: builtin/clone.c:160
+#: builtin/clone.c
 msgid "any cloned submodules will use their remote-tracking branch"
 msgstr "submodul yang diklon akan menggunakan cabang yang melacak remotenya"
 
-#: builtin/clone.c:162
+#: builtin/clone.c
 msgid "initialize sparse-checkout file to include only files at root"
 msgstr ""
 "inisialisasi berkas checkout tipis agar memasukkan hanya berkas pada akar"
 
-#: builtin/clone.c:237
+#: builtin/clone.c
 #, 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:310
+#: builtin/clone.c builtin/diff.c builtin/rm.c grep.c setup.c
+#, c-format
+msgid "failed to stat '%s'"
+msgstr "gagal men-stat '%s'"
+
+#: builtin/clone.c
 #, c-format
 msgid "%s exists and is not a directory"
 msgstr "%s ada dan bukan direktori"
 
-#: builtin/clone.c:328
+#: builtin/clone.c
 #, c-format
 msgid "failed to start iterator over '%s'"
 msgstr "gagal memulai iterator pada '%s'"
 
-#: builtin/clone.c:359
+#: builtin/clone.c compat/precompose_utf8.c
+#, c-format
+msgid "failed to unlink '%s'"
+msgstr "gagal menghapus tautan '%s'"
+
+#: builtin/clone.c
 #, c-format
 msgid "failed to create link '%s'"
 msgstr "gagal membuat tautan '%s'"
 
-#: builtin/clone.c:363
+#: builtin/clone.c
 #, c-format
 msgid "failed to copy file to '%s'"
 msgstr "gagal menyalin berkas ke '%s'"
 
-#: builtin/clone.c:368
+#: builtin/clone.c
 #, c-format
 msgid "failed to iterate over '%s'"
 msgstr "gagal iterasi pada '%s'"
 
-#: builtin/clone.c:395
+#: builtin/clone.c
 #, c-format
 msgid "done.\n"
 msgstr "selesai.\n"
 
-#: builtin/clone.c:409
+#: builtin/clone.c
 msgid ""
 "Clone succeeded, but checkout failed.\n"
 "You can inspect what was checked out with 'git status'\n"
@@ -13418,101 +5117,104 @@ msgstr ""
 "Anda dapat periksa apa yang dicheckout dengan 'git status'\n"
 "dan coba lagi dengan 'git restore --source=HEAD :/'\n"
 
-#: builtin/clone.c:486
+#: builtin/clone.c
 #, c-format
 msgid "Could not find remote branch %s to clone."
 msgstr "Tidak dapat menemukan cabang remote %s untuk diklon."
 
-#: builtin/clone.c:603
+#: builtin/clone.c fetch-pack.c
+msgid "remote did not send all necessary objects"
+msgstr "remote tidak mengirim semua objek yang dibutuhkan"
+
+#: builtin/clone.c
 #, c-format
 msgid "unable to update %s"
 msgstr "tidak dapat memperbarui %s"
 
-#: builtin/clone.c:651
+#: builtin/clone.c
 msgid "failed to initialize sparse-checkout"
 msgstr "gagal menginisalisasi checkout tipis"
 
-#: builtin/clone.c:674
+#: builtin/clone.c
 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:709
+#: builtin/clone.c
 msgid "unable to checkout working tree"
 msgstr "tidak dapat men-checkout pohon kerja"
 
-#: builtin/clone.c:793
+#: builtin/clone.c
 msgid "unable to write parameters to config file"
 msgstr "tidak dapat menulis parameter ke berkas konfigurasi"
 
-#: builtin/clone.c:856
+#: builtin/clone.c
 msgid "cannot repack to clean up"
 msgstr "tidak dapat memaket ulang untuk pembersihan"
 
-#: builtin/clone.c:858
+#: builtin/clone.c
 msgid "cannot unlink temporary alternates file"
 msgstr "tidak dapat batal-taut berkas alternatif sementara"
 
-#: builtin/clone.c:901
+#: builtin/clone.c
 msgid "Too many arguments."
 msgstr "Terlalu banyak argumen."
 
-#: builtin/clone.c:905 contrib/scalar/scalar.c:413
+#: builtin/clone.c contrib/scalar/scalar.c
 msgid "You must specify a repository to clone."
 msgstr "Anda harus sebutkan repositori untuk diklon."
 
-#: builtin/clone.c:918
+#: builtin/clone.c
 #, c-format
 msgid "options '%s' and '%s %s' cannot be used together"
 msgstr "opsi '%s' dan '%s %s' tidak dapat digunakan bersamaan"
 
-#: builtin/clone.c:935
+#: builtin/clone.c
 #, c-format
 msgid "repository '%s' does not exist"
 msgstr "repositori '%s' tidak ada"
 
-#: builtin/clone.c:939 builtin/fetch.c:2176
+#: builtin/clone.c builtin/fetch.c
 #, c-format
 msgid "depth %s is not a positive number"
 msgstr "kedalaman %s bukan bilangan positif"
 
-#: builtin/clone.c:949
+#: builtin/clone.c
 #, 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:955
+#: builtin/clone.c
 #, 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:969
+#: builtin/clone.c
 #, c-format
 msgid "working tree '%s' already exists."
 msgstr "pohon kerja '%s' sudah ada."
 
-#: builtin/clone.c:984 builtin/clone.c:1005 builtin/difftool.c:256
-#: builtin/log.c:2037 builtin/worktree.c:350 builtin/worktree.c:382
+#: builtin/clone.c builtin/difftool.c builtin/log.c builtin/worktree.c
 #, c-format
 msgid "could not create leading directories of '%s'"
 msgstr "tidak dapat membuat direktori pendahulu '%s'"
 
-#: builtin/clone.c:989
+#: builtin/clone.c
 #, c-format
 msgid "could not create work tree dir '%s'"
 msgstr "tidak dapat membuat direktori pohon kerja '%s'"
 
-#: builtin/clone.c:1009
+#: builtin/clone.c
 #, c-format
 msgid "Cloning into bare repository '%s'...\n"
 msgstr "Kloning ke repositori bare '%s'...\n"
 
-#: builtin/clone.c:1011
+#: builtin/clone.c
 #, c-format
 msgid "Cloning into '%s'...\n"
 msgstr "Kloning ke '%s'...\n"
 
-#: builtin/clone.c:1040
+#: builtin/clone.c
 msgid ""
 "clone --recursive is not compatible with both --reference and --reference-if-"
 "able"
@@ -13520,184 +5222,193 @@ msgstr ""
 "clone --recursive tidak kompatibel dengan baik --reference dan --reference-"
 "if-able"
 
-#: builtin/clone.c:1116 builtin/remote.c:201 builtin/remote.c:721
+#: builtin/clone.c builtin/remote.c
 #, c-format
 msgid "'%s' is not a valid remote name"
 msgstr "'%s' bukan nama remote yang valid"
 
-#: builtin/clone.c:1157
+#: builtin/clone.c
 msgid "--depth is ignored in local clones; use file:// instead."
 msgstr "--depth diabaikan di klon lokal; gunakan file:// sebagai gantinya."
 
-#: builtin/clone.c:1159
+#: builtin/clone.c
 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:1161
+#: builtin/clone.c
 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:1163
+#: builtin/clone.c
 msgid "--filter is ignored in local clones; use file:// instead."
 msgstr "--filter diabaikan di klon lokal; gunakan file:// sebagai gantinya."
 
-#: builtin/clone.c:1168
+#: builtin/clone.c fetch-pack.c
+msgid "source repository is shallow, reject to clone."
+msgstr "repositori sumber dangkal, menolak mengkloning."
+
+#: builtin/clone.c
 msgid "source repository is shallow, ignoring --local"
 msgstr "repositori sumber dangkal, abaikan --local"
 
-#: builtin/clone.c:1173
+#: builtin/clone.c
 msgid "--local is ignored"
 msgstr "--local diabaikan"
 
-#: builtin/clone.c:1185
+#: builtin/clone.c
 msgid "cannot clone from filtered bundle"
 msgstr "tidak dapat mengkloning dari bundel tersaring"
 
-#: builtin/clone.c:1265 builtin/clone.c:1324
+#: builtin/clone.c
 msgid "remote transport reported error"
 msgstr "transportasi remote melaporkan kesalahan"
 
-#: builtin/clone.c:1277 builtin/clone.c:1289
+#: builtin/clone.c
 #, c-format
 msgid "Remote branch %s not found in upstream %s"
 msgstr "Cabang remote %s tidak ditemukan di hulu %s"
 
-#: builtin/clone.c:1292
+#: builtin/clone.c
 msgid "You appear to have cloned an empty repository."
 msgstr "Anda tampaknya mengklon repositori kosong."
 
-#: builtin/column.c:10
+#: builtin/column.c
 msgid "git column [<options>]"
 msgstr ""
 
-#: builtin/column.c:27
+#: builtin/column.c
 msgid "lookup config vars"
 msgstr ""
 
-#: builtin/column.c:28 builtin/column.c:29
+#: builtin/column.c
 msgid "layout to use"
 msgstr ""
 
-#: builtin/column.c:30
+#: builtin/column.c
 msgid "maximum width"
 msgstr ""
 
-#: builtin/column.c:31
+#: builtin/column.c
 msgid "padding space on left border"
 msgstr ""
 
-#: builtin/column.c:32
+#: builtin/column.c
 msgid "padding space on right border"
 msgstr ""
 
-#: builtin/column.c:33
+#: builtin/column.c
 msgid "padding space between columns"
 msgstr ""
 
-#: builtin/column.c:51
+#: builtin/column.c
 msgid "--command must be the first argument"
 msgstr ""
 
-#: builtin/commit-graph.c:13
+#: builtin/commit-graph.c
 msgid ""
 "git commit-graph verify [--object-dir <objdir>] [--shallow] [--[no-]progress]"
 msgstr ""
 
-#: builtin/commit-graph.c:16
+#: builtin/commit-graph.c
 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:51 builtin/fetch.c:196 builtin/log.c:1813
+#: builtin/commit-graph.c builtin/fetch.c builtin/log.c
 msgid "dir"
 msgstr ""
 
-#: builtin/commit-graph.c:52
+#: builtin/commit-graph.c
 msgid "the object directory to store the graph"
 msgstr ""
 
-#: builtin/commit-graph.c:73
+#: builtin/commit-graph.c
 msgid "if the commit-graph is split, only verify the tip file"
 msgstr ""
 
-#: builtin/commit-graph.c:100
+#: builtin/commit-graph.c
 #, c-format
 msgid "Could not open commit-graph '%s'"
 msgstr ""
 
-#: builtin/commit-graph.c:137
+#: builtin/commit-graph.c
 #, c-format
 msgid "unrecognized --split argument, %s"
 msgstr ""
 
-#: builtin/commit-graph.c:150
+#: builtin/commit-graph.c
 #, c-format
 msgid "unexpected non-hex object ID: %s"
 msgstr ""
 
-#: builtin/commit-graph.c:155
+#: builtin/commit-graph.c
 #, c-format
 msgid "invalid object: %s"
 msgstr ""
 
-#: builtin/commit-graph.c:205
+#: builtin/commit-graph.c parse-options-cb.c
+#, c-format
+msgid "option `%s' expects a numerical value"
+msgstr ""
+
+#: builtin/commit-graph.c
 msgid "start walk at all refs"
 msgstr ""
 
-#: builtin/commit-graph.c:207
+#: builtin/commit-graph.c
 msgid "scan pack-indexes listed by stdin for commits"
 msgstr ""
 
-#: builtin/commit-graph.c:209
+#: builtin/commit-graph.c
 msgid "start walk at commits listed by stdin"
 msgstr ""
 
-#: builtin/commit-graph.c:211
+#: builtin/commit-graph.c
 msgid "include all commits already in the commit-graph file"
 msgstr ""
 
-#: builtin/commit-graph.c:213
+#: builtin/commit-graph.c
 msgid "enable computation for changed paths"
 msgstr ""
 
-#: builtin/commit-graph.c:215
+#: builtin/commit-graph.c
 msgid "allow writing an incremental commit-graph file"
 msgstr ""
 
-#: builtin/commit-graph.c:219
+#: builtin/commit-graph.c
 msgid "maximum number of commits in a non-base split commit-graph"
 msgstr ""
 
-#: builtin/commit-graph.c:221
+#: builtin/commit-graph.c
 msgid "maximum ratio between two levels of a split commit-graph"
 msgstr ""
 
-#: builtin/commit-graph.c:223
+#: builtin/commit-graph.c
 msgid "only expire files older than a given date-time"
 msgstr ""
 
-#: builtin/commit-graph.c:225
+#: builtin/commit-graph.c
 msgid "maximum number of changed-path Bloom filters to compute"
 msgstr ""
 
-#: builtin/commit-graph.c:251
+#: builtin/commit-graph.c
 msgid "use at most one of --reachable, --stdin-commits, or --stdin-packs"
 msgstr ""
 
-#: builtin/commit-graph.c:282
+#: builtin/commit-graph.c
 msgid "Collecting commits from input"
 msgstr ""
 
-#: builtin/commit-graph.c:328 builtin/multi-pack-index.c:259
+#: builtin/commit-graph.c builtin/multi-pack-index.c
 #, c-format
 msgid "unrecognized subcommand: %s"
 msgstr ""
 
-#: builtin/commit-tree.c:18
+#: builtin/commit-tree.c
 msgid ""
 "git commit-tree [(-p <parent>)...] [-S[<keyid>]] [(-m <message>)...] [(-F "
 "<file>)...] <tree>"
@@ -13705,70 +5416,69 @@ msgstr ""
 "git commit-tree [(-p <induk>)...] [-S[<id kunci>]] [(-m <pesan>)...] [(-F "
 "<berkas>)...] <pohon>"
 
-#: builtin/commit-tree.c:31
+#: builtin/commit-tree.c
 #, c-format
 msgid "duplicate parent %s ignored"
 msgstr "induk duplikat %s diabaikan"
 
-#: builtin/commit-tree.c:56 builtin/commit-tree.c:134 builtin/log.c:590
+#: builtin/commit-tree.c builtin/log.c
 #, c-format
 msgid "not a valid object name %s"
 msgstr "bukan nama objek valid %s"
 
-#: builtin/commit-tree.c:94
+#: builtin/commit-tree.c
 #, c-format
 msgid "git commit-tree: failed to read '%s'"
 msgstr "git commit-tree: gagal membaca '%s'"
 
-#: builtin/commit-tree.c:96
+#: builtin/commit-tree.c
 #, c-format
 msgid "git commit-tree: failed to close '%s'"
 msgstr "git commit-tree: gagal menutup '%s'"
 
-#: builtin/commit-tree.c:109
+#: builtin/commit-tree.c
 msgid "parent"
 msgstr "induk"
 
-#: builtin/commit-tree.c:110
+#: builtin/commit-tree.c
 msgid "id of a parent commit object"
 msgstr "id objek komit induk"
 
-#: builtin/commit-tree.c:112 builtin/commit.c:1626 builtin/merge.c:284
-#: builtin/notes.c:407 builtin/notes.c:573 builtin/stash.c:1666
-#: builtin/tag.c:455
+#: builtin/commit-tree.c builtin/commit.c builtin/merge.c builtin/notes.c
+#: builtin/stash.c builtin/tag.c
 msgid "message"
 msgstr "pesan"
 
-#: builtin/commit-tree.c:113 builtin/commit.c:1626
+#: builtin/commit-tree.c builtin/commit.c
 msgid "commit message"
 msgstr "pesan komit"
 
-#: builtin/commit-tree.c:116
+#: builtin/commit-tree.c
 msgid "read commit log message from file"
 msgstr "baca pesan log komit dari berkas"
 
-#: builtin/commit-tree.c:119 builtin/commit.c:1643 builtin/merge.c:303
-#: builtin/pull.c:180 builtin/revert.c:118
+#: builtin/commit-tree.c builtin/commit.c builtin/merge.c builtin/pull.c
+#: builtin/revert.c
 msgid "GPG sign commit"
 msgstr "Tandatangani komit dengan GPG"
 
-#: builtin/commit-tree.c:131
+#: builtin/commit-tree.c
 msgid "must give exactly one tree"
 msgstr "harus berikan tepat satu pohon"
 
-#: builtin/commit-tree.c:138
+#: builtin/commit-tree.c
 msgid "git commit-tree: failed to read"
 msgstr "git commit-tree: gagal membaca"
 
-#: builtin/commit.c:43
+#: builtin/commit.c
 msgid "git commit [<options>] [--] <pathspec>..."
 msgstr "git commit [<opsi>] [--] <spek jalur>..."
 
-#: builtin/commit.c:48
+#: builtin/commit.c
 msgid "git status [<options>] [--] <pathspec>..."
 msgstr "git status [<opsi>] [--] <spek jalur>..."
 
-#: builtin/commit.c:53
+#: builtin/commit.c
 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"
@@ -13779,7 +5489,7 @@ msgstr ""
 "dengan --allow-empty, atau Anda dapat menghapus keseluruhan komit\n"
 "dengan \"git reset HEAD^\".\n"
 
-#: builtin/commit.c:58
+#: builtin/commit.c
 msgid ""
 "The previous cherry-pick is now empty, possibly due to conflict resolution.\n"
 "If you wish to commit it anyway, use:\n"
@@ -13793,15 +5503,15 @@ msgstr ""
 "    git commit --allow-empty\n"
 "\n"
 
-#: builtin/commit.c:65
+#: builtin/commit.c
 msgid "Otherwise, please use 'git rebase --skip'\n"
 msgstr "Selain itu, gunakan 'git rebase --skip'\n"
 
-#: builtin/commit.c:68
+#: builtin/commit.c
 msgid "Otherwise, please use 'git cherry-pick --skip'\n"
 msgstr "Selain itu, gunakan 'git cherry-pick --skip'\n"
 
-#: builtin/commit.c:71
+#: builtin/commit.c
 msgid ""
 "and then use:\n"
 "\n"
@@ -13822,69 +5532,74 @@ msgstr ""
 "    git cherry-pick --skip\n"
 "\n"
 
-#: builtin/commit.c:326
+#: builtin/commit.c
 msgid "failed to unpack HEAD tree object"
 msgstr "gagal membuka objek pohon HEAD"
 
-#: builtin/commit.c:376
+#: builtin/commit.c
 msgid "No paths with --include/--only does not make sense."
 msgstr "Tanpa jalur dengan --include/--only tidak masuk akal."
 
-#: builtin/commit.c:388
+#: builtin/commit.c
 msgid "unable to create temporary index"
 msgstr "tidak dapat membuat indeks sementara"
 
-#: builtin/commit.c:397
+#: builtin/commit.c
 msgid "interactive add failed"
 msgstr "penambahan interaktif gagal"
 
-#: builtin/commit.c:412
+#: builtin/commit.c
 msgid "unable to update temporary index"
 msgstr "tidak dapat memperbarui indeks sementara"
 
-#: builtin/commit.c:414
+#: builtin/commit.c
 msgid "Failed to update main cache tree"
 msgstr "gagal memperbarui tembolok pohon utama"
 
-#: builtin/commit.c:439 builtin/commit.c:462 builtin/commit.c:510
+#: builtin/commit.c
 msgid "unable to write new_index file"
 msgstr "tidak dapat menulis berkas new_index"
 
-#: builtin/commit.c:491
+#: builtin/commit.c
 msgid "cannot do a partial commit during a merge."
 msgstr "tidak dapat melakukan komit sebagian selama penggabungan."
 
-#: builtin/commit.c:493
+#: builtin/commit.c
 msgid "cannot do a partial commit during a cherry-pick."
 msgstr "tidak dapat melakukan komit sebagian selama pemetikan ceri."
 
-#: builtin/commit.c:495
+#: builtin/commit.c
 msgid "cannot do a partial commit during a rebase."
 msgstr "tidak dapat melakukan komit sebagian selama pendasaran ulang."
 
-#: builtin/commit.c:503
+#: builtin/commit.c
 msgid "cannot read the index"
 msgstr "tidak dapat membaca indeks"
 
-#: builtin/commit.c:522
+#: builtin/commit.c
 msgid "unable to write temporary index file"
 msgstr "tidak dapat menulis berkas indeks sementara"
 
-#: builtin/commit.c:620
+#: builtin/commit.c
 #, c-format
 msgid "commit '%s' lacks author header"
 msgstr "komit '%s' kurang kepala pengarang"
 
-#: builtin/commit.c:622
+#: builtin/commit.c
 #, c-format
 msgid "commit '%s' has malformed author line"
 msgstr "komit '%s' ada baris pengarang cacat"
 
-#: builtin/commit.c:641
+#: builtin/commit.c
 msgid "malformed --author parameter"
 msgstr "parameter --author cacat"
 
-#: builtin/commit.c:694
+#: builtin/commit.c ident.c
+#, c-format
+msgid "invalid date format: %s"
+msgstr "format tanggal tidak valid: %s"
+
+#: builtin/commit.c
 msgid ""
 "unable to select a comment character that is not used\n"
 "in the current commit message"
@@ -13892,43 +5607,48 @@ msgstr ""
 "tidak dapat memilih karakter komentar yang tidak terpakai\n"
 "dalam pesan komit saat ini"
 
-#: builtin/commit.c:750 builtin/commit.c:784 builtin/commit.c:1170
+#: builtin/commit.c
 #, c-format
 msgid "could not lookup commit %s"
 msgstr "tidak dapat mencari komit %s"
 
-#: builtin/commit.c:762 builtin/shortlog.c:417
+#: builtin/commit.c builtin/shortlog.c
 #, c-format
 msgid "(reading log message from standard input)\n"
 msgstr "(baca pesan log dari standar masukan)\n"
 
-#: builtin/commit.c:764
+#: builtin/commit.c
 msgid "could not read log from standard input"
 msgstr "tidak dapat membaca log dari standar masukan"
 
-#: builtin/commit.c:768
+#: builtin/commit.c
 #, c-format
 msgid "could not read log file '%s'"
 msgstr "tidak dapat membaca berkas log '%s'"
 
-#: builtin/commit.c:805
+#: builtin/commit.c
 #, c-format
 msgid "options '%s' and '%s:%s' cannot be used together"
 msgstr "opsi '%s' dan '%s:%s' tidak dapat digunakan bersamaan"
 
-#: builtin/commit.c:817 builtin/commit.c:833
+#: builtin/commit.c
 msgid "could not read SQUASH_MSG"
 msgstr "tidak dapat membaca SQUASH_MSG"
 
-#: builtin/commit.c:824
+#: builtin/commit.c
 msgid "could not read MERGE_MSG"
 msgstr "tidak dapat membaca MERGE_MSG"
 
-#: builtin/commit.c:884
+#: builtin/commit.c bundle.c rerere.c sequencer.c
+#, c-format
+msgid "could not open '%s'"
+msgstr "tidak dapat membuka '%s'"
+
+#: builtin/commit.c
 msgid "could not write commit template"
 msgstr "tidak dapat menulis templat komit"
 
-#: builtin/commit.c:897
+#: builtin/commit.c
 #, c-format
 msgid ""
 "Please enter the commit message for your changes. Lines starting\n"
@@ -13937,7 +5657,7 @@ msgstr ""
 "Mohon masukkan pesan komit untuk perubahan Anda. Baris yang diawali\n"
 "dengan '%c' akan diabaikan.\n"
 
-#: builtin/commit.c:899
+#: builtin/commit.c
 #, c-format
 msgid ""
 "Please enter the commit message for your changes. Lines starting\n"
@@ -13946,16 +5666,16 @@ msgstr ""
 "Mohon masukkan pesan komit untuk perubahan Anda. Baris yang diawali\n"
 "dengan '%c' akan diabaikan, dan pesan kosong batalkan komit.\n"
 
-#: builtin/commit.c:903
+#: builtin/commit.c
 #, 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 ""
 "Mohon masukkan pesan komit untuk perubahan Anda. Baris yang diawali\n"
-"dengan '%c' akan tetap; Anda dapat menghapus itu jika Anda mau.\n"
+"dengan '%c' akan tetap; Anda dapat menghapusnya jika Anda mau.\n"
 
-#: builtin/commit.c:907
+#: builtin/commit.c
 #, c-format
 msgid ""
 "Please enter the commit message for your changes. Lines starting\n"
@@ -13963,10 +5683,10 @@ msgid ""
 "An empty message aborts the commit.\n"
 msgstr ""
 "Mohon masukkan pesan komit untuk perubahan Anda. Baris yang diawali\n"
-"dengan '%c' akan tetap; Anda dapat menghapus itu jika Anda mau.\n"
+"dengan '%c' akan tetap; Anda dapat menghapusnya jika Anda mau.\n"
 "Pesan kosong batalkan komit.\n"
 
-#: builtin/commit.c:919
+#: builtin/commit.c
 msgid ""
 "\n"
 "It looks like you may be committing a merge.\n"
@@ -13980,7 +5700,7 @@ msgstr ""
 "\tgit update-ref -d MERGE_HEAD\n"
 "dan coba lagi.\n"
 
-#: builtin/commit.c:924
+#: builtin/commit.c
 msgid ""
 "\n"
 "It looks like you may be committing a cherry-pick.\n"
@@ -13994,147 +5714,144 @@ msgstr ""
 "\tgit update-ref -d CHERRY_PICK_HEAD\n"
 "dan coba lagi.\n"
 
-#: builtin/commit.c:951
+#: builtin/commit.c
 #, c-format
 msgid "%sAuthor:    %.*s <%.*s>"
 msgstr "%sPengarang:    %.*s <%.*s>"
 
-#: builtin/commit.c:959
+#: builtin/commit.c
 #, c-format
 msgid "%sDate:      %s"
 msgstr "%sTanggal:       %s"
 
-#: builtin/commit.c:966
+#: builtin/commit.c
 #, c-format
 msgid "%sCommitter: %.*s <%.*s>"
 msgstr "%sPengkomit: %.*s <%.*s>"
 
-#: builtin/commit.c:984
+#: builtin/commit.c
 msgid "Cannot read index"
 msgstr "Tidak dapat membaca indeks"
 
-#: builtin/commit.c:1029
+#: builtin/commit.c
 msgid "unable to pass trailers to --trailers"
 msgstr "tidak dapat melewatkan trailer ke --trailers"
 
-#: builtin/commit.c:1069
+#: builtin/commit.c
 msgid "Error building trees"
 msgstr "Kesalahan membangun pohon"
 
-#: builtin/commit.c:1083 builtin/tag.c:317
+#: builtin/commit.c builtin/tag.c
 #, 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:1128
+#: builtin/commit.c
 #, 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:1142
+#: builtin/commit.c
 #, c-format
 msgid "Invalid ignored mode '%s'"
 msgstr "Mode terabaikan '%s' tidak valid"
 
-#: builtin/commit.c:1160 builtin/commit.c:1450
+#: builtin/commit.c
 #, c-format
 msgid "Invalid untracked files mode '%s'"
 msgstr "Mode berkas tak terlacak '%s' tidak valid"
 
-#: builtin/commit.c:1231
+#: builtin/commit.c
 msgid "You are in the middle of a merge -- cannot reword."
 msgstr "Anda berada di tengah penggabungan -- tidak dapat menulis ulang."
 
-#: builtin/commit.c:1233
+#: builtin/commit.c
 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:1236
+#: builtin/commit.c
 #, c-format
 msgid "reword option of '%s' and path '%s' cannot be used together"
 msgstr "opsi reword '%s' dan jalur '%s' tidak dapat digunakan bersamaan"
 
-#: builtin/commit.c:1238
+#: builtin/commit.c
 #, c-format
 msgid "reword option of '%s' and '%s' cannot be used together"
 msgstr "opsi reword '%s' dan '%s' tidak dapat digunakan bersamaan"
 
-#: builtin/commit.c:1263
+#: builtin/commit.c
 msgid "You have nothing to amend."
 msgstr "Anda tidak punya apapun untuk diubah."
 
-#: builtin/commit.c:1266
+#: builtin/commit.c
 msgid "You are in the middle of a merge -- cannot amend."
 msgstr "Anda berada di tengah penggabungan -- tidak dapat mengubah."
 
-#: builtin/commit.c:1268
+#: builtin/commit.c
 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:1270
+#: builtin/commit.c
 msgid "You are in the middle of a rebase -- cannot amend."
 msgstr "Anda berada di tengah pendasaran ulang -- tidak dapat mengubah."
 
-#: builtin/commit.c:1290
+#: builtin/commit.c
 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:1337
+#: builtin/commit.c
 #, c-format
 msgid "unknown option: --fixup=%s:%s"
 msgstr "opsi tidak dikenal: --fixup=%s:%s"
 
-#: builtin/commit.c:1354
+#: builtin/commit.c
 #, c-format
 msgid "paths '%s ...' with -a does not make sense"
 msgstr "jalur '%s ...' dengan -a tidak masuk akal"
 
-#: builtin/commit.c:1485 builtin/commit.c:1654
+#: builtin/commit.c
 msgid "show status concisely"
 msgstr "perlihatkan status dengan ringkas"
 
-#: builtin/commit.c:1487 builtin/commit.c:1656
+#: builtin/commit.c
 msgid "show branch information"
 msgstr "perlihatkan informasi cabang"
 
-#: builtin/commit.c:1489
+#: builtin/commit.c
 msgid "show stash information"
 msgstr "perlihatkan informasi stase"
 
-#: builtin/commit.c:1491 builtin/commit.c:1658
+#: builtin/commit.c
 msgid "compute full ahead/behind values"
 msgstr "hitung nilai didepan/dibelakang penuh"
 
-#: builtin/commit.c:1493
+#: builtin/commit.c
 msgid "version"
 msgstr "versi"
 
-#: builtin/commit.c:1493 builtin/commit.c:1660 builtin/push.c:551
-#: builtin/worktree.c:765
+#: builtin/commit.c builtin/push.c builtin/worktree.c
 msgid "machine-readable output"
 msgstr "keluaran yang dapat dibaca mesin"
 
-#: builtin/commit.c:1496 builtin/commit.c:1662
+#: builtin/commit.c
 msgid "show status in long format (default)"
 msgstr "perlihatkan status dalam format panjang (asali)"
 
-#: builtin/commit.c:1499 builtin/commit.c:1665
+#: builtin/commit.c
 msgid "terminate entries with NUL"
 msgstr "akhiri entri dengan NUL"
 
-#: builtin/commit.c:1501 builtin/commit.c:1505 builtin/commit.c:1668
-#: builtin/fast-export.c:1172 builtin/fast-export.c:1175
-#: builtin/fast-export.c:1178 builtin/rebase.c:1139 parse-options.h:368
+#: builtin/commit.c builtin/fast-export.c builtin/rebase.c parse-options.h
 msgid "mode"
 msgstr "mode"
 
-#: builtin/commit.c:1502 builtin/commit.c:1668
+#: builtin/commit.c
 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:1506
+#: builtin/commit.c
 msgid ""
 "show ignored files, optional modes: traditional, matching, no. (Default: "
 "traditional)"
@@ -14142,11 +5859,11 @@ msgstr ""
 "perlihatkan berkas terabaikan, mode opsional: traditional, matching, no. "
 "(Asali: traditional)"
 
-#: builtin/commit.c:1508 parse-options.h:197
+#: builtin/commit.c parse-options.h
 msgid "when"
 msgstr "bila"
 
-#: builtin/commit.c:1509
+#: builtin/commit.c
 msgid ""
 "ignore changes to submodules, optional when: all, dirty, untracked. "
 "(Default: all)"
@@ -14154,192 +5871,195 @@ msgstr ""
 "abaikan perubahan submodul, bila opsional: all, dirty, untracked. (Asali: "
 "all)"
 
-#: builtin/commit.c:1511
+#: builtin/commit.c
 msgid "list untracked files in columns"
 msgstr "sebut berkas tak terlacak dalam kolom"
 
-#: builtin/commit.c:1512
+#: builtin/commit.c
 msgid "do not detect renames"
 msgstr "jangan deteksi penggantian nama"
 
-#: builtin/commit.c:1514
+#: builtin/commit.c
 msgid "detect renames, optionally set similarity index"
 msgstr "deteksi penggantian nama, setel indeks kemiripan secara opsional"
 
-#: builtin/commit.c:1537
+#: builtin/commit.c
 msgid "Unsupported combination of ignored and untracked-files arguments"
 msgstr "Kombinasi argumen berkas terabaikan dan tak terlacak tidak didukung"
 
-#: builtin/commit.c:1619
+#: builtin/commit.c
 msgid "suppress summary after successful commit"
 msgstr "sembunyikan rangkuman setelah komit berhasil"
 
-#: builtin/commit.c:1620
+#: builtin/commit.c
 msgid "show diff in commit message template"
 msgstr "perlihatkan diff dalam templat pesan komit"
 
-#: builtin/commit.c:1622
+#: builtin/commit.c
 msgid "Commit message options"
 msgstr "Opsi pesan komit"
 
-#: builtin/commit.c:1623 builtin/merge.c:288 builtin/tag.c:457
+#: builtin/commit.c builtin/merge.c builtin/tag.c
 msgid "read message from file"
 msgstr "Baca pesan dari berkas"
 
-#: builtin/commit.c:1624
+#: builtin/commit.c
 msgid "author"
 msgstr "pengarang"
 
-#: builtin/commit.c:1624
+#: builtin/commit.c
 msgid "override author for commit"
 msgstr "timpa pengarang komit"
 
-#: builtin/commit.c:1625 builtin/gc.c:551
+#: builtin/commit.c builtin/gc.c
 msgid "date"
 msgstr "tangal"
 
-#: builtin/commit.c:1625
+#: builtin/commit.c
 msgid "override date for commit"
 msgstr "timpa tanggal komit"
 
-#: builtin/commit.c:1627 builtin/commit.c:1628 builtin/commit.c:1634
-#: parse-options.h:360 ref-filter.h:89
+#: builtin/commit.c parse-options.h ref-filter.h
 msgid "commit"
 msgstr "komit"
 
-#: builtin/commit.c:1627
+#: builtin/commit.c
 msgid "reuse and edit message from specified commit"
 msgstr "gunakan kembali dan sunting pesan dari komit tersebut"
 
-#: builtin/commit.c:1628
+#: builtin/commit.c
 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:1633
+#: builtin/commit.c
 msgid "[(amend|reword):]commit"
 msgstr "[(amend|reword):]komit"
 
-#: builtin/commit.c:1633
+#: builtin/commit.c
 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:1634
+#: builtin/commit.c
 msgid "use autosquash formatted message to squash specified commit"
 msgstr "gunakan pesan terformat autosquash untuk lumat komit tersebut"
 
-#: builtin/commit.c:1635
+#: builtin/commit.c
 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:1636 builtin/interpret-trailers.c:111
+#: builtin/commit.c builtin/interpret-trailers.c
 msgid "trailer"
 msgstr "trailer"
 
-#: builtin/commit.c:1636
+#: builtin/commit.c
 msgid "add custom trailer(s)"
 msgstr "tambahkan trailer kustom"
 
-#: builtin/commit.c:1637 builtin/log.c:1788 builtin/merge.c:306
-#: builtin/pull.c:146 builtin/revert.c:110
+#: builtin/commit.c builtin/log.c builtin/merge.c builtin/pull.c
+#: builtin/revert.c
 msgid "add a Signed-off-by trailer"
 msgstr "tambahkan trailer Signed-off-by"
 
-#: builtin/commit.c:1638
+#: builtin/commit.c
 msgid "use specified template file"
 msgstr "gunakan templat berkas tersebut"
 
-#: builtin/commit.c:1639
+#: builtin/commit.c
 msgid "force edit of commit"
 msgstr "paksa sunting komit"
 
-#: builtin/commit.c:1641
+#: builtin/commit.c
 msgid "include status in commit message template"
 msgstr "masukkan status dalam templat pesaan komit"
 
-#: builtin/commit.c:1646
+#: builtin/commit.c
 msgid "Commit contents options"
 msgstr "Opsi isi komit"
 
-#: builtin/commit.c:1647
+#: builtin/commit.c
 msgid "commit all changed files"
 msgstr "komit semua berkas terubah"
 
-#: builtin/commit.c:1648
+#: builtin/commit.c
 msgid "add specified files to index for commit"
 msgstr "tambahakn berkas tersebut ke indeks untuk dikomit"
 
-#: builtin/commit.c:1649
+#: builtin/commit.c
 msgid "interactively add files"
 msgstr "tambah berkas secara interaktif"
 
-#: builtin/commit.c:1650
+#: builtin/commit.c
 msgid "interactively add changes"
 msgstr "tambah perubahan secara interaktif"
 
-#: builtin/commit.c:1651
+#: builtin/commit.c
 msgid "commit only specified files"
 msgstr "hanya komit berkas tersebut"
 
-#: builtin/commit.c:1652
+#: builtin/commit.c
 msgid "bypass pre-commit and commit-msg hooks"
 msgstr "lewati kail pre-commit dan commit-msg"
 
-#: builtin/commit.c:1653
+#: builtin/commit.c
 msgid "show what would be committed"
 msgstr "perlihatkan apa yang akan dikomit"
 
-#: builtin/commit.c:1666
+#: builtin/commit.c
 msgid "amend previous commit"
 msgstr "ubah komit sebelumnya"
 
-#: builtin/commit.c:1667
+#: builtin/commit.c
 msgid "bypass post-rewrite hook"
 msgstr "lewati kail post-rewrite"
 
-#: builtin/commit.c:1674
+#: builtin/commit.c
 msgid "ok to record an empty change"
 msgstr "ok merekam perubahan kosong"
 
-#: builtin/commit.c:1676
+#: builtin/commit.c
 msgid "ok to record a change with an empty message"
 msgstr "ok merekam perubahan dengan pesan kosong"
 
-#: builtin/commit.c:1752
+#: builtin/commit.c sequencer.c
+msgid "could not parse HEAD commit"
+msgstr "tidak dapat menguraikan komit HEAD"
+
+#: builtin/commit.c
 #, c-format
 msgid "Corrupt MERGE_HEAD file (%s)"
 msgstr "Berkas MERGE_HEAD (%s) rusak"
 
-#: builtin/commit.c:1759
+#: builtin/commit.c
 msgid "could not read MERGE_MODE"
 msgstr "tidak dapat membaca MERGE_MODE"
 
-#: builtin/commit.c:1780
+#: builtin/commit.c
 #, c-format
 msgid "could not read commit message: %s"
 msgstr "tidak dapat membaca pesan komit: %s"
 
-#: builtin/commit.c:1787
+#: builtin/commit.c
 #, c-format
 msgid "Aborting commit due to empty commit message.\n"
 msgstr "Batalkan komit karena pesan komit kosong.\n"
 
-#: builtin/commit.c:1792
+#: builtin/commit.c
 #, c-format
 msgid "Aborting commit; you did not edit the message.\n"
 msgstr "Batalkan komit; Anda tidak menyunting pesan.\n"
 
-#: builtin/commit.c:1803
+#: builtin/commit.c
 #, c-format
 msgid "Aborting commit due to empty commit message body.\n"
 msgstr "Batalkan komit karena badan pesan komit kosong.\n"
 
-#: builtin/commit.c:1839
+#: builtin/commit.c
 msgid ""
 "repository has been updated, but unable to write\n"
 "new_index file. Check that disk is not full and quota is\n"
@@ -14349,228 +6069,233 @@ msgstr ""
 "berkas new_index. Periksa bahwa disk tidak penuh dan kuota\n"
 "tidak terlampaui, lalu \"git restore --staged :/\" untuk pulihkan."
 
-#: builtin/config.c:11
+#: builtin/config.c
 msgid "git config [<options>]"
 msgstr "git config [<opsi>]"
 
-#: builtin/config.c:109 builtin/env--helper.c:27
+#: builtin/config.c builtin/env--helper.c
 #, c-format
 msgid "unrecognized --type argument, %s"
 msgstr "argumen --type tidak dikenal %s"
 
-#: builtin/config.c:121
+#: builtin/config.c
 msgid "only one type at a time"
 msgstr "hanya satu tipe pada suatu saat"
 
-#: builtin/config.c:130
+#: builtin/config.c
 msgid "Config file location"
 msgstr "Lokasi berkas konfigurasi"
 
-#: builtin/config.c:131
+#: builtin/config.c
 msgid "use global config file"
 msgstr "gunakan berkas konfigurasi global"
 
-#: builtin/config.c:132
+#: builtin/config.c
 msgid "use system config file"
 msgstr "gunakan berkas konfigurasi sistem"
 
-#: builtin/config.c:133
+#: builtin/config.c
 msgid "use repository config file"
 msgstr "gunakan berkas konfigurasi repositori"
 
-#: builtin/config.c:134
+#: builtin/config.c
 msgid "use per-worktree config file"
 msgstr "gunakan berkas konfigurasi per pohon kerja"
 
-#: builtin/config.c:135
+#: builtin/config.c
 msgid "use given config file"
 msgstr "gunakan berkas konfigurasi yang diberikan"
 
-#: builtin/config.c:136
+#: builtin/config.c
 msgid "blob-id"
 msgstr "id blob"
 
-#: builtin/config.c:136
+#: builtin/config.c
 msgid "read config from given blob object"
 msgstr "baca konfigurasi dari objek blob yang diberikan"
 
-#: builtin/config.c:137
+#: builtin/config.c
 msgid "Action"
 msgstr "Tindakan"
 
-#: builtin/config.c:138
+#: builtin/config.c
 msgid "get value: name [value-pattern]"
 msgstr "dapatkan nilai: name [pola nilai]"
 
-#: builtin/config.c:139
+#: builtin/config.c
 msgid "get all values: key [value-pattern]"
 msgstr "dapatkan semua nilai: key [pola nilai]"
 
-#: builtin/config.c:140
+#: builtin/config.c
 msgid "get values for regexp: name-regex [value-pattern]"
 msgstr "dapatkan nilai dari regexp: name-regex [pola nilai]"
 
-#: builtin/config.c:141
+#: builtin/config.c
 msgid "get value specific for the URL: section[.var] URL"
 msgstr "dapatkan nilai spesifik untuk URL: section[.var] URL"
 
-#: builtin/config.c:142
+#: builtin/config.c
 msgid "replace all matching variables: name value [value-pattern]"
 msgstr "ganti semua variabel yang cocok: name value [pola nilai]"
 
-#: builtin/config.c:143
+#: builtin/config.c
 msgid "add a new variable: name value"
 msgstr "tambahkan variabel baru: name value"
 
-#: builtin/config.c:144
+#: builtin/config.c
 msgid "remove a variable: name [value-pattern]"
 msgstr "hapus variabel: name [pola nilai]"
 
-#: builtin/config.c:145
+#: builtin/config.c
 msgid "remove all matches: name [value-pattern]"
 msgstr "hapus semua cocokan: name [pola nilai]"
 
-#: builtin/config.c:146
+#: builtin/config.c
 msgid "rename section: old-name new-name"
 msgstr "ganti nama bagian: old-name new-name"
 
-#: builtin/config.c:147
+#: builtin/config.c
 msgid "remove a section: name"
 msgstr "hapus bagian: name"
 
-#: builtin/config.c:148
+#: builtin/config.c
 msgid "list all"
 msgstr "daftar semua"
 
-#: builtin/config.c:149
+#: builtin/config.c
 msgid "use string equality when comparing values to 'value-pattern'"
 msgstr "gunakan kesamaan untai ketika membandingkan nilai ke 'pola nilai'"
 
-#: builtin/config.c:150
+#: builtin/config.c
 msgid "open an editor"
 msgstr "buka penyunting"
 
-#: builtin/config.c:151
+#: builtin/config.c
 msgid "find the color configured: slot [default]"
 msgstr "temukan warna terkonfigurasi: slot [asali]"
 
-#: builtin/config.c:152
+#: builtin/config.c
 msgid "find the color setting: slot [stdout-is-tty]"
 msgstr "temukan setelan warna: slot [stdout-is-tty]"
 
-#: builtin/config.c:153
+#: builtin/config.c
 msgid "Type"
 msgstr "Tipe"
 
-#: builtin/config.c:154 builtin/env--helper.c:42 builtin/hash-object.c:97
+#: builtin/config.c builtin/env--helper.c builtin/hash-object.c
 msgid "type"
 msgstr "tipe"
 
-#: builtin/config.c:154 builtin/env--helper.c:43
+#: builtin/config.c builtin/env--helper.c
 msgid "value is given this type"
 msgstr "Nilai diberikan tipe ini"
 
-#: builtin/config.c:155
+#: builtin/config.c
 msgid "value is \"true\" or \"false\""
 msgstr "Nilai adala \"true\" atau \"false\""
 
-#: builtin/config.c:156
+#: builtin/config.c
 msgid "value is decimal number"
 msgstr "nilai adalah angka desimal"
 
-#: builtin/config.c:157
+#: builtin/config.c
 msgid "value is --bool or --int"
 msgstr "nilai adalah --bool atau --int"
 
-#: builtin/config.c:158
+#: builtin/config.c
 msgid "value is --bool or string"
 msgstr "nilai adalah --bool atau untai"
 
-#: builtin/config.c:159
+#: builtin/config.c
 msgid "value is a path (file or directory name)"
 msgstr "nilai adalah jalur (nama berkas atau direktori)"
 
-#: builtin/config.c:160
+#: builtin/config.c
 msgid "value is an expiry date"
 msgstr "nilai adalah tanggal kadaluarsa"
 
-#: builtin/config.c:161
+#: builtin/config.c
 msgid "Other"
 msgstr "Lainnya"
 
-#: builtin/config.c:162
+#: builtin/config.c
 msgid "terminate values with NUL byte"
 msgstr "Akhiri nilai dengan bita NUL"
 
-#: builtin/config.c:163
+#: builtin/config.c
 msgid "show variable names only"
 msgstr "perlihatkan hanya nama variabel"
 
-#: builtin/config.c:164
+#: builtin/config.c
 msgid "respect include directives on lookup"
 msgstr "segani arahan masukkan pada pencarian"
 
-#: builtin/config.c:165
+#: builtin/config.c
 msgid "show origin of config (file, standard input, blob, command line)"
 msgstr ""
 "perlihatkan asal konfigurasi (berkas, masukan standar, blob, baris perintah)"
 
-#: builtin/config.c:166
+#: builtin/config.c
 msgid "show scope of config (worktree, local, global, system, command)"
 msgstr ""
 "perlihatkan cakupan konfigurasi (pohon kerja, lokal, global, sistem, "
 "perintah)"
 
-#: builtin/config.c:167 builtin/env--helper.c:45
+#: builtin/config.c builtin/env--helper.c
 msgid "value"
 msgstr "nilai"
 
-#: builtin/config.c:167
+#: builtin/config.c
 msgid "with --get, use default value when missing entry"
 msgstr "dengan --get, gunakan nilai asali ketika kehilangan entri"
 
-#: builtin/config.c:181
+#: builtin/config.c
 #, c-format
 msgid "wrong number of arguments, should be %d"
 msgstr "jumlah argumen salah, seharusnya %d"
 
-#: builtin/config.c:183
+#: builtin/config.c
 #, c-format
 msgid "wrong number of arguments, should be from %d to %d"
 msgstr "jumlah argumen salah, seharusnya dari %d ke %d"
 
-#: builtin/config.c:339
+#: builtin/config.c
 #, c-format
 msgid "invalid key pattern: %s"
 msgstr "pola kunci tidak valid: %s"
 
-#: builtin/config.c:377
+#: builtin/config.c config.c
+#, c-format
+msgid "invalid pattern: %s"
+msgstr "pola tidak valid: %s"
+
+#: builtin/config.c
 #, c-format
 msgid "failed to format default config value: %s"
 msgstr "gagal memformat nilai konfigurasi asali: %s"
 
-#: builtin/config.c:441
+#: builtin/config.c
 #, c-format
 msgid "cannot parse color '%s'"
 msgstr "tidak dapat menguraikan warna '%s'"
 
-#: builtin/config.c:483
+#: builtin/config.c
 msgid "unable to parse default color value"
 msgstr "tidak dapat menguraikan nilai warna asali"
 
-#: builtin/config.c:536 builtin/config.c:833
+#: builtin/config.c
 msgid "not in a git directory"
 msgstr "bukan di dalam direktori git"
 
-#: builtin/config.c:539
+#: builtin/config.c
 msgid "writing to stdin is not supported"
 msgstr "menulis ke stdin tidak didukung"
 
-#: builtin/config.c:542
+#: builtin/config.c
 msgid "writing config blobs is not supported"
 msgstr "menulis blob konfigurasi tidak didukung"
 
-#: builtin/config.c:627
+#: builtin/config.c
 #, c-format
 msgid ""
 "# This is Git's per-user configuration file.\n"
@@ -14585,27 +6310,27 @@ msgstr ""
 "#\tname = %s\n"
 "#\temail = %s\n"
 
-#: builtin/config.c:652
+#: builtin/config.c
 msgid "only one config file at a time"
 msgstr "hanya satu berkas konfigurasi pada suatu saat"
 
-#: builtin/config.c:658
+#: builtin/config.c
 msgid "--local can only be used inside a git repository"
 msgstr "--local hanya dapat digunakan di dalam repositori git"
 
-#: builtin/config.c:660
+#: builtin/config.c
 msgid "--blob can only be used inside a git repository"
 msgstr "--blob hanya dapat digunakan di dalam repositori git"
 
-#: builtin/config.c:662
+#: builtin/config.c
 msgid "--worktree can only be used inside a git repository"
 msgstr "--worktree hanya dapat digunakan di dalam repositori git"
 
-#: builtin/config.c:684
+#: builtin/config.c
 msgid "$HOME not set"
 msgstr "$HOME tak disetel"
 
-#: builtin/config.c:708
+#: builtin/config.c
 msgid ""
 "--worktree cannot be used with multiple working trees unless the config\n"
 "extension worktreeConfig is enabled. Please read \"CONFIGURATION FILE\"\n"
@@ -14615,19 +6340,19 @@ msgstr ""
 "konfigurasi ekstensi worktreeConfig diaktifkan. Mohon baca bagian\n"
 "\"CONFIGURATION FILE\" di \"git help worktree\" untuk selengkapnya"
 
-#: builtin/config.c:743
+#: builtin/config.c
 msgid "--get-color and variable type are incoherent"
 msgstr "--get-color dan tipe variabel raban"
 
-#: builtin/config.c:748
+#: builtin/config.c
 msgid "only one action at a time"
 msgstr "hanya satu tindakan pada suatu saat"
 
-#: builtin/config.c:761
+#: builtin/config.c
 msgid "--name-only is only applicable to --list or --get-regexp"
 msgstr "--name-only hanya dapat diterapkan pada --list atau --get-regexp"
 
-#: builtin/config.c:767
+#: builtin/config.c
 msgid ""
 "--show-origin is only applicable to --get, --get-all, --get-regexp, and --"
 "list"
@@ -14635,37 +6360,37 @@ msgstr ""
 "--show-origin hanya dapat diterapkan pada --get, --get-all, --get-regexp, "
 "dan --list"
 
-#: builtin/config.c:773
+#: builtin/config.c
 msgid "--default is only applicable to --get"
 msgstr "--default hanya dapat diterapkan pada --get"
 
-#: builtin/config.c:806
+#: builtin/config.c
 msgid "--fixed-value only applies with 'value-pattern'"
 msgstr "--fixed-value hanya diterapkan dengan 'pola nilai'"
 
-#: builtin/config.c:822
+#: builtin/config.c
 #, c-format
 msgid "unable to read config file '%s'"
 msgstr "tidak dapat membaca berkas konfigurasi '%s'"
 
-#: builtin/config.c:825
+#: builtin/config.c
 msgid "error processing config file(s)"
 msgstr "kesalahan memproses berkas konfigurasi"
 
-#: builtin/config.c:835
+#: builtin/config.c
 msgid "editing stdin is not supported"
 msgstr "menyunting stdin tidak didukung"
 
-#: builtin/config.c:837
+#: builtin/config.c
 msgid "editing blobs is not supported"
 msgstr "menyunting blob tidak didukung"
 
-#: builtin/config.c:851
+#: builtin/config.c
 #, c-format
 msgid "cannot create configuration file %s"
 msgstr "tidak dapat membuat berkas konfigurasi %s"
 
-#: builtin/config.c:864
+#: builtin/config.c
 #, c-format
 msgid ""
 "cannot overwrite multiple values with a single value\n"
@@ -14674,16 +6399,16 @@ msgstr ""
 "tidak dapat menimpa banyak nilai dengan nilai tunggal\n"
 "       Gunakan regexp, --add atau --replace-all untuk mengubah %s."
 
-#: builtin/config.c:943 builtin/config.c:954
+#: builtin/config.c
 #, c-format
 msgid "no such section: %s"
 msgstr "tidak ada bagian seperti: %s"
 
-#: builtin/count-objects.c:100
+#: builtin/count-objects.c
 msgid "print sizes in human readable format"
 msgstr "cetak ukuran dalam format yang bisa dibaca manusia"
 
-#: builtin/credential-cache--daemon.c:227
+#: builtin/credential-cache--daemon.c
 #, c-format
 msgid ""
 "The permissions on your socket directory are too loose; other\n"
@@ -14692,71 +6417,71 @@ msgid ""
 "\tchmod 0700 %s"
 msgstr ""
 
-#: builtin/credential-cache--daemon.c:276
+#: builtin/credential-cache--daemon.c
 msgid "print debugging messages to stderr"
 msgstr ""
 
-#: builtin/credential-cache--daemon.c:316
+#: builtin/credential-cache--daemon.c
 msgid "credential-cache--daemon unavailable; no unix socket support"
 msgstr ""
 
-#: builtin/credential-cache.c:180
+#: builtin/credential-cache.c
 msgid "credential-cache unavailable; no unix socket support"
 msgstr ""
 
-#: builtin/credential-store.c:66
+#: builtin/credential-store.c
 #, c-format
 msgid "unable to get credential storage lock in %d ms"
 msgstr ""
 
-#: builtin/describe.c:26
+#: builtin/describe.c
 msgid "git describe [<options>] [<commit-ish>...]"
 msgstr "git describe [<opsi>] [<mirip-komit>...]"
 
-#: builtin/describe.c:27
+#: builtin/describe.c
 msgid "git describe [<options>] --dirty"
 msgstr "git describe [<opsi>] --dirty"
 
-#: builtin/describe.c:63
+#: builtin/describe.c
 msgid "head"
 msgstr "kepala"
 
-#: builtin/describe.c:63
+#: builtin/describe.c
 msgid "lightweight"
 msgstr "ringan"
 
-#: builtin/describe.c:63
+#: builtin/describe.c
 msgid "annotated"
 msgstr "teranotasi"
 
-#: builtin/describe.c:277
+#: builtin/describe.c
 #, c-format
 msgid "annotated tag %s not available"
 msgstr "tag teranotasi %s tidak tersedia"
 
-#: builtin/describe.c:281
+#: builtin/describe.c
 #, c-format
 msgid "tag '%s' is externally known as '%s'"
 msgstr "tag '%s' dikenal luar sebagai '%s'"
 
-#: builtin/describe.c:328
+#: builtin/describe.c
 #, c-format
 msgid "no tag exactly matches '%s'"
 msgstr "tidak ada tag yang tepat cocok dengan '%s'"
 
-#: builtin/describe.c:330
+#: builtin/describe.c
 #, c-format
 msgid "No exact match on refs or tags, searching to describe\n"
 msgstr ""
 "tidak ada kecocokan eksak pada referensi atau tag, mencari untuk "
 "menjelaskan \n"
 
-#: builtin/describe.c:397
+#: builtin/describe.c
 #, c-format
 msgid "finished search at %s\n"
 msgstr "selesai mencari pada %s\n"
 
-#: builtin/describe.c:424
+#: builtin/describe.c
 #, c-format
 msgid ""
 "No annotated tags can describe '%s'.\n"
@@ -14765,7 +6490,7 @@ msgstr ""
 "Tidak ada tag teranotasi yang dapat menjelaskan '%s'.\n"
 "Bagaimanapun, ada tag tak teranotasi: coba --tags."
 
-#: builtin/describe.c:428
+#: builtin/describe.c
 #, c-format
 msgid ""
 "No tags can describe '%s'.\n"
@@ -14774,12 +6499,12 @@ msgstr ""
 "Tidak ada tag yang dapat menjelaskan '%s'\n"
 "Coba --always, atau buat beberapa tag."
 
-#: builtin/describe.c:458
+#: builtin/describe.c
 #, c-format
 msgid "traversed %lu commits\n"
 msgstr "%lu komit dilintasi\n"
 
-#: builtin/describe.c:461
+#: builtin/describe.c
 #, c-format
 msgid ""
 "more than %i tags found; listed %i most recent\n"
@@ -14788,149 +6513,149 @@ msgstr ""
 "lebih dari %i tag ditemukan; %i terbaru didaftarkan\n"
 "menyerah mencari pada %s\n"
 
-#: builtin/describe.c:529
+#: builtin/describe.c
 #, c-format
 msgid "describe %s\n"
 msgstr "jelaskan %s\n"
 
-#: builtin/describe.c:532
+#: builtin/describe.c
 #, c-format
 msgid "Not a valid object name %s"
 msgstr "Bukan nama objek yang valid %s"
 
-#: builtin/describe.c:540
+#: builtin/describe.c
 #, c-format
 msgid "%s is neither a commit nor blob"
 msgstr "%s bukan sebuah komit atau blob"
 
-#: builtin/describe.c:554
+#: builtin/describe.c
 msgid "find the tag that comes after the commit"
 msgstr "temukan tag yang datang setelah komit"
 
-#: builtin/describe.c:555
+#: builtin/describe.c
 msgid "debug search strategy on stderr"
 msgstr "debug strategi pencarian pada keluaran standar"
 
-#: builtin/describe.c:556
+#: builtin/describe.c
 msgid "use any ref"
 msgstr "gunakan referensi apapun"
 
-#: builtin/describe.c:557
+#: builtin/describe.c
 msgid "use any tag, even unannotated"
 msgstr "gunakan tag apapun, bahkan tak teranotasi"
 
-#: builtin/describe.c:558
+#: builtin/describe.c
 msgid "always use long format"
 msgstr "selalu gunakan format panjang"
 
-#: builtin/describe.c:559
+#: builtin/describe.c
 msgid "only follow first parent"
 msgstr "hanya ikuti induk pertama"
 
-#: builtin/describe.c:562
+#: builtin/describe.c
 msgid "only output exact matches"
 msgstr "hanya keluarkan kecocokan eksak"
 
-#: builtin/describe.c:564
+#: builtin/describe.c
 msgid "consider <n> most recent tags (default: 10)"
 msgstr "pertimbangkan <n> tag terbaru (asali: 10)"
 
-#: builtin/describe.c:566
+#: builtin/describe.c
 msgid "only consider tags matching <pattern>"
 msgstr "hanya pertimbangkan tag yang cocok dengan <pola>"
 
-#: builtin/describe.c:568
+#: builtin/describe.c
 msgid "do not consider tags matching <pattern>"
 msgstr "jangan pertimbangkan tag yang cocok dengan <pola>"
 
-#: builtin/describe.c:570 builtin/name-rev.c:595
+#: builtin/describe.c builtin/name-rev.c
 msgid "show abbreviated commit object as fallback"
 msgstr "perlihatkan objek komit singkat sebagai langkah terakhir"
 
-#: builtin/describe.c:571 builtin/describe.c:574
+#: builtin/describe.c
 msgid "mark"
 msgstr "tanda"
 
-#: builtin/describe.c:572
+#: builtin/describe.c
 msgid "append <mark> on dirty working tree (default: \"-dirty\")"
 msgstr "tambahkan <tanda> pada direktori kerja kotor (asali: \"-dirty\")"
 
-#: builtin/describe.c:575
+#: builtin/describe.c
 msgid "append <mark> on broken working tree (default: \"-broken\")"
 msgstr "tambahkan <tanda> pada direktori kerja rusak (asali: \"-broken\")"
 
-#: builtin/describe.c:622
+#: builtin/describe.c
 msgid "No names found, cannot describe anything."
 msgstr "Tidak ada nama yang ditemukan, tidak dapat menjelaskan apapun."
 
-#: builtin/describe.c:673 builtin/describe.c:675
+#: builtin/describe.c
 #, c-format
 msgid "option '%s' and commit-ishes cannot be used together"
 msgstr "opsi '%s' dan mirip-komit tidak dapat digunakan bersamaan"
 
-#: builtin/diff-tree.c:157
+#: builtin/diff-tree.c
 msgid "--merge-base only works with two commits"
 msgstr "--merge-base hanya bekerja dengan dua komit"
 
-#: builtin/diff.c:92
+#: builtin/diff.c
 #, c-format
 msgid "'%s': not a regular file or symlink"
 msgstr "'%s': bukan berkas reguler atau tautan simbolik"
 
-#: builtin/diff.c:259
+#: builtin/diff.c
 #, c-format
 msgid "invalid option: %s"
 msgstr "opsi tidak valid: %s"
 
-#: builtin/diff.c:376
+#: builtin/diff.c
 #, c-format
 msgid "%s...%s: no merge base"
 msgstr "%s...%s: tidak ada dasar penggabungan"
 
-#: builtin/diff.c:491
+#: builtin/diff.c
 msgid "Not a git repository"
 msgstr "bukan repositori git"
 
-#: builtin/diff.c:537 builtin/grep.c:700
+#: builtin/diff.c builtin/grep.c
 #, c-format
 msgid "invalid object '%s' given."
 msgstr "objek yang diberikan '%s' tidak valid"
 
-#: builtin/diff.c:548
+#: builtin/diff.c
 #, c-format
 msgid "more than two blobs given: '%s'"
 msgstr "lebih dari dua blob diberikan: '%s'"
 
-#: builtin/diff.c:553
+#: builtin/diff.c
 #, c-format
 msgid "unhandled object '%s' given."
 msgstr "objek tak tertangani '%s' diberikan"
 
-#: builtin/diff.c:587
+#: builtin/diff.c
 #, c-format
 msgid "%s...%s: multiple merge bases, using %s"
 msgstr "%s...%s: banyak dasar penggabungan, menggunakan %s"
 
-#: builtin/difftool.c:31
+#: builtin/difftool.c
 msgid "git difftool [<options>] [<commit> [<commit>]] [--] [<path>...]"
 msgstr "git difftool [<opsi>] [<komit> [<komit>]] [--] [<jalur>...]"
 
-#: builtin/difftool.c:287
+#: builtin/difftool.c
 #, c-format
 msgid "could not read symlink %s"
 msgstr "tidak dapat membaca tautan simbolik %s"
 
-#: builtin/difftool.c:289
+#: builtin/difftool.c
 #, c-format
 msgid "could not read symlink file %s"
 msgstr "tidak dapat membaca berkas tautan simbolik %s"
 
-#: builtin/difftool.c:297
+#: builtin/difftool.c
 #, c-format
 msgid "could not read object %s for symlink %s"
 msgstr "tidak dapat membaca objek %s untuk symlink %s"
 
-#: builtin/difftool.c:421
+#: builtin/difftool.c
 msgid ""
 "combined diff formats ('-c' and '--cc') are not supported in\n"
 "directory diff mode ('-d' and '--dir-diff')."
@@ -14938,58 +6663,63 @@ msgstr ""
 "format diff tergabung ('-c' dan '--cc') tidak didukung dalam\n"
 "mode diff direktori ('-d' dan '--dir-diff')."
 
-#: builtin/difftool.c:626
+#: builtin/difftool.c
 #, c-format
 msgid "both files modified: '%s' and '%s'."
 msgstr "kedua berkas berubah: '%s' dan '%s'."
 
-#: builtin/difftool.c:628
+#: builtin/difftool.c
 msgid "working tree file has been left."
 msgstr "berkas pohon kerja telah ditinggalkan."
 
-#: builtin/difftool.c:639
+#: builtin/difftool.c sequencer.c
+#, c-format
+msgid "could not copy '%s' to '%s'"
+msgstr "tidak dapat menyalin '%s' ke '%s'"
+
+#: builtin/difftool.c
 #, c-format
 msgid "temporary files exist in '%s'."
 msgstr "berkas sementara ada di '%s'."
 
-#: builtin/difftool.c:640
+#: builtin/difftool.c
 msgid "you may want to cleanup or recover these."
-msgstr "mungkin Anda ingin membersihkan atau memulihkan itu."
+msgstr "mungkin Anda ingin membersihkan atau memulihkannya."
 
-#: builtin/difftool.c:645
+#: builtin/difftool.c
 #, c-format
 msgid "failed: %d"
 msgstr "gagal: %d"
 
-#: builtin/difftool.c:690
+#: builtin/difftool.c
 msgid "use `diff.guitool` instead of `diff.tool`"
 msgstr "gunakan `diff.guitool` daripada `diff.tool`"
 
-#: builtin/difftool.c:692
+#: builtin/difftool.c
 msgid "perform a full-directory diff"
 msgstr "lakukan diff direktori penuh"
 
-#: builtin/difftool.c:694
+#: builtin/difftool.c
 msgid "do not prompt before launching a diff tool"
 msgstr "jangan bisiki sebelum meluncurkan alat diff"
 
-#: builtin/difftool.c:699
+#: builtin/difftool.c
 msgid "use symlinks in dir-diff mode"
 msgstr "gunakan tautan simbolik dalam mode diff direktori"
 
-#: builtin/difftool.c:700
+#: builtin/difftool.c
 msgid "tool"
 msgstr "alat"
 
-#: builtin/difftool.c:701
+#: builtin/difftool.c
 msgid "use the specified diff tool"
 msgstr "gunakan alat diff yang disebutkan"
 
-#: builtin/difftool.c:703
+#: builtin/difftool.c
 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:706
+#: builtin/difftool.c
 msgid ""
 "make 'git-difftool' exit when an invoked diff tool returns a non-zero exit "
 "code"
@@ -14997,291 +6727,290 @@ msgstr ""
 "buat 'git-difftool' keluar ketika alat diff yang dijalankan mengembalikan "
 "kode keluar bukan nol"
 
-#: builtin/difftool.c:709
+#: builtin/difftool.c
 msgid "specify a custom command for viewing diffs"
 msgstr "sebutkan perintah kustom untuk melihat diff"
 
-#: builtin/difftool.c:710
+#: builtin/difftool.c
 msgid "passed to `diff`"
 msgstr "dilewatkan ke `diff`"
 
-#: builtin/difftool.c:726
+#: builtin/difftool.c
 msgid "difftool requires worktree or --no-index"
 msgstr "difftool butuh pohon kerja atau --no-index"
 
-#: builtin/difftool.c:745
+#: builtin/difftool.c
 msgid "no <tool> given for --tool=<tool>"
 msgstr "tidak ada <alat> yang diberikan untuk --tool=<alat>"
 
-#: builtin/difftool.c:752
+#: builtin/difftool.c
 msgid "no <cmd> given for --extcmd=<cmd>"
 msgstr "tidak ada <perintah> yang diberikan untuk --extcmd=<perintah>"
 
-#: builtin/env--helper.c:6
+#: builtin/env--helper.c
 msgid "git env--helper --type=[bool|ulong] <options> <env-var>"
 msgstr ""
 
-#: builtin/env--helper.c:46
+#: builtin/env--helper.c
 msgid "default for git_env_*(...) to fall back on"
 msgstr ""
 
-#: builtin/env--helper.c:48
+#: builtin/env--helper.c
 msgid "be quiet only use git_env_*() value as exit code"
 msgstr ""
 
-#: builtin/env--helper.c:67
+#: builtin/env--helper.c
 #, c-format
 msgid "option `--default' expects a boolean value with `--type=bool`, not `%s`"
 msgstr ""
 
-#: builtin/env--helper.c:82
+#: builtin/env--helper.c
 #, c-format
 msgid ""
 "option `--default' expects an unsigned long value with `--type=ulong`, not `"
 "%s`"
 msgstr ""
 
-#: builtin/fast-export.c:29
+#: builtin/fast-export.c
 msgid "git fast-export [<rev-list-opts>]"
 msgstr "git fast-export [<opsi rev-list>]"
 
-#: builtin/fast-export.c:843
+#: builtin/fast-export.c
 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:1152
+#: builtin/fast-export.c
 msgid "--anonymize-map token cannot be empty"
 msgstr "token --anonymize-map tidak bisa kosong"
 
-#: builtin/fast-export.c:1171
+#: builtin/fast-export.c
 msgid "show progress after <n> objects"
 msgstr "perlihatkan perkembangan setelah <n> objek"
 
-#: builtin/fast-export.c:1173
+#: builtin/fast-export.c
 msgid "select handling of signed tags"
 msgstr "pilih penanganan tag bertandatangan"
 
-#: builtin/fast-export.c:1176
+#: builtin/fast-export.c
 msgid "select handling of tags that tag filtered objects"
 msgstr "pilih penanganan tag yang men-tag objek tersaring"
 
-#: builtin/fast-export.c:1179
+#: builtin/fast-export.c
 msgid "select handling of commit messages in an alternate encoding"
 msgstr "pilih penanganan pesan komit dalam pengkodean alternatif"
 
-#: builtin/fast-export.c:1182
+#: builtin/fast-export.c
 msgid "dump marks to this file"
 msgstr "buang tanda ke berkas ini"
 
-#: builtin/fast-export.c:1184
+#: builtin/fast-export.c
 msgid "import marks from this file"
 msgstr "impor tanda dari berkas ini"
 
-#: builtin/fast-export.c:1188
+#: builtin/fast-export.c
 msgid "import marks from this file if it exists"
 msgstr "impor tanda dari berkas ini jika ada"
 
-#: builtin/fast-export.c:1190
+#: builtin/fast-export.c
 msgid "fake a tagger when tags lack one"
 msgstr "palsukan pen-tag ketika tidak ada pada tag"
 
-#: builtin/fast-export.c:1192
+#: builtin/fast-export.c
 msgid "output full tree for each commit"
 msgstr "keluarkan pohon penuh untuk setiap komit"
 
-#: builtin/fast-export.c:1194
+#: builtin/fast-export.c
 msgid "use the done feature to terminate the stream"
 msgstr "gunakan fitur selesai untuk mengakhiri arus"
 
-#: builtin/fast-export.c:1195
+#: builtin/fast-export.c
 msgid "skip output of blob data"
 msgstr "lewati keluaran data blob"
 
-#: builtin/fast-export.c:1196 builtin/log.c:1860
+#: builtin/fast-export.c builtin/log.c
 msgid "refspec"
 msgstr "spek referensi"
 
-#: builtin/fast-export.c:1197
+#: builtin/fast-export.c
 msgid "apply refspec to exported refs"
 msgstr "terapkan spek referensi ke referensi terekspor"
 
-#: builtin/fast-export.c:1198
+#: builtin/fast-export.c
 msgid "anonymize output"
 msgstr "anonimkan keluaran"
 
-#: builtin/fast-export.c:1199
+#: builtin/fast-export.c
 msgid "from:to"
 msgstr "dari:ke"
 
-#: builtin/fast-export.c:1200
+#: builtin/fast-export.c
 msgid "convert <from> to <to> in anonymized output"
 msgstr "ubah <dari> ke <ke> pada keluaran teranonim"
 
-#: builtin/fast-export.c:1203
+#: builtin/fast-export.c
 msgid "reference parents which are not in fast-export stream by object id"
 msgstr "referensikan induk yang tidak ada dalam arus fast-export oleh id objek"
 
-#: builtin/fast-export.c:1205
+#: builtin/fast-export.c
 msgid "show original object ids of blobs/commits"
 msgstr "perlihatkan id objek asli dari blob/komit"
 
-#: builtin/fast-export.c:1207
+#: builtin/fast-export.c
 msgid "label tags with mark ids"
 msgstr "label tag dengan id tanda"
 
-#: builtin/fast-import.c:3097
+#: builtin/fast-import.c
 #, c-format
 msgid "Missing from marks for submodule '%s'"
 msgstr "Kehilangan tanda dari untuk submodul '%s'"
 
-#: builtin/fast-import.c:3099
+#: builtin/fast-import.c
 #, c-format
 msgid "Missing to marks for submodule '%s'"
 msgstr "Kehilangan tanda ke untuk submodul '%s'"
 
-#: builtin/fast-import.c:3234
+#: builtin/fast-import.c
 #, c-format
 msgid "Expected 'mark' command, got %s"
 msgstr "Perintah 'mark' diharapkan, dapat %s"
 
-#: builtin/fast-import.c:3239
+#: builtin/fast-import.c
 #, c-format
 msgid "Expected 'to' command, got %s"
 msgstr "Perintah 'to' diharapkan, dapat %s"
 
-#: builtin/fast-import.c:3331
+#: builtin/fast-import.c
 msgid "Expected format name:filename for submodule rewrite option"
 msgstr ""
 "Format nama:nama berkas diharapkan untuk operasi penulisan ulang submodul"
 
-#: builtin/fast-import.c:3386
+#: builtin/fast-import.c
 #, c-format
 msgid "feature '%s' forbidden in input without --allow-unsafe-features"
 msgstr "fitur '%s' dilarang dalam input tanpa --allow-unsafe-features"
 
-#: builtin/fetch-pack.c:246
+#: builtin/fetch-pack.c
 #, c-format
 msgid "Lockfile created but not reported: %s"
 msgstr "Berkas kunci dibuat tetapi tidak dilaporkan: %s"
 
-#: builtin/fetch.c:36
+#: builtin/fetch.c
 msgid "git fetch [<options>] [<repository> [<refspec>...]]"
 msgstr "git fetch [<opsi>] [<repositori> [<spek referensi>...]]"
 
-#: builtin/fetch.c:37
+#: builtin/fetch.c
 msgid "git fetch [<options>] <group>"
 msgstr "git fetch [<opsi>] <grup>"
 
-#: builtin/fetch.c:38
+#: builtin/fetch.c
 msgid "git fetch --multiple [<options>] [(<repository> | <group>)...]"
 msgstr "git fetch --multiple [<opsi>] [(<repositori> | <grup>)]"
 
-#: builtin/fetch.c:39
+#: builtin/fetch.c
 msgid "git fetch --all [<options>]"
 msgstr "git fetch --all [<opsi>]"
 
-#: builtin/fetch.c:124
+#: builtin/fetch.c
 msgid "fetch.parallel cannot be negative"
 msgstr "fetch.parallel tidak dapat bernilai negatif"
 
-#: builtin/fetch.c:147 builtin/pull.c:189
+#: builtin/fetch.c builtin/pull.c
 msgid "fetch from all remotes"
 msgstr "ambil dari semua remote"
 
-#: builtin/fetch.c:149 builtin/pull.c:249
+#: builtin/fetch.c builtin/pull.c
 msgid "set upstream for git pull/fetch"
 msgstr "setel hulu untuk git pull/fetch"
 
-#: builtin/fetch.c:151 builtin/pull.c:192
+#: builtin/fetch.c builtin/pull.c
 msgid "append to .git/FETCH_HEAD instead of overwriting"
 msgstr "tambah ke .git/FETCH_HEAD daripada timpa"
 
-#: builtin/fetch.c:153
+#: builtin/fetch.c
 msgid "use atomic transaction to update references"
-msgstr ""
+msgstr "gunakan transaksi atomik untuk memperbarui referensi"
 
-#: builtin/fetch.c:155 builtin/pull.c:195
+#: builtin/fetch.c builtin/pull.c
 msgid "path to upload pack on remote end"
 msgstr "jalur ke paket unggah pada sisi remote"
 
-#: builtin/fetch.c:156
+#: builtin/fetch.c
 msgid "force overwrite of local reference"
 msgstr "paksa timpa referensi lokal"
 
-#: builtin/fetch.c:158
+#: builtin/fetch.c
 msgid "fetch from multiple remotes"
 msgstr "ambil dari banyak remote"
 
-#: builtin/fetch.c:160 builtin/pull.c:199
+#: builtin/fetch.c builtin/pull.c
 msgid "fetch all tags and associated objects"
 msgstr "ambil semua tag dan objek yang bersesuaian"
 
-#: builtin/fetch.c:162
+#: builtin/fetch.c
 msgid "do not fetch all tags (--no-tags)"
 msgstr "jangan ambil semua tag (--no-tags)"
 
-#: builtin/fetch.c:164
+#: builtin/fetch.c
 msgid "number of submodules fetched in parallel"
 msgstr "jumlah submodul yang diambil secara bersamaan"
 
-#: builtin/fetch.c:166
+#: builtin/fetch.c
 msgid "modify the refspec to place all refs within refs/prefetch/"
 msgstr ""
 "modifikasi spek referensi untuk tempatkan semua referensi di dalam refs/"
 "prefetch/"
 
-#: builtin/fetch.c:168 builtin/pull.c:202
+#: builtin/fetch.c builtin/pull.c
 msgid "prune remote-tracking branches no longer on remote"
 msgstr "buang cabang pelacak remote yang tidak ada pada remote"
 
-#: builtin/fetch.c:170
+#: builtin/fetch.c
 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:171 builtin/fetch.c:199 builtin/pull.c:123
+#: builtin/fetch.c builtin/pull.c
 msgid "on-demand"
 msgstr "sesuai permintaan"
 
-#: builtin/fetch.c:172
+#: builtin/fetch.c
 msgid "control recursive fetching of submodules"
 msgstr "kontrol pengambilan submodul rekursif"
 
-#: builtin/fetch.c:177
+#: builtin/fetch.c
 msgid "write fetched references to the FETCH_HEAD file"
 msgstr "tulis referensi yang diambil ke berkas FETCH_HEAD"
 
-#: builtin/fetch.c:178 builtin/pull.c:210
+#: builtin/fetch.c builtin/pull.c
 msgid "keep downloaded pack"
 msgstr "simpan paket yang diunduh"
 
-#: builtin/fetch.c:180
+#: builtin/fetch.c
 msgid "allow updating of HEAD ref"
 msgstr "bolehkan perbarui referensi HEAD"
 
-#: builtin/fetch.c:183 builtin/fetch.c:189 builtin/pull.c:213
-#: builtin/pull.c:222
+#: builtin/fetch.c builtin/pull.c
 msgid "deepen history of shallow clone"
 msgstr "perdalam riwayat klon dangkal"
 
-#: builtin/fetch.c:185 builtin/pull.c:216
+#: builtin/fetch.c builtin/pull.c
 msgid "deepen history of shallow repository based on time"
 msgstr "perdalam riwayat repositori dangkal berdasarkan waktu"
 
-#: builtin/fetch.c:191 builtin/pull.c:225
+#: builtin/fetch.c builtin/pull.c
 msgid "convert to a complete repository"
 msgstr "ubah ke repositori penuh"
 
-#: builtin/fetch.c:194
+#: builtin/fetch.c
 msgid "re-fetch without negotiating common commits"
-msgstr ""
+msgstr "ambil ulang tanpa menegosiasikan komit yang sama"
 
-#: builtin/fetch.c:197
+#: builtin/fetch.c
 msgid "prepend this to submodule path output"
 msgstr "tambahkan ini ke jalur keluaran submodul"
 
-#: builtin/fetch.c:200
+#: builtin/fetch.c
 msgid ""
 "default for recursive fetching of submodules (lower priority than config "
 "files)"
@@ -15289,103 +7018,107 @@ msgstr ""
 "default untuk ambil submodul secara rekursif (prioritas lebih rendah "
 "dariberkas konfigurasi)"
 
-#: builtin/fetch.c:204 builtin/pull.c:228
+#: builtin/fetch.c builtin/pull.c
 msgid "accept refs that update .git/shallow"
 msgstr "terima referensi yang memperbarui .git/shallow"
 
-#: builtin/fetch.c:205 builtin/pull.c:230
+#: builtin/fetch.c builtin/pull.c
 msgid "refmap"
 msgstr "peta referensi"
 
-#: builtin/fetch.c:206 builtin/pull.c:231
+#: builtin/fetch.c builtin/pull.c
 msgid "specify fetch refmap"
 msgstr "sebutkan ambil peta referensi"
 
-#: builtin/fetch.c:213 builtin/pull.c:244
+#: builtin/fetch.c builtin/pull.c
 msgid "report that we have only objects reachable from this object"
 msgstr ""
 "laporkan bahwa kami hanya punya object yang bisa dicapai dari objek ini"
 
-#: builtin/fetch.c:215
+#: builtin/fetch.c
 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:218 builtin/fetch.c:220
+#: builtin/fetch.c
 msgid "run 'maintenance --auto' after fetching"
 msgstr "lakukan 'maintenance --auto' setelah pengambilan"
 
-#: builtin/fetch.c:222 builtin/pull.c:247
+#: builtin/fetch.c builtin/pull.c
 msgid "check for forced-updates on all updated branches"
 msgstr "periksa pembaruan terpaksa pada semua cabang"
 
-#: builtin/fetch.c:224
+#: builtin/fetch.c
 msgid "write the commit-graph after fetching"
 msgstr "tulis grafik komit setelah pengambilan"
 
-#: builtin/fetch.c:226
+#: builtin/fetch.c
 msgid "accept refspecs from stdin"
 msgstr "terima spek referensi dari masukan standar"
 
-#: builtin/fetch.c:618
+#: builtin/fetch.c
 msgid "couldn't find remote ref HEAD"
 msgstr "tidak dapat menemukan referensi remote HEAD"
 
-#: builtin/fetch.c:893
+#: builtin/fetch.c
 #, c-format
 msgid "object %s not found"
 msgstr "objek %s tidak ditemukan"
 
-#: builtin/fetch.c:897
+#: builtin/fetch.c
 msgid "[up to date]"
 msgstr "[terkini]"
 
-#: builtin/fetch.c:909 builtin/fetch.c:927 builtin/fetch.c:999
+#: builtin/fetch.c
 msgid "[rejected]"
 msgstr "[tertolak]"
 
-#: builtin/fetch.c:911
+#: builtin/fetch.c
 msgid "can't fetch in current branch"
 msgstr "tidak dapat mengambil di cabang saat ini"
 
-#: builtin/fetch.c:912
+#: builtin/fetch.c
 msgid "checked out in another worktree"
 msgstr "ter-check out di dalam pohon kerja lainnya"
 
-#: builtin/fetch.c:922
+#: builtin/fetch.c
 msgid "[tag update]"
 msgstr "[pembaruan tag]"
 
-#: builtin/fetch.c:923 builtin/fetch.c:960 builtin/fetch.c:982
-#: builtin/fetch.c:994
+#: builtin/fetch.c
 msgid "unable to update local ref"
 msgstr "tidak dapat memperbarui referensi lokal"
 
-#: builtin/fetch.c:927
+#: builtin/fetch.c
 msgid "would clobber existing tag"
 msgstr "akan klob tag yang ada"
 
-#: builtin/fetch.c:949
+#: builtin/fetch.c
 msgid "[new tag]"
 msgstr "[tag baru]"
 
-#: builtin/fetch.c:952
+#: builtin/fetch.c
 msgid "[new branch]"
 msgstr "[cabang baru]"
 
-#: builtin/fetch.c:955
+#: builtin/fetch.c
 msgid "[new ref]"
 msgstr "[referensi baru]"
 
-#: builtin/fetch.c:994
+#: builtin/fetch.c
 msgid "forced update"
 msgstr "pembaruan terpaksa"
 
-#: builtin/fetch.c:999
+#: builtin/fetch.c
 msgid "non-fast-forward"
 msgstr "bukan-maju-cepat"
 
-#: builtin/fetch.c:1102
+#: builtin/fetch.c builtin/grep.c sequencer.c
+#, c-format
+msgid "cannot open '%s'"
+msgstr "tidak dapat membuka '%s'"
+
+#: builtin/fetch.c
 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"
@@ -15397,7 +7130,7 @@ msgstr ""
 "bendera '--show-forced-updates' atau jalankan 'git config fetch."
 "showForcedUpdates true'."
 
-#: builtin/fetch.c:1106
+#: builtin/fetch.c
 #, c-format
 msgid ""
 "it took %.2f seconds to check forced updates; you can use\n"
@@ -15410,22 +7143,22 @@ msgstr ""
 "'git config fetch.showForcedUpdates false'\n"
 "untuk menghindari pemeriksaan ini.\n"
 
-#: builtin/fetch.c:1136
+#: builtin/fetch.c
 #, c-format
 msgid "%s did not send all necessary objects\n"
 msgstr "%s tidak mengirim semua objek yang diperlukan\n"
 
-#: builtin/fetch.c:1156
+#: builtin/fetch.c
 #, 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:1259 builtin/fetch.c:1418
+#: builtin/fetch.c
 #, c-format
 msgid "From %.*s\n"
 msgstr "Dari %.*s\n"
 
-#: builtin/fetch.c:1269
+#: builtin/fetch.c
 #, c-format
 msgid ""
 "some local refs could not be updated; try running\n"
@@ -15434,49 +7167,54 @@ msgstr ""
 "beberapa referensi lokal tidak dapat diperbarui; coba jalankan\n"
 " 'git remote prune %s' untuk hapus cabang yang lama dan berkonflik"
 
-#: builtin/fetch.c:1377
+#: builtin/fetch.c
 #, c-format
 msgid "   (%s will become dangling)"
 msgstr "   (%s akan menjadi terjuntai)"
 
-#: builtin/fetch.c:1378
+#: builtin/fetch.c
 #, c-format
 msgid "   (%s has become dangling)"
 msgstr "   (%s telah menjadi terjuntai)"
 
-#: builtin/fetch.c:1421
+#: builtin/fetch.c
 msgid "[deleted]"
 msgstr "[dihapus]"
 
-#: builtin/fetch.c:1422 builtin/remote.c:1153
+#: builtin/fetch.c builtin/remote.c
 msgid "(none)"
 msgstr "(tidak ada)"
 
-#: builtin/fetch.c:1446
+#: builtin/fetch.c
 #, c-format
 msgid "refusing to fetch into branch '%s' checked out at '%s'"
 msgstr "menolak mengambil ke dalam cabang '%s' yang ter-checkout pada '%s'"
 
-#: builtin/fetch.c:1466
+#: builtin/fetch.c
 #, c-format
 msgid "option \"%s\" value \"%s\" is not valid for %s"
 msgstr "opsi \"%s\" nilai \"%s\" tidak valid untuk %s"
 
-#: builtin/fetch.c:1469
+#: builtin/fetch.c
 #, c-format
 msgid "option \"%s\" is ignored for %s\n"
 msgstr "opsi \"%s\" diabaikan untuk %s\n"
 
-#: builtin/fetch.c:1496
+#: builtin/fetch.c object-file.c
+#, c-format
+msgid "%s is not a valid object"
+msgstr "%s bukan sebuah objek valid"
+
+#: builtin/fetch.c
 #, c-format
 msgid "the object %s does not exist"
 msgstr "objek '%s' tidak ada"
 
-#: builtin/fetch.c:1748
+#: builtin/fetch.c
 msgid "multiple branches detected, incompatible with --set-upstream"
 msgstr "banyak cabang terdeteksi, tidak kompatibel dengan --set-upstream"
 
-#: builtin/fetch.c:1760
+#: builtin/fetch.c
 #, c-format
 msgid ""
 "could not set upstream of HEAD to '%s' from '%s' when it does not point to "
@@ -15485,19 +7223,19 @@ msgstr ""
 "tidak dapat menyetel hulu HEAD ke %s dari '%s' ketika itu tak menunjuk pada "
 "cabang apapun."
 
-#: builtin/fetch.c:1773
+#: builtin/fetch.c
 msgid "not setting upstream for a remote remote-tracking branch"
 msgstr "tidak setel hulu untuk cabang remote pelacak remote"
 
-#: builtin/fetch.c:1775
+#: builtin/fetch.c
 msgid "not setting upstream for a remote tag"
 msgstr "tidak setel hulu untuk tag remote"
 
-#: builtin/fetch.c:1777
+#: builtin/fetch.c
 msgid "unknown branch type"
 msgstr "tipe cabang tidak diketahui"
 
-#: builtin/fetch.c:1779
+#: builtin/fetch.c
 msgid ""
 "no source branch found;\n"
 "you need to specify exactly one branch with the --set-upstream option"
@@ -15505,22 +7243,22 @@ msgstr ""
 "cabang sumber tidak ditemukan;\n"
 "Anda harus sebutkan tepat satu cabang dengan opsi --set-upstream."
 
-#: builtin/fetch.c:1904 builtin/fetch.c:1967
+#: builtin/fetch.c
 #, c-format
 msgid "Fetching %s\n"
 msgstr "Mengambil %s\n"
 
-#: builtin/fetch.c:1914 builtin/fetch.c:1969
+#: builtin/fetch.c
 #, c-format
 msgid "could not fetch %s"
 msgstr "tidak dapat mengambil %s"
 
-#: builtin/fetch.c:1926
+#: builtin/fetch.c
 #, c-format
 msgid "could not fetch '%s' (exit code: %d)\n"
 msgstr "tidak dapat mengambil '%s' (kode keluar: %d)\n"
 
-#: builtin/fetch.c:2030
+#: builtin/fetch.c
 msgid ""
 "no remote repository specified; please specify either a URL or a\n"
 "remote name from which new revisions should be fetched"
@@ -15528,48 +7266,48 @@ msgstr ""
 "repositori remote tidak disebutkan; mohon sebutkan baik URL atau nama\n"
 "remote yang mana revisi baru sebaiknya diambil"
 
-#: builtin/fetch.c:2066
+#: builtin/fetch.c
 msgid "you need to specify a tag name"
 msgstr "Anda perlu sebutkan sebuah nama tag"
 
-#: builtin/fetch.c:2156
+#: builtin/fetch.c
 msgid "--negotiate-only needs one or more --negotiation-tip=*"
 msgstr "--negotiate-only perlu satu atau lebih --negotiation-tip=*"
 
-#: builtin/fetch.c:2160
+#: builtin/fetch.c
 msgid "negative depth in --deepen is not supported"
 msgstr "kedalaman negatif pada --deepen tidak didukung"
 
-#: builtin/fetch.c:2169
+#: builtin/fetch.c
 msgid "--unshallow on a complete repository does not make sense"
 msgstr "--unshallow pada repositori penuh tidak masuk akal"
 
-#: builtin/fetch.c:2186
+#: builtin/fetch.c
 msgid "fetch --all does not take a repository argument"
 msgstr "fetch --all tidak mengambil argumen repositori"
 
-#: builtin/fetch.c:2188
+#: builtin/fetch.c
 msgid "fetch --all does not make sense with refspecs"
 msgstr "fetch --all tidak masuk akal dengan spek referensi"
 
-#: builtin/fetch.c:2197
+#: builtin/fetch.c
 #, c-format
 msgid "no such remote or remote group: %s"
 msgstr "tidak ada remote atau grup remote seperti: %s"
 
-#: builtin/fetch.c:2205
+#: builtin/fetch.c
 msgid "fetching a group and specifying refspecs does not make sense"
 msgstr "mengambil sebuah grup dan menyebutkan spek referensi tidak masuk akal"
 
-#: builtin/fetch.c:2221
+#: builtin/fetch.c
 msgid "must supply remote when using --negotiate-only"
 msgstr "harus suplai remote ketika menggunakan --negotiate-only"
 
-#: builtin/fetch.c:2226
+#: builtin/fetch.c
 msgid "protocol does not support --negotiate-only, exiting"
 msgstr "protokol tidak mendukung --negotiate-only, keluar."
 
-#: builtin/fetch.c:2246
+#: builtin/fetch.c
 msgid ""
 "--filter can only be used with the remote configured in extensions."
 "partialclone"
@@ -15577,145 +7315,145 @@ msgstr ""
 "--filter hanya dapat digunakan dengan remote yang terkonfigurasi di "
 "extensions.partialclone"
 
-#: builtin/fetch.c:2250
+#: builtin/fetch.c
 msgid "--atomic can only be used when fetching from one remote"
 msgstr "--atomic hanya dapat digunakan saat mengambil dari satu remote"
 
-#: builtin/fetch.c:2254
+#: builtin/fetch.c
 msgid "--stdin can only be used when fetching from one remote"
 msgstr "--stdin hanya dapat digunakan saat mengambil dari satu remote"
 
-#: builtin/fmt-merge-msg.c:7
+#: builtin/fmt-merge-msg.c
 msgid ""
 "git fmt-merge-msg [-m <message>] [--log[=<n>] | --no-log] [--file <file>]"
 msgstr ""
 
-#: builtin/fmt-merge-msg.c:19
+#: builtin/fmt-merge-msg.c
 msgid "populate log with at most <n> entries from shortlog"
 msgstr ""
 
-#: builtin/fmt-merge-msg.c:22
+#: builtin/fmt-merge-msg.c
 msgid "alias for --log (deprecated)"
 msgstr ""
 
-#: builtin/fmt-merge-msg.c:25
+#: builtin/fmt-merge-msg.c
 msgid "text"
 msgstr ""
 
-#: builtin/fmt-merge-msg.c:26
+#: builtin/fmt-merge-msg.c
 msgid "use <text> as start of message"
 msgstr ""
 
-#: builtin/fmt-merge-msg.c:28
+#: builtin/fmt-merge-msg.c
 msgid "use <name> instead of the real target branch"
 msgstr ""
 
-#: builtin/fmt-merge-msg.c:29
+#: builtin/fmt-merge-msg.c
 msgid "file to read from"
 msgstr ""
 
-#: builtin/for-each-ref.c:10
+#: builtin/for-each-ref.c
 msgid "git for-each-ref [<options>] [<pattern>]"
 msgstr ""
 
-#: builtin/for-each-ref.c:11
+#: builtin/for-each-ref.c
 msgid "git for-each-ref [--points-at <object>]"
 msgstr ""
 
-#: builtin/for-each-ref.c:12
+#: builtin/for-each-ref.c
 msgid "git for-each-ref [--merged [<commit>]] [--no-merged [<commit>]]"
 msgstr ""
 
-#: builtin/for-each-ref.c:13
+#: builtin/for-each-ref.c
 msgid "git for-each-ref [--contains [<commit>]] [--no-contains [<commit>]]"
 msgstr ""
 
-#: builtin/for-each-ref.c:31
+#: builtin/for-each-ref.c
 msgid "quote placeholders suitably for shells"
 msgstr ""
 
-#: builtin/for-each-ref.c:33
+#: builtin/for-each-ref.c
 msgid "quote placeholders suitably for perl"
 msgstr ""
 
-#: builtin/for-each-ref.c:35
+#: builtin/for-each-ref.c
 msgid "quote placeholders suitably for python"
 msgstr ""
 
-#: builtin/for-each-ref.c:37
+#: builtin/for-each-ref.c
 msgid "quote placeholders suitably for Tcl"
 msgstr ""
 
-#: builtin/for-each-ref.c:40
+#: builtin/for-each-ref.c
 msgid "show only <n> matched refs"
 msgstr ""
 
-#: builtin/for-each-ref.c:42 builtin/tag.c:482
+#: builtin/for-each-ref.c builtin/tag.c
 msgid "respect format colors"
 msgstr ""
 
-#: builtin/for-each-ref.c:45
+#: builtin/for-each-ref.c
 msgid "print only refs which points at the given object"
 msgstr ""
 
-#: builtin/for-each-ref.c:47
+#: builtin/for-each-ref.c
 msgid "print only refs that are merged"
 msgstr ""
 
-#: builtin/for-each-ref.c:48
+#: builtin/for-each-ref.c
 msgid "print only refs that are not merged"
 msgstr ""
 
-#: builtin/for-each-ref.c:49
+#: builtin/for-each-ref.c
 msgid "print only refs which contain the commit"
 msgstr ""
 
-#: builtin/for-each-ref.c:50
+#: builtin/for-each-ref.c
 msgid "print only refs which don't contain the commit"
 msgstr ""
 
-#: builtin/for-each-repo.c:9
+#: builtin/for-each-repo.c
 msgid "git for-each-repo --config=<config> <command-args>"
 msgstr ""
 
-#: builtin/for-each-repo.c:34
+#: builtin/for-each-repo.c
 msgid "config"
 msgstr ""
 
-#: builtin/for-each-repo.c:35
+#: builtin/for-each-repo.c
 msgid "config key storing a list of repository paths"
 msgstr ""
 
-#: builtin/for-each-repo.c:43
+#: builtin/for-each-repo.c
 msgid "missing --config=<config>"
 msgstr ""
 
-#: builtin/fsck.c:69 builtin/fsck.c:128 builtin/fsck.c:129
+#: builtin/fsck.c
 msgid "unknown"
 msgstr "tidak dikenal"
 
 #. TRANSLATORS: e.g. error in tree 01bfda: <more explanation>
-#: builtin/fsck.c:78 builtin/fsck.c:100
+#: builtin/fsck.c
 #, c-format
 msgid "error in %s %s: %s"
 msgstr "kesalahan pada %s %s: %s"
 
 #. TRANSLATORS: e.g. warning in tree 01bfda: <more explanation>
-#: builtin/fsck.c:94
+#: builtin/fsck.c
 #, c-format
 msgid "warning in %s %s: %s"
 msgstr "peringatan pada %s %s: %s"
 
-#: builtin/fsck.c:124 builtin/fsck.c:127
+#: builtin/fsck.c
 #, c-format
 msgid "broken link from %7s %s"
 msgstr "tautan rusak dari %7s %s"
 
-#: builtin/fsck.c:136
+#: builtin/fsck.c
 msgid "wrong object type in link"
 msgstr "tipe objek salah dalam tautan"
 
-#: builtin/fsck.c:152
+#: builtin/fsck.c
 #, c-format
 msgid ""
 "broken link from %7s %s\n"
@@ -15724,357 +7462,380 @@ msgstr ""
 "tautan rusak dari %7s %s\n"
 "               ke %7s %s"
 
-#: builtin/fsck.c:264
+#: builtin/fsck.c builtin/prune.c connected.c
+msgid "Checking connectivity"
+msgstr "Memeriksa konektivitas"
+
+#: builtin/fsck.c
 #, c-format
 msgid "missing %s %s"
 msgstr "kehilangan %s %s"
 
-#: builtin/fsck.c:291
+#: builtin/fsck.c
 #, c-format
 msgid "unreachable %s %s"
 msgstr "tidak dapat dicapai %s %s"
 
-#: builtin/fsck.c:311
+#: builtin/fsck.c
 #, c-format
 msgid "dangling %s %s"
 msgstr "teruntai %s %s"
 
-#: builtin/fsck.c:321
+#: builtin/fsck.c
 msgid "could not create lost-found"
 msgstr "tidak dapat membuat lost-found"
 
-#: builtin/fsck.c:332
+#: builtin/fsck.c builtin/gc.c builtin/rebase.c rebase-interactive.c rerere.c
+#: sequencer.c
+#, c-format
+msgid "could not write '%s'"
+msgstr "tidak dapat menulis '%s'"
+
+#: builtin/fsck.c
 #, c-format
 msgid "could not finish '%s'"
 msgstr "tidak dapat menyelesaikan '%s'"
 
-#: builtin/fsck.c:349
+#: builtin/fsck.c
 #, c-format
 msgid "Checking %s"
 msgstr "Memeriksa %s"
 
-#: builtin/fsck.c:387
+#: builtin/fsck.c
 #, c-format
 msgid "Checking connectivity (%d objects)"
 msgstr "Memerika konektivitas (%d objek)"
 
-#: builtin/fsck.c:406
+#: builtin/fsck.c
 #, c-format
 msgid "Checking %s %s"
 msgstr "Memeriksa %s %s"
 
-#: builtin/fsck.c:411
+#: builtin/fsck.c
 msgid "broken links"
 msgstr "tautan rusak"
 
-#: builtin/fsck.c:420
+#: builtin/fsck.c
 #, c-format
 msgid "root %s"
 msgstr "akar %s"
 
-#: builtin/fsck.c:428
+#: builtin/fsck.c
 #, c-format
 msgid "tagged %s %s (%s) in %s"
 msgstr "ter-tag %s %s (%s) di %s"
 
-#: builtin/fsck.c:457
+#: builtin/fsck.c
 #, c-format
 msgid "%s: object corrupt or missing"
 msgstr "%s: objek rusak atau hilang"
 
-#: builtin/fsck.c:482
+#: builtin/fsck.c
 #, c-format
 msgid "%s: invalid reflog entry %s"
 msgstr "%s: entri log referensi tidak valid %s"
 
-#: builtin/fsck.c:496
+#: builtin/fsck.c
 #, c-format
 msgid "Checking reflog %s->%s"
 msgstr "Memeriksa log referensi %s->%s"
 
-#: builtin/fsck.c:530
+#: builtin/fsck.c
 #, c-format
 msgid "%s: invalid sha1 pointer %s"
 msgstr "%s: penunjuk sha1 tidak valid %s"
 
-#: builtin/fsck.c:537
+#: builtin/fsck.c
 #, c-format
 msgid "%s: not a commit"
 msgstr "%s: bukan sebuah komit"
 
-#: builtin/fsck.c:591
+#: builtin/fsck.c
 msgid "notice: No default references"
 msgstr "catatan: Tidak ada referensi asali"
 
-#: builtin/fsck.c:621
+#: builtin/fsck.c
 #, c-format
 msgid "%s: hash-path mismatch, found at: %s"
-msgstr ""
+msgstr "%s: hash-jalur tidak cocok, ditemukan pada: %s"
 
-#: builtin/fsck.c:624
+#: builtin/fsck.c
 #, c-format
 msgid "%s: object corrupt or missing: %s"
 msgstr "%s: objek rusak atau hilang: %s"
 
-#: builtin/fsck.c:628
+#: builtin/fsck.c
 #, c-format
 msgid "%s: object is of unknown type '%s': %s"
 msgstr "%s: objek bertipe tidak dikenal '%s': %s"
 
-#: builtin/fsck.c:645
+#: builtin/fsck.c
 #, c-format
 msgid "%s: object could not be parsed: %s"
 msgstr "%s: objek tidak dapat diuraikan: %s"
 
-#: builtin/fsck.c:665
+#: builtin/fsck.c
 #, c-format
 msgid "bad sha1 file: %s"
 msgstr "sha1 berkas jelek: %s"
 
-#: builtin/fsck.c:686
+#: builtin/fsck.c
 msgid "Checking object directory"
 msgstr "Memeriksa direktori objek"
 
-#: builtin/fsck.c:689
+#: builtin/fsck.c
 msgid "Checking object directories"
 msgstr "Memeriksa direktori objek"
 
-#: builtin/fsck.c:705
+#: builtin/fsck.c
 #, c-format
 msgid "Checking %s link"
 msgstr "Memeriksa tautan %s"
 
-#: builtin/fsck.c:710 builtin/index-pack.c:862
+#: builtin/fsck.c builtin/index-pack.c
 #, c-format
 msgid "invalid %s"
 msgstr "%s tidak valid"
 
-#: builtin/fsck.c:717
+#: builtin/fsck.c
 #, c-format
 msgid "%s points to something strange (%s)"
 msgstr "%s menunjuk ke sesuatu yang aneh (%s)"
 
-#: builtin/fsck.c:723
+#: builtin/fsck.c
 #, c-format
 msgid "%s: detached HEAD points at nothing"
 msgstr "%s: HEAD terpisah tidak menunjuk ke apapun"
 
-#: builtin/fsck.c:727
+#: builtin/fsck.c
 #, c-format
 msgid "notice: %s points to an unborn branch (%s)"
 msgstr "catatan: %s menunjuk ke cabang yang belum lahir (%s)"
 
-#: builtin/fsck.c:739
+#: builtin/fsck.c
 msgid "Checking cache tree"
 msgstr "Memeriksa pohon tembolok"
 
-#: builtin/fsck.c:744
+#: builtin/fsck.c
 #, c-format
 msgid "%s: invalid sha1 pointer in cache-tree"
 msgstr "%s: penunjuk sha1 tidak valid pada pohon tembolok"
 
-#: builtin/fsck.c:753
+#: builtin/fsck.c
 msgid "non-tree in cache-tree"
 msgstr "bukan pohon pada pohon tembolok"
 
-#: builtin/fsck.c:784
+#: builtin/fsck.c
 msgid "git fsck [<options>] [<object>...]"
 msgstr "git fsck [<opsi>] [<objek>...]"
 
-#: builtin/fsck.c:790
+#: builtin/fsck.c
 msgid "show unreachable objects"
 msgstr "perlihatkan objek yang tak dapat dicapai"
 
-#: builtin/fsck.c:791
+#: builtin/fsck.c
 msgid "show dangling objects"
 msgstr "perlihatkan objek teruntai"
 
-#: builtin/fsck.c:792
+#: builtin/fsck.c
 msgid "report tags"
 msgstr "laporkan tag"
 
-#: builtin/fsck.c:793
+#: builtin/fsck.c
 msgid "report root nodes"
 msgstr "laporkan simpul akar"
 
-#: builtin/fsck.c:794
+#: builtin/fsck.c
 msgid "make index objects head nodes"
 msgstr "buat objek indeks simpul kepala"
 
-#: builtin/fsck.c:795
+#: builtin/fsck.c
 msgid "make reflogs head nodes (default)"
 msgstr "buat log referensi simpul kepala (asali)"
 
-#: builtin/fsck.c:796
+#: builtin/fsck.c
 msgid "also consider packs and alternate objects"
 msgstr "juga pertimbangkan pak dan objek alternatif"
 
-#: builtin/fsck.c:797
+#: builtin/fsck.c
 msgid "check only connectivity"
 msgstr "hanya periksa konektivitas"
 
-#: builtin/fsck.c:798 builtin/mktag.c:75
+#: builtin/fsck.c builtin/mktag.c
 msgid "enable more strict checking"
 msgstr "aktifkan pemeriksaan lebih ketat"
 
-#: builtin/fsck.c:800
+#: builtin/fsck.c
 msgid "write dangling objects in .git/lost-found"
 msgstr "tulis objek teruntai dalam .git/lost-found"
 
-#: builtin/fsck.c:801 builtin/prune.c:146
+#: builtin/fsck.c builtin/prune.c
 msgid "show progress"
 msgstr "perlihatkan perkembangan"
 
-#: builtin/fsck.c:802
+#: builtin/fsck.c
 msgid "show verbose names for reachable objects"
 msgstr "perlihatkan nama lantung untuk objek yang dapat dicapai"
 
-#: builtin/fsck.c:862 builtin/index-pack.c:261
+#: builtin/fsck.c builtin/index-pack.c
 msgid "Checking objects"
 msgstr "Memeriksa objek"
 
-#: builtin/fsck.c:890
+#: builtin/fsck.c
 #, c-format
 msgid "%s: object missing"
 msgstr "%s: objek hilang"
 
-#: builtin/fsck.c:901
+#: builtin/fsck.c
 #, c-format
 msgid "invalid parameter: expected sha1, got '%s'"
 msgstr "parameter tidak valid: sha1 diharapkan, dapat '%s'"
 
-#: builtin/fsmonitor--daemon.c:13
+#: builtin/fsmonitor--daemon.c
 msgid "git fsmonitor--daemon start [<options>]"
 msgstr ""
 
-#: builtin/fsmonitor--daemon.c:14
+#: builtin/fsmonitor--daemon.c
 msgid "git fsmonitor--daemon run [<options>]"
 msgstr ""
 
-#: builtin/fsmonitor--daemon.c:15
+#: builtin/fsmonitor--daemon.c
 msgid "git fsmonitor--daemon stop"
 msgstr ""
 
-#: builtin/fsmonitor--daemon.c:16
+#: builtin/fsmonitor--daemon.c
 msgid "git fsmonitor--daemon status"
 msgstr ""
 
-#: builtin/fsmonitor--daemon.c:38 builtin/fsmonitor--daemon.c:47
+#: builtin/fsmonitor--daemon.c
 #, c-format
 msgid "value of '%s' out of range: %d"
 msgstr ""
 
-#: builtin/fsmonitor--daemon.c:57
+#: builtin/fsmonitor--daemon.c
 #, c-format
 msgid "value of '%s' not bool or int: %d"
 msgstr ""
 
-#: builtin/fsmonitor--daemon.c:99
+#: builtin/fsmonitor--daemon.c
 #, c-format
 msgid "fsmonitor-daemon is watching '%s'\n"
 msgstr ""
 
-#: builtin/fsmonitor--daemon.c:104
+#: builtin/fsmonitor--daemon.c
 #, c-format
 msgid "fsmonitor-daemon is not watching '%s'\n"
 msgstr ""
 
-#: builtin/fsmonitor--daemon.c:170
+#: builtin/fsmonitor--daemon.c
 #, c-format
 msgid "could not create fsmonitor cookie '%s'"
 msgstr ""
 
-#: builtin/fsmonitor--daemon.c:753
+#: builtin/fsmonitor--daemon.c
 #, c-format
 msgid "fsmonitor: cookie_result '%d' != SEEN"
 msgstr ""
 
-#: builtin/fsmonitor--daemon.c:1187
+#: builtin/fsmonitor--daemon.c
 #, c-format
 msgid "could not start IPC thread pool on '%s'"
 msgstr ""
 
-#: builtin/fsmonitor--daemon.c:1199
+#: builtin/fsmonitor--daemon.c
 msgid "could not start fsmonitor listener thread"
 msgstr ""
 
-#: builtin/fsmonitor--daemon.c:1297
+#: builtin/fsmonitor--daemon.c
+msgid "could not start fsmonitor health thread"
+msgstr ""
+
+#: builtin/fsmonitor--daemon.c
 msgid "could not initialize listener thread"
 msgstr ""
 
-#: builtin/fsmonitor--daemon.c:1328 builtin/fsmonitor--daemon.c:1383
+#: builtin/fsmonitor--daemon.c
+msgid "could not initialize health thread"
+msgstr ""
+
+#: builtin/fsmonitor--daemon.c
+#, c-format
+msgid "could not cd home '%s'"
+msgstr ""
+
+#: builtin/fsmonitor--daemon.c
 #, c-format
 msgid "fsmonitor--daemon is already running '%s'"
 msgstr ""
 
-#: builtin/fsmonitor--daemon.c:1332
+#: builtin/fsmonitor--daemon.c
 #, c-format
 msgid "running fsmonitor-daemon in '%s'\n"
 msgstr ""
 
-#: builtin/fsmonitor--daemon.c:1387
+#: builtin/fsmonitor--daemon.c
 #, c-format
 msgid "starting fsmonitor-daemon in '%s'\n"
 msgstr ""
 
-#: builtin/fsmonitor--daemon.c:1413
+#: builtin/fsmonitor--daemon.c
 msgid "daemon failed to start"
 msgstr ""
 
-#: builtin/fsmonitor--daemon.c:1416
+#: builtin/fsmonitor--daemon.c
 msgid "daemon not online yet"
 msgstr ""
 
-#: builtin/fsmonitor--daemon.c:1419
+#: builtin/fsmonitor--daemon.c
 msgid "daemon terminated"
 msgstr ""
 
-#: builtin/fsmonitor--daemon.c:1429
+#: builtin/fsmonitor--daemon.c
 msgid "detach from console"
 msgstr ""
 
-#: builtin/fsmonitor--daemon.c:1432
+#: builtin/fsmonitor--daemon.c
 msgid "use <n> ipc worker threads"
 msgstr ""
 
-#: builtin/fsmonitor--daemon.c:1435
+#: builtin/fsmonitor--daemon.c
 msgid "max seconds to wait for background daemon startup"
 msgstr ""
 
-#: builtin/fsmonitor--daemon.c:1449
+#: builtin/fsmonitor--daemon.c
 #, c-format
 msgid "invalid 'ipc-threads' value (%d)"
 msgstr ""
 
-#: builtin/fsmonitor--daemon.c:1464
+#: builtin/fsmonitor--daemon.c
 #, c-format
 msgid "Unhandled subcommand '%s'"
 msgstr ""
 
-#: builtin/fsmonitor--daemon.c:1477
+#: builtin/fsmonitor--daemon.c
 msgid "fsmonitor--daemon not supported on this platform"
 msgstr ""
 
-#: builtin/gc.c:39
+#: builtin/gc.c
 msgid "git gc [<options>]"
 msgstr "git gc [<opsi>]"
 
-#: builtin/gc.c:93
+#: builtin/gc.c
 #, c-format
 msgid "Failed to fstat %s: %s"
 msgstr "Gagal men-fstat %s: %s"
 
-#: builtin/gc.c:129
+#: builtin/gc.c
 #, c-format
 msgid "failed to parse '%s' value '%s'"
 msgstr "gagal menguraikan nilai '%s' '%s'"
 
-#: builtin/gc.c:488 builtin/init-db.c:57
+#: builtin/gc.c builtin/init-db.c
 #, c-format
 msgid "cannot stat '%s'"
 msgstr "tidak dapat men-stat '%s'"
 
-#: builtin/gc.c:504
+#: builtin/gc.c
 #, c-format
 msgid ""
 "The last gc run reported the following. Please correct the root cause\n"
@@ -16089,536 +7850,544 @@ msgstr ""
 "\n"
 "%s"
 
-#: builtin/gc.c:552
+#: builtin/gc.c
 msgid "prune unreferenced objects"
 msgstr "pangkas objek tak tereferensi"
 
-#: builtin/gc.c:554
+#: builtin/gc.c
+msgid "pack unreferenced objects separately"
+msgstr "pak objek tak terujuk secara terpisah"
+
+#: builtin/gc.c
 msgid "be more thorough (increased runtime)"
 msgstr "jadi lebih cermat (waktu yang dijalankan bertambah)"
 
-#: builtin/gc.c:555
+#: builtin/gc.c
 msgid "enable auto-gc mode"
 msgstr "aktifkan mode gc otomatis"
 
-#: builtin/gc.c:558
+#: builtin/gc.c
 msgid "force running gc even if there may be another gc running"
 msgstr "paksa jalankan gc bahkan jika mungkin ada gc lain yang berjalan"
 
-#: builtin/gc.c:561
+#: builtin/gc.c
 msgid "repack all other packs except the largest pack"
 msgstr "pak ulang semua pak yang lain kecuali pak terbesar"
 
-#: builtin/gc.c:577
+#: builtin/gc.c
 #, c-format
-msgid "failed to parse gc.logexpiry value %s"
-msgstr "gagal menguraikan nilai gc.logexpiry %s"
+msgid "failed to parse gc.logExpiry value %s"
+msgstr "gagal menguraikan nilai gc.logExpiry %s"
 
-#: builtin/gc.c:588
+#: builtin/gc.c
 #, c-format
 msgid "failed to parse prune expiry value %s"
 msgstr "gagal menguraikan nilai pangkas kadaluarsa %s"
 
-#: builtin/gc.c:608
+#: builtin/gc.c
 #, c-format
 msgid "Auto packing the repository in background for optimum performance.\n"
 msgstr "Mempak otomatis repositori di latar belakang untuk performa optimal.\n"
 
-#: builtin/gc.c:610
+#: builtin/gc.c
 #, c-format
 msgid "Auto packing the repository for optimum performance.\n"
 msgstr "Mempak otomatis repositori untuk performa optimal.\n"
 
-#: builtin/gc.c:611
+#: builtin/gc.c
 #, c-format
 msgid "See \"git help gc\" for manual housekeeping.\n"
 msgstr "Lihat \"git help gc\" untuk pembenahan manual.\n"
 
-#: builtin/gc.c:652
+#: builtin/gc.c
 #, 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:707
+#: builtin/gc.c
 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:717
+#: builtin/gc.c
 msgid ""
 "git maintenance run [--auto] [--[no-]quiet] [--task=<task>] [--schedule]"
 msgstr ""
 "git maintenance run [--auto] [--[no-]quiet] [--task=<tugas>] [--schedule]"
 
-#: builtin/gc.c:747
+#: builtin/gc.c
 msgid "--no-schedule is not allowed"
 msgstr "--no-schedule tidak diperbolehkan"
 
-#: builtin/gc.c:752
+#: builtin/gc.c
 #, c-format
 msgid "unrecognized --schedule argument '%s'"
 msgstr "argumen --schedule tidak dikenal '%s'"
 
-#: builtin/gc.c:870
+#: builtin/gc.c
 msgid "failed to write commit-graph"
 msgstr "gagal menulis grafik komit"
 
-#: builtin/gc.c:906
+#: builtin/gc.c
 msgid "failed to prefetch remotes"
 msgstr "gagal mem-praambil remote"
 
-#: builtin/gc.c:1022
+#: builtin/gc.c
 msgid "failed to start 'git pack-objects' process"
 msgstr "gagal memulai proses 'git pack-objects'"
 
-#: builtin/gc.c:1039
+#: builtin/gc.c
 msgid "failed to finish 'git pack-objects' process"
 msgstr "gagal menyelesaikan proses 'git pack-objects'"
 
-#: builtin/gc.c:1090
+#: builtin/gc.c
 msgid "failed to write multi-pack-index"
 msgstr "gagal menulis indeks multipak"
 
-#: builtin/gc.c:1106
+#: builtin/gc.c
 msgid "'git multi-pack-index expire' failed"
 msgstr "'git multi-pack-index expire' gagal"
 
-#: builtin/gc.c:1165
+#: builtin/gc.c
 msgid "'git multi-pack-index repack' failed"
 msgstr "'git multi-pack-index repack' gagal"
 
-#: builtin/gc.c:1174
+#: builtin/gc.c
 msgid ""
 "skipping incremental-repack task because core.multiPackIndex is disabled"
 msgstr ""
 "melewatkan tugas pengepakan tambahan karena core.multiPackIndex dinonaktifkan"
 
-#: builtin/gc.c:1278
+#: builtin/gc.c
 #, c-format
 msgid "lock file '%s' exists, skipping maintenance"
 msgstr "berkas kunci '%s' ada, melewatkan pemeliharaan"
 
-#: builtin/gc.c:1308
+#: builtin/gc.c
 #, c-format
 msgid "task '%s' failed"
 msgstr "tugas '%s' gagal"
 
-#: builtin/gc.c:1390
+#: builtin/gc.c
 #, c-format
 msgid "'%s' is not a valid task"
 msgstr "'%s' bukan tugas yang valid"
 
-#: builtin/gc.c:1395
+#: builtin/gc.c
 #, c-format
 msgid "task '%s' cannot be selected multiple times"
 msgstr "tugas '%s' tidak dapat dipilih berulang kali"
 
-#: builtin/gc.c:1410
+#: builtin/gc.c
 msgid "run tasks based on the state of the repository"
 msgstr "jalankan tugas berdasarkan keadaan repositori"
 
-#: builtin/gc.c:1411
+#: builtin/gc.c
 msgid "frequency"
 msgstr "frekuensi"
 
-#: builtin/gc.c:1412
+#: builtin/gc.c
 msgid "run tasks based on frequency"
 msgstr "jalankan tugas berdasarkan frekuensi"
 
-#: builtin/gc.c:1415
+#: builtin/gc.c
 msgid "do not report progress or other information over stderr"
 msgstr ""
 "jangan laporkan perkembangan atau informasi lainnya ke kesalahan standar"
 
-#: builtin/gc.c:1416
+#: builtin/gc.c
 msgid "task"
 msgstr "tugas"
 
-#: builtin/gc.c:1417
+#: builtin/gc.c
 msgid "run a specific task"
 msgstr "jalankan tugas spesifik"
 
-#: builtin/gc.c:1434
+#: builtin/gc.c
 msgid "use at most one of --auto and --schedule=<frequency>"
 msgstr "gunakan paling banyak satu dari --auto dan --schedule=<frekuensi>"
 
-#: builtin/gc.c:1477
+#: builtin/gc.c
 msgid "failed to run 'git config'"
 msgstr "gagal menjalankan 'git config'"
 
-#: builtin/gc.c:1629
+#: builtin/gc.c
 #, c-format
 msgid "failed to expand path '%s'"
 msgstr "gagal memperluas jalur '%s'"
 
-#: builtin/gc.c:1656 builtin/gc.c:1694
+#: builtin/gc.c
 msgid "failed to start launchctl"
 msgstr "gagal menjalankan launchctl"
 
-#: builtin/gc.c:1769 builtin/gc.c:2237
+#: builtin/gc.c
 #, c-format
 msgid "failed to create directories for '%s'"
 msgstr "gagal membuat direktori untuk '%s'"
 
-#: builtin/gc.c:1796
+#: builtin/gc.c
 #, c-format
 msgid "failed to bootstrap service %s"
 msgstr "gagal men-tali-botkan layanan %s"
 
-#: builtin/gc.c:1889
+#: builtin/gc.c
 msgid "failed to create temp xml file"
 msgstr "gagal membuat berkas xml sementara"
 
-#: builtin/gc.c:1979
+#: builtin/gc.c
 msgid "failed to start schtasks"
 msgstr "gagal menjalankan schtasks"
 
-#: builtin/gc.c:2063
+#: builtin/gc.c
 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:2080
+#: builtin/gc.c
 msgid "failed to run 'crontab'; your system might not support 'cron'"
 msgstr ""
 "gagal menjalankan 'crontab'; sistem Anda mungkin tidak mendukung 'cron'"
 
-#: builtin/gc.c:2084
+#: builtin/gc.c
 msgid "failed to open stdin of 'crontab'"
 msgstr "gagal membuka masukan standar dari 'crontab'"
 
-#: builtin/gc.c:2126
+#: builtin/gc.c
 msgid "'crontab' died"
 msgstr "'crontab' mati"
 
-#: builtin/gc.c:2191
+#: builtin/gc.c
 msgid "failed to start systemctl"
 msgstr "gagal memulai systemctl"
 
-#: builtin/gc.c:2201
+#: builtin/gc.c
 msgid "failed to run systemctl"
 msgstr "gagal menjalankan systemctl"
 
-#: builtin/gc.c:2210 builtin/gc.c:2215 builtin/worktree.c:63
-#: builtin/worktree.c:1024
+#: builtin/gc.c builtin/worktree.c
 #, c-format
 msgid "failed to delete '%s'"
 msgstr "gagal menghapus '%s'"
 
-#: builtin/gc.c:2395
+#: builtin/gc.c rerere.c
+#, c-format
+msgid "failed to flush '%s'"
+msgstr "gagal membilas '%s'"
+
+#: builtin/gc.c
 #, c-format
 msgid "unrecognized --scheduler argument '%s'"
 msgstr "argumen --scheduler tidak dikenal '%s'"
 
-#: builtin/gc.c:2420
+#: builtin/gc.c
 msgid "neither systemd timers nor crontab are available"
 msgstr "baik pewaktu systemd atau crontab tidak tersedia"
 
-#: builtin/gc.c:2435
+#: builtin/gc.c
 #, c-format
 msgid "%s scheduler is not available"
 msgstr "penjadwal %s tidak tersedia"
 
-#: builtin/gc.c:2449
+#: builtin/gc.c
 msgid "another process is scheduling background maintenance"
 msgstr "proses lainnya sedang menjadwalkan peme"
 
-#: builtin/gc.c:2471
+#: builtin/gc.c
 msgid "git maintenance start [--scheduler=<scheduler>]"
 msgstr "git maintenance start [--scheduler=<penjadwal>]"
 
-#: builtin/gc.c:2480
+#: builtin/gc.c
 msgid "scheduler"
 msgstr "penjadwal"
 
-#: builtin/gc.c:2481
+#: builtin/gc.c
 msgid "scheduler to trigger git maintenance run"
 msgstr "penjadwal untuk memicu git maintenance run"
 
-#: builtin/gc.c:2495
+#: builtin/gc.c
 msgid "failed to add repo to global config"
 msgstr "gagal menambahkan repositori ke konfigurasi global"
 
-#: builtin/gc.c:2504
+#: builtin/gc.c
 msgid "git maintenance <subcommand> [<options>]"
 msgstr "git maintenance <subperintah> [<opsi>]"
 
-#: builtin/gc.c:2523
+#: builtin/gc.c
 #, c-format
 msgid "invalid subcommand: %s"
 msgstr "subperintah tidak valid: %s"
 
-#: builtin/grep.c:32
+#: builtin/grep.c
 msgid "git grep [<options>] [-e] <pattern> [<rev>...] [[--] <path>...]"
 msgstr "git grep [<opsi>] [-e] <pola> [<revisi>...] [[--] <pola>...]"
 
-#: builtin/grep.c:241
+#: builtin/grep.c
 #, c-format
 msgid "grep: failed to create thread: %s"
 msgstr "grep: gagal membuat utas: %s"
 
-#: builtin/grep.c:295
+#: builtin/grep.c
 #, c-format
 msgid "invalid number of threads specified (%d) for %s"
 msgstr "jumlah utas yang diberikan (%d) tidak valid untuk %s"
 
+#. #-#-#-#-#  grep.c.po  #-#-#-#-#
 #. TRANSLATORS: %s is the configuration
 #. variable for tweaking threads, currently
 #. grep.threads
 #.
-#: builtin/grep.c:303 builtin/index-pack.c:1587 builtin/index-pack.c:1791
-#: builtin/pack-objects.c:3150
+#: builtin/grep.c builtin/index-pack.c builtin/pack-objects.c
 #, c-format
 msgid "no threads support, ignoring %s"
 msgstr "tidak ada dukungan utas, abaikan %s"
 
-#: builtin/grep.c:490 builtin/grep.c:619 builtin/grep.c:659
+#: builtin/grep.c
 #, c-format
 msgid "unable to read tree (%s)"
 msgstr "tidak dapat membaca pohon (%s)"
 
-#: builtin/grep.c:674
+#: builtin/grep.c
 #, c-format
 msgid "unable to grep from object of type %s"
 msgstr "tidak dapan men-grep dari objek dengan tipe %s"
 
-#: builtin/grep.c:754
+#: builtin/grep.c
 #, c-format
 msgid "switch `%c' expects a numerical value"
 msgstr "saklar '%c' mengharapkan nilai numerik"
 
-#: builtin/grep.c:852
+#: builtin/grep.c
 msgid "search in index instead of in the work tree"
 msgstr "cari dalam index daripada dalam pohon kerja"
 
-#: builtin/grep.c:854
+#: builtin/grep.c
 msgid "find in contents not managed by git"
 msgstr "temukan dalam konten yang tak dikelola oleh git"
 
-#: builtin/grep.c:856
+#: builtin/grep.c
 msgid "search in both tracked and untracked files"
 msgstr "cari dalam berkas terlacak dan tak terlacak"
 
-#: builtin/grep.c:858
+#: builtin/grep.c
 msgid "ignore files specified via '.gitignore'"
 msgstr "abaikan berkas yang disebutkan via '.gitignore'"
 
-#: builtin/grep.c:860
+#: builtin/grep.c
 msgid "recursively search in each submodule"
 msgstr "cari secara rekursif dalam setiap submodul"
 
-#: builtin/grep.c:863
+#: builtin/grep.c
 msgid "show non-matching lines"
 msgstr "perlihatkan baris nir-cocok"
 
-#: builtin/grep.c:865
+#: builtin/grep.c
 msgid "case insensitive matching"
 msgstr "pencocokan tak peka kapital"
 
-#: builtin/grep.c:867
+#: builtin/grep.c
 msgid "match patterns only at word boundaries"
 msgstr "cocokkan pola hanya pada batas kata"
 
-#: builtin/grep.c:869
+#: builtin/grep.c
 msgid "process binary files as text"
 msgstr "proses berkas biner sebagai teks"
 
-#: builtin/grep.c:871
+#: builtin/grep.c
 msgid "don't match patterns in binary files"
 msgstr "jangan cocokkan pola pada berkas biner"
 
-#: builtin/grep.c:874
+#: builtin/grep.c
 msgid "process binary files with textconv filters"
 msgstr "proses berkas biner dengan saringan textconv"
 
-#: builtin/grep.c:876
+#: builtin/grep.c
 msgid "search in subdirectories (default)"
 msgstr "cari dalam subdirektori (asali)"
 
-#: builtin/grep.c:878
+#: builtin/grep.c
 msgid "descend at most <depth> levels"
 msgstr "turun paling banyak <kedalaman> tingkat"
 
-#: builtin/grep.c:882
+#: builtin/grep.c
 msgid "use extended POSIX regular expressions"
 msgstr "gunakan ekspresi reguler POSIX diperpanjang"
 
-#: builtin/grep.c:885
+#: builtin/grep.c
 msgid "use basic POSIX regular expressions (default)"
 msgstr "gunakan ekspresi reguler POSIX dasar (asali)"
 
-#: builtin/grep.c:888
+#: builtin/grep.c
 msgid "interpret patterns as fixed strings"
 msgstr "tafsirkan pola sebagai untai tetap"
 
-#: builtin/grep.c:891
+#: builtin/grep.c
 msgid "use Perl-compatible regular expressions"
 msgstr "gunakan ekspresi reguler kompatibel dengan Perl"
 
-#: builtin/grep.c:894
+#: builtin/grep.c
 msgid "show line numbers"
 msgstr "perlihatkan nomor baris"
 
-#: builtin/grep.c:895
+#: builtin/grep.c
 msgid "show column number of first match"
 msgstr "perlihatkan nomor kolom cocokan pertama"
 
-#: builtin/grep.c:896
+#: builtin/grep.c
 msgid "don't show filenames"
 msgstr "jangan perlihatkan nama berkas"
 
-#: builtin/grep.c:897
+#: builtin/grep.c
 msgid "show filenames"
 msgstr "perlihatkan nama berkas"
 
-#: builtin/grep.c:899
+#: builtin/grep.c
 msgid "show filenames relative to top directory"
 msgstr "perlihatkan nama berkas relatif terhadap direktori puncak"
 
-#: builtin/grep.c:901
+#: builtin/grep.c
 msgid "show only filenames instead of matching lines"
 msgstr "hanya perlihatkan nama berkas daripada baris yang cocok"
 
-#: builtin/grep.c:903
+#: builtin/grep.c
 msgid "synonym for --files-with-matches"
 msgstr "sinonim untuk --files-with-matches"
 
-#: builtin/grep.c:906
+#: builtin/grep.c
 msgid "show only the names of files without match"
 msgstr "hanya perlihatkan nama berkas tanpa cocok"
 
-#: builtin/grep.c:908
+#: builtin/grep.c
 msgid "print NUL after filenames"
 msgstr "cetak NUL setelah nama berkas"
 
-#: builtin/grep.c:911
+#: builtin/grep.c
 msgid "show only matching parts of a line"
 msgstr "hanya perlihatkan bagian cocokan baris"
 
-#: builtin/grep.c:913
+#: builtin/grep.c
 msgid "show the number of matches instead of matching lines"
 msgstr "perlihatkan jumlah cocokan daripada baris yang cocok"
 
-#: builtin/grep.c:914
+#: builtin/grep.c
 msgid "highlight matches"
 msgstr "sorot cocokan"
 
-#: builtin/grep.c:916
+#: builtin/grep.c
 msgid "print empty line between matches from different files"
 msgstr "cetak baris kosong di antara cocokan dari berkas yang berbeda"
 
-#: builtin/grep.c:918
+#: builtin/grep.c
 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:921
+#: builtin/grep.c
 msgid "show <n> context lines before and after matches"
 msgstr "perlihatkan <n> baris konteks sebelum dan sesudah cocokan"
 
-#: builtin/grep.c:924
+#: builtin/grep.c
 msgid "show <n> context lines before matches"
 msgstr "perlihatkan <n> baris konteks sebelum cocokan"
 
-#: builtin/grep.c:926
+#: builtin/grep.c
 msgid "show <n> context lines after matches"
 msgstr "perlihatkan <n> baris konteks setelah cocokan"
 
-#: builtin/grep.c:928
+#: builtin/grep.c
 msgid "use <n> worker threads"
 msgstr "gunakan <n> utas pekerja"
 
-#: builtin/grep.c:929
+#: builtin/grep.c
 msgid "shortcut for -C NUM"
 msgstr "pintasan untuk -C NUM"
 
-#: builtin/grep.c:932
+#: builtin/grep.c
 msgid "show a line with the function name before matches"
 msgstr "perlihatkan sebuah baris dengan nama fungsi sebelum cocokan"
 
-#: builtin/grep.c:934
+#: builtin/grep.c
 msgid "show the surrounding function"
 msgstr "perlihatkan fungsi di sekitar"
 
-#: builtin/grep.c:937
+#: builtin/grep.c
 msgid "read patterns from file"
 msgstr "baca pola dari berkas"
 
-#: builtin/grep.c:939
+#: builtin/grep.c
 msgid "match <pattern>"
 msgstr "cocokkan <pola>"
 
-#: builtin/grep.c:941
+#: builtin/grep.c
 msgid "combine patterns specified with -e"
 msgstr "kombinasikan pola yang disebutkan dengan -e"
 
-#: builtin/grep.c:953
+#: builtin/grep.c
 msgid "indicate hit with exit status without output"
 msgstr "tunjukkan kena dengan status keluar tanpa keluaran"
 
-#: builtin/grep.c:955
+#: builtin/grep.c
 msgid "show only matches from files that match all patterns"
 msgstr "hanya perlihatkan cocokan dari berkas yang cocok dengan semua pola"
 
-#: builtin/grep.c:958
+#: builtin/grep.c
 msgid "pager"
 msgstr "penghalaman"
 
-#: builtin/grep.c:958
+#: builtin/grep.c
 msgid "show matching files in the pager"
 msgstr "perlihatkan berkas yang cocok dalam penghalaman"
 
-#: builtin/grep.c:962
+#: builtin/grep.c
 msgid "allow calling of grep(1) (ignored by this build)"
 msgstr "perbolehkan pemanggilan grep(1) (diabaikan oleh bangunan ini)"
 
-#: builtin/grep.c:1028
+#: builtin/grep.c
 msgid "no pattern given"
 msgstr "tidak ada pola yang diberikan"
 
-#: builtin/grep.c:1064
+#: builtin/grep.c
 msgid "--no-index or --untracked cannot be used with revs"
 msgstr "--no-index atau --untracked tidak dapat digunakan dengan revisi"
 
-#: builtin/grep.c:1072
+#: builtin/grep.c
 #, c-format
 msgid "unable to resolve revision: %s"
 msgstr "tidak dapat menguraikan revisi: %s"
 
-#: builtin/grep.c:1102
+#: builtin/grep.c
 msgid "--untracked not supported with --recurse-submodules"
 msgstr "--untracked tidak didukung dengan --recurse-submodules"
 
-#: builtin/grep.c:1106
+#: builtin/grep.c
 msgid "invalid option combination, ignoring --threads"
 msgstr "kombinasi opsi tidak valid, abaikan --threads"
 
-#: builtin/grep.c:1109 builtin/pack-objects.c:4084
+#: builtin/grep.c builtin/pack-objects.c
 msgid "no threads support, ignoring --threads"
 msgstr "tidak ada dukungan utas, abaikan --threads"
 
-#: builtin/grep.c:1112 builtin/index-pack.c:1584 builtin/pack-objects.c:3147
+#: builtin/grep.c builtin/index-pack.c builtin/pack-objects.c
 #, c-format
 msgid "invalid number of threads specified (%d)"
 msgstr "jumlah utas tersebut (%d) tidak valid"
 
-#: builtin/grep.c:1146
+#: builtin/grep.c
 msgid "--open-files-in-pager only works on the worktree"
 msgstr "--open-files-in-pager hanya bekerja pada pohon kerja"
 
-#: builtin/grep.c:1179
+#: builtin/grep.c
 msgid "--[no-]exclude-standard cannot be used for tracked contents"
 msgstr "--[no-]exclude-standard tidak dapat digunakan untuk konten terlacak"
 
-#: builtin/grep.c:1187
+#: builtin/grep.c
 msgid "both --cached and trees are given"
 msgstr "baik --cached dan pohon diberikan"
 
-#: builtin/hash-object.c:83
+#: builtin/hash-object.c
 msgid ""
 "git hash-object [-t <type>] [-w] [--path=<file> | --no-filters] [--stdin] "
 "[--] <file>..."
@@ -16626,100 +8395,100 @@ msgstr ""
 "git hash-object [-t <tipe>] [-w] [--path=<berkas> | --no-filters] [--stdin] "
 "[--] <berkas>..."
 
-#: builtin/hash-object.c:97
+#: builtin/hash-object.c
 msgid "object type"
 msgstr "tipe objek"
 
-#: builtin/hash-object.c:98
+#: builtin/hash-object.c
 msgid "write the object into the object database"
 msgstr "tulis objek ke dalam basis data objek"
 
-#: builtin/hash-object.c:100
+#: builtin/hash-object.c
 msgid "read the object from stdin"
 msgstr "baca objek dari masukan standar"
 
-#: builtin/hash-object.c:102
+#: builtin/hash-object.c
 msgid "store file as is without filters"
 msgstr "simpan berkas apa adanya tanpa penyaring"
 
-#: builtin/hash-object.c:103
+#: builtin/hash-object.c
 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:104
+#: builtin/hash-object.c
 msgid "process file as it were from this path"
 msgstr "proses berkas seperti dari jalur ini"
 
-#: builtin/help.c:57
+#: builtin/help.c
 msgid "print all available commands"
 msgstr "cetak semua perintah yang tersedia"
 
-#: builtin/help.c:60
+#: builtin/help.c
 msgid "show external commands in --all"
 msgstr "perlihatkan perintah eksternal dalam --all"
 
-#: builtin/help.c:61
+#: builtin/help.c
 msgid "show aliases in --all"
 msgstr "perlihatkan alias pada --all"
 
-#: builtin/help.c:62
+#: builtin/help.c
 msgid "exclude guides"
 msgstr "kecualikan panduan"
 
-#: builtin/help.c:63
+#: builtin/help.c
 msgid "show man page"
 msgstr "perlihatkan halaman man"
 
-#: builtin/help.c:64
+#: builtin/help.c
 msgid "show manual in web browser"
 msgstr "perlihatkan manual dalam penjelajah web"
 
-#: builtin/help.c:66
+#: builtin/help.c
 msgid "show info page"
 msgstr "perlihatkan halaman info"
 
-#: builtin/help.c:68
+#: builtin/help.c
 msgid "print command description"
 msgstr "perlihatkan deskripsi perintah"
 
-#: builtin/help.c:70
+#: builtin/help.c
 msgid "print list of useful guides"
 msgstr "cetak daftar panduan berguna"
 
-#: builtin/help.c:72
+#: builtin/help.c
 msgid "print all configuration variable names"
 msgstr "cetak semua nama variabel konfigurasi"
 
-#: builtin/help.c:84
+#: builtin/help.c
 msgid "git help [[-i|--info] [-m|--man] [-w|--web]] [<command>]"
 msgstr "git help [[-i|--info] [-m|--man] [-w|--web]] [<perintah>]"
 
-#: builtin/help.c:201
+#: builtin/help.c
 #, c-format
 msgid "unrecognized help format '%s'"
 msgstr "format bantuan tidak dikenal '%s'"
 
-#: builtin/help.c:227
+#: builtin/help.c
 msgid "Failed to start emacsclient."
 msgstr "gagal menjalankan emacsclient."
 
-#: builtin/help.c:240
+#: builtin/help.c
 msgid "Failed to parse emacsclient version."
 msgstr "gagal menguraikan versi emacsclient."
 
-#: builtin/help.c:248
+#: builtin/help.c
 #, c-format
 msgid "emacsclient version '%d' too old (< 22)."
 msgstr "versi emacsclient '%d' terlalu usang (< 22)."
 
-#: builtin/help.c:266 builtin/help.c:288 builtin/help.c:298 builtin/help.c:306
+#: builtin/help.c
 #, c-format
 msgid "failed to exec '%s'"
 msgstr "gagal menjalankan '%s'"
 
-#: builtin/help.c:344
+#: builtin/help.c
 #, c-format
 msgid ""
 "'%s': path for unsupported man viewer.\n"
@@ -16728,7 +8497,7 @@ msgstr ""
 "'%s': jalur untuk pembaca man yang tidak didukung.\n"
 "Mohon gunakan 'man.<tool>.cmd' sebagai gantinya."
 
-#: builtin/help.c:356
+#: builtin/help.c
 #, c-format
 msgid ""
 "'%s': cmd for supported man viewer.\n"
@@ -16737,422 +8506,419 @@ msgstr ""
 "'%s': cmd untuk pembaca man yang didukung.\n"
 "Mohon gunakan 'man.<tool>.path' sebagai gantinya."
 
-#: builtin/help.c:471
+#: builtin/help.c
 #, c-format
 msgid "'%s': unknown man viewer."
 msgstr "'%s': pembaca man tidak dikenal"
 
-#: builtin/help.c:487
+#: builtin/help.c
 msgid "no man viewer handled the request"
 msgstr "tidak ada pembaca man yang menangani permintaan"
 
-#: builtin/help.c:494
+#: builtin/help.c
 msgid "no info viewer handled the request"
 msgstr "tidak ada pembaca info yang menangani permintaan"
 
-#: builtin/help.c:555 builtin/help.c:566 git.c:348
+#: builtin/help.c git.c
 #, c-format
 msgid "'%s' is aliased to '%s'"
 msgstr "'%s' dialiaskan ke '%s'"
 
-#: builtin/help.c:569 git.c:380
+#: builtin/help.c git.c
 #, c-format
 msgid "bad alias.%s string: %s"
 msgstr "untai alias.%s jelek: %s"
 
-#: builtin/help.c:611
+#: builtin/help.c
 #, c-format
 msgid "the '%s' option doesn't take any non-option arguments"
 msgstr "opsi '%s' tidak mengambil argumen bukan opsi"
 
-#: builtin/help.c:631
+#: builtin/help.c
 msgid ""
 "the '--no-[external-commands|aliases]' options can only be used with '--all'"
 msgstr ""
 
-#: builtin/help.c:643 builtin/help.c:671
+#: builtin/help.c
 #, c-format
 msgid "usage: %s%s"
 msgstr "penggunaan: %s%s"
 
-#: builtin/help.c:666
+#: builtin/help.c
 msgid "'git help config' for more information"
 msgstr "'git help config' untuk informasi lebih lanjut"
 
-#: builtin/hook.c:10
+#: builtin/hook.c
 msgid "git hook run [--ignore-missing] <hook-name> [-- <hook-args>]"
 msgstr ""
 
-#: builtin/hook.c:30
+#: builtin/hook.c
 msgid "silently ignore missing requested <hook-name>"
 msgstr ""
 
-#: builtin/index-pack.c:221
+#: builtin/index-pack.c
 #, c-format
 msgid "object type mismatch at %s"
 msgstr "tipe objek tidak cocok pada %s"
 
-#: builtin/index-pack.c:241
+#: builtin/index-pack.c
 #, c-format
 msgid "did not receive expected object %s"
 msgstr "tidak menerima objek yang diharapkan %s"
 
-#: builtin/index-pack.c:244
+#: builtin/index-pack.c
 #, c-format
 msgid "object %s: expected type %s, found %s"
 msgstr "objek %s: yang diharapkan %s, yang didapat %s"
 
-#: builtin/index-pack.c:294
+#: builtin/index-pack.c
 #, c-format
 msgid "cannot fill %d byte"
 msgid_plural "cannot fill %d bytes"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "tidak dapat mengisi %d bita"
+msgstr[1] "tidak dapat mengisi %d bita"
 
-#: builtin/index-pack.c:304
+#: builtin/index-pack.c
 msgid "early EOF"
 msgstr "EOF awal"
 
-#: builtin/index-pack.c:305
+#: builtin/index-pack.c
 msgid "read error on input"
 msgstr "kesalahan baca pada masukan"
 
-#: builtin/index-pack.c:317
+#: builtin/index-pack.c
 msgid "used more bytes than were available"
 msgstr "gunakan lebih banyak pita dari pada yang tersedia"
 
-#: builtin/index-pack.c:324 builtin/pack-objects.c:754
+#: builtin/index-pack.c builtin/pack-objects.c
 msgid "pack too large for current definition of off_t"
 msgstr "paket terlalu besar untuk definisi off_t saat ini"
 
-#: builtin/index-pack.c:329
+#: builtin/index-pack.c
 #, c-format
 msgid "pack exceeds maximum allowed size (%s)"
 msgstr "paket melebihi ukuran maksimum yang diperbolehkan (%s)"
 
-#: builtin/index-pack.c:362
+#: builtin/index-pack.c
 msgid "pack signature mismatch"
 msgstr "tanda tangan paket tidak cocok"
 
-#: builtin/index-pack.c:364
+#: builtin/index-pack.c
 #, c-format
 msgid "pack version %<PRIu32> unsupported"
 msgstr "versi paket %<PRIu32> tidak didukung"
 
-#: builtin/index-pack.c:380
+#: builtin/index-pack.c
 #, c-format
 msgid "pack has bad object at offset %<PRIuMAX>: %s"
 msgstr "paket ada objek jelek pada offset %<PRIuMAX>: %s"
 
-#: builtin/index-pack.c:485
+#: builtin/index-pack.c
 #, c-format
 msgid "inflate returned %d"
 msgstr "inflate mengembalikan %d"
 
-#: builtin/index-pack.c:534
+#: builtin/index-pack.c
 msgid "offset value overflow for delta base object"
 msgstr "nilai offset meluap untuk objek basis delta"
 
-#: builtin/index-pack.c:542
+#: builtin/index-pack.c
 msgid "delta base offset is out of bound"
 msgstr "offset basis delta di luar jangkauan"
 
-#: builtin/index-pack.c:550
+#: builtin/index-pack.c
 #, c-format
 msgid "unknown object type %d"
 msgstr "tipe objek tidak diketahui %d"
 
-#: builtin/index-pack.c:581
+#: builtin/index-pack.c
 msgid "cannot pread pack file"
 msgstr "tidak dapat pread berkas paket"
 
-#: builtin/index-pack.c:583
+#: builtin/index-pack.c
 #, 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] ""
+msgstr[0] "ujung berkas pak prematur, %<PRIuMAX> bita hilang"
+msgstr[1] "ujung berkas pak prematur, %<PRIuMAX> bita hilang"
 
-#: builtin/index-pack.c:609
+#: builtin/index-pack.c
 msgid "serious inflate inconsistency"
 msgstr "inkonsistensi inflate serius"
 
-#: builtin/index-pack.c:754 builtin/index-pack.c:760 builtin/index-pack.c:784
-#: builtin/index-pack.c:823 builtin/index-pack.c:832
+#: builtin/index-pack.c
 #, c-format
 msgid "SHA1 COLLISION FOUND WITH %s !"
 msgstr "TUMBUKAN SHA1 DITEMUKAN DENGAN %s !"
 
-#: builtin/index-pack.c:757 builtin/pack-objects.c:290
-#: builtin/pack-objects.c:350 builtin/pack-objects.c:456
+#: builtin/index-pack.c builtin/pack-objects.c
 #, c-format
 msgid "unable to read %s"
 msgstr "tidak dapat membaca %s"
 
-#: builtin/index-pack.c:821
+#: builtin/index-pack.c
 #, c-format
 msgid "cannot read existing object info %s"
 msgstr "tidak dapat membaca info objek yang ada %s"
 
-#: builtin/index-pack.c:829
+#: builtin/index-pack.c
 #, c-format
 msgid "cannot read existing object %s"
 msgstr "tidak dapat membaca objek yang ada %s"
 
-#: builtin/index-pack.c:843
+#: builtin/index-pack.c
 #, c-format
 msgid "invalid blob object %s"
 msgstr "objek blob tidak valid %s"
 
-#: builtin/index-pack.c:846 builtin/index-pack.c:865
+#: builtin/index-pack.c
 msgid "fsck error in packed object"
 msgstr "kesalahan fsck dalam objek terpaket"
 
-#: builtin/index-pack.c:867
+#: builtin/index-pack.c
 #, c-format
 msgid "Not all child objects of %s are reachable"
 msgstr "Tidak semua objek anak dari %s bisa dicapai"
 
-#: builtin/index-pack.c:928 builtin/index-pack.c:975
+#: builtin/index-pack.c
 msgid "failed to apply delta"
 msgstr "gagal menerapkan delta"
 
-#: builtin/index-pack.c:1161
+#: builtin/index-pack.c
 msgid "Receiving objects"
 msgstr "Menerima objek"
 
-#: builtin/index-pack.c:1161
+#: builtin/index-pack.c
 msgid "Indexing objects"
 msgstr "Mengindeks objek"
 
-#: builtin/index-pack.c:1195
+#: builtin/index-pack.c
 msgid "pack is corrupted (SHA1 mismatch)"
 msgstr "paket rusak (SHA1 tidak cocok)"
 
-#: builtin/index-pack.c:1200
+#: builtin/index-pack.c
 msgid "cannot fstat packfile"
 msgstr "tidak dapat fstat berkas paket"
 
-#: builtin/index-pack.c:1203
+#: builtin/index-pack.c
 msgid "pack has junk at the end"
 msgstr "paket memiliki sampah pada ujung"
 
-#: builtin/index-pack.c:1215
+#: builtin/index-pack.c
 msgid "confusion beyond insanity in parse_pack_objects()"
 msgstr "bingung di luar kegilaan di parse_pack_objects()"
 
-#: builtin/index-pack.c:1238
+#: builtin/index-pack.c
 msgid "Resolving deltas"
 msgstr "Menguraikan delta"
 
-#: builtin/index-pack.c:1249 builtin/pack-objects.c:2913
+#: builtin/index-pack.c builtin/pack-objects.c
 #, c-format
 msgid "unable to create thread: %s"
 msgstr "tidak dapat membuat utas: %s"
 
-#: builtin/index-pack.c:1282
+#: builtin/index-pack.c
 msgid "confusion beyond insanity"
 msgstr "bingung di luar kegilaan"
 
-#: builtin/index-pack.c:1288
+#: builtin/index-pack.c
 #, c-format
 msgid "completed with %d local object"
 msgid_plural "completed with %d local objects"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "diselesaikan dengan %d objek lokal"
+msgstr[1] "diselesaikan dengan %d objek lokal"
 
-#: builtin/index-pack.c:1300
+#: builtin/index-pack.c
 #, c-format
 msgid "Unexpected tail checksum for %s (disk corruption?)"
 msgstr "Checksum ekor tidak diharapkan untuk %s (kerusakan disk?)"
 
-#: builtin/index-pack.c:1304
+#: builtin/index-pack.c
 #, c-format
 msgid "pack has %d unresolved delta"
 msgid_plural "pack has %d unresolved deltas"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "pak punya %d delta tak terurai"
+msgstr[1] "pak punya %d delta tak terurai"
 
-#: builtin/index-pack.c:1328
+#: builtin/index-pack.c
 #, 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
 #, c-format
 msgid "local object %s is corrupt"
 msgstr "objek lokal %s rusak"
 
-#: builtin/index-pack.c:1445
+#: builtin/index-pack.c
 #, c-format
 msgid "packfile name '%s' does not end with '.%s'"
 msgstr "nama berkas paket '%s' tidak diakhiri dengan '.%s'"
 
-#: builtin/index-pack.c:1469
+#: builtin/index-pack.c
 #, c-format
 msgid "cannot write %s file '%s'"
 msgstr "tidak dapat menulis %s berkas '%s'"
 
-#: builtin/index-pack.c:1477
+#: builtin/index-pack.c
 #, c-format
 msgid "cannot close written %s file '%s'"
 msgstr "tidak dapat menutup %s berkas tertulis '%s'"
 
-#: builtin/index-pack.c:1494
+#: builtin/index-pack.c
 #, 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:1519
+#: builtin/index-pack.c
 msgid "error while closing pack file"
 msgstr "kesalahan menutup berkas paket"
 
-#: builtin/index-pack.c:1578 builtin/pack-objects.c:3158
+#: builtin/index-pack.c builtin/pack-objects.c
 #, c-format
-msgid "bad pack.indexversion=%<PRIu32>"
-msgstr "pack.indexversion=%<PRIu32> jelek"
+msgid "bad pack.indexVersion=%<PRIu32>"
+msgstr "pack.indexVersion=%<PRIu32> jelek"
 
-#: builtin/index-pack.c:1648
+#: builtin/index-pack.c
 #, c-format
 msgid "Cannot open existing pack file '%s'"
 msgstr "tidak dapat membuka berkas paket yang ada '%s'"
 
-#: builtin/index-pack.c:1650
+#: builtin/index-pack.c
 #, c-format
 msgid "Cannot open existing pack idx file for '%s'"
 msgstr "tidak dapat membuka berkas indeks paket untuk '%s'"
 
-#: builtin/index-pack.c:1698
+#: builtin/index-pack.c
 #, c-format
 msgid "non delta: %d object"
 msgid_plural "non delta: %d objects"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "non delta: %d objek"
+msgstr[1] "non delta: %d objek"
 
-#: builtin/index-pack.c:1705
+#: builtin/index-pack.c
 #, c-format
 msgid "chain length = %d: %lu object"
 msgid_plural "chain length = %d: %lu objects"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "panjang rantai = %d: %lu objek"
+msgstr[1] "panjang rantai = %d: %lu objek"
 
-#: builtin/index-pack.c:1748
+#: builtin/index-pack.c
 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:1825 builtin/index-pack.c:1829
+#: builtin/index-pack.c
 #, c-format
 msgid "bad %s"
 msgstr "%s jelek"
 
-#: builtin/index-pack.c:1835 builtin/init-db.c:379 builtin/init-db.c:614
+#: builtin/index-pack.c builtin/init-db.c
 #, c-format
 msgid "unknown hash algorithm '%s'"
 msgstr "algoritma hash tak dikenal '%s'"
 
-#: builtin/index-pack.c:1856
+#: builtin/index-pack.c
 msgid "--stdin requires a git repository"
 msgstr "--stdin memerlukan repositori git"
 
-#: builtin/index-pack.c:1873
+#: builtin/index-pack.c
 msgid "--verify with no packfile name given"
 msgstr "--verify tanpa nama berkas paket diberikan"
 
-#: builtin/index-pack.c:1939 builtin/unpack-objects.c:584
+#: builtin/index-pack.c builtin/unpack-objects.c
 msgid "fsck error in pack objects"
 msgstr "kesalahan fsck dalam objek paket"
 
-#: builtin/init-db.c:63
+#: builtin/init-db.c
 #, c-format
 msgid "cannot stat template '%s'"
 msgstr "tidak dapat men-stat templat '%s'"
 
-#: builtin/init-db.c:68
+#: builtin/init-db.c
 #, c-format
 msgid "cannot opendir '%s'"
 msgstr "tidak dapat membuka direktori '%s'"
 
-#: builtin/init-db.c:80
+#: builtin/init-db.c
 #, c-format
 msgid "cannot readlink '%s'"
 msgstr "tidak dapat membaca tautan '%s'"
 
-#: builtin/init-db.c:82
+#: builtin/init-db.c
 #, c-format
 msgid "cannot symlink '%s' '%s'"
 msgstr "tidak dapat menautkan simbolik '%s' '%s'"
 
-#: builtin/init-db.c:88
+#: builtin/init-db.c
 #, c-format
 msgid "cannot copy '%s' to '%s'"
 msgstr "tidak dapat menyalin '%s' ke '%s'"
 
-#: builtin/init-db.c:92
+#: builtin/init-db.c
 #, c-format
 msgid "ignoring template %s"
 msgstr "mengabaikan templat %s"
 
-#: builtin/init-db.c:123
+#: builtin/init-db.c
 #, c-format
 msgid "templates not found in %s"
 msgstr "templat tidak ditemukan di %s"
 
-#: builtin/init-db.c:138
+#: builtin/init-db.c
 #, c-format
 msgid "not copying templates from '%s': %s"
 msgstr "tidak menyalin templat dari '%s': %s"
 
-#: builtin/init-db.c:263
+#: builtin/init-db.c
 #, c-format
 msgid "invalid initial branch name: '%s'"
 msgstr "nama cabang asal salah: '%s'"
 
-#: builtin/init-db.c:354
+#: builtin/init-db.c
 #, c-format
 msgid "unable to handle file type %d"
 msgstr "tidak dapat menangani tipe berkas %d"
 
-#: builtin/init-db.c:357
+#: builtin/init-db.c
 #, c-format
 msgid "unable to move %s to %s"
 msgstr "tidak dapat memindahkan %s ke %s"
 
-#: builtin/init-db.c:373
+#: builtin/init-db.c
 msgid "attempt to reinitialize repository with different hash"
 msgstr "mencoba menginisialisasi ulang repositori dengan hash yang berbeda"
 
-#: builtin/init-db.c:397 builtin/init-db.c:400
+#: builtin/init-db.c
 #, c-format
 msgid "%s already exists"
 msgstr "%s sudah ada"
 
-#: builtin/init-db.c:432
+#: builtin/init-db.c
 #, c-format
 msgid "re-init: ignored --initial-branch=%s"
 msgstr "re-init: --initial-branch=%s diabaikan"
 
-#: builtin/init-db.c:463
+#: builtin/init-db.c
 #, c-format
 msgid "Reinitialized existing shared Git repository in %s%s\n"
 msgstr "Repositori berbagi Git yang sudah ada diinisialisasi ulang di %s%s\n"
 
-#: builtin/init-db.c:464
+#: builtin/init-db.c
 #, c-format
 msgid "Reinitialized existing Git repository in %s%s\n"
 msgstr "Repositori Git diinisialisasi ulang di %s%s\n"
 
-#: builtin/init-db.c:468
+#: builtin/init-db.c
 #, c-format
 msgid "Initialized empty shared Git repository in %s%s\n"
 msgstr "Repositori berbagi Git kosong diinisialisasi di %s%s\n"
 
-#: builtin/init-db.c:469
+#: builtin/init-db.c
 #, c-format
 msgid "Initialized empty Git repository in %s%s\n"
 msgstr "Repositori Git kosong dinisialisasi di %s%s\n"
 
-#: builtin/init-db.c:518
+#: builtin/init-db.c
 msgid ""
 "git init [-q | --quiet] [--bare] [--template=<template-directory>] [--"
 "shared[=<permissions>]] [<directory>]"
@@ -17160,38 +8926,38 @@ msgstr ""
 "git init [-q | --quiet] [--bare] [--template=<direktori-templat>][--"
 "shared[=<perizinan>]] [<direktori>]"
 
-#: builtin/init-db.c:544
+#: builtin/init-db.c
 msgid "permissions"
 msgstr "perizinan"
 
-#: builtin/init-db.c:545
+#: builtin/init-db.c
 msgid "specify that the git repository is to be shared amongst several users"
 msgstr ""
 "tentukan bahwa repositori git untuk dibagikan di antara beberapa pengguna"
 
-#: builtin/init-db.c:551
+#: builtin/init-db.c
 msgid "override the name of the initial branch"
 msgstr "timpa nama cabang asal"
 
-#: builtin/init-db.c:552 builtin/verify-pack.c:74
+#: builtin/init-db.c builtin/verify-pack.c
 msgid "hash"
-msgstr ""
+msgstr "hash"
 
-#: builtin/init-db.c:553 builtin/show-index.c:22 builtin/verify-pack.c:75
+#: builtin/init-db.c builtin/show-index.c builtin/verify-pack.c
 msgid "specify the hash algorithm to use"
 msgstr "tentukan algoritma hash yang akan digunakan"
 
-#: builtin/init-db.c:591 builtin/init-db.c:596
+#: builtin/init-db.c
 #, c-format
 msgid "cannot mkdir %s"
 msgstr "tidak dapat membuat direktori %s"
 
-#: builtin/init-db.c:600 builtin/init-db.c:655
+#: builtin/init-db.c
 #, c-format
 msgid "cannot chdir to %s"
 msgstr "tidak dapat mengganti direktori ke %s"
 
-#: builtin/init-db.c:627
+#: builtin/init-db.c
 #, c-format
 msgid ""
 "%s (or --work-tree=<directory>) not allowed without specifying %s (or --git-"
@@ -17200,107 +8966,111 @@ msgstr ""
 "%s (atau --work-tree=<direktori>) tidak diperbolehkan tanpa sebutkan %s "
 "(atau --git-dir=<direktori>)"
 
-#: builtin/init-db.c:679
+#: builtin/init-db.c
 #, c-format
 msgid "Cannot access work tree '%s'"
 msgstr "Tidak dapat mengakses pohon kerja '%s'"
 
-#: builtin/init-db.c:684
+#: builtin/init-db.c
 msgid "--separate-git-dir incompatible with bare repository"
 msgstr "--separate-git-dir tidak kompatibel dengan repositori bare"
 
-#: builtin/interpret-trailers.c:16
+#: builtin/interpret-trailers.c
 msgid ""
 "git interpret-trailers [--in-place] [--trim-empty] [(--trailer "
 "<token>[(=|:)<value>])...] [<file>...]"
 msgstr ""
 
-#: builtin/interpret-trailers.c:95
+#: builtin/interpret-trailers.c
 msgid "edit files in place"
 msgstr ""
 
-#: builtin/interpret-trailers.c:96
+#: builtin/interpret-trailers.c
 msgid "trim empty trailers"
 msgstr ""
 
-#: builtin/interpret-trailers.c:99
+#: builtin/interpret-trailers.c
 msgid "where to place the new trailer"
 msgstr ""
 
-#: builtin/interpret-trailers.c:101
+#: builtin/interpret-trailers.c
 msgid "action if trailer already exists"
 msgstr ""
 
-#: builtin/interpret-trailers.c:103
+#: builtin/interpret-trailers.c
 msgid "action if trailer is missing"
 msgstr ""
 
-#: builtin/interpret-trailers.c:105
+#: builtin/interpret-trailers.c
 msgid "output only the trailers"
 msgstr ""
 
-#: builtin/interpret-trailers.c:106
+#: builtin/interpret-trailers.c
 msgid "do not apply config rules"
 msgstr ""
 
-#: builtin/interpret-trailers.c:107
+#: builtin/interpret-trailers.c
 msgid "join whitespace-continued values"
 msgstr ""
 
-#: builtin/interpret-trailers.c:108
+#: builtin/interpret-trailers.c
 msgid "set parsing options"
 msgstr ""
 
-#: builtin/interpret-trailers.c:110
+#: builtin/interpret-trailers.c
 msgid "do not treat --- specially"
 msgstr ""
 
-#: builtin/interpret-trailers.c:112
+#: builtin/interpret-trailers.c
 msgid "trailer(s) to add"
 msgstr ""
 
-#: builtin/interpret-trailers.c:123
+#: builtin/interpret-trailers.c
 msgid "--trailer with --only-input does not make sense"
 msgstr ""
 
-#: builtin/interpret-trailers.c:133
+#: builtin/interpret-trailers.c
 msgid "no input file given for in-place editing"
 msgstr ""
 
-#: builtin/log.c:60
+#: builtin/log.c
 msgid "git log [<options>] [<revision-range>] [[--] <path>...]"
 msgstr "git log [<opsi>] [<rentang revisi>] [[--] <jalur>...]"
 
-#: builtin/log.c:61
+#: builtin/log.c
 msgid "git show [<options>] <object>..."
 msgstr "git show [<opsi>] <objek>..."
 
-#: builtin/log.c:114
+#: builtin/log.c
 #, c-format
 msgid "invalid --decorate option: %s"
 msgstr "opsi --decorate tidak valid: %s"
 
-#: builtin/log.c:181
+#: builtin/log.c diff.c
+msgid "suppress diff output"
+msgstr "sembunyikan keluaran diff"
+
+#: builtin/log.c
 msgid "show source"
 msgstr "perlihatkan sumber"
 
-#: builtin/log.c:182
+#: builtin/log.c
 msgid "use mail map file"
 msgstr "gunakan berkas peta surat"
 
-#: builtin/log.c:185
+#: builtin/log.c
 msgid "only decorate refs that match <pattern>"
 msgstr "hanya dekorasi referensi yang cocok dengan <pola>"
 
-#: builtin/log.c:187
+#: builtin/log.c
 msgid "do not decorate refs that match <pattern>"
 msgstr "jangan dekorasi referensi yang cocok dengan <pola>"
 
-#: builtin/log.c:188
+#: builtin/log.c
 msgid "decorate options"
 msgstr "opsi dekorasi"
 
-#: builtin/log.c:191
+#: builtin/log.c
 msgid ""
 "trace the evolution of line range <start>,<end> or function :<funcname> in "
 "<file>"
@@ -17308,93 +9078,97 @@ msgstr ""
 "lacak evolusi rentang baris <awal>,<akhir> atau fungsi :<nama fungsi> dalam "
 "<berkas>"
 
-#: builtin/log.c:214
+#: builtin/log.c builtin/shortlog.c bundle.c
+#, c-format
+msgid "unrecognized argument: %s"
+msgstr "argumen tidak dikenal: %s"
+
+#: builtin/log.c
 msgid "-L<range>:<file> cannot be used with pathspec"
 msgstr "-L<rentang>:<berkas> tidak dapat digunakan dengan spek jalur"
 
-#: builtin/log.c:322
+#: builtin/log.c
 #, c-format
 msgid "Final output: %d %s\n"
 msgstr "Keluaran terakhir: %d %s\n"
 
-#: builtin/log.c:429
+#: builtin/log.c
 msgid "unable to create temporary object directory"
 msgstr "tidak dapat membuat direktori objek sementara"
 
-#: builtin/log.c:599
+#: builtin/log.c
 #, c-format
 msgid "git show %s: bad file"
 msgstr "git show %s: berkas jelek"
 
-#: builtin/log.c:614 builtin/log.c:706
+#: builtin/log.c
 #, c-format
 msgid "could not read object %s"
 msgstr "tidak dapat membaca objek %s"
 
-#: builtin/log.c:731
+#: builtin/log.c
 #, c-format
 msgid "unknown type: %d"
 msgstr "tipe tidak dikenal: %d"
 
-#: builtin/log.c:880
+#: builtin/log.c
 #, c-format
 msgid "%s: invalid cover from description mode"
 msgstr "%s: sampul tidak valid dari mode deskripsi"
 
-#: builtin/log.c:887
+#: builtin/log.c
 msgid "format.headers without value"
 msgstr "format.headers tanpa nilai"
 
-#: builtin/log.c:1016
+#: builtin/log.c
 #, c-format
 msgid "cannot open patch file %s"
 msgstr "tidak dapat membuka berkas tambalan %s"
 
-#: builtin/log.c:1033
+#: builtin/log.c
 msgid "need exactly one range"
 msgstr "butuh tepatnya satu rentang"
 
-#: builtin/log.c:1043
+#: builtin/log.c
 msgid "not a range"
 msgstr "bukan sebuah rentang"
 
-#: builtin/log.c:1207
+#: builtin/log.c
 msgid "cover letter needs email format"
 msgstr "sampul surat butuh format email"
 
-#: builtin/log.c:1213
+#: builtin/log.c
 msgid "failed to create cover-letter file"
 msgstr "gagal membuat berkas sampul surat"
 
-#: builtin/log.c:1300
+#: builtin/log.c
 #, c-format
 msgid "insane in-reply-to: %s"
 msgstr "in-reply-to gila: %s"
 
-#: builtin/log.c:1327
+#: builtin/log.c
 msgid "git format-patch [<options>] [<since> | <revision-range>]"
 msgstr "git format-patch [<opsi>] [<sejak> | <rentang revisi>]"
 
-#: builtin/log.c:1385
+#: builtin/log.c
 msgid "two output directories?"
 msgstr "dua direktori keluaran?"
 
-#: builtin/log.c:1536 builtin/log.c:2369 builtin/log.c:2371 builtin/log.c:2383
+#: builtin/log.c
 #, c-format
 msgid "unknown commit %s"
 msgstr "komit tidak dikenal %s"
 
-#: builtin/log.c:1547 builtin/replace.c:58 builtin/replace.c:207
-#: builtin/replace.c:210
+#: builtin/log.c builtin/replace.c
 #, c-format
 msgid "failed to resolve '%s' as a valid ref"
 msgstr "gagal menguraikan '%s' sebagai referensi valid"
 
-#: builtin/log.c:1556
+#: builtin/log.c
 msgid "could not find exact merge base"
 msgstr "tidak dapat menemukan dasar penggabungan eksak"
 
-#: builtin/log.c:1566
+#: builtin/log.c
 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"
@@ -17406,280 +9180,285 @@ msgstr ""
 "Atau Anda dapat menyebutkan dasar komit secara manual dengan --base=<id "
 "dasar komit>"
 
-#: builtin/log.c:1589
+#: builtin/log.c
 msgid "failed to find exact merge base"
 msgstr "tidak dapat menemukan dasar penggabungan eksak"
 
-#: builtin/log.c:1606
+#: builtin/log.c
 msgid "base commit should be the ancestor of revision list"
 msgstr "dasar komit seharusnya menjadi leluhur daftar revisi"
 
-#: builtin/log.c:1616
+#: builtin/log.c
 msgid "base commit shouldn't be in revision list"
 msgstr "dasar komit tidak seharusnya dalam daftar revisi"
 
-#: builtin/log.c:1674
+#: builtin/log.c
 msgid "cannot get patch id"
 msgstr "tidak dapat mendapatkan id tambalan"
 
-#: builtin/log.c:1737
+#: builtin/log.c
 msgid "failed to infer range-diff origin of current series"
 msgstr "gagal menduga asal range-diff dari seri saat ini"
 
-#: builtin/log.c:1739
+#: builtin/log.c
 #, c-format
 msgid "using '%s' as range-diff origin of current series"
 msgstr "menggunakan '%s' sebagai asal range-diff dari seri saat ini"
 
-#: builtin/log.c:1783
+#: builtin/log.c
 msgid "use [PATCH n/m] even with a single patch"
 msgstr "gunakan [PATCH n/m] bahkan dengan satu tambalan"
 
-#: builtin/log.c:1786
+#: builtin/log.c
 msgid "use [PATCH] even with multiple patches"
 msgstr "gunakan [PATCH] bahkan dengan banyak tambalan"
 
-#: builtin/log.c:1790
+#: builtin/log.c
 msgid "print patches to standard out"
 msgstr "cetak tambalan ke keluaran standar"
 
-#: builtin/log.c:1792
+#: builtin/log.c
 msgid "generate a cover letter"
 msgstr "buat sampul surat"
 
-#: builtin/log.c:1794
+#: builtin/log.c
 msgid "use simple number sequence for output file names"
 msgstr "gunakan urutan bilangan sederhana untuk keluarkan nama berkas"
 
-#: builtin/log.c:1795
+#: builtin/log.c
 msgid "sfx"
 msgstr "sfx"
 
-#: builtin/log.c:1796
+#: builtin/log.c
 msgid "use <sfx> instead of '.patch'"
 msgstr "gunakan <akhiran> daripada '.patch'"
 
-#: builtin/log.c:1798
+#: builtin/log.c
 msgid "start numbering patches at <n> instead of 1"
 msgstr "mulai menomorkan tambalan pada <n> daripada 1"
 
-#: builtin/log.c:1799
+#: builtin/log.c
 msgid "reroll-count"
-msgstr ""
+msgstr "reroll-count"
 
-#: builtin/log.c:1800
+#: builtin/log.c
 msgid "mark the series as Nth re-roll"
 msgstr "tandai seri sebagai gulung ulang ke-N"
 
-#: builtin/log.c:1802
+#: builtin/log.c
 msgid "max length of output filename"
 msgstr "panjang nama berkas keluaran maksimum"
 
-#: builtin/log.c:1804
+#: builtin/log.c
 msgid "use [RFC PATCH] instead of [PATCH]"
 msgstr "gunakan [RFC PATCH] daripada [PATCH]"
 
-#: builtin/log.c:1807
+#: builtin/log.c
 msgid "cover-from-description-mode"
 msgstr "cover-from-description-mode"
 
-#: builtin/log.c:1808
+#: builtin/log.c
 msgid "generate parts of a cover letter based on a branch's description"
 msgstr "buat bagian dari sampul surat berdasarkan deskripsi cabang"
 
-#: builtin/log.c:1810
+#: builtin/log.c
 msgid "use [<prefix>] instead of [PATCH]"
 msgstr "gunakan [<prefix>] daripada [PATCH]"
 
-#: builtin/log.c:1813
+#: builtin/log.c
 msgid "store resulting files in <dir>"
 msgstr "simpan hasil berkas di <direktori>"
 
-#: builtin/log.c:1816
+#: builtin/log.c
 msgid "don't strip/add [PATCH]"
 msgstr "jangan copot/tambah [PATCH]"
 
-#: builtin/log.c:1819
+#: builtin/log.c
 msgid "don't output binary diffs"
 msgstr "jangan keluarkan diff biner"
 
-#: builtin/log.c:1821
+#: builtin/log.c
 msgid "output all-zero hash in From header"
 msgstr "keluarkan hash semua-nol di kepala From"
 
-#: builtin/log.c:1823
+#: builtin/log.c
 msgid "don't include a patch matching a commit upstream"
 msgstr "jangan termasuk tambalan yang cocok dengan komit hulu"
 
-#: builtin/log.c:1825
+#: builtin/log.c
 msgid "show patch format instead of default (patch + stat)"
 msgstr "perlihatkan format tambalan daripada asali (tambalan + stat)"
 
-#: builtin/log.c:1827
+#: builtin/log.c
 msgid "Messaging"
 msgstr "Perpesanan"
 
-#: builtin/log.c:1828
+#: builtin/log.c
 msgid "header"
 msgstr "kepala"
 
-#: builtin/log.c:1829
+#: builtin/log.c
 msgid "add email header"
 msgstr "tambahkan kepala email"
 
-#: builtin/log.c:1830 builtin/log.c:1831
+#: builtin/log.c
 msgid "email"
 msgstr "email"
 
-#: builtin/log.c:1830
+#: builtin/log.c
 msgid "add To: header"
 msgstr "tambahkan kepala To:"
 
-#: builtin/log.c:1831
+#: builtin/log.c
 msgid "add Cc: header"
 msgstr "tambahkan kepala Cc:"
 
-#: builtin/log.c:1832
+#: builtin/log.c
 msgid "ident"
 msgstr "ident"
 
-#: builtin/log.c:1833
+#: builtin/log.c
 msgid "set From address to <ident> (or committer ident if absent)"
 msgstr ""
 "setel alamat From ke <identitas> (atau identitas pengkomit jika tidak ada)"
 
-#: builtin/log.c:1835
+#: builtin/log.c
 msgid "message-id"
 msgstr "message-id"
 
-#: builtin/log.c:1836
+#: builtin/log.c
 msgid "make first mail a reply to <message-id>"
 msgstr "buat surat pertama balasan ke <id pesan>"
 
-#: builtin/log.c:1837 builtin/log.c:1840
+#: builtin/log.c
 msgid "boundary"
 msgstr "perbatasan"
 
-#: builtin/log.c:1838
+#: builtin/log.c
 msgid "attach the patch"
 msgstr "lampirkan tambalan"
 
-#: builtin/log.c:1841
+#: builtin/log.c
 msgid "inline the patch"
 msgstr "bariskan tambalan"
 
-#: builtin/log.c:1845
+#: builtin/log.c
 msgid "enable message threading, styles: shallow, deep"
 msgstr "aktifkan utasan pesan, gaya: shallow, deep"
 
-#: builtin/log.c:1847
+#: builtin/log.c
 msgid "signature"
 msgstr "tanda tangan"
 
-#: builtin/log.c:1848
+#: builtin/log.c
 msgid "add a signature"
 msgstr "tambah tanda tangan"
 
-#: builtin/log.c:1849
+#: builtin/log.c
 msgid "base-commit"
 msgstr "dasar komit"
 
-#: builtin/log.c:1850
+#: builtin/log.c
 msgid "add prerequisite tree info to the patch series"
 msgstr "tambahkan info pohon prasyarat ke seri tambalan"
 
-#: builtin/log.c:1853
+#: builtin/log.c
 msgid "add a signature from a file"
 msgstr "tambahkan tandatangan dari berkas"
 
-#: builtin/log.c:1854
+#: builtin/log.c
 msgid "don't print the patch filenames"
 msgstr "jangan cetak nama berkas tambalan"
 
-#: builtin/log.c:1856
+#: builtin/log.c
 msgid "show progress while generating patches"
 msgstr "perlihatkan perkembangan ketika membuat tambalan"
 
-#: builtin/log.c:1858
+#: builtin/log.c
 msgid "show changes against <rev> in cover letter or single patch"
 msgstr ""
 "perlihatkan perubahan terhadap <revisi> di sampul surat atau satu tambalan"
 
-#: builtin/log.c:1861
+#: builtin/log.c
 msgid "show changes against <refspec> in cover letter or single patch"
 msgstr ""
 "perlihatkan perubahan terhadap <spek referensi> di sampul surat atau satu "
 "tambalan"
 
-#: builtin/log.c:1863 builtin/range-diff.c:28
+#: builtin/log.c builtin/range-diff.c
 msgid "percentage by which creation is weighted"
 msgstr "persentase dimana pembuatan tertimbang"
 
-#: builtin/log.c:1953
+#: builtin/log.c
 #, c-format
 msgid "invalid ident line: %s"
 msgstr "baris identitas tidak valid: %s"
 
-#: builtin/log.c:1978
+#: builtin/log.c
 msgid "--name-only does not make sense"
 msgstr "--name-only tidak masuk akal"
 
-#: builtin/log.c:1980
+#: builtin/log.c
 msgid "--name-status does not make sense"
 msgstr "--name-status tidak masuk akal"
 
-#: builtin/log.c:1982
+#: builtin/log.c
 msgid "--check does not make sense"
 msgstr "--check tidak masuk akal"
 
-#: builtin/log.c:1984
+#: builtin/log.c
 msgid "--remerge-diff does not make sense"
 msgstr "--remerge-diff tidak masuk akal"
 
-#: builtin/log.c:2129
+#: builtin/log.c builtin/submodule--helper.c rerere.c submodule.c
+#, c-format
+msgid "could not create directory '%s'"
+msgstr "tidak dapat membuat direktori '%s'"
+
+#: builtin/log.c
 msgid "--interdiff requires --cover-letter or single patch"
 msgstr "--interdiff butuh --cover-letter atau satu tambalan"
 
-#: builtin/log.c:2133
+#: builtin/log.c
 msgid "Interdiff:"
 msgstr "Interdiff:"
 
-#: builtin/log.c:2134
+#: builtin/log.c
 #, c-format
 msgid "Interdiff against v%d:"
 msgstr "Interdiff terhadap v%d:"
 
-#: builtin/log.c:2144
+#: builtin/log.c
 msgid "--range-diff requires --cover-letter or single patch"
 msgstr "--range-diff butuh --cover-letter atau satu tambalan"
 
-#: builtin/log.c:2152
+#: builtin/log.c
 msgid "Range-diff:"
 msgstr "Range-diff:"
 
-#: builtin/log.c:2153
+#: builtin/log.c
 #, c-format
 msgid "Range-diff against v%d:"
 msgstr "Range-diff terhadap v%d:"
 
-#: builtin/log.c:2164
+#: builtin/log.c
 #, c-format
 msgid "unable to read signature file '%s'"
 msgstr "tidak dapat membaca berkas tanda tangan '%s'"
 
-#: builtin/log.c:2200
+#: builtin/log.c
 msgid "Generating patches"
 msgstr "Membuat tambalan"
 
-#: builtin/log.c:2244
+#: builtin/log.c
 msgid "failed to create output files"
 msgstr "tidak dapat membuat berkas keluaran"
 
-#: builtin/log.c:2304
+#: builtin/log.c
 msgid "git cherry [-v] [<upstream> [<head> [<limit>]]]"
 msgstr "git cherry [-v] [<hulu> [<kepala> [<batas>]]]"
 
-#: builtin/log.c:2358
+#: builtin/log.c
 #, c-format
 msgid ""
 "Could not find a tracked remote branch, please specify <upstream> manually.\n"
@@ -17687,120 +9466,120 @@ msgstr ""
 "Tidak dapat menemukan cabang remote terlacak, mohon sebutkan <hulu>\n"
 "secara manual.\n"
 
-#: builtin/ls-files.c:564
+#: builtin/ls-files.c
 msgid "git ls-files [<options>] [<file>...]"
 msgstr "git ls-files [<opsi>] [<berkas>...]"
 
-#: builtin/ls-files.c:618
+#: builtin/ls-files.c
 msgid "separate paths with the NUL character"
 msgstr "pisahkan jalur dengan karakter NUL"
 
-#: builtin/ls-files.c:620
+#: builtin/ls-files.c
 msgid "identify the file status with tags"
 msgstr "identifikasi status berkas dengan tag"
 
-#: builtin/ls-files.c:622
+#: builtin/ls-files.c
 msgid "use lowercase letters for 'assume unchanged' files"
 msgstr "gunakan huruf kecil untuk berkas 'asumsikan tak berubah'"
 
-#: builtin/ls-files.c:624
+#: builtin/ls-files.c
 msgid "use lowercase letters for 'fsmonitor clean' files"
 msgstr "gunakan huruf kecil untuk berkas 'fsmonitor bersih'"
 
-#: builtin/ls-files.c:626
+#: builtin/ls-files.c
 msgid "show cached files in the output (default)"
 msgstr "perlihatkan berkas tertembolok di dalam keluaran (asali)"
 
-#: builtin/ls-files.c:628
+#: builtin/ls-files.c
 msgid "show deleted files in the output"
 msgstr "perlihatkan berkas yang dihapus di dalam keluaran"
 
-#: builtin/ls-files.c:630
+#: builtin/ls-files.c
 msgid "show modified files in the output"
 msgstr "perlihatkan berkas yang berubah di dalam keluaran"
 
-#: builtin/ls-files.c:632
+#: builtin/ls-files.c
 msgid "show other files in the output"
 msgstr "perlihatkan berkas lainnya di dalam keluaran"
 
-#: builtin/ls-files.c:634
+#: builtin/ls-files.c
 msgid "show ignored files in the output"
 msgstr "perlihatkan berkas terabaikan di dalam keluaran"
 
-#: builtin/ls-files.c:637
+#: builtin/ls-files.c
 msgid "show staged contents' object name in the output"
 msgstr "perlihatkan nama objek dari konten tergelar di dalam keluaran"
 
-#: builtin/ls-files.c:639
+#: builtin/ls-files.c
 msgid "show files on the filesystem that need to be removed"
 msgstr "perlihatkan berkas pada sistem berkas yang perlu dihapus"
 
-#: builtin/ls-files.c:641
+#: builtin/ls-files.c
 msgid "show 'other' directories' names only"
 msgstr "hanya perlihatkan nama direktori 'lainnya'"
 
-#: builtin/ls-files.c:643
+#: builtin/ls-files.c
 msgid "show line endings of files"
 msgstr "perlihatkan akhiran baris berkas"
 
-#: builtin/ls-files.c:645
+#: builtin/ls-files.c
 msgid "don't show empty directories"
 msgstr "jangan perlihatkan direktori kosong"
 
-#: builtin/ls-files.c:648
+#: builtin/ls-files.c
 msgid "show unmerged files in the output"
 msgstr "perlihatkan berkas tak tergabung di dalam keluaran"
 
-#: builtin/ls-files.c:650
+#: builtin/ls-files.c
 msgid "show resolve-undo information"
 msgstr "perlihatkan informasi resolve-undo"
 
-#: builtin/ls-files.c:652
+#: builtin/ls-files.c
 msgid "skip files matching pattern"
 msgstr "lewati berkas yang cocok dengan pola"
 
-#: builtin/ls-files.c:655
+#: builtin/ls-files.c
 msgid "read exclude patterns from <file>"
 msgstr "baca pola pengecualian dari <berkas>"
 
-#: builtin/ls-files.c:658
+#: builtin/ls-files.c
 msgid "read additional per-directory exclude patterns in <file>"
 msgstr "baca pola pengecualian tambahan per direktor dalam <berkas>"
 
-#: builtin/ls-files.c:660
+#: builtin/ls-files.c
 msgid "add the standard git exclusions"
 msgstr "tambahkan pengecualian git standar"
 
-#: builtin/ls-files.c:664
+#: builtin/ls-files.c
 msgid "make the output relative to the project top directory"
 msgstr "buat keluaran relatif terhadap direktori puncak proyek"
 
-#: builtin/ls-files.c:669
+#: builtin/ls-files.c
 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:670
+#: builtin/ls-files.c
 msgid "tree-ish"
 msgstr "mirip-pohon"
 
-#: builtin/ls-files.c:671
+#: builtin/ls-files.c
 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:673
+#: builtin/ls-files.c
 msgid "show debugging data"
 msgstr "perlihatkan data penirkutuan"
 
-#: builtin/ls-files.c:675
+#: builtin/ls-files.c
 msgid "suppress duplicate entries"
 msgstr "hapus entri duplikat"
 
-#: builtin/ls-files.c:677
+#: builtin/ls-files.c
 msgid "show sparse directories in the presence of a sparse index"
 msgstr "perlihatkan direktori tipis di hadapan indeks tipis"
 
-#: builtin/ls-remote.c:9
+#: builtin/ls-remote.c
 msgid ""
 "git ls-remote [--heads] [--tags] [--refs] [--upload-pack=<exec>]\n"
 "              [-q | --quiet] [--exit-code] [--get-url]\n"
@@ -17810,462 +9589,470 @@ msgstr ""
 "              [-q | --quiet] [--exit-code] [--get-url]\n"
 "              [--symref] [<repositori> [<referensi>...]]"
 
-#: builtin/ls-remote.c:60
+#: builtin/ls-remote.c
 msgid "do not print remote URL"
 msgstr "jangan cetak URL remote"
 
-#: builtin/ls-remote.c:61 builtin/ls-remote.c:63 builtin/rebase.c:1131
+#: builtin/ls-remote.c builtin/rebase.c
 msgid "exec"
 msgstr "exec"
 
-#: builtin/ls-remote.c:62 builtin/ls-remote.c:64
+#: builtin/ls-remote.c
 msgid "path of git-upload-pack on the remote host"
 msgstr "jalur git-upload-pack pada host remote"
 
-#: builtin/ls-remote.c:66
+#: builtin/ls-remote.c
 msgid "limit to tags"
 msgstr "batasi ke tag"
 
-#: builtin/ls-remote.c:67
+#: builtin/ls-remote.c
 msgid "limit to heads"
 msgstr "batasi ke kepala"
 
-#: builtin/ls-remote.c:68
+#: builtin/ls-remote.c
 msgid "do not show peeled tags"
 msgstr "jangan perlihatkan tag terkupas"
 
-#: builtin/ls-remote.c:70
+#: builtin/ls-remote.c
 msgid "take url.<base>.insteadOf into account"
 msgstr "perhitungkan url.<dasar>.insteadOf"
 
-#: builtin/ls-remote.c:73
+#: builtin/ls-remote.c
 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
+#: builtin/ls-remote.c
 msgid "show underlying ref in addition to the object pointed by it"
 msgstr "perlihatkan referensi pokok selain objek yang ditunjuk olehnya"
 
-#: builtin/ls-tree.c:36
+#: builtin/ls-tree.c
 msgid "git ls-tree [<options>] <tree-ish> [<path>...]"
 msgstr "git ls-tree [<opsi>] <mirip-pohon> [<jalur>...]"
 
-#: builtin/ls-tree.c:54
+#: builtin/ls-tree.c
 #, c-format
 msgid "could not get object info about '%s'"
 msgstr "tidak dapat mendapatkan info objek tentang '%s'"
 
-#: builtin/ls-tree.c:79
+#: builtin/ls-tree.c
 #, c-format
 msgid "bad ls-tree format: element '%s' does not start with '('"
 msgstr "format ls-tree jelek: elemen '%s' tidak dimulai dengan '('"
 
-#: builtin/ls-tree.c:83
+#: builtin/ls-tree.c
 #, c-format
 msgid "bad ls-tree format: element '%s' does not end in ')'"
 msgstr "format ls-tree jelek: elemen '%s' tidak diakhiri dengan ')'"
 
-#: builtin/ls-tree.c:109
+#: builtin/ls-tree.c
 #, c-format
 msgid "bad ls-tree format: %%%.*s"
 msgstr "format ls-tree jelek: %%%.*s"
 
-#: builtin/ls-tree.c:336
+#: builtin/ls-tree.c
 msgid "only show trees"
 msgstr "hanya perlihatkan pohon"
 
-#: builtin/ls-tree.c:338
+#: builtin/ls-tree.c
 msgid "recurse into subtrees"
 msgstr "rekursi ke dalam subpohon"
 
-#: builtin/ls-tree.c:340
+#: builtin/ls-tree.c
 msgid "show trees when recursing"
 msgstr "perlihatkan pohon ketika rekursi"
 
-#: builtin/ls-tree.c:343
+#: builtin/ls-tree.c
 msgid "terminate entries with NUL byte"
 msgstr "akhiri entri dengan bita NUL"
 
-#: builtin/ls-tree.c:344
+#: builtin/ls-tree.c
 msgid "include object size"
 msgstr "masukkan ukuran objek"
 
-#: builtin/ls-tree.c:346 builtin/ls-tree.c:348
+#: builtin/ls-tree.c
 msgid "list only filenames"
 msgstr "hanya daftar nama berkas"
 
-#: builtin/ls-tree.c:350
+#: builtin/ls-tree.c
 msgid "list only objects"
 msgstr "hanya daftar objek"
 
-#: builtin/ls-tree.c:353
+#: builtin/ls-tree.c
 msgid "use full path names"
 msgstr "gunakan nama berkas lengkap"
 
-#: builtin/ls-tree.c:355
+#: builtin/ls-tree.c
 msgid "list entire tree; not just current directory (implies --full-name)"
 msgstr ""
 "daftar pohon keseluruhan; bukan hanya direktori saat ini (menyiratkan --full-"
 "name)"
 
-#: builtin/ls-tree.c:391
+#: builtin/ls-tree.c
 msgid "--format can't be combined with other format-altering options"
 msgstr "--format tidak dapat digabungkan opsi pengubah format lainnya"
 
 #. TRANSLATORS: keep <> in "<" mail ">" info.
-#: builtin/mailinfo.c:14
+#: builtin/mailinfo.c
 msgid "git mailinfo [<options>] <msg> <patch> < mail >info"
 msgstr ""
 
-#: builtin/mailinfo.c:58
+#: builtin/mailinfo.c
 msgid "keep subject"
 msgstr ""
 
-#: builtin/mailinfo.c:60
+#: builtin/mailinfo.c
 msgid "keep non patch brackets in subject"
 msgstr ""
 
-#: builtin/mailinfo.c:62
+#: builtin/mailinfo.c
 msgid "copy Message-ID to the end of commit message"
 msgstr ""
 
-#: builtin/mailinfo.c:64
+#: builtin/mailinfo.c
 msgid "re-code metadata to i18n.commitEncoding"
 msgstr ""
 
-#: builtin/mailinfo.c:67
+#: builtin/mailinfo.c
 msgid "disable charset re-coding of metadata"
 msgstr ""
 
-#: builtin/mailinfo.c:69
+#: builtin/mailinfo.c
 msgid "encoding"
 msgstr ""
 
-#: builtin/mailinfo.c:70
+#: builtin/mailinfo.c
 msgid "re-code metadata to this encoding"
 msgstr ""
 
-#: builtin/mailinfo.c:72
+#: builtin/mailinfo.c
 msgid "use scissors"
 msgstr ""
 
-#: builtin/mailinfo.c:73
+#: builtin/mailinfo.c
 msgid "<action>"
 msgstr ""
 
-#: builtin/mailinfo.c:74
+#: builtin/mailinfo.c
 msgid "action when quoted CR is found"
 msgstr ""
 
-#: builtin/mailinfo.c:77
+#: builtin/mailinfo.c
 msgid "use headers in message's body"
 msgstr ""
 
-#: builtin/mailsplit.c:227
+#: builtin/mailsplit.c
 msgid "reading patches from stdin/tty..."
 msgstr ""
 
-#: builtin/mailsplit.c:242
+#: builtin/mailsplit.c
 #, c-format
 msgid "empty mbox: '%s'"
 msgstr ""
 
-#: builtin/merge-base.c:32
+#: builtin/merge-base.c
 msgid "git merge-base [-a | --all] <commit> <commit>..."
 msgstr "git merge-base [-a | --all] <komit> <komit>..."
 
-#: builtin/merge-base.c:33
+#: builtin/merge-base.c
 msgid "git merge-base [-a | --all] --octopus <commit>..."
 msgstr "git merge-base [-a | --all] --octopus <komit>..."
 
-#: builtin/merge-base.c:34
+#: builtin/merge-base.c
 msgid "git merge-base --independent <commit>..."
 msgstr "git merge-base --independent <komit>..."
 
-#: builtin/merge-base.c:35
+#: builtin/merge-base.c
 msgid "git merge-base --is-ancestor <commit> <commit>"
 msgstr "git merge-base --is-ancestor <komit> <komit>"
 
-#: builtin/merge-base.c:36
+#: builtin/merge-base.c
 msgid "git merge-base --fork-point <ref> [<commit>]"
 msgstr "git merge-base --fork-point <referensi> [<komit>]"
 
-#: builtin/merge-base.c:144
+#: builtin/merge-base.c
 msgid "output all common ancestors"
 msgstr "keluarkan semua leluhur umum"
 
-#: builtin/merge-base.c:146
+#: builtin/merge-base.c
 msgid "find ancestors for a single n-way merge"
 msgstr "temukan leluhur untuk sebuah penggabungan n-arah"
 
-#: builtin/merge-base.c:148
+#: builtin/merge-base.c
 msgid "list revs not reachable from others"
 msgstr "daftarkan revisi yang tak terjangkau dari yang lainnya"
 
-#: builtin/merge-base.c:150
+#: builtin/merge-base.c
 msgid "is the first one ancestor of the other?"
 msgstr "apakah yang pertama leluhur yang lain?"
 
-#: builtin/merge-base.c:152
+#: builtin/merge-base.c
 msgid "find where <commit> forked from reflog of <ref>"
 msgstr "temukan dimana <komit> digarpu dari log referensi <referensi>"
 
-#: builtin/merge-file.c:9
+#: builtin/merge-file.c
 msgid ""
 "git merge-file [<options>] [-L <name1> [-L <orig> [-L <name2>]]] <file1> "
 "<orig-file> <file2>"
 msgstr ""
 
-#: builtin/merge-file.c:35
+#: builtin/merge-file.c
 msgid "send results to standard output"
 msgstr ""
 
-#: builtin/merge-file.c:36
+#: builtin/merge-file.c
 msgid "use a diff3 based merge"
 msgstr ""
 
-#: builtin/merge-file.c:37
+#: builtin/merge-file.c
 msgid "use a zealous diff3 based merge"
 msgstr ""
 
-#: builtin/merge-file.c:39
+#: builtin/merge-file.c
 msgid "for conflicts, use our version"
 msgstr ""
 
-#: builtin/merge-file.c:41
+#: builtin/merge-file.c
 msgid "for conflicts, use their version"
 msgstr ""
 
-#: builtin/merge-file.c:43
+#: builtin/merge-file.c
 msgid "for conflicts, use a union version"
 msgstr ""
 
-#: builtin/merge-file.c:46
+#: builtin/merge-file.c
 msgid "for conflicts, use this marker size"
 msgstr ""
 
-#: builtin/merge-file.c:47
+#: builtin/merge-file.c
 msgid "do not warn about conflicts"
 msgstr ""
 
-#: builtin/merge-file.c:49
+#: builtin/merge-file.c
 msgid "set labels for file1/orig-file/file2"
 msgstr ""
 
-#: builtin/merge-recursive.c:47
+#: builtin/merge-recursive.c
 #, c-format
 msgid "unknown option %s"
 msgstr ""
 
-#: builtin/merge-recursive.c:53
+#: builtin/merge-recursive.c
 #, c-format
 msgid "could not parse object '%s'"
 msgstr ""
 
-#: builtin/merge-recursive.c:57
+#: builtin/merge-recursive.c
 #, c-format
 msgid "cannot handle more than %d base. Ignoring %s."
 msgid_plural "cannot handle more than %d bases. Ignoring %s."
 msgstr[0] ""
 msgstr[1] ""
 
-#: builtin/merge-recursive.c:65
+#: builtin/merge-recursive.c
 msgid "not handling anything other than two heads merge."
 msgstr ""
 
-#: builtin/merge-recursive.c:74 builtin/merge-recursive.c:76
+#: builtin/merge-recursive.c
 #, c-format
 msgid "could not resolve ref '%s'"
 msgstr ""
 
-#: builtin/merge-recursive.c:82
+#: builtin/merge-recursive.c
 #, c-format
 msgid "Merging %s with %s\n"
 msgstr ""
 
-#: builtin/merge.c:59
+#: builtin/merge.c
 msgid "git merge [<options>] [<commit>...]"
 msgstr "git merge [<opsi>] [<komit>...]"
 
-#: builtin/merge.c:125
+#: builtin/merge.c
 msgid "switch `m' requires a value"
 msgstr "tombol `m' butuh sebuah nilai"
 
-#: builtin/merge.c:148
+#: builtin/merge.c
 #, c-format
 msgid "option `%s' requires a value"
 msgstr "opsi `%s' butuh sebuah nilai"
 
-#: builtin/merge.c:201
+#: builtin/merge.c
 #, c-format
 msgid "Could not find merge strategy '%s'.\n"
 msgstr "Tidak dapat menemukan strategi penggabungan '%s'.\n"
 
-#: builtin/merge.c:202
+#: builtin/merge.c
 #, c-format
 msgid "Available strategies are:"
 msgstr "Strategi yang tersedia:"
 
-#: builtin/merge.c:207
+#: builtin/merge.c
 #, c-format
 msgid "Available custom strategies are:"
 msgstr "Strategi kustom yang tersedia:"
 
-#: builtin/merge.c:258 builtin/pull.c:134
+#: builtin/merge.c builtin/pull.c
 msgid "do not show a diffstat at the end of the merge"
 msgstr "jangan perlihatkan diffstat pada akhir penggabungan"
 
-#: builtin/merge.c:261 builtin/pull.c:137
+#: builtin/merge.c builtin/pull.c
 msgid "show a diffstat at the end of the merge"
 msgstr "perlihatkan diffstat pada akhir penggabungan"
 
-#: builtin/merge.c:262 builtin/pull.c:140
+#: builtin/merge.c builtin/pull.c
 msgid "(synonym to --stat)"
 msgstr "(sinonim untuk --stat)"
 
-#: builtin/merge.c:264 builtin/pull.c:143
+#: builtin/merge.c builtin/pull.c
 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:267 builtin/pull.c:149
+#: builtin/merge.c builtin/pull.c
 msgid "create a single commit instead of doing a merge"
 msgstr "buat satu komit daripada melakukan penggabungan"
 
-#: builtin/merge.c:269 builtin/pull.c:152
+#: builtin/merge.c builtin/pull.c
 msgid "perform a commit if the merge succeeds (default)"
 msgstr "lakukan komit jika penggabungan sukses (asali)"
 
-#: builtin/merge.c:271 builtin/pull.c:155
+#: builtin/merge.c builtin/pull.c
 msgid "edit message before committing"
 msgstr "sunting pesan sebelum komit"
 
-#: builtin/merge.c:273
+#: builtin/merge.c
 msgid "allow fast-forward (default)"
 msgstr "perbolehkan maju cepat (asali)"
 
-#: builtin/merge.c:275 builtin/pull.c:162
+#: builtin/merge.c builtin/pull.c
 msgid "abort if fast-forward is not possible"
 msgstr "batalkan jika maju cepat tidak dimungkinkan"
 
-#: builtin/merge.c:279 builtin/pull.c:168
+#: builtin/merge.c builtin/pull.c
 msgid "verify that the named commit has a valid GPG signature"
 msgstr "periksa bahwa komit bernama punya tandatangan GPG yang valid"
 
-#: builtin/merge.c:280 builtin/notes.c:785 builtin/pull.c:172
-#: builtin/rebase.c:1145 builtin/revert.c:114
+#: builtin/merge.c builtin/notes.c builtin/pull.c builtin/rebase.c
+#: builtin/revert.c
 msgid "strategy"
 msgstr "strategi"
 
-#: builtin/merge.c:281 builtin/pull.c:173
+#: builtin/merge.c builtin/pull.c
 msgid "merge strategy to use"
 msgstr "strategi penggabungan yang digunakan"
 
-#: builtin/merge.c:282 builtin/pull.c:176
+#: builtin/merge.c builtin/pull.c
 msgid "option=value"
 msgstr "opsi=nilai"
 
-#: builtin/merge.c:283 builtin/pull.c:177
+#: builtin/merge.c builtin/pull.c
 msgid "option for selected merge strategy"
 msgstr "opsi untuk strategi penggabungan yang dipilih"
 
-#: builtin/merge.c:285
+#: builtin/merge.c
 msgid "merge commit message (for a non-fast-forward merge)"
 msgstr "pesan komit penggabungan (untuk penggabungan bukan maju cepat)"
 
-#: builtin/merge.c:291
+#: builtin/merge.c
 msgid "use <name> instead of the real target"
 msgstr "gunakan <nama> daripada target sebenarnya"
 
-#: builtin/merge.c:294
+#: builtin/merge.c
 msgid "abort the current in-progress merge"
 msgstr "batalkan penggabungan yang sedang berlangsung saat ini"
 
-#: builtin/merge.c:296
+#: builtin/merge.c
 msgid "--abort but leave index and working tree alone"
 msgstr "--abort tapi biarkan indeks dan pohon kerja"
 
-#: builtin/merge.c:298
+#: builtin/merge.c
 msgid "continue the current in-progress merge"
 msgstr "lanjutkan penggabungan yang sedang berlangsung saat ini"
 
-#: builtin/merge.c:300 builtin/pull.c:184
+#: builtin/merge.c builtin/pull.c
 msgid "allow merging unrelated histories"
 msgstr "perbolehkan penggabungan riwayat yang tak terkait"
 
-#: builtin/merge.c:307
+#: builtin/merge.c
 msgid "bypass pre-merge-commit and commit-msg hooks"
 msgstr "lewati kail pre-merge-commit dan commit-msg"
 
-#: builtin/merge.c:323
+#: builtin/merge.c
 msgid "could not run stash."
 msgstr "tidak dapat menjalankan stase."
 
-#: builtin/merge.c:328
+#: builtin/merge.c
 msgid "stash failed"
 msgstr "stase gagal"
 
-#: builtin/merge.c:333
+#: builtin/merge.c
 #, c-format
 msgid "not a valid object: %s"
 msgstr "bukan objek valid: %s"
 
-#: builtin/merge.c:355 builtin/merge.c:372
+#: builtin/merge.c
 msgid "read-tree failed"
 msgstr "read-tree gagal"
 
-#: builtin/merge.c:403
+#: builtin/merge.c
 msgid "Already up to date. (nothing to squash)"
 msgstr "Sudah diperbarui. (tidak ada yang bisa dilumat)"
 
-#: builtin/merge.c:417
+#: builtin/merge.c merge-ort-wrappers.c merge-recursive.c
+msgid "Already up to date."
+msgstr "Sudah terbaru."
+
+#: builtin/merge.c
 #, c-format
 msgid "Squash commit -- not updating HEAD\n"
 msgstr "Lumat komit -- tak perbarui HEAD\n"
 
-#: builtin/merge.c:467
+#: builtin/merge.c
 #, c-format
 msgid "No merge message -- not updating HEAD\n"
 msgstr "Tidak ada pesan komit -- tak perbarui HEAD\n"
 
-#: builtin/merge.c:517
+#: builtin/merge.c
 #, c-format
 msgid "'%s' does not point to a commit"
 msgstr "'%s' tidak menunjuk pada sebuah komit"
 
-#: builtin/merge.c:605
+#: builtin/merge.c
 #, c-format
 msgid "Bad branch.%s.mergeoptions string: %s"
 msgstr "Untai branch.%s.mergeoptions jelek: %s"
 
-#: builtin/merge.c:732
+#: builtin/merge.c builtin/stash.c merge-recursive.c
+msgid "Unable to write index."
+msgstr "Tidak dapat menulis indeks."
+
+#: builtin/merge.c
 msgid "Not handling anything other than two heads merge."
 msgstr "Tak tangani apapun selain penggabungan dua kepala."
 
-#: builtin/merge.c:745
+#: builtin/merge.c
 #, c-format
 msgid "unknown strategy option: -X%s"
 msgstr "opsi strategi tidak dikenal: -X%s"
 
-#: builtin/merge.c:764 t/helper/test-fast-rebase.c:223
+#: builtin/merge.c t/helper/test-fast-rebase.c
 #, c-format
 msgid "unable to write %s"
 msgstr "tidak dapat menulis %s"
 
-#: builtin/merge.c:816
+#: builtin/merge.c
 #, c-format
 msgid "Could not read from '%s'"
 msgstr "Tidak dapat membaca dari '%s'"
 
-#: builtin/merge.c:825
+#: builtin/merge.c
 #, 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:831
+#: builtin/merge.c
 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"
@@ -18275,11 +10062,11 @@ msgstr ""
 "diperlukan, khususnya jika itu menggabungkan hulu terbarui ke cabang\n"
 "topik.\n"
 
-#: builtin/merge.c:836
+#: builtin/merge.c
 msgid "An empty message aborts the commit.\n"
 msgstr "Pesan kosong membatalkan komit.\n"
 
-#: builtin/merge.c:839
+#: builtin/merge.c
 #, c-format
 msgid ""
 "Lines starting with '%c' will be ignored, and an empty message aborts\n"
@@ -18288,72 +10075,77 @@ msgstr ""
 "Baris yang diawali dengan '%c' akan diabaikan, dan pesan kosong batalkan\n"
 "komit.\n"
 
-#: builtin/merge.c:900
+#: builtin/merge.c
 msgid "Empty commit message."
 msgstr "Pesan komit kosong"
 
-#: builtin/merge.c:915
+#: builtin/merge.c
 #, c-format
 msgid "Wonderful.\n"
 msgstr "Luar biasa.\n"
 
-#: builtin/merge.c:976
+#: builtin/merge.c
 #, 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:1015
+#: builtin/merge.c
 msgid "No current branch."
 msgstr "Tidak ada cabang saat ini."
 
-#: builtin/merge.c:1017
+#: builtin/merge.c
 msgid "No remote for the current branch."
 msgstr "Tidak ada remote untuk cabang saat ini."
 
-#: builtin/merge.c:1019
+#: builtin/merge.c
 msgid "No default upstream defined for the current branch."
 msgstr "Tidak ada hulu asali yang ditentukan untuk cabang saat ini."
 
-#: builtin/merge.c:1024
+#: builtin/merge.c
 #, c-format
 msgid "No remote-tracking branch for %s from %s"
 msgstr "Tidak ada cabang pelacak remote untuk %s dari %s"
 
-#: builtin/merge.c:1081
+#: builtin/merge.c
 #, c-format
 msgid "Bad value '%s' in environment '%s'"
 msgstr "Nilai jelek '%s' dalam lingkungan '%s'"
 
-#: builtin/merge.c:1183
+#: builtin/merge.c read-cache.c strbuf.c wrapper.c
+#, c-format
+msgid "could not close '%s'"
+msgstr ""
+
+#: builtin/merge.c
 #, c-format
 msgid "not something we can merge in %s: %s"
 msgstr "bukan sesuatu yang kami bisa gabungkan di %s: %s"
 
-#: builtin/merge.c:1217
+#: builtin/merge.c
 msgid "not something we can merge"
 msgstr "bukan sesuatu yang kami bisa gabungkan"
 
-#: builtin/merge.c:1330
+#: builtin/merge.c
 msgid "--abort expects no arguments"
 msgstr "--abort harap tanpa argumen"
 
-#: builtin/merge.c:1334
+#: builtin/merge.c
 msgid "There is no merge to abort (MERGE_HEAD missing)."
 msgstr "Tidak ada penggabungan yang bisa dibatalkan (MERGE_HEAD hilang)."
 
-#: builtin/merge.c:1352
+#: builtin/merge.c
 msgid "--quit expects no arguments"
 msgstr "--quit harap tanpa argumen"
 
-#: builtin/merge.c:1365
+#: builtin/merge.c
 msgid "--continue expects no arguments"
 msgstr "--continue harap tanpa argumen"
 
-#: builtin/merge.c:1369
+#: builtin/merge.c
 msgid "There is no merge in progress (MERGE_HEAD missing)."
 msgstr "Tidak ada penggabungan yang sedang berlangsung (MERGE_HEAD hilang)."
 
-#: builtin/merge.c:1385
+#: builtin/merge.c
 msgid ""
 "You have not concluded your merge (MERGE_HEAD exists).\n"
 "Please, commit your changes before you merge."
@@ -18361,7 +10153,7 @@ msgstr ""
 "Anda belum mengakhiri penggabungan Anda (MERGE_HEAD ada).\n"
 "Mohon komit perubahan Anda sebelum Anda gabungkan."
 
-#: builtin/merge.c:1392
+#: builtin/merge.c
 msgid ""
 "You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists).\n"
 "Please, commit your changes before you merge."
@@ -18369,133 +10161,137 @@ msgstr ""
 "Anda belum mengakhiri pemetikan ceri Anda (CHERRY_PICK_HEAD ada).\n"
 "Mohon komit perubahan Anda sebelum Anda gabungkan."
 
-#: builtin/merge.c:1395
+#: builtin/merge.c
 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:1427
+#: builtin/merge.c
 msgid "No commit specified and merge.defaultToUpstream not set."
 msgstr ""
 "Tidak ada komit yang disebutkan dan merge.defaultToUpstream tidak disetel."
 
-#: builtin/merge.c:1444
+#: builtin/merge.c
 msgid "Squash commit into empty head not supported yet"
 msgstr "Lumat komit ke kepala kosong belum didukung"
 
-#: builtin/merge.c:1446
+#: builtin/merge.c
 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:1451
+#: builtin/merge.c
 #, c-format
 msgid "%s - not something we can merge"
 msgstr "%s - bukan sesuatu yang kami bisa gabungkan"
 
-#: builtin/merge.c:1453
+#: builtin/merge.c
 msgid "Can merge only exactly one commit into empty head"
 msgstr "Hanya bisa menggabungkan tepantnya satu komit ke kepala kosong"
 
-#: builtin/merge.c:1540
+#: builtin/merge.c
 msgid "refusing to merge unrelated histories"
 msgstr "menolak menggabungkan riwayat tak terkait"
 
-#: builtin/merge.c:1559
+#: builtin/merge.c
 #, c-format
 msgid "Updating %s..%s\n"
 msgstr "Memperbarui %s..%s\n"
 
-#: builtin/merge.c:1606
+#: builtin/merge.c
 #, c-format
 msgid "Trying really trivial in-index merge...\n"
 msgstr "Mencoba penggabungan dalam indeks yang sangat sepele\n"
 
-#: builtin/merge.c:1613
+#: builtin/merge.c
 #, c-format
 msgid "Nope.\n"
 msgstr "Tidak.\n"
 
-#: builtin/merge.c:1671 builtin/merge.c:1737
+#: builtin/merge.c
 #, c-format
 msgid "Rewinding the tree to pristine...\n"
 msgstr "Memutar ulang pohon ke asli...\n"
 
-#: builtin/merge.c:1675
+#: builtin/merge.c
 #, c-format
 msgid "Trying merge strategy %s...\n"
 msgstr "Mencoba strategi penggabungan %s...\n"
 
-#: builtin/merge.c:1727
+#: builtin/merge.c
 #, c-format
 msgid "No merge strategy handled the merge.\n"
 msgstr "Tidak ada strategi yang menangani penggabungan.\n"
 
-#: builtin/merge.c:1729
+#: builtin/merge.c
 #, c-format
 msgid "Merge with strategy %s failed.\n"
 msgstr "Penggabungan dengan strategi %s gagal.\n"
 
-#: builtin/merge.c:1739
+#: builtin/merge.c
 #, 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:1753
+#: builtin/merge.c
 #, c-format
 msgid "Automatic merge went well; stopped before committing as requested\n"
 msgstr ""
 "Penggabungan otomatis berjalan baik; berhenti sebelum mengkomit seperti yang "
 "diminta\n"
 
-#: builtin/mktag.c:27
+#: builtin/mktag.c
 #, c-format
 msgid "warning: tag input does not pass fsck: %s"
 msgstr ""
 
-#: builtin/mktag.c:38
+#: builtin/mktag.c
 #, c-format
 msgid "error: tag input does not pass fsck: %s"
 msgstr ""
 
-#: builtin/mktag.c:41
+#: builtin/mktag.c
 #, c-format
 msgid "%d (FSCK_IGNORE?) should never trigger this callback"
 msgstr ""
 
-#: builtin/mktag.c:56
+#: builtin/mktag.c
 #, c-format
 msgid "could not read tagged object '%s'"
 msgstr ""
 
-#: builtin/mktag.c:59
+#: builtin/mktag.c
 #, c-format
 msgid "object '%s' tagged as '%s', but is a '%s' type"
 msgstr ""
 
-#: builtin/mktag.c:97
+#: builtin/mktag.c imap-send.c trailer.c
+msgid "could not read from stdin"
+msgstr "tidak dapat membaca dari masukan standar"
+
+#: builtin/mktag.c
 msgid "tag on stdin did not pass our strict fsck check"
 msgstr ""
 
-#: builtin/mktag.c:100
+#: builtin/mktag.c
 msgid "tag on stdin did not refer to a valid object"
 msgstr ""
 
-#: builtin/mktag.c:103 builtin/tag.c:243
+#: builtin/mktag.c builtin/tag.c
 msgid "unable to write tag file"
 msgstr ""
 
-#: builtin/mktree.c:154
+#: builtin/mktree.c
 msgid "input is NUL terminated"
 msgstr ""
 
-#: builtin/mktree.c:155 builtin/write-tree.c:26
+#: builtin/mktree.c builtin/write-tree.c
 msgid "allow missing objects"
 msgstr ""
 
-#: builtin/mktree.c:156
+#: builtin/mktree.c
 msgid "allow creation of more than one tree"
 msgstr ""
 
-#: builtin/multi-pack-index.c:10
+#: builtin/multi-pack-index.c
 msgid ""
 "git multi-pack-index [<options>] write [--preferred-pack=<pack>][--refs-"
 "snapshot=<path>]"
@@ -18503,43 +10299,47 @@ msgstr ""
 "git multi-pack-index [<opsi>] write [--preferred-pack=<pak>] [--refs-"
 "snapshot=<jalur>]"
 
-#: builtin/multi-pack-index.c:14
+#: builtin/multi-pack-index.c
 msgid "git multi-pack-index [<options>] verify"
 msgstr "git multi-pack-index [<opsi>] verify"
 
-#: builtin/multi-pack-index.c:17
+#: builtin/multi-pack-index.c
 msgid "git multi-pack-index [<options>] expire"
 msgstr "git multi-pack-index [<opsi>] expire"
 
-#: builtin/multi-pack-index.c:20
+#: builtin/multi-pack-index.c
 msgid "git multi-pack-index [<options>] repack [--batch-size=<size>]"
 msgstr "git multi-pack-index [<opsi>] repack [--batch-size=<ukuran>]"
 
-#: builtin/multi-pack-index.c:57
+#: builtin/multi-pack-index.c
+msgid "directory"
+msgstr "direktori"
+
+#: builtin/multi-pack-index.c
 msgid "object directory containing set of packfile and pack-index pairs"
 msgstr "direktori objek berisi set berkas pak dan pasangan pak-indeks"
 
-#: builtin/multi-pack-index.c:98
+#: builtin/multi-pack-index.c
 msgid "preferred-pack"
 msgstr "pak pilihan"
 
-#: builtin/multi-pack-index.c:99
+#: builtin/multi-pack-index.c
 msgid "pack for reuse when computing a multi-pack bitmap"
 msgstr "pak untuk digunakan ulang saat menghitung bitmap multipak"
 
-#: builtin/multi-pack-index.c:100
+#: builtin/multi-pack-index.c
 msgid "write multi-pack bitmap"
 msgstr "tulis bitmap multipak"
 
-#: builtin/multi-pack-index.c:105
+#: builtin/multi-pack-index.c
 msgid "write multi-pack index containing only given indexes"
 msgstr "tulis indeks multipak yang hanya berisi indeks yang diberikan"
 
-#: builtin/multi-pack-index.c:107
+#: builtin/multi-pack-index.c
 msgid "refs snapshot for selecting bitmap commits"
 msgstr "potret referensi untuk memilih komit bitmap"
 
-#: builtin/multi-pack-index.c:206
+#: builtin/multi-pack-index.c
 msgid ""
 "during repack, collect pack-files of smaller size into a batch that is "
 "larger than this size"
@@ -18547,156 +10347,155 @@ msgstr ""
 "selama pengepakan ulang, kumpulkan berkas pak berukuran lebih kecil ke dalam "
 "sebuah batch yang lebih besar dari ukuran ini"
 
-#: builtin/mv.c:18
+#: builtin/mv.c
 msgid "git mv [<options>] <source>... <destination>"
 msgstr "git mv [<opsi>] <sumber>... <tujuan>"
 
-#: builtin/mv.c:83
+#: builtin/mv.c
 #, c-format
 msgid "Directory %s is in index and no submodule?"
 msgstr "Direktori %s di dalam indeks dan tidak ada submodul?"
 
-#: builtin/mv.c:85
+#: builtin/mv.c
 msgid "Please stage your changes to .gitmodules or stash them to proceed"
-msgstr ""
-"Mohon gelar perubahan Anda ke .gitmodules atau stase itu untuk melanjutkan"
+msgstr "Mohon gelar perubahan Anda ke .gitmodules atau stase untuk melanjutkan"
 
-#: builtin/mv.c:103
+#: builtin/mv.c
 #, c-format
 msgid "%.*s is in index"
 msgstr "%.*s di dalam indeks"
 
-#: builtin/mv.c:125
+#: builtin/mv.c
 msgid "force move/rename even if target exists"
 msgstr "paksa pindah/ganti nama bahkan jika target ada"
 
-#: builtin/mv.c:127
+#: builtin/mv.c
 msgid "skip move/rename errors"
 msgstr "lewati kesalahan pindah/ganti nama"
 
-#: builtin/mv.c:172
+#: builtin/mv.c
 #, c-format
 msgid "destination '%s' is not a directory"
 msgstr "tujuan '%s' bukan direktori"
 
-#: builtin/mv.c:184
+#: builtin/mv.c
 #, c-format
 msgid "Checking rename of '%s' to '%s'\n"
 msgstr "Memeriksa penamaan ulang '%s' ke '%s'\n"
 
-#: builtin/mv.c:190
+#: builtin/mv.c
 msgid "bad source"
 msgstr "sumber jelek"
 
-#: builtin/mv.c:193
+#: builtin/mv.c
 msgid "can not move directory into itself"
 msgstr "tidak dapat memindahkan direktori ke dirinya sendiri"
 
-#: builtin/mv.c:196
+#: builtin/mv.c
 msgid "cannot move directory over file"
 msgstr "tidak dapat memindahkan direktori ke berkas"
 
-#: builtin/mv.c:205
+#: builtin/mv.c
 msgid "source directory is empty"
 msgstr "direktori asal kosong"
 
-#: builtin/mv.c:231
+#: builtin/mv.c
 msgid "not under version control"
 msgstr "bukan dalam kontrol versi"
 
-#: builtin/mv.c:233
+#: builtin/mv.c
 msgid "conflicted"
 msgstr "terkonflik"
 
-#: builtin/mv.c:236
+#: builtin/mv.c
 msgid "destination exists"
 msgstr "tujuan ada"
 
-#: builtin/mv.c:244
+#: builtin/mv.c
 #, c-format
 msgid "overwriting '%s'"
 msgstr "menimpa '%s'"
 
-#: builtin/mv.c:247
+#: builtin/mv.c
 msgid "Cannot overwrite"
 msgstr "Tidak dapat menimpa"
 
-#: builtin/mv.c:250
+#: builtin/mv.c
 msgid "multiple sources for the same target"
 msgstr "banyak asal untuk target yang sama"
 
-#: builtin/mv.c:252
+#: builtin/mv.c
 msgid "destination directory does not exist"
 msgstr "direktori tujuan tidak ada"
 
-#: builtin/mv.c:280
+#: builtin/mv.c
 #, c-format
 msgid "%s, source=%s, destination=%s"
 msgstr "%s, source=%s, destination=%s"
 
-#: builtin/mv.c:308
+#: builtin/mv.c
 #, c-format
 msgid "Renaming %s to %s\n"
 msgstr "Mengganti nama %s ke %s\n"
 
-#: builtin/mv.c:314 builtin/remote.c:812 builtin/repack.c:861
+#: builtin/mv.c builtin/remote.c builtin/repack.c
 #, c-format
 msgid "renaming '%s' failed"
 msgstr "gagal mengganti nama '%s'"
 
-#: builtin/name-rev.c:524
+#: builtin/name-rev.c
 msgid "git name-rev [<options>] <commit>..."
-msgstr ""
+msgstr "git name-rev [<opsi>] <komit>..."
 
-#: builtin/name-rev.c:525
+#: builtin/name-rev.c
 msgid "git name-rev [<options>] --all"
-msgstr ""
+msgstr "git name-rev [<opsi>] --all"
 
-#: builtin/name-rev.c:526
+#: builtin/name-rev.c
 msgid "git name-rev [<options>] --annotate-stdin"
-msgstr ""
+msgstr "git name-rev [<opsi>] --annotate-stdin"
 
-#: builtin/name-rev.c:583
+#: builtin/name-rev.c
 msgid "print only ref-based names (no object names)"
-msgstr ""
+msgstr "hanya cetak nama-nama berbasis referensi (tidak ada nama objek)"
 
-#: builtin/name-rev.c:584
+#: builtin/name-rev.c
 msgid "only use tags to name the commits"
-msgstr ""
+msgstr "hanya gunakan tag untuk menamai komit"
 
-#: builtin/name-rev.c:586
+#: builtin/name-rev.c
 msgid "only use refs matching <pattern>"
-msgstr ""
+msgstr "hanya gunakan referensi yang cocok dengan <pola>"
 
-#: builtin/name-rev.c:588
+#: builtin/name-rev.c
 msgid "ignore refs matching <pattern>"
-msgstr ""
+msgstr "abaikan referensi yang cocok dengan <pola>"
 
-#: builtin/name-rev.c:590
+#: builtin/name-rev.c
 msgid "list all commits reachable from all refs"
-msgstr ""
+msgstr "daftar semua komit yang bisa dijangkau dari semua referensi"
 
-#: builtin/name-rev.c:591
-msgid "deprecated: use annotate-stdin instead"
-msgstr ""
+#: builtin/name-rev.c
+msgid "deprecated: use --annotate-stdin instead"
+msgstr "usang: gunakan --annotate-stdin sebagai gantinya"
 
-#: builtin/name-rev.c:592
+#: builtin/name-rev.c
 msgid "annotate text from stdin"
-msgstr ""
+msgstr "anotasi teks dari masukan standar"
 
-#: builtin/name-rev.c:593
+#: builtin/name-rev.c
 msgid "allow to print `undefined` names (default)"
-msgstr ""
+msgstr "perbolehkan mencetak nama `undefined` (asali)"
 
-#: builtin/name-rev.c:599
+#: builtin/name-rev.c
 msgid "dereference tags in the input (internal use)"
-msgstr ""
+msgstr "dereferensi tag di dalam masukan (penggunaan internal)"
 
-#: builtin/notes.c:28
+#: builtin/notes.c
 msgid "git notes [--ref <notes-ref>] [list [<object>]]"
-msgstr ""
+msgstr "git notes [--ref <referensi catan>] [list [<objek>]]"
 
-#: builtin/notes.c:29
+#: builtin/notes.c
 msgid ""
 "git notes [--ref <notes-ref>] add [-f] [--allow-empty] [-m <msg> | -F <file> "
 "| (-c | -C) <object>] [<object>]"
@@ -18704,12 +10503,12 @@ msgstr ""
 "git notes [--ref <referensi catatan>] add [-f] [--allow-empty] [-m <pesan | -"
 "F <berkas> | (-c | -C) <objek>] [<objek>]"
 
-#: builtin/notes.c:30
+#: builtin/notes.c
 msgid "git notes [--ref <notes-ref>] copy [-f] <from-object> <to-object>"
 msgstr ""
 "git notes [--ref <referensi catatan>] copy [-f] <objek asal> <objek tujuan>"
 
-#: builtin/notes.c:31
+#: builtin/notes.c
 msgid ""
 "git notes [--ref <notes-ref>] append [--allow-empty] [-m <msg> | -F <file> | "
 "(-c | -C) <object>] [<object>]"
@@ -18717,140 +10516,138 @@ msgstr ""
 "git notes [--ref <referensi catatan>] append [--alow-empty] [-m <pesan> | -F "
 "<berkas> | (-c | -C) <objek>] [<objek>]"
 
-#: builtin/notes.c:32
+#: builtin/notes.c
 msgid "git notes [--ref <notes-ref>] edit [--allow-empty] [<object>]"
 msgstr "git notes [--ref <referensi catatan>] edit [--allow-empty] [<objek>]"
 
-#: builtin/notes.c:33
+#: builtin/notes.c
 msgid "git notes [--ref <notes-ref>] show [<object>]"
 msgstr "git notes [--ref <referensi catatan>] show [<objek>]"
 
-#: builtin/notes.c:34
+#: builtin/notes.c
 msgid ""
 "git notes [--ref <notes-ref>] merge [-v | -q] [-s <strategy>] <notes-ref>"
 msgstr ""
 "git notes [--ref <referensi catatan>] merge [-v | -q] [-s <strategi>] "
 "<referensi catatan> "
 
-#: builtin/notes.c:37
+#: builtin/notes.c
 msgid "git notes [--ref <notes-ref>] remove [<object>...]"
 msgstr "git notes [--ref <referensi catatan>] remove [<objek>...]"
 
-#: builtin/notes.c:38
+#: builtin/notes.c
 msgid "git notes [--ref <notes-ref>] prune [-n] [-v]"
 msgstr "git notes [--ref <referensi catatan>] prune [-n] [-v]"
 
-#: builtin/notes.c:39
+#: builtin/notes.c
 msgid "git notes [--ref <notes-ref>] get-ref"
 msgstr "git notes [--ref <referensi catatan>] get-ref"
 
-#: builtin/notes.c:44
+#: builtin/notes.c
 msgid "git notes [list [<object>]]"
 msgstr "git notes [list [<objek>]]"
 
-#: builtin/notes.c:49
+#: builtin/notes.c
 msgid "git notes add [<options>] [<object>]"
 msgstr "git notes add [<opsi>] [<objek>]"
 
-#: builtin/notes.c:54
+#: builtin/notes.c
 msgid "git notes copy [<options>] <from-object> <to-object>"
 msgstr "git notes copy [<opsi>] <objek asal> <objek tujuan>"
 
-#: builtin/notes.c:55
+#: builtin/notes.c
 msgid "git notes copy --stdin [<from-object> <to-object>]..."
 msgstr "git notes copy --stdin [<objek asal> <objek tujuan>]..."
 
-#: builtin/notes.c:60
+#: builtin/notes.c
 msgid "git notes append [<options>] [<object>]"
 msgstr "git notes append [<opsi>] [<objek>]"
 
-#: builtin/notes.c:65
+#: builtin/notes.c
 msgid "git notes edit [<object>]"
 msgstr "git notes edit [<objek>]"
 
-#: builtin/notes.c:70
+#: builtin/notes.c
 msgid "git notes show [<object>]"
 msgstr "git notes show [<objek>]"
 
-#: builtin/notes.c:75
+#: builtin/notes.c
 msgid "git notes merge [<options>] <notes-ref>"
 msgstr "git notes merge [<opsi>] <referensi catatan>"
 
-#: builtin/notes.c:76
+#: builtin/notes.c
 msgid "git notes merge --commit [<options>]"
 msgstr "git notes merge --commit [<opsi>]"
 
-#: builtin/notes.c:77
+#: builtin/notes.c
 msgid "git notes merge --abort [<options>]"
 msgstr "git notes merge --abort [<opsi>]"
 
-#: builtin/notes.c:82
+#: builtin/notes.c
 msgid "git notes remove [<object>]"
 msgstr "git notes remove [<objek>]"
 
-#: builtin/notes.c:87
+#: builtin/notes.c
 msgid "git notes prune [<options>]"
 msgstr "git notes prune [<opsi>]"
 
-#: builtin/notes.c:97
+#: builtin/notes.c
 msgid "Write/edit the notes for the following object:"
 msgstr "Tulis/sunting catatan untuk objek berikut:"
 
-#: builtin/notes.c:149
+#: builtin/notes.c
 #, c-format
 msgid "unable to start 'show' for object '%s'"
 msgstr "tidak dapat memulai 'show' untuk objek '%s'"
 
-#: builtin/notes.c:153
+#: builtin/notes.c
 msgid "could not read 'show' output"
 msgstr "tidak dapat membaca keluaran 'show'"
 
-#: builtin/notes.c:161
+#: builtin/notes.c
 #, c-format
 msgid "failed to finish 'show' for object '%s'"
 msgstr "gagal menyelesaikan 'show' untuk objek '%s'"
 
-#: builtin/notes.c:194
+#: builtin/notes.c
 msgid "please supply the note contents using either -m or -F option"
 msgstr "mohon berikan isi catatan baik menggunakan opsi -m ataupun -F"
 
-#: builtin/notes.c:203
+#: builtin/notes.c
 msgid "unable to write note object"
 msgstr "tidak dapat menulis objek catatan"
 
-#: builtin/notes.c:206
+#: builtin/notes.c
 #, c-format
 msgid "the note contents have been left in %s"
 msgstr "isi catatan telah ditinggalkan di %s"
 
-#: builtin/notes.c:240 builtin/tag.c:582
+#: builtin/notes.c builtin/tag.c
 #, c-format
 msgid "could not open or read '%s'"
 msgstr "tidak dapat membuka atau membaca '%s'"
 
-#: 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
+#: builtin/notes.c
 #, c-format
 msgid "failed to resolve '%s' as a valid ref."
 msgstr "gagal menguraikan '%s' sebagai sebuah referensi valid."
 
-#: builtin/notes.c:263
+#: builtin/notes.c
 #, c-format
 msgid "failed to read object '%s'."
 msgstr "gagal membaca objek '%s'."
 
-#: builtin/notes.c:266
+#: builtin/notes.c
 #, c-format
 msgid "cannot read note data from non-blob object '%s'."
 msgstr "gagal membaca data catatan dari objek bukan blob '%s'."
 
-#: builtin/notes.c:307
+#: builtin/notes.c
 #, c-format
 msgid "malformed input line: '%s'."
 msgstr "baris masukan jelek: '%s'."
 
-#: builtin/notes.c:322
+#: builtin/notes.c
 #, c-format
 msgid "failed to copy notes from '%s' to '%s'"
 msgstr "gagal menyalin catatan dari '%s' ke '%s'"
@@ -18858,41 +10655,41 @@ msgstr "gagal menyalin catatan dari '%s' ke '%s'"
 #. TRANSLATORS: the first %s will be replaced by a git
 #. notes command: 'add', 'merge', 'remove', etc.
 #.
-#: builtin/notes.c:354
+#: builtin/notes.c
 #, c-format
 msgid "refusing to %s notes in %s (outside of refs/notes/)"
 msgstr "gagal men-%s catatan di %s (di luar refs/notes/)"
 
-#: builtin/notes.c:387 builtin/notes.c:676
+#: builtin/notes.c
 #, c-format
 msgid "no note found for object %s."
 msgstr "tidak ada catatan yang ditemukan untuk objek %s."
 
-#: builtin/notes.c:408 builtin/notes.c:574
+#: builtin/notes.c
 msgid "note contents as a string"
 msgstr "isi catatan sebagai sebuah untai"
 
-#: builtin/notes.c:411 builtin/notes.c:577
+#: builtin/notes.c
 msgid "note contents in a file"
 msgstr "isi catatan di dalam berkas"
 
-#: builtin/notes.c:414 builtin/notes.c:580
+#: builtin/notes.c
 msgid "reuse and edit specified note object"
 msgstr "gunakan ulang dan sunting objek catatan yang disebutkan"
 
-#: builtin/notes.c:417 builtin/notes.c:583
+#: builtin/notes.c
 msgid "reuse specified note object"
 msgstr "gunakan ulang objek catatan yang disebutkan"
 
-#: builtin/notes.c:420 builtin/notes.c:586
+#: builtin/notes.c
 msgid "allow storing empty note"
 msgstr "perbolehkan menyimpan catatan kosong"
 
-#: builtin/notes.c:421 builtin/notes.c:494
+#: builtin/notes.c
 msgid "replace existing notes"
 msgstr "timpa catatan yang sudah ada"
 
-#: builtin/notes.c:446
+#: builtin/notes.c
 #, c-format
 msgid ""
 "Cannot add notes. Found existing notes for object %s. Use '-f' to overwrite "
@@ -18901,30 +10698,30 @@ msgstr ""
 "Tidak dapat menambahkan catatan. Catatan yang sudah ada ditemukan untuk "
 "objek %s. Gunakan '-f' untuk menimpa catatan yang sudah ada"
 
-#: builtin/notes.c:461 builtin/notes.c:542
+#: builtin/notes.c
 #, c-format
 msgid "Overwriting existing notes for object %s\n"
 msgstr "Menimpa catatan yang sudah ada untuk objek %s\n"
 
-#: builtin/notes.c:473 builtin/notes.c:635 builtin/notes.c:904
+#: builtin/notes.c
 #, c-format
 msgid "Removing note for object %s\n"
 msgstr "Menghapus catatan untuk objek %s\n"
 
-#: builtin/notes.c:495
+#: builtin/notes.c
 msgid "read objects from stdin"
 msgstr "baca objek dari masukan standar"
 
-#: builtin/notes.c:497
+#: builtin/notes.c
 msgid "load rewriting config for <command> (implies --stdin)"
 msgstr ""
 "muat konfigurasi penulisan ulang untuk <perintah> (menyiratkan --stdin)"
 
-#: builtin/notes.c:515
+#: builtin/notes.c
 msgid "too few arguments"
 msgstr "argumen terlalu sedikit"
 
-#: builtin/notes.c:536
+#: builtin/notes.c
 #, c-format
 msgid ""
 "Cannot copy notes. Found existing notes for object %s. Use '-f' to overwrite "
@@ -18933,12 +10730,12 @@ msgstr ""
 "Tidak dapat menyalin catatan. Catatan yang sudah ada ditemukan untuk %s. "
 "Gunakan '-f' untuk menimpa catatan yang sudah ada"
 
-#: builtin/notes.c:548
+#: builtin/notes.c
 #, c-format
 msgid "missing notes on source object %s. Cannot copy."
 msgstr "catatan hilang pada objek sumber %s. Tidak dapat menyalin."
 
-#: builtin/notes.c:601
+#: builtin/notes.c
 #, c-format
 msgid ""
 "The -m/-F/-c/-C options have been deprecated for the 'edit' subcommand.\n"
@@ -18947,52 +10744,52 @@ msgstr ""
 "Opsi -m/-F/-c/-C sudah usang untuk subperintah 'edit.\n"
 "'Mohon gunakan 'git notes add -f -m/-F/-c/-C' sebagai gantinya.\n"
 
-#: builtin/notes.c:696
+#: builtin/notes.c
 msgid "failed to delete ref NOTES_MERGE_PARTIAL"
 msgstr "gagal menghapus referensi NOTES_MERGE_PARTIAL"
 
-#: builtin/notes.c:698
+#: builtin/notes.c
 msgid "failed to delete ref NOTES_MERGE_REF"
 msgstr "gagal menghapus referensi NOTES_MERGE_REF"
 
-#: builtin/notes.c:700
+#: builtin/notes.c
 msgid "failed to remove 'git notes merge' worktree"
 msgstr "gagal menghapus pohon kerja 'git notes merge'"
 
-#: builtin/notes.c:720
+#: builtin/notes.c
 msgid "failed to read ref NOTES_MERGE_PARTIAL"
 msgstr "gagal membaca referensi NOTES_MERGE_PARTIAL"
 
-#: builtin/notes.c:722
+#: builtin/notes.c
 msgid "could not find commit from NOTES_MERGE_PARTIAL."
 msgstr "gagal menemukan komit dari NOTES_MERGE_PARTIAL."
 
-#: builtin/notes.c:724
+#: builtin/notes.c
 msgid "could not parse commit from NOTES_MERGE_PARTIAL."
 msgstr "gagal menguraikan komit dari NOTES_MERGE_PARTIAL."
 
-#: builtin/notes.c:737
+#: builtin/notes.c
 msgid "failed to resolve NOTES_MERGE_REF"
 msgstr "gagal menguraikan NOTES_MERGE_REF"
 
-#: builtin/notes.c:740
+#: builtin/notes.c
 msgid "failed to finalize notes merge"
 msgstr "gagal menyelesaikan penggabungan catatan"
 
-#: builtin/notes.c:766
+#: builtin/notes.c
 #, c-format
 msgid "unknown notes merge strategy %s"
 msgstr "strategi penggabungan catatan %s tidak dikenal"
 
-#: builtin/notes.c:782
+#: builtin/notes.c
 msgid "General options"
 msgstr "Opsi umum"
 
-#: builtin/notes.c:784
+#: builtin/notes.c
 msgid "Merge options"
 msgstr "Opsi penggabungan"
 
-#: builtin/notes.c:786
+#: builtin/notes.c
 msgid ""
 "resolve notes conflicts using the given strategy (manual/ours/theirs/union/"
 "cat_sort_uniq)"
@@ -19000,47 +10797,47 @@ msgstr ""
 "selesaikan konflik catatan menggunakan strategi yang diberikan (manual/ours/"
 "theirs/union/cat_sort_uniq)"
 
-#: builtin/notes.c:788
+#: builtin/notes.c
 msgid "Committing unmerged notes"
 msgstr "Mengkomitkan catatan tak tergabung"
 
-#: builtin/notes.c:790
+#: builtin/notes.c
 msgid "finalize notes merge by committing unmerged notes"
 msgstr ""
 "selesaikan penggabungan catatan dengan mengkomitkan catatan tak tergabung"
 
-#: builtin/notes.c:792
+#: builtin/notes.c
 msgid "Aborting notes merge resolution"
 msgstr "Membatalkan resolusi penggabungan catatan"
 
-#: builtin/notes.c:794
+#: builtin/notes.c
 msgid "abort notes merge"
 msgstr "batalkan penggabungan catatan"
 
-#: builtin/notes.c:805
+#: builtin/notes.c
 msgid "cannot mix --commit, --abort or -s/--strategy"
 msgstr "tidak dapat mencampurkan --commit, --abort atau -s/--strategy"
 
-#: builtin/notes.c:810
+#: builtin/notes.c
 msgid "must specify a notes ref to merge"
 msgstr "harus menyebutkan sebuah referensi catatan untuk digabungkan"
 
-#: builtin/notes.c:834
+#: builtin/notes.c
 #, c-format
 msgid "unknown -s/--strategy: %s"
 msgstr "-s/--strategy tidak dikenal: %s"
 
-#: builtin/notes.c:874
+#: builtin/notes.c
 #, c-format
 msgid "a notes merge into %s is already in-progress at %s"
 msgstr "sebuah penggabungan catatan ke %s sudah berjalan pada %s"
 
-#: builtin/notes.c:878
+#: builtin/notes.c
 #, c-format
 msgid "failed to store link to current notes ref (%s)"
 msgstr "gagal menyimpan tautan ke referensi catatan saat ini (%s)"
 
-#: builtin/notes.c:880
+#: builtin/notes.c
 #, c-format
 msgid ""
 "Automatic notes merge failed. Fix conflicts in %s and commit the result with "
@@ -19051,442 +10848,522 @@ msgstr ""
 "hasilnya dengan 'git notes merge --commit', atau batalkan penggabungan "
 "dengan 'git notes merge --abort'.\n"
 
-#: builtin/notes.c:899 builtin/tag.c:595
+#: builtin/notes.c builtin/tag.c
 #, c-format
 msgid "Failed to resolve '%s' as a valid ref."
 msgstr "Gagal menguraikan '%s' sebagai referensi valid."
 
-#: builtin/notes.c:902
+#: builtin/notes.c
 #, c-format
 msgid "Object %s has no note\n"
 msgstr "Objek %s tidak punya catatan\n"
 
-#: builtin/notes.c:914
+#: builtin/notes.c
 msgid "attempt to remove non-existent note is not an error"
 msgstr "mencoba menghapus catatan yang tidak ada bukanlah sebuah kesalahan"
 
-#: builtin/notes.c:917
+#: builtin/notes.c
 msgid "read object names from the standard input"
 msgstr "baca nama objek dari masukan standar"
 
-#: builtin/notes.c:956 builtin/prune.c:144 builtin/worktree.c:148
+#: builtin/notes.c builtin/prune.c builtin/worktree.c
 msgid "do not remove, show only"
 msgstr "jangan hapus, hanya perlihatkan"
 
-#: builtin/notes.c:957
+#: builtin/notes.c
 msgid "report pruned notes"
 msgstr "laporkan catatan terpangkas"
 
-#: builtin/notes.c:1000
+#: builtin/notes.c
 msgid "notes-ref"
 msgstr "referensi catatan"
 
-#: builtin/notes.c:1001
+#: builtin/notes.c
 msgid "use notes from <notes-ref>"
 msgstr "gunakan catatan dari <referensi catatan>"
 
-#: builtin/notes.c:1036 builtin/stash.c:1802
+#: builtin/notes.c builtin/stash.c
 #, c-format
 msgid "unknown subcommand: %s"
 msgstr "subperintah tidak dikenal: %s"
 
-#: builtin/pack-objects.c:182
+#: builtin/pack-objects.c
 msgid ""
 "git pack-objects --stdout [<options>...] [< <ref-list> | < <object-list>]"
 msgstr ""
+"git pack-objects --stdout [<opsi>...] [< <daftar referensi>| < <daftar-"
+"objek>]"
 
-#: builtin/pack-objects.c:183
+#: builtin/pack-objects.c
 msgid ""
 "git pack-objects [<options>...] <base-name> [< <ref-list> | < <object-list>]"
 msgstr ""
+"git pack-objects [<opsi>...] <nama dasar> [< <daftar referensi> | < <daftar-"
+"objek>]"
 
-#: builtin/pack-objects.c:570
+#: builtin/pack-objects.c
 #, c-format
 msgid ""
 "write_reuse_object: could not locate %s, expected at offset %<PRIuMAX> in "
 "pack %s"
 msgstr ""
+"write_reuse_object: tidak dapat menemukan %s, diharapkan pada offset "
+"%<PRIuMAX> di dalam pak %s"
 
-#: builtin/pack-objects.c:578
+#: builtin/pack-objects.c
 #, c-format
 msgid "bad packed object CRC for %s"
-msgstr ""
+msgstr "CRC objek terpak jelek untuk %s"
 
-#: builtin/pack-objects.c:589
+#: builtin/pack-objects.c
 #, c-format
 msgid "corrupt packed object for %s"
-msgstr ""
+msgstr "objek terpak rusak untuk %s"
 
-#: builtin/pack-objects.c:720
+#: builtin/pack-objects.c
 #, c-format
 msgid "recursive delta detected for object %s"
-msgstr ""
+msgstr "delta rekursif terdeteksi untuk objek %s"
 
-#: builtin/pack-objects.c:939
+#: builtin/pack-objects.c
 #, c-format
 msgid "ordered %u objects, expected %<PRIu32>"
-msgstr ""
+msgstr "%u objek disusun, %<PRIu32> diharapkan"
 
-#: builtin/pack-objects.c:1034
+#: builtin/pack-objects.c
 #, c-format
 msgid "expected object at offset %<PRIuMAX> in pack %s"
-msgstr ""
+msgstr "objek diharapkan pada offset %<PRIuMAX> di dalam paket %s"
 
-#: builtin/pack-objects.c:1158
+#: builtin/pack-objects.c
 msgid "disabling bitmap writing, packs are split due to pack.packSizeLimit"
-msgstr ""
+msgstr "menonaktifkan penulisan bitmap, pak terbagi karena pack.packSizeLimit"
 
-#: builtin/pack-objects.c:1171
+#: builtin/pack-objects.c
 msgid "Writing objects"
-msgstr ""
+msgstr "Menulis objek"
 
-#: builtin/pack-objects.c:1243 builtin/update-index.c:90
+#: builtin/pack-objects.c builtin/update-index.c
 #, c-format
 msgid "failed to stat %s"
-msgstr ""
+msgstr "gagal men-stat %s"
+
+#: builtin/pack-objects.c object-file.c
+#, c-format
+msgid "failed utime() on %s"
+msgstr "utime() gagal pada %s"
 
-#: builtin/pack-objects.c:1276
+#: builtin/pack-objects.c
 msgid "failed to write bitmap index"
-msgstr ""
+msgstr "gagal menulis indeks bitmap"
 
-#: builtin/pack-objects.c:1302
+#: builtin/pack-objects.c
 #, c-format
 msgid "wrote %<PRIu32> objects while expecting %<PRIu32>"
-msgstr ""
+msgstr "%<PRIu32> objek ditulish ketika mengharapkan %<PRIu32>"
 
-#: builtin/pack-objects.c:1544
+#: builtin/pack-objects.c
 msgid "disabling bitmap writing, as some objects are not being packed"
-msgstr ""
+msgstr "menonaktifkan penulisan bitmap, saat beberapa objek tidak sedang dipak"
 
-#: builtin/pack-objects.c:1992
+#: builtin/pack-objects.c
 #, c-format
 msgid "delta base offset overflow in pack for %s"
-msgstr ""
+msgstr "offset dasar delta meluap di dalam pak untuk %s"
 
-#: builtin/pack-objects.c:2001
+#: builtin/pack-objects.c
 #, c-format
 msgid "delta base offset out of bound for %s"
-msgstr ""
+msgstr "offset dasar delta di luar batas untuk %s"
 
-#: builtin/pack-objects.c:2282
+#: builtin/pack-objects.c
 msgid "Counting objects"
-msgstr ""
+msgstr "Menghitung objek"
+
+#: builtin/pack-objects.c pack-bitmap.c
+#, c-format
+msgid "unable to get size of %s"
+msgstr "tidak dapat mendapatkan ukuran %s"
 
-#: builtin/pack-objects.c:2447
+#: builtin/pack-objects.c
 #, c-format
 msgid "unable to parse object header of %s"
-msgstr ""
+msgstr "tidak dapat mendapatkan kepala objek %s"
 
-#: builtin/pack-objects.c:2517 builtin/pack-objects.c:2533
-#: builtin/pack-objects.c:2543
+#: builtin/pack-objects.c
 #, c-format
 msgid "object %s cannot be read"
-msgstr ""
+msgstr "objek %s tidak dapat dibaca"
 
-#: builtin/pack-objects.c:2520 builtin/pack-objects.c:2547
+#: builtin/pack-objects.c
 #, c-format
 msgid "object %s inconsistent object length (%<PRIuMAX> vs %<PRIuMAX>)"
-msgstr ""
+msgstr "objek %s panjang objek tidak konsisten (%<PRIuMAX> vs %<PRIuMAX>)"
 
-#: builtin/pack-objects.c:2557
+#: builtin/pack-objects.c
 msgid "suboptimal pack - out of memory"
-msgstr ""
+msgstr "pak suboptimal - kekurangan memori"
 
-#: builtin/pack-objects.c:2872
+#: builtin/pack-objects.c
 #, c-format
 msgid "Delta compression using up to %d threads"
-msgstr ""
+msgstr "Kompresi delta menggunakan sampai %d utas"
 
-#: builtin/pack-objects.c:3011
+#: builtin/pack-objects.c
 #, c-format
 msgid "unable to pack objects reachable from tag %s"
-msgstr ""
+msgstr "tidak dapat mempak objek yang dapat dicapai dari tag %s"
+
+#: builtin/pack-objects.c commit-graph.c
+#, c-format
+msgid "unable to get type of object %s"
+msgstr "tidak dapat mendapatkan tipe objek %s"
 
-#: builtin/pack-objects.c:3097
+#: builtin/pack-objects.c
 msgid "Compressing objects"
-msgstr ""
+msgstr "Memampatkan objek"
 
-#: builtin/pack-objects.c:3103
+#: builtin/pack-objects.c
 msgid "inconsistency with delta count"
-msgstr ""
+msgstr "ketidakkonsistenan dengan hitungan delta"
 
-#: builtin/pack-objects.c:3182
+#: builtin/pack-objects.c
 #, c-format
 msgid ""
 "value of uploadpack.blobpackfileuri must be of the form '<object-hash> <pack-"
 "hash> <uri>' (got '%s')"
 msgstr ""
+"nilai uploadpack.blobpackfileuri harus salah satu dari '<hash objek> <hash "
+"pak> <uri>' (dapat '%s')"
 
-#: builtin/pack-objects.c:3185
+#: builtin/pack-objects.c
 #, c-format
 msgid ""
 "object already configured in another uploadpack.blobpackfileuri (got '%s')"
 msgstr ""
+"objek sudah dikonfigurasi pada uploadpack.blobpackfileuri lainnya (dapat "
+"'%s')"
 
-#: builtin/pack-objects.c:3220
+#: builtin/pack-objects.c
 #, c-format
 msgid "could not get type of object %s in pack %s"
-msgstr ""
+msgstr "tidak dapat mendapatkan tipe objek %s di dalam pak %s"
 
-#: builtin/pack-objects.c:3348 builtin/pack-objects.c:3359
-#: builtin/pack-objects.c:3373
+#: builtin/pack-objects.c
 #, c-format
 msgid "could not find pack '%s'"
-msgstr ""
+msgstr "tidak dapat menemukan pak '%s'"
+
+#: builtin/pack-objects.c
+#, c-format
+msgid "packfile %s cannot be accessed"
+msgstr "berkas pak %s tidak dapat diakses"
+
+#: builtin/pack-objects.c
+msgid "Enumerating cruft objects"
+msgstr "Menghitung objek sisa"
+
+#: builtin/pack-objects.c
+msgid "unable to add cruft objects"
+msgstr "tidak dapat menambahkan objek sisa"
+
+#: builtin/pack-objects.c
+msgid "Traversing cruft objects"
+msgstr "Menyusuri objek sisa"
 
-#: builtin/pack-objects.c:3416
+#: builtin/pack-objects.c
 #, c-format
 msgid ""
 "expected edge object ID, got garbage:\n"
 " %s"
 msgstr ""
+"ID objek ujung diharapkan, dapat sampah:\n"
+" %s"
 
-#: builtin/pack-objects.c:3422
+#: builtin/pack-objects.c
 #, c-format
 msgid ""
 "expected object ID, got garbage:\n"
 " %s"
 msgstr ""
+"ID objek diharapkan, dapat sampah:\n"
+" %s"
+
+#: builtin/pack-objects.c reachable.c
+msgid "could not load cruft pack .mtimes"
+msgstr "tidak dapat memuat .mtimes paket sisa"
 
-#: builtin/pack-objects.c:3540 builtin/pack-objects.c:3627
+#: builtin/pack-objects.c
 msgid "cannot open pack index"
-msgstr ""
+msgstr "tidak dapat membuka indeks pak"
 
-#: builtin/pack-objects.c:3549
+#: builtin/pack-objects.c
 #, c-format
 msgid "loose object at %s could not be examined"
-msgstr ""
+msgstr "objek longgar pada %s tidak dapat diperiksa"
 
-#: builtin/pack-objects.c:3635
+#: builtin/pack-objects.c
 msgid "unable to force loose object"
-msgstr ""
+msgstr "tidak dapat memaksakan objek longgar"
 
-#: builtin/pack-objects.c:3763
+#: builtin/pack-objects.c
 #, c-format
 msgid "not a rev '%s'"
-msgstr ""
+msgstr "bukan sebuah revisi '%s'"
 
-#: builtin/pack-objects.c:3766 builtin/rev-parse.c:1061
+#: builtin/pack-objects.c builtin/rev-parse.c
 #, c-format
 msgid "bad revision '%s'"
-msgstr ""
+msgstr "revisi jelek '%s'"
 
-#: builtin/pack-objects.c:3794
+#: builtin/pack-objects.c
 msgid "unable to add recent objects"
-msgstr ""
+msgstr "tidak dapat menambahkan objek terkini"
 
-#: builtin/pack-objects.c:3847
+#: builtin/pack-objects.c
 #, c-format
 msgid "unsupported index version %s"
-msgstr ""
+msgstr "versi indeks tidak didukung %s"
 
-#: builtin/pack-objects.c:3851
+#: builtin/pack-objects.c
 #, c-format
 msgid "bad index version '%s'"
-msgstr ""
+msgstr "versi indeks jelek '%s'"
 
-#: builtin/pack-objects.c:3907
+#: builtin/pack-objects.c
 msgid "<version>[,<offset>]"
-msgstr ""
+msgstr "<versi>[,<offset>]"
 
-#: builtin/pack-objects.c:3908
+#: builtin/pack-objects.c
 msgid "write the pack index file in the specified idx format version"
-msgstr ""
+msgstr "tulis berkas indeks pak pada versi format indeks yang disebutkan"
 
-#: builtin/pack-objects.c:3911
+#: builtin/pack-objects.c
 msgid "maximum size of each output pack file"
-msgstr ""
+msgstr "ukuran maksimum dari setiap keluaran berkas pak"
 
-#: builtin/pack-objects.c:3913
+#: builtin/pack-objects.c
 msgid "ignore borrowed objects from alternate object store"
-msgstr ""
+msgstr "abaikan objek yang dipinjam dari penyimpanan objek alternatif"
 
-#: builtin/pack-objects.c:3915
+#: builtin/pack-objects.c
 msgid "ignore packed objects"
-msgstr ""
+msgstr "abaikan objek terpak"
 
-#: builtin/pack-objects.c:3917
+#: builtin/pack-objects.c
 msgid "limit pack window by objects"
-msgstr ""
+msgstr "batasi jendela pemapakan oleh objek"
 
-#: builtin/pack-objects.c:3919
+#: builtin/pack-objects.c
 msgid "limit pack window by memory in addition to object limit"
-msgstr ""
+msgstr "batasi jendela pemakan oleh memori di samping batas objek"
 
-#: builtin/pack-objects.c:3921
+#: builtin/pack-objects.c
 msgid "maximum length of delta chain allowed in the resulting pack"
-msgstr ""
+msgstr "panjang rantai delta maksimum yang diperbolehkan dalam hasil pak"
 
-#: builtin/pack-objects.c:3923
+#: builtin/pack-objects.c
 msgid "reuse existing deltas"
-msgstr ""
+msgstr "gunakan ulang delta yang ada"
 
-#: builtin/pack-objects.c:3925
+#: builtin/pack-objects.c
 msgid "reuse existing objects"
-msgstr ""
+msgstr "gunakan ulang objek yang ada"
 
-#: builtin/pack-objects.c:3927
+#: builtin/pack-objects.c
 msgid "use OFS_DELTA objects"
-msgstr ""
+msgstr "gunakan objek OFS_DELTA"
 
-#: builtin/pack-objects.c:3929
+#: builtin/pack-objects.c
 msgid "use threads when searching for best delta matches"
-msgstr ""
+msgstr "gunakan utas ketika mencari cocokan delta terbaik"
 
-#: builtin/pack-objects.c:3931
+#: builtin/pack-objects.c
 msgid "do not create an empty pack output"
-msgstr ""
+msgstr "jangan buat keluaran pak kosong"
 
-#: builtin/pack-objects.c:3933
+#: builtin/pack-objects.c
 msgid "read revision arguments from standard input"
-msgstr ""
+msgstr "baca argumen revisi dari masukan standar"
 
-#: builtin/pack-objects.c:3935
+#: builtin/pack-objects.c
 msgid "limit the objects to those that are not yet packed"
-msgstr ""
+msgstr "batasi objek pada yang belum dipak"
 
-#: builtin/pack-objects.c:3938
+#: builtin/pack-objects.c
 msgid "include objects reachable from any reference"
-msgstr ""
+msgstr "masukkan objek yang dapat dicapai dari referensi apapun"
 
-#: builtin/pack-objects.c:3941
+#: builtin/pack-objects.c
 msgid "include objects referred by reflog entries"
-msgstr ""
+msgstr "masukkan objek yang dirujuk oleh entri log referensi"
 
-#: builtin/pack-objects.c:3944
+#: builtin/pack-objects.c
 msgid "include objects referred to by the index"
-msgstr ""
+msgstr "masukkan objek yang dirujuk oleh indeks"
 
-#: builtin/pack-objects.c:3947
+#: builtin/pack-objects.c
 msgid "read packs from stdin"
-msgstr ""
+msgstr "baca pak dari masukan standar"
 
-#: builtin/pack-objects.c:3949
+#: builtin/pack-objects.c
 msgid "output pack to stdout"
-msgstr ""
+msgstr "keluarkan pak ke keluaran standar"
 
-#: builtin/pack-objects.c:3951
+#: builtin/pack-objects.c
 msgid "include tag objects that refer to objects to be packed"
-msgstr ""
+msgstr "masukkan objek tag yang merujuk pada objek yang akan dipak"
 
-#: builtin/pack-objects.c:3953
+#: builtin/pack-objects.c
 msgid "keep unreachable objects"
-msgstr ""
+msgstr "jaga objek yang tak dapat dicapai"
 
-#: builtin/pack-objects.c:3955
+#: builtin/pack-objects.c
 msgid "pack loose unreachable objects"
-msgstr ""
+msgstr "pak objek longgar yang tak dapat dicapai"
 
-#: builtin/pack-objects.c:3957
+#: builtin/pack-objects.c
 msgid "unpack unreachable objects newer than <time>"
-msgstr ""
+msgstr "bongkar objek yang tidak dapat dicapai yang lebih muda dari <waktu>"
 
-#: builtin/pack-objects.c:3960
+#: builtin/pack-objects.c
+msgid "create a cruft pack"
+msgstr "buat sebuah pak sisa"
+
+#: builtin/pack-objects.c
+msgid "expire cruft objects older than <time>"
+msgstr "kadaluarsakan objek sisa lebih tua dari <waktu>"
+
+#: builtin/pack-objects.c
 msgid "use the sparse reachability algorithm"
-msgstr ""
+msgstr "gunakan algoritma ketercapaian tipis"
 
-#: builtin/pack-objects.c:3962
+#: builtin/pack-objects.c
 msgid "create thin packs"
-msgstr ""
+msgstr "buat pak tipis"
 
-#: builtin/pack-objects.c:3964
+#: builtin/pack-objects.c
 msgid "create packs suitable for shallow fetches"
-msgstr ""
+msgstr "buat pak yang cocok untuk pengambilan dangkal"
 
-#: builtin/pack-objects.c:3966
+#: builtin/pack-objects.c
 msgid "ignore packs that have companion .keep file"
-msgstr ""
+msgstr "abaikan pak yang punya pasangan berkas .keep"
 
-#: builtin/pack-objects.c:3968
+#: builtin/pack-objects.c
 msgid "ignore this pack"
-msgstr ""
+msgstr "abaikan pak ini"
 
-#: builtin/pack-objects.c:3970
+#: builtin/pack-objects.c
 msgid "pack compression level"
-msgstr ""
+msgstr "tingkat pemampatan pak"
 
-#: builtin/pack-objects.c:3972
+#: builtin/pack-objects.c
 msgid "do not hide commits by grafts"
-msgstr ""
+msgstr "jangan sembunyikan komit oleh cangkokan"
 
-#: builtin/pack-objects.c:3974
+#: builtin/pack-objects.c
 msgid "use a bitmap index if available to speed up counting objects"
-msgstr ""
+msgstr "gunakan indeks bitmap jika ada untuk mempercepat penghitungan objek"
 
-#: builtin/pack-objects.c:3976
+#: builtin/pack-objects.c
 msgid "write a bitmap index together with the pack index"
-msgstr ""
+msgstr "gunakan indeks bitmap bersamaan dengan indeks pak"
 
-#: builtin/pack-objects.c:3980
+#: builtin/pack-objects.c
 msgid "write a bitmap index if possible"
-msgstr ""
+msgstr "tulis indeks bitmap bila dimungkinkan"
 
-#: builtin/pack-objects.c:3984
+#: builtin/pack-objects.c
 msgid "handling for missing objects"
-msgstr ""
+msgstr "penanganan untuk objek yang hilang"
 
-#: builtin/pack-objects.c:3987
+#: builtin/pack-objects.c
 msgid "do not pack objects in promisor packfiles"
-msgstr ""
+msgstr "jangan pak objek di dalam pak penjanji"
 
-#: builtin/pack-objects.c:3989
+#: builtin/pack-objects.c
 msgid "respect islands during delta compression"
-msgstr ""
+msgstr "patuhi pulau selama pemampatan delta"
 
-#: builtin/pack-objects.c:3991
+#: builtin/pack-objects.c
 msgid "protocol"
-msgstr ""
+msgstr "protokol"
 
-#: builtin/pack-objects.c:3992
+#: builtin/pack-objects.c
 msgid "exclude any configured uploadpack.blobpackfileuri with this protocol"
 msgstr ""
+"abaikan uploadpack.blobpackfileuri apapun yang dikonfigurasikan dengan "
+"protokol ini"
 
-#: builtin/pack-objects.c:4027
+#: builtin/pack-objects.c
 #, c-format
 msgid "delta chain depth %d is too deep, forcing %d"
-msgstr ""
+msgstr "kedalaman rantai delta %d terlalu dalam, memaksakan %d"
 
-#: builtin/pack-objects.c:4032
+#: builtin/pack-objects.c
 #, c-format
 msgid "pack.deltaCacheLimit is too high, forcing %d"
-msgstr ""
+msgstr "pack.deltaCacheLimit terlalu tinggi, memaksakan %d"
 
-#: builtin/pack-objects.c:4088
+#: builtin/pack-objects.c config.c
+#, c-format
+msgid "bad pack compression level %d"
+msgstr "level kompresi pak jelek %d"
+
+#: builtin/pack-objects.c
 msgid "--max-pack-size cannot be used to build a pack for transfer"
 msgstr ""
+"--max-pack-size tidak dapat digunakan untuk membangun sebuah pak untuk "
+"transfer"
 
-#: builtin/pack-objects.c:4090
+#: builtin/pack-objects.c
 msgid "minimum pack size limit is 1 MiB"
-msgstr ""
+msgstr "batas ukuran pak minimum adalah 1 MiB"
 
-#: builtin/pack-objects.c:4095
+#: builtin/pack-objects.c
 msgid "--thin cannot be used to build an indexable pack"
 msgstr ""
+"--thin tidak dapat digunakan untuk membangun sebuah pak yang dapat diindeks"
 
-#: builtin/pack-objects.c:4104
+#: builtin/pack-objects.c
 msgid "cannot use --filter without --stdout"
-msgstr ""
+msgstr "tidak dapat menggunakan --filter tanpa --stdout"
 
-#: builtin/pack-objects.c:4106
+#: builtin/pack-objects.c
 msgid "cannot use --filter with --stdin-packs"
-msgstr ""
+msgstr "tidak dapat menggunakan --filter dengan --stdin-packs"
 
-#: builtin/pack-objects.c:4110
+#: builtin/pack-objects.c
 msgid "cannot use internal rev list with --stdin-packs"
-msgstr ""
+msgstr "tidak dapat menggunakan daftar revisi internal dengan --stdin-packs"
+
+#: builtin/pack-objects.c
+msgid "cannot use internal rev list with --cruft"
+msgstr "tidak dapat menggunakan daftar revisi internal dengan --cruft"
+
+#: builtin/pack-objects.c
+msgid "cannot use --stdin-packs with --cruft"
+msgstr "tidak dapat menggunakan --stdin-packs dengan --cruft"
 
-#: builtin/pack-objects.c:4169
+#: builtin/pack-objects.c
+msgid "cannot use --max-pack-size with --cruft"
+msgstr "tidak dapat menggunakan --max-pack-size dengan --cruft"
+
+#: builtin/pack-objects.c
 msgid "Enumerating objects"
-msgstr ""
+msgstr "Menghitung objek"
 
-#: builtin/pack-objects.c:4210
+#: builtin/pack-objects.c
 #, c-format
 msgid ""
 "Total %<PRIu32> (delta %<PRIu32>), reused %<PRIu32> (delta %<PRIu32>), pack-"
 "reused %<PRIu32>"
 msgstr ""
+"Total %<PRIu32> (delta %<PRIu32>), digunakan ulang %<PRIu32> (delta "
+"%<PRIu32>), pak yang digunakan ulang %<PRIu32>"
 
-#: builtin/pack-redundant.c:601
+#: builtin/pack-redundant.c
 msgid ""
 "'git pack-redundant' is nominated for removal.\n"
 "If you still use this command, please add an extra\n"
@@ -19495,79 +11372,79 @@ msgid ""
 "to <git@vger.kernel.org>.  Thanks.\n"
 msgstr ""
 
-#: builtin/pack-refs.c:8
+#: builtin/pack-refs.c
 msgid "git pack-refs [<options>]"
-msgstr ""
+msgstr "git pack-refs [<opsi>]"
 
-#: builtin/pack-refs.c:16
+#: builtin/pack-refs.c
 msgid "pack everything"
-msgstr ""
+msgstr "pak semuanya"
 
-#: builtin/pack-refs.c:17
+#: builtin/pack-refs.c
 msgid "prune loose refs (default)"
-msgstr ""
+msgstr "pangkas referensi longgar (asali)"
 
-#: builtin/prune.c:14
+#: builtin/prune.c
 msgid "git prune [-n] [-v] [--progress] [--expire <time>] [--] [<head>...]"
-msgstr ""
+msgstr "git prune [-n] [-v] [--progress] [--expire <waktu>] [--] [<kepala>...]"
 
-#: builtin/prune.c:145
+#: builtin/prune.c
 msgid "report pruned objects"
-msgstr ""
+msgstr "laporkan objek terpangkas"
 
-#: builtin/prune.c:148
+#: builtin/prune.c
 msgid "expire objects older than <time>"
-msgstr ""
+msgstr "kadaluarsakan objek yang lebih tua dari <waktu>"
 
-#: builtin/prune.c:150
+#: builtin/prune.c
 msgid "limit traversal to objects outside promisor packfiles"
-msgstr ""
+msgstr "batasi perlintasan ke objek di luar berkas pak penjanji"
 
-#: builtin/prune.c:163
+#: builtin/prune.c
 msgid "cannot prune in a precious-objects repo"
-msgstr ""
+msgstr "tidak dapat memangkas di dalam repositori objek berharga"
 
-#: builtin/pull.c:67
+#: builtin/pull.c
 msgid "git pull [<options>] [<repository> [<refspec>...]]"
 msgstr "git pull [<opsi>] [<repositori> [<spek referensi>]]"
 
-#: builtin/pull.c:124
+#: builtin/pull.c
 msgid "control for recursive fetching of submodules"
 msgstr "kontrol pengambilan rekursif submodul"
 
-#: builtin/pull.c:128
+#: builtin/pull.c
 msgid "Options related to merging"
 msgstr "Opsi yang berkaitan dengan penggabungan"
 
-#: builtin/pull.c:131
+#: builtin/pull.c
 msgid "incorporate changes by rebasing rather than merging"
 msgstr "masukkan perubahan dengan pendasaran ulang daripada penggabungan"
 
-#: builtin/pull.c:159 builtin/revert.c:126
+#: builtin/pull.c builtin/revert.c
 msgid "allow fast-forward"
 msgstr "perbolehkan maju cepat"
 
-#: builtin/pull.c:165
+#: builtin/pull.c
 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:371
+#: builtin/pull.c parse-options.h
 msgid "automatically stash/stash pop before and after"
 msgstr "stash/stash pop otomatis sebelum dan sesudah"
 
-#: builtin/pull.c:187
+#: builtin/pull.c
 msgid "Options related to fetching"
 msgstr "Opsi yang berkaitan dengan pengambilan"
 
-#: builtin/pull.c:197
+#: builtin/pull.c
 msgid "force overwrite of local branch"
 msgstr "paksa timpa cabang lokal"
 
-#: builtin/pull.c:205
+#: builtin/pull.c
 msgid "number of submodules pulled in parallel"
 msgstr "nomor submodul ditarik dalam paralel"
 
-#: builtin/pull.c:449
+#: builtin/pull.c
 msgid ""
 "There is no candidate for rebasing against among the refs that you just "
 "fetched."
@@ -19575,22 +11452,22 @@ msgstr ""
 "Tidak ada kandidat untuk didasarkan ulang diantara referensi yang baru saja "
 "Anda ambil."
 
-#: builtin/pull.c:451
+#: builtin/pull.c
 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:452
+#: builtin/pull.c
 msgid ""
 "Generally this means that you provided a wildcard refspec which had no\n"
 "matches on the remote end."
 msgstr ""
-"Umumnya itu berarti Anda memberikan spek referensi wildcard yang tidak\n"
+"Umumnya ini berarti Anda memberikan spek referensi wildcard yang tidak\n"
 "cocok pada ujung remote."
 
-#: builtin/pull.c:455
+#: builtin/pull.c
 #, c-format
 msgid ""
 "You asked to pull from the remote '%s', but did not specify\n"
@@ -19601,44 +11478,42 @@ msgstr ""
 "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:460 builtin/rebase.c:978
+#: builtin/pull.c builtin/rebase.c
 msgid "You are not currently on a branch."
 msgstr "Anda tidak berada pada sebuah cabang."
 
-#: builtin/pull.c:462 builtin/pull.c:477
+#: builtin/pull.c
 msgid "Please specify which branch you want to rebase against."
 msgstr "Mohon sebutkan cabang mana yang Anda ingin didasarkan ulang."
 
-#: builtin/pull.c:464 builtin/pull.c:479
+#: builtin/pull.c
 msgid "Please specify which branch you want to merge with."
 msgstr "Mohon sebutkan cabang mana yang Anda ingin digabungkan."
 
-#: builtin/pull.c:465 builtin/pull.c:480
+#: builtin/pull.c
 msgid "See git-pull(1) for details."
 msgstr "Lihat git-pull(1) untuk selengkapnya."
 
-#: builtin/pull.c:467 builtin/pull.c:473 builtin/pull.c:482
-#: builtin/rebase.c:984
+#: builtin/pull.c builtin/rebase.c
 msgid "<remote>"
 msgstr "<remote>"
 
-#: builtin/pull.c:467 builtin/pull.c:482 builtin/pull.c:487
-#: contrib/scalar/scalar.c:374
+#: builtin/pull.c contrib/scalar/scalar.c
 msgid "<branch>"
 msgstr "<cabang>"
 
-#: builtin/pull.c:475 builtin/rebase.c:976
+#: builtin/pull.c builtin/rebase.c
 msgid "There is no tracking information for the current branch."
 msgstr "Tidak ada informasi pelacakan untuk cabang saat ini."
 
-#: builtin/pull.c:484
+#: builtin/pull.c
 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:489
+#: builtin/pull.c
 #, c-format
 msgid ""
 "Your configuration specifies to merge with the ref '%s'\n"
@@ -19647,16 +11522,16 @@ msgstr ""
 "Konfigurasi Anda menyebutkan untuk menggabungkan dengan referensi '%s'\n"
 "dari remote, tapi tidak ada referensi seperti itu yang diambil."
 
-#: builtin/pull.c:600
+#: builtin/pull.c
 #, c-format
 msgid "unable to access commit %s"
 msgstr "Tidak dapat mengakses komit %s"
 
-#: builtin/pull.c:908
+#: builtin/pull.c
 msgid "ignoring --verify-signatures for rebase"
 msgstr "mengabaikan --verify-signatures untuk pendasaran ulang"
 
-#: builtin/pull.c:969
+#: builtin/pull.c
 msgid ""
 "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"
@@ -19687,21 +11562,21 @@ msgstr ""
 "--rebase, --no-rebase, atau --ff-only pada baris perintah untuk menimpa\n"
 "asali terkonfigurasi untuk setiap invokasi.\n"
 
-#: builtin/pull.c:1047
+#: builtin/pull.c
 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:1051
+#: builtin/pull.c
 msgid "pull with rebase"
 msgstr "tarik dengan pendasaran ulang"
 
-#: builtin/pull.c:1052
+#: builtin/pull.c
 msgid "please commit or stash them."
-msgstr "mohon komit atau stase itu."
+msgstr "mohon komit atau stase."
 
-#: builtin/pull.c:1077
+#: builtin/pull.c
 #, c-format
 msgid ""
 "fetch updated the current branch head.\n"
@@ -19711,7 +11586,7 @@ msgstr ""
 "fetch memperbarui kepala cabang saat ini.\n"
 "memajukan-cepat pohon kerja Anda dari komit %s."
 
-#: builtin/pull.c:1083
+#: builtin/pull.c
 #, c-format
 msgid ""
 "Cannot fast-forward your working tree.\n"
@@ -19728,49 +11603,63 @@ msgstr ""
 "$ git reset --hard\n"
 "untuk memulihkan."
 
-#: builtin/pull.c:1098
+#: builtin/pull.c
 msgid "Cannot merge multiple branches into empty head."
 msgstr "Tidak dapat menggabungkan banyak cabang ke kepala kosong."
 
-#: builtin/pull.c:1103
+#: builtin/pull.c
 msgid "Cannot rebase onto multiple branches."
 msgstr "Tidak dapat mendasarkan ulang pada banyak cabang."
 
-#: builtin/pull.c:1105
+#: builtin/pull.c
 msgid "Cannot fast-forward to multiple branches."
 msgstr "Tidak dapat maju cepat ke banyak cabang."
 
-#: builtin/pull.c:1120
+#: builtin/pull.c
 msgid "Need to specify how to reconcile divergent branches."
 msgstr "Perlu sebutkan cara merujukkan cabang yang berlainan."
 
-#: builtin/pull.c:1134
+#: builtin/pull.c
 msgid "cannot rebase with locally recorded submodule modifications"
 msgstr ""
 "tidak dapat mendasarkan ulang dengan modifikasi submodul yang terekam lokal."
 
-#: builtin/push.c:19
+#: builtin/push.c
 msgid "git push [<options>] [<repository> [<refspec>...]]"
 msgstr "git push [<opsi>] [<repositori> [<spek referensi>...]]"
 
-#: builtin/push.c:111
+#: builtin/push.c
 msgid "tag shorthand without <tag>"
 msgstr "pintasan tag tanpa <tag>"
 
-#: builtin/push.c:119
+#: builtin/push.c
 msgid "--delete only accepts plain target ref names"
 msgstr "--delete hanya terima nama target referensi polos"
 
-#: builtin/push.c:164
+#: builtin/push.c
 msgid ""
 "\n"
-"To choose either option permanently, see push.default in 'git help config'."
+"To choose either option permanently, see push.default in 'git help config'.\n"
 msgstr ""
 "\n"
 "Untuk memilih salah satu opsi secara permanen, lihat push.default di 'git "
-"help config'."
+"help config'.\n"
 
-#: builtin/push.c:167
+#: builtin/push.c
+msgid ""
+"\n"
+"To avoid automatically configuring upstream branches when their name\n"
+"doesn't match the local branch, see option 'simple' of branch."
+"autoSetupMerge\n"
+"in 'git help config'.\n"
+msgstr ""
+"\n"
+"Untuk menghindari konfigurasi cabang hulu otomatis ketika namanya\n"
+"tidak cocok dengan cabang lokal, lihat opsi 'simple' dari branch."
+"autoSetupMerge\n"
+"di 'git help config'.\n"
+
+#: builtin/push.c
 #, c-format
 msgid ""
 "The upstream branch of your current branch does not match\n"
@@ -19782,7 +11671,7 @@ msgid ""
 "To push to the branch of the same name on the remote, use\n"
 "\n"
 "    git push %s HEAD\n"
-"%s"
+"%s%s"
 msgstr ""
 "Cabang hulu dari cabang Anda saat ini tidak cocok dengan \n"
 "nama cabang Anda saat ini. Untuk dorong ke cabang hulu pada remote,\n"
@@ -19793,9 +11682,9 @@ msgstr ""
 "Untuk dorong ke cabang bernama sama pada remote, gunakan\n"
 "\n"
 "    git push %s HEAD\n"
-"%s"
+"%s%s"
 
-#: builtin/push.c:182
+#: builtin/push.c
 #, c-format
 msgid ""
 "You are not currently on a branch.\n"
@@ -19810,32 +11699,44 @@ msgstr ""
 "\n"
 "    git push %s HEAD:<nama-cabang-remote>\n"
 
-#: builtin/push.c:191
+#: builtin/push.c
+msgid ""
+"\n"
+"To have this happen automatically for branches without a tracking\n"
+"upstream, see 'push.autoSetupRemote' in 'git help config'.\n"
+msgstr ""
+"\n"
+"Untuk membuat hal ini terjadi otomatis untuk cabang tanpa sebuah hulu\n"
+"pelacakan, lihat 'push.autoSetupRemote' di 'git help config'.\n"
+
+#: builtin/push.c
 #, c-format
 msgid ""
 "The current branch %s has no upstream branch.\n"
 "To push the current branch and set the remote as upstream, use\n"
 "\n"
 "    git push --set-upstream %s %s\n"
+"%s"
 msgstr ""
 "Cabang saat ini %s tidak punya cabang hulu.\n"
 "Untuk dorong cabang saat ini dan setel remote sebagai hulu, gunakan\n"
 "\n"
 "    git push --set-upstream %s %s\n"
+"%s"
 
-#: builtin/push.c:199
+#: builtin/push.c
 #, c-format
 msgid "The current branch %s has multiple upstream branches, refusing to push."
 msgstr "Cabang saat ini %s punya banyak cabang hulu, tolak dorong. "
 
-#: builtin/push.c:217
+#: builtin/push.c
 msgid ""
 "You didn't specify any refspecs to push, and push.default is \"nothing\"."
 msgstr ""
 "Anda tidak sebutkan spek referensi apapun untuk didorong, dan push.default "
 "yaitu \"nothing\""
 
-#: builtin/push.c:243
+#: builtin/push.c
 #, c-format
 msgid ""
 "You are pushing to remote '%s', which is not the upstream of\n"
@@ -19846,7 +11747,7 @@ msgstr ""
 "cabang Anda saat ini '%s', tanpa beri tahu saya apa yang harus\n"
 "didorong untuk perbarui cabang remote yang mana."
 
-#: builtin/push.c:258
+#: builtin/push.c
 msgid ""
 "Updates were rejected because the tip of your current branch is behind\n"
 "its remote counterpart. Integrate the remote changes (e.g.\n"
@@ -19858,7 +11759,7 @@ msgstr ""
 "'git pull') sebelum dorong lagi.\n"
 "Lihat 'Note about fast-forwards' di 'git push --help' untuk selengkapnya."
 
-#: builtin/push.c:264
+#: builtin/push.c
 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"
@@ -19870,7 +11771,7 @@ msgstr ""
 "remote (seperti 'git pull') sebelum dorong lagi.\n"
 "Lihat 'Note about fast-forwards' di 'git push --help' untuk selengkapnya."
 
-#: builtin/push.c:270
+#: builtin/push.c
 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"
@@ -19884,11 +11785,11 @@ msgstr ""
 "perubahan remote (seperti 'git pull') sebelum dorong lagi.\n"
 "Lihat 'Note about fast-forwards' di 'git push --help' untuk selengkapnya."
 
-#: builtin/push.c:277
+#: builtin/push.c
 msgid "Updates were rejected because the tag already exists in the remote."
 msgstr "Pembaruan ditolak karena tag sudah ada di remote."
 
-#: builtin/push.c:280
+#: builtin/push.c
 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"
@@ -19898,7 +11799,7 @@ msgstr ""
 "non komit atau memperbarui referensi remote agar itu memnunjuk ke\n"
 "objek non komit, tanpa menggunakan opsi '--force'.\n"
 
-#: builtin/push.c:285
+#: builtin/push.c
 msgid ""
 "Updates were rejected because the tip of the remote-tracking\n"
 "branch has been updated since the last checkout. You may want\n"
@@ -19910,99 +11811,103 @@ msgstr ""
 "integrasikan perubahan tersebut ke lokal (seperti 'git pull...')\n"
 "sebelum memaksa pembaruan.\n"
 
-#: builtin/push.c:355
+#: builtin/push.c
 #, c-format
 msgid "Pushing to %s\n"
 msgstr "Mendorong ke %s\n"
 
-#: builtin/push.c:362
+#: builtin/push.c
 #, c-format
 msgid "failed to push some refs to '%s'"
 msgstr "gagal dorong beberapa referensi ke '%s'"
 
-#: builtin/push.c:544 builtin/submodule--helper.c:3377
+#: builtin/push.c builtin/send-pack.c submodule-config.c
+#, c-format
+msgid "invalid value for '%s'"
+msgstr "nilai tidak valid untuk '%s'"
+
+#: builtin/push.c builtin/submodule--helper.c
 msgid "repository"
 msgstr "repositori"
 
-#: builtin/push.c:545 builtin/send-pack.c:193
+#: builtin/push.c builtin/send-pack.c
 msgid "push all refs"
 msgstr "dorong semua referensi"
 
-#: builtin/push.c:546 builtin/send-pack.c:195
+#: builtin/push.c builtin/send-pack.c
 msgid "mirror all refs"
 msgstr "cermin semua referensi"
 
-#: builtin/push.c:548
+#: builtin/push.c
 msgid "delete refs"
 msgstr "hapus referensi"
 
-#: builtin/push.c:549
+#: builtin/push.c
 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:196
+#: builtin/push.c builtin/send-pack.c
 msgid "force updates"
 msgstr "paksa pembaruan"
 
-#: builtin/push.c:553 builtin/send-pack.c:208
+#: builtin/push.c builtin/send-pack.c
 msgid "<refname>:<expect>"
 msgstr "<nama referensi>:<harapan>"
 
-#: builtin/push.c:554 builtin/send-pack.c:209
+#: builtin/push.c builtin/send-pack.c
 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:212
+#: builtin/push.c builtin/send-pack.c
 msgid "require remote updates to be integrated locally"
 msgstr "memerlukan pembaruan remote diintegrasikan ke lokal"
 
-#: builtin/push.c:560
+#: builtin/push.c
 msgid "control recursive pushing of submodules"
 msgstr "kontrol dorong rekursif submodul"
 
-#: builtin/push.c:561 builtin/send-pack.c:203
+#: builtin/push.c builtin/send-pack.c
 msgid "use thin pack"
 msgstr "gunakan paket tipis"
 
-#: builtin/push.c:562 builtin/push.c:563 builtin/send-pack.c:190
-#: builtin/send-pack.c:191
+#: builtin/push.c builtin/send-pack.c
 msgid "receive pack program"
 msgstr "program terima paket"
 
-#: builtin/push.c:564
+#: builtin/push.c
 msgid "set upstream for git pull/status"
 msgstr "setel hulu untuk git pull/status"
 
-#: builtin/push.c:567
+#: builtin/push.c
 msgid "prune locally removed refs"
 msgstr "buang referensi terhapus lokal"
 
-#: builtin/push.c:569
+#: builtin/push.c
 msgid "bypass pre-push hook"
 msgstr "lewati kail pra-dorong"
 
-#: builtin/push.c:570
+#: builtin/push.c
 msgid "push missing but relevant tags"
 msgstr "dorong tag yang hilang tapi relevan"
 
-#: builtin/push.c:572 builtin/send-pack.c:197
+#: builtin/push.c builtin/send-pack.c
 msgid "GPG sign the push"
 msgstr "Tandatangan GPG dorong"
 
-#: builtin/push.c:574 builtin/send-pack.c:204
+#: builtin/push.c builtin/send-pack.c
 msgid "request atomic transaction on remote side"
 msgstr "minta transaksi atomik pada sisi remote"
 
-#: builtin/push.c:594
+#: builtin/push.c
 msgid "--delete doesn't make sense without any refs"
 msgstr "--delete tidak masuk akal tanpa referensi"
 
-#: builtin/push.c:614
+#: builtin/push.c
 #, c-format
 msgid "bad repository '%s'"
 msgstr "repositori jelek '%s'"
 
-#: builtin/push.c:615
+#: builtin/push.c
 msgid ""
 "No configured push destination.\n"
 "Either specify the URL from the command-line or configure a remote "
@@ -20024,64 +11929,64 @@ msgstr ""
 "\n"
 "    git push <nama>\n"
 
-#: builtin/push.c:632
+#: builtin/push.c
 msgid "--all can't be combined with refspecs"
 msgstr "--all tidak dapat digabung dengan spek referensi"
 
-#: builtin/push.c:638
+#: builtin/push.c
 msgid "--mirror can't be combined with refspecs"
 msgstr "--mirror tidak dapat digabungkan dengan spek referensi"
 
-#: builtin/push.c:648
+#: builtin/push.c
 msgid "push options must not have new line characters"
 msgstr "opsi dorong harus tidak ada karakter baris baru"
 
-#: builtin/range-diff.c:9
+#: builtin/range-diff.c
 msgid "git range-diff [<options>] <old-base>..<old-tip> <new-base>..<new-tip>"
 msgstr ""
 
-#: builtin/range-diff.c:10
+#: builtin/range-diff.c
 msgid "git range-diff [<options>] <old-tip>...<new-tip>"
 msgstr ""
 
-#: builtin/range-diff.c:11
+#: builtin/range-diff.c
 msgid "git range-diff [<options>] <base> <old-tip> <new-tip>"
 msgstr ""
 
-#: builtin/range-diff.c:30
+#: builtin/range-diff.c
 msgid "use simple diff colors"
 msgstr ""
 
-#: builtin/range-diff.c:32
+#: builtin/range-diff.c
 msgid "notes"
 msgstr ""
 
-#: builtin/range-diff.c:32
+#: builtin/range-diff.c
 msgid "passed to 'git log'"
 msgstr ""
 
-#: builtin/range-diff.c:35
+#: builtin/range-diff.c
 msgid "only emit output related to the first range"
 msgstr ""
 
-#: builtin/range-diff.c:37
+#: builtin/range-diff.c
 msgid "only emit output related to the second range"
 msgstr ""
 
-#: builtin/range-diff.c:60 builtin/range-diff.c:64
+#: builtin/range-diff.c
 #, c-format
 msgid "not a commit range: '%s'"
 msgstr ""
 
-#: builtin/range-diff.c:74
+#: builtin/range-diff.c
 msgid "single arg format must be symmetric range"
 msgstr ""
 
-#: builtin/range-diff.c:89
+#: builtin/range-diff.c
 msgid "need two commit ranges"
 msgstr ""
 
-#: builtin/read-tree.c:41
+#: builtin/read-tree.c
 msgid ""
 "git read-tree [(-m [--trivial] [--aggressive] | --reset | --prefix=<prefix>) "
 "[-u | -i]] [--no-sparse-checkout] [--index-output=<file>] (--empty | <tree-"
@@ -20092,80 +11997,80 @@ msgstr ""
 "output=<berkas>] (--empty | <mirip-pohon 1> [<mirip-pohon 2> <mirip-pohon "
 "3>])"
 
-#: builtin/read-tree.c:116
+#: builtin/read-tree.c
 msgid "write resulting index to <file>"
 msgstr "tulis indeks yang dihasilkan ke <berkas>"
 
-#: builtin/read-tree.c:119
+#: builtin/read-tree.c
 msgid "only empty the index"
 msgstr "hanya kosongkan indeks"
 
-#: builtin/read-tree.c:121
+#: builtin/read-tree.c
 msgid "Merging"
 msgstr "Menggabungkan"
 
-#: builtin/read-tree.c:123
+#: builtin/read-tree.c
 msgid "perform a merge in addition to a read"
 msgstr "lakukan penggabungan selain pembacaan"
 
-#: builtin/read-tree.c:125
+#: builtin/read-tree.c
 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:127
+#: builtin/read-tree.c
 msgid "3-way merge in presence of adds and removes"
 msgstr "penggabungan 3 arah dengan kehadiran penambahan dan penghapusan"
 
-#: builtin/read-tree.c:129
+#: builtin/read-tree.c
 msgid "same as -m, but discard unmerged entries"
 msgstr "sama seperti -m, tapi buang entri tak tergabung"
 
-#: builtin/read-tree.c:130
+#: builtin/read-tree.c
 msgid "<subdirectory>/"
 msgstr "<subdirektori>/"
 
-#: builtin/read-tree.c:131
+#: builtin/read-tree.c
 msgid "read the tree into the index under <subdirectory>/"
 msgstr "baca pohon ke dalam indeks pada <subdirektori>/"
 
-#: builtin/read-tree.c:134
+#: builtin/read-tree.c
 msgid "update working tree with merge result"
 msgstr "perbarui pohon kerja dengan hasil penggabungan"
 
-#: builtin/read-tree.c:136
+#: builtin/read-tree.c
 msgid "gitignore"
 msgstr "gitignore"
 
-#: builtin/read-tree.c:137
+#: builtin/read-tree.c
 msgid "allow explicitly ignored files to be overwritten"
 msgstr "perbolehkan berkas yang diabaikan secara eksplisit untuk ditimpa"
 
-#: builtin/read-tree.c:140
+#: builtin/read-tree.c
 msgid "don't check the working tree after merging"
 msgstr "jangan periksa pohon kerja setelah penggabungan"
 
-#: builtin/read-tree.c:141
+#: builtin/read-tree.c
 msgid "don't update the index or the work tree"
 msgstr "jangan perbarui indeks atau pohon kerja"
 
-#: builtin/read-tree.c:143
+#: builtin/read-tree.c
 msgid "skip applying sparse checkout filter"
 msgstr "lewatkan penerapan saringan checkout tipis"
 
-#: builtin/read-tree.c:145
+#: builtin/read-tree.c
 msgid "debug unpack-trees"
 msgstr "nirkutukan unpack-trees"
 
-#: builtin/read-tree.c:149
+#: builtin/read-tree.c
 msgid "suppress feedback messages"
 msgstr "matikan pesan umpan balik"
 
-#: builtin/read-tree.c:190
+#: builtin/read-tree.c
 msgid "You need to resolve your current index first"
 msgstr "Anda perlu menguraikan indeks Anda saat ini dulu"
 
-#: builtin/rebase.c:36
+#: builtin/rebase.c
 msgid ""
 "git rebase [-i] [options] [--exec <cmd>] [--onto <newbase> | --keep-base] "
 "[<upstream> [<branch>]]"
@@ -20173,51 +12078,61 @@ msgstr ""
 "git rebase [-i] [opsi] [--exec <perintah>] [--onto <basis baru> | --keep-"
 "base][<hulu> [<cabang>]]"
 
-#: builtin/rebase.c:38
+#: builtin/rebase.c
 msgid ""
 "git rebase [-i] [options] [--exec <cmd>] [--onto <newbase>] --root [<branch>]"
 msgstr ""
 "git rebase [-i] [opsi] [--exec <perintah>] [--onto <basis baru>] --root "
 "[<cabang>]"
 
-#: builtin/rebase.c:231
+#: builtin/rebase.c sequencer.c
+#, c-format
+msgid "could not read '%s'."
+msgstr "tidak dapat membaca '%s'."
+
+#: builtin/rebase.c
 #, c-format
 msgid "could not create temporary %s"
 msgstr "tidak dapat membuat %s sementara"
 
-#: builtin/rebase.c:237
+#: builtin/rebase.c
 msgid "could not mark as interactive"
 msgstr "tidak dapat menandai sebagai interaktif"
 
-#: builtin/rebase.c:290
+#: builtin/rebase.c
 msgid "could not generate todo list"
 msgstr "tidak dapat membuat daftar todo"
 
-#: builtin/rebase.c:332
+#: builtin/rebase.c
 msgid "a base commit must be provided with --upstream or --onto"
 msgstr "basis komit harus diberikan dengan --upstream atau --onto"
 
-#: builtin/rebase.c:391
+#: builtin/rebase.c
 #, c-format
 msgid "%s requires the merge backend"
 msgstr "%s butuh tulang belakang penggabungan"
 
-#: builtin/rebase.c:433
+#: builtin/rebase.c
 #, c-format
 msgid "could not get 'onto': '%s'"
 msgstr "tidak dapat mendapatkan 'ke': '%s'"
 
-#: builtin/rebase.c:450
+#: builtin/rebase.c
 #, c-format
 msgid "invalid orig-head: '%s'"
 msgstr "orig-head tidak valid: '%s'"
 
-#: builtin/rebase.c:475
+#: builtin/rebase.c
 #, c-format
 msgid "ignoring invalid allow_rerere_autoupdate: '%s'"
 msgstr "abaikan allow_rerere_autoupdate yang tak valid: '%s'"
 
-#: builtin/rebase.c:600
+#: builtin/rebase.c builtin/rm.c sequencer.c
+#, c-format
+msgid "could not remove '%s'"
+msgstr "tidak dapat menghapus '%s'"
+
+#: builtin/rebase.c
 msgid ""
 "Resolve all conflicts manually, mark them as resolved with\n"
 "\"git add/rm <conflicted_files>\", then run \"git rebase --continue\".\n"
@@ -20232,7 +12147,7 @@ msgstr ""
 "Untuk membatalkan dan kembali ke kondisi sebelum \"git rebase\",jalankan "
 "\"git rebase --abort\"."
 
-#: builtin/rebase.c:685
+#: builtin/rebase.c
 #, c-format
 msgid ""
 "\n"
@@ -20249,14 +12164,14 @@ msgstr ""
 "\n"
 "    %s\n"
 "\n"
-"Hasilnya git tidak dapat mendasarkan ulang itu."
+"Hasilnya git tidak dapat mendasarkan ulang."
 
-#: builtin/rebase.c:836
+#: builtin/rebase.c
 #, c-format
 msgid "could not switch to %s"
 msgstr "tidak dapat mengganti ke %s"
 
-#: builtin/rebase.c:952
+#: builtin/rebase.c
 #, c-format
 msgid ""
 "unrecognized empty type '%s'; valid values are \"drop\", \"keep\", and \"ask"
@@ -20265,7 +12180,7 @@ msgstr ""
 "tipe kosong tak dikenali '%s'; nilai yang valid adalah \"drop\", \"keep\", "
 "dan \"ask\"."
 
-#: builtin/rebase.c:970
+#: builtin/rebase.c
 #, c-format
 msgid ""
 "%s\n"
@@ -20282,7 +12197,7 @@ msgstr ""
 "    git rebase '<cabang>'.\n"
 "\n"
 
-#: builtin/rebase.c:986
+#: builtin/rebase.c
 #, c-format
 msgid ""
 "If you wish to set tracking information for this branch you can do so with:\n"
@@ -20295,198 +12210,208 @@ msgstr ""
 "    git branch --set-upstream-to=%s/<cabang> %s\n"
 "\n"
 
-#: builtin/rebase.c:1016
+#: builtin/rebase.c
 msgid "exec commands cannot contain newlines"
 msgstr "perintah exec tidak dapat berisi baris baru"
 
-#: builtin/rebase.c:1020
+#: builtin/rebase.c
 msgid "empty exec command"
 msgstr "perintah exec kosong"
 
-#: builtin/rebase.c:1051
+#: builtin/rebase.c
 msgid "rebase onto given branch instead of upstream"
 msgstr "dasarkan ulang kepada cabang yang diberikan daripada hulu"
 
-#: builtin/rebase.c:1053
+#: builtin/rebase.c
 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:1055
+#: builtin/rebase.c
 msgid "allow pre-rebase hook to run"
 msgstr "perbolehkan kail pre-rebase untuk dijalankan"
 
-#: builtin/rebase.c:1057
+#: builtin/rebase.c
 msgid "be quiet. implies --no-stat"
 msgstr "diam. menyiratkan --no-stat"
 
-#: builtin/rebase.c:1060
+#: builtin/rebase.c
 msgid "display a diffstat of what changed upstream"
 msgstr "perlihatkan diffstat apa yang berubah di hulu"
 
-#: builtin/rebase.c:1063
+#: builtin/rebase.c
 msgid "do not show diffstat of what changed upstream"
 msgstr "jangan perlihatkan diffstat apa yang berubah di hulu"
 
-#: builtin/rebase.c:1066
+#: builtin/rebase.c
 msgid "add a Signed-off-by trailer to each commit"
 msgstr "tambahkan trailer Signed-off-by ke setiap komit"
 
-#: builtin/rebase.c:1069
+#: builtin/rebase.c
 msgid "make committer date match author date"
 msgstr "jadikan tanggal pengkomit sama dengan tanggal pengarang"
 
-#: builtin/rebase.c:1071
+#: builtin/rebase.c
 msgid "ignore author date and use current date"
 msgstr "abaikan tanggal pengarang dan gunakan tanggal saat ini"
 
-#: builtin/rebase.c:1073
+#: builtin/rebase.c
 msgid "synonym of --reset-author-date"
 msgstr "sinonim dari --reset-author-date"
 
-#: builtin/rebase.c:1075 builtin/rebase.c:1079
+#: builtin/rebase.c
 msgid "passed to 'git apply'"
 msgstr "lewatkan ke 'git apply'"
 
-#: builtin/rebase.c:1077
+#: builtin/rebase.c
 msgid "ignore changes in whitespace"
 msgstr "abaikan perubahan spasi"
 
-#: builtin/rebase.c:1081 builtin/rebase.c:1084
+#: builtin/rebase.c
 msgid "cherry-pick all commits, even if unchanged"
 msgstr "petik ceri semua komit, bahkan jika tak berubah"
 
-#: builtin/rebase.c:1086
+#: builtin/rebase.c
 msgid "continue"
 msgstr "lanjutkan"
 
-#: builtin/rebase.c:1089
+#: builtin/rebase.c
 msgid "skip current patch and continue"
 msgstr "lewatkan tambalan saat ini dan lanjutkan"
 
-#: builtin/rebase.c:1091
+#: builtin/rebase.c
 msgid "abort and check out the original branch"
 msgstr "hentikan dan check out cabang asli"
 
-#: builtin/rebase.c:1094
+#: builtin/rebase.c
 msgid "abort but keep HEAD where it is"
 msgstr "hentikan tapi simpan HEAD dimana itu berada"
 
-#: builtin/rebase.c:1095
+#: builtin/rebase.c
 msgid "edit the todo list during an interactive rebase"
 msgstr "sunting daftar todo selama pendasaran ulang interaktif"
 
-#: builtin/rebase.c:1098
+#: builtin/rebase.c
 msgid "show the patch file being applied or merged"
 msgstr "perlihatkan berkas tambalan yang sedang diterapkan atau digabungkan"
 
-#: builtin/rebase.c:1101
+#: builtin/rebase.c
 msgid "use apply strategies to rebase"
 msgstr "gunakan strategi penerapan ke pendasaran ulang"
 
-#: builtin/rebase.c:1105
+#: builtin/rebase.c
 msgid "use merging strategies to rebase"
 msgstr "gunakan strategi penggabungan ke pendasaran ulang"
 
-#: builtin/rebase.c:1109
+#: builtin/rebase.c
 msgid "let the user edit the list of commits to rebase"
 msgstr "biarkan pengguna menyunting daftar komit untuk didasarkan ulang"
 
-#: builtin/rebase.c:1113
-msgid "(DEPRECATED) try to recreate merges instead of ignoring them"
-msgstr "(USANG) coba buat ulang penggabungan daripada abaikan itu"
+#: builtin/rebase.c
+msgid "(REMOVED) was: try to recreate merges instead of ignoring them"
+msgstr "(USANG) yaitu:  coba buat ulang penggabungan daripada abaikannya"
 
-#: builtin/rebase.c:1118
+#: builtin/rebase.c
 msgid "how to handle commits that become empty"
 msgstr "bagaimana cara menangani komit yang menjadi kosong"
 
-#: builtin/rebase.c:1121
+#: builtin/rebase.c
 msgid "keep commits which start empty"
 msgstr "simpan komit yang dimulai kosong"
 
-#: builtin/rebase.c:1125
+#: builtin/rebase.c
 msgid "move commits that begin with squash!/fixup! under -i"
 msgstr "pindahakan komit yang diawali dengan squash!/fixup! di bawah -i"
 
-#: builtin/rebase.c:1132
+#: builtin/rebase.c
 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:1136
+#: builtin/rebase.c
 msgid "allow rebasing commits with empty messages"
 msgstr "perbolehkan mendasarkan ulang komit dengan pesan kosong"
 
-#: builtin/rebase.c:1140
+#: builtin/rebase.c
 msgid "try to rebase merges instead of skipping them"
-msgstr "coba mendasarkan ulang penggabungan daripada melewatkan itu"
+msgstr "coba mendasarkan ulang penggabungan daripada melewatkannya"
 
-#: builtin/rebase.c:1143
+#: builtin/rebase.c
 msgid "use 'merge-base --fork-point' to refine upstream"
 msgstr "gunakan 'merge-base --fork-point' untuk menyaring hulu"
 
-#: builtin/rebase.c:1145
+#: builtin/rebase.c
 msgid "use the given merge strategy"
 msgstr "gunakan strategi penggabungan yang diberikan"
 
-#: builtin/rebase.c:1147 builtin/revert.c:115
+#: builtin/rebase.c builtin/revert.c
 msgid "option"
 msgstr "opsi"
 
-#: builtin/rebase.c:1148
+#: builtin/rebase.c
 msgid "pass the argument through to the merge strategy"
 msgstr "lewatkan argumen ke strategi penggabungan"
 
-#: builtin/rebase.c:1151
+#: builtin/rebase.c
 msgid "rebase all reachable commits up to the root(s)"
 msgstr "dasarkan ulang semua komit yang bisa dicapai hingga ke akar"
 
-#: builtin/rebase.c:1154
+#: builtin/rebase.c
 msgid "automatically re-schedule any `exec` that fails"
 msgstr "jadwal ulang otomatis `exec` apa saja yang gagal"
 
-#: builtin/rebase.c:1156
+#: builtin/rebase.c
 msgid "apply all changes, even those already present upstream"
 msgstr "terapkan semua perubahan, bahkan yang sudah ada di hulu"
 
-#: builtin/rebase.c:1177
+#: builtin/rebase.c
 msgid "It looks like 'git am' is in progress. Cannot rebase."
 msgstr "Sepertinya 'git am' sedang berjalan. Tidak dapat mendasarkan ulang"
 
-#: builtin/rebase.c:1208
-msgid "--preserve-merges was replaced by --rebase-merges"
-msgstr "--preserve-merges digantikan oleh --rebase-merges"
+#: builtin/rebase.c
+msgid ""
+"`rebase --preserve-merges` (-p) is no longer supported.\n"
+"Use `git rebase --abort` to terminate current rebase.\n"
+"Or downgrade to v2.33, or earlier, to complete the rebase."
+msgstr ""
+
+#: builtin/rebase.c
+msgid ""
+"--preserve-merges was replaced by --rebase-merges\n"
+"Note: Your `pull.rebase` configuration may also be set to 'preserve',\n"
+"which is no longer supported; use 'merges' instead"
+msgstr ""
 
-#: builtin/rebase.c:1230
+#: builtin/rebase.c
 msgid "No rebase in progress?"
 msgstr "Tidak ada pendasaran ulang yang sedang berjalan?"
 
-#: builtin/rebase.c:1234
+#: builtin/rebase.c
 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:1257 t/helper/test-fast-rebase.c:122
+#: builtin/rebase.c t/helper/test-fast-rebase.c
 msgid "Cannot read HEAD"
 msgstr "Tidak dapat membaca HEAD"
 
-#: builtin/rebase.c:1269
+#: builtin/rebase.c
 msgid ""
 "You must edit all merge conflicts and then\n"
 "mark them as resolved using git add"
 msgstr ""
 "Anda harus menyunting semua konflik penggabungan lalu\n"
-"tandai itu sebagai terselesaikan menggunakan git add"
+"menandainya sebagai terselesaikan menggunakan git add"
 
-#: builtin/rebase.c:1287
+#: builtin/rebase.c
 msgid "could not discard worktree changes"
 msgstr "tidak dapat menyingkirkan perubahan pohon kerja"
 
-#: builtin/rebase.c:1308
+#: builtin/rebase.c
 #, c-format
 msgid "could not move back to %s"
 msgstr "tidak dapt memindahkan kembali ke %s"
 
-#: builtin/rebase.c:1354
+#: builtin/rebase.c
 #, c-format
 msgid ""
 "It seems that there is already a %s directory, and\n"
@@ -20507,128 +12432,126 @@ msgstr ""
 "dan jalankan saya lagi. Saya berhenti seandainya Anda masih punya\n"
 "sesuatu yang berharga di sana.\n"
 
-#: builtin/rebase.c:1382
+#: builtin/rebase.c
 msgid "switch `C' expects a numerical value"
 msgstr "tombol `C' harap nilai numerik"
 
-#: builtin/rebase.c:1424
+#: builtin/rebase.c
 #, c-format
 msgid "Unknown mode: %s"
 msgstr "Mode tidak dikenal: %s"
 
-#: builtin/rebase.c:1463
+#: builtin/rebase.c
 msgid "--strategy requires --merge or --interactive"
 msgstr "--strategy butuh --merge atau --interactive"
 
-#: builtin/rebase.c:1492
+#: builtin/rebase.c
 msgid "apply options and merge options cannot be used together"
 msgstr "opsi apply dan opsi merge tidak dapat digunakan bersamaan"
 
-#: builtin/rebase.c:1505
+#: builtin/rebase.c
 #, c-format
 msgid "Unknown rebase backend: %s"
 msgstr "Tulang belakang pendasaran ulang tidak dikenal: %s"
 
-#: builtin/rebase.c:1534
+#: builtin/rebase.c
 msgid "--reschedule-failed-exec requires --exec or --interactive"
 msgstr "--reschedule-failed-exec butuh --exec atau --interactive"
 
-#: builtin/rebase.c:1565
+#: builtin/rebase.c
 #, c-format
 msgid "invalid upstream '%s'"
 msgstr "hulu tidak valid '%s'"
 
-#: builtin/rebase.c:1571
+#: builtin/rebase.c
 msgid "Could not create new root commit"
 msgstr "tidak dapat membuat komit akar baru"
 
-#: builtin/rebase.c:1597
+#: builtin/rebase.c
+#, c-format
+msgid "no such branch/commit '%s'"
+msgstr "tidak ada cabang/komit seperti '%s'"
+
+#: builtin/rebase.c builtin/submodule--helper.c
+#, c-format
+msgid "No such ref: %s"
+msgstr "Tidak ada referensi seperti: %s"
+
+#: builtin/rebase.c
+msgid "Could not resolve HEAD to a revision"
+msgstr "Tidak dapat menguraikan HEAD ke sebuah revisi"
+
+#: builtin/rebase.c
 #, c-format
 msgid "'%s': need exactly one merge base with branch"
 msgstr "'%s': butuh tepatnya satu dasar penggabungan dengan cabang"
 
-#: builtin/rebase.c:1600
+#: builtin/rebase.c
 #, c-format
 msgid "'%s': need exactly one merge base"
 msgstr "'%s': butuh tepatnya satu dasar penggabungan"
 
-#: builtin/rebase.c:1609
+#: builtin/rebase.c
 #, c-format
 msgid "Does not point to a valid commit '%s'"
 msgstr "Tidak menunjuk pada komit yang valid '%s'"
 
-#: builtin/rebase.c:1636
-#, c-format
-msgid "no such branch/commit '%s'"
-msgstr "tidak ada cabang/komit seperti '%s'"
-
-#: builtin/rebase.c:1647 builtin/submodule--helper.c:43
-#: builtin/submodule--helper.c:2477
-#, c-format
-msgid "No such ref: %s"
-msgstr "Tidak ada referensi seperti: %s"
-
-#: builtin/rebase.c:1658
-msgid "Could not resolve HEAD to a revision"
-msgstr "Tidak dapat menguraikan HEAD ke sebuah revisi"
-
-#: builtin/rebase.c:1679
+#: builtin/rebase.c
 msgid "Please commit or stash them."
-msgstr "Mohon komit atau stase itu."
+msgstr "Mohon komit atau stase."
 
-#: builtin/rebase.c:1714
+#: builtin/rebase.c
 msgid "HEAD is up to date."
 msgstr "HEAD terbaru."
 
-#: builtin/rebase.c:1716
+#: builtin/rebase.c
 #, c-format
 msgid "Current branch %s is up to date.\n"
 msgstr "Cabang saat ini %s terbaru.\n"
 
-#: builtin/rebase.c:1724
+#: builtin/rebase.c
 msgid "HEAD is up to date, rebase forced."
 msgstr "HEAD terbaru, pendasaran ulang dipaksa."
 
-#: builtin/rebase.c:1726
+#: builtin/rebase.c
 #, 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:1734
+#: builtin/rebase.c
 msgid "The pre-rebase hook refused to rebase."
 msgstr "Kail pre-rebase menolak mendasarkan ulang."
 
-#: builtin/rebase.c:1741
+#: builtin/rebase.c
 #, c-format
 msgid "Changes to %s:\n"
 msgstr "Perubahan unuk %s:\n"
 
-#: builtin/rebase.c:1744
+#: builtin/rebase.c
 #, c-format
 msgid "Changes from %s to %s:\n"
 msgstr "Perubahan dari %s ke %s:\n"
 
-#: builtin/rebase.c:1769
+#: builtin/rebase.c
 #, 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"
+"Pertama, memutar ulang kepala untuk memainkan ulang karya Anda diatasnya...\n"
 
-#: builtin/rebase.c:1781
+#: builtin/rebase.c
 msgid "Could not detach HEAD"
 msgstr "Tidak dapat melepas HEAD"
 
-#: builtin/rebase.c:1790
+#: builtin/rebase.c
 #, c-format
 msgid "Fast-forwarded %s to %s.\n"
 msgstr "Maju-cepat %s ke %s.\n"
 
-#: builtin/receive-pack.c:35
+#: builtin/receive-pack.c
 msgid "git receive-pack <git-dir>"
 msgstr "git receive-pack <direktori git>"
 
-#: builtin/receive-pack.c:1263
+#: builtin/receive-pack.c
 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"
@@ -20657,7 +12580,7 @@ msgstr ""
 "Untuk mematikan pesan ini dan tetap menjaga kebiasaan asali, setel\n"
 "variabel konfigurasi 'receive.denyCurrentBranch' ke 'refuse'."
 
-#: builtin/receive-pack.c:1283
+#: builtin/receive-pack.c
 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"
@@ -20677,19 +12600,19 @@ msgstr ""
 "\n"
 "Untuk mematikan pesan ini, Anda dapat menyetelnya ke 'refuse'."
 
-#: builtin/receive-pack.c:2476
+#: builtin/receive-pack.c
 msgid "quiet"
 msgstr "diam"
 
-#: builtin/receive-pack.c:2491
+#: builtin/receive-pack.c
 msgid "you must specify a directory"
 msgstr "Anda harus menyebutkan sebuah direktori"
 
-#: builtin/reflog.c:9
+#: builtin/reflog.c
 msgid "git reflog [show] [<log-options>] [<ref>]"
 msgstr "git remote [show] [<opsi log>] [<referensi>]"
 
-#: builtin/reflog.c:12
+#: builtin/reflog.c
 msgid ""
 "git reflog expire [--expire=<time>] [--expire-unreachable=<time>]\n"
 "                  [--rewrite] [--updateref] [--stale-fix]\n"
@@ -20701,7 +12624,7 @@ msgstr ""
 "                  [--dry-run | -n] [--verbose] [--all [--single-worktree] | "
 "<referensi>...]"
 
-#: builtin/reflog.c:17
+#: builtin/reflog.c
 msgid ""
 "git reflog delete [--rewrite] [--updateref]\n"
 "                  [--dry-run | -n] [--verbose] <ref>@{<specifier>}..."
@@ -20709,41 +12632,41 @@ msgstr ""
 "git reflog delete [--rewrite] [--updateref]\n"
 "                  [--dry-run | -n] [--verbose] <referensi>@{<penyebut>}..."
 
-#: builtin/reflog.c:21
+#: builtin/reflog.c
 msgid "git reflog exists <ref>"
 msgstr "git reflog exists <referensi>"
 
-#: builtin/reflog.c:197 builtin/reflog.c:211
+#: builtin/reflog.c
 #, c-format
 msgid "invalid timestamp '%s' given to '--%s'"
 msgstr "stempel waktu tidak valid '%s' diberikan ke '--%s'"
 
-#: builtin/reflog.c:240 builtin/reflog.c:359
+#: builtin/reflog.c
 msgid "do not actually prune any entries"
 msgstr "jangan benar-benar pangkas entri apapun"
 
-#: builtin/reflog.c:243 builtin/reflog.c:362
+#: builtin/reflog.c
 msgid ""
 "rewrite the old SHA1 with the new SHA1 of the entry that now precedes it"
 msgstr "tulis ulang SHA1 lama dengan SHA1 baru dari entri yang mendahuluinya"
 
-#: builtin/reflog.c:246 builtin/reflog.c:365
+#: builtin/reflog.c
 msgid "update the reference to the value of the top reflog entry"
 msgstr "perbarui referensi ke nilai dari entri log referensi atas"
 
-#: builtin/reflog.c:248 builtin/reflog.c:367
+#: builtin/reflog.c
 msgid "print extra information on screen"
 msgstr "cetak informasi tambahan pada layar"
 
-#: builtin/reflog.c:249 builtin/reflog.c:253
+#: builtin/reflog.c
 msgid "timestamp"
 msgstr "stempel"
 
-#: builtin/reflog.c:250
+#: builtin/reflog.c
 msgid "prune entries older than the specified time"
 msgstr "pangkas entri yang lebih tua dari waktu yang disebutkan"
 
-#: builtin/reflog.c:254
+#: builtin/reflog.c
 msgid ""
 "prune entries older than <time> that are not reachable from the current tip "
 "of the branch"
@@ -20751,38 +12674,38 @@ msgstr ""
 "pangkas entri yang lebih tua dari <waktu> yang tak terjangkau dari ujung "
 "cabang saat ini"
 
-#: builtin/reflog.c:258
+#: builtin/reflog.c
 msgid "prune any reflog entries that point to broken commits"
 msgstr "pangkas entri reflog apapun yang menunjuk ke komit yang rusak"
 
-#: builtin/reflog.c:259
+#: builtin/reflog.c
 msgid "process the reflogs of all references"
 msgstr "proses reflog semua referensi"
 
-#: builtin/reflog.c:261
+#: builtin/reflog.c
 msgid "limits processing to reflogs from the current worktree only"
 msgstr "batasi pemrosesan ke hanya log referensi dari pohon kerja saat ini"
 
-#: builtin/reflog.c:294
+#: builtin/reflog.c
 #, c-format
 msgid "Marking reachable objects..."
 msgstr "Menandai objek yang bisa dicapai..."
 
-#: builtin/reflog.c:338
+#: builtin/reflog.c
 #, c-format
 msgid "%s points nowhere!"
 msgstr "%s tidak menunjuk ke apapun!"
 
-#: builtin/reflog.c:374
+#: builtin/reflog.c
 msgid "no reflog specified to delete"
 msgstr "tidak ada log referensi yang disebutkan untuk dihapus"
 
-#: builtin/reflog.c:396
+#: builtin/reflog.c
 #, c-format
 msgid "invalid ref format: %s"
 msgstr "format referensi tidak valid: %s"
 
-#: builtin/remote.c:19
+#: builtin/remote.c
 msgid ""
 "git remote add [-t <branch>] [-m <master>] [-f] [--tags | --no-tags] [--"
 "mirror=<fetch|push>] <name> <url>"
@@ -20790,87 +12713,87 @@ msgstr ""
 "git remote add [-t <cabang>] [-m <master>] [-f] [--tags | --no-tags] [--"
 "mirror=<fetch|push>] <nama> <url>"
 
-#: builtin/remote.c:20 builtin/remote.c:40
+#: builtin/remote.c
 msgid "git remote rename [--[no-]progress] <old> <new>"
 msgstr "git remote rename [--[no-]progress] <lama> <baru>"
 
-#: builtin/remote.c:21 builtin/remote.c:45
+#: builtin/remote.c
 msgid "git remote remove <name>"
 msgstr "git remote remove <nama>"
 
-#: builtin/remote.c:22 builtin/remote.c:50
+#: builtin/remote.c
 msgid "git remote set-head <name> (-a | --auto | -d | --delete | <branch>)"
 msgstr "git remote set-head <nama> (-a | --auto | -d | --delete | <cabang>)"
 
-#: builtin/remote.c:23
+#: builtin/remote.c
 msgid "git remote [-v | --verbose] show [-n] <name>"
 msgstr "git remote [-v | --verbose] show [-n] <nama>"
 
-#: builtin/remote.c:24
+#: builtin/remote.c
 msgid "git remote prune [-n | --dry-run] <name>"
 msgstr "git remote prune [-n | --dry-run] <nama>"
 
-#: builtin/remote.c:25
+#: builtin/remote.c
 msgid ""
 "git remote [-v | --verbose] update [-p | --prune] [(<group> | <remote>)...]"
 msgstr ""
 "git remote [-v | --verbose] update [-p | --prune] [(<grup> | <remote>)...]"
 
-#: builtin/remote.c:26
+#: builtin/remote.c
 msgid "git remote set-branches [--add] <name> <branch>..."
 msgstr "git remote set-branches [--add] <nama> <cabang>..."
 
-#: builtin/remote.c:27 builtin/remote.c:76
+#: builtin/remote.c
 msgid "git remote get-url [--push] [--all] <name>"
 msgstr "git remote get-url [--push] [--all] <nama>"
 
-#: builtin/remote.c:28 builtin/remote.c:81
+#: builtin/remote.c
 msgid "git remote set-url [--push] <name> <newurl> [<oldurl>]"
 msgstr "git remote set-url [--push] <nama> <url baru> [<url lama>]"
 
-#: builtin/remote.c:29 builtin/remote.c:82
+#: builtin/remote.c
 msgid "git remote set-url --add <name> <newurl>"
 msgstr "git remote set-url --add <nama> <url baru>"
 
-#: builtin/remote.c:30 builtin/remote.c:83
+#: builtin/remote.c
 msgid "git remote set-url --delete <name> <url>"
 msgstr "git remote set-url --delete <nama> <url>"
 
-#: builtin/remote.c:35
+#: builtin/remote.c
 msgid "git remote add [<options>] <name> <url>"
 msgstr "git remote add [<opsi>] <nama> <url>"
 
-#: builtin/remote.c:55
+#: builtin/remote.c
 msgid "git remote set-branches <name> <branch>..."
 msgstr "git remote set-branches <nama> <cabang>"
 
-#: builtin/remote.c:56
+#: builtin/remote.c
 msgid "git remote set-branches --add <name> <branch>..."
 msgstr "git remote set-branches --add <nama> <cabang>"
 
-#: builtin/remote.c:61
+#: builtin/remote.c
 msgid "git remote show [<options>] <name>"
 msgstr "git remote show [<opsi>] <nama>"
 
-#: builtin/remote.c:66
+#: builtin/remote.c
 msgid "git remote prune [<options>] <name>"
 msgstr "git remote prune [<opsi>] <nama>"
 
-#: builtin/remote.c:71
+#: builtin/remote.c
 msgid "git remote update [<options>] [<group> | <remote>]..."
 msgstr "git remote update [<opsi>] [<group> | <remote>]..."
 
-#: builtin/remote.c:100
+#: builtin/remote.c
 #, c-format
 msgid "Updating %s"
 msgstr "Memperbarui %s"
 
-#: builtin/remote.c:102
+#: builtin/remote.c
 #, c-format
 msgid "Could not fetch %s"
 msgstr "Tidak dapat mengambil %s"
 
-#: builtin/remote.c:132
+#: builtin/remote.c
 msgid ""
 "--mirror is dangerous and deprecated; please\n"
 "\t use --mirror=fetch or --mirror=push instead"
@@ -20878,77 +12801,87 @@ msgstr ""
 "--mirror berbahaya dan usang; mohon gunakan --mirror=fetch\n"
 "\t atau --mirror=push sebagai gantinya"
 
-#: builtin/remote.c:149
+#: builtin/remote.c
 #, c-format
 msgid "unknown mirror argument: %s"
 msgstr "argumen mirror tidak dikenal: %s"
 
-#: builtin/remote.c:165
+#: builtin/remote.c
 msgid "fetch the remote branches"
 msgstr "ambil cabang remote"
 
-#: builtin/remote.c:167
+#: builtin/remote.c
 msgid "import all tags and associated objects when fetching"
 msgstr "impor semua tag dan objek yang terkait ketika mengambil"
 
-#: builtin/remote.c:170
+#: builtin/remote.c
 msgid "or do not fetch any tag at all (--no-tags)"
 msgstr "atau jangan mengambil tag apapun (--no-tags)"
 
-#: builtin/remote.c:172
+#: builtin/remote.c
 msgid "branch(es) to track"
 msgstr "cabang untuk dilacak"
 
-#: builtin/remote.c:173
+#: builtin/remote.c
 msgid "master branch"
 msgstr "cabang master"
 
-#: builtin/remote.c:175
+#: builtin/remote.c
 msgid "set up remote as a mirror to push to or fetch from"
 msgstr "atur remote sebagai cermin untuk didorong atau diambil"
 
-#: builtin/remote.c:187
+#: builtin/remote.c
 msgid "specifying a master branch makes no sense with --mirror"
 msgstr "menyebutkan cabang master tidak masuk akal dengan --mirror"
 
-#: builtin/remote.c:189
+#: builtin/remote.c
 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:196 builtin/remote.c:716
+#: builtin/remote.c
 #, c-format
 msgid "remote %s already exists."
 msgstr "remote %s sudah ada"
 
-#: builtin/remote.c:241
+#: builtin/remote.c
 #, c-format
 msgid "Could not setup master '%s'"
 msgstr "Tidak dapat mengatur master '%s'"
 
-#: builtin/remote.c:323
+#: builtin/remote.c trailer.c
+#, c-format
+msgid "more than one %s"
+msgstr "lebih dari satu %s"
+
+#: builtin/remote.c
 #, c-format
 msgid "unhandled branch.%s.rebase=%s; assuming 'true'"
 msgstr "branch.%s.rebase=%s tak tertangani; diasumsikan 'true'"
 
-#: builtin/remote.c:367
+#: builtin/remote.c
 #, c-format
 msgid "Could not get fetch map for refspec %s"
 msgstr "Tidak dapat mendapatkan peta pengambilan untuk spek referensi %s"
 
-#: builtin/remote.c:461 builtin/remote.c:469
+#: builtin/remote.c
 msgid "(matching)"
 msgstr "(sepadan)"
 
-#: builtin/remote.c:473
+#: builtin/remote.c
 msgid "(delete)"
 msgstr "(hapus)"
 
-#: builtin/remote.c:664
+#: builtin/remote.c
 #, c-format
 msgid "could not set '%s'"
 msgstr "tidak dapat menyetel '%s'"
 
-#: builtin/remote.c:669
+#: builtin/remote.c config.c
+#, c-format
+msgid "could not unset '%s'"
+msgstr "tidak dapat mem-batal setel '%s'"
+
+#: builtin/remote.c
 #, c-format
 msgid ""
 "The %s configuration remote.pushDefault in:\n"
@@ -20959,17 +12892,17 @@ msgstr ""
 "\t%s:%d\n"
 "sekarang menamai remote yang tiada '%s'"
 
-#: builtin/remote.c:707 builtin/remote.c:866 builtin/remote.c:973
+#: builtin/remote.c
 #, c-format
 msgid "No such remote: '%s'"
 msgstr "Tidak ada remote seperti: '%s'"
 
-#: builtin/remote.c:726
+#: builtin/remote.c
 #, c-format
 msgid "Could not rename config section '%s' to '%s'"
 msgstr "Tidak dapat menamai ulang bagian konfigurasi '%s' ke '%s'"
 
-#: builtin/remote.c:746
+#: builtin/remote.c
 #, c-format
 msgid ""
 "Not updating non-default fetch refspec\n"
@@ -20980,21 +12913,21 @@ msgstr ""
 "\t%s\n"
 "\tMohon perbarui konfigurasi secara manual bila diperlukan."
 
-#: builtin/remote.c:783
+#: builtin/remote.c
 msgid "Renaming remote references"
 msgstr "Menamai ulang referensi remote"
 
-#: builtin/remote.c:794
+#: builtin/remote.c
 #, c-format
 msgid "deleting '%s' failed"
 msgstr "menghapus '%s' gagal"
 
-#: builtin/remote.c:832
+#: builtin/remote.c
 #, c-format
 msgid "creating '%s' failed"
 msgstr "membuat '%s' gagal"
 
-#: builtin/remote.c:912
+#: builtin/remote.c
 msgid ""
 "Note: A branch outside the refs/remotes/ hierarchy was not removed;\n"
 "to delete it, use:"
@@ -21003,125 +12936,125 @@ msgid_plural ""
 "to delete them, use:"
 msgstr[0] ""
 "Catatan: Sebuah cabang diluar hierarki refs/remotes tidak dihapus;\n"
-"untuk menghapus itu, gunakan:"
+"untuk menghapusnya, gunakan:"
 msgstr[1] ""
 "Catatan: Beberapa cabang diluar hierarki refs/remotes tidak dihapus;\n"
-"untuk menghapus itu, gunakan:"
+"untuk menghapusnya, gunakan:"
 
-#: builtin/remote.c:926
+#: builtin/remote.c
 #, c-format
 msgid "Could not remove config section '%s'"
 msgstr "Tidak dapat menghapus bagian konfigurasi '%s'"
 
-#: builtin/remote.c:1034
+#: builtin/remote.c
 #, c-format
 msgid " new (next fetch will store in remotes/%s)"
 msgstr " baru (pengambilan berikutnya akan simpan di remotes/%s)"
 
-#: builtin/remote.c:1037
+#: builtin/remote.c
 msgid " tracked"
 msgstr " dilacak"
 
-#: builtin/remote.c:1039
+#: builtin/remote.c
 msgid " stale (use 'git remote prune' to remove)"
 msgstr " basi (gunakan 'git remote prune' untuk hapus)"
 
-#: builtin/remote.c:1041
+#: builtin/remote.c
 msgid " ???"
 msgstr " ???"
 
-#: builtin/remote.c:1082
+#: builtin/remote.c
 #, 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:1091
+#: builtin/remote.c
 #, c-format
 msgid "rebases interactively onto remote %s"
 msgstr "dasarkan ulang secara interaktif ke remote %s"
 
-#: builtin/remote.c:1093
+#: builtin/remote.c
 #, c-format
 msgid "rebases interactively (with merges) onto remote %s"
 msgstr "dasarkan ulang secara interaktif (dengan penggabungan) ke remote %s"
 
-#: builtin/remote.c:1096
+#: builtin/remote.c
 #, c-format
 msgid "rebases onto remote %s"
 msgstr "dasarkan ulang ke remote %s"
 
-#: builtin/remote.c:1100
+#: builtin/remote.c
 #, c-format
 msgid " merges with remote %s"
 msgstr " gabungkan dengan remote %s"
 
-#: builtin/remote.c:1103
+#: builtin/remote.c
 #, c-format
 msgid "merges with remote %s"
 msgstr "gabungkan dengan remote %s"
 
-#: builtin/remote.c:1106
+#: builtin/remote.c
 #, c-format
 msgid "%-*s    and with remote %s\n"
 msgstr "%-*s    dan dengan remote %s\n"
 
-#: builtin/remote.c:1149
+#: builtin/remote.c
 msgid "create"
 msgstr "buat"
 
-#: builtin/remote.c:1152
+#: builtin/remote.c
 msgid "delete"
 msgstr "hapus"
 
-#: builtin/remote.c:1156
+#: builtin/remote.c
 msgid "up to date"
 msgstr "terbaru"
 
-#: builtin/remote.c:1159
+#: builtin/remote.c
 msgid "fast-forwardable"
 msgstr "bisa dimaju cepat"
 
-#: builtin/remote.c:1162
+#: builtin/remote.c
 msgid "local out of date"
 msgstr "lokal kuno"
 
-#: builtin/remote.c:1169
+#: builtin/remote.c
 #, c-format
 msgid "    %-*s forces to %-*s (%s)"
 msgstr "    %-*s memaksa untuk %-*s (%s)"
 
-#: builtin/remote.c:1172
+#: builtin/remote.c
 #, c-format
 msgid "    %-*s pushes to %-*s (%s)"
 msgstr "    %-*s mendorong ke %-*s (%s)"
 
-#: builtin/remote.c:1176
+#: builtin/remote.c
 #, c-format
 msgid "    %-*s forces to %s"
 msgstr "    %-*s memaksa untuk %s"
 
-#: builtin/remote.c:1179
+#: builtin/remote.c
 #, c-format
 msgid "    %-*s pushes to %s"
 msgstr "    %-*s mendorong ke %s"
 
-#: builtin/remote.c:1247
+#: builtin/remote.c
 msgid "do not query remotes"
 msgstr "jangan tanyakan remote"
 
-#: builtin/remote.c:1268
+#: builtin/remote.c
 #, c-format
 msgid "* remote %s"
 msgstr "* remote %s"
 
-#: builtin/remote.c:1269
+#: builtin/remote.c
 #, c-format
 msgid "  Fetch URL: %s"
 msgstr "  URL pengambilan: %s"
 
-#: builtin/remote.c:1270 builtin/remote.c:1286 builtin/remote.c:1423
+#: builtin/remote.c
 msgid "(no URL)"
 msgstr "(tidak ada URL)"
 
@@ -21129,389 +13062,402 @@ msgstr "(tidak ada URL)"
 #. with the one in " Fetch URL: %s"
 #. translation.
 #.
-#: builtin/remote.c:1284 builtin/remote.c:1286
+#: builtin/remote.c
 #, c-format
 msgid "  Push  URL: %s"
 msgstr "  URL pendorongan: %s"
 
-#: builtin/remote.c:1288 builtin/remote.c:1290 builtin/remote.c:1292
+#: builtin/remote.c
 #, c-format
 msgid "  HEAD branch: %s"
 msgstr "  Cabang HEAD: %s"
 
-#: builtin/remote.c:1288
+#: builtin/remote.c
 msgid "(not queried)"
 msgstr "(tidak ditanyakan)"
 
-#: builtin/remote.c:1290
+#: builtin/remote.c
 msgid "(unknown)"
 msgstr "(tidak diketahui)"
 
-#: builtin/remote.c:1294
+#: builtin/remote.c
 #, 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:1306
+#: builtin/remote.c
 #, c-format
 msgid "  Remote branch:%s"
 msgid_plural "  Remote branches:%s"
 msgstr[0] "  Cabang remote:%s"
 msgstr[1] "  Cabang remote:%s"
 
-#: builtin/remote.c:1309 builtin/remote.c:1335
+#: builtin/remote.c
 msgid " (status not queried)"
 msgstr " (status tidak ditanyakan)"
 
-#: builtin/remote.c:1318
+#: builtin/remote.c
 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:1326
+#: builtin/remote.c
 msgid "  Local refs will be mirrored by 'git push'"
 msgstr "  Referensi lokal yang akan dicerminkan oleh 'git push'"
 
-#: builtin/remote.c:1332
+#: builtin/remote.c
 #, 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:1353
+#: builtin/remote.c
 msgid "set refs/remotes/<name>/HEAD according to remote"
 msgstr "setel refs/remotes/<nama>/HEAD tergantung remote"
 
-#: builtin/remote.c:1355
+#: builtin/remote.c
 msgid "delete refs/remotes/<name>/HEAD"
 msgstr "hapus refs/remotes/<nama>/HEAD"
 
-#: builtin/remote.c:1369
+#: builtin/remote.c
 msgid "Cannot determine remote HEAD"
 msgstr "Tidak dapat menentukan HEAD remote"
 
-#: builtin/remote.c:1371
+#: builtin/remote.c
 msgid "Multiple remote HEAD branches. Please choose one explicitly with:"
 msgstr "Banyak cabang HEAD remote. Mohon pilih satu secara eksplisit dengan:"
 
-#: builtin/remote.c:1381
+#: builtin/remote.c
 #, c-format
 msgid "Could not delete %s"
 msgstr "Tidak dapat menghapus %s"
 
-#: builtin/remote.c:1389
+#: builtin/remote.c
 #, c-format
 msgid "Not a valid ref: %s"
 msgstr "Bukan referensi valid: %s"
 
-#: builtin/remote.c:1391
+#: builtin/remote.c
 #, c-format
 msgid "Could not setup %s"
 msgstr "Tidak dapat mengatur %s"
 
-#: builtin/remote.c:1409
+#: builtin/remote.c
 #, c-format
 msgid " %s will become dangling!"
 msgstr " %s akan menjadi teruntai!"
 
-#: builtin/remote.c:1410
+#: builtin/remote.c
 #, c-format
 msgid " %s has become dangling!"
 msgstr " %s telah menjadi teruntai!"
 
-#: builtin/remote.c:1419
+#: builtin/remote.c
 #, c-format
 msgid "Pruning %s"
 msgstr "Memangkas %s"
 
-#: builtin/remote.c:1420
+#: builtin/remote.c
 #, c-format
 msgid "URL: %s"
 msgstr "URL: %s"
 
-#: builtin/remote.c:1436
+#: builtin/remote.c
 #, c-format
 msgid " * [would prune] %s"
 msgstr " * [akan pangkas] %s"
 
-#: builtin/remote.c:1439
+#: builtin/remote.c
 #, c-format
 msgid " * [pruned] %s"
 msgstr " * [dipangkas] %s"
 
-#: builtin/remote.c:1484
+#: builtin/remote.c
 msgid "prune remotes after fetching"
 msgstr "pangkas remote setelah pengambilan"
 
-#: builtin/remote.c:1548 builtin/remote.c:1604 builtin/remote.c:1674
+#: builtin/remote.c
 #, c-format
 msgid "No such remote '%s'"
 msgstr "Tidak ada remote seperti '%s'"
 
-#: builtin/remote.c:1566
+#: builtin/remote.c
 msgid "add branch"
 msgstr "tambah cabang"
 
-#: builtin/remote.c:1573
+#: builtin/remote.c
 msgid "no remote specified"
 msgstr "tidak ada remote yang disebutkan"
 
-#: builtin/remote.c:1590
+#: builtin/remote.c
 msgid "query push URLs rather than fetch URLs"
 msgstr "tanyakan URL pendorongan daripada URL pengambilan"
 
-#: builtin/remote.c:1592
+#: builtin/remote.c
 msgid "return all URLs"
 msgstr "kembalikan semua URL"
 
-#: builtin/remote.c:1622
+#: builtin/remote.c
 #, c-format
 msgid "no URLs configured for remote '%s'"
 msgstr "tidak ada URL yang dikonfigurasi untuk remote '%s'"
 
-#: builtin/remote.c:1648
+#: builtin/remote.c
 msgid "manipulate push URLs"
 msgstr "manipulasi URL pendorongan"
 
-#: builtin/remote.c:1650
+#: builtin/remote.c
 msgid "add URL"
 msgstr "tambah URL"
 
-#: builtin/remote.c:1652
+#: builtin/remote.c
 msgid "delete URLs"
 msgstr "hapus URL"
 
-#: builtin/remote.c:1659
+#: builtin/remote.c
 msgid "--add --delete doesn't make sense"
 msgstr "--add --delete tidak masuk akal"
 
-#: builtin/remote.c:1700
+#: builtin/remote.c
 #, c-format
 msgid "Invalid old URL pattern: %s"
 msgstr "pola URL lama tidak valid: %s"
 
-#: builtin/remote.c:1708
+#: builtin/remote.c
 #, c-format
 msgid "No such URL found: %s"
 msgstr "Tidak ada URL yang ditemukan seperti: %s"
 
-#: builtin/remote.c:1710
+#: builtin/remote.c
 msgid "Will not delete all non-push URLs"
 msgstr "Tidak akan hapus semua URL non-dorong"
 
-#: builtin/remote.c:1727
+#: builtin/remote.c
 msgid "be verbose; must be placed before a subcommand"
 msgstr "jadi lebih bertele-tele; harus ditempatkan sebelum subperintah"
 
-#: builtin/repack.c:29
+#: builtin/repack.c
 msgid "git repack [<options>]"
 msgstr "git repack [<opsi>]"
 
-#: builtin/repack.c:34
+#: builtin/repack.c
 msgid ""
 "Incremental repacks are incompatible with bitmap indexes.  Use\n"
-"--no-write-bitmap-index or disable the pack.writebitmaps configuration."
+"--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."
+" --no-write-bitmap-index atau nonaktifkan konfigurasi pack.writeBitmaps."
 
-#: builtin/repack.c:206
+#: builtin/repack.c
 msgid "could not start pack-objects to repack promisor objects"
 msgstr "tidak dapat memulai pack-objects untuk mengepak ulang objek pejanji"
 
-#: builtin/repack.c:280 builtin/repack.c:824
+#: builtin/repack.c
 msgid "repack: Expecting full hex object ID lines only from pack-objects."
 msgstr "repack: Mengharapkan baris ID objek hex penuh hanya dari pack-objects."
 
-#: builtin/repack.c:304
+#: builtin/repack.c
 msgid "could not finish pack-objects to repack promisor objects"
 msgstr ""
 "tidak dapat menyelesaikan pack-objects untuk mengepak ulang objek pejanji"
 
-#: builtin/repack.c:319
+#: builtin/repack.c
 #, c-format
 msgid "cannot open index for %s"
 msgstr "tidak dapat membuka indeks untuk %s"
 
-#: builtin/repack.c:378
+#: builtin/repack.c
 #, c-format
 msgid "pack %s too large to consider in geometric progression"
 msgstr "pak %s terlalu besar untuk dipertimbangkan dalam deret geometri"
 
-#: builtin/repack.c:411 builtin/repack.c:418 builtin/repack.c:423
+#: builtin/repack.c
 #, c-format
 msgid "pack %s too large to roll up"
 msgstr "pak %s terlalu besar untuk digulung"
 
-#: builtin/repack.c:503
+#: builtin/repack.c
 #, c-format
 msgid "could not open tempfile %s for writing"
 msgstr "tidak dapat membuka berkas sementara '%s' untuk ditulis"
 
-#: builtin/repack.c:521
+#: builtin/repack.c
 msgid "could not close refs snapshot tempfile"
 msgstr "tidak dapat menutup berkas sementara jepretan referensi"
 
-#: builtin/repack.c:634
+#: builtin/repack.c
 msgid "pack everything in a single pack"
 msgstr "pak semuanya dalam satu pak"
 
-#: builtin/repack.c:636
+#: builtin/repack.c
 msgid "same as -a, and turn unreachable objects loose"
 msgstr "sama seperti -a, dan jadikan objek yang tak dapat dicapai longgar"
 
-#: builtin/repack.c:639
+#: builtin/repack.c
+msgid "same as -a, pack unreachable cruft objects separately"
+msgstr "sama seperti -a, dan jadikan objek sisa yang tak dapat dicapai longgar"
+
+#: builtin/repack.c
+msgid "approxidate"
+msgstr "tanggal aproksimasi"
+
+#: builtin/repack.c
+msgid "with -C, expire objects older than this"
+msgstr "dengan -C, jangan kadaluarsakan objek lebih lama dari ini"
+
+#: builtin/repack.c
 msgid "remove redundant packs, and run git-prune-packed"
 msgstr "hapus pak berlebihan, dan jalankan git-prune-packed"
 
-#: builtin/repack.c:641
+#: builtin/repack.c
 msgid "pass --no-reuse-delta to git-pack-objects"
 msgstr "lewatkan --no-reuse-delta ke git-pack-objects"
 
-#: builtin/repack.c:643
+#: builtin/repack.c
 msgid "pass --no-reuse-object to git-pack-objects"
 msgstr "lewatkan --no-reuse-object ke git-pack-objects"
 
-#: builtin/repack.c:645
+#: builtin/repack.c
 msgid "do not run git-update-server-info"
 msgstr "jangan jalankan git-update-server-info"
 
-#: builtin/repack.c:648
+#: builtin/repack.c
 msgid "pass --local to git-pack-objects"
 msgstr "lewatkan --local ke git-pack-objects"
 
-#: builtin/repack.c:650
+#: builtin/repack.c
 msgid "write bitmap index"
 msgstr "tulis indeks bitmap"
 
-#: builtin/repack.c:652
+#: builtin/repack.c
 msgid "pass --delta-islands to git-pack-objects"
 msgstr "lewatkan --delta-islands ke git-pack-objects"
 
-#: builtin/repack.c:653
-msgid "approxidate"
-msgstr "tanggal aproksimasi"
-
-#: builtin/repack.c:654
+#: builtin/repack.c
 msgid "with -A, do not loosen objects older than this"
 msgstr "dengan -A, jangan longgarkan objek lebih lama dari ini"
 
-#: builtin/repack.c:656
+#: builtin/repack.c
 msgid "with -a, repack unreachable objects"
 msgstr "dengan -a, pak ulang objek yang tak dapat dicapai"
 
-#: builtin/repack.c:658
+#: builtin/repack.c
 msgid "size of the window used for delta compression"
 msgstr "ukuran jendela yang digunakan untuk kompresi delta"
 
-#: builtin/repack.c:659 builtin/repack.c:665
+#: builtin/repack.c
 msgid "bytes"
 msgstr "bita"
 
-#: builtin/repack.c:660
+#: builtin/repack.c
 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:662
+#: builtin/repack.c
 msgid "limits the maximum delta depth"
 msgstr "batasi kedalaman delta maksimum"
 
-#: builtin/repack.c:664
+#: builtin/repack.c
 msgid "limits the maximum number of threads"
 msgstr "batasi jumlah utas maksimum"
 
-#: builtin/repack.c:666
+#: builtin/repack.c
 msgid "maximum size of each packfile"
 msgstr "ukuran maksimum setiap berkas pak"
 
-#: builtin/repack.c:668
+#: builtin/repack.c
 msgid "repack objects in packs marked with .keep"
 msgstr "pak ulang objek dalam pak yang ditandai dengan .keep"
 
-#: builtin/repack.c:670
+#: builtin/repack.c
 msgid "do not repack this pack"
 msgstr "jangan pak ulang pak ini"
 
-#: builtin/repack.c:672
+#: builtin/repack.c
 msgid "find a geometric progression with factor <N>"
 msgstr "temukan deret geometri dengan faktor <N>"
 
-#: builtin/repack.c:674
+#: builtin/repack.c
 msgid "write a multi-pack index of the resulting packs"
 msgstr "tulis indeks multipak dari pak yang dihasilkan"
 
-#: builtin/repack.c:684
+#: builtin/repack.c
 msgid "cannot delete packs in a precious-objects repo"
 msgstr "tidak dapat menghapus pak dalam repositori objek berharga"
 
-#: builtin/repack.c:833
+#: builtin/repack.c
 msgid "Nothing new to pack."
 msgstr "Tidak ada yang baru untuk dipak."
 
-#: builtin/repack.c:863
+#: builtin/repack.c
+#, c-format
+msgid "pack prefix %s does not begin with objdir %s"
+msgstr "nama berkas paket %s tidak diawali dengan %s"
+
+#: builtin/repack.c
 #, c-format
 msgid "missing required file: %s"
 msgstr "berkas yang diperlukan hilang: %s"
 
-#: builtin/repack.c:865
+#: builtin/repack.c
 #, c-format
 msgid "could not unlink: %s"
 msgstr "tidak dapat membatal taut: %s"
 
-#: builtin/replace.c:22
+#: builtin/replace.c
 msgid "git replace [-f] <object> <replacement>"
 msgstr ""
 
-#: builtin/replace.c:23
+#: builtin/replace.c
 msgid "git replace [-f] --edit <object>"
 msgstr ""
 
-#: builtin/replace.c:24
+#: builtin/replace.c
 msgid "git replace [-f] --graft <commit> [<parent>...]"
 msgstr ""
 
-#: builtin/replace.c:26
+#: builtin/replace.c
 msgid "git replace -d <object>..."
 msgstr ""
 
-#: builtin/replace.c:27
+#: builtin/replace.c
 msgid "git replace [--format=<format>] [-l [<pattern>]]"
 msgstr ""
 
-#: builtin/replace.c:90
+#: builtin/replace.c
 #, c-format
 msgid ""
 "invalid replace format '%s'\n"
 "valid formats are 'short', 'medium' and 'long'"
 msgstr ""
 
-#: builtin/replace.c:125
+#: builtin/replace.c
 #, c-format
 msgid "replace ref '%s' not found"
 msgstr ""
 
-#: builtin/replace.c:141
+#: builtin/replace.c
 #, c-format
 msgid "Deleted replace ref '%s'"
 msgstr ""
 
-#: builtin/replace.c:153
+#: builtin/replace.c
 #, c-format
 msgid "'%s' is not a valid ref name"
 msgstr ""
 
-#: builtin/replace.c:158
+#: builtin/replace.c
 #, c-format
 msgid "replace ref '%s' already exists"
 msgstr ""
 
-#: builtin/replace.c:178
+#: builtin/replace.c
 #, c-format
 msgid ""
 "Objects must be of the same type.\n"
@@ -21519,319 +13465,318 @@ msgid ""
 "while '%s' points to a replacement object of type '%s'."
 msgstr ""
 
-#: builtin/replace.c:229
+#: builtin/replace.c
 #, c-format
 msgid "unable to open %s for writing"
 msgstr ""
 
-#: builtin/replace.c:242
+#: builtin/replace.c
 msgid "cat-file reported failure"
 msgstr ""
 
-#: builtin/replace.c:258
+#: builtin/replace.c
 #, c-format
 msgid "unable to open %s for reading"
 msgstr ""
 
-#: builtin/replace.c:271
+#: builtin/replace.c
 msgid "unable to spawn mktree"
 msgstr ""
 
-#: builtin/replace.c:275
+#: builtin/replace.c
 msgid "unable to read from mktree"
 msgstr ""
 
-#: builtin/replace.c:284
+#: builtin/replace.c
 msgid "mktree reported failure"
 msgstr ""
 
-#: builtin/replace.c:288
+#: builtin/replace.c
 msgid "mktree did not return an object name"
 msgstr ""
 
-#: builtin/replace.c:297
+#: builtin/replace.c
 #, c-format
 msgid "unable to fstat %s"
 msgstr ""
 
-#: builtin/replace.c:302
+#: builtin/replace.c
 msgid "unable to write object to database"
 msgstr ""
 
-#: builtin/replace.c:325
+#: builtin/replace.c
 #, c-format
 msgid "unable to get object type for %s"
 msgstr ""
 
-#: builtin/replace.c:341
+#: builtin/replace.c
 msgid "editing object file failed"
 msgstr ""
 
-#: builtin/replace.c:350
+#: builtin/replace.c
 #, c-format
 msgid "new object is the same as the old one: '%s'"
 msgstr ""
 
-#: builtin/replace.c:383
+#: builtin/replace.c
 #, c-format
 msgid "could not parse %s as a commit"
 msgstr ""
 
-#: builtin/replace.c:415
+#: builtin/replace.c
 #, c-format
 msgid "bad mergetag in commit '%s'"
 msgstr ""
 
-#: builtin/replace.c:417
+#: builtin/replace.c
 #, c-format
 msgid "malformed mergetag in commit '%s'"
 msgstr ""
 
-#: builtin/replace.c:429
+#: builtin/replace.c
 #, c-format
 msgid ""
 "original commit '%s' contains mergetag '%s' that is discarded; use --edit "
 "instead of --graft"
 msgstr ""
 
-#: builtin/replace.c:468
+#: builtin/replace.c
 #, c-format
 msgid "the original commit '%s' has a gpg signature"
 msgstr ""
 
-#: builtin/replace.c:469
+#: builtin/replace.c
 msgid "the signature will be removed in the replacement commit!"
 msgstr ""
 
-#: builtin/replace.c:479
+#: builtin/replace.c
 #, c-format
 msgid "could not write replacement commit for: '%s'"
 msgstr ""
 
-#: builtin/replace.c:487
+#: builtin/replace.c
 #, c-format
 msgid "graft for '%s' unnecessary"
 msgstr ""
 
-#: builtin/replace.c:491
+#: builtin/replace.c
 #, c-format
 msgid "new commit is the same as the old one: '%s'"
 msgstr ""
 
-#: builtin/replace.c:526
+#: builtin/replace.c
 #, c-format
 msgid ""
 "could not convert the following graft(s):\n"
 "%s"
 msgstr ""
 
-#: builtin/replace.c:547
+#: builtin/replace.c
 msgid "list replace refs"
 msgstr ""
 
-#: builtin/replace.c:548
+#: builtin/replace.c
 msgid "delete replace refs"
 msgstr ""
 
-#: builtin/replace.c:549
+#: builtin/replace.c
 msgid "edit existing object"
 msgstr ""
 
-#: builtin/replace.c:550
+#: builtin/replace.c
 msgid "change a commit's parents"
 msgstr ""
 
-#: builtin/replace.c:551
+#: builtin/replace.c
 msgid "convert existing graft file"
 msgstr ""
 
-#: builtin/replace.c:552
+#: builtin/replace.c
 msgid "replace the ref if it exists"
 msgstr ""
 
-#: builtin/replace.c:554
+#: builtin/replace.c
 msgid "do not pretty-print contents for --edit"
 msgstr ""
 
-#: builtin/replace.c:555
+#: builtin/replace.c
 msgid "use this format"
 msgstr ""
 
-#: builtin/replace.c:568
+#: builtin/replace.c
 msgid "--format cannot be used when not listing"
 msgstr ""
 
-#: builtin/replace.c:576
+#: builtin/replace.c
 msgid "-f only makes sense when writing a replacement"
 msgstr ""
 
-#: builtin/replace.c:580
+#: builtin/replace.c
 msgid "--raw only makes sense with --edit"
 msgstr ""
 
-#: builtin/replace.c:586
+#: builtin/replace.c
 msgid "-d needs at least one argument"
 msgstr ""
 
-#: builtin/replace.c:592
+#: builtin/replace.c
 msgid "bad number of arguments"
 msgstr ""
 
-#: builtin/replace.c:598
+#: builtin/replace.c
 msgid "-e needs exactly one argument"
 msgstr ""
 
-#: builtin/replace.c:604
+#: builtin/replace.c
 msgid "-g needs at least one argument"
 msgstr ""
 
-#: builtin/replace.c:610
+#: builtin/replace.c
 msgid "--convert-graft-file takes no argument"
 msgstr ""
 
-#: builtin/replace.c:616
+#: builtin/replace.c
 msgid "only one pattern can be given with -l"
 msgstr ""
 
-#: builtin/rerere.c:13
+#: builtin/rerere.c
 msgid "git rerere [clear | forget <path>... | status | remaining | diff | gc]"
 msgstr ""
 
-#: builtin/rerere.c:58
+#: builtin/rerere.c
 msgid "register clean resolutions in index"
 msgstr ""
 
-#: builtin/rerere.c:77
+#: builtin/rerere.c
 msgid "'git rerere forget' without paths is deprecated"
 msgstr ""
 
-#: builtin/rerere.c:111
+#: builtin/rerere.c
 #, c-format
 msgid "unable to generate diff for '%s'"
 msgstr ""
 
-#: builtin/reset.c:33
+#: builtin/reset.c
 msgid ""
 "git reset [--mixed | --soft | --hard | --merge | --keep] [-q] [<commit>]"
 msgstr ""
 "git reset [--mixed | --soft | --hard | --merge | --keep] [-q] [<komit>]"
 
-#: builtin/reset.c:34
+#: builtin/reset.c
 msgid "git reset [-q] [<tree-ish>] [--] <pathspec>..."
 msgstr "git reset [-q] [<mirip-pohon>] [--] <spek jalur>..."
 
-#: builtin/reset.c:35
+#: builtin/reset.c
 msgid ""
 "git reset [-q] [--pathspec-from-file [--pathspec-file-nul]] [<tree-ish>]"
 msgstr ""
 "git reset [-q] [--pathspec-from-file [--pathspec-file-nul]] [<mirip-pohon>]"
 
-#: builtin/reset.c:36
+#: builtin/reset.c
 msgid "git reset --patch [<tree-ish>] [--] [<pathspec>...]"
 msgstr "git reset --patch [<mirip-pohon>] [--] [<pathspec>...]"
 
-#: builtin/reset.c:42
+#: builtin/reset.c
 msgid "mixed"
 msgstr "campuran"
 
-#: builtin/reset.c:42
+#: builtin/reset.c
 msgid "soft"
 msgstr "lunak"
 
-#: builtin/reset.c:42
+#: builtin/reset.c
 msgid "hard"
 msgstr "keras"
 
-#: builtin/reset.c:42
+#: builtin/reset.c
 msgid "merge"
 msgstr "gabungan"
 
-#: builtin/reset.c:42
+#: builtin/reset.c
 msgid "keep"
 msgstr "simpan"
 
-#: builtin/reset.c:90
+#: builtin/reset.c
 msgid "You do not have a valid HEAD."
 msgstr "Anda tidak punya HEAD yang valid."
 
-#: builtin/reset.c:92
+#: builtin/reset.c
 msgid "Failed to find tree of HEAD."
 msgstr "Gagal menemukan pohon HEAD."
 
-#: builtin/reset.c:98
+#: builtin/reset.c
 #, c-format
 msgid "Failed to find tree of %s."
 msgstr "Gagal menemukan pohon dari %s."
 
-#: builtin/reset.c:123
+#: builtin/reset.c
 #, c-format
 msgid "HEAD is now at %s"
 msgstr "HEAD sekarang pada %s"
 
-#: builtin/reset.c:304
+#: builtin/reset.c
 #, 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:402 builtin/stash.c:606 builtin/stash.c:669
-#: builtin/stash.c:693
+#: builtin/reset.c builtin/stash.c
 msgid "be quiet, only report errors"
 msgstr "diam, hanya laporkan kesalahan"
 
-#: builtin/reset.c:404
+#: builtin/reset.c
 msgid "skip refreshing the index after reset"
 msgstr ""
 
-#: builtin/reset.c:406
+#: builtin/reset.c
 msgid "reset HEAD and index"
 msgstr "setel ulang HEAD dan indeks"
 
-#: builtin/reset.c:407
+#: builtin/reset.c
 msgid "reset only HEAD"
 msgstr "hanya setel ulang HEAD"
 
-#: builtin/reset.c:409 builtin/reset.c:411
+#: builtin/reset.c
 msgid "reset HEAD, index and working tree"
 msgstr "setel ulang HEAD, indeks dan pohon kerja"
 
-#: builtin/reset.c:413
+#: builtin/reset.c
 msgid "reset HEAD but keep local changes"
 msgstr "setel ulang HEAD tapi simpan perubahan lokal"
 
-#: builtin/reset.c:419
+#: builtin/reset.c
 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:452
+#: builtin/reset.c
 #, c-format
 msgid "Failed to resolve '%s' as a valid revision."
 msgstr "Gagal menguraikan '%s' sebagai revisi yang valid."
 
-#: builtin/reset.c:460
+#: builtin/reset.c
 #, c-format
 msgid "Failed to resolve '%s' as a valid tree."
 msgstr "Gagal menguraikan '%s' sebagaikan pohon yang valid."
 
-#: builtin/reset.c:479
+#: builtin/reset.c
 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:481
+#: builtin/reset.c
 #, c-format
 msgid "Cannot do %s reset with paths."
 msgstr "Tidak dapat lakukan reset %s dengan jalur."
 
-#: builtin/reset.c:496
+#: builtin/reset.c
 #, c-format
 msgid "%s reset is not allowed in a bare repository"
 msgstr "Reset %s tidak diperbolehkan dalam repositori bare"
 
-#: builtin/reset.c:527
+#: builtin/reset.c
 msgid "Unstaged changes after reset:"
 msgstr "Perubahan tak tergelar setelah setel ulang:"
 
-#: builtin/reset.c:530
+#: builtin/reset.c
 #, c-format
 msgid ""
 "It took %.2f seconds to refresh the index after reset.  You can use\n"
@@ -21840,53 +13785,58 @@ msgstr ""
 "Butuh %.2f detik untuk menyegarkan indeks setelah penyetelan ulang.\n"
 "Anda bisa gunakan '--no-refresh' untuk menghindari hal tersebut."
 
-#: builtin/reset.c:547
+#: builtin/reset.c
 #, c-format
 msgid "Could not reset index file to revision '%s'."
 msgstr "Tidak dapat menyetel ulang berkas indeks ke revisi '%s'."
 
-#: builtin/reset.c:552
+#: builtin/reset.c
 msgid "Could not write new index file."
 msgstr "Tidak dapat menulis berkas indeks baru."
 
-#: builtin/rev-list.c:659
+#: builtin/rev-list.c pack-bitmap.c
+#, c-format
+msgid "unable to get disk usage of %s"
+msgstr ""
+
+#: builtin/rev-list.c
 msgid "rev-list does not support display of notes"
 msgstr "rev-list tidak mendukung penampilan catatan"
 
-#: builtin/rev-list.c:664
+#: builtin/rev-list.c
 #, c-format
 msgid "marked counting and '%s' cannot be used together"
 msgstr "hitungan tertanda dan '%s' tidak dapat digunakan bersamaan."
 
-#: builtin/rev-parse.c:409
+#: builtin/rev-parse.c
 msgid "git rev-parse --parseopt [<options>] -- [<args>...]"
 msgstr "git rev-parse --parseopt [<opsi>] -- [<argumen>...]"
 
-#: builtin/rev-parse.c:414
+#: builtin/rev-parse.c
 msgid "keep the `--` passed as an arg"
 msgstr "tetap `--` dilewatkan sebagai argumen"
 
-#: builtin/rev-parse.c:416
+#: builtin/rev-parse.c
 msgid "stop parsing after the first non-option argument"
 msgstr "hentikan penguraian setelah argumen non-opsi pertama"
 
-#: builtin/rev-parse.c:419
+#: builtin/rev-parse.c
 msgid "output in stuck long form"
 msgstr "keluarkan dalam bentuk lengket panjang"
 
-#: builtin/rev-parse.c:438
+#: builtin/rev-parse.c
 msgid "premature end of input"
 msgstr "akhir masukan prematur"
 
-#: builtin/rev-parse.c:442
+#: builtin/rev-parse.c
 msgid "no usage string given before the `--' separator"
 msgstr "tidak ada untai penggunaan yang diberikan sebelum pemisah `--'"
 
-#: builtin/rev-parse.c:548
+#: builtin/rev-parse.c
 msgid "Needed a single revision"
 msgstr "Butuh satu revisi"
 
-#: builtin/rev-parse.c:552
+#: builtin/rev-parse.c
 msgid ""
 "git rev-parse --parseopt [<options>] -- [<args>...]\n"
 "   or: git rev-parse --sq-quote [<arg>...]\n"
@@ -21900,145 +13850,153 @@ msgstr ""
 "Jalankan \"git rev-parse --parseopt -h\" untuk informasi lebih lanjut pada "
 "penggunaan pertama."
 
-#: builtin/rev-parse.c:712
+#: builtin/rev-parse.c
 msgid "--resolve-git-dir requires an argument"
 msgstr "--resolve-git-dir butuh sebuah argumen"
 
-#: builtin/rev-parse.c:715
+#: builtin/rev-parse.c
 #, c-format
 msgid "not a gitdir '%s'"
 msgstr "bukan sebuah gitdir '%s'"
 
-#: builtin/rev-parse.c:739
+#: builtin/rev-parse.c
 msgid "--git-path requires an argument"
 msgstr "--git-path buth sebuah argumen"
 
-#: builtin/rev-parse.c:749
+#: builtin/rev-parse.c
 msgid "-n requires an argument"
 msgstr "-n butuh sebuah argumen"
 
-#: builtin/rev-parse.c:763
+#: builtin/rev-parse.c
 msgid "--path-format requires an argument"
 msgstr "--path-format butuh sebuah argumen"
 
-#: builtin/rev-parse.c:769
+#: builtin/rev-parse.c
 #, c-format
 msgid "unknown argument to --path-format: %s"
 msgstr "argumen ke --path-format tidak dikenal: %s"
 
-#: builtin/rev-parse.c:776
+#: builtin/rev-parse.c
 msgid "--default requires an argument"
 msgstr "--default butuh sebuah argumen"
 
-#: builtin/rev-parse.c:782
+#: builtin/rev-parse.c
 msgid "--prefix requires an argument"
 msgstr "--prefix butuh sebuah argumen"
 
-#: builtin/rev-parse.c:851
+#: builtin/rev-parse.c
 #, c-format
 msgid "unknown mode for --abbrev-ref: %s"
 msgstr "mode untuk --abbrev-ref tidak dikenal: %s"
 
-#: builtin/rev-parse.c:1023
+#: builtin/rev-parse.c setup.c
+msgid "this operation must be run in a work tree"
+msgstr "operasi ini harus dijalankan di dalam pohon kerja"
+
+#: builtin/rev-parse.c
 #, c-format
 msgid "unknown mode for --show-object-format: %s"
 msgstr "mode untuk --show-object-format tidak dikenal: %s"
 
-#: builtin/revert.c:24
+#: builtin/revert.c
 msgid "git revert [<options>] <commit-ish>..."
 msgstr "git revert [<opsi>] <mirip-komit>..."
 
-#: builtin/revert.c:25
+#: builtin/revert.c
 msgid "git revert <subcommand>"
 msgstr "git revert <subperintah>"
 
-#: builtin/revert.c:30
+#: builtin/revert.c
 msgid "git cherry-pick [<options>] <commit-ish>..."
 msgstr "git cherry-pick [<opsi>] <mirip-komit>..."
 
-#: builtin/revert.c:31
+#: builtin/revert.c
 msgid "git cherry-pick <subcommand>"
 msgstr "git cherry-pick <subperintah>"
 
-#: builtin/revert.c:72
+#: builtin/revert.c
 #, c-format
 msgid "option `%s' expects a number greater than zero"
 msgstr "opsi `%s' harap sebuah angka lebih dari nol"
 
-#: builtin/revert.c:92
+#: builtin/revert.c
 #, c-format
 msgid "%s: %s cannot be used with %s"
 msgstr "%s: %s tidak dapat digunakan dengan %s"
 
-#: builtin/revert.c:102
+#: builtin/revert.c
 msgid "end revert or cherry-pick sequence"
 msgstr "akhiri rangkaian pembalikan atau pemetikan ceri"
 
-#: builtin/revert.c:103
+#: builtin/revert.c
 msgid "resume revert or cherry-pick sequence"
 msgstr "lanjutkan rangkaian pembalikan atau pemetikan ceri"
 
-#: builtin/revert.c:104
+#: builtin/revert.c
 msgid "cancel revert or cherry-pick sequence"
 msgstr "batalkan rangkaian pembalikan atau pemetikan ceri"
 
-#: builtin/revert.c:105
+#: builtin/revert.c
 msgid "skip current commit and continue"
 msgstr "lewati komit saat ini dan lanjutkan"
 
-#: builtin/revert.c:107
+#: builtin/revert.c
 msgid "don't automatically commit"
 msgstr "jangan komit otomatis"
 
-#: builtin/revert.c:108
+#: builtin/revert.c
 msgid "edit the commit message"
 msgstr "sunting pesan komit"
 
-#: builtin/revert.c:111
+#: builtin/revert.c
 msgid "parent-number"
 msgstr "nomor-induk"
 
-#: builtin/revert.c:112
+#: builtin/revert.c
 msgid "select mainline parent"
 msgstr "pilih induk garis utama"
 
-#: builtin/revert.c:114
+#: builtin/revert.c
 msgid "merge strategy"
 msgstr "strategi penggabungan"
 
-#: builtin/revert.c:116
+#: builtin/revert.c
 msgid "option for merge strategy"
 msgstr "opsi untuk strategi penggabungan"
 
-#: builtin/revert.c:125
+#: builtin/revert.c
 msgid "append commit name"
 msgstr "tambahkan nama komit"
 
-#: builtin/revert.c:127
+#: builtin/revert.c
 msgid "preserve initially empty commits"
 msgstr "pertahankan komit kosong awal"
 
-#: builtin/revert.c:128
+#: builtin/revert.c
 msgid "allow commits with empty messages"
 msgstr "perbolehkan komit dengan pesan kosong"
 
-#: builtin/revert.c:129
+#: builtin/revert.c
 msgid "keep redundant, empty commits"
 msgstr "simpan komit kosong mubazir"
 
-#: builtin/revert.c:241
+#: builtin/revert.c
+msgid "use the 'reference' format to refer to commits"
+msgstr ""
+
+#: builtin/revert.c
 msgid "revert failed"
 msgstr "pembalikan gagal"
 
-#: builtin/revert.c:254
+#: builtin/revert.c
 msgid "cherry-pick failed"
 msgstr "pemetikan ceri gagal"
 
-#: builtin/rm.c:20
+#: builtin/rm.c
 msgid "git rm [<options>] [--] <file>..."
 msgstr "git rm [<opsi>] [--] <berkas>..."
 
-#: builtin/rm.c:208
+#: builtin/rm.c
 msgid ""
 "the following file has staged content different from both the\n"
 "file and the HEAD:"
@@ -22052,7 +14010,7 @@ msgstr[1] ""
 "berkas berikut punya konten tergelar yang berbeda dengan baik\n"
 "berkas dan HEAD:"
 
-#: builtin/rm.c:213
+#: builtin/rm.c
 msgid ""
 "\n"
 "(use -f to force removal)"
@@ -22060,13 +14018,13 @@ msgstr ""
 "\n"
 "(gunakan -f untuk paksa hapus)"
 
-#: builtin/rm.c:217
+#: builtin/rm.c
 msgid "the following file has changes staged in the index:"
 msgid_plural "the following files have changes staged in the index:"
 msgstr[0] "berkas berikut punya perubahan tergelar dalam indeks:"
 msgstr[1] "berkas berikut punya perubahan tergelar dalam indeks:"
 
-#: builtin/rm.c:221 builtin/rm.c:230
+#: builtin/rm.c
 msgid ""
 "\n"
 "(use --cached to keep the file, or -f to force removal)"
@@ -22074,53 +14032,52 @@ msgstr ""
 "\n"
 "(gunakan --cached untuk jaga berkas, atau -f untuk paksa hapus)"
 
-#: builtin/rm.c:227
+#: builtin/rm.c
 msgid "the following file has local modifications:"
 msgid_plural "the following files have local modifications:"
 msgstr[0] "berkas berikut punya modifikasi lokal:"
 msgstr[1] "berkas berikut punya modifikasi lokal:"
 
-#: builtin/rm.c:245
+#: builtin/rm.c
 msgid "do not list removed files"
 msgstr "jangan daftar berkas terhapus"
 
-#: builtin/rm.c:246
+#: builtin/rm.c
 msgid "only remove from the index"
 msgstr "hanya hapus dari indeks"
 
-#: builtin/rm.c:247
+#: builtin/rm.c
 msgid "override the up-to-date check"
 msgstr "timpa pemeriksaan terbaru"
 
-#: builtin/rm.c:248
+#: builtin/rm.c
 msgid "allow recursive removal"
 msgstr "perbolehkan penghapusan rekursif"
 
-#: builtin/rm.c:250
+#: builtin/rm.c
 msgid "exit with a zero status even if nothing matched"
 msgstr "keluar dengan nol bahkan jika tidak ada yang cocok"
 
-#: builtin/rm.c:285
+#: builtin/rm.c
 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:315
+#: builtin/rm.c
 msgid "please stage your changes to .gitmodules or stash them to proceed"
-msgstr ""
-"mohon gelar perubahan Anda ke .gitmodules atau stase itu untuk melanjutkan"
+msgstr "mohon gelar perubahan Anda ke .gitmodules atau stase untuk melanjutkan"
 
-#: builtin/rm.c:337
+#: builtin/rm.c
 #, c-format
 msgid "not removing '%s' recursively without -r"
 msgstr "tidak menghapus '%s' secara rekursif tanpa -r"
 
-#: builtin/rm.c:385
+#: builtin/rm.c
 #, c-format
 msgid "git rm: unable to remove %s"
 msgstr "git rm: tidak dapat menghapus %s"
 
-#: builtin/send-pack.c:20
+#: builtin/send-pack.c
 msgid ""
 "git send-pack [--mirror] [--dry-run] [--force]\n"
 "              [--receive-pack=<git-receive-pack>]\n"
@@ -22132,80 +14089,80 @@ msgstr ""
 "]              [--verbose] [--thin] [--atomic]\n"
 "              [<tuan rumah>:]<direktori> (--all | <referensi>...)"
 
-#: builtin/send-pack.c:192
+#: builtin/send-pack.c
 msgid "remote name"
 msgstr "nama remote"
 
-#: builtin/send-pack.c:205
+#: builtin/send-pack.c
 msgid "use stateless RPC protocol"
 msgstr "gunakan protokol RPC nirkeadaan"
 
-#: builtin/send-pack.c:206
+#: builtin/send-pack.c
 msgid "read refs from stdin"
 msgstr "baca referensi dari masukan standar"
 
-#: builtin/send-pack.c:207
+#: builtin/send-pack.c
 msgid "print status from remote helper"
 msgstr "cetak status dari pembantu remote"
 
-#: builtin/shortlog.c:16
+#: builtin/shortlog.c
 msgid "git shortlog [<options>] [<revision-range>] [[--] <path>...]"
 msgstr "git shortlog [<opsi>] [<rentang revisi>] [[--] <jalur>...]"
 
-#: builtin/shortlog.c:17
+#: builtin/shortlog.c
 msgid "git log --pretty=short | git shortlog [<options>]"
 msgstr "git log --pretty=short | git shortlog [<opsi>]"
 
-#: builtin/shortlog.c:123
+#: builtin/shortlog.c
 msgid "using multiple --group options with stdin is not supported"
 msgstr "menggunakan banyak opsi --group dengan masukan standar tidak didukung"
 
-#: builtin/shortlog.c:133
+#: builtin/shortlog.c
 msgid "using --group=trailer with stdin is not supported"
 msgstr "mengguanakn --group=trailer dengan stdin tidak didukung"
 
-#: builtin/shortlog.c:323
+#: builtin/shortlog.c
 #, c-format
 msgid "unknown group type: %s"
 msgstr "tipe kelompok tidak dikenal: %s"
 
-#: builtin/shortlog.c:351
+#: builtin/shortlog.c
 msgid "group by committer rather than author"
 msgstr "kelompokkan oleh pengkomit daripada pengarang"
 
-#: builtin/shortlog.c:354
+#: builtin/shortlog.c
 msgid "sort output according to the number of commits per author"
 msgstr "urutkan keluaran berdasarkan jumlah komit per pengarang"
 
-#: builtin/shortlog.c:356
+#: builtin/shortlog.c
 msgid "suppress commit descriptions, only provides commit count"
 msgstr "sembunyikan deskripsi komit, hanya sediakan hitungan komit"
 
-#: builtin/shortlog.c:358
+#: builtin/shortlog.c
 msgid "show the email address of each author"
 msgstr "perlihatkan alamat email setiap pengarang"
 
-#: builtin/shortlog.c:359
+#: builtin/shortlog.c
 msgid "<w>[,<i1>[,<i2>]]"
 msgstr "<w>[,<i1>[,<i2>]]"
 
-#: builtin/shortlog.c:360
+#: builtin/shortlog.c
 msgid "linewrap output"
 msgstr "bungkus-baris keluaran"
 
-#: builtin/shortlog.c:362
+#: builtin/shortlog.c
 msgid "field"
 msgstr "bidang"
 
-#: builtin/shortlog.c:363
+#: builtin/shortlog.c
 msgid "group by field"
 msgstr "kelompokkan oleh bidang"
 
-#: builtin/shortlog.c:395
+#: builtin/shortlog.c
 msgid "too many arguments given outside repository"
 msgstr "terlalu banyak argumen diberikan di luar repositori"
 
-#: builtin/show-branch.c:14
+#: builtin/show-branch.c
 msgid ""
 "git show-branch [-a | --all] [-r | --remotes] [--topo-order | --date-order]\n"
 "                [--current] [--color[=<when>] | --no-color] [--sparse]\n"
@@ -22217,133 +14174,133 @@ msgstr ""
 "                [--more=<n> | --list | --independent | --merge-base]\n"
 "                [--no-name | --sha1-name] [--topics] [(<revisi> | <glob>)...]"
 
-#: builtin/show-branch.c:18
+#: builtin/show-branch.c
 msgid "git show-branch (-g | --reflog)[=<n>[,<base>]] [--list] [<ref>]"
 msgstr "git show-branch (-g | --reflog)[=<n>[,<dasar>]] [--list] [<referensi>]"
 
-#: builtin/show-branch.c:396
+#: builtin/show-branch.c
 #, c-format
 msgid "ignoring %s; cannot handle more than %d ref"
 msgid_plural "ignoring %s; cannot handle more than %d refs"
 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
 #, 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
 msgid "show remote-tracking and local branches"
 msgstr "perlihatkan cabang pelacak remote dan lokal"
 
-#: builtin/show-branch.c:647
+#: builtin/show-branch.c
 msgid "show remote-tracking branches"
 msgstr "perlihatkan cabang pelacak remote"
 
-#: builtin/show-branch.c:649
+#: builtin/show-branch.c
 msgid "color '*!+-' corresponding to the branch"
 msgstr "warna '*!+-' bersesuaian pada cabang"
 
-#: builtin/show-branch.c:651
+#: builtin/show-branch.c
 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
 msgid "synonym to more=-1"
 msgstr "sinonim untuk more=-1"
 
-#: builtin/show-branch.c:654
+#: builtin/show-branch.c
 msgid "suppress naming strings"
 msgstr "sembunyikan untai penamaan"
 
-#: builtin/show-branch.c:656
+#: builtin/show-branch.c
 msgid "include the current branch"
 msgstr "masukkan cabang saat ini"
 
-#: builtin/show-branch.c:658
+#: builtin/show-branch.c
 msgid "name commits with their object names"
 msgstr "namai komit dengan nama objeknya"
 
-#: builtin/show-branch.c:660
+#: builtin/show-branch.c
 msgid "show possible merge bases"
 msgstr "perlihatkan dasar penggabungan yang mungkin"
 
-#: builtin/show-branch.c:662
+#: builtin/show-branch.c
 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
 msgid "show commits in topological order"
 msgstr "perlihatkan komit dalam urutan topologis"
 
-#: builtin/show-branch.c:667
+#: builtin/show-branch.c
 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
 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
 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
 msgid "<n>[,<base>]"
 msgstr "<n>[,<dasar>]"
 
-#: builtin/show-branch.c:675
+#: builtin/show-branch.c
 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:735
+#: builtin/show-branch.c
 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
 msgid "--reflog option needs one branch name"
 msgstr "opsi --reflog butuh satu nama cabang"
 
-#: builtin/show-branch.c:741
+#: builtin/show-branch.c
 #, 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
 #, c-format
 msgid "no such ref %s"
 msgstr "tidak ada referensi seperti %s"
 
-#: builtin/show-branch.c:831
+#: builtin/show-branch.c
 #, 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
 #, 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
 #, c-format
 msgid "cannot find commit %s (%s)"
 msgstr "tidak dapat menemukan komit %s (%s)"
 
-#: builtin/show-index.c:21
+#: builtin/show-index.c
 msgid "hash-algorithm"
 msgstr "algoritma hash"
 
-#: builtin/show-index.c:31
+#: builtin/show-index.c
 msgid "Unknown hash algorithm"
 msgstr "algoritma hash tidak dikenal"
 
-#: builtin/show-ref.c:12
+#: builtin/show-ref.c
 msgid ""
 "git show-ref [-q | --quiet] [--verify] [--head] [-d | --dereference] [-s | --"
 "hash[=<n>]] [--abbrev[=<n>]] [--tags] [--heads] [--] [<pattern>...]"
@@ -22351,57 +14308,57 @@ msgstr ""
 "git show-ref [-q | --quiet] [--verify] [--head] [-d | --dereference] [-s | --"
 "hash[=<n>]] [--abbrev[=<n>]] [--tags] [--heads] [--] [<pola>...]"
 
-#: builtin/show-ref.c:13
+#: builtin/show-ref.c
 msgid "git show-ref --exclude-existing[=<pattern>]"
 msgstr "git show-ref --exclude-existing[=<pola>]"
 
-#: builtin/show-ref.c:162
+#: builtin/show-ref.c
 msgid "only show tags (can be combined with heads)"
 msgstr "hanya perlihatkan tag (bisa dikombinasikan dengan kepala)"
 
-#: builtin/show-ref.c:163
+#: builtin/show-ref.c
 msgid "only show heads (can be combined with tags)"
 msgstr "hanya perlihatkan kepala (bisa dikombinasikan dengan tag)"
 
-#: builtin/show-ref.c:164
+#: builtin/show-ref.c
 msgid "stricter reference checking, requires exact ref path"
 msgstr "pemeriksaan referensi lebih ketat, butuh jalur referensi eksak"
 
-#: builtin/show-ref.c:167 builtin/show-ref.c:169
+#: builtin/show-ref.c
 msgid "show the HEAD reference, even if it would be filtered out"
 msgstr "perlihatkan referensi HEAD, bahkan jika itu akan disaring"
 
-#: builtin/show-ref.c:171
+#: builtin/show-ref.c
 msgid "dereference tags into object IDs"
 msgstr "dereferensi tag ke dalam ID objek"
 
-#: builtin/show-ref.c:173
+#: builtin/show-ref.c
 msgid "only show SHA1 hash using <n> digits"
 msgstr "hanya perlihatkan hash SHA1 menggunakan <n> digit"
 
-#: builtin/show-ref.c:177
+#: builtin/show-ref.c
 msgid "do not print results to stdout (useful with --verify)"
 msgstr "jangan cetak hasil ke keluaran standar (berguna dengan --verify)"
 
-#: builtin/show-ref.c:179
+#: builtin/show-ref.c
 msgid "show refs from stdin that aren't in local repository"
 msgstr ""
 "perlihatkan referensi dari masukan standar yang tidak ada dalam repositori "
 "lokal"
 
-#: builtin/sparse-checkout.c:23
+#: builtin/sparse-checkout.c
 msgid "git sparse-checkout (init|list|set|add|reapply|disable) <options>"
 msgstr "git sparse-checkout (init|list|set|add|reapply|disable) <opsi>"
 
-#: builtin/sparse-checkout.c:61
+#: builtin/sparse-checkout.c
 msgid "this worktree is not sparse"
 msgstr "pohon kerja ini bukan tipis"
 
-#: builtin/sparse-checkout.c:76
+#: builtin/sparse-checkout.c
 msgid "this worktree is not sparse (sparse-checkout file may not exist)"
 msgstr "pohon kerja ini bukan tipis (berkas sparse-checkout mungkin tidak ada)"
 
-#: builtin/sparse-checkout.c:177
+#: builtin/sparse-checkout.c
 #, c-format
 msgid ""
 "directory '%s' contains untracked files, but is not in the sparse-checkout "
@@ -22410,65 +14367,68 @@ msgstr ""
 "directori '%s' berisi berkas tak teracak, tapi tidak di dalam kerucut sparse-"
 "checkout"
 
-#: builtin/sparse-checkout.c:185
+#: builtin/sparse-checkout.c
 #, c-format
 msgid "failed to remove directory '%s'"
 msgstr "gagal menghapus direktori '%s'"
 
-#: builtin/sparse-checkout.c:327
+#: builtin/sparse-checkout.c
 msgid "failed to create directory for sparse-checkout file"
 msgstr "gagal membuat direktori untuk berkas sparse-checkout"
 
-#: builtin/sparse-checkout.c:366
+#: builtin/sparse-checkout.c
 msgid "failed to initialize worktree config"
 msgstr "gagal menginisialisasi konfigurasi pohon kerja"
 
-#: builtin/sparse-checkout.c:411
+#: builtin/sparse-checkout.c
 msgid "failed to modify sparse-index config"
 msgstr "gagal memodifikasi konfigurasi sparse-index"
 
-#: builtin/sparse-checkout.c:441 builtin/sparse-checkout.c:793
-#: builtin/sparse-checkout.c:847
+#: builtin/sparse-checkout.c
 msgid "initialize the sparse-checkout in cone mode"
 msgstr "inisialisasi checkout tipis dalam mode kerucut"
 
-#: builtin/sparse-checkout.c:443 builtin/sparse-checkout.c:795
-#: builtin/sparse-checkout.c:849
+#: builtin/sparse-checkout.c
 msgid "toggle the use of a sparse index"
 msgstr "gunakan indeks tipis"
 
-#: builtin/sparse-checkout.c:479
+#: builtin/sparse-checkout.c commit-graph.c midx.c
+#, c-format
+msgid "unable to create leading directories of %s"
+msgstr ""
+
+#: builtin/sparse-checkout.c
 #, c-format
 msgid "failed to open '%s'"
 msgstr "gagal membuka '%s'"
 
-#: builtin/sparse-checkout.c:531
+#: builtin/sparse-checkout.c
 #, c-format
 msgid "could not normalize path %s"
 msgstr "tidak dapat menormalkan jalur %s"
 
-#: builtin/sparse-checkout.c:560
+#: builtin/sparse-checkout.c
 #, c-format
 msgid "unable to unquote C-style string '%s'"
 msgstr "tidak dapat membatal-kutip untai gaya C '%s'"
 
-#: builtin/sparse-checkout.c:615 builtin/sparse-checkout.c:643
+#: builtin/sparse-checkout.c
 msgid "unable to load existing sparse-checkout patterns"
 msgstr "tidak dapat memuat pola checkout tipis yang sudah ada"
 
-#: builtin/sparse-checkout.c:619
+#: builtin/sparse-checkout.c
 msgid "existing sparse-checkout patterns do not use cone mode"
 msgstr "pola checkout tipis yang sudah ada tidak menggunakan mode kerucut"
 
-#: builtin/sparse-checkout.c:707
+#: builtin/sparse-checkout.c
 msgid "please run from the toplevel directory in non-cone mode"
 msgstr "mohon jalankan dari direktori tingkat atas pada mode bukan kerucut"
 
-#: builtin/sparse-checkout.c:712
+#: builtin/sparse-checkout.c
 msgid "specify directories rather than patterns (no leading slash)"
 msgstr "sebutkan direktori daripada pola (tanpa garis miring terdepan)"
 
-#: builtin/sparse-checkout.c:714
+#: builtin/sparse-checkout.c
 msgid ""
 "specify directories rather than patterns.  If your directory starts with a "
 "'!', pass --skip-checks"
@@ -22476,7 +14436,7 @@ msgstr ""
 "sebutkan direktori daripada pola. Jika direktori Anda dimulai dengan '!', "
 "lewatkan --skip-checks"
 
-#: builtin/sparse-checkout.c:716
+#: builtin/sparse-checkout.c
 msgid ""
 "specify directories rather than patterns.  If your directory really has any "
 "of '*?[]\\' in it, pass --skip-checks"
@@ -22484,7 +14444,7 @@ msgstr ""
 "sebutkan direktori daripada pola. Jika direktori Anda benar-benar berisi "
 "salah satu dari '*?[]\\', lewatkan --skip-checks"
 
-#: builtin/sparse-checkout.c:732
+#: builtin/sparse-checkout.c
 #, c-format
 msgid ""
 "'%s' is not a directory; to treat it as a directory anyway, rerun with --"
@@ -22493,7 +14453,7 @@ msgstr ""
 "'%s' bukan sebuah direktori; untuk perlakukan juga sebagai direktori, "
 "jalankan ulang dengan --skip-checks"
 
-#: builtin/sparse-checkout.c:734
+#: builtin/sparse-checkout.c
 #, c-format
 msgid ""
 "pass a leading slash before paths such as '%s' if you want a single file "
@@ -22503,26 +14463,26 @@ msgstr ""
 "ingin sebuah berkas (lihat NON-CONE PROBLEMS dalam manual git-sparse-"
 "checkout)."
 
-#: builtin/sparse-checkout.c:739
+#: builtin/sparse-checkout.c
 msgid "git sparse-checkout add [--skip-checks] (--stdin | <patterns>)"
 msgstr "git sparse-checkout add [--skip-checks] (--stdin | <pola>)"
 
-#: builtin/sparse-checkout.c:752 builtin/sparse-checkout.c:797
+#: builtin/sparse-checkout.c
 msgid ""
 "skip some sanity checks on the given paths that might give false positives"
 msgstr ""
 "lewati beberapa pemeriksaan kewarasan pada jalur yang diberikan yang mana "
 "dapat memberikan positif palsu"
 
-#: builtin/sparse-checkout.c:755 builtin/sparse-checkout.c:800
+#: builtin/sparse-checkout.c
 msgid "read patterns from standard in"
 msgstr "baca pola dari masukan standar"
 
-#: builtin/sparse-checkout.c:760
+#: builtin/sparse-checkout.c
 msgid "no sparse-checkout to add to"
 msgstr "tidak ada checkout tipis untuk ditambahkan"
 
-#: builtin/sparse-checkout.c:775
+#: builtin/sparse-checkout.c
 msgid ""
 "git sparse-checkout set [--[no-]cone] [--[no-]sparse-index] [--skip-checks] "
 "(--stdin | <patterns>)"
@@ -22530,36 +14490,36 @@ msgstr ""
 "git sparse-checkout set [--[no-]cone] [--[no-]sparse-index] [--skip-checks] "
 "(--stdin | <pola>)"
 
-#: builtin/sparse-checkout.c:854
+#: builtin/sparse-checkout.c
 msgid "must be in a sparse-checkout to reapply sparsity patterns"
 msgstr ""
 "harus berada di dalam checkout tipis untuk menerapkan ulang pola kejarangan"
 
-#: builtin/sparse-checkout.c:914
+#: builtin/sparse-checkout.c
 msgid "error while refreshing working directory"
 msgstr "kesalahan saat menyegarkan direktori kerja"
 
-#: builtin/stash.c:24 builtin/stash.c:40
+#: builtin/stash.c
 msgid "git stash list [<options>]"
 msgstr "git stash list [<opsi>]"
 
-#: builtin/stash.c:25 builtin/stash.c:45
+#: builtin/stash.c
 msgid "git stash show [<options>] [<stash>]"
 msgstr "git stash show [<opsi>] [<stase>]"
 
-#: builtin/stash.c:26 builtin/stash.c:50
+#: builtin/stash.c
 msgid "git stash drop [-q|--quiet] [<stash>]"
 msgstr "git stash drop [-q|--quiet] [<stase>]"
 
-#: builtin/stash.c:27
+#: builtin/stash.c
 msgid "git stash ( pop | apply ) [--index] [-q|--quiet] [<stash>]"
 msgstr "git stash ( pop | apply ) [--index] [-q|--quiet] [<stase>]"
 
-#: builtin/stash.c:28 builtin/stash.c:65
+#: builtin/stash.c
 msgid "git stash branch <branchname> [<stash>]"
 msgstr "git stash branch <nama cabang> [<stase>]"
 
-#: builtin/stash.c:30
+#: builtin/stash.c
 msgid ""
 "git stash [push [-p|--patch] [-S|--staged] [-k|--[no-]keep-index] [-q|--"
 "quiet]\n"
@@ -22572,7 +14532,7 @@ msgstr ""
 "          [-m|--message <pesan>] [--pathspec-from-file=<berkas>\n"
 "          [--pathspec-file-nul]] [--] [<spek jalur>...]]"
 
-#: builtin/stash.c:34
+#: builtin/stash.c
 msgid ""
 "git stash save [-p|--patch] [-S|--staged] [-k|--[no-]keep-index] [-q|--"
 "quiet]\n"
@@ -22581,19 +14541,19 @@ msgstr ""
 "git stash save [-p|--patch] [-S|--staged] [-k|--[no-]keep-index]\n"
 "          [-q|--quiet] [-u|--include-untracked] [-a|--all] [<pesan>]"
 
-#: builtin/stash.c:55
+#: builtin/stash.c
 msgid "git stash pop [--index] [-q|--quiet] [<stash>]"
 msgstr "git stash pop [--index] [-q|--quiet] [<stase>]"
 
-#: builtin/stash.c:60
+#: builtin/stash.c
 msgid "git stash apply [--index] [-q|--quiet] [<stash>]"
 msgstr "git stash apply [--index] [-q|--quiet] [<stase>]"
 
-#: builtin/stash.c:75
+#: builtin/stash.c
 msgid "git stash store [-m|--message <message>] [-q|--quiet] <commit>"
 msgstr "git stash store [-m|--message <pesan>] [-q|--quiet] <komit>"
 
-#: builtin/stash.c:80
+#: builtin/stash.c
 msgid ""
 "git stash [push [-p|--patch] [-k|--[no-]keep-index] [-q|--quiet]\n"
 "          [-u|--include-untracked] [-a|--all] [-m|--message <message>]\n"
@@ -22603,7 +14563,7 @@ msgstr ""
 "          [-u|--include-untracked] [-a|--all] [-m|--message <pesan>]\n"
 "          [--] [<spek jalur>...]"
 
-#: builtin/stash.c:87
+#: builtin/stash.c
 msgid ""
 "git stash save [-p|--patch] [-k|--[no-]keep-index] [-q|--quiet]\n"
 "               [-u|--include-untracked] [-a|--all] [<message>]"
@@ -22611,30 +14571,30 @@ msgstr ""
 "git stash save [-p|--patch] [-k|--[no-]keep-index] [-q|--quiet]\n"
 "               [-u|--include-untracked] [-a|--all] [<pesan>]"
 
-#: builtin/stash.c:130
+#: builtin/stash.c
 #, c-format
 msgid "'%s' is not a stash-like commit"
 msgstr "'%s' bukan komit mirip stase"
 
-#: builtin/stash.c:150
+#: builtin/stash.c
 #, c-format
 msgid "Too many revisions specified:%s"
 msgstr "Terlalu banyak revisi disebutkan:%s"
 
-#: builtin/stash.c:164
+#: builtin/stash.c
 msgid "No stash entries found."
 msgstr "Tidak ada entri stase ditemukan."
 
-#: builtin/stash.c:178
+#: builtin/stash.c
 #, c-format
 msgid "%s is not a valid reference"
 msgstr "%s bukan referensi valid"
 
-#: builtin/stash.c:227
+#: builtin/stash.c
 msgid "git stash clear with arguments is unimplemented"
 msgstr "git stash clear dengan argument tak diimplementasikan"
 
-#: builtin/stash.c:447
+#: builtin/stash.c
 #, c-format
 msgid ""
 "WARNING: Untracked file in way of tracked file!  Renaming\n"
@@ -22646,204 +14606,199 @@ msgstr ""
 "            %s -> %s\n"
 "         untuk buat ruang.\n"
 
-#: builtin/stash.c:508
+#: builtin/stash.c
 msgid "cannot apply a stash in the middle of a merge"
 msgstr "tidak dapat menerapkan stase di tengah-tengah penggabungan"
 
-#: builtin/stash.c:519
+#: builtin/stash.c
 #, c-format
 msgid "could not generate diff %s^!."
 msgstr "tidak dapat membuat diff %s^!."
 
-#: builtin/stash.c:526
+#: builtin/stash.c
 msgid "conflicts in index. Try without --index."
 msgstr "konflik dalam indeks. Coba tanpa --index."
 
-#: builtin/stash.c:532
+#: builtin/stash.c
 msgid "could not save index tree"
 msgstr "tidak dapat menyimpan pohon indeks"
 
-#: builtin/stash.c:552
+#: builtin/stash.c
 #, c-format
 msgid "Merging %s with %s"
 msgstr "Menggabungkan %s dengan %s"
 
-#: builtin/stash.c:562
+#: builtin/stash.c
 msgid "Index was not unstashed."
 msgstr "Indeks tak dibatal-stasekan."
 
-#: builtin/stash.c:576
+#: builtin/stash.c
 msgid "could not restore untracked files from stash"
 msgstr "tidak dapat mengembalikan berkas tak terlacak dari stase"
 
-#: builtin/stash.c:608 builtin/stash.c:695
+#: builtin/stash.c
 msgid "attempt to recreate the index"
 msgstr "coba membuat ulang indeks"
 
-#: builtin/stash.c:641
+#: builtin/stash.c
 #, c-format
 msgid "Dropped %s (%s)"
 msgstr "%s (%s) dijatuhkan"
 
-#: builtin/stash.c:644
+#: builtin/stash.c
 #, c-format
 msgid "%s: Could not drop stash entry"
 msgstr "%s: Tidak dapat menjatuhkan entri stase"
 
-#: builtin/stash.c:657
+#: builtin/stash.c
 #, c-format
 msgid "'%s' is not a stash reference"
 msgstr "'%s' bukan referensi stase"
 
-#: builtin/stash.c:707
+#: builtin/stash.c
 msgid "The stash entry is kept in case you need it again."
 msgstr "Entri stase disimpan jika Anda butuh itu lagi."
 
-#: builtin/stash.c:730
+#: builtin/stash.c
 msgid "No branch name specified"
 msgstr "Tidak ada nama cabang yang disebutkan"
 
-#: builtin/stash.c:809
+#: builtin/stash.c
 msgid "failed to parse tree"
 msgstr "gagal menguraikan pohon"
 
-#: builtin/stash.c:820
+#: builtin/stash.c
 msgid "failed to unpack trees"
 msgstr "gagal membongkar pohon"
 
-#: builtin/stash.c:840
+#: builtin/stash.c
 msgid "include untracked files in the stash"
 msgstr "masukkan berkas tak terlacak ke dalam stase"
 
-#: builtin/stash.c:843
+#: builtin/stash.c
 msgid "only show untracked files in the stash"
 msgstr "hanya perlihatkan berkas tak terlacak dalam stase"
 
-#: builtin/stash.c:930 builtin/stash.c:967
+#: builtin/stash.c
 #, c-format
 msgid "Cannot update %s with %s"
 msgstr "Tidak dapat memperbarui %s dengan %s"
 
-#: builtin/stash.c:948 builtin/stash.c:1667 builtin/stash.c:1739
+#: builtin/stash.c
 msgid "stash message"
 msgstr "pesan stase"
 
-#: builtin/stash.c:958
+#: builtin/stash.c
 msgid "\"git stash store\" requires one <commit> argument"
 msgstr "\"git stash store\" butuh satu argumen <komit>"
 
-#: builtin/stash.c:1143
+#: builtin/stash.c
 msgid "No staged changes"
 msgstr "Tidak ada perubahan yang tergelar"
 
-#: builtin/stash.c:1204
+#: builtin/stash.c
 msgid "No changes selected"
 msgstr "Tidak ada perubahan yang dipilih"
 
-#: builtin/stash.c:1304
+#: builtin/stash.c
 msgid "You do not have the initial commit yet"
 msgstr "Anda belum punya komit awal"
 
-#: builtin/stash.c:1331
+#: builtin/stash.c
 msgid "Cannot save the current index state"
 msgstr "Tidak dapat menyimpan keadaan indeks saat ini"
 
-#: builtin/stash.c:1340
+#: builtin/stash.c
 msgid "Cannot save the untracked files"
 msgstr "Tidak dapat menyimpan berkas tak terlacak"
 
-#: builtin/stash.c:1351 builtin/stash.c:1370
+#: builtin/stash.c
 msgid "Cannot save the current worktree state"
 msgstr "Tidak dapat menyimpang keadaan pohon kerja saat ini"
 
-#: builtin/stash.c:1361
+#: builtin/stash.c
 msgid "Cannot save the current staged state"
 msgstr "Tidak dapat menyimpan keadaan tergelar saat ini"
 
-#: builtin/stash.c:1398
+#: builtin/stash.c
 msgid "Cannot record working tree state"
 msgstr "Tidak dapat merekam keadaan pohon kerja"
 
-#: builtin/stash.c:1447
+#: builtin/stash.c
 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:1458
+#: builtin/stash.c
 msgid "Can't use --staged and --include-untracked or --all at the same time"
 msgstr ""
 "Tidak dapat menggunakan --staged dan --include-untracked atau --all pada "
 "waktu yang bersamaan"
 
-#: builtin/stash.c:1476
+#: builtin/stash.c
 msgid "Did you forget to 'git add'?"
 msgstr "Anda lupa untuk 'git add'?"
 
-#: builtin/stash.c:1491
+#: builtin/stash.c
 msgid "No local changes to save"
 msgstr "Tidak ada perubahan lokal untuk disimpan"
 
-#: builtin/stash.c:1498
+#: builtin/stash.c
 msgid "Cannot initialize stash"
 msgstr "Tidak dapat menginisialisasi stase"
 
-#: builtin/stash.c:1513
+#: builtin/stash.c
 msgid "Cannot save the current status"
 msgstr "Tidak dapat menyimpan status saat ini"
 
-#: builtin/stash.c:1518
+#: builtin/stash.c
 #, c-format
 msgid "Saved working directory and index state %s"
 msgstr "Direktori kerja dan keadaan indeks %s disimpan"
 
-#: builtin/stash.c:1615
+#: builtin/stash.c
 msgid "Cannot remove worktree changes"
 msgstr "Tidak dapat menghapus perubahaan pohon kerja"
 
-#: builtin/stash.c:1656 builtin/stash.c:1728
+#: builtin/stash.c
 msgid "keep index"
 msgstr "jaga indeks"
 
-#: builtin/stash.c:1658 builtin/stash.c:1730
+#: builtin/stash.c
 msgid "stash staged changes only"
 msgstr "hanya stase perubahan tergelar"
 
-#: builtin/stash.c:1660 builtin/stash.c:1732
+#: builtin/stash.c
 msgid "stash in patch mode"
 msgstr "stase dalam mode tambalan"
 
-#: builtin/stash.c:1661 builtin/stash.c:1733
+#: builtin/stash.c
 msgid "quiet mode"
 msgstr "mode hening"
 
-#: builtin/stash.c:1663 builtin/stash.c:1735
+#: builtin/stash.c
 msgid "include untracked files in stash"
 msgstr "masukkan berkas tak terlacak ke dalam stase"
 
-#: builtin/stash.c:1665 builtin/stash.c:1737
+#: builtin/stash.c
 msgid "include ignore files"
 msgstr "masukkan berkas ignore"
 
-#: builtin/stripspace.c:37
+#: builtin/stripspace.c
 msgid "skip and remove all lines starting with comment character"
 msgstr ""
 
-#: builtin/stripspace.c:40
+#: builtin/stripspace.c
 msgid "prepend comment character and space to each line"
 msgstr ""
 
-#: builtin/submodule--helper.c:50 builtin/submodule--helper.c:2486
+#: builtin/submodule--helper.c
 #, c-format
 msgid "Expecting a full ref name, got %s"
 msgstr "Mengharapkan nama referensi penuh, dapat %s"
 
-#: builtin/submodule--helper.c:103
-#, c-format
-msgid "cannot strip one component off url '%s'"
-msgstr "tidak dapat mencopot satu komponen dari url '%s'"
-
-#: builtin/submodule--helper.c:213
+#: builtin/submodule--helper.c
 #, c-format
 msgid ""
 "could not look up configuration '%s'. Assuming this repository is its own "
@@ -22852,26 +14807,25 @@ msgstr ""
 "tidak dapat mencari konfigurasi '%s'. Asumsi bahwa repositori ini adalah "
 "hulu otoritatif tersendiri."
 
-#: builtin/submodule--helper.c:413 builtin/submodule--helper.c:1873
+#: builtin/submodule--helper.c
 msgid "alternative anchor for relative paths"
 msgstr "jangkar alternatif untuk jalur relatif"
 
-#: builtin/submodule--helper.c:418
+#: builtin/submodule--helper.c
 msgid "git submodule--helper list [--prefix=<path>] [<path>...]"
 msgstr "git submodule--helper list [--prefix=<jalur>] [<jalur>...]"
 
-#: builtin/submodule--helper.c:476 builtin/submodule--helper.c:617
-#: builtin/submodule--helper.c:640
+#: builtin/submodule--helper.c
 #, c-format
 msgid "No url found for submodule path '%s' in .gitmodules"
 msgstr "Tidak ada url yang ditemukan untuk jalur submodul '%s' di .gitmodules"
 
-#: builtin/submodule--helper.c:528
+#: builtin/submodule--helper.c
 #, c-format
 msgid "Entering '%s'\n"
 msgstr "Memasuki '%s'\n"
 
-#: builtin/submodule--helper.c:531
+#: builtin/submodule--helper.c
 #, c-format
 msgid ""
 "run_command returned non-zero status for %s\n"
@@ -22880,7 +14834,7 @@ msgstr ""
 "run_command mengembalikan status bukan nol untuk %s\n"
 "."
 
-#: builtin/submodule--helper.c:553
+#: builtin/submodule--helper.c
 #, c-format
 msgid ""
 "run_command returned non-zero status while recursing in the nested "
@@ -22891,68 +14845,67 @@ msgstr ""
 "bersarang %s\n"
 "."
 
-#: builtin/submodule--helper.c:569
+#: builtin/submodule--helper.c
 msgid "suppress output of entering each submodule command"
 msgstr "sembunyikan keluaran memasuki setiap perintah submodul"
 
-#: builtin/submodule--helper.c:571 builtin/submodule--helper.c:876
-#: builtin/submodule--helper.c:1458
+#: builtin/submodule--helper.c
 msgid "recurse into nested submodules"
 msgstr "rekursi ke dalam submodul bersarang"
 
-#: builtin/submodule--helper.c:576
+#: builtin/submodule--helper.c
 msgid "git submodule--helper foreach [--quiet] [--recursive] [--] <command>"
 msgstr ""
 "git submodule--helper foreach [--quiet] [--recursive] [--] [<perintah>]"
 
-#: builtin/submodule--helper.c:654
+#: builtin/submodule--helper.c
 #, c-format
 msgid "Failed to register url for submodule path '%s'"
 msgstr "Gagal mendaftarkan url untuk jalur submodul '%s'"
 
-#: builtin/submodule--helper.c:658
+#: builtin/submodule--helper.c
 #, c-format
 msgid "Submodule '%s' (%s) registered for path '%s'\n"
 msgstr "Submodul '%s' (%s) didaftarkan untuk jalur '%s'\n"
 
-#: builtin/submodule--helper.c:668
+#: builtin/submodule--helper.c
 #, 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:675
+#: builtin/submodule--helper.c
 #, 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:697
+#: builtin/submodule--helper.c
 msgid "suppress output for initializing a submodule"
 msgstr "sembunyikan keluaran menginisialisasi submodul"
 
-#: builtin/submodule--helper.c:702
+#: builtin/submodule--helper.c
 msgid "git submodule--helper init [<options>] [<path>]"
 msgstr "git submodule--helper init [<opsi>] [<jalur>]"
 
-#: builtin/submodule--helper.c:775 builtin/submodule--helper.c:910
+#: builtin/submodule--helper.c
 #, 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:823
+#: builtin/submodule--helper.c
 #, 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:850 builtin/submodule--helper.c:1428
+#: builtin/submodule--helper.c
 #, c-format
 msgid "failed to recurse into submodule '%s'"
 msgstr "gagal merekursi ke dalam submodul '%s'"
 
-#: builtin/submodule--helper.c:874 builtin/submodule--helper.c:1595
+#: builtin/submodule--helper.c
 msgid "suppress submodule status output"
 msgstr "sembunyikan keluaran status submodul"
 
-#: builtin/submodule--helper.c:875
+#: builtin/submodule--helper.c
 msgid ""
 "use commit stored in the index instead of the one stored in the submodule "
 "HEAD"
@@ -22960,92 +14913,92 @@ msgstr ""
 "gunakan komit yang disimpan di dalam indeks daripada yang disimpan di dalam "
 "HEAD"
 
-#: builtin/submodule--helper.c:881
+#: builtin/submodule--helper.c
 msgid "git submodule status [--quiet] [--cached] [--recursive] [<path>...]"
 msgstr "git submodule status [--quiet] [--cached] [--recursive] [<jalur>...]"
 
-#: builtin/submodule--helper.c:905
+#: builtin/submodule--helper.c
 msgid "git submodule--helper name <path>"
 msgstr "git submodule--helper name <jalur>"
 
-#: builtin/submodule--helper.c:977
+#: builtin/submodule--helper.c
 #, c-format
 msgid "* %s %s(blob)->%s(submodule)"
 msgstr "* %s %s(blob)->%s(submodul)"
 
-#: builtin/submodule--helper.c:980
+#: builtin/submodule--helper.c
 #, c-format
 msgid "* %s %s(submodule)->%s(blob)"
 msgstr "* %s %s(submodul)->%s(blob)"
 
-#: builtin/submodule--helper.c:993
+#: builtin/submodule--helper.c
 #, c-format
 msgid "%s"
 msgstr "%s"
 
-#: builtin/submodule--helper.c:1043
+#: builtin/submodule--helper.c
 #, c-format
 msgid "couldn't hash object from '%s'"
 msgstr "tidak dapat hash objek dari '%s'"
 
-#: builtin/submodule--helper.c:1047
+#: builtin/submodule--helper.c
 #, c-format
 msgid "unexpected mode %o\n"
 msgstr "mode tidak diharapkan %o\n"
 
-#: builtin/submodule--helper.c:1288
+#: builtin/submodule--helper.c
 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:1290
+#: builtin/submodule--helper.c
 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:1292
+#: builtin/submodule--helper.c
 msgid "skip submodules with 'ignore_config' value set to 'all'"
 msgstr "lewatkan submodul dengan nilai 'ignore_config' disetel ke 'all'"
 
-#: builtin/submodule--helper.c:1294
+#: builtin/submodule--helper.c
 msgid "limit the summary size"
 msgstr "batasi ukuran ringkasan"
 
-#: builtin/submodule--helper.c:1299
+#: builtin/submodule--helper.c
 msgid "git submodule--helper summary [<options>] [<commit>] [--] [<path>]"
 msgstr "git submodule--helper summary [<opsi>] [<commit>] -- [<jalur>]"
 
-#: builtin/submodule--helper.c:1323
+#: builtin/submodule--helper.c
 msgid "could not fetch a revision for HEAD"
 msgstr "tidak dapat mengambil revisi untuk HEAD"
 
-#: builtin/submodule--helper.c:1384
+#: builtin/submodule--helper.c
 #, c-format
 msgid "Synchronizing submodule url for '%s'\n"
 msgstr "Mensinkronisasi url submodul untuk '%s'\n"
 
-#: builtin/submodule--helper.c:1390
+#: builtin/submodule--helper.c
 #, c-format
 msgid "failed to register url for submodule path '%s'"
 msgstr "gagal mendaftarkan url untuk jalur submodul '%s'"
 
-#: builtin/submodule--helper.c:1399
+#: builtin/submodule--helper.c
 #, c-format
 msgid "failed to get the default remote for submodule '%s'"
 msgstr "gagal mendapatkan remote asali untuk submodul '%s'"
 
-#: builtin/submodule--helper.c:1409
+#: builtin/submodule--helper.c
 #, c-format
 msgid "failed to update remote for submodule '%s'"
 msgstr "gagal memperbarui remote untuk submodul '%s'"
 
-#: builtin/submodule--helper.c:1456
+#: builtin/submodule--helper.c
 msgid "suppress output of synchronizing submodule url"
 msgstr "sembunyikan keluaran mensinkronisasi url submodul"
 
-#: builtin/submodule--helper.c:1463
+#: builtin/submodule--helper.c
 msgid "git submodule--helper sync [--quiet] [--recursive] [<path>]"
 msgstr "git submodule--helper sync [--quiet] [--recursive] [<jalur>]"
 
-#: builtin/submodule--helper.c:1513
+#: builtin/submodule--helper.c
 #, c-format
 msgid ""
 "Submodule work tree '%s' contains a .git directory. This will be replaced "
@@ -23054,55 +15007,55 @@ msgstr ""
 "Pohon kerja submodul '%s' berisi direktori .git. Ini akan diganti dengan  "
 "berkas .git oleh dengan menggunakan absorbgitdirs."
 
-#: builtin/submodule--helper.c:1530
+#: builtin/submodule--helper.c
 #, c-format
 msgid ""
 "Submodule work tree '%s' contains local modifications; use '-f' to discard "
 "them"
 msgstr ""
 "Pohon kerja submodul '%s' berisi modifikasi lokal; gunakan '-f' untuk "
-"menyingkirkan itu"
+"menyingkirkannya"
 
-#: builtin/submodule--helper.c:1538
+#: builtin/submodule--helper.c
 #, c-format
 msgid "Cleared directory '%s'\n"
 msgstr "Direktori '%s' dibersihkan\n"
 
-#: builtin/submodule--helper.c:1540
+#: builtin/submodule--helper.c
 #, c-format
 msgid "Could not remove submodule work tree '%s'\n"
 msgstr "Tidak dapat menghapus pohon kerja submodul '%s'\n"
 
-#: builtin/submodule--helper.c:1551
+#: builtin/submodule--helper.c
 #, c-format
 msgid "could not create empty submodule directory %s"
 msgstr "tidak dapat membuat direktori submodul kosong %s"
 
-#: builtin/submodule--helper.c:1567
+#: builtin/submodule--helper.c
 #, 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:1596
+#: builtin/submodule--helper.c
 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:1597
+#: builtin/submodule--helper.c
 msgid "unregister all submodules"
 msgstr "batal daftar semua submodul"
 
-#: builtin/submodule--helper.c:1602
+#: builtin/submodule--helper.c
 msgid ""
 "git submodule deinit [--quiet] [-f | --force] [--all | [--] [<path>...]]"
 msgstr ""
 "git submodule deinit [--quiet] [-f | --force] [--all | [--] [<jalur>...]]"
 
-#: builtin/submodule--helper.c:1616
+#: builtin/submodule--helper.c
 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:1665
+#: builtin/submodule--helper.c
 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"
@@ -23114,68 +15067,67 @@ msgstr ""
 " itu, setel submodule.alternateErrorStrategy ke 'info' atau yang sama,\n"
 "kloning degan '--reference-if-able' daripada '--reference'."
 
-#: builtin/submodule--helper.c:1710 builtin/submodule--helper.c:1713
+#: builtin/submodule--helper.c
 #, c-format
 msgid "submodule '%s' cannot add alternate: %s"
 msgstr "submodul '%s' tidak dapat menambahkan pengganti: %s"
 
-#: builtin/submodule--helper.c:1749
+#: builtin/submodule--helper.c
 #, c-format
 msgid "Value '%s' for submodule.alternateErrorStrategy is not recognized"
 msgstr "Nilai '%s' untuk submodule.alternateErrorStrategy tidak dikenal"
 
-#: builtin/submodule--helper.c:1756
+#: builtin/submodule--helper.c
 #, c-format
 msgid "Value '%s' for submodule.alternateLocation is not recognized"
 msgstr "Nilai '%s' untuk submodule.alternateLocation tidak dikenal"
 
-#: builtin/submodule--helper.c:1781
+#: builtin/submodule--helper.c
 #, 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:1826
+#: builtin/submodule--helper.c
 #, c-format
 msgid "clone of '%s' into submodule path '%s' failed"
 msgstr "gagal mengkloning '%s' ke dalam jalur submodul '%s'"
 
-#: builtin/submodule--helper.c:1831
+#: builtin/submodule--helper.c
 #, c-format
 msgid "directory not empty: '%s'"
 msgstr "direktori tidak kosong: '%s'"
 
-#: builtin/submodule--helper.c:1843
+#: builtin/submodule--helper.c
 #, c-format
 msgid "could not get submodule directory for '%s'"
 msgstr "tidak dapat mendapatkan direktori submodul untuk '%s'"
 
-#: builtin/submodule--helper.c:1876
+#: builtin/submodule--helper.c
 msgid "where the new submodule will be cloned to"
 msgstr "di mana submodul baru akan dikloning"
 
-#: builtin/submodule--helper.c:1879
+#: builtin/submodule--helper.c
 msgid "name of the new submodule"
 msgstr "nama submodul baru"
 
-#: builtin/submodule--helper.c:1882
+#: builtin/submodule--helper.c
 msgid "url where to clone the submodule from"
 msgstr "url di mana submodul dikloning"
 
-#: builtin/submodule--helper.c:1890 builtin/submodule--helper.c:3383
+#: builtin/submodule--helper.c
 msgid "depth for shallow clones"
 msgstr "kedalaman untuk kloning dangkal"
 
-#: builtin/submodule--helper.c:1893 builtin/submodule--helper.c:2731
-#: builtin/submodule--helper.c:3376
+#: builtin/submodule--helper.c
 msgid "force cloning progress"
 msgstr "paksa perkembangan kloning"
 
-#: builtin/submodule--helper.c:1895 builtin/submodule--helper.c:2733
+#: builtin/submodule--helper.c
 msgid "disallow cloning into non-empty directory"
 msgstr "tak perbolehkan kloning ke dalam direktori bukan kosong"
 
-#: builtin/submodule--helper.c:1903
+#: builtin/submodule--helper.c
 msgid ""
 "git submodule--helper clone [--prefix=<path>] [--quiet] [--reference "
 "<repository>] [--name <name>] [--depth <depth>] [--single-branch] [--filter "
@@ -23185,93 +15137,93 @@ msgstr ""
 "<repositori>] [--name <nama>] [--depth <kedalaman>] [--single-branch] [--"
 "filter <spek filter>] --url <url> --path <jalur>"
 
-#: builtin/submodule--helper.c:1943
+#: builtin/submodule--helper.c
 #, 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:1947
+#: builtin/submodule--helper.c
 #, 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:2041
+#: builtin/submodule--helper.c
 #, c-format
 msgid "Submodule path '%s' not initialized"
 msgstr "Jalur submodul '%s' tidak diinisialisasi"
 
-#: builtin/submodule--helper.c:2045
+#: builtin/submodule--helper.c
 msgid "Maybe you want to use 'update --init'?"
 msgstr "Mungkin Anda ingin menggunakan 'update --init'?"
 
-#: builtin/submodule--helper.c:2075
+#: builtin/submodule--helper.c
 #, c-format
 msgid "Skipping unmerged submodule %s"
 msgstr "Melewati submodul tak tergabung %s"
 
-#: builtin/submodule--helper.c:2104
+#: builtin/submodule--helper.c
 #, c-format
 msgid "Skipping submodule '%s'"
 msgstr "Melewati submodul '%s'"
 
-#: builtin/submodule--helper.c:2257
+#: builtin/submodule--helper.c
 #, c-format
 msgid "Failed to clone '%s'. Retry scheduled"
 msgstr "Gagal mengkloning '%s'. Percobaan ulang dijadwalkan"
 
-#: builtin/submodule--helper.c:2268
+#: builtin/submodule--helper.c
 #, c-format
 msgid "Failed to clone '%s' a second time, aborting"
 msgstr "Gagal mengkloning '%s' untuk kedua kalinya, batalkan"
 
-#: builtin/submodule--helper.c:2371
+#: builtin/submodule--helper.c
 #, 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:2375
+#: builtin/submodule--helper.c
 #, c-format
 msgid "Unable to rebase '%s' in submodule path '%s'"
 msgstr "Gagal mendasarkan ulang '%s' pada jalur submodul '%s'"
 
-#: builtin/submodule--helper.c:2379
+#: builtin/submodule--helper.c
 #, c-format
 msgid "Unable to merge '%s' in submodule path '%s'"
 msgstr "Tidak dapat menggabungkan '%s' pada jalur submodul '%s'"
 
-#: builtin/submodule--helper.c:2383
+#: builtin/submodule--helper.c
 #, 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:2402
+#: builtin/submodule--helper.c
 #, c-format
 msgid "Submodule path '%s': checked out '%s'\n"
 msgstr "Jalur submodul '%s': ter-checkout '%s'\n"
 
-#: builtin/submodule--helper.c:2406
+#: builtin/submodule--helper.c
 #, c-format
 msgid "Submodule path '%s': rebased into '%s'\n"
 msgstr "Jalur submodul '%s: terdasarkan ulang ke '%s''\n"
 
-#: builtin/submodule--helper.c:2410
+#: builtin/submodule--helper.c
 #, c-format
 msgid "Submodule path '%s': merged in '%s'\n"
 msgstr "Jalur submodul '%s': tergabung dalam '%s'\n"
 
-#: builtin/submodule--helper.c:2414
+#: builtin/submodule--helper.c
 #, c-format
 msgid "Submodule path '%s': '%s %s'\n"
 msgstr "Jalur submodul '%s': '%s %s'\n"
 
-#: builtin/submodule--helper.c:2438
+#: builtin/submodule--helper.c
 #, 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:2447
+#: builtin/submodule--helper.c
 #, c-format
 msgid ""
 "Fetched in submodule path '%s', but it did not contain %s. Direct fetching "
@@ -23280,7 +15232,7 @@ msgstr ""
 "Terambil di dalam jalur submodul '%s', tetapi itu tidak berisi %s. "
 "Pengambilan langsung komit tersebut gagal."
 
-#: builtin/submodule--helper.c:2481
+#: builtin/submodule--helper.c
 #, c-format
 msgid ""
 "Submodule (%s) branch configured to inherit branch from superproject, but "
@@ -23289,163 +15241,166 @@ msgstr ""
 "Cabang submodul (%s) dikonfigurasikan untuk mewarisi cabang dari proyek "
 "super, tapi proyek super tidak pada cabang apapun"
 
-#: builtin/submodule--helper.c:2499
+#: builtin/submodule--helper.c
 #, 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:2588
+#: builtin/submodule--helper.c
 #, c-format
 msgid "Unable to find current revision in submodule path '%s'"
 msgstr "Tidak dapat menemukan revisi saat ini pada jalur submodul '%s'"
 
-#: builtin/submodule--helper.c:2599
+#: builtin/submodule--helper.c
 #, c-format
 msgid "Unable to fetch in submodule path '%s'"
 msgstr "Tidak dapat mengambil pada jalur submodul '%s'"
 
-#: builtin/submodule--helper.c:2604
+#: builtin/submodule--helper.c
 #, c-format
 msgid "Unable to find %s revision in submodule path '%s'"
 msgstr "Tidak dapat menemukan revisi %s pada jalur submodul '%s'"
 
-#: builtin/submodule--helper.c:2640
+#: builtin/submodule--helper.c
 #, c-format
 msgid "Failed to recurse into submodule path '%s'"
 msgstr "Gagal merekursi ke dalam submodul '%s'"
 
-#: builtin/submodule--helper.c:2699
+#: builtin/submodule--helper.c
 msgid "force checkout updates"
 msgstr "paksa pembaruan checkout"
 
-#: builtin/submodule--helper.c:2701
+#: builtin/submodule--helper.c
 msgid "initialize uninitialized submodules before update"
 msgstr "inisialisasi submodul yang belum diinisialisasi sebelum pembaruan"
 
-#: builtin/submodule--helper.c:2703
+#: builtin/submodule--helper.c
 msgid "use SHA-1 of submodule's remote tracking branch"
 msgstr "gunakan SHA-1 dari cabang pelacak remote submodul"
 
-#: builtin/submodule--helper.c:2705
+#: builtin/submodule--helper.c
 msgid "traverse submodules recursively"
-msgstr ""
+msgstr "lintasi submodul secara rekursif"
 
-#: builtin/submodule--helper.c:2707
+#: builtin/submodule--helper.c
 msgid "don't fetch new objects from the remote site"
 msgstr "jangan ambil objek baru dari situs remote"
 
-#: builtin/submodule--helper.c:2710 builtin/submodule--helper.c:2892
+#: builtin/submodule--helper.c
 msgid "path into the working tree"
 msgstr "jalur ke dalam pohon kerja"
 
-#: builtin/submodule--helper.c:2713
+#: builtin/submodule--helper.c
 msgid "path into the working tree, across nested submodule boundaries"
 msgstr "jalur ke dalam pohon kerja, melintasi perbatasan submodul bersarang"
 
-#: builtin/submodule--helper.c:2717
+#: builtin/submodule--helper.c
 msgid "rebase, merge, checkout or none"
 msgstr "dasarkan ulang, gabungkan, checkout atau tidak sama sekali"
 
-#: builtin/submodule--helper.c:2723
+#: builtin/submodule--helper.c
 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:2726
+#: builtin/submodule--helper.c
 msgid "parallel jobs"
 msgstr "pekerjaan paralel"
 
-#: builtin/submodule--helper.c:2728
+#: builtin/submodule--helper.c
 msgid "whether the initial clone should follow the shallow recommendation"
 msgstr "apakah klon awal seharusnya mengikuti rekomendasi dangkal"
 
-#: builtin/submodule--helper.c:2729
+#: builtin/submodule--helper.c
 msgid "don't print cloning progress"
 msgstr "jangan cetak perkembangan pengkloningan"
 
-#: builtin/submodule--helper.c:2741
+#: builtin/submodule--helper.c
 msgid ""
 "git submodule [--quiet] update [--init [--filter=<filter-spec>]] [--remote] "
 "[-N|--no-fetch] [-f|--force] [--checkout|--merge|--rebase] [--[no-]recommend-"
 "shallow] [--reference <repository>] [--recursive] [--[no-]single-branch] "
 "[--] [<path>...]"
 msgstr ""
+"git submodule [--quiet] update [--init [--filter=<spek filter>]] [--remote] "
+"[-N|--no-fetch] [-f|--force] [--checkout|--merge|--rebase] [--[no-]recommend-"
+"shallow] [--reference <repositori>] [--recursive] [--[no-]single-branch] "
+"[--] [<jalur>...]"
 
-#: builtin/submodule--helper.c:2767
+#: builtin/submodule--helper.c
 msgid "bad value for update parameter"
 msgstr "nilai jelek untuk parameter pembaruan"
 
-#: builtin/submodule--helper.c:2893
+#: builtin/submodule--helper.c
 msgid "recurse into submodules"
 msgstr "rekursi ke dalam submodul"
 
-#: builtin/submodule--helper.c:2899
+#: builtin/submodule--helper.c
 msgid "git submodule--helper absorb-git-dirs [<options>] [<path>...]"
 msgstr "git submodule--helper absorb-git-dirs [<opsi>] [<jalur>...]"
 
-#: builtin/submodule--helper.c:2955
+#: builtin/submodule--helper.c
 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:2958
+#: builtin/submodule--helper.c
 msgid "unset the config in the .gitmodules file"
 msgstr "batal setel konfigurasi dalam berkas .gitmodules"
 
-#: builtin/submodule--helper.c:2963
+#: builtin/submodule--helper.c
 msgid "git submodule--helper config <name> [<value>]"
 msgstr "git submodule--helper config <nama> [<nilai>]"
 
-#: builtin/submodule--helper.c:2964
+#: builtin/submodule--helper.c
 msgid "git submodule--helper config --unset <name>"
 msgstr "git submodule--helper config --unset <nama>"
 
-#: builtin/submodule--helper.c:2984 builtin/submodule--helper.c:3238
-#: builtin/submodule--helper.c:3395
+#: builtin/submodule--helper.c
 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:3000
+#: builtin/submodule--helper.c
 msgid "suppress output for setting url of a submodule"
 msgstr "sembunyikan keluaran penyetelan url submodule"
 
-#: builtin/submodule--helper.c:3004
+#: builtin/submodule--helper.c
 msgid "git submodule--helper set-url [--quiet] <path> <newurl>"
 msgstr "git submodule--helper set-url [--quiet] <jalur> <url baru>"
 
-#: builtin/submodule--helper.c:3037
+#: builtin/submodule--helper.c
 msgid "set the default tracking branch to master"
 msgstr "setel cabang pelacak asali ke master"
 
-#: builtin/submodule--helper.c:3039
+#: builtin/submodule--helper.c
 msgid "set the default tracking branch"
 msgstr "setel cabang pelacak asali"
 
-#: builtin/submodule--helper.c:3043
+#: builtin/submodule--helper.c
 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:3044
+#: builtin/submodule--helper.c
 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:3051
+#: builtin/submodule--helper.c
 msgid "--branch or --default required"
 msgstr "--branch atau --default dibutuhkan"
 
-#: builtin/submodule--helper.c:3072 builtin/submodule--helper.c:3375
+#: builtin/submodule--helper.c
 msgid "print only error messages"
 msgstr "hanya cetak pesan kesalahan"
 
-#: builtin/submodule--helper.c:3073
+#: builtin/submodule--helper.c
 msgid "force creation"
 msgstr "paksa pembuatan"
 
-#: builtin/submodule--helper.c:3081
+#: builtin/submodule--helper.c
 msgid "show whether the branch would be created"
 msgstr "perlihatkan apabila cabang akan dibuat"
 
-#: builtin/submodule--helper.c:3085
+#: builtin/submodule--helper.c
 msgid ""
 "git submodule--helper create-branch [-f|--force] [--create-reflog] [-q|--"
 "quiet] [-t|--track] [-n|--dry-run] <name> <start-oid> <start-name>"
@@ -23453,27 +15408,27 @@ msgstr ""
 "git submodule--helper create-branch [-f|--force] [--create-reflog] [-q|--"
 "quiet] [-t|--track] [-n|--dry-run] <nama> <oid awal> <nama awal>"
 
-#: builtin/submodule--helper.c:3097
+#: builtin/submodule--helper.c
 #, c-format
 msgid "creating branch '%s'"
 msgstr "membuat cabang '%s'"
 
-#: builtin/submodule--helper.c:3155
+#: builtin/submodule--helper.c
 #, 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:3158
+#: builtin/submodule--helper.c
 #, 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:3171
+#: builtin/submodule--helper.c
 #, c-format
 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:3178
+#: builtin/submodule--helper.c
 #, c-format
 msgid ""
 "If you want to reuse this local git directory instead of cloning again from\n"
@@ -23490,113 +15445,117 @@ msgstr ""
 "atau Anda tidak yakin apa maksudnya, pilih nama yang lain dengan opsi '--"
 "name'."
 
-#: builtin/submodule--helper.c:3190
+#: builtin/submodule--helper.c
 #, 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:3227
+#: builtin/submodule--helper.c
 #, c-format
 msgid "unable to checkout submodule '%s'"
 msgstr "Tidak dapat men-checkout submodul '%s'"
 
-#: builtin/submodule--helper.c:3266
+#: builtin/submodule--helper.c
 #, c-format
 msgid "Failed to add submodule '%s'"
 msgstr "Tidak dapat menambahkan submodul '%s'"
 
-#: builtin/submodule--helper.c:3270 builtin/submodule--helper.c:3275
-#: builtin/submodule--helper.c:3283
+#: builtin/submodule--helper.c
 #, c-format
 msgid "Failed to register submodule '%s'"
 msgstr "Gagal mendaftarkan jalur submodul '%s'"
 
-#: builtin/submodule--helper.c:3339
+#: builtin/submodule--helper.c
 #, c-format
 msgid "'%s' already exists in the index"
 msgstr "'%s' sudah ada di dalam indeks"
 
-#: builtin/submodule--helper.c:3342
+#: builtin/submodule--helper.c
 #, 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:3372
+#: builtin/submodule--helper.c read-cache.c
+#, c-format
+msgid "'%s' does not have a commit checked out"
+msgstr ""
+
+#: builtin/submodule--helper.c
 msgid "branch of repository to add as submodule"
 msgstr "cabang repositori untuk ditambahkan sebagai submodul"
 
-#: builtin/submodule--helper.c:3373
+#: builtin/submodule--helper.c
 msgid "allow adding an otherwise ignored submodule path"
 msgstr "perbolehkan menambah jalur submodul yang diabaikan"
 
-#: builtin/submodule--helper.c:3379
+#: builtin/submodule--helper.c
 msgid "borrow the objects from reference repositories"
 msgstr "pinjam objek dari repositori referensi"
 
-#: builtin/submodule--helper.c:3381
+#: builtin/submodule--helper.c
 msgid ""
-"sets the submodule’s name to the given string instead of defaulting to its "
+"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:3388
+#: builtin/submodule--helper.c
 msgid "git submodule--helper add [<options>] [--] <repository> [<path>]"
 msgstr "git submodule--helper add [<opsi>] [--] <repositori> [<jalur>]"
 
-#: builtin/submodule--helper.c:3416
+#: builtin/submodule--helper.c
 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:3425
+#: builtin/submodule--helper.c
 #, 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:3460
+#: builtin/submodule--helper.c
 #, c-format
 msgid "'%s' is not a valid submodule name"
 msgstr "'%s' bukan nama submodul yang valid"
 
-#: builtin/submodule--helper.c:3520 git.c:453 git.c:729
+#: builtin/submodule--helper.c git.c
 #, c-format
 msgid "%s doesn't support --super-prefix"
 msgstr "%s tidak mendukung --super-prefix"
 
-#: builtin/submodule--helper.c:3526
+#: builtin/submodule--helper.c
 #, c-format
 msgid "'%s' is not a valid submodule--helper subcommand"
 msgstr "'%s' bukan subperintah submodule--helper valid"
 
-#: builtin/symbolic-ref.c:8
+#: builtin/symbolic-ref.c
 msgid "git symbolic-ref [<options>] <name> [<ref>]"
 msgstr "git symbolic-ref [<opsi>] <nama> [<referensi>]"
 
-#: builtin/symbolic-ref.c:9
+#: builtin/symbolic-ref.c
 msgid "git symbolic-ref -d [-q] <name>"
 msgstr "git symbolic-ref -d [-q] <nama>"
 
-#: builtin/symbolic-ref.c:42
+#: builtin/symbolic-ref.c
 msgid "suppress error message for non-symbolic (detached) refs"
 msgstr "matikan pesan kesalahan untuk referensi non-simbolik (terlepas)"
 
-#: builtin/symbolic-ref.c:43
+#: builtin/symbolic-ref.c
 msgid "delete symbolic ref"
 msgstr "hapus referensi simbolik"
 
-#: builtin/symbolic-ref.c:44
+#: builtin/symbolic-ref.c
 msgid "shorten ref output"
 msgstr "pendekkan keluaran referensi"
 
-#: builtin/symbolic-ref.c:45 builtin/update-ref.c:505
+#: builtin/symbolic-ref.c builtin/update-ref.c
 msgid "reason"
 msgstr "alasan"
 
-#: builtin/symbolic-ref.c:45 builtin/update-ref.c:505
+#: builtin/symbolic-ref.c builtin/update-ref.c
 msgid "reason of the update"
 msgstr "alasan pembaruan"
 
-#: builtin/tag.c:26
+#: builtin/tag.c
 msgid ""
 "git tag [-a | -s | -u <key-id>] [-f] [-m <msg> | -F <file>]\n"
 "        <tagname> [<head>]"
@@ -23604,11 +15563,11 @@ msgstr ""
 "git tag [-a | -s | -u <id kunci>] [-f] [-m <pesan | -F <berkas>]\n"
 "        <nama tag> [<kepala>]"
 
-#: builtin/tag.c:28
+#: builtin/tag.c
 msgid "git tag -d <tagname>..."
 msgstr "git tag -d <nama tag>..."
 
-#: builtin/tag.c:29
+#: builtin/tag.c
 msgid ""
 "git tag -l [-n[<num>]] [--contains <commit>] [--no-contains <commit>] [--"
 "points-at <object>]\n"
@@ -23620,21 +15579,21 @@ msgstr ""
 "        [--format=<format>] [--merged <komit>] [--no-merged <komit>] "
 "[<pola>...]"
 
-#: builtin/tag.c:31
+#: builtin/tag.c
 msgid "git tag -v [--format=<format>] <tagname>..."
 msgstr "git tag -v [--format]<format>] <nama tag>..."
 
-#: builtin/tag.c:101
+#: builtin/tag.c
 #, c-format
 msgid "tag '%s' not found."
 msgstr "tag '%s' tidak ditemukan."
 
-#: builtin/tag.c:136
+#: builtin/tag.c
 #, c-format
 msgid "Deleted tag '%s' (was %s)\n"
 msgstr "Tag '%s' (yaitu %s) dihapus\n"
 
-#: builtin/tag.c:171
+#: builtin/tag.c
 #, c-format
 msgid ""
 "\n"
@@ -23647,7 +15606,7 @@ msgstr ""
 "  %s\n"
 "Baris yang diawali dengan '%c' akan diabaikan.\n"
 
-#: builtin/tag.c:175
+#: builtin/tag.c
 #, c-format
 msgid ""
 "\n"
@@ -23659,14 +15618,14 @@ msgstr ""
 "\n"
 "Tulis pesan untuk tag:\n"
 "  %s\n"
-"Baris yang diawali dengan '%c' akan disimpan; Anda dapat menghapus itu bila "
+"Baris yang diawali dengan '%c' akan disimpan; Anda dapat menghapusnya bila "
 "Anda mau.\n"
 
-#: builtin/tag.c:241
+#: builtin/tag.c
 msgid "unable to sign the tag"
 msgstr "tidak dapat menandatangani tag"
 
-#: builtin/tag.c:259
+#: builtin/tag.c
 #, c-format
 msgid ""
 "You have created a nested tag. The object referred to by your new tag is\n"
@@ -23680,313 +15639,318 @@ msgstr ""
 "\n"
 "\tgit tag -f %s %s^{}"
 
-#: builtin/tag.c:275
+#: builtin/tag.c
 msgid "bad object type."
 msgstr "tipe objek jelek."
 
-#: builtin/tag.c:326
+#: builtin/tag.c
 msgid "no tag message?"
 msgstr "tidak ada pesan tag?"
 
-#: builtin/tag.c:333
+#: builtin/tag.c
 #, c-format
 msgid "The tag message has been left in %s\n"
 msgstr "Pesan tag dibiarkan di %s\n"
 
-#: builtin/tag.c:445
+#: builtin/tag.c
 msgid "list tag names"
 msgstr "daftarkan nama tag"
 
-#: builtin/tag.c:447
+#: builtin/tag.c
 msgid "print <n> lines of each tag message"
 msgstr "cetak <n> baris dari setiap pesan tag"
 
-#: builtin/tag.c:449
+#: builtin/tag.c
 msgid "delete tags"
 msgstr "hapus tag"
 
-#: builtin/tag.c:450
+#: builtin/tag.c
 msgid "verify tags"
 msgstr "verifikasi tag"
 
-#: builtin/tag.c:452
+#: builtin/tag.c
 msgid "Tag creation options"
 msgstr "Opsi pembuatan tag"
 
-#: builtin/tag.c:454
+#: builtin/tag.c
 msgid "annotated tag, needs a message"
 msgstr "tag bercatat, butuh sebuah pesan"
 
-#: builtin/tag.c:456
+#: builtin/tag.c
 msgid "tag message"
 msgstr "pesan tag"
 
-#: builtin/tag.c:458
+#: builtin/tag.c
 msgid "force edit of tag message"
 msgstr "paksa sunting pesan tag"
 
-#: builtin/tag.c:459
+#: builtin/tag.c
 msgid "annotated and GPG-signed tag"
 msgstr "tag bercatat dan bertandatangan GPG"
 
-#: builtin/tag.c:462
+#: builtin/tag.c
 msgid "use another key to sign the tag"
 msgstr "gunakan kunci yang lain untuk menandatangani tag"
 
-#: builtin/tag.c:463
+#: builtin/tag.c
 msgid "replace the tag if exists"
 msgstr "ganti tag jika ada"
 
-#: builtin/tag.c:464 builtin/update-ref.c:511
+#: builtin/tag.c builtin/update-ref.c
 msgid "create a reflog"
 msgstr "buat log referensi"
 
-#: builtin/tag.c:466
+#: builtin/tag.c
 msgid "Tag listing options"
 msgstr "Opsi daftar tag"
 
-#: builtin/tag.c:467
+#: builtin/tag.c
 msgid "show tag list in columns"
 msgstr "perlihatkan daftar tag dalam kolom"
 
-#: builtin/tag.c:468 builtin/tag.c:470
+#: builtin/tag.c
 msgid "print only tags that contain the commit"
 msgstr "hanya cetak tag yang berisi komit"
 
-#: builtin/tag.c:469 builtin/tag.c:471
+#: builtin/tag.c
 msgid "print only tags that don't contain the commit"
 msgstr "hanya cetak tag yang tidak berisi komit"
 
-#: builtin/tag.c:472
+#: builtin/tag.c
 msgid "print only tags that are merged"
 msgstr "hanya cetak tag yang tergabung"
 
-#: builtin/tag.c:473
+#: builtin/tag.c
 msgid "print only tags that are not merged"
 msgstr "hanya cetak tag yang tak tergabung"
 
-#: builtin/tag.c:477
+#: builtin/tag.c
 msgid "print only tags of the object"
 msgstr "hanya cetak tag dari objek"
 
-#: builtin/tag.c:559
+#: builtin/tag.c
 #, c-format
 msgid "the '%s' option is only allowed in list mode"
 msgstr "opsi '%s' hanya diperbolehkan dalam mode daftar"
 
-#: builtin/tag.c:598
+#: builtin/tag.c
 #, c-format
 msgid "'%s' is not a valid tag name."
 msgstr "'%s' bukan nama tag yang valid."
 
-#: builtin/tag.c:603
+#: builtin/tag.c
 #, c-format
 msgid "tag '%s' already exists"
 msgstr "tag '%s' sudah ada"
 
-#: builtin/tag.c:634
+#: builtin/tag.c sequencer.c
+#, c-format
+msgid "Invalid cleanup mode %s"
+msgstr "Mode pembersihan tidak valid %s"
+
+#: builtin/tag.c
 #, c-format
 msgid "Updated tag '%s' (was %s)\n"
 msgstr "Tag '%s' diperbarui (yaitu %s)\n"
 
-#: builtin/unpack-objects.c:95
+#: builtin/unpack-objects.c
 msgid "pack exceeds maximum allowed size"
 msgstr "paket melebihi ukuran maksimum yang diperbolehkan"
 
-#: builtin/unpack-objects.c:504
+#: builtin/unpack-objects.c
 msgid "Unpacking objects"
 msgstr "Membongkar objek"
 
-#: builtin/update-index.c:84
+#: builtin/update-index.c
 #, c-format
 msgid "failed to create directory %s"
 msgstr "gagal membuat direktori %s"
 
-#: builtin/update-index.c:106
+#: builtin/update-index.c
 #, c-format
 msgid "failed to delete file %s"
 msgstr "gagal menghapus berkas %s"
 
-#: builtin/update-index.c:113 builtin/update-index.c:219
+#: builtin/update-index.c
 #, c-format
 msgid "failed to delete directory %s"
 msgstr "gagal menghapus direktori %s"
 
-#: builtin/update-index.c:138
+#: builtin/update-index.c
 #, c-format
 msgid "Testing mtime in '%s' "
 msgstr "Menguji mtime di '%s' "
 
-#: builtin/update-index.c:152
+#: builtin/update-index.c
 msgid "directory stat info does not change after adding a new file"
 msgstr "info stat direktori tidak berubah setelah menambahkan berkas baru"
 
-#: builtin/update-index.c:165
+#: builtin/update-index.c
 msgid "directory stat info does not change after adding a new directory"
 msgstr "info stat direktori tidak berubah setelah menambahkan direktori baru"
 
-#: builtin/update-index.c:178
+#: builtin/update-index.c
 msgid "directory stat info changes after updating a file"
 msgstr "info stat direktori berubah setelah memperbarui berkas"
 
-#: builtin/update-index.c:189
+#: builtin/update-index.c
 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:200
+#: builtin/update-index.c
 msgid "directory stat info does not change after deleting a file"
 msgstr "info stat direktori tidak berubah setelah menghapus berkas"
 
-#: builtin/update-index.c:213
+#: builtin/update-index.c
 msgid "directory stat info does not change after deleting a directory"
 msgstr "info stat direktori tidak berubah setelah menghapus direktori"
 
-#: builtin/update-index.c:220
+#: builtin/update-index.c
 msgid " OK"
 msgstr " OK"
 
-#: builtin/update-index.c:589
+#: builtin/update-index.c
 msgid "git update-index [<options>] [--] [<file>...]"
 msgstr "git update-index [<opsi>] [--] [<berkas>...]"
 
-#: builtin/update-index.c:993
+#: builtin/update-index.c
 msgid "continue refresh even when index needs update"
 msgstr "lanjutkan penyegaran bahkan ketika indeks perlu diperbarui"
 
-#: builtin/update-index.c:996
+#: builtin/update-index.c
 msgid "refresh: ignore submodules"
 msgstr "refresh: abaikan submodul"
 
-#: builtin/update-index.c:999
+#: builtin/update-index.c
 msgid "do not ignore new files"
 msgstr "jangan abaikan berkas baru"
 
-#: builtin/update-index.c:1001
+#: builtin/update-index.c
 msgid "let files replace directories and vice-versa"
 msgstr "biarkan berkas menggantikan direktori dan sebaliknya"
 
-#: builtin/update-index.c:1003
+#: builtin/update-index.c
 msgid "notice files missing from worktree"
 msgstr "catat berkas hilang dari pohon kerja"
 
-#: builtin/update-index.c:1005
+#: builtin/update-index.c
 msgid "refresh even if index contains unmerged entries"
 msgstr "segarkan bahkan jika indeks berisi entri tak tergabung"
 
-#: builtin/update-index.c:1008
+#: builtin/update-index.c
 msgid "refresh stat information"
 msgstr "segarkan informasi stat"
 
-#: builtin/update-index.c:1012
+#: builtin/update-index.c
 msgid "like --refresh, but ignore assume-unchanged setting"
 msgstr "seperti --refresh, tapi abaikan setelan assume-unchanged"
 
-#: builtin/update-index.c:1016
+#: builtin/update-index.c
 msgid "<mode>,<object>,<path>"
 msgstr "<mode>,<objek>,<jalur>"
 
-#: builtin/update-index.c:1017
+#: builtin/update-index.c
 msgid "add the specified entry to the index"
 msgstr "tambahkan entri yang disebutkan ke indeks"
 
-#: builtin/update-index.c:1027
+#: builtin/update-index.c
 msgid "mark files as \"not changing\""
 msgstr "tandai berkas sebagai \"not changing\""
 
-#: builtin/update-index.c:1030
+#: builtin/update-index.c
 msgid "clear assumed-unchanged bit"
 msgstr "bersihkan bita assumed-unchanged"
 
-#: builtin/update-index.c:1033
+#: builtin/update-index.c
 msgid "mark files as \"index-only\""
 msgstr "tandai berkas sebagai \"index-only\""
 
-#: builtin/update-index.c:1036
+#: builtin/update-index.c
 msgid "clear skip-worktree bit"
 msgstr "bersihkan bita skip-worktree"
 
-#: builtin/update-index.c:1039
+#: builtin/update-index.c
 msgid "do not touch index-only entries"
 msgstr "jangan sentuh entri index-only"
 
-#: builtin/update-index.c:1041
+#: builtin/update-index.c
 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:1043
+#: builtin/update-index.c
 msgid "remove named paths even if present in worktree"
 msgstr "hapus jalur bernama bahkan jika ada dalam pohon kerja"
 
-#: builtin/update-index.c:1045
+#: builtin/update-index.c
 msgid "with --stdin: input lines are terminated by null bytes"
 msgstr "dengan --stdin: baris masukan diakhiri dengan bita null"
 
-#: builtin/update-index.c:1047
+#: builtin/update-index.c
 msgid "read list of paths to be updated from standard input"
 msgstr "baca daftar jalur yang akan diperbarui dari masukan standar"
 
-#: builtin/update-index.c:1051
+#: builtin/update-index.c
 msgid "add entries from standard input to the index"
 msgstr "tambahkan entri dari masukan standar ke indeks"
 
-#: builtin/update-index.c:1055
+#: builtin/update-index.c
 msgid "repopulate stages #2 and #3 for the listed paths"
 msgstr "populasi ulang tahapan #2 dan #3 untuk jalur yang terdaftar"
 
-#: builtin/update-index.c:1059
+#: builtin/update-index.c
 msgid "only update entries that differ from HEAD"
 msgstr "hanya perbarui entri yang berbeda dari HEAD"
 
-#: builtin/update-index.c:1063
+#: builtin/update-index.c
 msgid "ignore files missing from worktree"
 msgstr "abaikan berkas yang hilang dari pohon kerja"
 
-#: builtin/update-index.c:1066
+#: builtin/update-index.c
 msgid "report actions to standard output"
 msgstr "laporkan aksi ke keluaran standar"
 
-#: builtin/update-index.c:1068
+#: builtin/update-index.c
 msgid "(for porcelains) forget saved unresolved conflicts"
 msgstr "(untuk porselen) lupakan konflik tak terselesaikan yang disimpan"
 
-#: builtin/update-index.c:1072
+#: builtin/update-index.c
 msgid "write index in this format"
 msgstr "tulis indeks dalam format ini"
 
-#: builtin/update-index.c:1074
+#: builtin/update-index.c
 msgid "enable or disable split index"
 msgstr "aktifkan atau nonaktifkan indeks terpisah"
 
-#: builtin/update-index.c:1076
+#: builtin/update-index.c
 msgid "enable/disable untracked cache"
 msgstr "aktifkan/nonaktifkan tembolok tak terlacak"
 
-#: builtin/update-index.c:1078
+#: builtin/update-index.c
 msgid "test if the filesystem supports untracked cache"
 msgstr "uji jika sistem berkas mendukung tembolok tak terlacak"
 
-#: builtin/update-index.c:1080
+#: builtin/update-index.c
 msgid "enable untracked cache without testing the filesystem"
 msgstr "aktifkan tembolok tak terlacak tanpa menguji sistem berkas"
 
-#: builtin/update-index.c:1082
+#: builtin/update-index.c
 msgid "write out the index even if is not flagged as changed"
 msgstr "tulis indeks bahkan jika tidak dianggap berubah"
 
-#: builtin/update-index.c:1084
+#: builtin/update-index.c
 msgid "enable or disable file system monitor"
 msgstr "aktifkan atau nonaktifkan monitor sistem berkas"
 
-#: builtin/update-index.c:1086
+#: builtin/update-index.c
 msgid "mark files as fsmonitor valid"
 msgstr "tandai berkas sebagai fsmonitor valid"
 
-#: builtin/update-index.c:1089
+#: builtin/update-index.c
 msgid "clear fsmonitor valid bit"
 msgstr "bersihkan bita fsmonitor valid"
 
-#: builtin/update-index.c:1195
+#: builtin/update-index.c
 msgid ""
 "core.splitIndex is set to false; remove or change it, if you really want to "
 "enable split index"
@@ -23994,7 +15958,7 @@ msgstr ""
 "core.splitIndex disetel ke false; hapus atau ubah, jika Anda benar-benar "
 "ingin mengaktifkan indeks terpisah"
 
-#: builtin/update-index.c:1204
+#: builtin/update-index.c
 msgid ""
 "core.splitIndex is set to true; remove or change it, if you really want to "
 "disable split index"
@@ -24002,7 +15966,7 @@ msgstr ""
 "core.splitIndex disetel ke true; hapus atau ubah, jika Anda benar-benar  "
 "ingin menonaktifkan indeks terpisah"
 
-#: builtin/update-index.c:1216
+#: builtin/update-index.c
 msgid ""
 "core.untrackedCache is set to true; remove or change it, if you really want "
 "to disable the untracked cache"
@@ -24010,11 +15974,11 @@ msgstr ""
 "core.untrackedCache disetel ke true; hapus atau ubah, jika Anda benar-benar "
 "ingin menonaktifkan tembolok tak terlacak"
 
-#: builtin/update-index.c:1220
+#: builtin/update-index.c
 msgid "Untracked cache disabled"
 msgstr "Tembolok tak terlacak dinonaktifkan"
 
-#: builtin/update-index.c:1228
+#: builtin/update-index.c
 msgid ""
 "core.untrackedCache is set to false; remove or change it, if you really want "
 "to enable the untracked cache"
@@ -24022,173 +15986,173 @@ msgstr ""
 "core.untrackedCache disetel ke false; hapus atau ubah, jika Anda benar-benar "
 "ingin mengaktifkan tembolok tak terlacak"
 
-#: builtin/update-index.c:1232
+#: builtin/update-index.c
 #, c-format
 msgid "Untracked cache enabled for '%s'"
 msgstr "Tembolok tak terlacak diaktifkan untuk '%s'"
 
-#: builtin/update-index.c:1241
+#: builtin/update-index.c
 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:1246
+#: builtin/update-index.c
 msgid "fsmonitor enabled"
 msgstr "fsmonitor diaktifkan"
 
-#: builtin/update-index.c:1250
+#: builtin/update-index.c
 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:1254
+#: builtin/update-index.c
 msgid "fsmonitor disabled"
 msgstr "fsmonitor dinonaktifkan"
 
-#: builtin/update-ref.c:10
+#: builtin/update-ref.c
 msgid "git update-ref [<options>] -d <refname> [<old-val>]"
 msgstr "git update-ref [<opsi>] -d <nama referensi> [<nilai lama>]"
 
-#: builtin/update-ref.c:11
+#: builtin/update-ref.c
 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
+#: builtin/update-ref.c
 msgid "git update-ref [<options>] --stdin [-z]"
 msgstr "git update-ref [<opsi>] --stdin [-z]"
 
-#: builtin/update-ref.c:506
+#: builtin/update-ref.c
 msgid "delete the reference"
 msgstr "hapus referensi"
 
-#: builtin/update-ref.c:508
+#: builtin/update-ref.c
 msgid "update <refname> not the one it points to"
 msgstr "perbarui <nama referensi> bukan yang ditunjuknya"
 
-#: builtin/update-ref.c:509
+#: builtin/update-ref.c
 msgid "stdin has NUL-terminated arguments"
 msgstr "stdin punya argumen yang diakhiri dengan NUL"
 
-#: builtin/update-ref.c:510
+#: builtin/update-ref.c
 msgid "read updates from stdin"
 msgstr "baca pembaruan dari masukan standar"
 
-#: builtin/update-server-info.c:15
+#: builtin/update-server-info.c
 msgid "update the info files from scratch"
-msgstr ""
+msgstr "perbarui berkas info dari awal"
 
-#: builtin/upload-pack.c:11
+#: builtin/upload-pack.c
 msgid "git upload-pack [<options>] <dir>"
 msgstr "git upload-pack [<opsi>] <direktori>"
 
-#: builtin/upload-pack.c:24 t/helper/test-serve-v2.c:17
+#: builtin/upload-pack.c t/helper/test-serve-v2.c
 msgid "quit after a single request/response exchange"
 msgstr "keluar setelah pertukaran permintaan/jawaban tunggal"
 
-#: builtin/upload-pack.c:26
+#: builtin/upload-pack.c
 msgid "serve up the info/refs for git-http-backend"
 msgstr "layani info/referensi untuk git-http-backend"
 
-#: builtin/upload-pack.c:29
+#: builtin/upload-pack.c
 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
+#: builtin/upload-pack.c
 msgid "interrupt transfer after <n> seconds of inactivity"
 msgstr "interupsi transfer setelah <n> detik niraktivitas"
 
-#: builtin/verify-commit.c:19
+#: builtin/verify-commit.c
 msgid "git verify-commit [-v | --verbose] <commit>..."
 msgstr "git verify-commit [-v | --verbose] <komit>..."
 
-#: builtin/verify-commit.c:68
+#: builtin/verify-commit.c
 msgid "print commit contents"
 msgstr "cetak isi komit"
 
-#: builtin/verify-commit.c:69 builtin/verify-tag.c:37
+#: builtin/verify-commit.c builtin/verify-tag.c
 msgid "print raw gpg status output"
 msgstr "cetak keluaran status gpg mentah"
 
-#: builtin/verify-pack.c:59
+#: builtin/verify-pack.c
 msgid "git verify-pack [-v | --verbose] [-s | --stat-only] <pack>..."
 msgstr "git verify-pack [-v | --verbose] [-s | --stat-only] <pak>..."
 
-#: builtin/verify-pack.c:70
+#: builtin/verify-pack.c
 msgid "verbose"
 msgstr "bertele-tele"
 
-#: builtin/verify-pack.c:72
+#: builtin/verify-pack.c
 msgid "show statistics only"
 msgstr "hanya perlihatkan statistik"
 
-#: builtin/verify-tag.c:18
+#: builtin/verify-tag.c
 msgid "git verify-tag [-v | --verbose] [--format=<format>] <tag>..."
 msgstr "git verify-tag [-v | --verbose] [--format=<format>] <tag>..."
 
-#: builtin/verify-tag.c:36
+#: builtin/verify-tag.c
 msgid "print tag contents"
 msgstr "cetak isi tag"
 
-#: builtin/worktree.c:19
+#: builtin/worktree.c
 msgid "git worktree add [<options>] <path> [<commit-ish>]"
 msgstr "git worktree add [<opsi>] <jalur> [<mirip komit>]"
 
-#: builtin/worktree.c:20
+#: builtin/worktree.c
 msgid "git worktree list [<options>]"
 msgstr "git worktree list [<opsi>]"
 
-#: builtin/worktree.c:21
+#: builtin/worktree.c
 msgid "git worktree lock [<options>] <path>"
 msgstr "git worktree lock [<opsi>] <jalur>"
 
-#: builtin/worktree.c:22
+#: builtin/worktree.c
 msgid "git worktree move <worktree> <new-path>"
 msgstr "git worktree move <pohon kerja> <jalur baru>"
 
-#: builtin/worktree.c:23
+#: builtin/worktree.c
 msgid "git worktree prune [<options>]"
 msgstr "git worktree prune [<opsi>]"
 
-#: builtin/worktree.c:24
+#: builtin/worktree.c
 msgid "git worktree remove [<options>] <worktree>"
 msgstr "git worktree remove [<opsi>] <pohon kerja>"
 
-#: builtin/worktree.c:25
+#: builtin/worktree.c
 msgid "git worktree repair [<path>...]"
 msgstr "git worktree repair [<jalur>...]"
 
-#: builtin/worktree.c:26
+#: builtin/worktree.c
 msgid "git worktree unlock <path>"
 msgstr "git worktree unlock <jalur>"
 
-#: builtin/worktree.c:76
+#: builtin/worktree.c
 #, c-format
 msgid "Removing %s/%s: %s"
 msgstr "Menghapus %s/%s: %s"
 
-#: builtin/worktree.c:149
+#: builtin/worktree.c
 msgid "report pruned working trees"
 msgstr "laporkan pohon kerja terpangkas"
 
-#: builtin/worktree.c:151
+#: builtin/worktree.c
 msgid "expire working trees older than <time>"
 msgstr "kadaluarsakan pohon kerja yang lebih tua dari <waktu>"
 
-#: builtin/worktree.c:221
+#: builtin/worktree.c
 #, c-format
 msgid "'%s' already exists"
 msgstr "'%s' sudah ada"
 
-#: builtin/worktree.c:230
+#: builtin/worktree.c
 #, c-format
 msgid "unusable worktree destination '%s'"
 msgstr "tujuan pohon kerja '%s' tidak dapat diguanakan"
 
-#: builtin/worktree.c:235
+#: builtin/worktree.c
 #, c-format
 msgid ""
 "'%s' is a missing but locked worktree;\n"
@@ -24198,7 +16162,7 @@ msgstr ""
 "gunakan '%s -f -f' untuk menimpa, atau 'unlock' dan 'prune' atau 'remove' "
 "untuk membersihkan"
 
-#: builtin/worktree.c:237
+#: builtin/worktree.c
 #, c-format
 msgid ""
 "'%s' is a missing but already registered worktree;\n"
@@ -24207,150 +16171,154 @@ msgstr ""
 "'%s' adalah pohon kerja hilang tapi telah didaftarkan;\n"
 "gunakan '%s -f' untuk menimpa, atau 'prune' atau 'remove' untuk membersihkan"
 
-#: builtin/worktree.c:248
+#: builtin/worktree.c
 #, c-format
 msgid "failed to copy '%s' to '%s'; sparse-checkout may not work correctly"
 msgstr ""
 "gagal menyalin '%s' ke '%s'; checkout tipis mungkin tidak bekerja dengan baik"
 
-#: builtin/worktree.c:268
+#: builtin/worktree.c
 #, c-format
 msgid "failed to copy worktree config from '%s' to '%s'"
 msgstr "Gagal menyalin konfigurasi pohon kerja dari '%s' ke '%s'"
 
-#: builtin/worktree.c:280 builtin/worktree.c:285
+#: builtin/worktree.c
 #, c-format
 msgid "failed to unset '%s' in '%s'"
 msgstr "gagal menyetel balik '%s' di '%s'"
 
-#: builtin/worktree.c:356
+#: builtin/worktree.c
 #, c-format
 msgid "could not create directory of '%s'"
 msgstr "tidak dapat membuat direktori '%s'"
 
-#: builtin/worktree.c:378
+#: builtin/worktree.c
 msgid "initializing"
 msgstr "menginisialisasi"
 
-#: builtin/worktree.c:492 builtin/worktree.c:498
+#: builtin/worktree.c
 #, c-format
 msgid "Preparing worktree (new branch '%s')"
 msgstr "Menyiapkan pohon kerja (cabang baru '%s')"
 
-#: builtin/worktree.c:494
+#: builtin/worktree.c
 #, c-format
 msgid "Preparing worktree (resetting branch '%s'; was at %s)"
 msgstr ""
 "Menyiapkan pohon kerja (menyetel ulang cabang '%s'; sebelumnya pada %s)"
 
-#: builtin/worktree.c:503
+#: builtin/worktree.c
 #, c-format
 msgid "Preparing worktree (checking out '%s')"
 msgstr "Menyiapkan pohon kerja (men-checkout '%s')"
 
-#: builtin/worktree.c:509
+#: builtin/worktree.c
 #, c-format
 msgid "Preparing worktree (detached HEAD %s)"
 msgstr "Menyiapkan pohon kerja (HEAD terpisah %s)"
 
-#: builtin/worktree.c:554
+#: builtin/worktree.c
 msgid "checkout <branch> even if already checked out in other worktree"
 msgstr ""
 "checkout <cabang> bahkan jika sudah di-checkout pada pohon kerja lainnya"
 
-#: builtin/worktree.c:557
+#: builtin/worktree.c
 msgid "create a new branch"
 msgstr "buat sebuah cabang baru"
 
-#: builtin/worktree.c:559
+#: builtin/worktree.c
 msgid "create or reset a branch"
 msgstr "buat atau setel ulang sebuah cabang"
 
-#: builtin/worktree.c:561
+#: builtin/worktree.c
 msgid "populate the new working tree"
 msgstr "isikan pohon kerja baru"
 
-#: builtin/worktree.c:562
+#: builtin/worktree.c
 msgid "keep the new working tree locked"
 msgstr "tetap pohon kerja baru terkunci"
 
-#: builtin/worktree.c:564 builtin/worktree.c:809
+#: builtin/worktree.c
 msgid "reason for locking"
 msgstr "alasan penguncian"
 
-#: builtin/worktree.c:567
+#: builtin/worktree.c
 msgid "set up tracking mode (see git-branch(1))"
 msgstr "pasang mode pelacakan (lihat git-branch(1))"
 
-#: builtin/worktree.c:570
+#: builtin/worktree.c
 msgid "try to match the new branch name with a remote-tracking branch"
 msgstr "coba cocokkan nama cabang baru dengan sebuah cabang pelacakan remote"
 
-#: builtin/worktree.c:584
+#: builtin/worktree.c diff.c parse-options.c
+#, c-format
+msgid "options '%s', '%s', and '%s' cannot be used together"
+msgstr "Opsi '%s', '%s', dan '%s' tidak dapat digunakan bersamaan"
+
+#: builtin/worktree.c
 msgid "added with --lock"
 msgstr "tambahkan dengan --lock"
 
-#: builtin/worktree.c:646
+#: builtin/worktree.c
 msgid "--[no-]track can only be used if a new branch is created"
 msgstr "--[no-]track hanya dapat digunakan jika cabang baru dibuat"
 
-#: builtin/worktree.c:766
+#: builtin/worktree.c
 msgid "show extended annotations and reasons, if available"
-msgstr ""
+msgstr "perlihatkan anotasi dan alasan yang diperpanjang, jika ada"
 
-#: builtin/worktree.c:768
+#: builtin/worktree.c
 msgid "add 'prunable' annotation to worktrees older than <time>"
 msgstr ""
 "tambahkan anotasi 'dapat dipangkas' ke pohon kerja lebih tua dari <time>"
 
-#: builtin/worktree.c:770
+#: builtin/worktree.c
 msgid "terminate records with a NUL character"
 msgstr "akhiri rekaman dengan karakter NUL"
 
-#: builtin/worktree.c:821 builtin/worktree.c:854 builtin/worktree.c:928
-#: builtin/worktree.c:1052
+#: builtin/worktree.c
 #, c-format
 msgid "'%s' is not a working tree"
 msgstr "'%s' bukan sebuah pohon kerja"
 
-#: builtin/worktree.c:823 builtin/worktree.c:856
+#: builtin/worktree.c
 msgid "The main working tree cannot be locked or unlocked"
 msgstr "Pohon kerja utama tidak dapat dikunci atau dibuka kunci"
 
-#: builtin/worktree.c:828
+#: builtin/worktree.c
 #, c-format
 msgid "'%s' is already locked, reason: %s"
 msgstr "'%s' sudah terkunci, alasan: %s"
 
-#: builtin/worktree.c:830
+#: builtin/worktree.c
 #, c-format
 msgid "'%s' is already locked"
 msgstr "'%s' sudah terkunci"
 
-#: builtin/worktree.c:858
+#: builtin/worktree.c
 #, c-format
 msgid "'%s' is not locked"
 msgstr "'%s' tidak terkunci"
 
-#: builtin/worktree.c:899
+#: builtin/worktree.c
 msgid "working trees containing submodules cannot be moved or removed"
 msgstr "pohon kerja yang berisi submodul tidak dapat dipindahkan atau dihapus"
 
-#: builtin/worktree.c:907
+#: builtin/worktree.c
 msgid "force move even if worktree is dirty or locked"
 msgstr "paksa pindah bahkan jika pohon kerja kotor atau terkunci"
 
-#: builtin/worktree.c:930 builtin/worktree.c:1054
+#: builtin/worktree.c
 #, c-format
 msgid "'%s' is a main working tree"
 msgstr "'%s' adalah pohon kerja utama"
 
-#: builtin/worktree.c:935
+#: builtin/worktree.c
 #, c-format
 msgid "could not figure out destination name from '%s'"
 msgstr "tidak dapat menebak nama tujuan dari '%s'"
 
-#: builtin/worktree.c:948
+#: builtin/worktree.c
 #, c-format
 msgid ""
 "cannot move a locked working tree, lock reason: %s\n"
@@ -24359,7 +16327,7 @@ msgstr ""
 "tidak dapat memindahkan pohon kerja terkunci, alasan penguncian: %s\n"
 "gunakan 'move -f -f' untuk memaksakan atau membuka kunci terlebih dahulu"
 
-#: builtin/worktree.c:950
+#: builtin/worktree.c
 msgid ""
 "cannot move a locked working tree;\n"
 "use 'move -f -f' to override or unlock first"
@@ -24367,38 +16335,38 @@ msgstr ""
 "tidak dapat memindahkan pohon kerja terkunci;\n"
 "gunakan 'move -f -f' untuk memaksakan atau membuka kunci terlebih dahulu"
 
-#: builtin/worktree.c:953
+#: builtin/worktree.c
 #, c-format
 msgid "validation failed, cannot move working tree: %s"
 msgstr "validasi gagal, tidak dapat memindahkan pohon kerja: %s"
 
-#: builtin/worktree.c:958
+#: builtin/worktree.c
 #, c-format
 msgid "failed to move '%s' to '%s'"
 msgstr "gagal memindahkan '%s' ke '%s'"
 
-#: builtin/worktree.c:1004
+#: builtin/worktree.c
 #, c-format
 msgid "failed to run 'git status' on '%s'"
 msgstr "tidak dapat menjalankan 'git status' pada '%s'"
 
-#: builtin/worktree.c:1008
+#: builtin/worktree.c
 #, c-format
 msgid "'%s' contains modified or untracked files, use --force to delete it"
 msgstr ""
 "'%s' berisi berkas termodifikasi atau tak terlacak, gunakan --force untuk "
 "menghapus"
 
-#: builtin/worktree.c:1013
+#: builtin/worktree.c
 #, c-format
 msgid "failed to run 'git status' on '%s', code %d"
 msgstr "gagal menjalankan 'git status' pada '%s', kode %d"
 
-#: builtin/worktree.c:1036
+#: builtin/worktree.c
 msgid "force removal even if worktree is dirty or locked"
 msgstr "paksa penghapusan bahkan jika pohon kerja kotor atau terkunci"
 
-#: builtin/worktree.c:1059
+#: builtin/worktree.c
 #, c-format
 msgid ""
 "cannot remove a locked working tree, lock reason: %s\n"
@@ -24407,7 +16375,7 @@ msgstr ""
 "tidak dapat menghapus pohon kerja terkunci, alasan penguncian: %s\n"
 "gunakan 'remove -f -f' untuk memaksakan atau buka kunci terlebih dahulu"
 
-#: builtin/worktree.c:1061
+#: builtin/worktree.c
 msgid ""
 "cannot remove a locked working tree;\n"
 "use 'remove -f -f' to override or unlock first"
@@ -24415,40 +16383,3358 @@ msgstr ""
 "tidak dapat menghapus pohon kerja terkunci;\n"
 "gunakan 'remove -f -f' untuk memaksakan atau buka kunci terlebih dahulu"
 
-#: builtin/worktree.c:1064
+#: builtin/worktree.c
 #, c-format
 msgid "validation failed, cannot remove working tree: %s"
 msgstr "validasi gagal, tidak dapat menghapus pohon kerja: %s"
 
-#: builtin/worktree.c:1088
+#: builtin/worktree.c
 #, c-format
 msgid "repair: %s: %s"
 msgstr "perbaikan: %s: %s"
 
-#: builtin/worktree.c:1091
+#: builtin/worktree.c
 #, c-format
 msgid "error: %s: %s"
 msgstr "kesalahan: %s: %s"
 
-#: builtin/write-tree.c:15
+#: builtin/write-tree.c
 msgid "git write-tree [--missing-ok] [--prefix=<prefix>/]"
 msgstr "git write-tree [--missing-ok] [--prefix=<prefiks>/]"
 
-#: builtin/write-tree.c:28
+#: builtin/write-tree.c
 msgid "<prefix>/"
 msgstr "<prefiks>/"
 
-#: builtin/write-tree.c:29
+#: builtin/write-tree.c
 msgid "write tree object for a subdirectory <prefix>"
 msgstr "tulis objek pohon untuk subdirektori <prefiks>"
 
-#: builtin/write-tree.c:31
+#: builtin/write-tree.c
 msgid "only useful for debugging"
 msgstr "hanya berguna untuk penirkutuan"
 
-#: git.c:28
+#: bundle.c
+#, c-format
+msgid "unrecognized bundle hash algorithm: %s"
+msgstr "algoritma hash bundel tidak dikenal: %s"
+
+#: bundle.c
+#, c-format
+msgid "unknown capability '%s'"
+msgstr "kapabilitas '%s' tidak dikenal"
+
+#: bundle.c
+#, c-format
+msgid "'%s' does not look like a v2 or v3 bundle file"
+msgstr "'%s' tidak terlihat seperti berkas bundel v2 atau v3"
+
+#: bundle.c
+#, c-format
+msgid "unrecognized header: %s%s (%d)"
+msgstr "kepala tidak dikenal: %s%s (%d)"
+
+#: bundle.c
+msgid "Repository lacks these prerequisite commits:"
+msgstr "Repositori kekurangan komit prasyarat berikut:"
+
+#: bundle.c
+msgid "need a repository to verify a bundle"
+msgstr "perlu sebuah repositori untuk verifikasi bundel"
+
+#: bundle.c
+#, c-format
+msgid "The bundle contains this ref:"
+msgid_plural "The bundle contains these %<PRIuMAX> refs:"
+msgstr[0] "Bundel berisi referensi ini:"
+msgstr[1] "Bundel berisi %<PRIuMAX> referensi berikut:"
+
+#: bundle.c
+msgid "The bundle records a complete history."
+msgstr "Bundel merekam riwayat penuh."
+
+#: bundle.c
+#, c-format
+msgid "The bundle requires this ref:"
+msgid_plural "The bundle requires these %<PRIuMAX> refs:"
+msgstr[0] "Bundel membutuhkan referensi ini:"
+msgstr[1] "Bundel membutuhkan %<PRIuMAX> referensi berikut:"
+
+#: bundle.c
+msgid "unable to dup bundle descriptor"
+msgstr "tidak dapat men-dup pendeskripsi bundel"
+
+#: bundle.c
+msgid "Could not spawn pack-objects"
+msgstr "Tidak dapat menghidupkan pack-objects"
+
+#: bundle.c
+msgid "pack-objects died"
+msgstr "pack-objects mati"
+
+#: bundle.c
+#, c-format
+msgid "ref '%s' is excluded by the rev-list options"
+msgstr "referensi '%s' dikecualikan oleh opsi rev-list"
+
+#: bundle.c
+#, c-format
+msgid "unsupported bundle version %d"
+msgstr "versi bundle %d tidak didukung"
+
+#: bundle.c
+#, c-format
+msgid "cannot write bundle version %d with algorithm %s"
+msgstr "tidak dapat menulis versi bundel %d dengan algoritma %s"
+
+#: bundle.c
+msgid "Refusing to create empty bundle."
+msgstr "Menolak memuat bundel kosong."
+
+#: bundle.c
+#, c-format
+msgid "cannot create '%s'"
+msgstr "tidak dapat membuat '%s'"
+
+#: bundle.c
+msgid "index-pack died"
+msgstr "index-pack mati"
+
+#: chunk-format.c
+msgid "terminating chunk id appears earlier than expected"
+msgstr ""
+
+#: chunk-format.c
+#, c-format
+msgid "improper chunk offset(s) %<PRIx64> and %<PRIx64>"
+msgstr ""
+
+#: chunk-format.c
+#, c-format
+msgid "duplicate chunk ID %<PRIx32> found"
+msgstr ""
+
+#: chunk-format.c
+#, c-format
+msgid "final chunk has non-zero id %<PRIx32>"
+msgstr ""
+
+#: chunk-format.c
+msgid "invalid hash version"
+msgstr ""
+
+#: color.c
+#, c-format
+msgid "invalid color value: %.*s"
+msgstr ""
+
+#: command-list.h
+msgid "Add file contents to the index"
+msgstr ""
+
+#: command-list.h
+msgid "Apply a series of patches from a mailbox"
+msgstr ""
+
+#: command-list.h
+msgid "Annotate file lines with commit information"
+msgstr ""
+
+#: command-list.h
+msgid "Apply a patch to files and/or to the index"
+msgstr ""
+
+#: command-list.h
+msgid "Import a GNU Arch repository into Git"
+msgstr ""
+
+#: command-list.h
+msgid "Create an archive of files from a named tree"
+msgstr ""
+
+#: command-list.h
+msgid "Use binary search to find the commit that introduced a bug"
+msgstr ""
+
+#: command-list.h
+msgid "Show what revision and author last modified each line of a file"
+msgstr ""
+
+#: command-list.h
+msgid "List, create, or delete branches"
+msgstr ""
+
+#: command-list.h
+msgid "Collect information for user to file a bug report"
+msgstr ""
+
+#: command-list.h
+msgid "Move objects and refs by archive"
+msgstr ""
+
+#: command-list.h
+msgid "Provide content or type and size information for repository objects"
+msgstr ""
+
+#: command-list.h
+msgid "Display gitattributes information"
+msgstr ""
+
+#: command-list.h
+msgid "Debug gitignore / exclude files"
+msgstr ""
+
+#: command-list.h
+msgid "Show canonical names and email addresses of contacts"
+msgstr ""
+
+#: command-list.h
+msgid "Ensures that a reference name is well formed"
+msgstr ""
+
+#: command-list.h
+msgid "Switch branches or restore working tree files"
+msgstr ""
+
+#: command-list.h
+msgid "Copy files from the index to the working tree"
+msgstr ""
+
+#: command-list.h
+msgid "Find commits yet to be applied to upstream"
+msgstr ""
+
+#: command-list.h
+msgid "Apply the changes introduced by some existing commits"
+msgstr ""
+
+#: command-list.h
+msgid "Graphical alternative to git-commit"
+msgstr ""
+
+#: command-list.h
+msgid "Remove untracked files from the working tree"
+msgstr ""
+
+#: command-list.h
+msgid "Clone a repository into a new directory"
+msgstr ""
+
+#: command-list.h
+msgid "Display data in columns"
+msgstr ""
+
+#: command-list.h
+msgid "Record changes to the repository"
+msgstr ""
+
+#: command-list.h
+msgid "Write and verify Git commit-graph files"
+msgstr ""
+
+#: command-list.h
+msgid "Create a new commit object"
+msgstr ""
+
+#: command-list.h
+msgid "Get and set repository or global options"
+msgstr ""
+
+#: command-list.h
+msgid "Count unpacked number of objects and their disk consumption"
+msgstr ""
+
+#: command-list.h
+msgid "Retrieve and store user credentials"
+msgstr ""
+
+#: command-list.h
+msgid "Helper to temporarily store passwords in memory"
+msgstr ""
+
+#: command-list.h
+msgid "Helper to store credentials on disk"
+msgstr ""
+
+#: command-list.h
+msgid "Export a single commit to a CVS checkout"
+msgstr ""
+
+#: command-list.h
+msgid "Salvage your data out of another SCM people love to hate"
+msgstr ""
+
+#: command-list.h
+msgid "A CVS server emulator for Git"
+msgstr ""
+
+#: command-list.h
+msgid "A really simple server for Git repositories"
+msgstr ""
+
+#: command-list.h
+msgid "Give an object a human readable name based on an available ref"
+msgstr ""
+
+#: command-list.h
+msgid "Show changes between commits, commit and working tree, etc"
+msgstr ""
+
+#: command-list.h
+msgid "Compares files in the working tree and the index"
+msgstr ""
+
+#: command-list.h
+msgid "Compare a tree to the working tree or index"
+msgstr ""
+
+#: command-list.h
+msgid "Compares the content and mode of blobs found via two tree objects"
+msgstr ""
+
+#: command-list.h
+msgid "Show changes using common diff tools"
+msgstr ""
+
+#: command-list.h
+msgid "Git data exporter"
+msgstr ""
+
+#: command-list.h
+msgid "Backend for fast Git data importers"
+msgstr ""
+
+#: command-list.h
+msgid "Download objects and refs from another repository"
+msgstr ""
+
+#: command-list.h
+msgid "Receive missing objects from another repository"
+msgstr ""
+
+#: command-list.h
+msgid "Rewrite branches"
+msgstr ""
+
+#: command-list.h
+msgid "Produce a merge commit message"
+msgstr ""
+
+#: command-list.h
+msgid "Output information on each ref"
+msgstr ""
+
+#: command-list.h
+msgid "Run a Git command on a list of repositories"
+msgstr ""
+
+#: command-list.h
+msgid "Prepare patches for e-mail submission"
+msgstr ""
+
+#: command-list.h
+msgid "Verifies the connectivity and validity of the objects in the database"
+msgstr ""
+
+#: command-list.h
+msgid "Cleanup unnecessary files and optimize the local repository"
+msgstr ""
+
+#: command-list.h
+msgid "Extract commit ID from an archive created using git-archive"
+msgstr ""
+
+#: command-list.h
+msgid "Print lines matching a pattern"
+msgstr ""
+
+#: command-list.h
+msgid "A portable graphical interface to Git"
+msgstr ""
+
+#: command-list.h
+msgid "Compute object ID and optionally creates a blob from a file"
+msgstr ""
+
+#: command-list.h
+msgid "Display help information about Git"
+msgstr ""
+
+#: command-list.h
+msgid "Run git hooks"
+msgstr ""
+
+#: command-list.h
+msgid "Server side implementation of Git over HTTP"
+msgstr ""
+
+#: command-list.h
+msgid "Download from a remote Git repository via HTTP"
+msgstr ""
+
+#: command-list.h
+msgid "Push objects over HTTP/DAV to another repository"
+msgstr ""
+
+#: command-list.h
+msgid "Send a collection of patches from stdin to an IMAP folder"
+msgstr ""
+
+#: command-list.h
+msgid "Build pack index file for an existing packed archive"
+msgstr ""
+
+#: command-list.h
+msgid "Create an empty Git repository or reinitialize an existing one"
+msgstr ""
+
+#: command-list.h
+msgid "Instantly browse your working repository in gitweb"
+msgstr ""
+
+#: command-list.h
+msgid "Add or parse structured information in commit messages"
+msgstr ""
+
+#: command-list.h
+msgid "Show commit logs"
+msgstr ""
+
+#: command-list.h
+msgid "Show information about files in the index and the working tree"
+msgstr ""
+
+#: command-list.h
+msgid "List references in a remote repository"
+msgstr ""
+
+#: command-list.h
+msgid "List the contents of a tree object"
+msgstr ""
+
+#: command-list.h
+msgid "Extracts patch and authorship from a single e-mail message"
+msgstr ""
+
+#: command-list.h
+msgid "Simple UNIX mbox splitter program"
+msgstr ""
+
+#: command-list.h
+msgid "Run tasks to optimize Git repository data"
+msgstr ""
+
+#: command-list.h
+msgid "Join two or more development histories together"
+msgstr ""
+
+#: command-list.h
+msgid "Find as good common ancestors as possible for a merge"
+msgstr ""
+
+#: command-list.h
+msgid "Run a three-way file merge"
+msgstr ""
+
+#: command-list.h
+msgid "Run a merge for files needing merging"
+msgstr ""
+
+#: command-list.h
+msgid "The standard helper program to use with git-merge-index"
+msgstr ""
+
+#: command-list.h
+msgid "Show three-way merge without touching index"
+msgstr ""
+
+#: command-list.h
+msgid "Run merge conflict resolution tools to resolve merge conflicts"
+msgstr ""
+
+#: command-list.h
+msgid "Creates a tag object with extra validation"
+msgstr ""
+
+#: command-list.h
+msgid "Build a tree-object from ls-tree formatted text"
+msgstr ""
+
+#: command-list.h
+msgid "Write and verify multi-pack-indexes"
+msgstr ""
+
+#: command-list.h
+msgid "Move or rename a file, a directory, or a symlink"
+msgstr ""
+
+#: command-list.h
+msgid "Find symbolic names for given revs"
+msgstr ""
+
+#: command-list.h
+msgid "Add or inspect object notes"
+msgstr ""
+
+#: command-list.h
+msgid "Import from and submit to Perforce repositories"
+msgstr ""
+
+#: command-list.h
+msgid "Create a packed archive of objects"
+msgstr ""
+
+#: command-list.h
+msgid "Find redundant pack files"
+msgstr ""
+
+#: command-list.h
+msgid "Pack heads and tags for efficient repository access"
+msgstr ""
+
+#: command-list.h
+msgid "Compute unique ID for a patch"
+msgstr ""
+
+#: command-list.h
+msgid "Prune all unreachable objects from the object database"
+msgstr ""
+
+#: command-list.h
+msgid "Remove extra objects that are already in pack files"
+msgstr ""
+
+#: command-list.h
+msgid "Fetch from and integrate with another repository or a local branch"
+msgstr ""
+
+#: command-list.h
+msgid "Update remote refs along with associated objects"
+msgstr ""
+
+#: command-list.h
+msgid "Applies a quilt patchset onto the current branch"
+msgstr ""
+
+#: command-list.h
+msgid "Compare two commit ranges (e.g. two versions of a branch)"
+msgstr ""
+
+#: command-list.h
+msgid "Reads tree information into the index"
+msgstr ""
+
+#: command-list.h
+msgid "Reapply commits on top of another base tip"
+msgstr ""
+
+#: command-list.h
+msgid "Receive what is pushed into the repository"
+msgstr ""
+
+#: command-list.h
+msgid "Manage reflog information"
+msgstr ""
+
+#: command-list.h
+msgid "Manage set of tracked repositories"
+msgstr ""
+
+#: command-list.h
+msgid "Pack unpacked objects in a repository"
+msgstr ""
+
+#: command-list.h
+msgid "Create, list, delete refs to replace objects"
+msgstr ""
+
+#: command-list.h
+msgid "Generates a summary of pending changes"
+msgstr ""
+
+#: command-list.h
+msgid "Reuse recorded resolution of conflicted merges"
+msgstr ""
+
+#: command-list.h
+msgid "Reset current HEAD to the specified state"
+msgstr ""
+
+#: command-list.h
+msgid "Restore working tree files"
+msgstr ""
+
+#: command-list.h
+msgid "Lists commit objects in reverse chronological order"
+msgstr ""
+
+#: command-list.h
+msgid "Pick out and massage parameters"
+msgstr ""
+
+#: command-list.h
+msgid "Revert some existing commits"
+msgstr ""
+
+#: command-list.h
+msgid "Remove files from the working tree and from the index"
+msgstr ""
+
+#: command-list.h
+msgid "Send a collection of patches as emails"
+msgstr ""
+
+#: command-list.h
+msgid "Push objects over Git protocol to another repository"
+msgstr ""
+
+#: command-list.h
+msgid "Git's i18n setup code for shell scripts"
+msgstr ""
+
+#: command-list.h
+msgid "Common Git shell script setup code"
+msgstr ""
+
+#: command-list.h
+msgid "Restricted login shell for Git-only SSH access"
+msgstr ""
+
+#: command-list.h
+msgid "Summarize 'git log' output"
+msgstr ""
+
+#: command-list.h
+msgid "Show various types of objects"
+msgstr ""
+
+#: command-list.h
+msgid "Show branches and their commits"
+msgstr ""
+
+#: command-list.h
+msgid "Show packed archive index"
+msgstr ""
+
+#: command-list.h
+msgid "List references in a local repository"
+msgstr ""
+
+#: command-list.h
+msgid "Reduce your working tree to a subset of tracked files"
+msgstr ""
+
+#: command-list.h
+msgid "Add file contents to the staging area"
+msgstr ""
+
+#: command-list.h
+msgid "Stash the changes in a dirty working directory away"
+msgstr ""
+
+#: command-list.h
+msgid "Show the working tree status"
+msgstr ""
+
+#: command-list.h
+msgid "Remove unnecessary whitespace"
+msgstr ""
+
+#: command-list.h
+msgid "Initialize, update or inspect submodules"
+msgstr ""
+
+#: command-list.h
+msgid "Bidirectional operation between a Subversion repository and Git"
+msgstr ""
+
+#: command-list.h
+msgid "Switch branches"
+msgstr ""
+
+#: command-list.h
+msgid "Read, modify and delete symbolic refs"
+msgstr ""
+
+#: command-list.h
+msgid "Create, list, delete or verify a tag object signed with GPG"
+msgstr ""
+
+#: command-list.h
+msgid "Creates a temporary file with a blob's contents"
+msgstr ""
+
+#: command-list.h
+msgid "Unpack objects from a packed archive"
+msgstr ""
+
+#: command-list.h
+msgid "Register file contents in the working tree to the index"
+msgstr ""
+
+#: command-list.h
+msgid "Update the object name stored in a ref safely"
+msgstr ""
+
+#: command-list.h
+msgid "Update auxiliary info file to help dumb servers"
+msgstr ""
+
+#: command-list.h
+msgid "Send archive back to git-archive"
+msgstr ""
+
+#: command-list.h
+msgid "Send objects packed back to git-fetch-pack"
+msgstr ""
+
+#: command-list.h
+msgid "Show a Git logical variable"
+msgstr ""
+
+#: command-list.h
+msgid "Check the GPG signature of commits"
+msgstr ""
+
+#: command-list.h
+msgid "Validate packed Git archive files"
+msgstr ""
+
+#: command-list.h
+msgid "Check the GPG signature of tags"
+msgstr ""
+
+#: command-list.h
+msgid "Show logs with difference each commit introduces"
+msgstr ""
+
+#: command-list.h
+msgid "Manage multiple working trees"
+msgstr ""
+
+#: command-list.h
+msgid "Create a tree object from the current index"
+msgstr ""
+
+#: command-list.h
+msgid "Defining attributes per path"
+msgstr ""
+
+#: command-list.h
+msgid "Git command-line interface and conventions"
+msgstr ""
+
+#: command-list.h
+msgid "A Git core tutorial for developers"
+msgstr ""
+
+#: command-list.h
+msgid "Providing usernames and passwords to Git"
+msgstr ""
+
+#: command-list.h
+msgid "Git for CVS users"
+msgstr ""
+
+#: command-list.h
+msgid "Tweaking diff output"
+msgstr ""
+
+#: command-list.h
+msgid "A useful minimum set of commands for Everyday Git"
+msgstr ""
+
+#: command-list.h
+msgid "Frequently asked questions about using Git"
+msgstr ""
+
+#: command-list.h
+msgid "A Git Glossary"
+msgstr ""
+
+#: command-list.h
+msgid "Hooks used by Git"
+msgstr ""
+
+#: command-list.h
+msgid "Specifies intentionally untracked files to ignore"
+msgstr ""
+
+#: command-list.h
+msgid "The Git repository browser"
+msgstr ""
+
+#: command-list.h
+msgid "Map author/committer names and/or E-Mail addresses"
+msgstr ""
+
+#: command-list.h
+msgid "Defining submodule properties"
+msgstr ""
+
+#: command-list.h
+msgid "Git namespaces"
+msgstr ""
+
+#: command-list.h
+msgid "Helper programs to interact with remote repositories"
+msgstr ""
+
+#: command-list.h
+msgid "Git Repository Layout"
+msgstr ""
+
+#: command-list.h
+msgid "Specifying revisions and ranges for Git"
+msgstr ""
+
+#: command-list.h
+msgid "Mounting one repository inside another"
+msgstr ""
+
+#: command-list.h
+msgid "A tutorial introduction to Git"
+msgstr ""
+
+#: command-list.h
+msgid "A tutorial introduction to Git: part two"
+msgstr ""
+
+#: command-list.h
+msgid "Git web interface (web frontend to Git repositories)"
+msgstr ""
+
+#: command-list.h
+msgid "An overview of recommended workflows with Git"
+msgstr ""
+
+#: commit-graph.c
+msgid "commit-graph file is too small"
+msgstr ""
+
+#: commit-graph.c
+#, c-format
+msgid "commit-graph signature %X does not match signature %X"
+msgstr ""
+
+#: commit-graph.c
+#, c-format
+msgid "commit-graph version %X does not match version %X"
+msgstr ""
+
+#: commit-graph.c
+#, c-format
+msgid "commit-graph hash version %X does not match version %X"
+msgstr ""
+
+#: commit-graph.c
+#, c-format
+msgid "commit-graph file is too small to hold %u chunks"
+msgstr ""
+
+#: commit-graph.c
+msgid "commit-graph has no base graphs chunk"
+msgstr ""
+
+#: commit-graph.c
+msgid "commit-graph chain does not match"
+msgstr ""
+
+#: commit-graph.c
+#, c-format
+msgid "invalid commit-graph chain: line '%s' not a hash"
+msgstr ""
+
+#: commit-graph.c
+msgid "unable to find all commit-graph files"
+msgstr ""
+
+#: commit-graph.c
+msgid "invalid commit position. commit-graph is likely corrupt"
+msgstr ""
+
+#: commit-graph.c
+#, c-format
+msgid "could not find commit %s"
+msgstr ""
+
+#: commit-graph.c
+msgid "commit-graph requires overflow generation data but has none"
+msgstr ""
+
+#: commit-graph.c
+msgid "Loading known commits in commit graph"
+msgstr ""
+
+#: commit-graph.c
+msgid "Expanding reachable commits in commit graph"
+msgstr ""
+
+#: commit-graph.c
+msgid "Clearing commit marks in commit graph"
+msgstr ""
+
+#: commit-graph.c
+msgid "Computing commit graph topological levels"
+msgstr ""
+
+#: commit-graph.c
+msgid "Computing commit graph generation numbers"
+msgstr ""
+
+#: commit-graph.c
+msgid "Computing commit changed paths Bloom filters"
+msgstr ""
+
+#: commit-graph.c
+msgid "Collecting referenced commits"
+msgstr ""
+
+#: commit-graph.c
+#, c-format
+msgid "Finding commits for commit graph in %<PRIuMAX> pack"
+msgid_plural "Finding commits for commit graph in %<PRIuMAX> packs"
+msgstr[0] ""
+msgstr[1] ""
+
+#: commit-graph.c
+#, c-format
+msgid "error adding pack %s"
+msgstr ""
+
+#: commit-graph.c
+#, c-format
+msgid "error opening index for %s"
+msgstr ""
+
+#: commit-graph.c
+msgid "Finding commits for commit graph among packed objects"
+msgstr ""
+
+#: commit-graph.c
+msgid "Finding extra edges in commit graph"
+msgstr ""
+
+#: commit-graph.c
+msgid "failed to write correct number of base graph ids"
+msgstr ""
+
+#: commit-graph.c
+msgid "unable to create temporary graph layer"
+msgstr ""
+
+#: commit-graph.c
+#, c-format
+msgid "unable to adjust shared permissions for '%s'"
+msgstr ""
+
+#: commit-graph.c
+#, 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
+msgid "unable to open commit-graph chain file"
+msgstr ""
+
+#: commit-graph.c
+msgid "failed to rename base commit-graph file"
+msgstr ""
+
+#: commit-graph.c
+msgid "failed to rename temporary commit-graph file"
+msgstr ""
+
+#: commit-graph.c
+msgid "Scanning merged commits"
+msgstr ""
+
+#: commit-graph.c
+msgid "Merging commit-graph"
+msgstr ""
+
+#: commit-graph.c
+msgid "attempting to write a commit-graph, but 'core.commitGraph' is disabled"
+msgstr ""
+
+#: commit-graph.c
+msgid "too many commits to write graph"
+msgstr ""
+
+#: commit-graph.c
+msgid "the commit-graph file has incorrect checksum and is likely corrupt"
+msgstr ""
+
+#: commit-graph.c
+#, c-format
+msgid "commit-graph has incorrect OID order: %s then %s"
+msgstr ""
+
+#: commit-graph.c
+#, c-format
+msgid "commit-graph has incorrect fanout value: fanout[%d] = %u != %u"
+msgstr ""
+
+#: commit-graph.c
+#, c-format
+msgid "failed to parse commit %s from commit-graph"
+msgstr ""
+
+#: commit-graph.c
+msgid "Verifying commits in commit graph"
+msgstr ""
+
+#: commit-graph.c
+#, c-format
+msgid "failed to parse commit %s from object database for commit-graph"
+msgstr ""
+
+#: commit-graph.c
+#, c-format
+msgid "root tree OID for commit %s in commit-graph is %s != %s"
+msgstr ""
+
+#: commit-graph.c
+#, c-format
+msgid "commit-graph parent list for commit %s is too long"
+msgstr ""
+
+#: commit-graph.c
+#, c-format
+msgid "commit-graph parent for %s is %s != %s"
+msgstr ""
+
+#: commit-graph.c
+#, c-format
+msgid "commit-graph parent list for commit %s terminates early"
+msgstr ""
+
+#: commit-graph.c
+#, c-format
+msgid ""
+"commit-graph has generation number zero for commit %s, but non-zero elsewhere"
+msgstr ""
+
+#: commit-graph.c
+#, c-format
+msgid ""
+"commit-graph has non-zero generation number for commit %s, but zero elsewhere"
+msgstr ""
+
+#: commit-graph.c
+#, c-format
+msgid "commit-graph generation for commit %s is %<PRIuMAX> < %<PRIuMAX>"
+msgstr ""
+
+#: commit-graph.c
+#, c-format
+msgid "commit date for commit %s in commit-graph is %<PRIuMAX> != %<PRIuMAX>"
+msgstr ""
+
+#: commit.c
+#, c-format
+msgid "%s %s is not a commit!"
+msgstr ""
+
+#: commit.c
+msgid ""
+"Support for <GIT_DIR>/info/grafts is deprecated\n"
+"and will be removed in a future Git version.\n"
+"\n"
+"Please use \"git replace --convert-graft-file\"\n"
+"to convert the grafts into replace refs.\n"
+"\n"
+"Turn this message off by running\n"
+"\"git config advice.graftFileDeprecated false\""
+msgstr ""
+
+#: commit.c
+#, c-format
+msgid "Commit %s has an untrusted GPG signature, allegedly by %s."
+msgstr ""
+
+#: commit.c
+#, c-format
+msgid "Commit %s has a bad GPG signature allegedly by %s."
+msgstr ""
+
+#: commit.c
+#, c-format
+msgid "Commit %s does not have a GPG signature."
+msgstr ""
+
+#: commit.c
+#, c-format
+msgid "Commit %s has a good GPG signature by %s\n"
+msgstr ""
+
+#: commit.c
+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"
+"variable i18n.commitEncoding to the encoding your project uses.\n"
+msgstr ""
+
+#: compat/compiler.h
+msgid "no compiler information available\n"
+msgstr ""
+
+#: compat/compiler.h
+msgid "no libc information available\n"
+msgstr ""
+
+#: compat/fsmonitor/fsm-health-win32.c
+#, c-format
+msgid "[GLE %ld] health thread could not open '%ls'"
+msgstr ""
+
+#: compat/fsmonitor/fsm-health-win32.c
+#, c-format
+msgid "[GLE %ld] health thread getting BHFI for '%ls'"
+msgstr ""
+
+#: compat/fsmonitor/fsm-health-win32.c compat/fsmonitor/fsm-listen-win32.c
+#, c-format
+msgid "could not convert to wide characters: '%s'"
+msgstr ""
+
+#: compat/fsmonitor/fsm-health-win32.c
+#, c-format
+msgid "BHFI changed '%ls'"
+msgstr ""
+
+#: compat/fsmonitor/fsm-health-win32.c
+#, c-format
+msgid "unhandled case in 'has_worktree_moved': %d"
+msgstr ""
+
+#: compat/fsmonitor/fsm-health-win32.c
+#, c-format
+msgid "health thread wait failed [GLE %ld]"
+msgstr ""
+
+#: compat/fsmonitor/fsm-listen-darwin.c
+msgid "Unable to create FSEventStream."
+msgstr ""
+
+#: compat/fsmonitor/fsm-listen-darwin.c
+msgid "Failed to start the FSEventStream"
+msgstr ""
+
+#: compat/fsmonitor/fsm-listen-win32.c
+#, c-format
+msgid "[GLE %ld] could not convert path to UTF-8: '%.*ls'"
+msgstr ""
+
+#: compat/fsmonitor/fsm-listen-win32.c
+#, c-format
+msgid "[GLE %ld] could not watch '%s'"
+msgstr ""
+
+#: compat/fsmonitor/fsm-listen-win32.c
+#, c-format
+msgid "[GLE %ld] could not get longname of '%s'"
+msgstr ""
+
+#: compat/fsmonitor/fsm-listen-win32.c
+#, c-format
+msgid "ReadDirectoryChangedW failed on '%s' [GLE %ld]"
+msgstr ""
+
+#: compat/fsmonitor/fsm-listen-win32.c
+#, c-format
+msgid "GetOverlappedResult failed on '%s' [GLE %ld]"
+msgstr ""
+
+#: compat/fsmonitor/fsm-listen-win32.c
+#, c-format
+msgid "could not read directory changes [GLE %ld]"
+msgstr ""
+
+#: compat/mingw.c
+#, c-format
+msgid "failed to copy SID (%ld)"
+msgstr ""
+
+#: compat/mingw.c
+#, c-format
+msgid "failed to get owner for '%s' (%ld)"
+msgstr ""
+
+#: compat/obstack.c
+msgid "memory exhausted"
+msgstr ""
+
+#: compat/regex/regcomp.c
+msgid "Success"
+msgstr ""
+
+#: compat/regex/regcomp.c
+msgid "No match"
+msgstr ""
+
+#: compat/regex/regcomp.c
+msgid "Invalid regular expression"
+msgstr ""
+
+#: compat/regex/regcomp.c
+msgid "Invalid collation character"
+msgstr ""
+
+#: compat/regex/regcomp.c
+msgid "Invalid character class name"
+msgstr ""
+
+#: compat/regex/regcomp.c
+msgid "Trailing backslash"
+msgstr ""
+
+#: compat/regex/regcomp.c
+msgid "Invalid back reference"
+msgstr ""
+
+#: compat/regex/regcomp.c
+msgid "Unmatched [ or [^"
+msgstr ""
+
+#: compat/regex/regcomp.c
+msgid "Unmatched ( or \\("
+msgstr ""
+
+#: compat/regex/regcomp.c
+msgid "Unmatched \\{"
+msgstr ""
+
+#: compat/regex/regcomp.c
+msgid "Invalid content of \\{\\}"
+msgstr ""
+
+#: compat/regex/regcomp.c
+msgid "Invalid range end"
+msgstr ""
+
+#: compat/regex/regcomp.c
+msgid "Memory exhausted"
+msgstr ""
+
+#: compat/regex/regcomp.c
+msgid "Invalid preceding regular expression"
+msgstr ""
+
+#: compat/regex/regcomp.c
+msgid "Premature end of regular expression"
+msgstr ""
+
+#: compat/regex/regcomp.c
+msgid "Regular expression too big"
+msgstr ""
+
+#: compat/regex/regcomp.c
+msgid "Unmatched ) or \\)"
+msgstr ""
+
+#: compat/regex/regcomp.c
+msgid "No previous regular expression"
+msgstr ""
+
+#: compat/simple-ipc/ipc-unix-socket.c compat/simple-ipc/ipc-win32.c
+msgid "could not send IPC command"
+msgstr ""
+
+#: compat/simple-ipc/ipc-unix-socket.c compat/simple-ipc/ipc-win32.c
+msgid "could not read IPC response"
+msgstr ""
+
+#: compat/simple-ipc/ipc-unix-socket.c
+#, c-format
+msgid "could not start accept_thread '%s'"
+msgstr ""
+
+#: compat/simple-ipc/ipc-unix-socket.c
+#, c-format
+msgid "could not start worker[0] for '%s'"
+msgstr ""
+
+#: compat/simple-ipc/ipc-win32.c
+#, c-format
+msgid "ConnectNamedPipe failed for '%s' (%lu)"
+msgstr ""
+
+#: compat/simple-ipc/ipc-win32.c
+#, c-format
+msgid "could not create fd from pipe for '%s'"
+msgstr ""
+
+#: compat/simple-ipc/ipc-win32.c
+#, c-format
+msgid "could not start thread[0] for '%s'"
+msgstr ""
+
+#: compat/simple-ipc/ipc-win32.c
+#, c-format
+msgid "wait for hEvent failed for '%s'"
+msgstr ""
+
+#: compat/terminal.c
+msgid "cannot resume in the background, please use 'fg' to resume"
+msgstr ""
+
+#: compat/terminal.c
+msgid "cannot restore terminal settings"
+msgstr ""
+
+#: config.c
+#, c-format
+msgid ""
+"exceeded maximum include depth (%d) while including\n"
+"\t%s\n"
+"from\n"
+"\t%s\n"
+"This might be due to circular includes."
+msgstr ""
+"melebihi kedalaman include maksimum (%d) ketika memasukkan\n"
+"\t%s\n"
+"dari\n"
+"\t%s\n"
+"Ini mungkin disebabkan oleh include sirkular."
+
+#: config.c
+#, c-format
+msgid "could not expand include path '%s'"
+msgstr "tidak dapat menjabarkan jalur include '%s'"
+
+#: config.c
+msgid "relative config includes must come from files"
+msgstr "include konfigurasi relatif harus dari berkas"
+
+#: config.c
+msgid "relative config include conditionals must come from files"
+msgstr "kondisional include konfigurasi relative harus dari berkas"
+
+#: config.c
+msgid ""
+"remote URLs cannot be configured in file directly or indirectly included by "
+"includeIf.hasconfig:remote.*.url"
+msgstr ""
+"URL remote tidak dapat dikonfigurasikan langsung di dalam berkas maupun "
+"dimasukkan secara tidak langsung oleh includeIf.hasconfig:remote.*.url"
+
+#: config.c
+#, c-format
+msgid "invalid config format: %s"
+msgstr "format konfigurasi tidak valid: %s"
+
+#: config.c
+#, c-format
+msgid "missing environment variable name for configuration '%.*s'"
+msgstr "nama variabel lingkungan untuk konfigurasi hilang '%.*s'"
+
+#: config.c
+#, c-format
+msgid "missing environment variable '%s' for configuration '%.*s'"
+msgstr "variabel lingkungan '%s' untuk konfigurasi '%.*s'"
+
+#: config.c
+#, c-format
+msgid "key does not contain a section: %s"
+msgstr "kunci tidak berisi bagian: %s"
+
+#: config.c
+#, c-format
+msgid "key does not contain variable name: %s"
+msgstr "kunci tidak berisi nama variabel: %s"
+
+#: config.c sequencer.c
+#, c-format
+msgid "invalid key: %s"
+msgstr "kunci tidak valid: %s"
+
+#: config.c
+#, c-format
+msgid "invalid key (newline): %s"
+msgstr "kunci tidak valid (barisbaru): %s"
+
+#: config.c
+msgid "empty config key"
+msgstr "kunci konfigurasi kosong"
+
+#: config.c
+#, c-format
+msgid "bogus config parameter: %s"
+msgstr "parameter konfigurasi gadungan: %s"
+
+#: config.c
+#, c-format
+msgid "bogus format in %s"
+msgstr "format gadungan dalam %s"
+
+#: config.c
+#, c-format
+msgid "bogus count in %s"
+msgstr "hitungan gadungan dalam %s"
+
+#: config.c
+#, c-format
+msgid "too many entries in %s"
+msgstr "terlalu banyak entri di %s"
+
+#: config.c
+#, c-format
+msgid "missing config key %s"
+msgstr "kunci konfigurasi %s hilang"
+
+#: config.c
+#, c-format
+msgid "missing config value %s"
+msgstr "nilai konfigurasi %s hilang"
+
+#: config.c
+#, c-format
+msgid "bad config line %d in blob %s"
+msgstr "baris konfigurasi %d jelek dalam blob %s"
+
+#: config.c
+#, c-format
+msgid "bad config line %d in file %s"
+msgstr "baris konfigurasi %d jelek dalam berkas %s"
+
+#: config.c
+#, c-format
+msgid "bad config line %d in standard input"
+msgstr "baris konfigurasi %d jelek pada masukan standar"
+
+#: config.c
+#, c-format
+msgid "bad config line %d in submodule-blob %s"
+msgstr "baris konfigurasi %d jelek dalam blob submodul %s"
+
+#: config.c
+#, c-format
+msgid "bad config line %d in command line %s"
+msgstr "baris konfigurasi %d jelek pada baris perintah %s"
+
+#: config.c
+#, c-format
+msgid "bad config line %d in %s"
+msgstr "baris konfigurasi %d jelek dalam %s"
+
+#: config.c
+msgid "out of range"
+msgstr "di luar rentang"
+
+#: config.c
+msgid "invalid unit"
+msgstr "satuan tidak valid"
+
+#: config.c
+#, c-format
+msgid "bad numeric config value '%s' for '%s': %s"
+msgstr "nilai konfigurasi numerik '%s' jelek untuk '%s': %s"
+
+#: config.c
+#, 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
+#, 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
+#, 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
+#, 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
+#, 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
+#, 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
+#, c-format
+msgid "invalid value for variable %s"
+msgstr "nilai tidak valid untuk variabel %s"
+
+#: config.c
+#, c-format
+msgid "ignoring unknown core.fsync component '%s'"
+msgstr "mengabaikan komponen core.fsync tidak dikenal '%s'"
+
+#: config.c
+#, c-format
+msgid "bad boolean config value '%s' for '%s'"
+msgstr "nilai konfigurasi boolean '%s' jelek untuk '%s'"
+
+#: config.c
+#, c-format
+msgid "failed to expand user dir in: '%s'"
+msgstr "gagal menjabarkan direktori pengguna di: '%s'"
+
+#: config.c
+#, c-format
+msgid "'%s' for '%s' is not a valid timestamp"
+msgstr "'%s' untuk '%s' bukan stempel waktu valid"
+
+#: config.c
+#, c-format
+msgid "abbrev length out of range: %d"
+msgstr "panjang singkatan di luar rentang: %d"
+
+#: config.c
+#, c-format
+msgid "bad zlib compression level %d"
+msgstr "level kompresi zlib jelek %d"
+
+#: config.c
+msgid "core.commentChar should only be one character"
+msgstr "core.commentChar harusnya hanya satu karakter"
+
+#: config.c
+#, c-format
+msgid "ignoring unknown core.fsyncMethod value '%s'"
+msgstr "mengabaikan nilai core.fsyncMethod tidak dikenal '%s'"
+
+#: config.c
+msgid "core.fsyncObjectFiles is deprecated; use core.fsync instead"
+msgstr "core.fsyncObjectFiles usang; gunakan core.fsync sebagai gantinya"
+
+#: config.c
+#, c-format
+msgid "invalid mode for object creation: %s"
+msgstr "mode tidak valid untuk pembuatan objek: %s"
+
+#: config.c
+#, c-format
+msgid "malformed value for %s"
+msgstr "nilai rusak untuk %s"
+
+#: config.c
+#, c-format
+msgid "malformed value for %s: %s"
+msgstr "nilai rusak untuk %s: %s"
+
+#: config.c
+msgid "must be one of nothing, matching, simple, upstream or current"
+msgstr "harus salah satu dari nothing, matching, simple, upstream atau current"
+
+#: config.c
+#, c-format
+msgid "unable to load config blob object '%s'"
+msgstr "tidak dapat memuat objek blob konfigurasi '%s'"
+
+#: config.c
+#, c-format
+msgid "reference '%s' does not point to a blob"
+msgstr "referensi '%s' tidak menunjuk pada sebuah blob"
+
+#: config.c
+#, c-format
+msgid "unable to resolve config blob '%s'"
+msgstr "tidak dapat menguraikan blob konfigurasi '%s'"
+
+#: config.c
+#, c-format
+msgid "failed to parse %s"
+msgstr "gagal menguraikan %s"
+
+#: config.c
+msgid "unable to parse command-line config"
+msgstr "gagal menguraikan konfigurasi baris perintah"
+
+#: config.c
+msgid "unknown error occurred while reading the configuration files"
+msgstr "error tidak diketahui ketika membaca berkas konfigurasi"
+
+#: config.c
+#, c-format
+msgid "Invalid %s: '%s'"
+msgstr "%s tidak valid: '%s'"
+
+#: config.c
+#, 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
+#, c-format
+msgid "unable to parse '%s' from command-line config"
+msgstr "tidak dapat menguraikan '%s' dari konfigurasi baris perintah"
+
+#: config.c
+#, 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
+#, c-format
+msgid "invalid section name '%s'"
+msgstr "nama bagian '%s' tidak valid"
+
+#: config.c
+#, c-format
+msgid "%s has multiple values"
+msgstr "%s punya banyak nilai"
+
+#: config.c
+#, c-format
+msgid "failed to write new configuration file %s"
+msgstr "gagal menulis berkas konfigurasi baru %s"
+
+#: config.c
+#, c-format
+msgid "could not lock config file %s"
+msgstr "tidak dapat mengunci berkas konfigurasi %s"
+
+#: config.c
+#, c-format
+msgid "opening %s"
+msgstr "membuka %s"
+
+#: config.c
+#, c-format
+msgid "invalid config file %s"
+msgstr "berkas konfigurasi %s tidak valid"
+
+#: config.c
+#, c-format
+msgid "fstat on %s failed"
+msgstr "fstat pada %s gagal"
+
+#: config.c
+#, c-format
+msgid "unable to mmap '%s'%s"
+msgstr "tidak dapat me-mmap '%s'%s"
+
+#: config.c
+#, c-format
+msgid "chmod on %s failed"
+msgstr "chmod pada %s gagal"
+
+#: config.c
+#, c-format
+msgid "could not write config file %s"
+msgstr "tidak dapat menulis berkas konfigurasi %s"
+
+#: config.c
+#, c-format
+msgid "could not set '%s' to '%s'"
+msgstr "tidak dapat menyetel '%s' ke '%s'"
+
+#: config.c
+#, c-format
+msgid "invalid section name: %s"
+msgstr "nama bagian tidak valid: %s"
+
+#: config.c
+#, c-format
+msgid "missing value for '%s'"
+msgstr "nilai hilang untuk '%s'"
+
+#: connect.c
+msgid "the remote end hung up upon initial contact"
+msgstr "remote berakhir menggantung saat kontak pertama"
+
+#: connect.c
 msgid ""
-"git [--version] [--help] [-C <path>] [-c <name>=<value>]\n"
+"Could not read from remote repository.\n"
+"\n"
+"Please make sure you have the correct access rights\n"
+"and the repository exists."
+msgstr ""
+"Tidak dapat membaca dari repositori remote.\n"
+"\n"
+"Mohon pastikan Anda punya hak akses yang benar dan repositori ada."
+
+#: connect.c
+#, c-format
+msgid "server doesn't support '%s'"
+msgstr "peladen tidak mendukung '%s'"
+
+#: connect.c
+#, c-format
+msgid "server doesn't support feature '%s'"
+msgstr "peladen tidak mendukung fitur '%s'"
+
+#: connect.c
+msgid "expected flush after capabilities"
+msgstr "bilasan diharapkan setelah kemampuan"
+
+#: connect.c
+#, c-format
+msgid "ignoring capabilities after first line '%s'"
+msgstr "mengabaikan kemampuan setelah baris pertama '%s'"
+
+#: connect.c
+msgid "protocol error: unexpected capabilities^{}"
+msgstr "kesalahan protokol: capabilities^{} tidak diharapkan"
+
+#: connect.c
+#, c-format
+msgid "protocol error: expected shallow sha-1, got '%s'"
+msgstr "kesalahan protokol: sha-1 dangkal diharapkan, dapat '%s'"
+
+#: connect.c
+msgid "repository on the other end cannot be shallow"
+msgstr "repositori pada ujung lainnya tidak boleh dangkal"
+
+#: connect.c
+msgid "invalid packet"
+msgstr "paket tidak valid"
+
+#: connect.c
+#, c-format
+msgid "protocol error: unexpected '%s'"
+msgstr "kesalahan protokol: '%s' tidak diharapkan"
+
+#: connect.c
+#, c-format
+msgid "unknown object format '%s' specified by server"
+msgstr "format objek tidak dikenal '%s' disebutkan oleh peladen"
+
+#: connect.c
+#, c-format
+msgid "invalid ls-refs response: %s"
+msgstr "jawaban ls-refs tidak valid: %s"
+
+#: connect.c
+msgid "expected flush after ref listing"
+msgstr "bilasan diharapkan setelah penyebutan referensi"
+
+#: connect.c
+msgid "expected response end packet after ref listing"
+msgstr "jawaban akhir paket diharapkan setelah penyebutan referensi"
+
+#: connect.c
+#, c-format
+msgid "protocol '%s' is not supported"
+msgstr "protokol '%s' tidak didukung"
+
+#: connect.c
+msgid "unable to set SO_KEEPALIVE on socket"
+msgstr "tidak dapat menyetel SO_KEEPALIVE pada soket"
+
+#: connect.c
+#, c-format
+msgid "Looking up %s ... "
+msgstr "Mencari %s ... "
+
+#: connect.c
+#, c-format
+msgid "unable to look up %s (port %s) (%s)"
+msgstr "tidak dapat mencari %s (port %s) (%s)"
+
+#. TRANSLATORS: this is the end of "Looking up %s ... "
+#: connect.c
+#, c-format
+msgid ""
+"done.\n"
+"Connecting to %s (port %s) ... "
+msgstr ""
+"selesai.\n"
+"Menghubungkan ke %s (port %s) ... "
+
+#: connect.c
+#, c-format
+msgid ""
+"unable to connect to %s:\n"
+"%s"
+msgstr ""
+"tidak dapat menghubungkan ke %s:\n"
+"%s"
+
+#. TRANSLATORS: this is the end of "Connecting to %s (port %s) ... "
+#: connect.c
+msgid "done."
+msgstr "selesai."
+
+#: connect.c
+#, c-format
+msgid "unable to look up %s (%s)"
+msgstr "tidak dapat mencari %s (%s)"
+
+#: connect.c
+#, c-format
+msgid "unknown port %s"
+msgstr "port tidak dikenal %s"
+
+#: connect.c
+#, c-format
+msgid "strange hostname '%s' blocked"
+msgstr "nama host aneh '%s' diblokir"
+
+#: connect.c
+#, c-format
+msgid "strange port '%s' blocked"
+msgstr "port aneh '%s' diblokir"
+
+#: connect.c
+#, c-format
+msgid "cannot start proxy %s"
+msgstr "tidak dapat memulai proksi %s"
+
+#: connect.c
+msgid "no path specified; see 'git help pull' for valid url syntax"
+msgstr ""
+"tidak ada jalur yang disebutkan; lihat 'git help pull' untuk sintaks url "
+"yang valid"
+
+#: connect.c
+msgid "newline is forbidden in git:// hosts and repo paths"
+msgstr "baris baru dilarang di host git:// dan jalur repositori"
+
+#: connect.c
+msgid "ssh variant 'simple' does not support -4"
+msgstr "varian ssh 'simple' tidak mendukung -4"
+
+#: connect.c
+msgid "ssh variant 'simple' does not support -6"
+msgstr "varian ssh 'simple' tidak mendukung -6"
+
+#: connect.c
+msgid "ssh variant 'simple' does not support setting port"
+msgstr "varian ssh 'simple' tidak mendukung penyetelan port"
+
+#: connect.c
+#, c-format
+msgid "strange pathname '%s' blocked"
+msgstr "nama jalur aneh '%s' diblokir"
+
+#: connect.c
+msgid "unable to fork"
+msgstr "tidak dapat menggarpu"
+
+#: connected.c
+msgid "Could not run 'git rev-list'"
+msgstr "Tidak dapat menjalankan 'git rev-list'"
+
+#: connected.c
+msgid "failed write to rev-list"
+msgstr "gagal menulis ke rev-list"
+
+#: connected.c
+msgid "failed to close rev-list's stdin"
+msgstr "gagal menutup masukan standar rev-list"
+
+#: contrib/scalar/scalar.c worktree.c
+#, c-format
+msgid "'%s' does not exist"
+msgstr "'%s' tidak ada"
+
+#: contrib/scalar/scalar.c
+msgid "need a working directory"
+msgstr ""
+
+#: contrib/scalar/scalar.c
+msgid "could not find enlistment root"
+msgstr ""
+
+#: contrib/scalar/scalar.c
+#, c-format
+msgid "could not switch to '%s'"
+msgstr ""
+
+#: contrib/scalar/scalar.c
+#, c-format
+msgid "could not configure %s=%s"
+msgstr ""
+
+#: contrib/scalar/scalar.c
+msgid "could not configure log.excludeDecoration"
+msgstr ""
+
+#: contrib/scalar/scalar.c
+msgid "Scalar enlistments require a worktree"
+msgstr ""
+
+#: contrib/scalar/scalar.c dir.c
+#, c-format
+msgid "could not open directory '%s'"
+msgstr ""
+
+#: contrib/scalar/scalar.c
+#, c-format
+msgid "skipping '%s', which is neither file nor directory"
+msgstr ""
+
+#: contrib/scalar/scalar.c
+#, c-format
+msgid "could not determine free disk size for '%s'"
+msgstr ""
+
+#: contrib/scalar/scalar.c
+#, c-format
+msgid "could not get info for '%s'"
+msgstr ""
+
+#: contrib/scalar/scalar.c
+#, c-format
+msgid "remote HEAD is not a branch: '%.*s'"
+msgstr ""
+
+#: contrib/scalar/scalar.c
+msgid "failed to get default branch name from remote; using local default"
+msgstr ""
+
+#: contrib/scalar/scalar.c
+msgid "failed to get default branch name"
+msgstr ""
+
+#: contrib/scalar/scalar.c
+msgid "failed to unregister repository"
+msgstr ""
+
+#: contrib/scalar/scalar.c
+msgid "failed to delete enlistment directory"
+msgstr ""
+
+#: contrib/scalar/scalar.c
+msgid "branch to checkout after clone"
+msgstr ""
+
+#: contrib/scalar/scalar.c
+msgid "when cloning, create full working directory"
+msgstr ""
+
+#: contrib/scalar/scalar.c
+msgid "only download metadata for the branch that will be checked out"
+msgstr ""
+
+#: contrib/scalar/scalar.c
+msgid "scalar clone [<options>] [--] <repo> [<dir>]"
+msgstr ""
+
+#: contrib/scalar/scalar.c
+#, c-format
+msgid "cannot deduce worktree name from '%s'"
+msgstr ""
+
+#: contrib/scalar/scalar.c
+#, c-format
+msgid "directory '%s' exists already"
+msgstr ""
+
+#: contrib/scalar/scalar.c
+#, c-format
+msgid "failed to get default branch for '%s'"
+msgstr ""
+
+#: contrib/scalar/scalar.c
+#, c-format
+msgid "could not configure remote in '%s'"
+msgstr ""
+
+#: contrib/scalar/scalar.c
+#, c-format
+msgid "could not configure '%s'"
+msgstr ""
+
+#: contrib/scalar/scalar.c
+msgid "partial clone failed; attempting full clone"
+msgstr ""
+
+#: contrib/scalar/scalar.c
+msgid "could not configure for full clone"
+msgstr ""
+
+#: contrib/scalar/scalar.c
+msgid "scalar diagnose [<enlistment>]"
+msgstr ""
+
+#: contrib/scalar/scalar.c
+#, c-format
+msgid "could not create directory for '%s'"
+msgstr ""
+
+#: contrib/scalar/scalar.c
+msgid "could not duplicate stdout"
+msgstr ""
+
+#: contrib/scalar/scalar.c
+msgid "failed to write archive"
+msgstr ""
+
+#: contrib/scalar/scalar.c
+msgid "`scalar list` does not take arguments"
+msgstr ""
+
+#: contrib/scalar/scalar.c
+msgid "scalar register [<enlistment>]"
+msgstr ""
+
+#: contrib/scalar/scalar.c
+msgid "reconfigure all registered enlistments"
+msgstr ""
+
+#: contrib/scalar/scalar.c
+msgid "scalar reconfigure [--all | <enlistment>]"
+msgstr ""
+
+#: contrib/scalar/scalar.c
+msgid "--all or <enlistment>, but not both"
+msgstr ""
+
+#: contrib/scalar/scalar.c
+#, c-format
+msgid "git repository gone in '%s'"
+msgstr ""
+
+#: contrib/scalar/scalar.c
+msgid ""
+"scalar run <task> [<enlistment>]\n"
+"Tasks:\n"
+msgstr ""
+
+#: contrib/scalar/scalar.c
+#, c-format
+msgid "no such task: '%s'"
+msgstr ""
+
+#: contrib/scalar/scalar.c
+msgid "scalar unregister [<enlistment>]"
+msgstr ""
+
+#: contrib/scalar/scalar.c
+msgid "scalar delete <enlistment>"
+msgstr ""
+
+#: contrib/scalar/scalar.c
+msgid "refusing to delete current working directory"
+msgstr ""
+
+#: contrib/scalar/scalar.c
+msgid "include Git version"
+msgstr ""
+
+#: contrib/scalar/scalar.c
+msgid "include Git's build options"
+msgstr ""
+
+#: contrib/scalar/scalar.c
+msgid "scalar verbose [-v | --verbose] [--build-options]"
+msgstr ""
+
+#: contrib/scalar/scalar.c
+msgid "-C requires a <directory>"
+msgstr ""
+
+#: contrib/scalar/scalar.c
+#, c-format
+msgid "could not change to '%s'"
+msgstr ""
+
+#: contrib/scalar/scalar.c
+msgid "-c requires a <key>=<value> argument"
+msgstr ""
+
+#: contrib/scalar/scalar.c
+msgid ""
+"scalar [-C <directory>] [-c <key>=<value>] <command> [<options>]\n"
+"\n"
+"Commands:\n"
+msgstr ""
+
+#: convert.c
+#, c-format
+msgid "illegal crlf_action %d"
+msgstr ""
+
+#: convert.c
+#, c-format
+msgid "CRLF would be replaced by LF in %s"
+msgstr ""
+
+#: convert.c
+#, c-format
+msgid ""
+"in the working copy of '%s', CRLF will be replaced by LF the next time Git "
+"touches it"
+msgstr ""
+
+#: convert.c
+#, c-format
+msgid "LF would be replaced by CRLF in %s"
+msgstr ""
+
+#: convert.c
+#, c-format
+msgid ""
+"in the working copy of '%s', LF will be replaced by CRLF the next time Git "
+"touches it"
+msgstr ""
+
+#: convert.c
+#, c-format
+msgid "BOM is prohibited in '%s' if encoded as %s"
+msgstr ""
+
+#: convert.c
+#, c-format
+msgid ""
+"The file '%s' contains a byte order mark (BOM). Please use UTF-%.*s as "
+"working-tree-encoding."
+msgstr ""
+
+#: convert.c
+#, c-format
+msgid "BOM is required in '%s' if encoded as %s"
+msgstr ""
+
+#: convert.c
+#, 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."
+msgstr ""
+
+#: convert.c
+#, c-format
+msgid "failed to encode '%s' from %s to %s"
+msgstr ""
+
+#: convert.c
+#, c-format
+msgid "encoding '%s' from %s to %s and back is not the same"
+msgstr ""
+
+#: convert.c
+#, c-format
+msgid "cannot fork to run external filter '%s'"
+msgstr ""
+
+#: convert.c
+#, c-format
+msgid "cannot feed the input to external filter '%s'"
+msgstr ""
+
+#: convert.c
+#, c-format
+msgid "external filter '%s' failed %d"
+msgstr ""
+
+#: convert.c
+#, c-format
+msgid "read from external filter '%s' failed"
+msgstr ""
+
+#: convert.c
+#, c-format
+msgid "external filter '%s' failed"
+msgstr ""
+
+#: convert.c
+msgid "unexpected filter type"
+msgstr ""
+
+#: convert.c
+msgid "path name too long for external filter"
+msgstr ""
+
+#: convert.c
+#, c-format
+msgid ""
+"external filter '%s' is not available anymore although not all paths have "
+"been filtered"
+msgstr ""
+
+#: convert.c
+msgid "true/false are no valid working-tree-encodings"
+msgstr ""
+
+#: convert.c
+#, c-format
+msgid "%s: clean filter '%s' failed"
+msgstr ""
+
+#: convert.c
+#, c-format
+msgid "%s: smudge filter %s failed"
+msgstr ""
+
+#: credential.c
+#, c-format
+msgid "skipping credential lookup for key: credential.%s"
+msgstr ""
+
+#: credential.c
+msgid "refusing to work with credential missing host field"
+msgstr ""
+
+#: credential.c
+msgid "refusing to work with credential missing protocol field"
+msgstr ""
+
+#: credential.c
+#, c-format
+msgid "url contains a newline in its %s component: %s"
+msgstr ""
+
+#: credential.c
+#, c-format
+msgid "url has no scheme: %s"
+msgstr ""
+
+#: credential.c
+#, c-format
+msgid "credential url cannot be parsed: %s"
+msgstr ""
+
+#: date.c
+msgid "in the future"
+msgstr "di masa depan"
+
+#: date.c
+#, c-format
+msgid "%<PRIuMAX> second ago"
+msgid_plural "%<PRIuMAX> seconds ago"
+msgstr[0] "%<PRIuMAX> detik yang lalu"
+msgstr[1] "%<PRIuMAX> detik yang lalu"
+
+#: date.c
+#, c-format
+msgid "%<PRIuMAX> minute ago"
+msgid_plural "%<PRIuMAX> minutes ago"
+msgstr[0] "%<PRIuMAX> menit yang lalu"
+msgstr[1] "%<PRIuMAX> menit yang lalu"
+
+#: date.c
+#, c-format
+msgid "%<PRIuMAX> hour ago"
+msgid_plural "%<PRIuMAX> hours ago"
+msgstr[0] "%<PRIuMAX> jam yang lalu"
+msgstr[1] "%<PRIuMAX> jam yang lalu"
+
+#: date.c
+#, c-format
+msgid "%<PRIuMAX> day ago"
+msgid_plural "%<PRIuMAX> days ago"
+msgstr[0] "%<PRIuMAX> hari yang lalu"
+msgstr[1] "%<PRIuMAX> hari yang lalu"
+
+#: date.c
+#, c-format
+msgid "%<PRIuMAX> week ago"
+msgid_plural "%<PRIuMAX> weeks ago"
+msgstr[0] "%<PRIuMAX> minggu yang lalu"
+msgstr[1] "%<PRIuMAX> minggu yang lalu"
+
+#: date.c
+#, c-format
+msgid "%<PRIuMAX> month ago"
+msgid_plural "%<PRIuMAX> months ago"
+msgstr[0] "%<PRIuMAX> bulan yang lalu"
+msgstr[1] "%<PRIuMAX> bulan yang lalu"
+
+#: date.c
+#, c-format
+msgid "%<PRIuMAX> year"
+msgid_plural "%<PRIuMAX> years"
+msgstr[0] "%<PRIuMAX> tahun"
+msgstr[1] "%<PRIuMAX> tahun"
+
+#. TRANSLATORS: "%s" is "<n> years"
+#: date.c
+#, c-format
+msgid "%s, %<PRIuMAX> month ago"
+msgid_plural "%s, %<PRIuMAX> months ago"
+msgstr[0] "%s, %<PRIuMAX> bulan yang lalu"
+msgstr[1] "%s, %<PRIuMAX> bulan yang lalu"
+
+#: date.c
+#, c-format
+msgid "%<PRIuMAX> year ago"
+msgid_plural "%<PRIuMAX> years ago"
+msgstr[0] "%<PRIuMAX> tahun yang lalu"
+msgstr[1] "%<PRIuMAX> tahun yang lalu"
+
+#: delta-islands.c
+msgid "Propagating island marks"
+msgstr ""
+
+#: delta-islands.c
+#, c-format
+msgid "bad tree object %s"
+msgstr ""
+
+#: delta-islands.c
+#, c-format
+msgid "failed to load island regex for '%s': %s"
+msgstr ""
+
+#: delta-islands.c
+#, c-format
+msgid "island regex from config has too many capture groups (max=%d)"
+msgstr ""
+
+#: delta-islands.c
+#, c-format
+msgid "Marked %d islands, done.\n"
+msgstr ""
+
+#: diff-lib.c
+msgid "--merge-base does not work with ranges"
+msgstr ""
+
+#: diff-lib.c
+msgid "--merge-base only works with commits"
+msgstr ""
+
+#: diff-lib.c
+msgid "unable to get HEAD"
+msgstr ""
+
+#: diff-lib.c
+msgid "no merge base found"
+msgstr ""
+
+#: diff-lib.c
+msgid "multiple merge bases found"
+msgstr ""
+
+#: diff-no-index.c
+msgid "git diff --no-index [<options>] <path> <path>"
+msgstr ""
+
+#: diff-no-index.c
+msgid ""
+"Not a git repository. Use --no-index to compare two paths outside a working "
+"tree"
+msgstr ""
+
+#: diff.c
+#, c-format
+msgid "  Failed to parse dirstat cut-off percentage '%s'\n"
+msgstr "  Gagal mengurai persentase potongan dirstat '%s'\n"
+
+#: diff.c
+#, c-format
+msgid "  Unknown dirstat parameter '%s'\n"
+msgstr "  Parameter dirstat tidak ditketahui '%s'\n"
+
+#: diff.c
+msgid ""
+"color moved setting must be one of 'no', 'default', 'blocks', 'zebra', "
+"'dimmed-zebra', 'plain'"
+msgstr ""
+"Setelan warna berpindah harus salah satu dari 'no', 'default', 'blocks', "
+"'dimmed-zebra', 'plain'"
+
+#: diff.c
+#, 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 ""
+"mode color-moved-ws tidak dikenal '%s', nilai yang mungkin yaitu 'ignore-"
+"space-change', 'ignore-space-at-eol', 'ignore-all-space', 'allow-indentation-"
+"change'"
+
+#: diff.c
+msgid ""
+"color-moved-ws: allow-indentation-change cannot be combined with other "
+"whitespace modes"
+msgstr ""
+"color-moved-ws: allow-indentation-change tidak dapat digabungkan dengan mode "
+"spasi yang lainnya"
+
+#: diff.c
+#, c-format
+msgid "Unknown value for 'diff.submodule' config variable: '%s'"
+msgstr "Nilai tidak dikenal untuk variabel konfigurasi 'diff.submodule': '%s'"
+
+#: diff.c
+#, c-format
+msgid ""
+"Found errors in 'diff.dirstat' config variable:\n"
+"%s"
+msgstr ""
+"Ditemukan error dalam variable konfigurasi 'diff.dirstat':\n"
+"%s"
+
+#: diff.c
+#, c-format
+msgid "external diff died, stopping at %s"
+msgstr "diff eksternal mati, berhenti pada %s"
+
+#: diff.c parse-options.c
+#, c-format
+msgid "options '%s', '%s', '%s', and '%s' cannot be used together"
+msgstr "Opsi '%s', '%s', '%s', dan '%s' tidak dapat digunakan bersamaan"
+
+#: diff.c
+#, c-format
+msgid "options '%s' and '%s' cannot be used together, use '%s' with '%s'"
+msgstr ""
+"opsi '%s' dan '%s' tidak dapat digunakan bersamaan, gunakan '%s' dengan '%s'"
+
+#: diff.c
+#, c-format
+msgid ""
+"options '%s' and '%s' cannot be used together, use '%s' with '%s' and '%s'"
+msgstr ""
+"opsi '%s' dan '%s' tidak dapat digunakan bersamaan, gunakan '%s' dengan '%s' "
+"dan '%s'"
+
+#: diff.c
+msgid "--follow requires exactly one pathspec"
+msgstr "--follow butuh tepatnya satu spek jalur"
+
+#: diff.c
+#, c-format
+msgid "invalid --stat value: %s"
+msgstr "nilai --stat tidak valid: %s"
+
+#: diff.c parse-options.c
+#, c-format
+msgid "%s expects a numerical value"
+msgstr "%s harap nilai numerik"
+
+#: diff.c
+#, c-format
+msgid ""
+"Failed to parse --dirstat/-X option parameter:\n"
+"%s"
+msgstr ""
+"Gagal menguraikan parameter opsi --dirstat/-X:\n"
+"%s"
+
+#: diff.c
+#, c-format
+msgid "unknown change class '%c' in --diff-filter=%s"
+msgstr "kelas perubahan '%c' tidak dikenal dalam --diff-filter=%s"
+
+#: diff.c
+#, c-format
+msgid "unknown value after ws-error-highlight=%.*s"
+msgstr "nilai tidak dikenal setelah ws-error-highlight=%.*s"
+
+#: diff.c
+#, c-format
+msgid "unable to resolve '%s'"
+msgstr "tidak dapat menguraikan '%s'"
+
+#: diff.c
+#, c-format
+msgid "%s expects <n>/<m> form"
+msgstr "%s butuh bentuk <n>/<m>"
+
+#: diff.c
+#, c-format
+msgid "%s expects a character, got '%s'"
+msgstr "%s butuh sebuah karakter, dapat '%s'"
+
+#: diff.c
+#, c-format
+msgid "bad --color-moved argument: %s"
+msgstr "argumen --color-moved jelek: %s"
+
+#: diff.c
+#, c-format
+msgid "invalid mode '%s' in --color-moved-ws"
+msgstr "mode tidak valid '%s' dalam --color-moved-ws"
+
+#: diff.c
+msgid ""
+"option diff-algorithm accepts \"myers\", \"minimal\", \"patience\" and "
+"\"histogram\""
+msgstr ""
+"opsi diff-algorithm terima \"myers\", \"minimal\", \"patience\" dan "
+"\"histogram\""
+
+#: diff.c
+#, c-format
+msgid "invalid argument to %s"
+msgstr "argumen tidak valid ke %s"
+
+#: diff.c
+#, c-format
+msgid "invalid regex given to -I: '%s'"
+msgstr "regex tidak valid diberikan ke -I: '%s'"
+
+#: diff.c
+#, c-format
+msgid "failed to parse --submodule option parameter: '%s'"
+msgstr "gagal menguraikan parameter opsi --submodule: '%s'"
+
+#: diff.c
+#, c-format
+msgid "bad --word-diff argument: %s"
+msgstr "argumen --word-diff jelek: %s"
+
+#: diff.c
+msgid "Diff output format options"
+msgstr "Opsi format keluaran diff"
+
+#: diff.c
+msgid "generate patch"
+msgstr "buat tambalan"
+
+#: diff.c
+msgid "<n>"
+msgstr "<n>"
+
+#: diff.c
+msgid "generate diffs with <n> lines context"
+msgstr "buat diff dengan <n> baris konteks"
+
+#: diff.c
+msgid "generate the diff in raw format"
+msgstr "buat diff dalam format mentah"
+
+#: diff.c
+msgid "synonym for '-p --raw'"
+msgstr "sinonim untuk '-p --raw'"
+
+#: diff.c
+msgid "synonym for '-p --stat'"
+msgstr "sinonim untuk '-p --stat'"
+
+#: diff.c
+msgid "machine friendly --stat"
+msgstr "--stat yang ramah mesin"
+
+#: diff.c
+msgid "output only the last line of --stat"
+msgstr "keluarkan hanya baris terakhir --stat"
+
+#: diff.c
+msgid "<param1,param2>..."
+msgstr "<parameter 1,parameter 2>..."
+
+#: diff.c
+msgid ""
+"output the distribution of relative amount of changes for each sub-directory"
+msgstr ""
+"keluarkan distribusi jumlah perubahan relatif untuk setiap subdirektori"
+
+#: diff.c
+msgid "synonym for --dirstat=cumulative"
+msgstr "sinonim untuk --dirstat=cumulative"
+
+#: diff.c
+msgid "synonym for --dirstat=files,param1,param2..."
+msgstr "sinonim untuk --dirstat=files,param1,param2..."
+
+#: diff.c
+msgid "warn if changes introduce conflict markers or whitespace errors"
+msgstr ""
+"peringatkan bila perubahan memasukkan penanda konflik atau kesalahan spasi"
+
+#: diff.c
+msgid "condensed summary such as creations, renames and mode changes"
+msgstr ""
+"ringkasan singkat seperti pembuatan, penggantian nama dan perubahan mode"
+
+#: diff.c
+msgid "show only names of changed files"
+msgstr "perlihatkan hanya nama berkas yang berubah"
+
+#: diff.c
+msgid "show only names and status of changed files"
+msgstr "perlihatkan hanya nama dan status berkas yang berubah"
+
+#: diff.c
+msgid "<width>[,<name-width>[,<count>]]"
+msgstr "<lebar>[,<nama lebar>[,<hitungan>]]"
+
+#: diff.c
+msgid "generate diffstat"
+msgstr "buat diffstat"
+
+#: diff.c
+msgid "<width>"
+msgstr "<lebar>"
+
+#: diff.c
+msgid "generate diffstat with a given width"
+msgstr "buat diffstat dengan lebar yang diberikan"
+
+#: diff.c
+msgid "generate diffstat with a given name width"
+msgstr "buat diffstat dengan nama lebar yang diberikan"
+
+#: diff.c
+msgid "generate diffstat with a given graph width"
+msgstr "buat diffstat dengan lebar grafik yang diberikan"
+
+#: diff.c
+msgid "<count>"
+msgstr "<hitungan>"
+
+#: diff.c
+msgid "generate diffstat with limited lines"
+msgstr "buat diffstat dengan baris yang terbatas"
+
+#: diff.c
+msgid "generate compact summary in diffstat"
+msgstr "buat ringkasan singkat dalam diffstat"
+
+#: diff.c
+msgid "output a binary diff that can be applied"
+msgstr "keluarkan diff biner yang dapat diterapkan"
+
+#: diff.c
+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
+msgid "show colored diff"
+msgstr "perlihatkan diff berwarna"
+
+#: diff.c
+msgid "<kind>"
+msgstr "<tipe>"
+
+#: diff.c
+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
+msgid ""
+"do not munge pathnames and use NULs as output field terminators in --raw or "
+"--numstat"
+msgstr ""
+"jangan tengkar jalur nama dan gunakan NUL sebagai pembatas bidang keluaran "
+"pada --raw atau --numstat"
+
+#: diff.c
+msgid "<prefix>"
+msgstr "<prefiks>"
+
+#: diff.c
+msgid "show the given source prefix instead of \"a/\""
+msgstr "perlihatkan prefiks sumber yang diberikan daripada \"a/\""
+
+#: diff.c
+msgid "show the given destination prefix instead of \"b/\""
+msgstr "perlihatkan prefiks tujuan daripada \"b/\""
+
+#: diff.c
+msgid "prepend an additional prefix to every line of output"
+msgstr "tambah depan prefiks tambahan pada setiap baris keluaran"
+
+#: diff.c
+msgid "do not show any source or destination prefix"
+msgstr "jangan perlihatkan prefiks sumber atau tujuan apapun"
+
+#: diff.c
+msgid "show context between diff hunks up to the specified number of lines"
+msgstr ""
+"perlihatkan konteks diantara bingkah diff hingga jumlah baris yang disebutkan"
+
+#: diff.c
+msgid "<char>"
+msgstr "<karakter>"
+
+#: diff.c
+msgid "specify the character to indicate a new line instead of '+'"
+msgstr "sebutkan karakter yang menandai baris baru daripada '+'"
+
+#: diff.c
+msgid "specify the character to indicate an old line instead of '-'"
+msgstr "sebutkan karakter yang menandai baris lama daripada '-'"
+
+#: diff.c
+msgid "specify the character to indicate a context instead of ' '"
+msgstr "sebutkan karakter yang menandai konteks daripada ' '"
+
+#: diff.c
+msgid "Diff rename options"
+msgstr "Opsi penamaan ulang diff"
+
+#: diff.c
+msgid "<n>[/<m>]"
+msgstr "<n>[/<m>]"
+
+#: diff.c
+msgid "break complete rewrite changes into pairs of delete and create"
+msgstr ""
+"pisahkan perubahan penulisan ulang penuh kedalam pasangan penghapusan dan "
+"pembuatan"
+
+#: diff.c
+msgid "detect renames"
+msgstr "deteksi penamaan ulang"
+
+#: diff.c
+msgid "omit the preimage for deletes"
+msgstr "lewati pracitra untuk penghapusan"
+
+#: diff.c
+msgid "detect copies"
+msgstr "deteksi penyalinan"
+
+#: diff.c
+msgid "use unmodified files as source to find copies"
+msgstr ""
+"gunakan berkas tak termodifikasi sebagai sumber untuk menemukan salinan"
+
+#: diff.c
+msgid "disable rename detection"
+msgstr "nonaktifkan deteksi penamaan ulang"
+
+#: diff.c
+msgid "use empty blobs as rename source"
+msgstr "gunakan blob kosong sebagai sumber penamaan ulang"
+
+#: diff.c
+msgid "continue listing the history of a file beyond renames"
+msgstr "lanjutkan daftarkan riwayat berkas di luar penamaan ulang"
+
+#: diff.c
+msgid ""
+"prevent rename/copy detection if the number of rename/copy targets exceeds "
+"given limit"
+msgstr ""
+"cegah pendeteksian penamaan ulang/penyalinan jika jumlah target penamaan "
+"ulang/penyalinan melebihi batas yang diberikan"
+
+#: diff.c
+msgid "Diff algorithm options"
+msgstr "Opsi algoritma diff"
+
+#: diff.c
+msgid "produce the smallest possible diff"
+msgstr "hasilkan diff yang paling kecil yang dimungkinkan"
+
+#: diff.c
+msgid "ignore whitespace when comparing lines"
+msgstr "abaikan spasi saat membandingkan baris"
+
+#: diff.c
+msgid "ignore changes in amount of whitespace"
+msgstr "abaikan perubahan dalam jumlah spasi"
+
+#: diff.c
+msgid "ignore changes in whitespace at EOL"
+msgstr "abaikan perubahan spasi pada EOL"
+
+#: diff.c
+msgid "ignore carrier-return at the end of line"
+msgstr "abaikan kembalian-kurir pada akhir baris"
+
+#: diff.c
+msgid "ignore changes whose lines are all blank"
+msgstr "abaikan perubahan yang semua baris kosong"
+
+#: diff.c
+msgid "<regex>"
+msgstr "<regex>"
+
+#: diff.c
+msgid "ignore changes whose all lines match <regex>"
+msgstr "abaikan perubahan yang semua baris cocok dengan <regex>"
+
+#: diff.c
+msgid "heuristic to shift diff hunk boundaries for easy reading"
+msgstr ""
+"heuristik untuk geser perbatasan bingkah diff untuk pembacaan yang mudah"
+
+#: diff.c
+msgid "generate diff using the \"patience diff\" algorithm"
+msgstr "buat diff menggunakan algoritma \"diff sabar\""
+
+#: diff.c
+msgid "generate diff using the \"histogram diff\" algorithm"
+msgstr "buat diff menggunakan algoritma \"diff histogram\""
+
+#: diff.c
+msgid "<algorithm>"
+msgstr "<algoritma>"
+
+#: diff.c
+msgid "choose a diff algorithm"
+msgstr "pilih algoritma diff"
+
+#: diff.c
+msgid "<text>"
+msgstr "<teks>"
+
+#: diff.c
+msgid "generate diff using the \"anchored diff\" algorithm"
+msgstr "buat diff menggunakan algoritma \"diff terlabuh\""
+
+#: diff.c
+msgid "<mode>"
+msgstr "<mode>"
+
+#: diff.c
+msgid "show word diff, using <mode> to delimit changed words"
+msgstr ""
+"perlihatkan diff kata, menggunakan <mode> untuk batasi kata yang berubah"
+
+#: diff.c
+msgid "use <regex> to decide what a word is"
+msgstr "gunakan <regex> untuk menentukan apa itu kata"
+
+#: diff.c
+msgid "equivalent to --word-diff=color --word-diff-regex=<regex>"
+msgstr "sama dengan --word-diff=color --word-diff-regex=<regex>"
+
+#: diff.c
+msgid "moved lines of code are colored differently"
+msgstr "baris kode yang berpindah diwarnai berbeda"
+
+#: diff.c
+msgid "how white spaces are ignored in --color-moved"
+msgstr "bagaimana spasi diabaikan di --color-moved"
+
+#: diff.c
+msgid "Other diff options"
+msgstr "Opsi diff yang lainnya"
+
+#: diff.c
+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
+msgid "treat all files as text"
+msgstr "perlakukan semua berkas sebagai teks"
+
+#: diff.c
+msgid "swap two inputs, reverse the diff"
+msgstr "tukar dua masukkan, balikkan diff"
+
+#: diff.c
+msgid "exit with 1 if there were differences, 0 otherwise"
+msgstr "keluar dengan 1 jika ada perbedaan, selain itu 0"
+
+#: diff.c
+msgid "disable all output of the program"
+msgstr "nonaktifkan semua keluaran program"
+
+#: diff.c
+msgid "allow an external diff helper to be executed"
+msgstr "perbolehkan pembantu diff eksternal untuk dieksekusi"
+
+#: diff.c
+msgid "run external text conversion filters when comparing binary files"
+msgstr ""
+"jalankan saringan konversi teks eksternal ketika membandingkan berkas biner"
+
+#: diff.c
+msgid "<when>"
+msgstr "<kapan>"
+
+#: diff.c
+msgid "ignore changes to submodules in the diff generation"
+msgstr "abaikan perubahan submodul dalam pembuatan diff"
+
+#: diff.c
+msgid "<format>"
+msgstr "<format>"
+
+#: diff.c
+msgid "specify how differences in submodules are shown"
+msgstr "sebutkan bagaimana perbedaan dalam submodul diperlihatkan"
+
+#: diff.c
+msgid "hide 'git add -N' entries from the index"
+msgstr "sembunyikan entri 'git add -N' dari indeks"
+
+#: diff.c
+msgid "treat 'git add -N' entries as real in the index"
+msgstr "perlakukan entri 'git add -N' sebagai nyata dalam indeks"
+
+#: diff.c
+msgid "<string>"
+msgstr "<untai>"
+
+#: diff.c
+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
+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
+msgid "show all changes in the changeset with -S or -G"
+msgstr "perlihatkan semua perubahan dalam set perubahan dengan -S atau -G"
+
+#: diff.c
+msgid "treat <string> in -S as extended POSIX regular expression"
+msgstr ""
+"perlakukan <string> di -S sebagai ekspresi reguler POSIX yang diperluas"
+
+#: diff.c
+msgid "control the order in which files appear in the output"
+msgstr "kontrol urutan berkas yang muncul dalam keluaran"
+
+#: diff.c
+msgid "<path>"
+msgstr "<jalur>"
+
+#: diff.c
+msgid "show the change in the specified path first"
+msgstr "perlihatkan perubahan dalam jalur yang disebutkan terlebih dahulu"
+
+#: diff.c
+msgid "skip the output to the specified path"
+msgstr "lewati keluaran ke jalur yang disebutkan"
+
+#: diff.c
+msgid "<object-id>"
+msgstr "<id objek>"
+
+#: diff.c
+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
+msgid "[(A|C|D|M|R|T|U|X|B)...[*]]"
+msgstr "[(A|C|D|M|R|T|U|X|B)...[*]]"
+
+#: diff.c
+msgid "select files by diff type"
+msgstr "pilih berkas oleh tipe diff"
+
+#: diff.c
+msgid "<file>"
+msgstr "<berkas>"
+
+#: diff.c
+msgid "output to a specific file"
+msgstr "keluarkan ke berkas yang disebutkan"
+
+#: diff.c
+msgid "exhaustive rename detection was skipped due to too many files."
+msgstr "deteksi penamaan ulang lengkap dilewati karena terlalu banyak berkas."
+
+#: diff.c
+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
+#, c-format
+msgid ""
+"you may want to set your %s variable to at least %d and retry the command."
+msgstr ""
+"mungkin Anda ingin menyetel variabel %s Anda ke setidaknya %d dan coba lagi "
+"perintah."
+
+#: diffcore-order.c
+#, c-format
+msgid "failed to read orderfile '%s'"
+msgstr ""
+
+#: diffcore-rename.c
+msgid "Performing inexact rename detection"
+msgstr ""
+
+#: diffcore-rotate.c
+#, c-format
+msgid "No such path '%s' in the diff"
+msgstr ""
+
+#: dir.c
+#, c-format
+msgid "pathspec '%s' did not match any file(s) known to git"
+msgstr ""
+
+#: dir.c
+#, c-format
+msgid "unrecognized pattern: '%s'"
+msgstr ""
+
+#: dir.c
+#, c-format
+msgid "unrecognized negative pattern: '%s'"
+msgstr ""
+
+#: dir.c
+#, c-format
+msgid "your sparse-checkout file may have issues: pattern '%s' is repeated"
+msgstr ""
+
+#: dir.c
+msgid "disabling cone pattern matching"
+msgstr ""
+
+#: dir.c
+#, c-format
+msgid "cannot use %s as an exclude file"
+msgstr ""
+
+#: dir.c
+msgid "failed to get kernel name and information"
+msgstr ""
+
+#: dir.c
+msgid "untracked cache is disabled on this system or location"
+msgstr ""
+
+#: dir.c
+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
+#, c-format
+msgid "index file corrupt in repo %s"
+msgstr ""
+
+#: dir.c
+#, c-format
+msgid "could not create directories for %s"
+msgstr ""
+
+#: dir.c
+#, c-format
+msgid "could not migrate git directory from '%s' to '%s'"
+msgstr ""
+
+#: editor.c
+#, c-format
+msgid "hint: Waiting for your editor to close the file...%c"
+msgstr ""
+
+#: entry.c
+msgid "Filtering content"
+msgstr ""
+
+#: entry.c
+#, c-format
+msgid "could not stat file '%s'"
+msgstr ""
+
+#: environment.c
+#, c-format
+msgid "bad git namespace path \"%s\""
+msgstr ""
+
+#: exec-cmd.c
+#, c-format
+msgid "too many args to run %s"
+msgstr ""
+
+#: fetch-pack.c
+msgid "git fetch-pack: expected shallow list"
+msgstr "git fetch-pack: daftar dangkal diharapkan"
+
+#: fetch-pack.c
+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
+msgid "git fetch-pack: expected ACK/NAK, got a flush packet"
+msgstr "git fetch-pack: ACK/NAK diharapkan, dapat paket bilasan"
+
+#: fetch-pack.c
+#, c-format
+msgid "git fetch-pack: expected ACK/NAK, got '%s'"
+msgstr "git fetch-pack: ACK/NAK diharapkan, dapat '%s'"
+
+#: fetch-pack.c
+msgid "unable to write to remote"
+msgstr "tidak dapat menulis ke remote"
+
+#: fetch-pack.c
+#, c-format
+msgid "invalid shallow line: %s"
+msgstr "baris dangkal tidak valid: %s"
+
+#: fetch-pack.c
+#, c-format
+msgid "invalid unshallow line: %s"
+msgstr "baris dangkal-balik tidak valid: %s"
+
+#: fetch-pack.c
+#, c-format
+msgid "object not found: %s"
+msgstr "object tidak ditemukan: %s"
+
+#: fetch-pack.c
+#, c-format
+msgid "error in object: %s"
+msgstr "kesalahan dalam objek: %s"
+
+#: fetch-pack.c
+#, c-format
+msgid "no shallow found: %s"
+msgstr "tidak ada dangkal yang ditemukan: %s"
+
+#: fetch-pack.c
+#, c-format
+msgid "expected shallow/unshallow, got %s"
+msgstr "dangkal/dangkal-balik diharapkan, dapat %s"
+
+#: fetch-pack.c
+#, c-format
+msgid "got %s %d %s"
+msgstr "dapat %s %d %s"
+
+#: fetch-pack.c
+#, c-format
+msgid "invalid commit %s"
+msgstr "komit tidak valid %s"
+
+#: fetch-pack.c
+msgid "giving up"
+msgstr "menyerah"
+
+#: fetch-pack.c progress.h
+msgid "done"
+msgstr "selesai"
+
+#: fetch-pack.c
+#, c-format
+msgid "got %s (%d) %s"
+msgstr "dapat %s (%d) %s"
+
+#: fetch-pack.c
+#, c-format
+msgid "Marking %s as complete"
+msgstr "Menandai %s sebagai lengkap"
+
+#: fetch-pack.c
+#, c-format
+msgid "already have %s (%s)"
+msgstr "sudah punya %s (%s)"
+
+#: fetch-pack.c
+msgid "fetch-pack: unable to fork off sideband demultiplexer"
+msgstr "fetch-pack: tidak dapat menggarpu pemultipleks-balik pita samping"
+
+#: fetch-pack.c
+msgid "protocol error: bad pack header"
+msgstr "kesalahan protokol: kepala pak jelek"
+
+#: fetch-pack.c
+#, c-format
+msgid "fetch-pack: unable to fork off %s"
+msgstr "fetch-pack: tidak dapat menggarpu %s"
+
+#: fetch-pack.c
+msgid "fetch-pack: invalid index-pack output"
+msgstr "fetch-pack: keluaran index-pack tidak valid"
+
+#: fetch-pack.c
+#, c-format
+msgid "%s failed"
+msgstr "%s gagal"
+
+#: fetch-pack.c
+msgid "error in sideband demultiplexer"
+msgstr "kesalahan dalam pemultipleks-balik pita samping"
+
+#: fetch-pack.c
+#, c-format
+msgid "Server version is %.*s"
+msgstr "Versi peladen %.*s"
+
+#: fetch-pack.c
+#, c-format
+msgid "Server supports %s"
+msgstr "Peladen mendukung %s"
+
+#: fetch-pack.c
+msgid "Server does not support shallow clients"
+msgstr "Peladen tidak mendukung klien dangkal"
+
+#: fetch-pack.c
+msgid "Server does not support --shallow-since"
+msgstr "Peladen tidak mendukung --shallow-since"
+
+#: fetch-pack.c
+msgid "Server does not support --shallow-exclude"
+msgstr "Peladen tidak mendukung --shallow-exclude"
+
+#: fetch-pack.c
+msgid "Server does not support --deepen"
+msgstr "Peladen tidak mendukung --deepen"
+
+#: fetch-pack.c
+msgid "Server does not support this repository's object format"
+msgstr "Peladen tidak mendukung objek format repositori ini"
+
+#: fetch-pack.c
+msgid "no common commits"
+msgstr "tidak ada komit umum"
+
+#: fetch-pack.c
+msgid "git fetch-pack: fetch failed."
+msgstr "git fetch-pack: pengambilan gagal."
+
+#: fetch-pack.c
+#, c-format
+msgid "mismatched algorithms: client %s; server %s"
+msgstr "algoritma tidak cocok: klien %s; peladen %s"
+
+#: fetch-pack.c
+#, c-format
+msgid "the server does not support algorithm '%s'"
+msgstr "peladen tidak mendukung algoritma '%s'"
+
+#: fetch-pack.c
+msgid "Server does not support shallow requests"
+msgstr "Peladen tidak mendukung permintaan dangkal"
+
+#: fetch-pack.c
+msgid "Server supports filter"
+msgstr "Peladen mendukung saringan"
+
+#: fetch-pack.c
+msgid "unable to write request to remote"
+msgstr "tidak dapat menulis permintaan kepada remote"
+
+#: fetch-pack.c
+#, c-format
+msgid "expected '%s', received '%s'"
+msgstr "diharapkan '%s', diterima '%s'"
+
+#: fetch-pack.c
+#, c-format
+msgid "expected '%s'"
+msgstr "'%s' diharapkan"
+
+#: fetch-pack.c
+#, c-format
+msgid "unexpected acknowledgment line: '%s'"
+msgstr "baris pengakuan tidak diharapkan: %s"
+
+#: fetch-pack.c
+#, c-format
+msgid "error processing acks: %d"
+msgstr "kesalahan memproses ack: %d"
+
+#. TRANSLATORS: The parameter will be 'ready', a protocol
+#. keyword.
+#.
+#: fetch-pack.c
+#, c-format
+msgid "expected packfile to be sent after '%s'"
+msgstr "berkas pak diharapkan dikirim setelah '%s'"
+
+#. TRANSLATORS: The parameter will be 'ready', a protocol
+#. keyword.
+#.
+#: fetch-pack.c
+#, c-format
+msgid "expected no other sections to be sent after no '%s'"
+msgstr ""
+"tidak ada bagian lainnya yang diharapkan dikirim setelah tidak ada '%s'"
+
+#: fetch-pack.c
+#, c-format
+msgid "error processing shallow info: %d"
+msgstr "gagal memproses info dangkal: %d"
+
+#: fetch-pack.c
+#, c-format
+msgid "expected wanted-ref, got '%s'"
+msgstr "wanted-ref diharapkan, dapat '%s'"
+
+#: fetch-pack.c
+#, c-format
+msgid "unexpected wanted-ref: '%s'"
+msgstr "wanted-ref tidak diharapkan: '%s'"
+
+#: fetch-pack.c
+#, c-format
+msgid "error processing wanted refs: %d"
+msgstr "kesalahan memproses referensi yang diminta: %d"
+
+#: fetch-pack.c
+msgid "git fetch-pack: expected response end packet"
+msgstr "git fetch-pack: paket jawaban akhir diharapkan"
+
+#: fetch-pack.c
+msgid "no matching remote head"
+msgstr "tidak ada kepala remote yang cocok"
+
+#: fetch-pack.c
+msgid "unexpected 'ready' from remote"
+msgstr "'ready' tidak diharapkan dari remote"
+
+#: fetch-pack.c
+#, c-format
+msgid "no such remote ref %s"
+msgstr "tidak ada referensi remote seperti %s"
+
+#: fetch-pack.c
+#, c-format
+msgid "Server does not allow request for unadvertised object %s"
+msgstr "Peladen tidak memperbolehkan permintaan untuk objek tak diiklankan %s"
+
+#: fsmonitor-ipc.c
+#, c-format
+msgid "fsmonitor_ipc__send_query: invalid path '%s'"
+msgstr ""
+
+#: fsmonitor-ipc.c
+#, c-format
+msgid "fsmonitor_ipc__send_query: unspecified error on '%s'"
+msgstr ""
+
+#: fsmonitor-ipc.c
+msgid "fsmonitor--daemon is not running"
+msgstr ""
+
+#: fsmonitor-ipc.c
+#, c-format
+msgid "could not send '%s' command to fsmonitor--daemon"
+msgstr ""
+
+#: fsmonitor-settings.c
+#, c-format
+msgid "bare repository '%s' is incompatible with fsmonitor"
+msgstr ""
+
+#: fsmonitor-settings.c
+#, c-format
+msgid "repository '%s' is incompatible with fsmonitor due to errors"
+msgstr ""
+
+#: fsmonitor-settings.c
+#, c-format
+msgid "remote repository '%s' is incompatible with fsmonitor"
+msgstr ""
+
+#: fsmonitor-settings.c
+#, c-format
+msgid "virtual repository '%s' is incompatible with fsmonitor"
+msgstr ""
+
+#: fsmonitor-settings.c
+#, c-format
+msgid ""
+"repository '%s' is incompatible with fsmonitor due to lack of Unix sockets"
+msgstr ""
+
+#: git.c
+msgid ""
+"git [-v | --version] [-h | --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"
@@ -24456,7 +19742,7 @@ msgid ""
 "           [--super-prefix=<path>] [--config-env=<name>=<envvar>]\n"
 "           <command> [<args>]"
 msgstr ""
-"git [--version] [--help] [-C <jalur>] [-c <nama>=<nilai>]\n"
+"git [-v| --version] [-h | --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"
@@ -24465,7 +19751,7 @@ msgstr ""
 "lingkungan>]\n"
 "           <perintah> [<argumen>]"
 
-#: git.c:36
+#: git.c
 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"
@@ -24477,42 +19763,47 @@ msgstr ""
 "untuk baca tentang perintah atau konsep spesifik.\n"
 "Lihat 'git help git' untuk gambaran tentang sistem."
 
-#: git.c:188 git.c:216 git.c:300
+#: git.c help.c
+#, c-format
+msgid "unsupported command listing type '%s'"
+msgstr "tipe daftar perintah '%s' tidak didukung"
+
+#: git.c
 #, c-format
 msgid "no directory given for '%s' option\n"
 msgstr "tidak ada direktori yang diberikan untuk opsi '%s'\n"
 
-#: git.c:202
+#: git.c
 #, c-format
 msgid "no namespace given for --namespace\n"
 msgstr "tidak ada ruang nama yang diberikan untuk --namespace\n"
 
-#: git.c:230
+#: git.c
 #, c-format
 msgid "no prefix given for --super-prefix\n"
 msgstr "tidak ada prefiks yang diberikan untuk --super-prefix\n"
 
-#: git.c:252
+#: git.c
 #, c-format
 msgid "-c expects a configuration string\n"
 msgstr "-c mengharapkan sebuah untai konfigurasi\n"
 
-#: git.c:260
+#: git.c
 #, c-format
 msgid "no config key given for --config-env\n"
 msgstr "tidak ada kunci konfigurasi yang diberikan untuk --config-env\n"
 
-#: git.c:326
+#: git.c
 #, c-format
 msgid "unknown option: %s\n"
 msgstr "opsi tidak dikenal: %s\n"
 
-#: git.c:375
+#: git.c
 #, c-format
 msgid "while expanding alias '%s': '%s'"
 msgstr "ketika memperluas alias '%s': '%s'"
 
-#: git.c:384
+#: git.c
 #, c-format
 msgid ""
 "alias '%s' changes environment variables.\n"
@@ -24521,39 +19812,39 @@ msgstr ""
 "alias '%s' merubah variabel lingkungan.\n"
 "Anda dapat menggunakan '!git' dalam alias untuk melakukannya."
 
-#: git.c:391
+#: git.c
 #, c-format
 msgid "empty alias for %s"
 msgstr "alias kosong untuk %s"
 
-#: git.c:394
+#: git.c
 #, c-format
 msgid "recursive alias: %s"
 msgstr "alias rekursif: %s"
 
-#: git.c:480
+#: git.c
 msgid "write failure on standard output"
 msgstr "kegagalan menulis pada keluaran standar"
 
-#: git.c:482
+#: git.c
 msgid "unknown write failure on standard output"
 msgstr "kegagal menulis tidak diketahui pada keluaran standar"
 
-#: git.c:484
+#: git.c
 msgid "close failed on standard output"
 msgstr "penutupan gagal pada keluaran standar"
 
-#: git.c:838
+#: git.c
 #, c-format
 msgid "alias loop detected: expansion of '%s' does not terminate:%s"
 msgstr "putaran alias terdeteksi: perluasan '%s' tidak berhenti:%s"
 
-#: git.c:888
+#: git.c
 #, c-format
 msgid "cannot handle %s as a builtin"
 msgstr "tidak dapat menangani %s sebagai bawaan"
 
-#: git.c:901
+#: git.c
 #, c-format
 msgid ""
 "usage: %s\n"
@@ -24562,1345 +19853,6374 @@ msgstr ""
 "penggunaan: %s\n"
 "\n"
 
-#: git.c:921
+#: git.c
 #, c-format
 msgid "expansion of alias '%s' failed; '%s' is not a git command\n"
 msgstr "perluasan alias '%s' gagal; '%s' bukan sebuah perintah git\n"
 
-#: git.c:933
+#: git.c
 #, c-format
 msgid "failed to run command '%s': %s\n"
 msgstr "gagal menjalankan perintah '%s': %s\n"
 
-#: http-fetch.c:128
+#: gpg-interface.c
+msgid "could not create temporary file"
+msgstr "tidak dapat membuat berkas sementara"
+
+#: gpg-interface.c
 #, c-format
-msgid "argument to --packfile must be a valid hash (got '%s')"
+msgid "failed writing detached signature to '%s'"
+msgstr "gagal menulis tandatangan terlepas ke '%s'"
+
+#: gpg-interface.c
+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"
 
-#: http-fetch.c:138
-msgid "not a git repository"
+#: gpg-interface.c
+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+)"
 
-#: t/helper/test-fast-rebase.c:141
-msgid "unhandled options"
+#: gpg-interface.c
+#, c-format
+msgid "ssh signing revocation file configured but not found: %s"
 msgstr ""
+"berkas pencabutan penandatanganan ssh terkonfigurasi tapi tidak ada: %s"
 
-#: t/helper/test-fast-rebase.c:146
-msgid "error preparing revisions"
+#: gpg-interface.c
+#, c-format
+msgid "bad/incompatible signature '%s'"
+msgstr "tanda tangan '%s' jelek/tidak kompatibel"
+
+#: gpg-interface.c
+#, c-format
+msgid "failed to get the ssh fingerprint for key '%s'"
+msgstr "gagal mendapatkan sidik jari ssh untuk kunci '%s'"
+
+#: gpg-interface.c
+msgid ""
+"either user.signingkey or gpg.ssh.defaultKeyCommand needs to be configured"
 msgstr ""
+"baik user.signingkey atau gpg.ssh.defaultKeyCommand perlu dikonfigurasi"
 
-#: t/helper/test-reach.c:154
+#: gpg-interface.c
 #, c-format
-msgid "commit %s is not marked reachable"
+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
+#, c-format
+msgid "gpg.ssh.defaultKeyCommand failed: %s %s"
+msgstr "gpg.ssh.defaultKeyCommand gagal: %s %s"
+
+#: gpg-interface.c
+msgid "gpg failed to sign the data"
+msgstr "gpg gagal menandatangani data"
+
+#: gpg-interface.c
+msgid "user.signingKey needs to be set for ssh signing"
+msgstr "user.signingKey perlu disetel untuk penandatanganan ssh"
+
+#: gpg-interface.c
+#, c-format
+msgid "failed writing ssh signing key to '%s'"
+msgstr "gagal menulis kunci penandatanganan ssh ke '%s'"
+
+#: gpg-interface.c
+#, c-format
+msgid "failed writing ssh signing key buffer to '%s'"
+msgstr "gagal menulis penyangga kunci penandatanganan ssh ke '%s'"
+
+#: gpg-interface.c
+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+)"
 
-#: t/helper/test-reach.c:164
-msgid "too many commits marked reachable"
+#: gpg-interface.c
+#, c-format
+msgid "failed reading ssh signing data buffer from '%s'"
+msgstr "gagal membaca penyangga data penandatanganan ssh dari '%s'"
+
+#: graph.c
+#, c-format
+msgid "ignored invalid color '%.*s' in log.graphColors"
+msgstr "warna tidak valid '%.*s' diabaikan di log.graphColors"
+
+#: grep.c
+msgid ""
+"given pattern contains NULL byte (via -f <file>). This is only supported "
+"with -P under PCRE v2"
 msgstr ""
+"pola yang diberikan berisi bita NULL (via -f <berkas>). Hal ini hanya "
+"didukung dengan -P di bawah PCRE v2"
 
-#: t/helper/test-serve-v2.c:7
-msgid "test-tool serve-v2 [<options>]"
+#: grep.c
+#, c-format
+msgid "'%s': unable to read %s"
+msgstr "'%s': tidak dapat membaca %s"
+
+#: grep.c
+#, c-format
+msgid "'%s': short read"
+msgstr "'%s': baca pendek"
+
+#: help.c
+msgid "start a working area (see also: git help tutorial)"
+msgstr "mulai area kerja (lihat pula: git help tutorial)"
+
+#: help.c
+msgid "work on the current change (see also: git help everyday)"
+msgstr "bekerja pada perubahan saat ini (lihat pula: git help everyday)"
+
+#: help.c
+msgid "examine the history and state (see also: git help revisions)"
+msgstr "periksa riwayat dan keadaan (lihat pula: git help revisions)"
+
+#: help.c
+msgid "grow, mark and tweak your common history"
+msgstr "tumbuhkan, tandai, dan cubit riwayat umum Anda"
+
+#: help.c
+msgid "collaborate (see also: git help workflows)"
+msgstr "kolaborasi (lihat pula: git help workflows)"
+
+#: help.c
+msgid "Main Porcelain Commands"
+msgstr "Perintah Porselen Utama"
+
+#: help.c
+msgid "Ancillary Commands / Manipulators"
+msgstr "Perintah Tambahan / Peubah"
+
+#: help.c
+msgid "Ancillary Commands / Interrogators"
+msgstr "Perintah Tambahan / Pemeriksa"
+
+#: help.c
+msgid "Interacting with Others"
+msgstr "Berinteraksi dengan yang Lain"
+
+#: help.c
+msgid "Low-level Commands / Manipulators"
+msgstr "Perintah Tingkat Rendah / Peubah"
+
+#: help.c
+msgid "Low-level Commands / Interrogators"
+msgstr "Perintah Tingkat Rendah / Pemeriksa"
+
+#: help.c
+msgid "Low-level Commands / Syncing Repositories"
+msgstr "Perintah Tingkat Rendah / Sinkronisasi Repositori"
+
+#: help.c
+msgid "Low-level Commands / Internal Helpers"
+msgstr "Perintah Tingak Rendah / Pembantu Internal"
+
+#: help.c
+#, c-format
+msgid "available git commands in '%s'"
+msgstr "perintah git yang tersedia di '%s'"
+
+#: help.c
+msgid "git commands available from elsewhere on your $PATH"
+msgstr "perintah git yang tersedia dari tempat lain pada $PATH Anda"
+
+#: help.c
+msgid "These are common Git commands used in various situations:"
+msgstr "Berikut ini perintah Git umum yang digunakan dalam beragam situasi:"
+
+#: help.c
+msgid "The Git concept guides are:"
+msgstr "Panduan konsep Git adalah:"
+
+#: help.c
+msgid "External commands"
+msgstr "Perintah eksternal"
+
+#: help.c
+msgid "Command aliases"
+msgstr "Alias perintah"
+
+#: help.c
+msgid "See 'git help <command>' to read about a specific subcommand"
+msgstr "Lihat 'git help <perintah>' untuk baca tentang subperintah spesifik"
+
+#: help.c
+#, c-format
+msgid ""
+"'%s' appears to be a git command, but we were not\n"
+"able to execute it. Maybe git-%s is broken?"
 msgstr ""
+"'%s' sepertinya perintah git, tetapi kami tidak dapat\n"
+"menjalankannya. Mungkin git-%s rusak?"
 
-#: t/helper/test-serve-v2.c:19
-msgid "exit immediately after advertising capabilities"
+#: help.c
+#, c-format
+msgid "git: '%s' is not a git command. See 'git --help'."
+msgstr "git: '%s' bukan perintah git. Lihat 'git --help'."
+
+#: help.c
+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
+#, 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
+#, c-format
+msgid "Continuing under the assumption that you meant '%s'."
+msgstr "Melanjutkan di bawah asumsi bahwa maksud Anda '%s'."
+
+#: help.c
+#, c-format
+msgid "Run '%s' instead [y/N]? "
+msgstr "Jalankan '%s' sebagai gantinya [y/N]?"
+
+#: help.c
+#, 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
+msgid ""
+"\n"
+"The most similar command is"
+msgid_plural ""
+"\n"
+"The most similar commands are"
+msgstr[0] ""
+"\n"
+"Perintah paling mirip adalah"
+msgstr[1] ""
+"\n"
+"Perintah paling mirip adalah"
+
+#: help.c
+msgid "git version [<options>]"
+msgstr "git version [<opsi>]"
+
+#: help.c
+#, c-format
+msgid "%s: %s - %s"
+msgstr "%s: %s - %s"
+
+#: help.c
+msgid ""
+"\n"
+"Did you mean this?"
+msgid_plural ""
+"\n"
+"Did you mean one of these?"
+msgstr[0] ""
+"\n"
+"Mungkin maksud Anda yang ini?"
+msgstr[1] ""
+"\n"
+"Mungkin maksud Anda salah satu dari yang ini?"
+
+#: hook.c
+#, 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 ""
+"Kait '%s' diabaikan karena tidak disetel sebagai dapat dieksekusi.\n"
+"Anda dapat menonaktifkan peringatan ini dengan `git config advice."
+"ignoredHook false`."
 
-#: t/helper/test-simple-ipc.c:581
-msgid "test-helper simple-ipc is-active    [<name>] [<options>]"
+#: hook.c
+#, c-format
+msgid "Couldn't start hook '%s'\n"
+msgstr "Tidak dapat memulai kait '%s'\n"
+
+#: http-fetch.c
+#, c-format
+msgid "argument to --packfile must be a valid hash (got '%s')"
 msgstr ""
 
-#: t/helper/test-simple-ipc.c:582
-msgid "test-helper simple-ipc run-daemon   [<name>] [<threads>]"
+#: http-fetch.c
+msgid "not a git repository"
 msgstr ""
 
-#: t/helper/test-simple-ipc.c:583
-msgid "test-helper simple-ipc start-daemon [<name>] [<threads>] [<max-wait>]"
+#: http.c
+#, c-format
+msgid "negative value for http.postBuffer; defaulting to %d"
 msgstr ""
 
-#: t/helper/test-simple-ipc.c:584
-msgid "test-helper simple-ipc stop-daemon  [<name>] [<max-wait>]"
+#: http.c
+msgid "Delegation control is not supported with cURL < 7.22.0"
 msgstr ""
 
-#: t/helper/test-simple-ipc.c:585
-msgid "test-helper simple-ipc send         [<name>] [<token>]"
+#: http.c
+msgid "Public key pinning not supported with cURL < 7.39.0"
 msgstr ""
 
-#: t/helper/test-simple-ipc.c:586
-msgid "test-helper simple-ipc sendbytes    [<name>] [<bytecount>] [<byte>]"
+#: http.c
+msgid "CURLSSLOPT_NO_REVOKE not supported with cURL < 7.44.0"
+msgstr ""
+
+#: http.c
+#, c-format
+msgid "Unsupported SSL backend '%s'. Supported SSL backends:"
+msgstr ""
+
+#: http.c
+#, c-format
+msgid "Could not set SSL backend to '%s': cURL was built without SSL backends"
+msgstr ""
+
+#: http.c
+#, c-format
+msgid "Could not set SSL backend to '%s': already set"
 msgstr ""
 
-#: t/helper/test-simple-ipc.c:587
+#: http.c
+#, c-format
 msgid ""
-"test-helper simple-ipc multiple     [<name>] [<threads>] [<bytecount>] "
-"[<batchsize>]"
+"unable to update url base from redirection:\n"
+"  asked for: %s\n"
+"   redirect: %s"
 msgstr ""
 
-#: t/helper/test-simple-ipc.c:595
-msgid "name or pathname of unix domain socket"
+#: ident.c
+msgid "Author identity unknown\n"
+msgstr "Identitas pengarang tidak dikenal\n"
+
+#: ident.c
+msgid "Committer identity unknown\n"
+msgstr "Identitas pengkomit tidak dikenal\n"
+
+#: ident.c
+msgid ""
+"\n"
+"*** Please tell me who you are.\n"
+"\n"
+"Run\n"
+"\n"
+"  git config --global user.email \"you@example.com\"\n"
+"  git config --global user.name \"Your Name\"\n"
+"\n"
+"to set your account's default identity.\n"
+"Omit --global to set the identity only in this repository.\n"
+"\n"
 msgstr ""
+"\n"
+"*** Mohon beri tahu saya siapa Anda.\n"
+"\n"
+"Jalankan\n"
+"\n"
+"  git config --global user.email \"anda@example.com\"\n"
+"  git config --global user.name \"Nama Anda\"\n"
+"\n"
+"untuk menyetel identitas asali akun Anda.\n"
+"Abaikan --global untuk menyetel identitas hanya di dalam repositori ini.\n"
+"\n"
 
-#: t/helper/test-simple-ipc.c:597
-msgid "named-pipe name"
+#: ident.c
+msgid "no email was given and auto-detection is disabled"
+msgstr "tidak ada email yang diberikan dan deteksi otomatis dimatikan"
+
+#: ident.c
+#, c-format
+msgid "unable to auto-detect email address (got '%s')"
+msgstr "tidak dapat mendeteksi otomatis alamat email (dapat '%s')"
+
+#: ident.c
+msgid "no name was given and auto-detection is disabled"
+msgstr "tidak ada nama yang diberikan dan deteksi otomatis dimatikan"
+
+#: ident.c
+#, c-format
+msgid "unable to auto-detect name (got '%s')"
+msgstr "tidak dapat mendeteksi otomatis nama (dapat '%s')"
+
+#: ident.c
+#, c-format
+msgid "empty ident name (for <%s>) not allowed"
+msgstr "nama identitas kosong (untuk <%s>) tidak diperbolehkan"
+
+#: ident.c
+#, c-format
+msgid "name consists only of disallowed characters: %s"
+msgstr "nama hanya terdiri dari karakter yang tidak diperbolehkan: %s"
+
+#: list-objects-filter-options.c
+msgid "expected 'tree:<depth>'"
 msgstr ""
 
-#: t/helper/test-simple-ipc.c:599
-msgid "number of threads in server thread pool"
+#: list-objects-filter-options.c
+msgid "sparse:path filters support has been dropped"
 msgstr ""
 
-#: t/helper/test-simple-ipc.c:600
-msgid "seconds to wait for daemon to start or stop"
+#: list-objects-filter-options.c
+#, c-format
+msgid "'%s' for 'object:type=<type>' is not a valid object type"
 msgstr ""
 
-#: t/helper/test-simple-ipc.c:602
-msgid "number of bytes"
+#: list-objects-filter-options.c
+#, c-format
+msgid "invalid filter-spec '%s'"
 msgstr ""
 
-#: t/helper/test-simple-ipc.c:603
-msgid "number of requests per thread"
+#: list-objects-filter-options.c
+#, c-format
+msgid "must escape char in sub-filter-spec: '%c'"
 msgstr ""
 
-#: t/helper/test-simple-ipc.c:605
-msgid "byte"
+#: list-objects-filter-options.c
+msgid "expected something after combine:"
 msgstr ""
 
-#: t/helper/test-simple-ipc.c:605
-msgid "ballast character"
+#: list-objects-filter-options.c
+msgid "multiple filter-specs cannot be combined"
 msgstr ""
 
-#: t/helper/test-simple-ipc.c:606
-msgid "token"
+#: list-objects-filter-options.c
+msgid "unable to upgrade repository format to support partial clone"
 msgstr ""
 
-#: t/helper/test-simple-ipc.c:606
-msgid "command token to send to the server"
+#: list-objects-filter-options.h
+msgid "args"
 msgstr ""
 
-#: http.c:350
+#: list-objects-filter-options.h
+msgid "object filtering"
+msgstr ""
+
+#: list-objects-filter.c
 #, c-format
-msgid "negative value for http.postbuffer; defaulting to %d"
+msgid "unable to access sparse blob in '%s'"
 msgstr ""
 
-#: http.c:371
-msgid "Delegation control is not supported with cURL < 7.22.0"
+#: list-objects-filter.c
+#, c-format
+msgid "unable to parse sparse filter data in %s"
 msgstr ""
 
-#: http.c:380
-msgid "Public key pinning not supported with cURL < 7.39.0"
+#: list-objects.c
+#, c-format
+msgid "entry '%s' in tree %s has tree mode, but is not a tree"
 msgstr ""
 
-#: http.c:812
-msgid "CURLSSLOPT_NO_REVOKE not supported with cURL < 7.44.0"
+#: list-objects.c
+#, c-format
+msgid "entry '%s' in tree %s has blob mode, but is not a blob"
 msgstr ""
 
-#: http.c:1016
+#: list-objects.c
 #, c-format
-msgid "Unsupported SSL backend '%s'. Supported SSL backends:"
+msgid "unable to load root tree for commit %s"
 msgstr ""
 
-#: http.c:1023
+#: lockfile.c
 #, c-format
-msgid "Could not set SSL backend to '%s': cURL was built without SSL backends"
+msgid ""
+"Unable to create '%s.lock': %s.\n"
+"\n"
+"Another git process seems to be running in this repository, e.g.\n"
+"an editor opened by 'git commit'. Please make sure all processes\n"
+"are terminated then try again. If it still fails, a git process\n"
+"may have crashed in this repository earlier:\n"
+"remove the file manually to continue."
 msgstr ""
 
-#: http.c:1027
+#: lockfile.c
 #, c-format
-msgid "Could not set SSL backend to '%s': already set"
+msgid "Unable to create '%s.lock': %s"
 msgstr ""
 
-#: http.c:1876
+#: ls-refs.c
+#, c-format
+msgid "unexpected line: '%s'"
+msgstr ""
+
+#: ls-refs.c
+msgid "expected flush after ls-refs arguments"
+msgstr ""
+
+#: mailinfo.c
+msgid "quoted CRLF detected"
+msgstr ""
+
+#: merge-ort-wrappers.c merge-recursive.c
 #, c-format
 msgid ""
-"unable to update url base from redirection:\n"
-"  asked for: %s\n"
-"   redirect: %s"
+"Your local changes to the following files would be overwritten by merge:\n"
+"  %s"
 msgstr ""
+"Perubahan lokal Anda terhadap berkas berikut akan ditimpa oleh "
+"penggabungan:\n"
+"  %s"
 
-#: remote-curl.c:184
+#: merge-ort.c merge-recursive.c
 #, c-format
-msgid "invalid quoting in push-option value: '%s'"
+msgid "Failed to merge submodule %s (not checked out)"
+msgstr "Gagal menggabungkan submodul %s (tidak di-checkout)"
+
+#: merge-ort.c merge-recursive.c
+#, c-format
+msgid "Failed to merge submodule %s (commits not present)"
+msgstr "Gagal menggabungkan submodul %s (komit tidak ada)"
+
+#: merge-ort.c merge-recursive.c
+#, c-format
+msgid "Failed to merge submodule %s (commits don't follow merge-base)"
 msgstr ""
+"Gagal menggabungkan submodul %s (komit tidak mengikuti dasar penggabungan)"
 
-#: remote-curl.c:308
+#: merge-ort.c
 #, c-format
-msgid "%sinfo/refs not valid: is this a git repository?"
+msgid "Note: Fast-forwarding submodule %s to %s"
+msgstr "Catatan: Memaju-cepat submodul %s ke %s"
+
+#: merge-ort.c
+#, c-format
+msgid "Failed to merge submodule %s"
+msgstr "Gagal menggabungkan submodul %s"
+
+#: merge-ort.c
+#, c-format
+msgid ""
+"Failed to merge submodule %s, but a possible merge resolution exists:\n"
+"%s\n"
 msgstr ""
+"Gagal menggabungkan submodul %s, tetapi sebuah penyelesaian penggabungan "
+"yang mungkin ada:\n"
+"%s\n"
 
-#: remote-curl.c:409
-msgid "invalid server response; expected service, got flush packet"
+#: merge-ort.c merge-recursive.c
+#, c-format
+msgid ""
+"If this is correct simply add it to the index for example\n"
+"by using:\n"
+"\n"
+"  git update-index --cacheinfo 160000 %s \"%s\"\n"
+"\n"
+"which will accept this suggestion.\n"
 msgstr ""
+"Jika benar, cukup misalkan tambahkan ke indeks dengan menggunakan:\n"
+"\n"
+"  git update-index --cacheinfo 160000 %s \"%s\"\n"
+"\n"
+"yang akan menerima saran ini.\n"
 
-#: remote-curl.c:440
+#: merge-ort.c
 #, c-format
-msgid "invalid server response; got '%s'"
+msgid ""
+"Failed to merge submodule %s, but multiple possible merges exist:\n"
+"%s"
 msgstr ""
+"Gagal menggabungkan submodul %s, tetapi ada banyak penggabungan yang "
+"mungkin:\n"
+"%s"
 
-#: remote-curl.c:500
+#: merge-ort.c merge-recursive.c
+msgid "Failed to execute internal merge"
+msgstr "Gagal menjalankan penggabungan internal"
+
+#: merge-ort.c merge-recursive.c
 #, c-format
-msgid "repository '%s' not found"
+msgid "Unable to add %s to database"
+msgstr "Tidak dapat menambahkan %s ke basis data"
+
+#: merge-ort.c merge-recursive.c
+#, c-format
+msgid "Auto-merging %s"
+msgstr "Menggabungkan otomatis %s"
+
+#: merge-ort.c merge-recursive.c
+#, 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 ""
+"KONFLIK (penamaan ulang direktori implisit): Berkas/direktori yang sudah ada "
+"pada %s saat penamaan ulang direktori menempatkan jalur berikut di sana: %s."
 
-#: remote-curl.c:504
+#: merge-ort.c merge-recursive.c
 #, c-format
-msgid "Authentication failed for '%s'"
+msgid ""
+"CONFLICT (implicit dir rename): Cannot map more than one path to %s; "
+"implicit directory renames tried to put these paths there: %s"
 msgstr ""
+"KONFLIK (penamaan ulang direktori implisit): Tidak dapat memetakan lebih "
+"dari satu jalur ke %s; penamaan ulang direktori implisit mencoba menempatkan "
+"jalur tersebut di sana: %s"
 
-#: remote-curl.c:508
+#: merge-ort.c
 #, c-format
-msgid "unable to access '%s' with http.pinnedPubkey configuration: %s"
+msgid ""
+"CONFLICT (directory rename split): Unclear where to rename %s to; it was "
+"renamed to multiple other directories, with no destination getting a "
+"majority of the files."
 msgstr ""
+"KONFLIK (pemecahan penamaan ulang direktori): Tidak jelas kemana menamakan "
+"ulang %s; itu dinamai ulang ke banyak direktori lainnya, dengan tiada tujuan "
+"mendapatkan mayoritas berkas."
 
-#: remote-curl.c:512
+#: merge-ort.c merge-recursive.c
 #, c-format
-msgid "unable to access '%s': %s"
+msgid ""
+"WARNING: Avoiding applying %s -> %s rename to %s, because %s itself was "
+"renamed."
 msgstr ""
+"PERINGATAN: Menghindari menerapkan penamaan ulang %s -> %s ke %s, karena %s-"
+"nya sendiri dinamai ulang."
 
-#: remote-curl.c:518
+#: merge-ort.c merge-recursive.c
 #, c-format
-msgid "redirecting to %s"
+msgid ""
+"Path updated: %s added in %s inside a directory that was renamed in %s; "
+"moving it to %s."
 msgstr ""
+"Jalur diperbarui: %s menambahkan %s di dalam sebuah direktori yang dinamai "
+"ulang di %s; memindahkan ke %s."
 
-#: remote-curl.c:649
-msgid "shouldn't have EOF when not gentle on EOF"
+#: merge-ort.c merge-recursive.c
+#, c-format
+msgid ""
+"Path updated: %s renamed to %s in %s, inside a directory that was renamed in "
+"%s; moving it to %s."
 msgstr ""
+"Jalur diperbarui: %s dinamai ulang ke %s di %s, di dalam sebuah direktori "
+"yang dinamai ulang di %s; memindahkan ke %s."
 
-#: remote-curl.c:661
-msgid "remote server sent unexpected response end packet"
+#: merge-ort.c merge-recursive.c
+#, 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 ""
+"KONFLIK (lokasi berkas): %s menambahkan %s di dalam sebuah direktori yang "
+"dinamai ulang di %s, menyarankan mungkin dipindahkan ke %s."
 
-#: remote-curl.c:730
-msgid "unable to rewind rpc post data - try increasing http.postBuffer"
+#: merge-ort.c merge-recursive.c
+#, 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 ""
+"KONFLIK (lokasi berkas): %s dinamai ulang ke %s di %s, di dalam sebuah "
+"direktori yang dinamai ulang di %s, menyarankan mungkin dipindahkan ke %s. "
 
-#: remote-curl.c:759
+#: merge-ort.c
 #, c-format
-msgid "remote-curl: bad line length character: %.4s"
+msgid "CONFLICT (rename/rename): %s renamed to %s in %s and to %s in %s."
 msgstr ""
+"KONFLIK (penamaan ulang/penamaan ulang): %s dinamai ulang ke %s di %s dan ke "
+"%s di %s."
 
-#: remote-curl.c:761
-msgid "remote-curl: unexpected response end packet"
+#: merge-ort.c
+#, 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."
 msgstr ""
+"KONFLIK (penamaan ulang terlibat di dalam tabrakan): penamaan ulang %s -> %s "
+"punya konflik konten DAN bertabrakan dengan jalur yang lain; ini mungkin "
+"menghasilkan penanda konflik bersarang."
 
-#: remote-curl.c:837
+#: merge-ort.c
 #, c-format
-msgid "RPC failed; %s"
+msgid "CONFLICT (rename/delete): %s renamed to %s in %s, but deleted in %s."
 msgstr ""
+"KONFLIK (penamaan ulang/penghapusan): %s dinamai ulang ke %s di %s, tetapi "
+"dihapus di %s."
 
-#: remote-curl.c:877
-msgid "cannot handle pushes this big"
+#: merge-ort.c merge-recursive.c
+#, c-format
+msgid "cannot read object %s"
+msgstr "tidak dapat membaca objek %s"
+
+#: merge-ort.c merge-recursive.c
+#, c-format
+msgid "object %s is not a blob"
+msgstr "objek %s bukanlah sebuah blob"
+
+#: merge-ort.c
+#, c-format
+msgid ""
+"CONFLICT (file/directory): directory in the way of %s from %s; moving it to "
+"%s instead."
 msgstr ""
+"KONFLIK (berkas/direktori): direktori di jalan %s dari %s; memindahkan ke %s "
+"sebagai gantinya."
 
-#: remote-curl.c:990
+#: merge-ort.c
 #, c-format
-msgid "cannot deflate request; zlib deflate error %d"
+msgid ""
+"CONFLICT (distinct types): %s had different types on each side; renamed both "
+"of them so each can be recorded somewhere."
 msgstr ""
+"KONFLIK (tipe berbeda): %s punya tipe berbeda pada setiap sisi; kedua-duanya "
+"dinamai ulang sehingga masing-masing dapat direkam di suatu tempat."
 
-#: remote-curl.c:994
+#: merge-ort.c
 #, c-format
-msgid "cannot deflate request; zlib end error %d"
+msgid ""
+"CONFLICT (distinct types): %s had different types on each side; renamed one "
+"of them so each can be recorded somewhere."
 msgstr ""
+"KONFLIK (tipe berbeda): %s punya tipe berbeda pada setiap sisi; salah "
+"satunya dinamai ulang sehingga masing-masing dapat direkam di suatu tempat."
+
+#: merge-ort.c merge-recursive.c
+msgid "content"
+msgstr "konten"
+
+#: merge-ort.c merge-recursive.c
+msgid "add/add"
+msgstr "penambahan/penambahan"
 
-#: remote-curl.c:1044
+#: merge-ort.c merge-recursive.c
+msgid "submodule"
+msgstr "submodul"
+
+#: merge-ort.c merge-recursive.c
 #, c-format
-msgid "%d bytes of length header were received"
+msgid "CONFLICT (%s): Merge conflict in %s"
+msgstr "KONFLIK (%s): Konflik penggabungan di %s"
+
+#: merge-ort.c
+#, c-format
+msgid ""
+"CONFLICT (modify/delete): %s deleted in %s and modified in %s.  Version %s "
+"of %s left in tree."
 msgstr ""
+"KONFLIK (pengubahan/penghapusan): %s dihapus di %s dan diubah di %s. Versi "
+"%s dari %s ditinggalkan di dalam pohon."
 
-#: remote-curl.c:1046
+#: merge-ort.c
 #, c-format
-msgid "%d bytes of body are still expected"
+msgid ""
+"Note: %s not up to date and in way of checking out conflicted version; old "
+"copy renamed to %s"
 msgstr ""
+"Catatan: %s tidak terbaru dan dalam men-checkout versi berkonflik; salinan "
+"lama dinamai ulang ke %s"
 
-#: remote-curl.c:1135
-msgid "dumb http transport does not support shallow capabilities"
+#. 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
+#, c-format
+msgid "collecting merge info failed for trees %s, %s, %s"
+msgstr "pengumpulan info penggabungan gagal untuk pohon %s, %s, dan %s"
+
+#: merge-recursive.c
+msgid "(bad commit)\n"
+msgstr "(komit jelek)\n"
+
+#: merge-recursive.c
+#, c-format
+msgid "add_cacheinfo failed for path '%s'; merge aborting."
+msgstr "add_cacheinfo gagal untuk jalur '%s'; penggabungan dibatalkan."
+
+#: merge-recursive.c
+#, c-format
+msgid "add_cacheinfo failed to refresh for path '%s'; merge aborting."
 msgstr ""
+"add_cacheinfo gagal menyegarkan untuk jalur '%s'; penggabungan dibatalkan."
 
-#: remote-curl.c:1150
-msgid "fetch failed."
+#: merge-recursive.c
+#, c-format
+msgid "failed to create path '%s'%s"
+msgstr "gagal membuat jalur '%s'%s"
+
+#: merge-recursive.c
+#, c-format
+msgid "Removing %s to make room for subdirectory\n"
+msgstr "Menghapus %s untuk membuat ruang untuk subdirektori\n"
+
+#: merge-recursive.c
+msgid ": perhaps a D/F conflict?"
+msgstr ": mungkin konflik direktori/berkas?"
+
+#: merge-recursive.c
+#, c-format
+msgid "refusing to lose untracked file at '%s'"
+msgstr "menolak menghilangkan berkas tak terlacak pada '%s'"
+
+#: merge-recursive.c
+#, c-format
+msgid "blob expected for %s '%s'"
+msgstr "blob diharapkan untuk %s '%s'"
+
+#: merge-recursive.c
+#, c-format
+msgid "failed to open '%s': %s"
+msgstr "gagal membuka '%s': %s"
+
+#: merge-recursive.c
+#, c-format
+msgid "failed to symlink '%s': %s"
+msgstr "gagal menautkan simbolik '%s': %s"
+
+#: merge-recursive.c
+#, c-format
+msgid "do not know what to do with %06o %s '%s'"
+msgstr "tidak tahu apa yang dilakukan dengan %06o %s '%s'"
+
+#: merge-recursive.c
+#, c-format
+msgid "Fast-forwarding submodule %s to the following commit:"
+msgstr "Memaju-cepat submodul %s ke komit berikut:"
+
+#: merge-recursive.c
+#, c-format
+msgid "Fast-forwarding submodule %s"
+msgstr "Memaju-cepat submodul %s"
+
+#: merge-recursive.c
+#, c-format
+msgid "Failed to merge submodule %s (merge following commits not found)"
 msgstr ""
+"Gagal menggabungkan submodul %s (penggabungan komit berikutnya tidak "
+"ditemukan)"
 
-#: remote-curl.c:1198
-msgid "cannot fetch by sha1 over smart http"
+#: merge-recursive.c
+#, c-format
+msgid "Failed to merge submodule %s (not fast-forward)"
+msgstr "Gagal menggabungkan submodul %s (bukan maju-cepat)"
+
+#: merge-recursive.c
+msgid "Found a possible merge resolution for the submodule:\n"
+msgstr "Sebuah resolusi penggabungan yang mungkin ditemukan untuk submodul:\n"
+
+#: merge-recursive.c
+#, c-format
+msgid "Failed to merge submodule %s (multiple merges found)"
+msgstr "Gagal menggabungkan submodul %s (banyak penggabungan ditemukan)"
+
+#: merge-recursive.c
+#, c-format
+msgid "Error: Refusing to lose untracked file at %s; writing to %s instead."
 msgstr ""
+"Kesalahan: Menolak menghilangkan berkas tak terlacak pada %s; menulis ke %s "
+"sebagai gantinya."
 
-#: remote-curl.c:1242 remote-curl.c:1248
+#: merge-recursive.c
 #, c-format
-msgid "protocol error: expected sha/ref, got '%s'"
+msgid ""
+"CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s left "
+"in tree."
 msgstr ""
+"KONFLIK (%s/penghapusan): %s dihapus di %s dan %s di %s. Versi %s dari %s "
+"ditinggalkan di dalam pohon."
 
-#: remote-curl.c:1260 remote-curl.c:1378
+#: merge-recursive.c
 #, c-format
-msgid "http transport does not support %s"
+msgid ""
+"CONFLICT (%s/delete): %s deleted in %s and %s to %s in %s. Version %s of %s "
+"left in tree."
 msgstr ""
+"KONFLIK (%s/penghapusan): %s dihapus di %s dan %s ke %s di %s. Versi %s dari "
+"%s ditinggalkan di dalam pohon."
 
-#: remote-curl.c:1296
-msgid "git-http-push failed"
+#: merge-recursive.c
+#, c-format
+msgid ""
+"CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s left "
+"in tree at %s."
 msgstr ""
+"KONFLIK (%s/penghapusan): %s dihapus di %s dan %s di %s. Versi %s dari %s "
+"ditinggalkan di dalam pohon pada %s."
 
-#: remote-curl.c:1485
-msgid "remote-curl: usage: git remote-curl <remote> [<url>]"
+#: merge-recursive.c
+#, 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 ""
+"KONFLIK (%s/penghapusan): %s dihapus di %s dan %s ke %s di %s. Versi %s dari "
+"%s ditinggalkan di dalam pohon pada %s."
 
-#: remote-curl.c:1517
-msgid "remote-curl: error reading command stream from git"
+#: merge-recursive.c
+msgid "rename"
+msgstr "penamaan ulang"
+
+#: merge-recursive.c
+msgid "renamed"
+msgstr "dinamai ulang"
+
+#: merge-recursive.c
+#, c-format
+msgid "Refusing to lose dirty file at %s"
+msgstr "Menolak menghilangkan berkas kotor pada %s"
+
+#: merge-recursive.c
+#, c-format
+msgid "Refusing to lose untracked file at %s, even though it's in the way."
 msgstr ""
+"Menolak menghilangkan berkas tak terlacak pada %s, bahkan jika itu berjalan."
 
-#: remote-curl.c:1524
-msgid "remote-curl: fetch attempted without a local repo"
+#: merge-recursive.c
+#, c-format
+msgid "CONFLICT (rename/add): Rename %s->%s in %s.  Added %s in %s"
 msgstr ""
+"KONFLIK (penamaan ulang/penambahan): Penamaan ulang %s-%s di %s. %s "
+"ditambahkan di %s"
 
-#: remote-curl.c:1565
+#: merge-recursive.c
 #, c-format
-msgid "remote-curl: unknown command '%s' from git"
+msgid "%s is a directory in %s adding as %s instead"
 msgstr ""
+"%s adalah sebuah direktori dalam %s menambahkan sebagai %s sebagai gantinya"
 
-#: contrib/scalar/scalar.c:49
-msgid "need a working directory"
+#: merge-recursive.c
+#, c-format
+msgid "Refusing to lose untracked file at %s; adding as %s instead"
 msgstr ""
+"Menolak menghilangkan berkas tak terlacak pada %s; menambahkan sebagai %s "
+"sebagai gantinya"
 
-#: contrib/scalar/scalar.c:86
-msgid "could not find enlistment root"
+#: merge-recursive.c
+#, c-format
+msgid ""
+"CONFLICT (rename/rename): Rename \"%s\"->\"%s\" in branch \"%s\" rename \"%s"
+"\"->\"%s\" in \"%s\"%s"
 msgstr ""
+"KONFLIK (penamaan ulang/penamaan ulang): Penamaan ulang \"%s\"->\"%s\" di "
+"dalam cabang \"%s\" penamaan ulang \"%s\"->\"%s\" di \"%s\"%s"
+
+#: merge-recursive.c
+msgid " (left unresolved)"
+msgstr " dibiarkan tak diselesaikan"
 
-#: contrib/scalar/scalar.c:89 contrib/scalar/scalar.c:350
-#: contrib/scalar/scalar.c:435 contrib/scalar/scalar.c:578
+#: merge-recursive.c
 #, c-format
-msgid "could not switch to '%s'"
+msgid "CONFLICT (rename/rename): Rename %s->%s in %s. Rename %s->%s in %s"
 msgstr ""
+"KONFLIK (penamaan ulang/penamaan ulang): Penamaan ulang %s->%s di %s. "
+"Penamaan ulang %s->%s di %s"
 
-#: contrib/scalar/scalar.c:179
+#: merge-recursive.c
 #, c-format
-msgid "could not configure %s=%s"
+msgid ""
+"CONFLICT (directory rename split): Unclear where to place %s because "
+"directory %s was renamed to multiple other directories, with no destination "
+"getting a majority of the files."
 msgstr ""
+"KONFLIK (pemecahan penamaan ulang direktori): Tidak jelas dimana untuk "
+"menempatkan %s karena direktori %s dinamai ulang ke banyak direktori "
+"lainnya, dengan tidak ada tujuan yang mendapatkan mayoritas berkas."
 
-#: contrib/scalar/scalar.c:197
-msgid "could not configure log.excludeDecoration"
+#: merge-recursive.c
+#, c-format
+msgid ""
+"CONFLICT (rename/rename): Rename directory %s->%s in %s. Rename directory %s-"
+">%s in %s"
 msgstr ""
+"KONFLIK (penamaan ulang/penamaan ulang): Penamaan ulang direktori %s->%s di "
+"%s. Penamaan ulang %s->%s di %s"
 
-#: contrib/scalar/scalar.c:218
-msgid "Scalar enlistments require a worktree"
+#: merge-recursive.c
+msgid "modify"
+msgstr "ubah"
+
+#: merge-recursive.c
+msgid "modified"
+msgstr "diubah"
+
+#: merge-recursive.c
+#, c-format
+msgid "Skipped %s (merged same as existing)"
+msgstr "%s dilewatkan (digabungkan sama seperti yang ada)"
+
+#: merge-recursive.c
+#, c-format
+msgid "Adding as %s instead"
+msgstr "Menambahkan sebagai %s sebagai gantinya"
+
+#: merge-recursive.c
+#, c-format
+msgid "Removing %s"
+msgstr "Menghapus %s"
+
+#: merge-recursive.c
+msgid "file/directory"
+msgstr "berkas/direktori"
+
+#: merge-recursive.c
+msgid "directory/file"
+msgstr "direktori/berkas"
+
+#: merge-recursive.c
+#, c-format
+msgid "CONFLICT (%s): There is a directory with name %s in %s. Adding %s as %s"
 msgstr ""
+"KONFLIK (%s): Ada direktori dengan nama %s di %s. Menambahakn %s sebagai %s"
 
-#: contrib/scalar/scalar.c:310
+#: merge-recursive.c
 #, c-format
-msgid "remote HEAD is not a branch: '%.*s'"
+msgid "Adding %s"
+msgstr "Menambahkan %s"
+
+#: merge-recursive.c
+#, c-format
+msgid "CONFLICT (add/add): Merge conflict in %s"
+msgstr "KONFLIK (penambahan/penambahan): Konflik penggabungan di %s"
+
+#: merge-recursive.c
+#, c-format
+msgid "merging of trees %s and %s failed"
+msgstr "penggabungan pohon %s dan %s gagal"
+
+#: merge-recursive.c
+msgid "Merging:"
+msgstr "Menggabungkan:"
+
+#: merge-recursive.c
+#, c-format
+msgid "found %u common ancestor:"
+msgid_plural "found %u common ancestors:"
+msgstr[0] "%u leluhur umum ditemukan:"
+msgstr[1] "%u leluhur umum ditemukan:"
+
+#: merge-recursive.c
+msgid "merge returned no commit"
+msgstr "penggabungan tidak mengembalikan komit"
+
+#: merge-recursive.c
+#, c-format
+msgid "Could not parse object '%s'"
+msgstr "Tidak dapat menguraikan objek '%s'"
+
+#: merge.c
+msgid "failed to read the cache"
+msgstr "gagal membaca tembolok"
+
+#: midx.c
+msgid "multi-pack-index OID fanout is of the wrong size"
+msgstr "OID kipas-keluar indeks multipak salah ukuran"
+
+#: midx.c
+#, c-format
+msgid "multi-pack-index file %s is too small"
+msgstr "berkas indeks multipak %s terlalu kecil"
+
+#: midx.c
+#, c-format
+msgid "multi-pack-index signature 0x%08x does not match signature 0x%08x"
 msgstr ""
+"tanda tangan indeks multipak 0x%08x tidak cocok dengan tanda tangan 0x%08x"
 
-#: contrib/scalar/scalar.c:316
-msgid "failed to get default branch name from remote; using local default"
+#: midx.c
+#, c-format
+msgid "multi-pack-index version %d not recognized"
+msgstr "versi indeks multipak %d tidak dikenal"
+
+#: midx.c
+#, c-format
+msgid "multi-pack-index hash version %u does not match version %u"
+msgstr "versi hash indeks multipak %u tidak cocok dengan versi %u"
+
+#: midx.c
+msgid "multi-pack-index missing required pack-name chunk"
+msgstr "indeks multipak kehilangan bingkah pack-name yang diperlukan"
+
+#: midx.c
+msgid "multi-pack-index missing required OID fanout chunk"
+msgstr "indeks multipak kehilangan bingkah OID kipas keluar yang diperlukan"
+
+#: midx.c
+msgid "multi-pack-index missing required OID lookup chunk"
+msgstr "indeks multipak kehilangan bingkah pencarian OID yang diperlukan"
+
+#: midx.c
+msgid "multi-pack-index missing required object offsets chunk"
+msgstr "indeks multipak kehilangan bingkah offset objek yang diperlukan"
+
+#: midx.c
+#, c-format
+msgid "multi-pack-index pack names out of order: '%s' before '%s'"
+msgstr "nama pak indeks multipak tidak berurutan: '%s' sebelum '%s'"
+
+#: midx.c
+#, c-format
+msgid "bad pack-int-id: %u (%u total packs)"
+msgstr "pack-int-id jelek: %u (total pak %u)"
+
+#: midx.c
+msgid "multi-pack-index stores a 64-bit offset, but off_t is too small"
+msgstr "indeks multipak simpan offset 64-bit, tapi off_t terlalu kecil"
+
+#: midx.c
+#, c-format
+msgid "failed to add packfile '%s'"
+msgstr "gagal menambah berkas pak '%s'"
+
+#: midx.c
+#, c-format
+msgid "failed to open pack-index '%s'"
+msgstr "gagal membuka indeks pak '%s'"
+
+#: midx.c
+#, c-format
+msgid "failed to locate object %d in packfile"
+msgstr "gagal melokasi objek %d di dalam berkas pak"
+
+#: midx.c
+msgid "cannot store reverse index file"
+msgstr "tidak dapat menyimpan berkas indeks balik"
+
+#: midx.c
+#, c-format
+msgid "could not parse line: %s"
+msgstr "tidak dapat menguraikan baris: %s"
+
+#: midx.c
+#, c-format
+msgid "malformed line: %s"
+msgstr "baris jelek '%s'."
+
+#: midx.c
+msgid "ignoring existing multi-pack-index; checksum mismatch"
+msgstr "abaikan indeks multipak yang sudah ada; checksum tidak cocok"
+
+#: midx.c
+msgid "could not load pack"
+msgstr "tidak dapat memuat pak"
+
+#: midx.c
+#, c-format
+msgid "could not open index for %s"
+msgstr "tidak dapat membuka indeks untuk %s"
+
+#: midx.c
+msgid "Adding packfiles to multi-pack-index"
+msgstr "Menambahkan berkas pak ke indeks multipak"
+
+#: midx.c
+#, c-format
+msgid "unknown preferred pack: '%s'"
+msgstr "pak yang disukai tidak dikenal: '%s'"
+
+#: midx.c
+#, c-format
+msgid "cannot select preferred pack %s with no objects"
+msgstr "tidak dapat memilih pak yang disukai %s tanpa objek"
+
+#: midx.c
+#, c-format
+msgid "did not see pack-file %s to drop"
+msgstr "tidak melihat berkas pak %s untuk dijeblokkan"
+
+#: midx.c
+#, c-format
+msgid "preferred pack '%s' is expired"
+msgstr "pak yang disukai '%s' kadaluarsa"
+
+#: midx.c
+msgid "no pack files to index."
+msgstr "tidak ada berkas pak untuk diindeks."
+
+#: midx.c
+msgid "refusing to write multi-pack .bitmap without any objects"
+msgstr "menolak menulis .bitmap multipak tanpa objek apapun"
+
+#: midx.c
+msgid "could not write multi-pack bitmap"
+msgstr "tidak dapat menulis bitmap multipak"
+
+#: midx.c
+msgid "could not write multi-pack-index"
+msgstr "gagal menulis indeks multipak"
+
+#: midx.c
+#, c-format
+msgid "failed to clear multi-pack-index at %s"
+msgstr "gagal membersihkan indeks multipak pada %s"
+
+#: midx.c
+msgid "multi-pack-index file exists, but failed to parse"
+msgstr "berkas indeks multipak ada, tetapi gagal diurai"
+
+#: midx.c
+msgid "incorrect checksum"
+msgstr "checksum salah"
+
+#: midx.c
+msgid "Looking for referenced packfiles"
+msgstr "Mencari berkas pak yang direferensikan"
+
+#: midx.c
+#, 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]"
 
-#: contrib/scalar/scalar.c:329
-msgid "failed to get default branch name"
+#: midx.c
+msgid "the midx contains no oid"
+msgstr "midx tidak berisi oid"
+
+#: midx.c
+msgid "Verifying OID order in multi-pack-index"
+msgstr "Memverifikasi urutan OID di dalam indeks multipak"
+
+#: midx.c
+#, c-format
+msgid "oid lookup out of order: oid[%d] = %s >= %s = oid[%d]"
+msgstr "urutan pencarian oid tidak berurutan: oid[%d] = %s >= %s = oid[%d]"
+
+#: midx.c
+msgid "Sorting objects by packfile"
+msgstr "Mengurutkan objek oleh berkas pak"
+
+#: midx.c
+msgid "Verifying object offsets"
+msgstr "Memverifikasi offset objek"
+
+#: midx.c
+#, c-format
+msgid "failed to load pack entry for oid[%d] = %s"
+msgstr "gagal memuat entri pak untuk oid[%d] = %s"
+
+#: midx.c
+#, c-format
+msgid "failed to load pack-index for packfile %s"
+msgstr "gagal memuat indeks pak untuk berkas pak %s"
+
+#: midx.c
+#, c-format
+msgid "incorrect object offset for oid[%d] = %s: %<PRIx64> != %<PRIx64>"
+msgstr "offset objek salah untuk oid[%d] = %s: %<PRIx64> != %<PRIx64>"
+
+#: midx.c
+msgid "Counting referenced objects"
+msgstr "Menghitung objek tereferensi"
+
+#: midx.c
+msgid "Finding and deleting unreferenced packfiles"
+msgstr "Mencari dan menghapus berkas pak tak tereferensi"
+
+#: midx.c
+msgid "could not start pack-objects"
+msgstr "tidak dapat memulai pack-objects"
+
+#: midx.c
+msgid "could not finish pack-objects"
+msgstr "tidak dapat menyelesaikan pack-objects"
+
+#: name-hash.c
+#, c-format
+msgid "unable to create lazy_dir thread: %s"
 msgstr ""
 
-#: contrib/scalar/scalar.c:340
-msgid "failed to unregister repository"
+#: name-hash.c
+#, c-format
+msgid "unable to create lazy_name thread: %s"
 msgstr ""
 
-#: contrib/scalar/scalar.c:355
-msgid "failed to delete enlistment directory"
+#: name-hash.c
+#, c-format
+msgid "unable to join lazy_name thread: %s"
 msgstr ""
 
-#: contrib/scalar/scalar.c:375
-msgid "branch to checkout after clone"
+#: notes-merge.c
+#, 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."
 msgstr ""
 
-#: contrib/scalar/scalar.c:377
-msgid "when cloning, create full working directory"
+#: notes-merge.c
+#, c-format
+msgid "You have not concluded your notes merge (%s exists)."
 msgstr ""
 
-#: contrib/scalar/scalar.c:379
-msgid "only download metadata for the branch that will be checked out"
+#: notes-utils.c
+msgid "Cannot commit uninitialized/unreferenced notes tree"
 msgstr ""
 
-#: contrib/scalar/scalar.c:384
-msgid "scalar clone [<options>] [--] <repo> [<dir>]"
+#: notes-utils.c
+#, c-format
+msgid "Bad notes.rewriteMode value: '%s'"
 msgstr ""
 
-#: contrib/scalar/scalar.c:409
+#: notes-utils.c
 #, c-format
-msgid "cannot deduce worktree name from '%s'"
+msgid "Refusing to rewrite notes in %s (outside of refs/notes/)"
 msgstr ""
 
-#: contrib/scalar/scalar.c:418
+#. TRANSLATORS: The first %s is the name of
+#. the environment variable, the second %s is
+#. its value.
+#.
+#: notes-utils.c
 #, c-format
-msgid "directory '%s' exists already"
+msgid "Bad %s value: '%s'"
 msgstr ""
 
-#: contrib/scalar/scalar.c:445
+#: object-file.c
 #, c-format
-msgid "failed to get default branch for '%s'"
+msgid "object directory %s does not exist; check .git/objects/info/alternates"
+msgstr "direktori objek %s tidak ada; periksa .git/objects/info/alternates"
+
+#: object-file.c
+#, c-format
+msgid "unable to normalize alternate object path: %s"
+msgstr "tidak dapat menormalisasikan jalur objek alternatif: %s"
+
+#: object-file.c
+#, c-format
+msgid "%s: ignoring alternate object stores, nesting too deep"
+msgstr "%s: mengabaikan penyimpanan objek alternatif, bersarang terlalu dalam"
+
+#: object-file.c
+#, c-format
+msgid "unable to normalize object directory: %s"
+msgstr "tidak dapat menormalisasikan direktori objek: %s"
+
+#: object-file.c
+msgid "unable to fdopen alternates lockfile"
+msgstr "tidak dapat men-fdopen berkas kunci alternatif"
+
+#: object-file.c
+msgid "unable to read alternates file"
+msgstr "tidak dapat membaca berkas alternatif"
+
+#: object-file.c
+msgid "unable to move new alternates file into place"
+msgstr "tidak dapat memindahkan berkas alternatif baru ke tempatnya"
+
+#: object-file.c
+#, c-format
+msgid "path '%s' does not exist"
+msgstr "jalur '%s' tidak ada"
+
+#: object-file.c
+#, c-format
+msgid "reference repository '%s' as a linked checkout is not supported yet."
 msgstr ""
+"repositori referensi '%s' sebagai sebuah checkout tertaut belum didukung."
 
-#: contrib/scalar/scalar.c:456
+#: object-file.c
 #, c-format
-msgid "could not configure remote in '%s'"
+msgid "reference repository '%s' is not a local repository."
+msgstr "repositori referensi '%s' bukan sebuah repositori lokal"
+
+#: object-file.c
+#, c-format
+msgid "reference repository '%s' is shallow"
+msgstr "repositori referensi '%s' dangkal"
+
+#: object-file.c
+#, c-format
+msgid "reference repository '%s' is grafted"
+msgstr "repositori referensi '%s' cangkok"
+
+#: object-file.c
+#, c-format
+msgid "could not find object directory matching %s"
+msgstr "tidak dapat menemukan direktori objek yang cocok dengan %s"
+
+#: object-file.c
+#, c-format
+msgid "invalid line while parsing alternate refs: %s"
+msgstr "baris tidak valid saat menguraikan referensi alternatif: %s"
+
+#: object-file.c
+#, c-format
+msgid "attempting to mmap %<PRIuMAX> over limit %<PRIuMAX>"
+msgstr "mencoba men-mmap %<PRIuMAX> di atas batas %<PRIuMAX>"
+
+#: object-file.c
+#, c-format
+msgid "mmap failed%s"
+msgstr "mmap gagal%s"
+
+#: object-file.c
+#, c-format
+msgid "object file %s is empty"
+msgstr "berkas objek %s kosong"
+
+#: object-file.c
+#, c-format
+msgid "corrupt loose object '%s'"
+msgstr "objek longgar '%s' rusak"
+
+#: object-file.c
+#, c-format
+msgid "garbage at end of loose object '%s'"
+msgstr "sampah pada ujung berkas objek '%s'"
+
+#: object-file.c
+#, c-format
+msgid "unable to parse %s header"
+msgstr "tidak dapat menguraikan kepala %s"
+
+#: object-file.c
+msgid "invalid object type"
+msgstr "tipe objek tidak valid"
+
+#: object-file.c
+#, c-format
+msgid "unable to unpack %s header"
+msgstr "tidak dapat membongkar kepala %s"
+
+#: object-file.c
+#, c-format
+msgid "header for %s too long, exceeds %d bytes"
+msgstr "kepala untuk %s terlalu panjang, melebihi %d bita"
+
+#: object-file.c
+#, c-format
+msgid "failed to read object %s"
+msgstr "gagal membaca objek %s"
+
+#: object-file.c
+#, c-format
+msgid "replacement %s not found for %s"
+msgstr "pengganti %s tidak ditemukan untuk %s"
+
+#: object-file.c
+#, c-format
+msgid "loose object %s (stored in %s) is corrupt"
+msgstr "objek longgar %s (disimpan di %s) rusak"
+
+#: object-file.c
+#, c-format
+msgid "packed object %s (stored in %s) is corrupt"
+msgstr "objek terpak %s (disimpan di %s) rusak"
+
+#: object-file.c
+#, c-format
+msgid "unable to write file %s"
+msgstr "tidak dapat menulis berkas %s"
+
+#: object-file.c
+#, c-format
+msgid "unable to set permission to '%s'"
+msgstr "tidak dapat menyetel perizinan ke '%s'"
+
+#: object-file.c
+msgid "file write error"
+msgstr "kesalahan menulis berkas"
+
+#: object-file.c
+msgid "error when closing loose object file"
+msgstr "kesalahan saat menutup berkas objek longgar"
+
+#: object-file.c
+#, c-format
+msgid "insufficient permission for adding an object to repository database %s"
 msgstr ""
+"perizinan tidak cukup untuk menambahkan sebuah objek ke basis data "
+"repositori %s"
 
-#: contrib/scalar/scalar.c:465
+#: object-file.c
+msgid "unable to create temporary file"
+msgstr "tidak dapat membuat berkas sementara"
+
+#: object-file.c
+msgid "unable to write loose object file"
+msgstr "tidak dapat menulis berkas objek longgar"
+
+#: object-file.c
 #, c-format
-msgid "could not configure '%s'"
+msgid "unable to deflate new object %s (%d)"
+msgstr "tidak dapat mengempiskan objek baru %s (%d)"
+
+#: object-file.c
+#, c-format
+msgid "deflateEnd on object %s failed (%d)"
+msgstr "deflateEnd pada objek %s gagal (%d)"
+
+#: object-file.c
+#, c-format
+msgid "confused by unstable object source data for %s"
+msgstr "kebingungan oleh data sumber objek tidak stabil untuk %s"
+
+#: object-file.c
+#, c-format
+msgid "cannot read object for %s"
+msgstr "tidak dapat membaca objek untuk %s"
+
+#: object-file.c
+msgid "corrupt commit"
+msgstr "komit rusak"
+
+#: object-file.c
+msgid "corrupt tag"
+msgstr "tag rusak"
+
+#: object-file.c
+#, c-format
+msgid "read error while indexing %s"
+msgstr "kesalahan pembacaan ketika mengindeks %s"
+
+#: object-file.c
+#, c-format
+msgid "short read while indexing %s"
+msgstr "pembacaan pendek ketika mengindeks %s"
+
+#: object-file.c
+#, c-format
+msgid "%s: failed to insert into database"
+msgstr "%s: gagal memasukkan ke dalam basis data"
+
+#: object-file.c
+#, c-format
+msgid "%s: unsupported file type"
+msgstr "%s: tipe berkas tidak didukung"
+
+#: object-file.c
+#, c-format
+msgid "%s is not a valid '%s' object"
+msgstr "%s bukan sebuah objek '%s' valid"
+
+#: object-file.c
+#, c-format
+msgid "unable to open %s"
+msgstr "tidak dapat membuka %s"
+
+#: object-file.c
+#, c-format
+msgid "hash mismatch for %s (expected %s)"
+msgstr "hash tidak cocok untuk %s (diharapkan %s)"
+
+#: object-file.c
+#, c-format
+msgid "unable to mmap %s"
+msgstr "tidak dapat men-mmap %s"
+
+#: object-file.c
+#, c-format
+msgid "unable to unpack header of %s"
+msgstr "tidak dapat membongkar kepala %s"
+
+#: object-file.c
+#, c-format
+msgid "unable to parse header of %s"
+msgstr "tidak dapat menguraikan kepala %s"
+
+#: object-file.c
+#, c-format
+msgid "unable to unpack contents of %s"
+msgstr "tidak dapat membongkar isi %s"
+
+#. TRANSLATORS: This is a line of ambiguous object
+#. output shown when we cannot look up or parse the
+#. object in question. E.g. "deadbeef [bad object]".
+#.
+#: object-name.c
+#, c-format
+msgid "%s [bad object]"
+msgstr "%s [objek jelek]"
+
+#. TRANSLATORS: This is a line of ambiguous commit
+#. object output. E.g.:
+#. *
+#.    "deadbeef commit 2021-01-01 - Some Commit Message"
+#.
+#: object-name.c
+#, c-format
+msgid "%s commit %s - %s"
+msgstr "%s komit %s - %s"
+
+#. TRANSLATORS: This is a line of ambiguous
+#. tag object output. E.g.:
+#. *
+#.    "deadbeef tag 2022-01-01 - Some Tag Message"
+#. *
+#. The second argument is the YYYY-MM-DD found
+#. in the tag.
+#. *
+#. The third argument is the "tag" string
+#. from object.c.
+#.
+#: object-name.c
+#, c-format
+msgid "%s tag %s - %s"
+msgstr "%s tag %s - %s"
+
+#. TRANSLATORS: This is a line of ambiguous
+#. tag object output where we couldn't parse
+#. the tag itself. E.g.:
+#. *
+#.    "deadbeef [bad tag, could not parse it]"
+#.
+#: object-name.c
+#, c-format
+msgid "%s [bad tag, could not parse it]"
+msgstr "%s [tag jelek, tidak dapat menguraikannya]"
+
+#. TRANSLATORS: This is a line of ambiguous <type>
+#. object output. E.g. "deadbeef tree".
+#.
+#: object-name.c
+#, c-format
+msgid "%s tree"
+msgstr "%s pohon"
+
+#. TRANSLATORS: This is a line of ambiguous <type>
+#. object output. E.g. "deadbeef blob".
+#.
+#: object-name.c
+#, c-format
+msgid "%s blob"
+msgstr "%s blob"
+
+#: object-name.c
+#, c-format
+msgid "short object ID %s is ambiguous"
+msgstr "ID objek pendek %s ambigu"
+
+#. TRANSLATORS: The argument is the list of ambiguous
+#. objects composed in show_ambiguous_object(). See
+#. its "TRANSLATORS" comments for details.
+#.
+#: object-name.c
+#, c-format
+msgid ""
+"The candidates are:\n"
+"%s"
 msgstr ""
+"Kandidat-kandidat yaitu:\n"
+"%s"
 
-#: contrib/scalar/scalar.c:468
-msgid "partial clone failed; attempting full clone"
+#: object-name.c
+msgid ""
+"Git normally never creates a ref that ends with 40 hex characters\n"
+"because it will be ignored when you just specify 40-hex. These refs\n"
+"may be created by mistake. For example,\n"
+"\n"
+"  git switch -c $br $(git rev-parse ...)\n"
+"\n"
+"where \"$br\" is somehow empty and a 40-hex ref is created. Please\n"
+"examine these refs and maybe delete them. Turn this message off by\n"
+"running \"git config advice.objectNameWarning false\""
 msgstr ""
+"Biasanya Git tidak pernah membuat sebuah referensi yang diakhiri dengan\n"
+"40 karakter hex, karena akan diabaikan ketika Anda hanya menyebutkan 40-"
+"hex.\n"
+"Referensi tersebut bisa tidak sengaja dibuat. Misalnya,\n"
+"\n"
+"  git switch -c $br $(git rev-parse ...)\n"
+"\n"
+"dimana \"$br\" entah bagaimana kosong dan referensi 40-hex dibuat.\n"
+"Mohon periksa referensi tersebut dan mungkin hapus. Matikan pesan ini "
+"dengan\n"
+"menjalankan \"git config advice.objectNameWarning false\""
 
-#: contrib/scalar/scalar.c:472
-msgid "could not configure for full clone"
+#: object-name.c
+#, c-format
+msgid "log for '%.*s' only goes back to %s"
+msgstr "log untuk '%.*s' hanya sampai ke %s"
+
+#: object-name.c
+#, c-format
+msgid "log for '%.*s' only has %d entries"
+msgstr "log untuk '%.*s' hanya punya %d entri"
+
+#: object-name.c
+#, c-format
+msgid "path '%s' exists on disk, but not in '%.*s'"
+msgstr "jalur '%s' ada pada disk, tapi bukan di '%.*s'"
+
+#: object-name.c
+#, c-format
+msgid ""
+"path '%s' exists, but not '%s'\n"
+"hint: Did you mean '%.*s:%s' aka '%.*s:./%s'?"
 msgstr ""
+"jalur '%s' ada, tapi bukan '%s'\n"
+"petunjuk: Mungkin maksud Anda '%.*s:%s' alias '%.*s:./%s'?"
 
-#: contrib/scalar/scalar.c:504
-msgid "`scalar list` does not take arguments"
+#: object-name.c
+#, c-format
+msgid "path '%s' does not exist in '%.*s'"
+msgstr "jalur '%s' tidak ada di '%.*s'"
+
+#: object-name.c
+#, c-format
+msgid ""
+"path '%s' is in the index, but not at stage %d\n"
+"hint: Did you mean ':%d:%s'?"
 msgstr ""
+"jalur '%s' di dalam indeks, tetapi bukan pada tahap %d\n"
+"petunjuk: Mungkin maksud Anda ':%d:%s'?"
 
-#: contrib/scalar/scalar.c:517
-msgid "scalar register [<enlistment>]"
+#: object-name.c
+#, c-format
+msgid ""
+"path '%s' is in the index, but not '%s'\n"
+"hint: Did you mean ':%d:%s' aka ':%d:./%s'?"
 msgstr ""
+"jalur '%s' di dalam indeks, tetapi bukan '%s'\n"
+"petunjuk: Mungkin maksud Anda ':%d:%s' alias ':%d:./%s'?"
 
-#: contrib/scalar/scalar.c:544
-msgid "reconfigure all registered enlistments"
+#: object-name.c
+#, c-format
+msgid "path '%s' exists on disk, but not in the index"
+msgstr "jalur '%s' ada pada disk, tetapi bukan di dalam indeks"
+
+#: object-name.c
+#, c-format
+msgid "path '%s' does not exist (neither on disk nor in the index)"
+msgstr "jalur '%s' tidak ada (bukan pada disk maupun di dalam indeks)"
+
+#: object-name.c
+msgid "relative path syntax can't be used outside working tree"
+msgstr "sintaks jalur relatif tidak dapat digunakan di luar pohon kerja"
+
+#: object-name.c
+#, c-format
+msgid "<object>:<path> required, only <object> '%s' given"
+msgstr "<objek>:<jalur> diperlukan, hanya <objek> '%s' diberikan"
+
+#: object-name.c
+#, c-format
+msgid "invalid object name '%.*s'."
+msgstr "nama objek tidak valid '%.*s'."
+
+#: object.c
+#, c-format
+msgid "invalid object type \"%s\""
+msgstr "tipe objek tidak valid \"%s\""
+
+#: object.c
+#, c-format
+msgid "object %s is a %s, not a %s"
+msgstr "objek %s adalah %s, bukan %s"
+
+#: object.c
+#, c-format
+msgid "object %s has unknown type id %d"
+msgstr "objek %s punya id tipe tidak dikenal %d"
+
+#: object.c
+#, c-format
+msgid "unable to parse object: %s"
+msgstr "tidak dapat menguraikan objek: %s"
+
+#: object.c
+#, c-format
+msgid "hash mismatch %s"
+msgstr "hash tidak cocok %s"
+
+#: pack-bitmap.c
+msgid "multi-pack bitmap is missing required reverse index"
+msgstr "bitmap multipak kehilangan indeks balik yang diperlukan"
+
+#: pack-bitmap.c
+#, c-format
+msgid "could not open pack %s"
+msgstr "tidak dapat membuka '%s'"
+
+#: pack-bitmap.c
+#, c-format
+msgid "preferred pack (%s) is invalid"
+msgstr "pak yang disukai '%s' kadaluarsa"
+
+#: pack-bitmap.c
+#, c-format
+msgid "could not find %s in pack %s at offset %<PRIuMAX>"
+msgstr "tidak dapat menemukan %s di dalam pak %s pada offset %<PRIuMAX>"
+
+#: pack-mtimes.c
+#, c-format
+msgid "mtimes file %s is too small"
+msgstr "berkas mtimes %s terlalu kecil"
+
+#: pack-mtimes.c
+#, c-format
+msgid "mtimes file %s has unknown signature"
+msgstr "berkas mtimes %s punya tanda tangan tidak dikenal"
+
+#: pack-mtimes.c
+#, c-format
+msgid "mtimes file %s has unsupported version %<PRIu32>"
+msgstr "berkas mtimes %s punya versi tidak didukung %<PRIu32>"
+
+#: pack-mtimes.c
+#, c-format
+msgid "mtimes file %s has unsupported hash id %<PRIu32>"
+msgstr "berkas mtimes %s punya id hash tidak didukung %<PRIu32>"
+
+#: pack-mtimes.c
+#, c-format
+msgid "mtimes file %s is corrupt"
+msgstr "berkas mtimes %s rusak"
+
+#: pack-revindex.c
+#, c-format
+msgid "reverse-index file %s is too small"
+msgstr "berkas indeks balik %s terlalu kecil"
+
+#: pack-revindex.c
+#, c-format
+msgid "reverse-index file %s is corrupt"
+msgstr "berkas indeks balik %s rusak"
+
+#: pack-revindex.c
+#, c-format
+msgid "reverse-index file %s has unknown signature"
+msgstr "berkas indeks balik %s punya tanda tangan tidak dikenal"
+
+#: pack-revindex.c
+#, c-format
+msgid "reverse-index file %s has unsupported version %<PRIu32>"
+msgstr "berkas indeks balik %s punya versi tidak didukung %<PRIu32>"
+
+#: pack-revindex.c
+#, c-format
+msgid "reverse-index file %s has unsupported hash id %<PRIu32>"
+msgstr "berkas indeks balik %s punya id hash tidak didukung %<PRIu32>"
+
+#: pack-write.c
+msgid "cannot both write and verify reverse index"
+msgstr "tidak dapat kedua-duanya menulis dan memverifikasi indeks balik"
+
+#: pack-write.c
+#, c-format
+msgid "could not stat: %s"
+msgstr "tidak dapat men-stat: %s"
+
+#: pack-write.c
+#, c-format
+msgid "failed to make %s readable"
+msgstr "gagal membuat %s dapat dibaca"
+
+#: pack-write.c
+#, c-format
+msgid "could not write '%s' promisor file"
+msgstr "tidak dapat menulis berkas penjanji '%s'"
+
+#: packfile.c
+msgid "offset before end of packfile (broken .idx?)"
+msgstr "offset sebelum ujung berkas pak (.idx rusak?)"
+
+#: packfile.c
+#, c-format
+msgid "packfile %s cannot be mapped%s"
+msgstr "berkas pak %s tidak dapat dipetakan%s"
+
+#: packfile.c
+#, c-format
+msgid "offset before start of pack index for %s (corrupt index?)"
+msgstr "offset sebelum awal indeks pak untuk %s (indeks rusak?)"
+
+#: packfile.c
+#, c-format
+msgid "offset beyond end of pack index for %s (truncated index?)"
+msgstr "offset di luar ujung indeks pak untuk %s (indeks terpotong?)"
+
+#: parse-options-cb.c
+#, c-format
+msgid "malformed expiration date '%s'"
 msgstr ""
 
-#: contrib/scalar/scalar.c:548
-msgid "scalar reconfigure [--all | <enlistment>]"
+#: parse-options-cb.c
+#, c-format
+msgid "option `%s' expects \"always\", \"auto\", or \"never\""
 msgstr ""
 
-#: contrib/scalar/scalar.c:566
-msgid "--all or <enlistment>, but not both"
+#: parse-options-cb.c
+#, c-format
+msgid "malformed object name '%s'"
 msgstr ""
 
-#: contrib/scalar/scalar.c:581
+#: parse-options-cb.c
 #, c-format
-msgid "git repository gone in '%s'"
+msgid "option `%s' expects \"%s\" or \"%s\""
 msgstr ""
 
-#: contrib/scalar/scalar.c:621
-msgid ""
-"scalar run <task> [<enlistment>]\n"
-"Tasks:\n"
+#: parse-options.c
+#, c-format
+msgid "%s requires a value"
 msgstr ""
 
-#: contrib/scalar/scalar.c:639
+#: parse-options.c
 #, c-format
-msgid "no such task: '%s'"
+msgid "%s is incompatible with %s"
 msgstr ""
 
-#: contrib/scalar/scalar.c:689
-msgid "scalar unregister [<enlistment>]"
+#: parse-options.c
+#, c-format
+msgid "%s : incompatible with something else"
 msgstr ""
 
-#: contrib/scalar/scalar.c:736
-msgid "scalar delete <enlistment>"
+#: parse-options.c
+#, c-format
+msgid "%s takes no value"
 msgstr ""
 
-#: contrib/scalar/scalar.c:751
-msgid "refusing to delete current working directory"
+#: parse-options.c
+#, c-format
+msgid "%s isn't available"
 msgstr ""
 
-#: contrib/scalar/scalar.c:766
-msgid "include Git version"
+#: parse-options.c
+#, c-format
+msgid "%s expects a non-negative integer value with an optional k/m/g suffix"
 msgstr ""
 
-#: contrib/scalar/scalar.c:768
-msgid "include Git's build options"
+#: parse-options.c
+#, c-format
+msgid "ambiguous option: %s (could be --%s%s or --%s%s)"
 msgstr ""
 
-#: contrib/scalar/scalar.c:772
-msgid "scalar verbose [-v | --verbose] [--build-options]"
+#: parse-options.c
+#, c-format
+msgid "did you mean `--%s` (with two dashes)?"
 msgstr ""
 
-#: contrib/scalar/scalar.c:813
-msgid "-C requires a <directory>"
+#: parse-options.c
+#, c-format
+msgid "alias of --%s"
 msgstr ""
 
-#: contrib/scalar/scalar.c:815
+#: parse-options.c
 #, c-format
-msgid "could not change to '%s'"
+msgid "unknown option `%s'"
 msgstr ""
 
-#: contrib/scalar/scalar.c:821
-msgid "-c requires a <key>=<value> argument"
+#: parse-options.c
+#, c-format
+msgid "unknown switch `%c'"
 msgstr ""
 
-#: contrib/scalar/scalar.c:839
-msgid ""
-"scalar [-C <directory>] [-c <key>=<value>] <command> [<options>]\n"
-"\n"
-"Commands:\n"
+#: parse-options.c
+#, c-format
+msgid "unknown non-ascii option in string: `%s'"
 msgstr ""
 
-#: compat/compiler.h:26
-msgid "no compiler information available\n"
+#: parse-options.c
+msgid "..."
 msgstr ""
 
-#: compat/compiler.h:38
-msgid "no libc information available\n"
+#: parse-options.c
+#, c-format
+msgid "usage: %s"
 msgstr ""
 
-#: list-objects-filter-options.h:126
-msgid "args"
+#. TRANSLATORS: the colon here should align with the
+#. one in "usage: %s" translation.
+#.
+#: parse-options.c
+#, c-format
+msgid "   or: %s"
 msgstr ""
 
-#: list-objects-filter-options.h:127
-msgid "object filtering"
+#. 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
+#, c-format
+msgid "%*s%s"
+msgstr ""
+
+#: parse-options.c
+#, c-format
+msgid "    %s"
+msgstr ""
+
+#: parse-options.c
+msgid "-NUM"
 msgstr ""
 
-#: parse-options.h:188
+#: parse-options.h
 msgid "expiry-date"
 msgstr ""
 
-#: parse-options.h:202
+#: parse-options.h
 msgid "no-op (backward compatibility)"
 msgstr ""
 
-#: parse-options.h:341
+#: parse-options.h
 msgid "be more verbose"
 msgstr ""
 
-#: parse-options.h:343
+#: parse-options.h
 msgid "be more quiet"
 msgstr ""
 
-#: parse-options.h:349
+#: parse-options.h
 msgid "use <n> digits to display object names"
 msgstr ""
 
-#: parse-options.h:368
+#: parse-options.h
 msgid "how to strip spaces and #comments from message"
 msgstr ""
 
-#: parse-options.h:369
+#: parse-options.h
 msgid "read pathspec from file"
 msgstr ""
 
-#: parse-options.h:370
+#: parse-options.h
 msgid ""
 "with --pathspec-from-file, pathspec elements are separated with NUL character"
 msgstr ""
 
-#: ref-filter.h:98
+#: path.c
+#, c-format
+msgid "Could not make %s writable by group"
+msgstr ""
+
+#: pathspec.c
+msgid "Escape character '\\' not allowed as last character in attr value"
+msgstr ""
+
+#: pathspec.c
+msgid "Only one 'attr:' specification is allowed."
+msgstr ""
+
+#: pathspec.c
+msgid "attr spec must not be empty"
+msgstr ""
+
+#: pathspec.c
+#, c-format
+msgid "invalid attribute name %s"
+msgstr ""
+
+#: pathspec.c
+msgid "global 'glob' and 'noglob' pathspec settings are incompatible"
+msgstr ""
+
+#: pathspec.c
+msgid ""
+"global 'literal' pathspec setting is incompatible with all other global "
+"pathspec settings"
+msgstr ""
+
+#: pathspec.c
+msgid "invalid parameter for pathspec magic 'prefix'"
+msgstr ""
+
+#: pathspec.c
+#, c-format
+msgid "Invalid pathspec magic '%.*s' in '%s'"
+msgstr ""
+
+#: pathspec.c
+#, c-format
+msgid "Missing ')' at the end of pathspec magic in '%s'"
+msgstr ""
+
+#: pathspec.c
+#, c-format
+msgid "Unimplemented pathspec magic '%c' in '%s'"
+msgstr ""
+
+#: pathspec.c
+#, c-format
+msgid "%s: 'literal' and 'glob' are incompatible"
+msgstr ""
+
+#: pathspec.c
+#, c-format
+msgid "%s: '%s' is outside repository at '%s'"
+msgstr ""
+
+#: pathspec.c
+#, c-format
+msgid "'%s' (mnemonic: '%c')"
+msgstr ""
+
+#: pathspec.c
+#, c-format
+msgid "%s: pathspec magic not supported by this command: %s"
+msgstr ""
+
+#: pathspec.c
+#, c-format
+msgid "pathspec '%s' is beyond a symbolic link"
+msgstr ""
+
+#: pathspec.c
+#, c-format
+msgid "line is badly quoted: %s"
+msgstr ""
+
+#: pkt-line.c
+msgid "unable to write flush packet"
+msgstr ""
+
+#: pkt-line.c
+msgid "unable to write delim packet"
+msgstr ""
+
+#: pkt-line.c
+msgid "unable to write response end packet"
+msgstr ""
+
+#: pkt-line.c
+msgid "flush packet write failed"
+msgstr ""
+
+#: pkt-line.c
+msgid "protocol error: impossibly long line"
+msgstr ""
+
+#: pkt-line.c
+msgid "packet write with format failed"
+msgstr ""
+
+#: pkt-line.c
+msgid "packet write failed - data exceeds max packet size"
+msgstr ""
+
+#: pkt-line.c
+#, c-format
+msgid "packet write failed: %s"
+msgstr ""
+
+#: pkt-line.c
+msgid "read error"
+msgstr ""
+
+#: pkt-line.c
+msgid "the remote end hung up unexpectedly"
+msgstr ""
+
+#: pkt-line.c
+#, c-format
+msgid "protocol error: bad line length character: %.4s"
+msgstr ""
+
+#: pkt-line.c
+#, c-format
+msgid "protocol error: bad line length %d"
+msgstr ""
+
+#: pkt-line.c sideband.c
+#, c-format
+msgid "remote error: %s"
+msgstr ""
+
+#: preload-index.c
+msgid "Refreshing index"
+msgstr ""
+
+#: preload-index.c
+#, c-format
+msgid "unable to create threaded lstat: %s"
+msgstr ""
+
+#: pretty.c
+msgid "unable to parse --pretty format"
+msgstr ""
+
+#: promisor-remote.c
+msgid "promisor-remote: unable to fork off fetch subprocess"
+msgstr ""
+
+#: promisor-remote.c
+msgid "promisor-remote: could not write to fetch subprocess"
+msgstr ""
+
+#: promisor-remote.c
+msgid "promisor-remote: could not close stdin to fetch subprocess"
+msgstr ""
+
+#: promisor-remote.c
+#, c-format
+msgid "promisor remote name cannot begin with '/': %s"
+msgstr ""
+
+#: protocol-caps.c
+msgid "object-info: expected flush after arguments"
+msgstr ""
+
+#: prune-packed.c
+msgid "Removing duplicate objects"
+msgstr ""
+
+#: range-diff.c
+msgid "could not start `log`"
+msgstr ""
+
+#: range-diff.c
+msgid "could not read `log` output"
+msgstr ""
+
+#: range-diff.c sequencer.c
+#, c-format
+msgid "could not parse commit '%s'"
+msgstr ""
+
+#: range-diff.c
+#, c-format
+msgid ""
+"could not parse first line of `log` output: did not start with 'commit ': "
+"'%s'"
+msgstr ""
+
+#: range-diff.c
+#, c-format
+msgid "could not parse git header '%.*s'"
+msgstr ""
+
+#: range-diff.c
+msgid "failed to generate diff"
+msgstr ""
+
+#: range-diff.c
+#, c-format
+msgid "could not parse log for '%s'"
+msgstr ""
+
+#: read-cache.c
+#, c-format
+msgid "will not add file alias '%s' ('%s' already exists in index)"
+msgstr ""
+
+#: read-cache.c
+msgid "cannot create an empty blob in the object database"
+msgstr ""
+
+#: read-cache.c
+#, c-format
+msgid "%s: can only add regular files, symbolic links or git-directories"
+msgstr ""
+
+#: read-cache.c
+#, c-format
+msgid "unable to index file '%s'"
+msgstr ""
+
+#: read-cache.c
+#, c-format
+msgid "unable to add '%s' to index"
+msgstr ""
+
+#: read-cache.c
+#, c-format
+msgid "unable to stat '%s'"
+msgstr ""
+
+#: read-cache.c
+#, c-format
+msgid "'%s' appears as both a file and as a directory"
+msgstr ""
+
+#: read-cache.c
+msgid "Refresh index"
+msgstr ""
+
+#: read-cache.c
+#, c-format
+msgid ""
+"index.version set, but the value is invalid.\n"
+"Using version %i"
+msgstr ""
+
+#: read-cache.c
+#, c-format
+msgid ""
+"GIT_INDEX_VERSION set, but the value is invalid.\n"
+"Using version %i"
+msgstr ""
+
+#: read-cache.c
+#, c-format
+msgid "bad signature 0x%08x"
+msgstr ""
+
+#: read-cache.c
+#, c-format
+msgid "bad index version %d"
+msgstr ""
+
+#: read-cache.c
+msgid "bad index file sha1 signature"
+msgstr ""
+
+#: read-cache.c
+#, c-format
+msgid "index uses %.4s extension, which we do not understand"
+msgstr ""
+
+#: read-cache.c
+#, c-format
+msgid "ignoring %.4s extension"
+msgstr ""
+
+#: read-cache.c
+#, c-format
+msgid "unknown index entry format 0x%08x"
+msgstr ""
+
+#: read-cache.c
+#, c-format
+msgid "malformed name field in the index, near path '%s'"
+msgstr ""
+
+#: read-cache.c
+msgid "unordered stage entries in index"
+msgstr ""
+
+#: read-cache.c
+#, c-format
+msgid "multiple stage entries for merged file '%s'"
+msgstr ""
+
+#: read-cache.c
+#, c-format
+msgid "unordered stage entries for '%s'"
+msgstr ""
+
+#: read-cache.c
+#, c-format
+msgid "unable to create load_cache_entries thread: %s"
+msgstr ""
+
+#: read-cache.c
+#, c-format
+msgid "unable to join load_cache_entries thread: %s"
+msgstr ""
+
+#: read-cache.c
+#, c-format
+msgid "%s: index file open failed"
+msgstr ""
+
+#: read-cache.c
+#, c-format
+msgid "%s: cannot stat the open index"
+msgstr ""
+
+#: read-cache.c
+#, c-format
+msgid "%s: index file smaller than expected"
+msgstr ""
+
+#: read-cache.c
+#, c-format
+msgid "%s: unable to map index file%s"
+msgstr ""
+
+#: read-cache.c
+#, c-format
+msgid "unable to create load_index_extensions thread: %s"
+msgstr ""
+
+#: read-cache.c
+#, c-format
+msgid "unable to join load_index_extensions thread: %s"
+msgstr ""
+
+#: read-cache.c
+#, c-format
+msgid "could not freshen shared index '%s'"
+msgstr ""
+
+#: read-cache.c
+#, c-format
+msgid "broken index, expect %s in %s, got %s"
+msgstr ""
+
+#: read-cache.c
+msgid "cannot write split index for a sparse index"
+msgstr ""
+
+#: read-cache.c
+msgid "failed to convert to a sparse-index"
+msgstr ""
+
+#: read-cache.c
+#, c-format
+msgid "could not stat '%s'"
+msgstr ""
+
+#: read-cache.c
+#, c-format
+msgid "unable to open git dir: %s"
+msgstr ""
+
+#: read-cache.c
+#, c-format
+msgid "unable to unlink: %s"
+msgstr ""
+
+#: read-cache.c
+#, c-format
+msgid "cannot fix permission bits on '%s'"
+msgstr ""
+
+#: read-cache.c
+#, c-format
+msgid "%s: cannot drop to stage #0"
+msgstr ""
+
+#: rebase-interactive.c
+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 ""
+"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
+#, c-format
+msgid ""
+"unrecognized setting %s for option rebase.missingCommitsCheck. Ignoring."
+msgstr ""
+"setelan %s tidak dikenal untuk opsi rebase.missingCommitsCheck. Abaikan."
+
+#: rebase-interactive.c
+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 [-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"
+"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"
+"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 penyuntingx, 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
+#, c-format
+msgid "Rebase %s onto %s (%d command)"
+msgid_plural "Rebase %s onto %s (%d commands)"
+msgstr[0] "Dasarkan ulang %s kepada %s (%d perintah)"
+msgstr[1] "Dasarkan ulang %s kepada %s (%d perintah)"
+
+#: rebase-interactive.c
+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
+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
+msgid ""
+"\n"
+"You are editing the todo file of an ongoing interactive rebase.\n"
+"To continue rebase after editing, run:\n"
+"    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
+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
+#, c-format
+msgid "could not write '%s'."
+msgstr "tidak dapat menulis '%s'."
+
+#: rebase-interactive.c
+#, c-format
+msgid ""
+"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
+#, c-format
+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"
+"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.c
+#, c-format
+msgid "%s: 'preserve' superseded by 'merges'"
+msgstr "%s: 'preserve' digantikan oleh 'merges'"
+
+#: ref-filter.c wt-status.c
+msgid "gone"
+msgstr ""
+
+#: ref-filter.c
+#, c-format
+msgid "ahead %d"
+msgstr ""
+
+#: ref-filter.c
+#, c-format
+msgid "behind %d"
+msgstr ""
+
+#: ref-filter.c
+#, c-format
+msgid "ahead %d, behind %d"
+msgstr ""
+
+#: ref-filter.c
+#, c-format
+msgid "expected format: %%(color:<color>)"
+msgstr ""
+
+#: ref-filter.c
+#, c-format
+msgid "unrecognized color: %%(color:%s)"
+msgstr ""
+
+#: ref-filter.c
+#, c-format
+msgid "Integer value expected refname:lstrip=%s"
+msgstr ""
+
+#: ref-filter.c
+#, c-format
+msgid "Integer value expected refname:rstrip=%s"
+msgstr ""
+
+#: ref-filter.c
+#, c-format
+msgid "unrecognized %%(%s) argument: %s"
+msgstr ""
+
+#: ref-filter.c
+#, c-format
+msgid "%%(objecttype) does not take arguments"
+msgstr ""
+
+#: ref-filter.c
+#, c-format
+msgid "%%(deltabase) does not take arguments"
+msgstr ""
+
+#: ref-filter.c
+#, c-format
+msgid "%%(body) does not take arguments"
+msgstr ""
+
+#: ref-filter.c
+#, c-format
+msgid "expected %%(trailers:key=<value>)"
+msgstr ""
+
+#: ref-filter.c
+#, c-format
+msgid "unknown %%(trailers) argument: %s"
+msgstr ""
+
+#: ref-filter.c
+#, c-format
+msgid "positive value expected contents:lines=%s"
+msgstr ""
+
+#: ref-filter.c
+#, c-format
+msgid "positive value expected '%s' in %%(%s)"
+msgstr ""
+
+#: ref-filter.c
+#, c-format
+msgid "unrecognized email option: %s"
+msgstr ""
+
+#: ref-filter.c
+#, c-format
+msgid "expected format: %%(align:<width>,<position>)"
+msgstr ""
+
+#: ref-filter.c
+#, c-format
+msgid "unrecognized position:%s"
+msgstr ""
+
+#: ref-filter.c
+#, c-format
+msgid "unrecognized width:%s"
+msgstr ""
+
+#: ref-filter.c
+#, c-format
+msgid "positive width expected with the %%(align) atom"
+msgstr ""
+
+#: ref-filter.c
+#, c-format
+msgid "%%(rest) does not take arguments"
+msgstr ""
+
+#: ref-filter.c
+#, c-format
+msgid "malformed field name: %.*s"
+msgstr ""
+
+#: ref-filter.c
+#, c-format
+msgid "unknown field name: %.*s"
+msgstr ""
+
+#: ref-filter.c
+#, c-format
+msgid ""
+"not a git repository, but the field '%.*s' requires access to object data"
+msgstr ""
+
+#: ref-filter.c
+#, c-format
+msgid "format: %%(%s) atom used without a %%(%s) atom"
+msgstr ""
+
+#: ref-filter.c
+#, c-format
+msgid "format: %%(then) atom used more than once"
+msgstr ""
+
+#: ref-filter.c
+#, c-format
+msgid "format: %%(then) atom used after %%(else)"
+msgstr ""
+
+#: ref-filter.c
+#, c-format
+msgid "format: %%(else) atom used more than once"
+msgstr ""
+
+#: ref-filter.c
+#, c-format
+msgid "format: %%(end) atom used without corresponding atom"
+msgstr ""
+
+#: ref-filter.c
+#, c-format
+msgid "malformed format string %s"
+msgstr ""
+
+#: ref-filter.c
+#, c-format
+msgid "this command reject atom %%(%.*s)"
+msgstr ""
+
+#: ref-filter.c
+#, c-format
+msgid "--format=%.*s cannot be used with --python, --shell, --tcl"
+msgstr ""
+
+#: ref-filter.c
+#, c-format
+msgid "(no branch, rebasing %s)"
+msgstr ""
+
+#: ref-filter.c
+#, c-format
+msgid "(no branch, rebasing detached HEAD %s)"
+msgstr ""
+
+#: ref-filter.c
+#, c-format
+msgid "(no branch, bisect started on %s)"
+msgstr ""
+
+#: ref-filter.c
+#, c-format
+msgid "(HEAD detached at %s)"
+msgstr ""
+
+#: ref-filter.c
+#, c-format
+msgid "(HEAD detached from %s)"
+msgstr ""
+
+#: ref-filter.c
+msgid "(no branch)"
+msgstr ""
+
+#: ref-filter.c
+#, c-format
+msgid "missing object %s for %s"
+msgstr ""
+
+#: ref-filter.c
+#, c-format
+msgid "parse_object_buffer failed on %s for %s"
+msgstr ""
+
+#: ref-filter.c
+#, c-format
+msgid "malformed object at '%s'"
+msgstr ""
+
+#: ref-filter.c
+#, c-format
+msgid "ignoring ref with broken name %s"
+msgstr ""
+
+#: ref-filter.c refs.c
+#, c-format
+msgid "ignoring broken ref %s"
+msgstr ""
+
+#: ref-filter.c
+#, c-format
+msgid "format: %%(end) atom missing"
+msgstr ""
+
+#: ref-filter.c
+#, c-format
+msgid "malformed object name %s"
+msgstr ""
+
+#: ref-filter.c
+#, c-format
+msgid "option `%s' must point to a commit"
+msgstr ""
+
+#: ref-filter.h
 msgid "key"
 msgstr ""
 
-#: ref-filter.h:98
+#: ref-filter.h
 msgid "field name to sort on"
 msgstr ""
 
-#: rerere.h:44
+#: reflog.c
+#, c-format
+msgid "not a reflog: %s"
+msgstr "bukan sebuah log referensi: %s"
+
+#: reflog.c
+#, c-format
+msgid "no reflog for '%s'"
+msgstr "tidak ada log referensi untuk '%s'"
+
+#: refs.c
+#, c-format
+msgid "%s does not point to a valid object!"
+msgstr "%s tidak menunjuk ke sebuah objek valid!"
+
+#: refs.c
+#, 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"
+"of your new repositories, which will suppress this warning, call:\n"
+"\n"
+"\tgit config --global init.defaultBranch <name>\n"
+"\n"
+"Names commonly chosen instead of 'master' are 'main', 'trunk' and\n"
+"'development'. The just-created branch can be renamed via this command:\n"
+"\n"
+"\tgit branch -m <name>\n"
+msgstr ""
+"Menggunakan '%s' sebagai nama cabang awal. Nama cabang asali ini dapat\n"
+"berubah. Untuk menyetel nama cabang awal untuk digunakan pada semua\n"
+"repositori baru Anda, dimana akan mematikan peringatan ini, panggil:\n"
+"\n"
+"\tgit config --global init.defaultBranch <nama>\n"
+"\n"
+"Nama-nama yang umumnya dipilih selain 'master' adalah 'main', 'trunk' dan\n"
+"'development'. Cabang yang baru saja dibuat bisa dinamai ulang lewat "
+"perintah\n"
+"ini:\n"
+"\n"
+"\tgit branch -m <nama>\n"
+
+#: refs.c
+#, c-format
+msgid "could not retrieve `%s`"
+msgstr "tidak dapat mengambil `%s`"
+
+#: refs.c
+#, c-format
+msgid "invalid branch name: %s = %s"
+msgstr "nama cabang tidak valid: %s = %s"
+
+#: refs.c
+#, c-format
+msgid "ignoring dangling symref %s"
+msgstr "abaikan referensi simbolik teruntai %s"
+
+#: refs.c
+#, c-format
+msgid "log for ref %s has gap after %s"
+msgstr "log untuk referensi %s ada celah setelah %s"
+
+#: refs.c
+#, c-format
+msgid "log for ref %s unexpectedly ended on %s"
+msgstr "log untuk referensi %s sayangnya berakhir pada %s"
+
+#: refs.c
+#, c-format
+msgid "log for %s is empty"
+msgstr "log untuk %s kosong"
+
+#: refs.c
+#, c-format
+msgid "refusing to update ref with bad name '%s'"
+msgstr "menolak memperbarui referensi dengan nama jelek '%s'"
+
+#: refs.c
+#, c-format
+msgid "update_ref failed for ref '%s': %s"
+msgstr "update_ref gagal untuk referensi '%s': %s"
+
+#: refs.c
+#, c-format
+msgid "multiple updates for ref '%s' not allowed"
+msgstr "pembaruan berlipat untuk referensi '%s' tidak diperbolehkan"
+
+#: refs.c
+msgid "ref updates forbidden inside quarantine environment"
+msgstr "pembaruan referensi tidak diperbolehkan di dalam lingkungan karantina"
+
+#: refs.c
+msgid "ref updates aborted by hook"
+msgstr "pembaruan referensi dihentikan oleh kait"
+
+#: refs.c
+#, c-format
+msgid "'%s' exists; cannot create '%s'"
+msgstr "'%s' ada; tidak dapat membuat '%s'"
+
+#: refs.c
+#, c-format
+msgid "cannot process '%s' and '%s' at the same time"
+msgstr "tidak dapat memproses '%s' dan '%s' pada waktu yang bersamaan"
+
+#: refs/files-backend.c
+#, c-format
+msgid "could not remove reference %s"
+msgstr "tidak dapat menghapus referensi %s"
+
+#: refs/files-backend.c refs/packed-backend.c
+#, c-format
+msgid "could not delete reference %s: %s"
+msgstr "tidak dapat menghapus referensi %s: %s"
+
+#: refs/files-backend.c refs/packed-backend.c
+#, c-format
+msgid "could not delete references: %s"
+msgstr "tidak dapat menghapus referensi: %s"
+
+#: refspec.c
+#, c-format
+msgid "invalid refspec '%s'"
+msgstr "spek referensi tidak valid '%s'"
+
+#: remote-curl.c
+#, c-format
+msgid "invalid quoting in push-option value: '%s'"
+msgstr ""
+
+#: remote-curl.c
+#, c-format
+msgid "%sinfo/refs not valid: is this a git repository?"
+msgstr ""
+
+#: remote-curl.c
+msgid "invalid server response; expected service, got flush packet"
+msgstr ""
+
+#: remote-curl.c
+#, c-format
+msgid "invalid server response; got '%s'"
+msgstr ""
+
+#: remote-curl.c
+#, c-format
+msgid "repository '%s' not found"
+msgstr ""
+
+#: remote-curl.c
+#, c-format
+msgid "Authentication failed for '%s'"
+msgstr ""
+
+#: remote-curl.c
+#, c-format
+msgid "unable to access '%s' with http.pinnedPubkey configuration: %s"
+msgstr ""
+
+#: remote-curl.c
+#, c-format
+msgid "unable to access '%s': %s"
+msgstr ""
+
+#: remote-curl.c
+#, c-format
+msgid "redirecting to %s"
+msgstr ""
+
+#: remote-curl.c
+msgid "shouldn't have EOF when not gentle on EOF"
+msgstr ""
+
+#: remote-curl.c
+msgid "remote server sent unexpected response end packet"
+msgstr ""
+
+#: remote-curl.c
+msgid "unable to rewind rpc post data - try increasing http.postBuffer"
+msgstr ""
+
+#: remote-curl.c
+#, c-format
+msgid "remote-curl: bad line length character: %.4s"
+msgstr ""
+
+#: remote-curl.c
+msgid "remote-curl: unexpected response end packet"
+msgstr ""
+
+#: remote-curl.c
+#, c-format
+msgid "RPC failed; %s"
+msgstr ""
+
+#: remote-curl.c
+msgid "cannot handle pushes this big"
+msgstr ""
+
+#: remote-curl.c
+#, c-format
+msgid "cannot deflate request; zlib deflate error %d"
+msgstr ""
+
+#: remote-curl.c
+#, c-format
+msgid "cannot deflate request; zlib end error %d"
+msgstr ""
+
+#: remote-curl.c
+#, c-format
+msgid "%d bytes of length header were received"
+msgstr ""
+
+#: remote-curl.c
+#, c-format
+msgid "%d bytes of body are still expected"
+msgstr ""
+
+#: remote-curl.c
+msgid "dumb http transport does not support shallow capabilities"
+msgstr ""
+
+#: remote-curl.c
+msgid "fetch failed."
+msgstr ""
+
+#: remote-curl.c
+msgid "cannot fetch by sha1 over smart http"
+msgstr ""
+
+#: remote-curl.c
+#, c-format
+msgid "protocol error: expected sha/ref, got '%s'"
+msgstr ""
+
+#: remote-curl.c
+#, c-format
+msgid "http transport does not support %s"
+msgstr ""
+
+#: remote-curl.c
+msgid "git-http-push failed"
+msgstr ""
+
+#: remote-curl.c
+msgid "remote-curl: usage: git remote-curl <remote> [<url>]"
+msgstr ""
+
+#: remote-curl.c
+msgid "remote-curl: error reading command stream from git"
+msgstr ""
+
+#: remote-curl.c
+msgid "remote-curl: fetch attempted without a local repo"
+msgstr ""
+
+#: remote-curl.c
+#, c-format
+msgid "remote-curl: unknown command '%s' from git"
+msgstr ""
+
+#: remote.c
+#, c-format
+msgid "config remote shorthand cannot begin with '/': %s"
+msgstr "pintasan konfigurasi remote tidak dapat diawali dengan '/': %s"
+
+#: remote.c
+msgid "more than one receivepack given, using the first"
+msgstr "lebih dari satu paket terima diberikan, gunakan yang pertama"
+
+#: remote.c
+msgid "more than one uploadpack given, using the first"
+msgstr "lebih dari satu paket unggah diberikan, gunakan yang pertama"
+
+#: remote.c
+#, c-format
+msgid "unrecognized value transfer.credentialsInUrl: '%s'"
+msgstr "nilai transfer.credentialsInUrl tidak dikenal: '%s'"
+
+#: remote.c
+#, c-format
+msgid "URL '%s' uses plaintext credentials"
+msgstr "URL '%s' menggunakan kredensial teks terang"
+
+#: remote.c
+#, c-format
+msgid "Cannot fetch both %s and %s to %s"
+msgstr "tidak dapat mengambil baik %s dan %s ke %s"
+
+#: remote.c
+#, c-format
+msgid "%s usually tracks %s, not %s"
+msgstr "%s biasanya melacak %s, bukan %s"
+
+#: remote.c
+#, c-format
+msgid "%s tracks both %s and %s"
+msgstr "%s melacak baik %s dan %s"
+
+#: remote.c
+#, c-format
+msgid "key '%s' of pattern had no '*'"
+msgstr "kunci '%s' dari pola tidak ada '*'"
+
+#: remote.c
+#, c-format
+msgid "value '%s' of pattern has no '*'"
+msgstr "nilai '%s' dari pola tidak ada '*'"
+
+#: remote.c
+#, c-format
+msgid "src refspec %s does not match any"
+msgstr "spek referensi sumber %s tidak cocok dengan apapun"
+
+#: remote.c
+#, c-format
+msgid "src refspec %s matches more than one"
+msgstr "spek referensi sumber %s cocok dengan lebih dari satu"
+
+#. TRANSLATORS: "matches '%s'%" is the <dst> part of "git push
+#. <remote> <src>:<dst>" push, and "being pushed ('%s')" is
+#. the <src>.
+#.
+#: remote.c
+#, c-format
+msgid ""
+"The destination you provided is not a full refname (i.e.,\n"
+"starting with \"refs/\"). We tried to guess what you meant by:\n"
+"\n"
+"- Looking for a ref that matches '%s' on the remote side.\n"
+"- Checking if the <src> being pushed ('%s')\n"
+"  is a ref in \"refs/{heads,tags}/\". If so we add a corresponding\n"
+"  refs/{heads,tags}/ prefix on the remote side.\n"
+"\n"
+"Neither worked, so we gave up. You must fully qualify the ref."
+msgstr ""
+"Tujuan yang Anda berikan bukan nama referensi penuh (seperti \n"
+"dimulai dengan \"refs/\"). Kami mencoba menebak maksud Anda dengan:\n"
+"- Cari referensi yang cocok dengan '%s' pada sisi remote.\n"
+"- Perika apakah <src> yang sedang didorong ('%s') adalah \n"
+"  referensi pada \"refs/{heads,tags}\". Bila demikian kami \n"
+"  menambahkan awalan refs/{heads,tags}/ yang bersesuaian pada sisi \n"
+"  remote.\n"
+"\n"
+"Kedua-duanya tidak bekerja, jadi kami menyerah. Anda harus kualifikasi\n"
+"penuh referensi."
+
+#: remote.c
+#, c-format
+msgid ""
+"The <src> part of the refspec is a commit object.\n"
+"Did you mean to create a new branch by pushing to\n"
+"'%s:refs/heads/%s'?"
+msgstr ""
+"Bagian <src> dari spek referensi adalah objek komit.\n"
+"Apakah maksud Anda buat cabang baru dengan mendorong ke\n"
+"'%s:refs/heads/%s'?"
+
+#: remote.c
+#, c-format
+msgid ""
+"The <src> part of the refspec is a tag object.\n"
+"Did you mean to create a new tag by pushing to\n"
+"'%s:refs/tags/%s'?"
+msgstr ""
+"Bagian <src> dari spek referensi adalah objek tag.\n"
+"Apakah maksud Anda buat tag baru dengan mendorong ke\n"
+"'%s:refs/tags/%s'?"
+
+#: remote.c
+#, c-format
+msgid ""
+"The <src> part of the refspec is a tree object.\n"
+"Did you mean to tag a new tree by pushing to\n"
+"'%s:refs/tags/%s'?"
+msgstr ""
+"Bagian <src> dari spek referensi adalah objek pohon.\n"
+"Apakah maksud Anda tag pohon dengan mendorong ke\n"
+"'%s:refs/tags/%s'?"
+
+#: remote.c
+#, c-format
+msgid ""
+"The <src> part of the refspec is a blob object.\n"
+"Did you mean to tag a new blob by pushing to\n"
+"'%s:refs/tags/%s'?"
+msgstr ""
+"Bagian <src> dari spek referensi adalah objek blob.\n"
+"Apakah maksud Anda tag blob baru dengan mendorong ke\n"
+"'%s:refs/tags/%s'?"
+
+#: remote.c
+#, c-format
+msgid "%s cannot be resolved to branch"
+msgstr "%s tidak dapat diselesaikan ke cabang"
+
+#: remote.c
+#, c-format
+msgid "unable to delete '%s': remote ref does not exist"
+msgstr "tidak dapat menghapus '%s': referensi remote tidak ada"
+
+#: remote.c
+#, c-format
+msgid "dst refspec %s matches more than one"
+msgstr "spek referensi tujuan %s cocok dengan lebih dari satu"
+
+#: remote.c
+#, c-format
+msgid "dst ref %s receives from more than one src"
+msgstr "referensi tujuan %s menerima dari lebih dari satu sumber"
+
+#: remote.c
+msgid "HEAD does not point to a branch"
+msgstr "HEAD tidak menunjuk ke cabang"
+
+#: remote.c
+#, c-format
+msgid "no such branch: '%s'"
+msgstr "tidak ada cabang seperti: '%s'"
+
+#: remote.c
+#, c-format
+msgid "no upstream configured for branch '%s'"
+msgstr "tidak ada hulu yang terkonfigurasi untuk cabang '%s'"
+
+#: remote.c
+#, c-format
+msgid "upstream branch '%s' not stored as a remote-tracking branch"
+msgstr "cabang hulu '%s' tidak disimpan sebagai cabang pelacak remote"
+
+#: remote.c
+#, c-format
+msgid "push destination '%s' on remote '%s' has no local tracking branch"
+msgstr "tujuan dorong '%s' pada remote '%s' tidak ada cabang pelacak lokal"
+
+#: remote.c
+#, c-format
+msgid "branch '%s' has no remote for pushing"
+msgstr "cabang '%s' tidak ada remote untuk didorong"
+
+#: remote.c
+#, c-format
+msgid "push refspecs for '%s' do not include '%s'"
+msgstr "spek referensi dorong untuk '%s' tidak termasuk '%s'"
+
+#: remote.c
+msgid "push has no destination (push.default is 'nothing')"
+msgstr "dorong tidak ada tujuan (push.default yaitu 'nothing')"
+
+#: remote.c
+msgid "cannot resolve 'simple' push to a single destination"
+msgstr "tidak dapat menyelesaikan dorongan 'sederhana' ke satu tujuan"
+
+#: remote.c
+#, c-format
+msgid "couldn't find remote ref %s"
+msgstr "tidak dapat menemukan referensi remote %s"
+
+#: remote.c
+#, c-format
+msgid "* Ignoring funny ref '%s' locally"
+msgstr "* Abaikan referensi lucu '%s' secara lokal"
+
+#: remote.c
+#, c-format
+msgid "Your branch is based on '%s', but the upstream is gone.\n"
+msgstr "Cabang Anda didasarkan pada '%s', tapi hulu sudah tiada.\n"
+
+#: remote.c
+msgid "  (use \"git branch --unset-upstream\" to fixup)\n"
+msgstr "  (gunakan \"git branch --unset-upstream\" untuk perbaiki)\n"
+
+#: remote.c
+#, c-format
+msgid "Your branch is up to date with '%s'.\n"
+msgstr "Cabang Anda mutakhir dengan '%s'.\n"
+
+#: remote.c
+#, c-format
+msgid "Your branch and '%s' refer to different commits.\n"
+msgstr "Cabang Anda dan '%s' merujuk pada komit yang berbeda.\n"
+
+#: remote.c
+#, c-format
+msgid "  (use \"%s\" for details)\n"
+msgstr "  (gunakan \"%s\" untuk selengkapnya)\n"
+
+#: remote.c
+#, c-format
+msgid "Your branch is ahead of '%s' by %d commit.\n"
+msgid_plural "Your branch is ahead of '%s' by %d commits.\n"
+msgstr[0] "Cabang Anda mendahului '%s' oleh %d komit.\n"
+msgstr[1] "Cabang Anda mendahului '%s' oleh %d komit.\n"
+
+#: remote.c
+msgid "  (use \"git push\" to publish your local commits)\n"
+msgstr "  (gunakan \"git push\" untuk terbitkan komit lokal Anda)\n"
+
+#: remote.c
+#, c-format
+msgid "Your branch is behind '%s' by %d commit, and can be fast-forwarded.\n"
+msgid_plural ""
+"Your branch is behind '%s' by %d commits, and can be fast-forwarded.\n"
+msgstr[0] ""
+msgstr[1] ""
+
+#: remote.c
+msgid "  (use \"git pull\" to update your local branch)\n"
+msgstr "  (gunakan \"git pull\" untuk perbarui cabang lokal Anda)\n"
+
+#: remote.c
+#, c-format
+msgid ""
+"Your branch and '%s' have diverged,\n"
+"and have %d and %d different commit each, respectively.\n"
+msgid_plural ""
+"Your branch and '%s' have diverged,\n"
+"and have %d and %d different commits each, respectively.\n"
+msgstr[0] ""
+"Cabang Anda dan '%s' telah menyimpang,\n"
+"dan masing-masing punya %d dan %d komit berbeda.\n"
+msgstr[1] ""
+"Cabang Anda dan '%s' telah menyimpang,\n"
+"dan masing-masing punya %d dan %d komit berbeda.\n"
+
+#: remote.c
+msgid "  (use \"git pull\" to merge the remote branch into yours)\n"
+msgstr "  (gunakan \"git pull\" untuk gabungkan cabang remote ke milik Anda)\n"
+
+#: remote.c
+#, c-format
+msgid "cannot parse expected object name '%s'"
+msgstr "tidak dapat mengurai nama object yang diharapkan '%s'"
+
+#: remote.c
+#, c-format
+msgid "cannot strip one component off url '%s'"
+msgstr "tidak dapat mencopot satu komponen dari url '%s'"
+
+#: replace-object.c
+#, c-format
+msgid "bad replace ref name: %s"
+msgstr ""
+
+#: replace-object.c
+#, c-format
+msgid "duplicate replace ref: %s"
+msgstr ""
+
+#: replace-object.c
+#, c-format
+msgid "replace depth too high for object %s"
+msgstr ""
+
+#: rerere.c
+msgid "corrupt MERGE_RR"
+msgstr "MERGE_RR rusak"
+
+#: rerere.c
+msgid "unable to write rerere record"
+msgstr "tidak dapat menulis rekaman rerere"
+
+#: rerere.c
+#, c-format
+msgid "there were errors while writing '%s' (%s)"
+msgstr "ada kesalahan saat menulis '%s' (%s)"
+
+#: rerere.c
+#, c-format
+msgid "could not parse conflict hunks in '%s'"
+msgstr "tidak dapat mengurai bingkah konflik di '%s'"
+
+#: rerere.c
+#, c-format
+msgid "failed utime() on '%s'"
+msgstr "utime() gagal pada '%s'"
+
+#: rerere.c
+#, c-format
+msgid "writing '%s' failed"
+msgstr "gagal menulis '%s'"
+
+#: rerere.c
+#, c-format
+msgid "Staged '%s' using previous resolution."
+msgstr "'%s' digelarkan menggunakan resolusi sebelumnya."
+
+#: rerere.c
+#, c-format
+msgid "Recorded resolution for '%s'."
+msgstr "Resolusi direkam untuk '%s'."
+
+#: rerere.c
+#, c-format
+msgid "Resolved '%s' using previous resolution."
+msgstr "'%s' diselesaikan menggunakan resolusi sebelumnya."
+
+#: rerere.c
+#, c-format
+msgid "cannot unlink stray '%s'"
+msgstr "tidak dapat batal taut simpangan '%s'"
+
+#: rerere.c
+#, c-format
+msgid "Recorded preimage for '%s'"
+msgstr "Pracitra direkam untuk '%s'"
+
+#: rerere.c
+#, c-format
+msgid "failed to update conflicted state in '%s'"
+msgstr "gagal memperbarui keadaan konflik di '%s'"
+
+#: rerere.c
+#, c-format
+msgid "no remembered resolution for '%s'"
+msgstr "tidak ada resolusi yang diingat untuk '%s'"
+
+#: rerere.c
+#, c-format
+msgid "cannot unlink '%s'"
+msgstr "tidak dapat batal taut '%s'"
+
+#: rerere.c
+#, c-format
+msgid "Updated preimage for '%s'"
+msgstr "Pracitra diperbarui untuk '%s'"
+
+#: rerere.c
+#, c-format
+msgid "Forgot resolution for '%s'\n"
+msgstr "Resolusi dilupakan untuk '%s'\n"
+
+#: rerere.c
+msgid "unable to open rr-cache directory"
+msgstr "tidak dapat membuka direktori rr-cache"
+
+#: rerere.h
 msgid "update the index with reused conflict resolution if possible"
 msgstr ""
 
-#: command-list.h:50
-msgid "Add file contents to the index"
+#: reset.c
+msgid "could not determine HEAD revision"
+msgstr "tidak dapat menentukan revisi HEAD"
+
+#: reset.c sequencer.c
+#, c-format
+msgid "failed to find tree of %s"
+msgstr "gagal menemukan pohon %s"
+
+#: revision.c
+msgid "--unpacked=<packfile> no longer supported"
+msgstr "--unpacked=<berkas pak> tidak didukung lagi"
+
+#: revision.c
+msgid "your current branch appears to be broken"
+msgstr "sepertinya cabang Anda saat ini rusak"
+
+#: revision.c
+#, c-format
+msgid "your current branch '%s' does not have any commits yet"
+msgstr "cabang Anda saat ini '%s' belum memiliki komit apapun"
+
+#: revision.c
+msgid "object filtering requires --objects"
+msgstr "penyaringan objek memerlukan --objects"
+
+#: revision.c
+msgid "-L does not yet support diff formats besides -p and -s"
+msgstr "-L belum mendukung format diff selain -p dan -s"
+
+#: run-command.c
+#, c-format
+msgid "cannot create async thread: %s"
 msgstr ""
 
-#: command-list.h:51
-msgid "Apply a series of patches from a mailbox"
+#: send-pack.c
+msgid "unexpected flush packet while reading remote unpack status"
+msgstr "paket bilas tidak diharapkan ketika membaca status pembongkaran remote"
+
+#: send-pack.c
+#, c-format
+msgid "unable to parse remote unpack status: %s"
+msgstr "tidak dapat menguraikan status pembongkaran remote: %s"
+
+#: send-pack.c
+#, c-format
+msgid "remote unpack failed: %s"
+msgstr "pembongkaran remote gagal: %s"
+
+#: send-pack.c
+msgid "failed to sign the push certificate"
+msgstr "gagal menandatangani sertifikat dorong"
+
+#: send-pack.c
+msgid "send-pack: unable to fork off fetch subprocess"
+msgstr "send-pack: tidak dapat menggarpu subproses pengambilan"
+
+#: send-pack.c
+msgid "push negotiation failed; proceeding anyway with push"
+msgstr "negosiasi pendorongan gagal; langsung dilanjutkan dengan mendorong"
+
+#: send-pack.c
+msgid "the receiving end does not support this repository's hash algorithm"
+msgstr "ujung penerima tidak mendukung algoritma hash repositori ini"
+
+#: send-pack.c
+msgid "the receiving end does not support --signed push"
+msgstr "ujung penerima tidak mendukung dorongan --signed"
+
+#: send-pack.c
+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"
 
-#: command-list.h:52
-msgid "Annotate file lines with commit information"
+#: send-pack.c
+msgid "the receiving end does not support --atomic push"
+msgstr "ujung penerima tidak mendukung dorongan --atomic"
+
+#: send-pack.c
+msgid "the receiving end does not support push options"
+msgstr "ujung penerima tidak mendukung opsi dorong"
+
+#: sequencer.c
+#, c-format
+msgid "invalid commit message cleanup mode '%s'"
+msgstr "mode pembersihan pesan komit tidak valid '%s'"
+
+#: sequencer.c
+#, c-format
+msgid "could not delete '%s'"
+msgstr "tidak dapat menghapus '%s'"
+
+#: sequencer.c
+msgid "revert"
+msgstr "balik"
+
+#: sequencer.c
+msgid "cherry-pick"
+msgstr "petik ceri"
+
+#: sequencer.c
+msgid "rebase"
+msgstr "dasar ulang"
+
+#: sequencer.c
+#, c-format
+msgid "unknown action: %d"
+msgstr "aksi tidak dikenal: %d"
+
+#: sequencer.c
+msgid ""
+"after resolving the conflicts, mark the corrected paths\n"
+"with 'git add <paths>' or 'git rm <paths>'"
 msgstr ""
+"setelah menyelesaikan konflik, tandai jalur yang terkoreksi\n"
+"dengan 'git add <jalur>' atau 'git rm <jalur>'"
 
-#: command-list.h:53
-msgid "Apply a patch to files and/or to the index"
+#: sequencer.c
+msgid ""
+"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 ""
+"Setelah menyelesaikan konflik, tandai dengan\n"
+"\"git add/rm <spek jalur\", lalu jalankan\n"
+"\"git cherry-pick --continue\".\n"
+"Atau Anda dapat melewati komit ini dengan \"git cherry-pick --skip\".\n"
+"Untuk membatalkan dan kembali ke keadaan sebelum \"git cherry-pick\",\n"
+"jalankan \"git cherry-pick --abort\"."
 
-#: command-list.h:54
-msgid "Import a GNU Arch repository into Git"
+#: sequencer.c
+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 ""
+"Setelah menyelesaikan konflik, tandai dengan\n"
+"\"git add/rm <spek jalur>\", lalu jalankan\n"
+"\"git revert --continue\".\n"
+"Atau Anda dapat melewati komit ini dengan \"git revert --skip\".\n"
+"Untuk membatalkan dan kembali ke keadaan sebelum \"git revert\",\n"
+"jalankan \"git revert --abort\"."
 
-#: command-list.h:55
-msgid "Create an archive of files from a named tree"
+#: sequencer.c
+#, c-format
+msgid "could not lock '%s'"
+msgstr "tidak dapat mengunci '%s'"
+
+#: sequencer.c strbuf.c wrapper.c
+#, c-format
+msgid "could not write to '%s'"
+msgstr "tidak dapat menulis ke '%s'"
+
+#: sequencer.c
+#, c-format
+msgid "could not write eol to '%s'"
+msgstr "tidak dapat menulis akhir baris ke '%s'"
+
+#: sequencer.c
+#, c-format
+msgid "failed to finalize '%s'"
+msgstr "gagal mengakhiri '%s'"
+
+#: sequencer.c
+#, c-format
+msgid "your local changes would be overwritten by %s."
+msgstr "perubahan lokal Anda akan ditimpa oleh %s."
+
+#: sequencer.c
+msgid "commit your changes or stash them to proceed."
+msgstr "komit perubahan Anda atau stase untuk melanjutkan."
+
+#: sequencer.c
+#, c-format
+msgid "%s: fast-forward"
+msgstr "%s: maju-cepat"
+
+#. TRANSLATORS: %s will be "revert", "cherry-pick" or
+#. "rebase".
+#.
+#: sequencer.c
+#, c-format
+msgid "%s: Unable to write new index file"
+msgstr "%s: Tidak dapat menulis berkas indeks baru"
+
+#: sequencer.c
+msgid "unable to update cache tree"
+msgstr "tidak dapat memperbarui pohon tembolok"
+
+#: sequencer.c
+msgid "could not resolve HEAD commit"
+msgstr "tidak dapat menguraikan komit HEAD"
+
+#: sequencer.c
+#, c-format
+msgid "no key present in '%.*s'"
+msgstr "tidak ada kunci yang ada di pada '%.*s'"
+
+#: sequencer.c
+#, c-format
+msgid "unable to dequote value of '%s'"
+msgstr "tidak dapat membatal-kutip nilai dari '%s'"
+
+#: sequencer.c
+msgid "'GIT_AUTHOR_NAME' already given"
+msgstr "'GIT_AUTHOR_NAME' sudah diberikan"
+
+#: sequencer.c
+msgid "'GIT_AUTHOR_EMAIL' already given"
+msgstr "'GIT_AUTHOR_EMAIL' sudah diberikan"
+
+#: sequencer.c
+msgid "'GIT_AUTHOR_DATE' already given"
+msgstr "'GIT_AUTHOR_DATE' sudah diberikan"
+
+#: sequencer.c
+#, c-format
+msgid "unknown variable '%s'"
+msgstr "variabel tidak dikenal '%s'"
+
+#: sequencer.c
+msgid "missing 'GIT_AUTHOR_NAME'"
+msgstr "'GIT_AUTHOR_NAME' hilang"
+
+#: sequencer.c
+msgid "missing 'GIT_AUTHOR_EMAIL'"
+msgstr "'GIT_AUTHOR_EMAIL' hilang"
+
+#: sequencer.c
+msgid "missing 'GIT_AUTHOR_DATE'"
+msgstr "'GIT_AUTHOR_DATE' hilang"
+
+#: sequencer.c
+#, c-format
+msgid ""
+"you have staged changes in your working tree\n"
+"If these changes are meant to be squashed into the previous commit, run:\n"
+"\n"
+"  git commit --amend %s\n"
+"\n"
+"If they are meant to go into a new commit, run:\n"
+"\n"
+"  git commit %s\n"
+"\n"
+"In both cases, once you're done, continue with:\n"
+"\n"
+"  git rebase --continue\n"
 msgstr ""
+"Anda punya perubahan tergelar di dalam pohon kerja Anda.\n"
+"Apabila perubahan tersebut dimaksudkan untuk dilumat ke komit sebelumnya, "
+"jalankan:\n"
+"\n"
+"  git commit --amend %s\n"
+"\n"
+"Apabila dimaksudkan untuk masuk ke komit baru, jalankan:\n"
+"\n"
+"  git commit %s\n"
+"Pada kedua kasus tersebut, setelah selesai, lanjutkan dengan:\n"
+"\n"
+"  git rebase --continue\n"
 
-#: command-list.h:56
-msgid "Use binary search to find the commit that introduced a bug"
+#: sequencer.c
+msgid "'prepare-commit-msg' hook failed"
+msgstr "kait 'prepare-commit-msg' gagal"
+
+#: sequencer.c
+msgid ""
+"Your name and email address were configured automatically based\n"
+"on your username and hostname. Please check that they are accurate.\n"
+"You can suppress this message by setting them explicitly. Run the\n"
+"following command and follow the instructions in your editor to edit\n"
+"your configuration file:\n"
+"\n"
+"    git config --global --edit\n"
+"\n"
+"After doing this, you may fix the identity used for this commit with:\n"
+"\n"
+"    git commit --amend --reset-author\n"
 msgstr ""
+"Nama dan email Anda dikonfigurasikan otomatis berdasarkan nama pengguna\n"
+"dan nama host Anda. Periksa jika itu benar. Anda dapat mematikan pesan\n"
+"ini dengan menyetel secara eksplisit. Jalankan perintah berikut dan ikuti\n"
+"petunjuk di dalam penyunting untuk menyunting berkas konfigurasi Anda:\n"
+"\n"
+"    git config --global --edit\n"
+"\n"
+"Setelah itu, Anda dapat memperbaiki identitas yang digunakan untuk komit\n"
+"ini dengan:\n"
+"\n"
+"    git commit --amend --reset-author\n"
 
-#: command-list.h:57
-msgid "Show what revision and author last modified each line of a file"
+#: sequencer.c
+msgid ""
+"Your name and email address were configured automatically based\n"
+"on your username and hostname. Please check that they are accurate.\n"
+"You can suppress this message by setting them explicitly:\n"
+"\n"
+"    git config --global user.name \"Your Name\"\n"
+"    git config --global user.email you@example.com\n"
+"\n"
+"After doing this, you may fix the identity used for this commit with:\n"
+"\n"
+"    git commit --amend --reset-author\n"
 msgstr ""
+"Nama dan email Anda dikonfigurasikan otomatis berdasarkan nama pengguna\n"
+"dan nama host Anda. Periksa jika itu benar. Anda dapat mematikan pesan\n"
+"ini dengan menyetel secara eksplisit:\n"
+"\n"
+"    git config --global user.name \"Nama Anda\"\n"
+"    git config --global user.email anda@example.com\n"
+"\n"
+"Setelah itu, Anda dapat memperbaiki identitas yang digunakan untuk komit\n"
+"ini dengan:\n"
+"\n"
+"    git commit --amend --reset-author\n"
 
-#: command-list.h:58
-msgid "List, create, or delete branches"
+#: sequencer.c
+msgid "couldn't look up newly created commit"
+msgstr "tidak dapat mencari komit yang baru saja dibuat"
+
+#: sequencer.c
+msgid "could not parse newly created commit"
+msgstr "tidak dapat menguraikan komit yang baru saja dibuat"
+
+#: sequencer.c
+msgid "unable to resolve HEAD after creating commit"
+msgstr "tidak dapat menguraikan HEAD setelah membuat komit"
+
+#: sequencer.c
+msgid "detached HEAD"
+msgstr "HEAD terpisah"
+
+#: sequencer.c
+msgid " (root-commit)"
+msgstr " (komit-akar)"
+
+#: sequencer.c
+msgid "could not parse HEAD"
+msgstr "tidak dapat menguraikan HEAD"
+
+#: sequencer.c
+#, c-format
+msgid "HEAD %s is not a commit!"
+msgstr "HEAD %s bukan sebuah komit!"
+
+#: sequencer.c
+msgid "unable to parse commit author"
+msgstr "tidak dapat menguraikan pengarang komit"
+
+#: sequencer.c
+#, c-format
+msgid "unable to read commit message from '%s'"
+msgstr "tidak dapat membaca pesan komit dari '%s'"
+
+#: sequencer.c
+#, c-format
+msgid "invalid author identity '%s'"
+msgstr "identitas pengarang tidak valid '%s'"
+
+#: sequencer.c
+msgid "corrupt author: missing date information"
+msgstr "pengarang rusak: informasi tanggal hilang"
+
+#: sequencer.c t/helper/test-fast-rebase.c
+#, c-format
+msgid "could not update %s"
+msgstr "tidak dapat memperbarui %s"
+
+#: sequencer.c
+#, c-format
+msgid "could not parse commit %s"
+msgstr "tidak dapat menguraikan komit %s"
+
+#: sequencer.c
+#, c-format
+msgid "could not parse parent commit %s"
+msgstr "tidak dapat menguraikan komit induk %s"
+
+#: sequencer.c
+#, c-format
+msgid "unknown command: %d"
+msgstr "perintah tidak dikenal: %d"
+
+#: sequencer.c
+msgid "This is the 1st commit message:"
+msgstr "Ini komit pertama:"
+
+#: sequencer.c
+#, c-format
+msgid "This is the commit message #%d:"
+msgstr "Ini komit ke-%d:"
+
+#: sequencer.c
+msgid "The 1st commit message will be skipped:"
+msgstr "Pesan komit pertama akan dilewati:"
+
+#: sequencer.c
+#, c-format
+msgid "The commit message #%d will be skipped:"
+msgstr "Pesan komit ke-%d akan dilewati"
+
+#: sequencer.c
+#, c-format
+msgid "This is a combination of %d commits."
+msgstr "Ini kombinasi dari %d komit."
+
+#: sequencer.c
+#, c-format
+msgid "cannot write '%s'"
+msgstr "tidak dapat menulis '%s'"
+
+#: sequencer.c
+msgid "need a HEAD to fixup"
+msgstr "butuh sebuah HEAD untuk memperbaiki"
+
+#: sequencer.c
+msgid "could not read HEAD"
+msgstr "tidak dapat membaca HEAD"
+
+#: sequencer.c
+msgid "could not read HEAD's commit message"
+msgstr "tidak dapat membaca pesan komit HEAD"
+
+#: sequencer.c
+#, c-format
+msgid "could not read commit message of %s"
+msgstr "tidak dapat membaca pesan komit %s"
+
+#: sequencer.c
+msgid "your index file is unmerged."
+msgstr "berkas indeks Anda tak tergabung."
+
+#: sequencer.c
+msgid "cannot fixup root commit"
+msgstr "tidak dapat memperbaiki komit akar"
+
+#: sequencer.c
+#, c-format
+msgid "commit %s is a merge but no -m option was given."
+msgstr "komit %s adalah penggabungan tetapi opsi -m tidak diberikan."
+
+#: sequencer.c
+#, c-format
+msgid "commit %s does not have parent %d"
+msgstr "komit %s tidak punya induk %d"
+
+#: sequencer.c
+#, c-format
+msgid "cannot get commit message for %s"
+msgstr "tidak dapat mendapatkan pesan komit untuk %s"
+
+#. TRANSLATORS: The first %s will be a "todo" command like
+#. "revert" or "pick", the second %s a SHA1.
+#: sequencer.c
+#, c-format
+msgid "%s: cannot parse parent commit %s"
+msgstr "%s: tidak dapat menguraikan komit induk %s"
+
+#: sequencer.c
+#, c-format
+msgid "could not rename '%s' to '%s'"
+msgstr "tidak dapat menamai ulang '%s' ke '%s'"
+
+#: sequencer.c
+#, c-format
+msgid "could not revert %s... %s"
+msgstr "tidak dapat membalikkan %s... %s"
+
+#: sequencer.c
+#, c-format
+msgid "could not apply %s... %s"
+msgstr "tidak dapat menerapkan %s... %s"
+
+#: sequencer.c
+#, c-format
+msgid "dropping %s %s -- patch contents already upstream\n"
+msgstr "menjatuhkan %s %s -- isi tambalan sudah di hulu\n"
+
+#: sequencer.c
+#, c-format
+msgid "git %s: failed to read the index"
+msgstr "git %s: gagal membaca indeks"
+
+#: sequencer.c
+#, c-format
+msgid "git %s: failed to refresh the index"
+msgstr "git %s: gagal menyegarkan indeks"
+
+#: sequencer.c
+#, c-format
+msgid "%s does not accept arguments: '%s'"
+msgstr "%s tidak menerima argumen: '%s'"
+
+#: sequencer.c
+#, c-format
+msgid "missing arguments for %s"
+msgstr "argumen hilang untuk %s"
+
+#: sequencer.c
+#, c-format
+msgid "could not parse '%s'"
+msgstr "tidak dapat menguraikan '%s'"
+
+#: sequencer.c
+#, c-format
+msgid "invalid line %d: %.*s"
+msgstr "baris %d tidak valid: %.*s"
+
+#: sequencer.c
+#, c-format
+msgid "cannot '%s' without a previous commit"
+msgstr "tidak dapat '%s' tanpa komit sebelumnya"
+
+#: sequencer.c
+msgid "cancelling a cherry picking in progress"
+msgstr "membatalkan pemetikan ceri yang sedang berlangsung"
+
+#: sequencer.c
+msgid "cancelling a revert in progress"
+msgstr "membatalkan pembalikkan yang sedang berlangsung"
+
+#: sequencer.c
+msgid "please fix this using 'git rebase --edit-todo'."
+msgstr "mohon perbaiki menggunakan 'git rebase --edit-todo'."
+
+#: sequencer.c
+#, c-format
+msgid "unusable instruction sheet: '%s'"
+msgstr "lembar perintah tidak dapat digunakan: '%s'"
+
+#: sequencer.c
+msgid "no commits parsed."
+msgstr "tidak ada komit yang diuraikan."
+
+#: sequencer.c
+msgid "cannot cherry-pick during a revert."
+msgstr "tidak dapat memetik ceri selama pembalikkan."
+
+#: sequencer.c
+msgid "cannot revert during a cherry-pick."
+msgstr "tidak dapat membalikkan selama petik ceri."
+
+#: sequencer.c
+msgid "unusable squash-onto"
+msgstr "squash-onto tidak dapat digunakan"
+
+#: sequencer.c
+#, c-format
+msgid "malformed options sheet: '%s'"
+msgstr "lembar opsi jelek: '%s'"
+
+#: sequencer.c
+msgid "empty commit set passed"
+msgstr "himpunan komit kosong dilewatkan"
+
+#: sequencer.c
+msgid "revert is already in progress"
+msgstr "pembalikkan sudah berjalan"
+
+#: sequencer.c
+#, c-format
+msgid "try \"git revert (--continue | %s--abort | --quit)\""
+msgstr "coba \"git revert (--continue | %s--abort | --quit)\""
+
+#: sequencer.c
+msgid "cherry-pick is already in progress"
+msgstr "pemetikan ceri sudah berjalan"
+
+#: sequencer.c
+#, c-format
+msgid "try \"git cherry-pick (--continue | %s--abort | --quit)\""
+msgstr "coba \"git cherry-pick (--continue | %s--abort | --quit)\""
+
+#: sequencer.c
+#, c-format
+msgid "could not create sequencer directory '%s'"
+msgstr "tidak dapat membuat direktori pembaris '%s'"
+
+#: sequencer.c
+msgid "could not lock HEAD"
+msgstr "tidak dapat mengunci HEAD"
+
+#: sequencer.c
+msgid "no cherry-pick or revert in progress"
+msgstr "tidak ada pemetikan ceri atau pembalikkan yang sedang berjalan"
+
+#: sequencer.c
+msgid "cannot resolve HEAD"
+msgstr "tidak dapat menguraikan HEAD"
+
+#: sequencer.c
+msgid "cannot abort from a branch yet to be born"
+msgstr "tidak dapat membatalkan dari cabang yang belum lahir"
+
+#: sequencer.c
+#, c-format
+msgid "cannot read '%s': %s"
+msgstr "tidak dapat membaca '%s': %s"
+
+#: sequencer.c
+msgid "unexpected end of file"
+msgstr "akhir berkas tidak diharapkan"
+
+#: sequencer.c
+#, c-format
+msgid "stored pre-cherry-pick HEAD file '%s' is corrupt"
+msgstr "berkas HEAD pra-petik-ceri yang tersimpan '%s' rusak"
+
+#: sequencer.c
+msgid "You seem to have moved HEAD. Not rewinding, check your HEAD!"
 msgstr ""
+"Sepertinya Anda sudah memindahkan HEAD. Tidak memutar ulang, periksa HEAD "
+"Anda!"
 
-#: command-list.h:59
-msgid "Collect information for user to file a bug report"
+#: sequencer.c
+msgid "no revert in progress"
+msgstr "tidak ada pembalikkan yang sedang berjalan"
+
+#: sequencer.c
+msgid "no cherry-pick in progress"
+msgstr "tidak ada pemetikan ceri yang sedang berjalan"
+
+#: sequencer.c
+msgid "failed to skip the commit"
+msgstr "gagal melewati komit"
+
+#: sequencer.c
+msgid "there is nothing to skip"
+msgstr "tidak ada yang dilewati"
+
+#: sequencer.c
+#, c-format
+msgid ""
+"have you committed already?\n"
+"try \"git %s --continue\""
 msgstr ""
+"sudahkah Anda komit?\n"
+"coba \"git %s --continue\""
 
-#: command-list.h:60
-msgid "Move objects and refs by archive"
+#: sequencer.c
+msgid "cannot read HEAD"
+msgstr "tidak dapat membaca HEAD"
+
+#: sequencer.c
+#, c-format
+msgid "unable to copy '%s' to '%s'"
+msgstr "tidak dapat menyalin '%s' ke '%s'"
+
+#: sequencer.c
+#, c-format
+msgid ""
+"You can amend the commit now, with\n"
+"\n"
+"  git commit --amend %s\n"
+"\n"
+"Once you are satisfied with your changes, run\n"
+"\n"
+"  git rebase --continue\n"
 msgstr ""
+"Anda dapat mengubah komit sekarang, dengan\n"
+"\n"
+"  git commit --amend %s\n"
+"\n"
+"Setelah Anda puas dengan perubahan Anda, jalankan\n"
+"\n"
+"  git rebase --continue\n"
 
-#: command-list.h:61
-msgid "Provide content or type and size information for repository objects"
+#: sequencer.c
+#, c-format
+msgid "Could not apply %s... %.*s"
+msgstr "Tidak dapat menerapkan %s... %.*s"
+
+#: sequencer.c
+#, c-format
+msgid "Could not merge %.*s"
+msgstr "Tidak dapat menggabungkan %.*s"
+
+#: sequencer.c
+#, c-format
+msgid "Executing: %s\n"
+msgstr "Mengeksekusi: %s\n"
+
+#: sequencer.c
+#, c-format
+msgid ""
+"execution failed: %s\n"
+"%sYou can fix the problem, and then run\n"
+"\n"
+"  git rebase --continue\n"
+"\n"
 msgstr ""
+"eksekusi gagal: %s\n"
+"%sAnda dapat memperbaiki masalah, lalu jalankan\n"
+"\n"
+"  git rebase --continue\n"
+"\n"
 
-#: command-list.h:62
-msgid "Display gitattributes information"
+#: sequencer.c
+msgid "and made changes to the index and/or the working tree\n"
+msgstr "dan buat perubahan ke indeks dan/atau pohon kerja\n"
+
+#: sequencer.c
+#, c-format
+msgid ""
+"execution succeeded: %s\n"
+"but left changes to the index and/or the working tree\n"
+"Commit or stash your changes, and then run\n"
+"\n"
+"  git rebase --continue\n"
+"\n"
 msgstr ""
+"eksekusi berhasil: %s\n"
+"tapi meninggalkan perubahan ke indeks dan/atau pohon kerja\n"
+"Komit atau stase perubahan Anda, lalu jalankan\n"
+"\n"
+"  git rebase --continue\n"
+"\n"
 
-#: command-list.h:63
-msgid "Debug gitignore / exclude files"
+#: sequencer.c
+#, c-format
+msgid "illegal label name: '%.*s'"
+msgstr "nama label ilegal: '%.*s'"
+
+#: sequencer.c
+msgid "writing fake root commit"
+msgstr "menulis komit akar palsu"
+
+#: sequencer.c
+msgid "writing squash-onto"
+msgstr "menulis squash-onto"
+
+#: sequencer.c
+#, c-format
+msgid "could not resolve '%s'"
+msgstr "tidak dapat menguraikan '%s'"
+
+#: sequencer.c
+msgid "cannot merge without a current revision"
+msgstr "tidak dapat menggabungkan tanpa revisi saat ini"
+
+#: sequencer.c
+#, c-format
+msgid "unable to parse '%.*s'"
+msgstr "tidak dapat menguraikan '%.*s'"
+
+#: sequencer.c
+#, c-format
+msgid "nothing to merge: '%.*s'"
+msgstr "tidak ada yang digabungkan: '%.*s'"
+
+#: sequencer.c
+msgid "octopus merge cannot be executed on top of a [new root]"
+msgstr "penggabungan gurita tidak dapat dieksekusi di atas sebuah [akar baru]"
+
+#: sequencer.c
+#, c-format
+msgid "could not get commit message of '%s'"
+msgstr "tidak dapat mendapatkan pesan komit dari '%s'"
+
+#: sequencer.c
+#, c-format
+msgid "could not even attempt to merge '%.*s'"
+msgstr "bahkan tidak dapat mencoba menggabungkan '%.*s'"
+
+#: sequencer.c
+msgid "merge: Unable to write new index file"
+msgstr "merge: Tidak dapat menulis berkas indeks baru"
+
+#: sequencer.c
+msgid "Cannot autostash"
+msgstr "Tidak dapat menstase otomatis"
+
+#: sequencer.c
+#, c-format
+msgid "Unexpected stash response: '%s'"
+msgstr "Respons stase tidak diharapkan: '%s'"
+
+#: sequencer.c
+#, c-format
+msgid "Could not create directory for '%s'"
+msgstr "Tidak dapat membuat direktori untuk '%s'"
+
+#: sequencer.c
+#, c-format
+msgid "Created autostash: %s\n"
+msgstr "Stase otomatis dibuat: %s\n"
+
+#: sequencer.c
+msgid "could not reset --hard"
+msgstr "tidak dapat reset --hard"
+
+#: sequencer.c
+#, c-format
+msgid "Applied autostash.\n"
+msgstr "Stase otomatis diterapkan.\n"
+
+#: sequencer.c
+#, c-format
+msgid "cannot store %s"
+msgstr "tidak dapat menyimpan %s"
+
+#: sequencer.c
+#, c-format
+msgid ""
+"%s\n"
+"Your changes are safe in the stash.\n"
+"You can run \"git stash pop\" or \"git stash drop\" at any time.\n"
 msgstr ""
+"%s\n"
+"Perubahan Anda aman di dalam stase.\n"
+"Anda dapat menjalankan \"git stash pop\" atau \"git stash drop\" kapanpun.\n"
 
-#: command-list.h:64
-msgid "Show canonical names and email addresses of contacts"
+#: sequencer.c
+msgid "Applying autostash resulted in conflicts."
+msgstr "Menerapkan stase otomatis menghasilkan konflik."
+
+#: sequencer.c
+msgid "Autostash exists; creating a new stash entry."
+msgstr "Stase otomatis sudah ada; membuat entri stase baru."
+
+#: sequencer.c
+msgid "could not detach HEAD"
+msgstr "tidak dapat melepas HEAD"
+
+#: sequencer.c
+#, c-format
+msgid "Stopped at HEAD\n"
+msgstr "Berhenti pada HEAD\n"
+
+#: sequencer.c
+#, c-format
+msgid "Stopped at %s\n"
+msgstr "Berhenti pada %s\n"
+
+#: sequencer.c
+#, c-format
+msgid ""
+"Could not execute the todo command\n"
+"\n"
+"    %.*s\n"
+"It has been rescheduled; To edit the command before continuing, please\n"
+"edit the todo list first:\n"
+"\n"
+"    git rebase --edit-todo\n"
+"    git rebase --continue\n"
 msgstr ""
+"Tidak dapat mengeksekusi perintah todo\n"
+"\n"
+"    %.*s\n"
+"Itu sudah dijadwalkan ulang; Untuk menyunting perintah sebelum melanjutkan,\n"
+"mohon sunting daftar todo terlebih dahulu:\n"
+"\n"
+"    git rebase --edit-todo\n"
+"    git rebase --continue\n"
 
-#: command-list.h:65
-msgid "Ensures that a reference name is well formed"
+#: sequencer.c
+#, c-format
+msgid "Rebasing (%d/%d)%s"
+msgstr "Mendasarkan ulang (%d/%d)%s"
+
+#: sequencer.c
+#, c-format
+msgid "Stopped at %s...  %.*s\n"
+msgstr "Berhenti pada %s... %.*s\n"
+
+#: sequencer.c
+#, c-format
+msgid "unknown command %d"
+msgstr "perintah tidak dikenal %d"
+
+#: sequencer.c
+msgid "could not read orig-head"
+msgstr "tidak dapat membaca orig-head"
+
+#: sequencer.c
+msgid "could not read 'onto'"
+msgstr "tidak dapat membaca 'onto'"
+
+#: sequencer.c
+#, c-format
+msgid "could not update HEAD to %s"
+msgstr "tidak dapat memperbarui HEAD ke %s"
+
+#: sequencer.c
+#, c-format
+msgid "Successfully rebased and updated %s.\n"
+msgstr "%s didasarkan ulang dan diperbarui dengan sukses.\n"
+
+#: sequencer.c
+msgid "cannot rebase: You have unstaged changes."
+msgstr "tidak dapat mendasarkan ulang: Anda punya perubahan tak tergelar."
+
+#: sequencer.c
+msgid "cannot amend non-existing commit"
+msgstr "tidak dapat mengubah komit yang tidak ada"
+
+#: sequencer.c
+#, c-format
+msgid "invalid file: '%s'"
+msgstr "berkas tidak valid: '%s'"
+
+#: sequencer.c
+#, c-format
+msgid "invalid contents: '%s'"
+msgstr "konten tidak valid: '%s'"
+
+#: sequencer.c
+msgid ""
+"\n"
+"You have uncommitted changes in your working tree. Please, commit them\n"
+"first and then run 'git rebase --continue' again."
 msgstr ""
+"\n"
+"Anda punya perubahan tak tergelar di dalam pohon kerja Anda. Mohon komit\n"
+"terlebih dahulu dan jalankan 'git rebase --continue' lagi."
 
-#: command-list.h:66
-msgid "Switch branches or restore working tree files"
+#: sequencer.c
+#, c-format
+msgid "could not write file: '%s'"
+msgstr "tidak dapat menulis berkas: '%s'"
+
+#: sequencer.c
+msgid "could not remove CHERRY_PICK_HEAD"
+msgstr "tidak dapat menghapus CHERRY_PICK_HEAD"
+
+#: sequencer.c
+msgid "could not commit staged changes."
+msgstr "tidak dapat mengkomit perubahan tergelar."
+
+#: sequencer.c
+#, c-format
+msgid "%s: can't cherry-pick a %s"
+msgstr "%s: tidak dapat memetik ceri sebuah %s"
+
+#: sequencer.c
+#, c-format
+msgid "%s: bad revision"
+msgstr "%s: revisi jelek"
+
+#: sequencer.c
+msgid "can't revert as initial commit"
+msgstr "tidak dapat membalikkan sebagai komit awal"
+
+#: sequencer.c
+#, c-format
+msgid "skipped previously applied commit %s"
+msgstr "melewatkan komit yang sudah diterapkan sebelumnya %s"
+
+#: sequencer.c
+msgid "use --reapply-cherry-picks to include skipped commits"
+msgstr "gunakan --reapply-cherry-picks untuk memasukkan komit yang terlewat"
+
+#: sequencer.c
+msgid "make_script: unhandled options"
+msgstr "make_script: opsi tak ditangani"
+
+#: sequencer.c
+msgid "make_script: error preparing revisions"
+msgstr "make_script: kesalahan membuat revisi"
+
+#: sequencer.c
+msgid "nothing to do"
+msgstr "tidak ada yang dilakukan"
+
+#: sequencer.c
+msgid "could not skip unnecessary pick commands"
+msgstr "tidak dapat melewatkan perintah pick yang tidak perlu"
+
+#: sequencer.c
+msgid "the script was already rearranged."
+msgstr "skrip sudah ditata ulang."
+
+#: setup.c
+#, c-format
+msgid "'%s' is outside repository at '%s'"
+msgstr "'%s' di luar repositori pada '%s'"
+
+#: setup.c
+#, c-format
+msgid ""
+"%s: no such path in the working tree.\n"
+"Use 'git <command> -- <path>...' to specify paths that do not exist locally."
 msgstr ""
+"%s: tidak ada jalur di pohon kerja.\n"
+"Gunakan 'git <perintah> -- <jalur>...' untuk menyebutkan jalur yang tidak "
+"ada secara lokal."
 
-#: command-list.h:67
-msgid "Copy files from the index to the working tree"
+#: setup.c
+#, c-format
+msgid ""
+"ambiguous argument '%s': unknown revision or path not in the working tree.\n"
+"Use '--' to separate paths from revisions, like this:\n"
+"'git <command> [<revision>...] -- [<file>...]'"
 msgstr ""
+"argumen ambigu '%s': revisi tidak dikenal atau jalur tidak ada di dalam "
+"pohon kerja.\n"
+"Gunakan '--' untuk memisahkan jalur dari revisi, seperti ini:\n"
+"'git <perintah> [<revisi>...] -- [<berkas>...]'"
 
-#: command-list.h:68
-msgid "Find commits yet to be applied to upstream"
+#: setup.c
+#, c-format
+msgid "option '%s' must come before non-option arguments"
+msgstr "opsi '%s' harus ada sebelum argumen bukan opsi"
+
+#: setup.c
+#, c-format
+msgid ""
+"ambiguous argument '%s': both revision and filename\n"
+"Use '--' to separate paths from revisions, like this:\n"
+"'git <command> [<revision>...] -- [<file>...]'"
 msgstr ""
+"argumen ambigu '%s': kedua-duanya revisi dan nama berkas\n"
+"Gunakan '--' untuk memisahkan jalur dari revisi, seperti ini:\n"
+"'git <perintah> [<revisi>...] -- [<berkas>]'"
 
-#: command-list.h:69
-msgid "Apply the changes introduced by some existing commits"
+#: setup.c
+msgid "unable to set up work tree using invalid config"
+msgstr "tidak dapat memasang pohon kerja menggunakan konfigurasi tidak valid"
+
+#: setup.c
+#, c-format
+msgid "Expected git repo version <= %d, found %d"
+msgstr "Versi repositori git diharapkan <= %d, dapat %d"
+
+#: setup.c
+msgid "unknown repository extension found:"
+msgid_plural "unknown repository extensions found:"
+msgstr[0] "ekstensi repositori tidak dikenal ditemukan:"
+msgstr[1] "ekstensi repositori tidak dikenal ditemukan:"
+
+#: setup.c
+msgid "repo version is 0, but v1-only extension found:"
+msgid_plural "repo version is 0, but v1-only extensions found:"
+msgstr[0] "versi repositori 0, tetapi ekstensi hanya v1 ditemukan:"
+msgstr[1] "versi repositori 0, tetapi ekstensi hanya v1 ditemukan:"
+
+#: setup.c
+#, c-format
+msgid "error opening '%s'"
+msgstr "kesalahan membuka '%s'"
+
+#: setup.c
+#, c-format
+msgid "too large to be a .git file: '%s'"
+msgstr "terlalu besar untuk jadi berkas .git: '%s'"
+
+#: setup.c
+#, c-format
+msgid "error reading %s"
+msgstr "kesalahan membaca %s"
+
+#: setup.c
+#, c-format
+msgid "invalid gitfile format: %s"
+msgstr "format gitfile tidak valid: %s"
+
+#: setup.c
+#, c-format
+msgid "no path in gitfile: %s"
+msgstr "tidak ada jalur di dalam gitfile: %s"
+
+#: setup.c
+#, c-format
+msgid "not a git repository: %s"
+msgstr "bukan sebuah repositori git: %s"
+
+#: setup.c
+#, c-format
+msgid "'$%s' too big"
+msgstr "'$%s' terlalu besar"
+
+#: setup.c
+#, c-format
+msgid "not a git repository: '%s'"
+msgstr "bukan sebuah repositori git: '%s'"
+
+#: setup.c
+#, c-format
+msgid "cannot chdir to '%s'"
+msgstr "tidak dapat chdir ke '%s'"
+
+#: setup.c
+msgid "cannot come back to cwd"
+msgstr "tidak dapat kembali ke cwd"
+
+#: setup.c
+#, c-format
+msgid "failed to stat '%*s%s%s'"
+msgstr "gagal men-stat '%*s%s%s'"
+
+#: setup.c
+msgid "Unable to read current working directory"
+msgstr "tidak dapat membaca direktori kerja saat ini"
+
+#: setup.c
+#, c-format
+msgid "cannot change to '%s'"
+msgstr "tidak dapat berganti ke '%s'"
+
+#: setup.c
+#, c-format
+msgid "not a git repository (or any of the parent directories): %s"
+msgstr "bukan sebuah repositori git (atau direktori induk apapun): %s"
+
+#: setup.c
+#, 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 ""
+"bukan sebuah repositori git (atau induk apapun hingga ke titik pasang %s)\n"
+"Berhenti pada perbatasan sistem berkas (GIT_DISCOVERY_ACROSS_FILESYSTEM "
+"tidak disetel)."
 
-#: command-list.h:70
-msgid "Graphical alternative to git-commit"
+#: setup.c
+#, c-format
+msgid ""
+"unsafe repository ('%s' is owned by someone else)\n"
+"To add an exception for this directory, call:\n"
+"\n"
+"\tgit config --global --add safe.directory %s"
 msgstr ""
+"repositori tidak aman ('%s' dimiliki oleh orang lain)\n"
+"Untuk menambahkan pengecualian untuk direktori ini, panggil:\n"
+"\n"
+"\tgit config --global --add safe.directory %s"
 
-#: command-list.h:71
-msgid "Remove untracked files from the working tree"
+#: setup.c
+#, c-format
+msgid ""
+"problem with core.sharedRepository filemode value (0%.3o).\n"
+"The owner of files must always have read and write permissions."
 msgstr ""
+"masalah dengan nilai mode berkas core.sharedRepository (0%.3o).\n"
+"Pemilik berkas harus selalu punya perizinan baca dan tulis."
 
-#: command-list.h:72
-msgid "Clone a repository into a new directory"
+#: setup.c
+msgid "fork failed"
+msgstr "penggarpuan gagal"
+
+#: setup.c
+msgid "setsid failed"
+msgstr "setsid gagal"
+
+#: sparse-index.c
+#, c-format
+msgid "index entry is a directory, but not sparse (%08x)"
+msgstr "entri indeks adalah direktori, tapi bukan tipis (%08x)"
+
+#: split-index.c
+msgid "cannot use split index with a sparse index"
+msgstr "tidak dapat menggunakan indeks terpisah dengan indeks tipis"
+
+#. TRANSLATORS: IEC 80000-13:2008 gibibyte
+#: strbuf.c
+#, c-format
+msgid "%u.%2.2u GiB"
+msgstr "%u.%2.2u gibibita"
+
+#. TRANSLATORS: IEC 80000-13:2008 gibibyte/second
+#: strbuf.c
+#, c-format
+msgid "%u.%2.2u GiB/s"
+msgstr "%u.%2.2u gibibita/detik"
+
+#. TRANSLATORS: IEC 80000-13:2008 mebibyte
+#: strbuf.c
+#, c-format
+msgid "%u.%2.2u MiB"
+msgstr "%u.%2.2u mebibita"
+
+#. TRANSLATORS: IEC 80000-13:2008 mebibyte/second
+#: strbuf.c
+#, c-format
+msgid "%u.%2.2u MiB/s"
+msgstr "%u.%2.2u mebibita/detik"
+
+#. TRANSLATORS: IEC 80000-13:2008 kibibyte
+#: strbuf.c
+#, c-format
+msgid "%u.%2.2u KiB"
+msgstr "%u.%2.2u kibibita"
+
+#. TRANSLATORS: IEC 80000-13:2008 kibibyte/second
+#: strbuf.c
+#, c-format
+msgid "%u.%2.2u KiB/s"
+msgstr "%u.%2.2u kibibita/detik"
+
+#. TRANSLATORS: IEC 80000-13:2008 byte
+#: strbuf.c
+#, c-format
+msgid "%u byte"
+msgid_plural "%u bytes"
+msgstr[0] "%u bita"
+msgstr[1] "%u bita"
+
+#. TRANSLATORS: IEC 80000-13:2008 byte/second
+#: strbuf.c
+#, c-format
+msgid "%u byte/s"
+msgid_plural "%u bytes/s"
+msgstr[0] "%u bita/detik"
+msgstr[1] "%u bita/detik"
+
+#: strbuf.c
+#, c-format
+msgid "could not edit '%s'"
+msgstr "tidak dapat menyunting '%s'"
+
+#: submodule-config.c
+#, c-format
+msgid "ignoring suspicious submodule name: %s"
+msgstr "abaikan nama submodul dicurigai: %s"
+
+#: submodule-config.c
+msgid "negative values not allowed for submodule.fetchJobs"
+msgstr "nilai negatif tidak diperbolehkan untuk submodule.fetchJobs"
+
+#: submodule-config.c
+#, c-format
+msgid "ignoring '%s' which may be interpreted as a command-line option: %s"
+msgstr "abaikan '%s' yang mungkin ditafsirkan sebagai opsi baris perintah: %s"
+
+#: submodule-config.c
+#, c-format
+msgid "Could not update .gitmodules entry %s"
+msgstr "Tidak dapat memperbarui entri .gitmodules %s"
+
+#: submodule.c
+msgid "Cannot change unmerged .gitmodules, resolve merge conflicts first"
 msgstr ""
+"Tidak dapat mengubah .gitmodules yang tak tergabung, selesaikan konflik "
+"penggabungan terlebih dahulu"
 
-#: command-list.h:73
-msgid "Display data in columns"
+#: submodule.c
+#, c-format
+msgid "Could not find section in .gitmodules where path=%s"
+msgstr "Tidak dapat menemukan bagian .gitmodules dimana path=%s"
+
+#: submodule.c
+#, c-format
+msgid "Could not remove .gitmodules entry for %s"
+msgstr "Tidak dapat menghapus entri .gitmodules untuk %s"
+
+#: submodule.c
+msgid "staging updated .gitmodules failed"
+msgstr "gagal menggelar .gitmodules terbarui"
+
+#: submodule.c
+#, c-format
+msgid "in unpopulated submodule '%s'"
+msgstr "dalam submodul tak terisi '%s'"
+
+#: submodule.c
+#, c-format
+msgid "Pathspec '%s' is in submodule '%.*s'"
+msgstr "Spek jalur '%s' di dalam submodul '%.*s'"
+
+#: submodule.c
+#, c-format
+msgid "bad --ignore-submodules argument: %s"
+msgstr "argumen --ignore-submodules jelek: %s"
+
+#: submodule.c
+#, c-format
+msgid ""
+"Submodule in commit %s at path: '%s' collides with a submodule named the "
+"same. Skipping it."
 msgstr ""
+"Submodul dalam komit %s pada jalur '%s' bertabrakan dengan submodul yang "
+"bernama sama. Melewatinya."
 
-#: command-list.h:74
-msgid "Record changes to the repository"
+#: submodule.c
+#, c-format
+msgid "submodule entry '%s' (%s) is a %s, not a commit"
+msgstr "entri submodul '%s' (%s) adalah %s, bukan komit"
+
+#: submodule.c
+#, c-format
+msgid ""
+"Could not run 'git rev-list <commits> --not --remotes -n 1' command in "
+"submodule %s"
 msgstr ""
+"Tidak dapat menjalankan perintah 'git rev-list <komit> --not --remotes -n 1' "
+"dalam submodul %s"
 
-#: command-list.h:75
-msgid "Write and verify Git commit-graph files"
+#: submodule.c
+#, c-format
+msgid "process for submodule '%s' failed"
+msgstr "proses untuk submodul '%s' gagal"
+
+#: submodule.c
+#, c-format
+msgid "Pushing submodule '%s'\n"
+msgstr "Mendorong submodul '%s'\n"
+
+#: submodule.c
+#, c-format
+msgid "Unable to push submodule '%s'\n"
+msgstr "Tidak dapat mendorong submodul '%s'\n"
+
+#: submodule.c
+#, c-format
+msgid "Fetching submodule %s%s\n"
+msgstr "Mengambil submodul %s%s\n"
+
+#: submodule.c
+#, c-format
+msgid "Could not access submodule '%s'\n"
+msgstr "Tidak dapat mengakses submodul '%s'\n"
+
+#: submodule.c
+#, c-format
+msgid "Could not access submodule '%s' at commit %s\n"
+msgstr "Tidak dapat mengakses submodul '%s' pada komit %s\n"
+
+#: submodule.c
+#, c-format
+msgid "Fetching submodule %s%s at commit %s\n"
+msgstr "Mengambil submodul %s%s pada komit %s\n"
+
+#: submodule.c
+#, c-format
+msgid ""
+"Errors during submodule fetch:\n"
+"%s"
 msgstr ""
+"Kesalahan saat pengambilan submodul:\n"
+"%s"
 
-#: command-list.h:76
-msgid "Create a new commit object"
+#: submodule.c
+#, c-format
+msgid "'%s' not recognized as a git repository"
+msgstr "'%s' tak dikenal sebagai repositori git"
+
+#: submodule.c
+#, 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
+#, c-format
+msgid "'git status --porcelain=2' failed in submodule %s"
+msgstr "'git status --porcelain=2' gagal dalam submodul %s"
+
+#: submodule.c
+#, c-format
+msgid "could not start 'git status' in submodule '%s'"
+msgstr "Tidak dalat memulai 'git status' dalam submodul '%s'"
+
+#: submodule.c
+#, c-format
+msgid "could not run 'git status' in submodule '%s'"
+msgstr "tidak dapat menjalankan 'git status' dalam submodul '%s'"
+
+#: submodule.c
+#, 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
+#, c-format
+msgid "could not recurse into submodule '%s'"
+msgstr "tidak dapat rekursi ke dalam submodul '%s'"
+
+#: submodule.c
+msgid "could not reset submodule index"
+msgstr "tidak dapat reset indeks submodul"
+
+#: submodule.c
+#, c-format
+msgid "submodule '%s' has dirty index"
+msgstr "submodul '%s' punya indeks kotor"
+
+#: submodule.c
+#, c-format
+msgid "Submodule '%s' could not be updated."
+msgstr "Submodul '%s' tidak dapat diperbarui."
+
+#: submodule.c
+#, c-format
+msgid "submodule git dir '%s' is inside git dir '%.*s'"
+msgstr "direktori submodul git '%s' di dalam direktori git '%.*s'"
+
+#: submodule.c
+#, c-format
+msgid ""
+"relocate_gitdir for submodule '%s' with more than one worktree not supported"
 msgstr ""
+"relocate_gitdir untuk submodul '%s' dengan lebih dari satu pohon kerja tidak "
+"didukung"
 
-#: command-list.h:77
-msgid "Get and set repository or global options"
+#: submodule.c
+#, c-format
+msgid "could not lookup name for submodule '%s'"
+msgstr "tidak dapat mencari nama untuk submodul '%s'"
+
+#: submodule.c
+#, c-format
+msgid "refusing to move '%s' into an existing git dir"
+msgstr "menolak memindahkan '%s' ke dalam direktori git yang ada"
+
+#: submodule.c
+#, c-format
+msgid ""
+"Migrating git directory of '%s%s' from\n"
+"'%s' to\n"
+"'%s'\n"
 msgstr ""
+"Memigrasikan direktori git '%s%s' dari\n"
+"'%s' ke\n"
+"'%s'\n"
 
-#: command-list.h:78
-msgid "Count unpacked number of objects and their disk consumption"
+#: submodule.c
+msgid "could not start ls-files in .."
+msgstr "tidak dapat memulai ls-files dalam .."
+
+#: submodule.c
+#, c-format
+msgid "ls-tree returned unexpected return code %d"
+msgstr "ls-tree kembalikan kode kembali %d yang tak diharapkan"
+
+#: symlinks.c
+#, c-format
+msgid "failed to lstat '%s'"
+msgstr "gagal men-lstat '%s'"
+
+#: t/helper/test-fast-rebase.c
+msgid "unhandled options"
 msgstr ""
 
-#: command-list.h:79
-msgid "Retrieve and store user credentials"
+#: t/helper/test-fast-rebase.c
+msgid "error preparing revisions"
 msgstr ""
 
-#: command-list.h:80
-msgid "Helper to temporarily store passwords in memory"
+#: t/helper/test-reach.c
+#, c-format
+msgid "commit %s is not marked reachable"
 msgstr ""
 
-#: command-list.h:81
-msgid "Helper to store credentials on disk"
+#: t/helper/test-reach.c
+msgid "too many commits marked reachable"
 msgstr ""
 
-#: command-list.h:82
-msgid "Export a single commit to a CVS checkout"
+#: t/helper/test-serve-v2.c
+msgid "test-tool serve-v2 [<options>]"
 msgstr ""
 
-#: command-list.h:83
-msgid "Salvage your data out of another SCM people love to hate"
+#: t/helper/test-serve-v2.c
+msgid "exit immediately after advertising capabilities"
 msgstr ""
 
-#: command-list.h:84
-msgid "A CVS server emulator for Git"
+#: t/helper/test-simple-ipc.c
+msgid "test-helper simple-ipc is-active    [<name>] [<options>]"
 msgstr ""
 
-#: command-list.h:85
-msgid "A really simple server for Git repositories"
+#: t/helper/test-simple-ipc.c
+msgid "test-helper simple-ipc run-daemon   [<name>] [<threads>]"
 msgstr ""
 
-#: command-list.h:86
-msgid "Give an object a human readable name based on an available ref"
+#: t/helper/test-simple-ipc.c
+msgid "test-helper simple-ipc start-daemon [<name>] [<threads>] [<max-wait>]"
 msgstr ""
 
-#: command-list.h:87
-msgid "Show changes between commits, commit and working tree, etc"
+#: t/helper/test-simple-ipc.c
+msgid "test-helper simple-ipc stop-daemon  [<name>] [<max-wait>]"
 msgstr ""
 
-#: command-list.h:88
-msgid "Compares files in the working tree and the index"
+#: t/helper/test-simple-ipc.c
+msgid "test-helper simple-ipc send         [<name>] [<token>]"
 msgstr ""
 
-#: command-list.h:89
-msgid "Compare a tree to the working tree or index"
+#: t/helper/test-simple-ipc.c
+msgid "test-helper simple-ipc sendbytes    [<name>] [<bytecount>] [<byte>]"
 msgstr ""
 
-#: command-list.h:90
-msgid "Compares the content and mode of blobs found via two tree objects"
+#: t/helper/test-simple-ipc.c
+msgid ""
+"test-helper simple-ipc multiple     [<name>] [<threads>] [<bytecount>] "
+"[<batchsize>]"
 msgstr ""
 
-#: command-list.h:91
-msgid "Show changes using common diff tools"
+#: t/helper/test-simple-ipc.c
+msgid "name or pathname of unix domain socket"
 msgstr ""
 
-#: command-list.h:92
-msgid "Git data exporter"
+#: t/helper/test-simple-ipc.c
+msgid "named-pipe name"
 msgstr ""
 
-#: command-list.h:93
-msgid "Backend for fast Git data importers"
+#: t/helper/test-simple-ipc.c
+msgid "number of threads in server thread pool"
 msgstr ""
 
-#: command-list.h:94
-msgid "Download objects and refs from another repository"
+#: t/helper/test-simple-ipc.c
+msgid "seconds to wait for daemon to start or stop"
 msgstr ""
 
-#: command-list.h:95
-msgid "Receive missing objects from another repository"
+#: t/helper/test-simple-ipc.c
+msgid "number of bytes"
 msgstr ""
 
-#: command-list.h:96
-msgid "Rewrite branches"
+#: t/helper/test-simple-ipc.c
+msgid "number of requests per thread"
 msgstr ""
 
-#: command-list.h:97
-msgid "Produce a merge commit message"
+#: t/helper/test-simple-ipc.c
+msgid "byte"
 msgstr ""
 
-#: command-list.h:98
-msgid "Output information on each ref"
+#: t/helper/test-simple-ipc.c
+msgid "ballast character"
 msgstr ""
 
-#: command-list.h:99
-msgid "Run a Git command on a list of repositories"
+#: t/helper/test-simple-ipc.c
+msgid "token"
 msgstr ""
 
-#: command-list.h:100
-msgid "Prepare patches for e-mail submission"
+#: t/helper/test-simple-ipc.c
+msgid "command token to send to the server"
 msgstr ""
 
-#: command-list.h:101
-msgid "Verifies the connectivity and validity of the objects in the database"
+#: trailer.c
+#, c-format
+msgid "running trailer command '%s' failed"
+msgstr "gagal menjalankan perintah trailer '%s'"
+
+#: trailer.c
+#, c-format
+msgid "unknown value '%s' for key '%s'"
+msgstr "nilai tidak dikenal '%s' untuk kunci '%s'"
+
+#: trailer.c
+#, c-format
+msgid "empty trailer token in trailer '%.*s'"
+msgstr "token trailer kosong dalam trailer '%.*s'"
+
+#: trailer.c
+#, c-format
+msgid "could not read input file '%s'"
+msgstr "tidak dapat membaca berkas masukan '%s'"
+
+#: trailer.c wrapper.c
+#, c-format
+msgid "could not stat %s"
+msgstr "tidak dapat membaca %s"
+
+#: trailer.c
+#, c-format
+msgid "file %s is not a regular file"
+msgstr "berkas %s bukan sebuah berkas reguler"
+
+#: trailer.c
+#, c-format
+msgid "file %s is not writable by user"
+msgstr "berkas %s tidak dapat ditulis oleh pengguna"
+
+#: trailer.c
+msgid "could not open temporary file"
+msgstr "tidak dapat membuka berkas sementara"
+
+#: trailer.c
+#, c-format
+msgid "could not rename temporary file to %s"
+msgstr "tidak dapat menamai ulang berkas sementara ke %s"
+
+#: transport-helper.c
+msgid "full write to remote helper failed"
 msgstr ""
 
-#: command-list.h:102
-msgid "Cleanup unnecessary files and optimize the local repository"
+#: transport-helper.c
+#, c-format
+msgid "unable to find remote helper for '%s'"
 msgstr ""
 
-#: command-list.h:103
-msgid "Extract commit ID from an archive created using git-archive"
+#: transport-helper.c
+msgid "can't dup helper output fd"
 msgstr ""
 
-#: command-list.h:104
-msgid "Print lines matching a pattern"
+#: transport-helper.c
+#, c-format
+msgid ""
+"unknown mandatory capability %s; this remote helper probably needs newer "
+"version of Git"
 msgstr ""
 
-#: command-list.h:105
-msgid "A portable graphical interface to Git"
+#: transport-helper.c
+msgid "this remote helper should implement refspec capability"
 msgstr ""
 
-#: command-list.h:106
-msgid "Compute object ID and optionally creates a blob from a file"
+#: transport-helper.c
+#, c-format
+msgid "%s unexpectedly said: '%s'"
 msgstr ""
 
-#: command-list.h:107
-msgid "Display help information about Git"
+#: transport-helper.c
+#, c-format
+msgid "%s also locked %s"
 msgstr ""
 
-#: command-list.h:108
-msgid "Run git hooks"
+#: transport-helper.c
+msgid "couldn't run fast-import"
 msgstr ""
 
-#: command-list.h:109
-msgid "Server side implementation of Git over HTTP"
+#: transport-helper.c
+msgid "error while running fast-import"
 msgstr ""
 
-#: command-list.h:110
-msgid "Download from a remote Git repository via HTTP"
+#: transport-helper.c
+#, c-format
+msgid "could not read ref %s"
 msgstr ""
 
-#: command-list.h:111
-msgid "Push objects over HTTP/DAV to another repository"
+#: transport-helper.c
+#, c-format
+msgid "unknown response to connect: %s"
 msgstr ""
 
-#: command-list.h:112
-msgid "Send a collection of patches from stdin to an IMAP folder"
+#: transport-helper.c
+msgid "setting remote service path not supported by protocol"
 msgstr ""
 
-#: command-list.h:113
-msgid "Build pack index file for an existing packed archive"
+#: transport-helper.c
+msgid "invalid remote service path"
 msgstr ""
 
-#: command-list.h:114
-msgid "Create an empty Git repository or reinitialize an existing one"
+#: transport-helper.c transport.c
+msgid "operation not supported by protocol"
 msgstr ""
 
-#: command-list.h:115
-msgid "Instantly browse your working repository in gitweb"
+#: transport-helper.c
+#, c-format
+msgid "can't connect to subservice %s"
 msgstr ""
 
-#: command-list.h:116
-msgid "Add or parse structured information in commit messages"
+#: transport-helper.c transport.c
+msgid "--negotiate-only requires protocol v2"
 msgstr ""
 
-#: command-list.h:117
-msgid "Show commit logs"
+#: transport-helper.c
+msgid "'option' without a matching 'ok/error' directive"
 msgstr ""
 
-#: command-list.h:118
-msgid "Show information about files in the index and the working tree"
+#: transport-helper.c
+#, c-format
+msgid "expected ok/error, helper said '%s'"
 msgstr ""
 
-#: command-list.h:119
-msgid "List references in a remote repository"
+#: transport-helper.c
+#, c-format
+msgid "helper reported unexpected status of %s"
 msgstr ""
 
-#: command-list.h:120
-msgid "List the contents of a tree object"
+#: transport-helper.c
+#, c-format
+msgid "helper %s does not support dry-run"
 msgstr ""
 
-#: command-list.h:121
-msgid "Extracts patch and authorship from a single e-mail message"
+#: transport-helper.c
+#, c-format
+msgid "helper %s does not support --signed"
 msgstr ""
 
-#: command-list.h:122
-msgid "Simple UNIX mbox splitter program"
+#: transport-helper.c
+#, c-format
+msgid "helper %s does not support --signed=if-asked"
 msgstr ""
 
-#: command-list.h:123
-msgid "Run tasks to optimize Git repository data"
+#: transport-helper.c
+#, c-format
+msgid "helper %s does not support --atomic"
 msgstr ""
 
-#: command-list.h:124
-msgid "Join two or more development histories together"
+#: transport-helper.c
+#, c-format
+msgid "helper %s does not support --%s"
 msgstr ""
 
-#: command-list.h:125
-msgid "Find as good common ancestors as possible for a merge"
+#: transport-helper.c
+#, c-format
+msgid "helper %s does not support 'push-option'"
 msgstr ""
 
-#: command-list.h:126
-msgid "Run a three-way file merge"
+#: transport-helper.c
+msgid "remote-helper doesn't support push; refspec needed"
 msgstr ""
 
-#: command-list.h:127
-msgid "Run a merge for files needing merging"
+#: transport-helper.c
+#, c-format
+msgid "helper %s does not support 'force'"
 msgstr ""
 
-#: command-list.h:128
-msgid "The standard helper program to use with git-merge-index"
+#: transport-helper.c
+msgid "couldn't run fast-export"
 msgstr ""
 
-#: command-list.h:129
-msgid "Show three-way merge without touching index"
+#: transport-helper.c
+msgid "error while running fast-export"
 msgstr ""
 
-#: command-list.h:130
-msgid "Run merge conflict resolution tools to resolve merge conflicts"
+#: transport-helper.c
+#, c-format
+msgid ""
+"No refs in common and none specified; doing nothing.\n"
+"Perhaps you should specify a branch.\n"
 msgstr ""
 
-#: command-list.h:131
-msgid "Creates a tag object with extra validation"
+#: transport-helper.c
+#, c-format
+msgid "unsupported object format '%s'"
 msgstr ""
 
-#: command-list.h:132
-msgid "Build a tree-object from ls-tree formatted text"
+#: transport-helper.c
+#, c-format
+msgid "malformed response in ref list: %s"
 msgstr ""
 
-#: command-list.h:133
-msgid "Write and verify multi-pack-indexes"
+#: transport-helper.c
+#, c-format
+msgid "read(%s) failed"
 msgstr ""
 
-#: command-list.h:134
-msgid "Move or rename a file, a directory, or a symlink"
+#: transport-helper.c
+#, c-format
+msgid "write(%s) failed"
 msgstr ""
 
-#: command-list.h:135
-msgid "Find symbolic names for given revs"
+#: transport-helper.c
+#, c-format
+msgid "%s thread failed"
 msgstr ""
 
-#: command-list.h:136
-msgid "Add or inspect object notes"
+#: transport-helper.c
+#, c-format
+msgid "%s thread failed to join: %s"
 msgstr ""
 
-#: command-list.h:137
-msgid "Import from and submit to Perforce repositories"
+#: transport-helper.c
+#, c-format
+msgid "can't start thread for copying data: %s"
 msgstr ""
 
-#: command-list.h:138
-msgid "Create a packed archive of objects"
+#: transport-helper.c
+#, c-format
+msgid "%s process failed to wait"
 msgstr ""
 
-#: command-list.h:139
-msgid "Find redundant pack files"
+#: transport-helper.c
+#, c-format
+msgid "%s process failed"
 msgstr ""
 
-#: command-list.h:140
-msgid "Pack heads and tags for efficient repository access"
+#: transport-helper.c
+msgid "can't start thread for copying data"
 msgstr ""
 
-#: command-list.h:141
-msgid "Compute unique ID for a patch"
+#: transport.c
+#, c-format
+msgid "Would set upstream of '%s' to '%s' of '%s'\n"
 msgstr ""
 
-#: command-list.h:142
-msgid "Prune all unreachable objects from the object database"
+#: transport.c
+#, c-format
+msgid "could not read bundle '%s'"
 msgstr ""
 
-#: command-list.h:143
-msgid "Remove extra objects that are already in pack files"
+#: transport.c
+#, c-format
+msgid "transport: invalid depth option '%s'"
 msgstr ""
 
-#: command-list.h:144
-msgid "Fetch from and integrate with another repository or a local branch"
+#: transport.c
+msgid "see protocol.version in 'git help config' for more details"
 msgstr ""
 
-#: command-list.h:145
-msgid "Update remote refs along with associated objects"
+#: transport.c
+msgid "server options require protocol version 2 or later"
 msgstr ""
 
-#: command-list.h:146
-msgid "Applies a quilt patchset onto the current branch"
+#: transport.c
+msgid "server does not support wait-for-done"
 msgstr ""
 
-#: command-list.h:147
-msgid "Compare two commit ranges (e.g. two versions of a branch)"
+#: transport.c
+msgid "could not parse transport.color.* config"
 msgstr ""
 
-#: command-list.h:148
-msgid "Reads tree information into the index"
+#: transport.c
+msgid "support for protocol v2 not implemented yet"
 msgstr ""
 
-#: command-list.h:149
-msgid "Reapply commits on top of another base tip"
+#: transport.c
+#, c-format
+msgid "unknown value for config '%s': %s"
 msgstr ""
 
-#: command-list.h:150
-msgid "Receive what is pushed into the repository"
+#: transport.c
+#, c-format
+msgid "transport '%s' not allowed"
 msgstr ""
 
-#: command-list.h:151
-msgid "Manage reflog information"
+#: transport.c
+msgid "git-over-rsync is no longer supported"
 msgstr ""
 
-#: command-list.h:152
-msgid "Manage set of tracked repositories"
+#: transport.c
+#, c-format
+msgid ""
+"The following submodule paths contain changes that can\n"
+"not be found on any remote:\n"
 msgstr ""
 
-#: command-list.h:153
-msgid "Pack unpacked objects in a repository"
+#: transport.c
+#, c-format
+msgid ""
+"\n"
+"Please try\n"
+"\n"
+"\tgit push --recurse-submodules=on-demand\n"
+"\n"
+"or cd to the path and use\n"
+"\n"
+"\tgit push\n"
+"\n"
+"to push them to a remote.\n"
+"\n"
 msgstr ""
 
-#: command-list.h:154
-msgid "Create, list, delete refs to replace objects"
+#: transport.c
+msgid "Aborting."
 msgstr ""
 
-#: command-list.h:155
-msgid "Generates a summary of pending changes"
+#: transport.c
+msgid "failed to push all needed submodules"
 msgstr ""
 
-#: command-list.h:156
-msgid "Reuse recorded resolution of conflicted merges"
+#: tree-walk.c
+msgid "too-short tree object"
 msgstr ""
 
-#: command-list.h:157
-msgid "Reset current HEAD to the specified state"
+#: tree-walk.c
+msgid "malformed mode in tree entry"
 msgstr ""
 
-#: command-list.h:158
-msgid "Restore working tree files"
+#: tree-walk.c
+msgid "empty filename in tree entry"
 msgstr ""
 
-#: command-list.h:159
-msgid "Lists commit objects in reverse chronological order"
+#: tree-walk.c
+msgid "too-short tree file"
 msgstr ""
 
-#: command-list.h:160
-msgid "Pick out and massage parameters"
+#: unpack-trees.c
+#, c-format
+msgid ""
+"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 ""
 
-#: command-list.h:161
-msgid "Revert some existing commits"
+#: unpack-trees.c
+#, c-format
+msgid ""
+"Your local changes to the following files would be overwritten by checkout:\n"
+"%%s"
 msgstr ""
 
-#: command-list.h:162
-msgid "Remove files from the working tree and from the index"
+#: unpack-trees.c
+#, c-format
+msgid ""
+"Your local changes to the following files would be overwritten by merge:\n"
+"%%sPlease commit your changes or stash them before you merge."
 msgstr ""
 
-#: command-list.h:163
-msgid "Send a collection of patches as emails"
+#: unpack-trees.c
+#, c-format
+msgid ""
+"Your local changes to the following files would be overwritten by merge:\n"
+"%%s"
 msgstr ""
 
-#: command-list.h:164
-msgid "Push objects over Git protocol to another repository"
+#: unpack-trees.c
+#, c-format
+msgid ""
+"Your local changes to the following files would be overwritten by %s:\n"
+"%%sPlease commit your changes or stash them before you %s."
 msgstr ""
 
-#: command-list.h:165
-msgid "Git's i18n setup code for shell scripts"
+#: unpack-trees.c
+#, c-format
+msgid ""
+"Your local changes to the following files would be overwritten by %s:\n"
+"%%s"
 msgstr ""
 
-#: command-list.h:166
-msgid "Common Git shell script setup code"
+#: unpack-trees.c
+#, c-format
+msgid ""
+"Updating the following directories would lose untracked files in them:\n"
+"%s"
 msgstr ""
 
-#: command-list.h:167
-msgid "Restricted login shell for Git-only SSH access"
+#: unpack-trees.c
+#, c-format
+msgid ""
+"Refusing to remove the current working directory:\n"
+"%s"
 msgstr ""
 
-#: command-list.h:168
-msgid "Summarize 'git log' output"
+#: unpack-trees.c
+#, c-format
+msgid ""
+"The following untracked working tree files would be removed by checkout:\n"
+"%%sPlease move or remove them before you switch branches."
 msgstr ""
 
-#: command-list.h:169
-msgid "Show various types of objects"
+#: unpack-trees.c
+#, c-format
+msgid ""
+"The following untracked working tree files would be removed by checkout:\n"
+"%%s"
 msgstr ""
 
-#: command-list.h:170
-msgid "Show branches and their commits"
+#: unpack-trees.c
+#, c-format
+msgid ""
+"The following untracked working tree files would be removed by merge:\n"
+"%%sPlease move or remove them before you merge."
 msgstr ""
 
-#: command-list.h:171
-msgid "Show packed archive index"
+#: unpack-trees.c
+#, c-format
+msgid ""
+"The following untracked working tree files would be removed by merge:\n"
+"%%s"
 msgstr ""
 
-#: command-list.h:172
-msgid "List references in a local repository"
+#: unpack-trees.c
+#, c-format
+msgid ""
+"The following untracked working tree files would be removed by %s:\n"
+"%%sPlease move or remove them before you %s."
 msgstr ""
 
-#: command-list.h:173
-msgid "Reduce your working tree to a subset of tracked files"
+#: unpack-trees.c
+#, c-format
+msgid ""
+"The following untracked working tree files would be removed by %s:\n"
+"%%s"
 msgstr ""
 
-#: command-list.h:174
-msgid "Add file contents to the staging area"
+#: unpack-trees.c
+#, c-format
+msgid ""
+"The following untracked working tree files would be overwritten by "
+"checkout:\n"
+"%%sPlease move or remove them before you switch branches."
 msgstr ""
 
-#: command-list.h:175
-msgid "Stash the changes in a dirty working directory away"
+#: unpack-trees.c
+#, c-format
+msgid ""
+"The following untracked working tree files would be overwritten by "
+"checkout:\n"
+"%%s"
 msgstr ""
 
-#: command-list.h:176
-msgid "Show the working tree status"
+#: unpack-trees.c
+#, c-format
+msgid ""
+"The following untracked working tree files would be overwritten by merge:\n"
+"%%sPlease move or remove them before you merge."
 msgstr ""
 
-#: command-list.h:177
-msgid "Remove unnecessary whitespace"
+#: unpack-trees.c
+#, c-format
+msgid ""
+"The following untracked working tree files would be overwritten by merge:\n"
+"%%s"
 msgstr ""
 
-#: command-list.h:178
-msgid "Initialize, update or inspect submodules"
+#: unpack-trees.c
+#, c-format
+msgid ""
+"The following untracked working tree files would be overwritten by %s:\n"
+"%%sPlease move or remove them before you %s."
 msgstr ""
 
-#: command-list.h:179
-msgid "Bidirectional operation between a Subversion repository and Git"
+#: unpack-trees.c
+#, c-format
+msgid ""
+"The following untracked working tree files would be overwritten by %s:\n"
+"%%s"
 msgstr ""
 
-#: command-list.h:180
-msgid "Switch branches"
+#: unpack-trees.c
+#, c-format
+msgid "Entry '%s' overlaps with '%s'.  Cannot bind."
 msgstr ""
 
-#: command-list.h:181
-msgid "Read, modify and delete symbolic refs"
+#: unpack-trees.c
+#, c-format
+msgid ""
+"Cannot update submodule:\n"
+"%s"
 msgstr ""
 
-#: command-list.h:182
-msgid "Create, list, delete or verify a tag object signed with GPG"
+#: unpack-trees.c
+#, c-format
+msgid ""
+"The following paths are not up to date and were left despite sparse "
+"patterns:\n"
+"%s"
 msgstr ""
 
-#: command-list.h:183
-msgid "Creates a temporary file with a blob's contents"
+#: unpack-trees.c
+#, c-format
+msgid ""
+"The following paths are unmerged and were left despite sparse patterns:\n"
+"%s"
 msgstr ""
 
-#: command-list.h:184
-msgid "Unpack objects from a packed archive"
+#: unpack-trees.c
+#, c-format
+msgid ""
+"The following paths were already present and thus not updated despite sparse "
+"patterns:\n"
+"%s"
 msgstr ""
 
-#: command-list.h:185
-msgid "Register file contents in the working tree to the index"
+#: unpack-trees.c
+#, c-format
+msgid "Aborting\n"
 msgstr ""
 
-#: command-list.h:186
-msgid "Update the object name stored in a ref safely"
+#: unpack-trees.c
+#, c-format
+msgid ""
+"After fixing the above paths, you may want to run `git sparse-checkout "
+"reapply`.\n"
 msgstr ""
 
-#: command-list.h:187
-msgid "Update auxiliary info file to help dumb servers"
+#: unpack-trees.c
+msgid "Updating files"
 msgstr ""
 
-#: command-list.h:188
-msgid "Send archive back to git-archive"
+#: unpack-trees.c
+msgid ""
+"the following paths have collided (e.g. case-sensitive paths\n"
+"on a case-insensitive filesystem) and only one from the same\n"
+"colliding group is in the working tree:\n"
 msgstr ""
 
-#: command-list.h:189
-msgid "Send objects packed back to git-fetch-pack"
+#: unpack-trees.c
+msgid "Updating index flags"
 msgstr ""
 
-#: command-list.h:190
-msgid "Show a Git logical variable"
+#: unpack-trees.c
+#, c-format
+msgid "worktree and untracked commit have duplicate entries: %s"
 msgstr ""
 
-#: command-list.h:191
-msgid "Check the GPG signature of commits"
+#: upload-pack.c
+msgid "expected flush after fetch arguments"
+msgstr "bilasan diharapkan setelah argumen pengambilan"
+
+#: urlmatch.c
+msgid "invalid URL scheme name or missing '://' suffix"
 msgstr ""
 
-#: command-list.h:192
-msgid "Validate packed Git archive files"
+#: urlmatch.c
+#, c-format
+msgid "invalid %XX escape sequence"
 msgstr ""
 
-#: command-list.h:193
-msgid "Check the GPG signature of tags"
+#: urlmatch.c
+msgid "missing host and scheme is not 'file:'"
 msgstr ""
 
-#: command-list.h:194
-msgid "Show logs with difference each commit introduces"
+#: urlmatch.c
+msgid "a 'file:' URL may not have a port number"
 msgstr ""
 
-#: command-list.h:195
-msgid "Manage multiple working trees"
+#: urlmatch.c
+msgid "invalid characters in host name"
 msgstr ""
 
-#: command-list.h:196
-msgid "Create a tree object from the current index"
+#: urlmatch.c
+msgid "invalid port number"
 msgstr ""
 
-#: command-list.h:197
-msgid "Defining attributes per path"
+#: urlmatch.c
+msgid "invalid '..' path segment"
 msgstr ""
 
-#: command-list.h:198
-msgid "Git command-line interface and conventions"
+#: walker.c
+msgid "Fetching objects"
 msgstr ""
 
-#: command-list.h:199
-msgid "A Git core tutorial for developers"
+#: worktree.c
+#, c-format
+msgid "'%s' at main working tree is not the repository directory"
+msgstr "'%s' pada pohon kerja utama bukan direktori repositori"
+
+#: worktree.c
+#, c-format
+msgid "'%s' file does not contain absolute path to the working tree location"
+msgstr "berkas '%s' tidak berisi jalur absolut ke lokasi pohon kerja"
+
+#: worktree.c
+#, c-format
+msgid "'%s' is not a .git file, error code %d"
+msgstr "'%s' bukan berkas .git, kode error %d"
+
+#: worktree.c
+#, c-format
+msgid "'%s' does not point back to '%s'"
+msgstr "'%s' tidak menunjuk kembali ke '%s'"
+
+#: worktree.c
+msgid "not a directory"
+msgstr "bukan direktori"
+
+#: worktree.c
+msgid ".git is not a file"
+msgstr ".git bukan berkas"
+
+#: worktree.c
+msgid ".git file broken"
+msgstr "berkas .git rusak"
+
+#: worktree.c
+msgid ".git file incorrect"
+msgstr "berkas .git salah"
+
+#: worktree.c
+msgid "not a valid path"
+msgstr "bukan jalur valid"
+
+#: worktree.c
+msgid "unable to locate repository; .git is not a file"
+msgstr "tidak dapat menempatkan repositori; .git bukan berkas"
+
+#: worktree.c
+msgid "unable to locate repository; .git file does not reference a repository"
 msgstr ""
+"tidak dapat menempatkan repositori; berkas .git tidak merujuk repositori"
 
-#: command-list.h:200
-msgid "Providing usernames and passwords to Git"
+#: worktree.c
+msgid "unable to locate repository; .git file broken"
+msgstr "tidak dapat menempatkan repositori; berkas .git rusak"
+
+#: worktree.c
+msgid "gitdir unreadable"
+msgstr "gitdir tidak dapat dibaca"
+
+#: worktree.c
+msgid "gitdir incorrect"
+msgstr "gitdir salah"
+
+#: worktree.c
+msgid "not a valid directory"
+msgstr "bukan direktori valid"
+
+#: worktree.c
+msgid "gitdir file does not exist"
+msgstr "berkas gitdir tidak ada"
+
+#: worktree.c
+#, c-format
+msgid "unable to read gitdir file (%s)"
+msgstr "tidak dapat membaca berkas gitdir (%s)"
+
+#: worktree.c
+#, c-format
+msgid "short read (expected %<PRIuMAX> bytes, read %<PRIuMAX>)"
+msgstr "baca singkat (diharapkan %<PRIuMAX> bita, terbaca %<PRIuMAX>)"
+
+#: worktree.c
+msgid "invalid gitdir file"
+msgstr "berkas gitdir tidak valid"
+
+#: worktree.c
+msgid "gitdir file points to non-existent location"
+msgstr "berkas gitdir menunjuk ke lokasi yang tidak ada"
+
+#: worktree.c
+#, c-format
+msgid "unable to set %s in '%s'"
+msgstr "tidak dapat menyetel %s di '%s'"
+
+#: worktree.c
+#, c-format
+msgid "unable to unset %s in '%s'"
+msgstr "tidak dapat menyetel balik %s di '%s'"
+
+#: worktree.c
+msgid "failed to set extensions.worktreeConfig setting"
+msgstr "gagal menyetel setelan extensions.worktreeConfig"
+
+#: wrapper.c
+#, c-format
+msgid "could not setenv '%s'"
 msgstr ""
 
-#: command-list.h:201
-msgid "Git for CVS users"
+#: wrapper.c
+#, c-format
+msgid "unable to create '%s'"
+msgstr "tidak dapat membuat '%s'"
+
+#: wrapper.c
+#, c-format
+msgid "could not open '%s' for reading and writing"
 msgstr ""
 
-#: command-list.h:202
-msgid "Tweaking diff output"
+#: wrapper.c
+#, c-format
+msgid "unable to access '%s'"
 msgstr ""
 
-#: command-list.h:203
-msgid "A useful minimum set of commands for Everyday Git"
+#: wrapper.c
+msgid "unable to get current working directory"
 msgstr ""
 
-#: command-list.h:204
-msgid "Frequently asked questions about using Git"
+#: wt-status.c
+msgid "Unmerged paths:"
+msgstr "Jalur yang tak tergabung:"
+
+#: wt-status.c
+msgid "  (use \"git restore --staged <file>...\" to unstage)"
+msgstr "  (gunakan \"git restore --staged <berkas>...\" untuk menggelar balik)"
+
+#: wt-status.c
+#, c-format
+msgid "  (use \"git restore --source=%s --staged <file>...\" to unstage)"
 msgstr ""
+"  (gunakan \"git restore --source=%s --staged <berkas>..\" untuk menggelar "
+"balik)"
 
-#: command-list.h:205
-msgid "A Git Glossary"
+#: wt-status.c
+msgid "  (use \"git rm --cached <file>...\" to unstage)"
+msgstr "  (gunakan \"git rm --cached <berkas>...\" untuk menggelar balik)"
+
+#: wt-status.c
+msgid "  (use \"git add <file>...\" to mark resolution)"
+msgstr "  (gunakan \"git add <berkas>...\" untuk menandai penyelesaian)"
+
+#: wt-status.c
+msgid "  (use \"git add/rm <file>...\" as appropriate to mark resolution)"
 msgstr ""
+"  (gunakan \"git add/rm <berkas>...\" sebagaimana mestinya untuk menandai "
+"penyelesaian)"
 
-#: command-list.h:206
-msgid "Hooks used by Git"
+#: wt-status.c
+msgid "  (use \"git rm <file>...\" to mark resolution)"
+msgstr "  (gunakan \"git rm <berkas>\" untuk menandai penyelesaian)"
+
+#: wt-status.c
+msgid "Changes to be committed:"
+msgstr "Perubahan yang akan dikomit:"
+
+#: wt-status.c
+msgid "Changes not staged for commit:"
+msgstr "Perubahan yang tidak digelar untuk komit:"
+
+#: wt-status.c
+msgid "  (use \"git add <file>...\" to update what will be committed)"
 msgstr ""
+"  (gunakan \"git add <berkas>...\" untuk memperbarui apa yang akan dikomit)"
 
-#: command-list.h:207
-msgid "Specifies intentionally untracked files to ignore"
+#: wt-status.c
+msgid "  (use \"git add/rm <file>...\" to update what will be committed)"
 msgstr ""
+"  (gunakan \"git add/rm <berkas>...\" untuk memperbarui apa yang akan "
+"dikomit)"
 
-#: command-list.h:208
-msgid "The Git repository browser"
+#: wt-status.c
+msgid ""
+"  (use \"git restore <file>...\" to discard changes in working directory)"
 msgstr ""
+"  (gunakan \"git restore <berkas>...\" untuk membuang perubahan di direktori "
+"kerja)"
 
-#: command-list.h:209
-msgid "Map author/committer names and/or E-Mail addresses"
+#: wt-status.c
+msgid "  (commit or discard the untracked or modified content in submodules)"
 msgstr ""
+"  (komit atau buang konten yang tak dilacak atau diubah dalam submodul)"
 
-#: command-list.h:210
-msgid "Defining submodule properties"
+#: wt-status.c
+#, c-format
+msgid "  (use \"git %s <file>...\" to include in what will be committed)"
+msgstr "  (use \"git %s <berkas>...\" untuk menyertakan apa yang akan dikomit)"
+
+#: wt-status.c
+msgid "both deleted:"
+msgstr "kedua-duanya dihapus:"
+
+#: wt-status.c
+msgid "added by us:"
+msgstr "ditambahkan oleh kami:"
+
+#: wt-status.c
+msgid "deleted by them:"
+msgstr "dihapus oleh mereka:"
+
+#: wt-status.c
+msgid "added by them:"
+msgstr "ditambahkan oleh mereka:"
+
+#: wt-status.c
+msgid "deleted by us:"
+msgstr "dihapus oleh kami:"
+
+#: wt-status.c
+msgid "both added:"
+msgstr "kedua-duanya ditambah:"
+
+#: wt-status.c
+msgid "both modified:"
+msgstr "kedua-duanya diubah:"
+
+#: wt-status.c
+msgid "new file:"
+msgstr "berkas baru:"
+
+#: wt-status.c
+msgid "copied:"
+msgstr "tersalin:"
+
+#: wt-status.c
+msgid "deleted:"
+msgstr "terhapus:"
+
+#: wt-status.c
+msgid "modified:"
+msgstr "terubah:"
+
+#: wt-status.c
+msgid "renamed:"
+msgstr "terganti nama:"
+
+#: wt-status.c
+msgid "typechange:"
+msgstr "tipe perubahan:"
+
+#: wt-status.c
+msgid "unknown:"
+msgstr "tidak diketahui:"
+
+#: wt-status.c
+msgid "unmerged:"
+msgstr "tidak digabung:"
+
+#: wt-status.c
+msgid "new commits, "
+msgstr "komit baru, "
+
+#: wt-status.c
+msgid "modified content, "
+msgstr "konten yang dimodifikasi, "
+
+#: wt-status.c
+msgid "untracked content, "
+msgstr "konten yang tak dilacak, "
+
+#: wt-status.c
+#, c-format
+msgid "Your stash currently has %d entry"
+msgid_plural "Your stash currently has %d entries"
+msgstr[0] "Simpanan Anda saat ini ada %d entri"
+msgstr[1] "Simpanan Anda saat ini ada %d entri"
+
+#: wt-status.c
+msgid "Submodules changed but not updated:"
+msgstr "Submodul berubah tapi tak diperbarui:"
+
+#: wt-status.c
+msgid "Submodule changes to be committed:"
+msgstr "Perubahan submodul yang akan dikomit:"
+
+#: wt-status.c
+msgid ""
+"Do not modify or remove the line above.\n"
+"Everything below it will be ignored."
 msgstr ""
+"Jangan ubah atau hapus baris diatas.\n"
+"Semua dibawahnya akan diabaikan."
 
-#: command-list.h:211
-msgid "Git namespaces"
+#: wt-status.c
+#, c-format
+msgid ""
+"\n"
+"It took %.2f seconds to compute the branch ahead/behind values.\n"
+"You can use '--no-ahead-behind' to avoid this.\n"
 msgstr ""
+"\n"
+"Butuh %.2f detik untuk menghitung cabang di depan/di belakang nilai.\n"
+"Anda bisa gunakan '--no-ahead-behind' untuk menghindari hal tersebut.\n"
 
-#: command-list.h:212
-msgid "Helper programs to interact with remote repositories"
+#: wt-status.c
+msgid "You have unmerged paths."
+msgstr "Anda punya jalur yang tak tergabung."
+
+#: wt-status.c
+msgid "  (fix conflicts and run \"git commit\")"
+msgstr "  (selesaikan konflik dan jalankan \"git commit\")"
+
+#: wt-status.c
+msgid "  (use \"git merge --abort\" to abort the merge)"
+msgstr "  (gunakan \"git merge --abort\" untuk membatalkan penggabungan)"
+
+#: wt-status.c
+msgid "All conflicts fixed but you are still merging."
+msgstr "Semua konflik sudah selesai tapi Anda masih menggabungkan."
+
+#: wt-status.c
+msgid "  (use \"git commit\" to conclude merge)"
+msgstr "  (gunakan \"git commit\" untuk mengakhiri penggabungan)"
+
+#: wt-status.c
+msgid "You are in the middle of an am session."
+msgstr "Anda berada ditengah-tengah sesi am."
+
+#: wt-status.c
+msgid "The current patch is empty."
+msgstr "Jalur saat ini kosong"
+
+#: wt-status.c
+msgid "  (fix conflicts and then run \"git am --continue\")"
+msgstr "  (selesaikan konflik lalu jalankan \"git am --continue\")"
+
+#: wt-status.c
+msgid "  (use \"git am --skip\" to skip this patch)"
+msgstr "  (gunakan \"git am --skip\" untuk lewati tambalan ini)"
+
+#: wt-status.c
+msgid ""
+"  (use \"git am --allow-empty\" to record this patch as an empty commit)"
 msgstr ""
+"  (gunakan \"git am --allow-empty\" untuk merekam tambalan ini sebagai komit "
+"kosong)"
 
-#: command-list.h:213
-msgid "Git Repository Layout"
+#: wt-status.c
+msgid "  (use \"git am --abort\" to restore the original branch)"
+msgstr "  (gunakan \"git am --abort\" untuk mengembalikan cabang asal)"
+
+#: wt-status.c
+msgid "git-rebase-todo is missing."
+msgstr "git-rebase-todo hilang."
+
+#: wt-status.c
+msgid "No commands done."
+msgstr "Tidak ada perintah selesai."
+
+#: wt-status.c
+#, c-format
+msgid "Last command done (%<PRIuMAX> command done):"
+msgid_plural "Last commands done (%<PRIuMAX> commands done):"
+msgstr[0] "Perintah yang selesai (%<PRIuMAX> perintah):"
+msgstr[1] "Perintah yang selesai (%<PRIuMAX> perintah):"
+
+#: wt-status.c
+#, c-format
+msgid "  (see more in file %s)"
+msgstr "  (lihat lebih lanjut di berkas %s)"
+
+#: wt-status.c
+msgid "No commands remaining."
+msgstr "Tidak ada perintah yang tersisa."
+
+#: wt-status.c
+#, c-format
+msgid "Next command to do (%<PRIuMAX> remaining command):"
+msgid_plural "Next commands to do (%<PRIuMAX> remaining commands):"
+msgstr[0] "Perintah berikutnya (%<PRIuMAX> perintah tersisa):"
+msgstr[1] "Perintah berikutnya (%<PRIuMAX> perintah tersisa):"
+
+#: wt-status.c
+msgid "  (use \"git rebase --edit-todo\" to view and edit)"
+msgstr "  (gunakan \"git rebase --edit-todo\" untuk lihat dan sunting)"
+
+#: wt-status.c
+#, c-format
+msgid "You are currently rebasing branch '%s' on '%s'."
+msgstr "Anda sedang mendasarkan ulang cabang '%s' pada '%s'."
+
+#: wt-status.c
+msgid "You are currently rebasing."
+msgstr "Anda sedang mendasarkan ulang."
+
+#: wt-status.c
+msgid "  (fix conflicts and then run \"git rebase --continue\")"
+msgstr "  (selesaikan konflik lalu jalankan \"git rebase --continue\")"
+
+#: wt-status.c
+msgid "  (use \"git rebase --skip\" to skip this patch)"
+msgstr "  (gunakan \"git rebase --skip\" untuk lewati tambalan ini)"
+
+#: wt-status.c
+msgid "  (use \"git rebase --abort\" to check out the original branch)"
+msgstr "  (gunakan \"git rebase --abort\" untuk check out cabang asal)"
+
+#: wt-status.c
+msgid "  (all conflicts fixed: run \"git rebase --continue\")"
+msgstr "  (semua konflik sudah selesai: jalankan \"git rebase --continue\")"
+
+#: wt-status.c
+#, c-format
+msgid ""
+"You are currently splitting a commit while rebasing branch '%s' on '%s'."
 msgstr ""
+"Anda sedang membelah komit saat mendasarkan ulang cabang '%s' pada '%s'."
 
-#: command-list.h:214
-msgid "Specifying revisions and ranges for Git"
+#: wt-status.c
+msgid "You are currently splitting a commit during a rebase."
+msgstr "Anda sedang membelah komit saat mendasarkan ulang."
+
+#: wt-status.c
+msgid "  (Once your working directory is clean, run \"git rebase --continue\")"
 msgstr ""
+"  (Setelah direktori kerja Anda bersih, jalankan \"git rebase --continue\")"
 
-#: command-list.h:215
-msgid "Mounting one repository inside another"
+#: wt-status.c
+#, c-format
+msgid "You are currently editing a commit while rebasing branch '%s' on '%s'."
 msgstr ""
+"Anda sedang menyunting komit saat mendasarkan ulang cabang '%s' pada '%s'."
 
-#: command-list.h:216
-msgid "A tutorial introduction to Git"
+#: wt-status.c
+msgid "You are currently editing a commit during a rebase."
+msgstr "Anda sedang menyunting komit saat mendasarkan ulang."
+
+#: wt-status.c
+msgid "  (use \"git commit --amend\" to amend the current commit)"
+msgstr "  (gunakan \"git commit --amend\" untuk mengubah komit saat ini)"
+
+#: wt-status.c
+msgid ""
+"  (use \"git rebase --continue\" once you are satisfied with your changes)"
 msgstr ""
+"  (gunakan \"git rebase --continue\" begitu Anda puas dengan perubahan Anda)"
 
-#: command-list.h:217
-msgid "A tutorial introduction to Git: part two"
+#: wt-status.c
+msgid "Cherry-pick currently in progress."
+msgstr "Petik ceri sedang berjalan."
+
+#: wt-status.c
+#, c-format
+msgid "You are currently cherry-picking commit %s."
+msgstr "Anda sedang memetik ceri komit %s."
+
+#: wt-status.c
+msgid "  (fix conflicts and run \"git cherry-pick --continue\")"
+msgstr "  (selesaikan konflik dan jalankan \"git cherry-pick --continue\")"
+
+#: wt-status.c
+msgid "  (run \"git cherry-pick --continue\" to continue)"
+msgstr "  (jalankan \"git cherry-pick --continue\" untuk melanjutkan)"
+
+#: wt-status.c
+msgid "  (all conflicts fixed: run \"git cherry-pick --continue\")"
 msgstr ""
+"  (semua konflik sudah selesai: jalankan \"git cherry-pick --continue\")"
 
-#: command-list.h:218
-msgid "Git web interface (web frontend to Git repositories)"
+#: wt-status.c
+msgid "  (use \"git cherry-pick --skip\" to skip this patch)"
+msgstr "  (gunakan \"git cherry-pick --skip\" untuk lewati tambalan ini)"
+
+#: wt-status.c
+msgid "  (use \"git cherry-pick --abort\" to cancel the cherry-pick operation)"
 msgstr ""
+"  (gunakan \"git cherry-pick --abort\" untuk membatalkan operasi petik ceri)"
 
-#: command-list.h:219
-msgid "An overview of recommended workflows with Git"
+#: wt-status.c
+msgid "Revert currently in progress."
+msgstr "Pengembalian sedang berjalang."
+
+#: wt-status.c
+#, c-format
+msgid "You are currently reverting commit %s."
+msgstr "Anda sedang mengembalikan komit %s."
+
+#: wt-status.c
+msgid "  (fix conflicts and run \"git revert --continue\")"
+msgstr "  (selesaikan konflik dan jalankan \"git revert --continue\")"
+
+#: wt-status.c
+msgid "  (run \"git revert --continue\" to continue)"
+msgstr "  (jalankan \"git revert --continue\" untuk melanjutkan)"
+
+#: wt-status.c
+msgid "  (all conflicts fixed: run \"git revert --continue\")"
+msgstr "  (semua konflik sudah selesai: jalankan \"git revert --continue\")"
+
+#: wt-status.c
+msgid "  (use \"git revert --skip\" to skip this patch)"
+msgstr "  (gunakan \"git revert --skip\" untuk lewati tambalan ini)"
+
+#: wt-status.c
+msgid "  (use \"git revert --abort\" to cancel the revert operation)"
+msgstr ""
+"  (gunakan \"git revert --abort\" untuk membatalkan operasi pengembalian)"
+
+#: wt-status.c
+#, c-format
+msgid "You are currently bisecting, started from branch '%s'."
+msgstr "Anda sedang membagi dua, dimulai dari cabang '%s'."
+
+#: wt-status.c
+msgid "You are currently bisecting."
+msgstr "Anda sedang membagi dua."
+
+#: wt-status.c
+msgid "  (use \"git bisect reset\" to get back to the original branch)"
+msgstr "  (gunakan \"git bisect reset\" untuk kembali ke cabang asal)"
+
+#: wt-status.c
+msgid "You are in a sparse checkout."
+msgstr "Anda berada dalam checkout tipis."
+
+#: wt-status.c
+#, c-format
+msgid "You are in a sparse checkout with %d%% of tracked files present."
+msgstr "Anda berada dalam checkout tipis dengan %d%% berkas terlacak ada."
+
+#: wt-status.c
+msgid "On branch "
+msgstr "Pada cabang "
+
+#: wt-status.c
+msgid "interactive rebase in progress; onto "
+msgstr "sedang mendasarkan ulang interaktif; ke "
+
+#: wt-status.c
+msgid "rebase in progress; onto "
+msgstr "sedang mendasarkan ulang; ke "
+
+#: wt-status.c
+msgid "HEAD detached at "
+msgstr ""
+
+#: wt-status.c
+msgid "HEAD detached from "
+msgstr ""
+
+#: wt-status.c
+msgid "Not currently on any branch."
+msgstr "Tidak sedang berada pada cabang apapun."
+
+#: wt-status.c
+msgid "Initial commit"
+msgstr "Komit awal"
+
+#: wt-status.c
+msgid "No commits yet"
+msgstr "Tidak ada komit"
+
+#: wt-status.c
+msgid "Untracked files"
+msgstr "Berkas tak terlacak"
+
+#: wt-status.c
+msgid "Ignored files"
+msgstr "Berkas yang diabaikan"
+
+#: wt-status.c
+#, c-format
+msgid ""
+"It took %.2f seconds to enumerate untracked files. 'status -uno'\n"
+"may speed it up, but you have to be careful not to forget to add\n"
+"new files yourself (see 'git help status')."
+msgstr ""
+"Butuh %.2f detik untuk menghitung berkas tak terlacak. 'status -uno'\n"
+"mungkin bisa mempercepat, tapi Anda harus berhati-hati jangan sampai lupa\n"
+"untuk tambahkan berkas baru sendiri (lihat 'git help status')."
+
+#: wt-status.c
+#, c-format
+msgid "Untracked files not listed%s"
+msgstr "Berkas tak terlacak yang tak disebutkan%s"
+
+#: wt-status.c
+msgid " (use -u option to show untracked files)"
+msgstr " (gunakan opsi -u untuk melihat berkas yang tak terlacak)"
+
+#: wt-status.c
+msgid "No changes"
+msgstr "Tidak ada perubahan"
+
+#: wt-status.c
+#, c-format
+msgid "no changes added to commit (use \"git add\" and/or \"git commit -a\")\n"
 msgstr ""
+"tidak ada perubahan untuk dikomit (gunakan \"git add\" dan/atau \"git commit "
+"-a\")\n"
+
+#: wt-status.c
+#, c-format
+msgid "no changes added to commit\n"
+msgstr "tidak ada perubahan untuk dikomit\n"
+
+#: wt-status.c
+#, c-format
+msgid ""
+"nothing added to commit but untracked files present (use \"git add\" to "
+"track)\n"
+msgstr ""
+"tidak ada perubahan untuk dikomit tapi berkas yang tak terlacak ada(gunakan "
+"\"git add\" untuk lacak)\n"
+
+#: wt-status.c
+#, c-format
+msgid "nothing added to commit but untracked files present\n"
+msgstr "tidak ada perubahan untuk dikomit tapi berkas yang tak terlacak ada\n"
+
+#: wt-status.c
+#, c-format
+msgid "nothing to commit (create/copy files and use \"git add\" to track)\n"
+msgstr ""
+"tidak ada yang dikomit (buat/salin berkas dan gunakan \"git add\" untuk "
+"lacak)\n"
+
+#: wt-status.c
+#, c-format
+msgid "nothing to commit\n"
+msgstr "tidak ada yang dikomit\n"
+
+#: wt-status.c
+#, c-format
+msgid "nothing to commit (use -u to show untracked files)\n"
+msgstr "tidak ada yang dikomit (gunakan -u untuk lihat berkas tak terlacak)\n"
+
+#: wt-status.c
+#, c-format
+msgid "nothing to commit, working tree clean\n"
+msgstr "tidak ada yang dikomit, pohon kerja bersih\n"
+
+#: wt-status.c
+msgid "No commits yet on "
+msgstr "Tidak ada komit apapun pada "
+
+#: wt-status.c
+msgid "HEAD (no branch)"
+msgstr "HEAD (tanpa cabang)"
+
+#: wt-status.c
+msgid "different"
+msgstr "berbeda"
+
+#: wt-status.c
+msgid "behind "
+msgstr "di belakang "
+
+#: wt-status.c
+msgid "ahead "
+msgstr "di depan "
+
+#. TRANSLATORS: the action is e.g. "pull with rebase"
+#: wt-status.c
+#, c-format
+msgid "cannot %s: You have unstaged changes."
+msgstr "tidak dapat %s: Anda punya perubahan yang tidak digelar."
+
+#: wt-status.c
+msgid "additionally, your index contains uncommitted changes."
+msgstr "juga indeks Anda berisi perubahan yang belum dikomit."
+
+#: wt-status.c
+#, c-format
+msgid "cannot %s: Your index contains uncommitted changes."
+msgstr "tidak dapat %s: indeks Anda berisi perubahan yang belum dikomit."
 
-#: git-merge-octopus.sh:46
+#: git-merge-octopus.sh
 msgid ""
 "Error: Your local changes to the following files would be overwritten by "
 "merge"
 msgstr ""
 
-#: git-merge-octopus.sh:61
+#: git-merge-octopus.sh
 msgid "Automated merge did not work."
 msgstr ""
 
-#: git-merge-octopus.sh:62
+#: git-merge-octopus.sh
 msgid "Should not be doing an octopus."
 msgstr ""
 
-#: git-merge-octopus.sh:73
+#: git-merge-octopus.sh
 #, sh-format
 msgid "Unable to find common commit with $pretty_name"
 msgstr ""
 
-#: git-merge-octopus.sh:77
+#: git-merge-octopus.sh
 #, sh-format
 msgid "Already up to date with $pretty_name"
 msgstr ""
 
-#: git-merge-octopus.sh:89
+#: git-merge-octopus.sh
 #, sh-format
 msgid "Fast-forwarding to: $pretty_name"
 msgstr ""
 
-#: git-merge-octopus.sh:97
+#: git-merge-octopus.sh
 #, sh-format
 msgid "Trying simple merge with $pretty_name"
 msgstr ""
 
-#: git-merge-octopus.sh:102
+#: git-merge-octopus.sh
 msgid "Simple merge did not work, trying automatic merge."
 msgstr ""
 
-#: git-sh-setup.sh:89 git-sh-setup.sh:94
+#: git-sh-setup.sh
 #, sh-format
 msgid "usage: $dashless $USAGE"
 msgstr ""
 
-#: git-sh-setup.sh:182
+#: git-sh-setup.sh
 #, sh-format
 msgid "Cannot chdir to $cdup, the toplevel of the working tree"
 msgstr ""
 
-#: git-sh-setup.sh:191 git-sh-setup.sh:198
+#: git-sh-setup.sh
 #, sh-format
 msgid "fatal: $program_name cannot be used without a working tree."
 msgstr ""
 
-#: git-sh-setup.sh:212
+#: git-sh-setup.sh
 msgid "Cannot rewrite branches: You have unstaged changes."
 msgstr ""
 
-#: git-sh-setup.sh:215
+#: git-sh-setup.sh
 #, sh-format
 msgid "Cannot $action: You have unstaged changes."
 msgstr ""
 
-#: git-sh-setup.sh:226
+#: git-sh-setup.sh
 #, sh-format
 msgid "Cannot $action: Your index contains uncommitted changes."
 msgstr ""
 
-#: git-sh-setup.sh:228
+#: git-sh-setup.sh
 msgid "Additionally, your index contains uncommitted changes."
 msgstr ""
 
-#: git-sh-setup.sh:348
+#: git-sh-setup.sh
 msgid "You need to run this command from the toplevel of the working tree."
 msgstr ""
 
-#: git-sh-setup.sh:353
+#: git-sh-setup.sh
 msgid "Unable to determine absolute path of git directory"
 msgstr ""
 
 #. TRANSLATORS: you can adjust this to align "git add -i" status menu
-#: git-add--interactive.perl:212
+#: git-add--interactive.perl
 #, perl-format
 msgid "%12s %12s %s"
 msgstr ""
 
-#: git-add--interactive.perl:632
+#: git-add--interactive.perl
 #, perl-format
 msgid "touched %d path\n"
 msgid_plural "touched %d paths\n"
 msgstr[0] ""
 msgstr[1] ""
 
-#: git-add--interactive.perl:1056
+#: git-add--interactive.perl
 msgid ""
 "If the patch applies cleanly, the edited hunk will immediately be\n"
 "marked for staging."
 msgstr ""
 
-#: git-add--interactive.perl:1059
+#: git-add--interactive.perl
 msgid ""
 "If the patch applies cleanly, the edited hunk will immediately be\n"
 "marked for stashing."
 msgstr ""
 
-#: git-add--interactive.perl:1062
+#: git-add--interactive.perl
 msgid ""
 "If the patch applies cleanly, the edited hunk will immediately be\n"
 "marked for unstaging."
 msgstr ""
 
-#: git-add--interactive.perl:1065 git-add--interactive.perl:1074
-#: git-add--interactive.perl:1080
+#: git-add--interactive.perl
 msgid ""
 "If the patch applies cleanly, the edited hunk will immediately be\n"
 "marked for applying."
 msgstr ""
 
-#: git-add--interactive.perl:1068 git-add--interactive.perl:1071
-#: git-add--interactive.perl:1077
+#: git-add--interactive.perl
 msgid ""
 "If the patch applies cleanly, the edited hunk will immediately be\n"
 "marked for discarding."
 msgstr ""
 
-#: git-add--interactive.perl:1114
+#: git-add--interactive.perl
 #, perl-format
 msgid "failed to open hunk edit file for writing: %s"
 msgstr ""
 
-#: git-add--interactive.perl:1121
+#: git-add--interactive.perl
 #, perl-format
 msgid ""
 "---\n"
@@ -25909,12 +26229,12 @@ msgid ""
 "Lines starting with %s will be removed.\n"
 msgstr ""
 
-#: git-add--interactive.perl:1143
+#: git-add--interactive.perl
 #, perl-format
 msgid "failed to open hunk edit file for reading: %s"
 msgstr ""
 
-#: git-add--interactive.perl:1253
+#: git-add--interactive.perl
 msgid ""
 "y - stage this hunk\n"
 "n - do not stage this hunk\n"
@@ -25923,7 +26243,7 @@ msgid ""
 "d - do not stage this hunk or any of the later hunks in the file"
 msgstr ""
 
-#: git-add--interactive.perl:1259
+#: git-add--interactive.perl
 msgid ""
 "y - stash this hunk\n"
 "n - do not stash this hunk\n"
@@ -25932,7 +26252,7 @@ msgid ""
 "d - do not stash this hunk or any of the later hunks in the file"
 msgstr ""
 
-#: git-add--interactive.perl:1265
+#: git-add--interactive.perl
 msgid ""
 "y - unstage this hunk\n"
 "n - do not unstage this hunk\n"
@@ -25941,7 +26261,7 @@ msgid ""
 "d - do not unstage this hunk or any of the later hunks in the file"
 msgstr ""
 
-#: git-add--interactive.perl:1271
+#: git-add--interactive.perl
 msgid ""
 "y - apply this hunk to index\n"
 "n - do not apply this hunk to index\n"
@@ -25950,7 +26270,7 @@ msgid ""
 "d - do not apply this hunk or any of the later hunks in the file"
 msgstr ""
 
-#: git-add--interactive.perl:1277 git-add--interactive.perl:1295
+#: git-add--interactive.perl
 msgid ""
 "y - discard this hunk from worktree\n"
 "n - do not discard this hunk from worktree\n"
@@ -25959,7 +26279,7 @@ msgid ""
 "d - do not discard this hunk or any of the later hunks in the file"
 msgstr ""
 
-#: git-add--interactive.perl:1283
+#: git-add--interactive.perl
 msgid ""
 "y - discard this hunk from index and worktree\n"
 "n - do not discard this hunk from index and worktree\n"
@@ -25968,7 +26288,7 @@ msgid ""
 "d - do not discard this hunk or any of the later hunks in the file"
 msgstr ""
 
-#: git-add--interactive.perl:1289
+#: git-add--interactive.perl
 msgid ""
 "y - apply this hunk to index and worktree\n"
 "n - do not apply this hunk to index and worktree\n"
@@ -25977,7 +26297,7 @@ msgid ""
 "d - do not apply this hunk or any of the later hunks in the file"
 msgstr ""
 
-#: git-add--interactive.perl:1301
+#: git-add--interactive.perl
 msgid ""
 "y - apply this hunk to worktree\n"
 "n - do not apply this hunk to worktree\n"
@@ -25986,7 +26306,7 @@ msgid ""
 "d - do not apply this hunk or any of the later hunks in the file"
 msgstr ""
 
-#: git-add--interactive.perl:1316
+#: git-add--interactive.perl
 msgid ""
 "g - select a hunk to go to\n"
 "/ - search for a hunk matching the given regex\n"
@@ -25999,90 +26319,90 @@ msgid ""
 "? - print help\n"
 msgstr ""
 
-#: git-add--interactive.perl:1347
+#: git-add--interactive.perl
 msgid "The selected hunks do not apply to the index!\n"
 msgstr ""
 
-#: git-add--interactive.perl:1362
+#: git-add--interactive.perl
 #, perl-format
 msgid "ignoring unmerged: %s\n"
 msgstr ""
 
-#: git-add--interactive.perl:1481
+#: git-add--interactive.perl
 #, perl-format
 msgid "Apply mode change to worktree [y,n,q,a,d%s,?]? "
 msgstr ""
 
-#: git-add--interactive.perl:1482
+#: git-add--interactive.perl
 #, perl-format
 msgid "Apply deletion to worktree [y,n,q,a,d%s,?]? "
 msgstr ""
 
-#: git-add--interactive.perl:1483
+#: git-add--interactive.perl
 #, perl-format
 msgid "Apply addition to worktree [y,n,q,a,d%s,?]? "
 msgstr ""
 
-#: git-add--interactive.perl:1484
+#: git-add--interactive.perl
 #, perl-format
 msgid "Apply this hunk to worktree [y,n,q,a,d%s,?]? "
 msgstr ""
 
-#: git-add--interactive.perl:1601
+#: git-add--interactive.perl
 msgid "No other hunks to goto\n"
 msgstr ""
 
-#: git-add--interactive.perl:1619
+#: git-add--interactive.perl
 #, perl-format
 msgid "Invalid number: '%s'\n"
 msgstr ""
 
-#: git-add--interactive.perl:1624
+#: git-add--interactive.perl
 #, perl-format
 msgid "Sorry, only %d hunk available.\n"
 msgid_plural "Sorry, only %d hunks available.\n"
 msgstr[0] ""
 msgstr[1] ""
 
-#: git-add--interactive.perl:1659
+#: git-add--interactive.perl
 msgid "No other hunks to search\n"
 msgstr ""
 
-#: git-add--interactive.perl:1676
+#: git-add--interactive.perl
 #, perl-format
 msgid "Malformed search regexp %s: %s\n"
 msgstr ""
 
-#: git-add--interactive.perl:1686
+#: git-add--interactive.perl
 msgid "No hunk matches the given pattern\n"
 msgstr ""
 
-#: git-add--interactive.perl:1698 git-add--interactive.perl:1720
+#: git-add--interactive.perl
 msgid "No previous hunk\n"
 msgstr ""
 
-#: git-add--interactive.perl:1707 git-add--interactive.perl:1726
+#: git-add--interactive.perl
 msgid "No next hunk\n"
 msgstr ""
 
-#: git-add--interactive.perl:1732
+#: git-add--interactive.perl
 msgid "Sorry, cannot split this hunk\n"
 msgstr ""
 
-#: git-add--interactive.perl:1738
+#: git-add--interactive.perl
 #, perl-format
 msgid "Split into %d hunk.\n"
 msgid_plural "Split into %d hunks.\n"
 msgstr[0] ""
 msgstr[1] ""
 
-#: git-add--interactive.perl:1748
+#: git-add--interactive.perl
 msgid "Sorry, cannot edit this hunk\n"
 msgstr ""
 
 #. TRANSLATORS: please do not translate the command names
 #. 'status', 'update', 'revert', etc.
-#: git-add--interactive.perl:1813
+#: git-add--interactive.perl
 msgid ""
 "status        - show paths with changes\n"
 "update        - add working tree state to the staged set of changes\n"
@@ -26093,56 +26413,53 @@ msgid ""
 "changes\n"
 msgstr ""
 
-#: git-add--interactive.perl:1830 git-add--interactive.perl:1842
-#: git-add--interactive.perl:1845 git-add--interactive.perl:1852
-#: git-add--interactive.perl:1855 git-add--interactive.perl:1862
-#: git-add--interactive.perl:1866 git-add--interactive.perl:1872
+#: git-add--interactive.perl
 msgid "missing --"
 msgstr ""
 
-#: git-add--interactive.perl:1868
+#: git-add--interactive.perl
 #, perl-format
 msgid "unknown --patch mode: %s"
 msgstr ""
 
-#: git-add--interactive.perl:1874 git-add--interactive.perl:1880
+#: git-add--interactive.perl
 #, perl-format
 msgid "invalid argument %s, expecting --"
 msgstr ""
 
-#: git-send-email.perl:159
+#: git-send-email.perl
 msgid "local zone differs from GMT by a non-minute interval\n"
 msgstr "zona lokal berbeda dari GMT oleh selang non-menit\n"
 
-#: git-send-email.perl:166 git-send-email.perl:172
+#: git-send-email.perl
 msgid "local time offset greater than or equal to 24 hours\n"
 msgstr "offset waktu lokal lebih dari atau sama dengan 24 jam\n"
 
-#: git-send-email.perl:244
+#: git-send-email.perl
 #, perl-format
 msgid "fatal: command '%s' died with exit code %d"
 msgstr "fatal: perintah '%s' mati dengan kode keluar %d"
 
-#: git-send-email.perl:257
+#: git-send-email.perl
 msgid "the editor exited uncleanly, aborting everything"
 msgstr "penyunting keluar dengan kotor, membatalkan semua"
 
-#: git-send-email.perl:346
+#: git-send-email.perl
 #, perl-format
 msgid ""
 "'%s' contains an intermediate version of the email you were composing.\n"
 msgstr "'%s' berisi versi menengah dari email yang Anda buat.\n"
 
-#: git-send-email.perl:351
+#: git-send-email.perl
 #, perl-format
 msgid "'%s.final' contains the composed email.\n"
 msgstr "'%s.final' berisi email yang dibuat.\n"
 
-#: git-send-email.perl:484
+#: git-send-email.perl
 msgid "--dump-aliases incompatible with other options\n"
 msgstr "--dump-aliases tidak kompatibel dengan opsi yang lain\n"
 
-#: git-send-email.perl:561
+#: git-send-email.perl
 msgid ""
 "fatal: found configuration options for 'sendmail'\n"
 "git-send-email is configured with the sendemail.* options - note the 'e'.\n"
@@ -26153,11 +26470,11 @@ msgstr ""
 "Setel sendemail.forbidSendmailVariables ke false untuk menonaktifkan "
 "pemeriksaan ini.\n"
 
-#: git-send-email.perl:566 git-send-email.perl:782
+#: git-send-email.perl
 msgid "Cannot run git format-patch from outside a repository\n"
 msgstr "tidak dapat menjalankan git format-patch diluar repositori\n"
 
-#: git-send-email.perl:569
+#: git-send-email.perl
 msgid ""
 "`batch-size` and `relogin` must be specified together (via command-line or "
 "configuration option)\n"
@@ -26165,37 +26482,37 @@ msgstr ""
 "`batch-size` dan `relogin` harus disebutkan bersamaan (lewat baris perintah "
 "atau opsi konfigurasi)\n"
 
-#: git-send-email.perl:582
+#: git-send-email.perl
 #, perl-format
 msgid "Unknown --suppress-cc field: '%s'\n"
 msgstr "Bidang --suppress-cc tidak dikenal: '%s'\n"
 
-#: git-send-email.perl:613
+#: git-send-email.perl
 #, perl-format
 msgid "Unknown --confirm setting: '%s'\n"
 msgstr "Setelan --confirm tidak dikenal: '%s'\n"
 
-#: git-send-email.perl:653
+#: git-send-email.perl
 #, perl-format
 msgid "warning: sendmail alias with quotes is not supported: %s\n"
 msgstr "peringatan: alias sendmail dengan kutipan tidak didukung: %s\n"
 
-#: git-send-email.perl:655
+#: git-send-email.perl
 #, perl-format
 msgid "warning: `:include:` not supported: %s\n"
 msgstr "peringatan: `:include:` tidak didukung: %s\n"
 
-#: git-send-email.perl:657
+#: git-send-email.perl
 #, perl-format
 msgid "warning: `/file` or `|pipe` redirection not supported: %s\n"
 msgstr "peringatan: pengalihan `/file` atau `|pipe` tidak didukung: %s\n"
 
-#: git-send-email.perl:662
+#: git-send-email.perl
 #, perl-format
 msgid "warning: sendmail line is not recognized: %s\n"
 msgstr "peringatan: baris sendmail tidak dikenal: %s\n"
 
-#: git-send-email.perl:747
+#: git-send-email.perl
 #, perl-format
 msgid ""
 "File '%s' exists but it could also be the range of commits\n"
@@ -26210,12 +26527,12 @@ msgstr ""
 "    * Sebutkan \"./%s\" jika maksud Anda sebuah berkas; atau\n"
 "    * Berikan opsi --format-patch jika maksud Anda sebuah rentang.\n"
 
-#: git-send-email.perl:768
+#: git-send-email.perl
 #, perl-format
 msgid "Failed to opendir %s: %s"
 msgstr "Gagal membuka direktori %s: %s"
 
-#: git-send-email.perl:803
+#: git-send-email.perl
 msgid ""
 "\n"
 "No patch files specified!\n"
@@ -26225,17 +26542,17 @@ msgstr ""
 "Tidak ada berkas tambalan yang disebutkan!\n"
 "\n"
 
-#: git-send-email.perl:816
+#: git-send-email.perl
 #, perl-format
 msgid "No subject line in %s?"
 msgstr "Tidak ada baris subjek di %s?"
 
-#: git-send-email.perl:827
+#: git-send-email.perl
 #, perl-format
 msgid "Failed to open for writing %s: %s"
 msgstr "Gagal membuka untuk menulis %s: %s"
 
-#: git-send-email.perl:838
+#: git-send-email.perl
 msgid ""
 "Lines beginning in \"GIT:\" will be removed.\n"
 "Consider including an overall diffstat or table of contents\n"
@@ -26249,38 +26566,38 @@ msgstr ""
 "\n"
 "Bersihkan konten badan jika Anda tidak ingin mengirimkan rangkuman.\n"
 
-#: git-send-email.perl:862
+#: git-send-email.perl
 #, perl-format
 msgid "Failed to open %s: %s"
 msgstr "Gagal membuka %s: %s"
 
-#: git-send-email.perl:879
+#: git-send-email.perl
 #, perl-format
 msgid "Failed to open %s.final: %s"
 msgstr "Gagal membuka %s.final: %s"
 
-#: git-send-email.perl:922
+#: git-send-email.perl
 msgid "Summary email is empty, skipping it\n"
 msgstr "Surel rangkuman kosong, lewati\n"
 
 #. TRANSLATORS: please keep [y/N] as is.
-#: git-send-email.perl:971
+#: git-send-email.perl
 #, perl-format
 msgid "Are you sure you want to use <%s> [y/N]? "
 msgstr "Anda yakin ingin menggunakan <%s> [y/N]? "
 
-#: git-send-email.perl:1026
+#: git-send-email.perl
 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:1031
+#: git-send-email.perl
 msgid "Which 8bit encoding should I declare [UTF-8]? "
 msgstr "Pengkodean 8bit apa yang harus saya sebut [UTF-8]? "
 
-#: git-send-email.perl:1039
+#: git-send-email.perl
 #, perl-format
 msgid ""
 "Refusing to send because the patch\n"
@@ -26293,22 +26610,22 @@ msgstr ""
 "punya subjek templat '*** SUBJECT HERE ***'. Lewatkan --force jika Anda "
 "benar-benar ingin mengirim.\n"
 
-#: git-send-email.perl:1058
+#: git-send-email.perl
 msgid "To whom should the emails be sent (if anyone)?"
 msgstr "Kepada siapa surel harus dikirim (jika ada)?"
 
-#: git-send-email.perl:1076
+#: git-send-email.perl
 #, perl-format
 msgid "fatal: alias '%s' expands to itself\n"
 msgstr "fatal: alias '%s' diperluas ke dirinya sendiri\n"
 
-#: git-send-email.perl:1088
+#: git-send-email.perl
 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:1150 git-send-email.perl:1158
+#: git-send-email.perl
 #, perl-format
 msgid "error: unable to extract a valid address from: %s\n"
 msgstr "kesalahan: tidak dapat mengekstrak alamat yang valid dari: %s\n"
@@ -26316,17 +26633,17 @@ 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
 #. at this point.
-#: git-send-email.perl:1162
+#: git-send-email.perl
 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:1482
+#: git-send-email.perl
 #, perl-format
 msgid "CA path \"%s\" does not exist"
 msgstr "Jalur CA \"%s\" tidak ada"
 
-#: git-send-email.perl:1565
+#: git-send-email.perl
 msgid ""
 "    The Cc list above has been expanded by additional\n"
 "    addresses found in the patch commit message. By default\n"
@@ -26351,114 +26668,114 @@ msgstr ""
 #. 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:1580
+#: git-send-email.perl
 msgid "Send this email? ([y]es|[n]o|[e]dit|[q]uit|[a]ll): "
 msgstr "Kirim surel ini? ([y]a|[n] tidak|[e] sunting|[q] keluar|semu[a]): "
 
-#: git-send-email.perl:1583
+#: git-send-email.perl
 msgid "Send this email reply required"
 msgstr "Balasan kirim surel ini diperlukan"
 
-#: git-send-email.perl:1617
+#: git-send-email.perl
 msgid "The required SMTP server is not properly defined."
 msgstr "Peladen SMTP yang diperlukan tidak dijelaskan dengan baik."
 
-#: git-send-email.perl:1664
+#: git-send-email.perl
 #, perl-format
 msgid "Server does not support STARTTLS! %s"
 msgstr "Peladen tidak mendukung STARTTLS! %s"
 
-#: git-send-email.perl:1669 git-send-email.perl:1673
+#: git-send-email.perl
 #, perl-format
 msgid "STARTTLS failed! %s"
 msgstr "STARTTLS gagal! %s"
 
-#: git-send-email.perl:1682
+#: git-send-email.perl
 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:1700
+#: git-send-email.perl
 #, perl-format
 msgid "Failed to send %s\n"
 msgstr "Gagal mengirim %s\n"
 
-#: git-send-email.perl:1703
+#: git-send-email.perl
 #, perl-format
 msgid "Dry-Sent %s\n"
 msgstr "Terkirim-kering %s\n"
 
-#: git-send-email.perl:1703
+#: git-send-email.perl
 #, perl-format
 msgid "Sent %s\n"
 msgstr "Terkirim %s\n"
 
-#: git-send-email.perl:1705
+#: git-send-email.perl
 msgid "Dry-OK. Log says:\n"
 msgstr "OK-kering. Log berkata:\n"
 
-#: git-send-email.perl:1705
+#: git-send-email.perl
 msgid "OK. Log says:\n"
 msgstr "OK. Log berkata:\n"
 
-#: git-send-email.perl:1724
+#: git-send-email.perl
 msgid "Result: "
 msgstr "Hasil: "
 
-#: git-send-email.perl:1727
+#: git-send-email.perl
 msgid "Result: OK\n"
 msgstr "Hasil: OK\n"
 
-#: git-send-email.perl:1744
+#: git-send-email.perl
 #, perl-format
 msgid "can't open file %s"
 msgstr "tidak dapat membuka berkas %s"
 
-#: git-send-email.perl:1792 git-send-email.perl:1812
+#: git-send-email.perl
 #, perl-format
 msgid "(mbox) Adding cc: %s from line '%s'\n"
 msgstr "(mbox) Menambahkan cc: %s dari baris '%s'\n"
 
-#: git-send-email.perl:1798
+#: git-send-email.perl
 #, perl-format
 msgid "(mbox) Adding to: %s from line '%s'\n"
 msgstr "(mbox) Menambahkan to: %s dari baris '%s'\n"
 
-#: git-send-email.perl:1855
+#: git-send-email.perl
 #, perl-format
 msgid "(non-mbox) Adding cc: %s from line '%s'\n"
 msgstr "(non-mbox) Menambahkan cc: %s dari baris '%s'\n"
 
-#: git-send-email.perl:1890
+#: git-send-email.perl
 #, perl-format
 msgid "(body) Adding cc: %s from line '%s'\n"
 msgstr "(body) Menambahkan cc: %s dari baris '%s'\n"
 
-#: git-send-email.perl:2009
+#: git-send-email.perl
 #, perl-format
 msgid "(%s) Could not execute '%s'"
 msgstr "(%s) Tidak dapat menjalankan '%s'"
 
-#: git-send-email.perl:2016
+#: git-send-email.perl
 #, perl-format
 msgid "(%s) Adding %s: %s from: '%s'\n"
 msgstr "(%s) Menambahkan %s: %s dari: '%s'\n"
 
-#: git-send-email.perl:2020
+#: git-send-email.perl
 #, perl-format
 msgid "(%s) failed to close pipe to '%s'"
 msgstr "(%s) gagal menutup pipa ke '%s'"
 
-#: git-send-email.perl:2050
+#: git-send-email.perl
 msgid "cannot send message as 7bit"
 msgstr "tidak dapat mengirim pesan sebagai 7bit"
 
-#: git-send-email.perl:2058
+#: git-send-email.perl
 msgid "invalid transfer encoding"
 msgstr "pengkodean transfer tidak valid"
 
-#: git-send-email.perl:2100
+#: git-send-email.perl
 #, perl-format
 msgid ""
 "fatal: %s: rejected by %s hook\n"
@@ -26469,12 +26786,12 @@ msgstr ""
 "%s\n"
 "peringatan: tidak ada tambalan yang dikirimkan\n"
 
-#: git-send-email.perl:2110 git-send-email.perl:2163 git-send-email.perl:2173
+#: git-send-email.perl
 #, perl-format
 msgid "unable to open %s: %s\n"
 msgstr "tidak dapat membuka %s: %s\n"
 
-#: git-send-email.perl:2113
+#: git-send-email.perl
 #, perl-format
 msgid ""
 "fatal: %s:%d is longer than 998 characters\n"
@@ -26483,13 +26800,13 @@ msgstr ""
 "fatal: %s:%d lebih panjang dari 998 karakter\n"
 "peringatan: tidak ada tambalan yang dikirimkan\n"
 
-#: git-send-email.perl:2131
+#: git-send-email.perl
 #, perl-format
 msgid "Skipping %s with backup suffix '%s'.\n"
 msgstr "Melewati %s dengan akhiran cadangan '%s'.\n"
 
 #. TRANSLATORS: please keep "[y|N]" as is.
-#: git-send-email.perl:2135
+#: git-send-email.perl
 #, perl-format
 msgid "Do you really want to send %s? [y|N]: "
 msgstr "Anda benar-benar ingin mengirim %s? [y|N]: "
diff --git a/po/ru.po b/po/ru.po
index 993d106f1f..803208c4d5 100644
--- a/po/ru.po
+++ b/po/ru.po
@@ -1,69 +1,58 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
-# This file is distributed under the same license as the PACKAGE package.
-# 
+# This file is distributed under the same license as the Git package.
+#
 # Translators:
 # Alexander Golubev <fatzer2@gmail.com>, 2020
-# Dimitriy Ryazantcev <DJm00n@mail.ru>, 2014-2021
-# Mike Manturov, 2014
-# Mike Manturov, 2014
-# Sergey Alyoshin <alyoshin.s@gmail.com>, 2020
-# Sergey Kuznetsov <votkinsk@gmail.com>, 2021
+# Dimitriy Ryazantcev <DJm00n@mail.ru>, 2014-2022
+# insolor, 2014
+# insolor, 2014
+# Sergey Alyoshin <alyoshin.s@gmail.com>, 2020-2021
+# Sergey Kuznetsov <votkinsk@gmail.com>, 2021-2022
 # Чук Таблицоменделеев <aurum444an@gmail.com>, 2019
 msgid ""
 msgstr ""
 "Project-Id-Version: Git Russian Localization Project\n"
 "Report-Msgid-Bugs-To: Git Mailing List <git@vger.kernel.org>\n"
-"POT-Creation-Date: 2020-12-21 07:10+0800\n"
-"PO-Revision-Date: 2021-01-29 19:33+0000\n"
-"Last-Translator: Dimitriy Ryazantcev <DJm00n@mail.ru>\n"
-"Language-Team: Russian (http://www.transifex.com/djm00n/git-po-ru/language/ru/)\n"
+"POT-Creation-Date: 2022-06-26 20:30+0800\n"
+"PO-Revision-Date: 2014-02-18 23:30+0000\n"
+"Last-Translator: Dimitriy Ryazantcev <DJm00n@mail.ru>, 2014-2022\n"
+"Language-Team: Russian (http://www.transifex.com/djm00n/git-po-ru/language/"
+"ru/)\n"
+"Language: ru\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: ru\n"
-"Plural-Forms: nplurals=4; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<12 || n%100>14) ? 1 : n%10==0 || (n%10>=5 && n%10<=9) || (n%100>=11 && n%100<=14)? 2 : 3);\n"
+"Plural-Forms: nplurals=4; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n"
+"%10<=4 && (n%100<12 || n%100>14) ? 1 : n%10==0 || (n%10>=5 && n%10<=9) || (n"
+"%100>=11 && n%100<=14)? 2 : 3);\n"
 
-#: add-interactive.c:376
 #, c-format
 msgid "Huh (%s)?"
 msgstr "Хм (%s)?"
 
-#: add-interactive.c:529 add-interactive.c:830 reset.c:65 sequencer.c:3284
-#: sequencer.c:3735 sequencer.c:3890 builtin/rebase.c:1532
-#: builtin/rebase.c:1955
 msgid "could not read index"
 msgstr "не удалось прочитать индекс"
 
-#: add-interactive.c:584 git-add--interactive.perl:269
-#: git-add--interactive.perl:294
 msgid "binary"
 msgstr "двоичный"
 
-#: add-interactive.c:642 git-add--interactive.perl:278
-#: git-add--interactive.perl:332
 msgid "nothing"
 msgstr "ничего"
 
-#: add-interactive.c:643 git-add--interactive.perl:314
-#: git-add--interactive.perl:329
 msgid "unchanged"
 msgstr "нет изменений"
 
-#: add-interactive.c:680 git-add--interactive.perl:641
 msgid "Update"
 msgstr "Обновить"
 
-#: add-interactive.c:697 add-interactive.c:885
 #, c-format
 msgid "could not stage '%s'"
 msgstr " не удалось проиндексировать «%s»"
 
-#: add-interactive.c:703 add-interactive.c:892 reset.c:89 sequencer.c:3478
 msgid "could not write index"
 msgstr "не удалось записать индекс"
 
-#: add-interactive.c:706 git-add--interactive.perl:626
 #, c-format, perl-format
 msgid "updated %d path\n"
 msgid_plural "updated %d paths\n"
@@ -72,26 +61,20 @@ msgstr[1] "обновлено %d пути\n"
 msgstr[2] "обновлено %d путей\n"
 msgstr[3] "обновлено %d пути\n"
 
-#: add-interactive.c:724 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:4125 builtin/checkout.c:295
-#: builtin/reset.c:145
 #, c-format
 msgid "make_cache_entry failed for path '%s'"
 msgstr "сбой make_cache_entry для пути «%s»"
 
-#: add-interactive.c:759 git-add--interactive.perl:653
 msgid "Revert"
 msgstr "Обратить изменения"
 
-#: add-interactive.c:775
 msgid "Could not parse HEAD^{tree}"
 msgstr "Не удалось разобрать HEAD^{tree}"
 
-#: add-interactive.c:813 git-add--interactive.perl:629
 #, c-format, perl-format
 msgid "reverted %d path\n"
 msgid_plural "reverted %d paths\n"
@@ -100,16 +83,13 @@ msgstr[1] "обращены изменения %d путей\n"
 msgstr[2] "обращены изменения %d путей\n"
 msgstr[3] "обращены изменения %d путей\n"
 
-#: add-interactive.c:864 git-add--interactive.perl:693
 #, c-format
 msgid "No untracked files.\n"
 msgstr "Нет неотслеживаемых файлов.\n"
 
-#: add-interactive.c:868 git-add--interactive.perl:687
 msgid "Add untracked"
 msgstr "Добавить неотслеживаемый"
 
-#: add-interactive.c:895 git-add--interactive.perl:623
 #, c-format, perl-format
 msgid "added %d path\n"
 msgid_plural "added %d paths\n"
@@ -118,155 +98,119 @@ msgstr[1] "добавлено %d пути\n"
 msgstr[2] "добавлено %d путей\n"
 msgstr[3] "добавлено %d пути\n"
 
-#: add-interactive.c:925
 #, c-format
 msgid "ignoring unmerged: %s"
-msgstr "игнорирую не слитое: %s"
+msgstr "игнорирую неслитое: %s"
 
-#: add-interactive.c:937 add-patch.c:1751 git-add--interactive.perl:1369
 #, c-format
 msgid "Only binary files changed.\n"
 msgstr "Только изменения двоичных файлов.\n"
 
-#: add-interactive.c:939 add-patch.c:1749 git-add--interactive.perl:1371
 #, c-format
 msgid "No changes.\n"
 msgstr "Нет изменений.\n"
 
-#: add-interactive.c:943 git-add--interactive.perl:1379
 msgid "Patch update"
 msgstr "Обновление патча"
 
-#: add-interactive.c:982 git-add--interactive.perl:1792
 msgid "Review diff"
 msgstr "Просмотреть список изменений"
 
-#: add-interactive.c:1010
 msgid "show paths with changes"
 msgstr "показать пути с изменениями"
 
-#: add-interactive.c:1012
 msgid "add working tree state to the staged set of changes"
-msgstr "добавить содержимое рабочего каталога к списку проиндексированных изменений"
+msgstr "проиндексировать изменения рабочей копии"
 
-#: add-interactive.c:1014
 msgid "revert staged set of changes back to the HEAD version"
 msgstr "вернуть проиндексированные изменения назад к HEAD-версии"
 
-#: add-interactive.c:1016
 msgid "pick hunks and update selectively"
-msgstr "выбрать отдельные блоки изменений и обновить выборочно"
+msgstr "отобрать блоки изменений и выборочно обновить"
 
-#: add-interactive.c:1018
 msgid "view diff between HEAD and index"
 msgstr "просмотреть список изменений между HEAD и индексом"
 
-#: add-interactive.c:1020
 msgid "add contents of untracked files to the staged set of changes"
-msgstr "добавить содержимое неотслеживаемых файлов к списку проиндексированных изменений"
+msgstr ""
+"добавить содержимое неотслеживаемых файлов к списку проиндексированных "
+"изменений"
 
-#: add-interactive.c:1028 add-interactive.c:1077
 msgid "Prompt help:"
 msgstr "Справка:"
 
-#: add-interactive.c:1030
 msgid "select a single item"
 msgstr "выбрать один элемент"
 
-#: add-interactive.c:1032
 msgid "select a range of items"
 msgstr "выбрать диапазон элементов"
 
-#: add-interactive.c:1034
 msgid "select multiple ranges"
 msgstr "выбрать несколько диапазонов"
 
-#: add-interactive.c:1036 add-interactive.c:1081
 msgid "select item based on unique prefix"
 msgstr "выбрать элемент на основе уникального префикса"
 
-#: add-interactive.c:1038
 msgid "unselect specified items"
 msgstr "убрать выбор указанных элементов"
 
-#: add-interactive.c:1040
 msgid "choose all items"
 msgstr "выбрать все элементы"
 
-#: add-interactive.c:1042
 msgid "(empty) finish selecting"
 msgstr "(пусто) закончить выбор"
 
-#: add-interactive.c:1079
 msgid "select a numbered item"
 msgstr "выбрать элемент по номеру"
 
-#: add-interactive.c:1083
 msgid "(empty) select nothing"
 msgstr "(пусто) ничего не выбирать"
 
-#: add-interactive.c:1091 builtin/clean.c:816 git-add--interactive.perl:1896
 msgid "*** Commands ***"
 msgstr "*** Команды ***"
 
-#: add-interactive.c:1092 builtin/clean.c:817 git-add--interactive.perl:1893
 msgid "What now"
 msgstr "Что теперь"
 
-#: add-interactive.c:1144 git-add--interactive.perl:213
 msgid "staged"
 msgstr "в индексе"
 
-#: add-interactive.c:1144 git-add--interactive.perl:213
 msgid "unstaged"
 msgstr "не в индексе"
 
-#: 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:147 builtin/merge.c:284 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
-#: git-add--interactive.perl:213
 msgid "path"
 msgstr "путь"
 
-#: add-interactive.c:1151
 msgid "could not refresh index"
 msgstr "не удалось обновить индекс"
 
-#: add-interactive.c:1165 builtin/clean.c:781 git-add--interactive.perl:1803
 #, c-format
 msgid "Bye.\n"
 msgstr "До свидания.\n"
 
-#: add-patch.c:34 git-add--interactive.perl:1431
 #, c-format, perl-format
 msgid "Stage mode change [y,n,q,a,d%s,?]? "
 msgstr "Проиндексировать изменение режима доступа [y,n,q,a,d%s,?]? "
 
-#: add-patch.c:35 git-add--interactive.perl:1432
 #, c-format, perl-format
 msgid "Stage deletion [y,n,q,a,d%s,?]? "
 msgstr "Проиндексировать удаление [y,n,q,a,d%s,?]? "
 
-#: add-patch.c:36 git-add--interactive.perl:1433
 #, c-format, perl-format
 msgid "Stage addition [y,n,q,a,d%s,?]? "
 msgstr "Добавить к индексу [y,n,q,a,d%s,?]?"
 
-#: add-patch.c:37 git-add--interactive.perl:1434
 #, c-format, perl-format
 msgid "Stage this hunk [y,n,q,a,d%s,?]? "
-msgstr "Проиндексировать этот блок изменений [y,n,q,a,d%s,?]? "
+msgstr "Индексировать этот блок [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 "При чистом наложении патча изменённая часть сразу будет отмечена для индексирования."
+"If the patch applies cleanly, the edited hunk will immediately be marked for "
+"staging."
+msgstr ""
+"При чистом наложении патча изменённая часть сразу будет отмечена для "
+"индексирования."
 
-#: add-patch.c:42
 msgid ""
 "y - stage this hunk\n"
 "n - do not stage this hunk\n"
@@ -274,34 +218,34 @@ msgid ""
 "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 - индексировать этот блок\n"
+"n - пропустить этот блок\n"
+"q - выход; пропустить этот и все оставшиеся блоки\n"
+"a - индексировать этот и остальные блоки файла\n"
+"d - пропустить этот и остальные блоки файла\n"
 
-#: add-patch.c:56 git-add--interactive.perl:1437
 #, c-format, perl-format
 msgid "Stash mode change [y,n,q,a,d%s,?]? "
 msgstr "Спрятать изменение режима доступа [y,n,q,a,d%s,?]? "
 
-#: add-patch.c:57 git-add--interactive.perl:1438
 #, c-format, perl-format
 msgid "Stash deletion [y,n,q,a,d%s,?]? "
 msgstr "Спрятать удаление файла [y,n,q,a,d%s,?]? "
 
-#: add-patch.c:58 git-add--interactive.perl:1439
 #, c-format, perl-format
 msgid "Stash addition [y,n,q,a,d%s,?]? "
 msgstr "Добавить к спрятанному [y,n,q,a,d%s,?]?"
 
-#: add-patch.c:59 git-add--interactive.perl:1440
 #, c-format, perl-format
 msgid "Stash this hunk [y,n,q,a,d%s,?]? "
-msgstr "Спрятать этот блок изменений [y,n,q,a,d%s,?]? "
+msgstr "Спрятать этот блок [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 "При чистом наложении патча изменённая часть сразу будет отмечена для скрытия."
+"If the patch applies cleanly, the edited hunk will immediately be marked for "
+"stashing."
+msgstr ""
+"При чистом наложении патча изменённая часть сразу будет отмечена для скрытия."
 
-#: add-patch.c:64
 msgid ""
 "y - stash this hunk\n"
 "n - do not stash this hunk\n"
@@ -309,34 +253,35 @@ msgid ""
 "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 - спрятать этот блок\n"
+"n - пропустить этот блок\n"
+"q - выход; пропустить этот и все последующие блоки\n"
+"a - спрятать этот и остальные блоки файла\n"
+"d - пропустить этот и остальные блоки файла\n"
 
-#: add-patch.c:80 git-add--interactive.perl:1443
 #, c-format, perl-format
 msgid "Unstage mode change [y,n,q,a,d%s,?]? "
 msgstr "Убрать изменения режима доступа из индекса [y,n,q,a,d%s,?]? "
 
-#: add-patch.c:81 git-add--interactive.perl:1444
 #, c-format, perl-format
 msgid "Unstage deletion [y,n,q,a,d%s,?]? "
 msgstr "Убрать удаление из индекса [y,n,q,a,d%s,?]? "
 
-#: add-patch.c:82 git-add--interactive.perl:1445
 #, c-format, perl-format
 msgid "Unstage addition [y,n,q,a,d%s,?]? "
 msgstr "Убрать из индекса [y,n,q,a,d%s,?]?"
 
-#: add-patch.c:83 git-add--interactive.perl:1446
 #, c-format, perl-format
 msgid "Unstage this hunk [y,n,q,a,d%s,?]? "
-msgstr "Убрать из индекса этот блок измений [y,n,q,a,d%s,?]? "
+msgstr "Убрать из индекса этот блок [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 "При чистом наложении патча изменённая часть сразу будет отмечена для удаления из индекса."
+"If the patch applies cleanly, the edited hunk will immediately be marked for "
+"unstaging."
+msgstr ""
+"При чистом наложении патча изменённая часть сразу будет отмечена для "
+"удаления из индекса."
 
-#: add-patch.c:88
 msgid ""
 "y - unstage this hunk\n"
 "n - do not unstage this hunk\n"
@@ -344,34 +289,35 @@ msgid ""
 "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 - убрать из индекса этот блок\n"
+"n - пропустить этот блок\n"
+"q - выход; пропустить этот и все последующие блоки\n"
+"a - убрать из индекса этот и остальные блоки файла\n"
+"d - пропустить этот и остальные блоки файла\n"
 
-#: add-patch.c:103 git-add--interactive.perl:1449
 #, c-format, perl-format
 msgid "Apply mode change to index [y,n,q,a,d%s,?]? "
 msgstr "Применить изменение режима доступа к индексу [y,n,q,a,d%s,?]? "
 
-#: add-patch.c:104 git-add--interactive.perl:1450
 #, c-format, perl-format
 msgid "Apply deletion to index [y,n,q,a,d%s,?]? "
 msgstr "Применить удаление к индексу [y,n,q,a,d%s,?]? "
 
-#: add-patch.c:105 git-add--interactive.perl:1451
 #, c-format, perl-format
 msgid "Apply addition to index [y,n,q,a,d%s,?]? "
 msgstr "Применить добавление к индексу [y,n,q,a,d%s,?]?"
 
-#: 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 "Применить этот блок к индексу [y,n,q,a,d%s,?]? "
+msgstr "Принять этот блок в индекс [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 "При чистом наложении патча изменённая часть сразу будет отмечена для применения."
+"If the patch applies cleanly, the edited hunk will immediately be marked for "
+"applying."
+msgstr ""
+"При чистом наложении патча изменённая часть сразу будет отмечена для "
+"применения."
 
-#: add-patch.c:111
 msgid ""
 "y - apply this hunk to index\n"
 "n - do not apply this hunk to index\n"
@@ -379,38 +325,34 @@ msgid ""
 "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 - принять этот блок в индекс\n"
+"n - пропустить этот блок\n"
+"q - выход; пропустить этот и все последующие блоки\n"
+"a - принять этот и остальные блоки файла\n"
+"d - пропустить этот и остальные блоки файла\n"
 
-#: add-patch.c:126 git-add--interactive.perl:1455
-#: git-add--interactive.perl:1473
 #, c-format, perl-format
 msgid "Discard mode change from worktree [y,n,q,a,d%s,?]? "
 msgstr "Отменить изменения режима доступа в рабочем каталоге [y,n,q,a,d%s,?]? "
 
-#: add-patch.c:127 git-add--interactive.perl:1456
-#: git-add--interactive.perl:1474
 #, c-format, perl-format
 msgid "Discard deletion from worktree [y,n,q,a,d%s,?]? "
 msgstr "Отменить удаление в рабочем каталоге [y,n,q,a,d%s,?]? "
 
-#: add-patch.c:128 git-add--interactive.perl:1457
-#: git-add--interactive.perl:1475
 #, c-format, perl-format
 msgid "Discard addition from worktree [y,n,q,a,d%s,?]? "
 msgstr "Отменить добавления из рабочего каталога [y,n,q,a,d%s,?]?"
 
-#: add-patch.c:129 git-add--interactive.perl:1458
-#: git-add--interactive.perl:1476
 #, c-format, perl-format
 msgid "Discard this hunk from worktree [y,n,q,a,d%s,?]? "
-msgstr "Отменить изменения этого блока в рабочем каталоге [y,n,q,a,d%s,?]? "
+msgstr "Отбросить этот блок из рабочего дерева [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 "При чистом наложении патча изменённая часть сразу будет отмечена для отмены."
+"If the patch applies cleanly, the edited hunk will immediately be marked for "
+"discarding."
+msgstr ""
+"При чистом наложении патча изменённая часть сразу будет отмечена для отмены."
 
-#: add-patch.c:134 add-patch.c:202
 msgid ""
 "y - discard this hunk from worktree\n"
 "n - do not discard this hunk from worktree\n"
@@ -418,28 +360,30 @@ msgid ""
 "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 - отбросить этот блок из рабочего дерева\n"
+"n - пропустить этот блок\n"
+"q - выход; пропустить этот и все последующие блоки\n"
+"a - отбросить этот и остальные блоки файла\n"
+"d - пропустить этот и остальные блоки файла\n"
 
-#: add-patch.c:149 add-patch.c:194 git-add--interactive.perl:1461
 #, c-format, perl-format
 msgid "Discard mode change from index and worktree [y,n,q,a,d%s,?]? "
-msgstr "Отменить изменения режима доступа в индексе и рабочем каталоге [y,n,q,a,d%s,?]? "
+msgstr ""
+"Отменить изменения режима доступа в индексе и рабочем каталоге [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 "Отменить удаление в индексе и рабочем каталоге [y,n,q,a,d%s,?]? "
 
-#: add-patch.c:151 add-patch.c:196 git-add--interactive.perl:1463
 #, c-format, perl-format
 msgid "Discard addition from index and worktree [y,n,q,a,d%s,?]? "
-msgstr ""
+msgstr "Отменить добавление в индекс и рабочий каталог [y,n,q,a,d%s,?]? "
 
-#: 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 "Отменить изменения этого блока в индексе и рабочем каталоге [y,n,q,a,d%s,?]? "
+msgstr "Отбросить этот блок из индекса рабочего дерева [y,n,q,a,d%s,?]? "
 
-#: add-patch.c:157
 msgid ""
 "y - discard this hunk from index and worktree\n"
 "n - do not discard this hunk from index and worktree\n"
@@ -447,28 +391,30 @@ msgid ""
 "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 - отбросить этот блок из рабочего дерева\n"
+"n - пропустить этот блок\n"
+"q - выход; пропустить этот и все последующие блоки\n"
+"a - отбросить этот и остальные блоки файла\n"
+"d - пропустить этот и остальные блоки файла\n"
 
-#: add-patch.c:171 add-patch.c:216 git-add--interactive.perl:1467
 #, c-format, perl-format
 msgid "Apply mode change to index and worktree [y,n,q,a,d%s,?]? "
-msgstr "Применить изменения режима доступа к индексу и рабочему каталогу [y,n,q,a,d%s,?]? "
+msgstr ""
+"Применить изменения режима доступа к индексу и рабочему каталогу [y,n,q,a,d"
+"%s,?]? "
 
-#: 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 "Применить удаление к индексу и рабочему каталогу [y,n,q,a,d%s,?]? "
 
-#: add-patch.c:173 add-patch.c:218 git-add--interactive.perl:1469
 #, c-format, perl-format
 msgid "Apply addition to index and worktree [y,n,q,a,d%s,?]? "
-msgstr ""
+msgstr "Применить добавление к индексу и рабочему каталогу [y,n,q,a,d%s,?]? "
 
-#: 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 "Применить изменения этого блока к индексу и рабочему каталогу [y,n,q,a,d%s,?]? "
+msgstr "Принять этот блок в индекс и рабочий каталог [y,n,q,a,d%s,?]? "
 
-#: add-patch.c:179
 msgid ""
 "y - apply this hunk to index and worktree\n"
 "n - do not apply this hunk to index and worktree\n"
@@ -476,8 +422,12 @@ msgid ""
 "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 - принять этот блок в индекс и рабочее дерево\n"
+"n - пропустить этот блок\n"
+"q - выход; пропустить этот и все последующие блоки\n"
+"a - принять этот и остальные блоки файла\n"
+"d - пропустить этот и остальные блоки файла\n"
 
-#: add-patch.c:224
 msgid ""
 "y - apply this hunk to worktree\n"
 "n - do not apply this hunk to worktree\n"
@@ -485,115 +435,122 @@ msgid ""
 "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 - принять этот блок в рабочее дерево\n"
+"n - пропустить этот блок\n"
+"q - выход; пропустить этот и все последующие блоки\n"
+"a - принять этот и остальные блоки файла\n"
+"d - пропустить этот и остальные блоки файла\n"
 
-#: add-patch.c:342
 #, c-format
 msgid "could not parse hunk header '%.*s'"
 msgstr "не удалось разобрать заголовок блока изменений «%.*s»"
 
-#: add-patch.c:361 add-patch.c:365
 #, c-format
 msgid "could not parse colored hunk header '%.*s'"
 msgstr "не удалось разобрать цветной заголовок блока изменений «%.*s»"
 
-#: add-patch.c:419
 msgid "could not parse diff"
 msgstr "не удалось разобрать список изменений (diff)"
 
-#: add-patch.c:438
 msgid "could not parse colored diff"
 msgstr "не удалось разобрать цветной список изменений (diff)"
 
-#: add-patch.c:452
 #, c-format
 msgid "failed to run '%s'"
 msgstr ""
 
-#: add-patch.c:611
 msgid "mismatched output from interactive.diffFilter"
 msgstr ""
 
-#: add-patch.c:612
 msgid ""
 "Your filter must maintain a one-to-one correspondence\n"
 "between its input and output lines."
 msgstr ""
 
-#: add-patch.c:790
 #, c-format
 msgid ""
 "expected context line #%d in\n"
 "%.*s"
-msgstr "на %d строке ожидалась информация о контексте\n%.*s"
+msgstr ""
+"на %d строке ожидалась информация о контексте\n"
+"%.*s"
 
-#: add-patch.c:805
 #, c-format
 msgid ""
 "hunks do not overlap:\n"
 "%.*s\n"
 "\tdoes not end with:\n"
 "%.*s"
-msgstr "блоки изменений не пересекаются:\n%.*s\n\tне заканчивается на:\n%.*s"
+msgstr ""
+"блоки изменений не пересекаются:\n"
+"%.*s\n"
+"\tне заканчивается на:\n"
+"%.*s"
 
-#: add-patch.c:1081 git-add--interactive.perl:1115
 msgid "Manual hunk edit mode -- see bottom for a quick guide.\n"
-msgstr "Ручной режим редактирования блока изменений — смотрите ниже для небольшого руководства.\n"
+msgstr ""
+"Ручной режим редактирования блока изменений — смотрите ниже для небольшого "
+"руководства.\n"
 
-#: add-patch.c:1085
 #, c-format
 msgid ""
 "---\n"
 "To remove '%c' lines, make them ' ' lines (context).\n"
 "To remove '%c' lines, delete them.\n"
 "Lines starting with %c will be removed.\n"
-msgstr "---\nЧтобы убрать «%c»-строки, сделайте их ' '-строками (контекстными).\nЧтобы убрать «%c»-строки, удалите их.\nСтроки, начинающиеся с %cбудут удалены.\n"
+msgstr ""
+"---\n"
+"Чтобы убрать «%c»-строки, сделайте их ' '-строками (контекстными).\n"
+"Чтобы убрать «%c»-строки, удалите их.\n"
+"Строки, начинающиеся с %cбудут удалены.\n"
 
+#. #-#-#-#-#  git-add--interactive.perl.po  #-#-#-#-#
 #. TRANSLATORS: 'it' refers to the patch mentioned in the previous messages.
-#: add-patch.c:1099 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"
 "aborted and the hunk is left unchanged.\n"
-msgstr "Если патч не применяется без ошибок, вам будет дана\nвозможность изменить его снова. Если все строки блока\nизменений удалены, то редактирование будет отменено\nи блок останется без изменений.\n"
+msgstr ""
+"Если патч не применяется без ошибок, вам будет дана\n"
+"возможность изменить его снова. Если все строки блока\n"
+"изменений удалены, то редактирование будет отменено\n"
+"и блок останется без изменений.\n"
 
-#: add-patch.c:1132
 msgid "could not parse hunk header"
 msgstr ""
 
-#: add-patch.c:1177
 msgid "'git apply --cached' failed"
 msgstr ""
 
+#. #-#-#-#-#  add-patch.c.po  #-#-#-#-#
 #. 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.
+#.
+#. #-#-#-#-#  git-add--interactive.perl.po  #-#-#-#-#
 #. 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
 msgid ""
-"Your edited hunk does not apply. Edit again (saying \"no\" discards!) [y/n]?"
-" "
-msgstr "Изменённый вами блок не применяется. Редактировать снова (ответ «y» означает «нет»!) [y/n]? "
+"Your edited hunk does not apply. Edit again (saying \"no\" discards!) [y/n]? "
+msgstr ""
+"Изменённый вами блок не применяется. Редактировать снова (ответ «y» означает "
+"«нет»!) [y/n]? "
 
-#: add-patch.c:1289
 msgid "The selected hunks do not apply to the index!"
 msgstr ""
 
-#: add-patch.c:1290 git-add--interactive.perl:1346
 msgid "Apply them to the worktree anyway? "
 msgstr "Все равно применить их к рабочему каталогу? "
 
-#: add-patch.c:1297 git-add--interactive.perl:1349
 msgid "Nothing was applied.\n"
 msgstr "Ничего не применено.\n"
 
-#: add-patch.c:1354
 msgid ""
 "j - leave this hunk undecided, see next undecided hunk\n"
 "J - leave this hunk undecided, see next hunk\n"
@@ -606,32 +563,25 @@ msgid ""
 "? - print help\n"
 msgstr ""
 
-#: add-patch.c:1516 add-patch.c:1526
 msgid "No previous hunk"
 msgstr ""
 
-#: add-patch.c:1521 add-patch.c:1531
 msgid "No next hunk"
 msgstr ""
 
-#: add-patch.c:1537
 msgid "No other hunks to goto"
 msgstr ""
 
-#: add-patch.c:1548 git-add--interactive.perl:1606
 msgid "go to which hunk (<ret> to see more)? "
 msgstr "на какой блок перейти (нажмите <ввод> чтобы увидеть еще)? "
 
-#: add-patch.c:1549 git-add--interactive.perl:1608
 msgid "go to which hunk? "
 msgstr "на какой блок перейти? "
 
-#: add-patch.c:1560
 #, c-format
 msgid "Invalid number: '%s'"
 msgstr ""
 
-#: add-patch.c:1565
 #, c-format
 msgid "Sorry, only %d hunk available."
 msgid_plural "Sorry, only %d hunks available."
@@ -640,100 +590,98 @@ msgstr[1] ""
 msgstr[2] ""
 msgstr[3] ""
 
-#: add-patch.c:1574
 msgid "No other hunks to search"
 msgstr ""
 
-#: add-patch.c:1580 git-add--interactive.perl:1661
 msgid "search for regex? "
 msgstr "искать с помощью регулярного выражения? "
 
-#: add-patch.c:1595
 #, c-format
 msgid "Malformed search regexp %s: %s"
 msgstr ""
 
-#: add-patch.c:1612
 msgid "No hunk matches the given pattern"
 msgstr ""
 
-#: add-patch.c:1619
 msgid "Sorry, cannot split this hunk"
 msgstr ""
 
-#: add-patch.c:1623
 #, c-format
 msgid "Split into %d hunks."
 msgstr ""
 
-#: add-patch.c:1627
 msgid "Sorry, cannot edit this hunk"
 msgstr ""
 
-#: add-patch.c:1679
 msgid "'git apply' failed"
 msgstr ""
 
-#: advice.c:143
 #, c-format
 msgid ""
 "\n"
 "Disable this message with \"git config advice.%s false\""
 msgstr ""
 
-#: advice.c:159
 #, c-format
 msgid "%shint: %.*s%s\n"
 msgstr "%sподсказка: %.*s%s\n"
 
-#: advice.c:250
 msgid "Cherry-picking is not possible because you have unmerged files."
-msgstr "Невозможно выполнить копирование коммита в текущую ветку, так как у вас имеются не слитые файлы."
+msgstr ""
+"Невозможно выполнить копирование коммита в текущую ветку, так как у вас "
+"имеются не слитые файлы."
 
-#: advice.c:252
 msgid "Committing is not possible because you have unmerged files."
 msgstr "Невозможно закоммитить, так как у вас имеются не слитые файлы."
 
-#: advice.c:254
 msgid "Merging is not possible because you have unmerged files."
 msgstr "Невозможно выполнить слияние, так как у вас имеются не слитые файлы."
 
-#: advice.c:256
 msgid "Pulling is not possible because you have unmerged files."
 msgstr "Невозможно выполнить получение, так как у вас имеются не слитые файлы."
 
-#: advice.c:258
 msgid "Reverting is not possible because you have unmerged files."
 msgstr "Невозможно обратить изменения, так как у вас имеются не слитые файлы."
 
-#: advice.c:260
 #, c-format
 msgid "It is not possible to %s because you have unmerged files."
 msgstr "Невозможно выполнить %s, так как у вас имеются не слитые файлы."
 
-#: advice.c:268
 msgid ""
 "Fix them up in the work tree, and then use 'git add/rm <file>'\n"
 "as appropriate to mark resolution and make a commit."
-msgstr "Исправьте их в рабочем каталоге, затем запустите «git add/rm <файл>»,\nчтобы пометить исправление и сделайте коммит."
+msgstr ""
+"Исправьте их в рабочем каталоге, затем запустите «git add/rm <файл>»,\n"
+"чтобы пометить исправление и сделайте коммит."
 
-#: advice.c:276
 msgid "Exiting because of an unresolved conflict."
 msgstr "Выход из-за неразрешенного конфликта."
 
-#: advice.c:281 builtin/merge.c:1369
 msgid "You have not concluded your merge (MERGE_HEAD exists)."
 msgstr "Вы не завершили слияние (присутствует файл MERGE_HEAD)."
 
-#: advice.c:283
 msgid "Please, commit your changes before merging."
 msgstr "Перед слиянием, выполните коммит ваших изменений."
 
-#: advice.c:284
 msgid "Exiting because of unfinished merge."
 msgstr "Выход из-за незавершенного слияния."
 
-#: advice.c:290
+msgid "Not possible to fast-forward, aborting."
+msgstr "Быстрая перемотка невозможна, отменяем."
+
+#, 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 ""
+
+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 ""
+
 #, c-format
 msgid ""
 "Note: switching to '%s'.\n"
@@ -751,180 +699,170 @@ msgid ""
 "\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 ""
+"Примечание: переключение на «%s».\n"
+"\n"
+"Вы сейчас в состоянии «отсоединённого указателя HEAD». Можете осмотреться,\n"
+"внести экспериментальные изменения и зафиксировать их, также можете\n"
+"отменить любые коммиты, созданные в этом состоянии, не затрагивая другие\n"
+"ветки, переключившись обратно на любую ветку.\n"
+"\n"
+"Если хотите создать новую ветку для сохранения созданных коммитов, можете\n"
+"сделать это (сейчас или позже), используя команду switch с параметром -c.\n"
+"Например:\n"
+"\n"
+"  git switch -c <новая-ветка>\n"
+"\n"
+"Или отмените эту операцию с помощью:\n"
+"\n"
+"  git switch -\n"
+"\n"
+"Отключите этот совет, установив переменную конфигурации\n"
+"advice.detachedHead в значение false\n"
+"\n"
 
-#: alias.c:50
 msgid "cmdline ends with \\"
 msgstr "командная строка заканчивается символом \\"
 
-#: alias.c:51
 msgid "unclosed quote"
 msgstr "пропущена закрывающая кавычка"
 
-#: apply.c:69
 #, c-format
 msgid "unrecognized whitespace option '%s'"
 msgstr "неопознанная опция для пробелов «%s»"
 
-#: apply.c:85
 #, c-format
 msgid "unrecognized whitespace ignore option '%s'"
 msgstr "неопознанная опция для игнорирования пробелов «%s»"
 
-#: apply.c:135
-msgid "--reject and --3way cannot be used together."
-msgstr "--reject и --3way нельзя использовать одновременно."
-
-#: apply.c:137
-msgid "--cached and --3way cannot be used together."
-msgstr "--cached и --3way нельзя использовать одновременно."
-
-#: apply.c:140
-msgid "--3way outside a repository"
-msgstr "--3way вне репозитория"
-
-#: apply.c:151
-msgid "--index outside a repository"
-msgstr "--index вне репозитория"
+#, c-format
+msgid "options '%s' and '%s' cannot be used together"
+msgstr ""
 
-#: apply.c:154
-msgid "--cached outside a repository"
-msgstr "--cached вне репозитория"
+#, c-format
+msgid "'%s' outside a repository"
+msgstr ""
 
-#: apply.c:801
 #, c-format
 msgid "Cannot prepare timestamp regexp %s"
 msgstr "Не удалось подготовить регулярное выражение для метки времени %s"
 
-#: apply.c:810
 #, c-format
 msgid "regexec returned %d for input: %s"
 msgstr "regexec возвратил %d для ввода: %s"
 
-#: apply.c:884
 #, c-format
 msgid "unable to find filename in patch at line %d"
 msgstr "не удалось найти имя файла в строке патча %d"
 
-#: apply.c:922
 #, c-format
 msgid "git apply: bad git-diff - expected /dev/null, got %s on line %d"
-msgstr "git apply: плохой git-diff — ожидалось /dev/null, получено %s на строке %d"
+msgstr ""
+"git apply: плохой git-diff — ожидалось /dev/null, получено %s на строке %d"
 
-#: apply.c:928
 #, c-format
 msgid "git apply: bad git-diff - inconsistent new filename on line %d"
-msgstr "git apply: плохой git-diff — не согласующееся новое имя файла на строке %d"
+msgstr ""
+"git apply: плохой git-diff — не согласующееся новое имя файла на строке %d"
 
-#: apply.c:929
 #, c-format
 msgid "git apply: bad git-diff - inconsistent old filename on line %d"
-msgstr "git apply: плохой git-diff — не согласующееся старое имя файла на строке %d"
+msgstr ""
+"git apply: плохой git-diff — не согласующееся старое имя файла на строке %d"
 
-#: apply.c:934
 #, c-format
 msgid "git apply: bad git-diff - expected /dev/null on line %d"
 msgstr "git apply: плохой git-diff  — ожидалось /dev/null на строке %d"
 
-#: apply.c:963
 #, c-format
 msgid "invalid mode on line %d: %s"
 msgstr "недопустимый режим %d: %s"
 
-#: apply.c:1282
 #, c-format
 msgid "inconsistent header lines %d and %d"
 msgstr "противоречивые строки заголовка %d и %d"
 
-#: apply.c:1372
 #, 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)"
-msgstr[0] "заголовок git diff не нашел информацию об имени файла при удалении %d ведущего компонента пути к файлу (строка %d)"
-msgstr[1] "заголовок git diff не нашел информацию об имени файла при удалении %d ведущих компонент пути к файлу (строка %d)"
-msgstr[2] "заголовок git diff не нашел информацию об имени файла при удалении %d ведущих компонент пути к файлу (строка %d)"
-msgstr[3] "заголовок git diff не нашел информацию об имени файла при удалении %d ведущих компонент пути к файлу (строка %d)"
+"git diff header lacks filename information when removing %d leading pathname "
+"components (line %d)"
+msgstr[0] ""
+"заголовок git diff не нашел информацию об имени файла при удалении %d "
+"ведущего компонента пути к файлу (строка %d)"
+msgstr[1] ""
+"заголовок git diff не нашел информацию об имени файла при удалении %d "
+"ведущих компонент пути к файлу (строка %d)"
+msgstr[2] ""
+"заголовок git diff не нашел информацию об имени файла при удалении %d "
+"ведущих компонент пути к файлу (строка %d)"
+msgstr[3] ""
+"заголовок git diff не нашел информацию об имени файла при удалении %d "
+"ведущих компонент пути к файлу (строка %d)"
 
-#: apply.c:1385
 #, c-format
 msgid "git diff header lacks filename information (line %d)"
 msgstr "заголовок git diff не содержит информации об имени файла (строка %d)"
 
-#: apply.c:1481
 #, c-format
 msgid "recount: unexpected line: %.*s"
 msgstr "recount: не ожидаемая строка: %.*s"
 
-#: apply.c:1550
 #, c-format
 msgid "patch fragment without header at line %d: %.*s"
 msgstr "фрагмент изменений без заголовка на строке %d: %.*s"
 
-#: apply.c:1753
 msgid "new file depends on old contents"
 msgstr "новый файл зависит от старого содержимого"
 
-#: apply.c:1755
 msgid "deleted file still has contents"
 msgstr "удаленный файл все еще имеет содержимое"
 
-#: apply.c:1789
 #, c-format
 msgid "corrupt patch at line %d"
 msgstr "патч поврежден на строке %d"
 
-#: apply.c:1826
 #, c-format
 msgid "new file %s depends on old contents"
 msgstr "новый файл %s зависит от старого содержимого"
 
-#: apply.c:1828
 #, c-format
 msgid "deleted file %s still has contents"
 msgstr "удаленный файл %s все еще имеет содержимое"
 
-#: apply.c:1831
 #, c-format
 msgid "** warning: file %s becomes empty but is not deleted"
 msgstr "** предупреждение: файл %s становится пустым, но не удаляется"
 
-#: apply.c:1978
 #, c-format
 msgid "corrupt binary patch at line %d: %.*s"
 msgstr "поврежденный двоичный патч на строке %d: %.*s"
 
-#: apply.c:2015
 #, c-format
 msgid "unrecognized binary patch at line %d"
 msgstr "неопознанный двоичный патч на строке %d"
 
-#: apply.c:2177
 #, c-format
 msgid "patch with only garbage at line %d"
 msgstr "патч с мусором на строке %d"
 
-#: apply.c:2263
 #, c-format
 msgid "unable to read symlink %s"
 msgstr "не удалось прочитать символьную ссылку %s"
 
-#: apply.c:2267
 #, c-format
 msgid "unable to open or read %s"
 msgstr "не удалось открыть или прочесть %s"
 
-#: apply.c:2936
 #, c-format
 msgid "invalid start of line: '%c'"
 msgstr "неправильное начало строки: «%c»"
 
-#: apply.c:3057
 #, c-format
 msgid "Hunk #%d succeeded at %d (offset %d line)."
 msgid_plural "Hunk #%d succeeded at %d (offset %d lines)."
@@ -933,300 +871,257 @@ msgstr[1] "Часть #%d успешно применена на %d (со сдв
 msgstr[2] "Часть #%d успешно применена на %d (со сдвигом в %d строк)."
 msgstr[3] "Часть #%d успешно применена на %d (со сдвигом в %d строк)."
 
-#: apply.c:3069
 #, c-format
 msgid "Context reduced to (%ld/%ld) to apply fragment at %d"
 msgstr "Контекст сужен до (%ld/%ld), чтобы применить фрагмент на %d строке"
 
-#: apply.c:3075
 #, c-format
 msgid ""
 "while searching for:\n"
 "%.*s"
-msgstr "при поиске:\n%.*s"
+msgstr ""
+"при поиске:\n"
+"%.*s"
 
-#: apply.c:3097
 #, c-format
 msgid "missing binary patch data for '%s'"
 msgstr "пропущены данные двоичного патча для «%s»"
 
-#: apply.c:3105
 #, c-format
 msgid "cannot reverse-apply a binary patch without the reverse hunk to '%s'"
-msgstr "невозможно выполнить reverse-apply для двоичного патча, без обращения изменений блока «%s»"
+msgstr ""
+"невозможно выполнить reverse-apply для двоичного патча, без обращения "
+"изменений блока «%s»"
 
-#: apply.c:3152
 #, c-format
 msgid "cannot apply binary patch to '%s' without full index line"
-msgstr "невозможно применить двоичный патч «%s» без строки с указанной полной версией индекса"
+msgstr ""
+"невозможно применить двоичный патч «%s» без строки с указанной полной "
+"версией индекса"
 
-#: apply.c:3163
 #, c-format
 msgid ""
 "the patch applies to '%s' (%s), which does not match the current contents."
-msgstr "патч применятся к файлу «%s» (%s), но его текущее содержимое не соотвествует ожидаемому."
+msgstr ""
+"патч применятся к файлу «%s» (%s), но его текущее содержимое не соотвествует "
+"ожидаемому."
 
-#: apply.c:3171
 #, c-format
 msgid "the patch applies to an empty '%s' but it is not empty"
 msgstr "патч применяется к пустому файлу «%s», но файл не пустой"
 
-#: apply.c:3189
 #, c-format
 msgid "the necessary postimage %s for '%s' cannot be read"
 msgstr "не удалось прочитать необходимую посылку %s для «%s»"
 
-#: apply.c:3202
 #, c-format
 msgid "binary patch does not apply to '%s'"
 msgstr "не удалось применить двоичный патч к «%s»"
 
-#: apply.c:3209
 #, c-format
 msgid "binary patch to '%s' creates incorrect result (expecting %s, got %s)"
-msgstr "после применения двоичного патча для «%s» был получен неправильный результат (ожидалось %s, получено %s)"
+msgstr ""
+"после применения двоичного патча для «%s» был получен неправильный результат "
+"(ожидалось %s, получено %s)"
 
-#: apply.c:3230
 #, c-format
 msgid "patch failed: %s:%ld"
 msgstr "ошибка применения изменений: %s:%ld"
 
-#: apply.c:3353
 #, c-format
 msgid "cannot checkout %s"
 msgstr "не удалось переключить состояние на %s"
 
-#: apply.c:3405 apply.c:3416 apply.c:3462 midx.c:73 setup.c:308
 #, c-format
 msgid "failed to read %s"
 msgstr "не удалось прочитать %s"
 
-#: apply.c:3413
 #, c-format
 msgid "reading from '%s' beyond a symbolic link"
 msgstr "чтение из «%s» за символической ссылкой"
 
-#: apply.c:3442 apply.c:3685
 #, c-format
 msgid "path %s has been renamed/deleted"
 msgstr "путь %s был переименован/удален"
 
-#: apply.c:3528 apply.c:3700
 #, c-format
 msgid "%s: does not exist in index"
 msgstr "%s: нет в индексе"
 
-#: apply.c:3537 apply.c:3708 apply.c:3952
 #, c-format
 msgid "%s: does not match index"
 msgstr "%s: не совпадает с индексом"
 
-#: apply.c:3572
-msgid "repository lacks the necessary blob to fall back on 3-way merge."
-msgstr "в репозитории отсутствует необходимый двоичный объект для отката к трёхходовому слиянию."
+msgid "repository lacks the necessary blob to perform 3-way merge."
+msgstr ""
 
-#: apply.c:3575
 #, c-format
-msgid "Falling back to three-way merge...\n"
-msgstr "Откат к трёхходовому слиянию…\n"
+msgid "Performing three-way merge...\n"
+msgstr ""
 
-#: apply.c:3591 apply.c:3595
 #, c-format
 msgid "cannot read the current contents of '%s'"
 msgstr "не удалось прочитать текущее содержимое «%s»"
 
-#: apply.c:3607
 #, c-format
-msgid "Failed to fall back on three-way merge...\n"
-msgstr "Не удалось откатиться к трёхходовому слиянию…\n"
+msgid "Failed to perform three-way merge...\n"
+msgstr ""
 
-#: apply.c:3621
 #, c-format
 msgid "Applied patch to '%s' with conflicts.\n"
 msgstr "Патч применен к «%s» с конфликтами.\n"
 
-#: apply.c:3626
 #, c-format
 msgid "Applied patch to '%s' cleanly.\n"
 msgstr "Патч применен к «%s» без ошибок.\n"
 
-#: apply.c:3652
+#, c-format
+msgid "Falling back to direct application...\n"
+msgstr ""
+
 msgid "removal patch leaves file contents"
 msgstr "патч удаления не удалил содержимое файла"
 
-#: apply.c:3725
 #, c-format
 msgid "%s: wrong type"
 msgstr "%s: неправильный тип"
 
-#: apply.c:3727
 #, c-format
 msgid "%s has type %o, expected %o"
 msgstr "%s имеет тип %o, а ожидался %o"
 
-#: apply.c:3892 apply.c:3894 read-cache.c:832 read-cache.c:858
-#: read-cache.c:1313
 #, c-format
 msgid "invalid path '%s'"
 msgstr "неправильный путь «%s»"
 
-#: apply.c:3950
 #, c-format
 msgid "%s: already exists in index"
 msgstr "%s: уже содержится в индексе"
 
-#: apply.c:3954
 #, c-format
 msgid "%s: already exists in working directory"
 msgstr "%s: уже содержится в рабочем каталоге"
 
-#: apply.c:3974
 #, c-format
 msgid "new mode (%o) of %s does not match old mode (%o)"
-msgstr "новый режим доступа (%o) для %s не соответствует старому режиму доступа (%o)"
+msgstr ""
+"новый режим доступа (%o) для %s не соответствует старому режиму доступа (%o)"
 
-#: apply.c:3979
 #, c-format
 msgid "new mode (%o) of %s does not match old mode (%o) of %s"
-msgstr "новый режим доступа (%o) для %s не соответствует старому режиму доступа (%o) для %s"
+msgstr ""
+"новый режим доступа (%o) для %s не соответствует старому режиму доступа (%o) "
+"для %s"
 
-#: apply.c:3999
 #, c-format
 msgid "affected file '%s' is beyond a symbolic link"
 msgstr "затронутый файл «%s» находится за символической ссылкой"
 
-#: apply.c:4003
 #, c-format
 msgid "%s: patch does not apply"
 msgstr "%s: не удалось применить патч"
 
-#: apply.c:4018
 #, c-format
 msgid "Checking patch %s..."
-msgstr "Проверка патча %s…"
+msgstr "Проверка патча %s..."
 
-#: apply.c:4110
 #, c-format
 msgid "sha1 information is lacking or useless for submodule %s"
 msgstr "информация об sha1 отсутствует или бесполезна для подмодуля %s"
 
-#: apply.c:4117
 #, c-format
 msgid "mode change for %s, which is not in current HEAD"
 msgstr "изменен режим для %s, который не находится в текущем HEAD"
 
-#: apply.c:4120
 #, c-format
 msgid "sha1 information is lacking or useless (%s)."
 msgstr "информация об sha1 отсутствует или бесполезна (%s)."
 
-#: apply.c:4129
 #, c-format
 msgid "could not add %s to temporary index"
 msgstr "не удалось добавить %s во временный индекс"
 
-#: apply.c:4139
 #, c-format
 msgid "could not write temporary index to %s"
 msgstr "не удалось записать временный индкекс в %s"
 
-#: apply.c:4277
 #, c-format
 msgid "unable to remove %s from index"
 msgstr "не удалось удалить %s из индекса"
 
-#: apply.c:4311
 #, c-format
 msgid "corrupt patch for submodule %s"
 msgstr "поврежденный патч для подмодуля %s"
 
-#: apply.c:4317
 #, c-format
 msgid "unable to stat newly created file '%s'"
 msgstr "не удалось выполнить stat для созданного файла «%s»"
 
-#: apply.c:4325
 #, c-format
 msgid "unable to create backing store for newly created file %s"
 msgstr "не удалось создать вспомогательный файл для созданного файла %s"
 
-#: apply.c:4331 apply.c:4476
 #, c-format
 msgid "unable to add cache entry for %s"
 msgstr "не удалось создать запись в кэше для %s"
 
-#: apply.c:4374 builtin/bisect--helper.c:524
 #, c-format
 msgid "failed to write to '%s'"
 msgstr "не удалось записать в «%s»"
 
-#: apply.c:4378
 #, c-format
 msgid "closing file '%s'"
 msgstr "закрытие файла «%s»"
 
-#: apply.c:4448
 #, c-format
 msgid "unable to write file '%s' mode %o"
 msgstr "не удалось записать файл «%s» с режимом доступа %o"
 
-#: apply.c:4546
 #, c-format
 msgid "Applied patch %s cleanly."
 msgstr "Патч %s применен без ошибок."
 
-#: apply.c:4554
 msgid "internal error"
 msgstr "внутренняя ошибка"
 
-#: apply.c:4557
 #, 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 отказами…"
-msgstr[2] "Применение патча %%s с %d отказами…"
-msgstr[3] "Применение патча %%s с %d отказами…"
+msgstr[0] "Применение патча %%s с %d отказом..."
+msgstr[1] "Применение патча %%s с %d отказами..."
+msgstr[2] "Применение патча %%s с %d отказами..."
+msgstr[3] "Применение патча %%s с %d отказами..."
 
-#: apply.c:4568
 #, c-format
 msgid "truncating .rej filename to %.*s.rej"
 msgstr "усечение имени .rej файла до %.*s.rej"
 
-#: apply.c:4576 builtin/fetch.c:927 builtin/fetch.c:1228
 #, c-format
 msgid "cannot open %s"
 msgstr "не удалось открыть %s"
 
-#: apply.c:4590
 #, c-format
 msgid "Hunk #%d applied cleanly."
 msgstr "Блок №%d применен без ошибок."
 
-#: apply.c:4594
 #, c-format
 msgid "Rejected hunk #%d."
 msgstr "Блок №%d отклонен."
 
-#: apply.c:4718
 #, c-format
 msgid "Skipped patch '%s'."
 msgstr "Патч «%s» пропущен."
 
-#: apply.c:4726
-msgid "unrecognized input"
-msgstr "не распознанный ввод"
+msgid "No valid patches in input (allow with \"--allow-empty\")"
+msgstr ""
 
-#: apply.c:4746
 msgid "unable to read index file"
 msgstr "не удалось прочитать файл индекса"
 
-#: apply.c:4903
 #, c-format
 msgid "can't open patch '%s': %s"
 msgstr "не удалось открыть патч «%s»: %s"
 
-#: apply.c:4930
 #, c-format
 msgid "squelched %d whitespace error"
 msgid_plural "squelched %d whitespace errors"
@@ -1235,7 +1130,6 @@ msgstr[1] "пропущено %d ошибки в пробельных симво
 msgstr[2] "пропущено %d ошибок в пробельных символах"
 msgstr[3] "пропущено %d ошибок в пробельных символах"
 
-#: apply.c:4936 apply.c:4951
 #, c-format
 msgid "%d line adds whitespace errors."
 msgid_plural "%d lines add whitespace errors."
@@ -1244,7 +1138,6 @@ msgstr[1] "%d строки добавили ошибки в пробельных
 msgstr[2] "%d строк добавили ошибки в пробельных символах."
 msgstr[3] "%d строк добавили ошибки в пробельных символах."
 
-#: apply.c:4944
 #, c-format
 msgid "%d line applied after fixing whitespace errors."
 msgid_plural "%d lines applied after fixing whitespace errors."
@@ -1253,440 +1146,364 @@ msgstr[1] "%d строки добавлено после исправления
 msgstr[2] "%d строк добавлено после исправления ошибок в пробелах."
 msgstr[3] "%d строки добавлено после исправления ошибок в пробелах."
 
-#: apply.c:4960 builtin/add.c:618 builtin/mv.c:304 builtin/rm.c:406
 msgid "Unable to write new index file"
 msgstr "Не удалось записать новый файл индекса"
 
-#: apply.c:4988
 msgid "don't apply changes matching the given path"
 msgstr "не применять изменения по указанному пути"
 
-#: apply.c:4991
 msgid "apply changes matching the given path"
 msgstr "применять изменения по указанному пути"
 
-#: apply.c:4993 builtin/am.c:2266
 msgid "num"
 msgstr "количество"
 
-#: apply.c:4994
 msgid "remove <num> leading slashes from traditional diff paths"
-msgstr "удалить <количество> ведущих косых черт из традиционных путей списка изменений"
+msgstr ""
+"удалить <количество> ведущих косых черт из традиционных путей списка "
+"изменений"
 
-#: apply.c:4997
 msgid "ignore additions made by the patch"
 msgstr "игнорировать добавления, сделанные этим патчем"
 
-#: apply.c:4999
 msgid "instead of applying the patch, output diffstat for the input"
-msgstr "вместо применения патча вывести статистику добавлений и удалений для ввода"
+msgstr ""
+"вместо применения патча вывести статистику добавлений и удалений для ввода"
 
-#: apply.c:5003
 msgid "show number of added and deleted lines in decimal notation"
-msgstr "показать количество добавленных и удаленных строк в десятичном представлении"
+msgstr ""
+"показать количество добавленных и удаленных строк в десятичном представлении"
 
-#: apply.c:5005
 msgid "instead of applying the patch, output a summary for the input"
 msgstr "вместо применения патча вывести сводку изменений для ввода"
 
-#: apply.c:5007
 msgid "instead of applying the patch, see if the patch is applicable"
 msgstr "вместо применения патча проверить подходит ли он"
 
-#: apply.c:5009
 msgid "make sure the patch is applicable to the current index"
 msgstr "проверить, что патч применяется к текущему индексу"
 
-#: apply.c:5011
 msgid "mark new files with `git add --intent-to-add`"
 msgstr "помечать новые файлы с «git add --intent-to-add»"
 
-#: apply.c:5013
 msgid "apply a patch without touching the working tree"
 msgstr "применить патч, не изменяя рабочий каталог"
 
-#: apply.c:5015
 msgid "accept a patch that touches outside the working area"
 msgstr "принять патч, который затрагивает файлы за рабочим каталогом"
 
-#: apply.c:5018
 msgid "also apply the patch (use with --stat/--summary/--check)"
 msgstr "а также применить патч (используйте с --stat/--summary/--check)"
 
-#: apply.c:5020
-msgid "attempt three-way merge if a patch does not apply"
-msgstr "попытаться сделать трехходовое слияние, если патч не применяется"
+msgid "attempt three-way merge, fall back on normal patch if that fails"
+msgstr ""
 
-#: apply.c:5022
 msgid "build a temporary index based on embedded index information"
-msgstr "построить временный индекс, основанный на встроенной информации об индексе"
+msgstr ""
+"построить временный индекс, основанный на встроенной информации об индексе"
 
-#: apply.c:5025 builtin/checkout-index.c:182 builtin/ls-files.c:525
 msgid "paths are separated with NUL character"
 msgstr "пути, отделённые НУЛЕВЫМ символом"
 
-#: apply.c:5027
 msgid "ensure at least <n> lines of context match"
 msgstr "удостовериться, что по крайней мере <n> строк контекста совпадают"
 
-#: 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:3562 builtin/rebase.c:1346
 msgid "action"
 msgstr "действие"
 
-#: apply.c:5029
 msgid "detect new or modified lines that have whitespace errors"
-msgstr "определять новые или модифицированные строки, у которых есть ошибки в пробельных символах"
+msgstr ""
+"определять новые или модифицированные строки, у которых есть ошибки в "
+"пробельных символах"
 
-#: apply.c:5032 apply.c:5035
 msgid "ignore changes in whitespace when finding context"
 msgstr "игнорировать изменения в пробельных символах при поиске контекста"
 
-#: apply.c:5038
 msgid "apply the patch in reverse"
 msgstr "применить патч с обращением изменений"
 
-#: apply.c:5040
 msgid "don't expect at least one line of context"
 msgstr "не ожидать как минимум одной строки контекста"
 
-#: apply.c:5042
 msgid "leave the rejected hunks in corresponding *.rej files"
 msgstr "оставить отклоненные блоки изменений в соответствующих *.rej файлах"
 
-#: apply.c:5044
 msgid "allow overlapping hunks"
 msgstr "разрешить перекрывающиеся блоки изменений"
 
-#: apply.c:5045 builtin/add.c:329 builtin/check-ignore.c:22
-#: builtin/commit.c:1364 builtin/count-objects.c:98 builtin/fsck.c:775
-#: builtin/log.c:2287 builtin/mv.c:123 builtin/read-tree.c:128
-msgid "be verbose"
-msgstr "быть многословнее"
-
-#: apply.c:5047
 msgid "tolerate incorrectly detected missing new-line at the end of file"
-msgstr "разрешить некорректно определенные пропущенные пустые строки в конце файла"
+msgstr ""
+"разрешить некорректно определенные пропущенные пустые строки в конце файла"
 
-#: apply.c:5050
 msgid "do not trust the line counts in the hunk headers"
 msgstr "не доверять количеству строк из заголовка блока изменений"
 
-#: apply.c:5052 builtin/am.c:2254
 msgid "root"
 msgstr "корень"
 
-#: apply.c:5053
 msgid "prepend <root> to all filenames"
 msgstr "добавить <корень> спереди ко всем именам файлов"
 
-#: archive-tar.c:125 archive-zip.c:345
+msgid "don't return error for empty patches"
+msgstr ""
+
 #, c-format
 msgid "cannot stream blob %s"
 msgstr "не удалось создать поток двоичного объекта %s"
 
-#: archive-tar.c:265 archive-zip.c:358
 #, c-format
 msgid "unsupported file mode: 0%o (SHA1: %s)"
 msgstr "неподдерживаемый режим доступа к файлу: 0%o (SHA1: %s)"
 
-#: archive-tar.c:450
 #, c-format
 msgid "unable to start '%s' filter"
 msgstr "не удалось запустить фильтр «%s»"
 
-#: archive-tar.c:453
 msgid "unable to redirect descriptor"
 msgstr "не удалось перенаправить дескриптор"
 
-#: archive-tar.c:460
 #, c-format
 msgid "'%s' filter reported error"
 msgstr "фильтр «%s» сообщил об ошибке"
 
-#: archive-zip.c:318
 #, c-format
 msgid "path is not valid UTF-8: %s"
 msgstr "путь не является действительным UTF-8: %s"
 
-#: archive-zip.c:322
 #, c-format
 msgid "path too long (%d chars, SHA1: %s): %s"
 msgstr "путь слишком длинный (%d символов, SHA1: %s): %s"
 
-#: archive-zip.c:469 builtin/pack-objects.c:244 builtin/pack-objects.c:247
 #, c-format
 msgid "deflate error (%d)"
 msgstr "ошибка сжатия (%d)"
 
-#: archive-zip.c:603
 #, c-format
 msgid "timestamp too large for this system: %<PRIuMAX>"
 msgstr "отметка времени слишком большая для этой системы: %<PRIuMAX>"
 
-#: archive.c:14
 msgid "git archive [<options>] <tree-ish> [<path>...]"
-msgstr "git archive [<опции>] <указатель-дерева> [<путь>…]"
-
-#: archive.c:15
-msgid "git archive --list"
-msgstr "git archive --list"
+msgstr "git archive [<options>] <tree-ish> [<path>...]"
 
-#: archive.c:16
 msgid ""
-"git archive --remote <repo> [--exec <cmd>] [<options>] <tree-ish> "
-"[<path>...]"
-msgstr "git archive --remote <репозиторий> [--exec <команда>] [<опции>] <указатель-дерева> [<путь>…]"
+"git archive --remote <repo> [--exec <cmd>] [<options>] <tree-ish> [<path>...]"
+msgstr ""
+"git archive --remote <repo> [--exec <cmd>] [<options>] <tree-ish> [<path>...]"
 
-#: archive.c:17
 msgid "git archive --remote <repo> [--exec <cmd>] --list"
 msgstr "git archive --remote <репозиторий> [--exec <команда>] --list"
 
-#: archive.c:192
 #, c-format
-msgid "cannot read %s"
-msgstr "не удалось прочитать %s"
-
-#: archive.c:345 sequencer.c:459 sequencer.c:1736 sequencer.c:2886
-#: sequencer.c:3327 sequencer.c:3436 builtin/am.c:249 builtin/commit.c:786
-#: builtin/merge.c:1138
-#, c-format
-msgid "could not read '%s'"
+msgid "cannot read '%s'"
 msgstr "не удалось прочитать «%s»"
 
-#: archive.c:430 builtin/add.c:181 builtin/add.c:594 builtin/rm.c:315
 #, c-format
 msgid "pathspec '%s' did not match any files"
 msgstr "спецификатор пути «%s» не соответствует ни одному файлу"
 
-#: archive.c:454
 #, c-format
 msgid "no such ref: %.*s"
 msgstr "нет такой ссылки: %.*s"
 
-#: archive.c:460
 #, c-format
 msgid "not a valid object name: %s"
 msgstr "недопустимое имя объекта: %s"
 
-#: archive.c:473
 #, c-format
 msgid "not a tree object: %s"
 msgstr "недействительный объект дерева: %s"
 
-#: archive.c:485
 msgid "current working directory is untracked"
 msgstr "текущий рабочий каталог не отслеживается"
 
-#: archive.c:526
 #, c-format
 msgid "File not found: %s"
 msgstr ""
 
-#: archive.c:528
 #, c-format
 msgid "Not a regular file: %s"
 msgstr ""
 
-#: archive.c:555
+#, c-format
+msgid "unclosed quote: '%s'"
+msgstr ""
+
+#, c-format
+msgid "missing colon: '%s'"
+msgstr ""
+
+#, c-format
+msgid "empty file name: '%s'"
+msgstr ""
+
 msgid "fmt"
 msgstr "формат"
 
-#: archive.c:555
 msgid "archive format"
 msgstr "формат архива"
 
-#: archive.c:556 builtin/log.c:1765
 msgid "prefix"
 msgstr "префикс"
 
-#: archive.c:557
 msgid "prepend prefix to each pathname in the archive"
 msgstr "добавлять префикс перед каждым путем файла в архиве"
 
-#: archive.c:558 archive.c:561 builtin/blame.c:886 builtin/blame.c:890
-#: builtin/blame.c:891 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:919 builtin/hash-object.c:105
-#: builtin/ls-files.c:561 builtin/ls-files.c:564 builtin/notes.c:412
-#: builtin/notes.c:578 builtin/read-tree.c:123 parse-options.h:190
 msgid "file"
 msgstr "файл"
 
-#: archive.c:559
 msgid "add untracked file to archive"
 msgstr ""
 
-#: archive.c:562 builtin/archive.c:90
+msgid "path:content"
+msgstr ""
+
 msgid "write the archive to this file"
 msgstr "запись архива в этот файл"
 
-#: archive.c:564
 msgid "read .gitattributes in working directory"
 msgstr "читать .gitattributes в рабочем каталоге"
 
-#: archive.c:565
 msgid "report archived files on stderr"
 msgstr "отчет об архивированных файлах в stderr"
 
-#: archive.c:567
 msgid "set compression level"
 msgstr ""
 
-#: archive.c:570
 msgid "list supported archive formats"
 msgstr "перечислить поддерживаемые форматы архивов"
 
-#: 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
 msgid "repo"
 msgstr "репозиторий"
 
-#: archive.c:573 builtin/archive.c:92
 msgid "retrieve the archive from remote repository <repo>"
 msgstr "получить архив из внешнего <репозитория>"
 
-#: archive.c:574 builtin/archive.c:93 builtin/difftool.c:714
-#: builtin/notes.c:498
 msgid "command"
 msgstr "команда"
 
-#: archive.c:575 builtin/archive.c:94
 msgid "path to the remote git-upload-archive command"
 msgstr "путь к команде git-upload-archive на машине с внешним репозиторием"
 
-#: archive.c:582
 msgid "Unexpected option --remote"
 msgstr "Неожиданная опция --remote"
 
-#: archive.c:584
-msgid "Option --exec can only be used together with --remote"
-msgstr "Опция --exec может использоваться только вместе с --remote"
+#, c-format
+msgid "the option '%s' requires '%s'"
+msgstr ""
 
-#: archive.c:586
 msgid "Unexpected option --output"
 msgstr "Неожиданная опция --output"
 
-#: archive.c:588
-msgid "Options --add-file and --remote cannot be used together"
-msgstr ""
-
-#: archive.c:610
 #, c-format
 msgid "Unknown archive format '%s'"
 msgstr "Неизвестный формат архива «%s»"
 
-#: archive.c:619
 #, c-format
 msgid "Argument not supported for format '%s': -%d"
 msgstr "Аргумент не поддерживается для формата «%s»: -%d"
 
-#: attr.c:202
 #, c-format
 msgid "%.*s is not a valid attribute name"
 msgstr "%.*s не является допустимым именем атрибута"
 
-#: attr.c:359
 #, c-format
 msgid "%s not allowed: %s:%d"
 msgstr "%s не разрешено: %s:%d"
 
-#: attr.c:399
 msgid ""
 "Negative patterns are ignored in git attributes\n"
 "Use '\\!' for literal leading exclamation."
-msgstr "Отрицающие шаблоны в атрибутах git игнорируются.\nИспользуйте «\\!» для буквального использования символа в значении «восклицательный знак»."
+msgstr ""
+"Отрицающие шаблоны в атрибутах git игнорируются.\n"
+"Используйте «\\!» для буквального использования символа в значении "
+"«восклицательный знак»."
 
-#: bisect.c:489
 #, c-format
 msgid "Badly quoted content in file '%s': %s"
 msgstr "Плохое содержимое файла «%s»: %s"
 
-#: bisect.c:699
 #, c-format
 msgid "We cannot bisect more!\n"
 msgstr "Невозможно продолжить бинарный поиск!\n"
 
-#: bisect.c:766
 #, c-format
 msgid "Not a valid commit name %s"
 msgstr "Недопустимое имя коммита %s"
 
-#: bisect.c:791
 #, c-format
 msgid ""
 "The merge base %s is bad.\n"
 "This means the bug has been fixed between %s and [%s].\n"
-msgstr "База слияния %s является плохим коммитом.\nЭто значит, что ошибка была исправлена где-то между %s и [%s].\n"
+msgstr ""
+"База слияния %s является плохим коммитом.\n"
+"Это значит, что ошибка была исправлена где-то между %s и [%s].\n"
 
-#: bisect.c:796
 #, c-format
 msgid ""
 "The merge base %s is new.\n"
 "The property has changed between %s and [%s].\n"
-msgstr "База слияния %s является новой.\nСвойство было изменено где-то между %s и [%s].\n"
+msgstr ""
+"База слияния %s является новой.\n"
+"Свойство было изменено где-то между %s и [%s].\n"
 
-#: bisect.c:801
 #, c-format
 msgid ""
 "The merge base %s is %s.\n"
 "This means the first '%s' commit is between %s and [%s].\n"
-msgstr "База слияния %s является %s.\nЭто значит, что «%s» коммит находится где-то между %s и [%s].\n"
+msgstr ""
+"База слияния %s является %s.\n"
+"Это значит, что «%s» коммит находится где-то между %s и [%s].\n"
 
-#: bisect.c:809
 #, c-format
 msgid ""
 "Some %s revs are not ancestors of the %s rev.\n"
 "git bisect cannot work properly in this case.\n"
 "Maybe you mistook %s and %s revs?\n"
-msgstr "Несколько %s коммитов не являются предками %s коммита.\nВ этом случае git bisect не может работать правильно.\nВозможно, вы перепутали редакции %s и %s местами?\n"
+msgstr ""
+"Несколько %s коммитов не являются предками %s коммита.\n"
+"В этом случае git bisect не может работать правильно.\n"
+"Возможно, вы перепутали редакции %s и %s местами?\n"
 
-#: bisect.c:822
 #, c-format
 msgid ""
 "the merge base between %s and [%s] must be skipped.\n"
 "So we cannot be sure the first %s commit is between %s and %s.\n"
 "We continue anyway."
-msgstr "База слияния между %s и [%s] должно быть пропущена.\nПоэтому мы не можем быть уверены, что первый %s коммит находится между %s и %s.\nНо все же продолжаем поиск."
+msgstr ""
+"База слияния между %s и [%s] должно быть пропущена.\n"
+"Поэтому мы не можем быть уверены, что первый %s коммит находится между %s и "
+"%s.\n"
+"Но все же продолжаем поиск."
 
-#: bisect.c:861
 #, c-format
 msgid "Bisecting: a merge base must be tested\n"
 msgstr "Бинарный поиск: база слияния должна быть проверена\n"
 
-#: bisect.c:911
 #, c-format
 msgid "a %s revision is needed"
 msgstr "нужно указать %s редакцию"
 
-#: bisect.c:941 builtin/notes.c:177 builtin/tag.c:255
 #, c-format
 msgid "could not create file '%s'"
 msgstr "не удалось создать файл «%s»"
 
-#: bisect.c:987 builtin/merge.c:152
 #, c-format
 msgid "could not read file '%s'"
 msgstr "не удалось прочитать файл «%s»"
 
-#: bisect.c:1027
 msgid "reading bisect refs failed"
 msgstr "сбой при чтении ссылок двоичного поиска"
 
-#: bisect.c:1057
 #, c-format
 msgid "%s was both %s and %s\n"
 msgstr "%s была одновременно и %s и %s\n"
 
-#: bisect.c:1066
 #, c-format
 msgid ""
 "No testable commit found.\n"
-"Maybe you started with bad path parameters?\n"
-msgstr "Тестируемый коммит не найден.\nВозможно, вы начали поиск с указанием неправильного параметра пути?\n"
+"Maybe you started with bad path arguments?\n"
+msgstr ""
 
-#: bisect.c:1095
 #, c-format
 msgid "(roughly %d step)"
 msgid_plural "(roughly %d steps)"
@@ -1697,7 +1514,7 @@ msgstr[3] "(примерно %d шагов)"
 
 #. TRANSLATORS: the last %s will be replaced with "(roughly %d
 #. steps)" translation.
-#: bisect.c:1101
+#.
 #, 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"
@@ -1706,7479 +1523,278 @@ msgstr[1] "Бинарный поиск: %d редакции осталось п�
 msgstr[2] "Бинарный поиск: %d редакций осталось проверить после этой %s\n"
 msgstr[3] "Бинарный поиск: %d редакций осталось проверить после этой %s\n"
 
-#: blame.c:2777
 msgid "--contents and --reverse do not blend well."
 msgstr "--contents и --reverse не очень сочетаются."
 
-#: blame.c:2791
 msgid "cannot use --contents with final commit object name"
 msgstr "нельзя использовать --contents с указанием финального имени объекта"
 
-#: blame.c:2812
 msgid "--reverse and --first-parent together require specified latest commit"
-msgstr "при --reverse и --first-parent вместе нужно указывать конкретный последний коммит"
+msgstr ""
+"при --reverse и --first-parent вместе нужно указывать конкретный последний "
+"коммит"
 
-#: blame.c:2821 bundle.c:213 ref-filter.c:2272 remote.c:2031 sequencer.c:2138
-#: sequencer.c:4633 submodule.c:855 builtin/commit.c:1045 builtin/log.c:409
-#: builtin/log.c:1023 builtin/log.c:1625 builtin/log.c:2046 builtin/log.c:2336
-#: builtin/merge.c:423 builtin/pack-objects.c:3380 builtin/pack-objects.c:3395
-#: builtin/shortlog.c:267
 msgid "revision walk setup failed"
 msgstr "сбой инициализации прохода по редакциям"
 
-#: blame.c:2839
 msgid ""
 "--reverse --first-parent together require range along first-parent chain"
-msgstr "при указании --reverse и --first-parent вместе, требуется также указать диапазон по цепочке первого родителя"
+msgstr ""
+"при указании --reverse и --first-parent вместе, требуется также указать "
+"диапазон по цепочке первого родителя"
 
-#: blame.c:2850
 #, c-format
 msgid "no such path %s in %s"
 msgstr "нет такого пути %s в %s"
 
-#: blame.c:2861
 #, c-format
 msgid "cannot read blob %s for path %s"
 msgstr "невозможно прочитать объект %s для пути %s"
 
-#: branch.c:53
-#, c-format
-msgid ""
-"\n"
-"After fixing the error cause you may try to fix up\n"
-"the remote tracking information by invoking\n"
-"\"git branch --set-upstream-to=%s%s%s\"."
-msgstr "\nПосле исправления причины ошибки,\nвы можете исправить информацию об отслеживаемой\nвнешней ветке, с помощью команды\n«git branch --set-upstream-to=%s%s%s»."
-
-#: branch.c:67
-#, c-format
-msgid "Not setting branch %s as its own upstream."
-msgstr "Не устанавливаю ветку %s, так так она принадлежит вышестоящему репозиторию."
-
-#: branch.c:93
-#, c-format
-msgid "Branch '%s' set up to track remote branch '%s' from '%s' by rebasing."
-msgstr "Ветка «%s» отслеживает внешнюю ветку «%s» из «%s» перемещением."
-
-#: branch.c:94
-#, c-format
-msgid "Branch '%s' set up to track remote branch '%s' from '%s'."
-msgstr "Ветка «%s» отслеживает внешнюю ветку «%s» из «%s»."
-
-#: branch.c:98
-#, c-format
-msgid "Branch '%s' set up to track local branch '%s' by rebasing."
-msgstr "Ветка «%s» отслеживает локальную ветку «%s» перемещением."
-
-#: branch.c:99
-#, c-format
-msgid "Branch '%s' set up to track local branch '%s'."
-msgstr "Ветка «%s» отслеживает локальную ветку «%s»."
-
-#: branch.c:104
-#, c-format
-msgid "Branch '%s' set up to track remote ref '%s' by rebasing."
-msgstr "Ветка «%s» отслеживает внешнюю ссылку «%s» перемещением."
-
-#: branch.c:105
-#, c-format
-msgid "Branch '%s' set up to track remote ref '%s'."
-msgstr "Ветка «%s» отслеживает внешнюю ссылку «%s»."
-
-#: branch.c:109
-#, c-format
-msgid "Branch '%s' set up to track local ref '%s' by rebasing."
-msgstr "Ветка «%s» отслеживает локальную ссылку «%s» перемещением."
-
-#: branch.c:110
-#, c-format
-msgid "Branch '%s' set up to track local ref '%s'."
-msgstr "Ветка «%s» отслеживает локальную ссылку «%s»."
-
-#: branch.c:119
-msgid "Unable to write upstream branch configuration"
-msgstr "Не удалось записать настройки вышестоящей ветки"
-
-#: branch.c:156
-#, c-format
-msgid "Not tracking: ambiguous information for ref %s"
-msgstr "Не отслеживается: неоднозначная информация для ссылки %s"
-
-#: branch.c:189
-#, c-format
-msgid "'%s' is not a valid branch name."
-msgstr "«%s» не является действительным именем ветки."
-
-#: branch.c:208
-#, c-format
-msgid "A branch named '%s' already exists."
-msgstr "Ветка с именем «%s» уже существует."
-
-#: branch.c:213
-msgid "Cannot force update the current branch."
-msgstr "Не удалось принудительно обновить текущую ветку."
-
-#: branch.c:233
-#, c-format
-msgid ""
-"Cannot setup tracking information; starting point '%s' is not a branch."
-msgstr "Не удалось настроить информацию отслеживания; стартовая точка «%s» не является веткой."
-
-#: branch.c:235
-#, c-format
-msgid "the requested upstream branch '%s' does not exist"
-msgstr "запрошенная ветка вышестоящего репозитория «%s» не существует"
-
-#: branch.c:237
-msgid ""
-"\n"
-"If you are planning on basing your work on an upstream\n"
-"branch that already exists at the remote, you may need to\n"
-"run \"git fetch\" to retrieve it.\n"
-"\n"
-"If you are planning to push out a new local branch that\n"
-"will track its remote counterpart, you may want to use\n"
-"\"git push -u\" to set the upstream config as you push."
-msgstr "\nЕсли вы планируете основывать свою работу на вышестоящей ветке, которая уже существует во внешнем репозитории, вам может потребоваться запустить «git fetch» для ее получения.\n\nЕсли вы планируете отправить новую локальную ветку, которая будет отслеживаться, во внешний репозиторий, вам может потребоваться запустить «git push -u» — чтобы сохранить настройку вышестоящего репозитория для отправки."
-
-#: branch.c:281
-#, c-format
-msgid "Not a valid object name: '%s'."
-msgstr "Недопустимое имя объекта: «%s»."
-
-#: branch.c:301
-#, c-format
-msgid "Ambiguous object name: '%s'."
-msgstr "Неоднозначное имя объекта: «%s»."
-
-#: branch.c:306
-#, c-format
-msgid "Not a valid branch point: '%s'."
-msgstr "Недопустимая точка ветки: «%s»."
-
-#: branch.c:365
-#, c-format
-msgid "'%s' is already checked out at '%s'"
-msgstr "«%s» уже находится на «%s»"
-
-#: branch.c:388
-#, c-format
-msgid "HEAD of working tree %s is not updated"
-msgstr "HEAD рабочего каталога %s не обновлён"
-
-#: bundle.c:41
-#, c-format
-msgid "unrecognized bundle hash algorithm: %s"
-msgstr ""
-
-#: bundle.c:45
-#, c-format
-msgid "unknown capability '%s'"
-msgstr ""
-
-#: bundle.c:71
-#, c-format
-msgid "'%s' does not look like a v2 or v3 bundle file"
-msgstr ""
-
-#: bundle.c:110
-#, c-format
-msgid "unrecognized header: %s%s (%d)"
-msgstr "неопознанный заголовок: %s%s (%d)"
-
-#: bundle.c:136 rerere.c:480 rerere.c:690 sequencer.c:2390 sequencer.c:3176
-#: builtin/commit.c:814
-#, c-format
-msgid "could not open '%s'"
-msgstr "не удалось открыть «%s»"
-
-#: bundle.c:189
-msgid "Repository lacks these prerequisite commits:"
-msgstr "В репозитории отсутствуют необходимые коммиты:"
-
-#: bundle.c:192
-msgid "need a repository to verify a bundle"
-msgstr ""
-
-#: bundle.c:243
-#, c-format
-msgid "The bundle contains this ref:"
-msgid_plural "The bundle contains these %d refs:"
-msgstr[0] "Пакет содержит эту %d ссылку:"
-msgstr[1] "Пакет содержит эти %d ссылки:"
-msgstr[2] "Пакет содержит эти %d ссылок:"
-msgstr[3] "Пакет содержит эти %d ссылок:"
-
-#: bundle.c:250
-msgid "The bundle records a complete history."
-msgstr "Пакет содержит полную историю."
-
-#: bundle.c:252
-#, c-format
-msgid "The bundle requires this ref:"
-msgid_plural "The bundle requires these %d refs:"
-msgstr[0] "Пакет требует эту %d ссылку:"
-msgstr[1] "Пакет требует эти %d ссылки:"
-msgstr[2] "Пакет требует эти %d ссылок:"
-msgstr[3] "Пакет требует эти %d ссылок:"
-
-#: bundle.c:319
-msgid "unable to dup bundle descriptor"
-msgstr "не удалось дублировать дескриптор пакета"
-
-#: bundle.c:326
-msgid "Could not spawn pack-objects"
-msgstr "Не удалось создать объекты пакета"
-
-#: bundle.c:337
-msgid "pack-objects died"
-msgstr "критическая ошибка pack-objects"
-
-#: bundle.c:379
-msgid "rev-list died"
-msgstr "критическая ошибка rev-list"
-
-#: bundle.c:428
-#, c-format
-msgid "ref '%s' is excluded by the rev-list options"
-msgstr "ссылка «%s» исключена в соответствии с опциями rev-list"
-
-#: bundle.c:498
-#, c-format
-msgid "unsupported bundle version %d"
-msgstr ""
-
-#: bundle.c:500
-#, c-format
-msgid "cannot write bundle version %d with algorithm %s"
-msgstr ""
-
-#: bundle.c:522 builtin/log.c:209 builtin/log.c:1927 builtin/shortlog.c:408
-#, c-format
-msgid "unrecognized argument: %s"
-msgstr "неопознанный аргумент: %s"
-
-#: bundle.c:530
-msgid "Refusing to create empty bundle."
-msgstr "Отклонение создания пустого пакета."
-
-#: bundle.c:540
-#, c-format
-msgid "cannot create '%s'"
-msgstr "не удалось создать «%s»"
-
-#: bundle.c:565
-msgid "index-pack died"
-msgstr "критическая ошибка index-pack"
-
-#: color.c:329
-#, c-format
-msgid "invalid color value: %.*s"
-msgstr "недопустимое значение цвета: %.*s"
-
-#: commit-graph.c:188 midx.c:47
-msgid "invalid hash version"
-msgstr ""
-
-#: commit-graph.c:246
-msgid "commit-graph file is too small"
-msgstr "файл commit-graph слишком маленький"
-
-#: commit-graph.c:311
-#, c-format
-msgid "commit-graph signature %X does not match signature %X"
-msgstr "подпись commit-graph файла %X не соотвествует подписи %X"
-
-#: commit-graph.c:318
-#, c-format
-msgid "commit-graph version %X does not match version %X"
-msgstr "версия commit-graph файла %X не соотвествует версии %X"
-
-#: commit-graph.c:325
-#, c-format
-msgid "commit-graph hash version %X does not match version %X"
-msgstr "версия хэш-функции commit-graph файла %X не соответствует версии %X"
-
-#: commit-graph.c:342
-#, c-format
-msgid "commit-graph file is too small to hold %u chunks"
-msgstr ""
-
-#: commit-graph.c:361
-#, c-format
-msgid "commit-graph improper chunk offset %08x%08x"
-msgstr "некорректное смещение части в commit-graph файле %08x%08x"
-
-#: commit-graph.c:433
-#, c-format
-msgid "commit-graph chunk id %08x appears multiple times"
-msgstr "часть файла commit-graph с идентификатором %08x появляется несколько раз"
-
-#: commit-graph.c:499
-msgid "commit-graph has no base graphs chunk"
-msgstr ""
-
-#: commit-graph.c:509
-msgid "commit-graph chain does not match"
-msgstr ""
-
-#: commit-graph.c:557
-#, c-format
-msgid "invalid commit-graph chain: line '%s' not a hash"
-msgstr ""
-
-#: commit-graph.c:581
-msgid "unable to find all commit-graph files"
-msgstr ""
-
-#: commit-graph.c:721 commit-graph.c:785
-msgid "invalid commit position. commit-graph is likely corrupt"
-msgstr ""
-
-#: commit-graph.c:742
-#, c-format
-msgid "could not find commit %s"
-msgstr "не удалось найти коммит %s"
-
-#: commit-graph.c:1036 builtin/am.c:1292
-#, c-format
-msgid "unable to parse commit %s"
-msgstr "не удалось разобрать коммит %s"
-
-#: commit-graph.c:1252 builtin/pack-objects.c:2864
-#, c-format
-msgid "unable to get type of object %s"
-msgstr "не удалось получить тип объекта %s"
-
-#: commit-graph.c:1283
-msgid "Loading known commits in commit graph"
-msgstr "Загрузка известных коммитов на граф коммитов"
-
-#: commit-graph.c:1300
-msgid "Expanding reachable commits in commit graph"
-msgstr "Расширение достижимых коммитов на граф коммитов"
-
-#: commit-graph.c:1320
-msgid "Clearing commit marks in commit graph"
-msgstr "Очистка пометок коммитов на графе коммитов"
-
-#: commit-graph.c:1339
-msgid "Computing commit graph generation numbers"
-msgstr "Вычисление номеров поколений на графе коммитов"
-
-#: commit-graph.c:1406
-msgid "Computing commit changed paths Bloom filters"
-msgstr ""
-
-#: commit-graph.c:1483
-msgid "Collecting referenced commits"
-msgstr ""
-
-#: commit-graph.c:1508
-#, 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 пакетах"
-msgstr[2] "Поиск коммитов для графа коммитов в %d пакетах"
-msgstr[3] "Поиск коммитов для графа коммитов в %d пакетах"
-
-#: commit-graph.c:1521
-#, c-format
-msgid "error adding pack %s"
-msgstr "ошибка добавления пакета %s"
-
-#: commit-graph.c:1525
-#, c-format
-msgid "error opening index for %s"
-msgstr "ошибка открытия индекса для %s"
-
-#: commit-graph.c:1562
-msgid "Finding commits for commit graph among packed objects"
-msgstr "Поиск коммитов для графа коммитов среди упакованных объектов"
-
-#: commit-graph.c:1580
-msgid "Finding extra edges in commit graph"
-msgstr "Поиск дополнительных ребер на графе коммитов"
-
-#: commit-graph.c:1628
-msgid "failed to write correct number of base graph ids"
-msgstr ""
-
-#: commit-graph.c:1670 midx.c:819
-#, c-format
-msgid "unable to create leading directories of %s"
-msgstr "не удалось создать родительские каталоги для %s"
-
-#: commit-graph.c:1683
-msgid "unable to create temporary graph layer"
-msgstr ""
-
-#: commit-graph.c:1688
-#, c-format
-msgid "unable to adjust shared permissions for '%s'"
-msgstr ""
-
-#: commit-graph.c:1758
-#, 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 прохода"
-msgstr[2] "Запись графа коммитов в %d проходов"
-msgstr[3] "Запись графа коммитов в %d прохода"
-
-#: commit-graph.c:1803
-msgid "unable to open commit-graph chain file"
-msgstr ""
-
-#: commit-graph.c:1819
-msgid "failed to rename base commit-graph file"
-msgstr ""
-
-#: commit-graph.c:1839
-msgid "failed to rename temporary commit-graph file"
-msgstr ""
-
-#: commit-graph.c:1965
-msgid "Scanning merged commits"
-msgstr ""
-
-#: commit-graph.c:2009
-msgid "Merging commit-graph"
-msgstr ""
-
-#: commit-graph.c:2115
-msgid "attempting to write a commit-graph, but 'core.commitGraph' is disabled"
-msgstr ""
-
-#: commit-graph.c:2214
-msgid "too many commits to write graph"
-msgstr "слишком много коммитов для записи графа"
-
-#: commit-graph.c:2307
-msgid "the commit-graph file has incorrect checksum and is likely corrupt"
-msgstr "файл commit-graph содержит неправильную контрольную сумму и скорее всего поврежден"
-
-#: commit-graph.c:2317
-#, c-format
-msgid "commit-graph has incorrect OID order: %s then %s"
-msgstr "файл commit-graph содержит неправильный порядок OID: %s, а затем %s"
-
-#: commit-graph.c:2327 commit-graph.c:2342
-#, c-format
-msgid "commit-graph has incorrect fanout value: fanout[%d] = %u != %u"
-msgstr "файл commit-graph содержит неправильное значение fanout: fanout[%d] = %u != %u"
-
-#: commit-graph.c:2334
-#, c-format
-msgid "failed to parse commit %s from commit-graph"
-msgstr "не удалось разобрать коммит %s из файла commit-graph"
-
-#: commit-graph.c:2352
-msgid "Verifying commits in commit graph"
-msgstr "Проверка коммитов на графе коммитов"
-
-#: commit-graph.c:2367
-#, c-format
-msgid "failed to parse commit %s from object database for commit-graph"
-msgstr "не удалось разобрать коммит %s из базы объектов файла commit-graph"
-
-#: commit-graph.c:2374
-#, c-format
-msgid "root tree OID for commit %s in commit-graph is %s != %s"
-msgstr "в файле commit-graph OID корня дерева для коммита %s является %s != %s"
-
-#: commit-graph.c:2384
-#, c-format
-msgid "commit-graph parent list for commit %s is too long"
-msgstr "слишком большой список родителей файле commit-graph для коммита %s"
-
-#: commit-graph.c:2393
-#, c-format
-msgid "commit-graph parent for %s is %s != %s"
-msgstr "в файле commit-graph родитель для %s является %s != %s"
-
-#: commit-graph.c:2407
-#, c-format
-msgid "commit-graph parent list for commit %s terminates early"
-msgstr "в файле commit-graph список родителей для коммита %s закончился слишком рано"
-
-#: commit-graph.c:2412
-#, c-format
-msgid ""
-"commit-graph has generation number zero for commit %s, but non-zero "
-"elsewhere"
-msgstr "в файле commit-graph содержится нулевой номер поколения для коммита %s, но ненулевой в остальных случаях"
-
-#: commit-graph.c:2416
-#, c-format
-msgid ""
-"commit-graph has non-zero generation number for commit %s, but zero "
-"elsewhere"
-msgstr "в файле commit-graph содержится ненулевой номер поколения для коммита %s, но нулевой в остальных случаях"
-
-#: commit-graph.c:2432
-#, c-format
-msgid "commit-graph generation for commit %s is %u != %u"
-msgstr "в файле commit-graph номер поколения для коммита %s является %u != %u"
-
-#: commit-graph.c:2438
-#, c-format
-msgid "commit date for commit %s in commit-graph is %<PRIuMAX> != %<PRIuMAX>"
-msgstr "в файле commit-graph дата коммита %s является %<PRIuMAX> != %<PRIuMAX>"
-
-#: commit.c:52 sequencer.c:2879 builtin/am.c:359 builtin/am.c:403
-#: builtin/am.c:1371 builtin/am.c:2018 builtin/replace.c:457
-#, c-format
-msgid "could not parse %s"
-msgstr "не удалось разобрать %s"
-
-#: commit.c:54
-#, c-format
-msgid "%s %s is not a commit!"
-msgstr "%s %s не является коммитом!"
-
-#: commit.c:194
-msgid ""
-"Support for <GIT_DIR>/info/grafts is deprecated\n"
-"and will be removed in a future Git version.\n"
-"\n"
-"Please use \"git replace --convert-graft-file\"\n"
-"to convert the grafts into replace refs.\n"
-"\n"
-"Turn this message off by running\n"
-"\"git config advice.graftFileDeprecated false\""
-msgstr "Поддержка <GIT_DIR>/info/grafts устарела и будет удалена в следующих версиях Git.\n\nИспользуйте «git replace --convert-graft-file» для  конвертации сращений (grafts) на ссылки замены.\n\nЧтобы скрыть это сообщение запустите «git config advice.graftFileDeprecated false»"
-
-#: commit.c:1172
-#, c-format
-msgid "Commit %s has an untrusted GPG signature, allegedly by %s."
-msgstr "Коммит %s содержит не доверенную GPG подпись, предположительно от %s."
-
-#: commit.c:1176
-#, c-format
-msgid "Commit %s has a bad GPG signature allegedly by %s."
-msgstr "Коммит %s содержит плохую GPG подпись, предположительно от %s."
-
-#: commit.c:1179
-#, c-format
-msgid "Commit %s does not have a GPG signature."
-msgstr "Коммит %s не содержит GPG подпись."
-
-#: commit.c:1182
-#, c-format
-msgid "Commit %s has a good GPG signature by %s\n"
-msgstr "Коммит %s содержит действительную GPG подпись, от %s.\n"
-
-#: commit.c:1436
-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"
-"variable i18n.commitencoding to the encoding your project uses.\n"
-msgstr "Предупреждение: сообщение коммита не соответствует UTF-8.\nВозможно, вы захотите исправить его после исправления сообщения\nили настроить опцию i18n.commitencoding и указать кодировку\nсообщений, которую использует ваш проект.\n"
-
-#: compat/obstack.c:406 compat/obstack.c:408
-msgid "memory exhausted"
-msgstr "память исчерпана"
-
-#: config.c:125
-#, c-format
-msgid ""
-"exceeded maximum include depth (%d) while including\n"
-"\t%s\n"
-"from\n"
-"\t%s\n"
-"This might be due to circular includes."
-msgstr ""
-
-#: config.c:141
-#, c-format
-msgid "could not expand include path '%s'"
-msgstr "не удалось раскрыть путь включения «%s»"
-
-#: config.c:152
-msgid "relative config includes must come from files"
-msgstr "относительные включения конфигурации должны исходить из файлов"
-
-#: config.c:198
-msgid "relative config include conditionals must come from files"
-msgstr "относительные условные включения конфигурации должны исходить из файлов"
-
-#: config.c:378
-#, c-format
-msgid "key does not contain a section: %s"
-msgstr ""
-
-#: config.c:384
-#, c-format
-msgid "key does not contain variable name: %s"
-msgstr ""
-
-#: config.c:408 sequencer.c:2580
-#, c-format
-msgid "invalid key: %s"
-msgstr "недействительный ключ: %s"
-
-#: config.c:414
-#, c-format
-msgid "invalid key (newline): %s"
-msgstr ""
-
-#: config.c:450 config.c:462
-#, c-format
-msgid "bogus config parameter: %s"
-msgstr ""
-
-#: config.c:497
-#, c-format
-msgid "bogus format in %s"
-msgstr ""
-
-#: config.c:836
-#, c-format
-msgid "bad config line %d in blob %s"
-msgstr "ошибка в %d строке двоичного объекта %s"
-
-#: config.c:840
-#, c-format
-msgid "bad config line %d in file %s"
-msgstr "ошибка в %d строке файла %s"
-
-#: config.c:844
-#, c-format
-msgid "bad config line %d in standard input"
-msgstr "ошибка в %d строке стандартного ввода"
-
-#: config.c:848
-#, c-format
-msgid "bad config line %d in submodule-blob %s"
-msgstr "ошибка в %d строке двоичного объекта подмодуля %s"
-
-#: config.c:852
-#, c-format
-msgid "bad config line %d in command line %s"
-msgstr "ошибка в %d строке коммандной строки %s"
-
-#: config.c:856
-#, c-format
-msgid "bad config line %d in %s"
-msgstr "ошибка в %d строке в %s"
-
-#: config.c:993
-msgid "out of range"
-msgstr "вне диапазона"
-
-#: config.c:993
-msgid "invalid unit"
-msgstr "неправильное число"
-
-#: config.c:994
-#, c-format
-msgid "bad numeric config value '%s' for '%s': %s"
-msgstr "неправильное числовое значение «%s» для «%s»: %s"
-
-#: config.c:1013
-#, c-format
-msgid "bad numeric config value '%s' for '%s' in blob %s: %s"
-msgstr "неправильное числовое значение «%s» для «%s» в двоичном объекте %s: %s"
-
-#: config.c:1016
-#, c-format
-msgid "bad numeric config value '%s' for '%s' in file %s: %s"
-msgstr "неправильное числовое значение «%s» для «%s» в файле %s: %s"
-
-#: config.c:1019
-#, c-format
-msgid "bad numeric config value '%s' for '%s' in standard input: %s"
-msgstr "неправильное числовое значение «%s» для «%s» на стандартном вводе: %s"
-
-#: config.c:1022
-#, c-format
-msgid "bad numeric config value '%s' for '%s' in submodule-blob %s: %s"
-msgstr "неправильное числовое значение «%s» для «%s» в двоичном объекте подмодуля %s: %s"
-
-#: config.c:1025
-#, c-format
-msgid "bad numeric config value '%s' for '%s' in command line %s: %s"
-msgstr "неправильное числовое значение «%s» для «%s» на коммандной строке %s: %s"
-
-#: config.c:1028
-#, c-format
-msgid "bad numeric config value '%s' for '%s' in %s: %s"
-msgstr "неправильное числовое значение «%s» для «%s» в %s: %s"
-
-#: config.c:1123
-#, c-format
-msgid "failed to expand user dir in: '%s'"
-msgstr "сбой разворачивания пути каталога пользователя: «%s»"
-
-#: config.c:1132
-#, c-format
-msgid "'%s' for '%s' is not a valid timestamp"
-msgstr "«%s» для «%s» не является допустимой меткой даты/времени"
-
-#: config.c:1223
-#, c-format
-msgid "abbrev length out of range: %d"
-msgstr ""
-
-#: config.c:1237 config.c:1248
-#, c-format
-msgid "bad zlib compression level %d"
-msgstr "неправильный уровень сжатия zlib %d"
-
-#: config.c:1340
-msgid "core.commentChar should only be one character"
-msgstr ""
-
-#: config.c:1373
-#, c-format
-msgid "invalid mode for object creation: %s"
-msgstr "недопустимый режим создания объекта: %s"
-
-#: config.c:1445
-#, c-format
-msgid "malformed value for %s"
-msgstr ""
-
-#: config.c:1471
-#, c-format
-msgid "malformed value for %s: %s"
-msgstr ""
-
-#: config.c:1472
-msgid "must be one of nothing, matching, simple, upstream or current"
-msgstr ""
-
-#: config.c:1533 builtin/pack-objects.c:3649
-#, c-format
-msgid "bad pack compression level %d"
-msgstr "неправильный уровень сжатия пакета %d"
-
-#: config.c:1655
-#, c-format
-msgid "unable to load config blob object '%s'"
-msgstr ""
-
-#: config.c:1658
-#, c-format
-msgid "reference '%s' does not point to a blob"
-msgstr ""
-
-#: config.c:1675
-#, c-format
-msgid "unable to resolve config blob '%s'"
-msgstr ""
-
-#: config.c:1705
-#, c-format
-msgid "failed to parse %s"
-msgstr ""
-
-#: config.c:1759
-msgid "unable to parse command-line config"
-msgstr "не удалось разобрать конфигурацию из командной строки"
-
-#: config.c:2122
-msgid "unknown error occurred while reading the configuration files"
-msgstr "произошла неизвестная ошибка при чтении файлов конфигурации"
-
-#: config.c:2296
-#, c-format
-msgid "Invalid %s: '%s'"
-msgstr "Недействительный %s: «%s»"
-
-#: config.c:2341
-#, c-format
-msgid "splitIndex.maxPercentChange value '%d' should be between 0 and 100"
-msgstr "значение «%d» для splitIndex.maxPercentChange должно быть от 0 до 100"
-
-#: config.c:2387
-#, c-format
-msgid "unable to parse '%s' from command-line config"
-msgstr "не удалось разобрать «%s» в конфигурации из командной строки"
-
-#: config.c:2389
-#, c-format
-msgid "bad config variable '%s' in file '%s' at line %d"
-msgstr "неправильная переменная конфигурации «%s» в файле «%s» на строке %d"
-
-#: config.c:2473
-#, c-format
-msgid "invalid section name '%s'"
-msgstr ""
-
-#: config.c:2505
-#, c-format
-msgid "%s has multiple values"
-msgstr "%s имеет несколько значений"
-
-#: config.c:2534
-#, c-format
-msgid "failed to write new configuration file %s"
-msgstr ""
-
-#: config.c:2786 config.c:3112
-#, c-format
-msgid "could not lock config file %s"
-msgstr ""
-
-#: config.c:2797
-#, c-format
-msgid "opening %s"
-msgstr ""
-
-#: config.c:2834 builtin/config.c:361
-#, c-format
-msgid "invalid pattern: %s"
-msgstr ""
-
-#: config.c:2859
-#, c-format
-msgid "invalid config file %s"
-msgstr ""
-
-#: config.c:2872 config.c:3125
-#, c-format
-msgid "fstat on %s failed"
-msgstr "сбой при выполнении fstat на файле %s"
-
-#: config.c:2883
-#, c-format
-msgid "unable to mmap '%s'"
-msgstr ""
-
-#: config.c:2892 config.c:3130
-#, c-format
-msgid "chmod on %s failed"
-msgstr ""
-
-#: config.c:2977 config.c:3227
-#, c-format
-msgid "could not write config file %s"
-msgstr ""
-
-#: config.c:3011
-#, c-format
-msgid "could not set '%s' to '%s'"
-msgstr "не удалось установить «%s» в «%s»"
-
-#: config.c:3013 builtin/remote.c:657 builtin/remote.c:855
-#: builtin/remote.c:863
-#, c-format
-msgid "could not unset '%s'"
-msgstr "не удалось сбросить значение для «%s»"
-
-#: config.c:3103
-#, c-format
-msgid "invalid section name: %s"
-msgstr ""
-
-#: config.c:3270
-#, c-format
-msgid "missing value for '%s'"
-msgstr ""
-
-#: connect.c:61
-msgid "the remote end hung up upon initial contact"
-msgstr ""
-
-#: connect.c:63
-msgid ""
-"Could not read from remote repository.\n"
-"\n"
-"Please make sure you have the correct access rights\n"
-"and the repository exists."
-msgstr "Не удалось прочитать из внешнего репозитория.\n\nУдостоверьтесь, что у вас есть необходимые права доступа\nи репозиторий существует."
-
-#: connect.c:81
-#, c-format
-msgid "server doesn't support '%s'"
-msgstr ""
-
-#: connect.c:118
-#, c-format
-msgid "server doesn't support feature '%s'"
-msgstr ""
-
-#: connect.c:129
-msgid "expected flush after capabilities"
-msgstr ""
-
-#: connect.c:263
-#, c-format
-msgid "ignoring capabilities after first line '%s'"
-msgstr ""
-
-#: connect.c:284
-msgid "protocol error: unexpected capabilities^{}"
-msgstr ""
-
-#: connect.c:306
-#, c-format
-msgid "protocol error: expected shallow sha-1, got '%s'"
-msgstr ""
-
-#: connect.c:308
-msgid "repository on the other end cannot be shallow"
-msgstr ""
-
-#: connect.c:347
-msgid "invalid packet"
-msgstr ""
-
-#: connect.c:367
-#, c-format
-msgid "protocol error: unexpected '%s'"
-msgstr ""
-
-#: connect.c:473
-#, c-format
-msgid "unknown object format '%s' specified by server"
-msgstr ""
-
-#: connect.c:500
-#, c-format
-msgid "invalid ls-refs response: %s"
-msgstr ""
-
-#: connect.c:504
-msgid "expected flush after ref listing"
-msgstr ""
-
-#: connect.c:507
-msgid "expected response end packet after ref listing"
-msgstr ""
-
-#: connect.c:640
-#, c-format
-msgid "protocol '%s' is not supported"
-msgstr ""
-
-#: connect.c:691
-msgid "unable to set SO_KEEPALIVE on socket"
-msgstr ""
-
-#: connect.c:731 connect.c:794
-#, c-format
-msgid "Looking up %s ... "
-msgstr ""
-
-#: connect.c:735
-#, c-format
-msgid "unable to look up %s (port %s) (%s)"
-msgstr ""
-
-#. TRANSLATORS: this is the end of "Looking up %s ... "
-#: connect.c:739 connect.c:810
-#, c-format
-msgid ""
-"done.\n"
-"Connecting to %s (port %s) ... "
-msgstr ""
-
-#: connect.c:761 connect.c:838
-#, c-format
-msgid ""
-"unable to connect to %s:\n"
-"%s"
-msgstr ""
-
-#. TRANSLATORS: this is the end of "Connecting to %s (port %s) ... "
-#: connect.c:767 connect.c:844
-msgid "done."
-msgstr ""
-
-#: connect.c:798
-#, c-format
-msgid "unable to look up %s (%s)"
-msgstr ""
-
-#: connect.c:804
-#, c-format
-msgid "unknown port %s"
-msgstr ""
-
-#: connect.c:941 connect.c:1271
-#, c-format
-msgid "strange hostname '%s' blocked"
-msgstr ""
-
-#: connect.c:943
-#, c-format
-msgid "strange port '%s' blocked"
-msgstr ""
-
-#: connect.c:953
-#, c-format
-msgid "cannot start proxy %s"
-msgstr ""
-
-#: connect.c:1024
-msgid "no path specified; see 'git help pull' for valid url syntax"
-msgstr ""
-
-#: connect.c:1219
-msgid "ssh variant 'simple' does not support -4"
-msgstr ""
-
-#: connect.c:1231
-msgid "ssh variant 'simple' does not support -6"
-msgstr ""
-
-#: connect.c:1248
-msgid "ssh variant 'simple' does not support setting port"
-msgstr ""
-
-#: connect.c:1360
-#, c-format
-msgid "strange pathname '%s' blocked"
-msgstr ""
-
-#: connect.c:1408
-msgid "unable to fork"
-msgstr ""
-
-#: connected.c:108 builtin/fsck.c:209 builtin/prune.c:45
-msgid "Checking connectivity"
-msgstr "Проверка соединения"
-
-#: connected.c:120
-msgid "Could not run 'git rev-list'"
-msgstr "Не удалось запустить «git rev-list»"
-
-#: connected.c:144
-msgid "failed write to rev-list"
-msgstr "сбой записи в rev-list"
-
-#: connected.c:149
-msgid "failed to close rev-list's stdin"
-msgstr "сбой закрытия стандартного ввода у rev-list"
-
-#: convert.c:194
-#, c-format
-msgid "illegal crlf_action %d"
-msgstr ""
-
-#: convert.c:207
-#, c-format
-msgid "CRLF would be replaced by LF in %s"
-msgstr ""
-
-#: convert.c:209
-#, c-format
-msgid ""
-"CRLF will be replaced by LF in %s.\n"
-"The file will have its original line endings in your working directory"
-msgstr ""
-
-#: convert.c:217
-#, c-format
-msgid "LF would be replaced by CRLF in %s"
-msgstr "LF будет заменен на CRLF в %s"
-
-#: convert.c:219
-#, c-format
-msgid ""
-"LF will be replaced by CRLF in %s.\n"
-"The file will have its original line endings in your working directory"
-msgstr ""
-
-#: convert.c:284
-#, c-format
-msgid "BOM is prohibited in '%s' if encoded as %s"
-msgstr "BOM запрещен в «%s», если кодируется как %s"
-
-#: convert.c:291
-#, c-format
-msgid ""
-"The file '%s' contains a byte order mark (BOM). Please use UTF-%.*s as "
-"working-tree-encoding."
-msgstr ""
-
-#: convert.c:304
-#, c-format
-msgid "BOM is required in '%s' if encoded as %s"
-msgstr "BOM требуется в «%s», если кодируется как %s"
-
-#: convert.c:306
-#, 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."
-msgstr "Файл «%s» не содержит маркер последовательности байтов (BOM).  Используйте UTF-%sBE или UTF-%sLE (в зависимости от порядка байтов) как кодировку рабочего каталога."
-
-#: convert.c:419 convert.c:490
-#, c-format
-msgid "failed to encode '%s' from %s to %s"
-msgstr "не удалось перекодировать «%s» из %s в %s"
-
-#: convert.c:462
-#, c-format
-msgid "encoding '%s' from %s to %s and back is not the same"
-msgstr "перекодирование «%s» из %s в %s и обратно не одно и то же"
-
-#: convert.c:665
-#, c-format
-msgid "cannot fork to run external filter '%s'"
-msgstr ""
-
-#: convert.c:685
-#, c-format
-msgid "cannot feed the input to external filter '%s'"
-msgstr ""
-
-#: convert.c:692
-#, c-format
-msgid "external filter '%s' failed %d"
-msgstr ""
-
-#: convert.c:727 convert.c:730
-#, c-format
-msgid "read from external filter '%s' failed"
-msgstr ""
-
-#: convert.c:733 convert.c:788
-#, c-format
-msgid "external filter '%s' failed"
-msgstr ""
-
-#: convert.c:837
-msgid "unexpected filter type"
-msgstr ""
-
-#: convert.c:848
-msgid "path name too long for external filter"
-msgstr ""
-
-#: convert.c:940
-#, c-format
-msgid ""
-"external filter '%s' is not available anymore although not all paths have "
-"been filtered"
-msgstr ""
-
-#: convert.c:1240
-msgid "true/false are no valid working-tree-encodings"
-msgstr "true/false не является допустимым значением для working-tree-encoding"
-
-#: convert.c:1428 convert.c:1462
-#, c-format
-msgid "%s: clean filter '%s' failed"
-msgstr ""
-
-#: convert.c:1508
-#, c-format
-msgid "%s: smudge filter %s failed"
-msgstr ""
-
-#: credential.c:96
-#, c-format
-msgid "skipping credential lookup for key: credential.%s"
-msgstr ""
-
-#: credential.c:112
-msgid "refusing to work with credential missing host field"
-msgstr ""
-
-#: credential.c:114
-msgid "refusing to work with credential missing protocol field"
-msgstr ""
-
-#: credential.c:394
-#, c-format
-msgid "url contains a newline in its %s component: %s"
-msgstr ""
-
-#: credential.c:438
-#, c-format
-msgid "url has no scheme: %s"
-msgstr ""
-
-#: credential.c:511
-#, c-format
-msgid "credential url cannot be parsed: %s"
-msgstr ""
-
-#: date.c:138
-msgid "in the future"
-msgstr "в будущем"
-
-#: date.c:144
-#, c-format
-msgid "%<PRIuMAX> second ago"
-msgid_plural "%<PRIuMAX> seconds ago"
-msgstr[0] "%<PRIuMAX> секунда назад"
-msgstr[1] "%<PRIuMAX> секунды назад"
-msgstr[2] "%<PRIuMAX> секунд назад"
-msgstr[3] "%<PRIuMAX> секунды назад"
-
-#: date.c:151
-#, c-format
-msgid "%<PRIuMAX> minute ago"
-msgid_plural "%<PRIuMAX> minutes ago"
-msgstr[0] "%<PRIuMAX> минута назад"
-msgstr[1] "%<PRIuMAX> минуты назад"
-msgstr[2] "%<PRIuMAX> минут назад"
-msgstr[3] "%<PRIuMAX> минуты назад"
-
-#: date.c:158
-#, c-format
-msgid "%<PRIuMAX> hour ago"
-msgid_plural "%<PRIuMAX> hours ago"
-msgstr[0] "%<PRIuMAX> час назад"
-msgstr[1] "%<PRIuMAX> часа назад"
-msgstr[2] "%<PRIuMAX> часов назад"
-msgstr[3] "%<PRIuMAX> часа назад"
-
-#: date.c:165
-#, c-format
-msgid "%<PRIuMAX> day ago"
-msgid_plural "%<PRIuMAX> days ago"
-msgstr[0] "%<PRIuMAX> день назад"
-msgstr[1] "%<PRIuMAX> дня назад"
-msgstr[2] "%<PRIuMAX> дней назад"
-msgstr[3] "%<PRIuMAX> дня назад"
-
-#: date.c:171
-#, c-format
-msgid "%<PRIuMAX> week ago"
-msgid_plural "%<PRIuMAX> weeks ago"
-msgstr[0] "%<PRIuMAX> неделю назад"
-msgstr[1] "%<PRIuMAX> недели назад"
-msgstr[2] "%<PRIuMAX> недель назад"
-msgstr[3] "%<PRIuMAX> недели назад"
-
-#: date.c:178
-#, c-format
-msgid "%<PRIuMAX> month ago"
-msgid_plural "%<PRIuMAX> months ago"
-msgstr[0] "%<PRIuMAX> месяц назад"
-msgstr[1] "%<PRIuMAX> месяца назад"
-msgstr[2] "%<PRIuMAX> месяцев назад"
-msgstr[3] "%<PRIuMAX> месяца назад"
-
-#: date.c:189
-#, c-format
-msgid "%<PRIuMAX> year"
-msgid_plural "%<PRIuMAX> years"
-msgstr[0] "%<PRIuMAX> год"
-msgstr[1] "%<PRIuMAX> года"
-msgstr[2] "%<PRIuMAX> лет"
-msgstr[3] "%<PRIuMAX> года"
-
-#. TRANSLATORS: "%s" is "<n> years"
-#: date.c:192
-#, c-format
-msgid "%s, %<PRIuMAX> month ago"
-msgid_plural "%s, %<PRIuMAX> months ago"
-msgstr[0] "%s, %<PRIuMAX> месяц назад"
-msgstr[1] "%s, %<PRIuMAX> месяца назад"
-msgstr[2] "%s, %<PRIuMAX> месяцев назад"
-msgstr[3] "%s, %<PRIuMAX> месяца назад"
-
-#: date.c:197 date.c:202
-#, c-format
-msgid "%<PRIuMAX> year ago"
-msgid_plural "%<PRIuMAX> years ago"
-msgstr[0] "%<PRIuMAX> год назад"
-msgstr[1] "%<PRIuMAX> года назад"
-msgstr[2] "%<PRIuMAX> лет назад"
-msgstr[3] "%<PRIuMAX> года назад"
-
-#: delta-islands.c:272
-msgid "Propagating island marks"
-msgstr ""
-
-#: delta-islands.c:290
-#, c-format
-msgid "bad tree object %s"
-msgstr ""
-
-#: delta-islands.c:334
-#, c-format
-msgid "failed to load island regex for '%s': %s"
-msgstr ""
-
-#: delta-islands.c:390
-#, c-format
-msgid "island regex from config has too many capture groups (max=%d)"
-msgstr ""
-
-#: delta-islands.c:467
-#, c-format
-msgid "Marked %d islands, done.\n"
-msgstr ""
-
-#: diff-lib.c:534
-msgid "--merge-base does not work with ranges"
-msgstr ""
-
-#: diff-lib.c:536
-msgid "--merge-base only works with commits"
-msgstr ""
-
-#: diff-lib.c:553
-msgid "unable to get HEAD"
-msgstr ""
-
-#: diff-lib.c:560
-msgid "no merge base found"
-msgstr ""
-
-#: diff-lib.c:562
-msgid "multiple merge bases found"
-msgstr ""
-
-#: diff-no-index.c:238
-msgid "git diff --no-index [<options>] <path> <path>"
-msgstr ""
-
-#: diff-no-index.c:263
-msgid ""
-"Not a git repository. Use --no-index to compare two paths outside a working "
-"tree"
-msgstr ""
-
-#: diff.c:156
-#, c-format
-msgid "  Failed to parse dirstat cut-off percentage '%s'\n"
-msgstr "  Сбой разбора величины среза (cut-off) у dirstat «%s»\n"
-
-#: diff.c:161
-#, c-format
-msgid "  Unknown dirstat parameter '%s'\n"
-msgstr " Неизвестный параметр dirstat: «%s»\n"
-
-#: diff.c:297
-msgid ""
-"color moved setting must be one of 'no', 'default', 'blocks', 'zebra', "
-"'dimmed-zebra', 'plain'"
-msgstr ""
-
-#: diff.c:325
-#, 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
-msgid ""
-"color-moved-ws: allow-indentation-change cannot be combined with other "
-"whitespace modes"
-msgstr ""
-
-#: diff.c:410
-#, c-format
-msgid "Unknown value for 'diff.submodule' config variable: '%s'"
-msgstr "Неизвестное значения для переменной «diff.submodule»: «%s»"
-
-#: diff.c:470
-#, c-format
-msgid ""
-"Found errors in 'diff.dirstat' config variable:\n"
-"%s"
-msgstr "Найдены ошибки в переменной «diff.dirstat»:\n%s"
-
-#: diff.c:4276
-#, c-format
-msgid "external diff died, stopping at %s"
-msgstr "критическая ошибка при внешнем сравнении, останов на %s"
-
-#: diff.c:4625
-msgid "--name-only, --name-status, --check and -s are mutually exclusive"
-msgstr "--name-only, --name-status, --check и -s нельзя использовать одновременно"
-
-#: diff.c:4628
-msgid "-G, -S and --find-object are mutually exclusive"
-msgstr "-G, -S и --find-object нельзя использовать одновременно"
-
-#: diff.c:4707
-msgid "--follow requires exactly one pathspec"
-msgstr "--follow требует ровно одного спецификатора пути"
-
-#: diff.c:4755
-#, c-format
-msgid "invalid --stat value: %s"
-msgstr ""
-
-#: diff.c:4760 diff.c:4765 diff.c:4770 diff.c:4775 diff.c:5303
-#: parse-options.c:197 parse-options.c:201 builtin/commit-graph.c:180
-#, c-format
-msgid "%s expects a numerical value"
-msgstr ""
-
-#: diff.c:4792
-#, c-format
-msgid ""
-"Failed to parse --dirstat/-X option parameter:\n"
-"%s"
-msgstr "Сбой разбора параметра опции --dirstat/-X :\n%s"
-
-#: diff.c:4877
-#, c-format
-msgid "unknown change class '%c' in --diff-filter=%s"
-msgstr ""
-
-#: diff.c:4901
-#, c-format
-msgid "unknown value after ws-error-highlight=%.*s"
-msgstr ""
-
-#: diff.c:4915
-#, c-format
-msgid "unable to resolve '%s'"
-msgstr ""
-
-#: diff.c:4965 diff.c:4971
-#, c-format
-msgid "%s expects <n>/<m> form"
-msgstr ""
-
-#: diff.c:4983
-#, c-format
-msgid "%s expects a character, got '%s'"
-msgstr ""
-
-#: diff.c:5004
-#, c-format
-msgid "bad --color-moved argument: %s"
-msgstr ""
-
-#: diff.c:5023
-#, c-format
-msgid "invalid mode '%s' in --color-moved-ws"
-msgstr ""
-
-#: diff.c:5063
-msgid "option diff-algorithm accepts \"myers\", \"minimal\", \"patience\" and \"histogram\""
-msgstr ""
-
-#: diff.c:5099 diff.c:5119
-#, c-format
-msgid "invalid argument to %s"
-msgstr ""
-
-#: diff.c:5223
-#, c-format
-msgid "invalid regex given to -I: '%s'"
-msgstr ""
-
-#: diff.c:5272
-#, c-format
-msgid "failed to parse --submodule option parameter: '%s'"
-msgstr ""
-
-#: diff.c:5328
-#, c-format
-msgid "bad --word-diff argument: %s"
-msgstr ""
-
-#: diff.c:5351
-msgid "Diff output format options"
-msgstr ""
-
-#: diff.c:5353 diff.c:5359
-msgid "generate patch"
-msgstr ""
-
-#: diff.c:5356 builtin/log.c:178
-msgid "suppress diff output"
-msgstr "не выводить список изменений"
-
-#: diff.c:5361 diff.c:5475 diff.c:5482
-msgid "<n>"
-msgstr ""
-
-#: diff.c:5362 diff.c:5365
-msgid "generate diffs with <n> lines context"
-msgstr ""
-
-#: diff.c:5367
-msgid "generate the diff in raw format"
-msgstr ""
-
-#: diff.c:5370
-msgid "synonym for '-p --raw'"
-msgstr ""
-
-#: diff.c:5374
-msgid "synonym for '-p --stat'"
-msgstr ""
-
-#: diff.c:5378
-msgid "machine friendly --stat"
-msgstr ""
-
-#: diff.c:5381
-msgid "output only the last line of --stat"
-msgstr ""
-
-#: diff.c:5383 diff.c:5391
-msgid "<param1,param2>..."
-msgstr ""
-
-#: diff.c:5384
-msgid ""
-"output the distribution of relative amount of changes for each sub-directory"
-msgstr ""
-
-#: diff.c:5388
-msgid "synonym for --dirstat=cumulative"
-msgstr ""
-
-#: diff.c:5392
-msgid "synonym for --dirstat=files,param1,param2..."
-msgstr ""
-
-#: diff.c:5396
-msgid "warn if changes introduce conflict markers or whitespace errors"
-msgstr ""
-
-#: diff.c:5399
-msgid "condensed summary such as creations, renames and mode changes"
-msgstr "краткая сводка изменений, вроде созданий, переименований или изменений режима доступа"
-
-#: diff.c:5402
-msgid "show only names of changed files"
-msgstr ""
-
-#: diff.c:5405
-msgid "show only names and status of changed files"
-msgstr ""
-
-#: diff.c:5407
-msgid "<width>[,<name-width>[,<count>]]"
-msgstr ""
-
-#: diff.c:5408
-msgid "generate diffstat"
-msgstr ""
-
-#: diff.c:5410 diff.c:5413 diff.c:5416
-msgid "<width>"
-msgstr ""
-
-#: diff.c:5411
-msgid "generate diffstat with a given width"
-msgstr ""
-
-#: diff.c:5414
-msgid "generate diffstat with a given name width"
-msgstr ""
-
-#: diff.c:5417
-msgid "generate diffstat with a given graph width"
-msgstr ""
-
-#: diff.c:5419
-msgid "<count>"
-msgstr ""
-
-#: diff.c:5420
-msgid "generate diffstat with limited lines"
-msgstr ""
-
-#: diff.c:5423
-msgid "generate compact summary in diffstat"
-msgstr "генерация компактной сводки в diffstat"
-
-#: diff.c:5426
-msgid "output a binary diff that can be applied"
-msgstr ""
-
-#: diff.c:5429
-msgid "show full pre- and post-image object names on the \"index\" lines"
-msgstr ""
-
-#: diff.c:5431
-msgid "show colored diff"
-msgstr ""
-
-#: diff.c:5432
-msgid "<kind>"
-msgstr ""
-
-#: diff.c:5433
-msgid ""
-"highlight whitespace errors in the 'context', 'old' or 'new' lines in the "
-"diff"
-msgstr ""
-
-#: diff.c:5436
-msgid ""
-"do not munge pathnames and use NULs as output field terminators in --raw or "
-"--numstat"
-msgstr ""
-
-#: diff.c:5439 diff.c:5442 diff.c:5445 diff.c:5554
-msgid "<prefix>"
-msgstr ""
-
-#: diff.c:5440
-msgid "show the given source prefix instead of \"a/\""
-msgstr ""
-
-#: diff.c:5443
-msgid "show the given destination prefix instead of \"b/\""
-msgstr ""
-
-#: diff.c:5446
-msgid "prepend an additional prefix to every line of output"
-msgstr ""
-
-#: diff.c:5449
-msgid "do not show any source or destination prefix"
-msgstr ""
-
-#: diff.c:5452
-msgid "show context between diff hunks up to the specified number of lines"
-msgstr ""
-
-#: diff.c:5456 diff.c:5461 diff.c:5466
-msgid "<char>"
-msgstr ""
-
-#: diff.c:5457
-msgid "specify the character to indicate a new line instead of '+'"
-msgstr ""
-
-#: diff.c:5462
-msgid "specify the character to indicate an old line instead of '-'"
-msgstr ""
-
-#: diff.c:5467
-msgid "specify the character to indicate a context instead of ' '"
-msgstr ""
-
-#: diff.c:5470
-msgid "Diff rename options"
-msgstr ""
-
-#: diff.c:5471
-msgid "<n>[/<m>]"
-msgstr ""
-
-#: diff.c:5472
-msgid "break complete rewrite changes into pairs of delete and create"
-msgstr ""
-
-#: diff.c:5476
-msgid "detect renames"
-msgstr ""
-
-#: diff.c:5480
-msgid "omit the preimage for deletes"
-msgstr ""
-
-#: diff.c:5483
-msgid "detect copies"
-msgstr ""
-
-#: diff.c:5487
-msgid "use unmodified files as source to find copies"
-msgstr ""
-
-#: diff.c:5489
-msgid "disable rename detection"
-msgstr ""
-
-#: diff.c:5492
-msgid "use empty blobs as rename source"
-msgstr ""
-
-#: diff.c:5494
-msgid "continue listing the history of a file beyond renames"
-msgstr ""
-
-#: diff.c:5497
-msgid ""
-"prevent rename/copy detection if the number of rename/copy targets exceeds "
-"given limit"
-msgstr ""
-
-#: diff.c:5499
-msgid "Diff algorithm options"
-msgstr ""
-
-#: diff.c:5501
-msgid "produce the smallest possible diff"
-msgstr ""
-
-#: diff.c:5504
-msgid "ignore whitespace when comparing lines"
-msgstr ""
-
-#: diff.c:5507
-msgid "ignore changes in amount of whitespace"
-msgstr ""
-
-#: diff.c:5510
-msgid "ignore changes in whitespace at EOL"
-msgstr ""
-
-#: diff.c:5513
-msgid "ignore carrier-return at the end of line"
-msgstr ""
-
-#: diff.c:5516
-msgid "ignore changes whose lines are all blank"
-msgstr ""
-
-#: diff.c:5518 diff.c:5540 diff.c:5543 diff.c:5588
-msgid "<regex>"
-msgstr ""
-
-#: diff.c:5519
-msgid "ignore changes whose all lines match <regex>"
-msgstr ""
-
-#: diff.c:5522
-msgid "heuristic to shift diff hunk boundaries for easy reading"
-msgstr ""
-
-#: diff.c:5525
-msgid "generate diff using the \"patience diff\" algorithm"
-msgstr ""
-
-#: diff.c:5529
-msgid "generate diff using the \"histogram diff\" algorithm"
-msgstr ""
-
-#: diff.c:5531
-msgid "<algorithm>"
-msgstr ""
-
-#: diff.c:5532
-msgid "choose a diff algorithm"
-msgstr ""
-
-#: diff.c:5534
-msgid "<text>"
-msgstr ""
-
-#: diff.c:5535
-msgid "generate diff using the \"anchored diff\" algorithm"
-msgstr ""
-
-#: diff.c:5537 diff.c:5546 diff.c:5549
-msgid "<mode>"
-msgstr ""
-
-#: diff.c:5538
-msgid "show word diff, using <mode> to delimit changed words"
-msgstr ""
-
-#: diff.c:5541
-msgid "use <regex> to decide what a word is"
-msgstr ""
-
-#: diff.c:5544
-msgid "equivalent to --word-diff=color --word-diff-regex=<regex>"
-msgstr ""
-
-#: diff.c:5547
-msgid "moved lines of code are colored differently"
-msgstr ""
-
-#: diff.c:5550
-msgid "how white spaces are ignored in --color-moved"
-msgstr ""
-
-#: diff.c:5553
-msgid "Other diff options"
-msgstr ""
-
-#: diff.c:5555
-msgid "when run from subdir, exclude changes outside and show relative paths"
-msgstr ""
-
-#: diff.c:5559
-msgid "treat all files as text"
-msgstr ""
-
-#: diff.c:5561
-msgid "swap two inputs, reverse the diff"
-msgstr ""
-
-#: diff.c:5563
-msgid "exit with 1 if there were differences, 0 otherwise"
-msgstr ""
-
-#: diff.c:5565
-msgid "disable all output of the program"
-msgstr ""
-
-#: diff.c:5567
-msgid "allow an external diff helper to be executed"
-msgstr ""
-
-#: diff.c:5569
-msgid "run external text conversion filters when comparing binary files"
-msgstr ""
-
-#: diff.c:5571
-msgid "<when>"
-msgstr ""
-
-#: diff.c:5572
-msgid "ignore changes to submodules in the diff generation"
-msgstr ""
-
-#: diff.c:5575
-msgid "<format>"
-msgstr ""
-
-#: diff.c:5576
-msgid "specify how differences in submodules are shown"
-msgstr ""
-
-#: diff.c:5580
-msgid "hide 'git add -N' entries from the index"
-msgstr ""
-
-#: diff.c:5583
-msgid "treat 'git add -N' entries as real in the index"
-msgstr ""
-
-#: diff.c:5585
-msgid "<string>"
-msgstr ""
-
-#: diff.c:5586
-msgid ""
-"look for differences that change the number of occurrences of the specified "
-"string"
-msgstr ""
-
-#: diff.c:5589
-msgid ""
-"look for differences that change the number of occurrences of the specified "
-"regex"
-msgstr ""
-
-#: diff.c:5592
-msgid "show all changes in the changeset with -S or -G"
-msgstr ""
-
-#: diff.c:5595
-msgid "treat <string> in -S as extended POSIX regular expression"
-msgstr ""
-
-#: diff.c:5598
-msgid "control the order in which files appear in the output"
-msgstr ""
-
-#: diff.c:5599
-msgid "<object-id>"
-msgstr ""
-
-#: diff.c:5600
-msgid ""
-"look for differences that change the number of occurrences of the specified "
-"object"
-msgstr ""
-
-#: diff.c:5602
-msgid "[(A|C|D|M|R|T|U|X|B)...[*]]"
-msgstr ""
-
-#: diff.c:5603
-msgid "select files by diff type"
-msgstr ""
-
-#: diff.c:5605
-msgid "<file>"
-msgstr ""
-
-#: diff.c:5606
-msgid "Output to a specific file"
-msgstr ""
-
-#: diff.c:6263
-msgid "inexact rename detection was skipped due to too many files."
-msgstr "неточное определение переименования было пропущено из-за слишком большого количества файлов."
-
-#: diff.c:6266
-msgid "only found copies from modified paths due to too many files."
-msgstr "найдены только копии из измененных путей из-за слишком большого количества файлов."
-
-#: diff.c:6269
-#, c-format
-msgid ""
-"you may want to set your %s variable to at least %d and retry the command."
-msgstr "возможно вы захотите установить переменную %s в как минимум значение %d и повторить вызов команды."
-
-#: diffcore-order.c:24
-#, c-format
-msgid "failed to read orderfile '%s'"
-msgstr "сбой чтения orderfile «%s»"
-
-#: diffcore-rename.c:592
-msgid "Performing inexact rename detection"
-msgstr "Выполняется неточное определение переименования"
-
-#: dir.c:578
-#, c-format
-msgid "pathspec '%s' did not match any file(s) known to git"
-msgstr ""
-
-#: dir.c:718 dir.c:747 dir.c:760
-#, c-format
-msgid "unrecognized pattern: '%s'"
-msgstr ""
-
-#: dir.c:777 dir.c:791
-#, c-format
-msgid "unrecognized negative pattern: '%s'"
-msgstr ""
-
-#: dir.c:809
-#, c-format
-msgid "your sparse-checkout file may have issues: pattern '%s' is repeated"
-msgstr ""
-
-#: dir.c:819
-msgid "disabling cone pattern matching"
-msgstr ""
-
-#: dir.c:1198
-#, c-format
-msgid "cannot use %s as an exclude file"
-msgstr ""
-
-#: dir.c:2305
-#, c-format
-msgid "could not open directory '%s'"
-msgstr "не удалось открыть каталог «%s»"
-
-#: dir.c:2605
-msgid "failed to get kernel name and information"
-msgstr "не удалось получить имя ядра и информацию"
-
-#: dir.c:2729
-msgid "untracked cache is disabled on this system or location"
-msgstr ""
-
-#: dir.c:3520
-#, c-format
-msgid "index file corrupt in repo %s"
-msgstr ""
-
-#: dir.c:3565 dir.c:3570
-#, c-format
-msgid "could not create directories for %s"
-msgstr "не удалось создать каталоги для %s"
-
-#: dir.c:3599
-#, c-format
-msgid "could not migrate git directory from '%s' to '%s'"
-msgstr "не удалось переместить каталог git с «%s» в «%s»"
-
-#: editor.c:74
-#, c-format
-msgid "hint: Waiting for your editor to close the file...%c"
-msgstr "подсказка: Ожидание, пока вы закроете редактор с файлом…%c"
-
-#: entry.c:177
-msgid "Filtering content"
-msgstr "Фильтруется содержимое"
-
-#: entry.c:478
-#, c-format
-msgid "could not stat file '%s'"
-msgstr "не удалось выполнить stat для файла «%s»"
-
-#: environment.c:150
-#, c-format
-msgid "bad git namespace path \"%s\""
-msgstr ""
-
-#: environment.c:337
-#, 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:177
-msgid "git fetch-pack: expected shallow list"
-msgstr "git fetch-pack: ожидается передача списка для получение части"
-
-#: fetch-pack.c:180
-msgid "git fetch-pack: expected a flush packet after shallow list"
-msgstr ""
-
-#: fetch-pack.c:191
-msgid "git fetch-pack: expected ACK/NAK, got a flush packet"
-msgstr "git fetch-pack: ожидается ACK/NAK, а получен пустой пакет"
-
-#: fetch-pack.c:211
-#, c-format
-msgid "git fetch-pack: expected ACK/NAK, got '%s'"
-msgstr "git fetch-pack: ожидается ACK/NAK, а получено «%s»"
-
-#: fetch-pack.c:222
-msgid "unable to write to remote"
-msgstr ""
-
-#: fetch-pack.c:283
-msgid "--stateless-rpc requires multi_ack_detailed"
-msgstr "--stateless-rpc требует multi_ack_detailed"
-
-#: fetch-pack.c:378 fetch-pack.c:1406
-#, c-format
-msgid "invalid shallow line: %s"
-msgstr "неправильная строка частичного получения: %s"
-
-#: fetch-pack.c:384 fetch-pack.c:1412
-#, c-format
-msgid "invalid unshallow line: %s"
-msgstr "неправильная строка полного получения: %s"
-
-#: fetch-pack.c:386 fetch-pack.c:1414
-#, c-format
-msgid "object not found: %s"
-msgstr "объект не найден: %s"
-
-#: fetch-pack.c:389 fetch-pack.c:1417
-#, c-format
-msgid "error in object: %s"
-msgstr "ошибка в объекте: %s"
-
-#: fetch-pack.c:391 fetch-pack.c:1419
-#, c-format
-msgid "no shallow found: %s"
-msgstr "частичный клон не найден: %s"
-
-#: fetch-pack.c:394 fetch-pack.c:1423
-#, c-format
-msgid "expected shallow/unshallow, got %s"
-msgstr "ожидалось shallow/unshallow, а получено %s"
-
-#: fetch-pack.c:434
-#, c-format
-msgid "got %s %d %s"
-msgstr "получено %s %d %s"
-
-#: fetch-pack.c:451
-#, c-format
-msgid "invalid commit %s"
-msgstr "недопустимый коммит %s"
-
-#: fetch-pack.c:482
-msgid "giving up"
-msgstr "останавливаю дальнейшие попытки"
-
-#: fetch-pack.c:495 progress.c:339
-msgid "done"
-msgstr "готово"
-
-#: fetch-pack.c:507
-#, c-format
-msgid "got %s (%d) %s"
-msgstr "получено %s (%d) %s"
-
-#: fetch-pack.c:543
-#, c-format
-msgid "Marking %s as complete"
-msgstr "Помечаю %s как завершенный"
-
-#: fetch-pack.c:758
-#, c-format
-msgid "already have %s (%s)"
-msgstr "уже есть %s (%s)"
-
-#: fetch-pack.c:827
-msgid "fetch-pack: unable to fork off sideband demultiplexer"
-msgstr "fetch-pack: не удалось запустить программу разбора данных"
-
-#: fetch-pack.c:835
-msgid "protocol error: bad pack header"
-msgstr "ошибка протокола: неправильный заголовок потока"
-
-#: fetch-pack.c:919
-#, c-format
-msgid "fetch-pack: unable to fork off %s"
-msgstr "fetch-pack: не удалось запустить программу %s"
-
-#: fetch-pack.c:937
-#, c-format
-msgid "%s failed"
-msgstr "%s завершен с ошибкой"
-
-#: fetch-pack.c:939
-msgid "error in sideband demultiplexer"
-msgstr "произошла  ошибка в  программе разбора данных"
-
-#: fetch-pack.c:982
-#, c-format
-msgid "Server version is %.*s"
-msgstr "Версия сервера %.*s"
-
-#: fetch-pack.c:990 fetch-pack.c:996 fetch-pack.c:999 fetch-pack.c:1005
-#: fetch-pack.c:1009 fetch-pack.c:1013 fetch-pack.c:1017 fetch-pack.c:1021
-#: fetch-pack.c:1025 fetch-pack.c:1029 fetch-pack.c:1033 fetch-pack.c:1037
-#: fetch-pack.c:1043 fetch-pack.c:1049 fetch-pack.c:1054 fetch-pack.c:1059
-#, c-format
-msgid "Server supports %s"
-msgstr ""
-
-#: fetch-pack.c:992
-msgid "Server does not support shallow clients"
-msgstr "Сервер не поддерживает клиентов с частичным клонированием"
-
-#: fetch-pack.c:1052
-msgid "Server does not support --shallow-since"
-msgstr "Сервер не поддерживает --shallow-since"
-
-#: fetch-pack.c:1057
-msgid "Server does not support --shallow-exclude"
-msgstr "Сервер не поддерживает --shallow-exclude"
-
-#: fetch-pack.c:1061
-msgid "Server does not support --deepen"
-msgstr "Сервер не поддерживает --deepen"
-
-#: fetch-pack.c:1063
-msgid "Server does not support this repository's object format"
-msgstr ""
-
-#: fetch-pack.c:1076
-msgid "no common commits"
-msgstr "не общих коммитов"
-
-#: fetch-pack.c:1088 fetch-pack.c:1628
-msgid "git fetch-pack: fetch failed."
-msgstr "git fetch-pack: ошибка при получении данных."
-
-#: fetch-pack.c:1214
-#, c-format
-msgid "mismatched algorithms: client %s; server %s"
-msgstr ""
-
-#: fetch-pack.c:1218
-#, c-format
-msgid "the server does not support algorithm '%s'"
-msgstr ""
-
-#: fetch-pack.c:1238
-msgid "Server does not support shallow requests"
-msgstr "Сервер не поддерживает частичные запросы"
-
-#: fetch-pack.c:1245
-msgid "Server supports filter"
-msgstr "Сервер поддерживает фильтрацию"
-
-#: fetch-pack.c:1284
-msgid "unable to write request to remote"
-msgstr ""
-
-#: fetch-pack.c:1302
-#, c-format
-msgid "error reading section header '%s'"
-msgstr ""
-
-#: fetch-pack.c:1308
-#, c-format
-msgid "expected '%s', received '%s'"
-msgstr ""
-
-#: fetch-pack.c:1369
-#, c-format
-msgid "unexpected acknowledgment line: '%s'"
-msgstr ""
-
-#: fetch-pack.c:1374
-#, c-format
-msgid "error processing acks: %d"
-msgstr ""
-
-#: fetch-pack.c:1384
-msgid "expected packfile to be sent after 'ready'"
-msgstr ""
-
-#: fetch-pack.c:1386
-msgid "expected no other sections to be sent after no 'ready'"
-msgstr ""
-
-#: fetch-pack.c:1428
-#, c-format
-msgid "error processing shallow info: %d"
-msgstr ""
-
-#: fetch-pack.c:1475
-#, c-format
-msgid "expected wanted-ref, got '%s'"
-msgstr ""
-
-#: fetch-pack.c:1480
-#, c-format
-msgid "unexpected wanted-ref: '%s'"
-msgstr ""
-
-#: fetch-pack.c:1485
-#, c-format
-msgid "error processing wanted refs: %d"
-msgstr ""
-
-#: fetch-pack.c:1515
-msgid "git fetch-pack: expected response end packet"
-msgstr ""
-
-#: fetch-pack.c:1897
-msgid "no matching remote head"
-msgstr "нет соотвествующего внешнего указателя на ветку"
-
-#: fetch-pack.c:1920 builtin/clone.c:693
-msgid "remote did not send all necessary objects"
-msgstr "внешний репозиторий прислал не все необходимые объекты"
-
-#: fetch-pack.c:1947
-#, c-format
-msgid "no such remote ref %s"
-msgstr "нет такой внешней ссылки %s"
-
-#: fetch-pack.c:1950
-#, c-format
-msgid "Server does not allow request for unadvertised object %s"
-msgstr "Сервер не поддерживает запрос необъявленного объекта %s"
-
-#: gpg-interface.c:272
-msgid "could not create temporary file"
-msgstr "не удалось создать временный файл"
-
-#: gpg-interface.c:275
-#, c-format
-msgid "failed writing detached signature to '%s'"
-msgstr "сбой записи отсоединенной подписи в «%s»"
-
-#: gpg-interface.c:457
-msgid "gpg failed to sign the data"
-msgstr "gpg не удалось подписать данные"
-
-#: graph.c:98
-#, c-format
-msgid "ignore invalid color '%.*s' in log.graphColors"
-msgstr "игнорирую недопустимый цвет «%.*s» в log.graphColors"
-
-#: grep.c:640
-msgid ""
-"given pattern contains NULL byte (via -f <file>). This is only supported "
-"with -P under PCRE v2"
-msgstr ""
-
-#: grep.c:2100
-#, c-format
-msgid "'%s': unable to read %s"
-msgstr "«%s»: не удалось прочесть %s"
-
-#: grep.c:2117 setup.c:176 builtin/clone.c:412 builtin/diff.c:89
-#: builtin/rm.c:135
-#, c-format
-msgid "failed to stat '%s'"
-msgstr "не удалось выполнить stat «%s»"
-
-#: grep.c:2128
-#, c-format
-msgid "'%s': short read"
-msgstr "«%s»: слишком мало данных прочитано"
-
-#: help.c:23
-msgid "start a working area (see also: git help tutorial)"
-msgstr "создание рабочей области (смотрите также: git help tutorial)"
-
-#: help.c:24
-msgid "work on the current change (see also: git help everyday)"
-msgstr "работа с текущими изменениями (смотрите также: git help everyday)"
-
-#: help.c:25
-msgid "examine the history and state (see also: git help revisions)"
-msgstr "просмотр истории и текущего состояния (смотрите также: git help revisions)"
-
-#: help.c:26
-msgid "grow, mark and tweak your common history"
-msgstr "выращивание, отметка и настройка вашей общей истории"
-
-#: help.c:27
-msgid "collaborate (see also: git help workflows)"
-msgstr "совместная работа (смотрите также: git help workflows)"
-
-#: help.c:31
-msgid "Main Porcelain Commands"
-msgstr "Основные машиночитаемые команды"
-
-#: help.c:32
-msgid "Ancillary Commands / Manipulators"
-msgstr "Вспомогательные команды / Манипуляторы"
-
-#: help.c:33
-msgid "Ancillary Commands / Interrogators"
-msgstr "Вспомогательные команды / Запросчики"
-
-#: help.c:34
-msgid "Interacting with Others"
-msgstr "Взаимодействие с другими"
-
-#: help.c:35
-msgid "Low-level Commands / Manipulators"
-msgstr "Низкоуровневые команды / Манипуляторы"
-
-#: help.c:36
-msgid "Low-level Commands / Interrogators"
-msgstr "Низкоуровневые команды / Запросчики"
-
-#: help.c:37
-msgid "Low-level Commands / Syncing Repositories"
-msgstr ""
-
-#: help.c:38
-msgid "Low-level Commands / Internal Helpers"
-msgstr "Низкоуровневые команды / Внутренние вспомогательные"
-
-#: help.c:300
-#, c-format
-msgid "available git commands in '%s'"
-msgstr "доступные команды git в «%s»"
-
-#: help.c:307
-msgid "git commands available from elsewhere on your $PATH"
-msgstr "команды git, доступные в других местах вашего $PATH"
-
-#: help.c:316
-msgid "These are common Git commands used in various situations:"
-msgstr "Стандартные команды Git используемые в различных ситуациях:"
-
-#: help.c:365 git.c:99
-#, c-format
-msgid "unsupported command listing type '%s'"
-msgstr "неподдерживаемый тип списка команд «%s»"
-
-#: help.c:405
-msgid "The Git concept guides are:"
-msgstr ""
-
-#: help.c:429
-msgid "See 'git help <command>' to read about a specific subcommand"
-msgstr "Запустите «git help <команда>», чтобы прочесть о конкретной подкоманде"
-
-#: help.c:434
-msgid "External commands"
-msgstr ""
-
-#: help.c:449
-msgid "Command aliases"
-msgstr ""
-
-#: help.c:527
-#, c-format
-msgid ""
-"'%s' appears to be a git command, but we were not\n"
-"able to execute it. Maybe git-%s is broken?"
-msgstr "«%s» похоже на команду git, но нам не удалось ее запустить. Возможно, git-%s  не работает?"
-
-#: help.c:543 help.c:631
-#, c-format
-msgid "git: '%s' is not a git command. See 'git --help'."
-msgstr "git: «%s» не является командой git. Смотрите «git --help»."
-
-#: help.c:591
-msgid "Uh oh. Your system reports no Git commands at all."
-msgstr "Ой-ёй! Ваша система не сообщает ни о каких командах Git вообще."
-
-#: help.c:613
-#, c-format
-msgid "WARNING: You called a Git command named '%s', which does not exist."
-msgstr "Внимание: Вы запустили не существующую команду Git «%s»."
-
-#: help.c:618
-#, c-format
-msgid "Continuing under the assumption that you meant '%s'."
-msgstr "Продолжаю, предполагая, что вы имели в виду «%s»."
-
-#: help.c:623
-#, c-format
-msgid "Continuing in %0.1f seconds, assuming that you meant '%s'."
-msgstr "Продолжу через %0.1f секунд, предполагая, что вы имели в виду «%s»."
-
-#: help.c:635
-msgid ""
-"\n"
-"The most similar command is"
-msgid_plural ""
-"\n"
-"The most similar commands are"
-msgstr[0] "\nСамые похожие команды:"
-msgstr[1] "\nСамые похожие команды:"
-msgstr[2] "\nСамые похожие команды:"
-msgstr[3] "\nСамые похожие команды:"
-
-#: help.c:675
-msgid "git version [<options>]"
-msgstr "git version [<options>]"
-
-#: help.c:730
-#, c-format
-msgid "%s: %s - %s"
-msgstr "%s: %s — %s"
-
-#: help.c:734
-msgid ""
-"\n"
-"Did you mean this?"
-msgid_plural ""
-"\n"
-"Did you mean one of these?"
-msgstr[0] "\nВозможно, вы имели в виду это?"
-msgstr[1] "\nВозможно, вы имели в виду что-то из этого?"
-msgstr[2] "\nВозможно, вы имели в виду что-то из этого?"
-msgstr[3] "\nВозможно, вы имели в виду что-то из этого?"
-
-#: ident.c:353
-msgid "Author identity unknown\n"
-msgstr ""
-
-#: ident.c:356
-msgid "Committer identity unknown\n"
-msgstr ""
-
-#: ident.c:362
-msgid ""
-"\n"
-"*** Please tell me who you are.\n"
-"\n"
-"Run\n"
-"\n"
-"  git config --global user.email \"you@example.com\"\n"
-"  git config --global user.name \"Your Name\"\n"
-"\n"
-"to set your account's default identity.\n"
-"Omit --global to set the identity only in this repository.\n"
-"\n"
-msgstr "\n*** Пожалуйста, скажите мне кто вы есть.\n\nЗапустите\n\n  git config --global user.email \"you@example.com\"\n  git config --global user.name \"Ваше Имя\"\n\nдля указания идентификационных данных аккаунта по умолчанию.\nПропустите параметр --global для указания данных только для этого репозитория.\n\n"
-
-#: ident.c:397
-msgid "no email was given and auto-detection is disabled"
-msgstr "адрес электронной почты не указан и автоопределение отключено"
-
-#: ident.c:402
-#, c-format
-msgid "unable to auto-detect email address (got '%s')"
-msgstr "не удалось выполнить автоопределение адреса электронной почты (получено «%s»)"
-
-#: ident.c:419
-msgid "no name was given and auto-detection is disabled"
-msgstr "имя не указано и автоопределение отключено"
-
-#: ident.c:425
-#, c-format
-msgid "unable to auto-detect name (got '%s')"
-msgstr "не удалось выполнить автоопределение имени (получено «%s»)"
-
-#: ident.c:433
-#, c-format
-msgid "empty ident name (for <%s>) not allowed"
-msgstr "пустое имя идентификатора (для <%s>) не разрешено"
-
-#: ident.c:439
-#, c-format
-msgid "name consists only of disallowed characters: %s"
-msgstr "имя состоит только из неразрешенных симоволов: %s"
-
-#: ident.c:454 builtin/commit.c:634
-#, c-format
-msgid "invalid date format: %s"
-msgstr "неправильный формат даты: %s"
-
-#: list-objects-filter-options.c:81
-msgid "expected 'tree:<depth>'"
-msgstr ""
-
-#: list-objects-filter-options.c:96
-msgid "sparse:path filters support has been dropped"
-msgstr ""
-
-#: list-objects-filter-options.c:109
-#, c-format
-msgid "invalid filter-spec '%s'"
-msgstr ""
-
-#: list-objects-filter-options.c:125
-#, c-format
-msgid "must escape char in sub-filter-spec: '%c'"
-msgstr ""
-
-#: list-objects-filter-options.c:167
-msgid "expected something after combine:"
-msgstr ""
-
-#: list-objects-filter-options.c:249
-msgid "multiple filter-specs cannot be combined"
-msgstr "невозможно объединять фильтрацию с помощью нескольких спецификаций"
-
-#: list-objects-filter-options.c:361
-msgid "unable to upgrade repository format to support partial clone"
-msgstr ""
-
-#: list-objects-filter.c:492
-#, c-format
-msgid "unable to access sparse blob in '%s'"
-msgstr ""
-
-#: list-objects-filter.c:495
-#, c-format
-msgid "unable to parse sparse filter data in %s"
-msgstr ""
-
-#: list-objects.c:127
-#, c-format
-msgid "entry '%s' in tree %s has tree mode, but is not a tree"
-msgstr ""
-
-#: list-objects.c:140
-#, c-format
-msgid "entry '%s' in tree %s has blob mode, but is not a blob"
-msgstr ""
-
-#: list-objects.c:375
-#, c-format
-msgid "unable to load root tree for commit %s"
-msgstr ""
-
-#: lockfile.c:152
-#, c-format
-msgid ""
-"Unable to create '%s.lock': %s.\n"
-"\n"
-"Another git process seems to be running in this repository, e.g.\n"
-"an editor opened by 'git commit'. Please make sure all processes\n"
-"are terminated then try again. If it still fails, a git process\n"
-"may have crashed in this repository earlier:\n"
-"remove the file manually to continue."
-msgstr "Не удалось создать «%s.lock»: %s.\n\nПохоже, что другой процесс git запущен в этом репозитории,\nнапример редактор открыт из «git commit». Пожалуйста, убедитесь,\nчто все процессы были завершены и потом попробуйте снова.\nЕсли это не поможет, то возможно процесс git был ранее завершен\nс ошибкой в этом репозитории: \nудалите файл вручную для продолжения."
-
-#: lockfile.c:160
-#, c-format
-msgid "Unable to create '%s.lock': %s"
-msgstr "Не удалось создать «%s.lock»: %s"
-
-#: ls-refs.c:109
-msgid "expected flush after ls-refs arguments"
-msgstr ""
-
-#: merge-ort-wrappers.c:13 merge-recursive.c:3672
-#, 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:3436
-#, c-format
-msgid "Already up to date!"
-msgstr "Уже обновлено!"
-
-#: merge-recursive.c:356
-msgid "(bad commit)\n"
-msgstr "(плохой коммит)\n"
-
-#: merge-recursive.c:379
-#, c-format
-msgid "add_cacheinfo failed for path '%s'; merge aborting."
-msgstr "сбой add_cacheinfo для пути «%s»; отмена слияния."
-
-#: merge-recursive.c:388
-#, c-format
-msgid "add_cacheinfo failed to refresh for path '%s'; merge aborting."
-msgstr "сбой обновления add_cacheinfo для пути «%s»; отмена слияния."
-
-#: merge-recursive.c:874
-#, c-format
-msgid "failed to create path '%s'%s"
-msgstr "не удалось создать путь «%s»%s"
-
-#: merge-recursive.c:885
-#, c-format
-msgid "Removing %s to make room for subdirectory\n"
-msgstr "Удаление %s, чтобы освободить место для подкаталогов\n"
-
-#: merge-recursive.c:899 merge-recursive.c:918
-msgid ": perhaps a D/F conflict?"
-msgstr ": возможно, конфликт каталогов/файлов?"
-
-#: merge-recursive.c:908
-#, c-format
-msgid "refusing to lose untracked file at '%s'"
-msgstr "отказ потери неотслеживаемого файла в «%s»"
-
-#: merge-recursive.c:949 builtin/cat-file.c:41
-#, c-format
-msgid "cannot read object %s '%s'"
-msgstr "невозможно прочитать объект %s «%s»"
-
-#: merge-recursive.c:954
-#, c-format
-msgid "blob expected for %s '%s'"
-msgstr "ожидается двоичный объект для %s «%s»"
-
-#: merge-recursive.c:979
-#, c-format
-msgid "failed to open '%s': %s"
-msgstr "не удалось открыть «%s»: %s"
-
-#: merge-recursive.c:990
-#, c-format
-msgid "failed to symlink '%s': %s"
-msgstr "не удалось создать символьную ссылку «%s»: %s"
-
-#: merge-recursive.c:995
-#, c-format
-msgid "do not know what to do with %06o %s '%s'"
-msgstr "не понятно, что делать с %06o %s «%s»"
-
-#: merge-recursive.c:1191
-#, c-format
-msgid "Failed to merge submodule %s (not checked out)"
-msgstr "Не удалось слить подмодуль %s (состояние не забрано)"
-
-#: merge-recursive.c:1198
-#, c-format
-msgid "Failed to merge submodule %s (commits not present)"
-msgstr "Не удалось слить подмодуль %s (нет коммитов)"
-
-#: merge-recursive.c:1205
-#, c-format
-msgid "Failed to merge submodule %s (commits don't follow merge-base)"
-msgstr "Не удалось слить подмодуль %s (у коммитов другая база слияния)"
-
-#: merge-recursive.c:1213 merge-recursive.c:1225
-#, c-format
-msgid "Fast-forwarding submodule %s to the following commit:"
-msgstr "Перемотка вперед подмодуля %s до указанного коммита:"
-
-#: merge-recursive.c:1216 merge-recursive.c:1228
-#, c-format
-msgid "Fast-forwarding submodule %s"
-msgstr "Перемотка вперед подмодуля %s"
-
-#: merge-recursive.c:1251
-#, c-format
-msgid "Failed to merge submodule %s (merge following commits not found)"
-msgstr "Не удалось слить подмодуль %s (нет указанных коммитов для слияния)"
-
-#: merge-recursive.c:1255
-#, c-format
-msgid "Failed to merge submodule %s (not fast-forward)"
-msgstr "Не удалось слить подмодуль %s (нельзя сделать перемотку вперед)"
-
-#: merge-recursive.c:1256
-msgid "Found a possible merge resolution for the submodule:\n"
-msgstr "Найдено возможное разрешение слиятия для подмодуля:\n"
-
-#: merge-recursive.c:1259
-#, c-format
-msgid ""
-"If this is correct simply add it to the index for example\n"
-"by using:\n"
-"\n"
-"  git update-index --cacheinfo 160000 %s \"%s\"\n"
-"\n"
-"which will accept this suggestion.\n"
-msgstr "Если оно верное, то просто добавьте его в индекс, например так:\n\n  git update-index --cacheinfo 160000 %s \"%s\"\n\nтем самым принимая это предположение.\n"
-
-#: merge-recursive.c:1268
-#, c-format
-msgid "Failed to merge submodule %s (multiple merges found)"
-msgstr "Не удалось слить подмодуль %s (найдено несколько слияний)"
-
-#: merge-recursive.c:1341
-msgid "Failed to execute internal merge"
-msgstr "Не удалось запустить внутреннее слияние"
-
-#: merge-recursive.c:1346
-#, c-format
-msgid "Unable to add %s to database"
-msgstr "Не удалось добавить %s в базу данных"
-
-#: merge-recursive.c:1378
-#, c-format
-msgid "Auto-merging %s"
-msgstr "Автослияние %s"
-
-#: merge-recursive.c:1402
-#, c-format
-msgid "Error: Refusing to lose untracked file at %s; writing to %s instead."
-msgstr "Ошибка: Отказ потери неотслеживаемого файла %s; запись в %s взамен."
-
-#: merge-recursive.c:1474
-#, c-format
-msgid ""
-"CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s left "
-"in tree."
-msgstr "КОНФЛИКТ (%s/удаление): %s удалено в %s и %s в %s. Версия %s из %s оставлена в дереве."
-
-#: merge-recursive.c:1479
-#, c-format
-msgid ""
-"CONFLICT (%s/delete): %s deleted in %s and %s to %s in %s. Version %s of %s "
-"left in tree."
-msgstr "КОНФЛИКТ (%s/удаление): %s удалено в %s и от %s до %s в %s. Версия %s из %s оставлена в дереве."
-
-#: merge-recursive.c:1486
-#, c-format
-msgid ""
-"CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s left "
-"in tree at %s."
-msgstr "КОНФЛИКТ (%s/удаление): %s удалено в %s и %s в %s. Версия %s из %s оставлена в дереве на %s."
-
-#: merge-recursive.c:1491
-#, 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 "КОНФЛИКТ (%s/удаление): %s удалено в %s и от %s до %s в %s. Версия %s из %s оставлена в дереве на %s."
-
-#: merge-recursive.c:1526
-msgid "rename"
-msgstr "переименование"
-
-#: merge-recursive.c:1526
-msgid "renamed"
-msgstr "переименовано"
-
-#: merge-recursive.c:1577 merge-recursive.c:2484 merge-recursive.c:3129
-#, c-format
-msgid "Refusing to lose dirty file at %s"
-msgstr "Отказ потери изменённого файла %s"
-
-#: merge-recursive.c:1587
-#, c-format
-msgid "Refusing to lose untracked file at %s, even though it's in the way."
-msgstr "Отказ потери неотслеживаемого файла %s, даже с учетом его наличия."
-
-#: merge-recursive.c:1645
-#, c-format
-msgid "CONFLICT (rename/add): Rename %s->%s in %s.  Added %s in %s"
-msgstr ""
-
-#: merge-recursive.c:1676
-#, c-format
-msgid "%s is a directory in %s adding as %s instead"
-msgstr "%s — это каталог в %s, добавляем как %s вместо этого"
-
-#: merge-recursive.c:1681
-#, c-format
-msgid "Refusing to lose untracked file at %s; adding as %s instead"
-msgstr "Отказ потери неотслеживаемого файла %s; добавление как %s взамен."
-
-#: merge-recursive.c:1708
-#, c-format
-msgid ""
-"CONFLICT (rename/rename): Rename \"%s\"->\"%s\" in branch \"%s\" rename "
-"\"%s\"->\"%s\" in \"%s\"%s"
-msgstr "КОНФЛИКТ (переименование/переименование): Переименование «%s»→«%s» в ветке «%s» и переименование «%s»→«%s» в ветке «%s»%s"
-
-#: merge-recursive.c:1713
-msgid " (left unresolved)"
-msgstr " (оставлено неразрешенным)"
-
-#: merge-recursive.c:1805
-#, 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:2068
-#, c-format
-msgid ""
-"CONFLICT (directory rename split): Unclear where to place %s because "
-"directory %s was renamed to multiple other directories, with no destination "
-"getting a majority of the files."
-msgstr ""
-
-#: merge-recursive.c:2100
-#, 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-recursive.c:2110
-#, 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-recursive.c:2202
-#, c-format
-msgid ""
-"CONFLICT (rename/rename): Rename directory %s->%s in %s. Rename directory "
-"%s->%s in %s"
-msgstr ""
-
-#: merge-recursive.c:2447
-#, c-format
-msgid ""
-"WARNING: Avoiding applying %s -> %s rename to %s, because %s itself was "
-"renamed."
-msgstr ""
-
-#: merge-recursive.c:2973
-#, c-format
-msgid "cannot read object %s"
-msgstr "невозможно прочитать объект «%s»"
-
-#: merge-recursive.c:2976
-#, c-format
-msgid "object %s is not a blob"
-msgstr "объект %s не является двоичным объектом"
-
-#: merge-recursive.c:3040
-msgid "modify"
-msgstr "изменение"
-
-#: merge-recursive.c:3040
-msgid "modified"
-msgstr "изменено"
-
-#: merge-recursive.c:3052
-msgid "content"
-msgstr "содержимое"
-
-#: merge-recursive.c:3056
-msgid "add/add"
-msgstr "добавление/добавление"
-
-#: merge-recursive.c:3079
-#, c-format
-msgid "Skipped %s (merged same as existing)"
-msgstr "Пропуск %s (слиты одинаковые изменения как существующие)"
-
-#: merge-recursive.c:3101
-msgid "submodule"
-msgstr "подмодуль"
-
-#: merge-recursive.c:3102
-#, c-format
-msgid "CONFLICT (%s): Merge conflict in %s"
-msgstr "КОНФЛИКТ (%s): Конфликт слияния в %s"
-
-#: merge-recursive.c:3132
-#, c-format
-msgid "Adding as %s instead"
-msgstr "Добавление вместо этого как %s"
-
-#: merge-recursive.c:3215
-#, c-format
-msgid ""
-"Path updated: %s added in %s inside a directory that was renamed in %s; "
-"moving it to %s."
-msgstr ""
-
-#: merge-recursive.c:3218
-#, 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-recursive.c:3222
-#, 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-recursive.c:3225
-#, 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-recursive.c:3339
-#, c-format
-msgid "Removing %s"
-msgstr "Удаление %s"
-
-#: merge-recursive.c:3362
-msgid "file/directory"
-msgstr "файл/каталог"
-
-#: merge-recursive.c:3367
-msgid "directory/file"
-msgstr "каталог/файл"
-
-#: merge-recursive.c:3374
-#, 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:3383
-#, c-format
-msgid "Adding %s"
-msgstr "Добавление %s"
-
-#: merge-recursive.c:3392
-#, c-format
-msgid "CONFLICT (add/add): Merge conflict in %s"
-msgstr ""
-
-#: merge-recursive.c:3445
-#, c-format
-msgid "merging of trees %s and %s failed"
-msgstr "сбой слияния деревьев «%s» и «%s»"
-
-#: merge-recursive.c:3550
-msgid "Merging:"
-msgstr "Слияние:"
-
-#: merge-recursive.c:3563
-#, c-format
-msgid "found %u common ancestor:"
-msgid_plural "found %u common ancestors:"
-msgstr[0] "найден %u общий предок:"
-msgstr[1] "найдено %u общих предка:"
-msgstr[2] "найдено %u общих предков:"
-msgstr[3] "найдено %u общих предков:"
-
-#: merge-recursive.c:3613
-msgid "merge returned no commit"
-msgstr "слияние не вернуло коммит"
-
-#: merge-recursive.c:3769
-#, c-format
-msgid "Could not parse object '%s'"
-msgstr "Не удалось разобрать объект «%s»"
-
-#: merge-recursive.c:3787 builtin/merge.c:711 builtin/merge.c:895
-msgid "Unable to write index."
-msgstr "Не удается записать индекс."
-
-#: merge.c:41
-msgid "failed to read the cache"
-msgstr "сбой чтения кэша"
-
-#: merge.c:109 rerere.c:720 builtin/am.c:1883 builtin/am.c:1917
-#: builtin/checkout.c:573 builtin/checkout.c:829 builtin/clone.c:817
-#: builtin/stash.c:265
-msgid "unable to write new index file"
-msgstr "не удалось записать новый файл индекса"
-
-#: midx.c:80
-#, c-format
-msgid "multi-pack-index file %s is too small"
-msgstr ""
-
-#: midx.c:96
-#, c-format
-msgid "multi-pack-index signature 0x%08x does not match signature 0x%08x"
-msgstr ""
-
-#: midx.c:101
-#, c-format
-msgid "multi-pack-index version %d not recognized"
-msgstr ""
-
-#: midx.c:106
-#, c-format
-msgid "multi-pack-index hash version %u does not match version %u"
-msgstr ""
-
-#: midx.c:123
-msgid "invalid chunk offset (too large)"
-msgstr ""
-
-#: midx.c:147
-msgid "terminating multi-pack-index chunk id appears earlier than expected"
-msgstr ""
-
-#: midx.c:160
-msgid "multi-pack-index missing required pack-name chunk"
-msgstr ""
-
-#: midx.c:162
-msgid "multi-pack-index missing required OID fanout chunk"
-msgstr ""
-
-#: midx.c:164
-msgid "multi-pack-index missing required OID lookup chunk"
-msgstr ""
-
-#: midx.c:166
-msgid "multi-pack-index missing required object offsets chunk"
-msgstr ""
-
-#: midx.c:180
-#, c-format
-msgid "multi-pack-index pack names out of order: '%s' before '%s'"
-msgstr ""
-
-#: midx.c:223
-#, c-format
-msgid "bad pack-int-id: %u (%u total packs)"
-msgstr ""
-
-#: midx.c:273
-msgid "multi-pack-index stores a 64-bit offset, but off_t is too small"
-msgstr ""
-
-#: midx.c:480
-#, c-format
-msgid "failed to add packfile '%s'"
-msgstr ""
-
-#: midx.c:486
-#, c-format
-msgid "failed to open pack-index '%s'"
-msgstr ""
-
-#: midx.c:546
-#, c-format
-msgid "failed to locate object %d in packfile"
-msgstr ""
-
-#: midx.c:846
-msgid "Adding packfiles to multi-pack-index"
-msgstr ""
-
-#: midx.c:879
-#, c-format
-msgid "did not see pack-file %s to drop"
-msgstr ""
-
-#: midx.c:931
-msgid "no pack files to index."
-msgstr ""
-
-#: midx.c:982
-msgid "Writing chunks to multi-pack-index"
-msgstr ""
-
-#: midx.c:1060
-#, c-format
-msgid "failed to clear multi-pack-index at %s"
-msgstr ""
-
-#: midx.c:1116
-msgid "multi-pack-index file exists, but failed to parse"
-msgstr ""
-
-#: midx.c:1124
-msgid "Looking for referenced packfiles"
-msgstr ""
-
-#: midx.c:1139
-#, c-format
-msgid ""
-"oid fanout out of order: fanout[%d] = %<PRIx32> > %<PRIx32> = fanout[%d]"
-msgstr ""
-
-#: midx.c:1144
-msgid "the midx contains no oid"
-msgstr ""
-
-#: midx.c:1153
-msgid "Verifying OID order in multi-pack-index"
-msgstr ""
-
-#: midx.c:1162
-#, c-format
-msgid "oid lookup out of order: oid[%d] = %s >= %s = oid[%d]"
-msgstr ""
-
-#: midx.c:1182
-msgid "Sorting objects by packfile"
-msgstr ""
-
-#: midx.c:1189
-msgid "Verifying object offsets"
-msgstr ""
-
-#: midx.c:1205
-#, c-format
-msgid "failed to load pack entry for oid[%d] = %s"
-msgstr ""
-
-#: midx.c:1211
-#, c-format
-msgid "failed to load pack-index for packfile %s"
-msgstr ""
-
-#: midx.c:1220
-#, c-format
-msgid "incorrect object offset for oid[%d] = %s: %<PRIx64> != %<PRIx64>"
-msgstr ""
-
-#: midx.c:1245
-msgid "Counting referenced objects"
-msgstr ""
-
-#: midx.c:1255
-msgid "Finding and deleting unreferenced packfiles"
-msgstr ""
-
-#: midx.c:1446
-msgid "could not start pack-objects"
-msgstr ""
-
-#: midx.c:1466
-msgid "could not finish pack-objects"
-msgstr ""
-
-#: name-hash.c:537
-#, c-format
-msgid "unable to create lazy_dir thread: %s"
-msgstr ""
-
-#: name-hash.c:559
-#, c-format
-msgid "unable to create lazy_name thread: %s"
-msgstr ""
-
-#: name-hash.c:565
-#, c-format
-msgid "unable to join lazy_name thread: %s"
-msgstr ""
-
-#: notes-merge.c:277
-#, 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."
-msgstr "Вы не закончили предыдущее слияние заметок (%s существует).\nЗапустите «git notes merge --commit» или «git notes merge --abort» для коммита или отмены предыдущего слияния и запуска нового слияния заметок."
-
-#: notes-merge.c:284
-#, c-format
-msgid "You have not concluded your notes merge (%s exists)."
-msgstr "Вы не закончили предыдущее слияние заметок (%s существует)."
-
-#: notes-utils.c:46
-msgid "Cannot commit uninitialized/unreferenced notes tree"
-msgstr "Нельзя закоммитить неинициализированное или не имеющее ссылок дерево заметок"
-
-#: notes-utils.c:105
-#, c-format
-msgid "Bad notes.rewriteMode value: '%s'"
-msgstr "Неправильное значение notes.rewriteMode: «%s»"
-
-#: notes-utils.c:115
-#, c-format
-msgid "Refusing to rewrite notes in %s (outside of refs/notes/)"
-msgstr "Отказ в перезаписи заметок в %s (за пределами refs/notes/)"
-
-#. TRANSLATORS: The first %s is the name of
-#. the environment variable, the second %s is
-#. its value.
-#: notes-utils.c:145
-#, c-format
-msgid "Bad %s value: '%s'"
-msgstr "Неправильное значение переменной %s: «%s»"
-
-#: object.c:53
-#, c-format
-msgid "invalid object type \"%s\""
-msgstr ""
-
-#: object.c:173
-#, c-format
-msgid "object %s is a %s, not a %s"
-msgstr ""
-
-#: object.c:233
-#, c-format
-msgid "object %s has unknown type id %d"
-msgstr ""
-
-#: object.c:246
-#, c-format
-msgid "unable to parse object: %s"
-msgstr "не удалось разобрать объект: %s"
-
-#: object.c:266 object.c:278
-#, c-format
-msgid "hash mismatch %s"
-msgstr "несоответствие хэш-кода %s"
-
-#: pack-bitmap.c:815 pack-bitmap.c:821 builtin/pack-objects.c:2216
-#, c-format
-msgid "unable to get size of %s"
-msgstr "не удалось получить размер %s"
-
-#: packfile.c:615
-msgid "offset before end of packfile (broken .idx?)"
-msgstr "сдвиг до конца файла пакета (возможно, повреждён файл .idx?)"
-
-#: packfile.c:1907
-#, c-format
-msgid "offset before start of pack index for %s (corrupt index?)"
-msgstr "сдвиг до начала индекса пакета для %s (повреждён индекс?)"
-
-#: packfile.c:1911
-#, 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
-#, c-format
-msgid "option `%s' expects a numerical value"
-msgstr ""
-
-#: parse-options-cb.c:41
-#, c-format
-msgid "malformed expiration date '%s'"
-msgstr ""
-
-#: parse-options-cb.c:54
-#, c-format
-msgid "option `%s' expects \"always\", \"auto\", or \"never\""
-msgstr ""
-
-#: parse-options-cb.c:132 parse-options-cb.c:149
-#, c-format
-msgid "malformed object name '%s'"
-msgstr "Неправильное имя объекта «%s»"
-
-#: parse-options.c:38
-#, c-format
-msgid "%s requires a value"
-msgstr ""
-
-#: parse-options.c:73
-#, c-format
-msgid "%s is incompatible with %s"
-msgstr ""
-
-#: parse-options.c:78
-#, c-format
-msgid "%s : incompatible with something else"
-msgstr ""
-
-#: parse-options.c:92 parse-options.c:96 parse-options.c:317
-#, c-format
-msgid "%s takes no value"
-msgstr ""
-
-#: parse-options.c:94
-#, c-format
-msgid "%s isn't available"
-msgstr ""
-
-#: parse-options.c:217
-#, c-format
-msgid "%s expects a non-negative integer value with an optional k/m/g suffix"
-msgstr ""
-
-#: parse-options.c:386
-#, c-format
-msgid "ambiguous option: %s (could be --%s%s or --%s%s)"
-msgstr ""
-
-#: parse-options.c:420 parse-options.c:428
-#, c-format
-msgid "did you mean `--%s` (with two dashes)?"
-msgstr ""
-
-#: parse-options.c:666 parse-options.c:971
-#, c-format
-msgid "alias of --%s"
-msgstr ""
-
-#: parse-options.c:862
-#, c-format
-msgid "unknown option `%s'"
-msgstr ""
-
-#: parse-options.c:864
-#, c-format
-msgid "unknown switch `%c'"
-msgstr ""
-
-#: parse-options.c:866
-#, c-format
-msgid "unknown non-ascii option in string: `%s'"
-msgstr ""
-
-#: parse-options.c:890
-msgid "..."
-msgstr "…"
-
-#: parse-options.c:909
-#, c-format
-msgid "usage: %s"
-msgstr "использование: %s"
-
-#. TRANSLATORS: the colon here should align with the
-#. one in "usage: %s" translation.
-#: parse-options.c:915
-#, c-format
-msgid "   or: %s"
-msgstr "          или: %s"
-
-#: parse-options.c:918
-#, c-format
-msgid "    %s"
-msgstr "            %s"
-
-#: parse-options.c:957
-msgid "-NUM"
-msgstr "-КОЛИЧЕСТВО"
-
-#: path.c:915
-#, c-format
-msgid "Could not make %s writable by group"
-msgstr "Не удалось предоставить доступ к %s на запись"
-
-#: pathspec.c:130
-msgid "Escape character '\\' not allowed as last character in attr value"
-msgstr "Управляющий символ «\\» не разрешен как последний символ в значении attr"
-
-#: pathspec.c:148
-msgid "Only one 'attr:' specification is allowed."
-msgstr "Разрешен только один спецификатор «attr:»."
-
-#: pathspec.c:151
-msgid "attr spec must not be empty"
-msgstr "спецификатор attr не должен быть пустой"
-
-#: pathspec.c:194
-#, c-format
-msgid "invalid attribute name %s"
-msgstr "недопустимое имя атрибута %s"
-
-#: pathspec.c:259
-msgid "global 'glob' and 'noglob' pathspec settings are incompatible"
-msgstr "глобальные опции спецификаторов пути «glob» и «noglob» нельзя использовать одновременно"
-
-#: pathspec.c:266
-msgid ""
-"global 'literal' pathspec setting is incompatible with all other global "
-"pathspec settings"
-msgstr "глобальная опция спецификатора пути «literal» не совместима с другими глобальными спецификаторами доступа"
-
-#: pathspec.c:306
-msgid "invalid parameter for pathspec magic 'prefix'"
-msgstr "неправильный параметр для магического слова «prefix» в спецификаторе пути"
-
-#: pathspec.c:327
-#, c-format
-msgid "Invalid pathspec magic '%.*s' in '%s'"
-msgstr "неправильное магическое слово «%.*s» в спецификаторе пути «%s»"
-
-#: pathspec.c:332
-#, c-format
-msgid "Missing ')' at the end of pathspec magic in '%s'"
-msgstr "Пропущено «)» в конце магического слова спецификатора пути «%s»"
-
-#: pathspec.c:370
-#, c-format
-msgid "Unimplemented pathspec magic '%c' in '%s'"
-msgstr "Нереализованное магическое слово «%c» спецификатора пути «%s»"
-
-#: pathspec.c:429
-#, c-format
-msgid "%s: 'literal' and 'glob' are incompatible"
-msgstr "%s: «literal» и «glob» не совместимы"
-
-#: pathspec.c:445
-#, c-format
-msgid "%s: '%s' is outside repository at '%s'"
-msgstr ""
-
-#: pathspec.c:521
-#, c-format
-msgid "'%s' (mnemonic: '%c')"
-msgstr "«%s» (мнемоника: «%c»)"
-
-#: pathspec.c:531
-#, c-format
-msgid "%s: pathspec magic not supported by this command: %s"
-msgstr "%s: магические слова в спецификаторе пути не поддерживаются командой: %s"
-
-#: pathspec.c:598
-#, c-format
-msgid "pathspec '%s' is beyond a symbolic link"
-msgstr "спецификатор пути «%s» находится за символической ссылкой"
-
-#: pathspec.c:643
-#, c-format
-msgid "line is badly quoted: %s"
-msgstr ""
-
-#: pkt-line.c:92
-msgid "unable to write flush packet"
-msgstr ""
-
-#: pkt-line.c:99
-msgid "unable to write delim packet"
-msgstr ""
-
-#: pkt-line.c:106
-msgid "unable to write stateless separator packet"
-msgstr ""
-
-#: pkt-line.c:113
-msgid "flush packet write failed"
-msgstr ""
-
-#: pkt-line.c:153 pkt-line.c:239
-msgid "protocol error: impossibly long line"
-msgstr ""
-
-#: pkt-line.c:169 pkt-line.c:171
-msgid "packet write with format failed"
-msgstr ""
-
-#: pkt-line.c:203
-msgid "packet write failed - data exceeds max packet size"
-msgstr ""
-
-#: pkt-line.c:210 pkt-line.c:217
-msgid "packet write failed"
-msgstr ""
-
-#: pkt-line.c:302
-msgid "read error"
-msgstr ""
-
-#: pkt-line.c:310
-msgid "the remote end hung up unexpectedly"
-msgstr ""
-
-#: pkt-line.c:338
-#, c-format
-msgid "protocol error: bad line length character: %.4s"
-msgstr ""
-
-#: pkt-line.c:352 pkt-line.c:357
-#, c-format
-msgid "protocol error: bad line length %d"
-msgstr ""
-
-#: pkt-line.c:373 sideband.c:165
-#, c-format
-msgid "remote error: %s"
-msgstr "ошибка внешнего репозитория: %s"
-
-#: preload-index.c:119
-msgid "Refreshing index"
-msgstr ""
-
-#: preload-index.c:138
-#, c-format
-msgid "unable to create threaded lstat: %s"
-msgstr ""
-
-#: pretty.c:983
-msgid "unable to parse --pretty format"
-msgstr "не удалось разобрать формат для --pretty"
-
-#: promisor-remote.c:30
-msgid "promisor-remote: unable to fork off fetch subprocess"
-msgstr ""
-
-#: promisor-remote.c:35 promisor-remote.c:37
-msgid "promisor-remote: could not write to fetch subprocess"
-msgstr ""
-
-#: promisor-remote.c:41
-msgid "promisor-remote: could not close stdin to fetch subprocess"
-msgstr ""
-
-#: promisor-remote.c:53
-#, c-format
-msgid "promisor remote name cannot begin with '/': %s"
-msgstr ""
-
-#: prune-packed.c:35
-msgid "Removing duplicate objects"
-msgstr "Удаление дублирующихся объектов"
-
-#: range-diff.c:77
-msgid "could not start `log`"
-msgstr ""
-
-#: range-diff.c:79
-msgid "could not read `log` output"
-msgstr ""
-
-#: range-diff.c:98 sequencer.c:5310
-#, c-format
-msgid "could not parse commit '%s'"
-msgstr "не удалось разобрать коммит «%s»"
-
-#: range-diff.c:112
-#, c-format
-msgid ""
-"could not parse first line of `log` output: did not start with 'commit ': "
-"'%s'"
-msgstr ""
-
-#: range-diff.c:137
-#, c-format
-msgid "could not parse git header '%.*s'"
-msgstr ""
-
-#: range-diff.c:299
-msgid "failed to generate diff"
-msgstr ""
-
-#: range-diff.c:532 range-diff.c:534
-#, c-format
-msgid "could not parse log for '%s'"
-msgstr ""
-
-#: read-cache.c:682
-#, c-format
-msgid "will not add file alias '%s' ('%s' already exists in index)"
-msgstr ""
-
-#: read-cache.c:698
-msgid "cannot create an empty blob in the object database"
-msgstr ""
-
-#: read-cache.c:720
-#, c-format
-msgid "%s: can only add regular files, symbolic links or git-directories"
-msgstr ""
-
-#: read-cache.c:725
-#, c-format
-msgid "'%s' does not have a commit checked out"
-msgstr ""
-
-#: read-cache.c:777
-#, c-format
-msgid "unable to index file '%s'"
-msgstr ""
-
-#: read-cache.c:796
-#, c-format
-msgid "unable to add '%s' to index"
-msgstr ""
-
-#: read-cache.c:807
-#, c-format
-msgid "unable to stat '%s'"
-msgstr ""
-
-#: read-cache.c:1318
-#, c-format
-msgid "'%s' appears as both a file and as a directory"
-msgstr ""
-
-#: read-cache.c:1524
-msgid "Refresh index"
-msgstr ""
-
-#: read-cache.c:1639
-#, c-format
-msgid ""
-"index.version set, but the value is invalid.\n"
-"Using version %i"
-msgstr "index.version указан, но значение недействительное.\nИспользую версию %i"
-
-#: read-cache.c:1649
-#, c-format
-msgid ""
-"GIT_INDEX_VERSION set, but the value is invalid.\n"
-"Using version %i"
-msgstr "GIT_INDEX_VERSION указан, но значение недействительное.\nИспользую версию %i"
-
-#: read-cache.c:1705
-#, c-format
-msgid "bad signature 0x%08x"
-msgstr ""
-
-#: read-cache.c:1708
-#, c-format
-msgid "bad index version %d"
-msgstr ""
-
-#: read-cache.c:1717
-msgid "bad index file sha1 signature"
-msgstr ""
-
-#: read-cache.c:1747
-#, c-format
-msgid "index uses %.4s extension, which we do not understand"
-msgstr ""
-
-#: read-cache.c:1749
-#, c-format
-msgid "ignoring %.4s extension"
-msgstr ""
-
-#: read-cache.c:1786
-#, c-format
-msgid "unknown index entry format 0x%08x"
-msgstr ""
-
-#: read-cache.c:1802
-#, c-format
-msgid "malformed name field in the index, near path '%s'"
-msgstr ""
-
-#: read-cache.c:1859
-msgid "unordered stage entries in index"
-msgstr ""
-
-#: read-cache.c:1862
-#, c-format
-msgid "multiple stage entries for merged file '%s'"
-msgstr ""
-
-#: read-cache.c:1865
-#, c-format
-msgid "unordered stage entries for '%s'"
-msgstr ""
-
-#: read-cache.c:1971 read-cache.c:2262 rerere.c:565 rerere.c:599 rerere.c:1111
-#: submodule.c:1628 builtin/add.c:538 builtin/check-ignore.c:181
-#: builtin/checkout.c:502 builtin/checkout.c:688 builtin/clean.c:991
-#: builtin/commit.c:364 builtin/diff-tree.c:122 builtin/grep.c:507
-#: builtin/mv.c:146 builtin/reset.c:247 builtin/rm.c:290
-#: builtin/submodule--helper.c:332
-msgid "index file corrupt"
-msgstr "файл индекса поврежден"
-
-#: read-cache.c:2115
-#, c-format
-msgid "unable to create load_cache_entries thread: %s"
-msgstr ""
-
-#: read-cache.c:2128
-#, c-format
-msgid "unable to join load_cache_entries thread: %s"
-msgstr ""
-
-#: read-cache.c:2161
-#, c-format
-msgid "%s: index file open failed"
-msgstr ""
-
-#: read-cache.c:2165
-#, c-format
-msgid "%s: cannot stat the open index"
-msgstr ""
-
-#: read-cache.c:2169
-#, c-format
-msgid "%s: index file smaller than expected"
-msgstr ""
-
-#: read-cache.c:2173
-#, c-format
-msgid "%s: unable to map index file"
-msgstr ""
-
-#: read-cache.c:2215
-#, c-format
-msgid "unable to create load_index_extensions thread: %s"
-msgstr ""
-
-#: read-cache.c:2242
-#, c-format
-msgid "unable to join load_index_extensions thread: %s"
-msgstr ""
-
-#: read-cache.c:2274
-#, c-format
-msgid "could not freshen shared index '%s'"
-msgstr ""
-
-#: read-cache.c:2321
-#, c-format
-msgid "broken index, expect %s in %s, got %s"
-msgstr ""
-
-#: read-cache.c:3017 strbuf.c:1171 wrapper.c:633 builtin/merge.c:1140
-#, c-format
-msgid "could not close '%s'"
-msgstr "не удалось закрыть «%s»"
-
-#: read-cache.c:3120 sequencer.c:2479 sequencer.c:4231
-#, c-format
-msgid "could not stat '%s'"
-msgstr "не удалось выполнить stat для «%s»"
-
-#: read-cache.c:3133
-#, c-format
-msgid "unable to open git dir: %s"
-msgstr "не удалось открыть каталог git: %s"
-
-#: read-cache.c:3145
-#, c-format
-msgid "unable to unlink: %s"
-msgstr "не удалось отсоединить: %s"
-
-#: read-cache.c:3170
-#, c-format
-msgid "cannot fix permission bits on '%s'"
-msgstr ""
-
-#: read-cache.c:3319
-#, c-format
-msgid "%s: cannot drop to stage #0"
-msgstr ""
-
-#: rebase-interactive.c:11
-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 "Вы можете исправить это с помощью «git rebase --edit-todo», а потом запустив «git rebase --continue».\nИли вы можете прервать процесс перемещения, выполнив «git rebase --abort»\n"
-
-#: rebase-interactive.c:33
-#, c-format
-msgid ""
-"unrecognized setting %s for option rebase.missingCommitsCheck. Ignoring."
-msgstr "нераспознанная настройка %s для опции rebase.missingCommitsCheck. Игнорирую."
-
-#: rebase-interactive.c:42
-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 <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"
-"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Команды:\np, pick <коммит> = использовать коммит\nr, reword <коммит> = использовать коммит, но изменить сообщение коммита\ne, edit <коммит> = использовать коммит, но остановиться для исправления\ns, squash <коммит> = использовать коммит, но объединить с предыдущим коммитом\nf, fixup <коммит> = как «squash», но пропустить сообщение коммита\nx, exec <команда> = выполнить команду (остаток строки) с помощью командной оболочки\nb, break = остановиться здесь (продолжить с помощью «git rebase --continue»)\nd, drop <коммит> = удалить коммит\nl, label <метка> = дать имя текущему HEAD\nt, reset <метка> = сбросить HEAD к указанной метке\nm, merge [-C <коммит> | -c <коммит>] <метка> [# <строка>]\n. создать слияние используя сообщение коммита оригинального\n. слияния (или использовать указанную строку, если оригинальное\n. слияние не указано). Используйте -c <коммит> чтобы изменить\n. сообщение коммита.\n\nЭти строки можно перемещать; они будут выполнены сверху вниз.\n"
-
-#: rebase-interactive.c:63
-#, c-format
-msgid "Rebase %s onto %s (%d command)"
-msgid_plural "Rebase %s onto %s (%d commands)"
-msgstr[0] ""
-msgstr[1] ""
-msgstr[2] ""
-msgstr[3] ""
-
-#: rebase-interactive.c:72 git-rebase--preserve-merges.sh:218
-msgid ""
-"\n"
-"Do not remove any line. Use 'drop' explicitly to remove a commit.\n"
-msgstr "\nНе удаляйте строки. Используйте «drop», чтобы явно удалить коммит.\n"
-
-#: rebase-interactive.c:75 git-rebase--preserve-merges.sh:222
-msgid ""
-"\n"
-"If you remove a line here THAT COMMIT WILL BE LOST.\n"
-msgstr "\nЕсли вы удалите строку здесь, то УКАЗАННЫЙ КОММИТ БУДЕТ УТЕРЯН.\n"
-
-#: rebase-interactive.c:81 git-rebase--preserve-merges.sh:861
-msgid ""
-"\n"
-"You are editing the todo file of an ongoing interactive rebase.\n"
-"To continue rebase after editing, run:\n"
-"    git rebase --continue\n"
-"\n"
-msgstr "\nВы сейчас редактируете файл со списком дел для интерактивного перемещения.\nДля продолжения перемещения, после редактирования файла запустите:\n    git rebase --continue\n\n"
-
-#: rebase-interactive.c:86 git-rebase--preserve-merges.sh:938
-msgid ""
-"\n"
-"However, if you remove everything, the rebase will be aborted.\n"
-"\n"
-msgstr "\nНо если вы удалите все, то процесс перемещения будет будет прерван.\n\n"
-
-#: rebase-interactive.c:110 rerere.c:485 rerere.c:692 sequencer.c:3607
-#: sequencer.c:3633 sequencer.c:5416 builtin/fsck.c:347 builtin/rebase.c:270
-#, c-format
-msgid "could not write '%s'"
-msgstr "не удалось записать «%s»"
-
-#: rebase-interactive.c:116 builtin/rebase.c:202 builtin/rebase.c:228
-#: builtin/rebase.c:252
-#, c-format
-msgid "could not write '%s'."
-msgstr "не удалось записать «%s»."
-
-#: rebase-interactive.c:193
-#, c-format
-msgid ""
-"Warning: some commits may have been dropped accidentally.\n"
-"Dropped commits (newer to older):\n"
-msgstr "Внимание: некоторые коммиты могли быть отброшены по ошибке.\nОтброшенные коммиты (от новых к старым):\n"
-
-#: rebase-interactive.c:200
-#, c-format
-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"
-"The possible behaviours are: ignore, warn, error.\n"
-"\n"
-msgstr "Чтобы избежать этого сообщения, используйте «drop» чтобы явно удалить коммит.\n\nИспользуйте опцию «git config rebase.missingCommitsCheck» для изменения количества предупреждений.\nВозможные значения: ignore, warn, error.\n\n"
-
-#: rebase-interactive.c:233 rebase-interactive.c:238 sequencer.c:2394
-#: builtin/rebase.c:188 builtin/rebase.c:213 builtin/rebase.c:239
-#: builtin/rebase.c:264
-#, c-format
-msgid "could not read '%s'."
-msgstr "не удалось прочитать «%s»."
-
-#: ref-filter.c:42 wt-status.c:1973
-msgid "gone"
-msgstr "исчез"
-
-#: ref-filter.c:43
-#, c-format
-msgid "ahead %d"
-msgstr "впереди %d"
-
-#: ref-filter.c:44
-#, c-format
-msgid "behind %d"
-msgstr "позади %d"
-
-#: ref-filter.c:45
-#, c-format
-msgid "ahead %d, behind %d"
-msgstr "впереди %d, позади %d"
-
-#: ref-filter.c:169
-#, c-format
-msgid "expected format: %%(color:<color>)"
-msgstr "ожидаемый формат: %%(color:<color>)"
-
-#: ref-filter.c:171
-#, c-format
-msgid "unrecognized color: %%(color:%s)"
-msgstr "неопознанный цвет: %%(color:%s)"
-
-#: ref-filter.c:193
-#, c-format
-msgid "Integer value expected refname:lstrip=%s"
-msgstr "Ожидается целочисленное значение refname:lstrip=%s"
-
-#: ref-filter.c:197
-#, c-format
-msgid "Integer value expected refname:rstrip=%s"
-msgstr "Ожидается целочисленное значение refname:rstrip=%s"
-
-#: ref-filter.c:199
-#, c-format
-msgid "unrecognized %%(%s) argument: %s"
-msgstr "неопознанный аргумент %%(%s): %s"
-
-#: ref-filter.c:254
-#, c-format
-msgid "%%(objecttype) does not take arguments"
-msgstr ""
-
-#: ref-filter.c:276
-#, c-format
-msgid "unrecognized %%(objectsize) argument: %s"
-msgstr ""
-
-#: ref-filter.c:284
-#, c-format
-msgid "%%(deltabase) does not take arguments"
-msgstr ""
-
-#: ref-filter.c:296
-#, c-format
-msgid "%%(body) does not take arguments"
-msgstr "параметр %%(body) не принимает аргументы"
-
-#: ref-filter.c:309
-#, c-format
-msgid "unrecognized %%(subject) argument: %s"
-msgstr ""
-
-#: ref-filter.c:330
-#, c-format
-msgid "unknown %%(trailers) argument: %s"
-msgstr "неизвестный аргумент для %%(trailers): %s"
-
-#: ref-filter.c:363
-#, c-format
-msgid "positive value expected contents:lines=%s"
-msgstr "положительное значение ожидает contents:lines=%s"
-
-#: ref-filter.c:365
-#, c-format
-msgid "unrecognized %%(contents) argument: %s"
-msgstr "неопознанный аргумент %%(contents): %s"
-
-#: ref-filter.c:380
-#, c-format
-msgid "positive value expected '%s' in %%(%s)"
-msgstr ""
-
-#: ref-filter.c:384
-#, c-format
-msgid "unrecognized argument '%s' in %%(%s)"
-msgstr ""
-
-#: ref-filter.c:398
-#, c-format
-msgid "unrecognized email option: %s"
-msgstr ""
-
-#: ref-filter.c:428
-#, c-format
-msgid "expected format: %%(align:<width>,<position>)"
-msgstr "ожидаемый формат: %%(align:<width>,<position>)"
-
-#: ref-filter.c:440
-#, c-format
-msgid "unrecognized position:%s"
-msgstr "неопознанная позиция:%s"
-
-#: ref-filter.c:447
-#, c-format
-msgid "unrecognized width:%s"
-msgstr "неопознанная ширина:%s"
-
-#: ref-filter.c:456
-#, c-format
-msgid "unrecognized %%(align) argument: %s"
-msgstr "неопознанный аргумент %%(align): %s"
-
-#: ref-filter.c:464
-#, c-format
-msgid "positive width expected with the %%(align) atom"
-msgstr "ожидается положительная ширина с указанием частицы %%(align)"
-
-#: ref-filter.c:482
-#, c-format
-msgid "unrecognized %%(if) argument: %s"
-msgstr "неопознанный аргумент %%(if): %s"
-
-#: ref-filter.c:584
-#, c-format
-msgid "malformed field name: %.*s"
-msgstr "неправильное имя поля: %.*s"
-
-#: ref-filter.c:611
-#, c-format
-msgid "unknown field name: %.*s"
-msgstr "неизвестное имя поля: %.*s"
-
-#: ref-filter.c:615
-#, c-format
-msgid ""
-"not a git repository, but the field '%.*s' requires access to object data"
-msgstr ""
-
-#: ref-filter.c:739
-#, c-format
-msgid "format: %%(if) atom used without a %%(then) atom"
-msgstr "формат: частица %%(if) использована без частицы %%(then)"
-
-#: ref-filter.c:802
-#, c-format
-msgid "format: %%(then) atom used without an %%(if) atom"
-msgstr "формат: частица %%(then) использована без частицы %%(if)"
-
-#: ref-filter.c:804
-#, c-format
-msgid "format: %%(then) atom used more than once"
-msgstr "формат: частица %%(then) использована более одного раза"
-
-#: ref-filter.c:806
-#, c-format
-msgid "format: %%(then) atom used after %%(else)"
-msgstr "формат: частица %%(then) использована после %%(else)"
-
-#: ref-filter.c:834
-#, c-format
-msgid "format: %%(else) atom used without an %%(if) atom"
-msgstr "формат: частица %%(else) использована без частицы %%(if)"
-
-#: ref-filter.c:836
-#, c-format
-msgid "format: %%(else) atom used without a %%(then) atom"
-msgstr "формат: частица %%(else) использована без частицы %%(then)"
-
-#: ref-filter.c:838
-#, c-format
-msgid "format: %%(else) atom used more than once"
-msgstr "формат: частица %%(else) использована более одного раза"
-
-#: ref-filter.c:853
-#, c-format
-msgid "format: %%(end) atom used without corresponding atom"
-msgstr "формат: частица %%(end) использована без соответствующей частицы"
-
-#: ref-filter.c:910
-#, c-format
-msgid "malformed format string %s"
-msgstr "неправильная строка формата %s"
-
-#: ref-filter.c:1549
-#, c-format
-msgid "no branch, rebasing %s"
-msgstr ""
-
-#: ref-filter.c:1552
-#, c-format
-msgid "no branch, rebasing detached HEAD %s"
-msgstr ""
-
-#: ref-filter.c:1555
-#, c-format
-msgid "no branch, bisect started on %s"
-msgstr ""
-
-#: ref-filter.c:1565
-msgid "no branch"
-msgstr ""
-
-#: ref-filter.c:1599 ref-filter.c:1808
-#, c-format
-msgid "missing object %s for %s"
-msgstr "не найден объект %s для %s"
-
-#: ref-filter.c:1609
-#, c-format
-msgid "parse_object_buffer failed on %s for %s"
-msgstr "сбой при выполнении parse_object_buffer на %s для %s"
-
-#: ref-filter.c:2062
-#, c-format
-msgid "malformed object at '%s'"
-msgstr "Повреждённый объект «%s»"
-
-#: ref-filter.c:2151
-#, c-format
-msgid "ignoring ref with broken name %s"
-msgstr "игнорирую ссылку с неправильным именем %s"
-
-#: ref-filter.c:2156 refs.c:676
-#, c-format
-msgid "ignoring broken ref %s"
-msgstr "игнорирую неправильную ссылку %s"
-
-#: ref-filter.c:2472
-#, c-format
-msgid "format: %%(end) atom missing"
-msgstr "format: пропущена частица %%(end)"
-
-#: ref-filter.c:2571
-#, c-format
-msgid "malformed object name %s"
-msgstr "неправильное имя объекта %s"
-
-#: ref-filter.c:2576
-#, c-format
-msgid "option `%s' must point to a commit"
-msgstr ""
-
-#: refs.c:264
-#, c-format
-msgid "%s does not point to a valid object!"
-msgstr ""
-
-#: refs.c:566
-#, 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"
-"of your new repositories, which will suppress this warning, call:\n"
-"\n"
-"\tgit config --global init.defaultBranch <name>\n"
-"\n"
-"Names commonly chosen instead of 'master' are 'main', 'trunk' and\n"
-"'development'. The just-created branch can be renamed via this command:\n"
-"\n"
-"\tgit branch -m <name>\n"
-msgstr ""
-
-#: refs.c:588
-#, c-format
-msgid "could not retrieve `%s`"
-msgstr ""
-
-#: refs.c:598
-#, c-format
-msgid "invalid branch name: %s = %s"
-msgstr ""
-
-#: refs.c:674
-#, c-format
-msgid "ignoring dangling symref %s"
-msgstr ""
-
-#: refs.c:911
-#, c-format
-msgid "log for ref %s has gap after %s"
-msgstr ""
-
-#: refs.c:917
-#, c-format
-msgid "log for ref %s unexpectedly ended on %s"
-msgstr ""
-
-#: refs.c:976
-#, c-format
-msgid "log for %s is empty"
-msgstr ""
-
-#: refs.c:1068
-#, c-format
-msgid "refusing to update ref with bad name '%s'"
-msgstr ""
-
-#: refs.c:1139
-#, c-format
-msgid "update_ref failed for ref '%s': %s"
-msgstr ""
-
-#: refs.c:1963
-#, c-format
-msgid "multiple updates for ref '%s' not allowed"
-msgstr ""
-
-#: refs.c:2043
-msgid "ref updates forbidden inside quarantine environment"
-msgstr "обновление ссылок запрещено в изолированном окружении"
-
-#: refs.c:2054
-msgid "ref updates aborted by hook"
-msgstr ""
-
-#: refs.c:2154 refs.c:2184
-#, c-format
-msgid "'%s' exists; cannot create '%s'"
-msgstr ""
-
-#: refs.c:2160 refs.c:2195
-#, c-format
-msgid "cannot process '%s' and '%s' at the same time"
-msgstr ""
-
-#: refs/files-backend.c:1228
-#, 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
-#, c-format
-msgid "could not delete reference %s: %s"
-msgstr "не удалось удалить ссылку %s: %s"
-
-#: refs/files-backend.c:1245 refs/packed-backend.c:1555
-#, c-format
-msgid "could not delete references: %s"
-msgstr "не удалось удалить ссылки: %s"
-
-#: refspec.c:170
-#, c-format
-msgid "invalid refspec '%s'"
-msgstr ""
-
-#: remote.c:351
-#, c-format
-msgid "config remote shorthand cannot begin with '/': %s"
-msgstr ""
-
-#: remote.c:399
-msgid "more than one receivepack given, using the first"
-msgstr ""
-
-#: remote.c:407
-msgid "more than one uploadpack given, using the first"
-msgstr ""
-
-#: remote.c:590
-#, c-format
-msgid "Cannot fetch both %s and %s to %s"
-msgstr "Нельзя извлечь одновременно %s и %s в %s"
-
-#: remote.c:594
-#, c-format
-msgid "%s usually tracks %s, not %s"
-msgstr "%s обычно отслеживает %s, а не %s"
-
-#: remote.c:598
-#, c-format
-msgid "%s tracks both %s and %s"
-msgstr "%s отслеживает и %s и %s"
-
-#: remote.c:666
-#, c-format
-msgid "key '%s' of pattern had no '*'"
-msgstr ""
-
-#: remote.c:676
-#, c-format
-msgid "value '%s' of pattern has no '*'"
-msgstr ""
-
-#: remote.c:1073
-#, c-format
-msgid "src refspec %s does not match any"
-msgstr ""
-
-#: remote.c:1078
-#, c-format
-msgid "src refspec %s matches more than one"
-msgstr ""
-
-#. TRANSLATORS: "matches '%s'%" is the <dst> part of "git push
-#. <remote> <src>:<dst>" push, and "being pushed ('%s')" is
-#. the <src>.
-#: remote.c:1093
-#, c-format
-msgid ""
-"The destination you provided is not a full refname (i.e.,\n"
-"starting with \"refs/\"). We tried to guess what you meant by:\n"
-"\n"
-"- Looking for a ref that matches '%s' on the remote side.\n"
-"- Checking if the <src> being pushed ('%s')\n"
-"  is a ref in \"refs/{heads,tags}/\". If so we add a corresponding\n"
-"  refs/{heads,tags}/ prefix on the remote side.\n"
-"\n"
-"Neither worked, so we gave up. You must fully qualify the ref."
-msgstr ""
-
-#: remote.c:1113
-#, c-format
-msgid ""
-"The <src> part of the refspec is a commit object.\n"
-"Did you mean to create a new branch by pushing to\n"
-"'%s:refs/heads/%s'?"
-msgstr ""
-
-#: remote.c:1118
-#, c-format
-msgid ""
-"The <src> part of the refspec is a tag object.\n"
-"Did you mean to create a new tag by pushing to\n"
-"'%s:refs/tags/%s'?"
-msgstr ""
-
-#: remote.c:1123
-#, c-format
-msgid ""
-"The <src> part of the refspec is a tree object.\n"
-"Did you mean to tag a new tree by pushing to\n"
-"'%s:refs/tags/%s'?"
-msgstr ""
-
-#: remote.c:1128
-#, c-format
-msgid ""
-"The <src> part of the refspec is a blob object.\n"
-"Did you mean to tag a new blob by pushing to\n"
-"'%s:refs/tags/%s'?"
-msgstr ""
-
-#: remote.c:1164
-#, c-format
-msgid "%s cannot be resolved to branch"
-msgstr ""
-
-#: remote.c:1175
-#, c-format
-msgid "unable to delete '%s': remote ref does not exist"
-msgstr ""
-
-#: remote.c:1187
-#, c-format
-msgid "dst refspec %s matches more than one"
-msgstr ""
-
-#: remote.c:1194
-#, c-format
-msgid "dst ref %s receives from more than one src"
-msgstr ""
-
-#: remote.c:1714 remote.c:1815
-msgid "HEAD does not point to a branch"
-msgstr "HEAD не указывает на ветку"
-
-#: remote.c:1723
-#, c-format
-msgid "no such branch: '%s'"
-msgstr "нет такой ветки: «%s»"
-
-#: remote.c:1726
-#, c-format
-msgid "no upstream configured for branch '%s'"
-msgstr "вышестоящая ветка не настроена для ветки «%s»"
-
-#: remote.c:1732
-#, c-format
-msgid "upstream branch '%s' not stored as a remote-tracking branch"
-msgstr "вышестоящая ветка «%s» не сохранена как отслеживаемая ветка"
-
-#: remote.c:1747
-#, c-format
-msgid "push destination '%s' on remote '%s' has no local tracking branch"
-msgstr "назначение для отправки «%s» на внешнем сервере «%s» не имеет локальной отслеживаемой ветки"
-
-#: remote.c:1759
-#, c-format
-msgid "branch '%s' has no remote for pushing"
-msgstr "ветка «%s» не имеет внешнего сервера для отправки"
-
-#: remote.c:1769
-#, c-format
-msgid "push refspecs for '%s' do not include '%s'"
-msgstr "спецификаторы пути для отправки «%s» не включают в себя «%s»"
-
-#: remote.c:1782
-msgid "push has no destination (push.default is 'nothing')"
-msgstr "отправка не имеет точки назначения (push.default выставлен в «nothing»)"
-
-#: remote.c:1804
-msgid "cannot resolve 'simple' push to a single destination"
-msgstr "не удалось выполнить «simple» отправку в единственную точку назначения"
-
-#: remote.c:1933
-#, c-format
-msgid "couldn't find remote ref %s"
-msgstr ""
-
-#: remote.c:1946
-#, c-format
-msgid "* Ignoring funny ref '%s' locally"
-msgstr ""
-
-#: remote.c:2109
-#, c-format
-msgid "Your branch is based on '%s', but the upstream is gone.\n"
-msgstr "Ваша ветка базируется на «%s», но вышестоящий репозиторий исчез.\n"
-
-#: remote.c:2113
-msgid "  (use \"git branch --unset-upstream\" to fixup)\n"
-msgstr " (для исправления запустите «git branch --unset-upstream»)\n"
-
-#: remote.c:2116
-#, c-format
-msgid "Your branch is up to date with '%s'.\n"
-msgstr "Ваша ветка обновлена в соответствии с «%s».\n"
-
-#: remote.c:2120
-#, c-format
-msgid "Your branch and '%s' refer to different commits.\n"
-msgstr "Ваша ветка и «%s» указывают на разные коммиты.\n"
-
-#: remote.c:2123
-#, c-format
-msgid "  (use \"%s\" for details)\n"
-msgstr "  (используйте «%s» для просмотра описания)\n"
-
-#: remote.c:2127
-#, c-format
-msgid "Your branch is ahead of '%s' by %d commit.\n"
-msgid_plural "Your branch is ahead of '%s' by %d commits.\n"
-msgstr[0] "Ваша ветка опережает «%s» на %d коммит.\n"
-msgstr[1] "Ваша ветка опережает «%s» на %d коммита.\n"
-msgstr[2] "Ваша ветка опережает «%s» на %d коммитов.\n"
-msgstr[3] "Ваша ветка опережает «%s» на %d коммитов.\n"
-
-#: remote.c:2133
-msgid "  (use \"git push\" to publish your local commits)\n"
-msgstr "  (используйте «git push», чтобы опубликовать ваши локальные коммиты)\n"
-
-#: remote.c:2136
-#, c-format
-msgid "Your branch is behind '%s' by %d commit, and can be fast-forwarded.\n"
-msgid_plural ""
-"Your branch is behind '%s' by %d commits, and can be fast-forwarded.\n"
-msgstr[0] "Ваша ветка отстает от «%s» на %d коммит и может быть перемотана вперед.\n"
-msgstr[1] "Ваша ветка отстает от «%s» на %d коммита и может быть перемотана вперед.\n"
-msgstr[2] "Ваша ветка отстает от «%s» на %d коммитов и может быть перемотана вперед.\n"
-msgstr[3] "Ваша ветка отстает от «%s» на %d коммитов и может быть перемотана вперед.\n"
-
-#: remote.c:2144
-msgid "  (use \"git pull\" to update your local branch)\n"
-msgstr "  (используйте «git pull», чтобы обновить вашу локальную ветку)\n"
-
-#: remote.c:2147
-#, c-format
-msgid ""
-"Your branch and '%s' have diverged,\n"
-"and have %d and %d different commit each, respectively.\n"
-msgid_plural ""
-"Your branch and '%s' have diverged,\n"
-"and have %d and %d different commits each, respectively.\n"
-msgstr[0] "Ваша ветка и «%s» разделились\nи теперь имеют %d и %d разный коммит в каждой соответственно.\n"
-msgstr[1] "Ваша ветка и «%s» разделились\nи теперь имеют %d и %d разных коммита в каждой соответственно.\n"
-msgstr[2] "Ваша ветка и «%s» разделились\nи теперь имеют %d и %d разных коммитов в каждой соответственно.\n"
-msgstr[3] "Ваша ветка и «%s» разделились\nи теперь имеют %d и %d разных коммитов в каждой соответственно.\n"
-
-#: remote.c:2157
-msgid "  (use \"git pull\" to merge the remote branch into yours)\n"
-msgstr "  (используйте «git pull», чтобы слить внешнюю ветку в вашу)\n"
-
-#: remote.c:2349
-#, c-format
-msgid "cannot parse expected object name '%s'"
-msgstr ""
-
-#: replace-object.c:21
-#, c-format
-msgid "bad replace ref name: %s"
-msgstr ""
-
-#: replace-object.c:30
-#, c-format
-msgid "duplicate replace ref: %s"
-msgstr ""
-
-#: replace-object.c:82
-#, c-format
-msgid "replace depth too high for object %s"
-msgstr ""
-
-#: rerere.c:217 rerere.c:226 rerere.c:229
-msgid "corrupt MERGE_RR"
-msgstr ""
-
-#: rerere.c:264 rerere.c:269
-msgid "unable to write rerere record"
-msgstr ""
-
-#: rerere.c:495
-#, c-format
-msgid "there were errors while writing '%s' (%s)"
-msgstr ""
-
-#: rerere.c:498
-#, c-format
-msgid "failed to flush '%s'"
-msgstr ""
-
-#: rerere.c:503 rerere.c:1039
-#, c-format
-msgid "could not parse conflict hunks in '%s'"
-msgstr ""
-
-#: rerere.c:684
-#, c-format
-msgid "failed utime() on '%s'"
-msgstr ""
-
-#: rerere.c:694
-#, c-format
-msgid "writing '%s' failed"
-msgstr ""
-
-#: rerere.c:714
-#, c-format
-msgid "Staged '%s' using previous resolution."
-msgstr ""
-
-#: rerere.c:753
-#, c-format
-msgid "Recorded resolution for '%s'."
-msgstr ""
-
-#: rerere.c:788
-#, c-format
-msgid "Resolved '%s' using previous resolution."
-msgstr ""
-
-#: rerere.c:803
-#, c-format
-msgid "cannot unlink stray '%s'"
-msgstr ""
-
-#: rerere.c:807
-#, c-format
-msgid "Recorded preimage for '%s'"
-msgstr ""
-
-#: rerere.c:881 submodule.c:2082 builtin/log.c:1992
-#: builtin/submodule--helper.c:1878 builtin/submodule--helper.c:1890
-#, c-format
-msgid "could not create directory '%s'"
-msgstr "не удалось создать каталог «%s»"
-
-#: rerere.c:1057
-#, c-format
-msgid "failed to update conflicted state in '%s'"
-msgstr ""
-
-#: rerere.c:1068 rerere.c:1075
-#, c-format
-msgid "no remembered resolution for '%s'"
-msgstr ""
-
-#: rerere.c:1077
-#, c-format
-msgid "cannot unlink '%s'"
-msgstr ""
-
-#: rerere.c:1087
-#, c-format
-msgid "Updated preimage for '%s'"
-msgstr ""
-
-#: rerere.c:1096
-#, c-format
-msgid "Forgot resolution for '%s'\n"
-msgstr ""
-
-#: rerere.c:1199
-msgid "unable to open rr-cache directory"
-msgstr ""
-
-#: reset.c:42
-msgid "could not determine HEAD revision"
-msgstr ""
-
-#: reset.c:70 reset.c:76 sequencer.c:3460
-#, c-format
-msgid "failed to find tree of %s"
-msgstr "не удалось найти дерево для %s"
-
-#: revision.c:2336
-msgid "--unpacked=<packfile> no longer supported"
-msgstr ""
-
-#: revision.c:2356
-#, c-format
-msgid "unknown value for --diff-merges: %s"
-msgstr ""
-
-#: revision.c:2694
-msgid "your current branch appears to be broken"
-msgstr "похоже, ваша текущая ветка повреждена"
-
-#: revision.c:2697
-#, c-format
-msgid "your current branch '%s' does not have any commits yet"
-msgstr "ваша текущая ветка «%s» еще не содержит ни одного коммита"
-
-#: revision.c:2907
-msgid "-L does not yet support diff formats besides -p and -s"
-msgstr ""
-
-#: run-command.c:764
-msgid "open /dev/null failed"
-msgstr "сбой открытия /dev/null"
-
-#: run-command.c:1271
-#, c-format
-msgid "cannot create async thread: %s"
-msgstr ""
-
-#: run-command.c:1335
-#, 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:146
-msgid "unexpected flush packet while reading remote unpack status"
-msgstr "неожиданный пустой пакет при чтении статуса внешней распаковки"
-
-#: send-pack.c:148
-#, c-format
-msgid "unable to parse remote unpack status: %s"
-msgstr "не удалось разобрать статус внешней распаковки: %s"
-
-#: send-pack.c:150
-#, c-format
-msgid "remote unpack failed: %s"
-msgstr "сбой при внешней распаковке %s"
-
-#: send-pack.c:374
-msgid "failed to sign the push certificate"
-msgstr "сбой подписания сертификата отправки"
-
-#: send-pack.c:467
-msgid "the receiving end does not support this repository's hash algorithm"
-msgstr ""
-
-#: send-pack.c:476
-msgid "the receiving end does not support --signed push"
-msgstr "принимающая сторона не поддерживает отправку с опцией --signed"
-
-#: send-pack.c:478
-msgid ""
-"not sending a push certificate since the receiving end does not support "
-"--signed push"
-msgstr "не отправляем сертификат для отправки, так как принимающая сторона не поддерживает отправку с опцией --signed"
-
-#: send-pack.c:490
-msgid "the receiving end does not support --atomic push"
-msgstr "принимающая сторона не поддерживает отправку с опцией --atomic"
-
-#: send-pack.c:495
-msgid "the receiving end does not support push options"
-msgstr "принимающая сторона не поддерживает отправку с опциями"
-
-#: sequencer.c:195
-#, c-format
-msgid "invalid commit message cleanup mode '%s'"
-msgstr "неправильный режим очистки сообщения коммита «%s»"
-
-#: sequencer.c:323
-#, c-format
-msgid "could not delete '%s'"
-msgstr "не удалось удалить «%s»"
-
-#: sequencer.c:343 builtin/rebase.c:755 builtin/rebase.c:1596 builtin/rm.c:385
-#, c-format
-msgid "could not remove '%s'"
-msgstr "не удалось удалить «%s»"
-
-#: sequencer.c:353
-msgid "revert"
-msgstr "обратить изменения"
-
-#: sequencer.c:355
-msgid "cherry-pick"
-msgstr "копировать коммит"
-
-#: sequencer.c:357
-msgid "rebase"
-msgstr ""
-
-#: sequencer.c:359
-#, c-format
-msgid "unknown action: %d"
-msgstr ""
-
-#: sequencer.c:418
-msgid ""
-"after resolving the conflicts, mark the corrected paths\n"
-"with 'git add <paths>' or 'git rm <paths>'"
-msgstr "после разрешения конфликтов, пометьте исправленные пути\nс помощью «git add <пути>» или «git rm <пути>»"
-
-#: sequencer.c:421
-msgid ""
-"after resolving the conflicts, mark the corrected paths\n"
-"with 'git add <paths>' or 'git rm <paths>'\n"
-"and commit the result with 'git commit'"
-msgstr "после разрешения конфликтов, пометьте исправленные пути\nс помощью «git add <пути>» или «git rm <пути>»\nи сделайте коммит с помощью «git commit»"
-
-#: sequencer.c:434 sequencer.c:3062
-#, c-format
-msgid "could not lock '%s'"
-msgstr "не удалось заблокировать «%s»"
-
-#: sequencer.c:436 sequencer.c:2861 sequencer.c:3066 sequencer.c:3080
-#: sequencer.c:3337 sequencer.c:5326 strbuf.c:1168 wrapper.c:631
-#, c-format
-msgid "could not write to '%s'"
-msgstr "не удалось записать в «%s»"
-
-#: sequencer.c:441
-#, c-format
-msgid "could not write eol to '%s'"
-msgstr "не удалось записать eol в «%s»"
-
-#: sequencer.c:446 sequencer.c:2866 sequencer.c:3068 sequencer.c:3082
-#: sequencer.c:3345
-#, c-format
-msgid "failed to finalize '%s'"
-msgstr "не удалось завершить «%s»"
-
-#: sequencer.c:485
-#, c-format
-msgid "your local changes would be overwritten by %s."
-msgstr "ваши локальные изменения будут перезаписаны %s."
-
-#: sequencer.c:489
-msgid "commit your changes or stash them to proceed."
-msgstr "для продолжения закоммитьте ваши изменения или спрячьте их."
-
-#: sequencer.c:521
-#, c-format
-msgid "%s: fast-forward"
-msgstr "%s: перемотка вперед"
-
-#: sequencer.c:560 builtin/tag.c:566
-#, c-format
-msgid "Invalid cleanup mode %s"
-msgstr "Неправильное значение режима очистки %s"
-
-#. TRANSLATORS: %s will be "revert", "cherry-pick" or
-#. "rebase".
-#: sequencer.c:670
-#, c-format
-msgid "%s: Unable to write new index file"
-msgstr "%s: Не удалось записать файл индекса"
-
-#: sequencer.c:687
-msgid "unable to update cache tree"
-msgstr "не удалось обновить дерево кэша"
-
-#: sequencer.c:701
-msgid "could not resolve HEAD commit"
-msgstr "не удалось распознать HEAD коммит"
-
-#: sequencer.c:781
-#, c-format
-msgid "no key present in '%.*s'"
-msgstr ""
-
-#: sequencer.c:792
-#, c-format
-msgid "unable to dequote value of '%s'"
-msgstr ""
-
-#: sequencer.c:829 wrapper.c:201 wrapper.c:371 builtin/am.c:710
-#: builtin/am.c:802 builtin/merge.c:1135 builtin/rebase.c:908
-#, c-format
-msgid "could not open '%s' for reading"
-msgstr "не удалось открыть «%s» для чтения"
-
-#: sequencer.c:839
-msgid "'GIT_AUTHOR_NAME' already given"
-msgstr ""
-
-#: sequencer.c:844
-msgid "'GIT_AUTHOR_EMAIL' already given"
-msgstr ""
-
-#: sequencer.c:849
-msgid "'GIT_AUTHOR_DATE' already given"
-msgstr ""
-
-#: sequencer.c:853
-#, c-format
-msgid "unknown variable '%s'"
-msgstr ""
-
-#: sequencer.c:858
-msgid "missing 'GIT_AUTHOR_NAME'"
-msgstr ""
-
-#: sequencer.c:860
-msgid "missing 'GIT_AUTHOR_EMAIL'"
-msgstr ""
-
-#: sequencer.c:862
-msgid "missing 'GIT_AUTHOR_DATE'"
-msgstr ""
-
-#: sequencer.c:927
-#, c-format
-msgid ""
-"you have staged changes in your working tree\n"
-"If these changes are meant to be squashed into the previous commit, run:\n"
-"\n"
-"  git commit --amend %s\n"
-"\n"
-"If they are meant to go into a new commit, run:\n"
-"\n"
-"  git commit %s\n"
-"\n"
-"In both cases, once you're done, continue with:\n"
-"\n"
-"  git rebase --continue\n"
-msgstr "у вас имеются проиндексированные изменения в рабочем каталоге. Если эти изменения должны быть объеденены с предыдущим коммитом, то запустите:\n\n  git commit --amend %s\n\nЕсли же они должны быть помещены в новый коммит, то запустите:\n\n  git commit %s\n\nВ любом случае, после того как вы закончите, продолжить перемещение можно выполнив:\n\n  git rebase --continue\n"
-
-#: sequencer.c:1208
-msgid "'prepare-commit-msg' hook failed"
-msgstr "ошибка при вызове перехватчика «prepare-commit-msg»"
-
-#: sequencer.c:1214
-msgid ""
-"Your name and email address were configured automatically based\n"
-"on your username and hostname. Please check that they are accurate.\n"
-"You can suppress this message by setting them explicitly. Run the\n"
-"following command and follow the instructions in your editor to edit\n"
-"your configuration file:\n"
-"\n"
-"    git config --global --edit\n"
-"\n"
-"After doing this, you may fix the identity used for this commit with:\n"
-"\n"
-"    git commit --amend --reset-author\n"
-msgstr "Ваше имя или электронная почта настроены автоматически на основании вашего\nимени пользователя и имени машины. Пожалуйста, проверьте, что они \nопределены правильно.\nВы можете отключить это уведомление установив их напрямую. Запустите следующую\nкоманду и следуйте инструкциям вашего текстового редактора, для\nредактирования вашего файла конфигурации:\n\n    git config --global --edit\n\nПосле этого, изменить авторство этой коммита можно будет с помощью команды:\n\n    git commit --amend --reset-author\n"
-
-#: sequencer.c:1227
-msgid ""
-"Your name and email address were configured automatically based\n"
-"on your username and hostname. Please check that they are accurate.\n"
-"You can suppress this message by setting them explicitly:\n"
-"\n"
-"    git config --global user.name \"Your Name\"\n"
-"    git config --global user.email you@example.com\n"
-"\n"
-"After doing this, you may fix the identity used for this commit with:\n"
-"\n"
-"    git commit --amend --reset-author\n"
-msgstr "Ваше имя или электронная почта настроены автоматически на основании вашего\nимени пользователя и имени машины. Пожалуйста, проверьте, что они \nопределены правильно.\nВы можете отключить это уведомление установив их напрямую:\n\n    git config --global user.name \"Ваше Имя\"\n    git config --global user.email you@example.com\n\nПосле этого, изменить авторство этой коммита можно будет с помощью команды:\n\n    git commit --amend --reset-author\n"
-
-#: sequencer.c:1269
-msgid "couldn't look up newly created commit"
-msgstr "нельзя запросить новосозданный коммит"
-
-#: sequencer.c:1271
-msgid "could not parse newly created commit"
-msgstr "нельзя разобрать новосозданный коммит"
-
-#: sequencer.c:1317
-msgid "unable to resolve HEAD after creating commit"
-msgstr "не удалось найти HEAD после создания коммита"
-
-#: sequencer.c:1319
-msgid "detached HEAD"
-msgstr "отделённый HEAD"
-
-#: sequencer.c:1323
-msgid " (root-commit)"
-msgstr " (корневой коммит)"
-
-#: sequencer.c:1344
-msgid "could not parse HEAD"
-msgstr "не удалось разобрать HEAD"
-
-#: sequencer.c:1346
-#, c-format
-msgid "HEAD %s is not a commit!"
-msgstr "HEAD %s не является коммитом!"
-
-#: sequencer.c:1350 sequencer.c:1425 builtin/commit.c:1577
-msgid "could not parse HEAD commit"
-msgstr "не удалось разобрать HEAD коммит"
-
-#: sequencer.c:1403 sequencer.c:2100
-msgid "unable to parse commit author"
-msgstr "не удалось разобрать автора коммита"
-
-#: sequencer.c:1414 builtin/am.c:1566 builtin/merge.c:701
-msgid "git write-tree failed to write a tree"
-msgstr "git write-tree не удалось записать дерево"
-
-#: sequencer.c:1447 sequencer.c:1565
-#, c-format
-msgid "unable to read commit message from '%s'"
-msgstr "не удалось прочитать сообщение коммита из «%s»"
-
-#: sequencer.c:1476 sequencer.c:1508
-#, c-format
-msgid "invalid author identity '%s'"
-msgstr ""
-
-#: sequencer.c:1482
-msgid "corrupt author: missing date information"
-msgstr ""
-
-#: sequencer.c:1521 builtin/am.c:1593 builtin/commit.c:1678
-#: builtin/merge.c:904 builtin/merge.c:929 t/helper/test-fast-rebase.c:78
-msgid "failed to write commit object"
-msgstr "сбой записи объекта коммита"
-
-#: sequencer.c:1548 sequencer.c:4283 t/helper/test-fast-rebase.c:198
-#, c-format
-msgid "could not update %s"
-msgstr "не удалось обновить %s"
-
-#: sequencer.c:1597
-#, c-format
-msgid "could not parse commit %s"
-msgstr "не удалось разобрать коммит %s"
-
-#: sequencer.c:1602
-#, c-format
-msgid "could not parse parent commit %s"
-msgstr "не удалось разобрать родительский коммит %s"
-
-#: sequencer.c:1685 sequencer.c:1796
-#, c-format
-msgid "unknown command: %d"
-msgstr "неизвестная команда: %d"
-
-#: sequencer.c:1743 sequencer.c:1768
-#, c-format
-msgid "This is a combination of %d commits."
-msgstr "Это объединение %d коммитов."
-
-#: sequencer.c:1753
-msgid "need a HEAD to fixup"
-msgstr "нужен HEAD для исправления"
-
-#: sequencer.c:1755 sequencer.c:3372
-msgid "could not read HEAD"
-msgstr "не удалось прочитать HEAD"
-
-#: sequencer.c:1757
-msgid "could not read HEAD's commit message"
-msgstr "не удалось прочитать сообщение коммита текущего HEAD"
-
-#: sequencer.c:1763
-#, c-format
-msgid "cannot write '%s'"
-msgstr "не удалось записать «%s»"
-
-#: sequencer.c:1770 git-rebase--preserve-merges.sh:486
-msgid "This is the 1st commit message:"
-msgstr "Это 1-е сообщение коммита:"
-
-#: sequencer.c:1778
-#, c-format
-msgid "could not read commit message of %s"
-msgstr "не удалось прочитать сообщение коммита для %s"
-
-#: sequencer.c:1785
-#, c-format
-msgid "This is the commit message #%d:"
-msgstr "Это сообщение коммита номер #%d:"
-
-#: sequencer.c:1791
-#, c-format
-msgid "The commit message #%d will be skipped:"
-msgstr "Сообщение коммита номер #%d будет пропущено:"
-
-#: sequencer.c:1879
-msgid "your index file is unmerged."
-msgstr "ваш индекс не слит."
-
-#: sequencer.c:1886
-msgid "cannot fixup root commit"
-msgstr "нельзя исправить корневой коммит"
-
-#: sequencer.c:1905
-#, c-format
-msgid "commit %s is a merge but no -m option was given."
-msgstr "коммит %s — это коммит-слияние, но опция -m не указана."
-
-#: sequencer.c:1913 sequencer.c:1921
-#, c-format
-msgid "commit %s does not have parent %d"
-msgstr "у коммита %s нет предка %d"
-
-#: sequencer.c:1927
-#, 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:1946
-#, c-format
-msgid "%s: cannot parse parent commit %s"
-msgstr "%s: не удалось разобрать родительский коммит для %s"
-
-#: sequencer.c:2011
-#, c-format
-msgid "could not rename '%s' to '%s'"
-msgstr "не удалось переименовать «%s» в «%s»"
-
-#: sequencer.c:2071
-#, c-format
-msgid "could not revert %s... %s"
-msgstr "не удалось обратить изменения коммита %s… %s"
-
-#: sequencer.c:2072
-#, c-format
-msgid "could not apply %s... %s"
-msgstr "не удалось применить коммит %s… %s"
-
-#: sequencer.c:2092
-#, c-format
-msgid "dropping %s %s -- patch contents already upstream\n"
-msgstr ""
-
-#: sequencer.c:2150
-#, c-format
-msgid "git %s: failed to read the index"
-msgstr "git %s: сбой чтения индекса"
-
-#: sequencer.c:2157
-#, c-format
-msgid "git %s: failed to refresh the index"
-msgstr "git %s: сбой обновления индекса"
-
-#: sequencer.c:2234
-#, c-format
-msgid "%s does not accept arguments: '%s'"
-msgstr "параметр %s не принимает аргументы: «%s»"
-
-#: sequencer.c:2243
-#, c-format
-msgid "missing arguments for %s"
-msgstr "пропущены аргументы для %s"
-
-#: sequencer.c:2274
-#, c-format
-msgid "could not parse '%s'"
-msgstr ""
-
-#: sequencer.c:2335
-#, c-format
-msgid "invalid line %d: %.*s"
-msgstr "неправильная строка %d: %.*s"
-
-#: sequencer.c:2346
-#, c-format
-msgid "cannot '%s' without a previous commit"
-msgstr "нельзя выполнить «%s» без указания предыдущего коммита"
-
-#: sequencer.c:2432
-msgid "cancelling a cherry picking in progress"
-msgstr ""
-
-#: sequencer.c:2441
-msgid "cancelling a revert in progress"
-msgstr ""
-
-#: sequencer.c:2485
-msgid "please fix this using 'git rebase --edit-todo'."
-msgstr "пожалуйста исправьте это с помощью «git rebase --edit-todo»."
-
-#: sequencer.c:2487
-#, c-format
-msgid "unusable instruction sheet: '%s'"
-msgstr "непригодная для использования карта с инструкциями: «%s»"
-
-#: sequencer.c:2492
-msgid "no commits parsed."
-msgstr "коммиты не разобраны."
-
-#: sequencer.c:2503
-msgid "cannot cherry-pick during a revert."
-msgstr "нельзя скопировать коммит во время процесса обращения коммита."
-
-#: sequencer.c:2505
-msgid "cannot revert during a cherry-pick."
-msgstr "нельзя обратить изменения коммита во время копирования коммита."
-
-#: sequencer.c:2583
-#, c-format
-msgid "invalid value for %s: %s"
-msgstr "неправильное значение %s: %s"
-
-#: sequencer.c:2690
-msgid "unusable squash-onto"
-msgstr "непригодный для использования уплотнить-над"
-
-#: sequencer.c:2710
-#, c-format
-msgid "malformed options sheet: '%s'"
-msgstr "испорченная карта с опциями: «%s»"
-
-#: sequencer.c:2803 sequencer.c:4636
-msgid "empty commit set passed"
-msgstr "передан пустой набор коммитов"
-
-#: sequencer.c:2820
-msgid "revert is already in progress"
-msgstr ""
-
-#: sequencer.c:2822
-#, c-format
-msgid "try \"git revert (--continue | %s--abort | --quit)\""
-msgstr ""
-
-#: sequencer.c:2825
-msgid "cherry-pick is already in progress"
-msgstr ""
-
-#: sequencer.c:2827
-#, c-format
-msgid "try \"git cherry-pick (--continue | %s--abort | --quit)\""
-msgstr ""
-
-#: sequencer.c:2841
-#, c-format
-msgid "could not create sequencer directory '%s'"
-msgstr "не удалось создать каталог для указателя следования коммитов «%s»"
-
-#: sequencer.c:2856
-msgid "could not lock HEAD"
-msgstr "не удалось заблокировать HEAD"
-
-#: sequencer.c:2916 sequencer.c:4371
-msgid "no cherry-pick or revert in progress"
-msgstr "копирование или обращение изменений коммита уже выполняются"
-
-#: sequencer.c:2918 sequencer.c:2929
-msgid "cannot resolve HEAD"
-msgstr "не удалось определить HEAD"
-
-#: sequencer.c:2920 sequencer.c:2964
-msgid "cannot abort from a branch yet to be born"
-msgstr "нельзя отменить изменения с ветки, которая еще не создана"
-
-#: sequencer.c:2950 builtin/grep.c:756
-#, c-format
-msgid "cannot open '%s'"
-msgstr "не удалось открыть «%s»"
-
-#: sequencer.c:2952
-#, c-format
-msgid "cannot read '%s': %s"
-msgstr "не удалось прочитать «%s»: %s"
-
-#: sequencer.c:2953
-msgid "unexpected end of file"
-msgstr "неожиданный конец файла"
-
-#: sequencer.c:2959
-#, c-format
-msgid "stored pre-cherry-pick HEAD file '%s' is corrupt"
-msgstr "сохраненный файл с HEAD перед копированием коммита «%s» поврежден"
-
-#: sequencer.c:2970
-msgid "You seem to have moved HEAD. Not rewinding, check your HEAD!"
-msgstr "Похоже, что вы переместили HEAD. Перемотка не выполняется, проверьте свой указатель HEAD!"
-
-#: sequencer.c:3011
-msgid "no revert in progress"
-msgstr ""
-
-#: sequencer.c:3020
-msgid "no cherry-pick in progress"
-msgstr ""
-
-#: sequencer.c:3030
-msgid "failed to skip the commit"
-msgstr ""
-
-#: sequencer.c:3037
-msgid "there is nothing to skip"
-msgstr ""
-
-#: sequencer.c:3040
-#, c-format
 msgid ""
-"have you committed already?\n"
-"try \"git %s --continue\""
+"cannot inherit upstream tracking configuration of multiple refs when "
+"rebasing is requested"
 msgstr ""
 
-#: sequencer.c:3202 sequencer.c:4263
-msgid "cannot read HEAD"
-msgstr "не удалось прочитать HEAD"
-
-#: sequencer.c:3219
 #, c-format
-msgid "unable to copy '%s' to '%s'"
+msgid "not setting branch '%s' as its own upstream"
 msgstr ""
 
-#: sequencer.c:3227
 #, c-format
-msgid ""
-"You can amend the commit now, with\n"
-"\n"
-"  git commit --amend %s\n"
-"\n"
-"Once you are satisfied with your changes, run\n"
-"\n"
-"  git rebase --continue\n"
+msgid "branch '%s' set up to track '%s' by rebasing."
 msgstr ""
 
-#: sequencer.c:3237
 #, c-format
-msgid "Could not apply %s... %.*s"
+msgid "branch '%s' set up to track '%s'."
 msgstr ""
 
-#: sequencer.c:3244
 #, c-format
-msgid "Could not merge %.*s"
+msgid "branch '%s' set up to track:"
 msgstr ""
 
-#: sequencer.c:3258 sequencer.c:3262 builtin/difftool.c:640
-#, c-format
-msgid "could not copy '%s' to '%s'"
-msgstr "не удалось скопировать «%s» в «%s»"
-
-#: sequencer.c:3274
-#, c-format
-msgid "Executing: %s\n"
+msgid "unable to write upstream branch configuration"
 msgstr ""
 
-#: sequencer.c:3289
-#, c-format
 msgid ""
-"execution failed: %s\n"
-"%sYou can fix the problem, and then run\n"
-"\n"
-"  git rebase --continue\n"
 "\n"
-msgstr "ошибка выполнения: %s\n%sВы можете исправить ошибку, а затем запустить\n\n  git rebase --continue\n\n"
-
-#: sequencer.c:3295
-msgid "and made changes to the index and/or the working tree\n"
-msgstr "и были сделаны изменения в индексе и/или в рабочем каталоге\n"
-
-#: sequencer.c:3301
-#, c-format
-msgid ""
-"execution succeeded: %s\n"
-"but left changes to the index and/or the working tree\n"
-"Commit or stash your changes, and then run\n"
-"\n"
-"  git rebase --continue\n"
-"\n"
-msgstr "успешное выполнение: %s\nно остались изменения в индексе и/или в рабочем каталоге\nСделайте коммит или спрячьте ваши изменения, а затем выполните\n\n  git rebase --continue\n\n"
-
-#: sequencer.c:3362
-#, c-format
-msgid "illegal label name: '%.*s'"
-msgstr ""
-
-#: sequencer.c:3416
-msgid "writing fake root commit"
-msgstr "запись поддельного корневого коммита"
-
-#: sequencer.c:3421
-msgid "writing squash-onto"
-msgstr "запить уплотнить-над"
-
-#: sequencer.c:3505
-#, c-format
-msgid "could not resolve '%s'"
-msgstr "не удалось распознать «%s»"
-
-#: sequencer.c:3538
-msgid "cannot merge without a current revision"
-msgstr "нельзя слить без текущей редакции"
-
-#: sequencer.c:3560
-#, c-format
-msgid "unable to parse '%.*s'"
+"After fixing the error cause you may try to fix up\n"
+"the remote tracking information by invoking:"
 msgstr ""
 
-#: sequencer.c:3569
 #, c-format
-msgid "nothing to merge: '%.*s'"
-msgstr ""
-
-#: sequencer.c:3581
-msgid "octopus merge cannot be executed on top of a [new root]"
+msgid "asked to inherit tracking from '%s', but no remote is set"
 msgstr ""
 
-#: sequencer.c:3597
-#, c-format
-msgid "could not get commit message of '%s'"
-msgstr "не удалось получить сообщение коммита для «%s»"
-
-#: sequencer.c:3780
-#, c-format
-msgid "could not even attempt to merge '%.*s'"
-msgstr "не удалось даже попытаться слить «%.*s»"
-
-#: sequencer.c:3796
-msgid "merge: Unable to write new index file"
-msgstr "слияние: Не удалось записать файл индекса"
-
-#: sequencer.c:3870
-msgid "Cannot autostash"
-msgstr "Не удалось автоматически спрятать изменения"
-
-#: sequencer.c:3873
 #, c-format
-msgid "Unexpected stash response: '%s'"
+msgid "asked to inherit tracking from '%s', but no merge configuration is set"
 msgstr ""
 
-#: sequencer.c:3879
 #, c-format
-msgid "Could not create directory for '%s'"
+msgid "not tracking: ambiguous information for ref '%s'"
 msgstr ""
 
-#: sequencer.c:3882
+#. #-#-#-#-#  branch.c.po  #-#-#-#-#
+#. TRANSLATORS: This is a line listing a remote with duplicate
+#. refspecs in the advice message below. For RTL languages you'll
+#. probably want to swap the "%s" and leading "  " space around.
+#.
+#. #-#-#-#-#  object-name.c.po  #-#-#-#-#
+#. TRANSLATORS: This is line item of ambiguous object output
+#. from describe_ambiguous_object() above. For RTL languages
+#. you'll probably want to swap the "%s" and leading " " space
+#. around.
+#.
 #, c-format
-msgid "Created autostash: %s\n"
+msgid "  %s\n"
 msgstr ""
 
-#: sequencer.c:3886
-msgid "could not reset --hard"
-msgstr ""
-
-#: sequencer.c:3911
-#, c-format
-msgid "Applied autostash.\n"
-msgstr "Применены автоматически спрятанные изменения.\n"
-
-#: sequencer.c:3923
-#, c-format
-msgid "cannot store %s"
-msgstr "не удалось сохранить %s"
-
-#: sequencer.c:3926
+#. TRANSLATORS: The second argument is a \n-delimited list of
+#. duplicate refspecs, composed above.
+#.
 #, c-format
 msgid ""
+"There are multiple remotes whose fetch refspecs map to the remote\n"
+"tracking ref '%s':\n"
 "%s\n"
-"Your changes are safe in the stash.\n"
-"You can run \"git stash pop\" or \"git stash drop\" at any time.\n"
-msgstr ""
-
-#: sequencer.c:3931
-msgid "Applying autostash resulted in conflicts."
-msgstr ""
-
-#: sequencer.c:3932
-msgid "Autostash exists; creating a new stash entry."
-msgstr ""
-
-#: sequencer.c:4025 git-rebase--preserve-merges.sh:769
-msgid "could not detach HEAD"
-msgstr "не удалось отделить HEAD"
-
-#: sequencer.c:4040
-#, c-format
-msgid "Stopped at HEAD\n"
-msgstr ""
-
-#: sequencer.c:4042
-#, c-format
-msgid "Stopped at %s\n"
-msgstr ""
-
-#: sequencer.c:4050
-#, c-format
-msgid ""
-"Could not execute the todo command\n"
-"\n"
-"    %.*s\n"
-"It has been rescheduled; To edit the command before continuing, please\n"
-"edit the todo list first:\n"
+"This is typically a configuration error.\n"
 "\n"
-"    git rebase --edit-todo\n"
-"    git rebase --continue\n"
-msgstr ""
-
-#: sequencer.c:4096
-#, c-format
-msgid "Rebasing (%d/%d)%s"
-msgstr ""
-
-#: sequencer.c:4141
-#, c-format
-msgid "Stopped at %s...  %.*s\n"
-msgstr "Остановлено на %s …  %.*s\n"
-
-#: sequencer.c:4212
-#, c-format
-msgid "unknown command %d"
-msgstr "неизвестная команда %d"
-
-#: sequencer.c:4271
-msgid "could not read orig-head"
-msgstr "не удалось прочитать orig-head"
-
-#: sequencer.c:4276
-msgid "could not read 'onto'"
-msgstr "не удалось прочитать «onto»"
-
-#: sequencer.c:4290
-#, c-format
-msgid "could not update HEAD to %s"
-msgstr "не удалось обновить HEAD на %s"
-
-#: sequencer.c:4350
-#, c-format
-msgid "Successfully rebased and updated %s.\n"
-msgstr ""
-
-#: sequencer.c:4383
-msgid "cannot rebase: You have unstaged changes."
-msgstr "не удалось выполнить перемещение коммитов: У вас есть непроиндексированные изменения."
-
-#: sequencer.c:4392
-msgid "cannot amend non-existing commit"
-msgstr "не удалось исправить несуществующий коммит"
-
-#: sequencer.c:4394
-#, c-format
-msgid "invalid file: '%s'"
-msgstr "недопустимый файл: «%s»"
-
-#: sequencer.c:4396
-#, c-format
-msgid "invalid contents: '%s'"
-msgstr "недопустимое содержимое: «%s»"
-
-#: sequencer.c:4399
-msgid ""
-"\n"
-"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» снова."
-
-#: sequencer.c:4435 sequencer.c:4474
-#, c-format
-msgid "could not write file: '%s'"
-msgstr ""
-
-#: sequencer.c:4490
-msgid "could not remove CHERRY_PICK_HEAD"
-msgstr "не удалось удалить CHERRY_PICK_HEAD"
-
-#: sequencer.c:4497
-msgid "could not commit staged changes."
-msgstr "не удалось закоммитить проиндексированные изменения."
-
-#: sequencer.c:4613
-#, c-format
-msgid "%s: can't cherry-pick a %s"
-msgstr "%s: не удалось скопировать коммит %s"
-
-#: sequencer.c:4617
-#, c-format
-msgid "%s: bad revision"
-msgstr "%s: плохая редакция"
-
-#: sequencer.c:4652
-msgid "can't revert as initial commit"
-msgstr "нельзя возвратить изначальный коммит"
-
-#: sequencer.c:5129
-msgid "make_script: unhandled options"
-msgstr "make_script: не обработанные опции"
-
-#: sequencer.c:5132
-msgid "make_script: error preparing revisions"
-msgstr "make_script: ошибка при обновлении редакций"
-
-#: sequencer.c:5374 sequencer.c:5391
-msgid "nothing to do"
-msgstr ""
-
-#: sequencer.c:5410
-msgid "could not skip unnecessary pick commands"
-msgstr ""
-
-#: sequencer.c:5504
-msgid "the script was already rearranged."
-msgstr "сценарий уже был перестроен."
-
-#: setup.c:133
-#, c-format
-msgid "'%s' is outside repository at '%s'"
-msgstr ""
-
-#: setup.c:185
-#, c-format
-msgid ""
-"%s: no such path in the working tree.\n"
-"Use 'git <command> -- <path>...' to specify paths that do not exist locally."
-msgstr "%s: нет такого пути в рабочем каталоге.\nИспользуйте «git <команда> -- <путь>…» для указания путей, которые не существуют локально."
-
-#: setup.c:198
-#, c-format
-msgid ""
-"ambiguous argument '%s': unknown revision or path not in the working tree.\n"
-"Use '--' to separate paths from revisions, like this:\n"
-"'git <command> [<revision>...] -- [<file>...]'"
-msgstr "неоднозначный аргумент «%s»: неизвестная редакция или не путь в рабочем каталоге.\nИспользуйте «--» для отделения путей от редакций, вот так:\n«git <команда> [<редакция>…] -- [<файл>…]»"
-
-#: setup.c:264
-#, c-format
-msgid "option '%s' must come before non-option arguments"
-msgstr ""
-
-#: setup.c:283
-#, c-format
-msgid ""
-"ambiguous argument '%s': both revision and filename\n"
-"Use '--' to separate paths from revisions, like this:\n"
-"'git <command> [<revision>...] -- [<file>...]'"
-msgstr "неоднозначный аргумент «%s»: является одновременно и редакцией и именем файла.\nИспользуйте «--» для отделения путей от редакций, вот так:\n«git <команда> [<редакция>…] -- [<файл>…]»"
-
-#: setup.c:419
-msgid "unable to set up work tree using invalid config"
-msgstr ""
-
-#: setup.c:423
-msgid "this operation must be run in a work tree"
-msgstr ""
-
-#: setup.c:661
-#, c-format
-msgid "Expected git repo version <= %d, found %d"
-msgstr "Ожидаемая версия git репозитория <= %d, а обнаружена %d"
-
-#: setup.c:669
-msgid "unknown repository extensions found:"
-msgstr "обнаружены неизвестные расширения репозитория:"
-
-#: setup.c:681
-msgid "repo version is 0, but v1-only extensions found:"
-msgstr ""
-
-#: setup.c:700
-#, c-format
-msgid "error opening '%s'"
-msgstr "ошибка открытия «%s»"
-
-#: setup.c:702
-#, c-format
-msgid "too large to be a .git file: '%s'"
-msgstr "файл слишком большой как для .git файла: «%s»"
-
-#: setup.c:704
-#, c-format
-msgid "error reading %s"
-msgstr "ошибка чтения %s"
-
-#: setup.c:706
-#, c-format
-msgid "invalid gitfile format: %s"
-msgstr "неправильный формат файла gitfile: %s"
-
-#: setup.c:708
-#, c-format
-msgid "no path in gitfile: %s"
-msgstr "нет пути в gitfile: %s"
-
-#: setup.c:710
-#, c-format
-msgid "not a git repository: %s"
-msgstr "не является репозиторием git: %s"
-
-#: setup.c:812
-#, c-format
-msgid "'$%s' too big"
-msgstr "«$%s» слишком большой"
-
-#: setup.c:826
-#, c-format
-msgid "not a git repository: '%s'"
-msgstr "не является репозиторием git: «%s»"
-
-#: setup.c:855 setup.c:857 setup.c:888
-#, c-format
-msgid "cannot chdir to '%s'"
-msgstr "не удалось выполнить chdir в «%s»"
-
-#: setup.c:860 setup.c:916 setup.c:926 setup.c:965 setup.c:973
-msgid "cannot come back to cwd"
-msgstr "не удалось вернуться в cwd"
-
-#: setup.c:987
-#, c-format
-msgid "failed to stat '%*s%s%s'"
-msgstr "не удалось выполнить stat для «%*s%s%s»"
-
-#: setup.c:1225
-msgid "Unable to read current working directory"
-msgstr "Не удалось прочитать текущий рабочий каталог"
-
-#: setup.c:1234 setup.c:1240
-#, c-format
-msgid "cannot change to '%s'"
-msgstr "не удалось изменить на «%s»"
-
-#: setup.c:1245
-#, c-format
-msgid "not a git repository (or any of the parent directories): %s"
-msgstr "не найден git репозиторий (или один из родительских каталогов): %s"
-
-#: setup.c:1251
-#, 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 "не найден git репозиторий (или один из его каталогов вплоть до точки монтирования %s)\nОстанавливаю поиск на границе файловой системы (так как GIT_DISCOVERY_ACROSS_FILESYSTEM не установлен)."
-
-#: setup.c:1362
-#, c-format
-msgid ""
-"problem with core.sharedRepository filemode value (0%.3o).\n"
-"The owner of files must always have read and write permissions."
-msgstr ""
-
-#: setup.c:1409
-msgid "open /dev/null or dup failed"
-msgstr "сбой открытия /dev/null или дублирования дескриптора"
-
-#: setup.c:1424
-msgid "fork failed"
-msgstr "сбой при выполнении fork"
-
-#: setup.c:1429
-msgid "setsid failed"
-msgstr "сбой при выполнении setsid"
-
-#: sha1-file.c:480
-#, c-format
-msgid "object directory %s does not exist; check .git/objects/info/alternates"
-msgstr ""
-
-#: sha1-file.c:531
-#, c-format
-msgid "unable to normalize alternate object path: %s"
-msgstr ""
-
-#: sha1-file.c:603
-#, c-format
-msgid "%s: ignoring alternate object stores, nesting too deep"
-msgstr ""
-
-#: sha1-file.c:610
-#, c-format
-msgid "unable to normalize object directory: %s"
-msgstr ""
-
-#: sha1-file.c:653
-msgid "unable to fdopen alternates lockfile"
-msgstr ""
-
-#: sha1-file.c:671
-msgid "unable to read alternates file"
-msgstr ""
-
-#: sha1-file.c:678
-msgid "unable to move new alternates file into place"
-msgstr ""
-
-#: sha1-file.c:713
-#, c-format
-msgid "path '%s' does not exist"
-msgstr "путь «%s» не существует"
-
-#: sha1-file.c:734
-#, c-format
-msgid "reference repository '%s' as a linked checkout is not supported yet."
-msgstr "ссылаемый репозиторий «%s» как связанное состояние, пока не поддерживается."
-
-#: sha1-file.c:740
-#, c-format
-msgid "reference repository '%s' is not a local repository."
-msgstr "ссылаемый репозиторий «%s» не является локальным."
-
-#: sha1-file.c:746
-#, c-format
-msgid "reference repository '%s' is shallow"
-msgstr "ссылаемый репозиторий «%s» является частичным"
-
-#: sha1-file.c:754
-#, c-format
-msgid "reference repository '%s' is grafted"
-msgstr "ссылаемый репозиторий «%s» является сращенным"
-
-#: sha1-file.c:814
-#, c-format
-msgid "invalid line while parsing alternate refs: %s"
-msgstr ""
-
-#: sha1-file.c:964
-#, c-format
-msgid "attempting to mmap %<PRIuMAX> over limit %<PRIuMAX>"
-msgstr ""
-
-#: sha1-file.c:985
-msgid "mmap failed"
-msgstr ""
-
-#: sha1-file.c:1149
-#, c-format
-msgid "object file %s is empty"
-msgstr ""
-
-#: sha1-file.c:1284 sha1-file.c:2477
-#, c-format
-msgid "corrupt loose object '%s'"
-msgstr ""
-
-#: sha1-file.c:1286 sha1-file.c:2481
-#, c-format
-msgid "garbage at end of loose object '%s'"
-msgstr ""
-
-#: sha1-file.c:1328
-msgid "invalid object type"
-msgstr ""
-
-#: sha1-file.c:1412
-#, c-format
-msgid "unable to unpack %s header with --allow-unknown-type"
-msgstr ""
-
-#: sha1-file.c:1415
-#, c-format
-msgid "unable to unpack %s header"
-msgstr ""
-
-#: sha1-file.c:1421
-#, c-format
-msgid "unable to parse %s header with --allow-unknown-type"
+"To support setting up tracking branches, ensure that\n"
+"different remotes' fetch refspecs map into different\n"
+"tracking namespaces."
 msgstr ""
 
-#: sha1-file.c:1424
 #, c-format
-msgid "unable to parse %s header"
-msgstr ""
-
-#: sha1-file.c:1651
-#, c-format
-msgid "failed to read object %s"
-msgstr ""
-
-#: sha1-file.c:1655
-#, c-format
-msgid "replacement %s not found for %s"
-msgstr ""
-
-#: sha1-file.c:1659
-#, c-format
-msgid "loose object %s (stored in %s) is corrupt"
-msgstr ""
-
-#: sha1-file.c:1663
-#, c-format
-msgid "packed object %s (stored in %s) is corrupt"
-msgstr ""
-
-#: sha1-file.c:1768
-#, c-format
-msgid "unable to write file %s"
-msgstr ""
-
-#: sha1-file.c:1775
-#, c-format
-msgid "unable to set permission to '%s'"
-msgstr ""
-
-#: sha1-file.c:1782
-msgid "file write error"
+msgid "'%s' is not a valid branch name"
 msgstr ""
 
-#: sha1-file.c:1802
-msgid "error when closing loose object file"
-msgstr ""
-
-#: sha1-file.c:1867
-#, c-format
-msgid "insufficient permission for adding an object to repository database %s"
-msgstr ""
-
-#: sha1-file.c:1869
-msgid "unable to create temporary file"
-msgstr ""
-
-#: sha1-file.c:1893
-msgid "unable to write loose object file"
-msgstr ""
-
-#: sha1-file.c:1899
-#, c-format
-msgid "unable to deflate new object %s (%d)"
-msgstr ""
-
-#: sha1-file.c:1903
 #, c-format
-msgid "deflateEnd on object %s failed (%d)"
+msgid "a branch named '%s' already exists"
 msgstr ""
 
-#: sha1-file.c:1907
 #, c-format
-msgid "confused by unstable object source data for %s"
+msgid "cannot force update the branch '%s' checked out at '%s'"
 msgstr ""
 
-#: sha1-file.c:1917 builtin/pack-objects.c:1086
 #, c-format
-msgid "failed utime() on %s"
+msgid "cannot set up tracking information; starting point '%s' is not a branch"
 msgstr ""
 
-#: sha1-file.c:1994
 #, c-format
-msgid "cannot read object for %s"
-msgstr ""
-
-#: sha1-file.c:2045
-msgid "corrupt commit"
-msgstr ""
-
-#: sha1-file.c:2053
-msgid "corrupt tag"
-msgstr ""
-
-#: sha1-file.c:2153
-#, c-format
-msgid "read error while indexing %s"
-msgstr ""
-
-#: sha1-file.c:2156
-#, c-format
-msgid "short read while indexing %s"
-msgstr ""
-
-#: sha1-file.c:2229 sha1-file.c:2239
-#, c-format
-msgid "%s: failed to insert into database"
-msgstr ""
-
-#: sha1-file.c:2245
-#, c-format
-msgid "%s: unsupported file type"
-msgstr ""
-
-#: sha1-file.c:2269
-#, c-format
-msgid "%s is not a valid object"
-msgstr ""
-
-#: sha1-file.c:2271
-#, c-format
-msgid "%s is not a valid '%s' object"
-msgstr "%s не является действительным объектом «%s»"
-
-#: sha1-file.c:2298 builtin/index-pack.c:192
-#, c-format
-msgid "unable to open %s"
-msgstr "не удалось открыть %s"
-
-#: sha1-file.c:2488 sha1-file.c:2541
-#, c-format
-msgid "hash mismatch for %s (expected %s)"
-msgstr "несоответствие хэш-кода %s (ожидается %s)"
-
-#: sha1-file.c:2512
-#, c-format
-msgid "unable to mmap %s"
-msgstr ""
-
-#: sha1-file.c:2517
-#, c-format
-msgid "unable to unpack header of %s"
-msgstr ""
-
-#: sha1-file.c:2523
-#, c-format
-msgid "unable to parse header of %s"
-msgstr ""
-
-#: sha1-file.c:2534
-#, c-format
-msgid "unable to unpack contents of %s"
-msgstr ""
-
-#: sha1-name.c:486
-#, c-format
-msgid "short SHA1 %s is ambiguous"
-msgstr "сокращённый SHA1 идентификатор %s неоднозначен"
-
-#: sha1-name.c:497
-msgid "The candidates are:"
-msgstr "Возможно, вы имели в виду:"
+msgid "the requested upstream branch '%s' does not exist"
+msgstr "запрошенная ветка вышестоящего репозитория «%s» не существует"
 
-#: sha1-name.c:796
 msgid ""
-"Git normally never creates a ref that ends with 40 hex characters\n"
-"because it will be ignored when you just specify 40-hex. These refs\n"
-"may be created by mistake. For example,\n"
 "\n"
-"  git switch -c $br $(git rev-parse ...)\n"
+"If you are planning on basing your work on an upstream\n"
+"branch that already exists at the remote, you may need to\n"
+"run \"git fetch\" to retrieve it.\n"
 "\n"
-"where \"$br\" is somehow empty and a 40-hex ref is created. Please\n"
-"examine these refs and maybe delete them. Turn this message off by\n"
-"running \"git config advice.objectNameWarning false\""
-msgstr ""
-
-#: sha1-name.c:916
-#, c-format
-msgid "log for '%.*s' only goes back to %s"
-msgstr ""
-
-#: sha1-name.c:924
-#, c-format
-msgid "log for '%.*s' only has %d entries"
-msgstr ""
-
-#: sha1-name.c:1702
-#, c-format
-msgid "path '%s' exists on disk, but not in '%.*s'"
-msgstr ""
-
-#: sha1-name.c:1708
-#, c-format
-msgid ""
-"path '%s' exists, but not '%s'\n"
-"hint: Did you mean '%.*s:%s' aka '%.*s:./%s'?"
-msgstr ""
-
-#: sha1-name.c:1717
-#, c-format
-msgid "path '%s' does not exist in '%.*s'"
-msgstr ""
-
-#: sha1-name.c:1745
-#, c-format
-msgid ""
-"path '%s' is in the index, but not at stage %d\n"
-"hint: Did you mean ':%d:%s'?"
-msgstr ""
-
-#: sha1-name.c:1761
-#, c-format
-msgid ""
-"path '%s' is in the index, but not '%s'\n"
-"hint: Did you mean ':%d:%s' aka ':%d:./%s'?"
-msgstr ""
-
-#: sha1-name.c:1769
-#, c-format
-msgid "path '%s' exists on disk, but not in the index"
-msgstr ""
-
-#: sha1-name.c:1771
-#, c-format
-msgid "path '%s' does not exist (neither on disk nor in the index)"
-msgstr ""
-
-#: sha1-name.c:1784
-msgid "relative path syntax can't be used outside working tree"
-msgstr ""
-
-#: sha1-name.c:1922
-#, c-format
-msgid "invalid object name '%.*s'."
-msgstr ""
-
-#. TRANSLATORS: IEC 80000-13:2008 gibibyte
-#: strbuf.c:848
-#, c-format
-msgid "%u.%2.2u GiB"
-msgstr "%u.%2.2u ГиБ"
-
-#. TRANSLATORS: IEC 80000-13:2008 gibibyte/second
-#: strbuf.c:850
-#, c-format
-msgid "%u.%2.2u GiB/s"
-msgstr "%u.%2.2u ГиБ/с"
-
-#. TRANSLATORS: IEC 80000-13:2008 mebibyte
-#: strbuf.c:858
-#, c-format
-msgid "%u.%2.2u MiB"
-msgstr "%u.%2.2u МиБ"
-
-#. TRANSLATORS: IEC 80000-13:2008 mebibyte/second
-#: strbuf.c:860
-#, c-format
-msgid "%u.%2.2u MiB/s"
-msgstr "%u.%2.2u МиБ/с"
-
-#. TRANSLATORS: IEC 80000-13:2008 kibibyte
-#: strbuf.c:867
-#, c-format
-msgid "%u.%2.2u KiB"
-msgstr "%u.%2.2u КиБ"
-
-#. TRANSLATORS: IEC 80000-13:2008 kibibyte/second
-#: strbuf.c:869
-#, c-format
-msgid "%u.%2.2u KiB/s"
-msgstr "%u.%2.2u КиБ/с"
-
-#. TRANSLATORS: IEC 80000-13:2008 byte
-#: strbuf.c:875
-#, c-format
-msgid "%u byte"
-msgid_plural "%u bytes"
-msgstr[0] "%u байт"
-msgstr[1] "%u байта"
-msgstr[2] "%u байтов"
-msgstr[3] "%u байта"
-
-#. TRANSLATORS: IEC 80000-13:2008 byte/second
-#: strbuf.c:877
-#, c-format
-msgid "%u byte/s"
-msgid_plural "%u bytes/s"
-msgstr[0] "%u байт/с"
-msgstr[1] "%u байта/с"
-msgstr[2] "%u байтов/с"
-msgstr[3] "%u байта/с"
-
-#: strbuf.c:1166 wrapper.c:199 wrapper.c:369 builtin/am.c:719
-#: builtin/rebase.c:864
-#, c-format
-msgid "could not open '%s' for writing"
-msgstr "не удалось открыть «%s» для записи"
-
-#: strbuf.c:1175
-#, c-format
-msgid "could not edit '%s'"
-msgstr ""
-
-#: submodule-config.c:237
-#, c-format
-msgid "ignoring suspicious submodule name: %s"
-msgstr "игнорирую подозрительный подмодуль с именем: %s"
-
-#: submodule-config.c:304
-msgid "negative values not allowed for submodule.fetchjobs"
-msgstr "нельзя использовать отрицательные значения для submodule.fetchjobs"
-
-#: submodule-config.c:402
-#, c-format
-msgid "ignoring '%s' which may be interpreted as a command-line option: %s"
-msgstr ""
-
-#: submodule-config.c:499
-#, c-format
-msgid "invalid value for %s"
-msgstr "неправильное значение %s"
-
-#: submodule-config.c:766
-#, c-format
-msgid "Could not update .gitmodules entry %s"
-msgstr "Не удалось обновить .gitmodules запись %s"
-
-#: submodule.c:114 submodule.c:143
-msgid "Cannot change unmerged .gitmodules, resolve merge conflicts first"
-msgstr "Не удалось изменить не слитый .gitmodules, сначала разрешите конфликты"
-
-#: submodule.c:118 submodule.c:147
-#, c-format
-msgid "Could not find section in .gitmodules where path=%s"
-msgstr "Не удалось найти раздел в .gitmodules, где путь равен %s"
-
-#: submodule.c:154
-#, c-format
-msgid "Could not remove .gitmodules entry for %s"
-msgstr "Не удалось удалить запись в .gitmodules для %s"
-
-#: submodule.c:165
-msgid "staging updated .gitmodules failed"
-msgstr "сбой индексирования обновленного .gitmodules"
-
-#: submodule.c:327
-#, c-format
-msgid "in unpopulated submodule '%s'"
-msgstr "в пустом подмодуле «%s»"
-
-#: submodule.c:358
-#, c-format
-msgid "Pathspec '%s' is in submodule '%.*s'"
-msgstr "Спецификатор пути «%s» в подмодуле «%.*s»"
-
-#: submodule.c:434
-#, c-format
-msgid "bad --ignore-submodules argument: %s"
-msgstr ""
-
-#: submodule.c:816
-#, c-format
-msgid ""
-"Submodule in commit %s at path: '%s' collides with a submodule named the "
-"same. Skipping it."
-msgstr ""
-
-#: submodule.c:919
-#, c-format
-msgid "submodule entry '%s' (%s) is a %s, not a commit"
-msgstr "запись подмодуля «%s» (%s) является %s, а не является коммитом"
-
-#: submodule.c:1004
-#, c-format
-msgid ""
-"Could not run 'git rev-list <commits> --not --remotes -n 1' command in "
-"submodule %s"
-msgstr ""
-
-#: submodule.c:1127
-#, c-format
-msgid "process for submodule '%s' failed"
-msgstr ""
-
-#: submodule.c:1156 builtin/branch.c:680 builtin/submodule--helper.c:2469
-msgid "Failed to resolve HEAD as a valid ref."
-msgstr "Не удалось определить HEAD как действительную ссылку."
-
-#: submodule.c:1167
-#, c-format
-msgid "Pushing submodule '%s'\n"
-msgstr ""
-
-#: submodule.c:1170
-#, c-format
-msgid "Unable to push submodule '%s'\n"
-msgstr ""
-
-#: submodule.c:1462
-#, c-format
-msgid "Fetching submodule %s%s\n"
-msgstr ""
-
-#: submodule.c:1492
-#, c-format
-msgid "Could not access submodule '%s'\n"
-msgstr ""
-
-#: submodule.c:1646
-#, c-format
-msgid ""
-"Errors during submodule fetch:\n"
-"%s"
-msgstr ""
-
-#: submodule.c:1671
-#, c-format
-msgid "'%s' not recognized as a git repository"
-msgstr "«%s» не распознан как репозиторий git"
-
-#: submodule.c:1688
-#, c-format
-msgid "Could not run 'git status --porcelain=2' in submodule %s"
-msgstr ""
-
-#: submodule.c:1729
-#, c-format
-msgid "'git status --porcelain=2' failed in submodule %s"
-msgstr ""
-
-#: submodule.c:1804
-#, c-format
-msgid "could not start 'git status' in submodule '%s'"
-msgstr "не удалось запустить «git status» в подмодуле «%s»"
-
-#: submodule.c:1817
-#, c-format
-msgid "could not run 'git status' in submodule '%s'"
-msgstr "не удалось запустить «git status» в подмодуле «%s»"
-
-#: submodule.c:1832
-#, c-format
-msgid "Could not unset core.worktree setting in submodule '%s'"
-msgstr ""
-
-#: submodule.c:1859 submodule.c:2169
-#, c-format
-msgid "could not recurse into submodule '%s'"
-msgstr "не удалось рекурсивно зайти в подмодуль «%s»"
-
-#: submodule.c:1880
-msgid "could not reset submodule index"
-msgstr ""
-
-#: submodule.c:1922
-#, c-format
-msgid "submodule '%s' has dirty index"
-msgstr "подмодуль «%s» имеет изменённый индекс"
-
-#: submodule.c:1974
-#, c-format
-msgid "Submodule '%s' could not be updated."
-msgstr ""
-
-#: submodule.c:2042
-#, c-format
-msgid "submodule git dir '%s' is inside git dir '%.*s'"
-msgstr ""
-
-#: submodule.c:2063
-#, c-format
-msgid ""
-"relocate_gitdir for submodule '%s' with more than one worktree not supported"
-msgstr "relocate_gitdir для подмодуля «%s» с указанием более одного рабочего дерева не поддерживается"
-
-#: submodule.c:2075 submodule.c:2134
-#, c-format
-msgid "could not lookup name for submodule '%s'"
-msgstr "не удалось запросить имя подмодуля «%s»"
-
-#: submodule.c:2079
-#, c-format
-msgid "refusing to move '%s' into an existing git dir"
-msgstr ""
-
-#: submodule.c:2086
-#, c-format
-msgid ""
-"Migrating git directory of '%s%s' from\n"
-"'%s' to\n"
-"'%s'\n"
-msgstr "Перемещение каталога git для «%s%s» из\n«%s» в\n«%s»\n"
-
-#: submodule.c:2214
-msgid "could not start ls-files in .."
-msgstr "не удалось выполнить stat ls-files в .."
-
-#: submodule.c:2254
-#, c-format
-msgid "ls-tree returned unexpected return code %d"
-msgstr "ls-tree вернул неожиданный код %d"
-
-#: trailer.c:236
-#, c-format
-msgid "running trailer command '%s' failed"
-msgstr "сбой при запуске команды завершителя «%s»"
-
-#: trailer.c:483 trailer.c:488 trailer.c:493 trailer.c:547 trailer.c:551
-#: trailer.c:555
-#, c-format
-msgid "unknown value '%s' for key '%s'"
-msgstr "неизвестное значение «%s» для ключа «%s»"
-
-#: trailer.c:537 trailer.c:542 builtin/remote.c:299 builtin/remote.c:324
-#, c-format
-msgid "more than one %s"
-msgstr "больше одного %s"
-
-#: trailer.c:728
-#, c-format
-msgid "empty trailer token in trailer '%.*s'"
-msgstr "пустая последняя лексема в завершителе «%.*s»"
-
-#: trailer.c:748
-#, c-format
-msgid "could not read input file '%s'"
-msgstr "не удалось прочитать входной файл «%s»"
-
-#: trailer.c:751
-msgid "could not read from stdin"
-msgstr "не удалось прочитать из стандартного ввода"
-
-#: trailer.c:1009 wrapper.c:676
-#, c-format
-msgid "could not stat %s"
-msgstr "не удалось выполнить stat для %s"
-
-#: trailer.c:1011
-#, c-format
-msgid "file %s is not a regular file"
-msgstr "файл %s не является обычным файлом"
-
-#: trailer.c:1013
-#, c-format
-msgid "file %s is not writable by user"
-msgstr "файл %s не доступен на запись пользователю"
-
-#: trailer.c:1025
-msgid "could not open temporary file"
-msgstr "не удалось создать временный файл"
-
-#: trailer.c:1065
-#, c-format
-msgid "could not rename temporary file to %s"
-msgstr "не удалось переименовать временный файл в %s"
-
-#: transport-helper.c:62 transport-helper.c:91
-msgid "full write to remote helper failed"
-msgstr ""
-
-#: transport-helper.c:145
-#, c-format
-msgid "unable to find remote helper for '%s'"
-msgstr ""
-
-#: transport-helper.c:161 transport-helper.c:575
-msgid "can't dup helper output fd"
-msgstr ""
-
-#: transport-helper.c:214
-#, c-format
-msgid ""
-"unknown mandatory capability %s; this remote helper probably needs newer "
-"version of Git"
-msgstr ""
-
-#: transport-helper.c:220
-msgid "this remote helper should implement refspec capability"
-msgstr ""
-
-#: transport-helper.c:287 transport-helper.c:429
-#, c-format
-msgid "%s unexpectedly said: '%s'"
-msgstr ""
-
-#: transport-helper.c:417
-#, c-format
-msgid "%s also locked %s"
-msgstr ""
-
-#: transport-helper.c:497
-msgid "couldn't run fast-import"
-msgstr ""
-
-#: transport-helper.c:520
-msgid "error while running fast-import"
-msgstr ""
-
-#: transport-helper.c:549 transport-helper.c:1236
-#, c-format
-msgid "could not read ref %s"
-msgstr ""
-
-#: transport-helper.c:594
-#, c-format
-msgid "unknown response to connect: %s"
-msgstr ""
-
-#: transport-helper.c:616
-msgid "setting remote service path not supported by protocol"
-msgstr ""
-
-#: transport-helper.c:618
-msgid "invalid remote service path"
-msgstr ""
-
-#: transport-helper.c:661 transport.c:1446
-msgid "operation not supported by protocol"
-msgstr ""
-
-#: transport-helper.c:664
-#, c-format
-msgid "can't connect to subservice %s"
-msgstr ""
-
-#: transport-helper.c:745
-msgid "'option' without a matching 'ok/error' directive"
-msgstr ""
-
-#: transport-helper.c:788
-#, c-format
-msgid "expected ok/error, helper said '%s'"
-msgstr ""
-
-#: transport-helper.c:845
-#, c-format
-msgid "helper reported unexpected status of %s"
-msgstr ""
-
-#: transport-helper.c:928
-#, c-format
-msgid "helper %s does not support dry-run"
-msgstr ""
-
-#: transport-helper.c:931
-#, c-format
-msgid "helper %s does not support --signed"
-msgstr ""
-
-#: transport-helper.c:934
-#, c-format
-msgid "helper %s does not support --signed=if-asked"
-msgstr ""
-
-#: transport-helper.c:939
-#, c-format
-msgid "helper %s does not support --atomic"
-msgstr ""
-
-#: transport-helper.c:943
-#, c-format
-msgid "helper %s does not support --%s"
-msgstr ""
-
-#: transport-helper.c:950
-#, c-format
-msgid "helper %s does not support 'push-option'"
-msgstr ""
-
-#: transport-helper.c:1050
-msgid "remote-helper doesn't support push; refspec needed"
-msgstr ""
-
-#: transport-helper.c:1055
-#, c-format
-msgid "helper %s does not support 'force'"
-msgstr ""
-
-#: transport-helper.c:1102
-msgid "couldn't run fast-export"
-msgstr ""
-
-#: transport-helper.c:1107
-msgid "error while running fast-export"
-msgstr ""
-
-#: transport-helper.c:1132
-#, c-format
-msgid ""
-"No refs in common and none specified; doing nothing.\n"
-"Perhaps you should specify a branch.\n"
-msgstr ""
-
-#: transport-helper.c:1213
-#, c-format
-msgid "unsupported object format '%s'"
-msgstr ""
-
-#: transport-helper.c:1222
-#, c-format
-msgid "malformed response in ref list: %s"
-msgstr ""
-
-#: transport-helper.c:1374
-#, c-format
-msgid "read(%s) failed"
-msgstr ""
-
-#: transport-helper.c:1401
-#, c-format
-msgid "write(%s) failed"
-msgstr ""
-
-#: transport-helper.c:1450
-#, c-format
-msgid "%s thread failed"
-msgstr ""
-
-#: transport-helper.c:1454
-#, c-format
-msgid "%s thread failed to join: %s"
-msgstr ""
-
-#: transport-helper.c:1473 transport-helper.c:1477
-#, c-format
-msgid "can't start thread for copying data: %s"
-msgstr ""
-
-#: transport-helper.c:1514
-#, c-format
-msgid "%s process failed to wait"
-msgstr ""
-
-#: transport-helper.c:1518
-#, c-format
-msgid "%s process failed"
-msgstr ""
-
-#: transport-helper.c:1536 transport-helper.c:1545
-msgid "can't start thread for copying data"
-msgstr ""
-
-#: transport.c:116
-#, c-format
-msgid "Would set upstream of '%s' to '%s' of '%s'\n"
-msgstr "Будет установлен вышестоящий репозиторий для «%s» на «%s» с «%s»\n"
-
-#: transport.c:145
-#, c-format
-msgid "could not read bundle '%s'"
-msgstr ""
-
-#: transport.c:220
-#, c-format
-msgid "transport: invalid depth option '%s'"
-msgstr "транспорт: неправильный параметр глубины «%s»"
-
-#: transport.c:269
-msgid "see protocol.version in 'git help config' for more details"
-msgstr ""
-
-#: transport.c:270
-msgid "server options require protocol version 2 or later"
-msgstr ""
-
-#: transport.c:727
-msgid "could not parse transport.color.* config"
-msgstr "не удалось разобрать опцию transport.color.*"
-
-#: transport.c:802
-msgid "support for protocol v2 not implemented yet"
-msgstr ""
-
-#: transport.c:936
-#, c-format
-msgid "unknown value for config '%s': %s"
-msgstr ""
-
-#: transport.c:1002
-#, c-format
-msgid "transport '%s' not allowed"
-msgstr ""
-
-#: transport.c:1055
-msgid "git-over-rsync is no longer supported"
+"If you are planning to push out a new local branch that\n"
+"will track its remote counterpart, you may want to use\n"
+"\"git push -u\" to set the upstream config as you push."
 msgstr ""
-
-#: transport.c:1157
-#, c-format
-msgid ""
-"The following submodule paths contain changes that can\n"
-"not be found on any remote:\n"
-msgstr "Подмодули по указанным путям содержат изменения, которые не найдены ни на одном из внешних репозиториев:\n"
-
-#: transport.c:1161
-#, c-format
-msgid ""
-"\n"
-"Please try\n"
-"\n"
-"\tgit push --recurse-submodules=on-demand\n"
-"\n"
-"or cd to the path and use\n"
-"\n"
-"\tgit push\n"
 "\n"
-"to push them to a remote.\n"
+"Если планируете основывать свою работу на вышестоящей ветке,\n"
+"которая уже существует во внешнем репозитории, вам может\n"
+"потребоваться запустить «git fetch» для ее получения.\n"
 "\n"
-msgstr "\nПопробуйте выполнить\n\n\tgit push --recurse-submodules=on-demand\n\nили перейти в каталог с помощью команды cd и выполнить\n\n\tgit push\n\nдля их отправки на внешний репозиторий.\n"
-
-#: transport.c:1169
-msgid "Aborting."
-msgstr "Прерываю."
-
-#: transport.c:1315
-msgid "failed to push all needed submodules"
-msgstr ""
-
-#: tree-walk.c:32
-msgid "too-short tree object"
-msgstr "слишком  короткий объект дерева"
-
-#: tree-walk.c:38
-msgid "malformed mode in tree entry"
-msgstr "неправильный режим в записи дерева"
-
-#: tree-walk.c:42
-msgid "empty filename in tree entry"
-msgstr "пустое имя файла в записи дерева"
-
-#: tree-walk.c:117
-msgid "too-short tree file"
-msgstr "слишком  короткий файл дерева"
-
-#: unpack-trees.c:113
-#, c-format
-msgid ""
-"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 "Ваши локальные изменения в указанных файлах будут перезаписаны при переключении на состояние:\n%%sСделайте коммит или спрячьте ваши изменения перед переключением веток."
-
-#: unpack-trees.c:115
-#, c-format
-msgid ""
-"Your local changes to the following files would be overwritten by checkout:\n"
-"%%s"
-msgstr "Ваши локальные изменения в указанных файлах будут перезаписаны при переключении на состояние:\n%%s"
-
-#: unpack-trees.c:118
-#, c-format
-msgid ""
-"Your local changes to the following files would be overwritten by merge:\n"
-"%%sPlease commit your changes or stash them before you merge."
-msgstr "Ваши локальные изменения в указанных файлах будут перезаписаны при слиянии:\n%%sСделайте коммит или спрячьте ваши изменения перед слиянием веток."
-
-#: unpack-trees.c:120
-#, c-format
-msgid ""
-"Your local changes to the following files would be overwritten by merge:\n"
-"%%s"
-msgstr "Ваши локальные изменения в указанных файлах будут перезаписаны при слиянии:\n%%s"
-
-#: unpack-trees.c:123
-#, c-format
-msgid ""
-"Your local changes to the following files would be overwritten by %s:\n"
-"%%sPlease commit your changes or stash them before you %s."
-msgstr "Ваши локальные изменения в указанных файлах будут перезаписаны при %s:\n%%sСделайте коммит или спрячьте ваши изменения перед %s."
-
-#: unpack-trees.c:125
-#, c-format
-msgid ""
-"Your local changes to the following files would be overwritten by %s:\n"
-"%%s"
-msgstr "Ваши локальные изменения в указанных файлах будут перезаписаны при %s:\n%%s"
-
-#: unpack-trees.c:130
-#, c-format
-msgid ""
-"Updating the following directories would lose untracked files in them:\n"
-"%s"
-msgstr "Обновление указанных каталогов приведет к потере неотслеживаемых файлов в них:\n%s"
-
-#: unpack-trees.c:134
-#, c-format
-msgid ""
-"The following untracked working tree files would be removed by checkout:\n"
-"%%sPlease move or remove them before you switch branches."
-msgstr "Указанные неотслеживаемые файлы в рабочем каталоге будут удалены при переключении на состояние:\n%%sПереместите эти файлы или удалите их перед переключением веток."
-
-#: unpack-trees.c:136
-#, c-format
-msgid ""
-"The following untracked working tree files would be removed by checkout:\n"
-"%%s"
-msgstr "Указанные неотслеживаемые файлы в рабочем каталоге будут удалены при переключении на состояние:\n%%s"
-
-#: unpack-trees.c:139
-#, c-format
-msgid ""
-"The following untracked working tree files would be removed by merge:\n"
-"%%sPlease move or remove them before you merge."
-msgstr "Указанные неотслеживаемые файлы в рабочем каталоге будут удалены при слиянии:\n%%sПереместите эти файлы или удалите их перед переключением веток."
-
-#: unpack-trees.c:141
-#, c-format
-msgid ""
-"The following untracked working tree files would be removed by merge:\n"
-"%%s"
-msgstr "Указанные неотслеживаемые файлы в рабочем каталоге будут удалены при слиянии:\n%%s"
-
-#: unpack-trees.c:144
-#, c-format
-msgid ""
-"The following untracked working tree files would be removed by %s:\n"
-"%%sPlease move or remove them before you %s."
-msgstr "Указанные неотслеживаемые файлы в рабочем каталоге будут удалены при %s:\n%%sПереместите эти файлы или удалите их перед %s."
-
-#: unpack-trees.c:146
-#, c-format
-msgid ""
-"The following untracked working tree files would be removed by %s:\n"
-"%%s"
-msgstr "Указанные неотслеживаемые файлы в рабочем каталоге будут удалены при %s:\n%%s"
-
-#: unpack-trees.c:152
-#, c-format
-msgid ""
-"The following untracked working tree files would be overwritten by checkout:\n"
-"%%sPlease move or remove them before you switch branches."
-msgstr "Указанные неотслеживаемые файлы в рабочем каталоге будут перезаписаны при переключении на состояние:\n%%sПереместите эти файлы или удалите их перед переключением веток."
-
-#: unpack-trees.c:154
-#, c-format
-msgid ""
-"The following untracked working tree files would be overwritten by checkout:\n"
-"%%s"
-msgstr "Указанные неотслеживаемые файлы в рабочем каталоге будут перезаписаны при переключении на состояние:\n%%s"
-
-#: unpack-trees.c:157
-#, c-format
-msgid ""
-"The following untracked working tree files would be overwritten by merge:\n"
-"%%sPlease move or remove them before you merge."
-msgstr "Указанные неотслеживаемые файлы в рабочем каталоге будут перезаписаны при слиянии:\n%%sПереместите эти файлы или удалите их перед переключением веток."
-
-#: unpack-trees.c:159
-#, c-format
-msgid ""
-"The following untracked working tree files would be overwritten by merge:\n"
-"%%s"
-msgstr "Указанные неотслеживаемые файлы в рабочем каталоге будут перезаписаны при слиянии:\n%%s"
-
-#: unpack-trees.c:162
-#, c-format
-msgid ""
-"The following untracked working tree files would be overwritten by %s:\n"
-"%%sPlease move or remove them before you %s."
-msgstr "Указанные неотслеживаемые файлы в рабочем каталоге будут перезаписаны при %s:\n%%sПереместите эти файлы или удалите их перед %s."
-
-#: unpack-trees.c:164
-#, c-format
-msgid ""
-"The following untracked working tree files would be overwritten by %s:\n"
-"%%s"
-msgstr "Указанные неотслеживаемые файлы в рабочем каталоге будут перезаписаны при %s:\n%%s"
-
-#: unpack-trees.c:172
-#, c-format
-msgid "Entry '%s' overlaps with '%s'.  Cannot bind."
-msgstr "Запись «%s» частично совпадает с «%s».  Не удалось назначить соответствие."
-
-#: unpack-trees.c:175
-#, c-format
-msgid ""
-"Cannot update submodule:\n"
-"%s"
-msgstr "Не удолось обновить подмодуль:\n%s"
-
-#: unpack-trees.c:178
-#, c-format
-msgid ""
-"The following paths are not up to date and were left despite sparse patterns:\n"
-"%s"
-msgstr ""
-
-#: unpack-trees.c:180
-#, c-format
-msgid ""
-"The following paths are unmerged and were left despite sparse patterns:\n"
-"%s"
-msgstr ""
-
-#: unpack-trees.c:182
-#, c-format
-msgid ""
-"The following paths were already present and thus not updated despite sparse patterns:\n"
-"%s"
-msgstr ""
-
-#: unpack-trees.c:262
-#, c-format
-msgid "Aborting\n"
-msgstr "Прерываю\n"
-
-#: unpack-trees.c:289
-#, c-format
-msgid ""
-"After fixing the above paths, you may want to run `git sparse-checkout "
-"reapply`.\n"
-msgstr "После исправления указанных путей вы можете запустить «git sparse-checkout reapply».\n"
-
-#: unpack-trees.c:350
-msgid "Updating files"
-msgstr ""
-
-#: unpack-trees.c:382
-msgid ""
-"the following paths have collided (e.g. case-sensitive paths\n"
-"on a case-insensitive filesystem) and only one from the same\n"
-"colliding group is in the working tree:\n"
-msgstr ""
-
-#: unpack-trees.c:1498
-msgid "Updating index flags"
-msgstr ""
-
-#: upload-pack.c:1550
-msgid "expected flush after fetch arguments"
-msgstr ""
-
-#: urlmatch.c:163
-msgid "invalid URL scheme name or missing '://' suffix"
-msgstr "Неправильная имя URL схемы или пропущен суффикс «://»"
-
-#: urlmatch.c:187 urlmatch.c:346 urlmatch.c:405
-#, c-format
-msgid "invalid %XX escape sequence"
-msgstr "неправильная управляющая последовательность %XX"
-
-#: urlmatch.c:215
-msgid "missing host and scheme is not 'file:'"
-msgstr "пропущено имя сервера и схема доступа не «file:»"
-
-#: urlmatch.c:232
-msgid "a 'file:' URL may not have a port number"
-msgstr "URL со схемой «file:» не может содержать номер порта"
-
-#: urlmatch.c:247
-msgid "invalid characters in host name"
-msgstr "неправильные символы в имени сервера"
-
-#: urlmatch.c:292 urlmatch.c:303
-msgid "invalid port number"
-msgstr "неправильный номер порта"
-
-#: urlmatch.c:371
-msgid "invalid '..' path segment"
-msgstr "неправильная часть пути «..»"
-
-#: walker.c:170
-msgid "Fetching objects"
-msgstr ""
+"Если планируете отправить во внешний репозиторий новую локальную ветку,\n"
+"которую нужно отслеживать, можете использовать команду «git push -u»\n"
+"чтобы сразу связать ветки."
 
-#: worktree.c:236 builtin/am.c:2103
 #, c-format
-msgid "failed to read '%s'"
-msgstr "не удалось прочитать «%s»"
-
-#: worktree.c:283
-#, c-format
-msgid "'%s' at main working tree is not the repository directory"
+msgid "not a valid object name: '%s'"
 msgstr ""
 
-#: worktree.c:294
 #, c-format
-msgid "'%s' file does not contain absolute path to the working tree location"
+msgid "ambiguous object name: '%s'"
 msgstr ""
 
-#: worktree.c:306
 #, c-format
-msgid "'%s' does not exist"
-msgstr "«%s» не существует"
-
-#: worktree.c:312
-#, c-format
-msgid "'%s' is not a .git file, error code %d"
+msgid "not a valid branch point: '%s'"
 msgstr ""
 
-#: worktree.c:321
 #, c-format
-msgid "'%s' does not point back to '%s'"
+msgid "submodule '%s': unable to find submodule"
 msgstr ""
 
-#: worktree.c:587
-msgid "not a directory"
-msgstr ""
-
-#: worktree.c:596
-msgid ".git is not a file"
-msgstr ""
-
-#: worktree.c:598
-msgid ".git file broken"
-msgstr ""
-
-#: worktree.c:600
-msgid ".git file incorrect"
-msgstr ""
-
-#: worktree.c:670
-msgid "not a valid path"
-msgstr ""
-
-#: worktree.c:676
-msgid "unable to locate repository; .git is not a file"
-msgstr ""
-
-#: worktree.c:679
-msgid "unable to locate repository; .git file broken"
-msgstr ""
-
-#: worktree.c:685
-msgid "gitdir unreadable"
-msgstr ""
-
-#: worktree.c:689
-msgid "gitdir incorrect"
-msgstr ""
-
-#: wrapper.c:197 wrapper.c:367
-#, c-format
-msgid "could not open '%s' for reading and writing"
-msgstr "не удалось открыть «%s» для чтения и записи"
-
-#: wrapper.c:398 wrapper.c:599
-#, c-format
-msgid "unable to access '%s'"
-msgstr "«%s» недоступно"
-
-#: wrapper.c:607
-msgid "unable to get current working directory"
-msgstr "не удалось получить текущий рабочий каталог"
-
-#: wt-status.c:158
-msgid "Unmerged paths:"
-msgstr "Не слитые пути:"
-
-#: wt-status.c:187 wt-status.c:219
-msgid "  (use \"git restore --staged <file>...\" to unstage)"
-msgstr "  (используйте «git restore --staged <файл>…», чтобы убрать из индекса)"
-
-#: wt-status.c:190 wt-status.c:222
-#, c-format
-msgid "  (use \"git restore --source=%s --staged <file>...\" to unstage)"
-msgstr "  (используйте «git restore --source=%s --staged <файл>…», чтобы убрать из индекса)"
-
-#: wt-status.c:193 wt-status.c:225
-msgid "  (use \"git rm --cached <file>...\" to unstage)"
-msgstr "  (используйте «git rm --cached <файл>…», чтобы убрать из индекса)"
-
-#: wt-status.c:197
-msgid "  (use \"git add <file>...\" to mark resolution)"
-msgstr "  (используйте «git add <файл>…», чтобы пометить разрешение конфликта)"
-
-#: wt-status.c:199 wt-status.c:203
-msgid "  (use \"git add/rm <file>...\" as appropriate to mark resolution)"
-msgstr "  (используйте «git add/rm <файл>…», чтобы пометить выбранное разрешение конфликта)"
-
-#: wt-status.c:201
-msgid "  (use \"git rm <file>...\" to mark resolution)"
-msgstr "  (используйте «git rm <файл>…», чтобы пометить разрешение конфликта)"
-
-#: wt-status.c:211 wt-status.c:1070
-msgid "Changes to be committed:"
-msgstr "Изменения, которые будут включены в коммит:"
-
-#: wt-status.c:234 wt-status.c:1079
-msgid "Changes not staged for commit:"
-msgstr "Изменения, которые не в индексе для коммита:"
-
-#: wt-status.c:238
-msgid "  (use \"git add <file>...\" to update what will be committed)"
-msgstr "  (используйте «git add <файл>…», чтобы добавить файл в индекс)"
-
-#: wt-status.c:240
-msgid "  (use \"git add/rm <file>...\" to update what will be committed)"
-msgstr "  (используйте «git add/rm <файл>…», чтобы добавить или удалить файл из индекса)"
-
-#: wt-status.c:241
-msgid "  (use \"git restore <file>...\" to discard changes in working directory)"
-msgstr "  (используйте «git restore <файл>…», чтобы отменить изменения в рабочем каталоге)"
-
-#: wt-status.c:243
-msgid "  (commit or discard the untracked or modified content in submodules)"
-msgstr "  (сделайте коммит или отмените изменения в неотслеживаемом или измененном содержимом в подмодулях)"
-
-#: wt-status.c:254
-#, c-format
-msgid "  (use \"git %s <file>...\" to include in what will be committed)"
-msgstr "  (используйте «git %s <файл>…», чтобы добавить в то, что будет включено в коммит)"
-
-#: wt-status.c:266
-msgid "both deleted:"
-msgstr "оба удалены:"
-
-#: wt-status.c:268
-msgid "added by us:"
-msgstr "добавлено нами:"
-
-#: wt-status.c:270
-msgid "deleted by them:"
-msgstr "удалено ими:"
-
-#: wt-status.c:272
-msgid "added by them:"
-msgstr "добавлено ими:"
-
-#: wt-status.c:274
-msgid "deleted by us:"
-msgstr "удалено нами:"
-
-#: wt-status.c:276
-msgid "both added:"
-msgstr "оба добавлены:"
-
-#: wt-status.c:278
-msgid "both modified:"
-msgstr "оба изменены:"
-
-#: wt-status.c:288
-msgid "new file:"
-msgstr "новый файл:"
-
-#: wt-status.c:290
-msgid "copied:"
-msgstr "скопировано:"
-
-#: wt-status.c:292
-msgid "deleted:"
-msgstr "удалено:"
-
-#: wt-status.c:294
-msgid "modified:"
-msgstr "изменено:"
-
-#: wt-status.c:296
-msgid "renamed:"
-msgstr "переименовано:"
-
-#: wt-status.c:298
-msgid "typechange:"
-msgstr "изменен тип:"
-
-#: wt-status.c:300
-msgid "unknown:"
-msgstr "неизвестно:"
-
-#: wt-status.c:302
-msgid "unmerged:"
-msgstr "не слитые:"
-
-#: wt-status.c:382
-msgid "new commits, "
-msgstr "новые коммиты, "
-
-#: wt-status.c:384
-msgid "modified content, "
-msgstr "изменено содержимое, "
-
-#: wt-status.c:386
-msgid "untracked content, "
-msgstr "неотслеживаемое содержимое, "
-
-#: wt-status.c:903
-#, c-format
-msgid "Your stash currently has %d entry"
-msgid_plural "Your stash currently has %d entries"
-msgstr[0] "У вас сейчас спрятана %d запись"
-msgstr[1] "У вас сейчас спрятаны %d записи"
-msgstr[2] "У вас сейчас спрятано %d записей"
-msgstr[3] "У вас сейчас спрятаны %d записи"
-
-#: wt-status.c:934
-msgid "Submodules changed but not updated:"
-msgstr "Измененные, но не обновленные подмодули:"
-
-#: wt-status.c:936
-msgid "Submodule changes to be committed:"
-msgstr "Изменения в подмодулях, которые будут закоммичены:"
-
-#: wt-status.c:1018
-msgid ""
-"Do not modify or remove the line above.\n"
-"Everything below it will be ignored."
-msgstr "Не изменяйте или удаляйте строку выше этой.\nВсё, что ниже — будет проигнорировано."
-
-#: wt-status.c:1110
 #, c-format
 msgid ""
-"\n"
-"It took %.2f seconds to compute the branch ahead/behind values.\n"
-"You can use '--no-ahead-behind' to avoid this.\n"
+"You may try updating the submodules using 'git checkout %s && git submodule "
+"update --init'"
 msgstr ""
 
-#: wt-status.c:1140
-msgid "You have unmerged paths."
-msgstr "У вас есть не слитые пути."
-
-#: wt-status.c:1143
-msgid "  (fix conflicts and run \"git commit\")"
-msgstr "  (разрешите конфликты, затем запустите «git commit»)"
-
-#: wt-status.c:1145
-msgid "  (use \"git merge --abort\" to abort the merge)"
-msgstr "  (используйте «git merge --abort», чтобы остановить операцию слияния)"
-
-#: wt-status.c:1149
-msgid "All conflicts fixed but you are still merging."
-msgstr "Все конфликты исправлены, но вы все еще в процессе слияния."
-
-#: wt-status.c:1152
-msgid "  (use \"git commit\" to conclude merge)"
-msgstr "  (используйте «git commit», чтобы завершить слияние)"
-
-#: wt-status.c:1161
-msgid "You are in the middle of an am session."
-msgstr "Вы в процессе сессии am."
-
-#: wt-status.c:1164
-msgid "The current patch is empty."
-msgstr "Текущий патч пустой."
-
-#: wt-status.c:1168
-msgid "  (fix conflicts and then run \"git am --continue\")"
-msgstr "  (разрешите конфликты, затем запустите «git am --continue»)"
-
-#: wt-status.c:1170
-msgid "  (use \"git am --skip\" to skip this patch)"
-msgstr "  (используйте «git am --skip», чтобы пропустить этот патч)"
-
-#: wt-status.c:1172
-msgid "  (use \"git am --abort\" to restore the original branch)"
-msgstr "  (используйте «git am --abort», чтобы восстановить оригинальную ветку)"
-
-#: wt-status.c:1305
-msgid "git-rebase-todo is missing."
-msgstr "git-rebase-todo отсутствует."
-
-#: wt-status.c:1307
-msgid "No commands done."
-msgstr "Команды не выполнены."
-
-#: wt-status.c:1310
 #, c-format
-msgid "Last command done (%d command done):"
-msgid_plural "Last commands done (%d commands done):"
-msgstr[0] "Последняя команда выполнена (%d команда выполнена):"
-msgstr[1] "Последняя команда выполнена (%d команды выполнено):"
-msgstr[2] "Последняя команда выполнена (%d команд выполнено):"
-msgstr[3] "Последняя команда выполнена (%d команд выполнено):"
-
-#: wt-status.c:1321
-#, c-format
-msgid "  (see more in file %s)"
-msgstr "  (смотрите дополнительно в файле %s)"
-
-#: wt-status.c:1326
-msgid "No commands remaining."
-msgstr "Команд больше не осталось."
-
-#: wt-status.c:1329
-#, c-format
-msgid "Next command to do (%d remaining command):"
-msgid_plural "Next commands to do (%d remaining commands):"
-msgstr[0] "Следующая команда для выполнения (%d команда осталась):"
-msgstr[1] "Следующая команда для выполнения (%d команды осталось):"
-msgstr[2] "Следующая команда для выполнения (%d команд осталось):"
-msgstr[3] "Следующая команда для выполнения (%d команд осталось):"
-
-#: wt-status.c:1337
-msgid "  (use \"git rebase --edit-todo\" to view and edit)"
-msgstr "  (используйте «git rebase --edit-todo», чтобы просмотреть или изменить их)"
-
-#: wt-status.c:1349
-#, c-format
-msgid "You are currently rebasing branch '%s' on '%s'."
-msgstr "Вы сейчас перемещаете ветку «%s» над «%s»."
-
-#: wt-status.c:1354
-msgid "You are currently rebasing."
-msgstr "Вы сейчас перемещаете ветку."
-
-#: wt-status.c:1367
-msgid "  (fix conflicts and then run \"git rebase --continue\")"
-msgstr "  (разрешите конфликты, затем запустите «git rebase --continue»)"
-
-#: wt-status.c:1369
-msgid "  (use \"git rebase --skip\" to skip this patch)"
-msgstr "  (используйте «git rebase --skip», чтобы пропустить этот патч)"
-
-#: wt-status.c:1371
-msgid "  (use \"git rebase --abort\" to check out the original branch)"
-msgstr "  (используйте «git rebase --abort», чтобы перейти на оригинальную ветку)"
-
-#: wt-status.c:1378
-msgid "  (all conflicts fixed: run \"git rebase --continue\")"
-msgstr "  (все конфликты разрешены: запустите «git rebase --continue»)"
-
-#: wt-status.c:1382
-#, c-format
-msgid ""
-"You are currently splitting a commit while rebasing branch '%s' on '%s'."
-msgstr "Вы сейчас разделяете коммит при перемещении ветки  «%s» над «%s»."
-
-#: wt-status.c:1387
-msgid "You are currently splitting a commit during a rebase."
-msgstr "Вы сейчас разделяете коммит при перемещении ветки."
-
-#: wt-status.c:1390
-msgid "  (Once your working directory is clean, run \"git rebase --continue\")"
-msgstr "  (Как только ваш рабочий каталог будет чистый, запустите «git rebase --continue»)"
-
-#: wt-status.c:1394
-#, c-format
-msgid "You are currently editing a commit while rebasing branch '%s' on '%s'."
-msgstr "Вы сейчас редактируете коммит при перемещении ветки  «%s» над «%s»."
-
-#: wt-status.c:1399
-msgid "You are currently editing a commit during a rebase."
-msgstr "Вы сейчас редактируете коммит при перемещении ветки."
-
-#: wt-status.c:1402
-msgid "  (use \"git commit --amend\" to amend the current commit)"
-msgstr "  (используйте «git commit --amend», чтобы исправить текущий коммит)"
-
-#: wt-status.c:1404
-msgid "  (use \"git rebase --continue\" once you are satisfied with your changes)"
-msgstr "  (используйте «git rebase --continue», когда будете довольны изменениями)"
-
-#: wt-status.c:1415
-msgid "Cherry-pick currently in progress."
+msgid "submodule '%s': cannot create branch '%s'"
 msgstr ""
 
-#: wt-status.c:1418
 #, c-format
-msgid "You are currently cherry-picking commit %s."
-msgstr "Вы копируете коммит %s."
-
-#: wt-status.c:1425
-msgid "  (fix conflicts and run \"git cherry-pick --continue\")"
-msgstr "  (разрешите конфликты, затем запустите «git cherry-pick --continue»)"
-
-#: wt-status.c:1428
-msgid "  (run \"git cherry-pick --continue\" to continue)"
-msgstr ""
-
-#: wt-status.c:1431
-msgid "  (all conflicts fixed: run \"git cherry-pick --continue\")"
-msgstr "  (все конфликты разрешены: запустите «git cherry-pick --continue»)"
-
-#: wt-status.c:1433
-msgid "  (use \"git cherry-pick --skip\" to skip this patch)"
-msgstr ""
-
-#: wt-status.c:1435
-msgid "  (use \"git cherry-pick --abort\" to cancel the cherry-pick operation)"
-msgstr "  (используйте «git cherry-pick --abort», чтобы отменить копирования коммита)"
-
-#: wt-status.c:1445
-msgid "Revert currently in progress."
-msgstr ""
-
-#: wt-status.c:1448
-#, c-format
-msgid "You are currently reverting commit %s."
-msgstr "Вы сейчас обращаете изменения коммита %s."
-
-#: wt-status.c:1454
-msgid "  (fix conflicts and run \"git revert --continue\")"
-msgstr "  (разрешите конфликты, затем запустите «git revert --continue»)"
-
-#: wt-status.c:1457
-msgid "  (run \"git revert --continue\" to continue)"
-msgstr ""
-
-#: wt-status.c:1460
-msgid "  (all conflicts fixed: run \"git revert --continue\")"
-msgstr "  (все конфликты разрешены: запустите «git revert --continue»)"
-
-#: wt-status.c:1462
-msgid "  (use \"git revert --skip\" to skip this patch)"
-msgstr ""
-
-#: wt-status.c:1464
-msgid "  (use \"git revert --abort\" to cancel the revert operation)"
-msgstr "  (используйте «git revert --abort», чтобы отменить операцию обращения изменений коммита)"
+msgid "'%s' is already checked out at '%s'"
+msgstr "«%s» уже находится на «%s»"
 
-#: wt-status.c:1474
 #, c-format
-msgid "You are currently bisecting, started from branch '%s'."
-msgstr "Вы сейчас в процессе двоичного поиска, начатого с ветки «%s»."
-
-#: wt-status.c:1478
-msgid "You are currently bisecting."
-msgstr "Вы сейчас в процессе двоичного поиска."
+msgid "HEAD of working tree %s is not updated"
+msgstr "HEAD рабочего каталога %s не обновлён"
 
-#: wt-status.c:1481
-msgid "  (use \"git bisect reset\" to get back to the original branch)"
-msgstr "  (используйте «git bisect reset», чтобы вернуться на исходную ветку)"
+msgid "git add [<options>] [--] <pathspec>..."
+msgstr "git add [<опции>] [--] <спецификатор-пути>..."
 
-#: wt-status.c:1492
 #, c-format
-msgid "You are in a sparse checkout with %d%% of tracked files present."
+msgid "cannot chmod %cx '%s'"
 msgstr ""
 
-#: wt-status.c:1731
-msgid "On branch "
-msgstr "На ветке "
-
-#: wt-status.c:1738
-msgid "interactive rebase in progress; onto "
-msgstr "интерактивное перемещение в процессе; над "
-
-#: wt-status.c:1740
-msgid "rebase in progress; onto "
-msgstr "перемещение в процессе; над "
-
-#: wt-status.c:1750
-msgid "Not currently on any branch."
-msgstr "Сейчас ни на одной из веток"
-
-#: wt-status.c:1767
-msgid "Initial commit"
-msgstr "Начальный коммит"
-
-#: wt-status.c:1768
-msgid "No commits yet"
-msgstr "Еще нет коммитов"
-
-#: wt-status.c:1782
-msgid "Untracked files"
-msgstr "Неотслеживаемые файлы"
-
-#: wt-status.c:1784
-msgid "Ignored files"
-msgstr "Игнорируемые файлы"
-
-#: wt-status.c:1788
-#, c-format
-msgid ""
-"It took %.2f seconds to enumerate untracked files. 'status -uno'\n"
-"may speed it up, but you have to be careful not to forget to add\n"
-"new files yourself (see 'git help status')."
-msgstr "%.2f секунды занял вывод списка неотслеживаемых файлов. «status -uno» возможно может ускорить это, но будьте внимательны, и не забудьте добавить новые файлы вручную (смотрите «git help status» для подробностей)."
-
-#: wt-status.c:1794
-#, c-format
-msgid "Untracked files not listed%s"
-msgstr "Неотслеживаемые файлы не показаны%s"
-
-#: wt-status.c:1796
-msgid " (use -u option to show untracked files)"
-msgstr " (используйте опцию «-u», чтобы показать неотслеживаемые файлы)"
-
-#: wt-status.c:1802
-msgid "No changes"
-msgstr "Нет изменений"
-
-#: wt-status.c:1807
-#, c-format
-msgid "no changes added to commit (use \"git add\" and/or \"git commit -a\")\n"
-msgstr "нет изменений добавленных для коммита\n(используйте «git add» и/или «git commit -a»)\n"
-
-#: wt-status.c:1811
-#, c-format
-msgid "no changes added to commit\n"
-msgstr "нет изменений добавленных для коммита\n"
-
-#: wt-status.c:1815
-#, c-format
-msgid ""
-"nothing added to commit but untracked files present (use \"git add\" to "
-"track)\n"
-msgstr "ничего не добавлено в коммит, но есть неотслеживаемые файлы (используйте «git add», чтобы отслеживать их)\n"
-
-#: wt-status.c:1819
-#, c-format
-msgid "nothing added to commit but untracked files present\n"
-msgstr "ничего не добавлено в коммит, но есть неотслеживаемые файлы\n"
-
-#: wt-status.c:1823
-#, c-format
-msgid "nothing to commit (create/copy files and use \"git add\" to track)\n"
-msgstr "нечего коммитить (создайте/скопируйте файлы, затем запустите «git add», чтобы отслеживать их)\n"
-
-#: wt-status.c:1827 wt-status.c:1833
-#, c-format
-msgid "nothing to commit\n"
-msgstr "нечего коммитить\n"
-
-#: wt-status.c:1830
-#, c-format
-msgid "nothing to commit (use -u to show untracked files)\n"
-msgstr "нечего коммитить (используйте опцию «-u», чтобы показать неотслеживаемые файлы)\n"
-
-#: wt-status.c:1835
-#, c-format
-msgid "nothing to commit, working tree clean\n"
-msgstr "нечего коммитить, нет изменений в рабочем каталоге\n"
-
-#: wt-status.c:1940
-msgid "No commits yet on "
-msgstr "Еще нет коммитов в "
-
-#: wt-status.c:1944
-msgid "HEAD (no branch)"
-msgstr "HEAD (нет ветки)"
-
-#: wt-status.c:1975
-msgid "different"
-msgstr "отличается"
-
-#: wt-status.c:1977 wt-status.c:1985
-msgid "behind "
-msgstr "позади "
-
-#: wt-status.c:1980 wt-status.c:1983
-msgid "ahead "
-msgstr "впереди "
-
-#. TRANSLATORS: the action is e.g. "pull with rebase"
-#: wt-status.c:2505
-#, c-format
-msgid "cannot %s: You have unstaged changes."
-msgstr "не удалось выполнить %s: У вас есть непроиндексированные изменения."
-
-#: wt-status.c:2511
-msgid "additionally, your index contains uncommitted changes."
-msgstr "к тому же, в вашем индексе есть незакоммиченные изменения."
-
-#: wt-status.c:2513
-#, c-format
-msgid "cannot %s: Your index contains uncommitted changes."
-msgstr "не удалось выполнить %s: В вашем индексе есть незакоммиченные изменения."
-
-#: compat/precompose_utf8.c:58 builtin/clone.c:457
-#, c-format
-msgid "failed to unlink '%s'"
-msgstr "сбой отсоединения «%s»"
-
-#: builtin/add.c:26
-msgid "git add [<options>] [--] <pathspec>..."
-msgstr "git add [<опции>] [--] <спецификатор-пути>…"
-
-#: builtin/add.c:88
 #, c-format
 msgid "unexpected diff status %c"
 msgstr "неожиданный статус утилиты сравнения %c"
 
-#: builtin/add.c:93 builtin/commit.c:285
 msgid "updating files failed"
 msgstr "сбой при обновлении файлов"
 
-#: builtin/add.c:103
 #, c-format
 msgid "remove '%s'\n"
 msgstr "удалить «%s»\n"
 
-#: builtin/add.c:178
 msgid "Unstaged changes after refreshing the index:"
 msgstr "Непроиндексированные изменения после обновления индекса:"
 
-#: builtin/add.c:272 builtin/rev-parse.c:908
 msgid "Could not read the index"
 msgstr "Не удалось прочитать индекс"
 
-#: builtin/add.c:283
-#, c-format
-msgid "Could not open '%s' for writing."
-msgstr "Не удалось открыть «%s» для записи."
-
-#: builtin/add.c:287
 msgid "Could not write patch"
 msgstr "Не удалось записать патч"
 
-#: builtin/add.c:290
 msgid "editing patch failed"
 msgstr "сбой при редактировании патча"
 
-#: builtin/add.c:293
 #, c-format
 msgid "Could not stat '%s'"
 msgstr "Не удалось выполнить stat для «%s»"
 
-#: builtin/add.c:295
 msgid "Empty patch. Aborted."
 msgstr "Пустой патч. Операция прервана."
 
-#: builtin/add.c:300
 #, c-format
 msgid "Could not apply '%s'"
 msgstr "Не удалось применить «%s»"
 
-#: builtin/add.c:308
 msgid "The following paths are ignored by one of your .gitignore files:\n"
 msgstr "Следующие пути игнорируются одним из ваших файлов .gitignore:\n"
 
-#: builtin/add.c:328 builtin/clean.c:904 builtin/fetch.c:166 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
 msgid "dry run"
 msgstr "пробный запуск"
 
-#: builtin/add.c:331
+msgid "be verbose"
+msgstr "быть многословнее"
+
 msgid "interactive picking"
 msgstr "интерактивный выбор"
 
-#: builtin/add.c:332 builtin/checkout.c:1547 builtin/reset.c:308
 msgid "select hunks interactively"
 msgstr "интерактивный выбор блоков"
 
-#: builtin/add.c:333
 msgid "edit current diff and apply"
 msgstr "отредактировать текущий файл списка изменений и применить его"
 
-#: builtin/add.c:334
 msgid "allow adding otherwise ignored files"
 msgstr "разрешить добавление игнорируемых иначе файлов"
 
-#: builtin/add.c:335
 msgid "update tracked files"
 msgstr "обновить отслеживаемые файлы"
 
-#: builtin/add.c:336
 msgid "renormalize EOL of tracked files (implies -u)"
-msgstr "перенормализировать концы строк (EOL) отслеживаемых файлов (подразумевает -u)"
+msgstr ""
+"перенормализировать концы строк (EOL) отслеживаемых файлов (подразумевает -u)"
 
-#: builtin/add.c:337
 msgid "record only the fact that the path will be added later"
 msgstr "записать только факт, что путь будет добавлен позже"
 
-#: builtin/add.c:338
 msgid "add changes from all tracked and untracked files"
 msgstr "добавить изменения из всех отслеживаемых и неотслеживаемых файлов"
 
-#: builtin/add.c:341
 msgid "ignore paths removed in the working tree (same as --no-all)"
-msgstr "игнорировать пути удаленные из рабочего каталога (тоже, что и --no-all)"
+msgstr ""
+"игнорировать пути удаленные из рабочего каталога (тоже, что и --no-all)"
 
-#: builtin/add.c:343
 msgid "don't add, only refresh the index"
 msgstr "не добавлять, только обновить индекс"
 
-#: builtin/add.c:344
 msgid "just skip files which cannot be added because of errors"
 msgstr "пропускать файлы, которые не могут быть добавлены из-за ошибок"
 
-#: builtin/add.c:345
 msgid "check if - even missing - files are ignored in dry run"
-msgstr "удостовериться, что даже недостающие файлы будут проигнорированы при  пробном запуске"
+msgstr ""
+"удостовериться, что даже недостающие файлы будут проигнорированы при  "
+"пробном запуске"
+
+msgid "allow updating entries outside of the sparse-checkout cone"
+msgstr ""
 
-#: builtin/add.c:347 builtin/update-index.c:1004
 msgid "override the executable bit of the listed files"
 msgstr "переопределить бит выполнения на указанных файлах"
 
-#: builtin/add.c:349
 msgid "warn when adding an embedded repository"
 msgstr "предупреждать при добавлении встроенного git репозитория"
 
-#: builtin/add.c:351
-msgid "backend for `git stash -p`"
-msgstr ""
-
-#: builtin/add.c:369
 #, c-format
 msgid ""
 "You've added another git repository inside your current repository.\n"
@@ -9194,592 +1810,530 @@ msgid ""
 "\tgit rm --cached %s\n"
 "\n"
 "See \"git help submodule\" for more information."
-msgstr "Вы добавили другой репозиторий git внутри текущего репозитория\nКлоны внешнего репозитория не будут содержать внутренний\nрепозиторий и не будут знать как его получить.\nЕсли вы хотели добавить подмодуль, то запустите:\n\n\tgit submodule add <url> %s\n\nЕсли бы добавили этот путь по ошибке, то вы можете удалить его\nиз индекса с помощью:\n\n\tgit rm --cached %s\n\nДля дополнительной информации смотрите «git help submodule»."
+msgstr ""
+"Вы добавили другой репозиторий git внутри текущего репозитория\n"
+"Клоны внешнего репозитория не будут содержать внутренний\n"
+"репозиторий и не будут знать как его получить.\n"
+"Если вы хотели добавить подмодуль, то запустите:\n"
+"\n"
+"\tgit submodule add <url> %s\n"
+"\n"
+"Если бы добавили этот путь по ошибке, то вы можете удалить его\n"
+"из индекса с помощью:\n"
+"\n"
+"\tgit rm --cached %s\n"
+"\n"
+"Для дополнительной информации смотрите «git help submodule»."
 
-#: builtin/add.c:397
 #, c-format
 msgid "adding embedded git repository: %s"
 msgstr "добавление встроенного git репозитория: %s"
 
-#: builtin/add.c:416
 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:425
 msgid "adding files failed"
 msgstr "ошибка при добавлении файлов"
 
-#: builtin/add.c:453 builtin/commit.c:345
-msgid "--pathspec-from-file is incompatible with --interactive/--patch"
-msgstr ""
-
-#: builtin/add.c:470
-msgid "--pathspec-from-file is incompatible with --edit"
-msgstr ""
-
-#: builtin/add.c:482
-msgid "-A and -u are mutually incompatible"
-msgstr "-A и -u нельзя использовать одновременно"
-
-#: builtin/add.c:485
-msgid "Option --ignore-missing can only be used together with --dry-run"
-msgstr "Опция --ignore-missing может использоваться только вместе с --dry-run"
-
-#: builtin/add.c:489
 #, c-format
 msgid "--chmod param '%s' must be either -x or +x"
 msgstr "параметр --chmod «%s» должен быть -x или +x"
 
-#: builtin/add.c:507 builtin/checkout.c:1715 builtin/commit.c:351
-#: builtin/reset.c:328 builtin/rm.c:272 builtin/stash.c:1502
-msgid "--pathspec-from-file is incompatible with pathspec arguments"
-msgstr ""
-
-#: builtin/add.c:514 builtin/checkout.c:1727 builtin/commit.c:357
-#: builtin/reset.c:334 builtin/rm.c:278 builtin/stash.c:1508
-msgid "--pathspec-file-nul requires --pathspec-from-file"
+#, c-format
+msgid "'%s' and pathspec arguments cannot be used together"
 msgstr ""
 
-#: builtin/add.c:518
 #, c-format
 msgid "Nothing specified, nothing added.\n"
-msgstr "Ничего не указано, ничего не добавлено.\n"
+msgstr "Ничего не проиндексировано.\n"
 
-#: builtin/add.c:520
 msgid ""
 "Maybe you wanted to say 'git add .'?\n"
 "Turn this message off by running\n"
 "\"git config advice.addEmptyPathspec false\""
 msgstr ""
+"Возможно вы хотели сделать «git add .»?\n"
+"Можно отключить это сообщение командой\n"
+"«git config advice.addEmptyPathspec false»"
+
+msgid "index file corrupt"
+msgstr "файл индекса поврежден"
+
+#, c-format
+msgid "bad action '%s' for '%s'"
+msgstr ""
+
+#, c-format
+msgid "invalid value for '%s': '%s'"
+msgstr ""
+
+#, c-format
+msgid "could not read '%s'"
+msgstr "не удалось прочитать «%s»"
 
-#: builtin/am.c:352
 msgid "could not parse author script"
 msgstr "не удалось разобрать сценарий авторства"
 
-#: builtin/am.c:436
+#, c-format
+msgid "could not parse %s"
+msgstr "не удалось разобрать %s"
+
 #, c-format
 msgid "'%s' was deleted by the applypatch-msg hook"
 msgstr "«%s» был удален перехватчиком applypatch-msg"
 
-#: builtin/am.c:478
 #, c-format
 msgid "Malformed input line: '%s'."
 msgstr "Неправильная строка ввода: «%s»."
 
-#: builtin/am.c:516
 #, c-format
 msgid "Failed to copy notes from '%s' to '%s'"
 msgstr "Не удалось скопировать заметку из «%s» в «%s»"
 
-#: builtin/am.c:542
 msgid "fseek failed"
 msgstr "сбой при выполнении fseek"
 
-#: builtin/am.c:730
+#, c-format
+msgid "could not open '%s' for reading"
+msgstr "не удалось открыть «%s» для чтения"
+
+#, c-format
+msgid "could not open '%s' for writing"
+msgstr "не удалось открыть «%s» для записи"
+
 #, c-format
 msgid "could not parse patch '%s'"
 msgstr "не удалось разобрать патч «%s»"
 
-#: builtin/am.c:795
 msgid "Only one StGIT patch series can be applied at once"
 msgstr "Только серия патчей StGIT может быть применена за раз"
 
-#: builtin/am.c:843
 msgid "invalid timestamp"
 msgstr "недопустимая метка даты/времени"
 
-#: builtin/am.c:848 builtin/am.c:860
 msgid "invalid Date line"
 msgstr "недопустимая строка даты"
 
-#: builtin/am.c:855
 msgid "invalid timezone offset"
 msgstr "недопустимое смещение часового пояса"
 
-#: builtin/am.c:948
 msgid "Patch format detection failed."
 msgstr "Сбой определения формата патча."
 
-#: builtin/am.c:953 builtin/clone.c:410
 #, c-format
 msgid "failed to create directory '%s'"
 msgstr "не удалось создать каталог «%s»"
 
-#: builtin/am.c:958
 msgid "Failed to split patches."
 msgstr "Не удалось разделить патчи на части."
 
-#: builtin/am.c:1089
 #, c-format
 msgid "When you have resolved this problem, run \"%s --continue\"."
 msgstr "Когда вы устраните эту проблему, запустите «%s --continue»."
 
-#: builtin/am.c:1090
 #, c-format
 msgid "If you prefer to skip this patch, run \"%s --skip\" instead."
 msgstr "Если вы хотите пропустить этот патч, то запустите «%s --skip»."
 
-#: builtin/am.c:1091
 #, c-format
-msgid "To restore the original branch and stop patching, run \"%s --abort\"."
-msgstr "Чтобы вернуться на предыдущую ветку и остановить применение изменений, запустите «%s --abort»."
+msgid "To record the empty patch as an empty commit, run \"%s --allow-empty\"."
+msgstr ""
 
-#: builtin/am.c:1174
-msgid ""
-"Patch sent with format=flowed; space at the end of lines might be lost."
+#, c-format
+msgid "To restore the original branch and stop patching, run \"%s --abort\"."
 msgstr ""
+"Чтобы вернуться на предыдущую ветку и остановить применение изменений, "
+"запустите «%s --abort»."
 
-#: builtin/am.c:1202
-msgid "Patch is empty."
-msgstr "Патч пустой."
+msgid "Patch sent with format=flowed; space at the end of lines might be lost."
+msgstr ""
 
-#: builtin/am.c:1267
 #, c-format
 msgid "missing author line in commit %s"
 msgstr ""
 
-#: builtin/am.c:1270
 #, c-format
 msgid "invalid ident line: %.*s"
 msgstr "неправильная строка идентификации: %.*s"
 
-#: builtin/am.c:1489
+#, c-format
+msgid "unable to parse commit %s"
+msgstr "не удалось разобрать коммит %s"
+
 msgid "Repository lacks necessary blobs to fall back on 3-way merge."
-msgstr "В репозитории отсутствуют двоичные объекты, необходимые для отката к трехходовому слиянию."
+msgstr ""
+"В репозитории отсутствуют двоичные объекты, необходимые для отката к "
+"трехходовому слиянию."
 
-#: builtin/am.c:1491
 msgid "Using index info to reconstruct a base tree..."
-msgstr "Использую индекс для реконструкции базового дерева…"
+msgstr "Использую индекс для реконструкции базового дерева..."
 
-#: builtin/am.c:1510
 msgid ""
 "Did you hand edit your patch?\n"
 "It does not apply to blobs recorded in its index."
-msgstr "Вы вручную изменяли патч?\nОн не накладывается без ошибок на двоичные объекты, записанные в его заголовке."
+msgstr ""
+"Вы вручную изменяли патч?\n"
+"Он не накладывается без ошибок на двоичные объекты, записанные в его "
+"заголовке."
 
-#: builtin/am.c:1516
 msgid "Falling back to patching base and 3-way merge..."
-msgstr "Откат к применению изменений к базовому коммиту с помощью трехходового слияния…"
+msgstr ""
+"Откат к применению изменений к базовому коммиту с помощью трехходового "
+"слияния..."
 
-#: builtin/am.c:1542
 msgid "Failed to merge in the changes."
 msgstr "Не удалось слить изменения."
 
-#: builtin/am.c:1574
+msgid "git write-tree failed to write a tree"
+msgstr "git write-tree не удалось записать дерево"
+
 msgid "applying to an empty history"
 msgstr "применение к пустой истории"
 
-#: builtin/am.c:1626 builtin/am.c:1630
+msgid "failed to write commit object"
+msgstr "сбой записи объекта коммита"
+
 #, c-format
 msgid "cannot resume: %s does not exist."
 msgstr "нельзя продолжнить: %s не существует."
 
-#: builtin/am.c:1648
 msgid "Commit Body is:"
 msgstr "Тело коммита:"
 
 #. TRANSLATORS: Make sure to include [y], [n], [e], [v] and [a]
 #. in your translation. The program will only accept English
 #. input at this point.
-#: builtin/am.c:1658
+#.
 #, c-format
 msgid "Apply? [y]es/[n]o/[e]dit/[v]iew patch/[a]ccept all: "
-msgstr "Применить? [y] - да/[n] - нет/[e] - редактировать/[v] - просмотреть патч/[a] - применить всё: "
+msgstr ""
+"Применить? [y] - да/[n] - нет/[e] - редактировать/[v] - просмотреть патч/[a] "
+"- применить всё: "
 
-#: builtin/am.c:1704 builtin/commit.c:395
 msgid "unable to write index file"
 msgstr "не удалось записать индекс"
 
-#: builtin/am.c:1708
 #, c-format
 msgid "Dirty index: cannot apply patches (dirty: %s)"
 msgstr "Индекс изменён: нельзя применять патчи (изменено: %s)"
 
-#: builtin/am.c:1748 builtin/am.c:1816
+#, c-format
+msgid "Skipping: %.*s"
+msgstr ""
+
+#, c-format
+msgid "Creating an empty commit: %.*s"
+msgstr ""
+
+msgid "Patch is empty."
+msgstr "Патч пустой."
+
 #, c-format
 msgid "Applying: %.*s"
 msgstr "Применение: %.*s"
 
-#: builtin/am.c:1765
 msgid "No changes -- Patch already applied."
 msgstr "Нет изменений — Патч уже применен."
 
-#: builtin/am.c:1771
 #, c-format
 msgid "Patch failed at %s %.*s"
 msgstr "Ошибка применения изменений на %s %.*s"
 
-#: builtin/am.c:1775
 msgid "Use 'git am --show-current-patch=diff' to see the failed patch"
 msgstr ""
 
-#: builtin/am.c:1819
+msgid "No changes - recorded it as an empty commit."
+msgstr ""
+
 msgid ""
 "No changes - did you forget to use 'git add'?\n"
 "If there is nothing left to stage, chances are that something else\n"
 "already introduced the same changes; you might want to skip this patch."
-msgstr "Нет изменений — возможно, вы забыли вызвать «git add»?\nЕсли ничего не осталось для индексации, то, скорее всего, что-то другое уже сделало те же изменения; возможно, вам следует пропустить этот патч."
+msgstr ""
+"Нет изменений — возможно, вы забыли вызвать «git add»?\n"
+"Если ничего не осталось для индексации, то, скорее всего, что-то другое уже "
+"сделало те же изменения; возможно, вам следует пропустить этот патч."
 
-#: builtin/am.c:1826
 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 "У вас есть не слитые пути в индексе.\nВы должны выполнить «git add» для каждого файла с разрешенными конфликтами, чтобы пометить их таковыми.\nВы можете запустить «git rm» с именем файла, чтобы пометить его как «удалено ими»."
+msgstr ""
+"У вас есть не слитые пути в индексе.\n"
+"Вы должны выполнить «git add» для каждого файла с разрешенными конфликтами, "
+"чтобы пометить их таковыми.\n"
+"Вы можете запустить «git rm» с именем файла, чтобы пометить его как «удалено "
+"ими»."
+
+msgid "unable to write new index file"
+msgstr "не удалось записать новый файл индекса"
 
-#: builtin/am.c:1933 builtin/am.c:1937 builtin/am.c:1949 builtin/reset.c:347
-#: builtin/reset.c:355
 #, c-format
 msgid "Could not parse object '%s'."
 msgstr "Не удалось разобрать объект «%s»."
 
-#: builtin/am.c:1985
 msgid "failed to clean index"
 msgstr "не удалось очистить индекс"
 
-#: builtin/am.c:2029
 msgid ""
 "You seem to have moved HEAD since the last 'am' failure.\n"
 "Not rewinding to ORIG_HEAD"
-msgstr "Похоже, что вы переместили HEAD с момента последней ошибки выполнения «am».\nПеремотка на ORIG_HEAD не выполняется"
-
-#: builtin/am.c:2136
-#, c-format
-msgid "Invalid value for --patch-format: %s"
-msgstr "Неправильное значение для --patch-format: %s"
+msgstr ""
+"Похоже, что вы переместили HEAD с момента последней ошибки выполнения «am».\n"
+"Перемотка на ORIG_HEAD не выполняется"
 
-#: builtin/am.c:2178
 #, c-format
-msgid "Invalid value for --show-current-patch: %s"
-msgstr ""
+msgid "failed to read '%s'"
+msgstr "не удалось прочитать «%s»"
 
-#: builtin/am.c:2182
 #, c-format
-msgid "--show-current-patch=%s is incompatible with --show-current-patch=%s"
+msgid "options '%s=%s' and '%s=%s' cannot be used together"
 msgstr ""
 
-#: builtin/am.c:2213
 msgid "git am [<options>] [(<mbox> | <Maildir>)...]"
-msgstr "git am [<опции>] [(<mbox> | <Maildir>)…]"
+msgstr "git am [<опции>] [(<mbox> | <Maildir>)...]"
 
-#: builtin/am.c:2214
 msgid "git am [<options>] (--continue | --skip | --abort)"
 msgstr "git am [<опции>] (--continue | --skip | --abort)"
 
-#: builtin/am.c:2220
 msgid "run interactively"
 msgstr "запустить в интерактивном режиме"
 
-#: builtin/am.c:2222
 msgid "historical option -- no-op"
 msgstr "историческая опция — ничего не делает"
 
-#: builtin/am.c:2224
 msgid "allow fall back on 3way merging if needed"
 msgstr "разрешить откатиться к трехходовому слиянию, если нужно"
 
-#: builtin/am.c:2225 builtin/init-db.c:560 builtin/prune-packed.c:16
-#: builtin/repack.c:335 builtin/stash.c:815
 msgid "be quiet"
 msgstr "тихий режим"
 
-#: builtin/am.c:2227
 msgid "add a Signed-off-by trailer to the commit message"
 msgstr ""
 
-#: builtin/am.c:2230
 msgid "recode into utf8 (default)"
 msgstr "перекодировать в utf8 (по умолчанию)"
 
-#: builtin/am.c:2232
 msgid "pass -k flag to git-mailinfo"
 msgstr "передать флаг -k в git-mailinfo"
 
-#: builtin/am.c:2234
 msgid "pass -b flag to git-mailinfo"
 msgstr "передать флаг -b в git-mailinfo"
 
-#: builtin/am.c:2236
 msgid "pass -m flag to git-mailinfo"
 msgstr "передать флаг -m в git-mailinfo"
 
-#: builtin/am.c:2238
 msgid "pass --keep-cr flag to git-mailsplit for mbox format"
 msgstr "передать флаг --keep-cr в git-mailsplit для формата mbox"
 
-#: builtin/am.c:2241
 msgid "do not pass --keep-cr flag to git-mailsplit independent of am.keepcr"
-msgstr "не передавать --keep-cr флаг в git-mailsplit вне зависимости от am.keepcr"
+msgstr ""
+"не передавать --keep-cr флаг в git-mailsplit вне зависимости от am.keepcr"
 
-#: builtin/am.c:2244
 msgid "strip everything before a scissors line"
 msgstr "обрезать все до строки обрезки"
 
-#: 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
+msgid "pass it through git-mailinfo"
+msgstr ""
+
 msgid "pass it through git-apply"
 msgstr "передать его в 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:903 builtin/merge.c:260
-#: builtin/pull.c:141 builtin/pull.c:200 builtin/pull.c:217
-#: builtin/rebase.c:1341 builtin/repack.c:346 builtin/repack.c:350
-#: builtin/repack.c:352 builtin/show-branch.c:650 builtin/show-ref.c:172
-#: builtin/tag.c:404 parse-options.h:154 parse-options.h:175
-#: parse-options.h:316
 msgid "n"
 msgstr "n"
 
-#: builtin/am.c:2269 builtin/branch.c:661 builtin/bugreport.c:136
-#: builtin/for-each-ref.c:38 builtin/replace.c:556 builtin/tag.c:438
-#: builtin/verify-tag.c:38
 msgid "format"
 msgstr "формат"
 
-#: builtin/am.c:2270
 msgid "format the patch(es) are in"
 msgstr "формат, в котором находятся патчи"
 
-#: builtin/am.c:2276
 msgid "override error message when patch failure occurs"
 msgstr "переопределить сообщение об ошибке, если не удалось наложить изменения"
 
-#: builtin/am.c:2278
 msgid "continue applying patches after resolving a conflict"
 msgstr "продолжить применение изменений после разрешения конфиликта"
 
-#: builtin/am.c:2281
 msgid "synonyms for --continue"
 msgstr "синоним для --continue"
 
-#: builtin/am.c:2284
 msgid "skip the current patch"
 msgstr "пропустить текущий патч"
 
-#: builtin/am.c:2287
-msgid "restore the original branch and abort the patching operation."
-msgstr "восстановить оригинальную ветку и отменить операцию применения изменений."
+msgid "restore the original branch and abort the patching operation"
+msgstr ""
 
-#: builtin/am.c:2290
-msgid "abort the patching operation but keep HEAD where it is."
+msgid "abort the patching operation but keep HEAD where it is"
 msgstr ""
 
-#: builtin/am.c:2294
 msgid "show the patch being applied"
 msgstr ""
 
-#: builtin/am.c:2299
+msgid "record the empty patch as an empty commit"
+msgstr ""
+
 msgid "lie about committer date"
 msgstr "соврать о дате коммитера"
 
-#: builtin/am.c:2301
 msgid "use current timestamp for author date"
 msgstr "использовать текущее время как время авторства"
 
-#: builtin/am.c:2303 builtin/commit-tree.c:120 builtin/commit.c:1515
-#: builtin/merge.c:297 builtin/pull.c:175 builtin/rebase.c:536
-#: builtin/rebase.c:1394 builtin/revert.c:117 builtin/tag.c:419
 msgid "key-id"
 msgstr "key-id"
 
-#: builtin/am.c:2304 builtin/rebase.c:537 builtin/rebase.c:1395
 msgid "GPG-sign commits"
 msgstr "подписать коммиты с помощью GPG"
 
-#: builtin/am.c:2307
+msgid "how to handle empty patches"
+msgstr ""
+
 msgid "(internal use for git-rebase)"
 msgstr "(внутреннее использование для git-rebase)"
 
-#: builtin/am.c:2325
 msgid ""
 "The -b/--binary option has been a no-op for long time, and\n"
 "it will be removed. Please do not use it anymore."
-msgstr "Опция -b/--binary уже долгое время ничего не делает и будет удалена с следующих версиях Git. Пожалуйста, не используйте ее."
+msgstr ""
+"Опция -b/--binary уже долгое время ничего не делает и будет удалена с "
+"следующих версиях Git. Пожалуйста, не используйте ее."
 
-#: builtin/am.c:2332
 msgid "failed to read the index"
 msgstr "сбой чтения индекса"
 
-#: builtin/am.c:2347
 #, c-format
 msgid "previous rebase directory %s still exists but mbox given."
 msgstr "предыдущий каталог перемещения %s еще существует, но передан mbox."
 
-#: builtin/am.c:2371
 #, c-format
 msgid ""
 "Stray %s directory found.\n"
 "Use \"git am --abort\" to remove it."
-msgstr "Найден забытый каталог %s.\nИспользуйте «git am --abort», чтобы удалить его."
+msgstr ""
+"Найден забытый каталог %s.\n"
+"Используйте «git am --abort», чтобы удалить его."
 
-#: builtin/am.c:2377
 msgid "Resolve operation not in progress, we are not resuming."
-msgstr "Операция разрешения конфликтов не в процессе выполнения, не продолжаем."
+msgstr ""
+"Операция разрешения конфликтов не в процессе выполнения, не продолжаем."
 
-#: builtin/am.c:2387
 msgid "interactive mode requires patches on the command line"
 msgstr ""
 
-#: builtin/apply.c:8
 msgid "git apply [<options>] [<patch>...]"
-msgstr "git apply [<опции>] [<патч>…]"
+msgstr "git apply [<опции>] [<патч>...]"
 
-#: builtin/archive.c:17
-#, c-format
-msgid "could not create archive file '%s'"
-msgstr "не удалось создать файл архива «%s»"
-
-#: builtin/archive.c:20
 msgid "could not redirect output"
 msgstr "не удалось перенаправить вывод"
 
-#: builtin/archive.c:37
 msgid "git archive: Remote with no URL"
 msgstr "git archive: внешний репозиторий без URL"
 
-#: builtin/archive.c:61
 msgid "git archive: expected ACK/NAK, got a flush packet"
 msgstr "git archive: ожидается ACK/NAK, получен пакет сброса буфера"
 
-#: builtin/archive.c:64
 #, c-format
 msgid "git archive: NACK %s"
 msgstr "git archive: NACK %s"
 
-#: builtin/archive.c:65
 msgid "git archive: protocol error"
 msgstr "git archive: ошибка протокола"
 
-#: builtin/archive.c:69
 msgid "git archive: expected a flush"
 msgstr "git archive: ожидался сброс буфера"
 
-#: builtin/bisect--helper.c:23
 msgid "git bisect--helper --bisect-reset [<commit>]"
 msgstr ""
 
-#: builtin/bisect--helper.c:24
-msgid ""
-"git bisect--helper --bisect-write [--no-log] <state> <revision> <good_term> "
-"<bad_term>"
-msgstr ""
-
-#: builtin/bisect--helper.c:25
 msgid ""
-"git bisect--helper --bisect-check-and-set-terms <command> <good_term> "
-"<bad_term>"
-msgstr ""
-
-#: builtin/bisect--helper.c:26
-msgid "git bisect--helper --bisect-next-check <good_term> <bad_term> [<term>]"
+"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-{new,bad}=<термин> --term-{old,"
+"good}=<термин>] [--no-checkout] [--first-parent] [<плохая-редация> [<хорошая-"
+"редация>...]] [--] [<пути>...]"
 
-#: builtin/bisect--helper.c:27
-msgid ""
-"git bisect--helper --bisect-terms [--term-good | --term-old | --term-bad | "
-"--term-new]"
+msgid "git bisect--helper --bisect-state (bad|new) [<rev>]"
 msgstr ""
 
-#: builtin/bisect--helper.c:28
-msgid ""
-"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-{new,bad}=<термин> --term-{old,good}=<термин>] [--no-checkout] [--first-parent] [<плохая-редация> [<хорошая-редация>…]] [--] [<пути>…]"
-
-#: builtin/bisect--helper.c:30
-msgid "git bisect--helper --bisect-next"
+msgid "git bisect--helper --bisect-state (good|old) [<rev>...]"
 msgstr ""
 
-#: builtin/bisect--helper.c:31
-msgid "git bisect--helper --bisect-auto-next"
+msgid "git bisect--helper --bisect-replay <filename>"
 msgstr ""
 
-#: builtin/bisect--helper.c:32
-msgid "git bisect--helper --bisect-state (bad|new) [<rev>]"
+msgid "git bisect--helper --bisect-skip [(<rev>|<range>)...]"
 msgstr ""
 
-#: builtin/bisect--helper.c:33
-msgid "git bisect--helper --bisect-state (good|old) [<rev>...]"
+msgid "git bisect--helper --bisect-run <cmd>..."
 msgstr ""
 
-#: builtin/bisect--helper.c:108
 #, c-format
 msgid "cannot open file '%s' in mode '%s'"
 msgstr ""
 
-#: builtin/bisect--helper.c:115
 #, c-format
 msgid "could not write to file '%s'"
 msgstr ""
 
-#: builtin/bisect--helper.c:154
+#, c-format
+msgid "cannot open file '%s' for reading"
+msgstr ""
+
 #, c-format
 msgid "'%s' is not a valid term"
 msgstr "«%s» не является допустимым определением"
 
-#: builtin/bisect--helper.c:158
 #, c-format
 msgid "can't use the builtin command '%s' as a term"
 msgstr "нельзя использовать встроенную команду «%s» как определение"
 
-#: builtin/bisect--helper.c:168
 #, c-format
 msgid "can't change the meaning of the term '%s'"
 msgstr "нельзя изменить значение определения «%s»"
 
-#: builtin/bisect--helper.c:178
 msgid "please use two different terms"
 msgstr "используйте два разных определения"
 
-#: builtin/bisect--helper.c:194
 #, c-format
 msgid "We are not bisecting.\n"
 msgstr ""
 
-#: builtin/bisect--helper.c:202
 #, c-format
 msgid "'%s' is not a valid commit"
 msgstr ""
 
-#: builtin/bisect--helper.c:211
 #, c-format
 msgid ""
 "could not check out original HEAD '%s'. Try 'git bisect reset <commit>'."
 msgstr ""
 
-#: builtin/bisect--helper.c:255
 #, c-format
 msgid "Bad bisect_write argument: %s"
 msgstr ""
 
-#: builtin/bisect--helper.c:260
 #, c-format
 msgid "couldn't get the oid of the rev '%s'"
 msgstr ""
 
-#: builtin/bisect--helper.c:272
 #, c-format
 msgid "couldn't open the file '%s'"
 msgstr ""
 
-#: builtin/bisect--helper.c:298
 #, c-format
 msgid "Invalid command: you're currently in a %s/%s bisect"
 msgstr ""
 
-#: builtin/bisect--helper.c:325
 #, 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:329
 #, c-format
 msgid ""
 "You need to start by \"git bisect start\".\n"
@@ -9787,7 +2341,6 @@ msgid ""
 "You can use \"git bisect %s\" and \"git bisect %s\" for that."
 msgstr ""
 
-#: builtin/bisect--helper.c:349
 #, c-format
 msgid "bisecting only with a %s commit"
 msgstr ""
@@ -9795,317 +2348,309 @@ msgstr ""
 #. 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:357
+#.
 msgid "Are you sure [Y/n]? "
 msgstr "Вы уверены [Y - да/n - нет]? "
 
-#: builtin/bisect--helper.c:418
+msgid "status: waiting for both good and bad commits\n"
+msgstr ""
+
+#, c-format
+msgid "status: waiting for bad commit, %d good commit known\n"
+msgid_plural "status: waiting for bad commit, %d good commits known\n"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+msgstr[3] ""
+
+msgid "status: waiting for good commit(s), bad commit known\n"
+msgstr ""
+
 msgid "no terms defined"
 msgstr "определения не заданы"
 
-#: builtin/bisect--helper.c:421
 #, 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:431
 #, 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:498
 msgid "revision walk setup failed\n"
 msgstr ""
 
-#: builtin/bisect--helper.c:520
 #, c-format
 msgid "could not open '%s' for appending"
 msgstr ""
 
-#: builtin/bisect--helper.c:639 builtin/bisect--helper.c:652
 msgid "'' is not a valid term"
 msgstr ""
 
-#: builtin/bisect--helper.c:662
 #, c-format
 msgid "unrecognized option: '%s'"
 msgstr ""
 
-#: builtin/bisect--helper.c:666
 #, c-format
 msgid "'%s' does not appear to be a valid revision"
-msgstr ""
+msgstr "«%s» не кажется действительной версией"
 
-#: builtin/bisect--helper.c:697
 msgid "bad HEAD - I need a HEAD"
 msgstr ""
 
-#: builtin/bisect--helper.c:712
 #, c-format
 msgid "checking out '%s' failed. Try 'git bisect start <valid-branch>'."
 msgstr ""
 
-#: builtin/bisect--helper.c:733
 msgid "won't bisect on cg-seek'ed tree"
 msgstr "нельзя выполнить двоичный поиск на дереве после cg-seek"
 
-#: builtin/bisect--helper.c:736
 msgid "bad HEAD - strange symbolic ref"
 msgstr ""
 
-#: builtin/bisect--helper.c:756
 #, c-format
 msgid "invalid ref: '%s'"
 msgstr ""
 
-#: builtin/bisect--helper.c:814
 msgid "You need to start by \"git bisect start\"\n"
 msgstr ""
 
 #. 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:825
+#.
 msgid "Do you want me to do it for you [Y/n]? "
 msgstr "Вы уверены, что хотите, чтобы я сделал это [Y] - да/[n] - нет? "
 
-#: builtin/bisect--helper.c:843
 msgid "Please call `--bisect-state` with at least one argument"
 msgstr ""
 
-#: builtin/bisect--helper.c:856
 #, c-format
 msgid "'git bisect %s' can take only one argument."
 msgstr ""
 
-#: builtin/bisect--helper.c:868 builtin/bisect--helper.c:879
 #, c-format
 msgid "Bad rev input: %s"
 msgstr ""
 
-#: builtin/bisect--helper.c:924
-msgid "reset the bisection state"
+#, c-format
+msgid "Bad rev input (not a commit): %s"
+msgstr ""
+
+msgid "We are not bisecting."
+msgstr "Вы сейчас не в процессе бинарного поиска."
+
+#, c-format
+msgid "'%s'?? what are you talking about?"
+msgstr ""
+
+#, c-format
+msgid "cannot read file '%s' for replaying"
+msgstr ""
+
+#, c-format
+msgid "running %s\n"
+msgstr ""
+
+msgid "bisect run failed: no command provided."
+msgstr "сбой при выполнении двоичного поиска: не передана команда."
+
+#, c-format
+msgid "unable to verify '%s' on good revision"
+msgstr ""
+
+#, c-format
+msgid "bogus exit code %d for good revision"
+msgstr ""
+
+#, c-format
+msgid "bisect run failed: exit code %d from '%s' is < 0 or >= 128"
+msgstr ""
+
+#, c-format
+msgid "cannot open file '%s' for writing"
+msgstr ""
+
+msgid "bisect run cannot continue any more"
+msgstr "bisect run больше не может продолжать"
+
+#, c-format
+msgid "bisect run success"
+msgstr "bisect run выполнен успешно"
+
+#, c-format
+msgid "bisect found first bad commit"
 msgstr ""
 
-#: builtin/bisect--helper.c:926
-msgid "write out the bisection state in BISECT_LOG"
+#, c-format
+msgid ""
+"bisect run failed: 'git bisect--helper --bisect-state %s' exited with error "
+"code %d"
 msgstr ""
 
-#: builtin/bisect--helper.c:928
-msgid "check and set terms in a bisection state"
+msgid "reset the bisection state"
 msgstr ""
 
-#: builtin/bisect--helper.c:930
 msgid "check whether bad or good terms exist"
 msgstr ""
 
-#: builtin/bisect--helper.c:932
 msgid "print out the bisect terms"
 msgstr ""
 
-#: builtin/bisect--helper.c:934
 msgid "start the bisect session"
 msgstr ""
 
-#: builtin/bisect--helper.c:936
 msgid "find the next bisection commit"
 msgstr ""
 
-#: builtin/bisect--helper.c:938
-msgid ""
-"verify the next bisection state then checkout the next bisection commit"
+msgid "mark the state of ref (or refs)"
 msgstr ""
 
-#: builtin/bisect--helper.c:940
-msgid "mark the state of ref (or refs)"
+msgid "list the bisection steps so far"
 msgstr ""
 
-#: builtin/bisect--helper.c:942
-msgid "no log for BISECT_WRITE"
+msgid "replay the bisection process from the given file"
 msgstr ""
 
-#: builtin/bisect--helper.c:957
-msgid "--bisect-reset requires either no argument or a commit"
+msgid "skip some commits for checkout"
 msgstr ""
 
-#: builtin/bisect--helper.c:961
-msgid "--bisect-write requires either 4 or 5 arguments"
+msgid "visualize the bisection"
 msgstr ""
 
-#: builtin/bisect--helper.c:967
-msgid "--check-and-set-terms requires 3 arguments"
+msgid "use <cmd>... to automatically bisect"
 msgstr ""
 
-#: builtin/bisect--helper.c:973
-msgid "--bisect-next-check requires 2 or 3 arguments"
+msgid "no log for BISECT_WRITE"
+msgstr ""
+
+msgid "--bisect-reset requires either no argument or a commit"
 msgstr ""
 
-#: builtin/bisect--helper.c:979
 msgid "--bisect-terms requires 0 or 1 argument"
 msgstr ""
 
-#: builtin/bisect--helper.c:988
 msgid "--bisect-next requires 0 arguments"
 msgstr ""
 
-#: builtin/bisect--helper.c:994
-msgid "--bisect-auto-next requires 0 arguments"
+msgid "--bisect-log requires 0 arguments"
+msgstr ""
+
+msgid "no logfile given"
 msgstr ""
 
-#: builtin/blame.c:32
 msgid "git blame [<options>] [<rev-opts>] [<rev>] [--] <file>"
 msgstr "git blame [<опции>] [<опции-редакции>] [<редакция>] [--] <файл>"
 
-#: builtin/blame.c:37
 msgid "<rev-opts> are documented in git-rev-list(1)"
 msgstr "<опции-rev-list> документированы в git-rev-list(1)"
 
-#: builtin/blame.c:410
 #, c-format
 msgid "expecting a color: %s"
 msgstr "ожидается цвет: %s"
 
-#: builtin/blame.c:417
 msgid "must end with a color"
 msgstr "должно заканчиваться на цвет"
 
-#: builtin/blame.c:730
 #, c-format
-msgid "invalid color '%s' in color.blame.repeatedLines"
+msgid "cannot find revision %s to ignore"
 msgstr ""
 
-#: builtin/blame.c:748
-msgid "invalid value for blame.coloring"
+msgid "show blame entries as we find them, incrementally"
 msgstr ""
 
-#: builtin/blame.c:847
-#, c-format
-msgid "cannot find revision %s to ignore"
+msgid "do not show object names of boundary commits (Default: off)"
 msgstr ""
 
-#: builtin/blame.c:869
-msgid "Show blame entries as we find them, incrementally"
-msgstr "Показать записи авторства постепенно, в процессе нахождения"
-
-#: builtin/blame.c:870
-msgid "Do not show object names of boundary commits (Default: off)"
+msgid "do not treat root commits as boundaries (Default: off)"
 msgstr ""
 
-#: builtin/blame.c:871
-msgid "Do not treat root commits as boundaries (Default: off)"
-msgstr "Не воспринимать корневые коммиты как граничные (По умолчанию: отключено)"
-
-#: builtin/blame.c:872
-msgid "Show work cost statistics"
-msgstr "Показать статистику расходов на выполнение запроса"
+msgid "show work cost statistics"
+msgstr ""
 
-#: builtin/blame.c:873
-msgid "Force progress reporting"
-msgstr "Принудительно выводить прогресс выполнения"
+msgid "force progress reporting"
+msgstr "принудительно выводить прогресс"
 
-#: builtin/blame.c:874
-msgid "Show output score for blame entries"
-msgstr "Показать оценку для записей авторства"
+msgid "show output score for blame entries"
+msgstr ""
 
-#: builtin/blame.c:875
-msgid "Show original filename (Default: auto)"
-msgstr "Показать оригинальное имя файла (По умолчанию: автоматически)"
+msgid "show original filename (Default: auto)"
+msgstr ""
 
-#: builtin/blame.c:876
-msgid "Show original linenumber (Default: off)"
-msgstr "Показать оригинальные номера строк (По умолчанию: отключено)"
+msgid "show original linenumber (Default: off)"
+msgstr ""
 
-#: builtin/blame.c:877
-msgid "Show in a format designed for machine consumption"
-msgstr "Показать в формате для программного разбора"
+msgid "show in a format designed for machine consumption"
+msgstr ""
 
-#: builtin/blame.c:878
-msgid "Show porcelain format with per-line commit information"
-msgstr "Показать в машиночитаемом формате, с построчной информацией о коммите"
+msgid "show porcelain format with per-line commit information"
+msgstr ""
 
-#: builtin/blame.c:879
-msgid "Use the same output mode as git-annotate (Default: off)"
-msgstr "Использовать такой же формат вывода, как и git-annotate (По умолчанию: отключено)"
+msgid "use the same output mode as git-annotate (Default: off)"
+msgstr ""
 
-#: builtin/blame.c:880
-msgid "Show raw timestamp (Default: off)"
-msgstr "Показать необработанные временные метки (По умолчанию: отключено)"
+msgid "show raw timestamp (Default: off)"
+msgstr ""
 
-#: builtin/blame.c:881
-msgid "Show long commit SHA1 (Default: off)"
-msgstr "Показать длинный SHA1 идентификатор коммита (По умолчанию: отключено)"
+msgid "show long commit SHA1 (Default: off)"
+msgstr ""
 
-#: builtin/blame.c:882
-msgid "Suppress author name and timestamp (Default: off)"
-msgstr "Не показывать имя автора и временные метки (По умолчанию: отключено)"
+msgid "suppress author name and timestamp (Default: off)"
+msgstr ""
 
-#: builtin/blame.c:883
-msgid "Show author email instead of name (Default: off)"
-msgstr "Показать почту автора вместо имени (По умолчанию: отключено)"
+msgid "show author email instead of name (Default: off)"
+msgstr ""
 
-#: builtin/blame.c:884
-msgid "Ignore whitespace differences"
-msgstr "Игнорировать различия в пробелах"
+msgid "ignore whitespace differences"
+msgstr ""
 
-#: builtin/blame.c:885 builtin/log.c:1813
 msgid "rev"
 msgstr ""
 
-#: builtin/blame.c:885
-msgid "Ignore <rev> when blaming"
+msgid "ignore <rev> when blaming"
 msgstr ""
 
-#: builtin/blame.c:886
-msgid "Ignore revisions from <file>"
+msgid "ignore revisions from <file>"
 msgstr ""
 
-#: builtin/blame.c:887
 msgid "color redundant metadata from previous line differently"
 msgstr ""
 
-#: builtin/blame.c:888
 msgid "color lines by age"
 msgstr ""
 
-#: builtin/blame.c:889
-msgid "Spend extra cycles to find better match"
-msgstr "Потратить больше времени, для нахождения лучших совпадений"
+msgid "spend extra cycles to find better match"
+msgstr ""
 
-#: builtin/blame.c:890
-msgid "Use revisions from <file> instead of calling git-rev-list"
-msgstr "Использовать редакции из <файла> вместо вызова git-rev-list"
+msgid "use revisions from <file> instead of calling git-rev-list"
+msgstr ""
 
-#: builtin/blame.c:891
-msgid "Use <file>'s contents as the final image"
-msgstr "Использовать содержимое <файла> как финальный снимок"
+msgid "use <file>'s contents as the final image"
+msgstr ""
 
-#: builtin/blame.c:892 builtin/blame.c:893
 msgid "score"
 msgstr "мин-длина"
 
-#: builtin/blame.c:892
-msgid "Find line copies within and across files"
-msgstr "Найти копирование строк в пределах и между файлами"
+msgid "find line copies within and across files"
+msgstr ""
 
-#: builtin/blame.c:893
-msgid "Find line movements within and across files"
-msgstr "Найти перемещения строк в пределах и между файлами"
+msgid "find line movements within and across files"
+msgstr ""
 
-#: builtin/blame.c:894
 msgid "range"
 msgstr ""
 
-#: builtin/blame.c:895
-msgid "Process only line range <start>,<end> or function :<funcname>"
+msgid "process only line range <start>,<end> or function :<funcname>"
 msgstr ""
 
-#: builtin/blame.c:947
 msgid "--progress can't be used with --incremental or porcelain formats"
-msgstr "--progress нельзя использовать одновременно с --incremental или машиночитаемым (porcelain) форматом"
+msgstr ""
+"--progress нельзя использовать одновременно с --incremental или "
+"машиночитаемым (porcelain) форматом"
 
 #. TRANSLATORS: This string is used to tell us the
 #. maximum display width for a relative timestamp in
@@ -10114,11 +2659,10 @@ msgstr "--progress нельзя использовать одновременн�
 #. among various forms of relative timestamps, but
 #. your language may need more or fewer display
 #. columns.
-#: builtin/blame.c:998
+#.
 msgid "4 years, 11 months ago"
 msgstr "4 года и 11 месяцев назад"
 
-#: builtin/blame.c:1114
 #, c-format
 msgid "file %s has only %lu line"
 msgid_plural "file %s has only %lu lines"
@@ -10127,426 +2671,355 @@ msgstr[1] "файл %s содержит только %lu строки"
 msgstr[2] "файл %s содержит только %lu строк"
 msgstr[3] "файл %s содержит только %lu строки"
 
-#: builtin/blame.c:1159
 msgid "Blaming lines"
 msgstr "Просмотр авторов строк"
 
-#: builtin/branch.c:29
 msgid "git branch [<options>] [-r | -a] [--merged] [--no-merged]"
 msgstr ""
 
-#: builtin/branch.c:30
-msgid "git branch [<options>] [-l] [-f] <branch-name> [<start-point>]"
-msgstr "git branch [<опции>] [-l] [-f] <имя-ветки> [<точка-начала>]"
+msgid ""
+"git branch [<options>] [-f] [--recurse-submodules] <branch-name> [<start-"
+"point>]"
+msgstr ""
+
+msgid "git branch [<options>] [-l] [<pattern>...]"
+msgstr ""
 
-#: builtin/branch.c:31
 msgid "git branch [<options>] [-r] (-d | -D) <branch-name>..."
-msgstr "git branch [<опции>] [-r] (-d | -D) <имя-ветки>…"
+msgstr "git branch [<options>] [-r] (-d | -D) <branch-name>..."
 
-#: builtin/branch.c:32
 msgid "git branch [<options>] (-m | -M) [<old-branch>] <new-branch>"
 msgstr "git branch [<опции>] (-m | -M) [<старая-ветка>] <новая-ветка>"
 
-#: builtin/branch.c:33
 msgid "git branch [<options>] (-c | -C) [<old-branch>] <new-branch>"
 msgstr "git branch [<опции>] (-c | -C) [<старая-ветка>] <новая-ветка>"
 
-#: builtin/branch.c:34
 msgid "git branch [<options>] [-r | -a] [--points-at]"
 msgstr "git branch [<опции>] [-r | -a] [--points-at]"
 
-#: builtin/branch.c:35
 msgid "git branch [<options>] [-r | -a] [--format]"
 msgstr "git branch [<опции>] [-r | -a] [--format]"
 
-#: builtin/branch.c:154
 #, c-format
 msgid ""
 "deleting branch '%s' that has been merged to\n"
 "         '%s', but not yet merged to HEAD."
-msgstr "удаление ветки «%s», которая была слита с\n         «%s», но не слита с HEAD."
+msgstr ""
+"удаление ветки «%s», которая была слита с\n"
+"         «%s», но не слита с HEAD."
 
-#: builtin/branch.c:158
 #, c-format
 msgid ""
 "not deleting branch '%s' that is not yet merged to\n"
 "         '%s', even though it is merged to HEAD."
-msgstr "не удаление ветки «%s», которая еще не слита с\n         «%s», хотя уже слита с HEAD."
+msgstr ""
+"не удаление ветки «%s», которая еще не слита с\n"
+"         «%s», хотя уже слита с HEAD."
 
-#: builtin/branch.c:172
 #, c-format
 msgid "Couldn't look up commit object for '%s'"
 msgstr "Не удалось найти объект коммита для «%s»"
 
-#: builtin/branch.c:176
 #, c-format
 msgid ""
 "The branch '%s' is not fully merged.\n"
 "If you are sure you want to delete it, run 'git branch -D %s'."
-msgstr "Ветка «%s» не слита полностью.\nЕсли вы уверены, что хотите ее удалить, запустите «git branch -D %s»."
+msgstr ""
+"Ветка «%s» не слита полностью.\n"
+"Если вы уверены, что хотите ее удалить, запустите «git branch -D %s»."
 
-#: builtin/branch.c:189
 msgid "Update of config-file failed"
 msgstr "Не удалось обновить файл конфигурации"
 
-#: builtin/branch.c:220
 msgid "cannot use -a with -d"
 msgstr "нельзя использовать одновременно ключи -a и -d"
 
-#: builtin/branch.c:226
 msgid "Couldn't look up commit object for HEAD"
 msgstr "Не удалось найти объект коммита для HEAD"
 
-#: builtin/branch.c:240
 #, c-format
 msgid "Cannot delete branch '%s' checked out at '%s'"
 msgstr "Нельзя удалить ветку «%s» т.к. она активна на «%s»"
 
-#: builtin/branch.c:255
 #, c-format
 msgid "remote-tracking branch '%s' not found."
 msgstr "внешняя отслеживаемая ветка «%s» не найдена."
 
-#: builtin/branch.c:256
 #, c-format
 msgid "branch '%s' not found."
 msgstr "ветка «%s» не найдена."
 
-#: builtin/branch.c:271
-#, c-format
-msgid "Error deleting remote-tracking branch '%s'"
-msgstr "Ошибка удаления внешней отслеживаемой ветки «%s»"
-
-#: builtin/branch.c:272
-#, c-format
-msgid "Error deleting branch '%s'"
-msgstr "Ошибка удаления ветки «%s»"
-
-#: builtin/branch.c:279
 #, c-format
 msgid "Deleted remote-tracking branch %s (was %s).\n"
 msgstr "Внешняя отслеживаемая ветка %s удалена (была %s).\n"
 
-#: builtin/branch.c:280
 #, c-format
 msgid "Deleted branch %s (was %s).\n"
 msgstr "Ветка %s удалена (была %s).\n"
 
-#: builtin/branch.c:429 builtin/tag.c:61
 msgid "unable to parse format string"
 msgstr "не удалось разобрать строку формата"
 
-#: builtin/branch.c:460
 msgid "could not resolve HEAD"
 msgstr "не удалось получить HEAD"
 
-#: builtin/branch.c:466
 #, c-format
 msgid "HEAD (%s) points outside of refs/heads/"
 msgstr "HEAD (%s) указывает за пределы refs/heads/"
 
-#: builtin/branch.c:481
 #, c-format
 msgid "Branch %s is being rebased at %s"
 msgstr "Производится перемещение ветки %s на %s"
 
-#: builtin/branch.c:485
 #, c-format
 msgid "Branch %s is being bisected at %s"
 msgstr "Производится двоичный поиск в ветке %s на %s"
 
-#: builtin/branch.c:502
 msgid "cannot copy the current branch while not on any."
-msgstr "невозможно скопировать текущую ветку, если вы не находитесь ни на одной из веток."
+msgstr ""
+"невозможно скопировать текущую ветку, если вы не находитесь ни на одной из "
+"веток."
 
-#: builtin/branch.c:504
 msgid "cannot rename the current branch while not on any."
-msgstr "невозможно переименовать текущую ветку, если вы не находитесь ни на одной из них."
+msgstr ""
+"невозможно переименовать текущую ветку, если вы не находитесь ни на одной из "
+"них."
 
-#: builtin/branch.c:515
 #, c-format
 msgid "Invalid branch name: '%s'"
 msgstr "Недействительное имя ветки: «%s»"
 
-#: builtin/branch.c:544
 msgid "Branch rename failed"
 msgstr "Сбой переименования ветки"
 
-#: builtin/branch.c:546
 msgid "Branch copy failed"
 msgstr "Сбой копирования ветки"
 
-#: builtin/branch.c:550
 #, c-format
 msgid "Created a copy of a misnamed branch '%s'"
 msgstr "Создана копия неправильно названной ветки «%s»"
 
-#: builtin/branch.c:553
 #, c-format
 msgid "Renamed a misnamed branch '%s' away"
 msgstr "Переименована неправильно названная ветка «%s»"
 
-#: builtin/branch.c:559
 #, c-format
 msgid "Branch renamed to %s, but HEAD is not updated!"
 msgstr "Ветка переименована в %s, но HEAD не обновлен!"
 
-#: builtin/branch.c:568
 msgid "Branch is renamed, but update of config-file failed"
 msgstr "Ветка переименована, но произошел сбой обновления файла конфигурации"
 
-#: builtin/branch.c:570
 msgid "Branch is copied, but update of config-file failed"
 msgstr "Ветка скопирована, но произошел сбой обновления файла конфигурации"
 
-#: builtin/branch.c:586
 #, c-format
 msgid ""
 "Please edit the description for the branch\n"
 "  %s\n"
 "Lines starting with '%c' will be stripped.\n"
-msgstr "Измените описание для ветки:\n  %s\nСтроки, начинающиеся с «%c» будут вырезаны.\n"
+msgstr ""
+"Измените описание для ветки:\n"
+"  %s\n"
+"Строки, начинающиеся с «%c» будут вырезаны.\n"
 
-#: builtin/branch.c:620
 msgid "Generic options"
 msgstr "Общие параметры"
 
-#: builtin/branch.c:622
 msgid "show hash and subject, give twice for upstream branch"
 msgstr "показывать хэш-код и тему, укажите дважды для вышестоящей ветки"
 
-#: builtin/branch.c:623
 msgid "suppress informational messages"
 msgstr "не выводить информационные сообщения"
 
-#: builtin/branch.c:624
-msgid "set up tracking mode (see git-pull(1))"
-msgstr "установить режим отслеживания вышестоящей ветки (см. git-pull(1))"
+msgid "set branch tracking configuration"
+msgstr ""
 
-#: builtin/branch.c:626
 msgid "do not use"
 msgstr "не используйте"
 
-#: builtin/branch.c:628 builtin/rebase.c:532
 msgid "upstream"
 msgstr "вышестоящая"
 
-#: builtin/branch.c:628
 msgid "change the upstream info"
 msgstr "изменить информацию о вышестоящей ветке"
 
-#: builtin/branch.c:629
 msgid "unset the upstream info"
 msgstr ""
 
-#: builtin/branch.c:630
 msgid "use colored output"
 msgstr "использовать цветной вывод"
 
-#: builtin/branch.c:631
 msgid "act on remote-tracking branches"
 msgstr "выполнить действия на отслеживаемых внешних ветках"
 
-#: builtin/branch.c:633 builtin/branch.c:635
 msgid "print only branches that contain the commit"
 msgstr "вывести только ветки, которые содержат коммит"
 
-#: builtin/branch.c:634 builtin/branch.c:636
 msgid "print only branches that don't contain the commit"
 msgstr "вывести только ветки, которые не содержат коммит"
 
-#: builtin/branch.c:639
 msgid "Specific git-branch actions:"
 msgstr "Специфичные для git-branch действия:"
 
-#: builtin/branch.c:640
 msgid "list both remote-tracking and local branches"
 msgstr "вывести списки отслеживаемых и локальных веток"
 
-#: builtin/branch.c:642
 msgid "delete fully merged branch"
 msgstr "удалить полностью слитую ветку"
 
-#: builtin/branch.c:643
 msgid "delete branch (even if not merged)"
 msgstr "удалить ветку (даже никуда не слитую)"
 
-#: builtin/branch.c:644
 msgid "move/rename a branch and its reflog"
 msgstr "переместить/переименовать ветки и ее журнал ссылок"
 
-#: builtin/branch.c:645
 msgid "move/rename a branch, even if target exists"
 msgstr "переместить/переименовать ветку, даже если целевое имя уже существует"
 
-#: builtin/branch.c:646
 msgid "copy a branch and its reflog"
 msgstr "скопировать ветку и её журнал ссылок"
 
-#: builtin/branch.c:647
 msgid "copy a branch, even if target exists"
 msgstr "скопировать ветку, даже если целевое имя уже существует"
 
-#: builtin/branch.c:648
 msgid "list branch names"
 msgstr "показать список имён веток"
 
-#: builtin/branch.c:649
 msgid "show current branch name"
 msgstr "вывести имя текущей ветки"
 
-#: builtin/branch.c:650
 msgid "create the branch's reflog"
 msgstr "создать журнал ссылок ветки"
 
-#: builtin/branch.c:652
 msgid "edit the description for the branch"
 msgstr "изменить описание ветки"
 
-#: builtin/branch.c:653
 msgid "force creation, move/rename, deletion"
 msgstr "принудительное создание, перемещение или удаление ветки"
 
-#: builtin/branch.c:654
 msgid "print only branches that are merged"
 msgstr "вывод только слитых веток"
 
-#: builtin/branch.c:655
 msgid "print only branches that are not merged"
 msgstr "вывод только не слитых веток"
 
-#: builtin/branch.c:656
 msgid "list branches in columns"
 msgstr "показать список веток по столбцам"
 
-#: builtin/branch.c:658 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:434
 msgid "object"
 msgstr "объект"
 
-#: builtin/branch.c:659
 msgid "print only branches of the object"
 msgstr "вывод только веток, определенного объекта"
 
-#: builtin/branch.c:660 builtin/for-each-ref.c:48 builtin/tag.c:441
 msgid "sorting and filtering are case insensitive"
 msgstr "сортировка и фильтрация не зависят от регистра"
 
-#: builtin/branch.c:661 builtin/for-each-ref.c:38 builtin/tag.c:439
-#: builtin/verify-tag.c:38
+msgid "recurse through submodules"
+msgstr "рекурсивно по подмодулям"
+
 msgid "format to use for the output"
 msgstr "использовать формат для вывода"
 
-#: builtin/branch.c:684 builtin/clone.c:790
+msgid "Failed to resolve HEAD as a valid ref."
+msgstr "Не удалось определить HEAD как действительную ссылку."
+
 msgid "HEAD not found below refs/heads!"
 msgstr "HEAD не найден в refs/heads!"
 
-#: builtin/branch.c:708
-msgid "--column and --verbose are incompatible"
-msgstr "--column и --verbose нельзя использовать одновременно"
+msgid ""
+"branch with --recurse-submodules can only be used if submodule."
+"propagateBranches is enabled"
+msgstr ""
+
+msgid "--recurse-submodules can only be used to create branches"
+msgstr ""
 
-#: builtin/branch.c:723 builtin/branch.c:777 builtin/branch.c:786
 msgid "branch name required"
 msgstr "требуется имя ветки"
 
-#: builtin/branch.c:753
 msgid "Cannot give description to detached HEAD"
-msgstr "Нельзя дать описание отделённому HEAD"
+msgstr "Нельзя дать описание отсоединённому указателю HEAD"
 
-#: builtin/branch.c:758
 msgid "cannot edit description of more than one branch"
 msgstr "нельзя изменить описание более одной ветки за раз"
 
-#: builtin/branch.c:765
 #, c-format
 msgid "No commit on branch '%s' yet."
 msgstr "Еще нет коммита на ветке «%s»."
 
-#: builtin/branch.c:768
 #, c-format
 msgid "No branch named '%s'."
 msgstr "Нет ветки с именем «%s»."
 
-#: builtin/branch.c:783
 msgid "too many branches for a copy operation"
 msgstr "слишком много веток для операции копирования"
 
-#: builtin/branch.c:792
 msgid "too many arguments for a rename operation"
 msgstr "слишком много аргументов для операции переименования"
 
-#: builtin/branch.c:797
 msgid "too many arguments to set new upstream"
 msgstr "слишком много аргументов для указания новой вышестоящей ветки"
 
-#: builtin/branch.c:801
 #, c-format
 msgid ""
 "could not set upstream of HEAD to %s when it does not point to any branch."
-msgstr "невозможно установить вышестоящий репозиторий для HEAD на %s, так как он не указывает ни на одну ветку."
+msgstr ""
+"невозможно установить вышестоящий репозиторий для HEAD на %s, так как он не "
+"указывает ни на одну ветку."
 
-#: builtin/branch.c:804 builtin/branch.c:827
 #, c-format
 msgid "no such branch '%s'"
 msgstr "нет такой ветки «%s»"
 
-#: builtin/branch.c:808
 #, c-format
 msgid "branch '%s' does not exist"
 msgstr "ветка «%s» не существует"
 
-#: builtin/branch.c:821
 msgid "too many arguments to unset upstream"
 msgstr "слишком много аргументов для сброса указания вышестоящей ветки"
 
-#: builtin/branch.c:825
 msgid "could not unset upstream of HEAD when it does not point to any branch."
-msgstr "невозможно убрать вышестоящий репозиторий для HEAD, так как он не указывает ни на одну ветку."
+msgstr ""
+"невозможно убрать вышестоящий репозиторий для HEAD, так как он не указывает "
+"ни на одну ветку."
 
-#: builtin/branch.c:831
 #, c-format
 msgid "Branch '%s' has no upstream information"
 msgstr "Ветка «%s» не имеет информации о вышестоящей ветке"
 
-#: builtin/branch.c:841
 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:845
 msgid ""
 "the '--set-upstream' option is no longer supported. Please use '--track' or "
 "'--set-upstream-to' instead."
-msgstr "опция --set-upstream больше не поддерживается. Вместо неё используйте «--track» или «--set-upstream-to»"
+msgstr ""
+"опция --set-upstream больше не поддерживается. Вместо неё используйте «--"
+"track» или «--set-upstream-to»"
 
-#: builtin/bugreport.c:15
 msgid "git version:\n"
 msgstr ""
 
-#: builtin/bugreport.c:21
 #, c-format
 msgid "uname() failed with error '%s' (%d)\n"
 msgstr ""
 
-#: builtin/bugreport.c:31
 msgid "compiler info: "
 msgstr ""
 
-#: builtin/bugreport.c:34
 msgid "libc info: "
 msgstr ""
 
-#: builtin/bugreport.c:80
 msgid "not run from a git repository - no hooks to show\n"
 msgstr ""
 
-#: builtin/bugreport.c:90
 msgid "git bugreport [-o|--output-directory <file>] [-s|--suffix <format>]"
 msgstr ""
 
-#: builtin/bugreport.c:97
 msgid ""
 "Thank you for filling out a Git bug report!\n"
 "Please answer the following questions to help us understand your issue.\n"
@@ -10565,360 +3038,362 @@ msgid ""
 "You can delete any lines you don't wish to share.\n"
 msgstr ""
 
-#: builtin/bugreport.c:135
 msgid "specify a destination for the bugreport file"
 msgstr ""
 
-#: builtin/bugreport.c:137
 msgid "specify a strftime format suffix for the filename"
 msgstr ""
 
-#: builtin/bugreport.c:159
 #, c-format
 msgid "could not create leading directories for '%s'"
 msgstr ""
 
-#: builtin/bugreport.c:166
 msgid "System Info"
 msgstr ""
 
-#: builtin/bugreport.c:169
 msgid "Enabled Hooks"
 msgstr ""
 
-#: builtin/bugreport.c:176
-#, c-format
-msgid "couldn't create a new file at '%s'"
-msgstr ""
-
-#: builtin/bugreport.c:179
 #, c-format
 msgid "unable to write to %s"
 msgstr ""
 
-#: builtin/bugreport.c:189
 #, 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 ""
 
-#: builtin/bundle.c:16 builtin/bundle.c:28
 msgid "git bundle verify [<options>] <file>"
 msgstr ""
 
-#: builtin/bundle.c:17 builtin/bundle.c:33
 msgid "git bundle list-heads <file> [<refname>...]"
 msgstr ""
 
-#: builtin/bundle.c:18 builtin/bundle.c:38
 msgid "git bundle unbundle <file> [<refname>...]"
 msgstr ""
 
-#: builtin/bundle.c:67 builtin/pack-objects.c:3480
 msgid "do not show progress meter"
 msgstr "не выводить прогресс выполнения"
 
-#: builtin/bundle.c:69 builtin/pack-objects.c:3482
 msgid "show progress meter"
 msgstr "показать прогресс выполнения"
 
-#: builtin/bundle.c:71 builtin/pack-objects.c:3484
 msgid "show progress meter during object writing phase"
 msgstr "показать прогресс выполнения во время записи объектов"
 
-#: builtin/bundle.c:74 builtin/pack-objects.c:3487
 msgid "similar to --all-progress when progress meter is shown"
 msgstr "похоже на --all-progress при включенном прогрессе выполнения"
 
-#: builtin/bundle.c:76
 msgid "specify bundle format version"
 msgstr ""
 
-#: builtin/bundle.c:96
 msgid "Need a repository to create a bundle."
 msgstr "Требуется репозиторий для создания пакета."
 
-#: builtin/bundle.c:107
 msgid "do not show bundle details"
 msgstr ""
 
-#: builtin/bundle.c:122
 #, c-format
 msgid "%s is okay\n"
 msgstr "%s в порядке\n"
 
-#: builtin/bundle.c:163
 msgid "Need a repository to unbundle."
 msgstr "Требуется репозиторий для распаковки."
 
-#: builtin/bundle.c:171 builtin/remote.c:1700
-msgid "be verbose; must be placed before a subcommand"
-msgstr "быть многословнее; должно стоять перед подкомандой"
+msgid "Unbundling objects"
+msgstr ""
 
-#: builtin/bundle.c:193 builtin/remote.c:1731
 #, c-format
 msgid "Unknown subcommand: %s"
 msgstr "Неизвестная подкоманда: %s"
 
-#: builtin/cat-file.c:598
+#, c-format
+msgid "cannot read object %s '%s'"
+msgstr "невозможно прочитать объект %s «%s»"
+
+msgid "flush is only for --buffer mode"
+msgstr ""
+
+msgid "empty command in input"
+msgstr ""
+
+#, c-format
+msgid "whitespace before command: '%s'"
+msgstr ""
+
+#, c-format
+msgid "%s requires arguments"
+msgstr ""
+
+#, c-format
+msgid "%s takes no arguments"
+msgstr ""
+
+#, c-format
+msgid "unknown command: '%s'"
+msgstr ""
+
+msgid "only one batch option may be specified"
+msgstr ""
+
+msgid "git cat-file <type> <object>"
+msgstr ""
+
+msgid "git cat-file (-e | -p) <object>"
+msgstr ""
+
+msgid "git cat-file (-t | -s) [--allow-unknown-type] <object>"
+msgstr ""
+
 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 | <тип> | --textconv | --filters) [--path=<путь>] <объект>"
+"git cat-file (--batch | --batch-check | --batch-command) [--batch-all-"
+"objects]\n"
+"             [--buffer] [--follow-symlinks] [--unordered]\n"
+"             [--textconv | --filters]"
+msgstr ""
 
-#: builtin/cat-file.c:599
 msgid ""
-"git cat-file (--batch[=<format>] | --batch-check[=<format>]) [--follow-"
-"symlinks] [--textconv | --filters]"
+"git cat-file (--textconv | --filters)\n"
+"             [<rev>:<path|tree-ish> | --path=<path|tree-ish> <rev>]"
 msgstr ""
 
-#: builtin/cat-file.c:620
-msgid "only one batch option may be specified"
+msgid "Check object existence or emit object contents"
+msgstr ""
+
+msgid "check if <object> exists"
 msgstr ""
 
-#: builtin/cat-file.c:638
-msgid "<type> can be one of: blob, tree, commit, tag"
-msgstr "<тип> может быть одним из: blob, tree, commit, tag"
+msgid "pretty-print <object> content"
+msgstr ""
+
+msgid "Emit [broken] object attributes"
+msgstr ""
 
-#: builtin/cat-file.c:639
-msgid "show object type"
-msgstr "показать тип объекта"
+msgid "show object type (one of 'blob', 'tree', 'commit', 'tag', ...)"
+msgstr ""
 
-#: builtin/cat-file.c:640
 msgid "show object size"
 msgstr "показать размер объекта"
 
-#: builtin/cat-file.c:642
-msgid "exit with zero when there's no error"
-msgstr "выйти с нулевым кодом возврата, если нет ошибки"
+msgid "allow -s and -t to work with broken/corrupt objects"
+msgstr "разрешить -s и -t работать с повреждёнными объектами"
 
-#: builtin/cat-file.c:643
-msgid "pretty-print object's content"
-msgstr "структурированный вывод содержимого объекта"
+msgid "Batch objects requested on stdin (or --batch-all-objects)"
+msgstr ""
 
-#: builtin/cat-file.c:645
-msgid "for blob objects, run textconv on object's content"
-msgstr "запустить texconv на содержимом двоичных объектов"
+msgid "show full <object> or <rev> contents"
+msgstr ""
 
-#: builtin/cat-file.c:647
-msgid "for blob objects, run filters on object's content"
-msgstr "запуск фильтров на содержимом двоичных объектов"
+msgid "like --batch, but don't emit <contents>"
+msgstr ""
 
-#: builtin/cat-file.c:648
-msgid "blob"
-msgstr "двоичный объект"
+msgid "read commands from stdin"
+msgstr ""
 
-#: builtin/cat-file.c:649
-msgid "use a specific path for --textconv/--filters"
-msgstr "использовать определенный путь для --textconv/--filters"
+msgid "with --batch[-check]: ignores stdin, batches all known objects"
+msgstr ""
 
-#: builtin/cat-file.c:651
-msgid "allow -s and -t to work with broken/corrupt objects"
-msgstr "разрешить -s и -t работать с повреждёнными объектами"
+msgid "Change or optimize batch output"
+msgstr ""
 
-#: builtin/cat-file.c:652
 msgid "buffer --batch output"
 msgstr "буфферировать вывод --batch"
 
-#: builtin/cat-file.c:654
-msgid "show info and content of objects fed from the standard input"
-msgstr "показать информацию и содержимое объектов, переданных из стандартного ввода"
+msgid "follow in-tree symlinks"
+msgstr ""
 
-#: builtin/cat-file.c:658
-msgid "show info about objects fed from the standard input"
-msgstr "показать информацию об объектах, переданных из стандартного ввода"
+msgid "do not order objects before emitting them"
+msgstr ""
 
-#: builtin/cat-file.c:662
-msgid "follow in-tree symlinks (used with --batch or --batch-check)"
-msgstr "переходить по символьным ссылкам внутри дерева (используется с опциями --batch и --batch-check)"
+msgid ""
+"Emit object (blob or tree) with conversion or filter (stand-alone, or with "
+"batch)"
+msgstr ""
+
+msgid "run textconv on object's content"
+msgstr ""
+
+msgid "run filters on object's content"
+msgstr ""
+
+msgid "blob|tree"
+msgstr ""
+
+msgid "use a <path> for (--textconv | --filters); Not with 'batch'"
+msgstr ""
+
+#, c-format
+msgid "'%s=<%s>' needs '%s' or '%s'"
+msgstr ""
+
+msgid "path|tree-ish"
+msgstr ""
 
-#: builtin/cat-file.c:664
-msgid "show all objects with --batch or --batch-check"
-msgstr "показать все объекты с опциями --batch или --batch-check"
+#, c-format
+msgid "'%s' requires a batch mode"
+msgstr ""
+
+#, c-format
+msgid "'-%c' is incompatible with batch mode"
+msgstr ""
+
+msgid "batch modes take no arguments"
+msgstr ""
 
-#: builtin/cat-file.c:666
-msgid "do not order --batch-all-objects output"
+#, c-format
+msgid "<rev> required with '%s'"
+msgstr ""
+
+#, c-format
+msgid "<object> required with '-%c'"
+msgstr ""
+
+msgid "too many arguments"
+msgstr ""
+
+#, c-format
+msgid "only two arguments allowed in <type> <object> mode, not %d"
 msgstr ""
 
-#: builtin/check-attr.c:13
 msgid "git check-attr [-a | --all | <attr>...] [--] <pathname>..."
-msgstr "git check-attr [-a | --all | <атрибут>…] [--] <путь>…"
+msgstr "git check-attr [-a | --all | <атрибут>...] [--] <путь>..."
 
-#: builtin/check-attr.c:14
 msgid "git check-attr --stdin [-z] [-a | --all | <attr>...]"
-msgstr "git check-attr --stdin [-z] [-a | --all | <атрибут>…]"
+msgstr "git check-attr --stdin [-z] [-a | --all | <атрибут>...]"
 
-#: builtin/check-attr.c:21
 msgid "report all attributes set on file"
 msgstr "вывести все атрибуты установленные для файла"
 
-#: builtin/check-attr.c:22
 msgid "use .gitattributes only from the index"
 msgstr "использовать только .gitattributes из индекса"
 
-#: builtin/check-attr.c:23 builtin/check-ignore.c:25 builtin/hash-object.c:102
 msgid "read file names from stdin"
 msgstr "прочитать имена файлов из стандартного ввода"
 
-#: builtin/check-attr.c:25 builtin/check-ignore.c:27
 msgid "terminate input and output records by a NUL character"
 msgstr "окончание ввода и вывода записей по НУЛЕВОМУ символу"
 
-#: builtin/check-ignore.c:21 builtin/checkout.c:1500 builtin/gc.c:541
-#: builtin/worktree.c:561
 msgid "suppress progress reporting"
 msgstr "не выводить прогресс выполнения"
 
-#: builtin/check-ignore.c:29
 msgid "show non-matching input paths"
 msgstr "показать не совпадающие введенные пути"
 
-#: builtin/check-ignore.c:31
 msgid "ignore index when checking"
 msgstr "игнорировать индекс при проверке"
 
-#: builtin/check-ignore.c:163
 msgid "cannot specify pathnames with --stdin"
 msgstr "нельзя указывать пути вместе с параметром --stdin"
 
-#: builtin/check-ignore.c:166
 msgid "-z only makes sense with --stdin"
 msgstr "-z имеет смысл только вместе с параметром --stdin"
 
-#: builtin/check-ignore.c:168
 msgid "no path specified"
 msgstr "не указан путь"
 
-#: builtin/check-ignore.c:172
 msgid "--quiet is only valid with a single pathname"
 msgstr "--quiet можно использовать только при указании одного пути"
 
-#: builtin/check-ignore.c:174
 msgid "cannot have both --quiet and --verbose"
 msgstr "нельзя использовать одновременно --quiet и --verbose"
 
-#: builtin/check-ignore.c:177
 msgid "--non-matching is only valid with --verbose"
 msgstr "--non-matching можно использовать только вместе с --verbose"
 
-#: builtin/check-mailmap.c:9
 msgid "git check-mailmap [<options>] <contact>..."
-msgstr "git check-mailmap [<опции>] <контакт>…"
+msgstr "git check-mailmap [<опции>] <контакт>..."
 
-#: builtin/check-mailmap.c:14
 msgid "also read contacts from stdin"
 msgstr "также читать контакты из стандартного ввода"
 
-#: builtin/check-mailmap.c:25
 #, c-format
 msgid "unable to parse contact: %s"
 msgstr "не удалось разобрать контакт: %s"
 
-#: builtin/check-mailmap.c:48
 msgid "no contacts specified"
 msgstr "не указаны контакты"
 
-#: builtin/checkout-index.c:139
+msgid "git checkout--worker [<options>]"
+msgstr ""
+
+msgid "string"
+msgstr "строка"
+
+msgid "when creating files, prepend <string>"
+msgstr "добавить спереди <строку> при создании файлов"
+
 msgid "git checkout-index [<options>] [--] [<file>...]"
-msgstr "git checkout-index [<опции>] [--] [<файл>…]"
+msgstr "git checkout-index [<опции>] [--] [<файл>...]"
 
-#: builtin/checkout-index.c:156
 msgid "stage should be between 1 and 3 or all"
 msgstr "индекс должен быть между 1 и 3 или all"
 
-#: builtin/checkout-index.c:173
 msgid "check out all files in the index"
 msgstr "переключиться на состояние всех файлов из индекса"
 
-#: builtin/checkout-index.c:174
+msgid "do not skip files with skip-worktree set"
+msgstr ""
+
 msgid "force overwrite of existing files"
 msgstr "принудительная перезапись существующих файлов"
 
-#: builtin/checkout-index.c:176
 msgid "no warning for existing files and files not in index"
-msgstr "не выводить предупреждения для существующих и непроиндексированных файлов"
+msgstr ""
+"не выводить предупреждения для существующих и непроиндексированных файлов"
 
-#: builtin/checkout-index.c:178
 msgid "don't checkout new files"
 msgstr "не создавать новые файлы"
 
-#: builtin/checkout-index.c:180
 msgid "update stat information in the index file"
 msgstr "обновить статистику доступа в файле индекса"
 
-#: builtin/checkout-index.c:184
 msgid "read list of paths from the standard input"
 msgstr "прочитать список путей из стандартного ввода"
 
-#: builtin/checkout-index.c:186
 msgid "write the content to temporary files"
 msgstr "записать содержимое во временные файлы"
 
-#: builtin/checkout-index.c:187 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:757
-msgid "string"
-msgstr "строка"
-
-#: builtin/checkout-index.c:188
-msgid "when creating files, prepend <string>"
-msgstr "добавить спереди <строку> при создании файлов"
-
-#: builtin/checkout-index.c:190
 msgid "copy out the files from named stage"
 msgstr "копировать файлы из указанного индекса"
 
-#: builtin/checkout.c:31
 msgid "git checkout [<options>] <branch>"
 msgstr "git checkout [<опции>] <ветка>"
 
-#: builtin/checkout.c:32
 msgid "git checkout [<options>] [<branch>] -- <file>..."
-msgstr "git checkout [<опции>] [<ветка>] -- <файл>…"
+msgstr "git checkout [<опции>] [<ветка>] -- <файл>..."
 
-#: builtin/checkout.c:37
 msgid "git switch [<options>] [<branch>]"
 msgstr ""
 
-#: builtin/checkout.c:42
 msgid "git restore [<options>] [--source=<branch>] <file>..."
-msgstr "git restore [<опции>] [--source=<ветка>] <файл>…"
+msgstr "git restore [<опции>] [--source=<ветка>] <файл>..."
 
-#: builtin/checkout.c:188 builtin/checkout.c:227
 #, c-format
 msgid "path '%s' does not have our version"
 msgstr "путь «%s» не имеет нашей версии"
 
-#: builtin/checkout.c:190 builtin/checkout.c:229
 #, c-format
 msgid "path '%s' does not have their version"
 msgstr "путь «%s» не имеет их версии"
 
-#: builtin/checkout.c:206
 #, c-format
 msgid "path '%s' does not have all necessary versions"
 msgstr "путь «%s» не имеет всех необходимых версий"
 
-#: builtin/checkout.c:258
 #, c-format
 msgid "path '%s' does not have necessary versions"
 msgstr "путь «%s» не имеет необходимых версий"
 
-#: builtin/checkout.c:275
 #, c-format
 msgid "path '%s': cannot merge"
 msgstr "путь «%s»: не удалось слить"
 
-#: builtin/checkout.c:291
 #, c-format
 msgid "Unable to add merge result for '%s'"
 msgstr "Не удалось добавить результат слияния «%s»"
 
-#: builtin/checkout.c:396
 #, c-format
 msgid "Recreated %d merge conflict"
 msgid_plural "Recreated %d merge conflicts"
@@ -10927,7 +3402,6 @@ msgstr[1] ""
 msgstr[2] ""
 msgstr[3] ""
 
-#: builtin/checkout.c:401
 #, c-format
 msgid "Updated %d path from %s"
 msgid_plural "Updated %d paths from %s"
@@ -10936,7 +3410,6 @@ msgstr[1] ""
 msgstr[2] ""
 msgstr[3] ""
 
-#: builtin/checkout.c:408
 #, c-format
 msgid "Updated %d path from the index"
 msgid_plural "Updated %d paths from the index"
@@ -10945,97 +3418,73 @@ msgstr[1] ""
 msgstr[2] ""
 msgstr[3] ""
 
-#: builtin/checkout.c:431 builtin/checkout.c:434 builtin/checkout.c:437
-#: builtin/checkout.c:441
 #, c-format
 msgid "'%s' cannot be used with updating paths"
 msgstr "«%s» нельзя использовать при обновлении путей"
 
-#: builtin/checkout.c:444 builtin/checkout.c:447
-#, c-format
-msgid "'%s' cannot be used with %s"
-msgstr "«%s» нельзя использовать одновременно с %s"
-
-#: builtin/checkout.c:451
 #, c-format
 msgid "Cannot update paths and switch to branch '%s' at the same time."
 msgstr "Нельзя обновлять пути и переключаться на ветку «%s» одновременно."
 
-#: builtin/checkout.c:455
 #, c-format
 msgid "neither '%s' or '%s' is specified"
 msgstr ""
 
-#: builtin/checkout.c:459
 #, c-format
 msgid "'%s' must be used when '%s' is not specified"
 msgstr ""
 
-#: builtin/checkout.c:464 builtin/checkout.c:469
 #, c-format
 msgid "'%s' or '%s' cannot be used with %s"
 msgstr ""
 
-#: builtin/checkout.c:541 builtin/checkout.c:548
 #, c-format
 msgid "path '%s' is unmerged"
 msgstr "путь «%s» не слит"
 
-#: builtin/checkout.c:716
 msgid "you need to resolve your current index first"
 msgstr "сначала нужно разрешить конфликты в вашем текущем индексе"
 
-#: builtin/checkout.c:770
 #, c-format
 msgid ""
 "cannot continue with staged changes in the following files:\n"
 "%s"
 msgstr ""
 
-#: builtin/checkout.c:866
 #, c-format
 msgid "Can not do reflog for '%s': %s\n"
 msgstr "Не удалось создать журнал ссылок для «%s»: %s\n"
 
-#: builtin/checkout.c:908
 msgid "HEAD is now at"
 msgstr "HEAD сейчас на"
 
-#: builtin/checkout.c:912 builtin/clone.c:721 t/helper/test-fast-rebase.c:202
 msgid "unable to update HEAD"
 msgstr "не удалось обновить HEAD"
 
-#: builtin/checkout.c:916
 #, c-format
 msgid "Reset branch '%s'\n"
 msgstr "Сброс ветки «%s»\n"
 
-#: builtin/checkout.c:919
 #, c-format
 msgid "Already on '%s'\n"
 msgstr "Уже на «%s»\n"
 
-#: builtin/checkout.c:923
 #, c-format
 msgid "Switched to and reset branch '%s'\n"
 msgstr "Переключение и сброс ветки «%s»\n"
 
-#: builtin/checkout.c:925 builtin/checkout.c:1356
 #, c-format
 msgid "Switched to a new branch '%s'\n"
-msgstr "Переключено на новую ветку «%s»\n"
+msgstr "Переключились на новую ветку «%s»\n"
 
-#: builtin/checkout.c:927
 #, c-format
 msgid "Switched to branch '%s'\n"
-msgstr "Переключено на ветку «%s»\n"
+msgstr "Переключились на ветку «%s»\n"
 
-#: builtin/checkout.c:978
 #, c-format
 msgid " ... and %d more.\n"
-msgstr " … и еще %d.\n"
+msgstr " ... и еще %d.\n"
 
-#: builtin/checkout.c:984
 #, c-format
 msgid ""
 "Warning: you are leaving %d commit behind, not connected to\n"
@@ -11047,12 +3496,26 @@ msgid_plural ""
 "any of your branches:\n"
 "\n"
 "%s\n"
-msgstr[0] "Предупреждение: вы оставляете позади %d коммит не соединенную ни с одной из ваших веток:\n\n%s\n"
-msgstr[1] "Предупреждение: вы оставляете позади %d коммита не соединенные ни с одной из ваших веток:\n\n%s\n"
-msgstr[2] "Предупреждение: вы оставляете позади %d коммитов не соединенные ни с одной из ваших веток:\n\n%s\n"
-msgstr[3] "Предупреждение: вы оставляете позади %d коммитов не соединенные ни с одной из ваших веток:\n\n%s\n"
+msgstr[0] ""
+"Предупреждение: позади остался %d коммит, не связанный ни с одной из веток:\n"
+"\n"
+"%s\n"
+msgstr[1] ""
+"Предупреждение: позади осталось %d коммита, не связанных ни с одной из "
+"веток:\n"
+"\n"
+"%s\n"
+msgstr[2] ""
+"Предупреждение: позади осталось %d коммитов, не связанных ни с одной из "
+"веток:\n"
+"\n"
+"%s\n"
+msgstr[3] ""
+"Предупреждение: позади осталось %d коммитов, не связанных ни с одной из "
+"веток:\n"
+"\n"
+"%s\n"
 
-#: builtin/checkout.c:1003
 #, c-format
 msgid ""
 "If you want to keep it by creating a new branch, this may be a good time\n"
@@ -11066,31 +3529,43 @@ msgid_plural ""
 "\n"
 " git branch <new-branch-name> %s\n"
 "\n"
-msgstr[0] "Если вы хотите сохранить их с помощью создания новой ветки, то сейчас самое время\nсделать это с помощью:\n\n git branch <имя-новой-ветки> %s\n"
-msgstr[1] "Если вы хотите сохранить их с помощью создания новой ветки, то сейчас самое время\nсделать это с помощью:\n\n git branch <имя-новой-ветки> %s\n"
-msgstr[2] "Если вы хотите сохранить их с помощью создания новой ветки, то сейчас самое время\nсделать это с помощью:\n\n git branch <имя-новой-ветки> %s\n"
-msgstr[3] "Если вы хотите сохранить их с помощью создания новой ветки, то сейчас самое время\nсделать это с помощью:\n\n git branch <имя-новой-ветки> %s\n"
+msgstr[0] ""
+"Если хотите сохранить его в новую ветку, то сейчас самое время для команды:\n"
+"\n"
+" git branch <имя-новой-ветки> %s\n"
+"\n"
+msgstr[1] ""
+"Если хотите сохранить их в новую ветку, то сейчас самое время для команды:\n"
+"\n"
+" git branch <имя-новой-ветки> %s\n"
+"\n"
+msgstr[2] ""
+"Если хотите сохранить их в новую ветку, то сейчас самое время для команды:\n"
+"\n"
+" git branch <имя-новой-ветки> %s\n"
+"\n"
+msgstr[3] ""
+"Если хотите сохранить работу в новую ветку, то сейчас самое время для "
+"команды:\n"
+"\n"
+" git branch <имя-новой-ветки> %s\n"
+"\n"
 
-#: builtin/checkout.c:1038
 msgid "internal error in revision walk"
 msgstr "внутренняя ошибка при хождении по редакциям"
 
-#: builtin/checkout.c:1042
 msgid "Previous HEAD position was"
 msgstr "Предыдущая позиция HEAD была"
 
-#: builtin/checkout.c:1082 builtin/checkout.c:1351
 msgid "You are on a branch yet to be born"
-msgstr "Вы находитесь на еще не созданной ветке"
+msgstr "Вы на ветке, которую еще не создали"
 
-#: builtin/checkout.c:1164
 #, 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:1171
 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"
@@ -11102,335 +3577,262 @@ msgid ""
 "checkout.defaultRemote=origin in your config."
 msgstr ""
 
-#: builtin/checkout.c:1181
 #, c-format
 msgid "'%s' matched multiple (%d) remote tracking branches"
 msgstr ""
 
-#: builtin/checkout.c:1247
 msgid "only one reference expected"
 msgstr ""
 
-#: builtin/checkout.c:1264
 #, c-format
 msgid "only one reference expected, %d given."
 msgstr "ожидается только одна ссылка, а передано %d."
 
-#: builtin/checkout.c:1310 builtin/worktree.c:342 builtin/worktree.c:510
 #, c-format
 msgid "invalid reference: %s"
 msgstr "неправильная ссылка: %s"
 
-#: builtin/checkout.c:1323 builtin/checkout.c:1689
 #, c-format
 msgid "reference is not a tree: %s"
 msgstr "в дереве нет такой ссылки: %s"
 
-#: builtin/checkout.c:1370
 #, c-format
 msgid "a branch is expected, got tag '%s'"
 msgstr ""
 
-#: builtin/checkout.c:1372
 #, c-format
 msgid "a branch is expected, got remote branch '%s'"
 msgstr ""
 
-#: builtin/checkout.c:1373 builtin/checkout.c:1381
 #, c-format
 msgid "a branch is expected, got '%s'"
 msgstr ""
 
-#: builtin/checkout.c:1376
 #, c-format
 msgid "a branch is expected, got commit '%s'"
 msgstr ""
 
-#: builtin/checkout.c:1392
+msgid ""
+"If you want to detach HEAD at the commit, try again with the --detach option."
+msgstr ""
+
 msgid ""
 "cannot switch branch while merging\n"
 "Consider \"git merge --quit\" or \"git worktree add\"."
 msgstr ""
 
-#: builtin/checkout.c:1396
 msgid ""
 "cannot switch branch in the middle of an am session\n"
 "Consider \"git am --quit\" or \"git worktree add\"."
 msgstr ""
 
-#: builtin/checkout.c:1400
 msgid ""
 "cannot switch branch while rebasing\n"
 "Consider \"git rebase --quit\" or \"git worktree add\"."
 msgstr ""
 
-#: builtin/checkout.c:1404
 msgid ""
 "cannot switch branch while cherry-picking\n"
 "Consider \"git cherry-pick --quit\" or \"git worktree add\"."
 msgstr ""
 
-#: builtin/checkout.c:1408
 msgid ""
 "cannot switch branch while reverting\n"
 "Consider \"git revert --quit\" or \"git worktree add\"."
 msgstr ""
 
-#: builtin/checkout.c:1412
 msgid "you are switching branch while bisecting"
 msgstr ""
 
-#: builtin/checkout.c:1419
 msgid "paths cannot be used with switching branches"
 msgstr "нельзя использовать пути при переключении веток"
 
-#: builtin/checkout.c:1422 builtin/checkout.c:1426 builtin/checkout.c:1430
 #, c-format
 msgid "'%s' cannot be used with switching branches"
 msgstr "нельзя использовать «%s» при переключении веток"
 
-#: builtin/checkout.c:1434 builtin/checkout.c:1437 builtin/checkout.c:1440
-#: builtin/checkout.c:1445 builtin/checkout.c:1450
 #, c-format
 msgid "'%s' cannot be used with '%s'"
 msgstr "«%s» нельзя использовать одновременно с «%s»"
 
-#: builtin/checkout.c:1447
 #, c-format
 msgid "'%s' cannot take <start-point>"
 msgstr ""
 
-#: builtin/checkout.c:1455
 #, c-format
 msgid "Cannot switch branch to a non-commit '%s'"
 msgstr "Нельзя переключить ветку на не коммит «%s»"
 
-#: builtin/checkout.c:1462
 msgid "missing branch or commit argument"
 msgstr ""
 
-#: builtin/checkout.c:1504 builtin/clone.c:92 builtin/commit-graph.c:84
-#: builtin/commit-graph.c:222 builtin/fetch.c:172 builtin/merge.c:296
-#: builtin/multi-pack-index.c:27 builtin/pull.c:119 builtin/push.c:575
-#: builtin/send-pack.c:198
-msgid "force progress reporting"
-msgstr "принудительно выводить прогресс"
-
-#: builtin/checkout.c:1505
 msgid "perform a 3-way merge with the new branch"
 msgstr "выполнить трехходовое слияние с новой веткой"
 
-#: builtin/checkout.c:1506 builtin/log.c:1800 parse-options.h:322
 msgid "style"
 msgstr "стиль"
 
-#: builtin/checkout.c:1507
-msgid "conflict style (merge or diff3)"
-msgstr "стиль конфликтов слияния (merge или diff3)"
+msgid "conflict style (merge, diff3, or zdiff3)"
+msgstr ""
 
-#: builtin/checkout.c:1519 builtin/worktree.c:558
 msgid "detach HEAD at named commit"
 msgstr "отсоединить HEAD на указанном коммите"
 
-#: builtin/checkout.c:1520
-msgid "set upstream info for new branch"
-msgstr "установить информацию о вышестоящей ветке для новой ветки"
-
-#: builtin/checkout.c:1522
 msgid "force checkout (throw away local modifications)"
-msgstr "принудительное переключение на состояние (отбрасывает все локальные изменения)"
+msgstr ""
+"принудительное переключение на состояние (отбрасывает все локальные "
+"изменения)"
 
-#: builtin/checkout.c:1524
 msgid "new-branch"
 msgstr "новая-ветка"
 
-#: builtin/checkout.c:1524
 msgid "new unparented branch"
 msgstr "новая ветка без родителей"
 
-#: builtin/checkout.c:1526 builtin/merge.c:300
 msgid "update ignored files (default)"
 msgstr "обновить игнорируемые файлы (по умолчанию)"
 
-#: builtin/checkout.c:1529
 msgid "do not check if another worktree is holding the given ref"
 msgstr "не проверять, что другое дерево уже содержит указанную ссылку"
 
-#: builtin/checkout.c:1542
 msgid "checkout our version for unmerged files"
 msgstr "переключиться на нашу версию для не слитых файлов"
 
-#: builtin/checkout.c:1545
 msgid "checkout their version for unmerged files"
 msgstr "переключиться на их версию для не слитых файлов"
 
-#: builtin/checkout.c:1549
 msgid "do not limit pathspecs to sparse entries only"
 msgstr "не ограничивать спецификаторы пути только частичными записями"
 
-#: builtin/checkout.c:1604
 #, c-format
-msgid "-%c, -%c and --orphan are mutually exclusive"
+msgid "options '-%c', '-%c', and '%s' cannot be used together"
 msgstr ""
 
-#: builtin/checkout.c:1608
-msgid "-p and --overlay are mutually exclusive"
-msgstr ""
-
-#: builtin/checkout.c:1645
 msgid "--track needs a branch name"
 msgstr "--track требует имя ветки"
 
-#: builtin/checkout.c:1650
 #, c-format
 msgid "missing branch name; try -%c"
 msgstr ""
 
-#: builtin/checkout.c:1682
 #, c-format
 msgid "could not resolve %s"
 msgstr ""
 
-#: builtin/checkout.c:1698
 msgid "invalid path specification"
 msgstr "недопустимый спецификатор пути"
 
-#: builtin/checkout.c:1705
 #, c-format
 msgid "'%s' is not a commit and a branch '%s' cannot be created from it"
-msgstr "«%s» не является коммитом, поэтому невозможно создать из него ветку «%s»"
+msgstr ""
+"«%s» не является коммитом, поэтому невозможно создать из него ветку «%s»"
 
-#: builtin/checkout.c:1709
 #, c-format
 msgid "git checkout: --detach does not take a path argument '%s'"
 msgstr "git checkout: --detach не принимает путь «%s» как аргумент"
 
-#: builtin/checkout.c:1718
-msgid "--pathspec-from-file is incompatible with --detach"
-msgstr ""
-
-#: builtin/checkout.c:1721 builtin/reset.c:325 builtin/stash.c:1499
-msgid "--pathspec-from-file is incompatible with --patch"
-msgstr ""
-
-#: builtin/checkout.c:1734
 msgid ""
 "git checkout: --ours/--theirs, --force and --merge are incompatible when\n"
 "checking out of the index."
-msgstr "git checkout: --ours/--theirs, --force and --merge нельзя использовать одновременно при применении состояния индекса."
+msgstr ""
+"git checkout: --ours/--theirs, --force and --merge нельзя использовать "
+"одновременно при применении состояния индекса."
 
-#: builtin/checkout.c:1739
 msgid "you must specify path(s) to restore"
 msgstr ""
 
-#: builtin/checkout.c:1765 builtin/checkout.c:1767 builtin/checkout.c:1816
-#: builtin/checkout.c:1818 builtin/clone.c:122 builtin/remote.c:170
-#: builtin/remote.c:172 builtin/submodule--helper.c:2719
-#: builtin/worktree.c:554 builtin/worktree.c:556
 msgid "branch"
 msgstr "ветка"
 
-#: builtin/checkout.c:1766
 msgid "create and checkout a new branch"
 msgstr "создать и переключиться на новую ветку"
 
-#: builtin/checkout.c:1768
 msgid "create/reset and checkout a branch"
 msgstr "создать/сбросить и перключиться на новую ветку"
 
-#: builtin/checkout.c:1769
 msgid "create reflog for new branch"
 msgstr "создать журнал ссылок для новой ветки"
 
-#: builtin/checkout.c:1771
 msgid "second guess 'git checkout <no-such-branch>' (default)"
 msgstr ""
 
-#: builtin/checkout.c:1772
 msgid "use overlay mode (default)"
 msgstr ""
 
-#: builtin/checkout.c:1817
 msgid "create and switch to a new branch"
 msgstr ""
 
-#: builtin/checkout.c:1819
 msgid "create/reset and switch to a branch"
 msgstr ""
 
-#: builtin/checkout.c:1821
 msgid "second guess 'git switch <no-such-branch>'"
 msgstr ""
 
-#: builtin/checkout.c:1823
 msgid "throw away local modifications"
 msgstr ""
 
-#: builtin/checkout.c:1857
 msgid "which tree-ish to checkout from"
 msgstr ""
 
-#: builtin/checkout.c:1859
 msgid "restore the index"
 msgstr ""
 
-#: builtin/checkout.c:1861
 msgid "restore the working tree (default)"
 msgstr ""
 
-#: builtin/checkout.c:1863
 msgid "ignore unmerged entries"
 msgstr ""
 
-#: builtin/checkout.c:1864
 msgid "use overlay mode"
 msgstr ""
 
-#: builtin/clean.c:29
 msgid ""
 "git clean [-d] [-f] [-i] [-n] [-q] [-e <pattern>] [-x | -X] [--] <paths>..."
-msgstr "git clean [-d] [-f] [-i] [-n] [-q] [-e <шаблон>] [-x | -X] [--] <пути>…"
+msgstr ""
+"git clean [-d] [-f] [-i] [-n] [-q] [-e <шаблон>] [-x | -X] [--] <пути>..."
 
-#: builtin/clean.c:33
 #, c-format
 msgid "Removing %s\n"
 msgstr "Удаление %s\n"
 
-#: builtin/clean.c:34
 #, c-format
 msgid "Would remove %s\n"
 msgstr "Будет удалено %s\n"
 
-#: builtin/clean.c:35
 #, c-format
 msgid "Skipping repository %s\n"
 msgstr "Пропуск репозитория %s\n"
 
-#: builtin/clean.c:36
 #, c-format
 msgid "Would skip repository %s\n"
 msgstr "Будет пропущен репозиторий %s\n"
 
-#: builtin/clean.c:37
 #, c-format
 msgid "failed to remove %s"
 msgstr "сбой удаления %s"
 
-#: builtin/clean.c:38
 #, c-format
 msgid "could not lstat %s\n"
 msgstr ""
 
-#: builtin/clean.c:302 git-add--interactive.perl:593
+msgid "Refusing to remove current working directory\n"
+msgstr ""
+
+msgid "Would refuse to remove current working directory\n"
+msgstr ""
+
 #, c-format
 msgid ""
 "Prompt help:\n"
 "1          - select a numbered item\n"
 "foo        - select item based on unique prefix\n"
 "           - (empty) select nothing\n"
-msgstr "Справка по выделению:\n1          - выбрать указанный элемент\nfoo        - выбрать элемент с указанным префиксом\n           - (пусто) не выбирать ничего\n"
+msgstr ""
+"Справка по выделению:\n"
+"1          - выбрать указанный элемент\n"
+"foo        - выбрать элемент с указанным префиксом\n"
+"           - (пусто) не выбирать ничего\n"
 
-#: builtin/clean.c:306 git-add--interactive.perl:602
 #, c-format
 msgid ""
 "Prompt help:\n"
@@ -11441,35 +3843,36 @@ msgid ""
 "-...       - unselect specified items\n"
 "*          - choose all items\n"
 "           - (empty) finish selecting\n"
-msgstr "Справка по выделению:\n1          - выбрать один элемент\n3-5        - выбрать диапазон элементов\n2-3,6-9    - выбрать несколько диапазонов\nfoo        - выбрать элемент с указанным префиксом\n-…       - убрать выделение с указанных элементов\n*          - выбрать все элементы\n           - (пусто) завершить выделение\n"
+msgstr ""
+"Справка по выделению:\n"
+"1          - выбрать один элемент\n"
+"3-5        - выбрать диапазон элементов\n"
+"2-3,6-9    - выбрать несколько диапазонов\n"
+"foo        - выбрать элемент с указанным префиксом\n"
+"-...       - убрать выделение с указанных элементов\n"
+"*          - выбрать все элементы\n"
+"           - (пусто) завершить выделение\n"
 
-#: builtin/clean.c:521 git-add--interactive.perl:568
-#: git-add--interactive.perl:573
 #, c-format, perl-format
 msgid "Huh (%s)?\n"
 msgstr "Хм (%s)?\n"
 
-#: builtin/clean.c:661
 #, c-format
 msgid "Input ignore patterns>> "
 msgstr "Шаблоны игнорирования ввода>> "
 
-#: builtin/clean.c:696
 #, c-format
 msgid "WARNING: Cannot find items matched by: %s"
 msgstr "ПРЕДУПРЕЖДЕНИЕ: Не удалось найти элементы соответствующие: %s"
 
-#: builtin/clean.c:717
 msgid "Select items to delete"
 msgstr "Укажите элементы для удаления"
 
 #. TRANSLATORS: Make sure to keep [y/N] as is
-#: builtin/clean.c:758
 #, c-format
 msgid "Remove %s [y/N]? "
 msgstr "Удалить %s [y - да/N - нет]? "
 
-#: builtin/clean.c:789
 msgid ""
 "clean               - start cleaning\n"
 "filter by pattern   - exclude items from deletion\n"
@@ -11478,9 +3881,16 @@ msgid ""
 "quit                - stop cleaning\n"
 "help                - this screen\n"
 "?                   - help for prompt selection"
-msgstr "clean               - начать очистку\nfilter by pattern   - исключить удаление элементов\nselect by numbers   - исключить удаление элементов по номерам\nask each            - запрашивать подтверждение на удаление каждого элемента (как «rm -i»)\nquit                - прекратить очистку\nhelp                - этот экран\n?                   - справка по выделению"
+msgstr ""
+"clean               - начать очистку\n"
+"filter by pattern   - исключить удаление элементов\n"
+"select by numbers   - исключить удаление элементов по номерам\n"
+"ask each            - запрашивать подтверждение на удаление каждого элемента "
+"(как «rm -i»)\n"
+"quit                - прекратить очистку\n"
+"help                - этот экран\n"
+"?                   - справка по выделению"
 
-#: builtin/clean.c:825
 msgid "Would remove the following item:"
 msgid_plural "Would remove the following items:"
 msgstr[0] "Удалить следующие элементы:"
@@ -11488,641 +3898,529 @@ msgstr[1] "Удалить следующие элементы:"
 msgstr[2] "Удалить следующие элементы:"
 msgstr[3] "Удалить следующие элементы:"
 
-#: builtin/clean.c:841
 msgid "No more files to clean, exiting."
 msgstr "Больше нет файлов для очистки, выходим."
 
-#: builtin/clean.c:903
 msgid "do not print names of files removed"
 msgstr "не выводить имена удаляемых файлов"
 
-#: builtin/clean.c:905
 msgid "force"
 msgstr "принудительно"
 
-#: builtin/clean.c:906
 msgid "interactive cleaning"
 msgstr "интерактивная очистка"
 
-#: builtin/clean.c:908
 msgid "remove whole directories"
 msgstr "удалить каталоги полностью"
 
-#: builtin/clean.c:909 builtin/describe.c:565 builtin/describe.c:567
-#: builtin/grep.c:921 builtin/log.c:183 builtin/log.c:185
-#: builtin/ls-files.c:558 builtin/name-rev.c:526 builtin/name-rev.c:528
-#: builtin/show-ref.c:179
 msgid "pattern"
 msgstr "шаблон"
 
-#: builtin/clean.c:910
 msgid "add <pattern> to ignore rules"
 msgstr "добавить <шаблон> в правила игнорирования"
 
-#: builtin/clean.c:911
 msgid "remove ignored files, too"
 msgstr "также удалить игнорируемые файлы"
 
-#: builtin/clean.c:913
 msgid "remove only ignored files"
 msgstr "удалить только игнорируемые файлы"
 
-#: builtin/clean.c:929
 msgid ""
-"clean.requireForce set to true and neither -i, -n, nor -f given; refusing to"
-" clean"
-msgstr "clean.requireForce установлен как true и ни одна из опций -i, -n или -f не указана; отказ очистки"
+"clean.requireForce set to true and neither -i, -n, nor -f given; refusing to "
+"clean"
+msgstr ""
+"clean.requireForce установлен как true и ни одна из опций -i, -n или -f не "
+"указана; отказ очистки"
 
-#: builtin/clean.c:932
 msgid ""
 "clean.requireForce defaults to true and neither -i, -n, nor -f given; "
 "refusing to clean"
-msgstr "clean.requireForce установлен по умолчанию как true и ни одна из опций -i, -n или -f не указана; отказ очистки"
+msgstr ""
+"clean.requireForce установлен по умолчанию как true и ни одна из опций -i, -"
+"n или -f не указана; отказ очистки"
 
-#: builtin/clean.c:944
 msgid "-x and -X cannot be used together"
 msgstr "нельзя использовать одновременно -x и -X"
 
-#: builtin/clone.c:45
 msgid "git clone [<options>] [--] <repo> [<dir>]"
 msgstr "git clone [<опции>] [--] <репозиторий> [<каталог>]"
 
-#: builtin/clone.c:94
+msgid "don't clone shallow repository"
+msgstr ""
+
 msgid "don't create a checkout"
 msgstr "не переключать рабочую копию на HEAD"
 
-#: builtin/clone.c:95 builtin/clone.c:97 builtin/init-db.c:555
 msgid "create a bare repository"
 msgstr "создать голый репозиторий"
 
-#: builtin/clone.c:99
 msgid "create a mirror repository (implies bare)"
 msgstr "создать зеркало репозитория (включает в себя и параметр bare)"
 
-#: builtin/clone.c:101
 msgid "to clone from a local repository"
 msgstr "для клонирования из локального репозитория"
 
-#: builtin/clone.c:103
 msgid "don't use local hardlinks, always copy"
 msgstr "не использовать жесткие ссылки, всегда копировать файлы"
 
-#: builtin/clone.c:105
 msgid "setup as shared repository"
 msgstr "настроить как общедоступный репозиторий"
 
-#: builtin/clone.c:107
 msgid "pathspec"
 msgstr "спецификатор-пути"
 
-#: builtin/clone.c:107
 msgid "initialize submodules in the clone"
 msgstr "инициализировать подмодули в клоне"
 
-#: builtin/clone.c:111
 msgid "number of submodules cloned in parallel"
 msgstr "количество подмодулей, которые будут клонированы парралельно"
 
-#: builtin/clone.c:112 builtin/init-db.c:552
 msgid "template-directory"
 msgstr "каталог-шаблонов"
 
-#: builtin/clone.c:113 builtin/init-db.c:553
 msgid "directory from which templates will be used"
 msgstr "каталог, шаблоны из которого будут использованы"
 
-#: builtin/clone.c:115 builtin/clone.c:117 builtin/submodule--helper.c:1831
-#: builtin/submodule--helper.c:2336
 msgid "reference repository"
 msgstr "ссылаемый репозиторий"
 
-#: builtin/clone.c:119 builtin/submodule--helper.c:1833
-#: builtin/submodule--helper.c:2338
 msgid "use --reference only while cloning"
 msgstr "используйте --reference только при клонировании"
 
-#: builtin/clone.c:120 builtin/column.c:27 builtin/init-db.c:563
-#: builtin/merge-file.c:46 builtin/pack-objects.c:3546 builtin/repack.c:358
 msgid "name"
 msgstr "имя"
 
-#: builtin/clone.c:121
 msgid "use <name> instead of 'origin' to track upstream"
-msgstr "использовать <имя> вместо «origin» для отслеживания вышестоящего репозитория"
+msgstr ""
+"использовать <имя> вместо «origin» для отслеживания вышестоящего репозитория"
 
-#: builtin/clone.c:123
 msgid "checkout <branch> instead of the remote's HEAD"
 msgstr "переключиться на <ветку>, вместо HEAD внешнего репозитория"
 
-#: builtin/clone.c:125
 msgid "path to git-upload-pack on the remote"
 msgstr "путь к git-upload-pack на внешнем репозитории"
 
-#: builtin/clone.c:126 builtin/fetch.c:173 builtin/grep.c:860
-#: builtin/pull.c:208
 msgid "depth"
 msgstr "глубина"
 
-#: builtin/clone.c:127
 msgid "create a shallow clone of that depth"
 msgstr "сделать частичный клон указанной глубины"
 
-#: builtin/clone.c:128 builtin/fetch.c:175 builtin/pack-objects.c:3535
-#: builtin/pull.c:211
 msgid "time"
 msgstr "время"
 
-#: builtin/clone.c:129
 msgid "create a shallow clone since a specific time"
 msgstr "сделать частичный клон до определенного времени"
 
-#: builtin/clone.c:130 builtin/fetch.c:177 builtin/fetch.c:200
-#: builtin/pull.c:214 builtin/pull.c:239 builtin/rebase.c:1317
 msgid "revision"
 msgstr "редакция"
 
-#: builtin/clone.c:131 builtin/fetch.c:178 builtin/pull.c:215
 msgid "deepen history of shallow clone, excluding rev"
 msgstr "углубить историю частичного клона исключая редакцию"
 
-#: builtin/clone.c:133 builtin/submodule--helper.c:1843
-#: builtin/submodule--helper.c:2352
 msgid "clone only one branch, HEAD or --branch"
 msgstr "клонировать только одну ветку, HEAD или --branch"
 
-#: builtin/clone.c:135
 msgid "don't clone any tags, and make later fetches not to follow them"
-msgstr "не клонировать метки, а также настроить, чтобы не клонировались и в дальнейшем"
+msgstr ""
+"не клонировать метки, а также настроить, чтобы не клонировались и в "
+"дальнейшем"
 
-#: builtin/clone.c:137
 msgid "any cloned submodules will be shallow"
 msgstr "все склонированные подмодули будут частичными клонами"
 
-#: builtin/clone.c:138 builtin/init-db.c:561
 msgid "gitdir"
 msgstr "каталог-git"
 
-#: builtin/clone.c:139 builtin/init-db.c:562
 msgid "separate git dir from working tree"
 msgstr "разместить каталог git отдельно от рабочей копии"
 
-#: builtin/clone.c:140
 msgid "key=value"
 msgstr "ключ=значение"
 
-#: builtin/clone.c:141
 msgid "set config inside the new repository"
 msgstr "установить параметры внутри нового репозитория"
 
-#: builtin/clone.c:143 builtin/fetch.c:195 builtin/ls-remote.c:76
-#: builtin/pull.c:230 builtin/push.c:584 builtin/send-pack.c:196
 msgid "server-specific"
 msgstr "зависит-от-сервера"
 
-#: builtin/clone.c:143 builtin/fetch.c:195 builtin/ls-remote.c:76
-#: builtin/pull.c:231 builtin/push.c:584 builtin/send-pack.c:197
 msgid "option to transmit"
 msgstr "передаваемые опции"
 
-#: builtin/clone.c:144 builtin/fetch.c:196 builtin/pull.c:234
-#: builtin/push.c:585
 msgid "use IPv4 addresses only"
 msgstr "использовать только IPv4 адреса"
 
-#: builtin/clone.c:146 builtin/fetch.c:198 builtin/pull.c:237
-#: builtin/push.c:587
 msgid "use IPv6 addresses only"
 msgstr "использовать только IPv6 адреса"
 
-#: builtin/clone.c:150
+msgid "apply partial clone filters to submodules"
+msgstr ""
+
 msgid "any cloned submodules will use their remote-tracking branch"
 msgstr ""
 
-#: builtin/clone.c:152
 msgid "initialize sparse-checkout file to include only files at root"
 msgstr ""
 
-#: builtin/clone.c:288
-msgid ""
-"No directory name could be guessed.\n"
-"Please specify a directory on the command line"
-msgstr "Имя каталога не может быть угадано.\nУкажите имя каталога с помощью параметра командной строки"
-
-#: builtin/clone.c:341
 #, c-format
 msgid "info: Could not add alternate for '%s': %s\n"
 msgstr "информация: Не удалось добавить альтернативу для «%s»: %s\n"
 
-#: builtin/clone.c:414
+#, c-format
+msgid "failed to stat '%s'"
+msgstr "не удалось выполнить stat «%s»"
+
 #, c-format
 msgid "%s exists and is not a directory"
 msgstr "%s уже существует и не является каталогом"
 
-#: builtin/clone.c:432
 #, c-format
 msgid "failed to start iterator over '%s'"
 msgstr ""
 
-#: builtin/clone.c:463
+#, c-format
+msgid "failed to unlink '%s'"
+msgstr "сбой отсоединения «%s»"
+
 #, c-format
 msgid "failed to create link '%s'"
 msgstr "не удалось создать ссылку «%s»"
 
-#: builtin/clone.c:467
 #, c-format
 msgid "failed to copy file to '%s'"
 msgstr "не удалось копировать файл в «%s»"
 
-#: builtin/clone.c:472
 #, c-format
 msgid "failed to iterate over '%s'"
 msgstr ""
 
-#: builtin/clone.c:499
 #, c-format
 msgid "done.\n"
 msgstr "готово.\n"
 
-#: builtin/clone.c:513
 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 "Клонирование прошло успешно, но во время переключения на состояние произошла ошибка.\nС помощь команды «git status» вы можете просмотреть какие файлы были обновлены,\nа повторить попытку перехода на версию можно с помощью «git restore --source=HEAD :/»\n"
+msgstr ""
+"Клонирование прошло успешно, но во время переключения на состояние произошла "
+"ошибка.\n"
+"С помощь команды «git status» вы можете просмотреть какие файлы были "
+"обновлены,\n"
+"а повторить попытку перехода на версию можно с помощью «git restore --"
+"source=HEAD :/»\n"
 
-#: builtin/clone.c:590
 #, c-format
 msgid "Could not find remote branch %s to clone."
 msgstr "Не удалось найти внешнюю ветку %s для клонирования."
 
-#: builtin/clone.c:709
+msgid "remote did not send all necessary objects"
+msgstr "внешний репозиторий прислал не все необходимые объекты"
+
 #, c-format
 msgid "unable to update %s"
 msgstr "не удалось обновить %s"
 
-#: builtin/clone.c:757
 msgid "failed to initialize sparse-checkout"
 msgstr ""
 
-#: builtin/clone.c:780
 msgid "remote HEAD refers to nonexistent ref, unable to checkout.\n"
-msgstr "внешний HEAD ссылается на несуществующую ссылку, нельзя переключиться на такое состояние.\n"
+msgstr ""
+"внешний HEAD ссылается на несуществующую ссылку, нельзя переключиться на "
+"такое состояние.\n"
 
-#: builtin/clone.c:812
 msgid "unable to checkout working tree"
 msgstr "не удалось переключиться на версию в рабочем каталоге"
 
-#: builtin/clone.c:887
 msgid "unable to write parameters to config file"
 msgstr "не удалось записать параметры в файл конфигурации"
 
-#: builtin/clone.c:950
 msgid "cannot repack to clean up"
 msgstr "не удалось выполнить перепаковку для очистки"
 
-#: builtin/clone.c:952
 msgid "cannot unlink temporary alternates file"
 msgstr "не удалось отсоединить временные альтернативные файлы"
 
-#: builtin/clone.c:992 builtin/receive-pack.c:2493
 msgid "Too many arguments."
 msgstr "Слишком много аргументов."
 
-#: builtin/clone.c:996
 msgid "You must specify a repository to clone."
 msgstr "Вы должны указать репозиторий для клонирования."
 
-#: builtin/clone.c:1009
 #, c-format
-msgid "--bare and --origin %s options are incompatible."
-msgstr "--bare и --origin %s нельзя использовать одновременно."
-
-#: builtin/clone.c:1012
-msgid "--bare and --separate-git-dir are incompatible."
-msgstr "--bare и --separate-git-dir нельзя использовать одновременно."
+msgid "options '%s' and '%s %s' cannot be used together"
+msgstr ""
 
-#: builtin/clone.c:1025
 #, c-format
 msgid "repository '%s' does not exist"
 msgstr "репозиторий «%s» не существует"
 
-#: builtin/clone.c:1029 builtin/fetch.c:1841
 #, c-format
 msgid "depth %s is not a positive number"
 msgstr "глубина %s не является положительным числом"
 
-#: builtin/clone.c:1039
 #, c-format
 msgid "destination path '%s' already exists and is not an empty directory."
 msgstr "целевой путь «%s» уже существует и не является пустым каталогом."
 
-#: builtin/clone.c:1045
 #, c-format
 msgid "repository path '%s' already exists and is not an empty directory."
 msgstr ""
 
-#: builtin/clone.c:1059
 #, c-format
 msgid "working tree '%s' already exists."
 msgstr "рабочий каталог «%s» уже существует."
 
-#: builtin/clone.c:1074 builtin/clone.c:1095 builtin/difftool.c:271
-#: builtin/log.c:1987 builtin/worktree.c:354 builtin/worktree.c:386
 #, c-format
 msgid "could not create leading directories of '%s'"
 msgstr "не удалось создать родительские каталоги для «%s»"
 
-#: builtin/clone.c:1079
 #, c-format
 msgid "could not create work tree dir '%s'"
 msgstr "не удалось создать рабочий каталог «%s»"
 
-#: builtin/clone.c:1099
 #, c-format
 msgid "Cloning into bare repository '%s'...\n"
-msgstr "Клонирование в голый репозиторий «%s»…\n"
+msgstr "Клонирование в голый репозиторий «%s»...\n"
 
-#: builtin/clone.c:1101
 #, c-format
 msgid "Cloning into '%s'...\n"
-msgstr "Клонирование в «%s»…\n"
+msgstr "Клонирование в «%s»...\n"
 
-#: builtin/clone.c:1125
 msgid ""
-"clone --recursive is not compatible with both --reference and --reference-"
-"if-able"
-msgstr "клонирование с параметром --recursive нельзя использовать одновременно ни с --reference, ни с --reference-if-able"
+"clone --recursive is not compatible with both --reference and --reference-if-"
+"able"
+msgstr ""
+"клонирование с параметром --recursive нельзя использовать одновременно ни с "
+"--reference, ни с --reference-if-able"
 
-#: builtin/clone.c:1169 builtin/remote.c:200 builtin/remote.c:705
 #, c-format
 msgid "'%s' is not a valid remote name"
 msgstr "«%s» не является допустимым именем внешнего репозитория."
 
-#: builtin/clone.c:1210
 msgid "--depth is ignored in local clones; use file:// instead."
-msgstr "--depth игнорируется на локальных клонах; вместо этого используйте file://."
+msgstr ""
+"--depth игнорируется на локальных клонах; вместо этого используйте file://."
 
-#: builtin/clone.c:1212
 msgid "--shallow-since is ignored in local clones; use file:// instead."
-msgstr "--shallow-since игнорируется на локальных клонах; используйте file:// вместо этого."
+msgstr ""
+"--shallow-since игнорируется на локальных клонах; используйте file:// вместо "
+"этого."
 
-#: builtin/clone.c:1214
 msgid "--shallow-exclude is ignored in local clones; use file:// instead."
-msgstr "--shallow-exclude игнорируется на локальных клонах; используйте file:// вместо этого."
+msgstr ""
+"--shallow-exclude игнорируется на локальных клонах; используйте file:// "
+"вместо этого."
 
-#: builtin/clone.c:1216
 msgid "--filter is ignored in local clones; use file:// instead."
 msgstr ""
 
-#: builtin/clone.c:1219
+msgid "source repository is shallow, reject to clone."
+msgstr ""
+
 msgid "source repository is shallow, ignoring --local"
 msgstr "исходный репозиторий является частичным, --local игнорируется"
 
-#: builtin/clone.c:1224
 msgid "--local is ignored"
 msgstr "--local игнорируется"
 
-#: builtin/clone.c:1311 builtin/clone.c:1319
+msgid "cannot clone from filtered bundle"
+msgstr ""
+
+msgid "remote transport reported error"
+msgstr ""
+
 #, c-format
 msgid "Remote branch %s not found in upstream %s"
 msgstr "Внешняя ветка %s не найдена в вышестоящем репозитории %s"
 
-#: builtin/clone.c:1322
 msgid "You appear to have cloned an empty repository."
 msgstr "Похоже, что вы клонировали пустой репозиторий."
 
-#: builtin/column.c:10
 msgid "git column [<options>]"
 msgstr "git column [<опции>]"
 
-#: builtin/column.c:27
 msgid "lookup config vars"
 msgstr "запросить переменные конфигурации"
 
-#: builtin/column.c:28 builtin/column.c:29
 msgid "layout to use"
 msgstr "использовать схему расположения"
 
-#: builtin/column.c:30
-msgid "Maximum width"
-msgstr "Максимальная ширина"
+msgid "maximum width"
+msgstr ""
 
-#: builtin/column.c:31
-msgid "Padding space on left border"
-msgstr "Расстояние отступа слева"
+msgid "padding space on left border"
+msgstr ""
 
-#: builtin/column.c:32
-msgid "Padding space on right border"
-msgstr "Расстояние отступа справа"
+msgid "padding space on right border"
+msgstr ""
 
-#: builtin/column.c:33
-msgid "Padding space between columns"
-msgstr "Расстояние отступа между колонками"
+msgid "padding space between columns"
+msgstr ""
 
-#: builtin/column.c:51
 msgid "--command must be the first argument"
 msgstr "параметр --command должен быть первым"
 
-#: builtin/commit-graph.c:13 builtin/commit-graph.c:22
 msgid ""
-"git commit-graph verify [--object-dir <objdir>] [--shallow] "
-"[--[no-]progress]"
+"git commit-graph verify [--object-dir <objdir>] [--shallow] [--[no-]progress]"
 msgstr ""
 
-#: builtin/commit-graph.c:14 builtin/commit-graph.c:27
 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 ""
 
-#: 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:184 builtin/log.c:1769
 msgid "dir"
 msgstr "каталог"
 
-#: builtin/commit-graph.c:81 builtin/commit-graph.c:211
-#: builtin/commit-graph.c:317
-msgid "The object directory to store the graph"
-msgstr "Каталог объектов для сохранения графа"
+msgid "the object directory to store the graph"
+msgstr ""
 
-#: builtin/commit-graph.c:83
 msgid "if the commit-graph is split, only verify the tip file"
 msgstr ""
 
-#: builtin/commit-graph.c:106
 #, c-format
 msgid "Could not open commit-graph '%s'"
 msgstr "Не удалось открыть файл commit-graph «%s»"
 
-#: builtin/commit-graph.c:142
 #, c-format
 msgid "unrecognized --split argument, %s"
 msgstr ""
 
-#: builtin/commit-graph.c:155
 #, c-format
 msgid "unexpected non-hex object ID: %s"
 msgstr ""
 
-#: builtin/commit-graph.c:160
 #, c-format
 msgid "invalid object: %s"
 msgstr ""
 
-#: builtin/commit-graph.c:213
+#, c-format
+msgid "option `%s' expects a numerical value"
+msgstr ""
+
 msgid "start walk at all refs"
 msgstr "начать со всех ссылок"
 
-#: builtin/commit-graph.c:215
 msgid "scan pack-indexes listed by stdin for commits"
 msgstr "искать коммиты в pack-indexes, перечисленных на стандартном вводе"
 
-#: builtin/commit-graph.c:217
 msgid "start walk at commits listed by stdin"
 msgstr "начать с коммитов, перечисленных на стандартном вводе"
 
-#: builtin/commit-graph.c:219
 msgid "include all commits already in the commit-graph file"
 msgstr "включить все коммиты, которые уже есть в файле commit-graph"
 
-#: builtin/commit-graph.c:221
 msgid "enable computation for changed paths"
 msgstr ""
 
-#: builtin/commit-graph.c:224
 msgid "allow writing an incremental commit-graph file"
 msgstr ""
 
-#: builtin/commit-graph.c:228
 msgid "maximum number of commits in a non-base split commit-graph"
 msgstr ""
 
-#: builtin/commit-graph.c:230
 msgid "maximum ratio between two levels of a split commit-graph"
 msgstr ""
 
-#: builtin/commit-graph.c:232
 msgid "only expire files older than a given date-time"
 msgstr ""
 
-#: builtin/commit-graph.c:234
 msgid "maximum number of changed-path Bloom filters to compute"
 msgstr ""
 
-#: builtin/commit-graph.c:255
 msgid "use at most one of --reachable, --stdin-commits, or --stdin-packs"
-msgstr "используйте что-то одно из --reachable, --stdin-commits и --stdin-packs"
+msgstr ""
+"используйте что-то одно из --reachable, --stdin-commits и --stdin-packs"
 
-#: builtin/commit-graph.c:287
 msgid "Collecting commits from input"
 msgstr ""
 
-#: builtin/commit-tree.c:18
+#, c-format
+msgid "unrecognized subcommand: %s"
+msgstr ""
+
 msgid ""
 "git commit-tree [(-p <parent>)...] [-S[<keyid>]] [(-m <message>)...] [(-F "
 "<file>)...] <tree>"
 msgstr ""
 
-#: builtin/commit-tree.c:31
 #, c-format
 msgid "duplicate parent %s ignored"
 msgstr ""
 
-#: builtin/commit-tree.c:56 builtin/commit-tree.c:136 builtin/log.c:555
 #, 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 "git commit-tree: сбой при открытии «%s»"
-
-#: builtin/commit-tree.c:96
 #, c-format
 msgid "git commit-tree: failed to read '%s'"
 msgstr "git commit-tree: сбой при чтении «%s»"
 
-#: builtin/commit-tree.c:98
 #, c-format
 msgid "git commit-tree: failed to close '%s'"
 msgstr "git commit-tree: сбой при закрытии «%s»"
 
-#: builtin/commit-tree.c:111
 msgid "parent"
 msgstr ""
 
-#: builtin/commit-tree.c:112
 msgid "id of a parent commit object"
 msgstr ""
 
-#: builtin/commit-tree.c:114 builtin/commit.c:1504 builtin/merge.c:281
-#: builtin/notes.c:409 builtin/notes.c:575 builtin/stash.c:1470
-#: builtin/tag.c:413
 msgid "message"
 msgstr "сообщение"
 
-#: builtin/commit-tree.c:115 builtin/commit.c:1504
 msgid "commit message"
 msgstr "сообщение коммита"
 
-#: builtin/commit-tree.c:118
 msgid "read commit log message from file"
 msgstr "прочитать сообщение коммита из файла"
 
-#: builtin/commit-tree.c:121 builtin/commit.c:1516 builtin/merge.c:298
-#: builtin/pull.c:176 builtin/revert.c:118
 msgid "GPG sign commit"
 msgstr "подписать коммит с помощью GPG"
 
-#: builtin/commit-tree.c:133
 msgid "must give exactly one tree"
 msgstr "необходимо указать одно дерево"
 
-#: builtin/commit-tree.c:140
 msgid "git commit-tree: failed to read"
 msgstr "git commit-tree: сбой при чтении"
 
-#: builtin/commit.c:41
 msgid "git commit [<options>] [--] <pathspec>..."
-msgstr "git commit [<опции>] [--] <спецификатор-пути>…"
+msgstr "git commit [<опции>] [--] <спецификатор-пути>..."
 
-#: builtin/commit.c:46
 msgid "git status [<options>] [--] <pathspec>..."
-msgstr "git status [<опции>] [--] <спецификатор-пути>…"
+msgstr "git status [<опции>] [--] <спецификатор-пути>..."
 
-#: builtin/commit.c:51
 msgid ""
 "You asked to amend the most recent commit, but doing so would make\n"
 "it empty. You can repeat your command with --allow-empty, or you can\n"
 "remove the commit entirely with \"git reset HEAD^\".\n"
-msgstr "Вы попросили исправить последний коммит, но делая это вы сделаете\nпустой коммит. Вы можете повторить эту команду с опцией --allow-empty\nили вы можете удалить коммит полностью с помощью команды \n«git reset HEAD^».\n"
+msgstr ""
+"Вы попросили исправить последний коммит, но делая это вы сделаете\n"
+"пустой коммит. Вы можете повторить эту команду с опцией --allow-empty\n"
+"или вы можете удалить коммит полностью с помощью команды \n"
+"«git reset HEAD^».\n"
 
-#: builtin/commit.c:56
 msgid ""
 "The previous cherry-pick is now empty, possibly due to conflict resolution.\n"
 "If you wish to commit it anyway, use:\n"
 "\n"
 "    git commit --allow-empty\n"
 "\n"
-msgstr "Копируемый коммит теперь пуст, возможно после разрешения конфликтов.\nЕсли вы все равно хотите сделать пустой коммит, используйте:\n\n    git commit --allow-empty\n\n"
+msgstr ""
+"Копируемый коммит теперь пуст, возможно после разрешения конфликтов.\n"
+"Если вы все равно хотите сделать пустой коммит, используйте:\n"
+"\n"
+"    git commit --allow-empty\n"
+"\n"
 
-#: builtin/commit.c:63
 msgid "Otherwise, please use 'git rebase --skip'\n"
 msgstr "В противном случае, используйте «git rebase --skip»\n"
 
-#: builtin/commit.c:66
 msgid "Otherwise, please use 'git cherry-pick --skip'\n"
 msgstr ""
 
-#: builtin/commit.c:69
 msgid ""
 "and then use:\n"
 "\n"
@@ -12135,677 +4433,596 @@ msgid ""
 "\n"
 msgstr ""
 
-#: builtin/commit.c:312
 msgid "failed to unpack HEAD tree object"
 msgstr "сбой распаковки объекта дерева HEAD"
 
-#: builtin/commit.c:348
-msgid "--pathspec-from-file with -a does not make sense"
-msgstr ""
-
-#: builtin/commit.c:361
 msgid "No paths with --include/--only does not make sense."
 msgstr "Указание путей каталогов с опциями --include/--only не имеет смысла."
 
-#: builtin/commit.c:373
 msgid "unable to create temporary index"
 msgstr "не удалось создать временный индекс"
 
-#: builtin/commit.c:382
 msgid "interactive add failed"
 msgstr "сбой интерактивного добавления"
 
-#: builtin/commit.c:397
 msgid "unable to update temporary index"
 msgstr "не удалось обновить временный индекс"
 
-#: builtin/commit.c:399
 msgid "Failed to update main cache tree"
 msgstr "Сбой при обновлении основного кэша дерева"
 
-#: builtin/commit.c:424 builtin/commit.c:447 builtin/commit.c:495
 msgid "unable to write new_index file"
 msgstr "не удалось записать файл new_index"
 
-#: builtin/commit.c:476
 msgid "cannot do a partial commit during a merge."
 msgstr "нельзя создать частичный коммит во время слияния."
 
-#: builtin/commit.c:478
 msgid "cannot do a partial commit during a cherry-pick."
 msgstr "нельзя создать частичный коммит во время копирования коммита."
 
-#: builtin/commit.c:480
 msgid "cannot do a partial commit during a rebase."
 msgstr ""
 
-#: builtin/commit.c:488
 msgid "cannot read the index"
 msgstr "не удалось прочитать индекс"
 
-#: builtin/commit.c:507
 msgid "unable to write temporary index file"
 msgstr "не удалось записать временный файл индекса"
 
-#: builtin/commit.c:605
 #, c-format
 msgid "commit '%s' lacks author header"
 msgstr "у коммита «%s» отсутствует автор в заголовке"
 
-#: builtin/commit.c:607
 #, c-format
 msgid "commit '%s' has malformed author line"
 msgstr "у коммита «%s» строка автора в неправильном формате"
 
-#: builtin/commit.c:626
 msgid "malformed --author parameter"
 msgstr "параметр --author в неправильном формате"
 
-#: builtin/commit.c:679
+#, c-format
+msgid "invalid date format: %s"
+msgstr "неправильный формат даты: %s"
+
 msgid ""
 "unable to select a comment character that is not used\n"
 "in the current commit message"
-msgstr "нельзя выбрать символ комментария, который\nне используется в текущем сообщении коммита"
+msgstr ""
+"нельзя выбрать символ комментария, который\n"
+"не используется в текущем сообщении коммита"
 
-#: builtin/commit.c:717 builtin/commit.c:750 builtin/commit.c:1097
 #, c-format
 msgid "could not lookup commit %s"
 msgstr "не удалось запросить коммит %s"
 
-#: builtin/commit.c:729 builtin/shortlog.c:425
 #, c-format
 msgid "(reading log message from standard input)\n"
 msgstr "(чтение файла журнала из стандартного ввода)\n"
 
-#: builtin/commit.c:731
 msgid "could not read log from standard input"
 msgstr "не удалось прочитать файл журнала из стандартного ввода"
 
-#: builtin/commit.c:735
 #, c-format
 msgid "could not read log file '%s'"
 msgstr "не удалось прочитать файл журнала «%s»"
 
-#: builtin/commit.c:766 builtin/commit.c:782
+#, c-format
+msgid "options '%s' and '%s:%s' cannot be used together"
+msgstr ""
+
 msgid "could not read SQUASH_MSG"
 msgstr "не удалось прочитать SQUASH_MSG"
 
-#: builtin/commit.c:773
 msgid "could not read MERGE_MSG"
 msgstr "не удалось прочитать MERGE_MSG"
 
-#: builtin/commit.c:833
+#, c-format
+msgid "could not open '%s'"
+msgstr "не удалось открыть «%s»"
+
 msgid "could not write commit template"
 msgstr "не удалось записать шаблон описания коммита"
 
-#: builtin/commit.c:853
+#, c-format
 msgid ""
-"\n"
-"It looks like you may be committing a merge.\n"
-"If this is not correct, please run\n"
-"\tgit update-ref -d MERGE_HEAD\n"
-"and try again.\n"
+"Please enter the commit message for your changes. Lines starting\n"
+"with '%c' will be ignored.\n"
 msgstr ""
 
-#: builtin/commit.c:858
+#, c-format
 msgid ""
-"\n"
-"It looks like you may be committing a cherry-pick.\n"
-"If this is not correct, please run\n"
-"\tgit update-ref -d CHERRY_PICK_HEAD\n"
-"and try again.\n"
+"Please enter the commit message for your changes. Lines starting\n"
+"with '%c' will be ignored, and an empty message aborts the commit.\n"
 msgstr ""
+"Пожалуйста, введите сообщение коммита для ваших изменений. Строки,\n"
+"начинающиеся с «%c» будут проигнорированы, а пустое сообщение\n"
+"отменяет процесс коммита.\n"
 
-#: builtin/commit.c: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 "Пожалуйста, введите сообщение коммита для ваших изменений. Строки,\nначинающиеся с «%c» будут проигнорированы, а пустое сообщение\nотменяет процесс коммита.\n"
+"with '%c' will be kept; you may remove them yourself if you want to.\n"
+msgstr ""
 
-#: 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 "Пожалуйста, введите сообщение коммита для ваших изменений. Строки,\nначинающиеся с «%c» будут оставлены; вы можете удалить их вручную,\nесли хотите. Пустое сообщение отменяет процесс коммита.\n"
+msgstr ""
+"Пожалуйста, введите сообщение коммита для ваших изменений. Строки,\n"
+"начинающиеся с «%c» будут оставлены; вы можете удалить их вручную,\n"
+"если хотите. Пустое сообщение отменяет процесс коммита.\n"
+
+msgid ""
+"\n"
+"It looks like you may be committing a merge.\n"
+"If this is not correct, please run\n"
+"\tgit update-ref -d MERGE_HEAD\n"
+"and try again.\n"
+msgstr ""
+
+msgid ""
+"\n"
+"It looks like you may be committing a cherry-pick.\n"
+"If this is not correct, please run\n"
+"\tgit update-ref -d CHERRY_PICK_HEAD\n"
+"and try again.\n"
+msgstr ""
 
-#: builtin/commit.c:893
 #, c-format
 msgid "%sAuthor:    %.*s <%.*s>"
 msgstr "%sАвтор:     %.*s <%.*s>"
 
-#: builtin/commit.c:901
 #, c-format
 msgid "%sDate:      %s"
 msgstr "%sДата:      %s"
 
-#: builtin/commit.c:908
 #, c-format
 msgid "%sCommitter: %.*s <%.*s>"
 msgstr "%sКоммитер:  %.*s <%.*s>"
 
-#: builtin/commit.c:926
 msgid "Cannot read index"
 msgstr "Не удалось прочитать индекс"
 
-#: builtin/commit.c:997
+msgid "unable to pass trailers to --trailers"
+msgstr ""
+
 msgid "Error building trees"
 msgstr "Ошибка при построении деревьев"
 
-#: builtin/commit.c:1011 builtin/tag.c:276
 #, c-format
 msgid "Please supply the message using either -m or -F option.\n"
 msgstr "Пожалуйста, укажите сообщение, при указании опций -m или -F.\n"
 
-#: builtin/commit.c:1055
 #, c-format
 msgid "--author '%s' is not 'Name <email>' and matches no existing author"
-msgstr "--author «%s» не в формате «Имя <почта>» и не совпадает с существующим автором"
+msgstr ""
+"--author «%s» не в формате «Имя <почта>» и не совпадает с существующим "
+"автором"
 
-#: builtin/commit.c:1069
 #, c-format
 msgid "Invalid ignored mode '%s'"
 msgstr "Недопустимый режим показа игнорируемых файлов «%s»"
 
-#: builtin/commit.c:1087 builtin/commit.c:1331
 #, c-format
 msgid "Invalid untracked files mode '%s'"
 msgstr "Неправильный режим неотслеживаемых файлов «%s»"
 
-#: builtin/commit.c:1127
-msgid "--long and -z are incompatible"
-msgstr "--long и -z нельзя использовать одновременно"
+msgid "You are in the middle of a merge -- cannot reword."
+msgstr ""
+
+msgid "You are in the middle of a cherry-pick -- cannot reword."
+msgstr ""
 
-#: builtin/commit.c:1171
-msgid "Using both --reset-author and --author does not make sense"
-msgstr "Указание одновременно опций --reset-author и --author не имеет смысла"
+#, c-format
+msgid "reword option of '%s' and path '%s' cannot be used together"
+msgstr ""
+
+#, c-format
+msgid "reword option of '%s' and '%s' cannot be used together"
+msgstr ""
 
-#: builtin/commit.c:1180
 msgid "You have nothing to amend."
 msgstr "Нечего исправлять."
 
-#: builtin/commit.c:1183
 msgid "You are in the middle of a merge -- cannot amend."
 msgstr "Вы в процессе слияния —  сейчас нельзя исправлять."
 
-#: builtin/commit.c:1185
 msgid "You are in the middle of a cherry-pick -- cannot amend."
 msgstr "Вы в процессе копирования коммита —  сейчас нельзя исправлять."
 
-#: builtin/commit.c:1187
 msgid "You are in the middle of a rebase -- cannot amend."
 msgstr ""
 
-#: builtin/commit.c:1190
-msgid "Options --squash and --fixup cannot be used together"
-msgstr "Опции --squash и --fixup не могут использоваться одновременно"
-
-#: builtin/commit.c:1200
-msgid "Only one of -c/-C/-F/--fixup can be used."
-msgstr "Может использоваться только одна из опций -c/-C/-F/--fixup."
-
-#: builtin/commit.c:1202
-msgid "Option -m cannot be combined with -c/-C/-F."
-msgstr ""
-
-#: builtin/commit.c:1211
 msgid "--reset-author can be used only with -C, -c or --amend."
-msgstr "--reset-author может использоваться только одновременно с опциями -C, -c или --amend."
+msgstr ""
+"--reset-author может использоваться только одновременно с опциями -C, -c или "
+"--amend."
 
-#: builtin/commit.c:1229
-msgid "Only one of --include/--only/--all/--interactive/--patch can be used."
-msgstr "Может использоваться только одна из опций --include/--only/--all/--interactive/--patch."
+#, c-format
+msgid "unknown option: --fixup=%s:%s"
+msgstr ""
 
-#: builtin/commit.c:1235
 #, c-format
 msgid "paths '%s ...' with -a does not make sense"
 msgstr ""
 
-#: builtin/commit.c:1366 builtin/commit.c:1527
 msgid "show status concisely"
 msgstr "кратко показать статус"
 
-#: builtin/commit.c:1368 builtin/commit.c:1529
 msgid "show branch information"
 msgstr "показать информацию о версии"
 
-#: builtin/commit.c:1370
 msgid "show stash information"
 msgstr "показать информацию о спрятанном"
 
-#: builtin/commit.c:1372 builtin/commit.c:1531
 msgid "compute full ahead/behind values"
 msgstr ""
 
-#: builtin/commit.c:1374
 msgid "version"
 msgstr "версия"
 
-#: builtin/commit.c:1374 builtin/commit.c:1533 builtin/push.c:560
-#: builtin/worktree.c:725
 msgid "machine-readable output"
 msgstr "машиночитаемый вывод"
 
-#: builtin/commit.c:1377 builtin/commit.c:1535
 msgid "show status in long format (default)"
 msgstr "показать статус в длинном формате (по умолчанию)"
 
-#: builtin/commit.c:1380 builtin/commit.c:1538
 msgid "terminate entries with NUL"
 msgstr "завершать записи НУЛЕВЫМ байтом"
 
-#: 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:1406 parse-options.h:336
 msgid "mode"
 msgstr "режим"
 
-#: builtin/commit.c:1383 builtin/commit.c:1541
 msgid "show untracked files, optional modes: all, normal, no. (Default: all)"
-msgstr "показать неотслеживаемые файлы, опциональные режимы: all (все), normal (как обычно), no (нет). (По умолчанию: all)"
+msgstr ""
+"показать неотслеживаемые файлы, опциональные режимы: all (все), normal (как "
+"обычно), no (нет). (По умолчанию: all)"
 
-#: builtin/commit.c:1387
 msgid ""
 "show ignored files, optional modes: traditional, matching, no. (Default: "
 "traditional)"
-msgstr "показывать игнорируемые файлы, с опциональным режимом: traditional (традиционный), matching (только совпадающие), no (не показывать). (По умолчанию: traditional)"
+msgstr ""
+"показывать игнорируемые файлы, с опциональным режимом: traditional "
+"(традиционный), matching (только совпадающие), no (не показывать). (По "
+"умолчанию: traditional)"
 
-#: builtin/commit.c:1389 parse-options.h:192
 msgid "when"
 msgstr "когда"
 
-#: builtin/commit.c:1390
 msgid ""
 "ignore changes to submodules, optional when: all, dirty, untracked. "
 "(Default: all)"
-msgstr "игнорировать изменения в подмодулях, опционально когда: all (всегда), dirty (изменённые), untracked (неотслеживаемые). (По умолчанию: all)"
+msgstr ""
+"игнорировать изменения в подмодулях, опционально когда: all (всегда), dirty "
+"(изменённые), untracked (неотслеживаемые). (По умолчанию: all)"
 
-#: builtin/commit.c:1392
 msgid "list untracked files in columns"
 msgstr "показать неотслеживаемые файлы по столбцам"
 
-#: builtin/commit.c:1393
 msgid "do not detect renames"
 msgstr "не определять переименования"
 
-#: builtin/commit.c:1395
 msgid "detect renames, optionally set similarity index"
 msgstr "определять переименования, опционально устанавливать рейтинг сходства"
 
-#: builtin/commit.c:1415
 msgid "Unsupported combination of ignored and untracked-files arguments"
-msgstr "Неподдерживаемая комбинация аргументов отображения игнорируемых и неотслеживаемых файлов"
+msgstr ""
+"Неподдерживаемая комбинация аргументов отображения игнорируемых и "
+"неотслеживаемых файлов"
 
-#: builtin/commit.c:1497
 msgid "suppress summary after successful commit"
 msgstr "не выводить сводку изменений после успешного коммита"
 
-#: builtin/commit.c:1498
 msgid "show diff in commit message template"
 msgstr "добавить список изменений в шаблон сообщения коммита"
 
-#: builtin/commit.c:1500
 msgid "Commit message options"
 msgstr "Опции сообщения коммита"
 
-#: builtin/commit.c:1501 builtin/merge.c:285 builtin/tag.c:415
 msgid "read message from file"
 msgstr "прочитать сообщение из файла"
 
-#: builtin/commit.c:1502
 msgid "author"
 msgstr "автор"
 
-#: builtin/commit.c:1502
 msgid "override author for commit"
 msgstr "подменить автора коммита"
 
-#: builtin/commit.c:1503 builtin/gc.c:542
 msgid "date"
 msgstr "дата"
 
-#: builtin/commit.c:1503
 msgid "override date for commit"
 msgstr "подменить дату коммита"
 
-#: builtin/commit.c:1505 builtin/commit.c:1506 builtin/commit.c:1507
-#: builtin/commit.c:1508 parse-options.h:328 ref-filter.h:87
 msgid "commit"
 msgstr "коммит"
 
-#: builtin/commit.c:1505
 msgid "reuse and edit message from specified commit"
 msgstr "использовать и отредактировать сообщение от указанного коммита"
 
-#: builtin/commit.c:1506
 msgid "reuse message from specified commit"
 msgstr "использовать сообщение указанного коммита"
 
-#: builtin/commit.c:1507
-msgid "use autosquash formatted message to fixup specified commit"
-msgstr "использовать форматированное сообщение автоуплотнения для исправления указанного коммита"
+#. TRANSLATORS: Leave "[(amend|reword):]" as-is,
+#. and only translate <commit>.
+#.
+msgid "[(amend|reword):]commit"
+msgstr ""
+
+msgid ""
+"use autosquash formatted message to fixup or amend/reword specified commit"
+msgstr ""
 
-#: builtin/commit.c:1508
 msgid "use autosquash formatted message to squash specified commit"
-msgstr "использовать форматированное сообщение автоуплотнения для уплотнения указанного коммита"
+msgstr ""
+"использовать форматированное сообщение автоуплотнения для уплотнения "
+"указанного коммита"
 
-#: builtin/commit.c:1509
 msgid "the commit is authored by me now (used with -C/-c/--amend)"
 msgstr "коммит теперь за моим авторством (используется с -C/-c/--amend)"
 
-#: builtin/commit.c:1510 builtin/log.c:1744 builtin/merge.c:301
-#: builtin/pull.c:145 builtin/revert.c:110
+msgid "trailer"
+msgstr "завершитель"
+
+msgid "add custom trailer(s)"
+msgstr ""
+
 msgid "add a Signed-off-by trailer"
 msgstr ""
 
-#: builtin/commit.c:1511
 msgid "use specified template file"
 msgstr "использовать указанный файл шаблона"
 
-#: builtin/commit.c:1512
 msgid "force edit of commit"
 msgstr "принудительно редактировать коммит"
 
-#: builtin/commit.c:1514
 msgid "include status in commit message template"
 msgstr "включить статус файлов в шаблон сообщения коммита"
 
-#: builtin/commit.c:1519
 msgid "Commit contents options"
 msgstr "Опции содержимого коммита"
 
-#: builtin/commit.c:1520
 msgid "commit all changed files"
 msgstr "закоммитить все измененные файлы"
 
-#: builtin/commit.c:1521
 msgid "add specified files to index for commit"
 msgstr "добавить указанные файлы в индекс для коммита"
 
-#: builtin/commit.c:1522
 msgid "interactively add files"
 msgstr "интерактивное добавление файлов"
 
-#: builtin/commit.c:1523
 msgid "interactively add changes"
 msgstr "интерактивное добавление изменений"
 
-#: builtin/commit.c:1524
 msgid "commit only specified files"
 msgstr "закоммитить только указанные файлы"
 
-#: builtin/commit.c:1525
 msgid "bypass pre-commit and commit-msg hooks"
 msgstr "пропустить перехватчик pre-commit и commit-msg"
 
-#: builtin/commit.c:1526
 msgid "show what would be committed"
 msgstr "показать, что будет закоммичено"
 
-#: builtin/commit.c:1539
 msgid "amend previous commit"
 msgstr "исправить предыдущий коммит"
 
-#: builtin/commit.c:1540
 msgid "bypass post-rewrite hook"
 msgstr "пропустить перехватчик post-rewrite"
 
-#: builtin/commit.c:1547
 msgid "ok to record an empty change"
 msgstr "разрешить запись пустого коммита"
 
-#: builtin/commit.c:1549
 msgid "ok to record a change with an empty message"
 msgstr "разрешить запись изменений с пустым сообщением"
 
-#: builtin/commit.c:1622
+msgid "could not parse HEAD commit"
+msgstr "не удалось разобрать HEAD коммит"
+
 #, c-format
 msgid "Corrupt MERGE_HEAD file (%s)"
 msgstr "Файл MERGE_HEAD поврежден (%s)"
 
-#: builtin/commit.c:1629
 msgid "could not read MERGE_MODE"
 msgstr "не удалось прочитать MERGE_MODE"
 
-#: builtin/commit.c:1650
 #, c-format
 msgid "could not read commit message: %s"
 msgstr "не удалось открыть сообщение коммита: %s"
 
-#: builtin/commit.c:1657
 #, c-format
 msgid "Aborting commit due to empty commit message.\n"
 msgstr "Отмена коммита из-за пустого сообщения коммита.\n"
 
-#: builtin/commit.c:1662
 #, c-format
 msgid "Aborting commit; you did not edit the message.\n"
 msgstr "Отмена коммита; вы не изменили сообщение.\n"
 
-#: builtin/commit.c:1696
+#, c-format
+msgid "Aborting commit due to empty commit message body.\n"
+msgstr ""
+
 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 "репозиторий был обновлен, но не удалось записать файл new_index. Удостоверьтесь, что на диске есть свободное место и квота не исчерпана, а после этого запустите «git restore --staged :/» для восстановления."
+msgstr ""
+"репозиторий был обновлен, но не удалось записать файл new_index. "
+"Удостоверьтесь, что на диске есть свободное место и квота не исчерпана, а "
+"после этого запустите «git restore --staged :/» для восстановления."
 
-#: builtin/config.c:11
 msgid "git config [<options>]"
 msgstr "git config [<опции>]"
 
-#: builtin/config.c:109 builtin/env--helper.c:27
 #, c-format
 msgid "unrecognized --type argument, %s"
 msgstr ""
 
-#: builtin/config.c:121
 msgid "only one type at a time"
 msgstr ""
 
-#: builtin/config.c:130
 msgid "Config file location"
 msgstr "Размещение файла конфигурации"
 
-#: builtin/config.c:131
 msgid "use global config file"
 msgstr "использовать глобальный файл конфигурации"
 
-#: builtin/config.c:132
 msgid "use system config file"
 msgstr "использовать системный файл конфигурации"
 
-#: builtin/config.c:133
 msgid "use repository config file"
 msgstr "использовать файл конфигурации репозитория"
 
-#: builtin/config.c:134
 msgid "use per-worktree config file"
 msgstr ""
 
-#: builtin/config.c:135
 msgid "use given config file"
 msgstr "использовать указанный файл конфигурации"
 
-#: builtin/config.c:136
 msgid "blob-id"
 msgstr "идент-двоичн-объекта"
 
-#: builtin/config.c:136
 msgid "read config from given blob object"
 msgstr "прочитать настройки из указанного двоичного объекта"
 
-#: builtin/config.c:137
 msgid "Action"
 msgstr "Действие"
 
-#: builtin/config.c:138
 msgid "get value: name [value-pattern]"
 msgstr ""
 
-#: builtin/config.c:139
 msgid "get all values: key [value-pattern]"
 msgstr ""
 
-#: builtin/config.c:140
 msgid "get values for regexp: name-regex [value-pattern]"
 msgstr ""
 
-#: builtin/config.c:141
 msgid "get value specific for the URL: section[.var] URL"
 msgstr "получить значение, специфичное для URL: раздел[.переменная] URL"
 
-#: builtin/config.c:142
 msgid "replace all matching variables: name value [value-pattern]"
 msgstr ""
 
-#: builtin/config.c:143
 msgid "add a new variable: name value"
 msgstr "добавить новую переменную: имя значение"
 
-#: builtin/config.c:144
 msgid "remove a variable: name [value-pattern]"
 msgstr ""
 
-#: builtin/config.c:145
 msgid "remove all matches: name [value-pattern]"
 msgstr ""
 
-#: builtin/config.c:146
 msgid "rename section: old-name new-name"
 msgstr "переименовать раздел: старое-имя новое-имя"
 
-#: builtin/config.c:147
 msgid "remove a section: name"
 msgstr "удалить раздел: имя"
 
-#: builtin/config.c:148
 msgid "list all"
 msgstr "показать весь список"
 
-#: builtin/config.c:149
 msgid "use string equality when comparing values to 'value-pattern'"
 msgstr ""
 
-#: builtin/config.c:150
 msgid "open an editor"
 msgstr "открыть в редакторе"
 
-#: builtin/config.c:151
 msgid "find the color configured: slot [default]"
 msgstr "найти настроенный цвет: раздел [по-умолчанию]"
 
-#: builtin/config.c:152
 msgid "find the color setting: slot [stdout-is-tty]"
 msgstr "проверить, существует ли настроенный цвет: раздел [stdout-есть-tty]"
 
-#: builtin/config.c:153
 msgid "Type"
 msgstr "Тип"
 
-#: builtin/config.c:154 builtin/env--helper.c:43
+msgid "type"
+msgstr "тип"
+
 msgid "value is given this type"
 msgstr ""
 
-#: builtin/config.c:155
 msgid "value is \"true\" or \"false\""
 msgstr "значение — это «true» (правда) или «false» (ложь)"
 
-#: builtin/config.c:156
 msgid "value is decimal number"
 msgstr "значение — это десятичное число"
 
-#: builtin/config.c:157
 msgid "value is --bool or --int"
 msgstr "значение — это --bool или --int"
 
-#: builtin/config.c:158
 msgid "value is --bool or string"
 msgstr ""
 
-#: builtin/config.c:159
 msgid "value is a path (file or directory name)"
 msgstr "значение — это путь (к файлу или каталогу)"
 
-#: builtin/config.c:160
 msgid "value is an expiry date"
 msgstr "значение - это дата окончания срока действия"
 
-#: builtin/config.c:161
 msgid "Other"
 msgstr "Другое"
 
-#: builtin/config.c:162
 msgid "terminate values with NUL byte"
 msgstr "завершать значения НУЛЕВЫМ байтом"
 
-#: builtin/config.c:163
 msgid "show variable names only"
 msgstr "показывать только имена переменных"
 
-#: builtin/config.c:164
 msgid "respect include directives on lookup"
 msgstr "учитывать директивы include (включения файлов) при запросе"
 
-#: builtin/config.c:165
 msgid "show origin of config (file, standard input, blob, command line)"
-msgstr "показать источник настройки (файл, стандартный ввод, двоичный объект, командная строка)"
+msgstr ""
+"показать источник настройки (файл, стандартный ввод, двоичный объект, "
+"командная строка)"
 
-#: builtin/config.c:166
 msgid "show scope of config (worktree, local, global, system, command)"
 msgstr ""
 
-#: builtin/config.c:167 builtin/env--helper.c:45
 msgid "value"
 msgstr ""
 
-#: builtin/config.c:167
 msgid "with --get, use default value when missing entry"
 msgstr ""
 
-#: builtin/config.c:181
 #, c-format
 msgid "wrong number of arguments, should be %d"
 msgstr ""
 
-#: builtin/config.c:183
 #, c-format
 msgid "wrong number of arguments, should be from %d to %d"
 msgstr ""
 
-#: builtin/config.c:339
 #, c-format
 msgid "invalid key pattern: %s"
 msgstr ""
 
-#: builtin/config.c:377
+#, c-format
+msgid "invalid pattern: %s"
+msgstr ""
+
 #, c-format
 msgid "failed to format default config value: %s"
 msgstr ""
 
-#: builtin/config.c:441
 #, c-format
 msgid "cannot parse color '%s'"
 msgstr ""
 
-#: builtin/config.c:483
 msgid "unable to parse default color value"
 msgstr "не удалось разобрать значение цвета по умолчанию"
 
-#: builtin/config.c:536 builtin/config.c:833
 msgid "not in a git directory"
 msgstr ""
 
-#: builtin/config.c:539
 msgid "writing to stdin is not supported"
 msgstr ""
 
-#: builtin/config.c:542
 msgid "writing config blobs is not supported"
 msgstr ""
 
-#: builtin/config.c:627
 #, c-format
 msgid ""
 "# This is Git's per-user configuration file.\n"
@@ -12813,1954 +5030,1750 @@ msgid ""
 "# Please adapt and uncomment the following lines:\n"
 "#\tname = %s\n"
 "#\temail = %s\n"
-msgstr "# Это файл конфигурации пользователя Git.\n[user]\n# Пожалуйста, адаптируйте и раскомментируйте следующие строки:\n#\tuser = %s\n#\temail = %s\n"
+msgstr ""
+"# Это файл конфигурации пользователя Git.\n"
+"[user]\n"
+"# Пожалуйста, адаптируйте и раскомментируйте следующие строки:\n"
+"#\tuser = %s\n"
+"#\temail = %s\n"
 
-#: builtin/config.c:652
 msgid "only one config file at a time"
 msgstr ""
 
-#: builtin/config.c:658
 msgid "--local can only be used inside a git repository"
 msgstr "--local можно использовать только внутри git репозитория"
 
-#: builtin/config.c:660
 msgid "--blob can only be used inside a git repository"
 msgstr ""
 
-#: builtin/config.c:662
 msgid "--worktree can only be used inside a git repository"
 msgstr ""
 
-#: builtin/config.c:684
 msgid "$HOME not set"
 msgstr ""
 
-#: builtin/config.c:708
 msgid ""
 "--worktree cannot be used with multiple working trees unless the config\n"
 "extension worktreeConfig is enabled. Please read \"CONFIGURATION FILE\"\n"
 "section in \"git help worktree\" for details"
 msgstr ""
 
-#: builtin/config.c:743
 msgid "--get-color and variable type are incoherent"
 msgstr ""
 
-#: builtin/config.c:748
 msgid "only one action at a time"
 msgstr ""
 
-#: builtin/config.c:761
 msgid "--name-only is only applicable to --list or --get-regexp"
 msgstr ""
 
-#: 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 ""
 
-#: builtin/config.c:773
 msgid "--default is only applicable to --get"
 msgstr ""
 
-#: builtin/config.c:806
 msgid "--fixed-value only applies with 'value-pattern'"
 msgstr ""
 
-#: builtin/config.c:822
 #, c-format
 msgid "unable to read config file '%s'"
 msgstr ""
 
-#: builtin/config.c:825
 msgid "error processing config file(s)"
 msgstr ""
 
-#: builtin/config.c:835
 msgid "editing stdin is not supported"
 msgstr ""
 
-#: builtin/config.c:837
 msgid "editing blobs is not supported"
 msgstr ""
 
-#: builtin/config.c:851
 #, c-format
 msgid "cannot create configuration file %s"
 msgstr "не удалось создать файл конфигурации %s"
 
-#: builtin/config.c:864
 #, c-format
 msgid ""
 "cannot overwrite multiple values with a single value\n"
 "       Use a regexp, --add or --replace-all to change %s."
-msgstr "нельзя перезаписать несколько значений одним\n       Используйте регулярные выражения, параметры --add или --replace-all, чтобы изменить %s."
+msgstr ""
+"нельзя перезаписать несколько значений одним\n"
+"       Используйте регулярные выражения, параметры --add или --replace-all, "
+"чтобы изменить %s."
 
-#: builtin/config.c:943 builtin/config.c:954
 #, c-format
 msgid "no such section: %s"
 msgstr ""
 
-#: builtin/count-objects.c:90
-msgid "git count-objects [-v] [-H | --human-readable]"
-msgstr "git count-objects [-v] [-H | --human-readable]"
-
-#: builtin/count-objects.c:100
 msgid "print sizes in human readable format"
 msgstr "вывод размеров в удобочитаемом для человека виде"
 
-#: builtin/credential-cache--daemon.c:226
 #, c-format
 msgid ""
 "The permissions on your socket directory are too loose; other\n"
 "users may be able to read your cached credentials. Consider running:\n"
 "\n"
 "\tchmod 0700 %s"
-msgstr "Права доступа к вашему каталогу сокетов слишком свободны; друге пользователи могуи читать ваши закэшированные пароли доступа. Обдумайте запуск команды:\n\n\tchmod 0700 %s"
+msgstr ""
+"Права доступа к вашему каталогу сокетов слишком свободны; друге пользователи "
+"могуи читать ваши закэшированные пароли доступа. Обдумайте запуск команды:\n"
+"\n"
+"\tchmod 0700 %s"
 
-#: builtin/credential-cache--daemon.c:275
 msgid "print debugging messages to stderr"
 msgstr "вывод отладочных сообщений на stderr"
 
-#: builtin/credential-cache--daemon.c:315
 msgid "credential-cache--daemon unavailable; no unix socket support"
 msgstr ""
 
-#: builtin/credential-cache.c:154
 msgid "credential-cache unavailable; no unix socket support"
 msgstr ""
 
-#: builtin/credential-store.c:66
 #, c-format
 msgid "unable to get credential storage lock in %d ms"
 msgstr ""
 
-#: builtin/describe.c:26
 msgid "git describe [<options>] [<commit-ish>...]"
-msgstr "git describe [<опции>] [<указатель-коммита>…]"
+msgstr "git describe [<опции>] [<указатель-коммита>...]"
 
-#: builtin/describe.c:27
 msgid "git describe [<options>] --dirty"
 msgstr "git describe [<опции>] --dirty"
 
-#: builtin/describe.c:63
 msgid "head"
 msgstr "указатель на ветку"
 
-#: builtin/describe.c:63
 msgid "lightweight"
 msgstr "легковесный"
 
-#: builtin/describe.c:63
 msgid "annotated"
 msgstr "аннотированный"
 
-#: builtin/describe.c:277
 #, c-format
 msgid "annotated tag %s not available"
 msgstr "аннотированная метка %s не доступна"
 
-#: builtin/describe.c:281
 #, c-format
 msgid "tag '%s' is externally known as '%s'"
 msgstr ""
 
-#: builtin/describe.c:328
 #, c-format
 msgid "no tag exactly matches '%s'"
 msgstr "нет меток, точно соответствующих «%s»"
 
-#: builtin/describe.c:330
 #, c-format
 msgid "No exact match on refs or tags, searching to describe\n"
 msgstr "Нет точных совпадений по ссылкам или тегам, ищу описания\n"
 
-#: builtin/describe.c:397
 #, c-format
 msgid "finished search at %s\n"
 msgstr "поиск окончен на %s\n"
 
-#: builtin/describe.c:424
 #, c-format
 msgid ""
 "No annotated tags can describe '%s'.\n"
 "However, there were unannotated tags: try --tags."
-msgstr "Нет аннотированных меток, которые могут описать «%s».\nНо имеются неаннотированные метки: попробуйте добавить параметр --tags."
+msgstr ""
+"Нет аннотированных меток, которые могут описать «%s».\n"
+"Но имеются неаннотированные метки: попробуйте добавить параметр --tags."
 
-#: builtin/describe.c:428
 #, c-format
 msgid ""
 "No tags can describe '%s'.\n"
 "Try --always, or create some tags."
-msgstr "Нет меток, которые могут описать «%s….\nПопробуйте добавить параметр --always или создать какие-нибудь метки."
+msgstr ""
+"Нет меток, которые могут описать «%s....\n"
+"Попробуйте добавить параметр --always или создать какие-нибудь метки."
 
-#: builtin/describe.c:458
 #, c-format
 msgid "traversed %lu commits\n"
 msgstr "посещено %lu коммитов\n"
 
-#: builtin/describe.c:461
 #, c-format
 msgid ""
 "more than %i tags found; listed %i most recent\n"
 "gave up search at %s\n"
-msgstr "более %i меток найдено; показано последние %i\nостановлен поиск после %s\n"
+msgstr ""
+"более %i меток найдено; показано последние %i\n"
+"остановлен поиск после %s\n"
 
-#: builtin/describe.c:529
 #, c-format
 msgid "describe %s\n"
 msgstr "описать %s\n"
 
-#: builtin/describe.c:532
 #, c-format
 msgid "Not a valid object name %s"
 msgstr "Недопустимое имя объекта %s"
 
-#: builtin/describe.c:540
 #, c-format
 msgid "%s is neither a commit nor blob"
 msgstr "%s не является коммитом или двоичным объектом"
 
-#: builtin/describe.c:554
 msgid "find the tag that comes after the commit"
 msgstr "поиск метки, которая идет после коммита"
 
-#: builtin/describe.c:555
 msgid "debug search strategy on stderr"
 msgstr "вывод отладочной информации стратегии поиска на стандартный вывод"
 
-#: builtin/describe.c:556
 msgid "use any ref"
 msgstr "использовать любую ссылку"
 
-#: builtin/describe.c:557
 msgid "use any tag, even unannotated"
 msgstr "использовать любую метку, даже неаннотированную"
 
-#: builtin/describe.c:558
 msgid "always use long format"
 msgstr "всегда использовать длинный формат вывода"
 
-#: builtin/describe.c:559
 msgid "only follow first parent"
 msgstr "следовать только за первым родителем"
 
-#: builtin/describe.c:562
 msgid "only output exact matches"
 msgstr "выводить только точные совпадения"
 
-#: builtin/describe.c:564
 msgid "consider <n> most recent tags (default: 10)"
 msgstr "рассматривать последние <n> меток (по умолчанию: 10)"
 
-#: builtin/describe.c:566
 msgid "only consider tags matching <pattern>"
 msgstr "рассматривать только метки по <шаблону>"
 
-#: builtin/describe.c:568
 msgid "do not consider tags matching <pattern>"
 msgstr "не учитывать метки, которые соответствуют <шаблону>"
 
-#: builtin/describe.c:570 builtin/name-rev.c:535
 msgid "show abbreviated commit object as fallback"
 msgstr "если не найдено, показать сокращенный номер редакции коммита"
 
-#: builtin/describe.c:571 builtin/describe.c:574
 msgid "mark"
 msgstr "пометка"
 
-#: builtin/describe.c:572
 msgid "append <mark> on dirty working tree (default: \"-dirty\")"
-msgstr "добавить <пометку> при изменённом рабочем каталоге (по умолчанию: «-dirty»)"
+msgstr ""
+"добавить <пометку> при изменённом рабочем каталоге (по умолчанию: «-dirty»)"
 
-#: builtin/describe.c:575
 msgid "append <mark> on broken working tree (default: \"-broken\")"
-msgstr "добавить <пометку> на повреждённое рабочее дерево (по умолчанию: «-broken»)"
-
-#: builtin/describe.c:593
-msgid "--long is incompatible with --abbrev=0"
-msgstr "--long несовместимо с --abbrev=0"
+msgstr ""
+"добавить <пометку> на повреждённое рабочее дерево (по умолчанию: «-broken»)"
 
-#: builtin/describe.c:622
 msgid "No names found, cannot describe anything."
 msgstr "Имена не найдены, не могу ничего описать."
 
-#: builtin/describe.c:673
-msgid "--dirty is incompatible with commit-ishes"
-msgstr "--dirty несовместимо с указанием указателей коммитов"
-
-#: builtin/describe.c:675
-msgid "--broken is incompatible with commit-ishes"
-msgstr "--broken несовместимо с указанием указателей коммитов"
-
-#: builtin/diff-tree.c:155
-msgid "--stdin and --merge-base are mutually exclusive"
+#, c-format
+msgid "option '%s' and commit-ishes cannot be used together"
 msgstr ""
 
-#: builtin/diff-tree.c:157
 msgid "--merge-base only works with two commits"
 msgstr ""
 
-#: builtin/diff.c:91
 #, c-format
 msgid "'%s': not a regular file or symlink"
 msgstr "«%s»: не является обычным файлом или символьной ссылкой"
 
-#: builtin/diff.c:258
 #, c-format
 msgid "invalid option: %s"
 msgstr "неправильный параметр: %s"
 
-#: builtin/diff.c:375
 #, c-format
 msgid "%s...%s: no merge base"
 msgstr ""
 
-#: builtin/diff.c:485
 msgid "Not a git repository"
 msgstr "Не найден git репозиторий"
 
-#: builtin/diff.c:530 builtin/grep.c:681
 #, c-format
 msgid "invalid object '%s' given."
 msgstr "передан неправильный объект «%s»."
 
-#: builtin/diff.c:541
 #, c-format
 msgid "more than two blobs given: '%s'"
 msgstr "передано больше двух двоичных объектов: «%s»"
 
-#: builtin/diff.c:546
 #, c-format
 msgid "unhandled object '%s' given."
 msgstr "передан необработанный объект «%s»."
 
-#: builtin/diff.c:580
 #, c-format
 msgid "%s...%s: multiple merge bases, using %s"
 msgstr ""
 
-#: builtin/difftool.c:30
 msgid "git difftool [<options>] [<commit> [<commit>]] [--] [<path>...]"
-msgstr "git difftool [<опции>] [<коммит> [<коммит>]] [--] [<путь>…]"
-
-#: builtin/difftool.c:260
-#, c-format
-msgid "failed: %d"
-msgstr "сбой: %d"
+msgstr "git difftool [<опции>] [<коммит> [<коммит>]] [--] [<путь>...]"
 
-#: builtin/difftool.c:302
 #, c-format
 msgid "could not read symlink %s"
 msgstr "не удалось прочитать символьную ссылку %s"
 
-#: builtin/difftool.c:304
 #, c-format
 msgid "could not read symlink file %s"
 msgstr "не удалось прочитать файл символьной ссылки %s"
 
-#: builtin/difftool.c:312
 #, c-format
 msgid "could not read object %s for symlink %s"
 msgstr "не удалось прочитать объект %s для символьной ссылки %s"
 
-#: builtin/difftool.c:412
 msgid ""
-"combined diff formats('-c' and '--cc') are not supported in\n"
-"directory diff mode('-d' and '--dir-diff')."
-msgstr "комбинированные форматы файлов списка изменений(«-c» и «--cc») не поддерживаются в режиме сравнения каталогов(«-d» и «--dir-diff»)."
+"combined diff formats ('-c' and '--cc') are not supported in\n"
+"directory diff mode ('-d' and '--dir-diff')."
+msgstr ""
 
-#: builtin/difftool.c:633
 #, c-format
 msgid "both files modified: '%s' and '%s'."
 msgstr "оба файла изменены: «%s» и «%s»."
 
-#: builtin/difftool.c:635
 msgid "working tree file has been left."
 msgstr "рабочий каталог был покинут."
 
-#: builtin/difftool.c:646
+#, c-format
+msgid "could not copy '%s' to '%s'"
+msgstr "не удалось скопировать «%s» в «%s»"
+
 #, c-format
 msgid "temporary files exist in '%s'."
 msgstr "временные файлы уже находятся в «%s»."
 
-#: builtin/difftool.c:647
 msgid "you may want to cleanup or recover these."
 msgstr "возможно вы хотите их удалить или восстановить."
 
-#: builtin/difftool.c:696
+#, c-format
+msgid "failed: %d"
+msgstr "сбой: %d"
+
 msgid "use `diff.guitool` instead of `diff.tool`"
 msgstr "использовать «diff.guitool» вместо «diff.tool»"
 
-#: builtin/difftool.c:698
 msgid "perform a full-directory diff"
 msgstr "выполнить пофайловое сравнение всего каталога"
 
-#: builtin/difftool.c:700
 msgid "do not prompt before launching a diff tool"
 msgstr "не спрашивать перед запуском утилиты сравнения"
 
-#: builtin/difftool.c:705
 msgid "use symlinks in dir-diff mode"
 msgstr "использовать символьные ссылки в режиме сравнения каталога"
 
-#: builtin/difftool.c:706
 msgid "tool"
 msgstr ""
 
-#: builtin/difftool.c:707
 msgid "use the specified diff tool"
 msgstr "использовать указанную утилиту сравнения"
 
-#: builtin/difftool.c:709
 msgid "print a list of diff tools that may be used with `--tool`"
-msgstr "вывести список утилит, которые можно использовать с параметром «--tool»"
+msgstr ""
+"вывести список утилит, которые можно использовать с параметром «--tool»"
 
-#: builtin/difftool.c:712
 msgid ""
-"make 'git-difftool' exit when an invoked diff tool returns a non - zero exit"
-" code"
-msgstr "выходить из «git-difftool», если вызванная утилита сравнения вернула не нулевой код возврата"
+"make 'git-difftool' exit when an invoked diff tool returns a non-zero exit "
+"code"
+msgstr ""
 
-#: builtin/difftool.c:715
 msgid "specify a custom command for viewing diffs"
 msgstr "использовать особую команду для просмотра изменений"
 
-#: builtin/difftool.c:716
 msgid "passed to `diff`"
 msgstr ""
 
-#: builtin/difftool.c:731
 msgid "difftool requires worktree or --no-index"
 msgstr ""
 
-#: builtin/difftool.c:738
-msgid "--dir-diff is incompatible with --no-index"
-msgstr ""
-
-#: builtin/difftool.c:741
-msgid "--gui, --tool and --extcmd are mutually exclusive"
-msgstr ""
-
-#: builtin/difftool.c:749
 msgid "no <tool> given for --tool=<tool>"
 msgstr "не передана <утилита> для --tool=<утилита>"
 
-#: builtin/difftool.c:756
 msgid "no <cmd> given for --extcmd=<cmd>"
 msgstr "не передана <команда> для --extcmd=<команда>"
 
-#: 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
-msgid "type"
-msgstr "тип"
-
-#: builtin/env--helper.c:46
 msgid "default for git_env_*(...) to fall back on"
 msgstr ""
 
-#: builtin/env--helper.c:48
 msgid "be quiet only use git_env_*() value as exit code"
 msgstr ""
 
-#: builtin/env--helper.c:67
 #, 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 ""
 
-#: builtin/env--helper.c:82
 #, 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 ""
 
-#: builtin/fast-export.c:29
-msgid "git fast-export [rev-list-opts]"
-msgstr "git fast-export [опции-rev-list]"
+msgid "git fast-export [<rev-list-opts>]"
+msgstr ""
 
-#: builtin/fast-export.c:868
 msgid "Error: Cannot export nested tags unless --mark-tags is specified."
 msgstr ""
 
-#: builtin/fast-export.c:1177
 msgid "--anonymize-map token cannot be empty"
 msgstr ""
 
-#: builtin/fast-export.c:1197
 msgid "show progress after <n> objects"
 msgstr "показать прогресс после <n> объектов"
 
-#: builtin/fast-export.c:1199
 msgid "select handling of signed tags"
 msgstr "выбор обработки подписанных меток"
 
-#: builtin/fast-export.c:1202
 msgid "select handling of tags that tag filtered objects"
 msgstr "выбор обработки меток, которыми помечены отфильтрованные объекты"
 
-#: builtin/fast-export.c:1205
 msgid "select handling of commit messages in an alternate encoding"
 msgstr ""
 
-#: builtin/fast-export.c:1208
-msgid "Dump marks to this file"
-msgstr "Записать пометки в этот файл"
+msgid "dump marks to this file"
+msgstr ""
 
-#: builtin/fast-export.c:1210
-msgid "Import marks from this file"
-msgstr "Импортировать пометки из этого файла"
+msgid "import marks from this file"
+msgstr ""
 
-#: builtin/fast-export.c:1214
-msgid "Import marks from this file if it exists"
+msgid "import marks from this file if it exists"
 msgstr ""
 
-#: builtin/fast-export.c:1216
-msgid "Fake a tagger when tags lack one"
-msgstr "Подделать автора метки, если у метки он отсутствует"
+msgid "fake a tagger when tags lack one"
+msgstr ""
 
-#: builtin/fast-export.c:1218
-msgid "Output full tree for each commit"
-msgstr "Вывести полное дерево для каждого коммита"
+msgid "output full tree for each commit"
+msgstr ""
 
-#: builtin/fast-export.c:1220
-msgid "Use the done feature to terminate the stream"
-msgstr "Использовать пометку завершения в конце потока"
+msgid "use the done feature to terminate the stream"
+msgstr ""
 
-#: builtin/fast-export.c:1221
-msgid "Skip output of blob data"
-msgstr "Пропустить вывод данных двоичных объектов"
+msgid "skip output of blob data"
+msgstr ""
 
-#: builtin/fast-export.c:1222 builtin/log.c:1816
 msgid "refspec"
 msgstr "спецификатор ссылки"
 
-#: builtin/fast-export.c:1223
-msgid "Apply refspec to exported refs"
-msgstr "Применить спецификатор ссылки к экспортируемым ссылкам"
+msgid "apply refspec to exported refs"
+msgstr ""
 
-#: builtin/fast-export.c:1224
 msgid "anonymize output"
 msgstr "сделать вывод анонимным"
 
-#: builtin/fast-export.c:1225
 msgid "from:to"
 msgstr ""
 
-#: builtin/fast-export.c:1226
 msgid "convert <from> to <to> in anonymized output"
 msgstr ""
 
-#: builtin/fast-export.c:1229
-msgid "Reference parents which are not in fast-export stream by object id"
+msgid "reference parents which are not in fast-export stream by object id"
 msgstr ""
 
-#: builtin/fast-export.c:1231
-msgid "Show original object ids of blobs/commits"
+msgid "show original object ids of blobs/commits"
 msgstr ""
 
-#: builtin/fast-export.c:1233
-msgid "Label tags with mark ids"
+msgid "label tags with mark ids"
 msgstr ""
 
-#: builtin/fast-export.c:1256
-msgid "--anonymize-map without --anonymize does not make sense"
-msgstr ""
-
-#: builtin/fast-export.c:1271
-msgid "Cannot pass both --import-marks and --import-marks-if-exists"
-msgstr ""
-
-#: builtin/fast-import.c:3088
 #, c-format
 msgid "Missing from marks for submodule '%s'"
 msgstr ""
 
-#: builtin/fast-import.c:3090
 #, c-format
 msgid "Missing to marks for submodule '%s'"
 msgstr ""
 
-#: builtin/fast-import.c:3225
 #, c-format
 msgid "Expected 'mark' command, got %s"
 msgstr ""
 
-#: builtin/fast-import.c:3230
 #, c-format
 msgid "Expected 'to' command, got %s"
 msgstr ""
 
-#: builtin/fast-import.c:3322
 msgid "Expected format name:filename for submodule rewrite option"
 msgstr ""
 
-#: builtin/fast-import.c:3377
 #, c-format
 msgid "feature '%s' forbidden in input without --allow-unsafe-features"
 msgstr ""
 
-#: builtin/fetch-pack.c:241
 #, c-format
 msgid "Lockfile created but not reported: %s"
 msgstr ""
 
-#: builtin/fetch.c:35
 msgid "git fetch [<options>] [<repository> [<refspec>...]]"
-msgstr "git fetch [<опции>] [<репозиторий> [<спецификатор-ссылки>…]]"
+msgstr "git fetch [<опции>] [<репозиторий> [<спецификатор-ссылки>...]]"
 
-#: builtin/fetch.c:36
 msgid "git fetch [<options>] <group>"
 msgstr "git fetch [<опции>] <группа>"
 
-#: builtin/fetch.c:37
 msgid "git fetch --multiple [<options>] [(<repository> | <group>)...]"
-msgstr "git fetch --multiple [<опции>] [(<репозиторий> | <группа>)…]"
+msgstr "git fetch --multiple [<опции>] [(<репозиторий> | <группа>)...]"
 
-#: builtin/fetch.c:38
 msgid "git fetch --all [<options>]"
 msgstr "git fetch --all [<опции>]"
 
-#: builtin/fetch.c:119
 msgid "fetch.parallel cannot be negative"
 msgstr ""
 
-#: builtin/fetch.c:142 builtin/pull.c:185
 msgid "fetch from all remotes"
 msgstr "извлечь со всех внешних репозиториев"
 
-#: builtin/fetch.c:144 builtin/pull.c:245
 msgid "set upstream for git pull/fetch"
 msgstr ""
 
-#: builtin/fetch.c:146 builtin/pull.c:188
 msgid "append to .git/FETCH_HEAD instead of overwriting"
 msgstr "дописать к .git/FETCH_HEAD вместо перезаписи"
 
-#: builtin/fetch.c:148 builtin/pull.c:191
+msgid "use atomic transaction to update references"
+msgstr ""
+
 msgid "path to upload pack on remote end"
 msgstr "путь к программе упаковки пакета на машине с внешним репозиторием"
 
-#: builtin/fetch.c:149
 msgid "force overwrite of local reference"
 msgstr ""
 
-#: builtin/fetch.c:151
 msgid "fetch from multiple remotes"
 msgstr "извлечь с нескольких внешних репозиториев"
 
-#: builtin/fetch.c:153 builtin/pull.c:195
 msgid "fetch all tags and associated objects"
 msgstr "извлечь все метки и связанные объекты"
 
-#: builtin/fetch.c:155
 msgid "do not fetch all tags (--no-tags)"
 msgstr "не извлекать все метки (--no-tags)"
 
-#: builtin/fetch.c:157
 msgid "number of submodules fetched in parallel"
 msgstr "количество подмодулей, которые будут скачаны парралельно"
 
-#: builtin/fetch.c:159 builtin/pull.c:198
+msgid "modify the refspec to place all refs within refs/prefetch/"
+msgstr ""
+
 msgid "prune remote-tracking branches no longer on remote"
-msgstr "почистить отслеживаемые внешние ветки, которых уже нет на внешнем репозитории"
+msgstr ""
+"почистить отслеживаемые внешние ветки, которых уже нет на внешнем репозитории"
 
-#: builtin/fetch.c:161
 msgid "prune local tags no longer on remote and clobber changed tags"
 msgstr ""
 
-#: builtin/fetch.c:162 builtin/fetch.c:187 builtin/pull.c:122
 msgid "on-demand"
 msgstr "по требованию"
 
-#: builtin/fetch.c:163
 msgid "control recursive fetching of submodules"
 msgstr "управление рекурсивным извлечением подмодулей"
 
-#: builtin/fetch.c:168
 msgid "write fetched references to the FETCH_HEAD file"
 msgstr ""
 
-#: builtin/fetch.c:169 builtin/pull.c:206
 msgid "keep downloaded pack"
 msgstr "оставить загруженный пакет данных"
 
-#: builtin/fetch.c:171
 msgid "allow updating of HEAD ref"
-msgstr "разрешить обновление ссылки HEAD"
+msgstr "разрешить обновление указателя HEAD"
 
-#: builtin/fetch.c:174 builtin/fetch.c:180 builtin/pull.c:209
-#: builtin/pull.c:218
 msgid "deepen history of shallow clone"
 msgstr "углубить историю частичного клона"
 
-#: builtin/fetch.c:176 builtin/pull.c:212
 msgid "deepen history of shallow repository based on time"
 msgstr "углубить историю частичного клона основываясь на времени"
 
-#: builtin/fetch.c:182 builtin/pull.c:221
 msgid "convert to a complete repository"
 msgstr "преобразовать в полный репозиторий"
 
-#: builtin/fetch.c:185
+msgid "re-fetch without negotiating common commits"
+msgstr ""
+
 msgid "prepend this to submodule path output"
 msgstr "присоединять это спереди к выводу путей подмодуля"
 
-#: builtin/fetch.c:188
 msgid ""
 "default for recursive fetching of submodules (lower priority than config "
 "files)"
-msgstr "настроить по умолчанию рекурсивное извлечение подмодулей (более низкий приоритет, чем файлы конфигурации)"
+msgstr ""
+"настроить по умолчанию рекурсивное извлечение подмодулей (более низкий "
+"приоритет, чем файлы конфигурации)"
 
-#: builtin/fetch.c:192 builtin/pull.c:224
 msgid "accept refs that update .git/shallow"
 msgstr "принимать ссылки, которые обновляют .git/shallow"
 
-#: builtin/fetch.c:193 builtin/pull.c:226
 msgid "refmap"
 msgstr "соответствие-ссылок"
 
-#: builtin/fetch.c:194 builtin/pull.c:227
 msgid "specify fetch refmap"
 msgstr "указать соответствие ссылок при извлечении"
 
-#: builtin/fetch.c:201 builtin/pull.c:240
 msgid "report that we have only objects reachable from this object"
 msgstr ""
 
-#: builtin/fetch.c:204 builtin/fetch.c:206
+msgid "do not fetch a packfile; instead, print ancestors of negotiation tips"
+msgstr ""
+
 msgid "run 'maintenance --auto' after fetching"
 msgstr ""
 
-#: builtin/fetch.c:208 builtin/pull.c:243
 msgid "check for forced-updates on all updated branches"
 msgstr ""
 
-#: builtin/fetch.c:210
 msgid "write the commit-graph after fetching"
 msgstr ""
 
-#: builtin/fetch.c:212
 msgid "accept refspecs from stdin"
 msgstr ""
 
-#: builtin/fetch.c:523
-msgid "Couldn't find remote ref HEAD"
-msgstr "Не удалось найти ссылку HEAD на внешнем репозитории"
-
-#: builtin/fetch.c:677
-#, c-format
-msgid "configuration fetch.output contains invalid value %s"
-msgstr "опция fetch.output содержит неправильное значение для %s"
+msgid "couldn't find remote ref HEAD"
+msgstr ""
 
-#: builtin/fetch.c:775
 #, c-format
 msgid "object %s not found"
 msgstr "объект %s не найден"
 
-#: builtin/fetch.c:779
 msgid "[up to date]"
 msgstr "[актуально]"
 
-#: builtin/fetch.c:792 builtin/fetch.c:808 builtin/fetch.c:880
 msgid "[rejected]"
 msgstr "[отклонено]"
 
-#: builtin/fetch.c:793
 msgid "can't fetch in current branch"
 msgstr "нельзя извлечь текущую ветку"
 
-#: builtin/fetch.c:803
+msgid "checked out in another worktree"
+msgstr ""
+
 msgid "[tag update]"
 msgstr "[обновление метки]"
 
-#: builtin/fetch.c:804 builtin/fetch.c:841 builtin/fetch.c:863
-#: builtin/fetch.c:875
 msgid "unable to update local ref"
 msgstr "не удалось обновить локальную ссылку"
 
-#: builtin/fetch.c:808
 msgid "would clobber existing tag"
 msgstr ""
 
-#: builtin/fetch.c:830
 msgid "[new tag]"
 msgstr "[новая метка]"
 
-#: builtin/fetch.c:833
 msgid "[new branch]"
 msgstr "[новая ветка]"
 
-#: builtin/fetch.c:836
 msgid "[new ref]"
 msgstr "[новая ссылка]"
 
-#: builtin/fetch.c:875
 msgid "forced update"
 msgstr "принудительное обновление"
 
-#: builtin/fetch.c:880
 msgid "non-fast-forward"
-msgstr "без перемотки вперед"
+msgstr "без быстрой перемотки"
+
+#, c-format
+msgid "cannot open '%s'"
+msgstr "не удалось открыть «%s»"
 
-#: builtin/fetch.c:901
 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'."
+"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:905
 #, 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"
-" to avoid this check.\n"
+"it took %.2f seconds to check forced updates; you can use\n"
+"'--no-show-forced-updates' or run 'git config fetch.showForcedUpdates "
+"false'\n"
+"to avoid this check\n"
 msgstr ""
 
-#: builtin/fetch.c:939
 #, c-format
 msgid "%s did not send all necessary objects\n"
 msgstr "%s не отправил все необходимые объекты\n"
 
-#: builtin/fetch.c:960
 #, c-format
-msgid "reject %s because shallow roots are not allowed to be updated"
-msgstr "%s отклонено из-за того, что частичные корни не разрешено обновлять"
+msgid "rejected %s because shallow roots are not allowed to be updated"
+msgstr ""
 
-#: builtin/fetch.c:1053 builtin/fetch.c:1191
 #, c-format
 msgid "From %.*s\n"
 msgstr "Из %.*s\n"
 
-#: builtin/fetch.c:1064
 #, c-format
 msgid ""
 "some local refs could not be updated; try running\n"
 " 'git remote prune %s' to remove any old, conflicting branches"
-msgstr "не удалось обновить некоторые локальные ссылки; попробуйте запустить «git remote prune %s», чтобы почистить старые, конфликтующие ветки"
+msgstr ""
+"не удалось обновить некоторые локальные ссылки; попробуйте запустить «git "
+"remote prune %s», чтобы почистить старые, конфликтующие ветки"
 
-#: builtin/fetch.c:1161
 #, c-format
 msgid "   (%s will become dangling)"
 msgstr "   (%s будет висящей веткой)"
 
-#: builtin/fetch.c:1162
 #, c-format
 msgid "   (%s has become dangling)"
 msgstr "   (%s стала висящей веткой)"
 
-#: builtin/fetch.c:1194
 msgid "[deleted]"
 msgstr "[удалено]"
 
-#: builtin/fetch.c:1195 builtin/remote.c:1118
 msgid "(none)"
 msgstr "(нет)"
 
-#: builtin/fetch.c:1218
 #, c-format
-msgid "Refusing to fetch into current branch %s of non-bare repository"
-msgstr "Отказ получения в текущую ветку %s не голого репозитория"
+msgid "refusing to fetch into branch '%s' checked out at '%s'"
+msgstr ""
 
-#: builtin/fetch.c:1237
 #, c-format
-msgid "Option \"%s\" value \"%s\" is not valid for %s"
-msgstr "Неправильное значение «%2$s» для параметра «%1$s» для %3$s"
+msgid "option \"%s\" value \"%s\" is not valid for %s"
+msgstr ""
 
-#: builtin/fetch.c:1240
 #, c-format
-msgid "Option \"%s\" is ignored for %s\n"
-msgstr "Параметр «%s» игнорируется для %s\n"
+msgid "option \"%s\" is ignored for %s\n"
+msgstr ""
+
+#, c-format
+msgid "%s is not a valid object"
+msgstr ""
+
+#, c-format
+msgid "the object %s does not exist"
+msgstr ""
 
-#: builtin/fetch.c:1448
 msgid "multiple branches detected, incompatible with --set-upstream"
 msgstr ""
 
-#: builtin/fetch.c:1463
+#, c-format
+msgid ""
+"could not set upstream of HEAD to '%s' from '%s' when it does not point to "
+"any branch."
+msgstr ""
+
 msgid "not setting upstream for a remote remote-tracking branch"
 msgstr ""
 
-#: builtin/fetch.c:1465
 msgid "not setting upstream for a remote tag"
 msgstr ""
 
-#: builtin/fetch.c:1467
 msgid "unknown branch type"
 msgstr ""
 
-#: builtin/fetch.c:1469
 msgid ""
-"no source branch found.\n"
-"you need to specify exactly one branch with the --set-upstream option."
+"no source branch found;\n"
+"you need to specify exactly one branch with the --set-upstream option"
 msgstr ""
 
-#: builtin/fetch.c:1598 builtin/fetch.c:1661
 #, c-format
 msgid "Fetching %s\n"
 msgstr "Извлечение из %s\n"
 
-#: builtin/fetch.c:1608 builtin/fetch.c:1663 builtin/remote.c:101
 #, c-format
-msgid "Could not fetch %s"
-msgstr "Не удалось извлечь %s"
+msgid "could not fetch %s"
+msgstr ""
 
-#: builtin/fetch.c:1620
 #, c-format
 msgid "could not fetch '%s' (exit code: %d)\n"
 msgstr ""
 
-#: builtin/fetch.c:1724
 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:1760
-msgid "You need to specify a tag name."
-msgstr "Вам нужно указать имя метки."
+"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:1825
-msgid "Negative depth in --deepen is not supported"
-msgstr "Отрицательная грубина для --deepen не поддерживается"
+msgid "you need to specify a tag name"
+msgstr ""
 
-#: builtin/fetch.c:1827
-msgid "--deepen and --depth are mutually exclusive"
-msgstr "--deepen и --depth нельзя использовать одновременно"
+msgid "--negotiate-only needs one or more --negotiation-tip=*"
+msgstr ""
 
-#: builtin/fetch.c:1832
-msgid "--depth and --unshallow cannot be used together"
-msgstr "нельзя использовать одновременно --depth и --unshallow"
+msgid "negative depth in --deepen is not supported"
+msgstr ""
 
-#: builtin/fetch.c:1834
 msgid "--unshallow on a complete repository does not make sense"
 msgstr "--unshallow не имеет смысла на полном репозитории"
 
-#: builtin/fetch.c:1851
 msgid "fetch --all does not take a repository argument"
 msgstr "fetch --all не принимает имя репозитория как аргумент"
 
-#: builtin/fetch.c:1853
 msgid "fetch --all does not make sense with refspecs"
 msgstr "fetch --all не имеет смысла при указании спецификаторов ссылок"
 
-#: builtin/fetch.c:1862
 #, c-format
-msgid "No such remote or remote group: %s"
-msgstr "Нет такого внешнего репозитория или группы: %s"
+msgid "no such remote or remote group: %s"
+msgstr ""
+
+msgid "fetching a group and specifying refspecs does not make sense"
+msgstr ""
+
+msgid "must supply remote when using --negotiate-only"
+msgstr ""
 
-#: builtin/fetch.c:1869
-msgid "Fetching a group and specifying refspecs does not make sense"
-msgstr "Получение группы и указание спецификаций ссылок не имеет смысла"
+msgid "protocol does not support --negotiate-only, exiting"
+msgstr ""
 
-#: builtin/fetch.c:1887
 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 ""
+
+msgid "--atomic can only be used when fetching from one remote"
 msgstr ""
 
-#: builtin/fetch.c:1891
 msgid "--stdin can only be used when fetching from one remote"
 msgstr ""
 
-#: builtin/fmt-merge-msg.c:7
 msgid ""
 "git fmt-merge-msg [-m <message>] [--log[=<n>] | --no-log] [--file <file>]"
-msgstr "git fmt-merge-msg [-m <сообщение>] [--log[=<n>] | --no-log] [--file <файл>]"
+msgstr ""
+"git fmt-merge-msg [-m <сообщение>] [--log[=<n>] | --no-log] [--file <файл>]"
 
-#: builtin/fmt-merge-msg.c:18
 msgid "populate log with at most <n> entries from shortlog"
 msgstr "отправить в журнал <n> записей из короткого журнала"
 
-#: builtin/fmt-merge-msg.c:21
 msgid "alias for --log (deprecated)"
 msgstr "сокращение для --log (устаревшее)"
 
-#: builtin/fmt-merge-msg.c:24
 msgid "text"
 msgstr "текст"
 
-#: builtin/fmt-merge-msg.c:25
 msgid "use <text> as start of message"
 msgstr "использовать <текст> как начальное сообщение"
 
-#: builtin/fmt-merge-msg.c:26
+msgid "use <name> instead of the real target branch"
+msgstr ""
+
 msgid "file to read from"
 msgstr "файл для чтения"
 
-#: builtin/for-each-ref.c:10
 msgid "git for-each-ref [<options>] [<pattern>]"
 msgstr "git for-each-ref [<опции>] [<шаблон>]"
 
-#: builtin/for-each-ref.c:11
 msgid "git for-each-ref [--points-at <object>]"
 msgstr "git for-each-ref [--points-at <объект>]"
 
-#: builtin/for-each-ref.c:12
 msgid "git for-each-ref [--merged [<commit>]] [--no-merged [<commit>]]"
 msgstr ""
 
-#: builtin/for-each-ref.c:13
 msgid "git for-each-ref [--contains [<commit>]] [--no-contains [<commit>]]"
 msgstr "git for-each-ref [--contains [<коммит>]] [--no-contains [<коммит>]]"
 
-#: builtin/for-each-ref.c:28
 msgid "quote placeholders suitably for shells"
-msgstr "выводить указатели места заполнения в подходящем формате для командного процессора"
+msgstr ""
+"выводить указатели места заполнения в подходящем формате для командного "
+"процессора"
 
-#: builtin/for-each-ref.c:30
 msgid "quote placeholders suitably for perl"
 msgstr "выводить указатели места заполнения в подходящем формате для perl"
 
-#: builtin/for-each-ref.c:32
 msgid "quote placeholders suitably for python"
 msgstr "выводить указатели места заполнения в подходящем формате для python"
 
-#: builtin/for-each-ref.c:34
 msgid "quote placeholders suitably for Tcl"
 msgstr "выводить указатели места заполнения в подходящем формате для Tcl"
 
-#: builtin/for-each-ref.c:37
 msgid "show only <n> matched refs"
 msgstr "показать только <n> совпадающих ссылок"
 
-#: builtin/for-each-ref.c:39 builtin/tag.c:440
 msgid "respect format colors"
 msgstr "использовать цвета из формата"
 
-#: builtin/for-each-ref.c:42
 msgid "print only refs which points at the given object"
 msgstr "вывод только ссылок, которые указывают на переданный объект"
 
-#: builtin/for-each-ref.c:44
 msgid "print only refs that are merged"
 msgstr "вывод только слитых ссылок"
 
-#: builtin/for-each-ref.c:45
 msgid "print only refs that are not merged"
 msgstr "вывод только не слитых ссылок"
 
-#: builtin/for-each-ref.c:46
 msgid "print only refs which contain the commit"
 msgstr "вывод только ссылок, которые содержат коммит"
 
-#: builtin/for-each-ref.c:47
 msgid "print only refs which don't contain the commit"
 msgstr "вывод только ссылок, которые не содержат коммит"
 
-#: builtin/for-each-repo.c:9
 msgid "git for-each-repo --config=<config> <command-args>"
 msgstr ""
 
-#: builtin/for-each-repo.c:37
 msgid "config"
 msgstr ""
 
-#: builtin/for-each-repo.c:38
 msgid "config key storing a list of repository paths"
 msgstr ""
 
-#: builtin/for-each-repo.c:46
 msgid "missing --config=<config>"
 msgstr ""
 
-#: builtin/fsck.c:69 builtin/fsck.c:148 builtin/fsck.c:149
 msgid "unknown"
 msgstr ""
 
 #. TRANSLATORS: e.g. error in tree 01bfda: <more explanation>
-#: builtin/fsck.c:101 builtin/fsck.c:121
 #, c-format
 msgid "error in %s %s: %s"
 msgstr ""
 
 #. TRANSLATORS: e.g. warning in tree 01bfda: <more explanation>
-#: builtin/fsck.c:115
 #, c-format
 msgid "warning in %s %s: %s"
 msgstr ""
 
-#: builtin/fsck.c:144 builtin/fsck.c:147
 #, c-format
 msgid "broken link from %7s %s"
 msgstr ""
 
-#: builtin/fsck.c:156
 msgid "wrong object type in link"
 msgstr ""
 
-#: builtin/fsck.c:172
 #, c-format
 msgid ""
 "broken link from %7s %s\n"
 "              to %7s %s"
 msgstr ""
 
-#: builtin/fsck.c:283
+msgid "Checking connectivity"
+msgstr "Проверка соединения"
+
 #, c-format
 msgid "missing %s %s"
 msgstr ""
 
-#: builtin/fsck.c:310
 #, c-format
 msgid "unreachable %s %s"
 msgstr ""
 
-#: builtin/fsck.c:330
 #, c-format
 msgid "dangling %s %s"
 msgstr ""
 
-#: builtin/fsck.c:340
 msgid "could not create lost-found"
 msgstr ""
 
-#: builtin/fsck.c:351
+#, c-format
+msgid "could not write '%s'"
+msgstr "не удалось записать «%s»"
+
 #, c-format
 msgid "could not finish '%s'"
 msgstr "не удалось закончить '%s'"
 
-#: builtin/fsck.c:368
 #, c-format
 msgid "Checking %s"
 msgstr ""
 
-#: builtin/fsck.c:406
 #, c-format
 msgid "Checking connectivity (%d objects)"
 msgstr ""
 
-#: builtin/fsck.c:425
 #, c-format
 msgid "Checking %s %s"
 msgstr ""
 
-#: builtin/fsck.c:430
 msgid "broken links"
 msgstr ""
 
-#: builtin/fsck.c:439
 #, c-format
 msgid "root %s"
 msgstr ""
 
-#: builtin/fsck.c:447
 #, c-format
 msgid "tagged %s %s (%s) in %s"
 msgstr ""
 
-#: builtin/fsck.c:476
 #, c-format
 msgid "%s: object corrupt or missing"
 msgstr ""
 
-#: builtin/fsck.c:501
 #, c-format
 msgid "%s: invalid reflog entry %s"
 msgstr ""
 
-#: builtin/fsck.c:515
 #, c-format
 msgid "Checking reflog %s->%s"
 msgstr ""
 
-#: builtin/fsck.c:549
 #, c-format
 msgid "%s: invalid sha1 pointer %s"
 msgstr ""
 
-#: builtin/fsck.c:556
 #, c-format
 msgid "%s: not a commit"
 msgstr ""
 
-#: builtin/fsck.c:610
 msgid "notice: No default references"
 msgstr ""
 
-#: builtin/fsck.c:625
+#, c-format
+msgid "%s: hash-path mismatch, found at: %s"
+msgstr ""
+
 #, c-format
 msgid "%s: object corrupt or missing: %s"
 msgstr ""
 
-#: builtin/fsck.c:638
+#, c-format
+msgid "%s: object is of unknown type '%s': %s"
+msgstr ""
+
 #, c-format
 msgid "%s: object could not be parsed: %s"
 msgstr ""
 
-#: builtin/fsck.c:658
 #, c-format
 msgid "bad sha1 file: %s"
 msgstr ""
 
-#: builtin/fsck.c:673
 msgid "Checking object directory"
 msgstr ""
 
-#: builtin/fsck.c:676
 msgid "Checking object directories"
 msgstr "Проверка каталогов объектов"
 
-#: builtin/fsck.c:691
 #, c-format
 msgid "Checking %s link"
 msgstr ""
 
-#: builtin/fsck.c:696 builtin/index-pack.c:865
 #, c-format
 msgid "invalid %s"
 msgstr "неправильный %s"
 
-#: builtin/fsck.c:703
 #, c-format
 msgid "%s points to something strange (%s)"
 msgstr ""
 
-#: builtin/fsck.c:709
 #, c-format
 msgid "%s: detached HEAD points at nothing"
-msgstr ""
+msgstr "%s: отсоединённый указатель HEAD ни на что не указывает"
 
-#: builtin/fsck.c:713
 #, c-format
 msgid "notice: %s points to an unborn branch (%s)"
 msgstr ""
 
-#: builtin/fsck.c:725
 msgid "Checking cache tree"
 msgstr ""
 
-#: builtin/fsck.c:730
 #, c-format
 msgid "%s: invalid sha1 pointer in cache-tree"
 msgstr ""
 
-#: builtin/fsck.c:739
 msgid "non-tree in cache-tree"
 msgstr ""
 
-#: builtin/fsck.c:770
 msgid "git fsck [<options>] [<object>...]"
-msgstr "git fsck [<опции>] [<объект>…]"
+msgstr "git fsck [<опции>] [<объект>...]"
 
-#: builtin/fsck.c:776
 msgid "show unreachable objects"
 msgstr "показать недоступные объекты"
 
-#: builtin/fsck.c:777
 msgid "show dangling objects"
 msgstr "показать объекты, на которые нет ссылок"
 
-#: builtin/fsck.c:778
 msgid "report tags"
 msgstr "вывести отчет по меткам"
 
-#: builtin/fsck.c:779
 msgid "report root nodes"
 msgstr "вывести отчет по корневым узлам"
 
-#: builtin/fsck.c:780
 msgid "make index objects head nodes"
 msgstr "воспринимать объекты в индексе как корневые узлы"
 
-#: builtin/fsck.c:781
 msgid "make reflogs head nodes (default)"
 msgstr "создать корневые узлы журналов ссылок (по умолчанию)"
 
-#: builtin/fsck.c:782
 msgid "also consider packs and alternate objects"
 msgstr "также проверять пакеты и альтернативные объекты"
 
-#: builtin/fsck.c:783
 msgid "check only connectivity"
 msgstr "только проверить соединение"
 
-#: builtin/fsck.c:784
 msgid "enable more strict checking"
 msgstr "использовать более строгую проверку"
 
-#: builtin/fsck.c:786
 msgid "write dangling objects in .git/lost-found"
 msgstr "записать объекты на которые нет ссылок в .git/lost-found"
 
-#: builtin/fsck.c:787 builtin/prune.c:134
 msgid "show progress"
 msgstr "показать прогресс выполнения"
 
-#: builtin/fsck.c:788
 msgid "show verbose names for reachable objects"
 msgstr "показать подробные имена для недоступных объектов"
 
-#: builtin/fsck.c:847 builtin/index-pack.c:261
 msgid "Checking objects"
 msgstr "Проверка объектов"
 
-#: builtin/fsck.c:875
 #, c-format
 msgid "%s: object missing"
 msgstr ""
 
-#: builtin/fsck.c:886
 #, c-format
 msgid "invalid parameter: expected sha1, got '%s'"
 msgstr ""
 
-#: builtin/gc.c:39
+msgid "git fsmonitor--daemon start [<options>]"
+msgstr ""
+
+msgid "git fsmonitor--daemon run [<options>]"
+msgstr ""
+
+msgid "git fsmonitor--daemon stop"
+msgstr ""
+
+msgid "git fsmonitor--daemon status"
+msgstr ""
+
+#, c-format
+msgid "value of '%s' out of range: %d"
+msgstr ""
+
+#, c-format
+msgid "value of '%s' not bool or int: %d"
+msgstr ""
+
+#, c-format
+msgid "fsmonitor-daemon is watching '%s'\n"
+msgstr ""
+
+#, c-format
+msgid "fsmonitor-daemon is not watching '%s'\n"
+msgstr ""
+
+#, c-format
+msgid "could not create fsmonitor cookie '%s'"
+msgstr ""
+
+#, c-format
+msgid "fsmonitor: cookie_result '%d' != SEEN"
+msgstr ""
+
+#, c-format
+msgid "could not start IPC thread pool on '%s'"
+msgstr ""
+
+msgid "could not start fsmonitor listener thread"
+msgstr ""
+
+msgid "could not start fsmonitor health thread"
+msgstr ""
+
+msgid "could not initialize listener thread"
+msgstr ""
+
+msgid "could not initialize health thread"
+msgstr ""
+
+#, c-format
+msgid "could not cd home '%s'"
+msgstr ""
+
+#, c-format
+msgid "fsmonitor--daemon is already running '%s'"
+msgstr ""
+
+#, c-format
+msgid "running fsmonitor-daemon in '%s'\n"
+msgstr ""
+
+#, c-format
+msgid "starting fsmonitor-daemon in '%s'\n"
+msgstr ""
+
+msgid "daemon failed to start"
+msgstr ""
+
+msgid "daemon not online yet"
+msgstr ""
+
+msgid "daemon terminated"
+msgstr ""
+
+msgid "detach from console"
+msgstr ""
+
+msgid "use <n> ipc worker threads"
+msgstr ""
+
+msgid "max seconds to wait for background daemon startup"
+msgstr ""
+
+#, c-format
+msgid "invalid 'ipc-threads' value (%d)"
+msgstr ""
+
+#, c-format
+msgid "Unhandled subcommand '%s'"
+msgstr ""
+
+msgid "fsmonitor--daemon not supported on this platform"
+msgstr ""
+
 msgid "git gc [<options>]"
 msgstr "git gc [<опции>]"
 
-#: builtin/gc.c:94
 #, c-format
 msgid "Failed to fstat %s: %s"
 msgstr "Не удалось выполнить fstat %s: %s"
 
-#: builtin/gc.c:130
 #, c-format
 msgid "failed to parse '%s' value '%s'"
 msgstr ""
 
-#: builtin/gc.c:479 builtin/init-db.c:58
 #, c-format
 msgid "cannot stat '%s'"
 msgstr "не удалось выполнить stat для «%s»"
 
-#: builtin/gc.c:488 builtin/notes.c:240 builtin/tag.c:530
-#, c-format
-msgid "cannot read '%s'"
-msgstr "не удалось прочитать «%s»"
-
-#: builtin/gc.c:495
 #, 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\n%s"
+msgstr ""
 
-#: builtin/gc.c:543
 msgid "prune unreferenced objects"
 msgstr "почистить объекты, на которые нет ссылок"
 
-#: builtin/gc.c:545
+msgid "pack unreferenced objects separately"
+msgstr ""
+
 msgid "be more thorough (increased runtime)"
 msgstr "проверять более внимательно (занимает больше времени)"
 
-#: builtin/gc.c:546
 msgid "enable auto-gc mode"
 msgstr "включить режим auto-gc"
 
-#: builtin/gc.c:549
 msgid "force running gc even if there may be another gc running"
 msgstr "принудительно запустить gc, даже есть другая копия gc уже запущена"
 
-#: builtin/gc.c:552
 msgid "repack all other packs except the largest pack"
 msgstr ""
 
-#: builtin/gc.c:569
 #, c-format
-msgid "failed to parse gc.logexpiry value %s"
+msgid "failed to parse gc.logExpiry value %s"
 msgstr ""
 
-#: builtin/gc.c:580
 #, c-format
 msgid "failed to parse prune expiry value %s"
 msgstr ""
 
-#: builtin/gc.c:600
 #, c-format
 msgid "Auto packing the repository in background for optimum performance.\n"
-msgstr "Автоматическая упаковка репозитория в фоне, для оптимальной производительности.\n"
+msgstr ""
+"Автоматическая упаковка репозитория в фоне, для оптимальной "
+"производительности.\n"
 
-#: builtin/gc.c:602
 #, c-format
 msgid "Auto packing the repository for optimum performance.\n"
-msgstr "Автоматическая упаковка репозитория, для оптимальной производительности.\n"
+msgstr ""
+"Автоматическая упаковка репозитория, для оптимальной производительности.\n"
 
-#: builtin/gc.c:603
 #, c-format
 msgid "See \"git help gc\" for manual housekeeping.\n"
 msgstr "Смотрите «git help gc» руководства по ручной очистке.\n"
 
-#: builtin/gc.c:643
 #, c-format
 msgid ""
 "gc is already running on machine '%s' pid %<PRIuMAX> (use --force if not)"
-msgstr "gc уже запущен на этом компьютере «%s» pid %<PRIuMAX> (если нет, используйте --force)"
+msgstr ""
+"gc уже запущен на этом компьютере «%s» pid %<PRIuMAX> (если нет, используйте "
+"--force)"
 
-#: builtin/gc.c:698
 msgid ""
-"There are too many unreachable loose objects; run 'git prune' to remove "
-"them."
-msgstr "Имеется слишком много объектов, на которые нет ссылок; запустите «git prune» для их удаления."
+"There are too many unreachable loose objects; run 'git prune' to remove them."
+msgstr ""
+"Имеется слишком много объектов, на которые нет ссылок; запустите «git prune» "
+"для их удаления."
 
-#: builtin/gc.c:708
 msgid ""
 "git maintenance run [--auto] [--[no-]quiet] [--task=<task>] [--schedule]"
 msgstr ""
 
-#: builtin/gc.c:738
 msgid "--no-schedule is not allowed"
 msgstr ""
 
-#: builtin/gc.c:743
 #, c-format
 msgid "unrecognized --schedule argument '%s'"
 msgstr ""
 
-#: builtin/gc.c:862
 msgid "failed to write commit-graph"
 msgstr ""
 
-#: builtin/gc.c:901
-msgid "failed to fill remotes"
+msgid "failed to prefetch remotes"
 msgstr ""
 
-#: builtin/gc.c:1024
 msgid "failed to start 'git pack-objects' process"
 msgstr ""
 
-#: builtin/gc.c:1041
 msgid "failed to finish 'git pack-objects' process"
 msgstr ""
 
-#: builtin/gc.c:1093
 msgid "failed to write multi-pack-index"
 msgstr ""
 
-#: builtin/gc.c:1111
 msgid "'git multi-pack-index expire' failed"
 msgstr ""
 
-#: builtin/gc.c:1172
 msgid "'git multi-pack-index repack' failed"
 msgstr ""
 
-#: builtin/gc.c:1181
 msgid ""
 "skipping incremental-repack task because core.multiPackIndex is disabled"
 msgstr ""
 
-#: builtin/gc.c:1279
 #, c-format
 msgid "lock file '%s' exists, skipping maintenance"
 msgstr ""
 
-#: builtin/gc.c:1309
 #, c-format
 msgid "task '%s' failed"
 msgstr ""
 
-#: builtin/gc.c:1389
 #, c-format
 msgid "'%s' is not a valid task"
 msgstr ""
 
-#: builtin/gc.c:1394
 #, c-format
 msgid "task '%s' cannot be selected multiple times"
 msgstr ""
 
-#: builtin/gc.c:1409
 msgid "run tasks based on the state of the repository"
 msgstr ""
 
-#: builtin/gc.c:1410
 msgid "frequency"
 msgstr ""
 
-#: builtin/gc.c:1411
 msgid "run tasks based on frequency"
 msgstr ""
 
-#: builtin/gc.c:1414
 msgid "do not report progress or other information over stderr"
 msgstr ""
 
-#: builtin/gc.c:1415
 msgid "task"
 msgstr ""
 
-#: builtin/gc.c:1416
 msgid "run a specific task"
 msgstr ""
 
-#: builtin/gc.c:1433
 msgid "use at most one of --auto and --schedule=<frequency>"
 msgstr ""
 
-#: builtin/gc.c:1467
 msgid "failed to run 'git config'"
 msgstr ""
 
-#: builtin/gc.c:1512
-msgid "another process is scheduling background maintenance"
+#, c-format
+msgid "failed to expand path '%s'"
+msgstr ""
+
+msgid "failed to start launchctl"
+msgstr ""
+
+#, c-format
+msgid "failed to create directories for '%s'"
+msgstr ""
+
+#, c-format
+msgid "failed to bootstrap service %s"
+msgstr ""
+
+msgid "failed to create temp xml file"
+msgstr ""
+
+msgid "failed to start schtasks"
 msgstr ""
 
-#: builtin/gc.c:1525
 msgid "failed to run 'crontab -l'; your system might not support 'cron'"
 msgstr ""
 
-#: builtin/gc.c:1544
 msgid "failed to run 'crontab'; your system might not support 'cron'"
 msgstr ""
 
-#: builtin/gc.c:1550
 msgid "failed to open stdin of 'crontab'"
 msgstr ""
 
-#: builtin/gc.c:1592
 msgid "'crontab' died"
 msgstr ""
 
-#: builtin/gc.c:1605
+msgid "failed to start systemctl"
+msgstr ""
+
+msgid "failed to run systemctl"
+msgstr ""
+
+#, c-format
+msgid "failed to delete '%s'"
+msgstr "не удалось удалить «%s»"
+
+#, c-format
+msgid "failed to flush '%s'"
+msgstr ""
+
+#, c-format
+msgid "unrecognized --scheduler argument '%s'"
+msgstr ""
+
+msgid "neither systemd timers nor crontab are available"
+msgstr ""
+
+#, c-format
+msgid "%s scheduler is not available"
+msgstr ""
+
+msgid "another process is scheduling background maintenance"
+msgstr ""
+
+msgid "git maintenance start [--scheduler=<scheduler>]"
+msgstr ""
+
+msgid "scheduler"
+msgstr ""
+
+msgid "scheduler to trigger git maintenance run"
+msgstr ""
+
 msgid "failed to add repo to global config"
 msgstr ""
 
-#: builtin/gc.c:1615
 msgid "git maintenance <subcommand> [<options>]"
 msgstr ""
 
-#: builtin/gc.c:1634
 #, c-format
 msgid "invalid subcommand: %s"
 msgstr ""
 
-#: builtin/grep.c:30
 msgid "git grep [<options>] [-e] <pattern> [<rev>...] [[--] <path>...]"
-msgstr "git grep [<опции>] [-e] <шаблон> [<редакция>…] [[--] <путь>…]"
+msgstr "git grep [<опции>] [-e] <шаблон> [<редакция>...] [[--] <путь>...]"
 
-#: builtin/grep.c:225
 #, c-format
 msgid "grep: failed to create thread: %s"
 msgstr "grep: сбой создания потока: %s"
 
-#: builtin/grep.c:279
 #, c-format
 msgid "invalid number of threads specified (%d) for %s"
 msgstr "указано недопустимое количество потоков (%d) для %s"
 
+#. #-#-#-#-#  grep.c.po  #-#-#-#-#
 #. TRANSLATORS: %s is the configuration
 #. variable for tweaking threads, currently
 #. grep.threads
-#: builtin/grep.c:287 builtin/index-pack.c:1576 builtin/index-pack.c:1766
-#: builtin/pack-objects.c:2936
+#.
 #, c-format
 msgid "no threads support, ignoring %s"
 msgstr "нет поддержки потоков, игнорирование %s"
 
-#: builtin/grep.c:475 builtin/grep.c:600 builtin/grep.c:640
 #, c-format
 msgid "unable to read tree (%s)"
 msgstr "не удалось прочитать дерево (%s)"
 
-#: builtin/grep.c:655
 #, c-format
 msgid "unable to grep from object of type %s"
 msgstr "не удалось выполнить grep из объекта типа %s"
 
-#: builtin/grep.c:736
 #, c-format
 msgid "switch `%c' expects a numerical value"
 msgstr "параметр «%c» ожидает числовое значение"
 
-#: builtin/grep.c:835
 msgid "search in index instead of in the work tree"
 msgstr "искать в индексе, а не в рабочем каталоге"
 
-#: builtin/grep.c:837
 msgid "find in contents not managed by git"
 msgstr "искать в содержимом не управляемым git"
 
-#: builtin/grep.c:839
 msgid "search in both tracked and untracked files"
 msgstr "искать и в отслеживаемых, и в неотслеживаемых файлах"
 
-#: builtin/grep.c:841
 msgid "ignore files specified via '.gitignore'"
 msgstr "игнорировать файлы указанные в «.gitignore»"
 
-#: builtin/grep.c:843
 msgid "recursively search in each submodule"
 msgstr "рекурсивный поиск по всем подмодулям"
 
-#: builtin/grep.c:846
 msgid "show non-matching lines"
 msgstr "искать в несовпадающих строках"
 
-#: builtin/grep.c:848
 msgid "case insensitive matching"
 msgstr "без учета регистра"
 
-#: builtin/grep.c:850
 msgid "match patterns only at word boundaries"
 msgstr "искать совпадения шаблона только на границах слов"
 
-#: builtin/grep.c:852
 msgid "process binary files as text"
 msgstr "обработка двоичных файлов как текста"
 
-#: builtin/grep.c:854
 msgid "don't match patterns in binary files"
 msgstr "не искать совпадения шаблона в двоичных файлах"
 
-#: builtin/grep.c:857
 msgid "process binary files with textconv filters"
 msgstr "обрабатываться двоичные файлы с помощью фильтров textconv"
 
-#: builtin/grep.c:859
 msgid "search in subdirectories (default)"
 msgstr ""
 
-#: builtin/grep.c:861
 msgid "descend at most <depth> levels"
 msgstr "на глубине максиму <глубина> уровней"
 
-#: builtin/grep.c:865
 msgid "use extended POSIX regular expressions"
 msgstr "использовать расширенные регулярные выражения POSIX"
 
-#: builtin/grep.c:868
 msgid "use basic POSIX regular expressions (default)"
 msgstr "использовать базовые регулярные выражения POSIX (по умолчанию)"
 
-#: builtin/grep.c:871
 msgid "interpret patterns as fixed strings"
 msgstr "интерпретировать шаблоны как фиксированные строки"
 
-#: builtin/grep.c:874
 msgid "use Perl-compatible regular expressions"
 msgstr "использовать Perl-совместимые регулярные выражения"
 
-#: builtin/grep.c:877
 msgid "show line numbers"
 msgstr "вывести номера строк"
 
-#: builtin/grep.c:878
 msgid "show column number of first match"
 msgstr ""
 
-#: builtin/grep.c:879
 msgid "don't show filenames"
 msgstr "не выводить имена файлов"
 
-#: builtin/grep.c:880
 msgid "show filenames"
 msgstr "выводить имена файлов"
 
-#: builtin/grep.c:882
 msgid "show filenames relative to top directory"
 msgstr "выводить имена файлов относительно каталога репозитория"
 
-#: builtin/grep.c:884
 msgid "show only filenames instead of matching lines"
 msgstr "выводить только имена файлов, а не совпадающие строки"
 
-#: builtin/grep.c:886
 msgid "synonym for --files-with-matches"
 msgstr "синоним для --files-with-matches"
 
-#: builtin/grep.c:889
 msgid "show only the names of files without match"
 msgstr "выводить только несовпадающие имена файлов"
 
-#: builtin/grep.c:891
 msgid "print NUL after filenames"
 msgstr "выводить двоичный НОЛЬ после списка имен файлов"
 
-#: builtin/grep.c:894
 msgid "show only matching parts of a line"
 msgstr ""
 
-#: builtin/grep.c:896
 msgid "show the number of matches instead of matching lines"
 msgstr "выводить количество совпадений, а не совпадающие строки"
 
-#: builtin/grep.c:897
 msgid "highlight matches"
 msgstr "подсвечивать совпадения"
 
-#: builtin/grep.c:899
 msgid "print empty line between matches from different files"
 msgstr "выводить пустую строку после совпадений из разных файлов"
 
-#: builtin/grep.c:901
 msgid "show filename only once above matches from same file"
 msgstr "выводить имя файла только раз на несколько совпадений в одном файле"
 
-#: builtin/grep.c:904
 msgid "show <n> context lines before and after matches"
 msgstr "показать <n> строк контекста перед и после совпадения"
 
-#: builtin/grep.c:907
 msgid "show <n> context lines before matches"
 msgstr "показать <n> строк контекста перед совпадением"
 
-#: builtin/grep.c:909
 msgid "show <n> context lines after matches"
 msgstr "показать <n> строк контекста после совпадения"
 
-#: builtin/grep.c:911
 msgid "use <n> worker threads"
 msgstr "использовать <кол> рабочих потоков"
 
-#: builtin/grep.c:912
 msgid "shortcut for -C NUM"
 msgstr "тоже, что и -C КОЛИЧЕСТВО"
 
-#: builtin/grep.c:915
 msgid "show a line with the function name before matches"
 msgstr "показать строку с именем функции перед совпадением"
 
-#: builtin/grep.c:917
 msgid "show the surrounding function"
 msgstr "показать окружающую функцию"
 
-#: builtin/grep.c:920
 msgid "read patterns from file"
 msgstr "прочитать шаблоны из файла"
 
-#: builtin/grep.c:922
 msgid "match <pattern>"
 msgstr "поиск соответствий с <шаблоном>"
 
-#: builtin/grep.c:924
 msgid "combine patterns specified with -e"
 msgstr "объединить шаблоны указанные с помощью -e"
 
-#: builtin/grep.c:936
 msgid "indicate hit with exit status without output"
 msgstr "ничего не выводить, указать на совпадение с помощью кода выхода"
 
-#: builtin/grep.c:938
 msgid "show only matches from files that match all patterns"
 msgstr "показать только совпадения из файлов в которых совпадают все шаблоны"
 
-#: builtin/grep.c:940
-msgid "show parse tree for grep expression"
-msgstr "показать дерево разбора для выражения поиска"
-
-#: builtin/grep.c:944
 msgid "pager"
 msgstr "пейджер"
 
-#: builtin/grep.c:944
 msgid "show matching files in the pager"
 msgstr "показать совпадающие файлы с помощью программы-пейджера"
 
-#: builtin/grep.c:948
 msgid "allow calling of grep(1) (ignored by this build)"
 msgstr "разрешить вызов grep(1) (игнорируется в этой сборке)"
 
-#: builtin/grep.c:1014
 msgid "no pattern given"
 msgstr ""
 
-#: builtin/grep.c:1050
 msgid "--no-index or --untracked cannot be used with revs"
-msgstr "--no-index или --untracked нельзя использовать одновременно с указанием ревизии"
+msgstr ""
+"--no-index или --untracked нельзя использовать одновременно с указанием "
+"ревизии"
 
-#: builtin/grep.c:1058
 #, c-format
 msgid "unable to resolve revision: %s"
 msgstr "не удалось определить редакцию: %s"
 
-#: builtin/grep.c:1088
 msgid "--untracked not supported with --recurse-submodules"
 msgstr ""
 
-#: builtin/grep.c:1092
 msgid "invalid option combination, ignoring --threads"
 msgstr ""
 
-#: builtin/grep.c:1095 builtin/pack-objects.c:3655
 msgid "no threads support, ignoring --threads"
 msgstr "нет поддержки потоков, игнорирование --threads"
 
-#: builtin/grep.c:1098 builtin/index-pack.c:1573 builtin/pack-objects.c:2933
 #, c-format
 msgid "invalid number of threads specified (%d)"
 msgstr "указано неправильное количество потоков (%d)"
 
-#: builtin/grep.c:1132
 msgid "--open-files-in-pager only works on the worktree"
 msgstr "--open-files-in-pager работает только в рабочем каталоге"
 
-#: builtin/grep.c:1158
-msgid "--cached or --untracked cannot be used with --no-index"
-msgstr ""
-
-#: builtin/grep.c:1164
 msgid "--[no-]exclude-standard cannot be used for tracked contents"
 msgstr ""
 
-#: builtin/grep.c:1172
 msgid "both --cached and trees are given"
 msgstr ""
 
-#: builtin/hash-object.c:85
 msgid ""
 "git hash-object [-t <type>] [-w] [--path=<file> | --no-filters] [--stdin] "
 "[--] <file>..."
-msgstr "git hash-object [-t <тип>] [-w] [--path=<файл> | --no-filters] [--stdin] [--] <файл>…"
-
-#: builtin/hash-object.c:86
-msgid "git hash-object  --stdin-paths"
-msgstr "git hash-object  --stdin-paths"
+msgstr ""
+"git hash-object [-t <тип>] [-w] [--path=<файл> | --no-filters] [--stdin] "
+"[--] <файл>..."
 
-#: builtin/hash-object.c:98
 msgid "object type"
 msgstr "тип объекта"
 
-#: builtin/hash-object.c:99
 msgid "write the object into the object database"
 msgstr "запись объекта в базу данных объектов"
 
-#: 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 "сохранить файл без использования фильтров"
 
-#: builtin/hash-object.c:104
 msgid ""
 "just hash any random garbage to create corrupt objects for debugging Git"
-msgstr "хэшировать любой мусор и создавать поврежденные объекты для отладки Git"
+msgstr ""
+"хэшировать любой мусор и создавать поврежденные объекты для отладки Git"
 
-#: builtin/hash-object.c:105
 msgid "process file as it were from this path"
 msgstr "обработать файл так, будто он находится по указанному пути"
 
-#: builtin/help.c:47
 msgid "print all available commands"
 msgstr "вывести список всех доступных команд"
 
-#: builtin/help.c:48
-msgid "exclude guides"
-msgstr "исключить руководства"
-
-#: builtin/help.c:49
-msgid "print list of useful guides"
-msgstr "вывести список полезных руководств"
+msgid "show external commands in --all"
+msgstr ""
 
-#: builtin/help.c:50
-msgid "print all configuration variable names"
+msgid "show aliases in --all"
 msgstr ""
 
-#: builtin/help.c:52
+msgid "exclude guides"
+msgstr "исключить руководства"
+
 msgid "show man page"
 msgstr "открыть руководство в формате man"
 
-#: builtin/help.c:53
 msgid "show manual in web browser"
 msgstr "открыть руководство в веб-браузере"
 
-#: builtin/help.c:55
 msgid "show info page"
 msgstr "открыть руководство в формате info"
 
-#: builtin/help.c:57
 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] [<команда>]"
+msgid "print list of useful guides"
+msgstr "вывести список полезных руководств"
+
+msgid "print all configuration variable names"
+msgstr ""
+
+msgid "git help [[-i|--info] [-m|--man] [-w|--web]] [<command>]"
+msgstr ""
 
-#: builtin/help.c:163
 #, c-format
 msgid "unrecognized help format '%s'"
 msgstr "неопознанный формат руководства «%s»"
 
-#: builtin/help.c:190
 msgid "Failed to start emacsclient."
 msgstr "Сбой при запуске emacsclient."
 
-#: builtin/help.c:203
 msgid "Failed to parse emacsclient version."
 msgstr "Сбой при определении версии emacsclient."
 
-#: builtin/help.c:211
 #, 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
 #, c-format
 msgid "failed to exec '%s'"
 msgstr "сбой при запуске «%s»"
 
-#: builtin/help.c:307
 #, c-format
 msgid ""
 "'%s': path for unsupported man viewer.\n"
 "Please consider using 'man.<tool>.cmd' instead."
-msgstr "«%s»: путь для неподдерживаемой программы просмотра man.\nВместо этого используйте «man.<программа>.cmd»."
+msgstr ""
+"«%s»: путь для неподдерживаемой программы просмотра man.\n"
+"Вместо этого используйте «man.<программа>.cmd»."
 
-#: builtin/help.c:319
 #, c-format
 msgid ""
 "'%s': cmd for supported man viewer.\n"
 "Please consider using 'man.<tool>.path' instead."
-msgstr "«%s»: команда для неподдерживаемой программы просмотра man.\nВместо этого используйте «man.<программа>.path»."
+msgstr ""
+"«%s»: команда для неподдерживаемой программы просмотра man.\n"
+"Вместо этого используйте «man.<программа>.path»."
 
-#: builtin/help.c:436
 #, c-format
 msgid "'%s': unknown man viewer."
 msgstr "«%s»: неизвестная программа просмотра man."
 
-#: builtin/help.c:453
 msgid "no man viewer handled the request"
 msgstr "программа просмотра man не обработала запрос"
 
-#: builtin/help.c:461
 msgid "no info viewer handled the request"
 msgstr "программа просмотра info не обработала запрос"
 
-#: builtin/help.c:520 builtin/help.c:531 git.c:337
 #, c-format
 msgid "'%s' is aliased to '%s'"
 msgstr "«%s» — это сокращение для «%s»"
 
-#: builtin/help.c:534 git.c:369
 #, c-format
 msgid "bad alias.%s string: %s"
 msgstr ""
 
-#: builtin/help.c:563 builtin/help.c:593
+#, c-format
+msgid "the '%s' option doesn't take any non-option arguments"
+msgstr ""
+
+msgid ""
+"the '--no-[external-commands|aliases]' options can only be used with '--all'"
+msgstr ""
+
 #, c-format
 msgid "usage: %s%s"
 msgstr "использование: %s%s"
 
-#: builtin/help.c:577
 msgid "'git help config' for more information"
 msgstr ""
 
-#: builtin/index-pack.c:221
+msgid "git hook run [--ignore-missing] <hook-name> [-- <hook-args>]"
+msgstr ""
+
+msgid "silently ignore missing requested <hook-name>"
+msgstr ""
+
 #, c-format
 msgid "object type mismatch at %s"
 msgstr "несоответствие типа объекта на %s"
 
-#: builtin/index-pack.c:241
 #, c-format
 msgid "did not receive expected object %s"
 msgstr "ожидаемый объект не получен на %s"
 
-#: builtin/index-pack.c:244
 #, c-format
 msgid "object %s: expected type %s, found %s"
 msgstr "объект %s: ожидаемый тип %s, получен %s"
 
-#: builtin/index-pack.c:294
 #, c-format
 msgid "cannot fill %d byte"
 msgid_plural "cannot fill %d bytes"
@@ -14769,163 +6782,122 @@ msgstr[1] "не удалось заполнить %d байта"
 msgstr[2] "не удалось заполнить %d байтов"
 msgstr[3] "не удалось заполнить %d байтов"
 
-#: builtin/index-pack.c:304
 msgid "early EOF"
 msgstr "неожиданный конец файла"
 
-#: builtin/index-pack.c:305
 msgid "read error on input"
 msgstr "ошибка чтения ввода"
 
-#: builtin/index-pack.c:317
 msgid "used more bytes than were available"
 msgstr "использовано больше байт, чем было доступно"
 
-#: builtin/index-pack.c:324 builtin/pack-objects.c:619
 msgid "pack too large for current definition of off_t"
 msgstr "пакет слишком большой для текущего определения off_t"
 
-#: builtin/index-pack.c:327 builtin/unpack-objects.c:95
-msgid "pack exceeds maximum allowed size"
-msgstr "размер пакета превышает максимальный допустимый"
-
-#: builtin/index-pack.c:342 builtin/repack.c:286
-#, c-format
-msgid "unable to create '%s'"
-msgstr "не удалось создать «%s»"
-
-#: builtin/index-pack.c:348
 #, c-format
-msgid "cannot open packfile '%s'"
-msgstr "не удалось открыть файл пакета «%s»"
+msgid "pack exceeds maximum allowed size (%s)"
+msgstr ""
 
-#: builtin/index-pack.c:362
 msgid "pack signature mismatch"
 msgstr "несоответствие подписи пакета"
 
-#: builtin/index-pack.c:364
 #, c-format
 msgid "pack version %<PRIu32> unsupported"
 msgstr "версия пакета %<PRIu32> не поддерживается"
 
-#: builtin/index-pack.c:382
 #, c-format
 msgid "pack has bad object at offset %<PRIuMAX>: %s"
 msgstr "пакет содержит плохой объект по смещению %<PRIuMAX>: %s"
 
-#: builtin/index-pack.c:488
 #, c-format
 msgid "inflate returned %d"
 msgstr "программа сжатия вернула %d"
 
-#: builtin/index-pack.c:537
 msgid "offset value overflow for delta base object"
 msgstr "переполнение значения смещения у базового объекта дельты"
 
-#: builtin/index-pack.c:545
 msgid "delta base offset is out of bound"
 msgstr "смещение базовой дельты вышло за допустимые пределы"
 
-#: builtin/index-pack.c:553
 #, c-format
 msgid "unknown object type %d"
 msgstr "неизвестный тип объекта %d"
 
-#: builtin/index-pack.c:584
 msgid "cannot pread pack file"
 msgstr "не удалось выполнить pread для файла пакета"
 
-#: builtin/index-pack.c:586
 #, 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> байта отсутствует"
-msgstr[2] "преждевременное окончание файла пакета, %<PRIuMAX> байтов отсутствует"
-msgstr[3] "преждевременное окончание файла пакета, %<PRIuMAX> байтов отсутствует"
+msgstr[1] ""
+"преждевременное окончание файла пакета, %<PRIuMAX> байта отсутствует"
+msgstr[2] ""
+"преждевременное окончание файла пакета, %<PRIuMAX> байтов отсутствует"
+msgstr[3] ""
+"преждевременное окончание файла пакета, %<PRIuMAX> байтов отсутствует"
 
-#: builtin/index-pack.c:612
 msgid "serious inflate inconsistency"
 msgstr "серьезное несоответствие при распаковке"
 
-#: 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
 #, c-format
 msgid "SHA1 COLLISION FOUND WITH %s !"
 msgstr "НАЙДЕНА КОЛЛИЗИЯ SHA1 С %s !"
 
-#: builtin/index-pack.c:760 builtin/pack-objects.c:171
-#: builtin/pack-objects.c:231 builtin/pack-objects.c:326
 #, c-format
 msgid "unable to read %s"
 msgstr "не удалось прочитать %s"
 
-#: builtin/index-pack.c:824
 #, c-format
 msgid "cannot read existing object info %s"
 msgstr "не удалось прочитать информацию существующего объекта %s"
 
-#: builtin/index-pack.c:832
 #, c-format
 msgid "cannot read existing object %s"
 msgstr "не удалось прочитать существующий объект %s"
 
-#: builtin/index-pack.c:846
 #, c-format
 msgid "invalid blob object %s"
 msgstr "неправильный файл двоичного объекта %s"
 
-#: builtin/index-pack.c:849 builtin/index-pack.c:868
 msgid "fsck error in packed object"
 msgstr ""
 
-#: builtin/index-pack.c:870
 #, c-format
 msgid "Not all child objects of %s are reachable"
 msgstr "Не все дочерние объекты %s достижимы"
 
-#: builtin/index-pack.c:931 builtin/index-pack.c:978
 msgid "failed to apply delta"
 msgstr "сбой при применении дельты"
 
-#: builtin/index-pack.c:1161
 msgid "Receiving objects"
 msgstr "Получение объектов"
 
-#: builtin/index-pack.c:1161
 msgid "Indexing objects"
 msgstr "Индексирование объектов"
 
-#: builtin/index-pack.c:1195
 msgid "pack is corrupted (SHA1 mismatch)"
 msgstr "пакет поврежден (несоответствие SHA1)"
 
-#: builtin/index-pack.c:1200
 msgid "cannot fstat packfile"
 msgstr "не удалось выполнить fstat для файла пакета"
 
-#: builtin/index-pack.c:1203
 msgid "pack has junk at the end"
 msgstr "файл пакета содержит мусор в конце"
 
-#: builtin/index-pack.c:1215
 msgid "confusion beyond insanity in parse_pack_objects()"
 msgstr "безумная путаница в parse_pack_objects()"
 
-#: builtin/index-pack.c:1238
 msgid "Resolving deltas"
 msgstr "Определение изменений"
 
-#: builtin/index-pack.c:1249 builtin/pack-objects.c:2697
 #, c-format
 msgid "unable to create thread: %s"
 msgstr "не удалось создать поток: %s"
 
-#: builtin/index-pack.c:1282
 msgid "confusion beyond insanity"
 msgstr "безумная путаница"
 
-#: builtin/index-pack.c:1288
 #, c-format
 msgid "completed with %d local object"
 msgid_plural "completed with %d local objects"
@@ -14934,12 +6906,10 @@ msgstr[1] "завершено с %d локальными объектами"
 msgstr[2] "завершено с %d локальными объектами"
 msgstr[3] "завершено с %d локальными объектами"
 
-#: builtin/index-pack.c:1300
 #, c-format
 msgid "Unexpected tail checksum for %s (disk corruption?)"
 msgstr "Неожиданная контрольная сумма в конце %s (диск поврежден?)"
 
-#: builtin/index-pack.c:1304
 #, c-format
 msgid "pack has %d unresolved delta"
 msgid_plural "pack has %d unresolved deltas"
@@ -14948,59 +6918,45 @@ msgstr[1] "пакет содержит %d неразрешенные дельт�
 msgstr[2] "пакет содержит %d неразрешенных дельт"
 msgstr[3] "пакет содержит %d неразрешенных дельт"
 
-#: builtin/index-pack.c:1328
 #, c-format
 msgid "unable to deflate appended object (%d)"
 msgstr "нельзя сжать присоединенный объект (%d)"
 
-#: builtin/index-pack.c:1424
 #, c-format
 msgid "local object %s is corrupt"
 msgstr "локальный объект %s поврежден"
 
-#: builtin/index-pack.c:1444
 #, c-format
-msgid "packfile name '%s' does not end with '.pack'"
-msgstr "имя пакета «%s» не оканчивается на «.pack»"
+msgid "packfile name '%s' does not end with '.%s'"
+msgstr ""
 
-#: builtin/index-pack.c:1469
 #, c-format
 msgid "cannot write %s file '%s'"
 msgstr ""
 
-#: builtin/index-pack.c:1477
 #, c-format
 msgid "cannot close written %s file '%s'"
 msgstr ""
 
-#: builtin/index-pack.c:1501
+#, c-format
+msgid "unable to rename temporary '*.%s' file to '%s'"
+msgstr ""
+
 msgid "error while closing pack file"
 msgstr "ошибка при закрытии файла пакета"
 
-#: builtin/index-pack.c:1515
-msgid "cannot store pack file"
-msgstr "не удалось сохранить файл пакета"
-
-#: builtin/index-pack.c:1523
-msgid "cannot store index file"
-msgstr "не удалось сохранить файл индекса"
-
-#: builtin/index-pack.c:1567 builtin/pack-objects.c:2944
 #, c-format
-msgid "bad pack.indexversion=%<PRIu32>"
-msgstr "плохой pack.indexversion=%<PRIu32>"
+msgid "bad pack.indexVersion=%<PRIu32>"
+msgstr ""
 
-#: builtin/index-pack.c:1631
 #, c-format
 msgid "Cannot open existing pack file '%s'"
 msgstr "Не удалось открыть существующий файл пакета «%s»"
 
-#: builtin/index-pack.c:1633
 #, c-format
 msgid "Cannot open existing pack idx file for '%s'"
 msgstr "Не удалось открыть существующий файл индекса для «%s»"
 
-#: builtin/index-pack.c:1681
 #, c-format
 msgid "non delta: %d object"
 msgid_plural "non delta: %d objects"
@@ -15009,7 +6965,6 @@ msgstr[1] "не дельты: %d объекта"
 msgstr[2] "не дельты: %d объектов"
 msgstr[3] "не дельты: %d объектов"
 
-#: builtin/index-pack.c:1688
 #, c-format
 msgid "chain length = %d: %lu object"
 msgid_plural "chain length = %d: %lu objects"
@@ -15018,937 +6973,803 @@ msgstr[1] "длина цепочки = %d: %lu объекта"
 msgstr[2] "длина цепочки = %d: %lu объектов"
 msgstr[3] "длина цепочки = %d: %lu объектов"
 
-#: builtin/index-pack.c:1728
 msgid "Cannot come back to cwd"
 msgstr "Не удалось вернуться в текущий рабочий каталог"
 
-#: builtin/index-pack.c:1777 builtin/index-pack.c:1780
-#: builtin/index-pack.c:1796 builtin/index-pack.c:1800
 #, c-format
 msgid "bad %s"
 msgstr "плохой %s"
 
-#: builtin/index-pack.c:1806 builtin/init-db.c:392 builtin/init-db.c:625
 #, c-format
 msgid "unknown hash algorithm '%s'"
 msgstr ""
 
-#: builtin/index-pack.c:1821
-msgid "--fix-thin cannot be used without --stdin"
-msgstr "--fix-thin нельзя использовать без --stdin"
-
-#: builtin/index-pack.c:1823
 msgid "--stdin requires a git repository"
 msgstr "опция --stdin требует наличия репозитория git"
 
-#: builtin/index-pack.c:1825
-msgid "--object-format cannot be used with --stdin"
-msgstr ""
-
-#: builtin/index-pack.c:1831
 msgid "--verify with no packfile name given"
 msgstr "--verify без указания имени файла пакета"
 
-#: builtin/index-pack.c:1892 builtin/unpack-objects.c:582
 msgid "fsck error in pack objects"
 msgstr "ошибка fsck в упакованных объектах"
 
-#: builtin/init-db.c:64
 #, c-format
 msgid "cannot stat template '%s'"
 msgstr "не удалось выполнить stat для шаблона «%s»"
 
-#: builtin/init-db.c:69
 #, c-format
 msgid "cannot opendir '%s'"
 msgstr "не удалось выполнить opendir для «%s»"
 
-#: builtin/init-db.c:81
 #, c-format
 msgid "cannot readlink '%s'"
 msgstr "не удалось выполнить readlink для «%s»"
 
-#: builtin/init-db.c:83
 #, c-format
 msgid "cannot symlink '%s' '%s'"
 msgstr "не удалось создать символьную ссылку «%s» на «%s»"
 
-#: builtin/init-db.c:89
 #, c-format
 msgid "cannot copy '%s' to '%s'"
 msgstr "не удалось скопировать файл «%s» в «%s»"
 
-#: builtin/init-db.c:93
 #, c-format
 msgid "ignoring template %s"
 msgstr "игнорирование шаблона %s"
 
-#: builtin/init-db.c:124
 #, c-format
 msgid "templates not found in %s"
 msgstr ""
 
-#: builtin/init-db.c:139
 #, c-format
 msgid "not copying templates from '%s': %s"
 msgstr "не копирую шаблоны из «%s»: %s"
 
-#: builtin/init-db.c:275
 #, c-format
 msgid "invalid initial branch name: '%s'"
 msgstr ""
 
-#: builtin/init-db.c:367
 #, c-format
 msgid "unable to handle file type %d"
 msgstr "не удается обработать файл типа %d"
 
-#: builtin/init-db.c:370
 #, c-format
 msgid "unable to move %s to %s"
 msgstr "не удается переместить файл %s в %s"
 
-#: builtin/init-db.c:386
 msgid "attempt to reinitialize repository with different hash"
 msgstr ""
 
-#: builtin/init-db.c:410 builtin/init-db.c:413
 #, c-format
 msgid "%s already exists"
 msgstr "%s уже существует"
 
-#: builtin/init-db.c:445
 #, c-format
 msgid "re-init: ignored --initial-branch=%s"
 msgstr ""
 
-#: builtin/init-db.c:476
 #, c-format
 msgid "Reinitialized existing shared Git repository in %s%s\n"
 msgstr "Переинициализирован существующий общий репозиторий Git в %s%s\n"
 
-#: builtin/init-db.c:477
 #, c-format
 msgid "Reinitialized existing Git repository in %s%s\n"
 msgstr "Переинициализирован существующий репозиторий Git в %s%s\n"
 
-#: builtin/init-db.c:481
 #, c-format
 msgid "Initialized empty shared Git repository in %s%s\n"
 msgstr "Инициализирован пустой общий репозиторий Git в %s%s\n"
 
-#: builtin/init-db.c:482
 #, c-format
 msgid "Initialized empty Git repository in %s%s\n"
 msgstr "Инициализирован пустой репозиторий Git в %s%s\n"
 
-#: builtin/init-db.c:531
 msgid ""
-"git init [-q | --quiet] [--bare] [--template=<template-directory>] "
-"[--shared[=<permissions>]] [<directory>]"
-msgstr "git init [-q | --quiet] [--bare] [--template=<каталог-шаблонов>] [--shared[=<права-доступа>]] [<каталог>]"
+"git init [-q | --quiet] [--bare] [--template=<template-directory>] [--"
+"shared[=<permissions>]] [<directory>]"
+msgstr ""
+"git init [-q | --quiet] [--bare] [--template=<каталог-шаблонов>] [--"
+"shared[=<права-доступа>]] [<каталог>]"
 
-#: builtin/init-db.c:557
 msgid "permissions"
 msgstr "права-доступа"
 
-#: builtin/init-db.c:558
 msgid "specify that the git repository is to be shared amongst several users"
-msgstr "укажите, если репозиторий git будет использоваться несколькими пользователями"
+msgstr ""
+"укажите, если репозиторий git будет использоваться несколькими пользователями"
 
-#: builtin/init-db.c:564
 msgid "override the name of the initial branch"
 msgstr ""
 
-#: builtin/init-db.c:565 builtin/verify-pack.c:74
 msgid "hash"
 msgstr "хэш-код"
 
-#: builtin/init-db.c:566 builtin/show-index.c:22 builtin/verify-pack.c:75
 msgid "specify the hash algorithm to use"
 msgstr "указание какой алгоритм хэширования использовать"
 
-#: builtin/init-db.c:573
-msgid "--separate-git-dir and --bare are mutually exclusive"
-msgstr ""
-
-#: builtin/init-db.c:602 builtin/init-db.c:607
 #, c-format
 msgid "cannot mkdir %s"
 msgstr "не удалось выполнить mkdir %s"
 
-#: builtin/init-db.c:611 builtin/init-db.c:666
 #, c-format
 msgid "cannot chdir to %s"
 msgstr "не удалось выполнить chdir в %s"
 
-#: builtin/init-db.c:638
 #, c-format
 msgid ""
 "%s (or --work-tree=<directory>) not allowed without specifying %s (or --git-"
 "dir=<directory>)"
-msgstr "%s (или --work-tree=<каталог>) нельзя использовать без указания %s (или --git-dir=<каталог>)"
+msgstr ""
+"%s (или --work-tree=<каталог>) нельзя использовать без указания %s (или --"
+"git-dir=<каталог>)"
 
-#: builtin/init-db.c:690
 #, c-format
 msgid "Cannot access work tree '%s'"
 msgstr "Не удалось получить доступ к рабочему каталогу «%s»"
 
-#: builtin/init-db.c:695
 msgid "--separate-git-dir incompatible with bare repository"
 msgstr ""
 
-#: builtin/interpret-trailers.c:16
 msgid ""
 "git interpret-trailers [--in-place] [--trim-empty] [(--trailer "
 "<token>[(=|:)<value>])...] [<file>...]"
-msgstr "git interpret-trailers [--in-place] [--trim-empty] [(--trailer <ключ>[(=|:)<значение>])…] [<файл>…]"
+msgstr ""
+"git interpret-trailers [--in-place] [--trim-empty] [(--trailer "
+"<ключ>[(=|:)<значение>])...] [<файл>...]"
 
-#: builtin/interpret-trailers.c:95
 msgid "edit files in place"
 msgstr "редактировать файлы на месте"
 
-#: builtin/interpret-trailers.c:96
 msgid "trim empty trailers"
 msgstr "удалять пустые завершители"
 
-#: builtin/interpret-trailers.c:99
 msgid "where to place the new trailer"
 msgstr "где поместить новый завершитель"
 
-#: builtin/interpret-trailers.c:101
 msgid "action if trailer already exists"
 msgstr "действие, если завершитель уже существует"
 
-#: builtin/interpret-trailers.c:103
 msgid "action if trailer is missing"
 msgstr "действие, если завершитель не существует"
 
-#: builtin/interpret-trailers.c:105
 msgid "output only the trailers"
 msgstr "вывести только завершители"
 
-#: builtin/interpret-trailers.c:106
 msgid "do not apply config rules"
 msgstr "не применять правила из файла конфигурации"
 
-#: builtin/interpret-trailers.c:107
 msgid "join whitespace-continued values"
 msgstr "объединить значения разделенные пробелом"
 
-#: builtin/interpret-trailers.c:108
 msgid "set parsing options"
 msgstr "указание опций разбора"
 
-#: builtin/interpret-trailers.c:110
 msgid "do not treat --- specially"
 msgstr "не воспринимать --- по-особенному"
 
-#: builtin/interpret-trailers.c:111
-msgid "trailer"
-msgstr "завершитель"
-
-#: builtin/interpret-trailers.c:112
 msgid "trailer(s) to add"
 msgstr "завершители для добавления"
 
-#: builtin/interpret-trailers.c:123
 msgid "--trailer with --only-input does not make sense"
 msgstr "--trailer одновременно с --only-input не имеет смысла"
 
-#: builtin/interpret-trailers.c:133
 msgid "no input file given for in-place editing"
 msgstr "ничего не передано, для редактирования файлов на месте"
 
-#: builtin/log.c:58
 msgid "git log [<options>] [<revision-range>] [[--] <path>...]"
-msgstr "git log [<опции>] [<диапазон-редакций>] [[--] <путь>…]"
+msgstr "git log [<опции>] [<диапазон-редакций>] [[--] <путь>...]"
 
-#: builtin/log.c:59
 msgid "git show [<options>] <object>..."
-msgstr "git show [<опции>] <объект>…"
+msgstr "git show [<опции>] <объект>..."
 
-#: builtin/log.c:112
 #, c-format
 msgid "invalid --decorate option: %s"
 msgstr "неправильный параметр для --decorate: %s"
 
-#: builtin/log.c:179
+msgid "suppress diff output"
+msgstr "не выводить список изменений"
+
 msgid "show source"
 msgstr "показать источник"
 
-#: builtin/log.c:180
-msgid "Use mail map file"
-msgstr "Использовать файл соответствия почтовых адресов"
+msgid "use mail map file"
+msgstr ""
 
-#: builtin/log.c:183
 msgid "only decorate refs that match <pattern>"
 msgstr "декорировать только ссылки соответствующие <шаблону>"
 
-#: builtin/log.c:185
 msgid "do not decorate refs that match <pattern>"
 msgstr "не декорировать ссылки соответствующие <шаблону>"
 
-#: builtin/log.c:186
 msgid "decorate options"
 msgstr "опции формата вывода ссылок"
 
-#: builtin/log.c:189
 msgid ""
-"Trace the evolution of line range <start>,<end> or function :<funcname> in "
+"trace the evolution of line range <start>,<end> or function :<funcname> in "
 "<file>"
 msgstr ""
 
-#: builtin/log.c:212
+#, c-format
+msgid "unrecognized argument: %s"
+msgstr "неопознанный аргумент: %s"
+
 msgid "-L<range>:<file> cannot be used with pathspec"
 msgstr ""
 
-#: builtin/log.c:302
 #, c-format
 msgid "Final output: %d %s\n"
 msgstr "Финальный вывод: %d %s\n"
 
-#: builtin/log.c:564
+msgid "unable to create temporary object directory"
+msgstr ""
+
 #, c-format
 msgid "git show %s: bad file"
 msgstr "git show %s: плохой файл"
 
-#: builtin/log.c:579 builtin/log.c:674
 #, c-format
 msgid "could not read object %s"
 msgstr ""
 
-#: builtin/log.c:699
 #, c-format
 msgid "unknown type: %d"
 msgstr ""
 
-#: builtin/log.c:848
 #, c-format
 msgid "%s: invalid cover from description mode"
 msgstr ""
 
-#: builtin/log.c:855
 msgid "format.headers without value"
 msgstr "в format.headers не указано значение"
 
-#: builtin/log.c:984
 #, c-format
 msgid "cannot open patch file %s"
 msgstr ""
 
-#: builtin/log.c:1001
 msgid "need exactly one range"
 msgstr ""
 
-#: builtin/log.c:1011
 msgid "not a range"
 msgstr ""
 
-#: builtin/log.c:1175
 msgid "cover letter needs email format"
 msgstr ""
 
-#: builtin/log.c:1181
 msgid "failed to create cover-letter file"
 msgstr ""
 
-#: builtin/log.c:1262
 #, c-format
 msgid "insane in-reply-to: %s"
 msgstr "ошибка в поле in-reply-to: %s"
 
-#: builtin/log.c:1289
 msgid "git format-patch [<options>] [<since> | <revision-range>]"
 msgstr "git format-patch [<опции>] [<начиная-с> | <диапазон-редакций>]"
 
-#: builtin/log.c:1347
 msgid "two output directories?"
 msgstr ""
 
-#: builtin/log.c:1498 builtin/log.c:2318 builtin/log.c:2320 builtin/log.c:2332
 #, c-format
 msgid "unknown commit %s"
 msgstr ""
 
-#: builtin/log.c:1509 builtin/replace.c:58 builtin/replace.c:207
-#: builtin/replace.c:210
 #, c-format
 msgid "failed to resolve '%s' as a valid ref"
 msgstr ""
 
-#: builtin/log.c:1518
 msgid "could not find exact merge base"
 msgstr ""
 
-#: builtin/log.c:1528
 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"
 "Or you could specify base commit by --base=<base-commit-id> manually"
 msgstr ""
 
-#: builtin/log.c:1551
 msgid "failed to find exact merge base"
 msgstr ""
 
-#: builtin/log.c:1568
 msgid "base commit should be the ancestor of revision list"
 msgstr "базовый коммит должен быть предком списка редакций"
 
-#: builtin/log.c:1578
 msgid "base commit shouldn't be in revision list"
 msgstr "базовый коммит не должен быть в списке редакций"
 
-#: builtin/log.c:1636
 msgid "cannot get patch id"
 msgstr "не удалось получить идентификатор патча"
 
-#: builtin/log.c:1693
 msgid "failed to infer range-diff origin of current series"
 msgstr ""
 
-#: builtin/log.c:1695
 #, c-format
 msgid "using '%s' as range-diff origin of current series"
 msgstr ""
 
-#: builtin/log.c:1739
 msgid "use [PATCH n/m] even with a single patch"
 msgstr "выводить [PATCH n/m] даже когда один патч"
 
-#: builtin/log.c:1742
 msgid "use [PATCH] even with multiple patches"
 msgstr "выводить [PATCH] даже когда несколько патчей"
 
-#: builtin/log.c:1746
 msgid "print patches to standard out"
 msgstr "выводить патчи на стандартный вывод"
 
-#: builtin/log.c:1748
 msgid "generate a cover letter"
 msgstr "создать сопроводительное письмо"
 
-#: builtin/log.c:1750
 msgid "use simple number sequence for output file names"
 msgstr "использовать простую последовательность чисел для имен выходных файлов"
 
-#: builtin/log.c:1751
 msgid "sfx"
 msgstr "суффикс"
 
-#: builtin/log.c:1752
 msgid "use <sfx> instead of '.patch'"
 msgstr "использовать суффикс <суффикс> вместо «.patch»"
 
-#: builtin/log.c:1754
 msgid "start numbering patches at <n> instead of 1"
 msgstr "начать нумерацию патчей с <n>, а не с 1"
 
-#: builtin/log.c:1756
+msgid "reroll-count"
+msgstr ""
+
 msgid "mark the series as Nth re-roll"
 msgstr "пометить серию как энную попытку"
 
-#: builtin/log.c:1758
 msgid "max length of output filename"
 msgstr ""
 
-#: builtin/log.c:1760
-msgid "Use [RFC PATCH] instead of [PATCH]"
-msgstr "Использовать [RFC PATCH] вместо [PATCH]"
+msgid "use [RFC PATCH] instead of [PATCH]"
+msgstr ""
 
-#: builtin/log.c:1763
 msgid "cover-from-description-mode"
 msgstr ""
 
-#: builtin/log.c:1764
 msgid "generate parts of a cover letter based on a branch's description"
 msgstr ""
 
-#: builtin/log.c:1766
-msgid "Use [<prefix>] instead of [PATCH]"
-msgstr "Использовать [<префикс>] вместо [PATCH]"
+msgid "use [<prefix>] instead of [PATCH]"
+msgstr ""
 
-#: builtin/log.c:1769
 msgid "store resulting files in <dir>"
 msgstr "сохранить результирующие файлы в <каталог>"
 
-#: builtin/log.c:1772
 msgid "don't strip/add [PATCH]"
 msgstr "не обрезать/добавлять [PATCH]"
 
-#: builtin/log.c:1775
 msgid "don't output binary diffs"
 msgstr "не выводить двоичные изменения"
 
-#: builtin/log.c:1777
 msgid "output all-zero hash in From header"
 msgstr "выводить нулевой хэш-код в заголовке From"
 
-#: builtin/log.c:1779
 msgid "don't include a patch matching a commit upstream"
 msgstr "не включать патч, если коммит уже есть в вышестоящей ветке"
 
-#: builtin/log.c:1781
 msgid "show patch format instead of default (patch + stat)"
 msgstr "выводить в формате патча, а не в стандартном (патч + статистика)"
 
-#: builtin/log.c:1783
 msgid "Messaging"
 msgstr "Передача сообщений"
 
-#: builtin/log.c:1784
 msgid "header"
 msgstr "заголовок"
 
-#: builtin/log.c:1785
 msgid "add email header"
 msgstr "добавить заголовок сообщения"
 
-#: builtin/log.c:1786 builtin/log.c:1787
 msgid "email"
 msgstr "почта"
 
-#: builtin/log.c:1786
 msgid "add To: header"
 msgstr "добавить заголовок To:"
 
-#: builtin/log.c:1787
 msgid "add Cc: header"
 msgstr "добавить заголовок Cc:"
 
-#: builtin/log.c:1788
 msgid "ident"
 msgstr "идентификатор"
 
-#: builtin/log.c:1789
 msgid "set From address to <ident> (or committer ident if absent)"
-msgstr "установить адрес отправителя на <идентификатор> (или на идентификатор коммитера, если отсутствует)"
+msgstr ""
+"установить адрес отправителя на <идентификатор> (или на идентификатор "
+"коммитера, если отсутствует)"
 
-#: builtin/log.c:1791
 msgid "message-id"
 msgstr "идентификатор-сообщения"
 
-#: builtin/log.c:1792
 msgid "make first mail a reply to <message-id>"
 msgstr "сделать первое письмо ответом на <идентификатор-сообщения>"
 
-#: builtin/log.c:1793 builtin/log.c:1796
 msgid "boundary"
 msgstr "вложение"
 
-#: builtin/log.c:1794
 msgid "attach the patch"
 msgstr "приложить патч"
 
-#: builtin/log.c:1797
 msgid "inline the patch"
 msgstr "включить патч в текст письма"
 
-#: builtin/log.c:1801
 msgid "enable message threading, styles: shallow, deep"
-msgstr "включить в письмах иерархичность, стили: shallow (частичную), deep (глубокую)"
+msgstr ""
+"включить в письмах иерархичность, стили: shallow (частичную), deep (глубокую)"
 
-#: builtin/log.c:1803
 msgid "signature"
 msgstr "подпись"
 
-#: builtin/log.c:1804
 msgid "add a signature"
 msgstr "добавить подпись"
 
-#: builtin/log.c:1805
 msgid "base-commit"
 msgstr "базовый коммит"
 
-#: builtin/log.c:1806
 msgid "add prerequisite tree info to the patch series"
 msgstr "добавить информацию о требовании дерева к серии патчей"
 
-#: builtin/log.c:1809
 msgid "add a signature from a file"
 msgstr "добавить подпись из файла"
 
-#: builtin/log.c:1810
 msgid "don't print the patch filenames"
 msgstr "не выводить имена файлов патчей"
 
-#: builtin/log.c:1812
 msgid "show progress while generating patches"
 msgstr "показать прогресс выполнения во создания патчей"
 
-#: builtin/log.c:1814
 msgid "show changes against <rev> in cover letter or single patch"
 msgstr ""
 
-#: builtin/log.c:1817
 msgid "show changes against <refspec> in cover letter or single patch"
 msgstr ""
 
-#: builtin/log.c:1819
 msgid "percentage by which creation is weighted"
 msgstr ""
 
-#: builtin/log.c:1905
 #, c-format
 msgid "invalid ident line: %s"
 msgstr "неправильная строка идентификации: %s"
 
-#: builtin/log.c:1920
-msgid "-n and -k are mutually exclusive"
-msgstr ""
-
-#: builtin/log.c:1922
-msgid "--subject-prefix/--rfc and -k are mutually exclusive"
-msgstr ""
-
-#: builtin/log.c:1930
 msgid "--name-only does not make sense"
 msgstr "--name-only не имеет смысла"
 
-#: builtin/log.c:1932
 msgid "--name-status does not make sense"
 msgstr "--name-status не имеет смысла"
 
-#: builtin/log.c:1934
 msgid "--check does not make sense"
 msgstr "--check не имеет смысла"
 
-#: builtin/log.c:1956
-msgid "--stdout, --output, and --output-directory are mutually exclusive"
+msgid "--remerge-diff does not make sense"
 msgstr ""
 
-#: builtin/log.c:2079
+#, c-format
+msgid "could not create directory '%s'"
+msgstr "не удалось создать каталог «%s»"
+
 msgid "--interdiff requires --cover-letter or single patch"
 msgstr ""
 
-#: builtin/log.c:2083
 msgid "Interdiff:"
 msgstr ""
 
-#: builtin/log.c:2084
 #, c-format
 msgid "Interdiff against v%d:"
 msgstr ""
 
-#: builtin/log.c:2090
-msgid "--creation-factor requires --range-diff"
-msgstr ""
-
-#: builtin/log.c:2094
 msgid "--range-diff requires --cover-letter or single patch"
 msgstr ""
 
-#: builtin/log.c:2102
 msgid "Range-diff:"
 msgstr ""
 
-#: builtin/log.c:2103
 #, c-format
 msgid "Range-diff against v%d:"
 msgstr ""
 
-#: builtin/log.c:2114
 #, c-format
 msgid "unable to read signature file '%s'"
 msgstr "не удалось прочитать файл подписи «%s»"
 
-#: builtin/log.c:2150
 msgid "Generating patches"
 msgstr "Создание патчей"
 
-#: builtin/log.c:2194
 msgid "failed to create output files"
 msgstr ""
 
-#: builtin/log.c:2253
 msgid "git cherry [-v] [<upstream> [<head> [<limit>]]]"
 msgstr "git cherry [-v] [<вышестоящая-ветка> [<редакция> [<ограничение>]]]"
 
-#: builtin/log.c:2307
 #, c-format
 msgid ""
-"Could not find a tracked remote branch, please specify <upstream> "
-"manually.\n"
-msgstr "Не удалось найти отслеживаемую внешнюю ветку, укажите <вышестоящую-ветку> вручную.\n"
+"Could not find a tracked remote branch, please specify <upstream> manually.\n"
+msgstr ""
+"Не удалось найти отслеживаемую внешнюю ветку, укажите <вышестоящую-ветку> "
+"вручную.\n"
 
-#: builtin/ls-files.c:471
 msgid "git ls-files [<options>] [<file>...]"
-msgstr "git ls-files [<опции>] [<файл>…]"
+msgstr "git ls-files [<опции>] [<файл>...]"
+
+msgid "separate paths with the NUL character"
+msgstr ""
 
-#: builtin/ls-files.c:527
 msgid "identify the file status with tags"
 msgstr "выводить имена файлов с метками"
 
-#: builtin/ls-files.c:529
 msgid "use lowercase letters for 'assume unchanged' files"
-msgstr "использовать символы в нижнем регистре для «предположительно без изменений» файлов"
+msgstr ""
+"использовать символы в нижнем регистре для «предположительно без изменений» "
+"файлов"
 
-#: builtin/ls-files.c:531
 msgid "use lowercase letters for 'fsmonitor clean' files"
 msgstr "использовать символы нижнего регистра для файлов «fsmonitor clean»"
 
-#: builtin/ls-files.c:533
 msgid "show cached files in the output (default)"
-msgstr "показывать кэшированные файлы при выводе (по умолчанию)"
+msgstr "показывать индексированные файлы (по умолчанию)"
 
-#: builtin/ls-files.c:535
 msgid "show deleted files in the output"
 msgstr "показывать удаленные файлы при выводе"
 
-#: builtin/ls-files.c:537
 msgid "show modified files in the output"
 msgstr "показывать измененные файлы при выводе"
 
-#: builtin/ls-files.c:539
 msgid "show other files in the output"
 msgstr "показывать другие файлы при выводе"
 
-#: builtin/ls-files.c:541
 msgid "show ignored files in the output"
 msgstr "показывать игнорируемые файлы при выводе"
 
-#: builtin/ls-files.c:544
 msgid "show staged contents' object name in the output"
 msgstr "показывать имя индексированного объекта на выводе"
 
-#: builtin/ls-files.c:546
 msgid "show files on the filesystem that need to be removed"
 msgstr "показывать файлы в файловой системе, которые должны быть удалены"
 
-#: builtin/ls-files.c:548
 msgid "show 'other' directories' names only"
 msgstr "показывать только имена у «других» каталогов"
 
-#: builtin/ls-files.c:550
 msgid "show line endings of files"
 msgstr "показать концы строк файлов"
 
-#: builtin/ls-files.c:552
 msgid "don't show empty directories"
 msgstr "не показывать пустые каталоги"
 
-#: builtin/ls-files.c:555
 msgid "show unmerged files in the output"
 msgstr "показывать не слитые файлы на выводе"
 
-#: builtin/ls-files.c:557
 msgid "show resolve-undo information"
 msgstr "показывать информации о разрешении конфликтов и отмене"
 
-#: builtin/ls-files.c:559
 msgid "skip files matching pattern"
 msgstr "пропустить файлы, соответствующие шаблону"
 
-#: builtin/ls-files.c:562
-msgid "exclude patterns are read from <file>"
-msgstr "прочитать шаблоны исключения из <файл>"
+msgid "read exclude patterns from <file>"
+msgstr ""
 
-#: builtin/ls-files.c:565
 msgid "read additional per-directory exclude patterns in <file>"
 msgstr "прочитать дополнительные покаталожные шаблоны исключения из <файл>"
 
-#: builtin/ls-files.c:567
 msgid "add the standard git exclusions"
 msgstr "добавить стандартные исключения git"
 
-#: builtin/ls-files.c:571
 msgid "make the output relative to the project top directory"
 msgstr "выводить пути относительно корневого каталога проекта"
 
-#: builtin/ls-files.c:574
-msgid "recurse through submodules"
-msgstr "рекурсивно по подмодулям"
-
-#: builtin/ls-files.c:576
 msgid "if any <file> is not in the index, treat this as an error"
 msgstr "если какой-либо <файл> не в индексе, считать это ошибкой"
 
-#: builtin/ls-files.c:577
 msgid "tree-ish"
 msgstr "указатель-дерева"
 
-#: builtin/ls-files.c:578
 msgid "pretend that paths removed since <tree-ish> are still present"
 msgstr "притвориться, что пути удалены, т.к. <указатель-дерева> еще существует"
 
-#: builtin/ls-files.c:580
 msgid "show debugging data"
 msgstr "показать отладочную информацию"
 
-#: builtin/ls-remote.c:9
+msgid "suppress duplicate entries"
+msgstr ""
+
+msgid "show sparse directories in the presence of a sparse index"
+msgstr ""
+
 msgid ""
 "git ls-remote [--heads] [--tags] [--refs] [--upload-pack=<exec>]\n"
-"                     [-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] [<репозиторий> [<ссылки>…]]"
+"              [-q | --quiet] [--exit-code] [--get-url]\n"
+"              [--symref] [<repository> [<refs>...]]"
+msgstr ""
 
-#: builtin/ls-remote.c:59
 msgid "do not print remote URL"
 msgstr "не выводить URL внешних репозиториев"
 
-#: builtin/ls-remote.c:60 builtin/ls-remote.c:62 builtin/rebase.c:1398
 msgid "exec"
 msgstr "запуск"
 
-#: builtin/ls-remote.c:61 builtin/ls-remote.c:63
 msgid "path of git-upload-pack on the remote host"
 msgstr "путь к git-upload-pack на внешнем сервере"
 
-#: builtin/ls-remote.c:65
 msgid "limit to tags"
 msgstr "ограничить вывод метками"
 
-#: builtin/ls-remote.c:66
 msgid "limit to heads"
 msgstr "ограничить вывод указателями на ветки"
 
-#: builtin/ls-remote.c:67
 msgid "do not show peeled tags"
 msgstr "не показывать удалённые метки"
 
-#: builtin/ls-remote.c:69
 msgid "take url.<base>.insteadOf into account"
 msgstr "учитывать url.<база>.insteadOf"
 
-#: builtin/ls-remote.c:72
 msgid "exit with exit code 2 if no matching refs are found"
 msgstr "выходить с кодом 2, если соответствующие ссылки не найдены"
 
-#: builtin/ls-remote.c:75
 msgid "show underlying ref in addition to the object pointed by it"
-msgstr "показать также внутреннюю ссылку в дополнение к объекту, на который она указывает"
+msgstr ""
+"показать также внутреннюю ссылку в дополнение к объекту, на который она "
+"указывает"
 
-#: builtin/ls-tree.c:30
 msgid "git ls-tree [<options>] <tree-ish> [<path>...]"
-msgstr "git ls-tree [<опции>] <указатель-дерева> [<путь>…]"
+msgstr "git ls-tree [<опции>] <указатель-дерева> [<путь>...]"
+
+#, c-format
+msgid "could not get object info about '%s'"
+msgstr ""
+
+#, c-format
+msgid "bad ls-tree format: element '%s' does not start with '('"
+msgstr ""
+
+#, c-format
+msgid "bad ls-tree format: element '%s' does not end in ')'"
+msgstr ""
+
+#, c-format
+msgid "bad ls-tree format: %%%.*s"
+msgstr ""
 
-#: builtin/ls-tree.c:128
 msgid "only show trees"
 msgstr "выводить только деревья"
 
-#: builtin/ls-tree.c:130
 msgid "recurse into subtrees"
 msgstr "проходить рекурсивно в поддеревья"
 
-#: builtin/ls-tree.c:132
 msgid "show trees when recursing"
 msgstr "выводить деревья при рекурсивном проходе"
 
-#: builtin/ls-tree.c:135
 msgid "terminate entries with NUL byte"
 msgstr "разделять записи с помощью НУЛЕВОГО байта"
 
-#: builtin/ls-tree.c:136
 msgid "include object size"
 msgstr "включить размер объекта"
 
-#: builtin/ls-tree.c:138 builtin/ls-tree.c:140
 msgid "list only filenames"
 msgstr "выводить только имена файлов"
 
-#: builtin/ls-tree.c:143
+msgid "list only objects"
+msgstr ""
+
 msgid "use full path names"
 msgstr "использовать полные пути"
 
-#: builtin/ls-tree.c:145
 msgid "list entire tree; not just current directory (implies --full-name)"
-msgstr "вывести полное дерево; не только текущий каталог (включает в себя --full-name)"
+msgstr ""
+"вывести полное дерево; не только текущий каталог (включает в себя --full-"
+"name)"
+
+msgid "--format can't be combined with other format-altering options"
+msgstr ""
+
+#. TRANSLATORS: keep <> in "<" mail ">" info.
+msgid "git mailinfo [<options>] <msg> <patch> < mail >info"
+msgstr ""
+
+msgid "keep subject"
+msgstr ""
+
+msgid "keep non patch brackets in subject"
+msgstr ""
+
+msgid "copy Message-ID to the end of commit message"
+msgstr ""
+
+msgid "re-code metadata to i18n.commitEncoding"
+msgstr ""
+
+msgid "disable charset re-coding of metadata"
+msgstr ""
+
+msgid "encoding"
+msgstr ""
+
+msgid "re-code metadata to this encoding"
+msgstr ""
+
+msgid "use scissors"
+msgstr ""
+
+msgid "<action>"
+msgstr ""
+
+msgid "action when quoted CR is found"
+msgstr ""
+
+msgid "use headers in message's body"
+msgstr ""
+
+msgid "reading patches from stdin/tty..."
+msgstr ""
 
-#: builtin/mailsplit.c:241
 #, c-format
 msgid "empty mbox: '%s'"
 msgstr "пустой mbox: «%s»"
 
-#: builtin/merge-base.c:32
 msgid "git merge-base [-a | --all] <commit> <commit>..."
-msgstr "git merge-base [-a | --all] <коммит> <коммит>…"
+msgstr "git merge-base [-a | --all] <коммит> <коммит>..."
 
-#: builtin/merge-base.c:33
 msgid "git merge-base [-a | --all] --octopus <commit>..."
-msgstr "git merge-base [-a | --all] --octopus <коммит>…"
+msgstr "git merge-base [-a | --all] --octopus <коммит>..."
 
-#: builtin/merge-base.c:34
 msgid "git merge-base --independent <commit>..."
-msgstr "git merge-base --independent <коммит>…"
+msgstr "git merge-base --independent <коммит>..."
 
-#: builtin/merge-base.c:35
 msgid "git merge-base --is-ancestor <commit> <commit>"
 msgstr "git merge-base --is-ancestor <коммит> <коммит>"
 
-#: builtin/merge-base.c:36
 msgid "git merge-base --fork-point <ref> [<commit>]"
 msgstr "git merge-base --fork-point <ссылка> [<коммит>]"
 
-#: builtin/merge-base.c:143
 msgid "output all common ancestors"
 msgstr "вывести всех общих предков"
 
-#: builtin/merge-base.c:145
 msgid "find ancestors for a single n-way merge"
 msgstr "вывести предков для одного многоходового слияния"
 
-#: builtin/merge-base.c:147
 msgid "list revs not reachable from others"
 msgstr "вывести список редаций, которые не достижимы из друг друга"
 
-#: builtin/merge-base.c:149
 msgid "is the first one ancestor of the other?"
 msgstr "является первым предком второго указанного коммита?"
 
-#: builtin/merge-base.c:151
 msgid "find where <commit> forked from reflog of <ref>"
 msgstr "найти журнале ссылок <ссылка> где именно <коммит> разветвился"
 
-#: builtin/merge-file.c:9
 msgid ""
 "git merge-file [<options>] [-L <name1> [-L <orig> [-L <name2>]]] <file1> "
 "<orig-file> <file2>"
-msgstr "git merge-file [<опции>] [-L имя1 [-L orig [-L имя2]]] <файл1> <ориг-файл> <файл2>"
+msgstr ""
+"git merge-file [<опции>] [-L имя1 [-L orig [-L имя2]]] <файл1> <ориг-файл> "
+"<файл2>"
 
-#: builtin/merge-file.c:35
 msgid "send results to standard output"
 msgstr "вывести результат на стандартный вывод"
 
-#: builtin/merge-file.c:36
 msgid "use a diff3 based merge"
 msgstr "использовать diff3 слияние"
 
-#: builtin/merge-file.c:37
+msgid "use a zealous diff3 based merge"
+msgstr ""
+
 msgid "for conflicts, use our version"
 msgstr "при возникновении конфликтов, использовать нашу версию"
 
-#: builtin/merge-file.c:39
 msgid "for conflicts, use their version"
 msgstr "при возникновении конфликтов, использовать их версию"
 
-#: builtin/merge-file.c:41
 msgid "for conflicts, use a union version"
 msgstr "при возникновении конфликтов, использовать обе версии"
 
-#: builtin/merge-file.c:44
 msgid "for conflicts, use this marker size"
 msgstr "при возникновении конфликтов, использовать этот размер маркера"
 
-#: builtin/merge-file.c:45
 msgid "do not warn about conflicts"
 msgstr "не предупреждать о конфликтах"
 
-#: builtin/merge-file.c:47
 msgid "set labels for file1/orig-file/file2"
 msgstr "установить метки для файл1/ориг-файл/файл2"
 
-#: builtin/merge-recursive.c:47
 #, c-format
 msgid "unknown option %s"
 msgstr "неизвестная опция %s"
 
-#: builtin/merge-recursive.c:53
 #, c-format
 msgid "could not parse object '%s'"
 msgstr "не удалось разобрать объект «%s»"
 
-#: builtin/merge-recursive.c:57
 #, c-format
 msgid "cannot handle more than %d base. Ignoring %s."
 msgid_plural "cannot handle more than %d bases. Ignoring %s."
@@ -15957,1530 +7778,1354 @@ msgstr[1] "невозможно обработать больше %d баз. И�
 msgstr[2] "невозможно обработать больше %d баз. Игнорирую %s."
 msgstr[3] "невозможно обработать больше %d базы. Игнорирую %s."
 
-#: builtin/merge-recursive.c:65
 msgid "not handling anything other than two heads merge."
 msgstr "не обрабатываю ничего, кроме слияния двух указателей на ветки."
 
-#: builtin/merge-recursive.c:74 builtin/merge-recursive.c:76
 #, c-format
 msgid "could not resolve ref '%s'"
 msgstr "не удалось распознать ссылку «%s»"
 
-#: builtin/merge-recursive.c:82
 #, c-format
 msgid "Merging %s with %s\n"
 msgstr "Слияние %s и %s\n"
 
-#: builtin/merge.c:57
 msgid "git merge [<options>] [<commit>...]"
-msgstr "git merge [<опции>] [<коммит>…]"
-
-#: builtin/merge.c:58
-msgid "git merge --abort"
-msgstr "git merge --abort"
-
-#: builtin/merge.c:59
-msgid "git merge --continue"
-msgstr "git merge --continue"
+msgstr "git merge [<опции>] [<коммит>...]"
 
-#: builtin/merge.c:122
 msgid "switch `m' requires a value"
 msgstr "при указании параметра «m» требуется указать значение"
 
-#: builtin/merge.c:145
 #, c-format
 msgid "option `%s' requires a value"
 msgstr ""
 
-#: builtin/merge.c:198
 #, c-format
 msgid "Could not find merge strategy '%s'.\n"
 msgstr "Не удалось найти стратегию слияния «%s».\n"
 
-#: builtin/merge.c:199
 #, c-format
 msgid "Available strategies are:"
 msgstr "Доступные стратегии:"
 
-#: builtin/merge.c:204
 #, c-format
 msgid "Available custom strategies are:"
 msgstr "Доступные пользовательские стратегии:"
 
-#: builtin/merge.c:255 builtin/pull.c:133
 msgid "do not show a diffstat at the end of the merge"
 msgstr "не выводить статистику изменений после окончания слияния"
 
-#: builtin/merge.c:258 builtin/pull.c:136
 msgid "show a diffstat at the end of the merge"
 msgstr "вывести статистику изменений после окончания слияния"
 
-#: builtin/merge.c:259 builtin/pull.c:139
 msgid "(synonym to --stat)"
 msgstr "(синоним для --stat)"
 
-#: builtin/merge.c:261 builtin/pull.c:142
 msgid "add (at most <n>) entries from shortlog to merge commit message"
-msgstr "добавить (максимум <n>) записей из короткого журнала в сообщение коммита у слияния"
+msgstr ""
+"добавить (максимум <n>) записей из короткого журнала в сообщение коммита у "
+"слияния"
 
-#: builtin/merge.c:264 builtin/pull.c:148
 msgid "create a single commit instead of doing a merge"
 msgstr "создать один коммит, вместо выполнения слияния"
 
-#: builtin/merge.c:266 builtin/pull.c:151
 msgid "perform a commit if the merge succeeds (default)"
 msgstr "сделать коммит, если слияние прошло успешно (по умолчанию)"
 
-#: builtin/merge.c:268 builtin/pull.c:154
 msgid "edit message before committing"
 msgstr "отредактировать сообщение перед выполнением коммита"
 
-#: builtin/merge.c:270
 msgid "allow fast-forward (default)"
-msgstr "разрешить перемотку вперед (по умолчанию)"
+msgstr "разрешить быструю перемотку (по умолчанию)"
 
-#: builtin/merge.c:272 builtin/pull.c:161
 msgid "abort if fast-forward is not possible"
-msgstr "отменить выполнение слияния, если перемотка вперед невозможна"
+msgstr "прервать слияние, если быстрая перемотка невозможна"
 
-#: builtin/merge.c:276 builtin/pull.c:164
 msgid "verify that the named commit has a valid GPG signature"
 msgstr "проверить, что указанный коммит имеет верную электронную подпись GPG"
 
-#: builtin/merge.c:277 builtin/notes.c:787 builtin/pull.c:168
-#: builtin/rebase.c:539 builtin/rebase.c:1412 builtin/revert.c:114
 msgid "strategy"
 msgstr "стратегия"
 
-#: builtin/merge.c:278 builtin/pull.c:169
 msgid "merge strategy to use"
 msgstr "используемая стратегия слияния"
 
-#: builtin/merge.c:279 builtin/pull.c:172
 msgid "option=value"
 msgstr "опция=значение"
 
-#: builtin/merge.c:280 builtin/pull.c:173
 msgid "option for selected merge strategy"
 msgstr "опции для выбранной стратегии слияния"
 
-#: builtin/merge.c:282
 msgid "merge commit message (for a non-fast-forward merge)"
-msgstr "сообщение коммита для слияния (для слияния без перемотки вперед)"
+msgstr "сообщение коммита (для слияния без быстрой перемотки)"
+
+msgid "use <name> instead of the real target"
+msgstr ""
 
-#: builtin/merge.c:289
 msgid "abort the current in-progress merge"
 msgstr "отменить выполнение происходящего слияния"
 
-#: builtin/merge.c:291
 msgid "--abort but leave index and working tree alone"
 msgstr ""
 
-#: builtin/merge.c:293
 msgid "continue the current in-progress merge"
 msgstr "продолжить выполнение происходящего слияния"
 
-#: builtin/merge.c:295 builtin/pull.c:180
 msgid "allow merging unrelated histories"
 msgstr "разрешить слияние несвязанных историй изменений"
 
-#: builtin/merge.c:302
 msgid "bypass pre-merge-commit and commit-msg hooks"
 msgstr ""
 
-#: builtin/merge.c:319
 msgid "could not run stash."
 msgstr "не удалось выполнить stash."
 
-#: builtin/merge.c:324
 msgid "stash failed"
 msgstr "сбой при выполнении stash"
 
-#: builtin/merge.c:329
 #, c-format
 msgid "not a valid object: %s"
 msgstr "неправильный объект: %s"
 
-#: builtin/merge.c:351 builtin/merge.c:368
 msgid "read-tree failed"
 msgstr "сбой при выполнении read-tree"
 
-#: builtin/merge.c:398
-msgid " (nothing to squash)"
-msgstr " (нечего уплотнять)"
+msgid "Already up to date. (nothing to squash)"
+msgstr ""
+
+msgid "Already up to date."
+msgstr "Уже актуально."
 
-#: builtin/merge.c:409
 #, c-format
 msgid "Squash commit -- not updating HEAD\n"
 msgstr "Уплотнение коммита — не обновляя HEAD\n"
 
-#: builtin/merge.c:459
 #, c-format
 msgid "No merge message -- not updating HEAD\n"
 msgstr "Нет сообщения слияния — не обновляем HEAD\n"
 
-#: builtin/merge.c:510
 #, c-format
 msgid "'%s' does not point to a commit"
 msgstr "«%s» не указывает на коммит"
 
-#: builtin/merge.c:597
 #, c-format
 msgid "Bad branch.%s.mergeoptions string: %s"
 msgstr "Неправильная строка branch.%s.mergeoptions: %s"
 
-#: builtin/merge.c:723
+msgid "Unable to write index."
+msgstr "Не удается записать индекс."
+
 msgid "Not handling anything other than two heads merge."
 msgstr "Не обрабатываю ничего, кроме слияния двух указателей на ветки."
 
-#: builtin/merge.c:736
 #, c-format
-msgid "Unknown option for merge-recursive: -X%s"
-msgstr "Неизвестный параметр merge-recursive: -X%s"
+msgid "unknown strategy option: -X%s"
+msgstr ""
 
-#: builtin/merge.c:755 t/helper/test-fast-rebase.c:209
 #, c-format
 msgid "unable to write %s"
 msgstr "не удалось записать %s"
 
-#: builtin/merge.c:807
 #, c-format
 msgid "Could not read from '%s'"
 msgstr "Не удалось прочесть из «%s»"
 
-#: builtin/merge.c:816
 #, c-format
 msgid "Not committing merge; use 'git commit' to complete the merge.\n"
-msgstr "Не выполняю коммит слияния; используйте «git commit» для завершения слияния.\n"
+msgstr ""
+"Не выполняю коммит слияния; используйте «git commit» для завершения "
+"слияния.\n"
 
-#: builtin/merge.c:822
 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 ""
+"Пожалуйста, введите сообщение коммита, для объяснения, зачем нужно\n"
+"это слияние, особенно, если это слияние обновленной вышестоящей\n"
+"ветки в тематическую ветку.\n"
+"\n"
 
-#: builtin/merge.c:827
 msgid "An empty message aborts the commit.\n"
 msgstr ""
 
-#: builtin/merge.c:830
 #, c-format
 msgid ""
 "Lines starting with '%c' will be ignored, and an empty message aborts\n"
 "the commit.\n"
 msgstr ""
+"Строки, начинающиеся с «%c» будут проигнорированы, а пустое сообщение\n"
+"отменяет процесс коммита.\n"
 
-#: builtin/merge.c:883
 msgid "Empty commit message."
 msgstr "Пустое сообщение коммита."
 
-#: builtin/merge.c:898
 #, c-format
 msgid "Wonderful.\n"
 msgstr "Прекрасно.\n"
 
-#: builtin/merge.c:959
 #, c-format
 msgid "Automatic merge failed; fix conflicts and then commit the result.\n"
-msgstr "Не удалось провести автоматическое слияние; исправьте конфликты и сделайте коммит результата.\n"
+msgstr ""
+"Сбой автоматического слияния; исправьте конфликты, затем зафиксируйте "
+"результат.\n"
 
-#: builtin/merge.c:998
 msgid "No current branch."
 msgstr "Нет текущей ветки."
 
-#: builtin/merge.c:1000
 msgid "No remote for the current branch."
 msgstr "У текущей ветки нет внешнего репозитория."
 
-#: builtin/merge.c:1002
 msgid "No default upstream defined for the current branch."
 msgstr "Для текущей ветки не указана вышестоящая ветка по умолчанию."
 
-#: builtin/merge.c:1007
 #, c-format
 msgid "No remote-tracking branch for %s from %s"
 msgstr "Не указана внешняя отслеживаемая ветка для %s на %s"
 
-#: builtin/merge.c:1064
 #, c-format
 msgid "Bad value '%s' in environment '%s'"
 msgstr "Плохое значение «%s» в переменной окружения «%s»"
 
-#: builtin/merge.c:1167
+#, c-format
+msgid "could not close '%s'"
+msgstr "не удалось закрыть «%s»"
+
 #, c-format
 msgid "not something we can merge in %s: %s"
 msgstr "не является тем, что можно слить в %s: %s"
 
-#: builtin/merge.c:1201
 msgid "not something we can merge"
 msgstr "не является тем, что можно слить"
 
-#: builtin/merge.c:1311
 msgid "--abort expects no arguments"
 msgstr "опция --abort не принимает аргументы"
 
-#: builtin/merge.c:1315
 msgid "There is no merge to abort (MERGE_HEAD missing)."
 msgstr "Нет слияния, которое можно отменить (отсутствует файл MERGE_HEAD)."
 
-#: builtin/merge.c:1333
 msgid "--quit expects no arguments"
 msgstr ""
 
-#: builtin/merge.c:1346
 msgid "--continue expects no arguments"
 msgstr "опция --continue не принимает аргументы"
 
-#: builtin/merge.c:1350
 msgid "There is no merge in progress (MERGE_HEAD missing)."
 msgstr "Сейчас не происходит слияние (отсутствует файл MERGE_HEAD)."
 
-#: builtin/merge.c:1366
 msgid ""
 "You have not concluded your merge (MERGE_HEAD exists).\n"
 "Please, commit your changes before you merge."
-msgstr "Вы не завершили слияние (присутствует файл MERGE_HEAD).\nВыполните коммит ваших изменений, перед слиянием."
+msgstr ""
+"Вы не завершили слияние (присутствует файл MERGE_HEAD).\n"
+"Выполните коммит ваших изменений, перед слиянием."
 
-#: builtin/merge.c:1373
 msgid ""
 "You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists).\n"
 "Please, commit your changes before you merge."
-msgstr "Вы не завершили копирование коммита (присутствует файл CHERRY_PICK_HEAD).\nПожалуйста, закоммитьте ваши изменения, перед слиянием."
+msgstr ""
+"Вы не завершили копирование коммита (присутствует файл CHERRY_PICK_HEAD).\n"
+"Пожалуйста, закоммитьте ваши изменения, перед слиянием."
 
-#: builtin/merge.c:1376
 msgid "You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists)."
-msgstr "Вы не завершили копирование коммита (присутствует файл CHERRY_PICK_HEAD)."
-
-#: builtin/merge.c:1390
-msgid "You cannot combine --squash with --no-ff."
-msgstr "Нельзя использовать одновременно --squash и --no-ff."
-
-#: builtin/merge.c:1392
-msgid "You cannot combine --squash with --commit."
 msgstr ""
+"Вы не завершили копирование коммита (присутствует файл CHERRY_PICK_HEAD)."
 
-#: builtin/merge.c:1408
 msgid "No commit specified and merge.defaultToUpstream not set."
 msgstr "Коммит не указан и параметр merge.defaultToUpstream не установлен."
 
-#: builtin/merge.c:1425
 msgid "Squash commit into empty head not supported yet"
 msgstr "Уплотнение коммита в пустую ветку еще не поддерживается"
 
-#: builtin/merge.c:1427
 msgid "Non-fast-forward commit does not make sense into an empty head"
-msgstr "Коммит, не являющийся перемоткой вперед, нет смысла делать в пустую ветку."
+msgstr "Слияние без быстрой перемотки не имеет смысла в пустой ветке."
 
-#: builtin/merge.c:1432
 #, c-format
 msgid "%s - not something we can merge"
 msgstr "%s не является тем, что можно слить"
 
-#: builtin/merge.c:1434
 msgid "Can merge only exactly one commit into empty head"
 msgstr "Можно только один коммит в пустую ветку."
 
-#: builtin/merge.c:1515
 msgid "refusing to merge unrelated histories"
 msgstr "отказ слияния несвязанных историй изменений"
 
-#: builtin/merge.c:1524
-msgid "Already up to date."
-msgstr "Уже обновлено."
-
-#: builtin/merge.c:1534
 #, c-format
 msgid "Updating %s..%s\n"
 msgstr "Обновление %s..%s\n"
 
-#: builtin/merge.c:1580
 #, c-format
 msgid "Trying really trivial in-index merge...\n"
-msgstr "Попытка тривиального слияния в индексе…\n"
+msgstr "Попытка тривиального слияния в индексе...\n"
 
-#: builtin/merge.c:1587
 #, c-format
 msgid "Nope.\n"
 msgstr "Не вышло.\n"
 
-#: builtin/merge.c:1612
-msgid "Already up to date. Yeeah!"
-msgstr "Уже обновлено. Круто!"
-
-#: builtin/merge.c:1618
-msgid "Not possible to fast-forward, aborting."
-msgstr "Перемотка вперед невозможна, отмена."
-
-#: builtin/merge.c:1646 builtin/merge.c:1711
 #, c-format
 msgid "Rewinding the tree to pristine...\n"
-msgstr "Перемотка дерева к исходному состоянию…\n"
+msgstr "Перемотка дерева к исходному состоянию...\n"
 
-#: builtin/merge.c:1650
 #, c-format
 msgid "Trying merge strategy %s...\n"
-msgstr "Попытка слияния с помощью стратегии %s…\n"
+msgstr "Попытка слияния с помощью стратегии %s...\n"
 
-#: builtin/merge.c:1702
 #, c-format
 msgid "No merge strategy handled the merge.\n"
 msgstr "Ни одна стратегия слияния не обработала слияние.\n"
 
-#: builtin/merge.c:1704
 #, c-format
 msgid "Merge with strategy %s failed.\n"
 msgstr "Сбой при слиянии с помощью стратегии %s.\n"
 
-#: builtin/merge.c:1713
 #, c-format
-msgid "Using the %s to prepare resolving by hand.\n"
-msgstr "Использую %s для подготовки ручного разрешения конфликтов.\n"
+msgid "Using the %s strategy to prepare resolving by hand.\n"
+msgstr ""
 
-#: builtin/merge.c:1727
 #, c-format
 msgid "Automatic merge went well; stopped before committing as requested\n"
-msgstr "Автоматическое слияние прошло успешно; как и запрашивали, остановлено перед выполнением коммита\n"
+msgstr ""
+"Автоматическое слияние прошло успешно; как и запрашивали, остановлено перед "
+"выполнением коммита\n"
+
+#, c-format
+msgid "warning: tag input does not pass fsck: %s"
+msgstr ""
 
-#: builtin/mktree.c:66
-msgid "git mktree [-z] [--missing] [--batch]"
-msgstr "git mktree [-z] [--missing] [--batch]"
+#, c-format
+msgid "error: tag input does not pass fsck: %s"
+msgstr ""
+
+#, c-format
+msgid "%d (FSCK_IGNORE?) should never trigger this callback"
+msgstr ""
+
+#, c-format
+msgid "could not read tagged object '%s'"
+msgstr ""
+
+#, c-format
+msgid "object '%s' tagged as '%s', but is a '%s' type"
+msgstr ""
+
+msgid "could not read from stdin"
+msgstr "не удалось прочитать из стандартного ввода"
+
+msgid "tag on stdin did not pass our strict fsck check"
+msgstr ""
+
+msgid "tag on stdin did not refer to a valid object"
+msgstr ""
+
+msgid "unable to write tag file"
+msgstr "не удалось записать файл метки"
 
-#: builtin/mktree.c:154
 msgid "input is NUL terminated"
 msgstr "ввод отделённый НУЛЕВЫМИ символами"
 
-#: builtin/mktree.c:155 builtin/write-tree.c:26
 msgid "allow missing objects"
 msgstr "допустить отсутствие объектов"
 
-#: builtin/mktree.c:156
 msgid "allow creation of more than one tree"
 msgstr "допустить создание более одного дерева"
 
-#: builtin/multi-pack-index.c:9
 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 ""
+
+msgid "git multi-pack-index [<options>] verify"
+msgstr ""
+
+msgid "git multi-pack-index [<options>] expire"
+msgstr ""
+
+msgid "git multi-pack-index [<options>] repack [--batch-size=<size>]"
+msgstr ""
+
+msgid "directory"
 msgstr ""
 
-#: builtin/multi-pack-index.c:26
 msgid "object directory containing set of packfile and pack-index pairs"
 msgstr ""
 
-#: builtin/multi-pack-index.c:29
-msgid ""
-"during repack, collect pack-files of smaller size into a batch that is "
-"larger than this size"
+msgid "preferred-pack"
 msgstr ""
 
-#: builtin/multi-pack-index.c:50 builtin/prune-packed.c:25
-msgid "too many arguments"
+msgid "pack for reuse when computing a multi-pack bitmap"
 msgstr ""
 
-#: builtin/multi-pack-index.c:60
-msgid "--batch-size option is only for 'repack' subcommand"
+msgid "write multi-pack bitmap"
 msgstr ""
 
-#: builtin/multi-pack-index.c:69
-#, c-format
-msgid "unrecognized subcommand: %s"
+msgid "write multi-pack index containing only given indexes"
+msgstr ""
+
+msgid "refs snapshot for selecting bitmap commits"
+msgstr ""
+
+msgid ""
+"during repack, collect pack-files of smaller size into a batch that is "
+"larger than this size"
 msgstr ""
 
-#: builtin/mv.c:18
 msgid "git mv [<options>] <source>... <destination>"
-msgstr "git mv [<опции>] <источник>… <назначение>"
+msgstr "git mv [<опции>] <источник>... <назначение>"
 
-#: builtin/mv.c:83
 #, c-format
 msgid "Directory %s is in index and no submodule?"
 msgstr "Каталог %s в индексе и не является подмодулем?"
 
-#: builtin/mv.c:85
 msgid "Please stage your changes to .gitmodules or stash them to proceed"
-msgstr "Чтобы продолжить, проиндексируйте или спрячьте ваши изменения в файле .gitmodules"
+msgstr ""
+"Чтобы продолжить, проиндексируйте или спрячьте ваши изменения в файле ."
+"gitmodules"
 
-#: builtin/mv.c:103
 #, c-format
 msgid "%.*s is in index"
 msgstr "%.*s в индесе"
 
-#: builtin/mv.c:125
 msgid "force move/rename even if target exists"
 msgstr "принудительно перемещать/переименовать, даже если цель существует"
 
-#: builtin/mv.c:127
 msgid "skip move/rename errors"
 msgstr "пропускать ошибки при перемещении/переименовании"
 
-#: builtin/mv.c:170
 #, c-format
 msgid "destination '%s' is not a directory"
 msgstr "целевой путь «%s» не является каталогом"
 
-#: builtin/mv.c:181
 #, c-format
 msgid "Checking rename of '%s' to '%s'\n"
 msgstr "Проверка переименования из «%s» в «%s»\n"
 
-#: builtin/mv.c:185
 msgid "bad source"
 msgstr "плохой источник"
 
-#: builtin/mv.c:188
 msgid "can not move directory into itself"
 msgstr "нельзя переместить каталог в самого себя"
 
-#: builtin/mv.c:191
 msgid "cannot move directory over file"
 msgstr "нельзя переместить каталог в файл"
 
-#: builtin/mv.c:200
 msgid "source directory is empty"
 msgstr "исходный каталог пуст"
 
-#: builtin/mv.c:225
 msgid "not under version control"
 msgstr "не под версионным контролем"
 
-#: builtin/mv.c:227
 msgid "conflicted"
 msgstr ""
 
-#: builtin/mv.c:230
 msgid "destination exists"
 msgstr "целевой путь уже существует"
 
-#: builtin/mv.c:238
 #, c-format
 msgid "overwriting '%s'"
 msgstr "перезапись «%s»"
 
-#: builtin/mv.c:241
 msgid "Cannot overwrite"
 msgstr "Не удалось перезаписать"
 
-#: builtin/mv.c:244
 msgid "multiple sources for the same target"
 msgstr "несколько источников для одного целевого пути"
 
-#: builtin/mv.c:246
 msgid "destination directory does not exist"
 msgstr "целевой каталог не существует"
 
-#: builtin/mv.c:253
 #, c-format
 msgid "%s, source=%s, destination=%s"
 msgstr "%s, откуда=%s, куда=%s"
 
-#: builtin/mv.c:274
 #, c-format
 msgid "Renaming %s to %s\n"
 msgstr "Переименование %s в %s\n"
 
-#: builtin/mv.c:280 builtin/remote.c:785 builtin/repack.c:484
 #, c-format
 msgid "renaming '%s' failed"
 msgstr "сбой при переименовании «%s»"
 
-#: builtin/name-rev.c:465
 msgid "git name-rev [<options>] <commit>..."
-msgstr "git name-rev [<опции>] <коммит>…"
+msgstr "git name-rev [<опции>] <коммит>..."
 
-#: builtin/name-rev.c:466
 msgid "git name-rev [<options>] --all"
 msgstr "git name-rev [<опции>] --all"
 
-#: builtin/name-rev.c:467
-msgid "git name-rev [<options>] --stdin"
-msgstr "git name-rev [<опции>] --stdin"
+msgid "git name-rev [<options>] --annotate-stdin"
+msgstr ""
 
-#: builtin/name-rev.c:524
 msgid "print only ref-based names (no object names)"
 msgstr ""
 
-#: builtin/name-rev.c:525
 msgid "only use tags to name the commits"
 msgstr "использовать только метки для именования коммитов"
 
-#: builtin/name-rev.c:527
 msgid "only use refs matching <pattern>"
 msgstr "использовать только ссылки, соответствующие <шаблону>"
 
-#: builtin/name-rev.c:529
 msgid "ignore refs matching <pattern>"
 msgstr "игнорировать ссылки, соответствующие <шаблону>"
 
-#: builtin/name-rev.c:531
 msgid "list all commits reachable from all refs"
 msgstr "вывести список всех коммитов, достижимых со всех ссылок"
 
-#: builtin/name-rev.c:532
-msgid "read from stdin"
-msgstr "прочитать из стандартного ввода"
+msgid "deprecated: use --annotate-stdin instead"
+msgstr ""
+
+msgid "annotate text from stdin"
+msgstr ""
 
-#: builtin/name-rev.c:533
 msgid "allow to print `undefined` names (default)"
 msgstr "разрешить вывод «undefined», если не найдено (по умолчанию)"
 
-#: builtin/name-rev.c:539
 msgid "dereference tags in the input (internal use)"
 msgstr "разыменовывать введенные метки (для внутреннего использования)"
 
-#: builtin/notes.c:28
 msgid "git notes [--ref <notes-ref>] [list [<object>]]"
 msgstr "git notes [--ref <ссылка-на-заметку>] [list [<объект>]]"
 
-#: 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 <ссылка-на-заметку>] add [-f] [--allow-empty] [-m <сообщение> | -F <файл> | (-c | -C) <объект>] [<объект>]"
+"git notes [--ref <notes-ref>] add [-f] [--allow-empty] [-m <msg> | -F <file> "
+"| (-c | -C) <object>] [<object>]"
+msgstr ""
+"git notes [--ref <ссылка-на-заметку>] add [-f] [--allow-empty] [-m "
+"<сообщение> | -F <файл> | (-c | -C) <объект>] [<объект>]"
 
-#: 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 ""
-"git notes [--ref <notes-ref>] append [--allow-empty] [-m <msg> | -F <file> |"
-" (-c | -C) <object>] [<object>]"
-msgstr "git notes [--ref <ссылка-на-заметку>] append [--allow-empty] [-m <сообщение> | -F <файл> | (-c | -C) <объект>] [<объект>]"
+"git notes [--ref <notes-ref>] append [--allow-empty] [-m <msg> | -F <file> | "
+"(-c | -C) <object>] [<object>]"
+msgstr ""
+"git notes [--ref <ссылка-на-заметку>] append [--allow-empty] [-m <сообщение> "
+"| -F <файл> | (-c | -C) <объект>] [<объект>]"
 
-#: builtin/notes.c:32
 msgid "git notes [--ref <notes-ref>] edit [--allow-empty] [<object>]"
 msgstr "git notes [--ref <ссылка-на-заметку>] edit [--allow-empty] [<объект>]"
 
-#: builtin/notes.c:33
 msgid "git notes [--ref <notes-ref>] show [<object>]"
 msgstr "git notes [--ref <ссылка-на-заметку>] show [<объект>]"
 
-#: builtin/notes.c:34
 msgid ""
 "git notes [--ref <notes-ref>] merge [-v | -q] [-s <strategy>] <notes-ref>"
-msgstr "git notes [--ref <ссылка-на-заметку>] merge [-v | -q] [-s <стратегия>] <ссылка-на-заметку>"
-
-#: builtin/notes.c:35
-msgid "git notes merge --commit [-v | -q]"
-msgstr "git notes merge --commit [-v | -q]"
-
-#: builtin/notes.c:36
-msgid "git notes merge --abort [-v | -q]"
-msgstr "git notes merge --abort [-v | -q]"
+msgstr ""
+"git notes [--ref <ссылка-на-заметку>] merge [-v | -q] [-s <стратегия>] "
+"<ссылка-на-заметку>"
 
-#: builtin/notes.c:37
 msgid "git notes [--ref <notes-ref>] remove [<object>...]"
-msgstr "git notes [--ref <ссылка-на-заметку>] remove [<объект>…]"
+msgstr "git notes [--ref <ссылка-на-заметку>] remove [<объект>...]"
 
-#: builtin/notes.c:38
 msgid "git notes [--ref <notes-ref>] prune [-n] [-v]"
 msgstr "git notes [--ref <имя-заметки>] prune [-n] [-v]"
 
-#: builtin/notes.c:39
 msgid "git notes [--ref <notes-ref>] get-ref"
 msgstr "git notes [--ref <ссылка-на-заметку>] get-ref"
 
-#: builtin/notes.c:44
 msgid "git notes [list [<object>]]"
 msgstr "git notes [list [<объект>]]"
 
-#: builtin/notes.c:49
 msgid "git notes add [<options>] [<object>]"
 msgstr "git notes add [<опции>] [<объект>]"
 
-#: builtin/notes.c:54
 msgid "git notes copy [<options>] <from-object> <to-object>"
 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>]"
 msgstr "git notes append [<опции>] [<объект>]"
 
-#: builtin/notes.c:65
 msgid "git notes edit [<object>]"
 msgstr "git notes edit [<объект>]"
 
-#: builtin/notes.c:70
 msgid "git notes show [<object>]"
 msgstr "git notes show [<объект>]"
 
-#: builtin/notes.c:75
 msgid "git notes merge [<options>] <notes-ref>"
 msgstr "git notes merge [<опции>] <ссылка-на-заметку>"
 
-#: builtin/notes.c:76
 msgid "git notes merge --commit [<options>]"
 msgstr "git notes merge --commit [<опции>]"
 
-#: builtin/notes.c:77
 msgid "git notes merge --abort [<options>]"
 msgstr "git notes merge --abort [<опции>]"
 
-#: builtin/notes.c:82
 msgid "git notes remove [<object>]"
 msgstr "git notes remove [<опции>]"
 
-#: builtin/notes.c:87
 msgid "git notes prune [<options>]"
 msgstr "git notes prune [<опции>]"
 
-#: builtin/notes.c:92
-msgid "git notes get-ref"
-msgstr "git notes get-ref"
-
-#: builtin/notes.c:97
 msgid "Write/edit the notes for the following object:"
 msgstr "Записать/изменить заметки для следующего объекта:"
 
-#: builtin/notes.c:150
 #, c-format
 msgid "unable to start 'show' for object '%s'"
 msgstr "не удалось запустить «show» для объекта «%s»"
 
-#: builtin/notes.c:154
 msgid "could not read 'show' output"
 msgstr "не удалось прочитать вывод «show»"
 
-#: builtin/notes.c:162
 #, c-format
 msgid "failed to finish 'show' for object '%s'"
 msgstr "не удалось завершить «show» для объекта «%s»"
 
-#: builtin/notes.c:197
 msgid "please supply the note contents using either -m or -F option"
 msgstr "пожалуйста, укажите содержимое заметки, используя опцию -m или -F"
 
-#: builtin/notes.c:206
 msgid "unable to write note object"
 msgstr "не удалось записать объект заметки"
 
-#: builtin/notes.c:208
 #, c-format
 msgid "the note contents have been left in %s"
 msgstr "содержимое заметки осталось в %s"
 
-#: builtin/notes.c:242 builtin/tag.c:533
 #, 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
 #, c-format
 msgid "failed to resolve '%s' as a valid ref."
 msgstr "не удалось разрешить «%s» как ссылку."
 
-#: builtin/notes.c:265
 #, c-format
 msgid "failed to read object '%s'."
 msgstr "не удалось прочитать объект «%s»."
 
-#: builtin/notes.c:268
 #, c-format
 msgid "cannot read note data from non-blob object '%s'."
 msgstr "не удалось прочитать данные заметки из недвоичного объекта «%s»."
 
-#: builtin/notes.c:309
 #, c-format
 msgid "malformed input line: '%s'."
 msgstr "неправильная введенная строка: «%s»."
 
-#: builtin/notes.c:324
 #, c-format
 msgid "failed to copy notes from '%s' to '%s'"
 msgstr "не удалось скопировать заметку из «%s» в «%s»"
 
 #. TRANSLATORS: the first %s will be replaced by a git
 #. notes command: 'add', 'merge', 'remove', etc.
-#: builtin/notes.c:356
+#.
 #, 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
-msgid "too many parameters"
-msgstr "передано слишком много параметров"
-
-#: builtin/notes.c:389 builtin/notes.c:678
 #, c-format
 msgid "no note found for object %s."
 msgstr "не найдена заметка для объекта %s."
 
-#: builtin/notes.c:410 builtin/notes.c:576
 msgid "note contents as a string"
 msgstr "текстовое содержимое заметки"
 
-#: builtin/notes.c:413 builtin/notes.c:579
 msgid "note contents in a file"
 msgstr "содержимое заметки в файле"
 
-#: builtin/notes.c:416 builtin/notes.c:582
 msgid "reuse and edit specified note object"
 msgstr "использовать и отредактировать указанный объект заметки"
 
-#: builtin/notes.c:419 builtin/notes.c:585
 msgid "reuse specified note object"
 msgstr "использовать указанный объект заметки"
 
-#: builtin/notes.c:422 builtin/notes.c:588
 msgid "allow storing empty note"
 msgstr "разрешить сохранение пустой заметки"
 
-#: builtin/notes.c:423 builtin/notes.c:496
 msgid "replace existing notes"
 msgstr "заменить существующие заметки"
 
-#: builtin/notes.c:448
 #, c-format
 msgid ""
 "Cannot add notes. Found existing notes for object %s. Use '-f' to overwrite "
 "existing notes"
-msgstr "Не удалось добавить заметку. Найдена существующая заметка у объекта %s. Используйте параметр «-f» для перезаписи существующих заметок."
+msgstr ""
+"Не удалось добавить заметку. Найдена существующая заметка у объекта %s. "
+"Используйте параметр «-f» для перезаписи существующих заметок."
 
-#: builtin/notes.c:463 builtin/notes.c:544
 #, 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
 #, c-format
 msgid "Removing note for object %s\n"
 msgstr "Удаление заметки у объекта %s\n"
 
-#: builtin/notes.c:497
 msgid "read objects from stdin"
 msgstr "прочитать объекты из стандартного ввода"
 
-#: builtin/notes.c:499
 msgid "load rewriting config for <command> (implies --stdin)"
-msgstr "загрузить настройки перезаписи для команды <команда> (включает в себя --stdin)"
+msgstr ""
+"загрузить настройки перезаписи для команды <команда> (включает в себя --"
+"stdin)"
 
-#: builtin/notes.c:517
-msgid "too few parameters"
-msgstr "передано слишком мало параметров"
+msgid "too few arguments"
+msgstr "cлишком мало аргументов"
 
-#: builtin/notes.c:538
 #, c-format
 msgid ""
-"Cannot copy notes. Found existing notes for object %s. Use '-f' to overwrite"
-" existing notes"
-msgstr "Не удалось скопировать заметку. Найдена существующая заметка у объекта %s. Используйте параметр «-f» для перезаписи существующих заметок."
+"Cannot copy notes. Found existing notes for object %s. Use '-f' to overwrite "
+"existing notes"
+msgstr ""
+"Не удалось скопировать заметку. Найдена существующая заметка у объекта %s. "
+"Используйте параметр «-f» для перезаписи существующих заметок."
 
-#: builtin/notes.c:550
 #, c-format
 msgid "missing notes on source object %s. Cannot copy."
 msgstr "нет заметок у исходного объекта %s. Нельзя скопировать."
 
-#: builtin/notes.c:603
 #, c-format
 msgid ""
 "The -m/-F/-c/-C options have been deprecated for the 'edit' subcommand.\n"
 "Please use 'git notes add -f -m/-F/-c/-C' instead.\n"
-msgstr "Опции -m/-F/-c/-C для подкоманды «edit» устарели.\nИспользуйте вместо них «git notes add -f -m/-F/-c/-C».\n"
+msgstr ""
+"Опции -m/-F/-c/-C для подкоманды «edit» устарели.\n"
+"Используйте вместо них «git notes add -f -m/-F/-c/-C».\n"
 
-#: builtin/notes.c:698
 msgid "failed to delete ref NOTES_MERGE_PARTIAL"
 msgstr "не удалось удалить ссылку NOTES_MERGE_PARTIAL"
 
-#: builtin/notes.c:700
 msgid "failed to delete ref NOTES_MERGE_REF"
 msgstr "не удалось удалить ссылку NOTES_MERGE_REF"
 
-#: builtin/notes.c:702
 msgid "failed to remove 'git notes merge' worktree"
 msgstr "не удалось удалить рабочий каталог «git notes merge»"
 
-#: builtin/notes.c:722
 msgid "failed to read ref NOTES_MERGE_PARTIAL"
 msgstr "не удалось прочитать ссылку NOTES_MERGE_PARTIAL"
 
-#: builtin/notes.c:724
 msgid "could not find commit from NOTES_MERGE_PARTIAL."
 msgstr "не удалось найти коммит из NOTES_MERGE_PARTIAL."
 
-#: builtin/notes.c:726
 msgid "could not parse commit from NOTES_MERGE_PARTIAL."
 msgstr "не удалось разобрать коммит из NOTES_MERGE_PARTIAL."
 
-#: builtin/notes.c:739
 msgid "failed to resolve NOTES_MERGE_REF"
 msgstr "не удалось разрешить NOTES_MERGE_REF"
 
-#: builtin/notes.c:742
 msgid "failed to finalize notes merge"
 msgstr "не удалось завершить слиние заметок"
 
-#: builtin/notes.c:768
 #, c-format
 msgid "unknown notes merge strategy %s"
 msgstr "неизвестная стратегия слияния заметок %s"
 
-#: builtin/notes.c:784
 msgid "General options"
 msgstr "Общие опции"
 
-#: builtin/notes.c:786
 msgid "Merge options"
 msgstr "Опции слияния"
 
-#: builtin/notes.c:788
 msgid ""
-"resolve notes conflicts using the given strategy "
-"(manual/ours/theirs/union/cat_sort_uniq)"
-msgstr "разрешить конфликты заметок с помощью указанной стратегии (manual/ours/theirs/union/cat_sort_uniq)"
+"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
 msgid "Committing unmerged notes"
 msgstr "Коммит не слитых заметок"
 
-#: builtin/notes.c:792
 msgid "finalize notes merge by committing unmerged notes"
 msgstr "завершить слияние заметок коммитом не слитых заметок"
 
-#: builtin/notes.c:794
 msgid "Aborting notes merge resolution"
 msgstr "Отмена разрешения слияния заметок"
 
-#: builtin/notes.c:796
 msgid "abort notes merge"
 msgstr "отменить слияние заметок"
 
-#: builtin/notes.c:807
 msgid "cannot mix --commit, --abort or -s/--strategy"
 msgstr "нельзя использовать одновременно --commit, --abort и -s/--strategy"
 
-#: builtin/notes.c:812
 msgid "must specify a notes ref to merge"
 msgstr "вы должны указать ссылку заметки для слияния"
 
-#: builtin/notes.c:836
 #, c-format
 msgid "unknown -s/--strategy: %s"
 msgstr "неизвестный параметр для -s/--strategy: %s"
 
-#: builtin/notes.c:873
 #, c-format
 msgid "a notes merge into %s is already in-progress at %s"
 msgstr "слияние заметок в %s уже выполняется на %s"
 
-#: builtin/notes.c:876
 #, c-format
 msgid "failed to store link to current notes ref (%s)"
 msgstr "не удалось сохранить адрес текущей ссылки на заметку (%s)"
 
-#: builtin/notes.c:878
 #, 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 "Не удалось автоматически слить заметки. Исправьте конфликты в %s и закоммитьте результат с помощью «git notes merge --commit», или прервите процесс слияния с помощью «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 ""
+"Не удалось автоматически слить заметки. Исправьте конфликты в %s и "
+"закоммитьте результат с помощью «git notes merge --commit», или прервите "
+"процесс слияния с помощью «git notes merge --abort».\n"
 
-#: builtin/notes.c:897 builtin/tag.c:546
 #, c-format
 msgid "Failed to resolve '%s' as a valid ref."
 msgstr "Не удалось разрешить «%s» как ссылку."
 
-#: builtin/notes.c:900
 #, c-format
 msgid "Object %s has no note\n"
 msgstr "У объекта %s нет заметки\n"
 
-#: builtin/notes.c:912
 msgid "attempt to remove non-existent note is not an error"
 msgstr "попытка удаления несуществующей заметки не является ошибкой"
 
-#: builtin/notes.c:915
 msgid "read object names from the standard input"
 msgstr "прочитать имена объектов из стандартного ввода"
 
-#: builtin/notes.c:954 builtin/prune.c:132 builtin/worktree.c:220
 msgid "do not remove, show only"
 msgstr "не удалять, только показать список"
 
-#: builtin/notes.c:955
 msgid "report pruned notes"
 msgstr "вывести список удаленных заметок"
 
-#: builtin/notes.c:998
 msgid "notes-ref"
 msgstr "ссылка-на-заметку"
 
-#: builtin/notes.c:999
 msgid "use notes from <notes-ref>"
 msgstr "использовать заметку из <ссылка-на-заметку>"
 
-#: builtin/notes.c:1034 builtin/stash.c:1604
 #, c-format
 msgid "unknown subcommand: %s"
 msgstr "неизвестная подкоманда: %s"
 
-#: builtin/pack-objects.c:54
 msgid ""
 "git pack-objects --stdout [<options>...] [< <ref-list> | < <object-list>]"
-msgstr "git pack-objects --stdout [<опции>…] [< <список-ссылок> | < <список-объектов>]"
+msgstr ""
+"git pack-objects --stdout [<опции>...] [< <список-ссылок> | < <список-"
+"объектов>]"
 
-#: builtin/pack-objects.c:55
 msgid ""
 "git pack-objects [<options>...] <base-name> [< <ref-list> | < <object-list>]"
-msgstr "git pack-objects [<опции>…] <имя-базы> [< <список-ссылок> | < <список-объектов>]"
+msgstr ""
+"git pack-objects [<опции>...] <имя-базы> [< <список-ссылок> | < <список-"
+"объектов>]"
+
+#, c-format
+msgid ""
+"write_reuse_object: could not locate %s, expected at offset %<PRIuMAX> in "
+"pack %s"
+msgstr ""
 
-#: builtin/pack-objects.c:443
 #, c-format
 msgid "bad packed object CRC for %s"
 msgstr ""
 
-#: builtin/pack-objects.c:454
 #, c-format
 msgid "corrupt packed object for %s"
 msgstr ""
 
-#: builtin/pack-objects.c:585
 #, c-format
 msgid "recursive delta detected for object %s"
 msgstr ""
 
-#: builtin/pack-objects.c:796
 #, c-format
 msgid "ordered %u objects, expected %<PRIu32>"
 msgstr ""
 
-#: builtin/pack-objects.c:1004
+#, c-format
+msgid "expected object at offset %<PRIuMAX> in pack %s"
+msgstr ""
+
 msgid "disabling bitmap writing, packs are split due to pack.packSizeLimit"
-msgstr "отключение записи битовых карт, так как карты были разбиты на части из-за pack.packSizeLimit"
+msgstr ""
+"отключение записи битовых карт, так как карты были разбиты на части из-за "
+"pack.packSizeLimit"
 
-#: builtin/pack-objects.c:1017
 msgid "Writing objects"
 msgstr "Запись объектов"
 
-#: builtin/pack-objects.c:1078 builtin/update-index.c:90
 #, c-format
 msgid "failed to stat %s"
 msgstr "не удалось выполнить stat %s"
 
-#: builtin/pack-objects.c:1131
+#, c-format
+msgid "failed utime() on %s"
+msgstr ""
+
+msgid "failed to write bitmap index"
+msgstr ""
+
 #, c-format
 msgid "wrote %<PRIu32> objects while expecting %<PRIu32>"
 msgstr ""
 
-#: builtin/pack-objects.c:1348
 msgid "disabling bitmap writing, as some objects are not being packed"
-msgstr "отключение записи битовых карт, так как некоторые объекты не были упакованы"
+msgstr ""
+"отключение записи битовых карт, так как некоторые объекты не были упакованы"
 
-#: builtin/pack-objects.c:1796
 #, c-format
 msgid "delta base offset overflow in pack for %s"
 msgstr ""
 
-#: builtin/pack-objects.c:1805
 #, c-format
 msgid "delta base offset out of bound for %s"
 msgstr ""
 
-#: builtin/pack-objects.c:2086
 msgid "Counting objects"
 msgstr "Подсчет объектов"
 
-#: builtin/pack-objects.c:2231
+#, c-format
+msgid "unable to get size of %s"
+msgstr "не удалось получить размер %s"
+
 #, c-format
 msgid "unable to parse object header of %s"
 msgstr "не удалось разобрать заголовок объекта %s"
 
-#: builtin/pack-objects.c:2301 builtin/pack-objects.c:2317
-#: builtin/pack-objects.c:2327
 #, c-format
 msgid "object %s cannot be read"
 msgstr ""
 
-#: builtin/pack-objects.c:2304 builtin/pack-objects.c:2331
 #, c-format
 msgid "object %s inconsistent object length (%<PRIuMAX> vs %<PRIuMAX>)"
 msgstr ""
 
-#: builtin/pack-objects.c:2341
 msgid "suboptimal pack - out of memory"
 msgstr ""
 
-#: builtin/pack-objects.c:2656
 #, c-format
 msgid "Delta compression using up to %d threads"
 msgstr "При сжатии изменений используется до %d потоков"
 
-#: builtin/pack-objects.c:2795
 #, c-format
 msgid "unable to pack objects reachable from tag %s"
 msgstr ""
 
-#: builtin/pack-objects.c:2883
+#, c-format
+msgid "unable to get type of object %s"
+msgstr "не удалось получить тип объекта %s"
+
 msgid "Compressing objects"
 msgstr "Сжатие объектов"
 
-#: builtin/pack-objects.c:2889
 msgid "inconsistency with delta count"
 msgstr ""
 
-#: builtin/pack-objects.c:2961
 #, 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 ""
 
-#: builtin/pack-objects.c:2964
 #, c-format
 msgid ""
 "object already configured in another uploadpack.blobpackfileuri (got '%s')"
 msgstr ""
 
-#: builtin/pack-objects.c:2993
+#, c-format
+msgid "could not get type of object %s in pack %s"
+msgstr ""
+
+#, c-format
+msgid "could not find pack '%s'"
+msgstr ""
+
+#, c-format
+msgid "packfile %s cannot be accessed"
+msgstr ""
+
+msgid "Enumerating cruft objects"
+msgstr ""
+
+msgid "unable to add cruft objects"
+msgstr ""
+
+msgid "Traversing cruft objects"
+msgstr ""
+
 #, c-format
 msgid ""
 "expected edge object ID, got garbage:\n"
 " %s"
 msgstr ""
 
-#: builtin/pack-objects.c:2999
 #, c-format
 msgid ""
 "expected object ID, got garbage:\n"
 " %s"
 msgstr ""
 
-#: builtin/pack-objects.c:3097
-msgid "invalid value for --missing"
-msgstr "недопустимое значение для --missing"
+msgid "could not load cruft pack .mtimes"
+msgstr ""
 
-#: builtin/pack-objects.c:3156 builtin/pack-objects.c:3264
 msgid "cannot open pack index"
 msgstr ""
 
-#: builtin/pack-objects.c:3187
 #, c-format
 msgid "loose object at %s could not be examined"
 msgstr ""
 
-#: builtin/pack-objects.c:3272
 msgid "unable to force loose object"
 msgstr ""
 
-#: builtin/pack-objects.c:3365
 #, c-format
 msgid "not a rev '%s'"
 msgstr ""
 
-#: builtin/pack-objects.c:3368
 #, c-format
 msgid "bad revision '%s'"
 msgstr ""
 
-#: builtin/pack-objects.c:3393
 msgid "unable to add recent objects"
 msgstr ""
 
-#: builtin/pack-objects.c:3446
 #, c-format
 msgid "unsupported index version %s"
 msgstr "неподдерживаемая версия индекса %s"
 
-#: builtin/pack-objects.c:3450
 #, c-format
 msgid "bad index version '%s'"
 msgstr "плохая версия индекса «%s»"
 
-#: builtin/pack-objects.c:3488
 msgid "<version>[,<offset>]"
 msgstr ""
 
-#: builtin/pack-objects.c:3489
 msgid "write the pack index file in the specified idx format version"
 msgstr "записать файл индекса пакета в указанной версии формата"
 
-#: builtin/pack-objects.c:3492
 msgid "maximum size of each output pack file"
 msgstr "максимальный размер каждого выходного файла пакета"
 
-#: builtin/pack-objects.c:3494
 msgid "ignore borrowed objects from alternate object store"
-msgstr "игнорировать чужие объекты, взятые из альтернативного хранилища объектов"
+msgstr ""
+"игнорировать чужие объекты, взятые из альтернативного хранилища объектов"
 
-#: builtin/pack-objects.c:3496
 msgid "ignore packed objects"
 msgstr "игнорировать упакованные объекты"
 
-#: builtin/pack-objects.c:3498
 msgid "limit pack window by objects"
 msgstr "ограничить окно пакета по количеству объектов"
 
-#: builtin/pack-objects.c:3500
 msgid "limit pack window by memory in addition to object limit"
 msgstr "дополнительно к количеству объектов ограничить окно пакета по памяти"
 
-#: builtin/pack-objects.c:3502
 msgid "maximum length of delta chain allowed in the resulting pack"
 msgstr "максимальная разрешенная длина цепочки дельт в результирующем пакете"
 
-#: builtin/pack-objects.c:3504
 msgid "reuse existing deltas"
 msgstr "использовать повторно существующие дельты"
 
-#: builtin/pack-objects.c:3506
 msgid "reuse existing objects"
 msgstr "использовать повторно существующие объекты"
 
-#: builtin/pack-objects.c:3508
 msgid "use OFS_DELTA objects"
 msgstr "использовать объекты OFS_DELTA"
 
-#: builtin/pack-objects.c:3510
 msgid "use threads when searching for best delta matches"
 msgstr "использовать многопоточность при поиске лучших совпадений дельт"
 
-#: builtin/pack-objects.c:3512
 msgid "do not create an empty pack output"
 msgstr "не создавать пустые выходные пакеты"
 
-#: builtin/pack-objects.c:3514
 msgid "read revision arguments from standard input"
 msgstr "прочитать аргументы редакций из стандартного ввода"
 
-#: builtin/pack-objects.c:3516
 msgid "limit the objects to those that are not yet packed"
 msgstr "ограничиться объектами, которые еще не упакованы"
 
-#: builtin/pack-objects.c:3519
 msgid "include objects reachable from any reference"
 msgstr "включить объекты, которые достижимы по любой из ссылок"
 
-#: builtin/pack-objects.c:3522
 msgid "include objects referred by reflog entries"
 msgstr "включить объекты, на которые ссылаются записи журнала ссылок"
 
-#: builtin/pack-objects.c:3525
 msgid "include objects referred to by the index"
 msgstr "включить объекты, на которые ссылается индекс"
 
-#: builtin/pack-objects.c:3528
+msgid "read packs from stdin"
+msgstr ""
+
 msgid "output pack to stdout"
 msgstr "вывести пакет на  стандартный вывод"
 
-#: builtin/pack-objects.c:3530
 msgid "include tag objects that refer to objects to be packed"
 msgstr "включить объекты меток, которые ссылаются на упаковываемые объекты"
 
-#: builtin/pack-objects.c:3532
 msgid "keep unreachable objects"
 msgstr "сохранять ссылки на недоступные объекты"
 
-#: builtin/pack-objects.c:3534
 msgid "pack loose unreachable objects"
 msgstr "паковать недостижимые объекты"
 
-#: builtin/pack-objects.c:3536
 msgid "unpack unreachable objects newer than <time>"
 msgstr "распаковать недоступные объекты, которые новее, чем <время>"
 
-#: builtin/pack-objects.c:3539
+msgid "create a cruft pack"
+msgstr ""
+
+msgid "expire cruft objects older than <time>"
+msgstr ""
+
 msgid "use the sparse reachability algorithm"
 msgstr ""
 
-#: builtin/pack-objects.c:3541
 msgid "create thin packs"
 msgstr "создавать тонкие пакеты"
 
-#: builtin/pack-objects.c:3543
 msgid "create packs suitable for shallow fetches"
 msgstr "создавать пакеты, подходящие для частичных извлечений"
 
-#: builtin/pack-objects.c:3545
 msgid "ignore packs that have companion .keep file"
 msgstr "игнорировать пакеты, рядом с которыми лежит .keep файл"
 
-#: builtin/pack-objects.c:3547
 msgid "ignore this pack"
 msgstr "игнорировать этот пакет"
 
-#: builtin/pack-objects.c:3549
 msgid "pack compression level"
 msgstr "уровень сжатия пакета"
 
-#: builtin/pack-objects.c:3551
 msgid "do not hide commits by grafts"
 msgstr "не скрывать коммиты сращениями"
 
-#: builtin/pack-objects.c:3553
 msgid "use a bitmap index if available to speed up counting objects"
-msgstr "по возможности использовать индекс в битовых картах, для ускорения подсчета объектов"
+msgstr ""
+"по возможности использовать индекс в битовых картах, для ускорения подсчета "
+"объектов"
 
-#: builtin/pack-objects.c:3555
 msgid "write a bitmap index together with the pack index"
 msgstr "запись индекса в битовых картах вместе с индексом пакета"
 
-#: builtin/pack-objects.c:3559
 msgid "write a bitmap index if possible"
 msgstr ""
 
-#: builtin/pack-objects.c:3563
 msgid "handling for missing objects"
 msgstr "обработка отсутствующих объектов"
 
-#: builtin/pack-objects.c:3566
 msgid "do not pack objects in promisor packfiles"
 msgstr "не упаковывать объекты в promisor файлы пакетов"
 
-#: builtin/pack-objects.c:3568
 msgid "respect islands during delta compression"
 msgstr ""
 
-#: builtin/pack-objects.c:3570
 msgid "protocol"
 msgstr ""
 
-#: builtin/pack-objects.c:3571
 msgid "exclude any configured uploadpack.blobpackfileuri with this protocol"
 msgstr ""
 
-#: builtin/pack-objects.c:3600
 #, c-format
 msgid "delta chain depth %d is too deep, forcing %d"
-msgstr "глубина цепочки изменений %d слишком большая, использую принудительно %d"
+msgstr ""
+"глубина цепочки изменений %d слишком большая, использую принудительно %d"
 
-#: builtin/pack-objects.c:3605
 #, c-format
 msgid "pack.deltaCacheLimit is too high, forcing %d"
 msgstr "лисит pack.deltaCacheLimit слишком высокий, использую принудительно %d"
 
-#: builtin/pack-objects.c:3659
+#, c-format
+msgid "bad pack compression level %d"
+msgstr "неправильный уровень сжатия пакета %d"
+
 msgid "--max-pack-size cannot be used to build a pack for transfer"
 msgstr ""
 
-#: builtin/pack-objects.c:3661
 msgid "minimum pack size limit is 1 MiB"
 msgstr ""
 
-#: builtin/pack-objects.c:3666
 msgid "--thin cannot be used to build an indexable pack"
 msgstr ""
 
-#: builtin/pack-objects.c:3669
-msgid "--keep-unreachable and --unpack-unreachable are incompatible"
+msgid "cannot use --filter without --stdout"
 msgstr ""
 
-#: builtin/pack-objects.c:3675
-msgid "cannot use --filter without --stdout"
+msgid "cannot use --filter with --stdin-packs"
+msgstr ""
+
+msgid "cannot use internal rev list with --stdin-packs"
+msgstr ""
+
+msgid "cannot use internal rev list with --cruft"
+msgstr ""
+
+msgid "cannot use --stdin-packs with --cruft"
+msgstr ""
+
+msgid "cannot use --max-pack-size with --cruft"
 msgstr ""
 
-#: builtin/pack-objects.c:3735
 msgid "Enumerating objects"
 msgstr "Перечисление объектов"
 
-#: builtin/pack-objects.c:3766
 #, c-format
 msgid ""
 "Total %<PRIu32> (delta %<PRIu32>), reused %<PRIu32> (delta %<PRIu32>), pack-"
 "reused %<PRIu32>"
-msgstr "Всего %<PRIu32> (изменений %<PRIu32>), повторно использовано %<PRIu32> (изменений %<PRIu32>), повторно использовано пакетов %<PRIu32>"
+msgstr ""
+"Всего %<PRIu32> (изменений %<PRIu32>), повторно использовано %<PRIu32> "
+"(изменений %<PRIu32>), повторно использовано пакетов %<PRIu32>"
+
+msgid ""
+"'git pack-redundant' is nominated for removal.\n"
+"If you still use this command, please add an extra\n"
+"option, '--i-still-use-this', on the command line\n"
+"and let us know you still use it by sending an e-mail\n"
+"to <git@vger.kernel.org>.  Thanks.\n"
+msgstr ""
 
-#: builtin/pack-refs.c:8
 msgid "git pack-refs [<options>]"
 msgstr "git pack-refs [<опции>]"
 
-#: builtin/pack-refs.c:16
 msgid "pack everything"
 msgstr "паковать всё"
 
-#: builtin/pack-refs.c:17
 msgid "prune loose refs (default)"
 msgstr "почистить слабые ссылки (по умолчанию)"
 
-#: builtin/prune-packed.c:6
-msgid "git prune-packed [-n | --dry-run] [-q | --quiet]"
-msgstr "git prune-packed [-n | --dry-run] [-q | --quiet]"
-
-#: builtin/prune.c:14
 msgid "git prune [-n] [-v] [--progress] [--expire <time>] [--] [<head>...]"
-msgstr "git prune [-n] [-v] [--progress] [--expire <время>] [--] [<редакция>…]"
+msgstr ""
+"git prune [-n] [-v] [--progress] [--expire <время>] [--] [<редакция>...]"
 
-#: builtin/prune.c:133
 msgid "report pruned objects"
 msgstr "вывести список удаленных объектов"
 
-#: builtin/prune.c:136
 msgid "expire objects older than <time>"
 msgstr "удалить объекты старее чем <дата-окончания>"
 
-#: builtin/prune.c:138
 msgid "limit traversal to objects outside promisor packfiles"
 msgstr "ограничить обход объектами вне promisor файлов пакетов"
 
-#: builtin/prune.c:152
 msgid "cannot prune in a precious-objects repo"
 msgstr "нельзя почистить неиспользуемые объекты в precious-objects репозитории"
 
-#: builtin/pull.c:45 builtin/pull.c:47
-#, c-format
-msgid "Invalid value for %s: %s"
-msgstr "Неправильное значение %s: %s"
-
-#: builtin/pull.c:67
 msgid "git pull [<options>] [<repository> [<refspec>...]]"
-msgstr "git pull [<опции>] [<репозиторий> [<спецификатор-ссылки>…]]"
+msgstr "git pull [<опции>] [<репозиторий> [<спецификатор-ссылки>...]]"
 
-#: builtin/pull.c:123
 msgid "control for recursive fetching of submodules"
 msgstr "управление рекурсивным извлечением подмодулей"
 
-#: builtin/pull.c:127
 msgid "Options related to merging"
 msgstr "Опции, связанные со слиянием"
 
-#: builtin/pull.c:130
 msgid "incorporate changes by rebasing rather than merging"
 msgstr "забрать изменения с помощью перемещения, а не слияния"
 
-#: builtin/pull.c:158 builtin/rebase.c:490 builtin/revert.c:126
 msgid "allow fast-forward"
-msgstr "разрешить перемотку вперед"
+msgstr "разрешить быструю перемотку"
+
+msgid "control use of pre-merge-commit and commit-msg hooks"
+msgstr ""
 
-#: builtin/pull.c:167 parse-options.h:339
 msgid "automatically stash/stash pop before and after"
 msgstr ""
 
-#: builtin/pull.c:183
 msgid "Options related to fetching"
 msgstr "Опции, связанные с извлечением изменений"
 
-#: builtin/pull.c:193
 msgid "force overwrite of local branch"
 msgstr "принудительная перезапись локальной ветки"
 
-#: builtin/pull.c:201
 msgid "number of submodules pulled in parallel"
 msgstr "количество подмодулей, которые будут получены парралельно"
 
-#: builtin/pull.c:317
-#, c-format
-msgid "Invalid value for pull.ff: %s"
-msgstr "Неправильное значение для pull.ff: %s"
-
-#: builtin/pull.c:348
-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"
-"\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"
-"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"
-msgstr ""
-
-#: builtin/pull.c:458
 msgid ""
 "There is no candidate for rebasing against among the refs that you just "
 "fetched."
-msgstr "Нет претендентов для перемещения среди ссылок, которые вы только что получили."
+msgstr ""
+"Нет претендентов для перемещения среди ссылок, которые вы только что "
+"получили."
 
-#: builtin/pull.c:460
 msgid ""
 "There are no candidates for merging among the refs that you just fetched."
-msgstr "Нет претендентов для слияния среди ссылок, которые вы только что получили."
+msgstr ""
+"Нет претендентов для слияния среди ссылок, которые вы только что получили."
 
-#: builtin/pull.c:461
 msgid ""
 "Generally this means that you provided a wildcard refspec which had no\n"
 "matches on the remote end."
-msgstr "Обычно это означает, что вы передали спецификацию ссылки с помощью шаблона и этот шаблон ни с чем не совпал на внешнем репозитории."
+msgstr ""
+"Обычно это означает, что вы передали спецификацию ссылки с помощью шаблона и "
+"этот шаблон ни с чем не совпал на внешнем репозитории."
 
-#: builtin/pull.c:464
 #, c-format
 msgid ""
 "You asked to pull from the remote '%s', but did not specify\n"
 "a branch. Because this is not the default configured remote\n"
 "for your current branch, you must specify a branch on the command line."
-msgstr "Вы попросили получить изменения со внешнего репозитория «%s», но не указали ветку. Так как это не репозиторий по умолчанию для  вашей текущей ветки, вы должны указать ветку в командной строке."
+msgstr ""
+"Вы попросили получить изменения со внешнего репозитория «%s», но не указали "
+"ветку. Так как это не репозиторий по умолчанию для  вашей текущей ветки, вы "
+"должны указать ветку в командной строке."
 
-#: builtin/pull.c:469 builtin/rebase.c:1246
 msgid "You are not currently on a branch."
 msgstr "Вы сейчас ни на одной из веток."
 
-#: builtin/pull.c:471 builtin/pull.c:486
 msgid "Please specify which branch you want to rebase against."
 msgstr "Пожалуйста, укажите на какую ветку вы хотите переместить изменения."
 
-#: builtin/pull.c:473 builtin/pull.c:488
 msgid "Please specify which branch you want to merge with."
 msgstr "Пожалуйста, укажите с какой веткой вы хотите слить изменения."
 
-#: builtin/pull.c:474 builtin/pull.c:489
 msgid "See git-pull(1) for details."
 msgstr "Для дополнительной информации, смотрите git-pull(1)."
 
-#: builtin/pull.c:476 builtin/pull.c:482 builtin/pull.c:491
-#: builtin/rebase.c:1252
 msgid "<remote>"
 msgstr "<внешний-репозиторий>"
 
-#: builtin/pull.c:476 builtin/pull.c:491 builtin/pull.c:496
 msgid "<branch>"
 msgstr "<ветка>"
 
-#: builtin/pull.c:484 builtin/rebase.c:1244
 msgid "There is no tracking information for the current branch."
 msgstr "У текущей ветки нет информации об отслеживании."
 
-#: builtin/pull.c:493
 msgid ""
 "If you wish to set tracking information for this branch you can do so with:"
 msgstr "Если вы хотите указать информацию о отслеживаемой ветке, выполните:"
 
-#: builtin/pull.c:498
 #, c-format
 msgid ""
 "Your configuration specifies to merge with the ref '%s'\n"
 "from the remote, but no such ref was fetched."
-msgstr "Ваша конфигурация указывает, что нужно слить изменения со ссылкой\n«%s» из внешнего репозитория, но такая ссылка не была получена."
+msgstr ""
+"Ваша конфигурация указывает, что нужно слить изменения со ссылкой\n"
+"«%s» из внешнего репозитория, но такая ссылка не была получена."
 
-#: builtin/pull.c:609
 #, c-format
 msgid "unable to access commit %s"
 msgstr ""
 
-#: builtin/pull.c:915
 msgid "ignoring --verify-signatures for rebase"
 msgstr "игнорирование --verify-signatures при перемещении"
 
-#: builtin/pull.c:972
+msgid ""
+"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\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"
+"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"
+msgstr ""
+
 msgid "Updating an unborn branch with changes added to the index."
-msgstr "Обновление еще не начавшейся ветки с изменениями, добавленными в индекс."
+msgstr ""
+"Обновление еще не начавшейся ветки с изменениями, добавленными в индекс."
 
-#: builtin/pull.c:976
 msgid "pull with rebase"
 msgstr "получение с перемещением"
 
-#: builtin/pull.c:977
 msgid "please commit or stash them."
 msgstr "сделайте коммит или спрячьте их."
 
-#: builtin/pull.c:1002
 #, c-format
 msgid ""
 "fetch updated the current branch head.\n"
 "fast-forwarding your working tree from\n"
 "commit %s."
-msgstr "извлечение обновило указатель на вашу текущую ветку.\nперемотка вашего рабочего каталога\nс коммита %s."
+msgstr ""
+"извлечение обновило указатель на текущую ветку, \n"
+"перемотка рабочей копии с коммита %s."
 
-#: builtin/pull.c:1008
 #, c-format
 msgid ""
 "Cannot fast-forward your working tree.\n"
@@ -17489,39 +9134,53 @@ msgid ""
 "output, run\n"
 "$ git reset --hard\n"
 "to recover."
-msgstr "Не удалось перемотать вперёд изменения в вашем рабочем каталоге.\nПосле того, как вы убедитесь, что вы сохранили всё необходимое из вывода\n$ git diff %s\n, запустите\n$ git reset --hard\nдля восстановления исходного состояния."
+msgstr ""
+"Быстрая перемотка не смогла изменить рабочую копию.\n"
+"После того, как вы убедитесь, что сохранили всё необходимое из вывода\n"
+"$ git diff %s\n"
+"запустите\n"
+"$ git reset --hard\n"
+"для восстановления исходного состояния."
 
-#: builtin/pull.c:1023
 msgid "Cannot merge multiple branches into empty head."
 msgstr "Нельзя слить несколько веток в пустой указатель на ветку."
 
-#: builtin/pull.c:1027
 msgid "Cannot rebase onto multiple branches."
 msgstr "Невозможно переместить над несколькими ветками."
 
-#: builtin/pull.c:1041
+msgid "Cannot fast-forward to multiple branches."
+msgstr ""
+
+msgid "Need to specify how to reconcile divergent branches."
+msgstr ""
+
 msgid "cannot rebase with locally recorded submodule modifications"
-msgstr "невозможно выполнить перемещение с записанными локальными изменениями в подмодулях"
+msgstr ""
+"невозможно выполнить перемещение с записанными локальными изменениями в "
+"подмодулях"
 
-#: builtin/push.c:19
 msgid "git push [<options>] [<repository> [<refspec>...]]"
-msgstr "git push [<опции>] [<репозиторий> [<спецификатор-ссылки>…]]"
+msgstr "git push [<опции>] [<репозиторий> [<спецификатор-ссылки>...]]"
 
-#: builtin/push.c:111
 msgid "tag shorthand without <tag>"
 msgstr "указано сокращение tag, но не указана сама <метка>"
 
-#: builtin/push.c:119
 msgid "--delete only accepts plain target ref names"
 msgstr "опция --delete принимает только простые целевые имена ссылок"
 
-#: builtin/push.c:164
 msgid ""
 "\n"
-"To choose either option permanently, see push.default in 'git help config'."
-msgstr "\nЧтобы выбрать любую из опций на постоянной основе, смотрите push.default в «git help config»."
+"To choose either option permanently, see push.default in 'git help config'.\n"
+msgstr ""
+
+msgid ""
+"\n"
+"To avoid automatically configuring upstream branches when their name\n"
+"doesn't match the local branch, see option 'simple' of branch."
+"autoSetupMerge\n"
+"in 'git help config'.\n"
+msgstr ""
 
-#: builtin/push.c:167
 #, c-format
 msgid ""
 "The upstream branch of your current branch does not match\n"
@@ -17533,10 +9192,9 @@ msgid ""
 "To push to the branch of the same name on the remote, use\n"
 "\n"
 "    git push %s HEAD\n"
-"%s"
+"%s%s"
 msgstr ""
 
-#: builtin/push.c:182
 #, c-format
 msgid ""
 "You are not currently on a branch.\n"
@@ -17544,542 +9202,374 @@ msgid ""
 "state now, use\n"
 "\n"
 "    git push %s HEAD:<name-of-remote-branch>\n"
-msgstr "Вы сейчас не находитесь ни на одной из веток.\nЧтобы отправить историю, ведущую к текущему (отделённый HEAD) состоянию, используйте\n\n    git push %s HEAD:<имя-внешней-ветки>\n"
+msgstr ""
+"Вы сейчас не находитесь ни на одной из веток.\n"
+"Чтобы отправить историю, ведущую к текущему (отсоединённый указатель HEAD) "
+"состоянию, используйте\n"
+"\n"
+"    git push %s HEAD:<имя-внешней-ветки>\n"
+
+msgid ""
+"\n"
+"To have this happen automatically for branches without a tracking\n"
+"upstream, see 'push.autoSetupRemote' in 'git help config'.\n"
+msgstr ""
 
-#: builtin/push.c:194
 #, c-format
 msgid ""
 "The current branch %s has no upstream branch.\n"
 "To push the current branch and set the remote as upstream, use\n"
 "\n"
 "    git push --set-upstream %s %s\n"
-msgstr "Текущая ветка %s не имеет вышестоящей ветки.\nЧтобы отправить текущую ветку и установить внешнюю ветку как вышестоящую для этой ветки, используйте\n\n    git push --set-upstream %s %s\n"
+"%s"
+msgstr ""
 
-#: builtin/push.c:202
 #, c-format
+msgid "The current branch %s has multiple upstream branches, refusing to push."
+msgstr ""
+"Ваша текущая ветка %s имеет несколько вышестоящих веток, отказ в отправке "
+"изменений."
+
 msgid ""
-"The current branch %s has multiple upstream branches, refusing to push."
-msgstr "Ваша текущая ветка %s имеет несколько вышестоящих веток, отказ в отправке изменений."
+"You didn't specify any refspecs to push, and push.default is \"nothing\"."
+msgstr ""
+"Вы не указали спецификацию ссылки для отправки, а push.default указан как "
+"«nothing»."
 
-#: builtin/push.c:205
 #, c-format
 msgid ""
 "You are pushing to remote '%s', which is not the upstream of\n"
 "your current branch '%s', without telling me what to push\n"
 "to update which remote branch."
-msgstr "Вы сейчас отправляете изменения на внешний репозиторий «%s», который не является вышестоящим для вашей текущей ветки «%s», без указания того, что отправлять и в какую внешнюю ветку."
-
-#: builtin/push.c:260
-msgid "You didn't specify any refspecs to push, and push.default is \"nothing\"."
-msgstr "Вы не указали спецификацию ссылки для отправки, а push.default указан как «nothing»."
+msgstr ""
+"Вы сейчас отправляете изменения на внешний репозиторий «%s», который не "
+"является вышестоящим для вашей текущей ветки «%s», без указания того, что "
+"отправлять и в какую внешнюю ветку."
 
-#: builtin/push.c:267
 msgid ""
 "Updates were rejected because the tip of your current branch is behind\n"
 "its remote counterpart. Integrate the remote changes (e.g.\n"
 "'git pull ...') before pushing again.\n"
 "See the 'Note about fast-forwards' in 'git push --help' for details."
-msgstr "Обновления были отклонены, так как верхушка вашей текущей ветки\nпозади ее внешней части. Заберите и слейте внешние изменения \n(например, с помощью «git pull …») перед повторной попыткой отправки\nизменений.\nДля дополнительной информации, смотрите «Note about fast-forwards»\nв «git push --help»."
+msgstr ""
+"Обновления были отклонены, так как верхушка текущей ветки\n"
+"позади ее внешней части. Заберите и слейте внешние изменения \n"
+"(например, с помощью «git pull ...») перед повторной попыткой отправки\n"
+"изменений.\n"
+"Для дополнительной информации, смотрите «Заметку о быстрой перемотке»\n"
+"в «git push --help»."
 
-#: builtin/push.c:273
 msgid ""
 "Updates were rejected because a pushed branch tip is behind its remote\n"
 "counterpart. Check out this branch and integrate the remote changes\n"
 "(e.g. 'git pull ...') before pushing again.\n"
 "See the 'Note about fast-forwards' in 'git push --help' for details."
-msgstr "Обновления были отклонены, так как верхушка отправляемой ветки\nпозади ее внешней части. Переключитесь на ветку и заберите внешние\nизменения (например, с помощью «git pull …») перед повторной\nпопыткой отправки изменений.\nДля дополнительной информации, смотрите «Note about fast-forwards»\nв «git push --help»."
+msgstr ""
+"Обновления были отклонены, так как верхушка отправляемой ветки\n"
+"позади ее внешней части. Переключитесь на ветку и заберите внешние\n"
+"изменения (например, с помощью «git pull ...») перед повторной\n"
+"попыткой отправки изменений.\n"
+"Для дополнительной информации, смотрите «Заметку о быстрой перемотке»\n"
+"в «git push --help»."
 
-#: builtin/push.c:279
 msgid ""
 "Updates were rejected because the remote contains work that you do\n"
 "not have locally. This is usually caused by another repository pushing\n"
 "to the same ref. You may want to first integrate the remote changes\n"
 "(e.g., 'git pull ...') before pushing again.\n"
 "See the 'Note about fast-forwards' in 'git push --help' for details."
-msgstr "Обновления были отклонены, так как внешний репозиторий содержит\nизменения, которых у вас нет в вашем локальном репозитории.\nОбычно, это связанно с тем, что кто-то уже отправил изменения в \nто же место. Перед повторной отправкой ваших изменений, вам нужно\nзабрать и слить изменения из внешнего репозитория себе\n(например, с помощью «git pull …»).\nДля дополнительной информации, смотрите «Note about fast-forwards»\nв «git push --help»."
+msgstr ""
+"Обновления были отклонены, так как внешний репозиторий содержит\n"
+"изменения, которых у вас нет в вашем локальном репозитории.\n"
+"Обычно, это связанно с тем, что кто-то уже отправил изменения в \n"
+"то же место. Перед повторной отправкой ваших изменений, вам нужно\n"
+"забрать и слить изменения из внешнего репозитория себе\n"
+"(например, с помощью «git pull ...»).\n"
+"Для дополнительной информации, смотрите «Заметку о быстрой перемотке»\n"
+"в «git push --help»."
 
-#: builtin/push.c:286
 msgid "Updates were rejected because the tag already exists in the remote."
-msgstr "Обновления были отклонены, так как метка уже существует во внешнем репозитории."
+msgstr ""
+"Обновления были отклонены, так как метка уже существует во внешнем "
+"репозитории."
 
-#: builtin/push.c:289
 msgid ""
 "You cannot update a remote ref that points at a non-commit object,\n"
 "or update a remote ref to make it point at a non-commit object,\n"
 "without using the '--force' option.\n"
-msgstr "Вы не можете обновить внешнюю ссылку, которая указывает на объект, не являющийся коммитом или обновить внешнюю ссылку так, чтобы она указывала на объект, не являющийся коммитом, без указания опции «--force».\n"
+msgstr ""
+"Вы не можете обновить внешнюю ссылку, которая указывает на объект, не "
+"являющийся коммитом или обновить внешнюю ссылку так, чтобы она указывала на "
+"объект, не являющийся коммитом, без указания опции «--force».\n"
 
-#: builtin/push.c:294
 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 ""
+"Обновления были отклонены, так как верхушка отслеживаемой ветки\n"
+"изменилась после последнего переключения на состояние.\n"
+"Перед принудительным обновлением, вы возможно захотите\n"
+"интегрировать эти изменения локально (с помощью «git pull ...»).\n"
 
-#: builtin/push.c:364
 #, c-format
 msgid "Pushing to %s\n"
 msgstr "Отправка в %s\n"
 
-#: builtin/push.c:371
 #, c-format
 msgid "failed to push some refs to '%s'"
 msgstr "не удалось отправить некоторые ссылки в «%s»"
 
-#: builtin/push.c:553
+#, c-format
+msgid "invalid value for '%s'"
+msgstr ""
+
 msgid "repository"
 msgstr "репозиторий"
 
-#: builtin/push.c:554 builtin/send-pack.c:189
 msgid "push all refs"
 msgstr "отправить все ссылки"
 
-#: builtin/push.c:555 builtin/send-pack.c:191
 msgid "mirror all refs"
 msgstr "сделать зеркало всех ссылок"
 
-#: builtin/push.c:557
 msgid "delete refs"
 msgstr "удалить ссылки"
 
-#: builtin/push.c:558
 msgid "push tags (can't be used with --all or --mirror)"
 msgstr "отправить метки (нельзя использовать вместе с --all или --mirror)"
 
-#: builtin/push.c:561 builtin/send-pack.c:192
 msgid "force updates"
 msgstr "принудительное обновление"
 
-#: builtin/push.c:562 builtin/send-pack.c:204
 msgid "<refname>:<expect>"
 msgstr ""
 
-#: builtin/push.c:563 builtin/send-pack.c:205
 msgid "require old value of ref to be at this value"
 msgstr "требовать, чтобы старое значение ссылки было ожидаемым"
 
-#: builtin/push.c:566 builtin/send-pack.c:208
 msgid "require remote updates to be integrated locally"
 msgstr ""
 
-#: builtin/push.c:569
 msgid "control recursive pushing of submodules"
 msgstr "управление рекурсивной отправкой подмодулей"
 
-#: builtin/push.c:570 builtin/send-pack.c:199
 msgid "use thin pack"
 msgstr "использовать тонкие пакеты"
 
-#: builtin/push.c:571 builtin/push.c:572 builtin/send-pack.c:186
-#: builtin/send-pack.c:187
 msgid "receive pack program"
 msgstr "путь к программе упаковки на сервере"
 
-#: builtin/push.c:573
 msgid "set upstream for git pull/status"
 msgstr "установить вышестоящую ветку для git pull/status"
 
-#: builtin/push.c:576
 msgid "prune locally removed refs"
 msgstr "почистить локально удаленные ссылки"
 
-#: builtin/push.c:578
 msgid "bypass pre-push hook"
 msgstr "пропустить перехватчик pre-push"
 
-#: builtin/push.c:579
 msgid "push missing but relevant tags"
 msgstr "отправить пропущенные, но нужные метки"
 
-#: builtin/push.c:581 builtin/send-pack.c:193
 msgid "GPG sign the push"
 msgstr "подписать отправку с помощью GPG"
 
-#: builtin/push.c:583 builtin/send-pack.c:200
 msgid "request atomic transaction on remote side"
 msgstr "запросить выполнение атомарной транзакции на внешней стороне"
 
-#: builtin/push.c:601
-msgid "--delete is incompatible with --all, --mirror and --tags"
-msgstr "--delete несовместимо с  --all, --mirror и --tags"
-
-#: builtin/push.c:603
 msgid "--delete doesn't make sense without any refs"
 msgstr "--delete не имеет смысла без указания ссылок"
 
-#: builtin/push.c:623
 #, c-format
 msgid "bad repository '%s'"
 msgstr "плохой репозитория «%s»"
 
-#: builtin/push.c:624
 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"
 "and then push using the remote name\n"
 "\n"
 "    git push <name>\n"
-msgstr "Не настроена точка назначения для отправки.\nЛибо укажите URL с помощью командной строки, либо настройте внешний репозиторий с помощью\n\n    git remote add <имя> <адрес>\n\nа затем отправьте изменения с помощью имени внешнего репозитория\n\n    git push <имя>\n"
-
-#: builtin/push.c:639
-msgid "--all and --tags are incompatible"
-msgstr "--all и --tags нельзя использовать одновременно"
+msgstr ""
+"Не настроена точка назначения для отправки.\n"
+"Либо укажите URL с помощью командной строки, либо настройте внешний "
+"репозиторий с помощью\n"
+"\n"
+"    git remote add <имя> <адрес>\n"
+"\n"
+"а затем отправьте изменения с помощью имени внешнего репозитория\n"
+"\n"
+"    git push <имя>\n"
 
-#: builtin/push.c:641
 msgid "--all can't be combined with refspecs"
 msgstr "--all нельзя использовать вместе со спецификаторами ссылок"
 
-#: builtin/push.c:645
-msgid "--mirror and --tags are incompatible"
-msgstr "--mirror и --tags нельзя использовать одновременно"
-
-#: builtin/push.c:647
 msgid "--mirror can't be combined with refspecs"
 msgstr "--mirror нельзя использовать вместе со спецификаторами ссылок"
 
-#: builtin/push.c:650
-msgid "--all and --mirror are incompatible"
-msgstr "--all и --mirror нельзя использовать одновременно"
-
-#: builtin/push.c:657
 msgid "push options must not have new line characters"
 msgstr "опции для отправки не должны содержать символы перевода строк"
 
-#: builtin/range-diff.c:8
 msgid "git range-diff [<options>] <old-base>..<old-tip> <new-base>..<new-tip>"
 msgstr ""
 
-#: builtin/range-diff.c:9
 msgid "git range-diff [<options>] <old-tip>...<new-tip>"
 msgstr ""
 
-#: builtin/range-diff.c:10
 msgid "git range-diff [<options>] <base> <old-tip> <new-tip>"
 msgstr ""
 
-#: builtin/range-diff.c:22
-msgid "Percentage by which creation is weighted"
-msgstr ""
-
-#: builtin/range-diff.c:24
 msgid "use simple diff colors"
 msgstr ""
 
-#: builtin/range-diff.c:26
 msgid "notes"
 msgstr ""
 
-#: builtin/range-diff.c:26
 msgid "passed to 'git log'"
 msgstr ""
 
-#: builtin/range-diff.c:50 builtin/range-diff.c:54
+msgid "only emit output related to the first range"
+msgstr ""
+
+msgid "only emit output related to the second range"
+msgstr ""
+
 #, c-format
-msgid "no .. in range: '%s'"
+msgid "not a commit range: '%s'"
 msgstr ""
 
-#: builtin/range-diff.c:64
 msgid "single arg format must be symmetric range"
 msgstr ""
 
-#: builtin/range-diff.c:79
 msgid "need two commit ranges"
 msgstr ""
 
-#: 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>]])"
-msgstr "git read-tree [(-m [--trivial] [--aggressive] | --reset | --prefix=<префикс>) [-u [--exclude-per-directory=<gitignore>] | -i]] [--no-sparse-checkout] [--index-output=<файл>] (--empty | <указатель-дерева-1> [<указатель-дерева-2> [<указатель-дерева-3>]])"
+"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 ""
 
-#: builtin/read-tree.c:124
 msgid "write resulting index to <file>"
 msgstr "записать результирующий индекс в <файл>"
 
-#: builtin/read-tree.c:127
 msgid "only empty the index"
 msgstr "просто очистить индекс"
 
-#: builtin/read-tree.c:129
 msgid "Merging"
 msgstr "Слияние"
 
-#: builtin/read-tree.c:131
 msgid "perform a merge in addition to a read"
 msgstr "выполнить слияние в дополнение к чтению"
 
-#: builtin/read-tree.c:133
 msgid "3-way merge if no file level merging required"
 msgstr "трехходовое слияние, если не требуется слияние на уровне файлов"
 
-#: builtin/read-tree.c:135
 msgid "3-way merge in presence of adds and removes"
-msgstr "трехходовое слияние в случае присутствия добавлений или удалений файлов"
+msgstr ""
+"трехходовое слияние в случае присутствия добавлений или удалений файлов"
 
-#: builtin/read-tree.c:137
 msgid "same as -m, but discard unmerged entries"
 msgstr "тоже, что и -m, но отменяет изменения не слитых записей"
 
-#: builtin/read-tree.c:138
 msgid "<subdirectory>/"
 msgstr "<подкаталог>/"
 
-#: builtin/read-tree.c:139
 msgid "read the tree into the index under <subdirectory>/"
 msgstr "прочитать дерево в индекс в <подкаталог>/"
 
-#: builtin/read-tree.c:142
 msgid "update working tree with merge result"
 msgstr "обновить рабочий каталог результатом слияния"
 
-#: builtin/read-tree.c:144
 msgid "gitignore"
 msgstr "gitignore"
 
-#: 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 "не проверять рабочий каталог после слияния"
 
-#: 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 "отладка unpack-trees"
 
-#: builtin/read-tree.c:157
 msgid "suppress feedback messages"
 msgstr ""
 
-#: builtin/read-tree.c:188
 msgid "You need to resolve your current index first"
 msgstr ""
 
-#: builtin/rebase.c:35
 msgid ""
 "git rebase [-i] [options] [--exec <cmd>] [--onto <newbase> | --keep-base] "
 "[<upstream> [<branch>]]"
 msgstr ""
 
-#: builtin/rebase.c:37
 msgid ""
-"git rebase [-i] [options] [--exec <cmd>] [--onto <newbase>] --root "
-"[<branch>]"
-msgstr ""
-
-#: builtin/rebase.c:39
-msgid "git rebase --continue | --abort | --skip | --edit-todo"
+"git rebase [-i] [options] [--exec <cmd>] [--onto <newbase>] --root [<branch>]"
 msgstr ""
 
-#: builtin/rebase.c:193 builtin/rebase.c:217 builtin/rebase.c:244
 #, c-format
-msgid "unusable todo list: '%s'"
-msgstr "непригодный для использования список дел: «%s»"
+msgid "could not read '%s'."
+msgstr "не удалось прочитать «%s»."
 
-#: builtin/rebase.c:310
 #, c-format
 msgid "could not create temporary %s"
 msgstr ""
 
-#: builtin/rebase.c:316
 msgid "could not mark as interactive"
 msgstr ""
 
-#: builtin/rebase.c:369
 msgid "could not generate todo list"
 msgstr ""
 
-#: builtin/rebase.c:411
 msgid "a base commit must be provided with --upstream or --onto"
 msgstr ""
 
-#: builtin/rebase.c:480
-msgid "git rebase--interactive [<options>]"
-msgstr ""
-
-#: builtin/rebase.c:493 builtin/rebase.c:1388
-msgid "keep commits which start empty"
-msgstr ""
-
-#: builtin/rebase.c:497 builtin/revert.c:128
-msgid "allow commits with empty messages"
-msgstr "разрешить коммиты с пустыми сообщениями"
-
-#: builtin/rebase.c:499
-msgid "rebase merge commits"
-msgstr ""
-
-#: builtin/rebase.c:501
-msgid "keep original branch points of cousins"
-msgstr ""
-
-#: builtin/rebase.c:503
-msgid "move commits that begin with squash!/fixup!"
-msgstr ""
-
-#: builtin/rebase.c:504
-msgid "sign commits"
-msgstr ""
-
-#: builtin/rebase.c:506 builtin/rebase.c:1327
-msgid "display a diffstat of what changed upstream"
-msgstr ""
-
-#: builtin/rebase.c:508
-msgid "continue rebase"
-msgstr "продолжить перемещение"
-
-#: builtin/rebase.c:510
-msgid "skip commit"
-msgstr ""
-
-#: builtin/rebase.c:511
-msgid "edit the todo list"
-msgstr ""
-
-#: builtin/rebase.c:513
-msgid "show the current patch"
-msgstr ""
-
-#: builtin/rebase.c:516
-msgid "shorten commit ids in the todo list"
-msgstr "вывести короткие идентификаторы коммитов в списке действий"
-
-#: builtin/rebase.c:518
-msgid "expand commit ids in the todo list"
-msgstr "вывести полные идентификаторы коммитов в списке действий"
-
-#: builtin/rebase.c:520
-msgid "check the todo list"
-msgstr "проверить список дел"
-
-#: builtin/rebase.c:522
-msgid "rearrange fixup/squash lines"
-msgstr "переставить строки fixup/squash"
-
-#: builtin/rebase.c:524
-msgid "insert exec commands in todo list"
-msgstr "вставить команды исполнения коммитов в списке действий"
-
-#: builtin/rebase.c:525
-msgid "onto"
-msgstr ""
-
-#: builtin/rebase.c:528
-msgid "restrict-revision"
-msgstr ""
-
-#: builtin/rebase.c:528
-msgid "restrict revision"
-msgstr ""
-
-#: builtin/rebase.c:530
-msgid "squash-onto"
-msgstr ""
-
-#: builtin/rebase.c:531
-msgid "squash onto"
-msgstr ""
-
-#: builtin/rebase.c:533
-msgid "the upstream commit"
-msgstr ""
-
-#: builtin/rebase.c:535
-msgid "head-name"
-msgstr ""
-
-#: builtin/rebase.c:535
-msgid "head name"
-msgstr ""
-
-#: builtin/rebase.c:540
-msgid "rebase strategy"
-msgstr ""
-
-#: builtin/rebase.c:541
-msgid "strategy-opts"
-msgstr ""
-
-#: builtin/rebase.c:542
-msgid "strategy options"
-msgstr ""
-
-#: builtin/rebase.c:543
-msgid "switch-to"
-msgstr ""
-
-#: builtin/rebase.c:544
-msgid "the branch or commit to checkout"
-msgstr ""
-
-#: builtin/rebase.c:545
-msgid "onto-name"
-msgstr ""
-
-#: builtin/rebase.c:545
-msgid "onto name"
-msgstr ""
-
-#: builtin/rebase.c:546
-msgid "cmd"
-msgstr ""
-
-#: builtin/rebase.c:546
-msgid "the command to run"
-msgstr ""
-
-#: builtin/rebase.c:549 builtin/rebase.c:1421
-msgid "automatically re-schedule any `exec` that fails"
-msgstr ""
-
-#: builtin/rebase.c:565
-msgid "--[no-]rebase-cousins has no effect without --rebase-merges"
-msgstr "--[no-]rebase-cousins не имеет смысла без указания --rebase-merges"
-
-#: builtin/rebase.c:581
 #, c-format
 msgid "%s requires the merge backend"
 msgstr ""
 
-#: builtin/rebase.c:624
 #, c-format
 msgid "could not get 'onto': '%s'"
 msgstr ""
 
-#: builtin/rebase.c:641
 #, c-format
 msgid "invalid orig-head: '%s'"
 msgstr ""
 
-#: builtin/rebase.c:666
 #, c-format
 msgid "ignoring invalid allow_rerere_autoupdate: '%s'"
 msgstr ""
 
-#: builtin/rebase.c:811 git-rebase--preserve-merges.sh:81
+#, c-format
+msgid "could not remove '%s'"
+msgstr "не удалось удалить «%s»"
+
 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\"."
-msgstr "Разрешите все конфликты вручную, пометьте их разрешёнными с помощью «git add/rm <конфликтующие-файлы>», а затем запустите «git rebase --continue».\nЕсли вы хотите пропустить этот коммит, то запустите «git rebase --skip».\nЧтобы вернуться на состояние до «git rebase», запустите «git rebase --abort»."
+"To abort and get back to the state before \"git rebase\", run \"git rebase --"
+"abort\"."
+msgstr ""
+"Разрешите все конфликты вручную, пометьте их разрешёнными командой\n"
+"«git add/rm <конфликтующие-файлы>», затем запустите «git rebase --"
+"continue».\n"
+"Если хотите пропустить этот коммит, то запустите «git rebase --skip».\n"
+"Чтобы вернуться на состояние до «git rebase», запустите «git rebase --abort»."
 
-#: builtin/rebase.c:894
 #, c-format
 msgid ""
 "\n"
@@ -18091,12 +9581,16 @@ msgid ""
 "As a result, git cannot rebase them."
 msgstr ""
 
-#: builtin/rebase.c:1220
 #, c-format
-msgid "unrecognized empty type '%s'; valid values are \"drop\", \"keep\", and \"ask\"."
+msgid "could not switch to %s"
+msgstr ""
+
+#, c-format
+msgid ""
+"unrecognized empty type '%s'; valid values are \"drop\", \"keep\", and \"ask"
+"\"."
 msgstr ""
 
-#: builtin/rebase.c:1238
 #, c-format
 msgid ""
 "%s\n"
@@ -18107,7 +9601,6 @@ msgid ""
 "\n"
 msgstr ""
 
-#: builtin/rebase.c:1254
 #, c-format
 msgid ""
 "If you wish to set tracking information for this branch you can do so with:\n"
@@ -18116,201 +9609,161 @@ msgid ""
 "\n"
 msgstr ""
 
-#: builtin/rebase.c:1284
 msgid "exec commands cannot contain newlines"
 msgstr ""
 
-#: builtin/rebase.c:1288
 msgid "empty exec command"
 msgstr ""
 
-#: builtin/rebase.c:1318
 msgid "rebase onto given branch instead of upstream"
 msgstr ""
 
-#: builtin/rebase.c:1320
 msgid "use the merge-base of upstream and branch as the current base"
 msgstr ""
 
-#: builtin/rebase.c:1322
 msgid "allow pre-rebase hook to run"
 msgstr ""
 
-#: builtin/rebase.c:1324
 msgid "be quiet. implies --no-stat"
 msgstr ""
 
-#: builtin/rebase.c:1330
+msgid "display a diffstat of what changed upstream"
+msgstr ""
+
 msgid "do not show diffstat of what changed upstream"
 msgstr ""
 
-#: builtin/rebase.c:1333
 msgid "add a Signed-off-by trailer to each commit"
 msgstr ""
 
-#: builtin/rebase.c:1336
 msgid "make committer date match author date"
 msgstr ""
 
-#: builtin/rebase.c:1338
 msgid "ignore author date and use current date"
 msgstr ""
 
-#: builtin/rebase.c:1340
 msgid "synonym of --reset-author-date"
 msgstr ""
 
-#: builtin/rebase.c:1342 builtin/rebase.c:1346
 msgid "passed to 'git apply'"
 msgstr ""
 
-#: builtin/rebase.c:1344
 msgid "ignore changes in whitespace"
 msgstr ""
 
-#: builtin/rebase.c:1348 builtin/rebase.c:1351
 msgid "cherry-pick all commits, even if unchanged"
 msgstr ""
 
-#: builtin/rebase.c:1353
 msgid "continue"
 msgstr ""
 
-#: builtin/rebase.c:1356
 msgid "skip current patch and continue"
 msgstr ""
 
-#: builtin/rebase.c:1358
 msgid "abort and check out the original branch"
 msgstr ""
 
-#: builtin/rebase.c:1361
 msgid "abort but keep HEAD where it is"
 msgstr ""
 
-#: builtin/rebase.c:1362
 msgid "edit the todo list during an interactive rebase"
 msgstr ""
 
-#: builtin/rebase.c:1365
 msgid "show the patch file being applied or merged"
 msgstr ""
 
-#: builtin/rebase.c:1368
 msgid "use apply strategies to rebase"
 msgstr ""
 
-#: builtin/rebase.c:1372
 msgid "use merging strategies to rebase"
 msgstr ""
 
-#: builtin/rebase.c:1376
 msgid "let the user edit the list of commits to rebase"
 msgstr ""
 
-#: builtin/rebase.c:1380
-msgid "(DEPRECATED) try to recreate merges instead of ignoring them"
+msgid "(REMOVED) was: try to recreate merges instead of ignoring them"
 msgstr ""
 
-#: builtin/rebase.c:1385
 msgid "how to handle commits that become empty"
 msgstr ""
 
-#: builtin/rebase.c:1392
+msgid "keep commits which start empty"
+msgstr ""
+
 msgid "move commits that begin with squash!/fixup! under -i"
 msgstr ""
 
-#: builtin/rebase.c:1399
 msgid "add exec lines after each commit of the editable list"
 msgstr ""
 
-#: builtin/rebase.c:1403
 msgid "allow rebasing commits with empty messages"
 msgstr ""
 
-#: builtin/rebase.c:1407
 msgid "try to rebase merges instead of skipping them"
 msgstr ""
 
-#: builtin/rebase.c:1410
 msgid "use 'merge-base --fork-point' to refine upstream"
 msgstr ""
 
-#: builtin/rebase.c:1412
 msgid "use the given merge strategy"
 msgstr ""
 
-#: builtin/rebase.c:1414 builtin/revert.c:115
 msgid "option"
 msgstr "опция"
 
-#: builtin/rebase.c:1415
 msgid "pass the argument through to the merge strategy"
 msgstr ""
 
-#: builtin/rebase.c:1418
 msgid "rebase all reachable commits up to the root(s)"
 msgstr ""
 
-#: builtin/rebase.c:1423
-msgid "apply all changes, even those already present upstream"
+msgid "automatically re-schedule any `exec` that fails"
 msgstr ""
 
-#: builtin/rebase.c:1440
-msgid ""
-"the rebase.useBuiltin support has been removed!\n"
-"See its entry in 'git help config' for details."
+msgid "apply all changes, even those already present upstream"
 msgstr ""
 
-#: builtin/rebase.c:1446
 msgid "It looks like 'git am' is in progress. Cannot rebase."
 msgstr "Похоже, что выполняется «git am». Невозможно выполнить перемещение."
 
-#: builtin/rebase.c:1487
 msgid ""
-"git rebase --preserve-merges is deprecated. Use --rebase-merges instead."
+"`rebase --preserve-merges` (-p) is no longer supported.\n"
+"Use `git rebase --abort` to terminate current rebase.\n"
+"Or downgrade to v2.33, or earlier, to complete the rebase."
 msgstr ""
 
-#: builtin/rebase.c:1492
-msgid "cannot combine '--keep-base' with '--onto'"
-msgstr ""
-
-#: builtin/rebase.c:1494
-msgid "cannot combine '--keep-base' with '--root'"
-msgstr ""
-
-#: builtin/rebase.c:1498
-msgid "cannot combine '--root' with '--fork-point'"
+msgid ""
+"--preserve-merges was replaced by --rebase-merges\n"
+"Note: Your `pull.rebase` configuration may also be set to 'preserve',\n"
+"which is no longer supported; use 'merges' instead"
 msgstr ""
 
-#: builtin/rebase.c:1501
 msgid "No rebase in progress?"
 msgstr "Нет перемещения в процессе?"
 
-#: builtin/rebase.c:1505
 msgid "The --edit-todo action can only be used during interactive rebase."
-msgstr "Действие --edit-todo может использоваться только при интерактивном перемещении."
+msgstr ""
+"Действие --edit-todo может использоваться только при интерактивном "
+"перемещении."
 
-#: builtin/rebase.c:1528 t/helper/test-fast-rebase.c:123
 msgid "Cannot read HEAD"
 msgstr "Не удалось прочитать HEAD"
 
-#: builtin/rebase.c:1540
 msgid ""
 "You must edit all merge conflicts and then\n"
 "mark them as resolved using git add"
-msgstr "Вы должны отредактировать все\nконфликты слияния, а потом пометить\nих как разрешенные с помощью git add"
+msgstr ""
+"Вы должны отредактировать все\n"
+"конфликты слияния, а потом пометить\n"
+"их как разрешенные с помощью git add"
 
-#: builtin/rebase.c:1559
 msgid "could not discard worktree changes"
 msgstr ""
 
-#: builtin/rebase.c:1578
 #, c-format
 msgid "could not move back to %s"
 msgstr ""
 
-#: builtin/rebase.c:1624
 #, c-format
 msgid ""
 "It seems that there is already a %s directory, and\n"
@@ -18323,140 +9776,99 @@ msgid ""
 "valuable there.\n"
 msgstr ""
 
-#: builtin/rebase.c:1652
 msgid "switch `C' expects a numerical value"
 msgstr ""
 
-#: builtin/rebase.c:1694
 #, c-format
 msgid "Unknown mode: %s"
 msgstr ""
 
-#: builtin/rebase.c:1733
 msgid "--strategy requires --merge or --interactive"
 msgstr ""
 
-#: builtin/rebase.c:1763
-msgid "cannot combine apply options with merge options"
+msgid "apply options and merge options cannot be used together"
 msgstr ""
 
-#: builtin/rebase.c:1776
 #, c-format
 msgid "Unknown rebase backend: %s"
 msgstr ""
 
-#: builtin/rebase.c:1806
 msgid "--reschedule-failed-exec requires --exec or --interactive"
 msgstr ""
 
-#: builtin/rebase.c:1826
-msgid "cannot combine '--preserve-merges' with '--rebase-merges'"
-msgstr ""
-
-#: builtin/rebase.c:1830
-msgid ""
-"error: cannot combine '--preserve-merges' with '--reschedule-failed-exec'"
-msgstr ""
-
-#: builtin/rebase.c:1854
 #, c-format
 msgid "invalid upstream '%s'"
 msgstr ""
 
-#: builtin/rebase.c:1860
 msgid "Could not create new root commit"
 msgstr ""
 
-#: builtin/rebase.c:1886
 #, c-format
-msgid "'%s': need exactly one merge base with branch"
+msgid "no such branch/commit '%s'"
 msgstr ""
 
-#: builtin/rebase.c:1889
 #, c-format
-msgid "'%s': need exactly one merge base"
+msgid "No such ref: %s"
+msgstr "Нет такой ссылки: %s"
+
+msgid "Could not resolve HEAD to a revision"
 msgstr ""
 
-#: builtin/rebase.c:1897
 #, c-format
-msgid "Does not point to a valid commit '%s'"
+msgid "'%s': need exactly one merge base with branch"
 msgstr ""
 
-#: builtin/rebase.c:1923
 #, c-format
-msgid "fatal: no such branch/commit '%s'"
+msgid "'%s': need exactly one merge base"
 msgstr ""
 
-#: builtin/rebase.c:1931 builtin/submodule--helper.c:40
-#: builtin/submodule--helper.c:2414
 #, c-format
-msgid "No such ref: %s"
-msgstr "Нет такой ссылки: %s"
-
-#: builtin/rebase.c:1942
-msgid "Could not resolve HEAD to a revision"
+msgid "Does not point to a valid commit '%s'"
 msgstr ""
 
-#: builtin/rebase.c:1963
 msgid "Please commit or stash them."
 msgstr "Сделайте коммит или спрячьте их."
 
-#: builtin/rebase.c:1999
-#, c-format
-msgid "could not switch to %s"
-msgstr ""
-
-#: builtin/rebase.c:2010
 msgid "HEAD is up to date."
 msgstr "HEAD уже в актуальном состоянии."
 
-#: builtin/rebase.c:2012
 #, c-format
 msgid "Current branch %s is up to date.\n"
-msgstr ""
+msgstr "Текущая ветка %s уже в актуальном состоянии.\n"
 
-#: builtin/rebase.c:2020
 msgid "HEAD is up to date, rebase forced."
 msgstr "HEAD уже в актуальном состоянии, принудительное перемещение."
 
-#: builtin/rebase.c:2022
 #, c-format
 msgid "Current branch %s is up to date, rebase forced.\n"
 msgstr ""
+"Текущая ветка %s уже в актуальном состоянии, принудительное перемещение.\n"
 
-#: builtin/rebase.c:2030
 msgid "The pre-rebase hook refused to rebase."
 msgstr "Перехватчик pre-rebase отказал в перемещении."
 
-#: builtin/rebase.c:2037
 #, c-format
 msgid "Changes to %s:\n"
 msgstr ""
 
-#: builtin/rebase.c:2040
 #, c-format
 msgid "Changes from %s to %s:\n"
 msgstr ""
 
-#: builtin/rebase.c:2065
 #, c-format
 msgid "First, rewinding head to replay your work on top of it...\n"
 msgstr ""
 
-#: builtin/rebase.c:2074
 msgid "Could not detach HEAD"
 msgstr ""
 
-#: builtin/rebase.c:2083
 #, c-format
 msgid "Fast-forwarded %s to %s.\n"
-msgstr ""
+msgstr "Быстрая перемотка %s до %s.\n"
 
-#: builtin/receive-pack.c:34
 msgid "git receive-pack <git-dir>"
 msgstr "git receive-pack <каталог-git>"
 
-#: builtin/receive-pack.c:1276
 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"
@@ -18471,9 +9883,23 @@ msgid ""
 "\n"
 "To squelch this message and still keep the default behaviour, set\n"
 "'receive.denyCurrentBranch' configuration variable to 'refuse'."
-msgstr "По умолчанию, обновлять текущую ветку в репозитории с рабочей\nкопией (не голом) запрещено, так как это сделает состояние индекса\nи рабочего каталога противоречивым, и вам прийдется выполнить\n«git reset --hard», чтобы состояние рабочего каталога снова\nсоответствовало HEAD.\n\nВы можете установить значение опции «receive.denyCurrentBranch»\nв «ignore» или «warn» во внешнем репозитории, чтобы разрешить\nотправку в его текущую ветку; но это не рекомендуется, если только\nвы не намерены обновить его рабочий каталог способом подобным\nвышеописанному.\n\nЧтобы пропустить это сообщение и все равно оставить поведение\nпо умолчанию, установите значение опции «receive.denyCurrentBranch»\nв «refuse»."
+msgstr ""
+"По умолчанию, обновлять текущую ветку в репозитории с рабочей\n"
+"копией (не голом) запрещено, так как это сделает состояние индекса\n"
+"и рабочего каталога противоречивым, и вам прийдется выполнить\n"
+"«git reset --hard», чтобы состояние рабочего каталога снова\n"
+"соответствовало HEAD.\n"
+"\n"
+"Вы можете установить значение опции «receive.denyCurrentBranch»\n"
+"в «ignore» или «warn» во внешнем репозитории, чтобы разрешить\n"
+"отправку в его текущую ветку; но это не рекомендуется, если только\n"
+"вы не намерены обновить его рабочий каталог способом подобным\n"
+"вышеописанному.\n"
+"\n"
+"Чтобы пропустить это сообщение и все равно оставить поведение\n"
+"по умолчанию, установите значение опции «receive.denyCurrentBranch»\n"
+"в «refuse»."
 
-#: builtin/receive-pack.c:1296
 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"
@@ -18483,227 +9909,234 @@ msgid ""
 "current branch, with or without a warning message.\n"
 "\n"
 "To squelch this message, you can set it to 'refuse'."
-msgstr "По умолчанию, удаление текущей ветки запрещено, так как последующий\n«git clone» не сможет получить никаких файлов, что приведет к путанице.\n\nВы можете установить значение опции «receive.denyDeleteCurrent»\nв «warn» или «ignore», во внешнем репозитории,  чтобы разрешить\nудаление текущей ветки с или без предупреждающего сообщения.\n\nЧтобы пропустить это сообщение, вы можете установить значение опции\nв «refuse»."
+msgstr ""
+"По умолчанию, удаление текущей ветки запрещено, так как последующий\n"
+"«git clone» не сможет получить никаких файлов, что приведет к путанице.\n"
+"\n"
+"Вы можете установить значение опции «receive.denyDeleteCurrent»\n"
+"в «warn» или «ignore», во внешнем репозитории,  чтобы разрешить\n"
+"удаление текущей ветки с или без предупреждающего сообщения.\n"
+"\n"
+"Чтобы пропустить это сообщение, вы можете установить значение опции\n"
+"в «refuse»."
 
-#: builtin/receive-pack.c:2481
 msgid "quiet"
 msgstr "тихий режим"
 
-#: builtin/receive-pack.c:2495
-msgid "You must specify a directory."
-msgstr "Вы должны указать каталог."
+msgid "you must specify a directory"
+msgstr ""
+
+msgid "git reflog [show] [<log-options>] [<ref>]"
+msgstr ""
 
-#: 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>]\n"
+"                  [--rewrite] [--updateref] [--stale-fix]\n"
+"                  [--dry-run | -n] [--verbose] [--all [--single-worktree] | "
+"<refs>...]"
 msgstr ""
 
-#: builtin/reflog.c:22
 msgid ""
-"git reflog delete [--rewrite] [--updateref] [--dry-run | -n] [--verbose] "
-"<refs>..."
+"git reflog delete [--rewrite] [--updateref]\n"
+"                  [--dry-run | -n] [--verbose] <ref>@{<specifier>}..."
 msgstr ""
 
-#: builtin/reflog.c:25
 msgid "git reflog exists <ref>"
 msgstr ""
 
-#: builtin/reflog.c:568 builtin/reflog.c:573
 #, c-format
-msgid "'%s' is not a valid timestamp"
-msgstr "«%s» не является допустимой меткой даты/времени"
+msgid "invalid timestamp '%s' given to '--%s'"
+msgstr ""
 
-#: builtin/reflog.c:606
-#, c-format
-msgid "Marking reachable objects..."
+msgid "do not actually prune any entries"
 msgstr ""
 
-#: builtin/reflog.c:644
-#, c-format
-msgid "%s points nowhere!"
+msgid ""
+"rewrite the old SHA1 with the new SHA1 of the entry that now precedes it"
 msgstr ""
 
-#: builtin/reflog.c:696
-msgid "no reflog specified to delete"
+msgid "update the reference to the value of the top reflog entry"
 msgstr ""
 
-#: builtin/reflog.c:705
-#, c-format
-msgid "not a reflog: %s"
+msgid "print extra information on screen"
+msgstr ""
+
+msgid "timestamp"
+msgstr ""
+
+msgid "prune entries older than the specified time"
+msgstr ""
+
+msgid ""
+"prune entries older than <time> that are not reachable from the current tip "
+"of the branch"
+msgstr ""
+
+msgid "prune any reflog entries that point to broken commits"
+msgstr ""
+
+msgid "process the reflogs of all references"
+msgstr ""
+
+msgid "limits processing to reflogs from the current worktree only"
 msgstr ""
 
-#: builtin/reflog.c:710
 #, c-format
-msgid "no reflog for '%s'"
+msgid "Marking reachable objects..."
 msgstr ""
 
-#: builtin/reflog.c:756
 #, c-format
-msgid "invalid ref format: %s"
+msgid "%s points nowhere!"
 msgstr ""
 
-#: builtin/reflog.c:765
-msgid "git reflog [ show | expire | delete | exists ]"
+msgid "no reflog specified to delete"
 msgstr ""
 
-#: builtin/remote.c:17
-msgid "git remote [-v | --verbose]"
-msgstr "git remote [-v | --verbose]"
+#, c-format
+msgid "invalid ref format: %s"
+msgstr ""
 
-#: builtin/remote.c:18
 msgid ""
-"git remote add [-t <branch>] [-m <master>] [-f] [--tags | --no-tags] "
-"[--mirror=<fetch|push>] <name> <url>"
-msgstr "git remote add [-t <ветка>] [-m <мастер-ветка>] [-f] [--tags | --no-tags] [--mirror=<fetch|push>] <имя> <адрес>"
+"git remote add [-t <branch>] [-m <master>] [-f] [--tags | --no-tags] [--"
+"mirror=<fetch|push>] <name> <url>"
+msgstr ""
+"git remote add [-t <ветка>] [-m <мастер-ветка>] [-f] [--tags | --no-tags] [--"
+"mirror=<fetch|push>] <имя> <адрес>"
 
-#: builtin/remote.c:19 builtin/remote.c:39
-msgid "git remote rename <old> <new>"
-msgstr "git remote rename <старое-название> <новое-название>"
+msgid "git remote rename [--[no-]progress] <old> <new>"
+msgstr ""
 
-#: builtin/remote.c:20 builtin/remote.c:44
 msgid "git remote remove <name>"
 msgstr "git remote remove <имя>"
 
-#: builtin/remote.c:21 builtin/remote.c:49
 msgid "git remote set-head <name> (-a | --auto | -d | --delete | <branch>)"
 msgstr "git remote set-head <имя> (-a | --auto | -d | --delete | <ветка>)"
 
-#: builtin/remote.c:22
 msgid "git remote [-v | --verbose] show [-n] <name>"
 msgstr "git remote [-v | --verbose] show [-n] <имя>"
 
-#: builtin/remote.c:23
 msgid "git remote prune [-n | --dry-run] <name>"
 msgstr "git remote prune [-n | --dry-run] <имя>"
 
-#: builtin/remote.c:24
 msgid ""
 "git remote [-v | --verbose] update [-p | --prune] [(<group> | <remote>)...]"
-msgstr "git remote [-v | --verbose] update [-p | --prune] [(<группа> | <имя-внешнего-репозитория>)…]"
+msgstr ""
+"git remote [-v | --verbose] update [-p | --prune] [(<группа> | <имя-внешнего-"
+"репозитория>)...]"
 
-#: builtin/remote.c:25
 msgid "git remote set-branches [--add] <name> <branch>..."
-msgstr "git remote set-branches [--add] <имя> <ветка>…"
+msgstr "git remote set-branches [--add] <имя> <ветка>..."
 
-#: builtin/remote.c:26 builtin/remote.c:75
 msgid "git remote get-url [--push] [--all] <name>"
 msgstr "git remote get-url [--push] [--all] <имя>"
 
-#: builtin/remote.c:27 builtin/remote.c:80
 msgid "git remote set-url [--push] <name> <newurl> [<oldurl>]"
 msgstr "git remote set-url [--push] <имя> <новый-url> [<старый-url>]"
 
-#: builtin/remote.c:28 builtin/remote.c:81
 msgid "git remote set-url --add <name> <newurl>"
 msgstr "git remote set-url --add <имя> <новый-url>"
 
-#: builtin/remote.c:29 builtin/remote.c:82
 msgid "git remote set-url --delete <name> <url>"
 msgstr "git remote set-url --delete <имя> <url>"
 
-#: builtin/remote.c:34
 msgid "git remote add [<options>] <name> <url>"
 msgstr "git remote add [<опции>] <имя> <url>"
 
-#: builtin/remote.c:54
 msgid "git remote set-branches <name> <branch>..."
-msgstr "git remote set-branches <имя> <ветка>…"
+msgstr "git remote set-branches <имя> <ветка>..."
 
-#: builtin/remote.c:55
 msgid "git remote set-branches --add <name> <branch>..."
-msgstr "git remote set-branches --add <имя> <ветка>…"
+msgstr "git remote set-branches --add <имя> <ветка>..."
 
-#: builtin/remote.c:60
 msgid "git remote show [<options>] <name>"
 msgstr "git remote show [<опции>] <имя>"
 
-#: builtin/remote.c:65
 msgid "git remote prune [<options>] <name>"
 msgstr "git remote prune [<опции>] <имя>"
 
-#: builtin/remote.c:70
 msgid "git remote update [<options>] [<group> | <remote>]..."
-msgstr "git remote update [<опции>] [<группа> | <имя-внешнего-репозитория>]…"
+msgstr "git remote update [<опции>] [<группа> | <имя-внешнего-репозитория>]..."
 
-#: builtin/remote.c:99
 #, c-format
 msgid "Updating %s"
 msgstr "Обновление %s"
 
-#: builtin/remote.c:131
+#, c-format
+msgid "Could not fetch %s"
+msgstr "Не удалось извлечь %s"
+
 msgid ""
 "--mirror is dangerous and deprecated; please\n"
 "\t use --mirror=fetch or --mirror=push instead"
-msgstr "ключ --mirror небезопасен и не рекомендуется к использованию;\nиспользуйте вместо него --mirror=fetch или --mirror=push"
+msgstr ""
+"ключ --mirror небезопасен и не рекомендуется к использованию;\n"
+"используйте вместо него --mirror=fetch или --mirror=push"
 
-#: builtin/remote.c:148
 #, c-format
 msgid "unknown mirror argument: %s"
 msgstr "неизвестный аргумент для mirror: %s"
 
-#: builtin/remote.c:164
 msgid "fetch the remote branches"
 msgstr "извлечь внешние ветки"
 
-#: builtin/remote.c:166
 msgid "import all tags and associated objects when fetching"
 msgstr "импортировать все метки и ассоциированные объекты при извлечении"
 
-#: builtin/remote.c:169
 msgid "or do not fetch any tag at all (--no-tags)"
 msgstr "или не извлекать метки вообще (--no-tags)"
 
-#: builtin/remote.c:171
 msgid "branch(es) to track"
 msgstr "отслеживаемые ветки"
 
-#: builtin/remote.c:172
 msgid "master branch"
 msgstr "мастер ветка"
 
-#: builtin/remote.c:174
 msgid "set up remote as a mirror to push to or fetch from"
-msgstr "настроить внешний репозиторий как зеркало для отправки или извлечения изменений"
+msgstr ""
+"настроить внешний репозиторий как зеркало для отправки или извлечения "
+"изменений"
 
-#: builtin/remote.c:186
 msgid "specifying a master branch makes no sense with --mirror"
 msgstr "указание мастер ветки не имеет смысла с параметром --mirror"
 
-#: builtin/remote.c:188
 msgid "specifying branches to track makes sense only with fetch mirrors"
-msgstr "указание отслеживаемых веток имеет смысл только при зеркальном извлечении"
+msgstr ""
+"указание отслеживаемых веток имеет смысл только при зеркальном извлечении"
 
-#: builtin/remote.c:195 builtin/remote.c:700
 #, c-format
 msgid "remote %s already exists."
 msgstr "внешний репозиторий %s уже существует"
 
-#: builtin/remote.c:240
 #, c-format
 msgid "Could not setup master '%s'"
 msgstr "Не удалось настроить мастер ветку «%s»"
 
-#: builtin/remote.c:355
+#, c-format
+msgid "more than one %s"
+msgstr "больше одного %s"
+
+#, c-format
+msgid "unhandled branch.%s.rebase=%s; assuming 'true'"
+msgstr ""
+
 #, c-format
 msgid "Could not get fetch map for refspec %s"
 msgstr "Не удалось извлечь карту для спецификатора ссылки %s"
 
-#: builtin/remote.c:454 builtin/remote.c:462
 msgid "(matching)"
 msgstr "(соответствующая)"
 
-#: builtin/remote.c:466
 msgid "(delete)"
 msgstr "(удаленная)"
 
-#: builtin/remote.c:655
 #, c-format
 msgid "could not set '%s'"
 msgstr ""
 
-#: builtin/remote.c:660
+#, c-format
+msgid "could not unset '%s'"
+msgstr "не удалось сбросить значение для «%s»"
+
 #, c-format
 msgid ""
 "The %s configuration remote.pushDefault in:\n"
@@ -18711,188 +10144,171 @@ msgid ""
 "now names the non-existent remote '%s'"
 msgstr ""
 
-#: builtin/remote.c:691 builtin/remote.c:836 builtin/remote.c:946
 #, c-format
 msgid "No such remote: '%s'"
 msgstr ""
 
-#: builtin/remote.c:710
 #, c-format
 msgid "Could not rename config section '%s' to '%s'"
 msgstr "Не удалось переименовать секцию конфигурации с «%s» на «%s»"
 
-#: builtin/remote.c:730
 #, c-format
 msgid ""
 "Not updating non-default fetch refspec\n"
 "\t%s\n"
 "\tPlease update the configuration manually if necessary."
-msgstr "Не обновляю нестандартную спецификатор ссылки для извлечения\n\t%s\n\tПожалуйста, если требуется, обновите конфигурацию вручную."
+msgstr ""
+"Не обновляю нестандартную спецификатор ссылки для извлечения\n"
+"\t%s\n"
+"\tПожалуйста, если требуется, обновите конфигурацию вручную."
+
+msgid "Renaming remote references"
+msgstr ""
 
-#: builtin/remote.c:770
 #, c-format
 msgid "deleting '%s' failed"
 msgstr "не удалось удалить «%s»"
 
-#: builtin/remote.c:804
 #, c-format
 msgid "creating '%s' failed"
 msgstr "не удалось создать «%s»"
 
-#: builtin/remote.c:882
 msgid ""
 "Note: A branch outside the refs/remotes/ hierarchy was not removed;\n"
 "to delete it, use:"
 msgid_plural ""
 "Note: Some branches outside the refs/remotes/ hierarchy were not removed;\n"
 "to delete them, use:"
-msgstr[0] "Примечание: Некоторые ветки вне иерархии refs/remotes/ не будут удалены;\nчтобы удалить их, используйте:"
-msgstr[1] "Примечание: Некоторые ветки вне иерархии refs/remotes/ не будут удалены;\nчтобы удалить их, используйте:"
-msgstr[2] "Примечание: Некоторые ветки вне иерархии refs/remotes/ не будут удалены;\nчтобы удалить их, используйте:"
-msgstr[3] "Примечание: Некоторые ветки вне иерархии refs/remotes/ не будут удалены;\nчтобы удалить их, используйте:"
+msgstr[0] ""
+"Примечание: Некоторые ветки вне иерархии refs/remotes/ не будут удалены;\n"
+"чтобы удалить их, используйте:"
+msgstr[1] ""
+"Примечание: Некоторые ветки вне иерархии refs/remotes/ не будут удалены;\n"
+"чтобы удалить их, используйте:"
+msgstr[2] ""
+"Примечание: Некоторые ветки вне иерархии refs/remotes/ не будут удалены;\n"
+"чтобы удалить их, используйте:"
+msgstr[3] ""
+"Примечание: Некоторые ветки вне иерархии refs/remotes/ не будут удалены;\n"
+"чтобы удалить их, используйте:"
 
-#: builtin/remote.c:896
 #, c-format
 msgid "Could not remove config section '%s'"
 msgstr "Не удалось удалить секцию файла конфигурации «%s»"
 
-#: builtin/remote.c:999
 #, c-format
 msgid " new (next fetch will store in remotes/%s)"
 msgstr " новая (следующее извлечение сохранит ее в remotes/%s)"
 
-#: builtin/remote.c:1002
 msgid " tracked"
 msgstr " отслеживается"
 
-#: builtin/remote.c:1004
 msgid " stale (use 'git remote prune' to remove)"
 msgstr " недействительна (используйте «git remote prune», чтобы удалить)"
 
-#: builtin/remote.c:1006
 msgid " ???"
 msgstr " ???"
 
-#: builtin/remote.c:1047
 #, c-format
 msgid "invalid branch.%s.merge; cannot rebase onto > 1 branch"
-msgstr "неправильный параметр конфигурации branch.%s.merge; невозможно переместить более чем над 1 веткой"
+msgstr ""
+"неправильный параметр конфигурации branch.%s.merge; невозможно переместить "
+"более чем над 1 веткой"
 
-#: builtin/remote.c:1056
 #, c-format
 msgid "rebases interactively onto remote %s"
 msgstr "перемещается интерактивно над внешней веткой %s"
 
-#: builtin/remote.c:1058
 #, c-format
 msgid "rebases interactively (with merges) onto remote %s"
 msgstr ""
 
-#: builtin/remote.c:1061
 #, c-format
 msgid "rebases onto remote %s"
 msgstr "перемещается над внешней веткой %s"
 
-#: builtin/remote.c:1065
 #, c-format
 msgid " merges with remote %s"
 msgstr " будет слита с внешней веткой %s"
 
-#: builtin/remote.c:1068
 #, c-format
 msgid "merges with remote %s"
 msgstr "будет слита с внешней веткой %s"
 
-#: builtin/remote.c:1071
 #, c-format
 msgid "%-*s    and with remote %s\n"
 msgstr "%-*s    и с внешней веткой %s\n"
 
-#: builtin/remote.c:1114
 msgid "create"
 msgstr "создана"
 
-#: builtin/remote.c:1117
 msgid "delete"
 msgstr "удалена"
 
-#: builtin/remote.c:1121
 msgid "up to date"
 msgstr "уже актуальна"
 
-#: builtin/remote.c:1124
 msgid "fast-forwardable"
-msgstr "возможна перемотка вперед"
+msgstr "возможна быстрая перемотка"
 
-#: builtin/remote.c:1127
 msgid "local out of date"
 msgstr "локальная ветка устарела"
 
-#: builtin/remote.c:1134
 #, c-format
 msgid "    %-*s forces to %-*s (%s)"
 msgstr "    %-*s будет принудительно отправлена в %-*s (%s)"
 
-#: builtin/remote.c:1137
 #, c-format
 msgid "    %-*s pushes to %-*s (%s)"
 msgstr "    %-*s будет отправлена в %-*s (%s)"
 
-#: builtin/remote.c:1141
 #, c-format
 msgid "    %-*s forces to %s"
 msgstr "    %-*s будет принудительно отправлена в %s"
 
-#: builtin/remote.c:1144
 #, c-format
 msgid "    %-*s pushes to %s"
 msgstr "    %-*s будет отправлена в %s"
 
-#: builtin/remote.c:1212
 msgid "do not query remotes"
 msgstr "не опрашивать внешние репозитории"
 
-#: builtin/remote.c:1239
 #, c-format
 msgid "* remote %s"
 msgstr "* внешний репозиторий %s"
 
-#: builtin/remote.c:1240
 #, c-format
 msgid "  Fetch URL: %s"
 msgstr "  URL для извлечения: %s"
 
-#: builtin/remote.c:1241 builtin/remote.c:1257 builtin/remote.c:1396
 msgid "(no URL)"
 msgstr "(нет URL)"
 
 #. TRANSLATORS: the colon ':' should align
 #. with the one in " Fetch URL: %s"
 #. translation.
-#: builtin/remote.c:1255 builtin/remote.c:1257
+#.
 #, c-format
 msgid "  Push  URL: %s"
 msgstr "    URL для отправки: %s"
 
-#: builtin/remote.c:1259 builtin/remote.c:1261 builtin/remote.c:1263
 #, c-format
 msgid "  HEAD branch: %s"
 msgstr "  HEAD ветка: %s"
 
-#: builtin/remote.c:1259
 msgid "(not queried)"
 msgstr "(не запрашивался)"
 
-#: builtin/remote.c:1261
 msgid "(unknown)"
 msgstr "(неизвестно)"
 
-#: builtin/remote.c:1265
 #, c-format
-msgid "  HEAD branch (remote HEAD is ambiguous, may be one of the following):\n"
-msgstr "  HEAD ветка (HEAD внешнего репозитория неоднозначный, может быть одним из):\n"
+msgid ""
+"  HEAD branch (remote HEAD is ambiguous, may be one of the following):\n"
+msgstr ""
+"  HEAD ветка (HEAD внешнего репозитория неоднозначный, может быть одним "
+"из):\n"
 
-#: builtin/remote.c:1277
 #, c-format
 msgid "  Remote branch:%s"
 msgid_plural "  Remote branches:%s"
@@ -18901,11 +10317,9 @@ msgstr[1] "  Внешние ветки:%s"
 msgstr[2] "  Внешние ветки:%s"
 msgstr[3] "  Внешние ветки:%s"
 
-#: builtin/remote.c:1280 builtin/remote.c:1306
 msgid " (status not queried)"
 msgstr " (статус не запрашивался)"
 
-#: builtin/remote.c:1289
 msgid "  Local branch configured for 'git pull':"
 msgid_plural "  Local branches configured for 'git pull':"
 msgstr[0] "  Локальная ветка, настроенная для «git pull»:"
@@ -18913,11 +10327,9 @@ msgstr[1] "  Локальные ветки, настроенные для «git
 msgstr[2] "  Локальные ветки, настроенные для «git pull»:"
 msgstr[3] "  Локальные ветки, настроенные для «git pull»:"
 
-#: builtin/remote.c:1297
 msgid "  Local refs will be mirrored by 'git push'"
 msgstr " Локальные ссылки, зеркалируемые с помощью «git push»"
 
-#: builtin/remote.c:1303
 #, c-format
 msgid "  Local ref configured for 'git push'%s:"
 msgid_plural "  Local refs configured for 'git push'%s:"
@@ -18926,303 +10338,267 @@ msgstr[1] "  Локальные ссылки, настроенные для «gi
 msgstr[2] "  Локальные ссылки, настроенные для «git push»%s:"
 msgstr[3] "  Локальные ссылки, настроенные для «git push»%s:"
 
-#: builtin/remote.c:1324
 msgid "set refs/remotes/<name>/HEAD according to remote"
-msgstr "установить refs/remotes/<имя>/HEAD в зависимости от внешнего репозитория"
+msgstr ""
+"установить refs/remotes/<имя>/HEAD в зависимости от внешнего репозитория"
 
-#: builtin/remote.c:1326
 msgid "delete refs/remotes/<name>/HEAD"
 msgstr "удалить refs/remotes/<имя>/HEAD"
 
-#: builtin/remote.c:1341
 msgid "Cannot determine remote HEAD"
 msgstr "Не удалось определить внешний HEAD"
 
-#: builtin/remote.c:1343
 msgid "Multiple remote HEAD branches. Please choose one explicitly with:"
 msgstr "Несколько внешних HEAD веток. Укажите явно одну из них:"
 
-#: builtin/remote.c:1353
 #, c-format
 msgid "Could not delete %s"
 msgstr "Не удалось удалить %s"
 
-#: builtin/remote.c:1361
 #, c-format
 msgid "Not a valid ref: %s"
 msgstr "Недопустимая ссылка: %s"
 
-#: builtin/remote.c:1363
 #, c-format
 msgid "Could not setup %s"
 msgstr "Не удалось настроить %s"
 
-#: builtin/remote.c:1381
 #, c-format
 msgid " %s will become dangling!"
 msgstr " %s будет висящей веткой!"
 
-#: builtin/remote.c:1382
 #, c-format
 msgid " %s has become dangling!"
 msgstr " %s стала висящей веткой!"
 
-#: builtin/remote.c:1392
 #, c-format
 msgid "Pruning %s"
 msgstr "Очистка %s"
 
-#: builtin/remote.c:1393
 #, c-format
 msgid "URL: %s"
 msgstr "URL: %s"
 
-#: builtin/remote.c:1409
 #, c-format
 msgid " * [would prune] %s"
 msgstr " * [будет удалена] %s"
 
-#: builtin/remote.c:1412
 #, c-format
 msgid " * [pruned] %s"
 msgstr " * [удалена] %s"
 
-#: builtin/remote.c:1457
 msgid "prune remotes after fetching"
 msgstr "почистить внешние репозитории после извлечения"
 
-#: builtin/remote.c:1521 builtin/remote.c:1577 builtin/remote.c:1647
 #, c-format
 msgid "No such remote '%s'"
 msgstr "Нет такого внешнего репозитория «%s»"
 
-#: builtin/remote.c:1539
 msgid "add branch"
 msgstr "добавить ветку"
 
-#: builtin/remote.c:1546
 msgid "no remote specified"
 msgstr "не указан внешний репозиторий"
 
-#: builtin/remote.c:1563
 msgid "query push URLs rather than fetch URLs"
 msgstr "запросить URL отправки, вместо URL извлечения"
 
-#: builtin/remote.c:1565
 msgid "return all URLs"
 msgstr "вернуть все URL"
 
-#: builtin/remote.c:1595
 #, c-format
 msgid "no URLs configured for remote '%s'"
 msgstr "URL не настроены для внешнего репозитория «%s»"
 
-#: builtin/remote.c:1621
 msgid "manipulate push URLs"
 msgstr "управление URL отправки"
 
-#: builtin/remote.c:1623
 msgid "add URL"
 msgstr "добавить URL"
 
-#: builtin/remote.c:1625
 msgid "delete URLs"
 msgstr "удалить URL"
 
-#: builtin/remote.c:1632
 msgid "--add --delete doesn't make sense"
 msgstr "--add нельзя использовать одновременно с --delete"
 
-#: builtin/remote.c:1673
 #, c-format
 msgid "Invalid old URL pattern: %s"
 msgstr "Неправильный шаблон старого URL: %s"
 
-#: builtin/remote.c:1681
 #, c-format
 msgid "No such URL found: %s"
 msgstr "Не найдены совпадения URL: %s"
 
-#: builtin/remote.c:1683
 msgid "Will not delete all non-push URLs"
 msgstr "Нельзя удалить все URL не-отправки"
 
-#: builtin/repack.c:25
+msgid "be verbose; must be placed before a subcommand"
+msgstr "быть многословнее; должно стоять перед подкомандой"
+
 msgid "git repack [<options>]"
 msgstr "git repack [<опции>]"
 
-#: builtin/repack.c:30
 msgid ""
 "Incremental repacks are incompatible with bitmap indexes.  Use\n"
-"--no-write-bitmap-index or disable the pack.writebitmaps configuration."
-msgstr "Инкрементальные перепаковки не совместимы с индексами в битовых картах.  Используйте опцию --no-write-bitmap-index или отключите параметр конфигурации pack.writebitmaps."
+"--no-write-bitmap-index or disable the pack.writeBitmaps configuration."
+msgstr ""
 
-#: builtin/repack.c:197
 msgid "could not start pack-objects to repack promisor objects"
 msgstr ""
 
-#: builtin/repack.c:268 builtin/repack.c:447
 msgid "repack: Expecting full hex object ID lines only from pack-objects."
 msgstr ""
 
-#: builtin/repack.c:295
 msgid "could not finish pack-objects to repack promisor objects"
 msgstr ""
 
-#: builtin/repack.c:323
+#, c-format
+msgid "cannot open index for %s"
+msgstr ""
+
+#, c-format
+msgid "pack %s too large to consider in geometric progression"
+msgstr ""
+
+#, c-format
+msgid "pack %s too large to roll up"
+msgstr ""
+
+#, c-format
+msgid "could not open tempfile %s for writing"
+msgstr ""
+
+msgid "could not close refs snapshot tempfile"
+msgstr ""
+
 msgid "pack everything in a single pack"
 msgstr "упаковать всё в один пакет"
 
-#: builtin/repack.c:325
 msgid "same as -a, and turn unreachable objects loose"
 msgstr "тоже, что и -a, но дополнительно отбросить недостижимые объекты"
 
-#: builtin/repack.c:328
+msgid "same as -a, pack unreachable cruft objects separately"
+msgstr ""
+
+msgid "approxidate"
+msgstr "примерная-дата"
+
+msgid "with -C, expire objects older than this"
+msgstr ""
+
 msgid "remove redundant packs, and run git-prune-packed"
 msgstr "удалите лишние пакеты и запустите git-prune-packed"
 
-#: builtin/repack.c:330
 msgid "pass --no-reuse-delta to git-pack-objects"
 msgstr "передать опцию --no-reuse-delta в git-pack-objects"
 
-#: builtin/repack.c:332
 msgid "pass --no-reuse-object to git-pack-objects"
 msgstr "передать опцию --no-reuse-object в git-pack-objects"
 
-#: builtin/repack.c:334
 msgid "do not run git-update-server-info"
 msgstr "не запускать git-update-server-info"
 
-#: builtin/repack.c:337
 msgid "pass --local to git-pack-objects"
 msgstr "передать опцию --local в git-pack-objects"
 
-#: builtin/repack.c:339
 msgid "write bitmap index"
 msgstr "запись индекса в битовых картах"
 
-#: builtin/repack.c:341
 msgid "pass --delta-islands to git-pack-objects"
 msgstr ""
 
-#: builtin/repack.c:342
-msgid "approxidate"
-msgstr "примерная-дата"
-
-#: builtin/repack.c:343
 msgid "with -A, do not loosen objects older than this"
 msgstr "с опцией -A, не отбрасывать объекты старее, чем указано"
 
-#: builtin/repack.c:345
 msgid "with -a, repack unreachable objects"
 msgstr "с параметром -a, перепаковать недоступные объекты"
 
-#: builtin/repack.c:347
 msgid "size of the window used for delta compression"
 msgstr "размер окна, используемый для компрессии дельт"
 
-#: builtin/repack.c:348 builtin/repack.c:354
 msgid "bytes"
 msgstr "количество-байт"
 
-#: builtin/repack.c:349
 msgid "same as the above, but limit memory size instead of entries count"
 msgstr "тоже, что и выше, но ограничить размер памяти, а не количество записей"
 
-#: builtin/repack.c:351
 msgid "limits the maximum delta depth"
 msgstr "ограничение на максимальную глубину дельт"
 
-#: builtin/repack.c:353
 msgid "limits the maximum number of threads"
 msgstr "ограничение на максимальное количество потоков"
 
-#: builtin/repack.c:355
 msgid "maximum size of each packfile"
 msgstr "максимальный размер каждого из файлов пакета"
 
-#: builtin/repack.c:357
 msgid "repack objects in packs marked with .keep"
 msgstr "переупаковать объекты в пакеты, помеченные файлом .keep"
 
-#: builtin/repack.c:359
 msgid "do not repack this pack"
 msgstr ""
 
-#: builtin/repack.c:369
+msgid "find a geometric progression with factor <N>"
+msgstr ""
+
+msgid "write a multi-pack index of the resulting packs"
+msgstr ""
+
 msgid "cannot delete packs in a precious-objects repo"
 msgstr "нельзя удалять пакеты в precious-objects репозитории"
 
-#: builtin/repack.c:373
-msgid "--keep-unreachable and -A are incompatible"
-msgstr "--keep-unreachable и -A нельзя использовать одновременно"
-
-#: builtin/repack.c:456
 msgid "Nothing new to pack."
 msgstr ""
 
-#: builtin/repack.c:486
+#, c-format
+msgid "pack prefix %s does not begin with objdir %s"
+msgstr ""
+
 #, c-format
 msgid "missing required file: %s"
 msgstr ""
 
-#: builtin/repack.c:488
 #, c-format
 msgid "could not unlink: %s"
 msgstr ""
 
-#: builtin/replace.c:22
 msgid "git replace [-f] <object> <replacement>"
 msgstr "git replace [-f] <объект> <замена>"
 
-#: builtin/replace.c:23
 msgid "git replace [-f] --edit <object>"
 msgstr "git replace [-f] --edit <объект>"
 
-#: builtin/replace.c:24
 msgid "git replace [-f] --graft <commit> [<parent>...]"
-msgstr "git replace [-f] --graft <коммит> [<родитель>…]"
-
-#: builtin/replace.c:25
-msgid "git replace [-f] --convert-graft-file"
-msgstr ""
+msgstr "git replace [-f] --graft <коммит> [<родитель>...]"
 
-#: builtin/replace.c:26
 msgid "git replace -d <object>..."
-msgstr "git replace -d <объект>…"
+msgstr "git replace -d <объект>..."
 
-#: builtin/replace.c:27
 msgid "git replace [--format=<format>] [-l [<pattern>]]"
 msgstr "git replace [--format=<формат>] [-l [<шаблон>]]"
 
-#: builtin/replace.c:90
 #, c-format
 msgid ""
 "invalid replace format '%s'\n"
 "valid formats are 'short', 'medium' and 'long'"
 msgstr ""
 
-#: builtin/replace.c:125
 #, c-format
 msgid "replace ref '%s' not found"
 msgstr ""
 
-#: builtin/replace.c:141
 #, c-format
 msgid "Deleted replace ref '%s'"
 msgstr ""
 
-#: builtin/replace.c:153
 #, c-format
 msgid "'%s' is not a valid ref name"
 msgstr ""
 
-#: builtin/replace.c:158
 #, c-format
 msgid "replace ref '%s' already exists"
 msgstr ""
 
-#: builtin/replace.c:178
 #, c-format
 msgid ""
 "Objects must be of the same type.\n"
@@ -19230,493 +10606,446 @@ msgid ""
 "while '%s' points to a replacement object of type '%s'."
 msgstr ""
 
-#: builtin/replace.c:229
 #, c-format
 msgid "unable to open %s for writing"
 msgstr ""
 
-#: builtin/replace.c:242
 msgid "cat-file reported failure"
 msgstr ""
 
-#: builtin/replace.c:258
 #, c-format
 msgid "unable to open %s for reading"
 msgstr ""
 
-#: builtin/replace.c:272
 msgid "unable to spawn mktree"
 msgstr ""
 
-#: builtin/replace.c:276
 msgid "unable to read from mktree"
 msgstr ""
 
-#: builtin/replace.c:285
 msgid "mktree reported failure"
 msgstr ""
 
-#: builtin/replace.c:289
 msgid "mktree did not return an object name"
 msgstr ""
 
-#: builtin/replace.c:298
 #, c-format
 msgid "unable to fstat %s"
 msgstr ""
 
-#: builtin/replace.c:303
 msgid "unable to write object to database"
 msgstr ""
 
-#: builtin/replace.c:322 builtin/replace.c:378 builtin/replace.c:424
-#: builtin/replace.c:454
-#, c-format
-msgid "not a valid object name: '%s'"
-msgstr ""
-
-#: builtin/replace.c:326
 #, c-format
 msgid "unable to get object type for %s"
 msgstr ""
 
-#: builtin/replace.c:342
 msgid "editing object file failed"
 msgstr ""
 
-#: builtin/replace.c:351
 #, c-format
 msgid "new object is the same as the old one: '%s'"
 msgstr ""
 
-#: builtin/replace.c:384
 #, c-format
 msgid "could not parse %s as a commit"
 msgstr ""
 
-#: builtin/replace.c:416
 #, c-format
 msgid "bad mergetag in commit '%s'"
 msgstr "плохая метка слияния в коммите «%s»"
 
-#: builtin/replace.c:418
 #, c-format
 msgid "malformed mergetag in commit '%s'"
 msgstr "повреждённая метка слияния в коммите «%s»"
 
-#: builtin/replace.c:430
 #, c-format
 msgid ""
 "original commit '%s' contains mergetag '%s' that is discarded; use --edit "
 "instead of --graft"
-msgstr "оригинальный коммит «%s» содержит метку слияния «%s», которая была отброшена; используйте --edit вместо --graft"
+msgstr ""
+"оригинальный коммит «%s» содержит метку слияния «%s», которая была "
+"отброшена; используйте --edit вместо --graft"
 
-#: builtin/replace.c:469
 #, c-format
 msgid "the original commit '%s' has a gpg signature"
 msgstr ""
 
-#: builtin/replace.c:470
 msgid "the signature will be removed in the replacement commit!"
 msgstr "подпись будет удалена в замененном коммите!"
 
-#: builtin/replace.c:480
 #, c-format
 msgid "could not write replacement commit for: '%s'"
 msgstr "не удалось записать замену для коммита: «%s»"
 
-#: builtin/replace.c:488
 #, c-format
 msgid "graft for '%s' unnecessary"
 msgstr ""
 
-#: builtin/replace.c:492
 #, c-format
 msgid "new commit is the same as the old one: '%s'"
 msgstr ""
 
-#: builtin/replace.c:527
 #, c-format
 msgid ""
 "could not convert the following graft(s):\n"
 "%s"
 msgstr ""
 
-#: builtin/replace.c:548
 msgid "list replace refs"
 msgstr "вывести список заменяемых ссылок"
 
-#: builtin/replace.c:549
 msgid "delete replace refs"
 msgstr "удаление заменяемых ссылок"
 
-#: builtin/replace.c:550
 msgid "edit existing object"
 msgstr "изменение существующего объекта"
 
-#: builtin/replace.c:551
 msgid "change a commit's parents"
 msgstr "изменение родителя коммита"
 
-#: builtin/replace.c:552
 msgid "convert existing graft file"
 msgstr ""
 
-#: builtin/replace.c:553
 msgid "replace the ref if it exists"
 msgstr "замена ссылки, если она существует"
 
-#: builtin/replace.c:555
 msgid "do not pretty-print contents for --edit"
 msgstr "не делать структурированный вывод содержимого для --edit"
 
-#: builtin/replace.c:556
 msgid "use this format"
 msgstr "использовать этот формат"
 
-#: builtin/replace.c:569
 msgid "--format cannot be used when not listing"
 msgstr ""
 
-#: builtin/replace.c:577
 msgid "-f only makes sense when writing a replacement"
 msgstr ""
 
-#: builtin/replace.c:581
 msgid "--raw only makes sense with --edit"
 msgstr ""
 
-#: builtin/replace.c:587
 msgid "-d needs at least one argument"
 msgstr ""
 
-#: builtin/replace.c:593
 msgid "bad number of arguments"
 msgstr ""
 
-#: builtin/replace.c:599
 msgid "-e needs exactly one argument"
 msgstr ""
 
-#: builtin/replace.c:605
 msgid "-g needs at least one argument"
 msgstr ""
 
-#: builtin/replace.c:611
 msgid "--convert-graft-file takes no argument"
 msgstr ""
 
-#: builtin/replace.c:617
 msgid "only one pattern can be given with -l"
 msgstr ""
 
-#: builtin/rerere.c:13
 msgid "git rerere [clear | forget <path>... | status | remaining | diff | gc]"
-msgstr "git rerere [clear | forget <путь>… | status | remaining | diff | gc]"
+msgstr "git rerere [clear | forget <путь>... | status | remaining | diff | gc]"
 
-#: builtin/rerere.c:60
 msgid "register clean resolutions in index"
 msgstr "записать чистые разрешения конфликтов в индекс"
 
-#: builtin/rerere.c:79
 msgid "'git rerere forget' without paths is deprecated"
 msgstr ""
 
-#: builtin/rerere.c:113
 #, c-format
 msgid "unable to generate diff for '%s'"
 msgstr ""
 
-#: builtin/reset.c:32
 msgid ""
 "git reset [--mixed | --soft | --hard | --merge | --keep] [-q] [<commit>]"
-msgstr "git reset [--mixed | --soft | --hard | --merge | --keep] [-q] [<коммит>]"
+msgstr ""
+"git reset [--mixed | --soft | --hard | --merge | --keep] [-q] [<коммит>]"
 
-#: builtin/reset.c:33
 msgid "git reset [-q] [<tree-ish>] [--] <pathspec>..."
 msgstr ""
 
-#: builtin/reset.c:34
 msgid ""
 "git reset [-q] [--pathspec-from-file [--pathspec-file-nul]] [<tree-ish>]"
 msgstr ""
 
-#: builtin/reset.c:35
 msgid "git reset --patch [<tree-ish>] [--] [<pathspec>...]"
 msgstr ""
 
-#: builtin/reset.c:41
 msgid "mixed"
 msgstr "смешанный"
 
-#: builtin/reset.c:41
 msgid "soft"
 msgstr "мягкий"
 
-#: builtin/reset.c:41
 msgid "hard"
 msgstr "жесткий"
 
-#: builtin/reset.c:41
 msgid "merge"
 msgstr "слиянием"
 
-#: builtin/reset.c:41
 msgid "keep"
 msgstr "оставлением"
 
-#: builtin/reset.c:83
 msgid "You do not have a valid HEAD."
 msgstr "У вас нет верного HEAD."
 
-#: builtin/reset.c:85
 msgid "Failed to find tree of HEAD."
 msgstr "Не удалось найти дерево у HEAD."
 
-#: builtin/reset.c:91
 #, c-format
 msgid "Failed to find tree of %s."
 msgstr "Не удалось найти дерево у %s."
 
-#: builtin/reset.c:116
 #, c-format
 msgid "HEAD is now at %s"
-msgstr "HEAD сейчас на %s"
+msgstr "Указатель HEAD сейчас на коммите %s"
 
-#: builtin/reset.c:195
 #, c-format
 msgid "Cannot do a %s reset in the middle of a merge."
 msgstr "Нельзя выполнить сброс в режиме «%s» во время слияния."
 
-#: builtin/reset.c:295 builtin/stash.c:520 builtin/stash.c:594
-#: builtin/stash.c:618
 msgid "be quiet, only report errors"
 msgstr "тихий режим, выводить только ошибки"
 
-#: builtin/reset.c:297
+msgid "skip refreshing the index after reset"
+msgstr ""
+
 msgid "reset HEAD and index"
 msgstr "сбросить HEAD и индекс"
 
-#: builtin/reset.c:298
 msgid "reset only HEAD"
 msgstr "сбросить только HEAD"
 
-#: builtin/reset.c:300 builtin/reset.c:302
 msgid "reset HEAD, index and working tree"
 msgstr "сбросить HEAD, индекс и рабочий каталог"
 
-#: builtin/reset.c:304
 msgid "reset HEAD but keep local changes"
 msgstr "сбросить HEAD, но оставить локальные изменения"
 
-#: builtin/reset.c:310
 msgid "record only the fact that removed paths will be added later"
 msgstr "записать только факт того, что удаленные пути будут добавлены позже"
 
-#: builtin/reset.c:344
 #, c-format
 msgid "Failed to resolve '%s' as a valid revision."
 msgstr "Не удалось распознать «%s» как действительную редакцию."
 
-#: builtin/reset.c:352
 #, c-format
 msgid "Failed to resolve '%s' as a valid tree."
 msgstr "Не удалось распознать «%s» как действительное дерево."
 
-#: builtin/reset.c:361
-msgid "--patch is incompatible with --{hard,mixed,soft}"
-msgstr "--patch нельзя использовать одновременно с --{hard,mixed,soft}"
-
-#: builtin/reset.c:371
 msgid "--mixed with paths is deprecated; use 'git reset -- <paths>' instead."
-msgstr "использование опции --mixed с путями устарело; используйте «git reset -- <пути>» instead."
+msgstr ""
+"использование опции --mixed с путями устарело; используйте «git reset -- "
+"<пути>» instead."
 
-#: builtin/reset.c:373
 #, c-format
 msgid "Cannot do %s reset with paths."
 msgstr "Нельзя выполнить сброс в режиме «%s» вместе с указанием пути."
 
-#: builtin/reset.c:388
 #, c-format
 msgid "%s reset is not allowed in a bare repository"
 msgstr "сброс «%s» разрешен только с голым репозиторием"
 
-#: builtin/reset.c:392
-msgid "-N can only be used with --mixed"
-msgstr "-N можно использовать вместе с --mixed"
-
-#: builtin/reset.c:413
 msgid "Unstaged changes after reset:"
 msgstr "Непроиндексированные изменения после сброса:"
 
-#: builtin/reset.c:416
 #, c-format
 msgid ""
-"\n"
-"It 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"
+"It took %.2f seconds to refresh the index after reset.  You can use\n"
+"'--no-refresh' to avoid this."
 msgstr ""
 
-#: builtin/reset.c:434
 #, c-format
 msgid "Could not reset index file to revision '%s'."
 msgstr "Не удалось сбросить файл индекса на редакцию «%s»."
 
-#: builtin/reset.c:439
 msgid "Could not write new index file."
 msgstr "Не удалось записать новый файл индекса."
 
-#: builtin/rev-list.c:499
-msgid "cannot combine --exclude-promisor-objects and --missing"
+#, c-format
+msgid "unable to get disk usage of %s"
 msgstr ""
 
-#: builtin/rev-list.c:560
-msgid "object filtering requires --objects"
-msgstr "фильтрация объектов требует указания параметра --objects"
-
-#: builtin/rev-list.c:610
 msgid "rev-list does not support display of notes"
 msgstr "rev-list не поддерживает отображение заметок"
 
-#: builtin/rev-list.c:615
-msgid "marked counting is incompatible with --objects"
+#, c-format
+msgid "marked counting and '%s' cannot be used together"
 msgstr ""
 
-#: builtin/rev-parse.c:409
 msgid "git rev-parse --parseopt [<options>] -- [<args>...]"
-msgstr "git rev-parse --parseopt [<опции>] -- [<аргументы>…]"
+msgstr "git rev-parse --parseopt [<опции>] -- [<аргументы>...]"
 
-#: builtin/rev-parse.c:414
 msgid "keep the `--` passed as an arg"
 msgstr "передавать далее «--» как аргумент"
 
-#: builtin/rev-parse.c:416
 msgid "stop parsing after the first non-option argument"
 msgstr "остановить разбор после первого аргумента не являющегося опцией"
 
-#: builtin/rev-parse.c:419
 msgid "output in stuck long form"
 msgstr "выводить аргументы в длинном формате"
 
-#: builtin/rev-parse.c:552
+msgid "premature end of input"
+msgstr ""
+
+msgid "no usage string given before the `--' separator"
+msgstr ""
+
+msgid "Needed a single revision"
+msgstr ""
+
 msgid ""
 "git rev-parse --parseopt [<options>] -- [<args>...]\n"
 "   or: git rev-parse --sq-quote [<arg>...]\n"
 "   or: git rev-parse [<options>] [<arg>...]\n"
 "\n"
 "Run \"git rev-parse --parseopt -h\" for more information on the first usage."
-msgstr "git rev-parse --parseopt [<опции>] -- [<аргументы>…]\n   or: git rev-parse --sq-quote [<аргумент>…]\n   or: git rev-parse [<опции>] [<аргумент>…]\n\nЗапустите команду «git rev-parse --parseopt -h» для получения подробной информации о первом использовании."
+msgstr ""
+"git rev-parse --parseopt [<опции>] -- [<аргументы>...]\n"
+"   or: git rev-parse --sq-quote [<аргумент>...]\n"
+"   or: git rev-parse [<опции>] [<аргумент>...]\n"
+"\n"
+"Запустите команду «git rev-parse --parseopt -h» для получения подробной "
+"информации о первом использовании."
+
+msgid "--resolve-git-dir requires an argument"
+msgstr ""
+
+#, c-format
+msgid "not a gitdir '%s'"
+msgstr ""
+
+msgid "--git-path requires an argument"
+msgstr ""
+
+msgid "-n requires an argument"
+msgstr ""
+
+msgid "--path-format requires an argument"
+msgstr ""
+
+#, c-format
+msgid "unknown argument to --path-format: %s"
+msgstr ""
+
+msgid "--default requires an argument"
+msgstr ""
+
+msgid "--prefix requires an argument"
+msgstr ""
+
+#, c-format
+msgid "unknown mode for --abbrev-ref: %s"
+msgstr ""
+
+msgid "this operation must be run in a work tree"
+msgstr ""
+
+#, c-format
+msgid "unknown mode for --show-object-format: %s"
+msgstr ""
 
-#: builtin/revert.c:24
 msgid "git revert [<options>] <commit-ish>..."
-msgstr "git revert [<опции>] <указатель-коммита>…"
+msgstr "git revert [<опции>] <указатель-коммита>..."
 
-#: builtin/revert.c:25
 msgid "git revert <subcommand>"
 msgstr "git revert <подкоманда>"
 
-#: builtin/revert.c:30
 msgid "git cherry-pick [<options>] <commit-ish>..."
-msgstr "git cherry-pick [<опции>] <указатель-коммита>…"
+msgstr "git cherry-pick [<опции>] <указатель-коммита>..."
 
-#: builtin/revert.c:31
 msgid "git cherry-pick <subcommand>"
 msgstr "git cherry-pick <подкоманда>"
 
-#: builtin/revert.c:72
 #, c-format
 msgid "option `%s' expects a number greater than zero"
 msgstr ""
 
-#: builtin/revert.c:92
 #, c-format
 msgid "%s: %s cannot be used with %s"
 msgstr "%s: %s нельзя использовать одновременно с %s"
 
-#: builtin/revert.c:102
 msgid "end revert or cherry-pick sequence"
 msgstr "конец последовательности копирования или обращения изменений коммитов"
 
-#: builtin/revert.c:103
 msgid "resume revert or cherry-pick sequence"
-msgstr "продолжить последовательность копирования или обращения изменений коммитов"
+msgstr ""
+"продолжить последовательность копирования или обращения изменений коммитов"
 
-#: builtin/revert.c:104
 msgid "cancel revert or cherry-pick sequence"
 msgstr "отмена последовательности копирования или обращения изменений коммитов"
 
-#: builtin/revert.c:105
 msgid "skip current commit and continue"
 msgstr ""
 
-#: builtin/revert.c:107
 msgid "don't automatically commit"
 msgstr "не коммитить автоматически"
 
-#: builtin/revert.c:108
 msgid "edit the commit message"
 msgstr "изменить сообщение коммита"
 
-#: builtin/revert.c:111
 msgid "parent-number"
 msgstr "номер-родителя"
 
-#: builtin/revert.c:112
 msgid "select mainline parent"
 msgstr "выбор основного родителя"
 
-#: builtin/revert.c:114
 msgid "merge strategy"
 msgstr "стратегия слияния"
 
-#: builtin/revert.c:116
 msgid "option for merge strategy"
 msgstr "опция для стратегии слияния"
 
-#: builtin/revert.c:125
 msgid "append commit name"
 msgstr "добавить имя коммита"
 
-#: builtin/revert.c:127
 msgid "preserve initially empty commits"
 msgstr "сохранить изначально пустые коммиты"
 
-#: builtin/revert.c:129
+msgid "allow commits with empty messages"
+msgstr "разрешить коммиты с пустыми сообщениями"
+
 msgid "keep redundant, empty commits"
 msgstr "оставить избыточные, пустые коммиты"
 
-#: builtin/revert.c:239
+msgid "use the 'reference' format to refer to commits"
+msgstr ""
+
 msgid "revert failed"
 msgstr "сбой обращения изменений коммита"
 
-#: builtin/revert.c:252
 msgid "cherry-pick failed"
 msgstr "сбой при копировании коммита"
 
-#: builtin/rm.c:19
 msgid "git rm [<options>] [--] <file>..."
-msgstr "git rm [<опции>] [--] <файл>…"
+msgstr "git rm [<опции>] [--] <файл>..."
 
-#: builtin/rm.c:207
 msgid ""
 "the following file has staged content different from both the\n"
 "file and the HEAD:"
 msgid_plural ""
 "the following files have staged content different from both the\n"
 "file and the HEAD:"
-msgstr[0] "следующие файлы содержат проиндексированные изменения отличающиеся и от файла, и от HEAD:"
-msgstr[1] "следующие файлы содержат проиндексированные изменения отличающиеся и от файла, и от HEAD:"
-msgstr[2] "следующие файлы содержат проиндексированные изменения отличающиеся и от файла, и от HEAD:"
-msgstr[3] "следующие файлы содержат проиндексированные изменения отличающиеся и от файла, и от HEAD:"
+msgstr[0] ""
+"следующие файлы содержат проиндексированные изменения отличающиеся и от "
+"файла, и от HEAD:"
+msgstr[1] ""
+"следующие файлы содержат проиндексированные изменения отличающиеся и от "
+"файла, и от HEAD:"
+msgstr[2] ""
+"следующие файлы содержат проиндексированные изменения отличающиеся и от "
+"файла, и от HEAD:"
+msgstr[3] ""
+"следующие файлы содержат проиндексированные изменения отличающиеся и от "
+"файла, и от HEAD:"
 
-#: builtin/rm.c:212
 msgid ""
 "\n"
 "(use -f to force removal)"
-msgstr "\n(используйте опцию «-f» для принудительного удаления)"
+msgstr ""
+"\n"
+"(используйте опцию «-f» для принудительного удаления)"
 
-#: builtin/rm.c:216
 msgid "the following file has changes staged in the index:"
 msgid_plural "the following files have changes staged in the index:"
 msgstr[0] "следующие файлы содержат проиндексированные изменения в индексе:"
@@ -19724,13 +11053,14 @@ msgstr[1] "следующие файлы содержат проиндексир
 msgstr[2] "следующие файлы содержат проиндексированные изменения в индексе:"
 msgstr[3] "следующие файлы содержат проиндексированные изменения в индексе:"
 
-#: builtin/rm.c:220 builtin/rm.c:229
 msgid ""
 "\n"
 "(use --cached to keep the file, or -f to force removal)"
-msgstr "\n(используйте опцию «--cached» для оставления файла, или «-f» для принудительного удаления)"
+msgstr ""
+"\n"
+"(используйте опцию «--cached» для оставления файла, или «-f» для "
+"принудительного удаления)"
 
-#: builtin/rm.c:226
 msgid "the following file has local modifications:"
 msgid_plural "the following files have local modifications:"
 msgstr[0] "следующие файлы содержат локальные изменения:"
@@ -19738,136 +11068,107 @@ msgstr[1] "следующие файлы содержат локальные и�
 msgstr[2] "следующие файлы содержат локальные изменения:"
 msgstr[3] "следующие файлы содержат локальные изменения:"
 
-#: builtin/rm.c:243
 msgid "do not list removed files"
 msgstr "не выводить список удаленных файлов"
 
-#: builtin/rm.c:244
 msgid "only remove from the index"
 msgstr "удалить только из индекса"
 
-#: builtin/rm.c:245
 msgid "override the up-to-date check"
 msgstr "пропустить проверку актуальности"
 
-#: builtin/rm.c:246
 msgid "allow recursive removal"
 msgstr "разрешить рекурсивное удаление"
 
-#: builtin/rm.c:248
 msgid "exit with a zero status even if nothing matched"
 msgstr "выход с нулевым кодом возврата, даже если ничего не найдено"
 
-#: builtin/rm.c:282
 msgid "No pathspec was given. Which files should I remove?"
 msgstr ""
 
-#: builtin/rm.c:305
 msgid "please stage your changes to .gitmodules or stash them to proceed"
 msgstr ""
 
-#: builtin/rm.c:323
 #, c-format
 msgid "not removing '%s' recursively without -r"
 msgstr "не удаляю рекурсивно «%s» без указания опции -r"
 
-#: builtin/rm.c:362
 #, 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."
-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"
+"              [<host>:]<directory> (--all | <ref>...)"
+msgstr ""
 
-#: builtin/send-pack.c:188
 msgid "remote name"
 msgstr "имя внешнего репозитория"
 
-#: builtin/send-pack.c:201
 msgid "use stateless RPC protocol"
 msgstr "протокол без сохранения состояния для RPC"
 
-#: builtin/send-pack.c:202
 msgid "read refs from stdin"
 msgstr "прочитать ссылки из стандартного ввода"
 
-#: builtin/send-pack.c:203
 msgid "print status from remote helper"
 msgstr "вывести статус от скрипта внешнего сервера"
 
-#: builtin/shortlog.c:16
 msgid "git shortlog [<options>] [<revision-range>] [[--] <path>...]"
-msgstr "git shortlog [<опции>] [<диапазон-редакций>] [[--] <путь>…]"
+msgstr "git shortlog [<опции>] [<диапазон-редакций>] [[--] <путь>...]"
 
-#: builtin/shortlog.c:17
 msgid "git log --pretty=short | git shortlog [<options>]"
 msgstr "git log --pretty=short | git shortlog [<опции>]"
 
-#: builtin/shortlog.c:135
 msgid "using multiple --group options with stdin is not supported"
 msgstr ""
 
-#: builtin/shortlog.c:145
 msgid "using --group=trailer with stdin is not supported"
 msgstr ""
 
-#: builtin/shortlog.c:335
 #, c-format
 msgid "unknown group type: %s"
 msgstr ""
 
-#: builtin/shortlog.c:363
-msgid "Group by committer rather than author"
-msgstr "Группировать по коммитеру, а не по автору"
+msgid "group by committer rather than author"
+msgstr ""
 
-#: builtin/shortlog.c:366
 msgid "sort output according to the number of commits per author"
 msgstr "отсортировать вывод по количеству коммитов у автора"
 
-#: builtin/shortlog.c:368
-msgid "Suppress commit descriptions, only provides commit count"
-msgstr "Не выводить описания коммитов, а только их количество"
+msgid "suppress commit descriptions, only provides commit count"
+msgstr ""
 
-#: builtin/shortlog.c:370
-msgid "Show the email address of each author"
-msgstr "Показать почту каждого из авторов"
+msgid "show the email address of each author"
+msgstr ""
 
-#: builtin/shortlog.c:371
 msgid "<w>[,<i1>[,<i2>]]"
 msgstr "<w>[,<i1>[,<i2>]]"
 
-#: builtin/shortlog.c:372
-msgid "Linewrap output"
-msgstr "Перенос строк на выводе"
+msgid "linewrap output"
+msgstr ""
 
-#: builtin/shortlog.c:374
 msgid "field"
 msgstr ""
 
-#: builtin/shortlog.c:375
-msgid "Group by field"
+msgid "group by field"
 msgstr ""
 
-#: builtin/shortlog.c:403
 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>)...]"
-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[=<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
 msgid "git show-branch (-g | --reflog)[=<n>[,<base>]] [--list] [<ref>]"
 msgstr "git show-branch (-g | --reflog)[=<n>[,<база>]] [--list] [<ссылка>]"
 
-#: builtin/show-branch.c:395
 #, c-format
 msgid "ignoring %s; cannot handle more than %d ref"
 msgid_plural "ignoring %s; cannot handle more than %d refs"
@@ -19876,90 +11177,64 @@ msgstr[1] "игнорирование %s; невозможно обработа�
 msgstr[2] "игнорирование %s; невозможно обработать больше %d ссылок"
 msgstr[3] "игнорирование %s; невозможно обработать больше %d ссылки"
 
-#: builtin/show-branch.c:548
 #, c-format
 msgid "no matching refs with %s"
 msgstr "нет совпадающих записей с %s"
 
-#: builtin/show-branch.c:645
 msgid "show remote-tracking and local branches"
 msgstr "показать список и отслеживаемых внешних и локальных веток"
 
-#: builtin/show-branch.c:647
 msgid "show remote-tracking branches"
 msgstr "показать список отслеживаемых внешних веток"
 
-#: builtin/show-branch.c:649
 msgid "color '*!+-' corresponding to the branch"
 msgstr "окрашивать «*!+-» в соответствии с веткой"
 
-#: builtin/show-branch.c:651
 msgid "show <n> more commits after the common ancestor"
 msgstr "показать <n> коммитов после общего предка"
 
-#: builtin/show-branch.c:653
 msgid "synonym to more=-1"
 msgstr "синоним для more=-1"
 
-#: builtin/show-branch.c:654
 msgid "suppress naming strings"
 msgstr "не выводить именованные строки"
 
-#: builtin/show-branch.c:656
 msgid "include the current branch"
 msgstr "включить в вывод текущую ветку"
 
-#: builtin/show-branch.c:658
 msgid "name commits with their object names"
 msgstr "именовать коммиты их именами объектов"
 
-#: builtin/show-branch.c:660
 msgid "show possible merge bases"
 msgstr "вывести возможные базы слияния"
 
-#: builtin/show-branch.c:662
 msgid "show refs unreachable from any other ref"
 msgstr "вывести ссылки, недоступные из любых других ссылок"
 
-#: builtin/show-branch.c:664
 msgid "show commits in topological order"
 msgstr "вывести коммиты в топологическом порядке"
 
-#: builtin/show-branch.c:667
 msgid "show only commits not on the first branch"
 msgstr "вывести только коммиты, отсутствующие в первой ветке"
 
-#: builtin/show-branch.c:669
 msgid "show merges reachable from only one tip"
 msgstr "вывести слияния, достижимые только из одной из верхушек"
 
-#: builtin/show-branch.c:671
 msgid "topologically sort, maintaining date order where possible"
 msgstr "топологическая сортировка, с сохранением порядка дат, если возможно"
 
-#: builtin/show-branch.c:674
 msgid "<n>[,<base>]"
 msgstr "<n>[,<база>]"
 
-#: builtin/show-branch.c:675
 msgid "show <n> most recent ref-log entries starting at base"
 msgstr "показать <n> последних записей в журнале ссылок, начиная с базы"
 
-#: builtin/show-branch.c:711
-msgid ""
-"--reflog is incompatible with --all, --remotes, --independent or --merge-"
-"base"
-msgstr "--reflog несовместимо с --all, --remotes, --independent и --merge-base"
-
-#: builtin/show-branch.c:735
 msgid "no branches given, and HEAD is not valid"
 msgstr "не указаны ветки и HEAD не действительный"
 
-#: builtin/show-branch.c:738
 msgid "--reflog option needs one branch name"
 msgstr "параметр --reflog требует указания имени одной ветки"
 
-#: builtin/show-branch.c:741
 #, c-format
 msgid "only %d entry can be shown at one time."
 msgid_plural "only %d entries can be shown at one time."
@@ -19968,12 +11243,10 @@ msgstr[1] "только %d записи могут быть показаны о�
 msgstr[2] "только %d записей могут быть показаны одновременно."
 msgstr[3] "только %d записи могут быть показаны одновременно."
 
-#: builtin/show-branch.c:745
 #, c-format
 msgid "no such ref %s"
 msgstr "нет такой ссылки %s"
 
-#: builtin/show-branch.c:831
 #, c-format
 msgid "cannot handle more than %d rev."
 msgid_plural "cannot handle more than %d revs."
@@ -19982,646 +11255,581 @@ msgstr[1] "невозможно обработать больше %d редак�
 msgstr[2] "невозможно обработать больше %d редакций."
 msgstr[3] "невозможно обработать больше %d редакции."
 
-#: builtin/show-branch.c:835
 #, c-format
 msgid "'%s' is not a valid ref."
 msgstr "«%s» не является допустимой ссылкой на коммит."
 
-#: builtin/show-branch.c:838
 #, c-format
 msgid "cannot find commit %s (%s)"
 msgstr "не удалось найти коммит %s (%s)"
 
-#: builtin/show-index.c:21
 msgid "hash-algorithm"
 msgstr ""
 
-#: builtin/show-index.c:31
 msgid "Unknown hash algorithm"
 msgstr ""
 
-#: builtin/show-ref.c:12
 msgid ""
-"git show-ref [-q | --quiet] [--verify] [--head] [-d | --dereference] [-s | "
-"--hash[=<n>]] [--abbrev[=<n>]] [--tags] [--heads] [--] [<pattern>...]"
-msgstr "git show-ref [-q | --quiet] [--verify] [--head] [-d | --dereference] [-s | --hash[=<n>]] [--abbrev[=<n>]] [--tags] [--heads] [--] [<шаблон>…]"
+"git show-ref [-q | --quiet] [--verify] [--head] [-d | --dereference] [-s | --"
+"hash[=<n>]] [--abbrev[=<n>]] [--tags] [--heads] [--] [<pattern>...]"
+msgstr ""
+"git show-ref [-q | --quiet] [--verify] [--head] [-d | --dereference] [-s | --"
+"hash[=<n>]] [--abbrev[=<n>]] [--tags] [--heads] [--] [<шаблон>...]"
 
-#: builtin/show-ref.c:13
 msgid "git show-ref --exclude-existing[=<pattern>]"
 msgstr "git show-ref --exclude-existing[=<шаблон>]"
 
-#: builtin/show-ref.c:162
 msgid "only show tags (can be combined with heads)"
-msgstr "вывести только метки (можно использовать одновременно с --heads)"
+msgstr "вывести только метки (можно использовать одновременно с опцией heads)"
 
-#: builtin/show-ref.c:163
 msgid "only show heads (can be combined with tags)"
-msgstr "вывести только головы (можно использовать одновременно с --tags)"
+msgstr "вывести только головы (можно использовать одновременно с опцией tags)"
 
-#: builtin/show-ref.c:164
 msgid "stricter reference checking, requires exact ref path"
 msgstr "более строгая проверка ссылок, требует точный путь ссылки"
 
-#: builtin/show-ref.c:167 builtin/show-ref.c:169
 msgid "show the HEAD reference, even if it would be filtered out"
 msgstr "вывести ссылку HEAD, даже если она будет отфильтрована"
 
-#: builtin/show-ref.c:171
 msgid "dereference tags into object IDs"
 msgstr "разыменовать метки в идентификаторы объектов"
 
-#: builtin/show-ref.c:173
 msgid "only show SHA1 hash using <n> digits"
 msgstr "использовать <n> символов для вывода хэш-кода SHA-1"
 
-#: builtin/show-ref.c:177
 msgid "do not print results to stdout (useful with --verify)"
-msgstr "не печатать результат на стандартный вывод (полезно с опцией «--verify»)"
+msgstr ""
+"не печатать результат на стандартный вывод (полезно с опцией «--verify»)"
 
-#: builtin/show-ref.c:179
 msgid "show refs from stdin that aren't in local repository"
-msgstr "вывести ссылки со стандартного ввода, которых нет в локальном репозитории"
+msgstr ""
+"вывести ссылки со стандартного ввода, которых нет в локальном репозитории"
 
-#: builtin/sparse-checkout.c:21
 msgid "git sparse-checkout (init|list|set|add|reapply|disable) <options>"
 msgstr ""
 
-#: builtin/sparse-checkout.c:50
-msgid "git sparse-checkout list"
+msgid "this worktree is not sparse"
 msgstr ""
 
-#: builtin/sparse-checkout.c:76
 msgid "this worktree is not sparse (sparse-checkout file may not exist)"
 msgstr ""
 
-#: builtin/sparse-checkout.c:228
-msgid "failed to create directory for sparse-checkout file"
+#, c-format
+msgid ""
+"directory '%s' contains untracked files, but is not in the sparse-checkout "
+"cone"
 msgstr ""
 
-#: builtin/sparse-checkout.c:269
-msgid "unable to upgrade repository format to enable worktreeConfig"
+#, c-format
+msgid "failed to remove directory '%s'"
 msgstr ""
 
-#: builtin/sparse-checkout.c:271
-msgid "failed to set extensions.worktreeConfig setting"
+msgid "failed to create directory for sparse-checkout file"
+msgstr ""
+
+msgid "failed to initialize worktree config"
 msgstr ""
 
-#: builtin/sparse-checkout.c:288
-msgid "git sparse-checkout init [--cone]"
+msgid "failed to modify sparse-index config"
 msgstr ""
 
-#: builtin/sparse-checkout.c:307
 msgid "initialize the sparse-checkout in cone mode"
 msgstr ""
 
-#: builtin/sparse-checkout.c:344
+msgid "toggle the use of a sparse index"
+msgstr ""
+
+#, c-format
+msgid "unable to create leading directories of %s"
+msgstr "не удалось создать родительские каталоги для %s"
+
 #, c-format
 msgid "failed to open '%s'"
 msgstr "не удалось открыть «%s»"
 
-#: builtin/sparse-checkout.c:401
 #, c-format
 msgid "could not normalize path %s"
 msgstr ""
 
-#: builtin/sparse-checkout.c:413
-msgid "git sparse-checkout (set|add) (--stdin | <patterns>)"
-msgstr ""
-
-#: builtin/sparse-checkout.c:438
 #, c-format
 msgid "unable to unquote C-style string '%s'"
 msgstr ""
 
-#: builtin/sparse-checkout.c:492 builtin/sparse-checkout.c:516
 msgid "unable to load existing sparse-checkout patterns"
 msgstr ""
 
-#: builtin/sparse-checkout.c:561
+msgid "existing sparse-checkout patterns do not use cone mode"
+msgstr ""
+
+msgid "please run from the toplevel directory in non-cone mode"
+msgstr ""
+
+msgid "specify directories rather than patterns (no leading slash)"
+msgstr ""
+
+msgid ""
+"specify directories rather than patterns.  If your directory starts with a "
+"'!', pass --skip-checks"
+msgstr ""
+
+msgid ""
+"specify directories rather than patterns.  If your directory really has any "
+"of '*?[]\\' in it, pass --skip-checks"
+msgstr ""
+
+#, c-format
+msgid ""
+"'%s' is not a directory; to treat it as a directory anyway, rerun with --"
+"skip-checks"
+msgstr ""
+
+#, c-format
+msgid ""
+"pass a leading slash before paths such as '%s' if you want a single file "
+"(see NON-CONE PROBLEMS in the git-sparse-checkout manual)."
+msgstr ""
+
+msgid "git sparse-checkout add [--skip-checks] (--stdin | <patterns>)"
+msgstr ""
+
+msgid ""
+"skip some sanity checks on the given paths that might give false positives"
+msgstr ""
+
 msgid "read patterns from standard in"
 msgstr ""
 
-#: builtin/sparse-checkout.c:576
-msgid "git sparse-checkout reapply"
+msgid "no sparse-checkout to add to"
+msgstr ""
+
+msgid ""
+"git sparse-checkout set [--[no-]cone] [--[no-]sparse-index] [--skip-checks] "
+"(--stdin | <patterns>)"
 msgstr ""
 
-#: builtin/sparse-checkout.c:595
-msgid "git sparse-checkout disable"
+msgid "must be in a sparse-checkout to reapply sparsity patterns"
 msgstr ""
 
-#: builtin/sparse-checkout.c:623
 msgid "error while refreshing working directory"
 msgstr ""
 
-#: builtin/stash.c:22 builtin/stash.c:38
 msgid "git stash list [<options>]"
 msgstr "git stash list [<опции>]"
 
-#: builtin/stash.c:23 builtin/stash.c:43
 msgid "git stash show [<options>] [<stash>]"
 msgstr "git stash show [<опциии>] [<спрятанные-изменения>]"
 
-#: builtin/stash.c:24 builtin/stash.c:48
 msgid "git stash drop [-q|--quiet] [<stash>]"
 msgstr "git stash drop [-q|--quiet] [<спрятанные-изменения>]"
 
-#: builtin/stash.c:25
 msgid "git stash ( pop | apply ) [--index] [-q|--quiet] [<stash>]"
-msgstr "git stash ( pop | apply ) [--index] [-q|--quiet] [<спрятанные-изменения>]"
+msgstr ""
+"git stash ( pop | apply ) [--index] [-q|--quiet] [<спрятанные-изменения>]"
 
-#: builtin/stash.c:26 builtin/stash.c:63
 msgid "git stash branch <branchname> [<stash>]"
 msgstr "git stash branch <имя-ветки> [<спрятанные-изменения>]"
 
-#: builtin/stash.c:27 builtin/stash.c:68
-msgid "git stash clear"
-msgstr "git stash clear"
-
-#: builtin/stash.c:28
 msgid ""
-"git stash [push [-p|--patch] [-k|--[no-]keep-index] [-q|--quiet]\n"
+"git stash [push [-p|--patch] [-S|--staged] [-k|--[no-]keep-index] [-q|--"
+"quiet]\n"
 "          [-u|--include-untracked] [-a|--all] [-m|--message <message>]\n"
 "          [--pathspec-from-file=<file> [--pathspec-file-nul]]\n"
 "          [--] [<pathspec>...]]"
 msgstr ""
 
-#: builtin/stash.c:32 builtin/stash.c:85
 msgid ""
-"git stash save [-p|--patch] [-k|--[no-]keep-index] [-q|--quiet]\n"
+"git stash save [-p|--patch] [-S|--staged] [-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] [<сообщение>]"
+msgstr ""
 
-#: builtin/stash.c:53
 msgid "git stash pop [--index] [-q|--quiet] [<stash>]"
 msgstr "git stash pop [--index] [-q|--quiet] [<спрятанные-изменения>]"
 
-#: builtin/stash.c:58
 msgid "git stash apply [--index] [-q|--quiet] [<stash>]"
 msgstr "git stash apply [--index] [-q|--quiet] [<спрятанные-изменения>]"
 
-#: builtin/stash.c:73
 msgid "git stash store [-m|--message <message>] [-q|--quiet] <commit>"
 msgstr "git stash store [-m|--message <сообщение>] [-q|--quiet] <коммит>"
 
-#: builtin/stash.c:78
 msgid ""
 "git stash [push [-p|--patch] [-k|--[no-]keep-index] [-q|--quiet]\n"
 "          [-u|--include-untracked] [-a|--all] [-m|--message <message>]\n"
 "          [--] [<pathspec>...]]"
-msgstr "git stash [push [-p|--patch] [-k|--[no-]keep-index] [-q|--quiet]\n          [-u|--include-untracked] [-a|--all] [-m|--message <сообщение>]\n          [--] [<спецификатор-пути>…]]"
+msgstr ""
+"git stash [push [-p|--patch] [-k|--[no-]keep-index] [-q|--quiet]\n"
+"          [-u|--include-untracked] [-a|--all] [-m|--message <сообщение>]\n"
+"          [--] [<спецификатор-пути>...]]"
+
+msgid ""
+"git stash save [-p|--patch] [-k|--[no-]keep-index] [-q|--quiet]\n"
+"               [-u|--include-untracked] [-a|--all] [<message>]"
+msgstr ""
 
-#: builtin/stash.c:128
 #, c-format
 msgid "'%s' is not a stash-like commit"
 msgstr "«%s» не является коммитом со спрятанными изменениями"
 
-#: builtin/stash.c:148
 #, c-format
 msgid "Too many revisions specified:%s"
 msgstr "Передано слишком много редакций:%s"
 
-#: builtin/stash.c:162
 msgid "No stash entries found."
 msgstr "Не найдены спрятанные изменения."
 
-#: builtin/stash.c:176
 #, c-format
 msgid "%s is not a valid reference"
 msgstr "%s не является допустимой ссылкой на коммит"
 
-#: builtin/stash.c:225
-msgid "git stash clear with parameters is unimplemented"
-msgstr "git stash очистка с параметрами не реализована"
+msgid "git stash clear with arguments is unimplemented"
+msgstr ""
+
+#, c-format
+msgid ""
+"WARNING: Untracked file in way of tracked file!  Renaming\n"
+"            %s -> %s\n"
+"         to make room.\n"
+msgstr ""
 
-#: builtin/stash.c:404
 msgid "cannot apply a stash in the middle of a merge"
 msgstr "нельзя применить спрятанные изменения во время выполнения слияния"
 
-#: builtin/stash.c:415
 #, c-format
 msgid "could not generate diff %s^!."
 msgstr "не удалось сгенерировать список изменений %s^!."
 
-#: builtin/stash.c:422
 msgid "conflicts in index. Try without --index."
 msgstr ""
 
-#: builtin/stash.c:428
 msgid "could not save index tree"
 msgstr "не удалось сохранить дерево индекса"
 
-#: builtin/stash.c:437
-msgid "could not restore untracked files from stash"
-msgstr "невозможно восстановить неотслеживаемые файлы из спрятанных файлов"
-
-#: builtin/stash.c:451
 #, c-format
 msgid "Merging %s with %s"
 msgstr "Слияние %s и %s"
 
-#: builtin/stash.c:461
 msgid "Index was not unstashed."
 msgstr "Индекс не был извлечён из спрятанных изменений."
 
-#: builtin/stash.c:522 builtin/stash.c:620
+msgid "could not restore untracked files from stash"
+msgstr "невозможно восстановить неотслеживаемые файлы из спрятанных файлов"
+
 msgid "attempt to recreate the index"
 msgstr "попытка пересоздания индекса"
 
-#: builtin/stash.c:566
 #, c-format
 msgid "Dropped %s (%s)"
 msgstr "Отброшено %s (%s)"
 
-#: builtin/stash.c:569
 #, c-format
 msgid "%s: Could not drop stash entry"
 msgstr "%s: Не удалось отбросить запись из спрятанных изменений"
 
-#: builtin/stash.c:582
 #, c-format
 msgid "'%s' is not a stash reference"
 msgstr "«%s» не является ссылкой на спрятанные изменения"
 
-#: builtin/stash.c:632
 msgid "The stash entry is kept in case you need it again."
-msgstr "Спрятанные изменения сохранены, на случай если они снова вам понадобятся."
+msgstr ""
+"Спрятанные изменения сохранены, на случай если они снова вам понадобятся."
 
-#: builtin/stash.c:655
 msgid "No branch name specified"
 msgstr "Не указано имя ветки"
 
-#: builtin/stash.c:799 builtin/stash.c:836
+msgid "failed to parse tree"
+msgstr ""
+
+msgid "failed to unpack trees"
+msgstr ""
+
+msgid "include untracked files in the stash"
+msgstr ""
+
+msgid "only show untracked files in the stash"
+msgstr ""
+
 #, c-format
 msgid "Cannot update %s with %s"
 msgstr "Не удолось обновить %s с %s"
 
-#: builtin/stash.c:817 builtin/stash.c:1471 builtin/stash.c:1536
 msgid "stash message"
 msgstr "описание спрятанных изменений"
 
-#: builtin/stash.c:827
 msgid "\"git stash store\" requires one <commit> argument"
 msgstr "«git stash store» требует указания одного аргумента <коммит>"
 
-#: builtin/stash.c:1042
+msgid "No staged changes"
+msgstr ""
+
 msgid "No changes selected"
 msgstr "Изменения не выбраны"
 
-#: builtin/stash.c:1142
 msgid "You do not have the initial commit yet"
 msgstr "У вас еще нет начального коммита"
 
-#: builtin/stash.c:1169
 msgid "Cannot save the current index state"
 msgstr "Не удалось сохранить текущее состояние индекса"
 
-#: builtin/stash.c:1178
 msgid "Cannot save the untracked files"
 msgstr "Невозможно сохранить неотслеживаемые файлы"
 
-#: builtin/stash.c:1189 builtin/stash.c:1198
 msgid "Cannot save the current worktree state"
 msgstr "Не удалось сохранить текущее состояние рабочего каталога"
 
-#: builtin/stash.c:1226
+msgid "Cannot save the current staged state"
+msgstr ""
+
 msgid "Cannot record working tree state"
 msgstr "Не удалось записать состояние рабочего каталога"
 
-#: builtin/stash.c:1275
 msgid "Can't use --patch and --include-untracked or --all at the same time"
-msgstr "Нельзя использовать --patch и --include-untracked или --all одновременно"
+msgstr ""
+"Нельзя использовать --patch и --include-untracked или --all одновременно"
+
+msgid "Can't use --staged and --include-untracked or --all at the same time"
+msgstr ""
 
-#: builtin/stash.c:1291
 msgid "Did you forget to 'git add'?"
 msgstr "Возможно, вы забыли выполнить «git add»?"
 
-#: builtin/stash.c:1306
 msgid "No local changes to save"
 msgstr "Нет локальных изменений для сохранения"
 
-#: builtin/stash.c:1313
 msgid "Cannot initialize stash"
 msgstr "Не удалось инициализировать спрятанные изменения"
 
-#: builtin/stash.c:1328
 msgid "Cannot save the current status"
 msgstr "Не удалось сохранить текущий статус"
 
-#: builtin/stash.c:1333
 #, c-format
 msgid "Saved working directory and index state %s"
 msgstr "Рабочий каталог и состояние индекса сохранены %s"
 
-#: builtin/stash.c:1423
 msgid "Cannot remove worktree changes"
 msgstr "Не удалось удалить изменения рабочего каталога"
 
-#: builtin/stash.c:1462 builtin/stash.c:1527
 msgid "keep index"
 msgstr ""
 
-#: builtin/stash.c:1464 builtin/stash.c:1529
+msgid "stash staged changes only"
+msgstr ""
+
 msgid "stash in patch mode"
 msgstr ""
 
-#: builtin/stash.c:1465 builtin/stash.c:1530
 msgid "quiet mode"
 msgstr ""
 
-#: builtin/stash.c:1467 builtin/stash.c:1532
 msgid "include untracked files in stash"
 msgstr ""
 
-#: builtin/stash.c:1469 builtin/stash.c:1534
 msgid "include ignore files"
 msgstr ""
 
-#: builtin/stash.c:1569
-msgid ""
-"the stash.useBuiltin support has been removed!\n"
-"See its entry in 'git help config' for details."
-msgstr ""
-
-#: builtin/stripspace.c:18
-msgid "git stripspace [-s | --strip-comments]"
-msgstr "git stripspace [-s | --strip-comments]"
-
-#: builtin/stripspace.c:19
-msgid "git stripspace [-c | --comment-lines]"
-msgstr "git stripspace [-c | --comment-lines]"
-
-#: builtin/stripspace.c:37
 msgid "skip and remove all lines starting with comment character"
 msgstr "пропустить и удалить все строки, начинающиеся с символа комметария"
 
-#: builtin/stripspace.c:40
 msgid "prepend comment character and space to each line"
 msgstr "добавить перед каждой строкой символ комметария и пробел"
 
-#: builtin/submodule--helper.c:47 builtin/submodule--helper.c:2423
 #, c-format
 msgid "Expecting a full ref name, got %s"
 msgstr "Ожидалось полное имя ссылки, а получено %s"
 
-#: builtin/submodule--helper.c:64
-msgid "submodule--helper print-default-remote takes no arguments"
-msgstr ""
-
-#: builtin/submodule--helper.c:102
 #, c-format
-msgid "cannot strip one component off url '%s'"
-msgstr "не удалось обрезать один компонент url «%s»"
+msgid ""
+"could not look up configuration '%s'. Assuming this repository is its own "
+"authoritative upstream."
+msgstr ""
 
-#: builtin/submodule--helper.c:410 builtin/submodule--helper.c:1819
 msgid "alternative anchor for relative paths"
 msgstr "альтернативный символ для относительных путей"
 
-#: builtin/submodule--helper.c:415
 msgid "git submodule--helper list [--prefix=<path>] [<path>...]"
-msgstr "git submodule--helper list [--prefix=<путь>] [<путь>…]"
+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 "URL для подмодуля по пути «%s» не найден в .gitmodules"
 
-#: builtin/submodule--helper.c:524
 #, c-format
 msgid "Entering '%s'\n"
 msgstr ""
 
-#: builtin/submodule--helper.c:527
 #, c-format
 msgid ""
 "run_command returned non-zero status for %s\n"
 "."
 msgstr ""
 
-#: builtin/submodule--helper.c:549
 #, 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 ""
 
-#: builtin/submodule--helper.c:565
-msgid "Suppress output of entering each submodule command"
+msgid "suppress output of entering each submodule command"
 msgstr ""
 
-#: builtin/submodule--helper.c:567 builtin/submodule--helper.c:1487
-msgid "Recurse into nested submodules"
-msgstr ""
+msgid "recurse into nested submodules"
+msgstr "проходить вглубь вложенных подмодулей"
 
-#: builtin/submodule--helper.c:572
 msgid "git submodule--helper foreach [--quiet] [--recursive] [--] <command>"
 msgstr ""
 
-#: builtin/submodule--helper.c:599
-#, c-format
-msgid ""
-"could not look up configuration '%s'. Assuming this repository is its own "
-"authoritative upstream."
-msgstr ""
-
-#: builtin/submodule--helper.c:666
 #, c-format
 msgid "Failed to register url for submodule path '%s'"
 msgstr "Сбой регистрации адреса для пути подмодуля «%s»"
 
-#: builtin/submodule--helper.c:670
 #, c-format
 msgid "Submodule '%s' (%s) registered for path '%s'\n"
 msgstr "Подмодуль «%s» (%s) зарегистрирован по пути «%s»\n"
 
-#: builtin/submodule--helper.c:680
 #, c-format
 msgid "warning: command update mode suggested for submodule '%s'\n"
 msgstr "внимание: предполагаемый режим обновления для подмодуля «%s»\n"
 
-#: builtin/submodule--helper.c:687
 #, c-format
 msgid "Failed to register update mode for submodule path '%s'"
 msgstr "Сбой регистрации режима обновления для пути подмодуля «%s»"
 
-#: builtin/submodule--helper.c:709
-msgid "Suppress output for initializing a submodule"
-msgstr "Не выводить информацию о инициализации подмодуля"
+msgid "suppress output for initializing a submodule"
+msgstr ""
 
-#: builtin/submodule--helper.c:714
 msgid "git submodule--helper init [<options>] [<path>]"
 msgstr ""
 
-#: builtin/submodule--helper.c:787 builtin/submodule--helper.c:922
 #, c-format
 msgid "no submodule mapping found in .gitmodules for path '%s'"
 msgstr "не найдено соответствие подмодулей в .gitmodules для пути «%s»"
 
-#: builtin/submodule--helper.c:835
 #, 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
 #, c-format
 msgid "failed to recurse into submodule '%s'"
 msgstr "не удалось перейти вглубь подмодуля «%s»"
 
-#: builtin/submodule--helper.c:886 builtin/submodule--helper.c:1623
-msgid "Suppress submodule status output"
-msgstr "Не выводить статус подмодуля"
+msgid "suppress submodule status output"
+msgstr ""
 
-#: builtin/submodule--helper.c:887
 msgid ""
-"Use commit stored in the index instead of the one stored in the submodule "
+"use commit stored in the index instead of the one stored in the submodule "
 "HEAD"
-msgstr "Использовать коммит хранящийся в индексе вместо коммита хранящегося в HEAD подмодуля"
-
-#: builtin/submodule--helper.c:888
-msgid "recurse into nested submodules"
-msgstr "проходить вглубь вложенных подмодулей"
+msgstr ""
 
-#: builtin/submodule--helper.c:893
 msgid "git submodule status [--quiet] [--cached] [--recursive] [<path>...]"
-msgstr "git submodule status [--quiet] [--cached] [--recursive] [<путь>…]"
+msgstr "git submodule status [--quiet] [--cached] [--recursive] [<путь>...]"
 
-#: builtin/submodule--helper.c:917
 msgid "git submodule--helper name <path>"
 msgstr "git submodule--helper name <путь>"
 
-#: builtin/submodule--helper.c:989
 #, c-format
 msgid "* %s %s(blob)->%s(submodule)"
 msgstr ""
 
-#: builtin/submodule--helper.c:992
 #, c-format
 msgid "* %s %s(submodule)->%s(blob)"
 msgstr ""
 
-#: builtin/submodule--helper.c:1005
 #, c-format
 msgid "%s"
 msgstr ""
 
-#: builtin/submodule--helper.c:1055
 #, c-format
 msgid "couldn't hash object from '%s'"
 msgstr ""
 
-#: builtin/submodule--helper.c:1059
 #, c-format
 msgid "unexpected mode %o\n"
 msgstr ""
 
-#: builtin/submodule--helper.c:1300
 msgid "use the commit stored in the index instead of the submodule HEAD"
 msgstr ""
 
-#: builtin/submodule--helper.c:1302
-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 ""
 
-#: builtin/submodule--helper.c:1304
 msgid "skip submodules with 'ignore_config' value set to 'all'"
 msgstr ""
 
-#: builtin/submodule--helper.c:1306
 msgid "limit the summary size"
 msgstr ""
 
-#: builtin/submodule--helper.c:1311
 msgid "git submodule--helper summary [<options>] [<commit>] [--] [<path>]"
 msgstr ""
 
-#: builtin/submodule--helper.c:1335
 msgid "could not fetch a revision for HEAD"
 msgstr ""
 
-#: builtin/submodule--helper.c:1340
-msgid "--cached and --files are mutually exclusive"
-msgstr ""
-
-#: builtin/submodule--helper.c:1407
 #, c-format
 msgid "Synchronizing submodule url for '%s'\n"
 msgstr ""
 
-#: builtin/submodule--helper.c:1413
 #, c-format
 msgid "failed to register url for submodule path '%s'"
 msgstr ""
 
-#: builtin/submodule--helper.c:1427
 #, c-format
 msgid "failed to get the default remote for submodule '%s'"
 msgstr ""
 
-#: builtin/submodule--helper.c:1438
 #, c-format
 msgid "failed to update remote for submodule '%s'"
 msgstr ""
 
-#: builtin/submodule--helper.c:1485
-msgid "Suppress output of synchronizing submodule url"
+msgid "suppress output of synchronizing submodule url"
 msgstr ""
 
-#: builtin/submodule--helper.c:1492
 msgid "git submodule--helper sync [--quiet] [--recursive] [<path>]"
 msgstr "git submodule--helper sync [--quiet] [--recursive] [<путь>]"
 
-#: builtin/submodule--helper.c:1546
 #, 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)"
+"Submodule work tree '%s' contains a .git directory. This will be replaced "
+"with a .git file by using absorbgitdirs."
 msgstr ""
 
-#: builtin/submodule--helper.c:1558
 #, c-format
 msgid ""
 "Submodule work tree '%s' contains local modifications; use '-f' to discard "
 "them"
 msgstr ""
 
-#: builtin/submodule--helper.c:1566
 #, c-format
 msgid "Cleared directory '%s'\n"
 msgstr ""
 
-#: builtin/submodule--helper.c:1568
 #, c-format
 msgid "Could not remove submodule work tree '%s'\n"
 msgstr ""
 
-#: builtin/submodule--helper.c:1579
 #, c-format
 msgid "could not create empty submodule directory %s"
 msgstr ""
 
-#: builtin/submodule--helper.c:1595
 #, c-format
 msgid "Submodule '%s' (%s) unregistered for path '%s'\n"
 msgstr ""
 
-#: builtin/submodule--helper.c:1624
-msgid "Remove submodule working trees even if they contain local changes"
+msgid "remove submodule working trees even if they contain local changes"
 msgstr ""
 
-#: builtin/submodule--helper.c:1625
-msgid "Unregister all submodules"
+msgid "unregister all submodules"
 msgstr ""
 
-#: builtin/submodule--helper.c:1630
 msgid ""
 "git submodule deinit [--quiet] [-f | --force] [--all | [--] [<path>...]]"
-msgstr "git submodule deinit [--quiet] [-f | --force] [--all | [--] [<путь>…]]"
+msgstr ""
+"git submodule deinit [--quiet] [-f | --force] [--all | [--] [<путь>...]]"
 
-#: builtin/submodule--helper.c:1644
 msgid "Use '--all' if you really want to deinitialize all submodules"
-msgstr "Используйте «--all», если вы действительно хотите деинициализировать все подмодули"
+msgstr ""
+"Используйте «--all», если вы действительно хотите деинициализировать все "
+"подмодули"
 
-#: builtin/submodule--helper.c:1713
 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"
@@ -20629,320 +11837,434 @@ msgid ""
 "'--reference-if-able' instead of '--reference'."
 msgstr ""
 
-#: builtin/submodule--helper.c:1752 builtin/submodule--helper.c:1755
 #, c-format
 msgid "submodule '%s' cannot add alternate: %s"
 msgstr "подмодулю «%s» не удалось добавить альтернативу: %s"
 
-#: builtin/submodule--helper.c:1791
 #, c-format
 msgid "Value '%s' for submodule.alternateErrorStrategy is not recognized"
-msgstr "Значение «%s» для параметра submodule.alternateErrorStrategy не рапознано"
+msgstr ""
+"Значение «%s» для параметра submodule.alternateErrorStrategy не рапознано"
 
-#: builtin/submodule--helper.c:1798
 #, c-format
 msgid "Value '%s' for submodule.alternateLocation is not recognized"
 msgstr "Значение «%s» для параметра submodule.alternateLocation не рапознано"
 
-#: builtin/submodule--helper.c:1822
+#, c-format
+msgid "refusing to create/use '%s' in another submodule's git dir"
+msgstr ""
+
+#, c-format
+msgid "clone of '%s' into submodule path '%s' failed"
+msgstr "не удалось клонировать «%s» в подмодуль по пути «%s»"
+
+#, c-format
+msgid "directory not empty: '%s'"
+msgstr ""
+
+#, c-format
+msgid "could not get submodule directory for '%s'"
+msgstr "не удалось получить каталог для подмодуля «%s»"
+
 msgid "where the new submodule will be cloned to"
 msgstr "куда должен быть склонирован новый подмодуль"
 
-#: builtin/submodule--helper.c:1825
 msgid "name of the new submodule"
 msgstr "имя нового подмодуля"
 
-#: builtin/submodule--helper.c:1828
 msgid "url where to clone the submodule from"
 msgstr "url откуда должен был склонирован новый подмодуль"
 
-#: builtin/submodule--helper.c:1836
 msgid "depth for shallow clones"
 msgstr "глубина для частичного клона"
 
-#: builtin/submodule--helper.c:1839 builtin/submodule--helper.c:2348
 msgid "force cloning progress"
 msgstr "принудительно выводить прогресс клонирования"
 
-#: builtin/submodule--helper.c:1841 builtin/submodule--helper.c:2350
 msgid "disallow cloning into non-empty directory"
 msgstr ""
 
-#: builtin/submodule--helper.c:1848
 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:1873
-#, c-format
-msgid "refusing to create/use '%s' in another submodule's git dir"
+"<repository>] [--name <name>] [--depth <depth>] [--single-branch] [--filter "
+"<filter-spec>] --url <url> --path <path>"
 msgstr ""
 
-#: 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 ""
-
-#: builtin/submodule--helper.c:1900
-#, c-format
-msgid "could not get submodule directory for '%s'"
-msgstr "не удалось получить каталог для подмодуля «%s»"
-
-#: builtin/submodule--helper.c:1936
 #, c-format
 msgid "Invalid update mode '%s' for submodule path '%s'"
 msgstr ""
 
-#: builtin/submodule--helper.c:1940
 #, c-format
 msgid "Invalid update mode '%s' configured for submodule path '%s'"
 msgstr ""
 
-#: builtin/submodule--helper.c:2041
 #, c-format
 msgid "Submodule path '%s' not initialized"
 msgstr "Подмодуль по пути «%s» не инициализирован"
 
-#: builtin/submodule--helper.c:2045
 msgid "Maybe you want to use 'update --init'?"
 msgstr "Возможно, вы хотели использовать «update --init»?"
 
-#: builtin/submodule--helper.c:2075
 #, c-format
 msgid "Skipping unmerged submodule %s"
 msgstr "Пропуск не слитого подмодуля %s"
 
-#: builtin/submodule--helper.c:2104
 #, c-format
 msgid "Skipping submodule '%s'"
 msgstr "Пропуск подмодуля «%s»"
 
-#: builtin/submodule--helper.c:2254
 #, c-format
 msgid "Failed to clone '%s'. Retry scheduled"
 msgstr "Не удалось клонировать «%s». Запланирована повторная попытка"
 
-#: builtin/submodule--helper.c:2265
 #, c-format
 msgid "Failed to clone '%s' a second time, aborting"
 msgstr "Не удалось клонировать «%s» со второй попытки, отмена"
 
-#: builtin/submodule--helper.c:2327 builtin/submodule--helper.c:2573
+#, c-format
+msgid "Unable to checkout '%s' in submodule path '%s'"
+msgstr ""
+
+#, c-format
+msgid "Unable to rebase '%s' in submodule path '%s'"
+msgstr ""
+
+#, c-format
+msgid "Unable to merge '%s' in submodule path '%s'"
+msgstr ""
+
+#, c-format
+msgid "Execution of '%s %s' failed in submodule path '%s'"
+msgstr ""
+
+#, c-format
+msgid "Submodule path '%s': checked out '%s'\n"
+msgstr ""
+
+#, c-format
+msgid "Submodule path '%s': rebased into '%s'\n"
+msgstr ""
+
+#, c-format
+msgid "Submodule path '%s': merged in '%s'\n"
+msgstr ""
+
+#, c-format
+msgid "Submodule path '%s': '%s %s'\n"
+msgstr ""
+
+#, c-format
+msgid "Unable to fetch in submodule path '%s'; trying to directly fetch %s:"
+msgstr ""
+
+#, c-format
+msgid ""
+"Fetched in submodule path '%s', but it did not contain %s. Direct fetching "
+"of that commit failed."
+msgstr ""
+
+#, c-format
+msgid ""
+"Submodule (%s) branch configured to inherit branch from superproject, but "
+"the superproject is not on any branch"
+msgstr ""
+"Ветка подмодуля (%s) настроена на наследование ветки из родительского "
+"проекта, но он не находится ни на одной ветке"
+
+#, c-format
+msgid "could not get a repository handle for submodule '%s'"
+msgstr ""
+
+#, c-format
+msgid "Unable to find current revision in submodule path '%s'"
+msgstr ""
+
+#, c-format
+msgid "Unable to fetch in submodule path '%s'"
+msgstr ""
+
+#, c-format
+msgid "Unable to find %s revision in submodule path '%s'"
+msgstr ""
+
+#, c-format
+msgid "Failed to recurse into submodule path '%s'"
+msgstr ""
+
+msgid "force checkout updates"
+msgstr ""
+
+msgid "initialize uninitialized submodules before update"
+msgstr ""
+
+msgid "use SHA-1 of submodule's remote tracking branch"
+msgstr ""
+
+msgid "traverse submodules recursively"
+msgstr ""
+
+msgid "don't fetch new objects from the remote site"
+msgstr ""
+
 msgid "path into the working tree"
 msgstr "путь в рабочем каталоге"
 
-#: builtin/submodule--helper.c:2330
 msgid "path into the working tree, across nested submodule boundaries"
 msgstr "путь в рабочем каталоге, в пределах границ подмодуля"
 
-#: builtin/submodule--helper.c:2334
 msgid "rebase, merge, checkout or none"
 msgstr "rebase, merge, checkout или none"
 
-#: builtin/submodule--helper.c:2340
-msgid "Create a shallow clone truncated to the specified number of revisions"
-msgstr "Создать частичный клон, ограниченный указанным количеством редакций"
+msgid "create a shallow clone truncated to the specified number of revisions"
+msgstr ""
 
-#: builtin/submodule--helper.c:2343
 msgid "parallel jobs"
 msgstr "параллельные задачи"
 
-#: builtin/submodule--helper.c:2345
 msgid "whether the initial clone should follow the shallow recommendation"
-msgstr "должен ли изначальный процесс клонирования следовать рекомендации о частичности"
+msgstr ""
+"должен ли изначальный процесс клонирования следовать рекомендации о "
+"частичности"
 
-#: builtin/submodule--helper.c:2346
 msgid "don't print cloning progress"
 msgstr "вы выводить прогресс клонирования"
 
-#: builtin/submodule--helper.c:2357
-msgid "git submodule--helper update-clone [--prefix=<path>] [<path>...]"
+msgid ""
+"git submodule [--quiet] update [--init [--filter=<filter-spec>]] [--remote] "
+"[-N|--no-fetch] [-f|--force] [--checkout|--merge|--rebase] [--[no-]recommend-"
+"shallow] [--reference <repository>] [--recursive] [--[no-]single-branch] "
+"[--] [<path>...]"
 msgstr ""
 
-#: builtin/submodule--helper.c:2370
 msgid "bad value for update parameter"
 msgstr "плохое значение для параметра update"
 
-#: builtin/submodule--helper.c:2418
-#, 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:2541
-#, c-format
-msgid "could not get a repository handle for submodule '%s'"
-msgstr ""
-
-#: builtin/submodule--helper.c:2574
 msgid "recurse into submodules"
 msgstr "рекурсивно по подмодулям"
 
-#: builtin/submodule--helper.c:2580
 msgid "git submodule--helper absorb-git-dirs [<options>] [<path>...]"
-msgstr "git submodule--helper absorb-git-dirs [<опции>] [<путь>…]"
+msgstr "git submodule--helper absorb-git-dirs [<опции>] [<путь>...]"
 
-#: builtin/submodule--helper.c:2636
 msgid "check if it is safe to write to the .gitmodules file"
 msgstr ""
 
-#: builtin/submodule--helper.c:2639
 msgid "unset the config in the .gitmodules file"
 msgstr ""
 
-#: builtin/submodule--helper.c:2644
 msgid "git submodule--helper config <name> [<value>]"
 msgstr "git submodule--helper config <имя> [<значение>]"
 
-#: builtin/submodule--helper.c:2645
 msgid "git submodule--helper config --unset <name>"
 msgstr "git submodule--helper config --unset <имя>"
 
-#: builtin/submodule--helper.c:2646
-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
 msgid "please make sure that the .gitmodules file is in the working tree"
 msgstr ""
 
-#: builtin/submodule--helper.c:2681
-msgid "Suppress output for setting url of a submodule"
+msgid "suppress output for setting url of a submodule"
 msgstr ""
 
-#: builtin/submodule--helper.c:2685
 msgid "git submodule--helper set-url [--quiet] <path> <newurl>"
 msgstr ""
 
-#: builtin/submodule--helper.c:2718
 msgid "set the default tracking branch to master"
 msgstr ""
 
-#: builtin/submodule--helper.c:2720
 msgid "set the default tracking branch"
 msgstr ""
 
-#: builtin/submodule--helper.c:2724
 msgid "git submodule--helper set-branch [-q|--quiet] (-d|--default) <path>"
 msgstr ""
 
-#: builtin/submodule--helper.c:2725
 msgid ""
 "git submodule--helper set-branch [-q|--quiet] (-b|--branch) <branch> <path>"
 msgstr ""
 
-#: builtin/submodule--helper.c:2732
 msgid "--branch or --default required"
 msgstr ""
 
-#: builtin/submodule--helper.c:2735
-msgid "--branch and --default are mutually exclusive"
+msgid "print only error messages"
+msgstr ""
+
+msgid "force creation"
+msgstr ""
+
+msgid "show whether the branch would be created"
+msgstr ""
+
+msgid ""
+"git submodule--helper create-branch [-f|--force] [--create-reflog] [-q|--"
+"quiet] [-t|--track] [-n|--dry-run] <name> <start-oid> <start-name>"
+msgstr ""
+
+#, c-format
+msgid "creating branch '%s'"
+msgstr ""
+
+#, c-format
+msgid "Adding existing repo at '%s' to the index\n"
+msgstr ""
+
+#, c-format
+msgid "'%s' already exists and is not a valid git repo"
+msgstr ""
+
+#, c-format
+msgid "A git directory for '%s' is found locally with remote(s):\n"
+msgstr ""
+
+#, 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 ""
+
+#, c-format
+msgid "Reactivating local git directory for submodule '%s'\n"
+msgstr ""
+
+#, c-format
+msgid "unable to checkout submodule '%s'"
+msgstr ""
+
+#, c-format
+msgid "Failed to add submodule '%s'"
+msgstr ""
+
+#, c-format
+msgid "Failed to register submodule '%s'"
+msgstr ""
+
+#, c-format
+msgid "'%s' already exists in the index"
+msgstr ""
+
+#, c-format
+msgid "'%s' already exists in the index and is not a submodule"
+msgstr ""
+
+#, c-format
+msgid "'%s' does not have a commit checked out"
+msgstr ""
+
+msgid "branch of repository to add as submodule"
+msgstr ""
+
+msgid "allow adding an otherwise ignored submodule path"
+msgstr ""
+
+msgid "borrow the objects from reference repositories"
+msgstr ""
+
+msgid ""
+"sets the submodule's name to the given string instead of defaulting to its "
+"path"
+msgstr ""
+
+msgid "git submodule--helper add [<options>] [--] <repository> [<path>]"
+msgstr ""
+
+msgid "Relative path can only be used from the toplevel of the working tree"
+msgstr ""
+"Относительный путь можно использовать только находясь на вершине рабочего "
+"каталога"
+
+#, c-format
+msgid "repo URL: '%s' must be absolute or begin with ./|../"
+msgstr ""
+
+#, c-format
+msgid "'%s' is not a valid submodule name"
 msgstr ""
 
-#: builtin/submodule--helper.c:2792 git.c:438 git.c:711
 #, c-format
 msgid "%s doesn't support --super-prefix"
 msgstr "%s не поддерживает параметр --super-prefix"
 
-#: builtin/submodule--helper.c:2798
 #, c-format
 msgid "'%s' is not a valid submodule--helper subcommand"
 msgstr "«%s» не является подкомандой submodule--helper"
 
-#: builtin/symbolic-ref.c:8
 msgid "git symbolic-ref [<options>] <name> [<ref>]"
 msgstr "git symbolic-ref [<опции>] <имя> [<ссылка>]"
 
-#: builtin/symbolic-ref.c:9
 msgid "git symbolic-ref -d [-q] <name>"
 msgstr "git symbolic-ref -d [-q] <имя>"
 
-#: builtin/symbolic-ref.c:40
 msgid "suppress error message for non-symbolic (detached) refs"
-msgstr "не выводить сообщения об ошибках для несимвольных (отсоединенных) ссылок"
+msgstr ""
+"не выводить сообщения об ошибках для несимвольных (отсоединенных) ссылок"
 
-#: builtin/symbolic-ref.c:41
 msgid "delete symbolic ref"
 msgstr "удалить символьные ссылки"
 
-#: builtin/symbolic-ref.c:42
 msgid "shorten ref output"
 msgstr "укороченный вывод ссылок"
 
-#: builtin/symbolic-ref.c:43 builtin/update-ref.c:499
 msgid "reason"
 msgstr "причина"
 
-#: builtin/symbolic-ref.c:43 builtin/update-ref.c:499
 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>]"
-msgstr "git tag [-a | -s | -u <key-id>] [-f] [-m <сообщение> | -F <файл>]\n\t\t<имя-метка> [<редакция>]"
+"        <tagname> [<head>]"
+msgstr ""
 
-#: builtin/tag.c:27
 msgid "git tag -d <tagname>..."
-msgstr "git tag -d <имя-метки>…"
+msgstr "git tag -d <имя-метки>..."
 
-#: 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>] [<pattern>...]"
+"git tag -l [-n[<num>]] [--contains <commit>] [--no-contains <commit>] [--"
+"points-at <object>]\n"
+"        [--format=<format>] [--merged <commit>] [--no-merged <commit>] "
+"[<pattern>...]"
 msgstr ""
 
-#: builtin/tag.c:30
 msgid "git tag -v [--format=<format>] <tagname>..."
-msgstr "git tag -v [--format=<формат>] <имя-метки>…"
+msgstr "git tag -v [--format=<формат>] <имя-метки>..."
 
-#: builtin/tag.c:89
 #, c-format
 msgid "tag '%s' not found."
 msgstr "метка  «%s» не найдена."
 
-#: builtin/tag.c:105
 #, c-format
 msgid "Deleted tag '%s' (was %s)\n"
 msgstr "Метка «%s» удалена (была %s)\n"
 
-#: builtin/tag.c:135
 #, c-format
 msgid ""
 "\n"
 "Write a message for tag:\n"
 "  %s\n"
 "Lines starting with '%c' will be ignored.\n"
-msgstr "\nВведите сообщение для метки:\n  %s\nСтроки, начинающиеся с «%c» будут проигнорированы.\n"
+msgstr ""
+"\n"
+"Введите сообщение для метки:\n"
+"  %s\n"
+"Строки, начинающиеся с «%c» будут проигнорированы.\n"
 
-#: builtin/tag.c:139
 #, c-format
 msgid ""
 "\n"
 "Write a message for tag:\n"
 "  %s\n"
-"Lines starting with '%c' will be kept; you may remove them yourself if you want to.\n"
-msgstr "\nВведите сообщение для метки:\n  %s\nСтроки, начинающиеся с «%c» будут оставлены; вы можете удалить их вручную, если хотите.\n"
+"Lines starting with '%c' will be kept; you may remove them yourself if you "
+"want to.\n"
+msgstr ""
+"\n"
+"Введите сообщение для метки:\n"
+"  %s\n"
+"Строки, начинающиеся с «%c» будут оставлены; вы можете удалить их вручную, "
+"если хотите.\n"
 
-#: builtin/tag.c:198
 msgid "unable to sign the tag"
 msgstr "не удалось подписать метку"
 
-#: builtin/tag.c:200
-msgid "unable to write tag file"
-msgstr "не удалось записать файл метки"
-
-#: builtin/tag.c:216
 #, c-format
 msgid ""
 "You have created a nested tag. The object referred to by your new tag is\n"
@@ -20951,2089 +12273,5253 @@ msgid ""
 "\tgit tag -f %s %s^{}"
 msgstr ""
 
-#: builtin/tag.c:232
 msgid "bad object type."
 msgstr "неправильный тип объекта"
 
-#: builtin/tag.c:285
 msgid "no tag message?"
 msgstr "нет описания метки?"
 
-#: builtin/tag.c:292
 #, c-format
 msgid "The tag message has been left in %s\n"
 msgstr "Сообщение метки было оставлено в %s\n"
 
-#: builtin/tag.c:403
 msgid "list tag names"
 msgstr "список названий меток"
 
-#: builtin/tag.c:405
 msgid "print <n> lines of each tag message"
 msgstr "печатать <n> строк описания от каждой метки"
 
-#: builtin/tag.c:407
 msgid "delete tags"
 msgstr "удалить метки"
 
-#: builtin/tag.c:408
 msgid "verify tags"
 msgstr "проверить метки"
 
-#: builtin/tag.c:410
 msgid "Tag creation options"
 msgstr "Настройки создания метки"
 
-#: builtin/tag.c:412
 msgid "annotated tag, needs a message"
 msgstr "для аннотированной метки нужно сообщение"
 
-#: builtin/tag.c:414
 msgid "tag message"
 msgstr "описание метки"
 
-#: builtin/tag.c:416
 msgid "force edit of tag message"
 msgstr ""
 
-#: builtin/tag.c:417
 msgid "annotated and GPG-signed tag"
 msgstr "аннотированная и подписанная с помощью GPG метка"
 
-#: builtin/tag.c:420
 msgid "use another key to sign the tag"
 msgstr "использовать другой ключ для подписания метки"
 
-#: builtin/tag.c:421
 msgid "replace the tag if exists"
 msgstr "замена метки, если она существует"
 
-#: builtin/tag.c:422 builtin/update-ref.c:505
 msgid "create a reflog"
 msgstr "создать журнал ссылок"
 
-#: builtin/tag.c:424
 msgid "Tag listing options"
 msgstr "Настройки вывода списка меток"
 
-#: builtin/tag.c:425
 msgid "show tag list in columns"
 msgstr "показать список меток по столбцам"
 
-#: builtin/tag.c:426 builtin/tag.c:428
 msgid "print only tags that contain the commit"
 msgstr "вывод только меток, которые содержат коммит"
 
-#: builtin/tag.c:427 builtin/tag.c:429
 msgid "print only tags that don't contain the commit"
 msgstr "вывод только меток, которые не содержат коммит"
 
-#: builtin/tag.c:430
 msgid "print only tags that are merged"
 msgstr "вывод только слитых меток"
 
-#: builtin/tag.c:431
 msgid "print only tags that are not merged"
 msgstr "вывод только не слитых меток"
 
-#: builtin/tag.c:435
 msgid "print only tags of the object"
 msgstr "вывод только меток, определенного объекта"
 
-#: builtin/tag.c:483
-msgid "--column and -n are incompatible"
-msgstr "--column и -n нельзя использовать одновременно"
-
-#: builtin/tag.c:505
-msgid "-n option is only allowed in list mode"
-msgstr "опцию -n можно использовать только в режиме списка"
-
-#: builtin/tag.c:507
-msgid "--contains option is only allowed in list mode"
-msgstr "опцию --contains можно использовать только в режиме списка"
-
-#: builtin/tag.c:509
-msgid "--no-contains option is only allowed in list mode"
-msgstr "опцию --no-contains можно использовать только в режиме списка"
-
-#: builtin/tag.c:511
-msgid "--points-at option is only allowed in list mode"
-msgstr "опцию --points-at можно использовать только в режиме списка"
-
-#: builtin/tag.c:513
-msgid "--merged and --no-merged options are only allowed in list mode"
-msgstr "опции --merged и --no-merged можно использовать только в режиме списка"
-
-#: builtin/tag.c:524
-msgid "only one -F or -m option is allowed."
-msgstr "-F и -m нельзя использовать одновременно."
-
-#: builtin/tag.c:543
-msgid "too many params"
-msgstr "передано слишком много параметров"
+#, c-format
+msgid "the '%s' option is only allowed in list mode"
+msgstr ""
 
-#: builtin/tag.c:549
 #, c-format
 msgid "'%s' is not a valid tag name."
 msgstr "«%s» не является допустимым именем метки."
 
-#: builtin/tag.c:554
 #, c-format
 msgid "tag '%s' already exists"
 msgstr "метка «%s» уже существует"
 
-#: builtin/tag.c:585
+#, c-format
+msgid "Invalid cleanup mode %s"
+msgstr "Неправильное значение режима очистки %s"
+
 #, c-format
 msgid "Updated tag '%s' (was %s)\n"
 msgstr "Метка «%s» обновлена (была %s)\n"
 
-#: builtin/unpack-objects.c:502
+msgid "pack exceeds maximum allowed size"
+msgstr "размер пакета превышает максимальный допустимый"
+
 msgid "Unpacking objects"
 msgstr "Распаковка объектов"
 
-#: builtin/update-index.c:84
 #, c-format
 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
 #, c-format
 msgid "failed to delete file %s"
 msgstr "не удалось удалить файл %s"
 
-#: builtin/update-index.c:115 builtin/update-index.c:221
 #, c-format
 msgid "failed to delete directory %s"
 msgstr "не удалось удалить каталог %s"
 
-#: builtin/update-index.c:140
 #, c-format
 msgid "Testing mtime in '%s' "
 msgstr "Проверка mtime в «%s» "
 
-#: builtin/update-index.c:154
 msgid "directory stat info does not change after adding a new file"
-msgstr "информация статистики каталога не изменяется после добавления нового файла"
+msgstr ""
+"информация статистики каталога не изменяется после добавления нового файла"
 
-#: builtin/update-index.c:167
 msgid "directory stat info does not change after adding a new directory"
-msgstr "информация статистики каталога не изменяется после добавления нового каталога"
+msgstr ""
+"информация статистики каталога не изменяется после добавления нового каталога"
 
-#: builtin/update-index.c:180
 msgid "directory stat info changes after updating a file"
-msgstr "информация статистики каталога изменяется после добавления нового файла"
+msgstr ""
+"информация статистики каталога изменяется после добавления нового файла"
 
-#: builtin/update-index.c:191
 msgid "directory stat info changes after adding a file inside subdirectory"
-msgstr "информация статистики каталога изменяется после добавления нового файла внутри подкаталога"
+msgstr ""
+"информация статистики каталога изменяется после добавления нового файла "
+"внутри подкаталога"
 
-#: builtin/update-index.c:202
 msgid "directory stat info does not change after deleting a file"
 msgstr "информация статистики каталога не изменяется после удаления файла"
 
-#: builtin/update-index.c:215
 msgid "directory stat info does not change after deleting a directory"
 msgstr "информация статистики каталога не изменяется после удаления каталога"
 
-#: builtin/update-index.c:222
 msgid " OK"
 msgstr " OK"
 
-#: builtin/update-index.c:591
 msgid "git update-index [<options>] [--] [<file>...]"
-msgstr "git update-index [<опции>] [--] [<файл>…]"
+msgstr "git update-index [<опции>] [--] [<файл>...]"
 
-#: builtin/update-index.c:974
 msgid "continue refresh even when index needs update"
 msgstr "продолжить обновление, даже если индекс требует обновления"
 
-#: builtin/update-index.c:977
 msgid "refresh: ignore submodules"
 msgstr "обновление: игнорировать подмодули"
 
-#: builtin/update-index.c:980
 msgid "do not ignore new files"
 msgstr "не игнорировать новые файлы"
 
-#: builtin/update-index.c:982
 msgid "let files replace directories and vice-versa"
 msgstr "разрешить файлам заменять каталоги и наоборот"
 
-#: builtin/update-index.c:984
 msgid "notice files missing from worktree"
 msgstr "замечать файлы отсутствующие в рабочем каталоге"
 
-#: builtin/update-index.c:986
 msgid "refresh even if index contains unmerged entries"
 msgstr "обновить, даже если в индексе имеются не слитые записи"
 
-#: builtin/update-index.c:989
 msgid "refresh stat information"
 msgstr "обновить информацию о статусе файлов"
 
-#: builtin/update-index.c:993
 msgid "like --refresh, but ignore assume-unchanged setting"
 msgstr "как --refresh, но игнорировать настройку assume-unchanged"
 
-#: builtin/update-index.c:997
 msgid "<mode>,<object>,<path>"
 msgstr "<режим доступа>,<объект>,<путь>"
 
-#: builtin/update-index.c:998
 msgid "add the specified entry to the index"
 msgstr "добавить указанную запись в индекс"
 
-#: builtin/update-index.c:1008
 msgid "mark files as \"not changing\""
 msgstr "пометить файлы как «не измененные»"
 
-#: builtin/update-index.c:1011
 msgid "clear assumed-unchanged bit"
 msgstr "убрать пометку assumed-unchanged"
 
-#: builtin/update-index.c:1014
 msgid "mark files as \"index-only\""
 msgstr "пометить файлы как «только в индексе»"
 
-#: builtin/update-index.c:1017
 msgid "clear skip-worktree bit"
 msgstr "убрать пометку skip-worktree"
 
-#: builtin/update-index.c:1020
 msgid "do not touch index-only entries"
 msgstr ""
 
-#: builtin/update-index.c:1022
 msgid "add to index only; do not add content to object database"
-msgstr "только добавить в индекс; не добавлять содержимое в базу данных объектов"
+msgstr ""
+"только добавить в индекс; не добавлять содержимое в базу данных объектов"
 
-#: builtin/update-index.c:1024
 msgid "remove named paths even if present in worktree"
 msgstr "удалить указанные пути, даже если они существуют в рабочем каталоге"
 
-#: builtin/update-index.c:1026
 msgid "with --stdin: input lines are terminated by null bytes"
 msgstr "с опцией --stdin: строки на вводе отделяются НУЛЕВЫМ байтом"
 
-#: builtin/update-index.c:1028
 msgid "read list of paths to be updated from standard input"
 msgstr "прочитать список обновляемых путей из стандартного ввода"
 
-#: builtin/update-index.c:1032
 msgid "add entries from standard input to the index"
 msgstr "добавить записи из стандартного ввода в индекс"
 
-#: builtin/update-index.c:1036
 msgid "repopulate stages #2 and #3 for the listed paths"
 msgstr "заново заполнить индекс #2 и #3 для указанных путей"
 
-#: builtin/update-index.c:1040
 msgid "only update entries that differ from HEAD"
 msgstr "обновить только записи, которые отличаются от HEAD"
 
-#: builtin/update-index.c:1044
 msgid "ignore files missing from worktree"
 msgstr "игнорировать файлы, отсутствующие в рабочем каталоге"
 
-#: builtin/update-index.c:1047
 msgid "report actions to standard output"
 msgstr "вывести выполняемые действия на стандартный вывод"
 
-#: builtin/update-index.c:1049
 msgid "(for porcelains) forget saved unresolved conflicts"
 msgstr "(для машинной обработки) забыть сохраненные неразрешенные конфликты"
 
-#: builtin/update-index.c:1053
 msgid "write index in this format"
 msgstr "записать индекс в указанном формате"
 
-#: builtin/update-index.c:1055
 msgid "enable or disable split index"
 msgstr "разрешить или запретить раздельный индекс"
 
-#: builtin/update-index.c:1057
 msgid "enable/disable untracked cache"
 msgstr "включить/отключить кэш неотслеживаемых файлов"
 
-#: builtin/update-index.c:1059
 msgid "test if the filesystem supports untracked cache"
-msgstr "проверить, что файловая система поддерживает кэш неотслеживаемых файлов"
+msgstr ""
+"проверить, что файловая система поддерживает кэш неотслеживаемых файлов"
 
-#: builtin/update-index.c:1061
 msgid "enable untracked cache without testing the filesystem"
 msgstr "включить кэш неотслеживаемых файлов без проверки файловой системы"
 
-#: builtin/update-index.c:1063
 msgid "write out the index even if is not flagged as changed"
 msgstr "записать индекс, даже если он не помечен как измененный"
 
-#: builtin/update-index.c:1065
 msgid "enable or disable file system monitor"
 msgstr "включить или выключить мониторинг файловой системы"
 
-#: builtin/update-index.c:1067
 msgid "mark files as fsmonitor valid"
 msgstr "пометить файл как действительный в мониторе файловой системы"
 
-#: builtin/update-index.c:1070
 msgid "clear fsmonitor valid bit"
 msgstr "снять пометку действительности мониторе файловой системы"
 
-#: 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; удалите или измените его, если вы действительно хотите включить разделенный индекс"
+msgstr ""
+"параметр  core.splitIndex установлен в false; удалите или измените его, если "
+"вы действительно хотите включить разделенный индекс"
 
-#: 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; удалите или измените его, если вы действительно хотите отключить разделенный индекс"
+msgstr ""
+"параметр  core.splitIndex установлен в true; удалите или измените его, если "
+"вы действительно хотите отключить разделенный индекс"
 
-#: 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 установлен true; удалите или измените его, если вы действительно хотите удалить кэш неотслеживаемых файлов"
+msgstr ""
+"параметр core.untrackedCache установлен true; удалите или измените его, если "
+"вы действительно хотите удалить кэш неотслеживаемых файлов"
 
-#: builtin/update-index.c:1198
 msgid "Untracked cache disabled"
 msgstr "Кэш неотслеживаемых файлов отключен"
 
-#: 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 установлен false; удалите или измените его, если вы действительно хотите включить кэш неотслеживаемых файлов"
+"core.untrackedCache is set to false; remove or change it, if you really want "
+"to enable the untracked cache"
+msgstr ""
+"параметр core.untrackedCache установлен false; удалите или измените его, "
+"если вы действительно хотите включить кэш неотслеживаемых файлов"
 
-#: builtin/update-index.c:1210
 #, c-format
 msgid "Untracked cache enabled for '%s'"
 msgstr "Кэш неотслеживаемых файлов включен для «%s»"
 
-#: builtin/update-index.c:1218
 msgid "core.fsmonitor is unset; set it if you really want to enable fsmonitor"
-msgstr "параметр core.fsmonitor не установлен; установите его если вы действительно хотите включить мониторинг файловой системы"
+msgstr ""
+"параметр core.fsmonitor не установлен; установите его если вы действительно "
+"хотите включить мониторинг файловой системы"
 
-#: builtin/update-index.c:1222
 msgid "fsmonitor enabled"
 msgstr "мониторинг файловой системы включён"
 
-#: builtin/update-index.c:1225
 msgid ""
 "core.fsmonitor is set; remove it if you really want to disable fsmonitor"
-msgstr "параметр core.fsmonitor установлен; удалите его если вы действительно хотите выключить мониторинг файловой системы"
+msgstr ""
+"параметр core.fsmonitor установлен; удалите его если вы действительно хотите "
+"выключить мониторинг файловой системы"
 
-#: builtin/update-index.c:1229
 msgid "fsmonitor disabled"
 msgstr "мониторинг файловой системы выключён"
 
-#: builtin/update-ref.c:10
 msgid "git update-ref [<options>] -d <refname> [<old-val>]"
 msgstr "git update-ref [<опции>] -d <имя-ссылки> [<старое-значение>]"
 
-#: builtin/update-ref.c:11
 msgid "git update-ref [<options>]    <refname> <new-val> [<old-val>]"
-msgstr "git update-ref [<опции>]    <имя-ссылки> <новое-значение> [<старое-значение>]"
+msgstr ""
+"git update-ref [<опции>]    <имя-ссылки> <новое-значение> [<старое-значение>]"
 
-#: builtin/update-ref.c:12
 msgid "git update-ref [<options>] --stdin [-z]"
 msgstr "git update-ref [<опции>] --stdin [-z]"
 
-#: builtin/update-ref.c:500
 msgid "delete the reference"
 msgstr "удалить ссылку"
 
-#: builtin/update-ref.c:502
 msgid "update <refname> not the one it points to"
 msgstr "обновить <имя-ссылки> а не то, на что она указывает"
 
-#: builtin/update-ref.c:503
 msgid "stdin has NUL-terminated arguments"
 msgstr "ввод отделённый НУЛЕВЫМИ символами"
 
-#: builtin/update-ref.c:504
 msgid "read updates from stdin"
 msgstr "прочитать обновления из стандартного ввода"
 
-#: builtin/update-server-info.c:7
-msgid "git update-server-info [--force]"
-msgstr "git update-server-info [--force]"
-
-#: builtin/update-server-info.c:15
 msgid "update the info files from scratch"
 msgstr "обновить информацию о серверах с нуля"
 
-#: builtin/upload-pack.c:11
 msgid "git upload-pack [<options>] <dir>"
 msgstr "git upload-pack [<опции>] <каталог>"
 
-#: builtin/upload-pack.c:23 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 "выходить сразу после начального объявления списка ссылок"
+msgid "serve up the info/refs for git-http-backend"
+msgstr ""
 
-#: builtin/upload-pack.c:27
 msgid "do not try <directory>/.git/ if <directory> is no Git directory"
 msgstr "не проверять <каталог>/.git/ если <каталог> не является каталогом Git"
 
-#: builtin/upload-pack.c:29
 msgid "interrupt transfer after <n> seconds of inactivity"
 msgstr "прервать передачу после <кол> секунд простоя"
 
-#: builtin/verify-commit.c:19
 msgid "git verify-commit [-v | --verbose] <commit>..."
-msgstr "git verify-commit [-v | --verbose] <коммит>…"
+msgstr "git verify-commit [-v | --verbose] <коммит>..."
 
-#: builtin/verify-commit.c:68
 msgid "print commit contents"
 msgstr "вывести содержимое коммита"
 
-#: builtin/verify-commit.c:69 builtin/verify-tag.c:37
 msgid "print raw gpg status output"
 msgstr "выводить сырой вывод статуса от gpg"
 
-#: builtin/verify-pack.c:59
 msgid "git verify-pack [-v | --verbose] [-s | --stat-only] <pack>..."
-msgstr "git verify-pack [-v | --verbose] [-s | --stat-only] <пакет>…"
+msgstr "git verify-pack [-v | --verbose] [-s | --stat-only] <пакет>..."
 
-#: builtin/verify-pack.c:70
 msgid "verbose"
 msgstr "быть многословнее"
 
-#: builtin/verify-pack.c:72
 msgid "show statistics only"
 msgstr "вывести только статистику"
 
-#: builtin/verify-tag.c:18
 msgid "git verify-tag [-v | --verbose] [--format=<format>] <tag>..."
-msgstr "git verify-tag [-v | --verbose] [--format=<формат>] <метка>…"
+msgstr "git verify-tag [-v | --verbose] [--format=<формат>] <метка>..."
 
-#: builtin/verify-tag.c:36
 msgid "print tag contents"
 msgstr "вывести содержимое метки"
 
-#: builtin/worktree.c:17
 msgid "git worktree add [<options>] <path> [<commit-ish>]"
 msgstr "git worktree add [<опции>] <путь> [<указатель-коммита>]"
 
-#: builtin/worktree.c:18
 msgid "git worktree list [<options>]"
 msgstr "git worktree list [<опции>]"
 
-#: builtin/worktree.c:19
 msgid "git worktree lock [<options>] <path>"
 msgstr "git worktree lock [<опции>] <путь>"
 
-#: builtin/worktree.c:20
 msgid "git worktree move <worktree> <new-path>"
 msgstr "git worktree move <рабочий-каталог> <новый-путь>"
 
-#: builtin/worktree.c:21
 msgid "git worktree prune [<options>]"
 msgstr "git worktree prune [<опции>]"
 
-#: builtin/worktree.c:22
 msgid "git worktree remove [<options>] <worktree>"
 msgstr "git worktree remove [<опции>] <рабочий-каталог>"
 
-#: builtin/worktree.c:23
-msgid "git worktree unlock <path>"
-msgstr "git worktree unlock <путь>"
-
-#: builtin/worktree.c:60 builtin/worktree.c:973
-#, c-format
-msgid "failed to delete '%s'"
-msgstr "не удалось удалить «%s»"
-
-#: builtin/worktree.c:85
-msgid "not a valid directory"
-msgstr ""
-
-#: builtin/worktree.c:91
-msgid "gitdir file does not exist"
-msgstr ""
-
-#: builtin/worktree.c:96 builtin/worktree.c:105
-#, c-format
-msgid "unable to read gitdir file (%s)"
+msgid "git worktree repair [<path>...]"
 msgstr ""
 
-#: builtin/worktree.c:115
-#, c-format
-msgid "short read (expected %<PRIuMAX> bytes, read %<PRIuMAX>)"
-msgstr ""
-
-#: builtin/worktree.c:123
-msgid "invalid gitdir file"
-msgstr ""
-
-#: builtin/worktree.c:131
-msgid "gitdir file points to non-existent location"
-msgstr ""
+msgid "git worktree unlock <path>"
+msgstr "git worktree unlock <путь>"
 
-#: builtin/worktree.c:146
 #, c-format
 msgid "Removing %s/%s: %s"
 msgstr ""
 
-#: builtin/worktree.c:221
 msgid "report pruned working trees"
 msgstr "вывести список удаленных рабочих каталогов"
 
-#: builtin/worktree.c:223
 msgid "expire working trees older than <time>"
 msgstr "удалить рабочие каталоги старее чем <дата-окончания>"
 
-#: builtin/worktree.c:293
 #, c-format
 msgid "'%s' already exists"
 msgstr "«%s» уже существует"
 
-#: builtin/worktree.c:302
 #, c-format
 msgid "unusable worktree destination '%s'"
 msgstr ""
 
-#: builtin/worktree.c:307
 #, 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:309
 #, 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:360
+#, c-format
+msgid "failed to copy '%s' to '%s'; sparse-checkout may not work correctly"
+msgstr ""
+
+#, c-format
+msgid "failed to copy worktree config from '%s' to '%s'"
+msgstr ""
+
+#, c-format
+msgid "failed to unset '%s' in '%s'"
+msgstr ""
+
 #, c-format
 msgid "could not create directory of '%s'"
 msgstr "не удалось создать каталог «%s»"
 
-#: builtin/worktree.c:494 builtin/worktree.c:500
+msgid "initializing"
+msgstr ""
+
 #, c-format
 msgid "Preparing worktree (new branch '%s')"
 msgstr ""
 
-#: builtin/worktree.c:496
 #, c-format
 msgid "Preparing worktree (resetting branch '%s'; was at %s)"
 msgstr ""
 
-#: builtin/worktree.c:505
 #, c-format
 msgid "Preparing worktree (checking out '%s')"
 msgstr ""
 
-#: builtin/worktree.c:511
 #, c-format
 msgid "Preparing worktree (detached HEAD %s)"
-msgstr ""
+msgstr "Готовится рабочая копия (отсоединённый указатель HEAD %s)"
 
-#: builtin/worktree.c:552
 msgid "checkout <branch> even if already checked out in other worktree"
-msgstr "переключиться на <ветка> даже если она уже активна в другом рабочесм каталоге"
+msgstr ""
+"переключиться на <ветка> даже если она уже активна в другом рабочесм каталоге"
 
-#: builtin/worktree.c:555
 msgid "create a new branch"
 msgstr "создать новую ветку"
 
-#: builtin/worktree.c:557
 msgid "create or reset a branch"
 msgstr "создать или перейти на ветку"
 
-#: builtin/worktree.c:559
 msgid "populate the new working tree"
 msgstr "наполнить новый рабочий каталог"
 
-#: builtin/worktree.c:560
 msgid "keep the new working tree locked"
 msgstr "держать рабочий каталог заблокированным"
 
-#: builtin/worktree.c:563
+msgid "reason for locking"
+msgstr "причина блокировки"
+
 msgid "set up tracking mode (see git-branch(1))"
 msgstr "настроить режим отслеживания ветки (смотрите git-branch(1))"
 
-#: builtin/worktree.c:566
 msgid "try to match the new branch name with a remote-tracking branch"
 msgstr "пытаться найти соответствие имени новой ветки с именем внешней ветки"
 
-#: builtin/worktree.c:574
-msgid "-b, -B, and --detach are mutually exclusive"
-msgstr "-b, -B и --detach нельзя использовать одновременно"
+#, c-format
+msgid "options '%s', '%s', and '%s' cannot be used together"
+msgstr ""
+
+msgid "added with --lock"
+msgstr ""
 
-#: builtin/worktree.c:635
 msgid "--[no-]track can only be used if a new branch is created"
 msgstr "--[no-]track можно использовать только когда вы создаёте новую ветку"
 
-#: builtin/worktree.c:758
-msgid "reason for locking"
-msgstr "причина блокировки"
+msgid "show extended annotations and reasons, if available"
+msgstr ""
+
+msgid "add 'prunable' annotation to worktrees older than <time>"
+msgstr ""
+
+msgid "terminate records with a NUL character"
+msgstr ""
 
-#: builtin/worktree.c:770 builtin/worktree.c:803 builtin/worktree.c:877
-#: builtin/worktree.c:1001
 #, c-format
 msgid "'%s' is not a working tree"
 msgstr "«%s» не является рабочим каталогом"
 
-#: builtin/worktree.c:772 builtin/worktree.c:805
 msgid "The main working tree cannot be locked or unlocked"
 msgstr "Главный рабочий каталог не может быть заблокирован или разблокирован"
 
-#: builtin/worktree.c:777
 #, c-format
 msgid "'%s' is already locked, reason: %s"
 msgstr "«%s» уже заблокирован, причина: %s"
 
-#: builtin/worktree.c:779
 #, c-format
 msgid "'%s' is already locked"
 msgstr "«%s» уже заблокирован"
 
-#: builtin/worktree.c:807
 #, c-format
 msgid "'%s' is not locked"
 msgstr "«%s» не заблокирован"
 
-#: builtin/worktree.c:848
 msgid "working trees containing submodules cannot be moved or removed"
 msgstr ""
 
-#: builtin/worktree.c:856
 msgid "force move even if worktree is dirty or locked"
 msgstr ""
 
-#: builtin/worktree.c:879 builtin/worktree.c:1003
 #, c-format
 msgid "'%s' is a main working tree"
 msgstr ""
 
-#: builtin/worktree.c:884
 #, c-format
 msgid "could not figure out destination name from '%s'"
 msgstr ""
 
-#: builtin/worktree.c:897
 #, 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:899
 msgid ""
 "cannot move a locked working tree;\n"
 "use 'move -f -f' to override or unlock first"
 msgstr ""
 
-#: builtin/worktree.c:902
 #, c-format
 msgid "validation failed, cannot move working tree: %s"
 msgstr ""
 
-#: builtin/worktree.c:907
 #, c-format
 msgid "failed to move '%s' to '%s'"
 msgstr ""
 
-#: builtin/worktree.c:953
 #, c-format
 msgid "failed to run 'git status' on '%s'"
 msgstr ""
 
-#: builtin/worktree.c:957
 #, c-format
 msgid "'%s' contains modified or untracked files, use --force to delete it"
 msgstr ""
 
-#: builtin/worktree.c:962
 #, c-format
 msgid "failed to run 'git status' on '%s', code %d"
 msgstr ""
 
-#: builtin/worktree.c:985
 msgid "force removal even if worktree is dirty or locked"
 msgstr ""
 
-#: builtin/worktree.c:1008
 #, 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:1010
 msgid ""
 "cannot remove a locked working tree;\n"
 "use 'remove -f -f' to override or unlock first"
 msgstr ""
 
-#: builtin/worktree.c:1013
 #, c-format
 msgid "validation failed, cannot remove working tree: %s"
 msgstr ""
 
-#: builtin/worktree.c:1037
 #, c-format
 msgid "repair: %s: %s"
 msgstr ""
 
-#: builtin/worktree.c:1040
 #, c-format
 msgid "error: %s: %s"
 msgstr ""
 
-#: builtin/write-tree.c:15
 msgid "git write-tree [--missing-ok] [--prefix=<prefix>/]"
 msgstr "git write-tree [--missing-ok] [--prefix=<префикс>/]"
 
-#: builtin/write-tree.c:28
 msgid "<prefix>/"
 msgstr "<префикс>/"
 
-#: builtin/write-tree.c:29
 msgid "write tree object for a subdirectory <prefix>"
 msgstr "вывести объект дерева для подкаталога с <префикс>"
 
-#: builtin/write-tree.c:31
 msgid "only useful for debugging"
 msgstr "используется только при отладке"
 
-#: http-fetch.c:114
-#, c-format
-msgid "argument to --packfile must be a valid hash (got '%s')"
-msgstr ""
-
-#: http-fetch.c:122
-msgid "not a git repository"
-msgstr ""
-
-#: t/helper/test-fast-rebase.c:141
-msgid "unhandled options"
-msgstr ""
-
-#: t/helper/test-fast-rebase.c:146
-msgid "error preparing revisions"
-msgstr ""
-
-#: t/helper/test-reach.c:154
-#, c-format
-msgid "commit %s is not marked reachable"
-msgstr ""
-
-#: t/helper/test-reach.c:164
-msgid "too many commits marked reachable"
-msgstr ""
-
-#: t/helper/test-serve-v2.c:7
-msgid "test-tool serve-v2 [<options>]"
-msgstr ""
-
-#: t/helper/test-serve-v2.c:19
-msgid "exit immediately after advertising capabilities"
-msgstr ""
-
-#: git.c:28
-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"
-"           [--git-dir=<path>] [--work-tree=<path>] [--namespace=<name>]\n"
-"           <command> [<args>]"
-msgstr "git [--version] [--help] [-C <путь>] [-c <имя>=<значение>]\n           [--exec-path[=<путь>]] [--html-path] [--man-path] [--info-path]\n           [-p | --paginate | -P | --no-pager] [--no-replace-objects] [--bare]\n           [--git-dir=<путь>] [--work-tree=<путь>] [--namespace=<имя>]\n           <команда> [<аргументы>]"
-
-#: git.c:35
-msgid ""
-"'git help -a' and 'git help -g' list available subcommands and some\n"
-"concept guides. See 'git help <command>' or 'git help <concept>'\n"
-"to read about a specific subcommand or concept.\n"
-"See 'git help git' for an overview of the system."
-msgstr ""
-
-#: git.c:187
-#, c-format
-msgid "no directory given for --git-dir\n"
-msgstr ""
-
-#: git.c:201
-#, c-format
-msgid "no namespace given for --namespace\n"
-msgstr ""
-
-#: git.c:215
-#, c-format
-msgid "no directory given for --work-tree\n"
-msgstr ""
-
-#: git.c:229
-#, c-format
-msgid "no prefix given for --super-prefix\n"
-msgstr ""
-
-#: git.c:251
-#, c-format
-msgid "-c expects a configuration string\n"
-msgstr ""
-
-#: git.c:289
-#, c-format
-msgid "no directory given for -C\n"
-msgstr ""
-
-#: git.c:315
 #, c-format
-msgid "unknown option: %s\n"
-msgstr ""
-
-#: git.c:364
-#, c-format
-msgid "while expanding alias '%s': '%s'"
-msgstr ""
-
-#: git.c:373
-#, c-format
-msgid ""
-"alias '%s' changes environment variables.\n"
-"You can use '!git' in the alias to do this"
-msgstr ""
-
-#: git.c:380
-#, c-format
-msgid "empty alias for %s"
-msgstr ""
-
-#: git.c:383
-#, c-format
-msgid "recursive alias: %s"
-msgstr ""
-
-#: git.c:465
-msgid "write failure on standard output"
-msgstr ""
-
-#: git.c:467
-msgid "unknown write failure on standard output"
-msgstr ""
-
-#: git.c:469
-msgid "close failed on standard output"
-msgstr ""
-
-#: git.c:820
-#, c-format
-msgid "alias loop detected: expansion of '%s' does not terminate:%s"
-msgstr ""
-
-#: git.c:870
-#, c-format
-msgid "cannot handle %s as a builtin"
-msgstr ""
-
-#: git.c:883
-#, c-format
-msgid ""
-"usage: %s\n"
-"\n"
-msgstr ""
-
-#: git.c:903
-#, c-format
-msgid "expansion of alias '%s' failed; '%s' is not a git command\n"
-msgstr ""
-
-#: git.c:915
-#, c-format
-msgid "failed to run command '%s': %s\n"
-msgstr ""
-
-#: http.c:399
-#, c-format
-msgid "negative value for http.postbuffer; defaulting to %d"
-msgstr "отрицательное значение http.postbuffer; использую стандартное значение %d"
-
-#: http.c:420
-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 "Public key pinning не поддерживается с cURL < 7.44.0"
-
-#: http.c:910
-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"
+msgid "unrecognized bundle hash algorithm: %s"
 msgstr ""
 
-#: http.c:1132
 #, c-format
-msgid "Unsupported SSL backend '%s'. Supported SSL backends:"
+msgid "unknown capability '%s'"
 msgstr ""
 
-#: http.c:1139
 #, c-format
-msgid "Could not set SSL backend to '%s': cURL was built without SSL backends"
+msgid "'%s' does not look like a v2 or v3 bundle file"
 msgstr ""
 
-#: http.c:1143
 #, c-format
-msgid "Could not set SSL backend to '%s': already set"
-msgstr ""
+msgid "unrecognized header: %s%s (%d)"
+msgstr "неопознанный заголовок: %s%s (%d)"
 
-#: http.c:2025
-#, c-format
-msgid ""
-"unable to update url base from redirection:\n"
-"  asked for: %s\n"
-"   redirect: %s"
-msgstr "не удалось обновить базовый url из переадресации:\n  запрошено: %s\n   переадресовано: %s"
+msgid "Repository lacks these prerequisite commits:"
+msgstr "В репозитории отсутствуют необходимые коммиты:"
 
-#: remote-curl.c:183
-#, c-format
-msgid "invalid quoting in push-option value: '%s'"
+msgid "need a repository to verify a bundle"
 msgstr ""
 
-#: remote-curl.c:307
 #, c-format
-msgid "%sinfo/refs not valid: is this a git repository?"
-msgstr ""
+msgid "The bundle contains this ref:"
+msgid_plural "The bundle contains these %<PRIuMAX> refs:"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+msgstr[3] ""
 
-#: remote-curl.c:408
-msgid "invalid server response; expected service, got flush packet"
-msgstr ""
+msgid "The bundle records a complete history."
+msgstr "Пакет содержит полную историю."
 
-#: remote-curl.c:439
 #, c-format
-msgid "invalid server response; got '%s'"
-msgstr ""
+msgid "The bundle requires this ref:"
+msgid_plural "The bundle requires these %<PRIuMAX> refs:"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+msgstr[3] ""
 
-#: remote-curl.c:499
-#, c-format
-msgid "repository '%s' not found"
-msgstr ""
+msgid "unable to dup bundle descriptor"
+msgstr "не удалось дублировать дескриптор пакета"
 
-#: remote-curl.c:503
-#, c-format
-msgid "Authentication failed for '%s'"
-msgstr ""
+msgid "Could not spawn pack-objects"
+msgstr "Не удалось создать объекты пакета"
 
-#: remote-curl.c:507
-#, c-format
-msgid "unable to access '%s': %s"
-msgstr "«%s» недоступно: %s"
+msgid "pack-objects died"
+msgstr "критическая ошибка pack-objects"
 
-#: remote-curl.c:513
 #, c-format
-msgid "redirecting to %s"
-msgstr "переадресация на %s"
-
-#: remote-curl.c:642
-msgid "shouldn't have EOF when not gentle on EOF"
-msgstr ""
-
-#: remote-curl.c:654
-msgid "remote server sent stateless separator"
-msgstr ""
-
-#: remote-curl.c:724
-msgid "unable to rewind rpc post data - try increasing http.postBuffer"
-msgstr ""
+msgid "ref '%s' is excluded by the rev-list options"
+msgstr "ссылка «%s» исключена в соответствии с опциями rev-list"
 
-#: remote-curl.c:754
 #, c-format
-msgid "remote-curl: bad line length character: %.4s"
-msgstr ""
-
-#: remote-curl.c:756
-msgid "remote-curl: unexpected response end packet"
+msgid "unsupported bundle version %d"
 msgstr ""
 
-#: remote-curl.c:832
 #, c-format
-msgid "RPC failed; %s"
+msgid "cannot write bundle version %d with algorithm %s"
 msgstr ""
 
-#: remote-curl.c:872
-msgid "cannot handle pushes this big"
-msgstr ""
+msgid "Refusing to create empty bundle."
+msgstr "Отклонение создания пустого пакета."
 
-#: remote-curl.c:987
 #, c-format
-msgid "cannot deflate request; zlib deflate error %d"
-msgstr ""
+msgid "cannot create '%s'"
+msgstr "не удалось создать «%s»"
 
-#: remote-curl.c:991
-#, c-format
-msgid "cannot deflate request; zlib end error %d"
-msgstr ""
+msgid "index-pack died"
+msgstr "критическая ошибка index-pack"
 
-#: remote-curl.c:1041
-#, c-format
-msgid "%d bytes of length header were received"
+msgid "terminating chunk id appears earlier than expected"
 msgstr ""
 
-#: remote-curl.c:1043
 #, c-format
-msgid "%d bytes of body are still expected"
+msgid "improper chunk offset(s) %<PRIx64> and %<PRIx64>"
 msgstr ""
 
-#: remote-curl.c:1132
-msgid "dumb http transport does not support shallow capabilities"
-msgstr ""
-
-#: remote-curl.c:1147
-msgid "fetch failed."
-msgstr ""
-
-#: remote-curl.c:1193
-msgid "cannot fetch by sha1 over smart http"
-msgstr ""
-
-#: remote-curl.c:1237 remote-curl.c:1243
 #, c-format
-msgid "protocol error: expected sha/ref, got '%s'"
+msgid "duplicate chunk ID %<PRIx32> found"
 msgstr ""
 
-#: remote-curl.c:1255 remote-curl.c:1373
 #, c-format
-msgid "http transport does not support %s"
-msgstr ""
-
-#: remote-curl.c:1291
-msgid "git-http-push failed"
-msgstr ""
-
-#: remote-curl.c:1479
-msgid "remote-curl: usage: git remote-curl <remote> [<url>]"
-msgstr ""
-
-#: remote-curl.c:1511
-msgid "remote-curl: error reading command stream from git"
+msgid "final chunk has non-zero id %<PRIx32>"
 msgstr ""
 
-#: remote-curl.c:1518
-msgid "remote-curl: fetch attempted without a local repo"
+msgid "invalid hash version"
 msgstr ""
 
-#: remote-curl.c:1559
 #, c-format
-msgid "remote-curl: unknown command '%s' from git"
-msgstr ""
-
-#: compat/compiler.h:26
-msgid "no compiler information available\n"
-msgstr ""
-
-#: compat/compiler.h:38
-msgid "no libc information available\n"
-msgstr ""
-
-#: list-objects-filter-options.h:91
-msgid "args"
-msgstr "аргументы"
-
-#: list-objects-filter-options.h:92
-msgid "object filtering"
-msgstr "фильтрация объектов"
-
-#: parse-options.h:183
-msgid "expiry-date"
-msgstr "дата-окончания"
-
-#: parse-options.h:197
-msgid "no-op (backward compatibility)"
-msgstr "ничего не делает (оставлено для обратной совместимости)"
-
-#: parse-options.h:309
-msgid "be more verbose"
-msgstr "быть многословнее"
-
-#: parse-options.h:311
-msgid "be more quiet"
-msgstr "тихий режим"
-
-#: parse-options.h:317
-msgid "use <n> digits to display object names"
-msgstr ""
-
-#: parse-options.h:336
-msgid "how to strip spaces and #comments from message"
-msgstr "как удалять пробелы и #комментарии из сообщения коммита"
-
-#: parse-options.h:337
-msgid "read pathspec from file"
-msgstr ""
-
-#: parse-options.h:338
-msgid ""
-"with --pathspec-from-file, pathspec elements are separated with NUL "
-"character"
-msgstr ""
-
-#: ref-filter.h:96
-msgid "key"
-msgstr "ключ"
-
-#: ref-filter.h:96
-msgid "field name to sort on"
-msgstr "имя поля, по которому выполнить сортировку"
-
-#: rerere.h:44
-msgid "update the index with reused conflict resolution if possible"
-msgstr "обновить индекс с помощью переиспользования разрешения конфликта, если возможно"
-
-#: wt-status.h:80
-msgid "HEAD detached at "
-msgstr "HEAD отделён на "
-
-#: wt-status.h:81
-msgid "HEAD detached from "
-msgstr "HEAD отделён начиная с "
+msgid "invalid color value: %.*s"
+msgstr "недопустимое значение цвета: %.*s"
 
-#: command-list.h:50
 msgid "Add file contents to the index"
 msgstr "Добавление содержимого файла в индекс"
 
-#: command-list.h:51
 msgid "Apply a series of patches from a mailbox"
 msgstr "Применение серии патчей из почтового сообщения"
 
-#: command-list.h:52
 msgid "Annotate file lines with commit information"
 msgstr "Аннотирование строк файла информацией о коммитах"
 
-#: command-list.h:53
 msgid "Apply a patch to files and/or to the index"
 msgstr "Применение патча к файлам и/или индексу"
 
-#: command-list.h:54
 msgid "Import a GNU Arch repository into Git"
 msgstr "Импортирование GNU Arch репозитория в Git"
 
-#: command-list.h:55
 msgid "Create an archive of files from a named tree"
 msgstr "Создание архива файлов из указанного дерева"
 
-#: command-list.h:56
 msgid "Use binary search to find the commit that introduced a bug"
 msgstr "Выполнение двоичного поиска коммита, который вносит ошибку"
 
-#: command-list.h:57
 msgid "Show what revision and author last modified each line of a file"
 msgstr "Показ редакции и автора последнего изменившего каждую строку файла"
 
-#: command-list.h:58
 msgid "List, create, or delete branches"
 msgstr "Вывод списка, создание или удаление веток"
 
-#: command-list.h:59
 msgid "Collect information for user to file a bug report"
 msgstr ""
 
-#: command-list.h:60
 msgid "Move objects and refs by archive"
 msgstr "Перемещение объектов и ссылок по архиву"
 
-#: command-list.h:61
 msgid "Provide content or type and size information for repository objects"
-msgstr "Вывод содержимого или типа и информации о размере для объектов репозитория"
+msgstr ""
+"Вывод содержимого или типа и информации о размере для объектов репозитория"
 
-#: command-list.h:62
 msgid "Display gitattributes information"
 msgstr "Вывод информации из gitattributes"
 
-#: command-list.h:63
 msgid "Debug gitignore / exclude files"
 msgstr "Отладка файлов gitignore / exclude"
 
-#: command-list.h:64
 msgid "Show canonical names and email addresses of contacts"
 msgstr "Вывод каноничных имён и адресов электронной почты контактов"
 
-#: command-list.h:65
+msgid "Ensures that a reference name is well formed"
+msgstr "Удостовериться, что имя ссылки правильно сформировано"
+
 msgid "Switch branches or restore working tree files"
 msgstr "Переключение веток или восстановление файлов в рабочем каталоге"
 
-#: command-list.h:66
 msgid "Copy files from the index to the working tree"
 msgstr "Копирование файлов из индекса в рабочий каталог"
 
-#: command-list.h:67
-msgid "Ensures that a reference name is well formed"
-msgstr "Удостовериться, что имя ссылки правильно сформировано"
-
-#: command-list.h:68
 msgid "Find commits yet to be applied to upstream"
 msgstr "Поиск коммитов которые еще не применены вышестоящим репозиторием"
 
-#: command-list.h:69
 msgid "Apply the changes introduced by some existing commits"
 msgstr "Применение изменений, сделанных в каком-то существующем коммите"
 
-#: command-list.h:70
 msgid "Graphical alternative to git-commit"
 msgstr "Графическая альтернатива для git-commit"
 
-#: command-list.h:71
 msgid "Remove untracked files from the working tree"
 msgstr "Удаление неотслеживаемых файлов из рабочего каталога"
 
-#: command-list.h:72
 msgid "Clone a repository into a new directory"
 msgstr "Клонирование репозитория в новый каталог"
 
-#: command-list.h:73
 msgid "Display data in columns"
 msgstr "Вывод данных по колонкам"
 
-#: command-list.h:74
 msgid "Record changes to the repository"
 msgstr "Запись изменений в репозиторий"
 
-#: command-list.h:75
 msgid "Write and verify Git commit-graph files"
 msgstr "Запись и проверка commit-graph файлов Git"
 
-#: command-list.h:76
 msgid "Create a new commit object"
 msgstr "Создание нового объекта коммита"
 
-#: command-list.h:77
 msgid "Get and set repository or global options"
 msgstr "Получение и установка глобальных опций или опций репозитория"
 
-#: command-list.h:78
 msgid "Count unpacked number of objects and their disk consumption"
 msgstr "Подсчет количества неупакованных объектов и их потребления диска"
 
-#: command-list.h:79
 msgid "Retrieve and store user credentials"
 msgstr "Получение и сохранение учетных записей пользователя"
 
-#: command-list.h:80
 msgid "Helper to temporarily store passwords in memory"
 msgstr "Помощник для временного хранения паролей в памяти"
 
-#: command-list.h:81
 msgid "Helper to store credentials on disk"
 msgstr "Помощник для хранения учетных записей на диске"
 
-#: command-list.h:82
 msgid "Export a single commit to a CVS checkout"
 msgstr "Экспорт единственного коммита в виде рабочей копии CVS"
 
-#: command-list.h:83
 msgid "Salvage your data out of another SCM people love to hate"
 msgstr "Спасение ваших данных из другой СКВ которую люди любят ненавидеть"
 
-#: command-list.h:84
 msgid "A CVS server emulator for Git"
 msgstr "Эмулятор сервера CVS для Git"
 
-#: command-list.h:85
 msgid "A really simple server for Git repositories"
 msgstr "Очень простой сервер для Git репозиториев"
 
-#: command-list.h:86
 msgid "Give an object a human readable name based on an available ref"
 msgstr "Присвоение объекту удобочитаемое имя на основе доступной ссылки"
 
-#: command-list.h:87
 msgid "Show changes between commits, commit and working tree, etc"
 msgstr "Вывод разницы между коммитами, коммитом и рабочим каталогом и т.д."
 
-#: command-list.h:88
 msgid "Compares files in the working tree and the index"
 msgstr "Сравнение седержимого файлов в рабочем каталоге с файлами в индексе"
 
-#: command-list.h:89
 msgid "Compare a tree to the working tree or index"
 msgstr "Сравнение дерева файлов с рабочим каталогом или индексом"
 
-#: command-list.h:90
 msgid "Compares the content and mode of blobs found via two tree objects"
-msgstr "Сравнение содержимого и режима двоичных объектов, найденных по двум объектам дерева"
+msgstr ""
+"Сравнение содержимого и режима двоичных объектов, найденных по двум объектам "
+"дерева"
 
-#: command-list.h:91
 msgid "Show changes using common diff tools"
 msgstr "Показ изменений с помощью распространенных утилит сравнения"
 
-#: command-list.h:92
 msgid "Git data exporter"
 msgstr "Экспорт данных Git"
 
-#: command-list.h:93
 msgid "Backend for fast Git data importers"
 msgstr "Внутренний интерфейс для быстрого импорта данных Git"
 
-#: command-list.h:94
 msgid "Download objects and refs from another repository"
 msgstr "Загрузка объектов и ссылок из другого репозитория"
 
-#: command-list.h:95
 msgid "Receive missing objects from another repository"
 msgstr "Получение недостающих объектов из другого репозитория"
 
-#: command-list.h:96
 msgid "Rewrite branches"
 msgstr "Перезапись веток"
 
-#: command-list.h:97
 msgid "Produce a merge commit message"
 msgstr "Создание сообщения коммита для слияния"
 
-#: command-list.h:98
 msgid "Output information on each ref"
 msgstr "Вывод информации о каждой ссылке"
 
-#: command-list.h:99
 msgid "Run a Git command on a list of repositories"
 msgstr ""
 
-#: command-list.h:100
 msgid "Prepare patches for e-mail submission"
 msgstr "Подготовка патчей для отправки по электронной почте"
 
-#: command-list.h:101
 msgid "Verifies the connectivity and validity of the objects in the database"
 msgstr "Проверка связности и валидности объектов в базе данных"
 
-#: command-list.h:102
 msgid "Cleanup unnecessary files and optimize the local repository"
 msgstr "Очистка ненужных файлов и оптимизация локального репозитория"
 
-#: command-list.h:103
 msgid "Extract commit ID from an archive created using git-archive"
-msgstr "Извлечение идентификатора коммита из архива, созданного с помощью git-archive"
+msgstr ""
+"Извлечение идентификатора коммита из архива, созданного с помощью git-archive"
 
-#: command-list.h:104
 msgid "Print lines matching a pattern"
 msgstr "Вывод строк, соответствующих шаблону"
 
-#: command-list.h:105
 msgid "A portable graphical interface to Git"
 msgstr "Портативный графический интерфейс для Git"
 
-#: command-list.h:106
 msgid "Compute object ID and optionally creates a blob from a file"
-msgstr "Вычисление идентификатора объекта и возможное создание двоичного объекта из файла"
+msgstr ""
+"Вычисление идентификатора объекта и возможное создание двоичного объекта из "
+"файла"
 
-#: command-list.h:107
 msgid "Display help information about Git"
 msgstr "Отображение справочной информации о Git"
 
-#: command-list.h:108
+msgid "Run git hooks"
+msgstr ""
+
 msgid "Server side implementation of Git over HTTP"
 msgstr "Серверная реализация протокола Git над HTTP"
 
-#: command-list.h:109
 msgid "Download from a remote Git repository via HTTP"
 msgstr "Загрузка из внешнего репозитория Git с помощью HTTP"
 
-#: command-list.h:110
 msgid "Push objects over HTTP/DAV to another repository"
 msgstr "Отправка объектов в другой репозиторий с помощью HTTP/DAV"
 
-#: command-list.h:111
 msgid "Send a collection of patches from stdin to an IMAP folder"
 msgstr "Отправка коллекции патчей из стандартного ввода в папку IMAP"
 
-#: command-list.h:112
 msgid "Build pack index file for an existing packed archive"
 msgstr "Построение файла индекса для существующего упакованного архива"
 
-#: command-list.h:113
 msgid "Create an empty Git repository or reinitialize an existing one"
 msgstr "Создание пустого репозитория Git или переинициализация существующего"
 
-#: command-list.h:114
 msgid "Instantly browse your working repository in gitweb"
 msgstr "Мгновенный просмотр вашего рабочего репозитория в gitweb"
 
-#: command-list.h:115
 msgid "Add or parse structured information in commit messages"
-msgstr "Добавление или разбор структурированной информации в сообщениях коммита"
-
-#: command-list.h:116
-msgid "The Git repository browser"
-msgstr "Браузер репозитория Git"
+msgstr ""
+"Добавление или разбор структурированной информации в сообщениях коммита"
 
-#: command-list.h:117
 msgid "Show commit logs"
 msgstr "Вывод истории коммитов"
 
-#: command-list.h:118
 msgid "Show information about files in the index and the working tree"
 msgstr "Вывод информации о файлах в индексе и в рабочем каталоге"
 
-#: command-list.h:119
 msgid "List references in a remote repository"
 msgstr "Вывод списка ссылок во внешнем репозитории"
 
-#: command-list.h:120
 msgid "List the contents of a tree object"
 msgstr "Вывод содержимого объекта дерева"
 
-#: command-list.h:121
 msgid "Extracts patch and authorship from a single e-mail message"
 msgstr "Извлекает патч и авторство из одного сообщения электронной почты"
 
-#: command-list.h:122
 msgid "Simple UNIX mbox splitter program"
 msgstr "Простая программа UNIX для разбора файла mbox"
 
-#: command-list.h:123
 msgid "Run tasks to optimize Git repository data"
 msgstr ""
 
-#: command-list.h:124
 msgid "Join two or more development histories together"
 msgstr "Объединение одной или нескольких историй разработки вместе"
 
-#: command-list.h:125
 msgid "Find as good common ancestors as possible for a merge"
 msgstr "Поиск подходящих общих предков для возможного слияния"
 
-#: command-list.h:126
 msgid "Run a three-way file merge"
 msgstr "Запуск трёхходового слияния файлов"
 
-#: command-list.h:127
 msgid "Run a merge for files needing merging"
 msgstr "Запуск слияния для файлов, которые требуют слияния"
 
-#: command-list.h:128
 msgid "The standard helper program to use with git-merge-index"
-msgstr "Стандартная программа-помощник для использования совместно с git-merge-index"
-
-#: command-list.h:129
-msgid "Run merge conflict resolution tools to resolve merge conflicts"
-msgstr "Запуск инструментов разрешения конфликтов слияния"
+msgstr ""
+"Стандартная программа-помощник для использования совместно с git-merge-index"
 
-#: command-list.h:130
 msgid "Show three-way merge without touching index"
 msgstr "Вывод трёхходового слияние без затрагивания индекса"
 
-#: command-list.h:131
-msgid "Write and verify multi-pack-indexes"
-msgstr "Запись и проверка файлов multi-pack-index"
+msgid "Run merge conflict resolution tools to resolve merge conflicts"
+msgstr "Запуск инструментов разрешения конфликтов слияния"
 
-#: command-list.h:132
-msgid "Creates a tag object"
-msgstr "Создание объектов меток"
+msgid "Creates a tag object with extra validation"
+msgstr ""
 
-#: command-list.h:133
 msgid "Build a tree-object from ls-tree formatted text"
 msgstr "Построение объекта дерева из текста формата ls-tree"
 
-#: command-list.h:134
+msgid "Write and verify multi-pack-indexes"
+msgstr "Запись и проверка файлов multi-pack-index"
+
 msgid "Move or rename a file, a directory, or a symlink"
 msgstr "Перемещение или переименование файла, каталога или символьной ссылки"
 
-#: command-list.h:135
 msgid "Find symbolic names for given revs"
 msgstr "Поиск символьных имён для указанных редакций"
 
-#: command-list.h:136
 msgid "Add or inspect object notes"
 msgstr "Добавление или просмотр заметок объекта"
 
-#: command-list.h:137
 msgid "Import from and submit to Perforce repositories"
 msgstr "Импорт и отправка в репозитории Perforce"
 
-#: command-list.h:138
 msgid "Create a packed archive of objects"
 msgstr "Создание упакованного архива объектов"
 
-#: command-list.h:139
 msgid "Find redundant pack files"
 msgstr "Поиск избыточных файлов пакетов"
 
-#: command-list.h:140
 msgid "Pack heads and tags for efficient repository access"
-msgstr "Упаковка указателей на ветки и меток для эффективного доступа к репозиторию"
+msgstr ""
+"Упаковка указателей на ветки и меток для эффективного доступа к репозиторию"
 
-#: command-list.h:141
 msgid "Compute unique ID for a patch"
 msgstr "Вычисление уникального идентификатора для патча"
 
-#: command-list.h:142
 msgid "Prune all unreachable objects from the object database"
 msgstr "Очистка всех недостижимых объектов из базы данных объектов"
 
-#: command-list.h:143
 msgid "Remove extra objects that are already in pack files"
-msgstr "Удаление дополнительных объектов, которые уже содержатся в файлах пакетов"
+msgstr ""
+"Удаление дополнительных объектов, которые уже содержатся в файлах пакетов"
 
-#: command-list.h:144
 msgid "Fetch from and integrate with another repository or a local branch"
-msgstr "Извлечение изменений и объединение с другим репозиторием или локальной веткой"
+msgstr ""
+"Извлечение изменений и объединение с другим репозиторием или локальной веткой"
 
-#: command-list.h:145
 msgid "Update remote refs along with associated objects"
 msgstr "Обновление внешних ссылок и связанных объектов"
 
-#: command-list.h:146
 msgid "Applies a quilt patchset onto the current branch"
 msgstr "Применение упорядоченного списка патчей над текущей веткой"
 
-#: command-list.h:147
 msgid "Compare two commit ranges (e.g. two versions of a branch)"
 msgstr "Сравнение двух диапазонов коммитов (например двух версий ветки)"
 
-#: command-list.h:148
 msgid "Reads tree information into the index"
 msgstr "Чтение информации о дереве в индекс"
 
-#: command-list.h:149
 msgid "Reapply commits on top of another base tip"
 msgstr "Повторное применение коммитов над верхушкой другой ветки"
 
-#: command-list.h:150
 msgid "Receive what is pushed into the repository"
 msgstr "Получение того, что было отправлено в репозиторий"
 
-#: command-list.h:151
 msgid "Manage reflog information"
 msgstr "Управление информацией журнала ссылок"
 
-#: command-list.h:152
 msgid "Manage set of tracked repositories"
 msgstr "Управление набором отслеживаемых репозиториев"
 
-#: command-list.h:153
 msgid "Pack unpacked objects in a repository"
 msgstr "Упаковка неупакованных объектов в репозитории"
 
-#: command-list.h:154
 msgid "Create, list, delete refs to replace objects"
 msgstr "Создание, вывод списка, удаление ссылок для замены объектов"
 
-#: command-list.h:155
 msgid "Generates a summary of pending changes"
 msgstr "Генерация сводки предстоящих изменений"
 
-#: command-list.h:156
 msgid "Reuse recorded resolution of conflicted merges"
 msgstr "Повторное использование записанных разрешений конфликтов при слияниях"
 
-#: command-list.h:157
 msgid "Reset current HEAD to the specified state"
 msgstr "Сброс текущего состояния HEAD на указанное состояние"
 
-#: command-list.h:158
 msgid "Restore working tree files"
-msgstr ""
-
-#: command-list.h:159
-msgid "Revert some existing commits"
-msgstr "Обращение изменений существующих коммитов"
+msgstr "Восстановление файлов в рабочем каталоге"
 
-#: command-list.h:160
 msgid "Lists commit objects in reverse chronological order"
 msgstr "Вывод списка объектов коммита в обратном хронологическом порядке"
 
-#: command-list.h:161
 msgid "Pick out and massage parameters"
 msgstr "Разбор и обработка параметров"
 
-#: command-list.h:162
+msgid "Revert some existing commits"
+msgstr "Обращение изменений существующих коммитов"
+
 msgid "Remove files from the working tree and from the index"
 msgstr "Удаление файлов из рабочего каталога и индекса"
 
-#: command-list.h:163
 msgid "Send a collection of patches as emails"
 msgstr "Отправка коллекции патчей на электронную почту"
 
-#: command-list.h:164
 msgid "Push objects over Git protocol to another repository"
 msgstr "Отправка объектов в другой репозиторий с помощью протокола Git"
 
-#: command-list.h:165
+msgid "Git's i18n setup code for shell scripts"
+msgstr "Код настройки интернационализации для сценариев оболочки Git"
+
+msgid "Common Git shell script setup code"
+msgstr "Общий код настройки для сценариев оболочки Git"
+
 msgid "Restricted login shell for Git-only SSH access"
 msgstr "Ограниченная оболочка входа в систему для доступа Git через SSH"
 
-#: command-list.h:166
 msgid "Summarize 'git log' output"
 msgstr "Обобщение вывода «git log»"
 
-#: command-list.h:167
 msgid "Show various types of objects"
 msgstr "Вывод различных типов объектов"
 
-#: command-list.h:168
 msgid "Show branches and their commits"
 msgstr "Вывод веток и их коммитов"
 
-#: command-list.h:169
 msgid "Show packed archive index"
 msgstr "Вывод индекса упакованного архива"
 
-#: command-list.h:170
 msgid "List references in a local repository"
 msgstr "Вывод ссылок в локальном репозитории"
 
-#: command-list.h:171
-msgid "Git's i18n setup code for shell scripts"
-msgstr "Код настройки интернационализации для сценариев оболочки Git"
-
-#: command-list.h:172
-msgid "Common Git shell script setup code"
-msgstr "Общий код настройки для сценариев оболочки Git"
-
-#: command-list.h:173
-msgid "Initialize and modify the sparse-checkout"
+msgid "Reduce your working tree to a subset of tracked files"
 msgstr ""
 
-#: command-list.h:174
-msgid "Stash the changes in a dirty working directory away"
-msgstr "Спрятать изменения в изменённом рабочем каталоге"
-
-#: command-list.h:175
 msgid "Add file contents to the staging area"
 msgstr "Добавление содержимого файлов в индекс"
 
-#: command-list.h:176
+msgid "Stash the changes in a dirty working directory away"
+msgstr "Спрятать изменения в изменённом рабочем каталоге"
+
 msgid "Show the working tree status"
 msgstr "Вывод состояния рабочего каталога"
 
-#: command-list.h:177
 msgid "Remove unnecessary whitespace"
 msgstr "Удаление ненужных пробелов"
 
-#: command-list.h:178
 msgid "Initialize, update or inspect submodules"
 msgstr "Инициализация, обновление или просмотр подмодулей"
 
-#: command-list.h:179
 msgid "Bidirectional operation between a Subversion repository and Git"
 msgstr "Двухсторонние операции между репозиториями Subversion и Git"
 
-#: command-list.h:180
 msgid "Switch branches"
-msgstr ""
+msgstr "Переключение веток"
 
-#: command-list.h:181
 msgid "Read, modify and delete symbolic refs"
 msgstr "Чтение, изменение и удаление символических ссылок"
 
-#: command-list.h:182
 msgid "Create, list, delete or verify a tag object signed with GPG"
-msgstr "Создание, вывод списка, удаление или проверка метки, подписанной с помощью GPG"
+msgstr ""
+"Создание, вывод списка, удаление или проверка метки, подписанной с помощью "
+"GPG"
 
-#: command-list.h:183
 msgid "Creates a temporary file with a blob's contents"
 msgstr "Создание временного файла с содержимым двоичного объекта"
 
-#: command-list.h:184
 msgid "Unpack objects from a packed archive"
 msgstr "Распаковка объектов из упакованного архива"
 
-#: command-list.h:185
 msgid "Register file contents in the working tree to the index"
 msgstr "Регистрация содержимого файла из рабочего каталога в индекс"
 
-#: command-list.h:186
 msgid "Update the object name stored in a ref safely"
 msgstr "Безопасное обновление имени объекта хранящегося в ссылке"
 
-#: command-list.h:187
 msgid "Update auxiliary info file to help dumb servers"
 msgstr "Обновление файла со вспомогательной информацией для глупых серверов"
 
-#: command-list.h:188
 msgid "Send archive back to git-archive"
 msgstr "Отправка архива обратно в git-archive"
 
-#: command-list.h:189
 msgid "Send objects packed back to git-fetch-pack"
 msgstr "Отправка упакованных объектов обратно в git-fetch-pack"
 
-#: command-list.h:190
 msgid "Show a Git logical variable"
 msgstr "Вывод логической переменной Git"
 
-#: command-list.h:191
 msgid "Check the GPG signature of commits"
 msgstr "Проверка подписи GPG коммитов"
 
-#: command-list.h:192
 msgid "Validate packed Git archive files"
 msgstr "Проверка файлов упакованных архивов Git"
 
-#: command-list.h:193
 msgid "Check the GPG signature of tags"
 msgstr "Проверка подписи GPG меток"
 
-#: command-list.h:194
-msgid "Git web interface (web frontend to Git repositories)"
-msgstr "Веб интерфейс Git (веб-интерфейс для Git репозиториев)"
-
-#: command-list.h:195
 msgid "Show logs with difference each commit introduces"
 msgstr "Вывод журнала с изменениями, которые вводил каждый из коммитов"
 
-#: command-list.h:196
 msgid "Manage multiple working trees"
 msgstr "Управление несколькими рабочими каталогами"
 
-#: command-list.h:197
 msgid "Create a tree object from the current index"
 msgstr "Создание объекта дерева из текущего индекса"
 
-#: command-list.h:198
 msgid "Defining attributes per path"
 msgstr "Определение атрибутов для путей файлов или каталогов"
 
-#: command-list.h:199
 msgid "Git command-line interface and conventions"
 msgstr "Интерфейс коммандной строки Git и соглашения"
 
-#: command-list.h:200
 msgid "A Git core tutorial for developers"
 msgstr "Учебник по ядру Git для разработчиков"
 
-#: command-list.h:201
 msgid "Providing usernames and passwords to Git"
 msgstr ""
 
-#: command-list.h:202
 msgid "Git for CVS users"
 msgstr "Git для пользователей CVS"
 
-#: command-list.h:203
 msgid "Tweaking diff output"
 msgstr "Подстройка вывода списка изменений"
 
-#: command-list.h:204
 msgid "A useful minimum set of commands for Everyday Git"
 msgstr "Полезный минимум команд для каждодневного использования Git"
 
-#: command-list.h:205
 msgid "Frequently asked questions about using Git"
 msgstr ""
 
-#: command-list.h:206
 msgid "A Git Glossary"
 msgstr "Глоссарий Git"
 
-#: command-list.h:207
 msgid "Hooks used by Git"
 msgstr "Перехватчики используемые Git"
 
-#: command-list.h:208
 msgid "Specifies intentionally untracked files to ignore"
 msgstr "Указание специально игнорируемых файлов"
 
-#: command-list.h:209
+msgid "The Git repository browser"
+msgstr "Браузер репозитория Git"
+
+msgid "Map author/committer names and/or E-Mail addresses"
+msgstr ""
+
 msgid "Defining submodule properties"
 msgstr "Определение свойств подмодулей"
 
-#: command-list.h:210
 msgid "Git namespaces"
 msgstr "Пространства имён Git"
 
-#: command-list.h:211
 msgid "Helper programs to interact with remote repositories"
 msgstr ""
 
-#: command-list.h:212
 msgid "Git Repository Layout"
 msgstr "Содержимое репозитория Git"
 
-#: command-list.h:213
 msgid "Specifying revisions and ranges for Git"
 msgstr "Указание редакций и диапазонов для Git"
 
-#: command-list.h:214
 msgid "Mounting one repository inside another"
 msgstr ""
 
-#: command-list.h:215
+msgid "A tutorial introduction to Git"
+msgstr "Обучающее введение в Git"
+
 msgid "A tutorial introduction to Git: part two"
 msgstr "Обучающее введение в Git: часть вторая"
 
-#: command-list.h:216
-msgid "A tutorial introduction to Git"
-msgstr "Обучающее введение в Git"
+msgid "Git web interface (web frontend to Git repositories)"
+msgstr "Веб интерфейс Git (веб-интерфейс для Git репозиториев)"
 
-#: command-list.h:217
 msgid "An overview of recommended workflows with Git"
 msgstr "Обзор рекомендуемых последовательностей выполняемых действий с Git"
 
-#: git-bisect.sh:48
-#, sh-format
-msgid "Bad rev input: $arg"
-msgstr "Плохой ввод номера редакции: $arg"
+msgid "commit-graph file is too small"
+msgstr "файл commit-graph слишком маленький"
 
-#: git-bisect.sh:82
-msgid "No logfile given"
-msgstr "Не передан файл журнала"
+#, c-format
+msgid "commit-graph signature %X does not match signature %X"
+msgstr "подпись commit-graph файла %X не соотвествует подписи %X"
 
-#: git-bisect.sh:83
-#, sh-format
-msgid "cannot read $file for replaying"
-msgstr "не удалось прочитать $file для повтора изменений"
+#, c-format
+msgid "commit-graph version %X does not match version %X"
+msgstr "версия commit-graph файла %X не соотвествует версии %X"
 
-#: git-bisect.sh:105
-msgid "?? what are you talking about?"
-msgstr "?? вы о чем?"
+#, c-format
+msgid "commit-graph hash version %X does not match version %X"
+msgstr "версия хэш-функции commit-graph файла %X не соответствует версии %X"
 
-#: git-bisect.sh:115
-msgid "bisect run failed: no command provided."
-msgstr "сбой при выполнении двоичного поиска: не передана команда."
+#, c-format
+msgid "commit-graph file is too small to hold %u chunks"
+msgstr ""
 
-#: git-bisect.sh:120
-#, sh-format
-msgid "running $command"
-msgstr "запускаю $command"
+msgid "commit-graph has no base graphs chunk"
+msgstr ""
 
-#: git-bisect.sh:127
-#, sh-format
+msgid "commit-graph chain does not match"
+msgstr ""
+
+#, c-format
+msgid "invalid commit-graph chain: line '%s' not a hash"
+msgstr ""
+
+msgid "unable to find all commit-graph files"
+msgstr ""
+
+msgid "invalid commit position. commit-graph is likely corrupt"
+msgstr ""
+
+#, c-format
+msgid "could not find commit %s"
+msgstr "не удалось найти коммит %s"
+
+msgid "commit-graph requires overflow generation data but has none"
+msgstr ""
+
+msgid "Loading known commits in commit graph"
+msgstr "Загрузка известных коммитов на граф коммитов"
+
+msgid "Expanding reachable commits in commit graph"
+msgstr "Расширение достижимых коммитов на граф коммитов"
+
+msgid "Clearing commit marks in commit graph"
+msgstr "Очистка пометок коммитов на графе коммитов"
+
+msgid "Computing commit graph topological levels"
+msgstr ""
+
+msgid "Computing commit graph generation numbers"
+msgstr "Вычисление номеров поколений на графе коммитов"
+
+msgid "Computing commit changed paths Bloom filters"
+msgstr ""
+
+msgid "Collecting referenced commits"
+msgstr ""
+
+#, c-format
+msgid "Finding commits for commit graph in %<PRIuMAX> pack"
+msgid_plural "Finding commits for commit graph in %<PRIuMAX> packs"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+msgstr[3] ""
+
+#, c-format
+msgid "error adding pack %s"
+msgstr "ошибка добавления пакета %s"
+
+#, c-format
+msgid "error opening index for %s"
+msgstr "ошибка открытия индекса для %s"
+
+msgid "Finding commits for commit graph among packed objects"
+msgstr "Поиск коммитов для графа коммитов среди упакованных объектов"
+
+msgid "Finding extra edges in commit graph"
+msgstr "Поиск дополнительных ребер на графе коммитов"
+
+msgid "failed to write correct number of base graph ids"
+msgstr ""
+
+msgid "unable to create temporary graph layer"
+msgstr ""
+
+#, c-format
+msgid "unable to adjust shared permissions for '%s'"
+msgstr ""
+
+#, 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 прохода"
+msgstr[2] "Запись графа коммитов в %d проходов"
+msgstr[3] "Запись графа коммитов в %d прохода"
+
+msgid "unable to open commit-graph chain file"
+msgstr ""
+
+msgid "failed to rename base commit-graph file"
+msgstr ""
+
+msgid "failed to rename temporary commit-graph file"
+msgstr ""
+
+msgid "Scanning merged commits"
+msgstr ""
+
+msgid "Merging commit-graph"
+msgstr ""
+
+msgid "attempting to write a commit-graph, but 'core.commitGraph' is disabled"
+msgstr ""
+
+msgid "too many commits to write graph"
+msgstr "слишком много коммитов для записи графа"
+
+msgid "the commit-graph file has incorrect checksum and is likely corrupt"
+msgstr ""
+"файл commit-graph содержит неправильную контрольную сумму и скорее всего "
+"поврежден"
+
+#, c-format
+msgid "commit-graph has incorrect OID order: %s then %s"
+msgstr "файл commit-graph содержит неправильный порядок OID: %s, а затем %s"
+
+#, c-format
+msgid "commit-graph has incorrect fanout value: fanout[%d] = %u != %u"
+msgstr ""
+"файл commit-graph содержит неправильное значение fanout: fanout[%d] = %u != "
+"%u"
+
+#, c-format
+msgid "failed to parse commit %s from commit-graph"
+msgstr "не удалось разобрать коммит %s из файла commit-graph"
+
+msgid "Verifying commits in commit graph"
+msgstr "Проверка коммитов на графе коммитов"
+
+#, c-format
+msgid "failed to parse commit %s from object database for commit-graph"
+msgstr "не удалось разобрать коммит %s из базы объектов файла commit-graph"
+
+#, c-format
+msgid "root tree OID for commit %s in commit-graph is %s != %s"
+msgstr "в файле commit-graph OID корня дерева для коммита %s является %s != %s"
+
+#, c-format
+msgid "commit-graph parent list for commit %s is too long"
+msgstr "слишком большой список родителей файле commit-graph для коммита %s"
+
+#, c-format
+msgid "commit-graph parent for %s is %s != %s"
+msgstr "в файле commit-graph родитель для %s является %s != %s"
+
+#, c-format
+msgid "commit-graph parent list for commit %s terminates early"
+msgstr ""
+"в файле commit-graph список родителей для коммита %s закончился слишком рано"
+
+#, c-format
 msgid ""
-"bisect run failed:\n"
-"exit code $res from '$command' is < 0 or >= 128"
-msgstr "не удалось выполнить двоичный поиск:\nкод завершения $res от «$command» оказался < 0 или >= 128"
+"commit-graph has generation number zero for commit %s, but non-zero elsewhere"
+msgstr ""
+"в файле commit-graph содержится нулевой номер поколения для коммита %s, но "
+"ненулевой в остальных случаях"
 
-#: git-bisect.sh:152
-msgid "bisect run cannot continue any more"
-msgstr "bisect run больше не может продолжать"
+#, c-format
+msgid ""
+"commit-graph has non-zero generation number for commit %s, but zero elsewhere"
+msgstr ""
+"в файле commit-graph содержится ненулевой номер поколения для коммита %s, но "
+"нулевой в остальных случаях"
+
+#, c-format
+msgid "commit-graph generation for commit %s is %<PRIuMAX> < %<PRIuMAX>"
+msgstr ""
+
+#, c-format
+msgid "commit date for commit %s in commit-graph is %<PRIuMAX> != %<PRIuMAX>"
+msgstr "в файле commit-graph дата коммита %s является %<PRIuMAX> != %<PRIuMAX>"
+
+#, c-format
+msgid "%s %s is not a commit!"
+msgstr "%s %s не является коммитом!"
 
-#: git-bisect.sh:158
-#, sh-format
 msgid ""
-"bisect run failed:\n"
-"'bisect-state $state' exited with error code $res"
+"Support for <GIT_DIR>/info/grafts is deprecated\n"
+"and will be removed in a future Git version.\n"
+"\n"
+"Please use \"git replace --convert-graft-file\"\n"
+"to convert the grafts into replace refs.\n"
+"\n"
+"Turn this message off by running\n"
+"\"git config advice.graftFileDeprecated false\""
 msgstr ""
+"Поддержка <GIT_DIR>/info/grafts устарела и будет удалена в следующих версиях "
+"Git.\n"
+"\n"
+"Используйте «git replace --convert-graft-file» для  конвертации сращений "
+"(grafts) на ссылки замены.\n"
+"\n"
+"Чтобы скрыть это сообщение запустите «git config advice.graftFileDeprecated "
+"false»"
 
-#: git-bisect.sh:165
-msgid "bisect run success"
-msgstr "bisect run выполнен успешно"
+#, c-format
+msgid "Commit %s has an untrusted GPG signature, allegedly by %s."
+msgstr "Коммит %s содержит не доверенную GPG подпись, предположительно от %s."
 
-#: git-bisect.sh:173
-msgid "We are not bisecting."
-msgstr "Вы сейчас не в процессе бинарного поиска."
+#, c-format
+msgid "Commit %s has a bad GPG signature allegedly by %s."
+msgstr "Коммит %s содержит плохую GPG подпись, предположительно от %s."
+
+#, c-format
+msgid "Commit %s does not have a GPG signature."
+msgstr "Коммит %s не содержит GPG подпись."
+
+#, c-format
+msgid "Commit %s has a good GPG signature by %s\n"
+msgstr "Коммит %s содержит действительную GPG подпись, от %s.\n"
 
-#: git-merge-octopus.sh:46
 msgid ""
-"Error: Your local changes to the following files would be overwritten by "
-"merge"
-msgstr "Ошибка: Ваши локальные изменения в указанных файлах будут перезаписаны при слиянии"
+"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"
+"variable i18n.commitEncoding to the encoding your project uses.\n"
+msgstr ""
 
-#: git-merge-octopus.sh:61
-msgid "Automated merge did not work."
-msgstr "Не удалось автоматически слить изменения."
+msgid "no compiler information available\n"
+msgstr ""
 
-#: git-merge-octopus.sh:62
-msgid "Should not be doing an octopus."
-msgstr "Должно быть octopus не подходит."
+msgid "no libc information available\n"
+msgstr ""
 
-#: git-merge-octopus.sh:73
-#, sh-format
-msgid "Unable to find common commit with $pretty_name"
-msgstr "Не удалось найти общий коммит с $pretty_name"
+#, c-format
+msgid "[GLE %ld] health thread could not open '%ls'"
+msgstr ""
 
-#: git-merge-octopus.sh:77
-#, sh-format
-msgid "Already up to date with $pretty_name"
-msgstr "Уже обновлено в соответствии с $pretty_name"
+#, c-format
+msgid "[GLE %ld] health thread getting BHFI for '%ls'"
+msgstr ""
 
-#: git-merge-octopus.sh:89
-#, sh-format
-msgid "Fast-forwarding to: $pretty_name"
-msgstr "Перемотка вперед до: $pretty_name"
+#, c-format
+msgid "could not convert to wide characters: '%s'"
+msgstr ""
 
-#: git-merge-octopus.sh:97
-#, sh-format
-msgid "Trying simple merge with $pretty_name"
-msgstr "Попытка простого слияния с $pretty_name"
+#, c-format
+msgid "BHFI changed '%ls'"
+msgstr ""
 
-#: git-merge-octopus.sh:102
-msgid "Simple merge did not work, trying automatic merge."
-msgstr "Простое слияние не удалось, попытка автоматического слияния."
+#, c-format
+msgid "unhandled case in 'has_worktree_moved': %d"
+msgstr ""
 
-#: git-submodule.sh:179
-msgid "Relative path can only be used from the toplevel of the working tree"
-msgstr "Относительный путь можно использовать только находясь на вершине рабочего каталога"
+#, c-format
+msgid "health thread wait failed [GLE %ld]"
+msgstr ""
 
-#: git-submodule.sh:189
-#, sh-format
-msgid "repo URL: '$repo' must be absolute or begin with ./|../"
-msgstr "URL репозитория: «$repo» должен быть абсолютным или начинаться с ./|../"
+msgid "Unable to create FSEventStream."
+msgstr ""
 
-#: git-submodule.sh:208
-#, sh-format
-msgid "'$sm_path' already exists in the index"
-msgstr "«$sm_path» уже содержится в индексе"
+msgid "Failed to start the FSEventStream"
+msgstr ""
 
-#: git-submodule.sh:211
-#, sh-format
-msgid "'$sm_path' already exists in the index and is not a submodule"
-msgstr "«$sm_path» уже содержится в индексе и не является подмодулем"
+#, c-format
+msgid "[GLE %ld] could not convert path to UTF-8: '%.*ls'"
+msgstr ""
 
-#: git-submodule.sh:218
-#, sh-format
-msgid "'$sm_path' does not have a commit checked out"
+#, c-format
+msgid "[GLE %ld] could not watch '%s'"
 msgstr ""
 
-#: git-submodule.sh:249
-#, sh-format
-msgid "Adding existing repo at '$sm_path' to the index"
-msgstr "Добавляю существующий репозиторий из «$sm_path» в индекс"
+#, c-format
+msgid "[GLE %ld] could not get longname of '%s'"
+msgstr ""
 
-#: git-submodule.sh:251
-#, sh-format
-msgid "'$sm_path' already exists and is not a valid git repo"
-msgstr "«$sm_path» уже существует и не является действительным репозиторием git"
+#, c-format
+msgid "ReadDirectoryChangedW failed on '%s' [GLE %ld]"
+msgstr ""
 
-#: git-submodule.sh:259
-#, sh-format
-msgid "A git directory for '$sm_name' is found locally with remote(s):"
-msgstr "Каталог git для «$sm_name» найден локально на внешних репозиториях:"
+#, c-format
+msgid "GetOverlappedResult failed on '%s' [GLE %ld]"
+msgstr ""
 
-#: git-submodule.sh:261
-#, sh-format
+#, c-format
+msgid "could not read directory changes [GLE %ld]"
+msgstr ""
+
+#, c-format
+msgid "failed to copy SID (%ld)"
+msgstr ""
+
+#, c-format
+msgid "failed to get owner for '%s' (%ld)"
+msgstr ""
+
+msgid "memory exhausted"
+msgstr "память исчерпана"
+
+msgid "Success"
+msgstr "Процесс успешно завершен"
+
+msgid "No match"
+msgstr ""
+
+msgid "Invalid regular expression"
+msgstr ""
+
+msgid "Invalid collation character"
+msgstr ""
+
+msgid "Invalid character class name"
+msgstr ""
+
+msgid "Trailing backslash"
+msgstr ""
+
+msgid "Invalid back reference"
+msgstr ""
+
+msgid "Unmatched [ or [^"
+msgstr ""
+
+msgid "Unmatched ( or \\("
+msgstr ""
+
+msgid "Unmatched \\{"
+msgstr ""
+
+msgid "Invalid content of \\{\\}"
+msgstr ""
+
+msgid "Invalid range end"
+msgstr ""
+
+msgid "Memory exhausted"
+msgstr ""
+
+msgid "Invalid preceding regular expression"
+msgstr ""
+
+msgid "Premature end of regular expression"
+msgstr ""
+
+msgid "Regular expression too big"
+msgstr ""
+
+msgid "Unmatched ) or \\)"
+msgstr ""
+
+msgid "No previous regular expression"
+msgstr ""
+
+msgid "could not send IPC command"
+msgstr ""
+
+msgid "could not read IPC response"
+msgstr ""
+
+#, c-format
+msgid "could not start accept_thread '%s'"
+msgstr ""
+
+#, c-format
+msgid "could not start worker[0] for '%s'"
+msgstr ""
+
+#, c-format
+msgid "ConnectNamedPipe failed for '%s' (%lu)"
+msgstr ""
+
+#, c-format
+msgid "could not create fd from pipe for '%s'"
+msgstr ""
+
+#, c-format
+msgid "could not start thread[0] for '%s'"
+msgstr ""
+
+#, c-format
+msgid "wait for hEvent failed for '%s'"
+msgstr ""
+
+msgid "cannot resume in the background, please use 'fg' to resume"
+msgstr ""
+
+msgid "cannot restore terminal settings"
+msgstr ""
+
+#, c-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 не является нужным репозиторием или если вы не уверены, что это значит, то укажите другое имя для подмодуля с помощью параметра «--name»."
+"exceeded maximum include depth (%d) while including\n"
+"\t%s\n"
+"from\n"
+"\t%s\n"
+"This might be due to circular includes."
+msgstr ""
 
-#: git-submodule.sh:267
-#, sh-format
-msgid "Reactivating local git directory for submodule '$sm_name'."
-msgstr "Восстановление локального каталога git для подмодуля «$sm_name»."
+#, c-format
+msgid "could not expand include path '%s'"
+msgstr "не удалось раскрыть путь включения «%s»"
 
-#: git-submodule.sh:279
-#, sh-format
-msgid "Unable to checkout submodule '$sm_path'"
-msgstr "Не удалось переключиться на состояние у подмодуля «$sm_path»"
+msgid "relative config includes must come from files"
+msgstr "относительные включения конфигурации должны исходить из файлов"
 
-#: git-submodule.sh:284
-#, sh-format
-msgid "Failed to add submodule '$sm_path'"
-msgstr "Сбой добавления подмодуля «$sm_path»"
+msgid "relative config include conditionals must come from files"
+msgstr ""
+"относительные условные включения конфигурации должны исходить из файлов"
 
-#: git-submodule.sh:293
-#, sh-format
-msgid "Failed to register submodule '$sm_path'"
-msgstr "Не удалось зарегистрировать подмодуль «$sm_path»"
+msgid ""
+"remote URLs cannot be configured in file directly or indirectly included by "
+"includeIf.hasconfig:remote.*.url"
+msgstr ""
 
-#: git-submodule.sh:568
-#, sh-format
-msgid "Unable to find current revision in submodule path '$displaypath'"
-msgstr "Не удалось найти текущую редакцию для подмодуля по пути «$displaypath»"
+#, c-format
+msgid "invalid config format: %s"
+msgstr ""
 
-#: git-submodule.sh:578
-#, sh-format
-msgid "Unable to fetch in submodule path '$sm_path'"
-msgstr "Не удалось выполнить извлечение для подмодуля по пути «$sm_path»"
+#, c-format
+msgid "missing environment variable name for configuration '%.*s'"
+msgstr ""
+
+#, c-format
+msgid "missing environment variable '%s' for configuration '%.*s'"
+msgstr ""
+
+#, c-format
+msgid "key does not contain a section: %s"
+msgstr ""
+
+#, c-format
+msgid "key does not contain variable name: %s"
+msgstr ""
+
+#, c-format
+msgid "invalid key: %s"
+msgstr "недействительный ключ: %s"
+
+#, c-format
+msgid "invalid key (newline): %s"
+msgstr ""
+
+msgid "empty config key"
+msgstr ""
+
+#, c-format
+msgid "bogus config parameter: %s"
+msgstr ""
+
+#, c-format
+msgid "bogus format in %s"
+msgstr ""
+
+#, c-format
+msgid "bogus count in %s"
+msgstr ""
+
+#, c-format
+msgid "too many entries in %s"
+msgstr ""
+
+#, c-format
+msgid "missing config key %s"
+msgstr ""
+
+#, c-format
+msgid "missing config value %s"
+msgstr ""
+
+#, c-format
+msgid "bad config line %d in blob %s"
+msgstr "ошибка в %d строке двоичного объекта %s"
+
+#, c-format
+msgid "bad config line %d in file %s"
+msgstr "ошибка в %d строке файла %s"
+
+#, c-format
+msgid "bad config line %d in standard input"
+msgstr "ошибка в %d строке стандартного ввода"
+
+#, c-format
+msgid "bad config line %d in submodule-blob %s"
+msgstr "ошибка в %d строке двоичного объекта подмодуля %s"
+
+#, c-format
+msgid "bad config line %d in command line %s"
+msgstr "ошибка в %d строке коммандной строки %s"
+
+#, c-format
+msgid "bad config line %d in %s"
+msgstr "ошибка в %d строке в %s"
+
+msgid "out of range"
+msgstr "вне диапазона"
+
+msgid "invalid unit"
+msgstr "неправильное число"
+
+#, c-format
+msgid "bad numeric config value '%s' for '%s': %s"
+msgstr "неправильное числовое значение «%s» для «%s»: %s"
+
+#, c-format
+msgid "bad numeric config value '%s' for '%s' in blob %s: %s"
+msgstr "неправильное числовое значение «%s» для «%s» в двоичном объекте %s: %s"
+
+#, c-format
+msgid "bad numeric config value '%s' for '%s' in file %s: %s"
+msgstr "неправильное числовое значение «%s» для «%s» в файле %s: %s"
+
+#, c-format
+msgid "bad numeric config value '%s' for '%s' in standard input: %s"
+msgstr "неправильное числовое значение «%s» для «%s» на стандартном вводе: %s"
+
+#, c-format
+msgid "bad numeric config value '%s' for '%s' in submodule-blob %s: %s"
+msgstr ""
+"неправильное числовое значение «%s» для «%s» в двоичном объекте подмодуля "
+"%s: %s"
+
+#, c-format
+msgid "bad numeric config value '%s' for '%s' in command line %s: %s"
+msgstr ""
+"неправильное числовое значение «%s» для «%s» на коммандной строке %s: %s"
+
+#, c-format
+msgid "bad numeric config value '%s' for '%s' in %s: %s"
+msgstr "неправильное числовое значение «%s» для «%s» в %s: %s"
+
+#, c-format
+msgid "invalid value for variable %s"
+msgstr ""
+
+#, c-format
+msgid "ignoring unknown core.fsync component '%s'"
+msgstr ""
+
+#, c-format
+msgid "bad boolean config value '%s' for '%s'"
+msgstr ""
+
+#, c-format
+msgid "failed to expand user dir in: '%s'"
+msgstr "сбой разворачивания пути каталога пользователя: «%s»"
+
+#, c-format
+msgid "'%s' for '%s' is not a valid timestamp"
+msgstr "«%s» для «%s» не является допустимой меткой даты/времени"
+
+#, c-format
+msgid "abbrev length out of range: %d"
+msgstr ""
+
+#, c-format
+msgid "bad zlib compression level %d"
+msgstr "неправильный уровень сжатия zlib %d"
+
+msgid "core.commentChar should only be one character"
+msgstr ""
+
+#, c-format
+msgid "ignoring unknown core.fsyncMethod value '%s'"
+msgstr ""
+
+msgid "core.fsyncObjectFiles is deprecated; use core.fsync instead"
+msgstr ""
+
+#, c-format
+msgid "invalid mode for object creation: %s"
+msgstr "недопустимый режим создания объекта: %s"
+
+#, c-format
+msgid "malformed value for %s"
+msgstr ""
+
+#, c-format
+msgid "malformed value for %s: %s"
+msgstr ""
+
+msgid "must be one of nothing, matching, simple, upstream or current"
+msgstr ""
+
+#, c-format
+msgid "unable to load config blob object '%s'"
+msgstr ""
+
+#, c-format
+msgid "reference '%s' does not point to a blob"
+msgstr ""
+
+#, c-format
+msgid "unable to resolve config blob '%s'"
+msgstr ""
+
+#, c-format
+msgid "failed to parse %s"
+msgstr ""
+
+msgid "unable to parse command-line config"
+msgstr "не удалось разобрать конфигурацию из командной строки"
+
+msgid "unknown error occurred while reading the configuration files"
+msgstr "произошла неизвестная ошибка при чтении файлов конфигурации"
+
+#, c-format
+msgid "Invalid %s: '%s'"
+msgstr "Недействительный %s: «%s»"
+
+#, c-format
+msgid "splitIndex.maxPercentChange value '%d' should be between 0 and 100"
+msgstr "значение «%d» для splitIndex.maxPercentChange должно быть от 0 до 100"
+
+#, c-format
+msgid "unable to parse '%s' from command-line config"
+msgstr "не удалось разобрать «%s» в конфигурации из командной строки"
+
+#, c-format
+msgid "bad config variable '%s' in file '%s' at line %d"
+msgstr "неправильная переменная конфигурации «%s» в файле «%s» на строке %d"
+
+#, c-format
+msgid "invalid section name '%s'"
+msgstr ""
+
+#, c-format
+msgid "%s has multiple values"
+msgstr "%s имеет несколько значений"
+
+#, c-format
+msgid "failed to write new configuration file %s"
+msgstr ""
+
+#, c-format
+msgid "could not lock config file %s"
+msgstr ""
+
+#, c-format
+msgid "opening %s"
+msgstr ""
+
+#, c-format
+msgid "invalid config file %s"
+msgstr ""
+
+#, c-format
+msgid "fstat on %s failed"
+msgstr "сбой при выполнении fstat на файле %s"
+
+#, c-format
+msgid "unable to mmap '%s'%s"
+msgstr ""
+
+#, c-format
+msgid "chmod on %s failed"
+msgstr ""
+
+#, c-format
+msgid "could not write config file %s"
+msgstr ""
+
+#, c-format
+msgid "could not set '%s' to '%s'"
+msgstr "не удалось установить «%s» в «%s»"
+
+#, c-format
+msgid "invalid section name: %s"
+msgstr ""
+
+#, c-format
+msgid "missing value for '%s'"
+msgstr ""
+
+msgid "the remote end hung up upon initial contact"
+msgstr ""
 
-#: git-submodule.sh:583
-#, sh-format
 msgid ""
-"Unable to find current ${remote_name}/${branch} revision in submodule path "
-"'$sm_path'"
-msgstr "Не удалось найти текущую редакцию ${remote_name}/${branch} для подмодуля по пути «$sm_path»"
+"Could not read from remote repository.\n"
+"\n"
+"Please make sure you have the correct access rights\n"
+"and the repository exists."
+msgstr ""
+"Не удалось прочитать из внешнего репозитория.\n"
+"\n"
+"Удостоверьтесь, что у вас есть необходимые права доступа\n"
+"и репозиторий существует."
 
-#: git-submodule.sh:601
-#, sh-format
+#, c-format
+msgid "server doesn't support '%s'"
+msgstr ""
+
+#, c-format
+msgid "server doesn't support feature '%s'"
+msgstr ""
+
+msgid "expected flush after capabilities"
+msgstr ""
+
+#, c-format
+msgid "ignoring capabilities after first line '%s'"
+msgstr ""
+
+msgid "protocol error: unexpected capabilities^{}"
+msgstr ""
+
+#, c-format
+msgid "protocol error: expected shallow sha-1, got '%s'"
+msgstr ""
+
+msgid "repository on the other end cannot be shallow"
+msgstr ""
+
+msgid "invalid packet"
+msgstr ""
+
+#, c-format
+msgid "protocol error: unexpected '%s'"
+msgstr ""
+
+#, c-format
+msgid "unknown object format '%s' specified by server"
+msgstr ""
+
+#, c-format
+msgid "invalid ls-refs response: %s"
+msgstr ""
+
+msgid "expected flush after ref listing"
+msgstr ""
+
+msgid "expected response end packet after ref listing"
+msgstr ""
+
+#, c-format
+msgid "protocol '%s' is not supported"
+msgstr ""
+
+msgid "unable to set SO_KEEPALIVE on socket"
+msgstr ""
+
+#, c-format
+msgid "Looking up %s ... "
+msgstr ""
+
+#, c-format
+msgid "unable to look up %s (port %s) (%s)"
+msgstr ""
+
+#. TRANSLATORS: this is the end of "Looking up %s ... "
+#, c-format
 msgid ""
-"Unable to fetch in submodule path '$displaypath'; trying to directly fetch "
-"$sha1:"
+"done.\n"
+"Connecting to %s (port %s) ... "
 msgstr ""
 
-#: git-submodule.sh:607
-#, sh-format
+#, c-format
 msgid ""
-"Fetched in submodule path '$displaypath', but it did not contain $sha1. "
-"Direct fetching of that commit failed."
-msgstr "Получен по пути подмодуля «$displaypath», но не содержит $sha1. Сбой при прямом получении коммита."
+"unable to connect to %s:\n"
+"%s"
+msgstr ""
 
-#: git-submodule.sh:614
-#, sh-format
-msgid "Unable to checkout '$sha1' in submodule path '$displaypath'"
-msgstr "Не удалось переключиться на состояние «$sha1» для подмодуля по пути «$displaypath»"
+#. TRANSLATORS: this is the end of "Connecting to %s (port %s) ... "
+msgid "done."
+msgstr ""
 
-#: git-submodule.sh:615
-#, sh-format
-msgid "Submodule path '$displaypath': checked out '$sha1'"
-msgstr "Подмодуль по пути «$displaypath»: забрано состояние «$sha1»"
+#, c-format
+msgid "unable to look up %s (%s)"
+msgstr ""
 
-#: git-submodule.sh:619
-#, sh-format
-msgid "Unable to rebase '$sha1' in submodule path '$displaypath'"
-msgstr "Не удалось переместить «$sha1» для подмодуля по пути «$displaypath»"
+#, c-format
+msgid "unknown port %s"
+msgstr ""
 
-#: git-submodule.sh:620
-#, sh-format
-msgid "Submodule path '$displaypath': rebased into '$sha1'"
-msgstr "Подмодуль по пути «$displaypath»: перемещен над «$sha1»"
+#, c-format
+msgid "strange hostname '%s' blocked"
+msgstr ""
 
-#: git-submodule.sh:625
-#, sh-format
-msgid "Unable to merge '$sha1' in submodule path '$displaypath'"
-msgstr "Не удалось выполнить слияние с «$sha1» для подмодуля по пути «$displaypath»"
+#, c-format
+msgid "strange port '%s' blocked"
+msgstr ""
 
-#: git-submodule.sh:626
-#, sh-format
-msgid "Submodule path '$displaypath': merged in '$sha1'"
-msgstr "Подмодуль по пути «$displaypath»: слито с «$sha1»"
+#, c-format
+msgid "cannot start proxy %s"
+msgstr ""
 
-#: git-submodule.sh:631
-#, sh-format
-msgid "Execution of '$command $sha1' failed in submodule path '$displaypath'"
-msgstr "Сбой выполнения «$command $sha1» для подмодуля по пути «$displaypath»"
+msgid "no path specified; see 'git help pull' for valid url syntax"
+msgstr ""
 
-#: git-submodule.sh:632
-#, sh-format
-msgid "Submodule path '$displaypath': '$command $sha1'"
-msgstr "Подмодуль по пути «$displaypath»: «$command $sha1»"
+msgid "newline is forbidden in git:// hosts and repo paths"
+msgstr ""
 
-#: git-submodule.sh:663
-#, sh-format
-msgid "Failed to recurse into submodule path '$displaypath'"
-msgstr "Не удалось выполнить рекурсивно для подмодуля по пути «$displaypath»"
+msgid "ssh variant 'simple' does not support -4"
+msgstr ""
 
-#: git-rebase--preserve-merges.sh:109
-msgid "Applied autostash."
-msgstr "Применены автоматически спрятанные изменения."
+msgid "ssh variant 'simple' does not support -6"
+msgstr ""
 
-#: git-rebase--preserve-merges.sh:112
-#, sh-format
-msgid "Cannot store $stash_sha1"
-msgstr "Не удалось сохранить $stash_sha1"
+msgid "ssh variant 'simple' does not support setting port"
+msgstr ""
+
+#, c-format
+msgid "strange pathname '%s' blocked"
+msgstr ""
+
+msgid "unable to fork"
+msgstr ""
+
+msgid "Could not run 'git rev-list'"
+msgstr "Не удалось запустить «git rev-list»"
+
+msgid "failed write to rev-list"
+msgstr "сбой записи в rev-list"
+
+msgid "failed to close rev-list's stdin"
+msgstr "сбой закрытия стандартного ввода у rev-list"
+
+#, c-format
+msgid "'%s' does not exist"
+msgstr "«%s» не существует"
+
+msgid "need a working directory"
+msgstr ""
+
+msgid "could not find enlistment root"
+msgstr ""
+
+#, c-format
+msgid "could not switch to '%s'"
+msgstr ""
+
+#, c-format
+msgid "could not configure %s=%s"
+msgstr ""
+
+msgid "could not configure log.excludeDecoration"
+msgstr ""
+
+msgid "Scalar enlistments require a worktree"
+msgstr ""
+
+#, c-format
+msgid "could not open directory '%s'"
+msgstr "не удалось открыть каталог «%s»"
+
+#, c-format
+msgid "skipping '%s', which is neither file nor directory"
+msgstr ""
+
+#, c-format
+msgid "could not determine free disk size for '%s'"
+msgstr ""
+
+#, c-format
+msgid "could not get info for '%s'"
+msgstr ""
+
+#, c-format
+msgid "remote HEAD is not a branch: '%.*s'"
+msgstr ""
+
+msgid "failed to get default branch name from remote; using local default"
+msgstr ""
+
+msgid "failed to get default branch name"
+msgstr ""
+
+msgid "failed to unregister repository"
+msgstr ""
+
+msgid "failed to delete enlistment directory"
+msgstr ""
+
+msgid "branch to checkout after clone"
+msgstr ""
+
+msgid "when cloning, create full working directory"
+msgstr ""
+
+msgid "only download metadata for the branch that will be checked out"
+msgstr ""
+
+msgid "scalar clone [<options>] [--] <repo> [<dir>]"
+msgstr ""
+
+#, c-format
+msgid "cannot deduce worktree name from '%s'"
+msgstr ""
+
+#, c-format
+msgid "directory '%s' exists already"
+msgstr ""
+
+#, c-format
+msgid "failed to get default branch for '%s'"
+msgstr ""
+
+#, c-format
+msgid "could not configure remote in '%s'"
+msgstr ""
+
+#, c-format
+msgid "could not configure '%s'"
+msgstr ""
+
+msgid "partial clone failed; attempting full clone"
+msgstr ""
+
+msgid "could not configure for full clone"
+msgstr ""
+
+msgid "scalar diagnose [<enlistment>]"
+msgstr ""
+
+#, c-format
+msgid "could not create directory for '%s'"
+msgstr ""
+
+msgid "could not duplicate stdout"
+msgstr ""
+
+msgid "failed to write archive"
+msgstr ""
+
+msgid "`scalar list` does not take arguments"
+msgstr ""
+
+msgid "scalar register [<enlistment>]"
+msgstr ""
+
+msgid "reconfigure all registered enlistments"
+msgstr ""
+
+msgid "scalar reconfigure [--all | <enlistment>]"
+msgstr ""
+
+msgid "--all or <enlistment>, but not both"
+msgstr ""
+
+#, c-format
+msgid "git repository gone in '%s'"
+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 "Применение автоматически спрятанных изменений вызвало конфликты.\nВаши изменения спрятаны и в безопасности.\nВы можете выполнить «git stash pop» или «git stash drop» в любой момент.\n"
+"scalar run <task> [<enlistment>]\n"
+"Tasks:\n"
+msgstr ""
 
-#: git-rebase--preserve-merges.sh:191
-#, sh-format
-msgid "Rebasing ($new_count/$total)"
-msgstr "Перемещение ($new_count/$total)"
+#, c-format
+msgid "no such task: '%s'"
+msgstr ""
+
+msgid "scalar unregister [<enlistment>]"
+msgstr ""
+
+msgid "scalar delete <enlistment>"
+msgstr ""
+
+msgid "refusing to delete current working directory"
+msgstr ""
+
+msgid "include Git version"
+msgstr ""
+
+msgid "include Git's build options"
+msgstr ""
+
+msgid "scalar verbose [-v | --verbose] [--build-options]"
+msgstr ""
+
+msgid "-C requires a <directory>"
+msgstr ""
+
+#, c-format
+msgid "could not change to '%s'"
+msgstr ""
+
+msgid "-c requires a <key>=<value> argument"
+msgstr ""
+
+msgid ""
+"scalar [-C <directory>] [-c <key>=<value>] <command> [<options>]\n"
+"\n"
+"Commands:\n"
+msgstr ""
+
+#, c-format
+msgid "illegal crlf_action %d"
+msgstr ""
+
+#, c-format
+msgid "CRLF would be replaced by LF in %s"
+msgstr ""
+
+#, c-format
+msgid ""
+"in the working copy of '%s', CRLF will be replaced by LF the next time Git "
+"touches it"
+msgstr ""
+
+#, c-format
+msgid "LF would be replaced by CRLF in %s"
+msgstr "LF будет заменен на CRLF в %s"
+
+#, c-format
+msgid ""
+"in the working copy of '%s', LF will be replaced by CRLF the next time Git "
+"touches it"
+msgstr ""
+
+#, c-format
+msgid "BOM is prohibited in '%s' if encoded as %s"
+msgstr "BOM запрещен в «%s», если кодируется как %s"
+
+#, c-format
+msgid ""
+"The file '%s' contains a byte order mark (BOM). Please use UTF-%.*s as "
+"working-tree-encoding."
+msgstr ""
+
+#, c-format
+msgid "BOM is required in '%s' if encoded as %s"
+msgstr "BOM требуется в «%s», если кодируется как %s"
+
+#, 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."
+msgstr ""
+"Файл «%s» не содержит маркер последовательности байтов (BOM).  Используйте "
+"UTF-%sBE или UTF-%sLE (в зависимости от порядка байтов) как кодировку "
+"рабочего каталога."
+
+#, c-format
+msgid "failed to encode '%s' from %s to %s"
+msgstr "не удалось перекодировать «%s» из %s в %s"
+
+#, c-format
+msgid "encoding '%s' from %s to %s and back is not the same"
+msgstr "перекодирование «%s» из %s в %s и обратно не одно и то же"
+
+#, c-format
+msgid "cannot fork to run external filter '%s'"
+msgstr ""
+
+#, c-format
+msgid "cannot feed the input to external filter '%s'"
+msgstr ""
+
+#, c-format
+msgid "external filter '%s' failed %d"
+msgstr ""
+
+#, c-format
+msgid "read from external filter '%s' failed"
+msgstr ""
+
+#, c-format
+msgid "external filter '%s' failed"
+msgstr ""
+
+msgid "unexpected filter type"
+msgstr ""
+
+msgid "path name too long for external filter"
+msgstr ""
+
+#, c-format
+msgid ""
+"external filter '%s' is not available anymore although not all paths have "
+"been filtered"
+msgstr ""
+
+msgid "true/false are no valid working-tree-encodings"
+msgstr "true/false не является допустимым значением для working-tree-encoding"
+
+#, c-format
+msgid "%s: clean filter '%s' failed"
+msgstr ""
+
+#, c-format
+msgid "%s: smudge filter %s failed"
+msgstr ""
+
+#, c-format
+msgid "skipping credential lookup for key: credential.%s"
+msgstr ""
+
+msgid "refusing to work with credential missing host field"
+msgstr ""
+
+msgid "refusing to work with credential missing protocol field"
+msgstr ""
+
+#, c-format
+msgid "url contains a newline in its %s component: %s"
+msgstr ""
+
+#, c-format
+msgid "url has no scheme: %s"
+msgstr ""
+
+#, c-format
+msgid "credential url cannot be parsed: %s"
+msgstr ""
+
+msgid "in the future"
+msgstr "в будущем"
+
+#, c-format
+msgid "%<PRIuMAX> second ago"
+msgid_plural "%<PRIuMAX> seconds ago"
+msgstr[0] "%<PRIuMAX> секунда назад"
+msgstr[1] "%<PRIuMAX> секунды назад"
+msgstr[2] "%<PRIuMAX> секунд назад"
+msgstr[3] "%<PRIuMAX> секунды назад"
+
+#, c-format
+msgid "%<PRIuMAX> minute ago"
+msgid_plural "%<PRIuMAX> minutes ago"
+msgstr[0] "%<PRIuMAX> минута назад"
+msgstr[1] "%<PRIuMAX> минуты назад"
+msgstr[2] "%<PRIuMAX> минут назад"
+msgstr[3] "%<PRIuMAX> минуты назад"
+
+#, c-format
+msgid "%<PRIuMAX> hour ago"
+msgid_plural "%<PRIuMAX> hours ago"
+msgstr[0] "%<PRIuMAX> час назад"
+msgstr[1] "%<PRIuMAX> часа назад"
+msgstr[2] "%<PRIuMAX> часов назад"
+msgstr[3] "%<PRIuMAX> часа назад"
+
+#, c-format
+msgid "%<PRIuMAX> day ago"
+msgid_plural "%<PRIuMAX> days ago"
+msgstr[0] "%<PRIuMAX> день назад"
+msgstr[1] "%<PRIuMAX> дня назад"
+msgstr[2] "%<PRIuMAX> дней назад"
+msgstr[3] "%<PRIuMAX> дня назад"
+
+#, c-format
+msgid "%<PRIuMAX> week ago"
+msgid_plural "%<PRIuMAX> weeks ago"
+msgstr[0] "%<PRIuMAX> неделю назад"
+msgstr[1] "%<PRIuMAX> недели назад"
+msgstr[2] "%<PRIuMAX> недель назад"
+msgstr[3] "%<PRIuMAX> недели назад"
+
+#, c-format
+msgid "%<PRIuMAX> month ago"
+msgid_plural "%<PRIuMAX> months ago"
+msgstr[0] "%<PRIuMAX> месяц назад"
+msgstr[1] "%<PRIuMAX> месяца назад"
+msgstr[2] "%<PRIuMAX> месяцев назад"
+msgstr[3] "%<PRIuMAX> месяца назад"
+
+#, c-format
+msgid "%<PRIuMAX> year"
+msgid_plural "%<PRIuMAX> years"
+msgstr[0] "%<PRIuMAX> год"
+msgstr[1] "%<PRIuMAX> года"
+msgstr[2] "%<PRIuMAX> лет"
+msgstr[3] "%<PRIuMAX> года"
+
+#. TRANSLATORS: "%s" is "<n> years"
+#, c-format
+msgid "%s, %<PRIuMAX> month ago"
+msgid_plural "%s, %<PRIuMAX> months ago"
+msgstr[0] "%s, %<PRIuMAX> месяц назад"
+msgstr[1] "%s, %<PRIuMAX> месяца назад"
+msgstr[2] "%s, %<PRIuMAX> месяцев назад"
+msgstr[3] "%s, %<PRIuMAX> месяца назад"
+
+#, c-format
+msgid "%<PRIuMAX> year ago"
+msgid_plural "%<PRIuMAX> years ago"
+msgstr[0] "%<PRIuMAX> год назад"
+msgstr[1] "%<PRIuMAX> года назад"
+msgstr[2] "%<PRIuMAX> лет назад"
+msgstr[3] "%<PRIuMAX> года назад"
+
+msgid "Propagating island marks"
+msgstr ""
+
+#, c-format
+msgid "bad tree object %s"
+msgstr ""
+
+#, c-format
+msgid "failed to load island regex for '%s': %s"
+msgstr ""
+
+#, c-format
+msgid "island regex from config has too many capture groups (max=%d)"
+msgstr ""
+
+#, c-format
+msgid "Marked %d islands, done.\n"
+msgstr ""
+
+msgid "--merge-base does not work with ranges"
+msgstr ""
+
+msgid "--merge-base only works with commits"
+msgstr ""
+
+msgid "unable to get HEAD"
+msgstr ""
+
+msgid "no merge base found"
+msgstr ""
+
+msgid "multiple merge bases found"
+msgstr ""
+
+msgid "git diff --no-index [<options>] <path> <path>"
+msgstr ""
+
+msgid ""
+"Not a git repository. Use --no-index to compare two paths outside a working "
+"tree"
+msgstr ""
+
+#, c-format
+msgid "  Failed to parse dirstat cut-off percentage '%s'\n"
+msgstr "  Сбой разбора величины среза (cut-off) у dirstat «%s»\n"
+
+#, c-format
+msgid "  Unknown dirstat parameter '%s'\n"
+msgstr "  Неизвестный параметр dirstat: «%s»\n"
+
+msgid ""
+"color moved setting must be one of 'no', 'default', 'blocks', 'zebra', "
+"'dimmed-zebra', 'plain'"
+msgstr ""
+
+#, 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 ""
+
+msgid ""
+"color-moved-ws: allow-indentation-change cannot be combined with other "
+"whitespace modes"
+msgstr ""
+
+#, c-format
+msgid "Unknown value for 'diff.submodule' config variable: '%s'"
+msgstr "Неизвестное значения для переменной «diff.submodule»: «%s»"
+
+#, c-format
+msgid ""
+"Found errors in 'diff.dirstat' config variable:\n"
+"%s"
+msgstr ""
+"Найдены ошибки в переменной «diff.dirstat»:\n"
+"%s"
+
+#, c-format
+msgid "external diff died, stopping at %s"
+msgstr "критическая ошибка при внешнем сравнении, останов на %s"
+
+#, c-format
+msgid "options '%s', '%s', '%s', and '%s' cannot be used together"
+msgstr ""
+
+#, c-format
+msgid "options '%s' and '%s' cannot be used together, use '%s' with '%s'"
+msgstr ""
+
+#, c-format
+msgid ""
+"options '%s' and '%s' cannot be used together, use '%s' with '%s' and '%s'"
+msgstr ""
+
+msgid "--follow requires exactly one pathspec"
+msgstr "--follow требует ровно одного спецификатора пути"
+
+#, c-format
+msgid "invalid --stat value: %s"
+msgstr "неправильное значение --stat: %s"
+
+#, c-format
+msgid "%s expects a numerical value"
+msgstr "%s ожидает числовое значение"
+
+#, c-format
+msgid ""
+"Failed to parse --dirstat/-X option parameter:\n"
+"%s"
+msgstr ""
+"Сбой разбора параметра опции --dirstat/-X :\n"
+"%s"
+
+#, c-format
+msgid "unknown change class '%c' in --diff-filter=%s"
+msgstr ""
+
+#, c-format
+msgid "unknown value after ws-error-highlight=%.*s"
+msgstr ""
+
+#, c-format
+msgid "unable to resolve '%s'"
+msgstr ""
+
+#, c-format
+msgid "%s expects <n>/<m> form"
+msgstr ""
+
+#, c-format
+msgid "%s expects a character, got '%s'"
+msgstr ""
+
+#, c-format
+msgid "bad --color-moved argument: %s"
+msgstr ""
+
+#, c-format
+msgid "invalid mode '%s' in --color-moved-ws"
+msgstr ""
+
+msgid ""
+"option diff-algorithm accepts \"myers\", \"minimal\", \"patience\" and "
+"\"histogram\""
+msgstr ""
+
+#, c-format
+msgid "invalid argument to %s"
+msgstr ""
+
+#, c-format
+msgid "invalid regex given to -I: '%s'"
+msgstr ""
+
+#, c-format
+msgid "failed to parse --submodule option parameter: '%s'"
+msgstr ""
+
+#, c-format
+msgid "bad --word-diff argument: %s"
+msgstr ""
+
+msgid "Diff output format options"
+msgstr ""
+
+msgid "generate patch"
+msgstr ""
+
+msgid "<n>"
+msgstr ""
+
+msgid "generate diffs with <n> lines context"
+msgstr ""
+
+msgid "generate the diff in raw format"
+msgstr ""
+
+msgid "synonym for '-p --raw'"
+msgstr ""
+
+msgid "synonym for '-p --stat'"
+msgstr ""
+
+msgid "machine friendly --stat"
+msgstr ""
+
+msgid "output only the last line of --stat"
+msgstr ""
+
+msgid "<param1,param2>..."
+msgstr ""
+
+msgid ""
+"output the distribution of relative amount of changes for each sub-directory"
+msgstr ""
+
+msgid "synonym for --dirstat=cumulative"
+msgstr ""
+
+msgid "synonym for --dirstat=files,param1,param2..."
+msgstr ""
+
+msgid "warn if changes introduce conflict markers or whitespace errors"
+msgstr ""
+
+msgid "condensed summary such as creations, renames and mode changes"
+msgstr ""
+"краткая сводка изменений, вроде созданий, переименований или изменений "
+"режима доступа"
+
+msgid "show only names of changed files"
+msgstr ""
+
+msgid "show only names and status of changed files"
+msgstr ""
+
+msgid "<width>[,<name-width>[,<count>]]"
+msgstr ""
+
+msgid "generate diffstat"
+msgstr ""
+
+msgid "<width>"
+msgstr ""
+
+msgid "generate diffstat with a given width"
+msgstr ""
+
+msgid "generate diffstat with a given name width"
+msgstr ""
+
+msgid "generate diffstat with a given graph width"
+msgstr ""
+
+msgid "<count>"
+msgstr ""
+
+msgid "generate diffstat with limited lines"
+msgstr ""
+
+msgid "generate compact summary in diffstat"
+msgstr "генерация компактной сводки в diffstat"
+
+msgid "output a binary diff that can be applied"
+msgstr ""
+
+msgid "show full pre- and post-image object names on the \"index\" lines"
+msgstr ""
+
+msgid "show colored diff"
+msgstr ""
+
+msgid "<kind>"
+msgstr ""
+
+msgid ""
+"highlight whitespace errors in the 'context', 'old' or 'new' lines in the "
+"diff"
+msgstr ""
+
+msgid ""
+"do not munge pathnames and use NULs as output field terminators in --raw or "
+"--numstat"
+msgstr ""
+
+msgid "<prefix>"
+msgstr ""
+
+msgid "show the given source prefix instead of \"a/\""
+msgstr ""
+
+msgid "show the given destination prefix instead of \"b/\""
+msgstr ""
+
+msgid "prepend an additional prefix to every line of output"
+msgstr ""
+
+msgid "do not show any source or destination prefix"
+msgstr ""
+
+msgid "show context between diff hunks up to the specified number of lines"
+msgstr ""
+
+msgid "<char>"
+msgstr ""
+
+msgid "specify the character to indicate a new line instead of '+'"
+msgstr ""
+
+msgid "specify the character to indicate an old line instead of '-'"
+msgstr ""
+
+msgid "specify the character to indicate a context instead of ' '"
+msgstr ""
+
+msgid "Diff rename options"
+msgstr ""
+
+msgid "<n>[/<m>]"
+msgstr ""
+
+msgid "break complete rewrite changes into pairs of delete and create"
+msgstr ""
+
+msgid "detect renames"
+msgstr ""
+
+msgid "omit the preimage for deletes"
+msgstr ""
+
+msgid "detect copies"
+msgstr ""
+
+msgid "use unmodified files as source to find copies"
+msgstr ""
+
+msgid "disable rename detection"
+msgstr ""
+
+msgid "use empty blobs as rename source"
+msgstr ""
+
+msgid "continue listing the history of a file beyond renames"
+msgstr ""
+
+msgid ""
+"prevent rename/copy detection if the number of rename/copy targets exceeds "
+"given limit"
+msgstr ""
+
+msgid "Diff algorithm options"
+msgstr ""
+
+msgid "produce the smallest possible diff"
+msgstr ""
+
+msgid "ignore whitespace when comparing lines"
+msgstr ""
+
+msgid "ignore changes in amount of whitespace"
+msgstr ""
+
+msgid "ignore changes in whitespace at EOL"
+msgstr ""
+
+msgid "ignore carrier-return at the end of line"
+msgstr ""
+
+msgid "ignore changes whose lines are all blank"
+msgstr ""
+
+msgid "<regex>"
+msgstr ""
+
+msgid "ignore changes whose all lines match <regex>"
+msgstr ""
+
+msgid "heuristic to shift diff hunk boundaries for easy reading"
+msgstr ""
+
+msgid "generate diff using the \"patience diff\" algorithm"
+msgstr ""
+
+msgid "generate diff using the \"histogram diff\" algorithm"
+msgstr ""
+
+msgid "<algorithm>"
+msgstr ""
+
+msgid "choose a diff algorithm"
+msgstr ""
+
+msgid "<text>"
+msgstr ""
+
+msgid "generate diff using the \"anchored diff\" algorithm"
+msgstr ""
+
+msgid "<mode>"
+msgstr ""
+
+msgid "show word diff, using <mode> to delimit changed words"
+msgstr ""
+
+msgid "use <regex> to decide what a word is"
+msgstr ""
+
+msgid "equivalent to --word-diff=color --word-diff-regex=<regex>"
+msgstr ""
+
+msgid "moved lines of code are colored differently"
+msgstr ""
+
+msgid "how white spaces are ignored in --color-moved"
+msgstr ""
+
+msgid "Other diff options"
+msgstr ""
+
+msgid "when run from subdir, exclude changes outside and show relative paths"
+msgstr ""
+
+msgid "treat all files as text"
+msgstr ""
+
+msgid "swap two inputs, reverse the diff"
+msgstr ""
+
+msgid "exit with 1 if there were differences, 0 otherwise"
+msgstr ""
+
+msgid "disable all output of the program"
+msgstr ""
+
+msgid "allow an external diff helper to be executed"
+msgstr ""
+
+msgid "run external text conversion filters when comparing binary files"
+msgstr ""
+
+msgid "<when>"
+msgstr ""
+
+msgid "ignore changes to submodules in the diff generation"
+msgstr ""
+
+msgid "<format>"
+msgstr ""
+
+msgid "specify how differences in submodules are shown"
+msgstr ""
+
+msgid "hide 'git add -N' entries from the index"
+msgstr ""
+
+msgid "treat 'git add -N' entries as real in the index"
+msgstr ""
+
+msgid "<string>"
+msgstr ""
+
+msgid ""
+"look for differences that change the number of occurrences of the specified "
+"string"
+msgstr ""
+
+msgid ""
+"look for differences that change the number of occurrences of the specified "
+"regex"
+msgstr ""
+
+msgid "show all changes in the changeset with -S or -G"
+msgstr ""
+
+msgid "treat <string> in -S as extended POSIX regular expression"
+msgstr ""
+
+msgid "control the order in which files appear in the output"
+msgstr ""
+
+msgid "<path>"
+msgstr ""
+
+msgid "show the change in the specified path first"
+msgstr ""
+
+msgid "skip the output to the specified path"
+msgstr ""
+
+msgid "<object-id>"
+msgstr ""
+
+msgid ""
+"look for differences that change the number of occurrences of the specified "
+"object"
+msgstr ""
+
+msgid "[(A|C|D|M|R|T|U|X|B)...[*]]"
+msgstr ""
+
+msgid "select files by diff type"
+msgstr ""
+
+msgid "<file>"
+msgstr ""
+
+msgid "output to a specific file"
+msgstr ""
+
+msgid "exhaustive rename detection was skipped due to too many files."
+msgstr ""
+
+msgid "only found copies from modified paths due to too many files."
+msgstr ""
+"найдены только копии из измененных путей из-за слишком большого количества "
+"файлов."
+
+#, c-format
+msgid ""
+"you may want to set your %s variable to at least %d and retry the command."
+msgstr ""
+"возможно вы захотите установить переменную %s в как минимум значение %d и "
+"повторить вызов команды."
+
+#, c-format
+msgid "failed to read orderfile '%s'"
+msgstr "сбой чтения orderfile «%s»"
+
+msgid "Performing inexact rename detection"
+msgstr "Выполняется неточное определение переименования"
+
+#, c-format
+msgid "No such path '%s' in the diff"
+msgstr ""
+
+#, c-format
+msgid "pathspec '%s' did not match any file(s) known to git"
+msgstr ""
+
+#, c-format
+msgid "unrecognized pattern: '%s'"
+msgstr ""
+
+#, c-format
+msgid "unrecognized negative pattern: '%s'"
+msgstr ""
+
+#, c-format
+msgid "your sparse-checkout file may have issues: pattern '%s' is repeated"
+msgstr ""
+
+msgid "disabling cone pattern matching"
+msgstr ""
+
+#, c-format
+msgid "cannot use %s as an exclude file"
+msgstr ""
+
+msgid "failed to get kernel name and information"
+msgstr "не удалось получить имя ядра и информацию"
+
+msgid "untracked cache is disabled on this system or location"
+msgstr ""
+
+msgid ""
+"No directory name could be guessed.\n"
+"Please specify a directory on the command line"
+msgstr ""
+"Имя каталога не может быть угадано.\n"
+"Укажите имя каталога с помощью параметра командной строки"
+
+#, c-format
+msgid "index file corrupt in repo %s"
+msgstr ""
+
+#, c-format
+msgid "could not create directories for %s"
+msgstr "не удалось создать каталоги для %s"
+
+#, c-format
+msgid "could not migrate git directory from '%s' to '%s'"
+msgstr "не удалось переместить каталог git с «%s» в «%s»"
+
+#, c-format
+msgid "hint: Waiting for your editor to close the file...%c"
+msgstr "подсказка: Ожидание, пока вы закроете редактор с файлом...%c"
+
+msgid "Filtering content"
+msgstr "Фильтруется содержимое"
+
+#, c-format
+msgid "could not stat file '%s'"
+msgstr "не удалось выполнить stat для файла «%s»"
+
+#, c-format
+msgid "bad git namespace path \"%s\""
+msgstr ""
+
+#, c-format
+msgid "too many args to run %s"
+msgstr ""
+
+msgid "git fetch-pack: expected shallow list"
+msgstr "git fetch-pack: ожидается передача списка для получение части"
+
+msgid "git fetch-pack: expected a flush packet after shallow list"
+msgstr ""
+
+msgid "git fetch-pack: expected ACK/NAK, got a flush packet"
+msgstr "git fetch-pack: ожидается ACK/NAK, а получен пустой пакет"
+
+#, c-format
+msgid "git fetch-pack: expected ACK/NAK, got '%s'"
+msgstr "git fetch-pack: ожидается ACK/NAK, а получено «%s»"
+
+msgid "unable to write to remote"
+msgstr ""
+
+#, c-format
+msgid "invalid shallow line: %s"
+msgstr "неправильная строка частичного получения: %s"
+
+#, c-format
+msgid "invalid unshallow line: %s"
+msgstr "неправильная строка полного получения: %s"
+
+#, c-format
+msgid "object not found: %s"
+msgstr "объект не найден: %s"
+
+#, c-format
+msgid "error in object: %s"
+msgstr "ошибка в объекте: %s"
+
+#, c-format
+msgid "no shallow found: %s"
+msgstr "частичный клон не найден: %s"
+
+#, c-format
+msgid "expected shallow/unshallow, got %s"
+msgstr "ожидалось shallow/unshallow, а получено %s"
+
+#, c-format
+msgid "got %s %d %s"
+msgstr "получено %s %d %s"
+
+#, c-format
+msgid "invalid commit %s"
+msgstr "недопустимый коммит %s"
+
+msgid "giving up"
+msgstr "останавливаю дальнейшие попытки"
+
+msgid "done"
+msgstr "готово"
+
+#, c-format
+msgid "got %s (%d) %s"
+msgstr "получено %s (%d) %s"
+
+#, c-format
+msgid "Marking %s as complete"
+msgstr "Помечаю %s как завершенный"
+
+#, c-format
+msgid "already have %s (%s)"
+msgstr "уже есть %s (%s)"
+
+msgid "fetch-pack: unable to fork off sideband demultiplexer"
+msgstr "fetch-pack: не удалось запустить программу разбора данных"
+
+msgid "protocol error: bad pack header"
+msgstr "ошибка протокола: неправильный заголовок потока"
+
+#, c-format
+msgid "fetch-pack: unable to fork off %s"
+msgstr "fetch-pack: не удалось запустить программу %s"
+
+msgid "fetch-pack: invalid index-pack output"
+msgstr ""
+
+#, c-format
+msgid "%s failed"
+msgstr "%s завершен с ошибкой"
+
+msgid "error in sideband demultiplexer"
+msgstr "произошла  ошибка в  программе разбора данных"
+
+#, c-format
+msgid "Server version is %.*s"
+msgstr "Версия сервера %.*s"
+
+#, c-format
+msgid "Server supports %s"
+msgstr ""
+
+msgid "Server does not support shallow clients"
+msgstr "Сервер не поддерживает клиентов с частичным клонированием"
+
+msgid "Server does not support --shallow-since"
+msgstr "Сервер не поддерживает --shallow-since"
+
+msgid "Server does not support --shallow-exclude"
+msgstr "Сервер не поддерживает --shallow-exclude"
+
+msgid "Server does not support --deepen"
+msgstr "Сервер не поддерживает --deepen"
+
+msgid "Server does not support this repository's object format"
+msgstr ""
+
+msgid "no common commits"
+msgstr "не общих коммитов"
+
+msgid "git fetch-pack: fetch failed."
+msgstr "git fetch-pack: ошибка при получении данных."
+
+#, c-format
+msgid "mismatched algorithms: client %s; server %s"
+msgstr ""
+
+#, c-format
+msgid "the server does not support algorithm '%s'"
+msgstr ""
+
+msgid "Server does not support shallow requests"
+msgstr "Сервер не поддерживает частичные запросы"
+
+msgid "Server supports filter"
+msgstr "Сервер поддерживает фильтрацию"
+
+msgid "unable to write request to remote"
+msgstr ""
+
+#, c-format
+msgid "expected '%s', received '%s'"
+msgstr ""
+
+#, c-format
+msgid "expected '%s'"
+msgstr ""
+
+#, c-format
+msgid "unexpected acknowledgment line: '%s'"
+msgstr ""
+
+#, c-format
+msgid "error processing acks: %d"
+msgstr ""
+
+#. TRANSLATORS: The parameter will be 'ready', a protocol
+#. keyword.
+#.
+#, c-format
+msgid "expected packfile to be sent after '%s'"
+msgstr ""
+
+#. TRANSLATORS: The parameter will be 'ready', a protocol
+#. keyword.
+#.
+#, c-format
+msgid "expected no other sections to be sent after no '%s'"
+msgstr ""
+
+#, c-format
+msgid "error processing shallow info: %d"
+msgstr ""
+
+#, c-format
+msgid "expected wanted-ref, got '%s'"
+msgstr ""
+
+#, c-format
+msgid "unexpected wanted-ref: '%s'"
+msgstr ""
+
+#, c-format
+msgid "error processing wanted refs: %d"
+msgstr ""
+
+msgid "git fetch-pack: expected response end packet"
+msgstr ""
+
+msgid "no matching remote head"
+msgstr "нет соотвествующего внешнего указателя на ветку"
+
+msgid "unexpected 'ready' from remote"
+msgstr ""
+
+#, c-format
+msgid "no such remote ref %s"
+msgstr "нет такой внешней ссылки %s"
+
+#, c-format
+msgid "Server does not allow request for unadvertised object %s"
+msgstr "Сервер не поддерживает запрос необъявленного объекта %s"
+
+#, c-format
+msgid "fsmonitor_ipc__send_query: invalid path '%s'"
+msgstr ""
+
+#, c-format
+msgid "fsmonitor_ipc__send_query: unspecified error on '%s'"
+msgstr ""
+
+msgid "fsmonitor--daemon is not running"
+msgstr ""
+
+#, c-format
+msgid "could not send '%s' command to fsmonitor--daemon"
+msgstr ""
+
+#, c-format
+msgid "bare repository '%s' is incompatible with fsmonitor"
+msgstr ""
+
+#, c-format
+msgid "repository '%s' is incompatible with fsmonitor due to errors"
+msgstr ""
+
+#, c-format
+msgid "remote repository '%s' is incompatible with fsmonitor"
+msgstr ""
+
+#, c-format
+msgid "virtual repository '%s' is incompatible with fsmonitor"
+msgstr ""
+
+#, c-format
+msgid ""
+"repository '%s' is incompatible with fsmonitor due to lack of Unix sockets"
+msgstr ""
+
+msgid ""
+"git [-v | --version] [-h | --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"
+"           [--git-dir=<path>] [--work-tree=<path>] [--namespace=<name>]\n"
+"           [--super-prefix=<path>] [--config-env=<name>=<envvar>]\n"
+"           <command> [<args>]"
+msgstr ""
+
+msgid ""
+"'git help -a' and 'git help -g' list available subcommands and some\n"
+"concept guides. See 'git help <command>' or 'git help <concept>'\n"
+"to read about a specific subcommand or concept.\n"
+"See 'git help git' for an overview of the system."
+msgstr ""
+"«git help -a» и «git help -g» выводит список доступных подкоманд\n"
+"и небольшую справку по понятиям. Смотрите «git help <понятие>»\n"
+"или «git help <термин>» чтобы узнать больше о конкретной подкоманде\n"
+"или понятии.\n"
+"Смотрите «git help git» для получения общего обзора системы."
+
+#, c-format
+msgid "unsupported command listing type '%s'"
+msgstr "неподдерживаемый тип списка команд «%s»"
+
+#, c-format
+msgid "no directory given for '%s' option\n"
+msgstr ""
+
+#, c-format
+msgid "no namespace given for --namespace\n"
+msgstr ""
+
+#, c-format
+msgid "no prefix given for --super-prefix\n"
+msgstr ""
+
+#, c-format
+msgid "-c expects a configuration string\n"
+msgstr ""
+
+#, c-format
+msgid "no config key given for --config-env\n"
+msgstr ""
+
+#, c-format
+msgid "unknown option: %s\n"
+msgstr ""
+
+#, c-format
+msgid "while expanding alias '%s': '%s'"
+msgstr ""
+
+#, c-format
+msgid ""
+"alias '%s' changes environment variables.\n"
+"You can use '!git' in the alias to do this"
+msgstr ""
+
+#, c-format
+msgid "empty alias for %s"
+msgstr ""
+
+#, c-format
+msgid "recursive alias: %s"
+msgstr ""
+
+msgid "write failure on standard output"
+msgstr ""
+
+msgid "unknown write failure on standard output"
+msgstr ""
+
+msgid "close failed on standard output"
+msgstr ""
+
+#, c-format
+msgid "alias loop detected: expansion of '%s' does not terminate:%s"
+msgstr ""
+
+#, c-format
+msgid "cannot handle %s as a builtin"
+msgstr ""
+
+#, c-format
+msgid ""
+"usage: %s\n"
+"\n"
+msgstr ""
+"использование: %s\n"
+"\n"
+
+#, c-format
+msgid "expansion of alias '%s' failed; '%s' is not a git command\n"
+msgstr ""
+
+#, c-format
+msgid "failed to run command '%s': %s\n"
+msgstr ""
+
+msgid "could not create temporary file"
+msgstr "не удалось создать временный файл"
+
+#, c-format
+msgid "failed writing detached signature to '%s'"
+msgstr "сбой записи отсоединенной подписи в «%s»"
+
+msgid ""
+"gpg.ssh.allowedSignersFile needs to be configured and exist for ssh "
+"signature verification"
+msgstr ""
+
+msgid ""
+"ssh-keygen -Y find-principals/verify is needed for ssh signature "
+"verification (available in openssh version 8.2p1+)"
+msgstr ""
+
+#, c-format
+msgid "ssh signing revocation file configured but not found: %s"
+msgstr ""
+
+#, c-format
+msgid "bad/incompatible signature '%s'"
+msgstr ""
+
+#, c-format
+msgid "failed to get the ssh fingerprint for key '%s'"
+msgstr ""
+
+msgid ""
+"either user.signingkey or gpg.ssh.defaultKeyCommand needs to be configured"
+msgstr ""
+
+#, c-format
+msgid "gpg.ssh.defaultKeyCommand succeeded but returned no keys: %s %s"
+msgstr ""
+
+#, c-format
+msgid "gpg.ssh.defaultKeyCommand failed: %s %s"
+msgstr ""
+
+msgid "gpg failed to sign the data"
+msgstr "gpg не удалось подписать данные"
+
+msgid "user.signingKey needs to be set for ssh signing"
+msgstr ""
+
+#, c-format
+msgid "failed writing ssh signing key to '%s'"
+msgstr ""
+
+#, c-format
+msgid "failed writing ssh signing key buffer to '%s'"
+msgstr ""
+
+msgid ""
+"ssh-keygen -Y sign is needed for ssh signing (available in openssh version "
+"8.2p1+)"
+msgstr ""
+
+#, c-format
+msgid "failed reading ssh signing data buffer from '%s'"
+msgstr ""
+
+#, c-format
+msgid "ignored invalid color '%.*s' in log.graphColors"
+msgstr ""
+
+msgid ""
+"given pattern contains NULL byte (via -f <file>). This is only supported "
+"with -P under PCRE v2"
+msgstr ""
+
+#, c-format
+msgid "'%s': unable to read %s"
+msgstr "«%s»: не удалось прочесть %s"
+
+#, c-format
+msgid "'%s': short read"
+msgstr "«%s»: слишком мало данных прочитано"
+
+msgid "start a working area (see also: git help tutorial)"
+msgstr "создание рабочей области (смотрите также: git help tutorial)"
+
+msgid "work on the current change (see also: git help everyday)"
+msgstr "работа с текущими изменениями (смотрите также: git help everyday)"
+
+msgid "examine the history and state (see also: git help revisions)"
+msgstr ""
+"просмотр истории и текущего состояния (смотрите также: git help revisions)"
+
+msgid "grow, mark and tweak your common history"
+msgstr "выращивание, маркировка и правка вашей общей истории"
+
+msgid "collaborate (see also: git help workflows)"
+msgstr "совместная работа (смотрите также: git help workflows)"
+
+msgid "Main Porcelain Commands"
+msgstr "Основные машиночитаемые команды"
+
+msgid "Ancillary Commands / Manipulators"
+msgstr "Вспомогательные команды / Манипуляторы"
+
+msgid "Ancillary Commands / Interrogators"
+msgstr "Вспомогательные команды / Запросчики"
+
+msgid "Interacting with Others"
+msgstr "Взаимодействие с другими"
+
+msgid "Low-level Commands / Manipulators"
+msgstr "Низкоуровневые команды / Манипуляторы"
+
+msgid "Low-level Commands / Interrogators"
+msgstr "Низкоуровневые команды / Запросчики"
+
+msgid "Low-level Commands / Syncing Repositories"
+msgstr ""
+
+msgid "Low-level Commands / Internal Helpers"
+msgstr "Низкоуровневые команды / Внутренние вспомогательные"
+
+#, c-format
+msgid "available git commands in '%s'"
+msgstr "доступные команды git в «%s»"
+
+msgid "git commands available from elsewhere on your $PATH"
+msgstr "команды git, доступные в других местах вашего $PATH"
+
+msgid "These are common Git commands used in various situations:"
+msgstr "Стандартные команды Git используемые в различных ситуациях:"
+
+msgid "The Git concept guides are:"
+msgstr ""
+
+msgid "External commands"
+msgstr ""
+
+msgid "Command aliases"
+msgstr ""
+
+msgid "See 'git help <command>' to read about a specific subcommand"
+msgstr "Запустите «git help <команда>», чтобы прочесть о конкретной подкоманде"
+
+#, c-format
+msgid ""
+"'%s' appears to be a git command, but we were not\n"
+"able to execute it. Maybe git-%s is broken?"
+msgstr ""
+"«%s» похоже на команду git, но нам не удалось ее запустить. Возможно, git-"
+"%s  не работает?"
+
+#, c-format
+msgid "git: '%s' is not a git command. See 'git --help'."
+msgstr "git: «%s» не является командой git. Смотрите «git --help»."
+
+msgid "Uh oh. Your system reports no Git commands at all."
+msgstr "Ой-ёй! Ваша система не сообщает ни о каких командах Git вообще."
+
+#, c-format
+msgid "WARNING: You called a Git command named '%s', which does not exist."
+msgstr "Внимание: Вы запустили не существующую команду Git «%s»."
+
+#, c-format
+msgid "Continuing under the assumption that you meant '%s'."
+msgstr "Продолжаю, предполагая, что вы имели в виду «%s»."
+
+#, c-format
+msgid "Run '%s' instead [y/N]? "
+msgstr ""
+
+#, c-format
+msgid "Continuing in %0.1f seconds, assuming that you meant '%s'."
+msgstr "Продолжу через %0.1f секунд, предполагая, что вы имели в виду «%s»."
+
+msgid ""
+"\n"
+"The most similar command is"
+msgid_plural ""
+"\n"
+"The most similar commands are"
+msgstr[0] ""
+"\n"
+"Самые похожие команды:"
+msgstr[1] ""
+"\n"
+"Самые похожие команды:"
+msgstr[2] ""
+"\n"
+"Самые похожие команды:"
+msgstr[3] ""
+"\n"
+"Самые похожие команды:"
+
+msgid "git version [<options>]"
+msgstr "git version [<options>]"
+
+#, c-format
+msgid "%s: %s - %s"
+msgstr "%s: %s — %s"
+
+msgid ""
+"\n"
+"Did you mean this?"
+msgid_plural ""
+"\n"
+"Did you mean one of these?"
+msgstr[0] ""
+"\n"
+"Возможно, вы имели в виду это?"
+msgstr[1] ""
+"\n"
+"Возможно, вы имели в виду что-то из этого?"
+msgstr[2] ""
+"\n"
+"Возможно, вы имели в виду что-то из этого?"
+msgstr[3] ""
+"\n"
+"Возможно, вы имели в виду что-то из этого?"
+
+#, 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»."
+
+#, c-format
+msgid "Couldn't start hook '%s'\n"
+msgstr ""
+
+#, c-format
+msgid "argument to --packfile must be a valid hash (got '%s')"
+msgstr ""
+
+msgid "not a git repository"
+msgstr ""
+
+#, c-format
+msgid "negative value for http.postBuffer; defaulting to %d"
+msgstr ""
+
+msgid "Delegation control is not supported with cURL < 7.22.0"
+msgstr "Делегация проверки полномочий не поддерживается с cURL < 7.22.0"
+
+msgid "Public key pinning not supported with cURL < 7.39.0"
+msgstr ""
+
+msgid "CURLSSLOPT_NO_REVOKE not supported with cURL < 7.44.0"
+msgstr ""
+
+#, c-format
+msgid "Unsupported SSL backend '%s'. Supported SSL backends:"
+msgstr ""
+
+#, c-format
+msgid "Could not set SSL backend to '%s': cURL was built without SSL backends"
+msgstr ""
+
+#, c-format
+msgid "Could not set SSL backend to '%s': already set"
+msgstr ""
+
+#, c-format
+msgid ""
+"unable to update url base from redirection:\n"
+"  asked for: %s\n"
+"   redirect: %s"
+msgstr ""
+"не удалось обновить базовый url из переадресации:\n"
+"  запрошено: %s\n"
+"   переадресовано: %s"
+
+msgid "Author identity unknown\n"
+msgstr ""
+
+msgid "Committer identity unknown\n"
+msgstr ""
+
+msgid ""
+"\n"
+"*** Please tell me who you are.\n"
+"\n"
+"Run\n"
+"\n"
+"  git config --global user.email \"you@example.com\"\n"
+"  git config --global user.name \"Your Name\"\n"
+"\n"
+"to set your account's default identity.\n"
+"Omit --global to set the identity only in this repository.\n"
+"\n"
+msgstr ""
+"\n"
+"*** Пожалуйста, скажите мне кто вы есть.\n"
+"\n"
+"Запустите\n"
+"\n"
+"  git config --global user.email \"you@example.com\"\n"
+"  git config --global user.name \"Ваше Имя\"\n"
+"\n"
+"для указания идентификационных данных аккаунта по умолчанию.\n"
+"Пропустите параметр --global для указания данных только для этого "
+"репозитория.\n"
+"\n"
+
+msgid "no email was given and auto-detection is disabled"
+msgstr "адрес электронной почты не указан и автоопределение отключено"
+
+#, c-format
+msgid "unable to auto-detect email address (got '%s')"
+msgstr ""
+"не удалось выполнить автоопределение адреса электронной почты (получено «%s»)"
+
+msgid "no name was given and auto-detection is disabled"
+msgstr "имя не указано и автоопределение отключено"
+
+#, c-format
+msgid "unable to auto-detect name (got '%s')"
+msgstr "не удалось выполнить автоопределение имени (получено «%s»)"
+
+#, c-format
+msgid "empty ident name (for <%s>) not allowed"
+msgstr "пустое имя идентификатора (для <%s>) не разрешено"
+
+#, c-format
+msgid "name consists only of disallowed characters: %s"
+msgstr "имя состоит только из неразрешенных симоволов: %s"
+
+msgid "expected 'tree:<depth>'"
+msgstr ""
+
+msgid "sparse:path filters support has been dropped"
+msgstr ""
+
+#, c-format
+msgid "'%s' for 'object:type=<type>' is not a valid object type"
+msgstr ""
+
+#, c-format
+msgid "invalid filter-spec '%s'"
+msgstr ""
+
+#, c-format
+msgid "must escape char in sub-filter-spec: '%c'"
+msgstr ""
+
+msgid "expected something after combine:"
+msgstr ""
+
+msgid "multiple filter-specs cannot be combined"
+msgstr "невозможно объединять фильтрацию с помощью нескольких спецификаций"
+
+msgid "unable to upgrade repository format to support partial clone"
+msgstr ""
+
+msgid "args"
+msgstr "аргументы"
+
+msgid "object filtering"
+msgstr "фильтрация объектов"
+
+#, c-format
+msgid "unable to access sparse blob in '%s'"
+msgstr ""
+
+#, c-format
+msgid "unable to parse sparse filter data in %s"
+msgstr ""
+
+#, c-format
+msgid "entry '%s' in tree %s has tree mode, but is not a tree"
+msgstr ""
+
+#, c-format
+msgid "entry '%s' in tree %s has blob mode, but is not a blob"
+msgstr ""
+
+#, c-format
+msgid "unable to load root tree for commit %s"
+msgstr ""
+
+#, c-format
+msgid ""
+"Unable to create '%s.lock': %s.\n"
+"\n"
+"Another git process seems to be running in this repository, e.g.\n"
+"an editor opened by 'git commit'. Please make sure all processes\n"
+"are terminated then try again. If it still fails, a git process\n"
+"may have crashed in this repository earlier:\n"
+"remove the file manually to continue."
+msgstr ""
+"Не удалось создать «%s.lock»: %s.\n"
+"\n"
+"Похоже, что другой процесс git запущен в этом репозитории,\n"
+"например редактор открыт из «git commit». Пожалуйста, убедитесь,\n"
+"что все процессы были завершены и потом попробуйте снова.\n"
+"Если это не поможет, то возможно процесс git был ранее завершен\n"
+"с ошибкой в этом репозитории: \n"
+"удалите файл вручную для продолжения."
+
+#, c-format
+msgid "Unable to create '%s.lock': %s"
+msgstr "Не удалось создать «%s.lock»: %s"
+
+#, c-format
+msgid "unexpected line: '%s'"
+msgstr ""
+
+msgid "expected flush after ls-refs arguments"
+msgstr ""
+
+msgid "quoted CRLF detected"
+msgstr ""
+
+#, c-format
+msgid ""
+"Your local changes to the following files would be overwritten by merge:\n"
+"  %s"
+msgstr ""
+
+#, c-format
+msgid "Failed to merge submodule %s (not checked out)"
+msgstr "Не удалось слить подмодуль %s (состояние не забрано)"
+
+#, c-format
+msgid "Failed to merge submodule %s (commits not present)"
+msgstr "Не удалось слить подмодуль %s (нет коммитов)"
+
+#, c-format
+msgid "Failed to merge submodule %s (commits don't follow merge-base)"
+msgstr "Не удалось слить подмодуль %s (у коммитов другая база слияния)"
+
+#, c-format
+msgid "Note: Fast-forwarding submodule %s to %s"
+msgstr "Примечание: Быстрая перемотка подмодуля %s до %s"
+
+#, c-format
+msgid "Failed to merge submodule %s"
+msgstr ""
+
+#, c-format
+msgid ""
+"Failed to merge submodule %s, but a possible merge resolution exists:\n"
+"%s\n"
+msgstr ""
+
+#, c-format
+msgid ""
+"If this is correct simply add it to the index for example\n"
+"by using:\n"
+"\n"
+"  git update-index --cacheinfo 160000 %s \"%s\"\n"
+"\n"
+"which will accept this suggestion.\n"
+msgstr ""
+"Если оно верное, то просто добавьте его в индекс, например так:\n"
+"\n"
+"  git update-index --cacheinfo 160000 %s \"%s\"\n"
+"\n"
+"тем самым принимая это предположение.\n"
+
+#, c-format
+msgid ""
+"Failed to merge submodule %s, but multiple possible merges exist:\n"
+"%s"
+msgstr ""
+
+msgid "Failed to execute internal merge"
+msgstr "Не удалось запустить внутреннее слияние"
+
+#, c-format
+msgid "Unable to add %s to database"
+msgstr "Не удалось добавить %s в базу данных"
+
+#, c-format
+msgid "Auto-merging %s"
+msgstr "Автослияние %s"
+
+#, 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 ""
+
+#, 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 ""
+
+#, c-format
+msgid ""
+"CONFLICT (directory rename split): Unclear where to rename %s to; it was "
+"renamed to multiple other directories, with no destination getting a "
+"majority of the files."
+msgstr ""
+
+#, c-format
+msgid ""
+"WARNING: Avoiding applying %s -> %s rename to %s, because %s itself was "
+"renamed."
+msgstr ""
+
+#, c-format
+msgid ""
+"Path updated: %s added in %s inside a directory that was renamed in %s; "
+"moving it to %s."
+msgstr ""
+
+#, c-format
+msgid ""
+"Path updated: %s renamed to %s in %s, inside a directory that was renamed in "
+"%s; moving it to %s."
+msgstr ""
+
+#, 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 ""
+
+#, 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 ""
+
+#, c-format
+msgid "CONFLICT (rename/rename): %s renamed to %s in %s and to %s in %s."
+msgstr ""
+
+#, 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."
+msgstr ""
+
+#, c-format
+msgid "CONFLICT (rename/delete): %s renamed to %s in %s, but deleted in %s."
+msgstr ""
+
+#, c-format
+msgid "cannot read object %s"
+msgstr "невозможно прочитать объект «%s»"
+
+#, c-format
+msgid "object %s is not a blob"
+msgstr "объект %s не является двоичным объектом"
+
+#, c-format
+msgid ""
+"CONFLICT (file/directory): directory in the way of %s from %s; moving it to "
+"%s instead."
+msgstr ""
+
+#, c-format
+msgid ""
+"CONFLICT (distinct types): %s had different types on each side; renamed both "
+"of them so each can be recorded somewhere."
+msgstr ""
+
+#, c-format
+msgid ""
+"CONFLICT (distinct types): %s had different types on each side; renamed one "
+"of them so each can be recorded somewhere."
+msgstr ""
+
+msgid "content"
+msgstr "содержимое"
+
+msgid "add/add"
+msgstr "добавление/добавление"
+
+msgid "submodule"
+msgstr "подмодуль"
+
+#, c-format
+msgid "CONFLICT (%s): Merge conflict in %s"
+msgstr "КОНФЛИКТ (%s): Конфликт слияния в %s"
+
+#, c-format
+msgid ""
+"CONFLICT (modify/delete): %s deleted in %s and modified in %s.  Version %s "
+"of %s left in tree."
+msgstr ""
+
+#, c-format
+msgid ""
+"Note: %s not up to date and in way of checking out conflicted version; old "
+"copy renamed to %s"
+msgstr ""
+
+#. TRANSLATORS: The %s arguments are: 1) tree hash of a merge
+#. base, and 2-3) the trees for the two trees we're merging.
+#.
+#, c-format
+msgid "collecting merge info failed for trees %s, %s, %s"
+msgstr ""
+
+msgid "(bad commit)\n"
+msgstr "(плохой коммит)\n"
+
+#, c-format
+msgid "add_cacheinfo failed for path '%s'; merge aborting."
+msgstr "сбой add_cacheinfo для пути «%s»; отмена слияния."
+
+#, c-format
+msgid "add_cacheinfo failed to refresh for path '%s'; merge aborting."
+msgstr "сбой обновления add_cacheinfo для пути «%s»; отмена слияния."
+
+#, c-format
+msgid "failed to create path '%s'%s"
+msgstr "не удалось создать путь «%s»%s"
+
+#, c-format
+msgid "Removing %s to make room for subdirectory\n"
+msgstr "Удаление %s, чтобы освободить место для подкаталогов\n"
+
+msgid ": perhaps a D/F conflict?"
+msgstr ": возможно, конфликт каталогов/файлов?"
+
+#, c-format
+msgid "refusing to lose untracked file at '%s'"
+msgstr "отказ потери неотслеживаемого файла в «%s»"
+
+#, c-format
+msgid "blob expected for %s '%s'"
+msgstr "ожидается двоичный объект для %s «%s»"
+
+#, c-format
+msgid "failed to open '%s': %s"
+msgstr "не удалось открыть «%s»: %s"
+
+#, c-format
+msgid "failed to symlink '%s': %s"
+msgstr "не удалось создать символьную ссылку «%s»: %s"
+
+#, c-format
+msgid "do not know what to do with %06o %s '%s'"
+msgstr "не понятно, что делать с %06o %s «%s»"
+
+#, c-format
+msgid "Fast-forwarding submodule %s to the following commit:"
+msgstr "Быстрая перемотка подмодуля %s до указанного коммита:"
+
+#, c-format
+msgid "Fast-forwarding submodule %s"
+msgstr "Быстрая перемотка подмодуля %s"
+
+#, c-format
+msgid "Failed to merge submodule %s (merge following commits not found)"
+msgstr "Не удалось слить подмодуль %s (нет указанных коммитов для слияния)"
+
+#, c-format
+msgid "Failed to merge submodule %s (not fast-forward)"
+msgstr "Не удалось слить подмодуль %s (нельзя сделать быструю перемотку)"
+
+msgid "Found a possible merge resolution for the submodule:\n"
+msgstr "Найдено возможное разрешение слиятия для подмодуля:\n"
+
+#, c-format
+msgid "Failed to merge submodule %s (multiple merges found)"
+msgstr "Не удалось слить подмодуль %s (найдено несколько слияний)"
+
+#, c-format
+msgid "Error: Refusing to lose untracked file at %s; writing to %s instead."
+msgstr "Ошибка: Отказ потери неотслеживаемого файла %s; запись в %s взамен."
+
+#, c-format
+msgid ""
+"CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s left "
+"in tree."
+msgstr ""
+"КОНФЛИКТ (%s/удаление): %s удалено в %s и %s в %s. Версия %s из %s оставлена "
+"в дереве."
+
+#, c-format
+msgid ""
+"CONFLICT (%s/delete): %s deleted in %s and %s to %s in %s. Version %s of %s "
+"left in tree."
+msgstr ""
+"КОНФЛИКТ (%s/удаление): %s удалено в %s и от %s до %s в %s. Версия %s из %s "
+"оставлена в дереве."
+
+#, c-format
+msgid ""
+"CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s left "
+"in tree at %s."
+msgstr ""
+"КОНФЛИКТ (%s/удаление): %s удалено в %s и %s в %s. Версия %s из %s оставлена "
+"в дереве на %s."
+
+#, 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 ""
+"КОНФЛИКТ (%s/удаление): %s удалено в %s и от %s до %s в %s. Версия %s из %s "
+"оставлена в дереве на %s."
+
+msgid "rename"
+msgstr "переименование"
+
+msgid "renamed"
+msgstr "переименовано"
+
+#, c-format
+msgid "Refusing to lose dirty file at %s"
+msgstr "Отказ потери изменённого файла %s"
+
+#, c-format
+msgid "Refusing to lose untracked file at %s, even though it's in the way."
+msgstr "Отказ потери неотслеживаемого файла %s, даже с учетом его наличия."
+
+#, c-format
+msgid "CONFLICT (rename/add): Rename %s->%s in %s.  Added %s in %s"
+msgstr ""
+
+#, c-format
+msgid "%s is a directory in %s adding as %s instead"
+msgstr "%s — это каталог в %s, добавляем как %s вместо этого"
+
+#, c-format
+msgid "Refusing to lose untracked file at %s; adding as %s instead"
+msgstr "Отказ потери неотслеживаемого файла %s; добавление как %s взамен."
+
+#, c-format
+msgid ""
+"CONFLICT (rename/rename): Rename \"%s\"->\"%s\" in branch \"%s\" rename \"%s"
+"\"->\"%s\" in \"%s\"%s"
+msgstr ""
+"КОНФЛИКТ (переименование/переименование): Переименование «%s»→«%s» в ветке "
+"«%s» и переименование «%s»→«%s» в ветке «%s»%s"
+
+msgid " (left unresolved)"
+msgstr " (оставлено неразрешенным)"
+
+#, c-format
+msgid "CONFLICT (rename/rename): Rename %s->%s in %s. Rename %s->%s in %s"
+msgstr ""
+"КОНФЛИКТ (переименование/переименование): Переименование «%s»→«%s» в ветке "
+"«%s» и переименование «%s»→«%s» в ветке «%s»"
+
+#, c-format
+msgid ""
+"CONFLICT (directory rename split): Unclear where to place %s because "
+"directory %s was renamed to multiple other directories, with no destination "
+"getting a majority of the files."
+msgstr ""
+
+#, c-format
+msgid ""
+"CONFLICT (rename/rename): Rename directory %s->%s in %s. Rename directory %s-"
+">%s in %s"
+msgstr ""
+
+msgid "modify"
+msgstr "изменение"
+
+msgid "modified"
+msgstr "изменено"
+
+#, c-format
+msgid "Skipped %s (merged same as existing)"
+msgstr "Пропуск %s (слиты одинаковые изменения как существующие)"
+
+#, c-format
+msgid "Adding as %s instead"
+msgstr "Добавление вместо этого как %s"
+
+#, c-format
+msgid "Removing %s"
+msgstr "Удаление %s"
+
+msgid "file/directory"
+msgstr "файл/каталог"
+
+msgid "directory/file"
+msgstr "каталог/файл"
+
+#, c-format
+msgid "CONFLICT (%s): There is a directory with name %s in %s. Adding %s as %s"
+msgstr ""
+"КОНФЛИКТ (%s): Уже существует каталог с именем «%s» в «%s». Добавление «%s» "
+"как «%s»"
+
+#, c-format
+msgid "Adding %s"
+msgstr "Добавление %s"
+
+#, c-format
+msgid "CONFLICT (add/add): Merge conflict in %s"
+msgstr ""
+
+#, c-format
+msgid "merging of trees %s and %s failed"
+msgstr "сбой слияния деревьев «%s» и «%s»"
+
+msgid "Merging:"
+msgstr "Слияние:"
+
+#, c-format
+msgid "found %u common ancestor:"
+msgid_plural "found %u common ancestors:"
+msgstr[0] "найден %u общий предок:"
+msgstr[1] "найдено %u общих предка:"
+msgstr[2] "найдено %u общих предков:"
+msgstr[3] "найдено %u общих предков:"
+
+msgid "merge returned no commit"
+msgstr "слияние не вернуло коммит"
+
+#, c-format
+msgid "Could not parse object '%s'"
+msgstr "Не удалось разобрать объект «%s»"
+
+msgid "failed to read the cache"
+msgstr "сбой чтения кэша"
+
+msgid "multi-pack-index OID fanout is of the wrong size"
+msgstr ""
+
+#, c-format
+msgid "multi-pack-index file %s is too small"
+msgstr ""
+
+#, c-format
+msgid "multi-pack-index signature 0x%08x does not match signature 0x%08x"
+msgstr ""
+
+#, c-format
+msgid "multi-pack-index version %d not recognized"
+msgstr ""
+
+#, c-format
+msgid "multi-pack-index hash version %u does not match version %u"
+msgstr ""
+
+msgid "multi-pack-index missing required pack-name chunk"
+msgstr ""
+
+msgid "multi-pack-index missing required OID fanout chunk"
+msgstr ""
+
+msgid "multi-pack-index missing required OID lookup chunk"
+msgstr ""
+
+msgid "multi-pack-index missing required object offsets chunk"
+msgstr ""
+
+#, c-format
+msgid "multi-pack-index pack names out of order: '%s' before '%s'"
+msgstr ""
+
+#, c-format
+msgid "bad pack-int-id: %u (%u total packs)"
+msgstr ""
+
+msgid "multi-pack-index stores a 64-bit offset, but off_t is too small"
+msgstr ""
+
+#, c-format
+msgid "failed to add packfile '%s'"
+msgstr ""
+
+#, c-format
+msgid "failed to open pack-index '%s'"
+msgstr ""
+
+#, c-format
+msgid "failed to locate object %d in packfile"
+msgstr ""
+
+msgid "cannot store reverse index file"
+msgstr ""
+
+#, c-format
+msgid "could not parse line: %s"
+msgstr ""
+
+#, c-format
+msgid "malformed line: %s"
+msgstr ""
+
+msgid "ignoring existing multi-pack-index; checksum mismatch"
+msgstr ""
+
+msgid "could not load pack"
+msgstr ""
+
+#, c-format
+msgid "could not open index for %s"
+msgstr ""
+
+msgid "Adding packfiles to multi-pack-index"
+msgstr ""
+
+#, c-format
+msgid "unknown preferred pack: '%s'"
+msgstr ""
+
+#, c-format
+msgid "cannot select preferred pack %s with no objects"
+msgstr ""
+
+#, c-format
+msgid "did not see pack-file %s to drop"
+msgstr ""
+
+#, c-format
+msgid "preferred pack '%s' is expired"
+msgstr ""
+
+msgid "no pack files to index."
+msgstr ""
+
+msgid "refusing to write multi-pack .bitmap without any objects"
+msgstr ""
+
+msgid "could not write multi-pack bitmap"
+msgstr ""
+
+msgid "could not write multi-pack-index"
+msgstr ""
+
+#, c-format
+msgid "failed to clear multi-pack-index at %s"
+msgstr ""
+
+msgid "multi-pack-index file exists, but failed to parse"
+msgstr ""
+
+msgid "incorrect checksum"
+msgstr ""
+
+msgid "Looking for referenced packfiles"
+msgstr ""
+
+#, c-format
+msgid ""
+"oid fanout out of order: fanout[%d] = %<PRIx32> > %<PRIx32> = fanout[%d]"
+msgstr ""
+
+msgid "the midx contains no oid"
+msgstr ""
+
+msgid "Verifying OID order in multi-pack-index"
+msgstr ""
+
+#, c-format
+msgid "oid lookup out of order: oid[%d] = %s >= %s = oid[%d]"
+msgstr ""
+
+msgid "Sorting objects by packfile"
+msgstr ""
+
+msgid "Verifying object offsets"
+msgstr ""
+
+#, c-format
+msgid "failed to load pack entry for oid[%d] = %s"
+msgstr ""
+
+#, c-format
+msgid "failed to load pack-index for packfile %s"
+msgstr ""
+
+#, c-format
+msgid "incorrect object offset for oid[%d] = %s: %<PRIx64> != %<PRIx64>"
+msgstr ""
+
+msgid "Counting referenced objects"
+msgstr ""
+
+msgid "Finding and deleting unreferenced packfiles"
+msgstr ""
+
+msgid "could not start pack-objects"
+msgstr ""
+
+msgid "could not finish pack-objects"
+msgstr ""
+
+#, c-format
+msgid "unable to create lazy_dir thread: %s"
+msgstr ""
+
+#, c-format
+msgid "unable to create lazy_name thread: %s"
+msgstr ""
+
+#, c-format
+msgid "unable to join lazy_name thread: %s"
+msgstr ""
+
+#, 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."
+msgstr ""
+"Вы не закончили предыдущее слияние заметок (%s существует).\n"
+"Запустите «git notes merge --commit» или «git notes merge --abort» для "
+"коммита или отмены предыдущего слияния и запуска нового слияния заметок."
+
+#, c-format
+msgid "You have not concluded your notes merge (%s exists)."
+msgstr "Вы не закончили предыдущее слияние заметок (%s существует)."
+
+msgid "Cannot commit uninitialized/unreferenced notes tree"
+msgstr ""
+"Нельзя закоммитить неинициализированное или не имеющее ссылок дерево заметок"
+
+#, c-format
+msgid "Bad notes.rewriteMode value: '%s'"
+msgstr "Неправильное значение notes.rewriteMode: «%s»"
+
+#, c-format
+msgid "Refusing to rewrite notes in %s (outside of refs/notes/)"
+msgstr "Отказ в перезаписи заметок в %s (за пределами refs/notes/)"
+
+#. TRANSLATORS: The first %s is the name of
+#. the environment variable, the second %s is
+#. its value.
+#.
+#, c-format
+msgid "Bad %s value: '%s'"
+msgstr "Неправильное значение переменной %s: «%s»"
+
+#, c-format
+msgid "object directory %s does not exist; check .git/objects/info/alternates"
+msgstr ""
+
+#, c-format
+msgid "unable to normalize alternate object path: %s"
+msgstr ""
+
+#, c-format
+msgid "%s: ignoring alternate object stores, nesting too deep"
+msgstr ""
+
+#, c-format
+msgid "unable to normalize object directory: %s"
+msgstr ""
+
+msgid "unable to fdopen alternates lockfile"
+msgstr ""
+
+msgid "unable to read alternates file"
+msgstr ""
+
+msgid "unable to move new alternates file into place"
+msgstr ""
+
+#, c-format
+msgid "path '%s' does not exist"
+msgstr "путь «%s» не существует"
+
+#, c-format
+msgid "reference repository '%s' as a linked checkout is not supported yet."
+msgstr ""
+"ссылаемый репозиторий «%s» как связанное состояние, пока не поддерживается."
+
+#, c-format
+msgid "reference repository '%s' is not a local repository."
+msgstr "ссылаемый репозиторий «%s» не является локальным."
+
+#, c-format
+msgid "reference repository '%s' is shallow"
+msgstr "ссылаемый репозиторий «%s» является частичным"
+
+#, c-format
+msgid "reference repository '%s' is grafted"
+msgstr "ссылаемый репозиторий «%s» является сращенным"
+
+#, c-format
+msgid "could not find object directory matching %s"
+msgstr ""
+
+#, c-format
+msgid "invalid line while parsing alternate refs: %s"
+msgstr ""
+
+#, c-format
+msgid "attempting to mmap %<PRIuMAX> over limit %<PRIuMAX>"
+msgstr ""
+
+#, c-format
+msgid "mmap failed%s"
+msgstr ""
+
+#, c-format
+msgid "object file %s is empty"
+msgstr ""
+
+#, c-format
+msgid "corrupt loose object '%s'"
+msgstr ""
+
+#, c-format
+msgid "garbage at end of loose object '%s'"
+msgstr ""
+
+#, c-format
+msgid "unable to parse %s header"
+msgstr ""
+
+msgid "invalid object type"
+msgstr ""
+
+#, c-format
+msgid "unable to unpack %s header"
+msgstr ""
+
+#, c-format
+msgid "header for %s too long, exceeds %d bytes"
+msgstr ""
+
+#, c-format
+msgid "failed to read object %s"
+msgstr ""
+
+#, c-format
+msgid "replacement %s not found for %s"
+msgstr ""
+
+#, c-format
+msgid "loose object %s (stored in %s) is corrupt"
+msgstr ""
+
+#, c-format
+msgid "packed object %s (stored in %s) is corrupt"
+msgstr ""
+
+#, c-format
+msgid "unable to write file %s"
+msgstr ""
+
+#, c-format
+msgid "unable to set permission to '%s'"
+msgstr ""
+
+msgid "file write error"
+msgstr ""
+
+msgid "error when closing loose object file"
+msgstr ""
+
+#, c-format
+msgid "insufficient permission for adding an object to repository database %s"
+msgstr ""
+
+msgid "unable to create temporary file"
+msgstr ""
+
+msgid "unable to write loose object file"
+msgstr ""
+
+#, c-format
+msgid "unable to deflate new object %s (%d)"
+msgstr ""
+
+#, c-format
+msgid "deflateEnd on object %s failed (%d)"
+msgstr ""
+
+#, c-format
+msgid "confused by unstable object source data for %s"
+msgstr ""
+
+#, c-format
+msgid "cannot read object for %s"
+msgstr ""
+
+msgid "corrupt commit"
+msgstr ""
+
+msgid "corrupt tag"
+msgstr ""
+
+#, c-format
+msgid "read error while indexing %s"
+msgstr ""
+
+#, c-format
+msgid "short read while indexing %s"
+msgstr ""
+
+#, c-format
+msgid "%s: failed to insert into database"
+msgstr ""
+
+#, c-format
+msgid "%s: unsupported file type"
+msgstr ""
+
+#, c-format
+msgid "%s is not a valid '%s' object"
+msgstr "%s не является действительным объектом «%s»"
+
+#, c-format
+msgid "unable to open %s"
+msgstr "не удалось открыть %s"
+
+#, c-format
+msgid "hash mismatch for %s (expected %s)"
+msgstr "несоответствие хэш-кода %s (ожидается %s)"
+
+#, c-format
+msgid "unable to mmap %s"
+msgstr ""
+
+#, c-format
+msgid "unable to unpack header of %s"
+msgstr ""
+
+#, c-format
+msgid "unable to parse header of %s"
+msgstr ""
+
+#, c-format
+msgid "unable to unpack contents of %s"
+msgstr ""
+
+#. TRANSLATORS: This is a line of ambiguous object
+#. output shown when we cannot look up or parse the
+#. object in question. E.g. "deadbeef [bad object]".
+#.
+#, c-format
+msgid "%s [bad object]"
+msgstr ""
+
+#. TRANSLATORS: This is a line of ambiguous commit
+#. object output. E.g.:
+#. *
+#.    "deadbeef commit 2021-01-01 - Some Commit Message"
+#.
+#, c-format
+msgid "%s commit %s - %s"
+msgstr ""
+
+#. TRANSLATORS: This is a line of ambiguous
+#. tag object output. E.g.:
+#. *
+#.    "deadbeef tag 2022-01-01 - Some Tag Message"
+#. *
+#. The second argument is the YYYY-MM-DD found
+#. in the tag.
+#. *
+#. The third argument is the "tag" string
+#. from object.c.
+#.
+#, c-format
+msgid "%s tag %s - %s"
+msgstr ""
+
+#. TRANSLATORS: This is a line of ambiguous
+#. tag object output where we couldn't parse
+#. the tag itself. E.g.:
+#. *
+#.    "deadbeef [bad tag, could not parse it]"
+#.
+#, c-format
+msgid "%s [bad tag, could not parse it]"
+msgstr ""
+
+#. TRANSLATORS: This is a line of ambiguous <type>
+#. object output. E.g. "deadbeef tree".
+#.
+#, c-format
+msgid "%s tree"
+msgstr ""
+
+#. TRANSLATORS: This is a line of ambiguous <type>
+#. object output. E.g. "deadbeef blob".
+#.
+#, c-format
+msgid "%s blob"
+msgstr ""
+
+#, c-format
+msgid "short object ID %s is ambiguous"
+msgstr ""
+
+#. TRANSLATORS: The argument is the list of ambiguous
+#. objects composed in show_ambiguous_object(). See
+#. its "TRANSLATORS" comments for details.
+#.
+#, c-format
+msgid ""
+"The candidates are:\n"
+"%s"
+msgstr ""
+
+msgid ""
+"Git normally never creates a ref that ends with 40 hex characters\n"
+"because it will be ignored when you just specify 40-hex. These refs\n"
+"may be created by mistake. For example,\n"
+"\n"
+"  git switch -c $br $(git rev-parse ...)\n"
+"\n"
+"where \"$br\" is somehow empty and a 40-hex ref is created. Please\n"
+"examine these refs and maybe delete them. Turn this message off by\n"
+"running \"git config advice.objectNameWarning false\""
+msgstr ""
+
+#, c-format
+msgid "log for '%.*s' only goes back to %s"
+msgstr ""
+
+#, c-format
+msgid "log for '%.*s' only has %d entries"
+msgstr ""
+
+#, c-format
+msgid "path '%s' exists on disk, but not in '%.*s'"
+msgstr ""
+
+#, c-format
+msgid ""
+"path '%s' exists, but not '%s'\n"
+"hint: Did you mean '%.*s:%s' aka '%.*s:./%s'?"
+msgstr ""
+
+#, c-format
+msgid "path '%s' does not exist in '%.*s'"
+msgstr ""
+
+#, c-format
+msgid ""
+"path '%s' is in the index, but not at stage %d\n"
+"hint: Did you mean ':%d:%s'?"
+msgstr ""
+
+#, c-format
+msgid ""
+"path '%s' is in the index, but not '%s'\n"
+"hint: Did you mean ':%d:%s' aka ':%d:./%s'?"
+msgstr ""
+
+#, c-format
+msgid "path '%s' exists on disk, but not in the index"
+msgstr ""
+
+#, c-format
+msgid "path '%s' does not exist (neither on disk nor in the index)"
+msgstr ""
+
+msgid "relative path syntax can't be used outside working tree"
+msgstr ""
+
+#, c-format
+msgid "<object>:<path> required, only <object> '%s' given"
+msgstr ""
+
+#, c-format
+msgid "invalid object name '%.*s'."
+msgstr ""
+
+#, c-format
+msgid "invalid object type \"%s\""
+msgstr ""
+
+#, c-format
+msgid "object %s is a %s, not a %s"
+msgstr ""
+
+#, c-format
+msgid "object %s has unknown type id %d"
+msgstr ""
+
+#, c-format
+msgid "unable to parse object: %s"
+msgstr "не удалось разобрать объект: %s"
+
+#, c-format
+msgid "hash mismatch %s"
+msgstr "несоответствие хэш-кода %s"
+
+msgid "multi-pack bitmap is missing required reverse index"
+msgstr ""
+
+#, c-format
+msgid "could not open pack %s"
+msgstr ""
+
+#, c-format
+msgid "preferred pack (%s) is invalid"
+msgstr ""
+
+#, c-format
+msgid "could not find %s in pack %s at offset %<PRIuMAX>"
+msgstr ""
+
+#, c-format
+msgid "mtimes file %s is too small"
+msgstr ""
+
+#, c-format
+msgid "mtimes file %s has unknown signature"
+msgstr ""
+
+#, c-format
+msgid "mtimes file %s has unsupported version %<PRIu32>"
+msgstr ""
+
+#, c-format
+msgid "mtimes file %s has unsupported hash id %<PRIu32>"
+msgstr ""
+
+#, c-format
+msgid "mtimes file %s is corrupt"
+msgstr ""
+
+#, c-format
+msgid "reverse-index file %s is too small"
+msgstr ""
+
+#, c-format
+msgid "reverse-index file %s is corrupt"
+msgstr ""
+
+#, c-format
+msgid "reverse-index file %s has unknown signature"
+msgstr ""
+
+#, c-format
+msgid "reverse-index file %s has unsupported version %<PRIu32>"
+msgstr ""
+
+#, c-format
+msgid "reverse-index file %s has unsupported hash id %<PRIu32>"
+msgstr ""
+
+msgid "cannot both write and verify reverse index"
+msgstr ""
+
+#, c-format
+msgid "could not stat: %s"
+msgstr ""
+
+#, c-format
+msgid "failed to make %s readable"
+msgstr ""
+
+#, c-format
+msgid "could not write '%s' promisor file"
+msgstr ""
+
+msgid "offset before end of packfile (broken .idx?)"
+msgstr "сдвиг до конца файла пакета (возможно, повреждён файл .idx?)"
+
+#, c-format
+msgid "packfile %s cannot be mapped%s"
+msgstr ""
+
+#, c-format
+msgid "offset before start of pack index for %s (corrupt index?)"
+msgstr "сдвиг до начала индекса пакета для %s (повреждён индекс?)"
+
+#, c-format
+msgid "offset beyond end of pack index for %s (truncated index?)"
+msgstr "сдвиг за пределами индекса пакета для %s (обрезан индекс?)"
+
+#, c-format
+msgid "malformed expiration date '%s'"
+msgstr ""
+
+#, c-format
+msgid "option `%s' expects \"always\", \"auto\", or \"never\""
+msgstr ""
+
+#, c-format
+msgid "malformed object name '%s'"
+msgstr "Неправильное имя объекта «%s»"
+
+#, c-format
+msgid "option `%s' expects \"%s\" or \"%s\""
+msgstr ""
+
+#, c-format
+msgid "%s requires a value"
+msgstr ""
+
+#, c-format
+msgid "%s is incompatible with %s"
+msgstr ""
+
+#, c-format
+msgid "%s : incompatible with something else"
+msgstr ""
+
+#, c-format
+msgid "%s takes no value"
+msgstr ""
+
+#, c-format
+msgid "%s isn't available"
+msgstr ""
+
+#, c-format
+msgid "%s expects a non-negative integer value with an optional k/m/g suffix"
+msgstr ""
+
+#, c-format
+msgid "ambiguous option: %s (could be --%s%s or --%s%s)"
+msgstr ""
+
+#, c-format
+msgid "did you mean `--%s` (with two dashes)?"
+msgstr "имелось в виду `--%s` (с двумя дефисами)?"
+
+#, c-format
+msgid "alias of --%s"
+msgstr ""
+
+#, c-format
+msgid "unknown option `%s'"
+msgstr ""
+
+#, c-format
+msgid "unknown switch `%c'"
+msgstr ""
+
+#, c-format
+msgid "unknown non-ascii option in string: `%s'"
+msgstr ""
+
+msgid "..."
+msgstr "..."
+
+#, c-format
+msgid "usage: %s"
+msgstr "использование: %s"
+
+#. TRANSLATORS: the colon here should align with the
+#. one in "usage: %s" translation.
+#.
+#, 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.
+#.
+#, c-format
+msgid "%*s%s"
+msgstr ""
+
+#, c-format
+msgid "    %s"
+msgstr "            %s"
+
+msgid "-NUM"
+msgstr "-КОЛИЧЕСТВО"
+
+msgid "expiry-date"
+msgstr "дата-окончания"
+
+msgid "no-op (backward compatibility)"
+msgstr "ничего не делает (оставлено для обратной совместимости)"
+
+msgid "be more verbose"
+msgstr "быть многословнее"
+
+msgid "be more quiet"
+msgstr "тихий режим"
+
+msgid "use <n> digits to display object names"
+msgstr ""
+
+msgid "how to strip spaces and #comments from message"
+msgstr "как удалять пробелы и #комментарии из сообщения коммита"
+
+msgid "read pathspec from file"
+msgstr ""
+
+msgid ""
+"with --pathspec-from-file, pathspec elements are separated with NUL character"
+msgstr ""
+
+#, c-format
+msgid "Could not make %s writable by group"
+msgstr "Не удалось предоставить доступ к %s на запись"
+
+msgid "Escape character '\\' not allowed as last character in attr value"
+msgstr ""
+"Управляющий символ «\\» не разрешен как последний символ в значении attr"
+
+msgid "Only one 'attr:' specification is allowed."
+msgstr "Разрешен только один спецификатор «attr:»."
+
+msgid "attr spec must not be empty"
+msgstr "спецификатор attr не должен быть пустой"
+
+#, c-format
+msgid "invalid attribute name %s"
+msgstr "недопустимое имя атрибута %s"
+
+msgid "global 'glob' and 'noglob' pathspec settings are incompatible"
+msgstr ""
+"глобальные опции спецификаторов пути «glob» и «noglob» нельзя использовать "
+"одновременно"
+
+msgid ""
+"global 'literal' pathspec setting is incompatible with all other global "
+"pathspec settings"
+msgstr ""
+"глобальная опция спецификатора пути «literal» не совместима с другими "
+"глобальными спецификаторами доступа"
+
+msgid "invalid parameter for pathspec magic 'prefix'"
+msgstr ""
+"неправильный параметр для магического слова «prefix» в спецификаторе пути"
+
+#, c-format
+msgid "Invalid pathspec magic '%.*s' in '%s'"
+msgstr "неправильное магическое слово «%.*s» в спецификаторе пути «%s»"
+
+#, c-format
+msgid "Missing ')' at the end of pathspec magic in '%s'"
+msgstr "Пропущено «)» в конце магического слова спецификатора пути «%s»"
+
+#, c-format
+msgid "Unimplemented pathspec magic '%c' in '%s'"
+msgstr "Нереализованное магическое слово «%c» спецификатора пути «%s»"
+
+#, c-format
+msgid "%s: 'literal' and 'glob' are incompatible"
+msgstr "%s: «literal» и «glob» не совместимы"
+
+#, c-format
+msgid "%s: '%s' is outside repository at '%s'"
+msgstr ""
+
+#, c-format
+msgid "'%s' (mnemonic: '%c')"
+msgstr "«%s» (мнемоника: «%c»)"
+
+#, c-format
+msgid "%s: pathspec magic not supported by this command: %s"
+msgstr ""
+"%s: магические слова в спецификаторе пути не поддерживаются командой: %s"
+
+#, c-format
+msgid "pathspec '%s' is beyond a symbolic link"
+msgstr "спецификатор пути «%s» находится за символической ссылкой"
+
+#, c-format
+msgid "line is badly quoted: %s"
+msgstr ""
+
+msgid "unable to write flush packet"
+msgstr ""
+
+msgid "unable to write delim packet"
+msgstr ""
+
+msgid "unable to write response end packet"
+msgstr ""
+
+msgid "flush packet write failed"
+msgstr ""
+
+msgid "protocol error: impossibly long line"
+msgstr ""
+
+msgid "packet write with format failed"
+msgstr ""
+
+msgid "packet write failed - data exceeds max packet size"
+msgstr ""
+
+#, c-format
+msgid "packet write failed: %s"
+msgstr ""
+
+msgid "read error"
+msgstr ""
+
+msgid "the remote end hung up unexpectedly"
+msgstr ""
+
+#, c-format
+msgid "protocol error: bad line length character: %.4s"
+msgstr ""
+
+#, c-format
+msgid "protocol error: bad line length %d"
+msgstr ""
+
+#, c-format
+msgid "remote error: %s"
+msgstr "ошибка внешнего репозитория: %s"
+
+msgid "Refreshing index"
+msgstr ""
+
+#, c-format
+msgid "unable to create threaded lstat: %s"
+msgstr ""
+
+msgid "unable to parse --pretty format"
+msgstr "не удалось разобрать формат для --pretty"
+
+msgid "promisor-remote: unable to fork off fetch subprocess"
+msgstr ""
+
+msgid "promisor-remote: could not write to fetch subprocess"
+msgstr ""
+
+msgid "promisor-remote: could not close stdin to fetch subprocess"
+msgstr ""
+
+#, c-format
+msgid "promisor remote name cannot begin with '/': %s"
+msgstr ""
+
+msgid "object-info: expected flush after arguments"
+msgstr ""
+
+msgid "Removing duplicate objects"
+msgstr "Удаление дублирующихся объектов"
+
+msgid "could not start `log`"
+msgstr ""
+
+msgid "could not read `log` output"
+msgstr ""
+
+#, c-format
+msgid "could not parse commit '%s'"
+msgstr "не удалось разобрать коммит «%s»"
+
+#, c-format
+msgid ""
+"could not parse first line of `log` output: did not start with 'commit ': "
+"'%s'"
+msgstr ""
+
+#, c-format
+msgid "could not parse git header '%.*s'"
+msgstr ""
+
+msgid "failed to generate diff"
+msgstr ""
+
+#, c-format
+msgid "could not parse log for '%s'"
+msgstr ""
+
+#, c-format
+msgid "will not add file alias '%s' ('%s' already exists in index)"
+msgstr ""
+
+msgid "cannot create an empty blob in the object database"
+msgstr ""
+
+#, c-format
+msgid "%s: can only add regular files, symbolic links or git-directories"
+msgstr ""
+
+#, c-format
+msgid "unable to index file '%s'"
+msgstr ""
+
+#, c-format
+msgid "unable to add '%s' to index"
+msgstr ""
+
+#, c-format
+msgid "unable to stat '%s'"
+msgstr ""
+
+#, c-format
+msgid "'%s' appears as both a file and as a directory"
+msgstr ""
+
+msgid "Refresh index"
+msgstr ""
+
+#, c-format
+msgid ""
+"index.version set, but the value is invalid.\n"
+"Using version %i"
+msgstr ""
+"index.version указан, но значение недействительное.\n"
+"Использую версию %i"
+
+#, c-format
+msgid ""
+"GIT_INDEX_VERSION set, but the value is invalid.\n"
+"Using version %i"
+msgstr ""
+"GIT_INDEX_VERSION указан, но значение недействительное.\n"
+"Использую версию %i"
+
+#, c-format
+msgid "bad signature 0x%08x"
+msgstr ""
+
+#, c-format
+msgid "bad index version %d"
+msgstr ""
+
+msgid "bad index file sha1 signature"
+msgstr ""
+
+#, c-format
+msgid "index uses %.4s extension, which we do not understand"
+msgstr ""
+
+#, c-format
+msgid "ignoring %.4s extension"
+msgstr ""
+
+#, c-format
+msgid "unknown index entry format 0x%08x"
+msgstr ""
+
+#, c-format
+msgid "malformed name field in the index, near path '%s'"
+msgstr ""
+
+msgid "unordered stage entries in index"
+msgstr ""
+
+#, c-format
+msgid "multiple stage entries for merged file '%s'"
+msgstr ""
+
+#, c-format
+msgid "unordered stage entries for '%s'"
+msgstr ""
+
+#, c-format
+msgid "unable to create load_cache_entries thread: %s"
+msgstr ""
+
+#, c-format
+msgid "unable to join load_cache_entries thread: %s"
+msgstr ""
+
+#, c-format
+msgid "%s: index file open failed"
+msgstr ""
+
+#, c-format
+msgid "%s: cannot stat the open index"
+msgstr ""
+
+#, c-format
+msgid "%s: index file smaller than expected"
+msgstr ""
+
+#, c-format
+msgid "%s: unable to map index file%s"
+msgstr ""
+
+#, c-format
+msgid "unable to create load_index_extensions thread: %s"
+msgstr ""
+
+#, c-format
+msgid "unable to join load_index_extensions thread: %s"
+msgstr ""
+
+#, c-format
+msgid "could not freshen shared index '%s'"
+msgstr ""
+
+#, c-format
+msgid "broken index, expect %s in %s, got %s"
+msgstr ""
+
+msgid "cannot write split index for a sparse index"
+msgstr ""
+
+msgid "failed to convert to a sparse-index"
+msgstr ""
+
+#, c-format
+msgid "could not stat '%s'"
+msgstr "не удалось выполнить stat для «%s»"
+
+#, c-format
+msgid "unable to open git dir: %s"
+msgstr "не удалось открыть каталог git: %s"
+
+#, c-format
+msgid "unable to unlink: %s"
+msgstr "не удалось отсоединить: %s"
+
+#, c-format
+msgid "cannot fix permission bits on '%s'"
+msgstr ""
+
+#, c-format
+msgid "%s: cannot drop to stage #0"
+msgstr ""
+
+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 ""
+"Вы можете исправить это с помощью «git rebase --edit-todo», а потом запустив "
+"«git rebase --continue».\n"
+"Или вы можете прервать процесс перемещения, выполнив «git rebase --abort»\n"
+
+#, c-format
+msgid ""
+"unrecognized setting %s for option rebase.missingCommitsCheck. Ignoring."
+msgstr ""
+"нераспознанная настройка %s для опции rebase.missingCommitsCheck. Игнорирую."
 
-#: git-rebase--preserve-merges.sh:197
 msgid ""
 "\n"
 "Commands:\n"
@@ -23041,313 +17527,3171 @@ msgid ""
 "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"
+"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"
 "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"
+".       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Команды:\np, pick <коммит> = использовать коммит\nr, reword <коммит> = использовать коммит, но изменить сообщение коммита\ne, edit <коммит> = использовать коммит, но остановиться для исправления\ns, squash <коммит> = использовать коммит, но объединить с предыдущим коммитом\nf, fixup <коммит> = как «squash», но пропустить сообщение коммита\nx, exec <команда> = выполнить команду (остаток строки) с помощью командной оболочки\nd, drop <коммит> = удалить коммит\nl, label <метка> = дать имя текущему HEAD\nt, reset <метка> = сбросить HEAD к указанной метке\nm, merge [-C <коммит> | -c <коммит>] <метка> [# <строка>]\n. создать слияние используя сообщение коммита оригинального\n. слияния (или использовать указанную строку, если оригинальное\n. слияние не указано). Используйте -c <коммит> чтобы изменить\n. сообщение коммита.\n\nЭти строки можно перемещать; они будут выполнены сверху вниз.\n"
+msgstr ""
+
+#, c-format
+msgid "Rebase %s onto %s (%d command)"
+msgid_plural "Rebase %s onto %s (%d commands)"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+msgstr[3] ""
 
-#: 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"
+"Do not remove any line. Use 'drop' explicitly to remove a commit.\n"
+msgstr ""
+"\n"
+"Не удаляйте строки. Используйте «drop», чтобы явно удалить коммит.\n"
+
+msgid ""
 "\n"
-"Once you are satisfied with your changes, run\n"
+"If you remove a line here THAT COMMIT WILL BE LOST.\n"
+msgstr ""
 "\n"
-"\tgit rebase --continue"
-msgstr "Теперь вы можете исправить коммит с помощью\n\n\tgit commit --amend $gpg_sign_opt_quoted\n\nКак только вы будете довольны результатом, запустите\n\n\tgit rebase --continue"
+"Если вы удалите строку здесь, то УКАЗАННЫЙ КОММИТ БУДЕТ УТЕРЯН.\n"
 
-#: git-rebase--preserve-merges.sh:285
-#, sh-format
-msgid "$sha1: not a commit that can be picked"
-msgstr "$sha1: не является коммитом, который можно взять"
+msgid ""
+"\n"
+"You are editing the todo file of an ongoing interactive rebase.\n"
+"To continue rebase after editing, run:\n"
+"    git rebase --continue\n"
+"\n"
+msgstr ""
+"\n"
+"Вы сейчас редактируете файл со списком дел для интерактивного перемещения.\n"
+"Для продолжения перемещения, после редактирования файла запустите:\n"
+"    git rebase --continue\n"
+"\n"
 
-#: git-rebase--preserve-merges.sh:324
-#, sh-format
-msgid "Invalid commit name: $sha1"
-msgstr "Недопустимое имя коммита: $sha1"
+msgid ""
+"\n"
+"However, if you remove everything, the rebase will be aborted.\n"
+"\n"
+msgstr ""
+"\n"
+"Но если вы удалите все, то процесс перемещения будет будет прерван.\n"
+"\n"
 
-#: git-rebase--preserve-merges.sh:354
-msgid "Cannot write current commit's replacement sha1"
-msgstr "Не удалось записать замену sha1 текущего коммита"
+#, c-format
+msgid "could not write '%s'."
+msgstr "не удалось записать «%s»."
 
-#: git-rebase--preserve-merges.sh:405
-#, sh-format
-msgid "Fast-forward to $sha1"
-msgstr "Перемотка вперед до $sha1"
+#, c-format
+msgid ""
+"Warning: some commits may have been dropped accidentally.\n"
+"Dropped commits (newer to older):\n"
+msgstr ""
+"Внимание: некоторые коммиты могли быть отброшены по ошибке.\n"
+"Отброшенные коммиты (от новых к старым):\n"
 
-#: git-rebase--preserve-merges.sh:407
-#, sh-format
-msgid "Cannot fast-forward to $sha1"
-msgstr "Не удалось перемотать вперед до $sha1"
+#, c-format
+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"
+"The possible behaviours are: ignore, warn, error.\n"
+"\n"
+msgstr ""
+"Чтобы избежать этого сообщения, используйте «drop» чтобы явно удалить "
+"коммит.\n"
+"\n"
+"Используйте опцию «git config rebase.missingCommitsCheck» для изменения "
+"количества предупреждений.\n"
+"Возможные значения: ignore, warn, error.\n"
+"\n"
 
-#: git-rebase--preserve-merges.sh:416
-#, sh-format
-msgid "Cannot move HEAD to $first_parent"
-msgstr "Не удалось переместить HEAD на $first_parent"
+#, c-format
+msgid "%s: 'preserve' superseded by 'merges'"
+msgstr ""
 
-#: git-rebase--preserve-merges.sh:421
-#, sh-format
-msgid "Refusing to squash a merge: $sha1"
-msgstr "Нельзя уплотнить слияние: $sha1"
+msgid "gone"
+msgstr "отсутствует"
 
-#: git-rebase--preserve-merges.sh:439
-#, sh-format
-msgid "Error redoing merge $sha1"
-msgstr "Ошибка при повторении слияния $sha1"
+#, c-format
+msgid "ahead %d"
+msgstr "впереди %d"
 
-#: git-rebase--preserve-merges.sh:448
-#, sh-format
-msgid "Could not pick $sha1"
-msgstr "Не удалось взять $sha1"
+#, c-format
+msgid "behind %d"
+msgstr "позади %d"
 
-#: git-rebase--preserve-merges.sh:457
-#, sh-format
-msgid "This is the commit message #${n}:"
-msgstr "Это сообщение коммита номер #${n}:"
+#, c-format
+msgid "ahead %d, behind %d"
+msgstr "впереди %d, позади %d"
 
-#: git-rebase--preserve-merges.sh:462
-#, sh-format
-msgid "The commit message #${n} will be skipped:"
-msgstr "Сообщение коммита номер #${n} будет пропущено:"
+#, c-format
+msgid "expected format: %%(color:<color>)"
+msgstr "ожидаемый формат: %%(color:<color>)"
 
-#: 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 коммитов"
-msgstr[2] "Это объединение $count коммитов"
-msgstr[3] "Это объединение $count коммитов"
-
-#: git-rebase--preserve-merges.sh:482
-#, sh-format
-msgid "Cannot write $fixup_msg"
-msgstr "Не удалось записать $fixup_msg"
+#, c-format
+msgid "unrecognized color: %%(color:%s)"
+msgstr "неопознанный цвет: %%(color:%s)"
 
-#: git-rebase--preserve-merges.sh:485
-msgid "This is a combination of 2 commits."
-msgstr "Это объединение 2 коммитов"
+#, c-format
+msgid "Integer value expected refname:lstrip=%s"
+msgstr "Ожидается целочисленное значение refname:lstrip=%s"
 
-#: 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"
+#, c-format
+msgid "Integer value expected refname:rstrip=%s"
+msgstr "Ожидается целочисленное значение refname:rstrip=%s"
 
-#: git-rebase--preserve-merges.sh:601
-#, sh-format
+#, c-format
+msgid "unrecognized %%(%s) argument: %s"
+msgstr "неопознанный аргумент %%(%s): %s"
+
+#, c-format
+msgid "%%(objecttype) does not take arguments"
+msgstr ""
+
+#, c-format
+msgid "%%(deltabase) does not take arguments"
+msgstr ""
+
+#, c-format
+msgid "%%(body) does not take arguments"
+msgstr "параметр %%(body) не принимает аргументы"
+
+#, c-format
+msgid "expected %%(trailers:key=<value>)"
+msgstr ""
+
+#, c-format
+msgid "unknown %%(trailers) argument: %s"
+msgstr "неизвестный аргумент для %%(trailers): %s"
+
+#, c-format
+msgid "positive value expected contents:lines=%s"
+msgstr "положительное значение ожидает contents:lines=%s"
+
+#, c-format
+msgid "positive value expected '%s' in %%(%s)"
+msgstr ""
+
+#, c-format
+msgid "unrecognized email option: %s"
+msgstr ""
+
+#, c-format
+msgid "expected format: %%(align:<width>,<position>)"
+msgstr "ожидаемый формат: %%(align:<width>,<position>)"
+
+#, c-format
+msgid "unrecognized position:%s"
+msgstr "неопознанная позиция:%s"
+
+#, c-format
+msgid "unrecognized width:%s"
+msgstr "неопознанная ширина:%s"
+
+#, c-format
+msgid "positive width expected with the %%(align) atom"
+msgstr "ожидается положительная ширина с указанием частицы %%(align)"
+
+#, c-format
+msgid "%%(rest) does not take arguments"
+msgstr ""
+
+#, c-format
+msgid "malformed field name: %.*s"
+msgstr "неправильное имя поля: %.*s"
+
+#, c-format
+msgid "unknown field name: %.*s"
+msgstr "неизвестное имя поля: %.*s"
+
+#, c-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Это произошло, скорее всего, из-за пустого сообщения коммита или из-за перехватчика перед коммитом. Если же это произошло из-за перехватчика перед коммитом, то вам нужно решить с ним проблему и повторить попытку снова."
+"not a git repository, but the field '%.*s' requires access to object data"
+msgstr ""
 
-#: git-rebase--preserve-merges.sh:616
-#, sh-format
-msgid "Stopped at $sha1_abbrev... $rest"
-msgstr "Остановлено на $sha1_abbrev… $rest"
+#, c-format
+msgid "format: %%(%s) atom used without a %%(%s) atom"
+msgstr ""
 
-#: git-rebase--preserve-merges.sh:631
-#, sh-format
-msgid "Cannot '$squash_style' without a previous commit"
-msgstr "Нельзя сделать «$squash_style» без указания предыдущего коммита"
+#, c-format
+msgid "format: %%(then) atom used more than once"
+msgstr "формат: частица %%(then) использована более одного раза"
 
-#: git-rebase--preserve-merges.sh:673
-#, sh-format
-msgid "Executing: $rest"
-msgstr "Выполнение: $rest"
+#, c-format
+msgid "format: %%(then) atom used after %%(else)"
+msgstr "формат: частица %%(then) использована после %%(else)"
 
-#: git-rebase--preserve-merges.sh:681
-#, sh-format
-msgid "Execution failed: $rest"
-msgstr "Не удалось выполнить: $rest"
+#, c-format
+msgid "format: %%(else) atom used more than once"
+msgstr "формат: частица %%(else) использована более одного раза"
 
-#: git-rebase--preserve-merges.sh:683
-msgid "and made changes to the index and/or the working tree"
-msgstr "и были сделаны изменения в индексе и/или в рабочем каталоге"
+#, c-format
+msgid "format: %%(end) atom used without corresponding atom"
+msgstr "формат: частица %%(end) использована без соответствующей частицы"
+
+#, c-format
+msgid "malformed format string %s"
+msgstr "неправильная строка формата %s"
+
+#, c-format
+msgid "this command reject atom %%(%.*s)"
+msgstr ""
+
+#, c-format
+msgid "--format=%.*s cannot be used with --python, --shell, --tcl"
+msgstr ""
+
+#, c-format
+msgid "(no branch, rebasing %s)"
+msgstr "(нет ветки, перемещение %s)"
+
+#, c-format
+msgid "(no branch, rebasing detached HEAD %s)"
+msgstr "(нет ветки перемещение отделённого HEAD %s)"
+
+#, c-format
+msgid "(no branch, bisect started on %s)"
+msgstr "(нет ветки, двоичный поиск начат на %s)"
+
+#, c-format
+msgid "(HEAD detached at %s)"
+msgstr "(HEAD отделён на %s)"
+
+#, c-format
+msgid "(HEAD detached from %s)"
+msgstr "(HEAD отделён начиная с %s)"
+
+msgid "(no branch)"
+msgstr "(нет ветки)"
+
+#, c-format
+msgid "missing object %s for %s"
+msgstr "не найден объект %s для %s"
+
+#, c-format
+msgid "parse_object_buffer failed on %s for %s"
+msgstr "сбой при выполнении parse_object_buffer на %s для %s"
+
+#, c-format
+msgid "malformed object at '%s'"
+msgstr "Повреждённый объект «%s»"
+
+#, c-format
+msgid "ignoring ref with broken name %s"
+msgstr "игнорирую ссылку с неправильным именем %s"
+
+#, c-format
+msgid "ignoring broken ref %s"
+msgstr "игнорирую неправильную ссылку %s"
+
+#, c-format
+msgid "format: %%(end) atom missing"
+msgstr "format: пропущена частица %%(end)"
+
+#, c-format
+msgid "malformed object name %s"
+msgstr "неправильное имя объекта %s"
+
+#, c-format
+msgid "option `%s' must point to a commit"
+msgstr ""
 
-#: git-rebase--preserve-merges.sh:685
+msgid "key"
+msgstr "ключ"
+
+msgid "field name to sort on"
+msgstr "имя поля, по которому выполнить сортировку"
+
+#, c-format
+msgid "not a reflog: %s"
+msgstr ""
+
+#, c-format
+msgid "no reflog for '%s'"
+msgstr ""
+
+#, c-format
+msgid "%s does not point to a valid object!"
+msgstr ""
+
+#, c-format
 msgid ""
-"You can fix the problem, and then run\n"
+"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"
+"of your new repositories, which will suppress this warning, call:\n"
+"\n"
+"\tgit config --global init.defaultBranch <name>\n"
 "\n"
-"\tgit rebase --continue"
-msgstr "Вы можете исправить ошибку, а затем запустить\n\n\tgit rebase --continue"
+"Names commonly chosen instead of 'master' are 'main', 'trunk' and\n"
+"'development'. The just-created branch can be renamed via this command:\n"
+"\n"
+"\tgit branch -m <name>\n"
+msgstr ""
 
-#. TRANSLATORS: after these lines is a command to be issued by the user
-#: git-rebase--preserve-merges.sh:698
-#, sh-format
+#, c-format
+msgid "could not retrieve `%s`"
+msgstr ""
+
+#, c-format
+msgid "invalid branch name: %s = %s"
+msgstr ""
+
+#, c-format
+msgid "ignoring dangling symref %s"
+msgstr ""
+
+#, c-format
+msgid "log for ref %s has gap after %s"
+msgstr ""
+
+#, c-format
+msgid "log for ref %s unexpectedly ended on %s"
+msgstr ""
+
+#, c-format
+msgid "log for %s is empty"
+msgstr ""
+
+#, c-format
+msgid "refusing to update ref with bad name '%s'"
+msgstr ""
+
+#, c-format
+msgid "update_ref failed for ref '%s': %s"
+msgstr ""
+
+#, c-format
+msgid "multiple updates for ref '%s' not allowed"
+msgstr ""
+
+msgid "ref updates forbidden inside quarantine environment"
+msgstr "обновление ссылок запрещено в изолированном окружении"
+
+msgid "ref updates aborted by hook"
+msgstr ""
+
+#, c-format
+msgid "'%s' exists; cannot create '%s'"
+msgstr ""
+
+#, c-format
+msgid "cannot process '%s' and '%s' at the same time"
+msgstr ""
+
+#, c-format
+msgid "could not remove reference %s"
+msgstr "не удалось удалить ссылки %s"
+
+#, c-format
+msgid "could not delete reference %s: %s"
+msgstr "не удалось удалить ссылку %s: %s"
+
+#, c-format
+msgid "could not delete references: %s"
+msgstr "не удалось удалить ссылки: %s"
+
+#, c-format
+msgid "invalid refspec '%s'"
+msgstr ""
+
+#, c-format
+msgid "invalid quoting in push-option value: '%s'"
+msgstr ""
+
+#, c-format
+msgid "%sinfo/refs not valid: is this a git repository?"
+msgstr ""
+
+msgid "invalid server response; expected service, got flush packet"
+msgstr ""
+
+#, c-format
+msgid "invalid server response; got '%s'"
+msgstr ""
+
+#, c-format
+msgid "repository '%s' not found"
+msgstr ""
+
+#, c-format
+msgid "Authentication failed for '%s'"
+msgstr ""
+
+#, c-format
+msgid "unable to access '%s' with http.pinnedPubkey configuration: %s"
+msgstr ""
+
+#, c-format
+msgid "unable to access '%s': %s"
+msgstr "«%s» недоступно: %s"
+
+#, c-format
+msgid "redirecting to %s"
+msgstr "переадресация на %s"
+
+msgid "shouldn't have EOF when not gentle on EOF"
+msgstr ""
+
+msgid "remote server sent unexpected response end packet"
+msgstr ""
+
+msgid "unable to rewind rpc post data - try increasing http.postBuffer"
+msgstr ""
+
+#, c-format
+msgid "remote-curl: bad line length character: %.4s"
+msgstr ""
+
+msgid "remote-curl: unexpected response end packet"
+msgstr ""
+
+#, c-format
+msgid "RPC failed; %s"
+msgstr ""
+
+msgid "cannot handle pushes this big"
+msgstr ""
+
+#, c-format
+msgid "cannot deflate request; zlib deflate error %d"
+msgstr ""
+
+#, c-format
+msgid "cannot deflate request; zlib end error %d"
+msgstr ""
+
+#, c-format
+msgid "%d bytes of length header were received"
+msgstr ""
+
+#, c-format
+msgid "%d bytes of body are still expected"
+msgstr ""
+
+msgid "dumb http transport does not support shallow capabilities"
+msgstr ""
+
+msgid "fetch failed."
+msgstr ""
+
+msgid "cannot fetch by sha1 over smart http"
+msgstr ""
+
+#, c-format
+msgid "protocol error: expected sha/ref, got '%s'"
+msgstr ""
+
+#, c-format
+msgid "http transport does not support %s"
+msgstr ""
+
+msgid "git-http-push failed"
+msgstr ""
+
+msgid "remote-curl: usage: git remote-curl <remote> [<url>]"
+msgstr ""
+"remote-curl: использование: git remote-curl <внешний-репозиторий> [<url>]"
+
+msgid "remote-curl: error reading command stream from git"
+msgstr ""
+
+msgid "remote-curl: fetch attempted without a local repo"
+msgstr ""
+
+#, c-format
+msgid "remote-curl: unknown command '%s' from git"
+msgstr ""
+
+#, c-format
+msgid "config remote shorthand cannot begin with '/': %s"
+msgstr ""
+
+msgid "more than one receivepack given, using the first"
+msgstr ""
+
+msgid "more than one uploadpack given, using the first"
+msgstr ""
+
+#, c-format
+msgid "unrecognized value transfer.credentialsInUrl: '%s'"
+msgstr ""
+
+#, c-format
+msgid "URL '%s' uses plaintext credentials"
+msgstr ""
+
+#, c-format
+msgid "Cannot fetch both %s and %s to %s"
+msgstr "Нельзя извлечь одновременно %s и %s в %s"
+
+#, c-format
+msgid "%s usually tracks %s, not %s"
+msgstr "%s обычно отслеживает %s, а не %s"
+
+#, c-format
+msgid "%s tracks both %s and %s"
+msgstr "%s отслеживает и %s и %s"
+
+#, c-format
+msgid "key '%s' of pattern had no '*'"
+msgstr ""
+
+#, c-format
+msgid "value '%s' of pattern has no '*'"
+msgstr ""
+
+#, c-format
+msgid "src refspec %s does not match any"
+msgstr "src refspec %s ничему не соответствует"
+
+#, c-format
+msgid "src refspec %s matches more than one"
+msgstr "src refspec %s соответствует более чем одному"
+
+#. TRANSLATORS: "matches '%s'%" is the <dst> part of "git push
+#. <remote> <src>:<dst>" push, and "being pushed ('%s')" is
+#. the <src>.
+#.
+#, c-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"
+"The destination you provided is not a full refname (i.e.,\n"
+"starting with \"refs/\"). We tried to guess what you meant by:\n"
 "\n"
-"\tgit rebase --continue"
-msgstr "Успешное выполнение: $rest\nно остались изменения в индексе и/или в рабочем каталоге\nСделайте коммит или спрячьте ваши изменения, а затем выполните\n\n\tgit rebase --continue"
+"- Looking for a ref that matches '%s' on the remote side.\n"
+"- Checking if the <src> being pushed ('%s')\n"
+"  is a ref in \"refs/{heads,tags}/\". If so we add a corresponding\n"
+"  refs/{heads,tags}/ prefix on the remote side.\n"
+"\n"
+"Neither worked, so we gave up. You must fully qualify the ref."
+msgstr ""
 
-#: git-rebase--preserve-merges.sh:709
-#, sh-format
-msgid "Unknown command: $command $sha1 $rest"
-msgstr "Неопознанная команда: $command $sha1 $rest"
+#, c-format
+msgid ""
+"The <src> part of the refspec is a commit object.\n"
+"Did you mean to create a new branch by pushing to\n"
+"'%s:refs/heads/%s'?"
+msgstr ""
 
-#: git-rebase--preserve-merges.sh:710
-msgid "Please fix this using 'git rebase --edit-todo'."
-msgstr "Пожалуйста исправьте это с помощью «git rebase --edit-todo»."
+#, c-format
+msgid ""
+"The <src> part of the refspec is a tag object.\n"
+"Did you mean to create a new tag by pushing to\n"
+"'%s:refs/tags/%s'?"
+msgstr ""
 
-#: git-rebase--preserve-merges.sh:745
-#, sh-format
-msgid "Successfully rebased and updated $head_name."
-msgstr "Успешно перемещён и обновлён $head_name."
+#, c-format
+msgid ""
+"The <src> part of the refspec is a tree object.\n"
+"Did you mean to tag a new tree by pushing to\n"
+"'%s:refs/tags/%s'?"
+msgstr ""
+
+#, c-format
+msgid ""
+"The <src> part of the refspec is a blob object.\n"
+"Did you mean to tag a new blob by pushing to\n"
+"'%s:refs/tags/%s'?"
+msgstr ""
 
-#: git-rebase--preserve-merges.sh:802
-msgid "Could not remove CHERRY_PICK_HEAD"
-msgstr "Не удалось удалить CHERRY_PICK_HEAD"
+#, c-format
+msgid "%s cannot be resolved to branch"
+msgstr ""
 
-#: git-rebase--preserve-merges.sh:807
-#, sh-format
+#, c-format
+msgid "unable to delete '%s': remote ref does not exist"
+msgstr ""
+
+#, c-format
+msgid "dst refspec %s matches more than one"
+msgstr ""
+
+#, c-format
+msgid "dst ref %s receives from more than one src"
+msgstr ""
+
+msgid "HEAD does not point to a branch"
+msgstr "HEAD не указывает на ветку"
+
+#, c-format
+msgid "no such branch: '%s'"
+msgstr "нет такой ветки: «%s»"
+
+#, c-format
+msgid "no upstream configured for branch '%s'"
+msgstr "вышестоящая ветка не настроена для ветки «%s»"
+
+#, c-format
+msgid "upstream branch '%s' not stored as a remote-tracking branch"
+msgstr "вышестоящая ветка «%s» не сохранена как отслеживаемая ветка"
+
+#, c-format
+msgid "push destination '%s' on remote '%s' has no local tracking branch"
+msgstr ""
+"назначение для отправки «%s» на внешнем сервере «%s» не имеет локальной "
+"отслеживаемой ветки"
+
+#, c-format
+msgid "branch '%s' has no remote for pushing"
+msgstr "ветка «%s» не имеет внешнего сервера для отправки"
+
+#, c-format
+msgid "push refspecs for '%s' do not include '%s'"
+msgstr "спецификаторы пути для отправки «%s» не включают в себя «%s»"
+
+msgid "push has no destination (push.default is 'nothing')"
+msgstr ""
+"отправка не имеет точки назначения (push.default выставлен в «nothing»)"
+
+msgid "cannot resolve 'simple' push to a single destination"
+msgstr "не удалось выполнить «simple» отправку в единственную точку назначения"
+
+#, c-format
+msgid "couldn't find remote ref %s"
+msgstr ""
+
+#, c-format
+msgid "* Ignoring funny ref '%s' locally"
+msgstr ""
+
+#, c-format
+msgid "Your branch is based on '%s', but the upstream is gone.\n"
+msgstr "Связанная ветка «%s» отсутствует в вышестоящем репозитории.\n"
+
+msgid "  (use \"git branch --unset-upstream\" to fixup)\n"
+msgstr "  (для исправления запустите «git branch --unset-upstream»)\n"
+
+#, c-format
+msgid "Your branch is up to date with '%s'.\n"
+msgstr "Эта ветка соответствует «%s».\n"
+
+#, c-format
+msgid "Your branch and '%s' refer to different commits.\n"
+msgstr "Ваша ветка и «%s» указывают на разные коммиты.\n"
+
+#, c-format
+msgid "  (use \"%s\" for details)\n"
+msgstr "  (используйте «%s» для просмотра описания)\n"
+
+#, c-format
+msgid "Your branch is ahead of '%s' by %d commit.\n"
+msgid_plural "Your branch is ahead of '%s' by %d commits.\n"
+msgstr[0] "Ваша ветка опережает «%s» на %d коммит.\n"
+msgstr[1] "Ваша ветка опережает «%s» на %d коммита.\n"
+msgstr[2] "Ваша ветка опережает «%s» на %d коммитов.\n"
+msgstr[3] "Ваша ветка опережает «%s» на %d коммитов.\n"
+
+msgid "  (use \"git push\" to publish your local commits)\n"
+msgstr ""
+"  (используйте «git push», чтобы опубликовать ваши локальные коммиты)\n"
+
+#, c-format
+msgid "Your branch is behind '%s' by %d commit, and can be fast-forwarded.\n"
+msgid_plural ""
+"Your branch is behind '%s' by %d commits, and can be fast-forwarded.\n"
+msgstr[0] ""
+"Ветка отстает от «%s» на %d коммит и может быть быстро перемотана.\n"
+msgstr[1] ""
+"Ветка отстает от «%s» на %d коммита и может быть быстро перемотана.\n"
+msgstr[2] ""
+"Ветка отстает от «%s» на %d коммитов и может быть быстро перемотана.\n"
+msgstr[3] ""
+"Ветка отстает от «%s» на %d коммитов и может быть быстро перемотана.\n"
+
+msgid "  (use \"git pull\" to update your local branch)\n"
+msgstr "  (используйте «git pull», чтобы обновить вашу локальную ветку)\n"
+
+#, c-format
+msgid ""
+"Your branch and '%s' have diverged,\n"
+"and have %d and %d different commit each, respectively.\n"
+msgid_plural ""
+"Your branch and '%s' have diverged,\n"
+"and have %d and %d different commits each, respectively.\n"
+msgstr[0] ""
+"Ваша ветка и «%s» разделились\n"
+"и теперь имеют %d и %d разный коммит в каждой соответственно.\n"
+msgstr[1] ""
+"Ваша ветка и «%s» разделились\n"
+"и теперь имеют %d и %d разных коммита в каждой соответственно.\n"
+msgstr[2] ""
+"Ваша ветка и «%s» разделились\n"
+"и теперь имеют %d и %d разных коммитов в каждой соответственно.\n"
+msgstr[3] ""
+"Ваша ветка и «%s» разделились\n"
+"и теперь имеют %d и %d разных коммитов в каждой соответственно.\n"
+
+msgid "  (use \"git pull\" to merge the remote branch into yours)\n"
+msgstr "  (используйте «git pull», чтобы слить внешнюю ветку в вашу)\n"
+
+#, c-format
+msgid "cannot parse expected object name '%s'"
+msgstr ""
+
+#, c-format
+msgid "cannot strip one component off url '%s'"
+msgstr "не удалось обрезать один компонент url «%s»"
+
+#, c-format
+msgid "bad replace ref name: %s"
+msgstr ""
+
+#, c-format
+msgid "duplicate replace ref: %s"
+msgstr ""
+
+#, c-format
+msgid "replace depth too high for object %s"
+msgstr ""
+
+msgid "corrupt MERGE_RR"
+msgstr ""
+
+msgid "unable to write rerere record"
+msgstr ""
+
+#, c-format
+msgid "there were errors while writing '%s' (%s)"
+msgstr ""
+
+#, c-format
+msgid "could not parse conflict hunks in '%s'"
+msgstr ""
+
+#, c-format
+msgid "failed utime() on '%s'"
+msgstr ""
+
+#, c-format
+msgid "writing '%s' failed"
+msgstr ""
+
+#, c-format
+msgid "Staged '%s' using previous resolution."
+msgstr "«%s» — индексирован используя предыдущее решение."
+
+#, c-format
+msgid "Recorded resolution for '%s'."
+msgstr ""
+
+#, c-format
+msgid "Resolved '%s' using previous resolution."
+msgstr "«%s» — исправлено используя предыдущее решение."
+
+#, c-format
+msgid "cannot unlink stray '%s'"
+msgstr ""
+
+#, c-format
+msgid "Recorded preimage for '%s'"
+msgstr "Запись прообраза для «%s»"
+
+#, c-format
+msgid "failed to update conflicted state in '%s'"
+msgstr ""
+
+#, c-format
+msgid "no remembered resolution for '%s'"
+msgstr ""
+
+#, c-format
+msgid "cannot unlink '%s'"
+msgstr ""
+
+#, c-format
+msgid "Updated preimage for '%s'"
+msgstr ""
+
+#, c-format
+msgid "Forgot resolution for '%s'\n"
+msgstr ""
+
+msgid "unable to open rr-cache directory"
+msgstr ""
+
+msgid "update the index with reused conflict resolution if possible"
+msgstr ""
+"обновить индекс с помощью переиспользования разрешения конфликта, если "
+"возможно"
+
+msgid "could not determine HEAD revision"
+msgstr ""
+
+#, c-format
+msgid "failed to find tree of %s"
+msgstr "не удалось найти дерево для %s"
+
+msgid "--unpacked=<packfile> no longer supported"
+msgstr ""
+
+msgid "your current branch appears to be broken"
+msgstr "похоже, ваша текущая ветка повреждена"
+
+#, c-format
+msgid "your current branch '%s' does not have any commits yet"
+msgstr "ваша текущая ветка «%s» еще не содержит ни одного коммита"
+
+msgid "object filtering requires --objects"
+msgstr "фильтрация объектов требует указания параметра --objects"
+
+msgid "-L does not yet support diff formats besides -p and -s"
+msgstr ""
+
+#, c-format
+msgid "cannot create async thread: %s"
+msgstr ""
+
+msgid "unexpected flush packet while reading remote unpack status"
+msgstr "неожиданный пустой пакет при чтении статуса внешней распаковки"
+
+#, c-format
+msgid "unable to parse remote unpack status: %s"
+msgstr "не удалось разобрать статус внешней распаковки: %s"
+
+#, c-format
+msgid "remote unpack failed: %s"
+msgstr "сбой при внешней распаковке %s"
+
+msgid "failed to sign the push certificate"
+msgstr "сбой подписания сертификата отправки"
+
+msgid "send-pack: unable to fork off fetch subprocess"
+msgstr ""
+
+msgid "push negotiation failed; proceeding anyway with push"
+msgstr ""
+
+msgid "the receiving end does not support this repository's hash algorithm"
+msgstr ""
+
+msgid "the receiving end does not support --signed push"
+msgstr "принимающая сторона не поддерживает отправку с опцией --signed"
+
+msgid ""
+"not sending a push certificate since the receiving end does not support --"
+"signed push"
+msgstr ""
+"не отправляем сертификат для отправки, так как принимающая сторона не "
+"поддерживает отправку с опцией --signed"
+
+msgid "the receiving end does not support --atomic push"
+msgstr "принимающая сторона не поддерживает отправку с опцией --atomic"
+
+msgid "the receiving end does not support push options"
+msgstr "принимающая сторона не поддерживает отправку с опциями"
+
+#, c-format
+msgid "invalid commit message cleanup mode '%s'"
+msgstr "неправильный режим очистки сообщения коммита «%s»"
+
+#, c-format
+msgid "could not delete '%s'"
+msgstr "не удалось удалить «%s»"
+
+msgid "revert"
+msgstr "обратить изменения"
+
+msgid "cherry-pick"
+msgstr "копировать коммит"
+
+msgid "rebase"
+msgstr ""
+
+#, c-format
+msgid "unknown action: %d"
+msgstr ""
+
+msgid ""
+"after resolving the conflicts, mark the corrected paths\n"
+"with 'git add <paths>' or 'git rm <paths>'"
+msgstr ""
+"после разрешения конфликтов, пометьте исправленные пути\n"
+"с помощью «git add <пути>» или «git rm <пути>»"
+
+msgid ""
+"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 ""
+
+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 ""
+
+#, c-format
+msgid "could not lock '%s'"
+msgstr "не удалось заблокировать «%s»"
+
+#, c-format
+msgid "could not write to '%s'"
+msgstr "не удалось записать в «%s»"
+
+#, c-format
+msgid "could not write eol to '%s'"
+msgstr "не удалось записать eol в «%s»"
+
+#, c-format
+msgid "failed to finalize '%s'"
+msgstr "не удалось завершить «%s»"
+
+#, c-format
+msgid "your local changes would be overwritten by %s."
+msgstr "ваши локальные изменения будут перезаписаны %s."
+
+msgid "commit your changes or stash them to proceed."
+msgstr "для продолжения закоммитьте ваши изменения или спрячьте их."
+
+#, c-format
+msgid "%s: fast-forward"
+msgstr "%s: быстрая перемотка"
+
+#. TRANSLATORS: %s will be "revert", "cherry-pick" or
+#. "rebase".
+#.
+#, c-format
+msgid "%s: Unable to write new index file"
+msgstr "%s: Не удалось записать файл индекса"
+
+msgid "unable to update cache tree"
+msgstr "не удалось обновить дерево кэша"
+
+msgid "could not resolve HEAD commit"
+msgstr "не удалось распознать HEAD коммит"
+
+#, c-format
+msgid "no key present in '%.*s'"
+msgstr ""
+
+#, c-format
+msgid "unable to dequote value of '%s'"
+msgstr ""
+
+msgid "'GIT_AUTHOR_NAME' already given"
+msgstr ""
+
+msgid "'GIT_AUTHOR_EMAIL' already given"
+msgstr ""
+
+msgid "'GIT_AUTHOR_DATE' already given"
+msgstr ""
+
+#, c-format
+msgid "unknown variable '%s'"
+msgstr ""
+
+msgid "missing 'GIT_AUTHOR_NAME'"
+msgstr ""
+
+msgid "missing 'GIT_AUTHOR_EMAIL'"
+msgstr ""
+
+msgid "missing 'GIT_AUTHOR_DATE'"
+msgstr ""
+
+#, c-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"
+"you have staged changes in your working tree\n"
+"If these changes are meant to be squashed into the previous commit, run:\n"
 "\n"
-"  git commit --amend $gpg_sign_opt_quoted\n"
+"  git commit --amend %s\n"
 "\n"
 "If they are meant to go into a new commit, run:\n"
 "\n"
-"  git commit $gpg_sign_opt_quoted\n"
+"  git commit %s\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"
+msgstr ""
+"у вас имеются проиндексированные изменения в рабочем каталоге. Если эти "
+"изменения должны быть объеденены с предыдущим коммитом, то запустите:\n"
+"\n"
+"  git commit --amend %s\n"
+"\n"
+"Если же они должны быть помещены в новый коммит, то запустите:\n"
+"\n"
+"  git commit %s\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 "Произошла ошибка при поиске автора для исправления коммита"
+msgid "'prepare-commit-msg' hook failed"
+msgstr "ошибка при вызове перехватчика «prepare-commit-msg»"
 
-#: git-rebase--preserve-merges.sh:829
 msgid ""
-"You have uncommitted changes in your working tree. Please commit them\n"
+"Your name and email address were configured automatically based\n"
+"on your username and hostname. Please check that they are accurate.\n"
+"You can suppress this message by setting them explicitly. Run the\n"
+"following command and follow the instructions in your editor to edit\n"
+"your configuration file:\n"
+"\n"
+"    git config --global --edit\n"
+"\n"
+"After doing this, you may fix the identity used for this commit with:\n"
+"\n"
+"    git commit --amend --reset-author\n"
+msgstr ""
+"Ваше имя или электронная почта настроены автоматически на основании вашего\n"
+"имени пользователя и имени машины. Пожалуйста, проверьте, что они \n"
+"определены правильно.\n"
+"Вы можете отключить это уведомление установив их напрямую. Запустите "
+"следующую\n"
+"команду и следуйте инструкциям вашего текстового редактора, для\n"
+"редактирования вашего файла конфигурации:\n"
+"\n"
+"    git config --global --edit\n"
+"\n"
+"После этого, изменить авторство этой коммита можно будет с помощью команды:\n"
+"\n"
+"    git commit --amend --reset-author\n"
+
+msgid ""
+"Your name and email address were configured automatically based\n"
+"on your username and hostname. Please check that they are accurate.\n"
+"You can suppress this message by setting them explicitly:\n"
+"\n"
+"    git config --global user.name \"Your Name\"\n"
+"    git config --global user.email you@example.com\n"
+"\n"
+"After doing this, you may fix the identity used for this commit with:\n"
+"\n"
+"    git commit --amend --reset-author\n"
+msgstr ""
+"Ваше имя или электронная почта настроены автоматически на основании вашего\n"
+"имени пользователя и имени машины. Пожалуйста, проверьте, что они \n"
+"определены правильно.\n"
+"Вы можете отключить это уведомление установив их напрямую:\n"
+"\n"
+"    git config --global user.name \"Ваше Имя\"\n"
+"    git config --global user.email you@example.com\n"
+"\n"
+"После этого, изменить авторство этой коммита можно будет с помощью команды:\n"
+"\n"
+"    git commit --amend --reset-author\n"
+
+msgid "couldn't look up newly created commit"
+msgstr "нельзя запросить новосозданный коммит"
+
+msgid "could not parse newly created commit"
+msgstr "нельзя разобрать новосозданный коммит"
+
+msgid "unable to resolve HEAD after creating commit"
+msgstr "не удалось найти HEAD после создания коммита"
+
+msgid "detached HEAD"
+msgstr "отделённый HEAD"
+
+msgid " (root-commit)"
+msgstr " (корневой коммит)"
+
+msgid "could not parse HEAD"
+msgstr "не удалось разобрать HEAD"
+
+#, c-format
+msgid "HEAD %s is not a commit!"
+msgstr "HEAD %s не является коммитом!"
+
+msgid "unable to parse commit author"
+msgstr "не удалось разобрать автора коммита"
+
+#, c-format
+msgid "unable to read commit message from '%s'"
+msgstr "не удалось прочитать сообщение коммита из «%s»"
+
+#, c-format
+msgid "invalid author identity '%s'"
+msgstr ""
+
+msgid "corrupt author: missing date information"
+msgstr ""
+
+#, c-format
+msgid "could not update %s"
+msgstr "не удалось обновить %s"
+
+#, c-format
+msgid "could not parse commit %s"
+msgstr "не удалось разобрать коммит %s"
+
+#, c-format
+msgid "could not parse parent commit %s"
+msgstr "не удалось разобрать родительский коммит %s"
+
+#, c-format
+msgid "unknown command: %d"
+msgstr "неизвестная команда: %d"
+
+msgid "This is the 1st commit message:"
+msgstr "Это 1-е сообщение коммита:"
+
+#, c-format
+msgid "This is the commit message #%d:"
+msgstr "Это сообщение коммита номер #%d:"
+
+msgid "The 1st commit message will be skipped:"
+msgstr "1-е сообщение коммита будет пропущено:"
+
+#, c-format
+msgid "The commit message #%d will be skipped:"
+msgstr "Сообщение коммита номер #%d будет пропущено:"
+
+#, c-format
+msgid "This is a combination of %d commits."
+msgstr "Это объединение %d коммитов."
+
+#, c-format
+msgid "cannot write '%s'"
+msgstr "не удалось записать «%s»"
+
+msgid "need a HEAD to fixup"
+msgstr "нужен HEAD для исправления"
+
+msgid "could not read HEAD"
+msgstr "не удалось прочитать HEAD"
+
+msgid "could not read HEAD's commit message"
+msgstr "не удалось прочитать сообщение коммита текущего HEAD"
+
+#, c-format
+msgid "could not read commit message of %s"
+msgstr "не удалось прочитать сообщение коммита для %s"
+
+msgid "your index file is unmerged."
+msgstr "ваш индекс не слит."
+
+msgid "cannot fixup root commit"
+msgstr "нельзя исправить корневой коммит"
+
+#, c-format
+msgid "commit %s is a merge but no -m option was given."
+msgstr "коммит %s — это коммит-слияние, но опция -m не указана."
+
+#, c-format
+msgid "commit %s does not have parent %d"
+msgstr "у коммита %s нет предка %d"
+
+#, 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.
+#, c-format
+msgid "%s: cannot parse parent commit %s"
+msgstr "%s: не удалось разобрать родительский коммит для %s"
+
+#, c-format
+msgid "could not rename '%s' to '%s'"
+msgstr "не удалось переименовать «%s» в «%s»"
+
+#, c-format
+msgid "could not revert %s... %s"
+msgstr "не удалось обратить изменения коммита %s... %s"
+
+#, c-format
+msgid "could not apply %s... %s"
+msgstr "не удалось применить коммит %s... %s"
+
+#, c-format
+msgid "dropping %s %s -- patch contents already upstream\n"
+msgstr ""
+
+#, c-format
+msgid "git %s: failed to read the index"
+msgstr "git %s: сбой чтения индекса"
+
+#, c-format
+msgid "git %s: failed to refresh the index"
+msgstr "git %s: сбой обновления индекса"
+
+#, c-format
+msgid "%s does not accept arguments: '%s'"
+msgstr "параметр %s не принимает аргументы: «%s»"
+
+#, c-format
+msgid "missing arguments for %s"
+msgstr "пропущены аргументы для %s"
+
+#, c-format
+msgid "could not parse '%s'"
+msgstr ""
+
+#, c-format
+msgid "invalid line %d: %.*s"
+msgstr "неправильная строка %d: %.*s"
+
+#, c-format
+msgid "cannot '%s' without a previous commit"
+msgstr "нельзя выполнить «%s» без указания предыдущего коммита"
+
+msgid "cancelling a cherry picking in progress"
+msgstr ""
+
+msgid "cancelling a revert in progress"
+msgstr ""
+
+msgid "please fix this using 'git rebase --edit-todo'."
+msgstr "пожалуйста исправьте это с помощью «git rebase --edit-todo»."
+
+#, c-format
+msgid "unusable instruction sheet: '%s'"
+msgstr "непригодная для использования карта с инструкциями: «%s»"
+
+msgid "no commits parsed."
+msgstr "коммиты не разобраны."
+
+msgid "cannot cherry-pick during a revert."
+msgstr "нельзя скопировать коммит во время процесса обращения коммита."
+
+msgid "cannot revert during a cherry-pick."
+msgstr "нельзя обратить изменения коммита во время копирования коммита."
+
+msgid "unusable squash-onto"
+msgstr "непригодный для использования уплотнить-над"
+
+#, c-format
+msgid "malformed options sheet: '%s'"
+msgstr "испорченная карта с опциями: «%s»"
+
+msgid "empty commit set passed"
+msgstr "передан пустой набор коммитов"
+
+msgid "revert is already in progress"
+msgstr ""
+
+#, c-format
+msgid "try \"git revert (--continue | %s--abort | --quit)\""
+msgstr ""
+
+msgid "cherry-pick is already in progress"
+msgstr ""
+
+#, c-format
+msgid "try \"git cherry-pick (--continue | %s--abort | --quit)\""
+msgstr ""
+
+#, c-format
+msgid "could not create sequencer directory '%s'"
+msgstr "не удалось создать каталог для указателя следования коммитов «%s»"
+
+msgid "could not lock HEAD"
+msgstr "не удалось заблокировать HEAD"
+
+msgid "no cherry-pick or revert in progress"
+msgstr "копирование или обращение изменений коммита уже выполняются"
+
+msgid "cannot resolve HEAD"
+msgstr "не удалось определить HEAD"
+
+msgid "cannot abort from a branch yet to be born"
+msgstr "нельзя отменить изменения с ветки, которая еще не создана"
+
+#, c-format
+msgid "cannot read '%s': %s"
+msgstr "не удалось прочитать «%s»: %s"
+
+msgid "unexpected end of file"
+msgstr "неожиданный конец файла"
+
+#, c-format
+msgid "stored pre-cherry-pick HEAD file '%s' is corrupt"
+msgstr "сохраненный файл с HEAD перед копированием коммита «%s» поврежден"
+
+msgid "You seem to have moved HEAD. Not rewinding, check your HEAD!"
+msgstr ""
+"Похоже, что вы переместили HEAD. Перемотка не выполняется, проверьте свой "
+"указатель HEAD!"
+
+msgid "no revert in progress"
+msgstr ""
+
+msgid "no cherry-pick in progress"
+msgstr ""
+
+msgid "failed to skip the commit"
+msgstr ""
+
+msgid "there is nothing to skip"
+msgstr ""
+
+#, c-format
+msgid ""
+"have you committed already?\n"
+"try \"git %s --continue\""
+msgstr ""
+
+msgid "cannot read HEAD"
+msgstr "не удалось прочитать HEAD"
+
+#, c-format
+msgid "unable to copy '%s' to '%s'"
+msgstr ""
+
+#, c-format
+msgid ""
+"You can amend the commit now, with\n"
+"\n"
+"  git commit --amend %s\n"
+"\n"
+"Once you are satisfied with your changes, run\n"
+"\n"
+"  git rebase --continue\n"
+msgstr ""
+
+#, c-format
+msgid "Could not apply %s... %.*s"
+msgstr "Не удалось применить коммит %s... %.*s"
+
+#, c-format
+msgid "Could not merge %.*s"
+msgstr ""
+
+#, c-format
+msgid "Executing: %s\n"
+msgstr ""
+
+#, c-format
+msgid ""
+"execution failed: %s\n"
+"%sYou can fix the problem, and then run\n"
+"\n"
+"  git rebase --continue\n"
+"\n"
+msgstr ""
+"ошибка выполнения: %s\n"
+"%sВы можете исправить ошибку, а затем запустить\n"
+"\n"
+"  git rebase --continue\n"
+"\n"
+
+msgid "and made changes to the index and/or the working tree\n"
+msgstr "и были сделаны изменения в индексе и/или в рабочем каталоге\n"
+
+#, c-format
+msgid ""
+"execution succeeded: %s\n"
+"but left changes to the index and/or the working tree\n"
+"Commit or stash your changes, and then run\n"
+"\n"
+"  git rebase --continue\n"
+"\n"
+msgstr ""
+"успешное выполнение: %s\n"
+"но остались изменения в индексе и/или в рабочем каталоге\n"
+"Сделайте коммит или спрячьте ваши изменения, а затем выполните\n"
+"\n"
+"  git rebase --continue\n"
+"\n"
+
+#, c-format
+msgid "illegal label name: '%.*s'"
+msgstr ""
+
+msgid "writing fake root commit"
+msgstr "запись поддельного корневого коммита"
+
+msgid "writing squash-onto"
+msgstr "запить уплотнить-над"
+
+#, c-format
+msgid "could not resolve '%s'"
+msgstr "не удалось распознать «%s»"
+
+msgid "cannot merge without a current revision"
+msgstr "нельзя слить без текущей редакции"
+
+#, c-format
+msgid "unable to parse '%.*s'"
+msgstr ""
+
+#, c-format
+msgid "nothing to merge: '%.*s'"
+msgstr ""
+
+msgid "octopus merge cannot be executed on top of a [new root]"
+msgstr ""
+
+#, c-format
+msgid "could not get commit message of '%s'"
+msgstr "не удалось получить сообщение коммита для «%s»"
+
+#, c-format
+msgid "could not even attempt to merge '%.*s'"
+msgstr "не удалось даже попытаться слить «%.*s»"
+
+msgid "merge: Unable to write new index file"
+msgstr "слияние: Не удалось записать файл индекса"
+
+msgid "Cannot autostash"
+msgstr "Не удалось автоматически спрятать изменения"
+
+#, c-format
+msgid "Unexpected stash response: '%s'"
+msgstr ""
+
+#, c-format
+msgid "Could not create directory for '%s'"
+msgstr ""
+
+#, c-format
+msgid "Created autostash: %s\n"
+msgstr ""
+
+msgid "could not reset --hard"
+msgstr ""
+
+#, c-format
+msgid "Applied autostash.\n"
+msgstr "Применены автоматически спрятанные изменения.\n"
+
+#, c-format
+msgid "cannot store %s"
+msgstr "не удалось сохранить %s"
+
+#, c-format
+msgid ""
+"%s\n"
+"Your changes are safe in the stash.\n"
+"You can run \"git stash pop\" or \"git stash drop\" at any time.\n"
+msgstr ""
+
+msgid "Applying autostash resulted in conflicts."
+msgstr ""
+
+msgid "Autostash exists; creating a new stash entry."
+msgstr ""
+
+msgid "could not detach HEAD"
+msgstr "не удалось отделить HEAD"
+
+#, c-format
+msgid "Stopped at HEAD\n"
+msgstr ""
+
+#, c-format
+msgid "Stopped at %s\n"
+msgstr ""
+
+#, c-format
+msgid ""
+"Could not execute the todo command\n"
+"\n"
+"    %.*s\n"
+"It has been rescheduled; To edit the command before continuing, please\n"
+"edit the todo list first:\n"
+"\n"
+"    git rebase --edit-todo\n"
+"    git rebase --continue\n"
+msgstr ""
+
+#, c-format
+msgid "Rebasing (%d/%d)%s"
+msgstr ""
+
+#, c-format
+msgid "Stopped at %s...  %.*s\n"
+msgstr "Остановлено на %s...  %.*s\n"
+
+#, c-format
+msgid "unknown command %d"
+msgstr "неизвестная команда %d"
+
+msgid "could not read orig-head"
+msgstr "не удалось прочитать orig-head"
+
+msgid "could not read 'onto'"
+msgstr "не удалось прочитать «onto»"
+
+#, c-format
+msgid "could not update HEAD to %s"
+msgstr "не удалось обновить HEAD на %s"
+
+#, c-format
+msgid "Successfully rebased and updated %s.\n"
+msgstr "Успешно перемещён и обновлён %s.\n"
+
+msgid "cannot rebase: You have unstaged changes."
+msgstr ""
+"не удалось выполнить перемещение коммитов: У вас есть непроиндексированные "
+"изменения."
+
+msgid "cannot amend non-existing commit"
+msgstr "не удалось исправить несуществующий коммит"
+
+#, c-format
+msgid "invalid file: '%s'"
+msgstr "недопустимый файл: «%s»"
+
+#, c-format
+msgid "invalid contents: '%s'"
+msgstr "недопустимое содержимое: «%s»"
+
+msgid ""
+"\n"
+"You have uncommitted changes in your working tree. Please, commit them\n"
 "first and then run 'git rebase --continue' again."
-msgstr "У вас имеются незакоммиченные изменения в рабочем каталоге. Сделайте коммит, а затем запустите «git rebase --continue» снова."
+msgstr ""
+"\n"
+"У вас имеются незакоммиченные изменения в рабочем каталоге. Сделайте коммит, "
+"а затем запустите «git rebase --continue» снова."
 
-#: git-rebase--preserve-merges.sh:834 git-rebase--preserve-merges.sh:838
-msgid "Could not commit staged changes."
-msgstr "Не удалось закоммитить проиндексированные изменения."
+#, c-format
+msgid "could not write file: '%s'"
+msgstr ""
 
-#: git-rebase--preserve-merges.sh:869 git-rebase--preserve-merges.sh:955
-msgid "Could not execute editor"
-msgstr "Не удалось запустить редактор"
+msgid "could not remove CHERRY_PICK_HEAD"
+msgstr "не удалось удалить CHERRY_PICK_HEAD"
 
-#: git-rebase--preserve-merges.sh:890
-#, sh-format
-msgid "Could not checkout $switch_to"
-msgstr "Не удалось перейти на версию $switch_to"
+msgid "could not commit staged changes."
+msgstr "не удалось закоммитить проиндексированные изменения."
+
+#, c-format
+msgid "%s: can't cherry-pick a %s"
+msgstr "%s: не удалось скопировать коммит %s"
+
+#, c-format
+msgid "%s: bad revision"
+msgstr "%s: плохая редакция"
+
+msgid "can't revert as initial commit"
+msgstr "нельзя возвратить изначальный коммит"
+
+#, c-format
+msgid "skipped previously applied commit %s"
+msgstr "пропущен уже применённый коммит %s"
+
+msgid "use --reapply-cherry-picks to include skipped commits"
+msgstr ""
+
+msgid "make_script: unhandled options"
+msgstr "make_script: не обработанные опции"
+
+msgid "make_script: error preparing revisions"
+msgstr "make_script: ошибка при обновлении редакций"
+
+msgid "nothing to do"
+msgstr ""
+
+msgid "could not skip unnecessary pick commands"
+msgstr ""
+
+msgid "the script was already rearranged."
+msgstr "сценарий уже был перестроен."
+
+#, c-format
+msgid "'%s' is outside repository at '%s'"
+msgstr ""
+
+#, c-format
+msgid ""
+"%s: no such path in the working tree.\n"
+"Use 'git <command> -- <path>...' to specify paths that do not exist locally."
+msgstr ""
+"%s: нет такого пути в рабочем каталоге.\n"
+"Используйте «git <команда> -- <путь>...» для указания путей, которые не "
+"существуют локально."
+
+#, c-format
+msgid ""
+"ambiguous argument '%s': unknown revision or path not in the working tree.\n"
+"Use '--' to separate paths from revisions, like this:\n"
+"'git <command> [<revision>...] -- [<file>...]'"
+msgstr ""
+"неоднозначный аргумент «%s»: неизвестная редакция или не путь в рабочем "
+"каталоге.\n"
+"Используйте «--» для отделения путей от редакций, вот так:\n"
+"«git <команда> [<редакция>...] -- [<файл>...]»"
+
+#, c-format
+msgid "option '%s' must come before non-option arguments"
+msgstr ""
+
+#, c-format
+msgid ""
+"ambiguous argument '%s': both revision and filename\n"
+"Use '--' to separate paths from revisions, like this:\n"
+"'git <command> [<revision>...] -- [<file>...]'"
+msgstr ""
+"неоднозначный аргумент «%s»: является одновременно и редакцией и именем "
+"файла.\n"
+"Используйте «--» для отделения путей от редакций, вот так:\n"
+"«git <команда> [<редакция>...] -- [<файл>...]»"
+
+msgid "unable to set up work tree using invalid config"
+msgstr ""
+
+#, c-format
+msgid "Expected git repo version <= %d, found %d"
+msgstr "Ожидаемая версия git репозитория <= %d, а обнаружена %d"
+
+msgid "unknown repository extension found:"
+msgid_plural "unknown repository extensions found:"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+msgstr[3] ""
+
+msgid "repo version is 0, but v1-only extension found:"
+msgid_plural "repo version is 0, but v1-only extensions found:"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+msgstr[3] ""
+
+#, c-format
+msgid "error opening '%s'"
+msgstr "ошибка открытия «%s»"
+
+#, c-format
+msgid "too large to be a .git file: '%s'"
+msgstr "файл слишком большой как для .git файла: «%s»"
+
+#, c-format
+msgid "error reading %s"
+msgstr "ошибка чтения %s"
+
+#, c-format
+msgid "invalid gitfile format: %s"
+msgstr "неправильный формат файла gitfile: %s"
+
+#, c-format
+msgid "no path in gitfile: %s"
+msgstr "нет пути в gitfile: %s"
+
+#, c-format
+msgid "not a git repository: %s"
+msgstr "не является репозиторием git: %s"
+
+#, c-format
+msgid "'$%s' too big"
+msgstr "«$%s» слишком большой"
+
+#, c-format
+msgid "not a git repository: '%s'"
+msgstr "не является репозиторием git: «%s»"
+
+#, c-format
+msgid "cannot chdir to '%s'"
+msgstr "не удалось выполнить chdir в «%s»"
+
+msgid "cannot come back to cwd"
+msgstr "не удалось вернуться в cwd"
+
+#, c-format
+msgid "failed to stat '%*s%s%s'"
+msgstr "не удалось выполнить stat для «%*s%s%s»"
+
+msgid "Unable to read current working directory"
+msgstr "Не удалось прочитать текущий рабочий каталог"
+
+#, c-format
+msgid "cannot change to '%s'"
+msgstr "не удалось изменить на «%s»"
+
+#, c-format
+msgid "not a git repository (or any of the parent directories): %s"
+msgstr "не найден git репозиторий (или один из родительских каталогов): %s"
 
-#: git-rebase--preserve-merges.sh:897
-msgid "No HEAD?"
-msgstr "Нет указателя HEAD?"
+#, 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 ""
+"не найден git репозиторий (или один из его каталогов вплоть до точки "
+"монтирования %s)\n"
+"Останавливаю поиск на границе файловой системы (так как "
+"GIT_DISCOVERY_ACROSS_FILESYSTEM не установлен)."
+
+#, c-format
+msgid ""
+"unsafe repository ('%s' is owned by someone else)\n"
+"To add an exception for this directory, call:\n"
+"\n"
+"\tgit config --global --add safe.directory %s"
+msgstr ""
+
+#, c-format
+msgid ""
+"problem with core.sharedRepository filemode value (0%.3o).\n"
+"The owner of files must always have read and write permissions."
+msgstr ""
+
+msgid "fork failed"
+msgstr "сбой при выполнении fork"
+
+msgid "setsid failed"
+msgstr "сбой при выполнении setsid"
+
+#, c-format
+msgid "index entry is a directory, but not sparse (%08x)"
+msgstr ""
+
+msgid "cannot use split index with a sparse index"
+msgstr ""
+
+#. TRANSLATORS: IEC 80000-13:2008 gibibyte
+#, c-format
+msgid "%u.%2.2u GiB"
+msgstr "%u.%2.2u ГиБ"
+
+#. TRANSLATORS: IEC 80000-13:2008 gibibyte/second
+#, c-format
+msgid "%u.%2.2u GiB/s"
+msgstr "%u.%2.2u ГиБ/с"
+
+#. TRANSLATORS: IEC 80000-13:2008 mebibyte
+#, c-format
+msgid "%u.%2.2u MiB"
+msgstr "%u.%2.2u МиБ"
+
+#. TRANSLATORS: IEC 80000-13:2008 mebibyte/second
+#, c-format
+msgid "%u.%2.2u MiB/s"
+msgstr "%u.%2.2u МиБ/с"
+
+#. TRANSLATORS: IEC 80000-13:2008 kibibyte
+#, c-format
+msgid "%u.%2.2u KiB"
+msgstr "%u.%2.2u КиБ"
+
+#. TRANSLATORS: IEC 80000-13:2008 kibibyte/second
+#, c-format
+msgid "%u.%2.2u KiB/s"
+msgstr "%u.%2.2u КиБ/с"
+
+#. TRANSLATORS: IEC 80000-13:2008 byte
+#, c-format
+msgid "%u byte"
+msgid_plural "%u bytes"
+msgstr[0] "%u байт"
+msgstr[1] "%u байта"
+msgstr[2] "%u байтов"
+msgstr[3] "%u байта"
+
+#. TRANSLATORS: IEC 80000-13:2008 byte/second
+#, c-format
+msgid "%u byte/s"
+msgid_plural "%u bytes/s"
+msgstr[0] "%u байт/с"
+msgstr[1] "%u байта/с"
+msgstr[2] "%u байтов/с"
+msgstr[3] "%u байта/с"
+
+#, c-format
+msgid "could not edit '%s'"
+msgstr ""
+
+#, c-format
+msgid "ignoring suspicious submodule name: %s"
+msgstr "игнорирую подозрительный подмодуль с именем: %s"
+
+msgid "negative values not allowed for submodule.fetchJobs"
+msgstr "нельзя использовать отприцательные значения для submodule.fetchJobs"
+
+#, c-format
+msgid "ignoring '%s' which may be interpreted as a command-line option: %s"
+msgstr ""
+
+#, c-format
+msgid "Could not update .gitmodules entry %s"
+msgstr "Не удалось обновить .gitmodules запись %s"
+
+msgid "Cannot change unmerged .gitmodules, resolve merge conflicts first"
+msgstr "Не удалось изменить не слитый .gitmodules, сначала разрешите конфликты"
+
+#, c-format
+msgid "Could not find section in .gitmodules where path=%s"
+msgstr "Не удалось найти раздел в .gitmodules, где путь равен %s"
+
+#, c-format
+msgid "Could not remove .gitmodules entry for %s"
+msgstr "Не удалось удалить запись в .gitmodules для %s"
+
+msgid "staging updated .gitmodules failed"
+msgstr "сбой индексирования обновленного .gitmodules"
+
+#, c-format
+msgid "in unpopulated submodule '%s'"
+msgstr "в пустом подмодуле «%s»"
+
+#, c-format
+msgid "Pathspec '%s' is in submodule '%.*s'"
+msgstr "Спецификатор пути «%s» в подмодуле «%.*s»"
+
+#, c-format
+msgid "bad --ignore-submodules argument: %s"
+msgstr ""
+
+#, c-format
+msgid ""
+"Submodule in commit %s at path: '%s' collides with a submodule named the "
+"same. Skipping it."
+msgstr ""
+
+#, c-format
+msgid "submodule entry '%s' (%s) is a %s, not a commit"
+msgstr "запись подмодуля «%s» (%s) является %s, а не является коммитом"
+
+#, c-format
+msgid ""
+"Could not run 'git rev-list <commits> --not --remotes -n 1' command in "
+"submodule %s"
+msgstr ""
+
+#, c-format
+msgid "process for submodule '%s' failed"
+msgstr ""
+
+#, c-format
+msgid "Pushing submodule '%s'\n"
+msgstr ""
+
+#, c-format
+msgid "Unable to push submodule '%s'\n"
+msgstr ""
+
+#, c-format
+msgid "Fetching submodule %s%s\n"
+msgstr ""
+
+#, c-format
+msgid "Could not access submodule '%s'\n"
+msgstr ""
+
+#, c-format
+msgid "Could not access submodule '%s' at commit %s\n"
+msgstr ""
+
+#, c-format
+msgid "Fetching submodule %s%s at commit %s\n"
+msgstr ""
+
+#, c-format
+msgid ""
+"Errors during submodule fetch:\n"
+"%s"
+msgstr ""
+
+#, c-format
+msgid "'%s' not recognized as a git repository"
+msgstr "«%s» не распознан как репозиторий git"
+
+#, c-format
+msgid "Could not run 'git status --porcelain=2' in submodule %s"
+msgstr ""
+
+#, c-format
+msgid "'git status --porcelain=2' failed in submodule %s"
+msgstr ""
+
+#, c-format
+msgid "could not start 'git status' in submodule '%s'"
+msgstr "не удалось запустить «git status» в подмодуле «%s»"
+
+#, c-format
+msgid "could not run 'git status' in submodule '%s'"
+msgstr "не удалось запустить «git status» в подмодуле «%s»"
+
+#, c-format
+msgid "Could not unset core.worktree setting in submodule '%s'"
+msgstr ""
+
+#, c-format
+msgid "could not recurse into submodule '%s'"
+msgstr "не удалось рекурсивно зайти в подмодуль «%s»"
+
+msgid "could not reset submodule index"
+msgstr ""
+
+#, c-format
+msgid "submodule '%s' has dirty index"
+msgstr "подмодуль «%s» имеет изменённый индекс"
+
+#, c-format
+msgid "Submodule '%s' could not be updated."
+msgstr ""
+
+#, c-format
+msgid "submodule git dir '%s' is inside git dir '%.*s'"
+msgstr ""
+
+#, c-format
+msgid ""
+"relocate_gitdir for submodule '%s' with more than one worktree not supported"
+msgstr ""
+"relocate_gitdir для подмодуля «%s» с указанием более одного рабочего дерева "
+"не поддерживается"
+
+#, c-format
+msgid "could not lookup name for submodule '%s'"
+msgstr "не удалось запросить имя подмодуля «%s»"
+
+#, c-format
+msgid "refusing to move '%s' into an existing git dir"
+msgstr ""
+
+#, c-format
+msgid ""
+"Migrating git directory of '%s%s' from\n"
+"'%s' to\n"
+"'%s'\n"
+msgstr ""
+"Перемещение каталога git для «%s%s» из\n"
+"«%s» в\n"
+"«%s»\n"
+
+msgid "could not start ls-files in .."
+msgstr "не удалось выполнить stat ls-files в .."
+
+#, c-format
+msgid "ls-tree returned unexpected return code %d"
+msgstr "ls-tree вернул неожиданный код %d"
+
+#, c-format
+msgid "failed to lstat '%s'"
+msgstr ""
+
+msgid "unhandled options"
+msgstr ""
+
+msgid "error preparing revisions"
+msgstr ""
+
+#, c-format
+msgid "commit %s is not marked reachable"
+msgstr ""
+
+msgid "too many commits marked reachable"
+msgstr ""
+
+msgid "test-tool serve-v2 [<options>]"
+msgstr ""
+
+msgid "exit immediately after advertising capabilities"
+msgstr ""
+
+msgid "test-helper simple-ipc is-active    [<name>] [<options>]"
+msgstr ""
+
+msgid "test-helper simple-ipc run-daemon   [<name>] [<threads>]"
+msgstr ""
+
+msgid "test-helper simple-ipc start-daemon [<name>] [<threads>] [<max-wait>]"
+msgstr ""
+
+msgid "test-helper simple-ipc stop-daemon  [<name>] [<max-wait>]"
+msgstr ""
+
+msgid "test-helper simple-ipc send         [<name>] [<token>]"
+msgstr ""
+
+msgid "test-helper simple-ipc sendbytes    [<name>] [<bytecount>] [<byte>]"
+msgstr ""
+
+msgid ""
+"test-helper simple-ipc multiple     [<name>] [<threads>] [<bytecount>] "
+"[<batchsize>]"
+msgstr ""
+
+msgid "name or pathname of unix domain socket"
+msgstr ""
+
+msgid "named-pipe name"
+msgstr ""
+
+msgid "number of threads in server thread pool"
+msgstr ""
+
+msgid "seconds to wait for daemon to start or stop"
+msgstr ""
+
+msgid "number of bytes"
+msgstr ""
+
+msgid "number of requests per thread"
+msgstr ""
+
+msgid "byte"
+msgstr ""
+
+msgid "ballast character"
+msgstr ""
+
+msgid "token"
+msgstr ""
+
+msgid "command token to send to the server"
+msgstr ""
+
+#, c-format
+msgid "running trailer command '%s' failed"
+msgstr "сбой при запуске команды завершителя «%s»"
+
+#, c-format
+msgid "unknown value '%s' for key '%s'"
+msgstr "неизвестное значение «%s» для ключа «%s»"
+
+#, c-format
+msgid "empty trailer token in trailer '%.*s'"
+msgstr "пустая последняя лексема в завершителе «%.*s»"
+
+#, c-format
+msgid "could not read input file '%s'"
+msgstr "не удалось прочитать входной файл «%s»"
+
+#, c-format
+msgid "could not stat %s"
+msgstr "не удалось выполнить stat для %s"
+
+#, c-format
+msgid "file %s is not a regular file"
+msgstr "файл %s не является обычным файлом"
+
+#, c-format
+msgid "file %s is not writable by user"
+msgstr "файл %s не доступен на запись пользователю"
+
+msgid "could not open temporary file"
+msgstr "не удалось создать временный файл"
+
+#, c-format
+msgid "could not rename temporary file to %s"
+msgstr "не удалось переименовать временный файл в %s"
+
+msgid "full write to remote helper failed"
+msgstr ""
+
+#, c-format
+msgid "unable to find remote helper for '%s'"
+msgstr ""
+
+msgid "can't dup helper output fd"
+msgstr ""
+
+#, c-format
+msgid ""
+"unknown mandatory capability %s; this remote helper probably needs newer "
+"version of Git"
+msgstr ""
+
+msgid "this remote helper should implement refspec capability"
+msgstr ""
+
+#, c-format
+msgid "%s unexpectedly said: '%s'"
+msgstr ""
+
+#, c-format
+msgid "%s also locked %s"
+msgstr ""
+
+msgid "couldn't run fast-import"
+msgstr ""
+
+msgid "error while running fast-import"
+msgstr ""
+
+#, c-format
+msgid "could not read ref %s"
+msgstr ""
+
+#, c-format
+msgid "unknown response to connect: %s"
+msgstr ""
+
+msgid "setting remote service path not supported by protocol"
+msgstr ""
+
+msgid "invalid remote service path"
+msgstr ""
+
+msgid "operation not supported by protocol"
+msgstr ""
+
+#, c-format
+msgid "can't connect to subservice %s"
+msgstr ""
+
+msgid "--negotiate-only requires protocol v2"
+msgstr ""
+
+msgid "'option' without a matching 'ok/error' directive"
+msgstr ""
+
+#, c-format
+msgid "expected ok/error, helper said '%s'"
+msgstr ""
+
+#, c-format
+msgid "helper reported unexpected status of %s"
+msgstr ""
+
+#, c-format
+msgid "helper %s does not support dry-run"
+msgstr ""
+
+#, c-format
+msgid "helper %s does not support --signed"
+msgstr ""
+
+#, c-format
+msgid "helper %s does not support --signed=if-asked"
+msgstr ""
+
+#, c-format
+msgid "helper %s does not support --atomic"
+msgstr ""
+
+#, c-format
+msgid "helper %s does not support --%s"
+msgstr ""
+
+#, c-format
+msgid "helper %s does not support 'push-option'"
+msgstr ""
+
+msgid "remote-helper doesn't support push; refspec needed"
+msgstr ""
+
+#, c-format
+msgid "helper %s does not support 'force'"
+msgstr ""
+
+msgid "couldn't run fast-export"
+msgstr ""
+
+msgid "error while running fast-export"
+msgstr ""
+
+#, c-format
+msgid ""
+"No refs in common and none specified; doing nothing.\n"
+"Perhaps you should specify a branch.\n"
+msgstr ""
+
+#, c-format
+msgid "unsupported object format '%s'"
+msgstr ""
+
+#, c-format
+msgid "malformed response in ref list: %s"
+msgstr ""
+
+#, c-format
+msgid "read(%s) failed"
+msgstr ""
+
+#, c-format
+msgid "write(%s) failed"
+msgstr ""
+
+#, c-format
+msgid "%s thread failed"
+msgstr ""
+
+#, c-format
+msgid "%s thread failed to join: %s"
+msgstr ""
+
+#, c-format
+msgid "can't start thread for copying data: %s"
+msgstr ""
+
+#, c-format
+msgid "%s process failed to wait"
+msgstr ""
+
+#, c-format
+msgid "%s process failed"
+msgstr ""
+
+msgid "can't start thread for copying data"
+msgstr ""
+
+#, c-format
+msgid "Would set upstream of '%s' to '%s' of '%s'\n"
+msgstr "Будет установлен вышестоящий репозиторий для «%s» на «%s» с «%s»\n"
+
+#, c-format
+msgid "could not read bundle '%s'"
+msgstr ""
+
+#, c-format
+msgid "transport: invalid depth option '%s'"
+msgstr "транспорт: неправильный параметр глубины «%s»"
+
+msgid "see protocol.version in 'git help config' for more details"
+msgstr ""
+
+msgid "server options require protocol version 2 or later"
+msgstr ""
+
+msgid "server does not support wait-for-done"
+msgstr ""
+
+msgid "could not parse transport.color.* config"
+msgstr "не удалось разобрать опцию transport.color.*"
+
+msgid "support for protocol v2 not implemented yet"
+msgstr ""
+
+#, c-format
+msgid "unknown value for config '%s': %s"
+msgstr ""
+
+#, c-format
+msgid "transport '%s' not allowed"
+msgstr ""
+
+msgid "git-over-rsync is no longer supported"
+msgstr ""
+
+#, c-format
+msgid ""
+"The following submodule paths contain changes that can\n"
+"not be found on any remote:\n"
+msgstr ""
+"Подмодули по указанным путям содержат изменения, которые не найдены ни на "
+"одном из внешних репозиториев:\n"
+
+#, c-format
+msgid ""
+"\n"
+"Please try\n"
+"\n"
+"\tgit push --recurse-submodules=on-demand\n"
+"\n"
+"or cd to the path and use\n"
+"\n"
+"\tgit push\n"
+"\n"
+"to push them to a remote.\n"
+"\n"
+msgstr ""
+"\n"
+"Попробуйте выполнить\n"
+"\n"
+"\tgit push --recurse-submodules=on-demand\n"
+"\n"
+"или перейти в каталог с помощью команды cd и выполнить\n"
+"\n"
+"\tgit push\n"
+"\n"
+"для их отправки на внешний репозиторий.\n"
+
+msgid "Aborting."
+msgstr "Прерываю."
+
+msgid "failed to push all needed submodules"
+msgstr ""
+
+msgid "too-short tree object"
+msgstr "слишком  короткий объект дерева"
+
+msgid "malformed mode in tree entry"
+msgstr "неправильный режим в записи дерева"
+
+msgid "empty filename in tree entry"
+msgstr "пустое имя файла в записи дерева"
+
+msgid "too-short tree file"
+msgstr "слишком  короткий файл дерева"
+
+#, c-format
+msgid ""
+"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 ""
+"Ваши локальные изменения в указанных файлах будут перезаписаны при "
+"переключении на состояние:\n"
+"%%sСделайте коммит или спрячьте ваши изменения перед переключением веток."
+
+#, c-format
+msgid ""
+"Your local changes to the following files would be overwritten by checkout:\n"
+"%%s"
+msgstr ""
+"Ваши локальные изменения в указанных файлах будут перезаписаны при "
+"переключении на состояние:\n"
+"%%s"
+
+#, c-format
+msgid ""
+"Your local changes to the following files would be overwritten by merge:\n"
+"%%sPlease commit your changes or stash them before you merge."
+msgstr ""
+"Ваши локальные изменения в указанных файлах будут перезаписаны при слиянии:\n"
+"%%sСделайте коммит или спрячьте ваши изменения перед слиянием веток."
+
+#, c-format
+msgid ""
+"Your local changes to the following files would be overwritten by merge:\n"
+"%%s"
+msgstr ""
+"Ваши локальные изменения в указанных файлах будут перезаписаны при слиянии:\n"
+"%%s"
+
+#, c-format
+msgid ""
+"Your local changes to the following files would be overwritten by %s:\n"
+"%%sPlease commit your changes or stash them before you %s."
+msgstr ""
+"Ваши локальные изменения в указанных файлах будут перезаписаны при %s:\n"
+"%%sСделайте коммит или спрячьте ваши изменения перед %s."
+
+#, c-format
+msgid ""
+"Your local changes to the following files would be overwritten by %s:\n"
+"%%s"
+msgstr ""
+"Ваши локальные изменения в указанных файлах будут перезаписаны при %s:\n"
+"%%s"
+
+#, c-format
+msgid ""
+"Updating the following directories would lose untracked files in them:\n"
+"%s"
+msgstr ""
+"Обновление указанных каталогов приведет к потере неотслеживаемых файлов в "
+"них:\n"
+"%s"
+
+#, c-format
+msgid ""
+"Refusing to remove the current working directory:\n"
+"%s"
+msgstr ""
+
+#, c-format
+msgid ""
+"The following untracked working tree files would be removed by checkout:\n"
+"%%sPlease move or remove them before you switch branches."
+msgstr ""
+"Указанные неотслеживаемые файлы в рабочем каталоге будут удалены при "
+"переключении на состояние:\n"
+"%%sПереместите эти файлы или удалите их перед переключением веток."
+
+#, c-format
+msgid ""
+"The following untracked working tree files would be removed by checkout:\n"
+"%%s"
+msgstr ""
+"Указанные неотслеживаемые файлы в рабочем каталоге будут удалены при "
+"переключении на состояние:\n"
+"%%s"
+
+#, c-format
+msgid ""
+"The following untracked working tree files would be removed by merge:\n"
+"%%sPlease move or remove them before you merge."
+msgstr ""
+"Указанные неотслеживаемые файлы в рабочем каталоге будут удалены при "
+"слиянии:\n"
+"%%sПереместите эти файлы или удалите их перед переключением веток."
+
+#, c-format
+msgid ""
+"The following untracked working tree files would be removed by merge:\n"
+"%%s"
+msgstr ""
+"Указанные неотслеживаемые файлы в рабочем каталоге будут удалены при "
+"слиянии:\n"
+"%%s"
+
+#, c-format
+msgid ""
+"The following untracked working tree files would be removed by %s:\n"
+"%%sPlease move or remove them before you %s."
+msgstr ""
+"Указанные неотслеживаемые файлы в рабочем каталоге будут удалены при %s:\n"
+"%%sПереместите эти файлы или удалите их перед %s."
+
+#, c-format
+msgid ""
+"The following untracked working tree files would be removed by %s:\n"
+"%%s"
+msgstr ""
+"Указанные неотслеживаемые файлы в рабочем каталоге будут удалены при %s:\n"
+"%%s"
+
+#, c-format
+msgid ""
+"The following untracked working tree files would be overwritten by "
+"checkout:\n"
+"%%sPlease move or remove them before you switch branches."
+msgstr ""
+"Указанные неотслеживаемые файлы в рабочем каталоге будут перезаписаны при "
+"переключении на состояние:\n"
+"%%sПереместите эти файлы или удалите их перед переключением веток."
+
+#, c-format
+msgid ""
+"The following untracked working tree files would be overwritten by "
+"checkout:\n"
+"%%s"
+msgstr ""
+"Указанные неотслеживаемые файлы в рабочем каталоге будут перезаписаны при "
+"переключении на состояние:\n"
+"%%s"
+
+#, c-format
+msgid ""
+"The following untracked working tree files would be overwritten by merge:\n"
+"%%sPlease move or remove them before you merge."
+msgstr ""
+"Указанные неотслеживаемые файлы в рабочем каталоге будут перезаписаны при "
+"слиянии:\n"
+"%%sПереместите эти файлы или удалите их перед переключением веток."
+
+#, c-format
+msgid ""
+"The following untracked working tree files would be overwritten by merge:\n"
+"%%s"
+msgstr ""
+"Указанные неотслеживаемые файлы в рабочем каталоге будут перезаписаны при "
+"слиянии:\n"
+"%%s"
+
+#, c-format
+msgid ""
+"The following untracked working tree files would be overwritten by %s:\n"
+"%%sPlease move or remove them before you %s."
+msgstr ""
+"Указанные неотслеживаемые файлы в рабочем каталоге будут перезаписаны при "
+"%s:\n"
+"%%sПереместите эти файлы или удалите их перед %s."
+
+#, c-format
+msgid ""
+"The following untracked working tree files would be overwritten by %s:\n"
+"%%s"
+msgstr ""
+"Указанные неотслеживаемые файлы в рабочем каталоге будут перезаписаны при "
+"%s:\n"
+"%%s"
+
+#, c-format
+msgid "Entry '%s' overlaps with '%s'.  Cannot bind."
+msgstr ""
+"Запись «%s» частично совпадает с «%s».  Не удалось назначить соответствие."
+
+#, c-format
+msgid ""
+"Cannot update submodule:\n"
+"%s"
+msgstr ""
+"Не удолось обновить подмодуль:\n"
+"%s"
+
+#, c-format
+msgid ""
+"The following paths are not up to date and were left despite sparse "
+"patterns:\n"
+"%s"
+msgstr ""
+
+#, c-format
+msgid ""
+"The following paths are unmerged and were left despite sparse patterns:\n"
+"%s"
+msgstr ""
+
+#, c-format
+msgid ""
+"The following paths were already present and thus not updated despite sparse "
+"patterns:\n"
+"%s"
+msgstr ""
+
+#, c-format
+msgid "Aborting\n"
+msgstr "Прерываю\n"
+
+#, c-format
+msgid ""
+"After fixing the above paths, you may want to run `git sparse-checkout "
+"reapply`.\n"
+msgstr ""
+"После исправления указанных путей вы можете запустить «git sparse-checkout "
+"reapply».\n"
+
+msgid "Updating files"
+msgstr ""
+
+msgid ""
+"the following paths have collided (e.g. case-sensitive paths\n"
+"on a case-insensitive filesystem) and only one from the same\n"
+"colliding group is in the working tree:\n"
+msgstr ""
+
+msgid "Updating index flags"
+msgstr ""
+
+#, c-format
+msgid "worktree and untracked commit have duplicate entries: %s"
+msgstr ""
+
+msgid "expected flush after fetch arguments"
+msgstr ""
+
+msgid "invalid URL scheme name or missing '://' suffix"
+msgstr "Неправильная имя URL схемы или пропущен суффикс «://»"
+
+#, c-format
+msgid "invalid %XX escape sequence"
+msgstr "неправильная управляющая последовательность %XX"
+
+msgid "missing host and scheme is not 'file:'"
+msgstr "пропущено имя сервера и схема доступа не «file:»"
+
+msgid "a 'file:' URL may not have a port number"
+msgstr "URL со схемой «file:» не может содержать номер порта"
+
+msgid "invalid characters in host name"
+msgstr "неправильные символы в имени сервера"
+
+msgid "invalid port number"
+msgstr "неправильный номер порта"
+
+msgid "invalid '..' path segment"
+msgstr "неправильная часть пути «..»"
+
+msgid "Fetching objects"
+msgstr ""
+
+#, c-format
+msgid "'%s' at main working tree is not the repository directory"
+msgstr ""
+
+#, c-format
+msgid "'%s' file does not contain absolute path to the working tree location"
+msgstr ""
+
+#, c-format
+msgid "'%s' is not a .git file, error code %d"
+msgstr ""
+
+#, c-format
+msgid "'%s' does not point back to '%s'"
+msgstr ""
+
+msgid "not a directory"
+msgstr ""
+
+msgid ".git is not a file"
+msgstr ""
+
+msgid ".git file broken"
+msgstr ""
+
+msgid ".git file incorrect"
+msgstr ""
+
+msgid "not a valid path"
+msgstr ""
+
+msgid "unable to locate repository; .git is not a file"
+msgstr ""
+
+msgid "unable to locate repository; .git file does not reference a repository"
+msgstr ""
+
+msgid "unable to locate repository; .git file broken"
+msgstr ""
+
+msgid "gitdir unreadable"
+msgstr ""
+
+msgid "gitdir incorrect"
+msgstr ""
+
+msgid "not a valid directory"
+msgstr ""
+
+msgid "gitdir file does not exist"
+msgstr ""
+
+#, c-format
+msgid "unable to read gitdir file (%s)"
+msgstr ""
+
+#, c-format
+msgid "short read (expected %<PRIuMAX> bytes, read %<PRIuMAX>)"
+msgstr ""
+
+msgid "invalid gitdir file"
+msgstr ""
+
+msgid "gitdir file points to non-existent location"
+msgstr ""
+
+#, c-format
+msgid "unable to set %s in '%s'"
+msgstr ""
+
+#, c-format
+msgid "unable to unset %s in '%s'"
+msgstr ""
+
+msgid "failed to set extensions.worktreeConfig setting"
+msgstr ""
+
+#, c-format
+msgid "could not setenv '%s'"
+msgstr ""
+
+#, c-format
+msgid "unable to create '%s'"
+msgstr "не удалось создать «%s»"
+
+#, c-format
+msgid "could not open '%s' for reading and writing"
+msgstr "не удалось открыть «%s» для чтения и записи"
+
+#, c-format
+msgid "unable to access '%s'"
+msgstr "«%s» недоступно"
+
+msgid "unable to get current working directory"
+msgstr "не удалось получить текущий рабочий каталог"
+
+msgid "Unmerged paths:"
+msgstr "Не слитые пути:"
+
+msgid "  (use \"git restore --staged <file>...\" to unstage)"
+msgstr ""
+"  (используйте «git restore --staged <файл>...», чтобы убрать из индекса)"
+
+#, c-format
+msgid "  (use \"git restore --source=%s --staged <file>...\" to unstage)"
+msgstr ""
+"  (используйте «git restore --source=%s --staged <файл>...», чтобы убрать из "
+"индекса)"
+
+msgid "  (use \"git rm --cached <file>...\" to unstage)"
+msgstr "  (используйте «git rm --cached <файл>...», чтобы убрать из индекса)"
+
+msgid "  (use \"git add <file>...\" to mark resolution)"
+msgstr ""
+"  (используйте «git add <файл>...», чтобы пометить разрешение конфликта)"
+
+msgid "  (use \"git add/rm <file>...\" as appropriate to mark resolution)"
+msgstr ""
+"  (используйте «git add/rm <файл>...», чтобы пометить выбранное разрешение "
+"конфликта)"
+
+msgid "  (use \"git rm <file>...\" to mark resolution)"
+msgstr ""
+"  (используйте «git rm <файл>...», чтобы пометить разрешение конфликта)"
+
+msgid "Changes to be committed:"
+msgstr "Изменения, которые будут включены в коммит:"
+
+msgid "Changes not staged for commit:"
+msgstr "Изменения, которые не в индексе для коммита:"
+
+msgid "  (use \"git add <file>...\" to update what will be committed)"
+msgstr "  (используйте «git add <файл>...», чтобы добавить файл в индекс)"
+
+msgid "  (use \"git add/rm <file>...\" to update what will be committed)"
+msgstr ""
+"  (используйте «git add/rm <файл>...», чтобы добавить или удалить файл из "
+"индекса)"
+
+msgid ""
+"  (use \"git restore <file>...\" to discard changes in working directory)"
+msgstr ""
+"  (используйте «git restore <файл>...», чтобы отменить изменения в рабочем "
+"каталоге)"
+
+msgid "  (commit or discard the untracked or modified content in submodules)"
+msgstr ""
+"  (сделайте коммит или отмените изменения в неотслеживаемом или измененном "
+"содержимом в подмодулях)"
+
+#, c-format
+msgid "  (use \"git %s <file>...\" to include in what will be committed)"
+msgstr ""
+"  (используйте «git %s <файл>...», чтобы добавить в то, что будет включено в "
+"коммит)"
+
+msgid "both deleted:"
+msgstr "оба удалены:"
+
+msgid "added by us:"
+msgstr "добавлено нами:"
+
+msgid "deleted by them:"
+msgstr "удалено ими:"
+
+msgid "added by them:"
+msgstr "добавлено ими:"
+
+msgid "deleted by us:"
+msgstr "удалено нами:"
+
+msgid "both added:"
+msgstr "оба добавлены:"
+
+msgid "both modified:"
+msgstr "оба изменены:"
+
+msgid "new file:"
+msgstr "новый файл:"
+
+msgid "copied:"
+msgstr "скопировано:"
+
+msgid "deleted:"
+msgstr "удалено:"
+
+msgid "modified:"
+msgstr "изменено:"
+
+msgid "renamed:"
+msgstr "переименовано:"
+
+msgid "typechange:"
+msgstr "изменен тип:"
+
+msgid "unknown:"
+msgstr "неизвестно:"
+
+msgid "unmerged:"
+msgstr "не слитые:"
+
+msgid "new commits, "
+msgstr "новые коммиты, "
+
+msgid "modified content, "
+msgstr "изменено содержимое, "
+
+msgid "untracked content, "
+msgstr "неотслеживаемое содержимое, "
+
+#, c-format
+msgid "Your stash currently has %d entry"
+msgid_plural "Your stash currently has %d entries"
+msgstr[0] "У вас сейчас спрятана %d запись"
+msgstr[1] "У вас сейчас спрятаны %d записи"
+msgstr[2] "У вас сейчас спрятано %d записей"
+msgstr[3] "У вас сейчас спрятаны %d записи"
+
+msgid "Submodules changed but not updated:"
+msgstr "Измененные, но не обновленные подмодули:"
+
+msgid "Submodule changes to be committed:"
+msgstr "Изменения в подмодулях, которые будут закоммичены:"
+
+msgid ""
+"Do not modify or remove the line above.\n"
+"Everything below it will be ignored."
+msgstr ""
+"Не изменяйте или удаляйте строку выше этой.\n"
+"Всё, что ниже — будет проигнорировано."
+
+#, c-format
+msgid ""
+"\n"
+"It took %.2f seconds to compute the branch ahead/behind values.\n"
+"You can use '--no-ahead-behind' to avoid this.\n"
+msgstr ""
+
+msgid "You have unmerged paths."
+msgstr "У вас есть не слитые пути."
+
+msgid "  (fix conflicts and run \"git commit\")"
+msgstr "  (разрешите конфликты, затем запустите «git commit»)"
+
+msgid "  (use \"git merge --abort\" to abort the merge)"
+msgstr "  (используйте «git merge --abort», чтобы остановить операцию слияния)"
+
+msgid "All conflicts fixed but you are still merging."
+msgstr "Все конфликты исправлены, но вы все еще в процессе слияния."
+
+msgid "  (use \"git commit\" to conclude merge)"
+msgstr "  (используйте «git commit», чтобы завершить слияние)"
+
+msgid "You are in the middle of an am session."
+msgstr "Вы в процессе сессии am."
+
+msgid "The current patch is empty."
+msgstr "Текущий патч пустой."
+
+msgid "  (fix conflicts and then run \"git am --continue\")"
+msgstr "  (разрешите конфликты, затем запустите «git am --continue»)"
+
+msgid "  (use \"git am --skip\" to skip this patch)"
+msgstr "  (используйте «git am --skip», чтобы пропустить этот патч)"
+
+msgid ""
+"  (use \"git am --allow-empty\" to record this patch as an empty commit)"
+msgstr ""
+
+msgid "  (use \"git am --abort\" to restore the original branch)"
+msgstr ""
+"  (используйте «git am --abort», чтобы восстановить оригинальную ветку)"
+
+msgid "git-rebase-todo is missing."
+msgstr "git-rebase-todo отсутствует."
+
+msgid "No commands done."
+msgstr "Команды не выполнены."
+
+#, c-format
+msgid "Last command done (%<PRIuMAX> command done):"
+msgid_plural "Last commands done (%<PRIuMAX> commands done):"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+msgstr[3] ""
+
+#, c-format
+msgid "  (see more in file %s)"
+msgstr "  (смотрите дополнительно в файле %s)"
+
+msgid "No commands remaining."
+msgstr "Команд больше не осталось."
+
+#, c-format
+msgid "Next command to do (%<PRIuMAX> remaining command):"
+msgid_plural "Next commands to do (%<PRIuMAX> remaining commands):"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+msgstr[3] ""
+
+msgid "  (use \"git rebase --edit-todo\" to view and edit)"
+msgstr ""
+"  (используйте «git rebase --edit-todo», чтобы просмотреть или изменить их)"
+
+#, c-format
+msgid "You are currently rebasing branch '%s' on '%s'."
+msgstr "Вы сейчас перемещаете ветку «%s» над «%s»."
+
+msgid "You are currently rebasing."
+msgstr "Вы сейчас перемещаете ветку."
+
+msgid "  (fix conflicts and then run \"git rebase --continue\")"
+msgstr "  (разрешите конфликты, затем запустите «git rebase --continue»)"
+
+msgid "  (use \"git rebase --skip\" to skip this patch)"
+msgstr "  (используйте «git rebase --skip», чтобы пропустить этот патч)"
+
+msgid "  (use \"git rebase --abort\" to check out the original branch)"
+msgstr ""
+"  (используйте «git rebase --abort», чтобы перейти на оригинальную ветку)"
+
+msgid "  (all conflicts fixed: run \"git rebase --continue\")"
+msgstr "  (все конфликты разрешены: запустите «git rebase --continue»)"
+
+#, c-format
+msgid ""
+"You are currently splitting a commit while rebasing branch '%s' on '%s'."
+msgstr "Вы сейчас разделяете коммит при перемещении ветки  «%s» над «%s»."
+
+msgid "You are currently splitting a commit during a rebase."
+msgstr "Вы сейчас разделяете коммит при перемещении ветки."
+
+msgid "  (Once your working directory is clean, run \"git rebase --continue\")"
+msgstr ""
+"  (Как только ваш рабочий каталог будет чистый, запустите «git rebase --"
+"continue»)"
+
+#, c-format
+msgid "You are currently editing a commit while rebasing branch '%s' on '%s'."
+msgstr "Вы сейчас редактируете коммит при перемещении ветки  «%s» над «%s»."
+
+msgid "You are currently editing a commit during a rebase."
+msgstr "Вы сейчас редактируете коммит при перемещении ветки."
+
+msgid "  (use \"git commit --amend\" to amend the current commit)"
+msgstr "  (используйте «git commit --amend», чтобы исправить текущий коммит)"
+
+msgid ""
+"  (use \"git rebase --continue\" once you are satisfied with your changes)"
+msgstr ""
+"  (используйте «git rebase --continue», когда будете довольны изменениями)"
+
+msgid "Cherry-pick currently in progress."
+msgstr ""
+
+#, c-format
+msgid "You are currently cherry-picking commit %s."
+msgstr "Вы копируете коммит %s."
+
+msgid "  (fix conflicts and run \"git cherry-pick --continue\")"
+msgstr "  (разрешите конфликты, затем запустите «git cherry-pick --continue»)"
+
+msgid "  (run \"git cherry-pick --continue\" to continue)"
+msgstr ""
+
+msgid "  (all conflicts fixed: run \"git cherry-pick --continue\")"
+msgstr "  (все конфликты разрешены: запустите «git cherry-pick --continue»)"
+
+msgid "  (use \"git cherry-pick --skip\" to skip this patch)"
+msgstr ""
+
+msgid "  (use \"git cherry-pick --abort\" to cancel the cherry-pick operation)"
+msgstr ""
+"  (используйте «git cherry-pick --abort», чтобы отменить копирования коммита)"
+
+msgid "Revert currently in progress."
+msgstr ""
+
+#, c-format
+msgid "You are currently reverting commit %s."
+msgstr "Вы сейчас обращаете изменения коммита %s."
+
+msgid "  (fix conflicts and run \"git revert --continue\")"
+msgstr "  (разрешите конфликты, затем запустите «git revert --continue»)"
+
+msgid "  (run \"git revert --continue\" to continue)"
+msgstr ""
+
+msgid "  (all conflicts fixed: run \"git revert --continue\")"
+msgstr "  (все конфликты разрешены: запустите «git revert --continue»)"
+
+msgid "  (use \"git revert --skip\" to skip this patch)"
+msgstr ""
+
+msgid "  (use \"git revert --abort\" to cancel the revert operation)"
+msgstr ""
+"  (используйте «git revert --abort», чтобы отменить операцию обращения "
+"изменений коммита)"
+
+#, c-format
+msgid "You are currently bisecting, started from branch '%s'."
+msgstr "Вы сейчас в процессе двоичного поиска, начатого с ветки «%s»."
+
+msgid "You are currently bisecting."
+msgstr "Вы сейчас в процессе двоичного поиска."
+
+msgid "  (use \"git bisect reset\" to get back to the original branch)"
+msgstr "  (используйте «git bisect reset», чтобы вернуться на исходную ветку)"
+
+msgid "You are in a sparse checkout."
+msgstr ""
+
+#, c-format
+msgid "You are in a sparse checkout with %d%% of tracked files present."
+msgstr ""
+
+msgid "On branch "
+msgstr "Текущая ветка: "
+
+msgid "interactive rebase in progress; onto "
+msgstr "интерактивное перемещение в процессе; над "
+
+msgid "rebase in progress; onto "
+msgstr "перемещение в процессе; над "
+
+msgid "HEAD detached at "
+msgstr "Отсоединённый указатель HEAD указывает на "
+
+msgid "HEAD detached from "
+msgstr "Отсоединённый указатель HEAD на цепочке коммитов начиная с "
+
+msgid "Not currently on any branch."
+msgstr "Сейчас ни на одной из веток"
+
+msgid "Initial commit"
+msgstr "Начальный коммит"
+
+msgid "No commits yet"
+msgstr "Еще нет коммитов"
+
+msgid "Untracked files"
+msgstr "Неотслеживаемые файлы"
+
+msgid "Ignored files"
+msgstr "Игнорируемые файлы"
+
+#, c-format
+msgid ""
+"It took %.2f seconds to enumerate untracked files. 'status -uno'\n"
+"may speed it up, but you have to be careful not to forget to add\n"
+"new files yourself (see 'git help status')."
+msgstr ""
+"%.2f сек занял вывод списка неотслеживаемых файлов.\n"
+"«status -uno» возможно ускорит это, но будьте внимательны\n"
+"и не забудьте добавить новые файлы вручную\n"
+"(смотрите «git help status» для подробностей)."
+
+#, c-format
+msgid "Untracked files not listed%s"
+msgstr "Неотслеживаемые файлы не показаны%s"
+
+msgid " (use -u option to show untracked files)"
+msgstr " (используйте опцию «-u», чтобы показать неотслеживаемые файлы)"
+
+msgid "No changes"
+msgstr "Нет изменений"
+
+#, c-format
+msgid "no changes added to commit (use \"git add\" and/or \"git commit -a\")\n"
+msgstr "индекс пуст (используйте «git add» и/или «git commit -a»)\n"
+
+#, c-format
+msgid "no changes added to commit\n"
+msgstr "индекс пуст\n"
+
+#, c-format
+msgid ""
+"nothing added to commit but untracked files present (use \"git add\" to "
+"track)\n"
+msgstr ""
+"индекс пуст, но есть неотслеживаемые файлы\n"
+"(используйте «git add», чтобы проиндексировать их)\n"
+
+#, c-format
+msgid "nothing added to commit but untracked files present\n"
+msgstr "индекс пуст, но есть неотслеживаемые файлы\n"
+
+#, c-format
+msgid "nothing to commit (create/copy files and use \"git add\" to track)\n"
+msgstr ""
+"нечего коммитить (создайте/скопируйте файлы, затем запустите\n"
+"«git add», чтобы отслеживать их)\n"
+
+#, c-format
+msgid "nothing to commit\n"
+msgstr "нечего коммитить\n"
+
+#, c-format
+msgid "nothing to commit (use -u to show untracked files)\n"
+msgstr ""
+"нечего коммитить (используйте опцию «-u», чтобы показать неотслеживаемые "
+"файлы)\n"
+
+#, c-format
+msgid "nothing to commit, working tree clean\n"
+msgstr "нечего коммитить, нет изменений в рабочем каталоге\n"
+
+msgid "No commits yet on "
+msgstr "Еще нет коммитов в "
+
+msgid "HEAD (no branch)"
+msgstr "HEAD (нет ветки)"
+
+msgid "different"
+msgstr "отличается"
+
+msgid "behind "
+msgstr "позади "
+
+msgid "ahead "
+msgstr "впереди "
+
+#. TRANSLATORS: the action is e.g. "pull with rebase"
+#, c-format
+msgid "cannot %s: You have unstaged changes."
+msgstr "не удалось выполнить %s: У вас есть непроиндексированные изменения."
+
+msgid "additionally, your index contains uncommitted changes."
+msgstr "к тому же, в вашем индексе есть незакоммиченные изменения."
+
+#, c-format
+msgid "cannot %s: Your index contains uncommitted changes."
+msgstr ""
+"не удалось выполнить %s: В вашем индексе есть незакоммиченные изменения."
+
+msgid ""
+"Error: Your local changes to the following files would be overwritten by "
+"merge"
+msgstr ""
+"Ошибка: Ваши локальные изменения в указанных файлах будут перезаписаны при "
+"слиянии"
+
+msgid "Automated merge did not work."
+msgstr "Не удалось автоматически слить изменения."
+
+msgid "Should not be doing an octopus."
+msgstr "Должно быть octopus не подходит."
 
-#: git-rebase--preserve-merges.sh:898
 #, sh-format
-msgid "Could not create temporary $state_dir"
-msgstr "Не удалось создать временный каталог $state_dir"
+msgid "Unable to find common commit with $pretty_name"
+msgstr "Не удалось найти общий коммит с $pretty_name"
 
-#: git-rebase--preserve-merges.sh:901
-msgid "Could not mark as interactive"
-msgstr "Не удалось пометить как интерактивный"
+#, sh-format
+msgid "Already up to date with $pretty_name"
+msgstr "Уже соответствует $pretty_name"
 
-#: 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 команды)"
-msgstr[2] "Перемещение $shortrevisions над $shortonto ($todocount команд)"
-msgstr[3] "Перемещение $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
+msgid "Fast-forwarding to: $pretty_name"
+msgstr "Быстрая перемотка до: $pretty_name"
+
+#, sh-format
+msgid "Trying simple merge with $pretty_name"
+msgstr "Попытка простого слияния с $pretty_name"
+
+msgid "Simple merge did not work, trying automatic merge."
+msgstr "Простое слияние не удалось, попытка автоматического слияния."
+
 #, sh-format
 msgid "usage: $dashless $USAGE"
 msgstr "использование: $dashless $USAGE"
 
-#: git-sh-setup.sh:191
 #, sh-format
 msgid "Cannot chdir to $cdup, the toplevel of the working tree"
 msgstr "Не удалось выполнить chdir в $cdup, вершину рабочего каталога"
 
-#: git-sh-setup.sh:200 git-sh-setup.sh:207
 #, sh-format
 msgid "fatal: $program_name cannot be used without a working tree."
-msgstr "критическая ошибка: $program_name нельзя использовать не имея рабочего каталога."
-
-#: git-sh-setup.sh:221
-msgid "Cannot rebase: You have unstaged changes."
-msgstr "Не удалось выполнить перемещение коммитов: У вас есть непроиндексированные изменения."
+msgstr ""
+"критическая ошибка: $program_name нельзя использовать не имея рабочего "
+"каталога."
 
-#: 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 "Не удалось получить с перемещением: У вас есть непроиндексированные изменения."
+msgstr ""
+"Не удалось выполнить перезапись веток: У вас есть непроиндексированные "
+"изменения."
 
-#: git-sh-setup.sh:230
 #, 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 "Не удалось получить с перемещением: В вашем индексе есть незакоммиченные изменения."
+msgstr ""
+"Не удалось выполнить $action: У вас есть непроиндексированные изменения."
 
-#: git-sh-setup.sh:249
 #, sh-format
 msgid "Cannot $action: Your index contains uncommitted changes."
-msgstr "Не удалось выполнить $action: В вашем индексе есть незакоммиченные изменения."
+msgstr ""
+"Не удалось выполнить $action: В вашем индексе есть незакоммиченные изменения."
 
-#: git-sh-setup.sh:253
 msgid "Additionally, your index contains uncommitted changes."
 msgstr "К тому же, в вашем индексе есть незакоммиченные изменения."
 
-#: git-sh-setup.sh:373
 msgid "You need to run this command from the toplevel of the working tree."
 msgstr "Вам нужно запускать эту команду находясь на вершине рабочего каталога."
 
-#: git-sh-setup.sh:378
 msgid "Unable to determine absolute path of git directory"
 msgstr "Не удалось определить абсолютный путь к каталогу git"
 
 #. TRANSLATORS: you can adjust this to align "git add -i" status menu
-#: git-add--interactive.perl:212
 #, perl-format
 msgid "%12s %12s %s"
 msgstr "%12s %12s %s"
 
-#: git-add--interactive.perl:632
 #, perl-format
 msgid "touched %d path\n"
 msgid_plural "touched %d paths\n"
@@ -23356,121 +20700,152 @@ msgstr[1] "тронуты %d пути\n"
 msgstr[2] "тронуты %d путей\n"
 msgstr[3] "тронуты %d пути\n"
 
-#: git-add--interactive.perl:1056
 msgid ""
 "If the patch applies cleanly, the edited hunk will immediately be\n"
 "marked for staging."
-msgstr "Если патч применяется без ошибок, то изменённый блок будет сразу помечен для индексирования."
+msgstr ""
+"Если патч применяется без ошибок, то изменённый блок будет сразу помечен для "
+"индексирования."
 
-#: git-add--interactive.perl:1059
 msgid ""
 "If the patch applies cleanly, the edited hunk will immediately be\n"
 "marked for stashing."
-msgstr "Если патч применяется без ошибок, то изменённый блок будет сразу помечен для прятанья."
+msgstr ""
+"Если патч применяется без ошибок, то изменённый блок будет сразу помечен для "
+"прятанья."
 
-#: git-add--interactive.perl:1062
 msgid ""
 "If the patch applies cleanly, the edited hunk will immediately be\n"
 "marked for unstaging."
-msgstr "Если патч применяется без ошибок, то изменённый блок будет сразу помечен для убирания из индекса."
+msgstr ""
+"Если патч применяется без ошибок, то изменённый блок будет сразу помечен для "
+"убирания из индекса."
 
-#: git-add--interactive.perl:1065 git-add--interactive.perl:1074
-#: git-add--interactive.perl:1080
 msgid ""
 "If the patch applies cleanly, the edited hunk will immediately be\n"
 "marked for applying."
-msgstr "Если патч применяется без ошибок, то изменённый блок будет сразу помечен для применения."
+msgstr ""
+"Если патч применяется без ошибок, то изменённый блок будет сразу помечен для "
+"применения."
 
-#: git-add--interactive.perl:1068 git-add--interactive.perl:1071
-#: git-add--interactive.perl:1077
 msgid ""
 "If the patch applies cleanly, the edited hunk will immediately be\n"
 "marked for discarding."
-msgstr "Если патч применяется без ошибок, то изменённый блок будет сразу помечен для отмены изменений."
+msgstr ""
+"Если патч применяется без ошибок, то изменённый блок будет сразу помечен для "
+"отмены изменений."
 
-#: git-add--interactive.perl:1114
 #, perl-format
 msgid "failed to open hunk edit file for writing: %s"
 msgstr "не удалось открыть файл редактирования блока изменений для записи: %s"
 
-#: git-add--interactive.perl:1121
 #, perl-format
 msgid ""
 "---\n"
 "To remove '%s' lines, make them ' ' lines (context).\n"
 "To remove '%s' lines, delete them.\n"
 "Lines starting with %s will be removed.\n"
-msgstr "---\nЧтобы удалить «%s» строки, сделайте их ' ' строками (контекст).\nЧтобы удалить «%s» строки, удалите их.\nСтроки, начинающиеся с %s будут удалены.\n"
+msgstr ""
+"---\n"
+"Чтобы удалить «%s» строки, сделайте их ' ' строками (контекст).\n"
+"Чтобы удалить «%s» строки, удалите их.\n"
+"Строки, начинающиеся с %s будут удалены.\n"
 
-#: git-add--interactive.perl:1143
 #, perl-format
 msgid "failed to open hunk edit file for reading: %s"
 msgstr "не удалось открыть файл редактирования блока изменений для чтения: %s"
 
-#: git-add--interactive.perl:1251
 msgid ""
 "y - stage this hunk\n"
 "n - do not stage this hunk\n"
 "q - quit; do not stage this hunk or any of the remaining ones\n"
 "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"
-msgstr "y - проиндексировать блок изменений\nn - не индексировать этот блок изменений\nq - выход; не индексировать этот и последующие блоки\na - проиндексировать этот и все последующие блоки файла\nd - не индексировать этот и последующие блоки файла"
+msgstr ""
+"y - индексировать этот блок\n"
+"n - пропустить этот блок\n"
+"q - выход; пропустить этот и все оставшиеся блоки\n"
+"a - индексировать этот и остальные блоки файла\n"
+"d - пропустить этот и остальные блоки файла"
 
-#: git-add--interactive.perl:1257
 msgid ""
 "y - stash this hunk\n"
 "n - do not stash this hunk\n"
 "q - quit; do not stash this hunk or any of the remaining ones\n"
 "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"
-msgstr "y - спрятать изменения блока\nq - выход; не прятать изменения этого и последующих блоков\na - спрятать этот и все последующие блоки файла\nd - не прятать этот и последующие блоки файла"
+msgstr ""
+"y - спрятать этот блок\n"
+"n - пропустить этот блок\n"
+"q - выход; пропустить этот и все последующие блоки\n"
+"a - спрятать этот и остальные блоки файла\n"
+"d - пропустить этот и остальные блоки файла"
 
-#: git-add--interactive.perl:1263
 msgid ""
 "y - unstage this hunk\n"
 "n - do not unstage this hunk\n"
 "q - quit; do not unstage this hunk or any of the remaining ones\n"
 "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"
-msgstr "y - убрать из индекса этот блок изменений\nn - не убирать из индекса этот блок изменений\nq - выход; не убирать из индекса этот и последующие блоки\na - убрать из индекса этот и все последующие блоки файла\nd - не убирать из индекса этот и последующие блоки файла"
+msgstr ""
+"y - убрать из индекса этот блок\n"
+"n - пропустить этот блок\n"
+"q - выход; пропустить этот и все последующие блоки\n"
+"a - убрать из индекса этот и остальные блоки файла\n"
+"d - пропустить этот и остальные блоки файла"
 
-#: git-add--interactive.perl:1269
 msgid ""
 "y - apply this hunk to index\n"
 "n - do not apply this hunk to index\n"
 "q - quit; do not apply this hunk or any of the remaining ones\n"
 "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"
-msgstr "y - применить блок изменений к индексу\nn - не применять этот блок изменений к индексу\nq - выход; не применять этот и последующие блоки\na - применить этот блок и все последующие блоки файла\nd - не применять этот и последующие блоки файла"
+msgstr ""
+"y - принять этот блок в индекс\n"
+"n - пропустить этот блок\n"
+"q - выход; пропустить этот и все последующие блоки\n"
+"a - принять этот и остальные блоки файла\n"
+"d - пропустить этот и остальные блоки файла"
 
-#: git-add--interactive.perl:1275 git-add--interactive.perl:1293
 msgid ""
 "y - discard this hunk from worktree\n"
 "n - do not discard this hunk from worktree\n"
 "q - quit; do not discard this hunk or any of the remaining ones\n"
 "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"
-msgstr "y - отменить изменения этого блока в рабочем каталоге\nn - не отменять изменения этого блока в рабочем каталоге\nq - выход; не отменять изменения этого блока и всех последующих\na - отменить изменения этого и всех последующих блоков файла\nd - не отменять изменения этого и всех последующих блоков файла"
+msgstr ""
+"y - отбросить этот блок из рабочего дерева\n"
+"n - пропустить этот блок\n"
+"q - выход; пропустить этот и все последующие блоки\n"
+"a - отбросить этот и остальные блоки файла\n"
+"d - пропустить этот и остальные блоки файла"
 
-#: git-add--interactive.perl:1281
 msgid ""
 "y - discard this hunk from index and worktree\n"
 "n - do not discard this hunk from index and worktree\n"
 "q - quit; do not discard this hunk or any of the remaining ones\n"
 "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"
-msgstr "y - отменить изменения этого блока в индексе и рабочем каталоге\nn - не отменять изменения этого блока в индексе и рабочем каталоге\nq - выход; не отменять изменения этого блока и всех последующих\na - отменить изменения этого и всех последующих блоков файла\nd - не отменять изменения этого и всех последующих блоков файла"
+msgstr ""
+"y - отбросить этот блок из индекса и рабочего дерева\n"
+"n - пропустить этот блок\n"
+"q - выход; пропустить этот и все последующие блоки\n"
+"a - отбросить этот и остальные блоки файла\n"
+"d - пропустить этот и остальные блоки файла"
 
-#: git-add--interactive.perl:1287
 msgid ""
 "y - apply this hunk to index and worktree\n"
 "n - do not apply this hunk to index and worktree\n"
 "q - quit; do not apply this hunk or any of the remaining ones\n"
 "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"
-msgstr "y - применить блок изменений к индексу и рабочему каталогу\nn - не применять этот блок изменений к индексу и рабочему каталогу\nq - выход; не применять этот и последующие блоки\na - применить этот блок и все последующие блоки файла\nd - не применять этот и последующие блоки файла"
+msgstr ""
+"y - принять этот блок в индекс и рабочее дерево\n"
+"n - пропустить этот блок\n"
+"q - выход; пропустить этот и все последующие блоки\n"
+"a - принять этот и остальные блоки файла\n"
+"d - пропустить этот и остальные блоки файла"
 
-#: git-add--interactive.perl:1299
 msgid ""
 "y - apply this hunk to worktree\n"
 "n - do not apply this hunk to worktree\n"
@@ -23478,8 +20853,12 @@ msgid ""
 "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"
 msgstr ""
+"y - принять этот блок в рабочее дерево\n"
+"n - пропустить этот блок\n"
+"q - выход; пропустить этот и все последующие блоки\n"
+"a - принять этот и остальные блоки файла\n"
+"d - пропустить этот и остальные блоки файла"
 
-#: git-add--interactive.perl:1314
 msgid ""
 "g - select a hunk to go to\n"
 "/ - search for a hunk matching the given regex\n"
@@ -23490,47 +20869,47 @@ msgid ""
 "s - split the current hunk into smaller hunks\n"
 "e - manually edit the current hunk\n"
 "? - print help\n"
-msgstr "g - выбрать блок изменений на который нужно перейти\n/ - поиск блока изменений с помощью регулярного выражения\nj - не принимать решение по этому блоку, перейти на следующий без решения\nJ - не принимать решение по этому блоку, перейти на следующий\nk - не принимать решение по этому блоку, перейти на предыдущий без решения\nK - не принимать решение по этому блоку, перейти на предыдущий\ns - разделить текущий блок на блоки меньшего размера\ne - вручную отредактировать текущий блок\n? - вывести справку\n"
+msgstr ""
+"g - выбрать блок изменений на который нужно перейти\n"
+"/ - поиск блока изменений с помощью регулярного выражения\n"
+"j - не принимать решение по этому блоку, перейти на следующий нерешенный\n"
+"J - не принимать решение по этому блоку, перейти на следующий\n"
+"k - не принимать решение по этому блоку, перейти на предыдущий нерешенный\n"
+"K - не принимать решение по этому блоку, перейти на предыдущий\n"
+"s - разделить текущий блок на блоки меньшего размера\n"
+"e - вручную отредактировать текущий блок\n"
+"? - вывести справку\n"
 
-#: git-add--interactive.perl:1345
 msgid "The selected hunks do not apply to the index!\n"
 msgstr "Выбранные блоки не применяются без ошибок к индексу!\n"
 
-#: git-add--interactive.perl:1360
 #, perl-format
 msgid "ignoring unmerged: %s\n"
 msgstr "игнорирую не слитое: %s\n"
 
-#: git-add--interactive.perl:1479
 #, perl-format
 msgid "Apply mode change to worktree [y,n,q,a,d%s,?]? "
 msgstr ""
 
-#: git-add--interactive.perl:1480
 #, perl-format
 msgid "Apply deletion to worktree [y,n,q,a,d%s,?]? "
 msgstr ""
 
-#: git-add--interactive.perl:1481
 #, perl-format
 msgid "Apply addition to worktree [y,n,q,a,d%s,?]? "
 msgstr ""
 
-#: git-add--interactive.perl:1482
 #, perl-format
 msgid "Apply this hunk to worktree [y,n,q,a,d%s,?]? "
-msgstr ""
+msgstr "Принять этот блок в рабочее дерево [y,n,q,a,d%s,?]? "
 
-#: git-add--interactive.perl:1599
 msgid "No other hunks to goto\n"
 msgstr ""
 
-#: git-add--interactive.perl:1617
 #, perl-format
 msgid "Invalid number: '%s'\n"
 msgstr "Неверный номер: «%s»\n"
 
-#: git-add--interactive.perl:1622
 #, perl-format
 msgid "Sorry, only %d hunk available.\n"
 msgid_plural "Sorry, only %d hunks available.\n"
@@ -23539,32 +20918,25 @@ msgstr[1] "Простите, но только %d блока изменений
 msgstr[2] "Простите, но только %d блоков изменений доступно.\n"
 msgstr[3] "Простите, но только %d блока изменений доступно.\n"
 
-#: git-add--interactive.perl:1657
 msgid "No other hunks to search\n"
 msgstr ""
 
-#: git-add--interactive.perl:1674
 #, perl-format
 msgid "Malformed search regexp %s: %s\n"
 msgstr "Регулярное выражение для поиска в неверном формате %s: %s\n"
 
-#: git-add--interactive.perl:1684
 msgid "No hunk matches the given pattern\n"
 msgstr "Не найдены блоки, которые соответствуют указанному шаблону\n"
 
-#: git-add--interactive.perl:1696 git-add--interactive.perl:1718
 msgid "No previous hunk\n"
 msgstr "Нет предыдущего блока\n"
 
-#: git-add--interactive.perl:1705 git-add--interactive.perl:1724
 msgid "No next hunk\n"
 msgstr "Не следующего блока\n"
 
-#: git-add--interactive.perl:1730
 msgid "Sorry, cannot split this hunk\n"
 msgstr ""
 
-#: git-add--interactive.perl:1736
 #, perl-format
 msgid "Split into %d hunk.\n"
 msgid_plural "Split into %d hunks.\n"
@@ -23573,113 +20945,103 @@ msgstr[1] "Разбито на %d блока изменений.\n"
 msgstr[2] "Разбито на %d блоков изменений.\n"
 msgstr[3] "Разбито на %d блока изменений.\n"
 
-#: git-add--interactive.perl:1746
 msgid "Sorry, cannot edit this hunk\n"
 msgstr ""
 
 #. TRANSLATORS: please do not translate the command names
 #. 'status', 'update', 'revert', etc.
-#: git-add--interactive.perl:1811
 msgid ""
 "status        - show paths with changes\n"
 "update        - add working tree state to the staged set of changes\n"
 "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"
-msgstr "status        - показать пути с изменениями\nupdate        - добавить состояние рабочего каталога индекс\nrevert        - вернуть проиндексированный набор изменений к HEAD версии\npatch         - выбрать и выборочно обновить блоки\ndiff          - просмотреть изменения между HEAD и индексом\nadd untracked - добавить содержимое неотслеживаемых файлов в индекс\n"
+"add untracked - add contents of untracked files to the staged set of "
+"changes\n"
+msgstr ""
+"status        - показать пути с изменениями\n"
+"update        - добавить состояние рабочей копии в индекс\n"
+"revert        - вернуть проиндексированный набор изменений к HEAD-версии\n"
+"patch         - выбрать и выборочно обновить блоки\n"
+"diff          - просмотреть различия между HEAD и индексом\n"
+"add untracked - добавить содержимое неотслеживаемых файлов в индекс\n"
 
-#: git-add--interactive.perl:1828 git-add--interactive.perl:1840
-#: git-add--interactive.perl:1843 git-add--interactive.perl:1850
-#: git-add--interactive.perl:1853 git-add--interactive.perl:1860
-#: git-add--interactive.perl:1864 git-add--interactive.perl:1870
 msgid "missing --"
 msgstr "отсутствует --"
 
-#: git-add--interactive.perl:1866
 #, perl-format
 msgid "unknown --patch mode: %s"
 msgstr "неизвестный режим для --patch: %s"
 
-#: git-add--interactive.perl:1872 git-add--interactive.perl:1878
 #, perl-format
 msgid "invalid argument %s, expecting --"
 msgstr "недопустимый аргумент %s, ожидается --"
 
-#: git-send-email.perl:138
 msgid "local zone differs from GMT by a non-minute interval\n"
 msgstr "локальный часовой пояс отличается от GMT на не минутный интервал\n"
 
-#: git-send-email.perl:145 git-send-email.perl:151
 msgid "local time offset greater than or equal to 24 hours\n"
 msgstr "локальный сдвиг времени больше или равен 24 часа\n"
 
-#: git-send-email.perl:223 git-send-email.perl:229
+#, perl-format
+msgid "fatal: command '%s' died with exit code %d"
+msgstr ""
+
 msgid "the editor exited uncleanly, aborting everything"
 msgstr "редактор был завершен с ошибкой, отменяю всё"
 
-#: git-send-email.perl:312
 #, 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» содержит промежуточную версию письма, которое вы готовите.\n"
 
-#: git-send-email.perl:317
 #, perl-format
 msgid "'%s.final' contains the composed email.\n"
 msgstr "«%s.final» содержит подготовленное письмо.\n"
 
-#: git-send-email.perl:410
 msgid "--dump-aliases incompatible with other options\n"
 msgstr "--dump-aliases не совместимо с другими опциями\n"
 
-#: git-send-email.perl:484
 msgid ""
 "fatal: found configuration options for 'sendmail'\n"
 "git-send-email is configured with the sendemail.* options - note the 'e'.\n"
 "Set sendemail.forbidSendmailVariables to false to disable this check.\n"
 msgstr ""
 
-#: git-send-email.perl:489 git-send-email.perl:691
 msgid "Cannot run git format-patch from outside a repository\n"
 msgstr "Нельзя запускать git format-patch вне репозитория\n"
 
-#: git-send-email.perl:492
 msgid ""
 "`batch-size` and `relogin` must be specified together (via command-line or "
 "configuration option)\n"
 msgstr ""
 
-#: git-send-email.perl:505
 #, perl-format
 msgid "Unknown --suppress-cc field: '%s'\n"
 msgstr "Неизвестное поле --suppress-cc: «%s»\n"
 
-#: git-send-email.perl:536
 #, perl-format
 msgid "Unknown --confirm setting: '%s'\n"
 msgstr "Неизвестный параметр --confirm: «%s»\n"
 
-#: git-send-email.perl:564
 #, perl-format
 msgid "warning: sendmail alias with quotes is not supported: %s\n"
-msgstr "предупреждение: сокращение для sendmail с кавычками не поддерживается: %s\n"
+msgstr ""
+"предупреждение: сокращение для sendmail с кавычками не поддерживается: %s\n"
 
-#: git-send-email.perl:566
 #, perl-format
 msgid "warning: `:include:` not supported: %s\n"
 msgstr "предупреждение: «:include:» не поддерживается: %s\n"
 
-#: git-send-email.perl:568
 #, perl-format
 msgid "warning: `/file` or `|pipe` redirection not supported: %s\n"
-msgstr "предупреждение: перенаправление «/file» или «|pipe» не поддерживается: %s\n"
+msgstr ""
+"предупреждение: перенаправление «/file» или «|pipe» не поддерживается: %s\n"
 
-#: git-send-email.perl:573
 #, perl-format
 msgid "warning: sendmail line is not recognized: %s\n"
 msgstr "предупреждение: строка sendmail не распознана: %s\n"
 
-#: git-send-email.perl:657
 #, perl-format
 msgid ""
 "File '%s' exists but it could also be the range of commits\n"
@@ -23687,98 +21049,97 @@ msgid ""
 "\n"
 "    * Saying \"./%s\" if you mean a file; or\n"
 "    * Giving --format-patch option if you mean a range.\n"
-msgstr "Файл «%s» существует, но это также может быть и\nдиапазоном коммитов для которых нужно сделать патчи. \nУстраните неоднозначность…\n\n    * Указав \"./%s\" если вы имеете в виду имя файла; или\n    * Передав опцию --format-patch если вы имеете в виду диапазон коммитов.\n"
+msgstr ""
+"Файл «%s» существует, но это также может быть и\n"
+"диапазоном коммитов для которых нужно сделать патчи. \n"
+"Устраните неоднозначность...\n"
+"\n"
+"    * Указав \"./%s\" если вы имеете в виду имя файла; или\n"
+"    * Передав опцию --format-patch если вы имеете в виду диапазон коммитов.\n"
 
-#: git-send-email.perl:678
 #, perl-format
 msgid "Failed to opendir %s: %s"
 msgstr "Не удалось выполнить opendir %s: %s"
 
-#: git-send-email.perl:702
-#, perl-format
-msgid ""
-"fatal: %s: %s\n"
-"warning: no patches were sent\n"
-msgstr "критическая ошибка: %s: %s\nпредупреждение: патчи не были отправлены\n"
-
-#: git-send-email.perl:713
 msgid ""
 "\n"
 "No patch files specified!\n"
 "\n"
-msgstr "\nФайл с патчем не указан!\n\n"
+msgstr ""
+"\n"
+"Файл с патчем не указан!\n"
+"\n"
 
-#: git-send-email.perl:726
 #, perl-format
 msgid "No subject line in %s?"
 msgstr "Нет строки с темой в %s?"
 
-#: git-send-email.perl:736
 #, perl-format
 msgid "Failed to open for writing %s: %s"
 msgstr "Не удалось открыть для записи %s: %s"
 
-#: git-send-email.perl:747
 msgid ""
 "Lines beginning in \"GIT:\" will be removed.\n"
 "Consider including an overall diffstat or table of contents\n"
 "for the patch you are writing.\n"
 "\n"
 "Clear the body content if you don't wish to send a summary.\n"
-msgstr "Строки, начинающиеся с «GIT:» будут удалены.\nВозможно будет полезно включить статистику добавлений\nи удалений или таблицу содержимого к создаваемому патчу.\n\nОчистите содержимое, если вы не хотите отправлять письмо со сводкой изменений.\n"
+msgstr ""
+"Строки, начинающиеся с «GIT:» будут удалены.\n"
+"Возможно будет полезно включить статистику добавлений\n"
+"и удалений или таблицу содержимого к создаваемому патчу.\n"
+"\n"
+"Очистите содержимое, если вы не хотите отправлять письмо со сводкой "
+"изменений.\n"
 
-#: git-send-email.perl:771
 #, perl-format
 msgid "Failed to open %s: %s"
 msgstr "Не удалось открыть %s: %s"
 
-#: git-send-email.perl:788
 #, perl-format
 msgid "Failed to open %s.final: %s"
 msgstr "Не удалось открыть %s.final: %s"
 
-#: git-send-email.perl:831
 msgid "Summary email is empty, skipping it\n"
 msgstr "Письмо со сводкой изменений пустое, попускаю его\n"
 
 #. TRANSLATORS: please keep [y/N] as is.
-#: git-send-email.perl:866
 #, perl-format
 msgid "Are you sure you want to use <%s> [y/N]? "
 msgstr "Вы уверены, что хотите использовать <%s> [y/N]? "
 
-#: git-send-email.perl:921
 msgid ""
 "The following files are 8bit, but do not declare a Content-Transfer-"
 "Encoding.\n"
 msgstr "Следующие файлы 8 битные, но не содержат Content-Transfer-Encoding.\n"
 
-#: git-send-email.perl:926
 msgid "Which 8bit encoding should I declare [UTF-8]? "
 msgstr "Какую 8 битную кодировку нужно указать [UTF-8]? "
 
-#: git-send-email.perl:934
 #, 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"
-msgstr "Отказываюсь отправить, т.к. патч\n\t%s\nсодержит шаблонный заголовок «*** SUBJECT HERE ***». Укажите параметр --force, если вы  действительно хотите отправить его.\n"
+"has the template subject '*** SUBJECT HERE ***'. Pass --force if you really "
+"want to send.\n"
+msgstr ""
+"Отказываюсь отправить, т.к. патч\n"
+"\t%s\n"
+"содержит шаблонный заголовок «*** SUBJECT HERE ***». Укажите параметр --"
+"force, если вы  действительно хотите отправить его.\n"
 
-#: git-send-email.perl:953
 msgid "To whom should the emails be sent (if anyone)?"
 msgstr "Кому должны быть отправлены письма (если нужно)?"
 
-#: git-send-email.perl:971
 #, perl-format
 msgid "fatal: alias '%s' expands to itself\n"
 msgstr "критическая ошибка: сокращение «%s» раскрывается само в себя\n"
 
-#: git-send-email.perl:983
 msgid "Message-ID to be used as In-Reply-To for the first email (if any)? "
-msgstr "Message-ID который нужно использовать в поле In-Reply-To для первого письма (если нужно)? "
+msgstr ""
+"Message-ID который нужно использовать в поле In-Reply-To для первого письма "
+"(если нужно)? "
 
-#: git-send-email.perl:1041 git-send-email.perl:1049
 #, perl-format
 msgid "error: unable to extract a valid address from: %s\n"
 msgstr "ошибка: не удалось выделить действительный адрес из: %s\n"
@@ -23786,16 +21147,15 @@ msgstr "ошибка: не удалось выделить действител�
 #. 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
 msgid "What to do with this address? ([q]uit|[d]rop|[e]dit): "
-msgstr "Что нужно сделать с этим адресом? ([q] - выход|[d] - отбросить|[e] - редактировать): "
+msgstr ""
+"Что нужно сделать с этим адресом? ([q] - выход|[d] - отбросить|[e] - "
+"редактировать): "
 
-#: git-send-email.perl:1370
 #, perl-format
 msgid "CA path \"%s\" does not exist"
 msgstr "путь CA «%s» не существует"
 
-#: git-send-email.perl:1453
 msgid ""
 "    The Cc list above has been expanded by additional\n"
 "    addresses found in the patch commit message. By default\n"
@@ -23807,133 +21167,129 @@ msgid ""
 "    To retain the current behavior, but squelch this message,\n"
 "    run 'git config --global sendemail.confirm auto'.\n"
 "\n"
-msgstr "    Список Cc (получателей копии письма) был расширен дополнительными\n    адресами, найденными в сообщении коммита патча. По умолчанию\n    send-email переспрашивает перед отправкой, когда она происходит.\n   Это поведение может быть изменено параметром файла конфигурации\n    sendemail.confirm.\n\n    Для дополнительной информации, запустите «git send-email --help».\n    Чтобы оставить текущее поведение, но скрыть это сообщение,\n    запустите «git config --global sendemail.confirm auto».\n\n"
+msgstr ""
+"    Список Cc (получателей копии письма) был расширен дополнительными\n"
+"    адресами, найденными в сообщении коммита патча. По умолчанию\n"
+"    send-email переспрашивает перед отправкой, когда она происходит.\n"
+"   Это поведение может быть изменено параметром файла конфигурации\n"
+"    sendemail.confirm.\n"
+"\n"
+"    Для дополнительной информации, запустите «git send-email --help».\n"
+"    Чтобы оставить текущее поведение, но скрыть это сообщение,\n"
+"    запустите «git config --global sendemail.confirm auto».\n"
+"\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:1468
 msgid "Send this email? ([y]es|[n]o|[e]dit|[q]uit|[a]ll): "
-msgstr "Отправить это письмо? ([y] - да|[n] - нет|[e] - изменить|[q] - выход|[a] - все): "
+msgstr ""
+"Отправить это письмо? ([y] - да|[n] - нет|[e] - изменить|[q] - выход|[a] - "
+"все): "
 
-#: git-send-email.perl:1471
 msgid "Send this email reply required"
 msgstr "Отправка этого ответа на письмо обязательна"
 
-#: git-send-email.perl:1499
 msgid "The required SMTP server is not properly defined."
 msgstr "Требуемый SMTP сервер не был правильно объявлен."
 
-#: git-send-email.perl:1546
 #, perl-format
 msgid "Server does not support STARTTLS! %s"
 msgstr "Сервер не поддерживает STARTTLS! %s"
 
-#: git-send-email.perl:1551 git-send-email.perl:1555
 #, perl-format
 msgid "STARTTLS failed! %s"
 msgstr "Ошибка STARTTLS! %s"
 
-#: git-send-email.perl:1564
 msgid "Unable to initialize SMTP properly. Check config and use --smtp-debug."
-msgstr "Не удалось инициализировать SMTP. Проверьте ваши настройки и попробуйте запустить в параметром --smtp-debug."
+msgstr ""
+"Не удалось инициализировать SMTP. Проверьте ваши настройки и попробуйте "
+"запустить в параметром --smtp-debug."
 
-#: git-send-email.perl:1582
 #, perl-format
 msgid "Failed to send %s\n"
 msgstr "Не удалось отправить %s\n"
 
-#: git-send-email.perl:1585
 #, perl-format
 msgid "Dry-Sent %s\n"
 msgstr "Имитация отправки %s\n"
 
-#: git-send-email.perl:1585
 #, perl-format
 msgid "Sent %s\n"
 msgstr "Отправлено %s\n"
 
-#: git-send-email.perl:1587
 msgid "Dry-OK. Log says:\n"
 msgstr "Имитация OK. Журнал содержит:\n"
 
-#: git-send-email.perl:1587
 msgid "OK. Log says:\n"
 msgstr "OK. Журнал содержит:\n"
 
-#: git-send-email.perl:1599
 msgid "Result: "
 msgstr "Результат: "
 
-#: git-send-email.perl:1602
 msgid "Result: OK\n"
 msgstr "Результат: OK\n"
 
-#: git-send-email.perl:1620
 #, perl-format
 msgid "can't open file %s"
 msgstr "не удалось открыть файл %s"
 
-#: git-send-email.perl:1667 git-send-email.perl:1687
 #, perl-format
 msgid "(mbox) Adding cc: %s from line '%s'\n"
 msgstr "(mbox) Добавление cc: %s со строки «%s»\n"
 
-#: git-send-email.perl:1673
 #, perl-format
 msgid "(mbox) Adding to: %s from line '%s'\n"
 msgstr "(mbox) Добавление to: %s со строки «%s»\n"
 
-#: git-send-email.perl:1730
 #, perl-format
 msgid "(non-mbox) Adding cc: %s from line '%s'\n"
 msgstr "(non-mbox) Добавление cc: %s со строки «%s»\n"
 
-#: git-send-email.perl:1765
 #, perl-format
 msgid "(body) Adding cc: %s from line '%s'\n"
 msgstr "(body) Добавление cc: %s со строки «%s»\n"
 
-#: git-send-email.perl:1876
 #, perl-format
 msgid "(%s) Could not execute '%s'"
 msgstr "(%s) Не удалось выполнить «%s»"
 
-#: git-send-email.perl:1883
 #, perl-format
 msgid "(%s) Adding %s: %s from: '%s'\n"
 msgstr "(%s) Добавление %s: %s из: «%s»\n"
 
-#: git-send-email.perl:1887
 #, perl-format
 msgid "(%s) failed to close pipe to '%s'"
 msgstr "(%s) не удалось закрыть поток к «%s»"
 
-#: git-send-email.perl:1917
 msgid "cannot send message as 7bit"
 msgstr "не удалось отправить сообщение в 7 битной кодировке"
 
-#: git-send-email.perl:1925
 msgid "invalid transfer encoding"
 msgstr "недопустимая кодировка передачи"
 
-#: git-send-email.perl:1966 git-send-email.perl:2018 git-send-email.perl:2028
+#, perl-format
+msgid ""
+"fatal: %s: rejected by %s hook\n"
+"%s\n"
+"warning: no patches were sent\n"
+msgstr ""
+
 #, perl-format
 msgid "unable to open %s: %s\n"
 msgstr "не удалось открыть %s: %s\n"
 
-#: git-send-email.perl:1969
 #, perl-format
-msgid "%s: patch contains a line longer than 998 characters"
-msgstr "%s: патч содержит строку длиннее чем 998 символов"
+msgid ""
+"fatal: %s:%d is longer than 998 characters\n"
+"warning: no patches were sent\n"
+msgstr ""
 
-#: git-send-email.perl:1986
 #, 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:1990
 #, perl-format
 msgid "Do you really want to send %s? [y|N]: "
 msgstr "Вы действительно хотите отправить %s? [y] - да, [N] - нет: "
diff --git a/po/sv.po b/po/sv.po
index 14176ac6fb..56db2f1bb1 100644
--- a/po/sv.po
+++ b/po/sv.po
@@ -5,249 +5,188 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: git 2.36.0\n"
+"Project-Id-Version: git 2.37.0\n"
 "Report-Msgid-Bugs-To: Git Mailing List <git@vger.kernel.org>\n"
-"POT-Creation-Date: 2022-04-13 14:52+0800\n"
-"PO-Revision-Date: 2022-04-17 18:08+0100\n"
+"POT-Creation-Date: 2022-06-24 21:19+0100\n"
+"PO-Revision-Date: 2022-06-24 21:23+0100\n"
 "Last-Translator: Peter Krefting <peter@softwolves.pp.se>\n"
 "Language-Team: Swedish <tp-sv@listor.tp-sv.se>\n"
 "Language: sv\n"
 "MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\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 3.38.0\n"
 
-#: add-interactive.c:382
 #, c-format
 msgid "Huh (%s)?"
 msgstr "Vadå (%s)?"
 
-#: add-interactive.c:535 add-interactive.c:836 reset.c:136 sequencer.c:3505
-#: sequencer.c:3970 sequencer.c:4127 builtin/rebase.c:1261
-#: builtin/rebase.c:1671
 msgid "could not read index"
 msgstr "kunde inte läsa indexet"
 
-#: add-interactive.c:590 git-add--interactive.perl:269
-#: git-add--interactive.perl:294
 msgid "binary"
 msgstr "binär"
 
-#: add-interactive.c:648 git-add--interactive.perl:278
-#: git-add--interactive.perl:332
 msgid "nothing"
 msgstr "ingenting"
 
-#: add-interactive.c:649 git-add--interactive.perl:314
-#: git-add--interactive.perl:329
 msgid "unchanged"
 msgstr "oändrad"
 
-#: add-interactive.c:686 git-add--interactive.perl:641
 msgid "Update"
 msgstr "Uppdatera"
 
-#: add-interactive.c:703 add-interactive.c:891
 #, c-format
 msgid "could not stage '%s'"
 msgstr "kunde inte köa \"%s\""
 
-#: add-interactive.c:709 add-interactive.c:898 reset.c:160 sequencer.c:3709
 msgid "could not write index"
 msgstr "kunde inte skriva indexet"
 
-#: add-interactive.c:712 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:730 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:735 apply.c:4133 builtin/checkout.c:311
-#: builtin/reset.c:167
 #, c-format
 msgid "make_cache_entry failed for path '%s'"
 msgstr "make_cache_entry misslyckades för sökvägen \"%s\""
 
-#: add-interactive.c:765 git-add--interactive.perl:653
 msgid "Revert"
 msgstr "Återställ"
 
-#: add-interactive.c:781
 msgid "Could not parse HEAD^{tree}"
 msgstr "kunde inte tolka HEAD^{tree}"
 
-#: add-interactive.c:819 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:870 git-add--interactive.perl:693
 #, c-format
 msgid "No untracked files.\n"
 msgstr "Inga ospårade filer.\n"
 
-#: add-interactive.c:874 git-add--interactive.perl:687
 msgid "Add untracked"
 msgstr "Lägg till ospårad"
 
-#: add-interactive.c:901 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:931
 #, c-format
 msgid "ignoring unmerged: %s"
 msgstr "ignorerar ej sammanslagen: %s"
 
-#: add-interactive.c:943 add-patch.c:1758 git-add--interactive.perl:1371
 #, c-format
 msgid "Only binary files changed.\n"
 msgstr "Endast binära filer ändrade.\n"
 
-#: add-interactive.c:945 add-patch.c:1756 git-add--interactive.perl:1373
 #, c-format
 msgid "No changes.\n"
 msgstr "Inga ändringar.\n"
 
-#: add-interactive.c:949 git-add--interactive.perl:1381
 msgid "Patch update"
 msgstr "Uppdatera patch"
 
-#: add-interactive.c:988 git-add--interactive.perl:1794
 msgid "Review diff"
 msgstr "Granska diff"
 
-#: add-interactive.c:1016
 msgid "show paths with changes"
 msgstr "visa sökvägar med ändringar"
 
-#: add-interactive.c:1018
 msgid "add working tree state to the staged set of changes"
 msgstr "lägg arbetskatalogens tillstånd till köade ändringar"
 
-#: add-interactive.c:1020
 msgid "revert staged set of changes back to the HEAD version"
 msgstr "återställ köade ändringar tillbaka till HEAD-versionen"
 
-#: add-interactive.c:1022
 msgid "pick hunks and update selectively"
 msgstr "välj stycken och uppdatera selektivt"
 
-#: add-interactive.c:1024
 msgid "view diff between HEAD and index"
 msgstr "visa skillnad mellan HEAD och index"
 
-#: add-interactive.c:1026
 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:1034 add-interactive.c:1083
 msgid "Prompt help:"
 msgstr "Kommandoradshjälp:"
 
-#: add-interactive.c:1036
 msgid "select a single item"
 msgstr "markera en post"
 
-#: add-interactive.c:1038
 msgid "select a range of items"
 msgstr "markera intervall av poster"
 
-#: add-interactive.c:1040
 msgid "select multiple ranges"
 msgstr "markera flera intervall"
 
-#: add-interactive.c:1042 add-interactive.c:1087
 msgid "select item based on unique prefix"
 msgstr "markera post baserad på unikt prefix"
 
-#: add-interactive.c:1044
 msgid "unselect specified items"
 msgstr "avmarkera angivna poster"
 
-#: add-interactive.c:1046
 msgid "choose all items"
 msgstr "välj alla poster"
 
-#: add-interactive.c:1048
 msgid "(empty) finish selecting"
 msgstr "(tomt) avsluta markering"
 
-#: add-interactive.c:1085
 msgid "select a numbered item"
 msgstr "markera en numrerad post"
 
-#: add-interactive.c:1089
 msgid "(empty) select nothing"
 msgstr "(tomt) markera ingenting"
 
-#: add-interactive.c:1097 builtin/clean.c:839 git-add--interactive.perl:1898
 msgid "*** Commands ***"
 msgstr "*** Kommandon ***"
 
-#: add-interactive.c:1098 builtin/clean.c:840 git-add--interactive.perl:1895
 msgid "What now"
 msgstr "Vad nu"
 
-#: add-interactive.c:1150 git-add--interactive.perl:213
 msgid "staged"
 msgstr "köad"
 
-#: add-interactive.c:1150 git-add--interactive.perl:213
 msgid "unstaged"
 msgstr "ej köad"
 
-#: add-interactive.c:1150 apply.c:5002 apply.c:5005 builtin/am.c:2370
-#: builtin/am.c:2373 builtin/bugreport.c:107 builtin/clone.c:132
-#: builtin/fetch.c:154 builtin/merge.c:287 builtin/pull.c:194
-#: builtin/submodule--helper.c:412 builtin/submodule--helper.c:1872
-#: builtin/submodule--helper.c:1875 builtin/submodule--helper.c:2709
-#: builtin/submodule--helper.c:2712 builtin/submodule--helper.c:2891
-#: git-add--interactive.perl:213
 msgid "path"
 msgstr "sökväg"
 
-#: add-interactive.c:1157
 msgid "could not refresh index"
 msgstr "kunde inte uppdatera indexet"
 
-#: add-interactive.c:1171 builtin/clean.c:804 git-add--interactive.perl:1805
 #, c-format
 msgid "Bye.\n"
 msgstr "Hej då.\n"
 
-#: add-patch.c:34 git-add--interactive.perl:1433
 #, c-format, perl-format
 msgid "Stage mode change [y,n,q,a,d%s,?]? "
 msgstr "Köa ändrat läge [y,n,q,a,d%s,?]? "
 
-#: add-patch.c:35 git-add--interactive.perl:1434
 #, c-format, perl-format
 msgid "Stage deletion [y,n,q,a,d%s,?]? "
 msgstr "Köa borttagning [y,n,q,a,d%s,?]? "
 
-#: add-patch.c:36 git-add--interactive.perl:1435
 #, c-format, perl-format
 msgid "Stage addition [y,n,q,a,d%s,?]? "
 msgstr "Köa tillägg [y,n,q,a,d%s,?]? "
 
-#: add-patch.c:37 git-add--interactive.perl:1436
 #, c-format, perl-format
 msgid "Stage this hunk [y,n,q,a,d%s,?]? "
 msgstr "Köa stycket [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."
@@ -255,7 +194,6 @@ msgstr ""
 "Om patchen kan appliceras rent kommer det redigerade stycket att köas "
 "omedelbart."
 
-#: add-patch.c:42
 msgid ""
 "y - stage this hunk\n"
 "n - do not stage this hunk\n"
@@ -269,27 +207,22 @@ msgstr ""
 "a - köa stycket och alla följande i filen\n"
 "d - köa inte stycket eller något av de följande i filen\n"
 
-#: add-patch.c:56 git-add--interactive.perl:1439
 #, c-format, perl-format
 msgid "Stash mode change [y,n,q,a,d%s,?]? "
 msgstr "Stash:a ändrat läge [y,n,q,a,d%s,?]? "
 
-#: add-patch.c:57 git-add--interactive.perl:1440
 #, c-format, perl-format
 msgid "Stash deletion [y,n,q,a,d%s,?]? "
 msgstr "Stash:a borttagning [y,n,q,a,d%s,?]? "
 
-#: add-patch.c:58 git-add--interactive.perl:1441
 #, c-format, perl-format
 msgid "Stash addition [y,n,q,a,d%s,?]? "
 msgstr "Stash:a tillägg [y,n,q,a,d%s,?]? "
 
-#: add-patch.c:59 git-add--interactive.perl:1442
 #, c-format, perl-format
 msgid "Stash this hunk [y,n,q,a,d%s,?]? "
 msgstr "Stash:a stycket [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."
@@ -297,7 +230,6 @@ msgstr ""
 "Om patchen kan appliceras rent kommer det redigerade stycket att läggas till "
 "i \"stash\" omedelbart."
 
-#: add-patch.c:64
 msgid ""
 "y - stash this hunk\n"
 "n - do not stash this hunk\n"
@@ -311,27 +243,22 @@ msgstr ""
 "a - \"stash\":a stycket och alla följande i filen\n"
 "d - \"stash\":a inte stycket eller något av de följande i filen\n"
 
-#: add-patch.c:80 git-add--interactive.perl:1445
 #, c-format, perl-format
 msgid "Unstage mode change [y,n,q,a,d%s,?]? "
 msgstr "Ta bort ändrat läge från kön [y,n,q,a,d%s,?]? "
 
-#: add-patch.c:81 git-add--interactive.perl:1446
 #, c-format, perl-format
 msgid "Unstage deletion [y,n,q,a,d%s,?]? "
 msgstr "Ta bort borttagning från kön [y,n,q,a,d%s,?]? "
 
-#: add-patch.c:82 git-add--interactive.perl:1447
 #, c-format, perl-format
 msgid "Unstage addition [y,n,q,a,d%s,?]? "
 msgstr "Ta bort tillägg från kön [y,n,q,a,d%s,?]? "
 
-#: add-patch.c:83 git-add--interactive.perl:1448
 #, c-format, perl-format
 msgid "Unstage this hunk [y,n,q,a,d%s,?]? "
 msgstr "Ta bort stycket från kön [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."
@@ -339,7 +266,6 @@ msgstr ""
 "Om patchen kan appliceras rent kommer det redigerade stycket att tas bort "
 "från kön omedelbart."
 
-#: add-patch.c:88
 msgid ""
 "y - unstage this hunk\n"
 "n - do not unstage this hunk\n"
@@ -353,27 +279,22 @@ msgstr ""
 "a - ta bort stycket och alla följande i filen från kön\n"
 "d - ta inte bort stycket eller något av de följande i filen från kön\n"
 
-#: add-patch.c:103 git-add--interactive.perl:1451
 #, c-format, perl-format
 msgid "Apply mode change to index [y,n,q,a,d%s,?]? "
 msgstr "Applicera ändrat läge på indexet [y,n,q,a,d%s,?]? "
 
-#: add-patch.c:104 git-add--interactive.perl:1452
 #, c-format, perl-format
 msgid "Apply deletion to index [y,n,q,a,d%s,?]? "
 msgstr "Applicera borttagning på indexet [y,n,q,a,d%s,?]? "
 
-#: add-patch.c:105 git-add--interactive.perl:1453
 #, c-format, perl-format
 msgid "Apply addition to index [y,n,q,a,d%s,?]? "
 msgstr "Applicera tillägg på indexet [y,n,q,a,d%s,?]? "
 
-#: add-patch.c:106 git-add--interactive.perl:1454
 #, c-format, perl-format
 msgid "Apply this hunk to index [y,n,q,a,d%s,?]? "
 msgstr "Applicera stycket på indexet [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."
@@ -381,7 +302,6 @@ msgstr ""
 "Om patchen kan appliceras rent kommer det redigerade stycket att markeras "
 "för applicering omedelbart."
 
-#: add-patch.c:111
 msgid ""
 "y - apply this hunk to index\n"
 "n - do not apply this hunk to index\n"
@@ -395,31 +315,22 @@ msgstr ""
 "a - applicera stycket och alla följande i filen\n"
 "d - applicera inte stycket eller något av de följande i filen\n"
 
-#: add-patch.c:126 git-add--interactive.perl:1457
-#: git-add--interactive.perl:1475
 #, c-format, perl-format
 msgid "Discard mode change from worktree [y,n,q,a,d%s,?]? "
 msgstr "Kasta ändrat läge från arbetskatalogen [y,n,q,a,d%s,?]? "
 
-#: add-patch.c:127 git-add--interactive.perl:1458
-#: git-add--interactive.perl:1476
 #, c-format, perl-format
 msgid "Discard deletion from worktree [y,n,q,a,d%s,?]? "
 msgstr "Kasta borttagning från arbetskatalogen [y,n,q,a,d%s,?]? "
 
-#: add-patch.c:128 git-add--interactive.perl:1459
-#: git-add--interactive.perl:1477
 #, c-format, perl-format
 msgid "Discard addition from worktree [y,n,q,a,d%s,?]? "
 msgstr "Kasta tillägg från arbetskatalogen [y,n,q,a,d%s,?]? "
 
-#: add-patch.c:129 git-add--interactive.perl:1460
-#: git-add--interactive.perl:1478
 #, c-format, perl-format
 msgid "Discard this hunk from worktree [y,n,q,a,d%s,?]? "
 msgstr "Kasta stycket från arbetskatalogen [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."
@@ -427,7 +338,6 @@ msgstr ""
 "Om patchen kan appliceras rent kommer det redigerade stycket att markeras "
 "för kasta omedelbart."
 
-#: add-patch.c:134 add-patch.c:202
 msgid ""
 "y - discard this hunk from worktree\n"
 "n - do not discard this hunk from worktree\n"
@@ -441,27 +351,22 @@ msgstr ""
 "a - förkasta stycket och alla följande i filen\n"
 "d - förkasta inte stycket eller något av de följande i filen\n"
 
-#: add-patch.c:149 add-patch.c:194 git-add--interactive.perl:1463
 #, c-format, perl-format
 msgid "Discard mode change from index and worktree [y,n,q,a,d%s,?]? "
 msgstr "Kasta ändrat läge från indexet och arbetskatalogen [y,n,q,a,d%s,?]? "
 
-#: add-patch.c:150 add-patch.c:195 git-add--interactive.perl:1464
 #, c-format, perl-format
 msgid "Discard deletion from index and worktree [y,n,q,a,d%s,?]? "
 msgstr "Kasta borttagning från indexet och arbetskatalogen [y,n,q,a,d%s,?]? "
 
-#: add-patch.c:151 add-patch.c:196 git-add--interactive.perl:1465
 #, c-format, perl-format
 msgid "Discard addition from index and worktree [y,n,q,a,d%s,?]? "
 msgstr "Kasta tillägg från indexet och arbetskatalogen [y,n,q,a,d%s,?]? "
 
-#: add-patch.c:152 add-patch.c:197 git-add--interactive.perl:1466
 #, c-format, perl-format
 msgid "Discard this hunk from index and worktree [y,n,q,a,d%s,?]? "
 msgstr "Kasta stycket från indexet och arbetskatalogen [y,n,q,a,d%s,?]? "
 
-#: add-patch.c:157
 msgid ""
 "y - discard this hunk from index and worktree\n"
 "n - do not discard this hunk from index and worktree\n"
@@ -475,27 +380,22 @@ msgstr ""
 "a - förkasta stycket och alla följande i filen\n"
 "d - förkasta inte stycket eller något av de följande i filen\n"
 
-#: add-patch.c:171 add-patch.c:216 git-add--interactive.perl:1469
 #, c-format, perl-format
 msgid "Apply mode change to index and worktree [y,n,q,a,d%s,?]? "
 msgstr "Applicera ändrat läge på indexet och arbetskatalogen [y,n,q,a,d%s,?]? "
 
-#: add-patch.c:172 add-patch.c:217 git-add--interactive.perl:1470
 #, c-format, perl-format
 msgid "Apply deletion to index and worktree [y,n,q,a,d%s,?]? "
 msgstr "Applicera borttagning på indexet och arbetskatalogen [y,n,q,a,d%s,?]? "
 
-#: add-patch.c:173 add-patch.c:218 git-add--interactive.perl:1471
 #, c-format, perl-format
 msgid "Apply addition to index and worktree [y,n,q,a,d%s,?]? "
 msgstr "Applicera tillägg på indexet och arbetskatalogen [y,n,q,a,d%s,?]? "
 
-#: add-patch.c:174 add-patch.c:219 git-add--interactive.perl:1472
 #, c-format, perl-format
 msgid "Apply this hunk to index and worktree [y,n,q,a,d%s,?]? "
 msgstr "Applicera stycket på indexet och arbetskatalogen [y,n,q,a,d%s,?]? "
 
-#: add-patch.c:179
 msgid ""
 "y - apply this hunk to index and worktree\n"
 "n - do not apply this hunk to index and worktree\n"
@@ -509,7 +409,6 @@ msgstr ""
 "a - applicera stycket och alla följande i filen\n"
 "d - applicera inte stycket eller något av de följande i filen\n"
 
-#: add-patch.c:224
 msgid ""
 "y - apply this hunk to worktree\n"
 "n - do not apply this hunk to worktree\n"
@@ -523,34 +422,27 @@ msgstr ""
 "a - applicera stycket och alla följande i filen\n"
 "d - applicera inte stycket eller något av de följande i filen\n"
 
-#: add-patch.c:343
 #, c-format
 msgid "could not parse hunk header '%.*s'"
 msgstr "kunde inte tolka styckehuvudet \"%.*s\""
 
-#: add-patch.c:362 add-patch.c:366
 #, c-format
 msgid "could not parse colored hunk header '%.*s'"
 msgstr "kunde inte tolka färgat styckehuvud \"%.*s\""
 
-#: add-patch.c:431
 msgid "could not parse diff"
 msgstr "kunde inte tolka diff"
 
-#: add-patch.c:450
 msgid "could not parse colored diff"
 msgstr "kunde inte tolka färgad diff"
 
-#: add-patch.c:464
 #, c-format
 msgid "failed to run '%s'"
 msgstr "misslyckades att köra \"%s\""
 
-#: add-patch.c:618
 msgid "mismatched output from interactive.diffFilter"
 msgstr "omaka utdata från interactive.diffFilter"
 
-#: add-patch.c:619
 msgid ""
 "Your filter must maintain a one-to-one correspondence\n"
 "between its input and output lines."
@@ -558,7 +450,6 @@ msgstr ""
 "Alla rader i indata måste ha en motsvarande rad i utdata från\n"
 "ditt filter."
 
-#: add-patch.c:797
 #, c-format
 msgid ""
 "expected context line #%d in\n"
@@ -567,7 +458,6 @@ msgstr ""
 "förväntade sammanhangsrad %d i\n"
 "%.*s"
 
-#: add-patch.c:812
 #, c-format
 msgid ""
 "hunks do not overlap:\n"
@@ -580,11 +470,9 @@ msgstr ""
 "\tavslutas inte med:\n"
 "%.*s"
 
-#: add-patch.c:1088 git-add--interactive.perl:1115
 msgid "Manual hunk edit mode -- see bottom for a quick guide.\n"
 msgstr "Manuellt styckeredigeringsläge -- se nederst för snabbguide.\n"
 
-#: add-patch.c:1092
 #, c-format
 msgid ""
 "---\n"
@@ -597,8 +485,8 @@ msgstr ""
 "Ta bort \"%c\" rader genom att radera dem.\n"
 "Rader som börjar med %c kommer att tas bort.\n"
 
+#. #-#-#-#-#  git-add--interactive.perl.po  #-#-#-#-#
 #. TRANSLATORS: 'it' refers to the patch mentioned in the previous messages.
-#: add-patch.c:1106 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"
@@ -608,46 +496,41 @@ msgstr ""
 "redigera den igen. Om alla rader i ett stycke tas bort avbryts\n"
 "redigeringen och stycket lämnas oförändrat.\n"
 
-#: add-patch.c:1139
 msgid "could not parse hunk header"
 msgstr "kunde inte tolka styckehuvud"
 
-#: add-patch.c:1184
 msgid "'git apply --cached' failed"
 msgstr "\"git apply --cached\" misslyckades"
 
+#. #-#-#-#-#  add-patch.c.po  #-#-#-#-#
 #. 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.
 #.
+#. #-#-#-#-#  git-add--interactive.perl.po  #-#-#-#-#
 #. 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:1253 git-add--interactive.perl:1244
 msgid ""
 "Your edited hunk does not apply. Edit again (saying \"no\" discards!) [y/n]? "
 msgstr ""
 "Ditt redigerade stycke kan inte appliceras. Redigera igen (\"nej\" kastar!) "
 "[y/n]? "
 
-#: add-patch.c:1296
 msgid "The selected hunks do not apply to the index!"
 msgstr "Markerade stycken kan inte appliceras på indexet!"
 
-#: add-patch.c:1297 git-add--interactive.perl:1348
 msgid "Apply them to the worktree anyway? "
 msgstr "Applicera dem på arbetskatalogen trots det? "
 
-#: add-patch.c:1304 git-add--interactive.perl:1351
 msgid "Nothing was applied.\n"
 msgstr "Ingenting applicerades.\n"
 
-#: add-patch.c:1361
 msgid ""
 "j - leave this hunk undecided, see next undecided hunk\n"
 "J - leave this hunk undecided, see next hunk\n"
@@ -669,73 +552,57 @@ msgstr ""
 "e - redigera aktuellt stycke manuellt\n"
 "? - visa hjälp\n"
 
-#: add-patch.c:1523 add-patch.c:1533
 msgid "No previous hunk"
 msgstr "Inget föregående stycke"
 
-#: add-patch.c:1528 add-patch.c:1538
 msgid "No next hunk"
 msgstr "Inget följande stycke"
 
-#: add-patch.c:1544
 msgid "No other hunks to goto"
 msgstr "Inga andra stycken att gå till"
 
-#: add-patch.c:1555 git-add--interactive.perl:1608
 msgid "go to which hunk (<ret> to see more)? "
 msgstr "gå till vilket stycke (<ret> för att se fler)? "
 
-#: add-patch.c:1556 git-add--interactive.perl:1610
 msgid "go to which hunk? "
 msgstr "gå till vilket stycke? "
 
-#: add-patch.c:1567
 #, c-format
 msgid "Invalid number: '%s'"
 msgstr "Ogiltigt siffervärde: \"%s\""
 
-#: add-patch.c:1572
 #, c-format
 msgid "Sorry, only %d hunk available."
 msgid_plural "Sorry, only %d hunks available."
 msgstr[0] "Beklagar, det finns bara %d stycke."
 msgstr[1] "Beklagar, det finns bara %d stycken."
 
-#: add-patch.c:1581
 msgid "No other hunks to search"
 msgstr "Inga andra stycken att söka efter"
 
-#: add-patch.c:1587 git-add--interactive.perl:1663
 msgid "search for regex? "
 msgstr "sök efter reguljärt uttryck? "
 
-#: add-patch.c:1602
 #, c-format
 msgid "Malformed search regexp %s: %s"
 msgstr "Felaktigt format på reguljärt sökuttryck %s: %s"
 
-#: add-patch.c:1619
 msgid "No hunk matches the given pattern"
 msgstr "Inga stycken motsvarar givet mönster"
 
-#: add-patch.c:1626
 msgid "Sorry, cannot split this hunk"
 msgstr "Beklagar, kan inte dela stycket"
 
-#: add-patch.c:1630
 #, c-format
 msgid "Split into %d hunks."
 msgstr "Dela i %d stycken."
 
-#: add-patch.c:1634
 msgid "Sorry, cannot edit this hunk"
 msgstr "Beklagar, kan inte redigera stycket"
 
-#: add-patch.c:1686
 msgid "'git apply' failed"
 msgstr "\"git apply\" misslyckades"
 
-#: advice.c:81
 #, c-format
 msgid ""
 "\n"
@@ -744,47 +611,39 @@ msgstr ""
 "\n"
 "Slå av meddelandet med \"git config advice.%s false\""
 
-#: advice.c:97
 #, c-format
 msgid "%shint: %.*s%s\n"
 msgstr "%stips: %.*s%s\n"
 
-#: advice.c:181
 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:183
 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:185
 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:187
 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:189
 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:191
 #, 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:199
 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,27 +651,21 @@ msgstr ""
 "Rätta dem i din arbetskatalog och använd sedan \"git add/rm <fil>\"\n"
 "som lämpligt för att ange lösning och checka in."
 
-#: advice.c:207
 msgid "Exiting because of an unresolved conflict."
 msgstr "Avslutar på grund av olöst konflikgt."
 
-#: advice.c:212 builtin/merge.c:1388
 msgid "You have not concluded your merge (MERGE_HEAD exists)."
 msgstr "Du har inte avslutat sammanslagningen (MERGE_HEAD finns)."
 
-#: advice.c:214
 msgid "Please, commit your changes before merging."
 msgstr "Checka in dina ändringar innan du utför sammanslagningen."
 
-#: advice.c:215
 msgid "Exiting because of unfinished merge."
 msgstr "Avslutar på grund av ofullbordad sammanslagning."
 
-#: advice.c:220
 msgid "Not possible to fast-forward, aborting."
 msgstr "Kan inte snabbspola, avbryter."
 
-#: advice.c:230
 #, c-format
 msgid ""
 "The following paths and/or pathspecs matched paths that exist\n"
@@ -823,7 +676,6 @@ msgstr ""
 "utanför din \"sparse-checkout\"-definition, så de kommer inte\n"
 "uppdateras i indexet:\n"
 
-#: advice.c:237
 msgid ""
 "If you intend to update such entries, try one of the following:\n"
 "* Use the --sparse option.\n"
@@ -833,7 +685,6 @@ msgstr ""
 "* Använd flaggan --sparse.\n"
 "* Inaktivera eller ändra reglerna för gles utcheckning."
 
-#: advice.c:245
 #, c-format
 msgid ""
 "Note: switching to '%s'.\n"
@@ -876,101 +727,64 @@ msgstr ""
 "advice.detachedHead till false\n"
 "\n"
 
-#: alias.c:50
 msgid "cmdline ends with \\"
 msgstr "kommandorad avslutas med \\"
 
-#: alias.c:51
 msgid "unclosed quote"
 msgstr "citat ej stängt"
 
-#: apply.c:70
 #, c-format
 msgid "unrecognized whitespace option '%s'"
 msgstr "okänt alternativ för whitespace: \"%s\""
 
-#: apply.c:86
 #, c-format
 msgid "unrecognized whitespace ignore option '%s'"
 msgstr "okänt alternativ för ignore-whitespace: \"%s\""
 
-#: apply.c:138 archive.c:584 parse-options.c:1122 range-diff.c:555
-#: revision.c:2314 revision.c:2318 revision.c:2327 revision.c:2332
-#: revision.c:2560 revision.c:2895 revision.c:2899 revision.c:2907
-#: revision.c:2910 revision.c:2912 builtin/add.c:507 builtin/add.c:509
-#: builtin/add.c:515 builtin/add.c:527 builtin/branch.c:755
-#: builtin/checkout.c:472 builtin/checkout.c:475 builtin/checkout.c:1663
-#: builtin/checkout.c:1773 builtin/checkout.c:1776 builtin/clone.c:921
-#: builtin/commit.c:359 builtin/commit.c:362 builtin/commit.c:1200
-#: builtin/commit.c:1256 builtin/commit.c:1273 builtin/describe.c:593
-#: builtin/diff-tree.c:155 builtin/difftool.c:733 builtin/fast-export.c:1245
-#: builtin/fetch.c:2141 builtin/fetch.c:2162 builtin/fetch.c:2167
-#: builtin/help.c:602 builtin/index-pack.c:1858 builtin/init-db.c:560
-#: builtin/log.c:1968 builtin/log.c:1970 builtin/ls-files.c:778
-#: builtin/merge-base.c:163 builtin/merge-base.c:169 builtin/merge.c:1409
-#: builtin/merge.c:1411 builtin/pack-objects.c:4098 builtin/push.c:592
-#: builtin/push.c:630 builtin/push.c:636 builtin/push.c:641
-#: builtin/rebase.c:1221 builtin/rebase.c:1223 builtin/rebase.c:1227
-#: builtin/repack.c:688 builtin/repack.c:719 builtin/reset.c:433
-#: builtin/reset.c:469 builtin/rev-list.c:537 builtin/show-branch.c:711
-#: builtin/stash.c:1696 builtin/stash.c:1699 builtin/submodule--helper.c:1328
-#: builtin/submodule--helper.c:3054 builtin/tag.c:527 builtin/tag.c:573
-#: builtin/worktree.c:779
 #, c-format
 msgid "options '%s' and '%s' cannot be used together"
 msgstr "flaggorna \"%s\" och \"%s\" kan inte användas samtidigt"
 
-#: apply.c:141 apply.c:152 apply.c:155
 #, c-format
 msgid "'%s' outside a repository"
 msgstr "\"%s\" utanför arkiv"
 
-#: apply.c:807
 #, c-format
 msgid "Cannot prepare timestamp regexp %s"
 msgstr "Kan inte förbereda reguljärt uttryck för tidsstämpeln %s"
 
-#: apply.c:816
 #, c-format
 msgid "regexec returned %d for input: %s"
 msgstr "regexec returnerade %d för indata: %s"
 
-#: apply.c:890
 #, c-format
 msgid "unable to find filename in patch at line %d"
 msgstr "kan inte hitta filnamn i patchen på rad %d"
 
-#: apply.c:928
 #, c-format
 msgid "git apply: bad git-diff - expected /dev/null, got %s on line %d"
 msgstr "git apply: dålig git-diff - förväntade /dev/null, fick %s på rad %d"
 
-#: apply.c:934
 #, c-format
 msgid "git apply: bad git-diff - inconsistent new filename on line %d"
 msgstr "git apply: dålig git-diff - motsägande nytt filnamn på rad %d"
 
-#: apply.c:935
 #, c-format
 msgid "git apply: bad git-diff - inconsistent old filename on line %d"
 msgstr "git apply: dålig git-diff - motsägande gammalt filnamn på rad %d"
 
-#: apply.c:940
 #, c-format
 msgid "git apply: bad git-diff - expected /dev/null on line %d"
 msgstr "git apply: dålig git-diff - förväntade /dev/null på rad %d"
 
-#: apply.c:969
 #, c-format
 msgid "invalid mode on line %d: %s"
 msgstr "ogiltigt läge på rad %d: %s"
 
-#: apply.c:1288
 #, c-format
 msgid "inconsistent header lines %d and %d"
 msgstr "huvudet är inkonsekvent mellan rad %d och %d"
 
-#: apply.c:1378
 #, c-format
 msgid ""
 "git diff header lacks filename information when removing %d leading pathname "
@@ -986,92 +800,74 @@ msgstr[1] ""
 "sökvägskomponenter\n"
 "tas bort (rad %d)"
 
-#: apply.c:1391
 #, c-format
 msgid "git diff header lacks filename information (line %d)"
 msgstr "git-diff-huvudet saknar filnamnsinformation (rad %d)"
 
-#: apply.c:1487
 #, c-format
 msgid "recount: unexpected line: %.*s"
 msgstr "recount: oväntad rad: %.*s"
 
-#: apply.c:1556
 #, c-format
 msgid "patch fragment without header at line %d: %.*s"
 msgstr "patch-fragment utan huvud på rad %d: %.*s"
 
-#: apply.c:1759
 msgid "new file depends on old contents"
 msgstr "ny fil beror på gammalt innehåll"
 
-#: apply.c:1761
 msgid "deleted file still has contents"
 msgstr "borttagen fil har fortfarande innehåll"
 
-#: apply.c:1795
 #, c-format
 msgid "corrupt patch at line %d"
 msgstr "trasig patch på rad %d"
 
-#: apply.c:1832
 #, c-format
 msgid "new file %s depends on old contents"
 msgstr "nya filen %s beror på gammalt innehåll"
 
-#: apply.c:1834
 #, c-format
 msgid "deleted file %s still has contents"
 msgstr "borttagna filen %s har fortfarande innehåll"
 
-#: apply.c:1837
 #, c-format
 msgid "** warning: file %s becomes empty but is not deleted"
 msgstr "** varning: filen %s blir tom men har inte tagits bort"
 
-#: apply.c:1985
 #, c-format
 msgid "corrupt binary patch at line %d: %.*s"
 msgstr "trasig binärpatch på rad %d: %.*s"
 
-#: apply.c:2022
 #, c-format
 msgid "unrecognized binary patch at line %d"
 msgstr "binärpatchen på rad %d känns inte igen"
 
-#: apply.c:2184
 #, c-format
 msgid "patch with only garbage at line %d"
 msgstr "patch med bara skräp på rad %d"
 
-#: apply.c:2270
 #, c-format
 msgid "unable to read symlink %s"
 msgstr "kunde inte läsa symboliska länken %s"
 
-#: apply.c:2274
 #, c-format
 msgid "unable to open or read %s"
 msgstr "kunde inte öppna eller läsa %s"
 
-#: apply.c:2943
 #, c-format
 msgid "invalid start of line: '%c'"
 msgstr "felaktig inledning på rad: \"%c\""
 
-#: apply.c:3064
 #, 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:3076
 #, 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:3082
 #, c-format
 msgid ""
 "while searching for:\n"
@@ -1080,25 +876,21 @@ msgstr ""
 "vid sökning efter:\n"
 "%.*s"
 
-#: apply.c:3104
 #, c-format
 msgid "missing binary patch data for '%s'"
 msgstr "saknar binära patchdata för \"%s\""
 
-#: apply.c:3112
 #, 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:3159
 #, 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:3170
 #, c-format
 msgid ""
 "the patch applies to '%s' (%s), which does not match the current contents."
@@ -1106,627 +898,492 @@ msgstr ""
 "patchen appliceras på \"%s\" (%s), som inte motsvarar det nuvarande "
 "innehållet."
 
-#: apply.c:3178
 #, 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:3196
 #, 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:3209
 #, c-format
 msgid "binary patch does not apply to '%s'"
 msgstr "binärpatchen kan inte tillämpas på \"%s\""
 
-#: apply.c:3216
 #, 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:3237
 #, c-format
 msgid "patch failed: %s:%ld"
 msgstr "patch misslyckades: %s:%ld"
 
-#: apply.c:3360
 #, c-format
 msgid "cannot checkout %s"
 msgstr "kan inte checka ut %s"
 
-#: apply.c:3412 apply.c:3423 apply.c:3469 midx.c:105 pack-revindex.c:214
-#: setup.c:310
 #, c-format
 msgid "failed to read %s"
 msgstr "misslyckades läsa %s"
 
-#: apply.c:3420
 #, 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:3449 apply.c:3721
 #, c-format
 msgid "path %s has been renamed/deleted"
 msgstr "sökvägen %s har ändrat namn/tagits bort"
 
-#: apply.c:3559 apply.c:3736
 #, c-format
 msgid "%s: does not exist in index"
 msgstr "%s: finns inte i indexet"
 
-#: apply.c:3568 apply.c:3744 apply.c:3960
 #, c-format
 msgid "%s: does not match index"
 msgstr "%s: motsvarar inte indexet"
 
-#: apply.c:3605
 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:3608
 #, c-format
 msgid "Performing three-way merge...\n"
 msgstr "Utför trevägssammanslagning...\n"
 
-#: apply.c:3624 apply.c:3628
 #, c-format
 msgid "cannot read the current contents of '%s'"
 msgstr "kunde inte läsa aktuellt innehåll i \"%s\""
 
-#: apply.c:3640
 #, c-format
 msgid "Failed to perform three-way merge...\n"
 msgstr "Misslyckades utföra trevägssammanslagning...\n"
 
-#: apply.c:3654
 #, c-format
 msgid "Applied patch to '%s' with conflicts.\n"
 msgstr "Applicerade patchen på \"%s\" med konflikter.\n"
 
-#: apply.c:3659
 #, c-format
 msgid "Applied patch to '%s' cleanly.\n"
 msgstr "Tillämpade patchen på  \"%s\" rent.\n"
 
-#: apply.c:3676
 #, c-format
 msgid "Falling back to direct application...\n"
 msgstr "Faller tillbaka på direkt tillämpning...\n"
 
-#: apply.c:3688
 msgid "removal patch leaves file contents"
 msgstr "patch för borttagning lämnar kvar filinnehåll"
 
-#: apply.c:3761
 #, c-format
 msgid "%s: wrong type"
 msgstr "%s: fel typ"
 
-#: apply.c:3763
 #, c-format
 msgid "%s has type %o, expected %o"
 msgstr "%s har typen %o, förväntade %o"
 
-#: apply.c:3900 apply.c:3902 read-cache.c:903 read-cache.c:932
-#: read-cache.c:1399
 #, c-format
 msgid "invalid path '%s'"
 msgstr "ogiltig sökväg \"%s\""
 
-#: apply.c:3958
 #, c-format
 msgid "%s: already exists in index"
 msgstr "%s: finns redan i indexet"
 
-#: apply.c:3962
 #, c-format
 msgid "%s: already exists in working directory"
 msgstr "%s: finns redan i arbetskatalogen"
 
-#: apply.c:3982
 #, 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:3987
 #, 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:4007
 #, 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:4011
 #, c-format
 msgid "%s: patch does not apply"
 msgstr "%s: patchen kan inte tillämpas"
 
-#: apply.c:4026
 #, c-format
 msgid "Checking patch %s..."
 msgstr "Kontrollerar patchen %s..."
 
-#: apply.c:4118
 #, 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:4125
 #, 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:4128
 #, c-format
 msgid "sha1 information is lacking or useless (%s)."
 msgstr "sha1-informationen saknas eller är oanvändbar (%s)."
 
-#: apply.c:4137
 #, c-format
 msgid "could not add %s to temporary index"
 msgstr "kunde inte lägga till %s till temporärt index"
 
-#: apply.c:4147
 #, c-format
 msgid "could not write temporary index to %s"
 msgstr "kunde inte skriva temporärt index till %s"
 
-#: apply.c:4285
 #, c-format
 msgid "unable to remove %s from index"
 msgstr "kan inte ta bort %s från indexet"
 
-#: apply.c:4319
 #, c-format
 msgid "corrupt patch for submodule %s"
 msgstr "trasig patch för undermodulen %s"
 
-#: apply.c:4325
 #, c-format
 msgid "unable to stat newly created file '%s'"
 msgstr "kan inte ta status på nyligen skapade filen \"%s\""
 
-#: apply.c:4333
 #, 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:4339 apply.c:4484
 #, c-format
 msgid "unable to add cache entry for %s"
 msgstr "kan inte lägga till cachepost för %s"
 
-#: apply.c:4382 builtin/bisect--helper.c:540 builtin/gc.c:2258
-#: builtin/gc.c:2293
 #, c-format
 msgid "failed to write to '%s'"
 msgstr "misslyckades skriva till \"%s\""
 
-#: apply.c:4386
 #, c-format
 msgid "closing file '%s'"
 msgstr "stänger filen \"%s\""
 
-#: apply.c:4456
 #, c-format
 msgid "unable to write file '%s' mode %o"
 msgstr "kan inte skriva filen \"%s\" läge %o"
 
-#: apply.c:4554
 #, c-format
 msgid "Applied patch %s cleanly."
 msgstr "Tillämpade patchen %s rent."
 
-#: apply.c:4562
 msgid "internal error"
 msgstr "internt fel"
 
-#: apply.c:4565
 #, 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:4576
 #, c-format
 msgid "truncating .rej filename to %.*s.rej"
 msgstr "trunkerar .rej-filnamnet till %.*s.rej"
 
-#: apply.c:4584
 #, c-format
 msgid "cannot open %s"
 msgstr "kan inte öppna %s"
 
-#: apply.c:4598
 #, c-format
 msgid "Hunk #%d applied cleanly."
 msgstr "Stycke %d tillämpades rent."
 
-#: apply.c:4602
 #, c-format
 msgid "Rejected hunk #%d."
 msgstr "Refuserar stycke %d."
 
-#: apply.c:4731
 #, c-format
 msgid "Skipped patch '%s'."
 msgstr "Ignorerar patch \"%s\"."
 
-#: apply.c:4740
 msgid "No valid patches in input (allow with \"--allow-empty\")"
 msgstr "Inga giltiga patchar i indata (tillåt med \"--allow-empty\")"
 
-#: apply.c:4761
 msgid "unable to read index file"
 msgstr "kan inte läsa indexfilen"
 
-#: apply.c:4918
 #, c-format
 msgid "can't open patch '%s': %s"
 msgstr "kan inte öppna patchen \"%s\": %s"
 
-#: apply.c:4945
 #, 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:4951 apply.c:4966
 #, 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:4959
 #, 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:4975 builtin/add.c:690 builtin/mv.c:338 builtin/rm.c:430
 msgid "Unable to write new index file"
 msgstr "Kunde inte skriva ny indexfil"
 
-#: apply.c:5003
 msgid "don't apply changes matching the given path"
 msgstr "tillämpa inte ändringar som motsvarar given sökväg"
 
-#: apply.c:5006
 msgid "apply changes matching the given path"
 msgstr "tillämpa ändringar som motsvarar given sökväg"
 
-#: apply.c:5008 builtin/am.c:2379
 msgid "num"
 msgstr "antal"
 
-#: apply.c:5009
 msgid "remove <num> leading slashes from traditional diff paths"
 msgstr "ta bort <antal> inledande snedstreck från traditionella diff-sökvägar"
 
-#: apply.c:5012
 msgid "ignore additions made by the patch"
 msgstr "ignorera tillägg gjorda av patchen"
 
-#: apply.c:5014
 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:5018
 msgid "show number of added and deleted lines in decimal notation"
 msgstr "visa antal tillagda och borttagna rader decimalt"
 
-#: apply.c:5020
 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:5022
 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:5024
 msgid "make sure the patch is applicable to the current index"
 msgstr "se till att patchen kan tillämpas på aktuellt index"
 
-#: apply.c:5026
 msgid "mark new files with `git add --intent-to-add`"
 msgstr "markera nya filer med \"git add --intent-to-add\""
 
-#: apply.c:5028
 msgid "apply a patch without touching the working tree"
 msgstr "tillämpa en patch utan att röra arbetskatalogen"
 
-#: apply.c:5030
 msgid "accept a patch that touches outside the working area"
 msgstr "godta en patch som rör filer utanför arbetskatalogen"
 
-#: apply.c:5033
 msgid "also apply the patch (use with --stat/--summary/--check)"
 msgstr "tillämpa också patchen (använd med --stat/--summary/--check)"
 
-#: apply.c:5035
 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:5037
 msgid "build a temporary index based on embedded index information"
 msgstr "bygg ett temporärt index baserat på inbyggd indexinformation"
 
-#: apply.c:5040 builtin/checkout-index.c:230
 msgid "paths are separated with NUL character"
 msgstr "sökvägar avdelas med NUL-tecken"
 
-#: apply.c:5042
 msgid "ensure at least <n> lines of context match"
 msgstr "se till att åtminstone <n> rader sammanhang är lika"
 
-#: apply.c:5043 builtin/am.c:2355 builtin/am.c:2358
-#: builtin/interpret-trailers.c:98 builtin/interpret-trailers.c:100
-#: builtin/interpret-trailers.c:102 builtin/pack-objects.c:3983
-#: builtin/rebase.c:1079
 msgid "action"
 msgstr "åtgärd"
 
-#: apply.c:5044
 msgid "detect new or modified lines that have whitespace errors"
 msgstr "detektera nya eller ändrade rader som har fel i blanktecken"
 
-#: apply.c:5047 apply.c:5050
 msgid "ignore changes in whitespace when finding context"
 msgstr "ignorera ändringar i blanktecken för sammanhang"
 
-#: apply.c:5053
 msgid "apply the patch in reverse"
 msgstr "tillämpa patchen baklänges"
 
-#: apply.c:5055
 msgid "don't expect at least one line of context"
 msgstr "förvänta inte minst en rad sammanhang"
 
-#: apply.c:5057
 msgid "leave the rejected hunks in corresponding *.rej files"
 msgstr "lämna refuserade stycken i motsvarande *.rej-filer"
 
-#: apply.c:5059
 msgid "allow overlapping hunks"
 msgstr "tillåt överlappande stycken"
 
-#: apply.c:5062
 msgid "tolerate incorrectly detected missing new-line at the end of file"
 msgstr "tolerera felaktigt detekterade saknade nyradstecken vid filslut"
 
-#: apply.c:5065
 msgid "do not trust the line counts in the hunk headers"
 msgstr "lite inte på antalet linjer i styckehuvuden"
 
-#: apply.c:5067 builtin/am.c:2367
 msgid "root"
 msgstr "rot"
 
-#: apply.c:5068
 msgid "prepend <root> to all filenames"
 msgstr "lägg till <rot> i alla filnamn"
 
-#: apply.c:5071
 msgid "don't return error for empty patches"
 msgstr "ge inte någon felkod för tomma patchar"
 
-#: archive-tar.c:125 archive-zip.c:346
 #, c-format
 msgid "cannot stream blob %s"
 msgstr "kan inte strömma blob:en %s"
 
-#: archive-tar.c:265 archive-zip.c:359
 #, c-format
 msgid "unsupported file mode: 0%o (SHA1: %s)"
 msgstr "filens läge stöds ej: 0%o (SHA1: %s)"
 
-#: archive-tar.c:447
 #, c-format
 msgid "unable to start '%s' filter"
 msgstr "kunde inte starta filtret \"%s\""
 
-#: archive-tar.c:450
 msgid "unable to redirect descriptor"
 msgstr "kan inte omdirigera handtag"
 
-#: archive-tar.c:457
 #, c-format
 msgid "'%s' filter reported error"
 msgstr "filtret \"%s\" rapporterade fel"
 
-#: archive-zip.c:319
 #, c-format
 msgid "path is not valid UTF-8: %s"
 msgstr "sökvägen är inte giltig UTF-8: %s"
 
-#: archive-zip.c:323
 #, c-format
 msgid "path too long (%d chars, SHA1: %s): %s"
 msgstr "sökvägen för lång (%d tecken, SHA1: %s): %s"
 
-#: archive-zip.c:470 builtin/pack-objects.c:363 builtin/pack-objects.c:366
 #, c-format
 msgid "deflate error (%d)"
 msgstr "fel i deflate (%d)"
 
-#: archive-zip.c:604
 #, c-format
 msgid "timestamp too large for this system: %<PRIuMAX>"
 msgstr "tidsstämpeln för stor för detta system: %<PRIuMAX>"
 
-#: archive.c:14
 msgid "git archive [<options>] <tree-ish> [<path>...]"
 msgstr "git archive [<flaggor>] <träd-igt> [<sökväg>...]"
 
-#: archive.c:16
 msgid ""
 "git archive --remote <repo> [--exec <cmd>] [<options>] <tree-ish> [<path>...]"
 msgstr ""
 "git archive --remote <arkiv> [--exec <kmd>] [<flaggor>] <träd-igt> "
 "[<sökväg>...]"
 
-#: archive.c:17
 msgid "git archive --remote <repo> [--exec <cmd>] --list"
 msgstr "git archive --remote <arkiv> [--exec <kmd>] --list"
 
-#: archive.c:188 archive.c:341 builtin/gc.c:497 builtin/notes.c:238
-#: builtin/tag.c:579
 #, c-format
 msgid "cannot read '%s'"
 msgstr "kunde inte läsa \"%s\""
 
-#: archive.c:426 builtin/add.c:214 builtin/add.c:657 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:450
 #, c-format
 msgid "no such ref: %.*s"
 msgstr "ingen sådan referens: %.*s"
 
-#: archive.c:456
 #, c-format
 msgid "not a valid object name: %s"
 msgstr "objektnamnet är inte giltigt: %s"
 
-#: archive.c:469
 #, c-format
 msgid "not a tree object: %s"
 msgstr "inte ett trädobjekt: %s"
 
-#: archive.c:481
 msgid "current working directory is untracked"
 msgstr "aktuell arbetskatalog är inte spårad"
 
-#: archive.c:522
 #, c-format
 msgid "File not found: %s"
 msgstr "Hittar inte filen: %s"
 
-#: archive.c:524
 #, c-format
 msgid "Not a regular file: %s"
 msgstr "Inte en vanlig fil: %s"
 
-#: archive.c:551
+#, c-format
+msgid "unclosed quote: '%s'"
+msgstr "citat ej stängt: \"%s\""
+
+#, c-format
+msgid "missing colon: '%s'"
+msgstr "kolon saknas: \"%s\""
+
+#, c-format
+msgid "empty file name: '%s'"
+msgstr "tomt filnamn: \"%s\""
+
 msgid "fmt"
 msgstr "fmt"
 
-#: archive.c:551
 msgid "archive format"
 msgstr "arkivformat"
 
-#: archive.c:552 builtin/log.c:1809
 msgid "prefix"
 msgstr "prefix"
 
-#: 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:554 archive.c:557 builtin/blame.c:881 builtin/blame.c:885
-#: builtin/blame.c:886 builtin/commit-tree.c:115 builtin/config.c:135
-#: builtin/fast-export.c:1181 builtin/fast-export.c:1183
-#: builtin/fast-export.c:1187 builtin/grep.c:936 builtin/hash-object.c:104
-#: builtin/ls-files.c:654 builtin/ls-files.c:657 builtin/notes.c:410
-#: builtin/notes.c:576 builtin/read-tree.c:115 parse-options.h:195
 msgid "file"
 msgstr "fil"
 
-#: archive.c:555
 msgid "add untracked file to archive"
 msgstr "ta med ospårade filer i arkivet"
 
-#: archive.c:558 builtin/archive.c:88
+msgid "path:content"
+msgstr "sökväg:innehåll"
+
 msgid "write the archive to this file"
 msgstr "skriv arkivet till filen"
 
-#: archive.c:560
 msgid "read .gitattributes in working directory"
 msgstr "läs .gitattributes i arbetskatalogen"
 
-#: archive.c:561
 msgid "report archived files on stderr"
 msgstr "rapportera arkiverade filer på standard fel"
 
-#: archive.c:563
 msgid "set compression level"
 msgstr "välj komprimeringsgrad"
 
-#: archive.c:566
 msgid "list supported archive formats"
 msgstr "visa understödda arkivformat"
 
-#: archive.c:568 builtin/archive.c:89 builtin/clone.c:122 builtin/clone.c:125
-#: builtin/submodule--helper.c:1884 builtin/submodule--helper.c:2718
 msgid "repo"
 msgstr "arkiv"
 
-#: 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:570 builtin/archive.c:91 builtin/difftool.c:708
-#: builtin/notes.c:496
 msgid "command"
 msgstr "kommando"
 
-#: 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:578
 msgid "Unexpected option --remote"
 msgstr "Oväntad flagga --remote"
 
-#: archive.c:580 fetch-pack.c:300 revision.c:2914 builtin/add.c:530
-#: builtin/add.c:562 builtin/checkout.c:1782 builtin/clone.c:1099
-#: builtin/clone.c:1102 builtin/commit.c:371 builtin/fast-export.c:1230
-#: builtin/index-pack.c:1854 builtin/log.c:2140 builtin/reset.c:442
-#: builtin/reset.c:500 builtin/rm.c:281 builtin/stash.c:1708
-#: builtin/worktree.c:580 builtin/worktree.c:781 http-fetch.c:144
-#: http-fetch.c:153
 #, c-format
 msgid "the option '%s' requires '%s'"
 msgstr "flaggan \"%s\" kräver \"%s\""
 
-#: archive.c:582
 msgid "Unexpected option --output"
 msgstr "Oväntad flagga --output"
 
-#: archive.c:606
 #, c-format
 msgid "Unknown archive format '%s'"
 msgstr "Okänt arkivformat \"%s\""
 
-#: 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
 #, c-format
 msgid "%.*s is not a valid attribute name"
 msgstr "%-*s är inte ett giltigt namn på attribut"
 
-#: attr.c:363
 #, c-format
 msgid "%s not allowed: %s:%d"
 msgstr "%s inte tillåtet: %s:%d"
 
-#: attr.c:403
 msgid ""
 "Negative patterns are ignored in git attributes\n"
 "Use '\\!' for literal leading exclamation."
@@ -1734,22 +1391,18 @@ msgstr ""
 "Negativa mönster ignoreras i git-attribut\n"
 "Använd '\\!' för att inleda med ett utropstecken."
 
-#: bisect.c:488
 #, c-format
 msgid "Badly quoted content in file '%s': %s"
 msgstr "Felaktigt citerat innehåll i filen \"%s\": %s"
 
-#: bisect.c:698
 #, c-format
 msgid "We cannot bisect more!\n"
 msgstr "Det finns inte mer att göra \"bisect\" på!\n"
 
-#: bisect.c:765
 #, c-format
 msgid "Not a valid commit name %s"
 msgstr "Namnet på incheckningen är inte giltigt: %s"
 
-#: bisect.c:790
 #, c-format
 msgid ""
 "The merge base %s is bad.\n"
@@ -1758,7 +1411,6 @@ msgstr ""
 "Sammanslagningsbasen %s är trasig.\n"
 "Det betyder att felet har rättats mellan %s och [%s].\n"
 
-#: bisect.c:795
 #, c-format
 msgid ""
 "The merge base %s is new.\n"
@@ -1767,7 +1419,6 @@ msgstr ""
 "Sammanslagningsbasen %s är ny.\n"
 "Egenskapen har ändrats mellan %s och [%s].\n"
 
-#: bisect.c:800
 #, c-format
 msgid ""
 "The merge base %s is %s.\n"
@@ -1776,7 +1427,6 @@ msgstr ""
 "Sammanslagningsbasen %s är %s.\n"
 "Det betyder att den första \"%s\" incheckningen är mellan %s och [%s].\n"
 
-#: bisect.c:808
 #, c-format
 msgid ""
 "Some %s revs are not ancestors of the %s rev.\n"
@@ -1787,7 +1437,6 @@ msgstr ""
 "git bisect kan inte fungera korrekt i detta fall.\n"
 "Kanske du skrev fel %s- och %s-revisioner?\n"
 
-#: bisect.c:821
 #, c-format
 msgid ""
 "the merge base between %s and [%s] must be skipped.\n"
@@ -1799,36 +1448,29 @@ msgstr ""
 "%s.\n"
 "Vi fortsätter ändå."
 
-#: bisect.c:860
 #, c-format
 msgid "Bisecting: a merge base must be tested\n"
 msgstr "Bisect: en sammanslagningsbas måste testas\n"
 
-#: bisect.c:910
 #, c-format
 msgid "a %s revision is needed"
 msgstr "en %s-revision behövs"
 
-#: bisect.c:940
 #, c-format
 msgid "could not create file '%s'"
 msgstr "kunde inte skapa filen \"%s\""
 
-#: bisect.c:986 builtin/merge.c:155
 #, c-format
 msgid "could not read file '%s'"
 msgstr "kunde inte läsa filen \"%s\""
 
-#: bisect.c:1026
 msgid "reading bisect refs failed"
 msgstr "misslyckades läsa bisect-referenser"
 
-#: bisect.c:1056
 #, c-format
 msgid "%s was both %s and %s\n"
 msgstr "%s var både %s och %s\n"
 
-#: bisect.c:1065
 #, c-format
 msgid ""
 "No testable commit found.\n"
@@ -1837,7 +1479,6 @@ msgstr ""
 "Ingen testbar incheckning hittades.\n"
 "Kanske du startade med felaktiga sökvägsargument?\n"
 
-#: bisect.c:1094
 #, c-format
 msgid "(roughly %d step)"
 msgid_plural "(roughly %d steps)"
@@ -1847,54 +1488,40 @@ msgstr[1] "(ungefär %d steg)"
 #. TRANSLATORS: the last %s will be replaced with "(roughly %d
 #. steps)" translation.
 #.
-#: bisect.c:1100
 #, 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"
 msgstr[0] "Bisect: %d revision kvar att testa efter denna %s\n"
 msgstr[1] "Bisect: %d revisioner kvar att testa efter denna %s\n"
 
-#: blame.c:2773
 msgid "--contents and --reverse do not blend well."
 msgstr "--contents och --reverse fungerar inte så bra tillsammans."
 
-#: blame.c:2787
 msgid "cannot use --contents with final commit object name"
 msgstr "kan inte använda --contents med namn på slutgiltigt incheckningsobjekt"
 
-#: blame.c:2808
 msgid "--reverse and --first-parent together require specified latest commit"
 msgstr ""
 "--reverse och --first-parent tillsammans kräver att du anger senaste "
 "incheckningen"
 
-#: blame.c:2817 bundle.c:231 midx.c:1058 ref-filter.c:2371 remote.c:2157
-#: sequencer.c:2348 sequencer.c:4872 submodule.c:913 builtin/commit.c:1118
-#: builtin/log.c:437 builtin/log.c:1055 builtin/log.c:1663 builtin/log.c:2096
-#: builtin/log.c:2387 builtin/merge.c:431 builtin/pack-objects.c:3381
-#: builtin/pack-objects.c:3781 builtin/pack-objects.c:3796
-#: builtin/shortlog.c:255
 msgid "revision walk setup failed"
 msgstr "misslyckades skapa revisionstraversering"
 
-#: blame.c:2835
 msgid ""
 "--reverse --first-parent together require range along first-parent chain"
 msgstr ""
 "--reverse --first-parent tillsammans kräver ett intervall på första-förälder-"
 "kedjan"
 
-#: blame.c:2846
 #, c-format
 msgid "no such path %s in %s"
 msgstr "sökvägen %s i %s finns inte"
 
-#: blame.c:2857
 #, c-format
 msgid "cannot read blob %s for path %s"
 msgstr "kan inte läsa objektet %s för sökvägen %s"
 
-#: branch.c:93
 msgid ""
 "cannot inherit upstream tracking configuration of multiple refs when "
 "rebasing is requested"
@@ -1902,31 +1529,25 @@ msgstr ""
 "kan inte ärva uppströmsspårningsinformation från flera referenser när "
 "ombasering är vald"
 
-#: branch.c:104
 #, c-format
 msgid "not setting branch '%s' as its own upstream"
 msgstr "ställer inte in grenen %s som sin egen uppströmsgren"
 
-#: branch.c:160
 #, c-format
 msgid "branch '%s' set up to track '%s' by rebasing."
 msgstr "grenen \"%s\" inställd på att spåra \"%s\" genom ombasering."
 
-#: branch.c:161
 #, c-format
 msgid "branch '%s' set up to track '%s'."
 msgstr "grenen \"%s\" inställd på att spåra \"%s\"."
 
-#: branch.c:164
 #, c-format
 msgid "branch '%s' set up to track:"
 msgstr "grenen \"%s\" inställd på att spåra:"
 
-#: branch.c:176
 msgid "unable to write upstream branch configuration"
 msgstr "kan inte skriva inställningar för uppströmsgren"
 
-#: branch.c:178
 msgid ""
 "\n"
 "After fixing the error cause you may try to fix up\n"
@@ -1936,33 +1557,31 @@ msgstr ""
 "När du har rättat felorsaken kan du försöka rätta\n"
 "fjärrspårningsinformationen genom att utföra:"
 
-#: branch.c:219
 #, c-format
 msgid "asked to inherit tracking from '%s', but no remote is set"
 msgstr "bad om att ärva spårning från \"%s\", men ingen fjärr är vald"
 
-#: branch.c:225
 #, c-format
 msgid "asked to inherit tracking from '%s', but no merge configuration is set"
 msgstr ""
 "bad om att ärva spårning från \"%s\", men ingen sammanslagningsinställning "
 "är vald"
 
-#: branch.c:277
 #, c-format
 msgid "not tracking: ambiguous information for ref '%s'"
 msgstr "spårar inte: tvetydig information för referensen \"%s\""
 
+#. #-#-#-#-#  branch.c.po  #-#-#-#-#
 #. TRANSLATORS: This is a line listing a remote with duplicate
 #. refspecs in the advice message below. For RTL languages you'll
 #. probably want to swap the "%s" and leading "  " space around.
 #.
+#. #-#-#-#-#  object-name.c.po  #-#-#-#-#
 #. TRANSLATORS: This is line item of ambiguous object output
 #. from describe_ambiguous_object() above. For RTL languages
 #. you'll probably want to swap the "%s" and leading " " space
 #. around.
 #.
-#: branch.c:289 object-name.c:464
 #, c-format
 msgid "  %s\n"
 msgstr "  %s\n"
@@ -1970,7 +1589,6 @@ msgstr "  %s\n"
 #. TRANSLATORS: The second argument is a \n-delimited list of
 #. duplicate refspecs, composed above.
 #.
-#: branch.c:295
 #, c-format
 msgid ""
 "There are multiple remotes whose fetch refspecs map to the remote\n"
@@ -1991,34 +1609,28 @@ msgstr ""
 "olika fjärrars hämtnings-referensspecifikationer kopplas till\n"
 "olika spårningsnamnrymder."
 
-#: branch.c:344
 #, c-format
 msgid "'%s' is not a valid branch name"
 msgstr "\"%s\" är inte ett giltigt grennamn"
 
-#: branch.c:364
 #, c-format
 msgid "a branch named '%s' already exists"
 msgstr "det finns redan en gren som heter \"%s\""
 
-#: branch.c:370
 #, c-format
 msgid "cannot force update the branch '%s' checked out at '%s'"
 msgstr ""
 "kan inte tvinga uppdatering av grenen \"%s\" som är utcheckad på \"%s\""
 
-#: branch.c:393
 #, c-format
 msgid "cannot set up tracking information; starting point '%s' is not a branch"
 msgstr ""
 "kan inte ställa in spårningsinformation; startpunkten \"%s\" är inte en gren"
 
-#: branch.c:395
 #, c-format
 msgid "the requested upstream branch '%s' does not exist"
 msgstr "den efterfrågade uppströmsgrenen \"%s\" finns inte"
 
-#: branch.c:397
 msgid ""
 "\n"
 "If you are planning on basing your work on an upstream\n"
@@ -2038,28 +1650,22 @@ msgstr ""
 "spåra dess fjärrmotsvarighet kan du använda \"git push -u\"\n"
 "för att ställa in uppströmskonfigurationen när du sänder in."
 
-#: branch.c:445 builtin/replace.c:321 builtin/replace.c:377
-#: builtin/replace.c:423 builtin/replace.c:453
 #, c-format
 msgid "not a valid object name: '%s'"
 msgstr "objektnamnet är inte giltigt: \"%s\""
 
-#: branch.c:465
 #, c-format
 msgid "ambiguous object name: '%s'"
 msgstr "objektnamnet är tvetydigt: \"%s\""
 
-#: branch.c:470
 #, c-format
 msgid "not a valid branch point: '%s'"
 msgstr "avgreningspunkten är inte giltig: \"%s\""
 
-#: branch.c:658
 #, c-format
 msgid "submodule '%s': unable to find submodule"
 msgstr "undermodulen \"%s\": kan inte hitta undermodulen"
 
-#: branch.c:661
 #, c-format
 msgid ""
 "You may try updating the submodules using 'git checkout %s && git submodule "
@@ -2068,8662 +1674,113 @@ msgstr ""
 "Du kan försöka uppdatera undermodulerna med \"git checkout %s && git "
 "submodule update --init\""
 
-#: branch.c:672 branch.c:698
 #, c-format
 msgid "submodule '%s': cannot create branch '%s'"
 msgstr "undermodulen \"%s\": kan inte skapa grenen \"%s\""
 
-#: branch.c:730
 #, c-format
 msgid "'%s' is already checked out at '%s'"
 msgstr "\"%s\" är redan utcheckad på \"%s\""
 
-#: branch.c:755
 #, c-format
 msgid "HEAD of working tree %s is not updated"
 msgstr "HEAD i arbetskatalogen %s har inte uppdaterats"
 
-#: bundle.c:45
-#, c-format
-msgid "unrecognized bundle hash algorithm: %s"
-msgstr "okänd hashningsalgoritm för bunt: \"%s\""
-
-#: bundle.c:53
-#, c-format
-msgid "unknown capability '%s'"
-msgstr "okänd kapabilitet \"%s\""
-
-#: bundle.c:79
-#, c-format
-msgid "'%s' does not look like a v2 or v3 bundle file"
-msgstr "'%s' ser inte ut som en v2- eller v3-bunt-fil"
-
-#: bundle.c:118
-#, c-format
-msgid "unrecognized header: %s%s (%d)"
-msgstr "okänt huvud: %s%s (%d)"
-
-#: bundle.c:145 rerere.c:464 rerere.c:675 sequencer.c:2616 sequencer.c:3402
-#: builtin/commit.c:865
-#, c-format
-msgid "could not open '%s'"
-msgstr "kunde inte öppna \"%s\""
-
-#: bundle.c:203
-msgid "Repository lacks these prerequisite commits:"
-msgstr "Arkivet saknar dessa nödvändiga incheckningar:"
-
-#: bundle.c:206
-msgid "need a repository to verify a bundle"
-msgstr "behöver ett arkiv för att bekräfta en bunt."
-
-#: bundle.c:264
-#, c-format
-msgid "The bundle contains this ref:"
-msgid_plural "The bundle contains these %<PRIuMAX> refs:"
-msgstr[0] "Bunten innehåller denna referens:"
-msgstr[1] "Bunten innehåller dessa %<PRIuMAX> referenser:"
-
-#: bundle.c:272
-msgid "The bundle records a complete history."
-msgstr "Bunten beskriver en komplett historik."
-
-#: bundle.c:274
-#, c-format
-msgid "The bundle requires this ref:"
-msgid_plural "The bundle requires these %<PRIuMAX> refs:"
-msgstr[0] "Bunten kräver denna referens:"
-msgstr[1] "Bunten kräver dessa %<PRIuMAX> referenser:"
-
-#: bundle.c:350
-msgid "unable to dup bundle descriptor"
-msgstr "kan inte duplicera bunthandtag"
-
-#: bundle.c:357
-msgid "Could not spawn pack-objects"
-msgstr "Kunde inte starta pack-objects"
-
-#: bundle.c:368
-msgid "pack-objects died"
-msgstr "pack-objects misslyckades"
-
-#: bundle.c:417
-#, c-format
-msgid "ref '%s' is excluded by the rev-list options"
-msgstr "referensen \"%s\" exkluderas av argumenten till rev-list"
-
-#: bundle.c:533 builtin/log.c:211 builtin/log.c:1975 builtin/shortlog.c:400
-#, c-format
-msgid "unrecognized argument: %s"
-msgstr "okänt argument: %s"
-
-#: bundle.c:548
-#, c-format
-msgid "unsupported bundle version %d"
-msgstr "version %d för bunt stöds ej"
-
-#: bundle.c:550
-#, c-format
-msgid "cannot write bundle version %d with algorithm %s"
-msgstr "kan inte skriva bunt med version %d med algoritmen %s"
-
-#: bundle.c:600
-msgid "Refusing to create empty bundle."
-msgstr "Vägrar skapa en tom bunt."
-
-#: bundle.c:610
-#, c-format
-msgid "cannot create '%s'"
-msgstr "kan inte skapa \"%s\""
-
-#: bundle.c:639
-msgid "index-pack died"
-msgstr "index-pack dog"
-
-#: chunk-format.c:117
-msgid "terminating chunk id appears earlier than expected"
-msgstr "avslutande stycke-id förekommer tidigare än förväntat"
-
-#: chunk-format.c:126
-#, c-format
-msgid "improper chunk offset(s) %<PRIx64> and %<PRIx64>"
-msgstr "felaktigt stycke-offset %<PRIx64> och %<PRIx64>"
-
-#: chunk-format.c:133
-#, c-format
-msgid "duplicate chunk ID %<PRIx32> found"
-msgstr "dubblerat stycke-ID %<PRIx32> upptäckt"
-
-#: chunk-format.c:147
-#, c-format
-msgid "final chunk has non-zero id %<PRIx32>"
-msgstr "avslutande stycke har id %<PRIx32> som inte är noll"
-
-#: color.c:354
-#, c-format
-msgid "invalid color value: %.*s"
-msgstr "felaktigt färgvärde: %.*s"
-
-#: commit-graph.c:204 midx.c:52
-msgid "invalid hash version"
-msgstr "felaktig hashnings-version"
-
-#: commit-graph.c:262
-msgid "commit-graph file is too small"
-msgstr "incheckningsgraffilen %s är för liten"
-
-#: commit-graph.c:355
-#, c-format
-msgid "commit-graph signature %X does not match signature %X"
-msgstr "incheckningsgrafens signatur %X stämmer inte med signaturen %X"
-
-#: commit-graph.c:362
-#, c-format
-msgid "commit-graph version %X does not match version %X"
-msgstr "incheckningsgrafens version %X stämmer inte med versionen %X"
-
-#: commit-graph.c:369
-#, c-format
-msgid "commit-graph hash version %X does not match version %X"
-msgstr "incheckningsgrafens hashversion %X stämmer inte med versionen %X"
-
-#: commit-graph.c:386
-#, c-format
-msgid "commit-graph file is too small to hold %u chunks"
-msgstr "incheckningsgraffilen är för liten för att innehålla %u stycken"
-
-#: commit-graph.c:485
-msgid "commit-graph has no base graphs chunk"
-msgstr "incheckningsgrafen har inga bas-graf-stycken"
-
-#: commit-graph.c:495
-msgid "commit-graph chain does not match"
-msgstr "incheckningsgrafens kedja stämmer inte"
-
-#: commit-graph.c:543
-#, c-format
-msgid "invalid commit-graph chain: line '%s' not a hash"
-msgstr "ogiltig incheckingsgrafkedja: rad \"%s\" är inte ett hash-värde"
-
-#: commit-graph.c:567
-msgid "unable to find all commit-graph files"
-msgstr "kan inte hitta alla incheckingsgraffiler"
-
-#: commit-graph.c:752 commit-graph.c:789
-msgid "invalid commit position. commit-graph is likely corrupt"
-msgstr "ogiltig incheckningsposition. incheckningsgrafen är troligtvis trasig"
-
-#: commit-graph.c:773
-#, c-format
-msgid "could not find commit %s"
-msgstr "kunde inte hitta incheckningen %s"
-
-#: commit-graph.c:806
-msgid "commit-graph requires overflow generation data but has none"
-msgstr "incheckningsgraf kräver spillgenerationsdata, men har ingen"
-
-#: commit-graph.c:1111 builtin/am.c:1370 builtin/checkout.c:775
-#: builtin/clone.c:705
-#, c-format
-msgid "unable to parse commit %s"
-msgstr "kunde inte tolka incheckningen %s"
-
-#: commit-graph.c:1373 builtin/pack-objects.c:3078
-#, c-format
-msgid "unable to get type of object %s"
-msgstr "kunde inte hämta typ för objektet %s"
-
-#: commit-graph.c:1404
-msgid "Loading known commits in commit graph"
-msgstr "Läser in kända incheckningar i incheckningsgraf"
-
-#: commit-graph.c:1421
-msgid "Expanding reachable commits in commit graph"
-msgstr "Expanderar nåbara incheckningar i incheckningsgraf"
-
-#: commit-graph.c:1441
-msgid "Clearing commit marks in commit graph"
-msgstr "Rensar incheckningsmärken i incheckningsgraf"
-
-#: commit-graph.c:1460
-msgid "Computing commit graph topological levels"
-msgstr "Beräknar topografiska nivåer för incheckningsgraf"
-
-#: commit-graph.c:1513
-msgid "Computing commit graph generation numbers"
-msgstr "Beräknar generationsvärden för incheckningsgraf"
-
-#: commit-graph.c:1598
-msgid "Computing commit changed paths Bloom filters"
-msgstr "Beräknar Bloom-filter för sökvägar ändrade av incheckningen"
-
-#: commit-graph.c:1675
-msgid "Collecting referenced commits"
-msgstr "Samlar refererade incheckningar"
-
-#: commit-graph.c:1701
-#, c-format
-msgid "Finding commits for commit graph in %<PRIuMAX> pack"
-msgid_plural "Finding commits for commit graph in %<PRIuMAX> packs"
-msgstr[0] "Söker incheckningar för incheckingsgraf i %<PRIuMAX> paket"
-msgstr[1] "Söker incheckningar för incheckingsgraf i %<PRIuMAX> paket"
-
-#: commit-graph.c:1714
-#, c-format
-msgid "error adding pack %s"
-msgstr "fel vid tillägg av paketet %s"
-
-#: commit-graph.c:1718
-#, c-format
-msgid "error opening index for %s"
-msgstr "fel vid öppning av indexet för %s"
-
-#: commit-graph.c:1756
-msgid "Finding commits for commit graph among packed objects"
-msgstr "Söker incheckningar för incheckingsgraf i packade objekt"
-
-#: commit-graph.c:1774
-msgid "Finding extra edges in commit graph"
-msgstr "Söker ytterligare kanter i incheckingsgraf"
-
-#: commit-graph.c:1823
-msgid "failed to write correct number of base graph ids"
-msgstr "kunde inte skriva korrekt antal bas-graf-id:n"
-
-#: commit-graph.c:1854 midx.c:1168 builtin/sparse-checkout.c:475
-#, c-format
-msgid "unable to create leading directories of %s"
-msgstr "kunde inte skapa inledande kataloger för %s"
-
-#: commit-graph.c:1868
-msgid "unable to create temporary graph layer"
-msgstr "kan inte skapa temporärt graflager"
-
-#: commit-graph.c:1873
-#, c-format
-msgid "unable to adjust shared permissions for '%s'"
-msgstr "kan inte justera delade behörigheter för \"%s\""
-
-#: commit-graph.c:1930
-#, 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:1967
-msgid "unable to open commit-graph chain file"
-msgstr "Kunde inte öppna incheckningsgrafkedjefilen"
-
-#: commit-graph.c:1983
-msgid "failed to rename base commit-graph file"
-msgstr "kunde inte byta namn på bas-incheckingsgraffilen"
-
-#: commit-graph.c:2004
-msgid "failed to rename temporary commit-graph file"
-msgstr "kunde inte byta namn på temporär incheckningsgraffil"
-
-#: commit-graph.c:2137
-msgid "Scanning merged commits"
-msgstr "Söker sammanslagna incheckningar"
-
-#: commit-graph.c:2181
-msgid "Merging commit-graph"
-msgstr "Slår ihop incheckningsgraf"
-
-#: commit-graph.c:2289
-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:2396
-msgid "too many commits to write graph"
-msgstr "för många incheckningar för att skriva graf"
-
-#: commit-graph.c:2494
-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:2504
-#, c-format
-msgid "commit-graph has incorrect OID order: %s then %s"
-msgstr "incheckningsgrafen har felaktig OID-ordning: %s så %s"
-
-#: commit-graph.c:2514 commit-graph.c:2529
-#, 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:2521
-#, c-format
-msgid "failed to parse commit %s from commit-graph"
-msgstr "kunde inte tolka incheckning %s från incheckningsgraf"
-
-#: commit-graph.c:2539
-msgid "Verifying commits in commit graph"
-msgstr "Bekräftar incheckningar i incheckningsgrafen"
-
-#: commit-graph.c:2554
-#, 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:2561
-#, 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:2571
-#, 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:2580
-#, 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:2594
-#, 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:2599
-#, c-format
-msgid ""
-"commit-graph has generation number zero for commit %s, but non-zero elsewhere"
-msgstr ""
-"incheckningsgrafen har generationsnummer noll för incheckningen %s, men icke-"
-"noll på annan plats"
-
-#: commit-graph.c:2603
-#, c-format
-msgid ""
-"commit-graph has non-zero generation number for commit %s, but zero elsewhere"
-msgstr ""
-"incheckningsgrafen har generationsnummer skilt från noll för incheckningen "
-"%s, men noll på annan plats"
-
-#: commit-graph.c:2620
-#, 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:2626
-#, 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:54 sequencer.c:3105 builtin/am.c:400 builtin/am.c:445
-#: builtin/am.c:450 builtin/am.c:1449 builtin/am.c:2124 builtin/replace.c:456
-#, c-format
-msgid "could not parse %s"
-msgstr "kunde inte tolka %s"
-
-#: commit.c:56
-#, c-format
-msgid "%s %s is not a commit!"
-msgstr "%s %s är inte en incheckning!"
-
-#: commit.c:197
-msgid ""
-"Support for <GIT_DIR>/info/grafts is deprecated\n"
-"and will be removed in a future Git version.\n"
-"\n"
-"Please use \"git replace --convert-graft-file\"\n"
-"to convert the grafts into replace refs.\n"
-"\n"
-"Turn this message off by running\n"
-"\"git config advice.graftFileDeprecated false\""
-msgstr ""
-"Stöd för <GIT_DIR>/info/grafts avråds från och\n"
-"kommer tas bort i en framtida version av Git.\n"
-"\n"
-"Använd \"git replace --convert-graft-file\"\n"
-"för att omvandla grafts till ersättningsreferenser.\n"
-"\n"
-"Slå av detta meddelande genom att skriva\n"
-"\"git config advice.graftFileDeprecated false\""
-
-#: commit.c:1252
-#, 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:1256
-#, 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:1259
-#, c-format
-msgid "Commit %s does not have a GPG signature."
-msgstr "Incheckning %s har inte någon GPG-signatur."
-
-#: commit.c:1262
-#, 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:1516
-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"
-"variable i18n.commitencoding to the encoding your project uses.\n"
-msgstr ""
-"Varning: incheckningsmeddelandet är inte korrekt UTF-8.\n"
-"Uppdatera det efter att ha rättat meddelandet, eller ändra variabeln\n"
-"i18n.commitencoding till den teckenkodning som används i ditt projekt.\n"
-
-#: compat/obstack.c:406 compat/obstack.c:408
-msgid "memory exhausted"
-msgstr "minnet slut"
-
-#: compat/terminal.c:167
-msgid "cannot resume in the background, please use 'fg' to resume"
-msgstr "kan inte fortsätta i bakgrunden, använd \"fg\" för att återuppta"
-
-#: compat/terminal.c:168
-msgid "cannot restore terminal settings"
-msgstr "kan inte återställa terminalinställningar"
-
-#: config.c:143
-#, c-format
-msgid ""
-"exceeded maximum include depth (%d) while including\n"
-"\t%s\n"
-"from\n"
-"\t%s\n"
-"This might be due to circular includes."
-msgstr ""
-"överskred maximalt inkluderingsdjup (%d) när\n"
-"\t%s\n"
-"inkluderades från\n"
-"\t%s\n"
-"Det kan bero på cirkulära inkluderingar."
-
-#: config.c:159
-#, c-format
-msgid "could not expand include path '%s'"
-msgstr "kunde inte expandera inkluderingssökväg \"%s\""
-
-#: config.c:170
-msgid "relative config includes must come from files"
-msgstr "relativa konfigureringsinkluderingar måste komma från filer"
-
-#: config.c:219
-msgid "relative config include conditionals must come from files"
-msgstr "relativa konfigureringsinkluderingsvillkor måste komma från filer"
-
-#: config.c:364
-msgid ""
-"remote URLs cannot be configured in file directly or indirectly included by "
-"includeIf.hasconfig:remote.*.url"
-msgstr ""
-"fjärr-URL:er kan inte konfigureras direkt eller indirekt i en fil inkluderad "
-"med includeIf.hasconfig:remote.*.url"
-
-#: config.c:508
-#, c-format
-msgid "invalid config format: %s"
-msgstr "felaktigt konfigurationsformat: %s"
-
-#: config.c:512
-#, c-format
-msgid "missing environment variable name for configuration '%.*s'"
-msgstr "miljövariabelnamn saknas för konfigurationen \"%.*s\""
-
-#: config.c:517
-#, c-format
-msgid "missing environment variable '%s' for configuration '%.*s'"
-msgstr "miljövariabeln \"%s\" saknas för konfigurationen \"%.*s\""
-
-#: config.c:553
-#, c-format
-msgid "key does not contain a section: %s"
-msgstr "nyckeln innehåller inte ett stycke: %s"
-
-#: config.c:558
-#, c-format
-msgid "key does not contain variable name: %s"
-msgstr "nyckeln innehåller inte variabelnamn: %s"
-
-#: config.c:580 sequencer.c:2802
-#, c-format
-msgid "invalid key: %s"
-msgstr "felaktig nyckel: %s"
-
-#: config.c:585
-#, c-format
-msgid "invalid key (newline): %s"
-msgstr "ogiltig nyckel (nyradstecken): %s"
-
-#: config.c:605
-msgid "empty config key"
-msgstr "tom konfigurationsnyckel"
-
-#: config.c:623 config.c:635
-#, c-format
-msgid "bogus config parameter: %s"
-msgstr "falsk konfigureringsparameter: %s"
-
-#: config.c:649 config.c:666 config.c:673 config.c:682
-#, c-format
-msgid "bogus format in %s"
-msgstr "felaktigt format i %s"
-
-#: config.c:716
-#, c-format
-msgid "bogus count in %s"
-msgstr "felaktigt antal i %s"
-
-#: config.c:720
-#, c-format
-msgid "too many entries in %s"
-msgstr "för många poster i %s"
-
-#: config.c:730
-#, c-format
-msgid "missing config key %s"
-msgstr "konfigurationsnyckel saknas för %s"
-
-#: config.c:738
-#, c-format
-msgid "missing config value %s"
-msgstr "konfigurationsvärde saknas för %s"
-
-#: config.c:1089
-#, c-format
-msgid "bad config line %d in blob %s"
-msgstr "felaktig konfigurationsfil rad %d i blob:en %s"
-
-#: config.c:1093
-#, c-format
-msgid "bad config line %d in file %s"
-msgstr "felaktig konfigurationsfil rad %d i filen %s"
-
-#: config.c:1097
-#, c-format
-msgid "bad config line %d in standard input"
-msgstr "felaktig konfigurationsfil rad %d i standard in"
-
-#: config.c:1101
-#, c-format
-msgid "bad config line %d in submodule-blob %s"
-msgstr "felaktig konfigurationsfil rad %d i undermoduls-blob:en %s"
-
-#: config.c:1105
-#, c-format
-msgid "bad config line %d in command line %s"
-msgstr "felaktig konfigurationsfil rad %d i kommandoraden %s"
-
-#: config.c:1109
-#, c-format
-msgid "bad config line %d in %s"
-msgstr "felaktig konfigurationsfil rad %d i %s"
-
-#: config.c:1246
-msgid "out of range"
-msgstr "utanför intervallet"
-
-#: config.c:1246
-msgid "invalid unit"
-msgstr "ogiltig enhet"
-
-#: config.c:1247
-#, c-format
-msgid "bad numeric config value '%s' for '%s': %s"
-msgstr "felaktigt numeriskt konfigurationsvärde \"%s\" för \"%s\": %s"
-
-#: config.c:1257
-#, 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:1260
-#, 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:1263
-#, 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:1266
-#, 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:1269
-#, 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:1272
-#, 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:1368
-#, c-format
-msgid "invalid value for variable %s"
-msgstr "ogiltigt värde för variabeln %s"
-
-#: config.c:1389
-#, c-format
-msgid "ignoring unknown core.fsync component '%s'"
-msgstr "ignorerar okänd core.fsync-komponent \"%s\""
-
-#: config.c:1425
-#, c-format
-msgid "bad boolean config value '%s' for '%s'"
-msgstr "felaktigt booleskt konfigurationsvärde \"%s\" för \"%s\""
-
-#: config.c:1443
-#, c-format
-msgid "failed to expand user dir in: '%s'"
-msgstr "misslyckades expandera användarkatalog i: \"%s\""
-
-#: config.c:1452
-#, c-format
-msgid "'%s' for '%s' is not a valid timestamp"
-msgstr "\"%s\" för \"%s\" är inte en giltig tidsstämpel"
-
-#: config.c:1545
-#, c-format
-msgid "abbrev length out of range: %d"
-msgstr "förkortningslängd utanför intervallet: %d"
-
-#: config.c:1559 config.c:1570
-#, c-format
-msgid "bad zlib compression level %d"
-msgstr "felaktigt zlib-komprimeringsgrad %d"
-
-#: config.c:1660
-msgid "core.commentChar should only be one character"
-msgstr "core.commentChar kan bara vara ett tecken"
-
-#: config.c:1692
-#, c-format
-msgid "ignoring unknown core.fsyncMethod value '%s'"
-msgstr "ignorerar okänt core.fsyncMethod-värde \"%s\""
-
-#: config.c:1698
-msgid "core.fsyncObjectFiles is deprecated; use core.fsync instead"
-msgstr "core.fsyncObjectFiles avråds från; använd core.fsync istället"
-
-#: config.c:1714
-#, c-format
-msgid "invalid mode for object creation: %s"
-msgstr "felaktigt läge för skapande av objekt: %s"
-
-#: config.c:1800
-#, c-format
-msgid "malformed value for %s"
-msgstr "felformat värde för %s"
-
-#: config.c:1826
-#, c-format
-msgid "malformed value for %s: %s"
-msgstr "felformat värde för %s: %s"
-
-#: config.c:1827
-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:1888 builtin/pack-objects.c:4078
-#, c-format
-msgid "bad pack compression level %d"
-msgstr "felaktig paketkomprimeringsgrad %d"
-
-#: config.c:2014
-#, c-format
-msgid "unable to load config blob object '%s'"
-msgstr "kunde inte läsa konfigurerings-blobobjektet \"%s\""
-
-#: config.c:2017
-#, c-format
-msgid "reference '%s' does not point to a blob"
-msgstr "referensen \"%s\" pekar inte på en blob"
-
-#: config.c:2035
-#, c-format
-msgid "unable to resolve config blob '%s'"
-msgstr "kan inte slå upp konfigurerings-bloben \"%s\""
-
-#: config.c:2080
-#, c-format
-msgid "failed to parse %s"
-msgstr "kunde inte tolka %s"
-
-#: config.c:2136
-msgid "unable to parse command-line config"
-msgstr "kan inte tolka kommandoradskonfiguration"
-
-#: config.c:2512
-msgid "unknown error occurred while reading the configuration files"
-msgstr "okänt fel uppstod vid läsning av konfigurationsfilerna"
-
-#: config.c:2686
-#, c-format
-msgid "Invalid %s: '%s'"
-msgstr "Felaktigt %s: \"%s\""
-
-#: config.c:2731
-#, 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:2763
-#, c-format
-msgid "unable to parse '%s' from command-line config"
-msgstr "kunde inte tolka värdet \"%s\" från kommandoradskonfiguration"
-
-#: config.c:2765
-#, 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:2850
-#, c-format
-msgid "invalid section name '%s'"
-msgstr "felaktigt sektionsnamn \"%s\""
-
-#: config.c:2882
-#, c-format
-msgid "%s has multiple values"
-msgstr "%s har flera värden"
-
-#: config.c:2911
-#, c-format
-msgid "failed to write new configuration file %s"
-msgstr "kan inte skriva nya konfigurationsfilen \"%s\""
-
-#: config.c:3177 config.c:3518
-#, c-format
-msgid "could not lock config file %s"
-msgstr "kunde inte låsa konfigurationsfilen %s"
-
-#: config.c:3188
-#, c-format
-msgid "opening %s"
-msgstr "öppnar %s"
-
-#: config.c:3225 builtin/config.c:361
-#, c-format
-msgid "invalid pattern: %s"
-msgstr "ogiltigt mönster: %s"
-
-#: config.c:3250
-#, c-format
-msgid "invalid config file %s"
-msgstr "ogiltig konfigurationsfil: \"%s\""
-
-#: config.c:3263 config.c:3531
-#, c-format
-msgid "fstat on %s failed"
-msgstr "fstat misslyckades på %s"
-
-#: config.c:3274
-#, c-format
-msgid "unable to mmap '%s'%s"
-msgstr "kunde inte utföra mmap på \"%s\"%s"
-
-#: config.c:3284 config.c:3536
-#, c-format
-msgid "chmod on %s failed"
-msgstr "chmod misslyckades på %s"
-
-#: config.c:3369 config.c:3633
-#, c-format
-msgid "could not write config file %s"
-msgstr "kunde inte skriva konfigurationsfilen %s"
-
-#: config.c:3403
-#, c-format
-msgid "could not set '%s' to '%s'"
-msgstr "kunde inte ställa in \"%s\" till \"%s\""
-
-#: config.c:3405 builtin/remote.c:666 builtin/remote.c:885 builtin/remote.c:893
-#, c-format
-msgid "could not unset '%s'"
-msgstr "kunde inte ta bort inställning för \"%s\""
-
-#: config.c:3509
-#, c-format
-msgid "invalid section name: %s"
-msgstr "felaktigt namn på stycke: %s"
-
-#: config.c:3676
-#, c-format
-msgid "missing value for '%s'"
-msgstr "värde saknas för \"%s\""
-
-#: connect.c:61
-msgid "the remote end hung up upon initial contact"
-msgstr "fjärren lade på vid inledande kontakt"
-
-#: connect.c:63
-msgid ""
-"Could not read from remote repository.\n"
-"\n"
-"Please make sure you have the correct access rights\n"
-"and the repository exists."
-msgstr ""
-"Kunde inte läsa från fjärrarkiv.\n"
-"\n"
-"Se till att du har korrekt åtkomstbehörighet\n"
-"och att arkivet existerar."
-
-#: connect.c:81
-#, c-format
-msgid "server doesn't support '%s'"
-msgstr "Servern stöder inte \"%s\""
-
-#: connect.c:118
-#, c-format
-msgid "server doesn't support feature '%s'"
-msgstr "servern stöder inte funktionen \"%s\""
-
-#: connect.c:129
-msgid "expected flush after capabilities"
-msgstr "förväntade \"flush\" efter förmågor"
-
-#: connect.c:265
-#, c-format
-msgid "ignoring capabilities after first line '%s'"
-msgstr "ignorerar förmågor efter första raden \"%s\""
-
-#: connect.c:286
-msgid "protocol error: unexpected capabilities^{}"
-msgstr "protokollfel: förväntade inte capabilities^{}"
-
-#: 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:310
-msgid "repository on the other end cannot be shallow"
-msgstr "arkivet på andra sidan kan inte vara grunt"
-
-#: connect.c:349
-msgid "invalid packet"
-msgstr "ogiltigt paket"
-
-#: connect.c:369
-#, c-format
-msgid "protocol error: unexpected '%s'"
-msgstr "protokollfel: förväntade inte \"%s\""
-
-#: connect.c:499
-#, c-format
-msgid "unknown object format '%s' specified by server"
-msgstr "okänt objektformat \"%s\" angavs av servern"
-
-#: connect.c:528
-#, c-format
-msgid "invalid ls-refs response: %s"
-msgstr "ogiltigt svar på ls-refs: %s"
-
-#: connect.c:532
-msgid "expected flush after ref listing"
-msgstr "förväntade \"flush\" efter ref-listan"
-
-#: connect.c:535
-msgid "expected response end packet after ref listing"
-msgstr "förväntade svarsavslutningspaket efter ref-listan"
-
-#: connect.c:670
-#, c-format
-msgid "protocol '%s' is not supported"
-msgstr "protokollet \"%s\" stöds inte"
-
-#: connect.c:721
-msgid "unable to set SO_KEEPALIVE on socket"
-msgstr "kunde inte sätta SO_KEEPALIVE på uttaget"
-
-#: connect.c:761 connect.c:824
-#, c-format
-msgid "Looking up %s ... "
-msgstr "Slår upp %s..."
-
-#: 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:769 connect.c:840
-#, c-format
-msgid ""
-"done.\n"
-"Connecting to %s (port %s) ... "
-msgstr ""
-"klart.\n"
-"Ansluter till %s (port %s)..."
-
-#: connect.c:791 connect.c:868
-#, c-format
-msgid ""
-"unable to connect to %s:\n"
-"%s"
-msgstr ""
-"kunde inte ansluta till %s:\n"
-"%s"
-
-#. TRANSLATORS: this is the end of "Connecting to %s (port %s) ... "
-#: connect.c:797 connect.c:874
-msgid "done."
-msgstr "klart."
-
-#: connect.c:828
-#, c-format
-msgid "unable to look up %s (%s)"
-msgstr "kunde inte slå upp %s (%s)"
-
-#: connect.c:834
-#, c-format
-msgid "unknown port %s"
-msgstr "okänd port %s"
-
-#: connect.c:971 connect.c:1303
-#, c-format
-msgid "strange hostname '%s' blocked"
-msgstr "konstigt värdnamn \"%s\" blockerat"
-
-#: connect.c:973
-#, c-format
-msgid "strange port '%s' blocked"
-msgstr "konstig port \"%s\" blockerad"
-
-#: connect.c:983
-#, c-format
-msgid "cannot start proxy %s"
-msgstr "kan inte starta mellanserver (proxy) %s"
-
-#: 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: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:1251
-msgid "ssh variant 'simple' does not support -4"
-msgstr "ssh-varianten \"simple\" stöder inte -4"
-
-#: connect.c:1263
-msgid "ssh variant 'simple' does not support -6"
-msgstr "ssh-varianten \"simple\" stöder inte -6"
-
-#: connect.c:1280
-msgid "ssh variant 'simple' does not support setting port"
-msgstr "ssh-varianten \"simple\" stöder inte val av port"
-
-#: connect.c:1392
-#, c-format
-msgid "strange pathname '%s' blocked"
-msgstr "konstigt sökvägsnamn \"%s\" blockerat"
-
-#: 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:109 builtin/fsck.c:189 builtin/prune.c:57
-msgid "Checking connectivity"
-msgstr "Kontrollerar konnektivitet"
-
-#: connected.c:122
-msgid "Could not run 'git rev-list'"
-msgstr "Kunde inte köra \"git rev-list\""
-
-#: connected.c:146
-msgid "failed write to rev-list"
-msgstr "kunde inte skriva till rev-list"
-
-#: connected.c:151
-msgid "failed to close rev-list's stdin"
-msgstr "kunde inte stänga rev-list:s standard in"
-
-#: convert.c:183
-#, c-format
-msgid "illegal crlf_action %d"
-msgstr "felaktig crlf_action %d"
-
-#: convert.c:196
-#, c-format
-msgid "CRLF would be replaced by LF in %s"
-msgstr "CRLF skulle ersättas av LF i %s"
-
-#: convert.c:198
-#, c-format
-msgid ""
-"CRLF will be replaced by LF in %s.\n"
-"The file will have its original line endings in your working directory"
-msgstr ""
-"CRLF kommer att ersättas av LF i %s.\n"
-"Filen kommer att ha sina ursprungliga radbrytningar i din arbetskatalog"
-
-#: convert.c:206
-#, c-format
-msgid "LF would be replaced by CRLF in %s"
-msgstr "LF skulle ersättas av CRLF i %s"
-
-#: convert.c:208
-#, c-format
-msgid ""
-"LF will be replaced by CRLF in %s.\n"
-"The file will have its original line endings in your working directory"
-msgstr ""
-"LF kommer att ersättas av CRLF i %s.\n"
-"Filen kommer att ha sina ursprungliga radbrytningar i din arbetskatalog"
-
-#: convert.c:273
-#, c-format
-msgid "BOM is prohibited in '%s' if encoded as %s"
-msgstr "BOM är förbjudet i \"%s\" om kodat som %s"
-
-#: convert.c:280
-#, c-format
-msgid ""
-"The file '%s' contains a byte order mark (BOM). Please use UTF-%.*s as "
-"working-tree-encoding."
-msgstr ""
-"Filen \"%s\" innehåller byte order mark (BOM). Använd UTF-%.*s som "
-"teckenkodning i arbetskatalogen."
-
-#: convert.c:293
-#, c-format
-msgid "BOM is required in '%s' if encoded as %s"
-msgstr "BOM krävs om \"%s\" kodas som %s"
-
-#: 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."
-msgstr ""
-"Filen \"%s\" saknar byte order mark (BOM). Använd UTF-%sBE eller UTF-%sLE "
-"(beroende på byteordning) som teckenkodning i arbetskatalogen."
-
-#: convert.c:408 convert.c:479
-#, c-format
-msgid "failed to encode '%s' from %s to %s"
-msgstr "misslyckades omkoda \"%s\" från %s till %s"
-
-#: convert.c:451
-#, c-format
-msgid "encoding '%s' from %s to %s and back is not the same"
-msgstr ""
-"omkodning av \"%s\" från %s till %s och tillbaka ger inte samma resultat"
-
-#: convert.c:654
-#, c-format
-msgid "cannot fork to run external filter '%s'"
-msgstr "kan inte grena (fork) för att köra externt filter \"%s\""
-
-#: convert.c:674
-#, c-format
-msgid "cannot feed the input to external filter '%s'"
-msgstr "kunde inte skicka indata till externt filter \"%s\""
-
-#: convert.c:681
-#, c-format
-msgid "external filter '%s' failed %d"
-msgstr "externt filter \"%s\" misslyckades %d"
-
-#: convert.c:716 convert.c:719
-#, c-format
-msgid "read from external filter '%s' failed"
-msgstr "läsning från externt filter \"%s\" misslyckades"
-
-#: convert.c:722 convert.c:777
-#, c-format
-msgid "external filter '%s' failed"
-msgstr "externt filter \"%s\" misslyckades"
-
-#: convert.c:826
-msgid "unexpected filter type"
-msgstr "oväntad filtertyp"
-
-#: convert.c:837
-msgid "path name too long for external filter"
-msgstr "sökvägen för lång för externt filter"
-
-#: convert.c:935
-#, c-format
-msgid ""
-"external filter '%s' is not available anymore although not all paths have "
-"been filtered"
-msgstr ""
-"externt filter \"%s\" är inte längre tillgängligt trots att alla sökvägar "
-"inte har filtrerats"
-
-#: convert.c:1236
-msgid "true/false are no valid working-tree-encodings"
-msgstr "true/false är inte giltig teckenkodning för arbetskatalogen"
-
-#: convert.c:1416 convert.c:1449
-#, c-format
-msgid "%s: clean filter '%s' failed"
-msgstr "%s: \"clean\"-filtret \"%s\" misslyckades"
-
-#: convert.c:1492
-#, c-format
-msgid "%s: smudge filter %s failed"
-msgstr "%s: \"smudge\"-filtret \"%s\" misslyckades"
-
-#: credential.c:96
-#, c-format
-msgid "skipping credential lookup for key: credential.%s"
-msgstr "hoppar över uppslag av inloggningsuppgifter för nyckel: credential.%s"
-
-#: credential.c:112
-msgid "refusing to work with credential missing host field"
-msgstr "vägrar arbeta med inloggningsuppgifter utan värdfält"
-
-#: credential.c:114
-msgid "refusing to work with credential missing protocol field"
-msgstr "vägrar arbeta med inloggningsuppgifter utan protokollfält"
-
-#: credential.c:396
-#, c-format
-msgid "url contains a newline in its %s component: %s"
-msgstr "url innehåller radbrytning i komponenten %s: %s"
-
-#: credential.c:440
-#, c-format
-msgid "url has no scheme: %s"
-msgstr "url saknar protokoll: %s"
-
-#: credential.c:513
-#, c-format
-msgid "credential url cannot be parsed: %s"
-msgstr "kan inte tolka url för inloggingsuppgifter: %s"
-
-#: date.c:139
-msgid "in the future"
-msgstr "i framtiden"
-
-#: date.c:145
-#, c-format
-msgid "%<PRIuMAX> second ago"
-msgid_plural "%<PRIuMAX> seconds ago"
-msgstr[0] "%<PRIuMAX> sekund sedan"
-msgstr[1] "%<PRIuMAX> sekunder sedan"
-
-#: date.c:152
-#, c-format
-msgid "%<PRIuMAX> minute ago"
-msgid_plural "%<PRIuMAX> minutes ago"
-msgstr[0] "%<PRIuMAX> minut sedan"
-msgstr[1] "%<PRIuMAX> minuter sedan"
-
-#: date.c:159
-#, c-format
-msgid "%<PRIuMAX> hour ago"
-msgid_plural "%<PRIuMAX> hours ago"
-msgstr[0] "%<PRIuMAX> timme sedan"
-msgstr[1] "%<PRIuMAX> timmar sedan"
-
-#: date.c:166
-#, c-format
-msgid "%<PRIuMAX> day ago"
-msgid_plural "%<PRIuMAX> days ago"
-msgstr[0] "%<PRIuMAX> dag sedan"
-msgstr[1] "%<PRIuMAX> dagar sedan"
-
-#: date.c:172
-#, c-format
-msgid "%<PRIuMAX> week ago"
-msgid_plural "%<PRIuMAX> weeks ago"
-msgstr[0] "%<PRIuMAX> vecka sedan"
-msgstr[1] "%<PRIuMAX> veckor sedan"
-
-#: date.c:179
-#, c-format
-msgid "%<PRIuMAX> month ago"
-msgid_plural "%<PRIuMAX> months ago"
-msgstr[0] "%<PRIuMAX> månad sedan"
-msgstr[1] "%<PRIuMAX> månader sedan"
-
-#: date.c:190
-#, c-format
-msgid "%<PRIuMAX> year"
-msgid_plural "%<PRIuMAX> years"
-msgstr[0] "%<PRIuMAX> år"
-msgstr[1] "%<PRIuMAX> år"
-
-#. TRANSLATORS: "%s" is "<n> years"
-#: date.c:193
-#, c-format
-msgid "%s, %<PRIuMAX> month ago"
-msgid_plural "%s, %<PRIuMAX> months ago"
-msgstr[0] "%s, %<PRIuMAX> månad sedan"
-msgstr[1] "%s, %<PRIuMAX> månader sedan"
-
-#: date.c:198 date.c:203
-#, c-format
-msgid "%<PRIuMAX> year ago"
-msgid_plural "%<PRIuMAX> years ago"
-msgstr[0] "%<PRIuMAX> år sedan"
-msgstr[1] "%<PRIuMAX> år sedan"
-
-#: delta-islands.c:272
-msgid "Propagating island marks"
-msgstr "Sprider ö-markeringar"
-
-#: delta-islands.c:290
-#, c-format
-msgid "bad tree object %s"
-msgstr "felaktigt trädobjektet %s"
-
-#: delta-islands.c:334
-#, c-format
-msgid "failed to load island regex for '%s': %s"
-msgstr "kunde inte hämta ö-regex för \"%s\": %s"
-
-#: delta-islands.c:390
-#, c-format
-msgid "island regex from config has too many capture groups (max=%d)"
-msgstr "ö-regex från konfiguration har för många fångstgrupper (max=%d)"
-
-#: delta-islands.c:467
-#, c-format
-msgid "Marked %d islands, done.\n"
-msgstr "Markerade %d öar, klar.\n"
-
-#: diff-merges.c:81 gpg-interface.c:719 gpg-interface.c:734 ls-refs.c:37
-#: parallel-checkout.c:42 sequencer.c:2805 setup.c:563 builtin/am.c:203
-#: builtin/am.c:2243 builtin/am.c:2287 builtin/blame.c:724 builtin/blame.c:742
-#: builtin/fetch.c:792 builtin/pack-objects.c:3515 builtin/pull.c:45
-#: builtin/pull.c:47 builtin/pull.c:321
-#, c-format
-msgid "invalid value for '%s': '%s'"
-msgstr "felaktigt värde för \"%s\": \"%s\""
-
-#: diff-lib.c:561
-msgid "--merge-base does not work with ranges"
-msgstr "--merge-base fungerar inte med intervall"
-
-#: diff-lib.c:563
-msgid "--merge-base only works with commits"
-msgstr "--merge-base fungerar bara med incheckningar"
-
-#: diff-lib.c:580
-msgid "unable to get HEAD"
-msgstr "kan inte hämta HEAD"
-
-#: diff-lib.c:587
-msgid "no merge base found"
-msgstr "ingen sammanslagningsbas hittades"
-
-#: diff-lib.c:589
-msgid "multiple merge bases found"
-msgstr "flera sammanslagningsbaser hittades"
-
-#: diff-no-index.c:237
-msgid "git diff --no-index [<options>] <path> <path>"
-msgstr "git diff --no-index [<flaggor>] <sökväg> <sökväg>"
-
-#: diff-no-index.c:262
-msgid ""
-"Not a git repository. Use --no-index to compare two paths outside a working "
-"tree"
-msgstr ""
-"Inte ett git-arkiv. Använd --no-index för att jämföra två sökvägar utanför "
-"en arbetskatalog."
-
-#: diff.c:159
-#, c-format
-msgid "  Failed to parse dirstat cut-off percentage '%s'\n"
-msgstr "  Misslyckades tolka dirstat-avskärningsprocentandel \"%s\"\n"
-
-#: diff.c:164
-#, c-format
-msgid "  Unknown dirstat parameter '%s'\n"
-msgstr "  Okänd dirstat-parameter \"%s\"\n"
-
-#: diff.c:300
-msgid ""
-"color moved setting must be one of 'no', 'default', 'blocks', 'zebra', "
-"'dimmed-zebra', 'plain'"
-msgstr ""
-"färginställningen för flyttade block måste vara en av \"no\", \"default\", "
-"\"blocks\", \"zebra\", \"dimmed-zebra\", \"plain\""
-
-#: diff.c:328
-#, 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 ""
-"okänt läge \"%s\" för color-moved-ws, möjliga värden är \"ignore-space-change"
-"\", \"ignore-space-at-eol\", \"ignore-all-space\", \"allow-indentation-change"
-"\""
-
-#: diff.c:336
-msgid ""
-"color-moved-ws: allow-indentation-change cannot be combined with other "
-"whitespace modes"
-msgstr ""
-"color-moved-ws: allow-indentation-change kan inte kombineras med andra "
-"blankstegslägen"
-
-#: diff.c:413
-#, c-format
-msgid "Unknown value for 'diff.submodule' config variable: '%s'"
-msgstr "Okänt värde för konfigurationsvariabeln \"diff.submodule\": \"%s\""
-
-#: diff.c:473
-#, c-format
-msgid ""
-"Found errors in 'diff.dirstat' config variable:\n"
-"%s"
-msgstr ""
-"Hittade fel i konfigurationsvariabeln \"diff.dirstat\":\n"
-"%s"
-
-#: diff.c:4282
-#, c-format
-msgid "external diff died, stopping at %s"
-msgstr "extern diff dog, stannar vid %s"
-
-#: diff.c:4677 parse-options.c:1114
-#, c-format
-msgid "options '%s', '%s', '%s', and '%s' cannot be used together"
-msgstr ""
-"flaggorna \"%s\", \"%s\", \"%s\" och \"%s\" kan inte användas samtidigt"
-
-#: diff.c:4681 parse-options.c:1118 builtin/worktree.c:578
-#, c-format
-msgid "options '%s', '%s', and '%s' cannot be used together"
-msgstr "flaggorna \"%s\", \"%s\" och \"%s\" kan inte användas samtidigt"
-
-#: diff.c:4685
-#, c-format
-msgid "options '%s' and '%s' cannot be used together, use '%s' with '%s'"
-msgstr ""
-"flaggorna \"%s\" och \"%s\" kan inte användas samtidigt, använd \"%s\" med "
-"\"%s\""
-
-#: diff.c:4689
-#, c-format
-msgid ""
-"options '%s' and '%s' cannot be used together, use '%s' with '%s' and '%s'"
-msgstr ""
-"flaggorna \"%s\" och  \"%s\" kan inte användas samtidigt, använd \"%s\" med "
-"\"%s\" och \"%s\""
-
-#: diff.c:4769
-msgid "--follow requires exactly one pathspec"
-msgstr "--follow kräver exakt en sökvägsangivelse"
-
-#: diff.c:4823
-#, c-format
-msgid "invalid --stat value: %s"
-msgstr "ogiltigt värde för --stat: %s"
-
-#: diff.c:4828 diff.c:4833 diff.c:4838 diff.c:4843 diff.c:5319
-#: 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:4860
-#, c-format
-msgid ""
-"Failed to parse --dirstat/-X option parameter:\n"
-"%s"
-msgstr ""
-"Misslyckades tolka argument till flaggan --dirstat/-X;\n"
-"%s"
-
-#: diff.c:4893
-#, c-format
-msgid "unknown change class '%c' in --diff-filter=%s"
-msgstr "okänd ändringsklass \"%c\" i --diff-filter=%s"
-
-#: diff.c:4917
-#, c-format
-msgid "unknown value after ws-error-highlight=%.*s"
-msgstr "okänt värde efter ws-error-highlight=%.*s"
-
-#: diff.c:4931
-#, c-format
-msgid "unable to resolve '%s'"
-msgstr "kunde inte slå upp \"%s\""
-
-#: diff.c:4981 diff.c:4987
-#, c-format
-msgid "%s expects <n>/<m> form"
-msgstr "%s förväntar formen <n>/<m>"
-
-#: diff.c:4999
-#, c-format
-msgid "%s expects a character, got '%s'"
-msgstr "%s förväntar ett tecken, fick \"%s\""
-
-#: diff.c:5020
-#, c-format
-msgid "bad --color-moved argument: %s"
-msgstr "felaktigt argument till --color-moved: %s"
-
-#: diff.c:5039
-#, c-format
-msgid "invalid mode '%s' in --color-moved-ws"
-msgstr "ogiltigt läge %s\" i --color-moved-ws"
-
-#: diff.c:5079
-msgid ""
-"option diff-algorithm accepts \"myers\", \"minimal\", \"patience\" and "
-"\"histogram\""
-msgstr ""
-"flaggan diff-algorithm godtar\"myers\", \"minimal\", \"patience\" och "
-"\"histogram\""
-
-#: diff.c:5115 diff.c:5135
-#, c-format
-msgid "invalid argument to %s"
-msgstr "ogiltigt argument för %s"
-
-#: diff.c:5239
-#, c-format
-msgid "invalid regex given to -I: '%s'"
-msgstr "ogiltigt reguljärt uttryck angavs för -I: \"%s\""
-
-#: diff.c:5288
-#, c-format
-msgid "failed to parse --submodule option parameter: '%s'"
-msgstr "misslyckades tolka argument till flaggan --submodule: \"%s\""
-
-#: diff.c:5344
-#, c-format
-msgid "bad --word-diff argument: %s"
-msgstr "felaktigt argument --word-diff: %s"
-
-#: diff.c:5380
-msgid "Diff output format options"
-msgstr "Formatflaggor för diff-utdata"
-
-#: diff.c:5382 diff.c:5388
-msgid "generate patch"
-msgstr "skapar patch"
-
-#: diff.c:5385 builtin/log.c:180
-msgid "suppress diff output"
-msgstr "undertryck diff-utdata"
-
-#: diff.c:5390 diff.c:5504 diff.c:5511
-msgid "<n>"
-msgstr "<n>"
-
-#: diff.c:5391 diff.c:5394
-msgid "generate diffs with <n> lines context"
-msgstr "skapa diffar med <n> rader sammanhang"
-
-#: diff.c:5396
-msgid "generate the diff in raw format"
-msgstr "generera diff i råformat"
-
-#: diff.c:5399
-msgid "synonym for '-p --raw'"
-msgstr "synonym till \"-p --raw\""
-
-#: diff.c:5403
-msgid "synonym for '-p --stat'"
-msgstr "synonym till \"-p --stat\""
-
-#: diff.c:5407
-msgid "machine friendly --stat"
-msgstr "maskinläsbar --stat"
-
-#: diff.c:5410
-msgid "output only the last line of --stat"
-msgstr "skriv bara ut den sista raden för --stat"
-
-#: diff.c:5412 diff.c:5420
-msgid "<param1,param2>..."
-msgstr "<param1,param2>..."
-
-#: diff.c:5413
-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:5417
-msgid "synonym for --dirstat=cumulative"
-msgstr "synonym för --dirstat=cumulative"
-
-#: diff.c:5421
-msgid "synonym for --dirstat=files,param1,param2..."
-msgstr "synonym för --dirstat=filer,param1,param2..."
-
-#: diff.c:5425
-msgid "warn if changes introduce conflict markers or whitespace errors"
-msgstr "varna om ändringar introducerar konfliktmarkörer eller blankstegsfel"
-
-#: diff.c:5428
-msgid "condensed summary such as creations, renames and mode changes"
-msgstr "kortfattad summering såsom skapade, namnbyten och ändrade lägen"
-
-#: diff.c:5431
-msgid "show only names of changed files"
-msgstr "visa endast namnen på ändrade filer"
-
-#: diff.c:5434
-msgid "show only names and status of changed files"
-msgstr "visa endast namn och status för ändrade filer"
-
-#: diff.c:5436
-msgid "<width>[,<name-width>[,<count>]]"
-msgstr "<bredd>[,<namn-bredd>[,<antal>]]"
-
-#: diff.c:5437
-msgid "generate diffstat"
-msgstr "skapa diffstat"
-
-#: diff.c:5439 diff.c:5442 diff.c:5445
-msgid "<width>"
-msgstr "<bredd>"
-
-#: diff.c:5440
-msgid "generate diffstat with a given width"
-msgstr "generera en diffstat med given bredd"
-
-#: diff.c:5443
-msgid "generate diffstat with a given name width"
-msgstr "generera en diffstat med given namnbredd"
-
-#: diff.c:5446
-msgid "generate diffstat with a given graph width"
-msgstr "generera en diffstat med given grafbredd"
-
-#: diff.c:5448
-msgid "<count>"
-msgstr "<antal>"
-
-#: diff.c:5449
-msgid "generate diffstat with limited lines"
-msgstr "generera diffstat med begränsade rader"
-
-#: diff.c:5452
-msgid "generate compact summary in diffstat"
-msgstr "skapa kompakt översikt i diffstat"
-
-#: diff.c:5455
-msgid "output a binary diff that can be applied"
-msgstr "skapa en binärdiff som kan appliceras"
-
-#: diff.c:5458
-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:5460
-msgid "show colored diff"
-msgstr "visa färgad diff"
-
-#: diff.c:5461
-msgid "<kind>"
-msgstr "<typ>"
-
-#: diff.c:5462
-msgid ""
-"highlight whitespace errors in the 'context', 'old' or 'new' lines in the "
-"diff"
-msgstr ""
-"ljusmarkera blankstegsfel i \"context\" (sammanhang), \"old\" (gamla) eller "
-"\"new\" (nya) rader i diffen"
-
-#: diff.c:5465
-msgid ""
-"do not munge pathnames and use NULs as output field terminators in --raw or "
-"--numstat"
-msgstr ""
-"skriv inte om sökvägsnamn och använd NUL-tecken som fältseparerare i --raw "
-"eller --numstat"
-
-#: diff.c:5468 diff.c:5471 diff.c:5474 diff.c:5583
-msgid "<prefix>"
-msgstr "<prefix>"
-
-#: diff.c:5469
-msgid "show the given source prefix instead of \"a/\""
-msgstr "visa givet källprefix istället för \"a/\""
-
-#: diff.c:5472
-msgid "show the given destination prefix instead of \"b/\""
-msgstr "visa givet målprefix istället för \"b/\""
-
-#: diff.c:5475
-msgid "prepend an additional prefix to every line of output"
-msgstr "lägg till ytterligare prefix på alla rader i utdata"
-
-#: diff.c:5478
-msgid "do not show any source or destination prefix"
-msgstr "visa inte käll- eller målprefix"
-
-#: diff.c:5481
-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:5485 diff.c:5490 diff.c:5495
-msgid "<char>"
-msgstr "<tecken>"
-
-#: diff.c:5486
-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:5491
-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:5496
-msgid "specify the character to indicate a context instead of ' '"
-msgstr "ange tecken för att ange sammanhang istället för \" \""
-
-#: diff.c:5499
-msgid "Diff rename options"
-msgstr "Diff-namnbytesflaggor"
-
-#: diff.c:5500
-msgid "<n>[/<m>]"
-msgstr "<n>[/<m>]"
-
-#: diff.c:5501
-msgid "break complete rewrite changes into pairs of delete and create"
-msgstr "dela upp kompletta omskrivningar till ta bort och skapa-par"
-
-#: diff.c:5505
-msgid "detect renames"
-msgstr "detektera namnändringar"
-
-#: diff.c:5509
-msgid "omit the preimage for deletes"
-msgstr "ta bort för-version för borttagningar"
-
-#: diff.c:5512
-msgid "detect copies"
-msgstr "detektera kopior"
-
-#: diff.c:5516
-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:5518
-msgid "disable rename detection"
-msgstr "inaktivera detektering av namnbyten"
-
-#: diff.c:5521
-msgid "use empty blobs as rename source"
-msgstr "använd tomma blob:ar som namnändringskälla"
-
-#: diff.c:5523
-msgid "continue listing the history of a file beyond renames"
-msgstr "fortsätt lista historiken för en fil bortom namnändringar"
-
-#: diff.c:5526
-msgid ""
-"prevent rename/copy detection if the number of rename/copy targets exceeds "
-"given limit"
-msgstr ""
-"förhindra namnbyte/kopie-detektering om antalet namnbyten/kopior överskriver "
-"given gräns"
-
-#: diff.c:5528
-msgid "Diff algorithm options"
-msgstr "Alternativ för diff-algoritm"
-
-#: diff.c:5530
-msgid "produce the smallest possible diff"
-msgstr "skapa minsta möjliga diff"
-
-#: diff.c:5533
-msgid "ignore whitespace when comparing lines"
-msgstr "ignorera blanktecken vid radjämförelse"
-
-#: diff.c:5536
-msgid "ignore changes in amount of whitespace"
-msgstr "ignorera ändringar i antal blanktecken vid radjämförelse"
-
-#: diff.c:5539
-msgid "ignore changes in whitespace at EOL"
-msgstr "ignorera blanktecken vid radslut"
-
-#: diff.c:5542
-msgid "ignore carrier-return at the end of line"
-msgstr "ignorera CR-tecken vid radslut"
-
-#: diff.c:5545
-msgid "ignore changes whose lines are all blank"
-msgstr "ignorera ändringar i rader som är helt blanka"
-
-#: diff.c:5547 diff.c:5569 diff.c:5572 diff.c:5617
-msgid "<regex>"
-msgstr "<reguttr>"
-
-#: diff.c:5548
-msgid "ignore changes whose all lines match <regex>"
-msgstr "ignorera ändringar där samtliga rader motsvarar <reguttr>"
-
-#: diff.c:5551
-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:5554
-msgid "generate diff using the \"patience diff\" algorithm"
-msgstr "skapa diffar med algoritmen \"patience diff\""
-
-#: diff.c:5558
-msgid "generate diff using the \"histogram diff\" algorithm"
-msgstr "skapa diffar med algoritmen \"histogram diff\""
-
-#: diff.c:5560
-msgid "<algorithm>"
-msgstr "<algoritm>"
-
-#: diff.c:5561
-msgid "choose a diff algorithm"
-msgstr "välj en diff-algoritm"
-
-#: diff.c:5563
-msgid "<text>"
-msgstr "<text>"
-
-#: diff.c:5564
-msgid "generate diff using the \"anchored diff\" algorithm"
-msgstr "skapa diffar med algoritmen \"anchored diff\""
-
-#: diff.c:5566 diff.c:5575 diff.c:5578
-msgid "<mode>"
-msgstr "<läge>"
-
-#: diff.c:5567
-msgid "show word diff, using <mode> to delimit changed words"
-msgstr "visa orddiff, där <läge> avgränsar ändrade ord"
-
-#: diff.c:5570
-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:5573
-msgid "equivalent to --word-diff=color --word-diff-regex=<regex>"
-msgstr "motsvarar --word-diff=color --word-diff-regex=<reguttr>"
-
-#: diff.c:5576
-msgid "moved lines of code are colored differently"
-msgstr "flyttade kodrader färgas på annat sätt"
-
-#: diff.c:5579
-msgid "how white spaces are ignored in --color-moved"
-msgstr "hur blanktecken ignoreras i --color-moved"
-
-#: diff.c:5582
-msgid "Other diff options"
-msgstr "Andra diff-flaggor"
-
-#: diff.c:5584
-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:5588
-msgid "treat all files as text"
-msgstr "hantera alla filer som text"
-
-#: diff.c:5590
-msgid "swap two inputs, reverse the diff"
-msgstr "växla två indatafiler, vänd diffen"
-
-#: diff.c:5592
-msgid "exit with 1 if there were differences, 0 otherwise"
-msgstr "avsluta med 1 vid ändringar, annars 0"
-
-#: diff.c:5594
-msgid "disable all output of the program"
-msgstr "slå av alla utdata från programmet"
-
-#: diff.c:5596
-msgid "allow an external diff helper to be executed"
-msgstr "tillåt köra en extern diff-hjälpare"
-
-#: diff.c:5598
-msgid "run external text conversion filters when comparing binary files"
-msgstr "kör externt textkonverteringsfiler när binärfiler jämförs"
-
-#: diff.c:5600
-msgid "<when>"
-msgstr "<när>"
-
-#: diff.c:5601
-msgid "ignore changes to submodules in the diff generation"
-msgstr "ignorera ändringar i undermoduler när diffen skapas"
-
-#: diff.c:5604
-msgid "<format>"
-msgstr "<format>"
-
-#: diff.c:5605
-msgid "specify how differences in submodules are shown"
-msgstr "ange hur ändringar i undermoduler visas"
-
-#: diff.c:5609
-msgid "hide 'git add -N' entries from the index"
-msgstr "dölj \"git add -N\"-poster från indexet"
-
-#: diff.c:5612
-msgid "treat 'git add -N' entries as real in the index"
-msgstr "tolka \"git add -N\"-poster som äkta i indexet"
-
-#: diff.c:5614
-msgid "<string>"
-msgstr "<sträng>"
-
-#: diff.c:5615
-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:5618
-msgid ""
-"look for differences that change the number of occurrences of the specified "
-"regex"
-msgstr ""
-"se efter ändringar som ändrar antalet förekomster av angivet reguljärt "
-"uttryck"
-
-#: diff.c:5621
-msgid "show all changes in the changeset with -S or -G"
-msgstr "visa alla ändringar i ändringsuppsättningen med -S eller -G"
-
-#: diff.c:5624
-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:5627
-msgid "control the order in which files appear in the output"
-msgstr "styr ordningen i vilken filer visas i utdata"
-
-#: diff.c:5628 diff.c:5631
-msgid "<path>"
-msgstr "<sökväg>"
-
-#: diff.c:5629
-msgid "show the change in the specified path first"
-msgstr "visa ändringen i angiven sökväg först"
-
-#: diff.c:5632
-msgid "skip the output to the specified path"
-msgstr "hoppa över utdata fram till angiven sökväg"
-
-#: diff.c:5634
-msgid "<object-id>"
-msgstr "<objekt-id>"
-
-#: diff.c:5635
-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:5637
-msgid "[(A|C|D|M|R|T|U|X|B)...[*]]"
-msgstr "[(A|C|D|M|R|T|U|X|B)...[*]]"
-
-#: diff.c:5638
-msgid "select files by diff type"
-msgstr "välj filter efter diff-typ"
-
-#: diff.c:5640
-msgid "<file>"
-msgstr "<fil>"
-
-#: diff.c:5641
-msgid "output to a specific file"
-msgstr "skriv utdata till en specifik fil"
-
-#: diff.c:6321
-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:6324
-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:6327
-#, c-format
-msgid ""
-"you may want to set your %s variable to at least %d and retry the command."
-msgstr ""
-"du kan sätta variabeln %s till åtminstone %d och försöka kommandot på nytt."
-
-#: diffcore-order.c:24
-#, c-format
-msgid "failed to read orderfile '%s'"
-msgstr "kunde inte läsa orderfilen \"%s\""
-
-#: diffcore-rename.c:1564
-msgid "Performing inexact rename detection"
-msgstr "Utför onöjaktig namnbytesdetektering"
-
-#: diffcore-rotate.c:29
-#, c-format
-msgid "No such path '%s' in the diff"
-msgstr "Sökvägen \"%s\" finns inte i diffen"
-
-#: dir.c:593
-#, c-format
-msgid "pathspec '%s' did not match any file(s) known to git"
-msgstr "sökvägsangivelsen \"%s\" motsvarade inte några av git kända filer"
-
-#: dir.c:733 dir.c:762 dir.c:775
-#, c-format
-msgid "unrecognized pattern: '%s'"
-msgstr "okänt mönster: %s"
-
-#: dir.c:790 dir.c:804
-#, c-format
-msgid "unrecognized negative pattern: '%s'"
-msgstr "okänt negativt mönster: %s"
-
-#: dir.c:820
-#, c-format
-msgid "your sparse-checkout file may have issues: pattern '%s' is repeated"
-msgstr ""
-"din \"sparse-checkout\"-fil kan ha problem: mönstret \"%s\" förekommer flera "
-"gånger"
-
-#: dir.c:828
-msgid "disabling cone pattern matching"
-msgstr "inaktiverar konmönstermatchning"
-
-#: dir.c:1212
-#, c-format
-msgid "cannot use %s as an exclude file"
-msgstr "kan inte använda %s som exkluderingsfil"
-
-#: dir.c:2419
-#, c-format
-msgid "could not open directory '%s'"
-msgstr "kunde inte öppna katalogen \"%s\""
-
-#: dir.c:2721
-msgid "failed to get kernel name and information"
-msgstr "misslyckades hämta kärnans namn och information"
-
-#: dir.c:2846
-msgid "untracked cache is disabled on this system or location"
-msgstr "ospårad cache är inaktiverad på systemet eller platsen"
-
-#: dir.c:3119
-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:3807
-#, c-format
-msgid "index file corrupt in repo %s"
-msgstr "indexfilen trasig i arkivet %s"
-
-#: dir.c:3854 dir.c:3859
-#, c-format
-msgid "could not create directories for %s"
-msgstr "kunde inte skapa kataloger för %s"
-
-#: dir.c:3888
-#, 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
-#, 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:179
-msgid "Filtering content"
-msgstr "Filtrerar innehåll"
-
-#: entry.c:500
-#, c-format
-msgid "could not stat file '%s'"
-msgstr "kunde inte ta status på filen \"%s\""
-
-#: environment.c:147
-#, c-format
-msgid "bad git namespace path \"%s\""
-msgstr "felaktig git-namnrymdssökväg \"%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:194
-msgid "git fetch-pack: expected shallow list"
-msgstr "git fetch-pack: förväntade grund lista"
-
-#: fetch-pack.c:197
-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:208
-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:228
-#, 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:239
-msgid "unable to write to remote"
-msgstr "kunde inte skriva till fjärren"
-
-#: fetch-pack.c:397 fetch-pack.c:1460
-#, c-format
-msgid "invalid shallow line: %s"
-msgstr "ogiltig \"shallow\"-rad: %s"
-
-#: fetch-pack.c:403 fetch-pack.c:1466
-#, c-format
-msgid "invalid unshallow line: %s"
-msgstr "ogiltig \"unshallow\"-rad: %s"
-
-#: fetch-pack.c:405 fetch-pack.c:1468
-#, c-format
-msgid "object not found: %s"
-msgstr "objektet hittades inte: %s"
-
-#: fetch-pack.c:408 fetch-pack.c:1471
-#, c-format
-msgid "error in object: %s"
-msgstr "fel i objekt: %s"
-
-#: fetch-pack.c:410 fetch-pack.c:1473
-#, c-format
-msgid "no shallow found: %s"
-msgstr "ingen \"shallow\" hittades: %s"
-
-#: fetch-pack.c:413 fetch-pack.c:1477
-#, c-format
-msgid "expected shallow/unshallow, got %s"
-msgstr "förväntade shallow/unshallow, fick %s"
-
-#: fetch-pack.c:453
-#, c-format
-msgid "got %s %d %s"
-msgstr "fick %s %d %s"
-
-#: fetch-pack.c:470
-#, c-format
-msgid "invalid commit %s"
-msgstr "ogiltig incheckning %s"
-
-#: fetch-pack.c:501
-msgid "giving up"
-msgstr "ger upp"
-
-#: fetch-pack.c:514 progress.h:25
-msgid "done"
-msgstr "klart"
-
-#: fetch-pack.c:526
-#, c-format
-msgid "got %s (%d) %s"
-msgstr "fick %s (%d) %s"
-
-#: fetch-pack.c:562
-#, c-format
-msgid "Marking %s as complete"
-msgstr "Markerar %s som komplett"
-
-#: fetch-pack.c:784
-#, c-format
-msgid "already have %s (%s)"
-msgstr "har redan %s (%s)"
-
-#: fetch-pack.c:870
-msgid "fetch-pack: unable to fork off sideband demultiplexer"
-msgstr "fetch-patch: kunde inte grena av sidbandsmultiplexare"
-
-#: fetch-pack.c:878
-msgid "protocol error: bad pack header"
-msgstr "protokollfel: felaktigt packhuvud"
-
-#: fetch-pack.c:974
-#, c-format
-msgid "fetch-pack: unable to fork off %s"
-msgstr "fetch-patch: kunde inte grena av %s"
-
-#: fetch-pack.c:980
-msgid "fetch-pack: invalid index-pack output"
-msgstr "fetch-patch: ogiltig utdata från index-pack"
-
-#: fetch-pack.c:997
-#, c-format
-msgid "%s failed"
-msgstr "%s misslyckades"
-
-#: fetch-pack.c:999
-msgid "error in sideband demultiplexer"
-msgstr "fel i sidbands-avmultiplexare"
-
-#: fetch-pack.c:1048
-#, c-format
-msgid "Server version is %.*s"
-msgstr "Serverversionen är %.*s"
-
-#: fetch-pack.c:1056 fetch-pack.c:1062 fetch-pack.c:1065 fetch-pack.c:1071
-#: fetch-pack.c:1075 fetch-pack.c:1079 fetch-pack.c:1083 fetch-pack.c:1087
-#: fetch-pack.c:1091 fetch-pack.c:1095 fetch-pack.c:1099 fetch-pack.c:1103
-#: fetch-pack.c:1109 fetch-pack.c:1115 fetch-pack.c:1120 fetch-pack.c:1125
-#, c-format
-msgid "Server supports %s"
-msgstr "Servern stöder %s"
-
-#: fetch-pack.c:1058
-msgid "Server does not support shallow clients"
-msgstr "Servern stöder inte klienter med grunda arkiv"
-
-#: fetch-pack.c:1118
-msgid "Server does not support --shallow-since"
-msgstr "Servern stöder inte --shallow-since"
-
-#: fetch-pack.c:1123
-msgid "Server does not support --shallow-exclude"
-msgstr "Servern stöder inte --shallow-exclude"
-
-#: fetch-pack.c:1127
-msgid "Server does not support --deepen"
-msgstr "Servern stöder inte --deepen"
-
-#: fetch-pack.c:1129
-msgid "Server does not support this repository's object format"
-msgstr "Servern stöder inte det här arkivets objektformat"
-
-#: fetch-pack.c:1142
-msgid "no common commits"
-msgstr "inga gemensamma incheckningar"
-
-#: fetch-pack.c:1151 fetch-pack.c:1506 builtin/clone.c:1166
-msgid "source repository is shallow, reject to clone."
-msgstr "källarkivet är grunt, tillåter inte kloning."
-
-#: fetch-pack.c:1157 fetch-pack.c:1705
-msgid "git fetch-pack: fetch failed."
-msgstr "git fetch-pack: hämtning misslyckades."
-
-#: fetch-pack.c:1271
-#, c-format
-msgid "mismatched algorithms: client %s; server %s"
-msgstr "omaka algoritmer: klient %s; server %s"
-
-#: fetch-pack.c:1275
-#, c-format
-msgid "the server does not support algorithm '%s'"
-msgstr "servern stöder inte algoritmen \"%s\""
-
-#: fetch-pack.c:1308
-msgid "Server does not support shallow requests"
-msgstr "Servern stöder inte grunda förfrågningar"
-
-#: fetch-pack.c:1315
-msgid "Server supports filter"
-msgstr "Servern stöder filter"
-
-#: fetch-pack.c:1358 fetch-pack.c:2087
-msgid "unable to write request to remote"
-msgstr "kunde inte skriva anrop till fjärren"
-
-#: fetch-pack.c:1376
-#, c-format
-msgid "error reading section header '%s'"
-msgstr "fel vid läsning av styckehuvudet \"%s\""
-
-#: fetch-pack.c:1382
-#, c-format
-msgid "expected '%s', received '%s'"
-msgstr "förväntade \"%s\", tog emot \"%s\""
-
-#: fetch-pack.c:1416
-#, c-format
-msgid "unexpected acknowledgment line: '%s'"
-msgstr "oväntad bekräftelserad: \"%s\""
-
-#: fetch-pack.c:1421
-#, c-format
-msgid "error processing acks: %d"
-msgstr "fel vid hantering av bekräftelser: %d"
-
-#. TRANSLATORS: The parameter will be 'ready', a protocol
-#. keyword.
-#.
-#: fetch-pack.c:1435
-#, c-format
-msgid "expected packfile to be sent after '%s'"
-msgstr "väntade att paketfil skulle sändas efter \"%s\""
-
-#. TRANSLATORS: The parameter will be 'ready', a protocol
-#. keyword.
-#.
-#: fetch-pack.c:1441
-#, c-format
-msgid "expected no other sections to be sent after no '%s'"
-msgstr ""
-"väntade inte att några ytterligare sektioner skulle sändas efter \"%s\""
-
-#: fetch-pack.c:1482
-#, c-format
-msgid "error processing shallow info: %d"
-msgstr "fel vid hantering av grund (\"shallow\") info: %d"
-
-#: fetch-pack.c:1531
-#, c-format
-msgid "expected wanted-ref, got '%s'"
-msgstr "förväntade wanted-ref, fick %s"
-
-#: fetch-pack.c:1536
-#, c-format
-msgid "unexpected wanted-ref: '%s'"
-msgstr "oväntad wanted-ref: \"%s\""
-
-#: fetch-pack.c:1541
-#, c-format
-msgid "error processing wanted refs: %d"
-msgstr "fel vid hantering av önskade referenser: %d"
-
-#: fetch-pack.c:1571
-msgid "git fetch-pack: expected response end packet"
-msgstr "git fetch-pack: förväntade svarsavslutningspaket"
-
-#: fetch-pack.c:1983
-msgid "no matching remote head"
-msgstr "inget motsvarande fjärrhuvud"
-
-#: fetch-pack.c:2006 builtin/clone.c:587
-msgid "remote did not send all necessary objects"
-msgstr "fjärren sände inte alla nödvändiga objekt"
-
-#: fetch-pack.c:2109
-msgid "unexpected 'ready' from remote"
-msgstr "oväntat \"ready\" från fjärr"
-
-#: fetch-pack.c:2132
-#, c-format
-msgid "no such remote ref %s"
-msgstr "ingen sådan fjärreferens: %s"
-
-#: fetch-pack.c:2135
-#, 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"
-
-#: fsmonitor-ipc.c:119
-#, c-format
-msgid "fsmonitor_ipc__send_query: invalid path '%s'"
-msgstr "fsmonitor_ipc__send_query: ogilitg sökväg \"%s\""
-
-#: fsmonitor-ipc.c:125
-#, c-format
-msgid "fsmonitor_ipc__send_query: unspecified error on '%s'"
-msgstr "fsmonitor_ipc__send_query: ospecificerat fel på \"%s\""
-
-#: fsmonitor-ipc.c:155
-msgid "fsmonitor--daemon is not running"
-msgstr "fsmonitor--daemon kör inte"
-
-#: fsmonitor-ipc.c:164
-#, c-format
-msgid "could not send '%s' command to fsmonitor--daemon"
-msgstr "kunde inte sända kommandot \"%s\" till fsmonitor--daemon"
-
-#: gpg-interface.c:329 gpg-interface.c:456 gpg-interface.c:995
-#: gpg-interface.c:1011
-msgid "could not create temporary file"
-msgstr "kunde inte skapa temporära fil"
-
-#: gpg-interface.c:332 gpg-interface.c:459
-#, c-format
-msgid "failed writing detached signature to '%s'"
-msgstr "misslyckades skriva fristående signatur till \"%s\""
-
-#: gpg-interface.c:450
-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:479
-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:550
-#, 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:638
-#, c-format
-msgid "bad/incompatible signature '%s'"
-msgstr "felaktig/inkompatibel signatur \"%s\""
-
-#: gpg-interface.c:815 gpg-interface.c:820
-#, 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:843
-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:865
-#, 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:871
-#, c-format
-msgid "gpg.ssh.defaultKeyCommand failed: %s %s"
-msgstr "gpg.ssh.defaultKeyCommand misslyckades: %s %s"
-
-#: gpg-interface.c:966
-msgid "gpg failed to sign the data"
-msgstr "gpg misslyckades signera data"
-
-#: gpg-interface.c:988
-msgid "user.signingkey needs to be set for ssh signing"
-msgstr "user.signingkey måste anges för ssh-signering"
-
-#: gpg-interface.c:999
-#, c-format
-msgid "failed writing ssh signing key to '%s'"
-msgstr "misslyckades skriva ssh-signeringsnyckel till \"%s\""
-
-#: gpg-interface.c:1017
-#, c-format
-msgid "failed writing ssh signing key buffer to '%s'"
-msgstr "misslyckades skriva ssh-signeringsnyckelbuffert till \"%s\""
-
-#: gpg-interface.c:1035
-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:1047
-#, 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:446
-msgid ""
-"given pattern contains NULL byte (via -f <file>). This is only supported "
-"with -P under PCRE v2"
-msgstr ""
-"angivet mönster innehåller NULL-byte (via -f <fil>). Detta stöds endast med -"
-"P under PCRE v2"
-
-#: grep.c:1859
-#, c-format
-msgid "'%s': unable to read %s"
-msgstr "\"%s\" kunde inte läsa %s"
-
-#: grep.c:1876 setup.c:178 builtin/clone.c:308 builtin/diff.c:90
-#: builtin/rm.c:136
-#, c-format
-msgid "failed to stat '%s'"
-msgstr "misslyckades ta status på \"%s\""
-
-#: grep.c:1887
-#, c-format
-msgid "'%s': short read"
-msgstr "\"%s\": kort läsning"
-
-#: help.c:25
-msgid "start a working area (see also: git help tutorial)"
-msgstr "starta arbetskatalog (se också: git help tutorial)"
-
-#: help.c:26
-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:27
-msgid "examine the history and state (see also: git help revisions)"
-msgstr "utforska historiken och tillståndet (se också: git help revisions)"
-
-#: help.c:28
-msgid "grow, mark and tweak your common history"
-msgstr "utöka, markera och justera din gemensamma historik"
-
-#: help.c:29
-msgid "collaborate (see also: git help workflows)"
-msgstr "samarbeta (se också: git help workflows)"
-
-#: help.c:33
-msgid "Main Porcelain Commands"
-msgstr "Huvudsakliga porslinskommandon"
-
-#: help.c:34
-msgid "Ancillary Commands / Manipulators"
-msgstr "Tilläggskommandon / manipulerare"
-
-#: help.c:35
-msgid "Ancillary Commands / Interrogators"
-msgstr "Tilläggskommandon / frågare"
-
-#: help.c:36
-msgid "Interacting with Others"
-msgstr "Interaktion med andra"
-
-#: help.c:37
-msgid "Low-level Commands / Manipulators"
-msgstr "Lågnivåkommandon / maniupulerare"
-
-#: help.c:38
-msgid "Low-level Commands / Interrogators"
-msgstr "Lågnivåkommandon / frågare"
-
-#: help.c:39
-msgid "Low-level Commands / Syncing Repositories"
-msgstr "Lågnivåkommandon / synka arkiv"
-
-#: help.c:40
-msgid "Low-level Commands / Internal Helpers"
-msgstr "Lågnivåkommandon / interna hjälpare"
-
-#: help.c:316
-#, c-format
-msgid "available git commands in '%s'"
-msgstr "git-kommandon tillgängliga i \"%s\""
-
-#: help.c:323
-msgid "git commands available from elsewhere on your $PATH"
-msgstr "git-kommandon från andra platser i din $PATH"
-
-#: help.c:332
-msgid "These are common Git commands used in various situations:"
-msgstr "Dessa vanliga Git-kommandon används i olika situationer:"
-
-#: help.c:382 git.c:100
-#, c-format
-msgid "unsupported command listing type '%s'"
-msgstr "okänd kommandolisttyp \"%s\""
-
-#: help.c:422
-msgid "The Git concept guides are:"
-msgstr "Vägledningar för Git-koncept:"
-
-#: help.c:446
-msgid "External commands"
-msgstr "Externa kommandon"
-
-#: help.c:468
-msgid "Command aliases"
-msgstr "Kommadoalias"
-
-#: help.c:486
-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:563
-#, c-format
-msgid ""
-"'%s' appears to be a git command, but we were not\n"
-"able to execute it. Maybe git-%s is broken?"
-msgstr ""
-"\"%s\" verkar vara ett git-kommando, men vi kan inte\n"
-"köra det. Kanske git-%s är trasigt?"
-
-#: help.c:585 help.c:682
-#, 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:633
-msgid "Uh oh. Your system reports no Git commands at all."
-msgstr "Oj då. Ditt system rapporterar inga Git-kommandon alls."
-
-#: help.c:655
-#, 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:660
-#, c-format
-msgid "Continuing under the assumption that you meant '%s'."
-msgstr "Fortsätter under förutsättningen att du menade \"%s\"."
-
-#: help.c:666
-#, c-format
-msgid "Run '%s' instead [y/N]? "
-msgstr "Köra \"%s\" istället (j/N)?"
-
-#: help.c:674
-#, 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:686
-msgid ""
-"\n"
-"The most similar command is"
-msgid_plural ""
-"\n"
-"The most similar commands are"
-msgstr[0] ""
-"\n"
-"Mest likt kommando är"
-msgstr[1] ""
-"\n"
-"Mest lika kommandon är"
-
-#: help.c:729
-msgid "git version [<options>]"
-msgstr "git version [<flaggor>]"
-
-#: help.c:784
-#, c-format
-msgid "%s: %s - %s"
-msgstr "%s: %s - %s"
-
-#: help.c:788
-msgid ""
-"\n"
-"Did you mean this?"
-msgid_plural ""
-"\n"
-"Did you mean one of these?"
-msgstr[0] ""
-"\n"
-"Menade du detta?"
-msgstr[1] ""
-"\n"
-"Menade du ett av dessa?"
-
-#: hook.c:28
-#, 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\"."
-
-#: hook.c:87
-#, c-format
-msgid "Couldn't start hook '%s'\n"
-msgstr "Kunde inte starta kroken \"%s\"\n"
-
-#: ident.c:354
-msgid "Author identity unknown\n"
-msgstr "Författar-identitet okänd\n"
-
-#: ident.c:357
-msgid "Committer identity unknown\n"
-msgstr "Incheckar-identitet okänd\n"
-
-#: ident.c:363
-msgid ""
-"\n"
-"*** Please tell me who you are.\n"
-"\n"
-"Run\n"
-"\n"
-"  git config --global user.email \"you@example.com\"\n"
-"  git config --global user.name \"Your Name\"\n"
-"\n"
-"to set your account's default identity.\n"
-"Omit --global to set the identity only in this repository.\n"
-"\n"
-msgstr ""
-"\n"
-"*** Vänligen berätta vem du är.\n"
-"\n"
-"Kör\n"
-"\n"
-"  git config --global user.email \"du@example.com\"\n"
-"  git config --global user.name \"Ditt Namn\"\n"
-"\n"
-"för att ställa in ditt kontos standardidentitet.\n"
-"Kör utan --global för att endast ändra i aktuellt arkiv.\n"
-"\n"
-
-#: ident.c:398
-msgid "no email was given and auto-detection is disabled"
-msgstr "ingen e-post angavs och autodetektering är inaktiverad"
-
-#: ident.c:403
-#, c-format
-msgid "unable to auto-detect email address (got '%s')"
-msgstr "kunde inte autodetektera e-postadress (fick \"%s\")"
-
-#: ident.c:420
-msgid "no name was given and auto-detection is disabled"
-msgstr "inget namn angavs och autodetektering är inaktiverad"
-
-#: ident.c:426
-#, c-format
-msgid "unable to auto-detect name (got '%s')"
-msgstr "kunde inte autodetektera namn (fick \"%s\")"
-
-#: ident.c:434
-#, c-format
-msgid "empty ident name (for <%s>) not allowed"
-msgstr "tomt ident-namn (för <%s>) ej tillåtet"
-
-#: ident.c:440
-#, c-format
-msgid "name consists only of disallowed characters: %s"
-msgstr "namnet består enbart av ej tillåtna tecken: %s"
-
-#: ident.c:455 builtin/commit.c:649
-#, c-format
-msgid "invalid date format: %s"
-msgstr "felaktigt datumformat: %s"
-
-#: list-objects-filter-options.c:68
-msgid "expected 'tree:<depth>'"
-msgstr "förväntade \"tree:<djup>\""
-
-#: list-objects-filter-options.c:83
-msgid "sparse:path filters support has been dropped"
-msgstr "sparse:sökväg-filter stöds inte längre"
-
-#: list-objects-filter-options.c:90
-#, c-format
-msgid "'%s' for 'object:type=<type>' is not a valid object type"
-msgstr "\"%s\" för \"object:type=<typ>\" är inte en giltig objekttyp"
-
-#: list-objects-filter-options.c:109
-#, c-format
-msgid "invalid filter-spec '%s'"
-msgstr "felaktig filterspecifikation: \"%s\""
-
-#: list-objects-filter-options.c:125
-#, c-format
-msgid "must escape char in sub-filter-spec: '%c'"
-msgstr "måste använda specialsekvens i delfilter-spec: \"%c\""
-
-#: list-objects-filter-options.c:167
-msgid "expected something after combine:"
-msgstr "förväntade någonting efter combine:"
-
-#: list-objects-filter-options.c:249
-msgid "multiple filter-specs cannot be combined"
-msgstr "flera filterspecifikationer kan inte kombineras"
-
-#: list-objects-filter-options.c:365
-msgid "unable to upgrade repository format to support partial clone"
-msgstr "kunde inte uppgradera arkivformat till att stöda delvis klon"
-
-#: list-objects-filter.c:532
-#, c-format
-msgid "unable to access sparse blob in '%s'"
-msgstr "kunde inte nå gles blob på \"%s\""
-
-#: list-objects-filter.c:535
-#, c-format
-msgid "unable to parse sparse filter data in %s"
-msgstr "kunde inte tolka gles filterdata i %s"
-
-#: list-objects.c:144
-#, c-format
-msgid "entry '%s' in tree %s has tree mode, but is not a tree"
-msgstr "posten \"%s\" i trädet %s har träd-läge, men är inte ett träd"
-
-#: list-objects.c:157
-#, c-format
-msgid "entry '%s' in tree %s has blob mode, but is not a blob"
-msgstr "posten \"%s\" i trädet %s har blob-läge, men är inte en blob"
-
-#: list-objects.c:415
-#, c-format
-msgid "unable to load root tree for commit %s"
-msgstr "kunde inte läsa in rot-trädet för incheckningen %s"
-
-#: lockfile.c:152
-#, c-format
-msgid ""
-"Unable to create '%s.lock': %s.\n"
-"\n"
-"Another git process seems to be running in this repository, e.g.\n"
-"an editor opened by 'git commit'. Please make sure all processes\n"
-"are terminated then try again. If it still fails, a git process\n"
-"may have crashed in this repository earlier:\n"
-"remove the file manually to continue."
-msgstr ""
-"Kunde inte skapa \"%s.lock\": %s.\n"
-"\n"
-"Det verkar som en annan git-process kör i det här arkivet, t.ex.\n"
-"ett textredigeringsprogram startat av \"git commit\". Se till att\n"
-"alla processer avslutats och försök sedan igen. Om det fortfarande\n"
-"misslyckas kanske en git-process har kraschat i det här arkivet\n"
-"tidigare:\n"
-"ta bort filen manuellt för att fortsätta."
-
-#: lockfile.c:160
-#, c-format
-msgid "Unable to create '%s.lock': %s"
-msgstr "Kunde inte skapa \"%s.lock\": %s"
-
-#: ls-refs.c:175
-#, c-format
-msgid "unexpected line: '%s'"
-msgstr "oväntad rad: \"%s\""
-
-#: ls-refs.c:179
-msgid "expected flush after ls-refs arguments"
-msgstr "förväntade \"flush\" efter ls-refs-argument"
-
-#: mailinfo.c:1050
-msgid "quoted CRLF detected"
-msgstr "citerad CRLF upptäcktes"
-
-#: mailinfo.c:1254 builtin/am.c:185 builtin/mailinfo.c:46
-#, c-format
-msgid "bad action '%s' for '%s'"
-msgstr "felaktig funktion \"%s\" för \"%s\""
-
-#: merge-ort.c:1630 merge-recursive.c:1214
-#, c-format
-msgid "Failed to merge submodule %s (not checked out)"
-msgstr "Misslyckades slå ihop undermodulen %s (ej utcheckad)"
-
-#: merge-ort.c:1639 merge-recursive.c:1221
-#, c-format
-msgid "Failed to merge submodule %s (commits not present)"
-msgstr "Misslyckades slå ihop undermodulen %s (incheckningar saknas)"
-
-#: merge-ort.c:1648 merge-recursive.c:1228
-#, 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:1658 merge-ort.c:1666
-#, c-format
-msgid "Note: Fast-forwarding submodule %s to %s"
-msgstr "Obs: Snabbspolar undermodulen %s till %s"
-
-#: merge-ort.c:1688
-#, c-format
-msgid "Failed to merge submodule %s"
-msgstr "Misslyckades slå ihop undermodulen %s"
-
-#: merge-ort.c:1695
-#, c-format
-msgid ""
-"Failed to merge submodule %s, but a possible merge resolution exists:\n"
-"%s\n"
-msgstr ""
-"Misslyckades slå ihop undermodulen %s, men en möjlig lösning finns:\n"
-"%s\n"
-
-#: merge-ort.c:1699 merge-recursive.c:1284
-#, c-format
-msgid ""
-"If this is correct simply add it to the index for example\n"
-"by using:\n"
-"\n"
-"  git update-index --cacheinfo 160000 %s \"%s\"\n"
-"\n"
-"which will accept this suggestion.\n"
-msgstr ""
-"Om detta är riktigt lägger du bara till det i indexet, till\n"
-"exempel så här:\n"
-"\n"
-"  git update-index --cacheinfo 160000 %s \"%s\"\n"
-"\n"
-"vilket godtar lösningen.\n"
-
-#: merge-ort.c:1712
-#, c-format
-msgid ""
-"Failed to merge submodule %s, but multiple possible merges exist:\n"
-"%s"
-msgstr ""
-"Misslyckades slå ihop undermodulen %s, men flera möjliga sammanslagningar "
-"finns:\n"
-"%s"
-
-#: merge-ort.c:1937 merge-recursive.c:1375
-msgid "Failed to execute internal merge"
-msgstr "Misslyckades exekvera intern sammanslagning"
-
-#: merge-ort.c:1942 merge-recursive.c:1380
-#, c-format
-msgid "Unable to add %s to database"
-msgstr "Kunde inte lägga till %s till databasen"
-
-#: merge-ort.c:1949 merge-recursive.c:1413
-#, c-format
-msgid "Auto-merging %s"
-msgstr "Slår ihop %s automatiskt"
-
-#: merge-ort.c:2088 merge-recursive.c:2135
-#, 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 ""
-"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:2098 merge-recursive.c:2145
-#, 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 ""
-"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:2156
-#, c-format
-msgid ""
-"CONFLICT (directory rename split): Unclear where to rename %s to; it was "
-"renamed to multiple other directories, with no destination getting a "
-"majority of the files."
-msgstr ""
-"KONFLIKT (namnändrad delad katalog): Osäker på var %s ska namnbytas till; "
-"den har namnbytts till flera andra kataloger, utan att någon destination "
-"fick en majoritet av filerna."
-
-#: merge-ort.c:2310 merge-recursive.c:2481
-#, c-format
-msgid ""
-"WARNING: Avoiding applying %s -> %s rename to %s, because %s itself was "
-"renamed."
-msgstr ""
-"VARNING: Undviker att applicera namnändring %s -> %s på %s, då %s själv har "
-"bytt namn."
-
-#: merge-ort.c:2450 merge-recursive.c:3264
-#, c-format
-msgid ""
-"Path updated: %s added in %s inside a directory that was renamed in %s; "
-"moving it to %s."
-msgstr ""
-"Uppdaterad sökväg: %s lade till %s inuti en katalog som bytte namn i %s; "
-"flyttar den till %s."
-
-#: merge-ort.c:2457 merge-recursive.c:3271
-#, c-format
-msgid ""
-"Path updated: %s renamed to %s in %s, inside a directory that was renamed in "
-"%s; moving it to %s."
-msgstr ""
-"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:2470 merge-recursive.c:3267
-#, 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 ""
-"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:2478 merge-recursive.c:3274
-#, 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 ""
-"KONFLIKT (filplacering): %s bytte namn till %s i %s, inuti en katalog som "
-"bytte namn i %s; flyttar den till %s."
-
-#: merge-ort.c:2634
-#, 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:2729
-#, 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."
-msgstr ""
-"KONFLIKT (namnbyte involverad i krock): namnbyte av %s -> %s har "
-"innehållskonflikter OCH krockar med en annan sökväg; detta kan leda till "
-"nästlade konfliktmarkörer."
-
-#: merge-ort.c:2748 merge-ort.c:2772
-#, 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:3261 merge-recursive.c:3025
-#, c-format
-msgid "cannot read object %s"
-msgstr "kan inte läsa objektet %s"
-
-#: merge-ort.c:3264 merge-recursive.c:3028
-#, c-format
-msgid "object %s is not a blob"
-msgstr "objektet %s är inte en blob"
-
-#: merge-ort.c:3693
-#, c-format
-msgid ""
-"CONFLICT (file/directory): directory in the way of %s from %s; moving it to "
-"%s instead."
-msgstr ""
-"KONFLIKT (fil/katalog): katalogen är i vägen för %s från %s; flyttar den "
-"till %s istället."
-
-#: merge-ort.c:3770
-#, c-format
-msgid ""
-"CONFLICT (distinct types): %s had different types on each side; renamed both "
-"of them so each can be recorded somewhere."
-msgstr ""
-"KONFLIKT (olika typer): %s hade olika typer på varje sida; namnbytte bägge "
-"så att de kan protokollföras någonstans."
-
-#: merge-ort.c:3777
-#, 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 (olika typer): %s hade olika typer på varje sida; namnbytte den ena "
-"så att de kan protokollföras någonstans."
-
-#: merge-ort.c:3866 merge-recursive.c:3104
-msgid "content"
-msgstr "innehåll"
-
-#: merge-ort.c:3868 merge-recursive.c:3108
-msgid "add/add"
-msgstr "tillägg/tillägg"
-
-#: merge-ort.c:3870 merge-recursive.c:3153
-msgid "submodule"
-msgstr "undermodul"
-
-#: merge-ort.c:3872 merge-recursive.c:3154
-#, c-format
-msgid "CONFLICT (%s): Merge conflict in %s"
-msgstr "KONFLIKT (%s): Sammanslagningskonflikt i %s"
-
-#: merge-ort.c:3916
-#, c-format
-msgid ""
-"CONFLICT (modify/delete): %s deleted in %s and modified in %s.  Version %s "
-"of %s left in tree."
-msgstr ""
-"KONFLIKT (ändra/radera): %s raderad i %s och ändrad i %s. Versionen %s av %s "
-"lämnad i trädet."
-
-#: merge-ort.c:4212
-#, c-format
-msgid ""
-"Note: %s not up to date and in way of checking out conflicted version; old "
-"copy renamed to %s"
-msgstr ""
-"Observera: %s är inte à jour och i vägen för att checka ut version i "
-"konflikt; gammal upplaga har nytt namn %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:4586
-#, 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:3723
-#, c-format
-msgid ""
-"Your local changes to the following files would be overwritten by merge:\n"
-"  %s"
-msgstr ""
-"Dina lokala ändringar av följande filer skulle skrivas över av "
-"sammanslagning:\n"
-"  %s"
-
-#: merge-ort-wrappers.c:33 merge-recursive.c:3485 builtin/merge.c:405
-msgid "Already up to date."
-msgstr "Redan à jour."
-
-#: merge-recursive.c:353
-msgid "(bad commit)\n"
-msgstr "(felaktig incheckning)\n"
-
-#: 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: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:881
-#, c-format
-msgid "failed to create path '%s'%s"
-msgstr "misslyckades skapa sökvägen \"%s\"%s"
-
-#: 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:906 merge-recursive.c:925
-msgid ": perhaps a D/F conflict?"
-msgstr ": kanske en K/F-konflikt?"
-
-#: 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:956 builtin/cat-file.c:47
-#, c-format
-msgid "cannot read object %s '%s'"
-msgstr "kan inte läsa objektet %s: \"%s\""
-
-#: merge-recursive.c:961
-#, c-format
-msgid "blob expected for %s '%s'"
-msgstr "blob förväntades för %s \"%s\""
-
-#: merge-recursive.c:986
-#, c-format
-msgid "failed to open '%s': %s"
-msgstr "misslyckades öppna \"%s\": %s"
-
-#: merge-recursive.c:997
-#, c-format
-msgid "failed to symlink '%s': %s"
-msgstr "misslyckades skapa symboliska länken \"%s\": %s"
-
-#: 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:1236 merge-recursive.c:1249
-#, c-format
-msgid "Fast-forwarding submodule %s to the following commit:"
-msgstr "Snabbspolar undermodulen %s till följande incheckning:"
-
-#: merge-recursive.c:1239 merge-recursive.c:1252
-#, c-format
-msgid "Fast-forwarding submodule %s"
-msgstr "Snabbspolar undermodulen %s"
-
-#: merge-recursive.c:1276
-#, 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:1280
-#, c-format
-msgid "Failed to merge submodule %s (not fast-forward)"
-msgstr "Misslyckades slå ihop undermodulen %s (ej snabbspolning)"
-
-#: merge-recursive.c:1281
-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:1293
-#, c-format
-msgid "Failed to merge submodule %s (multiple merges found)"
-msgstr ""
-"Misslyckades slå ihop undermodulen %s (flera sammanslagningar hittades)"
-
-#: merge-recursive.c:1437
-#, 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:1509
-#, c-format
-msgid ""
-"CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s left "
-"in tree."
-msgstr ""
-"KONFLIKT (%s/radera): %s raderad i %s och %s i %s. Versionen %s av %s lämnad "
-"i trädet."
-
-#: merge-recursive.c:1514
-#, c-format
-msgid ""
-"CONFLICT (%s/delete): %s deleted in %s and %s to %s in %s. Version %s of %s "
-"left in tree."
-msgstr ""
-"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:1521
-#, c-format
-msgid ""
-"CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s left "
-"in tree at %s."
-msgstr ""
-"KONFLIKT (%s/radera): %s raderad i %s och %s i %s. Versionen %s av %s lämnad "
-"i trädet vid %s."
-
-#: merge-recursive.c:1526
-#, 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 ""
-"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:1561
-msgid "rename"
-msgstr "namnbyte"
-
-#: merge-recursive.c:1561
-msgid "renamed"
-msgstr "namnbytt"
-
-#: merge-recursive.c:1612 merge-recursive.c:2518 merge-recursive.c:3181
-#, c-format
-msgid "Refusing to lose dirty file at %s"
-msgstr "Vägrar förlora lortig fil vid \"%s\""
-
-#: merge-recursive.c:1622
-#, 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:1680
-#, 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:1711
-#, 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:1716
-#, 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:1743
-#, c-format
-msgid ""
-"CONFLICT (rename/rename): Rename \"%s\"->\"%s\" in branch \"%s\" rename \"%s"
-"\"->\"%s\" in \"%s\"%s"
-msgstr ""
-"KONFLIKT (namnbyte/namnbyte): Namnbyte \"%s\"->\"%s\" på grenen \"%s\" "
-"namnbyte \"%s\"->\"%s\" i \"%s\"%s"
-
-#: merge-recursive.c:1748
-msgid " (left unresolved)"
-msgstr " (lämnad olöst)"
-
-#: merge-recursive.c:1840
-#, 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:2103
-#, c-format
-msgid ""
-"CONFLICT (directory rename split): Unclear where to place %s because "
-"directory %s was renamed to multiple other directories, with no destination "
-"getting a majority of the files."
-msgstr ""
-"KONFLIKT (namnändrad delad katalog): Osäker på var %s ska placeras då "
-"katalogen %s bytte namn till flera andra kataloger, utan att någon "
-"destination fick en majoritet av filerna."
-
-#: merge-recursive.c:2237
-#, c-format
-msgid ""
-"CONFLICT (rename/rename): Rename directory %s->%s in %s. Rename directory %s-"
-">%s in %s"
-msgstr ""
-"KONFLIKT (namnbyte/namnbyte): Namnbytt katalog %s->%s i %s. Namnbytt katalog "
-"%s->%s i %s"
-
-#: merge-recursive.c:3092
-msgid "modify"
-msgstr "ändra"
-
-#: merge-recursive.c:3092
-msgid "modified"
-msgstr "ändrad"
-
-#: merge-recursive.c:3131
-#, c-format
-msgid "Skipped %s (merged same as existing)"
-msgstr "Hoppade över %s (sammanslagen samma som befintlig)"
-
-#: merge-recursive.c:3184
-#, c-format
-msgid "Adding as %s instead"
-msgstr "Lägger till som %s istället"
-
-#: merge-recursive.c:3388
-#, c-format
-msgid "Removing %s"
-msgstr "Tar bort %s"
-
-#: merge-recursive.c:3411
-msgid "file/directory"
-msgstr "fil/katalog"
-
-#: merge-recursive.c:3416
-msgid "directory/file"
-msgstr "katalog/fil"
-
-#: merge-recursive.c:3423
-#, 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:3432
-#, c-format
-msgid "Adding %s"
-msgstr "Lägger till %s"
-
-#: merge-recursive.c:3441
-#, c-format
-msgid "CONFLICT (add/add): Merge conflict in %s"
-msgstr "KONFLIKT (tillägg/tillägg): Sammanslagningskonflikt i %s"
-
-#: merge-recursive.c:3494
-#, c-format
-msgid "merging of trees %s and %s failed"
-msgstr "sammanslagning av träden %s och %s misslyckades"
-
-#: merge-recursive.c:3588
-msgid "Merging:"
-msgstr "Slår ihop:"
-
-#: merge-recursive.c:3601
-#, 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:3651
-msgid "merge returned no commit"
-msgstr "sammanslagningen returnerade ingen incheckning"
-
-#: merge-recursive.c:3823
-#, c-format
-msgid "Could not parse object '%s'"
-msgstr "Kunde inte tolka objektet \"%s\""
-
-#: merge-recursive.c:3841 builtin/merge.c:720 builtin/merge.c:912
-#: builtin/stash.c:489
-msgid "Unable to write index."
-msgstr "Kunde inte skriva indexet."
-
-#: merge.c:41
-msgid "failed to read the cache"
-msgstr "misslyckades läsa cachen"
-
-#: merge.c:102 rerere.c:705 builtin/am.c:1989 builtin/am.c:2023
-#: builtin/checkout.c:603 builtin/checkout.c:865 builtin/clone.c:714
-#: builtin/stash.c:269
-msgid "unable to write new index file"
-msgstr "kunde inte skriva ny indexfil"
-
-#: midx.c:79
-msgid "multi-pack-index OID fanout is of the wrong size"
-msgstr "multi-pack-indexets OID-utbredning har fel storlek"
-
-#: midx.c:112
-#, c-format
-msgid "multi-pack-index file %s is too small"
-msgstr "multi-pack-indexfilen %s är för liten"
-
-#: midx.c:128
-#, 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:133
-#, c-format
-msgid "multi-pack-index version %d not recognized"
-msgstr "multi-pack-indexversionen %d stöds inte"
-
-#: midx.c:138
-#, 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:155
-msgid "multi-pack-index missing required pack-name chunk"
-msgstr "multi-pack-index saknar krävd paketnamn-stycke"
-
-#: midx.c:157
-msgid "multi-pack-index missing required OID fanout chunk"
-msgstr "multi-pack-index saknar krävt OID-utbredningsstycke"
-
-#: midx.c:159
-msgid "multi-pack-index missing required OID lookup chunk"
-msgstr "multi-pack-index saknar krävt OID-uppslagnignsstycke"
-
-#: midx.c:161
-msgid "multi-pack-index missing required object offsets chunk"
-msgstr "multi-pack-index saknar krävt objekt-offsetstycke"
-
-#: midx.c:180
-#, 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:228
-#, c-format
-msgid "bad pack-int-id: %u (%u total packs)"
-msgstr "bad pack-int-id: %u (%u paket totalt)"
-
-#: midx.c:278
-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:509
-#, c-format
-msgid "failed to add packfile '%s'"
-msgstr "misslyckades läsa paketfilen \"%s\""
-
-#: midx.c:515
-#, c-format
-msgid "failed to open pack-index '%s'"
-msgstr "misslyckades öppna paketindexet \"%s\""
-
-#: midx.c:583
-#, c-format
-msgid "failed to locate object %d in packfile"
-msgstr "misslyckades hitta objekt %d i paketfilen"
-
-#: midx.c:911
-msgid "cannot store reverse index file"
-msgstr "kan inte spara reverse-index-fil"
-
-#: midx.c:1009
-#, c-format
-msgid "could not parse line: %s"
-msgstr "kunde inte tolka rad: %s"
-
-#: midx.c:1011
-#, c-format
-msgid "malformed line: %s"
-msgstr "felaktig rad: %s"
-
-#: midx.c:1181
-msgid "ignoring existing multi-pack-index; checksum mismatch"
-msgstr "ignorerar befintlig multi-pack-index; felaktig kontrollsumma"
-
-#: midx.c:1206
-msgid "could not load pack"
-msgstr "kunde inte läsa paket{"
-
-#: midx.c:1212
-#, c-format
-msgid "could not open index for %s"
-msgstr "kunde inte öppna indexet för %s"
-
-#: midx.c:1223
-msgid "Adding packfiles to multi-pack-index"
-msgstr "Lägger till paketfiler till multi-pack-index"
-
-#: midx.c:1266
-#, c-format
-msgid "unknown preferred pack: '%s'"
-msgstr "okänt föredraget paket: %s"
-
-#: midx.c:1311
-#, 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:1343
-#, c-format
-msgid "did not see pack-file %s to drop"
-msgstr "såg inte paketfilen %s som skulle kastas"
-
-#: midx.c:1389
-#, c-format
-msgid "preferred pack '%s' is expired"
-msgstr "föredraget paket \"%s\" har löpt ut"
-
-#: midx.c:1402
-msgid "no pack files to index."
-msgstr "inga paketfiler att indexera."
-
-#: midx.c:1409
-msgid "refusing to write multi-pack .bitmap without any objects"
-msgstr "kunde inte skriva fler-paketsbitkarta utan några objekt"
-
-#: midx.c:1451
-msgid "could not write multi-pack bitmap"
-msgstr "kunde inte skriva fler-paketsbitkarta"
-
-#: midx.c:1461
-msgid "could not write multi-pack-index"
-msgstr "kunde inte skriva flerpakets-index"
-
-#: midx.c:1520 builtin/clean.c:37
-#, c-format
-msgid "failed to remove %s"
-msgstr "misslyckades ta bort %s"
-
-#: midx.c:1553
-#, c-format
-msgid "failed to clear multi-pack-index at %s"
-msgstr "misslyckades städa multi-pack-index på %s"
-
-#: midx.c:1616
-msgid "multi-pack-index file exists, but failed to parse"
-msgstr "multi-pack-indexfilen finns, men kunde inte tolkas"
-
-#: midx.c:1624
-msgid "incorrect checksum"
-msgstr "felaktig kontrollsumma"
-
-#: midx.c:1627
-msgid "Looking for referenced packfiles"
-msgstr "Ser efter refererade packfiler"
-
-#: midx.c:1642
-#, 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:1647
-msgid "the midx contains no oid"
-msgstr "midx saknar oid"
-
-#: midx.c:1656
-msgid "Verifying OID order in multi-pack-index"
-msgstr "Bekräftar OID-ordning i multi-pack-index"
-
-#: midx.c:1665
-#, 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:1685
-msgid "Sorting objects by packfile"
-msgstr "Sorterar objekt efter packfil"
-
-#: midx.c:1692
-msgid "Verifying object offsets"
-msgstr "Bekräftar offset för objekt"
-
-#: midx.c:1708
-#, c-format
-msgid "failed to load pack entry for oid[%d] = %s"
-msgstr "misslyckades läsa paketpost för oid[%d] = %s"
-
-#: midx.c:1714
-#, c-format
-msgid "failed to load pack-index for packfile %s"
-msgstr "misslyckades läsa paketindex för paketfil %s"
-
-#: midx.c:1723
-#, 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:1750
-msgid "Counting referenced objects"
-msgstr "Räknar refererade objekt"
-
-#: midx.c:1760
-msgid "Finding and deleting unreferenced packfiles"
-msgstr "Ser efter och tar bort orefererade packfiler"
-
-#: midx.c:1952
-msgid "could not start pack-objects"
-msgstr "kunde inte starta pack-objects"
-
-#: midx.c:1972
-msgid "could not finish pack-objects"
-msgstr "kunde inte avsluta pack-objects"
-
-#: name-hash.c:542
-#, c-format
-msgid "unable to create lazy_dir thread: %s"
-msgstr "misslyckades skapa lazy_dir-tråd: %s"
-
-#: name-hash.c:564
-#, c-format
-msgid "unable to create lazy_name thread: %s"
-msgstr "misslyckades skapa lazy_name-tråd: %s"
-
-#: name-hash.c:570
-#, c-format
-msgid "unable to join lazy_name thread: %s"
-msgstr "misslyckades utföra join på lazy_name-tråd: %s"
-
-#: notes-merge.c:276
-#, 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."
-msgstr ""
-"Du har inte avslutat föregående antecknings-sammanslagning (%s finns).\n"
-"Använd \"git notes merge --commit\" eller \"git notes merge --abort\" för "
-"att checka in eller avbryta föregående sammanslagning innan du påbörjar en "
-"ny antecknings-sammanslagning."
-
-#: notes-merge.c:283
-#, c-format
-msgid "You have not concluded your notes merge (%s exists)."
-msgstr "Du har inte avslutat antecknings-sammanslagningen (%s finns)."
-
-#: notes-utils.c:46
-msgid "Cannot commit uninitialized/unreferenced notes tree"
-msgstr "Kan inte checka in oinitierat/orefererat anteckningsträd"
-
-#: notes-utils.c:105
-#, c-format
-msgid "Bad notes.rewriteMode value: '%s'"
-msgstr "Felaktigt värde för notes.rewriteMode: '%s'"
-
-#: notes-utils.c:115
-#, c-format
-msgid "Refusing to rewrite notes in %s (outside of refs/notes/)"
-msgstr "Vägrar skriva över anteckningar i %s (utanför refs/notes/)"
-
-#. 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 "Felaktigt värde på %s: \"%s\""
-
-#: object-file.c:457
-#, 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:515
-#, c-format
-msgid "unable to normalize alternate object path: %s"
-msgstr "kunde inte normalisera supplerande objektsökväg: %s"
-
-#: object-file.c:589
-#, c-format
-msgid "%s: ignoring alternate object stores, nesting too deep"
-msgstr "%s: ignorerar supplerande objektlager, för djup nästling"
-
-#: object-file.c:596
-#, c-format
-msgid "unable to normalize object directory: %s"
-msgstr "kan inte normalisera objektkatalogen: %s"
-
-#: object-file.c:639
-msgid "unable to fdopen alternates lockfile"
-msgstr "kan inte utföra \"fdopen\" på suppleantlåsfil"
-
-#: object-file.c:657
-msgid "unable to read alternates file"
-msgstr "kan inte läsa \"alternates\"-filen"
-
-#: object-file.c:664
-msgid "unable to move new alternates file into place"
-msgstr "kan inte flytta ny \"alternates\"-fil på plats"
-
-#: object-file.c:742
-#, c-format
-msgid "path '%s' does not exist"
-msgstr "sökvägen \"%s\" finns inte"
-
-#: object-file.c:763
-#, 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:769
-#, c-format
-msgid "reference repository '%s' is not a local repository."
-msgstr "referensarkivet \"%s\" är inte ett lokalt arkiv."
-
-#: object-file.c:775
-#, c-format
-msgid "reference repository '%s' is shallow"
-msgstr "referensarkivet \"%s\" är grunt"
-
-#: object-file.c:783
-#, c-format
-msgid "reference repository '%s' is grafted"
-msgstr "referensarkivet \"%s\" är ympat"
-
-#: object-file.c:814
-#, c-format
-msgid "could not find object directory matching %s"
-msgstr "kunde inte hitta objektkatalog för %s"
-
-#: object-file.c:864
-#, c-format
-msgid "invalid line while parsing alternate refs: %s"
-msgstr "felaktig rad vid tolkning av supplerande referenser: %s"
-
-#: object-file.c:1014
-#, 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:1049
-#, c-format
-msgid "mmap failed%s"
-msgstr "mmap misslyckades%s"
-
-#: object-file.c:1230
-#, c-format
-msgid "object file %s is empty"
-msgstr "objektfilen %s är tom"
-
-#: object-file.c:1349 object-file.c:2588
-#, c-format
-msgid "corrupt loose object '%s'"
-msgstr "trasigt löst objekt \"%s\""
-
-#: object-file.c:1351 object-file.c:2592
-#, c-format
-msgid "garbage at end of loose object '%s'"
-msgstr "skräp i slutet av löst objekt \"%s\""
-
-#: object-file.c:1473
-#, c-format
-msgid "unable to parse %s header"
-msgstr "kan inte tolka %s-huvud"
-
-#: object-file.c:1475
-msgid "invalid object type"
-msgstr "felaktig objekttyp"
-
-#: object-file.c:1486
-#, c-format
-msgid "unable to unpack %s header"
-msgstr "kan inte packa upp %s-huvudet"
-
-#: object-file.c:1490
-#, 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:1720
-#, c-format
-msgid "failed to read object %s"
-msgstr "misslyckades läsa objektet %s"
-
-#: object-file.c:1724
-#, c-format
-msgid "replacement %s not found for %s"
-msgstr "ersättningen %s hittades inte för %s"
-
-#: object-file.c:1728
-#, c-format
-msgid "loose object %s (stored in %s) is corrupt"
-msgstr "löst objekt %s (lagrat i %s) är trasigt"
-
-#: object-file.c:1732
-#, c-format
-msgid "packed object %s (stored in %s) is corrupt"
-msgstr "packat objekt %s (lagrat i %s) är trasigt"
-
-#: object-file.c:1855
-#, c-format
-msgid "unable to write file %s"
-msgstr "kunde inte skriva filen %s"
-
-#: object-file.c:1862
-#, c-format
-msgid "unable to set permission to '%s'"
-msgstr "kan inte sätta behörigheten till \"%s\""
-
-#: object-file.c:1869
-msgid "file write error"
-msgstr "fel vid skrivning av fil"
-
-#: object-file.c:1904
-msgid "error when closing loose object file"
-msgstr "fel vid stängning av fil för löst objekt"
-
-#: object-file.c:1971
-#, 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:1973
-msgid "unable to create temporary file"
-msgstr "kan inte skapa temporär fil"
-
-#: object-file.c:1997
-msgid "unable to write loose object file"
-msgstr "kunde inte skriva fil för löst objekt"
-
-#: object-file.c:2003
-#, c-format
-msgid "unable to deflate new object %s (%d)"
-msgstr "kan inte utföra \"deflate\" på nytt objekt %s (%d)"
-
-#: object-file.c:2007
-#, c-format
-msgid "deflateEnd on object %s failed (%d)"
-msgstr "\"deflateend\" på objektet %s misslyckades (%d)"
-
-#: object-file.c:2011
-#, c-format
-msgid "confused by unstable object source data for %s"
-msgstr "förvirrad av instabil objektkälldata för %s"
-
-#: object-file.c:2022 builtin/pack-objects.c:1251
-#, c-format
-msgid "failed utime() on %s"
-msgstr "\"utime()\" misslyckades på %s"
-
-#: object-file.c:2100
-#, c-format
-msgid "cannot read object for %s"
-msgstr "kan inte läsa objekt för %s"
-
-#: object-file.c:2151
-msgid "corrupt commit"
-msgstr "trasik incheckning"
-
-#: object-file.c:2159
-msgid "corrupt tag"
-msgstr "trasig tagg"
-
-#: object-file.c:2259
-#, c-format
-msgid "read error while indexing %s"
-msgstr "läsfel vid indexering av %s"
-
-#: object-file.c:2262
-#, c-format
-msgid "short read while indexing %s"
-msgstr "för lite lästes vid indexering av %s"
-
-#: object-file.c:2335 object-file.c:2345
-#, c-format
-msgid "%s: failed to insert into database"
-msgstr "%s: misslyckades lägga in i databasen"
-
-#: object-file.c:2351
-#, c-format
-msgid "%s: unsupported file type"
-msgstr "%s: filtypen stöds ej"
-
-#: object-file.c:2375 builtin/fetch.c:1494
-#, c-format
-msgid "%s is not a valid object"
-msgstr "%s är inte ett giltigt objekt"
-
-#: object-file.c:2377
-#, c-format
-msgid "%s is not a valid '%s' object"
-msgstr "%s är inte ett giltigt \"%s\"-objekt"
-
-#: object-file.c:2404
-#, c-format
-msgid "unable to open %s"
-msgstr "kan inte öppna %s"
-
-#: object-file.c:2599
-#, c-format
-msgid "hash mismatch for %s (expected %s)"
-msgstr "hash stämmer inte för %s (förväntade %s)"
-
-#: object-file.c:2622
-#, c-format
-msgid "unable to mmap %s"
-msgstr "kan inte utföra \"mmap\" för %s"
-
-#: object-file.c:2628
-#, c-format
-msgid "unable to unpack header of %s"
-msgstr "kan inte packa upp huvud för %s"
-
-#: object-file.c:2633
-#, c-format
-msgid "unable to parse header of %s"
-msgstr "kan inte tolka huvud för %s"
-
-#: object-file.c:2644
-#, c-format
-msgid "unable to unpack contents of %s"
-msgstr "kan inte tolka innehåll i %s"
-
-#. TRANSLATORS: This is a line of ambiguous object
-#. output shown when we cannot look up or parse the
-#. object in question. E.g. "deadbeef [bad object]".
-#.
-#: object-name.c:382
-#, c-format
-msgid "%s [bad object]"
-msgstr "%s [felaktig objekt]."
-
-#. TRANSLATORS: This is a line of ambiguous commit
-#. object output. E.g.:
-#. *
-#.    "deadbeef commit 2021-01-01 - Some Commit Message"
-#.
-#: object-name.c:407
-#, c-format
-msgid "%s commit %s - %s"
-msgstr "%s incheckning %s - %s"
-
-#. TRANSLATORS: This is a line of ambiguous
-#. tag object output. E.g.:
-#. *
-#.    "deadbeef tag 2022-01-01 - Some Tag Message"
-#. *
-#. The second argument is the YYYY-MM-DD found
-#. in the tag.
-#. *
-#. The third argument is the "tag" string
-#. from object.c.
-#.
-#: object-name.c:428
-#, c-format
-msgid "%s tag %s - %s"
-msgstr "%s tagg %s - %s"
-
-#. TRANSLATORS: This is a line of ambiguous
-#. tag object output where we couldn't parse
-#. the tag itself. E.g.:
-#. *
-#.    "deadbeef [bad tag, could not parse it]"
-#.
-#: object-name.c:439
-#, c-format
-msgid "%s [bad tag, could not parse it]"
-msgstr "%s [felaktig tagg, kunde inte tolka]"
-
-#. TRANSLATORS: This is a line of ambiguous <type>
-#. object output. E.g. "deadbeef tree".
-#.
-#: object-name.c:447
-#, c-format
-msgid "%s tree"
-msgstr "%s-träd"
-
-#. TRANSLATORS: This is a line of ambiguous <type>
-#. object output. E.g. "deadbeef blob".
-#.
-#: object-name.c:453
-#, c-format
-msgid "%s blob"
-msgstr "%s blob"
-
-#: object-name.c:569
-#, c-format
-msgid "short object ID %s is ambiguous"
-msgstr "kort objekt-ID %s är tvetydigt"
-
-#. TRANSLATORS: The argument is the list of ambiguous
-#. objects composed in show_ambiguous_object(). See
-#. its "TRANSLATORS" comments for details.
-#.
-#: object-name.c:591
-#, c-format
-msgid ""
-"The candidates are:\n"
-"%s"
-msgstr ""
-"Kandidaterna är:\n"
-"%s"
-
-#: object-name.c:888
-msgid ""
-"Git normally never creates a ref that ends with 40 hex characters\n"
-"because it will be ignored when you just specify 40-hex. These refs\n"
-"may be created by mistake. For example,\n"
-"\n"
-"  git switch -c $br $(git rev-parse ...)\n"
-"\n"
-"where \"$br\" is somehow empty and a 40-hex ref is created. Please\n"
-"examine these refs and maybe delete them. Turn this message off by\n"
-"running \"git config advice.objectNameWarning false\""
-msgstr ""
-"Git skapar normalt aldrig referenser som slutar med 40 hexadecimala\n"
-"tecken, då detta ignoreras när du anger 40-hex enbart. Dessa\n"
-"referenser kan skapas av misstag. Till exempel, för\n"
-"\n"
-"  git switch -c $br $(git rev-parse ...)\n"
-"\n"
-"där \"$br\" på något sätt blivit tomt och en 40-hex-referens skapats.\n"
-"Undersök referenserna och ta kanske bort dem. Stäng av meddelandet\n"
-"genom att köra \"git config advice.objectNameWarning false\""
-
-#: object-name.c:1008
-#, c-format
-msgid "log for '%.*s' only goes back to %s"
-msgstr "loggen för \"%.*s\" räcker bara tillbaka till %s"
-
-#: object-name.c:1016
-#, c-format
-msgid "log for '%.*s' only has %d entries"
-msgstr "loggen för \"%.*s\" har bara %d poster"
-
-#: object-name.c:1794
-#, c-format
-msgid "path '%s' exists on disk, but not in '%.*s'"
-msgstr "Sökvägen \"%s\" finns på disken, men inte i \"%.*s\""
-
-#: object-name.c:1800
-#, c-format
-msgid ""
-"path '%s' exists, but not '%s'\n"
-"hint: Did you mean '%.*s:%s' aka '%.*s:./%s'?"
-msgstr ""
-"sökvägen \"%s\" finns, men inte i \"%s\"\n"
-"tips: Menade du \"%.*s:%s\", även känd som \"%.*s:./%s\"?"
-
-#: object-name.c:1809
-#, c-format
-msgid "path '%s' does not exist in '%.*s'"
-msgstr "sökvägen \"%s\" finns inte i \"%.*s\""
-
-#: object-name.c:1837
-#, c-format
-msgid ""
-"path '%s' is in the index, but not at stage %d\n"
-"hint: Did you mean ':%d:%s'?"
-msgstr ""
-"sökvägen \"%s\" finns i indexet men inte i etapp %d\n"
-"tips: Menade du \":%d:%s\"?"
-
-#: object-name.c:1853
-#, c-format
-msgid ""
-"path '%s' is in the index, but not '%s'\n"
-"hint: Did you mean ':%d:%s' aka ':%d:./%s'?"
-msgstr ""
-"sökvägen \"%s\" finns i indexet, men inte i \"%s\"\n"
-"tips: Menade du \":%d:%s\", även känd som \":%d:./%s\"?"
-
-#: object-name.c:1861
-#, c-format
-msgid "path '%s' exists on disk, but not in the index"
-msgstr "sökvägen \"%s\" finns på disk, men inte i indexet"
-
-#: object-name.c:1863
-#, c-format
-msgid "path '%s' does not exist (neither on disk nor in the index)"
-msgstr "sökvägen \"%s\" finns inte (varken i disken eller i indexet)"
-
-#: object-name.c:1876
-msgid "relative path syntax can't be used outside working tree"
-msgstr "relativ sökväg kan inte användas utanför arbetskatalogen"
-
-#: object-name.c:1901
-#, c-format
-msgid "<object>:<path> required, only <object> '%s' given"
-msgstr "<objekt>:<sökväg> krävs, endast <objekt> \"%s\" har angivits"
-
-#: object-name.c:2014
-#, c-format
-msgid "invalid object name '%.*s'."
-msgstr "felaktigt objektnamn \"%.*s\"."
-
-#: object.c:53
-#, c-format
-msgid "invalid object type \"%s\""
-msgstr "ogiltig objekttyp \"%s\""
-
-#: object.c:173
-#, c-format
-msgid "object %s is a %s, not a %s"
-msgstr "objektet %s är en %s, inte en %s"
-
-#: object.c:250
-#, c-format
-msgid "object %s has unknown type id %d"
-msgstr "objektet %s har okänd typ-id %d"
-
-#: object.c:263
-#, c-format
-msgid "unable to parse object: %s"
-msgstr "kunde inte tolka objektet: %s"
-
-#: object.c:283 object.c:294
-#, c-format
-msgid "hash mismatch %s"
-msgstr "hashvärde stämmer inte överens %s"
-
-#: pack-bitmap.c:353
-msgid "multi-pack bitmap is missing required reverse index"
-msgstr "flerpaketsbitkarta saknar nödvändigt omvänt index"
-
-#: pack-bitmap.c:433
-msgid "load_reverse_index: could not open pack"
-msgstr "load_reverse_index: kunde inte öppna paket"
-
-#: pack-bitmap.c:1072 pack-bitmap.c:1078 builtin/pack-objects.c:2432
-#, c-format
-msgid "unable to get size of %s"
-msgstr "kan inte hämta storlek på %s"
-
-#: pack-bitmap.c:1937
-#, 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:1973 builtin/rev-list.c:91
-#, c-format
-msgid "unable to get disk usage of %s"
-msgstr "kan inte hämta diskanvändning för %s"
-
-#: pack-revindex.c:221
-#, c-format
-msgid "reverse-index file %s is too small"
-msgstr "reverse-index-filen %s är för liten"
-
-#: pack-revindex.c:226
-#, c-format
-msgid "reverse-index file %s is corrupt"
-msgstr "reverse-index-filen %s är trasig"
-
-#: pack-revindex.c:234
-#, c-format
-msgid "reverse-index file %s has unknown signature"
-msgstr "reverse-index-filen %s har okänd signatur"
-
-#: pack-revindex.c:238
-#, c-format
-msgid "reverse-index file %s has unsupported version %<PRIu32>"
-msgstr "reverse-index-filen %s har versionen %<PRIu32> som inte stöds"
-
-#: pack-revindex.c:243
-#, c-format
-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:251
-msgid "cannot both write and verify reverse index"
-msgstr "kan inte både skriva och bekräfta reverse-index"
-
-#: pack-write.c:270
-#, c-format
-msgid "could not stat: %s"
-msgstr "kunde inte ta status: %s"
-
-#: pack-write.c:282
-#, c-format
-msgid "failed to make %s readable"
-msgstr "kunde inte göra %s läsbar"
-
-#: pack-write.c:521
-#, c-format
-msgid "could not write '%s' promisor file"
-msgstr "kunde inte skriva kontraktsfilen \"%s\""
-
-#: packfile.c:627
-msgid "offset before end of packfile (broken .idx?)"
-msgstr "offset före slutet av packfilen (trasig .idx?)"
-
-#: packfile.c:657
-#, c-format
-msgid "packfile %s cannot be mapped%s"
-msgstr "paketfilen %s kunde inte kopplas%s"
-
-#: packfile.c:1924
-#, 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:1928
-#, 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:21 parse-options-cb.c:25 builtin/commit-graph.c:175
-#, c-format
-msgid "option `%s' expects a numerical value"
-msgstr "flaggan \"%s\" antar ett numeriskt värde"
-
-#: parse-options-cb.c:42
-#, c-format
-msgid "malformed expiration date '%s'"
-msgstr "trasigt utlöpsdatum: \"%s\""
-
-#: parse-options-cb.c:55
-#, c-format
-msgid "option `%s' expects \"always\", \"auto\", or \"never\""
-msgstr ""
-"flaggan \"%s\" antar \"always\" (alltid), \"auto\" eller \"never\" (aldrig)"
-
-#: parse-options-cb.c:133 parse-options-cb.c:150
-#, c-format
-msgid "malformed object name '%s'"
-msgstr "felformat objektnamn \"%s\""
-
-#: parse-options-cb.c:307
-#, c-format
-msgid "option `%s' expects \"%s\" or \"%s\""
-msgstr "flaggan \"%s\" kräver \"%s\" eller \"%s\""
-
-#: parse-options.c:58
-#, c-format
-msgid "%s requires a value"
-msgstr "%s behöver ett värde"
-
-#: parse-options.c:93
-#, c-format
-msgid "%s is incompatible with %s"
-msgstr "%s är inkompatibel med %s"
-
-#: parse-options.c:98
-#, c-format
-msgid "%s : incompatible with something else"
-msgstr "%s: inkompatibelt med något annat"
-
-#: parse-options.c:112 parse-options.c:116
-#, c-format
-msgid "%s takes no value"
-msgstr "%s tar inget värde"
-
-#: parse-options.c:114
-#, c-format
-msgid "%s isn't available"
-msgstr "%s är inte tillgängligt"
-
-#: 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: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:428 parse-options.c:436
-#, c-format
-msgid "did you mean `--%s` (with two dashes)?"
-msgstr "menade du \"--%s\" (med två bindestreck)?"
-
-#: parse-options.c:678 parse-options.c:1054
-#, c-format
-msgid "alias of --%s"
-msgstr "alias för --%s"
-
-#: parse-options.c:892
-#, c-format
-msgid "unknown option `%s'"
-msgstr "okänd flagga \"%s\""
-
-#: parse-options.c:894
-#, c-format
-msgid "unknown switch `%c'"
-msgstr "okänd flagga \"%c\""
-
-#: parse-options.c:896
-#, c-format
-msgid "unknown non-ascii option in string: `%s'"
-msgstr "okänd icke-ascii-flagga i strängen: \"%s\""
-
-#: parse-options.c:920
-msgid "..."
-msgstr "..."
-
-#: parse-options.c:934
-#, c-format
-msgid "usage: %s"
-msgstr "användning: %s"
-
-#. TRANSLATORS: the colon here should align with the
-#. one in "usage: %s" translation.
-#.
-#: parse-options.c:949
-#, c-format
-msgid "   or: %s"
-msgstr "     eller: %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:970
-#, c-format
-msgid "%*s%s"
-msgstr "%*s%s"
-
-#: parse-options.c:993
-#, c-format
-msgid "    %s"
-msgstr "    %s"
-
-#: parse-options.c:1040
-msgid "-NUM"
-msgstr "-TAL"
-
-#: 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: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:168
-msgid "Only one 'attr:' specification is allowed."
-msgstr "Endast en \"attr:\"-angivelse tillåten."
-
-#: pathspec.c:171
-msgid "attr spec must not be empty"
-msgstr "attr-angivelse kan inte vara tom"
-
-#: pathspec.c:214
-#, c-format
-msgid "invalid attribute name %s"
-msgstr "ogiltigt attributnamn %s"
-
-#: 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:286
-msgid ""
-"global 'literal' pathspec setting is incompatible with all other global "
-"pathspec settings"
-msgstr ""
-"den globala sökvägsinställningen \"literal\" är inkompatibel med alla andra "
-"globala sökvägsinställningar"
-
-#: pathspec.c:326
-msgid "invalid parameter for pathspec magic 'prefix'"
-msgstr "ogiltig parameter för sökvägsuttrycket för \"prefix\""
-
-#: pathspec.c:347
-#, c-format
-msgid "Invalid pathspec magic '%.*s' in '%s'"
-msgstr "Felaktigt sökvägsuttryck \"%.*s\" i \"%s\""
-
-#: 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:390
-#, c-format
-msgid "Unimplemented pathspec magic '%c' in '%s'"
-msgstr "Ej implementerat sökvägsuttryckmagi \"%c\" i \"%s\""
-
-#: pathspec.c:449
-#, c-format
-msgid "%s: 'literal' and 'glob' are incompatible"
-msgstr "%s: \"literal\" och \"glob\" är inkompatibla"
-
-#: pathspec.c:465
-#, c-format
-msgid "%s: '%s' is outside repository at '%s'"
-msgstr "%s: \"%s\" är utanför arkivet på \"%s\""
-
-#: pathspec.c:541
-#, c-format
-msgid "'%s' (mnemonic: '%c')"
-msgstr "\"%s\" (minnesstöd: \"%c\")"
-
-#: 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: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:663
-#, c-format
-msgid "line is badly quoted: %s"
-msgstr "linjen er felaktigt citerad: %s"
-
-#: pkt-line.c:92
-msgid "unable to write flush packet"
-msgstr "kan inte skriva flush-paket"
-
-#: pkt-line.c:99
-msgid "unable to write delim packet"
-msgstr "kan inte skriva delim-paket"
-
-#: pkt-line.c:106
-msgid "unable to write response end packet"
-msgstr "kunde inte skriva svarsavslutningspaket"
-
-#: pkt-line.c:113
-msgid "flush packet write failed"
-msgstr "fel vid skrivning av \"flush\"-paket"
-
-#: pkt-line.c:153
-msgid "protocol error: impossibly long line"
-msgstr "protokollfel: omöjligt lång rad"
-
-#: pkt-line.c:169 pkt-line.c:171
-msgid "packet write with format failed"
-msgstr "paketskrivning med format misslyckades"
-
-#: pkt-line.c:204 pkt-line.c:252
-msgid "packet write failed - data exceeds max packet size"
-msgstr "paketskrivning misslyckades - data överskrider maximal paketstorlek"
-
-#: pkt-line.c:222
-#, c-format
-msgid "packet write failed: %s"
-msgstr "paketskrivning misslyckades: %s"
-
-#: pkt-line.c:349 pkt-line.c:350
-msgid "read error"
-msgstr "läsfel"
-
-#: 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:417 pkt-line.c:419
-#, c-format
-msgid "protocol error: bad line length character: %.4s"
-msgstr "protokollfel: felaktig radlängdstecken: %.4s"
-
-#: pkt-line.c:434 pkt-line.c:436 pkt-line.c:442 pkt-line.c:444
-#, c-format
-msgid "protocol error: bad line length %d"
-msgstr "protokollfel: felaktig radlängd: %d"
-
-#: pkt-line.c:472 sideband.c:165
-#, c-format
-msgid "remote error: %s"
-msgstr "fjärrfel: %s"
-
-#: preload-index.c:125
-msgid "Refreshing index"
-msgstr "Uppdaterar indexet"
-
-#: preload-index.c:144
-#, c-format
-msgid "unable to create threaded lstat: %s"
-msgstr "kunde inte skapa trådad lstat: %s"
-
-#: pretty.c:1051
-msgid "unable to parse --pretty format"
-msgstr "kunde inte tolka format för --pretty"
-
-#: promisor-remote.c:31
-msgid "promisor-remote: unable to fork off fetch subprocess"
-msgstr "promisor-remote: kunde inte starta (fork) underprocessen för fetch"
-
-#: promisor-remote.c:38 promisor-remote.c:40
-msgid "promisor-remote: could not write to fetch subprocess"
-msgstr "promisor-remote: kunde skriva till underprocessen för fetch"
-
-#: promisor-remote.c:44
-msgid "promisor-remote: could not close stdin to fetch subprocess"
-msgstr ""
-"promisor-remote: kunde inte stänga standard in för underprocessen för fetch"
-
-#: promisor-remote.c:54
-#, c-format
-msgid "promisor remote name cannot begin with '/': %s"
-msgstr "kontraktsfjärr kan inte börja med \"/\": %s"
-
-#: protocol-caps.c:103
-msgid "object-info: expected flush after arguments"
-msgstr "object-info: förväntade \"flush\" efter argument"
-
-#: prune-packed.c:35
-msgid "Removing duplicate objects"
-msgstr "Tar bort duplicerade objekt"
-
-#: range-diff.c:68
-msgid "could not start `log`"
-msgstr "kunde inte starta \"log\""
-
-#: range-diff.c:70
-msgid "could not read `log` output"
-msgstr "kunde inte läsa utdata från \"log\""
-
-#: range-diff.c:98 sequencer.c:5575
-#, c-format
-msgid "could not parse commit '%s'"
-msgstr "kunde inte tolka incheckningen \"%s\""
-
-#: range-diff.c:109
-#, c-format
-msgid ""
-"could not parse first line of `log` output: did not start with 'commit ': "
-"'%s'"
-msgstr ""
-"kunde inte tolka första raden i \"log\"-updata: börjar inte med \"commit \": "
-"\"%s\""
-
-#: range-diff.c:132
-#, c-format
-msgid "could not parse git header '%.*s'"
-msgstr "kunde inte tolka git-huvudet \"%.*s\""
-
-#: range-diff.c:300
-msgid "failed to generate diff"
-msgstr "misslyckades skapa diff"
-
-#: range-diff.c:558 range-diff.c:560
-#, c-format
-msgid "could not parse log for '%s'"
-msgstr "kunde inte tolka loggen för \"%s\""
-
-#: read-cache.c:737
-#, c-format
-msgid "will not add file alias '%s' ('%s' already exists in index)"
-msgstr "lägger inte till filalias \"%s\" (\"%s\" finns redan i indexet)"
-
-#: read-cache.c:753
-msgid "cannot create an empty blob in the object database"
-msgstr "kan inte skapa tom blob i objektdatabasen"
-
-#: read-cache.c:775
-#, c-format
-msgid "%s: can only add regular files, symbolic links or git-directories"
-msgstr ""
-"%s: kan bara lägga till vanliga filer, symboliska länkar och git-kataloger"
-
-#: read-cache.c:780 builtin/submodule--helper.c:3359
-#, c-format
-msgid "'%s' does not have a commit checked out"
-msgstr "\"%s\" har inte någon utcheckad incheckning"
-
-#: read-cache.c:832
-#, c-format
-msgid "unable to index file '%s'"
-msgstr "kan inte indexera filen \"%s\""
-
-#: read-cache.c:851
-#, c-format
-msgid "unable to add '%s' to index"
-msgstr "kan inte lägga till \"%s\" till indexet"
-
-#: read-cache.c:862
-#, c-format
-msgid "unable to stat '%s'"
-msgstr "kan inte ta status på \"%s\""
-
-#: read-cache.c:1404
-#, 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:1619
-msgid "Refresh index"
-msgstr "Uppdatera indexet"
-
-#: read-cache.c:1751
-#, c-format
-msgid ""
-"index.version set, but the value is invalid.\n"
-"Using version %i"
-msgstr ""
-"index.version satt, men värdet är ogiltigt.\n"
-"Använder version %i"
-
-#: read-cache.c:1761
-#, c-format
-msgid ""
-"GIT_INDEX_VERSION set, but the value is invalid.\n"
-"Using version %i"
-msgstr ""
-"GIT_INDEX_VERSION satt, men värdet är ogiltigt.\n"
-"Använder version %i"
-
-#: read-cache.c:1817
-#, c-format
-msgid "bad signature 0x%08x"
-msgstr "felaktig signatur 0x%08x"
-
-#: read-cache.c:1820
-#, c-format
-msgid "bad index version %d"
-msgstr "felaktig indexversion %d"
-
-#: read-cache.c:1829
-msgid "bad index file sha1 signature"
-msgstr "felaktig sha1-signatur för indexfil"
-
-#: read-cache.c:1863
-#, 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:1865
-#, c-format
-msgid "ignoring %.4s extension"
-msgstr "ignorerar filtillägget %.4s"
-
-#: read-cache.c:1902
-#, c-format
-msgid "unknown index entry format 0x%08x"
-msgstr "okänt format 0x%08x på indexpost"
-
-#: read-cache.c:1918
-#, 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:1975
-msgid "unordered stage entries in index"
-msgstr "osorterade köposter i index"
-
-#: read-cache.c:1978
-#, c-format
-msgid "multiple stage entries for merged file '%s'"
-msgstr "flera köposter för den sammanslagna filen \"%s\""
-
-#: read-cache.c:1981
-#, c-format
-msgid "unordered stage entries for '%s'"
-msgstr "osorterade köposter för \"%s\""
-
-#: read-cache.c:2096 read-cache.c:2402 rerere.c:549 rerere.c:583 rerere.c:1096
-#: submodule.c:1831 builtin/add.c:586 builtin/check-ignore.c:183
-#: builtin/checkout.c:532 builtin/checkout.c:724 builtin/clean.c:1016
-#: builtin/commit.c:379 builtin/diff-tree.c:122 builtin/grep.c:521
-#: builtin/mv.c:148 builtin/reset.c:506 builtin/rm.c:293
-#: builtin/submodule--helper.c:335 builtin/submodule--helper.c:3319
-msgid "index file corrupt"
-msgstr "indexfilen trasig"
-
-#: read-cache.c:2240
-#, 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:2253
-#, 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:2286
-#, c-format
-msgid "%s: index file open failed"
-msgstr "%s: öppning av indexfilen misslyckades"
-
-#: read-cache.c:2290
-#, c-format
-msgid "%s: cannot stat the open index"
-msgstr "%s: kan inte ta startus på det öppna indexet"
-
-#: read-cache.c:2294
-#, c-format
-msgid "%s: index file smaller than expected"
-msgstr "%s: indexfilen mindre än förväntat"
-
-#: read-cache.c:2298
-#, c-format
-msgid "%s: unable to map index file%s"
-msgstr "%s: kan inte koppla indexfilen%s"
-
-#: read-cache.c:2341
-#, c-format
-msgid "unable to create load_index_extensions thread: %s"
-msgstr "kunde inte skapa load_index_extensions-tråden: %s"
-
-#: read-cache.c:2368
-#, 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:2414
-#, c-format
-msgid "could not freshen shared index '%s'"
-msgstr "kunde inte uppdatera delat index \"%s\""
-
-#: read-cache.c:2473
-#, 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
-msgid "cannot write split index for a sparse index"
-msgstr "kan inte skriva delat index för ett glest index"
-
-#: read-cache.c:3114 strbuf.c:1192 wrapper.c:717 builtin/merge.c:1156
-#, c-format
-msgid "could not close '%s'"
-msgstr "kunde inte stänga \"%s\""
-
-#: read-cache.c:3157
-msgid "failed to convert to a sparse-index"
-msgstr "misslyckades omvandla till glest index"
-
-#: read-cache.c:3228
-#, c-format
-msgid "could not stat '%s'"
-msgstr "kunde inte ta status på \"%s\""
-
-#: read-cache.c:3241
-#, c-format
-msgid "unable to open git dir: %s"
-msgstr "kunde inte öppna git-katalog: %s"
-
-#: read-cache.c:3253
-#, c-format
-msgid "unable to unlink: %s"
-msgstr "misslyckades ta bort länken: %s"
-
-#: read-cache.c:3282
-#, c-format
-msgid "cannot fix permission bits on '%s'"
-msgstr "kan inte rätta behörighetsbitar på \"%s\""
-
-#: read-cache.c:3439
-#, c-format
-msgid "%s: cannot drop to stage #0"
-msgstr "%s: kan inte återgå till kö 0"
-
-#: rebase-interactive.c:11
-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 ""
-"Du kan rätta detta med \"git rebase --edit-todo\" följt av \"git rebase --"
-"continue\".\n"
-"Avbryt ombaseringen med \"git rebase --abort\".\n"
-
-#: rebase-interactive.c:33
-#, c-format
-msgid ""
-"unrecognized setting %s for option rebase.missingCommitsCheck. Ignoring."
-msgstr ""
-"okänd inställning %s för flaggan rebase.missingCommitsCheck. Ignorerar."
-
-#: rebase-interactive.c:42
-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 [-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"
-"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 [-C | -c] <incheckning> = som \"squash\" men behåll bara "
-"loggmeddelandet\n"
-"                   från föregående incheckning, såvida inte -C används, då "
-"används\n"
-"                   istället bara den här incheckningens meddelande; -c är "
-"samma\n"
-"                   som -C, men öppnar redigeringsprogrammet\n"
-"f, fixup <incheckning> = som \"squash\", men förkasta "
-"incheckningsmeddelandet\n"
-"x, exec <kommando> = kör kommando (resten av raden) i skalet\n"
-"b, break = stoppa här (fortsätt ombaseringen senare med \"git rebase --"
-"continue\")\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"
-".       -c <incheckning> för att skriva om meddelandet.\n"
-"\n"
-"Du kan byta ordning på raderna; de utförs uppifrån och ned.\n"
-
-#: rebase-interactive.c:66
-#, c-format
-msgid "Rebase %s onto %s (%d command)"
-msgid_plural "Rebase %s onto %s (%d commands)"
-msgstr[0] "Ombasera %s på %s (%d kommando)"
-msgstr[1] "Ombasera %s på %s (%d kommandon)"
-
-#: rebase-interactive.c:75
-msgid ""
-"\n"
-"Do not remove any line. Use 'drop' explicitly to remove a commit.\n"
-msgstr ""
-"\n"
-"Ta inte bort rader. Använd \"drop\" för att specifikt förkasta en "
-"incheckning.\n"
-
-#: rebase-interactive.c:78
-msgid ""
-"\n"
-"If you remove a line here THAT COMMIT WILL BE LOST.\n"
-msgstr ""
-"\n"
-"Om du tar bort en rad KOMMER DEN INCHECKNINGEN ATT FÖRLORAS.\n"
-
-#: rebase-interactive.c:84
-msgid ""
-"\n"
-"You are editing the todo file of an ongoing interactive rebase.\n"
-"To continue rebase after editing, run:\n"
-"    git rebase --continue\n"
-"\n"
-msgstr ""
-"\n"
-"Du redigerar \"todo\"-filen för en pågående interaktiv ombasering.\n"
-"För att forsätta ombasera efter redigeringen, kör:\n"
-"    git rebase --continue\n"
-"\n"
-
-#: rebase-interactive.c:89
-msgid ""
-"\n"
-"However, if you remove everything, the rebase will be aborted.\n"
-"\n"
-msgstr ""
-"\n"
-"Ombaseringen kommer dock att avbrytas om du tar bort allting.\n"
-"\n"
-
-#: rebase-interactive.c:113 rerere.c:469 rerere.c:677 sequencer.c:3879
-#: sequencer.c:3905 sequencer.c:5681 builtin/fsck.c:328 builtin/gc.c:1791
-#: builtin/rebase.c:191
-#, c-format
-msgid "could not write '%s'"
-msgstr "kunde inte skriva \"%s\""
-
-#: rebase-interactive.c:119
-#, c-format
-msgid "could not write '%s'."
-msgstr "kunde inte skriva \"%s\"."
-
-#: rebase-interactive.c:196
-#, c-format
-msgid ""
-"Warning: some commits may have been dropped accidentally.\n"
-"Dropped commits (newer to older):\n"
-msgstr ""
-"Varning: vissa incheckningar kan av misstag ha tappats.\n"
-"Tappade incheckningar (nyaste först):\n"
-
-#: rebase-interactive.c:203
-#, c-format
-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"
-"The possible behaviours are: ignore, warn, error.\n"
-"\n"
-msgstr ""
-"För att undvika det här meddelandet kan du använda \"drop\" för att "
-"explicit\n"
-"kasta en incheckning.\n"
-"\n"
-"Använd \"git config rebase.missingCommitsCheck\" för att ändra "
-"varningsnivån.\n"
-"Möjliga bettenden är: \"ignore\" (ignorera), \"warn\" (varna), \"error"
-"\" (fel).\n"
-"\n"
-
-#: rebase.c:29
-#, c-format
-msgid "%s: 'preserve' superseded by 'merges'"
-msgstr "%s: \"preserve\" har ersatts av \"merges\""
-
-#: ref-filter.c:42 wt-status.c:2057
-msgid "gone"
-msgstr "försvunnen"
-
-#: ref-filter.c:43
-#, c-format
-msgid "ahead %d"
-msgstr "före %d"
-
-#: ref-filter.c:44
-#, c-format
-msgid "behind %d"
-msgstr "bakom %d"
-
-#: ref-filter.c:45
-#, c-format
-msgid "ahead %d, behind %d"
-msgstr "före %d, bakom %d"
-
-#: ref-filter.c:235
-#, c-format
-msgid "expected format: %%(color:<color>)"
-msgstr "förväntat format: %%(color:<color>)"
-
-#: ref-filter.c:237
-#, c-format
-msgid "unrecognized color: %%(color:%s)"
-msgstr "okänd färg: %%(color:%s)"
-
-#: 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:263
-#, c-format
-msgid "Integer value expected refname:rstrip=%s"
-msgstr "Heltalsvärde förväntades refname:rstrip=%s"
-
-#: ref-filter.c:265 ref-filter.c:344 ref-filter.c:377 ref-filter.c:431
-#: ref-filter.c:443 ref-filter.c:462 ref-filter.c:534 ref-filter.c:560
-#, c-format
-msgid "unrecognized %%(%s) argument: %s"
-msgstr "okänt %%(%s)-argument: %s"
-
-#: ref-filter.c:320
-#, c-format
-msgid "%%(objecttype) does not take arguments"
-msgstr "%%(objecttype) tar inte argument"
-
-#: ref-filter.c:352
-#, c-format
-msgid "%%(deltabase) does not take arguments"
-msgstr "%%(deltabase) tar inte argument"
-
-#: ref-filter.c:364
-#, c-format
-msgid "%%(body) does not take arguments"
-msgstr "%%(body) tar inte argument"
-
-#: ref-filter.c:396
-#, c-format
-msgid "expected %%(trailers:key=<value>)"
-msgstr "förväntade %%(trailers:key=<värde>)"
-
-#: ref-filter.c:398
-#, c-format
-msgid "unknown %%(trailers) argument: %s"
-msgstr "okänt %%(trailers)-argument: %s"
-
-#: 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:458
-#, c-format
-msgid "positive value expected '%s' in %%(%s)"
-msgstr "positivt värde förväntat \"%s\" i %%(%s)"
-
-#: ref-filter.c:476
-#, c-format
-msgid "unrecognized email option: %s"
-msgstr "okänd e-postalternativ: %s"
-
-#: ref-filter.c:506
-#, c-format
-msgid "expected format: %%(align:<width>,<position>)"
-msgstr "förväntat format: %%(align:<bredd>,<position>)"
-
-#: ref-filter.c:518
-#, c-format
-msgid "unrecognized position:%s"
-msgstr "okänd position:%s"
-
-#: ref-filter.c:525
-#, c-format
-msgid "unrecognized width:%s"
-msgstr "okänd bredd:%s"
-
-#: 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: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:707
-#, c-format
-msgid "unknown field name: %.*s"
-msgstr "okänt fältnamn: %.*s"
-
-#: 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:844 ref-filter.c:910 ref-filter.c:946 ref-filter.c:948
-#, c-format
-msgid "format: %%(%s) atom used without a %%(%s) atom"
-msgstr "format: atomen %%(%s) använd utan en %%(%s)-atom"
-
-#: 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:914
-#, c-format
-msgid "format: %%(then) atom used after %%(else)"
-msgstr "format: atomen %%(then) använd efter %%(else)"
-
-#: 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:965
-#, c-format
-msgid "format: %%(end) atom used without corresponding atom"
-msgstr "format: atomen %%(end) använd utan motsvarande atom"
-
-#: ref-filter.c:1027
-#, c-format
-msgid "malformed format string %s"
-msgstr "felformad formatsträng %s"
-
-#: 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:1707
-#, c-format
-msgid "(no branch, rebasing %s)"
-msgstr "(ingen gren, ombaserar %s)"
-
-#: ref-filter.c:1710
-#, c-format
-msgid "(no branch, rebasing detached HEAD %s)"
-msgstr "(ingen gren, ombaserar frånkopplat HEAD %s)"
-
-#: ref-filter.c:1713
-#, c-format
-msgid "(no branch, bisect started on %s)"
-msgstr "(ingen gren, \"bisect\" startad på %s)"
-
-#: ref-filter.c:1717
-#, c-format
-msgid "(HEAD detached at %s)"
-msgstr "(HEAD frånkopplat vid %s)"
-
-#: ref-filter.c:1720
-#, c-format
-msgid "(HEAD detached from %s)"
-msgstr "(HEAD frånkopplat från %s)"
-
-#: ref-filter.c:1723
-msgid "(no branch)"
-msgstr "(ingen gren)"
-
-#: ref-filter.c:1755 ref-filter.c:1973
-#, c-format
-msgid "missing object %s for %s"
-msgstr "objektet %s saknas för %s"
-
-#: ref-filter.c:1765
-#, c-format
-msgid "parse_object_buffer failed on %s for %s"
-msgstr "parse_object_buffer misslyckades på %s för %s"
-
-#: ref-filter.c:2156
-#, c-format
-msgid "malformed object at '%s'"
-msgstr "felformat objekt vid \"%s\""
-
-#: ref-filter.c:2246
-#, c-format
-msgid "ignoring ref with broken name %s"
-msgstr "ignorerar referens med trasigt namn %s"
-
-#: ref-filter.c:2251 refs.c:672
-#, c-format
-msgid "ignoring broken ref %s"
-msgstr "ignorerar trasig referens %s"
-
-#: ref-filter.c:2630
-#, c-format
-msgid "format: %%(end) atom missing"
-msgstr "format: atomen %%(end) saknas"
-
-#: ref-filter.c:2741
-#, c-format
-msgid "malformed object name %s"
-msgstr "felformat objektnamn %s"
-
-#: ref-filter.c:2746
-#, c-format
-msgid "option `%s' must point to a commit"
-msgstr "flaggan \"%s\" måste peka på en incheckning"
-
-#: reflog.c:407
-#, c-format
-msgid "not a reflog: %s"
-msgstr "inte en referenslogg: %s"
-
-#: reflog.c:410
-#, c-format
-msgid "no reflog for '%s'"
-msgstr "ingen referenslogg för \"%s\""
-
-#: refs.c:262
-#, c-format
-msgid "%s does not point to a valid object!"
-msgstr "\"%s\" pekar inte på ett giltigt objekt!"
-
-#: refs.c:561
-#, 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"
-"of your new repositories, which will suppress this warning, call:\n"
-"\n"
-"\tgit config --global init.defaultBranch <name>\n"
-"\n"
-"Names commonly chosen instead of 'master' are 'main', 'trunk' and\n"
-"'development'. The just-created branch can be renamed via this command:\n"
-"\n"
-"\tgit branch -m <name>\n"
-msgstr ""
-"Använder \"%s\" som namn för den inledande grenen. Detta förvalda grennamn\n"
-"kan ändras i framtiden. För att välja vilket namn som ska användas på\n"
-"den inledande grenen i alla nya arkiv, och dölja denna varning, kör du:\n"
-"\n"
-"\tgit config --global init.defaultBranch <namn>\n"
-"\n"
-"Namn som ofta används istället för \"master\" är \"main\", \"trunk\" och\n"
-"\"development\". Den nyskapade grenen kan ges nytt namn med kommandot:\n"
-"\n"
-"\tgit branch -m <namn>\n"
-
-#: refs.c:583
-#, c-format
-msgid "could not retrieve `%s`"
-msgstr "kunde inte hämta \"%s\""
-
-#: refs.c:593
-#, c-format
-msgid "invalid branch name: %s = %s"
-msgstr "felaktigt namn på gren: %s = %s"
-
-#: refs.c:670
-#, c-format
-msgid "ignoring dangling symref %s"
-msgstr "ignorerar dinglande symbolisk referens %s"
-
-#: refs.c:919
-#, c-format
-msgid "log for ref %s has gap after %s"
-msgstr "loggen för referensen %s har lucka efter %s"
-
-#: refs.c:926
-#, c-format
-msgid "log for ref %s unexpectedly ended on %s"
-msgstr "loggen för referensen %s slutade oväntat på %s"
-
-#: refs.c:991
-#, c-format
-msgid "log for %s is empty"
-msgstr "loggen för %s är tom"
-
-#: refs.c:1086
-#, c-format
-msgid "refusing to update ref with bad name '%s'"
-msgstr "vägrar uppdatera referens med trasigt namn \"%s\""
-
-#: refs.c:1164
-#, c-format
-msgid "update_ref failed for ref '%s': %s"
-msgstr "update_ref misslyckades för referensen \"%s\": %s"
-
-#: refs.c:2059
-#, c-format
-msgid "multiple updates for ref '%s' not allowed"
-msgstr "flera uppdateringar för referensen \"%s\" tillåts inte"
-
-#: refs.c:2145
-msgid "ref updates forbidden inside quarantine environment"
-msgstr "referensuppdateringar förbjudna i karantänmiljö"
-
-#: refs.c:2156
-msgid "ref updates aborted by hook"
-msgstr "referensuppdateringar avbrutna av krok"
-
-#: refs.c:2264 refs.c:2294
-#, c-format
-msgid "'%s' exists; cannot create '%s'"
-msgstr "\"%s\" finns; kan inte skapa \"%s\""
-
-#: refs.c:2270 refs.c:2305
-#, c-format
-msgid "cannot process '%s' and '%s' at the same time"
-msgstr "kan inte hantera \"%s\" och \"%s\" samtidigt"
-
-#: refs/files-backend.c:1295
-#, c-format
-msgid "could not remove reference %s"
-msgstr "kunde inte ta bort referensen %s"
-
-#: refs/files-backend.c:1310 refs/packed-backend.c:1565
-#: refs/packed-backend.c:1575
-#, c-format
-msgid "could not delete reference %s: %s"
-msgstr "kunde inte ta bort referensen %s: %s"
-
-#: refs/files-backend.c:1313 refs/packed-backend.c:1578
-#, c-format
-msgid "could not delete references: %s"
-msgstr "kunde inte ta bort referenser: %s"
-
-#: refspec.c:170
-#, c-format
-msgid "invalid refspec '%s'"
-msgstr "felaktig referensspecifikation: \"%s\""
-
-#: remote.c:402
-#, c-format
-msgid "config remote shorthand cannot begin with '/': %s"
-msgstr "konfigurerad kortform för fjärr kan inte börja med \"/\": %s"
-
-#: remote.c:450
-msgid "more than one receivepack given, using the first"
-msgstr "mer än en receivepack angavs, använder den första"
-
-#: remote.c:458
-msgid "more than one uploadpack given, using the first"
-msgstr "mer än en uploadpack angavs, använder den första"
-
-#: remote.c:698
-#, c-format
-msgid "Cannot fetch both %s and %s to %s"
-msgstr "Kan inte hämta både %s och %s till %s"
-
-#: remote.c:702
-#, c-format
-msgid "%s usually tracks %s, not %s"
-msgstr "%s spårar vanligtvis %s, inte %s"
-
-#: remote.c:706
-#, c-format
-msgid "%s tracks both %s and %s"
-msgstr "%s spårar både %s och %s"
-
-#: remote.c:774
-#, c-format
-msgid "key '%s' of pattern had no '*'"
-msgstr "nyckeln \"%s\" i mönstret innehåller ingen \"*\""
-
-#: remote.c:784
-#, c-format
-msgid "value '%s' of pattern has no '*'"
-msgstr "värdet \"%s\" i mönstret innehåller ingen \"*\""
-
-#: remote.c:1191
-#, c-format
-msgid "src refspec %s does not match any"
-msgstr "käll-referensspecifikationen %s motsvarar ingen"
-
-#: remote.c:1196
-#, c-format
-msgid "src refspec %s matches more than one"
-msgstr "käll-referensspecifikationen %s motsvarar mer än en"
-
-#. TRANSLATORS: "matches '%s'%" is the <dst> part of "git push
-#. <remote> <src>:<dst>" push, and "being pushed ('%s')" is
-#. the <src>.
-#.
-#: remote.c:1211
-#, c-format
-msgid ""
-"The destination you provided is not a full refname (i.e.,\n"
-"starting with \"refs/\"). We tried to guess what you meant by:\n"
-"\n"
-"- Looking for a ref that matches '%s' on the remote side.\n"
-"- Checking if the <src> being pushed ('%s')\n"
-"  is a ref in \"refs/{heads,tags}/\". If so we add a corresponding\n"
-"  refs/{heads,tags}/ prefix on the remote side.\n"
-"\n"
-"Neither worked, so we gave up. You must fully qualify the ref."
-msgstr ""
-"Målet du angav är inte ett komplett referensamn (dvs.,\n"
-"startar med \"refs/\"). Vi försökte gissa vad du menade genom att:\n"
-"\n"
-"- Se efter en referens som motsvarar \"%s\" på fjärrsidan.\n"
-"- Se om <källan> som sänds (\"%s\")\n"
-"  är en referens i \"refs/{heads,tags}/\". Om så lägger vi till\n"
-"  motsvarande refs/{heads,tags}/-prefix på fjärrsidan.\n"
-"\n"
-"Inget av dem fungerade, så vi gav upp. Ange fullständig referens."
-
-#: remote.c:1231
-#, c-format
-msgid ""
-"The <src> part of the refspec is a commit object.\n"
-"Did you mean to create a new branch by pushing to\n"
-"'%s:refs/heads/%s'?"
-msgstr ""
-"<Källa>-delen av ref.spec-en är ett incheckningsobjekt.\n"
-"Var det meningen att skapa en ny gren genom att sända\n"
-"till \"%s:refs/heads/%s\"?"
-
-#: remote.c:1236
-#, c-format
-msgid ""
-"The <src> part of the refspec is a tag object.\n"
-"Did you mean to create a new tag by pushing to\n"
-"'%s:refs/tags/%s'?"
-msgstr ""
-"<Källa>-delen av ref.spec-en är ett taggobjekt.\n"
-"Var det meningen att skapa en ny tagg genom att sända\n"
-"till \"%s:refs/tags/%s\"?"
-
-#: remote.c:1241
-#, c-format
-msgid ""
-"The <src> part of the refspec is a tree object.\n"
-"Did you mean to tag a new tree by pushing to\n"
-"'%s:refs/tags/%s'?"
-msgstr ""
-"<Källa>-delen av ref.spec-en är ett trädobjekt.\n"
-"Var det meningen att tagga ett nytt träd genom att sända\n"
-"till \"%s:refs/tags/%s\"?"
-
-#: remote.c:1246
-#, c-format
-msgid ""
-"The <src> part of the refspec is a blob object.\n"
-"Did you mean to tag a new blob by pushing to\n"
-"'%s:refs/tags/%s'?"
-msgstr ""
-"<Källa>-delen av ref.spec-en är ett blobobjekt.\n"
-"Var det meningen att tagga en ny blob genom att sända\n"
-"till \"%s:refs/tags/%s\"?"
-
-#: remote.c:1282
-#, c-format
-msgid "%s cannot be resolved to branch"
-msgstr "%s kan inte slås upp till en gren"
-
-#: remote.c:1293
-#, c-format
-msgid "unable to delete '%s': remote ref does not exist"
-msgstr "kan inte ta bort \"%s\": fjärreferensen finns inte"
-
-#: remote.c:1305
-#, c-format
-msgid "dst refspec %s matches more than one"
-msgstr "fjärr-referensspecifikationen \"%s\" motsvarar mer än en"
-
-#: remote.c:1312
-#, c-format
-msgid "dst ref %s receives from more than one src"
-msgstr "fjärr-referensen \"%s\" hämtar från mer än en källa"
-
-#: remote.c:1833 remote.c:1940
-msgid "HEAD does not point to a branch"
-msgstr "HEAD pekar inte på en gren"
-
-#: remote.c:1842
-#, c-format
-msgid "no such branch: '%s'"
-msgstr "okänd gren: \"%s\""
-
-#: remote.c:1845
-#, c-format
-msgid "no upstream configured for branch '%s'"
-msgstr "ingen standarduppström angiven för grenen \"%s\""
-
-#: remote.c:1851
-#, c-format
-msgid "upstream branch '%s' not stored as a remote-tracking branch"
-msgstr "uppströmsgrenen \"%s\" är inte lagrad som en fjärrspårande gren"
-
-#: remote.c:1866
-#, c-format
-msgid "push destination '%s' on remote '%s' has no local tracking branch"
-msgstr "push-målet \"%s\" på fjärren \"%s\" har ingen lokalt spårande gren"
-
-#: remote.c:1881
-#, c-format
-msgid "branch '%s' has no remote for pushing"
-msgstr "grenen \"%s\" har ingen fjärr för \"push\""
-
-#: remote.c:1891
-#, c-format
-msgid "push refspecs for '%s' do not include '%s'"
-msgstr "\"push\"-referensspecifikation för \"%s\" innehåller inte \"%s\""
-
-#: remote.c:1904
-msgid "push has no destination (push.default is 'nothing')"
-msgstr "\"push\" har inget mål (push.default är \"ingenting\")"
-
-#: remote.c:1926
-msgid "cannot resolve 'simple' push to a single destination"
-msgstr "\"enkel push\" motsvarar flera olika mål"
-
-#: remote.c:2059
-#, c-format
-msgid "couldn't find remote ref %s"
-msgstr "Kunde inte hitta fjärr-referensen %s"
-
-#: remote.c:2072
-#, c-format
-msgid "* Ignoring funny ref '%s' locally"
-msgstr "* Ignorerar märklig referens \"%s\" lokalt"
-
-#: remote.c:2235
-#, c-format
-msgid "Your branch is based on '%s', but the upstream is gone.\n"
-msgstr "Din gren är baserad på \"%s\", men den har försvunnit uppströms.\n"
-
-#: remote.c:2239
-msgid "  (use \"git branch --unset-upstream\" to fixup)\n"
-msgstr "  (använd \"git branch --unset-upstream\" för att rätta)\n"
-
-#: remote.c:2242
-#, c-format
-msgid "Your branch is up to date with '%s'.\n"
-msgstr "Din gren är à jour med \"%s\".\n"
-
-#: remote.c:2246
-#, c-format
-msgid "Your branch and '%s' refer to different commits.\n"
-msgstr "Din gren och \"%s\" pekar på olika incheckningar.\n"
-
-#: remote.c:2249
-#, c-format
-msgid "  (use \"%s\" for details)\n"
-msgstr "  (använd \"%s\" för detaljer)\n"
-
-#: remote.c:2253
-#, c-format
-msgid "Your branch is ahead of '%s' by %d commit.\n"
-msgid_plural "Your branch is ahead of '%s' by %d commits.\n"
-msgstr[0] "Din gren ligger före \"%s\" med %d incheckning.\n"
-msgstr[1] "Din gren ligger före \"%s\" med %d incheckningar.\n"
-
-#: remote.c:2259
-msgid "  (use \"git push\" to publish your local commits)\n"
-msgstr "  (använd \"git push\" för att publicera dina lokala incheckningar)\n"
-
-#: remote.c:2262
-#, c-format
-msgid "Your branch is behind '%s' by %d commit, and can be fast-forwarded.\n"
-msgid_plural ""
-"Your branch is behind '%s' by %d commits, and can be fast-forwarded.\n"
-msgstr[0] ""
-"Din gren ligger efter \"%s\" med %d incheckning, och kan snabbspolas.\n"
-msgstr[1] ""
-"Din gren ligger efter \"%s\" med %d incheckningar, och kan snabbspolas.\n"
-
-#: remote.c:2270
-msgid "  (use \"git pull\" to update your local branch)\n"
-msgstr "  (använd \"git pull\" för att uppdatera din lokala gren)\n"
-
-#: remote.c:2273
-#, c-format
-msgid ""
-"Your branch and '%s' have diverged,\n"
-"and have %d and %d different commit each, respectively.\n"
-msgid_plural ""
-"Your branch and '%s' have diverged,\n"
-"and have %d and %d different commits each, respectively.\n"
-msgstr[0] ""
-"Din gren och \"%s\" har divergerat,\n"
-"och har %d respektive %d olika incheckning.\n"
-msgstr[1] ""
-"Din gren och \"%s\" har divergerat,\n"
-"och har %d respektive %d olika incheckningar.\n"
-
-#: remote.c:2283
-msgid "  (use \"git pull\" to merge the remote branch into yours)\n"
-msgstr "  (använd \"git pull\" för att slå ihop fjärrgrenen med din egen)\n"
-
-#: remote.c:2475
-#, c-format
-msgid "cannot parse expected object name '%s'"
-msgstr "kan inte tolka förväntat objektnamn \"%s\""
-
-#: replace-object.c:21
-#, c-format
-msgid "bad replace ref name: %s"
-msgstr "felaktig ersättningsreferensnamn: %s"
-
-#: replace-object.c:30
-#, c-format
-msgid "duplicate replace ref: %s"
-msgstr "duplicerat ersättningsreferensnamn: %s"
-
-#: replace-object.c:82
-#, c-format
-msgid "replace depth too high for object %s"
-msgstr "ersättningsdjupet för högt för objektet %s"
-
-#: rerere.c:201 rerere.c:210 rerere.c:213
-msgid "corrupt MERGE_RR"
-msgstr "trasig MERGE_RR"
-
-#: rerere.c:248 rerere.c:253
-msgid "unable to write rerere record"
-msgstr "kunde inte skriva rerere-post"
-
-#: rerere.c:479
-#, c-format
-msgid "there were errors while writing '%s' (%s)"
-msgstr "fel vid skrivning av \"%s\" (%s)"
-
-#: rerere.c:482 builtin/gc.c:2263 builtin/gc.c:2298
-#, c-format
-msgid "failed to flush '%s'"
-msgstr "misslyckades spola \"%s\""
-
-#: rerere.c:487 rerere.c:1024
-#, c-format
-msgid "could not parse conflict hunks in '%s'"
-msgstr "kunde inte tolka konflikt-stycket i \"%s\""
-
-#: rerere.c:669
-#, c-format
-msgid "failed utime() on '%s'"
-msgstr "\"utime()\" misslyckades på \"%s\""
-
-#: rerere.c:679
-#, c-format
-msgid "writing '%s' failed"
-msgstr "misslyckades skriva \"%s\""
-
-#: rerere.c:699
-#, c-format
-msgid "Staged '%s' using previous resolution."
-msgstr "Köade \"%s\" med sparad lösning."
-
-#: rerere.c:738
-#, c-format
-msgid "Recorded resolution for '%s'."
-msgstr "Sparade lösning för \"%s\"."
-
-#: rerere.c:773
-#, c-format
-msgid "Resolved '%s' using previous resolution."
-msgstr "Löste \"%s\" med tidigare lösning."
-
-#: rerere.c:788
-#, c-format
-msgid "cannot unlink stray '%s'"
-msgstr "kan inte ta bort lös länk \"%s\""
-
-#: rerere.c:792
-#, c-format
-msgid "Recorded preimage for '%s'"
-msgstr "Sparade förhandsbild för \"%s\""
-
-#: rerere.c:866 submodule.c:2290 builtin/log.c:2042
-#: builtin/submodule--helper.c:1786 builtin/submodule--helper.c:1833
-#, c-format
-msgid "could not create directory '%s'"
-msgstr "kunde inte skapa katalogen \"%s\""
-
-#: rerere.c:1042
-#, c-format
-msgid "failed to update conflicted state in '%s'"
-msgstr "misslyckades uppdatera tillstånd för sammanslagningsproblem i \"%s\""
-
-#: rerere.c:1053 rerere.c:1060
-#, c-format
-msgid "no remembered resolution for '%s'"
-msgstr "inget sparat sammanslagningsresultat för \"%s\""
-
-#: rerere.c:1062
-#, c-format
-msgid "cannot unlink '%s'"
-msgstr "kan inte ta bort länken \"%s\""
-
-#: rerere.c:1072
-#, c-format
-msgid "Updated preimage for '%s'"
-msgstr "Uppdaterade förhandsbild för \"%s\""
-
-#: rerere.c:1081
-#, c-format
-msgid "Forgot resolution for '%s'\n"
-msgstr "Glömde lösning för \"%s\"\n"
-
-#: rerere.c:1192
-msgid "unable to open rr-cache directory"
-msgstr "kan inte uppdatera katalogen rr-cache"
-
-#: reset.c:112
-msgid "could not determine HEAD revision"
-msgstr "kunde inte bestämma HEAD-revision"
-
-#: reset.c:141 reset.c:147 sequencer.c:3696
-#, c-format
-msgid "failed to find tree of %s"
-msgstr "kunde inte hitta trädet för %s."
-
-#: revision.c:2358
-msgid "--unpacked=<packfile> no longer supported"
-msgstr "--unpacked=<paketfil> stöds inte längre"
-
-#: revision.c:2712
-msgid "your current branch appears to be broken"
-msgstr "din nuvarande gren verkar vara trasig"
-
-#: revision.c:2715
-#, 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:2901
-msgid "object filtering requires --objects"
-msgstr "objektfiltrering kräver --objects"
-
-#: revision.c:2918
-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:1262
-#, c-format
-msgid "cannot create async thread: %s"
-msgstr "kan inte skapa asynkron tråd: %s"
-
-#: send-pack.c:150
-msgid "unexpected flush packet while reading remote unpack status"
-msgstr "oväntat flush-paket vid läsning av fjärruppackningsstatus"
-
-#: send-pack.c:152
-#, c-format
-msgid "unable to parse remote unpack status: %s"
-msgstr "kunde inte tolka fjärruppackningsstatus: %s"
-
-#: send-pack.c:154
-#, c-format
-msgid "remote unpack failed: %s"
-msgstr "fjärruppackning misslyckades: %s"
-
-#: send-pack.c:378
-msgid "failed to sign the push certificate"
-msgstr "misslyckades underteckna push-certifikatet"
-
-#: 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:457
-msgid "push negotiation failed; proceeding anyway with push"
-msgstr "sänd-förhandling misslyckades; fortsätter ändå med sändningen"
-
-#: 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:537
-msgid "the receiving end does not support --signed push"
-msgstr "mottagarsidan stöder inte push med --signed"
-
-#: send-pack.c:539
-msgid ""
-"not sending a push certificate since the receiving end does not support --"
-"signed push"
-msgstr ""
-"sänder inte push-certifikat eftersom mottagarsidan inte stlder push med --"
-"signed"
-
-#: send-pack.c:546
-msgid "the receiving end does not support --atomic push"
-msgstr "mottagarsidan stöder inte push med --atomic"
-
-#: send-pack.c:551
-msgid "the receiving end does not support push options"
-msgstr "mottagarsidan stöder inte push-flaggor"
-
-#: sequencer.c:197
-#, c-format
-msgid "invalid commit message cleanup mode '%s'"
-msgstr "felaktigt incheckningsmeddelandestädningsläge \"%s\""
-
-#: sequencer.c:325
-#, c-format
-msgid "could not delete '%s'"
-msgstr "kunde inte ta bort \"%s\""
-
-#: sequencer.c:345 sequencer.c:4724 builtin/rebase.c:564 builtin/rebase.c:1326
-#: builtin/rm.c:409
-#, c-format
-msgid "could not remove '%s'"
-msgstr "kunde inte ta bort \"%s\""
-
-#: sequencer.c:355
-msgid "revert"
-msgstr "revert"
-
-#: sequencer.c:357
-msgid "cherry-pick"
-msgstr "cherry-pick"
-
-#: sequencer.c:359
-msgid "rebase"
-msgstr "rebase"
-
-#: sequencer.c:361
-#, c-format
-msgid "unknown action: %d"
-msgstr "okänd funktion: %d"
-
-#: sequencer.c:420
-msgid ""
-"after resolving the conflicts, mark the corrected paths\n"
-"with 'git add <paths>' or 'git rm <paths>'"
-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>\""
-
-#: sequencer.c:423
-msgid ""
-"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, 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: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:3288
-#, c-format
-msgid "could not lock '%s'"
-msgstr "kunde inte låsa \"%s\""
-
-#: sequencer.c:450 sequencer.c:3087 sequencer.c:3292 sequencer.c:3306
-#: sequencer.c:3557 sequencer.c:5591 strbuf.c:1189 wrapper.c:715
-#, c-format
-msgid "could not write to '%s'"
-msgstr "kunde inte skriva till \"%s\""
-
-#: sequencer.c:455
-#, c-format
-msgid "could not write eol to '%s'"
-msgstr "kunde inte skriva radslut till \"%s\""
-
-#: sequencer.c:460 sequencer.c:3092 sequencer.c:3294 sequencer.c:3308
-#: sequencer.c:3565
-#, c-format
-msgid "failed to finalize '%s'"
-msgstr "misslyckades färdigställa \"%s\""
-
-#: sequencer.c:473 sequencer.c:1930 sequencer.c:3112 sequencer.c:3547
-#: sequencer.c:3675 builtin/am.c:290 builtin/commit.c:837 builtin/merge.c:1154
-#, c-format
-msgid "could not read '%s'"
-msgstr "kunde inte läsa \"%s\""
-
-#: 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: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:535
-#, c-format
-msgid "%s: fast-forward"
-msgstr "%s: snabbspola"
-
-#: sequencer.c:574 builtin/tag.c:615
-#, c-format
-msgid "Invalid cleanup mode %s"
-msgstr "Felaktigt städningsläge %s"
-
-#. TRANSLATORS: %s will be "revert", "cherry-pick" or
-#. "rebase".
-#.
-#: sequencer.c:685
-#, c-format
-msgid "%s: Unable to write new index file"
-msgstr "%s: Kunde inte skriva ny indexfil"
-
-#: sequencer.c:699
-msgid "unable to update cache tree"
-msgstr "kan inte uppdatera cacheträd"
-
-#: sequencer.c:713
-msgid "could not resolve HEAD commit"
-msgstr "kunde inte bestämma HEAD:s incheckning"
-
-#: sequencer.c:793
-#, c-format
-msgid "no key present in '%.*s'"
-msgstr "ingen nyckel i  \"%.*s\""
-
-#: sequencer.c:804
-#, c-format
-msgid "unable to dequote value of '%s'"
-msgstr "kan inte ta bort citering av värdet \"%s\""
-
-#: sequencer.c:841 wrapper.c:219 wrapper.c:389 builtin/am.c:757
-#: builtin/am.c:849 builtin/rebase.c:699
-#, c-format
-msgid "could not open '%s' for reading"
-msgstr "kunde inte öppna \"%s\" för läsning"
-
-#: sequencer.c:851
-msgid "'GIT_AUTHOR_NAME' already given"
-msgstr "\"GIT_AUTHOR_NAME\" har redan angivits"
-
-#: sequencer.c:856
-msgid "'GIT_AUTHOR_EMAIL' already given"
-msgstr "\"GIT_AUTHOR_EMAIL\" har redan angivits"
-
-#: sequencer.c:861
-msgid "'GIT_AUTHOR_DATE' already given"
-msgstr "\"GIT_AUTHOR_DATE\" har redan angivits"
-
-#: sequencer.c:865
-#, c-format
-msgid "unknown variable '%s'"
-msgstr "okänd variabel \"%s\""
-
-#: sequencer.c:870
-msgid "missing 'GIT_AUTHOR_NAME'"
-msgstr "\"GIT_AUTHOR_NAME\" saknas"
-
-#: sequencer.c:872
-msgid "missing 'GIT_AUTHOR_EMAIL'"
-msgstr "\"GIT_AUTHOR_EMAIL\" saknas"
-
-#: sequencer.c:874
-msgid "missing 'GIT_AUTHOR_DATE'"
-msgstr "\"GIT_AUTHOR_DATE\" saknas"
-
-#: sequencer.c:939
-#, c-format
-msgid ""
-"you have staged changes in your working tree\n"
-"If these changes are meant to be squashed into the previous commit, run:\n"
-"\n"
-"  git commit --amend %s\n"
-"\n"
-"If they are meant to go into a new commit, run:\n"
-"\n"
-"  git commit %s\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 ändringarna ska läggas in i föregående incheckning, kör:\n"
-"\n"
-"  git commit --amend %s\n"
-"\n"
-"Om de ska checkas in i en egen incheckning, kör:\n"
-"\n"
-"  git commit %s\n"
-"\n"
-"Oavsett vilket, när du är färdig fortsätter du med:\n"
-"\n"
-"  git rebase --continue\n"
-
-#: sequencer.c:1225
-msgid "'prepare-commit-msg' hook failed"
-msgstr "kroken \"prepare-commit-msg\" misslyckades"
-
-#: sequencer.c:1231
-msgid ""
-"Your name and email address were configured automatically based\n"
-"on your username and hostname. Please check that they are accurate.\n"
-"You can suppress this message by setting them explicitly. Run the\n"
-"following command and follow the instructions in your editor to edit\n"
-"your configuration file:\n"
-"\n"
-"    git config --global --edit\n"
-"\n"
-"After doing this, you may fix the identity used for this commit with:\n"
-"\n"
-"    git commit --amend --reset-author\n"
-msgstr ""
-"Ditt namn och e-postadress konfigurerades automatiskt baserat på\n"
-"ditt användar-id och värdnamn. Kontrollera att de är riktiga. Du\n"
-"kan förhindra det här meddelandet genom att ställa dem explicit.\n"
-"Kör följande kommandon och följ instruktionerna i textredigeraren\n"
-"för att redigera din konfigurationsfil:\n"
-"\n"
-"    git config --global --edit\n"
-"\n"
-"När du gjort det kan du rätta identiteten som användes för den här\n"
-"incheckningen med:\n"
-"\n"
-"    git commit --amend --reset-author\n"
-
-#: sequencer.c:1244
-msgid ""
-"Your name and email address were configured automatically based\n"
-"on your username and hostname. Please check that they are accurate.\n"
-"You can suppress this message by setting them explicitly:\n"
-"\n"
-"    git config --global user.name \"Your Name\"\n"
-"    git config --global user.email you@example.com\n"
-"\n"
-"After doing this, you may fix the identity used for this commit with:\n"
-"\n"
-"    git commit --amend --reset-author\n"
-msgstr ""
-"Ditt namn och e-postadress konfigurerades automatiskt baserat på\n"
-"ditt användar-id och värdnamn. Kontrollera att de är riktiga. Du\n"
-"kan förhindra det här meddelandet genom att ställa dem explicit:\n"
-"\n"
-"    git config --global user.name \"Ditt namn\"\n"
-"    git config --global user.email du@example.com\n"
-"\n"
-"När du gjort det kan du rätta identiteten som användes för den här\n"
-"incheckningen med:\n"
-"\n"
-"    git commit --amend --reset-author\n"
-
-#: sequencer.c:1287
-msgid "couldn't look up newly created commit"
-msgstr "kunde inte slå upp en precis skapad incheckning"
-
-#: sequencer.c:1289
-msgid "could not parse newly created commit"
-msgstr "kunde inte tolka en precis skapad incheckning"
-
-#: sequencer.c:1336
-msgid "unable to resolve HEAD after creating commit"
-msgstr "kunde inte bestämma HEAD efter att ha skapat incheckning"
-
-#: sequencer.c:1338
-msgid "detached HEAD"
-msgstr "frånkopplad HEAD"
-
-#: sequencer.c:1342
-msgid " (root-commit)"
-msgstr " (rotincheckning)"
-
-#: sequencer.c:1363
-msgid "could not parse HEAD"
-msgstr "kunde inte tolka HEAD"
-
-#: sequencer.c:1365
-#, c-format
-msgid "HEAD %s is not a commit!"
-msgstr "HEAD %s är inte en incheckning!"
-
-#: sequencer.c:1369 sequencer.c:1447 builtin/commit.c:1707
-msgid "could not parse HEAD commit"
-msgstr "kunde inte tolka HEAD:s incheckning"
-
-#: sequencer.c:1425 sequencer.c:2310
-msgid "unable to parse commit author"
-msgstr "kunde inte tolka incheckningens författare"
-
-#: sequencer.c:1436 builtin/am.c:1644 builtin/merge.c:710
-msgid "git write-tree failed to write a tree"
-msgstr "git write-tree misslyckades skriva ett träd"
-
-#: sequencer.c:1469 sequencer.c:1589
-#, c-format
-msgid "unable to read commit message from '%s'"
-msgstr "kunde inte läsa incheckningsmeddelande från \"%s\""
-
-#: sequencer.c:1500 sequencer.c:1532
-#, c-format
-msgid "invalid author identity '%s'"
-msgstr "ogiltig författar-identitet \"%s\""
-
-#: sequencer.c:1506
-msgid "corrupt author: missing date information"
-msgstr "trasig författare: saknar datuminformation"
-
-#: sequencer.c:1545 builtin/am.c:1671 builtin/commit.c:1821 builtin/merge.c:921
-#: builtin/merge.c:946 t/helper/test-fast-rebase.c:78
-msgid "failed to write commit object"
-msgstr "kunde inte skriva incheckningsobjekt"
-
-#: sequencer.c:1572 sequencer.c:4496 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:1621
-#, c-format
-msgid "could not parse commit %s"
-msgstr "kunde inte tolka incheckningen %s"
-
-#: sequencer.c:1626
-#, c-format
-msgid "could not parse parent commit %s"
-msgstr "kunde inte tolka föräldraincheckningen %s"
-
-#: sequencer.c:1709 sequencer.c:1990
-#, c-format
-msgid "unknown command: %d"
-msgstr "okänt kommando: %d"
-
-#: sequencer.c:1751
-msgid "This is the 1st commit message:"
-msgstr "Det här är 1:a incheckningsmeddelandet:"
-
-#: sequencer.c:1752
-#, c-format
-msgid "This is the commit message #%d:"
-msgstr "Det här är incheckningsmeddelande %d:"
-
-#: sequencer.c:1753
-msgid "The 1st commit message will be skipped:"
-msgstr "1:a incheckningsmeddelandet kommer hoppas över:"
-
-#: sequencer.c:1754
-#, c-format
-msgid "The commit message #%d will be skipped:"
-msgstr "Incheckningsmeddelande %d kommer hoppas över:"
-
-#: sequencer.c:1755
-#, c-format
-msgid "This is a combination of %d commits."
-msgstr "Det här är en kombination av %d incheckningar."
-
-#: sequencer.c:1902 sequencer.c:1959
-#, c-format
-msgid "cannot write '%s'"
-msgstr "kan inte skriva \"%s\""
-
-#: sequencer.c:1949
-msgid "need a HEAD to fixup"
-msgstr "behöver en HEAD-incheckning att rätta"
-
-#: sequencer.c:1951 sequencer.c:3592
-msgid "could not read HEAD"
-msgstr "kunde inte läsa HEAD"
-
-#: sequencer.c:1953
-msgid "could not read HEAD's commit message"
-msgstr "kunde inte läsa HEAD:s incheckningsmeddelande"
-
-#: sequencer.c:1977
-#, c-format
-msgid "could not read commit message of %s"
-msgstr "kunde inte läsa incheckningsmeddelande för %s"
-
-#: sequencer.c:2087
-msgid "your index file is unmerged."
-msgstr "din indexfil har inte slagits ihop."
-
-#: sequencer.c:2094
-msgid "cannot fixup root commit"
-msgstr "kan inte göra \"fixup\" på rotincheckning"
-
-#: sequencer.c:2113
-#, 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:2121 sequencer.c:2129
-#, c-format
-msgid "commit %s does not have parent %d"
-msgstr "incheckning %s har inte förälder %d"
-
-#: sequencer.c:2135
-#, 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:2154
-#, c-format
-msgid "%s: cannot parse parent commit %s"
-msgstr "%s: kan inte tolka föräldraincheckningen %s"
-
-#: sequencer.c:2220
-#, c-format
-msgid "could not rename '%s' to '%s'"
-msgstr "kunde inte byta namn på \"%s\" till \"%s\""
-
-#: sequencer.c:2280
-#, c-format
-msgid "could not revert %s... %s"
-msgstr "kunde inte ångra %s... %s"
-
-#: sequencer.c:2281
-#, c-format
-msgid "could not apply %s... %s"
-msgstr "kunde inte tillämpa %s... %s"
-
-#: sequencer.c:2302
-#, 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:2360
-#, c-format
-msgid "git %s: failed to read the index"
-msgstr "git %s: misslyckades läsa indexet"
-
-#: sequencer.c:2368
-#, c-format
-msgid "git %s: failed to refresh the index"
-msgstr "git %s: misslyckades uppdatera indexet"
-
-#: sequencer.c:2448
-#, c-format
-msgid "%s does not accept arguments: '%s'"
-msgstr "%s tar inte argument: \"%s\""
-
-#: sequencer.c:2457
-#, c-format
-msgid "missing arguments for %s"
-msgstr "argument saknas för %s"
-
-#: sequencer.c:2500
-#, c-format
-msgid "could not parse '%s'"
-msgstr "kunde inte tolka \"%s\""
-
-#: sequencer.c:2561
-#, c-format
-msgid "invalid line %d: %.*s"
-msgstr "ogiltig rad %d: %.*s"
-
-#: sequencer.c:2572
-#, c-format
-msgid "cannot '%s' without a previous commit"
-msgstr "kan inte utföra \"%s\" utan en föregående incheckning"
-
-#: sequencer.c:2620 builtin/rebase.c:185
-#, c-format
-msgid "could not read '%s'."
-msgstr "kunde inte läsa \"%s\"."
-
-#: sequencer.c:2658
-msgid "cancelling a cherry picking in progress"
-msgstr "avbryter pågående \"cherry-pick\""
-
-#: sequencer.c:2667
-msgid "cancelling a revert in progress"
-msgstr "avbryter pågående \"revert\""
-
-#: sequencer.c:2707
-msgid "please fix this using 'git rebase --edit-todo'."
-msgstr "rätta det med \"git rebase --edit-todo\"."
-
-#: sequencer.c:2709
-#, c-format
-msgid "unusable instruction sheet: '%s'"
-msgstr "oanvändbart manus: \"%s\""
-
-#: sequencer.c:2714
-msgid "no commits parsed."
-msgstr "inga incheckningar lästes."
-
-#: sequencer.c:2725
-msgid "cannot cherry-pick during a revert."
-msgstr "kan inte utföra \"cherry-pick\" under en \"revert\"."
-
-#: sequencer.c:2727
-msgid "cannot revert during a cherry-pick."
-msgstr "kan inte utföra \"revert\" under en \"cherry-pick\"."
-
-#: sequencer.c:2914
-msgid "unusable squash-onto"
-msgstr "oanvändbar squash-onto"
-
-#: sequencer.c:2934
-#, c-format
-msgid "malformed options sheet: '%s'"
-msgstr "trasigt manus: \"%s\""
-
-#: sequencer.c:3029 sequencer.c:4875
-msgid "empty commit set passed"
-msgstr "den angivna uppsättningen incheckningar är tom"
-
-#: sequencer.c:3046
-msgid "revert is already in progress"
-msgstr "en \"revert\" pågår redan"
-
-#: sequencer.c:3048
-#, c-format
-msgid "try \"git revert (--continue | %s--abort | --quit)\""
-msgstr "testa \"git revert (--continue | %s--abort | --quit)\""
-
-#: sequencer.c:3051
-msgid "cherry-pick is already in progress"
-msgstr "en \"cherry-pick\" pågår redan"
-
-#: sequencer.c:3053
-#, c-format
-msgid "try \"git cherry-pick (--continue | %s--abort | --quit)\""
-msgstr "testa \"git cherry-pick (--continue | %s--abort | --quit)\""
-
-#: sequencer.c:3067
-#, c-format
-msgid "could not create sequencer directory '%s'"
-msgstr "kunde inte skapa \"sequencer\"-katalogen \"%s\""
-
-#: sequencer.c:3082
-msgid "could not lock HEAD"
-msgstr "kunde inte låsa HEAD"
-
-#: sequencer.c:3142 sequencer.c:4585
-msgid "no cherry-pick or revert in progress"
-msgstr "ingen \"cherry-pick\" eller \"revert\" pågår"
-
-#: sequencer.c:3144 sequencer.c:3155
-msgid "cannot resolve HEAD"
-msgstr "kan inte bestämma HEAD"
-
-#: sequencer.c:3146 sequencer.c:3190
-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:3176 builtin/fetch.c:1030 builtin/fetch.c:1457
-#: builtin/grep.c:774
-#, c-format
-msgid "cannot open '%s'"
-msgstr "kan inte öppna \"%s\""
-
-#: sequencer.c:3178
-#, c-format
-msgid "cannot read '%s': %s"
-msgstr "kan inte läsa \"%s\": %s"
-
-#: sequencer.c:3179
-msgid "unexpected end of file"
-msgstr "oväntat filslut"
-
-#: sequencer.c:3185
-#, 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:3196
-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:3237
-msgid "no revert in progress"
-msgstr "ingen \"revers\" pågår"
-
-#: sequencer.c:3246
-msgid "no cherry-pick in progress"
-msgstr "ingen \"cherry-pick\" pågår"
-
-#: sequencer.c:3256
-msgid "failed to skip the commit"
-msgstr "kunde inte hoppa över incheckningen"
-
-#: sequencer.c:3263
-msgid "there is nothing to skip"
-msgstr "ingenting att hoppa över"
-
-#: sequencer.c:3266
-#, c-format
-msgid ""
-"have you committed already?\n"
-"try \"git %s --continue\""
-msgstr ""
-"har du redan checkat in?\n"
-"testa \"git %s --continue\""
-
-#: sequencer.c:3428 sequencer.c:4476
-msgid "cannot read HEAD"
-msgstr "kan inte läsa HEAD"
-
-#: sequencer.c:3445
-#, c-format
-msgid "unable to copy '%s' to '%s'"
-msgstr "kan inte kopiera in \"%s\" till \"%s\""
-
-#: sequencer.c:3453
-#, c-format
-msgid ""
-"You can amend the commit now, with\n"
-"\n"
-"  git commit --amend %s\n"
-"\n"
-"Once you are satisfied with your changes, run\n"
-"\n"
-"  git rebase --continue\n"
-msgstr ""
-"Du kan utöka incheckningen nu, med\n"
-"\n"
-"\tgit commit --amend %s\n"
-"\n"
-"När du är nöjd med dina ändringar kör du\n"
-"\n"
-"\tgit rebase --continue\n"
-
-#: sequencer.c:3463
-#, c-format
-msgid "Could not apply %s... %.*s"
-msgstr "Kunde inte tillämpa %s... %.*s"
-
-#: sequencer.c:3470
-#, c-format
-msgid "Could not merge %.*s"
-msgstr "Kunde inte slå ihop %.*s"
-
-#: sequencer.c:3484 sequencer.c:3488 builtin/difftool.c:633
-#, c-format
-msgid "could not copy '%s' to '%s'"
-msgstr "kunde inte kopiera in \"%s\" till \"%s\""
-
-#: sequencer.c:3499
-#, c-format
-msgid "Executing: %s\n"
-msgstr "Kör: %s\n"
-
-#: sequencer.c:3510
-#, c-format
-msgid ""
-"execution failed: %s\n"
-"%sYou can fix the problem, and then run\n"
-"\n"
-"  git rebase --continue\n"
-"\n"
-msgstr ""
-"körningen misslyckades: %s\n"
-"%sDu kan rätta problemet och sedan köra\n"
-"\n"
-"\tgit rebase --continue\n"
-"\n"
-
-#: sequencer.c:3516
-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:3522
-#, c-format
-msgid ""
-"execution succeeded: %s\n"
-"but left changes to the index and/or the working tree\n"
-"Commit or stash your changes, and then run\n"
-"\n"
-"  git rebase --continue\n"
-"\n"
-msgstr ""
-"körningen lyckades: %s\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\n"
-"\n"
-
-#: sequencer.c:3582
-#, c-format
-msgid "illegal label name: '%.*s'"
-msgstr "ogiltigt etikettnamn: \"%.*s\""
-
-#: sequencer.c:3655
-msgid "writing fake root commit"
-msgstr "skriver fejkad rotincheckning"
-
-#: sequencer.c:3660
-msgid "writing squash-onto"
-msgstr "skriver squash-onto"
-
-#: sequencer.c:3739
-#, c-format
-msgid "could not resolve '%s'"
-msgstr "kunde inte upplösa \"%s\""
-
-#: sequencer.c:3771
-msgid "cannot merge without a current revision"
-msgstr "kan inte slå ihop utan en aktuell incheckning"
-
-#: sequencer.c:3793
-#, c-format
-msgid "unable to parse '%.*s'"
-msgstr "kan inte tolka \"%.*s\""
-
-#: sequencer.c:3802
-#, c-format
-msgid "nothing to merge: '%.*s'"
-msgstr "inget att slå samman: \"%.*s\""
-
-#: sequencer.c:3814
-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:3869
-#, c-format
-msgid "could not get commit message of '%s'"
-msgstr "kunde inte läsa incheckningsmeddelande för \"%s\""
-
-#: sequencer.c:4013
-#, c-format
-msgid "could not even attempt to merge '%.*s'"
-msgstr "kunde inte ens försöka slå ihop \"%.*s\""
-
-#: sequencer.c:4029
-msgid "merge: Unable to write new index file"
-msgstr "sammanslagning: Kunde inte skriva ny indexfil"
-
-#: sequencer.c:4110
-msgid "Cannot autostash"
-msgstr "Kan inte utföra \"autostash\""
-
-#: sequencer.c:4113
-#, c-format
-msgid "Unexpected stash response: '%s'"
-msgstr "Oväntat svar från stash: \"%s\""
-
-#: sequencer.c:4119
-#, c-format
-msgid "Could not create directory for '%s'"
-msgstr "Kunde inte skapa katalog för \"%s\""
-
-#: sequencer.c:4122
-#, c-format
-msgid "Created autostash: %s\n"
-msgstr "Skapade autostash: %s\n"
-
-#: sequencer.c:4124
-msgid "could not reset --hard"
-msgstr "kunde inte utföra \"reset --hard\""
-
-#: sequencer.c:4148
-#, c-format
-msgid "Applied autostash.\n"
-msgstr "Tillämpade autostash.\n"
-
-#: sequencer.c:4160
-#, c-format
-msgid "cannot store %s"
-msgstr "kan inte spara %s"
-
-#: sequencer.c:4163
-#, c-format
-msgid ""
-"%s\n"
-"Your changes are safe in the stash.\n"
-"You can run \"git stash pop\" or \"git stash drop\" at any time.\n"
-msgstr ""
-"%s\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"
-
-#: sequencer.c:4168
-msgid "Applying autostash resulted in conflicts."
-msgstr "Tillämpning av autostash gav konflikter."
-
-#: sequencer.c:4169
-msgid "Autostash exists; creating a new stash entry."
-msgstr "Autostash finns; skapar ny stash-post."
-
-#: sequencer.c:4225
-msgid "could not detach HEAD"
-msgstr "kunde inte koppla från HEAD"
-
-#: sequencer.c:4240
-#, c-format
-msgid "Stopped at HEAD\n"
-msgstr "Stoppade på HEAD\n"
-
-#: sequencer.c:4242
-#, c-format
-msgid "Stopped at %s\n"
-msgstr "Stoppade på %s\n"
-
-#: sequencer.c:4274
-#, c-format
-msgid ""
-"Could not execute the todo command\n"
-"\n"
-"    %.*s\n"
-"It has been rescheduled; To edit the command before continuing, please\n"
-"edit the todo list first:\n"
-"\n"
-"    git rebase --edit-todo\n"
-"    git rebase --continue\n"
-msgstr ""
-"Kunde inte köra todo-kommandot\n"
-"\n"
-"    %.*s\n"
-"Det har lagts tillbaka i kön; För att redigera kommandot innan du\n"
-"fortsätter, redigera först attgöra-listan:\n"
-"\n"
-"    git rebase --edit-todo\n"
-"    git rebase --continue\n"
-
-#: sequencer.c:4320
-#, c-format
-msgid "Rebasing (%d/%d)%s"
-msgstr "Ombaserar (%d/%d)%s"
-
-#: sequencer.c:4366
-#, c-format
-msgid "Stopped at %s...  %.*s\n"
-msgstr "Stoppade på %s... %.*s\n"
-
-#: sequencer.c:4436
-#, c-format
-msgid "unknown command %d"
-msgstr "okänt kommando %d"
-
-#: sequencer.c:4484
-msgid "could not read orig-head"
-msgstr "kunde inte läsa orig-head"
-
-#: sequencer.c:4489
-msgid "could not read 'onto'"
-msgstr "kunde inte läsa \"onto\""
-
-#: sequencer.c:4503
-#, c-format
-msgid "could not update HEAD to %s"
-msgstr "kunde inte uppdatera HEAD till %s"
-
-#: sequencer.c:4563
-#, c-format
-msgid "Successfully rebased and updated %s.\n"
-msgstr "Lyckades ombasera och uppdatera %s.\n"
-
-#: sequencer.c:4615
-msgid "cannot rebase: You have unstaged changes."
-msgstr "kan inte ombasera: Du har oköade ändringar."
-
-#: sequencer.c:4624
-msgid "cannot amend non-existing commit"
-msgstr "kan inte lägga till incheckning som inte finns"
-
-#: sequencer.c:4626
-#, c-format
-msgid "invalid file: '%s'"
-msgstr "ogiltig fil: \"%s\""
-
-#: sequencer.c:4628
-#, c-format
-msgid "invalid contents: '%s'"
-msgstr "ogiltigt innehåll: \"%s\""
-
-#: sequencer.c:4631
-msgid ""
-"\n"
-"You have uncommitted changes in your working tree. Please, commit them\n"
-"first and then run 'git rebase --continue' again."
-msgstr ""
-"\n"
-"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:4667 sequencer.c:4706
-#, c-format
-msgid "could not write file: '%s'"
-msgstr "kunde inte skriva fil: \"%s\""
-
-#: sequencer.c:4722
-msgid "could not remove CHERRY_PICK_HEAD"
-msgstr "kunde inte ta bort CHERRY_PICK_HEAD"
-
-#: sequencer.c:4732
-msgid "could not commit staged changes."
-msgstr "kunde inte checka in köade ändringar."
-
-#: sequencer.c:4852
-#, c-format
-msgid "%s: can't cherry-pick a %s"
-msgstr "%s: kan inte göra \"cherry-pick\" på typen \"%s\""
-
-#: sequencer.c:4856
-#, c-format
-msgid "%s: bad revision"
-msgstr "%s: felaktig revision"
-
-#: sequencer.c:4891
-msgid "can't revert as initial commit"
-msgstr "kan inte ångra som första incheckning"
-
-#: sequencer.c:5162 sequencer.c:5391
-#, c-format
-msgid "skipped previously applied commit %s"
-msgstr "hoppade över tidigare applicerad incheckning %s"
-
-#: sequencer.c:5232 sequencer.c:5407
-msgid "use --reapply-cherry-picks to include skipped commits"
-msgstr "använd --reapply-cherry-picks för att ta med överhoppade incheckningar"
-
-#: sequencer.c:5378
-msgid "make_script: unhandled options"
-msgstr "make_script: flaggor som inte stöds"
-
-#: sequencer.c:5381
-msgid "make_script: error preparing revisions"
-msgstr "make_script: fel när revisioner skulle förberedas"
-
-#: sequencer.c:5639 sequencer.c:5656
-msgid "nothing to do"
-msgstr "inget att göra"
-
-#: sequencer.c:5675
-msgid "could not skip unnecessary pick commands"
-msgstr "kunde inte hoppa över onödiga \"pick\"-kommandon"
-
-#: sequencer.c:5775
-msgid "the script was already rearranged."
-msgstr "skriptet har redan omordnats."
-
-#: setup.c:135
-#, c-format
-msgid "'%s' is outside repository at '%s'"
-msgstr "\"%s\" är utanför arkivet på \"%s\""
-
-#: setup.c:187
-#, c-format
-msgid ""
-"%s: no such path in the working tree.\n"
-"Use 'git <command> -- <path>...' to specify paths that do not exist locally."
-msgstr ""
-"%s: sökvägen finns inte i arbetskatalogen.\n"
-"Använd \"git <kommando> -- <sökväg>..\" för att ange sökvägar som inte finns "
-"lokalt."
-
-#: setup.c:200
-#, c-format
-msgid ""
-"ambiguous argument '%s': unknown revision or path not in the working tree.\n"
-"Use '--' to separate paths from revisions, like this:\n"
-"'git <command> [<revision>...] -- [<file>...]'"
-msgstr ""
-"tvetydigt argument \"%s\": okänd revision eller sökväg inte i "
-"arbetskatalogen.\n"
-"Använd \"--\" för att skilja sökvägar från revisioner, så här:\n"
-"\"git <kommando> [<revision>...] -- [<fil>...]\""
-
-#: setup.c:266
-#, c-format
-msgid "option '%s' must come before non-option arguments"
-msgstr "flaggan \"%s\" måste anges före argument som inte är flaggor"
-
-#: setup.c:285
-#, c-format
-msgid ""
-"ambiguous argument '%s': both revision and filename\n"
-"Use '--' to separate paths from revisions, like this:\n"
-"'git <command> [<revision>...] -- [<file>...]'"
-msgstr ""
-"tvetydigt argument \"%s\": både revision och filnamn\n"
-"Använd \"--\" för att skilja sökvägar från revisioner, så här:\n"
-"\"git <kommando> [<revision>...] -- [<fil>...]\""
-
-#: setup.c:421
-msgid "unable to set up work tree using invalid config"
-msgstr "kan inte skapa arbetskatalog med felaktig konfiguration"
-
-#: setup.c:425 builtin/rev-parse.c:895
-msgid "this operation must be run in a work tree"
-msgstr "funktionen måste köras i en arbetskatalog"
-
-#: setup.c:724
-#, c-format
-msgid "Expected git repo version <= %d, found %d"
-msgstr "Förväntade git-arkivversion <= %d, hittade %d"
-
-#: setup.c:732
-msgid "unknown repository extension found:"
-msgid_plural "unknown repository extensions found:"
-msgstr[0] "okänd arkivutökning hittades:"
-msgstr[1] "okända arkivutökningar hittades:"
-
-#: setup.c:746
-msgid "repo version is 0, but v1-only extension found:"
-msgid_plural "repo version is 0, but v1-only extensions found:"
-msgstr[0] "arkivversionen är 0, men utökning som bara finns i v1 upptäcktes:"
-msgstr[1] "arkivversionen är 0, men utökningar som bara finns i v1 upptäcktes:"
-
-#: setup.c:767
-#, c-format
-msgid "error opening '%s'"
-msgstr "fel vid öppning av \"%s\""
-
-#: setup.c:769
-#, c-format
-msgid "too large to be a .git file: '%s'"
-msgstr "för stor för att vara en .git-fil: \"%s\""
-
-#: setup.c:771
-#, c-format
-msgid "error reading %s"
-msgstr "fel vid läsning av %s"
-
-#: setup.c:773
-#, c-format
-msgid "invalid gitfile format: %s"
-msgstr "ogiltigt gitfilformat: %s"
-
-#: setup.c:775
-#, c-format
-msgid "no path in gitfile: %s"
-msgstr "ingen sökväg i gitfil: %s"
-
-#: setup.c:777
-#, c-format
-msgid "not a git repository: %s"
-msgstr "inte ett git-arkiv: %s"
-
-#: setup.c:879
-#, c-format
-msgid "'$%s' too big"
-msgstr "\"$%s\" för stor"
-
-#: setup.c:893
-#, c-format
-msgid "not a git repository: '%s'"
-msgstr "inte ett git-arkiv: \"%s\""
-
-#: setup.c:922 setup.c:924 setup.c:955
-#, c-format
-msgid "cannot chdir to '%s'"
-msgstr "kan inte byta katalog (chdir) till \"%s\""
-
-#: setup.c:927 setup.c:983 setup.c:993 setup.c:1032 setup.c:1040
-msgid "cannot come back to cwd"
-msgstr "kan inte gå tillbaka till arbetskatalogen (cwd)"
-
-#: setup.c:1054
-#, c-format
-msgid "failed to stat '%*s%s%s'"
-msgstr "misslyckades ta status på \"%*ss%s%s\""
-
-#: setup.c:1338
-msgid "Unable to read current working directory"
-msgstr "Kan inte läsa aktuell arbetskatalog"
-
-#: setup.c:1347 setup.c:1353
-#, c-format
-msgid "cannot change to '%s'"
-msgstr "kan inte byta till \"%s\""
-
-#: setup.c:1358
-#, c-format
-msgid "not a git repository (or any of the parent directories): %s"
-msgstr "inte ett git-arkiv (eller någon av föräldrakatalogerna): %s"
-
-#: setup.c:1364
-#, 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 ""
-"inte ett git-arkiv (eller någon av föräldrakatalogerna upp till "
-"monteringspunkten %s)\n"
-"Stoppar vid filsystemsgräns (GIT_DISCOVERY_ACROSS_FILESYSTEM är inte satt)."
-
-#: setup.c:1374
-#, c-format
-msgid ""
-"unsafe repository ('%s' is owned by someone else)\n"
-"To add an exception for this directory, call:\n"
-"\n"
-"\tgit config --global --add safe.directory %s"
-msgstr ""
-"osäkert arkiv (\"%s\" ägs av någon annan)\n"
-"För att lägga till ett undantag för denna katalog, kör:\n"
-"\n"
-"\tgit config --global --add safe.directory %s"
-
-#: setup.c:1502
-#, c-format
-msgid ""
-"problem with core.sharedRepository filemode value (0%.3o).\n"
-"The owner of files must always have read and write permissions."
-msgstr ""
-"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:1564
-msgid "fork failed"
-msgstr "\"fork\" misslyckades"
-
-#: setup.c:1569
-msgid "setsid failed"
-msgstr "\"setsid\" misslyckades"
-
-#: sparse-index.c:285
-#, c-format
-msgid "index entry is a directory, but not sparse (%08x)"
-msgstr "indexposten är en katalog, men inte gles (%08x)"
-
-#: split-index.c:9
-msgid "cannot use split index with a sparse index"
-msgstr "kan inte dela indexet med ett glest index"
-
-#. TRANSLATORS: IEC 80000-13:2008 gibibyte
-#: strbuf.c:851
-#, c-format
-msgid "%u.%2.2u GiB"
-msgstr "%u,%2.2u GiB"
-
-#. TRANSLATORS: IEC 80000-13:2008 gibibyte/second
-#: strbuf.c:853
-#, c-format
-msgid "%u.%2.2u GiB/s"
-msgstr "%u,%2.2u GiB/s"
-
-#. TRANSLATORS: IEC 80000-13:2008 mebibyte
-#: strbuf.c:861
-#, c-format
-msgid "%u.%2.2u MiB"
-msgstr "%u,%2.2u MiB"
-
-#. TRANSLATORS: IEC 80000-13:2008 mebibyte/second
-#: strbuf.c:863
-#, c-format
-msgid "%u.%2.2u MiB/s"
-msgstr "%u,%2.2u MiB/s"
-
-#. TRANSLATORS: IEC 80000-13:2008 kibibyte
-#: strbuf.c:870
-#, c-format
-msgid "%u.%2.2u KiB"
-msgstr "%u,%2.2u KiB"
-
-#. TRANSLATORS: IEC 80000-13:2008 kibibyte/second
-#: strbuf.c:872
-#, c-format
-msgid "%u.%2.2u KiB/s"
-msgstr "%u,%2.2u KiB/s"
-
-#. TRANSLATORS: IEC 80000-13:2008 byte
-#: strbuf.c:878
-#, c-format
-msgid "%u byte"
-msgid_plural "%u bytes"
-msgstr[0] "%u byte"
-msgstr[1] "%u bytes"
-
-#. TRANSLATORS: IEC 80000-13:2008 byte/second
-#: strbuf.c:880
-#, c-format
-msgid "%u byte/s"
-msgid_plural "%u bytes/s"
-msgstr[0] "%u byte/s"
-msgstr[1] "%u bytes/s"
-
-#: strbuf.c:1187 wrapper.c:217 wrapper.c:387 builtin/am.c:766
-#: builtin/rebase.c:653
-#, c-format
-msgid "could not open '%s' for writing"
-msgstr "kunde inte öppna \"%s\" för skrivning"
-
-#: strbuf.c:1196
-#, c-format
-msgid "could not edit '%s'"
-msgstr "kunde inte redigera \"%s\""
-
-#: submodule-config.c:238
-#, c-format
-msgid "ignoring suspicious submodule name: %s"
-msgstr "ignorerar misstänkt undermodulnamn: %s"
-
-#: submodule-config.c:305
-msgid "negative values not allowed for submodule.fetchjobs"
-msgstr "negativa värden är inte tillåtna för submodule.fetchjobs"
-
-#: submodule-config.c:403
-#, c-format
-msgid "ignoring '%s' which may be interpreted as a command-line option: %s"
-msgstr "ignorerar \"%s\" som kan tolkas som en kommandoradsflagga: %s"
-
-#: submodule-config.c:500 builtin/push.c:489 builtin/send-pack.c:148
-#, c-format
-msgid "invalid value for '%s'"
-msgstr "ogiltigt värde för \"%s\""
-
-#: submodule-config.c:828
-#, c-format
-msgid "Could not update .gitmodules entry %s"
-msgstr "Kunde inte uppdatera .gitmodules-posten %s"
-
-#: submodule.c:115 submodule.c:144
-msgid "Cannot change unmerged .gitmodules, resolve merge conflicts first"
-msgstr ""
-"Kan inte ändra .gitmodules-fil som inte slagits ihop, lös "
-"sammanslagningskonflikter först"
-
-#: submodule.c:119 submodule.c:148
-#, c-format
-msgid "Could not find section in .gitmodules where path=%s"
-msgstr "Hittade inte någon sektion i .gitmodules där sökväg=%s"
-
-#: submodule.c:155
-#, c-format
-msgid "Could not remove .gitmodules entry for %s"
-msgstr "Kunde inte ta bort .gitmodules-posten för %s"
-
-#: submodule.c:166
-msgid "staging updated .gitmodules failed"
-msgstr "misslyckades köa uppdaterad .gitmodules"
-
-#: submodule.c:346
-#, c-format
-msgid "in unpopulated submodule '%s'"
-msgstr "i ej utcheckad undermodul \"%s\""
-
-#: submodule.c:377
-#, c-format
-msgid "Pathspec '%s' is in submodule '%.*s'"
-msgstr "Sökvägsangivelsen \"%s\" är i undermodulen \"%.*s\""
-
-#: submodule.c:454
-#, c-format
-msgid "bad --ignore-submodules argument: %s"
-msgstr "felaktigt argument till --ignore-submodules: %s"
-
-#: submodule.c:866
-#, c-format
-msgid ""
-"Submodule in commit %s at path: '%s' collides with a submodule named the "
-"same. Skipping it."
-msgstr ""
-"Undermodulen i incheckning %s på sökvägen: \"%s\" krockar med en undermodul "
-"med samma namn. Hoppar över den."
-
-#: submodule.c:987
-#, 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:1069
-#, c-format
-msgid ""
-"Could not run 'git rev-list <commits> --not --remotes -n 1' command in "
-"submodule %s"
-msgstr ""
-"kunde inte köra \"git rev-list <incheckningar> --not --remotes -n 1\" i "
-"undermodulen \"%s\""
-
-#: submodule.c:1192
-#, c-format
-msgid "process for submodule '%s' failed"
-msgstr "process för undermodulen \"%s\" misslyckades"
-
-#: submodule.c:1221 builtin/branch.c:714 builtin/submodule--helper.c:2827
-msgid "Failed to resolve HEAD as a valid ref."
-msgstr "Misslyckades slå upp HEAD som giltig referens."
-
-#: submodule.c:1232
-#, c-format
-msgid "Pushing submodule '%s'\n"
-msgstr "Sänder undermodulen \"%s\"\n"
-
-#: submodule.c:1235
-#, c-format
-msgid "Unable to push submodule '%s'\n"
-msgstr "Kunde inte sända undermodulen \"%s\"\n"
-
-#: submodule.c:1567
-#, c-format
-msgid "Fetching submodule %s%s\n"
-msgstr "Hämtar undermodulen %s%s\n"
-
-#: submodule.c:1589
-#, c-format
-msgid "Could not access submodule '%s'\n"
-msgstr "Kunde inte komma åt undermodulen \"%s\"\n"
-
-#: submodule.c:1618
-#, c-format
-msgid "Could not access submodule '%s' at commit %s\n"
-msgstr "Kunde inte komma åt undermodulen \"%s\" vid incheckningen %s\n"
-
-#: submodule.c:1629
-#, c-format
-msgid "Fetching submodule %s%s at commit %s\n"
-msgstr "Hämtar undermodulen %s%s vvid incheckningen %s\n"
-
-#: submodule.c:1849
-#, c-format
-msgid ""
-"Errors during submodule fetch:\n"
-"%s"
-msgstr ""
-"Fel vid hämtning av undermodul:\n"
-"%s"
-
-#: submodule.c:1874
-#, c-format
-msgid "'%s' not recognized as a git repository"
-msgstr "\"%s\" känns inte igen som ett git-arkiv"
-
-#: submodule.c:1891
-#, 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:1932
-#, c-format
-msgid "'git status --porcelain=2' failed in submodule %s"
-msgstr "\"git status --porcelain=2\" misslyckades i undermodulen \"%s\""
-
-#: submodule.c:2007
-#, c-format
-msgid "could not start 'git status' in submodule '%s'"
-msgstr "kunde inte starta \"git status\" i undermodulen \"%s\""
-
-#: submodule.c:2020
-#, c-format
-msgid "could not run 'git status' in submodule '%s'"
-msgstr "kunde inte köra \"git status\" i undermodulen \"%s\""
-
-#: submodule.c:2037
-#, 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:2064 submodule.c:2379
-#, c-format
-msgid "could not recurse into submodule '%s'"
-msgstr "kunde inte rekursera in i undermodulen \"%s\""
-
-#: submodule.c:2086
-msgid "could not reset submodule index"
-msgstr "kunde inte återställa indexet i undermodul"
-
-#: submodule.c:2128
-#, c-format
-msgid "submodule '%s' has dirty index"
-msgstr "undermodulen \"%s\" har ett smutsigt index"
-
-#: submodule.c:2182
-#, c-format
-msgid "Submodule '%s' could not be updated."
-msgstr "Undermoduler \"%s\" kunde inte uppdateras."
-
-#: submodule.c:2250
-#, c-format
-msgid "submodule git dir '%s' is inside git dir '%.*s'"
-msgstr "undermodul-gitkatalogen \"%s\" är inuti gitkatalogen \"%.*s\""
-
-#: submodule.c:2271
-#, c-format
-msgid ""
-"relocate_gitdir for submodule '%s' with more than one worktree not supported"
-msgstr ""
-"relocate_gitdir för undermodulen \"%s\", som har mer än en arbetskatalog, "
-"stöds ej"
-
-#: submodule.c:2283 submodule.c:2343
-#, c-format
-msgid "could not lookup name for submodule '%s'"
-msgstr "kunde inte slå upp namnet för undermodulen \"%s\""
-
-#: submodule.c:2287
-#, c-format
-msgid "refusing to move '%s' into an existing git dir"
-msgstr "vägrar flytta \"%s\" till en befintlig gitkatalog"
-
-#: submodule.c:2293
-#, c-format
-msgid ""
-"Migrating git directory of '%s%s' from\n"
-"'%s' to\n"
-"'%s'\n"
-msgstr ""
-"Migrerar git-katalogen för \"%s%s\" från\n"
-"\"%s\" till\n"
-"\"%s\"\n"
-
-#: submodule.c:2424
-msgid "could not start ls-files in .."
-msgstr "kunde inte starta ls-files i .."
-
-#: submodule.c:2464
-#, c-format
-msgid "ls-tree returned unexpected return code %d"
-msgstr "ls-tree returnerade en oväntad returkod %d"
-
-#: symlinks.c:244
-#, c-format
-msgid "failed to lstat '%s'"
-msgstr "misslyckades ta status (lstat) på \"%s\""
-
-#: trailer.c:244
-#, c-format
-msgid "running trailer command '%s' failed"
-msgstr "misslyckades utföra släpradskommandot \"%s\""
-
-#: 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 "okänt värde \"%s\" för nyckeln \"%s\""
-
-#: trailer.c:547 trailer.c:552 trailer.c:557 builtin/remote.c:300
-#: builtin/remote.c:328
-#, c-format
-msgid "more than one %s"
-msgstr "mer än en %s"
-
-#: trailer.c:743
-#, c-format
-msgid "empty trailer token in trailer '%.*s'"
-msgstr "tom släpradssymbol i släpraden \"%.*s\""
-
-#: trailer.c:763
-#, c-format
-msgid "could not read input file '%s'"
-msgstr "kunde inte läsa indatafilen \"%s\""
-
-#: trailer.c:766 builtin/mktag.c:88 imap-send.c:1563
-msgid "could not read from stdin"
-msgstr "kunde inte läsa från standard in"
-
-#: trailer.c:1024 wrapper.c:760
-#, c-format
-msgid "could not stat %s"
-msgstr "kunde inte ta status på %s"
-
-#: trailer.c:1026
-#, c-format
-msgid "file %s is not a regular file"
-msgstr "filen %s är inte en normal fil"
-
-#: trailer.c:1028
-#, c-format
-msgid "file %s is not writable by user"
-msgstr "filen %s är inte skrivbar av användaren"
-
-#: trailer.c:1040
-msgid "could not open temporary file"
-msgstr "kunde inte öppna temporär fil"
-
-#: trailer.c:1080
-#, c-format
-msgid "could not rename temporary file to %s"
-msgstr "kunde inte byta namn på temporär fil till %s"
-
-#: transport-helper.c:62 transport-helper.c:91
-msgid "full write to remote helper failed"
-msgstr "komplett skrivning till fjärrhjälpare misslyckades"
-
-#: transport-helper.c:145
-#, c-format
-msgid "unable to find remote helper for '%s'"
-msgstr "kan inte hitta fjärrhjälpare för \"%s\""
-
-#: transport-helper.c:161 transport-helper.c:575
-msgid "can't dup helper output fd"
-msgstr "kunde inte duplicera utdata-filhandtag"
-
-#: transport-helper.c:214
-#, c-format
-msgid ""
-"unknown mandatory capability %s; this remote helper probably needs newer "
-"version of Git"
-msgstr ""
-"okänd krävd förmåga (capability) %s; fjärrhjälparen behöver antagligen en "
-"nyare version av Git"
-
-#: transport-helper.c:220
-msgid "this remote helper should implement refspec capability"
-msgstr ""
-"fjärrhjälparen behöver implementera förmåga för referensspecifikationer "
-"(refspec)"
-
-#: transport-helper.c:287 transport-helper.c:429
-#, c-format
-msgid "%s unexpectedly said: '%s'"
-msgstr "%s sade oväntat: \"%s\""
-
-#: transport-helper.c:417
-#, c-format
-msgid "%s also locked %s"
-msgstr "%s låste också %s"
-
-#: transport-helper.c:497
-msgid "couldn't run fast-import"
-msgstr "kunde inte köra fast-import"
-
-#: transport-helper.c:520
-msgid "error while running fast-import"
-msgstr "fel när fast-import kördes"
-
-#: transport-helper.c:549 transport-helper.c:1254
-#, c-format
-msgid "could not read ref %s"
-msgstr "kunde inte läsa referensen %s"
-
-#: transport-helper.c:594
-#, c-format
-msgid "unknown response to connect: %s"
-msgstr "okänt svar på ansluntning: %s"
-
-#: transport-helper.c:616
-msgid "setting remote service path not supported by protocol"
-msgstr "protkollet stöder inte att sätta sökväg till fjärrtjänst"
-
-#: transport-helper.c:618
-msgid "invalid remote service path"
-msgstr "felaktig sökväg till fjärrtjänst"
-
-#: transport-helper.c:661 transport.c:1496
-msgid "operation not supported by protocol"
-msgstr "funktionen stöds inte av protokollet"
-
-#: transport-helper.c:664
-#, c-format
-msgid "can't connect to subservice %s"
-msgstr "kan inte ansluta till undertjänsten %s"
-
-#: transport-helper.c:693 transport.c:415
-msgid "--negotiate-only requires protocol v2"
-msgstr "--negotiate-only kräver protokoll v2"
-
-#: transport-helper.c:758
-msgid "'option' without a matching 'ok/error' directive"
-msgstr "\"option\" utan mostsvarande \"ok/error\"-direktiv"
-
-#: transport-helper.c:801
-#, c-format
-msgid "expected ok/error, helper said '%s'"
-msgstr "förväntade ok/error, hjälpprogrammet svarade \"%s\""
-
-#: transport-helper.c:862
-#, c-format
-msgid "helper reported unexpected status of %s"
-msgstr "hjälparen returnerade oväntad status %s"
-
-#: transport-helper.c:945
-#, c-format
-msgid "helper %s does not support dry-run"
-msgstr "hjälparen %s stöder inte dry-run"
-
-#: transport-helper.c:948
-#, c-format
-msgid "helper %s does not support --signed"
-msgstr "hjälparen %s stöder inte --signed"
-
-#: transport-helper.c:951
-#, c-format
-msgid "helper %s does not support --signed=if-asked"
-msgstr "hjälparen %s stöder inte --signed=if-asked"
-
-#: transport-helper.c:956
-#, c-format
-msgid "helper %s does not support --atomic"
-msgstr "hjälparen %s stöder inte --atomic"
-
-#: transport-helper.c:960
-#, c-format
-msgid "helper %s does not support --%s"
-msgstr "hjälparen %s stöder inte --%s"
-
-#: transport-helper.c:967
-#, c-format
-msgid "helper %s does not support 'push-option'"
-msgstr "hjälparen %s stöder inte \"push-option\""
-
-#: transport-helper.c:1067
-msgid "remote-helper doesn't support push; refspec needed"
-msgstr "fjärrhjälparen stöder inte push; referensspecifikation krävs"
-
-#: transport-helper.c:1072
-#, c-format
-msgid "helper %s does not support 'force'"
-msgstr "hjälparen %s stöder inte \"force\""
-
-#: transport-helper.c:1119
-msgid "couldn't run fast-export"
-msgstr "kunde inte köra fast-export"
-
-#: transport-helper.c:1124
-msgid "error while running fast-export"
-msgstr "fel vid körning av fast-export"
-
-#: transport-helper.c:1149
-#, c-format
-msgid ""
-"No refs in common and none specified; doing nothing.\n"
-"Perhaps you should specify a branch.\n"
-msgstr ""
-"Inga gemensamma referenser och inga angavs; gör inget.\n"
-"Du kanske borde ange en gren.\n"
-
-#: transport-helper.c:1231
-#, c-format
-msgid "unsupported object format '%s'"
-msgstr "objektformatet \"%s\" stöds ej"
-
-#: transport-helper.c:1240
-#, c-format
-msgid "malformed response in ref list: %s"
-msgstr "felformat svar i referenslistan: %s"
-
-#: transport-helper.c:1392
-#, c-format
-msgid "read(%s) failed"
-msgstr "läs(%s) misslyckades"
-
-#: transport-helper.c:1419
-#, c-format
-msgid "write(%s) failed"
-msgstr "skriv(%s) misslyckades"
-
-#: transport-helper.c:1468
-#, c-format
-msgid "%s thread failed"
-msgstr "%s-tråden misslyckades"
-
-#: transport-helper.c:1472
-#, c-format
-msgid "%s thread failed to join: %s"
-msgstr "%s-tråden misslyckades ansluta: %s"
-
-#: transport-helper.c:1491 transport-helper.c:1495
-#, 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:1532
-#, c-format
-msgid "%s process failed to wait"
-msgstr "processen %s misslyckades vänta"
-
-#: transport-helper.c:1536
-#, c-format
-msgid "%s process failed"
-msgstr "processen %s misslyckades"
-
-#: transport-helper.c:1554 transport-helper.c:1563
-msgid "can't start thread for copying data"
-msgstr "kan inte skapa tråd för kopiering av data"
-
-#: transport.c:116
-#, c-format
-msgid "Would set upstream of '%s' to '%s' of '%s'\n"
-msgstr "Skulle sätta uppströms för \"%s\" till \"%s\" från \"%s\"\n"
-
-#: transport.c:138
-#, c-format
-msgid "could not read bundle '%s'"
-msgstr "kunde inte läsa bunten \"%s\""
-
-#: transport.c:234
-#, c-format
-msgid "transport: invalid depth option '%s'"
-msgstr "transport: ogiltig flagga för depth: \"%s\""
-
-#: transport.c:289
-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:290
-msgid "server options require protocol version 2 or later"
-msgstr "serverflaggor kräver protokollversion 2 eller senare"
-
-#: transport.c:418
-msgid "server does not support wait-for-done"
-msgstr "servern stöder inte wait-for-done"
-
-#: transport.c:770
-msgid "could not parse transport.color.* config"
-msgstr "kunde inte tolka inställningen för transport.color.*"
-
-#: transport.c:845
-msgid "support for protocol v2 not implemented yet"
-msgstr "stöd för protokoll v2 ännu ej implementerat"
-
-#: transport.c:978
-#, c-format
-msgid "unknown value for config '%s': %s"
-msgstr "okänt värde för inställningen \"%s\": %s"
-
-#: transport.c:1044
-#, c-format
-msgid "transport '%s' not allowed"
-msgstr "transporten \"%s\" tillåts inte"
-
-#: transport.c:1093
-msgid "git-over-rsync is no longer supported"
-msgstr "git-over-rsync stöds inte längre"
-
-#: transport.c:1196
-#, c-format
-msgid ""
-"The following submodule paths contain changes that can\n"
-"not be found on any remote:\n"
-msgstr ""
-"Följande undermodulsökvägar innehåller ändringar som\n"
-"inte kan hittas av fjärrarna:\n"
-
-#: transport.c:1200
-#, c-format
-msgid ""
-"\n"
-"Please try\n"
-"\n"
-"\tgit push --recurse-submodules=on-demand\n"
-"\n"
-"or cd to the path and use\n"
-"\n"
-"\tgit push\n"
-"\n"
-"to push them to a remote.\n"
-"\n"
-msgstr ""
-"\n"
-"Testa\n"
-"\n"
-"\tgit push --recurse-submodules=on-demand\n"
-"\n"
-"eller cd till sökvägen och använd\n"
-"\n"
-"\tgit push\n"
-"\n"
-"för att sända dem till fjärren.\n"
-"\n"
-
-#: transport.c:1208
-msgid "Aborting."
-msgstr "Avbryter."
-
-#: transport.c:1354
-msgid "failed to push all needed submodules"
-msgstr "kunde inte sända alla nödvändiga undermoduler"
-
-#: tree-walk.c:33
-msgid "too-short tree object"
-msgstr "trädobjekt för kort"
-
-#: tree-walk.c:39
-msgid "malformed mode in tree entry"
-msgstr "felformat läge i trädpost"
-
-#: tree-walk.c:43
-msgid "empty filename in tree entry"
-msgstr "tomt filnamn i trädpost"
-
-#: tree-walk.c:118
-msgid "too-short tree file"
-msgstr "trädfil för kort"
-
-#: unpack-trees.c:118
-#, c-format
-msgid ""
-"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 ""
-"Dina lokala ändringar av följande filer skulle skrivas över av utcheckning:\n"
-"%%sChecka in dina ändringar eller använd \"stash\" innan du byter gren."
-
-#: unpack-trees.c:120
-#, c-format
-msgid ""
-"Your local changes to the following files would be overwritten by checkout:\n"
-"%%s"
-msgstr ""
-"Dina lokala ändringar av följande filer skulle skrivas över av utcheckning:\n"
-"%%s"
-
-#: unpack-trees.c:123
-#, c-format
-msgid ""
-"Your local changes to the following files would be overwritten by merge:\n"
-"%%sPlease commit your changes or stash them before you merge."
-msgstr ""
-"Dina lokala ändringar av följande filer skulle skrivas över av "
-"sammanslagning:\n"
-"%%sChecka in dina ändringar eller använd \"stash\" innan du byter gren."
-
-#: unpack-trees.c:125
-#, c-format
-msgid ""
-"Your local changes to the following files would be overwritten by merge:\n"
-"%%s"
-msgstr ""
-"Dina lokala ändringar av följande filer skulle skrivas över av "
-"sammanslagning:\n"
-"%%s"
-
-#: unpack-trees.c:128
-#, c-format
-msgid ""
-"Your local changes to the following files would be overwritten by %s:\n"
-"%%sPlease commit your changes or stash them before you %s."
-msgstr ""
-"Dina lokala ändringar av följande filer skulle skrivas över av \"%s\":\n"
-"%%sChecka in dina ändringar eller använd \"stash\" innan du \"%s\"."
-
-#: unpack-trees.c:130
-#, c-format
-msgid ""
-"Your local changes to the following files would be overwritten by %s:\n"
-"%%s"
-msgstr ""
-"Dina lokala ändringar av följande filer skulle skrivas över av \"%s\":\n"
-"%%s"
-
-#: unpack-trees.c:135
-#, c-format
-msgid ""
-"Updating the following directories would lose untracked files in them:\n"
-"%s"
-msgstr ""
-"Uppdatering av följande kataloger gör att ospårade filer går förlorade i "
-"dem:\n"
-"%s"
-
-#: unpack-trees.c:138
-#, c-format
-msgid ""
-"Refusing to remove the current working directory:\n"
-"%s"
-msgstr ""
-"Vägrar ta bort aktuell arbetskatalog:\n"
-"%s"
-
-#: unpack-trees.c:142
-#, c-format
-msgid ""
-"The following untracked working tree files would be removed by checkout:\n"
-"%%sPlease move or remove them before you switch branches."
-msgstr ""
-"Följande ospårade filer i arbetskatalogen skulle tas bort av utcheckningen:\n"
-"%%sFlytta eller ta bort dem innan du byter gren."
-
-#: unpack-trees.c:144
-#, c-format
-msgid ""
-"The following untracked working tree files would be removed by checkout:\n"
-"%%s"
-msgstr ""
-"Följande ospårade filer i arbetskatalogen skulle tas bort av utcheckningen:\n"
-"%%s"
-
-#: unpack-trees.c:147
-#, c-format
-msgid ""
-"The following untracked working tree files would be removed by merge:\n"
-"%%sPlease move or remove them before you merge."
-msgstr ""
-"Följande ospårade filer i arbetskatalogen skulle tas bort av "
-"sammanslagningen:\n"
-"%%sFlytta eller ta bort dem innan du slår samman."
-
-#: unpack-trees.c:149
-#, c-format
-msgid ""
-"The following untracked working tree files would be removed by merge:\n"
-"%%s"
-msgstr ""
-"Följande ospårade filer i arbetskatalogen skulle tas bort av "
-"sammanslagningen:\n"
-"%%s"
-
-#: unpack-trees.c:152
-#, c-format
-msgid ""
-"The following untracked working tree files would be removed by %s:\n"
-"%%sPlease move or remove them before you %s."
-msgstr ""
-"Följande ospårade filer i arbetskatalogen skulle tas bort av \"%s\":\n"
-"%%sFlytta eller ta bort dem innan du \"%s\"."
-
-#: unpack-trees.c:154
-#, c-format
-msgid ""
-"The following untracked working tree files would be removed by %s:\n"
-"%%s"
-msgstr ""
-"Följande ospårade filer i arbetskatalogen skulle tas bort av \"%s\":\n"
-"%%s"
-
-#: unpack-trees.c:160
-#, c-format
-msgid ""
-"The following untracked working tree files would be overwritten by "
-"checkout:\n"
-"%%sPlease move or remove them before you switch branches."
-msgstr ""
-"Följande ospårade filer i arbetskatalogen skulle skrivas över av "
-"utcheckningen:\n"
-"%%sFlytta eller ta bort dem innan du byter gren."
-
-#: unpack-trees.c:162
-#, c-format
-msgid ""
-"The following untracked working tree files would be overwritten by "
-"checkout:\n"
-"%%s"
-msgstr ""
-"Följande ospårade filer i arbetskatalogen skulle skrivas över av "
-"utcheckningen:\n"
-"%%s"
-
-#: unpack-trees.c:165
-#, c-format
-msgid ""
-"The following untracked working tree files would be overwritten by merge:\n"
-"%%sPlease move or remove them before you merge."
-msgstr ""
-"Följande ospårade filer i arbetskatalogen skulle skrivas över av "
-"sammanslagningen:\n"
-"%%sFlytta eller ta bort dem innan du byter gren."
-
-#: unpack-trees.c:167
-#, c-format
-msgid ""
-"The following untracked working tree files would be overwritten by merge:\n"
-"%%s"
-msgstr ""
-"Följande ospårade filer i arbetskatalogen skulle skrivas över av "
-"sammanslagningen:\n"
-"%%s"
-
-#: unpack-trees.c:170
-#, c-format
-msgid ""
-"The following untracked working tree files would be overwritten by %s:\n"
-"%%sPlease move or remove them before you %s."
-msgstr ""
-"Följande ospårade filer i arbetskatalogen skulle skrivas över av \"%s\":\n"
-"%%sFlytta eller ta bort dem innan du \"%s\"."
-
-#: unpack-trees.c:172
-#, c-format
-msgid ""
-"The following untracked working tree files would be overwritten by %s:\n"
-"%%s"
-msgstr ""
-"Följande ospårade filer i arbetskatalogen skulle skrivas över av \"%s\":\n"
-"%%s"
-
-#: unpack-trees.c:180
-#, c-format
-msgid "Entry '%s' overlaps with '%s'.  Cannot bind."
-msgstr "Posten \"%s\" överlappar \"%s\". Kan inte binda."
-
-#: unpack-trees.c:183
-#, c-format
-msgid ""
-"Cannot update submodule:\n"
-"%s"
-msgstr ""
-"Kan inte uppdatera undermodul:\n"
-"%s"
-
-#: unpack-trees.c:186
-#, c-format
-msgid ""
-"The following paths are not up to date and were left despite sparse "
-"patterns:\n"
-"%s"
-msgstr ""
-"Följande sökvägar är inte àjour och lämnades till trots för gles-mönster:\n"
-"%s"
-
-#: unpack-trees.c:188
-#, c-format
-msgid ""
-"The following paths are unmerged and were left despite sparse patterns:\n"
-"%s"
-msgstr ""
-"Följande sökvägar har inte slagits ihop och lämnades till trots för gles-"
-"mönster:\n"
-"%s"
-
-#: unpack-trees.c:190
-#, c-format
-msgid ""
-"The following paths were already present and thus not updated despite sparse "
-"patterns:\n"
-"%s"
-msgstr ""
-"Följande sökvägar fanns redan och har därför inte uppdaterats till trots för "
-"gles-mönster:\n"
-"%s"
-
-#: unpack-trees.c:270
-#, c-format
-msgid "Aborting\n"
-msgstr "Avbryter\n"
-
-#: unpack-trees.c:297
-#, c-format
-msgid ""
-"After fixing the above paths, you may want to run `git sparse-checkout "
-"reapply`.\n"
-msgstr ""
-"Du bör köra \"git sparse-checkout reapply\" efter att ha fixat sökvägarna "
-"ovan.\n"
-
-#: unpack-trees.c:358
-msgid "Updating files"
-msgstr "Uppdaterar filer"
-
-#: unpack-trees.c:390
-msgid ""
-"the following paths have collided (e.g. case-sensitive paths\n"
-"on a case-insensitive filesystem) and only one from the same\n"
-"colliding group is in the working tree:\n"
-msgstr ""
-"följande sökvägar har kolliderat (t.ex. skiftlägeskänsliga\n"
-"sökvägar på ett okänsligt filsystem) och endast en från samma\n"
-"kollisionsgrupp finns i arbetskatalogen:\n"
-
-#: unpack-trees.c:1664
-msgid "Updating index flags"
-msgstr "Uppdaterar indexflaggor"
-
-#: unpack-trees.c:2925
-#, c-format
-msgid "worktree and untracked commit have duplicate entries: %s"
-msgstr "arbetskatalog och ospårad incheckning har dublettposter: %s"
-
-#: upload-pack.c:1579
-msgid "expected flush after fetch arguments"
-msgstr "förväntade \"flush\" efter \"fetch\"-argument"
-
-#: urlmatch.c:163
-msgid "invalid URL scheme name or missing '://' suffix"
-msgstr "ogiltig URL-schemanamn eller saknat \"://\"-suffix"
-
-#: urlmatch.c:187 urlmatch.c:346 urlmatch.c:405
-#, c-format
-msgid "invalid %XX escape sequence"
-msgstr "ogiltig %XX-teckensekvens"
-
-#: urlmatch.c:215
-msgid "missing host and scheme is not 'file:'"
-msgstr "värd saknas och schemat är inte \"file:\""
-
-#: urlmatch.c:232
-msgid "a 'file:' URL may not have a port number"
-msgstr "en \"file:\"-URL kan inte innehålla portnummer"
-
-#: urlmatch.c:247
-msgid "invalid characters in host name"
-msgstr "ogiltiga tecken i värdnamnet"
-
-#: urlmatch.c:292 urlmatch.c:303
-msgid "invalid port number"
-msgstr "felaktigt portnummer"
-
-#: urlmatch.c:371
-msgid "invalid '..' path segment"
-msgstr "felaktigt \"..\"-sökvägssegment"
-
-#: walker.c:170
-msgid "Fetching objects"
-msgstr "Hämtar objekt"
-
-#: worktree.c:237 builtin/am.c:2210 builtin/bisect--helper.c:156
-#, c-format
-msgid "failed to read '%s'"
-msgstr "misslyckades läsa \"%s\""
-
-#: worktree.c:304
-#, c-format
-msgid "'%s' at main working tree is not the repository directory"
-msgstr "\"%s\" i huvudarbetskatalogen är inte arkivkatalogen"
-
-#: worktree.c:315
-#, c-format
-msgid "'%s' file does not contain absolute path to the working tree location"
-msgstr "filen \"%s\" innehåller inte absolut sökväg till arbetskatalogen"
-
-#: worktree.c:327
-#, c-format
-msgid "'%s' does not exist"
-msgstr "\"%s\" finns inte"
-
-#: worktree.c:333
-#, c-format
-msgid "'%s' is not a .git file, error code %d"
-msgstr "\"%s\" är inte en .git-fil, felkod %d"
-
-#: worktree.c:342
-#, c-format
-msgid "'%s' does not point back to '%s'"
-msgstr "\"%s\" pekar inte tillbaka till \"%s\""
-
-#: worktree.c:600
-msgid "not a directory"
-msgstr "inte en katalog"
-
-#: worktree.c:609
-msgid ".git is not a file"
-msgstr ".git är inte en fil"
-
-#: worktree.c:611
-msgid ".git file broken"
-msgstr ".git-filen är trasig"
-
-#: worktree.c:613
-msgid ".git file incorrect"
-msgstr ".git-filen är felaktig"
-
-#: worktree.c:719
-msgid "not a valid path"
-msgstr "inte en giltig sökväg"
-
-#: worktree.c:725
-msgid "unable to locate repository; .git is not a file"
-msgstr "hittar inte arkivet; .git är inte en fil"
-
-#: worktree.c:729
-msgid "unable to locate repository; .git file does not reference a repository"
-msgstr "hittar inte arkivet; .git-filen hänvisar inte till ett arkiv"
-
-#: worktree.c:733
-msgid "unable to locate repository; .git file broken"
-msgstr "hittar inte arkivet; .git-filen är trasig"
-
-#: worktree.c:739
-msgid "gitdir unreadable"
-msgstr "gitdir är oläsbar"
-
-#: worktree.c:743
-msgid "gitdir incorrect"
-msgstr "gitdir är felaktig"
-
-#: worktree.c:768
-msgid "not a valid directory"
-msgstr "inte i en giltig katalog"
-
-#: worktree.c:774
-msgid "gitdir file does not exist"
-msgstr "gitdir-filen existerar inte"
-
-#: worktree.c:779 worktree.c:788
-#, c-format
-msgid "unable to read gitdir file (%s)"
-msgstr "kunde inte läsa gitdir-filen (%s)"
-
-#: worktree.c:798
-#, c-format
-msgid "short read (expected %<PRIuMAX> bytes, read %<PRIuMAX>)"
-msgstr "kort läsning (förväntade %<PRIuMAX> byte, läste %<PRIuMAX>)"
-
-#: worktree.c:806
-msgid "invalid gitdir file"
-msgstr "ogiltig gitdir-fil"
-
-#: worktree.c:814
-msgid "gitdir file points to non-existent location"
-msgstr "gitdir-filen pekar på en ickeexisterande plats"
-
-#: worktree.c:830
-#, c-format
-msgid "unable to set %s in '%s'"
-msgstr "kan inte sätta %s i \"%s\""
-
-#: worktree.c:832
-#, c-format
-msgid "unable to unset %s in '%s'"
-msgstr "kan inte slå av %s i \"%s\""
-
-#: worktree.c:852
-msgid "failed to set extensions.worktreeConfig setting"
-msgstr "misslyckades ändra inställningen extensions.worktreeConfig"
-
-#: wrapper.c:161
-#, c-format
-msgid "could not setenv '%s'"
-msgstr "kunde inte lagra miljövariabeln \"%s\""
-
-#: wrapper.c:213
-#, c-format
-msgid "unable to create '%s'"
-msgstr "kunde inte skapa \"%s\""
-
-#: wrapper.c:215 wrapper.c:385
-#, c-format
-msgid "could not open '%s' for reading and writing"
-msgstr "kunde inte öppna \"%s\" för läsning och skrivning"
-
-#: wrapper.c:416 wrapper.c:683
-#, c-format
-msgid "unable to access '%s'"
-msgstr "kan inte komma åt \"%s\""
-
-#: wrapper.c:691
-msgid "unable to get current working directory"
-msgstr "kan inte hämta aktuell arbetskatalog"
-
-#: wt-status.c:158
-msgid "Unmerged paths:"
-msgstr "Ej sammanslagna sökvägar:"
-
-#: wt-status.c:187 wt-status.c:219
-msgid "  (use \"git restore --staged <file>...\" to unstage)"
-msgstr "  (använd \"git restore --staged <fil>...\" för att ta bort från kö)"
-
-#: wt-status.c:190 wt-status.c:222
-#, c-format
-msgid "  (use \"git restore --source=%s --staged <file>...\" to unstage)"
-msgstr ""
-"  (använd \"git restore --source=%s --staged <fil>...\" för att ta bort från "
-"kö)"
-
-#: wt-status.c:193 wt-status.c:225
-msgid "  (use \"git rm --cached <file>...\" to unstage)"
-msgstr "  (använd \"git rm --cached <fil>...\" för att ta bort från kö)"
-
-#: wt-status.c:197
-msgid "  (use \"git add <file>...\" to mark resolution)"
-msgstr "  (använd \"git add <fil>...\" för att ange lösning)"
-
-#: wt-status.c:199 wt-status.c:203
-msgid "  (use \"git add/rm <file>...\" as appropriate to mark resolution)"
-msgstr "  (använd \"git add/rm <fil>...\" som lämpligt för att ange lösning)"
-
-#: wt-status.c:201
-msgid "  (use \"git rm <file>...\" to mark resolution)"
-msgstr "  (använd \"git rm <fil>...\" för att ange lösning)"
-
-#: wt-status.c:211 wt-status.c:1140
-msgid "Changes to be committed:"
-msgstr "Ändringar att checka in:"
-
-#: wt-status.c:234 wt-status.c:1149
-msgid "Changes not staged for commit:"
-msgstr "Ändringar ej i incheckningskön:"
-
-#: wt-status.c:238
-msgid "  (use \"git add <file>...\" to update what will be committed)"
-msgstr ""
-"  (använd \"git add <fil>...\" för att uppdatera vad som ska checkas in)"
-
-#: wt-status.c:240
-msgid "  (use \"git add/rm <file>...\" to update what will be committed)"
-msgstr ""
-"  (använd \"git add/rm <fil>...\" för att uppdatera vad som ska checkas in)"
-
-#: wt-status.c:241
-msgid ""
-"  (use \"git restore <file>...\" to discard changes in working directory)"
-msgstr ""
-"  (använd \"git restore <fil>...\" för att förkasta ändringar i "
-"arbetskatalogen)"
-
-#: wt-status.c:243
-msgid "  (commit or discard the untracked or modified content in submodules)"
-msgstr ""
-"  (checka in eller förkasta ospårat eller ändrat innehåll i undermoduler)"
-
-#: wt-status.c:254
-#, c-format
-msgid "  (use \"git %s <file>...\" to include in what will be committed)"
-msgstr "  (använd \"git %s <fil>...\" för att ta med i det som ska checkas in)"
-
-#: wt-status.c:266
-msgid "both deleted:"
-msgstr "borttaget av bägge:"
-
-#: wt-status.c:268
-msgid "added by us:"
-msgstr "tillagt av oss:"
-
-#: wt-status.c:270
-msgid "deleted by them:"
-msgstr "borttaget av dem:"
-
-#: wt-status.c:272
-msgid "added by them:"
-msgstr "tillagt av dem:"
-
-#: wt-status.c:274
-msgid "deleted by us:"
-msgstr "borttaget av oss:"
-
-#: wt-status.c:276
-msgid "both added:"
-msgstr "tillagt av bägge:"
-
-#: wt-status.c:278
-msgid "both modified:"
-msgstr "ändrat av bägge:"
-
-#: wt-status.c:288
-msgid "new file:"
-msgstr "ny fil:"
-
-#: wt-status.c:290
-msgid "copied:"
-msgstr "kopierad:"
-
-#: wt-status.c:292
-msgid "deleted:"
-msgstr "borttagen:"
-
-#: wt-status.c:294
-msgid "modified:"
-msgstr "ändrad:"
-
-#: wt-status.c:296
-msgid "renamed:"
-msgstr "namnbytt:"
-
-#: wt-status.c:298
-msgid "typechange:"
-msgstr "typbyte:"
-
-#: wt-status.c:300
-msgid "unknown:"
-msgstr "okänd:"
-
-#: wt-status.c:302
-msgid "unmerged:"
-msgstr "osammanslagen:"
-
-#: wt-status.c:382
-msgid "new commits, "
-msgstr "nya incheckningar, "
-
-#: wt-status.c:384
-msgid "modified content, "
-msgstr "ändrat innehåll, "
-
-#: wt-status.c:386
-msgid "untracked content, "
-msgstr "ospårat innehåll, "
-
-#: wt-status.c:973
-#, c-format
-msgid "Your stash currently has %d entry"
-msgid_plural "Your stash currently has %d entries"
-msgstr[0] "Stashen innehåller just nu %d post"
-msgstr[1] "Stashen innehåller just nu %d poster"
-
-#: wt-status.c:1004
-msgid "Submodules changed but not updated:"
-msgstr "Undermoduler ändrade men inte uppdaterade:"
-
-#: wt-status.c:1006
-msgid "Submodule changes to be committed:"
-msgstr "Undermodulers ändringar att checka in:"
-
-#: wt-status.c:1088
-msgid ""
-"Do not modify or remove the line above.\n"
-"Everything below it will be ignored."
-msgstr ""
-"Raden ovan får inte ändras eller tas bort.\n"
-"Allt under den kommer tas bort."
-
-#: wt-status.c:1180
-#, c-format
-msgid ""
-"\n"
-"It took %.2f seconds to compute the branch ahead/behind values.\n"
-"You can use '--no-ahead-behind' to avoid this.\n"
-msgstr ""
-"\n"
-"Det tog %.2f sekunder att räkna före/bakom-värden.\n"
-"Du kan använda \"--no-ahead-behind\" för undvika detta.\n"
-
-#: wt-status.c:1210
-msgid "You have unmerged paths."
-msgstr "Du har ej sammanslagna sökvägar."
-
-#: wt-status.c:1213
-msgid "  (fix conflicts and run \"git commit\")"
-msgstr "  (rätta konflikter och kör \"git commit\")"
-
-#: wt-status.c:1215
-msgid "  (use \"git merge --abort\" to abort the merge)"
-msgstr "  (använd \"git merge --abort\" för att avbryta sammanslagningen)"
-
-#: wt-status.c:1219
-msgid "All conflicts fixed but you are still merging."
-msgstr "Alla konflikter har rättats men du är fortfarande i en sammanslagning."
-
-#: wt-status.c:1222
-msgid "  (use \"git commit\" to conclude merge)"
-msgstr "  (använd \"git commit\" för att slutföra sammanslagningen)"
-
-#: wt-status.c:1233
-msgid "You are in the middle of an am session."
-msgstr "Du är i mitten av en körning av \"git am\"."
-
-#: wt-status.c:1236
-msgid "The current patch is empty."
-msgstr "Aktuell patch är tom."
-
-#: wt-status.c:1241
-msgid "  (fix conflicts and then run \"git am --continue\")"
-msgstr "  (rätta konflikter och kör sedan \"git am --continue\")"
-
-#: wt-status.c:1243
-msgid "  (use \"git am --skip\" to skip this patch)"
-msgstr "  (använd \"git am --skip\" för att hoppa över patchen)"
-
-#: wt-status.c:1246
-msgid ""
-"  (use \"git am --allow-empty\" to record this patch as an empty commit)"
-msgstr ""
-"  (använd \"git am --allow-empty\" för att registrera patchen som en tom "
-"incheckning)"
-
-#: wt-status.c:1248
-msgid "  (use \"git am --abort\" to restore the original branch)"
-msgstr "  (använd \"git am --abort\" för att återställa ursprungsgrenen)"
-
-#: wt-status.c:1381
-msgid "git-rebase-todo is missing."
-msgstr "git-rebase-todo saknas."
-
-#: wt-status.c:1383
-msgid "No commands done."
-msgstr "Inga kommandon utförda."
-
-#: wt-status.c:1386
-#, c-format
-msgid "Last command done (%<PRIuMAX> command done):"
-msgid_plural "Last commands done (%<PRIuMAX> commands done):"
-msgstr[0] "Sista kommandot utfört (%<PRIuMAX> kommando utfört):"
-msgstr[1] "Sista kommandot utfört (%<PRIuMAX> kommandon utfört):"
-
-#: wt-status.c:1397
-#, c-format
-msgid "  (see more in file %s)"
-msgstr "  (se fler i filen %s)"
-
-#: wt-status.c:1402
-msgid "No commands remaining."
-msgstr "Inga kommandon återstår."
-
-#: wt-status.c:1405
-#, c-format
-msgid "Next command to do (%<PRIuMAX> remaining command):"
-msgid_plural "Next commands to do (%<PRIuMAX> remaining commands):"
-msgstr[0] "Nästa kommando att utföra (%<PRIuMAX> kommando återstår):"
-msgstr[1] "Följande kommandon att utföra (%<PRIuMAX> kommandon återstår):"
-
-#: wt-status.c:1413
-msgid "  (use \"git rebase --edit-todo\" to view and edit)"
-msgstr "  (använd \"git rebase --edit-todo\" för att visa och redigera)"
-
-#: wt-status.c:1425
-#, c-format
-msgid "You are currently rebasing branch '%s' on '%s'."
-msgstr "Du håller på att ombasera grenen \"%s\" ovanpå \"%s\"."
-
-#: wt-status.c:1430
-msgid "You are currently rebasing."
-msgstr "Du håller på med en ombasering."
-
-#: wt-status.c:1443
-msgid "  (fix conflicts and then run \"git rebase --continue\")"
-msgstr "  (rätta konflikter och kör sedan \"git rebase --continue\")"
-
-#: wt-status.c:1445
-msgid "  (use \"git rebase --skip\" to skip this patch)"
-msgstr "  (använd \"git rebase --skip\" för att hoppa över patchen)"
-
-#: wt-status.c:1447
-msgid "  (use \"git rebase --abort\" to check out the original branch)"
-msgstr "  (använd \"git rebase --abort\" för att checka ut ursprungsgrenen)"
-
-#: wt-status.c:1454
-msgid "  (all conflicts fixed: run \"git rebase --continue\")"
-msgstr "  (alla konflikter rättade: kör \"git rebase --continue\")"
-
-#: wt-status.c:1458
-#, c-format
-msgid ""
-"You are currently splitting a commit while rebasing branch '%s' on '%s'."
-msgstr ""
-"Du håller på att dela upp en incheckning medan du ombaserar grenen \"%s\" "
-"ovanpå \"%s\"."
-
-#: wt-status.c:1463
-msgid "You are currently splitting a commit during a rebase."
-msgstr "Du håller på att dela upp en incheckning i en ombasering."
-
-#: wt-status.c:1466
-msgid "  (Once your working directory is clean, run \"git rebase --continue\")"
-msgstr "  (Så fort din arbetskatalog är ren, kör \"git rebase --continue\")"
-
-#: wt-status.c:1470
-#, c-format
-msgid "You are currently editing a commit while rebasing branch '%s' on '%s'."
-msgstr ""
-"Du håller på att redigera en incheckning medan du ombaserar grenen \"%s\" "
-"ovanpå \"%s\"."
-
-#: wt-status.c:1475
-msgid "You are currently editing a commit during a rebase."
-msgstr "Du håller på att redigera en incheckning under en ombasering."
-
-#: wt-status.c:1478
-msgid "  (use \"git commit --amend\" to amend the current commit)"
-msgstr ""
-"  (använd \"git commit --amend\" för att lägga till på aktuell incheckning)"
-
-#: wt-status.c:1480
-msgid ""
-"  (use \"git rebase --continue\" once you are satisfied with your changes)"
-msgstr "  (använd \"git rebase --continue\" när du är nöjd med dina ändringar)"
-
-#: wt-status.c:1491
-msgid "Cherry-pick currently in progress."
-msgstr "Cherry-pick pågår."
-
-#: wt-status.c:1494
-#, c-format
-msgid "You are currently cherry-picking commit %s."
-msgstr "Du håller på med en \"cherry-pick\" av incheckningen %s."
-
-#: wt-status.c:1501
-msgid "  (fix conflicts and run \"git cherry-pick --continue\")"
-msgstr "  (rätta konflikter och kör sedan \"git cherry-pick --continue\")"
-
-#: wt-status.c:1504
-msgid "  (run \"git cherry-pick --continue\" to continue)"
-msgstr "  (kör \"git cherry-pick --continue\" för att fortsätta)"
-
-#: wt-status.c:1507
-msgid "  (all conflicts fixed: run \"git cherry-pick --continue\")"
-msgstr "  (alla konflikter rättade: kör \"git cherry-pick --continue\")"
-
-#: wt-status.c:1509
-msgid "  (use \"git cherry-pick --skip\" to skip this patch)"
-msgstr "  (använd \"git cherry-pick --skip\" för att hoppa över patchen)"
-
-#: wt-status.c:1511
-msgid "  (use \"git cherry-pick --abort\" to cancel the cherry-pick operation)"
-msgstr ""
-"  (använd \"git cherry-pick --abort\" för att avbryta \"cherry-pick\"-"
-"operationen)"
-
-#: wt-status.c:1521
-msgid "Revert currently in progress."
-msgstr "Ångring pågår."
-
-#: wt-status.c:1524
-#, c-format
-msgid "You are currently reverting commit %s."
-msgstr "Du håller på med att ångra incheckningen %s."
-
-#: wt-status.c:1530
-msgid "  (fix conflicts and run \"git revert --continue\")"
-msgstr "  (rätta konflikter och kör sedan \"git revert --continue\")"
-
-#: wt-status.c:1533
-msgid "  (run \"git revert --continue\" to continue)"
-msgstr "  (kör \"git revert --continue\" för att fortsätta)"
-
-#: wt-status.c:1536
-msgid "  (all conflicts fixed: run \"git revert --continue\")"
-msgstr "  (alla konflikter rättade: kör \"git revert --continue\")"
-
-#: wt-status.c:1538
-msgid "  (use \"git revert --skip\" to skip this patch)"
-msgstr "  (använd \"git revert --skip\" för att hoppa över patchen)"
-
-#: wt-status.c:1540
-msgid "  (use \"git revert --abort\" to cancel the revert operation)"
-msgstr "  (använd \"git revert --abort\" för att avbryta ångrandet)"
-
-#: wt-status.c:1550
-#, c-format
-msgid "You are currently bisecting, started from branch '%s'."
-msgstr "Du håller på med en \"bisect\", startad från grenen \"%s\"."
-
-#: wt-status.c:1554
-msgid "You are currently bisecting."
-msgstr "Du håller på med en \"bisect\"."
-
-#: wt-status.c:1557
-msgid "  (use \"git bisect reset\" to get back to the original branch)"
-msgstr ""
-"  (använd \"git bisect reset\" för att komma tillbaka till ursprungsgrenen)"
-
-#: wt-status.c:1568
-msgid "You are in a sparse checkout."
-msgstr "Du är i en gles utcheckning."
-
-#: wt-status.c:1571
-#, c-format
-msgid "You are in a sparse checkout with %d%% of tracked files present."
-msgstr "Du är i en gles utcheckning med %d%% spårade filer på plats."
-
-#: wt-status.c:1815
-msgid "On branch "
-msgstr "På grenen "
-
-#: wt-status.c:1822
-msgid "interactive rebase in progress; onto "
-msgstr "interaktiv ombasering pågår; ovanpå "
-
-#: wt-status.c:1824
-msgid "rebase in progress; onto "
-msgstr "ombasering pågår; ovanpå "
-
-#: wt-status.c:1829
-msgid "HEAD detached at "
-msgstr "HEAD frånkopplad vid "
-
-#: wt-status.c:1831
-msgid "HEAD detached from "
-msgstr "HEAD frånkopplad från "
-
-#: wt-status.c:1834
-msgid "Not currently on any branch."
-msgstr "Inte på någon gren för närvarande."
-
-#: wt-status.c:1851
-msgid "Initial commit"
-msgstr "Första incheckning"
-
-#: wt-status.c:1852
-msgid "No commits yet"
-msgstr "Inga incheckningar ännu"
-
-#: wt-status.c:1866
-msgid "Untracked files"
-msgstr "Ospårade filer"
-
-#: wt-status.c:1868
-msgid "Ignored files"
-msgstr "Ignorerade filer"
-
-#: wt-status.c:1872
-#, c-format
-msgid ""
-"It took %.2f seconds to enumerate untracked files. 'status -uno'\n"
-"may speed it up, but you have to be careful not to forget to add\n"
-"new files yourself (see 'git help status')."
-msgstr ""
-"Det tog %.2f sekunder att räkna upp ospårade filer. \"status -uno\"\n"
-"kan gå snabbare, men du måste vara försiktig så du inte glömmer\n"
-"lägga till nya filer själv (se \"git help status\")."
-
-# %s är nästa sträng eller tom.
-#: wt-status.c:1878
-#, c-format
-msgid "Untracked files not listed%s"
-msgstr "Ospårade filer visas ej%s"
-
-#: wt-status.c:1880
-msgid " (use -u option to show untracked files)"
-msgstr " (använd flaggan -u för att visa ospårade filer)"
-
-#: wt-status.c:1886
-msgid "No changes"
-msgstr "Inga ändringar"
-
-#: wt-status.c:1891
-#, c-format
-msgid "no changes added to commit (use \"git add\" and/or \"git commit -a\")\n"
-msgstr ""
-"inga ändringar att checka in (använd \"git add\" och/eller \"git commit -a"
-"\")\n"
-
-#: wt-status.c:1895
-#, c-format
-msgid "no changes added to commit\n"
-msgstr "inga ändringar att checka in\n"
-
-#: wt-status.c:1899
-#, c-format
-msgid ""
-"nothing added to commit but untracked files present (use \"git add\" to "
-"track)\n"
-msgstr ""
-"inget köat för incheckning, men ospårade filer finns (spåra med \"git add"
-"\")\n"
-
-#: wt-status.c:1903
-#, c-format
-msgid "nothing added to commit but untracked files present\n"
-msgstr "inget köat för incheckning, men ospårade filer finns\n"
-
-#: wt-status.c:1907
-#, c-format
-msgid "nothing to commit (create/copy files and use \"git add\" to track)\n"
-msgstr "inget att checka in (skapa/kopiera filer och spåra med \"git add\")\n"
-
-#: wt-status.c:1911 wt-status.c:1917
-#, c-format
-msgid "nothing to commit\n"
-msgstr "inget att checka in\n"
-
-#: wt-status.c:1914
-#, c-format
-msgid "nothing to commit (use -u to show untracked files)\n"
-msgstr "inget att checka in (använd -u för att visa ospårade filer)\n"
-
-#: wt-status.c:1919
-#, c-format
-msgid "nothing to commit, working tree clean\n"
-msgstr "inget att checka in, arbetskatalogen ren\n"
-
-#: wt-status.c:2024
-msgid "No commits yet on "
-msgstr "Inga incheckningar ännu på "
-
-#: wt-status.c:2028
-msgid "HEAD (no branch)"
-msgstr "HEAD (ingen gren)"
-
-#: wt-status.c:2059
-msgid "different"
-msgstr "olika"
-
-#: wt-status.c:2061 wt-status.c:2069
-msgid "behind "
-msgstr "efter "
-
-#: wt-status.c:2064 wt-status.c:2067
-msgid "ahead "
-msgstr "före "
-
-#. TRANSLATORS: the action is e.g. "pull with rebase"
-#: wt-status.c:2605
-#, c-format
-msgid "cannot %s: You have unstaged changes."
-msgstr "kan inte %s: Du har oköade ändringar."
-
-#: wt-status.c:2611
-msgid "additionally, your index contains uncommitted changes."
-msgstr "dessutom innehåller dit index ändringar som inte har checkats in."
-
-#: wt-status.c:2613
-#, c-format
-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:205
-msgid "could not send IPC command"
-msgstr "kunde inte sända IPC-kommando"
-
-#: compat/simple-ipc/ipc-unix-socket.c:212
-msgid "could not read IPC response"
-msgstr "kunde inte läsa IPC-svar"
-
-#: compat/simple-ipc/ipc-unix-socket.c:892
-#, c-format
-msgid "could not start accept_thread '%s'"
-msgstr "kunde inte ta status \"accept_thread\" \"%s\""
-
-#: compat/simple-ipc/ipc-unix-socket.c:904
-#, 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:353
-#, c-format
-msgid "failed to unlink '%s'"
-msgstr "misslyckades ta bort länken \"%s\""
-
-#: compat/fsmonitor/fsm-listen-darwin.c:355
-msgid "Unable to create FSEventStream."
-msgstr "kunde inte skapa FSEventStream."
-
-#: compat/fsmonitor/fsm-listen-darwin.c:403
-msgid "Failed to start the FSEventStream"
-msgstr "Misslyckades starta FSEventStream:en"
-
-#: builtin/add.c:26
 msgid "git add [<options>] [--] <pathspec>..."
 msgstr "git add [<flaggor>] [--] <sökväg>..."
 
-#: builtin/add.c:63
 #, c-format
 msgid "cannot chmod %cx '%s'"
 msgstr "kan inte utföra chmod %cx \"%s\""
 
-#: builtin/add.c:105
 #, c-format
 msgid "unexpected diff status %c"
 msgstr "diff-status %c förväntades inte"
 
-#: builtin/add.c:110 builtin/commit.c:299
 msgid "updating files failed"
 msgstr "misslyckades uppdatera filer"
 
-#: builtin/add.c:120
 #, c-format
 msgid "remove '%s'\n"
 msgstr "ta bort \"%s\"\n"
 
-#: builtin/add.c:204
 msgid "Unstaged changes after refreshing the index:"
 msgstr "Oköade ändringar efter att ha uppdaterat indexet:"
 
-#: builtin/add.c:312 builtin/rev-parse.c:993
 msgid "Could not read the index"
 msgstr "Kunde inte läsa indexet"
 
-#: builtin/add.c:325
 msgid "Could not write patch"
 msgstr "Kunde inte skriva patch"
 
-#: builtin/add.c:328
 msgid "editing patch failed"
 msgstr "redigering av patch misslyckades"
 
-#: builtin/add.c:331
 #, c-format
 msgid "Could not stat '%s'"
 msgstr "Kunde inte ta status på \"%s\""
 
-#: builtin/add.c:333
 msgid "Empty patch. Aborted."
 msgstr "Tom patch. Avbryter."
 
-#: builtin/add.c:339
 #, c-format
 msgid "Could not apply '%s'"
 msgstr "Kunde inte tillämpa \"%s\""
 
-#: builtin/add.c:347
 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:367 builtin/clean.c:927 builtin/fetch.c:175 builtin/mv.c:124
-#: builtin/prune-packed.c:14 builtin/pull.c:208 builtin/push.c:550
-#: builtin/remote.c:1454 builtin/rm.c:244 builtin/send-pack.c:194
 msgid "dry run"
 msgstr "testkörning"
 
-#: builtin/add.c:368 builtin/check-ignore.c:22 builtin/commit.c:1483
-#: builtin/count-objects.c:98 builtin/fsck.c:789 builtin/log.c:2338
-#: builtin/mv.c:123 builtin/read-tree.c:120
 msgid "be verbose"
 msgstr "var pratsam"
 
-#: builtin/add.c:370
 msgid "interactive picking"
 msgstr "plocka interaktivt"
 
-#: builtin/add.c:371 builtin/checkout.c:1599 builtin/reset.c:417
 msgid "select hunks interactively"
 msgstr "välj stycken interaktivt"
 
-#: builtin/add.c:372
 msgid "edit current diff and apply"
 msgstr "redigera aktuell diff och applicera"
 
-#: builtin/add.c:373
 msgid "allow adding otherwise ignored files"
 msgstr "tillåt lägga till annars ignorerade filer"
 
-#: builtin/add.c:374
 msgid "update tracked files"
 msgstr "uppdatera spårade filer"
 
-#: builtin/add.c:375
 msgid "renormalize EOL of tracked files (implies -u)"
 msgstr "åternormalisera radslut i spårade filer (implicerar -u)"
 
-#: builtin/add.c:376
 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:377
 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:380
 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:382
 msgid "don't add, only refresh the index"
 msgstr "lägg inte till, uppdatera endast indexet"
 
-#: builtin/add.c:383
 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:384
 msgid "check if - even missing - files are ignored in dry run"
 msgstr "se om - även saknade - filer ignoreras i testkörning"
 
-#: builtin/add.c:385 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:387 builtin/update-index.c:1023
 msgid "override the executable bit of the listed files"
 msgstr "överstyr exekveringsbiten för angivna filer"
 
-#: builtin/add.c:389
 msgid "warn when adding an embedded repository"
 msgstr "varna när ett inbyggt arkiv läggs till"
 
-#: builtin/add.c:407
 #, c-format
 msgid ""
 "You've added another git repository inside your current repository.\n"
@@ -10754,12 +1811,10 @@ msgstr ""
 "\n"
 "Se \"git help submodule\" för ytterligare information."
 
-#: builtin/add.c:436
 #, c-format
 msgid "adding embedded git repository: %s"
 msgstr "lägger till inbäddat git-arkiv: %s"
 
-#: builtin/add.c:456
 msgid ""
 "Use -f if you really want to add them.\n"
 "Turn this message off by running\n"
@@ -10769,27 +1824,21 @@ msgstr ""
 "Slå av detta meddelande med\n"
 "\"git config advice.addIgnoredFile false\""
 
-#: builtin/add.c:471
 msgid "adding files failed"
 msgstr "misslyckades lägga till filer"
 
-#: builtin/add.c:534
 #, c-format
 msgid "--chmod param '%s' must be either -x or +x"
 msgstr "\"--chmod\"-parametern \"%s\" måste antingen vara -x eller +x"
 
-#: builtin/add.c:555 builtin/checkout.c:1770 builtin/commit.c:365
-#: builtin/reset.c:436 builtin/rm.c:275 builtin/stash.c:1702
 #, c-format
 msgid "'%s' and pathspec arguments cannot be used together"
 msgstr "\"%s\" kan inte användas tillsammans med sökvägsangivelser"
 
-#: builtin/add.c:566
 #, c-format
 msgid "Nothing specified, nothing added.\n"
 msgstr "Inget angivet, inget tillagt.\n"
 
-#: builtin/add.c:568
 msgid ""
 "Maybe you wanted to say 'git add .'?\n"
 "Turn this message off by running\n"
@@ -10799,112 +1848,120 @@ msgstr ""
 "Slå av detta meddelande genom att köra\n"
 "\"git config advice.addEmptyPathspec false\""
 
-#: builtin/am.c:393
+msgid "index file corrupt"
+msgstr "indexfilen trasig"
+
+#, c-format
+msgid "bad action '%s' for '%s'"
+msgstr "felaktig funktion \"%s\" för \"%s\""
+
+#, c-format
+msgid "invalid value for '%s': '%s'"
+msgstr "felaktigt värde för \"%s\": \"%s\""
+
+#, c-format
+msgid "could not read '%s'"
+msgstr "kunde inte läsa \"%s\""
+
 msgid "could not parse author script"
 msgstr "kunde inte tolka författarskript"
 
-#: builtin/am.c:483
+#, c-format
+msgid "could not parse %s"
+msgstr "kunde inte tolka %s"
+
 #, c-format
 msgid "'%s' was deleted by the applypatch-msg hook"
 msgstr "\"%s\" togs bort av kroken applypatch-msg"
 
-#: builtin/am.c:525
 #, c-format
 msgid "Malformed input line: '%s'."
 msgstr "Felaktig indatarad: \"%s\"."
 
-#: builtin/am.c:563
 #, c-format
 msgid "Failed to copy notes from '%s' to '%s'"
 msgstr "Misslyckades kopiera anteckningar från \"%s\" till \"%s\""
 
-#: builtin/am.c:589
 msgid "fseek failed"
 msgstr "\"fseek\" misslyckades"
 
-#: builtin/am.c:777
+#, c-format
+msgid "could not open '%s' for reading"
+msgstr "kunde inte öppna \"%s\" för läsning"
+
+#, c-format
+msgid "could not open '%s' for writing"
+msgstr "kunde inte öppna \"%s\" för skrivning"
+
 #, c-format
 msgid "could not parse patch '%s'"
 msgstr "kunde inte tolka patchen \"%s\""
 
-#: builtin/am.c:842
 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:890
 msgid "invalid timestamp"
 msgstr "ogiltig tidsstämpel"
 
-#: builtin/am.c:895 builtin/am.c:907
 msgid "invalid Date line"
 msgstr "ogiltig \"Date\"-rad"
 
-#: builtin/am.c:902
 msgid "invalid timezone offset"
 msgstr "ogiltig tidszons-offset"
 
-#: builtin/am.c:995
 msgid "Patch format detection failed."
 msgstr "Misslyckades detektera patchformat."
 
-#: builtin/am.c:1000 builtin/clone.c:306
 #, c-format
 msgid "failed to create directory '%s'"
 msgstr "misslyckades skapa katalogen \"%s\""
 
-#: builtin/am.c:1005
 msgid "Failed to split patches."
 msgstr "Misslyckades dela patchar."
 
-#: builtin/am.c:1154
 #, 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:1155
 #, 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:1160
 #, c-format
 msgid "To record the empty patch as an empty commit, run \"%s --allow-empty\"."
 msgstr ""
 "För att registrera den tomma patchen som en tom incheckning, kör \"%s --"
 "allow-empty\"."
 
-#: builtin/am.c:1162
 #, 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:1257
 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:1345
 #, c-format
 msgid "missing author line in commit %s"
 msgstr "saknad \"author\"-rad i incheckningen %s"
 
-#: builtin/am.c:1348
 #, c-format
 msgid "invalid ident line: %.*s"
 msgstr "ogiltig ident-rad: %.*s"
 
-#: builtin/am.c:1567
+#, c-format
+msgid "unable to parse commit %s"
+msgstr "kunde inte tolka incheckningen %s"
+
 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:1569
 msgid "Using index info to reconstruct a base tree..."
 msgstr "Använder indexinfo för att återskapa ett basträd..."
 
-#: builtin/am.c:1588
 msgid ""
 "Did you hand edit your patch?\n"
 "It does not apply to blobs recorded in its index."
@@ -10912,25 +1969,26 @@ msgstr ""
 "Har du handredigerat din patch?\n"
 "Den kan inte tillämpas på blobbar som antecknats i dess index."
 
-#: builtin/am.c:1594
 msgid "Falling back to patching base and 3-way merge..."
 msgstr ""
 "Faller tillbaka på att patcha grundversionen och trevägssammanslagning..."
 
-#: builtin/am.c:1620
 msgid "Failed to merge in the changes."
 msgstr "Misslyckades slå ihop ändringarna."
 
-#: builtin/am.c:1652
+msgid "git write-tree failed to write a tree"
+msgstr "git write-tree misslyckades skriva ett träd"
+
 msgid "applying to an empty history"
 msgstr "tillämpar på en tom historik"
 
-#: builtin/am.c:1704 builtin/am.c:1708
+msgid "failed to write commit object"
+msgstr "kunde inte skriva incheckningsobjekt"
+
 #, c-format
 msgid "cannot resume: %s does not exist."
 msgstr "kan inte återuppta: %s finns inte."
 
-#: builtin/am.c:1726
 msgid "Commit Body is:"
 msgstr "Incheckningskroppen är:"
 
@@ -10938,59 +1996,47 @@ msgstr "Incheckningskroppen är:"
 #. in your translation. The program will only accept English
 #. input at this point.
 #.
-#: builtin/am.c:1736
 #, 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:1782 builtin/commit.c:410
 msgid "unable to write index file"
 msgstr "kan inte skriva indexfil"
 
-#: builtin/am.c:1786
 #, c-format
 msgid "Dirty index: cannot apply patches (dirty: %s)"
 msgstr "Smutsigt index: kan inte tillämpa patchar (smutsiga: %s)"
 
-#: builtin/am.c:1828
 #, c-format
 msgid "Skipping: %.*s"
 msgstr "Hoppar över: %.*s"
 
-#: builtin/am.c:1833
 #, c-format
 msgid "Creating an empty commit: %.*s"
 msgstr "Skapar en tom incheckningar: %.*s"
 
-#: builtin/am.c:1837
 msgid "Patch is empty."
 msgstr "Patchen är tom."
 
-#: builtin/am.c:1848 builtin/am.c:1917
 #, c-format
 msgid "Applying: %.*s"
 msgstr "Tillämpar: %.*s"
 
-#: builtin/am.c:1865
 msgid "No changes -- Patch already applied."
 msgstr "Inga ändringar -- Patchen har redan tillämpats."
 
-#: builtin/am.c:1871
 #, c-format
 msgid "Patch failed at %s %.*s"
 msgstr "Patch misslyckades på %s %.*s"
 
-#: builtin/am.c:1875
 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 "
 "misslyckades"
 
-#: builtin/am.c:1921
 msgid "No changes - recorded it as an empty commit."
 msgstr "Inga ändringar - sparat som en tom incheckning."
 
-#: builtin/am.c:1923
 msgid ""
 "No changes - did you forget to use 'git add'?\n"
 "If there is nothing left to stage, chances are that something else\n"
@@ -11000,7 +2046,6 @@ msgstr ""
 "Om det inte är något kvar att köa kan det hända att något annat redan\n"
 "introducerat samma ändringar; kanske du bör hoppa över patchen."
 
-#: builtin/am.c:1931
 msgid ""
 "You still have unmerged paths in your index.\n"
 "You should 'git add' each file with resolved conflicts to mark them as "
@@ -11012,17 +2057,16 @@ msgstr ""
 "lösta.\n"
 "Du kan köra \"git rm\" för att godta \"borttagen av dem\" för den."
 
-#: builtin/am.c:2039 builtin/am.c:2043 builtin/am.c:2055 builtin/reset.c:455
-#: builtin/reset.c:463
+msgid "unable to write new index file"
+msgstr "kunde inte skriva ny indexfil"
+
 #, c-format
 msgid "Could not parse object '%s'."
 msgstr "Kan inte tolka objektet \"%s\"."
 
-#: builtin/am.c:2091 builtin/am.c:2167
 msgid "failed to clean index"
 msgstr "misslyckades städa upp indexet"
 
-#: builtin/am.c:2135
 msgid ""
 "You seem to have moved HEAD since the last 'am' failure.\n"
 "Not rewinding to ORIG_HEAD"
@@ -11030,158 +2074,113 @@ msgstr ""
 "Du verkar ha flyttat HEAD sedan \"am\" sist misslyckades.\n"
 "Återställer inte till ORIG_HEAD"
 
-#: builtin/am.c:2292
+#, c-format
+msgid "failed to read '%s'"
+msgstr "misslyckades läsa \"%s\""
+
 #, c-format
 msgid "options '%s=%s' and '%s=%s' cannot be used together"
 msgstr "flaggorna \"%s=%s\" och \"%s=%s\" kan inte användas samtidigt"
 
-#: builtin/am.c:2323
 msgid "git am [<options>] [(<mbox> | <Maildir>)...]"
 msgstr "git am [<flaggor>] [(<mbox> | <Maildir>)...]"
 
-#: builtin/am.c:2324
 msgid "git am [<options>] (--continue | --skip | --abort)"
 msgstr "git am [<flaggor>] (--continue | --skip | --abort)"
 
-#: builtin/am.c:2330
 msgid "run interactively"
 msgstr "kör interaktivt"
 
-#: builtin/am.c:2332
 msgid "historical option -- no-op"
 msgstr "historisk flagga -- no-op"
 
-#: builtin/am.c:2334
 msgid "allow fall back on 3way merging if needed"
 msgstr "tillåt falla tillbaka på trevägssammanslagning om nödvändigt"
 
-#: builtin/am.c:2335 builtin/init-db.c:547 builtin/prune-packed.c:16
-#: builtin/repack.c:646 builtin/stash.c:946
 msgid "be quiet"
 msgstr "var tyst"
 
-#: builtin/am.c:2337
 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:2340
 msgid "recode into utf8 (default)"
 msgstr "koda om till utf8 (standard)"
 
-#: builtin/am.c:2342
 msgid "pass -k flag to git-mailinfo"
 msgstr "sänd flaggan -k till git-mailinfo"
 
-#: builtin/am.c:2344
 msgid "pass -b flag to git-mailinfo"
 msgstr "sänd flaggan -b till git-mailinfo"
 
-#: builtin/am.c:2346
 msgid "pass -m flag to git-mailinfo"
 msgstr "sänd flaggan -m till git-mailinfo"
 
-#: builtin/am.c:2348
 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:2351
 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:2354
 msgid "strip everything before a scissors line"
 msgstr "ta bort allting före en saxlinje"
 
-#: builtin/am.c:2356
 msgid "pass it through git-mailinfo"
 msgstr "sänd det genom git-mailinfo"
 
-#: builtin/am.c:2359 builtin/am.c:2362 builtin/am.c:2365 builtin/am.c:2368
-#: builtin/am.c:2371 builtin/am.c:2374 builtin/am.c:2377 builtin/am.c:2380
-#: builtin/am.c:2386
 msgid "pass it through git-apply"
 msgstr "sänd det genom git-apply"
 
-#: builtin/am.c:2376 builtin/commit.c:1514 builtin/fmt-merge-msg.c:18
-#: builtin/fmt-merge-msg.c:21 builtin/grep.c:920 builtin/merge.c:263
-#: builtin/pull.c:142 builtin/pull.c:204 builtin/pull.c:221
-#: builtin/rebase.c:1074 builtin/repack.c:657 builtin/repack.c:661
-#: builtin/repack.c:663 builtin/show-branch.c:650 builtin/show-ref.c:172
-#: builtin/tag.c:446 parse-options.h:159 parse-options.h:180
-#: parse-options.h:348
 msgid "n"
 msgstr "n"
 
-#: builtin/am.c:2382 builtin/branch.c:695 builtin/bugreport.c:109
-#: builtin/cat-file.c:848 builtin/cat-file.c:852 builtin/cat-file.c:856
-#: builtin/for-each-ref.c:41 builtin/ls-tree.c:357 builtin/replace.c:555
-#: builtin/tag.c:480 builtin/verify-tag.c:38
 msgid "format"
 msgstr "format"
 
-#: builtin/am.c:2383
 msgid "format the patch(es) are in"
 msgstr "format för patch(ar)"
 
-#: builtin/am.c:2389
 msgid "override error message when patch failure occurs"
 msgstr "överstyr felmeddelanden när patchfel uppstår"
 
-#: builtin/am.c:2391
 msgid "continue applying patches after resolving a conflict"
 msgstr "fortsätt applicera patchar efter att ha löst en konflikt"
 
-#: builtin/am.c:2394
 msgid "synonyms for --continue"
 msgstr "synonymer till --continue"
 
-#: builtin/am.c:2397
 msgid "skip the current patch"
 msgstr "hoppa över den aktuella grenen"
 
-#: builtin/am.c:2400
 msgid "restore the original branch and abort the patching operation"
 msgstr "återställ originalgrenen och avbryt patchningen"
 
-#: builtin/am.c:2403
 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:2407
 msgid "show the patch being applied"
 msgstr "visa patchen som tillämpas"
 
-#: builtin/am.c:2411
 msgid "record the empty patch as an empty commit"
 msgstr "lagra den tomma patchen som en tom incheckning"
 
-#: builtin/am.c:2415
 msgid "lie about committer date"
 msgstr "ljug om incheckningsdatum"
 
-#: builtin/am.c:2417
 msgid "use current timestamp for author date"
 msgstr "använd nuvarande tidsstämpel för författardatum"
 
-#: builtin/am.c:2419 builtin/commit-tree.c:118 builtin/commit.c:1642
-#: builtin/merge.c:302 builtin/pull.c:179 builtin/rebase.c:1127
-#: builtin/revert.c:117 builtin/tag.c:461
 msgid "key-id"
 msgstr "nyckel-id"
 
-#: builtin/am.c:2420 builtin/rebase.c:1128
 msgid "GPG-sign commits"
 msgstr "GPG-signera incheckningar"
 
-#: builtin/am.c:2423
 msgid "how to handle empty patches"
 msgstr "hantering av tomma patchar"
 
-#: builtin/am.c:2426
 msgid "(internal use for git-rebase)"
 msgstr "(används internt av git-rebase)"
 
-#: builtin/am.c:2444
 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."
@@ -11189,16 +2188,13 @@ msgstr ""
 "Flaggan -b/--binary har varit utan funktion länge, och\n"
 "kommer tas bort. Vi ber dig att inte använda den längre."
 
-#: builtin/am.c:2451
 msgid "failed to read the index"
 msgstr "misslyckades läsa indexet"
 
-#: builtin/am.c:2466
 #, 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:2490
 #, c-format
 msgid ""
 "Stray %s directory found.\n"
@@ -11207,48 +2203,37 @@ msgstr ""
 "Kvarbliven katalog %s hittades.\n"
 "Använd \"git am --abort\" för att ta bort den."
 
-#: builtin/am.c:2496
 msgid "Resolve operation not in progress, we are not resuming."
 msgstr "Lösningsoperation pågår inte, vi återupptar inte."
 
-#: builtin/am.c:2506
 msgid "interactive mode requires patches on the command line"
 msgstr "interaktivt läge kräver patchar på kommandoraden"
 
-#: builtin/apply.c:8
 msgid "git apply [<options>] [<patch>...]"
 msgstr "git apply [<flaggor>] [<patch>...]"
 
-#: builtin/archive.c:18
 msgid "could not redirect output"
 msgstr "kunde inte omdirigera utdata"
 
-#: builtin/archive.c:35
 msgid "git archive: Remote with no URL"
 msgstr "git archive: Fjärr utan URL"
 
-#: 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:62
 #, c-format
 msgid "git archive: NACK %s"
 msgstr "git archive: NACK %s"
 
-#: builtin/archive.c:63
 msgid "git archive: protocol error"
 msgstr "git archive: protokollfel"
 
-#: builtin/archive.c:67
 msgid "git archive: expected a flush"
 msgstr "git archive: förväntade en tömning (flush)"
 
-#: builtin/bisect--helper.c:24
 msgid "git bisect--helper --bisect-reset [<commit>]"
 msgstr "git bisect--helper --bisect-reset [<incheckning>]"
 
-#: builtin/bisect--helper.c:26
 msgid ""
 "git bisect--helper --bisect-start [--term-{new,bad}=<term> --term-{old,good}"
 "=<term>] [--no-checkout] [--first-parent] [<bad> [<good>...]] [--] "
@@ -11258,71 +2243,56 @@ msgstr ""
 "=<term>] [--no-checkout] [--first-parent] [<dålig> [<bra>...]] [--] "
 "[<sökvägar>...]"
 
-#: builtin/bisect--helper.c:29
 msgid "git bisect--helper --bisect-state (bad|new) [<rev>]"
 msgstr "git bisect--helper --bisect-state (bad|new) [<incheckning>]"
 
-#: builtin/bisect--helper.c:30
 msgid "git bisect--helper --bisect-state (good|old) [<rev>...]"
 msgstr "git bisect--helper --bisect-state (good|old) [<incheckning>...]"
 
-#: builtin/bisect--helper.c:31
 msgid "git bisect--helper --bisect-replay <filename>"
 msgstr "git bisect--helper --bisect-replay <filnamn>"
 
-#: builtin/bisect--helper.c:32
 msgid "git bisect--helper --bisect-skip [(<rev>|<range>)...]"
 msgstr "git bisect--helper --bisect-skip [(<incheckning>|<intervall>)...]"
 
-#: 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:116
 #, c-format
 msgid "could not write to file '%s'"
 msgstr "kunde inte skriva till filen \"%s\""
 
-#: 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: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: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:194
 msgid "please use two different terms"
 msgstr "termerna måste vara olika"
 
-#: 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:218
 #, c-format
 msgid "'%s' is not a valid commit"
 msgstr "\"%s\" är inte en giltig incheckning"
 
-#: builtin/bisect--helper.c:227
 #, c-format
 msgid ""
 "could not check out original HEAD '%s'. Try 'git bisect reset <commit>'."
@@ -11330,27 +2300,22 @@ msgstr ""
 "Kunde inte checka ut original-HEAD \"%s\". Försök \"git bisect reset "
 "<incheckning>\"."
 
-#: builtin/bisect--helper.c:271
 #, c-format
 msgid "Bad bisect_write argument: %s"
 msgstr "Felaktigt argument till bisect_write: %s"
 
-#: 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:288
 #, c-format
 msgid "couldn't open the file '%s'"
 msgstr "kunde inte öppna filen \"%s\""
 
-#: 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:341
 #, c-format
 msgid ""
 "You need to give me at least one %s and %s revision.\n"
@@ -11359,7 +2324,6 @@ msgstr ""
 "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:345
 #, c-format
 msgid ""
 "You need to start by \"git bisect start\".\n"
@@ -11370,7 +2334,6 @@ msgstr ""
 "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:365
 #, c-format
 msgid "bisecting only with a %s commit"
 msgstr "utför bisect med endast en %s incheckning"
@@ -11379,15 +2342,24 @@ msgstr "utför bisect med endast en %s incheckning"
 #. translation. The program will only accept English input
 #. at this point.
 #.
-#: builtin/bisect--helper.c:373
 msgid "Are you sure [Y/n]? "
 msgstr "Är du säker [Y=ja/N=nej]? "
 
-#: builtin/bisect--helper.c:434
+msgid "status: waiting for both good and bad commits\n"
+msgstr "status: väntar på både bra och trasiga incheckningar\n"
+
+#, c-format
+msgid "status: waiting for bad commit, %d good commit known\n"
+msgid_plural "status: waiting for bad commit, %d good commits known\n"
+msgstr[0] "status: väntar på trasig incheckning, %d bra incheckning känd\n"
+msgstr[1] "status: väntar på trasig incheckning, %d bra incheckningar kända\n"
+
+msgid "status: waiting for good commit(s), bad commit known\n"
+msgstr "status: väntar på bra incheckning(ar), trasig incheckning känd\n"
+
 msgid "no terms defined"
 msgstr "inga termer angivna"
 
-#: builtin/bisect--helper.c:437
 #, c-format
 msgid ""
 "Your current terms are %s for the old state\n"
@@ -11396,7 +2368,6 @@ msgstr ""
 "Aktuella termer är %s för det gamla tillståndet\n"
 "och %s för det nya tillståndet.\n"
 
-#: builtin/bisect--helper.c:447
 #, c-format
 msgid ""
 "invalid argument %s for 'git bisect terms'.\n"
@@ -11405,54 +2376,43 @@ msgstr ""
 "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:514 builtin/bisect--helper.c:1038
 msgid "revision walk setup failed\n"
 msgstr "misslyckades starta revisionstraversering\n"
 
-#: 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:655 builtin/bisect--helper.c:668
 msgid "'' is not a valid term"
 msgstr "\"\" är inte en giltig term"
 
-#: builtin/bisect--helper.c:678
 #, c-format
 msgid "unrecognized option: '%s'"
 msgstr "okänd flagga: %s"
 
-#: 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:713
 msgid "bad HEAD - I need a HEAD"
 msgstr "felaktigt HEAD - Jag behöver ett HEAD"
 
-#: 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: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:752
 msgid "bad HEAD - strange symbolic ref"
 msgstr "felaktigt HEAD - konstig symbolisk referens"
 
-#: builtin/bisect--helper.c:772
 #, c-format
 msgid "invalid ref: '%s'"
 msgstr "ogiltig referens: \"%s\""
 
-#: 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"
 
@@ -11460,88 +2420,70 @@ msgstr "Du måste starta med \"git bisect start\"\n"
 #. translation. The program will only accept English input
 #. at this point.
 #.
-#: 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:859
 msgid "Please call `--bisect-state` with at least one argument"
 msgstr "Anropa \"--bisect-state\" med minst ett argument."
 
-#: 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:884 builtin/bisect--helper.c:897
 #, c-format
 msgid "Bad rev input: %s"
 msgstr "Felaktig rev-indata: %s"
 
-#: 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:936
 msgid "We are not bisecting."
 msgstr "Vi utför ingen bisect för tillfället."
 
-#: builtin/bisect--helper.c:986
 #, c-format
 msgid "'%s'?? what are you talking about?"
 msgstr "\"%s\"?? vad menar du?"
 
-#: 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:1120 builtin/bisect--helper.c:1152
 #, c-format
 msgid "running %s\n"
 msgstr "kör %s\n"
 
-#: builtin/bisect--helper.c:1145 builtin/bisect--helper.c:1335
 msgid "bisect run failed: no command provided."
 msgstr "bisect-körning misslyckades: inget kommando gavs."
 
-#: builtin/bisect--helper.c:1166
 #, c-format
 msgid "unable to verify '%s' on good revision"
 msgstr "kan inte bekräfta \"%s\" på bra revision"
 
-#: builtin/bisect--helper.c:1172
 #, c-format
 msgid "bogus exit code %d for good revision"
 msgstr "falsk slutkod %d för bra revision"
 
-#: builtin/bisect--helper.c:1180
 #, 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:1195
 #, c-format
 msgid "cannot open file '%s' for writing"
 msgstr "kan inte öppna \"%s\" för skrivning"
 
-#: builtin/bisect--helper.c:1213
 msgid "bisect run cannot continue any more"
 msgstr "\"bisect\"-körningen kan inte fortsätta längre"
 
-#: builtin/bisect--helper.c:1215
 #, c-format
 msgid "bisect run success"
 msgstr "\"bisect\"-körningen lyckades"
 
-#: builtin/bisect--helper.c:1218
 #, c-format
 msgid "bisect found first bad commit"
 msgstr "bisect hittade första trasiga incheckning"
 
-#: builtin/bisect--helper.c:1221
 #, c-format
 msgid ""
 "bisect run failed: 'git bisect--helper --bisect-state %s' exited with error "
@@ -11550,219 +2492,162 @@ msgstr ""
 "\"bisect\"-körningen misslyckades: \"git bisect--helper --bisect-state %s\" "
 "avslutades med felkoden %d"
 
-#: builtin/bisect--helper.c:1253
 msgid "reset the bisection state"
 msgstr "återställ bisect-tillstånd"
 
-#: builtin/bisect--helper.c:1255
 msgid "check whether bad or good terms exist"
 msgstr "se efter om termer för rätt och fel finns"
 
-#: builtin/bisect--helper.c:1257
 msgid "print out the bisect terms"
 msgstr "skriv ut termer för bisect"
 
-#: builtin/bisect--helper.c:1259
 msgid "start the bisect session"
 msgstr "påbörja bisect-körningen"
 
-#: builtin/bisect--helper.c:1261
 msgid "find the next bisection commit"
 msgstr "hitta nästa incheckning i bisect"
 
-#: builtin/bisect--helper.c:1263
 msgid "mark the state of ref (or refs)"
 msgstr "markera tillståndet för en eller flera referenser"
 
-#: builtin/bisect--helper.c:1265
 msgid "list the bisection steps so far"
 msgstr "lista \"bisect\"-stegen som utförts så långt"
 
-#: builtin/bisect--helper.c:1267
 msgid "replay the bisection process from the given file"
 msgstr "spela upp \"bisect\"-processen från angiven fil"
 
-#: builtin/bisect--helper.c:1269
 msgid "skip some commits for checkout"
 msgstr "hoppa över ett par incheckningar"
 
-#: builtin/bisect--helper.c:1271
 msgid "visualize the bisection"
 msgstr "visualisera \"bisect\"-körningen"
 
-#: builtin/bisect--helper.c:1273
 msgid "use <cmd>... to automatically bisect"
 msgstr "använd <kommando>... för att utföra \"bisect\" automatiskt"
 
-#: builtin/bisect--helper.c:1275
 msgid "no log for BISECT_WRITE"
 msgstr "ingen logg för BISECT_WRITE"
 
-#: builtin/bisect--helper.c:1290
 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:1295
 msgid "--bisect-terms requires 0 or 1 argument"
 msgstr "--bisect-terms kräver noll eller ett argument"
 
-#: builtin/bisect--helper.c:1304
 msgid "--bisect-next requires 0 arguments"
 msgstr "--bisect-next kräver 0 argument"
 
-#: builtin/bisect--helper.c:1315
 msgid "--bisect-log requires 0 arguments"
 msgstr "--bisect-log kräver 0 argument"
 
-#: builtin/bisect--helper.c:1320
 msgid "no logfile given"
 msgstr "ingen loggfil angiven"
 
-#: builtin/blame.c:32
 msgid "git blame [<options>] [<rev-opts>] [<rev>] [--] <file>"
 msgstr "git blame [<flaggor>] [<rev-flaggor>] [<rev>] [--] <fil>"
 
-#: builtin/blame.c:37
 msgid "<rev-opts> are documented in git-rev-list(1)"
 msgstr "<rev-flaggor> dokumenteras i git-rev-list(1)"
 
-#: builtin/blame.c:406
 #, c-format
 msgid "expecting a color: %s"
 msgstr "förväntade en färg: %s"
 
-#: builtin/blame.c:413
 msgid "must end with a color"
 msgstr "måste sluta med en färg"
 
-#: builtin/blame.c:842
 #, c-format
 msgid "cannot find revision %s to ignore"
 msgstr "kan inte hitta revision %s att ignorera"
 
-#: builtin/blame.c:864
 msgid "show blame entries as we find them, incrementally"
 msgstr "visa klandringsposter när vi hittar dem, interaktivt"
 
-#: builtin/blame.c:865
 msgid "do not show object names of boundary commits (Default: off)"
 msgstr "visa inte objektnamn för gränsincheckningar (Standard: av)"
 
-#: builtin/blame.c:866
 msgid "do not treat root commits as boundaries (Default: off)"
 msgstr "vehandla inte rotincheckningar som gränser (Standard: av)"
 
-#: builtin/blame.c:867
 msgid "show work cost statistics"
 msgstr "visa statistik över arbetskostnad"
 
-#: builtin/blame.c:868 builtin/checkout.c:1554 builtin/clone.c:98
-#: builtin/commit-graph.c:75 builtin/commit-graph.c:228 builtin/fetch.c:181
-#: builtin/merge.c:301 builtin/multi-pack-index.c:103
-#: builtin/multi-pack-index.c:154 builtin/multi-pack-index.c:180
-#: builtin/multi-pack-index.c:208 builtin/pull.c:120 builtin/push.c:566
-#: builtin/remote.c:683 builtin/send-pack.c:202
 msgid "force progress reporting"
 msgstr "tvinga förloppsrapportering"
 
-#: builtin/blame.c:869
 msgid "show output score for blame entries"
 msgstr "visa utdatapoäng för klandringsposter"
 
-#: builtin/blame.c:870
 msgid "show original filename (Default: auto)"
 msgstr "visa originalfilnamn (Standard: auto)"
 
-#: builtin/blame.c:871
 msgid "show original linenumber (Default: off)"
 msgstr "visa ursprungligt radnummer (Standard: av)"
 
-#: builtin/blame.c:872
 msgid "show in a format designed for machine consumption"
 msgstr "visa i ett format avsett för maskinkonsumtion"
 
-#: builtin/blame.c:873
 msgid "show porcelain format with per-line commit information"
 msgstr "visa porslinsformat med per-rad-incheckningsinformation"
 
-#: builtin/blame.c:874
 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:875
 msgid "show raw timestamp (Default: off)"
 msgstr "visa rå tidsstämpel (Standard: av)"
 
-#: builtin/blame.c:876
 msgid "show long commit SHA1 (Default: off)"
 msgstr "visa lång inchecknings-SHA1 (Standard: av)"
 
-#: builtin/blame.c:877
 msgid "suppress author name and timestamp (Default: off)"
 msgstr "undertryck författarnamn och tidsstämpel (Standard: av)"
 
-#: builtin/blame.c:878
 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:879
 msgid "ignore whitespace differences"
 msgstr "ignorera ändringar i blanksteg"
 
-#: builtin/blame.c:880 builtin/log.c:1857
 msgid "rev"
 msgstr "incheckning"
 
-#: builtin/blame.c:880
 msgid "ignore <rev> when blaming"
 msgstr "ignorera <incheckning> vid klandringen"
 
-#: builtin/blame.c:881
 msgid "ignore revisions from <file>"
 msgstr "ignorera incheckningar från <fil>"
 
-#: builtin/blame.c:882
 msgid "color redundant metadata from previous line differently"
 msgstr "färglägg redundant metadata från tidigare rader annorlunda"
 
-#: builtin/blame.c:883
 msgid "color lines by age"
 msgstr "färglägg rader efter ålder"
 
-#: builtin/blame.c:884
 msgid "spend extra cycles to find better match"
 msgstr "slösa extra cykler med att hitta bättre träff"
 
-#: builtin/blame.c:885
 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:886
 msgid "use <file>'s contents as the final image"
 msgstr "använd <fil>s innehåll som slutgiltig bild"
 
-#: builtin/blame.c:887 builtin/blame.c:888
 msgid "score"
 msgstr "poäng"
 
-#: builtin/blame.c:887
 msgid "find line copies within and across files"
 msgstr "hitta kopierade rader inuti och mellan filer"
 
-#: builtin/blame.c:888
 msgid "find line movements within and across files"
 msgstr "hitta flyttade rader inuti och mellan filer"
 
-#: builtin/blame.c:889
 msgid "range"
 msgstr "intervall"
 
-#: builtin/blame.c:890
 msgid "process only line range <start>,<end> or function :<funcname>"
 msgstr ""
 "behandla endast intervallet <start>,<slut> eller funktionen :<funknamn>"
 
-#: builtin/blame.c:949
 msgid "--progress can't be used with --incremental or porcelain formats"
 msgstr "--progress kan inte användas med --incremental eller porslinsformat"
 
@@ -11774,57 +2659,45 @@ msgstr "--progress kan inte användas med --incremental eller porslinsformat"
 #. your language may need more or fewer display
 #. columns.
 #.
-#: builtin/blame.c:1000
 msgid "4 years, 11 months ago"
 msgstr "4 år, 11 månader sedan"
 
-#: builtin/blame.c:1116
 #, 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:1161
 msgid "Blaming lines"
 msgstr "Klandra rader"
 
-#: builtin/branch.c:29
 msgid "git branch [<options>] [-r | -a] [--merged] [--no-merged]"
 msgstr "git branch [<flaggor>] [-r | -a] [--merged] [--no-merged]"
 
-#: builtin/branch.c:30
 msgid ""
 "git branch [<options>] [-f] [--recurse-submodules] <branch-name> [<start-"
 "point>]"
 msgstr ""
 "git branch [<flaggor>] [-f] [--recurse-submodules] <grennamn> [<startpunkt>]"
 
-#: builtin/branch.c:31
 msgid "git branch [<options>] [-l] [<pattern>...]"
 msgstr "git branch [<flaggor>] [-l] [<mönster>...]"
 
-#: builtin/branch.c:32
 msgid "git branch [<options>] [-r] (-d | -D) <branch-name>..."
 msgstr "git branch [<flaggor>] [-r] (-d | -D) <grennamn>..."
 
-#: builtin/branch.c:33
 msgid "git branch [<options>] (-m | -M) [<old-branch>] <new-branch>"
 msgstr "git branch [<flaggor>] (-m | -M) [<gammal_gren>] <ny_gren>"
 
-#: builtin/branch.c:34
 msgid "git branch [<options>] (-c | -C) [<old-branch>] <new-branch>"
 msgstr "git branch [<flaggor>] (-c | -C) [<gammal_gren>] <ny_gren>"
 
-#: builtin/branch.c:35
 msgid "git branch [<options>] [-r | -a] [--points-at]"
 msgstr "git branch [<flaggor>] [-r | -a] [--points-at]"
 
-#: builtin/branch.c:36
 msgid "git branch [<options>] [-r | -a] [--format]"
 msgstr "git branch [<flaggor>] [-r | -a] [--format]"
 
-#: builtin/branch.c:165
 #, c-format
 msgid ""
 "deleting branch '%s' that has been merged to\n"
@@ -11833,7 +2706,6 @@ msgstr ""
 "tar bort grenen \"%s\" som har slagits ihop med\n"
 "         \"%s\", men ännu inte slagits ihop med HEAD."
 
-#: builtin/branch.c:169
 #, c-format
 msgid ""
 "not deleting branch '%s' that is not yet merged to\n"
@@ -11842,12 +2714,10 @@ msgstr ""
 "tar inte bort grenen \"%s\" som inte har slagits ihop med\n"
 "         \"%s\", trots att den har slagits ihop med HEAD."
 
-#: builtin/branch.c:183
 #, c-format
 msgid "Couldn't look up commit object for '%s'"
 msgstr "Kunde inte slå upp incheckningsobjekt för \"%s\""
 
-#: builtin/branch.c:187
 #, c-format
 msgid ""
 "The branch '%s' is not fully merged.\n"
@@ -11856,112 +2726,88 @@ msgstr ""
 "Grenen \"%s\" har inte slagits samman i sin helhet.\n"
 "Om du är säker på att du vill ta bort den, kör \"git branch -D %s\"."
 
-#: builtin/branch.c:200
 msgid "Update of config-file failed"
 msgstr "Misslyckades uppdatera konfigurationsfil"
 
-#: builtin/branch.c:235
 msgid "cannot use -a with -d"
 msgstr "kan inte ange -a med -d"
 
-#: builtin/branch.c:242
 msgid "Couldn't look up commit object for HEAD"
 msgstr "Kunde inte slå upp incheckningsobjekt för HEAD"
 
-#: builtin/branch.c:259
 #, c-format
 msgid "Cannot delete branch '%s' checked out at '%s'"
 msgstr "Kan inte ta bort grenen \"%s\" som är utcheckad på \"%s\""
 
-#: builtin/branch.c:274
 #, c-format
 msgid "remote-tracking branch '%s' not found."
 msgstr "fjärrspårande grenen \"%s\" hittades inte."
 
-#: builtin/branch.c:275
 #, c-format
 msgid "branch '%s' not found."
 msgstr "grenen \"%s\" hittades inte."
 
-#: builtin/branch.c:306
 #, c-format
 msgid "Deleted remote-tracking branch %s (was %s).\n"
 msgstr "Tog bort fjärrspårande grenen %s (var %s).\n"
 
-#: builtin/branch.c:307
 #, c-format
 msgid "Deleted branch %s (was %s).\n"
 msgstr "Tog bort grenen %s (var %s).\n"
 
-#: builtin/branch.c:457 builtin/tag.c:64
 msgid "unable to parse format string"
 msgstr "kan inte tolka formatsträng"
 
-#: builtin/branch.c:488
 msgid "could not resolve HEAD"
 msgstr "kunde inte slå upp HEAD"
 
-#: builtin/branch.c:494
 #, c-format
 msgid "HEAD (%s) points outside of refs/heads/"
 msgstr "HEAD (%s) pekar utenför refs/heads/"
 
-#: builtin/branch.c:509
 #, c-format
 msgid "Branch %s is being rebased at %s"
 msgstr "Grenen %s ombaseras på %s"
 
-#: builtin/branch.c:513
 #, c-format
 msgid "Branch %s is being bisected at %s"
 msgstr "Grenen %s är i en \"bisect\" på %s"
 
-#: builtin/branch.c:530
 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:532
 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:543
 #, c-format
 msgid "Invalid branch name: '%s'"
 msgstr "Felaktigt namn på gren: \"%s\""
 
-#: builtin/branch.c:572
 msgid "Branch rename failed"
 msgstr "Misslyckades byta namn på gren"
 
-#: builtin/branch.c:574
 msgid "Branch copy failed"
 msgstr "Misslyckades kopiera gren"
 
-#: builtin/branch.c:578
 #, c-format
 msgid "Created a copy of a misnamed branch '%s'"
 msgstr "Skapade kopia av felaktigt namngiven gren \"%s\""
 
-#: builtin/branch.c:581
 #, c-format
 msgid "Renamed a misnamed branch '%s' away"
 msgstr "Bytte bort namn på en felaktigt namngiven gren \"%s\""
 
-#: builtin/branch.c:587
 #, 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:596
 msgid "Branch is renamed, but update of config-file failed"
 msgstr "Grenen namnbytt, men misslyckades uppdatera konfigurationsfilen"
 
-#: builtin/branch.c:598
 msgid "Branch is copied, but update of config-file failed"
 msgstr "Grenen kopierades, men misslyckades uppdatera konfigurationsfilen"
 
-#: builtin/branch.c:614
 #, c-format
 msgid ""
 "Please edit the description for the branch\n"
@@ -11972,147 +2818,111 @@ msgstr ""
 "  %s\n"
 "Rader som inleds med \"%c\" ignoreras.\n"
 
-#: builtin/branch.c:651
 msgid "Generic options"
 msgstr "Allmänna flaggor"
 
-#: builtin/branch.c:653
 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:654
 msgid "suppress informational messages"
 msgstr "undertryck informationsmeddelanden"
 
-#: builtin/branch.c:656 builtin/checkout.c:1571
-#: builtin/submodule--helper.c:3077
 msgid "set branch tracking configuration"
 msgstr "ställ in inställningar för spårad gren"
 
-#: builtin/branch.c:659
 msgid "do not use"
 msgstr "använd ej"
 
-#: builtin/branch.c:661
 msgid "upstream"
 msgstr "uppströms"
 
-#: builtin/branch.c:661
 msgid "change the upstream info"
 msgstr "ändra uppströmsinformationen"
 
-#: builtin/branch.c:662
 msgid "unset the upstream info"
 msgstr "ta bort uppströmsinformationen"
 
-#: builtin/branch.c:663
 msgid "use colored output"
 msgstr "använd färgad utdata"
 
-#: builtin/branch.c:664
 msgid "act on remote-tracking branches"
 msgstr "arbeta på fjärrspårande grenar"
 
-#: builtin/branch.c:666 builtin/branch.c:668
 msgid "print only branches that contain the commit"
 msgstr "visa endast grenar som innehåller incheckningen"
 
-#: builtin/branch.c:667 builtin/branch.c:669
 msgid "print only branches that don't contain the commit"
 msgstr "visa endast grenar som inte innehåller incheckningen"
 
-#: builtin/branch.c:672
 msgid "Specific git-branch actions:"
 msgstr "Specifika git-branch-åtgärder:"
 
-#: builtin/branch.c:673
 msgid "list both remote-tracking and local branches"
 msgstr "visa både fjärrspårande och lokala grenar"
 
-#: builtin/branch.c:675
 msgid "delete fully merged branch"
 msgstr "ta bort helt sammanslagen gren"
 
-#: builtin/branch.c:676
 msgid "delete branch (even if not merged)"
 msgstr "ta bort gren (även om inte helt sammanslagen)"
 
-#: builtin/branch.c:677
 msgid "move/rename a branch and its reflog"
 msgstr "flytta/ta bort en gren och dess reflogg"
 
-#: builtin/branch.c:678
 msgid "move/rename a branch, even if target exists"
 msgstr "flytta/ta bort en gren, även om målet finns"
 
-#: builtin/branch.c:679
 msgid "copy a branch and its reflog"
 msgstr "kopiera en gren och dess reflogg"
 
-#: builtin/branch.c:680
 msgid "copy a branch, even if target exists"
 msgstr "kopiera en gren, även om målet finns"
 
-#: builtin/branch.c:681
 msgid "list branch names"
 msgstr "lista namn på grenar"
 
-#: builtin/branch.c:682
 msgid "show current branch name"
 msgstr "visa namn på aktuell gren"
 
-#: builtin/branch.c:683 builtin/submodule--helper.c:3075
 msgid "create the branch's reflog"
 msgstr "skapa grenens reflogg"
 
-#: builtin/branch.c:685
 msgid "edit the description for the branch"
 msgstr "redigera beskrivning för grenen"
 
-#: builtin/branch.c:686
 msgid "force creation, move/rename, deletion"
 msgstr "tvinga skapande, flytt/namnändring, borttagande"
 
-#: builtin/branch.c:687
 msgid "print only branches that are merged"
 msgstr "visa endast sammanslagna grenar"
 
-#: builtin/branch.c:688
 msgid "print only branches that are not merged"
 msgstr "visa endast ej sammanslagna grenar"
 
-#: builtin/branch.c:689
 msgid "list branches in columns"
 msgstr "visa grenar i spalter"
 
-#: builtin/branch.c:691 builtin/for-each-ref.c:45 builtin/notes.c:413
-#: builtin/notes.c:416 builtin/notes.c:579 builtin/notes.c:582
-#: builtin/tag.c:476
 msgid "object"
 msgstr "objekt"
 
-#: builtin/branch.c:692
 msgid "print only branches of the object"
 msgstr "visa endast grenar för objektet"
 
-#: builtin/branch.c:693 builtin/for-each-ref.c:51 builtin/tag.c:483
 msgid "sorting and filtering are case insensitive"
 msgstr "sortering och filtrering skiljer gemener och VERSALER"
 
-#: builtin/branch.c:694 builtin/ls-files.c:667
 msgid "recurse through submodules"
 msgstr "rekursera ner i undermoduler"
 
-#: builtin/branch.c:695 builtin/for-each-ref.c:41 builtin/ls-tree.c:358
-#: builtin/tag.c:481 builtin/verify-tag.c:38
 msgid "format to use for the output"
 msgstr "format att använda för utdata"
 
-#: builtin/branch.c:718 builtin/clone.c:684
+msgid "Failed to resolve HEAD as a valid ref."
+msgstr "Misslyckades slå upp HEAD som giltig referens."
+
 msgid "HEAD not found below refs/heads!"
 msgstr "HEAD hittades inte under refs/heads!"
 
-#: builtin/branch.c:739
 msgid ""
 "branch with --recurse-submodules can only be used if submodule."
 "propagateBranches is enabled"
@@ -12120,76 +2930,60 @@ msgstr ""
 "gren med --recurse-submodules kan endast användas om submodule."
 "propagateBranches har aktiverats"
 
-#: builtin/branch.c:741
 msgid "--recurse-submodules can only be used to create branches"
 msgstr "--recurse-submodules jan endast användas för att skapa grenar"
 
-#: builtin/branch.c:770 builtin/branch.c:826 builtin/branch.c:835
 msgid "branch name required"
 msgstr "grennamn krävs"
 
-#: builtin/branch.c:802
 msgid "Cannot give description to detached HEAD"
 msgstr "Kan inte beskriva frånkopplad HEAD"
 
-#: builtin/branch.c:807
 msgid "cannot edit description of more than one branch"
 msgstr "kan inte redigera beskrivning för mer än en gren"
 
-#: builtin/branch.c:814
 #, c-format
 msgid "No commit on branch '%s' yet."
 msgstr "Inga incheckningar på grenen \"%s\" ännu."
 
-#: builtin/branch.c:817
 #, c-format
 msgid "No branch named '%s'."
 msgstr "Ingen gren vid namnet \"%s\"."
 
-#: builtin/branch.c:832
 msgid "too many branches for a copy operation"
 msgstr "för många grenar för kopiering"
 
-#: builtin/branch.c:841
 msgid "too many arguments for a rename operation"
 msgstr "för många flaggor för namnbyte"
 
-#: builtin/branch.c:846
 msgid "too many arguments to set new upstream"
 msgstr "för många flaggor för att byta uppström"
 
-#: builtin/branch.c:850
 #, 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:853 builtin/branch.c:873
 #, c-format
 msgid "no such branch '%s'"
 msgstr "okänd gren \"%s\""
 
-#: builtin/branch.c:857
 #, c-format
 msgid "branch '%s' does not exist"
 msgstr "grenen \"%s\" finns inte"
 
-#: builtin/branch.c:867
 msgid "too many arguments to unset upstream"
 msgstr "för många flaggor för att ta bort uppström"
 
-#: builtin/branch.c:871
 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:877
 #, c-format
 msgid "Branch '%s' has no upstream information"
 msgstr "Grenen \"%s\" har ingen uppströmsinformation"
 
-#: builtin/branch.c:890
 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>?"
@@ -12197,7 +2991,6 @@ msgstr ""
 "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:894
 msgid ""
 "the '--set-upstream' option is no longer supported. Please use '--track' or "
 "'--set-upstream-to' instead."
@@ -12205,32 +2998,25 @@ msgstr ""
 "Flaggan --set-upstream rekommenderas ej och kommer tas bort. Använd --track "
 "eller --set-upstream-to istället."
 
-#: builtin/bugreport.c:16
 msgid "git version:\n"
 msgstr "git version:\n"
 
-#: 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:32
 msgid "compiler info: "
 msgstr "kompilatorinfo:"
 
-#: builtin/bugreport.c:35
 msgid "libc info: "
 msgstr "libc-info:"
 
-#: 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:62
 msgid "git bugreport [-o|--output-directory <file>] [-s|--suffix <format>]"
 msgstr "git bugreport [-o|--output-directory <fil>] [-s|--suffix <format>]"
 
-#: 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"
@@ -12266,144 +3052,115 @@ msgstr ""
 "Se över resten av felrapporten nedan.\n"
 "Du kan ta bort rader du inte vill dela.\n"
 
-#: builtin/bugreport.c:108
 msgid "specify a destination for the bugreport file"
 msgstr "ange mål för buggrapporteringsfilen"
 
-#: builtin/bugreport.c:110
 msgid "specify a strftime format suffix for the filename"
 msgstr "ange ett filändelse i strftime-format"
 
-#: 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:139
 msgid "System Info"
 msgstr "Systeminfo"
 
-#: builtin/bugreport.c:142
 msgid "Enabled Hooks"
 msgstr "Aktiverade krokar"
 
-#: builtin/bugreport.c:149
 #, c-format
 msgid "unable to write to %s"
 msgstr "kunde inte skriva till %s"
 
-#: builtin/bugreport.c:159
 #, c-format
 msgid "Created new report at '%s'.\n"
 msgstr "Skapade ny rapport på \"%s\"\n"
 
-#: builtin/bundle.c:15 builtin/bundle.c:23
 msgid "git bundle create [<options>] <file> <git-rev-list args>"
 msgstr "git bundle create [<flaggor>] <fil> <git-rev-list-flaggor>"
 
-#: builtin/bundle.c:16 builtin/bundle.c:28
 msgid "git bundle verify [<options>] <file>"
 msgstr "git bundle verify [<flaggor>] <fil>"
 
-#: builtin/bundle.c:17 builtin/bundle.c:33
 msgid "git bundle list-heads <file> [<refname>...]"
 msgstr "git bundle list-heads <fil> [<refnamn>...]"
 
-#: builtin/bundle.c:18 builtin/bundle.c:38
 msgid "git bundle unbundle <file> [<refname>...]"
 msgstr "git bundle unbundle <fil> [<refnamn>...]"
 
-#: builtin/bundle.c:65 builtin/pack-objects.c:3899
 msgid "do not show progress meter"
 msgstr "visa inte förloppsindikator"
 
-#: builtin/bundle.c:67 builtin/bundle.c:168 builtin/pack-objects.c:3901
 msgid "show progress meter"
 msgstr "visa förloppsindikator"
 
-#: builtin/bundle.c:69 builtin/pack-objects.c:3903
 msgid "show progress meter during object writing phase"
 msgstr "visa förloppsindikator under objektskrivningsfasen"
 
-#: builtin/bundle.c:72 builtin/pack-objects.c:3906
 msgid "similar to --all-progress when progress meter is shown"
 msgstr "som --all-progress när förloppsindikatorn visas"
 
-#: builtin/bundle.c:74
 msgid "specify bundle format version"
 msgstr "ange formatversion för bunten."
 
-#: builtin/bundle.c:94
 msgid "Need a repository to create a bundle."
 msgstr "Behöver ett arkiv för att skapa en bunt."
 
-#: builtin/bundle.c:108
 msgid "do not show bundle details"
 msgstr "visa inte buntdetaljer"
 
-#: builtin/bundle.c:127
 #, c-format
 msgid "%s is okay\n"
 msgstr "%s är okej\n"
 
-#: builtin/bundle.c:183
 msgid "Need a repository to unbundle."
 msgstr "Behöver ett arkiv för att packa upp en bunt."
 
-#: builtin/bundle.c:186
 msgid "Unbundling objects"
 msgstr "Packar upp objektbunt"
 
-#: builtin/bundle.c:220 builtin/remote.c:1758
 #, c-format
 msgid "Unknown subcommand: %s"
 msgstr "Okänt underkommando: %s"
 
-#: builtin/cat-file.c:568
+#, c-format
+msgid "cannot read object %s '%s'"
+msgstr "kan inte läsa objektet %s: \"%s\""
+
 msgid "flush is only for --buffer mode"
 msgstr "flush är endast till för --buffer-läge"
 
-#: builtin/cat-file.c:612
 msgid "empty command in input"
 msgstr "tomt kommando i indata"
 
-#: builtin/cat-file.c:614
 #, c-format
 msgid "whitespace before command: '%s'"
 msgstr "blanksteg före kommando: \"%s\""
 
-#: builtin/cat-file.c:623
 #, c-format
 msgid "%s requires arguments"
 msgstr "%s kräver ett argument"
 
-#: builtin/cat-file.c:628
 #, c-format
 msgid "%s takes no arguments"
 msgstr "%s tar inget argument"
 
-#: builtin/cat-file.c:636
 #, c-format
 msgid "unknown command: '%s'"
 msgstr "okänt kommando: \"%s\""
 
-#: builtin/cat-file.c:795
 msgid "only one batch option may be specified"
 msgstr "endast en buntflagga kan anges"
 
-#: builtin/cat-file.c:824
 msgid "git cat-file <type> <object>"
 msgstr "git cat-file <typ> <objekt>"
 
-#: builtin/cat-file.c:825
 msgid "git cat-file (-e | -p) <object>"
 msgstr "git cat-file (-e | -p) <objekt>"
 
-#: builtin/cat-file.c:826
 msgid "git cat-file (-t | -s) [--allow-unknown-type] <object>"
 msgstr "git cat-file (-t | -s) [--allow-unknown-type] <objekt>"
 
-#: builtin/cat-file.c:827
 msgid ""
 "git cat-file (--batch | --batch-check | --batch-command) [--batch-all-"
 "objects]\n"
@@ -12415,7 +3172,6 @@ msgstr ""
 "             [--buffer] [--follow-symlinks] [--unordered]\n"
 "             [--textconv | --filters]"
 
-#: builtin/cat-file.c:830
 msgid ""
 "git cat-file (--textconv | --filters)\n"
 "             [<rev>:<path|tree-ish> | --path=<path|tree-ish> <rev>]"
@@ -12424,71 +3180,54 @@ msgstr ""
 "             [<revision>:<sökväg|träd-igt> | --path=<sökväg|träd-igt> "
 "<revision>]"
 
-#: builtin/cat-file.c:836
 msgid "Check object existence or emit object contents"
 msgstr "Kontrollera om objektet finns eller mata ut objektets innehåll"
 
-#: builtin/cat-file.c:838
 msgid "check if <object> exists"
 msgstr "kontrollera om <objekt> finns"
 
-#: builtin/cat-file.c:839
 msgid "pretty-print <object> content"
 msgstr "visa <objekt>-innehåll snyggt"
 
-#: builtin/cat-file.c:841
 msgid "Emit [broken] object attributes"
 msgstr "Skriv ut [trasiga] objektattribut"
 
-#: builtin/cat-file.c:842
 msgid "show object type (one of 'blob', 'tree', 'commit', 'tag', ...)"
 msgstr "visa objekttyp (en av: \"blob\", \"tree\", \"commit\", \"tag\", ...)"
 
-#: builtin/cat-file.c:843
 msgid "show object size"
 msgstr "visa objektstorlek"
 
-#: builtin/cat-file.c:845
 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:847
 msgid "Batch objects requested on stdin (or --batch-all-objects)"
 msgstr "Buntobjekt ombeds på standard in (eller --batch-all-objects)"
 
-#: builtin/cat-file.c:849
 msgid "show full <object> or <rev> contents"
 msgstr "visa komplett innehåll för <objekt> eller <rev>"
 
-#: builtin/cat-file.c:853
 msgid "like --batch, but don't emit <contents>"
 msgstr "som --batch, men mata inte ut <innehåll>"
 
-#: builtin/cat-file.c:857
 msgid "read commands from stdin"
 msgstr "läs kommandon från standard in"
 
-#: builtin/cat-file.c:861
 msgid "with --batch[-check]: ignores stdin, batches all known objects"
 msgstr "med --batch[-check]: ignorear standard in, buntar alla kända objekt"
 
-#: builtin/cat-file.c:863
 msgid "Change or optimize batch output"
 msgstr "Ändra eller optimera buntutdata"
 
-#: builtin/cat-file.c:864
 msgid "buffer --batch output"
 msgstr "buffra utdata från --batch"
 
-#: builtin/cat-file.c:866
 msgid "follow in-tree symlinks"
 msgstr "följ symboliska länkar inom trädet"
 
-#: builtin/cat-file.c:868
 msgid "do not order objects before emitting them"
 msgstr "sortera inte objekt innan de matas ut"
 
-#: builtin/cat-file.c:870
 msgid ""
 "Emit object (blob or tree) with conversion or filter (stand-alone, or with "
 "batch)"
@@ -12496,309 +3235,232 @@ msgstr ""
 "Mata ut objekt (blob eller träd) med konvertering eller filter (fristående "
 "eller med bunt)"
 
-#: builtin/cat-file.c:872
 msgid "run textconv on object's content"
 msgstr "kör textconv på objektets innehåll"
 
-#: builtin/cat-file.c:874
 msgid "run filters on object's content"
 msgstr "kör filter på objektets innehåll"
 
-#: builtin/cat-file.c:875
 msgid "blob|tree"
 msgstr "blob|träd"
 
-#: builtin/cat-file.c:876
 msgid "use a <path> for (--textconv | --filters); Not with 'batch'"
 msgstr "använd en <sökväg> för (--textconv | --filters): Inte med 'batch'"
 
-#: builtin/cat-file.c:894
 #, c-format
 msgid "'%s=<%s>' needs '%s' or '%s'"
 msgstr "'%s=<%s>' behöver '%s' eller '%s'"
 
-#: builtin/cat-file.c:896
 msgid "path|tree-ish"
 msgstr "sökväg|träd-igt"
 
-#: builtin/cat-file.c:903 builtin/cat-file.c:906 builtin/cat-file.c:909
 #, c-format
 msgid "'%s' requires a batch mode"
 msgstr "\"%s\" behöver ett buntläge"
 
-#: builtin/cat-file.c:921
 #, c-format
 msgid "'-%c' is incompatible with batch mode"
 msgstr "\"-%c\" är inkompatibel med buntläge"
 
-#: builtin/cat-file.c:924
 msgid "batch modes take no arguments"
 msgstr "buntlägen inte några argument"
 
-#: builtin/cat-file.c:932 builtin/cat-file.c:935
 #, c-format
 msgid "<rev> required with '%s'"
 msgstr "<rev> krävs med \"%s\""
 
-#: builtin/cat-file.c:938
 #, c-format
 msgid "<object> required with '-%c'"
 msgstr "<objekt> krävs med \"-%c\""
 
-#: builtin/cat-file.c:943 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:965
-#: builtin/notes.c:987 builtin/prune-packed.c:25 builtin/receive-pack.c:2489
-#: builtin/tag.c:592
 msgid "too many arguments"
 msgstr "för många argument"
 
-#: builtin/cat-file.c:947
 #, c-format
 msgid "only two arguments allowed in <type> <object> mode, not %d"
 msgstr "endast två argument krävs i <typ> <objekt>-läge, inte %d"
 
-#: builtin/check-attr.c:13
 msgid "git check-attr [-a | --all | <attr>...] [--] <pathname>..."
 msgstr "git check-attr [-a | --all | <attr>...] [--] <sökväg>..."
 
-#: builtin/check-attr.c:14
 msgid "git check-attr --stdin [-z] [-a | --all | <attr>...]"
 msgstr "git check-attr --stdin [-z] [-a | --all | <attr>...]"
 
-#: builtin/check-attr.c:21
 msgid "report all attributes set on file"
 msgstr "visa alla attribut som satts på filen"
 
-#: builtin/check-attr.c:22
 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:101
 msgid "read file names from stdin"
 msgstr "läs filnamn från standard in"
 
-#: builtin/check-attr.c:25 builtin/check-ignore.c:27
 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:1550 builtin/gc.c:550
-#: builtin/worktree.c:565
 msgid "suppress progress reporting"
 msgstr "undertryck förloppsrapportering"
 
-#: builtin/check-ignore.c:29
 msgid "show non-matching input paths"
 msgstr "visa indatasökvägar som inte träffas"
 
-#: builtin/check-ignore.c:31
 msgid "ignore index when checking"
 msgstr "ignorera index vid kontroll"
 
-#: builtin/check-ignore.c:165
 msgid "cannot specify pathnames with --stdin"
 msgstr "kan inte ange sökvägsnamn med --stdin"
 
-#: builtin/check-ignore.c:168
 msgid "-z only makes sense with --stdin"
 msgstr "-z kan endast användas tillsammans med --stdin"
 
-#: builtin/check-ignore.c:170
 msgid "no path specified"
 msgstr "ingen sökväg angavs"
 
-#: builtin/check-ignore.c:174
 msgid "--quiet is only valid with a single pathname"
 msgstr "--quiet kan endast användas med ett enkelt sökvägsnamn"
 
-#: builtin/check-ignore.c:176
 msgid "cannot have both --quiet and --verbose"
 msgstr "kan inte använda både --quiet och --verbose"
 
-#: builtin/check-ignore.c:179
 msgid "--non-matching is only valid with --verbose"
 msgstr "--non-matching är endast giltig med --verbose"
 
-#: builtin/check-mailmap.c:9
 msgid "git check-mailmap [<options>] <contact>..."
 msgstr "git check-mailmap [<flaggor>] <kontakt>..."
 
-#: builtin/check-mailmap.c:14
 msgid "also read contacts from stdin"
 msgstr "läs även kontakter från standard in"
 
-#: builtin/check-mailmap.c:25
 #, c-format
 msgid "unable to parse contact: %s"
 msgstr "kunde inte tolka kontakt: %s"
 
-#: builtin/check-mailmap.c:48
 msgid "no contacts specified"
 msgstr "inga kontakter angavs"
 
-#: builtin/checkout--worker.c:110
 msgid "git checkout--worker [<options>]"
 msgstr "git checkout--worker [<flaggor>]"
 
-#: builtin/checkout--worker.c:118 builtin/checkout-index.c:235
-#: builtin/column.c:31 builtin/column.c:32 builtin/submodule--helper.c:1878
-#: builtin/submodule--helper.c:1881 builtin/submodule--helper.c:1889
-#: builtin/submodule--helper.c:2716 builtin/worktree.c:563
-#: builtin/worktree.c:808
 msgid "string"
 msgstr "sträng"
 
-#: builtin/checkout--worker.c:119 builtin/checkout-index.c:236
 msgid "when creating files, prepend <string>"
 msgstr "när filer skapas, lägg till <sträng> först"
 
-#: builtin/checkout-index.c:184
 msgid "git checkout-index [<options>] [--] [<file>...]"
 msgstr "git checkout-index [<flaggor>] [--] [<fil>...]"
 
-#: builtin/checkout-index.c:201
 msgid "stage should be between 1 and 3 or all"
 msgstr "etapp måste vara mellan 1 och 3 eller \"all\""
 
-#: builtin/checkout-index.c:219
 msgid "check out all files in the index"
 msgstr "checka ut alla filer i indexet"
 
-#: builtin/checkout-index.c:221
 msgid "do not skip files with skip-worktree set"
 msgstr "hoppa inte över filer med skip-worktree satt"
 
-#: builtin/checkout-index.c:222
 msgid "force overwrite of existing files"
 msgstr "tvinga överskrivning av befintliga filer"
 
-#: builtin/checkout-index.c:224
 msgid "no warning for existing files and files not in index"
 msgstr "ingen varning för existerande filer och filer ej i indexet"
 
-#: builtin/checkout-index.c:226
 msgid "don't checkout new files"
 msgstr "checka inte ut nya filer"
 
-#: builtin/checkout-index.c:228
 msgid "update stat information in the index file"
 msgstr "uppdatera stat-information i indexfilen"
 
-#: builtin/checkout-index.c:232
 msgid "read list of paths from the standard input"
 msgstr "läs listan över sökvägar från standard in"
 
-#: builtin/checkout-index.c:234
 msgid "write the content to temporary files"
 msgstr "skriv innehåll till temporära filer"
 
-#: builtin/checkout-index.c:238
 msgid "copy out the files from named stage"
 msgstr "kopiera ut filer från namngiven etapp"
 
-#: builtin/checkout.c:34
 msgid "git checkout [<options>] <branch>"
 msgstr "git checkout [<flaggor>] <gren>"
 
-#: builtin/checkout.c:35
 msgid "git checkout [<options>] [<branch>] -- <file>..."
 msgstr "git checkout [<flaggor>] [<gren>] -- <fil>..."
 
-#: builtin/checkout.c:40
 msgid "git switch [<options>] [<branch>]"
 msgstr "git switch [<flaggor>] [<gren>]"
 
-#: builtin/checkout.c:45
 msgid "git restore [<options>] [--source=<branch>] <file>..."
 msgstr "git restore [<flaggor>] [--source=<gren>] <fil>..."
 
-#: builtin/checkout.c:199 builtin/checkout.c:238
 #, c-format
 msgid "path '%s' does not have our version"
 msgstr "sökvägen \"%s\" har inte vår version"
 
-#: builtin/checkout.c:201 builtin/checkout.c:240
 #, c-format
 msgid "path '%s' does not have their version"
 msgstr "sökvägen \"%s\" har inte deras version"
 
-#: builtin/checkout.c:217
 #, c-format
 msgid "path '%s' does not have all necessary versions"
 msgstr "sökvägen \"%s\" innehåller inte alla nödvändiga versioner"
 
-#: builtin/checkout.c:271
 #, c-format
 msgid "path '%s' does not have necessary versions"
 msgstr "sökvägen \"%s\" innehåller inte nödvändiga versioner"
 
-#: builtin/checkout.c:291
 #, c-format
 msgid "path '%s': cannot merge"
 msgstr "sökväg \"%s\": kan inte slå ihop"
 
-#: builtin/checkout.c:307
 #, c-format
 msgid "Unable to add merge result for '%s'"
 msgstr "Kunde inte lägga till sammanslagningsresultat för \"%s\""
 
-#: builtin/checkout.c:424
 #, c-format
 msgid "Recreated %d merge conflict"
 msgid_plural "Recreated %d merge conflicts"
 msgstr[0] "Återskapade %d sammanslagningskonflikt"
 msgstr[1] "Återskapade %d sammanslagningskonflikter"
 
-#: builtin/checkout.c:429
 #, c-format
 msgid "Updated %d path from %s"
 msgid_plural "Updated %d paths from %s"
 msgstr[0] "Uppdaterade %d sökväg från %s"
 msgstr[1] "Uppdaterade %d sökvägar från %s"
 
-#: builtin/checkout.c:436
 #, c-format
 msgid "Updated %d path from the index"
 msgid_plural "Updated %d paths from the index"
 msgstr[0] "Uppdaterade %d sökväg från indexet"
 msgstr[1] "Uppdaterade %d sökvägar från indexet"
 
-#: builtin/checkout.c:459 builtin/checkout.c:462 builtin/checkout.c:465
-#: builtin/checkout.c:469
 #, c-format
 msgid "'%s' cannot be used with updating paths"
 msgstr "\"%s\" kan inte användas vid uppdatering av sökvägar"
 
-#: builtin/checkout.c:479
 #, c-format
 msgid "Cannot update paths and switch to branch '%s' at the same time."
 msgstr "Kan inte uppdatera sökvägar och växla till grenen \"%s\" samtidigt."
 
-#: builtin/checkout.c:483
 #, c-format
 msgid "neither '%s' or '%s' is specified"
 msgstr "varken \"%s\" eller \"%s\" har angivits"
 
-#: builtin/checkout.c:487
 #, c-format
 msgid "'%s' must be used when '%s' is not specified"
 msgstr "\"%s\" måste användas när \"%s\" inte anges"
 
-#: builtin/checkout.c:492 builtin/checkout.c:497
 #, c-format
 msgid "'%s' or '%s' cannot be used with %s"
 msgstr "\"%s\" eller \"%s\" kan inte användas med %s"
 
-#: builtin/checkout.c:571 builtin/checkout.c:578
 #, c-format
 msgid "path '%s' is unmerged"
 msgstr "sökvägen \"%s\" har inte slagits ihop"
 
-#: builtin/checkout.c:753
 msgid "you need to resolve your current index first"
 msgstr "du måste lösa ditt befintliga index först"
 
-#: builtin/checkout.c:809
 #, c-format
 msgid ""
 "cannot continue with staged changes in the following files:\n"
@@ -12807,50 +3469,40 @@ msgstr ""
 "kan inte fortsätta med köade ändringar i följande filer:\n"
 "%s"
 
-#: builtin/checkout.c:902
 #, c-format
 msgid "Can not do reflog for '%s': %s\n"
 msgstr "Kan inte skapa referenslogg för \"%s\": %s\n"
 
-#: builtin/checkout.c:947
 msgid "HEAD is now at"
 msgstr "HEAD är nu på"
 
-#: builtin/checkout.c:951 builtin/clone.c:615 t/helper/test-fast-rebase.c:203
 msgid "unable to update HEAD"
 msgstr "kan inte uppdatera HEAD"
 
-#: builtin/checkout.c:955
 #, c-format
 msgid "Reset branch '%s'\n"
 msgstr "Återställ gren \"%s\"\n"
 
-#: builtin/checkout.c:958
 #, c-format
 msgid "Already on '%s'\n"
 msgstr "Redan på \"%s\"\n"
 
-#: builtin/checkout.c:962
 #, c-format
 msgid "Switched to and reset branch '%s'\n"
 msgstr "Växlade till och nollställde grenen \"%s\"\n"
 
-#: builtin/checkout.c:964 builtin/checkout.c:1398
 #, c-format
 msgid "Switched to a new branch '%s'\n"
 msgstr "Växlade till en ny gren \"%s\"\n"
 
-#: builtin/checkout.c:966
 #, c-format
 msgid "Switched to branch '%s'\n"
 msgstr "Växlade till grenen \"%s\"\n"
 
-#: builtin/checkout.c:1017
 #, c-format
 msgid " ... and %d more.\n"
 msgstr " ... och %d till.\n"
 
-#: builtin/checkout.c:1023
 #, c-format
 msgid ""
 "Warning: you are leaving %d commit behind, not connected to\n"
@@ -12873,7 +3525,6 @@ msgstr[1] ""
 "\n"
 "%s\n"
 
-#: builtin/checkout.c:1042
 #, c-format
 msgid ""
 "If you want to keep it by creating a new branch, this may be a good time\n"
@@ -12900,19 +3551,15 @@ msgstr[1] ""
 " git branch <nytt_grennamn> %s\n"
 "\n"
 
-#: builtin/checkout.c:1077
 msgid "internal error in revision walk"
 msgstr "internt fel vid genomgång av revisioner (revision walk)"
 
-#: builtin/checkout.c:1081
 msgid "Previous HEAD position was"
 msgstr "Tidigare position för HEAD var"
 
-#: builtin/checkout.c:1124 builtin/checkout.c:1393
 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:1206
 #, c-format
 msgid ""
 "'%s' could be both a local file and a tracking branch.\n"
@@ -12921,7 +3568,6 @@ msgstr ""
 "\"%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:1213
 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"
@@ -12941,58 +3587,47 @@ msgstr ""
 "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:1223
 #, c-format
 msgid "'%s' matched multiple (%d) remote tracking branches"
 msgstr "\"%s\" motsvarar flera (%d) spårade fjärrgrenar"
 
-#: builtin/checkout.c:1289
 msgid "only one reference expected"
 msgstr "endast en referens förväntades"
 
-#: builtin/checkout.c:1306
 #, c-format
 msgid "only one reference expected, %d given."
 msgstr "endast en referens förväntades, %d gavs."
 
-#: builtin/checkout.c:1352 builtin/worktree.c:338 builtin/worktree.c:508
 #, c-format
 msgid "invalid reference: %s"
 msgstr "felaktig referens: %s"
 
-#: builtin/checkout.c:1365 builtin/checkout.c:1744
 #, c-format
 msgid "reference is not a tree: %s"
 msgstr "referensen är inte ett träd: %s"
 
-#: builtin/checkout.c:1413
 #, c-format
 msgid "a branch is expected, got tag '%s'"
 msgstr "förväntade gren, fick taggen \"%s\""
 
-#: builtin/checkout.c:1415
 #, c-format
 msgid "a branch is expected, got remote branch '%s'"
 msgstr "förväntade gren, fick fjärrgrenen \"%s\""
 
-#: builtin/checkout.c:1417 builtin/checkout.c:1426
 #, c-format
 msgid "a branch is expected, got '%s'"
 msgstr "förväntade gren, fick \"%s\""
 
-#: builtin/checkout.c:1420
 #, c-format
 msgid "a branch is expected, got commit '%s'"
 msgstr "förväntade gren, fick incheckningen \"%s\""
 
-#: builtin/checkout.c:1429
 msgid ""
 "If you want to detach HEAD at the commit, try again with the --detach option."
 msgstr ""
 "Om du vill koppla från HEAD vid incheckningen, försök igen med flaggan --"
 "detach."
 
-#: builtin/checkout.c:1442
 msgid ""
 "cannot switch branch while merging\n"
 "Consider \"git merge --quit\" or \"git worktree add\"."
@@ -13000,7 +3635,6 @@ msgstr ""
 "kan inte växla gren vid sammanslagning\n"
 "Överväg \"git merge --quit\" eller \"git worktree add\"."
 
-#: builtin/checkout.c:1446
 msgid ""
 "cannot switch branch in the middle of an am session\n"
 "Consider \"git am --quit\" or \"git worktree add\"."
@@ -13008,7 +3642,6 @@ msgstr ""
 "kan inte växla gren mitt i en \"am\"-körning\n"
 "Överväg \"git am --quit\" eller \"git worktree add\"."
 
-#: builtin/checkout.c:1450
 msgid ""
 "cannot switch branch while rebasing\n"
 "Consider \"git rebase --quit\" or \"git worktree add\"."
@@ -13016,7 +3649,6 @@ msgstr ""
 "kan inte växla gren vid ombasering\n"
 "Överväg \"git rebase --quit\" eller \"git worktree add\"."
 
-#: builtin/checkout.c:1454
 msgid ""
 "cannot switch branch while cherry-picking\n"
 "Consider \"git cherry-pick --quit\" or \"git worktree add\"."
@@ -13024,7 +3656,6 @@ msgstr ""
 "kan inte växla gren i en \"cherry-pick\"\n"
 "Överväg \"git cherry-pick --quit\" eller \"git worktree add\"."
 
-#: builtin/checkout.c:1458
 msgid ""
 "cannot switch branch while reverting\n"
 "Consider \"git revert --quit\" or \"git worktree add\"."
@@ -13032,123 +3663,95 @@ msgstr ""
 "kan inte växla gren i en \"revert\"\n"
 "Överväg \"git revert --quit\" eller \"git worktree add\"."
 
-#: builtin/checkout.c:1462
 msgid "you are switching branch while bisecting"
 msgstr "då växlar grenar medan du gör en \"bisect\""
 
-#: builtin/checkout.c:1469
 msgid "paths cannot be used with switching branches"
 msgstr "sökvägar kan inte användas vid byte av gren"
 
-#: builtin/checkout.c:1472 builtin/checkout.c:1476 builtin/checkout.c:1480
 #, c-format
 msgid "'%s' cannot be used with switching branches"
 msgstr "\"%s\" kan inte användas vid byte av gren"
 
-#: builtin/checkout.c:1484 builtin/checkout.c:1487 builtin/checkout.c:1490
-#: builtin/checkout.c:1495 builtin/checkout.c:1500
 #, c-format
 msgid "'%s' cannot be used with '%s'"
 msgstr "\"%s\" kan inte användas med \"%s\""
 
-#: builtin/checkout.c:1497
 #, c-format
 msgid "'%s' cannot take <start-point>"
 msgstr "\"%s\" kan inte ta <startpunkt>"
 
-#: builtin/checkout.c:1505
 #, c-format
 msgid "Cannot switch branch to a non-commit '%s'"
 msgstr "Kan inte växla gren till icke-incheckningen \"%s\""
 
-#: builtin/checkout.c:1512
 msgid "missing branch or commit argument"
 msgstr "saknar gren- eller incheckingsargument"
 
-#: builtin/checkout.c:1555
 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:1556 builtin/log.c:1844 parse-options.h:354
 msgid "style"
 msgstr "stil"
 
-#: builtin/checkout.c:1557
 msgid "conflict style (merge, diff3, or zdiff3)"
 msgstr "konfliktstil (merge, diff3 eller zdiff3)"
 
-#: builtin/checkout.c:1569 builtin/worktree.c:560
 msgid "detach HEAD at named commit"
 msgstr "koppla från HEAD vid namngiven incheckning"
 
-#: builtin/checkout.c:1574
 msgid "force checkout (throw away local modifications)"
 msgstr "tvinga utcheckning (kasta bort lokala ändringar)"
 
-#: builtin/checkout.c:1576
 msgid "new-branch"
 msgstr "ny-gren"
 
-#: builtin/checkout.c:1576
 msgid "new unparented branch"
 msgstr "ny gren utan förälder"
 
-#: builtin/checkout.c:1578 builtin/merge.c:305
 msgid "update ignored files (default)"
 msgstr "uppdatera ignorerade filer (standard)"
 
-#: builtin/checkout.c:1581
 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:1594
 msgid "checkout our version for unmerged files"
 msgstr "checka ut vår version för ej sammanslagna filer"
 
-#: builtin/checkout.c:1597
 msgid "checkout their version for unmerged files"
 msgstr "checka ut deras version för ej sammanslagna filer"
 
-#: builtin/checkout.c:1601
 msgid "do not limit pathspecs to sparse entries only"
 msgstr "begränsa inte sökvägar till endast glesa poster"
 
-#: builtin/checkout.c:1659
 #, c-format
 msgid "options '-%c', '-%c', and '%s' cannot be used together"
 msgstr "flaggorna \"%-c\", \"-%c\" och \"%s\" kan inte användas samtidigt"
 
-#: builtin/checkout.c:1700
 msgid "--track needs a branch name"
 msgstr "--track behöver ett namn på en gren"
 
-#: builtin/checkout.c:1705
 #, c-format
 msgid "missing branch name; try -%c"
 msgstr "grennamn saknas; försök med -%c"
 
-#: builtin/checkout.c:1737
 #, c-format
 msgid "could not resolve %s"
 msgstr "kunde inte upplösa %s"
 
-#: builtin/checkout.c:1753
 msgid "invalid path specification"
 msgstr "felaktig sökvägsangivelse"
 
-#: builtin/checkout.c:1760
 #, 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:1764
 #, 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:1789
 msgid ""
 "git checkout: --ours/--theirs, --force and --merge are incompatible when\n"
 "checking out of the index."
@@ -13156,115 +3759,90 @@ msgstr ""
 "git checkout: --ours/--theirs, --force och --merge är inkompatibla när\n"
 "du checkar ut från indexet."
 
-#: builtin/checkout.c:1794
 msgid "you must specify path(s) to restore"
 msgstr "du måste ange katalog(er) att återställa"
 
-#: builtin/checkout.c:1819 builtin/checkout.c:1821 builtin/checkout.c:1873
-#: builtin/checkout.c:1875 builtin/clone.c:130 builtin/remote.c:171
-#: builtin/remote.c:173 builtin/submodule--helper.c:3038
-#: builtin/submodule--helper.c:3371 builtin/worktree.c:556
-#: builtin/worktree.c:558
 msgid "branch"
 msgstr "gren"
 
-#: builtin/checkout.c:1820
 msgid "create and checkout a new branch"
 msgstr "skapa och checka ut en ny gren"
 
-#: builtin/checkout.c:1822
 msgid "create/reset and checkout a branch"
 msgstr "skapa/nollställ och checka ut en gren"
 
-#: builtin/checkout.c:1823
 msgid "create reflog for new branch"
 msgstr "skapa reflogg för ny gren"
 
-#: builtin/checkout.c:1825
 msgid "second guess 'git checkout <no-such-branch>' (default)"
 msgstr "förutspå \"git checkout <gren-saknas>\" (förval)"
 
-#: builtin/checkout.c:1826
 msgid "use overlay mode (default)"
 msgstr "använd överläggsläge (standard)"
 
-#: builtin/checkout.c:1874
 msgid "create and switch to a new branch"
 msgstr "skapa och växla till en ny gren"
 
-#: builtin/checkout.c:1876
 msgid "create/reset and switch to a branch"
 msgstr "skapa/nollställ och växla till en gren"
 
-#: builtin/checkout.c:1878
 msgid "second guess 'git switch <no-such-branch>'"
 msgstr "förutspå \"git checkout <gren-saknas>\""
 
-#: builtin/checkout.c:1880
 msgid "throw away local modifications"
 msgstr "kasta bort lokala ändringar"
 
-#: builtin/checkout.c:1916
 msgid "which tree-ish to checkout from"
 msgstr "vilken träd-igt att checka ut från"
 
-#: builtin/checkout.c:1918
 msgid "restore the index"
 msgstr "återställ indexet"
 
-#: builtin/checkout.c:1920
 msgid "restore the working tree (default)"
 msgstr "återställ arbetskatalogen (förval)"
 
-#: builtin/checkout.c:1922
 msgid "ignore unmerged entries"
 msgstr "ignorera ej sammanslagna poster"
 
-#: builtin/checkout.c:1923
 msgid "use overlay mode"
 msgstr "använd överläggsläge"
 
-#: builtin/clean.c:29
 msgid ""
 "git clean [-d] [-f] [-i] [-n] [-q] [-e <pattern>] [-x | -X] [--] <paths>..."
 msgstr ""
 "git clean [-d] [-f] [-i] [-n] [-q] [-e <mönster>] [-x | -X] [--] "
 "<sökvägar>..."
 
-#: builtin/clean.c:33
 #, c-format
 msgid "Removing %s\n"
 msgstr "Tar bort %s\n"
 
-#: builtin/clean.c:34
 #, c-format
 msgid "Would remove %s\n"
 msgstr "Skulle ta bort %s\n"
 
-#: builtin/clean.c:35
 #, c-format
 msgid "Skipping repository %s\n"
 msgstr "Hoppar över arkivet %s\n"
 
-#: builtin/clean.c:36
 #, c-format
 msgid "Would skip repository %s\n"
 msgstr "Skulle hoppa över arkivet %s\n"
 
-#: builtin/clean.c:38
+#, c-format
+msgid "failed to remove %s"
+msgstr "misslyckades ta bort %s"
+
 #, c-format
 msgid "could not lstat %s\n"
 msgstr "kunde inte ta status (\"lstat\") på %s\n"
 
-#: builtin/clean.c:39
 msgid "Refusing to remove current working directory\n"
 msgstr "Vägrar ta bort aktuell arbetskatalog\n"
 
-#: builtin/clean.c:40
 msgid "Would refuse to remove current working directory\n"
 msgstr "Skulle vägra ta bort aktuell arbetskatalog\n"
 
-#: builtin/clean.c:326 git-add--interactive.perl:593
 #, c-format
 msgid ""
 "Prompt help:\n"
@@ -13277,7 +3855,6 @@ msgstr ""
 "foo        - markera post baserad på unikt prefix\n"
 "           - (tomt) markera ingenting\n"
 
-#: builtin/clean.c:330 git-add--interactive.perl:602
 #, c-format
 msgid ""
 "Prompt help:\n"
@@ -13298,33 +3875,26 @@ msgstr ""
 "*          - välj alla poster\n"
 "           - (tomt) avsluta markering\n"
 
-#: builtin/clean.c:545 git-add--interactive.perl:568
-#: git-add--interactive.perl:573
 #, c-format, perl-format
 msgid "Huh (%s)?\n"
 msgstr "Vadå (%s)?\n"
 
-#: builtin/clean.c:685
 #, c-format
 msgid "Input ignore patterns>> "
 msgstr "Ange ignoreringsmönster>>"
 
-#: builtin/clean.c:719
 #, c-format
 msgid "WARNING: Cannot find items matched by: %s"
 msgstr "VARNING: Hittar inte poster som motsvarar: %s"
 
-#: builtin/clean.c:740
 msgid "Select items to delete"
 msgstr "Välj poster att ta bort"
 
 #. TRANSLATORS: Make sure to keep [y/N] as is
-#: builtin/clean.c:781
 #, c-format
 msgid "Remove %s [y/N]? "
 msgstr "Ta bort %s [Y=ja / N=nej]? "
 
-#: builtin/clean.c:812
 msgid ""
 "clean               - start cleaning\n"
 "filter by pattern   - exclude items from deletion\n"
@@ -13342,52 +3912,38 @@ msgstr ""
 "help                - denna skärm\n"
 "?                   - hjälp för kommandoval"
 
-#: builtin/clean.c:848
 msgid "Would remove the following item:"
 msgid_plural "Would remove the following items:"
 msgstr[0] "Skulle ta bort följande post:"
 msgstr[1] "Skulle ta bort följande poster:"
 
-#: builtin/clean.c:864
 msgid "No more files to clean, exiting."
 msgstr "Inga fler filer att städa, avslutar."
 
-#: builtin/clean.c:926
 msgid "do not print names of files removed"
 msgstr "skriv inte ut namn på borttagna filer"
 
-#: builtin/clean.c:928
 msgid "force"
 msgstr "tvinga"
 
-#: builtin/clean.c:929
 msgid "interactive cleaning"
 msgstr "städa interaktivt"
 
-#: builtin/clean.c:931
 msgid "remove whole directories"
 msgstr "ta bort hela kataloger"
 
-#: builtin/clean.c:932 builtin/describe.c:565 builtin/describe.c:567
-#: builtin/grep.c:938 builtin/log.c:185 builtin/log.c:187
-#: builtin/ls-files.c:651 builtin/name-rev.c:585 builtin/name-rev.c:587
-#: builtin/show-ref.c:179
 msgid "pattern"
 msgstr "mönster"
 
-#: builtin/clean.c:933
 msgid "add <pattern> to ignore rules"
 msgstr "lägg till <mönster> till ignoreringsregler"
 
-#: builtin/clean.c:934
 msgid "remove ignored files, too"
 msgstr "ta även bort ignorerade filer"
 
-#: builtin/clean.c:936
 msgid "remove only ignored files"
 msgstr "ta endast bort ignorerade filer"
 
-#: builtin/clean.c:951
 msgid ""
 "clean.requireForce set to true and neither -i, -n, nor -f given; refusing to "
 "clean"
@@ -13395,7 +3951,6 @@ msgstr ""
 "clean.requireForce satt till true, men varken -i, -n eller -f angavs; vägrar "
 "städa"
 
-#: builtin/clean.c:954
 msgid ""
 "clean.requireForce defaults to true and neither -i, -n, nor -f given; "
 "refusing to clean"
@@ -13403,216 +3958,162 @@ msgstr ""
 "clean.requireForce har standardvärdet true och varken -i, -n eller -f "
 "angavs; vägrar städa"
 
-#: builtin/clean.c:966
 msgid "-x and -X cannot be used together"
 msgstr "-x och -X kan inte användas samtidigt"
 
-#: builtin/clone.c:47
 msgid "git clone [<options>] [--] <repo> [<dir>]"
 msgstr "git clone [<flaggor>] [--] <arkiv> [<kat>]"
 
-#: builtin/clone.c:100
 msgid "don't clone shallow repository"
 msgstr "klona inte grunt arkiv"
 
-#: builtin/clone.c:102
 msgid "don't create a checkout"
 msgstr "skapa inte någon utcheckning"
 
-#: builtin/clone.c:103 builtin/clone.c:105 builtin/init-db.c:542
 msgid "create a bare repository"
 msgstr "skapa ett naket (\"bare\") arkiv"
 
-#: builtin/clone.c:107
 msgid "create a mirror repository (implies bare)"
 msgstr "skapa ett spegelarkiv (implicerar \"bare\")"
 
-#: builtin/clone.c:109
 msgid "to clone from a local repository"
 msgstr "för att klona från ett lokalt arkiv"
 
-#: builtin/clone.c:111
 msgid "don't use local hardlinks, always copy"
 msgstr "skapa inte lokala hårda länkar, kopiera alltid"
 
-#: builtin/clone.c:113
 msgid "setup as shared repository"
 msgstr "skapa som ett delat arkiv"
 
-#: builtin/clone.c:115
 msgid "pathspec"
 msgstr "sökvägsangivelse"
 
-#: builtin/clone.c:115
 msgid "initialize submodules in the clone"
 msgstr "initiera undermoduler i klonen"
 
-#: builtin/clone.c:119
 msgid "number of submodules cloned in parallel"
 msgstr "antal undermoduler som klonas parallellt"
 
-#: builtin/clone.c:120 builtin/init-db.c:539
 msgid "template-directory"
 msgstr "mallkatalog"
 
-#: builtin/clone.c:121 builtin/init-db.c:540
 msgid "directory from which templates will be used"
 msgstr "katalog att använda mallar från"
 
-#: builtin/clone.c:123 builtin/clone.c:125 builtin/submodule--helper.c:1885
-#: builtin/submodule--helper.c:2719 builtin/submodule--helper.c:3378
 msgid "reference repository"
 msgstr "referensarkiv"
 
-#: builtin/clone.c:127 builtin/submodule--helper.c:1887
-#: builtin/submodule--helper.c:2721
 msgid "use --reference only while cloning"
 msgstr "använd --reference endast under kloningen"
 
-#: builtin/clone.c:128 builtin/column.c:27 builtin/fmt-merge-msg.c:27
-#: builtin/init-db.c:550 builtin/merge-file.c:48 builtin/merge.c:290
-#: builtin/pack-objects.c:3967 builtin/repack.c:669
-#: builtin/submodule--helper.c:3380 t/helper/test-simple-ipc.c:595
-#: t/helper/test-simple-ipc.c:597
 msgid "name"
 msgstr "namn"
 
-#: builtin/clone.c:129
 msgid "use <name> instead of 'origin' to track upstream"
 msgstr "använd <namn> istället för \"origin\" för att spåra uppströms"
 
-#: builtin/clone.c:131
 msgid "checkout <branch> instead of the remote's HEAD"
 msgstr "checka ut <gren> istället för fjärrens HEAD"
 
-#: builtin/clone.c:133
 msgid "path to git-upload-pack on the remote"
 msgstr "sökväg till git-upload-pack på fjärren"
 
-#: builtin/clone.c:134 builtin/fetch.c:182 builtin/grep.c:877
-#: builtin/pull.c:212
 msgid "depth"
 msgstr "djup"
 
-#: builtin/clone.c:135
 msgid "create a shallow clone of that depth"
 msgstr "skapa en grund klon på detta djup"
 
-#: builtin/clone.c:136 builtin/fetch.c:184 builtin/pack-objects.c:3956
-#: builtin/pull.c:215
 msgid "time"
 msgstr "tid"
 
-#: builtin/clone.c:137
 msgid "create a shallow clone since a specific time"
 msgstr "skapa en grund klon från en angiven tidpunkt"
 
-#: builtin/clone.c:138 builtin/fetch.c:186 builtin/fetch.c:212
-#: builtin/pull.c:218 builtin/pull.c:243 builtin/rebase.c:1050
 msgid "revision"
 msgstr "revision"
 
-#: builtin/clone.c:139 builtin/fetch.c:187 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:141 builtin/submodule--helper.c:1897
-#: builtin/submodule--helper.c:2735
 msgid "clone only one branch, HEAD or --branch"
 msgstr "klona endast en gren, HEAD eller --branch"
 
-#: builtin/clone.c:143
 msgid "don't clone any tags, and make later fetches not to follow them"
 msgstr "klona inga taggar och gör att senare hämtningar inte följer dem"
 
-#: builtin/clone.c:145
 msgid "any cloned submodules will be shallow"
 msgstr "klonade undermoduler kommer vara grunda"
 
-#: builtin/clone.c:146 builtin/init-db.c:548
 msgid "gitdir"
 msgstr "gitkat"
 
-#: builtin/clone.c:147 builtin/init-db.c:549
 msgid "separate git dir from working tree"
 msgstr "separera gitkatalogen från arbetskatalogen"
 
-#: builtin/clone.c:148
 msgid "key=value"
 msgstr "nyckel=värde"
 
-#: builtin/clone.c:149
 msgid "set config inside the new repository"
 msgstr "ställ in konfiguration i det nya arkivet"
 
-#: builtin/clone.c:151 builtin/fetch.c:207 builtin/ls-remote.c:77
-#: builtin/pull.c:234 builtin/push.c:575 builtin/send-pack.c:200
 msgid "server-specific"
 msgstr "serverspecifik"
 
-#: builtin/clone.c:151 builtin/fetch.c:207 builtin/ls-remote.c:77
-#: builtin/pull.c:235 builtin/push.c:575 builtin/send-pack.c:201
 msgid "option to transmit"
 msgstr "flagga att sända"
 
-#: builtin/clone.c:152 builtin/fetch.c:208 builtin/pull.c:238
-#: builtin/push.c:576
 msgid "use IPv4 addresses only"
 msgstr "använd endast IPv4-adresser"
 
-#: builtin/clone.c:154 builtin/fetch.c:210 builtin/pull.c:241
-#: builtin/push.c:578
 msgid "use IPv6 addresses only"
 msgstr "använd endast IPv6-adresser"
 
-#: builtin/clone.c:158
 msgid "apply partial clone filters to submodules"
 msgstr "tillämpa delvisa klonfilter på undermoduler"
 
-#: builtin/clone.c:160
 msgid "any cloned submodules will use their remote-tracking branch"
 msgstr "klonade undermoduler kommer använda sin fjärrspårningsgren"
 
-#: builtin/clone.c:162
 msgid "initialize sparse-checkout file to include only files at root"
 msgstr "initiera sparse-checkout-filen till att bara ta med filer i roten"
 
-#: builtin/clone.c:237
 #, 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:310
+#, c-format
+msgid "failed to stat '%s'"
+msgstr "misslyckades ta status på \"%s\""
+
 #, c-format
 msgid "%s exists and is not a directory"
 msgstr "%s finns och är ingen katalog"
 
-#: builtin/clone.c:328
 #, c-format
 msgid "failed to start iterator over '%s'"
 msgstr "misslyckades starta iterator över \"%s\""
 
-#: builtin/clone.c:359
+#, c-format
+msgid "failed to unlink '%s'"
+msgstr "misslyckades ta bort länken \"%s\""
+
 #, c-format
 msgid "failed to create link '%s'"
 msgstr "misslyckades skapa länken \"%s\""
 
-#: builtin/clone.c:363
 #, c-format
 msgid "failed to copy file to '%s'"
 msgstr "misslyckades kopiera filen till \"%s\""
 
-#: builtin/clone.c:368
 #, c-format
 msgid "failed to iterate over '%s'"
 msgstr "misslyckades iterera över \"%s\""
 
-#: builtin/clone.c:395
 #, c-format
 msgid "done.\n"
 msgstr "klart.\n"
 
-#: builtin/clone.c:409
 msgid ""
 "Clone succeeded, but checkout failed.\n"
 "You can inspect what was checked out with 'git status'\n"
@@ -13622,193 +4123,156 @@ msgstr ""
 "Du kan inspektera det som checkades ut med \"git status\"\n"
 "och försöka med \"git restore --source=HEAD :/\"\n"
 
-#: builtin/clone.c:486
 #, 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:603
+msgid "remote did not send all necessary objects"
+msgstr "fjärren sände inte alla nödvändiga objekt"
+
 #, c-format
 msgid "unable to update %s"
 msgstr "kan inte uppdatera %s"
 
-#: builtin/clone.c:651
 msgid "failed to initialize sparse-checkout"
 msgstr "misslyckades initiera sparse-checkout"
 
-#: builtin/clone.c:674
 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:709
 msgid "unable to checkout working tree"
 msgstr "kunde inte checka ut arbetskatalogen"
 
-#: builtin/clone.c:793
 msgid "unable to write parameters to config file"
 msgstr "kunde inte skriva parametrar till konfigurationsfilen"
 
-#: builtin/clone.c:856
 msgid "cannot repack to clean up"
 msgstr "kan inte packa om för att städa upp"
 
-#: builtin/clone.c:858
 msgid "cannot unlink temporary alternates file"
 msgstr "kunde inte ta bort temporär \"alternates\"-fil"
 
-#: builtin/clone.c:901
 msgid "Too many arguments."
 msgstr "För många argument."
 
-#: builtin/clone.c:905 contrib/scalar/scalar.c:413
 msgid "You must specify a repository to clone."
 msgstr "Du måste ange ett arkiv att klona."
 
-#: builtin/clone.c:918
 #, c-format
 msgid "options '%s' and '%s %s' cannot be used together"
 msgstr "flaggorna \"%s\" och \"%s %s\" kan inte användas samtidigt"
 
-#: builtin/clone.c:935
 #, c-format
 msgid "repository '%s' does not exist"
 msgstr "arkivet \"%s\" finns inte"
 
-#: builtin/clone.c:939 builtin/fetch.c:2176
 #, c-format
 msgid "depth %s is not a positive number"
 msgstr "djupet %s är inte ett positivt tal"
 
-#: builtin/clone.c:949
 #, 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:955
 #, 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:969
 #, c-format
 msgid "working tree '%s' already exists."
 msgstr "arbetsträdet \"%s\" finns redan."
 
-#: builtin/clone.c:984 builtin/clone.c:1005 builtin/difftool.c:256
-#: builtin/log.c:2037 builtin/worktree.c:350 builtin/worktree.c:382
 #, c-format
 msgid "could not create leading directories of '%s'"
 msgstr "kunde inte skapa inledande kataloger för \"%s\""
 
-#: builtin/clone.c:989
 #, c-format
 msgid "could not create work tree dir '%s'"
 msgstr "kunde inte skapa arbetskatalogen \"%s\""
 
-#: builtin/clone.c:1009
 #, c-format
 msgid "Cloning into bare repository '%s'...\n"
 msgstr "Klonar till ett naket arkiv \"%s\"...\n"
 
-#: builtin/clone.c:1011
 #, c-format
 msgid "Cloning into '%s'...\n"
 msgstr "Klonar till \"%s\"...\n"
 
-#: builtin/clone.c:1040
 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:1116 builtin/remote.c:201 builtin/remote.c:721
 #, c-format
 msgid "'%s' is not a valid remote name"
 msgstr "\"%s\" är inte ett giltigt namn på fjärrarkiv"
 
-#: builtin/clone.c:1157
 msgid "--depth is ignored in local clones; use file:// instead."
 msgstr "--depth ignoreras i lokala kloningar; använd file:// istället."
 
-#: builtin/clone.c:1159
 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:1161
 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:1163
 msgid "--filter is ignored in local clones; use file:// instead."
 msgstr "--filter ignoreras i lokala kloningar; använd file:// istället."
 
-#: builtin/clone.c:1168
+msgid "source repository is shallow, reject to clone."
+msgstr "källarkivet är grunt, tillåter inte kloning."
+
 msgid "source repository is shallow, ignoring --local"
 msgstr "källarkivet är grunt, ignorerar --local"
 
-#: builtin/clone.c:1173
 msgid "--local is ignored"
 msgstr "--local ignoreras"
 
-#: builtin/clone.c:1185
 msgid "cannot clone from filtered bundle"
 msgstr "kan inte klona från filtrerad bunt"
 
-#: builtin/clone.c:1265 builtin/clone.c:1324
 msgid "remote transport reported error"
 msgstr "fjärrtransport rapporterade fel"
 
-#: builtin/clone.c:1277 builtin/clone.c:1289
 #, c-format
 msgid "Remote branch %s not found in upstream %s"
 msgstr "Fjärrgrenen %s hittades inte i uppströmsarkivet %s"
 
-#: builtin/clone.c:1292
 msgid "You appear to have cloned an empty repository."
 msgstr "Du verkar ha klonat ett tomt arkiv."
 
-#: builtin/column.c:10
 msgid "git column [<options>]"
 msgstr "git column [<flaggor>]"
 
-#: builtin/column.c:27
 msgid "lookup config vars"
 msgstr "slå upp konfigurationsvariabler"
 
-#: builtin/column.c:28 builtin/column.c:29
 msgid "layout to use"
 msgstr "utseende att använda"
 
-#: builtin/column.c:30
 msgid "maximum width"
 msgstr "maximal bredd"
 
-#: builtin/column.c:31
 msgid "padding space on left border"
 msgstr "spaltfyllnad i vänsterkanten"
 
-#: builtin/column.c:32
 msgid "padding space on right border"
 msgstr "spaltfyllnad i högerkanten"
 
-#: builtin/column.c:33
 msgid "padding space between columns"
 msgstr "spaltfyllnad mellan spalter"
 
-#: builtin/column.c:51
 msgid "--command must be the first argument"
 msgstr "--command måste vara första argument"
 
-#: 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:16
 msgid ""
 "git commit-graph write [--object-dir <objdir>] [--append] [--"
 "split[=<strategy>]] [--reachable|--stdin-packs|--stdin-commits] [--changed-"
@@ -13818,93 +4282,76 @@ msgstr ""
 "split[=<strategi>]] [--reachable|--stdin-packs|--stdin-commits] [--changed-"
 "paths] [--[no-]max-new-filters <n>] [--[no-]progress] <delnings-flaggor>"
 
-#: builtin/commit-graph.c:51 builtin/fetch.c:196 builtin/log.c:1813
 msgid "dir"
 msgstr "kat"
 
-#: builtin/commit-graph.c:52
 msgid "the object directory to store the graph"
 msgstr "objektkatalogen där grafen ska lagras"
 
-#: 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:100
 #, c-format
 msgid "Could not open commit-graph '%s'"
 msgstr "Kunde inte öppna incheckningsgrafen \"%s\""
 
-#: builtin/commit-graph.c:137
 #, c-format
 msgid "unrecognized --split argument, %s"
 msgstr "okänt argument för --split, %s"
 
-#: 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:155
 #, c-format
 msgid "invalid object: %s"
 msgstr "ogiltigt objekt: %s"
 
-#: builtin/commit-graph.c:205
+#, c-format
+msgid "option `%s' expects a numerical value"
+msgstr "flaggan \"%s\" antar ett numeriskt värde"
+
 msgid "start walk at all refs"
 msgstr "starta traversering vid alla referenser"
 
-#: 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:209
 msgid "start walk at commits listed by stdin"
 msgstr "börja gå genom incheckningar listade på standard in"
 
-#: 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:213
 msgid "enable computation for changed paths"
 msgstr "aktivera beräkning av ändrade sökvägar"
 
-#: builtin/commit-graph.c:215
 msgid "allow writing an incremental commit-graph file"
 msgstr "tillåt skriva en inkrementell incheckningsgraffil"
 
-#: 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: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: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: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: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:282
 msgid "Collecting commits from input"
 msgstr "Hämtar incheckningar från indata"
 
-#: builtin/commit-graph.c:328 builtin/multi-pack-index.c:259
 #, 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 "
 "<file>)...] <tree>"
@@ -13912,70 +4359,52 @@ msgstr ""
 "git commit-tree [(-p <föräldrer>)...] [-S[<nyckelid>]] [(-m "
 "<meddelande>)...] [(-F <fil>)...] <träd>"
 
-#: builtin/commit-tree.c:31
 #, c-format
 msgid "duplicate parent %s ignored"
 msgstr "duplicerad förälder %s ignorerades"
 
-#: builtin/commit-tree.c:56 builtin/commit-tree.c:134 builtin/log.c:590
 #, c-format
 msgid "not a valid object name %s"
 msgstr "objektnamnet är inte giltigt: %s"
 
-#: 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:96
 #, c-format
 msgid "git commit-tree: failed to close '%s'"
 msgstr "git commit-tree: misslyckades stänga \"%s\""
 
-#: builtin/commit-tree.c:109
 msgid "parent"
 msgstr "förälder"
 
-#: builtin/commit-tree.c:110
 msgid "id of a parent commit object"
 msgstr "id på ett förälderincheckningsobjekt"
 
-#: builtin/commit-tree.c:112 builtin/commit.c:1626 builtin/merge.c:284
-#: builtin/notes.c:407 builtin/notes.c:573 builtin/stash.c:1666
-#: builtin/tag.c:455
 msgid "message"
 msgstr "meddelande"
 
-#: builtin/commit-tree.c:113 builtin/commit.c:1626
 msgid "commit message"
 msgstr "incheckningsmeddelande"
 
-#: builtin/commit-tree.c:116
 msgid "read commit log message from file"
 msgstr "läs incheckningsloggmeddelande från fil"
 
-#: builtin/commit-tree.c:119 builtin/commit.c:1643 builtin/merge.c:303
-#: builtin/pull.c:180 builtin/revert.c:118
 msgid "GPG sign commit"
 msgstr "GPG-signera incheckning"
 
-#: builtin/commit-tree.c:131
 msgid "must give exactly one tree"
 msgstr "måste ange exakt ett träd"
 
-#: builtin/commit-tree.c:138
 msgid "git commit-tree: failed to read"
 msgstr "git commit-tree: misslyckades läsa"
 
-#: builtin/commit.c:43
 msgid "git commit [<options>] [--] <pathspec>..."
 msgstr "git commit [<flaggor>] [--] <sökväg>..."
 
-#: builtin/commit.c:48
 msgid "git status [<options>] [--] <pathspec>..."
 msgstr "git status [<flaggor>] [--] <sökväg>..."
 
-#: builtin/commit.c:53
 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"
@@ -13985,7 +4414,6 @@ msgstr ""
 "blir den tom. Du kan köra kommandot på nytt med --allow-empty, eller\n"
 "så kan du ta bort incheckningen helt med \"git reset HEAD^\".\n"
 
-#: builtin/commit.c:58
 msgid ""
 "The previous cherry-pick is now empty, possibly due to conflict resolution.\n"
 "If you wish to commit it anyway, use:\n"
@@ -13999,15 +4427,12 @@ msgstr ""
 "    git commit --allow-empty\n"
 "\n"
 
-#: builtin/commit.c:65
 msgid "Otherwise, please use 'git rebase --skip'\n"
 msgstr "Använd annars \"git rebase --skip\"\n"
 
-#: builtin/commit.c:68
 msgid "Otherwise, please use 'git cherry-pick --skip'\n"
 msgstr "Använd annars \"git cherry-pick --skip\"\n"
 
-#: builtin/commit.c:71
 msgid ""
 "and then use:\n"
 "\n"
@@ -14029,69 +4454,57 @@ msgstr ""
 "    git cherry-pick --skip\n"
 "\n"
 
-#: builtin/commit.c:326
 msgid "failed to unpack HEAD tree object"
 msgstr "misslyckades packa upp HEAD:s trädobjekt"
 
-#: builtin/commit.c:376
 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:388
 msgid "unable to create temporary index"
 msgstr "kunde inte skapa temporär indexfil"
 
-#: builtin/commit.c:397
 msgid "interactive add failed"
 msgstr "interaktiv tilläggning misslyckades"
 
-#: builtin/commit.c:412
 msgid "unable to update temporary index"
 msgstr "kan inte uppdatera temporärt index"
 
-#: builtin/commit.c:414
 msgid "Failed to update main cache tree"
 msgstr "Misslyckades uppdatera huvud-cacheträdet"
 
-#: builtin/commit.c:439 builtin/commit.c:462 builtin/commit.c:510
 msgid "unable to write new_index file"
 msgstr "kunde inte skriva filen new_index"
 
-#: builtin/commit.c:491
 msgid "cannot do a partial commit during a merge."
 msgstr "kan inte utföra en delvis incheckning under en sammanslagning."
 
-#: builtin/commit.c:493
 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:495
 msgid "cannot do a partial commit during a rebase."
 msgstr "kan inte utföra en delvis incheckning under en ombasering."
 
-#: builtin/commit.c:503
 msgid "cannot read the index"
 msgstr "kan inte läsa indexet"
 
-#: builtin/commit.c:522
 msgid "unable to write temporary index file"
 msgstr "kunde inte skriva temporär indexfil"
 
-#: builtin/commit.c:620
 #, c-format
 msgid "commit '%s' lacks author header"
 msgstr "incheckningen \"%s\" saknar författarhuvud"
 
-#: builtin/commit.c:622
 #, c-format
 msgid "commit '%s' has malformed author line"
 msgstr "incheckningen \"%s\" har felformaterat författarhuvud"
 
-#: builtin/commit.c:641
 msgid "malformed --author parameter"
 msgstr "felformad \"--author\"-flagga"
 
-#: builtin/commit.c:694
+#, c-format
+msgid "invalid date format: %s"
+msgstr "felaktigt datumformat: %s"
+
 msgid ""
 "unable to select a comment character that is not used\n"
 "in the current commit message"
@@ -14099,43 +4512,38 @@ msgstr ""
 "kunde inte välja ett kommentarstecken som inte använts\n"
 "i det befintliga incheckningsmeddelandet"
 
-#: builtin/commit.c:750 builtin/commit.c:784 builtin/commit.c:1170
 #, c-format
 msgid "could not lookup commit %s"
 msgstr "kunde inte slå upp incheckningen %s"
 
-#: builtin/commit.c:762 builtin/shortlog.c:417
 #, c-format
 msgid "(reading log message from standard input)\n"
 msgstr "(läser loggmeddelande från standard in)\n"
 
-#: builtin/commit.c:764
 msgid "could not read log from standard input"
 msgstr "kunde inte läsa logg från standard in"
 
-#: builtin/commit.c:768
 #, c-format
 msgid "could not read log file '%s'"
 msgstr "kunde inte läsa loggfilen \"%s\""
 
-#: builtin/commit.c:805
 #, c-format
 msgid "options '%s' and '%s:%s' cannot be used together"
 msgstr "flaggorna \"%s\" och \"%s:%s\" kan inte användas samtidigt"
 
-#: builtin/commit.c:817 builtin/commit.c:833
 msgid "could not read SQUASH_MSG"
 msgstr "kunde inte läsa SQUASH_MSG"
 
-#: builtin/commit.c:824
 msgid "could not read MERGE_MSG"
 msgstr "kunde inte läsa MERGE_MSG"
 
-#: builtin/commit.c:884
+#, c-format
+msgid "could not open '%s'"
+msgstr "kunde inte öppna \"%s\""
+
 msgid "could not write commit template"
 msgstr "kunde inte skriva incheckningsmall"
 
-#: builtin/commit.c:897
 #, c-format
 msgid ""
 "Please enter the commit message for your changes. Lines starting\n"
@@ -14144,7 +4552,6 @@ msgstr ""
 "Ange incheckningsmeddelandet för dina ändringar. Rader som inleds\n"
 "med \"%c\" kommer ignoreras.\n"
 
-#: builtin/commit.c:899
 #, c-format
 msgid ""
 "Please enter the commit message for your changes. Lines starting\n"
@@ -14154,7 +4561,6 @@ msgstr ""
 "med \"%c\" kommer ignoreras, och ett tomt meddelande avbryter "
 "incheckningen.\n"
 
-#: builtin/commit.c:903
 #, c-format
 msgid ""
 "Please enter the commit message for your changes. Lines starting\n"
@@ -14163,7 +4569,6 @@ msgstr ""
 "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:907
 #, c-format
 msgid ""
 "Please enter the commit message for your changes. Lines starting\n"
@@ -14174,7 +4579,6 @@ msgstr ""
 "med \"%c\" kommer behållas; du kan själv ta bort dem om du vill.\n"
 "Ett tomt meddelande avbryter incheckningen.\n"
 
-#: builtin/commit.c:919
 msgid ""
 "\n"
 "It looks like you may be committing a merge.\n"
@@ -14188,7 +4592,6 @@ msgstr ""
 "\tgit update-ref -d MERGE_HEAD\n"
 "och försöker igen.\n"
 
-#: builtin/commit.c:924
 msgid ""
 "\n"
 "It looks like you may be committing a cherry-pick.\n"
@@ -14202,147 +4605,112 @@ msgstr ""
 "\tgit update-ref -d CHERRY_PICK_HEAD\n"
 "och försöker igen.\n"
 
-#: builtin/commit.c:951
 #, c-format
 msgid "%sAuthor:    %.*s <%.*s>"
 msgstr "%sFörfattare: %.*s <%.*s>"
 
-#: builtin/commit.c:959
 #, c-format
 msgid "%sDate:      %s"
 msgstr "%sDatum:      %s"
 
-#: builtin/commit.c:966
 #, c-format
 msgid "%sCommitter: %.*s <%.*s>"
 msgstr "%sIncheckare: %.*s <%.*s>"
 
-#: builtin/commit.c:984
 msgid "Cannot read index"
 msgstr "Kan inte läsa indexet"
 
-#: builtin/commit.c:1029
 msgid "unable to pass trailers to --trailers"
 msgstr "kan inte sända släprader till --trailers"
 
-#: builtin/commit.c:1069
 msgid "Error building trees"
 msgstr "Fel vid byggande av träd"
 
-#: builtin/commit.c:1083 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:1128
 #, 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:1142
 #, c-format
 msgid "Invalid ignored mode '%s'"
 msgstr "Ogiltigt ignorerat läge \"%s\""
 
-#: builtin/commit.c:1160 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:1231
 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:1233
 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:1236
 #, c-format
 msgid "reword option of '%s' and path '%s' cannot be used together"
 msgstr ""
 "reword-flaggan till \"%s\" och sökvägen \"%s\" kan inte användas tillsammans"
 
-#: builtin/commit.c:1238
 #, c-format
 msgid "reword option of '%s' and '%s' cannot be used together"
 msgstr "reword-flaggan till \"%s\" och \"%s\" kan inte användas tillsammans"
 
-#: builtin/commit.c:1263
 msgid "You have nothing to amend."
 msgstr "Du har inget att utöka."
 
-#: builtin/commit.c:1266
 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:1268
 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:1270
 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:1290
 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:1337
 #, c-format
 msgid "unknown option: --fixup=%s:%s"
 msgstr "okänd flagga: --fixup=%s:%s"
 
-#: 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:1485 builtin/commit.c:1654
 msgid "show status concisely"
 msgstr "visa koncis status"
 
-#: builtin/commit.c:1487 builtin/commit.c:1656
 msgid "show branch information"
 msgstr "visa information om gren"
 
-#: builtin/commit.c:1489
 msgid "show stash information"
 msgstr "visa information om stash"
 
-#: 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:1493
 msgid "version"
 msgstr "version"
 
-#: builtin/commit.c:1493 builtin/commit.c:1660 builtin/push.c:551
-#: builtin/worktree.c:765
 msgid "machine-readable output"
 msgstr "maskinläsbar utdata"
 
-#: 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:1499 builtin/commit.c:1665
 msgid "terminate entries with NUL"
 msgstr "terminera poster med NUL"
 
-#: builtin/commit.c:1501 builtin/commit.c:1505 builtin/commit.c:1668
-#: builtin/fast-export.c:1172 builtin/fast-export.c:1175
-#: builtin/fast-export.c:1178 builtin/rebase.c:1139 parse-options.h:368
 msgid "mode"
 msgstr "läge"
 
-#: 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:1506
 msgid ""
 "show ignored files, optional modes: traditional, matching, no. (Default: "
 "traditional)"
@@ -14350,11 +4718,9 @@ msgstr ""
 "visa ignorerade filer, valfria lägen: traditional, matching, no (Standard: "
 "traditional)"
 
-#: builtin/commit.c:1508 parse-options.h:197
 msgid "when"
 msgstr "när"
 
-#: builtin/commit.c:1509
 msgid ""
 "ignore changes to submodules, optional when: all, dirty, untracked. "
 "(Default: all)"
@@ -14362,194 +4728,151 @@ msgstr ""
 "ignorera ändringar i undermoduler, valfritt när: all, dirty, untracked. "
 "(Default: all)"
 
-#: builtin/commit.c:1511
 msgid "list untracked files in columns"
 msgstr "visa ospårade filer i spalter"
 
-#: builtin/commit.c:1512
 msgid "do not detect renames"
 msgstr "detektera inte namnändringar"
 
-#: builtin/commit.c:1514
 msgid "detect renames, optionally set similarity index"
 msgstr "detektera namnändringar, möjligen sätt likhetsindex"
 
-#: 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:1619
 msgid "suppress summary after successful commit"
 msgstr "undertryck sammanfattning efter framgångsrik incheckning"
 
-#: builtin/commit.c:1620
 msgid "show diff in commit message template"
 msgstr "visa diff i mallen för incheckningsmeddelandet"
 
-#: builtin/commit.c:1622
 msgid "Commit message options"
 msgstr "Alternativ för incheckningsmeddelande"
 
-#: builtin/commit.c:1623 builtin/merge.c:288 builtin/tag.c:457
 msgid "read message from file"
 msgstr "läs meddelande från fil"
 
-#: builtin/commit.c:1624
 msgid "author"
 msgstr "författare"
 
-#: builtin/commit.c:1624
 msgid "override author for commit"
 msgstr "överstyr författare för incheckningen"
 
-#: builtin/commit.c:1625 builtin/gc.c:551
 msgid "date"
 msgstr "datum"
 
-#: builtin/commit.c:1625
 msgid "override date for commit"
 msgstr "överstyr datum för incheckningen"
 
-#: builtin/commit.c:1627 builtin/commit.c:1628 builtin/commit.c:1634
-#: parse-options.h:360 ref-filter.h:89
 msgid "commit"
 msgstr "incheckning"
 
-#: 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: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:1633
 msgid "[(amend|reword):]commit"
 msgstr "[(amend|reword):]incheckning"
 
-#: 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: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: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:1636 builtin/interpret-trailers.c:111
 msgid "trailer"
 msgstr "släprad"
 
-#: builtin/commit.c:1636
 msgid "add custom trailer(s)"
 msgstr "använd skräddarsydd(a) släprad(er)"
 
-#: builtin/commit.c:1637 builtin/log.c:1788 builtin/merge.c:306
-#: 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:1638
 msgid "use specified template file"
 msgstr "använd angiven mallfil"
 
-#: builtin/commit.c:1639
 msgid "force edit of commit"
 msgstr "tvinga redigering av incheckning"
 
-#: builtin/commit.c:1641
 msgid "include status in commit message template"
 msgstr "ta med status i mallen för incheckningsmeddelandet"
 
-#: builtin/commit.c:1646
 msgid "Commit contents options"
 msgstr "Alternativ för incheckningens innehåll"
 
-#: builtin/commit.c:1647
 msgid "commit all changed files"
 msgstr "checka in alla ändrade filer"
 
-#: 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:1649
 msgid "interactively add files"
 msgstr "lägg till filer interaktivt"
 
-#: builtin/commit.c:1650
 msgid "interactively add changes"
 msgstr "lägg till ändringar interaktivt"
 
-#: builtin/commit.c:1651
 msgid "commit only specified files"
 msgstr "checka endast in angivna filer"
 
-#: builtin/commit.c:1652
 msgid "bypass pre-commit and commit-msg hooks"
 msgstr "förbigå pre-commit- och commit-msg-krokar"
 
-#: builtin/commit.c:1653
 msgid "show what would be committed"
 msgstr "visa vad som skulle checkas in"
 
-#: builtin/commit.c:1666
 msgid "amend previous commit"
 msgstr "lägg till föregående incheckning"
 
-#: builtin/commit.c:1667
 msgid "bypass post-rewrite hook"
 msgstr "förbigå post-rewrite-krok"
 
-#: builtin/commit.c:1674
 msgid "ok to record an empty change"
 msgstr "ok att registrera en tom ändring"
 
-#: 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:1752
+msgid "could not parse HEAD commit"
+msgstr "kunde inte tolka HEAD:s incheckning"
+
 #, c-format
 msgid "Corrupt MERGE_HEAD file (%s)"
 msgstr "Trasig MERGE_HEAD-fil (%s)"
 
-#: builtin/commit.c:1759
 msgid "could not read MERGE_MODE"
 msgstr "kunde inte läsa MERGE_MODE"
 
-#: builtin/commit.c:1780
 #, c-format
 msgid "could not read commit message: %s"
 msgstr "kunde inte läsa incheckningsmeddelande: %s"
 
-#: 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:1792
 #, c-format
 msgid "Aborting commit; you did not edit the message.\n"
 msgstr "Avbryter incheckning; meddelandet inte redigerat.\n"
 
-#: 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:1839
 msgid ""
 "repository has been updated, but unable to write\n"
 "new_index file. Check that disk is not full and quota is\n"
@@ -14560,227 +4883,177 @@ msgstr ""
 "att kvoten inte har överskridits, och kör sedan\n"
 "\"git restore --staged :/\" för att återställa."
 
-#: builtin/config.c:11
 msgid "git config [<options>]"
 msgstr "git config [<flaggor>]"
 
-#: builtin/config.c:109 builtin/env--helper.c:27
 #, c-format
 msgid "unrecognized --type argument, %s"
 msgstr "okänt argument för --type, %s"
 
-#: builtin/config.c:121
 msgid "only one type at a time"
 msgstr "endast en typ åt gången"
 
-#: builtin/config.c:130
 msgid "Config file location"
 msgstr "Konfigurationsfilens plats"
 
-#: builtin/config.c:131
 msgid "use global config file"
 msgstr "använd global konfigurationsfil"
 
-#: builtin/config.c:132
 msgid "use system config file"
 msgstr "använd systemets konfigurationsfil"
 
-#: builtin/config.c:133
 msgid "use repository config file"
 msgstr "använd arkivets konfigurationsfil"
 
-#: builtin/config.c:134
 msgid "use per-worktree config file"
 msgstr "använd arbetskatalogens konfigurationsfil"
 
-#: builtin/config.c:135
 msgid "use given config file"
 msgstr "använd angiven konfigurationsfil"
 
-#: builtin/config.c:136
 msgid "blob-id"
 msgstr "blob-id"
 
-#: builtin/config.c:136
 msgid "read config from given blob object"
 msgstr "läs konfiguration från givet blob-objekt"
 
-#: builtin/config.c:137
 msgid "Action"
 msgstr "Åtgärd"
 
-#: builtin/config.c:138
 msgid "get value: name [value-pattern]"
 msgstr "hämta värde: namn [värde-mönster]"
 
-#: builtin/config.c:139
 msgid "get all values: key [value-pattern]"
 msgstr "hämta alla värden: nyckel [värde-mönster]"
 
-#: builtin/config.c:140
 msgid "get values for regexp: name-regex [value-pattern]"
 msgstr "hämta värden för reguttr: namn-reguttr [värde-mönster]"
 
-#: builtin/config.c:141
 msgid "get value specific for the URL: section[.var] URL"
 msgstr "hämta värde specifikt URL:en: sektion[.var] URL"
 
-#: builtin/config.c:142
 msgid "replace all matching variables: name value [value-pattern]"
 msgstr "ersätt alla motsvarande variabler: namn värde [värde-mönster]"
 
-#: builtin/config.c:143
 msgid "add a new variable: name value"
 msgstr "lägg till en ny variabel: namn värde"
 
-#: builtin/config.c:144
 msgid "remove a variable: name [value-pattern]"
 msgstr "ta bort en variabel: namn [värde-mönster]"
 
-#: builtin/config.c:145
 msgid "remove all matches: name [value-pattern]"
 msgstr "ta bort alla träffar: namn [värde-mönster]"
 
-#: builtin/config.c:146
 msgid "rename section: old-name new-name"
 msgstr "byt namn på sektion: gammalt-namn nytt-namn"
 
-#: builtin/config.c:147
 msgid "remove a section: name"
 msgstr "ta bort en sektion: namn"
 
-#: builtin/config.c:148
 msgid "list all"
 msgstr "visa alla"
 
-#: builtin/config.c:149
 msgid "use string equality when comparing values to 'value-pattern'"
 msgstr "använd stränglikhet vid när värden jämförs med \"värde-mönster\""
 
-#: builtin/config.c:150
 msgid "open an editor"
 msgstr "öppna textredigeringsprogram"
 
-#: builtin/config.c:151
 msgid "find the color configured: slot [default]"
 msgstr "hitta den inställda färgen: slot [default]"
 
-#: builtin/config.c:152
 msgid "find the color setting: slot [stdout-is-tty]"
 msgstr "hitta färginställningen: slot [stdout-is-tty]"
 
-#: builtin/config.c:153
 msgid "Type"
 msgstr "Typ"
 
-#: builtin/config.c:154 builtin/env--helper.c:42 builtin/hash-object.c:97
 msgid "type"
 msgstr "typ"
 
-#: builtin/config.c:154 builtin/env--helper.c:43
 msgid "value is given this type"
 msgstr "värdet har givits denna typ"
 
-#: builtin/config.c:155
 msgid "value is \"true\" or \"false\""
 msgstr "värdet är \"true\" eller \"false\""
 
-#: builtin/config.c:156
 msgid "value is decimal number"
 msgstr "värdet är ett decimalt tal"
 
-#: builtin/config.c:157
 msgid "value is --bool or --int"
 msgstr "värdet är --bool eller --int"
 
-#: builtin/config.c:158
 msgid "value is --bool or string"
 msgstr "värdet är --bool eller sträng"
 
-#: builtin/config.c:159
 msgid "value is a path (file or directory name)"
 msgstr "värdet är en sökväg (fil- eller katalognamn)"
 
-#: builtin/config.c:160
 msgid "value is an expiry date"
 msgstr "värdet är ett utgångsdatum"
 
-#: builtin/config.c:161
 msgid "Other"
 msgstr "Andra"
 
-#: builtin/config.c:162
 msgid "terminate values with NUL byte"
 msgstr "terminera värden med NUL-byte"
 
-#: builtin/config.c:163
 msgid "show variable names only"
 msgstr "visa endast variabelnamn"
 
-#: builtin/config.c:164
 msgid "respect include directives on lookup"
 msgstr "respektera inkluderingsdirektiv vid uppslag"
 
-#: builtin/config.c:165
 msgid "show origin of config (file, standard input, blob, command line)"
 msgstr "visa konfigurationskälla (fil, standard in, blob, kommandorad)"
 
-#: builtin/config.c:166
 msgid "show scope of config (worktree, local, global, system, command)"
 msgstr ""
 "visa omfång för konfiguration (arbetskatalog, lokalt, globalt, system, "
 "kommando)"
 
-#: builtin/config.c:167 builtin/env--helper.c:45
 msgid "value"
 msgstr "värde"
 
-#: builtin/config.c:167
 msgid "with --get, use default value when missing entry"
 msgstr "med --get, använd standardvärde vid saknad post"
 
-#: builtin/config.c:181
 #, c-format
 msgid "wrong number of arguments, should be %d"
 msgstr "fel antal argument, skulle vara %d"
 
-#: builtin/config.c:183
 #, c-format
 msgid "wrong number of arguments, should be from %d to %d"
 msgstr "fel antal argument, skulle vara från %d till %d"
 
-#: builtin/config.c:339
 #, c-format
 msgid "invalid key pattern: %s"
 msgstr "felaktigt nyckelmönster: %s"
 
-#: builtin/config.c:377
+#, c-format
+msgid "invalid pattern: %s"
+msgstr "ogiltigt mönster: %s"
+
 #, c-format
 msgid "failed to format default config value: %s"
 msgstr "misslyckades formatera standardkonfigurationsvärde: %s"
 
-#: builtin/config.c:441
 #, c-format
 msgid "cannot parse color '%s'"
 msgstr "kan inte tolka färgen \"%s\""
 
-#: builtin/config.c:483
 msgid "unable to parse default color value"
 msgstr "kan inte tolka standardfärgvärde"
 
-#: builtin/config.c:536 builtin/config.c:833
 msgid "not in a git directory"
 msgstr "inte i en git-katalog"
 
-#: builtin/config.c:539
 msgid "writing to stdin is not supported"
 msgstr "skriva till standard in stöds inte"
 
-#: builtin/config.c:542
 msgid "writing config blobs is not supported"
 msgstr "skriva konfigurations-blobbar stöds inte"
 
-#: builtin/config.c:627
 #, c-format
 msgid ""
 "# This is Git's per-user configuration file.\n"
@@ -14795,27 +5068,21 @@ msgstr ""
 "#\tname = %s\n"
 "#\temail = %s\n"
 
-#: builtin/config.c:652
 msgid "only one config file at a time"
 msgstr "endast en konfigurationsfil åt gången"
 
-#: builtin/config.c:658
 msgid "--local can only be used inside a git repository"
 msgstr "--local kan bara användas inuti ett git-arkiv"
 
-#: builtin/config.c:660
 msgid "--blob can only be used inside a git repository"
 msgstr "--blob kan bara användas inuti ett git-arkiv"
 
-#: builtin/config.c:662
 msgid "--worktree can only be used inside a git repository"
 msgstr "--worktree kan bara användas inuti ett git-arkiv"
 
-#: builtin/config.c:684
 msgid "$HOME not set"
 msgstr "$HOME inte satt"
 
-#: builtin/config.c:708
 msgid ""
 "--worktree cannot be used with multiple working trees unless the config\n"
 "extension worktreeConfig is enabled. Please read \"CONFIGURATION FILE\"\n"
@@ -14825,56 +5092,44 @@ msgstr ""
 "konfigurationsutöknignen worktreeConfig har aktiverats. Läsa stycket\n"
 "\"KONFIGURATIONSFIL\" i \"git help worktree\" för detaljer"
 
-#: builtin/config.c:743
 msgid "--get-color and variable type are incoherent"
 msgstr "--get-color och variabeltyp stämmer inte överens"
 
-#: builtin/config.c:748
 msgid "only one action at a time"
 msgstr "endast en åtgärd åt gången"
 
-#: builtin/config.c:761
 msgid "--name-only is only applicable to --list or --get-regexp"
 msgstr "--name-only gäller bara för --list eller --get-regexp"
 
-#: builtin/config.c:767
 msgid ""
 "--show-origin is only applicable to --get, --get-all, --get-regexp, and --"
 "list"
 msgstr ""
 "--show-origin gäller bara för --get, --get-all, --get-regexp och --list"
 
-#: builtin/config.c:773
 msgid "--default is only applicable to --get"
 msgstr "--default gäller bara för --get"
 
-#: builtin/config.c:806
 msgid "--fixed-value only applies with 'value-pattern'"
 msgstr "--fixed-value gäller endast med \"värde-mönster\""
 
-#: builtin/config.c:822
 #, c-format
 msgid "unable to read config file '%s'"
 msgstr "kan inte konfigurationsfil \"%s\""
 
-#: builtin/config.c:825
 msgid "error processing config file(s)"
 msgstr "fel vid hantering av konfigurationsfil(er)"
 
-#: builtin/config.c:835
 msgid "editing stdin is not supported"
 msgstr "redigering av standard in stöds ej"
 
-#: builtin/config.c:837
 msgid "editing blobs is not supported"
 msgstr "redigering av blobbar stöds ej"
 
-#: builtin/config.c:851
 #, c-format
 msgid "cannot create configuration file %s"
 msgstr "kan inte skapa konfigurationsfilen \"%s\""
 
-#: builtin/config.c:864
 #, c-format
 msgid ""
 "cannot overwrite multiple values with a single value\n"
@@ -14883,16 +5138,13 @@ msgstr ""
 "kan inte skriva över flera värden med ett ensamt värde\n"
 "       Använd en regexp, --add eller --replace-all för att ändra %s."
 
-#: builtin/config.c:943 builtin/config.c:954
 #, c-format
 msgid "no such section: %s"
 msgstr "ingen sådan sektion: %s"
 
-#: builtin/count-objects.c:100
 msgid "print sizes in human readable format"
 msgstr "skriv storlekar i människoläsbart format"
 
-#: builtin/credential-cache--daemon.c:227
 #, c-format
 msgid ""
 "The permissions on your socket directory are too loose; other\n"
@@ -14905,71 +5157,56 @@ msgstr ""
 "\n"
 "\tchmod 0700 %s"
 
-#: builtin/credential-cache--daemon.c:276
 msgid "print debugging messages to stderr"
 msgstr "skriv felsökningsmeddelanden på standard fel"
 
-#: builtin/credential-cache--daemon.c:316
 msgid "credential-cache--daemon unavailable; no unix socket support"
 msgstr ""
 "\"credential-cache--daemon\" ej tillgänglig; stöd för unix-uttag saknas"
 
-#: 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"
 
-#: builtin/credential-store.c:66
 #, c-format
 msgid "unable to get credential storage lock in %d ms"
 msgstr "kunde inte erhålla låset för lagring av inlogginsuppgifter på %d ms"
 
-#: builtin/describe.c:26
 msgid "git describe [<options>] [<commit-ish>...]"
 msgstr "git describe [<flaggor>] [<incheckning-igt>...]"
 
-#: builtin/describe.c:27
 msgid "git describe [<options>] --dirty"
 msgstr "git describe [<flaggor>] --dirty"
 
-#: builtin/describe.c:63
 msgid "head"
 msgstr "huvud"
 
-#: builtin/describe.c:63
 msgid "lightweight"
 msgstr "lättviktig"
 
-#: builtin/describe.c:63
 msgid "annotated"
 msgstr "annoterad"
 
-#: builtin/describe.c:277
 #, c-format
 msgid "annotated tag %s not available"
 msgstr "den annoterade taggen %s inte tillgänglig"
 
-#: builtin/describe.c:281
 #, c-format
 msgid "tag '%s' is externally known as '%s'"
 msgstr "taggen \"%s\" är utanför känd som \"%s\""
 
-#: builtin/describe.c:328
 #, c-format
 msgid "no tag exactly matches '%s'"
 msgstr "ingen tagg motsvarar \"%s\" exakt"
 
-#: builtin/describe.c:330
 #, c-format
 msgid "No exact match on refs or tags, searching to describe\n"
 msgstr ""
 "Ingen exakt träff mot referenser eller taggar, söker för att beskriva\n"
 
-#: builtin/describe.c:397
 #, c-format
 msgid "finished search at %s\n"
 msgstr "avslutade sökning på %s\n"
 
-#: builtin/describe.c:424
 #, c-format
 msgid ""
 "No annotated tags can describe '%s'.\n"
@@ -14978,7 +5215,6 @@ msgstr ""
 "Inga annoterade taggar kan beskriva \"%s\".\n"
 "Det finns dock oannoterade taggar: testa --tags."
 
-#: builtin/describe.c:428
 #, c-format
 msgid ""
 "No tags can describe '%s'.\n"
@@ -14987,12 +5223,10 @@ msgstr ""
 "Inga taggar kan beskriva \"%s\".\n"
 "Testa --always, eller skapa några taggar."
 
-#: builtin/describe.c:458
 #, c-format
 msgid "traversed %lu commits\n"
 msgstr "traverserade %lu incheckningar\n"
 
-#: builtin/describe.c:461
 #, c-format
 msgid ""
 "more than %i tags found; listed %i most recent\n"
@@ -15001,150 +5235,117 @@ msgstr ""
 "mer än %i taggar hittades; listar de %i senaste\n"
 "gav upp sökningen vid %s\n"
 
-#: builtin/describe.c:529
 #, c-format
 msgid "describe %s\n"
 msgstr "beskriva %s\n"
 
-#: builtin/describe.c:532
 #, c-format
 msgid "Not a valid object name %s"
 msgstr "Objektnamnet är inte giltigt: %s"
 
-#: builtin/describe.c:540
 #, c-format
 msgid "%s is neither a commit nor blob"
 msgstr "%s är varken incheckning eller blob"
 
-#: builtin/describe.c:554
 msgid "find the tag that comes after the commit"
 msgstr "hitta taggen som kommer efter incheckningen"
 
-#: builtin/describe.c:555
 msgid "debug search strategy on stderr"
 msgstr "felsök sökstrategin på standard fel"
 
-#: builtin/describe.c:556
 msgid "use any ref"
 msgstr "använd alla referenser"
 
-#: builtin/describe.c:557
 msgid "use any tag, even unannotated"
 msgstr "använd alla taggar, även oannoterade"
 
-#: builtin/describe.c:558
 msgid "always use long format"
 msgstr "använd alltid långt format"
 
-#: builtin/describe.c:559
 msgid "only follow first parent"
 msgstr "följ endast första föräldern"
 
-#: builtin/describe.c:562
 msgid "only output exact matches"
 msgstr "skriv endast ut exakta träffar"
 
-#: builtin/describe.c:564
 msgid "consider <n> most recent tags (default: 10)"
 msgstr "överväg de <n> nyaste taggarna (standard: 10)"
 
-#: builtin/describe.c:566
 msgid "only consider tags matching <pattern>"
 msgstr "överväg endast taggar som motsvarar <mönster>"
 
-#: builtin/describe.c:568
 msgid "do not consider tags matching <pattern>"
 msgstr "överväg inte taggar som motsvarar <mönster>"
 
-#: builtin/describe.c:570 builtin/name-rev.c:595
 msgid "show abbreviated commit object as fallback"
 msgstr "visa förkortade incheckningsobjekt som standard"
 
-#: builtin/describe.c:571 builtin/describe.c:574
 msgid "mark"
 msgstr "märke"
 
-#: builtin/describe.c:572
 msgid "append <mark> on dirty working tree (default: \"-dirty\")"
 msgstr "lägg till <märke> på lortigt arbetsträd (standard: \"-dirty\")"
 
-#: builtin/describe.c:575
 msgid "append <mark> on broken working tree (default: \"-broken\")"
 msgstr "lägg till <märke> på trasigt arbetsträd (standard: \"-broken\")"
 
-#: builtin/describe.c:622
 msgid "No names found, cannot describe anything."
 msgstr "Inga namn hittades, kan inte beskriva något."
 
-#: builtin/describe.c:673 builtin/describe.c:675
 #, c-format
 msgid "option '%s' and commit-ishes cannot be used together"
 msgstr "flaggorna \"%s\" och incheckning-igter kan inte användas samtidigt"
 
-#: builtin/diff-tree.c:157
 msgid "--merge-base only works with two commits"
 msgstr "--merge-base fungerar endast med två incheckningar"
 
-#: builtin/diff.c:92
 #, c-format
 msgid "'%s': not a regular file or symlink"
 msgstr "\"%s\": inte en normal fil eller symbolisk länk"
 
-#: builtin/diff.c:259
 #, c-format
 msgid "invalid option: %s"
 msgstr "ogiltig flagga: %s"
 
-#: builtin/diff.c:376
 #, c-format
 msgid "%s...%s: no merge base"
 msgstr "%s...%s: ingen sammanslagningsbas"
 
-#: builtin/diff.c:491
 msgid "Not a git repository"
 msgstr "Inte ett git-arkiv"
 
-#: builtin/diff.c:537 builtin/grep.c:700
 #, c-format
 msgid "invalid object '%s' given."
 msgstr "objektet \"%s\" som angavs är felaktigt."
 
-#: builtin/diff.c:548
 #, c-format
 msgid "more than two blobs given: '%s'"
 msgstr "mer än två blobbar angavs: \"%s\""
 
-#: builtin/diff.c:553
 #, c-format
 msgid "unhandled object '%s' given."
 msgstr "ej hanterat objekt \"%s\" angavs."
 
-#: builtin/diff.c:587
 #, c-format
 msgid "%s...%s: multiple merge bases, using %s"
 msgstr "%s...%s: flera sammanslagningsbaser, använder %s"
 
-#: builtin/difftool.c:31
 msgid "git difftool [<options>] [<commit> [<commit>]] [--] [<path>...]"
 msgstr ""
 "git difftool [<flaggor>] [<incheckning> [<incheckning>]] [--] [<sökväg>...]"
 
-#: builtin/difftool.c:287
 #, c-format
 msgid "could not read symlink %s"
 msgstr "kunde inte läsa symboliska länken %s"
 
-#: builtin/difftool.c:289
 #, c-format
 msgid "could not read symlink file %s"
 msgstr "kunde inte läsa symbolisk länk-fil %s"
 
-#: builtin/difftool.c:297
 #, 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:421
 msgid ""
 "combined diff formats ('-c' and '--cc') are not supported in\n"
 "directory diff mode ('-d' and '--dir-diff')."
@@ -15152,58 +5353,49 @@ msgstr ""
 "kombinerade diff-format (\"-c\" och \"--cc\") stöds inte i\n"
 "katalogdiffläge (\"-d\" och \"--dir-diff\")."
 
-#: builtin/difftool.c:626
 #, c-format
 msgid "both files modified: '%s' and '%s'."
 msgstr "bägge filerna ändrade: \"%s\" och \"%s\"."
 
-#: builtin/difftool.c:628
 msgid "working tree file has been left."
 msgstr "filen i arbetskatalogen lämnades kvar."
 
-#: builtin/difftool.c:639
+#, c-format
+msgid "could not copy '%s' to '%s'"
+msgstr "kunde inte kopiera in \"%s\" till \"%s\""
+
 #, c-format
 msgid "temporary files exist in '%s'."
 msgstr "temporära filer finns i \"%s\"."
 
-#: builtin/difftool.c:640
 msgid "you may want to cleanup or recover these."
 msgstr "du kanske vill städa eller rädda dem."
 
-#: builtin/difftool.c:645
 #, c-format
 msgid "failed: %d"
 msgstr "misslyckades: %d"
 
-#: builtin/difftool.c:690
 msgid "use `diff.guitool` instead of `diff.tool`"
 msgstr "använd \"diff.guitool\" istället för \"diff.tool\""
 
-#: builtin/difftool.c:692
 msgid "perform a full-directory diff"
 msgstr "utför diff för hela katalogen"
 
-#: builtin/difftool.c:694
 msgid "do not prompt before launching a diff tool"
 msgstr "fråga inte vid start av diff-verktyg"
 
-#: builtin/difftool.c:699
 msgid "use symlinks in dir-diff mode"
 msgstr "använd symboliska länkar i katalogdiffläge"
 
-#: builtin/difftool.c:700
 msgid "tool"
 msgstr "verktyg"
 
-#: builtin/difftool.c:701
 msgid "use the specified diff tool"
 msgstr "använd angivet diff-verktyg"
 
-#: builtin/difftool.c:703
 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:706
 msgid ""
 "make 'git-difftool' exit when an invoked diff tool returns a non-zero exit "
 "code"
@@ -15211,46 +5403,36 @@ msgstr ""
 "låt \"git-difftool\" avsluta när ett anropat diff-verktyg ger returvärde "
 "skilt från noll"
 
-#: builtin/difftool.c:709
 msgid "specify a custom command for viewing diffs"
 msgstr "ange eget kommando för att visa diffar"
 
-#: builtin/difftool.c:710
 msgid "passed to `diff`"
 msgstr "sändes till \"diff\""
 
-#: builtin/difftool.c:726
 msgid "difftool requires worktree or --no-index"
 msgstr "difftool kräver en arbetskatalog eller --no-index"
 
-#: builtin/difftool.c:745
 msgid "no <tool> given for --tool=<tool>"
 msgstr "inget <verktyg> angavs för --tool=<verktyg>"
 
-#: builtin/difftool.c:752
 msgid "no <cmd> given for --extcmd=<cmd>"
 msgstr "inget <kommando> angavs för --extcmd=<kommando>"
 
-#: builtin/env--helper.c:6
 msgid "git env--helper --type=[bool|ulong] <options> <env-var>"
 msgstr "git env--helper --type=[bool|ulong] <flaggor> <miljövariabel>"
 
-#: builtin/env--helper.c:46
 msgid "default for git_env_*(...) to fall back on"
 msgstr "standard för git_env_*(...) att falla tillbaka på"
 
-#: builtin/env--helper.c:48
 msgid "be quiet only use git_env_*() value as exit code"
 msgstr "var tyst, använd bara git_env_*() som resultatvärde"
 
-#: builtin/env--helper.c:67
 #, c-format
 msgid "option `--default' expects a boolean value with `--type=bool`, not `%s`"
 msgstr ""
 "flaggan \"--default\" förväntar ett sanningsvärde med \"--type=bool\", inte "
 "\"%s\""
 
-#: builtin/env--helper.c:82
 #, c-format
 msgid ""
 "option `--default' expects an unsigned long value with `--type=ulong`, not `"
@@ -15259,245 +5441,186 @@ msgstr ""
 "flaggan \"--default\" förväntar ett teckenlöst långt värde med \"--type=ulong"
 "\", inte \"%s\""
 
-#: builtin/fast-export.c:29
 msgid "git fast-export [<rev-list-opts>]"
 msgstr "git fast-export [<rev-list-flaggor>]"
 
-#: builtin/fast-export.c:843
 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:1152
 msgid "--anonymize-map token cannot be empty"
 msgstr "symbolen för --anonymize-map kan inte vara tom"
 
-#: builtin/fast-export.c:1171
 msgid "show progress after <n> objects"
 msgstr "visa förlopp efter <n> objekt"
 
-#: builtin/fast-export.c:1173
 msgid "select handling of signed tags"
 msgstr "välj hantering av signerade taggar"
 
-#: builtin/fast-export.c:1176
 msgid "select handling of tags that tag filtered objects"
 msgstr "välj hantering av taggar som har taggfiltrerade objekt"
 
-#: builtin/fast-export.c:1179
 msgid "select handling of commit messages in an alternate encoding"
 msgstr "välj hantering av incheckningsmeddelanden i alternativ teckenkodning"
 
-#: builtin/fast-export.c:1182
 msgid "dump marks to this file"
 msgstr "dumpa märken till filen"
 
-#: builtin/fast-export.c:1184
 msgid "import marks from this file"
 msgstr "importera märken från filen"
 
-#: builtin/fast-export.c:1188
 msgid "import marks from this file if it exists"
 msgstr "importera märken från filen, om den finns"
 
-#: builtin/fast-export.c:1190
 msgid "fake a tagger when tags lack one"
 msgstr "fejka taggare när taggen saknar en"
 
-#: builtin/fast-export.c:1192
 msgid "output full tree for each commit"
 msgstr "skriv ut hela trädet för varje incheckning"
 
-#: builtin/fast-export.c:1194
 msgid "use the done feature to terminate the stream"
 msgstr "använd done-funktionen för att avsluta strömmen"
 
-#: builtin/fast-export.c:1195
 msgid "skip output of blob data"
 msgstr "hoppa över skrivning av blob-data"
 
-#: builtin/fast-export.c:1196 builtin/log.c:1860
 msgid "refspec"
 msgstr "referensspecifikation"
 
-#: builtin/fast-export.c:1197
 msgid "apply refspec to exported refs"
 msgstr "applicera referensspecifikation på exporterade referenser"
 
-#: builtin/fast-export.c:1198
 msgid "anonymize output"
 msgstr "anonymisera utdata"
 
-#: builtin/fast-export.c:1199
 msgid "from:to"
 msgstr "från:till"
 
-#: builtin/fast-export.c:1200
 msgid "convert <from> to <to> in anonymized output"
 msgstr "konvertera <från> till <till> i anonymiserad utdata"
 
-#: builtin/fast-export.c:1203
 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:1205
 msgid "show original object ids of blobs/commits"
 msgstr "visa ursprungliga objekt-id för blobbar/incheckningar"
 
-#: builtin/fast-export.c:1207
 msgid "label tags with mark ids"
 msgstr "märk taggar med märke-id"
 
-#: builtin/fast-import.c:3097
 #, c-format
 msgid "Missing from marks for submodule '%s'"
 msgstr "Saknar från-märken för undermodulen \"%s\""
 
-#: builtin/fast-import.c:3099
 #, c-format
 msgid "Missing to marks for submodule '%s'"
 msgstr "Saknar till-märken för undermodulen \"%s\""
 
-#: builtin/fast-import.c:3234
 #, c-format
 msgid "Expected 'mark' command, got %s"
 msgstr "Förväntade \"mark\"-kommando, fick %s"
 
-#: builtin/fast-import.c:3239
 #, c-format
 msgid "Expected 'to' command, got %s"
 msgstr "Förväntade \"to\"-kommando, fick %s"
 
-#: builtin/fast-import.c:3331
 msgid "Expected format name:filename for submodule rewrite option"
 msgstr "Förvändae formatet namn:filnamn för undermodul-omskrivningsflaggan"
 
-#: builtin/fast-import.c:3386
 #, c-format
 msgid "feature '%s' forbidden in input without --allow-unsafe-features"
 msgstr "funktionen \"%s\" förbjuden i indata utan --allow-unsafe-features"
 
-#: builtin/fetch-pack.c:246
 #, c-format
 msgid "Lockfile created but not reported: %s"
 msgstr "Låsfil skapad men inte rapporterad: %s"
 
-#: builtin/fetch.c:36
 msgid "git fetch [<options>] [<repository> [<refspec>...]]"
 msgstr "git fetch [<flaggor>] [<arkiv> [<refspec>...]]"
 
-#: builtin/fetch.c:37
 msgid "git fetch [<options>] <group>"
 msgstr "git fetch [<flaggor>] <grupp>"
 
-#: builtin/fetch.c:38
 msgid "git fetch --multiple [<options>] [(<repository> | <group>)...]"
 msgstr "git fetch --multiple [<flaggor>] [(<arkiv> | <grupp>)...]"
 
-#: builtin/fetch.c:39
 msgid "git fetch --all [<options>]"
 msgstr "git fetch --all [<flaggor>]"
 
-#: builtin/fetch.c:124
 msgid "fetch.parallel cannot be negative"
 msgstr "fetch.parallel kan inte vara negativt"
 
-#: builtin/fetch.c:147 builtin/pull.c:189
 msgid "fetch from all remotes"
 msgstr "hämta från alla fjärrar"
 
-#: builtin/fetch.c:149 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:151 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"
 
-#: builtin/fetch.c:153
 msgid "use atomic transaction to update references"
 msgstr "använd atomiska transaktioner för att uppdatera referenser"
 
-#: builtin/fetch.c:155 builtin/pull.c:195
 msgid "path to upload pack on remote end"
 msgstr "sökväg till upload pack på fjärren"
 
-#: builtin/fetch.c:156
 msgid "force overwrite of local reference"
 msgstr "tvinga överskrivning av lokal referens"
 
-#: builtin/fetch.c:158
 msgid "fetch from multiple remotes"
 msgstr "hämta från flera fjärrar"
 
-#: builtin/fetch.c:160 builtin/pull.c:199
 msgid "fetch all tags and associated objects"
 msgstr "hämta alla taggar och associerade objekt"
 
-#: builtin/fetch.c:162
 msgid "do not fetch all tags (--no-tags)"
 msgstr "hämta inte alla taggar (--no-tags)"
 
-#: builtin/fetch.c:164
 msgid "number of submodules fetched in parallel"
 msgstr "antal undermoduler som hämtas parallellt"
 
-#: builtin/fetch.c:166
 msgid "modify the refspec to place all refs within refs/prefetch/"
 msgstr ""
 "modifiera referensspecifikationen så att alla referenser hamnar i refs/"
 "prefetch/"
 
-#: builtin/fetch.c:168 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"
 
-#: builtin/fetch.c:170
 msgid "prune local tags no longer on remote and clobber changed tags"
 msgstr ""
 "rensa lokala taggar inte längre på fjärren och skriv över ändrade taggar"
 
-#: builtin/fetch.c:171 builtin/fetch.c:199 builtin/pull.c:123
 msgid "on-demand"
 msgstr "on-demand"
 
-#: builtin/fetch.c:172
 msgid "control recursive fetching of submodules"
 msgstr "styr rekursiv hämtning av undermoduler"
 
-#: builtin/fetch.c:177
 msgid "write fetched references to the FETCH_HEAD file"
 msgstr "skriv hämtade referenser till FETCH_HEAD-filen"
 
-#: builtin/fetch.c:178 builtin/pull.c:210
 msgid "keep downloaded pack"
 msgstr "behåll hämtade paket"
 
-#: builtin/fetch.c:180
 msgid "allow updating of HEAD ref"
 msgstr "tillåt uppdatering av HEAD-referens"
 
-#: builtin/fetch.c:183 builtin/fetch.c:189 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:185 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:191 builtin/pull.c:225
 msgid "convert to a complete repository"
 msgstr "konvertera till komplett arkiv"
 
-#: builtin/fetch.c:194
 msgid "re-fetch without negotiating common commits"
 msgstr "hämta om utan att förhandla om gemensamma incheckningar"
 
-#: builtin/fetch.c:197
 msgid "prepend this to submodule path output"
 msgstr "lägg till i början av undermodulens sökvägsutdata"
 
-#: builtin/fetch.c:200
 msgid ""
 "default for recursive fetching of submodules (lower priority than config "
 "files)"
@@ -15505,101 +5628,80 @@ msgstr ""
 "standard för rekursiv hämtning av undermoduler (lägre prioritet än "
 "konfigurationsfiler)"
 
-#: builtin/fetch.c:204 builtin/pull.c:228
 msgid "accept refs that update .git/shallow"
 msgstr "tar emot referenser som uppdaterar .git/shallow"
 
-#: builtin/fetch.c:205 builtin/pull.c:230
 msgid "refmap"
 msgstr "referenskarta"
 
-#: builtin/fetch.c:206 builtin/pull.c:231
 msgid "specify fetch refmap"
 msgstr "ange referenskarta för \"fetch\""
 
-#: builtin/fetch.c:213 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"
 
-#: builtin/fetch.c:215
 msgid "do not fetch a packfile; instead, print ancestors of negotiation tips"
 msgstr "hämta inte paketfil; skriv istället förfäder till förhandlingstips"
 
-#: builtin/fetch.c:218 builtin/fetch.c:220
 msgid "run 'maintenance --auto' after fetching"
 msgstr "kör \"maintenance --auto\" efter hämtning"
 
-#: builtin/fetch.c:222 builtin/pull.c:247
 msgid "check for forced-updates on all updated branches"
 msgstr "se efter tvingade uppdateringar i alla uppdaterade grenar"
 
-#: builtin/fetch.c:224
 msgid "write the commit-graph after fetching"
 msgstr "skriv incheckingsgrafen efter hämtning"
 
-#: builtin/fetch.c:226
 msgid "accept refspecs from stdin"
 msgstr "ta emot referenser från standard in"
 
-#: builtin/fetch.c:618
 msgid "couldn't find remote ref HEAD"
 msgstr "kunde inte hitta fjärr-referensen HEAD"
 
-#: builtin/fetch.c:893
 #, c-format
 msgid "object %s not found"
 msgstr "objektet %s hittades inte"
 
-#: builtin/fetch.c:897
 msgid "[up to date]"
 msgstr "[àjour]"
 
-#: builtin/fetch.c:909 builtin/fetch.c:927 builtin/fetch.c:999
 msgid "[rejected]"
 msgstr "[refuserad]"
 
-#: builtin/fetch.c:911
 msgid "can't fetch in current branch"
 msgstr "kan inte hämta i aktuell gren"
 
-#: builtin/fetch.c:912
 msgid "checked out in another worktree"
 msgstr "utcheckat i en annan arbetskatalog"
 
-#: builtin/fetch.c:922
 msgid "[tag update]"
 msgstr "[uppdaterad tagg]"
 
-#: builtin/fetch.c:923 builtin/fetch.c:960 builtin/fetch.c:982
-#: builtin/fetch.c:994
 msgid "unable to update local ref"
 msgstr "kunde inte uppdatera lokal ref"
 
-#: builtin/fetch.c:927
 msgid "would clobber existing tag"
 msgstr "skulle skriva över befintlig tagg"
 
-#: builtin/fetch.c:949
 msgid "[new tag]"
 msgstr "[ny tagg]"
 
-#: builtin/fetch.c:952
 msgid "[new branch]"
 msgstr "[ny gren]"
 
-#: builtin/fetch.c:955
 msgid "[new ref]"
 msgstr "[ny ref]"
 
-#: builtin/fetch.c:994
 msgid "forced update"
 msgstr "tvingad uppdatering"
 
-#: builtin/fetch.c:999
 msgid "non-fast-forward"
 msgstr "ej snabbspolad"
 
-#: builtin/fetch.c:1102
+#, c-format
+msgid "cannot open '%s'"
+msgstr "kan inte öppna \"%s\""
+
 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"
@@ -15610,7 +5712,6 @@ msgstr ""
 "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:1106
 #, c-format
 msgid ""
 "it took %.2f seconds to check forced updates; you can use\n"
@@ -15623,22 +5724,18 @@ msgstr ""
 "showForcedUpdates\n"
 "false\" för att undvika testet\n"
 
-#: builtin/fetch.c:1136
 #, 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:1156
 #, 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:1259 builtin/fetch.c:1418
 #, c-format
 msgid "From %.*s\n"
 msgstr "Från %.*s\n"
 
-#: builtin/fetch.c:1269
 #, c-format
 msgid ""
 "some local refs could not be updated; try running\n"
@@ -15647,49 +5744,43 @@ msgstr ""
 "vissa lokala referenser kunde inte uppdateras; testa att köra\n"
 " \"git remote prune %s\" för att ta bort gamla grenar som står i konflikt"
 
-#: builtin/fetch.c:1377
 #, c-format
 msgid "   (%s will become dangling)"
 msgstr "   (%s kommer bli dinglande)"
 
-#: builtin/fetch.c:1378
 #, c-format
 msgid "   (%s has become dangling)"
 msgstr "   (%s har blivit dinglande)"
 
-#: builtin/fetch.c:1421
 msgid "[deleted]"
 msgstr "[borttagen]"
 
-#: builtin/fetch.c:1422 builtin/remote.c:1153
 msgid "(none)"
 msgstr "(ingen)"
 
-#: builtin/fetch.c:1446
 #, c-format
 msgid "refusing to fetch into branch '%s' checked out at '%s'"
 msgstr "vägrar hämta till grenen \"%s\" som är utcheckad på \"%s\""
 
-#: builtin/fetch.c:1466
 #, c-format
 msgid "option \"%s\" value \"%s\" is not valid for %s"
 msgstr "flaggan \"%s\" med värdet \"%s\" är inte giltigt för %s"
 
-#: builtin/fetch.c:1469
 #, c-format
 msgid "option \"%s\" is ignored for %s\n"
 msgstr "flaggan \"%s\" ignoreras för %s\n"
 
-#: builtin/fetch.c:1496
+#, c-format
+msgid "%s is not a valid object"
+msgstr "%s är inte ett giltigt objekt"
+
 #, c-format
 msgid "the object %s does not exist"
 msgstr "objektet %s finns inte"
 
-#: builtin/fetch.c:1748
 msgid "multiple branches detected, incompatible with --set-upstream"
 msgstr "flera grenar upptäcktes, inkompatibelt med --set-upstream"
 
-#: builtin/fetch.c:1760
 #, c-format
 msgid ""
 "could not set upstream of HEAD to '%s' from '%s' when it does not point to "
@@ -15698,19 +5789,15 @@ msgstr ""
 "kunde inte sätta uppström för HEAD till \"%s\" från \"%s\" när det inte "
 "pekar mot någon gren."
 
-#: builtin/fetch.c:1773
 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:1775
 msgid "not setting upstream for a remote tag"
 msgstr "ställer inte in uppström för en fjärrtag"
 
-#: builtin/fetch.c:1777
 msgid "unknown branch type"
 msgstr "okänd grentyp"
 
-#: builtin/fetch.c:1779
 msgid ""
 "no source branch found;\n"
 "you need to specify exactly one branch with the --set-upstream option"
@@ -15718,22 +5805,18 @@ msgstr ""
 "hittade ingen källgren;\n"
 "du måste ange exakt en gren med flaggan --set-upstream"
 
-#: builtin/fetch.c:1904 builtin/fetch.c:1967
 #, c-format
 msgid "Fetching %s\n"
 msgstr "Hämtar %s\n"
 
-#: builtin/fetch.c:1914 builtin/fetch.c:1969
 #, c-format
 msgid "could not fetch %s"
 msgstr "kunde inte hämta %s"
 
-#: builtin/fetch.c:1926
 #, c-format
 msgid "could not fetch '%s' (exit code: %d)\n"
 msgstr "kunde inte hämta \"%s\" (felkod: %d)\n"
 
-#: builtin/fetch.c:2030
 msgid ""
 "no remote repository specified; please specify either a URL or a\n"
 "remote name from which new revisions should be fetched"
@@ -15741,48 +5824,37 @@ msgstr ""
 "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:2066
 msgid "you need to specify a tag name"
 msgstr "du måste ange namnet på en tagg"
 
-#: builtin/fetch.c:2156
 msgid "--negotiate-only needs one or more --negotiation-tip=*"
 msgstr "--negotiate-only behöver en eller flera --negotiation-tip=*"
 
-#: builtin/fetch.c:2160
 msgid "negative depth in --deepen is not supported"
 msgstr "negativa djup stöds inte i --deepen"
 
-#: builtin/fetch.c:2169
 msgid "--unshallow on a complete repository does not make sense"
 msgstr "--unshallow kan inte användas på ett komplett arkiv"
 
-#: builtin/fetch.c:2186
 msgid "fetch --all does not take a repository argument"
 msgstr "fetch --all tar inte namnet på ett arkiv som argument"
 
-#: builtin/fetch.c:2188
 msgid "fetch --all does not make sense with refspecs"
 msgstr "fetch --all kan inte anges med referensspecifikationer"
 
-#: builtin/fetch.c:2197
 #, c-format
 msgid "no such remote or remote group: %s"
 msgstr "fjärren eller fjärrgruppen finns inte: %s"
 
-#: builtin/fetch.c:2205
 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:2221
 msgid "must supply remote when using --negotiate-only"
 msgstr "måste ange fjärr när --negotiate-only anges"
 
-#: builtin/fetch.c:2226
 msgid "protocol does not support --negotiate-only, exiting"
 msgstr "protokollet stöder inte --negotiate-only, avslutar"
 
-#: builtin/fetch.c:2246
 msgid ""
 "--filter can only be used with the remote configured in extensions."
 "partialclone"
@@ -15790,148 +5862,114 @@ msgstr ""
 "--filter kan endast användas med fjärren konfigurerad i extensions."
 "partialclone"
 
-#: builtin/fetch.c:2250
 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:2254
 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"
 
-#: builtin/fmt-merge-msg.c:7
 msgid ""
 "git fmt-merge-msg [-m <message>] [--log[=<n>] | --no-log] [--file <file>]"
 msgstr ""
 "git fmt-merge-msg [-m <meddelande>] [--log[=<n>] | --no-log] [--file <fil>]"
 
-#: builtin/fmt-merge-msg.c:19
 msgid "populate log with at most <n> entries from shortlog"
 msgstr "fyll i loggen med som mest <n> poster från shortlog"
 
-#: builtin/fmt-merge-msg.c:22
 msgid "alias for --log (deprecated)"
 msgstr "alias för --log (avråds)"
 
-#: builtin/fmt-merge-msg.c:25
 msgid "text"
 msgstr "text"
 
-#: builtin/fmt-merge-msg.c:26
 msgid "use <text> as start of message"
 msgstr "inled meddelande med <text>"
 
-#: builtin/fmt-merge-msg.c:28
 msgid "use <name> instead of the real target branch"
 msgstr "använd <namn> istället för den verkliga målgrenen"
 
-#: builtin/fmt-merge-msg.c:29
 msgid "file to read from"
 msgstr "fil att läsa från"
 
-#: builtin/for-each-ref.c:10
 msgid "git for-each-ref [<options>] [<pattern>]"
 msgstr "git for-each-ref [<flaggor>] [<mönster>]"
 
-#: builtin/for-each-ref.c:11
 msgid "git for-each-ref [--points-at <object>]"
 msgstr "git for-each-ref [--points-at <objekt>]"
 
-#: builtin/for-each-ref.c:12
 msgid "git for-each-ref [--merged [<commit>]] [--no-merged [<commit>]]"
 msgstr ""
 "git for-each-ref [--merged [<incheckning>]] [--no-merged <incheckning>]]"
 
-#: builtin/for-each-ref.c:13
 msgid "git for-each-ref [--contains [<commit>]] [--no-contains [<commit>]]"
 msgstr ""
 "git for-each-ref [--contains [<incheckning>]] [--no-contains [<incheckning>]]"
 
-#: builtin/for-each-ref.c:31
 msgid "quote placeholders suitably for shells"
 msgstr "citera platshållare passande för skal"
 
-#: builtin/for-each-ref.c:33
 msgid "quote placeholders suitably for perl"
 msgstr "citera platshållare passande för perl"
 
-#: builtin/for-each-ref.c:35
 msgid "quote placeholders suitably for python"
 msgstr "citera platshållare passande för python"
 
-#: builtin/for-each-ref.c:37
 msgid "quote placeholders suitably for Tcl"
 msgstr "citera platshållare passande för Tcl"
 
-#: builtin/for-each-ref.c:40
 msgid "show only <n> matched refs"
 msgstr "visa endast <n> träffade refs"
 
-#: builtin/for-each-ref.c:42 builtin/tag.c:482
 msgid "respect format colors"
 msgstr "använd formatfärger"
 
-#: builtin/for-each-ref.c:45
 msgid "print only refs which points at the given object"
 msgstr "visa endast referenser som pekar på objektet"
 
-#: builtin/for-each-ref.c:47
 msgid "print only refs that are merged"
 msgstr "visa endast referenser som slagits samman"
 
-#: builtin/for-each-ref.c:48
 msgid "print only refs that are not merged"
 msgstr "visa endast referenser som ej slagits samman"
 
-#: builtin/for-each-ref.c:49
 msgid "print only refs which contain the commit"
 msgstr "visa endast referenser som innehåller incheckningen"
 
-#: builtin/for-each-ref.c:50
 msgid "print only refs which don't contain the commit"
 msgstr "visa endast referenser som inte innehåller incheckningen"
 
-#: builtin/for-each-repo.c:9
 msgid "git for-each-repo --config=<config> <command-args>"
 msgstr "git for-each-repo --config=<konfig> <kommandoargument>"
 
-#: builtin/for-each-repo.c:34
 msgid "config"
 msgstr "konfig"
 
-#: builtin/for-each-repo.c:35
 msgid "config key storing a list of repository paths"
 msgstr "konfigurationsnyckel som innehåller en lista över arkivsökvägar"
 
-#: builtin/for-each-repo.c:43
 msgid "missing --config=<config>"
 msgstr "saknar --config=<konfig>"
 
-#: builtin/fsck.c:69 builtin/fsck.c:128 builtin/fsck.c:129
 msgid "unknown"
 msgstr "okänd"
 
 #. 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 "fel i %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 "varning i %s %s: %s"
 
-#: builtin/fsck.c:124 builtin/fsck.c:127
 #, c-format
 msgid "broken link from %7s %s"
 msgstr "trasig länk från %7s %s"
 
-#: builtin/fsck.c:136
 msgid "wrong object type in link"
 msgstr "fel objekttyp i länk"
 
-#: builtin/fsck.c:152
 #, c-format
 msgid ""
 "broken link from %7s %s\n"
@@ -15940,361 +5978,302 @@ msgstr ""
 "trasig länk från %7s %s\n"
 "            till %7s %s"
 
-#: builtin/fsck.c:264
+# Vague original, not networking-related, but rather related to the actual
+# objects in the database.
+msgid "Checking connectivity"
+msgstr "Kontrollerar konnektivitet"
+
 #, c-format
 msgid "missing %s %s"
 msgstr "saknat %s %s"
 
-#: builtin/fsck.c:291
 #, c-format
 msgid "unreachable %s %s"
 msgstr "onåbart %s %s"
 
-#: builtin/fsck.c:311
 #, c-format
 msgid "dangling %s %s"
 msgstr "hängande %s %s"
 
-#: builtin/fsck.c:321
 msgid "could not create lost-found"
 msgstr "kunde inte skapa lost-found"
 
-#: builtin/fsck.c:332
+#, c-format
+msgid "could not write '%s'"
+msgstr "kunde inte skriva \"%s\""
+
 #, c-format
 msgid "could not finish '%s'"
 msgstr "kunde inte avsluta \"%s\""
 
-#: builtin/fsck.c:349
 #, c-format
 msgid "Checking %s"
 msgstr "Kontrollerar %s"
 
 # Vague original, not networking-related, but rather related to the actual
 # objects in the database.
-#: builtin/fsck.c:387
 #, c-format
 msgid "Checking connectivity (%d objects)"
 msgstr "Kontrollerar konnektivitet (%d objekt)"
 
-#: builtin/fsck.c:406
 #, c-format
 msgid "Checking %s %s"
 msgstr "Kontrollerar %s %s"
 
-#: builtin/fsck.c:411
 msgid "broken links"
 msgstr "trasiga länkar"
 
-#: builtin/fsck.c:420
 #, c-format
 msgid "root %s"
 msgstr "roten %s"
 
-#: builtin/fsck.c:428
 #, c-format
 msgid "tagged %s %s (%s) in %s"
 msgstr "taggad %s %s (%s) i %s"
 
-#: builtin/fsck.c:457
 #, c-format
 msgid "%s: object corrupt or missing"
 msgstr "%s: objekt trasigt eller saknas"
 
-#: builtin/fsck.c:482
 #, c-format
 msgid "%s: invalid reflog entry %s"
 msgstr "%s: ogiltig reflog-post %s"
 
-#: builtin/fsck.c:496
 #, c-format
 msgid "Checking reflog %s->%s"
 msgstr "Kontrollerar reflog %s->%s"
 
-#: builtin/fsck.c:530
 #, c-format
 msgid "%s: invalid sha1 pointer %s"
 msgstr "%s: ogiltig sha1-pekare %s"
 
-#: builtin/fsck.c:537
 #, c-format
 msgid "%s: not a commit"
 msgstr "%s: inte en incheckning!"
 
-#: builtin/fsck.c:591
 msgid "notice: No default references"
 msgstr "obs: Inga förvalda referenser"
 
-#: 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:628
 #, c-format
 msgid "%s: object is of unknown type '%s': %s"
 msgstr "%s: objektet har okänd typ \"%s\": %s"
 
-#: builtin/fsck.c:645
 #, c-format
 msgid "%s: object could not be parsed: %s"
 msgstr "%s: objektet kunde inte tolkas: %s"
 
-#: builtin/fsck.c:665
 #, c-format
 msgid "bad sha1 file: %s"
 msgstr "ogiltig sha1-fil: %s"
 
-#: builtin/fsck.c:686
 msgid "Checking object directory"
 msgstr "Kontrollerar objektkatalog"
 
-#: builtin/fsck.c:689
 msgid "Checking object directories"
 msgstr "Kontrollerar objektkataloger"
 
-#: builtin/fsck.c:705
 #, c-format
 msgid "Checking %s link"
 msgstr "Kontrollerar %s-länk"
 
-#: builtin/fsck.c:710 builtin/index-pack.c:862
 #, c-format
 msgid "invalid %s"
 msgstr "ogiltigt %s"
 
-#: builtin/fsck.c:717
 #, c-format
 msgid "%s points to something strange (%s)"
 msgstr "%s pekar på något konstigt (%s)"
 
-#: builtin/fsck.c:723
 #, c-format
 msgid "%s: detached HEAD points at nothing"
 msgstr "%s: frånkopplat HEAD pekar på ingenting"
 
-#: builtin/fsck.c:727
 #, c-format
 msgid "notice: %s points to an unborn branch (%s)"
 msgstr "obs: %s pekar på en ofödd gren (%s)"
 
-#: builtin/fsck.c:739
 msgid "Checking cache tree"
 msgstr "Kontrollerar cacheträd"
 
-#: builtin/fsck.c:744
 #, c-format
 msgid "%s: invalid sha1 pointer in cache-tree"
 msgstr "%s: ogiltig sha1-pekare i cacheträd"
 
-#: builtin/fsck.c:753
 msgid "non-tree in cache-tree"
 msgstr "icke-träd i cacheträd"
 
-#: builtin/fsck.c:784
 msgid "git fsck [<options>] [<object>...]"
 msgstr "git fsck [<flaggor>] [<objekt>...]"
 
-#: builtin/fsck.c:790
 msgid "show unreachable objects"
 msgstr "visa onåbara objekt"
 
-#: builtin/fsck.c:791
 msgid "show dangling objects"
 msgstr "visa dinglande objekt"
 
-#: builtin/fsck.c:792
 msgid "report tags"
 msgstr "rapportera taggar"
 
-#: builtin/fsck.c:793
 msgid "report root nodes"
 msgstr "rapportera rotnoder"
 
-#: builtin/fsck.c:794
 msgid "make index objects head nodes"
 msgstr "gör indexojekt till huvudnoder"
 
-#: builtin/fsck.c:795
 msgid "make reflogs head nodes (default)"
 msgstr "gör refloggar till huvudnoder (standard)"
 
-#: builtin/fsck.c:796
 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:797
 msgid "check only connectivity"
 msgstr "kontrollera endast konnektivitet"
 
-#: builtin/fsck.c:798 builtin/mktag.c:75
 msgid "enable more strict checking"
 msgstr "aktivera striktare kontroll"
 
-#: builtin/fsck.c:800
 msgid "write dangling objects in .git/lost-found"
 msgstr "skriv dinglande objekt i .git/lost-found"
 
-#: builtin/fsck.c:801 builtin/prune.c:146
 msgid "show progress"
 msgstr "visa förlopp"
 
-#: builtin/fsck.c:802
 msgid "show verbose names for reachable objects"
 msgstr "visa ordrika namn för nåbara objekt"
 
-#: builtin/fsck.c:862 builtin/index-pack.c:261
 msgid "Checking objects"
 msgstr "Kontrollerar objekt"
 
-#: builtin/fsck.c:890
 #, c-format
 msgid "%s: object missing"
 msgstr "%s: objekt saknas"
 
-#: builtin/fsck.c:901
 #, c-format
 msgid "invalid parameter: expected sha1, got '%s'"
 msgstr "ogiltig parameter: förväntade sha1, fick \"%s\""
 
-#: builtin/fsmonitor--daemon.c:13
 msgid "git fsmonitor--daemon start [<options>]"
 msgstr "git fsmonitor--daemon start [<flaggor>]"
 
-#: builtin/fsmonitor--daemon.c:14
 msgid "git fsmonitor--daemon run [<options>]"
 msgstr "git fsmonitor--daemon run [<flaggor>]"
 
-#: builtin/fsmonitor--daemon.c:15
 msgid "git fsmonitor--daemon stop"
 msgstr "git fsmonitor--daemon stop"
 
-#: builtin/fsmonitor--daemon.c:16
 msgid "git fsmonitor--daemon status"
 msgstr "git fsmonitor--daemon status"
 
-#: builtin/fsmonitor--daemon.c:38 builtin/fsmonitor--daemon.c:47
 #, c-format
 msgid "value of '%s' out of range: %d"
 msgstr "värdet för \"%s\" utanför intervallet: %d"
 
-#: builtin/fsmonitor--daemon.c:57
 #, c-format
 msgid "value of '%s' not bool or int: %d"
 msgstr "värdet för \"%s\" är inte bool eller int: %d"
 
-#: builtin/fsmonitor--daemon.c:99
 #, c-format
 msgid "fsmonitor-daemon is watching '%s'\n"
 msgstr "fsmonitor-daemon bevakar \"%s\"\n"
 
-#: builtin/fsmonitor--daemon.c:104
 #, c-format
 msgid "fsmonitor-daemon is not watching '%s'\n"
 msgstr "fsmonitor-daemon bevakar inte \"%s\"\n"
 
-#: builtin/fsmonitor--daemon.c:170
 #, c-format
 msgid "could not create fsmonitor cookie '%s'"
 msgstr "kunde inte skapa fsmonitor-kaka \"%s\""
 
-#: builtin/fsmonitor--daemon.c:753
 #, c-format
 msgid "fsmonitor: cookie_result '%d' != SEEN"
 msgstr "fsmonitor: cookie_result '%d' != SEEN"
 
-#: builtin/fsmonitor--daemon.c:1187
 #, c-format
 msgid "could not start IPC thread pool on '%s'"
 msgstr "kunde inte starta IPC-trådpol på \"%s\""
 
-#: builtin/fsmonitor--daemon.c:1199
 msgid "could not start fsmonitor listener thread"
 msgstr "kunde inte starta fsmonitor-lyssnartråd"
 
-#: builtin/fsmonitor--daemon.c:1297
+msgid "could not start fsmonitor health thread"
+msgstr "kunde inte starta fsmonitor-hälsotråd"
+
 msgid "could not initialize listener thread"
 msgstr "kunde inte initiera lyssnartråd"
 
-#: builtin/fsmonitor--daemon.c:1328 builtin/fsmonitor--daemon.c:1383
+msgid "could not initialize health thread"
+msgstr "kunde inte initiera hälsotråd"
+
+#, c-format
+msgid "could not cd home '%s'"
+msgstr "kunde inte byta katalog hem \"%s\""
+
 #, c-format
 msgid "fsmonitor--daemon is already running '%s'"
 msgstr "fsmonitor--daemon körs redan på \"%s\""
 
-#: builtin/fsmonitor--daemon.c:1332
 #, c-format
 msgid "running fsmonitor-daemon in '%s'\n"
 msgstr "kör fsmonitor-daemon i \"%s\"\n"
 
-#: builtin/fsmonitor--daemon.c:1387
 #, c-format
 msgid "starting fsmonitor-daemon in '%s'\n"
 msgstr "startar fsmonitor-daemon i \"%s\"\n"
 
-#: builtin/fsmonitor--daemon.c:1413
 msgid "daemon failed to start"
 msgstr "serverprocessen kunde inte startas"
 
-#: builtin/fsmonitor--daemon.c:1416
 msgid "daemon not online yet"
 msgstr "serverprocessen ännu inte operativ"
 
-#: builtin/fsmonitor--daemon.c:1419
 msgid "daemon terminated"
 msgstr "serverprocessen avslutades"
 
-#: builtin/fsmonitor--daemon.c:1429
 msgid "detach from console"
 msgstr "koppla från konsolen"
 
-#: builtin/fsmonitor--daemon.c:1432
 msgid "use <n> ipc worker threads"
 msgstr "använd <n> ipc-jobbtrådar"
 
-#: builtin/fsmonitor--daemon.c:1435
 msgid "max seconds to wait for background daemon startup"
 msgstr "max sekunder att vänta på att serverprocessen startar"
 
-#: builtin/fsmonitor--daemon.c:1449
 #, c-format
 msgid "invalid 'ipc-threads' value (%d)"
 msgstr "ogiltigt värde för \"ipc-threads\" (%d)"
 
-#: builtin/fsmonitor--daemon.c:1464
 #, c-format
 msgid "Unhandled subcommand '%s'"
 msgstr "Ej hanterat underkommando \"%s\""
 
-#: builtin/fsmonitor--daemon.c:1477
 msgid "fsmonitor--daemon not supported on this platform"
 msgstr "fsmonitor--daemon stöds inte på denna plattform"
 
-#: builtin/gc.c:39
 msgid "git gc [<options>]"
 msgstr "git gc [<flaggor>]"
 
-#: builtin/gc.c:93
 #, c-format
 msgid "Failed to fstat %s: %s"
 msgstr "Misslyckades ta status (fstat) på %s: %s"
 
-#: builtin/gc.c:129
 #, c-format
 msgid "failed to parse '%s' value '%s'"
 msgstr "misslyckades tolka \"%s\" värde \"%s\""
 
-#: builtin/gc.c:488 builtin/init-db.c:57
 #, c-format
 msgid "cannot stat '%s'"
 msgstr "kan inte ta status på \"%s\""
 
-#: builtin/gc.c:504
 #, c-format
 msgid ""
 "The last gc run reported the following. Please correct the root cause\n"
@@ -16309,52 +6288,44 @@ msgstr ""
 "\n"
 "%s"
 
-#: builtin/gc.c:552
 msgid "prune unreferenced objects"
 msgstr "rensa ej refererade objekt"
 
-#: builtin/gc.c:554
+msgid "pack unreferenced objects separately"
+msgstr "packa ej refererade objekt separat"
+
 msgid "be more thorough (increased runtime)"
 msgstr "var mer grundlig (ökar körtiden)"
 
-#: builtin/gc.c:555
 msgid "enable auto-gc mode"
 msgstr "aktivera auto-gc-läge"
 
-#: builtin/gc.c:558
 msgid "force running gc even if there may be another gc running"
 msgstr "tvinga gc-körning även om en annan gc kanske körs"
 
-#: builtin/gc.c:561
 msgid "repack all other packs except the largest pack"
 msgstr "packa om alla paket förutom det största paketet"
 
-#: builtin/gc.c:577
 #, c-format
-msgid "failed to parse gc.logexpiry value %s"
-msgstr "kunde inte tolka värdet %s för gc.logexpiry"
+msgid "failed to parse gc.logExpiry value %s"
+msgstr "kunde inte tolka värdet %s för gc.logExpiry"
 
-#: builtin/gc.c:588
 #, c-format
 msgid "failed to parse prune expiry value %s"
 msgstr "kunde inte tolka värdet %s för prune expiry"
 
-#: builtin/gc.c:608
 #, c-format
 msgid "Auto packing the repository in background for optimum performance.\n"
 msgstr "Packar arkivet automatiskt i bakgrunden för optimal prestanda.\n"
 
-#: builtin/gc.c:610
 #, c-format
 msgid "Auto packing the repository for optimum performance.\n"
 msgstr "Packar arkivet automatiskt för optimal prestanda.\n"
 
-#: builtin/gc.c:611
 #, c-format
 msgid "See \"git help gc\" for manual housekeeping.\n"
 msgstr "Se \"git help gc\" för manuell hushållning.\n"
 
-#: builtin/gc.c:652
 #, c-format
 msgid ""
 "gc is already running on machine '%s' pid %<PRIuMAX> (use --force if not)"
@@ -16362,482 +6333,374 @@ msgstr ""
 "gc körs redan på maskinen \"%s\" pid %<PRIuMAX> (använd --force om så inte "
 "är fallet)"
 
-#: builtin/gc.c:707
 msgid ""
 "There are too many unreachable loose objects; run 'git prune' to remove them."
 msgstr ""
 "Det finns för många onåbara lösa objekt; kör \"git prune\" för att ta bort "
 "dem."
 
-#: builtin/gc.c:717
 msgid ""
 "git maintenance run [--auto] [--[no-]quiet] [--task=<task>] [--schedule]"
 msgstr ""
 "git maintenance run [--auto] [--[no-]quiet] [--task=<uppgift>] [--schedule]"
 
-#: builtin/gc.c:747
 msgid "--no-schedule is not allowed"
 msgstr "--no-schedule tillåts inte"
 
-#: builtin/gc.c:752
 #, c-format
 msgid "unrecognized --schedule argument '%s'"
 msgstr "okänt argument för --schedule, %s"
 
-#: builtin/gc.c:870
 msgid "failed to write commit-graph"
 msgstr "kunde inte skriva incheckningsgraf"
 
-#: builtin/gc.c:906
 msgid "failed to prefetch remotes"
 msgstr "kunde inte förhämta fjärrar"
 
-#: builtin/gc.c:1022
 msgid "failed to start 'git pack-objects' process"
 msgstr "kunde inte starta \"git pack-objects\"-process"
 
-#: builtin/gc.c:1039
 msgid "failed to finish 'git pack-objects' process"
 msgstr "kunde inte avsluta \"git pack-objects\"-process"
 
-#: builtin/gc.c:1090
 msgid "failed to write multi-pack-index"
 msgstr "kunde inte skriva multi-pack-index"
 
-#: builtin/gc.c:1106
 msgid "'git multi-pack-index expire' failed"
 msgstr "\"git multi-pack-index expire\" misslyckades"
 
-#: builtin/gc.c:1165
 msgid "'git multi-pack-index repack' failed"
 msgstr "\"git multi-pack-index repack\" misslyckades"
 
-#: builtin/gc.c:1174
 msgid ""
 "skipping incremental-repack task because core.multiPackIndex is disabled"
 msgstr ""
 "hoppar över \"incremental-repack\"-uppgift eftersom core.multiPackIndex är "
 "inaktiverat"
 
-#: builtin/gc.c:1278
 #, c-format
 msgid "lock file '%s' exists, skipping maintenance"
 msgstr "låsfilen \"%s\" finns, hoppar över underhåll"
 
-#: builtin/gc.c:1308
 #, c-format
 msgid "task '%s' failed"
 msgstr "uppgiften \"%s\" misslyckades"
 
-#: builtin/gc.c:1390
 #, c-format
 msgid "'%s' is not a valid task"
 msgstr "\"%s\" är inte en giltig uppgift"
 
-#: builtin/gc.c:1395
 #, c-format
 msgid "task '%s' cannot be selected multiple times"
 msgstr "uppgiften \"%s\" kan inte väljas flera gånger"
 
-#: builtin/gc.c:1410
 msgid "run tasks based on the state of the repository"
 msgstr "kör uppgifter baserad på arkivets tillstånd"
 
-#: builtin/gc.c:1411
 msgid "frequency"
 msgstr "frekvens"
 
-#: builtin/gc.c:1412
 msgid "run tasks based on frequency"
 msgstr "kör uppgifter baserat på frekvens"
 
-#: builtin/gc.c:1415
 msgid "do not report progress or other information over stderr"
 msgstr "rapportera inte framgång eller annan information över standard fel"
 
-#: builtin/gc.c:1416
 msgid "task"
 msgstr "uppgift"
 
-#: builtin/gc.c:1417
 msgid "run a specific task"
 msgstr "utför en specifik uppgift"
 
-#: builtin/gc.c:1434
 msgid "use at most one of --auto and --schedule=<frequency>"
 msgstr "använd som mest en av --auto och --schedule=<frekvens>"
 
-#: builtin/gc.c:1477
 msgid "failed to run 'git config'"
 msgstr "misslyckades köra \"git config\""
 
-#: builtin/gc.c:1629
 #, c-format
 msgid "failed to expand path '%s'"
 msgstr "misslyckades expandera sökvägen \"%s\""
 
-#: builtin/gc.c:1656 builtin/gc.c:1694
 msgid "failed to start launchctl"
 msgstr "misslyckades starta launchctl"
 
-#: builtin/gc.c:1769 builtin/gc.c:2237
 #, c-format
 msgid "failed to create directories for '%s'"
 msgstr "misslyckades skapa kataloger för \"%s\""
 
-#: builtin/gc.c:1796
 #, c-format
 msgid "failed to bootstrap service %s"
 msgstr "misslyckades starta tjänsten %s"
 
-#: builtin/gc.c:1889
 msgid "failed to create temp xml file"
 msgstr "misslyckades skapa temporär xml-fil"
 
-#: builtin/gc.c:1979
 msgid "failed to start schtasks"
 msgstr "misslyckades starta schtasks"
 
-#: builtin/gc.c:2063
 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:2080
 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:2084
 msgid "failed to open stdin of 'crontab'"
 msgstr "misslyckades öppna standard in för \"crontab\""
 
-#: builtin/gc.c:2126
 msgid "'crontab' died"
 msgstr "\"crontab\" dog"
 
-#: builtin/gc.c:2191
 msgid "failed to start systemctl"
 msgstr "misslyckades starta systemctl"
 
-#: builtin/gc.c:2201
 msgid "failed to run systemctl"
 msgstr "misslyckades att köra systemctl"
 
-#: builtin/gc.c:2210 builtin/gc.c:2215 builtin/worktree.c:63
-#: builtin/worktree.c:1024
 #, c-format
 msgid "failed to delete '%s'"
 msgstr "misslyckades ta bort \"%s\""
 
-#: builtin/gc.c:2395
+#, c-format
+msgid "failed to flush '%s'"
+msgstr "misslyckades spola \"%s\""
+
 #, c-format
 msgid "unrecognized --scheduler argument '%s'"
 msgstr "okänt argument för --scheduler, \"%s\""
 
-#: builtin/gc.c:2420
 msgid "neither systemd timers nor crontab are available"
 msgstr "varken systemd-timer eller crontab är tillgänglig"
 
-#: builtin/gc.c:2435
 #, c-format
 msgid "%s scheduler is not available"
 msgstr "%s-schemaläggare är inte tillgänglig"
 
-#: builtin/gc.c:2449
 msgid "another process is scheduling background maintenance"
 msgstr "en annan process schemalägger bakgrundsunderhåll"
 
-#: builtin/gc.c:2471
 msgid "git maintenance start [--scheduler=<scheduler>]"
 msgstr "git maintenance start [--scheduler=<schemaläggare>]"
 
-#: builtin/gc.c:2480
 msgid "scheduler"
 msgstr "schemaläggare"
 
-#: builtin/gc.c:2481
 msgid "scheduler to trigger git maintenance run"
 msgstr "schemaläggare som utlöser \"git maintenance\"-körning"
 
-#: builtin/gc.c:2495
 msgid "failed to add repo to global config"
 msgstr "misslyckades lägga till arkiv till global konfiguration"
 
-#: builtin/gc.c:2504
 msgid "git maintenance <subcommand> [<options>]"
 msgstr "git maintenance <underkommando> [<flaggor>]"
 
-#: builtin/gc.c:2523
 #, c-format
 msgid "invalid subcommand: %s"
 msgstr "felaktigt underkommando: %s"
 
-#: builtin/grep.c:32
 msgid "git grep [<options>] [-e] <pattern> [<rev>...] [[--] <path>...]"
 msgstr "git grep [<flaggor>] [-e] <mönster> [<rev>...] [[--] <sökväg>...]"
 
-#: builtin/grep.c:241
 #, c-format
 msgid "grep: failed to create thread: %s"
 msgstr "grep: misslyckades skapa tråd. %s"
 
-#: builtin/grep.c:295
 #, c-format
 msgid "invalid number of threads specified (%d) for %s"
 msgstr "felaktigt antal trådar angivet (%d) för %s"
 
+#. #-#-#-#-#  grep.c.po  #-#-#-#-#
 #. TRANSLATORS: %s is the configuration
 #. variable for tweaking threads, currently
 #. grep.threads
 #.
-#: builtin/grep.c:303 builtin/index-pack.c:1587 builtin/index-pack.c:1791
-#: builtin/pack-objects.c:3150
 #, c-format
 msgid "no threads support, ignoring %s"
 msgstr "trådstöd saknas, ignorerar %s"
 
-#: builtin/grep.c:490 builtin/grep.c:619 builtin/grep.c:659
 #, c-format
 msgid "unable to read tree (%s)"
 msgstr "kunde inte läsa träd (%s)"
 
-#: builtin/grep.c:674
 #, c-format
 msgid "unable to grep from object of type %s"
 msgstr "kunde inte \"grep\" från objekt av typen %s"
 
-#: builtin/grep.c:754
 #, c-format
 msgid "switch `%c' expects a numerical value"
 msgstr "flaggan \"%c\" antar ett numeriskt värde"
 
-#: builtin/grep.c:852
 msgid "search in index instead of in the work tree"
 msgstr "sök i indexet istället för i arbetskatalogen"
 
-#: builtin/grep.c:854
 msgid "find in contents not managed by git"
 msgstr "sök i innehåll som inte hanteras av git"
 
-#: builtin/grep.c:856
 msgid "search in both tracked and untracked files"
 msgstr "sök i både spårade och ospårade filer"
 
-#: builtin/grep.c:858
 msgid "ignore files specified via '.gitignore'"
 msgstr "ignorera filer angivna i \".gitignore\""
 
-#: builtin/grep.c:860
 msgid "recursively search in each submodule"
 msgstr "sök varje undermodul rekursivt"
 
-#: builtin/grep.c:863
 msgid "show non-matching lines"
 msgstr "visa rader som inte träffas"
 
-#: builtin/grep.c:865
 msgid "case insensitive matching"
 msgstr "skiftlägesokänslig sökning"
 
-#: builtin/grep.c:867
 msgid "match patterns only at word boundaries"
 msgstr "träffa endast mönster vid ordgränser"
 
-#: builtin/grep.c:869
 msgid "process binary files as text"
 msgstr "hantera binärfiler som text"
 
-#: builtin/grep.c:871
 msgid "don't match patterns in binary files"
 msgstr "träffa inte mönster i binärfiler"
 
-#: builtin/grep.c:874
 msgid "process binary files with textconv filters"
 msgstr "hantera binärfiler med textconv-filter"
 
-#: builtin/grep.c:876
 msgid "search in subdirectories (default)"
 msgstr "sök i underkataloger (standard)"
 
-#: builtin/grep.c:878
 msgid "descend at most <depth> levels"
 msgstr "gå som mest ned <djup> nivåer"
 
-#: builtin/grep.c:882
 msgid "use extended POSIX regular expressions"
 msgstr "använd utökade POSIX-reguljära uttryck"
 
-#: builtin/grep.c:885
 msgid "use basic POSIX regular expressions (default)"
 msgstr "använd grundläggande POSIX-reguljära uttryck (standard)"
 
-#: builtin/grep.c:888
 msgid "interpret patterns as fixed strings"
 msgstr "tolka mönster som fixerade strängar"
 
-#: builtin/grep.c:891
 msgid "use Perl-compatible regular expressions"
 msgstr "använd Perlkompatibla reguljära uttryck"
 
-#: builtin/grep.c:894
 msgid "show line numbers"
 msgstr "visa radnummer"
 
-#: builtin/grep.c:895
 msgid "show column number of first match"
 msgstr "visa kolumnnummer för första träff"
 
-#: builtin/grep.c:896
 msgid "don't show filenames"
 msgstr "visa inte filnamn"
 
-#: builtin/grep.c:897
 msgid "show filenames"
 msgstr "visa filnamn"
 
-#: builtin/grep.c:899
 msgid "show filenames relative to top directory"
 msgstr "visa filnamn relativa till toppkatalogen"
 
-#: builtin/grep.c:901
 msgid "show only filenames instead of matching lines"
 msgstr "visa endast filnamn istället för träffade rader"
 
-#: builtin/grep.c:903
 msgid "synonym for --files-with-matches"
 msgstr "synonym för --files-with-matches"
 
-#: builtin/grep.c:906
 msgid "show only the names of files without match"
 msgstr "visa endast namn på filer utan träffar"
 
-#: builtin/grep.c:908
 msgid "print NUL after filenames"
 msgstr "skriv NUL efter filnamn"
 
-#: builtin/grep.c:911
 msgid "show only matching parts of a line"
 msgstr "visa endast träffade delar av rader"
 
-#: builtin/grep.c:913
 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:914
 msgid "highlight matches"
 msgstr "ljusmarkera träffar"
 
-#: builtin/grep.c:916
 msgid "print empty line between matches from different files"
 msgstr "skriv tomma rader mellan träffar från olika filer"
 
-#: builtin/grep.c:918
 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:921
 msgid "show <n> context lines before and after matches"
 msgstr "visa <n> rader sammanhang före och efter träffar"
 
-#: builtin/grep.c:924
 msgid "show <n> context lines before matches"
 msgstr "visa <n> rader sammanhang före träffar"
 
-#: builtin/grep.c:926
 msgid "show <n> context lines after matches"
 msgstr "visa <n> rader sammanhang efter träffar"
 
-#: builtin/grep.c:928
 msgid "use <n> worker threads"
 msgstr "använd <n> jobbtrådar"
 
-#: builtin/grep.c:929
 msgid "shortcut for -C NUM"
 msgstr "genväg för -C NUM"
 
-#: builtin/grep.c:932
 msgid "show a line with the function name before matches"
 msgstr "visa en rad med funktionsnamnet före träffen"
 
-#: builtin/grep.c:934
 msgid "show the surrounding function"
 msgstr "visa den omkringliggande funktionen"
 
-#: builtin/grep.c:937
 msgid "read patterns from file"
 msgstr "läs mönster från fil"
 
-#: builtin/grep.c:939
 msgid "match <pattern>"
 msgstr "träffa <mönster>"
 
-#: builtin/grep.c:941
 msgid "combine patterns specified with -e"
 msgstr "kombinera mönster som anges med -e"
 
-#: builtin/grep.c:953
 msgid "indicate hit with exit status without output"
 msgstr "ange träff med slutstatuskod utan utdata"
 
-#: builtin/grep.c:955
 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:958
 msgid "pager"
 msgstr "bläddrare"
 
-#: builtin/grep.c:958
 msgid "show matching files in the pager"
 msgstr "visa träffade filer i filbläddraren"
 
-#: builtin/grep.c:962
 msgid "allow calling of grep(1) (ignored by this build)"
 msgstr "tillåt anropa grep(1) (ignoreras av detta bygge)"
 
-#: builtin/grep.c:1028
 msgid "no pattern given"
 msgstr "inget mönster angavs"
 
-#: builtin/grep.c:1064
 msgid "--no-index or --untracked cannot be used with revs"
 msgstr "--no-index och --untracked kan inte användas med revisioner"
 
-#: builtin/grep.c:1072
 #, c-format
 msgid "unable to resolve revision: %s"
 msgstr "kan inte slå upp revision: %s"
 
-#: builtin/grep.c:1102
 msgid "--untracked not supported with --recurse-submodules"
 msgstr "--untracked stöds inte med --recurse-submodules"
 
-#: builtin/grep.c:1106
 msgid "invalid option combination, ignoring --threads"
 msgstr "ogiltig kombination av flaggor, ignorerar --threads"
 
-#: builtin/grep.c:1109 builtin/pack-objects.c:4084
 msgid "no threads support, ignoring --threads"
 msgstr "trådstöd saknas, ignorerar --threads"
 
-#: builtin/grep.c:1112 builtin/index-pack.c:1584 builtin/pack-objects.c:3147
 #, c-format
 msgid "invalid number of threads specified (%d)"
 msgstr "felaktigt antal trådar angivet (%d)"
 
-#: builtin/grep.c:1146
 msgid "--open-files-in-pager only works on the worktree"
 msgstr "--open-files-in-pager fungerar endast i arbetskatalogen"
 
-#: builtin/grep.c:1179
 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:1187
 msgid "both --cached and trees are given"
 msgstr "både --cached och träd angavs"
 
-#: builtin/hash-object.c:83
 msgid ""
 "git hash-object [-t <type>] [-w] [--path=<file> | --no-filters] [--stdin] "
 "[--] <file>..."
@@ -16845,100 +6708,77 @@ msgstr ""
 "git hash-object [-t <typ>] [-w] [--path=<fil> | --no-filters] [--stdin] [--] "
 "<fil>..."
 
-#: builtin/hash-object.c:97
 msgid "object type"
 msgstr "objekttyp"
 
-#: builtin/hash-object.c:98
 msgid "write the object into the object database"
 msgstr "skriv objektet till objektdatabasen"
 
-#: builtin/hash-object.c:100
 msgid "read the object from stdin"
 msgstr "läs objektet från standard in"
 
-#: builtin/hash-object.c:102
 msgid "store file as is without filters"
 msgstr "spara filen som den är utan filer"
 
-#: builtin/hash-object.c:103
 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:104
 msgid "process file as it were from this path"
 msgstr "hantera filen som om den kom från sökvägen"
 
-#: builtin/help.c:57
 msgid "print all available commands"
 msgstr "visa alla tillgängliga kommandon"
 
-#: builtin/help.c:60
 msgid "show external commands in --all"
 msgstr "visa externa kommandon i --all"
 
-#: builtin/help.c:61
 msgid "show aliases in --all"
 msgstr "visa alias i --all"
 
-#: builtin/help.c:62
 msgid "exclude guides"
 msgstr "uteslut vägledningar"
 
-#: builtin/help.c:63
 msgid "show man page"
 msgstr "visa manualsida"
 
-#: builtin/help.c:64
 msgid "show manual in web browser"
 msgstr "visa manual i webbläsare"
 
-#: builtin/help.c:66
 msgid "show info page"
 msgstr "visa info-sida"
 
-#: builtin/help.c:68
 msgid "print command description"
 msgstr "visa kommandobeskrivning"
 
-#: builtin/help.c:70
 msgid "print list of useful guides"
 msgstr "lista användbara vägledningar"
 
-#: builtin/help.c:72
 msgid "print all configuration variable names"
 msgstr "visa namn på alla konfigurationsvariabler"
 
-#: builtin/help.c:84
 msgid "git help [[-i|--info] [-m|--man] [-w|--web]] [<command>]"
 msgstr "git help [[-i|--info] [-m|--man] [-w|--web]] [<kommando>]"
 
-#: builtin/help.c:201
 #, c-format
 msgid "unrecognized help format '%s'"
 msgstr "okänt hjälpformat: \"%s\""
 
-#: builtin/help.c:227
 msgid "Failed to start emacsclient."
 msgstr "Misslyckades starta emacsclient."
 
-#: builtin/help.c:240
 msgid "Failed to parse emacsclient version."
 msgstr "Kunde inte tolka emacsclient-version."
 
-#: builtin/help.c:248
 #, c-format
 msgid "emacsclient version '%d' too old (< 22)."
 msgstr "emacsclient version \"%d\" för gammal (< 22)."
 
-#: builtin/help.c:266 builtin/help.c:288 builtin/help.c:298 builtin/help.c:306
 #, c-format
 msgid "failed to exec '%s'"
 msgstr "exec misslyckades för \"%s\""
 
-#: builtin/help.c:344
 #, c-format
 msgid ""
 "'%s': path for unsupported man viewer.\n"
@@ -16947,7 +6787,6 @@ msgstr ""
 "\"%s\": sökväg för man-visare som ej stöds.\n"
 "Använd \"man.<verktyg>.cmd\" istället."
 
-#: builtin/help.c:356
 #, c-format
 msgid ""
 "'%s': cmd for supported man viewer.\n"
@@ -16956,424 +6795,334 @@ msgstr ""
 "\"%s\": kommando för man-visare som stöds.\n"
 "Använd \"man.<verktyg>.path\" istället."
 
-#: builtin/help.c:471
 #, c-format
 msgid "'%s': unknown man viewer."
 msgstr "\"%s\": okänd man-visare."
 
-#: builtin/help.c:487
 msgid "no man viewer handled the request"
 msgstr "ingen man-visare hanterade förfrågan"
 
-#: builtin/help.c:494
 msgid "no info viewer handled the request"
 msgstr "ingen info-visare hanterade förfrågan"
 
-#: builtin/help.c:555 builtin/help.c:566 git.c:348
 #, c-format
 msgid "'%s' is aliased to '%s'"
 msgstr "\"%s\" är ett alias för \"%s\""
 
-#: builtin/help.c:569 git.c:380
 #, c-format
 msgid "bad alias.%s string: %s"
 msgstr "felaktig alias.%s-sträng: %s"
 
-#: builtin/help.c:611
 #, c-format
 msgid "the '%s' option doesn't take any non-option arguments"
 msgstr "flaggan \"%s\" tar inte några argument som inte är flaggor"
 
-#: builtin/help.c:631
 msgid ""
 "the '--no-[external-commands|aliases]' options can only be used with '--all'"
 msgstr ""
 "flaggorna '--no-[external-commands|aliases]' kan endast användas med \"--all"
 "\""
 
-#: builtin/help.c:643 builtin/help.c:671
 #, c-format
 msgid "usage: %s%s"
 msgstr "användning: %s%s"
 
-#: builtin/help.c:666
 msgid "'git help config' for more information"
 msgstr "\"git help config\" för mer information"
 
-#: builtin/hook.c:10
 msgid "git hook run [--ignore-missing] <hook-name> [-- <hook-args>]"
 msgstr "git hook run [--ignore-missing] <krok-namn> [-- <krok-argument>]"
 
-#: builtin/hook.c:30
 msgid "silently ignore missing requested <hook-name>"
 msgstr "ignorera tyst om önskat <krok-namn> saknas"
 
-#: 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:241
 #, c-format
 msgid "did not receive expected object %s"
 msgstr "emottog inte det förväntade objektet %s"
 
-#: 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: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:304
 msgid "early EOF"
 msgstr "tidigt filslut"
 
-#: builtin/index-pack.c:305
 msgid "read error on input"
 msgstr "indataläsfel"
 
-#: builtin/index-pack.c:317
 msgid "used more bytes than were available"
 msgstr "använde fler byte än tillgängligt"
 
-#: builtin/index-pack.c:324 builtin/pack-objects.c:754
 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:329
 #, c-format
 msgid "pack exceeds maximum allowed size (%s)"
 msgstr "paket är större än tillåten maximal storlek (%s)"
 
-#: builtin/index-pack.c:362
 msgid "pack signature mismatch"
 msgstr "paketsignatur stämmer inte överens"
 
-#: builtin/index-pack.c:364
 #, c-format
 msgid "pack version %<PRIu32> unsupported"
 msgstr "paketversion %<PRIu32> stöds ej"
 
-#: builtin/index-pack.c:380
 #, c-format
 msgid "pack has bad object at offset %<PRIuMAX>: %s"
 msgstr "paketet har felaktigt objekt vid index %<PRIuMAX>: %s"
 
-#: builtin/index-pack.c:485
 #, c-format
 msgid "inflate returned %d"
 msgstr "inflate returnerade %d"
 
-#: builtin/index-pack.c:534
 msgid "offset value overflow for delta base object"
 msgstr "indexvärdespill för deltabasobjekt"
 
-#: builtin/index-pack.c:542
 msgid "delta base offset is out of bound"
 msgstr "deltabasindex utanför gränsen"
 
-#: builtin/index-pack.c:550
 #, c-format
 msgid "unknown object type %d"
 msgstr "okänd objekttyp %d"
 
-#: builtin/index-pack.c:581
 msgid "cannot pread pack file"
 msgstr "kan inte utföra \"pread\" på paketfil"
 
-#: builtin/index-pack.c:583
 #, 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:609
 msgid "serious inflate inconsistency"
 msgstr "allvarlig inflate-inkonsekvens"
 
-#: builtin/index-pack.c:754 builtin/index-pack.c:760 builtin/index-pack.c:784
-#: builtin/index-pack.c:823 builtin/index-pack.c:832
 #, c-format
 msgid "SHA1 COLLISION FOUND WITH %s !"
 msgstr "SHA1-KOLLISION UPPTÄCKT VID %s !"
 
-#: builtin/index-pack.c:757 builtin/pack-objects.c:290
-#: builtin/pack-objects.c:350 builtin/pack-objects.c:456
 #, c-format
 msgid "unable to read %s"
 msgstr "kunde inte läsa %s"
 
-#: builtin/index-pack.c:821
 #, c-format
 msgid "cannot read existing object info %s"
 msgstr "kan inte läsa information om befintligt objekt %s"
 
-#: builtin/index-pack.c:829
 #, c-format
 msgid "cannot read existing object %s"
 msgstr "kan inte läsa befintligt objekt %s"
 
-#: builtin/index-pack.c:843
 #, c-format
 msgid "invalid blob object %s"
 msgstr "ogiltigt blob-objekt %s"
 
-#: builtin/index-pack.c:846 builtin/index-pack.c:865
 msgid "fsck error in packed object"
 msgstr "fsck-fel i packat objekt"
 
-#: builtin/index-pack.c:867
 #, 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:928 builtin/index-pack.c:975
 msgid "failed to apply delta"
 msgstr "misslyckades tillämpa delta"
 
-#: builtin/index-pack.c:1161
 msgid "Receiving objects"
 msgstr "Tar emot objekt"
 
-#: builtin/index-pack.c:1161
 msgid "Indexing objects"
 msgstr "Skapar index för objekt"
 
-#: builtin/index-pack.c:1195
 msgid "pack is corrupted (SHA1 mismatch)"
 msgstr "paketet är trasigt (SHA1 stämmer inte)"
 
-#: builtin/index-pack.c:1200
 msgid "cannot fstat packfile"
 msgstr "kan inte utföra \"fstat\" på paketfil"
 
-#: builtin/index-pack.c:1203
 msgid "pack has junk at the end"
 msgstr "paket har skräp i slutet"
 
-#: builtin/index-pack.c:1215
 msgid "confusion beyond insanity in parse_pack_objects()"
 msgstr "förvirrad bortom vanvett i parse_pack_objects()"
 
-#: builtin/index-pack.c:1238
 msgid "Resolving deltas"
 msgstr "Analyserar delta"
 
-#: builtin/index-pack.c:1249 builtin/pack-objects.c:2913
 #, c-format
 msgid "unable to create thread: %s"
 msgstr "kunde inte skapa tråd: %s"
 
-#: builtin/index-pack.c:1282
 msgid "confusion beyond insanity"
 msgstr "förvirrad bortom vanvett"
 
-#: builtin/index-pack.c:1288
 #, 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:1300
 #, c-format
 msgid "Unexpected tail checksum for %s (disk corruption?)"
 msgstr "Oväntad svanskontrollsumma för %s (trasig disk?)"
 
-#: builtin/index-pack.c:1304
 #, 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:1328
 #, c-format
 msgid "unable to deflate appended object (%d)"
 msgstr "kunde inte utföra \"deflate\" på tillagt objekt (%d)"
 
-#: builtin/index-pack.c:1423
 #, c-format
 msgid "local object %s is corrupt"
 msgstr "lokalt objekt %s är trasigt"
 
-#: builtin/index-pack.c:1445
 #, c-format
 msgid "packfile name '%s' does not end with '.%s'"
 msgstr "paketfilnamnet \"%s\" slutar inte med \".%s\""
 
-#: builtin/index-pack.c:1469
 #, c-format
 msgid "cannot write %s file '%s'"
 msgstr "kan inte ta skriva %s-fil \"%s\""
 
-#: builtin/index-pack.c:1477
 #, c-format
 msgid "cannot close written %s file '%s'"
 msgstr "kan inte stänga skriven %s-fil \"%s\""
 
-#: builtin/index-pack.c:1494
 #, 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:1519
 msgid "error while closing pack file"
 msgstr "fel vid stängning av paketfil"
 
-#: builtin/index-pack.c:1578 builtin/pack-objects.c:3158
 #, c-format
-msgid "bad pack.indexversion=%<PRIu32>"
-msgstr "felaktig pack.indexversion=%<PRIu32>"
+msgid "bad pack.indexVersion=%<PRIu32>"
+msgstr "felaktig pack.indexVersion=%<PRIu32>"
 
-#: builtin/index-pack.c:1648
 #, c-format
 msgid "Cannot open existing pack file '%s'"
 msgstr "Kan inte öppna befintlig paketfil \"%s\""
 
-#: builtin/index-pack.c:1650
 #, 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:1698
 #, 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:1705
 #, 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
 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:1825 builtin/index-pack.c:1829
 #, c-format
 msgid "bad %s"
 msgstr "felaktig %s"
 
-#: builtin/index-pack.c:1835 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:1856
 msgid "--stdin requires a git repository"
 msgstr "--stdin kräver ett git-arkiv"
 
-#: builtin/index-pack.c:1873
 msgid "--verify with no packfile name given"
 msgstr "--verify angavs utan paketfilnamn"
 
-#: builtin/index-pack.c:1939 builtin/unpack-objects.c:584
 msgid "fsck error in pack objects"
 msgstr "fsck-fel i packat objekt"
 
-#: builtin/init-db.c:63
 #, c-format
 msgid "cannot stat template '%s'"
 msgstr "kan inte ta status på mallen \"%s\""
 
-#: builtin/init-db.c:68
 #, c-format
 msgid "cannot opendir '%s'"
 msgstr "kan inte öppna katalogen (opendir) \"%s\""
 
-#: builtin/init-db.c:80
 #, c-format
 msgid "cannot readlink '%s'"
 msgstr "kan inte läsa länk (readlink) \"%s\""
 
-#: builtin/init-db.c:82
 #, c-format
 msgid "cannot symlink '%s' '%s'"
 msgstr "kan inte skapa symbolisk länk \"%s\" \"%s\""
 
-#: builtin/init-db.c:88
 #, c-format
 msgid "cannot copy '%s' to '%s'"
 msgstr "kan inte kopiera \"%s\" till \"%s\""
 
-#: builtin/init-db.c:92
 #, c-format
 msgid "ignoring template %s"
 msgstr "ignorerar mallen %s"
 
-#: builtin/init-db.c:123
 #, c-format
 msgid "templates not found in %s"
 msgstr "mallarna hittades inte i %s"
 
-#: builtin/init-db.c:138
 #, c-format
 msgid "not copying templates from '%s': %s"
 msgstr "kopierade inte mallar från \"%s\": %s"
 
-#: builtin/init-db.c:263
 #, c-format
 msgid "invalid initial branch name: '%s'"
 msgstr "ogiltigt namn på första gren: \"%s\""
 
-#: builtin/init-db.c:354
 #, c-format
 msgid "unable to handle file type %d"
 msgstr "kan inte hantera filtyp %d"
 
-#: builtin/init-db.c:357
 #, c-format
 msgid "unable to move %s to %s"
 msgstr "kan inte flytta %s till %s"
 
-#: builtin/init-db.c:373
 msgid "attempt to reinitialize repository with different hash"
 msgstr "försöker initiera arkivet på nytt med annan hash"
 
-#: builtin/init-db.c:397 builtin/init-db.c:400
 #, c-format
 msgid "%s already exists"
 msgstr "%s finns redan"
 
-#: builtin/init-db.c:432
 #, c-format
 msgid "re-init: ignored --initial-branch=%s"
 msgstr "re-init: ignorerade --initial-branch=%s"
 
-#: builtin/init-db.c:463
 #, c-format
 msgid "Reinitialized existing shared Git repository in %s%s\n"
 msgstr "Ominitierade befintligt delat Git-arkiv i %s%s\n"
 
-#: builtin/init-db.c:464
 #, c-format
 msgid "Reinitialized existing Git repository in %s%s\n"
 msgstr "Ominitierade befintligt Git-arkiv i %s%s\n"
 
-#: builtin/init-db.c:468
 #, c-format
 msgid "Initialized empty shared Git repository in %s%s\n"
 msgstr "Initierade tomt delat Git-arkiv i %s%s\n"
 
-#: builtin/init-db.c:469
 #, c-format
 msgid "Initialized empty Git repository in %s%s\n"
 msgstr "Initierade tomt Git-arkiv i %s%s\n"
 
-#: builtin/init-db.c:518
 msgid ""
 "git init [-q | --quiet] [--bare] [--template=<template-directory>] [--"
 "shared[=<permissions>]] [<directory>]"
@@ -17381,37 +7130,29 @@ msgstr ""
 "git init [-q | --quiet] [--bare] [--template=<mallkatalog>] [--"
 "shared[=<behörigheter>]] [<katalog>]"
 
-#: builtin/init-db.c:544
 msgid "permissions"
 msgstr "behörigheter"
 
-#: builtin/init-db.c:545
 msgid "specify that the git repository is to be shared amongst several users"
 msgstr "ange att git-arkivet ska delas bland flera användare"
 
-#: builtin/init-db.c:551
 msgid "override the name of the initial branch"
 msgstr "överstyr namnet på första gren"
 
-#: builtin/init-db.c:552 builtin/verify-pack.c:74
 msgid "hash"
 msgstr "hash"
 
-#: builtin/init-db.c:553 builtin/show-index.c:22 builtin/verify-pack.c:75
 msgid "specify the hash algorithm to use"
 msgstr "ange hashningsalgoritm att använda"
 
-#: builtin/init-db.c:591 builtin/init-db.c:596
 #, c-format
 msgid "cannot mkdir %s"
 msgstr "kan inte skapa katalogen (mkdir) %s"
 
-#: builtin/init-db.c:600 builtin/init-db.c:655
 #, c-format
 msgid "cannot chdir to %s"
 msgstr "kan inte byta katalog (chdir) till %s"
 
-#: builtin/init-db.c:627
 #, c-format
 msgid ""
 "%s (or --work-tree=<directory>) not allowed without specifying %s (or --git-"
@@ -17420,16 +7161,13 @@ msgstr ""
 "%s (eller --work-tree=<katalog>) inte tillåtet utan att ange %s (eller --git-"
 "dir=<katalog>)"
 
-#: builtin/init-db.c:679
 #, c-format
 msgid "Cannot access work tree '%s'"
 msgstr "Kan inte komma åt arbetskatalogen \"%s\""
 
-#: builtin/init-db.c:684
 msgid "--separate-git-dir incompatible with bare repository"
 msgstr "--separate-git-dir är inkompatibelt med naket arkiv"
 
-#: builtin/interpret-trailers.c:16
 msgid ""
 "git interpret-trailers [--in-place] [--trim-empty] [(--trailer "
 "<token>[(=|:)<value>])...] [<file>...]"
@@ -17437,92 +7175,73 @@ msgstr ""
 "git interpret-trailers [--in-place] [--trim-empty] [(--trailer "
 "<symbol>[(=|:)<värde>])...] [<fil>...]"
 
-#: builtin/interpret-trailers.c:95
 msgid "edit files in place"
 msgstr "redigera filer på plats"
 
-#: builtin/interpret-trailers.c:96
 msgid "trim empty trailers"
 msgstr "ta bort tomma släprader"
 
-#: builtin/interpret-trailers.c:99
 msgid "where to place the new trailer"
 msgstr "var nya släprader ska placeras"
 
-#: builtin/interpret-trailers.c:101
 msgid "action if trailer already exists"
 msgstr "att göra om släprader redan finns"
 
-#: builtin/interpret-trailers.c:103
 msgid "action if trailer is missing"
 msgstr "att göra om släprader saknas"
 
-#: builtin/interpret-trailers.c:105
 msgid "output only the trailers"
 msgstr "visa endast släprader"
 
-#: builtin/interpret-trailers.c:106
 msgid "do not apply config rules"
 msgstr "använd inte regler från konfigurationen"
 
-#: builtin/interpret-trailers.c:107
 msgid "join whitespace-continued values"
 msgstr "slå ihop värden avdelade med blanksteg"
 
-#: builtin/interpret-trailers.c:108
 msgid "set parsing options"
 msgstr "välj tolkningsalternativ"
 
-#: builtin/interpret-trailers.c:110
 msgid "do not treat --- specially"
 msgstr "tolka inte --- speciellt"
 
-#: builtin/interpret-trailers.c:112
 msgid "trailer(s) to add"
 msgstr "släprad(er) att lägga till"
 
-#: builtin/interpret-trailers.c:123
 msgid "--trailer with --only-input does not make sense"
 msgstr "--trailer med --only-input ger ingen mening"
 
-#: builtin/interpret-trailers.c:133
 msgid "no input file given for in-place editing"
 msgstr "ingen indatafil angiven för redigering på plats"
 
-#: builtin/log.c:60
 msgid "git log [<options>] [<revision-range>] [[--] <path>...]"
 msgstr "git log [<flaggor>] [<versionsintervall>] [[--] <sökväg>...]"
 
-#: builtin/log.c:61
 msgid "git show [<options>] <object>..."
 msgstr "git show [<flaggor>] <objekt>..."
 
-#: builtin/log.c:114
 #, c-format
 msgid "invalid --decorate option: %s"
 msgstr "ogiltig flagga för --decorate: %s"
 
-#: builtin/log.c:181
+msgid "suppress diff output"
+msgstr "undertryck diff-utdata"
+
 msgid "show source"
 msgstr "visa källkod"
 
-#: builtin/log.c:182
 msgid "use mail map file"
 msgstr "använd e-postmappningsfil"
 
-#: builtin/log.c:185
 msgid "only decorate refs that match <pattern>"
 msgstr "dekorera endast referenser som motsvarar <mönster>"
 
-#: builtin/log.c:187
 msgid "do not decorate refs that match <pattern>"
 msgstr "dekorera inte referenser som motsvarar <mönster>"
 
-#: builtin/log.c:188
 msgid "decorate options"
 msgstr "dekoreringsflaggor"
 
-#: builtin/log.c:191
 msgid ""
 "trace the evolution of line range <start>,<end> or function :<funcname> in "
 "<file>"
@@ -17530,93 +7249,76 @@ msgstr ""
 "spåra utvecklingen av radintervallet <start>,<slut> eller funktionen :"
 "<funknamn> i <fil>"
 
-#: builtin/log.c:214
+#, c-format
+msgid "unrecognized argument: %s"
+msgstr "okänt argument: %s"
+
 msgid "-L<range>:<file> cannot be used with pathspec"
 msgstr "-L<intervall>:<fil> kan inte användas med sökvägsspecifikation"
 
-#: builtin/log.c:322
 #, c-format
 msgid "Final output: %d %s\n"
 msgstr "Slututdata: %d %s\n"
 
-#: builtin/log.c:429
 msgid "unable to create temporary object directory"
 msgstr "kunde inte skapa temporär objektkatalog"
 
-#: builtin/log.c:599
 #, c-format
 msgid "git show %s: bad file"
 msgstr "git show %s: felaktig fil"
 
-#: builtin/log.c:614 builtin/log.c:706
 #, c-format
 msgid "could not read object %s"
 msgstr "kunde inte läsa objektet %s"
 
-#: builtin/log.c:731
 #, c-format
 msgid "unknown type: %d"
 msgstr "okänd typ: %d"
 
-#: builtin/log.c:880
 #, c-format
 msgid "%s: invalid cover from description mode"
 msgstr "%s: ogiltigt omslag från beskrivningsläge"
 
-#: builtin/log.c:887
 msgid "format.headers without value"
 msgstr "format.headers utan värde"
 
-#: builtin/log.c:1016
 #, c-format
 msgid "cannot open patch file %s"
 msgstr "kan inte öppna patchfilen %s"
 
-#: builtin/log.c:1033
 msgid "need exactly one range"
 msgstr "behöver precis ett intervall"
 
-#: builtin/log.c:1043
 msgid "not a range"
 msgstr "inte ett intervall"
 
-#: builtin/log.c:1207
 msgid "cover letter needs email format"
 msgstr "omslagsbrevet behöver e-postformat"
 
-#: builtin/log.c:1213
 msgid "failed to create cover-letter file"
 msgstr "misslyckades skapa fil för omslagsbrev"
 
-#: builtin/log.c:1300
 #, c-format
 msgid "insane in-reply-to: %s"
 msgstr "tokigt in-reply-to: %s"
 
-#: builtin/log.c:1327
 msgid "git format-patch [<options>] [<since> | <revision-range>]"
 msgstr "git format-patch [<flaggor>] [<sedan> | <revisionsintervall>]"
 
-#: builtin/log.c:1385
 msgid "two output directories?"
 msgstr "två utdatakataloger?"
 
-#: builtin/log.c:1536 builtin/log.c:2369 builtin/log.c:2371 builtin/log.c:2383
 #, c-format
 msgid "unknown commit %s"
 msgstr "okänd incheckning %s"
 
-#: builtin/log.c:1547 builtin/replace.c:58 builtin/replace.c:207
-#: builtin/replace.c:210
 #, c-format
 msgid "failed to resolve '%s' as a valid ref"
 msgstr "misslyckades slå upp \"%s\" som en giltig referens"
 
-#: builtin/log.c:1556
 msgid "could not find exact merge base"
 msgstr "kunde inte hitta exakt sammanslagningsbas"
 
-#: builtin/log.c:1566
 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"
@@ -17626,394 +7328,302 @@ msgstr ""
 "använd git branch --set-upstream-to för att spåra en fjärrgren.\n"
 "Eller så kan du ange basincheckning med --base=<bas-inchecknings-id> manuellt"
 
-#: builtin/log.c:1589
 msgid "failed to find exact merge base"
 msgstr "kunde inte hitta exakt sammanslagningsbas"
 
-#: builtin/log.c:1606
 msgid "base commit should be the ancestor of revision list"
 msgstr "basincheckningen bör vara förfader till revisionslistan"
 
-#: builtin/log.c:1616
 msgid "base commit shouldn't be in revision list"
 msgstr "basincheckningen bör inte vara i revisionslistan"
 
-#: builtin/log.c:1674
 msgid "cannot get patch id"
 msgstr "kan inte hämta patch-id"
 
-#: builtin/log.c:1737
 msgid "failed to infer range-diff origin of current series"
 msgstr "misslyckades räkna ut intervalldiff-ursprung för aktuell serie"
 
-#: builtin/log.c:1739
 #, c-format
 msgid "using '%s' as range-diff origin of current series"
 msgstr "använd \"%s\" som intervalldiff-ursprung för aktuell serie"
 
-#: builtin/log.c:1783
 msgid "use [PATCH n/m] even with a single patch"
 msgstr "använd [PATCH n/m] även för en ensam patch"
 
-#: builtin/log.c:1786
 msgid "use [PATCH] even with multiple patches"
 msgstr "använd [PATCH] även för flera patchar"
 
-#: builtin/log.c:1790
 msgid "print patches to standard out"
 msgstr "skriv patcharna på standard ut"
 
-#: builtin/log.c:1792
 msgid "generate a cover letter"
 msgstr "generera ett följebrev"
 
-#: builtin/log.c:1794
 msgid "use simple number sequence for output file names"
 msgstr "använd enkel nummersekvens för utdatafilnamn"
 
-#: builtin/log.c:1795
 msgid "sfx"
 msgstr "sfx"
 
-#: builtin/log.c:1796
 msgid "use <sfx> instead of '.patch'"
 msgstr "använd <sfx> istället för \".patch\""
 
-#: builtin/log.c:1798
 msgid "start numbering patches at <n> instead of 1"
 msgstr "börja numrera patchar på <n> istället för 1"
 
-#: builtin/log.c:1799
 msgid "reroll-count"
 msgstr "antal iterationer"
 
-#: builtin/log.c:1800
 msgid "mark the series as Nth re-roll"
 msgstr "markera serien som N:te försök"
 
-#: builtin/log.c:1802
 msgid "max length of output filename"
 msgstr "maximal längd för utdatafilnamn"
 
-#: builtin/log.c:1804
 msgid "use [RFC PATCH] instead of [PATCH]"
 msgstr "använd [RFC PATCH] istället för [PATCH]"
 
-#: builtin/log.c:1807
 msgid "cover-from-description-mode"
 msgstr "cover-from-description-läge"
 
-#: builtin/log.c:1808
 msgid "generate parts of a cover letter based on a branch's description"
 msgstr "skapa delar av omslagsbrevet baserat på grenbeskrivelsen"
 
-#: builtin/log.c:1810
 msgid "use [<prefix>] instead of [PATCH]"
 msgstr "använd [<prefix>] istället för [PATCH]"
 
-#: builtin/log.c:1813
 msgid "store resulting files in <dir>"
 msgstr "spara filerna i <katalog>"
 
-#: builtin/log.c:1816
 msgid "don't strip/add [PATCH]"
 msgstr "ta inte bort eller lägg till [PATCH]"
 
-#: builtin/log.c:1819
 msgid "don't output binary diffs"
 msgstr "skriv inte binära diffar"
 
-#: builtin/log.c:1821
 msgid "output all-zero hash in From header"
 msgstr "använd hashvärde med nollor i From-huvud"
 
-#: builtin/log.c:1823
 msgid "don't include a patch matching a commit upstream"
 msgstr "ta inte med patchar som motsvarar en uppströmsincheckning"
 
-#: builtin/log.c:1825
 msgid "show patch format instead of default (patch + stat)"
 msgstr "visa patchformat istället för standard (patch + stat)"
 
-#: builtin/log.c:1827
 msgid "Messaging"
 msgstr "E-post"
 
-#: builtin/log.c:1828
 msgid "header"
 msgstr "huvud"
 
-#: builtin/log.c:1829
 msgid "add email header"
 msgstr "lägg till e-posthuvud"
 
-#: builtin/log.c:1830 builtin/log.c:1831
 msgid "email"
 msgstr "epost"
 
-#: builtin/log.c:1830
 msgid "add To: header"
 msgstr "lägg till mottagarhuvud (\"To:\")"
 
-#: builtin/log.c:1831
 msgid "add Cc: header"
 msgstr "lägg till kopiehuvud (\"Cc:\")"
 
-#: builtin/log.c:1832
 msgid "ident"
 msgstr "ident"
 
-#: builtin/log.c:1833
 msgid "set From address to <ident> (or committer ident if absent)"
 msgstr "sätt Från-adress till <ident> (eller incheckare om ident saknas)"
 
-#: builtin/log.c:1835
 msgid "message-id"
 msgstr "meddelande-id"
 
-#: builtin/log.c:1836
 msgid "make first mail a reply to <message-id>"
 msgstr "gör det första brevet ett svar till <meddelande-id>"
 
-#: builtin/log.c:1837 builtin/log.c:1840
 msgid "boundary"
 msgstr "gräns"
 
-#: builtin/log.c:1838
 msgid "attach the patch"
 msgstr "bifoga patchen"
 
-#: builtin/log.c:1841
 msgid "inline the patch"
 msgstr "gör patchen ett inline-objekt"
 
-#: builtin/log.c:1845
 msgid "enable message threading, styles: shallow, deep"
 msgstr "aktivera brevtrådning, typer: shallow, deep"
 
-#: builtin/log.c:1847
 msgid "signature"
 msgstr "signatur"
 
-#: builtin/log.c:1848
 msgid "add a signature"
 msgstr "lägg till signatur"
 
-#: builtin/log.c:1849
 msgid "base-commit"
 msgstr "basincheckning"
 
-#: builtin/log.c:1850
 msgid "add prerequisite tree info to the patch series"
 msgstr "lägg till förhandskrävd trädinfo i patchserien"
 
-#: builtin/log.c:1853
 msgid "add a signature from a file"
 msgstr "lägg till signatur från fil"
 
-#: builtin/log.c:1854
 msgid "don't print the patch filenames"
 msgstr "visa inte filnamn för patchar"
 
-#: builtin/log.c:1856
 msgid "show progress while generating patches"
 msgstr "visa förloppsindikator medan patchar skapas"
 
-#: builtin/log.c:1858
 msgid "show changes against <rev> in cover letter or single patch"
 msgstr "visa ändringar mot <rev> i omslagsbrev eller ensam patch"
 
-#: builtin/log.c:1861
 msgid "show changes against <refspec> in cover letter or single patch"
 msgstr "visa ändringar mot <refspec> i omslagsbrev eller ensam patch"
 
-#: builtin/log.c:1863 builtin/range-diff.c:28
 msgid "percentage by which creation is weighted"
 msgstr "procent som skapelse vägs med"
 
-#: builtin/log.c:1953
 #, c-format
 msgid "invalid ident line: %s"
 msgstr "ogiltig ident-rad: %s"
 
-#: builtin/log.c:1978
 msgid "--name-only does not make sense"
 msgstr "kan inte använda --name-only"
 
-#: builtin/log.c:1980
 msgid "--name-status does not make sense"
 msgstr "kan inte använda --name-status"
 
-#: builtin/log.c:1982
 msgid "--check does not make sense"
 msgstr "kan inte använda --check"
 
-#: builtin/log.c:1984
 msgid "--remerge-diff does not make sense"
 msgstr "kan inte använda --remerge-diff"
 
-#: builtin/log.c:2129
+#, c-format
+msgid "could not create directory '%s'"
+msgstr "kunde inte skapa katalogen \"%s\""
+
 msgid "--interdiff requires --cover-letter or single patch"
 msgstr "--interdiff kräver --cover-letter eller ensam patch"
 
-#: builtin/log.c:2133
 msgid "Interdiff:"
 msgstr "Interdiff:"
 
-#: builtin/log.c:2134
 #, c-format
 msgid "Interdiff against v%d:"
 msgstr "Interdiff mot v%d:"
 
-#: builtin/log.c:2144
 msgid "--range-diff requires --cover-letter or single patch"
 msgstr "--range-diff kräver --cover-letter eller ensam patch"
 
-#: builtin/log.c:2152
 msgid "Range-diff:"
 msgstr "Intervall-diff:"
 
-#: builtin/log.c:2153
 #, c-format
 msgid "Range-diff against v%d:"
 msgstr "Intervall-diff mot v%d:"
 
-#: builtin/log.c:2164
 #, c-format
 msgid "unable to read signature file '%s'"
 msgstr "kunde inte läsa signaturfil \"%s\""
 
-#: builtin/log.c:2200
 msgid "Generating patches"
 msgstr "Skapar patchar"
 
-#: builtin/log.c:2244
 msgid "failed to create output files"
 msgstr "misslyckades skapa utdatafiler"
 
-#: builtin/log.c:2304
 msgid "git cherry [-v] [<upstream> [<head> [<limit>]]]"
 msgstr "git cherry [-v] [<uppström> [<huvud> [<gräns>]]]"
 
-#: builtin/log.c:2358
 #, c-format
 msgid ""
 "Could not find a tracked remote branch, please specify <upstream> manually.\n"
 msgstr "Kunde inte hitta en spårad fjärrgren, ange <uppström> manuellt.\n"
 
-#: builtin/ls-files.c:564
 msgid "git ls-files [<options>] [<file>...]"
 msgstr "git ls-files [<flaggor>] [<fil>...]"
 
-#: builtin/ls-files.c:618
 msgid "separate paths with the NUL character"
 msgstr "sökvägar avdelas med NUL-tecken"
 
-#: builtin/ls-files.c:620
 msgid "identify the file status with tags"
 msgstr "identifiera filstatus med taggar"
 
-#: builtin/ls-files.c:622
 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:624
 msgid "use lowercase letters for 'fsmonitor clean' files"
 msgstr "använd små bokstäver för \"fsmonitor clean\"-filer"
 
-#: builtin/ls-files.c:626
 msgid "show cached files in the output (default)"
 msgstr "visa cachade filer i utdata (standard)"
 
-#: builtin/ls-files.c:628
 msgid "show deleted files in the output"
 msgstr "visa borttagna filer i utdata"
 
-#: builtin/ls-files.c:630
 msgid "show modified files in the output"
 msgstr "visa modifierade filer i utdata"
 
-#: builtin/ls-files.c:632
 msgid "show other files in the output"
 msgstr "visa andra filer i utdata"
 
-#: builtin/ls-files.c:634
 msgid "show ignored files in the output"
 msgstr "visa ignorerade filer i utdata"
 
-#: builtin/ls-files.c:637
 msgid "show staged contents' object name in the output"
 msgstr "visa köat innehålls objektnamn i utdata"
 
-#: builtin/ls-files.c:639
 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:641
 msgid "show 'other' directories' names only"
 msgstr "visa endast namn för \"andra\" kataloger"
 
-#: builtin/ls-files.c:643
 msgid "show line endings of files"
 msgstr "visa radslut i filer"
 
-#: builtin/ls-files.c:645
 msgid "don't show empty directories"
 msgstr "visa inte tomma kataloger"
 
-#: builtin/ls-files.c:648
 msgid "show unmerged files in the output"
 msgstr "visa ej sammanslagna filer i utdata"
 
-#: builtin/ls-files.c:650
 msgid "show resolve-undo information"
 msgstr "visa \"resolve-undo\"-information"
 
-#: builtin/ls-files.c:652
 msgid "skip files matching pattern"
 msgstr "hoppa över filer som motsvarar mönster"
 
-#: builtin/ls-files.c:655
 msgid "read exclude patterns from <file>"
 msgstr "läs exkluderingsmönster från <fil>"
 
-#: builtin/ls-files.c:658
 msgid "read additional per-directory exclude patterns in <file>"
 msgstr "läs ytterligare per-katalog-exkluderingsmönster från <fil>"
 
-#: builtin/ls-files.c:660
 msgid "add the standard git exclusions"
 msgstr "lägg till git:s standardexkluderingar"
 
-#: builtin/ls-files.c:664
 msgid "make the output relative to the project top directory"
 msgstr "gör utdata relativ till projektets toppkatalog"
 
-#: builtin/ls-files.c:669
 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:670
 msgid "tree-ish"
 msgstr "träd-igt"
 
-#: builtin/ls-files.c:671
 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:673
 msgid "show debugging data"
 msgstr "visa felsökningsutdata"
 
-#: builtin/ls-files.c:675
 msgid "suppress duplicate entries"
 msgstr "undertyck dublettposter"
 
-#: builtin/ls-files.c:677
 msgid "show sparse directories in the presence of a sparse index"
 msgstr "visa glesa kataloger när et glest index existerar"
 
-#: builtin/ls-remote.c:9
 msgid ""
 "git ls-remote [--heads] [--tags] [--refs] [--upload-pack=<exec>]\n"
 "              [-q | --quiet] [--exit-code] [--get-url]\n"
@@ -18023,205 +7633,156 @@ msgstr ""
 "              [-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:1131
 msgid "exec"
 msgstr "exec"
 
-#: builtin/ls-remote.c:62 builtin/ls-remote.c:64
 msgid "path of git-upload-pack on the remote host"
 msgstr "sökväg till git-upload-pack på fjärren"
 
-#: builtin/ls-remote.c:66
 msgid "limit to tags"
 msgstr "begränsa till taggar"
 
-#: builtin/ls-remote.c:67
 msgid "limit to heads"
 msgstr "begränsa till huvuden"
 
-#: builtin/ls-remote.c:68
 msgid "do not show peeled tags"
 msgstr "visa inte avskalade taggar"
 
-#: builtin/ls-remote.c:70
 msgid "take url.<base>.insteadOf into account"
 msgstr "ta hänsyn till url.<bas>.insteadOf"
 
-#: builtin/ls-remote.c:73
 msgid "exit with exit code 2 if no matching refs are found"
 msgstr "avsluta med felkod 2 om motsvarande referenser inte hittas"
 
-#: builtin/ls-remote.c:76
 msgid "show underlying ref in addition to the object pointed by it"
 msgstr "visa underliggande referens och objektet det pekar på"
 
-#: builtin/ls-tree.c:36
 msgid "git ls-tree [<options>] <tree-ish> [<path>...]"
 msgstr "git ls-tree [<flaggor>] <träd-igt> [<sökväg>...]"
 
-#: builtin/ls-tree.c:54
 #, c-format
 msgid "could not get object info about '%s'"
 msgstr "kunde inte hämta objektinfo om \"%s\""
 
-#: builtin/ls-tree.c:79
 #, c-format
 msgid "bad ls-tree format: element '%s' does not start with '('"
 msgstr "felaktigt ls-tree-format: elementet \"%s\" börjar inte med \"(\""
 
-#: builtin/ls-tree.c:83
 #, c-format
 msgid "bad ls-tree format: element '%s' does not end in ')'"
 msgstr "felaktigt ls-tree-format: elementet \"%s\" slutar inte med \")\""
 
-#: builtin/ls-tree.c:109
 #, c-format
 msgid "bad ls-tree format: %%%.*s"
 msgstr "felaktigt ls-tree-format: %%%.*s"
 
-#: builtin/ls-tree.c:336
 msgid "only show trees"
 msgstr "visa endast träd"
 
-#: builtin/ls-tree.c:338
 msgid "recurse into subtrees"
 msgstr "rekursera ner i underträd"
 
-#: builtin/ls-tree.c:340
 msgid "show trees when recursing"
 msgstr "visa träd medan rekursering"
 
-#: builtin/ls-tree.c:343
 msgid "terminate entries with NUL byte"
 msgstr "terminera poster med NUL-byte"
 
-#: builtin/ls-tree.c:344
 msgid "include object size"
 msgstr "ta med objektstorlek"
 
-#: builtin/ls-tree.c:346 builtin/ls-tree.c:348
 msgid "list only filenames"
 msgstr "visa endast filnamn"
 
-#: builtin/ls-tree.c:350
 msgid "list only objects"
 msgstr "lista endast objekt"
 
-#: builtin/ls-tree.c:353
 msgid "use full path names"
 msgstr "använd fullständiga sökvägsnamn"
 
-#: builtin/ls-tree.c:355
 msgid "list entire tree; not just current directory (implies --full-name)"
 msgstr "visa hela trädet; inte bara aktuell katalog (implicerar --full-name)"
 
-#: builtin/ls-tree.c:391
 msgid "--format can't be combined with other format-altering options"
 msgstr "--format kan inte kombineras med andra formatändrande flaggor"
 
 #. TRANSLATORS: keep <> in "<" mail ">" info.
-#: builtin/mailinfo.c:14
 msgid "git mailinfo [<options>] <msg> <patch> < mail >info"
 msgstr "git mailinfo [<flaggor>] <meddelande> <patch> < epost >info"
 
-#: builtin/mailinfo.c:58
 msgid "keep subject"
 msgstr "behåll ärenderad"
 
-#: builtin/mailinfo.c:60
 msgid "keep non patch brackets in subject"
 msgstr "behåll hakparanterser som inte är \"patch\" i ärenderaden"
 
-#: builtin/mailinfo.c:62
 msgid "copy Message-ID to the end of commit message"
 msgstr "kopiera Message-ID till slutet av incheckningsmeddelandet"
 
-#: builtin/mailinfo.c:64
 msgid "re-code metadata to i18n.commitEncoding"
 msgstr "koda om metadata till i18n.commitEncoding"
 
-#: builtin/mailinfo.c:67
 msgid "disable charset re-coding of metadata"
 msgstr "inaktivera omkodning av metadata"
 
-#: builtin/mailinfo.c:69
 msgid "encoding"
 msgstr "teckenkodning"
 
-#: builtin/mailinfo.c:70
 msgid "re-code metadata to this encoding"
 msgstr "omkoda metadata till denna teckenkodning"
 
-#: builtin/mailinfo.c:72
 msgid "use scissors"
 msgstr "använd saxar"
 
-#: builtin/mailinfo.c:73
 msgid "<action>"
 msgstr "<åtgärd>"
 
-#: builtin/mailinfo.c:74
 msgid "action when quoted CR is found"
 msgstr "åtgärd när citerad vagnretur hittas"
 
-#: builtin/mailinfo.c:77
 msgid "use headers in message's body"
 msgstr "använd huvuden i brevkroppen"
 
-#: builtin/mailsplit.c:227
 msgid "reading patches from stdin/tty..."
 msgstr "läser patchar från standard in/tty..."
 
-#: builtin/mailsplit.c:242
 #, c-format
 msgid "empty mbox: '%s'"
 msgstr "tom mbox: \"%s\""
 
-#: builtin/merge-base.c:32
 msgid "git merge-base [-a | --all] <commit> <commit>..."
 msgstr "git merge-base [-a | --all] <incheckning> <incheckning>..."
 
-#: builtin/merge-base.c:33
 msgid "git merge-base [-a | --all] --octopus <commit>..."
 msgstr "git merge-base [-a | --all] --octopus <incheckning>..."
 
-#: builtin/merge-base.c:34
 msgid "git merge-base --independent <commit>..."
 msgstr "git merge-base --independent <incheckning>..."
 
-#: builtin/merge-base.c:35
 msgid "git merge-base --is-ancestor <commit> <commit>"
 msgstr "git merge-base --is-ancestor <incheckning> <incheckning>"
 
-#: builtin/merge-base.c:36
 msgid "git merge-base --fork-point <ref> [<commit>]"
 msgstr "git merge-base --fork-point <ref> [<incheckning>]"
 
-#: builtin/merge-base.c:144
 msgid "output all common ancestors"
 msgstr "skriv ut alla gemensamma anfäder"
 
-#: builtin/merge-base.c:146
 msgid "find ancestors for a single n-way merge"
 msgstr "hitta anfader för enkel n-vägssammanslagning"
 
-#: builtin/merge-base.c:148
 msgid "list revs not reachable from others"
 msgstr "visa revisioner som inte kan nås från andra"
 
-#: builtin/merge-base.c:150
 msgid "is the first one ancestor of the other?"
 msgstr "är den första anfader till den andra?"
 
-#: builtin/merge-base.c:152
 msgid "find where <commit> forked from reflog of <ref>"
 msgstr "se var <incheckning> grenades av från referensloggen från <ref>"
 
-#: builtin/merge-file.c:9
 msgid ""
 "git merge-file [<options>] [-L <name1> [-L <orig> [-L <name2>]]] <file1> "
 "<orig-file> <file2>"
@@ -18229,255 +7790,203 @@ msgstr ""
 "git merge-file [<alternativ>] [-L <namn1> [-L <orig> [-L <namn2>]]] <fil1> "
 "<origfil> <fil2>"
 
-#: builtin/merge-file.c:35
 msgid "send results to standard output"
 msgstr "sänd resultat till standard ut"
 
-#: builtin/merge-file.c:36
 msgid "use a diff3 based merge"
 msgstr "använd diff3-baserad sammanslagning"
 
-#: builtin/merge-file.c:37
 msgid "use a zealous diff3 based merge"
 msgstr "använd nitisk diff3-baserad sammanslagning"
 
-#: builtin/merge-file.c:39
 msgid "for conflicts, use our version"
 msgstr "för konflikter, använd vår version"
 
-#: builtin/merge-file.c:41
 msgid "for conflicts, use their version"
 msgstr "för konflikter, använd deras version"
 
-#: builtin/merge-file.c:43
 msgid "for conflicts, use a union version"
 msgstr "för konflikter, använd en förenad version"
 
-#: builtin/merge-file.c:46
 msgid "for conflicts, use this marker size"
 msgstr "för konflikter, använd denna markörstorlek"
 
-#: builtin/merge-file.c:47
 msgid "do not warn about conflicts"
 msgstr "varna inte om konflikter"
 
-#: builtin/merge-file.c:49
 msgid "set labels for file1/orig-file/file2"
 msgstr "sätt etiketter för fil1/origfil/fil2"
 
-#: builtin/merge-recursive.c:47
 #, c-format
 msgid "unknown option %s"
 msgstr "okänd flagga %s"
 
-#: builtin/merge-recursive.c:53
 #, c-format
 msgid "could not parse object '%s'"
 msgstr "kunde inte tolka objektet \"%s\""
 
-#: builtin/merge-recursive.c:57
 #, c-format
 msgid "cannot handle more than %d base. Ignoring %s."
 msgid_plural "cannot handle more than %d bases. Ignoring %s."
 msgstr[0] "kan inte hantera mer än %d bas. Ignorerar %s."
 msgstr[1] "kan inte hantera mer än %d baser. Ignorerar %s."
 
-#: builtin/merge-recursive.c:65
 msgid "not handling anything other than two heads merge."
 msgstr "hanterar inte något annat än en sammanslagning av två huvuden."
 
-#: builtin/merge-recursive.c:74 builtin/merge-recursive.c:76
 #, c-format
 msgid "could not resolve ref '%s'"
 msgstr "kunde inte bestämma referensen \"%s\""
 
-#: builtin/merge-recursive.c:82
 #, c-format
 msgid "Merging %s with %s\n"
 msgstr "Slår ihop %s med %s\n"
 
-#: builtin/merge.c:59
 msgid "git merge [<options>] [<commit>...]"
 msgstr "git merge [<flaggor>] [<incheckning>...]"
 
-#: builtin/merge.c:125
 msgid "switch `m' requires a value"
 msgstr "flaggan \"m\" behöver ett värde"
 
-#: builtin/merge.c:148
 #, c-format
 msgid "option `%s' requires a value"
 msgstr "flaggan \"%s\" behöver ett värde"
 
-#: builtin/merge.c:201
 #, c-format
 msgid "Could not find merge strategy '%s'.\n"
 msgstr "Kunde inte hitta sammanslagningsstrategin \"%s\".\n"
 
-#: builtin/merge.c:202
 #, c-format
 msgid "Available strategies are:"
 msgstr "Tillgängliga strategier är:"
 
-#: builtin/merge.c:207
 #, c-format
 msgid "Available custom strategies are:"
 msgstr "Tillgängliga skräddarsydda strategier är:"
 
-#: builtin/merge.c:258 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:261 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:262 builtin/pull.c:140
 msgid "(synonym to --stat)"
 msgstr "(synonym till --stat)"
 
-#: builtin/merge.c:264 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:267 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:269 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:271 builtin/pull.c:155
 msgid "edit message before committing"
 msgstr "redigera meddelande innan incheckning"
 
-#: builtin/merge.c:273
 msgid "allow fast-forward (default)"
 msgstr "tillåt snabbspolning (standard)"
 
-#: builtin/merge.c:275 builtin/pull.c:162
 msgid "abort if fast-forward is not possible"
 msgstr "avbryt om snabbspolning inte är möjlig"
 
-#: builtin/merge.c:279 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:280 builtin/notes.c:785 builtin/pull.c:172
-#: builtin/rebase.c:1145 builtin/revert.c:114
 msgid "strategy"
 msgstr "strategi"
 
-#: builtin/merge.c:281 builtin/pull.c:173
 msgid "merge strategy to use"
 msgstr "sammanslagningsstrategi att använda"
 
-#: builtin/merge.c:282 builtin/pull.c:176
 msgid "option=value"
 msgstr "alternativ=värde"
 
-#: builtin/merge.c:283 builtin/pull.c:177
 msgid "option for selected merge strategy"
 msgstr "alternativ för vald sammanslagningsstrategi"
 
-#: builtin/merge.c:285
 msgid "merge commit message (for a non-fast-forward merge)"
 msgstr "incheckningsmeddelande för (icke snabbspolande) sammanslagning"
 
-#: builtin/merge.c:291
 msgid "use <name> instead of the real target"
 msgstr "använd <namn> istället för det verkliga målet"
 
-#: builtin/merge.c:294
 msgid "abort the current in-progress merge"
 msgstr "avbryt den pågående sammanslagningen"
 
-#: builtin/merge.c:296
 msgid "--abort but leave index and working tree alone"
 msgstr "--abort men lämna index och arbetskatalog ensamma"
 
-#: builtin/merge.c:298
 msgid "continue the current in-progress merge"
 msgstr "fortsätt den pågående sammanslagningen"
 
-#: builtin/merge.c:300 builtin/pull.c:184
 msgid "allow merging unrelated histories"
 msgstr "tillåt sammanslagning av orelaterade historier"
 
-#: builtin/merge.c:307
 msgid "bypass pre-merge-commit and commit-msg hooks"
 msgstr "förbigå pre-merge-commit- och commit-msg-krokar"
 
-#: builtin/merge.c:323
 msgid "could not run stash."
 msgstr "kunde köra stash."
 
-#: builtin/merge.c:328
 msgid "stash failed"
 msgstr "stash misslyckades"
 
-#: builtin/merge.c:333
 #, c-format
 msgid "not a valid object: %s"
 msgstr "inte ett giltigt objekt: %s"
 
-#: builtin/merge.c:355 builtin/merge.c:372
 msgid "read-tree failed"
 msgstr "read-tree misslyckades"
 
-#: builtin/merge.c:403
 msgid "Already up to date. (nothing to squash)"
 msgstr "Redan à jour. (inget att platta till)"
 
-#: builtin/merge.c:417
+msgid "Already up to date."
+msgstr "Redan à jour."
+
 #, c-format
 msgid "Squash commit -- not updating HEAD\n"
 msgstr "Tillplattningsincheckning -- uppdaterar inte HEAD\n"
 
-#: builtin/merge.c:467
 #, c-format
 msgid "No merge message -- not updating HEAD\n"
 msgstr "Inget sammanslagningsmeddelande -- uppdaterar inte HEAD\n"
 
-#: builtin/merge.c:517
 #, c-format
 msgid "'%s' does not point to a commit"
 msgstr "\"%s\" verkar inte peka på en incheckning"
 
-#: builtin/merge.c:605
 #, c-format
 msgid "Bad branch.%s.mergeoptions string: %s"
 msgstr "Felaktig branch.%s.mergeoptions-sträng: %s"
 
-#: builtin/merge.c:732
+msgid "Unable to write index."
+msgstr "Kunde inte skriva indexet."
+
 msgid "Not handling anything other than two heads merge."
 msgstr "Hanterar inte något annat än en sammanslagning av två huvuden."
 
-#: builtin/merge.c:745
 #, c-format
 msgid "unknown strategy option: -X%s"
 msgstr "okänd strategiflagga: -X%s"
 
-#: builtin/merge.c:764 t/helper/test-fast-rebase.c:223
 #, c-format
 msgid "unable to write %s"
 msgstr "kunde inte skriva %s"
 
-#: builtin/merge.c:816
 #, c-format
 msgid "Could not read from '%s'"
 msgstr "Kunde inte läsa från \"%s\""
 
-#: builtin/merge.c:825
 #, 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:831
 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"
@@ -18488,11 +7997,9 @@ msgstr ""
 "temagren.\n"
 "\n"
 
-#: builtin/merge.c:836
 msgid "An empty message aborts the commit.\n"
 msgstr "Ett tomt meddelande avbryter incheckningen.\n"
 
-#: builtin/merge.c:839
 #, c-format
 msgid ""
 "Lines starting with '%c' will be ignored, and an empty message aborts\n"
@@ -18501,73 +8008,61 @@ msgstr ""
 "Rader som inleds med \"%c\" kommer ignoreras, och ett tomt meddelande\n"
 "avbryter incheckningen.\n"
 
-#: builtin/merge.c:900
 msgid "Empty commit message."
 msgstr "Tomt incheckningsmeddelande."
 
-#: builtin/merge.c:915
 #, c-format
 msgid "Wonderful.\n"
 msgstr "Underbart.\n"
 
-#: builtin/merge.c:976
 #, 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:1015
 msgid "No current branch."
 msgstr "Inte på någon gren."
 
-#: builtin/merge.c:1017
 msgid "No remote for the current branch."
 msgstr "Ingen fjärr för aktuell gren."
 
-#: builtin/merge.c:1019
 msgid "No default upstream defined for the current branch."
 msgstr "Ingen standarduppström angiven för aktuell gren."
 
-#: builtin/merge.c:1024
 #, 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:1081
 #, c-format
 msgid "Bad value '%s' in environment '%s'"
 msgstr "Felaktigt värde \"%s\" i miljövariabeln \"%s\""
 
-#: builtin/merge.c:1183
+#, c-format
+msgid "could not close '%s'"
+msgstr "kunde inte stänga \"%s\""
+
 #, 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:1217
 msgid "not something we can merge"
 msgstr "inte något vi kan slå ihop"
 
-#: builtin/merge.c:1330
 msgid "--abort expects no arguments"
 msgstr "--abort tar inga argument"
 
-#: builtin/merge.c:1334
 msgid "There is no merge to abort (MERGE_HEAD missing)."
 msgstr "Ingen sammanslagning att avbryta (MERGE_HEAD saknas)."
 
-#: builtin/merge.c:1352
 msgid "--quit expects no arguments"
 msgstr "--quit tar inga argument"
 
-#: builtin/merge.c:1365
 msgid "--continue expects no arguments"
 msgstr "--continue tar inga argument"
 
-#: builtin/merge.c:1369
 msgid "There is no merge in progress (MERGE_HEAD missing)."
 msgstr "Ingen sammanslagning pågår (MERGE_HEAD saknas)."
 
-#: builtin/merge.c:1385
 msgid ""
 "You have not concluded your merge (MERGE_HEAD exists).\n"
 "Please, commit your changes before you merge."
@@ -18575,7 +8070,6 @@ msgstr ""
 "Du har inte avslutat sammanslagningen (MERGE_HEAD finns).\n"
 "Checka in dina ändringar innan du slår ihop."
 
-#: builtin/merge.c:1392
 msgid ""
 "You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists).\n"
 "Please, commit your changes before you merge."
@@ -18583,131 +8077,106 @@ msgstr ""
 "Du har inte avslutat din \"cherry-pick\" (CHERRY_PICK_HEAD finns).\n"
 "Checka in dina ändringar innan du slår ihop."
 
-#: builtin/merge.c:1395
 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:1427
 msgid "No commit specified and merge.defaultToUpstream not set."
 msgstr "Ingen incheckning angiven och merge.defaultToUpstream är ej satt."
 
-#: builtin/merge.c:1444
 msgid "Squash commit into empty head not supported yet"
 msgstr "Stöder inte en tillplattningsincheckning på ett tomt huvud ännu"
 
-#: builtin/merge.c:1446
 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:1451
 #, c-format
 msgid "%s - not something we can merge"
 msgstr "%s - inte något vi kan slå ihop"
 
-#: builtin/merge.c:1453
 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:1540
 msgid "refusing to merge unrelated histories"
 msgstr "vägrar slå samman orelaterad historik"
 
-#: builtin/merge.c:1559
 #, c-format
 msgid "Updating %s..%s\n"
 msgstr "Uppdaterar %s..%s\n"
 
-#: builtin/merge.c:1606
 #, c-format
 msgid "Trying really trivial in-index merge...\n"
 msgstr "Försöker riktigt enkel sammanslagning i indexet...\n"
 
-#: builtin/merge.c:1613
 #, c-format
 msgid "Nope.\n"
 msgstr "Nej.\n"
 
-#: builtin/merge.c:1671 builtin/merge.c:1737
 #, c-format
 msgid "Rewinding the tree to pristine...\n"
 msgstr "Återspolar trädet till orört...\n"
 
-#: builtin/merge.c:1675
 #, c-format
 msgid "Trying merge strategy %s...\n"
 msgstr "Försöker sammanslagningsstrategin %s...\n"
 
-#: builtin/merge.c:1727
 #, c-format
 msgid "No merge strategy handled the merge.\n"
 msgstr "Ingen sammanslagningsstrategi hanterade sammanslagningen.\n"
 
-#: builtin/merge.c:1729
 #, c-format
 msgid "Merge with strategy %s failed.\n"
 msgstr "Sammanslagning med strategin %s misslyckades.\n"
 
-#: builtin/merge.c:1739
 #, 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:1753
 #, c-format
 msgid "Automatic merge went well; stopped before committing as requested\n"
 msgstr ""
 "Automatisk sammanslagning lyckades; stoppar före incheckning som önskat\n"
 
-#: builtin/mktag.c:27
 #, c-format
 msgid "warning: tag input does not pass fsck: %s"
 msgstr "varning: taggindata godkänns inte av fsck: %s"
 
-#: builtin/mktag.c:38
 #, c-format
 msgid "error: tag input does not pass fsck: %s"
 msgstr "fel: taggindata godkänns inte av fsck: %s"
 
-#: builtin/mktag.c:41
 #, c-format
 msgid "%d (FSCK_IGNORE?) should never trigger this callback"
 msgstr "%d (FSCK_IGNORE?) skulle aldrig utlösa detta återanrop"
 
-#: builtin/mktag.c:56
 #, c-format
 msgid "could not read tagged object '%s'"
 msgstr "kunde inte läsa det taggade objektet \"%s\""
 
-#: builtin/mktag.c:59
 #, c-format
 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
+msgid "could not read from stdin"
+msgstr "kunde inte läsa från standard in"
+
 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
 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
 msgid "unable to write tag file"
 msgstr "kunde inte skriva tagg-filen"
 
-#: builtin/mktree.c:154
 msgid "input is NUL terminated"
 msgstr "indata är NUL-terminerad"
 
-#: builtin/mktree.c:155 builtin/write-tree.c:26
 msgid "allow missing objects"
 msgstr "tillåt saknade objekt"
 
-#: builtin/mktree.c:156
 msgid "allow creation of more than one tree"
 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>][--refs-"
 "snapshot=<path>]"
@@ -18715,43 +8184,36 @@ msgstr ""
 "git multi-pack-index [<flaggor>] write [--preferred-pack=<paket>] [--refs-"
 "snapshot=<sökväg>]"
 
-#: 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:17
 msgid "git multi-pack-index [<options>] expire"
 msgstr "git multi-pack-index [<flaggor>] expire"
 
-#: 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:57
+msgid "directory"
+msgstr "katalog"
+
 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:98
 msgid "preferred-pack"
 msgstr "föredraget paket"
 
-#: 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: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:206
 msgid ""
 "during repack, collect pack-files of smaller size into a batch that is "
 "larger than this size"
@@ -18759,156 +8221,121 @@ msgstr ""
 "vid ompackning, samla mindre paketfiler i en bunt som är större än denna "
 "storlek"
 
-#: builtin/mv.c:18
 msgid "git mv [<options>] <source>... <destination>"
 msgstr "git mv [<flaggor>] <källa>... <mål>"
 
-#: builtin/mv.c:83
 #, c-format
 msgid "Directory %s is in index and no submodule?"
 msgstr "Katalogen %s är i indexet och inte en undermodul?"
 
-#: builtin/mv.c:85
 msgid "Please stage your changes to .gitmodules or stash them to proceed"
 msgstr ""
 "Köa dina ändringar i .gitmodules eller använd \"stash\" för att fortsätta"
 
-#: builtin/mv.c:103
 #, c-format
 msgid "%.*s is in index"
 msgstr "%.*s är i indexet"
 
-#: builtin/mv.c:125
 msgid "force move/rename even if target exists"
 msgstr "tvinga flytta/ändra namn även om målet finns"
 
-#: builtin/mv.c:127
 msgid "skip move/rename errors"
 msgstr "hoppa över fel vid flytt/namnändring"
 
-#: builtin/mv.c:172
 #, c-format
 msgid "destination '%s' is not a directory"
 msgstr "destinationen \"%s\" är ingen katalog"
 
-#: 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:190
 msgid "bad source"
 msgstr "felaktig källa"
 
-#: builtin/mv.c:193
 msgid "can not move directory into itself"
 msgstr "kan inte flytta katalog till sig själv"
 
-#: builtin/mv.c:196
 msgid "cannot move directory over file"
 msgstr "kan inte flytta katalog över fil"
 
-#: builtin/mv.c:205
 msgid "source directory is empty"
 msgstr "källkatalogen är tom"
 
-#: builtin/mv.c:231
 msgid "not under version control"
 msgstr "inte versionshanterad"
 
-#: builtin/mv.c:233
 msgid "conflicted"
 msgstr "i konflikt"
 
-#: builtin/mv.c:236
 msgid "destination exists"
 msgstr "destinationen finns"
 
-#: builtin/mv.c:244
 #, c-format
 msgid "overwriting '%s'"
 msgstr "skriver över \"%s\""
 
-#: builtin/mv.c:247
 msgid "Cannot overwrite"
 msgstr "Kan inte skriva över"
 
-#: builtin/mv.c:250
 msgid "multiple sources for the same target"
 msgstr "flera källor för samma mål"
 
-#: builtin/mv.c:252
 msgid "destination directory does not exist"
 msgstr "destinationskatalogen finns inte"
 
-#: builtin/mv.c:280
 #, c-format
 msgid "%s, source=%s, destination=%s"
 msgstr "%s, källa=%s, mål=%s"
 
-#: builtin/mv.c:308
 #, c-format
 msgid "Renaming %s to %s\n"
 msgstr "Byter namn på %s till %s\n"
 
-#: builtin/mv.c:314 builtin/remote.c:812 builtin/repack.c:861
 #, c-format
 msgid "renaming '%s' failed"
 msgstr "misslyckades byta namn på \"%s\""
 
-#: builtin/name-rev.c:524
 msgid "git name-rev [<options>] <commit>..."
 msgstr "git name-rev [<flaggor>] <incheckning>..."
 
-#: builtin/name-rev.c:525
 msgid "git name-rev [<options>] --all"
 msgstr "git name-rev [<flaggor>] --all"
 
-#: builtin/name-rev.c:526
 msgid "git name-rev [<options>] --annotate-stdin"
 msgstr "git name-rev [<flaggor>] --annotate-stdin"
 
-#: builtin/name-rev.c:583
 msgid "print only ref-based names (no object names)"
 msgstr "skriv endast referensbaserade namn (inga objektnamn)"
 
-#: builtin/name-rev.c:584
 msgid "only use tags to name the commits"
 msgstr "använd endast taggar för att namnge incheckningar"
 
-#: builtin/name-rev.c:586
 msgid "only use refs matching <pattern>"
 msgstr "använd endast referenser som motsvarar <mönster>"
 
-#: builtin/name-rev.c:588
 msgid "ignore refs matching <pattern>"
 msgstr "ignorera referenser som motsvarar <mönster>"
 
-#: builtin/name-rev.c:590
 msgid "list all commits reachable from all refs"
 msgstr "lista alla incheckningar som kan nås alla referenser"
 
-#: builtin/name-rev.c:591
-msgid "deprecated: use annotate-stdin instead"
-msgstr "avråds: använd annotate-stdin istället"
+#| msgid "deprecated: use annotate-stdin instead"
+msgid "deprecated: use --annotate-stdin instead"
+msgstr "avråds: använd --annotate-stdin istället"
 
-#: builtin/name-rev.c:592
 msgid "annotate text from stdin"
 msgstr "annotera text från standard in"
 
-#: builtin/name-rev.c:593
 msgid "allow to print `undefined` names (default)"
 msgstr "tillåt att skriva \"odefinierade\" namn (standard)"
 
-#: builtin/name-rev.c:599
 msgid "dereference tags in the input (internal use)"
 msgstr "avreferera taggar i indata (används internt)"
 
-#: builtin/notes.c:28
 msgid "git notes [--ref <notes-ref>] [list [<object>]]"
 msgstr "git notes [--ref <anteckningsref>] [list [<objekt>]]"
 
-#: builtin/notes.c:29
 msgid ""
 "git notes [--ref <notes-ref>] add [-f] [--allow-empty] [-m <msg> | -F <file> "
 "| (-c | -C) <object>] [<object>]"
@@ -18916,12 +8343,10 @@ msgstr ""
 "git notes [--ref <anteckningsref>] add [-f] [--allow-empty] [-m <medd> | -F "
 "<fil> | (-c | -C) <objekt>] [<objekt>]"
 
-#: builtin/notes.c:30
 msgid "git notes [--ref <notes-ref>] copy [-f] <from-object> <to-object>"
 msgstr ""
 "git notes [--ref <anteckningsref>] copy [-f] <från-objekt> <till-objekt>"
 
-#: builtin/notes.c:31
 msgid ""
 "git notes [--ref <notes-ref>] append [--allow-empty] [-m <msg> | -F <file> | "
 "(-c | -C) <object>] [<object>]"
@@ -18929,140 +8354,107 @@ msgstr ""
 "git notes [--ref <anteckningsref>] append [--allow-empty] [-m <medd> | -F "
 "<fil> | (-c | -C) <objekt>] [<objekt>]"
 
-#: builtin/notes.c:32
 msgid "git notes [--ref <notes-ref>] edit [--allow-empty] [<object>]"
 msgstr "git notes [--ref <anteckningsref>] edit [--allow-empty] [<objekt>]"
 
-#: builtin/notes.c:33
 msgid "git notes [--ref <notes-ref>] show [<object>]"
 msgstr "git notes [--ref <anteckningsref>] show [<objekt>]"
 
-#: builtin/notes.c:34
 msgid ""
 "git notes [--ref <notes-ref>] merge [-v | -q] [-s <strategy>] <notes-ref>"
 msgstr ""
 "git notes [--ref <anteckningsref>] merge [-v | -q] [-s <strategi>] "
 "<anteckningsref>"
 
-#: builtin/notes.c:37
 msgid "git notes [--ref <notes-ref>] remove [<object>...]"
 msgstr "git notes [--ref <anteckningsref>] remove [<objekt>...]"
 
-#: builtin/notes.c:38
 msgid "git notes [--ref <notes-ref>] prune [-n] [-v]"
 msgstr "git notes [--ref <anteckningsref>] prune [-n] [-v]"
 
-#: builtin/notes.c:39
 msgid "git notes [--ref <notes-ref>] get-ref"
 msgstr "git notes [--ref <anteckningsref>] get-ref"
 
-#: builtin/notes.c:44
 msgid "git notes [list [<object>]]"
 msgstr "git notes [list [<objekt>]]"
 
-#: builtin/notes.c:49
 msgid "git notes add [<options>] [<object>]"
 msgstr "git notes add [<flaggor>] [<objekt>]"
 
-#: builtin/notes.c:54
 msgid "git notes copy [<options>] <from-object> <to-object>"
 msgstr "git notes copy [<flaggor>] <från-objekt> <till-objekt>"
 
-#: builtin/notes.c:55
 msgid "git notes copy --stdin [<from-object> <to-object>]..."
 msgstr "git notes copy --stdin [<från-objekt> <till-objekt>]..."
 
-#: builtin/notes.c:60
 msgid "git notes append [<options>] [<object>]"
 msgstr "git notes append [<flaggor>] [<objekt>]"
 
-#: builtin/notes.c:65
 msgid "git notes edit [<object>]"
 msgstr "git notes edit [<objekt>]"
 
-#: builtin/notes.c:70
 msgid "git notes show [<object>]"
 msgstr "git notes show [<objekt>]"
 
-#: builtin/notes.c:75
 msgid "git notes merge [<options>] <notes-ref>"
 msgstr "git notes merge [<flaggor>] <anteckningsref>"
 
-#: builtin/notes.c:76
 msgid "git notes merge --commit [<options>]"
 msgstr "git notes merge --commit [<flaggor>]"
 
-#: builtin/notes.c:77
 msgid "git notes merge --abort [<options>]"
 msgstr "git notes merge --abort [<flaggor>]"
 
-#: builtin/notes.c:82
 msgid "git notes remove [<object>]"
 msgstr "git notes remove [<objekt>]"
 
-#: builtin/notes.c:87
 msgid "git notes prune [<options>]"
 msgstr "git notes prune [<flaggor>]"
 
-#: builtin/notes.c:97
 msgid "Write/edit the notes for the following object:"
 msgstr "Skriv/redigera anteckningar för följande objekt:"
 
-#: builtin/notes.c:149
 #, c-format
 msgid "unable to start 'show' for object '%s'"
 msgstr "kunde inte starta \"show\" för objektet \"%s\""
 
-#: builtin/notes.c:153
 msgid "could not read 'show' output"
 msgstr "kunde inte läsa utdata från \"show\""
 
-#: builtin/notes.c:161
 #, c-format
 msgid "failed to finish 'show' for object '%s'"
 msgstr "kunde inte avsluta \"show\" för objektet \"%s\""
 
-#: builtin/notes.c:194
 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:203
 msgid "unable to write note object"
 msgstr "kunde inte skriva anteckningsobjekt"
 
-#: 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:240 builtin/tag.c:582
 #, c-format
 msgid "could not open or read '%s'"
 msgstr "kunde inte öppna eller läsa \"%s\""
 
-#: 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:263
 #, c-format
 msgid "failed to read object '%s'."
 msgstr "kunde inte läsa objektet \"%s\"."
 
-#: 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:307
 #, c-format
 msgid "malformed input line: '%s'."
 msgstr "felaktig indatarad: \"%s\"."
 
-#: builtin/notes.c:322
 #, c-format
 msgid "failed to copy notes from '%s' to '%s'"
 msgstr "misslyckades kopiera anteckningar från \"%s\" till \"%s\""
@@ -19070,41 +8462,32 @@ msgstr "misslyckades kopiera anteckningar från \"%s\" till \"%s\""
 #. TRANSLATORS: the first %s will be replaced by a git
 #. notes command: 'add', 'merge', 'remove', etc.
 #.
-#: 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: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:408 builtin/notes.c:574
 msgid "note contents as a string"
 msgstr "anteckningsinnehåll som sträng"
 
-#: builtin/notes.c:411 builtin/notes.c:577
 msgid "note contents in a file"
 msgstr "anteckningsinnehåll i en fil"
 
-#: 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:417 builtin/notes.c:583
 msgid "reuse specified note object"
 msgstr "återanvänd angivet anteckningsobjekt"
 
-#: builtin/notes.c:420 builtin/notes.c:586
 msgid "allow storing empty note"
 msgstr "tillåt lagra tom anteckning"
 
-#: builtin/notes.c:421 builtin/notes.c:494
 msgid "replace existing notes"
 msgstr "ersätt befintliga anteckningar"
 
-#: builtin/notes.c:446
 #, c-format
 msgid ""
 "Cannot add notes. Found existing notes for object %s. Use '-f' to overwrite "
@@ -19113,29 +8496,23 @@ msgstr ""
 "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: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:473 builtin/notes.c:635 builtin/notes.c:904
 #, c-format
 msgid "Removing note for object %s\n"
 msgstr "Tar bort anteckning för objektet %s\n"
 
-#: builtin/notes.c:495
 msgid "read objects from stdin"
 msgstr "läs objekt från standard in"
 
-#: 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:515
 msgid "too few arguments"
 msgstr "för få argument"
 
-#: builtin/notes.c:536
 #, c-format
 msgid ""
 "Cannot copy notes. Found existing notes for object %s. Use '-f' to overwrite "
@@ -19144,12 +8521,10 @@ msgstr ""
 "Kan inte kopiera anteckningar. Hittade befintliga anteckningar för objektet "
 "%s. Använd \"-f\" för att skriva över befintliga anteckningar"
 
-#: 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:601
 #, c-format
 msgid ""
 "The -m/-F/-c/-C options have been deprecated for the 'edit' subcommand.\n"
@@ -19158,52 +8533,40 @@ msgstr ""
 "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:696
 msgid "failed to delete ref NOTES_MERGE_PARTIAL"
 msgstr "misslyckades ta bort referensen NOTES_MERGE_PARTIAL"
 
-#: builtin/notes.c:698
 msgid "failed to delete ref NOTES_MERGE_REF"
 msgstr "misslyckades ta bort referensen NOTES_MERGE_REF"
 
-#: 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:720
 msgid "failed to read ref NOTES_MERGE_PARTIAL"
 msgstr "misslyckades läsa references NOTES_MERGE_PARTIAL"
 
-#: 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:724
 msgid "could not parse commit from NOTES_MERGE_PARTIAL."
 msgstr "kunde inte tolka incheckning från NOTES_MERGE_PARTIAL."
 
-#: builtin/notes.c:737
 msgid "failed to resolve NOTES_MERGE_REF"
 msgstr "misslyckades bestämma NOTES_MERGE_REF"
 
-#: builtin/notes.c:740
 msgid "failed to finalize notes merge"
 msgstr "misslyckades färdigställa sammanslagning av anteckningar"
 
-#: builtin/notes.c:766
 #, c-format
 msgid "unknown notes merge strategy %s"
 msgstr "okänd sammanslagningsstrategi för anteckningar: %s"
 
-#: builtin/notes.c:782
 msgid "General options"
 msgstr "Allmänna flaggor"
 
-#: builtin/notes.c:784
 msgid "Merge options"
 msgstr "Flaggor för sammanslagning"
 
-#: builtin/notes.c:786
 msgid ""
 "resolve notes conflicts using the given strategy (manual/ours/theirs/union/"
 "cat_sort_uniq)"
@@ -19211,48 +8574,38 @@ msgstr ""
 "läs konflikter i anteckningar med angiven strategi (manual/ours/theirs/union/"
 "cat_sort_uniq)"
 
-#: builtin/notes.c:788
 msgid "Committing unmerged notes"
 msgstr "Checkar in ej sammanslagna anteckningar"
 
-#: 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:792
 msgid "Aborting notes merge resolution"
 msgstr "Avbryt lösning av sammanslagning av anteckningar"
 
-#: builtin/notes.c:794
 msgid "abort notes merge"
 msgstr "avbryt sammanslagning av anteckningar"
 
-#: builtin/notes.c:805
 msgid "cannot mix --commit, --abort or -s/--strategy"
 msgstr "kan inte blanda --commit, --abort eller -s/--strategy"
 
-#: 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:834
 #, c-format
 msgid "unknown -s/--strategy: %s"
 msgstr "okänd -s/--strategy: %s"
 
-#: builtin/notes.c:874
 #, 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:878
 #, c-format
 msgid "failed to store link to current notes ref (%s)"
 msgstr "misslyckades lagra länk till aktuell anteckningsreferens (%s)"
 
-#: builtin/notes.c:880
 #, c-format
 msgid ""
 "Automatic notes merge failed. Fix conflicts in %s and commit the result with "
@@ -19263,58 +8616,46 @@ msgstr ""
 "%s och checka in resultatet med \"git notes merge --commit\", eller avbryt "
 "sammanslagningen med \"git notes merge --abort\".\n"
 
-#: builtin/notes.c:899 builtin/tag.c:595
 #, c-format
 msgid "Failed to resolve '%s' as a valid ref."
 msgstr "Kunde inte slå upp \"%s\" som en giltig referens."
 
-#: builtin/notes.c:902
 #, c-format
 msgid "Object %s has no note\n"
 msgstr "Objektet %s har ingen anteckning\n"
 
-#: builtin/notes.c:914
 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:917
 msgid "read object names from the standard input"
 msgstr "läs objektnamn från standard in"
 
-#: builtin/notes.c:956 builtin/prune.c:144 builtin/worktree.c:148
 msgid "do not remove, show only"
 msgstr "ta inte bort, bara visa"
 
-#: builtin/notes.c:957
 msgid "report pruned notes"
 msgstr "rapportera borttagna anteckningar"
 
-#: builtin/notes.c:1000
 msgid "notes-ref"
 msgstr "anteckningar-ref"
 
-#: builtin/notes.c:1001
 msgid "use notes from <notes-ref>"
 msgstr "använd anteckningar från <anteckningsref>"
 
-#: builtin/notes.c:1036 builtin/stash.c:1802
 #, c-format
 msgid "unknown subcommand: %s"
 msgstr "okänt underkommando: %s"
 
-#: builtin/pack-objects.c:182
 msgid ""
 "git pack-objects --stdout [<options>...] [< <ref-list> | < <object-list>]"
 msgstr ""
 "git pack-objects --stdout [<flaggor>...] [< <reflista> | < <objektlista>]"
 
-#: builtin/pack-objects.c:183
 msgid ""
 "git pack-objects [<options>...] <base-name> [< <ref-list> | < <object-list>]"
 msgstr ""
 "git pack-objects [<flaggor>...] <basnamn> [< <reflista> | < <objektlista>]"
 
-#: builtin/pack-objects.c:570
 #, c-format
 msgid ""
 "write_reuse_object: could not locate %s, expected at offset %<PRIuMAX> in "
@@ -19323,111 +8664,99 @@ msgstr ""
 "write_reuse_object: kunde inte hitta %s, förväntat på position %<PRIuMAX> i "
 "paketet %s"
 
-#: builtin/pack-objects.c:578
 #, c-format
 msgid "bad packed object CRC for %s"
 msgstr "felaktig CRC för packat objekt %s"
 
-#: builtin/pack-objects.c:589
 #, c-format
 msgid "corrupt packed object for %s"
 msgstr "trasigt packat objekt för %s"
 
-#: builtin/pack-objects.c:720
 #, c-format
 msgid "recursive delta detected for object %s"
 msgstr "rekursivt delta upptäcktes för objektet %s"
 
-#: builtin/pack-objects.c:939
 #, c-format
 msgid "ordered %u objects, expected %<PRIu32>"
 msgstr "ordnade %u objekt, förväntade %<PRIu32>"
 
-#: builtin/pack-objects.c:1034
 #, c-format
 msgid "expected object at offset %<PRIuMAX> in pack %s"
 msgstr "förväntade objekt på position %<PRIuMAX> i paketet %s"
 
-#: builtin/pack-objects.c:1158
 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:1171
 msgid "Writing objects"
 msgstr "Skriver objekt"
 
-#: builtin/pack-objects.c:1243 builtin/update-index.c:90
 #, c-format
 msgid "failed to stat %s"
 msgstr "misslyckades ta status på %s"
 
-#: builtin/pack-objects.c:1276
+#, c-format
+msgid "failed utime() on %s"
+msgstr "\"utime()\" misslyckades på %s"
+
 msgid "failed to write bitmap index"
 msgstr "misslyckade skriva bitkarteindex"
 
-#: builtin/pack-objects.c:1302
 #, c-format
 msgid "wrote %<PRIu32> objects while expecting %<PRIu32>"
 msgstr "skrev %<PRIu32> objekt medan %<PRIu32> förväntades"
 
-#: builtin/pack-objects.c:1544
 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:1992
 #, 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:2001
 #, 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:2282
 msgid "Counting objects"
 msgstr "Räknar objekt"
 
-#: builtin/pack-objects.c:2447
+#, c-format
+msgid "unable to get size of %s"
+msgstr "kan inte hämta storlek på %s"
+
 #, c-format
 msgid "unable to parse object header of %s"
 msgstr "kunde inte tolka objekthuvud för %s"
 
-#: builtin/pack-objects.c:2517 builtin/pack-objects.c:2533
-#: builtin/pack-objects.c:2543
 #, c-format
 msgid "object %s cannot be read"
 msgstr "objektet %s kunde inte läsas"
 
-#: builtin/pack-objects.c:2520 builtin/pack-objects.c:2547
 #, 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:2557
 msgid "suboptimal pack - out of memory"
 msgstr "icke-optimalt pack - minnet slut"
 
-#: builtin/pack-objects.c:2872
 #, c-format
 msgid "Delta compression using up to %d threads"
 msgstr "Deltakomprimering använder upp till %d trådar"
 
-#: builtin/pack-objects.c:3011
 #, 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:3097
+#, c-format
+msgid "unable to get type of object %s"
+msgstr "kunde inte hämta typ för objektet %s"
+
 msgid "Compressing objects"
 msgstr "Komprimerar objekt"
 
-#: builtin/pack-objects.c:3103
 msgid "inconsistency with delta count"
 msgstr "deltaräknaren är inkonsekvent"
 
-#: builtin/pack-objects.c:3182
 #, c-format
 msgid ""
 "value of uploadpack.blobpackfileuri must be of the form '<object-hash> <pack-"
@@ -19436,25 +8765,33 @@ msgstr ""
 "värdet på uploadpack.blobpackfileuri måste vara på formen '<objekt-hash> "
 "<paket-hash> <uri>' (fick '%s')"
 
-#: builtin/pack-objects.c:3185
 #, 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:3220
 #, 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:3348 builtin/pack-objects.c:3359
-#: builtin/pack-objects.c:3373
 #, c-format
 msgid "could not find pack '%s'"
 msgstr "kunde inte hitta paketet \"%s\""
 
-#: builtin/pack-objects.c:3416
+#, c-format
+msgid "packfile %s cannot be accessed"
+msgstr "paketfilen %s kunde inte nås"
+
+msgid "Enumerating cruft objects"
+msgstr "Räknar upp onödiga objekt"
+
+msgid "unable to add cruft objects"
+msgstr "kan inte lägga till onödiga objekt"
+
+msgid "Traversing cruft objects"
+msgstr "Traverserar onödiga objekt"
+
 #, c-format
 msgid ""
 "expected edge object ID, got garbage:\n"
@@ -19463,7 +8800,6 @@ msgstr ""
 "förväntade kant-objekt-id, fick skräp:\n"
 " %s"
 
-#: builtin/pack-objects.c:3422
 #, c-format
 msgid ""
 "expected object ID, got garbage:\n"
@@ -19472,240 +8808,205 @@ msgstr ""
 "förväntade objekt-id, fick skräp:\n"
 " %s"
 
-#: builtin/pack-objects.c:3540 builtin/pack-objects.c:3627
+msgid "could not load cruft pack .mtimes"
+msgstr "kunde inte läsa .mtimes från onödiga paket"
+
 msgid "cannot open pack index"
 msgstr "kan inte öppna paketfilen"
 
-#: builtin/pack-objects.c:3549
 #, 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:3635
 msgid "unable to force loose object"
 msgstr "kan inte tvinga lösa objekt"
 
-#: builtin/pack-objects.c:3763
 #, c-format
 msgid "not a rev '%s'"
 msgstr "inte en referens \"%s\""
 
-#: builtin/pack-objects.c:3766 builtin/rev-parse.c:1061
 #, c-format
 msgid "bad revision '%s'"
 msgstr "felaktig revision \"%s\""
 
-#: builtin/pack-objects.c:3794
 msgid "unable to add recent objects"
 msgstr "kan inte lägga till nya objekt"
 
-#: builtin/pack-objects.c:3847
 #, c-format
 msgid "unsupported index version %s"
 msgstr "indexversionen %s stöds ej"
 
-#: builtin/pack-objects.c:3851
 #, c-format
 msgid "bad index version '%s'"
 msgstr "felaktig indexversion \"%s\""
 
-#: builtin/pack-objects.c:3907
 msgid "<version>[,<offset>]"
 msgstr "<version>[,<offset>]"
 
-#: builtin/pack-objects.c:3908
 msgid "write the pack index file in the specified idx format version"
 msgstr "skriv paketindexfilen i angiven indexformatversion"
 
-#: builtin/pack-objects.c:3911
 msgid "maximum size of each output pack file"
 msgstr "maximal storlek på varje utdatapaketfil"
 
-#: builtin/pack-objects.c:3913
 msgid "ignore borrowed objects from alternate object store"
 msgstr "ignorera lånade objekt från supplerande objektlager"
 
-#: builtin/pack-objects.c:3915
 msgid "ignore packed objects"
 msgstr "ignorera packade objekt"
 
-#: builtin/pack-objects.c:3917
 msgid "limit pack window by objects"
 msgstr "begränsa paketfönster efter objekt"
 
-#: builtin/pack-objects.c:3919
 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:3921
 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:3923
 msgid "reuse existing deltas"
 msgstr "återanvänd befintliga delta"
 
-#: builtin/pack-objects.c:3925
 msgid "reuse existing objects"
 msgstr "återanvänd befintliga objekt"
 
-#: builtin/pack-objects.c:3927
 msgid "use OFS_DELTA objects"
 msgstr "använd OFS_DELTA-objekt"
 
-#: builtin/pack-objects.c:3929
 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:3931
 msgid "do not create an empty pack output"
 msgstr "försök inte skapa tom paketutdata"
 
-#: builtin/pack-objects.c:3933
 msgid "read revision arguments from standard input"
 msgstr "läs revisionsargument från standard in"
 
-#: builtin/pack-objects.c:3935
 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:3938
 msgid "include objects reachable from any reference"
 msgstr "ta med objekt som kan nås från någon referens"
 
-#: builtin/pack-objects.c:3941
 msgid "include objects referred by reflog entries"
 msgstr "ta med objekt som refereras från referensloggposter"
 
-#: builtin/pack-objects.c:3944
 msgid "include objects referred to by the index"
 msgstr "ta med objekt som refereras från indexet"
 
-#: builtin/pack-objects.c:3947
 msgid "read packs from stdin"
 msgstr "läs paket från standard in"
 
-#: builtin/pack-objects.c:3949
 msgid "output pack to stdout"
 msgstr "skriv paket på standard ut"
 
-#: builtin/pack-objects.c:3951
 msgid "include tag objects that refer to objects to be packed"
 msgstr "ta med taggobjekt som refererar objekt som ska packas"
 
-#: builtin/pack-objects.c:3953
 msgid "keep unreachable objects"
 msgstr "behåll onåbara objekt"
 
-#: builtin/pack-objects.c:3955
 msgid "pack loose unreachable objects"
 msgstr "packa lösa onåbara objekt"
 
-#: builtin/pack-objects.c:3957
 msgid "unpack unreachable objects newer than <time>"
 msgstr "packa upp onåbara objekt nyare än <tid>"
 
-#: builtin/pack-objects.c:3960
+msgid "create a cruft pack"
+msgstr "skapa ett onödigt paket"
+
+msgid "expire cruft objects older than <time>"
+msgstr "låt tid gå ut för onödiga objekt äldre än <tid>"
+
 msgid "use the sparse reachability algorithm"
 msgstr "använd gles-nåbarhetsalgoritmen"
 
-#: builtin/pack-objects.c:3962
 msgid "create thin packs"
 msgstr "skapa tunna paket"
 
-#: builtin/pack-objects.c:3964
 msgid "create packs suitable for shallow fetches"
 msgstr "skapa packfiler lämpade för grunda hämtningar"
 
-#: builtin/pack-objects.c:3966
 msgid "ignore packs that have companion .keep file"
 msgstr "ignorera paket som har tillhörande .keep-fil"
 
-#: builtin/pack-objects.c:3968
 msgid "ignore this pack"
 msgstr "ignorera detta paket"
 
-#: builtin/pack-objects.c:3970
 msgid "pack compression level"
 msgstr "komprimeringsgrad för paket"
 
-#: builtin/pack-objects.c:3972
 msgid "do not hide commits by grafts"
 msgstr "göm inte incheckningar med ympningar (\"grafts\")"
 
-#: builtin/pack-objects.c:3974
 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:3976
 msgid "write a bitmap index together with the pack index"
 msgstr "använd bitkartindex tillsammans med packindexet"
 
-#: builtin/pack-objects.c:3980
 msgid "write a bitmap index if possible"
 msgstr "skriv bitkartindex om möjligt"
 
-#: builtin/pack-objects.c:3984
 msgid "handling for missing objects"
 msgstr "hantering av saknade objekt"
 
-#: builtin/pack-objects.c:3987
 msgid "do not pack objects in promisor packfiles"
 msgstr "packa inte objekt i kontraktspackfiler"
 
-#: builtin/pack-objects.c:3989
 msgid "respect islands during delta compression"
 msgstr "respektera öar under deltakomprimering"
 
-#: builtin/pack-objects.c:3991
 msgid "protocol"
 msgstr "protokoll"
 
-#: builtin/pack-objects.c:3992
 msgid "exclude any configured uploadpack.blobpackfileuri with this protocol"
 msgstr ""
 "uteslut redan konfigurerade uploadpack.blobpackfileuri med detta protokoll"
 
-#: builtin/pack-objects.c:4027
 #, 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:4032
 #, 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:4088
+#, c-format
+msgid "bad pack compression level %d"
+msgstr "felaktig paketkomprimeringsgrad %d"
+
 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:4090
 msgid "minimum pack size limit is 1 MiB"
 msgstr "minsta packstorlek är 1 MiB"
 
-#: builtin/pack-objects.c:4095
 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
 msgid "cannot use --filter without --stdout"
 msgstr "kan inte använda --filter utan --stdout"
 
-#: builtin/pack-objects.c:4106
 msgid "cannot use --filter with --stdin-packs"
 msgstr "kan inte använda --filter med --stdin-packs"
 
-#: builtin/pack-objects.c:4110
 msgid "cannot use internal rev list with --stdin-packs"
 msgstr "kan inte använda intern revisionslista med --stdin-packs"
 
-#: builtin/pack-objects.c:4169
+msgid "cannot use internal rev list with --cruft"
+msgstr "kan inte använda intern revisionslista med --cruft"
+
+msgid "cannot use --stdin-packs with --cruft"
+msgstr "kan inte använda --stdin-packs med --cruft"
+
+msgid "cannot use --max-pack-size with --cruft"
+msgstr "kan inte använda --max-pack-size med --cruft"
+
 msgid "Enumerating objects"
 msgstr "Räknar upp objekt"
 
-#: builtin/pack-objects.c:4210
 #, c-format
 msgid ""
 "Total %<PRIu32> (delta %<PRIu32>), reused %<PRIu32> (delta %<PRIu32>), pack-"
@@ -19714,7 +9015,6 @@ msgstr ""
 "Totalt %<PRIu32> (delta %<PRIu32>), återanvände %<PRIu32> (delta %<PRIu32>), "
 "paket-återanvända %<PRIu32>"
 
-#: builtin/pack-redundant.c:601
 msgid ""
 "'git pack-redundant' is nominated for removal.\n"
 "If you still use this command, please add an extra\n"
@@ -19728,79 +9028,60 @@ msgstr ""
 "oss att du fortfarande använder det på e-post till\n"
 "<git@vger.kernel.org>. Tack.\n"
 
-#: builtin/pack-refs.c:8
 msgid "git pack-refs [<options>]"
 msgstr "git pack-refs [<flaggor>]"
 
-#: builtin/pack-refs.c:16
 msgid "pack everything"
 msgstr "packa allt"
 
-#: builtin/pack-refs.c:17
 msgid "prune loose refs (default)"
 msgstr "ta bort lösa referenser (standard)"
 
-#: builtin/prune.c:14
 msgid "git prune [-n] [-v] [--progress] [--expire <time>] [--] [<head>...]"
 msgstr "git prune [-n] [-v] [--progress] [--expire <tid>] [--] [<huvud>...]"
 
-#: builtin/prune.c:145
 msgid "report pruned objects"
 msgstr "rapportera borttagna objekt"
 
-#: builtin/prune.c:148
 msgid "expire objects older than <time>"
 msgstr "låt tid gå ut för objekt äldre än <tid>"
 
-#: builtin/prune.c:150
 msgid "limit traversal to objects outside promisor packfiles"
 msgstr "begränsa vandring av objekt utanför kontraktspackfiler."
 
-#: builtin/prune.c:163
 msgid "cannot prune in a precious-objects repo"
 msgstr "kan inte rensa i ett \"precious-objekt\"-arkiv"
 
-#: builtin/pull.c:67
 msgid "git pull [<options>] [<repository> [<refspec>...]]"
 msgstr "git pull [<flaggor>] [<arkiv> [<refspec>...]]"
 
-#: builtin/pull.c:124
 msgid "control for recursive fetching of submodules"
 msgstr "styrning för rekursiv hämtning av undermoduler"
 
-#: builtin/pull.c:128
 msgid "Options related to merging"
 msgstr "Alternativ gällande sammanslagning"
 
-#: 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:159 builtin/revert.c:126
 msgid "allow fast-forward"
 msgstr "tillåt snabbspolning"
 
-#: 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:371
 msgid "automatically stash/stash pop before and after"
 msgstr "utför automatiskt stash/stash pop före och efter"
 
-#: builtin/pull.c:187
 msgid "Options related to fetching"
 msgstr "Alternativ gällande hämtningar"
 
-#: builtin/pull.c:197
 msgid "force overwrite of local branch"
 msgstr "tvinga överskrivning av lokal gren"
 
-#: builtin/pull.c:205
 msgid "number of submodules pulled in parallel"
 msgstr "antal undermoduler som hämtas parallellt"
 
-#: builtin/pull.c:449
 msgid ""
 "There is no candidate for rebasing against among the refs that you just "
 "fetched."
@@ -19808,14 +9089,12 @@ msgstr ""
 "Det finns ingen kandidat för ombasering bland referenserna du precis har "
 "hämtat."
 
-#: 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:452
 msgid ""
 "Generally this means that you provided a wildcard refspec which had no\n"
 "matches on the remote end."
@@ -19823,7 +9102,6 @@ msgstr ""
 "Det betyder vanligtvis att du använt en jokertecken-refspec som inte\n"
 "motsvarade något i fjärränden."
 
-#: builtin/pull.c:455
 #, c-format
 msgid ""
 "You asked to pull from the remote '%s', but did not specify\n"
@@ -19834,42 +9112,31 @@ msgstr ""
 "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:460 builtin/rebase.c:978
 msgid "You are not currently on a branch."
 msgstr "Du är inte på någon gren för närvarande."
 
-#: 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: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:465 builtin/pull.c:480
 msgid "See git-pull(1) for details."
 msgstr "Se git-pull(1) för detaljer."
 
-#: builtin/pull.c:467 builtin/pull.c:473 builtin/pull.c:482
-#: builtin/rebase.c:984
 msgid "<remote>"
 msgstr "<fjärr>"
 
-#: builtin/pull.c:467 builtin/pull.c:482 builtin/pull.c:487
-#: contrib/scalar/scalar.c:374
 msgid "<branch>"
 msgstr "<gren>"
 
-#: builtin/pull.c:475 builtin/rebase.c:976
 msgid "There is no tracking information for the current branch."
 msgstr "Det finns ingen spårningsinformation för aktuell gren."
 
-#: 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:489
 #, c-format
 msgid ""
 "Your configuration specifies to merge with the ref '%s'\n"
@@ -19878,16 +9145,13 @@ msgstr ""
 "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:600
 #, c-format
 msgid "unable to access commit %s"
 msgstr "kunde inte komma åt incheckningen %s"
 
-#: builtin/pull.c:908
 msgid "ignoring --verify-signatures for rebase"
 msgstr "ignorera --verify-signatures för ombasering"
 
-#: builtin/pull.c:969
 msgid ""
 "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"
@@ -19916,19 +9180,15 @@ msgstr ""
 "eller --ff-only på kommandoraden för att överstyra det konfigurerade\n"
 "förvalet vid körning.\n"
 
-#: builtin/pull.c:1047
 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:1051
 msgid "pull with rebase"
 msgstr "pull med ombasering"
 
-#: builtin/pull.c:1052
 msgid "please commit or stash them."
 msgstr "checka in eller använd \"stash\" på dem."
 
-#: builtin/pull.c:1077
 #, c-format
 msgid ""
 "fetch updated the current branch head.\n"
@@ -19939,7 +9199,6 @@ msgstr ""
 "snabbspolar din arbetskatalog från\n"
 "incheckningen %s."
 
-#: builtin/pull.c:1083
 #, c-format
 msgid ""
 "Cannot fast-forward your working tree.\n"
@@ -19956,48 +9215,51 @@ msgstr ""
 "$ git reset --hard\n"
 "för att återgå."
 
-#: builtin/pull.c:1098
 msgid "Cannot merge multiple branches into empty head."
 msgstr "Kan inte slå ihop flera grenar i ett tomt huvud."
 
-#: builtin/pull.c:1103
 msgid "Cannot rebase onto multiple branches."
 msgstr "Kan inte ombasera ovanpå flera grenar."
 
-#: builtin/pull.c:1105
 msgid "Cannot fast-forward to multiple branches."
 msgstr "Kan inte snabbspola till flera grenar."
 
-#: builtin/pull.c:1120
 msgid "Need to specify how to reconcile divergent branches."
 msgstr "Måste ange hur avvikande grenar skall förlikas."
 
-#: builtin/pull.c:1134
 msgid "cannot rebase with locally recorded submodule modifications"
 msgstr "kan inte ombasera med lokalt lagrade ändringar i undermoful"
 
-#: builtin/push.c:19
 msgid "git push [<options>] [<repository> [<refspec>...]]"
 msgstr "git push [<flaggor>] [<arkiv> [<refspec>...]]"
 
-#: builtin/push.c:111
 msgid "tag shorthand without <tag>"
 msgstr "taggförkortning utan <tagg>"
 
-#: builtin/push.c:119
 msgid "--delete only accepts plain target ref names"
 msgstr "--delete godtar endast enkla målreferensnamn"
 
-#: builtin/push.c:164
 msgid ""
 "\n"
-"To choose either option permanently, see push.default in 'git help config'."
+"To choose either option permanently, see push.default in 'git help config'.\n"
 msgstr ""
 "\n"
 "För att välja ett av alternativen permanent, se push.default i \"git help "
-"config\"."
+"config\".\n"
+
+msgid ""
+"\n"
+"To avoid automatically configuring upstream branches when their name\n"
+"doesn't match the local branch, see option 'simple' of branch."
+"autoSetupMerge\n"
+"in 'git help config'.\n"
+msgstr ""
+"\n"
+"För att undvika att uppströmsgrenar automatiskt konfigureras när deras\n"
+"namn inte motsvarar en lokal gren, se värdet \"simple\" i branch."
+"autoSetupMerge\n"
+"i \"git help config\".\n"
 
-#: builtin/push.c:167
 #, c-format
 msgid ""
 "The upstream branch of your current branch does not match\n"
@@ -20009,7 +9271,7 @@ msgid ""
 "To push to the branch of the same name on the remote, use\n"
 "\n"
 "    git push %s HEAD\n"
-"%s"
+"%s%s"
 msgstr ""
 "Uppströmsgrenen för din nuvarande gren stämmer inte överens\n"
 "med namnet på din aktuella gren. För att sända till uppströmsgrenen\n"
@@ -20020,9 +9282,8 @@ msgstr ""
 "För att sända till grenen med samma namn i fjärrarkivet använder du\n"
 "\n"
 "    git push %s HEAD\n"
-"%s"
+"%s%s"
 
-#: builtin/push.c:182
 #, c-format
 msgid ""
 "You are not currently on a branch.\n"
@@ -20037,32 +9298,39 @@ msgstr ""
 "\n"
 "    git push %s HEAD:<namn-på-fjärrgren>\n"
 
-#: builtin/push.c:191
+msgid ""
+"\n"
+"To have this happen automatically for branches without a tracking\n"
+"upstream, see 'push.autoSetupRemote' in 'git help config'.\n"
+msgstr ""
+"\n"
+"För att detta ska ske automatiskt för grenar som saknar en spårande\n"
+"uppströmsgren, se \"push.autoSetupRemote\" i \"git help config\".\n"
+
 #, c-format
 msgid ""
 "The current branch %s has no upstream branch.\n"
 "To push the current branch and set the remote as upstream, use\n"
 "\n"
 "    git push --set-upstream %s %s\n"
+"%s"
 msgstr ""
 "Den aktuella grenen %s har ingen uppströmsgren.\n"
 "För att sända aktuell gren och ange fjärrarkiv som uppström använder du\n"
 "\n"
 "    git push --set-upstream %s %s\n"
+"%s"
 
-#: builtin/push.c:199
 #, c-format
 msgid "The current branch %s has multiple upstream branches, refusing to push."
 msgstr "Den aktuella grenen %s har flera uppströmsgrenar, vägrar sända."
 
-#: builtin/push.c:217
 msgid ""
 "You didn't specify any refspecs to push, and push.default is \"nothing\"."
 msgstr ""
 "Du angav inga referensspecifikationer att sända, och push.default är "
 "\"nothing\"."
 
-#: builtin/push.c:243
 #, c-format
 msgid ""
 "You are pushing to remote '%s', which is not the upstream of\n"
@@ -20073,7 +9341,6 @@ msgstr ""
 "aktuella grenen \"%s\", utan att tala om för mig vad som\n"
 "ska sändas för att uppdatera fjärrgrenen."
 
-#: 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"
@@ -20085,7 +9352,6 @@ msgstr ""
 "\"git pull ....\") innan du sänder igen.\n"
 "Se avsnittet \"Note about fast-forward\" i \"git push --help\" för detaljer."
 
-#: builtin/push.c: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"
@@ -20097,7 +9363,6 @@ msgstr ""
 "\"git pull ...\") innan du sänder igen.\n"
 "Se avsnittet \"Note about fast-forward\" i \"git push --help\" för detaljer."
 
-#: builtin/push.c: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"
@@ -20111,11 +9376,9 @@ msgstr ""
 "(t.ex. \"git pull ...\") innan du sänder igen.\n"
 "Se avsnittet \"Note about fast-forwards\" i \"git push --help\" för detaljer."
 
-#: builtin/push.c:277
 msgid "Updates were rejected because the tag already exists in the remote."
 msgstr "Uppdateringarna avvisades eftersom taggen redan finns på fjärren."
 
-#: builtin/push.c: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"
@@ -20126,7 +9389,6 @@ msgstr ""
 "pekar på något som inte är en incheckning, utan att använda flaggan\n"
 "\"--force\".\n"
 
-#: 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"
@@ -20138,99 +9400,79 @@ msgstr ""
 "fjärrändringarna lokalt (t.ex \"git pull ....\") innan du\n"
 "tvingar en uppdatering.\n"
 
-#: builtin/push.c:355
 #, c-format
 msgid "Pushing to %s\n"
 msgstr "Sänder till %s\n"
 
-#: builtin/push.c:362
 #, c-format
 msgid "failed to push some refs to '%s'"
 msgstr "misslyckades sända vissa referenser till \"%s\""
 
-#: builtin/push.c:544 builtin/submodule--helper.c:3377
+#, c-format
+msgid "invalid value for '%s'"
+msgstr "ogiltigt värde för \"%s\""
+
 msgid "repository"
 msgstr "arkiv"
 
-#: 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:195
 msgid "mirror all refs"
 msgstr "spegla alla referenser"
 
-#: builtin/push.c:548
 msgid "delete refs"
 msgstr "ta bort referenser"
 
-#: builtin/push.c:549
 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:196
 msgid "force updates"
 msgstr "tvinga uppdateringar"
 
-#: 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: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:212
 msgid "require remote updates to be integrated locally"
 msgstr "kräv att fjärruppdateringar har integrerats lokalt"
 
-#: builtin/push.c:560
 msgid "control recursive pushing of submodules"
 msgstr "styr rekursiv insändning av undermoduler"
 
-#: 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:190
-#: builtin/send-pack.c:191
 msgid "receive pack program"
 msgstr "program för att ta emot paket"
 
-#: builtin/push.c:564
 msgid "set upstream for git pull/status"
 msgstr "ställ in uppström för git pull/status"
 
-#: builtin/push.c:567
 msgid "prune locally removed refs"
 msgstr "ta bort lokalt borttagna referenser"
 
-#: builtin/push.c:569
 msgid "bypass pre-push hook"
 msgstr "förbigå pre-push-krok"
 
-#: builtin/push.c:570
 msgid "push missing but relevant tags"
 msgstr "sänd in saknade men relevanta taggar"
 
-#: 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:204
 msgid "request atomic transaction on remote side"
 msgstr "begär atomiska transaktioner på fjärrsidan"
 
-#: builtin/push.c:594
 msgid "--delete doesn't make sense without any refs"
 msgstr "--delete kan inte användas utan referenser"
 
-#: builtin/push.c:614
 #, c-format
 msgid "bad repository '%s'"
 msgstr "felaktigt arkiv \"%s\""
 
-#: builtin/push.c:615
 msgid ""
 "No configured push destination.\n"
 "Either specify the URL from the command-line or configure a remote "
@@ -20251,65 +9493,50 @@ msgstr ""
 "\n"
 "    git push <namn>\n"
 
-#: builtin/push.c:632
 msgid "--all can't be combined with refspecs"
 msgstr "--all kan inte kombineras med referensspecifikationer"
 
-#: builtin/push.c:638
 msgid "--mirror can't be combined with refspecs"
 msgstr "--mirror kan inte kombineras med referensspecifikationer"
 
-#: builtin/push.c:648
 msgid "push options must not have new line characters"
 msgstr "push-flaggor kan inte innehålla radbrytning"
 
-#: builtin/range-diff.c:9
 msgid "git range-diff [<options>] <old-base>..<old-tip> <new-base>..<new-tip>"
 msgstr ""
 "git range-diff [<flaggor>] <gammal-bas>..<gammal-ända> <ny-bas>..<ny-ända>"
 
-#: builtin/range-diff.c:10
 msgid "git range-diff [<options>] <old-tip>...<new-tip>"
 msgstr "git range-diff [<flaggor>] <gammal-bas>..<ny-ända>"
 
-#: builtin/range-diff.c:11
 msgid "git range-diff [<options>] <base> <old-tip> <new-tip>"
 msgstr "git range-diff [<flaggor>] <bas> <gammal-ända> <ny-ända>"
 
-#: builtin/range-diff.c:30
 msgid "use simple diff colors"
 msgstr "använd enkla diff-färger"
 
-#: builtin/range-diff.c:32
 msgid "notes"
 msgstr "anteckningar"
 
-#: builtin/range-diff.c:32
 msgid "passed to 'git log'"
 msgstr "sänds till \"git log\""
 
-#: builtin/range-diff.c:35
 msgid "only emit output related to the first range"
 msgstr "visa endast utdata för det första intervallet"
 
-#: builtin/range-diff.c:37
 msgid "only emit output related to the second range"
 msgstr "visa endast utdata för det andra intervallet"
 
-#: builtin/range-diff.c:60 builtin/range-diff.c:64
 #, c-format
 msgid "not a commit range: '%s'"
 msgstr "inte ett incheckningsintervall: \"%s\""
 
-#: builtin/range-diff.c:74
 msgid "single arg format must be symmetric range"
 msgstr "ensamt argument måste vara symmetriskt intervall"
 
-#: builtin/range-diff.c:89
 msgid "need two commit ranges"
 msgstr "behöver två incheckningsintervall"
 
-#: builtin/read-tree.c:41
 msgid ""
 "git read-tree [(-m [--trivial] [--aggressive] | --reset | --prefix=<prefix>) "
 "[-u | -i]] [--no-sparse-checkout] [--index-output=<file>] (--empty | <tree-"
@@ -20319,79 +9546,60 @@ msgstr ""
 "[-u | -i]] [--no-sparse-checkout] [--index-output=<fil>] (--empty | <träd-"
 "igt1> [<träd-igt2> [<träd-igt3>]])"
 
-#: builtin/read-tree.c:116
 msgid "write resulting index to <file>"
 msgstr "skriv resulterande index till <fil>"
 
-#: builtin/read-tree.c:119
 msgid "only empty the index"
 msgstr "töm bara indexet"
 
-#: builtin/read-tree.c:121
 msgid "Merging"
 msgstr "Sammanslagning"
 
-#: 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: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: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:129
 msgid "same as -m, but discard unmerged entries"
 msgstr "som -m, men kasta bort ej sammanslagna poster"
 
-#: builtin/read-tree.c:130
 msgid "<subdirectory>/"
 msgstr "<underkatalog>/"
 
-#: 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:134
 msgid "update working tree with merge result"
 msgstr "uppdatera arbetskatalogen med resultatet från sammanslagningen"
 
-#: builtin/read-tree.c:136
 msgid "gitignore"
 msgstr "gitignore"
 
-#: 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:140
 msgid "don't check the working tree after merging"
 msgstr "kontrollera inte arbetskatalogen efter sammanslagning"
 
-#: 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:143
 msgid "skip applying sparse checkout filter"
 msgstr "hoppa över att applicera filter för gles utcheckning"
 
-#: builtin/read-tree.c:145
 msgid "debug unpack-trees"
 msgstr "felsök unpack-trees"
 
-#: builtin/read-tree.c:149
 msgid "suppress feedback messages"
 msgstr "undertryck återkopplingsmeddelanden"
 
-#: builtin/read-tree.c:190
 msgid "You need to resolve your current index first"
 msgstr "Du måste lösa ditt befintliga index först"
 
-#: builtin/rebase.c:36
 msgid ""
 "git rebase [-i] [options] [--exec <cmd>] [--onto <newbase> | --keep-base] "
 "[<upstream> [<branch>]]"
@@ -20399,50 +9607,48 @@ msgstr ""
 "git rebase [-i] [flaggor] [--exec <kmd>] [--onto <nybas> | --keep-base] "
 "[<uppström> [<gren>]]"
 
-#: builtin/rebase.c:38
 msgid ""
 "git rebase [-i] [options] [--exec <cmd>] [--onto <newbase>] --root [<branch>]"
 msgstr ""
 "git rebase [-i] [flaggor] [--exec <kmd>] [--onto <nybas>] --root [<gren>]"
 
-#: builtin/rebase.c:231
+#, c-format
+msgid "could not read '%s'."
+msgstr "kunde inte läsa \"%s\"."
+
 #, c-format
 msgid "could not create temporary %s"
 msgstr "kunde inte skapa temporär %s"
 
-#: builtin/rebase.c:237
 msgid "could not mark as interactive"
 msgstr "kunde inte markera som interaktiv"
 
-#: builtin/rebase.c:290
 msgid "could not generate todo list"
 msgstr "Kunde inte skapa attgöra-lista"
 
-#: builtin/rebase.c:332
 msgid "a base commit must be provided with --upstream or --onto"
 msgstr "en basincheckning måste anges med --upstream eller --onto"
 
-#: builtin/rebase.c:391
 #, c-format
 msgid "%s requires the merge backend"
 msgstr "%s kräver \"merge\"-bakändan"
 
-#: builtin/rebase.c:433
 #, c-format
 msgid "could not get 'onto': '%s'"
 msgstr "kunde inte hämta \"onto\": \"%s\""
 
-#: builtin/rebase.c:450
 #, c-format
 msgid "invalid orig-head: '%s'"
 msgstr "ogiltigt orig-head: \"%s\""
 
-#: builtin/rebase.c:475
 #, c-format
 msgid "ignoring invalid allow_rerere_autoupdate: '%s'"
 msgstr "ignorera ogiltigt allow_rerere_autoupdate: \"%s\""
 
-#: builtin/rebase.c:600
+#, c-format
+msgid "could not remove '%s'"
+msgstr "kunde inte ta bort \"%s\""
+
 msgid ""
 "Resolve all conflicts manually, mark them as resolved with\n"
 "\"git add/rm <conflicted_files>\", then run \"git rebase --continue\".\n"
@@ -20456,7 +9662,6 @@ msgstr ""
 "För att avbryta och återgå till där du var före ombaseringen, kör \"git "
 "rebase --abort\"."
 
-#: builtin/rebase.c:685
 #, c-format
 msgid ""
 "\n"
@@ -20475,12 +9680,10 @@ msgstr ""
 "\n"
 "Därför kan inte git ombasera dessa."
 
-#: builtin/rebase.c:836
 #, c-format
 msgid "could not switch to %s"
 msgstr "kunde inte växla till %s"
 
-#: builtin/rebase.c:952
 #, c-format
 msgid ""
 "unrecognized empty type '%s'; valid values are \"drop\", \"keep\", and \"ask"
@@ -20488,7 +9691,6 @@ msgid ""
 msgstr ""
 "okänd tom-typ \"%s\"; giltiga värden är \"drop\", \"keep\" och \"ask\"."
 
-#: builtin/rebase.c:970
 #, c-format
 msgid ""
 "%s\n"
@@ -20505,7 +9707,6 @@ msgstr ""
 "    git rebase '<gren>'\n"
 "\n"
 
-#: builtin/rebase.c:986
 #, c-format
 msgid ""
 "If you wish to set tracking information for this branch you can do so with:\n"
@@ -20518,180 +9719,152 @@ msgstr ""
 "    git branch --set-upstream-to=%s/<gren> %s\n"
 "\n"
 
-#: builtin/rebase.c:1016
 msgid "exec commands cannot contain newlines"
 msgstr "exec-kommandon kan inte innehålla nyradstecken"
 
-#: builtin/rebase.c:1020
 msgid "empty exec command"
 msgstr "tomt exec-kommando"
 
-#: builtin/rebase.c:1051
 msgid "rebase onto given branch instead of upstream"
 msgstr "ombasera mot given grenen istället för uppström"
 
-#: builtin/rebase.c:1053
 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:1055
 msgid "allow pre-rebase hook to run"
 msgstr "tillåt pre-rebase-krok att köra"
 
-#: builtin/rebase.c:1057
 msgid "be quiet. implies --no-stat"
 msgstr "var tyst. implicerar --no-stat"
 
-#: builtin/rebase.c:1060
 msgid "display a diffstat of what changed upstream"
 msgstr "vis diffstat för vad som ändrats uppströms"
 
-#: builtin/rebase.c:1063
 msgid "do not show diffstat of what changed upstream"
 msgstr "visa inte en diffstat för vad som ändrats uppströms"
 
-#: builtin/rebase.c:1066
 msgid "add a Signed-off-by trailer to each commit"
 msgstr "lägg \"Signed-off-by:\"-släprad till varje incheckning"
 
-#: builtin/rebase.c:1069
 msgid "make committer date match author date"
 msgstr "sätt incheckningsdatum till författardatum"
 
-#: builtin/rebase.c:1071
 msgid "ignore author date and use current date"
 msgstr "ignorera författardatum och använd nuvarande"
 
-#: builtin/rebase.c:1073
 msgid "synonym of --reset-author-date"
 msgstr "synonym för --reset-author-date"
 
-#: builtin/rebase.c:1075 builtin/rebase.c:1079
 msgid "passed to 'git apply'"
 msgstr "sänds till \"git apply\""
 
-#: builtin/rebase.c:1077
 msgid "ignore changes in whitespace"
 msgstr "ignorera ändringar i blanksteg"
 
-#: builtin/rebase.c:1081 builtin/rebase.c:1084
 msgid "cherry-pick all commits, even if unchanged"
 msgstr "utför cherry-pick på alla incheckningar, även om oändrad"
 
-#: builtin/rebase.c:1086
 msgid "continue"
 msgstr "fortsätt"
 
-#: builtin/rebase.c:1089
 msgid "skip current patch and continue"
 msgstr "hoppa över nuvarande patch och fortsätt"
 
-#: builtin/rebase.c:1091
 msgid "abort and check out the original branch"
 msgstr "avbryt och checka ut ursprungsgrenen"
 
-#: builtin/rebase.c:1094
 msgid "abort but keep HEAD where it is"
 msgstr "avbryt men behåll HEAD där det är"
 
-#: builtin/rebase.c:1095
 msgid "edit the todo list during an interactive rebase"
 msgstr "redigera attgöra-listan under interaktiv ombasering."
 
-#: builtin/rebase.c:1098
 msgid "show the patch file being applied or merged"
 msgstr "visa patchen som tillämpas eller slås samman"
 
-#: builtin/rebase.c:1101
 msgid "use apply strategies to rebase"
 msgstr "använd appliceringstrategier för ombasering"
 
-#: builtin/rebase.c:1105
 msgid "use merging strategies to rebase"
 msgstr "använd sammanslagningsstrategier för ombasering"
 
-#: builtin/rebase.c:1109
 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:1113
-msgid "(DEPRECATED) try to recreate merges instead of ignoring them"
+msgid "(REMOVED) was: try to recreate merges instead of ignoring them"
 msgstr ""
-"(AVRÅDS) försök återskapa sammanslagningar istället för att ignorera dem"
+"(BORTTAGEN) var: försök återskapa sammanslagningar istället för att ignorera "
+"dem"
 
-#: builtin/rebase.c:1118
 msgid "how to handle commits that become empty"
 msgstr "hur incheckningar som blir tomma ska hanteras"
 
-#: builtin/rebase.c:1121
 msgid "keep commits which start empty"
 msgstr "behåller incheckningar som är tomma från början"
 
-#: builtin/rebase.c:1125
 msgid "move commits that begin with squash!/fixup! under -i"
 msgstr "flytta incheckningar som börjar med squash!/fixup! under -i"
 
-#: builtin/rebase.c:1132
 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:1136
 msgid "allow rebasing commits with empty messages"
 msgstr "tillåt ombasering av incheckningar med tomt meddelande"
 
-#: builtin/rebase.c:1140
 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:1143
 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:1145
 msgid "use the given merge strategy"
 msgstr "använd angiven sammanslagningsstrategi"
 
-#: builtin/rebase.c:1147 builtin/revert.c:115
 msgid "option"
 msgstr "alternativ"
 
-#: builtin/rebase.c:1148
 msgid "pass the argument through to the merge strategy"
 msgstr "sänd flaggan till sammanslagningsstrategin"
 
-#: builtin/rebase.c:1151
 msgid "rebase all reachable commits up to the root(s)"
 msgstr "ombasera alla nåbara incheckningar upp till roten/rötterna"
 
-#: builtin/rebase.c:1154
 msgid "automatically re-schedule any `exec` that fails"
 msgstr "kör automatiskt alla \"exec\" som misslyckas på nytt"
 
-#: builtin/rebase.c:1156
 msgid "apply all changes, even those already present upstream"
 msgstr "applicera alla ändringar, även de som redan finns uppströms"
 
-#: builtin/rebase.c:1177
 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:1208
-msgid "--preserve-merges was replaced by --rebase-merges"
-msgstr "--preserve-merges har ersatts av --rebase-merges"
+msgid ""
+"`rebase --preserve-merges` (-p) is no longer supported.\n"
+"Use `git rebase --abort` to terminate current rebase.\n"
+"Or downgrade to v2.33, or earlier, to complete the rebase."
+msgstr ""
+"\"rebase --preserve-merges\" (-p) stöds ej längre.\n"
+"Använd \"git rebase --abort\" för att avsluta aktuell ombasering.\n"
+"Eller nedgradera till v2.33 eller tidigare för att slutföra ombaseringen."
+
+msgid ""
+"--preserve-merges was replaced by --rebase-merges\n"
+"Note: Your `pull.rebase` configuration may also be set to 'preserve',\n"
+"which is no longer supported; use 'merges' instead"
+msgstr ""
+"--preserve-merges ersattes av --rebase-merges\n"
+"Observera: Din inställning för \"pull.rebase\" kan också vara satt till\n"
+"\"preserve\", som inte längre stöds; använd \"merges\" istället"
 
-#: builtin/rebase.c:1230
 msgid "No rebase in progress?"
 msgstr "Ingen ombasering pågår?"
 
-#: builtin/rebase.c:1234
 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:1257 t/helper/test-fast-rebase.c:122
 msgid "Cannot read HEAD"
 msgstr "Kan inte läsa HEAD"
 
-#: builtin/rebase.c:1269
 msgid ""
 "You must edit all merge conflicts and then\n"
 "mark them as resolved using git add"
@@ -20699,16 +9872,13 @@ msgstr ""
 "Du måste redigera alla sammanslagningskonflikter och\n"
 "därefter markera dem som lösta med git add"
 
-#: builtin/rebase.c:1287
 msgid "could not discard worktree changes"
 msgstr "kunde inte kasta ändringar i arbetskatalogen"
 
-#: builtin/rebase.c:1308
 #, c-format
 msgid "could not move back to %s"
 msgstr "kunde inte flytta tillbaka till %s"
 
-#: builtin/rebase.c:1354
 #, c-format
 msgid ""
 "It seems that there is already a %s directory, and\n"
@@ -20729,128 +9899,100 @@ msgstr ""
 "och kör programmet igen. Jag avslutar ifall du fortfarande har\n"
 "något av värde där.\n"
 
-#: builtin/rebase.c:1382
 msgid "switch `C' expects a numerical value"
 msgstr "flaggan \"C\" förväntar ett numeriskt värde"
 
-#: builtin/rebase.c:1424
 #, c-format
 msgid "Unknown mode: %s"
 msgstr "Okänt läge: %s"
 
-#: builtin/rebase.c:1463
 msgid "--strategy requires --merge or --interactive"
 msgstr "--strategy kräver --merge eller --interactive"
 
-#: builtin/rebase.c:1492
 msgid "apply options and merge options cannot be used together"
 msgstr ""
 "appliceringsflaggor och sammanslagningsflaggor kan inte användas tillsammans"
 
-#: builtin/rebase.c:1505
 #, c-format
 msgid "Unknown rebase backend: %s"
 msgstr "Okänd rebase-bakända: %s"
 
-#: builtin/rebase.c:1534
 msgid "--reschedule-failed-exec requires --exec or --interactive"
 msgstr "--reschedule-failed-exec kräver --exec eller --interactive"
 
-#: builtin/rebase.c:1565
 #, c-format
 msgid "invalid upstream '%s'"
 msgstr "felaktig uppström \"%s\""
 
-#: builtin/rebase.c:1571
 msgid "Could not create new root commit"
 msgstr "kunde inte skapa ny rotincheckning"
 
-#: builtin/rebase.c:1597
+#, c-format
+msgid "no such branch/commit '%s'"
+msgstr "ingen sådan gren/incheckning: \"%s\""
+
+#, c-format
+msgid "No such ref: %s"
+msgstr "Ingen sådan referens: %s"
+
+msgid "Could not resolve HEAD to a revision"
+msgstr "Kunde inte bestämma HEAD:s incheckning"
+
 #, c-format
 msgid "'%s': need exactly one merge base with branch"
 msgstr "\"%s\": behöver precis en sammanslagningsbas med gren"
 
-#: builtin/rebase.c:1600
 #, c-format
 msgid "'%s': need exactly one merge base"
 msgstr "\"%s\": behöver precis en sammanslagningsbas"
 
-#: builtin/rebase.c:1609
 #, c-format
 msgid "Does not point to a valid commit '%s'"
 msgstr "Pekar inte på en giltig incheckning: \"%s\""
 
-#: builtin/rebase.c:1636
-#, c-format
-msgid "no such branch/commit '%s'"
-msgstr "ingen sådan gren/incheckning: \"%s\""
-
-#: builtin/rebase.c:1647 builtin/submodule--helper.c:43
-#: builtin/submodule--helper.c:2477
-#, c-format
-msgid "No such ref: %s"
-msgstr "Ingen sådan referens: %s"
-
-#: builtin/rebase.c:1658
-msgid "Could not resolve HEAD to a revision"
-msgstr "Kunde inte bestämma HEAD:s incheckning"
-
-#: builtin/rebase.c:1679
 msgid "Please commit or stash them."
 msgstr "Checka in eller använd \"stash\" på dem."
 
-#: builtin/rebase.c:1714
 msgid "HEAD is up to date."
 msgstr "HEAD är à jour."
 
-#: builtin/rebase.c:1716
 #, c-format
 msgid "Current branch %s is up to date.\n"
 msgstr "Aktuell gren %s är à jour.\n"
 
-#: builtin/rebase.c:1724
 msgid "HEAD is up to date, rebase forced."
 msgstr "HEAD är à jour, ombasering framtvingad."
 
-#: builtin/rebase.c:1726
 #, 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:1734
 msgid "The pre-rebase hook refused to rebase."
 msgstr "Kroken pre-rebase vägrade ombaseringen."
 
-#: builtin/rebase.c:1741
 #, c-format
 msgid "Changes to %s:\n"
 msgstr "Ändringar till %s:\n"
 
-#: builtin/rebase.c:1744
 #, c-format
 msgid "Changes from %s to %s:\n"
 msgstr "Ändringar från %s till %s:\n"
 
-#: builtin/rebase.c:1769
 #, 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:1781
 msgid "Could not detach HEAD"
 msgstr "Kunde inte koppla från HEAD"
 
-#: builtin/rebase.c:1790
 #, c-format
 msgid "Fast-forwarded %s to %s.\n"
 msgstr "Snabbspolade %s till %s.\n"
 
-#: builtin/receive-pack.c:35
 msgid "git receive-pack <git-dir>"
 msgstr "git receive-pack <git-katalog>"
 
-#: builtin/receive-pack.c:1263
 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"
@@ -20880,7 +10022,6 @@ msgstr ""
 "För att undvika detta meddelande och fortfarande behålla det\n"
 "normala beteendet, sätt \"receive.denyCurrentBranch\" till \"refuse\"."
 
-#: builtin/receive-pack.c:1283
 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"
@@ -20901,19 +10042,15 @@ msgstr ""
 "\n"
 "För att undvika detta meddelande kan du sätta det till \"refuse\"."
 
-#: builtin/receive-pack.c:2476
 msgid "quiet"
 msgstr "tyst"
 
-#: builtin/receive-pack.c:2491
 msgid "you must specify a directory"
 msgstr "du måste ange en katalog"
 
-#: builtin/reflog.c:9
 msgid "git reflog [show] [<log-options>] [<ref>]"
 msgstr "git reflog [show] [<log-flaggor>] [<ref>]"
 
-#: builtin/reflog.c:12
 msgid ""
 "git reflog expire [--expire=<time>] [--expire-unreachable=<time>]\n"
 "                  [--rewrite] [--updateref] [--stale-fix]\n"
@@ -20925,7 +10062,6 @@ msgstr ""
 "                  [--dry-run | -n] [--verbose] [--all [--single-worktree] | "
 "<referenser>...]"
 
-#: builtin/reflog.c:17
 msgid ""
 "git reflog delete [--rewrite] [--updateref]\n"
 "                  [--dry-run | -n] [--verbose] <ref>@{<specifier>}..."
@@ -20933,79 +10069,62 @@ msgstr ""
 "git reflog delete [--rewrite] [--updateref]\n"
 "                  [--dry-run | -n] [--verbose] <ref>@{<specificering>}..."
 
-#: builtin/reflog.c:21
 msgid "git reflog exists <ref>"
 msgstr "git reflog exists <referens>"
 
-#: builtin/reflog.c:197 builtin/reflog.c:211
 #, c-format
 msgid "invalid timestamp '%s' given to '--%s'"
 msgstr "ogiltig tidsstämpel \"%s\" given i \"--%s\""
 
-#: builtin/reflog.c:240 builtin/reflog.c:359
 msgid "do not actually prune any entries"
 msgstr "rensa faktiskt inte några poster"
 
-#: builtin/reflog.c:243 builtin/reflog.c:362
 msgid ""
 "rewrite the old SHA1 with the new SHA1 of the entry that now precedes it"
 msgstr "skriv om gammal SHA1 med ny SHA1 i posten som nu föregår den"
 
-#: builtin/reflog.c:246 builtin/reflog.c:365
 msgid "update the reference to the value of the top reflog entry"
 msgstr "uppdatera referensen till värdet i översta referensloggposten"
 
-#: builtin/reflog.c:248 builtin/reflog.c:367
 msgid "print extra information on screen"
 msgstr "visa extra information på skärm"
 
-#: builtin/reflog.c:249 builtin/reflog.c:253
 msgid "timestamp"
 msgstr "tidsstämpel"
 
-#: builtin/reflog.c:250
 msgid "prune entries older than the specified time"
 msgstr "rensa poster äldre än angiven tid"
 
-#: builtin/reflog.c:254
 msgid ""
 "prune entries older than <time> that are not reachable from the current tip "
 "of the branch"
 msgstr ""
 "rensa poster äldre än <tid> som inte kan nås från nuvarande ände av grenen"
 
-#: builtin/reflog.c:258
 msgid "prune any reflog entries that point to broken commits"
 msgstr "rensa alla referensloggposter som pekar på trasiga incheckningar"
 
-#: builtin/reflog.c:259
 msgid "process the reflogs of all references"
 msgstr "hantera referensloggar för alla referenser"
 
-#: builtin/reflog.c:261
 msgid "limits processing to reflogs from the current worktree only"
 msgstr "begränsar hantering av referensloggar till endst aktuell arbetskatalog"
 
-#: builtin/reflog.c:294
 #, c-format
 msgid "Marking reachable objects..."
 msgstr "Markerar nåbara objekt..."
 
-#: builtin/reflog.c:338
 #, c-format
 msgid "%s points nowhere!"
 msgstr "%s pekar ingenstans!"
 
-#: builtin/reflog.c:374
 msgid "no reflog specified to delete"
 msgstr "ingen referenslogg att ta bort angavs"
 
-#: builtin/reflog.c:396
 #, c-format
 msgid "invalid ref format: %s"
 msgstr "felaktigt referensformat: %s"
 
-#: builtin/remote.c:19
 msgid ""
 "git remote add [-t <branch>] [-m <master>] [-f] [--tags | --no-tags] [--"
 "mirror=<fetch|push>] <name> <url>"
@@ -21013,87 +10132,67 @@ msgstr ""
 "git remote add [-t <gren>] [-m <master>] [-f] [--tags | --no-tags] [--"
 "mirror=<fetch|push>] <namn> <url>"
 
-#: builtin/remote.c:20 builtin/remote.c:40
 msgid "git remote rename [--[no-]progress] <old> <new>"
 msgstr "git remote rename [--[no-]progress] <gammal> <ny>"
 
-#: builtin/remote.c:21 builtin/remote.c:45
 msgid "git remote remove <name>"
 msgstr "git remote remove <namn>"
 
-#: builtin/remote.c:22 builtin/remote.c:50
 msgid "git remote set-head <name> (-a | --auto | -d | --delete | <branch>)"
 msgstr "git remote set-head <namn> (-a | --auto | -d | --delete | <gren>)"
 
-#: builtin/remote.c:23
 msgid "git remote [-v | --verbose] show [-n] <name>"
 msgstr "git remote [-v | --verbose] show [-n] <namn>"
 
-#: builtin/remote.c:24
 msgid "git remote prune [-n | --dry-run] <name>"
 msgstr "git remote prune [-n | --dry-run] <namn>"
 
-#: builtin/remote.c:25
 msgid ""
 "git remote [-v | --verbose] update [-p | --prune] [(<group> | <remote>)...]"
 msgstr ""
 "git remote [-v | --verbose] update [-p | --prune] [(<grupp> | <fjärr>)...]"
 
-#: builtin/remote.c:26
 msgid "git remote set-branches [--add] <name> <branch>..."
 msgstr "git remote set-branches [--add] <namn> <gren>..."
 
-#: builtin/remote.c:27 builtin/remote.c:76
 msgid "git remote get-url [--push] [--all] <name>"
 msgstr "git remote get-url [--push] [--all] <namn>"
 
-#: builtin/remote.c:28 builtin/remote.c:81
 msgid "git remote set-url [--push] <name> <newurl> [<oldurl>]"
 msgstr "git remote set-url [--push] <namn> <nyurl> [<gammalurl>]"
 
-#: builtin/remote.c:29 builtin/remote.c:82
 msgid "git remote set-url --add <name> <newurl>"
 msgstr "git remote set-url --add <namn> <nyurl>"
 
-#: builtin/remote.c:30 builtin/remote.c:83
 msgid "git remote set-url --delete <name> <url>"
 msgstr "git remote set-url --delete <namn> <url>"
 
-#: builtin/remote.c:35
 msgid "git remote add [<options>] <name> <url>"
 msgstr "git remote add [<flaggor>] <namn> <url>"
 
-#: builtin/remote.c:55
 msgid "git remote set-branches <name> <branch>..."
 msgstr "git remote set-branches <namn> <gren>..."
 
-#: builtin/remote.c:56
 msgid "git remote set-branches --add <name> <branch>..."
 msgstr "git remote set-branches --add <namn> <gren>..."
 
-#: builtin/remote.c:61
 msgid "git remote show [<options>] <name>"
 msgstr "git remote show [<flaggor>] <namn>"
 
-#: builtin/remote.c:66
 msgid "git remote prune [<options>] <name>"
 msgstr "git remote prune [<flaggor>] <namn>"
 
-#: builtin/remote.c:71
 msgid "git remote update [<options>] [<group> | <remote>]..."
 msgstr "git remote update [<flaggor>] [<grupp> | <fjärr>]..."
 
-#: builtin/remote.c:100
 #, c-format
 msgid "Updating %s"
 msgstr "Uppdaterar %s"
 
-#: builtin/remote.c:102
 #, c-format
 msgid "Could not fetch %s"
 msgstr "Kunde inte hämta %s"
 
-#: builtin/remote.c:132
 msgid ""
 "--mirror is dangerous and deprecated; please\n"
 "\t use --mirror=fetch or --mirror=push instead"
@@ -21101,77 +10200,68 @@ msgstr ""
 "--mirror är farlig och föråldrad; använd\n"
 "\t --mirror=fetch eller --mirror=push istället"
 
-#: builtin/remote.c:149
 #, c-format
 msgid "unknown mirror argument: %s"
 msgstr "okänt argument till mirror: %s"
 
-#: builtin/remote.c:165
 msgid "fetch the remote branches"
 msgstr "hämta fjärrgrenarna"
 
-#: builtin/remote.c:167
 msgid "import all tags and associated objects when fetching"
 msgstr "importera alla taggar och associerade objekt vid hämtning"
 
-#: builtin/remote.c:170
 msgid "or do not fetch any tag at all (--no-tags)"
 msgstr "eller hämta inte några taggar alls (--no-tags)"
 
-#: builtin/remote.c:172
 msgid "branch(es) to track"
 msgstr "gren(ar) att spåra"
 
-#: builtin/remote.c:173
 msgid "master branch"
 msgstr "huvudgren"
 
-#: builtin/remote.c:175
 msgid "set up remote as a mirror to push to or fetch from"
 msgstr "ställ in arkiv som spegel att sända eller ta emot från"
 
-#: builtin/remote.c:187
 msgid "specifying a master branch makes no sense with --mirror"
 msgstr "att ange en master-gren ger ingen mening med --mirror"
 
-#: builtin/remote.c:189
 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:196 builtin/remote.c:716
 #, c-format
 msgid "remote %s already exists."
 msgstr "fjärrarkivet %s finns redan."
 
-#: builtin/remote.c:241
 #, c-format
 msgid "Could not setup master '%s'"
 msgstr "Kunde inte skapa master \"%s\""
 
-#: builtin/remote.c:323
+#, c-format
+msgid "more than one %s"
+msgstr "mer än en %s"
+
 #, c-format
 msgid "unhandled branch.%s.rebase=%s; assuming 'true'"
 msgstr "ohanterad branch.%s.rebase=%s; antar \"true\""
 
-#: builtin/remote.c:367
 #, c-format
 msgid "Could not get fetch map for refspec %s"
 msgstr "Kunde inte hämta mappning för referensspecifikation %s"
 
-#: builtin/remote.c:461 builtin/remote.c:469
 msgid "(matching)"
 msgstr "(träffande)"
 
-#: builtin/remote.c:473
 msgid "(delete)"
 msgstr "(ta bort)"
 
-#: builtin/remote.c:664
 #, c-format
 msgid "could not set '%s'"
 msgstr "kunde inte ställa in \"%s\""
 
-#: builtin/remote.c:669
+#, c-format
+msgid "could not unset '%s'"
+msgstr "kunde inte ta bort inställning för \"%s\""
+
 #, c-format
 msgid ""
 "The %s configuration remote.pushDefault in:\n"
@@ -21182,17 +10272,14 @@ msgstr ""
 "\t%s:%d\n"
 "anger nu den icke-existerande fjärren \"%s\""
 
-#: builtin/remote.c:707 builtin/remote.c:866 builtin/remote.c:973
 #, c-format
 msgid "No such remote: '%s'"
 msgstr "Ingen sådan fjärr: \"%s\""
 
-#: builtin/remote.c:726
 #, c-format
 msgid "Could not rename config section '%s' to '%s'"
 msgstr "Kunde inte byta namn på konfigurationssektionen \"%s\" till \"%s\""
 
-#: builtin/remote.c:746
 #, c-format
 msgid ""
 "Not updating non-default fetch refspec\n"
@@ -21203,21 +10290,17 @@ msgstr ""
 "\t%s\n"
 "\tUppdatera konfigurationen manuellt om nödvändigt."
 
-#: builtin/remote.c:783
 msgid "Renaming remote references"
 msgstr "Byter namn på fjärreferenser"
 
-#: builtin/remote.c:794
 #, c-format
 msgid "deleting '%s' failed"
 msgstr "misslyckades ta bort \"%s\""
 
-#: builtin/remote.c:832
 #, c-format
 msgid "creating '%s' failed"
 msgstr "misslyckades skapa \"%s\""
 
-#: builtin/remote.c:912
 msgid ""
 "Note: A branch outside the refs/remotes/ hierarchy was not removed;\n"
 "to delete it, use:"
@@ -21231,118 +10314,93 @@ msgstr[1] ""
 "Observera: Några grenar utanför hierarkin refs/remotes/ togs inte bort;\n"
 "för att ta bort dem, använd:"
 
-#: builtin/remote.c:926
 #, c-format
 msgid "Could not remove config section '%s'"
 msgstr "Kunde inte ta bort konfigurationssektionen \"%s\""
 
-#: builtin/remote.c:1034
 #, c-format
 msgid " new (next fetch will store in remotes/%s)"
 msgstr " ny (nästa hämtning sparar i remotes/%s)"
 
-#: builtin/remote.c:1037
 msgid " tracked"
 msgstr " spårad"
 
-#: builtin/remote.c:1039
 msgid " stale (use 'git remote prune' to remove)"
 msgstr " förlegad (använd \"git remote prune\" för att ta bort)"
 
-#: builtin/remote.c:1041
 msgid " ???"
 msgstr " ???"
 
-#: builtin/remote.c:1082
 #, 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:1091
 #, c-format
 msgid "rebases interactively onto remote %s"
 msgstr "ombaseras interaktivt på fjärren %s"
 
-#: builtin/remote.c:1093
 #, c-format
 msgid "rebases interactively (with merges) onto remote %s"
 msgstr "ombaseras interaktivt (med sammanslagningar) på fjärren %s"
 
-#: builtin/remote.c:1096
 #, c-format
 msgid "rebases onto remote %s"
 msgstr "ombaseras på fjärren %s"
 
-#: builtin/remote.c:1100
 #, c-format
 msgid " merges with remote %s"
 msgstr " sammanslås med fjärren %s"
 
-#: builtin/remote.c:1103
 #, c-format
 msgid "merges with remote %s"
 msgstr "sammanslås med fjärren %s"
 
-#: builtin/remote.c:1106
 #, c-format
 msgid "%-*s    and with remote %s\n"
 msgstr "%-*s    och med fjärren %s\n"
 
-#: builtin/remote.c:1149
 msgid "create"
 msgstr "skapa"
 
-#: builtin/remote.c:1152
 msgid "delete"
 msgstr "ta bort"
 
-#: builtin/remote.c:1156
 msgid "up to date"
 msgstr "àjour"
 
-#: builtin/remote.c:1159
 msgid "fast-forwardable"
 msgstr "kan snabbspolas"
 
-#: builtin/remote.c:1162
 msgid "local out of date"
 msgstr "lokal föråldrad"
 
-#: builtin/remote.c:1169
 #, c-format
 msgid "    %-*s forces to %-*s (%s)"
 msgstr "    %-*s tvingar till %-*s (%s)"
 
-#: builtin/remote.c:1172
 #, c-format
 msgid "    %-*s pushes to %-*s (%s)"
 msgstr "    %-*s sänder till %-*s (%s)"
 
-#: builtin/remote.c:1176
 #, c-format
 msgid "    %-*s forces to %s"
 msgstr "    %-*s tvingar till %s"
 
-#: builtin/remote.c:1179
 #, c-format
 msgid "    %-*s pushes to %s"
 msgstr "    %-*s sänder till %s"
 
-#: builtin/remote.c:1247
 msgid "do not query remotes"
 msgstr "fråga inte fjärrar"
 
-#: builtin/remote.c:1268
 #, c-format
 msgid "* remote %s"
 msgstr "* fjärr %s"
 
-#: builtin/remote.c:1269
 #, c-format
 msgid "  Fetch URL: %s"
 msgstr "  Hämt-URL: %s"
 
-#: builtin/remote.c:1270 builtin/remote.c:1286 builtin/remote.c:1423
 msgid "(no URL)"
 msgstr "(ingen URL)"
 
@@ -21350,360 +10408,290 @@ msgstr "(ingen URL)"
 #. with the one in " Fetch URL: %s"
 #. translation.
 #.
-#: builtin/remote.c:1284 builtin/remote.c:1286
 #, c-format
 msgid "  Push  URL: %s"
 msgstr "  Sänd-URL: %s"
 
-#: builtin/remote.c:1288 builtin/remote.c:1290 builtin/remote.c:1292
 #, c-format
 msgid "  HEAD branch: %s"
 msgstr "  HEAD-gren: %s"
 
-#: builtin/remote.c:1288
 msgid "(not queried)"
 msgstr "(inte förfrågad)"
 
-#: builtin/remote.c:1290
 msgid "(unknown)"
 msgstr "(okänd)"
 
-#: builtin/remote.c:1294
 #, 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:1306
 #, c-format
 msgid "  Remote branch:%s"
 msgid_plural "  Remote branches:%s"
 msgstr[0] "  Fjärrgren:%s"
 msgstr[1] "  Fjärrgrenar:%s"
 
-#: builtin/remote.c:1309 builtin/remote.c:1335
 msgid " (status not queried)"
 msgstr " (status inte förfrågad)"
 
-#: builtin/remote.c:1318
 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:1326
 msgid "  Local refs will be mirrored by 'git push'"
 msgstr "  Lokala referenser speglas av \"git push\""
 
-#: builtin/remote.c:1332
 #, 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:1353
 msgid "set refs/remotes/<name>/HEAD according to remote"
 msgstr "sätt refs/remotes/<namn>/HEAD enligt fjärren"
 
-#: builtin/remote.c:1355
 msgid "delete refs/remotes/<name>/HEAD"
 msgstr "ta bort refs/remotes/<namn>/HEAD"
 
-#: builtin/remote.c:1369
 msgid "Cannot determine remote HEAD"
 msgstr "Kan inte bestämma HEAD på fjärren"
 
-#: builtin/remote.c:1371
 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:1381
 #, c-format
 msgid "Could not delete %s"
 msgstr "Kunde inte ta bort %s"
 
-#: builtin/remote.c:1389
 #, c-format
 msgid "Not a valid ref: %s"
 msgstr "Inte en giltig referens: %s"
 
-#: builtin/remote.c:1391
 #, c-format
 msgid "Could not setup %s"
 msgstr "Kunde inte ställa in %s"
 
-#: builtin/remote.c:1409
 #, c-format
 msgid " %s will become dangling!"
 msgstr " %s kommer bli dinglande!"
 
-#: builtin/remote.c:1410
 #, c-format
 msgid " %s has become dangling!"
 msgstr " %s har blivit dinglande!"
 
-#: builtin/remote.c:1419
 #, c-format
 msgid "Pruning %s"
 msgstr "Rensar %s"
 
-#: builtin/remote.c:1420
 #, c-format
 msgid "URL: %s"
 msgstr "URL: %s"
 
-#: builtin/remote.c:1436
 #, c-format
 msgid " * [would prune] %s"
 msgstr " * [skulle rensa] %s"
 
-#: builtin/remote.c:1439
 #, c-format
 msgid " * [pruned] %s"
 msgstr " * [rensad] %s"
 
-#: builtin/remote.c:1484
 msgid "prune remotes after fetching"
 msgstr "rensa fjärrar efter hämtning"
 
-#: builtin/remote.c:1548 builtin/remote.c:1604 builtin/remote.c:1674
 #, c-format
 msgid "No such remote '%s'"
 msgstr "Ingen sådan fjärr \"%s\""
 
-#: builtin/remote.c:1566
 msgid "add branch"
 msgstr "lägg till gren"
 
-#: builtin/remote.c:1573
 msgid "no remote specified"
 msgstr "ingen fjärr angavs"
 
-#: builtin/remote.c:1590
 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:1592
 msgid "return all URLs"
 msgstr "returnera alla URL:er"
 
-#: builtin/remote.c:1622
 #, c-format
 msgid "no URLs configured for remote '%s'"
 msgstr "ingen URL:er angivna för fjärren \"%s\""
 
-#: builtin/remote.c:1648
 msgid "manipulate push URLs"
 msgstr "manipulera URL:ar för sändning"
 
-#: builtin/remote.c:1650
 msgid "add URL"
 msgstr "lägg till URL"
 
-#: builtin/remote.c:1652
 msgid "delete URLs"
 msgstr "ta bort URL:ar"
 
-#: builtin/remote.c:1659
 msgid "--add --delete doesn't make sense"
 msgstr "--add --delete ger ingen mening"
 
-#: builtin/remote.c:1700
 #, c-format
 msgid "Invalid old URL pattern: %s"
 msgstr "Felaktig gammalt URL-mönster: %s"
 
-#: builtin/remote.c:1708
 #, c-format
 msgid "No such URL found: %s"
 msgstr "Ingen sådan URL hittades: %s"
 
-#: builtin/remote.c:1710
 msgid "Will not delete all non-push URLs"
 msgstr "Kommer inte ta bort alla icke-sänd-URL:er"
 
-#: builtin/remote.c:1727
 msgid "be verbose; must be placed before a subcommand"
 msgstr "var pratsam; måste skrivas före ett underkommando"
 
-#: builtin/repack.c:29
 msgid "git repack [<options>]"
 msgstr "git repack [<flaggor>]"
 
-#: builtin/repack.c:34
 msgid ""
 "Incremental repacks are incompatible with bitmap indexes.  Use\n"
-"--no-write-bitmap-index or disable the pack.writebitmaps configuration."
+"--no-write-bitmap-index or disable the pack.writeBitmaps configuration."
 msgstr ""
 "Inkrementella ompackningar är inte kompatibla med bitmapp-index.\n"
 "Använd --no-write-bitmap-index eller inaktivera inställningen\n"
-"pack.writebitmaps"
+"pack.writeBitmaps."
 
-#: builtin/repack.c:206
 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:280 builtin/repack.c:824
 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:304
 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:319
 #, c-format
 msgid "cannot open index for %s"
 msgstr "kunde inte öppna indexet för %s"
 
-#: builtin/repack.c:378
 #, 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:411 builtin/repack.c:418 builtin/repack.c:423
 #, c-format
 msgid "pack %s too large to roll up"
 msgstr "paketet %s för stort att rulla upp"
 
-#: builtin/repack.c:503
 #, c-format
 msgid "could not open tempfile %s for writing"
 msgstr "kunde inte öppna temporär fil %s för skrivning"
 
-#: builtin/repack.c:521
 msgid "could not close refs snapshot tempfile"
 msgstr "kunde inte stänga temporär fil för refs-ögonblicksbild"
 
-#: builtin/repack.c:634
 msgid "pack everything in a single pack"
 msgstr "packa allt i ett enda paket"
 
-#: builtin/repack.c:636
 msgid "same as -a, and turn unreachable objects loose"
 msgstr "samma som -a, och gör onåbara objekt lösa"
 
-#: builtin/repack.c:639
+msgid "same as -a, pack unreachable cruft objects separately"
+msgstr "samma som -a, packa onåbara onödiga objekt separat"
+
+msgid "approxidate"
+msgstr "cirkadatum"
+
+msgid "with -C, expire objects older than this"
+msgstr "med -C, låt tid gå ut för objekt äldre än detta"
+
 msgid "remove redundant packs, and run git-prune-packed"
 msgstr "ta bort överflödiga paket, och kör git-prune-packed"
 
-#: builtin/repack.c:641
 msgid "pass --no-reuse-delta to git-pack-objects"
 msgstr "sänd --no-reuse-delta till git-pack-objects"
 
-#: builtin/repack.c:643
 msgid "pass --no-reuse-object to git-pack-objects"
 msgstr "sänd --no-reuse-object till git-pack-objects"
 
-#: builtin/repack.c:645
 msgid "do not run git-update-server-info"
 msgstr "kör inte git-update-server-info"
 
-#: builtin/repack.c:648
 msgid "pass --local to git-pack-objects"
 msgstr "sänd --local till git-pack-objects"
 
-#: builtin/repack.c:650
 msgid "write bitmap index"
 msgstr "skriv bitkartindex"
 
-#: builtin/repack.c:652
 msgid "pass --delta-islands to git-pack-objects"
 msgstr "sänd --delta-islands till git-pack-objects"
 
-#: builtin/repack.c:653
-msgid "approxidate"
-msgstr "cirkadatum"
-
-#: builtin/repack.c:654
 msgid "with -A, do not loosen objects older than this"
 msgstr "med -A, lös inte upp objekt äldre än detta"
 
-#: builtin/repack.c:656
 msgid "with -a, repack unreachable objects"
 msgstr "med -a, packa om onåbara objekt"
 
-#: builtin/repack.c:658
 msgid "size of the window used for delta compression"
 msgstr "storlek på fönster använt för deltakomprimering"
 
-#: builtin/repack.c:659 builtin/repack.c:665
 msgid "bytes"
 msgstr "byte"
 
-#: builtin/repack.c:660
 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:662
 msgid "limits the maximum delta depth"
 msgstr "begränsa maximalt deltadjup"
 
-#: builtin/repack.c:664
 msgid "limits the maximum number of threads"
 msgstr "begränsar maximalt antal trådar"
 
-#: builtin/repack.c:666
 msgid "maximum size of each packfile"
 msgstr "maximal storlek på varje paketfil"
 
-#: builtin/repack.c:668
 msgid "repack objects in packs marked with .keep"
 msgstr "packa om objekt i paket märkta med .keep"
 
-#: builtin/repack.c:670
 msgid "do not repack this pack"
 msgstr "packa inte om detta paket"
 
-#: builtin/repack.c:672
 msgid "find a geometric progression with factor <N>"
 msgstr "hitta ett geometrisk förlopp med faktor <N>"
 
-#: builtin/repack.c:674
 msgid "write a multi-pack index of the resulting packs"
 msgstr "skriv ett flerpaketsindex för de skapade paketen"
 
-#: builtin/repack.c:684
 msgid "cannot delete packs in a precious-objects repo"
 msgstr "kan inte ta bort paket i ett \"precious-objects\"-arkiv"
 
-#: builtin/repack.c:833
 msgid "Nothing new to pack."
 msgstr "Inget nytt att packa."
 
-#: builtin/repack.c:863
+#, c-format
+msgid "pack prefix %s does not begin with objdir %s"
+msgstr "paketprefixet %s börjar inte med objkat %s"
+
 #, c-format
 msgid "missing required file: %s"
 msgstr "nödvändig fil saknas: %s"
 
-#: builtin/repack.c:865
 #, c-format
 msgid "could not unlink: %s"
 msgstr "kunde inte ta bort: \"%s\""
 
-#: builtin/replace.c:22
 msgid "git replace [-f] <object> <replacement>"
 msgstr "git replace [-f] <objekt> <ersättning>"
 
-#: builtin/replace.c:23
 msgid "git replace [-f] --edit <object>"
 msgstr "git replace [-f] --edit <objekt>"
 
-#: builtin/replace.c:24
 msgid "git replace [-f] --graft <commit> [<parent>...]"
 msgstr "git replace [-f] --graft <incheckning> [<förälder>...]"
 
-#: builtin/replace.c:26
 msgid "git replace -d <object>..."
 msgstr "git replace -d <objekt>..."
 
-#: builtin/replace.c:27
 msgid "git replace [--format=<format>] [-l [<pattern>]]"
 msgstr "git replace [--format=<format>] [-l [<mönster>]]"
 
-#: builtin/replace.c:90
 #, c-format
 msgid ""
 "invalid replace format '%s'\n"
@@ -21712,27 +10700,22 @@ msgstr ""
 "ogiltigt ersättningsformat \"%s\"\n"
 "giltiga format är \"short\", \"medium\" och \"long\""
 
-#: builtin/replace.c:125
 #, c-format
 msgid "replace ref '%s' not found"
 msgstr "ersättningsreferensen \"%s\" hittades inte"
 
-#: builtin/replace.c:141
 #, c-format
 msgid "Deleted replace ref '%s'"
 msgstr "Tog bort ersättningsreferensen \"%s\""
 
-#: builtin/replace.c:153
 #, c-format
 msgid "'%s' is not a valid ref name"
 msgstr "\"%s\" är inte ett giltigt referensnamn"
 
-#: builtin/replace.c:158
 #, c-format
 msgid "replace ref '%s' already exists"
 msgstr "ersättningsreferensen \"%s\" finns redan"
 
-#: builtin/replace.c:178
 #, c-format
 msgid ""
 "Objects must be of the same type.\n"
@@ -21743,75 +10726,59 @@ msgstr ""
 "\"%s\" pekar på ett ersatt objekt med typen \"%s\"\n"
 "medan \"%s\" pekar på ett ersättningsobjekt av typen \"%s\"."
 
-#: builtin/replace.c:229
 #, c-format
 msgid "unable to open %s for writing"
 msgstr "kan inte öppna %s för skrivning"
 
-#: builtin/replace.c:242
 msgid "cat-file reported failure"
 msgstr "cat-file rapporterade misslyckande"
 
-#: builtin/replace.c:258
 #, c-format
 msgid "unable to open %s for reading"
 msgstr "kan inte öppna %s för läsning"
 
-#: builtin/replace.c:271
 msgid "unable to spawn mktree"
 msgstr "kan inte starta mktree"
 
-#: builtin/replace.c:275
 msgid "unable to read from mktree"
 msgstr "kan inte läsa från mktree"
 
-#: builtin/replace.c:284
 msgid "mktree reported failure"
 msgstr "mktree rapporterade misslyckande"
 
-#: builtin/replace.c:288
 msgid "mktree did not return an object name"
 msgstr "mktree returnerade inte ett objektnamn"
 
-#: builtin/replace.c:297
 #, c-format
 msgid "unable to fstat %s"
 msgstr "kan inte utföra \"fstat\" på %s"
 
-#: builtin/replace.c:302
 msgid "unable to write object to database"
 msgstr "kan inte skriva objektet till databasen"
 
-#: builtin/replace.c:325
 #, c-format
 msgid "unable to get object type for %s"
 msgstr "kan inte läsa objekttyp för %s"
 
-#: builtin/replace.c:341
 msgid "editing object file failed"
 msgstr "misslyckades redigera objektfilen"
 
-#: builtin/replace.c:350
 #, c-format
 msgid "new object is the same as the old one: '%s'"
 msgstr "nytt objekt är samma som det gamla: \"%s\""
 
-#: builtin/replace.c:383
 #, c-format
 msgid "could not parse %s as a commit"
 msgstr "kunde inte tolka %s som incheckning"
 
-#: builtin/replace.c:415
 #, c-format
 msgid "bad mergetag in commit '%s'"
 msgstr "felaktig sammanslagningstagg i incheckningen \"%s\""
 
-#: builtin/replace.c:417
 #, c-format
 msgid "malformed mergetag in commit '%s'"
 msgstr "felformad sammanslagningstagg i incheckningen \"%s\""
 
-#: builtin/replace.c:429
 #, c-format
 msgid ""
 "original commit '%s' contains mergetag '%s' that is discarded; use --edit "
@@ -21820,31 +10787,25 @@ msgstr ""
 "den ursprungliga incheckningen \"%s\" innehåller sammanslagningstaggen \"%s"
 "\" som har förkastats; använd --edit istället för --graft"
 
-#: builtin/replace.c:468
 #, c-format
 msgid "the original commit '%s' has a gpg signature"
 msgstr "den ursprungliga incheckningen \"%s\" har en gpg-signatur"
 
-#: builtin/replace.c:469
 msgid "the signature will be removed in the replacement commit!"
 msgstr "signaturen kommer att tas bort i ersättningsincheckningen!"
 
-#: builtin/replace.c:479
 #, c-format
 msgid "could not write replacement commit for: '%s'"
 msgstr "kunde inte skriva ersättningsincheckning för: \"%s\""
 
-#: builtin/replace.c:487
 #, c-format
 msgid "graft for '%s' unnecessary"
 msgstr "ympning för \"%s\" behövs inte"
 
-#: builtin/replace.c:491
 #, c-format
 msgid "new commit is the same as the old one: '%s'"
 msgstr "ny incheckning är samma som den gamla: \"%s\""
 
-#: builtin/replace.c:526
 #, c-format
 msgid ""
 "could not convert the following graft(s):\n"
@@ -21853,213 +10814,163 @@ msgstr ""
 "kunde inte konvertera följande ympning(ar):\n"
 "%s"
 
-#: builtin/replace.c:547
 msgid "list replace refs"
 msgstr "visa ersättningsreferenser"
 
-#: builtin/replace.c:548
 msgid "delete replace refs"
 msgstr "ta bort ersättningsreferenser"
 
-#: builtin/replace.c:549
 msgid "edit existing object"
 msgstr "redigera befintligt objekt"
 
-#: builtin/replace.c:550
 msgid "change a commit's parents"
 msgstr "ändra en inchecknings föräldrar"
 
-#: builtin/replace.c:551
 msgid "convert existing graft file"
 msgstr "konvertera befintlig ympningsfil"
 
-#: builtin/replace.c:552
 msgid "replace the ref if it exists"
 msgstr "ersätt referensen om den finns"
 
-#: builtin/replace.c:554
 msgid "do not pretty-print contents for --edit"
 msgstr "använd inte snygg visning av innehåll för --edit"
 
-#: builtin/replace.c:555
 msgid "use this format"
 msgstr "använd detta format"
 
-#: builtin/replace.c:568
 msgid "--format cannot be used when not listing"
 msgstr "--format kan inte användas utanför listning"
 
-#: builtin/replace.c:576
 msgid "-f only makes sense when writing a replacement"
 msgstr "-f kan endast användas vid skrivning av ersättning"
 
-#: builtin/replace.c:580
 msgid "--raw only makes sense with --edit"
 msgstr "--raw kan bara användas med --edit"
 
-#: builtin/replace.c:586
 msgid "-d needs at least one argument"
 msgstr "-d behöver minst ett argument"
 
-#: builtin/replace.c:592
 msgid "bad number of arguments"
 msgstr "fel antal argument"
 
-#: builtin/replace.c:598
 msgid "-e needs exactly one argument"
 msgstr "-e tar exakt ett argument"
 
-#: builtin/replace.c:604
 msgid "-g needs at least one argument"
 msgstr "-g tar minst ett argument"
 
-#: builtin/replace.c:610
 msgid "--convert-graft-file takes no argument"
 msgstr "--convert-graft-file tar inga argument"
 
-#: builtin/replace.c:616
 msgid "only one pattern can be given with -l"
 msgstr "endast ett mönster kan anges med -l"
 
-#: builtin/rerere.c:13
 msgid "git rerere [clear | forget <path>... | status | remaining | diff | gc]"
 msgstr "git rerere [clear | forget <path>... | status | remaining | diff | gc]"
 
-#: builtin/rerere.c:58
 msgid "register clean resolutions in index"
 msgstr "registrera rena lösningar i indexet"
 
-#: builtin/rerere.c:77
 msgid "'git rerere forget' without paths is deprecated"
 msgstr "\"git rerere forget\" utan sökvägar är föråldrat"
 
-#: builtin/rerere.c:111
 #, c-format
 msgid "unable to generate diff for '%s'"
 msgstr "misslyckades skapa diff för \"%s\""
 
-#: builtin/reset.c:33
 msgid ""
 "git reset [--mixed | --soft | --hard | --merge | --keep] [-q] [<commit>]"
 msgstr ""
 "git reset [--mixed | --soft | --hard | --merge | --keep] [-q] [<incheckning>]"
 
-#: builtin/reset.c:34
 msgid "git reset [-q] [<tree-ish>] [--] <pathspec>..."
 msgstr "git reset [-q] [<träd-igt>] [--] <sökvägar>..."
 
-#: builtin/reset.c:35
 msgid ""
 "git reset [-q] [--pathspec-from-file [--pathspec-file-nul]] [<tree-ish>]"
 msgstr ""
 "git reset [-q] [--pathspec-from-file [--pathspec-file-nul]] [<träd-igt>]"
 
-#: builtin/reset.c:36
 msgid "git reset --patch [<tree-ish>] [--] [<pathspec>...]"
 msgstr "git reset --patch [<träd-igt>] [--] [<sökvägar>...]"
 
-#: builtin/reset.c:42
 msgid "mixed"
 msgstr "blandad"
 
-#: builtin/reset.c:42
 msgid "soft"
 msgstr "mjuk"
 
-#: builtin/reset.c:42
 msgid "hard"
 msgstr "hård"
 
-#: builtin/reset.c:42
 msgid "merge"
 msgstr "sammanslagning"
 
-#: builtin/reset.c:42
 msgid "keep"
 msgstr "behåll"
 
-#: builtin/reset.c:90
 msgid "You do not have a valid HEAD."
 msgstr "Du har inte en giltig HEAD."
 
-#: builtin/reset.c:92
 msgid "Failed to find tree of HEAD."
 msgstr "Kunde inte hitta trädet för HEAD."
 
-#: builtin/reset.c:98
 #, c-format
 msgid "Failed to find tree of %s."
 msgstr "Kunde inte hitta trädet för %s."
 
-#: builtin/reset.c:123
 #, c-format
 msgid "HEAD is now at %s"
 msgstr "HEAD är nu på %s"
 
-#: builtin/reset.c:304
 #, 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:402 builtin/stash.c:606 builtin/stash.c:669
-#: builtin/stash.c:693
 msgid "be quiet, only report errors"
 msgstr "var tyst, rapportera endast fel"
 
-#: builtin/reset.c:404
 msgid "skip refreshing the index after reset"
 msgstr "hoppa över uppdatering av indexet efter nollställning"
 
-#: builtin/reset.c:406
 msgid "reset HEAD and index"
 msgstr "återställ HEAD och index"
 
-#: builtin/reset.c:407
 msgid "reset only HEAD"
 msgstr "återställ endast HEAD"
 
-#: builtin/reset.c:409 builtin/reset.c:411
 msgid "reset HEAD, index and working tree"
 msgstr "återställ HEAD, index och arbetskatalog"
 
-#: builtin/reset.c:413
 msgid "reset HEAD but keep local changes"
 msgstr "återställ HEAD men behåll lokala ändringar"
 
-#: builtin/reset.c:419
 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:452
 #, c-format
 msgid "Failed to resolve '%s' as a valid revision."
 msgstr "Kunde inte slå upp \"%s\" som en giltig revision."
 
-#: builtin/reset.c:460
 #, 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:479
 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:481
 #, c-format
 msgid "Cannot do %s reset with paths."
 msgstr "Kan inte göra %s återställning med sökvägar."
 
-#: builtin/reset.c:496
 #, 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:527
 msgid "Unstaged changes after reset:"
 msgstr "Oköade ändringar efter återställning:"
 
-#: builtin/reset.c:530
 #, c-format
 msgid ""
 "It took %.2f seconds to refresh the index after reset.  You can use\n"
@@ -22068,53 +10979,45 @@ msgstr ""
 "Det tog %.2f sekunder att uppdatera indexet efter återställning.\n"
 "Du kan använda \"--no-refresh\" för undvika detta."
 
-#: builtin/reset.c:547
 #, c-format
 msgid "Could not reset index file to revision '%s'."
 msgstr "Kunde inte återställa indexfilen till versionen \"%s\"."
 
-#: builtin/reset.c:552
 msgid "Could not write new index file."
 msgstr "Kunde inte skriva ny indexfil."
 
-#: builtin/rev-list.c:659
+#, c-format
+msgid "unable to get disk usage of %s"
+msgstr "kan inte hämta diskanvändning för %s"
+
 msgid "rev-list does not support display of notes"
 msgstr "rev-list stöder inte visning av anteckningar"
 
-#: builtin/rev-list.c:664
 #, c-format
 msgid "marked counting and '%s' cannot be used together"
 msgstr "markerad räkning och \"%s\" kan inte användas samtidigt."
 
-#: builtin/rev-parse.c:409
 msgid "git rev-parse --parseopt [<options>] -- [<args>...]"
 msgstr "git rev-parse --parseopt [<options>] -- [<argument>...]"
 
-#: builtin/rev-parse.c:414
 msgid "keep the `--` passed as an arg"
 msgstr "behåll \"--\" sänt som argument"
 
-#: builtin/rev-parse.c:416
 msgid "stop parsing after the first non-option argument"
 msgstr "sluta tolka efter första argument som inte är flagga"
 
-#: builtin/rev-parse.c:419
 msgid "output in stuck long form"
 msgstr "utdata fast i lång form"
 
-#: builtin/rev-parse.c:438
 msgid "premature end of input"
 msgstr "för tidigt slut på indata"
 
-#: builtin/rev-parse.c:442
 msgid "no usage string given before the `--' separator"
 msgstr "ingen användningssträng angavs före \"--\"-avdelaren"
 
-#: builtin/rev-parse.c:548
 msgid "Needed a single revision"
 msgstr "Behövde ensam revision"
 
-#: builtin/rev-parse.c:552
 msgid ""
 "git rev-parse --parseopt [<options>] -- [<args>...]\n"
 "   or: git rev-parse --sq-quote [<arg>...]\n"
@@ -22129,145 +11032,117 @@ msgstr ""
 "Kör \"git rev-parse --parseopt -h\" för mer information om den första "
 "varianten."
 
-#: builtin/rev-parse.c:712
 msgid "--resolve-git-dir requires an argument"
 msgstr "--resolve-git-dir kräver ett argument"
 
-#: builtin/rev-parse.c:715
 #, c-format
 msgid "not a gitdir '%s'"
 msgstr "inte en gitkatalog \"%s\""
 
-#: builtin/rev-parse.c:739
 msgid "--git-path requires an argument"
 msgstr "--git-path kräver ett argument"
 
-#: builtin/rev-parse.c:749
 msgid "-n requires an argument"
 msgstr "-n kräver ett argument"
 
-#: builtin/rev-parse.c:763
 msgid "--path-format requires an argument"
 msgstr "--path-format kräver ett argument"
 
-#: builtin/rev-parse.c:769
 #, c-format
 msgid "unknown argument to --path-format: %s"
 msgstr "felaktigt argument till --path-format: %s"
 
-#: builtin/rev-parse.c:776
 msgid "--default requires an argument"
 msgstr "--default kräver ett argument"
 
-#: builtin/rev-parse.c:782
 msgid "--prefix requires an argument"
 msgstr "--prefix kräver ett argument"
 
-#: builtin/rev-parse.c:851
 #, c-format
 msgid "unknown mode for --abbrev-ref: %s"
 msgstr "okänt läge för --abbrev-ref: %s"
 
-#: builtin/rev-parse.c:1023
+msgid "this operation must be run in a work tree"
+msgstr "funktionen måste köras i en arbetskatalog"
+
 #, c-format
 msgid "unknown mode for --show-object-format: %s"
 msgstr "okänt läge för --show-object-format: %s"
 
-#: builtin/revert.c:24
 msgid "git revert [<options>] <commit-ish>..."
 msgstr "git revert [<flaggor>] <incheckning-igt>..."
 
-#: builtin/revert.c:25
 msgid "git revert <subcommand>"
 msgstr "git revert <underkommando>"
 
-#: builtin/revert.c:30
 msgid "git cherry-pick [<options>] <commit-ish>..."
 msgstr "git cherry-pick [<flaggor>] <incheckning-igt>..."
 
-#: builtin/revert.c:31
 msgid "git cherry-pick <subcommand>"
 msgstr "git cherry-pick <underkommando>"
 
-#: builtin/revert.c:72
 #, c-format
 msgid "option `%s' expects a number greater than zero"
 msgstr "flaggan \"%s\" antar ett numeriskt värde större än noll"
 
-#: builtin/revert.c:92
 #, c-format
 msgid "%s: %s cannot be used with %s"
 msgstr "%s: %s kan inte användas med %s"
 
-#: builtin/revert.c:102
 msgid "end revert or cherry-pick sequence"
 msgstr "avsluta revert- eller cherry-pick-sekvens"
 
-#: builtin/revert.c:103
 msgid "resume revert or cherry-pick sequence"
 msgstr "återuppta revert- eller cherry-pick-sekvens"
 
-#: builtin/revert.c:104
 msgid "cancel revert or cherry-pick sequence"
 msgstr "avbryt revert- eller cherry-pick-sekvens"
 
-#: builtin/revert.c:105
 msgid "skip current commit and continue"
 msgstr "hoppa över nuvarande incheckning och fortsätt"
 
-#: builtin/revert.c:107
 msgid "don't automatically commit"
 msgstr "checka inte in automatiskt"
 
-#: builtin/revert.c:108
 msgid "edit the commit message"
 msgstr "redigera incheckningsmeddelandet"
 
-#: builtin/revert.c:111
 msgid "parent-number"
 msgstr "nummer-på-förälder"
 
-#: builtin/revert.c:112
 msgid "select mainline parent"
 msgstr "välj förälder för huvudlinje"
 
-#: builtin/revert.c:114
 msgid "merge strategy"
 msgstr "sammanslagningsstrategi"
 
-#: builtin/revert.c:116
 msgid "option for merge strategy"
 msgstr "alternativ för sammanslagningsstrategi"
 
-#: builtin/revert.c:125
 msgid "append commit name"
 msgstr "lägg till incheckningsnamn"
 
-#: builtin/revert.c:127
 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:241
+msgid "use the 'reference' format to refer to commits"
+msgstr "använd \"referens\"-format för att referera till incheckningar"
+
 msgid "revert failed"
 msgstr "\"revert\" misslyckades"
 
-#: builtin/revert.c:254
 msgid "cherry-pick failed"
 msgstr "\"cherry-pick\" misslyckades"
 
-#: builtin/rm.c:20
 msgid "git rm [<options>] [--] <file>..."
 msgstr "git rm [<flaggor>] [--] <fil>..."
 
-#: builtin/rm.c:208
 msgid ""
 "the following file has staged content different from both the\n"
 "file and the HEAD:"
@@ -22279,7 +11154,6 @@ msgstr[0] ""
 msgstr[1] ""
 "följande filer har köat innehåll som skiljer sig både från filen och HEAD:"
 
-#: builtin/rm.c:213
 msgid ""
 "\n"
 "(use -f to force removal)"
@@ -22287,13 +11161,11 @@ msgstr ""
 "\n"
 "(använd -f för att tvinga borttagning)"
 
-#: 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] "följande fil har ändringar köade i indexet:"
 msgstr[1] "följande filer har ändringar köade i indexet:"
 
-#: builtin/rm.c:221 builtin/rm.c:230
 msgid ""
 "\n"
 "(use --cached to keep the file, or -f to force removal)"
@@ -22301,52 +11173,41 @@ msgstr ""
 "\n"
 "(använd --cached för att behålla filen eller -f för att tvinga borttagning)"
 
-#: builtin/rm.c:227
 msgid "the following file has local modifications:"
 msgid_plural "the following files have local modifications:"
 msgstr[0] "följande fil har lokala ändringar:"
 msgstr[1] "följande filer har lokala ändringar:"
 
-#: builtin/rm.c:245
 msgid "do not list removed files"
 msgstr "lista inte borttagna filer"
 
-#: builtin/rm.c:246
 msgid "only remove from the index"
 msgstr "ta bara bort från indexet"
 
-#: builtin/rm.c:247
 msgid "override the up-to-date check"
 msgstr "överstyr àjour-testet"
 
-#: builtin/rm.c:248
 msgid "allow recursive removal"
 msgstr "tillåt rekursiv borttagning"
 
-#: 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: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: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:337
 #, c-format
 msgid "not removing '%s' recursively without -r"
 msgstr "tar inte bort \"%s\" rekursivt utan -r"
 
-#: 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 [--mirror] [--dry-run] [--force]\n"
 "              [--receive-pack=<git-receive-pack>]\n"
@@ -22358,80 +11219,61 @@ msgstr ""
 "              [--verbose] [--thin] [--atomic]\n"
 "              [<värd>:]<katalog> (--all | <ref>...)"
 
-#: builtin/send-pack.c:192
 msgid "remote name"
 msgstr "fjärrnamn"
 
-#: builtin/send-pack.c:205
 msgid "use stateless RPC protocol"
 msgstr "använd tillståndslöst RPC-protokoll"
 
-#: builtin/send-pack.c:206
 msgid "read refs from stdin"
 msgstr "läs referenser från standard in"
 
-#: builtin/send-pack.c:207
 msgid "print status from remote helper"
 msgstr "visa status från fjärrhjälpare"
 
-#: builtin/shortlog.c:16
 msgid "git shortlog [<options>] [<revision-range>] [[--] <path>...]"
 msgstr "git shortlog [<flaggor>] [<versionsintervall>] [[--] <sökväg>...]"
 
-#: builtin/shortlog.c:17
 msgid "git log --pretty=short | git shortlog [<options>]"
 msgstr "git log --pretty=short | git shortlog [<flaggor>]"
 
-#: 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"
 
-#: builtin/shortlog.c:133
 msgid "using --group=trailer with stdin is not supported"
 msgstr "att använda --group=trailer stöds inte med standard in"
 
-#: builtin/shortlog.c:323
 #, c-format
 msgid "unknown group type: %s"
 msgstr "okänd grupptyp: %s"
 
-#: builtin/shortlog.c:351
 msgid "group by committer rather than author"
 msgstr "gruppera efter incheckare istället för författare"
 
-#: builtin/shortlog.c:354
 msgid "sort output according to the number of commits per author"
 msgstr "sortera utdata enligt antal incheckningar per författare"
 
-#: builtin/shortlog.c:356
 msgid "suppress commit descriptions, only provides commit count"
 msgstr "undertryck beskrivningar, visa bara antal incheckningar"
 
-#: builtin/shortlog.c:358
 msgid "show the email address of each author"
 msgstr "visa e-postadress för varje författare"
 
-#: builtin/shortlog.c:359
 msgid "<w>[,<i1>[,<i2>]]"
 msgstr "<w>[,<i1>[,<i2>]]"
 
-#: builtin/shortlog.c:360
 msgid "linewrap output"
 msgstr "radbryt utdata"
 
-#: builtin/shortlog.c:362
 msgid "field"
 msgstr "föt"
 
-#: builtin/shortlog.c:363
 msgid "group by field"
 msgstr "gruppera efter fält"
 
-#: builtin/shortlog.c:395
 msgid "too many arguments given outside repository"
 msgstr "för många flaggor givna utanför arkivet"
 
-#: builtin/show-branch.c:14
 msgid ""
 "git show-branch [-a | --all] [-r | --remotes] [--topo-order | --date-order]\n"
 "                [--current] [--color[=<when>] | --no-color] [--sparse]\n"
@@ -22443,132 +11285,103 @@ msgstr ""
 "                [--more=<n> | --list | --independent | --merge-base]\n"
 "                [--no-name | --sha1-name] [--topics] [(<rev> | <mönster>)...]"
 
-#: builtin/show-branch.c:18
 msgid "git show-branch (-g | --reflog)[=<n>[,<base>]] [--list] [<ref>]"
 msgstr "git show-branch (-g | --reflog)[=<n>[,<bas>]] [--list] [<ref>]"
 
-#: builtin/show-branch.c:396
 #, c-format
 msgid "ignoring %s; cannot handle more than %d ref"
 msgid_plural "ignoring %s; cannot handle more than %d refs"
 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
 #, c-format
 msgid "no matching refs with %s"
 msgstr "inga motsvarande referenser med %s"
 
-#: builtin/show-branch.c:645
 msgid "show remote-tracking and local branches"
 msgstr "visa fjärrspårande och lokala grenar"
 
-#: builtin/show-branch.c:647
 msgid "show remote-tracking branches"
 msgstr "visa fjärrspårande grenar"
 
-#: builtin/show-branch.c:649
 msgid "color '*!+-' corresponding to the branch"
 msgstr "färga \"*!+-\" enligt grenen"
 
-#: builtin/show-branch.c:651
 msgid "show <n> more commits after the common ancestor"
 msgstr "visa <n> ytterligare incheckningar efter gemensam anfader"
 
-#: builtin/show-branch.c:653
 msgid "synonym to more=-1"
 msgstr "synonym till more=-1"
 
-#: builtin/show-branch.c:654
 msgid "suppress naming strings"
 msgstr "undertyck namnsträngar"
 
-#: builtin/show-branch.c:656
 msgid "include the current branch"
 msgstr "ta med aktuell gren"
 
-#: builtin/show-branch.c:658
 msgid "name commits with their object names"
 msgstr "namnge incheckningar med deras objektnamn"
 
-#: builtin/show-branch.c:660
 msgid "show possible merge bases"
 msgstr "visa möjliga sammanslagningsbaser"
 
-#: builtin/show-branch.c:662
 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
 msgid "show commits in topological order"
 msgstr "visa incheckningar i topologisk ordning"
 
-#: builtin/show-branch.c:667
 msgid "show only commits not on the first branch"
 msgstr "visa endast incheckningar inte på den första grenen"
 
-#: builtin/show-branch.c:669
 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
 msgid "topologically sort, maintaining date order where possible"
 msgstr "sortera topologiskt, behåll datumordning när möjligt"
 
-#: builtin/show-branch.c:674
 msgid "<n>[,<base>]"
 msgstr "<n>[,<bas>]"
 
-#: builtin/show-branch.c:675
 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:735
 msgid "no branches given, and HEAD is not valid"
 msgstr "inga grenar angavs, och HEAD är inte giltigt"
 
-#: builtin/show-branch.c:738
 msgid "--reflog option needs one branch name"
 msgstr "--reflog behöver ett namn på en gren"
 
-#: builtin/show-branch.c:741
 #, 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
 #, c-format
 msgid "no such ref %s"
 msgstr "ingen sådan referens %s"
 
-#: builtin/show-branch.c:831
 #, 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
 #, c-format
 msgid "'%s' is not a valid ref."
 msgstr "\"%s\" är inte en giltig referens."
 
-#: builtin/show-branch.c:838
 #, c-format
 msgid "cannot find commit %s (%s)"
 msgstr "hittar inte incheckning %s (%s)"
 
-#: builtin/show-index.c:21
 msgid "hash-algorithm"
 msgstr "hashningsalgoritm"
 
-#: builtin/show-index.c:31
 msgid "Unknown hash algorithm"
 msgstr "okänd hashningsalgoritm"
 
-#: builtin/show-ref.c:12
 msgid ""
 "git show-ref [-q | --quiet] [--verify] [--head] [-d | --dereference] [-s | --"
 "hash[=<n>]] [--abbrev[=<n>]] [--tags] [--heads] [--] [<pattern>...]"
@@ -22576,56 +11389,43 @@ msgstr ""
 "git show-ref [-q | --quiet] [--verify] [--head] [-d | --dereference] [-s | --"
 "hash[=<n>]] [--abbrev[=<n>]] [--tags] [--heads] [--] [<mönster>...]"
 
-#: builtin/show-ref.c:13
 msgid "git show-ref --exclude-existing[=<pattern>]"
 msgstr "git show-ref --exclude-existing[=<mönster>]"
 
-#: builtin/show-ref.c:162
 msgid "only show tags (can be combined with heads)"
 msgstr "visa endast taggar (kan kombineras med huvuden)"
 
-#: builtin/show-ref.c:163
 msgid "only show heads (can be combined with tags)"
 msgstr "visa endast huvuden (kan kombineras med taggar)"
 
-#: builtin/show-ref.c:164
 msgid "stricter reference checking, requires exact ref path"
 msgstr "striktare referenskontroll, kräver exakt referenssökväg"
 
-#: builtin/show-ref.c:167 builtin/show-ref.c:169
 msgid "show the HEAD reference, even if it would be filtered out"
 msgstr "visa HEAD-refrens, även när den skulle filtreras ut"
 
-#: builtin/show-ref.c:171
 msgid "dereference tags into object IDs"
 msgstr "avreferera taggar till objekt-id"
 
-#: builtin/show-ref.c:173
 msgid "only show SHA1 hash using <n> digits"
 msgstr "visa SHA1-hash endast med <n> siffror"
 
-#: builtin/show-ref.c:177
 msgid "do not print results to stdout (useful with --verify)"
 msgstr "visa inte resultat på standard ut (användbart med --verify)"
 
-#: builtin/show-ref.c:179
 msgid "show refs from stdin that aren't in local repository"
 msgstr "visa referenser från standard in som inte finns i lokalt arkiv"
 
-#: builtin/sparse-checkout.c:23
 msgid "git sparse-checkout (init|list|set|add|reapply|disable) <options>"
 msgstr "git sparse-checkout (init|list|set|add|reapply|disable) <flaggor>"
 
-#: builtin/sparse-checkout.c:61
 msgid "this worktree is not sparse"
 msgstr "arbetskatalogen är inte gren"
 
-#: builtin/sparse-checkout.c:76
 msgid "this worktree is not sparse (sparse-checkout file may not exist)"
 msgstr ""
 "arbetskatalogen är inte glest (sparse-checkout-filen kanske inte finns)"
 
-#: builtin/sparse-checkout.c:177
 #, c-format
 msgid ""
 "directory '%s' contains untracked files, but is not in the sparse-checkout "
@@ -22634,65 +11434,53 @@ msgstr ""
 "katalogen \"%s\" innehåller ospårade filer, men är inte i området som ages i "
 "\"sparse-checkout\""
 
-#: builtin/sparse-checkout.c:185
 #, c-format
 msgid "failed to remove directory '%s'"
 msgstr "misslyckades ta bort katalogen \"%s\""
 
-#: builtin/sparse-checkout.c:327
 msgid "failed to create directory for sparse-checkout file"
 msgstr "misslyckades skapa katalog för \"sparse-checkout\"-filen"
 
-#: builtin/sparse-checkout.c:366
 msgid "failed to initialize worktree config"
 msgstr "misslyckades initiera arbetskataloginställning"
 
-#: builtin/sparse-checkout.c:411
 msgid "failed to modify sparse-index config"
 msgstr "misslyckades ändra inställning för sparse-index"
 
-#: builtin/sparse-checkout.c:441 builtin/sparse-checkout.c:793
-#: builtin/sparse-checkout.c:847
 msgid "initialize the sparse-checkout in cone mode"
 msgstr "initiera sparse-checkout i konläge"
 
-#: builtin/sparse-checkout.c:443 builtin/sparse-checkout.c:795
-#: builtin/sparse-checkout.c:849
 msgid "toggle the use of a sparse index"
 msgstr "slå på/av använding av glest index"
 
-#: builtin/sparse-checkout.c:479
+#, c-format
+msgid "unable to create leading directories of %s"
+msgstr "kunde inte skapa inledande kataloger för %s"
+
 #, c-format
 msgid "failed to open '%s'"
 msgstr "misslyckades öppna \"%s\""
 
-#: builtin/sparse-checkout.c:531
 #, c-format
 msgid "could not normalize path %s"
 msgstr "kunde inte normalisera sökvägen \"%s\""
 
-#: builtin/sparse-checkout.c:560
 #, 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:615 builtin/sparse-checkout.c:643
 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:619
 msgid "existing sparse-checkout patterns do not use cone mode"
 msgstr "befintliga filter för gles utcheckning använder inte konläge"
 
-#: builtin/sparse-checkout.c:707
 msgid "please run from the toplevel directory in non-cone mode"
 msgstr "vänligen kör från toppnivåkatalogen i icke-konläge"
 
-#: builtin/sparse-checkout.c:712
 msgid "specify directories rather than patterns (no leading slash)"
 msgstr "ange kataloger istället för mönster (utan inledande snedstreck)"
 
-#: builtin/sparse-checkout.c:714
 msgid ""
 "specify directories rather than patterns.  If your directory starts with a "
 "'!', pass --skip-checks"
@@ -22700,7 +11488,6 @@ msgstr ""
 "ange kataloger istället för mönster. Om din katalog börjar med ett \"!\", "
 "sänd med --skip-checks"
 
-#: builtin/sparse-checkout.c:716
 msgid ""
 "specify directories rather than patterns.  If your directory really has any "
 "of '*?[]\\' in it, pass --skip-checks"
@@ -22708,7 +11495,6 @@ msgstr ""
 "ange kataloger istället för mönster. Om din katalog faktiskt har tecknen '*?"
 "[]\\' i namnet, sänd med --skip-checks"
 
-#: builtin/sparse-checkout.c:732
 #, c-format
 msgid ""
 "'%s' is not a directory; to treat it as a directory anyway, rerun with --"
@@ -22717,7 +11503,6 @@ msgstr ""
 "\"%s\" är inte en katalog: för att ändå behandla det som en katalog, kör på "
 "nytt med --skip-checks"
 
-#: builtin/sparse-checkout.c:734
 #, c-format
 msgid ""
 "pass a leading slash before paths such as '%s' if you want a single file "
@@ -22726,26 +11511,21 @@ msgstr ""
 "sänd med ett inledande snedstreck före sökvägar som \"%s\" om du vill ha en "
 "enstaka file (se NON-CONE PROBLEMS i manualen git-sparse-checkout)."
 
-#: builtin/sparse-checkout.c:739
 msgid "git sparse-checkout add [--skip-checks] (--stdin | <patterns>)"
 msgstr "git sparse-checkout add [--skip-checks] (--stdin | <mönster>)"
 
-#: builtin/sparse-checkout.c:752 builtin/sparse-checkout.c:797
 msgid ""
 "skip some sanity checks on the given paths that might give false positives"
 msgstr ""
 "hoppa över några kontroller på de angivna sökvägarna som kan ge falska "
 "positiva"
 
-#: builtin/sparse-checkout.c:755 builtin/sparse-checkout.c:800
 msgid "read patterns from standard in"
 msgstr "läs mönster från standard in"
 
-#: builtin/sparse-checkout.c:760
 msgid "no sparse-checkout to add to"
 msgstr "ingen sparse-checkout att utöka"
 
-#: builtin/sparse-checkout.c:775
 msgid ""
 "git sparse-checkout set [--[no-]cone] [--[no-]sparse-index] [--skip-checks] "
 "(--stdin | <patterns>)"
@@ -22753,36 +11533,28 @@ msgstr ""
 "git sparse-checkout set [--[no-]cone] [--[no-]sparse-index] [--skip-checks] "
 "(--stdin | <mönster>)"
 
-#: builtin/sparse-checkout.c:854
 msgid "must be in a sparse-checkout to reapply sparsity patterns"
 msgstr ""
 "måste vara i en gles utcheckning för att tillämpa gleshetsmönster på nytt"
 
-#: builtin/sparse-checkout.c:914
 msgid "error while refreshing working directory"
 msgstr "fel vid uppdatering av arbetskatalog"
 
-#: builtin/stash.c:24 builtin/stash.c:40
 msgid "git stash list [<options>]"
 msgstr "git stash list [<flaggor>]"
 
-#: builtin/stash.c:25 builtin/stash.c:45
 msgid "git stash show [<options>] [<stash>]"
 msgstr "git stash show [<flaggor>] [<stash>]"
 
-#: builtin/stash.c:26 builtin/stash.c:50
 msgid "git stash drop [-q|--quiet] [<stash>]"
 msgstr "git stash drop [-q|--quiet] [<stash>]"
 
-#: builtin/stash.c:27
 msgid "git stash ( pop | apply ) [--index] [-q|--quiet] [<stash>]"
 msgstr "git stash ( pop | apply ) [--index] [-q|--quiet] [<stash>]"
 
-#: builtin/stash.c:28 builtin/stash.c:65
 msgid "git stash branch <branchname> [<stash>]"
 msgstr "git stash branch <grennamn> [<stash>]"
 
-#: builtin/stash.c:30
 msgid ""
 "git stash [push [-p|--patch] [-S|--staged] [-k|--[no-]keep-index] [-q|--"
 "quiet]\n"
@@ -22796,7 +11568,6 @@ msgstr ""
 "          [--pathspec-from-file=<fil> [--pathspec-file-nul]]\n"
 "          [--] [<sökväg>...]]"
 
-#: builtin/stash.c:34
 msgid ""
 "git stash save [-p|--patch] [-S|--staged] [-k|--[no-]keep-index] [-q|--"
 "quiet]\n"
@@ -22806,19 +11577,15 @@ msgstr ""
 "quiet]\n"
 "          [-u|--include-untracked] [-a|--all] [<meddelande>]"
 
-#: builtin/stash.c:55
 msgid "git stash pop [--index] [-q|--quiet] [<stash>]"
 msgstr "git stash pop [--index] [-q|--quiet] [<stash>]"
 
-#: builtin/stash.c:60
 msgid "git stash apply [--index] [-q|--quiet] [<stash>]"
 msgstr "git stash apply [--index] [-q|--quiet] [<stash>]"
 
-#: builtin/stash.c:75
 msgid "git stash store [-m|--message <message>] [-q|--quiet] <commit>"
 msgstr "git stash store [-m|--message <meddelande>] [-q|--quiet] <incheckning>"
 
-#: 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"
@@ -22828,7 +11595,6 @@ msgstr ""
 "          [-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>]"
@@ -22836,30 +11602,24 @@ 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"
 msgstr "\"%s\" är inte en \"stash\"-liknande incheckning"
 
-#: builtin/stash.c:150
 #, c-format
 msgid "Too many revisions specified:%s"
 msgstr "För många revisioner angivna:%s"
 
-#: builtin/stash.c:164
 msgid "No stash entries found."
 msgstr "Inga \"stash\"-poster hittades."
 
-#: builtin/stash.c:178
 #, c-format
 msgid "%s is not a valid reference"
 msgstr "%s är inte en giltigt referens"
 
-#: builtin/stash.c:227
 msgid "git stash clear with arguments is unimplemented"
 msgstr "\"git stash clear\" med argument har inte implementerats"
 
-#: builtin/stash.c:447
 #, c-format
 msgid ""
 "WARNING: Untracked file in way of tracked file!  Renaming\n"
@@ -22870,201 +11630,150 @@ msgstr ""
 "            %s -> %s\n"
 "         för att lämna plats.\n"
 
-#: 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:519
 #, c-format
 msgid "could not generate diff %s^!."
 msgstr "kunde inte skapa diff %s^!."
 
-#: builtin/stash.c:526
 msgid "conflicts in index. Try without --index."
 msgstr "konflikter i indexet. Testa utan --index."
 
-#: builtin/stash.c:532
 msgid "could not save index tree"
 msgstr "kunde inte spara indexträd"
 
-#: builtin/stash.c:552
 #, c-format
 msgid "Merging %s with %s"
 msgstr "Slår ihop %s med %s"
 
-#: builtin/stash.c:562
 msgid "Index was not unstashed."
 msgstr "Indexet har inte tagits upp ur \"stash\":en"
 
-#: builtin/stash.c:576
 msgid "could not restore untracked files from stash"
 msgstr "kunde inte återställa ospårade filer från stash-post"
 
-#: builtin/stash.c:608 builtin/stash.c:695
 msgid "attempt to recreate the index"
 msgstr "försök återskapa indexet"
 
-#: builtin/stash.c:641
 #, c-format
 msgid "Dropped %s (%s)"
 msgstr "Kastade %s (%s)"
 
-#: builtin/stash.c:644
 #, c-format
 msgid "%s: Could not drop stash entry"
 msgstr "%s: Kunde inte kasta \"stash\"-post"
 
-#: builtin/stash.c:657
 #, c-format
 msgid "'%s' is not a stash reference"
 msgstr "\"%s\" är inte en \"stash\"-referens"
 
-#: builtin/stash.c:707
 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:730
 msgid "No branch name specified"
 msgstr "Inget grennamn angavs"
 
-#: builtin/stash.c:809
 msgid "failed to parse tree"
 msgstr "misslyckades tolka träd"
 
-#: builtin/stash.c:820
 msgid "failed to unpack trees"
 msgstr "misslyckades packa upp träd"
 
-#: builtin/stash.c:840
 msgid "include untracked files in the stash"
 msgstr "ta med ospårade filer i \"stash\""
 
-#: builtin/stash.c:843
 msgid "only show untracked files in the stash"
 msgstr "visa bara ospårade filer i \"stash\""
 
-#: builtin/stash.c:930 builtin/stash.c:967
 #, c-format
 msgid "Cannot update %s with %s"
 msgstr "Kan inte uppdatera %s med %s"
 
-#: builtin/stash.c:948 builtin/stash.c:1667 builtin/stash.c:1739
 msgid "stash message"
 msgstr "\"stash\"-meddelande"
 
-#: builtin/stash.c:958
 msgid "\"git stash store\" requires one <commit> argument"
 msgstr "\"git stash store\" kräver ett <incheckning>-argument"
 
-#: builtin/stash.c:1143
 msgid "No staged changes"
 msgstr "Inga köade ändringar"
 
-#: builtin/stash.c:1204
 msgid "No changes selected"
 msgstr "Inga ändringar valda"
 
-#: builtin/stash.c:1304
 msgid "You do not have the initial commit yet"
 msgstr "Du har inte den första incheckningen ännu"
 
-#: builtin/stash.c:1331
 msgid "Cannot save the current index state"
 msgstr "Kan inte spara aktuellt tillstånd för indexet"
 
-#: builtin/stash.c:1340
 msgid "Cannot save the untracked files"
 msgstr "Kan inte spara ospårade filer"
 
-#: builtin/stash.c:1351 builtin/stash.c:1370
 msgid "Cannot save the current worktree state"
 msgstr "Kan inte spara aktuellt tillstånd för arbetskatalogen"
 
-#: builtin/stash.c:1361
 msgid "Cannot save the current staged state"
 msgstr "Kan inte spara aktuellt tillstånd kö"
 
-#: builtin/stash.c:1398
 msgid "Cannot record working tree state"
 msgstr "Kan inte registrera tillstånd för arbetskatalog"
 
-#: builtin/stash.c:1447
 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:1458
 msgid "Can't use --staged and --include-untracked or --all at the same time"
 msgstr ""
 "Kan inte använda --staged och --include-untracked eller --all samtidigt"
 
-#: builtin/stash.c:1476
 msgid "Did you forget to 'git add'?"
 msgstr "Glömde du använda \"git add\"?"
 
-#: builtin/stash.c:1491
 msgid "No local changes to save"
 msgstr "Inga lokala ändringar att spara"
 
-#: builtin/stash.c:1498
 msgid "Cannot initialize stash"
 msgstr "Kan inte initiera \"stash\""
 
-#: builtin/stash.c:1513
 msgid "Cannot save the current status"
 msgstr "Kan inte spara aktuell status"
 
-#: builtin/stash.c:1518
 #, c-format
 msgid "Saved working directory and index state %s"
 msgstr "Sparade arbetskatalogen och indexstatus %s"
 
-#: builtin/stash.c:1615
 msgid "Cannot remove worktree changes"
 msgstr "Kan inte ta bort ändringar i arbetskatalogen"
 
-#: builtin/stash.c:1656 builtin/stash.c:1728
 msgid "keep index"
 msgstr "behåll indexet"
 
-#: builtin/stash.c:1658 builtin/stash.c:1730
 msgid "stash staged changes only"
 msgstr "stash:a endast köade ändringar"
 
-#: builtin/stash.c:1660 builtin/stash.c:1732
 msgid "stash in patch mode"
 msgstr "\"stash\" i \"patch\"-läge"
 
-#: builtin/stash.c:1661 builtin/stash.c:1733
 msgid "quiet mode"
 msgstr "tyst läge"
 
-#: builtin/stash.c:1663 builtin/stash.c:1735
 msgid "include untracked files in stash"
 msgstr "ta med ospårade filer i \"stash\""
 
-#: builtin/stash.c:1665 builtin/stash.c:1737
 msgid "include ignore files"
 msgstr "ta med ignorerade filer"
 
-#: builtin/stripspace.c:37
 msgid "skip and remove all lines starting with comment character"
 msgstr "hoppa över och ta bort alla rader som inleds med kommentarstecken"
 
-#: builtin/stripspace.c:40
 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:50 builtin/submodule--helper.c:2486
 #, c-format
 msgid "Expecting a full ref name, got %s"
 msgstr "Förväntade fullt referensnamn, fick %s"
 
-#: builtin/submodule--helper.c:103
-#, c-format
-msgid "cannot strip one component off url '%s'"
-msgstr "kan inte ta bort en komponent från url:en \"%s\""
-
-#: builtin/submodule--helper.c:213
 #, c-format
 msgid ""
 "could not look up configuration '%s'. Assuming this repository is its own "
@@ -23073,26 +11782,20 @@ msgstr ""
 "kunde inte slå upp konfigurationen \"%s\". Antar att arkivet är sin eget "
 "officiella uppström."
 
-#: builtin/submodule--helper.c:413 builtin/submodule--helper.c:1873
 msgid "alternative anchor for relative paths"
 msgstr "alternativa ankare för relativa sökvägar"
 
-#: builtin/submodule--helper.c:418
 msgid "git submodule--helper list [--prefix=<path>] [<path>...]"
 msgstr "git submodule--helper list [--prefix=<sökväg>] [<sökväg>...]"
 
-#: builtin/submodule--helper.c:476 builtin/submodule--helper.c:617
-#: builtin/submodule--helper.c:640
 #, 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:528
 #, c-format
 msgid "Entering '%s'\n"
 msgstr "Går in i \"%s\"\n"
 
-#: builtin/submodule--helper.c:531
 #, c-format
 msgid ""
 "run_command returned non-zero status for %s\n"
@@ -23101,7 +11804,6 @@ msgstr ""
 "run_command returnerade icke-nollstatus för %s\n"
 "."
 
-#: builtin/submodule--helper.c:553
 #, c-format
 msgid ""
 "run_command returned non-zero status while recursing in the nested "
@@ -23112,67 +11814,52 @@ msgstr ""
 "undermoduler för %s\n"
 "."
 
-#: builtin/submodule--helper.c:569
 msgid "suppress output of entering each submodule command"
 msgstr "dölj utdata från för varje undermodulskommando som startas"
 
-#: builtin/submodule--helper.c:571 builtin/submodule--helper.c:876
-#: builtin/submodule--helper.c:1458
 msgid "recurse into nested submodules"
 msgstr "rekursera in i nästlade undermoduler"
 
-#: builtin/submodule--helper.c:576
 msgid "git submodule--helper foreach [--quiet] [--recursive] [--] <command>"
 msgstr "git submodule--helper sync [--quiet] [--recursive] [--] [<kommando>]"
 
-#: builtin/submodule--helper.c:654
 #, 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:658
 #, 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:668
 #, 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:675
 #, 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:697
 msgid "suppress output for initializing a submodule"
 msgstr "dölj utdata från initiering av undermodul"
 
-#: builtin/submodule--helper.c:702
 msgid "git submodule--helper init [<options>] [<path>]"
 msgstr "git submodule--helper init [<flaggor>] [<sökväg>]"
 
-#: builtin/submodule--helper.c:775 builtin/submodule--helper.c:910
 #, 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:823
 #, 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:850 builtin/submodule--helper.c:1428
 #, c-format
 msgid "failed to recurse into submodule '%s'"
 msgstr "misslyckades rekursera in i undermodulen \"%s\""
 
-#: builtin/submodule--helper.c:874 builtin/submodule--helper.c:1595
 msgid "suppress submodule status output"
 msgstr "hindra statusutskrift för undermodul"
 
-#: builtin/submodule--helper.c:875
 msgid ""
 "use commit stored in the index instead of the one stored in the submodule "
 "HEAD"
@@ -23180,94 +11867,74 @@ msgstr ""
 "visa incheckning från indexet istället för den som lagrats i undermodulens "
 "HEAD"
 
-#: builtin/submodule--helper.c:881
 msgid "git submodule status [--quiet] [--cached] [--recursive] [<path>...]"
 msgstr "git submodule status [--quitet] [--cached] [--recursive] [<sökväg>...]"
 
-#: builtin/submodule--helper.c:905
 msgid "git submodule--helper name <path>"
 msgstr "git submodule--helper name <sökväg>"
 
-#: builtin/submodule--helper.c:977
 #, c-format
 msgid "* %s %s(blob)->%s(submodule)"
 msgstr "* %s %s(blob)->%s(submodule)"
 
-#: builtin/submodule--helper.c:980
 #, c-format
 msgid "* %s %s(submodule)->%s(blob)"
 msgstr "* %s %s(submodule)->%s(blob)"
 
-#: builtin/submodule--helper.c:993
 #, c-format
 msgid "%s"
 msgstr "%s"
 
-#: builtin/submodule--helper.c:1043
 #, c-format
 msgid "couldn't hash object from '%s'"
 msgstr "kunde inte hasha objekt från \"%s\""
 
-#: builtin/submodule--helper.c:1047
 #, c-format
 msgid "unexpected mode %o\n"
 msgstr "okänt läge %o\n"
 
-#: builtin/submodule--helper.c:1288
 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:1290
 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:1292
 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:1294
 msgid "limit the summary size"
 msgstr "begränsa översiktsstorleken"
 
-#: builtin/submodule--helper.c:1299
 msgid "git submodule--helper summary [<options>] [<commit>] [--] [<path>]"
 msgstr ""
 "git submodule--helper summary [<flaggor>] [<incheckning>] [--] [<sökväg>]"
 
-#: builtin/submodule--helper.c:1323
 msgid "could not fetch a revision for HEAD"
 msgstr "kunde inte hämta en version för HEAD"
 
-#: builtin/submodule--helper.c:1384
 #, c-format
 msgid "Synchronizing submodule url for '%s'\n"
 msgstr "Synkroniserar undermodul-url för \"%s\"\n"
 
-#: builtin/submodule--helper.c:1390
 #, 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:1399
 #, 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:1409
 #, 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:1456
 msgid "suppress output of synchronizing submodule url"
 msgstr "dölj utdata från synkronisering av undermodul-url"
 
-#: builtin/submodule--helper.c:1463
 msgid "git submodule--helper sync [--quiet] [--recursive] [<path>]"
 msgstr "git submodule--helper sync [--quiet] [--recursive] [<sökväg>]"
 
-#: builtin/submodule--helper.c:1513
 #, c-format
 msgid ""
 "Submodule work tree '%s' contains a .git directory. This will be replaced "
@@ -23276,7 +11943,6 @@ msgstr ""
 "Undermodulsarbetskatalogen \"%s\" innehåller en .git-katalog. Denna kommer "
 "ersättas med en .git-fil med absorbgitdirs."
 
-#: builtin/submodule--helper.c:1530
 #, c-format
 msgid ""
 "Submodule work tree '%s' contains local modifications; use '-f' to discard "
@@ -23285,46 +11951,37 @@ msgstr ""
 "Undermodulens arbetskatalog \"%s\" har lokala ändringar; \"-f\" kastar bort "
 "dem"
 
-#: builtin/submodule--helper.c:1538
 #, c-format
 msgid "Cleared directory '%s'\n"
 msgstr "Rensade katalogen \"%s\"\n"
 
-#: builtin/submodule--helper.c:1540
 #, c-format
 msgid "Could not remove submodule work tree '%s'\n"
 msgstr "Kunde inte ta bort undermodulens arbetskatalog \"%s\"\n"
 
-#: builtin/submodule--helper.c:1551
 #, c-format
 msgid "could not create empty submodule directory %s"
 msgstr "kunde inte skapa tom undermodulskatalog %s"
 
-#: builtin/submodule--helper.c:1567
 #, 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:1596
 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:1597
 msgid "unregister all submodules"
 msgstr "avregistrera alla undermoduler"
 
-#: builtin/submodule--helper.c:1602
 msgid ""
 "git submodule deinit [--quiet] [-f | --force] [--all | [--] [<path>...]]"
 msgstr ""
 "git submodule deinit [--quiet] [-f | --force] [--all | [--] [<sökväg>...]]"
 
-#: builtin/submodule--helper.c:1616
 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:1665
 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"
@@ -23336,67 +11993,52 @@ msgstr ""
 "submodule.alternateErrorStrategy till \"info\" eller, likvärdigt, klona\n"
 "med \"--reference-if-able\" istället för \"--reference\"."
 
-#: builtin/submodule--helper.c:1710 builtin/submodule--helper.c:1713
 #, c-format
 msgid "submodule '%s' cannot add alternate: %s"
 msgstr "undermodulen \"%s\" kan inte lägga till suppleant: %s"
 
-#: builtin/submodule--helper.c:1749
 #, 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:1756
 #, 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:1781
 #, 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:1826
 #, c-format
 msgid "clone of '%s' into submodule path '%s' failed"
 msgstr "misslyckades klona \"%s\" till undermodulsökvägen \"%s\""
 
-#: builtin/submodule--helper.c:1831
 #, c-format
 msgid "directory not empty: '%s'"
 msgstr "katalogen inte tom: \"%s\""
 
-#: builtin/submodule--helper.c:1843
 #, c-format
 msgid "could not get submodule directory for '%s'"
 msgstr "kunde inte få tag i undermodulkatalog för \"%s\""
 
-#: builtin/submodule--helper.c:1876
 msgid "where the new submodule will be cloned to"
 msgstr "var den nya undermodulen ska klonas till"
 
-#: builtin/submodule--helper.c:1879
 msgid "name of the new submodule"
 msgstr "namn på den nya undermodulen"
 
-#: builtin/submodule--helper.c:1882
 msgid "url where to clone the submodule from"
 msgstr "URL att klona undermodulen från"
 
-#: builtin/submodule--helper.c:1890 builtin/submodule--helper.c:3383
 msgid "depth for shallow clones"
 msgstr "djup för grunda kloner"
 
-#: builtin/submodule--helper.c:1893 builtin/submodule--helper.c:2731
-#: builtin/submodule--helper.c:3376
 msgid "force cloning progress"
 msgstr "tvinga kloningsförlopp"
 
-#: builtin/submodule--helper.c:1895 builtin/submodule--helper.c:2733
 msgid "disallow cloning into non-empty directory"
 msgstr "förhindra kloning till icke-tom katalog"
 
-#: builtin/submodule--helper.c:1903
 msgid ""
 "git submodule--helper clone [--prefix=<path>] [--quiet] [--reference "
 "<repository>] [--name <name>] [--depth <depth>] [--single-branch] [--filter "
@@ -23406,92 +12048,74 @@ msgstr ""
 "<arkiv>] [--name <namn>] [--depth <djup>] [--single-branch] [--filter "
 "<filterangivelse>] --url <url> --path <sökväg>"
 
-#: builtin/submodule--helper.c:1943
 #, 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:1947
 #, 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:2041
 #, c-format
 msgid "Submodule path '%s' not initialized"
 msgstr "Undermodulsökvägen \"%s\" har inte initierats"
 
-#: builtin/submodule--helper.c:2045
 msgid "Maybe you want to use 'update --init'?"
 msgstr "Kanske menade du att använda \"update --init\"?"
 
-#: builtin/submodule--helper.c:2075
 #, c-format
 msgid "Skipping unmerged submodule %s"
 msgstr "Hoppar över ej sammanslagen undermodul %s"
 
-#: builtin/submodule--helper.c:2104
 #, c-format
 msgid "Skipping submodule '%s'"
 msgstr "Hoppar över undermodulen \"%s\""
 
-#: builtin/submodule--helper.c:2257
 #, c-format
 msgid "Failed to clone '%s'. Retry scheduled"
 msgstr "Misslyckades klona \"%s\". Nytt försök planlagt"
 
-#: builtin/submodule--helper.c:2268
 #, 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:2371
 #, 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:2375
 #, 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:2379
 #, 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:2383
 #, 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:2402
 #, c-format
 msgid "Submodule path '%s': checked out '%s'\n"
 msgstr "Undermodulsökvägen \"%s\": checkade ut \"%s\"\n"
 
-#: builtin/submodule--helper.c:2406
 #, c-format
 msgid "Submodule path '%s': rebased into '%s'\n"
 msgstr "Undermodulsökvägen \"%s\": ombaserade in i \"%s\"\n"
 
-#: builtin/submodule--helper.c:2410
 #, c-format
 msgid "Submodule path '%s': merged in '%s'\n"
 msgstr "Undermodulsökvägen \"%s\": sammanslagen i \"%s\"\n"
 
-#: builtin/submodule--helper.c:2414
 #, c-format
 msgid "Submodule path '%s': '%s %s'\n"
 msgstr "Undermodulsökvägen \"%s\": \"%s %s\"\n"
 
-#: builtin/submodule--helper.c:2438
 #, 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:2447
 #, c-format
 msgid ""
 "Fetched in submodule path '%s', but it did not contain %s. Direct fetching "
@@ -23500,7 +12124,6 @@ msgstr ""
 "Hämtade i undermodulssökvägen \"%s\", men den innehöll inte %s. Direkt "
 "hämtning av incheckningen misslyckades."
 
-#: builtin/submodule--helper.c:2481
 #, c-format
 msgid ""
 "Submodule (%s) branch configured to inherit branch from superproject, but "
@@ -23509,80 +12132,62 @@ msgstr ""
 "Undermodulens (%s) gren inställd på att ärva gren från huvudprojektet, men "
 "huvudprojektet är inte på någon gren"
 
-#: builtin/submodule--helper.c:2499
 #, 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:2588
 #, c-format
 msgid "Unable to find current revision in submodule path '%s'"
 msgstr "Kan inte hitta aktuell revision i undermodulsökvägen \"%s\""
 
-#: builtin/submodule--helper.c:2599
 #, c-format
 msgid "Unable to fetch in submodule path '%s'"
 msgstr "Kan inte hämta i undermodulsökväg \"%s\""
 
-#: builtin/submodule--helper.c:2604
 #, c-format
 msgid "Unable to find %s revision in submodule path '%s'"
 msgstr "Kan inte hitta %s revision i undermodulsökvägen \"%s\""
 
-#: builtin/submodule--helper.c:2640
 #, c-format
 msgid "Failed to recurse into submodule path '%s'"
 msgstr "Misslyckades rekursera in i undermodulsökväg \"%s\""
 
-#: builtin/submodule--helper.c:2699
 msgid "force checkout updates"
 msgstr "tvinga utcheckningsuppdateringar"
 
-#: builtin/submodule--helper.c:2701
 msgid "initialize uninitialized submodules before update"
 msgstr "initiera oinitierade undermoduler före uppdateringen"
 
-#: builtin/submodule--helper.c:2703
 msgid "use SHA-1 of submodule's remote tracking branch"
 msgstr "använd SHA-1 från undermodulers fjärrspårningsgren"
 
-#: builtin/submodule--helper.c:2705
 msgid "traverse submodules recursively"
 msgstr "traversera undermoduler rekursivt"
 
-#: builtin/submodule--helper.c:2707
 msgid "don't fetch new objects from the remote site"
 msgstr "hämta inte nya objekt från fjärrplatsen"
 
-#: builtin/submodule--helper.c:2710 builtin/submodule--helper.c:2892
 msgid "path into the working tree"
 msgstr "sökväg inuti arbetskatalogen"
 
-#: builtin/submodule--helper.c:2713
 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:2717
 msgid "rebase, merge, checkout or none"
 msgstr "rebase, merge, checkout eller none"
 
-#: builtin/submodule--helper.c:2723
 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:2726
 msgid "parallel jobs"
 msgstr "parallella jobb"
 
-#: builtin/submodule--helper.c:2728
 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:2729
 msgid "don't print cloning progress"
 msgstr "skriv inte klonförlopp"
 
-#: builtin/submodule--helper.c:2741
 msgid ""
 "git submodule [--quiet] update [--init [--filter=<filter-spec>]] [--remote] "
 "[-N|--no-fetch] [-f|--force] [--checkout|--merge|--rebase] [--[no-]recommend-"
@@ -23594,82 +12199,62 @@ msgstr ""
 "[no-]recommend-shallow] [--reference <arkiv>] [--recursive] [--[no-]single-"
 "branch] [--] [<sökväg>...]"
 
-#: builtin/submodule--helper.c:2767
 msgid "bad value for update parameter"
 msgstr "felaktigt värde för parametern update"
 
-#: builtin/submodule--helper.c:2893
 msgid "recurse into submodules"
 msgstr "rekursera ner i undermoduler"
 
-#: builtin/submodule--helper.c:2899
 msgid "git submodule--helper absorb-git-dirs [<options>] [<path>...]"
 msgstr "git submodule--helper absorb-git-dirs [<flaggor>] [<sökväg>...]"
 
-#: builtin/submodule--helper.c:2955
 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:2958
 msgid "unset the config in the .gitmodules file"
 msgstr "ta bort konfigurationen från .gitmodules-filen"
 
-#: builtin/submodule--helper.c:2963
 msgid "git submodule--helper config <name> [<value>]"
 msgstr "git submodule--helper config <namn> [<värde>]"
 
-#: builtin/submodule--helper.c:2964
 msgid "git submodule--helper config --unset <name>"
 msgstr "git submodule--helper config --unset <namn>"
 
-#: builtin/submodule--helper.c:2984 builtin/submodule--helper.c:3238
-#: builtin/submodule--helper.c:3395
 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:3000
 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:3004
 msgid "git submodule--helper set-url [--quiet] <path> <newurl>"
 msgstr "git submodule--helper set-url [--quiet] <sökväg> <nyurl>"
 
-#: builtin/submodule--helper.c:3037
 msgid "set the default tracking branch to master"
 msgstr "välj master som förvald spårad gren"
 
-#: builtin/submodule--helper.c:3039
 msgid "set the default tracking branch"
 msgstr "välj förvald spårad gren"
 
-#: builtin/submodule--helper.c:3043
 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:3044
 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:3051
 msgid "--branch or --default required"
 msgstr "--branch eller --default krävs"
 
-#: builtin/submodule--helper.c:3072 builtin/submodule--helper.c:3375
 msgid "print only error messages"
 msgstr "visa endast felmeddelanden"
 
-#: builtin/submodule--helper.c:3073
 msgid "force creation"
 msgstr "tvinga skapande"
 
-#: builtin/submodule--helper.c:3081
 msgid "show whether the branch would be created"
 msgstr "visa om grenen skulle skapas"
 
-#: builtin/submodule--helper.c:3085
 msgid ""
 "git submodule--helper create-branch [-f|--force] [--create-reflog] [-q|--"
 "quiet] [-t|--track] [-n|--dry-run] <name> <start-oid> <start-name>"
@@ -23677,27 +12262,22 @@ msgstr ""
 "git submodule--helper create-branch [-f|--force] [--create-reflog] [-q|--"
 "quiet] [-t|--track] [-n|--dry-run] <namn> <start-oid> <start-namn>"
 
-#: builtin/submodule--helper.c:3097
 #, c-format
 msgid "creating branch '%s'"
 msgstr "skapar grenen \"%s\""
 
-#: builtin/submodule--helper.c:3155
 #, 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:3158
 #, 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:3171
 #, c-format
 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:3178
 #, c-format
 msgid ""
 "If you want to reuse this local git directory instead of cloning again from\n"
@@ -23715,115 +12295,94 @@ msgstr ""
 "arkiv eller om du är osäker på vad det här betyder, välj ett annat namn med\n"
 "flaggan \"--name\"."
 
-#: builtin/submodule--helper.c:3190
 #, 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:3227
 #, c-format
 msgid "unable to checkout submodule '%s'"
 msgstr "Kan inte checka ut undermodulen \"%s\""
 
-#: builtin/submodule--helper.c:3266
 #, c-format
 msgid "Failed to add submodule '%s'"
 msgstr "Misslyckades lägga till undermodulen \"%s\""
 
-#: builtin/submodule--helper.c:3270 builtin/submodule--helper.c:3275
-#: builtin/submodule--helper.c:3283
 #, c-format
 msgid "Failed to register submodule '%s'"
 msgstr "Misslyckades registrera undermodulen \"%s\""
 
-#: builtin/submodule--helper.c:3339
 #, c-format
 msgid "'%s' already exists in the index"
 msgstr "\"%s\" finns redan i indexet"
 
-#: builtin/submodule--helper.c:3342
 #, 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:3372
+#, c-format
+msgid "'%s' does not have a commit checked out"
+msgstr "\"%s\" har inte någon utcheckad incheckning"
+
 msgid "branch of repository to add as submodule"
 msgstr "gren från arkivet att lägga till som undermodul"
 
-#: builtin/submodule--helper.c:3373
 msgid "allow adding an otherwise ignored submodule path"
 msgstr "tillåt lägga till en annars ignorerad undermodulsökväg"
 
-#: builtin/submodule--helper.c:3379
 msgid "borrow the objects from reference repositories"
 msgstr "låna objekt från referensarkiv"
 
-#: builtin/submodule--helper.c:3381
 msgid ""
-"sets the submodule’s name to the given string instead of defaulting to its "
+"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:3388
 msgid "git submodule--helper add [<options>] [--] <repository> [<path>]"
 msgstr "git submodule--helper add [<flaggor>] [--] <arkiv> [<sökväg>]"
 
-#: builtin/submodule--helper.c:3416
 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:3425
 #, 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:3460
 #, c-format
 msgid "'%s' is not a valid submodule name"
 msgstr "\"%s\" är inte ett giltigt namn på undermodul"
 
-#: builtin/submodule--helper.c:3520 git.c:453 git.c:729
 #, c-format
 msgid "%s doesn't support --super-prefix"
 msgstr "%s stöder inte --super-prefix"
 
-#: builtin/submodule--helper.c:3526
 #, c-format
 msgid "'%s' is not a valid submodule--helper subcommand"
 msgstr "\"%s\" är inte ett giltigt underkommando till submodule--helper"
 
-#: builtin/symbolic-ref.c:8
 msgid "git symbolic-ref [<options>] <name> [<ref>]"
 msgstr "git symbolic-ref [<flaggor>] <namn> [<ref>]"
 
-#: builtin/symbolic-ref.c:9
 msgid "git symbolic-ref -d [-q] <name>"
 msgstr "git symbolic-ref -d [-q] <namn>"
 
-#: builtin/symbolic-ref.c:42
 msgid "suppress error message for non-symbolic (detached) refs"
 msgstr ""
 "undertryck felmeddelanden för icke-symboliska (frånkopplade) referenser"
 
-#: builtin/symbolic-ref.c:43
 msgid "delete symbolic ref"
 msgstr "ta bort symbolisk referens"
 
-#: builtin/symbolic-ref.c:44
 msgid "shorten ref output"
 msgstr "förkorta ref-utdata"
 
-#: builtin/symbolic-ref.c:45 builtin/update-ref.c:505
 msgid "reason"
 msgstr "skäl"
 
-#: builtin/symbolic-ref.c:45 builtin/update-ref.c:505
 msgid "reason of the update"
 msgstr "skäl till uppdateringen"
 
-#: builtin/tag.c:26
 msgid ""
 "git tag [-a | -s | -u <key-id>] [-f] [-m <msg> | -F <file>]\n"
 "        <tagname> [<head>]"
@@ -23831,11 +12390,9 @@ msgstr ""
 "git tag [-a | -s | -u <nyckel-id>] [-f] [-m <medd> | -F <fil>]\n"
 "        <taggnamn> [<huvud>]"
 
-#: builtin/tag.c:28
 msgid "git tag -d <tagname>..."
 msgstr "git tag -d <taggnamn>..."
 
-#: builtin/tag.c:29
 msgid ""
 "git tag -l [-n[<num>]] [--contains <commit>] [--no-contains <commit>] [--"
 "points-at <object>]\n"
@@ -23847,21 +12404,17 @@ msgstr ""
 "        [--format=<format>] [--merged <incheckning>] [--no-merged "
 "<incheckning>] [<mönster>...]"
 
-#: builtin/tag.c:31
 msgid "git tag -v [--format=<format>] <tagname>..."
 msgstr "git tag -v [--format=<format>] <taggnamn>..."
 
-#: builtin/tag.c:101
 #, c-format
 msgid "tag '%s' not found."
 msgstr "taggen \"%s\" hittades inte."
 
-#: builtin/tag.c:136
 #, c-format
 msgid "Deleted tag '%s' (was %s)\n"
 msgstr "Tog bort tagg \"%s\" (var %s)\n"
 
-#: builtin/tag.c:171
 #, c-format
 msgid ""
 "\n"
@@ -23874,7 +12427,6 @@ msgstr ""
 "  %s\n"
 "Rader som inleds med \"%c\" ignoreras.\n"
 
-#: builtin/tag.c:175
 #, c-format
 msgid ""
 "\n"
@@ -23889,11 +12441,9 @@ msgstr ""
 "Rader som inleds med \"%c\" kommer behållas; du kan själv ta bort dem om\n"
 "du vill.\n"
 
-#: builtin/tag.c:241
 msgid "unable to sign the tag"
 msgstr "kunde inte signera taggen"
 
-#: builtin/tag.c:259
 #, c-format
 msgid ""
 "You have created a nested tag. The object referred to by your new tag is\n"
@@ -23906,315 +12456,244 @@ msgstr ""
 "\n"
 "\tgit tag -f %s %s^{}"
 
-#: builtin/tag.c:275
 msgid "bad object type."
 msgstr "felaktig objekttyp."
 
-#: builtin/tag.c:326
 msgid "no tag message?"
 msgstr "inget taggmeddelande?"
 
-#: 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:445
 msgid "list tag names"
 msgstr "lista taggnamn"
 
-#: builtin/tag.c:447
 msgid "print <n> lines of each tag message"
 msgstr "visa <n> rader från varje taggmeddelande"
 
-#: builtin/tag.c:449
 msgid "delete tags"
 msgstr "ta bort taggar"
 
-#: builtin/tag.c:450
 msgid "verify tags"
 msgstr "verifiera taggar"
 
-#: builtin/tag.c:452
 msgid "Tag creation options"
 msgstr "Alternativ för att skapa taggar"
 
-#: builtin/tag.c:454
 msgid "annotated tag, needs a message"
 msgstr "annoterad tagg, behöver meddelande"
 
-#: builtin/tag.c:456
 msgid "tag message"
 msgstr "taggmeddelande"
 
-#: builtin/tag.c:458
 msgid "force edit of tag message"
 msgstr "tvinga redigering av incheckningsmeddelande"
 
-#: builtin/tag.c:459
 msgid "annotated and GPG-signed tag"
 msgstr "annoterad och GPG-signerad tagg"
 
-#: builtin/tag.c:462
 msgid "use another key to sign the tag"
 msgstr "använd annan nyckel för att signera taggen"
 
-#: builtin/tag.c:463
 msgid "replace the tag if exists"
 msgstr "ersätt taggen om den finns"
 
-#: builtin/tag.c:464 builtin/update-ref.c:511
 msgid "create a reflog"
 msgstr "skapa en reflog"
 
-#: builtin/tag.c:466
 msgid "Tag listing options"
 msgstr "Alternativ för listning av taggar"
 
-#: builtin/tag.c:467
 msgid "show tag list in columns"
 msgstr "lista taggar i spalter"
 
-#: builtin/tag.c:468 builtin/tag.c:470
 msgid "print only tags that contain the commit"
 msgstr "visa endast taggar som innehåller incheckningen"
 
-#: builtin/tag.c:469 builtin/tag.c:471
 msgid "print only tags that don't contain the commit"
 msgstr "visa endast taggar som inte innehåller incheckningen"
 
-#: builtin/tag.c:472
 msgid "print only tags that are merged"
 msgstr "visa endast taggar som slagits samman"
 
-#: builtin/tag.c:473
 msgid "print only tags that are not merged"
 msgstr "visa endast taggar som ej slagits samman"
 
-#: builtin/tag.c:477
 msgid "print only tags of the object"
 msgstr "visa endast taggar för objektet"
 
-#: builtin/tag.c:559
 #, c-format
 msgid "the '%s' option is only allowed in list mode"
 msgstr "flaggan \"%s\" är endast tillåten i listläge"
 
-#: builtin/tag.c:598
 #, c-format
 msgid "'%s' is not a valid tag name."
 msgstr "\"%s\" är inte ett giltigt taggnamn."
 
-#: builtin/tag.c:603
 #, c-format
 msgid "tag '%s' already exists"
 msgstr "taggen \"%s\" finns redan"
 
-#: builtin/tag.c:634
+#, c-format
+msgid "Invalid cleanup mode %s"
+msgstr "Felaktigt städningsläge %s"
+
 #, c-format
 msgid "Updated tag '%s' (was %s)\n"
 msgstr "Uppdaterad tagg \"%s\" (var %s)\n"
 
-#: builtin/unpack-objects.c:95
 msgid "pack exceeds maximum allowed size"
 msgstr "paket är större än tillåten maximal storlek"
 
-#: builtin/unpack-objects.c:504
 msgid "Unpacking objects"
 msgstr "Packar upp objekt"
 
-#: builtin/update-index.c:84
 #, c-format
 msgid "failed to create directory %s"
 msgstr "misslyckades skapa katalogen %s"
 
-#: builtin/update-index.c:106
 #, c-format
 msgid "failed to delete file %s"
 msgstr "misslyckades ta bort filen %s"
 
-#: 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:138
 #, c-format
 msgid "Testing mtime in '%s' "
 msgstr "Testar mtime i \"%s\" "
 
-#: 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: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: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: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: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: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:220
 msgid " OK"
 msgstr " OK"
 
-#: builtin/update-index.c:589
 msgid "git update-index [<options>] [--] [<file>...]"
 msgstr "git update-index [<flaggor>] [--] [<fil>...]"
 
-#: builtin/update-index.c:993
 msgid "continue refresh even when index needs update"
 msgstr "fortsätt uppdatera även när index inte är àjour"
 
-#: builtin/update-index.c:996
 msgid "refresh: ignore submodules"
 msgstr "refresh: ignorera undermoduler"
 
-#: builtin/update-index.c:999
 msgid "do not ignore new files"
 msgstr "ignorera inte nya filer"
 
-#: builtin/update-index.c:1001
 msgid "let files replace directories and vice-versa"
 msgstr "låt filer ersätta kataloger och omvänt"
 
-#: builtin/update-index.c:1003
 msgid "notice files missing from worktree"
 msgstr "lägg märke till filer som saknas i arbetskatalogen"
 
-#: builtin/update-index.c:1005
 msgid "refresh even if index contains unmerged entries"
 msgstr "uppdatera även om indexet innehåller ej sammanslagna poster"
 
-#: builtin/update-index.c:1008
 msgid "refresh stat information"
 msgstr "uppdatera statusinformation"
 
-#: builtin/update-index.c:1012
 msgid "like --refresh, but ignore assume-unchanged setting"
 msgstr "som --refresh, men ignorera assume-unchanged-inställning"
 
-#: builtin/update-index.c:1016
 msgid "<mode>,<object>,<path>"
 msgstr "<läge>,<objekt>,<sökväg>"
 
-#: builtin/update-index.c:1017
 msgid "add the specified entry to the index"
 msgstr "lägg till angiven post i indexet"
 
-#: builtin/update-index.c:1027
 msgid "mark files as \"not changing\""
 msgstr "markera filer som \"ändras inte\""
 
-#: builtin/update-index.c:1030
 msgid "clear assumed-unchanged bit"
 msgstr "rensa \"assume-unchanged\"-biten"
 
-#: builtin/update-index.c:1033
 msgid "mark files as \"index-only\""
 msgstr "markera filer som \"endast index\""
 
-#: builtin/update-index.c:1036
 msgid "clear skip-worktree bit"
 msgstr "töm \"skip-worktree\"-biten"
 
-#: builtin/update-index.c:1039
 msgid "do not touch index-only entries"
 msgstr "rör inte \"endast index\"-poster"
 
-#: builtin/update-index.c:1041
 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:1043
 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:1045
 msgid "with --stdin: input lines are terminated by null bytes"
 msgstr "med --stdin: indatarader termineras med null-byte"
 
-#: builtin/update-index.c:1047
 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:1051
 msgid "add entries from standard input to the index"
 msgstr "lägg poster från standard in till indexet"
 
-#: builtin/update-index.c:1055
 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:1059
 msgid "only update entries that differ from HEAD"
 msgstr "uppdatera endast poster som skiljer sig från HEAD"
 
-#: builtin/update-index.c:1063
 msgid "ignore files missing from worktree"
 msgstr "ignorera filer som saknas i arbetskatalogen"
 
-#: builtin/update-index.c:1066
 msgid "report actions to standard output"
 msgstr "rapportera åtgärder på standard ut"
 
-#: builtin/update-index.c:1068
 msgid "(for porcelains) forget saved unresolved conflicts"
 msgstr "(för porslin) glöm sparade olösta konflikter"
 
-#: builtin/update-index.c:1072
 msgid "write index in this format"
 msgstr "skriv index i detta format"
 
-#: builtin/update-index.c:1074
 msgid "enable or disable split index"
 msgstr "aktivera eller inaktivera delat index"
 
-#: builtin/update-index.c:1076
 msgid "enable/disable untracked cache"
 msgstr "aktivera/inaktivera ospårad cache"
 
-#: builtin/update-index.c:1078
 msgid "test if the filesystem supports untracked cache"
 msgstr "testa om filsystemet stöder ospårad cache"
 
-#: builtin/update-index.c:1080
 msgid "enable untracked cache without testing the filesystem"
 msgstr "aktivera ospårad cache utan att testa filsystemet"
 
-#: builtin/update-index.c:1082
 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:1084
 msgid "enable or disable file system monitor"
 msgstr "aktivera eller inaktivera filsystemsövervakning"
 
-#: builtin/update-index.c:1086
 msgid "mark files as fsmonitor valid"
 msgstr "markera filer som \"fsmonitor valid\""
 
-#: builtin/update-index.c:1089
 msgid "clear fsmonitor valid bit"
 msgstr "töm \"fsmonitor valid\"-bit"
 
-#: builtin/update-index.c:1195
 msgid ""
 "core.splitIndex is set to false; remove or change it, if you really want to "
 "enable split index"
@@ -24222,7 +12701,6 @@ msgstr ""
 "core.splitIndex är satt till false; ta bort eller ändra det om du verkligen "
 "vill aktivera delat index"
 
-#: builtin/update-index.c:1204
 msgid ""
 "core.splitIndex is set to true; remove or change it, if you really want to "
 "disable split index"
@@ -24230,7 +12708,6 @@ msgstr ""
 "core.splitIndex är satt till true; ta bort eller ändra det om du verkligen "
 "vill inaktivera delat index"
 
-#: builtin/update-index.c:1216
 msgid ""
 "core.untrackedCache is set to true; remove or change it, if you really want "
 "to disable the untracked cache"
@@ -24238,11 +12715,9 @@ msgstr ""
 "core.untrackedCache är satt till true; ta bort eller ändra det om du "
 "verkligen vill inaktivera den ospårade cachen"
 
-#: builtin/update-index.c:1220
 msgid "Untracked cache disabled"
 msgstr "Ospårad cache är inaktiverad"
 
-#: builtin/update-index.c:1228
 msgid ""
 "core.untrackedCache is set to false; remove or change it, if you really want "
 "to enable the untracked cache"
@@ -24250,169 +12725,129 @@ msgstr ""
 "core.untrackedCache är satt till false; ta bort eller ändra det om du "
 "verkligen vill aktivera den ospårade cachen"
 
-#: builtin/update-index.c:1232
 #, c-format
 msgid "Untracked cache enabled for '%s'"
 msgstr "Ospårad cache är aktiverad för \"%s\""
 
-#: builtin/update-index.c:1241
 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:1246
 msgid "fsmonitor enabled"
 msgstr "fsmonitor aktiverat"
 
-#: builtin/update-index.c:1250
 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:1254
 msgid "fsmonitor disabled"
 msgstr "fsmonitor inaktiverat"
 
-#: builtin/update-ref.c:10
 msgid "git update-ref [<options>] -d <refname> [<old-val>]"
 msgstr "git update-ref [<flaggor>] -d <refnamn> [<gammaltvärde>]"
 
-#: builtin/update-ref.c:11
 msgid "git update-ref [<options>]    <refname> <new-val> [<old-val>]"
 msgstr "git update-ref [<flaggor>]    <refnamn> <gammaltvärde> [<nyttvärde>]"
 
-#: builtin/update-ref.c:12
 msgid "git update-ref [<options>] --stdin [-z]"
 msgstr "git update-ref [<flaggor>] --stdin [-z]"
 
-#: builtin/update-ref.c:506
 msgid "delete the reference"
 msgstr "ta bort referensen"
 
-#: 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:509
 msgid "stdin has NUL-terminated arguments"
 msgstr "standard in har NUL-terminerade argument"
 
-#: builtin/update-ref.c:510
 msgid "read updates from stdin"
 msgstr "läs uppdateringar från standard in"
 
-#: builtin/update-server-info.c:15
 msgid "update the info files from scratch"
 msgstr "uppdatera informationsfilerna från grunden"
 
-#: builtin/upload-pack.c:11
 msgid "git upload-pack [<options>] <dir>"
 msgstr "git upload-pack [<flaggor>] <katalog>"
 
-#: 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:26
 msgid "serve up the info/refs for git-http-backend"
 msgstr "presentera info/referenser för git-http-backend"
 
-#: 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:31
 msgid "interrupt transfer after <n> seconds of inactivity"
 msgstr "avbryt överföringen efter <n> sekunders inaktivitet"
 
-#: builtin/verify-commit.c:19
 msgid "git verify-commit [-v | --verbose] <commit>..."
 msgstr "git verify-commit [-v | --verbose] <incheckning>..."
 
-#: builtin/verify-commit.c:68
 msgid "print commit contents"
 msgstr "visa innehåll för incheckning"
 
-#: builtin/verify-commit.c:69 builtin/verify-tag.c:37
 msgid "print raw gpg status output"
 msgstr "visa råa gpg-statusdata"
 
-#: builtin/verify-pack.c:59
 msgid "git verify-pack [-v | --verbose] [-s | --stat-only] <pack>..."
 msgstr "git verify-pack [-v | --verbose] [-s | --stat-only] <paket>..."
 
-#: builtin/verify-pack.c:70
 msgid "verbose"
 msgstr "pratsam"
 
-#: builtin/verify-pack.c:72
 msgid "show statistics only"
 msgstr "visa endast statistik"
 
-#: builtin/verify-tag.c:18
 msgid "git verify-tag [-v | --verbose] [--format=<format>] <tag>..."
 msgstr "git verify-tag [-v | --verbose] [--format=<format>] <tagg>..."
 
-#: builtin/verify-tag.c:36
 msgid "print tag contents"
 msgstr "visa innehåll för tag"
 
-#: 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:20
 msgid "git worktree list [<options>]"
 msgstr "git worktree list [<flaggor>]"
 
-#: builtin/worktree.c:21
 msgid "git worktree lock [<options>] <path>"
 msgstr "git worktree lock [<flaggor>] <sökväg>"
 
-#: builtin/worktree.c:22
 msgid "git worktree move <worktree> <new-path>"
 msgstr "git worktree move <arbetskatalog> <ny-sökväg>"
 
-#: builtin/worktree.c:23
 msgid "git worktree prune [<options>]"
 msgstr "git worktree prune [<flaggor>]"
 
-#: builtin/worktree.c:24
 msgid "git worktree remove [<options>] <worktree>"
 msgstr "git worktree remove [<flaggor>] <arbetskatalog>"
 
-#: builtin/worktree.c:25
 msgid "git worktree repair [<path>...]"
 msgstr "git worktree repair [<sökväg>...]"
 
-#: builtin/worktree.c:26
 msgid "git worktree unlock <path>"
 msgstr "git worktree unlock <sökväg>"
 
-#: builtin/worktree.c:76
 #, c-format
 msgid "Removing %s/%s: %s"
 msgstr "Tar bort %s/%s: %s"
 
-#: builtin/worktree.c:149
 msgid "report pruned working trees"
 msgstr "rapportera borttagna arbetskataloger"
 
-#: builtin/worktree.c:151
 msgid "expire working trees older than <time>"
 msgstr "låt tid gå ut för arbetskataloger äldre än <tid>"
 
-#: builtin/worktree.c:221
 #, c-format
 msgid "'%s' already exists"
 msgstr "\"%s\" finns redan"
 
-#: builtin/worktree.c:230
 #, c-format
 msgid "unusable worktree destination '%s'"
 msgstr "oanvändbar mål för arbetskatalog \"%s\""
 
-#: builtin/worktree.c:235
 #, c-format
 msgid ""
 "'%s' is a missing but locked worktree;\n"
@@ -24422,7 +12857,6 @@ msgstr ""
 "använd \"%s -f -f\" för att överstyra, eller \"unlock\" och \"prune\" eller "
 "\"remove\" för att rensa"
 
-#: builtin/worktree.c:237
 #, c-format
 msgid ""
 "'%s' is a missing but already registered worktree;\n"
@@ -24432,151 +12866,122 @@ msgstr ""
 "använd \"%s -f\" för att överstyra, eller \"prune\" eller \"remove\" för att "
 "rensa"
 
-#: builtin/worktree.c:248
 #, c-format
 msgid "failed to copy '%s' to '%s'; sparse-checkout may not work correctly"
 msgstr ""
 "misslyckades kopiera \"%s\" till \"%s\"; sparse-checkout kanske inte kommer "
 "att fungera korrekt"
 
-#: builtin/worktree.c:268
 #, c-format
 msgid "failed to copy worktree config from '%s' to '%s'"
 msgstr ""
 "misslyckades kopiera arbetskatalogkonfiguration från \"%s\" till \"%s\""
 
-#: builtin/worktree.c:280 builtin/worktree.c:285
 #, c-format
 msgid "failed to unset '%s' in '%s'"
 msgstr "misslyckades slå av \"%s\" i \"%s\""
 
-#: builtin/worktree.c:356
 #, c-format
 msgid "could not create directory of '%s'"
 msgstr "kunde inte skapa katalogen \"%s\""
 
-#: builtin/worktree.c:378
 msgid "initializing"
 msgstr "initierar"
 
-#: builtin/worktree.c:492 builtin/worktree.c:498
 #, c-format
 msgid "Preparing worktree (new branch '%s')"
 msgstr "Förbereder arbetskatalog (ny gren \"%s\")"
 
-#: builtin/worktree.c:494
 #, 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:503
 #, c-format
 msgid "Preparing worktree (checking out '%s')"
 msgstr "Förbereder arbetskatalog (checkar ut \"%s\")"
 
-#: builtin/worktree.c:509
 #, c-format
 msgid "Preparing worktree (detached HEAD %s)"
 msgstr "Förbereder arbetskatalog (frånkopplat HEAD %s)"
 
-#: builtin/worktree.c:554
 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:557
 msgid "create a new branch"
 msgstr "skapa en ny gren"
 
-#: builtin/worktree.c:559
 msgid "create or reset a branch"
 msgstr "skapa eller återställ en gren"
 
-#: builtin/worktree.c:561
 msgid "populate the new working tree"
 msgstr "befolka den nya arbetskatalogen"
 
-#: builtin/worktree.c:562
 msgid "keep the new working tree locked"
 msgstr "låt arbetskatalogen förbli låst"
 
-#: builtin/worktree.c:564 builtin/worktree.c:809
 msgid "reason for locking"
 msgstr "orsak till lås"
 
-#: builtin/worktree.c:567
 msgid "set up tracking mode (see git-branch(1))"
 msgstr "ställ in spårningsläge (se git-branch(1))"
 
-#: builtin/worktree.c:570
 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:584
+#, c-format
+msgid "options '%s', '%s', and '%s' cannot be used together"
+msgstr "flaggorna \"%s\", \"%s\" och \"%s\" kan inte användas samtidigt"
+
 msgid "added with --lock"
 msgstr "lagt till med --lock"
 
-#: builtin/worktree.c:646
 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:766
 msgid "show extended annotations and reasons, if available"
 msgstr "visa utökade annoteringar och grunder, om tillgängliga"
 
-#: builtin/worktree.c:768
 msgid "add 'prunable' annotation to worktrees older than <time>"
 msgstr ""
 "lägg till \"prunable\"-annoteringar till arbetskataloger äldre än <tid>"
 
-#: builtin/worktree.c:770
 msgid "terminate records with a NUL character"
 msgstr "avsluta poster med NUL-tecken"
 
-#: builtin/worktree.c:821 builtin/worktree.c:854 builtin/worktree.c:928
-#: builtin/worktree.c:1052
 #, c-format
 msgid "'%s' is not a working tree"
 msgstr "\"%s\" är inte en arbetskatalog"
 
-#: builtin/worktree.c:823 builtin/worktree.c:856
 msgid "The main working tree cannot be locked or unlocked"
 msgstr "Huvudarbetskatalogen kan inte låsas eller låsas upp"
 
-#: builtin/worktree.c:828
 #, c-format
 msgid "'%s' is already locked, reason: %s"
 msgstr "\"%s\" är redan låst, orsak: %s"
 
-#: builtin/worktree.c:830
 #, c-format
 msgid "'%s' is already locked"
 msgstr "\"%s\" är redan låst"
 
-#: builtin/worktree.c:858
 #, c-format
 msgid "'%s' is not locked"
 msgstr "\"%s\" är inte låst"
 
-#: builtin/worktree.c:899
 msgid "working trees containing submodules cannot be moved or removed"
 msgstr "arbetskataloger med undermoduler kan inte flyttas eller tas bort"
 
-#: builtin/worktree.c:907
 msgid "force move even if worktree is dirty or locked"
 msgstr "tvinga flyttning även om arbetskatalogen är smutsig eller låst"
 
-#: builtin/worktree.c:930 builtin/worktree.c:1054
 #, c-format
 msgid "'%s' is a main working tree"
 msgstr "\"%s\" är inte en huvudarbetskatalog"
 
-#: builtin/worktree.c:935
 #, c-format
 msgid "could not figure out destination name from '%s'"
 msgstr "kunde inte lista ut målnamn från \"%s\""
 
-#: builtin/worktree.c:948
 #, c-format
 msgid ""
 "cannot move a locked working tree, lock reason: %s\n"
@@ -24585,7 +12990,6 @@ msgstr ""
 "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:950
 msgid ""
 "cannot move a locked working tree;\n"
 "use 'move -f -f' to override or unlock first"
@@ -24593,38 +12997,31 @@ msgstr ""
 "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:953
 #, c-format
 msgid "validation failed, cannot move working tree: %s"
 msgstr "kontroll misslyckades, kan inte flytta arbetskatalog: %s"
 
-#: builtin/worktree.c:958
 #, c-format
 msgid "failed to move '%s' to '%s'"
 msgstr "misslyckades flytta \"%s\" till \"%s\""
 
-#: builtin/worktree.c:1004
 #, c-format
 msgid "failed to run 'git status' on '%s'"
 msgstr "misslyckades köra \"git status\" på \"%s\""
 
-#: builtin/worktree.c:1008
 #, 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:1013
 #, 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:1036
 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:1059
 #, c-format
 msgid ""
 "cannot remove a locked working tree, lock reason: %s\n"
@@ -24633,7 +13030,6 @@ msgstr ""
 "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:1061
 msgid ""
 "cannot remove a locked working tree;\n"
 "use 'remove -f -f' to override or unlock first"
@@ -24641,5155 +13037,8632 @@ msgstr ""
 "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:1064
 #, c-format
 msgid "validation failed, cannot remove working tree: %s"
 msgstr "kontroll misslyckades, kan inte ta bort arbetskatalog: %s"
 
-#: builtin/worktree.c:1088
 #, c-format
 msgid "repair: %s: %s"
 msgstr "reparera: %s: %s"
 
-#: builtin/worktree.c:1091
 #, c-format
 msgid "error: %s: %s"
 msgstr "fel: %s: %s"
 
-#: builtin/write-tree.c:15
 msgid "git write-tree [--missing-ok] [--prefix=<prefix>/]"
 msgstr "git write-tree [--missing-ok] [--prefix=<prefix>/]"
 
-#: builtin/write-tree.c:28
 msgid "<prefix>/"
 msgstr "<prefix>/"
 
-#: builtin/write-tree.c:29
 msgid "write tree object for a subdirectory <prefix>"
 msgstr "visa trädobjekt för underkatalogen <prefix>"
 
-#: builtin/write-tree.c:31
 msgid "only useful for debugging"
 msgstr "endast användbart vid felsökning"
 
-#: git.c:28
-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"
-"           [--git-dir=<path>] [--work-tree=<path>] [--namespace=<name>]\n"
-"           [--super-prefix=<path>] [--config-env=<name>=<envvar>]\n"
-"           <command> [<args>]"
-msgstr ""
-"git [--version] [--help] [-C <sökväg>] [-c <namn>=<värde>]\n"
-"           [--exec-path[=<sökväg>]] [--html-path] [--man-path] [--info-"
-"path]\n"
-"           [-p | --paginate | -P | --no-pager] [--no-replace-objects] [--"
-"bare]\n"
-"           [--git-dir=<sökväg>] [--work-tree=<sökväg>] [--namespace=<namn>]\n"
-"           [--super-prefix=<sökväg>] [--config-env=<namn>=<miljövar>]\n"
-"           <kommando> [<flaggor>]"
-
-#: git.c:36
-msgid ""
-"'git help -a' and 'git help -g' list available subcommands and some\n"
-"concept guides. See 'git help <command>' or 'git help <concept>'\n"
-"to read about a specific subcommand or concept.\n"
-"See 'git help git' for an overview of the system."
-msgstr ""
-"\"git help -a\" och \"git help -g\" visar tillgängliga underkommandon och\n"
-"några konceptvägledningar. Se \"git help <kommando>\" eller \"git help\n"
-"<koncept>\" för att läsa mer om specifika underkommandon och koncept.\n"
-"See \"git help git\" för en översikt över systemet."
-
-#: git.c:188 git.c:216 git.c:300
-#, c-format
-msgid "no directory given for '%s' option\n"
-msgstr "ingen katalog angavs för flaggan \"%s\"\n"
-
-#: git.c:202
-#, c-format
-msgid "no namespace given for --namespace\n"
-msgstr "ingen namnrymd angavs för --namespace\n"
-
-#: git.c:230
-#, c-format
-msgid "no prefix given for --super-prefix\n"
-msgstr "inget prefix angavs för --super-prefix\n"
-
-#: git.c:252
-#, c-format
-msgid "-c expects a configuration string\n"
-msgstr "-c förväntar en konfigurationssträng\n"
-
-#: git.c:260
-#, c-format
-msgid "no config key given for --config-env\n"
-msgstr "ingen konfigurationsnyckel angavs för --config-env\n"
-
-#: git.c:326
-#, c-format
-msgid "unknown option: %s\n"
-msgstr "okänd flagga: %s\n"
-
-#: git.c:375
-#, c-format
-msgid "while expanding alias '%s': '%s'"
-msgstr "vid expandering av aliaset \"%s\": \"%s\""
-
-#: git.c:384
-#, c-format
-msgid ""
-"alias '%s' changes environment variables.\n"
-"You can use '!git' in the alias to do this"
-msgstr ""
-"aliaset \"%s\" ändrar miljövariabler.\n"
-"Du kan använda \"!git\" i aliaset för att göra det"
-
-#: git.c:391
-#, c-format
-msgid "empty alias for %s"
-msgstr "tomt alias för %s"
-
-#: git.c:394
-#, c-format
-msgid "recursive alias: %s"
-msgstr "rekursivt alias: %s"
-
-#: git.c:480
-msgid "write failure on standard output"
-msgstr "skrivfel på standard ut"
-
-#: git.c:482
-msgid "unknown write failure on standard output"
-msgstr "okänt skrivfel på standard ut"
-
-#: git.c:484
-msgid "close failed on standard output"
-msgstr "stäng misslyckades på standard ut"
-
-#: git.c:838
-#, 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:888
-#, c-format
-msgid "cannot handle %s as a builtin"
-msgstr "kan inte hantera %s som inbyggd"
-
-#: git.c:901
-#, c-format
-msgid ""
-"usage: %s\n"
-"\n"
-msgstr ""
-"användning: %s\n"
-"\n"
-
-#: git.c:921
 #, 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:933
-#, c-format
-msgid "failed to run command '%s': %s\n"
-msgstr "misslyckades köra kommandot \"%s\": %s\n"
-
-#: http-fetch.c:128
-#, c-format
-msgid "argument to --packfile must be a valid hash (got '%s')"
-msgstr ""
-"argumentet till --packfile måste vara ett giltigt hashvärde (fick '%s')"
-
-#: http-fetch.c:138
-msgid "not a git repository"
-msgstr "inte ett git-arkiv"
-
-#: t/helper/test-fast-rebase.c:141
-msgid "unhandled options"
-msgstr "flaggor som inte hanterats"
-
-#: t/helper/test-fast-rebase.c:146
-msgid "error preparing revisions"
-msgstr "fel när revisioner skulle förberedas"
-
-#: t/helper/test-reach.c:154
-#, c-format
-msgid "commit %s is not marked reachable"
-msgstr "incheckning %s är inte märkt nåbar"
-
-#: t/helper/test-reach.c:164
-msgid "too many commits marked reachable"
-msgstr "för många incheckningar markerade nåbara"
-
-#: t/helper/test-serve-v2.c:7
-msgid "test-tool serve-v2 [<options>]"
-msgstr "test-tool serve-v2 [<flaggor>]"
-
-#: t/helper/test-serve-v2.c:19
-msgid "exit immediately after advertising capabilities"
-msgstr "avsluta omedelbart efter kungörelse av kapabiliteter"
-
-#: 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: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: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: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:585
-msgid "test-helper simple-ipc send         [<name>] [<token>]"
-msgstr "test-helper simple-ipc send         [<namn>] [<igenkänningstecken>]"
-
-#: 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:587
-msgid ""
-"test-helper simple-ipc multiple     [<name>] [<threads>] [<bytecount>] "
-"[<batchsize>]"
-msgstr ""
-"test-helper simple-ipc multiple     [<namn>] [<trådar>] [<antal-byte>] "
-"[<buntstorlek>]"
-
-#: 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:597
-msgid "named-pipe name"
-msgstr "namn på namngivet rör"
-
-#: 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: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:602
-msgid "number of bytes"
-msgstr "antal byte"
-
-#: 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:605
-msgid "byte"
-msgstr "byte"
-
-#: t/helper/test-simple-ipc.c:605
-msgid "ballast character"
-msgstr "ballasttecken"
-
-#: t/helper/test-simple-ipc.c:606
-msgid "token"
-msgstr "igenkänningstecken"
-
-#: 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: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: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: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: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: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: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: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:1876
-#, c-format
-msgid ""
-"unable to update url base from redirection:\n"
-"  asked for: %s\n"
-"   redirect: %s"
-msgstr ""
-"kan inte uppdatera urlbas från omdirigerin:\n"
-"        bad om: %s\n"
-"  omdirigering: %s"
-
-#: remote-curl.c:184
-#, c-format
-msgid "invalid quoting in push-option value: '%s'"
-msgstr "felaktig citering på värde för push-option: \"%s\""
-
-#: remote-curl.c:308
-#, 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:409
-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:440
-#, c-format
-msgid "invalid server response; got '%s'"
-msgstr "ogiltigt svar från servern; fick \"%s\""
-
-#: remote-curl.c:500
-#, c-format
-msgid "repository '%s' not found"
-msgstr "arkivet \"%s\" hittades inte"
-
-#: remote-curl.c:504
-#, c-format
-msgid "Authentication failed for '%s'"
-msgstr "Autentisering misslyckades \"%s\""
-
-#: remote-curl.c:508
-#, 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:512
-#, c-format
-msgid "unable to access '%s': %s"
-msgstr "kan inte komma åt \"%s\": %s"
-
-#: remote-curl.c:518
-#, c-format
-msgid "redirecting to %s"
-msgstr "omdirigerar till %s"
-
-#: remote-curl.c:649
-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:661
-msgid "remote server sent unexpected response end packet"
-msgstr "fjärrservern sände oväntat svarsavslutningspaketet"
-
-#: remote-curl.c:730
-msgid "unable to rewind rpc post data - try increasing http.postBuffer"
-msgstr "kunde inte spola tillbaka rpc-postdata - försök öka http.postBuffer"
+msgid "unrecognized bundle hash algorithm: %s"
+msgstr "okänd hashningsalgoritm för bunt: \"%s\""
 
-#: remote-curl.c:759
 #, c-format
-msgid "remote-curl: bad line length character: %.4s"
-msgstr "remote-curl: felaktig radlängdstecken: %.4s"
-
-#: remote-curl.c:761
-msgid "remote-curl: unexpected response end packet"
-msgstr "remote-curl: oväntat svarsavslutningspaketet"
+msgid "unknown capability '%s'"
+msgstr "okänd kapabilitet \"%s\""
 
-#: remote-curl.c:837
 #, c-format
-msgid "RPC failed; %s"
-msgstr "RPC misslyckades; %s"
-
-#: remote-curl.c:877
-msgid "cannot handle pushes this big"
-msgstr "kan inte hantera så stora sändningar"
+msgid "'%s' does not look like a v2 or v3 bundle file"
+msgstr "'%s' ser inte ut som en v2- eller v3-bunt-fil"
 
-#: remote-curl.c:990
 #, c-format
-msgid "cannot deflate request; zlib deflate error %d"
-msgstr "kan inte packa upp anrop; zlib-deflate-fel %d"
+msgid "unrecognized header: %s%s (%d)"
+msgstr "okänt huvud: %s%s (%d)"
 
-#: remote-curl.c:994
-#, c-format
-msgid "cannot deflate request; zlib end error %d"
-msgstr "kan inte packa upp anrop; zlib-slutfel %d"
+msgid "Repository lacks these prerequisite commits:"
+msgstr "Arkivet saknar dessa nödvändiga incheckningar:"
 
-#: remote-curl.c:1044
-#, c-format
-msgid "%d bytes of length header were received"
-msgstr "%d byte av längd-huvudet togs emot"
+msgid "need a repository to verify a bundle"
+msgstr "behöver ett arkiv för att bekräfta en bunt."
 
-#: remote-curl.c:1046
 #, c-format
-msgid "%d bytes of body are still expected"
-msgstr "%d byte av kroppen väntas fortfarande"
-
-#: remote-curl.c:1135
-msgid "dumb http transport does not support shallow capabilities"
-msgstr "dum http-transport stöder inte grunda arkiv"
-
-#: remote-curl.c:1150
-msgid "fetch failed."
-msgstr "mottagning misslyckades."
-
-#: remote-curl.c:1198
-msgid "cannot fetch by sha1 over smart http"
-msgstr "kan inte hämta med sha1 över smart http"
+msgid "The bundle contains this ref:"
+msgid_plural "The bundle contains these %<PRIuMAX> refs:"
+msgstr[0] "Bunten innehåller denna referens:"
+msgstr[1] "Bunten innehåller dessa %<PRIuMAX> referenser:"
 
-#: remote-curl.c:1242 remote-curl.c:1248
-#, c-format
-msgid "protocol error: expected sha/ref, got '%s'"
-msgstr "protokollfel: förväntade sha/ref, fick \"%s\""
+msgid "The bundle records a complete history."
+msgstr "Bunten beskriver en komplett historik."
 
-#: remote-curl.c:1260 remote-curl.c:1378
 #, c-format
-msgid "http transport does not support %s"
-msgstr "http-transporten stöder inte %s"
-
-#: remote-curl.c:1296
-msgid "git-http-push failed"
-msgstr "git-http-push misslyckades"
-
-#: remote-curl.c:1485
-msgid "remote-curl: usage: git remote-curl <remote> [<url>]"
-msgstr "remote-curl: användning: git remote-curl <fjärr> [<url>]"
-
-#: remote-curl.c:1517
-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:1524
-msgid "remote-curl: fetch attempted without a local repo"
-msgstr "remote-curl: försökte ta emot utan lokalt arkiv"
+msgid "The bundle requires this ref:"
+msgid_plural "The bundle requires these %<PRIuMAX> refs:"
+msgstr[0] "Bunten kräver denna referens:"
+msgstr[1] "Bunten kräver dessa %<PRIuMAX> referenser:"
 
-#: remote-curl.c:1565
-#, c-format
-msgid "remote-curl: unknown command '%s' from git"
-msgstr "remote-curl: okänt kommando \"%s\" från git"
+msgid "unable to dup bundle descriptor"
+msgstr "kan inte duplicera bunthandtag"
 
-#: contrib/scalar/scalar.c:49
-msgid "need a working directory"
-msgstr "behöver en arbetskatalog"
+msgid "Could not spawn pack-objects"
+msgstr "Kunde inte starta pack-objects"
 
-#: contrib/scalar/scalar.c:86
-msgid "could not find enlistment root"
-msgstr "kunde inte hitta enrolleringsroten"
+msgid "pack-objects died"
+msgstr "pack-objects misslyckades"
 
-#: contrib/scalar/scalar.c:89 contrib/scalar/scalar.c:350
-#: contrib/scalar/scalar.c:435 contrib/scalar/scalar.c:578
 #, c-format
-msgid "could not switch to '%s'"
-msgstr "kunde inte växla till \"%s\""
+msgid "ref '%s' is excluded by the rev-list options"
+msgstr "referensen \"%s\" exkluderas av argumenten till rev-list"
 
-#: contrib/scalar/scalar.c:179
 #, c-format
-msgid "could not configure %s=%s"
-msgstr "kunde inte ställa in %s=%s"
-
-#: contrib/scalar/scalar.c:197
-msgid "could not configure log.excludeDecoration"
-msgstr "kunde inte ställa in log.excludeDecoration"
-
-#: contrib/scalar/scalar.c:218
-msgid "Scalar enlistments require a worktree"
-msgstr "Scalar-enrolleringar kräver en arbetskatalog"
+msgid "unsupported bundle version %d"
+msgstr "version %d för bunt stöds ej"
 
-#: contrib/scalar/scalar.c:310
 #, c-format
-msgid "remote HEAD is not a branch: '%.*s'"
-msgstr "HEAD hos fjärren är inte en gren: \"%.*s\""
-
-#: contrib/scalar/scalar.c:316
-msgid "failed to get default branch name from remote; using local default"
-msgstr ""
-"misslyckades hämta namn på standardgren för fjärr; använder lokalt förval"
-
-#: contrib/scalar/scalar.c:329
-msgid "failed to get default branch name"
-msgstr "misslyckades hämta namn på standardgren"
-
-#: contrib/scalar/scalar.c:340
-msgid "failed to unregister repository"
-msgstr "misslyckades avregistrera arkivet"
-
-#: contrib/scalar/scalar.c:355
-msgid "failed to delete enlistment directory"
-msgstr "misslyckades ta bort enrolleringskatalogen"
-
-#: contrib/scalar/scalar.c:375
-msgid "branch to checkout after clone"
-msgstr "gren att checka ut efter kloning"
-
-#: contrib/scalar/scalar.c:377
-msgid "when cloning, create full working directory"
-msgstr "skapa komplett arbetskatalog vid kloning"
-
-#: contrib/scalar/scalar.c:379
-msgid "only download metadata for the branch that will be checked out"
-msgstr "hämta endast metadata för grenen som skall checkas ut"
-
-#: contrib/scalar/scalar.c:384
-msgid "scalar clone [<options>] [--] <repo> [<dir>]"
-msgstr "scalar clone [<flaggor>] [--] <arkiv> [<kat>]"
+msgid "cannot write bundle version %d with algorithm %s"
+msgstr "kan inte skriva bunt med version %d med algoritmen %s"
 
-#: contrib/scalar/scalar.c:409
-#, c-format
-msgid "cannot deduce worktree name from '%s'"
-msgstr "Kan inte härleda arbetsträdsnamn från \"%s\""
+msgid "Refusing to create empty bundle."
+msgstr "Vägrar skapa en tom bunt."
 
-#: contrib/scalar/scalar.c:418
 #, c-format
-msgid "directory '%s' exists already"
-msgstr "katalogen \"%s\" finns redan"
+msgid "cannot create '%s'"
+msgstr "kan inte skapa \"%s\""
 
-#: contrib/scalar/scalar.c:445
-#, c-format
-msgid "failed to get default branch for '%s'"
-msgstr "misslyckades hämta standardgren för \"%s\""
+msgid "index-pack died"
+msgstr "index-pack dog"
 
-#: contrib/scalar/scalar.c:456
-#, c-format
-msgid "could not configure remote in '%s'"
-msgstr "kunde inte ställa in fjärr i \"%s\""
+msgid "terminating chunk id appears earlier than expected"
+msgstr "avslutande stycke-id förekommer tidigare än förväntat"
 
-#: contrib/scalar/scalar.c:465
 #, c-format
-msgid "could not configure '%s'"
-msgstr "kunde inte ställa in \"%s\""
-
-#: contrib/scalar/scalar.c:468
-msgid "partial clone failed; attempting full clone"
-msgstr "delvis klon misslyckades; försöker med fullständig klon"
-
-#: contrib/scalar/scalar.c:472
-msgid "could not configure for full clone"
-msgstr "kunde inte ställa in för komplett klon"
-
-#: contrib/scalar/scalar.c:504
-msgid "`scalar list` does not take arguments"
-msgstr "\"scalar list\" tar inte argument"
-
-#: contrib/scalar/scalar.c:517
-msgid "scalar register [<enlistment>]"
-msgstr "scalar register [<enrollering>]"
-
-#: contrib/scalar/scalar.c:544
-msgid "reconfigure all registered enlistments"
-msgstr "konfigurera alla registrerade enrolleringar på nytt"
-
-#: contrib/scalar/scalar.c:548
-msgid "scalar reconfigure [--all | <enlistment>]"
-msgstr "scalar reconfigure [--all | <enrollering>]"
-
-#: contrib/scalar/scalar.c:566
-msgid "--all or <enlistment>, but not both"
-msgstr "--all eller <enrollering>, men inte bägge"
+msgid "improper chunk offset(s) %<PRIx64> and %<PRIx64>"
+msgstr "felaktigt stycke-offset %<PRIx64> och %<PRIx64>"
 
-#: contrib/scalar/scalar.c:581
 #, c-format
-msgid "git repository gone in '%s'"
-msgstr "git-arkiv försvunnet i \"%s\""
-
-#: contrib/scalar/scalar.c:621
-msgid ""
-"scalar run <task> [<enlistment>]\n"
-"Tasks:\n"
-msgstr ""
-"scalar run <uppgift> [<enrollering>]\n"
-"Uppgifter:\n"
+msgid "duplicate chunk ID %<PRIx32> found"
+msgstr "dubblerat stycke-ID %<PRIx32> upptäckt"
 
-#: contrib/scalar/scalar.c:639
 #, c-format
-msgid "no such task: '%s'"
-msgstr "okänd uppgift: \"%s\""
-
-#: contrib/scalar/scalar.c:689
-msgid "scalar unregister [<enlistment>]"
-msgstr "scalar unregister [<enrollering>]"
-
-#: contrib/scalar/scalar.c:736
-msgid "scalar delete <enlistment>"
-msgstr "scalar delete <enrollering>"
-
-#: contrib/scalar/scalar.c:751
-msgid "refusing to delete current working directory"
-msgstr "vägrar ta bort aktuell arbetskatalog"
-
-#: contrib/scalar/scalar.c:766
-msgid "include Git version"
-msgstr "ta med Git-version"
-
-#: contrib/scalar/scalar.c:768
-msgid "include Git's build options"
-msgstr "ta med Gits byggflaggor"
-
-#: contrib/scalar/scalar.c:772
-msgid "scalar verbose [-v | --verbose] [--build-options]"
-msgstr "scalar verbose [-v | --verbose] [--build-options]"
+msgid "final chunk has non-zero id %<PRIx32>"
+msgstr "avslutande stycke har id %<PRIx32> som inte är noll"
 
-#: contrib/scalar/scalar.c:813
-msgid "-C requires a <directory>"
-msgstr "-C kräver en <katalog>"
+msgid "invalid hash version"
+msgstr "felaktig hashnings-version"
 
-#: contrib/scalar/scalar.c:815
 #, c-format
-msgid "could not change to '%s'"
-msgstr "kunde inte byta till \"%s\""
-
-#: contrib/scalar/scalar.c:821
-msgid "-c requires a <key>=<value> argument"
-msgstr "-c kräver ett argument på formen <nyckel>=<värde>"
-
-#: contrib/scalar/scalar.c:839
-msgid ""
-"scalar [-C <directory>] [-c <key>=<value>] <command> [<options>]\n"
-"\n"
-"Commands:\n"
-msgstr ""
-"scalar [-C <katalog>] [-c <nyckel>=<värde>] <kommando> [<flaggor>]\n"
-"\n"
-"Kommandon:\n"
-
-#: compat/compiler.h:26
-msgid "no compiler information available\n"
-msgstr "ingen kompilatorinformation tillgänglig\n"
-
-#: compat/compiler.h:38
-msgid "no libc information available\n"
-msgstr "ingen libc-information tillgänglig\n"
-
-#: list-objects-filter-options.h:126
-msgid "args"
-msgstr "argument"
-
-#: list-objects-filter-options.h:127
-msgid "object filtering"
-msgstr "objektfiltrering"
-
-#: parse-options.h:188
-msgid "expiry-date"
-msgstr "giltig-till"
-
-#: parse-options.h:202
-msgid "no-op (backward compatibility)"
-msgstr "ingen funktion (bakåtkompatibilitet)"
-
-#: parse-options.h:341
-msgid "be more verbose"
-msgstr "var mer pratsam"
-
-#: parse-options.h:343
-msgid "be more quiet"
-msgstr "var mer tyst"
-
-#: parse-options.h:349
-msgid "use <n> digits to display object names"
-msgstr "använd <n> siffror för att visa objektnamn"
-
-#: parse-options.h:368
-msgid "how to strip spaces and #comments from message"
-msgstr "hur blanksteg och #kommentarer ska tas bort från meddelande"
-
-#: parse-options.h:369
-msgid "read pathspec from file"
-msgstr "läs sökvägsangivelse från fil"
-
-#: parse-options.h:370
-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:98
-msgid "key"
-msgstr "nyckel"
-
-#: ref-filter.h:98
-msgid "field name to sort on"
-msgstr "fältnamn att sortera på"
-
-#: rerere.h:44
-msgid "update the index with reused conflict resolution if possible"
-msgstr "uppdatera indexet med återanvänd konfliktlösning om möjligt"
+msgid "invalid color value: %.*s"
+msgstr "felaktigt färgvärde: %.*s"
 
-#: command-list.h:50
 msgid "Add file contents to the index"
 msgstr "Lägg filinnehåll till indexet"
 
-#: command-list.h:51
 msgid "Apply a series of patches from a mailbox"
 msgstr "Tillämpa en serie patchar från en brevlåda"
 
-#: command-list.h:52
 msgid "Annotate file lines with commit information"
 msgstr "Kommentera filrader med incheckningsinformation"
 
-#: command-list.h:53
 msgid "Apply a patch to files and/or to the index"
 msgstr "Tillämpa en patch på filer och/eller indexet"
 
-#: command-list.h:54
 msgid "Import a GNU Arch repository into Git"
 msgstr "Importera ett GNU Arch-arkiv till Git"
 
-#: command-list.h:55
 msgid "Create an archive of files from a named tree"
 msgstr "Skapa ett arkiv över filer från ett namngivet träd"
 
-#: command-list.h:56
 msgid "Use binary search to find the commit that introduced a bug"
 msgstr "Använd binärsökning för att hitta ändringen som introducerade ett fel"
 
-#: command-list.h:57
 msgid "Show what revision and author last modified each line of a file"
 msgstr "Visa version och författare som sist modifierade varje rad i en fil"
 
-#: command-list.h:58
 msgid "List, create, or delete branches"
 msgstr "Visa, skapa eller ta bort grenar"
 
-#: command-list.h:59
 msgid "Collect information for user to file a bug report"
 msgstr "Samla information från användaren för att sända en felrapport"
 
-#: command-list.h:60
 msgid "Move objects and refs by archive"
 msgstr "Flytta objekt och referenser efter arkiv"
 
-#: command-list.h:61
 msgid "Provide content or type and size information for repository objects"
 msgstr ""
 "Visa innehåller eller typ- och storleksinformation för objekt i arkivet"
 
-#: command-list.h:62
 msgid "Display gitattributes information"
 msgstr "Visa information från gitattributes"
 
-#: command-list.h:63
 msgid "Debug gitignore / exclude files"
 msgstr "Felsök gitignore / exkluderings-filer"
 
-#: command-list.h:64
 msgid "Show canonical names and email addresses of contacts"
 msgstr "Visa kanoniska namn och e-postadresser för kontakter"
 
-#: command-list.h:65
 msgid "Ensures that a reference name is well formed"
 msgstr "Se till att referensen är välformad"
 
-#: command-list.h:66
 msgid "Switch branches or restore working tree files"
 msgstr "Byt till en ny gren eller återställ filer i arbetskatalogen"
 
-#: command-list.h:67
 msgid "Copy files from the index to the working tree"
 msgstr "Kopiera filer från indexet till arbetskatalogen"
 
-#: command-list.h:68
 msgid "Find commits yet to be applied to upstream"
 msgstr "Hitta incheckningar som ännu inte applicerats uppströms"
 
-#: command-list.h:69
 msgid "Apply the changes introduced by some existing commits"
 msgstr "Applicera ändringarna introducerade av befintliga incheckningar"
 
-#: command-list.h:70
 msgid "Graphical alternative to git-commit"
 msgstr "Grafiskt alternativ till git-commit"
 
-#: command-list.h:71
 msgid "Remove untracked files from the working tree"
 msgstr "Ta bort ospårade filer från arbetskatalogen"
 
-#: command-list.h:72
 msgid "Clone a repository into a new directory"
 msgstr "Klona ett arkiv till en ny katalog"
 
-#: command-list.h:73
 msgid "Display data in columns"
 msgstr "Visa data i kolumner"
 
-#: command-list.h:74
 msgid "Record changes to the repository"
 msgstr "Protokollför ändringar i arkivet"
 
-#: command-list.h:75
 msgid "Write and verify Git commit-graph files"
 msgstr "Skriv och verifiera Git-incheckningsgraffiler"
 
-#: command-list.h:76
 msgid "Create a new commit object"
 msgstr "Skapa ett nytt incheckningsobjekt"
 
-#: command-list.h:77
 msgid "Get and set repository or global options"
 msgstr "Läs och skriv alternativ för arkiv eller globalt"
 
-#: command-list.h:78
 msgid "Count unpacked number of objects and their disk consumption"
 msgstr "Räkna antal opackade objekt och mängd diskutrymme"
 
-#: command-list.h:79
 msgid "Retrieve and store user credentials"
 msgstr "Hämta och spara användarreferenser"
 
-#: command-list.h:80
 msgid "Helper to temporarily store passwords in memory"
 msgstr "Hjälpprogram för att tillfälligt lagra lösenord i minnet"
 
-#: command-list.h:81
 msgid "Helper to store credentials on disk"
 msgstr "Hjälpprogram för att lagra användarreferenser på disk"
 
-#: command-list.h:82
 msgid "Export a single commit to a CVS checkout"
 msgstr "Exportera en enkel incheckning i en CVS-utcheckning"
 
-#: command-list.h:83
 msgid "Salvage your data out of another SCM people love to hate"
 msgstr "Rädda dina data ut ur andra SCM folk älskar att hata"
 
-#: command-list.h:84
 msgid "A CVS server emulator for Git"
 msgstr "En CVS-serveremulator för Git"
 
-#: command-list.h:85
 msgid "A really simple server for Git repositories"
 msgstr "En riktigt enkel server för Git-arkiv"
 
-#: command-list.h:86
 msgid "Give an object a human readable name based on an available ref"
 msgstr "Ge ett objekt användarläsbara namn baserade på en tillgänglig referens"
 
-#: command-list.h:87
 msgid "Show changes between commits, commit and working tree, etc"
 msgstr "Visa ändringar mellan incheckningar, med arbetskatalogen, osv"
 
-#: command-list.h:88
 msgid "Compares files in the working tree and the index"
 msgstr "Jämför filer i arbetskatalogen och indexet"
 
-#: command-list.h:89
 msgid "Compare a tree to the working tree or index"
 msgstr "Jämför en träd med arbetskatalogen eller indexet"
 
-#: command-list.h:90
 msgid "Compares the content and mode of blobs found via two tree objects"
 msgstr "Visar innehåll och läge för blobbar som hittats via två trädobjekt"
 
-#: command-list.h:91
 msgid "Show changes using common diff tools"
 msgstr "Visa ändringar med vanliga diff-verktyg"
 
-#: command-list.h:92
 msgid "Git data exporter"
 msgstr "Exporterare för Git-data"
 
-#: command-list.h:93
 msgid "Backend for fast Git data importers"
 msgstr "Bakända för snabba Git-dataimporterare"
 
-#: command-list.h:94
 msgid "Download objects and refs from another repository"
 msgstr "Hämta objekt och referenser från annat arkiv"
 
-#: command-list.h:95
 msgid "Receive missing objects from another repository"
 msgstr "Ta emot saknade objekt från annat arkiv"
 
-#: command-list.h:96
 msgid "Rewrite branches"
 msgstr "Skriv om grenar"
 
-#: command-list.h:97
 msgid "Produce a merge commit message"
 msgstr "Skapa incheckningsmeddelande för en sammanslagning"
 
-#: command-list.h:98
 msgid "Output information on each ref"
 msgstr "Visa information för varje referens"
 
-#: command-list.h:99
 msgid "Run a Git command on a list of repositories"
 msgstr "Kör ett Git-kommando på en lista över arkiv"
 
-#: command-list.h:100
 msgid "Prepare patches for e-mail submission"
 msgstr "Förbered patchar för insändning via e-post"
 
-#: command-list.h:101
 msgid "Verifies the connectivity and validity of the objects in the database"
 msgstr "Bekräftar konnektivitet och validitet för objektet i databasen"
 
-#: command-list.h:102
 msgid "Cleanup unnecessary files and optimize the local repository"
 msgstr "Städa onödiga filer och optimera det lokala arkivet"
 
-#: command-list.h:103
 msgid "Extract commit ID from an archive created using git-archive"
 msgstr "Hämta inchecknings-id från ett arkiv skapat med git-archive"
 
-#: command-list.h:104
 msgid "Print lines matching a pattern"
 msgstr "Visa rader som motsvarar mönster"
 
-#: command-list.h:105
 msgid "A portable graphical interface to Git"
 msgstr "Ett portabelt grafiskt gränssnitt för Git"
 
-#: command-list.h:106
 msgid "Compute object ID and optionally creates a blob from a file"
 msgstr "Beräkna objekt-id och möjligen skapa en blob från en fil"
 
-#: command-list.h:107
 msgid "Display help information about Git"
 msgstr "Visa hjälpinformation om Git"
 
-#: command-list.h:108
 msgid "Run git hooks"
 msgstr "Kör git-krokar"
 
-#: command-list.h:109
 msgid "Server side implementation of Git over HTTP"
 msgstr "Serversideimplementation av Git över HTTP"
 
-#: command-list.h:110
 msgid "Download from a remote Git repository via HTTP"
 msgstr "Hämta objekt och referenser från annat Git-arkiv över HTTP"
 
-#: command-list.h:111
 msgid "Push objects over HTTP/DAV to another repository"
 msgstr "Sänd objekt över HTTP/DAV till ett annat arkiv"
 
-#: command-list.h:112
 msgid "Send a collection of patches from stdin to an IMAP folder"
 msgstr "Sänd en samling patchar från stdin till en IMAP-mapp"
 
-#: command-list.h:113
 msgid "Build pack index file for an existing packed archive"
 msgstr "SKapa pack-indexfiler för ett befintligt packat arkiv"
 
-#: command-list.h:114
 msgid "Create an empty Git repository or reinitialize an existing one"
 msgstr "Skapa tomt Git-arkiv eller ominitiera ett befintligt"
 
-#: command-list.h:115
 msgid "Instantly browse your working repository in gitweb"
 msgstr "Omedelbart bläddra i din arbetskatalog med gitweb"
 
-#: command-list.h:116
 msgid "Add or parse structured information in commit messages"
 msgstr ""
 "Lägg till eller tolka strukturerad information i incheckningsmeddelanden"
 
-#: command-list.h:117
 msgid "Show commit logs"
 msgstr "Visa incheckningsloggar"
 
-#: command-list.h:118
 msgid "Show information about files in the index and the working tree"
 msgstr "Visa information om filer i indexet och arbetskatalogen"
 
-#: command-list.h:119
 msgid "List references in a remote repository"
 msgstr "Lista referenser i ett fjärrarkiv"
 
-#: command-list.h:120
 msgid "List the contents of a tree object"
 msgstr "Visa innehållet i ett trädobjekt"
 
-#: command-list.h:121
 msgid "Extracts patch and authorship from a single e-mail message"
 msgstr "Hämta patch och ägarskap från ett enkelt e-postmeddelande"
 
-#: command-list.h:122
 msgid "Simple UNIX mbox splitter program"
 msgstr "Enkelt program för att dela en UNIX mbox"
 
-#: command-list.h:123
 msgid "Run tasks to optimize Git repository data"
 msgstr "Utför uppgifter för att optimera Git-arkivdata"
 
-#: command-list.h:124
 msgid "Join two or more development histories together"
 msgstr "Slå ihop två eller flera utvecklingshistorier"
 
-#: command-list.h:125
 msgid "Find as good common ancestors as possible for a merge"
 msgstr "Hitta en så bra anfader som möjligt för sammanslagning"
 
-#: command-list.h:126
 msgid "Run a three-way file merge"
 msgstr "Kör en trevägs-filsammanslagning"
 
-#: command-list.h:127
 msgid "Run a merge for files needing merging"
 msgstr "Kör en sammanslagning för filer som behöver det"
 
-#: command-list.h:128
 msgid "The standard helper program to use with git-merge-index"
 msgstr "Förvalt hjälpprogram att använda tillsammans med git-merge-index"
 
-#: command-list.h:129
 msgid "Show three-way merge without touching index"
 msgstr "Visa trevägssammanslagning utan att röra indexet"
 
-#: command-list.h:130
 msgid "Run merge conflict resolution tools to resolve merge conflicts"
 msgstr "Kör verktyg för lösning av sammanslagningskonflikter"
 
-#: command-list.h:131
 msgid "Creates a tag object with extra validation"
 msgstr "skapar ett taggobjekt med extra validering"
 
-#: command-list.h:132
 msgid "Build a tree-object from ls-tree formatted text"
 msgstr "Bygg ett trädobjekt från ls-tree-formaterad text"
 
-#: command-list.h:133
 msgid "Write and verify multi-pack-indexes"
 msgstr "Skriv och verifiera multi-pack-index"
 
-#: command-list.h:134
 msgid "Move or rename a file, a directory, or a symlink"
 msgstr "Flytta eller byt namn på en fil, katalog eller symbolisk länk"
 
-#: command-list.h:135
 msgid "Find symbolic names for given revs"
 msgstr "Hitta symboliska namn för givna referenser"
 
-#: command-list.h:136
 msgid "Add or inspect object notes"
 msgstr "Lägg till eller inspektera objektanteckningar"
 
-#: command-list.h:137
 msgid "Import from and submit to Perforce repositories"
 msgstr "Importera från eller sänd till Perforce-arkiv"
 
-#: command-list.h:138
 msgid "Create a packed archive of objects"
 msgstr "Skapa ett packat arkiv med objekt"
 
-#: command-list.h:139
 msgid "Find redundant pack files"
 msgstr "Hitta redundanta pack-filer"
 
-#: command-list.h:140
 msgid "Pack heads and tags for efficient repository access"
 msgstr "Packa huvuden och taggar för effektiv arkivåtkomst"
 
-#: command-list.h:141
 msgid "Compute unique ID for a patch"
 msgstr "Beräkna unik ID för en patch"
 
-#: command-list.h:142
 msgid "Prune all unreachable objects from the object database"
 msgstr "Ta bort alla onåbara objekt från objektdatabasen"
 
-#: command-list.h:143
 msgid "Remove extra objects that are already in pack files"
 msgstr "Ta bort extraobjekt som redan finns i pack-filerna"
 
-#: command-list.h:144
 msgid "Fetch from and integrate with another repository or a local branch"
 msgstr "Hämta från och integrera med annat arkiv eller en lokal gren"
 
-#: command-list.h:145
 msgid "Update remote refs along with associated objects"
 msgstr "Uppdatera fjärr-referenser och tillhörande objekt"
 
-#: command-list.h:146
 msgid "Applies a quilt patchset onto the current branch"
 msgstr "Tillämpar en quilt-patchuppsättning på aktiv gren"
 
-#: command-list.h:147
 msgid "Compare two commit ranges (e.g. two versions of a branch)"
 msgstr "Jämför två incheckningsintervall (dvs. två versioner av en gren)"
 
-#: command-list.h:148
 msgid "Reads tree information into the index"
 msgstr "Läser trädinformation in i indexet"
 
-#: command-list.h:149
 msgid "Reapply commits on top of another base tip"
 msgstr "Applicera incheckningar på nytt ovanpå en annan bastopp"
 
-#: command-list.h:150
 msgid "Receive what is pushed into the repository"
 msgstr "Ta emot det som sänds till arkivet"
 
-#: command-list.h:151
 msgid "Manage reflog information"
 msgstr "Hantera referenslogg-information"
 
-#: command-list.h:152
 msgid "Manage set of tracked repositories"
 msgstr "Hantera uppsättningen spårade arkiv"
 
-#: command-list.h:153
 msgid "Pack unpacked objects in a repository"
 msgstr "Packa opackade objekt i ett arkiv"
 
-#: command-list.h:154
 msgid "Create, list, delete refs to replace objects"
 msgstr "Skapa, visa, ta bort referenser för att ersätta objekt"
 
-#: command-list.h:155
 msgid "Generates a summary of pending changes"
 msgstr "Skapar en sammanfattning av väntande ändringar"
 
-#: command-list.h:156
 msgid "Reuse recorded resolution of conflicted merges"
 msgstr "Återanvänd sparad lösning av sammanslagningskonflikter"
 
-#: command-list.h:157
 msgid "Reset current HEAD to the specified state"
 msgstr "Återställ aktuell HEAD till angivet tillstånd"
 
-#: command-list.h:158
 msgid "Restore working tree files"
 msgstr "Återställ filer i arbetskatalogen"
 
-#: command-list.h:159
 msgid "Lists commit objects in reverse chronological order"
 msgstr "Visa incheckningsobjekt i omvänd kronologisk ordning"
 
-#: command-list.h:160
 msgid "Pick out and massage parameters"
 msgstr "Plocka ut och massera parametrar"
 
-#: command-list.h:161
 msgid "Revert some existing commits"
 msgstr "Återställ några befintliga incheckningar"
 
-#: command-list.h:162
 msgid "Remove files from the working tree and from the index"
 msgstr "Ta bort filer från arbetskatalogen och från indexet"
 
-#: command-list.h:163
 msgid "Send a collection of patches as emails"
 msgstr "Sänd en uppsättning patchar som e-post"
 
-#: command-list.h:164
 msgid "Push objects over Git protocol to another repository"
 msgstr "Sänd objekt över Git-protokollet till annat arkiv"
 
-#: command-list.h:165
 msgid "Git's i18n setup code for shell scripts"
 msgstr "Git:s i18n-startkod för skalskript"
 
-#: command-list.h:166
 msgid "Common Git shell script setup code"
 msgstr "Gemensam skriptstartkod för Git"
 
-#: command-list.h:167
 msgid "Restricted login shell for Git-only SSH access"
 msgstr "Begränsat inloggningsskal för SSH-åtkomst till bara Git"
 
-#: command-list.h:168
 msgid "Summarize 'git log' output"
 msgstr "Summera \"git log\"-utdata"
 
-#: command-list.h:169
 msgid "Show various types of objects"
 msgstr "Visa olika sorters objekt"
 
-#: command-list.h:170
 msgid "Show branches and their commits"
 msgstr "Visa grenar och deras incheckningar"
 
-#: command-list.h:171
 msgid "Show packed archive index"
 msgstr "Skapa packat arkivindex"
 
-#: command-list.h:172
 msgid "List references in a local repository"
 msgstr "Visa referenser i ett lokalt arkiv"
 
-#: command-list.h:173
 msgid "Reduce your working tree to a subset of tracked files"
 msgstr "Reducera din arbetskatalog till en undermängd av de spårade filerna"
 
-#: command-list.h:174
 msgid "Add file contents to the staging area"
 msgstr "Lägg filinnehållet till indexet"
 
-#: command-list.h:175
 msgid "Stash the changes in a dirty working directory away"
 msgstr "Spara undan ändringar i en lortig arbetskatalog"
 
-#: command-list.h:176
 msgid "Show the working tree status"
 msgstr "Visa status för arbetskatalogen"
 
-#: command-list.h:177
 msgid "Remove unnecessary whitespace"
 msgstr "Ta bort onödiga blanksteg"
 
-#: command-list.h:178
 msgid "Initialize, update or inspect submodules"
 msgstr "Initiera, uppdatera eller inspektera undermoduler"
 
-#: command-list.h:179
 msgid "Bidirectional operation between a Subversion repository and Git"
 msgstr "Dubbelriktad verkan mellan ett Subversion-arkiv och Git"
 
-#: command-list.h:180
 msgid "Switch branches"
 msgstr "Byt gren"
 
-#: command-list.h:181
 msgid "Read, modify and delete symbolic refs"
 msgstr "Läs, modifiera eller ta bort symbolisk referens"
 
-#: command-list.h:182
 msgid "Create, list, delete or verify a tag object signed with GPG"
 msgstr "Skapa, visa, ta bort eller verifiera GPG-signerat taggobjekt"
 
-#: command-list.h:183
 msgid "Creates a temporary file with a blob's contents"
 msgstr "Skapar temporära filer med innehållet från en blob"
 
-#: command-list.h:184
 msgid "Unpack objects from a packed archive"
 msgstr "Packa upp objekt från ett pakat arkiv"
 
-#: command-list.h:185
 msgid "Register file contents in the working tree to the index"
 msgstr "Registrera filinnehållet från arbetskatalogen i indexet"
 
-#: command-list.h:186
 msgid "Update the object name stored in a ref safely"
 msgstr "Uppdatera objektnamnet i en referens på ett säkert sätt"
 
-#: command-list.h:187
 msgid "Update auxiliary info file to help dumb servers"
 msgstr "Uppdatera tilläggsinfofil för att hjälpa dumma servrar"
 
-#: command-list.h:188
 msgid "Send archive back to git-archive"
 msgstr "Sänd arkivet tillbaka till git-archive"
 
-#: command-list.h:189
 msgid "Send objects packed back to git-fetch-pack"
 msgstr "Sänd packade objekt tillbaka till git-fetch-pack"
 
-#: command-list.h:190
 msgid "Show a Git logical variable"
 msgstr "Visa en logisk Git-variabel"
 
-#: command-list.h:191
 msgid "Check the GPG signature of commits"
 msgstr "Kontrollera GPG-signaturer för incheckningar"
 
-#: command-list.h:192
 msgid "Validate packed Git archive files"
 msgstr "Bekräfta packade Git-arkivfiler"
 
-#: command-list.h:193
 msgid "Check the GPG signature of tags"
 msgstr "Kontrollera GPG-signaturer i taggar"
 
-#: command-list.h:194
 msgid "Show logs with difference each commit introduces"
 msgstr "Visa loggar med differenser varje incheckning introducerar"
 
-#: command-list.h:195
 msgid "Manage multiple working trees"
 msgstr "Hantera ytterligare arbetskataloger"
 
-#: command-list.h:196
 msgid "Create a tree object from the current index"
 msgstr "Skapa ett trädobjekt från aktuellt index"
 
-#: command-list.h:197
 msgid "Defining attributes per path"
 msgstr "Definierar attribut per sökväg"
 
-#: command-list.h:198
 msgid "Git command-line interface and conventions"
 msgstr "Gits kommandoradsgränssnitt och -konventioner"
 
-#: command-list.h:199
 msgid "A Git core tutorial for developers"
 msgstr "Grundläggande Git-handledning för utvecklare"
 
-#: command-list.h:200
 msgid "Providing usernames and passwords to Git"
 msgstr "Tillhandahåll användarnamn och lösenord till Git"
 
-#: command-list.h:201
 msgid "Git for CVS users"
 msgstr "Git för CVS-användare"
 
-#: command-list.h:202
 msgid "Tweaking diff output"
 msgstr "Justrea diff-utdata"
 
-#: command-list.h:203
 msgid "A useful minimum set of commands for Everyday Git"
 msgstr "Ett användbart minsta uppsättning kommandon för vardags-Git"
 
-#: command-list.h:204
 msgid "Frequently asked questions about using Git"
 msgstr "Ofta ställda frågor om att använda Git"
 
-#: command-list.h:205
 msgid "A Git Glossary"
 msgstr "En Git-ordlista"
 
-#: command-list.h:206
 msgid "Hooks used by Git"
 msgstr "Krokar som används av Git"
 
-#: command-list.h:207
 msgid "Specifies intentionally untracked files to ignore"
 msgstr "Ange avsiktligen ospårade filer att ignorera"
 
-#: command-list.h:208
 msgid "The Git repository browser"
 msgstr "Bläddraren för Git-arkiv"
 
-#: command-list.h:209
 msgid "Map author/committer names and/or E-Mail addresses"
 msgstr "Kopplar författar-/incheckarnamn och/eller -e-postadresser"
 
-#: command-list.h:210
 msgid "Defining submodule properties"
 msgstr "Ange egenskaper för undermoduler"
 
-#: command-list.h:211
 msgid "Git namespaces"
 msgstr "Git-namnrymder"
 
-#: command-list.h:212
 msgid "Helper programs to interact with remote repositories"
 msgstr "Hjälpprogram för att interagera med fjärrarkiv"
 
-#: command-list.h:213
 msgid "Git Repository Layout"
 msgstr "Gits arkivlayout"
 
-#: command-list.h:214
 msgid "Specifying revisions and ranges for Git"
 msgstr "Ange versioner och intervall i Git"
 
-#: command-list.h:215
 msgid "Mounting one repository inside another"
 msgstr "Monterar ett arkiv inuti ett annat"
 
-#: command-list.h:216
 msgid "A tutorial introduction to Git"
 msgstr "Introduktion till Git"
 
-#: command-list.h:217
 msgid "A tutorial introduction to Git: part two"
 msgstr "Introduktion till Git: del två"
 
-#: command-list.h:218
 msgid "Git web interface (web frontend to Git repositories)"
 msgstr "Git-webbgränssnitt (webbframända för Git-arkiv)"
 
-#: command-list.h:219
 msgid "An overview of recommended workflows with Git"
 msgstr "Översikt över rekommenderade arbetsflöden med Git"
 
-#: git-merge-octopus.sh:46
+msgid "commit-graph file is too small"
+msgstr "incheckningsgraffilen %s är för liten"
+
+#, c-format
+msgid "commit-graph signature %X does not match signature %X"
+msgstr "incheckningsgrafens signatur %X stämmer inte med signaturen %X"
+
+#, c-format
+msgid "commit-graph version %X does not match version %X"
+msgstr "incheckningsgrafens version %X stämmer inte med versionen %X"
+
+#, c-format
+msgid "commit-graph hash version %X does not match version %X"
+msgstr "incheckningsgrafens hashversion %X stämmer inte med versionen %X"
+
+#, c-format
+msgid "commit-graph file is too small to hold %u chunks"
+msgstr "incheckningsgraffilen är för liten för att innehålla %u stycken"
+
+msgid "commit-graph has no base graphs chunk"
+msgstr "incheckningsgrafen har inga bas-graf-stycken"
+
+msgid "commit-graph chain does not match"
+msgstr "incheckningsgrafens kedja stämmer inte"
+
+#, c-format
+msgid "invalid commit-graph chain: line '%s' not a hash"
+msgstr "ogiltig incheckingsgrafkedja: rad \"%s\" är inte ett hash-värde"
+
+msgid "unable to find all commit-graph files"
+msgstr "kan inte hitta alla incheckingsgraffiler"
+
+msgid "invalid commit position. commit-graph is likely corrupt"
+msgstr "ogiltig incheckningsposition. incheckningsgrafen är troligtvis trasig"
+
+#, c-format
+msgid "could not find commit %s"
+msgstr "kunde inte hitta incheckningen %s"
+
+msgid "commit-graph requires overflow generation data but has none"
+msgstr "incheckningsgraf kräver spillgenerationsdata, men har ingen"
+
+msgid "Loading known commits in commit graph"
+msgstr "Läser in kända incheckningar i incheckningsgraf"
+
+msgid "Expanding reachable commits in commit graph"
+msgstr "Expanderar nåbara incheckningar i incheckningsgraf"
+
+msgid "Clearing commit marks in commit graph"
+msgstr "Rensar incheckningsmärken i incheckningsgraf"
+
+msgid "Computing commit graph topological levels"
+msgstr "Beräknar topografiska nivåer för incheckningsgraf"
+
+msgid "Computing commit graph generation numbers"
+msgstr "Beräknar generationsvärden för incheckningsgraf"
+
+msgid "Computing commit changed paths Bloom filters"
+msgstr "Beräknar Bloom-filter för sökvägar ändrade av incheckningen"
+
+msgid "Collecting referenced commits"
+msgstr "Samlar refererade incheckningar"
+
+#, c-format
+msgid "Finding commits for commit graph in %<PRIuMAX> pack"
+msgid_plural "Finding commits for commit graph in %<PRIuMAX> packs"
+msgstr[0] "Söker incheckningar för incheckingsgraf i %<PRIuMAX> paket"
+msgstr[1] "Söker incheckningar för incheckingsgraf i %<PRIuMAX> paket"
+
+#, c-format
+msgid "error adding pack %s"
+msgstr "fel vid tillägg av paketet %s"
+
+#, c-format
+msgid "error opening index for %s"
+msgstr "fel vid öppning av indexet för %s"
+
+msgid "Finding commits for commit graph among packed objects"
+msgstr "Söker incheckningar för incheckingsgraf i packade objekt"
+
+msgid "Finding extra edges in commit graph"
+msgstr "Söker ytterligare kanter i incheckingsgraf"
+
+msgid "failed to write correct number of base graph ids"
+msgstr "kunde inte skriva korrekt antal bas-graf-id:n"
+
+msgid "unable to create temporary graph layer"
+msgstr "kan inte skapa temporärt graflager"
+
+#, c-format
+msgid "unable to adjust shared permissions for '%s'"
+msgstr "kan inte justera delade behörigheter för \"%s\""
+
+#, 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"
+
+msgid "unable to open commit-graph chain file"
+msgstr "Kunde inte öppna incheckningsgrafkedjefilen"
+
+msgid "failed to rename base commit-graph file"
+msgstr "kunde inte byta namn på bas-incheckingsgraffilen"
+
+msgid "failed to rename temporary commit-graph file"
+msgstr "kunde inte byta namn på temporär incheckningsgraffil"
+
+msgid "Scanning merged commits"
+msgstr "Söker sammanslagna incheckningar"
+
+msgid "Merging commit-graph"
+msgstr "Slår ihop incheckningsgraf"
+
+msgid "attempting to write a commit-graph, but 'core.commitGraph' is disabled"
+msgstr ""
+"försöker skriva en incheckningsgraf, men \"core.commitGraph\" är inaktiverad"
+
+msgid "too many commits to write graph"
+msgstr "för många incheckningar för att skriva graf"
+
+msgid "the commit-graph file has incorrect checksum and is likely corrupt"
+msgstr ""
+"filen med incheckningsgraf har felaktig kontrollsumma och är troligtvis "
+"trasig"
+
+#, c-format
+msgid "commit-graph has incorrect OID order: %s then %s"
+msgstr "incheckningsgrafen har felaktig OID-ordning: %s så %s"
+
+#, c-format
+msgid "commit-graph has incorrect fanout value: fanout[%d] = %u != %u"
+msgstr ""
+"incheckningsgrafen har felaktig utbredningsvärde: fanout[%d] = %u != %u"
+
+#, c-format
+msgid "failed to parse commit %s from commit-graph"
+msgstr "kunde inte tolka incheckning %s från incheckningsgraf"
+
+msgid "Verifying commits in commit graph"
+msgstr "Bekräftar incheckningar i incheckningsgrafen"
+
+#, 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"
+
+#, 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"
+
+#, 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"
+
+#, c-format
+msgid "commit-graph parent for %s is %s != %s"
+msgstr "incheckningsgrafens förälder för %s är %s != %s"
+
+#, 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"
+
+#, c-format
 msgid ""
-"Error: Your local changes to the following files would be overwritten by "
-"merge"
+"commit-graph has generation number zero for commit %s, but non-zero elsewhere"
 msgstr ""
-"Fel: Dina lokala ändringar av följande filer skulle skrivas över av "
-"sammanslagning"
+"incheckningsgrafen har generationsnummer noll för incheckningen %s, men icke-"
+"noll på annan plats"
 
-#: git-merge-octopus.sh:61
-msgid "Automated merge did not work."
-msgstr "Automatisk sammanslagning misslyckades."
+#, c-format
+msgid ""
+"commit-graph has non-zero generation number for commit %s, but zero elsewhere"
+msgstr ""
+"incheckningsgrafen har generationsnummer skilt från noll för incheckningen "
+"%s, men noll på annan plats"
 
-#: git-merge-octopus.sh:62
-msgid "Should not be doing an octopus."
-msgstr "Borde inte använda octopus."
+#, c-format
+msgid "commit-graph generation for commit %s is %<PRIuMAX> < %<PRIuMAX>"
+msgstr ""
+"incheckningsgrafens generation för incheckningen %s är %<PRIuMAX> < "
+"%<PRIuMAX>"
 
-#: git-merge-octopus.sh:73
-#, sh-format
-msgid "Unable to find common commit with $pretty_name"
-msgstr "Kunde inte hitta gemensam incheckning med $pretty_name"
+#, 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>"
 
-#: git-merge-octopus.sh:77
-#, sh-format
-msgid "Already up to date with $pretty_name"
-msgstr "Redan à jour med $pretty_name"
+#, c-format
+msgid "%s %s is not a commit!"
+msgstr "%s %s är inte en incheckning!"
 
-#: git-merge-octopus.sh:89
-#, sh-format
-msgid "Fast-forwarding to: $pretty_name"
-msgstr "Snabbspolar till: $pretty_name"
+msgid ""
+"Support for <GIT_DIR>/info/grafts is deprecated\n"
+"and will be removed in a future Git version.\n"
+"\n"
+"Please use \"git replace --convert-graft-file\"\n"
+"to convert the grafts into replace refs.\n"
+"\n"
+"Turn this message off by running\n"
+"\"git config advice.graftFileDeprecated false\""
+msgstr ""
+"Stöd för <GIT_DIR>/info/grafts avråds från och\n"
+"kommer tas bort i en framtida version av Git.\n"
+"\n"
+"Använd \"git replace --convert-graft-file\"\n"
+"för att omvandla grafts till ersättningsreferenser.\n"
+"\n"
+"Slå av detta meddelande genom att skriva\n"
+"\"git config advice.graftFileDeprecated false\""
 
-#: git-merge-octopus.sh:97
-#, sh-format
-msgid "Trying simple merge with $pretty_name"
-msgstr "Försök enkel sammanslagning med $pretty_name"
+#, 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."
 
-#: git-merge-octopus.sh:102
-msgid "Simple merge did not work, trying automatic merge."
-msgstr "Enkel sammanslagning misslyckades, försöker automatisk sammanslagning."
+#, 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."
 
-#: git-sh-setup.sh:89 git-sh-setup.sh:94
-#, sh-format
-msgid "usage: $dashless $USAGE"
-msgstr "använd: $dashless $USAGE"
+#, c-format
+msgid "Commit %s does not have a GPG signature."
+msgstr "Incheckning %s har inte någon GPG-signatur."
 
-#: git-sh-setup.sh:182
-#, sh-format
-msgid "Cannot chdir to $cdup, the toplevel of the working tree"
-msgstr "Kunde inte byta katalog till $cdup, toppnivån på arbetskatalogen"
+#, c-format
+msgid "Commit %s has a good GPG signature by %s\n"
+msgstr "Incheckningen %s har en korrekt GPG-signatur av %s\n"
 
-#: git-sh-setup.sh:191 git-sh-setup.sh:198
-#, sh-format
-msgid "fatal: $program_name cannot be used without a working tree."
-msgstr "ödesdigetrt: $program_name kan inte användas utan arbetskatalog."
+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"
+"variable i18n.commitEncoding to the encoding your project uses.\n"
+msgstr ""
+"Varning: incheckningsmeddelandet är inte korrekt UTF-8.\n"
+"Uppdatera det efter att ha rättat meddelandet, eller ändra variabeln\n"
+"i18n.commitEncoding till den teckenkodning som används i ditt projekt.\n"
 
-#: git-sh-setup.sh:212
-msgid "Cannot rewrite branches: You have unstaged changes."
-msgstr "Kan inte skriva om grenar: Du har oköade ändringar."
+msgid "no compiler information available\n"
+msgstr "ingen kompilatorinformation tillgänglig\n"
 
-#: git-sh-setup.sh:215
-#, sh-format
-msgid "Cannot $action: You have unstaged changes."
-msgstr "Kan inte $action: Du har oköade ändringar."
+msgid "no libc information available\n"
+msgstr "ingen libc-information tillgänglig\n"
 
-#: git-sh-setup.sh:226
-#, sh-format
-msgid "Cannot $action: Your index contains uncommitted changes."
+#, c-format
+msgid "[GLE %ld] health thread could not open '%ls'"
+msgstr "[GLE %ld] hälsotråden kunde inte öppna \"%ls\""
+
+#, c-format
+msgid "[GLE %ld] health thread getting BHFI for '%ls'"
+msgstr "[GLE %ld] hälsotråden hämtar BHFI för \"%ls\""
+
+#, c-format
+msgid "could not convert to wide characters: '%s'"
+msgstr "kunde inte konvertera till breda tecken: \"%s\""
+
+#, c-format
+msgid "BHFI changed '%ls'"
+msgstr "BHFI ändrade \"%ls\""
+
+#, c-format
+msgid "unhandled case in 'has_worktree_moved': %d"
+msgstr "ohanterat fall i \"has_worktree_moved\": %d"
+
+#, c-format
+msgid "health thread wait failed [GLE %ld]"
+msgstr "misslyckades vänta på hälsotråden [GLE %ld]"
+
+msgid "Unable to create FSEventStream."
+msgstr "kunde inte skapa FSEventStream."
+
+msgid "Failed to start the FSEventStream"
+msgstr "Misslyckades starta FSEventStream:en"
+
+#, c-format
+msgid "[GLE %ld] could not convert path to UTF-8: '%.*ls'"
+msgstr "[GLE %ld] kunde inte konvertera sökväg till UTF-8: \"%.*ls\""
+
+#, c-format
+msgid "[GLE %ld] could not watch '%s'"
+msgstr "[GLE %ld] kunde inte övervaka \"%s\""
+
+#, c-format
+msgid "[GLE %ld] could not get longname of '%s'"
+msgstr "[GLE %ld] kunde inte hämta långt namn för \"%s\""
+
+#, c-format
+msgid "ReadDirectoryChangedW failed on '%s' [GLE %ld]"
+msgstr "ReadDirectoryChangedW misslyckades på \"%s\" [GLE %ld]"
+
+#, c-format
+msgid "GetOverlappedResult failed on '%s' [GLE %ld]"
+msgstr "GetOverlappedResult misslyckades på \"%s\" [GLE %ld]"
+
+#, c-format
+msgid "could not read directory changes [GLE %ld]"
+msgstr "kunde inte läsa katalogändringar [GLE %ld]"
+
+#, c-format
+msgid "failed to copy SID (%ld)"
+msgstr "misslyckades kopiera SID (%ld)"
+
+#, c-format
+msgid "failed to get owner for '%s' (%ld)"
+msgstr "misslyckades hämta ägaren för \"%s\" (%ld)"
+
+msgid "memory exhausted"
+msgstr "minnet slut"
+
+msgid "Success"
+msgstr "Lyckades"
+
+msgid "No match"
+msgstr "Ingen träff"
+
+msgid "Invalid regular expression"
+msgstr "Ogiltigt reguljärt uttryck"
+
+msgid "Invalid collation character"
+msgstr "Ogiltigt kollationeringstecken"
+
+msgid "Invalid character class name"
+msgstr "Ogiltiga teckenklassnamn"
+
+msgid "Trailing backslash"
+msgstr "Avslutande omvänt snedstreck"
+
+msgid "Invalid back reference"
+msgstr "Ogiltig bakåtreferens"
+
+msgid "Unmatched [ or [^"
+msgstr "Ensam [ eller [^"
+
+msgid "Unmatched ( or \\("
+msgstr "Ensam ( eller \\("
+
+msgid "Unmatched \\{"
+msgstr "Ensam \\{"
+
+msgid "Invalid content of \\{\\}"
+msgstr "Ogiltigt innehåll i \\{\\}"
+
+msgid "Invalid range end"
+msgstr "Ogiltigt intervallslut"
+
+msgid "Memory exhausted"
+msgstr "Minnet slut"
+
+msgid "Invalid preceding regular expression"
+msgstr "Ogiltigt inledande reguljärt uttryck"
+
+msgid "Premature end of regular expression"
+msgstr "Förtida slut på reguljärt uttryck"
+
+msgid "Regular expression too big"
+msgstr "Reguljärt uttryck för stort"
+
+msgid "Unmatched ) or \\)"
+msgstr "Ensam ) eller \\)"
+
+msgid "No previous regular expression"
+msgstr "Inga tidigare reguljära uttryck"
+
+msgid "could not send IPC command"
+msgstr "kunde inte sända IPC-kommando"
+
+msgid "could not read IPC response"
+msgstr "kunde inte läsa IPC-svar"
+
+#, c-format
+msgid "could not start accept_thread '%s'"
+msgstr "kunde inte ta status \"accept_thread\" \"%s\""
+
+#, c-format
+msgid "could not start worker[0] for '%s'"
+msgstr "kunde inte starta \"worker[0]\" för \"%s\""
+
+#, c-format
+msgid "ConnectNamedPipe failed for '%s' (%lu)"
+msgstr "ConnectNamedPipe misslyckades för \"%s\" (%lu)"
+
+#, c-format
+msgid "could not create fd from pipe for '%s'"
+msgstr "kunde inte skapa filhandtag från rör för %s"
+
+#, c-format
+msgid "could not start thread[0] for '%s'"
+msgstr "kunde inte starta thread[0] för \"%s\""
+
+#, c-format
+msgid "wait for hEvent failed for '%s'"
+msgstr "misslyckades vänta på hEvent för \"%s\""
+
+msgid "cannot resume in the background, please use 'fg' to resume"
+msgstr "kan inte fortsätta i bakgrunden, använd \"fg\" för att återuppta"
+
+msgid "cannot restore terminal settings"
+msgstr "kan inte återställa terminalinställningar"
+
+#, c-format
+msgid ""
+"exceeded maximum include depth (%d) while including\n"
+"\t%s\n"
+"from\n"
+"\t%s\n"
+"This might be due to circular includes."
 msgstr ""
-"Kan inte $action: Ditt index innehåller ändringar som inte checkats in."
+"överskred maximalt inkluderingsdjup (%d) när\n"
+"\t%s\n"
+"inkluderades från\n"
+"\t%s\n"
+"Det kan bero på cirkulära inkluderingar."
 
-#: git-sh-setup.sh:228
-msgid "Additionally, your index contains uncommitted changes."
-msgstr "Dessutom innehåller dit index ändringar som inte har checkats in."
+#, c-format
+msgid "could not expand include path '%s'"
+msgstr "kunde inte expandera inkluderingssökväg \"%s\""
 
-#: git-sh-setup.sh:348
-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å."
+msgid "relative config includes must come from files"
+msgstr "relativa konfigureringsinkluderingar måste komma från filer"
 
-#: git-sh-setup.sh:353
-msgid "Unable to determine absolute path of git directory"
-msgstr "Kunde inte bestämma absolut sökväg till git-katalogen"
+msgid "relative config include conditionals must come from files"
+msgstr "relativa konfigureringsinkluderingsvillkor måste komma från filer"
 
-#. TRANSLATORS: you can adjust this to align "git add -i" status menu
-#: git-add--interactive.perl:212
-#, perl-format
-msgid "%12s %12s %s"
-msgstr "%12s %12s %s"
+msgid ""
+"remote URLs cannot be configured in file directly or indirectly included by "
+"includeIf.hasconfig:remote.*.url"
+msgstr ""
+"fjärr-URL:er kan inte konfigureras direkt eller indirekt i en fil inkluderad "
+"med includeIf.hasconfig:remote.*.url"
 
-#: git-add--interactive.perl:632
-#, perl-format
-msgid "touched %d path\n"
-msgid_plural "touched %d paths\n"
-msgstr[0] "rörde %d sökväg\n"
-msgstr[1] "rörde %d sökvägar\n"
+#, c-format
+msgid "invalid config format: %s"
+msgstr "felaktigt konfigurationsformat: %s"
+
+#, c-format
+msgid "missing environment variable name for configuration '%.*s'"
+msgstr "miljövariabelnamn saknas för konfigurationen \"%.*s\""
+
+#, c-format
+msgid "missing environment variable '%s' for configuration '%.*s'"
+msgstr "miljövariabeln \"%s\" saknas för konfigurationen \"%.*s\""
+
+#, c-format
+msgid "key does not contain a section: %s"
+msgstr "nyckeln innehåller inte ett stycke: %s"
+
+#, c-format
+msgid "key does not contain variable name: %s"
+msgstr "nyckeln innehåller inte variabelnamn: %s"
+
+#, c-format
+msgid "invalid key: %s"
+msgstr "felaktig nyckel: %s"
+
+#, c-format
+msgid "invalid key (newline): %s"
+msgstr "ogiltig nyckel (nyradstecken): %s"
+
+msgid "empty config key"
+msgstr "tom konfigurationsnyckel"
+
+#, c-format
+msgid "bogus config parameter: %s"
+msgstr "falsk konfigureringsparameter: %s"
+
+#, c-format
+msgid "bogus format in %s"
+msgstr "felaktigt format i %s"
+
+#, c-format
+msgid "bogus count in %s"
+msgstr "felaktigt antal i %s"
+
+#, c-format
+msgid "too many entries in %s"
+msgstr "för många poster i %s"
+
+#, c-format
+msgid "missing config key %s"
+msgstr "konfigurationsnyckel saknas för %s"
+
+#, c-format
+msgid "missing config value %s"
+msgstr "konfigurationsvärde saknas för %s"
+
+#, c-format
+msgid "bad config line %d in blob %s"
+msgstr "felaktig konfigurationsfil rad %d i blob:en %s"
+
+#, c-format
+msgid "bad config line %d in file %s"
+msgstr "felaktig konfigurationsfil rad %d i filen %s"
+
+#, c-format
+msgid "bad config line %d in standard input"
+msgstr "felaktig konfigurationsfil rad %d i standard in"
+
+#, c-format
+msgid "bad config line %d in submodule-blob %s"
+msgstr "felaktig konfigurationsfil rad %d i undermoduls-blob:en %s"
+
+#, c-format
+msgid "bad config line %d in command line %s"
+msgstr "felaktig konfigurationsfil rad %d i kommandoraden %s"
+
+#, c-format
+msgid "bad config line %d in %s"
+msgstr "felaktig konfigurationsfil rad %d i %s"
+
+msgid "out of range"
+msgstr "utanför intervallet"
+
+msgid "invalid unit"
+msgstr "ogiltig enhet"
+
+#, c-format
+msgid "bad numeric config value '%s' for '%s': %s"
+msgstr "felaktigt numeriskt konfigurationsvärde \"%s\" för \"%s\": %s"
+
+#, 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"
+
+#, 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"
+
+#, 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"
+
+#, 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"
+
+#, 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"
+
+#, 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"
+
+#, c-format
+msgid "invalid value for variable %s"
+msgstr "ogiltigt värde för variabeln %s"
+
+#, c-format
+msgid "ignoring unknown core.fsync component '%s'"
+msgstr "ignorerar okänd core.fsync-komponent \"%s\""
+
+#, c-format
+msgid "bad boolean config value '%s' for '%s'"
+msgstr "felaktigt booleskt konfigurationsvärde \"%s\" för \"%s\""
+
+#, c-format
+msgid "failed to expand user dir in: '%s'"
+msgstr "misslyckades expandera användarkatalog i: \"%s\""
+
+#, c-format
+msgid "'%s' for '%s' is not a valid timestamp"
+msgstr "\"%s\" för \"%s\" är inte en giltig tidsstämpel"
+
+#, c-format
+msgid "abbrev length out of range: %d"
+msgstr "förkortningslängd utanför intervallet: %d"
+
+#, c-format
+msgid "bad zlib compression level %d"
+msgstr "felaktigt zlib-komprimeringsgrad %d"
+
+msgid "core.commentChar should only be one character"
+msgstr "core.commentChar kan bara vara ett tecken"
+
+#, c-format
+msgid "ignoring unknown core.fsyncMethod value '%s'"
+msgstr "ignorerar okänt core.fsyncMethod-värde \"%s\""
+
+msgid "core.fsyncObjectFiles is deprecated; use core.fsync instead"
+msgstr "core.fsyncObjectFiles avråds från; använd core.fsync istället"
+
+#, c-format
+msgid "invalid mode for object creation: %s"
+msgstr "felaktigt läge för skapande av objekt: %s"
+
+#, c-format
+msgid "malformed value for %s"
+msgstr "felformat värde för %s"
+
+#, c-format
+msgid "malformed value for %s: %s"
+msgstr "felformat värde för %s: %s"
+
+msgid "must be one of nothing, matching, simple, upstream or current"
+msgstr "måste vara en av nothing, matching, simple, upstream eller current"
+
+#, c-format
+msgid "unable to load config blob object '%s'"
+msgstr "kunde inte läsa konfigurerings-blobobjektet \"%s\""
+
+#, c-format
+msgid "reference '%s' does not point to a blob"
+msgstr "referensen \"%s\" pekar inte på en blob"
+
+#, c-format
+msgid "unable to resolve config blob '%s'"
+msgstr "kan inte slå upp konfigurerings-bloben \"%s\""
+
+#, c-format
+msgid "failed to parse %s"
+msgstr "kunde inte tolka %s"
+
+msgid "unable to parse command-line config"
+msgstr "kan inte tolka kommandoradskonfiguration"
+
+msgid "unknown error occurred while reading the configuration files"
+msgstr "okänt fel uppstod vid läsning av konfigurationsfilerna"
+
+#, c-format
+msgid "Invalid %s: '%s'"
+msgstr "Felaktigt %s: \"%s\""
+
+#, 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"
+
+#, c-format
+msgid "unable to parse '%s' from command-line config"
+msgstr "kunde inte tolka värdet \"%s\" från kommandoradskonfiguration"
+
+#, c-format
+msgid "bad config variable '%s' in file '%s' at line %d"
+msgstr "felaktig konfigurationsvariabel \"%s\" i filen \"%s\" på rad %d"
+
+#, c-format
+msgid "invalid section name '%s'"
+msgstr "felaktigt sektionsnamn \"%s\""
+
+#, c-format
+msgid "%s has multiple values"
+msgstr "%s har flera värden"
+
+#, c-format
+msgid "failed to write new configuration file %s"
+msgstr "kan inte skriva nya konfigurationsfilen \"%s\""
+
+#, c-format
+msgid "could not lock config file %s"
+msgstr "kunde inte låsa konfigurationsfilen %s"
+
+#, c-format
+msgid "opening %s"
+msgstr "öppnar %s"
+
+#, c-format
+msgid "invalid config file %s"
+msgstr "ogiltig konfigurationsfil: \"%s\""
+
+#, c-format
+msgid "fstat on %s failed"
+msgstr "fstat misslyckades på %s"
+
+#, c-format
+msgid "unable to mmap '%s'%s"
+msgstr "kunde inte utföra mmap på \"%s\"%s"
+
+#, c-format
+msgid "chmod on %s failed"
+msgstr "chmod misslyckades på %s"
+
+#, c-format
+msgid "could not write config file %s"
+msgstr "kunde inte skriva konfigurationsfilen %s"
+
+#, c-format
+msgid "could not set '%s' to '%s'"
+msgstr "kunde inte ställa in \"%s\" till \"%s\""
+
+#, c-format
+msgid "invalid section name: %s"
+msgstr "felaktigt namn på stycke: %s"
+
+#, c-format
+msgid "missing value for '%s'"
+msgstr "värde saknas för \"%s\""
+
+msgid "the remote end hung up upon initial contact"
+msgstr "fjärren lade på vid inledande kontakt"
 
-#: git-add--interactive.perl:1056
 msgid ""
-"If the patch applies cleanly, the edited hunk will immediately be\n"
-"marked for staging."
+"Could not read from remote repository.\n"
+"\n"
+"Please make sure you have the correct access rights\n"
+"and the repository exists."
 msgstr ""
-"Om patchen kan appliceras rent kommer det redigerade stycket att\n"
-"köas omedelbart."
+"Kunde inte läsa från fjärrarkiv.\n"
+"\n"
+"Se till att du har korrekt åtkomstbehörighet\n"
+"och att arkivet existerar."
 
-#: git-add--interactive.perl:1059
+#, c-format
+msgid "server doesn't support '%s'"
+msgstr "Servern stöder inte \"%s\""
+
+#, c-format
+msgid "server doesn't support feature '%s'"
+msgstr "servern stöder inte funktionen \"%s\""
+
+msgid "expected flush after capabilities"
+msgstr "förväntade \"flush\" efter förmågor"
+
+#, c-format
+msgid "ignoring capabilities after first line '%s'"
+msgstr "ignorerar förmågor efter första raden \"%s\""
+
+msgid "protocol error: unexpected capabilities^{}"
+msgstr "protokollfel: förväntade inte capabilities^{}"
+
+#, c-format
+msgid "protocol error: expected shallow sha-1, got '%s'"
+msgstr "protokollfel: förväntade \"shallow sha-1\" fick \"%s\""
+
+msgid "repository on the other end cannot be shallow"
+msgstr "arkivet på andra sidan kan inte vara grunt"
+
+msgid "invalid packet"
+msgstr "ogiltigt paket"
+
+#, c-format
+msgid "protocol error: unexpected '%s'"
+msgstr "protokollfel: förväntade inte \"%s\""
+
+#, c-format
+msgid "unknown object format '%s' specified by server"
+msgstr "okänt objektformat \"%s\" angavs av servern"
+
+#, c-format
+msgid "invalid ls-refs response: %s"
+msgstr "ogiltigt svar på ls-refs: %s"
+
+msgid "expected flush after ref listing"
+msgstr "förväntade \"flush\" efter ref-listan"
+
+msgid "expected response end packet after ref listing"
+msgstr "förväntade svarsavslutningspaket efter ref-listan"
+
+#, c-format
+msgid "protocol '%s' is not supported"
+msgstr "protokollet \"%s\" stöds inte"
+
+msgid "unable to set SO_KEEPALIVE on socket"
+msgstr "kunde inte sätta SO_KEEPALIVE på uttaget"
+
+#, c-format
+msgid "Looking up %s ... "
+msgstr "Slår upp %s..."
+
+#, 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 ... "
+#, c-format
 msgid ""
-"If the patch applies cleanly, the edited hunk will immediately be\n"
-"marked for stashing."
+"done.\n"
+"Connecting to %s (port %s) ... "
 msgstr ""
-"Om patchen kan appliceras rent kommer det redigerade stycket att\n"
-"läggas till i \"stash\" omedelbart."
+"klart.\n"
+"Ansluter till %s (port %s)..."
 
-#: git-add--interactive.perl:1062
+#, c-format
 msgid ""
-"If the patch applies cleanly, the edited hunk will immediately be\n"
-"marked for unstaging."
+"unable to connect to %s:\n"
+"%s"
 msgstr ""
-"Om patchen kan appliceras rent kommer det redigerade stycket att\n"
-"tas bort från kön omedelbart."
+"kunde inte ansluta till %s:\n"
+"%s"
+
+#. TRANSLATORS: this is the end of "Connecting to %s (port %s) ... "
+msgid "done."
+msgstr "klart."
+
+#, c-format
+msgid "unable to look up %s (%s)"
+msgstr "kunde inte slå upp %s (%s)"
+
+#, c-format
+msgid "unknown port %s"
+msgstr "okänd port %s"
+
+#, c-format
+msgid "strange hostname '%s' blocked"
+msgstr "konstigt värdnamn \"%s\" blockerat"
+
+#, c-format
+msgid "strange port '%s' blocked"
+msgstr "konstig port \"%s\" blockerad"
+
+#, c-format
+msgid "cannot start proxy %s"
+msgstr "kan inte starta mellanserver (proxy) %s"
+
+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"
+
+msgid "newline is forbidden in git:// hosts and repo paths"
+msgstr "radbrytningar är förbjudna i git://-värdnamn och arkivsökvägar"
+
+msgid "ssh variant 'simple' does not support -4"
+msgstr "ssh-varianten \"simple\" stöder inte -4"
+
+msgid "ssh variant 'simple' does not support -6"
+msgstr "ssh-varianten \"simple\" stöder inte -6"
+
+msgid "ssh variant 'simple' does not support setting port"
+msgstr "ssh-varianten \"simple\" stöder inte val av port"
+
+#, c-format
+msgid "strange pathname '%s' blocked"
+msgstr "konstigt sökvägsnamn \"%s\" blockerat"
+
+msgid "unable to fork"
+msgstr "kunde inte grena (fork)"
+
+msgid "Could not run 'git rev-list'"
+msgstr "Kunde inte köra \"git rev-list\""
+
+msgid "failed write to rev-list"
+msgstr "kunde inte skriva till rev-list"
+
+msgid "failed to close rev-list's stdin"
+msgstr "kunde inte stänga rev-list:s standard in"
+
+#, c-format
+msgid "'%s' does not exist"
+msgstr "\"%s\" finns inte"
+
+msgid "need a working directory"
+msgstr "behöver en arbetskatalog"
+
+msgid "could not find enlistment root"
+msgstr "kunde inte hitta enrolleringsroten"
+
+#, c-format
+msgid "could not switch to '%s'"
+msgstr "kunde inte växla till \"%s\""
+
+#, c-format
+msgid "could not configure %s=%s"
+msgstr "kunde inte ställa in %s=%s"
+
+msgid "could not configure log.excludeDecoration"
+msgstr "kunde inte ställa in log.excludeDecoration"
+
+msgid "Scalar enlistments require a worktree"
+msgstr "Scalar-enrolleringar kräver en arbetskatalog"
+
+#, c-format
+msgid "could not open directory '%s'"
+msgstr "kunde inte öppna katalogen \"%s\""
+
+#, c-format
+msgid "skipping '%s', which is neither file nor directory"
+msgstr "hoppar över \"%s\", som varken är en fil eller en katalog"
+
+#, c-format
+msgid "could not determine free disk size for '%s'"
+msgstr "kunde inte ta reda på ledigt diskutrymme för \"%s\""
+
+#, c-format
+msgid "could not get info for '%s'"
+msgstr "kunde inte hämta info för \"%s\""
+
+#, c-format
+msgid "remote HEAD is not a branch: '%.*s'"
+msgstr "HEAD hos fjärren är inte en gren: \"%.*s\""
+
+msgid "failed to get default branch name from remote; using local default"
+msgstr ""
+"misslyckades hämta namn på standardgren för fjärr; använder lokalt förval"
+
+msgid "failed to get default branch name"
+msgstr "misslyckades hämta namn på standardgren"
+
+msgid "failed to unregister repository"
+msgstr "misslyckades avregistrera arkivet"
+
+msgid "failed to delete enlistment directory"
+msgstr "misslyckades ta bort enrolleringskatalogen"
+
+msgid "branch to checkout after clone"
+msgstr "gren att checka ut efter kloning"
+
+msgid "when cloning, create full working directory"
+msgstr "skapa komplett arbetskatalog vid kloning"
+
+msgid "only download metadata for the branch that will be checked out"
+msgstr "hämta endast metadata för grenen som skall checkas ut"
+
+msgid "scalar clone [<options>] [--] <repo> [<dir>]"
+msgstr "scalar clone [<flaggor>] [--] <arkiv> [<kat>]"
+
+#, c-format
+msgid "cannot deduce worktree name from '%s'"
+msgstr "Kan inte härleda arbetsträdsnamn från \"%s\""
+
+#, c-format
+msgid "directory '%s' exists already"
+msgstr "katalogen \"%s\" finns redan"
+
+#, c-format
+msgid "failed to get default branch for '%s'"
+msgstr "misslyckades hämta standardgren för \"%s\""
+
+#, c-format
+msgid "could not configure remote in '%s'"
+msgstr "kunde inte ställa in fjärr i \"%s\""
+
+#, c-format
+msgid "could not configure '%s'"
+msgstr "kunde inte ställa in \"%s\""
+
+msgid "partial clone failed; attempting full clone"
+msgstr "delvis klon misslyckades; försöker med fullständig klon"
+
+msgid "could not configure for full clone"
+msgstr "kunde inte ställa in för komplett klon"
+
+msgid "scalar diagnose [<enlistment>]"
+msgstr "scalar diagnose [<enrollering>]"
+
+#, c-format
+msgid "could not create directory for '%s'"
+msgstr "kunde inte skapa katalog för \"%s\""
+
+msgid "could not duplicate stdout"
+msgstr "kunde inte duplicera standard ut"
+
+msgid "failed to write archive"
+msgstr "misslyckades skriva arkiv"
+
+msgid "`scalar list` does not take arguments"
+msgstr "\"scalar list\" tar inte argument"
+
+msgid "scalar register [<enlistment>]"
+msgstr "scalar register [<enrollering>]"
+
+msgid "reconfigure all registered enlistments"
+msgstr "konfigurera alla registrerade enrolleringar på nytt"
+
+msgid "scalar reconfigure [--all | <enlistment>]"
+msgstr "scalar reconfigure [--all | <enrollering>]"
+
+msgid "--all or <enlistment>, but not both"
+msgstr "--all eller <enrollering>, men inte bägge"
+
+#, c-format
+msgid "git repository gone in '%s'"
+msgstr "git-arkiv försvunnet i \"%s\""
 
-#: git-add--interactive.perl:1065 git-add--interactive.perl:1074
-#: git-add--interactive.perl:1080
 msgid ""
-"If the patch applies cleanly, the edited hunk will immediately be\n"
-"marked for applying."
+"scalar run <task> [<enlistment>]\n"
+"Tasks:\n"
 msgstr ""
-"Om patchen kan appliceras rent kommer det redigerade stycket att\n"
-"markeras för applicering omedelbart."
+"scalar run <uppgift> [<enrollering>]\n"
+"Uppgifter:\n"
+
+#, c-format
+msgid "no such task: '%s'"
+msgstr "okänd uppgift: \"%s\""
+
+msgid "scalar unregister [<enlistment>]"
+msgstr "scalar unregister [<enrollering>]"
+
+msgid "scalar delete <enlistment>"
+msgstr "scalar delete <enrollering>"
+
+msgid "refusing to delete current working directory"
+msgstr "vägrar ta bort aktuell arbetskatalog"
+
+msgid "include Git version"
+msgstr "ta med Git-version"
+
+msgid "include Git's build options"
+msgstr "ta med Gits byggflaggor"
+
+msgid "scalar verbose [-v | --verbose] [--build-options]"
+msgstr "scalar verbose [-v | --verbose] [--build-options]"
+
+msgid "-C requires a <directory>"
+msgstr "-C kräver en <katalog>"
+
+#, c-format
+msgid "could not change to '%s'"
+msgstr "kunde inte byta till \"%s\""
+
+msgid "-c requires a <key>=<value> argument"
+msgstr "-c kräver ett argument på formen <nyckel>=<värde>"
 
-#: git-add--interactive.perl:1068 git-add--interactive.perl:1071
-#: git-add--interactive.perl:1077
 msgid ""
-"If the patch applies cleanly, the edited hunk will immediately be\n"
-"marked for discarding."
+"scalar [-C <directory>] [-c <key>=<value>] <command> [<options>]\n"
+"\n"
+"Commands:\n"
 msgstr ""
-"Om patchen kan appliceras rent kommer det redigerade stycket att\n"
-"markeras för kasta omedelbart."
+"scalar [-C <katalog>] [-c <nyckel>=<värde>] <kommando> [<flaggor>]\n"
+"\n"
+"Kommandon:\n"
 
-#: git-add--interactive.perl:1114
-#, perl-format
-msgid "failed to open hunk edit file for writing: %s"
-msgstr "misslyckades öppna styckeredigeringsfil för skrivning: %s"
+#, c-format
+msgid "illegal crlf_action %d"
+msgstr "felaktig crlf_action %d"
 
-#: git-add--interactive.perl:1121
-#, perl-format
+#, c-format
+msgid "CRLF would be replaced by LF in %s"
+msgstr "CRLF skulle ersättas av LF i %s"
+
+#, c-format
 msgid ""
-"---\n"
-"To remove '%s' lines, make them ' ' lines (context).\n"
-"To remove '%s' lines, delete them.\n"
-"Lines starting with %s will be removed.\n"
+"in the working copy of '%s', CRLF will be replaced by LF the next time Git "
+"touches it"
 msgstr ""
-"---\n"
-"Ta bort \"%s\" rader genom att göra dem \" \"-rader (sammanhang).\n"
-"Ta bort \"%s\" rader genom att radera dem.\n"
-"Rader som börjar med %s kommer att tas bort.\n"
+"CRLF i arbetskopian av \"%s\" kommer ersättas med LF nästa gång Git rör den"
 
-#: git-add--interactive.perl:1143
-#, perl-format
-msgid "failed to open hunk edit file for reading: %s"
-msgstr "misslyckades öppna styckesredigeringsfil för läsning: %s"
+#, c-format
+msgid "LF would be replaced by CRLF in %s"
+msgstr "LF skulle ersättas av CRLF i %s"
 
-#: git-add--interactive.perl:1253
+#, c-format
 msgid ""
-"y - stage this hunk\n"
-"n - do not stage this hunk\n"
-"q - quit; do not stage this hunk or any of the remaining ones\n"
-"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"
+"in the working copy of '%s', LF will be replaced by CRLF the next time Git "
+"touches it"
 msgstr ""
-"y - köa stycket\n"
-"n - köa inte stycket\n"
-"q - avsluta; köa inte stycket eller något av de följande\n"
-"a - köa stycket och alla följande i filen\n"
-"d - köa inte stycket eller något av de följande i filen"
+"LF i arbetskopian av \"%s\" kommer ersättas med CRLF nästa gång Git rör den"
 
-#: git-add--interactive.perl:1259
+#, c-format
+msgid "BOM is prohibited in '%s' if encoded as %s"
+msgstr "BOM är förbjudet i \"%s\" om kodat som %s"
+
+#, c-format
 msgid ""
-"y - stash this hunk\n"
-"n - do not stash this hunk\n"
-"q - quit; do not stash this hunk or any of the remaining ones\n"
-"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"
+"The file '%s' contains a byte order mark (BOM). Please use UTF-%.*s as "
+"working-tree-encoding."
 msgstr ""
-"y - \"stash\":a stycket\n"
-"n - \"stash\":a inte stycket\n"
-"q - avsluta; \"stash\":a inte stycket eller något av de följande\n"
-"a - \"stash\":a stycket och alla följande i filen\n"
-"d - \"stash\":a inte stycket eller något av de följande i filen"
+"Filen \"%s\" innehåller byte order mark (BOM). Använd UTF-%.*s som "
+"teckenkodning i arbetskatalogen."
+
+#, c-format
+msgid "BOM is required in '%s' if encoded as %s"
+msgstr "BOM krävs om \"%s\" kodas som %s"
 
-#: git-add--interactive.perl:1265
+#, c-format
 msgid ""
-"y - unstage this hunk\n"
-"n - do not unstage this hunk\n"
-"q - quit; do not unstage this hunk or any of the remaining ones\n"
-"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"
+"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 ""
-"y - ta bort stycket från kön\n"
-"n - ta inte bort stycket från kön\n"
-"q - avsluta; ta inte bort stycket eller något av de följande från kön\n"
-"a - ta bort stycket och alla följande i filen från kön\n"
-"d - ta inte bort stycket eller något av de följande i filen från kön"
+"Filen \"%s\" saknar byte order mark (BOM). Använd UTF-%sBE eller UTF-%sLE "
+"(beroende på byteordning) som teckenkodning i arbetskatalogen."
+
+#, c-format
+msgid "failed to encode '%s' from %s to %s"
+msgstr "misslyckades omkoda \"%s\" från %s till %s"
+
+#, c-format
+msgid "encoding '%s' from %s to %s and back is not the same"
+msgstr ""
+"omkodning av \"%s\" från %s till %s och tillbaka ger inte samma resultat"
+
+#, c-format
+msgid "cannot fork to run external filter '%s'"
+msgstr "kan inte grena (fork) för att köra externt filter \"%s\""
+
+#, c-format
+msgid "cannot feed the input to external filter '%s'"
+msgstr "kunde inte skicka indata till externt filter \"%s\""
+
+#, c-format
+msgid "external filter '%s' failed %d"
+msgstr "externt filter \"%s\" misslyckades %d"
+
+#, c-format
+msgid "read from external filter '%s' failed"
+msgstr "läsning från externt filter \"%s\" misslyckades"
+
+#, c-format
+msgid "external filter '%s' failed"
+msgstr "externt filter \"%s\" misslyckades"
+
+msgid "unexpected filter type"
+msgstr "oväntad filtertyp"
+
+msgid "path name too long for external filter"
+msgstr "sökvägen för lång för externt filter"
 
-#: git-add--interactive.perl:1271
+#, c-format
 msgid ""
-"y - apply this hunk to index\n"
-"n - do not apply this hunk to index\n"
-"q - quit; do not apply this hunk or any of the remaining ones\n"
-"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"
+"external filter '%s' is not available anymore although not all paths have "
+"been filtered"
 msgstr ""
-"y - applicera stycket på indexet\n"
-"n - applicera inte stycket på indexet\n"
-"q - avsluta; applicera inte stycket eller något av de följande\n"
-"a - applicera stycket och alla följande i filen\n"
-"d - applicera inte stycket eller något av de följande i filen"
+"externt filter \"%s\" är inte längre tillgängligt trots att alla sökvägar "
+"inte har filtrerats"
+
+msgid "true/false are no valid working-tree-encodings"
+msgstr "true/false är inte giltig teckenkodning för arbetskatalogen"
+
+#, c-format
+msgid "%s: clean filter '%s' failed"
+msgstr "%s: \"clean\"-filtret \"%s\" misslyckades"
+
+#, c-format
+msgid "%s: smudge filter %s failed"
+msgstr "%s: \"smudge\"-filtret \"%s\" misslyckades"
+
+#, c-format
+msgid "skipping credential lookup for key: credential.%s"
+msgstr "hoppar över uppslag av inloggningsuppgifter för nyckel: credential.%s"
+
+msgid "refusing to work with credential missing host field"
+msgstr "vägrar arbeta med inloggningsuppgifter utan värdfält"
+
+msgid "refusing to work with credential missing protocol field"
+msgstr "vägrar arbeta med inloggningsuppgifter utan protokollfält"
+
+#, c-format
+msgid "url contains a newline in its %s component: %s"
+msgstr "url innehåller radbrytning i komponenten %s: %s"
+
+#, c-format
+msgid "url has no scheme: %s"
+msgstr "url saknar protokoll: %s"
+
+#, c-format
+msgid "credential url cannot be parsed: %s"
+msgstr "kan inte tolka url för inloggingsuppgifter: %s"
+
+msgid "in the future"
+msgstr "i framtiden"
+
+#, c-format
+msgid "%<PRIuMAX> second ago"
+msgid_plural "%<PRIuMAX> seconds ago"
+msgstr[0] "%<PRIuMAX> sekund sedan"
+msgstr[1] "%<PRIuMAX> sekunder sedan"
+
+#, c-format
+msgid "%<PRIuMAX> minute ago"
+msgid_plural "%<PRIuMAX> minutes ago"
+msgstr[0] "%<PRIuMAX> minut sedan"
+msgstr[1] "%<PRIuMAX> minuter sedan"
+
+#, c-format
+msgid "%<PRIuMAX> hour ago"
+msgid_plural "%<PRIuMAX> hours ago"
+msgstr[0] "%<PRIuMAX> timme sedan"
+msgstr[1] "%<PRIuMAX> timmar sedan"
+
+#, c-format
+msgid "%<PRIuMAX> day ago"
+msgid_plural "%<PRIuMAX> days ago"
+msgstr[0] "%<PRIuMAX> dag sedan"
+msgstr[1] "%<PRIuMAX> dagar sedan"
+
+#, c-format
+msgid "%<PRIuMAX> week ago"
+msgid_plural "%<PRIuMAX> weeks ago"
+msgstr[0] "%<PRIuMAX> vecka sedan"
+msgstr[1] "%<PRIuMAX> veckor sedan"
+
+#, c-format
+msgid "%<PRIuMAX> month ago"
+msgid_plural "%<PRIuMAX> months ago"
+msgstr[0] "%<PRIuMAX> månad sedan"
+msgstr[1] "%<PRIuMAX> månader sedan"
+
+#, c-format
+msgid "%<PRIuMAX> year"
+msgid_plural "%<PRIuMAX> years"
+msgstr[0] "%<PRIuMAX> år"
+msgstr[1] "%<PRIuMAX> år"
+
+#. TRANSLATORS: "%s" is "<n> years"
+#, c-format
+msgid "%s, %<PRIuMAX> month ago"
+msgid_plural "%s, %<PRIuMAX> months ago"
+msgstr[0] "%s, %<PRIuMAX> månad sedan"
+msgstr[1] "%s, %<PRIuMAX> månader sedan"
+
+#, c-format
+msgid "%<PRIuMAX> year ago"
+msgid_plural "%<PRIuMAX> years ago"
+msgstr[0] "%<PRIuMAX> år sedan"
+msgstr[1] "%<PRIuMAX> år sedan"
+
+msgid "Propagating island marks"
+msgstr "Sprider ö-markeringar"
+
+#, c-format
+msgid "bad tree object %s"
+msgstr "felaktigt trädobjektet %s"
+
+#, c-format
+msgid "failed to load island regex for '%s': %s"
+msgstr "kunde inte hämta ö-regex för \"%s\": %s"
+
+#, c-format
+msgid "island regex from config has too many capture groups (max=%d)"
+msgstr "ö-regex från konfiguration har för många fångstgrupper (max=%d)"
+
+#, c-format
+msgid "Marked %d islands, done.\n"
+msgstr "Markerade %d öar, klar.\n"
+
+msgid "--merge-base does not work with ranges"
+msgstr "--merge-base fungerar inte med intervall"
+
+msgid "--merge-base only works with commits"
+msgstr "--merge-base fungerar bara med incheckningar"
+
+msgid "unable to get HEAD"
+msgstr "kan inte hämta HEAD"
+
+msgid "no merge base found"
+msgstr "ingen sammanslagningsbas hittades"
+
+msgid "multiple merge bases found"
+msgstr "flera sammanslagningsbaser hittades"
+
+msgid "git diff --no-index [<options>] <path> <path>"
+msgstr "git diff --no-index [<flaggor>] <sökväg> <sökväg>"
 
-#: git-add--interactive.perl:1277 git-add--interactive.perl:1295
 msgid ""
-"y - discard this hunk from worktree\n"
-"n - do not discard this hunk from worktree\n"
-"q - quit; do not discard this hunk or any of the remaining ones\n"
-"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"
+"Not a git repository. Use --no-index to compare two paths outside a working "
+"tree"
 msgstr ""
-"y - förkasta stycket från arbetskatalogen\n"
-"n - förkasta inte stycket från arbetskatalogen\n"
-"q - avsluta; förkasta inte stycket eller något av de följande\n"
-"a - förkasta stycket och alla följande i filen\n"
-"d - förkasta inte stycket eller något av de följande i filen"
+"Inte ett git-arkiv. Använd --no-index för att jämföra två sökvägar utanför "
+"en arbetskatalog."
+
+#, c-format
+msgid "  Failed to parse dirstat cut-off percentage '%s'\n"
+msgstr "  Misslyckades tolka dirstat-avskärningsprocentandel \"%s\"\n"
+
+#, c-format
+msgid "  Unknown dirstat parameter '%s'\n"
+msgstr "  Okänd dirstat-parameter \"%s\"\n"
 
-#: git-add--interactive.perl:1283
 msgid ""
-"y - discard this hunk from index and worktree\n"
-"n - do not discard this hunk from index and worktree\n"
-"q - quit; do not discard this hunk or any of the remaining ones\n"
-"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"
+"color moved setting must be one of 'no', 'default', 'blocks', 'zebra', "
+"'dimmed-zebra', 'plain'"
 msgstr ""
-"y - förkasta stycket från indexet och arbetskatalogen\n"
-"n - förkasta inte stycket från indexet och arbetskatalogen\n"
-"q - avsluta; förkasta inte stycket eller något av de följande\n"
-"a - förkasta stycket och alla följande i filen\n"
-"d - förkasta inte stycket eller något av de följande i filen"
+"färginställningen för flyttade block måste vara en av \"no\", \"default\", "
+"\"blocks\", \"zebra\", \"dimmed-zebra\", \"plain\""
 
-#: git-add--interactive.perl:1289
+#, c-format
 msgid ""
-"y - apply this hunk to index and worktree\n"
-"n - do not apply this hunk to index and worktree\n"
-"q - quit; do not apply this hunk or any of the remaining ones\n"
-"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"
+"unknown color-moved-ws mode '%s', possible values are 'ignore-space-change', "
+"'ignore-space-at-eol', 'ignore-all-space', 'allow-indentation-change'"
 msgstr ""
-"y - applicera stycket på indexet och arbetskatalogen\n"
-"n - applicera inte stycket på indexet och arbetskatalogen\n"
-"q - avsluta; applicera inte stycket eller något av de följande\n"
-"a - applicera stycket och alla följande i filen\n"
-"d - applicera inte stycket eller något av de följande i filen"
+"okänt läge \"%s\" för color-moved-ws, möjliga värden är \"ignore-space-change"
+"\", \"ignore-space-at-eol\", \"ignore-all-space\", \"allow-indentation-change"
+"\""
 
-#: git-add--interactive.perl:1301
 msgid ""
-"y - apply this hunk to worktree\n"
-"n - do not apply this hunk to worktree\n"
-"q - quit; do not apply this hunk or any of the remaining ones\n"
-"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"
+"color-moved-ws: allow-indentation-change cannot be combined with other "
+"whitespace modes"
 msgstr ""
-"y - applicera stycket på arbetskatalogen\n"
-"n - applicera inte stycket på arbetskatalogen\n"
-"q - avsluta; applicera inte stycket eller något av de följande\n"
-"a - applicera stycket och alla följande i filen\n"
-"d - applicera inte stycket eller något av de följande i filen"
+"color-moved-ws: allow-indentation-change kan inte kombineras med andra "
+"blankstegslägen"
 
-#: git-add--interactive.perl:1316
+#, c-format
+msgid "Unknown value for 'diff.submodule' config variable: '%s'"
+msgstr "Okänt värde för konfigurationsvariabeln \"diff.submodule\": \"%s\""
+
+#, c-format
 msgid ""
-"g - select a hunk to go to\n"
-"/ - search for a hunk matching the given regex\n"
-"j - leave this hunk undecided, see next undecided hunk\n"
-"J - leave this hunk undecided, see next hunk\n"
-"k - leave this hunk undecided, see previous undecided hunk\n"
-"K - leave this hunk undecided, see previous hunk\n"
-"s - split the current hunk into smaller hunks\n"
-"e - manually edit the current hunk\n"
-"? - print help\n"
+"Found errors in 'diff.dirstat' config variable:\n"
+"%s"
 msgstr ""
-"g - välj ett stycke att gå till\n"
-"/ - sök efter stycke som motsvarar angivet reguljärt uttryck\n"
-"j - lämna stycket obestämt, se nästa obestämda stycke\n"
-"J - lämna stycket obestämt, se nästa stycke\n"
-"k - lämna stycket obestämt, se föregående obestämda stycke\n"
-"K - lämna stycket obestämt, se föregående stycke\n"
-"s - dela aktuellt stycke i mindre styckens\n"
-"e - redigera aktuellt stycke manuellt\n"
-"? - visa hjälp\n"
+"Hittade fel i konfigurationsvariabeln \"diff.dirstat\":\n"
+"%s"
 
-#: git-add--interactive.perl:1347
-msgid "The selected hunks do not apply to the index!\n"
-msgstr "Markerade stycken kan inte appliceras på indexet!\n"
+#, c-format
+msgid "external diff died, stopping at %s"
+msgstr "extern diff dog, stannar vid %s"
 
-#: git-add--interactive.perl:1362
-#, perl-format
-msgid "ignoring unmerged: %s\n"
-msgstr "ignorerar ej sammanslagen: %s\n"
+#, c-format
+msgid "options '%s', '%s', '%s', and '%s' cannot be used together"
+msgstr ""
+"flaggorna \"%s\", \"%s\", \"%s\" och \"%s\" kan inte användas samtidigt"
 
-#: git-add--interactive.perl:1481
-#, perl-format
-msgid "Apply mode change to worktree [y,n,q,a,d%s,?]? "
-msgstr "Applicera ändrat läge på arbetskatalogen [y,n,q,a,d%s,?]? "
+#, c-format
+msgid "options '%s' and '%s' cannot be used together, use '%s' with '%s'"
+msgstr ""
+"flaggorna \"%s\" och \"%s\" kan inte användas samtidigt, använd \"%s\" med "
+"\"%s\""
 
-#: git-add--interactive.perl:1482
-#, perl-format
-msgid "Apply deletion to worktree [y,n,q,a,d%s,?]? "
-msgstr "Applicera borttagning på arbetskatalogen [y,n,q,a,d%s,?]? "
+#, c-format
+msgid ""
+"options '%s' and '%s' cannot be used together, use '%s' with '%s' and '%s'"
+msgstr ""
+"flaggorna \"%s\" och  \"%s\" kan inte användas samtidigt, använd \"%s\" med "
+"\"%s\" och \"%s\""
 
-#: git-add--interactive.perl:1483
-#, perl-format
-msgid "Apply addition to worktree [y,n,q,a,d%s,?]? "
-msgstr "Applicera tillägg på arbetskatalogen [y,n,q,a,d%s,?]? "
+msgid "--follow requires exactly one pathspec"
+msgstr "--follow kräver exakt en sökvägsangivelse"
 
-#: git-add--interactive.perl:1484
-#, perl-format
-msgid "Apply this hunk to worktree [y,n,q,a,d%s,?]? "
-msgstr "Applicera stycket på arbetskatalogen [y,n,q,a,d%s,?]? "
+#, c-format
+msgid "invalid --stat value: %s"
+msgstr "ogiltigt värde för --stat: %s"
 
-#: git-add--interactive.perl:1601
-msgid "No other hunks to goto\n"
-msgstr "Inga andra stycken att gå till\n"
+#, c-format
+msgid "%s expects a numerical value"
+msgstr "%s förväntar ett numeriskt värde"
 
-#: git-add--interactive.perl:1619
-#, perl-format
-msgid "Invalid number: '%s'\n"
-msgstr "Ogiltigt siffervärde: \"%s\"\n"
+#, c-format
+msgid ""
+"Failed to parse --dirstat/-X option parameter:\n"
+"%s"
+msgstr ""
+"Misslyckades tolka argument till flaggan --dirstat/-X;\n"
+"%s"
 
-#: git-add--interactive.perl:1624
-#, perl-format
-msgid "Sorry, only %d hunk available.\n"
-msgid_plural "Sorry, only %d hunks available.\n"
-msgstr[0] "Beklagar, det finns bara %d stycke.\n"
-msgstr[1] "Beklagar, det finns bara %d stycken.\n"
+#, c-format
+msgid "unknown change class '%c' in --diff-filter=%s"
+msgstr "okänd ändringsklass \"%c\" i --diff-filter=%s"
 
-#: git-add--interactive.perl:1659
-msgid "No other hunks to search\n"
-msgstr "Inga andra stycken att söka efter\n"
+#, c-format
+msgid "unknown value after ws-error-highlight=%.*s"
+msgstr "okänt värde efter ws-error-highlight=%.*s"
 
-#: git-add--interactive.perl:1676
-#, perl-format
-msgid "Malformed search regexp %s: %s\n"
-msgstr "Felaktigt format på reguljärt sökuttryck %s: %s\n"
+#, c-format
+msgid "unable to resolve '%s'"
+msgstr "kunde inte slå upp \"%s\""
 
-#: git-add--interactive.perl:1686
-msgid "No hunk matches the given pattern\n"
-msgstr "Inga stycken motsvarar givet mönster\n"
+#, c-format
+msgid "%s expects <n>/<m> form"
+msgstr "%s förväntar formen <n>/<m>"
 
-#: git-add--interactive.perl:1698 git-add--interactive.perl:1720
-msgid "No previous hunk\n"
-msgstr "Inget föregående stycke\n"
+#, c-format
+msgid "%s expects a character, got '%s'"
+msgstr "%s förväntar ett tecken, fick \"%s\""
 
-#: git-add--interactive.perl:1707 git-add--interactive.perl:1726
-msgid "No next hunk\n"
-msgstr "Inget följande stycke\n"
+#, c-format
+msgid "bad --color-moved argument: %s"
+msgstr "felaktigt argument till --color-moved: %s"
 
-#: git-add--interactive.perl:1732
-msgid "Sorry, cannot split this hunk\n"
-msgstr "Beklagar, kan inte dela stycket\n"
+#, c-format
+msgid "invalid mode '%s' in --color-moved-ws"
+msgstr "ogiltigt läge %s\" i --color-moved-ws"
 
-#: git-add--interactive.perl:1738
-#, perl-format
-msgid "Split into %d hunk.\n"
-msgid_plural "Split into %d hunks.\n"
-msgstr[0] "Dela i %d stycke.\n"
-msgstr[1] "Dela i %d stycken.\n"
+msgid ""
+"option diff-algorithm accepts \"myers\", \"minimal\", \"patience\" and "
+"\"histogram\""
+msgstr ""
+"flaggan diff-algorithm godtar\"myers\", \"minimal\", \"patience\" och "
+"\"histogram\""
 
-#: git-add--interactive.perl:1748
-msgid "Sorry, cannot edit this hunk\n"
-msgstr "Beklagar, kan inte redigera stycket\n"
+#, c-format
+msgid "invalid argument to %s"
+msgstr "ogiltigt argument för %s"
+
+#, c-format
+msgid "invalid regex given to -I: '%s'"
+msgstr "ogiltigt reguljärt uttryck angavs för -I: \"%s\""
+
+#, c-format
+msgid "failed to parse --submodule option parameter: '%s'"
+msgstr "misslyckades tolka argument till flaggan --submodule: \"%s\""
+
+#, c-format
+msgid "bad --word-diff argument: %s"
+msgstr "felaktigt argument --word-diff: %s"
+
+msgid "Diff output format options"
+msgstr "Formatflaggor för diff-utdata"
+
+msgid "generate patch"
+msgstr "skapar patch"
+
+msgid "<n>"
+msgstr "<n>"
+
+msgid "generate diffs with <n> lines context"
+msgstr "skapa diffar med <n> rader sammanhang"
+
+msgid "generate the diff in raw format"
+msgstr "generera diff i råformat"
+
+msgid "synonym for '-p --raw'"
+msgstr "synonym till \"-p --raw\""
+
+msgid "synonym for '-p --stat'"
+msgstr "synonym till \"-p --stat\""
+
+msgid "machine friendly --stat"
+msgstr "maskinläsbar --stat"
+
+msgid "output only the last line of --stat"
+msgstr "skriv bara ut den sista raden för --stat"
+
+msgid "<param1,param2>..."
+msgstr "<param1,param2>..."
 
-#. TRANSLATORS: please do not translate the command names
-#. 'status', 'update', 'revert', etc.
-#: git-add--interactive.perl:1813
 msgid ""
-"status        - show paths with changes\n"
-"update        - add working tree state to the staged set of changes\n"
-"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"
+"output the distribution of relative amount of changes for each sub-directory"
 msgstr ""
-"status        - visa sökvägar med ändringar\n"
-"update        - lägg arbetskatalogens tillstånd till köade ändringar\n"
-"revert        - återställ köade ändringar till HEAD-versionen\n"
-"patch         - välj och uppdatera valda stycken\n"
-"diff          - visa diff mellan HEAD och index\n"
-"add untracked - lägg till innehåll i ospårade filer till köade ändringar\n"
+"skriv ut distributionen av relativa mängder ändringar för varje underkatalog"
 
-#: git-add--interactive.perl:1830 git-add--interactive.perl:1842
-#: git-add--interactive.perl:1845 git-add--interactive.perl:1852
-#: git-add--interactive.perl:1855 git-add--interactive.perl:1862
-#: git-add--interactive.perl:1866 git-add--interactive.perl:1872
-msgid "missing --"
-msgstr "saknad --"
+msgid "synonym for --dirstat=cumulative"
+msgstr "synonym för --dirstat=cumulative"
 
-#: git-add--interactive.perl:1868
-#, perl-format
-msgid "unknown --patch mode: %s"
-msgstr "okänt läge för --patch: %s"
+msgid "synonym for --dirstat=files,param1,param2..."
+msgstr "synonym för --dirstat=filer,param1,param2..."
 
-#: git-add--interactive.perl:1874 git-add--interactive.perl:1880
-#, perl-format
-msgid "invalid argument %s, expecting --"
-msgstr "felaktigt argument %s, förväntar --"
+msgid "warn if changes introduce conflict markers or whitespace errors"
+msgstr "varna om ändringar introducerar konfliktmarkörer eller blankstegsfel"
 
-#: git-send-email.perl:159
-msgid "local zone differs from GMT by a non-minute interval\n"
-msgstr "lokal zon skiljer sig från GMT med delar av minuter\n"
+msgid "condensed summary such as creations, renames and mode changes"
+msgstr "kortfattad summering såsom skapade, namnbyten och ändrade lägen"
 
-#: git-send-email.perl:166 git-send-email.perl:172
-msgid "local time offset greater than or equal to 24 hours\n"
-msgstr "lokal tidszonförskjutning större än eller lika med 24 timmar\n"
+msgid "show only names of changed files"
+msgstr "visa endast namnen på ändrade filer"
 
-#: git-send-email.perl:244
-#, perl-format
-msgid "fatal: command '%s' died with exit code %d"
-msgstr "ödesdigert: kommandot \"%s\" dog med slutkoden %d"
+msgid "show only names and status of changed files"
+msgstr "visa endast namn och status för ändrade filer"
 
-#: git-send-email.perl:257
-msgid "the editor exited uncleanly, aborting everything"
-msgstr "textredigeringsprogrammet avslutades med fel, avbryter allting"
+msgid "<width>[,<name-width>[,<count>]]"
+msgstr "<bredd>[,<namn-bredd>[,<antal>]]"
+
+msgid "generate diffstat"
+msgstr "skapa diffstat"
+
+msgid "<width>"
+msgstr "<bredd>"
+
+msgid "generate diffstat with a given width"
+msgstr "generera en diffstat med given bredd"
+
+msgid "generate diffstat with a given name width"
+msgstr "generera en diffstat med given namnbredd"
+
+msgid "generate diffstat with a given graph width"
+msgstr "generera en diffstat med given grafbredd"
+
+msgid "<count>"
+msgstr "<antal>"
+
+msgid "generate diffstat with limited lines"
+msgstr "generera diffstat med begränsade rader"
+
+msgid "generate compact summary in diffstat"
+msgstr "skapa kompakt översikt i diffstat"
+
+msgid "output a binary diff that can be applied"
+msgstr "skapa en binärdiff som kan appliceras"
+
+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"
+
+msgid "show colored diff"
+msgstr "visa färgad diff"
+
+msgid "<kind>"
+msgstr "<typ>"
 
-#: git-send-email.perl:346
-#, perl-format
 msgid ""
-"'%s' contains an intermediate version of the email you were composing.\n"
+"highlight whitespace errors in the 'context', 'old' or 'new' lines in the "
+"diff"
 msgstr ""
-"\"%s\" innehåller en mellanliggande version av e-postbrevet du skrev.\n"
+"ljusmarkera blankstegsfel i \"context\" (sammanhang), \"old\" (gamla) eller "
+"\"new\" (nya) rader i diffen"
 
-#: git-send-email.perl:351
-#, perl-format
-msgid "'%s.final' contains the composed email.\n"
-msgstr "\"%s.final\" innehåller det skrivna brevet.\n"
+msgid ""
+"do not munge pathnames and use NULs as output field terminators in --raw or "
+"--numstat"
+msgstr ""
+"skriv inte om sökvägsnamn och använd NUL-tecken som fältseparerare i --raw "
+"eller --numstat"
 
-#: git-send-email.perl:484
-msgid "--dump-aliases incompatible with other options\n"
-msgstr "--dump-aliases är inkompatibelt med andra flaggor\n"
+msgid "<prefix>"
+msgstr "<prefix>"
+
+msgid "show the given source prefix instead of \"a/\""
+msgstr "visa givet källprefix istället för \"a/\""
+
+msgid "show the given destination prefix instead of \"b/\""
+msgstr "visa givet målprefix istället för \"b/\""
+
+msgid "prepend an additional prefix to every line of output"
+msgstr "lägg till ytterligare prefix på alla rader i utdata"
+
+msgid "do not show any source or destination prefix"
+msgstr "visa inte käll- eller målprefix"
+
+msgid "show context between diff hunks up to the specified number of lines"
+msgstr "visa sammnhang mellan diff-stycken upp till angivet antal rader"
+
+msgid "<char>"
+msgstr "<tecken>"
+
+msgid "specify the character to indicate a new line instead of '+'"
+msgstr "ange tecken för att ange ny rad istället för \"+\""
+
+msgid "specify the character to indicate an old line instead of '-'"
+msgstr "ange tecken för att ange gammal rad istället för \"-\""
+
+msgid "specify the character to indicate a context instead of ' '"
+msgstr "ange tecken för att ange sammanhang istället för \" \""
+
+msgid "Diff rename options"
+msgstr "Diff-namnbytesflaggor"
+
+msgid "<n>[/<m>]"
+msgstr "<n>[/<m>]"
+
+msgid "break complete rewrite changes into pairs of delete and create"
+msgstr "dela upp kompletta omskrivningar till ta bort och skapa-par"
+
+msgid "detect renames"
+msgstr "detektera namnändringar"
+
+msgid "omit the preimage for deletes"
+msgstr "ta bort för-version för borttagningar"
+
+msgid "detect copies"
+msgstr "detektera kopior"
+
+msgid "use unmodified files as source to find copies"
+msgstr "använd oförändrade som källa för att hitta kopior"
+
+msgid "disable rename detection"
+msgstr "inaktivera detektering av namnbyten"
+
+msgid "use empty blobs as rename source"
+msgstr "använd tomma blob:ar som namnändringskälla"
+
+msgid "continue listing the history of a file beyond renames"
+msgstr "fortsätt lista historiken för en fil bortom namnändringar"
 
-#: git-send-email.perl:561
 msgid ""
-"fatal: found configuration options for 'sendmail'\n"
-"git-send-email is configured with the sendemail.* options - note the 'e'.\n"
-"Set sendemail.forbidSendmailVariables to false to disable this check.\n"
+"prevent rename/copy detection if the number of rename/copy targets exceeds "
+"given limit"
 msgstr ""
-"ödesdigert: hittade konfigurationsflaggor för \"sendmail\"\n"
-"git-send-email konfigureras med \"sendemail.*\"-flaggor - lägg märke till \"e"
-"\".\n"
-"Sätt sendemail.forbidSendmailVariables till false för att inaktivera denna "
-"kontroll.\n"
+"förhindra namnbyte/kopie-detektering om antalet namnbyten/kopior överskriver "
+"given gräns"
 
-#: git-send-email.perl:566 git-send-email.perl:782
-msgid "Cannot run git format-patch from outside a repository\n"
-msgstr "Kan inte köra git format-patch från utanför arkivet\n"
+msgid "Diff algorithm options"
+msgstr "Alternativ för diff-algoritm"
+
+msgid "produce the smallest possible diff"
+msgstr "skapa minsta möjliga diff"
+
+msgid "ignore whitespace when comparing lines"
+msgstr "ignorera blanktecken vid radjämförelse"
+
+msgid "ignore changes in amount of whitespace"
+msgstr "ignorera ändringar i antal blanktecken vid radjämförelse"
+
+msgid "ignore changes in whitespace at EOL"
+msgstr "ignorera blanktecken vid radslut"
+
+msgid "ignore carrier-return at the end of line"
+msgstr "ignorera CR-tecken vid radslut"
+
+msgid "ignore changes whose lines are all blank"
+msgstr "ignorera ändringar i rader som är helt blanka"
+
+msgid "<regex>"
+msgstr "<reguttr>"
+
+msgid "ignore changes whose all lines match <regex>"
+msgstr "ignorera ändringar där samtliga rader motsvarar <reguttr>"
+
+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"
+
+msgid "generate diff using the \"patience diff\" algorithm"
+msgstr "skapa diffar med algoritmen \"patience diff\""
+
+msgid "generate diff using the \"histogram diff\" algorithm"
+msgstr "skapa diffar med algoritmen \"histogram diff\""
+
+msgid "<algorithm>"
+msgstr "<algoritm>"
+
+msgid "choose a diff algorithm"
+msgstr "välj en diff-algoritm"
+
+msgid "<text>"
+msgstr "<text>"
+
+msgid "generate diff using the \"anchored diff\" algorithm"
+msgstr "skapa diffar med algoritmen \"anchored diff\""
+
+msgid "<mode>"
+msgstr "<läge>"
+
+msgid "show word diff, using <mode> to delimit changed words"
+msgstr "visa orddiff, där <läge> avgränsar ändrade ord"
+
+msgid "use <regex> to decide what a word is"
+msgstr "använd <reguttr> för att bestämma vad som är ett ord"
+
+msgid "equivalent to --word-diff=color --word-diff-regex=<regex>"
+msgstr "motsvarar --word-diff=color --word-diff-regex=<reguttr>"
+
+msgid "moved lines of code are colored differently"
+msgstr "flyttade kodrader färgas på annat sätt"
+
+msgid "how white spaces are ignored in --color-moved"
+msgstr "hur blanktecken ignoreras i --color-moved"
+
+msgid "Other diff options"
+msgstr "Andra diff-flaggor"
+
+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"
+
+msgid "treat all files as text"
+msgstr "hantera alla filer som text"
+
+msgid "swap two inputs, reverse the diff"
+msgstr "växla två indatafiler, vänd diffen"
+
+msgid "exit with 1 if there were differences, 0 otherwise"
+msgstr "avsluta med 1 vid ändringar, annars 0"
+
+msgid "disable all output of the program"
+msgstr "slå av alla utdata från programmet"
+
+msgid "allow an external diff helper to be executed"
+msgstr "tillåt köra en extern diff-hjälpare"
+
+msgid "run external text conversion filters when comparing binary files"
+msgstr "kör externt textkonverteringsfiler när binärfiler jämförs"
+
+msgid "<when>"
+msgstr "<när>"
+
+msgid "ignore changes to submodules in the diff generation"
+msgstr "ignorera ändringar i undermoduler när diffen skapas"
+
+msgid "<format>"
+msgstr "<format>"
+
+msgid "specify how differences in submodules are shown"
+msgstr "ange hur ändringar i undermoduler visas"
+
+msgid "hide 'git add -N' entries from the index"
+msgstr "dölj \"git add -N\"-poster från indexet"
+
+msgid "treat 'git add -N' entries as real in the index"
+msgstr "tolka \"git add -N\"-poster som äkta i indexet"
+
+msgid "<string>"
+msgstr "<sträng>"
 
-#: git-send-email.perl:569
 msgid ""
-"`batch-size` and `relogin` must be specified together (via command-line or "
-"configuration option)\n"
+"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"
+
+msgid ""
+"look for differences that change the number of occurrences of the specified "
+"regex"
 msgstr ""
-"\"batch-size\" och \"relogin\" måste anges tillsammans (via kommandorad "
-"eller konfigurationsflagga)\n"
+"se efter ändringar som ändrar antalet förekomster av angivet reguljärt "
+"uttryck"
 
-#: git-send-email.perl:582
-#, perl-format
-msgid "Unknown --suppress-cc field: '%s'\n"
-msgstr "Okänt fält i --suppress-cc: \"%s\"\n"
+msgid "show all changes in the changeset with -S or -G"
+msgstr "visa alla ändringar i ändringsuppsättningen med -S eller -G"
 
-#: git-send-email.perl:613
-#, perl-format
-msgid "Unknown --confirm setting: '%s'\n"
-msgstr "Okänd inställning i --confirm: \"%s\"\n"
+msgid "treat <string> in -S as extended POSIX regular expression"
+msgstr "tolka <sträng> i -S som utökade POSIX-reguljära uttryck"
 
-#: git-send-email.perl:653
-#, perl-format
-msgid "warning: sendmail alias with quotes is not supported: %s\n"
-msgstr "varning: sendmail-alias med citationstecken stöds inte. %s\n"
+msgid "control the order in which files appear in the output"
+msgstr "styr ordningen i vilken filer visas i utdata"
 
-#: git-send-email.perl:655
-#, perl-format
-msgid "warning: `:include:` not supported: %s\n"
-msgstr "varning: \":include:\" stöds inte: %s\n"
+msgid "<path>"
+msgstr "<sökväg>"
 
-#: git-send-email.perl:657
-#, perl-format
-msgid "warning: `/file` or `|pipe` redirection not supported: %s\n"
-msgstr "varning: omdirigering til \"/fil\" eller \"|rör\" stöds inte: %s\n"
+msgid "show the change in the specified path first"
+msgstr "visa ändringen i angiven sökväg först"
 
-#: git-send-email.perl:662
-#, perl-format
-msgid "warning: sendmail line is not recognized: %s\n"
-msgstr "varning: sendmail-raden känns inte igen: %s\n"
+msgid "skip the output to the specified path"
+msgstr "hoppa över utdata fram till angiven sökväg"
+
+msgid "<object-id>"
+msgstr "<objekt-id>"
 
-#: git-send-email.perl:747
-#, perl-format
 msgid ""
-"File '%s' exists but it could also be the range of commits\n"
-"to produce patches for.  Please disambiguate by...\n"
+"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"
+
+msgid "[(A|C|D|M|R|T|U|X|B)...[*]]"
+msgstr "[(A|C|D|M|R|T|U|X|B)...[*]]"
+
+msgid "select files by diff type"
+msgstr "välj filter efter diff-typ"
+
+msgid "<file>"
+msgstr "<fil>"
+
+msgid "output to a specific file"
+msgstr "skriv utdata till en specifik fil"
+
+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."
+
+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."
+
+#, c-format
+msgid ""
+"you may want to set your %s variable to at least %d and retry the command."
+msgstr ""
+"du kan sätta variabeln %s till åtminstone %d och försöka kommandot på nytt."
+
+#, c-format
+msgid "failed to read orderfile '%s'"
+msgstr "kunde inte läsa orderfilen \"%s\""
+
+msgid "Performing inexact rename detection"
+msgstr "Utför onöjaktig namnbytesdetektering"
+
+#, c-format
+msgid "No such path '%s' in the diff"
+msgstr "Sökvägen \"%s\" finns inte i diffen"
+
+#, c-format
+msgid "pathspec '%s' did not match any file(s) known to git"
+msgstr "sökvägsangivelsen \"%s\" motsvarade inte några av git kända filer"
+
+#, c-format
+msgid "unrecognized pattern: '%s'"
+msgstr "okänt mönster: %s"
+
+#, c-format
+msgid "unrecognized negative pattern: '%s'"
+msgstr "okänt negativt mönster: %s"
+
+#, c-format
+msgid "your sparse-checkout file may have issues: pattern '%s' is repeated"
+msgstr ""
+"din \"sparse-checkout\"-fil kan ha problem: mönstret \"%s\" förekommer flera "
+"gånger"
+
+msgid "disabling cone pattern matching"
+msgstr "inaktiverar konmönstermatchning"
+
+#, c-format
+msgid "cannot use %s as an exclude file"
+msgstr "kan inte använda %s som exkluderingsfil"
+
+msgid "failed to get kernel name and information"
+msgstr "misslyckades hämta kärnans namn och information"
+
+msgid "untracked cache is disabled on this system or location"
+msgstr "ospårad cache är inaktiverad på systemet eller platsen"
+
+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"
+
+#, c-format
+msgid "index file corrupt in repo %s"
+msgstr "indexfilen trasig i arkivet %s"
+
+#, c-format
+msgid "could not create directories for %s"
+msgstr "kunde inte skapa kataloger för %s"
+
+#, c-format
+msgid "could not migrate git directory from '%s' to '%s'"
+msgstr "kunde inte migrera git-katalog från \"%s\" till \"%s\""
+
+#, 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"
+
+msgid "Filtering content"
+msgstr "Filtrerar innehåll"
+
+#, c-format
+msgid "could not stat file '%s'"
+msgstr "kunde inte ta status på filen \"%s\""
+
+#, c-format
+msgid "bad git namespace path \"%s\""
+msgstr "felaktig git-namnrymdssökväg \"%s\""
+
+#, c-format
+msgid "too many args to run %s"
+msgstr "för många flaggor för att köra %s"
+
+msgid "git fetch-pack: expected shallow list"
+msgstr "git fetch-pack: förväntade grund lista"
+
+msgid "git fetch-pack: expected a flush packet after shallow list"
+msgstr "git fetch-pack: förväntade ett flush-paket efter grund lista"
+
+msgid "git fetch-pack: expected ACK/NAK, got a flush packet"
+msgstr "git fetch-pack: förväntade ACK/NAK, fick flush-paket"
+
+#, c-format
+msgid "git fetch-pack: expected ACK/NAK, got '%s'"
+msgstr "git fetch-pack: förväntade ACK/NAK, fick \"%s\""
+
+msgid "unable to write to remote"
+msgstr "kunde inte skriva till fjärren"
+
+#, c-format
+msgid "invalid shallow line: %s"
+msgstr "ogiltig \"shallow\"-rad: %s"
+
+#, c-format
+msgid "invalid unshallow line: %s"
+msgstr "ogiltig \"unshallow\"-rad: %s"
+
+#, c-format
+msgid "object not found: %s"
+msgstr "objektet hittades inte: %s"
+
+#, c-format
+msgid "error in object: %s"
+msgstr "fel i objekt: %s"
+
+#, c-format
+msgid "no shallow found: %s"
+msgstr "ingen \"shallow\" hittades: %s"
+
+#, c-format
+msgid "expected shallow/unshallow, got %s"
+msgstr "förväntade shallow/unshallow, fick %s"
+
+#, c-format
+msgid "got %s %d %s"
+msgstr "fick %s %d %s"
+
+#, c-format
+msgid "invalid commit %s"
+msgstr "ogiltig incheckning %s"
+
+msgid "giving up"
+msgstr "ger upp"
+
+msgid "done"
+msgstr "klart"
+
+#, c-format
+msgid "got %s (%d) %s"
+msgstr "fick %s (%d) %s"
+
+#, c-format
+msgid "Marking %s as complete"
+msgstr "Markerar %s som komplett"
+
+#, c-format
+msgid "already have %s (%s)"
+msgstr "har redan %s (%s)"
+
+msgid "fetch-pack: unable to fork off sideband demultiplexer"
+msgstr "fetch-patch: kunde inte grena av sidbandsmultiplexare"
+
+msgid "protocol error: bad pack header"
+msgstr "protokollfel: felaktigt packhuvud"
+
+#, c-format
+msgid "fetch-pack: unable to fork off %s"
+msgstr "fetch-patch: kunde inte grena av %s"
+
+msgid "fetch-pack: invalid index-pack output"
+msgstr "fetch-patch: ogiltig utdata från index-pack"
+
+#, c-format
+msgid "%s failed"
+msgstr "%s misslyckades"
+
+msgid "error in sideband demultiplexer"
+msgstr "fel i sidbands-avmultiplexare"
+
+#, c-format
+msgid "Server version is %.*s"
+msgstr "Serverversionen är %.*s"
+
+#, c-format
+msgid "Server supports %s"
+msgstr "Servern stöder %s"
+
+msgid "Server does not support shallow clients"
+msgstr "Servern stöder inte klienter med grunda arkiv"
+
+msgid "Server does not support --shallow-since"
+msgstr "Servern stöder inte --shallow-since"
+
+msgid "Server does not support --shallow-exclude"
+msgstr "Servern stöder inte --shallow-exclude"
+
+msgid "Server does not support --deepen"
+msgstr "Servern stöder inte --deepen"
+
+msgid "Server does not support this repository's object format"
+msgstr "Servern stöder inte det här arkivets objektformat"
+
+msgid "no common commits"
+msgstr "inga gemensamma incheckningar"
+
+msgid "git fetch-pack: fetch failed."
+msgstr "git fetch-pack: hämtning misslyckades."
+
+#, c-format
+msgid "mismatched algorithms: client %s; server %s"
+msgstr "omaka algoritmer: klient %s; server %s"
+
+#, c-format
+msgid "the server does not support algorithm '%s'"
+msgstr "servern stöder inte algoritmen \"%s\""
+
+msgid "Server does not support shallow requests"
+msgstr "Servern stöder inte grunda förfrågningar"
+
+msgid "Server supports filter"
+msgstr "Servern stöder filter"
+
+msgid "unable to write request to remote"
+msgstr "kunde inte skriva anrop till fjärren"
+
+#, c-format
+msgid "expected '%s', received '%s'"
+msgstr "förväntade \"%s\", tog emot \"%s\""
+
+#, c-format
+msgid "expected '%s'"
+msgstr "förväntade \"%s\""
+
+#, c-format
+msgid "unexpected acknowledgment line: '%s'"
+msgstr "oväntad bekräftelserad: \"%s\""
+
+#, c-format
+msgid "error processing acks: %d"
+msgstr "fel vid hantering av bekräftelser: %d"
+
+#. TRANSLATORS: The parameter will be 'ready', a protocol
+#. keyword.
+#.
+#, c-format
+msgid "expected packfile to be sent after '%s'"
+msgstr "väntade att paketfil skulle sändas efter \"%s\""
+
+#. TRANSLATORS: The parameter will be 'ready', a protocol
+#. keyword.
+#.
+#, c-format
+msgid "expected no other sections to be sent after no '%s'"
+msgstr ""
+"väntade inte att några ytterligare sektioner skulle sändas efter \"%s\""
+
+#, c-format
+msgid "error processing shallow info: %d"
+msgstr "fel vid hantering av grund (\"shallow\") info: %d"
+
+#, c-format
+msgid "expected wanted-ref, got '%s'"
+msgstr "förväntade wanted-ref, fick %s"
+
+#, c-format
+msgid "unexpected wanted-ref: '%s'"
+msgstr "oväntad wanted-ref: \"%s\""
+
+#, c-format
+msgid "error processing wanted refs: %d"
+msgstr "fel vid hantering av önskade referenser: %d"
+
+msgid "git fetch-pack: expected response end packet"
+msgstr "git fetch-pack: förväntade svarsavslutningspaket"
+
+msgid "no matching remote head"
+msgstr "inget motsvarande fjärrhuvud"
+
+msgid "unexpected 'ready' from remote"
+msgstr "oväntat \"ready\" från fjärr"
+
+#, c-format
+msgid "no such remote ref %s"
+msgstr "ingen sådan fjärreferens: %s"
+
+#, 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"
+
+#, c-format
+msgid "fsmonitor_ipc__send_query: invalid path '%s'"
+msgstr "fsmonitor_ipc__send_query: ogilitg sökväg \"%s\""
+
+#, c-format
+msgid "fsmonitor_ipc__send_query: unspecified error on '%s'"
+msgstr "fsmonitor_ipc__send_query: ospecificerat fel på \"%s\""
+
+msgid "fsmonitor--daemon is not running"
+msgstr "fsmonitor--daemon kör inte"
+
+#, c-format
+msgid "could not send '%s' command to fsmonitor--daemon"
+msgstr "kunde inte sända kommandot \"%s\" till fsmonitor--daemon"
+
+#, c-format
+msgid "bare repository '%s' is incompatible with fsmonitor"
+msgstr "naket arkiv \"%s\" är inkompatibelt med fsmonitor"
+
+#, c-format
+msgid "repository '%s' is incompatible with fsmonitor due to errors"
+msgstr "arkivet \"%s\" är inkompatibelt med fsmonitor på grund av fel"
+
+#, c-format
+msgid "remote repository '%s' is incompatible with fsmonitor"
+msgstr "fjärrarkivet \"%s\" är inkompatibelt med fsmonitor"
+
+#, c-format
+msgid "virtual repository '%s' is incompatible with fsmonitor"
+msgstr "det virtuella arkivet \"%s\" är inkompatibelt med fsmonitor"
+
+#, c-format
+msgid ""
+"repository '%s' is incompatible with fsmonitor due to lack of Unix sockets"
+msgstr ""
+"arkivet \"%s\" är inkompatibelt med fsmonitor på grund av avsaknad av Unix-"
+"uttag"
+
+msgid ""
+"git [-v | --version] [-h | --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"
+"           [--git-dir=<path>] [--work-tree=<path>] [--namespace=<name>]\n"
+"           [--super-prefix=<path>] [--config-env=<name>=<envvar>]\n"
+"           <command> [<args>]"
+msgstr ""
+"git [-v | --version] [-h |--help] [-C <sökväg>] [-c <namn>=<värde>]\n"
+"           [--exec-path[=<sökväg>]] [--html-path] [--man-path] [--info-"
+"path]\n"
+"           [-p | --paginate | -P | --no-pager] [--no-replace-objects] [--"
+"bare]\n"
+"           [--git-dir=<sökväg>] [--work-tree=<sökväg>] [--namespace=<namn>]\n"
+"           [--super-prefix=<sökväg>] [--config-env=<namn>=<miljövar>]\n"
+"           <kommando> [<flaggor>]"
+
+msgid ""
+"'git help -a' and 'git help -g' list available subcommands and some\n"
+"concept guides. See 'git help <command>' or 'git help <concept>'\n"
+"to read about a specific subcommand or concept.\n"
+"See 'git help git' for an overview of the system."
+msgstr ""
+"\"git help -a\" och \"git help -g\" visar tillgängliga underkommandon och\n"
+"några konceptvägledningar. Se \"git help <kommando>\" eller \"git help\n"
+"<koncept>\" för att läsa mer om specifika underkommandon och koncept.\n"
+"See \"git help git\" för en översikt över systemet."
+
+#, c-format
+msgid "unsupported command listing type '%s'"
+msgstr "okänd kommandolisttyp \"%s\""
+
+#, c-format
+msgid "no directory given for '%s' option\n"
+msgstr "ingen katalog angavs för flaggan \"%s\"\n"
+
+#, c-format
+msgid "no namespace given for --namespace\n"
+msgstr "ingen namnrymd angavs för --namespace\n"
+
+#, c-format
+msgid "no prefix given for --super-prefix\n"
+msgstr "inget prefix angavs för --super-prefix\n"
+
+#, c-format
+msgid "-c expects a configuration string\n"
+msgstr "-c förväntar en konfigurationssträng\n"
+
+#, c-format
+msgid "no config key given for --config-env\n"
+msgstr "ingen konfigurationsnyckel angavs för --config-env\n"
+
+#, c-format
+msgid "unknown option: %s\n"
+msgstr "okänd flagga: %s\n"
+
+#, c-format
+msgid "while expanding alias '%s': '%s'"
+msgstr "vid expandering av aliaset \"%s\": \"%s\""
+
+#, c-format
+msgid ""
+"alias '%s' changes environment variables.\n"
+"You can use '!git' in the alias to do this"
+msgstr ""
+"aliaset \"%s\" ändrar miljövariabler.\n"
+"Du kan använda \"!git\" i aliaset för att göra det"
+
+#, c-format
+msgid "empty alias for %s"
+msgstr "tomt alias för %s"
+
+#, c-format
+msgid "recursive alias: %s"
+msgstr "rekursivt alias: %s"
+
+msgid "write failure on standard output"
+msgstr "skrivfel på standard ut"
+
+msgid "unknown write failure on standard output"
+msgstr "okänt skrivfel på standard ut"
+
+msgid "close failed on standard output"
+msgstr "stäng misslyckades på standard ut"
+
+#, c-format
+msgid "alias loop detected: expansion of '%s' does not terminate:%s"
+msgstr "alias-slinga detekterades: expansionen av \"%s\" avslutas aldrig:%s"
+
+#, c-format
+msgid "cannot handle %s as a builtin"
+msgstr "kan inte hantera %s som inbyggd"
+
+#, c-format
+msgid ""
+"usage: %s\n"
 "\n"
-"    * Saying \"./%s\" if you mean a file; or\n"
-"    * Giving --format-patch option if you mean a range.\n"
 msgstr ""
-"Filen \"%s\" finns men kan också vara ett incheckningsintervall\n"
-"att skapa patchar för. Gör otvetydigt genom att...\n"
+"användning: %s\n"
 "\n"
-"    * Säga \"./%s\" om du menar en fil; eller\n"
-"    * Ange flaggan --format-patch om du menar ett intervall.\n"
 
-#: git-send-email.perl:768
-#, perl-format
-msgid "Failed to opendir %s: %s"
-msgstr "Misslyckades utföra opendir %s: %s"
+#, 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"
+
+#, c-format
+msgid "failed to run command '%s': %s\n"
+msgstr "misslyckades köra kommandot \"%s\": %s\n"
+
+msgid "could not create temporary file"
+msgstr "kunde inte skapa temporära fil"
+
+#, c-format
+msgid "failed writing detached signature to '%s'"
+msgstr "misslyckades skriva fristående signatur till \"%s\""
+
+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"
+
+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+)"
+
+#, c-format
+msgid "ssh signing revocation file configured but not found: %s"
+msgstr "återkallningsfilen för ssh-signering inställd men saknas: %s"
+
+#, c-format
+msgid "bad/incompatible signature '%s'"
+msgstr "felaktig/inkompatibel signatur \"%s\""
+
+#, c-format
+msgid "failed to get the ssh fingerprint for key '%s'"
+msgstr "misslyckades hämta ssh-fingeravtrycket för nyckeln \"%s\""
+
+msgid ""
+"either user.signingkey or gpg.ssh.defaultKeyCommand needs to be configured"
+msgstr ""
+"måste konfigurera antingen user.signingkey eller gpg.ssh.defaultKeyCommand"
+
+#, c-format
+msgid "gpg.ssh.defaultKeyCommand succeeded but returned no keys: %s %s"
+msgstr "gpg.ssh.defaultKeyCommand lyckades men gav inga nycklar: %s %s"
+
+#, c-format
+msgid "gpg.ssh.defaultKeyCommand failed: %s %s"
+msgstr "gpg.ssh.defaultKeyCommand misslyckades: %s %s"
+
+msgid "gpg failed to sign the data"
+msgstr "gpg misslyckades signera data"
+
+msgid "user.signingKey needs to be set for ssh signing"
+msgstr "user.signingKey måste anges för ssh-signering"
+
+#, c-format
+msgid "failed writing ssh signing key to '%s'"
+msgstr "misslyckades skriva ssh-signeringsnyckel till \"%s\""
+
+#, c-format
+msgid "failed writing ssh signing key buffer to '%s'"
+msgstr "misslyckades skriva ssh-signeringsnyckelbuffert till \"%s\""
+
+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+)"
+
+#, c-format
+msgid "failed reading ssh signing data buffer from '%s'"
+msgstr "misslyckades läsa ssh-signeringsdatabuffert från \"%s\""
+
+#, c-format
+msgid "ignored invalid color '%.*s' in log.graphColors"
+msgstr "ignorerade felaktig färg \"%.*s\" i log.graphColors"
+
+msgid ""
+"given pattern contains NULL byte (via -f <file>). This is only supported "
+"with -P under PCRE v2"
+msgstr ""
+"angivet mönster innehåller NULL-byte (via -f <fil>). Detta stöds endast med -"
+"P under PCRE v2"
+
+#, c-format
+msgid "'%s': unable to read %s"
+msgstr "\"%s\" kunde inte läsa %s"
+
+#, c-format
+msgid "'%s': short read"
+msgstr "\"%s\": kort läsning"
+
+msgid "start a working area (see also: git help tutorial)"
+msgstr "starta arbetskatalog (se också: git help tutorial)"
+
+msgid "work on the current change (see also: git help everyday)"
+msgstr "jobba med aktuell förändring (se också: git help everyday)"
+
+msgid "examine the history and state (see also: git help revisions)"
+msgstr "utforska historiken och tillståndet (se också: git help revisions)"
+
+msgid "grow, mark and tweak your common history"
+msgstr "utöka, markera och justera din gemensamma historik"
+
+msgid "collaborate (see also: git help workflows)"
+msgstr "samarbeta (se också: git help workflows)"
+
+msgid "Main Porcelain Commands"
+msgstr "Huvudsakliga porslinskommandon"
+
+msgid "Ancillary Commands / Manipulators"
+msgstr "Tilläggskommandon / manipulerare"
+
+msgid "Ancillary Commands / Interrogators"
+msgstr "Tilläggskommandon / frågare"
+
+msgid "Interacting with Others"
+msgstr "Interaktion med andra"
+
+msgid "Low-level Commands / Manipulators"
+msgstr "Lågnivåkommandon / maniupulerare"
+
+msgid "Low-level Commands / Interrogators"
+msgstr "Lågnivåkommandon / frågare"
+
+msgid "Low-level Commands / Syncing Repositories"
+msgstr "Lågnivåkommandon / synka arkiv"
+
+msgid "Low-level Commands / Internal Helpers"
+msgstr "Lågnivåkommandon / interna hjälpare"
+
+#, c-format
+msgid "available git commands in '%s'"
+msgstr "git-kommandon tillgängliga i \"%s\""
+
+msgid "git commands available from elsewhere on your $PATH"
+msgstr "git-kommandon från andra platser i din $PATH"
+
+msgid "These are common Git commands used in various situations:"
+msgstr "Dessa vanliga Git-kommandon används i olika situationer:"
+
+msgid "The Git concept guides are:"
+msgstr "Vägledningar för Git-koncept:"
+
+msgid "External commands"
+msgstr "Externa kommandon"
+
+msgid "Command aliases"
+msgstr "Kommadoalias"
+
+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"
+
+#, c-format
+msgid ""
+"'%s' appears to be a git command, but we were not\n"
+"able to execute it. Maybe git-%s is broken?"
+msgstr ""
+"\"%s\" verkar vara ett git-kommando, men vi kan inte\n"
+"köra det. Kanske git-%s är trasigt?"
+
+#, c-format
+msgid "git: '%s' is not a git command. See 'git --help'."
+msgstr "git: \"%s\" är inte ett git-kommando. Se \"git --help\"."
+
+msgid "Uh oh. Your system reports no Git commands at all."
+msgstr "Oj då. Ditt system rapporterar inga Git-kommandon alls."
+
+#, 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."
+
+#, c-format
+msgid "Continuing under the assumption that you meant '%s'."
+msgstr "Fortsätter under förutsättningen att du menade \"%s\"."
+
+#, c-format
+msgid "Run '%s' instead [y/N]? "
+msgstr "Köra \"%s\" istället (j/N)?"
+
+#, 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\"."
 
-#: git-send-email.perl:803
 msgid ""
 "\n"
-"No patch files specified!\n"
+"The most similar command is"
+msgid_plural ""
+"\n"
+"The most similar commands are"
+msgstr[0] ""
+"\n"
+"Mest likt kommando är"
+msgstr[1] ""
+"\n"
+"Mest lika kommandon är"
+
+msgid "git version [<options>]"
+msgstr "git version [<flaggor>]"
+
+#, c-format
+msgid "%s: %s - %s"
+msgstr "%s: %s - %s"
+
+msgid ""
+"\n"
+"Did you mean this?"
+msgid_plural ""
 "\n"
+"Did you mean one of these?"
+msgstr[0] ""
+"\n"
+"Menade du detta?"
+msgstr[1] ""
+"\n"
+"Menade du ett av dessa?"
+
+#, 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\"."
+
+#, c-format
+msgid "Couldn't start hook '%s'\n"
+msgstr "Kunde inte starta kroken \"%s\"\n"
+
+#, c-format
+msgid "argument to --packfile must be a valid hash (got '%s')"
+msgstr ""
+"argumentet till --packfile måste vara ett giltigt hashvärde (fick '%s')"
+
+msgid "not a git repository"
+msgstr "inte ett git-arkiv"
+
+#, c-format
+msgid "negative value for http.postBuffer; defaulting to %d"
+msgstr "http.postBuffer har negativt värde; använder förvalet %d"
+
+msgid "Delegation control is not supported with cURL < 7.22.0"
+msgstr "Delegerad styrning stöds inte av cURL < 7.22.0"
+
+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"
+
+msgid "CURLSSLOPT_NO_REVOKE not supported with cURL < 7.44.0"
+msgstr "CURLSSLOPT_NO_REVOKE stöds inte av cURL < 7.44.0"
+
+#, c-format
+msgid "Unsupported SSL backend '%s'. Supported SSL backends:"
+msgstr "SSL-bakändan \"%s\" stöds inte. Dessa SSL-bakändor stöds:"
+
+#, 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"
+
+#, c-format
+msgid "Could not set SSL backend to '%s': already set"
+msgstr "Kunde inte sätta SSL-bakända till \"%s\": redan valt"
+
+#, c-format
+msgid ""
+"unable to update url base from redirection:\n"
+"  asked for: %s\n"
+"   redirect: %s"
 msgstr ""
+"kan inte uppdatera urlbas från omdirigerin:\n"
+"        bad om: %s\n"
+"  omdirigering: %s"
+
+msgid "Author identity unknown\n"
+msgstr "Författar-identitet okänd\n"
+
+msgid "Committer identity unknown\n"
+msgstr "Incheckar-identitet okänd\n"
+
+msgid ""
 "\n"
-"Inga patchfiler angavs!\n"
+"*** Please tell me who you are.\n"
+"\n"
+"Run\n"
+"\n"
+"  git config --global user.email \"you@example.com\"\n"
+"  git config --global user.name \"Your Name\"\n"
+"\n"
+"to set your account's default identity.\n"
+"Omit --global to set the identity only in this repository.\n"
+"\n"
+msgstr ""
+"\n"
+"*** Vänligen berätta vem du är.\n"
+"\n"
+"Kör\n"
+"\n"
+"  git config --global user.email \"du@example.com\"\n"
+"  git config --global user.name \"Ditt Namn\"\n"
+"\n"
+"för att ställa in ditt kontos standardidentitet.\n"
+"Kör utan --global för att endast ändra i aktuellt arkiv.\n"
 "\n"
 
-#: git-send-email.perl:816
-#, perl-format
-msgid "No subject line in %s?"
-msgstr "Ingen ärenderad i %s?"
+msgid "no email was given and auto-detection is disabled"
+msgstr "ingen e-post angavs och autodetektering är inaktiverad"
 
-#: git-send-email.perl:827
-#, perl-format
-msgid "Failed to open for writing %s: %s"
-msgstr "Kunde inte öppna för skrivning %s: %s"
+#, c-format
+msgid "unable to auto-detect email address (got '%s')"
+msgstr "kunde inte autodetektera e-postadress (fick \"%s\")"
+
+msgid "no name was given and auto-detection is disabled"
+msgstr "inget namn angavs och autodetektering är inaktiverad"
+
+#, c-format
+msgid "unable to auto-detect name (got '%s')"
+msgstr "kunde inte autodetektera namn (fick \"%s\")"
 
-#: git-send-email.perl:838
+#, c-format
+msgid "empty ident name (for <%s>) not allowed"
+msgstr "tomt ident-namn (för <%s>) ej tillåtet"
+
+#, c-format
+msgid "name consists only of disallowed characters: %s"
+msgstr "namnet består enbart av ej tillåtna tecken: %s"
+
+msgid "expected 'tree:<depth>'"
+msgstr "förväntade \"tree:<djup>\""
+
+msgid "sparse:path filters support has been dropped"
+msgstr "sparse:sökväg-filter stöds inte längre"
+
+#, c-format
+msgid "'%s' for 'object:type=<type>' is not a valid object type"
+msgstr "\"%s\" för \"object:type=<typ>\" är inte en giltig objekttyp"
+
+#, c-format
+msgid "invalid filter-spec '%s'"
+msgstr "felaktig filterspecifikation: \"%s\""
+
+#, c-format
+msgid "must escape char in sub-filter-spec: '%c'"
+msgstr "måste använda specialsekvens i delfilter-spec: \"%c\""
+
+msgid "expected something after combine:"
+msgstr "förväntade någonting efter combine:"
+
+msgid "multiple filter-specs cannot be combined"
+msgstr "flera filterspecifikationer kan inte kombineras"
+
+msgid "unable to upgrade repository format to support partial clone"
+msgstr "kunde inte uppgradera arkivformat till att stöda delvis klon"
+
+msgid "args"
+msgstr "argument"
+
+msgid "object filtering"
+msgstr "objektfiltrering"
+
+#, c-format
+msgid "unable to access sparse blob in '%s'"
+msgstr "kunde inte nå gles blob på \"%s\""
+
+#, c-format
+msgid "unable to parse sparse filter data in %s"
+msgstr "kunde inte tolka gles filterdata i %s"
+
+#, c-format
+msgid "entry '%s' in tree %s has tree mode, but is not a tree"
+msgstr "posten \"%s\" i trädet %s har träd-läge, men är inte ett träd"
+
+#, c-format
+msgid "entry '%s' in tree %s has blob mode, but is not a blob"
+msgstr "posten \"%s\" i trädet %s har blob-läge, men är inte en blob"
+
+#, c-format
+msgid "unable to load root tree for commit %s"
+msgstr "kunde inte läsa in rot-trädet för incheckningen %s"
+
+#, c-format
 msgid ""
-"Lines beginning in \"GIT:\" will be removed.\n"
-"Consider including an overall diffstat or table of contents\n"
-"for the patch you are writing.\n"
+"Unable to create '%s.lock': %s.\n"
 "\n"
-"Clear the body content if you don't wish to send a summary.\n"
+"Another git process seems to be running in this repository, e.g.\n"
+"an editor opened by 'git commit'. Please make sure all processes\n"
+"are terminated then try again. If it still fails, a git process\n"
+"may have crashed in this repository earlier:\n"
+"remove the file manually to continue."
 msgstr ""
-"Rader som börjar med \"GIT:\" kommer tas bort.\n"
-"Överväg att ta med en övergripande diffstatus eller\n"
-"innehållsförteckning för patchen du skriver.\n"
+"Kunde inte skapa \"%s.lock\": %s.\n"
 "\n"
-"Rensa brevkroppen om du inte vill sända någon sammanfattning.\n"
+"Det verkar som en annan git-process kör i det här arkivet, t.ex.\n"
+"ett textredigeringsprogram startat av \"git commit\". Se till att\n"
+"alla processer avslutats och försök sedan igen. Om det fortfarande\n"
+"misslyckas kanske en git-process har kraschat i det här arkivet\n"
+"tidigare:\n"
+"ta bort filen manuellt för att fortsätta."
 
-#: git-send-email.perl:862
-#, perl-format
-msgid "Failed to open %s: %s"
-msgstr "Misslyckades öppna %s: %s"
+#, c-format
+msgid "Unable to create '%s.lock': %s"
+msgstr "Kunde inte skapa \"%s.lock\": %s"
 
-#: git-send-email.perl:879
-#, perl-format
-msgid "Failed to open %s.final: %s"
-msgstr "Misslyckades öppna %s.final: %s"
+#, c-format
+msgid "unexpected line: '%s'"
+msgstr "oväntad rad: \"%s\""
 
-#: git-send-email.perl:922
-msgid "Summary email is empty, skipping it\n"
-msgstr "Sammanfattande brev tomt, hoppar över\n"
+msgid "expected flush after ls-refs arguments"
+msgstr "förväntade \"flush\" efter ls-refs-argument"
 
-#. TRANSLATORS: please keep [y/N] as is.
-#: git-send-email.perl:971
-#, perl-format
-msgid "Are you sure you want to use <%s> [y/N]? "
-msgstr "Är du säker på att du vill använda <%s> [Y=ja, N=nej]? "
+msgid "quoted CRLF detected"
+msgstr "citerad CRLF upptäcktes"
 
-#: git-send-email.perl:1026
+#, c-format
 msgid ""
-"The following files are 8bit, but do not declare a Content-Transfer-"
-"Encoding.\n"
+"Your local changes to the following files would be overwritten by merge:\n"
+"  %s"
 msgstr ""
-"Följande filer är åttabitars, men anger inte en Content-Transfer-Encoding.\n"
+"Dina lokala ändringar av följande filer skulle skrivas över av "
+"sammanslagning:\n"
+"  %s"
 
-#: git-send-email.perl:1031
-msgid "Which 8bit encoding should I declare [UTF-8]? "
-msgstr "Vilken åttabitarsteckenkodning ska jag ange [UTF-8]? "
+#, c-format
+msgid "Failed to merge submodule %s (not checked out)"
+msgstr "Misslyckades slå ihop undermodulen %s (ej utcheckad)"
 
-#: git-send-email.perl:1039
-#, perl-format
+#, c-format
+msgid "Failed to merge submodule %s (commits not present)"
+msgstr "Misslyckades slå ihop undermodulen %s (incheckningar saknas)"
+
+#, 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)"
+
+#, c-format
+msgid "Note: Fast-forwarding submodule %s to %s"
+msgstr "Obs: Snabbspolar undermodulen %s till %s"
+
+#, c-format
+msgid "Failed to merge submodule %s"
+msgstr "Misslyckades slå ihop undermodulen %s"
+
+#, c-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"
+"Failed to merge submodule %s, but a possible merge resolution exists:\n"
+"%s\n"
 msgstr ""
-"Vägrar sända eftersom patchen\n"
-"\t%s\n"
-"har mallärendet \"*** SUBJECT HERE ***\". Använd --force om du verkligen "
-"vill sända.\n"
+"Misslyckades slå ihop undermodulen %s, men en möjlig lösning finns:\n"
+"%s\n"
 
-#: git-send-email.perl:1058
-msgid "To whom should the emails be sent (if anyone)?"
-msgstr "Till vem ska breven sändas (om någon)?"
+#, c-format
+msgid ""
+"If this is correct simply add it to the index for example\n"
+"by using:\n"
+"\n"
+"  git update-index --cacheinfo 160000 %s \"%s\"\n"
+"\n"
+"which will accept this suggestion.\n"
+msgstr ""
+"Om detta är riktigt lägger du bara till det i indexet, till\n"
+"exempel så här:\n"
+"\n"
+"  git update-index --cacheinfo 160000 %s \"%s\"\n"
+"\n"
+"vilket godtar lösningen.\n"
 
-#: git-send-email.perl:1076
-#, perl-format
-msgid "fatal: alias '%s' expands to itself\n"
-msgstr "ödesdigert: aliaset \"%s\" expanderar till sig själv\n"
+#, c-format
+msgid ""
+"Failed to merge submodule %s, but multiple possible merges exist:\n"
+"%s"
+msgstr ""
+"Misslyckades slå ihop undermodulen %s, men flera möjliga sammanslagningar "
+"finns:\n"
+"%s"
 
-#: git-send-email.perl:1088
-msgid "Message-ID to be used as In-Reply-To for the first email (if any)? "
+msgid "Failed to execute internal merge"
+msgstr "Misslyckades exekvera intern sammanslagning"
+
+#, c-format
+msgid "Unable to add %s to database"
+msgstr "Kunde inte lägga till %s till databasen"
+
+#, c-format
+msgid "Auto-merging %s"
+msgstr "Slår ihop %s automatiskt"
+
+#, 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 ""
-"Message-ID att använda som In-Reply-To för det första brevet (om något)? "
+"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."
 
-#: git-send-email.perl:1150 git-send-email.perl:1158
-#, perl-format
-msgid "error: unable to extract a valid address from: %s\n"
-msgstr "fel: kunde inte få fram en giltig adress från: %s\n"
+#, 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 ""
+"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"
 
-#. 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:1162
-msgid "What to do with this address? ([q]uit|[d]rop|[e]dit): "
-msgstr "Vad vill du göra med adressen? (q=avsluta, d=kasta, e=redigera): "
+#, c-format
+msgid ""
+"CONFLICT (directory rename split): Unclear where to rename %s to; it was "
+"renamed to multiple other directories, with no destination getting a "
+"majority of the files."
+msgstr ""
+"KONFLIKT (namnändrad delad katalog): Osäker på var %s ska namnbytas till; "
+"den har namnbytts till flera andra kataloger, utan att någon destination "
+"fick en majoritet av filerna."
 
-#: git-send-email.perl:1482
-#, perl-format
-msgid "CA path \"%s\" does not exist"
-msgstr "CA-sökvägen \"%s\" finns inte"
+#, c-format
+msgid ""
+"WARNING: Avoiding applying %s -> %s rename to %s, because %s itself was "
+"renamed."
+msgstr ""
+"VARNING: Undviker att applicera namnändring %s -> %s på %s, då %s själv har "
+"bytt namn."
 
-#: git-send-email.perl:1565
+#, c-format
 msgid ""
-"    The Cc list above has been expanded by additional\n"
-"    addresses found in the patch commit message. By default\n"
-"    send-email prompts before sending whenever this occurs.\n"
-"    This behavior is controlled by the sendemail.confirm\n"
-"    configuration setting.\n"
+"Path updated: %s added in %s inside a directory that was renamed in %s; "
+"moving it to %s."
+msgstr ""
+"Uppdaterad sökväg: %s lade till %s inuti en katalog som bytte namn i %s; "
+"flyttar den till %s."
+
+#, c-format
+msgid ""
+"Path updated: %s renamed to %s in %s, inside a directory that was renamed in "
+"%s; moving it to %s."
+msgstr ""
+"Uppdaterad sökväg: %s bytte namn till %s i %s, inuti en katalog som bytte "
+"namn i %s; flyttar den till %s."
+
+#, 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 ""
+"KONFLIKT (filplacering): %s lade till %s inuti en katalog som bytte namn i "
+"%s, föreslår att den bör flyttas till%s."
+
+#, 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 ""
+"KONFLIKT (filplacering): %s bytte namn till %s i %s, inuti en katalog som "
+"bytte namn i %s; flyttar den till %s."
+
+#, 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."
+
+#, 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."
+msgstr ""
+"KONFLIKT (namnbyte involverad i krock): namnbyte av %s -> %s har "
+"innehållskonflikter OCH krockar med en annan sökväg; detta kan leda till "
+"nästlade konfliktmarkörer."
+
+#, 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."
+
+#, c-format
+msgid "cannot read object %s"
+msgstr "kan inte läsa objektet %s"
+
+#, c-format
+msgid "object %s is not a blob"
+msgstr "objektet %s är inte en blob"
+
+#, c-format
+msgid ""
+"CONFLICT (file/directory): directory in the way of %s from %s; moving it to "
+"%s instead."
+msgstr ""
+"KONFLIKT (fil/katalog): katalogen är i vägen för %s från %s; flyttar den "
+"till %s istället."
+
+#, c-format
+msgid ""
+"CONFLICT (distinct types): %s had different types on each side; renamed both "
+"of them so each can be recorded somewhere."
+msgstr ""
+"KONFLIKT (olika typer): %s hade olika typer på varje sida; namnbytte bägge "
+"så att de kan protokollföras någonstans."
+
+#, 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 (olika typer): %s hade olika typer på varje sida; namnbytte den ena "
+"så att de kan protokollföras någonstans."
+
+msgid "content"
+msgstr "innehåll"
+
+msgid "add/add"
+msgstr "tillägg/tillägg"
+
+msgid "submodule"
+msgstr "undermodul"
+
+#, c-format
+msgid "CONFLICT (%s): Merge conflict in %s"
+msgstr "KONFLIKT (%s): Sammanslagningskonflikt i %s"
+
+#, c-format
+msgid ""
+"CONFLICT (modify/delete): %s deleted in %s and modified in %s.  Version %s "
+"of %s left in tree."
+msgstr ""
+"KONFLIKT (ändra/radera): %s raderad i %s och ändrad i %s. Versionen %s av %s "
+"lämnad i trädet."
+
+#, c-format
+msgid ""
+"Note: %s not up to date and in way of checking out conflicted version; old "
+"copy renamed to %s"
+msgstr ""
+"Observera: %s är inte à jour och i vägen för att checka ut version i "
+"konflikt; gammal upplaga har nytt namn %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.
+#.
+#, c-format
+msgid "collecting merge info failed for trees %s, %s, %s"
+msgstr "samling av sammanslagningsinfo misslyckades för träden %s, %s, %s"
+
+msgid "(bad commit)\n"
+msgstr "(felaktig incheckning)\n"
+
+#, c-format
+msgid "add_cacheinfo failed for path '%s'; merge aborting."
+msgstr ""
+"add_cacheinfo misslyckades för sökvägen \"%s\"; avslutar sammanslagningen."
+
+#, 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."
+
+#, c-format
+msgid "failed to create path '%s'%s"
+msgstr "misslyckades skapa sökvägen \"%s\"%s"
+
+#, 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"
+
+msgid ": perhaps a D/F conflict?"
+msgstr ": kanske en K/F-konflikt?"
+
+#, c-format
+msgid "refusing to lose untracked file at '%s'"
+msgstr "vägrar förlora ospårad fil vid \"%s\""
+
+#, c-format
+msgid "blob expected for %s '%s'"
+msgstr "blob förväntades för %s \"%s\""
+
+#, c-format
+msgid "failed to open '%s': %s"
+msgstr "misslyckades öppna \"%s\": %s"
+
+#, c-format
+msgid "failed to symlink '%s': %s"
+msgstr "misslyckades skapa symboliska länken \"%s\": %s"
+
+#, c-format
+msgid "do not know what to do with %06o %s '%s'"
+msgstr "vet inte hur %06o %s \"%s\" ska hanteras"
+
+#, c-format
+msgid "Fast-forwarding submodule %s to the following commit:"
+msgstr "Snabbspolar undermodulen %s till följande incheckning:"
+
+#, c-format
+msgid "Fast-forwarding submodule %s"
+msgstr "Snabbspolar undermodulen %s"
+
+#, c-format
+msgid "Failed to merge submodule %s (merge following commits not found)"
+msgstr ""
+"Misslyckades slå ihop undermodulen %s (sammanslagning efter incheckningar "
+"hittades inte)"
+
+#, c-format
+msgid "Failed to merge submodule %s (not fast-forward)"
+msgstr "Misslyckades slå ihop undermodulen %s (ej snabbspolning)"
+
+msgid "Found a possible merge resolution for the submodule:\n"
+msgstr "Hittade en möjlig lösning av sammanslagning för undermodulen:\n"
+
+#, c-format
+msgid "Failed to merge submodule %s (multiple merges found)"
+msgstr ""
+"Misslyckades slå ihop undermodulen %s (flera sammanslagningar hittades)"
+
+#, 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."
+
+#, c-format
+msgid ""
+"CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s left "
+"in tree."
+msgstr ""
+"KONFLIKT (%s/radera): %s raderad i %s och %s i %s. Versionen %s av %s lämnad "
+"i trädet."
+
+#, c-format
+msgid ""
+"CONFLICT (%s/delete): %s deleted in %s and %s to %s in %s. Version %s of %s "
+"left in tree."
+msgstr ""
+"KONFLIKT (%s/radera): %s raderad i %s och %s till %s i %s. Versionen %s av "
+"%s lämnad i trädet."
+
+#, c-format
+msgid ""
+"CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s left "
+"in tree at %s."
+msgstr ""
+"KONFLIKT (%s/radera): %s raderad i %s och %s i %s. Versionen %s av %s lämnad "
+"i trädet vid %s."
+
+#, 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 ""
+"KONFLIKT (%s/radera): %s raderad i %s och %s till %s i %s. Versionen %s av "
+"%s lämnad i trädet vid %s."
+
+msgid "rename"
+msgstr "namnbyte"
+
+msgid "renamed"
+msgstr "namnbytt"
+
+#, c-format
+msgid "Refusing to lose dirty file at %s"
+msgstr "Vägrar förlora lortig fil vid \"%s\""
+
+#, 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."
+
+#, 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"
+
+#, 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"
+
+#, 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"
+
+#, c-format
+msgid ""
+"CONFLICT (rename/rename): Rename \"%s\"->\"%s\" in branch \"%s\" rename \"%s"
+"\"->\"%s\" in \"%s\"%s"
+msgstr ""
+"KONFLIKT (namnbyte/namnbyte): Namnbyte \"%s\"->\"%s\" på grenen \"%s\" "
+"namnbyte \"%s\"->\"%s\" i \"%s\"%s"
+
+msgid " (left unresolved)"
+msgstr " (lämnad olöst)"
+
+#, 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"
+
+#, c-format
+msgid ""
+"CONFLICT (directory rename split): Unclear where to place %s because "
+"directory %s was renamed to multiple other directories, with no destination "
+"getting a majority of the files."
+msgstr ""
+"KONFLIKT (namnändrad delad katalog): Osäker på var %s ska placeras då "
+"katalogen %s bytte namn till flera andra kataloger, utan att någon "
+"destination fick en majoritet av filerna."
+
+#, c-format
+msgid ""
+"CONFLICT (rename/rename): Rename directory %s->%s in %s. Rename directory %s-"
+">%s in %s"
+msgstr ""
+"KONFLIKT (namnbyte/namnbyte): Namnbytt katalog %s->%s i %s. Namnbytt katalog "
+"%s->%s i %s"
+
+msgid "modify"
+msgstr "ändra"
+
+msgid "modified"
+msgstr "ändrad"
+
+#, c-format
+msgid "Skipped %s (merged same as existing)"
+msgstr "Hoppade över %s (sammanslagen samma som befintlig)"
+
+#, c-format
+msgid "Adding as %s instead"
+msgstr "Lägger till som %s istället"
+
+#, c-format
+msgid "Removing %s"
+msgstr "Tar bort %s"
+
+msgid "file/directory"
+msgstr "fil/katalog"
+
+msgid "directory/file"
+msgstr "katalog/fil"
+
+#, 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"
+
+#, c-format
+msgid "Adding %s"
+msgstr "Lägger till %s"
+
+#, c-format
+msgid "CONFLICT (add/add): Merge conflict in %s"
+msgstr "KONFLIKT (tillägg/tillägg): Sammanslagningskonflikt i %s"
+
+#, c-format
+msgid "merging of trees %s and %s failed"
+msgstr "sammanslagning av träden %s och %s misslyckades"
+
+msgid "Merging:"
+msgstr "Slår ihop:"
+
+#, 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:"
+
+msgid "merge returned no commit"
+msgstr "sammanslagningen returnerade ingen incheckning"
+
+#, c-format
+msgid "Could not parse object '%s'"
+msgstr "Kunde inte tolka objektet \"%s\""
+
+msgid "failed to read the cache"
+msgstr "misslyckades läsa cachen"
+
+msgid "multi-pack-index OID fanout is of the wrong size"
+msgstr "multi-pack-indexets OID-utbredning har fel storlek"
+
+#, c-format
+msgid "multi-pack-index file %s is too small"
+msgstr "multi-pack-indexfilen %s är för liten"
+
+#, 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"
+
+#, c-format
+msgid "multi-pack-index version %d not recognized"
+msgstr "multi-pack-indexversionen %d stöds inte"
+
+#, 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"
+
+msgid "multi-pack-index missing required pack-name chunk"
+msgstr "multi-pack-index saknar krävd paketnamn-stycke"
+
+msgid "multi-pack-index missing required OID fanout chunk"
+msgstr "multi-pack-index saknar krävt OID-utbredningsstycke"
+
+msgid "multi-pack-index missing required OID lookup chunk"
+msgstr "multi-pack-index saknar krävt OID-uppslagnignsstycke"
+
+msgid "multi-pack-index missing required object offsets chunk"
+msgstr "multi-pack-index saknar krävt objekt-offsetstycke"
+
+#, 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\""
+
+#, c-format
+msgid "bad pack-int-id: %u (%u total packs)"
+msgstr "bad pack-int-id: %u (%u paket totalt)"
+
+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"
+
+#, c-format
+msgid "failed to add packfile '%s'"
+msgstr "misslyckades läsa paketfilen \"%s\""
+
+#, c-format
+msgid "failed to open pack-index '%s'"
+msgstr "misslyckades öppna paketindexet \"%s\""
+
+#, c-format
+msgid "failed to locate object %d in packfile"
+msgstr "misslyckades hitta objekt %d i paketfilen"
+
+msgid "cannot store reverse index file"
+msgstr "kan inte spara reverse-index-fil"
+
+#, c-format
+msgid "could not parse line: %s"
+msgstr "kunde inte tolka rad: %s"
+
+#, c-format
+msgid "malformed line: %s"
+msgstr "felaktig rad: %s"
+
+msgid "ignoring existing multi-pack-index; checksum mismatch"
+msgstr "ignorerar befintlig multi-pack-index; felaktig kontrollsumma"
+
+msgid "could not load pack"
+msgstr "kunde inte läsa paket{"
+
+#, c-format
+msgid "could not open index for %s"
+msgstr "kunde inte öppna indexet för %s"
+
+msgid "Adding packfiles to multi-pack-index"
+msgstr "Lägger till paketfiler till multi-pack-index"
+
+#, c-format
+msgid "unknown preferred pack: '%s'"
+msgstr "okänt föredraget paket: %s"
+
+#, 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"
+
+#, c-format
+msgid "did not see pack-file %s to drop"
+msgstr "såg inte paketfilen %s som skulle kastas"
+
+#, c-format
+msgid "preferred pack '%s' is expired"
+msgstr "föredraget paket \"%s\" har löpt ut"
+
+msgid "no pack files to index."
+msgstr "inga paketfiler att indexera."
+
+msgid "refusing to write multi-pack .bitmap without any objects"
+msgstr "kunde inte skriva fler-paketsbitkarta utan några objekt"
+
+msgid "could not write multi-pack bitmap"
+msgstr "kunde inte skriva fler-paketsbitkarta"
+
+msgid "could not write multi-pack-index"
+msgstr "kunde inte skriva flerpakets-index"
+
+#, c-format
+msgid "failed to clear multi-pack-index at %s"
+msgstr "misslyckades städa multi-pack-index på %s"
+
+msgid "multi-pack-index file exists, but failed to parse"
+msgstr "multi-pack-indexfilen finns, men kunde inte tolkas"
+
+msgid "incorrect checksum"
+msgstr "felaktig kontrollsumma"
+
+msgid "Looking for referenced packfiles"
+msgstr "Ser efter refererade packfiler"
+
+#, 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]"
+
+msgid "the midx contains no oid"
+msgstr "midx saknar oid"
+
+msgid "Verifying OID order in multi-pack-index"
+msgstr "Bekräftar OID-ordning i multi-pack-index"
+
+#, 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]"
+
+msgid "Sorting objects by packfile"
+msgstr "Sorterar objekt efter packfil"
+
+msgid "Verifying object offsets"
+msgstr "Bekräftar offset för objekt"
+
+#, c-format
+msgid "failed to load pack entry for oid[%d] = %s"
+msgstr "misslyckades läsa paketpost för oid[%d] = %s"
+
+#, c-format
+msgid "failed to load pack-index for packfile %s"
+msgstr "misslyckades läsa paketindex för paketfil %s"
+
+#, c-format
+msgid "incorrect object offset for oid[%d] = %s: %<PRIx64> != %<PRIx64>"
+msgstr "felaktigt objekt-offset för oid[%d] = %s: %<PRIx64> != %<PRIx64>"
+
+msgid "Counting referenced objects"
+msgstr "Räknar refererade objekt"
+
+msgid "Finding and deleting unreferenced packfiles"
+msgstr "Ser efter och tar bort orefererade packfiler"
+
+msgid "could not start pack-objects"
+msgstr "kunde inte starta pack-objects"
+
+msgid "could not finish pack-objects"
+msgstr "kunde inte avsluta pack-objects"
+
+#, c-format
+msgid "unable to create lazy_dir thread: %s"
+msgstr "misslyckades skapa lazy_dir-tråd: %s"
+
+#, c-format
+msgid "unable to create lazy_name thread: %s"
+msgstr "misslyckades skapa lazy_name-tråd: %s"
+
+#, c-format
+msgid "unable to join lazy_name thread: %s"
+msgstr "misslyckades utföra join på lazy_name-tråd: %s"
+
+#, 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."
+msgstr ""
+"Du har inte avslutat föregående antecknings-sammanslagning (%s finns).\n"
+"Använd \"git notes merge --commit\" eller \"git notes merge --abort\" för "
+"att checka in eller avbryta föregående sammanslagning innan du påbörjar en "
+"ny antecknings-sammanslagning."
+
+#, c-format
+msgid "You have not concluded your notes merge (%s exists)."
+msgstr "Du har inte avslutat antecknings-sammanslagningen (%s finns)."
+
+msgid "Cannot commit uninitialized/unreferenced notes tree"
+msgstr "Kan inte checka in oinitierat/orefererat anteckningsträd"
+
+#, c-format
+msgid "Bad notes.rewriteMode value: '%s'"
+msgstr "Felaktigt värde för notes.rewriteMode: '%s'"
+
+#, c-format
+msgid "Refusing to rewrite notes in %s (outside of refs/notes/)"
+msgstr "Vägrar skriva över anteckningar i %s (utanför refs/notes/)"
+
+#. TRANSLATORS: The first %s is the name of
+#. the environment variable, the second %s is
+#. its value.
+#.
+#, c-format
+msgid "Bad %s value: '%s'"
+msgstr "Felaktigt värde på %s: \"%s\""
+
+#, c-format
+msgid "object directory %s does not exist; check .git/objects/info/alternates"
+msgstr "objektkatalogen %s finns inte; se .git/objects/info/alternates"
+
+#, c-format
+msgid "unable to normalize alternate object path: %s"
+msgstr "kunde inte normalisera supplerande objektsökväg: %s"
+
+#, c-format
+msgid "%s: ignoring alternate object stores, nesting too deep"
+msgstr "%s: ignorerar supplerande objektlager, för djup nästling"
+
+#, c-format
+msgid "unable to normalize object directory: %s"
+msgstr "kan inte normalisera objektkatalogen: %s"
+
+msgid "unable to fdopen alternates lockfile"
+msgstr "kan inte utföra \"fdopen\" på suppleantlåsfil"
+
+msgid "unable to read alternates file"
+msgstr "kan inte läsa \"alternates\"-filen"
+
+msgid "unable to move new alternates file into place"
+msgstr "kan inte flytta ny \"alternates\"-fil på plats"
+
+#, c-format
+msgid "path '%s' does not exist"
+msgstr "sökvägen \"%s\" finns inte"
+
+#, 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."
+
+#, c-format
+msgid "reference repository '%s' is not a local repository."
+msgstr "referensarkivet \"%s\" är inte ett lokalt arkiv."
+
+#, c-format
+msgid "reference repository '%s' is shallow"
+msgstr "referensarkivet \"%s\" är grunt"
+
+#, c-format
+msgid "reference repository '%s' is grafted"
+msgstr "referensarkivet \"%s\" är ympat"
+
+#, c-format
+msgid "could not find object directory matching %s"
+msgstr "kunde inte hitta objektkatalog för %s"
+
+#, c-format
+msgid "invalid line while parsing alternate refs: %s"
+msgstr "felaktig rad vid tolkning av supplerande referenser: %s"
+
+#, c-format
+msgid "attempting to mmap %<PRIuMAX> over limit %<PRIuMAX>"
+msgstr "försök att utföra \"mmap\" på %<PRIuMAX> över gränsen %<PRIuMAX>"
+
+#, c-format
+msgid "mmap failed%s"
+msgstr "mmap misslyckades%s"
+
+#, c-format
+msgid "object file %s is empty"
+msgstr "objektfilen %s är tom"
+
+#, c-format
+msgid "corrupt loose object '%s'"
+msgstr "trasigt löst objekt \"%s\""
+
+#, c-format
+msgid "garbage at end of loose object '%s'"
+msgstr "skräp i slutet av löst objekt \"%s\""
+
+#, c-format
+msgid "unable to parse %s header"
+msgstr "kan inte tolka %s-huvud"
+
+msgid "invalid object type"
+msgstr "felaktig objekttyp"
+
+#, c-format
+msgid "unable to unpack %s header"
+msgstr "kan inte packa upp %s-huvudet"
+
+#, 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"
+
+#, c-format
+msgid "failed to read object %s"
+msgstr "misslyckades läsa objektet %s"
+
+#, c-format
+msgid "replacement %s not found for %s"
+msgstr "ersättningen %s hittades inte för %s"
+
+#, c-format
+msgid "loose object %s (stored in %s) is corrupt"
+msgstr "löst objekt %s (lagrat i %s) är trasigt"
+
+#, c-format
+msgid "packed object %s (stored in %s) is corrupt"
+msgstr "packat objekt %s (lagrat i %s) är trasigt"
+
+#, c-format
+msgid "unable to write file %s"
+msgstr "kunde inte skriva filen %s"
+
+#, c-format
+msgid "unable to set permission to '%s'"
+msgstr "kan inte sätta behörigheten till \"%s\""
+
+msgid "file write error"
+msgstr "fel vid skrivning av fil"
+
+msgid "error when closing loose object file"
+msgstr "fel vid stängning av fil för löst objekt"
+
+#, 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"
+
+msgid "unable to create temporary file"
+msgstr "kan inte skapa temporär fil"
+
+msgid "unable to write loose object file"
+msgstr "kunde inte skriva fil för löst objekt"
+
+#, c-format
+msgid "unable to deflate new object %s (%d)"
+msgstr "kan inte utföra \"deflate\" på nytt objekt %s (%d)"
+
+#, c-format
+msgid "deflateEnd on object %s failed (%d)"
+msgstr "\"deflateend\" på objektet %s misslyckades (%d)"
+
+#, c-format
+msgid "confused by unstable object source data for %s"
+msgstr "förvirrad av instabil objektkälldata för %s"
+
+#, c-format
+msgid "cannot read object for %s"
+msgstr "kan inte läsa objekt för %s"
+
+msgid "corrupt commit"
+msgstr "trasik incheckning"
+
+msgid "corrupt tag"
+msgstr "trasig tagg"
+
+#, c-format
+msgid "read error while indexing %s"
+msgstr "läsfel vid indexering av %s"
+
+#, c-format
+msgid "short read while indexing %s"
+msgstr "för lite lästes vid indexering av %s"
+
+#, c-format
+msgid "%s: failed to insert into database"
+msgstr "%s: misslyckades lägga in i databasen"
+
+#, c-format
+msgid "%s: unsupported file type"
+msgstr "%s: filtypen stöds ej"
+
+#, c-format
+msgid "%s is not a valid '%s' object"
+msgstr "%s är inte ett giltigt \"%s\"-objekt"
+
+#, c-format
+msgid "unable to open %s"
+msgstr "kan inte öppna %s"
+
+#, c-format
+msgid "hash mismatch for %s (expected %s)"
+msgstr "hash stämmer inte för %s (förväntade %s)"
+
+#, c-format
+msgid "unable to mmap %s"
+msgstr "kan inte utföra \"mmap\" för %s"
+
+#, c-format
+msgid "unable to unpack header of %s"
+msgstr "kan inte packa upp huvud för %s"
+
+#, c-format
+msgid "unable to parse header of %s"
+msgstr "kan inte tolka huvud för %s"
+
+#, c-format
+msgid "unable to unpack contents of %s"
+msgstr "kan inte tolka innehåll i %s"
+
+#. TRANSLATORS: This is a line of ambiguous object
+#. output shown when we cannot look up or parse the
+#. object in question. E.g. "deadbeef [bad object]".
+#.
+#, c-format
+msgid "%s [bad object]"
+msgstr "%s [felaktig objekt]."
+
+#. TRANSLATORS: This is a line of ambiguous commit
+#. object output. E.g.:
+#. *
+#.    "deadbeef commit 2021-01-01 - Some Commit Message"
+#.
+#, c-format
+msgid "%s commit %s - %s"
+msgstr "%s incheckning %s - %s"
+
+#. TRANSLATORS: This is a line of ambiguous
+#. tag object output. E.g.:
+#. *
+#.    "deadbeef tag 2022-01-01 - Some Tag Message"
+#. *
+#. The second argument is the YYYY-MM-DD found
+#. in the tag.
+#. *
+#. The third argument is the "tag" string
+#. from object.c.
+#.
+#, c-format
+msgid "%s tag %s - %s"
+msgstr "%s tagg %s - %s"
+
+#. TRANSLATORS: This is a line of ambiguous
+#. tag object output where we couldn't parse
+#. the tag itself. E.g.:
+#. *
+#.    "deadbeef [bad tag, could not parse it]"
+#.
+#, c-format
+msgid "%s [bad tag, could not parse it]"
+msgstr "%s [felaktig tagg, kunde inte tolka]"
+
+#. TRANSLATORS: This is a line of ambiguous <type>
+#. object output. E.g. "deadbeef tree".
+#.
+#, c-format
+msgid "%s tree"
+msgstr "%s-träd"
+
+#. TRANSLATORS: This is a line of ambiguous <type>
+#. object output. E.g. "deadbeef blob".
+#.
+#, c-format
+msgid "%s blob"
+msgstr "%s blob"
+
+#, c-format
+msgid "short object ID %s is ambiguous"
+msgstr "kort objekt-ID %s är tvetydigt"
+
+#. TRANSLATORS: The argument is the list of ambiguous
+#. objects composed in show_ambiguous_object(). See
+#. its "TRANSLATORS" comments for details.
+#.
+#, c-format
+msgid ""
+"The candidates are:\n"
+"%s"
+msgstr ""
+"Kandidaterna är:\n"
+"%s"
+
+msgid ""
+"Git normally never creates a ref that ends with 40 hex characters\n"
+"because it will be ignored when you just specify 40-hex. These refs\n"
+"may be created by mistake. For example,\n"
 "\n"
-"    For additional information, run 'git send-email --help'.\n"
-"    To retain the current behavior, but squelch this message,\n"
-"    run 'git config --global sendemail.confirm auto'.\n"
+"  git switch -c $br $(git rev-parse ...)\n"
 "\n"
+"where \"$br\" is somehow empty and a 40-hex ref is created. Please\n"
+"examine these refs and maybe delete them. Turn this message off by\n"
+"running \"git config advice.objectNameWarning false\""
 msgstr ""
-"    Kopielistan ovan har utökats av ytterligare adresser\n"
-"    funna i patchens incheckningsmeddelande. Send-email\n"
-"    frågar som standard innan sändning när detta sker.\n"
-"    Beteendet styrs av konfigurationsinställningen\n"
-"    sendemail.confirm\n"
+"Git skapar normalt aldrig referenser som slutar med 40 hexadecimala\n"
+"tecken, då detta ignoreras när du anger 40-hex enbart. Dessa\n"
+"referenser kan skapas av misstag. Till exempel, för\n"
 "\n"
-"    För ytterligare information, kör \"git send-email --help\".\n"
-"    För att behålla nuvarande beteende, men dölja detta\n"
-"    meddelande, kör \"git config --global sendemail.confirm auto\".\n"
+"  git switch -c $br $(git rev-parse ...)\n"
 "\n"
+"där \"$br\" på något sätt blivit tomt och en 40-hex-referens skapats.\n"
+"Undersök referenserna och ta kanske bort dem. Stäng av meddelandet\n"
+"genom att köra \"git config advice.objectNameWarning false\""
 
-#. 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:1580
-msgid "Send this email? ([y]es|[n]o|[e]dit|[q]uit|[a]ll): "
-msgstr "Sända brevet? (y=ja, n=nej, e=redigera, q=avsluta, a=alla): "
+#, c-format
+msgid "log for '%.*s' only goes back to %s"
+msgstr "loggen för \"%.*s\" räcker bara tillbaka till %s"
 
-#: git-send-email.perl:1583
-msgid "Send this email reply required"
-msgstr "Svar krävs på frågan \"Sända brevet?\""
+#, c-format
+msgid "log for '%.*s' only has %d entries"
+msgstr "loggen för \"%.*s\" har bara %d poster"
 
-#: git-send-email.perl:1617
-msgid "The required SMTP server is not properly defined."
-msgstr "Nödvändig SMTP-server har inte angivits korrekt."
+#, c-format
+msgid "path '%s' exists on disk, but not in '%.*s'"
+msgstr "Sökvägen \"%s\" finns på disken, men inte i \"%.*s\""
 
-#: git-send-email.perl:1664
-#, perl-format
-msgid "Server does not support STARTTLS! %s"
-msgstr "Servern stöder inte SMARTTLS! %s"
+#, c-format
+msgid ""
+"path '%s' exists, but not '%s'\n"
+"hint: Did you mean '%.*s:%s' aka '%.*s:./%s'?"
+msgstr ""
+"sökvägen \"%s\" finns, men inte i \"%s\"\n"
+"tips: Menade du \"%.*s:%s\", även känd som \"%.*s:./%s\"?"
 
-#: git-send-email.perl:1669 git-send-email.perl:1673
-#, perl-format
-msgid "STARTTLS failed! %s"
-msgstr "STARTTLS misslyckades! %s"
+#, c-format
+msgid "path '%s' does not exist in '%.*s'"
+msgstr "sökvägen \"%s\" finns inte i \"%.*s\""
 
-#: git-send-email.perl:1682
-msgid "Unable to initialize SMTP properly. Check config and use --smtp-debug."
+#, c-format
+msgid ""
+"path '%s' is in the index, but not at stage %d\n"
+"hint: Did you mean ':%d:%s'?"
 msgstr ""
-"Kan inte initiera SMTP korrekt. Kontrollera inställningarna och använd --"
-"smtp-debug."
+"sökvägen \"%s\" finns i indexet men inte i etapp %d\n"
+"tips: Menade du \":%d:%s\"?"
 
-#: git-send-email.perl:1700
-#, perl-format
-msgid "Failed to send %s\n"
-msgstr "Misslyckades sända %s\n"
+#, c-format
+msgid ""
+"path '%s' is in the index, but not '%s'\n"
+"hint: Did you mean ':%d:%s' aka ':%d:./%s'?"
+msgstr ""
+"sökvägen \"%s\" finns i indexet, men inte i \"%s\"\n"
+"tips: Menade du \":%d:%s\", även känd som \":%d:./%s\"?"
 
-#: git-send-email.perl:1703
-#, perl-format
-msgid "Dry-Sent %s\n"
-msgstr "Test-Sände %s\n"
+#, c-format
+msgid "path '%s' exists on disk, but not in the index"
+msgstr "sökvägen \"%s\" finns på disk, men inte i indexet"
 
-#: git-send-email.perl:1703
-#, perl-format
-msgid "Sent %s\n"
-msgstr "Sände %s\n"
+#, c-format
+msgid "path '%s' does not exist (neither on disk nor in the index)"
+msgstr "sökvägen \"%s\" finns inte (varken i disken eller i indexet)"
 
-#: git-send-email.perl:1705
-msgid "Dry-OK. Log says:\n"
-msgstr "Test-OK. Loggen säger:\n"
+msgid "relative path syntax can't be used outside working tree"
+msgstr "relativ sökväg kan inte användas utanför arbetskatalogen"
 
-#: git-send-email.perl:1705
-msgid "OK. Log says:\n"
-msgstr "OK. Loggen säger:\n"
+#, c-format
+msgid "<object>:<path> required, only <object> '%s' given"
+msgstr "<objekt>:<sökväg> krävs, endast <objekt> \"%s\" har angivits"
 
-#: git-send-email.perl:1724
-msgid "Result: "
-msgstr "Resultat: "
+#, c-format
+msgid "invalid object name '%.*s'."
+msgstr "felaktigt objektnamn \"%.*s\"."
 
-#: git-send-email.perl:1727
-msgid "Result: OK\n"
-msgstr "Resultat: OK\n"
+#, c-format
+msgid "invalid object type \"%s\""
+msgstr "ogiltig objekttyp \"%s\""
 
-#: git-send-email.perl:1744
-#, perl-format
-msgid "can't open file %s"
-msgstr "kan inte öppna filen %s"
+#, c-format
+msgid "object %s is a %s, not a %s"
+msgstr "objektet %s är en %s, inte en %s"
 
-#: git-send-email.perl:1792 git-send-email.perl:1812
-#, perl-format
-msgid "(mbox) Adding cc: %s from line '%s'\n"
-msgstr "(mbox) Lägger till cc: %s från raden \"%s\"\n"
+#, c-format
+msgid "object %s has unknown type id %d"
+msgstr "objektet %s har okänd typ-id %d"
 
-#: git-send-email.perl:1798
-#, perl-format
-msgid "(mbox) Adding to: %s from line '%s'\n"
-msgstr "(mbox) Lägger till to: %s från raden \"%s\"\n"
+#, c-format
+msgid "unable to parse object: %s"
+msgstr "kunde inte tolka objektet: %s"
 
-#: git-send-email.perl:1855
-#, perl-format
-msgid "(non-mbox) Adding cc: %s from line '%s'\n"
-msgstr "(icke-mbox) Lägger till cc: %s från raden \"%s\"\n"
+#, c-format
+msgid "hash mismatch %s"
+msgstr "hashvärde stämmer inte överens %s"
 
-#: git-send-email.perl:1890
-#, perl-format
-msgid "(body) Adding cc: %s from line '%s'\n"
-msgstr "(kropp) Lägger till cc: %s från raden \"%s\"\n"
+msgid "multi-pack bitmap is missing required reverse index"
+msgstr "flerpaketsbitkarta saknar nödvändigt omvänt index"
 
-#: git-send-email.perl:2009
-#, perl-format
-msgid "(%s) Could not execute '%s'"
-msgstr "(%s) Kunde inte köra \"%s\""
+#, c-format
+msgid "could not open pack %s"
+msgstr "kunde inte öppna paketfilen %s"
 
-#: git-send-email.perl:2016
-#, perl-format
-msgid "(%s) Adding %s: %s from: '%s'\n"
-msgstr "(%s) Lägger till %s: %s från: \"%s\"\n"
+#, c-format
+msgid "preferred pack (%s) is invalid"
+msgstr "föredragen paketfil (%s) är ogiltig"
 
-#: git-send-email.perl:2020
-#, perl-format
-msgid "(%s) failed to close pipe to '%s'"
-msgstr "(%s) misslyckades stänga röret till \"%s\""
+#, c-format
+msgid "could not find %s in pack %s at offset %<PRIuMAX>"
+msgstr "kunde inte hitta %s i paketet %s på offset %<PRIuMAX>"
 
-#: git-send-email.perl:2050
-msgid "cannot send message as 7bit"
-msgstr "kan inte sända brev som sjubitars"
+#, c-format
+msgid "mtimes file %s is too small"
+msgstr "mtimes-filen %s är för liten"
 
-#: git-send-email.perl:2058
-msgid "invalid transfer encoding"
-msgstr "ogiltig överföringskondning"
+#, c-format
+msgid "mtimes file %s has unknown signature"
+msgstr "mtimes-filen %s har okänd signatur"
+
+#, c-format
+msgid "mtimes file %s has unsupported version %<PRIu32>"
+msgstr "mtimes-filen %s har versionen %<PRIu32> som inte stöds"
+
+#, c-format
+msgid "mtimes file %s has unsupported hash id %<PRIu32>"
+msgstr "mtimes-filen %s har hash-ID %<PRIu32> som inte stöds"
+
+#, c-format
+msgid "mtimes file %s is corrupt"
+msgstr "mtimes-filen %s är trasig"
+
+#, c-format
+msgid "reverse-index file %s is too small"
+msgstr "reverse-index-filen %s är för liten"
+
+#, c-format
+msgid "reverse-index file %s is corrupt"
+msgstr "reverse-index-filen %s är trasig"
+
+#, c-format
+msgid "reverse-index file %s has unknown signature"
+msgstr "reverse-index-filen %s har okänd signatur"
+
+#, c-format
+msgid "reverse-index file %s has unsupported version %<PRIu32>"
+msgstr "reverse-index-filen %s har versionen %<PRIu32> som inte stöds"
+
+#, c-format
+msgid "reverse-index file %s has unsupported hash id %<PRIu32>"
+msgstr "reverse-index-filen %s har hash-ID %<PRIu32> som inte stöds"
+
+msgid "cannot both write and verify reverse index"
+msgstr "kan inte både skriva och bekräfta reverse-index"
+
+#, c-format
+msgid "could not stat: %s"
+msgstr "kunde inte ta status: %s"
+
+#, c-format
+msgid "failed to make %s readable"
+msgstr "kunde inte göra %s läsbar"
+
+#, c-format
+msgid "could not write '%s' promisor file"
+msgstr "kunde inte skriva kontraktsfilen \"%s\""
+
+msgid "offset before end of packfile (broken .idx?)"
+msgstr "offset före slutet av packfilen (trasig .idx?)"
+
+#, c-format
+msgid "packfile %s cannot be mapped%s"
+msgstr "paketfilen %s kunde inte kopplas%s"
+
+#, 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?)"
+
+#, c-format
+msgid "offset beyond end of pack index for %s (truncated index?)"
+msgstr "offset borton slutet av packindex för %s (trunkerat index?)"
+
+#, c-format
+msgid "malformed expiration date '%s'"
+msgstr "trasigt utlöpsdatum: \"%s\""
+
+#, c-format
+msgid "option `%s' expects \"always\", \"auto\", or \"never\""
+msgstr ""
+"flaggan \"%s\" antar \"always\" (alltid), \"auto\" eller \"never\" (aldrig)"
+
+#, c-format
+msgid "malformed object name '%s'"
+msgstr "felformat objektnamn \"%s\""
+
+#, c-format
+msgid "option `%s' expects \"%s\" or \"%s\""
+msgstr "flaggan \"%s\" kräver \"%s\" eller \"%s\""
+
+#, c-format
+msgid "%s requires a value"
+msgstr "%s behöver ett värde"
+
+#, c-format
+msgid "%s is incompatible with %s"
+msgstr "%s är inkompatibel med %s"
+
+#, c-format
+msgid "%s : incompatible with something else"
+msgstr "%s: inkompatibelt med något annat"
+
+#, c-format
+msgid "%s takes no value"
+msgstr "%s tar inget värde"
+
+#, c-format
+msgid "%s isn't available"
+msgstr "%s är inte tillgängligt"
+
+#, 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"
+
+#, c-format
+msgid "ambiguous option: %s (could be --%s%s or --%s%s)"
+msgstr "tvetydig flagga: %s (kan vara --%s%s eller --%s%s)"
+
+#, c-format
+msgid "did you mean `--%s` (with two dashes)?"
+msgstr "menade du \"--%s\" (med två bindestreck)?"
+
+#, c-format
+msgid "alias of --%s"
+msgstr "alias för --%s"
+
+#, c-format
+msgid "unknown option `%s'"
+msgstr "okänd flagga \"%s\""
+
+#, c-format
+msgid "unknown switch `%c'"
+msgstr "okänd flagga \"%c\""
+
+#, c-format
+msgid "unknown non-ascii option in string: `%s'"
+msgstr "okänd icke-ascii-flagga i strängen: \"%s\""
+
+msgid "..."
+msgstr "..."
+
+#, c-format
+msgid "usage: %s"
+msgstr "användning: %s"
+
+#. TRANSLATORS: the colon here should align with the
+#. one in "usage: %s" translation.
+#.
+#, c-format
+msgid "   or: %s"
+msgstr "     eller: %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.
+#.
+#, c-format
+msgid "%*s%s"
+msgstr "%*s%s"
+
+#, c-format
+msgid "    %s"
+msgstr "    %s"
+
+msgid "-NUM"
+msgstr "-TAL"
+
+msgid "expiry-date"
+msgstr "giltig-till"
+
+msgid "no-op (backward compatibility)"
+msgstr "ingen funktion (bakåtkompatibilitet)"
+
+msgid "be more verbose"
+msgstr "var mer pratsam"
+
+msgid "be more quiet"
+msgstr "var mer tyst"
+
+msgid "use <n> digits to display object names"
+msgstr "använd <n> siffror för att visa objektnamn"
+
+msgid "how to strip spaces and #comments from message"
+msgstr "hur blanksteg och #kommentarer ska tas bort från meddelande"
+
+msgid "read pathspec from file"
+msgstr "läs sökvägsangivelse från fil"
 
-#: git-send-email.perl:2100
-#, perl-format
 msgid ""
-"fatal: %s: rejected by %s hook\n"
-"%s\n"
-"warning: no patches were sent\n"
+"with --pathspec-from-file, pathspec elements are separated with NUL character"
+msgstr "med --pathspec-from-file, sökvägsangivelser avdelas med NUL-tecken"
+
+#, c-format
+msgid "Could not make %s writable by group"
+msgstr "Kunde inte göra %s skrivbar för gruppen"
+
+msgid "Escape character '\\' not allowed as last character in attr value"
+msgstr "Specialtecknet \"\\\" tillåts inte som sista tecken i attributvärde"
+
+msgid "Only one 'attr:' specification is allowed."
+msgstr "Endast en \"attr:\"-angivelse tillåten."
+
+msgid "attr spec must not be empty"
+msgstr "attr-angivelse kan inte vara tom"
+
+#, c-format
+msgid "invalid attribute name %s"
+msgstr "ogiltigt attributnamn %s"
+
+msgid "global 'glob' and 'noglob' pathspec settings are incompatible"
 msgstr ""
-"ödesdigert: %s: refuserad av kroken %s\n"
-"%s\n"
-"varning: inga patchar har sänts\n"
+"de globala sökvägsinställningarna \"glob\" och \"noglob\" är inkompatibla"
 
-#: git-send-email.perl:2110 git-send-email.perl:2163 git-send-email.perl:2173
-#, perl-format
-msgid "unable to open %s: %s\n"
-msgstr "kunde inte öppna %s: %s\n"
+msgid ""
+"global 'literal' pathspec setting is incompatible with all other global "
+"pathspec settings"
+msgstr ""
+"den globala sökvägsinställningen \"literal\" är inkompatibel med alla andra "
+"globala sökvägsinställningar"
 
-#: git-send-email.perl:2113
-#, perl-format
+msgid "invalid parameter for pathspec magic 'prefix'"
+msgstr "ogiltig parameter för sökvägsuttrycket för \"prefix\""
+
+#, c-format
+msgid "Invalid pathspec magic '%.*s' in '%s'"
+msgstr "Felaktigt sökvägsuttryck \"%.*s\" i \"%s\""
+
+#, c-format
+msgid "Missing ')' at the end of pathspec magic in '%s'"
+msgstr "\")\" saknas i slutet av sökvägsuttrycket för \"%s\""
+
+#, c-format
+msgid "Unimplemented pathspec magic '%c' in '%s'"
+msgstr "Ej implementerat sökvägsuttryckmagi \"%c\" i \"%s\""
+
+#, c-format
+msgid "%s: 'literal' and 'glob' are incompatible"
+msgstr "%s: \"literal\" och \"glob\" är inkompatibla"
+
+#, c-format
+msgid "%s: '%s' is outside repository at '%s'"
+msgstr "%s: \"%s\" är utanför arkivet på \"%s\""
+
+#, c-format
+msgid "'%s' (mnemonic: '%c')"
+msgstr "\"%s\" (minnesstöd: \"%c\")"
+
+#, 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"
+
+#, c-format
+msgid "pathspec '%s' is beyond a symbolic link"
+msgstr "sökvägsangivelsen \"%s\" är på andra sidan av en symbolisk länk"
+
+#, c-format
+msgid "line is badly quoted: %s"
+msgstr "linjen er felaktigt citerad: %s"
+
+msgid "unable to write flush packet"
+msgstr "kan inte skriva flush-paket"
+
+msgid "unable to write delim packet"
+msgstr "kan inte skriva delim-paket"
+
+msgid "unable to write response end packet"
+msgstr "kunde inte skriva svarsavslutningspaket"
+
+msgid "flush packet write failed"
+msgstr "fel vid skrivning av \"flush\"-paket"
+
+msgid "protocol error: impossibly long line"
+msgstr "protokollfel: omöjligt lång rad"
+
+msgid "packet write with format failed"
+msgstr "paketskrivning med format misslyckades"
+
+msgid "packet write failed - data exceeds max packet size"
+msgstr "paketskrivning misslyckades - data överskrider maximal paketstorlek"
+
+#, c-format
+msgid "packet write failed: %s"
+msgstr "paketskrivning misslyckades: %s"
+
+msgid "read error"
+msgstr "läsfel"
+
+msgid "the remote end hung up unexpectedly"
+msgstr "fjärren lade på oväntat"
+
+#, c-format
+msgid "protocol error: bad line length character: %.4s"
+msgstr "protokollfel: felaktig radlängdstecken: %.4s"
+
+#, c-format
+msgid "protocol error: bad line length %d"
+msgstr "protokollfel: felaktig radlängd: %d"
+
+#, c-format
+msgid "remote error: %s"
+msgstr "fjärrfel: %s"
+
+msgid "Refreshing index"
+msgstr "Uppdaterar indexet"
+
+#, c-format
+msgid "unable to create threaded lstat: %s"
+msgstr "kunde inte skapa trådad lstat: %s"
+
+msgid "unable to parse --pretty format"
+msgstr "kunde inte tolka format för --pretty"
+
+msgid "promisor-remote: unable to fork off fetch subprocess"
+msgstr "promisor-remote: kunde inte starta (fork) underprocessen för fetch"
+
+msgid "promisor-remote: could not write to fetch subprocess"
+msgstr "promisor-remote: kunde skriva till underprocessen för fetch"
+
+msgid "promisor-remote: could not close stdin to fetch subprocess"
+msgstr ""
+"promisor-remote: kunde inte stänga standard in för underprocessen för fetch"
+
+#, c-format
+msgid "promisor remote name cannot begin with '/': %s"
+msgstr "kontraktsfjärr kan inte börja med \"/\": %s"
+
+msgid "object-info: expected flush after arguments"
+msgstr "object-info: förväntade \"flush\" efter argument"
+
+msgid "Removing duplicate objects"
+msgstr "Tar bort duplicerade objekt"
+
+msgid "could not start `log`"
+msgstr "kunde inte starta \"log\""
+
+msgid "could not read `log` output"
+msgstr "kunde inte läsa utdata från \"log\""
+
+#, c-format
+msgid "could not parse commit '%s'"
+msgstr "kunde inte tolka incheckningen \"%s\""
+
+#, c-format
 msgid ""
-"fatal: %s:%d is longer than 998 characters\n"
-"warning: no patches were sent\n"
+"could not parse first line of `log` output: did not start with 'commit ': "
+"'%s'"
 msgstr ""
-"ödesdigert: %s:%d är längre än 998 tecken\n"
-"varning: inga patchar har sänts\n"
+"kunde inte tolka första raden i \"log\"-updata: börjar inte med \"commit \": "
+"\"%s\""
 
-#: git-send-email.perl:2131
-#, perl-format
-msgid "Skipping %s with backup suffix '%s'.\n"
+#, c-format
+msgid "could not parse git header '%.*s'"
+msgstr "kunde inte tolka git-huvudet \"%.*s\""
+
+msgid "failed to generate diff"
+msgstr "misslyckades skapa diff"
+
+#, c-format
+msgid "could not parse log for '%s'"
+msgstr "kunde inte tolka loggen för \"%s\""
+
+#, c-format
+msgid "will not add file alias '%s' ('%s' already exists in index)"
+msgstr "lägger inte till filalias \"%s\" (\"%s\" finns redan i indexet)"
+
+msgid "cannot create an empty blob in the object database"
+msgstr "kan inte skapa tom blob i objektdatabasen"
+
+#, c-format
+msgid "%s: can only add regular files, symbolic links or git-directories"
 msgstr ""
-"Hoppar över %s med filnamnstillägget \"%s\" som används för "
-"säkerhetskopior.\n"
+"%s: kan bara lägga till vanliga filer, symboliska länkar och git-kataloger"
 
-#. TRANSLATORS: please keep "[y|N]" as is.
-#: git-send-email.perl:2135
-#, perl-format
-msgid "Do you really want to send %s? [y|N]: "
-msgstr "Vill du verkligen sända %s? [y=ja, n=nej]: "
+#, c-format
+msgid "unable to index file '%s'"
+msgstr "kan inte indexera filen \"%s\""
+
+#, c-format
+msgid "unable to add '%s' to index"
+msgstr "kan inte lägga till \"%s\" till indexet"
+
+#, c-format
+msgid "unable to stat '%s'"
+msgstr "kan inte ta status på \"%s\""
+
+#, c-format
+msgid "'%s' appears as both a file and as a directory"
+msgstr "\"%s\" finns både som en fil och en katalog"
+
+msgid "Refresh index"
+msgstr "Uppdatera indexet"
+
+#, c-format
+msgid ""
+"index.version set, but the value is invalid.\n"
+"Using version %i"
+msgstr ""
+"index.version satt, men värdet är ogiltigt.\n"
+"Använder version %i"
+
+#, c-format
+msgid ""
+"GIT_INDEX_VERSION set, but the value is invalid.\n"
+"Using version %i"
+msgstr ""
+"GIT_INDEX_VERSION satt, men värdet är ogiltigt.\n"
+"Använder version %i"
+
+#, c-format
+msgid "bad signature 0x%08x"
+msgstr "felaktig signatur 0x%08x"
+
+#, c-format
+msgid "bad index version %d"
+msgstr "felaktig indexversion %d"
+
+msgid "bad index file sha1 signature"
+msgstr "felaktig sha1-signatur för indexfil"
+
+#, 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"
+
+#, c-format
+msgid "ignoring %.4s extension"
+msgstr "ignorerar filtillägget %.4s"
+
+#, c-format
+msgid "unknown index entry format 0x%08x"
+msgstr "okänt format 0x%08x på indexpost"
+
+#, c-format
+msgid "malformed name field in the index, near path '%s'"
+msgstr "felformat namnfält i indexet, nära sökvägen \"%s\""
+
+msgid "unordered stage entries in index"
+msgstr "osorterade köposter i index"
+
+#, c-format
+msgid "multiple stage entries for merged file '%s'"
+msgstr "flera köposter för den sammanslagna filen \"%s\""
+
+#, c-format
+msgid "unordered stage entries for '%s'"
+msgstr "osorterade köposter för \"%s\""
+
+#, c-format
+msgid "unable to create load_cache_entries thread: %s"
+msgstr "kunde inte skapa tråd för load_cache_entries: %s"
+
+#, c-format
+msgid "unable to join load_cache_entries thread: %s"
+msgstr "kunde inte ansluta till tråden för load_cache_entries: %s"
+
+#, c-format
+msgid "%s: index file open failed"
+msgstr "%s: öppning av indexfilen misslyckades"
+
+#, c-format
+msgid "%s: cannot stat the open index"
+msgstr "%s: kan inte ta startus på det öppna indexet"
 
-#~ msgid "git archive --list"
-#~ msgstr "git archive --list"
+#, c-format
+msgid "%s: index file smaller than expected"
+msgstr "%s: indexfilen mindre än förväntat"
 
 #, c-format
-#~ msgid "unknown value for --diff-merges: %s"
-#~ msgstr "okänt värde för --diff-merges: %s"
+msgid "%s: unable to map index file%s"
+msgstr "%s: kan inte koppla indexfilen%s"
 
 #, c-format
-#~ msgid "invalid value '%s' for lsrefs.unborn"
-#~ msgstr "ogiltigt värde \"%s\" för lsrefs.unborn"
+msgid "unable to create load_index_extensions thread: %s"
+msgstr "kunde inte skapa load_index_extensions-tråden: %s"
 
-#~ msgid "backend for `git stash -p`"
-#~ msgstr "bakända för \"git stash -p\""
+#, c-format
+msgid "unable to join load_index_extensions thread: %s"
+msgstr "kunde inte utföra join på load_index_extensions-tråden: %s"
 
 #, c-format
-#~ msgid "Invalid value for --empty: %s"
-#~ msgstr "Felaktigt värde för --empty: %s"
+msgid "could not freshen shared index '%s'"
+msgstr "kunde inte uppdatera delat index \"%s\""
 
 #, c-format
-#~ msgid "Invalid value for --patch-format: %s"
-#~ msgstr "Felaktigt värde för --patch-format: %s"
+msgid "broken index, expect %s in %s, got %s"
+msgstr "trasigt index, förväntade %s i %s, fick %s"
+
+msgid "cannot write split index for a sparse index"
+msgstr "kan inte skriva delat index för ett glest index"
+
+msgid "failed to convert to a sparse-index"
+msgstr "misslyckades omvandla till glest index"
 
 #, c-format
-#~ msgid "Invalid value for --show-current-patch: %s"
-#~ msgstr "Felaktigt värde för --show-current-patch: %s"
+msgid "could not stat '%s'"
+msgstr "kunde inte ta status på \"%s\""
 
-#~ msgid ""
-#~ "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-new]"
+#, c-format
+msgid "unable to open git dir: %s"
+msgstr "kunde inte öppna git-katalog: %s"
 
-#~ msgid "git bisect--helper --bisect-next"
-#~ msgstr "git bisect--helper --bisect-next"
+#, c-format
+msgid "unable to unlink: %s"
+msgstr "misslyckades ta bort länken: %s"
 
-#~ msgid "git bisect--helper --bisect-visualize"
-#~ msgstr "git bisect--helper --bisect-visualize"
+#, c-format
+msgid "cannot fix permission bits on '%s'"
+msgstr "kan inte rätta behörighetsbitar på \"%s\""
 
 #, c-format
-#~ msgid "invalid color '%s' in color.blame.repeatedLines"
-#~ msgstr "felaktig färg \"%s\" i color.blame.repeatedLines"
+msgid "%s: cannot drop to stage #0"
+msgstr "%s: kan inte återgå till kö 0"
 
-#~ msgid "invalid value for blame.coloring"
-#~ msgstr "ogiltigt värde för blame.coloring"
+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 ""
+"Du kan rätta detta med \"git rebase --edit-todo\" följt av \"git rebase --"
+"continue\".\n"
+"Avbryt ombaseringen med \"git rebase --abort\".\n"
 
-#~ 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 | <typ> | --textconv | --filters) [--path=<sökväg>] <objekt>"
+#, c-format
+msgid ""
+"unrecognized setting %s for option rebase.missingCommitsCheck. Ignoring."
+msgstr ""
+"okänd inställning %s för flaggan rebase.missingCommitsCheck. Ignorerar."
 
-#~ msgid "show object type"
-#~ msgstr "visa objekttyp"
+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 [-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"
+"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 [-C | -c] <incheckning> = som \"squash\" men behåll bara "
+"loggmeddelandet\n"
+"                   från föregående incheckning, såvida inte -C används, då "
+"används\n"
+"                   istället bara den här incheckningens meddelande; -c är "
+"samma\n"
+"                   som -C, men öppnar redigeringsprogrammet\n"
+"f, fixup <incheckning> = som \"squash\", men förkasta "
+"incheckningsmeddelandet\n"
+"x, exec <kommando> = kör kommando (resten av raden) i skalet\n"
+"b, break = stoppa här (fortsätt ombaseringen senare med \"git rebase --"
+"continue\")\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"
+".       -c <incheckning> för att skriva om meddelandet.\n"
+"\n"
+"Du kan byta ordning på raderna; de utförs uppifrån och ned.\n"
 
-#~ msgid "exit with zero when there's no error"
-#~ msgstr "avsluta med noll när det inte uppstått något fel"
+#, c-format
+msgid "Rebase %s onto %s (%d command)"
+msgid_plural "Rebase %s onto %s (%d commands)"
+msgstr[0] "Ombasera %s på %s (%d kommando)"
+msgstr[1] "Ombasera %s på %s (%d kommandon)"
 
-#~ 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"
+msgid ""
+"\n"
+"Do not remove any line. Use 'drop' explicitly to remove a commit.\n"
+msgstr ""
+"\n"
+"Ta inte bort rader. Använd \"drop\" för att specifikt förkasta en "
+"incheckning.\n"
 
-#~ msgid "show info about objects fed from the standard input"
-#~ msgstr "visa information för objekt som listas på standard in"
+msgid ""
+"\n"
+"If you remove a line here THAT COMMIT WILL BE LOST.\n"
+msgstr ""
+"\n"
+"Om du tar bort en rad KOMMER DEN INCHECKNINGEN ATT FÖRLORAS.\n"
 
-#~ 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)"
+msgid ""
+"\n"
+"You are editing the todo file of an ongoing interactive rebase.\n"
+"To continue rebase after editing, run:\n"
+"    git rebase --continue\n"
+"\n"
+msgstr ""
+"\n"
+"Du redigerar \"todo\"-filen för en pågående interaktiv ombasering.\n"
+"För att forsätta ombasera efter redigeringen, kör:\n"
+"    git rebase --continue\n"
+"\n"
 
-#~ msgid "show all objects with --batch or --batch-check"
-#~ msgstr "visa alla objekt med --batch eller --batch-check"
+msgid ""
+"\n"
+"However, if you remove everything, the rebase will be aborted.\n"
+"\n"
+msgstr ""
+"\n"
+"Ombaseringen kommer dock att avbrytas om du tar bort allting.\n"
+"\n"
 
-#~ msgid "do not order --batch-all-objects output"
-#~ msgstr "ordna inte --batch-all-objects output"
+#, c-format
+msgid "could not write '%s'."
+msgstr "kunde inte skriva \"%s\"."
 
-#~ msgid "set up tracking mode (see git-pull(1))"
-#~ msgstr "ställ in spårningsläge (se git-pull(1))"
+#, c-format
+msgid ""
+"Warning: some commits may have been dropped accidentally.\n"
+"Dropped commits (newer to older):\n"
+msgstr ""
+"Varning: vissa incheckningar kan av misstag ha tappats.\n"
+"Tappade incheckningar (nyaste först):\n"
 
-#~ msgid "Using both --reset-author and --author does not make sense"
-#~ msgstr "Kan inte använda både --reset-author och --author"
+#, c-format
+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"
+"The possible behaviours are: ignore, warn, error.\n"
+"\n"
+msgstr ""
+"För att undvika det här meddelandet kan du använda \"drop\" för att "
+"explicit\n"
+"kasta en incheckning.\n"
+"\n"
+"Använd \"git config rebase.missingCommitsCheck\" för att ändra "
+"varningsnivån.\n"
+"Möjliga bettenden är: \"ignore\" (ignorera), \"warn\" (varna), \"error"
+"\" (fel).\n"
+"\n"
 
-#~ msgid "Options --squash and --fixup cannot be used together"
-#~ msgstr "Flaggorna --squash och --fixup kan inte användas samtidigt"
+#, c-format
+msgid "%s: 'preserve' superseded by 'merges'"
+msgstr "%s: \"preserve\" har ersatts av \"merges\""
 
-#~ msgid "Only one of -c/-C/-F/--fixup can be used."
-#~ msgstr "Endast en av -c/-C/-F/--fixup kan användas."
+msgid "gone"
+msgstr "försvunnen"
 
-#~ msgid "Option -m cannot be combined with -c/-C/-F."
-#~ msgstr "Flaggan -m kan inte kombineras med -c/-C/-F."
+#, c-format
+msgid "ahead %d"
+msgstr "före %d"
 
-#~ msgid ""
-#~ "Only one of --include/--only/--all/--interactive/--patch can be used."
-#~ msgstr ""
-#~ "Endast en av --include/--only/--all/--interactive/--patch kan användas."
+#, c-format
+msgid "behind %d"
+msgstr "bakom %d"
 
-#~ msgid "git count-objects [-v] [-H | --human-readable]"
-#~ msgstr "git count-objects [-v] [-H | --human-readable]"
+#, c-format
+msgid "ahead %d, behind %d"
+msgstr "före %d, bakom %d"
 
 #, c-format
-#~ msgid "configuration fetch.output contains invalid value %s"
-#~ msgstr "konfigurationen för fetch.output innehåller ogiltigt värde %s"
+msgid "expected format: %%(color:<color>)"
+msgstr "förväntat format: %%(color:<color>)"
 
-#~ msgid "--cached or --untracked cannot be used with --no-index"
-#~ msgstr "--cached och --untracked kan inte användas med --no-index"
+#, c-format
+msgid "unrecognized color: %%(color:%s)"
+msgstr "okänd färg: %%(color:%s)"
 
-#~ msgid "--untracked cannot be used with --cached"
-#~ msgstr "--untracked kan inte användas med --cached"
+#, c-format
+msgid "Integer value expected refname:lstrip=%s"
+msgstr "Heltalsvärde förväntades refname:lstrip=%s"
 
-#~ msgid "git hash-object  --stdin-paths"
-#~ msgstr "git hash-object  --stdin-paths"
+#, c-format
+msgid "Integer value expected refname:rstrip=%s"
+msgstr "Heltalsvärde förväntades refname:rstrip=%s"
 
-#~ msgid "git help [-g|--guides]"
-#~ msgstr "git help [-g|--guides]"
+#, c-format
+msgid "unrecognized %%(%s) argument: %s"
+msgstr "okänt %%(%s)-argument: %s"
 
-#~ msgid "git help [-c|--config]"
-#~ msgstr "git help [-c|--config]"
+#, c-format
+msgid "%%(objecttype) does not take arguments"
+msgstr "%%(objecttype) tar inte argument"
 
-#~ msgid "git mktag"
-#~ msgstr "git mktag"
+#, c-format
+msgid "%%(deltabase) does not take arguments"
+msgstr "%%(deltabase) tar inte argument"
 
-#~ msgid "git mktree [-z] [--missing] [--batch]"
-#~ msgstr "git mktree [-z] [--missing] [--batch]"
+#, c-format
+msgid "%%(body) does not take arguments"
+msgstr "%%(body) tar inte argument"
 
-#~ msgid "read from stdin"
-#~ msgstr "läs från standard in"
+#, c-format
+msgid "expected %%(trailers:key=<value>)"
+msgstr "förväntade %%(trailers:key=<värde>)"
 
-#~ msgid "git notes merge --commit [-v | -q]"
-#~ msgstr "git notes merge --commit [-v | -q]"
+#, c-format
+msgid "unknown %%(trailers) argument: %s"
+msgstr "okänt %%(trailers)-argument: %s"
 
-#~ msgid "git notes merge --abort [-v | -q]"
-#~ msgstr "git notes merge --abort [-v | -q]"
+#, c-format
+msgid "positive value expected contents:lines=%s"
+msgstr "positivt värde förväntat contents:lines=%s"
 
-#~ msgid "git notes get-ref"
-#~ msgstr "git notes get-ref"
+#, c-format
+msgid "positive value expected '%s' in %%(%s)"
+msgstr "positivt värde förväntat \"%s\" i %%(%s)"
 
-#~ msgid "invalid value for --missing"
-#~ msgstr "ogiltigt värde för --missing"
+#, c-format
+msgid "unrecognized email option: %s"
+msgstr "okänd e-postalternativ: %s"
 
-#~ msgid "git prune-packed [-n | --dry-run] [-q | --quiet]"
-#~ msgstr "git prune-packed [-n | --dry-run] [-q | --quiet]"
+#, c-format
+msgid "expected format: %%(align:<width>,<position>)"
+msgstr "förväntat format: %%(align:<bredd>,<position>)"
 
 #, c-format
-#~ msgid "Invalid value for %s: %s"
-#~ msgstr "Felaktigt värde för %s: %s"
+msgid "unrecognized position:%s"
+msgstr "okänd position:%s"
 
 #, c-format
-#~ msgid "Invalid value for pull.ff: %s"
-#~ msgstr "Felaktigt värde för pull.ff: %s"
+msgid "unrecognized width:%s"
+msgstr "okänd bredd:%s"
 
-#~ msgid "git rebase --continue | --abort | --skip | --edit-todo"
-#~ msgstr "git rebase --continue | --abort | --skip | --edit-todo"
+#, c-format
+msgid "positive width expected with the %%(align) atom"
+msgstr "positiv bredd förväntad med atomen %%(align)"
 
 #, c-format
-#~ msgid "'%s' is not a valid timestamp"
-#~ msgstr "\"%s\" är inte en giltig tidsstämpel"
+msgid "%%(rest) does not take arguments"
+msgstr "%%(rest) tar inte argument"
 
-#~ msgid "git reflog [ show | expire | delete | exists ]"
-#~ msgstr "git reflog [ show | expire | delete | exists ]"
+#, c-format
+msgid "malformed field name: %.*s"
+msgstr "felformat fältnamn: %.*s"
 
-#~ msgid "git remote [-v | --verbose]"
-#~ msgstr "git remote [-v | --verbose]"
+#, c-format
+msgid "unknown field name: %.*s"
+msgstr "okänt fältnamn: %.*s"
 
-#~ msgid "git replace [-f] --convert-graft-file"
-#~ msgstr "git replace [-f] --convert-graft-file"
+#, 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"
 
 #, c-format
-#~ msgid ""
-#~ "\n"
-#~ "It 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"
-#~ msgstr ""
-#~ "\n"
-#~ "Det tog %.2f sekunder att räkna upp oköade ändringar efter "
-#~ "återställning.\n"
-#~ "Du kan använda \"--quiet\" för att förhindra detta. Ställ "
-#~ "konfigurationsvariabeln\n"
-#~ "reset.quiet till true för att göra detta till förval.\n"
+msgid "format: %%(%s) atom used without a %%(%s) atom"
+msgstr "format: atomen %%(%s) använd utan en %%(%s)-atom"
 
-#~ msgid "git sparse-checkout list"
-#~ msgstr "git sparse-checkout list"
+#, c-format
+msgid "format: %%(then) atom used more than once"
+msgstr "format: atomen %%(then) använd mer än en gång"
 
-#~ msgid "unable to upgrade repository format to enable worktreeConfig"
-#~ msgstr "kunde inte uppgradera arkivformat för att aktivera worktreeConfig"
+#, c-format
+msgid "format: %%(then) atom used after %%(else)"
+msgstr "format: atomen %%(then) använd efter %%(else)"
 
-#~ msgid "git sparse-checkout init [--cone] [--[no-]sparse-index]"
-#~ msgstr "git sparse-checkout init [--cone] [--[no-]sparse-index]"
+#, c-format
+msgid "format: %%(else) atom used more than once"
+msgstr "format: atomen %%(else) använd mer än en gång"
 
-#~ msgid "git sparse-checkout reapply [--[no-]cone] [--[no-]sparse-index]"
-#~ msgstr "git sparse-checkout reapply [--[no-]cone] [--[no-]sparse-index]"
+#, c-format
+msgid "format: %%(end) atom used without corresponding atom"
+msgstr "format: atomen %%(end) använd utan motsvarande atom"
 
-#~ msgid "git sparse-checkout disable"
-#~ msgstr "git sparse-checkout disable"
+#, c-format
+msgid "malformed format string %s"
+msgstr "felformad formatsträng %s"
 
-#~ msgid ""
-#~ "the stash.useBuiltin support has been removed!\n"
-#~ "See its entry in 'git help config' for details."
-#~ msgstr ""
-#~ "stödet för stash.useBuiltin har tagits bort!\n"
-#~ "Se posten för det i \"git help config\" för detaljer."
+#, c-format
+msgid "this command reject atom %%(%.*s)"
+msgstr "kommandot förkastar atom %%(%.*s)"
 
-#~ msgid "git stripspace [-s | --strip-comments]"
-#~ msgstr "git stripspace [-s | --strip-comments]"
+#, c-format
+msgid "--format=%.*s cannot be used with --python, --shell, --tcl"
+msgstr "--format=%.*s kan inte användas med --python, --shell, --tcl"
 
-#~ msgid "git stripspace [-c | --comment-lines]"
-#~ msgstr "git stripspace [-c | --comment-lines]"
+#, c-format
+msgid "(no branch, rebasing %s)"
+msgstr "(ingen gren, ombaserar %s)"
 
-#~ msgid "submodule--helper print-default-remote takes no arguments"
-#~ msgstr "submodule--helper print-default-remote tar inga argument"
+#, c-format
+msgid "(no branch, rebasing detached HEAD %s)"
+msgstr "(ingen gren, ombaserar frånkopplat HEAD %s)"
 
-#~ msgid "git submodule--helper update-clone [--prefix=<path>] [<path>...]"
-#~ msgstr ""
-#~ "git submodule--helper update-clone [--prefix=<sökväg>] [<sökväg>...]"
+#, c-format
+msgid "(no branch, bisect started on %s)"
+msgstr "(ingen gren, \"bisect\" startad på %s)"
 
-#~ msgid "suppress output for update by rebase or merge"
-#~ msgstr "dölj utdata för uppdatering via ombasering eller sammanslagning{"
+#, c-format
+msgid "(HEAD detached at %s)"
+msgstr "(HEAD frånkopplat vid %s)"
 
-#~ msgid "overrides update mode in case the repository is a fresh clone"
-#~ msgstr "överstyr uppdateringsläge om arkviet är en färsk klon"
+#, c-format
+msgid "(HEAD detached from %s)"
+msgstr "(HEAD frånkopplat från %s)"
 
-#~ msgid "depth for shallow fetch"
-#~ msgstr "djup för grund hämtning"
+msgid "(no branch)"
+msgstr "(ingen gren)"
 
-#~ msgid "sha1"
-#~ msgstr "sha1"
+#, c-format
+msgid "missing object %s for %s"
+msgstr "objektet %s saknas för %s"
 
-#~ msgid "SHA1 expected by superproject"
-#~ msgstr "SHA1 förväntades av överprojekt{"
+#, c-format
+msgid "parse_object_buffer failed on %s for %s"
+msgstr "parse_object_buffer misslyckades på %s för %s"
 
-#~ msgid "subsha1"
-#~ msgstr "subsha1"
+#, c-format
+msgid "malformed object at '%s'"
+msgstr "felformat objekt vid \"%s\""
 
-#~ msgid "SHA1 of submodule's HEAD"
-#~ msgstr "SHA1 för undermodulens \"HEAD\""
+#, c-format
+msgid "ignoring ref with broken name %s"
+msgstr "ignorerar referens med trasigt namn %s"
 
-#~ msgid "git submodule--helper run-update-procedure [<options>] <path>"
-#~ msgstr "git submodule--helper run-update-procedure [<flaggor>] <sökväg>"
+#, c-format
+msgid "ignoring broken ref %s"
+msgstr "ignorerar trasig referens %s"
 
-#~ msgid "git submodule--helper config --check-writeable"
-#~ msgstr "git submodule--helper config --check-writeable"
+#, c-format
+msgid "format: %%(end) atom missing"
+msgstr "format: atomen %%(end) saknas"
 
-#~ msgid "git update-server-info [--force]"
-#~ msgstr "git update-server-info [--force]"
+#, c-format
+msgid "malformed object name %s"
+msgstr "felformat objektnamn %s"
 
-#~ msgid "Initialize and modify the sparse-checkout"
-#~ msgstr "Initiera och modifiera sparse-checkout"
+#, c-format
+msgid "option `%s' must point to a commit"
+msgstr "flaggan \"%s\" måste peka på en incheckning"
 
-#, sh-format
-#~ msgid ""
-#~ "Unable to find current ${remote_name}/${branch} revision in submodule "
-#~ "path '$sm_path'"
-#~ msgstr ""
-#~ "Kan inte hitta aktuell revision för ${remote_name}/${branch} i "
-#~ "undermodulsökvägen \"$sm_path\""
+msgid "key"
+msgstr "nyckel"
 
-#, sh-format
-#~ msgid "Failed to recurse into submodule path '$displaypath'"
-#~ msgstr "Misslyckades rekursera in i undermodulsökvägen \"$displaypath\""
+msgid "field name to sort on"
+msgstr "fältnamn att sortera på"
+
+#, c-format
+msgid "not a reflog: %s"
+msgstr "inte en referenslogg: %s"
+
+#, c-format
+msgid "no reflog for '%s'"
+msgstr "ingen referenslogg för \"%s\""
+
+#, c-format
+msgid "%s does not point to a valid object!"
+msgstr "\"%s\" pekar inte på ett giltigt objekt!"
+
+#, 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"
+"of your new repositories, which will suppress this warning, call:\n"
+"\n"
+"\tgit config --global init.defaultBranch <name>\n"
+"\n"
+"Names commonly chosen instead of 'master' are 'main', 'trunk' and\n"
+"'development'. The just-created branch can be renamed via this command:\n"
+"\n"
+"\tgit branch -m <name>\n"
+msgstr ""
+"Använder \"%s\" som namn för den inledande grenen. Detta förvalda grennamn\n"
+"kan ändras i framtiden. För att välja vilket namn som ska användas på\n"
+"den inledande grenen i alla nya arkiv, och dölja denna varning, kör du:\n"
+"\n"
+"\tgit config --global init.defaultBranch <namn>\n"
+"\n"
+"Namn som ofta används istället för \"master\" är \"main\", \"trunk\" och\n"
+"\"development\". Den nyskapade grenen kan ges nytt namn med kommandot:\n"
+"\n"
+"\tgit branch -m <namn>\n"
+
+#, c-format
+msgid "could not retrieve `%s`"
+msgstr "kunde inte hämta \"%s\""
+
+#, c-format
+msgid "invalid branch name: %s = %s"
+msgstr "felaktigt namn på gren: %s = %s"
+
+#, c-format
+msgid "ignoring dangling symref %s"
+msgstr "ignorerar dinglande symbolisk referens %s"
+
+#, c-format
+msgid "log for ref %s has gap after %s"
+msgstr "loggen för referensen %s har lucka efter %s"
+
+#, c-format
+msgid "log for ref %s unexpectedly ended on %s"
+msgstr "loggen för referensen %s slutade oväntat på %s"
+
+#, c-format
+msgid "log for %s is empty"
+msgstr "loggen för %s är tom"
+
+#, c-format
+msgid "refusing to update ref with bad name '%s'"
+msgstr "vägrar uppdatera referens med trasigt namn \"%s\""
+
+#, c-format
+msgid "update_ref failed for ref '%s': %s"
+msgstr "update_ref misslyckades för referensen \"%s\": %s"
+
+#, c-format
+msgid "multiple updates for ref '%s' not allowed"
+msgstr "flera uppdateringar för referensen \"%s\" tillåts inte"
+
+msgid "ref updates forbidden inside quarantine environment"
+msgstr "referensuppdateringar förbjudna i karantänmiljö"
+
+msgid "ref updates aborted by hook"
+msgstr "referensuppdateringar avbrutna av krok"
+
+#, c-format
+msgid "'%s' exists; cannot create '%s'"
+msgstr "\"%s\" finns; kan inte skapa \"%s\""
+
+#, c-format
+msgid "cannot process '%s' and '%s' at the same time"
+msgstr "kan inte hantera \"%s\" och \"%s\" samtidigt"
+
+#, c-format
+msgid "could not remove reference %s"
+msgstr "kunde inte ta bort referensen %s"
+
+#, c-format
+msgid "could not delete reference %s: %s"
+msgstr "kunde inte ta bort referensen %s: %s"
+
+#, c-format
+msgid "could not delete references: %s"
+msgstr "kunde inte ta bort referenser: %s"
+
+#, c-format
+msgid "invalid refspec '%s'"
+msgstr "felaktig referensspecifikation: \"%s\""
+
+#, c-format
+msgid "invalid quoting in push-option value: '%s'"
+msgstr "felaktig citering på värde för push-option: \"%s\""
+
+#, c-format
+msgid "%sinfo/refs not valid: is this a git repository?"
+msgstr "%sinfo/refs inte giltig: är detta ett git-arkiv?"
+
+msgid "invalid server response; expected service, got flush packet"
+msgstr "ogiltigt svar från servern; förväntade tjänst, fick flush-paket"
+
+#, c-format
+msgid "invalid server response; got '%s'"
+msgstr "ogiltigt svar från servern; fick \"%s\""
+
+#, c-format
+msgid "repository '%s' not found"
+msgstr "arkivet \"%s\" hittades inte"
+
+#, c-format
+msgid "Authentication failed for '%s'"
+msgstr "Autentisering misslyckades \"%s\""
+
+#, c-format
+msgid "unable to access '%s' with http.pinnedPubkey configuration: %s"
+msgstr "kan inte nå \"%s\" med http.pinnedPubkey inställt till: %s"
+
+#, c-format
+msgid "unable to access '%s': %s"
+msgstr "kan inte komma åt \"%s\": %s"
+
+#, c-format
+msgid "redirecting to %s"
+msgstr "omdirigerar till %s"
+
+msgid "shouldn't have EOF when not gentle on EOF"
+msgstr "borde inte ha EOF när inte försiktig på EOF"
+
+msgid "remote server sent unexpected response end packet"
+msgstr "fjärrservern sände oväntat svarsavslutningspaketet"
+
+msgid "unable to rewind rpc post data - try increasing http.postBuffer"
+msgstr "kunde inte spola tillbaka rpc-postdata - försök öka http.postBuffer"
+
+#, c-format
+msgid "remote-curl: bad line length character: %.4s"
+msgstr "remote-curl: felaktig radlängdstecken: %.4s"
+
+msgid "remote-curl: unexpected response end packet"
+msgstr "remote-curl: oväntat svarsavslutningspaketet"
+
+#, c-format
+msgid "RPC failed; %s"
+msgstr "RPC misslyckades; %s"
+
+msgid "cannot handle pushes this big"
+msgstr "kan inte hantera så stora sändningar"
+
+#, c-format
+msgid "cannot deflate request; zlib deflate error %d"
+msgstr "kan inte packa upp anrop; zlib-deflate-fel %d"
+
+#, c-format
+msgid "cannot deflate request; zlib end error %d"
+msgstr "kan inte packa upp anrop; zlib-slutfel %d"
+
+#, c-format
+msgid "%d bytes of length header were received"
+msgstr "%d byte av längd-huvudet togs emot"
+
+#, c-format
+msgid "%d bytes of body are still expected"
+msgstr "%d byte av kroppen väntas fortfarande"
+
+msgid "dumb http transport does not support shallow capabilities"
+msgstr "dum http-transport stöder inte grunda arkiv"
+
+msgid "fetch failed."
+msgstr "mottagning misslyckades."
+
+msgid "cannot fetch by sha1 over smart http"
+msgstr "kan inte hämta med sha1 över smart http"
+
+#, c-format
+msgid "protocol error: expected sha/ref, got '%s'"
+msgstr "protokollfel: förväntade sha/ref, fick \"%s\""
+
+#, c-format
+msgid "http transport does not support %s"
+msgstr "http-transporten stöder inte %s"
+
+msgid "git-http-push failed"
+msgstr "git-http-push misslyckades"
+
+msgid "remote-curl: usage: git remote-curl <remote> [<url>]"
+msgstr "remote-curl: användning: git remote-curl <fjärr> [<url>]"
+
+msgid "remote-curl: error reading command stream from git"
+msgstr "remote-curl: fel vid läsning av kommandoström från git"
+
+msgid "remote-curl: fetch attempted without a local repo"
+msgstr "remote-curl: försökte ta emot utan lokalt arkiv"
+
+#, c-format
+msgid "remote-curl: unknown command '%s' from git"
+msgstr "remote-curl: okänt kommando \"%s\" från git"
+
+#, c-format
+msgid "config remote shorthand cannot begin with '/': %s"
+msgstr "konfigurerad kortform för fjärr kan inte börja med \"/\": %s"
+
+msgid "more than one receivepack given, using the first"
+msgstr "mer än en receivepack angavs, använder den första"
+
+msgid "more than one uploadpack given, using the first"
+msgstr "mer än en uploadpack angavs, använder den första"
+
+#, c-format
+msgid "unrecognized value transfer.credentialsInUrl: '%s'"
+msgstr "okänt värde transfer.credentialsInUrl: \"%s\""
+
+#, c-format
+msgid "URL '%s' uses plaintext credentials"
+msgstr "URL \"%s\" använder inloggningsuppgifter i klartext"
+
+#, c-format
+msgid "Cannot fetch both %s and %s to %s"
+msgstr "Kan inte hämta både %s och %s till %s"
+
+#, c-format
+msgid "%s usually tracks %s, not %s"
+msgstr "%s spårar vanligtvis %s, inte %s"
+
+#, c-format
+msgid "%s tracks both %s and %s"
+msgstr "%s spårar både %s och %s"
+
+#, c-format
+msgid "key '%s' of pattern had no '*'"
+msgstr "nyckeln \"%s\" i mönstret innehåller ingen \"*\""
+
+#, c-format
+msgid "value '%s' of pattern has no '*'"
+msgstr "värdet \"%s\" i mönstret innehåller ingen \"*\""
+
+#, c-format
+msgid "src refspec %s does not match any"
+msgstr "käll-referensspecifikationen %s motsvarar ingen"
+
+#, c-format
+msgid "src refspec %s matches more than one"
+msgstr "käll-referensspecifikationen %s motsvarar mer än en"
+
+#. TRANSLATORS: "matches '%s'%" is the <dst> part of "git push
+#. <remote> <src>:<dst>" push, and "being pushed ('%s')" is
+#. the <src>.
+#.
+#, c-format
+msgid ""
+"The destination you provided is not a full refname (i.e.,\n"
+"starting with \"refs/\"). We tried to guess what you meant by:\n"
+"\n"
+"- Looking for a ref that matches '%s' on the remote side.\n"
+"- Checking if the <src> being pushed ('%s')\n"
+"  is a ref in \"refs/{heads,tags}/\". If so we add a corresponding\n"
+"  refs/{heads,tags}/ prefix on the remote side.\n"
+"\n"
+"Neither worked, so we gave up. You must fully qualify the ref."
+msgstr ""
+"Målet du angav är inte ett komplett referensamn (dvs.,\n"
+"startar med \"refs/\"). Vi försökte gissa vad du menade genom att:\n"
+"\n"
+"- Se efter en referens som motsvarar \"%s\" på fjärrsidan.\n"
+"- Se om <källan> som sänds (\"%s\")\n"
+"  är en referens i \"refs/{heads,tags}/\". Om så lägger vi till\n"
+"  motsvarande refs/{heads,tags}/-prefix på fjärrsidan.\n"
+"\n"
+"Inget av dem fungerade, så vi gav upp. Ange fullständig referens."
+
+#, c-format
+msgid ""
+"The <src> part of the refspec is a commit object.\n"
+"Did you mean to create a new branch by pushing to\n"
+"'%s:refs/heads/%s'?"
+msgstr ""
+"<Källa>-delen av ref.spec-en är ett incheckningsobjekt.\n"
+"Var det meningen att skapa en ny gren genom att sända\n"
+"till \"%s:refs/heads/%s\"?"
+
+#, c-format
+msgid ""
+"The <src> part of the refspec is a tag object.\n"
+"Did you mean to create a new tag by pushing to\n"
+"'%s:refs/tags/%s'?"
+msgstr ""
+"<Källa>-delen av ref.spec-en är ett taggobjekt.\n"
+"Var det meningen att skapa en ny tagg genom att sända\n"
+"till \"%s:refs/tags/%s\"?"
+
+#, c-format
+msgid ""
+"The <src> part of the refspec is a tree object.\n"
+"Did you mean to tag a new tree by pushing to\n"
+"'%s:refs/tags/%s'?"
+msgstr ""
+"<Källa>-delen av ref.spec-en är ett trädobjekt.\n"
+"Var det meningen att tagga ett nytt träd genom att sända\n"
+"till \"%s:refs/tags/%s\"?"
+
+#, c-format
+msgid ""
+"The <src> part of the refspec is a blob object.\n"
+"Did you mean to tag a new blob by pushing to\n"
+"'%s:refs/tags/%s'?"
+msgstr ""
+"<Källa>-delen av ref.spec-en är ett blobobjekt.\n"
+"Var det meningen att tagga en ny blob genom att sända\n"
+"till \"%s:refs/tags/%s\"?"
+
+#, c-format
+msgid "%s cannot be resolved to branch"
+msgstr "%s kan inte slås upp till en gren"
+
+#, c-format
+msgid "unable to delete '%s': remote ref does not exist"
+msgstr "kan inte ta bort \"%s\": fjärreferensen finns inte"
+
+#, c-format
+msgid "dst refspec %s matches more than one"
+msgstr "fjärr-referensspecifikationen \"%s\" motsvarar mer än en"
+
+#, c-format
+msgid "dst ref %s receives from more than one src"
+msgstr "fjärr-referensen \"%s\" hämtar från mer än en källa"
+
+msgid "HEAD does not point to a branch"
+msgstr "HEAD pekar inte på en gren"
+
+#, c-format
+msgid "no such branch: '%s'"
+msgstr "okänd gren: \"%s\""
+
+#, c-format
+msgid "no upstream configured for branch '%s'"
+msgstr "ingen standarduppström angiven för grenen \"%s\""
+
+#, c-format
+msgid "upstream branch '%s' not stored as a remote-tracking branch"
+msgstr "uppströmsgrenen \"%s\" är inte lagrad som en fjärrspårande gren"
+
+#, c-format
+msgid "push destination '%s' on remote '%s' has no local tracking branch"
+msgstr "push-målet \"%s\" på fjärren \"%s\" har ingen lokalt spårande gren"
+
+#, c-format
+msgid "branch '%s' has no remote for pushing"
+msgstr "grenen \"%s\" har ingen fjärr för \"push\""
+
+#, c-format
+msgid "push refspecs for '%s' do not include '%s'"
+msgstr "\"push\"-referensspecifikation för \"%s\" innehåller inte \"%s\""
+
+msgid "push has no destination (push.default is 'nothing')"
+msgstr "\"push\" har inget mål (push.default är \"ingenting\")"
+
+msgid "cannot resolve 'simple' push to a single destination"
+msgstr "\"enkel push\" motsvarar flera olika mål"
+
+#, c-format
+msgid "couldn't find remote ref %s"
+msgstr "Kunde inte hitta fjärr-referensen %s"
+
+#, c-format
+msgid "* Ignoring funny ref '%s' locally"
+msgstr "* Ignorerar märklig referens \"%s\" lokalt"
+
+#, c-format
+msgid "Your branch is based on '%s', but the upstream is gone.\n"
+msgstr "Din gren är baserad på \"%s\", men den har försvunnit uppströms.\n"
+
+msgid "  (use \"git branch --unset-upstream\" to fixup)\n"
+msgstr "  (använd \"git branch --unset-upstream\" för att rätta)\n"
+
+#, c-format
+msgid "Your branch is up to date with '%s'.\n"
+msgstr "Din gren är à jour med \"%s\".\n"
+
+#, c-format
+msgid "Your branch and '%s' refer to different commits.\n"
+msgstr "Din gren och \"%s\" pekar på olika incheckningar.\n"
+
+#, c-format
+msgid "  (use \"%s\" for details)\n"
+msgstr "  (använd \"%s\" för detaljer)\n"
+
+#, c-format
+msgid "Your branch is ahead of '%s' by %d commit.\n"
+msgid_plural "Your branch is ahead of '%s' by %d commits.\n"
+msgstr[0] "Din gren ligger före \"%s\" med %d incheckning.\n"
+msgstr[1] "Din gren ligger före \"%s\" med %d incheckningar.\n"
+
+msgid "  (use \"git push\" to publish your local commits)\n"
+msgstr "  (använd \"git push\" för att publicera dina lokala incheckningar)\n"
+
+#, c-format
+msgid "Your branch is behind '%s' by %d commit, and can be fast-forwarded.\n"
+msgid_plural ""
+"Your branch is behind '%s' by %d commits, and can be fast-forwarded.\n"
+msgstr[0] ""
+"Din gren ligger efter \"%s\" med %d incheckning, och kan snabbspolas.\n"
+msgstr[1] ""
+"Din gren ligger efter \"%s\" med %d incheckningar, och kan snabbspolas.\n"
+
+msgid "  (use \"git pull\" to update your local branch)\n"
+msgstr "  (använd \"git pull\" för att uppdatera din lokala gren)\n"
+
+#, c-format
+msgid ""
+"Your branch and '%s' have diverged,\n"
+"and have %d and %d different commit each, respectively.\n"
+msgid_plural ""
+"Your branch and '%s' have diverged,\n"
+"and have %d and %d different commits each, respectively.\n"
+msgstr[0] ""
+"Din gren och \"%s\" har divergerat,\n"
+"och har %d respektive %d olika incheckning.\n"
+msgstr[1] ""
+"Din gren och \"%s\" har divergerat,\n"
+"och har %d respektive %d olika incheckningar.\n"
+
+msgid "  (use \"git pull\" to merge the remote branch into yours)\n"
+msgstr "  (använd \"git pull\" för att slå ihop fjärrgrenen med din egen)\n"
+
+#, c-format
+msgid "cannot parse expected object name '%s'"
+msgstr "kan inte tolka förväntat objektnamn \"%s\""
+
+#, c-format
+msgid "cannot strip one component off url '%s'"
+msgstr "kan inte ta bort en komponent från url:en \"%s\""
+
+#, c-format
+msgid "bad replace ref name: %s"
+msgstr "felaktig ersättningsreferensnamn: %s"
+
+#, c-format
+msgid "duplicate replace ref: %s"
+msgstr "duplicerat ersättningsreferensnamn: %s"
+
+#, c-format
+msgid "replace depth too high for object %s"
+msgstr "ersättningsdjupet för högt för objektet %s"
+
+msgid "corrupt MERGE_RR"
+msgstr "trasig MERGE_RR"
+
+msgid "unable to write rerere record"
+msgstr "kunde inte skriva rerere-post"
+
+#, c-format
+msgid "there were errors while writing '%s' (%s)"
+msgstr "fel vid skrivning av \"%s\" (%s)"
+
+#, c-format
+msgid "could not parse conflict hunks in '%s'"
+msgstr "kunde inte tolka konflikt-stycket i \"%s\""
+
+#, c-format
+msgid "failed utime() on '%s'"
+msgstr "\"utime()\" misslyckades på \"%s\""
+
+#, c-format
+msgid "writing '%s' failed"
+msgstr "misslyckades skriva \"%s\""
+
+#, c-format
+msgid "Staged '%s' using previous resolution."
+msgstr "Köade \"%s\" med sparad lösning."
+
+#, c-format
+msgid "Recorded resolution for '%s'."
+msgstr "Sparade lösning för \"%s\"."
+
+#, c-format
+msgid "Resolved '%s' using previous resolution."
+msgstr "Löste \"%s\" med tidigare lösning."
+
+#, c-format
+msgid "cannot unlink stray '%s'"
+msgstr "kan inte ta bort lös länk \"%s\""
+
+#, c-format
+msgid "Recorded preimage for '%s'"
+msgstr "Sparade förhandsbild för \"%s\""
+
+#, c-format
+msgid "failed to update conflicted state in '%s'"
+msgstr "misslyckades uppdatera tillstånd för sammanslagningsproblem i \"%s\""
+
+#, c-format
+msgid "no remembered resolution for '%s'"
+msgstr "inget sparat sammanslagningsresultat för \"%s\""
+
+#, c-format
+msgid "cannot unlink '%s'"
+msgstr "kan inte ta bort länken \"%s\""
+
+#, c-format
+msgid "Updated preimage for '%s'"
+msgstr "Uppdaterade förhandsbild för \"%s\""
+
+#, c-format
+msgid "Forgot resolution for '%s'\n"
+msgstr "Glömde lösning för \"%s\"\n"
+
+msgid "unable to open rr-cache directory"
+msgstr "kan inte uppdatera katalogen rr-cache"
+
+msgid "update the index with reused conflict resolution if possible"
+msgstr "uppdatera indexet med återanvänd konfliktlösning om möjligt"
+
+msgid "could not determine HEAD revision"
+msgstr "kunde inte bestämma HEAD-revision"
+
+#, c-format
+msgid "failed to find tree of %s"
+msgstr "kunde inte hitta trädet för %s."
+
+msgid "--unpacked=<packfile> no longer supported"
+msgstr "--unpacked=<paketfil> stöds inte längre"
+
+msgid "your current branch appears to be broken"
+msgstr "din nuvarande gren verkar vara trasig"
+
+#, 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"
+
+msgid "object filtering requires --objects"
+msgstr "objektfiltrering kräver --objects"
+
+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"
+
+#, c-format
+msgid "cannot create async thread: %s"
+msgstr "kan inte skapa asynkron tråd: %s"
+
+msgid "unexpected flush packet while reading remote unpack status"
+msgstr "oväntat flush-paket vid läsning av fjärruppackningsstatus"
+
+#, c-format
+msgid "unable to parse remote unpack status: %s"
+msgstr "kunde inte tolka fjärruppackningsstatus: %s"
+
+#, c-format
+msgid "remote unpack failed: %s"
+msgstr "fjärruppackning misslyckades: %s"
+
+msgid "failed to sign the push certificate"
+msgstr "misslyckades underteckna push-certifikatet"
+
+msgid "send-pack: unable to fork off fetch subprocess"
+msgstr "send-pack: kunde inte starta (fork) underprocessen för fetch"
+
+msgid "push negotiation failed; proceeding anyway with push"
+msgstr "sänd-förhandling misslyckades; fortsätter ändå med sändningen"
+
+msgid "the receiving end does not support this repository's hash algorithm"
+msgstr "mottagarsidan stöder inte arkivets hashningsalgoritm"
+
+msgid "the receiving end does not support --signed push"
+msgstr "mottagarsidan stöder inte push med --signed"
+
+msgid ""
+"not sending a push certificate since the receiving end does not support --"
+"signed push"
+msgstr ""
+"sänder inte push-certifikat eftersom mottagarsidan inte stlder push med --"
+"signed"
+
+msgid "the receiving end does not support --atomic push"
+msgstr "mottagarsidan stöder inte push med --atomic"
+
+msgid "the receiving end does not support push options"
+msgstr "mottagarsidan stöder inte push-flaggor"
+
+#, c-format
+msgid "invalid commit message cleanup mode '%s'"
+msgstr "felaktigt incheckningsmeddelandestädningsläge \"%s\""
+
+#, c-format
+msgid "could not delete '%s'"
+msgstr "kunde inte ta bort \"%s\""
+
+msgid "revert"
+msgstr "revert"
+
+msgid "cherry-pick"
+msgstr "cherry-pick"
+
+msgid "rebase"
+msgstr "rebase"
+
+#, c-format
+msgid "unknown action: %d"
+msgstr "okänd funktion: %d"
+
+msgid ""
+"after resolving the conflicts, mark the corrected paths\n"
+"with 'git add <paths>' or 'git rm <paths>'"
+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>\""
+
+msgid ""
+"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, 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\"."
+
+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\"."
+
+#, c-format
+msgid "could not lock '%s'"
+msgstr "kunde inte låsa \"%s\""
+
+#, c-format
+msgid "could not write to '%s'"
+msgstr "kunde inte skriva till \"%s\""
+
+#, c-format
+msgid "could not write eol to '%s'"
+msgstr "kunde inte skriva radslut till \"%s\""
+
+#, c-format
+msgid "failed to finalize '%s'"
+msgstr "misslyckades färdigställa \"%s\""
+
+#, c-format
+msgid "your local changes would be overwritten by %s."
+msgstr "dina lokala ändringar skulle skrivas över av %s."
+
+msgid "commit your changes or stash them to proceed."
+msgstr "checka in dina ändringar eller använd \"stash\" för att fortsätta."
+
+#, c-format
+msgid "%s: fast-forward"
+msgstr "%s: snabbspola"
+
+#. TRANSLATORS: %s will be "revert", "cherry-pick" or
+#. "rebase".
+#.
+#, c-format
+msgid "%s: Unable to write new index file"
+msgstr "%s: Kunde inte skriva ny indexfil"
+
+msgid "unable to update cache tree"
+msgstr "kan inte uppdatera cacheträd"
+
+msgid "could not resolve HEAD commit"
+msgstr "kunde inte bestämma HEAD:s incheckning"
+
+#, c-format
+msgid "no key present in '%.*s'"
+msgstr "ingen nyckel i  \"%.*s\""
+
+#, c-format
+msgid "unable to dequote value of '%s'"
+msgstr "kan inte ta bort citering av värdet \"%s\""
+
+msgid "'GIT_AUTHOR_NAME' already given"
+msgstr "\"GIT_AUTHOR_NAME\" har redan angivits"
+
+msgid "'GIT_AUTHOR_EMAIL' already given"
+msgstr "\"GIT_AUTHOR_EMAIL\" har redan angivits"
+
+msgid "'GIT_AUTHOR_DATE' already given"
+msgstr "\"GIT_AUTHOR_DATE\" har redan angivits"
+
+#, c-format
+msgid "unknown variable '%s'"
+msgstr "okänd variabel \"%s\""
+
+msgid "missing 'GIT_AUTHOR_NAME'"
+msgstr "\"GIT_AUTHOR_NAME\" saknas"
+
+msgid "missing 'GIT_AUTHOR_EMAIL'"
+msgstr "\"GIT_AUTHOR_EMAIL\" saknas"
+
+msgid "missing 'GIT_AUTHOR_DATE'"
+msgstr "\"GIT_AUTHOR_DATE\" saknas"
+
+#, c-format
+msgid ""
+"you have staged changes in your working tree\n"
+"If these changes are meant to be squashed into the previous commit, run:\n"
+"\n"
+"  git commit --amend %s\n"
+"\n"
+"If they are meant to go into a new commit, run:\n"
+"\n"
+"  git commit %s\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 ändringarna ska läggas in i föregående incheckning, kör:\n"
+"\n"
+"  git commit --amend %s\n"
+"\n"
+"Om de ska checkas in i en egen incheckning, kör:\n"
+"\n"
+"  git commit %s\n"
+"\n"
+"Oavsett vilket, när du är färdig fortsätter du med:\n"
+"\n"
+"  git rebase --continue\n"
+
+msgid "'prepare-commit-msg' hook failed"
+msgstr "kroken \"prepare-commit-msg\" misslyckades"
+
+msgid ""
+"Your name and email address were configured automatically based\n"
+"on your username and hostname. Please check that they are accurate.\n"
+"You can suppress this message by setting them explicitly. Run the\n"
+"following command and follow the instructions in your editor to edit\n"
+"your configuration file:\n"
+"\n"
+"    git config --global --edit\n"
+"\n"
+"After doing this, you may fix the identity used for this commit with:\n"
+"\n"
+"    git commit --amend --reset-author\n"
+msgstr ""
+"Ditt namn och e-postadress konfigurerades automatiskt baserat på\n"
+"ditt användar-id och värdnamn. Kontrollera att de är riktiga. Du\n"
+"kan förhindra det här meddelandet genom att ställa dem explicit.\n"
+"Kör följande kommandon och följ instruktionerna i textredigeraren\n"
+"för att redigera din konfigurationsfil:\n"
+"\n"
+"    git config --global --edit\n"
+"\n"
+"När du gjort det kan du rätta identiteten som användes för den här\n"
+"incheckningen med:\n"
+"\n"
+"    git commit --amend --reset-author\n"
+
+msgid ""
+"Your name and email address were configured automatically based\n"
+"on your username and hostname. Please check that they are accurate.\n"
+"You can suppress this message by setting them explicitly:\n"
+"\n"
+"    git config --global user.name \"Your Name\"\n"
+"    git config --global user.email you@example.com\n"
+"\n"
+"After doing this, you may fix the identity used for this commit with:\n"
+"\n"
+"    git commit --amend --reset-author\n"
+msgstr ""
+"Ditt namn och e-postadress konfigurerades automatiskt baserat på\n"
+"ditt användar-id och värdnamn. Kontrollera att de är riktiga. Du\n"
+"kan förhindra det här meddelandet genom att ställa dem explicit:\n"
+"\n"
+"    git config --global user.name \"Ditt namn\"\n"
+"    git config --global user.email du@example.com\n"
+"\n"
+"När du gjort det kan du rätta identiteten som användes för den här\n"
+"incheckningen med:\n"
+"\n"
+"    git commit --amend --reset-author\n"
+
+msgid "couldn't look up newly created commit"
+msgstr "kunde inte slå upp en precis skapad incheckning"
+
+msgid "could not parse newly created commit"
+msgstr "kunde inte tolka en precis skapad incheckning"
+
+msgid "unable to resolve HEAD after creating commit"
+msgstr "kunde inte bestämma HEAD efter att ha skapat incheckning"
+
+msgid "detached HEAD"
+msgstr "frånkopplad HEAD"
+
+msgid " (root-commit)"
+msgstr " (rotincheckning)"
+
+msgid "could not parse HEAD"
+msgstr "kunde inte tolka HEAD"
+
+#, c-format
+msgid "HEAD %s is not a commit!"
+msgstr "HEAD %s är inte en incheckning!"
+
+msgid "unable to parse commit author"
+msgstr "kunde inte tolka incheckningens författare"
+
+#, c-format
+msgid "unable to read commit message from '%s'"
+msgstr "kunde inte läsa incheckningsmeddelande från \"%s\""
+
+#, c-format
+msgid "invalid author identity '%s'"
+msgstr "ogiltig författar-identitet \"%s\""
+
+msgid "corrupt author: missing date information"
+msgstr "trasig författare: saknar datuminformation"
+
+#, c-format
+msgid "could not update %s"
+msgstr "kunde inte uppdatera %s"
+
+#, c-format
+msgid "could not parse commit %s"
+msgstr "kunde inte tolka incheckningen %s"
+
+#, c-format
+msgid "could not parse parent commit %s"
+msgstr "kunde inte tolka föräldraincheckningen %s"
+
+#, c-format
+msgid "unknown command: %d"
+msgstr "okänt kommando: %d"
+
+msgid "This is the 1st commit message:"
+msgstr "Det här är 1:a incheckningsmeddelandet:"
+
+#, c-format
+msgid "This is the commit message #%d:"
+msgstr "Det här är incheckningsmeddelande %d:"
+
+msgid "The 1st commit message will be skipped:"
+msgstr "1:a incheckningsmeddelandet kommer hoppas över:"
+
+#, c-format
+msgid "The commit message #%d will be skipped:"
+msgstr "Incheckningsmeddelande %d kommer hoppas över:"
+
+#, c-format
+msgid "This is a combination of %d commits."
+msgstr "Det här är en kombination av %d incheckningar."
+
+#, c-format
+msgid "cannot write '%s'"
+msgstr "kan inte skriva \"%s\""
+
+msgid "need a HEAD to fixup"
+msgstr "behöver en HEAD-incheckning att rätta"
+
+msgid "could not read HEAD"
+msgstr "kunde inte läsa HEAD"
+
+msgid "could not read HEAD's commit message"
+msgstr "kunde inte läsa HEAD:s incheckningsmeddelande"
+
+#, c-format
+msgid "could not read commit message of %s"
+msgstr "kunde inte läsa incheckningsmeddelande för %s"
+
+msgid "your index file is unmerged."
+msgstr "din indexfil har inte slagits ihop."
+
+msgid "cannot fixup root commit"
+msgstr "kan inte göra \"fixup\" på rotincheckning"
+
+#, 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."
+
+#, c-format
+msgid "commit %s does not have parent %d"
+msgstr "incheckning %s har inte förälder %d"
+
+#, 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.
+#, c-format
+msgid "%s: cannot parse parent commit %s"
+msgstr "%s: kan inte tolka föräldraincheckningen %s"
+
+#, c-format
+msgid "could not rename '%s' to '%s'"
+msgstr "kunde inte byta namn på \"%s\" till \"%s\""
+
+#, c-format
+msgid "could not revert %s... %s"
+msgstr "kunde inte ångra %s... %s"
+
+#, c-format
+msgid "could not apply %s... %s"
+msgstr "kunde inte tillämpa %s... %s"
+
+#, c-format
+msgid "dropping %s %s -- patch contents already upstream\n"
+msgstr "utelämnar %s %s -- patchinnehållet finns redan uppströms\n"
+
+#, c-format
+msgid "git %s: failed to read the index"
+msgstr "git %s: misslyckades läsa indexet"
+
+#, c-format
+msgid "git %s: failed to refresh the index"
+msgstr "git %s: misslyckades uppdatera indexet"
+
+#, c-format
+msgid "%s does not accept arguments: '%s'"
+msgstr "%s tar inte argument: \"%s\""
+
+#, c-format
+msgid "missing arguments for %s"
+msgstr "argument saknas för %s"
+
+#, c-format
+msgid "could not parse '%s'"
+msgstr "kunde inte tolka \"%s\""
+
+#, c-format
+msgid "invalid line %d: %.*s"
+msgstr "ogiltig rad %d: %.*s"
+
+#, c-format
+msgid "cannot '%s' without a previous commit"
+msgstr "kan inte utföra \"%s\" utan en föregående incheckning"
+
+msgid "cancelling a cherry picking in progress"
+msgstr "avbryter pågående \"cherry-pick\""
+
+msgid "cancelling a revert in progress"
+msgstr "avbryter pågående \"revert\""
+
+msgid "please fix this using 'git rebase --edit-todo'."
+msgstr "rätta det med \"git rebase --edit-todo\"."
+
+#, c-format
+msgid "unusable instruction sheet: '%s'"
+msgstr "oanvändbart manus: \"%s\""
+
+msgid "no commits parsed."
+msgstr "inga incheckningar lästes."
+
+msgid "cannot cherry-pick during a revert."
+msgstr "kan inte utföra \"cherry-pick\" under en \"revert\"."
+
+msgid "cannot revert during a cherry-pick."
+msgstr "kan inte utföra \"revert\" under en \"cherry-pick\"."
+
+msgid "unusable squash-onto"
+msgstr "oanvändbar squash-onto"
+
+#, c-format
+msgid "malformed options sheet: '%s'"
+msgstr "trasigt manus: \"%s\""
+
+msgid "empty commit set passed"
+msgstr "den angivna uppsättningen incheckningar är tom"
+
+msgid "revert is already in progress"
+msgstr "en \"revert\" pågår redan"
+
+#, c-format
+msgid "try \"git revert (--continue | %s--abort | --quit)\""
+msgstr "testa \"git revert (--continue | %s--abort | --quit)\""
+
+msgid "cherry-pick is already in progress"
+msgstr "en \"cherry-pick\" pågår redan"
+
+#, c-format
+msgid "try \"git cherry-pick (--continue | %s--abort | --quit)\""
+msgstr "testa \"git cherry-pick (--continue | %s--abort | --quit)\""
+
+#, c-format
+msgid "could not create sequencer directory '%s'"
+msgstr "kunde inte skapa \"sequencer\"-katalogen \"%s\""
+
+msgid "could not lock HEAD"
+msgstr "kunde inte låsa HEAD"
+
+msgid "no cherry-pick or revert in progress"
+msgstr "ingen \"cherry-pick\" eller \"revert\" pågår"
+
+msgid "cannot resolve HEAD"
+msgstr "kan inte bestämma HEAD"
+
+msgid "cannot abort from a branch yet to be born"
+msgstr "kan inte avbryta från en gren som ännu inte är född"
+
+#, c-format
+msgid "cannot read '%s': %s"
+msgstr "kan inte läsa \"%s\": %s"
+
+msgid "unexpected end of file"
+msgstr "oväntat filslut"
+
+#, 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"
+
+msgid "You seem to have moved HEAD. Not rewinding, check your HEAD!"
+msgstr ""
+"Du verkar ha flyttat HEAD.\n"
+"Spolar inte tillbaka, kontrollera HEAD!"
+
+msgid "no revert in progress"
+msgstr "ingen \"revers\" pågår"
+
+msgid "no cherry-pick in progress"
+msgstr "ingen \"cherry-pick\" pågår"
+
+msgid "failed to skip the commit"
+msgstr "kunde inte hoppa över incheckningen"
+
+msgid "there is nothing to skip"
+msgstr "ingenting att hoppa över"
+
+#, c-format
+msgid ""
+"have you committed already?\n"
+"try \"git %s --continue\""
+msgstr ""
+"har du redan checkat in?\n"
+"testa \"git %s --continue\""
+
+msgid "cannot read HEAD"
+msgstr "kan inte läsa HEAD"
+
+#, c-format
+msgid "unable to copy '%s' to '%s'"
+msgstr "kan inte kopiera in \"%s\" till \"%s\""
+
+#, c-format
+msgid ""
+"You can amend the commit now, with\n"
+"\n"
+"  git commit --amend %s\n"
+"\n"
+"Once you are satisfied with your changes, run\n"
+"\n"
+"  git rebase --continue\n"
+msgstr ""
+"Du kan utöka incheckningen nu, med\n"
+"\n"
+"\tgit commit --amend %s\n"
+"\n"
+"När du är nöjd med dina ändringar kör du\n"
+"\n"
+"\tgit rebase --continue\n"
+
+#, c-format
+msgid "Could not apply %s... %.*s"
+msgstr "Kunde inte tillämpa %s... %.*s"
+
+#, c-format
+msgid "Could not merge %.*s"
+msgstr "Kunde inte slå ihop %.*s"
+
+#, c-format
+msgid "Executing: %s\n"
+msgstr "Kör: %s\n"
+
+#, c-format
+msgid ""
+"execution failed: %s\n"
+"%sYou can fix the problem, and then run\n"
+"\n"
+"  git rebase --continue\n"
+"\n"
+msgstr ""
+"körningen misslyckades: %s\n"
+"%sDu kan rätta problemet och sedan köra\n"
+"\n"
+"\tgit rebase --continue\n"
+"\n"
+
+msgid "and made changes to the index and/or the working tree\n"
+msgstr "och gjorde ändringar till indexet och/eller arbetskatalogen\n"
+
+#, c-format
+msgid ""
+"execution succeeded: %s\n"
+"but left changes to the index and/or the working tree\n"
+"Commit or stash your changes, and then run\n"
+"\n"
+"  git rebase --continue\n"
+"\n"
+msgstr ""
+"körningen lyckades: %s\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\n"
+"\n"
+
+#, c-format
+msgid "illegal label name: '%.*s'"
+msgstr "ogiltigt etikettnamn: \"%.*s\""
 
-#~ msgid "--index outside a repository"
-#~ msgstr "--index utanför arkiv"
+msgid "writing fake root commit"
+msgstr "skriver fejkad rotincheckning"
 
-#~ msgid "--cached outside a repository"
-#~ msgstr "--cached utanför arkiv"
+msgid "writing squash-onto"
+msgstr "skriver squash-onto"
 
-#~ msgid "unrecognized input"
-#~ msgstr "indata känns inte igen"
+#, c-format
+msgid "could not resolve '%s'"
+msgstr "kunde inte upplösa \"%s\""
+
+msgid "cannot merge without a current revision"
+msgstr "kan inte slå ihop utan en aktuell incheckning"
+
+#, c-format
+msgid "unable to parse '%.*s'"
+msgstr "kan inte tolka \"%.*s\""
 
 #, c-format
-#~ msgid "cannot read %s"
-#~ msgstr "kan inte läsa %s"
+msgid "nothing to merge: '%.*s'"
+msgstr "inget att slå samman: \"%.*s\""
 
-#~ msgid "Option --exec can only be used together with --remote"
-#~ msgstr "Flaggan --exec kan endast användas tillsammans med --remote"
+msgid "octopus merge cannot be executed on top of a [new root]"
+msgstr "\"octopus\"-sammanslagning kan inte köras ovanpå en [ny rot]"
 
 #, c-format
-#~ msgid ""
-#~ "Branch '%s' set up to track remote branch '%s' from '%s' by rebasing."
-#~ msgstr ""
-#~ "Grenen %s ställdes in att spåra fjärrgrenen \"%s\" från \"%s\" genom "
-#~ "ombasering."
+msgid "could not get commit message of '%s'"
+msgstr "kunde inte läsa incheckningsmeddelande för \"%s\""
 
 #, c-format
-#~ msgid "Branch '%s' set up to track remote branch '%s' from '%s'."
-#~ msgstr "Grenen %s ställdes in att spåra fjärrgrenen \"%s\" från \"%s\"."
+msgid "could not even attempt to merge '%.*s'"
+msgstr "kunde inte ens försöka slå ihop \"%.*s\""
+
+msgid "merge: Unable to write new index file"
+msgstr "sammanslagning: Kunde inte skriva ny indexfil"
+
+msgid "Cannot autostash"
+msgstr "Kan inte utföra \"autostash\""
 
 #, c-format
-#~ msgid "Branch '%s' set up to track local branch '%s' by rebasing."
-#~ msgstr ""
-#~ "Grenen \"%s\" ställdes in att spåra den lokala grenen \"%s\"  genom "
-#~ "ombasering."
+msgid "Unexpected stash response: '%s'"
+msgstr "Oväntat svar från stash: \"%s\""
 
 #, c-format
-#~ msgid "Branch '%s' set up to track local branch '%s'."
-#~ msgstr "Grenen \"%s\" ställdes in att spåra den lokala grenen \"%s\"."
+msgid "Could not create directory for '%s'"
+msgstr "Kunde inte skapa katalog för \"%s\""
 
 #, c-format
-#~ msgid "Branch '%s' set up to track remote ref '%s' by rebasing."
-#~ msgstr ""
-#~ "Grenen \"%s\" ställdes in att spåra fjärreferensen \"%s\" genom "
-#~ "ombasering."
+msgid "Created autostash: %s\n"
+msgstr "Skapade autostash: %s\n"
+
+msgid "could not reset --hard"
+msgstr "kunde inte utföra \"reset --hard\""
 
 #, c-format
-#~ msgid "Branch '%s' set up to track remote ref '%s'."
-#~ msgstr "Grenen \"%s\" ställdes in att spåra fjärreferensen \"%s\"."
+msgid "Applied autostash.\n"
+msgstr "Tillämpade autostash.\n"
 
-#~ msgid "Cannot force update the current branch."
-#~ msgstr "Kan inte tvinga uppdatering av aktuell gren."
+#, c-format
+msgid "cannot store %s"
+msgstr "kan inte spara %s"
 
 #, c-format
-#~ msgid "Not a valid object name: '%s'."
-#~ msgstr "Objektnamnet är inte giltigt: \"%s\"."
+msgid ""
+"%s\n"
+"Your changes are safe in the stash.\n"
+"You can run \"git stash pop\" or \"git stash drop\" at any time.\n"
+msgstr ""
+"%s\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 "--name-only, --name-status, --check and -s are mutually exclusive"
-#~ msgstr ""
-#~ "--name-only, --name-status, --check och -s är ömsesidigt uteslutande"
+msgid "Applying autostash resulted in conflicts."
+msgstr "Tillämpning av autostash gav konflikter."
 
-#~ msgid "-G, -S and --find-object are mutually exclusive"
-#~ msgstr "-G, -S och --find-object är ömsesidigt uteslutande"
+msgid "Autostash exists; creating a new stash entry."
+msgstr "Autostash finns; skapar ny stash-post."
 
-#~ 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"
+msgid "could not detach HEAD"
+msgstr "kunde inte koppla från HEAD"
 
-#~ msgid ""
-#~ "--pickaxe-all and --find-object are mutually exclusive, use --pickaxe-all "
-#~ "with -G and -S"
-#~ msgstr ""
-#~ "--pickaxe-all och --find-object är ömsesidigt uteslutande, använd --"
-#~ "pickaxe-all med -G och -S"
+#, c-format
+msgid "Stopped at HEAD\n"
+msgstr "Stoppade på HEAD\n"
 
-#~ msgid "--stateless-rpc requires multi_ack_detailed"
-#~ msgstr "--stateless-rpc kräver \"multi_ack_detailed\""
+#, c-format
+msgid "Stopped at %s\n"
+msgstr "Stoppade på %s\n"
 
-#~ msgid "--left-only and --right-only are mutually exclusive"
-#~ msgstr "--left-only och --right-only är ömsesidigt uteslutande"
+#, c-format
+msgid ""
+"Could not execute the todo command\n"
+"\n"
+"    %.*s\n"
+"It has been rescheduled; To edit the command before continuing, please\n"
+"edit the todo list first:\n"
+"\n"
+"    git rebase --edit-todo\n"
+"    git rebase --continue\n"
+msgstr ""
+"Kunde inte köra todo-kommandot\n"
+"\n"
+"    %.*s\n"
+"Det har lagts tillbaka i kön; För att redigera kommandot innan du\n"
+"fortsätter, redigera först attgöra-listan:\n"
+"\n"
+"    git rebase --edit-todo\n"
+"    git rebase --continue\n"
 
 #, c-format
-#~ msgid "unrecognized %%(objectsize) argument: %s"
-#~ msgstr "okänt %%(objectsize)-argument: %s"
+msgid "Rebasing (%d/%d)%s"
+msgstr "Ombaserar (%d/%d)%s"
 
 #, c-format
-#~ msgid "unrecognized %%(subject) argument: %s"
-#~ msgstr "okänt %%(subject)-argument: %s"
+msgid "Stopped at %s...  %.*s\n"
+msgstr "Stoppade på %s... %.*s\n"
 
 #, c-format
-#~ msgid "unrecognized %%(contents) argument: %s"
-#~ msgstr "okänt %%(contents)-argument: %s"
+msgid "unknown command %d"
+msgstr "okänt kommando %d"
+
+msgid "could not read orig-head"
+msgstr "kunde inte läsa orig-head"
+
+msgid "could not read 'onto'"
+msgstr "kunde inte läsa \"onto\""
 
 #, c-format
-#~ msgid "unrecognized %%(raw) argument: %s"
-#~ msgstr "okänt %%(raw)-argument: %s"
+msgid "could not update HEAD to %s"
+msgstr "kunde inte uppdatera HEAD till %s"
 
 #, c-format
-#~ msgid "unrecognized argument '%s' in %%(%s)"
-#~ msgstr "okänt argument \"%s\" i %%(%s)"
+msgid "Successfully rebased and updated %s.\n"
+msgstr "Lyckades ombasera och uppdatera %s.\n"
+
+msgid "cannot rebase: You have unstaged changes."
+msgstr "kan inte ombasera: Du har oköade ändringar."
+
+msgid "cannot amend non-existing commit"
+msgstr "kan inte lägga till incheckning som inte finns"
 
 #, c-format
-#~ msgid "unrecognized %%(align) argument: %s"
-#~ msgstr "okänt %%(align)-argument: %s"
+msgid "invalid file: '%s'"
+msgstr "ogiltig fil: \"%s\""
 
 #, c-format
-#~ msgid "unrecognized %%(if) argument: %s"
-#~ msgstr "okänt %%(if)-argument: %s"
+msgid "invalid contents: '%s'"
+msgstr "ogiltigt innehåll: \"%s\""
+
+msgid ""
+"\n"
+"You have uncommitted changes in your working tree. Please, commit them\n"
+"first and then run 'git rebase --continue' again."
+msgstr ""
+"\n"
+"Du har ändringar i arbetskatalogen som inte checkats in. Checka in dem\n"
+"först och kör sedan \"git rebase --continue\" igen."
 
 #, c-format
-#~ msgid "format: %%(if) atom used without a %%(then) atom"
-#~ msgstr "format: atomen %%(if) använd utan en %%(then)-atom"
+msgid "could not write file: '%s'"
+msgstr "kunde inte skriva fil: \"%s\""
+
+msgid "could not remove CHERRY_PICK_HEAD"
+msgstr "kunde inte ta bort CHERRY_PICK_HEAD"
+
+msgid "could not commit staged changes."
+msgstr "kunde inte checka in köade ändringar."
 
 #, c-format
-#~ msgid "format: %%(then) atom used without an %%(if) atom"
-#~ msgstr "format: atomen %%(then) använd utan en %%(if)-atom"
+msgid "%s: can't cherry-pick a %s"
+msgstr "%s: kan inte göra \"cherry-pick\" på typen \"%s\""
 
 #, c-format
-#~ msgid "format: %%(else) atom used without a %%(then) atom"
-#~ msgstr "format: atomen %%(else) använd utan en %%(then)-atom"
+msgid "%s: bad revision"
+msgstr "%s: felaktig revision"
 
-#~ msgid "--unsorted-input is incompatible with --no-walk"
-#~ msgstr "--unsorted-input är inkompatibelt med --no-walk"
+msgid "can't revert as initial commit"
+msgstr "kan inte ångra som första incheckning"
 
-#~ msgid "--no-walk is incompatible with --unsorted-input"
-#~ msgstr "--no-walk är inkompatibelt med --unsorted-input"
+#, c-format
+msgid "skipped previously applied commit %s"
+msgstr "hoppade över tidigare applicerad incheckning %s"
 
-#~ msgid "--dry-run is incompatible with --interactive/--patch"
-#~ msgstr "--dry-run är inkompatibelt med --interactive/--patch"
+msgid "use --reapply-cherry-picks to include skipped commits"
+msgstr "använd --reapply-cherry-picks för att ta med överhoppade incheckningar"
 
-#~ msgid "--pathspec-from-file is incompatible with --interactive/--patch"
-#~ msgstr "--pathspec-from-file är inkompatibelt med --interactive/--patch"
+msgid "make_script: unhandled options"
+msgstr "make_script: flaggor som inte stöds"
 
-#~ msgid "--pathspec-from-file is incompatible with --edit"
-#~ msgstr "--pathspec-from-file är inkompatibelt med --edit"
+msgid "make_script: error preparing revisions"
+msgstr "make_script: fel när revisioner skulle förberedas"
 
-#~ msgid "-A and -u are mutually incompatible"
-#~ msgstr "-A och -u är ömsesidigt inkompatibla"
+msgid "nothing to do"
+msgstr "inget att göra"
 
-#~ msgid "Option --ignore-missing can only be used together with --dry-run"
-#~ msgstr ""
-#~ "Flaggan --ignore-missing kan endast användas tillsammans med --dry-run"
+msgid "could not skip unnecessary pick commands"
+msgstr "kunde inte hoppa över onödiga \"pick\"-kommandon"
 
-#~ msgid "--pathspec-from-file is incompatible with pathspec arguments"
-#~ msgstr ""
-#~ "--pathspec-from-file är inkompatibelt med sökvägsangivelsesparametrar"
+msgid "the script was already rearranged."
+msgstr "skriptet har redan omordnats."
 
-#~ msgid "--pathspec-file-nul requires --pathspec-from-file"
-#~ msgstr "--pathspec-file-nul kräver --pathspec-from-file"
+#, c-format
+msgid "'%s' is outside repository at '%s'"
+msgstr "\"%s\" är utanför arkivet på \"%s\""
 
 #, 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"
+msgid ""
+"%s: no such path in the working tree.\n"
+"Use 'git <command> -- <path>...' to specify paths that do not exist locally."
+msgstr ""
+"%s: sökvägen finns inte i arbetskatalogen.\n"
+"Använd \"git <kommando> -- <sökväg>..\" för att ange sökvägar som inte finns "
+"lokalt."
 
-#~ msgid "--column and --verbose are incompatible"
-#~ msgstr "--column och --verbose är inkompatibla"
+#, c-format
+msgid ""
+"ambiguous argument '%s': unknown revision or path not in the working tree.\n"
+"Use '--' to separate paths from revisions, like this:\n"
+"'git <command> [<revision>...] -- [<file>...]'"
+msgstr ""
+"tvetydigt argument \"%s\": okänd revision eller sökväg inte i "
+"arbetskatalogen.\n"
+"Använd \"--\" för att skilja sökvägar från revisioner, så här:\n"
+"\"git <kommando> [<revision>...] -- [<fil>...]\""
 
 #, c-format
-#~ msgid "'%s' cannot be used with %s"
-#~ msgstr "\"%s\" kan inte användas med %s"
+msgid "option '%s' must come before non-option arguments"
+msgstr "flaggan \"%s\" måste anges före argument som inte är flaggor"
 
-#~ msgid "set upstream info for new branch"
-#~ msgstr "sätt uppströmsinformation för ny gren"
+#, c-format
+msgid ""
+"ambiguous argument '%s': both revision and filename\n"
+"Use '--' to separate paths from revisions, like this:\n"
+"'git <command> [<revision>...] -- [<file>...]'"
+msgstr ""
+"tvetydigt argument \"%s\": både revision och filnamn\n"
+"Använd \"--\" för att skilja sökvägar från revisioner, så här:\n"
+"\"git <kommando> [<revision>...] -- [<fil>...]\""
+
+msgid "unable to set up work tree using invalid config"
+msgstr "kan inte skapa arbetskatalog med felaktig konfiguration"
 
 #, c-format
-#~ msgid "-%c, -%c and --orphan are mutually exclusive"
-#~ msgstr "-%c, -%c och --orphan är ömsesidigt uteslutande"
+msgid "Expected git repo version <= %d, found %d"
+msgstr "Förväntade git-arkivversion <= %d, hittade %d"
 
-#~ msgid "-p and --overlay are mutually exclusive"
-#~ msgstr "-p och --overlay är ömsesidigt uteslutande"
+msgid "unknown repository extension found:"
+msgid_plural "unknown repository extensions found:"
+msgstr[0] "okänd arkivutökning hittades:"
+msgstr[1] "okända arkivutökningar hittades:"
 
-#~ msgid "--pathspec-from-file is incompatible with --detach"
-#~ msgstr "--pathspec-from-file är inkompatibelt med --detach"
+msgid "repo version is 0, but v1-only extension found:"
+msgid_plural "repo version is 0, but v1-only extensions found:"
+msgstr[0] "arkivversionen är 0, men utökning som bara finns i v1 upptäcktes:"
+msgstr[1] "arkivversionen är 0, men utökningar som bara finns i v1 upptäcktes:"
 
-#~ msgid "--pathspec-from-file is incompatible with --patch"
-#~ msgstr "--pathspec-from-file är inkompatibelt med --patch"
+#, c-format
+msgid "error opening '%s'"
+msgstr "fel vid öppning av \"%s\""
 
 #, c-format
-#~ msgid "--bare and --origin %s options are incompatible."
-#~ msgstr "flaggorna --bare och --origin %s är inkompatibla."
+msgid "too large to be a .git file: '%s'"
+msgstr "för stor för att vara en .git-fil: \"%s\""
 
-#~ msgid "--bare and --separate-git-dir are incompatible."
-#~ msgstr "flaggorna --bare och --separate-git-dir är inkompatibla."
+#, c-format
+msgid "error reading %s"
+msgstr "fel vid läsning av %s"
 
-#~ msgid "--pathspec-from-file with -a does not make sense"
-#~ msgstr "--pathspec-from-file med -a ger ingen mening"
+#, c-format
+msgid "invalid gitfile format: %s"
+msgstr "ogiltigt gitfilformat: %s"
 
 #, c-format
-#~ msgid "cannot combine -m with --fixup:%s"
-#~ msgstr "kan inte kombinera -m med --fixup:%s"
+msgid "no path in gitfile: %s"
+msgstr "ingen sökväg i gitfil: %s"
 
-#~ msgid "--long and -z are incompatible"
-#~ msgstr "--long och -z är inkompatibla"
+#, c-format
+msgid "not a git repository: %s"
+msgstr "inte ett git-arkiv: %s"
 
 #, 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\""
+msgid "'$%s' too big"
+msgstr "\"$%s\" för stor"
 
-#~ msgid ""
-#~ "reword option of --fixup is mutually exclusive with --patch/--"
-#~ "interactive/--all/--include/--only"
-#~ msgstr ""
-#~ "omformuleringsflaggan i --fixup är ömsesidigt uteslutande med --patch/--"
-#~ "interactive/--all/--include/--only"
+#, c-format
+msgid "not a git repository: '%s'"
+msgstr "inte ett git-arkiv: \"%s\""
 
-#~ msgid "--long is incompatible with --abbrev=0"
-#~ msgstr "--long är inkompatibel med --abbrev=0"
+#, c-format
+msgid "cannot chdir to '%s'"
+msgstr "kan inte byta katalog (chdir) till \"%s\""
 
-#~ msgid "--dirty is incompatible with commit-ishes"
-#~ msgstr "--dirty är inkompatibelt med \"commit-ish\"-värden"
+msgid "cannot come back to cwd"
+msgstr "kan inte gå tillbaka till arbetskatalogen (cwd)"
 
-#~ msgid "--broken is incompatible with commit-ishes"
-#~ msgstr "--broken är inkompatibelt med \"commit-ish\"-värden"
+#, c-format
+msgid "failed to stat '%*s%s%s'"
+msgstr "misslyckades ta status på \"%*ss%s%s\""
 
-#~ msgid "--stdin and --merge-base are mutually exclusive"
-#~ msgstr "--stdin och --merge-base är ömsesidigt uteslutande"
+msgid "Unable to read current working directory"
+msgstr "Kan inte läsa aktuell arbetskatalog"
 
-#~ msgid "--dir-diff is incompatible with --no-index"
-#~ msgstr "--dir-diff är inkompatibelt med --no-index"
+#, c-format
+msgid "cannot change to '%s'"
+msgstr "kan inte byta till \"%s\""
 
-#~ msgid "--gui, --tool and --extcmd are mutually exclusive"
-#~ msgstr "--gui, --tool och --extcmd är ömsesidigt uteslutande"
+#, c-format
+msgid "not a git repository (or any of the parent directories): %s"
+msgstr "inte ett git-arkiv (eller någon av föräldrakatalogerna): %s"
 
-#~ msgid "--anonymize-map without --anonymize does not make sense"
-#~ msgstr "--anonymize-map utan --anonymize ger ingen mening"
+#, 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 ""
+"inte ett git-arkiv (eller någon av föräldrakatalogerna upp till "
+"monteringspunkten %s)\n"
+"Stoppar vid filsystemsgräns (GIT_DISCOVERY_ACROSS_FILESYSTEM är inte satt)."
 
-#~ msgid "Cannot pass both --import-marks and --import-marks-if-exists"
-#~ msgstr "Kan inte ange både --import-marks och --import-marks-if-exists"
+#, c-format
+msgid ""
+"unsafe repository ('%s' is owned by someone else)\n"
+"To add an exception for this directory, call:\n"
+"\n"
+"\tgit config --global --add safe.directory %s"
+msgstr ""
+"osäkert arkiv (\"%s\" ägs av någon annan)\n"
+"För att lägga till ett undantag för denna katalog, kör:\n"
+"\n"
+"\tgit config --global --add safe.directory %s"
+
+#, c-format
+msgid ""
+"problem with core.sharedRepository filemode value (0%.3o).\n"
+"The owner of files must always have read and write permissions."
+msgstr ""
+"problem med filläges-värdet i core.sharedRepository (0%.3o).\n"
+"Ägaren av filerna måste alltid ha läs- och skrivbehörighet."
+
+msgid "fork failed"
+msgstr "\"fork\" misslyckades"
+
+msgid "setsid failed"
+msgstr "\"setsid\" misslyckades"
+
+#, c-format
+msgid "index entry is a directory, but not sparse (%08x)"
+msgstr "indexposten är en katalog, men inte gles (%08x)"
+
+msgid "cannot use split index with a sparse index"
+msgstr "kan inte dela indexet med ett glest index"
+
+#. TRANSLATORS: IEC 80000-13:2008 gibibyte
+#, c-format
+msgid "%u.%2.2u GiB"
+msgstr "%u,%2.2u GiB"
+
+#. TRANSLATORS: IEC 80000-13:2008 gibibyte/second
+#, c-format
+msgid "%u.%2.2u GiB/s"
+msgstr "%u,%2.2u GiB/s"
+
+#. TRANSLATORS: IEC 80000-13:2008 mebibyte
+#, c-format
+msgid "%u.%2.2u MiB"
+msgstr "%u,%2.2u MiB"
+
+#. TRANSLATORS: IEC 80000-13:2008 mebibyte/second
+#, c-format
+msgid "%u.%2.2u MiB/s"
+msgstr "%u,%2.2u MiB/s"
+
+#. TRANSLATORS: IEC 80000-13:2008 kibibyte
+#, c-format
+msgid "%u.%2.2u KiB"
+msgstr "%u,%2.2u KiB"
+
+#. TRANSLATORS: IEC 80000-13:2008 kibibyte/second
+#, c-format
+msgid "%u.%2.2u KiB/s"
+msgstr "%u,%2.2u KiB/s"
+
+#. TRANSLATORS: IEC 80000-13:2008 byte
+#, c-format
+msgid "%u byte"
+msgid_plural "%u bytes"
+msgstr[0] "%u byte"
+msgstr[1] "%u bytes"
+
+#. TRANSLATORS: IEC 80000-13:2008 byte/second
+#, c-format
+msgid "%u byte/s"
+msgid_plural "%u bytes/s"
+msgstr[0] "%u byte/s"
+msgstr[1] "%u bytes/s"
+
+#, c-format
+msgid "could not edit '%s'"
+msgstr "kunde inte redigera \"%s\""
+
+#, c-format
+msgid "ignoring suspicious submodule name: %s"
+msgstr "ignorerar misstänkt undermodulnamn: %s"
+
+msgid "negative values not allowed for submodule.fetchJobs"
+msgstr "negativa värden är inte tillåtna för submodule.fetchJobs"
+
+#, c-format
+msgid "ignoring '%s' which may be interpreted as a command-line option: %s"
+msgstr "ignorerar \"%s\" som kan tolkas som en kommandoradsflagga: %s"
+
+#, c-format
+msgid "Could not update .gitmodules entry %s"
+msgstr "Kunde inte uppdatera .gitmodules-posten %s"
+
+msgid "Cannot change unmerged .gitmodules, resolve merge conflicts first"
+msgstr ""
+"Kan inte ändra .gitmodules-fil som inte slagits ihop, lös "
+"sammanslagningskonflikter först"
+
+#, c-format
+msgid "Could not find section in .gitmodules where path=%s"
+msgstr "Hittade inte någon sektion i .gitmodules där sökväg=%s"
+
+#, c-format
+msgid "Could not remove .gitmodules entry for %s"
+msgstr "Kunde inte ta bort .gitmodules-posten för %s"
+
+msgid "staging updated .gitmodules failed"
+msgstr "misslyckades köa uppdaterad .gitmodules"
+
+#, c-format
+msgid "in unpopulated submodule '%s'"
+msgstr "i ej utcheckad undermodul \"%s\""
+
+#, c-format
+msgid "Pathspec '%s' is in submodule '%.*s'"
+msgstr "Sökvägsangivelsen \"%s\" är i undermodulen \"%.*s\""
+
+#, c-format
+msgid "bad --ignore-submodules argument: %s"
+msgstr "felaktigt argument till --ignore-submodules: %s"
+
+#, c-format
+msgid ""
+"Submodule in commit %s at path: '%s' collides with a submodule named the "
+"same. Skipping it."
+msgstr ""
+"Undermodulen i incheckning %s på sökvägen: \"%s\" krockar med en undermodul "
+"med samma namn. Hoppar över den."
+
+#, c-format
+msgid "submodule entry '%s' (%s) is a %s, not a commit"
+msgstr "undermodulposten \"%s\" (%s) är en %s, inte en incheckning"
+
+#, c-format
+msgid ""
+"Could not run 'git rev-list <commits> --not --remotes -n 1' command in "
+"submodule %s"
+msgstr ""
+"kunde inte köra \"git rev-list <incheckningar> --not --remotes -n 1\" i "
+"undermodulen \"%s\""
+
+#, c-format
+msgid "process for submodule '%s' failed"
+msgstr "process för undermodulen \"%s\" misslyckades"
+
+#, c-format
+msgid "Pushing submodule '%s'\n"
+msgstr "Sänder undermodulen \"%s\"\n"
+
+#, c-format
+msgid "Unable to push submodule '%s'\n"
+msgstr "Kunde inte sända undermodulen \"%s\"\n"
 
 #, 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"
+msgid "Fetching submodule %s%s\n"
+msgstr "Hämtar undermodulen %s%s\n"
 
-#~ msgid "--deepen and --depth are mutually exclusive"
-#~ msgstr "--deepen och --depth är ömsesidigt uteslutande"
+#, c-format
+msgid "Could not access submodule '%s'\n"
+msgstr "Kunde inte komma åt undermodulen \"%s\"\n"
 
-#~ msgid "--depth and --unshallow cannot be used together"
-#~ msgstr "--depth och --unshallow kan inte användas samtidigt"
+#, c-format
+msgid "Could not access submodule '%s' at commit %s\n"
+msgstr "Kunde inte komma åt undermodulen \"%s\" vid incheckningen %s\n"
 
-#~ msgid "--fix-thin cannot be used without --stdin"
-#~ msgstr "--fix-thin kan inte användas med --stdin"
+#, c-format
+msgid "Fetching submodule %s%s at commit %s\n"
+msgstr "Hämtar undermodulen %s%s vvid incheckningen %s\n"
+
+#, c-format
+msgid ""
+"Errors during submodule fetch:\n"
+"%s"
+msgstr ""
+"Fel vid hämtning av undermodul:\n"
+"%s"
 
-#~ msgid "--object-format cannot be used with --stdin"
-#~ msgstr "--object-format kan inte användas med --stdin"
+#, c-format
+msgid "'%s' not recognized as a git repository"
+msgstr "\"%s\" känns inte igen som ett git-arkiv"
 
-#~ msgid "--separate-git-dir and --bare are mutually exclusive"
-#~ msgstr "--separate-git-dir och --bare är ömsesidigt uteslutande"
+#, 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\""
 
-#~ msgid "-n and -k are mutually exclusive"
-#~ msgstr "-n och -k kan inte användas samtidigt"
+#, c-format
+msgid "'git status --porcelain=2' failed in submodule %s"
+msgstr "\"git status --porcelain=2\" misslyckades i undermodulen \"%s\""
 
-#~ msgid "--subject-prefix/--rfc and -k are mutually exclusive"
-#~ msgstr "--subject-prefix/--rfc och -k kan inte användas samtidigt"
+#, c-format
+msgid "could not start 'git status' in submodule '%s'"
+msgstr "kunde inte starta \"git status\" i undermodulen \"%s\""
+
+#, c-format
+msgid "could not run 'git status' in submodule '%s'"
+msgstr "kunde inte köra \"git status\" i undermodulen \"%s\""
+
+#, c-format
+msgid "Could not unset core.worktree setting in submodule '%s'"
+msgstr "Kunde inte ta bort inställningen core.worktree i undermodulen \"%s\""
+
+#, c-format
+msgid "could not recurse into submodule '%s'"
+msgstr "kunde inte rekursera in i undermodulen \"%s\""
+
+msgid "could not reset submodule index"
+msgstr "kunde inte återställa indexet i undermodul"
+
+#, c-format
+msgid "submodule '%s' has dirty index"
+msgstr "undermodulen \"%s\" har ett smutsigt index"
+
+#, c-format
+msgid "Submodule '%s' could not be updated."
+msgstr "Undermoduler \"%s\" kunde inte uppdateras."
+
+#, c-format
+msgid "submodule git dir '%s' is inside git dir '%.*s'"
+msgstr "undermodul-gitkatalogen \"%s\" är inuti gitkatalogen \"%.*s\""
+
+#, c-format
+msgid ""
+"relocate_gitdir for submodule '%s' with more than one worktree not supported"
+msgstr ""
+"relocate_gitdir för undermodulen \"%s\", som har mer än en arbetskatalog, "
+"stöds ej"
+
+#, c-format
+msgid "could not lookup name for submodule '%s'"
+msgstr "kunde inte slå upp namnet för undermodulen \"%s\""
+
+#, c-format
+msgid "refusing to move '%s' into an existing git dir"
+msgstr "vägrar flytta \"%s\" till en befintlig gitkatalog"
+
+#, c-format
+msgid ""
+"Migrating git directory of '%s%s' from\n"
+"'%s' to\n"
+"'%s'\n"
+msgstr ""
+"Migrerar git-katalogen för \"%s%s\" från\n"
+"\"%s\" till\n"
+"\"%s\"\n"
+
+msgid "could not start ls-files in .."
+msgstr "kunde inte starta ls-files i .."
+
+#, c-format
+msgid "ls-tree returned unexpected return code %d"
+msgstr "ls-tree returnerade en oväntad returkod %d"
 
-#~ msgid "--stdout, --output, and --output-directory are mutually exclusive"
-#~ msgstr ""
-#~ "--stdout, --output, och --output-directory är ömsesidigt uteslutande"
+#, c-format
+msgid "failed to lstat '%s'"
+msgstr "misslyckades ta status (lstat) på \"%s\""
 
-#~ msgid "--creation-factor requires --range-diff"
-#~ msgstr "--creation-factor kräver --range-diff"
+msgid "unhandled options"
+msgstr "flaggor som inte hanterats"
 
-#~ msgid "You cannot combine --squash with --no-ff."
-#~ msgstr "Du kan inte kombinera --squash med --no-ff."
+msgid "error preparing revisions"
+msgstr "fel när revisioner skulle förberedas"
 
-#~ msgid "You cannot combine --squash with --commit."
-#~ msgstr "Du kan inte kombinera --squash med --commit."
+#, c-format
+msgid "commit %s is not marked reachable"
+msgstr "incheckning %s är inte märkt nåbar"
 
-#~ msgid "--keep-unreachable and --unpack-unreachable are incompatible"
-#~ msgstr ""
-#~ "--keep-unreachable och --unpack-unreachable kan inte användas samtidigt"
+msgid "too many commits marked reachable"
+msgstr "för många incheckningar markerade nåbara"
 
-#~ msgid "--delete is incompatible with --all, --mirror and --tags"
-#~ msgstr "--delete är inkompatibel med --all, --mirror och --tags"
+msgid "test-tool serve-v2 [<options>]"
+msgstr "test-tool serve-v2 [<flaggor>]"
 
-#~ msgid "--all and --tags are incompatible"
-#~ msgstr "--all och --tags är inkompatibla"
+msgid "exit immediately after advertising capabilities"
+msgstr "avsluta omedelbart efter kungörelse av kapabiliteter"
 
-#~ msgid "--mirror and --tags are incompatible"
-#~ msgstr "--mirror och --tags är inkompatibla"
+msgid "test-helper simple-ipc is-active    [<name>] [<options>]"
+msgstr "test-helper simple-ipc is-active    [<namn>] [<flaggor>]"
 
-#~ msgid "--all and --mirror are incompatible"
-#~ msgstr "--all och --mirror är inkompatibla"
+msgid "test-helper simple-ipc run-daemon   [<name>] [<threads>]"
+msgstr "test-helper simple-ipc run-daemon   [<namn>] [<trådar>]"
 
-#~ msgid "cannot combine '--keep-base' with '--onto'"
-#~ msgstr "kan inte kombinera \"--keep-base\" med \"--onto\""
+msgid "test-helper simple-ipc start-daemon [<name>] [<threads>] [<max-wait>]"
+msgstr ""
+"test-helper simple-ipc start-daemon [<namn>] [<trådar>] [<max-väntetid>]"
 
-#~ msgid "cannot combine '--keep-base' with '--root'"
-#~ msgstr "kan inte kombinera \"--keep-base\" med \"--root\""
+msgid "test-helper simple-ipc stop-daemon  [<name>] [<max-wait>]"
+msgstr "test-helper simple-ipc stop-daemon  [<namn>] [<max-väntetid>]"
 
-#~ msgid "cannot combine '--root' with '--fork-point'"
-#~ msgstr "kan inte kombinera \"--root\" med \"--fork-point\""
+msgid "test-helper simple-ipc send         [<name>] [<token>]"
+msgstr "test-helper simple-ipc send         [<namn>] [<igenkänningstecken>]"
 
-#~ msgid "cannot combine apply options with merge options"
-#~ msgstr "kan inte kombinera apply-flaggor med merge-flaggor"
+msgid "test-helper simple-ipc sendbytes    [<name>] [<bytecount>] [<byte>]"
+msgstr "test-helper simple-ipc sendbytes    [<namn>] [<antal-byte>] [<byte>]"
 
-#~ msgid "--keep-unreachable and -A are incompatible"
-#~ msgstr "--keep-unreachable och -A kan inte användas samtidigt"
+msgid ""
+"test-helper simple-ipc multiple     [<name>] [<threads>] [<bytecount>] "
+"[<batchsize>]"
+msgstr ""
+"test-helper simple-ipc multiple     [<namn>] [<trådar>] [<antal-byte>] "
+"[<buntstorlek>]"
 
-#~ msgid "--geometric is incompatible with -A, -a"
-#~ msgstr "--geometric är inkompatibel med -A, -a"
+msgid "name or pathname of unix domain socket"
+msgstr "namn eller sövkäg till unixdomän-uttag"
 
-#~ msgid "--patch is incompatible with --{hard,mixed,soft}"
-#~ msgstr "--patch är inkompatibel med --{hard,mixed,soft}"
+msgid "named-pipe name"
+msgstr "namn på namngivet rör"
 
-#~ msgid "-N can only be used with --mixed"
-#~ msgstr "-N kan endast användas med --mixed"
+msgid "number of threads in server thread pool"
+msgstr "antal trådar i serverns trådpool"
 
-#~ msgid "cannot combine --exclude-promisor-objects and --missing"
-#~ msgstr "kan inte kombinera --exclude-promisor-objects och --missing"
+msgid "seconds to wait for daemon to start or stop"
+msgstr "sekunder att vänta på att serverprocessen startar eller stoppar"
 
-#~ msgid "marked counting is incompatible with --objects"
-#~ msgstr "markerad räkning är inkompatibelt med --objects"
+msgid "number of bytes"
+msgstr "antal byte"
 
-#~ msgid ""
-#~ "--reflog is incompatible with --all, --remotes, --independent or --merge-"
-#~ "base"
-#~ msgstr ""
-#~ "--reflog är inkompatibel med --all, --remotes, --independent eller --"
-#~ "merge-base"
+msgid "number of requests per thread"
+msgstr "antal frågor per tråd"
 
-#~ msgid "git sparse-checkout reapply"
-#~ msgstr "git sparse-checkout reapply"
+msgid "byte"
+msgstr "byte"
 
-#~ msgid "--cached and --files are mutually exclusive"
-#~ msgstr "--cached och --files är ömsesidigt uteslutande"
+msgid "ballast character"
+msgstr "ballasttecken"
 
-#~ msgid "--branch and --default are mutually exclusive"
-#~ msgstr "--branch och --default är ömsesidigt uteslutande"
+msgid "token"
+msgstr "igenkänningstecken"
 
-#~ msgid "--column and -n are incompatible"
-#~ msgstr "--column och -n är inkompatibla"
+msgid "command token to send to the server"
+msgstr "igenkänningstecken för kommando att sända till servern"
 
-#~ msgid "--contains option is only allowed in list mode"
-#~ msgstr "Flaggan --contains är endast tillåten i listläge"
+#, c-format
+msgid "running trailer command '%s' failed"
+msgstr "misslyckades utföra släpradskommandot \"%s\""
 
-#~ msgid "--no-contains option is only allowed in list mode"
-#~ msgstr "Flaggan --no-contains är endast tillåten i listläge"
+#, c-format
+msgid "unknown value '%s' for key '%s'"
+msgstr "okänt värde \"%s\" för nyckeln \"%s\""
 
-#~ msgid "--points-at option is only allowed in list mode"
-#~ msgstr "Flaggan --points-at är endast tillåten i listläge"
+#, c-format
+msgid "empty trailer token in trailer '%.*s'"
+msgstr "tom släpradssymbol i släpraden \"%.*s\""
 
-#~ 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"
+#, c-format
+msgid "could not read input file '%s'"
+msgstr "kunde inte läsa indatafilen \"%s\""
 
-#~ msgid "only one -F or -m option is allowed."
-#~ msgstr "endast en av flaggorna -F eller -m tillåts."
+#, c-format
+msgid "could not stat %s"
+msgstr "kunde inte ta status på %s"
 
-#~ msgid "-b, -B, and --detach are mutually exclusive"
-#~ msgstr "-b, -B och --detach är ömsesidigt uteslutande"
+#, c-format
+msgid "file %s is not a regular file"
+msgstr "filen %s är inte en normal fil"
 
-#~ msgid "--reason requires --lock"
-#~ msgstr "--reason kräver --lock"
+#, c-format
+msgid "file %s is not writable by user"
+msgstr "filen %s är inte skrivbar av användaren"
 
-#~ msgid "--verbose and --porcelain are mutually exclusive"
-#~ msgstr "--verbose och --porcelain är ömsesidigt uteslutande"
+msgid "could not open temporary file"
+msgstr "kunde inte öppna temporär fil"
 
 #, c-format
-#~ msgid "no directory given for --git-dir\n"
-#~ msgstr "ingen katalog angavs för --git-dir\n"
+msgid "could not rename temporary file to %s"
+msgstr "kunde inte byta namn på temporär fil till %s"
+
+msgid "full write to remote helper failed"
+msgstr "komplett skrivning till fjärrhjälpare misslyckades"
 
 #, c-format
-#~ msgid "no directory given for --work-tree\n"
-#~ msgstr "ingen katalog angavs för --work-tree\n"
+msgid "unable to find remote helper for '%s'"
+msgstr "kan inte hitta fjärrhjälpare för \"%s\""
 
-#~ msgid "--packfile requires --index-pack-args"
-#~ msgstr "--packfile kräver --index-pack-args"
+msgid "can't dup helper output fd"
+msgstr "kunde inte duplicera utdata-filhandtag"
 
-#~ msgid "--index-pack-args can only be used with --packfile"
-#~ msgstr "--index-pack-args kan endast användas med --packfile"
+#, c-format
+msgid ""
+"unknown mandatory capability %s; this remote helper probably needs newer "
+"version of Git"
+msgstr ""
+"okänd krävd förmåga (capability) %s; fjärrhjälparen behöver antagligen en "
+"nyare version av Git"
 
-#~ msgid "gpg.ssh.defaultKeycommand succeeded but returned no keys: %s %s"
-#~ msgstr "gpg.ssh.defaultKeycommand lyckades men gav inga nycklar: %s %s"
+msgid "this remote helper should implement refspec capability"
+msgstr ""
+"fjärrhjälparen behöver implementera förmåga för referensspecifikationer "
+"(refspec)"
 
-#~ msgid "--format=%.*s cannot be used with--python, --shell, --tcl"
-#~ msgstr "--format=%.*s kan inte användas med --python, --shell, --tcl"
+#, c-format
+msgid "%s unexpectedly said: '%s'"
+msgstr "%s sade oväntat: \"%s\""
 
-#~ msgid "unable to rename temporary '*.%s' file to '%s"
-#~ msgstr "kunde inte byta namn på temporär \"*.%s\"-fil till \"%s\""
+#, c-format
+msgid "%s also locked %s"
+msgstr "%s låste också %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 "couldn't run fast-import"
+msgstr "kunde inte köra fast-import"
 
-#~ 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 "error while running fast-import"
+msgstr "fel när fast-import kördes"
 
-#~ msgid "could not set GIT_DIR to '%s'"
-#~ msgstr "kunde inte ställa in GIT_DIR till \"%s\""
+#, c-format
+msgid "could not read ref %s"
+msgstr "kunde inte läsa referensen %s"
 
-#~ msgid "unable to unpack %s header with --allow-unknown-type"
-#~ msgstr "kan inte packa upp %s-huvud med --allow-unknown-type"
+#, c-format
+msgid "unknown response to connect: %s"
+msgstr "okänt svar på ansluntning: %s"
 
-#~ msgid "unable to parse %s header with --allow-unknown-type"
-#~ msgstr "kan inte tolka %s-huvud med --allow-unknown-type"
+msgid "setting remote service path not supported by protocol"
+msgstr "protkollet stöder inte att sätta sökväg till fjärrtjänst"
 
-#~ msgid "open /dev/null failed"
-#~ msgstr "misslyckades öppna /dev/null"
+msgid "invalid remote service path"
+msgstr "felaktig sökväg till fjärrtjänst"
 
-#~ 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 "operation not supported by protocol"
+msgstr "funktionen stöds inte av protokollet"
 
-#~ msgid "open /dev/null or dup failed"
-#~ msgstr "misslyckades öppna /dev/null eller \"dup\""
+#, c-format
+msgid "can't connect to subservice %s"
+msgstr "kan inte ansluta till undertjänsten %s"
 
-#~ msgid "attempting to use sparse-index without cone mode"
-#~ msgstr "försöker använda glest index utan \"cone\"-läge"
+msgid "--negotiate-only requires protocol v2"
+msgstr "--negotiate-only kräver protokoll v2"
 
-#~ msgid "unable to update cache-tree, staying full"
-#~ msgstr "kan inte uppdatera cacheträd, behåller fullt läge"
+msgid "'option' without a matching 'ok/error' directive"
+msgstr "\"option\" utan mostsvarande \"ok/error\"-direktiv"
 
-#~ msgid "Could not open '%s' for writing."
-#~ msgstr "Kunde inte öppna \"%s\" för skrivning."
+#, c-format
+msgid "expected ok/error, helper said '%s'"
+msgstr "förväntade ok/error, hjälpprogrammet svarade \"%s\""
 
-#~ msgid "could not create archive file '%s'"
-#~ msgstr "kunde inte skapa arkivfilen \"%s\""
+#, c-format
+msgid "helper reported unexpected status of %s"
+msgstr "hjälparen returnerade oväntad status %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>"
+#, c-format
+msgid "helper %s does not support dry-run"
+msgstr "hjälparen %s stöder inte dry-run"
 
-#~ msgid "--bisect-next-check requires 2 or 3 arguments"
-#~ msgstr "--bisect-next-check kräver 2 eller 3 argument"
+#, c-format
+msgid "helper %s does not support --signed"
+msgstr "hjälparen %s stöder inte --signed"
 
-#~ msgid "couldn't create a new file at '%s'"
-#~ msgstr "kunde inte skapa filen på \"%s\""
+#, c-format
+msgid "helper %s does not support --signed=if-asked"
+msgstr "hjälparen %s stöder inte --signed=if-asked"
 
-#~ msgid "git commit-tree: failed to open '%s'"
-#~ msgstr "git commit-tree: misslyckades öppna \"%s\""
+#, c-format
+msgid "helper %s does not support --atomic"
+msgstr "hjälparen %s stöder inte --atomic"
 
-#~ msgid "cannot open packfile '%s'"
-#~ msgstr "kan inte öppna paketfilen \"%s\""
+#, c-format
+msgid "helper %s does not support --%s"
+msgstr "hjälparen %s stöder inte --%s"
 
-#~ msgid "cannot store pack file"
-#~ msgstr "kan inte spara paketfil"
+#, c-format
+msgid "helper %s does not support 'push-option'"
+msgstr "hjälparen %s stöder inte \"push-option\""
 
-#~ msgid "exclude patterns are read from <file>"
-#~ msgstr "exkludera mönster som läses från <fil>"
+msgid "remote-helper doesn't support push; refspec needed"
+msgstr "fjärrhjälparen stöder inte push; referensspecifikation krävs"
 
-#~ msgid "Unknown option for merge-recursive: -X%s"
-#~ msgstr "Felaktig flagga för merge-recursive: -X%s"
+#, c-format
+msgid "helper %s does not support 'force'"
+msgstr "hjälparen %s stöder inte \"force\""
 
-#~ msgid "unusable todo list: '%s'"
-#~ msgstr "oanvändbar todo-lista: %s"
+msgid "couldn't run fast-export"
+msgstr "kunde inte köra fast-export"
 
-#~ msgid "git rebase--interactive [<options>]"
-#~ msgstr "git rebase--interactive [<flaggor>]"
+msgid "error while running fast-export"
+msgstr "fel vid körning av fast-export"
 
-#~ msgid "rebase merge commits"
-#~ msgstr "ombasera sammanslagningar"
+#, c-format
+msgid ""
+"No refs in common and none specified; doing nothing.\n"
+"Perhaps you should specify a branch.\n"
+msgstr ""
+"Inga gemensamma referenser och inga angavs; gör inget.\n"
+"Du kanske borde ange en gren.\n"
 
-#~ msgid "keep original branch points of cousins"
-#~ msgstr "behåll ursprungliga förgreningspunkter för kusiner"
+#, c-format
+msgid "unsupported object format '%s'"
+msgstr "objektformatet \"%s\" stöds ej"
 
-#~ msgid "move commits that begin with squash!/fixup!"
-#~ msgstr "flytta incheckningar som inleds med squash!/fixup!"
+#, c-format
+msgid "malformed response in ref list: %s"
+msgstr "felformat svar i referenslistan: %s"
 
-#~ msgid "sign commits"
-#~ msgstr "signera incheckningar"
+#, c-format
+msgid "read(%s) failed"
+msgstr "läs(%s) misslyckades"
 
-#~ msgid "continue rebase"
-#~ msgstr "fortsätt ombasering"
+#, c-format
+msgid "write(%s) failed"
+msgstr "skriv(%s) misslyckades"
 
-#~ msgid "skip commit"
-#~ msgstr "hoppa över incheckning"
+#, c-format
+msgid "%s thread failed"
+msgstr "%s-tråden misslyckades"
 
-#~ msgid "edit the todo list"
-#~ msgstr "redigera attgöra-listan"
+#, c-format
+msgid "%s thread failed to join: %s"
+msgstr "%s-tråden misslyckades ansluta: %s"
 
-#~ msgid "shorten commit ids in the todo list"
-#~ msgstr "förkorta inchecknings-id i todo-listan"
+#, c-format
+msgid "can't start thread for copying data: %s"
+msgstr "kan inte starta tråd för kopiering av data: %s"
 
-#~ msgid "expand commit ids in the todo list"
-#~ msgstr "utöka inchecknings-id i todo-listan"
+#, c-format
+msgid "%s process failed to wait"
+msgstr "processen %s misslyckades vänta"
 
-#~ msgid "check the todo list"
-#~ msgstr "kontrollera todo-listan"
+#, c-format
+msgid "%s process failed"
+msgstr "processen %s misslyckades"
 
-#~ msgid "rearrange fixup/squash lines"
-#~ msgstr "ordna om fixup-/squash-rader"
+msgid "can't start thread for copying data"
+msgstr "kan inte skapa tråd för kopiering av data"
 
-#~ msgid "insert exec commands in todo list"
-#~ msgstr "lägg in exec-kommandon i todo-listan"
+#, c-format
+msgid "Would set upstream of '%s' to '%s' of '%s'\n"
+msgstr "Skulle sätta uppströms för \"%s\" till \"%s\" från \"%s\"\n"
 
-#~ msgid "onto"
-#~ msgstr "ovanpå"
+#, c-format
+msgid "could not read bundle '%s'"
+msgstr "kunde inte läsa bunten \"%s\""
 
-#~ msgid "restrict-revision"
-#~ msgstr "restrict-revision"
+#, c-format
+msgid "transport: invalid depth option '%s'"
+msgstr "transport: ogiltig flagga för depth: \"%s\""
 
-#~ msgid "restrict revision"
-#~ msgstr "begränsa revision"
+msgid "see protocol.version in 'git help config' for more details"
+msgstr "se protocol.version i \"git help config\" för mer information"
 
-#~ msgid "squash-onto"
-#~ msgstr "squash-onto"
+msgid "server options require protocol version 2 or later"
+msgstr "serverflaggor kräver protokollversion 2 eller senare"
 
-#~ msgid "squash onto"
-#~ msgstr "tryck ihop ovanpå"
+msgid "server does not support wait-for-done"
+msgstr "servern stöder inte wait-for-done"
 
-#~ msgid "the upstream commit"
-#~ msgstr "uppströmsincheckningen"
+msgid "could not parse transport.color.* config"
+msgstr "kunde inte tolka inställningen för transport.color.*"
 
-#~ msgid "head-name"
-#~ msgstr "head-name"
+msgid "support for protocol v2 not implemented yet"
+msgstr "stöd för protokoll v2 ännu ej implementerat"
 
-#~ msgid "head name"
-#~ msgstr "namn på huvud"
+#, c-format
+msgid "unknown value for config '%s': %s"
+msgstr "okänt värde för inställningen \"%s\": %s"
 
-#~ msgid "rebase strategy"
-#~ msgstr "sammanslagningsstrategi"
+#, c-format
+msgid "transport '%s' not allowed"
+msgstr "transporten \"%s\" tillåts inte"
 
-#~ msgid "strategy-opts"
-#~ msgstr "strategy-opts"
+msgid "git-over-rsync is no longer supported"
+msgstr "git-over-rsync stöds inte längre"
 
-#~ msgid "strategy options"
-#~ msgstr "strategiflaggor"
+#, c-format
+msgid ""
+"The following submodule paths contain changes that can\n"
+"not be found on any remote:\n"
+msgstr ""
+"Följande undermodulsökvägar innehåller ändringar som\n"
+"inte kan hittas av fjärrarna:\n"
 
-#~ msgid "switch-to"
-#~ msgstr "switch-to"
+#, c-format
+msgid ""
+"\n"
+"Please try\n"
+"\n"
+"\tgit push --recurse-submodules=on-demand\n"
+"\n"
+"or cd to the path and use\n"
+"\n"
+"\tgit push\n"
+"\n"
+"to push them to a remote.\n"
+"\n"
+msgstr ""
+"\n"
+"Testa\n"
+"\n"
+"\tgit push --recurse-submodules=on-demand\n"
+"\n"
+"eller cd till sökvägen och använd\n"
+"\n"
+"\tgit push\n"
+"\n"
+"för att sända dem till fjärren.\n"
+"\n"
 
-#~ msgid "the branch or commit to checkout"
-#~ msgstr "gren eller inchecking att checka ut"
+msgid "Aborting."
+msgstr "Avbryter."
 
-#~ msgid "onto-name"
-#~ msgstr "onto-name"
+msgid "failed to push all needed submodules"
+msgstr "kunde inte sända alla nödvändiga undermoduler"
 
-#~ msgid "onto name"
-#~ msgstr "på-namn"
+msgid "too-short tree object"
+msgstr "trädobjekt för kort"
 
-#~ msgid "cmd"
-#~ msgstr "kmd"
+msgid "malformed mode in tree entry"
+msgstr "felformat läge i trädpost"
 
-#~ msgid "the command to run"
-#~ msgstr "kommando att köra"
+msgid "empty filename in tree entry"
+msgstr "tomt filnamn i trädpost"
 
-#~ msgid "--[no-]rebase-cousins has no effect without --rebase-merges"
-#~ msgstr "--[no-]rebase-cousins har ingen effekt utan --rebase-merges"
+msgid "too-short tree file"
+msgstr "trädfil för kort"
 
-#~ msgid "cannot combine '--preserve-merges' with '--rebase-merges'"
-#~ msgstr "kan inte kombinera \"--preserve-merges\" med \"--rebase-merges\""
+#, c-format
+msgid ""
+"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 ""
+"Dina lokala ändringar av följande filer skulle skrivas över av utcheckning:\n"
+"%%sChecka in dina ändringar eller använd \"stash\" innan du byter gren."
 
-#~ msgid ""
-#~ "error: cannot combine '--preserve-merges' with '--reschedule-failed-exec'"
-#~ msgstr ""
-#~ "fel: kan inte kombinera \"--preserve-merges\" med \"--reschedule-failed-"
-#~ "exec\""
+#, c-format
+msgid ""
+"Your local changes to the following files would be overwritten by checkout:\n"
+"%%s"
+msgstr ""
+"Dina lokala ändringar av följande filer skulle skrivas över av utcheckning:\n"
+"%%s"
 
-#~ 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 spawn daemon in the background"
-#~ msgstr "kunde inte starta serverprocess i bakgrunden"
-
-#~ msgid "waitpid failed"
-#~ msgstr "\"waitpid\" misslyckades"
-
-#~ 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"
+#, c-format
+msgid ""
+"Your local changes to the following files would be overwritten by merge:\n"
+"%%sPlease commit your changes or stash them before you merge."
+msgstr ""
+"Dina lokala ändringar av följande filer skulle skrivas över av "
+"sammanslagning:\n"
+"%%sChecka in dina ändringar eller använd \"stash\" innan du byter gren."
 
-#~ msgid "git merge --abort"
-#~ msgstr "git merge --abort"
+#, c-format
+msgid ""
+"Your local changes to the following files would be overwritten by merge:\n"
+"%%s"
+msgstr ""
+"Dina lokala ändringar av följande filer skulle skrivas över av "
+"sammanslagning:\n"
+"%%s"
 
-#~ msgid "git merge --continue"
-#~ msgstr "git merge --continue"
+#, c-format
+msgid ""
+"Your local changes to the following files would be overwritten by %s:\n"
+"%%sPlease commit your changes or stash them before you %s."
+msgstr ""
+"Dina lokala ändringar av följande filer skulle skrivas över av \"%s\":\n"
+"%%sChecka in dina ändringar eller använd \"stash\" innan du \"%s\"."
 
-#~ msgid "git stash clear"
-#~ msgstr "git stash clear"
+#, c-format
+msgid ""
+"Your local changes to the following files would be overwritten by %s:\n"
+"%%s"
+msgstr ""
+"Dina lokala ändringar av följande filer skulle skrivas över av \"%s\":\n"
+"%%s"
 
-#~ msgid "remote server sent stateless separator"
-#~ msgstr "fjärrservern sände tillståndslös avdelare"
+#, c-format
+msgid ""
+"Updating the following directories would lose untracked files in them:\n"
+"%s"
+msgstr ""
+"Uppdatering av följande kataloger gör att ospårade filer går förlorade i "
+"dem:\n"
+"%s"
 
-#~ msgid "--cached and --3way cannot be used together."
-#~ msgstr "--cached och --3way kan inte användas samtidigt."
+#, c-format
+msgid ""
+"Refusing to remove the current working directory:\n"
+"%s"
+msgstr ""
+"Vägrar ta bort aktuell arbetskatalog:\n"
+"%s"
 
-#~ msgid "both"
-#~ msgstr "båda"
+#, c-format
+msgid ""
+"The following untracked working tree files would be removed by checkout:\n"
+"%%sPlease move or remove them before you switch branches."
+msgstr ""
+"Följande ospårade filer i arbetskatalogen skulle tas bort av utcheckningen:\n"
+"%%sFlytta eller ta bort dem innan du byter gren."
 
-#~ msgid "one"
-#~ msgstr "en"
+#, c-format
+msgid ""
+"The following untracked working tree files would be removed by checkout:\n"
+"%%s"
+msgstr ""
+"Följande ospårade filer i arbetskatalogen skulle tas bort av utcheckningen:\n"
+"%%s"
 
-#~ msgid "Already up to date!"
-#~ msgstr "Redan à jour!"
+#, c-format
+msgid ""
+"The following untracked working tree files would be removed by merge:\n"
+"%%sPlease move or remove them before you merge."
+msgstr ""
+"Följande ospårade filer i arbetskatalogen skulle tas bort av "
+"sammanslagningen:\n"
+"%%sFlytta eller ta bort dem innan du slår samman."
+
+#, c-format
+msgid ""
+"The following untracked working tree files would be removed by merge:\n"
+"%%s"
+msgstr ""
+"Följande ospårade filer i arbetskatalogen skulle tas bort av "
+"sammanslagningen:\n"
+"%%s"
 
-#~ msgid "Already up to date. Yeeah!"
-#~ msgstr "Redan à jour. Toppen!"
+#, c-format
+msgid ""
+"The following untracked working tree files would be removed by %s:\n"
+"%%sPlease move or remove them before you %s."
+msgstr ""
+"Följande ospårade filer i arbetskatalogen skulle tas bort av \"%s\":\n"
+"%%sFlytta eller ta bort dem innan du \"%s\"."
 
-#~ msgid "--batch-size option is only for 'repack' subcommand"
-#~ msgstr "flaggan --batch-size används bara i underkommandot \"repack\""
+#, c-format
+msgid ""
+"The following untracked working tree files would be removed by %s:\n"
+"%%s"
+msgstr ""
+"Följande ospårade filer i arbetskatalogen skulle tas bort av \"%s\":\n"
+"%%s"
 
-#~ msgid "Percentage by which creation is weighted"
-#~ msgstr "Procent som skapelse vägs med"
+#, c-format
+msgid ""
+"The following untracked working tree files would be overwritten by "
+"checkout:\n"
+"%%sPlease move or remove them before you switch branches."
+msgstr ""
+"Följande ospårade filer i arbetskatalogen skulle skrivas över av "
+"utcheckningen:\n"
+"%%sFlytta eller ta bort dem innan du byter gren."
 
-#~ msgid ""
-#~ "the rebase.useBuiltin support has been removed!\n"
-#~ "See its entry in 'git help config' for details."
-#~ msgstr ""
-#~ "stödet för rebase.useBuiltin har tagits bort!\n"
-#~ "Se posten för det i \"git help config\" för detaljer."
+#, c-format
+msgid ""
+"The following untracked working tree files would be overwritten by "
+"checkout:\n"
+"%%s"
+msgstr ""
+"Följande ospårade filer i arbetskatalogen skulle skrivas över av "
+"utcheckningen:\n"
+"%%s"
 
-#~ msgid "%s: patch contains a line longer than 998 characters"
-#~ msgstr "%s: patchen innehåller en rad längre än 998 tecken"
+#, c-format
+msgid ""
+"The following untracked working tree files would be overwritten by merge:\n"
+"%%sPlease move or remove them before you merge."
+msgstr ""
+"Följande ospårade filer i arbetskatalogen skulle skrivas över av "
+"sammanslagningen:\n"
+"%%sFlytta eller ta bort dem innan du byter gren."
 
-#~ msgid "repository contains replace objects; skipping commit-graph"
-#~ msgstr "arkivet innehåller replace-objekt; hoppar över incheckningsgraf"
+#, c-format
+msgid ""
+"The following untracked working tree files would be overwritten by merge:\n"
+"%%s"
+msgstr ""
+"Följande ospårade filer i arbetskatalogen skulle skrivas över av "
+"sammanslagningen:\n"
+"%%s"
 
-#~ msgid "repository contains (deprecated) grafts; skipping commit-graph"
-#~ msgstr ""
-#~ "arkivet innehåller ympningar (avråds från); hoppar över incheckningsgraf"
+#, c-format
+msgid ""
+"The following untracked working tree files would be overwritten by %s:\n"
+"%%sPlease move or remove them before you %s."
+msgstr ""
+"Följande ospårade filer i arbetskatalogen skulle skrivas över av \"%s\":\n"
+"%%sFlytta eller ta bort dem innan du \"%s\"."
 
-#~ msgid "repository is shallow; skipping commit-graph"
-#~ msgstr "källarkivet är grunt; hoppar över incheckningsgraf"
+#, c-format
+msgid ""
+"The following untracked working tree files would be overwritten by %s:\n"
+"%%s"
+msgstr ""
+"Följande ospårade filer i arbetskatalogen skulle skrivas över av \"%s\":\n"
+"%%s"
 
-#~ msgid "commit-graph improper chunk offset %08x%08x"
-#~ msgstr "felaktigt offset för stycke %08x%08x i incheckningsgraffilen"
+#, c-format
+msgid "Entry '%s' overlaps with '%s'.  Cannot bind."
+msgstr "Posten \"%s\" överlappar \"%s\". Kan inte binda."
 
-#~ msgid "commit-graph chunk id %08x appears multiple times"
-#~ msgstr "incheckningsgrafens stycke-id %08x förekommer flera gånger"
+#, c-format
+msgid ""
+"Cannot update submodule:\n"
+"%s"
+msgstr ""
+"Kan inte uppdatera undermodul:\n"
+"%s"
 
-#~ msgid "invalid chunk offset (too large)"
-#~ msgstr "felaktigt offset för stycke (för stort)"
+#, c-format
+msgid ""
+"The following paths are not up to date and were left despite sparse "
+"patterns:\n"
+"%s"
+msgstr ""
+"Följande sökvägar är inte àjour och lämnades till trots för gles-mönster:\n"
+"%s"
 
-#~ msgid "Writing chunks to multi-pack-index"
-#~ msgstr "Skriver stycken till multi-pack-index"
+#, c-format
+msgid ""
+"The following paths are unmerged and were left despite sparse patterns:\n"
+"%s"
+msgstr ""
+"Följande sökvägar har inte slagits ihop och lämnades till trots för gles-"
+"mönster:\n"
+"%s"
 
-#~ msgid "rev-list died"
-#~ msgstr "rev-list dog"
+#, c-format
+msgid ""
+"The following paths were already present and thus not updated despite sparse "
+"patterns:\n"
+"%s"
+msgstr ""
+"Följande sökvägar fanns redan och har därför inte uppdaterats till trots för "
+"gles-mönster:\n"
+"%s"
 
-#~ msgid ""
-#~ "git bisect--helper --bisect-write [--no-log] <state> <revision> "
-#~ "<good_term> <bad_term>"
-#~ msgstr ""
-#~ "git bisect--helper --bisect-write [--no-log] <tillstånd> <revision> <term-"
-#~ "för-rätt> <term-för-fel>"
+#, c-format
+msgid "Aborting\n"
+msgstr "Avbryter\n"
 
-#~ msgid ""
-#~ "git bisect--helper --bisect-check-and-set-terms <command> <good_term> "
-#~ "<bad_term>"
-#~ msgstr ""
-#~ "git bisect--helper --bisect-check-and-set-terms <kommadno> <term-för-"
-#~ "rätt> <term-för-fel>"
+#, c-format
+msgid ""
+"After fixing the above paths, you may want to run `git sparse-checkout "
+"reapply`.\n"
+msgstr ""
+"Du bör köra \"git sparse-checkout reapply\" efter att ha fixat sökvägarna "
+"ovan.\n"
 
-#~ msgid "git bisect--helper --bisect-auto-next"
-#~ msgstr "git bisect--helper --bisect-auto-next"
+msgid "Updating files"
+msgstr "Uppdaterar filer"
 
-#~ msgid "write out the bisection state in BISECT_LOG"
-#~ msgstr "skriver bisect-tillståndet i BISECT_LOG"
+msgid ""
+"the following paths have collided (e.g. case-sensitive paths\n"
+"on a case-insensitive filesystem) and only one from the same\n"
+"colliding group is in the working tree:\n"
+msgstr ""
+"följande sökvägar har kolliderat (t.ex. skiftlägeskänsliga\n"
+"sökvägar på ett okänsligt filsystem) och endast en från samma\n"
+"kollisionsgrupp finns i arbetskatalogen:\n"
 
-#~ msgid "check and set terms in a bisection state"
-#~ msgstr "visa och ange termer för bisect-tillstånd"
+msgid "Updating index flags"
+msgstr "Uppdaterar indexflaggor"
 
-#~ msgid ""
-#~ "verify the next bisection state then checkout the next bisection commit"
-#~ msgstr ""
-#~ "kontrollera nästa bisect-tillstånd och checka så ut nästa bisect-"
-#~ "incheckning"
+#, c-format
+msgid "worktree and untracked commit have duplicate entries: %s"
+msgstr "arbetskatalog och ospårad incheckning har dublettposter: %s"
 
-#~ msgid "--bisect-write requires either 4 or 5 arguments"
-#~ msgstr "--bisect-write kräver antingen 4 eller 5 argument"
+msgid "expected flush after fetch arguments"
+msgstr "förväntade \"flush\" efter \"fetch\"-argument"
 
-#~ msgid "--check-and-set-terms requires 3 arguments"
-#~ msgstr "--check-and-set-terms kräver tre argument"
+msgid "invalid URL scheme name or missing '://' suffix"
+msgstr "ogiltig URL-schemanamn eller saknat \"://\"-suffix"
 
-#~ msgid "--bisect-auto-next requires 0 arguments"
-#~ msgstr "--bisect-auto-next kräver 0 argument"
+#, c-format
+msgid "invalid %XX escape sequence"
+msgstr "ogiltig %XX-teckensekvens"
 
-#~ msgid "Force progress reporting"
-#~ msgstr "Tvinga förloppsrapportering"
+msgid "missing host and scheme is not 'file:'"
+msgstr "värd saknas och schemat är inte \"file:\""
 
-#~ msgid "Error deleting remote-tracking branch '%s'"
-#~ msgstr "Fel vid borttagning av fjärrspårande grenen \"%s\""
+msgid "a 'file:' URL may not have a port number"
+msgstr "en \"file:\"-URL kan inte innehålla portnummer"
 
-#~ msgid "show parse tree for grep expression"
-#~ msgstr "visa analysträd för grep-uttryck"
+msgid "invalid characters in host name"
+msgstr "ogiltiga tecken i värdnamnet"
 
-#~ msgid "too many parameters"
-#~ msgstr "för många parametrar"
+msgid "invalid port number"
+msgstr "felaktigt portnummer"
 
-#~ msgid "too few parameters"
-#~ msgstr "för få parametrar"
+msgid "invalid '..' path segment"
+msgstr "felaktigt \"..\"-sökvägssegment"
 
-#~ msgid "Recurse into nested submodules"
-#~ msgstr "Rekursera in i nästlade undermoduler"
+msgid "Fetching objects"
+msgstr "Hämtar objekt"
 
-#~ msgid "too many params"
-#~ msgstr "för många parametrar"
+#, c-format
+msgid "'%s' at main working tree is not the repository directory"
+msgstr "\"%s\" i huvudarbetskatalogen är inte arkivkatalogen"
 
-#~ msgid "Bad rev input: $arg"
-#~ msgstr "Felaktig rev-indata: $arg"
+#, c-format
+msgid "'%s' file does not contain absolute path to the working tree location"
+msgstr "filen \"%s\" innehåller inte absolut sökväg till arbetskatalogen"
 
-#~ msgid "Counting distinct commits in commit graph"
-#~ msgstr "Räknar olika incheckningar i incheckningsgraf"
+#, c-format
+msgid "'%s' is not a .git file, error code %d"
+msgstr "\"%s\" är inte en .git-fil, felkod %d"
 
-#~ msgid "the commit graph format cannot write %d commits"
-#~ msgstr "formatet på incheckningsgrafen kan inte visa %d incheckningar"
+#, c-format
+msgid "'%s' does not point back to '%s'"
+msgstr "\"%s\" pekar inte tillbaka till \"%s\""
 
-#~ msgid "store only"
-#~ msgstr "endast spara"
+msgid "not a directory"
+msgstr "inte en katalog"
 
-#~ msgid "compress faster"
-#~ msgstr "komprimera snabbare"
+msgid ".git is not a file"
+msgstr ".git är inte en fil"
 
-#~ msgid "compress better"
-#~ msgstr "komprimera bättre"
+msgid ".git file broken"
+msgstr ".git-filen är trasig"
 
-#~ msgid "unexpected duplicate commit id %s"
-#~ msgstr "oväntat duplicerat inchecknings-id %s"
+msgid ".git file incorrect"
+msgstr ".git-filen är felaktig"
 
-#~ msgid "error preparing packfile from multi-pack-index"
-#~ msgstr "fel när paketfiler från multi-pack-index skulle förberedas"
+msgid "not a valid path"
+msgstr "inte en giltig sökväg"
 
-#~ msgid "%s: not a valid OID"
-#~ msgstr "%s: inte ett giltigt OID"
+msgid "unable to locate repository; .git is not a file"
+msgstr "hittar inte arkivet; .git är inte en fil"
 
-#~ msgid "invalid committer '%s'"
-#~ msgstr "ogiltig incheckare %s"
+msgid "unable to locate repository; .git file does not reference a repository"
+msgstr "hittar inte arkivet; .git-filen hänvisar inte till ett arkiv"
 
-#~ msgid "invalid committer: %s"
-#~ msgstr "ogiltig incheckare: %s"
+msgid "unable to locate repository; .git file broken"
+msgstr "hittar inte arkivet; .git-filen är trasig"
 
-#~ msgid "git bisect--helper --next-all"
-#~ msgstr "git bisect--helper --next-all"
+msgid "gitdir unreadable"
+msgstr "gitdir är oläsbar"
 
-#~ msgid "git bisect--helper --write-terms <bad_term> <good_term>"
-#~ msgstr "git bisect--helper --write-terms <term-för-fel> <term-för-rätt>"
+msgid "gitdir incorrect"
+msgstr "gitdir är felaktig"
 
-#~ msgid "git bisect--helper --bisect-autostart"
-#~ msgstr "git bisect--helper --bisect-autostart"
+msgid "not a valid directory"
+msgstr "inte i en giltig katalog"
 
-#~ msgid "perform 'git bisect next'"
-#~ msgstr "utför 'git bisect next'"
+msgid "gitdir file does not exist"
+msgstr "gitdir-filen existerar inte"
 
-#~ msgid "write the terms to .git/BISECT_TERMS"
-#~ msgstr "skriv termerna i .git/BISECT_TERMS"
+#, c-format
+msgid "unable to read gitdir file (%s)"
+msgstr "kunde inte läsa gitdir-filen (%s)"
 
-#~ msgid "cleanup the bisection state"
-#~ msgstr "städar upp bisect-tillstånd"
+#, c-format
+msgid "short read (expected %<PRIuMAX> bytes, read %<PRIuMAX>)"
+msgstr "kort läsning (förväntade %<PRIuMAX> byte, läste %<PRIuMAX>)"
 
-#~ msgid "check for expected revs"
-#~ msgstr "kontrollera för förväntade versioner"
+msgid "invalid gitdir file"
+msgstr "ogiltig gitdir-fil"
 
-#~ msgid "start the bisection if it has not yet been started"
-#~ msgstr "påbörja bisect om det inte redan har startats"
+msgid "gitdir file points to non-existent location"
+msgstr "gitdir-filen pekar på en ickeexisterande plats"
 
-#~ msgid "--write-terms requires two arguments"
-#~ msgstr "--write-terms kräver två argument"
+#, c-format
+msgid "unable to set %s in '%s'"
+msgstr "kan inte sätta %s i \"%s\""
 
-#~ msgid "--bisect-clean-state requires no arguments"
-#~ msgstr "--bisect-clean-state tar inga argument"
+#, c-format
+msgid "unable to unset %s in '%s'"
+msgstr "kan inte slå av %s i \"%s\""
 
-#~ msgid "--bisect-autostart does not accept arguments"
-#~ msgstr "--bisect-autostart tar inga argument"
+msgid "failed to set extensions.worktreeConfig setting"
+msgstr "misslyckades ändra inställningen extensions.worktreeConfig"
 
-#~ msgid "n,m"
-#~ msgstr "n,m"
+#, c-format
+msgid "could not setenv '%s'"
+msgstr "kunde inte lagra miljövariabeln \"%s\""
 
-#~ msgid "Process line range n,m in file, counting from 1"
-#~ msgstr "Behandla radintervallet n,m i filen, med början på 1"
+#, c-format
+msgid "unable to create '%s'"
+msgstr "kunde inte skapa \"%s\""
 
-#~ msgid "name of output directory is too long"
-#~ msgstr "namnet på utdatakatalogen är för långt"
+#, c-format
+msgid "could not open '%s' for reading and writing"
+msgstr "kunde inte öppna \"%s\" för läsning och skrivning"
 
-#~ msgid "standard output, or directory, which one?"
-#~ msgstr "standard ut, eller katalog, vilken ska det vara?"
+#, c-format
+msgid "unable to access '%s'"
+msgstr "kan inte komma åt \"%s\""
 
-#~ msgid ""
-#~ "WARNING: Some packs in use have been renamed by\n"
-#~ "WARNING: prefixing old- to their name, in order to\n"
-#~ "WARNING: replace them with the new version of the\n"
-#~ "WARNING: file.  But the operation failed, and the\n"
-#~ "WARNING: attempt to rename them back to their\n"
-#~ "WARNING: original names also failed.\n"
-#~ "WARNING: Please rename them in %s manually:\n"
-#~ msgstr ""
-#~ "VARNING: Namnen på några paket har bytts genom att\n"
-#~ "VARNING: lägga till old- före namnen, för att byta\n"
-#~ "VARNING: dem mot den nya versionen av filen. Men\n"
-#~ "VARNING: operationen misslyckades, och försöket att\n"
-#~ "VARNING: byta tillbaka till det ursprungliga\n"
-#~ "VARNING: namnet misslyckades också.\n"
-#~ "VARNING: Byt namn på dem i %s manuellt:\n"
+msgid "unable to get current working directory"
+msgstr "kan inte hämta aktuell arbetskatalog"
 
-#~ msgid "failed to remove '%s'"
-#~ msgstr "misslyckades ta bort \"%s\""
+msgid "Unmerged paths:"
+msgstr "Ej sammanslagna sökvägar:"
 
-#~ msgid "Routines to help parsing remote repository access parameters"
-#~ msgstr ""
-#~ "Rutiner för att göra det lättare att tolka åtkomstparametrar för "
-#~ "fjärrarkiv"
+msgid "  (use \"git restore --staged <file>...\" to unstage)"
+msgstr "  (använd \"git restore --staged <fil>...\" för att ta bort från kö)"
 
-#~ msgid "Bad rev input: $bisected_head"
-#~ msgstr "Felaktig rev-indata: $bisected_head"
+#, c-format
+msgid "  (use \"git restore --source=%s --staged <file>...\" to unstage)"
+msgstr ""
+"  (använd \"git restore --source=%s --staged <fil>...\" för att ta bort från "
+"kö)"
 
-#~ msgid "Bad rev input: $rev"
-#~ msgstr "Felaktig rev-indata: $rev"
+msgid "  (use \"git rm --cached <file>...\" to unstage)"
+msgstr "  (använd \"git rm --cached <fil>...\" för att ta bort från kö)"
 
-#~ msgid "See git-${cmd}(1) for details."
-#~ msgstr "Se git-${cmd}(1) för detaljer."
+msgid "  (use \"git add <file>...\" to mark resolution)"
+msgstr "  (använd \"git add <fil>...\" för att ange lösning)"
 
-#~ msgid "unknown hash algorithm length"
-#~ msgstr "okänd hashningsalgoritmlängd"
+msgid "  (use \"git add/rm <file>...\" as appropriate to mark resolution)"
+msgstr "  (använd \"git add/rm <fil>...\" som lämpligt för att ange lösning)"
 
-#~ msgid ""
-#~ "commit-graph chunk lookup table entry missing; file may be incomplete"
-#~ msgstr ""
-#~ "incheckningsgrafen saknar post i styckeuppslagningstabell; filen kan vara "
-#~ "ofullständig"
+msgid "  (use \"git rm <file>...\" to mark resolution)"
+msgstr "  (använd \"git rm <fil>...\" för att ange lösning)"
 
-#~ msgid "Writing changed paths Bloom filters index"
-#~ msgstr "Skriver Bloom-filterindex för ändrade sökvägar"
+msgid "Changes to be committed:"
+msgstr "Ändringar att checka in:"
 
-#~ msgid "hash version %u does not match"
-#~ msgstr "hash-versionen %u stämmer inte"
+msgid "Changes not staged for commit:"
+msgstr "Ändringar ej i incheckningskön:"
 
-#~ msgid "Remote with no URL"
-#~ msgstr "Fjärr utan URL"
+msgid "  (use \"git add <file>...\" to update what will be committed)"
+msgstr ""
+"  (använd \"git add <fil>...\" för att uppdatera vad som ska checkas in)"
 
-#~ msgid "%%(subject) does not take arguments"
-#~ msgstr "%%(subject) tar inte argument"
+msgid "  (use \"git add/rm <file>...\" to update what will be committed)"
+msgstr ""
+"  (använd \"git add/rm <fil>...\" för att uppdatera vad som ska checkas in)"
 
-#~ msgid "positive value expected objectname:short=%s"
-#~ msgstr "positivt värde förväntat objectname:short=%s"
+msgid ""
+"  (use \"git restore <file>...\" to discard changes in working directory)"
+msgstr ""
+"  (använd \"git restore <fil>...\" för att förkasta ändringar i "
+"arbetskatalogen)"
 
-#~ msgid "unrecognized %%(objectname) argument: %s"
-#~ msgstr "okänt %%(objectname)-argument: %s"
+msgid "  (commit or discard the untracked or modified content in submodules)"
+msgstr ""
+"  (checka in eller förkasta ospårat eller ändrat innehåll i undermoduler)"
 
-#~ msgid "option `%s' is incompatible with --merged"
-#~ msgstr "flaggan \"%s\" är inkompatibel med --merged"
+#, c-format
+msgid "  (use \"git %s <file>...\" to include in what will be committed)"
+msgstr "  (använd \"git %s <fil>...\" för att ta med i det som ska checkas in)"
 
-#~ msgid "option `%s' is incompatible with --no-merged"
-#~ msgstr "flaggan \"%s\" är inkompatibel med --no-merged"
+msgid "both deleted:"
+msgstr "borttaget av bägge:"
 
-#~ msgid "could not open '%s' for writing: %s"
-#~ msgstr "kunde inte öppna \"%s\" för skrivning: %s"
+msgid "added by us:"
+msgstr "tillagt av oss:"
 
-#~ msgid "could not read ref '%s'"
-#~ msgstr "Kunde inte läsa referensen \"%s\""
+msgid "deleted by them:"
+msgstr "borttaget av dem:"
 
-#~ msgid "ref '%s' already exists"
-#~ msgstr "referensen \"%s\" finns redan"
+msgid "added by them:"
+msgstr "tillagt av dem:"
 
-#~ msgid "unexpected object ID when writing '%s'"
-#~ msgstr "oväntat objekt-id vid skrivning \"%s\""
+msgid "deleted by us:"
+msgstr "borttaget av oss:"
 
-#~ msgid "unexpected object ID when deleting '%s'"
-#~ msgstr "oväntat objekt-id vid borttagning \"%s\""
+msgid "both added:"
+msgstr "tillagt av bägge:"
 
-#~ msgid "The hash algorithm %s is not supported in this build."
-#~ msgstr "Hashningsalgoritmen %s stöds inte i detta bygge."
+msgid "both modified:"
+msgstr "ändrat av bägge:"
 
-#~ msgid "could not open the file BISECT_TERMS"
-#~ msgstr "kunde inte öppna filen BISECT_TERMS"
+msgid "new file:"
+msgstr "ny fil:"
 
-#~ msgid "update BISECT_HEAD instead of checking out the current commit"
-#~ msgstr ""
-#~ "uppdatera BISECT_HEAD istället för att checka ut aktuell incheckning"
+msgid "copied:"
+msgstr "kopierad:"
 
-#~ msgid "print only names (no SHA-1)"
-#~ msgstr "skriv endast namn (ingen SHA-1)"
+msgid "deleted:"
+msgstr "borttagen:"
 
-#~ msgid "passed to 'git am'"
-#~ msgstr "sänds till \"git am\""
+msgid "modified:"
+msgstr "ändrad:"
 
-#~ msgid "The --cached option cannot be used with the --files option"
-#~ msgstr "Flaggan --cached kan inte användas med flaggan --files"
+msgid "renamed:"
+msgstr "namnbytt:"
 
-#~ msgid "  Warn: $display_name doesn't contain commit $sha1_src"
-#~ msgstr "  Varning: $display_name innehåller inte incheckningen $sha1_src"
+msgid "typechange:"
+msgstr "typbyte:"
 
-#~ msgid "  Warn: $display_name doesn't contain commit $sha1_dst"
-#~ msgstr "  Varning: $display_name innehåller inte incheckningen $sha1_dst"
+msgid "unknown:"
+msgstr "okänd:"
 
-#~ msgid ""
-#~ "  Warn: $display_name doesn't contain commits $sha1_src and $sha1_dst"
-#~ msgstr ""
-#~ "  Varning: $display_name innehåller inte incheckningarna $sha1_src och "
-#~ "$sha1_dst"
+msgid "unmerged:"
+msgstr "osammanslagen:"
 
-#~ msgid "Finding commits for commit graph from %d ref"
-#~ msgid_plural "Finding commits for commit graph from %d refs"
-#~ msgstr[0] "Söker incheckningar för incheckingsgraf från %d referens"
-#~ msgstr[1] "Söker incheckningar för incheckingsgraf från %d referenser"
+msgid "new commits, "
+msgstr "nya incheckningar, "
 
-#~ msgid "invalid commit object id: %s"
-#~ msgstr "ogiltigt inchecknings-objekt-id %s"
+msgid "modified content, "
+msgstr "ändrat innehåll, "
 
-#~ msgid "Removing worktrees/%s: not a valid directory"
-#~ msgstr "Tar bort worktrees/%s: inte en giltig katalog"
+msgid "untracked content, "
+msgstr "ospårat innehåll, "
 
-#~ msgid "Removing worktrees/%s: unable to read gitdir file (%s)"
-#~ msgstr "Tar bort worktrees/%s: kan inte läsa gitdir-filen (%s)"
+#, c-format
+msgid "Your stash currently has %d entry"
+msgid_plural "Your stash currently has %d entries"
+msgstr[0] "Stashen innehåller just nu %d post"
+msgstr[1] "Stashen innehåller just nu %d poster"
 
-#~ msgid "Removing worktrees/%s: invalid gitdir file"
-#~ msgstr "Tar bort worktrees/%s: felaktig gitdir-fil"
+msgid "Submodules changed but not updated:"
+msgstr "Undermoduler ändrade men inte uppdaterade:"
 
-#~ msgid "unable to re-add worktree '%s'"
-#~ msgstr "kunde inte lägga in arbetskatalogen \"%s\" igen"
+msgid "Submodule changes to be committed:"
+msgstr "Undermodulers ändringar att checka in:"
 
-#~ msgid "target '%s' already exists"
-#~ msgstr "målet \"%s\" finns redan"
+msgid ""
+"Do not modify or remove the line above.\n"
+"Everything below it will be ignored."
+msgstr ""
+"Raden ovan får inte ändras eller tas bort.\n"
+"Allt under den kommer tas bort."
 
-#~ msgid ""
-#~ "Cannot update sparse checkout: the following entries are not up to date:\n"
-#~ "%s"
-#~ msgstr ""
-#~ "Kan inte uppdatera gles utcheckning: följande poster är inte à jour:\n"
-#~ "%s"
+#, c-format
+msgid ""
+"\n"
+"It took %.2f seconds to compute the branch ahead/behind values.\n"
+"You can use '--no-ahead-behind' to avoid this.\n"
+msgstr ""
+"\n"
+"Det tog %.2f sekunder att räkna före/bakom-värden.\n"
+"Du kan använda \"--no-ahead-behind\" för undvika detta.\n"
 
-#~ msgid ""
-#~ "The following working tree files would be overwritten by sparse checkout "
-#~ "update:\n"
-#~ "%s"
-#~ msgstr ""
-#~ "Följande filer i arbetskatalogen skulle skrivas över av uppdatering av "
-#~ "gles utcheckning:\n"
-#~ "%s"
+msgid "You have unmerged paths."
+msgstr "Du har ej sammanslagna sökvägar."
 
-#~ msgid ""
-#~ "The following working tree files would be removed by sparse checkout "
-#~ "update:\n"
-#~ "%s"
-#~ msgstr ""
-#~ "Följande filer i arbetskatalogen skulle tas bort av uppdatering av gles "
-#~ "utcheckning:\n"
-#~ "%s"
+msgid "  (fix conflicts and run \"git commit\")"
+msgstr "  (rätta konflikter och kör \"git commit\")"
 
-#~ msgid "annotated tag %s has no embedded name"
-#~ msgstr "den annoterade taggen %s har inget inbäddat namn"
+msgid "  (use \"git merge --abort\" to abort the merge)"
+msgstr "  (använd \"git merge --abort\" för att avbryta sammanslagningen)"
 
-#~ msgid "automatically stash/stash pop before and after rebase"
-#~ msgstr "utför automatiskt stash/stash pop före och efter ombasering"
+msgid "All conflicts fixed but you are still merging."
+msgstr "Alla konflikter har rättats men du är fortfarande i en sammanslagning."
 
-#~ msgid "--[no-]autostash option is only valid with --rebase."
-#~ msgstr "--[no-]autostash är endast giltig med --rebase."
+msgid "  (use \"git commit\" to conclude merge)"
+msgstr "  (använd \"git commit\" för att slutföra sammanslagningen)"
 
-#~ msgid "(DEPRECATED) keep empty commits"
-#~ msgstr "(FÖRÅLDRAD) behåll tomma incheckningar"
+msgid "You are in the middle of an am session."
+msgstr "Du är i mitten av en körning av \"git am\"."
 
-#~ msgid "Could not read '%s'"
-#~ msgstr "Kunde inte läsa \"%s\""
+msgid "The current patch is empty."
+msgstr "Aktuell patch är tom."
 
-#~ msgid "Cannot store %s"
-#~ msgstr "Kan inte spara %s"
+msgid "  (fix conflicts and then run \"git am --continue\")"
+msgstr "  (rätta konflikter och kör sedan \"git am --continue\")"
 
-#~ msgid "disable sparse-checkout"
-#~ msgstr "inaktivera gles utcheckning"
+msgid "  (use \"git am --skip\" to skip this patch)"
+msgstr "  (använd \"git am --skip\" för att hoppa över patchen)"
 
-#~ msgid "could not exec %s"
-#~ msgstr "kunde inte köra %s"
+msgid ""
+"  (use \"git am --allow-empty\" to record this patch as an empty commit)"
+msgstr ""
+"  (använd \"git am --allow-empty\" för att registrera patchen som en tom "
+"incheckning)"
 
-#~ msgid "Cannot remove temporary index (can't happen)"
-#~ msgstr "Kan inte ta bort temporärt index (kan inte inträffa)"
+msgid "  (use \"git am --abort\" to restore the original branch)"
+msgstr "  (använd \"git am --abort\" för att återställa ursprungsgrenen)"
 
-#~ msgid "Cannot update $ref_stash with $w_commit"
-#~ msgstr "Kan inte uppdatera $ref_stash med $w_commit"
+msgid "git-rebase-todo is missing."
+msgstr "git-rebase-todo saknas."
 
-#~ msgid "error: unknown option for 'stash push': $option"
-#~ msgstr "fel: okänd flagga för \"stash push\": $option"
+msgid "No commands done."
+msgstr "Inga kommandon utförda."
 
-#~ msgid "Saved working directory and index state $stash_msg"
-#~ msgstr "Sparade arbetskatalogen och indexstatus $stash_msg"
+#, c-format
+msgid "Last command done (%<PRIuMAX> command done):"
+msgid_plural "Last commands done (%<PRIuMAX> commands done):"
+msgstr[0] "Sista kommandot utfört (%<PRIuMAX> kommando utfört):"
+msgstr[1] "Sista kommandot utfört (%<PRIuMAX> kommandon utförda):"
 
-#~ msgid "unknown option: $opt"
-#~ msgstr "okänd flagga: $opt"
+#, c-format
+msgid "  (see more in file %s)"
+msgstr "  (se fler i filen %s)"
 
-#~ msgid "Too many revisions specified: $REV"
-#~ msgstr "För många revisioner angivna: $REV"
+msgid "No commands remaining."
+msgstr "Inga kommandon återstår."
 
-#~ msgid "$reference is not a valid reference"
-#~ msgstr "$reference är inte en giltig referens"
+#, c-format
+msgid "Next command to do (%<PRIuMAX> remaining command):"
+msgid_plural "Next commands to do (%<PRIuMAX> remaining commands):"
+msgstr[0] "Nästa kommando att utföra (%<PRIuMAX> kommando återstår):"
+msgstr[1] "Följande kommandon att utföra (%<PRIuMAX> kommandon återstår):"
 
-#~ msgid "'$args' is not a stash-like commit"
-#~ msgstr "\"$args\" är inte en \"stash\"-liknande incheckning"
+msgid "  (use \"git rebase --edit-todo\" to view and edit)"
+msgstr "  (använd \"git rebase --edit-todo\" för att visa och redigera)"
 
-#~ msgid "'$args' is not a stash reference"
-#~ msgstr "\"$args\" är inte en \"stash\"-referens"
+#, c-format
+msgid "You are currently rebasing branch '%s' on '%s'."
+msgstr "Du håller på att ombasera grenen \"%s\" ovanpå \"%s\"."
 
-#~ msgid "unable to refresh index"
-#~ msgstr "kan inte uppdatera indexet"
+msgid "You are currently rebasing."
+msgstr "Du håller på med en ombasering."
 
-#~ msgid "Cannot apply a stash in the middle of a merge"
-#~ msgstr "Kan inte tillämpa en \"stash\" mitt i en sammanslagning"
+msgid "  (fix conflicts and then run \"git rebase --continue\")"
+msgstr "  (rätta konflikter och kör sedan \"git rebase --continue\")"
 
-#~ msgid "Conflicts in index. Try without --index."
-#~ msgstr "Konflikter i indexet. Testa utan --index."
+msgid "  (use \"git rebase --skip\" to skip this patch)"
+msgstr "  (använd \"git rebase --skip\" för att hoppa över patchen)"
 
-#~ msgid "Could not save index tree"
-#~ msgstr "Kunde inte spara indexträd"
+msgid "  (use \"git rebase --abort\" to check out the original branch)"
+msgstr "  (använd \"git rebase --abort\" för att checka ut ursprungsgrenen)"
 
-#~ msgid "Could not restore untracked files from stash entry"
-#~ msgstr "Kunde inte återställa ospårade filer från stash-post"
+msgid "  (all conflicts fixed: run \"git rebase --continue\")"
+msgstr "  (alla konflikter rättade: kör \"git rebase --continue\")"
 
-#~ msgid "Cannot unstage modified files"
-#~ msgstr "Kan inte ta bort ändrade filer ur kön"
+#, c-format
+msgid ""
+"You are currently splitting a commit while rebasing branch '%s' on '%s'."
+msgstr ""
+"Du håller på att dela upp en incheckning medan du ombaserar grenen \"%s\" "
+"ovanpå \"%s\"."
 
-#~ msgid "Dropped ${REV} ($s)"
-#~ msgstr "Kastade ${REV} ($s)"
+msgid "You are currently splitting a commit during a rebase."
+msgstr "Du håller på att dela upp en incheckning i en ombasering."
 
-#~ msgid "${REV}: Could not drop stash entry"
-#~ msgstr "${REV}: Kunde inte kasta \"stash\"-post"
+msgid "  (Once your working directory is clean, run \"git rebase --continue\")"
+msgstr "  (Så fort din arbetskatalog är ren, kör \"git rebase --continue\")"
 
-#~ msgid "(To restore them type \"git stash apply\")"
-#~ msgstr "(För att återställa dem, skriv \"git stash apply\")"
+#, c-format
+msgid "You are currently editing a commit while rebasing branch '%s' on '%s'."
+msgstr ""
+"Du håller på att redigera en incheckning medan du ombaserar grenen \"%s\" "
+"ovanpå \"%s\"."
 
-#~ msgid "{drop,keep,ask}"
-#~ msgstr "{drop,keep,ask}"
+msgid "You are currently editing a commit during a rebase."
+msgstr "Du håller på att redigera en incheckning under en ombasering."
 
-#~ msgid "Stage mode change [y,n,a,q,d%s,?]? "
-#~ msgstr "Köa ändrat läge [y,n,a,q,d%s,?]? "
+msgid "  (use \"git commit --amend\" to amend the current commit)"
+msgstr ""
+"  (använd \"git commit --amend\" för att lägga till på aktuell incheckning)"
 
-#~ msgid "Stage deletion [y,n,a,q,d%s,?]? "
-#~ msgstr "Köa borttagning [y,n,a,q,d%s,?]? "
+msgid ""
+"  (use \"git rebase --continue\" once you are satisfied with your changes)"
+msgstr "  (använd \"git rebase --continue\" när du är nöjd med dina ändringar)"
 
-#~ msgid "Stage this hunk [y,n,a,q,d%s,?]? "
-#~ msgstr "Köa stycket [y,n,a,q,d%s,?]? "
+msgid "Cherry-pick currently in progress."
+msgstr "Cherry-pick pågår."
 
-#~ msgid ""
-#~ "If the patch applies cleanly, the edited hunk will immediately be\n"
-#~ "marked for staging.\n"
-#~ msgstr ""
-#~ "Om patchen kan appliceras rent kommer det redigerade stycket att\n"
-#~ "köas omedelbart.\n"
+#, c-format
+msgid "You are currently cherry-picking commit %s."
+msgstr "Du håller på med en \"cherry-pick\" av incheckningen %s."
 
-#~ msgid ""
-#~ "y - stage this hunk\n"
-#~ "n - do not stage this hunk\n"
-#~ "q - quit; do not stage this hunk or any of the remaining ones\n"
-#~ "a - stage this and all the remaining hunks\n"
-#~ "d - do not stage this hunk nor any of the remaining hunks\n"
-#~ msgstr ""
-#~ "y - köa stycket\n"
-#~ "n - köa inte stycket\n"
-#~ "q - avsluta; köa inte stycket eller något av de följande\n"
-#~ "a - köa detta och alla följande stycken\n"
-#~ "d - köa inte stycket eller något av de stycken som följer\n"
+msgid "  (fix conflicts and run \"git cherry-pick --continue\")"
+msgstr "  (rätta konflikter och kör sedan \"git cherry-pick --continue\")"
 
-#~ msgid "could not copy '%s' to '%s'."
-#~ msgstr "kunde inte kopiera \"%s\" till \"%s\"."
+msgid "  (run \"git cherry-pick --continue\" to continue)"
+msgstr "  (kör \"git cherry-pick --continue\" för att fortsätta)"
 
-#~ msgid "malformed ident line"
-#~ msgstr "felaktig ident-rad"
+msgid "  (all conflicts fixed: run \"git cherry-pick --continue\")"
+msgstr "  (alla konflikter rättade: kör \"git cherry-pick --continue\")"
 
-#~ msgid "could not parse '%.*s'"
-#~ msgstr "kunde inte tolka \"%.*s\""
+msgid "  (use \"git cherry-pick --skip\" to skip this patch)"
+msgstr "  (använd \"git cherry-pick --skip\" för att hoppa över patchen)"
 
-#~ msgid "could not checkout %s"
-#~ msgstr "kunde inte checka ut %s"
+msgid "  (use \"git cherry-pick --abort\" to cancel the cherry-pick operation)"
+msgstr ""
+"  (använd \"git cherry-pick --abort\" för att avbryta \"cherry-pick\"-"
+"operationen)"
 
-#~ msgid "filename in tree entry contains backslash: '%s'"
-#~ msgstr "filnamnet i trädet innehåller omvänt snedstreck: \"%s\""
+msgid "Revert currently in progress."
+msgstr "Ångring pågår."
 
-#~ msgid "Use -f if you really want to add them.\n"
-#~ msgstr "Använd -f om du verkligen vill lägga till dem.\n"
+#, c-format
+msgid "You are currently reverting commit %s."
+msgstr "Du håller på med att ångra incheckningen %s."
 
-#~ msgid "Maybe you wanted to say 'git add .'?\n"
-#~ msgstr "Kanske menade du att skriva \"git add .\"?\n"
+msgid "  (fix conflicts and run \"git revert --continue\")"
+msgstr "  (rätta konflikter och kör sedan \"git revert --continue\")"
 
-#~ msgid "packfile is invalid: %s"
-#~ msgstr "packfil är ogiltig: %s"
+msgid "  (run \"git revert --continue\" to continue)"
+msgstr "  (kör \"git revert --continue\" för att fortsätta)"
 
-#~ msgid "unable to open packfile for reuse: %s"
-#~ msgstr "kan inte öppna packfil för återanvändning: %s"
+msgid "  (all conflicts fixed: run \"git revert --continue\")"
+msgstr "  (alla konflikter rättade: kör \"git revert --continue\")"
 
-#~ msgid "unable to seek in reused packfile"
-#~ msgstr "kan inte söka i återanvänd packfil"
+msgid "  (use \"git revert --skip\" to skip this patch)"
+msgstr "  (använd \"git revert --skip\" för att hoppa över patchen)"
 
-#~ msgid "unable to read from reused packfile"
-#~ msgstr "kan inte läsa från återanvänd packfil"
+msgid "  (use \"git revert --abort\" to cancel the revert operation)"
+msgstr "  (använd \"git revert --abort\" för att avbryta ångrandet)"
 
-#~ msgid "no HEAD?"
-#~ msgstr "inget HEAD?"
+#, c-format
+msgid "You are currently bisecting, started from branch '%s'."
+msgstr "Du håller på med en \"bisect\", startad från grenen \"%s\"."
 
-#~ msgid "preserve empty commits during rebase"
-#~ msgstr "behåll tomma incheckningar under ombasering"
+msgid "You are currently bisecting."
+msgstr "Du håller på med en \"bisect\"."
 
-#~ msgid "cannot combine --use-bitmap-index with object filtering"
-#~ msgstr "kan inte kombinera --use-bitmap-index med objektfiltrering"
+msgid "  (use \"git bisect reset\" to get back to the original branch)"
+msgstr ""
+"  (använd \"git bisect reset\" för att komma tillbaka till ursprungsgrenen)"
 
-#~ msgid ""
-#~ "The following path is ignored by one of your .gitignore files:\n"
-#~ "$sm_path\n"
-#~ "Use -f if you really want to add it."
-#~ msgstr ""
-#~ "Följande sökvägar ignoreras av en av dina .gitignore-filer:\n"
-#~ "$sm_path\n"
-#~ "Använd -f om du verkligen vill lägga till den."
+msgid "You are in a sparse checkout."
+msgstr "Du är i en gles utcheckning."
 
-#~ msgid "Use an experimental heuristic to improve diffs"
-#~ msgstr "Använd en experimentell algoritm för att förbättra diffar"
+#, c-format
+msgid "You are in a sparse checkout with %d%% of tracked files present."
+msgstr "Du är i en gles utcheckning med %d%% spårade filer på plats."
 
-#~ msgid "git commit-graph [--object-dir <objdir>]"
-#~ msgstr "git commit-graph [--object-dir <objkat>]"
+msgid "On branch "
+msgstr "På grenen "
 
-#~ msgid "git commit-graph read [--object-dir <objdir>]"
-#~ msgstr "git commit-graph read [--object-dir <objkat>]"
+msgid "interactive rebase in progress; onto "
+msgstr "interaktiv ombasering pågår; ovanpå "
 
-#~ msgid "unknown core.untrackedCache value '%s'; using 'keep' default value"
-#~ msgstr ""
-#~ "okänt värde \"%s\" för core.untrackedCache; använder standardvärdet \"keep"
-#~ "\""
-
-#~ msgid "cannot change partial clone promisor remote"
-#~ msgstr "kan inte ändra kontraktsfjärr för delvis kloning"
-
-#~ msgid "error building trees"
-#~ msgstr "fel vid byggande av träd"
-
-#~ msgid "writing root commit"
-#~ msgstr "skriver rotincheckning"
-
-#~ msgid "staged changes in the following files may be lost: %s"
-#~ msgstr "köade ändringar i följande filer kan gå förlorade: %s"
-
-#~ msgid ""
-#~ "--filter can only be used with the remote configured in extensions."
-#~ "partialClone"
-#~ msgstr ""
-#~ "--filter kan endast användas med fjärren konfigurerad i extensions."
-#~ "partialClone"
-
-#~ msgid "verify commit-msg hook"
-#~ msgstr "bekräfta commit-msg-krok"
-
-#~ msgid "cannot combine '--rebase-merges' with '--strategy-option'"
-#~ msgstr "kan inte kombinera \"--rebase-merges\" med \"--strategy-option\""
-
-#~ msgid "invalid sparse value '%s'"
-#~ msgstr "ogiltigt värde för sparse: \"%s\""
-
-#~ msgid ""
-#~ "Fetch normally indicates which branches had a forced update, but that "
-#~ "check has been disabled."
-#~ msgstr ""
-#~ "Hämtning visar vanligtvis vilka grenar som har en tvingad uppdatering, "
-#~ "men det testet har slagits av."
+msgid "rebase in progress; onto "
+msgstr "ombasering pågår; ovanpå "
 
-#~ msgid ""
-#~ "or run 'git config fetch.showForcedUpdates false' to avoid this check.\n"
-#~ msgstr ""
-#~ "eller kör \"git config fetch.showForcedUpdates false\" för undvika "
-#~ "testet.\n"
-
-#~ msgid ""
-#~ "log.mailmap is not set; its implicit value will change in an\n"
-#~ "upcoming release. To squelch this message and preserve current\n"
-#~ "behaviour, set the log.mailmap configuration value to false.\n"
-#~ "\n"
-#~ "To squelch this message and adopt the new behaviour now, set the\n"
-#~ "log.mailmap configuration value to true.\n"
-#~ "\n"
-#~ "See 'git help config' and search for 'log.mailmap' for further "
-#~ "information."
-#~ msgstr ""
-#~ "log.mailmap har inte satts: förvalet kommer ändras i en kommande\n"
-#~ "version. För att dölja det här meddelandet och behålla nuvarande\n"
-#~ "beteende, sätt konfigurationsvariabeln log.mailmap till false.\n"
-#~ "\n"
-#~ "För att dölja det här meddelandet och använda det nya beteendet,\n"
-#~ "sätt konfigurationsvariabeln log.mailmap till true.\n"
-#~ "\n"
-#~ "Se \"git help config\" och sök efter \"log.mailmap\" för mer information."
-
-#~ msgid "Server supports multi_ack_detailed"
-#~ msgstr "Servern stöder \"multi_ack_detailed\""
-
-#~ msgid "Server supports no-done"
-#~ msgstr "Servern stöder \"no-done\""
-
-#~ msgid "Server supports multi_ack"
-#~ msgstr "Servern stöder \"multi_ack\""
-
-#~ msgid "Server supports side-band-64k"
-#~ msgstr "Servern stöder \"side-band-64k\""
-
-#~ msgid "Server supports side-band"
-#~ msgstr "Servern stöder \"side-band\""
-
-#~ msgid "Server supports allow-tip-sha1-in-want"
-#~ msgstr "Servern stöder \"allow-tip-sha1-in-want\""
-
-#~ msgid "Server supports allow-reachable-sha1-in-want"
-#~ msgstr "Servern stöder \"allow-reachable-sha1-in-want\""
-
-#~ msgid "Server supports ofs-delta"
-#~ msgstr "Servern stöder \"ofs-delta\""
-
-#~ msgid "Checking out files"
-#~ msgstr "Checkar ut filer"
-
-#~ msgid "cannot be interactive without stdin connected to a terminal."
-#~ msgstr ""
-#~ "kan inte vara interaktiv om standard in inte är ansluten till en terminal."
-
-#~ msgid "failed to stat %s\n"
-#~ msgstr "misslyckades ta status på %s\n"
-
-#~ msgid ""
-#~ "If you wish to skip this commit, use:\n"
-#~ "\n"
-#~ "    git reset\n"
-#~ "\n"
-#~ "Then \"git cherry-pick --continue\" will resume cherry-picking\n"
-#~ "the remaining commits.\n"
-#~ msgstr ""
-#~ "Om du vill hoppa över incheckningen, använd:\n"
-#~ "\n"
-#~ "    git reset\n"
-#~ "\n"
-#~ "\"git cherry-pick --continue\" kommer därefter att återuppta\n"
-#~ "cherry-pick för återstående incheckningar.\n"
-
-#~ msgid "unrecognized verb: %s"
-#~ msgstr "okänt verb: %s"
-
-#~ msgid "could not transform the todo list"
-#~ msgstr "kunde inte transformera att göra-listan"
-
-#~ msgid "default"
-#~ msgstr "standard"
-
-#~ msgid "Could not create directory '%s'"
-#~ msgstr "Kunde inte skapa katalogen \"%s\""
-
-#~ msgid "allow rerere to update index with resolved conflict"
-#~ msgstr "tillåt rerere att uppdatera index med lösa konflikter"
-
-#~ msgid "could not open %s"
-#~ msgstr "kunde inte öppna %s"
-
-#~ msgid "Could not move back to $head_name"
-#~ msgstr "Kunde inte flytta tillbaka till $head_name"
-
-#~ msgid ""
-#~ "It seems that there is already a $state_dir_base directory, and\n"
-#~ "I wonder if you are in the middle of another rebase.  If that is the\n"
-#~ "case, please try\n"
-#~ "\t$cmd_live_rebase\n"
-#~ "If that is not the case, please\n"
-#~ "\t$cmd_clear_stale_rebase\n"
-#~ "and run me again.  I am stopping in case you still have something\n"
-#~ "valuable there."
-#~ msgstr ""
-#~ "Det verkar som katalogen $state_dir_base redan existerar, och\n"
-#~ "jag undrar om du redan är mitt i en annan ombasering. Om så är\n"
-#~ "fallet, försök\n"
-#~ "\t$cmd_live_rebase\n"
-#~ "Om så inte är fallet, kör\n"
-#~ "\t$cmd_clear_stale_rebase\n"
-#~ "och kör programmet igen. Jag avslutar ifall du fortfarande har\n"
-#~ "något av värde där."
-
-#~ msgid ""
-#~ "fatal: cannot combine am options with either interactive or merge options"
-#~ msgstr ""
-#~ "ödesdigert: kan inte kombinera am-flaggor med antingen interaktiv- eller "
-#~ "sammanslagningsflaggor"
-
-#~ msgid "fatal: cannot combine '--signoff' with '--preserve-merges'"
-#~ msgstr ""
-#~ "ödesdigert: kan inte kombinera \"--signoff\" med \"--preserve-merges\""
+msgid "HEAD detached at "
+msgstr "HEAD frånkopplad vid "
 
-#~ msgid "fatal: cannot combine '--preserve-merges' with '--rebase-merges'"
-#~ msgstr ""
-#~ "ödesdigert: kan inte kombinera \"--preserve-merges\" med \"--rebase-merges"
-#~ "\""
+msgid "HEAD detached from "
+msgstr "HEAD frånkopplad från "
 
-#~ msgid "fatal: cannot combine '--rebase-merges' with '--strategy-option'"
-#~ msgstr ""
-#~ "ödesdigert: kan inte kombinera \"--rebase-merges\" med \"--strategy-option"
-#~ "\""
+msgid "Not currently on any branch."
+msgstr "Inte på någon gren för närvarande."
 
-#~ msgid "fatal: cannot combine '--rebase-merges' with '--strategy'"
-#~ msgstr ""
-#~ "ödesdigert: kan inte kombinera \"--rebase-merges\" med \"--strategy\""
+msgid "Initial commit"
+msgstr "Första incheckning"
 
-#~ msgid "invalid upstream '$upstream_name'"
-#~ msgstr "ogiltig uppström \"$upstream_name\""
+msgid "No commits yet"
+msgstr "Inga incheckningar ännu"
 
-#~ msgid "$onto_name: there are more than one merge bases"
-#~ msgstr "$onto_name: mer än en sammanslagningsbas finns"
-
-#~ msgid "$onto_name: there is no merge base"
-#~ msgstr "$onto_name: ingen sammanslagningsbas finns"
-
-#~ msgid "Does not point to a valid commit: $onto_name"
-#~ msgstr "Peka på en giltig incheckning: $onto_name"
-
-#~ msgid "fatal: no such branch/commit '$branch_name'"
-#~ msgstr "ödesdigert: ingen sådan gren/incheckning: $branch_name"
-
-#~ msgid "Created autostash: $stash_abbrev"
-#~ msgstr "Skapade autostash: $stash_abbrev"
-
-#~ msgid "Current branch $branch_name is up to date."
-#~ msgstr "Aktuell gren $branch_name är à jour."
-
-#~ msgid "Current branch $branch_name is up to date, rebase forced."
-#~ msgstr "Aktuell gren $branch_name är à jour, ombasering framtvingad."
-
-#~ msgid "Changes to $onto:"
-#~ msgstr "Ändringar till $onto:"
+msgid "Untracked files"
+msgstr "Ospårade filer"
 
-#~ msgid "Changes from $mb to $onto:"
-#~ msgstr "Ändringar från $mb till $onto:"
+msgid "Ignored files"
+msgstr "Ignorerade filer"
 
-#~ msgid "Fast-forwarded $branch_name to $onto_name."
-#~ msgstr "Snabbspolade $branch_name till $onto_name."
+#, c-format
+msgid ""
+"It took %.2f seconds to enumerate untracked files. 'status -uno'\n"
+"may speed it up, but you have to be careful not to forget to add\n"
+"new files yourself (see 'git help status')."
+msgstr ""
+"Det tog %.2f sekunder att räkna upp ospårade filer. \"status -uno\"\n"
+"kan gå snabbare, men du måste vara försiktig så du inte glömmer\n"
+"lägga till nya filer själv (se \"git help status\")."
 
-#~ msgid "First, rewinding head to replay your work on top of it..."
-#~ msgstr ""
-#~ "Först, spolar tillbaka huvudet för att spela av ditt arbete ovanpå det..."
+# %s är nästa sträng eller tom.
+#, c-format
+msgid "Untracked files not listed%s"
+msgstr "Ospårade filer visas ej%s"
 
-#~ msgid "only 'tree:0' is supported"
-#~ msgstr "endast \"tree:0\" stöds"
+msgid " (use -u option to show untracked files)"
+msgstr " (använd flaggan -u för att visa ospårade filer)"
 
-#~ msgid "Renaming %s to %s and %s to %s instead"
-#~ msgstr "Byter namn på %s till %s och %s till %s istället"
+msgid "No changes"
+msgstr "Inga ändringar"
 
-#~ msgid "Adding merged %s"
-#~ msgstr "Lägger till sammanslagen %s"
+#, c-format
+msgid "no changes added to commit (use \"git add\" and/or \"git commit -a\")\n"
+msgstr ""
+"inga ändringar att checka in (använd \"git add\" och/eller \"git commit -a"
+"\")\n"
 
-#~ msgid "Internal error"
-#~ msgstr "Internt fel"
-
-#~ msgid "mainline was specified but commit %s is not a merge."
-#~ msgstr "huvudlinje angavs, men incheckningen %s är inte en sammanslagning."
-
-#~ msgid "unable to write sha1 filename %s"
-#~ msgstr "kan inte skriva sha1-filnamn %s"
-
-#~ msgid "cannot read sha1_file for %s"
-#~ msgstr "kan inte läsa sha1_file för %s"
-
-#~ msgid ""
-#~ "error: cannot combine interactive options (--interactive, --exec, --"
-#~ "rebase-merges, --preserve-merges, --keep-empty, --root + --onto) with am "
-#~ "options (%s)"
-#~ msgstr ""
-#~ "fel: kan inte kombinera interaktiva flaggor (--interactive, --exec, --"
-#~ "rebase-merges, --preserve-merges, --keep-empty, --root + --onto) med am-"
-#~ "flaggor (%s)"
+#, c-format
+msgid "no changes added to commit\n"
+msgstr "inga ändringar att checka in\n"
 
-#~ msgid ""
-#~ "error: cannot combine merge options (--merge, --strategy, --strategy-"
-#~ "option) with am options (%s)"
-#~ msgstr ""
-#~ "fel: kan inte kombinera sammanslagningsflaggor (--merge, --strategy, --"
-#~ "strategy-option) med am-flaggor (%s)"
+#, c-format
+msgid ""
+"nothing added to commit but untracked files present (use \"git add\" to "
+"track)\n"
+msgstr ""
+"inget köat för incheckning, men ospårade filer finns (spåra med \"git add"
+"\")\n"
 
-#~ msgid "unrecognised option: '$arg'"
-#~ msgstr "flaggan känns inte igen: \"$arg\""
+#, c-format
+msgid "nothing added to commit but untracked files present\n"
+msgstr "inget köat för incheckning, men ospårade filer finns\n"
 
-#~ msgid "'$invalid' is not a valid commit"
-#~ msgstr "\"$invalid\" är inte en giltig incheckning"
+#, c-format
+msgid "nothing to commit (create/copy files and use \"git add\" to track)\n"
+msgstr "inget att checka in (skapa/kopiera filer och spåra med \"git add\")\n"
 
-#~ msgid "could not parse '%s' (looking for '%s')"
-#~ msgstr "kunde inte tolka \"%s\" (letar efter \"%s\")"
+#, c-format
+msgid "nothing to commit\n"
+msgstr "inget att checka in\n"
 
-#~ msgid "deprecated synonym for --create-reflog"
-#~ msgstr "avrådd synonym för --create-reflog"
+#, c-format
+msgid "nothing to commit (use -u to show untracked files)\n"
+msgstr "inget att checka in (använd -u för att visa ospårade filer)\n"
 
-#~ msgid "Can't stat %s"
-#~ msgstr "Kan inte ta status på %s"
+#, c-format
+msgid "nothing to commit, working tree clean\n"
+msgstr "inget att checka in, arbetskatalogen ren\n"
 
-#~ msgid "abort rebase"
-#~ msgstr "avbryt ombasering"
+msgid "No commits yet on "
+msgstr "Inga incheckningar ännu på "
 
-#~ msgid "make rebase script"
-#~ msgstr "skapa ombaseringsskript"
+msgid "HEAD (no branch)"
+msgstr "HEAD (ingen gren)"
 
-#~ msgid "cannot move a locked working tree"
-#~ msgstr "kan inte flytta en låst arbetskatalog"
+msgid "different"
+msgstr "olika"
 
-#~ msgid "cannot remove a locked working tree"
-#~ msgstr "kan inte ta bort en låst arbetskatalog"
+msgid "behind "
+msgstr "efter "
 
-#~ msgid ""
-#~ "\n"
-#~ "\tHowever, if you remove everything, the rebase will be aborted.\n"
-#~ "\n"
-#~ "\t"
-#~ msgstr ""
-#~ "\n"
-#~ "\tOmbaseringen kommer dock att avbrytas om du tar bort allting.\n"
-#~ "\n"
-#~ "\t"
+msgid "ahead "
+msgstr "före "
 
-#~ msgid "Dirty index: cannot merge (dirty: %s)"
-#~ msgstr "Smutsigt index: kan inte slå ihop (smutsiga: %s)"
+#. TRANSLATORS: the action is e.g. "pull with rebase"
+#, c-format
+msgid "cannot %s: You have unstaged changes."
+msgstr "kan inte %s: Du har oköade ändringar."
 
-#~ msgid "(+/-)x"
-#~ msgstr "(+/-)x"
+msgid "additionally, your index contains uncommitted changes."
+msgstr "dessutom innehåller dit index ändringar som inte har checkats in."
 
-#~ msgid "<command>"
-#~ msgstr "<kommando>"
+#, c-format
+msgid "cannot %s: Your index contains uncommitted changes."
+msgstr "kan inte %s: Ditt index innehåller ändringar som inte checkats in."
 
-#~ msgid "push|fetch"
-#~ msgstr "push|fetch"
+msgid ""
+"Error: Your local changes to the following files would be overwritten by "
+"merge"
+msgstr ""
+"Fel: Dina lokala ändringar av följande filer skulle skrivas över av "
+"sammanslagning"
 
-#~ msgid "w[,i1[,i2]]"
-#~ msgstr "w[,i1[,i2]]"
+msgid "Automated merge did not work."
+msgstr "Automatisk sammanslagning misslyckades."
 
-#~ msgid "Entering '$displaypath'"
-#~ msgstr "Går in i \"$displaypath\""
+msgid "Should not be doing an octopus."
+msgstr "Borde inte använda octopus."
 
-#~ msgid "Stopping at '$displaypath'; script returned non-zero status."
-#~ msgstr ""
-#~ "Stoppar på \"$displaypath\"; skriptet returnerade en status skild från "
-#~ "noll."
+#, sh-format
+msgid "Unable to find common commit with $pretty_name"
+msgstr "Kunde inte hitta gemensam incheckning med $pretty_name"
 
-#~ msgid "Everyday Git With 20 Commands Or So"
-#~ msgstr "Git för dagligt bruk i ungefär 20 kommandon"
+#, sh-format
+msgid "Already up to date with $pretty_name"
+msgstr "Redan à jour med $pretty_name"
 
-#~ msgid "Could not open '%s' for writing"
-#~ msgstr "Kunde inte öppna \"%s\" för skrivning"
+#, sh-format
+msgid "Fast-forwarding to: $pretty_name"
+msgstr "Snabbspolar till: $pretty_name"
 
-#~ msgid ""
-#~ "unexpected 1st line of squash message:\n"
-#~ "\n"
-#~ "\t%.*s"
-#~ msgstr ""
-#~ "oväntad första rad i squash-meddelande:\n"
-#~ "\n"
-#~ "\t%.*s"
-
-#~ msgid ""
-#~ "invalid 1st line of squash message:\n"
-#~ "\n"
-#~ "\t%.*s"
-#~ msgstr ""
-#~ "ogiltig första rad i squash-meddelande:\n"
-#~ "\n"
-#~ "\t%.*s"
-
-#~ msgid "BUG: returned path string doesn't match cwd?"
-#~ msgstr "BUG: returnerad sökvägssträng motsvarar inte cwd?"
-
-#~ msgid "Error in object"
-#~ msgstr "Fel i objekt"
-
-#~ msgid "git fetch-pack: expected ACK/NAK, got EOF"
-#~ msgstr "git fetch-patch: förväntade ACK/NAK, fick EOF"
-
-#~ msgid "invalid filter-spec expression '%s'"
-#~ msgstr "ogiltig filterspec-utryck \"%s\""
+#, sh-format
+msgid "Trying simple merge with $pretty_name"
+msgstr "Försök enkel sammanslagning med $pretty_name"
 
-#~ msgid "The copy of the patch that failed is found in: %s"
-#~ msgstr "En kopia av patchen som misslyckades finns i: %s"
+msgid "Simple merge did not work, trying automatic merge."
+msgstr "Enkel sammanslagning misslyckades, försöker automatisk sammanslagning."
 
-#~ msgid "pathspec and --all are incompatible"
-#~ msgstr "sökvägsangivelse och --all är inkompatibla"
+#, sh-format
+msgid "usage: $dashless $USAGE"
+msgstr "använd: $dashless $USAGE"
 
-#~ msgid "Submodule '$name' ($url) unregistered for path '$displaypath'"
-#~ msgstr ""
-#~ "Undermodulen \"$name\" ($url) avregistrerad för sökvägen \"$displaypath\""
-
-#~ msgid "To/Cc/Bcc fields are not interpreted yet, they have been ignored\n"
-#~ msgstr "Fälten To/Cc/Bcc tolkas inte ännu, de har ignorerats\n"
-
-#~ msgid ""
-#~ "empty strings as pathspecs will be made invalid in upcoming releases. "
-#~ "please use . instead if you meant to match all paths"
-#~ msgstr ""
-#~ "tomma strängar som sökvägsangivelser kommer bli ogiltiga i en kommande "
-#~ "utgåva. använd istället . om du vill träffa alla sökvägar"
-
-#~ msgid "could not truncate '%s'"
-#~ msgstr "kunde inte trunkera \"%s\""
-
-#~ msgid "Copied a misnamed branch '%s' away"
-#~ msgstr "Kopierade bort en felaktigt namngiven gren \"%s\""
-
-#~ msgid "it does not make sense to create 'HEAD' manually"
-#~ msgstr "kan inte skapa \"HEAD\" manuellt"
-
-#~ msgid "Don't know how to clone %s"
-#~ msgstr "Vet inte hur man klonar %s"
-
-#~ msgid "Don't know how to fetch from %s"
-#~ msgstr "Vet inte hur man hämtar från %s"
-
-#~ msgid "'$term' is not a valid term"
-#~ msgstr "\"$term\" är inte en giltig term"
-
-#~ msgid ""
-#~ "error: unknown option for 'stash save': $option\n"
-#~ "       To provide a message, use git stash save -- '$option'"
-#~ msgstr ""
-#~ "fel: felaktig flagga för \"stash save\": $option\n"
-#~ "     För att ange ett meddelande, använd git stash save -- \"$option\""
-
-#~ msgid "Failed to recurse into submodule path '$sm_path'"
-#~ msgstr "Misslyckades rekursera in i undermodulsökvägen \"$sm_path\""
-
-#~ msgid ""
-#~ "unrecognized setting %s for optionrebase.missingCommitsCheck. Ignoring."
-#~ msgstr ""
-#~ "okänd inställning %s för flaggan rebase.missingCommitsCheck. Ignorerar."
-
-#~ msgid "%s, %"
-#~ msgid_plural "%s, %"
-#~ msgstr[0] "%s. %"
-#~ msgstr[1] "%s. %"
-
-#~ msgid "submodule update strategy not supported for submodule '%s'"
-#~ msgstr ""
-#~ "uppdateringsstrategi för undermodul stöds inte för undermodulen \"%s\""
-
-#~ msgid "change upstream info"
-#~ msgstr "ändra uppströmsinformation"
-
-#~ msgid ""
-#~ "\n"
-#~ "If you wanted to make '%s' track '%s', do this:\n"
-#~ "\n"
-#~ msgstr ""
-#~ "\n"
-#~ "Om du vill göra så att \"%s\" spårar \"%s\" gör du så här:\n"
-#~ "\n"
+#, sh-format
+msgid "Cannot chdir to $cdup, the toplevel of the working tree"
+msgstr "Kunde inte byta katalog till $cdup, toppnivån på arbetskatalogen"
 
-#~ msgid "basename"
-#~ msgstr "basnamn"
+#, sh-format
+msgid "fatal: $program_name cannot be used without a working tree."
+msgstr "ödesdigetrt: $program_name kan inte användas utan arbetskatalog."
 
-#~ msgid ""
-#~ "Warning: the SHA-1 is missing or isn't a commit in the following line:\n"
-#~ " - $line"
-#~ msgstr ""
-#~ "Varning: SHA-1 saknas eller inte en incheckning på följande rad:\n"
-#~ " - $line"
+msgid "Cannot rewrite branches: You have unstaged changes."
+msgstr "Kan inte skriva om grenar: Du har oköade ändringar."
 
-#~ msgid ""
-#~ "Warning: the command isn't recognized in the following line:\n"
-#~ " - $line"
-#~ msgstr ""
-#~ "Varning: kommandot kändes inte igen på följande rad:\n"
-#~ " - $line"
+#, sh-format
+msgid "Cannot $action: You have unstaged changes."
+msgstr "Kan inte $action: Du har oköade ändringar."
 
-#~ msgid "Or you can abort the rebase with 'git rebase --abort'."
-#~ msgstr "Eller så kan du avbryta ombaseringen med \"git rebase --abort\"."
+#, sh-format
+msgid "Cannot $action: Your index contains uncommitted changes."
+msgstr ""
+"Kan inte $action: Ditt index innehåller ändringar som inte checkats in."
 
-#~ msgid "in %0.1f seconds automatically..."
-#~ msgstr "automatiskt om %0.1f sekunder..."
+msgid "Additionally, your index contains uncommitted changes."
+msgstr "Dessutom innehåller dit index ändringar som inte har checkats in."
 
-#~ msgid "dup2(%d,%d) failed"
-#~ msgstr "dup2(%d,%d) misslyckades"
+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å."
 
-#~ msgid "Initial commit on "
-#~ msgstr "Första incheckning på "
+msgid "Unable to determine absolute path of git directory"
+msgstr "Kunde inte bestämma absolut sökväg till git-katalogen"
 
-#~ msgid "Patch is empty. Was it split wrong?"
-#~ msgstr "Patchen är tom. Delades den upp felaktigt?"
+#. TRANSLATORS: you can adjust this to align "git add -i" status menu
+#, perl-format
+msgid "%12s %12s %s"
+msgstr "%12s %12s %s"
 
-#~ msgid ""
-#~ "You still have unmerged paths in your index.\n"
-#~ "Did you forget to use 'git add'?"
-#~ msgstr ""
-#~ "Du har fortfarande sökvägar som inte slagits samman i ditt index.\n"
-#~ "Glömde du att använda \"git add\"?"
-
-#~ msgid ""
-#~ "Cannot update paths and switch to branch '%s' at the same time.\n"
-#~ "Did you intend to checkout '%s' which can not be resolved as commit?"
-#~ msgstr ""
-#~ "Kan inte uppdatera sökvägar och växla till grenen \"%s\" samtidigt.\n"
-#~ "Ville du checka ut \"%s\" som inte kan lösas som en utcheckning?"
-
-#~ msgid "Explicit paths specified without -i or -o; assuming --only paths..."
-#~ msgstr ""
-#~ "Explicita sökvägar angavs utan -i eller -o; antar --only sökvägar..."
-
-#~ msgid "default mode for recursion"
-#~ msgstr "standardläge för rekursion"
-
-#~ msgid "submodule--helper subcommand must be called with a subcommand"
-#~ msgstr ""
-#~ "underkommandot submodule--helper måste anropas med ett underkommando"
-
-#~ msgid "could not stat '%s"
-#~ msgstr "kunde inte ta status på \"%s\""
-
-#~ msgid "tag: tagging "
-#~ msgstr "tag: taggar"
-
-#~ msgid "commit object"
-#~ msgstr "incheckningsobjekt"
-
-#~ msgid "blob object"
-#~ msgstr "blob-objekt"
-
-#~ msgid ""
-#~ "There is nothing to exclude from by :(exclude) patterns.\n"
-#~ "Perhaps you forgot to add either ':/' or '.' ?"
-#~ msgstr ""
-#~ "Ingenting att exkludera från med :(exkludera)-mönster.\n"
-#~ "Glömde du kanske att antingen lägga till \":/\" eller \".\"?"
-
-#~ msgid "unrecognized format: %%(%s)"
-#~ msgstr "okänt format: %%(%s)"
-
-#~ msgid ":strip= requires a positive integer argument"
-#~ msgstr ":strip= kräver ett positivt heltalsargument"
-
-#~ msgid "ref '%s' does not have %ld components to :strip"
-#~ msgstr "referensen \"%s\" har inte %ld komponenter för :strip"
-
-#~ msgid "[%s: gone]"
-#~ msgstr "[%s: försvunnen]"
-
-#~ msgid "[%s]"
-#~ msgstr "[%s]"
-
-#~ msgid "[%s: behind %d]"
-#~ msgstr "[%s: bakom %d] "
-
-#~ msgid "[%s: ahead %d]"
-#~ msgstr "[%s: före %d] "
-
-#~ msgid "[%s: ahead %d, behind %d]"
-#~ msgstr "[%s: före %d, bakom %d] "
-
-#~ msgid " **** invalid ref ****"
-#~ msgstr " **** ogiltig ref ****"
-
-#~ msgid "insanely long object directory %.*s"
-#~ msgstr "tokigt lång objektkatalog %.*s"
-
-#~ msgid "tag name too long: %.*s..."
-#~ msgstr "taggnamnet för långt: %.*s..."
-
-#~ msgid "tag header too big."
-#~ msgstr "tagghuvud för stort."
-
-#~ msgid ""
-#~ "If the patch applies cleanly, the edited hunk will immediately be\n"
-#~ "marked for discarding"
-#~ msgstr ""
-#~ "Om patchen kan appliceras rent kommer det redigerade stycket att\n"
-#~ "markeras för kasta omedelbart"
+#, perl-format
+msgid "touched %d path\n"
+msgid_plural "touched %d paths\n"
+msgstr[0] "rörde %d sökväg\n"
+msgstr[1] "rörde %d sökvägar\n"
 
-#~ msgid "Use an experimental blank-line-based heuristic to improve diffs"
-#~ msgstr ""
-#~ "Använd en experimentell algoritm baserad på tomma rader för att förbättra "
-#~ "diffar"
+msgid ""
+"If the patch applies cleanly, the edited hunk will immediately be\n"
+"marked for staging."
+msgstr ""
+"Om patchen kan appliceras rent kommer det redigerade stycket att\n"
+"köas omedelbart."
 
-#~ msgid "Clever... amending the last one with dirty index."
-#~ msgstr "Smart... utöka den senaste med smutsigt index."
+msgid ""
+"If the patch applies cleanly, the edited hunk will immediately be\n"
+"marked for stashing."
+msgstr ""
+"Om patchen kan appliceras rent kommer det redigerade stycket att\n"
+"läggas till i \"stash\" omedelbart."
 
-#~ msgid ""
-#~ "the following submodule (or one of its nested submodules)\n"
-#~ "uses a .git directory:"
-#~ msgid_plural ""
-#~ "the following submodules (or one of their nested submodules)\n"
-#~ "use a .git directory:"
-#~ msgstr[0] ""
-#~ "följande undermodul (eller en av dess nästlade undermoduler)\n"
-#~ "använder en .git-katalog:"
-#~ msgstr[1] ""
-#~ "följande undermoduler (eller en av deras nästlade undermoduler)\n"
-#~ "använder en .git-katalog:"
+msgid ""
+"If the patch applies cleanly, the edited hunk will immediately be\n"
+"marked for unstaging."
+msgstr ""
+"Om patchen kan appliceras rent kommer det redigerade stycket att\n"
+"tas bort från kön omedelbart."
 
-#~ msgid ""
-#~ "\n"
-#~ "(use 'rm -rf' if you really want to remove it including all of its "
-#~ "history)"
-#~ msgstr ""
-#~ "\n"
-#~ "(använd \"rm -rf\" om du verkligen vill ta bort den och all dess historik)"
+msgid ""
+"If the patch applies cleanly, the edited hunk will immediately be\n"
+"marked for applying."
+msgstr ""
+"Om patchen kan appliceras rent kommer det redigerade stycket att\n"
+"markeras för applicering omedelbart."
 
-#~ msgid "Error wrapping up %s."
-#~ msgstr "Fel vid ombrytning av %s."
+msgid ""
+"If the patch applies cleanly, the edited hunk will immediately be\n"
+"marked for discarding."
+msgstr ""
+"Om patchen kan appliceras rent kommer det redigerade stycket att\n"
+"markeras för kasta omedelbart."
 
-#~ msgid "Your local changes would be overwritten by cherry-pick."
-#~ msgstr "Dina lokala ändringar skulle skrivas över av \"cherry-pick\"."
+#, perl-format
+msgid "failed to open hunk edit file for writing: %s"
+msgstr "misslyckades öppna styckeredigeringsfil för skrivning: %s"
 
-#~ msgid "Cannot revert during another revert."
-#~ msgstr "Kan inte utföra \"revert\" under en annan \"revert\"."
+#, perl-format
+msgid ""
+"---\n"
+"To remove '%s' lines, make them ' ' lines (context).\n"
+"To remove '%s' lines, delete them.\n"
+"Lines starting with %s will be removed.\n"
+msgstr ""
+"---\n"
+"Ta bort \"%s\" rader genom att göra dem \" \"-rader (sammanhang).\n"
+"Ta bort \"%s\" rader genom att radera dem.\n"
+"Rader som börjar med %s kommer att tas bort.\n"
 
-#~ msgid "Cannot cherry-pick during another cherry-pick."
-#~ msgstr "Kan inte utföra \"cherry-pick\" under en annan \"cherry-pick\"."
+#, perl-format
+msgid "failed to open hunk edit file for reading: %s"
+msgstr "misslyckades öppna styckesredigeringsfil för läsning: %s"
 
-#~ msgid "Could not open %s"
-#~ msgstr "Kunde inte öppna %s"
+msgid ""
+"y - stage this hunk\n"
+"n - do not stage this hunk\n"
+"q - quit; do not stage this hunk or any of the remaining ones\n"
+"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"
+msgstr ""
+"y - köa stycket\n"
+"n - köa inte stycket\n"
+"q - avsluta; köa inte stycket eller något av de följande\n"
+"a - köa stycket och alla följande i filen\n"
+"d - köa inte stycket eller något av de följande i filen"
 
-#~ msgid "Could not format %s."
-#~ msgstr "Kunde inte formatera %s."
+msgid ""
+"y - stash this hunk\n"
+"n - do not stash this hunk\n"
+"q - quit; do not stash this hunk or any of the remaining ones\n"
+"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"
+msgstr ""
+"y - \"stash\":a stycket\n"
+"n - \"stash\":a inte stycket\n"
+"q - avsluta; \"stash\":a inte stycket eller något av de följande\n"
+"a - \"stash\":a stycket och alla följande i filen\n"
+"d - \"stash\":a inte stycket eller något av de följande i filen"
 
-#~ msgid "You need to set your committer info first"
-#~ msgstr "Du måste ställa in din incheckarinformation först"
+msgid ""
+"y - unstage this hunk\n"
+"n - do not unstage this hunk\n"
+"q - quit; do not unstage this hunk or any of the remaining ones\n"
+"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"
+msgstr ""
+"y - ta bort stycket från kön\n"
+"n - ta inte bort stycket från kön\n"
+"q - avsluta; ta inte bort stycket eller något av de följande från kön\n"
+"a - ta bort stycket och alla följande i filen från kön\n"
+"d - ta inte bort stycket eller något av de följande i filen från kön"
 
-#~ msgid "bad numeric config value '%s' for '%s': invalid unit"
-#~ msgstr ""
-#~ "felaktigt numeriskt konfigurationsvärde \"%s\" för \"%s\": ogiltig enhet"
+msgid ""
+"y - apply this hunk to index\n"
+"n - do not apply this hunk to index\n"
+"q - quit; do not apply this hunk or any of the remaining ones\n"
+"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"
+msgstr ""
+"y - applicera stycket på indexet\n"
+"n - applicera inte stycket på indexet\n"
+"q - avsluta; applicera inte stycket eller något av de följande\n"
+"a - applicera stycket och alla följande i filen\n"
+"d - applicera inte stycket eller något av de följande i filen"
 
-#~ msgid "bad numeric config value '%s' for '%s' in blob %s: invalid unit"
-#~ msgstr ""
-#~ "felaktigt numeriskt konfigurationsvärde \"%s\" för \"%s\" i blob:en %s: "
-#~ "ogiltig enhet"
+msgid ""
+"y - discard this hunk from worktree\n"
+"n - do not discard this hunk from worktree\n"
+"q - quit; do not discard this hunk or any of the remaining ones\n"
+"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"
+msgstr ""
+"y - förkasta stycket från arbetskatalogen\n"
+"n - förkasta inte stycket från arbetskatalogen\n"
+"q - avsluta; förkasta inte stycket eller något av de följande\n"
+"a - förkasta stycket och alla följande i filen\n"
+"d - förkasta inte stycket eller något av de följande i filen"
 
-#~ msgid "bad numeric config value '%s' for '%s' in file %s: invalid unit"
-#~ msgstr ""
-#~ "felaktigt numeriskt konfigurationsvärde \"%s\" för \"%s\" i filen %s: "
-#~ "ogiltig enhet"
+msgid ""
+"y - discard this hunk from index and worktree\n"
+"n - do not discard this hunk from index and worktree\n"
+"q - quit; do not discard this hunk or any of the remaining ones\n"
+"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"
+msgstr ""
+"y - förkasta stycket från indexet och arbetskatalogen\n"
+"n - förkasta inte stycket från indexet och arbetskatalogen\n"
+"q - avsluta; förkasta inte stycket eller något av de följande\n"
+"a - förkasta stycket och alla följande i filen\n"
+"d - förkasta inte stycket eller något av de följande i filen"
 
-#~ msgid ""
-#~ "bad numeric config value '%s' for '%s' in standard input: invalid unit"
-#~ msgstr ""
-#~ "felaktigt numeriskt konfigurationsvärde \"%s\" för \"%s\" i standard in: "
-#~ "ogiltig enhet"
+msgid ""
+"y - apply this hunk to index and worktree\n"
+"n - do not apply this hunk to index and worktree\n"
+"q - quit; do not apply this hunk or any of the remaining ones\n"
+"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"
+msgstr ""
+"y - applicera stycket på indexet och arbetskatalogen\n"
+"n - applicera inte stycket på indexet och arbetskatalogen\n"
+"q - avsluta; applicera inte stycket eller något av de följande\n"
+"a - applicera stycket och alla följande i filen\n"
+"d - applicera inte stycket eller något av de följande i filen"
 
-#~ msgid ""
-#~ "bad numeric config value '%s' for '%s' in submodule-blob %s: invalid unit"
-#~ msgstr ""
-#~ "felaktigt numeriskt konfigurationsvärde \"%s\" för \"%s\" i undermodul-"
-#~ "blob:en %s: ogiltig enhet"
+msgid ""
+"y - apply this hunk to worktree\n"
+"n - do not apply this hunk to worktree\n"
+"q - quit; do not apply this hunk or any of the remaining ones\n"
+"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"
+msgstr ""
+"y - applicera stycket på arbetskatalogen\n"
+"n - applicera inte stycket på arbetskatalogen\n"
+"q - avsluta; applicera inte stycket eller något av de följande\n"
+"a - applicera stycket och alla följande i filen\n"
+"d - applicera inte stycket eller något av de följande i filen"
 
-#~ msgid ""
-#~ "bad numeric config value '%s' for '%s' in command line %s: invalid unit"
-#~ msgstr ""
-#~ "felaktigt numeriskt konfigurationsvärde \"%s\" för \"%s\" i kommandoraden "
-#~ "%s: ogiltig enhet"
+msgid ""
+"g - select a hunk to go to\n"
+"/ - search for a hunk matching the given regex\n"
+"j - leave this hunk undecided, see next undecided hunk\n"
+"J - leave this hunk undecided, see next hunk\n"
+"k - leave this hunk undecided, see previous undecided hunk\n"
+"K - leave this hunk undecided, see previous hunk\n"
+"s - split the current hunk into smaller hunks\n"
+"e - manually edit the current hunk\n"
+"? - print help\n"
+msgstr ""
+"g - välj ett stycke att gå till\n"
+"/ - sök efter stycke som motsvarar angivet reguljärt uttryck\n"
+"j - lämna stycket obestämt, se nästa obestämda stycke\n"
+"J - lämna stycket obestämt, se nästa stycke\n"
+"k - lämna stycket obestämt, se föregående obestämda stycke\n"
+"K - lämna stycket obestämt, se föregående stycke\n"
+"s - dela aktuellt stycke i mindre styckens\n"
+"e - redigera aktuellt stycke manuellt\n"
+"? - visa hjälp\n"
 
-#~ msgid "bad numeric config value '%s' for '%s' in %s: invalid unit"
-#~ msgstr ""
-#~ "felaktigt numeriskt konfigurationsvärde \"%s\" för \"%s\" i %s: ogiltig "
-#~ "enhet"
+msgid "The selected hunks do not apply to the index!\n"
+msgstr "Markerade stycken kan inte appliceras på indexet!\n"
 
-#~ msgid "This is the 3rd commit message:"
-#~ msgstr "Det här är 3:e incheckningsmeddelandet:"
+#, perl-format
+msgid "ignoring unmerged: %s\n"
+msgstr "ignorerar ej sammanslagen: %s\n"
 
-#~ msgid "This is the 4th commit message:"
-#~ msgstr "Det här är 4:e incheckningsmeddelandet:"
+#, perl-format
+msgid "Apply mode change to worktree [y,n,q,a,d%s,?]? "
+msgstr "Applicera ändrat läge på arbetskatalogen [y,n,q,a,d%s,?]? "
 
-#~ msgid "This is the 5th commit message:"
-#~ msgstr "Det här är 5:e incheckningsmeddelandet:"
+#, perl-format
+msgid "Apply deletion to worktree [y,n,q,a,d%s,?]? "
+msgstr "Applicera borttagning på arbetskatalogen [y,n,q,a,d%s,?]? "
 
-#~ msgid "This is the 6th commit message:"
-#~ msgstr "Det här är 6:e incheckningsmeddelandet:"
+#, perl-format
+msgid "Apply addition to worktree [y,n,q,a,d%s,?]? "
+msgstr "Applicera tillägg på arbetskatalogen [y,n,q,a,d%s,?]? "
 
-#~ msgid "This is the 7th commit message:"
-#~ msgstr "Det här är 7:e incheckningsmeddelandet:"
+#, perl-format
+msgid "Apply this hunk to worktree [y,n,q,a,d%s,?]? "
+msgstr "Applicera stycket på arbetskatalogen [y,n,q,a,d%s,?]? "
 
-#~ msgid "This is the 8th commit message:"
-#~ msgstr "Det här är 8:e incheckningsmeddelandet:"
+msgid "No other hunks to goto\n"
+msgstr "Inga andra stycken att gå till\n"
 
-#~ msgid "This is the 9th commit message:"
-#~ msgstr "Det här är 9:e incheckningsmeddelandet:"
+#, perl-format
+msgid "Invalid number: '%s'\n"
+msgstr "Ogiltigt siffervärde: \"%s\"\n"
 
-#~ msgid "This is the 10th commit message:"
-#~ msgstr "Det här är 10:e incheckningsmeddelandet:"
+#, perl-format
+msgid "Sorry, only %d hunk available.\n"
+msgid_plural "Sorry, only %d hunks available.\n"
+msgstr[0] "Beklagar, det finns bara %d stycke.\n"
+msgstr[1] "Beklagar, det finns bara %d stycken.\n"
 
-#~ msgid "This is the ${n}th commit message:"
-#~ msgstr "Det här är ${n}:e incheckningsmeddelandet:"
+msgid "No other hunks to search\n"
+msgstr "Inga andra stycken att söka efter\n"
 
-#~ msgid "This is the ${n}st commit message:"
-#~ msgstr "Det här är ${n}:a incheckningsmeddelandet:"
+#, perl-format
+msgid "Malformed search regexp %s: %s\n"
+msgstr "Felaktigt format på reguljärt sökuttryck %s: %s\n"
 
-#~ msgid "This is the ${n}nd commit message:"
-#~ msgstr "Det här är ${n}:a incheckningsmeddelandet:"
+msgid "No hunk matches the given pattern\n"
+msgstr "Inga stycken motsvarar givet mönster\n"
 
-#~ msgid "This is the ${n}rd commit message:"
-#~ msgstr "Det här är ${n}:e incheckningsmeddelandet:"
+msgid "No previous hunk\n"
+msgstr "Inget föregående stycke\n"
 
-#~ msgid "The 2nd commit message will be skipped:"
-#~ msgstr "2:a incheckningsmeddelandet kommer hoppas över:"
+msgid "No next hunk\n"
+msgstr "Inget följande stycke\n"
 
-#~ msgid "The 3rd commit message will be skipped:"
-#~ msgstr "3:e incheckningsmeddelandet kommer hoppas över:"
+msgid "Sorry, cannot split this hunk\n"
+msgstr "Beklagar, kan inte dela stycket\n"
 
-#~ msgid "The 4th commit message will be skipped:"
-#~ msgstr "4:e incheckningsmeddelandet kommer hoppas över:"
+#, perl-format
+msgid "Split into %d hunk.\n"
+msgid_plural "Split into %d hunks.\n"
+msgstr[0] "Dela i %d stycke.\n"
+msgstr[1] "Dela i %d stycken.\n"
 
-#~ msgid "The 5th commit message will be skipped:"
-#~ msgstr "5:e incheckningsmeddelandet kommer hoppas över:"
+msgid "Sorry, cannot edit this hunk\n"
+msgstr "Beklagar, kan inte redigera stycket\n"
 
-#~ msgid "The 6th commit message will be skipped:"
-#~ msgstr "6:e incheckningsmeddelandet kommer hoppas över:"
+#. TRANSLATORS: please do not translate the command names
+#. 'status', 'update', 'revert', etc.
+msgid ""
+"status        - show paths with changes\n"
+"update        - add working tree state to the staged set of changes\n"
+"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"
+msgstr ""
+"status        - visa sökvägar med ändringar\n"
+"update        - lägg arbetskatalogens tillstånd till köade ändringar\n"
+"revert        - återställ köade ändringar till HEAD-versionen\n"
+"patch         - välj och uppdatera valda stycken\n"
+"diff          - visa diff mellan HEAD och index\n"
+"add untracked - lägg till innehåll i ospårade filer till köade ändringar\n"
 
-#~ msgid "The 7th commit message will be skipped:"
-#~ msgstr "7:e incheckningsmeddelandet kommer hoppas över:"
+msgid "missing --"
+msgstr "saknad --"
 
-#~ msgid "The 8th commit message will be skipped:"
-#~ msgstr "8:e incheckningsmeddelandet kommer hoppas över:"
+#, perl-format
+msgid "unknown --patch mode: %s"
+msgstr "okänt läge för --patch: %s"
 
-#~ msgid "The 9th commit message will be skipped:"
-#~ msgstr "9:e incheckningsmeddelandet kommer hoppas över:"
+#, perl-format
+msgid "invalid argument %s, expecting --"
+msgstr "felaktigt argument %s, förväntar --"
 
-#~ msgid "The 10th commit message will be skipped:"
-#~ msgstr "10:e incheckningsmeddelandet kommer hoppas över:"
+msgid "local zone differs from GMT by a non-minute interval\n"
+msgstr "lokal zon skiljer sig från GMT med delar av minuter\n"
 
-#~ msgid "The ${n}th commit message will be skipped:"
-#~ msgstr "${n}:e incheckningsmeddelandet kommer hoppas över:"
+msgid "local time offset greater than or equal to 24 hours\n"
+msgstr "lokal tidszonförskjutning större än eller lika med 24 timmar\n"
 
-#~ msgid "The ${n}st commit message will be skipped:"
-#~ msgstr "${n}:a incheckningsmeddelandet kommer hoppas över:"
+#, perl-format
+msgid "fatal: command '%s' died with exit code %d"
+msgstr "ödesdigert: kommandot \"%s\" dog med slutkoden %d"
 
-#~ msgid "The ${n}nd commit message will be skipped:"
-#~ msgstr "${n}:a incheckningsmeddelandet kommer hoppas över:"
+msgid "the editor exited uncleanly, aborting everything"
+msgstr "textredigeringsprogrammet avslutades med fel, avbryter allting"
 
-#~ msgid "The ${n}rd commit message will be skipped:"
-#~ msgstr "${n}:e incheckningsmeddelandet kommer hoppas över:"
+#, perl-format
+msgid ""
+"'%s' contains an intermediate version of the email you were composing.\n"
+msgstr ""
+"\"%s\" innehåller en mellanliggande version av e-postbrevet du skrev.\n"
 
-#~ msgid "could not run gpg."
-#~ msgstr "kunde inte köra gpg."
+#, perl-format
+msgid "'%s.final' contains the composed email.\n"
+msgstr "\"%s.final\" innehåller det skrivna brevet.\n"
 
-#~ msgid "gpg did not accept the data"
-#~ msgstr "gpg godtog inte data"
+msgid "--dump-aliases incompatible with other options\n"
+msgstr "--dump-aliases är inkompatibelt med andra flaggor\n"
 
-#~ msgid "unsupported object type in the tree"
-#~ msgstr "objekttyp som ej stöds upptäcktes i trädet"
+msgid ""
+"fatal: found configuration options for 'sendmail'\n"
+"git-send-email is configured with the sendemail.* options - note the 'e'.\n"
+"Set sendemail.forbidSendmailVariables to false to disable this check.\n"
+msgstr ""
+"ödesdigert: hittade konfigurationsflaggor för \"sendmail\"\n"
+"git-send-email konfigureras med \"sendemail.*\"-flaggor - lägg märke till \"e"
+"\".\n"
+"Sätt sendemail.forbidSendmailVariables till false för att inaktivera denna "
+"kontroll.\n"
 
-#~ msgid "Fatal merge failure, shouldn't happen."
-#~ msgstr "Ödesdigert sammanslagningsfel, borde inte inträffa."
+msgid "Cannot run git format-patch from outside a repository\n"
+msgstr "Kan inte köra git format-patch från utanför arkivet\n"
 
-#~ msgid "Unprocessed path??? %s"
-#~ msgstr "Obehandlad sökväg??? %s"
+msgid ""
+"`batch-size` and `relogin` must be specified together (via command-line or "
+"configuration option)\n"
+msgstr ""
+"\"batch-size\" och \"relogin\" måste anges tillsammans (via kommandorad "
+"eller konfigurationsflagga)\n"
 
-#~ msgid "Cannot %s during a %s"
-#~ msgstr "kan inte %s under en %s"
+#, perl-format
+msgid "Unknown --suppress-cc field: '%s'\n"
+msgstr "Okänt fält i --suppress-cc: \"%s\"\n"
 
-#~ msgid "Can't cherry-pick into empty head"
-#~ msgstr "Kan inte göra \"cherry-pick\" i ett tomt huvud"
+#, perl-format
+msgid "Unknown --confirm setting: '%s'\n"
+msgstr "Okänd inställning i --confirm: \"%s\"\n"
 
-#~ msgid "bug: unhandled unmerged status %x"
-#~ msgstr "programfel: ej hanterad \"unmerged\"-status %x"
+#, perl-format
+msgid "warning: sendmail alias with quotes is not supported: %s\n"
+msgstr "varning: sendmail-alias med citationstecken stöds inte. %s\n"
 
-#~ msgid "bug: unhandled diff status %c"
-#~ msgstr "programfel: diff-status %c ej hanterad"
+#, perl-format
+msgid "warning: `:include:` not supported: %s\n"
+msgstr "varning: \":include:\" stöds inte: %s\n"
 
-#~ msgid "could not write branch description template"
-#~ msgstr "kunde inte skriva grenbeskrivningsmall"
+#, perl-format
+msgid "warning: `/file` or `|pipe` redirection not supported: %s\n"
+msgstr "varning: omdirigering til \"/fil\" eller \"|rör\" stöds inte: %s\n"
 
-#~ msgid "corrupt index file"
-#~ msgstr "indexfilen är trasig"
+#, perl-format
+msgid "warning: sendmail line is not recognized: %s\n"
+msgstr "varning: sendmail-raden känns inte igen: %s\n"
 
-#~ msgid "detach the HEAD at named commit"
-#~ msgstr "koppla från HEAD vid namngiven incheckning"
+#, perl-format
+msgid ""
+"File '%s' exists but it could also be the range of commits\n"
+"to produce patches for.  Please disambiguate by...\n"
+"\n"
+"    * Saying \"./%s\" if you mean a file; or\n"
+"    * Giving --format-patch option if you mean a range.\n"
+msgstr ""
+"Filen \"%s\" finns men kan också vara ett incheckningsintervall\n"
+"att skapa patchar för. Gör otvetydigt genom att...\n"
+"\n"
+"    * Säga \"./%s\" om du menar en fil; eller\n"
+"    * Ange flaggan --format-patch om du menar ett intervall.\n"
 
-# Vague original, not networking-related, but rather related to the actual
-# objects downloaded.
-#~ msgid "Checking connectivity... "
-#~ msgstr "Kontrollerar om vi fick alla objekt..."
-
-#~ msgid "  (unable to update local ref)"
-#~ msgstr "  (kunde inte uppdatera lokal ref)"
-
-#~ msgid "Initialized empty"
-#~ msgstr "Initierade tomt"
-
-#~ msgid " shared"
-#~ msgstr " delat"
-
-#~ msgid "Verify that the named commit has a valid GPG signature"
-#~ msgstr "Bekräfta att den namngivna incheckningen har en giltig GPG-signatur"
-
-#~ msgid "Writing SQUASH_MSG"
-#~ msgstr "Skriver SQUASH_MSG"
-
-#~ msgid "Finishing SQUASH_MSG"
-#~ msgstr "Avslutar SQUASH_MSG"
-
-#~ msgid "   and with remote"
-#~ msgstr "   och med fjärren"
-
-#~ msgid "removing '%s' failed"
-#~ msgstr "misslyckades ta bort \"%s\""
-
-#~ msgid ""
-#~ "If you want to reuse this local git directory instead of cloning again "
-#~ "from"
-#~ msgstr ""
-#~ "För att återanvända den lokala git-katalogen istället för att på nytt "
-#~ "klona från"
-
-#~ msgid ""
-#~ "use the '--force' option. If the local git directory is not the correct "
-#~ "repo"
-#~ msgstr ""
-#~ "använd flaggan \"--force\". Om den lokala git-katalogen inte är riktigt "
-#~ "arkiv"
-
-#~ msgid ""
-#~ "or you are unsure what this means choose another name with the '--name' "
-#~ "option."
-#~ msgstr ""
-#~ "eller om du är osäker på vad det innebär, välj nytt namn med flaggan \"--"
-#~ "name\"."
-
-#~ msgid "Submodule work tree '$displaypath' contains a .git directory"
-#~ msgstr ""
-#~ "Undermodulens arbetskatalog \"$displaypath\" innehåller katalogen \".git\""
-
-#~ msgid ""
-#~ "(use 'rm -rf' if you really want to remove it including all of its "
-#~ "history)"
-#~ msgstr ""
-#~ "(använd \"rm -rf\" om du verkligen vill ta bort den och all dess historik)"
-
-#~ msgid "'%s': %s"
-#~ msgstr "\"%s\": %s"
-
-#~ msgid "    git branch -d %s\n"
-#~ msgstr "    git branch -d %s\n"
-
-#~ msgid "    git branch --set-upstream-to %s\n"
-#~ msgstr "    git branch --set-upstream-to %s\n"
-
-#~ msgid "cannot open %s: %s\n"
-#~ msgstr "kan inte öppna %s: %s\n"
-
-#~ msgid "Please, stage your changes to .gitmodules or stash them to proceed"
-#~ msgstr ""
-#~ "Köa dina ändringar i .gitmodules eller använd \"stash\" för att fortsätta"
-
-#~ msgid "failed to remove: %s"
-#~ msgstr "misslyckades ta bort: %s"
-
-#~ msgid ""
-#~ "Submodule path '$displaypath' not initialized\n"
-#~ "Maybe you want to use 'update --init'?"
-#~ msgstr ""
-#~ "Undermodulen \"$displaypath\" har inte initierats\n"
-#~ "Kanske du vill köra \"update --init\"?"
-
-#~ msgid "Forward-port local commits to the updated upstream head"
-#~ msgstr "Framåtanpassa lokala kommandon på uppdaterat uppströmshuvud"
-
-#~ msgid "improper format entered align:%s"
-#~ msgstr "felaktigt format angivet align:%s"
-
-#~ msgid ""
-#~ "push.default is unset; its implicit value has changed in\n"
-#~ "Git 2.0 from 'matching' to 'simple'. To squelch this message\n"
-#~ "and maintain the traditional behavior, use:\n"
-#~ "\n"
-#~ "  git config --global push.default matching\n"
-#~ "\n"
-#~ "To squelch this message and adopt the new behavior now, use:\n"
-#~ "\n"
-#~ "  git config --global push.default simple\n"
-#~ "\n"
-#~ "When push.default is set to 'matching', git will push local branches\n"
-#~ "to the remote branches that already exist with the same name.\n"
-#~ "\n"
-#~ "Since Git 2.0, Git defaults to the more conservative 'simple'\n"
-#~ "behavior, which only pushes the current branch to the corresponding\n"
-#~ "remote branch that 'git pull' uses to update the current branch.\n"
-#~ "\n"
-#~ "See 'git help config' and search for 'push.default' for further "
-#~ "information.\n"
-#~ "(the 'simple' mode was introduced in Git 1.7.11. Use the similar mode\n"
-#~ "'current' instead of 'simple' if you sometimes use older versions of Git)"
-#~ msgstr ""
-#~ "push.default har inte ställts in; dess underförstådda värde\n"
-#~ "ändras i Git 2.0 från \"matching\" till \"simple\". För att\n"
-#~ "undertrycka det här meddelandet och behålla traditionellt beteende\n"
-#~ "skriver du:\n"
-#~ "\n"
-#~ "  git config --global push.default matching\n"
-#~ "\n"
-#~ "För att undertrycka meddelandet och välja det nya beteendet nu skriver "
-#~ "du:\n"
-#~ "\n"
-#~ "  git config --global push.default simple\n"
-#~ "\n"
-#~ "När push.default är satt till \"matching\" kommer git att sända lokala "
-#~ "grenar\n"
-#~ "till fjärrgrenar som redan finns och som har samma namn.\n"
-#~ "\n"
-#~ "Git 2.0 kommer som standard välja den mer konservativa inställningen\n"
-#~ "\"simple\", vilket bara sänder in den aktuella grenen till den "
-#~ "motsvarande\n"
-#~ "fjärrgren \"git pull\" använder för att uppdatera den aktuella grenen.\n"
-#~ "\n"
-#~ "Se \"git help config\" och sök efter \"push.default\" för ytterligare \n"
-#~ "information. (Läget \"simple\" introducerades i Git 1.7.11. Använd det\n"
-#~ "liknande läget \"current\" istället för \"simple\" om du ibland använder\n"
-#~ "äldre versioner av Git.)"
-
-#~ msgid "check|on-demand|no"
-#~ msgstr "check|on-demand|no"
-
-#~ msgid "Could not append '%s'"
-#~ msgstr "Kunde inte lägga till på \"%s\""
-
-#~ msgid "Testing "
-#~ msgstr "Testar"
-
-#~ msgid "unable to look up current user in the passwd file: %s"
-#~ msgstr "kan inte slå upp aktuell användare i passwd-filen: %s"
-
-#~ msgid "no such user"
-#~ msgstr "okänd användare"
-
-#~ msgid "branch '%s' does not point at a commit"
-#~ msgstr "grenen \"%s\" pekar inte på en incheckning"
-
-#~ msgid "--dissociate given, but there is no --reference"
-#~ msgstr "--dissociate angavs, men --reference har inte angivits"
-
-#~ msgid "show usage"
-#~ msgstr "visa användning"
-
-#~ msgid "insanely long template name %s"
-#~ msgstr "tokigt långt namn på mallen %s"
-
-#~ msgid "insanely long symlink %s"
-#~ msgstr "tokigt lång symbolisk länk %s"
-
-#~ msgid "insanely long template path %s"
-#~ msgstr "tokigt lång mallsökväg %s"
-
-#~ msgid "false|true|preserve"
-#~ msgstr "false|true|preserve"
-
-#~ msgid "unsupported sort specification '%s' in variable '%s'"
-#~ msgstr "sorteringsangivelsen \"%s\" i variabeln \"%s\" stöds ej"
-
-#~ msgid "switch 'points-at' requires an object"
-#~ msgstr "flaggan \"points-at\" behöver ett objekt"
-
-#~ msgid "--sort and -n are incompatible"
-#~ msgstr "--sort och -n är inkompatibla"
-
-#~ msgid "Gitdir '$a' is part of the submodule path '$b' or vice versa"
-#~ msgstr "Gitkatalog \"$a\" ingår i undermodulsökvägen \"$b\" eller omvänt"
-
-#~ msgid "BUG: reopen a lockfile that is still open"
-#~ msgstr "FEL: återöppna en låsfil som fortfarande är öppen"
-
-#~ msgid "BUG: reopen a lockfile that has been committed"
-#~ msgstr "FEL: återöppna en låsfil som har överlämnats"
-
-#~ msgid "option %s does not accept negative form"
-#~ msgstr "flaggan %s godtar inte negativ form"
-
-#~ msgid "-b and -B are mutually exclusive"
-#~ msgstr "-b och -B kan inte användas samtidigt"
-
-#~ msgid ""
-#~ "When you have resolved this problem, run \"$cmdline --continue\".\n"
-#~ "If you prefer to skip this patch, run \"$cmdline --skip\" instead.\n"
-#~ "To restore the original branch and stop patching, run \"$cmdline --abort"
-#~ "\"."
-#~ msgstr ""
-#~ "När du har löst problemet kör du \"$cmdline --continue\".\n"
-#~ "Om du vill hoppa över patchen kör du istället \"$cmdline --skip\".\n"
-#~ "För att återställa originalgrenen och avbryta kör du \"$cmdline --abort\"."
+#, perl-format
+msgid "Failed to opendir %s: %s"
+msgstr "Misslyckades utföra opendir %s: %s"
 
-#~ msgid "Patch format $patch_format is not supported."
-#~ msgstr "Patchformatet $patch_format stöds inte."
+msgid ""
+"\n"
+"No patch files specified!\n"
+"\n"
+msgstr ""
+"\n"
+"Inga patchfiler angavs!\n"
+"\n"
 
-#~ msgid "Please make up your mind. --skip or --abort?"
-#~ msgstr "Bestäm dig. --skip eller --abort?"
+#, perl-format
+msgid "No subject line in %s?"
+msgstr "Ingen ärenderad i %s?"
 
-#~ msgid ""
-#~ "Patch is empty.  Was it split wrong?\n"
-#~ "If you would prefer to skip this patch, instead run \"$cmdline --skip\".\n"
-#~ "To restore the original branch and stop patching run \"$cmdline --abort\"."
-#~ msgstr ""
-#~ "Patchen är tom. Delades den upp felaktigt?\n"
-#~ "Om du vill hoppa över patchen kör du istället \"$cmdline --skip\".\n"
-#~ "För att återställa originalgrenen och avbryta kör du \"$cmdline --abort\"."
+#, perl-format
+msgid "Failed to open for writing %s: %s"
+msgstr "Kunde inte öppna för skrivning %s: %s"
 
-#~ msgid "Patch does not have a valid e-mail address."
-#~ msgstr "Patchen har inte någon giltig e-postadress."
+msgid ""
+"Lines beginning in \"GIT:\" will be removed.\n"
+"Consider including an overall diffstat or table of contents\n"
+"for the patch you are writing.\n"
+"\n"
+"Clear the body content if you don't wish to send a summary.\n"
+msgstr ""
+"Rader som börjar med \"GIT:\" kommer tas bort.\n"
+"Överväg att ta med en övergripande diffstatus eller\n"
+"innehållsförteckning för patchen du skriver.\n"
+"\n"
+"Rensa brevkroppen om du inte vill sända någon sammanfattning.\n"
 
-#~ msgid "Applying: $FIRSTLINE"
-#~ msgstr "Tillämpar: $FIRSTLINE"
+#, perl-format
+msgid "Failed to open %s: %s"
+msgstr "Misslyckades öppna %s: %s"
 
-#~ msgid "Patch failed at $msgnum $FIRSTLINE"
-#~ msgstr "Patchen misslyckades vid $msgnum $FIRSTLINE"
+#, perl-format
+msgid "Failed to open %s.final: %s"
+msgstr "Misslyckades öppna %s.final: %s"
 
-#~ msgid ""
-#~ "Pull is not possible because you have unmerged files.\n"
-#~ "Please, fix them up in the work tree, and then use 'git add/rm <file>'\n"
-#~ "as appropriate to mark resolution and make a commit."
-#~ msgstr ""
-#~ "Du kan inte göra en \"pull\" då du har ändringar som inte checkats in.\n"
-#~ "Rätta dem i din arbetskatalog och använd sedan \"git add/rm <fil>\"\n"
-#~ "där det är lämpligt för att ange lösning och checka in."
+msgid "Summary email is empty, skipping it\n"
+msgstr "Sammanfattande brev tomt, hoppar över\n"
 
-#~ msgid "no branch specified"
-#~ msgstr "inget grennamn angavs"
+#. TRANSLATORS: please keep [y/N] as is.
+#, perl-format
+msgid "Are you sure you want to use <%s> [y/N]? "
+msgstr "Är du säker på att du vill använda <%s> [Y=ja, N=nej]? "
 
-#~ msgid "prune .git/worktrees"
-#~ msgstr "rensa .git/worktrees"
+msgid ""
+"The following files are 8bit, but do not declare a Content-Transfer-"
+"Encoding.\n"
+msgstr ""
+"Följande filer är åttabitars, men anger inte en Content-Transfer-Encoding.\n"
 
-#~ msgid "The most commonly used git commands are:"
-#~ msgstr "De mest använda git-kommandona är:"
+msgid "Which 8bit encoding should I declare [UTF-8]? "
+msgstr "Vilken åttabitarsteckenkodning ska jag ange [UTF-8]? "
 
-#~ msgid "No such branch: '%s'"
-#~ msgstr "Okänd gren: \"%s\""
+#, 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"
+msgstr ""
+"Vägrar sända eftersom patchen\n"
+"\t%s\n"
+"har mallärendet \"*** SUBJECT HERE ***\". Använd --force om du verkligen "
+"vill sända.\n"
 
-#~ msgid "Could not create git link %s"
-#~ msgstr "Kunde inte skapa gitlänk %s"
+msgid "To whom should the emails be sent (if anyone)?"
+msgstr "Till vem ska breven sändas (om någon)?"
 
-#~ msgid "Invalid gc.pruneexpire: '%s'"
-#~ msgstr "Ogiltig gc.pruneexpire: '%s'"
+#, perl-format
+msgid "fatal: alias '%s' expands to itself\n"
+msgstr "ödesdigert: aliaset \"%s\" expanderar till sig själv\n"
 
-#~ msgid "No existing author found with '%s'"
-#~ msgstr "Hittade ingen befintlig författare med \"%s\""
-
-#~ msgid "search also in ignored files"
-#~ msgstr "sök även i ignorerade filer"
-
-#~ msgid "git remote set-head <name> (-a | --auto | -d | --delete |<branch>)"
-#~ msgstr "git remote set-head <namn> (-a | --auto | -d | --delete | <gren>)"
-
-#~ msgid "no files added"
-#~ msgstr "inga filer har lagts till"
-
-#~ msgid "slot"
-#~ msgstr "plats"
-
-#~ msgid "Failed to lock ref for update"
-#~ msgstr "Misslyckades låsa referens för uppdatering"
-
-#~ msgid "Failed to write ref"
-#~ msgstr "Misslyckades skriva referens"
-
-#~ msgid "Failed to lock HEAD during fast_forward_to"
-#~ msgstr "Misslyckades låsa HEAD under \"fast_forward_to\""
-
-#~ msgid "cannot lock HEAD ref"
-#~ msgstr "kunde inte låsa HEAD-referens"
-
-#~ msgid "cannot update HEAD ref"
-#~ msgstr "kunde inte uppdatera HEAD-referens"
-
-#~ msgid "%s: cannot lock the ref"
-#~ msgstr "%s: kan inte låsa referensen"
-
-#~ msgid "commit has empty message"
-#~ msgstr "incheckningen har ett tomt meddelande"
-
-#~ msgid "Failed to chdir: %s"
-#~ msgstr "Kunde inte byta katalog (chdir): %s"
-
-#~ msgid "Tracking not set up: name too long: %s"
-#~ msgstr "Spårning har inte ställts in: namnet för långt: %s"
-
-#~ msgid "could not find .gitmodules in index"
-#~ msgstr "kunde inte hitta .gitmodules i indexet"
-
-#~ msgid "reading updated .gitmodules failed"
-#~ msgstr "misslyckades läsa uppdaterad .gitmodules"
-
-#~ msgid "unable to stat updated .gitmodules"
-#~ msgstr "kan inte ta status på uppdaterad .gitmodules"
-
-#~ msgid "unable to remove .gitmodules from index"
-#~ msgstr "kan inte ta bort .gitmodules från indexet"
-
-#~ msgid "adding updated .gitmodules failed"
-#~ msgstr "misslyckades lägga till uppdaterad .gitmodules"
-
-#~ msgid "bug"
-#~ msgstr "programfel"
-
-#~ msgid ", behind "
-#~ msgstr ", efter "
-
-#~ msgid ""
-#~ "The behavior of 'git add %s (or %s)' with no path argument from a\n"
-#~ "subdirectory of the tree will change in Git 2.0 and should not be used "
-#~ "anymore.\n"
-#~ "To add content for the whole tree, run:\n"
-#~ "\n"
-#~ "  git add %s :/\n"
-#~ "  (or git add %s :/)\n"
-#~ "\n"
-#~ "To restrict the command to the current directory, run:\n"
-#~ "\n"
-#~ "  git add %s .\n"
-#~ "  (or git add %s .)\n"
-#~ "\n"
-#~ "With the current Git version, the command is restricted to the current "
-#~ "directory.\n"
-#~ msgstr ""
-#~ "Beteendet för \"git add %s (eller %s)\" utan sökvägsargument från en\n"
-#~ "underkatalog i ett träd kommer ändras i Git 2.0 och bör inte längre "
-#~ "användas.\n"
-#~ "För att lägga till innehållet för hela trädet, använd:\n"
-#~ "\n"
-#~ "  git add %s :/\n"
-#~ "  (eller git add %s :/)\n"
-#~ "\n"
-#~ "För att begränsa kommandot till aktuell katalog, använd:\n"
-#~ "\n"
-#~ "  git add %s .\n"
-#~ "  (eller git add %s .)\n"
-#~ "\n"
-#~ "I nuvarande version av Git begränsas kommandot till aktuell katalog.\n"
-
-#~ msgid ""
-#~ "You ran 'git add' with neither '-A (--all)' or '--ignore-removal',\n"
-#~ "whose behaviour will change in Git 2.0 with respect to paths you "
-#~ "removed.\n"
-#~ "Paths like '%s' that are\n"
-#~ "removed from your working tree are ignored with this version of Git.\n"
-#~ "\n"
-#~ "* 'git add --ignore-removal <pathspec>', which is the current default,\n"
-#~ "  ignores paths you removed from your working tree.\n"
-#~ "\n"
-#~ "* 'git add --all <pathspec>' will let you also record the removals.\n"
-#~ "\n"
-#~ "Run 'git status' to check the paths you removed from your working tree.\n"
-#~ msgstr ""
-#~ "Du körde \"git add\" utan varken \"-A (--all)\" eller \"--ignore-removal"
-#~ "\".\n"
-#~ "Beteendet kommer ändras i Git 2.0 vad gäller sökvägar du tagit bort.\n"
-#~ "Sökvägar som \"%s\", som har\n"
-#~ "tagits bort från din arbetskatalog ignoreras i den här versionen av Git.\n"
-#~ "\n"
-#~ "* \"git add --ignore-removal <sökväg>\", som är förvalet just nu,\n"
-#~ "  ignorerar sökvägar du har tagit bort från arbetskatalogen.\n"
-#~ "\n"
-#~ "* \"git add --all <sökväg>\" låter dig även registrera borttagningarna.\n"
-#~ "\n"
-#~ "Kör \"git status\" för att kontrollera sökvägarna du tagit bort från\n"
-#~ "arbetskatalogen.\n"
-
-#~ msgid "key id"
-#~ msgstr "nyckel-id"
-
-#~ msgid ""
-#~ "Auto packing the repository for optimum performance. You may also\n"
-#~ "run \"git gc\" manually. See \"git help gc\" for more information.\n"
-#~ msgstr ""
-#~ "Packar arkivet automatiskt för optimal prestanda. Du kan även\n"
-#~ "köra \"git gc\" manuellt. Se \"git help gc\" för mer information.\n"
-
-#~ msgid ""
-#~ "Updates were rejected because a pushed branch tip is behind its remote\n"
-#~ "counterpart. If you did not intend to push that branch, you may want to\n"
-#~ "specify branches to push or set the 'push.default' configuration "
-#~ "variable\n"
-#~ "to 'simple', 'current' or 'upstream' to push only the current branch."
-#~ msgstr ""
-#~ "Uppdateringar avvisades då änden på en insänd gren är bakom dess\n"
-#~ "fjärrmotsvarighet. Om det inte var meningen att sända in grenen, bör\n"
-#~ "du specificera grenar att sända, eller ändra inställningsvariabeln\n"
-#~ "\"push-default\" till \"simple\", \"current\" eller \"upstream\" för att "
-#~ "endast\n"
-#~ "sända aktuell gren."
-
-#~ msgid "copied:     %s -> %s"
-#~ msgstr "kopierad:   %s -> %s"
-
-#~ msgid "deleted:    %s"
-#~ msgstr "borttagen:  %s"
-
-#~ msgid "modified:   %s"
-#~ msgstr "ändrad:     %s"
-
-#~ msgid "renamed:    %s -> %s"
-#~ msgstr "namnbyte:   %s -> %s"
-
-#~ msgid "unmerged:   %s"
-#~ msgstr "osammansl.: %s"
-
-#~ msgid "input paths are terminated by a null character"
-#~ msgstr "sökvägar avdelas med null-tecken"
-
-#~ msgid ""
-#~ "Aborting. Consider using either the --force or --include-untracked option."
-#~ msgstr ""
-#~ "Avbryter. Överväg att använda antingen flaggan --force eller --include-"
-#~ "untracked."
-
-#~ msgid "  (fix conflicts and then run \"git am --resolved\")"
-#~ msgstr "  (rätta konflikter och kör sedan \"git am --resolved\")"
-
-#~ msgid "  (all conflicts fixed: run \"git commit\")"
-#~ msgstr "  (alla konflikter har rättats: kör \"git commit\")"
-
-#~ msgid "more than %d trees given: '%s'"
-#~ msgstr "mer än %d träd angavs: \"%s\""
-
-#~ msgid ""
-#~ "'%s' has changes staged in the index\n"
-#~ "(use --cached to keep the file, or -f to force removal)"
-#~ msgstr ""
-#~ "\"%s\" har köade ändringar i indexet\n"
-#~ "(använd --cached för att behålla filen eller -f för att tvinga "
-#~ "borttagning)"
-
-#~ msgid "show commits where no parent comes before its children"
-#~ msgstr "visa incheckningar där ingen förälder kommer före dess barn"
-
-#~ msgid "show the HEAD reference"
-#~ msgstr "visa HEAD-referensen"
-
-#~ msgid "Unable to fetch in submodule path '$prefix$sm_path'"
-#~ msgstr "Kan inte hämta i undermodulsökväg \"$prefix$sm_path\""
-
-#~ msgid "Failed to recurse into submodule path '$prefix$sm_path'"
-#~ msgstr "Misslyckades rekursera in i undermodulsökvägen \"$prefix$sm_path\""
-
-#~ msgid "It took %.2f seconds to enumerate untracked files.  'status -uno'"
-#~ msgstr "Det tog %.2f sekunder att räkna ospårade filer. \"status -uno\""
+msgid "Message-ID to be used as In-Reply-To for the first email (if any)? "
+msgstr ""
+"Message-ID att använda som In-Reply-To för det första brevet (om något)? "
 
-#~ msgid "may speed it up, but you have to be careful not to forget to add"
-#~ msgstr "kanske gör det snabbare, men du måste vara försiktig så att du"
+#, perl-format
+msgid "error: unable to extract a valid address from: %s\n"
+msgstr "fel: kunde inte få fram en giltig adress från: %s\n"
 
-#~ msgid "new files yourself (see 'git help status')."
-#~ msgstr "inte glömmer lägga till filer själv (se \"git help status\")"
+#. TRANSLATORS: Make sure to include [q] [d] [e] in your
+#. translation. The program will only accept English input
+#. at this point.
+msgid "What to do with this address? ([q]uit|[d]rop|[e]dit): "
+msgstr "Vad vill du göra med adressen? (q=avsluta, d=kasta, e=redigera): "
 
-#~ msgid "git shortlog [-n] [-s] [-e] [-w] [rev-opts] [--] [<commit-id>... ]"
-#~ msgstr ""
-#~ "git shortlog [-n] [-s] [-e] [-w] [rev-flaggor] [--] [<incheckning-id>... ]"
+#, perl-format
+msgid "CA path \"%s\" does not exist"
+msgstr "CA-sökvägen \"%s\" finns inte"
 
-#~ msgid "use any ref in .git/refs"
-#~ msgstr "använd alla referenser i .git/refs"
+msgid ""
+"    The Cc list above has been expanded by additional\n"
+"    addresses found in the patch commit message. By default\n"
+"    send-email prompts before sending whenever this occurs.\n"
+"    This behavior is controlled by the sendemail.confirm\n"
+"    configuration setting.\n"
+"\n"
+"    For additional information, run 'git send-email --help'.\n"
+"    To retain the current behavior, but squelch this message,\n"
+"    run 'git config --global sendemail.confirm auto'.\n"
+"\n"
+msgstr ""
+"    Kopielistan ovan har utökats av ytterligare adresser\n"
+"    funna i patchens incheckningsmeddelande. Send-email\n"
+"    frågar som standard innan sändning när detta sker.\n"
+"    Beteendet styrs av konfigurationsinställningen\n"
+"    sendemail.confirm\n"
+"\n"
+"    För ytterligare information, kör \"git send-email --help\".\n"
+"    För att behålla nuvarande beteende, men dölja detta\n"
+"    meddelande, kör \"git config --global sendemail.confirm auto\".\n"
+"\n"
 
-#~ msgid "use any tag in .git/refs/tags"
-#~ msgstr "använd alla taggar i .git/refs/tags"
+#. TRANSLATORS: Make sure to include [y] [n] [e] [q] [a] in your
+#. translation. The program will only accept English input
+#. at this point.
+msgid "Send this email? ([y]es|[n]o|[e]dit|[q]uit|[a]ll): "
+msgstr "Sända brevet? (y=ja, n=nej, e=redigera, q=avsluta, a=alla): "
 
-#~ msgid "failed to close pipe to 'show' for object '%s'"
-#~ msgstr "kunde inte stänga röret till \"show\" för objektet \"%s\""
+msgid "Send this email reply required"
+msgstr "Svar krävs på frågan \"Sända brevet?\""
 
-#~ msgid "You do not have a valid HEAD"
-#~ msgstr "Du har ingen giltig HEAD"
+msgid "The required SMTP server is not properly defined."
+msgstr "Nödvändig SMTP-server har inte angivits korrekt."
 
-#~ msgid "oops"
-#~ msgstr "hoppsan"
+#, perl-format
+msgid "Server does not support STARTTLS! %s"
+msgstr "Servern stöder inte SMARTTLS! %s"
 
-#~ msgid "Not removing %s\n"
-#~ msgstr "Tar inte bort %s\n"
+#, perl-format
+msgid "STARTTLS failed! %s"
+msgstr "STARTTLS misslyckades! %s"
 
-#~ msgid "git remote set-head <name> (-a | -d | <branch>])"
-#~ msgstr "git remote set-head <namn> (-a | -d | <gren>])"
+msgid "Unable to initialize SMTP properly. Check config and use --smtp-debug."
+msgstr ""
+"Kan inte initiera SMTP korrekt. Kontrollera inställningarna och använd --"
+"smtp-debug."
 
-#~ msgid " %d file changed"
-#~ msgid_plural " %d files changed"
-#~ msgstr[0] " %d fil ändrad"
-#~ msgstr[1] " %d filer ändrade"
+#, perl-format
+msgid "Failed to send %s\n"
+msgstr "Misslyckades sända %s\n"
 
-#~ msgid ", %d insertion(+)"
-#~ msgid_plural ", %d insertions(+)"
-#~ msgstr[0] ", %d tillägg(+)"
-#~ msgstr[1] ", %d tillägg(+)"
+#, perl-format
+msgid "Dry-Sent %s\n"
+msgstr "Test-Sände %s\n"
 
-#~ msgid ", %d deletion(-)"
-#~ msgid_plural ", %d deletions(-)"
-#~ msgstr[0] ", %d borttagning(-)"
-#~ msgstr[1] ", %d borttagningar(-)"
+#, perl-format
+msgid "Sent %s\n"
+msgstr "Sände %s\n"
 
-#~ msgid " (use \"git add\" to track)"
-#~ msgstr " (spåra med \"git add\")"
+msgid "Dry-OK. Log says:\n"
+msgstr "Test-OK. Loggen säger:\n"
 
-#~ msgid "--detach cannot be used with -b/-B/--orphan"
-#~ msgstr "--detcah kan inte användas med -b/-B/--orphan"
+msgid "OK. Log says:\n"
+msgstr "OK. Loggen säger:\n"
 
-#~ msgid "--orphan and -b|-B are mutually exclusive"
-#~ msgstr "--orphan och -b|-B kan inte användas samtidigt"
+msgid "Result: "
+msgstr "Resultat: "
 
-#~ msgid "git checkout: -f and -m are incompatible"
-#~ msgstr "git checkout: -f och -m är inkompatibla"
+msgid "Result: OK\n"
+msgstr "Resultat: OK\n"
 
-#~ msgid ""
-#~ "git checkout: updating paths is incompatible with switching branches."
-#~ msgstr ""
-#~ "git checkout: uppdatera sökvägar är inkompatibelt med att växla gren."
+#, perl-format
+msgid "can't open file %s"
+msgstr "kan inte öppna filen %s"
 
-#~ msgid "diff setup failed"
-#~ msgstr "misslyckades sätta upp för diff"
+#, perl-format
+msgid "(mbox) Adding cc: %s from line '%s'\n"
+msgstr "(mbox) Lägger till cc: %s från raden \"%s\"\n"
 
-#~ msgid "merge-recursive: disk full?"
-#~ msgstr "merge-recursive: disk full?"
+#, perl-format
+msgid "(mbox) Adding to: %s from line '%s'\n"
+msgstr "(mbox) Lägger till to: %s från raden \"%s\"\n"
 
-#~ msgid "diff_setup_done failed"
-#~ msgstr "diff_setup_done misslyckades"
+#, perl-format
+msgid "(non-mbox) Adding cc: %s from line '%s'\n"
+msgstr "(icke-mbox) Lägger till cc: %s från raden \"%s\"\n"
 
-#~ msgid "%s: has been deleted/renamed"
-#~ msgstr "%s: har tagits bort/ändrat namn"
+#, perl-format
+msgid "(body) Adding cc: %s from line '%s'\n"
+msgstr "(kropp) Lägger till cc: %s från raden \"%s\"\n"
 
-#~ msgid "'%s': not a documentation directory."
-#~ msgstr "\"%s\": inte en dokumentationskatalog."
+#, perl-format
+msgid "(%s) Could not execute '%s'"
+msgstr "(%s) Kunde inte köra \"%s\""
 
-#~ msgid "Could not extract email from committer identity."
-#~ msgstr "Kunde inte extrahera e-postadress från incheckarens identitet."
+#, perl-format
+msgid "(%s) Adding %s: %s from: '%s'\n"
+msgstr "(%s) Lägger till %s: %s från: \"%s\"\n"
 
-#~ msgid "--"
-#~ msgstr "--"
+#, perl-format
+msgid "(%s) failed to close pipe to '%s'"
+msgstr "(%s) misslyckades stänga röret till \"%s\""
 
-#~ msgid "# Changed but not updated:"
-#~ msgstr "# Ändrade men inte uppdaterade:"
+msgid "cannot send message as 7bit"
+msgstr "kan inte sända brev som sjubitars"
 
-#~ msgid "git checkout: we do not like '%s' as a branch name."
-#~ msgstr "git checkout: vi tycker inte om \"%s\" som namn på en gren."
+msgid "invalid transfer encoding"
+msgstr "ogiltig överföringskondning"
 
-#~ msgid "git checkout: branch %s already exists"
-#~ msgstr "git checkout: grenen %s finns redan"
+#, perl-format
+msgid ""
+"fatal: %s: rejected by %s hook\n"
+"%s\n"
+"warning: no patches were sent\n"
+msgstr ""
+"ödesdigert: %s: refuserad av kroken %s\n"
+"%s\n"
+"varning: inga patchar har sänts\n"
 
-#~ msgid "Paths with --interactive does not make sense."
-#~ msgstr "Kan inte ange sökvägar med --interactive."
+#, perl-format
+msgid "unable to open %s: %s\n"
+msgstr "kunde inte öppna %s: %s\n"
 
-#~ msgid "No HEAD commit to compare with (yet)"
-#~ msgstr "Ingen HEAD-incheckning att jämföra med (ännu)"
+#, perl-format
+msgid ""
+"fatal: %s:%d is longer than 998 characters\n"
+"warning: no patches were sent\n"
+msgstr ""
+"ödesdigert: %s:%d är längre än 998 tecken\n"
+"varning: inga patchar har sänts\n"
 
-#~ msgid "cannot mix --fixed-strings and regexp"
-#~ msgstr "kan inte blanda --fixed-strings och reguljära uttryck"
+#, perl-format
+msgid "Skipping %s with backup suffix '%s'.\n"
+msgstr ""
+"Hoppar över %s med filnamnstillägget \"%s\" som används för "
+"säkerhetskopior.\n"
 
-#~ msgid "%s; will overwrite!"
-#~ msgstr "%s; kommer skriva över!"
+#. TRANSLATORS: please keep "[y|N]" as is.
+#, perl-format
+msgid "Do you really want to send %s? [y|N]: "
+msgstr "Vill du verkligen sända %s? [y=ja, n=nej]: "
diff --git a/po/tr.po b/po/tr.po
index 45d66c66af..1e1d0318fd 100644
--- a/po/tr.po
+++ b/po/tr.po
@@ -22,6 +22,7 @@
 # commit (eyl.)               | işlemek                     #
 # commitish                   | işlememsi                   #
 # conflict                    | çakışma                     #
+# cruft                       | süprüntü                    #
 # dangling object             | sallanan nesne              #
 # detached HEAD               | ayrık HEAD                  #
 # dirty                       | kirli                       #
@@ -90,8 +91,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Git Turkish Localization Project\n"
 "Report-Msgid-Bugs-To: Git Mailing List <git@vger.kernel.org>\n"
-"POT-Creation-Date: 2022-04-13 14:52+0800\n"
-"PO-Revision-Date: 2022-04-06 16:00+0300\n"
+"POT-Creation-Date: 2022-06-22 12:46+0300\n"
+"PO-Revision-Date: 2022-06-22 16:00+0300\n"
 "Last-Translator: Emir SARI <emir_sari@icloud.com>\n"
 "Language-Team: Turkish (https://github.com/bitigchi/git-po/)\n"
 "Language: tr\n"
@@ -100,237 +101,175 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: add-interactive.c:382
 #, c-format
 msgid "Huh (%s)?"
 msgstr "Pardon (%s)?"
 
-#: add-interactive.c:535 add-interactive.c:836 reset.c:136 sequencer.c:3505
-#: sequencer.c:3970 sequencer.c:4127 builtin/rebase.c:1261
-#: builtin/rebase.c:1671
 msgid "could not read index"
 msgstr "indeks okunamadı"
 
-#: add-interactive.c:590 git-add--interactive.perl:269
-#: git-add--interactive.perl:294
 msgid "binary"
 msgstr "ikili"
 
-#: add-interactive.c:648 git-add--interactive.perl:278
-#: git-add--interactive.perl:332
 msgid "nothing"
 msgstr "hiçbir şey"
 
-#: add-interactive.c:649 git-add--interactive.perl:314
-#: git-add--interactive.perl:329
 msgid "unchanged"
 msgstr "değiştirilmemiş"
 
-#: add-interactive.c:686 git-add--interactive.perl:641
 msgid "Update"
 msgstr "Güncelle"
 
-#: add-interactive.c:703 add-interactive.c:891
 #, c-format
 msgid "could not stage '%s'"
 msgstr "'%s' hazırlanamadı"
 
-#: add-interactive.c:709 add-interactive.c:898 reset.c:160 sequencer.c:3709
 msgid "could not write index"
 msgstr "indeks yazılamadı"
 
-#: add-interactive.c:712 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:730 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:735 apply.c:4133 builtin/checkout.c:311
-#: builtin/reset.c:167
 #, 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:765 git-add--interactive.perl:653
 msgid "Revert"
 msgstr "Geri al"
 
-#: add-interactive.c:781
 msgid "Could not parse HEAD^{tree}"
 msgstr "HEAD^{tree} ayrıştırılamadı"
 
-#: add-interactive.c:819 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:870 git-add--interactive.perl:693
 #, c-format
 msgid "No untracked files.\n"
 msgstr "İzlenmeyen dosya yok.\n"
 
-#: add-interactive.c:874 git-add--interactive.perl:687
 msgid "Add untracked"
 msgstr "İzlenmeyenleri ekle"
 
-#: add-interactive.c:901 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:931
 #, c-format
 msgid "ignoring unmerged: %s"
 msgstr "birleştirilmeyenler yok sayılıyor: %s"
 
-#: add-interactive.c:943 add-patch.c:1758 git-add--interactive.perl:1371
 #, c-format
 msgid "Only binary files changed.\n"
 msgstr "Yalnızca ikili dosyalar değiştirildi.\n"
 
-#: add-interactive.c:945 add-patch.c:1756 git-add--interactive.perl:1373
 #, c-format
 msgid "No changes.\n"
 msgstr "Değişiklik yok.\n"
 
-#: add-interactive.c:949 git-add--interactive.perl:1381
 msgid "Patch update"
 msgstr "Yama güncellemesi"
 
-#: add-interactive.c:988 git-add--interactive.perl:1794
 msgid "Review diff"
 msgstr "diff'i gözden geçir"
 
-#: add-interactive.c:1016
 msgid "show paths with changes"
 msgstr "değiştirilmiş yolları göster"
 
-#: add-interactive.c:1018
 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:1020
 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:1022
 msgid "pick hunks and update selectively"
 msgstr "parçaları seç ve seçerek güncelle"
 
-#: add-interactive.c:1024
 msgid "view diff between HEAD and index"
 msgstr "HEAD ve indeks arasındaki diff'i gör"
 
-#: add-interactive.c:1026
 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:1034 add-interactive.c:1083
 msgid "Prompt help:"
 msgstr "İstem yardımı:"
 
-#: add-interactive.c:1036
 msgid "select a single item"
 msgstr "tek bir öge seç"
 
-#: add-interactive.c:1038
 msgid "select a range of items"
 msgstr "bir öge erimi seç"
 
-#: add-interactive.c:1040
 msgid "select multiple ranges"
 msgstr "birden çok erim seç"
 
-#: add-interactive.c:1042 add-interactive.c:1087
 msgid "select item based on unique prefix"
 msgstr "benzersiz öneke dayanarak öge seç"
 
-#: add-interactive.c:1044
 msgid "unselect specified items"
 msgstr "belirtilen ögelerin seçimini kaldır"
 
-#: add-interactive.c:1046
 msgid "choose all items"
 msgstr "tüm ögeleri seç"
 
-#: add-interactive.c:1048
 msgid "(empty) finish selecting"
 msgstr "(boş) seçimi bitir"
 
-#: add-interactive.c:1085
 msgid "select a numbered item"
 msgstr "numaralandırılmış bir öge seç"
 
-#: add-interactive.c:1089
 msgid "(empty) select nothing"
 msgstr "(boş) hiçbir şey seçme"
 
-#: add-interactive.c:1097 builtin/clean.c:839 git-add--interactive.perl:1898
 msgid "*** Commands ***"
 msgstr "*** Komutlar ***"
 
-#: add-interactive.c:1098 builtin/clean.c:840 git-add--interactive.perl:1895
 msgid "What now"
 msgstr "Şimdi ne olacak"
 
-#: add-interactive.c:1150 git-add--interactive.perl:213
 msgid "staged"
 msgstr "hazırlanmış"
 
-#: add-interactive.c:1150 git-add--interactive.perl:213
 msgid "unstaged"
 msgstr "hazırlanmamış"
 
-#: add-interactive.c:1150 apply.c:5002 apply.c:5005 builtin/am.c:2370
-#: builtin/am.c:2373 builtin/bugreport.c:107 builtin/clone.c:132
-#: builtin/fetch.c:154 builtin/merge.c:287 builtin/pull.c:194
-#: builtin/submodule--helper.c:412 builtin/submodule--helper.c:1872
-#: builtin/submodule--helper.c:1875 builtin/submodule--helper.c:2709
-#: builtin/submodule--helper.c:2712 builtin/submodule--helper.c:2891
-#: git-add--interactive.perl:213
 msgid "path"
 msgstr "yol"
 
-#: add-interactive.c:1157
 msgid "could not refresh index"
 msgstr "indeks yenilenemedi"
 
-#: add-interactive.c:1171 builtin/clean.c:804 git-add--interactive.perl:1805
 #, c-format
 msgid "Bye.\n"
 msgstr "Güle güle.\n"
 
-#: add-patch.c:34 git-add--interactive.perl:1433
 #, c-format, perl-format
 msgid "Stage mode change [y,n,q,a,d%s,?]? "
 msgstr "Kip değişimi hazırlansın mı [y,n,q,a,d%s,?]? "
 
-#: add-patch.c:35 git-add--interactive.perl:1434
 #, c-format, perl-format
 msgid "Stage deletion [y,n,q,a,d%s,?]? "
 msgstr "Silme hazırlansın mı [y,n,q,a,d%s,?]? "
 
-#: add-patch.c:36 git-add--interactive.perl:1435
 #, c-format, perl-format
 msgid "Stage addition [y,n,q,a,d%s,?]? "
 msgstr "Ekleme hazırlansın mı [y,n,q,a,d%s,?]? "
 
-#: add-patch.c:37 git-add--interactive.perl:1436
 #, c-format, perl-format
 msgid "Stage this hunk [y,n,q,a,d%s,?]? "
 msgstr "Bu parça hazırlansın mı [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."
@@ -338,7 +277,6 @@ msgstr ""
 "Eğer yama sorunsuzca uygulanırsa düzenlenen parça derhal hazırlama için "
 "imlenecektir."
 
-#: add-patch.c:42
 msgid ""
 "y - stage this hunk\n"
 "n - do not stage this hunk\n"
@@ -352,27 +290,22 @@ msgstr ""
 "a - bu parçayı ve sonraki tüm parçaları hazırla\n"
 "d - bu parçayı veya sonraki parçalardan herhangi birini hazırlama\n"
 
-#: add-patch.c:56 git-add--interactive.perl:1439
 #, c-format, perl-format
 msgid "Stash mode change [y,n,q,a,d%s,?]? "
 msgstr "Kip değişimi zulalansın mı [y,n,q,a,d%s,?]? "
 
-#: add-patch.c:57 git-add--interactive.perl:1440
 #, c-format, perl-format
 msgid "Stash deletion [y,n,q,a,d%s,?]? "
 msgstr "Silme zulalansın mı [y,n,q,a,d%s,?]? "
 
-#: add-patch.c:58 git-add--interactive.perl:1441
 #, c-format, perl-format
 msgid "Stash addition [y,n,q,a,d%s,?]? "
 msgstr "Ekleme zulalansın mı [y,n,q,a,d%s,?]? "
 
-#: add-patch.c:59 git-add--interactive.perl:1442
 #, c-format, perl-format
 msgid "Stash this hunk [y,n,q,a,d%s,?]? "
 msgstr "Bu parça zulalansın mı [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."
@@ -380,7 +313,6 @@ msgstr ""
 "Eğer yama sorunsuzca uygulanırsa düzenlenen parça derhal zulalama için "
 "imlenecektir."
 
-#: add-patch.c:64
 msgid ""
 "y - stash this hunk\n"
 "n - do not stash this hunk\n"
@@ -394,27 +326,22 @@ msgstr ""
 "a - bu parçayı ve sonraki tüm parçaları zulala\n"
 "d - bu parçayı veya sonraki parçalardan herhangi birini zulalama\n"
 
-#: add-patch.c:80 git-add--interactive.perl:1445
 #, c-format, perl-format
 msgid "Unstage mode change [y,n,q,a,d%s,?]? "
 msgstr "Kip değişimi hazırlıktan çıkarılsın mı [y,n,q,a,d%s,?]? "
 
-#: add-patch.c:81 git-add--interactive.perl:1446
 #, c-format, perl-format
 msgid "Unstage deletion [y,n,q,a,d%s,?]? "
 msgstr "Silme hazırlıktan çıkarılsın mı [y,n,q,a,d%s,?]? "
 
-#: add-patch.c:82 git-add--interactive.perl:1447
 #, c-format, perl-format
 msgid "Unstage addition [y,n,q,a,d%s,?]? "
 msgstr "Ekleme hazırlıktan çıkarılsın mı [y,n,q,a,d%s,?]? "
 
-#: add-patch.c:83 git-add--interactive.perl:1448
 #, c-format, perl-format
 msgid "Unstage this hunk [y,n,q,a,d%s,?]? "
 msgstr "Bu parça hazırlıktan çıkarılsın mı [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."
@@ -422,7 +349,6 @@ msgstr ""
 "Eğer yama sorunsuzca uygulanırsa, düzenlenen parça derhal hazırlıktan "
 "çıkarım için imlenecektir."
 
-#: add-patch.c:88
 msgid ""
 "y - unstage this hunk\n"
 "n - do not unstage this hunk\n"
@@ -436,27 +362,22 @@ msgstr ""
 "a - bu parçayı ve sonraki tüm parçaları hazırlıktan çıkar\n"
 "d - bu parçayı veya sonraki parçalardan herhangi birini hazırlıktan çıkarma\n"
 
-#: add-patch.c:103 git-add--interactive.perl:1451
 #, c-format, perl-format
 msgid "Apply mode change to index [y,n,q,a,d%s,?]? "
 msgstr "Kip değişimi indekse uygulansın mı [y,n,q,a,d%s,?]? "
 
-#: add-patch.c:104 git-add--interactive.perl:1452
 #, c-format, perl-format
 msgid "Apply deletion to index [y,n,q,a,d%s,?]? "
 msgstr "Silme indekse uygulansın mı [y,n,q,a,d%s,?]? "
 
-#: add-patch.c:105 git-add--interactive.perl:1453
 #, c-format, perl-format
 msgid "Apply addition to index [y,n,q,a,d%s,?]? "
 msgstr "Ekleme indekse uygulansın mı [y,n,q,a,d%s,?]? "
 
-#: add-patch.c:106 git-add--interactive.perl:1454
 #, c-format, perl-format
 msgid "Apply this hunk to index [y,n,q,a,d%s,?]? "
 msgstr "Bu parça indekse uygulansın mı [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."
@@ -464,7 +385,6 @@ msgstr ""
 "Eğer yama sorunsuzca uygulanırsa düzenlenen parça derhal uygulama için "
 "imlenecektir."
 
-#: add-patch.c:111
 msgid ""
 "y - apply this hunk to index\n"
 "n - do not apply this hunk to index\n"
@@ -478,31 +398,22 @@ msgstr ""
 "a - bu parçayı ve sonraki tüm parçaları uygula\n"
 "d - bu parçayı veya sonraki parçalardan herhangi birini uygulama\n"
 
-#: add-patch.c:126 git-add--interactive.perl:1457
-#: git-add--interactive.perl:1475
 #, c-format, perl-format
 msgid "Discard mode change from worktree [y,n,q,a,d%s,?]? "
 msgstr "Kip değişimi çalışma ağacından atılsın mı [y,n,q,a,d%s,?]? "
 
-#: add-patch.c:127 git-add--interactive.perl:1458
-#: git-add--interactive.perl:1476
 #, c-format, perl-format
 msgid "Discard deletion from worktree [y,n,q,a,d%s,?]? "
 msgstr "Silme çalışma ağacından atılsın mı [y,n,q,a,d%s,?]? "
 
-#: add-patch.c:128 git-add--interactive.perl:1459
-#: git-add--interactive.perl:1477
 #, c-format, perl-format
 msgid "Discard addition from worktree [y,n,q,a,d%s,?]? "
 msgstr "Ekleme çalışma ağacından atılsın mı [y,n,q,a,d%s,?]? "
 
-#: add-patch.c:129 git-add--interactive.perl:1460
-#: git-add--interactive.perl:1478
 #, c-format, perl-format
 msgid "Discard this hunk from worktree [y,n,q,a,d%s,?]? "
 msgstr "Bu parça çalışma ağacından atılsın mı [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."
@@ -510,7 +421,6 @@ msgstr ""
 "Eğer yama sorunsuzca uygulanırsa düzenlenen parça derhal ıskartaya çıkarım "
 "için imlenecektir."
 
-#: add-patch.c:134 add-patch.c:202
 msgid ""
 "y - discard this hunk from worktree\n"
 "n - do not discard this hunk from worktree\n"
@@ -524,28 +434,23 @@ msgstr ""
 "a - bu parçayı ve sonraki tüm parçaları at\n"
 "d - bu parçayı veya sonraki parçalardan herhangi birini atma\n"
 
-#: add-patch.c:149 add-patch.c:194 git-add--interactive.perl:1463
 #, c-format, perl-format
 msgid "Discard mode change from index and worktree [y,n,q,a,d%s,?]? "
 msgstr ""
 "Kip değişimi indeksten ve çalışma ağacından atılsın mı [y,n,q,a,d%s,?]? "
 
-#: add-patch.c:150 add-patch.c:195 git-add--interactive.perl:1464
 #, c-format, perl-format
 msgid "Discard deletion from index and worktree [y,n,q,a,d%s,?]? "
 msgstr "Silme indeksten ve çalışma ağacından atılsın mı [y,n,q,a,d%s,?]? "
 
-#: add-patch.c:151 add-patch.c:196 git-add--interactive.perl:1465
 #, c-format, perl-format
 msgid "Discard addition from index and worktree [y,n,q,a,d%s,?]? "
 msgstr "Ekleme indeksten ve çalışma ağacından atılsın mı [y,n,q,a,d%s,?]? "
 
-#: add-patch.c:152 add-patch.c:197 git-add--interactive.perl:1466
 #, c-format, perl-format
 msgid "Discard this hunk from index and worktree [y,n,q,a,d%s,?]? "
 msgstr "Bu parça indeksten ve çalışma ağacından atılsın mı [y,n,q,a,d%s,?]? "
 
-#: add-patch.c:157
 msgid ""
 "y - discard this hunk from index and worktree\n"
 "n - do not discard this hunk from index and worktree\n"
@@ -559,28 +464,23 @@ msgstr ""
 "a - bu parçayı ve sonraki tüm parçaları at\n"
 "d - bu parçayı veya sonraki parçalardan herhangi birini atma\n"
 
-#: add-patch.c:171 add-patch.c:216 git-add--interactive.perl:1469
 #, c-format, perl-format
 msgid "Apply mode change to index and worktree [y,n,q,a,d%s,?]? "
 msgstr ""
 "Kip değişimi indekse ve çalışma ağacına uygulansın mı [y,n,q,a,d%s,?]? "
 
-#: add-patch.c:172 add-patch.c:217 git-add--interactive.perl:1470
 #, c-format, perl-format
 msgid "Apply deletion to index and worktree [y,n,q,a,d%s,?]? "
 msgstr "Silme indekse ve çalışma ağacına uygulansın mı [y,n,q,a,d%s,?]? "
 
-#: add-patch.c:173 add-patch.c:218 git-add--interactive.perl:1471
 #, c-format, perl-format
 msgid "Apply addition to index and worktree [y,n,q,a,d%s,?]? "
 msgstr "Ekleme indekse ve çalışma ağacına uygulansın mı [y,n,q,a,d%s,?]? "
 
-#: add-patch.c:174 add-patch.c:219 git-add--interactive.perl:1472
 #, c-format, perl-format
 msgid "Apply this hunk to index and worktree [y,n,q,a,d%s,?]? "
 msgstr "Bu parça indekse ve çalışma ağacına uygulansın mı [y,n,q,a,d%s,?]? "
 
-#: add-patch.c:179
 msgid ""
 "y - apply this hunk to index and worktree\n"
 "n - do not apply this hunk to index and worktree\n"
@@ -594,7 +494,6 @@ msgstr ""
 "a - bu parçayı ve sonraki tüm parçaları uygula\n"
 "d - bu parçayı veya sonraki parçalardan herhangi birini uygulama\n"
 
-#: add-patch.c:224
 msgid ""
 "y - apply this hunk to worktree\n"
 "n - do not apply this hunk to worktree\n"
@@ -608,34 +507,27 @@ msgstr ""
 "a - bu parçayı ve sonraki tüm parçaları uygula\n"
 "d - bu parçayı veya sonraki parçalardan herhangi birini uygulama\n"
 
-#: add-patch.c:343
 #, c-format
 msgid "could not parse hunk header '%.*s'"
 msgstr "parça üstbilgisi '%.*s' ayrıştırılamadı"
 
-#: add-patch.c:362 add-patch.c:366
 #, c-format
 msgid "could not parse colored hunk header '%.*s'"
 msgstr "renklendirilmiş parça üstbilgisi '%.*s' ayrıştırılamadı"
 
-#: add-patch.c:431
 msgid "could not parse diff"
 msgstr "diff ayrıştırılamadı"
 
-#: add-patch.c:450
 msgid "could not parse colored diff"
 msgstr "renklendirilmiş diff ayrıştırılamadı"
 
-#: add-patch.c:464
 #, c-format
 msgid "failed to run '%s'"
 msgstr "'%s' çalıştırılamadı"
 
-#: add-patch.c:618
 msgid "mismatched output from interactive.diffFilter"
 msgstr "interactive.diffFilter ögesinden eşleşmeyen çıktı"
 
-#: add-patch.c:619
 msgid ""
 "Your filter must maintain a one-to-one correspondence\n"
 "between its input and output lines."
@@ -643,7 +535,6 @@ msgstr ""
 "Süzgeciniz kendisinin girdi ve çıktı satırları arasında\n"
 "birebir karşılık sağlamalıdır."
 
-#: add-patch.c:797
 #, c-format
 msgid ""
 "expected context line #%d in\n"
@@ -652,7 +543,6 @@ msgstr ""
 "şurada bağlam satırı #%d bekleniyordu:\n"
 "%.*s"
 
-#: add-patch.c:812
 #, c-format
 msgid ""
 "hunks do not overlap:\n"
@@ -665,11 +555,9 @@ msgstr ""
 "\tşununla bitmiyor:\n"
 "%.*s"
 
-#: add-patch.c:1088 git-add--interactive.perl:1115
 msgid "Manual hunk edit mode -- see bottom for a quick guide.\n"
 msgstr "El ile parça düzenleme kipi -- hızlıca öğrenmek için aşağıya bakın.\n"
 
-#: add-patch.c:1092
 #, c-format
 msgid ""
 "---\n"
@@ -682,8 +570,8 @@ msgstr ""
 "'%c' satır kaldırmak için onları silin.\n"
 "%c kaldırılacak.\n"
 
+#. #-#-#-#-#  git-add--interactive.perl.po  #-#-#-#-#
 #. TRANSLATORS: 'it' refers to the patch mentioned in the previous messages.
-#: add-patch.c:1106 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"
@@ -693,46 +581,41 @@ msgstr ""
 "sunulacaktır. Parçanın tüm satırları kaldırılırsa düzenleme durdurulur\n"
 "ve parça değiştirilmeden bırakılır.\n"
 
-#: add-patch.c:1139
 msgid "could not parse hunk header"
 msgstr "parça üstbilgisi ayrıştırılamadı"
 
-#: add-patch.c:1184
 msgid "'git apply --cached' failed"
 msgstr "'git apply --cached' başarısız oldu"
 
+#. #-#-#-#-#  add-patch.c.po  #-#-#-#-#
 #. 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.
 #.
+#. #-#-#-#-#  git-add--interactive.perl.po  #-#-#-#-#
 #. 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:1253 git-add--interactive.perl:1244
 msgid ""
 "Your edited hunk does not apply. Edit again (saying \"no\" discards!) [y/n]? "
 msgstr ""
 "Düzenlediğiniz parça uygulanamıyor. Yeniden düzenlensin mi (\"n (hayır)\" "
 "ıskartaya çıkarır!) [y/n]? "
 
-#: add-patch.c:1296
 msgid "The selected hunks do not apply to the index!"
 msgstr "Seçili parçalar indekse uygulanamıyor!"
 
-#: add-patch.c:1297 git-add--interactive.perl:1348
 msgid "Apply them to the worktree anyway? "
 msgstr "Çalışma ağacına yine de uygulansın mı? "
 
-#: add-patch.c:1304 git-add--interactive.perl:1351
 msgid "Nothing was applied.\n"
 msgstr "Hiçbir şey uygulanmadı.\n"
 
-#: add-patch.c:1361
 msgid ""
 "j - leave this hunk undecided, see next undecided hunk\n"
 "J - leave this hunk undecided, see next hunk\n"
@@ -754,73 +637,57 @@ msgstr ""
 "e - geçerli parçayı el ile düzenle\n"
 "? - yardımı yazdır\n"
 
-#: add-patch.c:1523 add-patch.c:1533
 msgid "No previous hunk"
 msgstr "Öncesinde parça yok"
 
-#: add-patch.c:1528 add-patch.c:1538
 msgid "No next hunk"
 msgstr "Sonrasında parça yok"
 
-#: add-patch.c:1544
 msgid "No other hunks to goto"
 msgstr "Gidilecek başka bir parça yok"
 
-#: add-patch.c:1555 git-add--interactive.perl:1608
 msgid "go to which hunk (<ret> to see more)? "
 msgstr "hangi parçaya gidilsin (daha fazla görmek için <ret>)? "
 
-#: add-patch.c:1556 git-add--interactive.perl:1610
 msgid "go to which hunk? "
 msgstr "hangi parçaya gidilsin? "
 
-#: add-patch.c:1567
 #, c-format
 msgid "Invalid number: '%s'"
 msgstr "Geçersiz sayı: '%s'"
 
-#: add-patch.c:1572
 #, c-format
 msgid "Sorry, only %d hunk available."
 msgid_plural "Sorry, only %d hunks available."
 msgstr[0] "Üzgünüm, yalnızca %d parça kullanılabilir."
 msgstr[1] "Üzgünüm, yalnızca %d parça kullanılabilir."
 
-#: add-patch.c:1581
 msgid "No other hunks to search"
 msgstr "Aranacak başka parça yok"
 
-#: add-patch.c:1587 git-add--interactive.perl:1663
 msgid "search for regex? "
 msgstr "düzenli ifade aransın mı? "
 
-#: add-patch.c:1602
 #, c-format
 msgid "Malformed search regexp %s: %s"
 msgstr "Hatalı oluşturulmuş düzenli ifade %s: %s"
 
-#: add-patch.c:1619
 msgid "No hunk matches the given pattern"
 msgstr "Verilen dizgi ile eşleşen bir parça yok"
 
-#: add-patch.c:1626
 msgid "Sorry, cannot split this hunk"
 msgstr "Üzgünüm, bu parça bölünemiyor"
 
-#: add-patch.c:1630
 #, c-format
 msgid "Split into %d hunks."
 msgstr "%d parçaya bölündü."
 
-#: add-patch.c:1634
 msgid "Sorry, cannot edit this hunk"
 msgstr "Üzgünüm, bu parça düzenlenemiyor"
 
-#: add-patch.c:1686
 msgid "'git apply' failed"
 msgstr "'git apply' başarısız oldu"
 
-#: advice.c:81
 #, c-format
 msgid ""
 "\n"
@@ -829,37 +696,29 @@ msgstr ""
 "\n"
 "Bu iletiyi \"git config advice.%s false\" ile devre dışı bırakın"
 
-#: advice.c:97
 #, c-format
 msgid "%shint: %.*s%s\n"
 msgstr "%sipucu: %.*s%s\n"
 
-#: advice.c:181
 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:183
 msgid "Committing is not possible because you have unmerged files."
 msgstr "İşleme yapılamaz; birleştirmesi tamamlanmamış dosyalarınız var."
 
-#: advice.c:185
 msgid "Merging is not possible because you have unmerged files."
 msgstr "Birleştirme yapılamaz; birleştirmesi tamamlanmamış dosyalarınız var."
 
-#: advice.c:187
 msgid "Pulling is not possible because you have unmerged files."
 msgstr "Çekme yapılamaz; birleştirmesi tamamlanmamış dosyalarınız var."
 
-#: advice.c:189
 msgid "Reverting is not possible because you have unmerged files."
 msgstr "Geriye al yapılamaz; birleştirmesi tamamlanmamış dosyalarınız var."
 
-#: advice.c:191
 #, 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:199
 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."
@@ -867,27 +726,21 @@ msgstr ""
 "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:207
 msgid "Exiting because of an unresolved conflict."
 msgstr "Çözüme kavuşturulmamış bir çakışmadan dolayı çıkılıyor."
 
-#: advice.c:212 builtin/merge.c:1388
 msgid "You have not concluded your merge (MERGE_HEAD exists)."
 msgstr "Birleştirmenizi sonuçlandırmadınız (MERGE_HEAD mevcut)."
 
-#: advice.c:214
 msgid "Please, commit your changes before merging."
 msgstr "Birleştirme öncesinde değişikliklerinizi işleyin."
 
-#: advice.c:215
 msgid "Exiting because of unfinished merge."
 msgstr "Tamamlanmamış birleştirmeden dolayı çıkılıyor."
 
-#: advice.c:220
 msgid "Not possible to fast-forward, aborting."
 msgstr "İleri sarma olanaklı değil, iptal ediliyor."
 
-#: advice.c:230
 #, c-format
 msgid ""
 "The following paths and/or pathspecs matched paths that exist\n"
@@ -898,7 +751,6 @@ msgstr ""
 "tanımınızın dışında kalan yollarla eşleştiğinden dolayı\n"
 "indeksinizde güncellenmeyecek:\n"
 
-#: advice.c:237
 msgid ""
 "If you intend to update such entries, try one of the following:\n"
 "* Use the --sparse option.\n"
@@ -909,7 +761,6 @@ msgstr ""
 "* --sparse seçeneğini kullanın.\n"
 "* Aralıklandırma kurallarını devre dışı bırakın veya değiştirin."
 
-#: advice.c:245
 #, c-format
 msgid ""
 "Note: switching to '%s'.\n"
@@ -950,102 +801,65 @@ msgstr ""
 "kapatabilirsiniz.\n"
 "\n"
 
-#: alias.c:50
 msgid "cmdline ends with \\"
 msgstr "komut satırı \\ ile bitiyor"
 
-#: alias.c:51
 msgid "unclosed quote"
 msgstr "kapatılmamış tırnak"
 
-#: apply.c:70
 #, c-format
 msgid "unrecognized whitespace option '%s'"
 msgstr "tanımlanamayan boşluk seçeneği '%s'"
 
-#: apply.c:86
 #, c-format
 msgid "unrecognized whitespace ignore option '%s'"
 msgstr "tanımlanamayan boşluk yok sayma seçeneği '%s'"
 
-#: apply.c:138 archive.c:584 parse-options.c:1122 range-diff.c:555
-#: revision.c:2314 revision.c:2318 revision.c:2327 revision.c:2332
-#: revision.c:2560 revision.c:2895 revision.c:2899 revision.c:2907
-#: revision.c:2910 revision.c:2912 builtin/add.c:507 builtin/add.c:509
-#: builtin/add.c:515 builtin/add.c:527 builtin/branch.c:755
-#: builtin/checkout.c:472 builtin/checkout.c:475 builtin/checkout.c:1663
-#: builtin/checkout.c:1773 builtin/checkout.c:1776 builtin/clone.c:921
-#: builtin/commit.c:359 builtin/commit.c:362 builtin/commit.c:1200
-#: builtin/commit.c:1256 builtin/commit.c:1273 builtin/describe.c:593
-#: builtin/diff-tree.c:155 builtin/difftool.c:733 builtin/fast-export.c:1245
-#: builtin/fetch.c:2141 builtin/fetch.c:2162 builtin/fetch.c:2167
-#: builtin/help.c:602 builtin/index-pack.c:1858 builtin/init-db.c:560
-#: builtin/log.c:1968 builtin/log.c:1970 builtin/ls-files.c:778
-#: builtin/merge-base.c:163 builtin/merge-base.c:169 builtin/merge.c:1409
-#: builtin/merge.c:1411 builtin/pack-objects.c:4098 builtin/push.c:592
-#: builtin/push.c:630 builtin/push.c:636 builtin/push.c:641
-#: builtin/rebase.c:1221 builtin/rebase.c:1223 builtin/rebase.c:1227
-#: builtin/repack.c:688 builtin/repack.c:719 builtin/reset.c:433
-#: builtin/reset.c:469 builtin/rev-list.c:537 builtin/show-branch.c:711
-#: builtin/stash.c:1696 builtin/stash.c:1699 builtin/submodule--helper.c:1328
-#: builtin/submodule--helper.c:3054 builtin/tag.c:527 builtin/tag.c:573
-#: builtin/worktree.c:779
 #, c-format
 msgid "options '%s' and '%s' cannot be used together"
 msgstr "'%s' ve '%s' seçenekleri birlikte kullanılamaz"
 
-#: apply.c:141 apply.c:152 apply.c:155
 #, c-format
 msgid "'%s' outside a repository"
 msgstr "'%s' bir depo dışında"
 
-#: apply.c:807
 #, c-format
 msgid "Cannot prepare timestamp regexp %s"
 msgstr "Zaman damgası düzenli ifadesi %s hazırlanamıyor"
 
-#: apply.c:816
 #, c-format
 msgid "regexec returned %d for input: %s"
 msgstr "düzenli ifade girdi için %d döndürdü: %s"
 
-#: apply.c:890
 #, c-format
 msgid "unable to find filename in patch at line %d"
 msgstr "yamanın %d. satırında dosya adı bulunamıyor"
 
-#: apply.c:928
 #, c-format
 msgid "git apply: bad git-diff - expected /dev/null, got %s on line %d"
 msgstr ""
 "git apply: hatalı git-diff - /dev/null bekleniyordu, %s alındı, satır %d"
 
-#: apply.c:934
 #, c-format
 msgid "git apply: bad git-diff - inconsistent new filename on line %d"
 msgstr "git apply: hatalı git-diff - %d. satırda tutarsız yeni dosya adı"
 
-#: apply.c:935
 #, c-format
 msgid "git apply: bad git-diff - inconsistent old filename on line %d"
 msgstr "git apply: hatalı git-diff - %d. satırda tutarsız eski dosya adı"
 
-#: apply.c:940
 #, c-format
 msgid "git apply: bad git-diff - expected /dev/null on line %d"
 msgstr "git apply: hatalı git-diff - %d. satırda /dev/null bekleniyordu"
 
-#: apply.c:969
 #, c-format
 msgid "invalid mode on line %d: %s"
 msgstr "%d. satırda geçersiz kip: %s"
 
-#: apply.c:1288
 #, c-format
 msgid "inconsistent header lines %d and %d"
 msgstr "tutarsız üstbilgi satırları %d ve %d"
 
-#: apply.c:1378
 #, c-format
 msgid ""
 "git diff header lacks filename information when removing %d leading pathname "
@@ -1060,93 +874,75 @@ msgstr[1] ""
 "%d öncü yol adı bileşeni kaldırılırken git diff üstbilgisi dosya adı "
 "bilgisine iye değil (%d. satır)"
 
-#: apply.c:1391
 #, c-format
 msgid "git diff header lacks filename information (line %d)"
 msgstr "git diff üstbilgisi dosya adı bilgisine iye değil (%d. satır)"
 
-#: apply.c:1487
 #, c-format
 msgid "recount: unexpected line: %.*s"
 msgstr "recount: beklenmedik satır: %.*s"
 
-#: apply.c:1556
 #, c-format
 msgid "patch fragment without header at line %d: %.*s"
 msgstr "%d. satırda üstbilgisi olmayan yama parçacığı: %.*s"
 
-#: apply.c:1759
 msgid "new file depends on old contents"
 msgstr "yeni dosyanın eski içeriğe bağımlılığı var"
 
-#: apply.c:1761
 msgid "deleted file still has contents"
 msgstr "silinen dosya içinde hâlâ bir şeyler var"
 
-#: apply.c:1795
 #, c-format
 msgid "corrupt patch at line %d"
 msgstr "hasarlı yama, %d. satır"
 
-#: apply.c:1832
 #, c-format
 msgid "new file %s depends on old contents"
 msgstr "%s yeni dosyasının eski içeriğe bağımlılığı var"
 
-#: apply.c:1834
 #, c-format
 msgid "deleted file %s still has contents"
 msgstr "%s silinen dosyasının içinde hâlâ bir şeyler var"
 
-#: apply.c:1837
 #, c-format
 msgid "** warning: file %s becomes empty but is not deleted"
 msgstr "** uyarı: %s dosyası boş duruma gelir; ancak silinmez"
 
-#: apply.c:1985
 #, c-format
 msgid "corrupt binary patch at line %d: %.*s"
 msgstr "hasarlı ikili yama, %d. satır: %.*s"
 
-#: apply.c:2022
 #, c-format
 msgid "unrecognized binary patch at line %d"
 msgstr "tanımlanamayan ikili yama, %d. satır"
 
-#: apply.c:2184
 #, c-format
 msgid "patch with only garbage at line %d"
 msgstr "yalnızca anlamsız veri içeren yama, %d. satır"
 
-#: apply.c:2270
 #, c-format
 msgid "unable to read symlink %s"
 msgstr "%s sembolik bağı okunamıyor"
 
-#: apply.c:2274
 #, c-format
 msgid "unable to open or read %s"
 msgstr "%s açılamıyor veya okunamıyor"
 
-#: apply.c:2943
 #, c-format
 msgid "invalid start of line: '%c'"
 msgstr "geçersiz satır başlangıcı: '%c'"
 
-#: apply.c:3064
 #, 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:3076
 #, 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:3082
 #, c-format
 msgid ""
 "while searching for:\n"
@@ -1155,646 +951,507 @@ msgstr ""
 "şunu ararken:\n"
 "%.*s"
 
-#: apply.c:3104
 #, c-format
 msgid "missing binary patch data for '%s'"
 msgstr "'%s' için ikili yama verisi eksik"
 
-#: apply.c:3112
 #, 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:3159
 #, 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:3170
 #, 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:3178
 #, 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:3196
 #, 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:3209
 #, c-format
 msgid "binary patch does not apply to '%s'"
 msgstr "ikili yama '%s' üzerine uygulanamıyor"
 
-#: apply.c:3216
 #, 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:3237
 #, c-format
 msgid "patch failed: %s:%ld"
 msgstr "yama başarısız oldu: %s:%ld"
 
-#: apply.c:3360
 #, c-format
 msgid "cannot checkout %s"
 msgstr "%s çıkışı yapılamıyor"
 
-#: apply.c:3412 apply.c:3423 apply.c:3469 midx.c:105 pack-revindex.c:214
-#: setup.c:310
 #, c-format
 msgid "failed to read %s"
 msgstr "%s okunamadı"
 
-#: apply.c:3420
 #, c-format
 msgid "reading from '%s' beyond a symbolic link"
 msgstr "'%s' bir sembolik bağın ötesinden okunuyor"
 
-#: apply.c:3449 apply.c:3721
 #, c-format
 msgid "path %s has been renamed/deleted"
 msgstr "%s yolu yeniden adlandırıldı/silindi"
 
-#: apply.c:3559 apply.c:3736
 #, c-format
 msgid "%s: does not exist in index"
 msgstr "%s: indekste bulunmuyor"
 
-#: apply.c:3568 apply.c:3744 apply.c:3960
 #, c-format
 msgid "%s: does not match index"
 msgstr "%s: indeks ile eşleşmiyor"
 
-#: apply.c:3605
 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:3608
 #, c-format
 msgid "Performing three-way merge...\n"
 msgstr "3 yönlü birleştirme gerçekleştiriliyor...\n"
 
-#: apply.c:3624 apply.c:3628
 #, c-format
 msgid "cannot read the current contents of '%s'"
 msgstr "'%s' ögesinin geçerli içeriği okunamıyor"
 
-#: apply.c:3640
 #, c-format
 msgid "Failed to perform three-way merge...\n"
 msgstr "3 yönlü birleştirme gerçekleştirilemedi...\n"
 
-#: apply.c:3654
 #, c-format
 msgid "Applied patch to '%s' with conflicts.\n"
 msgstr "'%s' üzerine yama çakışmalarla birlikte uygulandı.\n"
 
-#: apply.c:3659
 #, c-format
 msgid "Applied patch to '%s' cleanly.\n"
 msgstr "'%s' üzerine yama sorunsuzca uygulandı.\n"
 
-#: apply.c:3676
 #, c-format
 msgid "Falling back to direct application...\n"
 msgstr "Doğrudan uygulamaya geri çekiliniyor...\n"
 
-#: apply.c:3688
 msgid "removal patch leaves file contents"
 msgstr "kaldırma yaması dosya içeriğini bırakır"
 
-#: apply.c:3761
 #, c-format
 msgid "%s: wrong type"
 msgstr "%s: yanlış tür"
 
-#: apply.c:3763
 #, c-format
 msgid "%s has type %o, expected %o"
 msgstr "%s, %o türüne iye, %o bekleniyordu"
 
-#: apply.c:3900 apply.c:3902 read-cache.c:903 read-cache.c:932
-#: read-cache.c:1399
 #, c-format
 msgid "invalid path '%s'"
 msgstr "geçersiz yol '%s'"
 
-#: apply.c:3958
 #, c-format
 msgid "%s: already exists in index"
 msgstr "%s: indekste halihazırda var"
 
-#: apply.c:3962
 #, c-format
 msgid "%s: already exists in working directory"
 msgstr "%s: çalışma dizininde halihazırda var"
 
-#: apply.c:3982
 #, 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:3987
 #, 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:4007
 #, c-format
 msgid "affected file '%s' is beyond a symbolic link"
 msgstr "etkilenen dosya '%s' bir sembolik bağın ötesinde"
 
-#: apply.c:4011
 #, c-format
 msgid "%s: patch does not apply"
 msgstr "%s: yama uygulanamıyor"
 
-#: apply.c:4026
 #, c-format
 msgid "Checking patch %s..."
 msgstr "%s yaması denetleniyor..."
 
-#: apply.c:4118
 #, 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:4125
 #, 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:4128
 #, c-format
 msgid "sha1 information is lacking or useless (%s)."
 msgstr "sha1 bilgisi eksik veya yararsız (%s)."
 
-#: apply.c:4137
 #, c-format
 msgid "could not add %s to temporary index"
 msgstr "%s geçici indekse eklenemedi"
 
-#: apply.c:4147
 #, c-format
 msgid "could not write temporary index to %s"
 msgstr "geçici indeks şuraya yazılamadı: %s"
 
-#: apply.c:4285
 #, c-format
 msgid "unable to remove %s from index"
 msgstr "%s indeksten kaldırılamıyor"
 
-#: apply.c:4319
 #, c-format
 msgid "corrupt patch for submodule %s"
 msgstr "%s altmodülü için hasarlı yama"
 
-#: apply.c:4325
 #, c-format
 msgid "unable to stat newly created file '%s'"
 msgstr "yeni oluşturulan '%s' dosyasının bilgileri alınamıyor"
 
-#: apply.c:4333
 #, 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:4339 apply.c:4484
 #, c-format
 msgid "unable to add cache entry for %s"
 msgstr "%s için önbellek girdisi eklenemiyor"
 
-#: apply.c:4382 builtin/bisect--helper.c:540 builtin/gc.c:2258
-#: builtin/gc.c:2293
 #, c-format
 msgid "failed to write to '%s'"
 msgstr "şuraya yazılamadı: '%s'"
 
-#: apply.c:4386
 #, c-format
 msgid "closing file '%s'"
 msgstr "'%s' dosyası kapatılıyor"
 
-#: apply.c:4456
 #, c-format
 msgid "unable to write file '%s' mode %o"
 msgstr "'%s' dosyası yazılamıyor, %o kipi"
 
-#: apply.c:4554
 #, c-format
 msgid "Applied patch %s cleanly."
 msgstr "%s yaması sorunsuzca uygulandı."
 
-#: apply.c:4562
 msgid "internal error"
 msgstr "iç hata"
 
-#: apply.c:4565
 #, 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:4576
 #, c-format
 msgid "truncating .rej filename to %.*s.rej"
 msgstr ".rej dosya adı %.*s.rej olarak kısaltılıyor"
 
-#: apply.c:4584
 #, c-format
 msgid "cannot open %s"
 msgstr "%s açılamıyor"
 
-#: apply.c:4598
 #, c-format
 msgid "Hunk #%d applied cleanly."
 msgstr "Parça #%d sorunsuzca uygulandı."
 
-#: apply.c:4602
 #, c-format
 msgid "Rejected hunk #%d."
 msgstr "Parça %d geri çevrildi."
 
-#: apply.c:4731
 #, c-format
 msgid "Skipped patch '%s'."
 msgstr "'%s' yaması atlandı."
 
-#: apply.c:4740
 msgid "No valid patches in input (allow with \"--allow-empty\")"
 msgstr "Girdide geçerli yama yok (\"--allow-empty\" ile izin ver)"
 
-#: apply.c:4761
 msgid "unable to read index file"
 msgstr "indeks dosyası okunamıyor"
 
-#: apply.c:4918
 #, c-format
 msgid "can't open patch '%s': %s"
 msgstr "'%s' yaması açılamıyor: %s"
 
-#: apply.c:4945
 #, 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:4951 apply.c:4966
 #, 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:4959
 #, 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:4975 builtin/add.c:690 builtin/mv.c:338 builtin/rm.c:430
 msgid "Unable to write new index file"
 msgstr "Yeni indeks dosyası yazılamıyor"
 
-#: apply.c:5003
 msgid "don't apply changes matching the given path"
 msgstr "verilen yol ile eşleşen değişiklikleri uygulama"
 
-#: apply.c:5006
 msgid "apply changes matching the given path"
 msgstr "verilen yol ile eşleşen değişiklikleri uygula"
 
-#: apply.c:5008 builtin/am.c:2379
 msgid "num"
 msgstr "sayı"
 
-#: apply.c:5009
 msgid "remove <num> leading slashes from traditional diff paths"
 msgstr "geleneksel diff yollarından <sayı> öncü eğik çizgiyi kaldır"
 
-#: apply.c:5012
 msgid "ignore additions made by the patch"
 msgstr "yamanın yaptığı eklemeleri yok say"
 
-#: apply.c:5014
 msgid "instead of applying the patch, output diffstat for the input"
 msgstr "yamayı uygulama yerine girdi için diffstat çıktısı ver"
 
-#: apply.c:5018
 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:5020
 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:5022
 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:5024
 msgid "make sure the patch is applicable to the current index"
 msgstr "yamanın geçerli indekse uygulanabilir olduğundan emin ol"
 
-#: apply.c:5026
 msgid "mark new files with `git add --intent-to-add`"
 msgstr "yeni dosyaları `git add --intent-to-add` ile imle"
 
-#: apply.c:5028
 msgid "apply a patch without touching the working tree"
 msgstr "çalışma ağacına dokunmadan bir yama uygula"
 
-#: apply.c:5030
 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:5033
 msgid "also apply the patch (use with --stat/--summary/--check)"
 msgstr "ek olarak yamayı da uygula (--stat/--summary/--check ile kullan)"
 
-#: apply.c:5035
 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:5037
 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:5040 builtin/checkout-index.c:230
 msgid "paths are separated with NUL character"
 msgstr "yollar NUL karakteri ile ayrılır"
 
-#: apply.c:5042
 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:5043 builtin/am.c:2355 builtin/am.c:2358
-#: builtin/interpret-trailers.c:98 builtin/interpret-trailers.c:100
-#: builtin/interpret-trailers.c:102 builtin/pack-objects.c:3983
-#: builtin/rebase.c:1079
 msgid "action"
 msgstr "eylem"
 
-#: apply.c:5044
 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:5047 apply.c:5050
 msgid "ignore changes in whitespace when finding context"
 msgstr "bağlam bulurken boşluk değişikliklerini yok say"
 
-#: apply.c:5053
 msgid "apply the patch in reverse"
 msgstr "yamayı tersten uygula"
 
-#: apply.c:5055
 msgid "don't expect at least one line of context"
 msgstr "en az bir satır bağlam bekleme"
 
-#: apply.c:5057
 msgid "leave the rejected hunks in corresponding *.rej files"
 msgstr "reddedilmiş parçaları ilgili *.rej dosyalarında bırak"
 
-#: apply.c:5059
 msgid "allow overlapping hunks"
 msgstr "üst üste binen parçalara izin ver"
 
-#: apply.c:5062
 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:5065
 msgid "do not trust the line counts in the hunk headers"
 msgstr "parça üstbilgisindeki satır sayımına güvenme"
 
-#: apply.c:5067 builtin/am.c:2367
 msgid "root"
 msgstr "kök"
 
-#: apply.c:5068
 msgid "prepend <root> to all filenames"
 msgstr "tüm dosya adlarının başına <kök> ekle"
 
-#: apply.c:5071
 msgid "don't return error for empty patches"
 msgstr "boş yamalar için hata döndürme"
 
-#: archive-tar.c:125 archive-zip.c:346
 #, c-format
 msgid "cannot stream blob %s"
 msgstr "%s ikili nesnesi akıtılamıyor"
 
-#: archive-tar.c:265 archive-zip.c:359
 #, c-format
 msgid "unsupported file mode: 0%o (SHA1: %s)"
 msgstr "desteklenmeyen dosya kipi: 0%o (SHA1: %s)"
 
-#: archive-tar.c:447
 #, c-format
 msgid "unable to start '%s' filter"
 msgstr "'%s' süzgeci başlatılamıyor"
 
-#: archive-tar.c:450
 msgid "unable to redirect descriptor"
 msgstr "açıklayıcı yeniden yönlendirilemiyor"
 
-#: archive-tar.c:457
 #, c-format
 msgid "'%s' filter reported error"
 msgstr "'%s' süzgeci hata bildirdi"
 
-#: archive-zip.c:319
 #, c-format
 msgid "path is not valid UTF-8: %s"
 msgstr "yol geçerli UTF-8 değil: %s"
 
-#: archive-zip.c:323
 #, c-format
 msgid "path too long (%d chars, SHA1: %s): %s"
 msgstr "yol çok uzun (%d karakter, SHA1: %s): %s"
 
-#: archive-zip.c:470 builtin/pack-objects.c:363 builtin/pack-objects.c:366
 #, c-format
 msgid "deflate error (%d)"
 msgstr "söndürme hatası (%d)"
 
-#: archive-zip.c:604
 #, c-format
 msgid "timestamp too large for this system: %<PRIuMAX>"
 msgstr "zaman damgası bu sistem için çok büyük: %<PRIuMAX>"
 
-#: archive.c:14
 msgid "git archive [<options>] <tree-ish> [<path>...]"
 msgstr "git archive [<seçenekler>] <ağacımsı> [<yol>...]"
 
-#: archive.c:16
 msgid ""
 "git archive --remote <repo> [--exec <cmd>] [<options>] <tree-ish> [<path>...]"
 msgstr ""
 "git archive --remote <depo> [--exec <komut>] [<sçnklr>] <ağacımsı> [<yol>...]"
 
-#: archive.c:17
 msgid "git archive --remote <repo> [--exec <cmd>] --list"
 msgstr "git archive --remote <depo> [--exec <komut>] --list"
 
-#: archive.c:188 archive.c:341 builtin/gc.c:497 builtin/notes.c:238
-#: builtin/tag.c:579
 #, c-format
 msgid "cannot read '%s'"
 msgstr "'%s' okunamıyor"
 
-#: archive.c:426 builtin/add.c:214 builtin/add.c:657 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:450
 #, c-format
 msgid "no such ref: %.*s"
 msgstr "böyle bir başvuru yok: %.*s"
 
-#: archive.c:456
 #, c-format
 msgid "not a valid object name: %s"
 msgstr "geçerli bir nesne adı değil: %s"
 
-#: archive.c:469
 #, c-format
 msgid "not a tree object: %s"
 msgstr "bir ağaç nesnesi değil: %s"
 
-#: archive.c:481
 msgid "current working directory is untracked"
 msgstr "geçerli çalışma dizini izlenmiyor"
 
-#: archive.c:522
 #, c-format
 msgid "File not found: %s"
 msgstr "Dosya bulunamadı: %s"
 
-#: archive.c:524
 #, c-format
 msgid "Not a regular file: %s"
 msgstr "Normal bir dosya değil: %s"
 
-#: archive.c:551
+#, c-format
+msgid "unclosed quote: '%s'"
+msgstr "kapatılmamış tırnak: '%s'"
+
+#, c-format
+msgid "missing colon: '%s'"
+msgstr "eksik iki nokta: '%s'"
+
+#, c-format
+msgid "empty file name: '%s'"
+msgstr "boş dosya adı: '%s'"
+
 msgid "fmt"
 msgstr "biçim"
 
-#: archive.c:551
 msgid "archive format"
 msgstr "arşiv biçimi"
 
-#: archive.c:552 builtin/log.c:1809
 msgid "prefix"
 msgstr "önek"
 
-#: 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:554 archive.c:557 builtin/blame.c:881 builtin/blame.c:885
-#: builtin/blame.c:886 builtin/commit-tree.c:115 builtin/config.c:135
-#: builtin/fast-export.c:1181 builtin/fast-export.c:1183
-#: builtin/fast-export.c:1187 builtin/grep.c:936 builtin/hash-object.c:104
-#: builtin/ls-files.c:654 builtin/ls-files.c:657 builtin/notes.c:410
-#: builtin/notes.c:576 builtin/read-tree.c:115 parse-options.h:195
 msgid "file"
 msgstr "dosya"
 
-#: archive.c:555
 msgid "add untracked file to archive"
 msgstr "izlenmeyen dosyaları arşive ekle"
 
-#: archive.c:558 builtin/archive.c:88
+msgid "path:content"
+msgstr "yol:içerik"
+
 msgid "write the archive to this file"
 msgstr "arşivi bu dosyaya yaz"
 
-#: archive.c:560
 msgid "read .gitattributes in working directory"
 msgstr "çalışma dizinindeki .gitattributes'u oku"
 
-#: archive.c:561
 msgid "report archived files on stderr"
 msgstr "arşivlenmiş dosyaları stderr'de raporla"
 
-#: archive.c:563
 msgid "set compression level"
 msgstr "sıkıştırma düzeyini ayarla"
 
-#: archive.c:566
 msgid "list supported archive formats"
 msgstr "desteklenen arşiv biçimlerini listele"
 
-#: archive.c:568 builtin/archive.c:89 builtin/clone.c:122 builtin/clone.c:125
-#: builtin/submodule--helper.c:1884 builtin/submodule--helper.c:2718
 msgid "repo"
 msgstr "depo"
 
-#: 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:570 builtin/archive.c:91 builtin/difftool.c:708
-#: builtin/notes.c:496
 msgid "command"
 msgstr "komut"
 
-#: 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:578
 msgid "Unexpected option --remote"
 msgstr "Beklenmedik seçenek --remote"
 
-#: archive.c:580 fetch-pack.c:300 revision.c:2914 builtin/add.c:530
-#: builtin/add.c:562 builtin/checkout.c:1782 builtin/clone.c:1099
-#: builtin/clone.c:1102 builtin/commit.c:371 builtin/fast-export.c:1230
-#: builtin/index-pack.c:1854 builtin/log.c:2140 builtin/reset.c:442
-#: builtin/reset.c:500 builtin/rm.c:281 builtin/stash.c:1708
-#: builtin/worktree.c:580 builtin/worktree.c:781 http-fetch.c:144
-#: http-fetch.c:153
 #, c-format
 msgid "the option '%s' requires '%s'"
 msgstr "'%s' seçeneği '%s' gerektiriyor"
 
-#: archive.c:582
 msgid "Unexpected option --output"
 msgstr "Beklenmedik seçenek --output"
 
-#: archive.c:606
 #, c-format
 msgid "Unknown archive format '%s'"
 msgstr "Bilinmeyen arşiv biçimi '%s'"
 
-#: 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
 #, c-format
 msgid "%.*s is not a valid attribute name"
 msgstr "%.*s geçerli bir öznitelik adı değil"
 
-#: attr.c:363
 #, c-format
 msgid "%s not allowed: %s:%d"
 msgstr "%s izin verilmiyor: %s:%d"
 
-#: attr.c:403
 msgid ""
 "Negative patterns are ignored in git attributes\n"
 "Use '\\!' for literal leading exclamation."
@@ -1802,22 +1459,18 @@ msgstr ""
 "Negatif dizgiler git özniteliklerinde yok sayılır.\n"
 "Gerçek öncü ünlem için '\\!' kullanın."
 
-#: 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:698
 #, c-format
 msgid "We cannot bisect more!\n"
 msgstr "Daha fazla ikili arama yapılamıyor!\n"
 
-#: bisect.c:765
 #, c-format
 msgid "Not a valid commit name %s"
 msgstr "Geçerli bir işleme adı değil: %s"
 
-#: bisect.c:790
 #, c-format
 msgid ""
 "The merge base %s is bad.\n"
@@ -1826,7 +1479,6 @@ msgstr ""
 "Birleştirme temeli %s hatalı.\n"
 "Bu demek oluyor ki hata %s ve [%s] arasında düzeltilmiş.\n"
 
-#: bisect.c:795
 #, c-format
 msgid ""
 "The merge base %s is new.\n"
@@ -1835,7 +1487,6 @@ msgstr ""
 "Birleştirme temeli %s yeni.\n"
 "Özellik %s ve [%s] arasında değişmiş.\n"
 
-#: bisect.c:800
 #, c-format
 msgid ""
 "The merge base %s is %s.\n"
@@ -1844,7 +1495,6 @@ msgstr ""
 "Birleştirme temeli %s, %s.\n"
 "Bu demek oluyor ki ilk '%s' işlemesi %s ve [%s] arasında.\n"
 
-#: bisect.c:808
 #, c-format
 msgid ""
 "Some %s revs are not ancestors of the %s rev.\n"
@@ -1855,7 +1505,6 @@ msgstr ""
 "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:821
 #, c-format
 msgid ""
 "the merge base between %s and [%s] must be skipped.\n"
@@ -1866,36 +1515,29 @@ msgstr ""
 "%s işlemesinin %s ve [%s] arasında olduğundan emin olamıyoruz.\n"
 "Yine de sürdüreceğiz."
 
-#: bisect.c:860
 #, c-format
 msgid "Bisecting: a merge base must be tested\n"
 msgstr "İkili arama: Birleştirme temelleri sınanmalı\n"
 
-#: bisect.c:910
 #, c-format
 msgid "a %s revision is needed"
 msgstr "bir %s revizyonu gerekiyor"
 
-#: bisect.c:940
 #, c-format
 msgid "could not create file '%s'"
 msgstr "'%s' dosyası oluşturulamadı"
 
-#: bisect.c:986 builtin/merge.c:155
 #, c-format
 msgid "could not read file '%s'"
 msgstr "'%s' dosyası okunamadı"
 
-#: bisect.c:1026
 msgid "reading bisect refs failed"
 msgstr "ikili arama başvurularını okuma başarısız oldu"
 
-#: bisect.c:1056
 #, c-format
 msgid "%s was both %s and %s\n"
 msgstr "%s hem %s hem %s idi\n"
 
-#: bisect.c:1065
 #, c-format
 msgid ""
 "No testable commit found.\n"
@@ -1904,7 +1546,6 @@ msgstr ""
 "Sınanabilir bir işleme bulunamadı.\n"
 "Hatalı yol argümanları ile mi başladınız?\n"
 
-#: bisect.c:1094
 #, c-format
 msgid "(roughly %d step)"
 msgid_plural "(roughly %d steps)"
@@ -1914,54 +1555,40 @@ msgstr[1] "(aşağı yukarı %d adım)"
 #. TRANSLATORS: the last %s will be replaced with "(roughly %d
 #. steps)" translation.
 #.
-#: bisect.c:1100
 #, 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"
 msgstr[0] "İkili arama: Şundan sonra sınanacak %d revizyon kaldı: %s\n"
 msgstr[1] "İkili arama: Şundan sonra sınanacak %d revizyon kaldı: %s\n"
 
-#: blame.c:2773
 msgid "--contents and --reverse do not blend well."
 msgstr "--contents ve --reverse birlikte pek iyi gitmiyor."
 
-#: blame.c:2787
 msgid "cannot use --contents with final commit object name"
 msgstr "--contents son işleme nesnesi adı ile kullanılamıyor"
 
-#: blame.c:2808
 msgid "--reverse and --first-parent together require specified latest commit"
 msgstr ""
 "--reverse ve --first-parent birlikte en son işlemenin belirtilmesini "
 "gerektiriyor"
 
-#: blame.c:2817 bundle.c:231 midx.c:1058 ref-filter.c:2371 remote.c:2157
-#: sequencer.c:2348 sequencer.c:4872 submodule.c:913 builtin/commit.c:1118
-#: builtin/log.c:437 builtin/log.c:1055 builtin/log.c:1663 builtin/log.c:2096
-#: builtin/log.c:2387 builtin/merge.c:431 builtin/pack-objects.c:3381
-#: builtin/pack-objects.c:3781 builtin/pack-objects.c:3796
-#: builtin/shortlog.c:255
 msgid "revision walk setup failed"
 msgstr "revizyonda gezinme ayarlaması başarısız oldu"
 
-#: blame.c:2835
 msgid ""
 "--reverse --first-parent together require range along first-parent chain"
 msgstr ""
 "--reverse --first-parent birlikte ilk üst öge zincirinin yanında erim "
 "gerektiriyor"
 
-#: blame.c:2846
 #, c-format
 msgid "no such path %s in %s"
 msgstr "şurada %s yolu bulunamadı: %s"
 
-#: blame.c:2857
 #, c-format
 msgid "cannot read blob %s for path %s"
 msgstr "%s ikili nesnesi %s yolunda okunamıyor"
 
-#: branch.c:93
 msgid ""
 "cannot inherit upstream tracking configuration of multiple refs when "
 "rebasing is requested"
@@ -1969,32 +1596,26 @@ msgstr ""
 "yeniden temellendirme istendiğinde birden çok başvurunun üst kaynak izleme "
 "yapılandırması miras alınamıyor"
 
-#: branch.c:104
 #, c-format
 msgid "not setting branch '%s' as its own upstream"
 msgstr "'%s' dalı kendi üst kaynağı olarak ayarlanamaz"
 
-#: branch.c:160
 #, c-format
 msgid "branch '%s' set up to track '%s' by rebasing."
 msgstr ""
 "'%s' dalı '%s' ögesini yeniden temellendirme ile izlemek üzere ayarlandı."
 
-#: branch.c:161
 #, c-format
 msgid "branch '%s' set up to track '%s'."
 msgstr "'%s' dalı '%s' ögesini izlemek üzere ayarlandı."
 
-#: branch.c:164
 #, c-format
 msgid "branch '%s' set up to track:"
 msgstr "'%s' dalı şunu izlemek üzere ayarlandı:"
 
-#: branch.c:176
 msgid "unable to write upstream branch configuration"
 msgstr "üstkaynak dal yapılandırması yazılamıyor"
 
-#: branch.c:178
 msgid ""
 "\n"
 "After fixing the error cause you may try to fix up\n"
@@ -2004,34 +1625,32 @@ msgstr ""
 "Hata nedenini ortadan kaldırdıktan sonra uzak konum izleme\n"
 "bilgisini onarmayı şunu çalıştırarak deneyebilirsiniz:"
 
-#: branch.c:219
 #, c-format
 msgid "asked to inherit tracking from '%s', but no remote is set"
 msgstr ""
 "'%s' konumundan izleme miras istendi; ancak bir uzak konum ayarlanmamış"
 
-#: branch.c:225
 #, c-format
 msgid "asked to inherit tracking from '%s', but no merge configuration is set"
 msgstr ""
 "'%s' konumundan izleme miras istendi; ancak bir birleştirme yapılandırması "
 "ayarlanmamış"
 
-#: branch.c:277
 #, c-format
 msgid "not tracking: ambiguous information for ref '%s'"
 msgstr "izlenmiyor: '%s' başvurusu için belirsiz bilgi"
 
+#. #-#-#-#-#  branch.c.po  #-#-#-#-#
 #. TRANSLATORS: This is a line listing a remote with duplicate
 #. refspecs in the advice message below. For RTL languages you'll
 #. probably want to swap the "%s" and leading "  " space around.
 #.
+#. #-#-#-#-#  object-name.c.po  #-#-#-#-#
 #. TRANSLATORS: This is line item of ambiguous object output
 #. from describe_ambiguous_object() above. For RTL languages
 #. you'll probably want to swap the "%s" and leading " " space
 #. around.
 #.
-#: branch.c:289 object-name.c:464
 #, c-format
 msgid "  %s\n"
 msgstr "  %s\n"
@@ -2039,7 +1658,6 @@ msgstr "  %s\n"
 #. TRANSLATORS: The second argument is a \n-delimited list of
 #. duplicate refspecs, composed above.
 #.
-#: branch.c:295
 #, c-format
 msgid ""
 "There are multiple remotes whose fetch refspecs map to the remote\n"
@@ -2060,32 +1678,26 @@ msgstr ""
 "konumların getirme belirteçlerinin değişik izleme ad alanlarına\n"
 "eşlemlendiğinden emin olun."
 
-#: branch.c:344
 #, c-format
 msgid "'%s' is not a valid branch name"
 msgstr "'%s' geçerli bir dal adı değil"
 
-#: branch.c:364
 #, c-format
 msgid "a branch named '%s' already exists"
 msgstr "'%s' adında bir dal halihazırda var"
 
-#: branch.c:370
 #, c-format
 msgid "cannot force update the branch '%s' checked out at '%s'"
 msgstr "'%s' dalı zorla güncellenemiyor, '%s' konumunda çıkış yapılmış"
 
-#: branch.c:393
 #, c-format
 msgid "cannot set up tracking information; starting point '%s' is not a branch"
 msgstr "izleme bilgisi ayarlanamıyor; başlangıç noktası '%s' bir dal değil"
 
-#: branch.c:395
 #, c-format
 msgid "the requested upstream branch '%s' does not exist"
 msgstr "istenen üstkaynak dalı '%s' mevcut değil"
 
-#: branch.c:397
 msgid ""
 "\n"
 "If you are planning on basing your work on an upstream\n"
@@ -2105,28 +1717,22 @@ msgstr ""
 "tasarlıyorsanız itme sırasında üstkaynak yapılandırmasını\n"
 "da ayarlamak için \"git push -u\" kullanmak isteyebilirsiniz."
 
-#: branch.c:445 builtin/replace.c:321 builtin/replace.c:377
-#: builtin/replace.c:423 builtin/replace.c:453
 #, c-format
 msgid "not a valid object name: '%s'"
 msgstr "geçerli bir nesne adı değil: '%s'"
 
-#: branch.c:465
 #, c-format
 msgid "ambiguous object name: '%s'"
 msgstr "belirsiz nesne adı: '%s'"
 
-#: branch.c:470
 #, c-format
 msgid "not a valid branch point: '%s'"
 msgstr "geçerli bir dal noktası değil: '%s'"
 
-#: branch.c:658
 #, c-format
 msgid "submodule '%s': unable to find submodule"
 msgstr "'%s' altmodülü: altmodül bulunamıyor"
 
-#: branch.c:661
 #, c-format
 msgid ""
 "You may try updating the submodules using 'git checkout %s && git submodule "
@@ -2135,8656 +1741,117 @@ msgstr ""
 "Altmodülleri güncellemeyi 'git checkout %s && git submodule update --init' "
 "kullanarak deneyebilirsiniz."
 
-#: branch.c:672 branch.c:698
 #, c-format
 msgid "submodule '%s': cannot create branch '%s'"
 msgstr "'%s' altmodülü: '%s' dalı oluşturulamıyor"
 
-#: branch.c:730
 #, c-format
 msgid "'%s' is already checked out at '%s'"
 msgstr "'%s' çıkışı '%s' konumunda halihazırda yapılmış"
 
-#: branch.c:755
 #, c-format
 msgid "HEAD of working tree %s is not updated"
 msgstr "%s çalışma ağacının HEAD'i güncellenmemiş"
 
-#: bundle.c:45
-#, c-format
-msgid "unrecognized bundle hash algorithm: %s"
-msgstr "bilinmeyen demet sağlama algoritması: %s"
-
-#: bundle.c:53
-#, c-format
-msgid "unknown capability '%s'"
-msgstr "bilinmeyen yetenek '%s'"
-
-#: bundle.c:79
-#, c-format
-msgid "'%s' does not look like a v2 or v3 bundle file"
-msgstr "'%s' bir v2 veya v3 demet dosyası gibi görünmüyor"
-
-#: bundle.c:118
-#, c-format
-msgid "unrecognized header: %s%s (%d)"
-msgstr "tanımlanamayan üstbilgi: %s%s (%d)"
-
-#: bundle.c:145 rerere.c:464 rerere.c:675 sequencer.c:2616 sequencer.c:3402
-#: builtin/commit.c:865
-#, c-format
-msgid "could not open '%s'"
-msgstr "'%s' açılamadı"
-
-#: bundle.c:203
-msgid "Repository lacks these prerequisite commits:"
-msgstr "Depo aşağıdaki önkoşul işlemelere iye değil:"
-
-#: bundle.c:206
-msgid "need a repository to verify a bundle"
-msgstr "bir demeti doğrulamak için bir depo gerekiyor"
-
-#: bundle.c:264
-#, c-format
-msgid "The bundle contains this ref:"
-msgid_plural "The bundle contains these %<PRIuMAX> refs:"
-msgstr[0] "Demet bu başvuruyu içeriyor:"
-msgstr[1] "Demet bu %<PRIuMAX> başvuruyu içeriyor:"
-
-#: bundle.c:272
-msgid "The bundle records a complete history."
-msgstr "Demet tam bir geçmiş kaydını yazar."
-
-#: bundle.c:274
-#, c-format
-msgid "The bundle requires this ref:"
-msgid_plural "The bundle requires these %<PRIuMAX> refs:"
-msgstr[0] "Demet bu başvuruyu gerektiriyor:"
-msgstr[1] "Demet bu %<PRIuMAX> başvuruyu gerektiriyor:"
-
-#: bundle.c:350
-msgid "unable to dup bundle descriptor"
-msgstr "demet açıklayıcısı çoğaltılamıyor"
-
-#: bundle.c:357
-msgid "Could not spawn pack-objects"
-msgstr "pack-objects ortaya çıkarılamadı"
-
-#: bundle.c:368
-msgid "pack-objects died"
-msgstr "pack-objects sonlandı"
-
-#: bundle.c:417
-#, c-format
-msgid "ref '%s' is excluded by the rev-list options"
-msgstr "'%s' başvurusu revizyon listesi seçenekleri tarafından dışlandı"
-
-#: bundle.c:533 builtin/log.c:211 builtin/log.c:1975 builtin/shortlog.c:400
-#, c-format
-msgid "unrecognized argument: %s"
-msgstr "tanımlanamayan argüman: %s"
-
-#: bundle.c:548
-#, c-format
-msgid "unsupported bundle version %d"
-msgstr "desteklenmeyen demet sürümü %d"
-
-#: bundle.c:550
-#, c-format
-msgid "cannot write bundle version %d with algorithm %s"
-msgstr "demet sürümü %d, %s algoritması ile yazılamıyor"
-
-#: bundle.c:600
-msgid "Refusing to create empty bundle."
-msgstr "Boş demet oluşturma reddediliyor."
-
-#: bundle.c:610
-#, c-format
-msgid "cannot create '%s'"
-msgstr "'%s' oluşturulamıyor"
-
-#: bundle.c:639
-msgid "index-pack died"
-msgstr "index-pack sonlandı"
-
-#: chunk-format.c:117
-msgid "terminating chunk id appears earlier than expected"
-msgstr "iri parça numarası sonlandırması beklenenden önce ortaya çıkıyor"
-
-#: chunk-format.c:126
-#, c-format
-msgid "improper chunk offset(s) %<PRIx64> and %<PRIx64>"
-msgstr "düzgün olmayan iri parça ofseti %<PRIx64> ve %<PRIx64>"
-
-#: chunk-format.c:133
-#, c-format
-msgid "duplicate chunk ID %<PRIx32> found"
-msgstr "yinelenmiş iri parça numarası %<PRIx32> bulundu"
-
-#: chunk-format.c:147
-#, c-format
-msgid "final chunk has non-zero id %<PRIx32>"
-msgstr "en son iri parçanın numarası sıfır olmayan %<PRIx32>"
-
-#: color.c:354
-#, c-format
-msgid "invalid color value: %.*s"
-msgstr "geçersiz renk değeri: %.*s"
-
-#: commit-graph.c:204 midx.c:52
-msgid "invalid hash version"
-msgstr "geçersiz sağlama sürümü"
-
-#: commit-graph.c:262
-msgid "commit-graph file is too small"
-msgstr "commit-graph dosyası pek küçük"
-
-#: commit-graph.c:355
-#, c-format
-msgid "commit-graph signature %X does not match signature %X"
-msgstr "commit-graph imzası %X, %X ile eşleşmiyor"
-
-#: commit-graph.c:362
-#, c-format
-msgid "commit-graph version %X does not match version %X"
-msgstr "commit-graph sürümü %x, %X ile eşleşmiyor"
-
-#: commit-graph.c:369
-#, c-format
-msgid "commit-graph hash version %X does not match version %X"
-msgstr "commit-graph sağlama sürümü %X, %X ile eşleşmiyor"
-
-#: commit-graph.c:386
-#, c-format
-msgid "commit-graph file is too small to hold %u chunks"
-msgstr "commit-graph dosyası %u iri parça tutmak için pek küçük"
-
-#: commit-graph.c:485
-msgid "commit-graph has no base graphs chunk"
-msgstr "commit-graph temel grafiği iri parçasına iye değil"
-
-#: commit-graph.c:495
-msgid "commit-graph chain does not match"
-msgstr "commit-graph zinciri eşleşmiyor"
-
-#: commit-graph.c:543
-#, c-format
-msgid "invalid commit-graph chain: line '%s' not a hash"
-msgstr "geçersiz commit-graph zinciri: '%s'. satır bir sağlama değil"
-
-#: commit-graph.c:567
-msgid "unable to find all commit-graph files"
-msgstr "tüm commit-graph dosyaları bulunamıyor"
-
-#: commit-graph.c:752 commit-graph.c:789
-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:773
-#, c-format
-msgid "could not find commit %s"
-msgstr "%s işlemesi bulunamadı"
-
-#: commit-graph.c:806
-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:1111 builtin/am.c:1370 builtin/checkout.c:775
-#: builtin/clone.c:705
-#, c-format
-msgid "unable to parse commit %s"
-msgstr "%s işlemesi ayrıştırılamıyor"
-
-#: commit-graph.c:1373 builtin/pack-objects.c:3078
-#, c-format
-msgid "unable to get type of object %s"
-msgstr "%s nesnesinin türü alınamıyor"
-
-#: commit-graph.c:1404
-msgid "Loading known commits in commit graph"
-msgstr "İşleme grafiğindeki bilinen işlemeler yükleniyor"
-
-#: commit-graph.c:1421
-msgid "Expanding reachable commits in commit graph"
-msgstr "İşleme grafiğindeki ulaşılabilir işlemeler genişletiliyor"
-
-#: commit-graph.c:1441
-msgid "Clearing commit marks in commit graph"
-msgstr "İşleme grafiğindeki işleme imleri temizleniyor"
-
-#: commit-graph.c:1460
-msgid "Computing commit graph topological levels"
-msgstr "İşleme grafiği ilingesel düzeyleri hesaplanıyor"
-
-#: commit-graph.c:1513
-msgid "Computing commit graph generation numbers"
-msgstr "İşleme grafiği kuşak sayıları hesaplanıyor"
-
-#: commit-graph.c:1598
-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:1675
-msgid "Collecting referenced commits"
-msgstr "Başvurulmuş işlemeler toplanıyor"
-
-#: commit-graph.c:1701
-#, c-format
-msgid "Finding commits for commit graph in %<PRIuMAX> pack"
-msgid_plural "Finding commits for commit graph in %<PRIuMAX> packs"
-msgstr[0] "%<PRIuMAX> pakette işleme grafiği için işlemeler bulunuyor"
-msgstr[1] "%<PRIuMAX> pakette işleme grafiği için işlemeler bulunuyor"
-
-#: commit-graph.c:1714
-#, c-format
-msgid "error adding pack %s"
-msgstr "%s paketi eklenirken hata"
-
-#: commit-graph.c:1718
-#, c-format
-msgid "error opening index for %s"
-msgstr "%s için indeks açılırken hata"
-
-#: commit-graph.c:1756
-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:1774
-msgid "Finding extra edges in commit graph"
-msgstr "İşleme grafiğindeki ek sınırlar bulunuyor"
-
-#: commit-graph.c:1823
-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:1854 midx.c:1168 builtin/sparse-checkout.c:475
-#, c-format
-msgid "unable to create leading directories of %s"
-msgstr "%s öncü dizinleri oluşturulamıyor"
-
-#: commit-graph.c:1868
-msgid "unable to create temporary graph layer"
-msgstr "geçici grafik katmanı oluşturulamıyor"
-
-#: commit-graph.c:1873
-#, c-format
-msgid "unable to adjust shared permissions for '%s'"
-msgstr "'%s' için paylaşılan izinler ayarlanamıyor"
-
-#: commit-graph.c:1930
-#, 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:1967
-msgid "unable to open commit-graph chain file"
-msgstr "commit-graph zincir dosyası açılamıyor"
-
-#: commit-graph.c:1983
-msgid "failed to rename base commit-graph file"
-msgstr "temel commit-graph dosyası yeniden adlandırılamadı"
-
-#: commit-graph.c:2004
-msgid "failed to rename temporary commit-graph file"
-msgstr "geçici commit-graph dosyası yeniden adlandırılamadı"
-
-#: commit-graph.c:2137
-msgid "Scanning merged commits"
-msgstr "Birleştirilen işlemeler taranıyor"
-
-#: commit-graph.c:2181
-msgid "Merging commit-graph"
-msgstr "commit-graph birleştiriliyor"
-
-#: commit-graph.c:2289
-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:2396
-msgid "too many commits to write graph"
-msgstr "grafik yazımı için çok fazla işleme"
-
-#: commit-graph.c:2494
-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:2504
-#, 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:2514 commit-graph.c:2529
-#, 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:2521
-#, 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:2539
-msgid "Verifying commits in commit graph"
-msgstr "İşleme grafiğindeki işlemeler doğrulanıyor"
-
-#: commit-graph.c:2554
-#, 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:2561
-#, 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:2571
-#, 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:2580
-#, 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:2594
-#, 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:2599
-#, c-format
-msgid ""
-"commit-graph has generation number zero for commit %s, but non-zero elsewhere"
-msgstr ""
-"%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:2603
-#, c-format
-msgid ""
-"commit-graph has non-zero generation number for commit %s, but zero elsewhere"
-msgstr ""
-"%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:2620
-#, 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:2626
-#, 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:54 sequencer.c:3105 builtin/am.c:400 builtin/am.c:445
-#: builtin/am.c:450 builtin/am.c:1449 builtin/am.c:2124 builtin/replace.c:456
-#, c-format
-msgid "could not parse %s"
-msgstr "%s ayrıştırılamadı"
-
-#: commit.c:56
-#, c-format
-msgid "%s %s is not a commit!"
-msgstr "%s %s bir işleme değil!"
-
-#: commit.c:197
-msgid ""
-"Support for <GIT_DIR>/info/grafts is deprecated\n"
-"and will be removed in a future Git version.\n"
-"\n"
-"Please use \"git replace --convert-graft-file\"\n"
-"to convert the grafts into replace refs.\n"
-"\n"
-"Turn this message off by running\n"
-"\"git config advice.graftFileDeprecated false\""
-msgstr ""
-"<GIT_DIR>/info/grafts desteği artık kullanılmamalı\n"
-"ve ileriki bir Git sürümünde kaldırılacak.\n"
-"\n"
-"Aşıları değiştirme başvurularına dönüştürmek için\n"
-"lütfen \"git replace --convert-graft-file\" kullanın.\n"
-"\n"
-"\"git config advice.graftFileDeprecated false\"\n"
-"kullanarak bu iletiyi kapatabilirsiniz."
-
-#: commit.c:1252
-#, 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:1256
-#, 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:1259
-#, c-format
-msgid "Commit %s does not have a GPG signature."
-msgstr "%s işlemesinin bir GPG imzası yok."
-
-#: commit.c:1262
-#, 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:1516
-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"
-"variable i18n.commitencoding to the encoding your project uses.\n"
-msgstr ""
-"Uyarı: İşleme iletisi UTF-8'e uymuyor.\n"
-"İletiyi düzelttikten sonra bunu değiştirmek isteyebilir veya\n"
-"i18n.commitencoding yapılandırma değişkenini projenizin kullandığı\n"
-"kodlama ile değiştirmek isteyebilirsiniz.\n"
-
-#: compat/obstack.c:406 compat/obstack.c:408
-msgid "memory exhausted"
-msgstr "bellek tükendi"
-
-#: compat/terminal.c:167
-msgid "cannot resume in the background, please use 'fg' to resume"
-msgstr "arka planda sürdürülemiyor, sürdürmek için 'fg' kullanın"
-
-#: compat/terminal.c:168
-msgid "cannot restore terminal settings"
-msgstr "uçbirim ayarları geri yüklenemiyor"
-
-#: config.c:143
-#, c-format
-msgid ""
-"exceeded maximum include depth (%d) while including\n"
-"\t%s\n"
-"from\n"
-"\t%s\n"
-"This might be due to circular includes."
-msgstr ""
-"aşağıdaki içerilirken olabilecek en çok içerme derinliği (%d) aşıldı:\n"
-"\t%s\n"
-"içerme konumu:\n"
-"\t%s\n"
-"Bu dairesel içermelerden dolayı olabilir."
-
-#: config.c:159
-#, c-format
-msgid "could not expand include path '%s'"
-msgstr "içerme yolu '%s' genişletilemedi"
-
-#: config.c:170
-msgid "relative config includes must come from files"
-msgstr "göreceli yapılandırma içermeleri dosyalardan gelmeli"
-
-#: config.c:219
-msgid "relative config include conditionals must come from files"
-msgstr "göreceli yapılandırma içerme koşulluları dosyalardan gelmeli"
-
-#: config.c:364
-msgid ""
-"remote URLs cannot be configured in file directly or indirectly included by "
-"includeIf.hasconfig:remote.*.url"
-msgstr ""
-"uzak URL'ler dosya içinde doğrudan veya başka türlü includeIf.hasconfig:"
-"remote.*.url kullanarak yapılandırılamaz"
-
-#: config.c:508
-#, c-format
-msgid "invalid config format: %s"
-msgstr "geçersiz yapılandırma biçimi: %s"
-
-#: config.c:512
-#, 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:517
-#, 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:553
-#, c-format
-msgid "key does not contain a section: %s"
-msgstr "anahtar, bir bölüm içermiyor: %s"
-
-#: config.c:558
-#, c-format
-msgid "key does not contain variable name: %s"
-msgstr "anahtar, bir değişken adı içermiyor: %s"
-
-#: config.c:580 sequencer.c:2802
-#, c-format
-msgid "invalid key: %s"
-msgstr "geçersiz anahtar: %s"
-
-#: config.c:585
-#, c-format
-msgid "invalid key (newline): %s"
-msgstr "geçersiz anahtar (yenisatır): %s"
-
-#: config.c:605
-msgid "empty config key"
-msgstr "boş yapılandırma anahtarı"
-
-#: config.c:623 config.c:635
-#, c-format
-msgid "bogus config parameter: %s"
-msgstr "düzmece yapılandırma parametresi: %s"
-
-#: config.c:649 config.c:666 config.c:673 config.c:682
-#, c-format
-msgid "bogus format in %s"
-msgstr "%s içinde düzmece biçim"
-
-#: config.c:716
-#, c-format
-msgid "bogus count in %s"
-msgstr "%s içinde düzmece sayım"
-
-#: config.c:720
-#, c-format
-msgid "too many entries in %s"
-msgstr "%s içinde çok fazla girdi"
-
-#: config.c:730
-#, c-format
-msgid "missing config key %s"
-msgstr "%s yapılandırma anahtarı eksik"
-
-#: config.c:738
-#, c-format
-msgid "missing config value %s"
-msgstr "%s yapılandırma değeri eksik"
-
-#: config.c:1089
-#, 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:1093
-#, c-format
-msgid "bad config line %d in file %s"
-msgstr "hatalı yapılandırma satırı %d, %s dosyası içinde"
-
-#: config.c:1097
-#, c-format
-msgid "bad config line %d in standard input"
-msgstr "standart girdi içinde hatalı yapılandırma satırı %d"
-
-#: config.c:1101
-#, 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:1105
-#, 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:1109
-#, c-format
-msgid "bad config line %d in %s"
-msgstr "hatalı yapılandırma satırı %d (%s içinde)"
-
-#: config.c:1246
-msgid "out of range"
-msgstr "erim dışı"
-
-#: config.c:1246
-msgid "invalid unit"
-msgstr "geçersiz birim"
-
-#: config.c:1247
-#, 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:1257
-#, 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:1260
-#, 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:1263
-#, 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:1266
-#, 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:1269
-#, 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:1272
-#, 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:1368
-#, c-format
-msgid "invalid value for variable %s"
-msgstr "%s değişkeni için geçersiz değer"
-
-#: config.c:1389
-#, c-format
-msgid "ignoring unknown core.fsync component '%s'"
-msgstr "bilinmeyen core.fsync bileşeni '%s' yok sayılıyor"
-
-#: config.c:1425
-#, c-format
-msgid "bad boolean config value '%s' for '%s'"
-msgstr "hatalı Boole yapılandırma değeri '%s', '%s' için"
-
-#: config.c:1443
-#, c-format
-msgid "failed to expand user dir in: '%s'"
-msgstr "şuradaki kullanıcı dizini genişletilemedi: '%s'"
-
-#: config.c:1452
-#, 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:1545
-#, c-format
-msgid "abbrev length out of range: %d"
-msgstr "kısaltma uzunluğu erim dışında: %d"
-
-#: config.c:1559 config.c:1570
-#, c-format
-msgid "bad zlib compression level %d"
-msgstr "hatalı zlib sıkıştırma düzeyi %d"
-
-#: config.c:1660
-msgid "core.commentChar should only be one character"
-msgstr "core.commentChar yalnızca bir karakter olmalı"
-
-#: config.c:1692
-#, c-format
-msgid "ignoring unknown core.fsyncMethod value '%s'"
-msgstr "bilinmeyen core.fsyncMethod değeri '%s' yok sayılıyor"
-
-#: config.c:1698
-msgid "core.fsyncObjectFiles is deprecated; use core.fsync instead"
-msgstr "core.fsyncObjectFiles artık kullanılmıyor; yerine core.fsync kullanın"
-
-#: config.c:1714
-#, c-format
-msgid "invalid mode for object creation: %s"
-msgstr "nesne oluşturma için geçersiz kip: %s"
-
-#: config.c:1800
-#, c-format
-msgid "malformed value for %s"
-msgstr "%s için hatalı oluşturulmuş değer"
-
-#: config.c:1826
-#, c-format
-msgid "malformed value for %s: %s"
-msgstr "%s için hatalı oluşturulmuş değer: %s"
-
-#: config.c:1827
-msgid "must be one of nothing, matching, simple, upstream or current"
-msgstr "nothing, matching, simple, upstream veya current içinden biri olmalı"
-
-#: config.c:1888 builtin/pack-objects.c:4078
-#, c-format
-msgid "bad pack compression level %d"
-msgstr "hatalı paket sıkıştırma düzeyi %d"
-
-#: config.c:2014
-#, c-format
-msgid "unable to load config blob object '%s'"
-msgstr "'%s' yapılandırma ikili nesnesi yüklenemiyor"
-
-#: config.c:2017
-#, c-format
-msgid "reference '%s' does not point to a blob"
-msgstr "'%s' başvurusu ikili bir nesneye işaret etmiyor"
-
-#: config.c:2035
-#, c-format
-msgid "unable to resolve config blob '%s'"
-msgstr "'%s' yapılandırma ikili nesnesi çözülemiyor"
-
-#: config.c:2080
-#, c-format
-msgid "failed to parse %s"
-msgstr "%s ayrıştırılamadı"
-
-#: config.c:2136
-msgid "unable to parse command-line config"
-msgstr "komut satırı yapılandırması ayrıştırılamıyor"
-
-#: config.c:2512
-msgid "unknown error occurred while reading the configuration files"
-msgstr "yapılandırma dosyaları okunurken beklenmedik bir hata oluştu"
-
-#: config.c:2686
-#, c-format
-msgid "Invalid %s: '%s'"
-msgstr "Geçersiz %s: '%s'"
-
-#: config.c:2731
-#, 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:2763
-#, 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:2765
-#, 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:2850
-#, c-format
-msgid "invalid section name '%s'"
-msgstr "geçersiz bölüm adı '%s'"
-
-#: config.c:2882
-#, c-format
-msgid "%s has multiple values"
-msgstr "%s birden çok değere iye"
-
-#: config.c:2911
-#, c-format
-msgid "failed to write new configuration file %s"
-msgstr "yeni yapılandırma dosyası %s yazılamadı"
-
-#: config.c:3177 config.c:3518
-#, c-format
-msgid "could not lock config file %s"
-msgstr "%s yapılandırma dosyası kilitlenemedi"
-
-#: config.c:3188
-#, c-format
-msgid "opening %s"
-msgstr "%s açılıyor"
-
-#: config.c:3225 builtin/config.c:361
-#, c-format
-msgid "invalid pattern: %s"
-msgstr "geçersiz dizgi: %s"
-
-#: config.c:3250
-#, c-format
-msgid "invalid config file %s"
-msgstr "geçersiz yapılandırma dosyası %s"
-
-#: config.c:3263 config.c:3531
-#, c-format
-msgid "fstat on %s failed"
-msgstr "%s üzerinde fstat başarısız oldu"
-
-#: config.c:3274
-#, c-format
-msgid "unable to mmap '%s'%s"
-msgstr "'%s'%s mmap yapılamıyor"
-
-#: config.c:3284 config.c:3536
-#, c-format
-msgid "chmod on %s failed"
-msgstr "%s üzerinde chmod başarısız oldu"
-
-#: config.c:3369 config.c:3633
-#, c-format
-msgid "could not write config file %s"
-msgstr "%s yapılandırma dosyası yazılamadı"
-
-#: config.c:3403
-#, c-format
-msgid "could not set '%s' to '%s'"
-msgstr "'%s', '%s' olarak ayarlanamadı"
-
-#: config.c:3405 builtin/remote.c:666 builtin/remote.c:885 builtin/remote.c:893
-#, c-format
-msgid "could not unset '%s'"
-msgstr "'%s' ayarı kapatılamadı"
-
-#: config.c:3509
-#, c-format
-msgid "invalid section name: %s"
-msgstr "geçersiz bölüm adı: %s"
-
-#: config.c:3676
-#, c-format
-msgid "missing value for '%s'"
-msgstr "'%s' için değer eksik"
-
-#: connect.c:61
-msgid "the remote end hung up upon initial contact"
-msgstr "uzak uç ilk iletişimle birlikte hattı kapattı"
-
-#: connect.c:63
-msgid ""
-"Could not read from remote repository.\n"
-"\n"
-"Please make sure you have the correct access rights\n"
-"and the repository exists."
-msgstr ""
-"Uzak konum deposu okunamadı.\n"
-"\n"
-"Lütfen doğru erişim haklarına iye olduğunuzdan ve\n"
-"deponun var olduğundan emin olun."
-
-#: connect.c:81
-#, c-format
-msgid "server doesn't support '%s'"
-msgstr "sunucu '%s' desteklemiyor"
-
-#: connect.c:118
-#, c-format
-msgid "server doesn't support feature '%s'"
-msgstr "sunucu '%s' özelliğini desteklemiyor"
-
-#: connect.c:129
-msgid "expected flush after capabilities"
-msgstr "yeteneklerden sonra floş bekleniyordu"
-
-#: 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:286
-msgid "protocol error: unexpected capabilities^{}"
-msgstr "protokol hatası: beklenmedik yetenekler^{}"
-
-#: 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:310
-msgid "repository on the other end cannot be shallow"
-msgstr "diğer uçtaki depo sığ olamaz"
-
-#: connect.c:349
-msgid "invalid packet"
-msgstr "geçersiz paket"
-
-#: connect.c:369
-#, c-format
-msgid "protocol error: unexpected '%s'"
-msgstr "protokol hatası: beklenmedik '%s'"
-
-#: 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:528
-#, c-format
-msgid "invalid ls-refs response: %s"
-msgstr "geçersiz ls-refs yanıtı: %s"
-
-#: connect.c:532
-msgid "expected flush after ref listing"
-msgstr "başvuru listelemesinden sonra floş bekleniyordu"
-
-#: connect.c:535
-msgid "expected response end packet after ref listing"
-msgstr "başvuru listelemesinden sonra yanıt sonu paketi bekleniyordu"
-
-#: connect.c:670
-#, c-format
-msgid "protocol '%s' is not supported"
-msgstr "'%s' protokolü desteklenmiyor"
-
-#: connect.c:721
-msgid "unable to set SO_KEEPALIVE on socket"
-msgstr "soket üzerinde SO_KEEPALIVE ayarlanamıyor"
-
-#: connect.c:761 connect.c:824
-#, c-format
-msgid "Looking up %s ... "
-msgstr "%s adresi aranıyor ... "
-
-#: 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:769 connect.c:840
-#, c-format
-msgid ""
-"done.\n"
-"Connecting to %s (port %s) ... "
-msgstr ""
-"bitti.\n"
-"%s adresine bağlanılıyor (kapı %s) ... "
-
-#: connect.c:791 connect.c:868
-#, c-format
-msgid ""
-"unable to connect to %s:\n"
-"%s"
-msgstr ""
-"%s adresine bağlanılıyor:\n"
-"%s"
-
-#. TRANSLATORS: this is the end of "Connecting to %s (port %s) ... "
-#: connect.c:797 connect.c:874
-msgid "done."
-msgstr "bitti."
-
-#: connect.c:828
-#, c-format
-msgid "unable to look up %s (%s)"
-msgstr "%s aranamıyor (%s)"
-
-#: connect.c:834
-#, c-format
-msgid "unknown port %s"
-msgstr "bilinmeyen kapı %s"
-
-#: connect.c:971 connect.c:1303
-#, c-format
-msgid "strange hostname '%s' blocked"
-msgstr "garip makine adı '%s' engellendi"
-
-#: connect.c:973
-#, c-format
-msgid "strange port '%s' blocked"
-msgstr "garip kapı '%s' engellendi"
-
-#: connect.c:983
-#, c-format
-msgid "cannot start proxy %s"
-msgstr "vekil %s başlatılamıyor"
-
-#: 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:1194
-msgid "newline is forbidden in git:// hosts and repo paths"
-msgstr "git:// makinelerinde ve depo yollarında yenisatır karakteri yasak"
-
-#: connect.c:1251
-msgid "ssh variant 'simple' does not support -4"
-msgstr "ssh değişik biçimi 'simple' -4 desteklemiyor"
-
-#: connect.c:1263
-msgid "ssh variant 'simple' does not support -6"
-msgstr "ssh değişik biçimi 'simple' -6 desteklemiyor"
-
-#: 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:1392
-#, c-format
-msgid "strange pathname '%s' blocked"
-msgstr "garip yol adı '%s' engellendi"
-
-#: connect.c:1440
-msgid "unable to fork"
-msgstr "çatallanamıyor"
-
-#: connected.c:109 builtin/fsck.c:189 builtin/prune.c:57
-msgid "Checking connectivity"
-msgstr "Bağlantı denetleniyor"
-
-#: connected.c:122
-msgid "Could not run 'git rev-list'"
-msgstr "'git rev-list' çalıştırılamadı"
-
-#: connected.c:146
-msgid "failed write to rev-list"
-msgstr "rev-list yazılamadı"
-
-#: connected.c:151
-msgid "failed to close rev-list's stdin"
-msgstr "rev-list'in stdin'i kapatılamadı"
-
-#: convert.c:183
-#, c-format
-msgid "illegal crlf_action %d"
-msgstr "izin verilmeyen crlf_action %d"
-
-#: convert.c:196
-#, c-format
-msgid "CRLF would be replaced by LF in %s"
-msgstr "CRLF %s içinde LF ile değiştirilecek"
-
-#: convert.c:198
-#, c-format
-msgid ""
-"CRLF will be replaced by LF in %s.\n"
-"The file will have its original line endings in your working directory"
-msgstr ""
-"CRLF %s içinde LF ile değiştirilecek.\n"
-"Dosya sizin çalışma dizininizde kendi orijinal satır sonlarına iye olacak."
-
-#: convert.c:206
-#, c-format
-msgid "LF would be replaced by CRLF in %s"
-msgstr "LF %s içinde CRLF ile değiştirilecek"
-
-#: convert.c:208
-#, c-format
-msgid ""
-"LF will be replaced by CRLF in %s.\n"
-"The file will have its original line endings in your working directory"
-msgstr ""
-"LF %s içinde CRLF ile değiştirilecek.\n"
-"Dosya sizin çalışma dizininizde kendi orijinal satır sonlarına iye olacak."
-
-#: convert.c:273
-#, c-format
-msgid "BOM is prohibited in '%s' if encoded as %s"
-msgstr "BOM '%s' içinde yasaklı, eğer %s olarak kodlanmışsa"
-
-#: convert.c:280
-#, c-format
-msgid ""
-"The file '%s' contains a byte order mark (BOM). Please use UTF-%.*s as "
-"working-tree-encoding."
-msgstr ""
-"'%s' dosyası bir bayt sıra imi (BOM) içeriyor. Lütfen çalışma ağacı "
-"kodlaması için UTF-%.*s kullanın."
-
-#: convert.c:293
-#, c-format
-msgid "BOM is required in '%s' if encoded as %s"
-msgstr "BOM '%s' içinde gerekli, eğer %s olarak kodlanmışsa"
-
-#: 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."
-msgstr ""
-"'%s' dosyasında bir bayt sıra imi (BOM) eksik. Lütfen çalışma ağacı "
-"kodlaması için UTF-%sBE veya UTF-%sLE (bayt sırasına göre) kullanın."
-
-#: convert.c:408 convert.c:479
-#, c-format
-msgid "failed to encode '%s' from %s to %s"
-msgstr "'%s', %s değerinden %s değerine kodlanamadı"
-
-#: convert.c:451
-#, c-format
-msgid "encoding '%s' from %s to %s and back is not the same"
-msgstr ""
-"'%s' kodlamasını %s -> %s biçiminde yapıp tersine döndürmek aynı şey değil"
-
-#: convert.c:654
-#, c-format
-msgid "cannot fork to run external filter '%s'"
-msgstr "'%s' dış süzgecini çalıştırmak için çatallama yapılamıyor"
-
-#: convert.c:674
-#, c-format
-msgid "cannot feed the input to external filter '%s'"
-msgstr "girdi '%s' dış süzgecine beslenemiyor"
-
-#: convert.c:681
-#, c-format
-msgid "external filter '%s' failed %d"
-msgstr "'%s' dış süzgeci %d için başarısız oldu"
-
-#: convert.c:716 convert.c:719
-#, c-format
-msgid "read from external filter '%s' failed"
-msgstr "'%s' dış süzgecinden okuma başarısız oldu"
-
-#: convert.c:722 convert.c:777
-#, c-format
-msgid "external filter '%s' failed"
-msgstr "'%s' dış süzgeci başarısız oldu"
-
-#: convert.c:826
-msgid "unexpected filter type"
-msgstr "beklenmedik süzgeç türü"
-
-#: convert.c:837
-msgid "path name too long for external filter"
-msgstr "dış süzgeç için yol adı pek uzun"
-
-#: convert.c:935
-#, c-format
-msgid ""
-"external filter '%s' is not available anymore although not all paths have "
-"been filtered"
-msgstr ""
-"'%s' dış süzgeci artık kullanılamıyor; ancak tüm yolların süzümü bitmedi"
-
-#: convert.c:1236
-msgid "true/false are no valid working-tree-encodings"
-msgstr "doğru/yanlış geçerli bir çalışma ağacı kodlaması değil"
-
-#: convert.c:1416 convert.c:1449
-#, c-format
-msgid "%s: clean filter '%s' failed"
-msgstr "%s: temiz süzgeç '%s' başarısız oldu"
-
-#: convert.c:1492
-#, c-format
-msgid "%s: smudge filter %s failed"
-msgstr "%s: is süzgeci %s başarısız oldu"
-
-#: credential.c:96
-#, c-format
-msgid "skipping credential lookup for key: credential.%s"
-msgstr "şu anahtar için yetki araması atlanıyor: credential.%s"
-
-#: credential.c:112
-msgid "refusing to work with credential missing host field"
-msgstr "ana makine bilgisi eksik yetki ile çalışma reddediliyor"
-
-#: credential.c:114
-msgid "refusing to work with credential missing protocol field"
-msgstr "protokol bilgisi eksik yetki ile çalışma reddediliyor"
-
-#: credential.c:396
-#, 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:440
-#, c-format
-msgid "url has no scheme: %s"
-msgstr "url'nin şeması yok: %s"
-
-#: credential.c:513
-#, c-format
-msgid "credential url cannot be parsed: %s"
-msgstr "yetki url'si ayrıştırılamıyor: %s"
-
-#: date.c:139
-msgid "in the future"
-msgstr "gelecekte"
-
-#: date.c:145
-#, c-format
-msgid "%<PRIuMAX> second ago"
-msgid_plural "%<PRIuMAX> seconds ago"
-msgstr[0] "%<PRIuMAX> saniye önce"
-msgstr[1] "%<PRIuMAX> saniye önce"
-
-#: date.c:152
-#, c-format
-msgid "%<PRIuMAX> minute ago"
-msgid_plural "%<PRIuMAX> minutes ago"
-msgstr[0] "%<PRIuMAX> dakika önce"
-msgstr[1] "%<PRIuMAX> dakika önce"
-
-#: date.c:159
-#, c-format
-msgid "%<PRIuMAX> hour ago"
-msgid_plural "%<PRIuMAX> hours ago"
-msgstr[0] "%<PRIuMAX> saat önce"
-msgstr[1] "%<PRIuMAX> saat önce"
-
-#: date.c:166
-#, c-format
-msgid "%<PRIuMAX> day ago"
-msgid_plural "%<PRIuMAX> days ago"
-msgstr[0] "%<PRIuMAX> gün önce"
-msgstr[1] "%<PRIuMAX> gün önce"
-
-#: date.c:172
-#, c-format
-msgid "%<PRIuMAX> week ago"
-msgid_plural "%<PRIuMAX> weeks ago"
-msgstr[0] "%<PRIuMAX> hafta önce"
-msgstr[1] "%<PRIuMAX> hafta önce"
-
-#: date.c:179
-#, c-format
-msgid "%<PRIuMAX> month ago"
-msgid_plural "%<PRIuMAX> months ago"
-msgstr[0] "%<PRIuMAX> ay önce"
-msgstr[1] "%<PRIuMAX> ay önce"
-
-#: date.c:190
-#, c-format
-msgid "%<PRIuMAX> year"
-msgid_plural "%<PRIuMAX> years"
-msgstr[0] "%<PRIuMAX> yıl"
-msgstr[1] "%<PRIuMAX> yıl"
-
-#. TRANSLATORS: "%s" is "<n> years"
-#: date.c:193
-#, c-format
-msgid "%s, %<PRIuMAX> month ago"
-msgid_plural "%s, %<PRIuMAX> months ago"
-msgstr[0] "%s, %<PRIuMAX> ay önce"
-msgstr[1] "%s, %<PRIuMAX> ay önce"
-
-#: date.c:198 date.c:203
-#, c-format
-msgid "%<PRIuMAX> year ago"
-msgid_plural "%<PRIuMAX> years ago"
-msgstr[0] "%<PRIuMAX> yıl önce"
-msgstr[1] "%<PRIuMAX> yıl önce"
-
-#: delta-islands.c:272
-msgid "Propagating island marks"
-msgstr "Delta adası imleri yayılıyor"
-
-#: delta-islands.c:290
-#, c-format
-msgid "bad tree object %s"
-msgstr "hatalı ağaç nesnesi %s"
-
-#: delta-islands.c:334
-#, c-format
-msgid "failed to load island regex for '%s': %s"
-msgstr "'%s' için delta adası düzenli ifadesi yüklenemedi: %s"
-
-#: delta-islands.c:390
-#, c-format
-msgid "island regex from config has too many capture groups (max=%d)"
-msgstr ""
-"yapılandırmanın delta adası düzenli ifadesinde çok fazla yakalama grubu var "
-"(en çok %d)"
-
-#: delta-islands.c:467
-#, c-format
-msgid "Marked %d islands, done.\n"
-msgstr "%d delta adası imlendi, bitti.\n"
-
-#: diff-merges.c:81 gpg-interface.c:719 gpg-interface.c:734 ls-refs.c:37
-#: parallel-checkout.c:42 sequencer.c:2805 setup.c:563 builtin/am.c:203
-#: builtin/am.c:2243 builtin/am.c:2287 builtin/blame.c:724 builtin/blame.c:742
-#: builtin/fetch.c:792 builtin/pack-objects.c:3515 builtin/pull.c:45
-#: builtin/pull.c:47 builtin/pull.c:321
-#, c-format
-msgid "invalid value for '%s': '%s'"
-msgstr "'%s' için geçersiz değer: '%s'"
-
-#: diff-lib.c:561
-msgid "--merge-base does not work with ranges"
-msgstr "--merge-base erimlerle çalışmaz"
-
-#: diff-lib.c:563
-msgid "--merge-base only works with commits"
-msgstr "--merge-base yalnızca işlemelerle çalışır"
-
-#: diff-lib.c:580
-msgid "unable to get HEAD"
-msgstr "HEAD alınamıyor"
-
-#: diff-lib.c:587
-msgid "no merge base found"
-msgstr "bir birleştirme temeli bulunamadı"
-
-#: diff-lib.c:589
-msgid "multiple merge bases found"
-msgstr "birden çok birleştirme temeli bulundu"
-
-#: diff-no-index.c:237
-msgid "git diff --no-index [<options>] <path> <path>"
-msgstr "git diff --no-index [<seçenekler>] <yol> <yol>"
-
-#: diff-no-index.c:262
-msgid ""
-"Not a git repository. Use --no-index to compare two paths outside a working "
-"tree"
-msgstr ""
-"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:159
-#, 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:164
-#, c-format
-msgid "  Unknown dirstat parameter '%s'\n"
-msgstr "  Bilinmeyen dirstat parametresi '%s'\n"
-
-#: diff.c:300
-msgid ""
-"color moved setting must be one of 'no', 'default', 'blocks', 'zebra', "
-"'dimmed-zebra', 'plain'"
-msgstr ""
-"\"color-moved\" ayarı 'no', 'default', 'blocks', 'zebra', 'dimmed-zebra', "
-"'plain' seçeneklerinden biri olmalıdır"
-
-#: diff.c:328
-#, 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 ""
-"bilinmeyen color-moved-ws kipi '%s', olabilecek değerler: 'ignore-space-"
-"change', 'ignore-space-at-eol', 'ignore-all-space' 'allow-indentation-change'"
-
-#: diff.c:336
-msgid ""
-"color-moved-ws: allow-indentation-change cannot be combined with other "
-"whitespace modes"
-msgstr ""
-"color-moved-ws: allow-indentation-change diğer boşluk kipleri ile birlikte "
-"kullanılamaz"
-
-#: diff.c:413
-#, 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:473
-#, c-format
-msgid ""
-"Found errors in 'diff.dirstat' config variable:\n"
-"%s"
-msgstr ""
-"'diff.dirstat' yapılandırma değişkeninde hatalar bulundu:\n"
-"%s"
-
-#: diff.c:4282
-#, c-format
-msgid "external diff died, stopping at %s"
-msgstr "dış diff sonlandı, %s konumunda durdu"
-
-#: diff.c:4677 parse-options.c:1114
-#, c-format
-msgid "options '%s', '%s', '%s', and '%s' cannot be used together"
-msgstr "'%s', '%s', '%s' ve '%s' seçenekleri birlikte kullanılamaz"
-
-#: diff.c:4681 parse-options.c:1118 builtin/worktree.c:578
-#, c-format
-msgid "options '%s', '%s', and '%s' cannot be used together"
-msgstr "'%s', '%s' ve '%s' seçenekleri birlikte kullanılamaz"
-
-#: diff.c:4685
-#, c-format
-msgid "options '%s' and '%s' cannot be used together, use '%s' with '%s'"
-msgstr ""
-"'%s' ve '%s' seçenekleri birlikte kullanılamaz, '%s' seçeneğini '%s' ile "
-"kullanın"
-
-#: diff.c:4689
-#, c-format
-msgid ""
-"options '%s' and '%s' cannot be used together, use '%s' with '%s' and '%s'"
-msgstr ""
-"'%s' ve '%s' seçenekleri birlikte kullanılamaz, '%s' seçeneğini '%s' ve '%s' "
-"ile kullanın"
-
-#: diff.c:4769
-msgid "--follow requires exactly one pathspec"
-msgstr "--follow tam olarak yalnızca bir yol belirteci gerektiriyor"
-
-#: diff.c:4823
-#, c-format
-msgid "invalid --stat value: %s"
-msgstr "geçersiz --stat değeri: %s"
-
-#: diff.c:4828 diff.c:4833 diff.c:4838 diff.c:4843 diff.c:5319
-#: 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:4860
-#, c-format
-msgid ""
-"Failed to parse --dirstat/-X option parameter:\n"
-"%s"
-msgstr ""
-"--dirstat/-X seçenek parametresi ayrıştırılamadı:\n"
-"%s"
-
-#: diff.c:4893
-#, 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:4917
-#, c-format
-msgid "unknown value after ws-error-highlight=%.*s"
-msgstr "şundan sonra bilinmeyen değer: ws-error-highlight=%.*s"
-
-#: diff.c:4931
-#, c-format
-msgid "unable to resolve '%s'"
-msgstr "'%s' çözülemiyor"
-
-#: diff.c:4981 diff.c:4987
-#, c-format
-msgid "%s expects <n>/<m> form"
-msgstr "%s <n>/<m> biçimi bekliyor"
-
-#: diff.c:4999
-#, c-format
-msgid "%s expects a character, got '%s'"
-msgstr "%s bir karakter bekliyor, '%s' aldı"
-
-#: diff.c:5020
-#, c-format
-msgid "bad --color-moved argument: %s"
-msgstr "hatalı --color-moved argümanı: %s"
-
-#: diff.c:5039
-#, c-format
-msgid "invalid mode '%s' in --color-moved-ws"
-msgstr "--color-moved-ws içinde geçersiz kip '%s'"
-
-#: diff.c:5079
-msgid ""
-"option diff-algorithm accepts \"myers\", \"minimal\", \"patience\" and "
-"\"histogram\""
-msgstr ""
-"diff-algorithm seçeneği şunları kabul eder: \"myers\", \"minimal\", "
-"\"patience\" ve \"histogram\""
-
-#: diff.c:5115 diff.c:5135
-#, c-format
-msgid "invalid argument to %s"
-msgstr "%s için geçersiz argüman"
-
-#: diff.c:5239
-#, c-format
-msgid "invalid regex given to -I: '%s'"
-msgstr "-I'ya geçersiz düzenli ifade verildi: '%s'"
-
-#: diff.c:5288
-#, c-format
-msgid "failed to parse --submodule option parameter: '%s'"
-msgstr "--submodule seçenek parametresi ayrıştırılamadı: '%s'"
-
-#: diff.c:5344
-#, c-format
-msgid "bad --word-diff argument: %s"
-msgstr "hatalı --word-diff argümanı: %s"
-
-#: diff.c:5380
-msgid "Diff output format options"
-msgstr "Diff çıktısı biçimlendirme seçenekleri"
-
-#: diff.c:5382 diff.c:5388
-msgid "generate patch"
-msgstr "yama oluştur"
-
-#: diff.c:5385 builtin/log.c:180
-msgid "suppress diff output"
-msgstr "diff çıktısını gizle"
-
-#: diff.c:5390 diff.c:5504 diff.c:5511
-msgid "<n>"
-msgstr "<n>"
-
-#: diff.c:5391 diff.c:5394
-msgid "generate diffs with <n> lines context"
-msgstr "diff'leri <n> satır bağlamlı oluştur"
-
-#: diff.c:5396
-msgid "generate the diff in raw format"
-msgstr "diff'i ham biçimde oluştur"
-
-#: diff.c:5399
-msgid "synonym for '-p --raw'"
-msgstr "'-p --raw eşanlamlısı"
-
-#: diff.c:5403
-msgid "synonym for '-p --stat'"
-msgstr "'-p --stat eşanlamlısı"
-
-#: diff.c:5407
-msgid "machine friendly --stat"
-msgstr "makinede okunabilen --stat"
-
-#: diff.c:5410
-msgid "output only the last line of --stat"
-msgstr "--stat'ın yalnızca son satırını çıktı ver"
-
-#: diff.c:5412 diff.c:5420
-msgid "<param1,param2>..."
-msgstr "<param1,param2>..."
-
-#: diff.c:5413
-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:5417
-msgid "synonym for --dirstat=cumulative"
-msgstr "--dirstat=cumulative eşanlamlısı"
-
-#: diff.c:5421
-msgid "synonym for --dirstat=files,param1,param2..."
-msgstr "--dirstat=files,param1,param2... eşanlamlısı"
-
-#: diff.c:5425
-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:5428
-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:5431
-msgid "show only names of changed files"
-msgstr "yalnızca değiştirilen dosyaların adlarını göster"
-
-#: diff.c:5434
-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:5436
-msgid "<width>[,<name-width>[,<count>]]"
-msgstr "<genişlik>[,<ad-genişlik>[,<sayım>]]"
-
-#: diff.c:5437
-msgid "generate diffstat"
-msgstr "diffstat oluştur"
-
-#: diff.c:5439 diff.c:5442 diff.c:5445
-msgid "<width>"
-msgstr "<genişlik>"
-
-#: diff.c:5440
-msgid "generate diffstat with a given width"
-msgstr "diffstat'ı verilmiş bir genişlik ile oluştur"
-
-#: diff.c:5443
-msgid "generate diffstat with a given name width"
-msgstr "diffstat'ı verilmiş bir ad genişliği ile oluştur"
-
-#: diff.c:5446
-msgid "generate diffstat with a given graph width"
-msgstr "diffstat'ı verilmiş bir grafik genişliği ile oluştur"
-
-#: diff.c:5448
-msgid "<count>"
-msgstr "<sayım>"
-
-#: diff.c:5449
-msgid "generate diffstat with limited lines"
-msgstr "diffstat'ı kısıtlı satırlarla oluştur"
-
-#: diff.c:5452
-msgid "generate compact summary in diffstat"
-msgstr "diffstat içinde ufak özet oluştur"
-
-#: diff.c:5455
-msgid "output a binary diff that can be applied"
-msgstr "uygulanabilir bir ikili diff çıktısı ver"
-
-#: diff.c:5458
-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:5460
-msgid "show colored diff"
-msgstr "renkli diff göster"
-
-#: diff.c:5461
-msgid "<kind>"
-msgstr "<çeşit>"
-
-#: diff.c:5462
-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:5465
-msgid ""
-"do not munge pathnames and use NULs as output field terminators in --raw or "
-"--numstat"
-msgstr ""
-"--raw veya --numstat içinde yol adlarını tahrip etme ve çıktı alanı "
-"sonlandırıcıları olarak NUL'ları kullan"
-
-#: diff.c:5468 diff.c:5471 diff.c:5474 diff.c:5583
-msgid "<prefix>"
-msgstr "<önek>"
-
-#: diff.c:5469
-msgid "show the given source prefix instead of \"a/\""
-msgstr "\"a/\" yerine verilmiş kaynak önekini göster"
-
-#: diff.c:5472
-msgid "show the given destination prefix instead of \"b/\""
-msgstr "\"b/\"yerine verilmiş kaynak önekini göster"
-
-#: diff.c:5475
-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:5478
-msgid "do not show any source or destination prefix"
-msgstr "hiçbir kaynak ve hedef önekini gösterme"
-
-#: diff.c:5481
-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:5485 diff.c:5490 diff.c:5495
-msgid "<char>"
-msgstr "<karakter>"
-
-#: diff.c:5486
-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:5491
-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:5496
-msgid "specify the character to indicate a context instead of ' '"
-msgstr "bağlam belirtmek için ' ' yerine kullanılacak karakteri belirle"
-
-#: diff.c:5499
-msgid "Diff rename options"
-msgstr "Diff yeniden adlandırma seçenekleri"
-
-#: diff.c:5500
-msgid "<n>[/<m>]"
-msgstr "<n>[/<m>]"
-
-#: diff.c:5501
-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:5505
-msgid "detect renames"
-msgstr "yeniden adlandırmaları algıla"
-
-#: diff.c:5509
-msgid "omit the preimage for deletes"
-msgstr "silmeler için öngörüntüyü atla"
-
-#: diff.c:5512
-msgid "detect copies"
-msgstr "kopyaları algıla"
-
-#: diff.c:5516
-msgid "use unmodified files as source to find copies"
-msgstr "değiştirilmemiş dosyaları kopyaları bulmak için kaynak olarak kullan"
-
-#: diff.c:5518
-msgid "disable rename detection"
-msgstr "yeniden adlandırma algılamasını devre dışı bırak"
-
-#: diff.c:5521
-msgid "use empty blobs as rename source"
-msgstr "boş ikili nesneleri yeniden adlandırma kaynağı olarak kullan"
-
-#: diff.c:5523
-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:5526
-msgid ""
-"prevent rename/copy detection if the number of rename/copy targets exceeds "
-"given limit"
-msgstr ""
-"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:5528
-msgid "Diff algorithm options"
-msgstr "Diff algoritma seçenekleri"
-
-#: diff.c:5530
-msgid "produce the smallest possible diff"
-msgstr "olabilecek en küçük diff'i üret"
-
-#: diff.c:5533
-msgid "ignore whitespace when comparing lines"
-msgstr "satırları karşılaştırırken boşlukları yok say"
-
-#: diff.c:5536
-msgid "ignore changes in amount of whitespace"
-msgstr "boşluk sayısındaki değişiklikleri yok say"
-
-#: diff.c:5539
-msgid "ignore changes in whitespace at EOL"
-msgstr "satır sonundaki boşluk değişikliklerini yok say"
-
-#: diff.c:5542
-msgid "ignore carrier-return at the end of line"
-msgstr "satır sonundaki satırbaşı karakterini yok say"
-
-#: diff.c:5545
-msgid "ignore changes whose lines are all blank"
-msgstr "satırlarının tümü boş olan değişiklikleri yok say"
-
-#: diff.c:5547 diff.c:5569 diff.c:5572 diff.c:5617
-msgid "<regex>"
-msgstr "<ifade>"
-
-#: diff.c:5548
-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:5551
-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:5554
-msgid "generate diff using the \"patience diff\" algorithm"
-msgstr "diff'i \"patience diff\" algoritmasını kullanarak oluştur"
-
-#: diff.c:5558
-msgid "generate diff using the \"histogram diff\" algorithm"
-msgstr "diff'i \"histogram diff\" algoritmasını kullanarak oluştur"
-
-#: diff.c:5560
-msgid "<algorithm>"
-msgstr "<algoritma>"
-
-#: diff.c:5561
-msgid "choose a diff algorithm"
-msgstr "bir diff algoritması seç"
-
-#: diff.c:5563
-msgid "<text>"
-msgstr "<metin>"
-
-#: diff.c:5564
-msgid "generate diff using the \"anchored diff\" algorithm"
-msgstr "diff'i \"anchored diff\" algoritmasını kullanarak oluştur"
-
-#: diff.c:5566 diff.c:5575 diff.c:5578
-msgid "<mode>"
-msgstr "<kip>"
-
-#: diff.c:5567
-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:5570
-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:5573
-msgid "equivalent to --word-diff=color --word-diff-regex=<regex>"
-msgstr "şuna eşdeğer: --word-diff=color --word-diff-regex=<ifade>"
-
-#: diff.c:5576
-msgid "moved lines of code are colored differently"
-msgstr "taşınan kod satırları farklı renklendirilir"
-
-#: diff.c:5579
-msgid "how white spaces are ignored in --color-moved"
-msgstr "boşluklar --color-moved içinde nasıl yok sayılır"
-
-#: diff.c:5582
-msgid "Other diff options"
-msgstr "Diğer diff seçenekleri"
-
-#: diff.c:5584
-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:5588
-msgid "treat all files as text"
-msgstr "tüm dosyaları metin olarak varsay"
-
-#: diff.c:5590
-msgid "swap two inputs, reverse the diff"
-msgstr "iki girdiyi değiştir, diff'i tersine döndür"
-
-#: diff.c:5592
-msgid "exit with 1 if there were differences, 0 otherwise"
-msgstr "ayrımlar varsa 1 ile, yoksa 0 ile çık"
-
-#: diff.c:5594
-msgid "disable all output of the program"
-msgstr "tüm program çıktısını devre dışı bırak"
-
-#: diff.c:5596
-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:5598
-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:5600
-msgid "<when>"
-msgstr "<ne-zaman>"
-
-#: diff.c:5601
-msgid "ignore changes to submodules in the diff generation"
-msgstr "diff oluştururken altmodüllere olan değişiklikleri yok say"
-
-#: diff.c:5604
-msgid "<format>"
-msgstr "<biçim>"
-
-#: diff.c:5605
-msgid "specify how differences in submodules are shown"
-msgstr "altmodüllerdeki değişikliklerin nasıl gösterileceğini belirt"
-
-#: diff.c:5609
-msgid "hide 'git add -N' entries from the index"
-msgstr "indeksten 'git add -N' girdilerini gizle"
-
-#: diff.c:5612
-msgid "treat 'git add -N' entries as real in the index"
-msgstr "indekste 'git add -N' girdilerine gerçekmiş gibi davran"
-
-#: diff.c:5614
-msgid "<string>"
-msgstr "<dizi>"
-
-#: diff.c:5615
-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:5618
-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:5621
-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:5624
-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:5627
-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:5628 diff.c:5631
-msgid "<path>"
-msgstr "<yol>"
-
-#: diff.c:5629
-msgid "show the change in the specified path first"
-msgstr "öncelikle belirtilen yoldaki değişikliği göster"
-
-#: diff.c:5632
-msgid "skip the output to the specified path"
-msgstr "belirtilen yola olan çıktıyı atla"
-
-#: diff.c:5634
-msgid "<object-id>"
-msgstr "<nesne-no>"
-
-#: diff.c:5635
-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:5637
-msgid "[(A|C|D|M|R|T|U|X|B)...[*]]"
-msgstr "[(A|C|D|M|R|T|U|X|B)...[*]]"
-
-#: diff.c:5638
-msgid "select files by diff type"
-msgstr "dosyaları diff türüne göre seç"
-
-#: diff.c:5640
-msgid "<file>"
-msgstr "<dosya>"
-
-#: diff.c:5641
-msgid "output to a specific file"
-msgstr "belirli bir dosyaya çıktıla"
-
-#: diff.c:6321
-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:6324
-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:6327
-#, c-format
-msgid ""
-"you may want to set your %s variable to at least %d and retry the command."
-msgstr ""
-"%s değişkeninizi en azından %d olarak ayarlamak ve komutu yeniden denemek "
-"isteyebilirsiniz."
-
-#: diffcore-order.c:24
-#, c-format
-msgid "failed to read orderfile '%s'"
-msgstr "orderfile '%s' okunamadı"
-
-#: diffcore-rename.c:1564
-msgid "Performing inexact rename detection"
-msgstr "Kesin olmayan yeniden adlandırma algılaması gerçekleştiriliyor"
-
-#: diffcore-rotate.c:29
-#, c-format
-msgid "No such path '%s' in the diff"
-msgstr "diff'te '%s' diye bir yol yok"
-
-#: dir.c:593
-#, c-format
-msgid "pathspec '%s' did not match any file(s) known to git"
-msgstr "yol belirteci '%s' git'in tanıdığı herhangi bir dosya ile eşleşmedi"
-
-#: dir.c:733 dir.c:762 dir.c:775
-#, c-format
-msgid "unrecognized pattern: '%s'"
-msgstr "tanımlanamayan dizgi: '%s'"
-
-#: dir.c:790 dir.c:804
-#, c-format
-msgid "unrecognized negative pattern: '%s'"
-msgstr "tanımlanamayan negatif dizgi: '%s'"
-
-#: dir.c:820
-#, c-format
-msgid "your sparse-checkout file may have issues: pattern '%s' is repeated"
-msgstr "sparse-checkout dosyanızın sorunları olabilir: '%s' dizgisi yinelenmiş"
-
-#: dir.c:828
-msgid "disabling cone pattern matching"
-msgstr "koni dizgi eşleşmesi devre dışı bırakılıyor"
-
-#: dir.c:1212
-#, c-format
-msgid "cannot use %s as an exclude file"
-msgstr "%s bir 'exclude' dosyası olarak kullanılamıyor"
-
-#: dir.c:2419
-#, c-format
-msgid "could not open directory '%s'"
-msgstr "'%s' dizini açılamadı"
-
-#: dir.c:2721
-msgid "failed to get kernel name and information"
-msgstr "çekirdek adı ve bilgisi alınamadı"
-
-#: dir.c:2846
-msgid "untracked cache is disabled on this system or location"
-msgstr "izlenmeyen önbellek bu sistemde veya konumda devre dışı bırakılmış"
-
-#: dir.c:3119
-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:3807
-#, c-format
-msgid "index file corrupt in repo %s"
-msgstr "%s deposundaki indeks dosyası hasarlı"
-
-#: dir.c:3854 dir.c:3859
-#, c-format
-msgid "could not create directories for %s"
-msgstr "%s için dizinler oluşturulamadı"
-
-#: dir.c:3888
-#, c-format
-msgid "could not migrate git directory from '%s' to '%s'"
-msgstr "git dizini '%s' konumundan '%s' konumuna göç ettirilemedi"
-
-#: editor.c:74
-#, c-format
-msgid "hint: Waiting for your editor to close the file...%c"
-msgstr "İpucu: Düzenleyicinizin dosyayı kapatması bekleniyor...%c"
-
-#: entry.c:179
-msgid "Filtering content"
-msgstr "İçerik süzülüyor"
-
-#: entry.c:500
-#, c-format
-msgid "could not stat file '%s'"
-msgstr "'%s' dosyasının bilgileri alınamadı"
-
-#: environment.c:147
-#, c-format
-msgid "bad git namespace path \"%s\""
-msgstr "hatalı git ad alanı yolu \"%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:194
-msgid "git fetch-pack: expected shallow list"
-msgstr "git fetch-pack: sığ bir liste bekleniyordu"
-
-#: fetch-pack.c:197
-msgid "git fetch-pack: expected a flush packet after shallow list"
-msgstr "git fetch-pack: sığ listeden sonra floş paketi bekleniyordu"
-
-#: fetch-pack.c:208
-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:228
-#, c-format
-msgid "git fetch-pack: expected ACK/NAK, got '%s'"
-msgstr "git fetch-pack: ACK/NAK bekleniyordu, '%s' alındı"
-
-#: fetch-pack.c:239
-msgid "unable to write to remote"
-msgstr "uzak konuma yazılamıyor"
-
-#: fetch-pack.c:397 fetch-pack.c:1460
-#, c-format
-msgid "invalid shallow line: %s"
-msgstr "geçersiz sığ satır: %s"
-
-#: fetch-pack.c:403 fetch-pack.c:1466
-#, c-format
-msgid "invalid unshallow line: %s"
-msgstr "geçersiz sığ olmayan satır: %s"
-
-#: fetch-pack.c:405 fetch-pack.c:1468
-#, c-format
-msgid "object not found: %s"
-msgstr "nesne bulunamadı: %s"
-
-#: fetch-pack.c:408 fetch-pack.c:1471
-#, c-format
-msgid "error in object: %s"
-msgstr "nesne içinde hata: %s"
-
-#: fetch-pack.c:410 fetch-pack.c:1473
-#, c-format
-msgid "no shallow found: %s"
-msgstr "sığ bulunamadı: %s"
-
-#: fetch-pack.c:413 fetch-pack.c:1477
-#, c-format
-msgid "expected shallow/unshallow, got %s"
-msgstr "sığ/sığ olmayan bekleniyordu, %s alındı"
-
-#: fetch-pack.c:453
-#, c-format
-msgid "got %s %d %s"
-msgstr "%s %d %s alındı"
-
-#: fetch-pack.c:470
-#, c-format
-msgid "invalid commit %s"
-msgstr "geçersiz işleme %s"
-
-#: fetch-pack.c:501
-msgid "giving up"
-msgstr "vazgeçiliyor"
-
-#: fetch-pack.c:514 progress.h:25
-msgid "done"
-msgstr "bitti"
-
-#: fetch-pack.c:526
-#, c-format
-msgid "got %s (%d) %s"
-msgstr "%s (%d) %s alındı"
-
-#: fetch-pack.c:562
-#, c-format
-msgid "Marking %s as complete"
-msgstr "%s tamam olarak imleniyor"
-
-#: fetch-pack.c:784
-#, c-format
-msgid "already have %s (%s)"
-msgstr "%s halihazırda var (%s)"
-
-#: fetch-pack.c:870
-msgid "fetch-pack: unable to fork off sideband demultiplexer"
-msgstr "fetch-pack: yanbant çoğullama çözücüsü ayrı çatallanamıyor"
-
-#: fetch-pack.c:878
-msgid "protocol error: bad pack header"
-msgstr "protokol hatası: hatalı paket üstbilgisi"
-
-#: fetch-pack.c:974
-#, c-format
-msgid "fetch-pack: unable to fork off %s"
-msgstr "fetch-pack: %s ayrı çatallanamıyor"
-
-#: fetch-pack.c:980
-msgid "fetch-pack: invalid index-pack output"
-msgstr "fetch-pack: geçersiz index-pack çıktısı"
-
-#: fetch-pack.c:997
-#, c-format
-msgid "%s failed"
-msgstr "%s başarısız oldu"
-
-#: fetch-pack.c:999
-msgid "error in sideband demultiplexer"
-msgstr "yanbant çoğullama çözücüsünde hata"
-
-#: fetch-pack.c:1048
-#, c-format
-msgid "Server version is %.*s"
-msgstr "Sunucu sürümü %.*s"
-
-#: fetch-pack.c:1056 fetch-pack.c:1062 fetch-pack.c:1065 fetch-pack.c:1071
-#: fetch-pack.c:1075 fetch-pack.c:1079 fetch-pack.c:1083 fetch-pack.c:1087
-#: fetch-pack.c:1091 fetch-pack.c:1095 fetch-pack.c:1099 fetch-pack.c:1103
-#: fetch-pack.c:1109 fetch-pack.c:1115 fetch-pack.c:1120 fetch-pack.c:1125
-#, c-format
-msgid "Server supports %s"
-msgstr "Sunucu %s destekliyor"
-
-#: fetch-pack.c:1058
-msgid "Server does not support shallow clients"
-msgstr "Sunucu sığ istemcileri desteklemiyor"
-
-#: fetch-pack.c:1118
-msgid "Server does not support --shallow-since"
-msgstr "Sunucu --shallow-since desteklemiyor"
-
-#: fetch-pack.c:1123
-msgid "Server does not support --shallow-exclude"
-msgstr "Sunucu --shallow-exclude desteklemiyor"
-
-#: fetch-pack.c:1127
-msgid "Server does not support --deepen"
-msgstr "Sunucu --deepen desteklemiyor"
-
-#: fetch-pack.c:1129
-msgid "Server does not support this repository's object format"
-msgstr "Sunucu bu deponun nesne türünü desteklemiyor"
-
-#: fetch-pack.c:1142
-msgid "no common commits"
-msgstr "ortak işleme yok"
-
-#: fetch-pack.c:1151 fetch-pack.c:1506 builtin/clone.c:1166
-msgid "source repository is shallow, reject to clone."
-msgstr "kaynak depo sığ, klonlama için reddet."
-
-#: fetch-pack.c:1157 fetch-pack.c:1705
-msgid "git fetch-pack: fetch failed."
-msgstr "git fetch-pack: Getirme başarısız."
-
-#: fetch-pack.c:1271
-#, c-format
-msgid "mismatched algorithms: client %s; server %s"
-msgstr "eşleşmeyen algoritmalar: İstemci %s; sunucu %s"
-
-#: fetch-pack.c:1275
-#, c-format
-msgid "the server does not support algorithm '%s'"
-msgstr "sunucu '%s' algoritmasını desteklemiyor"
-
-#: fetch-pack.c:1308
-msgid "Server does not support shallow requests"
-msgstr "Sunucu sığ istekleri desteklemiyor"
-
-#: fetch-pack.c:1315
-msgid "Server supports filter"
-msgstr "Sunucu süzgeç destekliyor"
-
-#: fetch-pack.c:1358 fetch-pack.c:2087
-msgid "unable to write request to remote"
-msgstr "uzak konuma istek yazılamıyor"
-
-#: fetch-pack.c:1376
-#, c-format
-msgid "error reading section header '%s'"
-msgstr "bölüm üstbilgisi '%s' okunurken hata"
-
-#: fetch-pack.c:1382
-#, c-format
-msgid "expected '%s', received '%s'"
-msgstr "'%s' bekleniyordu, '%s' alındı"
-
-#: fetch-pack.c:1416
-#, c-format
-msgid "unexpected acknowledgment line: '%s'"
-msgstr "beklenmedik alındı satırı: '%s'"
-
-#: fetch-pack.c:1421
-#, c-format
-msgid "error processing acks: %d"
-msgstr "alındılar işlenirken hata: %d"
-
-#. TRANSLATORS: The parameter will be 'ready', a protocol
-#. keyword.
-#.
-#: fetch-pack.c:1435
-#, c-format
-msgid "expected packfile to be sent after '%s'"
-msgstr "paket dosyasının '%s' ögesinden sonra gönderilmesi bekleniyordu"
-
-#. TRANSLATORS: The parameter will be 'ready', a protocol
-#. keyword.
-#.
-#: fetch-pack.c:1441
-#, c-format
-msgid "expected no other sections to be sent after no '%s'"
-msgstr "'%s' \"yok\" iken başka hiçbir bölümün gönderilmemesi bekleniyordu"
-
-#: fetch-pack.c:1482
-#, c-format
-msgid "error processing shallow info: %d"
-msgstr "sığ bilgi işlenirken hata: %d"
-
-#: fetch-pack.c:1531
-#, c-format
-msgid "expected wanted-ref, got '%s'"
-msgstr "wanted-ref bekleniyordu, '%s' alındı"
-
-#: fetch-pack.c:1536
-#, c-format
-msgid "unexpected wanted-ref: '%s'"
-msgstr "beklenmedik wanted-ref: '%s'"
-
-#: fetch-pack.c:1541
-#, c-format
-msgid "error processing wanted refs: %d"
-msgstr "aranan başvurular işlenirken hata: %d"
-
-#: fetch-pack.c:1571
-msgid "git fetch-pack: expected response end packet"
-msgstr "git fetch-pack: yanıt sonu paketi bekleniyordu"
-
-#: fetch-pack.c:1983
-msgid "no matching remote head"
-msgstr "eşleşen uzak dal ucu yok"
-
-#: fetch-pack.c:2006 builtin/clone.c:587
-msgid "remote did not send all necessary objects"
-msgstr "uzak konum gereken tüm nesneleri göndermedi"
-
-#: fetch-pack.c:2109
-msgid "unexpected 'ready' from remote"
-msgstr "uzak konumdan beklenmedik 'ready'"
-
-#: fetch-pack.c:2132
-#, c-format
-msgid "no such remote ref %s"
-msgstr "böyle bir uzak başvuru yok: %s"
-
-#: fetch-pack.c:2135
-#, 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"
-
-#: fsmonitor-ipc.c:119
-#, c-format
-msgid "fsmonitor_ipc__send_query: invalid path '%s'"
-msgstr "fsmonitor_ipc__send_query: geçersiz yol '%s'"
-
-#: fsmonitor-ipc.c:125
-#, c-format
-msgid "fsmonitor_ipc__send_query: unspecified error on '%s'"
-msgstr "fsmonitor_ipc__send_query: '%s' üzerinde belirtilmemiş hata"
-
-#: fsmonitor-ipc.c:155
-msgid "fsmonitor--daemon is not running"
-msgstr "fsmonitor--daemon çalışmıyor"
-
-#: fsmonitor-ipc.c:164
-#, c-format
-msgid "could not send '%s' command to fsmonitor--daemon"
-msgstr "fsmonitor--daemon'a '%s' komutu gönderilemedi"
-
-#: gpg-interface.c:329 gpg-interface.c:456 gpg-interface.c:995
-#: gpg-interface.c:1011
-msgid "could not create temporary file"
-msgstr "geçici dosya oluşturulamadı"
-
-#: gpg-interface.c:332 gpg-interface.c:459
-#, c-format
-msgid "failed writing detached signature to '%s'"
-msgstr "şuna ayrık imza yazılamadı: '%s'"
-
-#: gpg-interface.c:450
-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:479
-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:550
-#, 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:638
-#, c-format
-msgid "bad/incompatible signature '%s'"
-msgstr "hatalı/uyumsuz imza '%s'"
-
-#: gpg-interface.c:815 gpg-interface.c:820
-#, 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:843
-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:865
-#, 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:871
-#, c-format
-msgid "gpg.ssh.defaultKeyCommand failed: %s %s"
-msgstr "gpg.ssh.defaultKeyCommand başarısız oldu: %s %s"
-
-#: gpg-interface.c:966
-msgid "gpg failed to sign the data"
-msgstr "gpg veriyi imzalayamadı"
-
-#: gpg-interface.c:988
-msgid "user.signingkey needs to be set for ssh signing"
-msgstr "user.signingkey'in ssh imzalaması için ayarlanması gerekiyor"
-
-#: gpg-interface.c:999
-#, c-format
-msgid "failed writing ssh signing key to '%s'"
-msgstr "ssh imzalama anahtarı '%s' konumuna yazılamadı"
-
-#: gpg-interface.c:1017
-#, c-format
-msgid "failed writing ssh signing key buffer to '%s'"
-msgstr "ssh imzalama anahtarı arabelleği '%s' konumuna yazılamadı"
-
-#: gpg-interface.c:1035
-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:1047
-#, 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:446
-msgid ""
-"given pattern contains NULL byte (via -f <file>). This is only supported "
-"with -P under PCRE v2"
-msgstr ""
-"verilen dizgi NULL baytı içeriyor (-f <dosya> aracılığıyla). Bu yalnızca "
-"PCRE v2 altında -P ile desteklenir"
-
-#: grep.c:1859
-#, c-format
-msgid "'%s': unable to read %s"
-msgstr "'%s': %s okunamıyor"
-
-#: grep.c:1876 setup.c:178 builtin/clone.c:308 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:1887
-#, c-format
-msgid "'%s': short read"
-msgstr "'%s': kısa okuma"
-
-#: help.c:25
-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:26
-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:27
-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:28
-msgid "grow, mark and tweak your common history"
-msgstr "ortak geçmişinizi büyütün, imleyin ve geliştirin"
-
-#: help.c:29
-msgid "collaborate (see also: git help workflows)"
-msgstr "birlikte çalışın (ayrıca bkz: git help workflows)"
-
-#: help.c:33
-msgid "Main Porcelain Commands"
-msgstr "Ana Komutlar"
-
-#: help.c:34
-msgid "Ancillary Commands / Manipulators"
-msgstr "Yan Komutlar / Yönlendiriciler"
-
-#: help.c:35
-msgid "Ancillary Commands / Interrogators"
-msgstr "Yan Komutlar / Sorgucular"
-
-#: help.c:36
-msgid "Interacting with Others"
-msgstr "Başkaları ile Etkileşim"
-
-#: help.c:37
-msgid "Low-level Commands / Manipulators"
-msgstr "Düşük Düzeyli Komutlar / Yönlendiriciler"
-
-#: help.c:38
-msgid "Low-level Commands / Interrogators"
-msgstr "Düşük Düzeyli Komutlar / Sorgucular"
-
-#: help.c:39
-msgid "Low-level Commands / Syncing Repositories"
-msgstr "Düşük Düzeyli Komutlar / Depo Eşitleme"
-
-#: help.c:40
-msgid "Low-level Commands / Internal Helpers"
-msgstr "Düşük Düzeyli Komutlar / İç Yardımcılar"
-
-#: help.c:316
-#, c-format
-msgid "available git commands in '%s'"
-msgstr "'%s' içindeki kullanılabilir git komutları"
-
-#: help.c:323
-msgid "git commands available from elsewhere on your $PATH"
-msgstr "$PATH içindeki başka yerlerden kullanılabilen git komutları"
-
-#: help.c:332
-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:382 git.c:100
-#, c-format
-msgid "unsupported command listing type '%s'"
-msgstr "desteklenmeyen komut listeleme türü '%s'"
-
-#: help.c:422
-msgid "The Git concept guides are:"
-msgstr "Git konsept kılavuzları şunlardır:"
-
-#: help.c:446
-msgid "External commands"
-msgstr "Dış komutlar"
-
-#: help.c:468
-msgid "Command aliases"
-msgstr "Komut armaları"
-
-#: help.c:486
-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:563
-#, c-format
-msgid ""
-"'%s' appears to be a git command, but we were not\n"
-"able to execute it. Maybe git-%s is broken?"
-msgstr ""
-"'%s' bir git komutu gibi görünüyor; ancak biz onu\n"
-"çalıştıramadık. git-%s bozuk olabilir mi?"
-
-#: help.c:585 help.c:682
-#, 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:633
-msgid "Uh oh. Your system reports no Git commands at all."
-msgstr "Tüh. Sisteminiz hiçbir Git komutu bildirmiyor."
-
-#: help.c:655
-#, 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:660
-#, 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:666
-#, c-format
-msgid "Run '%s' instead [y/N]? "
-msgstr "Bunun yerine '%s' çalıştırılsın mı? (y/N)? "
-
-#: help.c:674
-#, 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:686
-msgid ""
-"\n"
-"The most similar command is"
-msgid_plural ""
-"\n"
-"The most similar commands are"
-msgstr[0] ""
-"\n"
-"Buna en yakın komut:"
-msgstr[1] ""
-"\n"
-"Buna en yakın komutlar:"
-
-#: help.c:729
-msgid "git version [<options>]"
-msgstr "git version [<seçenekler>]"
-
-#: help.c:784
-#, c-format
-msgid "%s: %s - %s"
-msgstr "%s: %s - %s"
-
-#: help.c:788
-msgid ""
-"\n"
-"Did you mean this?"
-msgid_plural ""
-"\n"
-"Did you mean one of these?"
-msgstr[0] ""
-"\n"
-"Şunu mu demek istediniz?"
-msgstr[1] ""
-"\n"
-"Şunlardan birini mi demek istediniz?"
-
-#: hook.c:28
-#, 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."
-
-#: hook.c:87
-#, c-format
-msgid "Couldn't start hook '%s'\n"
-msgstr "'%s' kancası başlatılamadı\n"
-
-#: ident.c:354
-msgid "Author identity unknown\n"
-msgstr "Yazar kimliği bilinmiyor\n"
-
-#: ident.c:357
-msgid "Committer identity unknown\n"
-msgstr "İşleyici kimliği bilinmiyor\n"
-
-#: ident.c:363
-msgid ""
-"\n"
-"*** Please tell me who you are.\n"
-"\n"
-"Run\n"
-"\n"
-"  git config --global user.email \"you@example.com\"\n"
-"  git config --global user.name \"Your Name\"\n"
-"\n"
-"to set your account's default identity.\n"
-"Omit --global to set the identity only in this repository.\n"
-"\n"
-msgstr ""
-"\n"
-"*** Lütfen bana kim olduğunuzu söyleyin.\n"
-"\n"
-"Hesabınızın öntanımlı kimliğini ayarlamak için\n"
-"\n"
-"\tgit config --global user.name \"Adınız\"\n"
-"\tgit config --global user.email \"siz@e-posta.com\"\n"
-"\n"
-"komutlarını çalıştırın.\n"
-"Kimliğinizi yalnızca bu depo için geçerli kılmak isterseniz --global\n"
-"değişkenini kullanmayın.\n"
-"\n"
-
-#: ident.c:398
-msgid "no email was given and auto-detection is disabled"
-msgstr "bir e-posta verilmedi ve kendiliğinden algılama devre dışı"
-
-#: ident.c:403
-#, c-format
-msgid "unable to auto-detect email address (got '%s')"
-msgstr "e-posta adresi kendiliğinden algılanamıyor ('%s' alındı)"
-
-#: ident.c:420
-msgid "no name was given and auto-detection is disabled"
-msgstr "bir ad verilmedi ve kendiliğinden algılama devre dışı"
-
-#: ident.c:426
-#, c-format
-msgid "unable to auto-detect name (got '%s')"
-msgstr "ad kendiliğinden algılanamıyor ('%s' alındı)"
-
-#: ident.c:434
-#, c-format
-msgid "empty ident name (for <%s>) not allowed"
-msgstr "boş tanımlayıcı adına (<%s> için) izin verilmiyor"
-
-#: ident.c:440
-#, c-format
-msgid "name consists only of disallowed characters: %s"
-msgstr "ad yalnızca izin verilmeyen karakterlerden oluşuyor: %s"
-
-#: ident.c:455 builtin/commit.c:649
-#, c-format
-msgid "invalid date format: %s"
-msgstr "geçersiz tarih biçimi: %s"
-
-#: list-objects-filter-options.c:68
-msgid "expected 'tree:<depth>'"
-msgstr "'tree:<derinlik>' bekleniyordu"
-
-#: list-objects-filter-options.c:83
-msgid "sparse:path filters support has been dropped"
-msgstr "sparse:path süzgeçleri desteği artık yok"
-
-#: list-objects-filter-options.c:90
-#, c-format
-msgid "'%s' for 'object:type=<type>' is not a valid object type"
-msgstr "'object:type=<tür>' için '%s' geçerli bir nesne türü değil"
-
-#: list-objects-filter-options.c:109
-#, c-format
-msgid "invalid filter-spec '%s'"
-msgstr "geçersiz filter-spec '%s'"
-
-#: list-objects-filter-options.c:125
-#, c-format
-msgid "must escape char in sub-filter-spec: '%c'"
-msgstr "sub-filter-spec içinde kaçış karakteri olmalı: '%c'"
-
-#: list-objects-filter-options.c:167
-msgid "expected something after combine:"
-msgstr "birlikte kullanımdan sonra bir şeyler bekleniyordu:"
-
-#: list-objects-filter-options.c:249
-msgid "multiple filter-specs cannot be combined"
-msgstr "çoklu filter-specs birlikte kullanılamaz"
-
-#: list-objects-filter-options.c:365
-msgid "unable to upgrade repository format to support partial clone"
-msgstr "depo biçimi kısımsal klonları desteklemesi için yükseltilemiyor"
-
-#: list-objects-filter.c:532
-#, c-format
-msgid "unable to access sparse blob in '%s'"
-msgstr "'%s' içindeki aralıklı ikili nesneye erişilemiyor"
-
-#: list-objects-filter.c:535
-#, c-format
-msgid "unable to parse sparse filter data in %s"
-msgstr "%s içindeki aralıklı süzgeç verisi ayrıştırılamıyor"
-
-#: list-objects.c:144
-#, c-format
-msgid "entry '%s' in tree %s has tree mode, but is not a tree"
-msgstr "'%s' girdisi (%s ağacında) ağaç kipine iye; ancak bir ağaç değil"
-
-#: list-objects.c:157
-#, c-format
-msgid "entry '%s' in tree %s has blob mode, but is not a blob"
-msgstr ""
-"'%s' girdisi (%s ağacında) ikili nesne kipine iye; ancak bir ikili nesne "
-"değil"
-
-#: list-objects.c:415
-#, c-format
-msgid "unable to load root tree for commit %s"
-msgstr "%s işlemesi için kök ağacı yüklenemiyor"
-
-#: lockfile.c:152
-#, c-format
-msgid ""
-"Unable to create '%s.lock': %s.\n"
-"\n"
-"Another git process seems to be running in this repository, e.g.\n"
-"an editor opened by 'git commit'. Please make sure all processes\n"
-"are terminated then try again. If it still fails, a git process\n"
-"may have crashed in this repository earlier:\n"
-"remove the file manually to continue."
-msgstr ""
-"'%s.lock' oluşturulamıyor: %s.\n"
-"\n"
-"Bu depoda başka bir git işlemi çalışıyor gibi görünüyor, örneğin\n"
-"'git commit' kullanılarak açılmış bir düzenleyici. Lütfen tüm işlemlerin\n"
-"sonlandırıldığından emin olun ve yeniden deneyin. Eğer hâlâ başarısız\n"
-"oluyorsa bir git işlemi bu depo içinde daha önceden çakılmış olabilir:\n"
-"Sürdürmek için dosyayı el ile kaldırın."
-
-#: lockfile.c:160
-#, c-format
-msgid "Unable to create '%s.lock': %s"
-msgstr "'%s.lock' oluşturulamıyor: %s"
-
-#: ls-refs.c:175
-#, c-format
-msgid "unexpected line: '%s'"
-msgstr "beklenmedik satır: '%s'"
-
-#: ls-refs.c:179
-msgid "expected flush after ls-refs arguments"
-msgstr "ls-refs argümanlarından sonra floş bekleniyordu"
-
-#: mailinfo.c:1050
-msgid "quoted CRLF detected"
-msgstr "alıntılanmış CRLF algılandı"
-
-#: mailinfo.c:1254 builtin/am.c:185 builtin/mailinfo.c:46
-#, c-format
-msgid "bad action '%s' for '%s'"
-msgstr "hatalı eylem '%s', '%s' için"
-
-#: merge-ort.c:1630 merge-recursive.c:1214
-#, c-format
-msgid "Failed to merge submodule %s (not checked out)"
-msgstr "%s altmodülü birleştirilemedi (çıkış yapılmadı)"
-
-#: merge-ort.c:1639 merge-recursive.c:1221
-#, 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:1648 merge-recursive.c:1228
-#, 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:1658 merge-ort.c:1666
-#, 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:1688
-#, c-format
-msgid "Failed to merge submodule %s"
-msgstr "'%s' altmodülü birleştirilemedi"
-
-#: merge-ort.c:1695
-#, c-format
-msgid ""
-"Failed to merge submodule %s, but a possible merge resolution exists:\n"
-"%s\n"
-msgstr ""
-"%s altmodülü birleştirilemedi; ancak olası bir birleştirme çözümü mevcut:\n"
-"%s\n"
-
-#: merge-ort.c:1699 merge-recursive.c:1284
-#, c-format
-msgid ""
-"If this is correct simply add it to the index for example\n"
-"by using:\n"
-"\n"
-"  git update-index --cacheinfo 160000 %s \"%s\"\n"
-"\n"
-"which will accept this suggestion.\n"
-msgstr ""
-"Eğer bu doğruysa yalnızca indekse ekleyin, örneğin:\n"
-"\n"
-"\tgit update-index --cacheinfo 160000 %s \"%s\"\n"
-"\n"
-"komutu bu öneriyi kabul edecektir.\n"
-
-#: merge-ort.c:1712
-#, c-format
-msgid ""
-"Failed to merge submodule %s, but multiple possible merges exist:\n"
-"%s"
-msgstr ""
-"%s altmodülü birleştirilemedi; ancak birden çok olası birleştirmeler "
-"mevcut:\n"
-"%s"
-
-#: merge-ort.c:1937 merge-recursive.c:1375
-msgid "Failed to execute internal merge"
-msgstr "İç birleştirme çalıştırılamadı"
-
-#: merge-ort.c:1942 merge-recursive.c:1380
-#, c-format
-msgid "Unable to add %s to database"
-msgstr "%s veritabanına eklenemedi"
-
-#: merge-ort.c:1949 merge-recursive.c:1413
-#, c-format
-msgid "Auto-merging %s"
-msgstr "%s kendiliğinden birleştiriliyor"
-
-#: merge-ort.c:2088 merge-recursive.c:2135
-#, 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 ""
-"ÇAKIŞMA (örtülü dizin yeniden adlandırma): %s konumundaki mevcut dosya/dizin "
-"örtülü yeniden adlandırmanın aşağıdaki yolları oraya koymasına engel oluyor: "
-"%s."
-
-#: merge-ort.c:2098 merge-recursive.c:2145
-#, 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 ""
-"ÇAKIŞMA (örtülü dizin yeniden adlandırma): %s için birden çok yol "
-"eşlemlenemiyor; örtülü dizin yeniden adlandırmaları aşağıdaki yolları oraya "
-"koymayı denedi: %s."
-
-#: merge-ort.c:2156
-#, c-format
-msgid ""
-"CONFLICT (directory rename split): Unclear where to rename %s to; it was "
-"renamed to multiple other directories, with no destination getting a "
-"majority of the files."
-msgstr ""
-"ÇAKIŞMA: (dizin yeniden adlandırma ayrılması): %s ögesinin nereye yeniden "
-"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:2310 merge-recursive.c:2481
-#, c-format
-msgid ""
-"WARNING: Avoiding applying %s -> %s rename to %s, because %s itself was "
-"renamed."
-msgstr ""
-"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:2450 merge-recursive.c:3264
-#, c-format
-msgid ""
-"Path updated: %s added in %s inside a directory that was renamed in %s; "
-"moving it to %s."
-msgstr ""
-"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:2457 merge-recursive.c:3271
-#, c-format
-msgid ""
-"Path updated: %s renamed to %s in %s, inside a directory that was renamed in "
-"%s; moving it to %s."
-msgstr ""
-"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:2470 merge-recursive.c:3267
-#, 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 ""
-"Ç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:2478 merge-recursive.c:3274
-#, 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 ""
-"Ç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:2634
-#, 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:2729
-#, 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."
-msgstr ""
-"ÇAKIŞMA (yeniden adlandırma çarpışması): %s -> %s yeniden adlandırmasının "
-"içerik çakışmaları var ve başka bir yolla çarpışıyor; bu iç içe geçmiş "
-"çakışma imleyicilerine neden olabilir."
-
-#: merge-ort.c:2748 merge-ort.c:2772
-#, 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:3261 merge-recursive.c:3025
-#, c-format
-msgid "cannot read object %s"
-msgstr "%s nesnesi okunamıyor"
-
-#: merge-ort.c:3264 merge-recursive.c:3028
-#, c-format
-msgid "object %s is not a blob"
-msgstr "%s nesnesi ikili bir nesne değil"
-
-#: merge-ort.c:3693
-#, c-format
-msgid ""
-"CONFLICT (file/directory): directory in the way of %s from %s; moving it to "
-"%s instead."
-msgstr ""
-"ÇAKIŞMA (dosya/dizin): Dizin, şuradan %s yolunda: %s; bunun yerine %s "
-"konumuna taşınıyor."
-
-#: merge-ort.c:3770
-#, c-format
-msgid ""
-"CONFLICT (distinct types): %s had different types on each side; renamed both "
-"of them so each can be recorded somewhere."
-msgstr ""
-"ÇAKIŞMA (belirgin türler): %s ögesinin her bir yanında değişik türler vardı; "
-"ikisi de yeniden adlandırıldı; böylelikle başka bir yerde kayıtları "
-"yazılabilir."
-
-#: merge-ort.c:3777
-#, c-format
-msgid ""
-"CONFLICT (distinct types): %s had different types on each side; renamed one "
-"of them so each can be recorded somewhere."
-msgstr ""
-"ÇAKIŞMA (belirgin türler): %s ögesinin her bir yanında değişik türler vardı; "
-"bir tanesi yeniden adlandırıldı; böylelikle her birinin başka bir yerde "
-"kayıtları yazılabilir."
-
-#: merge-ort.c:3866 merge-recursive.c:3104
-msgid "content"
-msgstr "içerik"
-
-#: merge-ort.c:3868 merge-recursive.c:3108
-msgid "add/add"
-msgstr "ekle/ekle"
-
-#: merge-ort.c:3870 merge-recursive.c:3153
-msgid "submodule"
-msgstr "altmodül"
-
-#: merge-ort.c:3872 merge-recursive.c:3154
-#, c-format
-msgid "CONFLICT (%s): Merge conflict in %s"
-msgstr "ÇAKIŞMA (%s): %s içinde birleştirme çakışması"
-
-#: merge-ort.c:3916
-#, c-format
-msgid ""
-"CONFLICT (modify/delete): %s deleted in %s and modified in %s.  Version %s "
-"of %s left in tree."
-msgstr ""
-"Ç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:4212
-#, c-format
-msgid ""
-"Note: %s not up to date and in way of checking out conflicted version; old "
-"copy renamed to %s"
-msgstr ""
-"Not: %s güncel değil ve çakışmalı sürümlerin çıkışının önünde; eski kopya %s "
-"olarak yeniden adlandırıldı."
-
-#. 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:4586
-#, 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:3723
-#, c-format
-msgid ""
-"Your local changes to the following files would be overwritten by merge:\n"
-"  %s"
-msgstr ""
-"Birleştirme ile aşağıdaki dosyalardaki yerel değişikliklerin üzerine "
-"yazılacak:\n"
-"\t%s"
-
-#: merge-ort-wrappers.c:33 merge-recursive.c:3485 builtin/merge.c:405
-msgid "Already up to date."
-msgstr "Tümü güncel."
-
-#: merge-recursive.c:353
-msgid "(bad commit)\n"
-msgstr "(hatalı işleme)\n"
-
-#: 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: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:881
-#, c-format
-msgid "failed to create path '%s'%s"
-msgstr "'%s'%s yolu oluşturulamadı"
-
-#: 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:906 merge-recursive.c:925
-msgid ": perhaps a D/F conflict?"
-msgstr ": bir D/F çakışması olabilir mi?"
-
-#: merge-recursive.c:915
-#, c-format
-msgid "refusing to lose untracked file at '%s'"
-msgstr "'%s' konumundaki izlenmeyen dosyayı kaybetme reddediliyor"
-
-#: merge-recursive.c:956 builtin/cat-file.c:47
-#, c-format
-msgid "cannot read object %s '%s'"
-msgstr "%s '%s' nesnesi okunamıyor"
-
-#: merge-recursive.c:961
-#, c-format
-msgid "blob expected for %s '%s'"
-msgstr "%s '%s' için ikili nesne bekleniyordu"
-
-#: merge-recursive.c:986
-#, c-format
-msgid "failed to open '%s': %s"
-msgstr "'%s' açılamadı: %s"
-
-#: merge-recursive.c:997
-#, c-format
-msgid "failed to symlink '%s': %s"
-msgstr "'%s' için sembolik bağ oluşturulamadı: %s"
-
-#: 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:1236 merge-recursive.c:1249
-#, 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:1239 merge-recursive.c:1252
-#, c-format
-msgid "Fast-forwarding submodule %s"
-msgstr "%s altmodülü ileri sarılıyor"
-
-#: merge-recursive.c:1276
-#, 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:1280
-#, 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:1281
-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:1293
-#, 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:1437
-#, 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:1509
-#, c-format
-msgid ""
-"CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s left "
-"in tree."
-msgstr ""
-"Ç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:1514
-#, c-format
-msgid ""
-"CONFLICT (%s/delete): %s deleted in %s and %s to %s in %s. Version %s of %s "
-"left in tree."
-msgstr ""
-"Ç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:1521
-#, c-format
-msgid ""
-"CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s left "
-"in tree at %s."
-msgstr ""
-"Ç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:1526
-#, 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 ""
-"Ç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:1561
-msgid "rename"
-msgstr "yeniden adlandır"
-
-#: merge-recursive.c:1561
-msgid "renamed"
-msgstr "yeniden adlandırıldı"
-
-#: merge-recursive.c:1612 merge-recursive.c:2518 merge-recursive.c:3181
-#, c-format
-msgid "Refusing to lose dirty file at %s"
-msgstr "%s konumundaki kirli dosyayı kaybetme reddediliyor"
-
-#: merge-recursive.c:1622
-#, 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:1680
-#, 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:1711
-#, 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:1716
-#, 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:1743
-#, c-format
-msgid ""
-"CONFLICT (rename/rename): Rename \"%s\"->\"%s\" in branch \"%s\" rename \"%s"
-"\"->\"%s\" in \"%s\"%s"
-msgstr ""
-"Ç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:1748
-msgid " (left unresolved)"
-msgstr " (çözülmeden bırakıldı)"
-
-#: merge-recursive.c:1840
-#, 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:2103
-#, c-format
-msgid ""
-"CONFLICT (directory rename split): Unclear where to place %s because "
-"directory %s was renamed to multiple other directories, with no destination "
-"getting a majority of the files."
-msgstr ""
-"ÇAKIŞMA: (dizin yeniden adlandırma ayrılması): %s ögesinin nereye "
-"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:2237
-#, c-format
-msgid ""
-"CONFLICT (rename/rename): Rename directory %s->%s in %s. Rename directory %s-"
-">%s in %s"
-msgstr ""
-"Ç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:3092
-msgid "modify"
-msgstr "değiştir"
-
-#: merge-recursive.c:3092
-msgid "modified"
-msgstr "değiştirilmiş"
-
-#: merge-recursive.c:3131
-#, c-format
-msgid "Skipped %s (merged same as existing)"
-msgstr "%s atlandı (mevcut ile aynı biçimde birleştirildi)"
-
-#: merge-recursive.c:3184
-#, c-format
-msgid "Adding as %s instead"
-msgstr "Bunun yerine %s olarak ekleniyor"
-
-#: merge-recursive.c:3388
-#, c-format
-msgid "Removing %s"
-msgstr "%s kaldırılıyor"
-
-#: merge-recursive.c:3411
-msgid "file/directory"
-msgstr "dosya/dizin"
-
-#: merge-recursive.c:3416
-msgid "directory/file"
-msgstr "dizin/dosya"
-
-#: merge-recursive.c:3423
-#, 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:3432
-#, c-format
-msgid "Adding %s"
-msgstr "%s ekleniyor"
-
-#: merge-recursive.c:3441
-#, 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:3494
-#, 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:3588
-msgid "Merging:"
-msgstr "Birleştiriliyor:"
-
-#: merge-recursive.c:3601
-#, 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:3651
-msgid "merge returned no commit"
-msgstr "birleştirme herhangi bir işleme döndürmedi"
-
-#: merge-recursive.c:3823
-#, c-format
-msgid "Could not parse object '%s'"
-msgstr "'%s' nesnesi ayrıştırılamadı"
-
-#: merge-recursive.c:3841 builtin/merge.c:720 builtin/merge.c:912
-#: builtin/stash.c:489
-msgid "Unable to write index."
-msgstr "İndeks yazılamıyor."
-
-#: merge.c:41
-msgid "failed to read the cache"
-msgstr "önbellek okunamadı"
-
-#: merge.c:102 rerere.c:705 builtin/am.c:1989 builtin/am.c:2023
-#: builtin/checkout.c:603 builtin/checkout.c:865 builtin/clone.c:714
-#: builtin/stash.c:269
-msgid "unable to write new index file"
-msgstr "yeni indeks dosyası yazılamıyor"
-
-#: midx.c:79
-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:112
-#, c-format
-msgid "multi-pack-index file %s is too small"
-msgstr "multi-pack-index dosyası %s pek küçük"
-
-#: midx.c:128
-#, 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:133
-#, c-format
-msgid "multi-pack-index version %d not recognized"
-msgstr "multi-pack-index sürümü %d tanımlanamıyor"
-
-#: midx.c:138
-#, 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:155
-msgid "multi-pack-index missing required pack-name chunk"
-msgstr "multi-pack-index'ten gerekli pack-name iri parçası eksik"
-
-#: midx.c:157
-msgid "multi-pack-index missing required OID fanout chunk"
-msgstr "multi-pack-index'ten gerekli OID fanout iri parçası eksik"
-
-#: midx.c:159
-msgid "multi-pack-index missing required OID lookup chunk"
-msgstr "multi-pack-index'ten gerekli OID arama iri parçası eksik"
-
-#: midx.c:161
-msgid "multi-pack-index missing required object offsets chunk"
-msgstr "multi-pack-index'ten gerekli nesne ofsetleri iri parçası eksik"
-
-#: midx.c:180
-#, 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:228
-#, c-format
-msgid "bad pack-int-id: %u (%u total packs)"
-msgstr "hatalı pack-int-id: %u (%u toplam paket)"
-
-#: midx.c:278
-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:509
-#, c-format
-msgid "failed to add packfile '%s'"
-msgstr "paket dosyası '%s' eklenemedi"
-
-#: midx.c:515
-#, c-format
-msgid "failed to open pack-index '%s'"
-msgstr "pack-index '%s' açılamadı"
-
-#: midx.c:583
-#, c-format
-msgid "failed to locate object %d in packfile"
-msgstr "%d nesnesi paket dosyasında bulunamadı"
-
-#: midx.c:911
-msgid "cannot store reverse index file"
-msgstr "ters indeks dosyası depolanamıyor"
-
-#: midx.c:1009
-#, c-format
-msgid "could not parse line: %s"
-msgstr "satır ayrıştırılamadı: %s"
-
-#: midx.c:1011
-#, c-format
-msgid "malformed line: %s"
-msgstr "hatalı oluşturulmuş satır: %s"
-
-#: midx.c:1181
-msgid "ignoring existing multi-pack-index; checksum mismatch"
-msgstr "mevcut multi-pack-index yok sayılıyor; sağlama toplamı uyumsuzluğu"
-
-#: midx.c:1206
-msgid "could not load pack"
-msgstr "paket yüklenemedi"
-
-#: midx.c:1212
-#, c-format
-msgid "could not open index for %s"
-msgstr "%s için indeks açılamadı"
-
-#: midx.c:1223
-msgid "Adding packfiles to multi-pack-index"
-msgstr "Paket dosyaları multi-pack-index'e ekleniyor"
-
-#: midx.c:1266
-#, c-format
-msgid "unknown preferred pack: '%s'"
-msgstr "bilinmeyen tercih edilen paket: '%s'"
-
-#: midx.c:1311
-#, c-format
-msgid "cannot select preferred pack %s with no objects"
-msgstr "yeğlenen paket %s nesnesiz seçilemiyor"
-
-#: midx.c:1343
-#, c-format
-msgid "did not see pack-file %s to drop"
-msgstr "bırakılacak pack-file %s görülmedi"
-
-#: midx.c:1389
-#, c-format
-msgid "preferred pack '%s' is expired"
-msgstr "tercih edilen '%s' paketinin süresi geçmiş"
-
-#: midx.c:1402
-msgid "no pack files to index."
-msgstr "indekslenecek paket dosyası yok."
-
-#: midx.c:1409
-msgid "refusing to write multi-pack .bitmap without any objects"
-msgstr "bir nesne olmadan multi-pack .bitmap yazımı reddediliyor"
-
-#: midx.c:1451
-msgid "could not write multi-pack bitmap"
-msgstr "çoklu paket biteşlem yazılamadı"
-
-#: midx.c:1461
-msgid "could not write multi-pack-index"
-msgstr "multi-pack-index yazılamadı"
-
-#: midx.c:1520 builtin/clean.c:37
-#, c-format
-msgid "failed to remove %s"
-msgstr "%s kaldırılamadı"
-
-#: midx.c:1553
-#, c-format
-msgid "failed to clear multi-pack-index at %s"
-msgstr "multi-pack-index %s konumunda temizlenemedi"
-
-#: midx.c:1616
-msgid "multi-pack-index file exists, but failed to parse"
-msgstr "multi-pack-index dosyası mevcut, ancak ayrıştırılamadı"
-
-#: midx.c:1624
-msgid "incorrect checksum"
-msgstr "yanlış sağlama toplamı"
-
-#: midx.c:1627
-msgid "Looking for referenced packfiles"
-msgstr "Başvurulmuş paket dosyaları aranıyor"
-
-#: midx.c:1642
-#, 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:1647
-msgid "the midx contains no oid"
-msgstr "midx bir oid içermiyor"
-
-#: midx.c:1656
-msgid "Verifying OID order in multi-pack-index"
-msgstr "multi-pack-index içindeki OID sırası doğrulanıyor"
-
-#: midx.c:1665
-#, 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:1685
-msgid "Sorting objects by packfile"
-msgstr "Nesneler paket dosyasına göre sıralanıyor"
-
-#: midx.c:1692
-msgid "Verifying object offsets"
-msgstr "Nesne ofsetleri doğrulanıyor"
-
-#: midx.c:1708
-#, 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:1714
-#, c-format
-msgid "failed to load pack-index for packfile %s"
-msgstr "paket dosyası %s için pack-index yüklenemedi"
-
-#: midx.c:1723
-#, 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:1750
-msgid "Counting referenced objects"
-msgstr "Başvurulmuş nesneler sayılıyor"
-
-#: midx.c:1760
-msgid "Finding and deleting unreferenced packfiles"
-msgstr "Başvurulmamış paket dosyaları bulunuyor ve siliniyor"
-
-#: midx.c:1952
-msgid "could not start pack-objects"
-msgstr "pack-objects başlatılamadı"
-
-#: midx.c:1972
-msgid "could not finish pack-objects"
-msgstr "pack-objects bitirilemedi"
-
-#: name-hash.c:542
-#, c-format
-msgid "unable to create lazy_dir thread: %s"
-msgstr "lazy_dir iş parçacığı oluşturulamıyor: %s"
-
-#: name-hash.c:564
-#, c-format
-msgid "unable to create lazy_name thread: %s"
-msgstr "lazy_name oluşturulamıyor: %s"
-
-#: name-hash.c:570
-#, c-format
-msgid "unable to join lazy_name thread: %s"
-msgstr "lazy_name iş parçacığı ucu birleştirilemiyor: %s"
-
-#: notes-merge.c:276
-#, 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."
-msgstr ""
-"Bir önceki not birleştirmenizi sonuçlandırmadınız (%s var).\n"
-"Lütfen başka bir not birleştirmesine başlamadan önce 'git notes merge --"
-"commit' veya 'git notes merge --abort' kullanarak bir önceki birleştirmeyi "
-"işleyin/durdurun."
-
-#: notes-merge.c:283
-#, c-format
-msgid "You have not concluded your notes merge (%s exists)."
-msgstr "Notlar birleştirmenizi sonuçlandırmadınız (%s var)."
-
-#: notes-utils.c:46
-msgid "Cannot commit uninitialized/unreferenced notes tree"
-msgstr "İlklendirilmemiş/Başvurulmamış not ağacı işlenemiyor"
-
-#: notes-utils.c:105
-#, c-format
-msgid "Bad notes.rewriteMode value: '%s'"
-msgstr "Hatalı notes.rewriteMode değeri: '%s'"
-
-#: notes-utils.c:115
-#, c-format
-msgid "Refusing to rewrite notes in %s (outside of refs/notes/)"
-msgstr "%s içindeki notları yeniden yazma reddediliyor (refs/notes/ dışında)"
-
-#. 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 "Hatalı %s değeri: '%s'"
-
-#: object-file.c:457
-#, 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:515
-#, c-format
-msgid "unable to normalize alternate object path: %s"
-msgstr "alternatif nesne yolu olağanlaştırılamıyor: %s"
-
-#: object-file.c:589
-#, 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:596
-#, c-format
-msgid "unable to normalize object directory: %s"
-msgstr "nesne dizini olağanlaştırılamıyor: %s"
-
-#: object-file.c:639
-msgid "unable to fdopen alternates lockfile"
-msgstr "alternatifler kilit dosyası fdopen yapılamıyor"
-
-#: object-file.c:657
-msgid "unable to read alternates file"
-msgstr "alternatifler dosyası okunamıyor"
-
-#: object-file.c:664
-msgid "unable to move new alternates file into place"
-msgstr "yeni alternatifler dosyası yerine taşınamıyor"
-
-#: object-file.c:742
-#, c-format
-msgid "path '%s' does not exist"
-msgstr "'%s' diye bir yol yok"
-
-#: object-file.c:763
-#, 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:769
-#, c-format
-msgid "reference repository '%s' is not a local repository."
-msgstr "Başvuru deposu '%s' yerel bir depo değil."
-
-#: object-file.c:775
-#, c-format
-msgid "reference repository '%s' is shallow"
-msgstr "başvuru deposu '%s' sığ"
-
-#: object-file.c:783
-#, c-format
-msgid "reference repository '%s' is grafted"
-msgstr "başvuru deposu '%s' aşılı"
-
-#: object-file.c:814
-#, c-format
-msgid "could not find object directory matching %s"
-msgstr "'%s' ile eşleşen nesne dizini bulunamadı"
-
-#: object-file.c:864
-#, 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:1014
-#, 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:1049
-#, c-format
-msgid "mmap failed%s"
-msgstr "mmap başarısız%s"
-
-#: object-file.c:1230
-#, c-format
-msgid "object file %s is empty"
-msgstr "nesne dosyası %s boş"
-
-#: object-file.c:1349 object-file.c:2588
-#, c-format
-msgid "corrupt loose object '%s'"
-msgstr "hasar görmüş gevşek nesne '%s'"
-
-#: object-file.c:1351 object-file.c:2592
-#, c-format
-msgid "garbage at end of loose object '%s'"
-msgstr "gevşek nesne '%s' sonunda anlamsız veri"
-
-#: object-file.c:1473
-#, c-format
-msgid "unable to parse %s header"
-msgstr "%s üstbilgisi ayrıştırılamıyor"
-
-#: object-file.c:1475
-msgid "invalid object type"
-msgstr "geçersiz nesne türü"
-
-#: object-file.c:1486
-#, c-format
-msgid "unable to unpack %s header"
-msgstr "%s üstbilgisi açılamıyor"
-
-#: object-file.c:1490
-#, c-format
-msgid "header for %s too long, exceeds %d bytes"
-msgstr "%s üstbilgisi pek uzun, %d bayt'ı aşıyor"
-
-#: object-file.c:1720
-#, c-format
-msgid "failed to read object %s"
-msgstr "%s nesnesi okunamadı"
-
-#: object-file.c:1724
-#, c-format
-msgid "replacement %s not found for %s"
-msgstr "%s yedeği %s için bulunamadı"
-
-#: object-file.c:1728
-#, 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:1732
-#, 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:1855
-#, c-format
-msgid "unable to write file %s"
-msgstr "%s dosyası yazılamıyor"
-
-#: object-file.c:1862
-#, c-format
-msgid "unable to set permission to '%s'"
-msgstr "'%s' ögesine izin ayarlanamıyor"
-
-#: object-file.c:1869
-msgid "file write error"
-msgstr "dosya yazım hatası"
-
-#: object-file.c:1904
-msgid "error when closing loose object file"
-msgstr "gevşek nesne dosyası kapatılırken hata"
-
-#: object-file.c:1971
-#, 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:1973
-msgid "unable to create temporary file"
-msgstr "geçici dosya oluşturulamıyor"
-
-#: object-file.c:1997
-msgid "unable to write loose object file"
-msgstr "gevşek nesne dosyası yazılamıyor"
-
-#: object-file.c:2003
-#, c-format
-msgid "unable to deflate new object %s (%d)"
-msgstr "yeni nesne %s söndürülemiyor (%d)"
-
-#: object-file.c:2007
-#, c-format
-msgid "deflateEnd on object %s failed (%d)"
-msgstr "%s nesnesi üzerinde deflateEnd başarısız oldu (%d)"
-
-#: object-file.c:2011
-#, 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:2022 builtin/pack-objects.c:1251
-#, c-format
-msgid "failed utime() on %s"
-msgstr "%s üzerinde utime() başarısız"
-
-#: object-file.c:2100
-#, c-format
-msgid "cannot read object for %s"
-msgstr "%s için nesne okunamıyor"
-
-#: object-file.c:2151
-msgid "corrupt commit"
-msgstr "hasar görmüş işleme"
-
-#: object-file.c:2159
-msgid "corrupt tag"
-msgstr "hasar görmüş etiket"
-
-#: object-file.c:2259
-#, c-format
-msgid "read error while indexing %s"
-msgstr "%s indekslenirken okuma hatası"
-
-#: object-file.c:2262
-#, c-format
-msgid "short read while indexing %s"
-msgstr "%s indekslenirken kısa read"
-
-#: object-file.c:2335 object-file.c:2345
-#, c-format
-msgid "%s: failed to insert into database"
-msgstr "%s: veritabanına ekleme başarısız"
-
-#: object-file.c:2351
-#, c-format
-msgid "%s: unsupported file type"
-msgstr "%s: desteklenmeyen dosya türü"
-
-#: object-file.c:2375 builtin/fetch.c:1494
-#, c-format
-msgid "%s is not a valid object"
-msgstr "%s geçerli bir nesne değil"
-
-#: object-file.c:2377
-#, c-format
-msgid "%s is not a valid '%s' object"
-msgstr "%s geçerli bir '%s' nesnesi değil"
-
-#: object-file.c:2404
-#, c-format
-msgid "unable to open %s"
-msgstr "%s açılamıyor"
-
-#: object-file.c:2599
-#, c-format
-msgid "hash mismatch for %s (expected %s)"
-msgstr "%s için sağlama uyuşmazlığı (%s bekleniyordu)"
-
-#: object-file.c:2622
-#, c-format
-msgid "unable to mmap %s"
-msgstr "%s mmap yapılamadı"
-
-#: object-file.c:2628
-#, c-format
-msgid "unable to unpack header of %s"
-msgstr "%s üstbilgisi açılamıyor"
-
-#: object-file.c:2633
-#, c-format
-msgid "unable to parse header of %s"
-msgstr "%s üstbilgisi ayrıştırılamıyor"
-
-#: object-file.c:2644
-#, c-format
-msgid "unable to unpack contents of %s"
-msgstr "%s içeriği açılamıyor"
-
-#. TRANSLATORS: This is a line of ambiguous object
-#. output shown when we cannot look up or parse the
-#. object in question. E.g. "deadbeef [bad object]".
-#.
-#: object-name.c:382
-#, c-format
-msgid "%s [bad object]"
-msgstr "%s [hatalı nesne]"
-
-#. TRANSLATORS: This is a line of ambiguous commit
-#. object output. E.g.:
-#. *
-#.    "deadbeef commit 2021-01-01 - Some Commit Message"
-#.
-#: object-name.c:407
-#, c-format
-msgid "%s commit %s - %s"
-msgstr "%s %s işlemesi - %s"
-
-#. TRANSLATORS: This is a line of ambiguous
-#. tag object output. E.g.:
-#. *
-#.    "deadbeef tag 2022-01-01 - Some Tag Message"
-#. *
-#. The second argument is the YYYY-MM-DD found
-#. in the tag.
-#. *
-#. The third argument is the "tag" string
-#. from object.c.
-#.
-#: object-name.c:428
-#, c-format
-msgid "%s tag %s - %s"
-msgstr "%s %s etiketi - %s"
-
-#. TRANSLATORS: This is a line of ambiguous
-#. tag object output where we couldn't parse
-#. the tag itself. E.g.:
-#. *
-#.    "deadbeef [bad tag, could not parse it]"
-#.
-#: object-name.c:439
-#, c-format
-msgid "%s [bad tag, could not parse it]"
-msgstr "%s [hatalı etiket, ayrıştırılamadı]"
-
-#. TRANSLATORS: This is a line of ambiguous <type>
-#. object output. E.g. "deadbeef tree".
-#.
-#: object-name.c:447
-#, c-format
-msgid "%s tree"
-msgstr "%s ağacı"
-
-#. TRANSLATORS: This is a line of ambiguous <type>
-#. object output. E.g. "deadbeef blob".
-#.
-#: object-name.c:453
-#, c-format
-msgid "%s blob"
-msgstr "%s ikili nesnesi"
-
-#: object-name.c:569
-#, c-format
-msgid "short object ID %s is ambiguous"
-msgstr "kısa nesne kimliği %s belirsiz"
-
-#. TRANSLATORS: The argument is the list of ambiguous
-#. objects composed in show_ambiguous_object(). See
-#. its "TRANSLATORS" comments for details.
-#.
-#: object-name.c:591
-#, c-format
-msgid ""
-"The candidates are:\n"
-"%s"
-msgstr ""
-"Adaylar:\n"
-"%s"
-
-#: object-name.c:888
-msgid ""
-"Git normally never creates a ref that ends with 40 hex characters\n"
-"because it will be ignored when you just specify 40-hex. These refs\n"
-"may be created by mistake. For example,\n"
-"\n"
-"  git switch -c $br $(git rev-parse ...)\n"
-"\n"
-"where \"$br\" is somehow empty and a 40-hex ref is created. Please\n"
-"examine these refs and maybe delete them. Turn this message off by\n"
-"running \"git config advice.objectNameWarning false\""
-msgstr ""
-"Git normalde hiçbir zaman 40 onaltılı karakterlerle biten bir başvuru\n"
-"oluşturmaz; çünkü 40 onaltılı bir başvuru, onu belirlediğiniz zaman yok\n"
-"sayılacaktır. Bu başvurular yanlışlıkla oluşturulmuş olabilir. Örneğin:\n"
-"\n"
-"\tgit switch -c $br $(git rev-parse ...)\n"
-"\n"
-"komutunda \"$br\" bir şekilde boş kalmış ve 40 onaltılı bir başvuru\n"
-"oluşturulmuş. Lütfen bu başvuruları inceleyin ve gerekirse silin. Bu "
-"iletiyi\n"
-"kapatmak için \"git config advice.objectNameWarning\" yapın."
-
-#: object-name.c:1008
-#, c-format
-msgid "log for '%.*s' only goes back to %s"
-msgstr "'%.*s' günlüğü yalnızca şuna geri gider: %s"
-
-#: object-name.c:1016
-#, c-format
-msgid "log for '%.*s' only has %d entries"
-msgstr "'%.*s' günlüğünde yalnızca %d girdi var"
-
-#: object-name.c:1794
-#, c-format
-msgid "path '%s' exists on disk, but not in '%.*s'"
-msgstr "'%s' yolu disk üzerinde mevcut; ancak '%.*s' içinde değil"
-
-#: object-name.c:1800
-#, c-format
-msgid ""
-"path '%s' exists, but not '%s'\n"
-"hint: Did you mean '%.*s:%s' aka '%.*s:./%s'?"
-msgstr ""
-"'%s' yolu mevcut; ancak '%s' değil\n"
-"İpucu: Şunu mu demek istediniz: '%.*s:%s', nam-ı diğer '%.*s:./%s'?"
-
-#: object-name.c:1809
-#, c-format
-msgid "path '%s' does not exist in '%.*s'"
-msgstr "'%s' yolu '%.*s' içinde mevcut değil"
-
-#: object-name.c:1837
-#, c-format
-msgid ""
-"path '%s' is in the index, but not at stage %d\n"
-"hint: Did you mean ':%d:%s'?"
-msgstr ""
-"'%s' yolu indekste; ancak %d numaralı alanda değil\n"
-"İpucu: Şunu mu demek istediniz: ':%d:%s'?"
-
-#: object-name.c:1853
-#, c-format
-msgid ""
-"path '%s' is in the index, but not '%s'\n"
-"hint: Did you mean ':%d:%s' aka ':%d:./%s'?"
-msgstr ""
-"'%s' yolu indekste; ancak '%s' değil\n"
-"İpucu: Şunu mu demek istediniz: '%d:%s', nam-ı diğer ':%d:./%s'?"
-
-#: object-name.c:1861
-#, c-format
-msgid "path '%s' exists on disk, but not in the index"
-msgstr "'%s' yolu diskte mevcut; ancak indekste değil"
-
-#: object-name.c:1863
-#, c-format
-msgid "path '%s' does not exist (neither on disk nor in the index)"
-msgstr "'%s' diye bir yol yok (ne diskte ne de indekste)"
-
-#: object-name.c:1876
-msgid "relative path syntax can't be used outside working tree"
-msgstr "göreceli yol sözdizimi çalışma ağacı dışında kullanılamaz"
-
-#: object-name.c:1901
-#, c-format
-msgid "<object>:<path> required, only <object> '%s' given"
-msgstr "<nesne>:<yol> gerekiyor, yalnızca <nesne> '%s' verildi"
-
-#: object-name.c:2014
-#, c-format
-msgid "invalid object name '%.*s'."
-msgstr "geçersiz nesne adı: '%.*s'"
-
-#: object.c:53
-#, c-format
-msgid "invalid object type \"%s\""
-msgstr "geçersiz nesne türü \"%s\""
-
-#: object.c:173
-#, c-format
-msgid "object %s is a %s, not a %s"
-msgstr "%s nesnesi bir %s, %s değil"
-
-#: object.c:250
-#, c-format
-msgid "object %s has unknown type id %d"
-msgstr "%s nesnesi %d bilinmeyen tür numarasına iye"
-
-#: object.c:263
-#, c-format
-msgid "unable to parse object: %s"
-msgstr "nesne ayrıştırılamıyor: %s"
-
-#: object.c:283 object.c:294
-#, c-format
-msgid "hash mismatch %s"
-msgstr "sağlama uyuşmazlığı %s"
-
-#: pack-bitmap.c:353
-msgid "multi-pack bitmap is missing required reverse index"
-msgstr "çoklu paket biteşlemi gereken ters indeksi içermiyor"
-
-#: pack-bitmap.c:433
-msgid "load_reverse_index: could not open pack"
-msgstr "load_reverse_index: paket açılamadı"
-
-#: pack-bitmap.c:1072 pack-bitmap.c:1078 builtin/pack-objects.c:2432
-#, c-format
-msgid "unable to get size of %s"
-msgstr "%s boyutu alınamıyor"
-
-#: pack-bitmap.c:1937
-#, c-format
-msgid "could not find %s in pack %s at offset %<PRIuMAX>"
-msgstr "%s, %s paketi %<PRIuMAX> ofsetinde bulunamadı"
-
-#: pack-bitmap.c:1973 builtin/rev-list.c:91
-#, c-format
-msgid "unable to get disk usage of %s"
-msgstr "%s ögesinin disk kullanımı alınamıyor"
-
-#: pack-revindex.c:221
-#, c-format
-msgid "reverse-index file %s is too small"
-msgstr "reverse-index dosyası %s pek küçük"
-
-#: pack-revindex.c:226
-#, c-format
-msgid "reverse-index file %s is corrupt"
-msgstr "reverse-index dosyası %s hasar görmüş"
-
-#: pack-revindex.c:234
-#, c-format
-msgid "reverse-index file %s has unknown signature"
-msgstr "%s reverse-index dosyasının bilinmeyen bir imzası var"
-
-#: pack-revindex.c:238
-#, c-format
-msgid "reverse-index file %s has unsupported version %<PRIu32>"
-msgstr "%s reverse-index dosyasının sürümü %<PRIu32> desteklenmiyor"
-
-#: pack-revindex.c:243
-#, c-format
-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:251
-msgid "cannot both write and verify reverse index"
-msgstr "ters indeks dosyası hem yazılıp hem doğrulanamıyor"
-
-#: pack-write.c:270
-#, c-format
-msgid "could not stat: %s"
-msgstr "dosya bilgileri alınamadı: %s"
-
-#: pack-write.c:282
-#, c-format
-msgid "failed to make %s readable"
-msgstr "%s, yazılabilir yapılamadı"
-
-#: pack-write.c:521
-#, c-format
-msgid "could not write '%s' promisor file"
-msgstr "vaat dosyası '%s' yazılamadı"
-
-#: packfile.c:627
-msgid "offset before end of packfile (broken .idx?)"
-msgstr "ofset paket dosyasının sonundan önce (bozuk .idx?)"
-
-#: packfile.c:657
-#, c-format
-msgid "packfile %s cannot be mapped%s"
-msgstr "paket dosyası %s eşlemlenemiyor%s"
-
-#: packfile.c:1924
-#, 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:1928
-#, 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:21 parse-options-cb.c:25 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"
-
-#: parse-options-cb.c:42
-#, c-format
-msgid "malformed expiration date '%s'"
-msgstr "hatalı oluşturulmuş son kullanım tarihi '%s'"
-
-#: parse-options-cb.c:55
-#, c-format
-msgid "option `%s' expects \"always\", \"auto\", or \"never\""
-msgstr "'%s' seçeneği \"always\", \"auto\" veya \"never\" bekliyor"
-
-#: parse-options-cb.c:133 parse-options-cb.c:150
-#, c-format
-msgid "malformed object name '%s'"
-msgstr "hatalı oluşturulmuş nesne adı '%s'"
-
-#: parse-options-cb.c:307
-#, c-format
-msgid "option `%s' expects \"%s\" or \"%s\""
-msgstr "'%s' seçeneği \"%s\" veya \"%s\" bekliyor"
-
-#: parse-options.c:58
-#, c-format
-msgid "%s requires a value"
-msgstr "%s bir değer gerektiriyor"
-
-#: parse-options.c:93
-#, c-format
-msgid "%s is incompatible with %s"
-msgstr "%s, %s ile uyumsuz"
-
-#: parse-options.c:98
-#, c-format
-msgid "%s : incompatible with something else"
-msgstr "%s: başka bir şeyle uyumsuz"
-
-#: 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:114
-#, c-format
-msgid "%s isn't available"
-msgstr "%s kullanılabilir değil"
-
-#: 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: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:428 parse-options.c:436
-#, c-format
-msgid "did you mean `--%s` (with two dashes)?"
-msgstr "şunu mu demek istediniz: '--%s' (iki tire ile)?"
-
-#: parse-options.c:678 parse-options.c:1054
-#, c-format
-msgid "alias of --%s"
-msgstr "şunun arması: --%s"
-
-#: parse-options.c:892
-#, c-format
-msgid "unknown option `%s'"
-msgstr "bilinmeyen seçenek '%s'"
-
-#: parse-options.c:894
-#, c-format
-msgid "unknown switch `%c'"
-msgstr "bilinmeyen anahtar '%c'"
-
-#: parse-options.c:896
-#, c-format
-msgid "unknown non-ascii option in string: `%s'"
-msgstr "dizi içinde bilinmeyen ascii dışı seçenek: '%s'"
-
-#: parse-options.c:920
-msgid "..."
-msgstr "..."
-
-#: parse-options.c:934
-#, c-format
-msgid "usage: %s"
-msgstr "kullanım: %s"
-
-#. TRANSLATORS: the colon here should align with the
-#. one in "usage: %s" translation.
-#.
-#: parse-options.c:949
-#, c-format
-msgid "   or: %s"
-msgstr "    veya: %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:970
-#, c-format
-msgid "%*s%s"
-msgstr "%*s%s"
-
-#: parse-options.c:993
-#, c-format
-msgid "    %s"
-msgstr "    %s"
-
-#: parse-options.c:1040
-msgid "-NUM"
-msgstr "-SAYI"
-
-#: path.c:922
-#, c-format
-msgid "Could not make %s writable by group"
-msgstr "%s grup ile yazılabilir yapılamadı"
-
-#: 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:168
-msgid "Only one 'attr:' specification is allowed."
-msgstr "Yalnızca bir 'attr:' belirtimine izin verilir."
-
-#: pathspec.c:171
-msgid "attr spec must not be empty"
-msgstr "attr belirteci boş bırakılmamalı"
-
-#: pathspec.c:214
-#, c-format
-msgid "invalid attribute name %s"
-msgstr "geçersiz öznitelik adı %s"
-
-#: pathspec.c:279
-msgid "global 'glob' and 'noglob' pathspec settings are incompatible"
-msgstr "global 'glob' ve 'noglob' yol belirteci ayarları birbiriyle uyumsuz"
-
-#: pathspec.c:286
-msgid ""
-"global 'literal' pathspec setting is incompatible with all other global "
-"pathspec settings"
-msgstr ""
-"global 'literal' yol belirteci ayarı diğer tüm global yol belirteci "
-"ayarlarıyla uyumsuz"
-
-#: pathspec.c:326
-msgid "invalid parameter for pathspec magic 'prefix'"
-msgstr "yol belirteci sihri 'prefix' için geçersiz parametre"
-
-#: pathspec.c:347
-#, c-format
-msgid "Invalid pathspec magic '%.*s' in '%s'"
-msgstr "Geçersiz yol belirteci sihri '%.*s' (%s içinde)"
-
-#: 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:390
-#, c-format
-msgid "Unimplemented pathspec magic '%c' in '%s'"
-msgstr "Yerine getirilmemiş yol belirteci sihri '%c' ('%s' içinde)"
-
-#: pathspec.c:449
-#, c-format
-msgid "%s: 'literal' and 'glob' are incompatible"
-msgstr "%s: 'literal' ve 'glob' birbiriyle uyumsuz"
-
-#: pathspec.c:465
-#, c-format
-msgid "%s: '%s' is outside repository at '%s'"
-msgstr "%s: '%s', '%s' konumunda depo dışında"
-
-#: pathspec.c:541
-#, c-format
-msgid "'%s' (mnemonic: '%c')"
-msgstr "'%s' (belleten: '%c')"
-
-#: 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:618
-#, c-format
-msgid "pathspec '%s' is beyond a symbolic link"
-msgstr "yol belirteci '%s' bir sembolik bağın ötesinde"
-
-#: pathspec.c:663
-#, c-format
-msgid "line is badly quoted: %s"
-msgstr "satırda hatalı tırnaklar: %s"
-
-#: pkt-line.c:92
-msgid "unable to write flush packet"
-msgstr "floş paketi yazılamıyor"
-
-#: pkt-line.c:99
-msgid "unable to write delim packet"
-msgstr "sınırlandıran paket yazılamıyor"
-
-#: pkt-line.c:106
-msgid "unable to write response end packet"
-msgstr "yanıt sonu paketi yazılamıyor"
-
-#: pkt-line.c:113
-msgid "flush packet write failed"
-msgstr "floş paketi yazımı başarısız"
-
-#: pkt-line.c:153
-msgid "protocol error: impossibly long line"
-msgstr "protokol hatası: olanaksız uzun satır"
-
-#: pkt-line.c:169 pkt-line.c:171
-msgid "packet write with format failed"
-msgstr "biçimlendirilmiş paket yazımı başarısız"
-
-#: 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"
-
-#: pkt-line.c:222
-#, c-format
-msgid "packet write failed: %s"
-msgstr "paket yazımı başarısız: %s"
-
-#: pkt-line.c:349 pkt-line.c:350
-msgid "read error"
-msgstr "okuma hatası"
-
-#: 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:417 pkt-line.c:419
-#, c-format
-msgid "protocol error: bad line length character: %.4s"
-msgstr "protokol hatası: hatalı satır uzunluğu karakteri: %.4s"
-
-#: pkt-line.c:434 pkt-line.c:436 pkt-line.c:442 pkt-line.c:444
-#, c-format
-msgid "protocol error: bad line length %d"
-msgstr "protokol hatası: hatalı satır uzunluğu %d"
-
-#: pkt-line.c:472 sideband.c:165
-#, c-format
-msgid "remote error: %s"
-msgstr "uzak konum hatası: %s"
-
-#: preload-index.c:125
-msgid "Refreshing index"
-msgstr "İndeks yenileniyor"
-
-#: preload-index.c:144
-#, c-format
-msgid "unable to create threaded lstat: %s"
-msgstr "iş parçacıklarına ayrılmış 'lstat' oluşturulamıyor: %s"
-
-#: pretty.c:1051
-msgid "unable to parse --pretty format"
-msgstr "--pretty biçimi ayrıştırılamıyor"
-
-#: promisor-remote.c:31
-msgid "promisor-remote: unable to fork off fetch subprocess"
-msgstr "promisor-remote: getirme alt süreci çatallanamıyor"
-
-#: promisor-remote.c:38 promisor-remote.c:40
-msgid "promisor-remote: could not write to fetch subprocess"
-msgstr "promisor-remote: getirme alt sürecine yazılamıyor"
-
-#: promisor-remote.c:44
-msgid "promisor-remote: could not close stdin to fetch subprocess"
-msgstr "promisor-remote: alt sürecine getirmek için stdin kapatılamıyor"
-
-#: promisor-remote.c:54
-#, c-format
-msgid "promisor remote name cannot begin with '/': %s"
-msgstr "vaatçi uzak konum adı '/' ile başlayamaz: %s"
-
-#: protocol-caps.c:103
-msgid "object-info: expected flush after arguments"
-msgstr "object-info: argümanlardan sonra floş bekleniyordu"
-
-#: prune-packed.c:35
-msgid "Removing duplicate objects"
-msgstr "Yinelenmiş nesneler kaldırılıyor"
-
-#: range-diff.c:68
-msgid "could not start `log`"
-msgstr "'log' başlatılamadı"
-
-#: range-diff.c:70
-msgid "could not read `log` output"
-msgstr "'log' çıktısı okunamadı"
-
-#: range-diff.c:98 sequencer.c:5575
-#, c-format
-msgid "could not parse commit '%s'"
-msgstr "'%s' işlemesi ayrıştırılamadı"
-
-#: range-diff.c:109
-#, c-format
-msgid ""
-"could not parse first line of `log` output: did not start with 'commit ': "
-"'%s'"
-msgstr ""
-"'log' çıktısının ilk satırı ayrıştırılamadı: 'commit ' ile başlamıyor: '%s'"
-
-#: range-diff.c:132
-#, c-format
-msgid "could not parse git header '%.*s'"
-msgstr "git üstbilgisi '%.*s' ayrıştırılamadı"
-
-#: range-diff.c:300
-msgid "failed to generate diff"
-msgstr "diff oluşturulamadı"
-
-#: range-diff.c:558 range-diff.c:560
-#, c-format
-msgid "could not parse log for '%s'"
-msgstr "'%s' günlüğü ayrıştırılamadı"
-
-#: read-cache.c:737
-#, c-format
-msgid "will not add file alias '%s' ('%s' already exists in index)"
-msgstr "dosya arması '%s' eklenmeyecek ('%s' indekste halihazırda var)"
-
-#: read-cache.c:753
-msgid "cannot create an empty blob in the object database"
-msgstr "nesne veritabanında boş ikili bir nesne oluşturulamıyor"
-
-#: read-cache.c:775
-#, c-format
-msgid "%s: can only add regular files, symbolic links or git-directories"
-msgstr ""
-"%s: yalnızca sıradan dosyalar, sembolik bağlar ve git dizinleri eklenebilir"
-
-#: read-cache.c:780 builtin/submodule--helper.c:3359
-#, c-format
-msgid "'%s' does not have a commit checked out"
-msgstr "'%s' çıkışı yapılmış bir işlemeye iye değil"
-
-#: read-cache.c:832
-#, c-format
-msgid "unable to index file '%s'"
-msgstr "'%s' dosyası indekslenemiyor"
-
-#: read-cache.c:851
-#, c-format
-msgid "unable to add '%s' to index"
-msgstr "'%s' indekse eklenemiyor"
-
-#: read-cache.c:862
-#, c-format
-msgid "unable to stat '%s'"
-msgstr "'%s' dosyasının bilgileri alınamıyor"
-
-#: read-cache.c:1404
-#, 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:1619
-msgid "Refresh index"
-msgstr "İndeks yenileniyor"
-
-#: read-cache.c:1751
-#, c-format
-msgid ""
-"index.version set, but the value is invalid.\n"
-"Using version %i"
-msgstr ""
-"index.version ayarlanmış; ancak değer geçersiz.\n"
-"%i sürümü kullanılıyor"
-
-#: read-cache.c:1761
-#, c-format
-msgid ""
-"GIT_INDEX_VERSION set, but the value is invalid.\n"
-"Using version %i"
-msgstr ""
-"GIT_INDEX_VERSION ayarlanmış; ancak değer geçersiz.\n"
-"%i sürümü kullanılıyor"
-
-#: read-cache.c:1817
-#, c-format
-msgid "bad signature 0x%08x"
-msgstr "hatalı imza 0x%08x"
-
-#: read-cache.c:1820
-#, c-format
-msgid "bad index version %d"
-msgstr "hatalı indeks sürümü %d"
-
-#: read-cache.c:1829
-msgid "bad index file sha1 signature"
-msgstr "hatalı indeks dosyası sha1 imzası"
-
-#: read-cache.c:1863
-#, 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:1865
-#, c-format
-msgid "ignoring %.4s extension"
-msgstr "%.4s uzantısı yok sayılıyor"
-
-#: read-cache.c:1902
-#, c-format
-msgid "unknown index entry format 0x%08x"
-msgstr "bilinmeyen indeks girdisi biçimi 0x%08x"
-
-#: read-cache.c:1918
-#, 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:1975
-msgid "unordered stage entries in index"
-msgstr "indekste sırasız hazırlama alanı girdileri"
-
-#: read-cache.c:1978
-#, 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:1981
-#, c-format
-msgid "unordered stage entries for '%s'"
-msgstr "'%s' için sırasız hazırlama alanı girdileri"
-
-#: read-cache.c:2096 read-cache.c:2402 rerere.c:549 rerere.c:583 rerere.c:1096
-#: submodule.c:1831 builtin/add.c:586 builtin/check-ignore.c:183
-#: builtin/checkout.c:532 builtin/checkout.c:724 builtin/clean.c:1016
-#: builtin/commit.c:379 builtin/diff-tree.c:122 builtin/grep.c:521
-#: builtin/mv.c:148 builtin/reset.c:506 builtin/rm.c:293
-#: builtin/submodule--helper.c:335 builtin/submodule--helper.c:3319
-msgid "index file corrupt"
-msgstr "indeks dosyası hasar görmüş"
-
-#: read-cache.c:2240
-#, 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:2253
-#, 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:2286
-#, c-format
-msgid "%s: index file open failed"
-msgstr "%s: indeks dosyası açılamadı"
-
-#: read-cache.c:2290
-#, c-format
-msgid "%s: cannot stat the open index"
-msgstr "%s: açık indeksin bilgileri alınamıyor"
-
-#: read-cache.c:2294
-#, c-format
-msgid "%s: index file smaller than expected"
-msgstr "%s: indeks dosyası beklenenden daha küçük"
-
-#: read-cache.c:2298
-#, c-format
-msgid "%s: unable to map index file%s"
-msgstr "%s: indeks dosyası eşlemlenemiyor%s"
-
-#: read-cache.c:2341
-#, 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:2368
-#, 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:2414
-#, c-format
-msgid "could not freshen shared index '%s'"
-msgstr "paylaşılan indeks '%s' tazelenemedi"
-
-#: read-cache.c:2473
-#, 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
-msgid "cannot write split index for a sparse index"
-msgstr "bir aralıklı indeks için bölünmüş indeks yazılamıyor"
-
-#: read-cache.c:3114 strbuf.c:1192 wrapper.c:717 builtin/merge.c:1156
-#, c-format
-msgid "could not close '%s'"
-msgstr "'%s' kapatılamadı"
-
-#: read-cache.c:3157
-msgid "failed to convert to a sparse-index"
-msgstr "bir sparse-index'e dönüştürülemedi"
-
-#: read-cache.c:3228
-#, c-format
-msgid "could not stat '%s'"
-msgstr "'%s' bilgileri alınamadı"
-
-#: read-cache.c:3241
-#, c-format
-msgid "unable to open git dir: %s"
-msgstr "git dizini açılamıyor: %s"
-
-#: read-cache.c:3253
-#, c-format
-msgid "unable to unlink: %s"
-msgstr "bağlantı kesilemiyor: %s"
-
-#: read-cache.c:3282
-#, c-format
-msgid "cannot fix permission bits on '%s'"
-msgstr "'%s' üzerindeki izin bitleri onarılamıyor"
-
-#: read-cache.c:3439
-#, c-format
-msgid "%s: cannot drop to stage #0"
-msgstr "%s: #0 numaralı hazırlama alanına bırakılamıyor"
-
-#: rebase-interactive.c:11
-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 ""
-"Bunu 'git rebase --edit-todo' ile düzeltebilir ve ardından 'git rebase --"
-"continue' yapabilirsiniz.\n"
-"Yeniden temellendirmeyi durdurmak isterseniz 'git rebase --abort' yapın.\n"
-
-#: rebase-interactive.c:33
-#, c-format
-msgid ""
-"unrecognized setting %s for option rebase.missingCommitsCheck. Ignoring."
-msgstr ""
-"rebase.missingCommitsCheck seçeneği için tanımlanamayan %s ayarı. Yok "
-"sayılıyor."
-
-#: rebase-interactive.c:42
-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 [-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"
-"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ştirmek için dur\n"
-"s, squash <işleme> = işlemeyi kullan; ancak önceki işleme içine karıştır\n"
-"f, fixup [-C | -c] <işleme> = \"squash\" gibi; ancak yalnızca bir önceki\n"
-"                   işlemenin günlük iletisini tutar (-C kullanılmadıysa,\n"
-"                   o zaman yalnızca bu işlemenin iletisini tutar; -c, -C\n"
-"                   ile aynıdır; ancak ek olarak düzenleyiciyi açar)\n"
-"x, exec <komut> = komutu (satırın geri kalanı) kabuk kullanarak çalıştır\n"
-"b, break = burada dur (daha sonra sürdürmek için 'git rebase --continue')\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> [# <teksatı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"
-
-#: rebase-interactive.c:66
-#, c-format
-msgid "Rebase %s onto %s (%d command)"
-msgid_plural "Rebase %s onto %s (%d commands)"
-msgstr[0] "%s ögesini %s üzerine yeniden temellendir (%d komut)"
-msgstr[1] "%s ögesini %s üzerine yeniden temellendir (%d komut)"
-
-#: rebase-interactive.c:75
-msgid ""
-"\n"
-"Do not remove any line. Use 'drop' explicitly to remove a commit.\n"
-msgstr ""
-"\n"
-"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
-msgid ""
-"\n"
-"If you remove a line here THAT COMMIT WILL BE LOST.\n"
-msgstr ""
-"\n"
-"Buradaki bir satırı kaldırırsanız İŞLEME KAYBOLUR.\n"
-
-#: rebase-interactive.c:84
-msgid ""
-"\n"
-"You are editing the todo file of an ongoing interactive rebase.\n"
-"To continue rebase after editing, run:\n"
-"    git rebase --continue\n"
-"\n"
-msgstr ""
-"\n"
-"Sürmekte olan bir etkileşimli yeniden temellendirmenin yapılacaklar "
-"dosyasını düzenlemektesiniz.\n"
-"Düzenlemenin ardından yeniden temellendirmeyi sürdürmek için şunu kullanın:\n"
-"\tgit rebase --continue\n"
-"\n"
-
-#: rebase-interactive.c:89
-msgid ""
-"\n"
-"However, if you remove everything, the rebase will be aborted.\n"
-"\n"
-msgstr ""
-"\n"
-"Ancak tümünü kaldırırsanız yeniden temellendirme iptal edilecektir.\n"
-"\n"
-
-#: rebase-interactive.c:113 rerere.c:469 rerere.c:677 sequencer.c:3879
-#: sequencer.c:3905 sequencer.c:5681 builtin/fsck.c:328 builtin/gc.c:1791
-#: builtin/rebase.c:191
-#, c-format
-msgid "could not write '%s'"
-msgstr "'%s' yazılamadı"
-
-#: rebase-interactive.c:119
-#, c-format
-msgid "could not write '%s'."
-msgstr "'%s' yazılamadı."
-
-#: rebase-interactive.c:196
-#, c-format
-msgid ""
-"Warning: some commits may have been dropped accidentally.\n"
-"Dropped commits (newer to older):\n"
-msgstr ""
-"Uyarı: Bazı işlemeler yanlışlıkla bırakılmış olabilir.\n"
-"Bırakılan işlemeler: (yeniden eskiye):\n"
-
-#: rebase-interactive.c:203
-#, c-format
-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"
-"The possible behaviours are: ignore, warn, error.\n"
-"\n"
-msgstr ""
-"Bu iletiden kaçınmak için, bir işlemeyi kaldırırken açıkça \"drop\" "
-"kullanın.\n"
-"Uyarıların düzeyini değiştirmek için 'git config rebase.missingCommitsCheck' "
-"kullanın.\n"
-"Kullanılabilir davranışlar: ignore, warn, error.\n"
-"\n"
-
-#: rebase.c:29
-#, c-format
-msgid "%s: 'preserve' superseded by 'merges'"
-msgstr "%s: 'preserve'in yerini 'merges' aldı"
-
-#: ref-filter.c:42 wt-status.c:2057
-msgid "gone"
-msgstr "gitti"
-
-#: ref-filter.c:43
-#, c-format
-msgid "ahead %d"
-msgstr "%d önünde"
-
-#: ref-filter.c:44
-#, c-format
-msgid "behind %d"
-msgstr "%d arkasında"
-
-#: ref-filter.c:45
-#, c-format
-msgid "ahead %d, behind %d"
-msgstr "%d önünde, %d arkasında"
-
-#: ref-filter.c:235
-#, c-format
-msgid "expected format: %%(color:<color>)"
-msgstr "beklenen biçim: %%(color:<renk>)"
-
-#: ref-filter.c:237
-#, c-format
-msgid "unrecognized color: %%(color:%s)"
-msgstr "tanımlanamayan renk: %%(color:%s)"
-
-#: 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:263
-#, c-format
-msgid "Integer value expected refname:rstrip=%s"
-msgstr "Tamsayı değeri şunu bekliyordu: refname:rstrip=%s"
-
-#: ref-filter.c:265 ref-filter.c:344 ref-filter.c:377 ref-filter.c:431
-#: ref-filter.c:443 ref-filter.c:462 ref-filter.c:534 ref-filter.c:560
-#, c-format
-msgid "unrecognized %%(%s) argument: %s"
-msgstr "tanımlanamayan %%(%s) argümanı: %s"
-
-#: ref-filter.c:320
-#, c-format
-msgid "%%(objecttype) does not take arguments"
-msgstr "%%(objecttype) argüman almıyor"
-
-#: ref-filter.c:352
-#, c-format
-msgid "%%(deltabase) does not take arguments"
-msgstr "%%(deltabase) argüman almıyor"
-
-#: ref-filter.c:364
-#, c-format
-msgid "%%(body) does not take arguments"
-msgstr "%%(body) argüman almıyor"
-
-#: ref-filter.c:396
-#, c-format
-msgid "expected %%(trailers:key=<value>)"
-msgstr "%%(trailers:key=<değer>) bekleniyordu"
-
-#: ref-filter.c:398
-#, c-format
-msgid "unknown %%(trailers) argument: %s"
-msgstr "bilinmeyen %%(trailers) argümanı: %s"
-
-#: 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:458
-#, c-format
-msgid "positive value expected '%s' in %%(%s)"
-msgstr "pozitif değer şurada '%s' bekliyordu: %%(%s)"
-
-#: ref-filter.c:476
-#, c-format
-msgid "unrecognized email option: %s"
-msgstr "tanımlanamayan e-posta seçeneği: %s"
-
-#: ref-filter.c:506
-#, c-format
-msgid "expected format: %%(align:<width>,<position>)"
-msgstr "beklenen biçim: %%(align:<genişlik>,<konum>)"
-
-#: ref-filter.c:518
-#, c-format
-msgid "unrecognized position:%s"
-msgstr "tanımlanamayan konum:%s"
-
-#: ref-filter.c:525
-#, c-format
-msgid "unrecognized width:%s"
-msgstr "tanımlanamayan genişlik:%s"
-
-#: 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: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:707
-#, c-format
-msgid "unknown field name: %.*s"
-msgstr "bilinmeyen alan adı: %.*s"
-
-#: 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:844 ref-filter.c:910 ref-filter.c:946 ref-filter.c:948
-#, c-format
-msgid "format: %%(%s) atom used without a %%(%s) atom"
-msgstr "biçim: %%(%s) ögeciği bir %%(%s) ögeciği olmadan kullanıldı"
-
-#: 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: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: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: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:1027
-#, c-format
-msgid "malformed format string %s"
-msgstr "hatalı oluşturulmuş biçim dizisi %s"
-
-#: 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:1707
-#, c-format
-msgid "(no branch, rebasing %s)"
-msgstr "(dal yok, %s yeniden temellendiriliyor)"
-
-#: ref-filter.c:1710
-#, c-format
-msgid "(no branch, rebasing detached HEAD %s)"
-msgstr "(dal yok, ayrık HEAD %s yeniden temellendiriliyor)"
-
-#: ref-filter.c:1713
-#, c-format
-msgid "(no branch, bisect started on %s)"
-msgstr "(dal yok, ikili arama %s üzerinde başladı)"
-
-#: ref-filter.c:1717
-#, c-format
-msgid "(HEAD detached at %s)"
-msgstr "(HEAD, %s konumunda ayrıldı)"
-
-#: ref-filter.c:1720
-#, c-format
-msgid "(HEAD detached from %s)"
-msgstr "(HEAD, %s ögesinden ayrıldı)"
-
-#: ref-filter.c:1723
-msgid "(no branch)"
-msgstr "(dal yok)"
-
-#: ref-filter.c:1755 ref-filter.c:1973
-#, c-format
-msgid "missing object %s for %s"
-msgstr "eksik nesne %s (%s için)"
-
-#: ref-filter.c:1765
-#, 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:2156
-#, c-format
-msgid "malformed object at '%s'"
-msgstr "'%s' konumunda hatalı oluşturulmuş nesne"
-
-#: ref-filter.c:2246
-#, c-format
-msgid "ignoring ref with broken name %s"
-msgstr "bozuk ada iye %s başvurusu yok sayılıyor"
-
-#: ref-filter.c:2251 refs.c:672
-#, c-format
-msgid "ignoring broken ref %s"
-msgstr "bozuk başvuru %s yok sayılıyor"
-
-#: ref-filter.c:2630
-#, c-format
-msgid "format: %%(end) atom missing"
-msgstr "biçim: %%(end) ögeciği eksik"
-
-#: ref-filter.c:2741
-#, c-format
-msgid "malformed object name %s"
-msgstr "hatalı oluşturulmuş nesne adı %s"
-
-#: ref-filter.c:2746
-#, c-format
-msgid "option `%s' must point to a commit"
-msgstr "'%s' bir işlemeye işaret etmeli"
-
-#: reflog.c:407
-#, c-format
-msgid "not a reflog: %s"
-msgstr "bir başvuru günlüğü değil: %s"
-
-#: reflog.c:410
-#, c-format
-msgid "no reflog for '%s'"
-msgstr "'%s' için başvuru günlüğü yok"
-
-#: refs.c:262
-#, c-format
-msgid "%s does not point to a valid object!"
-msgstr "%s geçerli bir nesneye işaret etmiyor!"
-
-#: refs.c:561
-#, 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"
-"of your new repositories, which will suppress this warning, call:\n"
-"\n"
-"\tgit config --global init.defaultBranch <name>\n"
-"\n"
-"Names commonly chosen instead of 'master' are 'main', 'trunk' and\n"
-"'development'. The just-created branch can be renamed via this command:\n"
-"\n"
-"\tgit branch -m <name>\n"
-msgstr ""
-"Başlangıç dal adı olarak %s kullanılıyor. Bu öntanımlı dal adı\n"
-"değiştirilebilir. Bu iletiyi kapatmak ve yeni depolarınızda kullanılacak\n"
-"başlangıç dal adını yapılandırmak için şu komutu kullanın:\n"
-"\n"
-"\tgit config --global init.defaultBranch <ad>\n"
-"\n"
-"'master' yerine kullanılan diğer yaygın dal adları 'main', 'trunk'\n"
-"ve/veya 'development'tır. Yeni oluşturulan dal şu komutla yeniden\n"
-"adlandırılabilir:\n"
-"\n"
-"\tgit branch -m <ad>\n"
-
-#: refs.c:583
-#, c-format
-msgid "could not retrieve `%s`"
-msgstr "'%s' alınamadı"
-
-#: refs.c:593
-#, c-format
-msgid "invalid branch name: %s = %s"
-msgstr "geçersiz dal adı: %s = %s"
-
-#: refs.c:670
-#, c-format
-msgid "ignoring dangling symref %s"
-msgstr "sarkan sembolik başvuru %s yok sayılıyor"
-
-#: refs.c:919
-#, 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:926
-#, 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:991
-#, c-format
-msgid "log for %s is empty"
-msgstr "%s için olan günlük boş"
-
-#: refs.c:1086
-#, c-format
-msgid "refusing to update ref with bad name '%s'"
-msgstr "hatalı ada iye '%s' başvurusunu güncelleme reddediliyor"
-
-#: refs.c:1164
-#, 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:2059
-#, c-format
-msgid "multiple updates for ref '%s' not allowed"
-msgstr "'%s' başvurusu için birden çok güncellemeye izin verilmiyor"
-
-#: refs.c:2145
-msgid "ref updates forbidden inside quarantine environment"
-msgstr "başvuru güncellemeleri karantina ortamı içinde yasak"
-
-#: refs.c:2156
-msgid "ref updates aborted by hook"
-msgstr "başvuru güncellemeleri kanca tarafından iptal edildi"
-
-#: refs.c:2264 refs.c:2294
-#, c-format
-msgid "'%s' exists; cannot create '%s'"
-msgstr "'%s' mevcut; '%s' oluşturulamıyor"
-
-#: refs.c:2270 refs.c:2305
-#, c-format
-msgid "cannot process '%s' and '%s' at the same time"
-msgstr "'%s' ve '%s' aynı anda işlenemiyor"
-
-#: refs/files-backend.c:1295
-#, c-format
-msgid "could not remove reference %s"
-msgstr "%s başvurusu kaldırılamadı"
-
-#: refs/files-backend.c:1310 refs/packed-backend.c:1565
-#: refs/packed-backend.c:1575
-#, c-format
-msgid "could not delete reference %s: %s"
-msgstr "%s başvurusu silinemedi: %s"
-
-#: refs/files-backend.c:1313 refs/packed-backend.c:1578
-#, c-format
-msgid "could not delete references: %s"
-msgstr "başvurular silinemedi: %s"
-
-#: refspec.c:170
-#, c-format
-msgid "invalid refspec '%s'"
-msgstr "geçersiz başvuru belirteci '%s'"
-
-#: remote.c:402
-#, c-format
-msgid "config remote shorthand cannot begin with '/': %s"
-msgstr "uzak konum yapılandırma stenografisi '/' ile başlayamaz: %s"
-
-#: remote.c:450
-msgid "more than one receivepack given, using the first"
-msgstr "birden fazla receivepack verildi, birincisi kullanılıyor"
-
-#: remote.c:458
-msgid "more than one uploadpack given, using the first"
-msgstr "birden fazla uploadpack verildi, birincisi kullanılıyor"
-
-#: remote.c:698
-#, c-format
-msgid "Cannot fetch both %s and %s to %s"
-msgstr "Hem %s hem %s şuraya getirilemiyor: %s"
-
-#: remote.c:702
-#, c-format
-msgid "%s usually tracks %s, not %s"
-msgstr "%s genelde %s ögesini izler, %s değil"
-
-#: remote.c:706
-#, c-format
-msgid "%s tracks both %s and %s"
-msgstr "%s hem %s hem %s ögelerini izler"
-
-#: remote.c:774
-#, c-format
-msgid "key '%s' of pattern had no '*'"
-msgstr "dizginin '%s' anahtarında '*' yoktu"
-
-#: remote.c:784
-#, c-format
-msgid "value '%s' of pattern has no '*'"
-msgstr "dizginin '%s' değerinde '*' yok"
-
-#: remote.c:1191
-#, c-format
-msgid "src refspec %s does not match any"
-msgstr "kaynak başvuru belirteci %s başka hiçbir şeyle eşleşmiyor"
-
-#: remote.c:1196
-#, c-format
-msgid "src refspec %s matches more than one"
-msgstr "kaynak başvuru belirteci %s birden fazlası ile eşleşiyor"
-
-#. TRANSLATORS: "matches '%s'%" is the <dst> part of "git push
-#. <remote> <src>:<dst>" push, and "being pushed ('%s')" is
-#. the <src>.
-#.
-#: remote.c:1211
-#, c-format
-msgid ""
-"The destination you provided is not a full refname (i.e.,\n"
-"starting with \"refs/\"). We tried to guess what you meant by:\n"
-"\n"
-"- Looking for a ref that matches '%s' on the remote side.\n"
-"- Checking if the <src> being pushed ('%s')\n"
-"  is a ref in \"refs/{heads,tags}/\". If so we add a corresponding\n"
-"  refs/{heads,tags}/ prefix on the remote side.\n"
-"\n"
-"Neither worked, so we gave up. You must fully qualify the ref."
-msgstr ""
-"Sağladığınız kaynak tam bir başvuru belirteci değil (örneğin \"refs/\"\n"
-"ile başlamıyor. Bununla ne demek istediğinizi bulabilmek için:\n"
-"\n"
-"- Uzak konumda '%s' ile eşleşen bir başvuru aradık.\n"
-"- İtilen <kaynak>'ın ('%s') \"refs/{heads,tags}/\" içinde bir\n"
-"  başvuru olup olmadığına baktık. Eğer öyleyse uzak konum tarafında\n"
-"  eşleşen bir refs/{heads,tags}/ öneki ekledik.\n"
-"\n"
-"Hiçbiri işe yaramadı, biz de bıraktık. Başvuruyu tam olarak "
-"nitelendirmelisiniz."
-
-#: remote.c:1231
-#, c-format
-msgid ""
-"The <src> part of the refspec is a commit object.\n"
-"Did you mean to create a new branch by pushing to\n"
-"'%s:refs/heads/%s'?"
-msgstr ""
-"Başvuru belirtecinin <kaynak> kısmı bir işleme nesnesi.\n"
-"'%s:refs/heads/%s' konumuna iterek yeni bir dal mı\n"
-"oluşturmak istediniz?"
-
-#: remote.c:1236
-#, c-format
-msgid ""
-"The <src> part of the refspec is a tag object.\n"
-"Did you mean to create a new tag by pushing to\n"
-"'%s:refs/tags/%s'?"
-msgstr ""
-"Başvuru belirtecinin <kaynak> kısmı bir etiket nesnesi.\n"
-"'%s:refs/tags/%s' konumuna iterek yeni bir etiket mi\n"
-"oluşturmak istediniz?"
-
-#: remote.c:1241
-#, c-format
-msgid ""
-"The <src> part of the refspec is a tree object.\n"
-"Did you mean to tag a new tree by pushing to\n"
-"'%s:refs/tags/%s'?"
-msgstr ""
-"Başvuru belirtecinin <kaynak> kısmı bir ağaç nesnesi.\n"
-"'%s:refs/tags/%s' konumuna iterek yeni bir ağaç mı\n"
-"etiketlemek istediniz?"
-
-#: remote.c:1246
-#, c-format
-msgid ""
-"The <src> part of the refspec is a blob object.\n"
-"Did you mean to tag a new blob by pushing to\n"
-"'%s:refs/tags/%s'?"
-msgstr ""
-"Başvuru belirtecinin <kaynak> kısmı ikili bir nesne.\n"
-"'%s:refs/tags/%s' konumuna iterek yeni ikili bir nesne mi\n"
-"etiketlemek istediniz?"
-
-#: remote.c:1282
-#, c-format
-msgid "%s cannot be resolved to branch"
-msgstr "%s dala çözülemiyor"
-
-#: remote.c:1293
-#, c-format
-msgid "unable to delete '%s': remote ref does not exist"
-msgstr "'%s' silinemiyor: uzak başvuru yok"
-
-#: remote.c:1305
-#, c-format
-msgid "dst refspec %s matches more than one"
-msgstr "birden çok hedef başvuru belirteci %s eşleşmesi"
-
-#: remote.c:1312
-#, c-format
-msgid "dst ref %s receives from more than one src"
-msgstr "hedef başvurusu %s birden çok kaynaktan alıyor"
-
-#: remote.c:1833 remote.c:1940
-msgid "HEAD does not point to a branch"
-msgstr "HEAD bir dala işaret etmiyor"
-
-#: remote.c:1842
-#, c-format
-msgid "no such branch: '%s'"
-msgstr "böyle bir dal yok: '%s'"
-
-#: remote.c:1845
-#, c-format
-msgid "no upstream configured for branch '%s'"
-msgstr "'%s' dalı için üstkaynak yapılandırılmamış"
-
-#: remote.c:1851
-#, c-format
-msgid "upstream branch '%s' not stored as a remote-tracking branch"
-msgstr "üstkaynak dalı '%s' bir uzak izleme dalı olarak depolanmıyor"
-
-#: remote.c:1866
-#, c-format
-msgid "push destination '%s' on remote '%s' has no local tracking branch"
-msgstr "'%s' itme hedefinin ('%s' uzak konumunda) yerel izleme dalı yok"
-
-#: remote.c:1881
-#, c-format
-msgid "branch '%s' has no remote for pushing"
-msgstr "'%s' dalının itme için uzak konumu yok"
-
-#: remote.c:1891
-#, c-format
-msgid "push refspecs for '%s' do not include '%s'"
-msgstr "'%s' için olan başvuru belirteçleri '%s' içermiyor"
-
-#: remote.c:1904
-msgid "push has no destination (push.default is 'nothing')"
-msgstr "itilecek bir hedef yok (push.default: 'nothing')"
-
-#: remote.c:1926
-msgid "cannot resolve 'simple' push to a single destination"
-msgstr "tek bir konuma 'simple' itme çözülemiyor"
-
-#: remote.c:2059
-#, c-format
-msgid "couldn't find remote ref %s"
-msgstr "%s uzak başvurusu bulunamadı"
-
-#: remote.c:2072
-#, c-format
-msgid "* Ignoring funny ref '%s' locally"
-msgstr "* Eğlenceli başvuru '%s' yerel olarak yok sayılıyor"
-
-#: remote.c:2235
-#, c-format
-msgid "Your branch is based on '%s', but the upstream is gone.\n"
-msgstr "Dalınız '%s' temelli; ancak üstkaynak kaybolmuş.\n"
-
-#: remote.c:2239
-msgid "  (use \"git branch --unset-upstream\" to fixup)\n"
-msgstr "  (düzeltmek için \"git branch --unset-upstream\" kullan)\n"
-
-#: remote.c:2242
-#, c-format
-msgid "Your branch is up to date with '%s'.\n"
-msgstr "Dalınız '%s' ile güncel.\n"
-
-#: remote.c:2246
-#, c-format
-msgid "Your branch and '%s' refer to different commits.\n"
-msgstr "Sizin dalınız ve '%s' başka işlemelere başvuruyor.\n"
-
-#: remote.c:2249
-#, c-format
-msgid "  (use \"%s\" for details)\n"
-msgstr "  (ayrıntılar için \"%s\" kullanın)\n"
-
-#: remote.c:2253
-#, c-format
-msgid "Your branch is ahead of '%s' by %d commit.\n"
-msgid_plural "Your branch is ahead of '%s' by %d commits.\n"
-msgstr[0] "Dalınız '%s' dalından %d işleme ileride.\n"
-msgstr[1] "Dalınız '%s' dalından %d işleme ileride.\n"
-
-#: remote.c:2259
-msgid "  (use \"git push\" to publish your local commits)\n"
-msgstr "  (yerel işlemelerinizi yayımlamak için \"git push\" kullanın)\n"
-
-#: remote.c:2262
-#, c-format
-msgid "Your branch is behind '%s' by %d commit, and can be fast-forwarded.\n"
-msgid_plural ""
-"Your branch is behind '%s' by %d commits, and can be fast-forwarded.\n"
-msgstr[0] "Dalınız '%s' dalından %d işleme geride ve ileri sarılabilir.\n"
-msgstr[1] "Dalınız '%s' dalından %d işleme geride ve ileri sarılabilir.\n"
-
-#: remote.c:2270
-msgid "  (use \"git pull\" to update your local branch)\n"
-msgstr "  (yerel dalınızı güncellemek için \"git pull\" kullanın)\n"
-
-#: remote.c:2273
-#, c-format
-msgid ""
-"Your branch and '%s' have diverged,\n"
-"and have %d and %d different commit each, respectively.\n"
-msgid_plural ""
-"Your branch and '%s' have diverged,\n"
-"and have %d and %d different commits each, respectively.\n"
-msgstr[0] ""
-"Sizin dalınız ve '%s' birbirinden uzaklaşmış ve sırasıyla\n"
-"her birinde %d ve %d işleme var.\n"
-msgstr[1] ""
-"Sizin dalınız ve '%s' birbirinden uzaklaşmış ve sırasıyla\n"
-"her birinde %d ve %d işleme var.\n"
-
-#: remote.c:2283
-msgid "  (use \"git pull\" to merge the remote branch into yours)\n"
-msgstr "  (uzak dalı kendi dalınıza birleştirmek için \"git pull\" kullanın)\n"
-
-#: remote.c:2475
-#, c-format
-msgid "cannot parse expected object name '%s'"
-msgstr "beklenen nesne adı '%s' ayrıştırılamıyor"
-
-#: replace-object.c:21
-#, c-format
-msgid "bad replace ref name: %s"
-msgstr "hatalı değiştirme başvurusu adı: %s"
-
-#: replace-object.c:30
-#, c-format
-msgid "duplicate replace ref: %s"
-msgstr "yinelenmiş değiştirme başvurusu: %s"
-
-#: replace-object.c:82
-#, c-format
-msgid "replace depth too high for object %s"
-msgstr "%s nesnesi için değiştirme derinliği pek yüksek"
-
-#: rerere.c:201 rerere.c:210 rerere.c:213
-msgid "corrupt MERGE_RR"
-msgstr "hasar görmüş MERGE_RR"
-
-#: rerere.c:248 rerere.c:253
-msgid "unable to write rerere record"
-msgstr "rerere kaydı yazılamıyor"
-
-#: rerere.c:479
-#, c-format
-msgid "there were errors while writing '%s' (%s)"
-msgstr "'%s' yazılırken hatalar vardı (%s)"
-
-#: rerere.c:482 builtin/gc.c:2263 builtin/gc.c:2298
-#, c-format
-msgid "failed to flush '%s'"
-msgstr "'%s' floş yapılamadı"
-
-#: rerere.c:487 rerere.c:1024
-#, c-format
-msgid "could not parse conflict hunks in '%s'"
-msgstr "'%s' içindeki çakışan parçalar ayrıştırılamadı"
-
-#: rerere.c:669
-#, c-format
-msgid "failed utime() on '%s'"
-msgstr "'%s' üzerinde utime() başarısız"
-
-#: rerere.c:679
-#, c-format
-msgid "writing '%s' failed"
-msgstr "'%s' yazılamadı"
-
-#: rerere.c:699
-#, c-format
-msgid "Staged '%s' using previous resolution."
-msgstr "'%s' bir önceki çözüm kullanılarak hazırlama alanına alındı."
-
-#: rerere.c:738
-#, c-format
-msgid "Recorded resolution for '%s'."
-msgstr "'%s' için çözüm kaydedildi."
-
-#: rerere.c:773
-#, c-format
-msgid "Resolved '%s' using previous resolution."
-msgstr "'%s' bir önceki çözüm kullanılarak çözüldü."
-
-#: rerere.c:788
-#, c-format
-msgid "cannot unlink stray '%s'"
-msgstr "'%s' başıboşunun bağlantısı kesilemiyor"
-
-#: rerere.c:792
-#, c-format
-msgid "Recorded preimage for '%s'"
-msgstr "'%s' için öngörüntü kaydedildi"
-
-#: rerere.c:866 submodule.c:2290 builtin/log.c:2042
-#: builtin/submodule--helper.c:1786 builtin/submodule--helper.c:1833
-#, c-format
-msgid "could not create directory '%s'"
-msgstr "'%s' dizini oluşturulamadı"
-
-#: rerere.c:1042
-#, c-format
-msgid "failed to update conflicted state in '%s'"
-msgstr "'%s' içindeki çakışan durum güncellenemedi"
-
-#: rerere.c:1053 rerere.c:1060
-#, c-format
-msgid "no remembered resolution for '%s'"
-msgstr "'%s' için hatırlanan çözüm yok"
-
-#: rerere.c:1062
-#, c-format
-msgid "cannot unlink '%s'"
-msgstr "'%s' bağlantısı kesilemiyor"
-
-#: rerere.c:1072
-#, c-format
-msgid "Updated preimage for '%s'"
-msgstr "'%s' için öngörüntü güncellendi"
-
-#: rerere.c:1081
-#, c-format
-msgid "Forgot resolution for '%s'\n"
-msgstr "'%s' için çözüm unutuldu\n"
-
-#: rerere.c:1192
-msgid "unable to open rr-cache directory"
-msgstr "rr-cache dizini açılamıyor"
-
-#: reset.c:112
-msgid "could not determine HEAD revision"
-msgstr "HEAD revizyonu saptanamadı"
-
-#: reset.c:141 reset.c:147 sequencer.c:3696
-#, c-format
-msgid "failed to find tree of %s"
-msgstr "%s ögesinin ağacı bulunamadı"
-
-#: revision.c:2358
-msgid "--unpacked=<packfile> no longer supported"
-msgstr "--unpacked=<paketdosyası> artık desteklenmiyor"
-
-#: revision.c:2712
-msgid "your current branch appears to be broken"
-msgstr "geçerli dalınız bozuk gibi görünüyor"
-
-#: revision.c:2715
-#, 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:2901
-msgid "object filtering requires --objects"
-msgstr "nesne süzme --objects gerektiriyor"
-
-#: revision.c:2918
-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:1262
-#, c-format
-msgid "cannot create async thread: %s"
-msgstr "async iş parçacığı oluşturulamadı: %s"
-
-#: send-pack.c:150
-msgid "unexpected flush packet while reading remote unpack status"
-msgstr "uzak konum açım durumu okunurken beklenmedik floş paketi"
-
-#: send-pack.c:152
-#, c-format
-msgid "unable to parse remote unpack status: %s"
-msgstr "uzak konum açım durumu ayrıştırılamadı: %s"
-
-#: send-pack.c:154
-#, c-format
-msgid "remote unpack failed: %s"
-msgstr "uzak konum açımı başarısız: %s"
-
-#: send-pack.c:378
-msgid "failed to sign the push certificate"
-msgstr "itme sertifikası imzalanamadı"
-
-#: send-pack.c:435
-msgid "send-pack: unable to fork off fetch subprocess"
-msgstr "send-pack: getirme alt süreci çatallanamıyor"
-
-#: 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: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:537
-msgid "the receiving end does not support --signed push"
-msgstr "alıcı uç --signed itmeyi desteklemiyor"
-
-#: send-pack.c:539
-msgid ""
-"not sending a push certificate since the receiving end does not support --"
-"signed push"
-msgstr ""
-"alıcı uç --signed itmeyi desteklemediğinden dolayı bir itme sertifikası "
-"gönderilmiyor"
-
-#: send-pack.c:546
-msgid "the receiving end does not support --atomic push"
-msgstr "alıcı uç --atomic itmeyi desteklemiyor"
-
-#: send-pack.c:551
-msgid "the receiving end does not support push options"
-msgstr "alıcı uç itme seçeneklerini desteklemiyor"
-
-#: sequencer.c:197
-#, c-format
-msgid "invalid commit message cleanup mode '%s'"
-msgstr "geçersiz işleme iletisi temizleme kipi '%s'"
-
-#: sequencer.c:325
-#, c-format
-msgid "could not delete '%s'"
-msgstr "'%s' silinemedi"
-
-#: sequencer.c:345 sequencer.c:4724 builtin/rebase.c:564 builtin/rebase.c:1326
-#: builtin/rm.c:409
-#, c-format
-msgid "could not remove '%s'"
-msgstr "'%s' kaldırılamadı"
-
-#: sequencer.c:355
-msgid "revert"
-msgstr "geri al"
-
-#: sequencer.c:357
-msgid "cherry-pick"
-msgstr "seç-al"
-
-#: sequencer.c:359
-msgid "rebase"
-msgstr "yeniden temellendirme"
-
-#: sequencer.c:361
-#, c-format
-msgid "unknown action: %d"
-msgstr "bilinmeyen eylem: %d"
-
-#: sequencer.c:420
-msgid ""
-"after resolving the conflicts, mark the corrected paths\n"
-"with 'git add <paths>' or 'git rm <paths>'"
-msgstr ""
-"çakışmaları çözdükten sonra doğrusu verilen yolları 'git add <yollar>'\n"
-"veya 'git rm <yollar>' ile imleyin"
-
-#: sequencer.c:423
-msgid ""
-"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 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: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:3288
-#, c-format
-msgid "could not lock '%s'"
-msgstr "'%s' kilitlenemedi"
-
-#: sequencer.c:450 sequencer.c:3087 sequencer.c:3292 sequencer.c:3306
-#: sequencer.c:3557 sequencer.c:5591 strbuf.c:1189 wrapper.c:715
-#, c-format
-msgid "could not write to '%s'"
-msgstr "şuraya yazılamadı: '%s'"
-
-#: sequencer.c:455
-#, c-format
-msgid "could not write eol to '%s'"
-msgstr "satır sonu şuraya yazılamadı: '%s'"
-
-#: sequencer.c:460 sequencer.c:3092 sequencer.c:3294 sequencer.c:3308
-#: sequencer.c:3565
-#, c-format
-msgid "failed to finalize '%s'"
-msgstr "'%s' tamamlanamadı"
-
-#: sequencer.c:473 sequencer.c:1930 sequencer.c:3112 sequencer.c:3547
-#: sequencer.c:3675 builtin/am.c:290 builtin/commit.c:837 builtin/merge.c:1154
-#, c-format
-msgid "could not read '%s'"
-msgstr "'%s' okunamadı"
-
-#: 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:503
-msgid "commit your changes or stash them to proceed."
-msgstr "İlerlemek için değişikliklerinizi işleyin veya zulalayın."
-
-#: sequencer.c:535
-#, c-format
-msgid "%s: fast-forward"
-msgstr "%s: ileri sar"
-
-#: sequencer.c:574 builtin/tag.c:615
-#, c-format
-msgid "Invalid cleanup mode %s"
-msgstr "Geçersiz temizlik kipi %s"
-
-#. TRANSLATORS: %s will be "revert", "cherry-pick" or
-#. "rebase".
-#.
-#: sequencer.c:685
-#, c-format
-msgid "%s: Unable to write new index file"
-msgstr "%s: Yeni indeks dosyası yazılamıyor"
-
-#: sequencer.c:699
-msgid "unable to update cache tree"
-msgstr "önbellek ağacı güncellenemiyor"
-
-#: sequencer.c:713
-msgid "could not resolve HEAD commit"
-msgstr "HEAD işlemesi çözülemedi"
-
-#: sequencer.c:793
-#, c-format
-msgid "no key present in '%.*s'"
-msgstr "'%.*s' içinde bir anahtar yok"
-
-#: sequencer.c:804
-#, c-format
-msgid "unable to dequote value of '%s'"
-msgstr "'%s' ögesinin tırnakları kaldırılamıyor"
-
-#: sequencer.c:841 wrapper.c:219 wrapper.c:389 builtin/am.c:757
-#: builtin/am.c:849 builtin/rebase.c:699
-#, c-format
-msgid "could not open '%s' for reading"
-msgstr "'%s' okuma için açılamadı"
-
-#: sequencer.c:851
-msgid "'GIT_AUTHOR_NAME' already given"
-msgstr "'GIT_AUTHOR_NAME' halihazırda verilmiş"
-
-#: sequencer.c:856
-msgid "'GIT_AUTHOR_EMAIL' already given"
-msgstr "'GIT_AUTHOR_EMAIL' halihazırda verilmiş"
-
-#: sequencer.c:861
-msgid "'GIT_AUTHOR_DATE' already given"
-msgstr "'GIT_AUTHOR_DATE' halihazırda verilmiş"
-
-#: sequencer.c:865
-#, c-format
-msgid "unknown variable '%s'"
-msgstr "bilinmeyen değişken '%s'"
-
-#: sequencer.c:870
-msgid "missing 'GIT_AUTHOR_NAME'"
-msgstr "'GIT_AUTHOR_NAME' eksik"
-
-#: sequencer.c:872
-msgid "missing 'GIT_AUTHOR_EMAIL'"
-msgstr "'GIT_AUTHOR_EMAIL' eksik"
-
-#: sequencer.c:874
-msgid "missing 'GIT_AUTHOR_DATE'"
-msgstr "'GIT_AUTHOR_DATE' eksik"
-
-#: sequencer.c:939
-#, c-format
-msgid ""
-"you have staged changes in your working tree\n"
-"If these changes are meant to be squashed into the previous commit, run:\n"
-"\n"
-"  git commit --amend %s\n"
-"\n"
-"If they are meant to go into a new commit, run:\n"
-"\n"
-"  git commit %s\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şikliklerin bir önceki işlemeye eklenmesi\n"
-"gerekiyorsa şu komutu çalıştırın:\n"
-"\n"
-"\tgit commit --amend %s\n"
-"\n"
-"Yeni bir işleme yapmak istiyorsanız şu komutu çalıştırın:\n"
-"\n"
-"\tgit commit %s\n"
-"\n"
-"Her iki durumda da işiniz bittikten sonra şu komut ile sürdürün:\n"
-"\n"
-"\tgit rebase --continue\n"
-
-#: sequencer.c:1225
-msgid "'prepare-commit-msg' hook failed"
-msgstr "'prepare-commit-msg' başarısız oldu"
-
-#: sequencer.c:1231
-msgid ""
-"Your name and email address were configured automatically based\n"
-"on your username and hostname. Please check that they are accurate.\n"
-"You can suppress this message by setting them explicitly. Run the\n"
-"following command and follow the instructions in your editor to edit\n"
-"your configuration file:\n"
-"\n"
-"    git config --global --edit\n"
-"\n"
-"After doing this, you may fix the identity used for this commit with:\n"
-"\n"
-"    git commit --amend --reset-author\n"
-msgstr ""
-"Adınız ve e-posta adresiniz kullanıcı adınız ve makine adı temel alınarak\n"
-"kendiliğinden yapılandırıldı. Lütfen doğru olup olmadığını denetleyin.\n"
-"Bu iletiyi onları el ile belirterek gizleyebilirsiniz. Aşağıdaki komutu\n"
-"çalıştırın ve yapılandırma dosyanızı düzenlemek için düzenleyicinizdeki\n"
-"yönergeleri izleyin:\n"
-"\n"
-"\tgit config --global --edit\n"
-"\n"
-"Bundan sonra bu işleme için kullanılan kimliği düzeltmek isteyebilirsiniz:\n"
-"\n"
-"\tgit commit --amend --reset-author\n"
-
-#: sequencer.c:1244
-msgid ""
-"Your name and email address were configured automatically based\n"
-"on your username and hostname. Please check that they are accurate.\n"
-"You can suppress this message by setting them explicitly:\n"
-"\n"
-"    git config --global user.name \"Your Name\"\n"
-"    git config --global user.email you@example.com\n"
-"\n"
-"After doing this, you may fix the identity used for this commit with:\n"
-"\n"
-"    git commit --amend --reset-author\n"
-msgstr ""
-"Adınız ve e-posta adresiniz kullanıcı adınız ve makine adı temel alınarak\n"
-"kendiliğinden yapılandırıldı. Lütfen doğru olup olmadığını denetleyin.\n"
-"Bu iletiyi onları el ile belirterek gizleyebilirsiniz:\n"
-"\n"
-"\tgit config --global user.name \"Adınız\"\n"
-"\tgit config --global user.email \"siz@e-posta.com\"\n"
-"\n"
-"Bundan sonra bu işleme için kullanılan kimliği düzeltmek isteyebilirsiniz:\n"
-"\n"
-"\tgit commit --amend --reset-author\n"
-
-#: sequencer.c:1287
-msgid "couldn't look up newly created commit"
-msgstr "yeni yapılan işleme aranamadı"
-
-#: sequencer.c:1289
-msgid "could not parse newly created commit"
-msgstr "yeni yapılan işleme ayrıştırılamadı"
-
-#: sequencer.c:1336
-msgid "unable to resolve HEAD after creating commit"
-msgstr "HEAD, işleme yapıldıktan sonra çözülemiyor"
-
-#: sequencer.c:1338
-msgid "detached HEAD"
-msgstr "ayrık HEAD"
-
-#: sequencer.c:1342
-msgid " (root-commit)"
-msgstr " (kök işleme)"
-
-#: sequencer.c:1363
-msgid "could not parse HEAD"
-msgstr "HEAD ayrıştırılamadı"
-
-#: sequencer.c:1365
-#, c-format
-msgid "HEAD %s is not a commit!"
-msgstr "HEAD %s bir işleme değil"
-
-#: sequencer.c:1369 sequencer.c:1447 builtin/commit.c:1707
-msgid "could not parse HEAD commit"
-msgstr "HEAD işlemesi ayrıştırılamadı"
-
-#: sequencer.c:1425 sequencer.c:2310
-msgid "unable to parse commit author"
-msgstr "işleme yazarı ayrıştırılamıyor"
-
-#: sequencer.c:1436 builtin/am.c:1644 builtin/merge.c:710
-msgid "git write-tree failed to write a tree"
-msgstr "git write-tree bir ağaca yazamadı"
-
-#: sequencer.c:1469 sequencer.c:1589
-#, c-format
-msgid "unable to read commit message from '%s'"
-msgstr "'%s' konumundan işleme iletisi okunamıyor"
-
-#: sequencer.c:1500 sequencer.c:1532
-#, c-format
-msgid "invalid author identity '%s'"
-msgstr "geçersiz yazar kimliği '%s'"
-
-#: sequencer.c:1506
-msgid "corrupt author: missing date information"
-msgstr "hasar görmüş yazar: tarih bilgisi eksik"
-
-#: sequencer.c:1545 builtin/am.c:1671 builtin/commit.c:1821 builtin/merge.c:921
-#: builtin/merge.c:946 t/helper/test-fast-rebase.c:78
-msgid "failed to write commit object"
-msgstr "işleme nesnesi yazılamadı"
-
-#: sequencer.c:1572 sequencer.c:4496 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:1621
-#, c-format
-msgid "could not parse commit %s"
-msgstr "%s işlemesi ayrıştırılamadı"
-
-#: sequencer.c:1626
-#, c-format
-msgid "could not parse parent commit %s"
-msgstr "üst işleme %s ayrıştırılamadı"
-
-#: sequencer.c:1709 sequencer.c:1990
-#, c-format
-msgid "unknown command: %d"
-msgstr "bilinmeyen komut: %d"
-
-#: sequencer.c:1751
-msgid "This is the 1st commit message:"
-msgstr "Birinci işleme iletisi bu:"
-
-#: sequencer.c:1752
-#, c-format
-msgid "This is the commit message #%d:"
-msgstr "İşleme iletisi #%d bu:"
-
-#: sequencer.c:1753
-msgid "The 1st commit message will be skipped:"
-msgstr "Birinci işlemenin iletisi atlanacak:"
-
-#: sequencer.c:1754
-#, c-format
-msgid "The commit message #%d will be skipped:"
-msgstr "İşleme iletisi #%d atlanacak:"
-
-#: sequencer.c:1755
-#, c-format
-msgid "This is a combination of %d commits."
-msgstr "Bu %d işlemenin bir birleşimi."
-
-#: sequencer.c:1902 sequencer.c:1959
-#, c-format
-msgid "cannot write '%s'"
-msgstr "'%s' yazılamıyor"
-
-#: sequencer.c:1949
-msgid "need a HEAD to fixup"
-msgstr "düzeltmek için bir HEAD gerekiyor"
-
-#: sequencer.c:1951 sequencer.c:3592
-msgid "could not read HEAD"
-msgstr "HEAD okunamadı"
-
-#: sequencer.c:1953
-msgid "could not read HEAD's commit message"
-msgstr "HEAD'in işleme iletisi okunamadı"
-
-#: sequencer.c:1977
-#, c-format
-msgid "could not read commit message of %s"
-msgstr "%s işleme iletisi okunamadı"
-
-#: sequencer.c:2087
-msgid "your index file is unmerged."
-msgstr "indeks dosyanız birleştirilmemiş"
-
-#: sequencer.c:2094
-msgid "cannot fixup root commit"
-msgstr "kök işleme düzeltilemiyor"
-
-#: sequencer.c:2113
-#, 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:2121 sequencer.c:2129
-#, c-format
-msgid "commit %s does not have parent %d"
-msgstr "%s işlemesinin %d diye bir üst ögesi yok"
-
-#: sequencer.c:2135
-#, 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:2154
-#, c-format
-msgid "%s: cannot parse parent commit %s"
-msgstr "%s: üst işleme %s ayrıştırılamıyor"
-
-#: sequencer.c:2220
-#, c-format
-msgid "could not rename '%s' to '%s'"
-msgstr "'%s', '%s' olarak yeniden adlandırılamadı"
-
-#: sequencer.c:2280
-#, c-format
-msgid "could not revert %s... %s"
-msgstr "%s geri alınamadı... %s"
-
-#: sequencer.c:2281
-#, c-format
-msgid "could not apply %s... %s"
-msgstr "%s uygulanamadı... %s"
-
-#: sequencer.c:2302
-#, 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:2360
-#, c-format
-msgid "git %s: failed to read the index"
-msgstr "git %s: indeks okunamadı"
-
-#: sequencer.c:2368
-#, c-format
-msgid "git %s: failed to refresh the index"
-msgstr "git %s: indeks yenilenemedi"
-
-#: sequencer.c:2448
-#, c-format
-msgid "%s does not accept arguments: '%s'"
-msgstr "%s argüman kabul etmiyor: '%s'"
-
-#: sequencer.c:2457
-#, c-format
-msgid "missing arguments for %s"
-msgstr "%s için eksik argüman"
-
-#: sequencer.c:2500
-#, c-format
-msgid "could not parse '%s'"
-msgstr "'%s' ayrıştırılamadı"
-
-#: sequencer.c:2561
-#, c-format
-msgid "invalid line %d: %.*s"
-msgstr "geçersiz satır %d: %.*s"
-
-#: sequencer.c:2572
-#, c-format
-msgid "cannot '%s' without a previous commit"
-msgstr "öncesinde bir işleme olmadan '%s' yapılamıyor"
-
-#: sequencer.c:2620 builtin/rebase.c:185
-#, c-format
-msgid "could not read '%s'."
-msgstr "'%s' okunamadı."
-
-#: sequencer.c:2658
-msgid "cancelling a cherry picking in progress"
-msgstr "sürmekte olan bir seç-al iptal ediliyor"
-
-#: sequencer.c:2667
-msgid "cancelling a revert in progress"
-msgstr "sürmekte olan bir geri al iptal ediliyor"
-
-#: sequencer.c:2707
-msgid "please fix this using 'git rebase --edit-todo'."
-msgstr "lütfen bunu 'git rebase --edit-todo' kullanarak onarın."
-
-#: sequencer.c:2709
-#, c-format
-msgid "unusable instruction sheet: '%s'"
-msgstr "kullanılabilir olmayan yönerge tablosu: '%s'"
-
-#: sequencer.c:2714
-msgid "no commits parsed."
-msgstr "Hiçbir işleme ayrıştırılmadı."
-
-#: sequencer.c:2725
-msgid "cannot cherry-pick during a revert."
-msgstr "bir geri al sırasında seç-al yapılamıyor"
-
-#: sequencer.c:2727
-msgid "cannot revert during a cherry-pick."
-msgstr "bir seç-al sırasında geri al yapılamıyor"
-
-#: sequencer.c:2914
-msgid "unusable squash-onto"
-msgstr "kullanılabilir olmayan squash-onto"
-
-#: sequencer.c:2934
-#, c-format
-msgid "malformed options sheet: '%s'"
-msgstr "hatalı oluşturulmuş seçenekler tablosu: '%s'"
-
-#: sequencer.c:3029 sequencer.c:4875
-msgid "empty commit set passed"
-msgstr "boş işleme seti aktarıldı"
-
-#: sequencer.c:3046
-msgid "revert is already in progress"
-msgstr "geri al halihazırda sürüyor"
-
-#: sequencer.c:3048
-#, c-format
-msgid "try \"git revert (--continue | %s--abort | --quit)\""
-msgstr "\"git revert (--continue | %s--abort | --quit)\" deneyin"
-
-#: sequencer.c:3051
-msgid "cherry-pick is already in progress"
-msgstr "seç-al halihazırda sürüyor"
-
-#: sequencer.c:3053
-#, c-format
-msgid "try \"git cherry-pick (--continue | %s--abort | --quit)\""
-msgstr "\"git cherry-pick (--continue | %s--abort | --quit)\" deneyin"
-
-#: sequencer.c:3067
-#, c-format
-msgid "could not create sequencer directory '%s'"
-msgstr "ardıştırıcı dizini '%s' oluşturulamadı"
-
-#: sequencer.c:3082
-msgid "could not lock HEAD"
-msgstr "HEAD kilitlenemedi"
-
-#: sequencer.c:3142 sequencer.c:4585
-msgid "no cherry-pick or revert in progress"
-msgstr "süren bir seç-al veya geri al yok"
-
-#: sequencer.c:3144 sequencer.c:3155
-msgid "cannot resolve HEAD"
-msgstr "HEAD çözülemiyor"
-
-#: sequencer.c:3146 sequencer.c:3190
-msgid "cannot abort from a branch yet to be born"
-msgstr "daha doğmamış bir daldan iptal edilemiyor"
-
-#: sequencer.c:3176 builtin/fetch.c:1030 builtin/fetch.c:1457
-#: builtin/grep.c:774
-#, c-format
-msgid "cannot open '%s'"
-msgstr "'%s' açılamıyor"
-
-#: sequencer.c:3178
-#, c-format
-msgid "cannot read '%s': %s"
-msgstr "'%s' okunamıyor: %s"
-
-#: sequencer.c:3179
-msgid "unexpected end of file"
-msgstr "beklenmedik dosya sonu"
-
-#: sequencer.c:3185
-#, 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:3196
-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:3237
-msgid "no revert in progress"
-msgstr "süren bir geri al yok"
-
-#: sequencer.c:3246
-msgid "no cherry-pick in progress"
-msgstr "süren bir seç-al yok"
-
-#: sequencer.c:3256
-msgid "failed to skip the commit"
-msgstr "işleme atlanamadı"
-
-#: sequencer.c:3263
-msgid "there is nothing to skip"
-msgstr "atlanacak bir şey yok"
-
-#: sequencer.c:3266
-#, c-format
-msgid ""
-"have you committed already?\n"
-"try \"git %s --continue\""
-msgstr ""
-"İşlemeyi yaptınız mı?\n"
-"\"git %s --continue\" deneyin.\""
-
-#: sequencer.c:3428 sequencer.c:4476
-msgid "cannot read HEAD"
-msgstr "HEAD okunamıyor"
-
-#: sequencer.c:3445
-#, c-format
-msgid "unable to copy '%s' to '%s'"
-msgstr "'%s', '%s' konumuna kopyalanamıyor"
-
-#: sequencer.c:3453
-#, c-format
-msgid ""
-"You can amend the commit now, with\n"
-"\n"
-"  git commit --amend %s\n"
-"\n"
-"Once you are satisfied with your changes, run\n"
-"\n"
-"  git rebase --continue\n"
-msgstr ""
-"İşlemeyi şimdi şu komutla değiştirebilirsiniz:\n"
-"\n"
-"\tgit commit --amend %s\n"
-"\n"
-"Değişikliklerinizden memnunsanız şu komutla sürdürün:\n"
-"\n"
-"\tgit rebase --continue\n"
-
-#: sequencer.c:3463
-#, c-format
-msgid "Could not apply %s... %.*s"
-msgstr "%s uygulanamıyor... %.*s"
-
-#: sequencer.c:3470
-#, c-format
-msgid "Could not merge %.*s"
-msgstr "%.*s birleştirilemedi"
-
-#: sequencer.c:3484 sequencer.c:3488 builtin/difftool.c:633
-#, c-format
-msgid "could not copy '%s' to '%s'"
-msgstr "'%s', '%s' konumuna kopyalanamadı"
-
-#: sequencer.c:3499
-#, c-format
-msgid "Executing: %s\n"
-msgstr "Çalıştırılıyor: %s\n"
-
-#: sequencer.c:3510
-#, c-format
-msgid ""
-"execution failed: %s\n"
-"%sYou can fix the problem, and then run\n"
-"\n"
-"  git rebase --continue\n"
-"\n"
-msgstr ""
-"Çalıştırma başarısız: %s\n"
-"%sSorunu çözüp sürdürmek için şunu çalıştırın:\n"
-"\n"
-"\tgit rebase --continue\n"
-"\n"
-
-#: sequencer.c:3516
-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:3522
-#, c-format
-msgid ""
-"execution succeeded: %s\n"
-"but left changes to the index and/or the working tree\n"
-"Commit or stash your changes, and then run\n"
-"\n"
-"  git rebase --continue\n"
-"\n"
-msgstr ""
-"Çalıştırma başarılı oldu: %s,\n"
-"ancak indeksinize ve/veya çalışma ağacınıza 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\n"
-"\n"
-
-#: sequencer.c:3582
-#, c-format
-msgid "illegal label name: '%.*s'"
-msgstr "izin verilmeyen etiket adı: '%.*s'"
-
-#: sequencer.c:3655
-msgid "writing fake root commit"
-msgstr "sahte kök işlemesi yazılıyor"
-
-#: sequencer.c:3660
-msgid "writing squash-onto"
-msgstr "squash-onto yazılıyor"
-
-#: sequencer.c:3739
-#, c-format
-msgid "could not resolve '%s'"
-msgstr "'%s' çözülemedi"
-
-#: sequencer.c:3771
-msgid "cannot merge without a current revision"
-msgstr "güncel bir revizyon olmadan birleştirilemiyor"
-
-#: sequencer.c:3793
-#, c-format
-msgid "unable to parse '%.*s'"
-msgstr "'%.*s' ayrıştırılamıyor"
-
-#: sequencer.c:3802
-#, c-format
-msgid "nothing to merge: '%.*s'"
-msgstr "birleştirilecek bir şey yok: '%.*s'"
-
-#: sequencer.c:3814
-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:3869
-#, c-format
-msgid "could not get commit message of '%s'"
-msgstr "'%s' işlemesinin işleme iletisi alınamadı"
-
-#: sequencer.c:4013
-#, c-format
-msgid "could not even attempt to merge '%.*s'"
-msgstr "şunu birleştirme girişiminde bulunulamadı bile: '%.*s'"
-
-#: sequencer.c:4029
-msgid "merge: Unable to write new index file"
-msgstr "merge: Yeni indeks dosyası yazılamıyor"
-
-#: sequencer.c:4110
-msgid "Cannot autostash"
-msgstr "Kendiliğinden zulalanamıyor"
-
-#: sequencer.c:4113
-#, c-format
-msgid "Unexpected stash response: '%s'"
-msgstr "Beklenmedik zula yanıtı: '%s'"
-
-#: sequencer.c:4119
-#, c-format
-msgid "Could not create directory for '%s'"
-msgstr "'%s' için dizin oluşturulamadı"
-
-#: sequencer.c:4122
-#, c-format
-msgid "Created autostash: %s\n"
-msgstr "Zula kendiliğinden oluşturuldu: %s\n"
-
-#: sequencer.c:4124
-msgid "could not reset --hard"
-msgstr "'reset --hard' yapılamadı"
-
-#: sequencer.c:4148
-#, c-format
-msgid "Applied autostash.\n"
-msgstr "Kendiliğinden zulalama uygulandı.\n"
-
-#: sequencer.c:4160
-#, c-format
-msgid "cannot store %s"
-msgstr "%s depolanamıyor"
-
-#: sequencer.c:4163
-#, c-format
-msgid ""
-"%s\n"
-"Your changes are safe in the stash.\n"
-"You can run \"git stash pop\" or \"git stash drop\" at any time.\n"
-msgstr ""
-"%s\n"
-"Değişiklikleriniz zulada güvende.\n"
-"İstediğiniz zaman \"git stash pop\" veya \"git stash drop\" yapabilirsiniz.\n"
-
-#: sequencer.c:4168
-msgid "Applying autostash resulted in conflicts."
-msgstr "Kendiliğinden zulalama çakışmalara neden oldu."
-
-#: sequencer.c:4169
-msgid "Autostash exists; creating a new stash entry."
-msgstr "Kendiliğinden zulalama mevcut; yeni bir zula girdisi oluşturuluyor."
-
-#: sequencer.c:4225
-msgid "could not detach HEAD"
-msgstr "HEAD ayrılamadı"
-
-#: sequencer.c:4240
-#, c-format
-msgid "Stopped at HEAD\n"
-msgstr "HEAD'de duruldu\n"
-
-#: sequencer.c:4242
-#, c-format
-msgid "Stopped at %s\n"
-msgstr "%s konumunda duruldu\n"
-
-#: sequencer.c:4274
-#, c-format
-msgid ""
-"Could not execute the todo command\n"
-"\n"
-"    %.*s\n"
-"It has been rescheduled; To edit the command before continuing, please\n"
-"edit the todo list first:\n"
-"\n"
-"    git rebase --edit-todo\n"
-"    git rebase --continue\n"
-msgstr ""
-"todo komutu çalıştırılamadı.\n"
-"\n"
-"\t%.*s\n"
-"Yeniden zamanlandı; sürdürmeden önce komutu düzenlemek için lütfen\n"
-"önce yapılacaklar listesini düzenleyin:\n"
-"\n"
-"\tgit rebase --edit-todo\n"
-"\tgit rebase --continue\n"
-
-#: sequencer.c:4320
-#, c-format
-msgid "Rebasing (%d/%d)%s"
-msgstr "Yeniden temellendiriliyor: (%d/%d)%s"
-
-#: sequencer.c:4366
-#, c-format
-msgid "Stopped at %s...  %.*s\n"
-msgstr "%s konumunda durdu... %.*s\n"
-
-#: sequencer.c:4436
-#, c-format
-msgid "unknown command %d"
-msgstr "bilinmeyen komut %d"
-
-#: sequencer.c:4484
-msgid "could not read orig-head"
-msgstr "orig-head okunamadı"
-
-#: sequencer.c:4489
-msgid "could not read 'onto'"
-msgstr "'onto' okunamadı"
-
-#: sequencer.c:4503
-#, c-format
-msgid "could not update HEAD to %s"
-msgstr "HEAD şu konuma güncellenemedi: %s"
-
-#: sequencer.c:4563
-#, c-format
-msgid "Successfully rebased and updated %s.\n"
-msgstr "%s başarıyla yeniden temellendirildi ve güncellendi.\n"
-
-#: sequencer.c:4615
-msgid "cannot rebase: You have unstaged changes."
-msgstr "Yeniden temellendirilemiyor: Hazırlanmamış değişiklikleriniz var."
-
-#: sequencer.c:4624
-msgid "cannot amend non-existing commit"
-msgstr "var olmayan işleme değiştirilemiyor"
-
-#: sequencer.c:4626
-#, c-format
-msgid "invalid file: '%s'"
-msgstr "geçersiz dosya: '%s'"
-
-#: sequencer.c:4628
-#, c-format
-msgid "invalid contents: '%s'"
-msgstr "geçersiz içerik: '%s'"
-
-#: sequencer.c:4631
-msgid ""
-"\n"
-"You have uncommitted changes in your working tree. Please, commit them\n"
-"first and then run 'git rebase --continue' again."
-msgstr ""
-"\n"
-"Ç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:4667 sequencer.c:4706
-#, c-format
-msgid "could not write file: '%s'"
-msgstr "dosya yazılamadı: '%s'"
-
-#: sequencer.c:4722
-msgid "could not remove CHERRY_PICK_HEAD"
-msgstr "CHERRY_PICK_HEAD kaldırılamadı"
-
-#: sequencer.c:4732
-msgid "could not commit staged changes."
-msgstr "Hazırlanmış değişiklikler işlenemedi."
-
-#: sequencer.c:4852
-#, c-format
-msgid "%s: can't cherry-pick a %s"
-msgstr "%s: Bir %s seçip alınamıyor"
-
-#: sequencer.c:4856
-#, c-format
-msgid "%s: bad revision"
-msgstr "%s hatalı revizyon"
-
-#: sequencer.c:4891
-msgid "can't revert as initial commit"
-msgstr "ilk işleme geri alınamaz"
-
-#: sequencer.c:5162 sequencer.c:5391
-#, c-format
-msgid "skipped previously applied commit %s"
-msgstr "daha önce uygulanan %s işlemesi atlandı"
-
-#: sequencer.c:5232 sequencer.c:5407
-msgid "use --reapply-cherry-picks to include skipped commits"
-msgstr "atlanan işlemeleri içermek için --reapply-cherry-picks kullanın"
-
-#: sequencer.c:5378
-msgid "make_script: unhandled options"
-msgstr "make_script: ele alınmayan seçenekler"
-
-#: sequencer.c:5381
-msgid "make_script: error preparing revisions"
-msgstr "make_script: revizyonlar hazırlanırken hata"
-
-#: sequencer.c:5639 sequencer.c:5656
-msgid "nothing to do"
-msgstr "yapılacak bir şey yok"
-
-#: sequencer.c:5675
-msgid "could not skip unnecessary pick commands"
-msgstr "gerekli olmayan seçim komutları atlanamadı"
-
-#: sequencer.c:5775
-msgid "the script was already rearranged."
-msgstr "betik halihazırda yeniden düzenlenmişti"
-
-#: setup.c:135
-#, c-format
-msgid "'%s' is outside repository at '%s'"
-msgstr "'%s', '%s' konumunda depo dışında"
-
-#: setup.c:187
-#, c-format
-msgid ""
-"%s: no such path in the working tree.\n"
-"Use 'git <command> -- <path>...' to specify paths that do not exist locally."
-msgstr ""
-"%s: Çalışma ağacında böyle bir yol yok.\n"
-"Yerelde var olmayan yolları belirtmek için 'git <komut> -- <yol>... kullanın."
-
-#: setup.c:200
-#, c-format
-msgid ""
-"ambiguous argument '%s': unknown revision or path not in the working tree.\n"
-"Use '--' to separate paths from revisions, like this:\n"
-"'git <command> [<revision>...] -- [<file>...]'"
-msgstr ""
-"Belirsiz argüman '%s': Çalışma ağacında olmayan bilinmeyen revizyon veya "
-"yol.\n"
-"Yolları revizyonlardan ayırmak için '--' kullanın, şöyle:\n"
-"'git <komut> [<revizyon>...] -- [<dosya>...]'"
-
-#: setup.c:266
-#, c-format
-msgid "option '%s' must come before non-option arguments"
-msgstr "'%s' seçeneği seçenek olmayan argümanlardan önce gelmeli"
-
-#: setup.c:285
-#, c-format
-msgid ""
-"ambiguous argument '%s': both revision and filename\n"
-"Use '--' to separate paths from revisions, like this:\n"
-"'git <command> [<revision>...] -- [<file>...]'"
-msgstr ""
-"Belirsiz argüman '%s': Hem revizyon hem dosya adı.\n"
-"Yolları revizyonlardan ayırmak için '--' kullanın, şöyle:\n"
-"'git <komut> [<revizyon>...] -- [<dosya>...]'"
-
-#: setup.c:421
-msgid "unable to set up work tree using invalid config"
-msgstr "geçersiz yapılandırma kullanılarak çalışma ağacı kurulamıyor"
-
-#: setup.c:425 builtin/rev-parse.c:895
-msgid "this operation must be run in a work tree"
-msgstr "bu işlem bir çalışma ağacı içinde çalıştırılmalı"
-
-#: setup.c:724
-#, c-format
-msgid "Expected git repo version <= %d, found %d"
-msgstr "Beklenen git repo sürümü <= %d, %d bulundu"
-
-#: setup.c:732
-msgid "unknown repository extension found:"
-msgid_plural "unknown repository extensions found:"
-msgstr[0] "bilinmeyen depo genişletmesi bulundu:"
-msgstr[1] "bilinmeyen depo genişletmeleri bulundu:"
-
-#: setup.c:746
-msgid "repo version is 0, but v1-only extension found:"
-msgid_plural "repo version is 0, but v1-only extensions found:"
-msgstr[0] "depo sürümü 0; ancak v1'e özel genişletme bulundu:"
-msgstr[1] "depo sürümü 0; ancak v1'e özel genişletmeler bulundu:"
-
-#: setup.c:767
-#, c-format
-msgid "error opening '%s'"
-msgstr "'%s' açılırken hata"
-
-#: setup.c:769
-#, c-format
-msgid "too large to be a .git file: '%s'"
-msgstr "bir .git dosyası olabilmek için çok büyük: '%s'"
-
-#: setup.c:771
-#, c-format
-msgid "error reading %s"
-msgstr "%s okunurken hata"
-
-#: setup.c:773
-#, c-format
-msgid "invalid gitfile format: %s"
-msgstr "geçersiz gitfile biçimi: %s"
-
-#: setup.c:775
-#, c-format
-msgid "no path in gitfile: %s"
-msgstr "gitfile içinde yol yok: %s"
-
-#: setup.c:777
-#, c-format
-msgid "not a git repository: %s"
-msgstr "bir git deposu değil: %s"
-
-#: setup.c:879
-#, c-format
-msgid "'$%s' too big"
-msgstr "'$%s' çok büyük"
-
-#: setup.c:893
-#, c-format
-msgid "not a git repository: '%s'"
-msgstr "bir git deposu değil: '%s'"
-
-#: setup.c:922 setup.c:924 setup.c:955
-#, c-format
-msgid "cannot chdir to '%s'"
-msgstr "'%s' konumuna chdir yapılamıyor"
-
-#: setup.c:927 setup.c:983 setup.c:993 setup.c:1032 setup.c:1040
-msgid "cannot come back to cwd"
-msgstr "cwd'ye geri dönülemiyor"
-
-#: setup.c:1054
-#, c-format
-msgid "failed to stat '%*s%s%s'"
-msgstr "'%*s%s%s' bilgileri alınamadı"
-
-#: setup.c:1338
-msgid "Unable to read current working directory"
-msgstr "Şu anki çalışma dizini okunamıyor"
-
-#: setup.c:1347 setup.c:1353
-#, c-format
-msgid "cannot change to '%s'"
-msgstr "şuraya değiştirilemiyor: '%s'"
-
-#: setup.c:1358
-#, c-format
-msgid "not a git repository (or any of the parent directories): %s"
-msgstr "bir git deposu (veya üst dizinlerinden birisi) değil: %s"
-
-#: setup.c:1364
-#, 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 ""
-"Bir git deposu veya (%s bağlama noktasına kadar olan üstü) değil\n"
-"Dosya sistemi sınırında duruluyor (GIT_DISCOVERY_ACROSS_FILESYSTEM "
-"ayarlanmamış)."
-
-#: setup.c:1374
-#, c-format
-msgid ""
-"unsafe repository ('%s' is owned by someone else)\n"
-"To add an exception for this directory, call:\n"
-"\n"
-"\tgit config --global --add safe.directory %s"
-msgstr ""
-"güvensiz depo ('%s' sahibi bir başkası)\n"
-"Bu dizin için bir istisna eklemek için şunu çağırın:\n"
-"\n"
-"\tgit config --global --add safe.directory %s"
-
-#: setup.c:1502
-#, c-format
-msgid ""
-"problem with core.sharedRepository filemode value (0%.3o).\n"
-"The owner of files must always have read and write permissions."
-msgstr ""
-"core.sharedRepository dosya kipi değeri ile sorun (0%.3o).\n"
-"Dosyaların sahibinin her zaman okuma ve yazma izni olması gerekir."
-
-#: setup.c:1564
-msgid "fork failed"
-msgstr "çatallama başarısız"
-
-#: setup.c:1569
-msgid "setsid failed"
-msgstr "setsid başarısız"
-
-#: sparse-index.c:285
-#, c-format
-msgid "index entry is a directory, but not sparse (%08x)"
-msgstr "indeks girdisi bir dizin; ancak aralıklı değil (%08x)"
-
-#: split-index.c:9
-msgid "cannot use split index with a sparse index"
-msgstr "bir aralıklı indeksle bölünmüş indeks kullanılamıyor"
-
-#. TRANSLATORS: IEC 80000-13:2008 gibibyte
-#: strbuf.c:851
-#, c-format
-msgid "%u.%2.2u GiB"
-msgstr "%u.%2.2u GiB"
-
-#. TRANSLATORS: IEC 80000-13:2008 gibibyte/second
-#: strbuf.c:853
-#, c-format
-msgid "%u.%2.2u GiB/s"
-msgstr "%u.%2.2u GiB/sn"
-
-#. TRANSLATORS: IEC 80000-13:2008 mebibyte
-#: strbuf.c:861
-#, c-format
-msgid "%u.%2.2u MiB"
-msgstr "%u.%2.2u MiB"
-
-#. TRANSLATORS: IEC 80000-13:2008 mebibyte/second
-#: strbuf.c:863
-#, c-format
-msgid "%u.%2.2u MiB/s"
-msgstr "%u.%2.2u MiB/sn"
-
-#. TRANSLATORS: IEC 80000-13:2008 kibibyte
-#: strbuf.c:870
-#, c-format
-msgid "%u.%2.2u KiB"
-msgstr "%u.%2.2u KiB"
-
-#. TRANSLATORS: IEC 80000-13:2008 kibibyte/second
-#: strbuf.c:872
-#, c-format
-msgid "%u.%2.2u KiB/s"
-msgstr "%u.%2.2u KiB/sn"
-
-#. TRANSLATORS: IEC 80000-13:2008 byte
-#: strbuf.c:878
-#, c-format
-msgid "%u byte"
-msgid_plural "%u bytes"
-msgstr[0] "%u bayt"
-msgstr[1] "%u bayt"
-
-#. TRANSLATORS: IEC 80000-13:2008 byte/second
-#: strbuf.c:880
-#, c-format
-msgid "%u byte/s"
-msgid_plural "%u bytes/s"
-msgstr[0] "%u bayt/sn"
-msgstr[1] "%u bayt/sn"
-
-#: strbuf.c:1187 wrapper.c:217 wrapper.c:387 builtin/am.c:766
-#: builtin/rebase.c:653
-#, c-format
-msgid "could not open '%s' for writing"
-msgstr "'%s' yazma için açılamadı"
-
-#: strbuf.c:1196
-#, c-format
-msgid "could not edit '%s'"
-msgstr "'%s' düzenlenemedi"
-
-#: submodule-config.c:238
-#, c-format
-msgid "ignoring suspicious submodule name: %s"
-msgstr "kuşku doğuran altmodül yok sayılıyor: %s"
-
-#: submodule-config.c:305
-msgid "negative values not allowed for submodule.fetchjobs"
-msgstr "submodule.fetchjobs için negatif değerlere izin verilmiyor"
-
-#: submodule-config.c:403
-#, c-format
-msgid "ignoring '%s' which may be interpreted as a command-line option: %s"
-msgstr ""
-"'%s' bir komut satırı seçeneği olarak yorumlanabileceğinden yok sayılıyor: %s"
-
-#: submodule-config.c:500 builtin/push.c:489 builtin/send-pack.c:148
-#, c-format
-msgid "invalid value for '%s'"
-msgstr "'%s' için geçersiz değer"
-
-#: submodule-config.c:828
-#, c-format
-msgid "Could not update .gitmodules entry %s"
-msgstr ".gitmodules girdisi %s güncellenemedi"
-
-#: submodule.c:115 submodule.c:144
-msgid "Cannot change unmerged .gitmodules, resolve merge conflicts first"
-msgstr ""
-"Birleştirilmemiş .gitmodules değiştirilemiyor, önce birleştirme "
-"çakışmalarını çözün"
-
-#: submodule.c:119 submodule.c:148
-#, c-format
-msgid "Could not find section in .gitmodules where path=%s"
-msgstr ".gitmodules içinde path=%s olan bölüm bulunamadı"
-
-#: submodule.c:155
-#, c-format
-msgid "Could not remove .gitmodules entry for %s"
-msgstr "%s için .gitmodules girdisi kaldırılamadı"
-
-#: submodule.c:166
-msgid "staging updated .gitmodules failed"
-msgstr "güncellenmiş .gitmodules'u hazırlama başarısız oldu"
-
-#: submodule.c:346
-#, c-format
-msgid "in unpopulated submodule '%s'"
-msgstr "içi doldurulmamış '%s' altmodülünde"
-
-#: submodule.c:377
-#, c-format
-msgid "Pathspec '%s' is in submodule '%.*s'"
-msgstr "Yol belirteci '%s' '%.*s' altmodülünde"
-
-#: submodule.c:454
-#, c-format
-msgid "bad --ignore-submodules argument: %s"
-msgstr "hatalı --ignore-submodules argümanı: %s"
-
-#: submodule.c:866
-#, c-format
-msgid ""
-"Submodule in commit %s at path: '%s' collides with a submodule named the "
-"same. Skipping it."
-msgstr ""
-"%s işlemesinde '%s' yolunda bulunan altmodül, aynı adlı bir altmodülle "
-"çarpışıyor. Atlanıyor."
-
-#: submodule.c:987
-#, 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:1069
-#, c-format
-msgid ""
-"Could not run 'git rev-list <commits> --not --remotes -n 1' command in "
-"submodule %s"
-msgstr ""
-"'%s' altmodülünde 'git rev-list <commits> --not --remotes -n 1' "
-"çalıştırılamadı"
-
-#: submodule.c:1192
-#, c-format
-msgid "process for submodule '%s' failed"
-msgstr "'%s' altmodülü için işlem başarısız oldu"
-
-#: submodule.c:1221 builtin/branch.c:714 builtin/submodule--helper.c:2827
-msgid "Failed to resolve HEAD as a valid ref."
-msgstr "HEAD geçerli bir başvuru olarak çözülemedi."
-
-#: submodule.c:1232
-#, c-format
-msgid "Pushing submodule '%s'\n"
-msgstr "'%s' altmodülü itiliyor\n"
-
-#: submodule.c:1235
-#, c-format
-msgid "Unable to push submodule '%s'\n"
-msgstr "'%s' altmodülü itilemiyor\n"
-
-#: submodule.c:1567
-#, c-format
-msgid "Fetching submodule %s%s\n"
-msgstr "%s%s altmodülü getiriliyor\n"
-
-#: submodule.c:1589
-#, c-format
-msgid "Could not access submodule '%s'\n"
-msgstr "'%s' altmodülüne erişilemedi\n"
-
-#: submodule.c:1618
-#, c-format
-msgid "Could not access submodule '%s' at commit %s\n"
-msgstr "'%s' altmodülüne %s işlemesinde erişilemedi\n"
-
-#: submodule.c:1629
-#, c-format
-msgid "Fetching submodule %s%s at commit %s\n"
-msgstr "%s%s altmodülü %s işlemesinde getiriliyor\n"
-
-#: submodule.c:1849
-#, c-format
-msgid ""
-"Errors during submodule fetch:\n"
-"%s"
-msgstr ""
-"Altmodül getirilirken hata:\n"
-"%s"
-
-#: submodule.c:1874
-#, c-format
-msgid "'%s' not recognized as a git repository"
-msgstr "'%s' bir git deposu olarak tanımlanamadı"
-
-#: submodule.c:1891
-#, 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:1932
-#, 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:2007
-#, c-format
-msgid "could not start 'git status' in submodule '%s'"
-msgstr "'%s' altmodülü içinde 'git status' başlatılamadı"
-
-#: submodule.c:2020
-#, 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:2037
-#, 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:2064 submodule.c:2379
-#, c-format
-msgid "could not recurse into submodule '%s'"
-msgstr "'%s' altmodülüne özyinelenemedi"
-
-#: submodule.c:2086
-msgid "could not reset submodule index"
-msgstr "altmodül indeksi sıfırlanamadı"
-
-#: submodule.c:2128
-#, c-format
-msgid "submodule '%s' has dirty index"
-msgstr "'%s' altmodülü indeksi kirli"
-
-#: submodule.c:2182
-#, c-format
-msgid "Submodule '%s' could not be updated."
-msgstr "'%s' altmodülü güncellenemedi."
-
-#: submodule.c:2250
-#, 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:2271
-#, 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:2283 submodule.c:2343
-#, c-format
-msgid "could not lookup name for submodule '%s'"
-msgstr "'%s' altmodülü adı aranamadı"
-
-#: submodule.c:2287
-#, c-format
-msgid "refusing to move '%s' into an existing git dir"
-msgstr "'%s' ögesini mevcut bir git dizinine taşıma reddediliyor"
-
-#: submodule.c:2293
-#, c-format
-msgid ""
-"Migrating git directory of '%s%s' from\n"
-"'%s' to\n"
-"'%s'\n"
-msgstr ""
-"'%s%s' git dizini göç ettiriliyor:\n"
-"şuradan: '%s'\n"
-"şuraya: '%s'\n"
-
-#: submodule.c:2424
-msgid "could not start ls-files in .."
-msgstr "ls-files şurada başlatılamadı .."
-
-#: submodule.c:2464
-#, c-format
-msgid "ls-tree returned unexpected return code %d"
-msgstr "ls-tree beklenmedik bir biçimde %d kodu ile çıktı"
-
-#: symlinks.c:244
-#, c-format
-msgid "failed to lstat '%s'"
-msgstr "'%s', lstat yapılamadı"
-
-#: trailer.c:244
-#, c-format
-msgid "running trailer command '%s' failed"
-msgstr "'%s' artbilgi komutunu çalıştırma başarısız oldu"
-
-#: 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 "bilinmeyen değer '%s' ('%s' anahtarı için)"
-
-#: trailer.c:547 trailer.c:552 trailer.c:557 builtin/remote.c:300
-#: builtin/remote.c:328
-#, c-format
-msgid "more than one %s"
-msgstr "birden çok %s"
-
-#: trailer.c:743
-#, c-format
-msgid "empty trailer token in trailer '%.*s'"
-msgstr "'%.*s' artbilgisi içinde boş artbilgi jetonu"
-
-#: trailer.c:763
-#, c-format
-msgid "could not read input file '%s'"
-msgstr "'%s' girdi dosyası okunamadı"
-
-#: trailer.c:766 builtin/mktag.c:88 imap-send.c:1563
-msgid "could not read from stdin"
-msgstr "stdin'den okunamadı"
-
-#: trailer.c:1024 wrapper.c:760
-#, c-format
-msgid "could not stat %s"
-msgstr "%s dosya bilgileri alınamadı"
-
-#: trailer.c:1026
-#, c-format
-msgid "file %s is not a regular file"
-msgstr "%s dosyası sıradan bir dosya değil"
-
-#: trailer.c:1028
-#, c-format
-msgid "file %s is not writable by user"
-msgstr "%s dosyası kullanıcı tarafından yazılabilir değil"
-
-#: trailer.c:1040
-msgid "could not open temporary file"
-msgstr "geçici dosya açılamadı"
-
-#: trailer.c:1080
-#, c-format
-msgid "could not rename temporary file to %s"
-msgstr "geçici dosya adı %s olarak değiştirilemedi"
-
-#: transport-helper.c:62 transport-helper.c:91
-msgid "full write to remote helper failed"
-msgstr "uzak konum yardımcısına tam yazım başarısız"
-
-#: transport-helper.c:145
-#, c-format
-msgid "unable to find remote helper for '%s'"
-msgstr "'%s' için uzak konum yardımcısı bulunamadı"
-
-#: transport-helper.c:161 transport-helper.c:575
-msgid "can't dup helper output fd"
-msgstr "uzak konum yardımcısı çıktısı için dosya açıklayıcısı çoğaltılamıyor"
-
-#: transport-helper.c:214
-#, c-format
-msgid ""
-"unknown mandatory capability %s; this remote helper probably needs newer "
-"version of Git"
-msgstr ""
-"bilinmeyen zorunlu %s yeteneği; bu uzak konum yardımcısı büyük olasılıkla "
-"Git'in daha yeni bir sürümüne gereksinim duyuyor"
-
-#: transport-helper.c:220
-msgid "this remote helper should implement refspec capability"
-msgstr "bu uzak konum yardımcısı refspec yapabilirliğini yerine getirmeli"
-
-#: transport-helper.c:287 transport-helper.c:429
-#, c-format
-msgid "%s unexpectedly said: '%s'"
-msgstr "%s beklenmedik bir biçimde şunu söyledi: '%s'"
-
-#: transport-helper.c:417
-#, c-format
-msgid "%s also locked %s"
-msgstr "%s ayrıca şunu kilitledi: %s"
-
-#: transport-helper.c:497
-msgid "couldn't run fast-import"
-msgstr "fast-import çalıştırılamadı"
-
-#: transport-helper.c:520
-msgid "error while running fast-import"
-msgstr "fast-import çalıştırılırken hata"
-
-#: transport-helper.c:549 transport-helper.c:1254
-#, c-format
-msgid "could not read ref %s"
-msgstr "%s başvurusu okunamadı"
-
-#: transport-helper.c:594
-#, c-format
-msgid "unknown response to connect: %s"
-msgstr "'connect'e bilinmeyen yanıt: %s"
-
-#: transport-helper.c:616
-msgid "setting remote service path not supported by protocol"
-msgstr "uzak servis yolu ayarlama protokol tarafından desteklenmiyor"
-
-#: transport-helper.c:618
-msgid "invalid remote service path"
-msgstr "geçersiz uzak konum servis yolu"
-
-#: transport-helper.c:661 transport.c:1496
-msgid "operation not supported by protocol"
-msgstr "işlem protokol tarafından desteklenmiyor"
-
-#: transport-helper.c:664
-#, c-format
-msgid "can't connect to subservice %s"
-msgstr "%s altservisine bağlanılamıyor"
-
-#: transport-helper.c:693 transport.c:415
-msgid "--negotiate-only requires protocol v2"
-msgstr "--negotiate-only protokolün ikinci sürümünü gerektiriyor"
-
-#: transport-helper.c:758
-msgid "'option' without a matching 'ok/error' directive"
-msgstr "eşleşen bir 'tamam/hata' direktifi olmadan 'option'"
-
-#: transport-helper.c:801
-#, c-format
-msgid "expected ok/error, helper said '%s'"
-msgstr "tamam/hata bekleniyordu, yardımcı şunu söyledi: '%s'"
-
-#: transport-helper.c:862
-#, c-format
-msgid "helper reported unexpected status of %s"
-msgstr "yardımcı %s beklenmedik durumu bildirdi"
-
-#: transport-helper.c:945
-#, c-format
-msgid "helper %s does not support dry-run"
-msgstr "%s yardımcısı 'dry-run' desteklemiyor"
-
-#: transport-helper.c:948
-#, c-format
-msgid "helper %s does not support --signed"
-msgstr "%s yardımcısı --signed desteklemiyor"
-
-#: transport-helper.c:951
-#, c-format
-msgid "helper %s does not support --signed=if-asked"
-msgstr "%s yardımcısı --signed=if-asked desteklemiyor"
-
-#: transport-helper.c:956
-#, c-format
-msgid "helper %s does not support --atomic"
-msgstr "%s yardımcısı --atomic desteklemiyor"
-
-#: transport-helper.c:960
-#, c-format
-msgid "helper %s does not support --%s"
-msgstr "%s yardımcısı --%s desteklemiyor"
-
-#: transport-helper.c:967
-#, c-format
-msgid "helper %s does not support 'push-option'"
-msgstr "%s yardımcısı 'push-option' desteklemiyor"
-
-#: transport-helper.c:1067
-msgid "remote-helper doesn't support push; refspec needed"
-msgstr "remote-helper itme desteklemiyor; başvuru belirteci gerekli"
-
-#: transport-helper.c:1072
-#, c-format
-msgid "helper %s does not support 'force'"
-msgstr "%s yardımcısı 'force' desteklemiyor"
-
-#: transport-helper.c:1119
-msgid "couldn't run fast-export"
-msgstr "fast-export çalıştırılamadı"
-
-#: transport-helper.c:1124
-msgid "error while running fast-export"
-msgstr "fast-export çalıştırılırken hata"
-
-#: transport-helper.c:1149
-#, c-format
-msgid ""
-"No refs in common and none specified; doing nothing.\n"
-"Perhaps you should specify a branch.\n"
-msgstr ""
-"Ortak başvuru yok ve hiç belirtilmemiş; bir şey yapılmayacak.\n"
-"Belki de bir dal belirtmelisiniz.\n"
-
-#: transport-helper.c:1231
-#, c-format
-msgid "unsupported object format '%s'"
-msgstr "desteklenmeyen nesne biçimi '%s'"
-
-#: transport-helper.c:1240
-#, c-format
-msgid "malformed response in ref list: %s"
-msgstr "başvuru listesinde hatalı oluşturulmuş yanıt: %s"
-
-#: transport-helper.c:1392
-#, c-format
-msgid "read(%s) failed"
-msgstr "read(%s) başarısız oldu"
-
-#: transport-helper.c:1419
-#, c-format
-msgid "write(%s) failed"
-msgstr "write(%s) başarısız oldu"
-
-#: transport-helper.c:1468
-#, c-format
-msgid "%s thread failed"
-msgstr "%s iş parçacığı başarısız oldu"
-
-#: transport-helper.c:1472
-#, c-format
-msgid "%s thread failed to join: %s"
-msgstr "%s iş parçacığı eklenemedi: %s"
-
-#: transport-helper.c:1491 transport-helper.c:1495
-#, 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:1532
-#, c-format
-msgid "%s process failed to wait"
-msgstr "%s işlemi bekleyemedi"
-
-#: transport-helper.c:1536
-#, c-format
-msgid "%s process failed"
-msgstr "%s işlemi başarısız oldu"
-
-#: transport-helper.c:1554 transport-helper.c:1563
-msgid "can't start thread for copying data"
-msgstr "veri kopyalama için iş parçacığı başlatılamıyor"
-
-#: transport.c:116
-#, c-format
-msgid "Would set upstream of '%s' to '%s' of '%s'\n"
-msgstr "'%s' üst kaynağı '%s' (kaynak: '%s') olarak ayarlanacak\n"
-
-#: transport.c:138
-#, c-format
-msgid "could not read bundle '%s'"
-msgstr "'%s' demeti okunamadı"
-
-#: transport.c:234
-#, c-format
-msgid "transport: invalid depth option '%s'"
-msgstr "transport: Geçersiz derinlik seçeneği '%s'"
-
-#: transport.c:289
-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:290
-msgid "server options require protocol version 2 or later"
-msgstr "sunucu seçenekleri protokol sürüm 2 veya sonrasını gerektirir"
-
-#: transport.c:418
-msgid "server does not support wait-for-done"
-msgstr "Sunucu, wait-for-done desteklemiyor"
-
-#: transport.c:770
-msgid "could not parse transport.color.* config"
-msgstr "transport.color.* yapılandırması ayrıştırılamadı"
-
-#: transport.c:845
-msgid "support for protocol v2 not implemented yet"
-msgstr "protokol v2 desteği henüz yerine getirilmedi"
-
-#: transport.c:978
-#, c-format
-msgid "unknown value for config '%s': %s"
-msgstr "'%s' yapılandırması için bilinmeyen değer: %s"
-
-#: transport.c:1044
-#, c-format
-msgid "transport '%s' not allowed"
-msgstr "'%s' taşıyıcısına izin verilmiyor"
-
-#: transport.c:1093
-msgid "git-over-rsync is no longer supported"
-msgstr "git-over-rsync artık desteklenmiyor"
-
-#: transport.c:1196
-#, c-format
-msgid ""
-"The following submodule paths contain changes that can\n"
-"not be found on any remote:\n"
-msgstr ""
-"Aşağıdaki altmodül yolları başka hiçbir uzak konumda bulunamayan\n"
-"değişiklikler içeriyor:\n"
-
-#: transport.c:1200
-#, c-format
-msgid ""
-"\n"
-"Please try\n"
-"\n"
-"\tgit push --recurse-submodules=on-demand\n"
-"\n"
-"or cd to the path and use\n"
-"\n"
-"\tgit push\n"
-"\n"
-"to push them to a remote.\n"
-"\n"
-msgstr ""
-"\n"
-"Lütfen\n"
-"\n"
-"\tgit push --recurse-submodules=on-demand\n"
-"\n"
-"deneyin veya bir uzak konuma itmek için yola cd yapıp\n"
-"\n"
-"\tgit push\n"
-"\n"
-"kullanın.\n"
-"\n"
-
-#: transport.c:1208
-msgid "Aborting."
-msgstr "İptal ediliyor."
-
-#: transport.c:1354
-msgid "failed to push all needed submodules"
-msgstr "gereken tüm altmodüller itilemedi"
-
-#: tree-walk.c:33
-msgid "too-short tree object"
-msgstr "ağaç nesnesi çok kısa"
-
-#: tree-walk.c:39
-msgid "malformed mode in tree entry"
-msgstr "ağaç girdisinde hatalı oluşturulmuş kip"
-
-#: tree-walk.c:43
-msgid "empty filename in tree entry"
-msgstr "ağaç girdisinde boş dosya adı"
-
-#: tree-walk.c:118
-msgid "too-short tree file"
-msgstr "ağaç dosyası çok kısa"
-
-#: unpack-trees.c:118
-#, c-format
-msgid ""
-"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 ""
-"Çıkış ile aşağıdaki dosyalardaki yerel değişikliklerin üzerine yazılacak:\n"
-"%%sLütfen dal değiştirmeden önce değişikliklerinizi işleyin veya zulalayın."
-
-#: unpack-trees.c:120
-#, c-format
-msgid ""
-"Your local changes to the following files would be overwritten by checkout:\n"
-"%%s"
-msgstr ""
-"Çıkış ile aşağıdaki dosyalardaki yerel değişikliklerin üzerine yazılacak:\n"
-"%%s"
-
-#: unpack-trees.c:123
-#, c-format
-msgid ""
-"Your local changes to the following files would be overwritten by merge:\n"
-"%%sPlease commit your changes or stash them before you merge."
-msgstr ""
-"Birleştirme ile aşağıdaki dosyalardaki yerel değişikliklerin üzerine "
-"yazılacak:\n"
-"%%sLütfen birleştirmeden önce değişikliklerinizi işleyin veya zulalayın."
-
-#: unpack-trees.c:125
-#, c-format
-msgid ""
-"Your local changes to the following files would be overwritten by merge:\n"
-"%%s"
-msgstr ""
-"Birleştirme ile aşağıdaki dosyalardaki yerel değişikliklerin üzerine "
-"yazılacak:\n"
-"%%s"
-
-#: unpack-trees.c:128
-#, c-format
-msgid ""
-"Your local changes to the following files would be overwritten by %s:\n"
-"%%sPlease commit your changes or stash them before you %s."
-msgstr ""
-"%s ile aşağıdaki dosyalardaki yerel değişikliklerin üzerine yazılacak:\n"
-"%%sLütfen %s yapmadan önce değişikliklerinizi işleyin veya zulalayın."
-
-#: unpack-trees.c:130
-#, c-format
-msgid ""
-"Your local changes to the following files would be overwritten by %s:\n"
-"%%s"
-msgstr ""
-"%s ile aşağıdaki dosyalardaki yerel değişikliklerin üzerine yazılacak:\n"
-"%%s"
-
-#: unpack-trees.c:135
-#, c-format
-msgid ""
-"Updating the following directories would lose untracked files in them:\n"
-"%s"
-msgstr ""
-"Aşağıdaki dizinleri güncellemek içlerindeki izlenmeyen dosyaları kaybeder:\n"
-"%s"
-
-#: unpack-trees.c:138
-#, c-format
-msgid ""
-"Refusing to remove the current working directory:\n"
-"%s"
-msgstr ""
-"Geçerli çalışma dizinini kaldırma reddediliyor:\n"
-"%s"
-
-#: unpack-trees.c:142
-#, c-format
-msgid ""
-"The following untracked working tree files would be removed by checkout:\n"
-"%%sPlease move or remove them before you switch branches."
-msgstr ""
-"Çıkış ile aşağıdaki izlenmeyen çalışma ağacı dosyaları kaldırılacak:\n"
-"%%sLütfen dal değiştirmeden önce onları taşıyın veya kaldırın."
-
-#: unpack-trees.c:144
-#, c-format
-msgid ""
-"The following untracked working tree files would be removed by checkout:\n"
-"%%s"
-msgstr ""
-"Çıkış ile aşağıdaki izlenmeyen çalışma ağacı dosyaları kaldırılacak:\n"
-"%%s"
-
-#: unpack-trees.c:147
-#, c-format
-msgid ""
-"The following untracked working tree files would be removed by merge:\n"
-"%%sPlease move or remove them before you merge."
-msgstr ""
-"Birleştirme ile aşağıdaki izlenmeyen çalışma ağacı dosyaları kaldırılacak:\n"
-"%%sLütfen birleştirmeden önce onları taşıyın veya kaldırın."
-
-#: unpack-trees.c:149
-#, c-format
-msgid ""
-"The following untracked working tree files would be removed by merge:\n"
-"%%s"
-msgstr ""
-"Birleştirme ile aşağıdaki izlenmeyen çalışma ağacı dosyaları kaldırılacak:\n"
-"%%s"
-
-#: unpack-trees.c:152
-#, c-format
-msgid ""
-"The following untracked working tree files would be removed by %s:\n"
-"%%sPlease move or remove them before you %s."
-msgstr ""
-"%s ile aşağıdaki izlenmeyen çalışma ağacı dosyaları kaldırılacak:\n"
-"%%sLütfen %s yapmadan önce onları taşıyın veya kaldırın."
-
-#: unpack-trees.c:154
-#, c-format
-msgid ""
-"The following untracked working tree files would be removed by %s:\n"
-"%%s"
-msgstr ""
-"%s ile aşağıdaki izlenmeyen çalışma ağacı dosyaları kaldırılacak:\n"
-"%%s"
-
-#: unpack-trees.c:160
-#, c-format
-msgid ""
-"The following untracked working tree files would be overwritten by "
-"checkout:\n"
-"%%sPlease move or remove them before you switch branches."
-msgstr ""
-"Çıkış ile aşağıdaki izlenmeyen çalışma ağacı dosyalarının üzerine "
-"yazılacak:\n"
-"%%sLütfen dal değiştirmeden önce onları taşıyın veya kaldırın."
-
-#: unpack-trees.c:162
-#, c-format
-msgid ""
-"The following untracked working tree files would be overwritten by "
-"checkout:\n"
-"%%s"
-msgstr ""
-"Çıkış ile aşağıdaki izlenmeyen çalışma ağacı dosyalarının üzerine "
-"yazılacak:\n"
-"%%s"
-
-#: unpack-trees.c:165
-#, c-format
-msgid ""
-"The following untracked working tree files would be overwritten by merge:\n"
-"%%sPlease move or remove them before you merge."
-msgstr ""
-"Birleştirme ile aşağıdaki izlenmeyen çalışma ağacı dosyalarının üzerine "
-"yazılacak:\n"
-"%%sLütfen birleştirmeden önce onları taşıyın veya kaldırın."
-
-#: unpack-trees.c:167
-#, c-format
-msgid ""
-"The following untracked working tree files would be overwritten by merge:\n"
-"%%s"
-msgstr ""
-"Birleştirme ile aşağıdaki izlenmeyen çalışma ağacı dosyalarının üzerine "
-"yazılacak:\n"
-"%%s"
-
-#: unpack-trees.c:170
-#, c-format
-msgid ""
-"The following untracked working tree files would be overwritten by %s:\n"
-"%%sPlease move or remove them before you %s."
-msgstr ""
-"%s ile aşağıdaki izlenmeyen çalışma ağacı dosyalarının üzerine yazılacak:\n"
-"%%sLütfen %s yapmadan önce onları taşıyın veya kaldırın."
-
-#: unpack-trees.c:172
-#, c-format
-msgid ""
-"The following untracked working tree files would be overwritten by %s:\n"
-"%%s"
-msgstr ""
-"%s ile aşağıdaki izlenmeyen çalışma ağacı dosyalarının üzerine yazılacak:\n"
-"%%s"
-
-#: unpack-trees.c:180
-#, c-format
-msgid "Entry '%s' overlaps with '%s'.  Cannot bind."
-msgstr "'%s' girdisi '%s' ile üst üste biniyor. Bağlanamıyor."
-
-#: unpack-trees.c:183
-#, c-format
-msgid ""
-"Cannot update submodule:\n"
-"%s"
-msgstr ""
-"Altmodül güncellenemiyor:\n"
-"%s"
-
-#: unpack-trees.c:186
-#, c-format
-msgid ""
-"The following paths are not up to date and were left despite sparse "
-"patterns:\n"
-"%s"
-msgstr ""
-"Aşağıdaki yollar güncel değil ve seyrek dizgilere rağmen terk edilmiş:\n"
-"%s"
-
-#: unpack-trees.c:188
-#, c-format
-msgid ""
-"The following paths are unmerged and were left despite sparse patterns:\n"
-"%s"
-msgstr ""
-"Aşağıdaki yollar birleştirilmemiş ve seyrek dizgilere rağmen terk edilmiş:\n"
-"%s"
-
-#: unpack-trees.c:190
-#, c-format
-msgid ""
-"The following paths were already present and thus not updated despite sparse "
-"patterns:\n"
-"%s"
-msgstr ""
-"Aşağıdaki yollar halihazırda vardı ve buna göre, seyrek dizgilere rağmen "
-"güncellenmedi:\n"
-"%s"
-
-#: unpack-trees.c:270
-#, c-format
-msgid "Aborting\n"
-msgstr "İptal ediliyor\n"
-
-#: unpack-trees.c:297
-#, c-format
-msgid ""
-"After fixing the above paths, you may want to run `git sparse-checkout "
-"reapply`.\n"
-msgstr ""
-"Yukarıdaki yolları onardıktan sonra 'git sparse-checkout reapply' yapmak "
-"isteyebilirsiniz.\n"
-
-#: unpack-trees.c:358
-msgid "Updating files"
-msgstr "Dosyalar güncelleniyor"
-
-#: unpack-trees.c:390
-msgid ""
-"the following paths have collided (e.g. case-sensitive paths\n"
-"on a case-insensitive filesystem) and only one from the same\n"
-"colliding group is in the working tree:\n"
-msgstr ""
-"Aşağıdaki yollar birbiriyle çarpıştı (örn. BÜYÜK/küçük harf duyarlı\n"
-"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:1664
-msgid "Updating index flags"
-msgstr "İndeks bayrakları güncelleniyor"
-
-#: unpack-trees.c:2925
-#, 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:1579
-msgid "expected flush after fetch arguments"
-msgstr "getir argümanlarından sonra floş bekleniyordu"
-
-#: urlmatch.c:163
-msgid "invalid URL scheme name or missing '://' suffix"
-msgstr "geçersiz URL şeması veya eksik '://' eki"
-
-#: urlmatch.c:187 urlmatch.c:346 urlmatch.c:405
-#, c-format
-msgid "invalid %XX escape sequence"
-msgstr "geçersiz %XX kaçış sırası"
-
-#: urlmatch.c:215
-msgid "missing host and scheme is not 'file:'"
-msgstr "ana bilgisayar eksik ve şema 'file:' değil"
-
-#: urlmatch.c:232
-msgid "a 'file:' URL may not have a port number"
-msgstr "bir 'file:' URL'sinin kapı numarası olmayabilir"
-
-#: urlmatch.c:247
-msgid "invalid characters in host name"
-msgstr "ana bilgisayar adında geçersiz karakter"
-
-#: urlmatch.c:292 urlmatch.c:303
-msgid "invalid port number"
-msgstr "geçersiz kapı numarası"
-
-#: urlmatch.c:371
-msgid "invalid '..' path segment"
-msgstr "geçersiz '..' yol kesimi"
-
-#: walker.c:170
-msgid "Fetching objects"
-msgstr "Nesneler getiriliyor"
-
-#: worktree.c:237 builtin/am.c:2210 builtin/bisect--helper.c:156
-#, c-format
-msgid "failed to read '%s'"
-msgstr "'%s' okunamadı"
-
-#: worktree.c:304
-#, c-format
-msgid "'%s' at main working tree is not the repository directory"
-msgstr "ana çalışma ağacındaki '%s' depo dizini değil"
-
-#: worktree.c:315
-#, c-format
-msgid "'%s' file does not contain absolute path to the working tree location"
-msgstr "'%s' dosyası çalışma ağacı konumuna olan tam yolu içermiyor"
-
-#: worktree.c:327
-#, c-format
-msgid "'%s' does not exist"
-msgstr "'%s' mevcut değil"
-
-#: worktree.c:333
-#, c-format
-msgid "'%s' is not a .git file, error code %d"
-msgstr "'%s' bir .git dosyası değil, hata kodu %d"
-
-#: worktree.c:342
-#, c-format
-msgid "'%s' does not point back to '%s'"
-msgstr "'%s' şuna geri işaret etmiyor: '%s'"
-
-#: worktree.c:600
-msgid "not a directory"
-msgstr "bir dizin değil"
-
-#: worktree.c:609
-msgid ".git is not a file"
-msgstr ".git bir dosya değil"
-
-#: worktree.c:611
-msgid ".git file broken"
-msgstr ".git dosyası bozuk"
-
-#: worktree.c:613
-msgid ".git file incorrect"
-msgstr ".git dosyası doğru değil"
-
-#: worktree.c:719
-msgid "not a valid path"
-msgstr "geçerli bir yol değil"
-
-#: worktree.c:725
-msgid "unable to locate repository; .git is not a file"
-msgstr "depo konumu bulunamıyor: .git bir dosya değil"
-
-#: worktree.c:729
-msgid "unable to locate repository; .git file does not reference a repository"
-msgstr "depo konumu bulunamıyor: .git dosyası bir depoya başvurmuyor"
-
-#: worktree.c:733
-msgid "unable to locate repository; .git file broken"
-msgstr "depo konumu bulunamıyor: .git dosyası bozuk"
-
-#: worktree.c:739
-msgid "gitdir unreadable"
-msgstr "okunamayan gitdir"
-
-#: worktree.c:743
-msgid "gitdir incorrect"
-msgstr "doğru olmayan gitdir"
-
-#: worktree.c:768
-msgid "not a valid directory"
-msgstr "geçerli bir dizin değil"
-
-#: worktree.c:774
-msgid "gitdir file does not exist"
-msgstr "gitdir dosyası mevcut değil"
-
-#: worktree.c:779 worktree.c:788
-#, c-format
-msgid "unable to read gitdir file (%s)"
-msgstr "gitdir dosyası (%s) okunamıyor"
-
-#: worktree.c:798
-#, c-format
-msgid "short read (expected %<PRIuMAX> bytes, read %<PRIuMAX>)"
-msgstr "az okundu (%<PRIuMAX> bayt bekleniyordu, %<PRIuMAX> okundu)"
-
-#: worktree.c:806
-msgid "invalid gitdir file"
-msgstr "geçersiz gitdir dosyası"
-
-#: worktree.c:814
-msgid "gitdir file points to non-existent location"
-msgstr "gitdir dosyası var olmayan bir konuma işaret ediyor"
-
-#: worktree.c:830
-#, c-format
-msgid "unable to set %s in '%s'"
-msgstr "%s, '%s' içinde ayarlanamıyor"
-
-#: worktree.c:832
-#, c-format
-msgid "unable to unset %s in '%s'"
-msgstr "%s, '%s' içinde ayarı kaldırılamıyor"
-
-#: worktree.c:852
-msgid "failed to set extensions.worktreeConfig setting"
-msgstr "extensions.worktreeConfig yapılandırması ayarlanamadı"
-
-#: wrapper.c:161
-#, c-format
-msgid "could not setenv '%s'"
-msgstr "setenv '%s' yapılamadı"
-
-#: wrapper.c:213
-#, c-format
-msgid "unable to create '%s'"
-msgstr "'%s' oluşturulamıyor"
-
-#: wrapper.c:215 wrapper.c:385
-#, c-format
-msgid "could not open '%s' for reading and writing"
-msgstr "'%s' okuma ve yazma için açılamadı"
-
-#: wrapper.c:416 wrapper.c:683
-#, c-format
-msgid "unable to access '%s'"
-msgstr "'%s' erişilemiyor"
-
-#: wrapper.c:691
-msgid "unable to get current working directory"
-msgstr "geçerli çalışma dizini alınamıyor"
-
-#: wt-status.c:158
-msgid "Unmerged paths:"
-msgstr "Birleştirilmemiş yollar:"
-
-#: wt-status.c:187 wt-status.c:219
-msgid "  (use \"git restore --staged <file>...\" to unstage)"
-msgstr ""
-"  (hazırlıktan çıkarmak için \"git restore --staged <dosya>...\" kullanın)"
-
-#: wt-status.c:190 wt-status.c:222
-#, c-format
-msgid "  (use \"git restore --source=%s --staged <file>...\" to unstage)"
-msgstr ""
-"  (hazırlıktan çıkarmak için \"git restore --source=%s --staged <dosya>...\" "
-"kullanın)"
-
-#: wt-status.c:193 wt-status.c:225
-msgid "  (use \"git rm --cached <file>...\" to unstage)"
-msgstr "  (hazırlıktan çıkarmak için \"git rm --cached <dosya>...\" kullanın)"
-
-#: wt-status.c:197
-msgid "  (use \"git add <file>...\" to mark resolution)"
-msgstr "  (hazırlığı bitirmek için \"git add <dosya>...\" kullanın)"
-
-#: wt-status.c:199 wt-status.c:203
-msgid "  (use \"git add/rm <file>...\" as appropriate to mark resolution)"
-msgstr ""
-"  (hazırlığı bitirmek için uygun bir biçimde \"git add/rm <dosya>...\" "
-"kullanın)"
-
-#: wt-status.c:201
-msgid "  (use \"git rm <file>...\" to mark resolution)"
-msgstr "  (hazırlığı bitirmek için \"git rm <dosya>...\" kullanın)"
-
-#: wt-status.c:211 wt-status.c:1140
-msgid "Changes to be committed:"
-msgstr "İşlenecek değişiklikler:"
-
-#: wt-status.c:234 wt-status.c:1149
-msgid "Changes not staged for commit:"
-msgstr "İşleme için hazırlanmamış değişiklikler:"
-
-#: wt-status.c:238
-msgid "  (use \"git add <file>...\" to update what will be committed)"
-msgstr "  (işlenecekleri güncellemek için \"git add <dosya>...\" kullanın)"
-
-#: wt-status.c:240
-msgid "  (use \"git add/rm <file>...\" to update what will be committed)"
-msgstr "  (işlenecekleri güncellemek için \"git add/rm <dosya>...\" kullanın)"
-
-#: wt-status.c:241
-msgid ""
-"  (use \"git restore <file>...\" to discard changes in working directory)"
-msgstr ""
-"  (çalışma dizinindeki değişiklikleri atmak için \"git restore <dosya>...\" "
-"kullanın)"
-
-#: wt-status.c:243
-msgid "  (commit or discard the untracked or modified content in submodules)"
-msgstr "  (altmodüllerdeki izlenmeyen/değiştirilen içeriği gönder veya at)"
-
-#: wt-status.c:254
-#, c-format
-msgid "  (use \"git %s <file>...\" to include in what will be committed)"
-msgstr "  (işlenecekler arasına koymak için \"git %s <dosya>...\" kullanın)"
-
-#: wt-status.c:266
-msgid "both deleted:"
-msgstr "ikimiz de sildik:"
-
-#: wt-status.c:268
-msgid "added by us:"
-msgstr "biz ekledik:"
-
-#: wt-status.c:270
-msgid "deleted by them:"
-msgstr "onlar sildi:"
-
-#: wt-status.c:272
-msgid "added by them:"
-msgstr "onlar ekledi:"
-
-#: wt-status.c:274
-msgid "deleted by us:"
-msgstr "biz sildik:"
-
-#: wt-status.c:276
-msgid "both added:"
-msgstr "ikimiz de ekledik:"
-
-#: wt-status.c:278
-msgid "both modified:"
-msgstr "ikimiz de değiştirdik:"
-
-#: wt-status.c:288
-msgid "new file:"
-msgstr "yeni dosya:"
-
-#: wt-status.c:290
-msgid "copied:"
-msgstr "kopyalandı:"
-
-#: wt-status.c:292
-msgid "deleted:"
-msgstr "silindi:"
-
-#: wt-status.c:294
-msgid "modified:"
-msgstr "değiştirildi:"
-
-#: wt-status.c:296
-msgid "renamed:"
-msgstr "yeniden adlandırıldı:"
-
-#: wt-status.c:298
-msgid "typechange:"
-msgstr "türü değiştirildi:"
-
-#: wt-status.c:300
-msgid "unknown:"
-msgstr "bilinmiyor:"
-
-#: wt-status.c:302
-msgid "unmerged:"
-msgstr "birleştirilmedi:"
-
-#: wt-status.c:382
-msgid "new commits, "
-msgstr "yeni işlemeler, "
-
-#: wt-status.c:384
-msgid "modified content, "
-msgstr "değiştirilen içerik, "
-
-#: wt-status.c:386
-msgid "untracked content, "
-msgstr "izlenmeyen içerik, "
-
-#: wt-status.c:973
-#, c-format
-msgid "Your stash currently has %d entry"
-msgid_plural "Your stash currently has %d entries"
-msgstr[0] "Zulanızda şu anda %d girdi var"
-msgstr[1] "Zulanızda şu anda %d girdi var"
-
-#: wt-status.c:1004
-msgid "Submodules changed but not updated:"
-msgstr "Değiştirilen; ancak güncellenmeyen altmodüller:"
-
-#: wt-status.c:1006
-msgid "Submodule changes to be committed:"
-msgstr "İşlenecek altmodül değişiklikleri:"
-
-#: wt-status.c:1088
-msgid ""
-"Do not modify or remove the line above.\n"
-"Everything below it will be ignored."
-msgstr ""
-"Yukarıdaki satırı değiştirmeyin veya kaldırmayın.\n"
-"Altındaki her şey yok sayılacaktır."
-
-#: wt-status.c:1180
-#, c-format
-msgid ""
-"\n"
-"It took %.2f seconds to compute the branch ahead/behind values.\n"
-"You can use '--no-ahead-behind' to avoid this.\n"
-msgstr ""
-"\n"
-"Dal önünde/arkasında değerlerini hesaplama %.2f saniye sürdü.\n"
-"Bundan kaçınmak için --no-ahead-behind kullanabilirsiniz.\n"
-
-#: wt-status.c:1210
-msgid "You have unmerged paths."
-msgstr "Birleştirilmemiş yollarınız var."
-
-#: wt-status.c:1213
-msgid "  (fix conflicts and run \"git commit\")"
-msgstr "  (çakışmaları onar ve \"git commit\" çalıştır)"
-
-#: wt-status.c:1215
-msgid "  (use \"git merge --abort\" to abort the merge)"
-msgstr "  (birleştirmeyi iptal etmek için \"git merge --abort\" kullanın)"
-
-#: wt-status.c:1219
-msgid "All conflicts fixed but you are still merging."
-msgstr "Tüm çakışmalar onarıldı; ancak siz hâlâ birleştiriyorsunuz."
-
-#: wt-status.c:1222
-msgid "  (use \"git commit\" to conclude merge)"
-msgstr "  (birleştirmeyi sonuçlandırmak için \"git commit\" kullanın)"
-
-#: wt-status.c:1233
-msgid "You are in the middle of an am session."
-msgstr "Bir 'am' oturumunun tam ortasındasınız."
-
-#: wt-status.c:1236
-msgid "The current patch is empty."
-msgstr "Mevcut yama boş."
-
-#: wt-status.c:1241
-msgid "  (fix conflicts and then run \"git am --continue\")"
-msgstr "  (çakışmaları onar ve ardından \"git am --continue\" çalıştır)"
-
-#: wt-status.c:1243
-msgid "  (use \"git am --skip\" to skip this patch)"
-msgstr "  (bu yamayı atlamak için \"git am --skip\" kullanın"
-
-#: wt-status.c:1246
-msgid ""
-"  (use \"git am --allow-empty\" to record this patch as an empty commit)"
-msgstr ""
-"  (yamayı boş işleme kaydı olarak yazmak için \"git am --allow-empty\" "
-"kullanın)"
-
-#: wt-status.c:1248
-msgid "  (use \"git am --abort\" to restore the original branch)"
-msgstr "  (ilk dalı eski durumuna getirmek için \"git am --abort\" kullanın)"
-
-#: wt-status.c:1381
-msgid "git-rebase-todo is missing."
-msgstr "git-rebase-todo eksik"
-
-#: wt-status.c:1383
-msgid "No commands done."
-msgstr "Yerine getirilen bir komut yok."
-
-#: wt-status.c:1386
-#, c-format
-msgid "Last command done (%<PRIuMAX> command done):"
-msgid_plural "Last commands done (%<PRIuMAX> commands done):"
-msgstr[0] "Son yerine getirilen komut (%<PRIuMAX> komut yapıldı):"
-msgstr[1] "Son yerine getirilen komutlar (%<PRIuMAX> komut yapıldı):"
-
-#: wt-status.c:1397
-#, c-format
-msgid "  (see more in file %s)"
-msgstr "  (ek bilgi için %s dosyasına bakın)"
-
-#: wt-status.c:1402
-msgid "No commands remaining."
-msgstr "Kalan komut yok."
-
-#: wt-status.c:1405
-#, c-format
-msgid "Next command to do (%<PRIuMAX> remaining command):"
-msgid_plural "Next commands to do (%<PRIuMAX> remaining commands):"
-msgstr[0] "Sıradaki yerine getirilecek komut (%<PRIuMAX> kalan komut):"
-msgstr[1] "Sıradaki yerine getirilecek komutlar (%<PRIuMAX> kalan komut):"
-
-#: wt-status.c:1413
-msgid "  (use \"git rebase --edit-todo\" to view and edit)"
-msgstr "  (görüntüleme ve düzenleme için \"git rebase --edit-todo\" kullanın)"
-
-#: wt-status.c:1425
-#, c-format
-msgid "You are currently rebasing branch '%s' on '%s'."
-msgstr "Şu anda '%s' dalını '%s' üzerine yeniden temellendiriyorsunuz."
-
-#: wt-status.c:1430
-msgid "You are currently rebasing."
-msgstr "Şu anda yeniden temellendirme yapmaktasınız."
-
-#: wt-status.c:1443
-msgid "  (fix conflicts and then run \"git rebase --continue\")"
-msgstr "  (çakışmaları çözün ve ardından \"git rebase --continue\" çalıştır)"
-
-#: wt-status.c:1445
-msgid "  (use \"git rebase --skip\" to skip this patch)"
-msgstr "  (bu yamayı atlamak için \"git rebase --skip\" kullanın)"
-
-#: wt-status.c:1447
-msgid "  (use \"git rebase --abort\" to check out the original branch)"
-msgstr "  (ilk dalı çıkış yapmak için \"git rebase --abort\" kullanın)"
-
-#: wt-status.c:1454
-msgid "  (all conflicts fixed: run \"git rebase --continue\")"
-msgstr "  (tüm çakışmalar onarıldı: \"git rebase --continue\" çalıştır)"
-
-#: wt-status.c:1458
-#, c-format
-msgid ""
-"You are currently splitting a commit while rebasing branch '%s' on '%s'."
-msgstr ""
-"Şu anda '%s' dalını '%s' üzerine yeniden temellendirirken bir işlemeyi "
-"parçalara bölüyorsunuz."
-
-#: wt-status.c:1463
-msgid "You are currently splitting a commit during a rebase."
-msgstr ""
-"Şu anda yeniden temellendirme sırasında bir işlemeyi parçalara bölüyorsunuz."
-
-#: wt-status.c:1466
-msgid "  (Once your working directory is clean, run \"git rebase --continue\")"
-msgstr ""
-"  (Çalışma dizininiz temizlendiğinde \"git rebase --continue\" çalıştır)"
-
-#: wt-status.c:1470
-#, c-format
-msgid "You are currently editing a commit while rebasing branch '%s' on '%s'."
-msgstr ""
-"Şu anda '%s' dalını '%s' üzerine yeniden temellendirirken bir işlemeyi "
-"düzenliyorsunuz."
-
-#: wt-status.c:1475
-msgid "You are currently editing a commit during a rebase."
-msgstr "Şu anda yeniden temellendirme sırasında bir işlemeyi düzenliyorsunuz."
-
-#: wt-status.c:1478
-msgid "  (use \"git commit --amend\" to amend the current commit)"
-msgstr "  (geçerli işlemeyi değiştirmek için \"git commit --amend\" kullanın)"
-
-#: wt-status.c:1480
-msgid ""
-"  (use \"git rebase --continue\" once you are satisfied with your changes)"
-msgstr ""
-"  (değişikliklerinizden memnunsanız \"git rebase --continue\" kullanın)"
-
-#: wt-status.c:1491
-msgid "Cherry-pick currently in progress."
-msgstr "Seç-al şu anda sürmekte."
-
-#: wt-status.c:1494
-#, c-format
-msgid "You are currently cherry-picking commit %s."
-msgstr "Şu anda %s işlemesini seç-al yapıyorsunuz."
-
-#: wt-status.c:1501
-msgid "  (fix conflicts and run \"git cherry-pick --continue\")"
-msgstr "  (çakışmaları onar ve \"git cherry-pick --continue\" çalıştır)"
-
-#: wt-status.c:1504
-msgid "  (run \"git cherry-pick --continue\" to continue)"
-msgstr "  (sürdürmek için \"git cherry-pick --continue\" çalıştır)"
-
-#: wt-status.c:1507
-msgid "  (all conflicts fixed: run \"git cherry-pick --continue\")"
-msgstr "  (tüm çakışmalar onarıldı: \"git cherry-pick --continue\" çalıştır)"
-
-#: wt-status.c:1509
-msgid "  (use \"git cherry-pick --skip\" to skip this patch)"
-msgstr "  (bu yamayı atlamak için \"git cherry-pick --skip\" kullanın)"
-
-#: wt-status.c:1511
-msgid "  (use \"git cherry-pick --abort\" to cancel the cherry-pick operation)"
-msgstr "  (seç-al işlemini iptal için \"git cherry-pick --abort\" kullanın)"
-
-#: wt-status.c:1521
-msgid "Revert currently in progress."
-msgstr "Geriye al şu anda sürmekte."
-
-#: wt-status.c:1524
-#, c-format
-msgid "You are currently reverting commit %s."
-msgstr "Şu anda %s işlemesini geri alıyorsunuz."
-
-#: wt-status.c:1530
-msgid "  (fix conflicts and run \"git revert --continue\")"
-msgstr "  (çakışmaları onar ve \"git revert --continue\" çalıştır)"
-
-#: wt-status.c:1533
-msgid "  (run \"git revert --continue\" to continue)"
-msgstr "  (sürdürmek için \"git revert --continue\" çalıştır)"
-
-#: wt-status.c:1536
-msgid "  (all conflicts fixed: run \"git revert --continue\")"
-msgstr "  (tüm çakışmalar onarıldı: \"git revert --continue\" çalıştır)"
-
-#: wt-status.c:1538
-msgid "  (use \"git revert --skip\" to skip this patch)"
-msgstr "  (bu yamayı atlamak için \"git revert --skip\" kullanın)"
-
-#: wt-status.c:1540
-msgid "  (use \"git revert --abort\" to cancel the revert operation)"
-msgstr "  (geri al işlemini iptal için \"git revert --abort\" kullanın)"
-
-#: wt-status.c:1550
-#, c-format
-msgid "You are currently bisecting, started from branch '%s'."
-msgstr "Şu anda ikili arama yapıyorsunuz, '%s' dalından başlandı."
-
-#: wt-status.c:1554
-msgid "You are currently bisecting."
-msgstr "Şu anda ikili arama yapıyorsunuz."
-
-#: wt-status.c:1557
-msgid "  (use \"git bisect reset\" to get back to the original branch)"
-msgstr "  (ilk dala dönmek için \"git bisect reset\" kullanın)"
-
-#: wt-status.c:1568
-msgid "You are in a sparse checkout."
-msgstr "Bir aralıklı çıkış içindesiniz."
-
-#: wt-status.c:1571
-#, c-format
-msgid "You are in a sparse checkout with %d%% of tracked files present."
-msgstr "İzlenen dosyaların %%%d mevcut olduğu aralıklı bir çıkıştasınız."
-
-#: wt-status.c:1815
-msgid "On branch "
-msgstr "Üzerinde bulunulan dal: "
-
-#: wt-status.c:1822
-msgid "interactive rebase in progress; onto "
-msgstr "şunun üzerine etkileşimli yeniden temellendirme sürmekte: "
-
-#: wt-status.c:1824
-msgid "rebase in progress; onto "
-msgstr "şunun üzerine yeniden temellendirme sürmekte: "
-
-#: wt-status.c:1829
-msgid "HEAD detached at "
-msgstr "HEAD şurada ayrıldı: "
-
-#: wt-status.c:1831
-msgid "HEAD detached from "
-msgstr "HEAD şundan ayrıldı: "
-
-#: wt-status.c:1834
-msgid "Not currently on any branch."
-msgstr "Şu anda bir dal üzerinde değil."
-
-#: wt-status.c:1851
-msgid "Initial commit"
-msgstr "İlk işleme"
-
-#: wt-status.c:1852
-msgid "No commits yet"
-msgstr "Henüz bir işleme yok"
-
-#: wt-status.c:1866
-msgid "Untracked files"
-msgstr "İzlenmeyen dosyalar"
-
-#: wt-status.c:1868
-msgid "Ignored files"
-msgstr "Yok sayılan dosyalar"
-
-#: wt-status.c:1872
-#, c-format
-msgid ""
-"It took %.2f seconds to enumerate untracked files. 'status -uno'\n"
-"may speed it up, but you have to be careful not to forget to add\n"
-"new files yourself (see 'git help status')."
-msgstr ""
-"İzlenmeyen dosyaların ortaya dökülmesi %.2f saniye sürdü. 'status -uno'\n"
-"bunu hızlandırabilir; ancak yeni dosyaları eklemeyi unutmamanız\n"
-"konusunda dikkatli olmalısınız (ek bilgi için 'git help status')."
-
-#: wt-status.c:1878
-#, c-format
-msgid "Untracked files not listed%s"
-msgstr "İzlenmeyen dosyalar listelenmiyor%s"
-
-#: wt-status.c:1880
-msgid " (use -u option to show untracked files)"
-msgstr " (izlenmeyen dosyaları göstermek için -u seçeneğini kullanın)"
-
-#: wt-status.c:1886
-msgid "No changes"
-msgstr "Değişiklik yok"
-
-#: wt-status.c:1891
-#, c-format
-msgid "no changes added to commit (use \"git add\" and/or \"git commit -a\")\n"
-msgstr ""
-"İşlemeye eklenen değişiklik yok (\"git add\" ve/veya \"git commit -a\" "
-"kullanın)\n"
-
-#: wt-status.c:1895
-#, c-format
-msgid "no changes added to commit\n"
-msgstr "İşlemeye eklenen değişiklik yok\n"
-
-#: wt-status.c:1899
-#, c-format
-msgid ""
-"nothing added to commit but untracked files present (use \"git add\" to "
-"track)\n"
-msgstr ""
-"işlemeye bir şey eklenmedi; ancak izlenmeyen dosyalar var (izlemek için "
-"\"git add\" kullanın)\n"
-
-#: wt-status.c:1903
-#, c-format
-msgid "nothing added to commit but untracked files present\n"
-msgstr "işlemeye bir şey eklenmedi; ancak izlenmeyen dosyalar var\n"
-
-#: wt-status.c:1907
-#, c-format
-msgid "nothing to commit (create/copy files and use \"git add\" to track)\n"
-msgstr ""
-"İşlenecek bir şey yok (dosyalar oluşturun/kopyalayın ve izlemek için \"git "
-"add\" kullanın)\n"
-
-#: wt-status.c:1911 wt-status.c:1917
-#, c-format
-msgid "nothing to commit\n"
-msgstr "İşlenecek bir şey yok\n"
-
-#: wt-status.c:1914
-#, c-format
-msgid "nothing to commit (use -u to show untracked files)\n"
-msgstr ""
-"İşlenecek bir şey yok (izlenmeyen dosyaları göstermek için -u kullanın)\n"
-
-#: wt-status.c:1919
-#, c-format
-msgid "nothing to commit, working tree clean\n"
-msgstr "İşlenecek bir şey yok, çalışma ağacı temiz\n"
-
-#: wt-status.c:2024
-msgid "No commits yet on "
-msgstr "Şurada henüz bir işleme yok: "
-
-#: wt-status.c:2028
-msgid "HEAD (no branch)"
-msgstr "HEAD (dal yok)"
-
-#: wt-status.c:2059
-msgid "different"
-msgstr "değişik"
-
-#: wt-status.c:2061 wt-status.c:2069
-msgid "behind "
-msgstr "şunun arkasında: "
-
-#: wt-status.c:2064 wt-status.c:2067
-msgid "ahead "
-msgstr "şunun önünde: "
-
-#. TRANSLATORS: the action is e.g. "pull with rebase"
-#: wt-status.c:2605
-#, c-format
-msgid "cannot %s: You have unstaged changes."
-msgstr "%s yapılamıyor: Hazırlanmamış değişiklikleriniz var."
-
-#: wt-status.c:2611
-msgid "additionally, your index contains uncommitted changes."
-msgstr "Ek olarak, indeksiniz işlenmemiş değişiklikler içeriyor."
-
-#: wt-status.c:2613
-#, c-format
-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:205
-msgid "could not send IPC command"
-msgstr "IPC komutu gönderilemedi"
-
-#: compat/simple-ipc/ipc-unix-socket.c:212
-msgid "could not read IPC response"
-msgstr "IPC yanıtı okunamadı"
-
-#: compat/simple-ipc/ipc-unix-socket.c:892
-#, c-format
-msgid "could not start accept_thread '%s'"
-msgstr "accept_thread '%s' başlatılamadı"
-
-#: compat/simple-ipc/ipc-unix-socket.c:904
-#, 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:353
-#, c-format
-msgid "failed to unlink '%s'"
-msgstr "'%s' bağlantısı kesilemedi"
-
-#: compat/fsmonitor/fsm-listen-darwin.c:355
-msgid "Unable to create FSEventStream."
-msgstr "FSEventStream oluşturulamadı."
-
-#: compat/fsmonitor/fsm-listen-darwin.c:403
-msgid "Failed to start the FSEventStream"
-msgstr "FSEventStream başlatılamadı"
-
-#: builtin/add.c:26
 msgid "git add [<options>] [--] <pathspec>..."
 msgstr "git add [<seçenekler>] [--] <yol-blrtç>..."
 
-#: builtin/add.c:63
 #, c-format
 msgid "cannot chmod %cx '%s'"
 msgstr "%cx '%s' chmod yapılamıyor"
 
-#: builtin/add.c:105
 #, c-format
 msgid "unexpected diff status %c"
 msgstr "beklenmedik diff durumu %c"
 
-#: builtin/add.c:110 builtin/commit.c:299
 msgid "updating files failed"
 msgstr "dosyaları güncelleme başarısız"
 
-#: builtin/add.c:120
 #, c-format
 msgid "remove '%s'\n"
 msgstr "kaldır: '%s'\n"
 
-#: builtin/add.c:204
 msgid "Unstaged changes after refreshing the index:"
 msgstr "İndeksi yeniledikten sonra hazırlanmamış değişiklikler:"
 
-#: builtin/add.c:312 builtin/rev-parse.c:993
 msgid "Could not read the index"
 msgstr "İndeks okunamadı"
 
-#: builtin/add.c:325
 msgid "Could not write patch"
 msgstr "Yama yazılamadı"
 
-#: builtin/add.c:328
 msgid "editing patch failed"
 msgstr "yamayı düzenleme başarısız"
 
-#: builtin/add.c:331
 #, c-format
 msgid "Could not stat '%s'"
 msgstr "'%s' dosya bilgileri alınamadı"
 
-#: builtin/add.c:333
 msgid "Empty patch. Aborted."
 msgstr "Boş yama. İptal edildi."
 
-#: builtin/add.c:339
 #, c-format
 msgid "Could not apply '%s'"
 msgstr "'%s' uygulanamadı"
 
-#: builtin/add.c:347
 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:367 builtin/clean.c:927 builtin/fetch.c:175 builtin/mv.c:124
-#: builtin/prune-packed.c:14 builtin/pull.c:208 builtin/push.c:550
-#: builtin/remote.c:1454 builtin/rm.c:244 builtin/send-pack.c:194
 msgid "dry run"
 msgstr "sınama turu"
 
-#: builtin/add.c:368 builtin/check-ignore.c:22 builtin/commit.c:1483
-#: builtin/count-objects.c:98 builtin/fsck.c:789 builtin/log.c:2338
-#: builtin/mv.c:123 builtin/read-tree.c:120
 msgid "be verbose"
 msgstr "ayrıntı ver"
 
-#: builtin/add.c:370
 msgid "interactive picking"
 msgstr "etkileşimli seçim"
 
-#: builtin/add.c:371 builtin/checkout.c:1599 builtin/reset.c:417
 msgid "select hunks interactively"
 msgstr "parçaları etkileşimli olarak seç"
 
-#: builtin/add.c:372
 msgid "edit current diff and apply"
 msgstr "geçerli diff'i düzenle ve uygula"
 
-#: builtin/add.c:373
 msgid "allow adding otherwise ignored files"
 msgstr "başka türlü yok sayılan dosyaların eklenmesine izin ver"
 
-#: builtin/add.c:374
 msgid "update tracked files"
 msgstr "izlenen dosyaları güncelle"
 
-#: builtin/add.c:375
 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:376
 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:377
 msgid "add changes from all tracked and untracked files"
 msgstr "tüm izlenen/izlenmeyen dosyalardan değişiklikleri ekle"
 
-#: builtin/add.c:380
 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:382
 msgid "don't add, only refresh the index"
 msgstr "ekleme, yalnızca indeksi yenile"
 
-#: builtin/add.c:383
 msgid "just skip files which cannot be added because of errors"
 msgstr "yalnızca hatalardan dolayı eklenemeyen dosyaları atla"
 
-#: builtin/add.c:384
 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:385 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:387 builtin/update-index.c:1023
 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:389
 msgid "warn when adding an embedded repository"
 msgstr "gömülü bir depo eklenirken uyar"
 
-#: builtin/add.c:407
 #, c-format
 msgid ""
 "You've added another git repository inside your current repository.\n"
@@ -10815,12 +1882,10 @@ msgstr ""
 "\n"
 "Ek bilgi için: \"git help submodule\"."
 
-#: builtin/add.c:436
 #, c-format
 msgid "adding embedded git repository: %s"
 msgstr "gömülü git deposu ekleniyor: %s"
 
-#: builtin/add.c:456
 msgid ""
 "Use -f if you really want to add them.\n"
 "Turn this message off by running\n"
@@ -10830,27 +1895,21 @@ msgstr ""
 "Bu iletiyi 'git config advice.addIgnoredFile false'\n"
 "kullanarak kapatabilirsiniz."
 
-#: builtin/add.c:471
 msgid "adding files failed"
 msgstr "dosya ekleme başarısız"
 
-#: builtin/add.c:534
 #, 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:555 builtin/checkout.c:1770 builtin/commit.c:365
-#: builtin/reset.c:436 builtin/rm.c:275 builtin/stash.c:1702
 #, c-format
 msgid "'%s' and pathspec arguments cannot be used together"
 msgstr "'%s' ve yol belirteci argümanları birlikte kullanılamaz"
 
-#: builtin/add.c:566
 #, c-format
 msgid "Nothing specified, nothing added.\n"
 msgstr "Hiçbir şey belirtilmedi, hiçbir şey eklenmedi.\n"
 
-#: builtin/add.c:568
 msgid ""
 "Maybe you wanted to say 'git add .'?\n"
 "Turn this message off by running\n"
@@ -10860,114 +1919,122 @@ msgstr ""
 "Bu iletiyi 'git config advice.addEmptyPathspec false'\n"
 "yaparak kapatabilirsiniz."
 
-#: builtin/am.c:393
+msgid "index file corrupt"
+msgstr "indeks dosyası hasar görmüş"
+
+#, c-format
+msgid "bad action '%s' for '%s'"
+msgstr "hatalı eylem '%s', '%s' için"
+
+#, c-format
+msgid "invalid value for '%s': '%s'"
+msgstr "'%s' için geçersiz değer: '%s'"
+
+#, c-format
+msgid "could not read '%s'"
+msgstr "'%s' okunamadı"
+
 msgid "could not parse author script"
 msgstr "yazar betiği ayrıştırılamadı"
 
-#: builtin/am.c:483
+#, c-format
+msgid "could not parse %s"
+msgstr "%s ayrıştırılamadı"
+
 #, c-format
 msgid "'%s' was deleted by the applypatch-msg hook"
 msgstr "'%s' applypatch-msg kancası tarafından silindi"
 
-#: builtin/am.c:525
 #, c-format
 msgid "Malformed input line: '%s'."
 msgstr "Hatalı oluşturulmuş girdi satırı: '%s'."
 
-#: builtin/am.c:563
 #, 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:589
 msgid "fseek failed"
 msgstr "fseek başarısız oldu"
 
-#: builtin/am.c:777
+#, c-format
+msgid "could not open '%s' for reading"
+msgstr "'%s' okuma için açılamadı"
+
+#, c-format
+msgid "could not open '%s' for writing"
+msgstr "'%s' yazma için açılamadı"
+
 #, c-format
 msgid "could not parse patch '%s'"
 msgstr "'%s' yaması ayrıştırılamadı"
 
-#: builtin/am.c:842
 msgid "Only one StGIT patch series can be applied at once"
 msgstr "Bir kerede yalnızca bir StGIT yama serisi uygulanabilir"
 
-#: builtin/am.c:890
 msgid "invalid timestamp"
 msgstr "geçersiz zaman damgası"
 
-#: builtin/am.c:895 builtin/am.c:907
 msgid "invalid Date line"
 msgstr "geçersiz tarih satırı"
 
-#: builtin/am.c:902
 msgid "invalid timezone offset"
 msgstr "geçersiz zaman dilimi ofseti"
 
-#: builtin/am.c:995
 msgid "Patch format detection failed."
 msgstr "Yama biçimi algılaması başarısız."
 
-#: builtin/am.c:1000 builtin/clone.c:306
 #, c-format
 msgid "failed to create directory '%s'"
 msgstr "'%s' dizini oluşturulamadı"
 
-#: builtin/am.c:1005
 msgid "Failed to split patches."
 msgstr "Yamalar parçalanıp bölünemedi."
 
-#: builtin/am.c:1154
 #, 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:1155
 #, 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:1160
 #, c-format
 msgid "To record the empty patch as an empty commit, run \"%s --allow-empty\"."
 msgstr ""
 "Boş yamayı boş işleme kaydı olarak yazmak için \"%s --allow-empty\" "
 "çalıştırın."
 
-#: builtin/am.c:1162
 #, 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:1257
 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:1345
 #, c-format
 msgid "missing author line in commit %s"
 msgstr "%s işlemesinde yazar satırı eksik"
 
-#: builtin/am.c:1348
 #, c-format
 msgid "invalid ident line: %.*s"
 msgstr "geçersiz tanımlama satırı: %.*s"
 
-#: builtin/am.c:1567
+#, c-format
+msgid "unable to parse commit %s"
+msgstr "%s işlemesi ayrıştırılamıyor"
+
 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:1569
 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:1588
 msgid ""
 "Did you hand edit your patch?\n"
 "It does not apply to blobs recorded in its index."
@@ -10975,24 +2042,25 @@ msgstr ""
 "Yamanızı elle mi düzenlediniz?\n"
 "Kendi indeksinde kaydı yazılan ikili nesnelere uygulanamıyor."
 
-#: builtin/am.c:1594
 msgid "Falling back to patching base and 3-way merge..."
 msgstr "Temeli yamalamaya ve 3 yönlü birleştirmeye geri çekiliniyor..."
 
-#: builtin/am.c:1620
 msgid "Failed to merge in the changes."
 msgstr "Değişiklikler birleştirilemedi."
 
-#: builtin/am.c:1652
+msgid "git write-tree failed to write a tree"
+msgstr "git write-tree bir ağaca yazamadı"
+
 msgid "applying to an empty history"
 msgstr "boş bir geçmişe uygulanıyor"
 
-#: builtin/am.c:1704 builtin/am.c:1708
+msgid "failed to write commit object"
+msgstr "işleme nesnesi yazılamadı"
+
 #, c-format
 msgid "cannot resume: %s does not exist."
 msgstr "sürdürülemiyor: %s yok."
 
-#: builtin/am.c:1726
 msgid "Commit Body is:"
 msgstr "İşleme gövdesi:"
 
@@ -11000,59 +2068,47 @@ msgstr "İşleme gövdesi:"
 #. in your translation. The program will only accept English
 #. input at this point.
 #.
-#: builtin/am.c:1736
 #, 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:1782 builtin/commit.c:410
 msgid "unable to write index file"
 msgstr "indeks dosyası yazılamıyor"
 
-#: builtin/am.c:1786
 #, c-format
 msgid "Dirty index: cannot apply patches (dirty: %s)"
 msgstr "Kirli indeks: Yamalar uygulanamıyor (kirli: %s)"
 
-#: builtin/am.c:1828
 #, c-format
 msgid "Skipping: %.*s"
 msgstr "Atlanıyor: %.*s"
 
-#: builtin/am.c:1833
 #, c-format
 msgid "Creating an empty commit: %.*s"
 msgstr "Boş bir işleme oluşturuluyor: %.*s"
 
-#: builtin/am.c:1837
 msgid "Patch is empty."
 msgstr "Yama boş."
 
-#: builtin/am.c:1848 builtin/am.c:1917
 #, c-format
 msgid "Applying: %.*s"
 msgstr "Uygulanıyor: %.*s"
 
-#: builtin/am.c:1865
 msgid "No changes -- Patch already applied."
 msgstr "Değişiklik yok -- Yama halihazırda uygulandı."
 
-#: builtin/am.c:1871
 #, c-format
 msgid "Patch failed at %s %.*s"
 msgstr "Yama şurada başarısız oldu: %s %.*s"
 
-#: builtin/am.c:1875
 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"
 
-#: builtin/am.c:1921
 msgid "No changes - recorded it as an empty commit."
 msgstr "Değişiklik yok -- boş bir işleme olarak kayıt yazıldı."
 
-#: builtin/am.c:1923
 msgid ""
 "No changes - did you forget to use 'git add'?\n"
 "If there is nothing left to stage, chances are that something else\n"
@@ -11062,7 +2118,6 @@ msgstr ""
 "Hazırlanacak başka bir şey kalmadıysa büyük olasılıkla başka bir şey\n"
 "aynı değişiklikleri uygulamış olabilir; bu yamayı atlamak isteyebilirsiniz."
 
-#: builtin/am.c:1931
 msgid ""
 "You still have unmerged paths in your index.\n"
 "You should 'git add' each file with resolved conflicts to mark them as "
@@ -11075,17 +2130,16 @@ msgstr ""
 "Bir dosyanın \"onlar sildi\" olduğunu kabul etmek için dosya ile 'git rm' "
 "yapabilirsiniz."
 
-#: builtin/am.c:2039 builtin/am.c:2043 builtin/am.c:2055 builtin/reset.c:455
-#: builtin/reset.c:463
+msgid "unable to write new index file"
+msgstr "yeni indeks dosyası yazılamıyor"
+
 #, c-format
 msgid "Could not parse object '%s'."
 msgstr "'%s' nesnesi ayrıştırılamadı."
 
-#: builtin/am.c:2091 builtin/am.c:2167
 msgid "failed to clean index"
 msgstr "indeks temizlenemedi"
 
-#: builtin/am.c:2135
 msgid ""
 "You seem to have moved HEAD since the last 'am' failure.\n"
 "Not rewinding to ORIG_HEAD"
@@ -11093,159 +2147,114 @@ msgstr ""
 "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:2292
+#, c-format
+msgid "failed to read '%s'"
+msgstr "'%s' okunamadı"
+
 #, c-format
 msgid "options '%s=%s' and '%s=%s' cannot be used together"
 msgstr "'%s=%s' ve '%s=%s' seçenekleri birlikte kullanılamaz"
 
-#: builtin/am.c:2323
 msgid "git am [<options>] [(<mbox> | <Maildir>)...]"
 msgstr "git am [<seçenekler>] [(<mbox> | <posta-dizin>)...]"
 
-#: builtin/am.c:2324
 msgid "git am [<options>] (--continue | --skip | --abort)"
 msgstr "git am [<seçenekler>] (--continue | --skip | --abort)"
 
-#: builtin/am.c:2330
 msgid "run interactively"
 msgstr "etkileşimli olarak çalıştır"
 
-#: builtin/am.c:2332
 msgid "historical option -- no-op"
 msgstr "tarihi seçenek -- no-op"
 
-#: builtin/am.c:2334
 msgid "allow fall back on 3way merging if needed"
 msgstr "gerekirse 3 yönlü birleştirmeye geri çekilmeye izin ver"
 
-#: builtin/am.c:2335 builtin/init-db.c:547 builtin/prune-packed.c:16
-#: builtin/repack.c:646 builtin/stash.c:946
 msgid "be quiet"
 msgstr "sessiz ol"
 
-#: builtin/am.c:2337
 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:2340
 msgid "recode into utf8 (default)"
 msgstr "utf8 olarak yeniden kodla (öntanımlı)"
 
-#: builtin/am.c:2342
 msgid "pass -k flag to git-mailinfo"
 msgstr "'git-mailinfo'ya -k bayrağını geçir"
 
-#: builtin/am.c:2344
 msgid "pass -b flag to git-mailinfo"
 msgstr "'git-mailinfo'ya -b bayrağını geçir"
 
-#: builtin/am.c:2346
 msgid "pass -m flag to git-mailinfo"
 msgstr "'git-mailinfo'ya -m bayrağını geçir"
 
-#: builtin/am.c:2348
 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:2351
 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:2354
 msgid "strip everything before a scissors line"
 msgstr "bir kesim çizgisinden önceki her şeyi çıkar"
 
-#: builtin/am.c:2356
 msgid "pass it through git-mailinfo"
 msgstr "git-mailinfo içerisinden geçir"
 
-#: builtin/am.c:2359 builtin/am.c:2362 builtin/am.c:2365 builtin/am.c:2368
-#: builtin/am.c:2371 builtin/am.c:2374 builtin/am.c:2377 builtin/am.c:2380
-#: builtin/am.c:2386
 msgid "pass it through git-apply"
 msgstr "git-apply aracılığıyla geçir"
 
-#: builtin/am.c:2376 builtin/commit.c:1514 builtin/fmt-merge-msg.c:18
-#: builtin/fmt-merge-msg.c:21 builtin/grep.c:920 builtin/merge.c:263
-#: builtin/pull.c:142 builtin/pull.c:204 builtin/pull.c:221
-#: builtin/rebase.c:1074 builtin/repack.c:657 builtin/repack.c:661
-#: builtin/repack.c:663 builtin/show-branch.c:650 builtin/show-ref.c:172
-#: builtin/tag.c:446 parse-options.h:159 parse-options.h:180
-#: parse-options.h:348
 msgid "n"
 msgstr "n"
 
-#: builtin/am.c:2382 builtin/branch.c:695 builtin/bugreport.c:109
-#: builtin/cat-file.c:848 builtin/cat-file.c:852 builtin/cat-file.c:856
-#: builtin/for-each-ref.c:41 builtin/ls-tree.c:357 builtin/replace.c:555
-#: builtin/tag.c:480 builtin/verify-tag.c:38
 msgid "format"
 msgstr "biçim"
 
-#: builtin/am.c:2383
 msgid "format the patch(es) are in"
 msgstr "yama biçimi"
 
-#: builtin/am.c:2389
 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:2391
 msgid "continue applying patches after resolving a conflict"
 msgstr "bir çakışmayı çözdükten sonra yamaları uygulamayı sürdür"
 
-#: builtin/am.c:2394
 msgid "synonyms for --continue"
 msgstr "--continue eşanlamlıları"
 
-#: builtin/am.c:2397
 msgid "skip the current patch"
 msgstr "geçerli yamayı atla"
 
-#: builtin/am.c:2400
 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:2403
 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:2407
 msgid "show the patch being applied"
 msgstr "uygulanmakta olan yamayı göster"
 
-#: builtin/am.c:2411
 msgid "record the empty patch as an empty commit"
 msgstr "boş yamayı bir boş işleme olarak kayıt yaz"
 
-#: builtin/am.c:2415
 msgid "lie about committer date"
 msgstr "işleyici tarihi hakkında yalan söyle"
 
-#: builtin/am.c:2417
 msgid "use current timestamp for author date"
 msgstr "yazar tarihi için geçerli zaman damgasını kullan"
 
-#: builtin/am.c:2419 builtin/commit-tree.c:118 builtin/commit.c:1642
-#: builtin/merge.c:302 builtin/pull.c:179 builtin/rebase.c:1127
-#: builtin/revert.c:117 builtin/tag.c:461
 msgid "key-id"
 msgstr "key-id"
 
-#: builtin/am.c:2420 builtin/rebase.c:1128
 msgid "GPG-sign commits"
 msgstr "GPG imzalı işlemeler"
 
-#: builtin/am.c:2423
 msgid "how to handle empty patches"
 msgstr "boş yamaların nasıl değerlendirileceği"
 
-#: builtin/am.c:2426
 msgid "(internal use for git-rebase)"
 msgstr "(git-rebase için iç kullanım)"
 
-#: builtin/am.c:2444
 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."
@@ -11253,17 +2262,14 @@ msgstr ""
 "-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:2451
 msgid "failed to read the index"
 msgstr "indeks okunamadı"
 
-#: builtin/am.c:2466
 #, 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:2490
 #, c-format
 msgid ""
 "Stray %s directory found.\n"
@@ -11272,48 +2278,37 @@ msgstr ""
 "Başıboş %s dizini bulundu.\n"
 "Kaldırmak için \"git am --abort\" kullanın."
 
-#: builtin/am.c:2496
 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:2506
 msgid "interactive mode requires patches on the command line"
 msgstr "etkileşimli kip yamanın komut satırında olmasını gerektirir"
 
-#: builtin/apply.c:8
 msgid "git apply [<options>] [<patch>...]"
 msgstr "git apply [<seçenekler>] [<yama>...]"
 
-#: builtin/archive.c:18
 msgid "could not redirect output"
 msgstr "çıktı yeniden yönlendirilemedi"
 
-#: builtin/archive.c:35
 msgid "git archive: Remote with no URL"
 msgstr "git archive: URL'si olmayan uzak konum"
 
-#: 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:62
 #, c-format
 msgid "git archive: NACK %s"
 msgstr "git archive NACK %s"
 
-#: builtin/archive.c:63
 msgid "git archive: protocol error"
 msgstr "git archive: Protokol hatası"
 
-#: builtin/archive.c:67
 msgid "git archive: expected a flush"
 msgstr "git archive: Floş bekleniyordu"
 
-#: builtin/bisect--helper.c:24
 msgid "git bisect--helper --bisect-reset [<commit>]"
 msgstr "git bisect--helper --bisect-reset [<işleme>]"
 
-#: builtin/bisect--helper.c:26
 msgid ""
 "git bisect--helper --bisect-start [--term-{new,bad}=<term> --term-{old,good}"
 "=<term>] [--no-checkout] [--first-parent] [<bad> [<good>...]] [--] "
@@ -11323,98 +2318,78 @@ msgstr ""
 "=<terim>] [--no-checkout] [--first-parent] [<kötü> [<iyi>...]] [--] "
 "[<yollar>...]"
 
-#: builtin/bisect--helper.c:29
 msgid "git bisect--helper --bisect-state (bad|new) [<rev>]"
 msgstr "git bisect--helper --bisect-state (bad|new) [<rev>]"
 
-#: builtin/bisect--helper.c:30
 msgid "git bisect--helper --bisect-state (good|old) [<rev>...]"
 msgstr "git bisect--helper --bisect-state (good|old) [<rev>...]"
 
-#: builtin/bisect--helper.c:31
 msgid "git bisect--helper --bisect-replay <filename>"
 msgstr "git bisect--helper --bisect-replay <dosyaadı>"
 
-#: builtin/bisect--helper.c:32
 msgid "git bisect--helper --bisect-skip [(<rev>|<range>)...]"
 msgstr "git bisect--helper --bisect-skip [(<rev>|<erim>)...]"
 
-#: 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:116
 #, c-format
 msgid "could not write to file '%s'"
 msgstr "'%s' dosyasına yazılamadı"
 
-#: 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: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:184
 #, c-format
 msgid "can't change the meaning of the term '%s'"
 msgstr "'%s' teriminin anlamı değiştirilemiyor"
 
-#: 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:210
 #, c-format
 msgid "We are not bisecting.\n"
 msgstr "İkili arama yapılmıyor.\n"
 
-#: 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: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:271
 #, c-format
 msgid "Bad bisect_write argument: %s"
 msgstr "Hatalı bisect_write argümanı: %s"
 
-#: 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:288
 #, c-format
 msgid "couldn't open the file '%s'"
 msgstr "'%s' dosyası açılamadı"
 
-#: 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:341
 #, c-format
 msgid ""
 "You need to give me at least one %s and %s revision.\n"
@@ -11423,7 +2398,6 @@ msgstr ""
 "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:345
 #, c-format
 msgid ""
 "You need to start by \"git bisect start\".\n"
@@ -11434,7 +2408,6 @@ msgstr ""
 "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:365
 #, c-format
 msgid "bisecting only with a %s commit"
 msgstr "yalnızca bir %s işlemesi ile ikili arama yapılıyor"
@@ -11443,15 +2416,24 @@ msgstr "yalnızca bir %s işlemesi ile ikili arama yapılıyor"
 #. translation. The program will only accept English input
 #. at this point.
 #.
-#: builtin/bisect--helper.c:373
 msgid "Are you sure [Y/n]? "
 msgstr "Emin misiniz [Y/n]? "
 
-#: builtin/bisect--helper.c:434
+msgid "status: waiting for both good and bad commits\n"
+msgstr "durum: hem iyi hem kötü işlemeler bekleniyor\n"
+
+#, c-format
+msgid "status: waiting for bad commit, %d good commit known\n"
+msgid_plural "status: waiting for bad commit, %d good commits known\n"
+msgstr[0] "durum: kötü işleme bekleniyor, bilinen %d iyi işleme\n"
+msgstr[1] "durum: kötü işleme bekleniyor, bilinen %d iyi işleme\n"
+
+msgid "status: waiting for good commit(s), bad commit known\n"
+msgstr "durum: iyi işleme(ler) bekleniyor, kötü işleme biliniyor\n"
+
 msgid "no terms defined"
 msgstr "hiçbir terim tanımlanmadı"
 
-#: builtin/bisect--helper.c:437
 #, c-format
 msgid ""
 "Your current terms are %s for the old state\n"
@@ -11460,7 +2442,6 @@ msgstr ""
 "Mevcut terimleriniz eski durum için %s ve\n"
 "yeni durum için %s.\n"
 
-#: builtin/bisect--helper.c:447
 #, c-format
 msgid ""
 "invalid argument %s for 'git bisect terms'.\n"
@@ -11469,52 +2450,41 @@ msgstr ""
 "'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: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:536
 #, c-format
 msgid "could not open '%s' for appending"
 msgstr "'%s' iliştirme için açılamadı"
 
-#: 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:678
 #, c-format
 msgid "unrecognized option: '%s'"
 msgstr "tanımlanamayan seçenek: '%s'"
 
-#: 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:713
 msgid "bad HEAD - I need a HEAD"
 msgstr "hatalı HEAD - Bana bir HEAD gerek"
 
-#: 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: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:752
 msgid "bad HEAD - strange symbolic ref"
 msgstr "hatalı HEAD - tuhaf sembolik başvuru"
 
-#: builtin/bisect--helper.c:772
 #, c-format
 msgid "invalid ref: '%s'"
 msgstr "geçersiz başvuru: '%s'"
 
-#: 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"
 
@@ -11522,88 +2492,70 @@ msgstr "\"git bisect start\" ile başlamalısınız\n"
 #. translation. The program will only accept English input
 #. at this point.
 #.
-#: 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: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: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:884 builtin/bisect--helper.c:897
 #, c-format
 msgid "Bad rev input: %s"
 msgstr "Hatalı revizyon girdisi: %s"
 
-#: 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:936
 msgid "We are not bisecting."
 msgstr "İkili arama yapmıyoruz."
 
-#: builtin/bisect--helper.c:986
 #, c-format
 msgid "'%s'?? what are you talking about?"
 msgstr "'%s'?? ney ney?"
 
-#: 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:1120 builtin/bisect--helper.c:1152
 #, c-format
 msgid "running %s\n"
 msgstr "%s çalıştırılıyor\n"
 
-#: builtin/bisect--helper.c:1145 builtin/bisect--helper.c:1335
 msgid "bisect run failed: no command provided."
 msgstr "ikili arama başarısız: Komut verilmedi."
 
-#: builtin/bisect--helper.c:1166
 #, c-format
 msgid "unable to verify '%s' on good revision"
 msgstr "'%s', iyi revizyonda doğrulanamadı"
 
-#: builtin/bisect--helper.c:1172
 #, c-format
 msgid "bogus exit code %d for good revision"
 msgstr "iyi revizyon için anlamsız %d çıkış kodu"
 
-#: builtin/bisect--helper.c:1180
 #, 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:1195
 #, c-format
 msgid "cannot open file '%s' for writing"
 msgstr "'%s' dosyası yazma için açılamadı"
 
-#: builtin/bisect--helper.c:1213
 msgid "bisect run cannot continue any more"
 msgstr "ikili arama artık çalışmayı sürdüremiyor"
 
-#: builtin/bisect--helper.c:1215
 #, c-format
 msgid "bisect run success"
 msgstr "ikili arama başarılı"
 
-#: builtin/bisect--helper.c:1218
 #, c-format
 msgid "bisect found first bad commit"
 msgstr "ikili arama ilk hatalı işlemeyi buldu"
 
-#: builtin/bisect--helper.c:1221
 #, c-format
 msgid ""
 "bisect run failed: 'git bisect--helper --bisect-state %s' exited with error "
@@ -11612,219 +2564,162 @@ msgstr ""
 "ikili arama çalıştırılamadı: 'git bisect--helper --bisect-state %s', %d hata "
 "koduyla çıktı"
 
-#: builtin/bisect--helper.c:1253
 msgid "reset the bisection state"
 msgstr "ikili arama durumunu sıfırla"
 
-#: builtin/bisect--helper.c:1255
 msgid "check whether bad or good terms exist"
 msgstr "iyi veya kötü terimlerin olup olmadığını denetle"
 
-#: builtin/bisect--helper.c:1257
 msgid "print out the bisect terms"
 msgstr "ikili arama terimlerini yazdır"
 
-#: builtin/bisect--helper.c:1259
 msgid "start the bisect session"
 msgstr "ikili arama oturumunu başlat"
 
-#: builtin/bisect--helper.c:1261
 msgid "find the next bisection commit"
 msgstr "bir sonraki ikili arama işlemesini bul"
 
-#: builtin/bisect--helper.c:1263
 msgid "mark the state of ref (or refs)"
 msgstr "başvurunun (veya başvuruların) durumunu imle"
 
-#: builtin/bisect--helper.c:1265
 msgid "list the bisection steps so far"
 msgstr "şu ana kadarki ikili arama durumunu listele"
 
-#: builtin/bisect--helper.c:1267
 msgid "replay the bisection process from the given file"
 msgstr "verilen dosyadan ikili arama işlemini yeniden oynat"
 
-#: builtin/bisect--helper.c:1269
 msgid "skip some commits for checkout"
 msgstr "çıkış için birkaç işlemeyi atla"
 
-#: builtin/bisect--helper.c:1271
 msgid "visualize the bisection"
 msgstr "ikili aramayı görselleştir"
 
-#: builtin/bisect--helper.c:1273
 msgid "use <cmd>... to automatically bisect"
 msgstr "kendiliğinden ikili aramak için <komut>... kullan"
 
-#: builtin/bisect--helper.c:1275
 msgid "no log for BISECT_WRITE"
 msgstr "BISECT_WRITE için günlük yok"
 
-#: builtin/bisect--helper.c:1290
 msgid "--bisect-reset requires either no argument or a commit"
 msgstr "--bisect-reset bir argüman veya işleme gerektirmiyor"
 
-#: builtin/bisect--helper.c:1295
 msgid "--bisect-terms requires 0 or 1 argument"
 msgstr "--bisect-terms 0 veya 1 argüman gerektiriyor"
 
-#: builtin/bisect--helper.c:1304
 msgid "--bisect-next requires 0 arguments"
 msgstr "--bisect-next 0 argüman gerektiriyor"
 
-#: builtin/bisect--helper.c:1315
 msgid "--bisect-log requires 0 arguments"
 msgstr "--bisect-log 0 argüman gerektiriyor"
 
-#: builtin/bisect--helper.c:1320
 msgid "no logfile given"
 msgstr "hiçbir günlük dosyası verilmedi"
 
-#: builtin/blame.c:32
 msgid "git blame [<options>] [<rev-opts>] [<rev>] [--] <file>"
 msgstr "git blame [<seçenekler>] [<rev-sçnk>] [<rev>] [--] <dosya>"
 
-#: builtin/blame.c:37
 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:406
 #, c-format
 msgid "expecting a color: %s"
 msgstr "bir renk bekleniyor: %s"
 
-#: builtin/blame.c:413
 msgid "must end with a color"
 msgstr "bir renk ile bitmeli"
 
-#: builtin/blame.c:842
 #, c-format
 msgid "cannot find revision %s to ignore"
 msgstr "yok saymak için %s revizyonu bulunamıyor"
 
-#: builtin/blame.c:864
 msgid "show blame entries as we find them, incrementally"
 msgstr "genel bakış girdilerini biz buldukça artan biçimde göster"
 
-#: builtin/blame.c:865
 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:866
 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:867
 msgid "show work cost statistics"
 msgstr "iş maliyet istatistiklerini göster"
 
-#: builtin/blame.c:868 builtin/checkout.c:1554 builtin/clone.c:98
-#: builtin/commit-graph.c:75 builtin/commit-graph.c:228 builtin/fetch.c:181
-#: builtin/merge.c:301 builtin/multi-pack-index.c:103
-#: builtin/multi-pack-index.c:154 builtin/multi-pack-index.c:180
-#: builtin/multi-pack-index.c:208 builtin/pull.c:120 builtin/push.c:566
-#: builtin/remote.c:683 builtin/send-pack.c:202
 msgid "force progress reporting"
 msgstr "durum belirtmeyi zorla"
 
-#: builtin/blame.c:869
 msgid "show output score for blame entries"
 msgstr "genel bakış girdileri için çıktı skorunu göster"
 
-#: builtin/blame.c:870
 msgid "show original filename (Default: auto)"
 msgstr "orijinal dosya adını göster (Öntanımlı: Otomatik)"
 
-#: builtin/blame.c:871
 msgid "show original linenumber (Default: off)"
 msgstr "orijinal satır numarasını göster (Öntanımlı: Kapalı)"
 
-#: builtin/blame.c:872
 msgid "show in a format designed for machine consumption"
 msgstr "makine işlemesi için tasarlanmış bir biçimde göster"
 
-#: builtin/blame.c:873
 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:874
 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:875
 msgid "show raw timestamp (Default: off)"
 msgstr "ham zaman damgasını göster (Öntanımlı: Kapalı)"
 
-#: builtin/blame.c:876
 msgid "show long commit SHA1 (Default: off)"
 msgstr "uzun işleme SHA1'ini göster (Öntanımlı: Kapalı)"
 
-#: builtin/blame.c:877
 msgid "suppress author name and timestamp (Default: off)"
 msgstr "yazar adını ve zaman damgasını gizle (Öntanımlı: Kapalı)"
 
-#: builtin/blame.c:878
 msgid "show author email instead of name (Default: off)"
 msgstr "yazar adı yerine e-postasını göster (Öntanımlı: Kapalı)"
 
-#: builtin/blame.c:879
 msgid "ignore whitespace differences"
 msgstr "boşluk ayrımlarını yok say"
 
-#: builtin/blame.c:880 builtin/log.c:1857
 msgid "rev"
 msgstr "revizyon"
 
-#: builtin/blame.c:880
 msgid "ignore <rev> when blaming"
 msgstr "suçlarken <revizyon>'u yok say"
 
-#: builtin/blame.c:881
 msgid "ignore revisions from <file>"
 msgstr "<dosya>'dan olan revizyonları yok say"
 
-#: builtin/blame.c:882
 msgid "color redundant metadata from previous line differently"
 msgstr "bir önceki dosyadan gereksiz üstveriyi başka biçimde renklendir"
 
-#: builtin/blame.c:883
 msgid "color lines by age"
 msgstr "satırları yaşına göre renklendir"
 
-#: builtin/blame.c:884
 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:885
 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:886
 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:887 builtin/blame.c:888
 msgid "score"
 msgstr "skor"
 
-#: builtin/blame.c:887
 msgid "find line copies within and across files"
 msgstr "satır kopyalarını dosyaların içinde ve aralarında ara"
 
-#: builtin/blame.c:888
 msgid "find line movements within and across files"
 msgstr "satır hareketlerini dosyaların içinde ve aralarında ara"
 
-#: builtin/blame.c:889
 msgid "range"
 msgstr "erim"
 
-#: builtin/blame.c:890
 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:949
 msgid "--progress can't be used with --incremental or porcelain formats"
 msgstr "--progress, --incremental veya okunabilir biçimlerle kullanılamaz"
 
@@ -11836,26 +2731,21 @@ msgstr "--progress, --incremental veya okunabilir biçimlerle kullanılamaz"
 #. your language may need more or fewer display
 #. columns.
 #.
-#: builtin/blame.c:1000
 msgid "4 years, 11 months ago"
 msgstr "4 yıl 11 ay önce"
 
-#: builtin/blame.c:1116
 #, 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:1161
 msgid "Blaming lines"
 msgstr "Genel bakış satırları"
 
-#: builtin/branch.c:29
 msgid "git branch [<options>] [-r | -a] [--merged] [--no-merged]"
 msgstr "git branch [<seçenekler>] [-r | -a] [--merged] [--no-merged]"
 
-#: builtin/branch.c:30
 msgid ""
 "git branch [<options>] [-f] [--recurse-submodules] <branch-name> [<start-"
 "point>]"
@@ -11863,31 +2753,24 @@ msgstr ""
 "git branch [<seçenekler>] [-f] [--recurse-submodules] <dal-adı> [<başlangıç-"
 "noktası>]"
 
-#: builtin/branch.c:31
 msgid "git branch [<options>] [-l] [<pattern>...]"
 msgstr "git branch [<seçenekler>] [-l] [<dizgi>...]"
 
-#: builtin/branch.c:32
 msgid "git branch [<options>] [-r] (-d | -D) <branch-name>..."
 msgstr "git branch [<seçenekler>] [-r] (-d | -D) <dal-adı>..."
 
-#: builtin/branch.c:33
 msgid "git branch [<options>] (-m | -M) [<old-branch>] <new-branch>"
 msgstr "git branch [<seçenekler>] (-m | -M) [<eski-dal>] <yeni-dal>"
 
-#: builtin/branch.c:34
 msgid "git branch [<options>] (-c | -C) [<old-branch>] <new-branch>"
 msgstr "git branch [<seçenekler>] (-c | -C) [<eski-dal>] <yeni-dal>"
 
-#: builtin/branch.c:35
 msgid "git branch [<options>] [-r | -a] [--points-at]"
 msgstr "git branch [<seçenekler>] [-r | -a] [--points-at]"
 
-#: builtin/branch.c:36
 msgid "git branch [<options>] [-r | -a] [--format]"
 msgstr "git branch [<seçenekler>] [-r | -a] [--format]"
 
-#: builtin/branch.c:165
 #, c-format
 msgid ""
 "deleting branch '%s' that has been merged to\n"
@@ -11896,7 +2779,6 @@ msgstr ""
 "'%s' dalı siliniyor: Bu dal '%s'\n"
 "         dalına birleştirilmiş; ancak HEAD'e henüz birleştirilmemiş."
 
-#: builtin/branch.c:169
 #, c-format
 msgid ""
 "not deleting branch '%s' that is not yet merged to\n"
@@ -11905,12 +2787,10 @@ msgstr ""
 "'%s' dalı silinmiyor: Bu dal HEAD'e birleştirilmiş olmasına rağmen\n"
 "         '%s' dalına birleştirilmemiş."
 
-#: builtin/branch.c:183
 #, c-format
 msgid "Couldn't look up commit object for '%s'"
 msgstr "'%s' için işleme nesnesi aranamadı"
 
-#: builtin/branch.c:187
 #, c-format
 msgid ""
 "The branch '%s' is not fully merged.\n"
@@ -11919,111 +2799,87 @@ msgstr ""
 "'%s' dalı tümüyle birleştirilmemiş.\n"
 "Eğer silmek istediğinizden eminseniz 'git branch -D %s' çalıştırın."
 
-#: builtin/branch.c:200
 msgid "Update of config-file failed"
 msgstr "config-file güncellemesi başarısız"
 
-#: builtin/branch.c:235
 msgid "cannot use -a with -d"
 msgstr "-a, -d ile kullanılamıyor"
 
-#: builtin/branch.c:242
 msgid "Couldn't look up commit object for HEAD"
 msgstr "HEAD için işleme nesnesi aranamadı."
 
-#: builtin/branch.c:259
 #, c-format
 msgid "Cannot delete branch '%s' checked out at '%s'"
 msgstr "'%s' dalı silinemiyor, şurada çıkış yapılmış: '%s'."
 
-#: builtin/branch.c:274
 #, c-format
 msgid "remote-tracking branch '%s' not found."
 msgstr "Uzak izleme dalı '%s' bulunamadı."
 
-#: builtin/branch.c:275
 #, c-format
 msgid "branch '%s' not found."
 msgstr "'%s' dalı bulunamadı."
 
-#: builtin/branch.c:306
 #, c-format
 msgid "Deleted remote-tracking branch %s (was %s).\n"
 msgstr "Uzak izleme dalı %s silindi (%s idi).\n"
 
-#: builtin/branch.c:307
 #, c-format
 msgid "Deleted branch %s (was %s).\n"
 msgstr "%s dalı silindi (%s idi).\n"
 
-#: builtin/branch.c:457 builtin/tag.c:64
 msgid "unable to parse format string"
 msgstr "biçim dizisi ayrıştırılamıyor"
 
-#: builtin/branch.c:488
 msgid "could not resolve HEAD"
 msgstr "HEAD çözülemedi"
 
-#: builtin/branch.c:494
 #, c-format
 msgid "HEAD (%s) points outside of refs/heads/"
 msgstr "HEAD (%s), refs/heads/ dışına işaret ediyor"
 
-#: builtin/branch.c:509
 #, c-format
 msgid "Branch %s is being rebased at %s"
 msgstr "%s dalı %s konumunda yeniden temellendiriliyor"
 
-#: builtin/branch.c:513
 #, c-format
 msgid "Branch %s is being bisected at %s"
 msgstr "%s dalı %s konumunda ikili aranıyor"
 
-#: builtin/branch.c:530
 msgid "cannot copy the current branch while not on any."
 msgstr "Bir dalın üzerinde değilken geçerli dal kopyalanamaz."
 
-#: builtin/branch.c:532
 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:543
 #, c-format
 msgid "Invalid branch name: '%s'"
 msgstr "Geçersiz dal adı: '%s'"
 
-#: builtin/branch.c:572
 msgid "Branch rename failed"
 msgstr "Dal yeniden adlandırması başarısız"
 
-#: builtin/branch.c:574
 msgid "Branch copy failed"
 msgstr "Dal kopyalaması başarısız"
 
-#: builtin/branch.c:578
 #, 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:581
 #, c-format
 msgid "Renamed a misnamed branch '%s' away"
 msgstr "Yanlış adlandırılan '%s' dalı yeniden adlandırıldı"
 
-#: builtin/branch.c:587
 #, 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:596
 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:598
 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:614
 #, c-format
 msgid ""
 "Please edit the description for the branch\n"
@@ -12034,147 +2890,111 @@ msgstr ""
 "\t%s\n"
 "'%c' ile başlayan satırlar çıkarılacaktır.\n"
 
-#: builtin/branch.c:651
 msgid "Generic options"
 msgstr "Genel seçenekler"
 
-#: builtin/branch.c:653
 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:654
 msgid "suppress informational messages"
 msgstr "bilgi iletilerini gizle"
 
-#: builtin/branch.c:656 builtin/checkout.c:1571
-#: builtin/submodule--helper.c:3077
 msgid "set branch tracking configuration"
 msgstr "dal izleme yapılandırmasını ayarla"
 
-#: builtin/branch.c:659
 msgid "do not use"
 msgstr "kullanma"
 
-#: builtin/branch.c:661
 msgid "upstream"
 msgstr "üstkaynak"
 
-#: builtin/branch.c:661
 msgid "change the upstream info"
 msgstr "üstkaynak bilgisini değiştir"
 
-#: builtin/branch.c:662
 msgid "unset the upstream info"
 msgstr "üstkaynak bilgisini kaldır"
 
-#: builtin/branch.c:663
 msgid "use colored output"
 msgstr "renklendirilmiş çıktı kullan"
 
-#: builtin/branch.c:664
 msgid "act on remote-tracking branches"
 msgstr "uzak izleme dallarında iş yap"
 
-#: builtin/branch.c:666 builtin/branch.c:668
 msgid "print only branches that contain the commit"
 msgstr "yalnızca işlemeyi içeren dalları yazdır"
 
-#: builtin/branch.c:667 builtin/branch.c:669
 msgid "print only branches that don't contain the commit"
 msgstr "yalnızca işlemeyi içermeyen dalları yazdır"
 
-#: builtin/branch.c:672
 msgid "Specific git-branch actions:"
 msgstr "Özel git-branch eylemleri:"
 
-#: builtin/branch.c:673
 msgid "list both remote-tracking and local branches"
 msgstr "hem uzak izleme hem de yerel dalları listele"
 
-#: builtin/branch.c:675
 msgid "delete fully merged branch"
 msgstr "tümüyle birleştirilen dalı sil"
 
-#: builtin/branch.c:676
 msgid "delete branch (even if not merged)"
 msgstr "dalı sil (birleştirilmemiş olsa bile)"
 
-#: builtin/branch.c:677
 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:678
 msgid "move/rename a branch, even if target exists"
 msgstr "bir dalı taşı/yeniden adlandır, hedef var olsa bile"
 
-#: builtin/branch.c:679
 msgid "copy a branch and its reflog"
 msgstr "bir dalı ve onun başvuru günlüğünü kopyala"
 
-#: builtin/branch.c:680
 msgid "copy a branch, even if target exists"
 msgstr "bir dalı kopyala, hedef var olsa bile"
 
-#: builtin/branch.c:681
 msgid "list branch names"
 msgstr "dal adlarını listele"
 
-#: builtin/branch.c:682
 msgid "show current branch name"
 msgstr "geçerli dal adını göster"
 
-#: builtin/branch.c:683 builtin/submodule--helper.c:3075
 msgid "create the branch's reflog"
 msgstr "dalın başvuru günlüğünü oluştur"
 
-#: builtin/branch.c:685
 msgid "edit the description for the branch"
 msgstr "dalın açıklamasını düzenle"
 
-#: builtin/branch.c:686
 msgid "force creation, move/rename, deletion"
 msgstr "zorla oluştur, taşı/yeniden adlandır, sil"
 
-#: builtin/branch.c:687
 msgid "print only branches that are merged"
 msgstr "yalnızca birleştirilen dalları yazdır"
 
-#: builtin/branch.c:688
 msgid "print only branches that are not merged"
 msgstr "yalnızca birleştirilmeyen dalları yazdır"
 
-#: builtin/branch.c:689
 msgid "list branches in columns"
 msgstr "dalları sütunlarla listele"
 
-#: builtin/branch.c:691 builtin/for-each-ref.c:45 builtin/notes.c:413
-#: builtin/notes.c:416 builtin/notes.c:579 builtin/notes.c:582
-#: builtin/tag.c:476
 msgid "object"
 msgstr "nesne"
 
-#: builtin/branch.c:692
 msgid "print only branches of the object"
 msgstr "yalnızca nesnenin dallarını yazdır"
 
-#: builtin/branch.c:693 builtin/for-each-ref.c:51 builtin/tag.c:483
 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:694 builtin/ls-files.c:667
 msgid "recurse through submodules"
 msgstr "altmodüller içinden özyinele"
 
-#: builtin/branch.c:695 builtin/for-each-ref.c:41 builtin/ls-tree.c:358
-#: builtin/tag.c:481 builtin/verify-tag.c:38
 msgid "format to use for the output"
 msgstr "çıktı için kullanılacak biçim"
 
-#: builtin/branch.c:718 builtin/clone.c:684
+msgid "Failed to resolve HEAD as a valid ref."
+msgstr "HEAD geçerli bir başvuru olarak çözülemedi."
+
 msgid "HEAD not found below refs/heads!"
 msgstr "HEAD, refs/heads altında bulunamadı!"
 
-#: builtin/branch.c:739
 msgid ""
 "branch with --recurse-submodules can only be used if submodule."
 "propagateBranches is enabled"
@@ -12182,45 +3002,35 @@ msgstr ""
 "--recurse-submodules ile dallanma, yalnızca submodule.propagateBranches "
 "etkinleştirilmişse kullanılabilir"
 
-#: builtin/branch.c:741
 msgid "--recurse-submodules can only be used to create branches"
 msgstr "--recurse-submodules, yalnızca dal oluşturmada kullanılabilir"
 
-#: builtin/branch.c:770 builtin/branch.c:826 builtin/branch.c:835
 msgid "branch name required"
 msgstr "dal adı gerekli"
 
-#: builtin/branch.c:802
 msgid "Cannot give description to detached HEAD"
 msgstr "Ayrılmış HEAD'e açıklama verilemiyor"
 
-#: builtin/branch.c:807
 msgid "cannot edit description of more than one branch"
 msgstr "birden çok dalın açıklaması düzenlenemiyor"
 
-#: builtin/branch.c:814
 #, c-format
 msgid "No commit on branch '%s' yet."
 msgstr "'%s' dalında henüz bir işleme yok."
 
-#: builtin/branch.c:817
 #, c-format
 msgid "No branch named '%s'."
 msgstr "'%s' adında bir dal yok."
 
-#: builtin/branch.c:832
 msgid "too many branches for a copy operation"
 msgstr "bir kopyalama işlemi için çok fazla dal"
 
-#: builtin/branch.c:841
 msgid "too many arguments for a rename operation"
 msgstr "bir yeniden adlandırma işlemi için çok fazla argüman"
 
-#: builtin/branch.c:846
 msgid "too many arguments to set new upstream"
 msgstr "yeni üstkaynak ayarlamak için çok fazla argüman"
 
-#: builtin/branch.c:850
 #, c-format
 msgid ""
 "could not set upstream of HEAD to %s when it does not point to any branch."
@@ -12228,31 +3038,25 @@ msgstr ""
 "HEAD'in üst kaynağı %s olarak ayarlanamadı; çünkü herhangi bir dala işaret "
 "etmiyor."
 
-#: builtin/branch.c:853 builtin/branch.c:873
 #, c-format
 msgid "no such branch '%s'"
 msgstr "'%s' diye bir dal yok"
 
-#: builtin/branch.c:857
 #, c-format
 msgid "branch '%s' does not exist"
 msgstr "'%s' diye bir dal mevcut değil"
 
-#: builtin/branch.c:867
 msgid "too many arguments to unset upstream"
 msgstr "üst kaynağı kaldırmak için çok fazla argüman"
 
-#: builtin/branch.c:871
 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:877
 #, c-format
 msgid "Branch '%s' has no upstream information"
 msgstr "'%s' dalının üstkaynak bilgisi yok"
 
-#: builtin/branch.c:890
 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>?"
@@ -12260,7 +3064,6 @@ msgstr ""
 "'git branch'in -a ve -r seçenekleri bir dal adı almaz.\n"
 "Şunu mu demek istediniz: -a|-r --list <dizgi>?"
 
-#: builtin/branch.c:894
 msgid ""
 "the '--set-upstream' option is no longer supported. Please use '--track' or "
 "'--set-upstream-to' instead."
@@ -12268,32 +3071,25 @@ msgstr ""
 "--set-upstream seçeneği artık desteklenmiyor. Lütfen --track veya --set-"
 "upstream-to kullanın."
 
-#: builtin/bugreport.c:16
 msgid "git version:\n"
 msgstr "git sürümü:\n"
 
-#: 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:32
 msgid "compiler info: "
 msgstr "derleyici bilgisi: "
 
-#: builtin/bugreport.c:35
 msgid "libc info: "
 msgstr "libc bilgisi: "
 
-#: 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: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:69
 msgid ""
 "Thank you for filling out a Git bug report!\n"
 "Please answer the following questions to help us understand your issue.\n"
@@ -12328,144 +3124,115 @@ msgstr ""
 "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:108
 msgid "specify a destination for the bugreport file"
 msgstr "hata raporu dosyası için bir konum belirtin"
 
-#: 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:132
 #, c-format
 msgid "could not create leading directories for '%s'"
 msgstr "'%s' için öncü dizinler oluşturulamadı"
 
-#: builtin/bugreport.c:139
 msgid "System Info"
 msgstr "Sistem Bilgisi"
 
-#: builtin/bugreport.c:142
 msgid "Enabled Hooks"
 msgstr "Etkin Kancalar"
 
-#: builtin/bugreport.c:149
 #, c-format
 msgid "unable to write to %s"
 msgstr "%s dosyasına yazılamıyor"
 
-#: builtin/bugreport.c:159
 #, c-format
 msgid "Created new report at '%s'.\n"
 msgstr "Hata raporu '%s' dosyasına yazıldı.\n"
 
-#: builtin/bundle.c:15 builtin/bundle.c:23
 msgid "git bundle create [<options>] <file> <git-rev-list args>"
 msgstr "git bundle create [<seçenekler>] <dosya> <git-rev-liste argümanlar>"
 
-#: builtin/bundle.c:16 builtin/bundle.c:28
 msgid "git bundle verify [<options>] <file>"
 msgstr "git bundle verify [<seçenekler>] <dosya>"
 
-#: builtin/bundle.c:17 builtin/bundle.c:33
 msgid "git bundle list-heads <file> [<refname>...]"
 msgstr "git bundle list-heads <dosya> [<başvuru-adı>...]"
 
-#: builtin/bundle.c:18 builtin/bundle.c:38
 msgid "git bundle unbundle <file> [<refname>...]"
 msgstr "git bundle unbundle <dosya> [<başvuru-adı>...]"
 
-#: builtin/bundle.c:65 builtin/pack-objects.c:3899
 msgid "do not show progress meter"
 msgstr "ilerleme çubuğunu gösterme"
 
-#: builtin/bundle.c:67 builtin/bundle.c:168 builtin/pack-objects.c:3901
 msgid "show progress meter"
 msgstr "ilerleme çubuğunu göster"
 
-#: builtin/bundle.c:69 builtin/pack-objects.c:3903
 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:72 builtin/pack-objects.c:3906
 msgid "similar to --all-progress when progress meter is shown"
 msgstr "ilerleme çubuğu gösterildiğinde --all-progress'e benzer"
 
-#: builtin/bundle.c:74
 msgid "specify bundle format version"
 msgstr "demet biçim sürümünü belirt"
 
-#: 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:108
 msgid "do not show bundle details"
 msgstr "demet ayrıntılarını gösterme"
 
-#: builtin/bundle.c:127
 #, c-format
 msgid "%s is okay\n"
 msgstr "%s tamam\n"
 
-#: builtin/bundle.c:183
 msgid "Need a repository to unbundle."
 msgstr "Demeti çözmek için bir depo gerekiyor."
 
-#: builtin/bundle.c:186
 msgid "Unbundling objects"
 msgstr "Nesneler demetten çıkarılıyor"
 
-#: builtin/bundle.c:220 builtin/remote.c:1758
 #, c-format
 msgid "Unknown subcommand: %s"
 msgstr "Bilinmeyen altkomut: %s"
 
-#: builtin/cat-file.c:568
+#, c-format
+msgid "cannot read object %s '%s'"
+msgstr "%s '%s' nesnesi okunamıyor"
+
 msgid "flush is only for --buffer mode"
 msgstr "floş, yalnızca --buffer kipi içindir"
 
-#: builtin/cat-file.c:612
 msgid "empty command in input"
 msgstr "girdide boş komut"
 
-#: builtin/cat-file.c:614
 #, c-format
 msgid "whitespace before command: '%s'"
 msgstr "komuttan önce boşluk: '%s'"
 
-#: builtin/cat-file.c:623
 #, c-format
 msgid "%s requires arguments"
 msgstr "%s, argümanlar gerektiriyor"
 
-#: builtin/cat-file.c:628
 #, c-format
 msgid "%s takes no arguments"
 msgstr "%s, bir argüman almıyor"
 
-#: builtin/cat-file.c:636
 #, c-format
 msgid "unknown command: '%s'"
 msgstr "bilinmeyen komut: '%s'"
 
-#: builtin/cat-file.c:795
 msgid "only one batch option may be specified"
 msgstr "yalnızca bir toplu iş seçeneği belirtilebilir"
 
-#: builtin/cat-file.c:824
 msgid "git cat-file <type> <object>"
 msgstr "git cat-file <tür> <nesne>"
 
-#: builtin/cat-file.c:825
 msgid "git cat-file (-e | -p) <object>"
 msgstr "git cat-file (-e | -p) <nesne>"
 
-#: builtin/cat-file.c:826
 msgid "git cat-file (-t | -s) [--allow-unknown-type] <object>"
 msgstr "git cat-file (-t | -s) [--allow-unknown-type] <nesne>"
 
-#: builtin/cat-file.c:827
 msgid ""
 "git cat-file (--batch | --batch-check | --batch-command) [--batch-all-"
 "objects]\n"
@@ -12477,7 +3244,6 @@ msgstr ""
 "             [--buffer] [--follow-symlinks] [--unordered]\n"
 "             [--textconv | --filters]"
 
-#: builtin/cat-file.c:830
 msgid ""
 "git cat-file (--textconv | --filters)\n"
 "             [<rev>:<path|tree-ish> | --path=<path|tree-ish> <rev>]"
@@ -12485,383 +3251,289 @@ msgstr ""
 "git cat-file (--textconv | --filters)\n"
 "             [<başvuru>:<yol|ağacımsı> | --path=<yol|ağacımsı> <revizyon>]"
 
-#: builtin/cat-file.c:836
 msgid "Check object existence or emit object contents"
 msgstr "Nesne varlığını denetle veya nesne içeriğini yay"
 
-#: builtin/cat-file.c:838
 msgid "check if <object> exists"
 msgstr "<nesne> varlığını denetle"
 
-#: builtin/cat-file.c:839
 msgid "pretty-print <object> content"
 msgstr "<nesne> içeriğini okunabilir yap"
 
-#: builtin/cat-file.c:841
 msgid "Emit [broken] object attributes"
 msgstr "[Hatalı] nesne özniteliklerini yay"
 
-#: builtin/cat-file.c:842
 msgid "show object type (one of 'blob', 'tree', 'commit', 'tag', ...)"
 msgstr "nesne türünü göster (türler: 'blob', 'tree', 'commit', 'tag', ...)"
 
-#: builtin/cat-file.c:843
 msgid "show object size"
 msgstr "nesne boyutunu göster"
 
-#: builtin/cat-file.c:845
 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:847
 msgid "Batch objects requested on stdin (or --batch-all-objects)"
 msgstr "Toplu iş nesneleri stdin'de istendi (veya --batch-all-objects)"
 
-#: builtin/cat-file.c:849
 msgid "show full <object> or <rev> contents"
 msgstr "tam <nesne> veya <revizyon> içeriğini göster"
 
-#: builtin/cat-file.c:853
 msgid "like --batch, but don't emit <contents>"
 msgstr "--batch gibi; ancak <içerik> yayma"
 
-#: builtin/cat-file.c:857
 msgid "read commands from stdin"
 msgstr "komutları stdin'den oku"
 
-#: builtin/cat-file.c:861
 msgid "with --batch[-check]: ignores stdin, batches all known objects"
 msgstr ""
 "--batch[-check] ile stdin'i yok sayar, bilinen tüm nesneleri bir araya "
 "getirir"
 
-#: builtin/cat-file.c:863
 msgid "Change or optimize batch output"
 msgstr "Toplu iş çıktısını değiştir veya eniyile"
 
-#: builtin/cat-file.c:864
 msgid "buffer --batch output"
 msgstr "--batch çıktısını arabelleğe al"
 
-#: builtin/cat-file.c:866
 msgid "follow in-tree symlinks"
 msgstr "ağaç içi sembolik bağları izle"
 
-#: builtin/cat-file.c:868
 msgid "do not order objects before emitting them"
 msgstr "onları yaymadan önce nesneleri sıralama"
 
-#: builtin/cat-file.c:870
 msgid ""
 "Emit object (blob or tree) with conversion or filter (stand-alone, or with "
 "batch)"
 msgstr ""
 "Nesneyi (ikili veya ağaç), dönüştürme veya süzgeçle yay (tek veya toplu)"
 
-#: builtin/cat-file.c:872
 msgid "run textconv on object's content"
 msgstr "nesnenin içeriği üzerinde textconv çalıştır"
 
-#: builtin/cat-file.c:874
 msgid "run filters on object's content"
 msgstr "nesnenin içeriği üzerinde süzgeçler çalıştır"
 
-#: builtin/cat-file.c:875
 msgid "blob|tree"
 msgstr "ikili nesne/ağaç"
 
-#: builtin/cat-file.c:876
 msgid "use a <path> for (--textconv | --filters); Not with 'batch'"
 msgstr ""
 "(--textconv | --filters) için bir <yol> kullan; ancak 'batch' ile değil"
 
-#: builtin/cat-file.c:894
 #, c-format
 msgid "'%s=<%s>' needs '%s' or '%s'"
 msgstr "'%s=<%s>' için '%s' veya '%s' gerekiyor"
 
-#: builtin/cat-file.c:896
 msgid "path|tree-ish"
 msgstr "yol|ağacımsı"
 
-#: builtin/cat-file.c:903 builtin/cat-file.c:906 builtin/cat-file.c:909
 #, c-format
 msgid "'%s' requires a batch mode"
 msgstr "'%s' bir toplu iş kipi gerektiriyor"
 
-#: builtin/cat-file.c:921
 #, c-format
 msgid "'-%c' is incompatible with batch mode"
 msgstr "'-%c', toplu iş kipi ile uyumsuz"
 
-#: builtin/cat-file.c:924
 msgid "batch modes take no arguments"
 msgstr "toplu iş kipleri argüman almaz"
 
-#: builtin/cat-file.c:932 builtin/cat-file.c:935
 #, c-format
 msgid "<rev> required with '%s'"
 msgstr "<revizyon>, '%s' ile gerekiyor"
 
-#: builtin/cat-file.c:938
 #, c-format
 msgid "<object> required with '-%c'"
 msgstr "<nesne>, '-%c' ile gerekiyor"
 
-#: builtin/cat-file.c:943 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:965
-#: builtin/notes.c:987 builtin/prune-packed.c:25 builtin/receive-pack.c:2489
-#: builtin/tag.c:592
 msgid "too many arguments"
 msgstr "çok fazla argüman"
 
-#: builtin/cat-file.c:947
 #, c-format
 msgid "only two arguments allowed in <type> <object> mode, not %d"
 msgstr "<tür> <nesne> kipinde yalnızca iki argümana izin veriliyor, %d değil"
 
-#: builtin/check-attr.c:13
 msgid "git check-attr [-a | --all | <attr>...] [--] <pathname>..."
 msgstr "git check-attr [-a | --all | <öznitelik>...] [--] <yol-adı>..."
 
-#: builtin/check-attr.c:14
 msgid "git check-attr --stdin [-z] [-a | --all | <attr>...]"
 msgstr "git check-attr --stdin [-z] [-a | --all | <öznitelik>...]"
 
-#: builtin/check-attr.c:21
 msgid "report all attributes set on file"
 msgstr "tüm dosya özniteliklerini bildir"
 
-#: builtin/check-attr.c:22
 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:101
 msgid "read file names from stdin"
 msgstr "dosya adlarını stdin'den oku"
 
-#: builtin/check-attr.c:25 builtin/check-ignore.c:27
 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:1550 builtin/gc.c:550
-#: builtin/worktree.c:565
 msgid "suppress progress reporting"
 msgstr "ilerleme bildirimini gizle"
 
-#: builtin/check-ignore.c:29
 msgid "show non-matching input paths"
 msgstr "eşleşmeyen girdi yollarını göster"
 
-#: builtin/check-ignore.c:31
 msgid "ignore index when checking"
 msgstr "denetlerken indeksi yok say"
 
-#: builtin/check-ignore.c:165
 msgid "cannot specify pathnames with --stdin"
 msgstr "yol adları --stdin ile belirtilemiyor"
 
-#: builtin/check-ignore.c:168
 msgid "-z only makes sense with --stdin"
 msgstr "-z yalnızca --stdin ile bir anlam ifade eder"
 
-#: builtin/check-ignore.c:170
 msgid "no path specified"
 msgstr "bir yol belirtilmedi"
 
-#: builtin/check-ignore.c:174
 msgid "--quiet is only valid with a single pathname"
 msgstr "--quiet yalnızca tek bir yol adı ile geçerlidir"
 
-#: builtin/check-ignore.c:176
 msgid "cannot have both --quiet and --verbose"
 msgstr "hem --quiet hem --verbose birlikte kullanılamaz"
 
-#: builtin/check-ignore.c:179
 msgid "--non-matching is only valid with --verbose"
 msgstr "--non-matching yalnızca --verbose ile geçerlidir"
 
-#: builtin/check-mailmap.c:9
 msgid "git check-mailmap [<options>] <contact>..."
 msgstr "git check-mailmap [<seçenekler>] <kişi>..."
 
-#: builtin/check-mailmap.c:14
 msgid "also read contacts from stdin"
 msgstr "stdin'den kişileri de oku"
 
-#: builtin/check-mailmap.c:25
 #, c-format
 msgid "unable to parse contact: %s"
 msgstr "kişi ayrıştırılamadı: %s"
 
-#: builtin/check-mailmap.c:48
 msgid "no contacts specified"
 msgstr "kişi belirtilmedi"
 
-#: builtin/checkout--worker.c:110
 msgid "git checkout--worker [<options>]"
 msgstr "git checkout--worker [<seçenekler>]"
 
-#: builtin/checkout--worker.c:118 builtin/checkout-index.c:235
-#: builtin/column.c:31 builtin/column.c:32 builtin/submodule--helper.c:1878
-#: builtin/submodule--helper.c:1881 builtin/submodule--helper.c:1889
-#: builtin/submodule--helper.c:2716 builtin/worktree.c:563
-#: builtin/worktree.c:808
 msgid "string"
 msgstr "dizi"
 
-#: builtin/checkout--worker.c:119 builtin/checkout-index.c:236
 msgid "when creating files, prepend <string>"
 msgstr "dosyalar oluştururken başına <dizi> ekle"
 
-#: builtin/checkout-index.c:184
 msgid "git checkout-index [<options>] [--] [<file>...]"
 msgstr "git checkout-index [<seçenekler>] [--] [<dosya>...]"
 
-#: builtin/checkout-index.c:201
 msgid "stage should be between 1 and 3 or all"
 msgstr "stage 1 ve 3 arasında veya tümü olmalıdır"
 
-#: builtin/checkout-index.c:219
 msgid "check out all files in the index"
 msgstr "indeksteki tüm dosyaları çıkış yap"
 
-#: builtin/checkout-index.c:221
 msgid "do not skip files with skip-worktree set"
 msgstr "skip-worktree kümesiyle dosyaları atlama"
 
-#: builtin/checkout-index.c:222
 msgid "force overwrite of existing files"
 msgstr "mevcut dosyaların üzerine yazılmasını zorla"
 
-#: builtin/checkout-index.c:224
 msgid "no warning for existing files and files not in index"
 msgstr "mevcut dosyalar ve indekste olmayan dosyalar için uyarma"
 
-#: builtin/checkout-index.c:226
 msgid "don't checkout new files"
 msgstr "yeni dosyaları çıkış yapma"
 
-#: builtin/checkout-index.c:228
 msgid "update stat information in the index file"
 msgstr "indeks dosyasındaki dosya bilgilerini güncelle"
 
-#: builtin/checkout-index.c:232
 msgid "read list of paths from the standard input"
 msgstr "yolların listesini standart girdi'den oku"
 
-#: builtin/checkout-index.c:234
 msgid "write the content to temporary files"
 msgstr "içeriği geçici dosyalara yaz"
 
-#: builtin/checkout-index.c:238
 msgid "copy out the files from named stage"
 msgstr "dosyaları adı verilen alandan kopyala"
 
-#: builtin/checkout.c:34
 msgid "git checkout [<options>] <branch>"
 msgstr "git checkout [<seçenekler>] <dal>"
 
-#: builtin/checkout.c:35
 msgid "git checkout [<options>] [<branch>] -- <file>..."
 msgstr "git checkout [<seçenekler>] [<dal>] -- <dosya>..."
 
-#: builtin/checkout.c:40
 msgid "git switch [<options>] [<branch>]"
 msgstr "git switch [<seçenekler>] [<dal>]"
 
-#: builtin/checkout.c:45
 msgid "git restore [<options>] [--source=<branch>] <file>..."
 msgstr "git restore [<seçenekler>] [--source=<dal>] <dosya>..."
 
-#: builtin/checkout.c:199 builtin/checkout.c:238
 #, c-format
 msgid "path '%s' does not have our version"
 msgstr "'%s' yolu bizdeki sürüme iye değil"
 
-#: builtin/checkout.c:201 builtin/checkout.c:240
 #, c-format
 msgid "path '%s' does not have their version"
 msgstr "'%s' yolu onlardaki sürüme iye değil"
 
-#: builtin/checkout.c:217
 #, c-format
 msgid "path '%s' does not have all necessary versions"
 msgstr "'%s' yolu gereken tüm sürümlere iye değil"
 
-#: builtin/checkout.c:271
 #, c-format
 msgid "path '%s' does not have necessary versions"
 msgstr "'%s' yolu gereken sürümlere iye değil"
 
-#: builtin/checkout.c:291
 #, c-format
 msgid "path '%s': cannot merge"
 msgstr "'%s' yolu: Birleştirilemiyor"
 
-#: builtin/checkout.c:307
 #, c-format
 msgid "Unable to add merge result for '%s'"
 msgstr "'%s' için birleştirme sonuçları eklenemiyor"
 
-#: builtin/checkout.c:424
 #, c-format
 msgid "Recreated %d merge conflict"
 msgid_plural "Recreated %d merge conflicts"
 msgstr[0] "%d birleştirme çakışması yeniden oluşturuldu"
 msgstr[1] "%d birleştirme çakışması yeniden oluşturuldu"
 
-#: builtin/checkout.c:429
 #, c-format
 msgid "Updated %d path from %s"
 msgid_plural "Updated %d paths from %s"
 msgstr[0] "%d yol şuradan güncellendi: %s"
 msgstr[1] "%d yol şuradan güncellendi: %s"
 
-#: builtin/checkout.c:436
 #, c-format
 msgid "Updated %d path from the index"
 msgid_plural "Updated %d paths from the index"
 msgstr[0] "%d yol indeksten güncellendi"
 msgstr[1] "%d yol indeksten güncellendi"
 
-#: builtin/checkout.c:459 builtin/checkout.c:462 builtin/checkout.c:465
-#: builtin/checkout.c:469
 #, c-format
 msgid "'%s' cannot be used with updating paths"
 msgstr "'%s' güncellenmekte olan yollarla kullanılamaz"
 
-#: builtin/checkout.c:479
 #, c-format
 msgid "Cannot update paths and switch to branch '%s' at the same time."
 msgstr "Aynı anda hem yolları güncelleyip hem de '%s' dalına geçilemiyor."
 
-#: builtin/checkout.c:483
 #, c-format
 msgid "neither '%s' or '%s' is specified"
 msgstr "ne '%s' ne de '%s' belirtilmiş"
 
-#: builtin/checkout.c:487
 #, c-format
 msgid "'%s' must be used when '%s' is not specified"
 msgstr "'%s', '%s' ögesinin belirtilmediği durumlarda kullanılmalıdır"
 
-#: builtin/checkout.c:492 builtin/checkout.c:497
 #, c-format
 msgid "'%s' or '%s' cannot be used with %s"
 msgstr "'%s' veya '%s', %s ile birlikte kullanılamaz"
 
-#: builtin/checkout.c:571 builtin/checkout.c:578
 #, c-format
 msgid "path '%s' is unmerged"
 msgstr "'%s' yolu birleştirilmemiş"
 
-#: builtin/checkout.c:753
 msgid "you need to resolve your current index first"
 msgstr "önce geçerli indeksinizi çözmelisiniz"
 
-#: builtin/checkout.c:809
 #, c-format
 msgid ""
 "cannot continue with staged changes in the following files:\n"
@@ -12870,50 +3542,40 @@ msgstr ""
 "aşağıdaki dosyalardaki hazırlanan değişikliklerle sürdürülemiyor:\n"
 "%s"
 
-#: builtin/checkout.c:902
 #, 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:947
 msgid "HEAD is now at"
 msgstr "HEAD konumu:"
 
-#: builtin/checkout.c:951 builtin/clone.c:615 t/helper/test-fast-rebase.c:203
 msgid "unable to update HEAD"
 msgstr "HEAD güncellenemiyor"
 
-#: builtin/checkout.c:955
 #, c-format
 msgid "Reset branch '%s'\n"
 msgstr "'%s' dalı sıfırlandı.\n"
 
-#: builtin/checkout.c:958
 #, c-format
 msgid "Already on '%s'\n"
 msgstr "Halihazırda '%s' üzerinde\n"
 
-#: builtin/checkout.c:962
 #, c-format
 msgid "Switched to and reset branch '%s'\n"
 msgstr "'%s' dalına geçildi ve sıfırlandı.\n"
 
-#: builtin/checkout.c:964 builtin/checkout.c:1398
 #, c-format
 msgid "Switched to a new branch '%s'\n"
 msgstr "Yeni '%s' dalına geçildi.\n"
 
-#: builtin/checkout.c:966
 #, c-format
 msgid "Switched to branch '%s'\n"
 msgstr "'%s' dalına geçildi.\n"
 
-#: builtin/checkout.c:1017
 #, c-format
 msgid " ... and %d more.\n"
 msgstr " ... ve %d daha.\n"
 
-#: builtin/checkout.c:1023
 #, c-format
 msgid ""
 "Warning: you are leaving %d commit behind, not connected to\n"
@@ -12936,7 +3598,6 @@ msgstr[1] ""
 "\n"
 "%s\n"
 
-#: builtin/checkout.c:1042
 #, c-format
 msgid ""
 "If you want to keep it by creating a new branch, this may be a good time\n"
@@ -12963,19 +3624,15 @@ msgstr[1] ""
 "\tgit branch <yeni-dal-adı> %s\n"
 "\n"
 
-#: builtin/checkout.c:1077
 msgid "internal error in revision walk"
 msgstr "revizyonlarda gezinirken iç hata"
 
-#: builtin/checkout.c:1081
 msgid "Previous HEAD position was"
 msgstr "Önceki HEAD konumu şuydu:"
 
-#: builtin/checkout.c:1124 builtin/checkout.c:1393
 msgid "You are on a branch yet to be born"
 msgstr "Henüz doğmamış bir dal üzerindesiniz"
 
-#: builtin/checkout.c:1206
 #, c-format
 msgid ""
 "'%s' could be both a local file and a tracking branch.\n"
@@ -12984,7 +3641,6 @@ msgstr ""
 "'%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:1213
 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"
@@ -13004,57 +3660,46 @@ msgstr ""
 "isterseniz, örn. 'origin', yapılandırmanızda checkout.defaultRemote=origin\n"
 "ayarını yapmayı düşünün."
 
-#: builtin/checkout.c:1223
 #, 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:1289
 msgid "only one reference expected"
 msgstr "yalnızca bir başvuru bekleniyordu"
 
-#: builtin/checkout.c:1306
 #, c-format
 msgid "only one reference expected, %d given."
 msgstr "Yalnızca bir başvuru bekleniyordu, %d verildi."
 
-#: builtin/checkout.c:1352 builtin/worktree.c:338 builtin/worktree.c:508
 #, c-format
 msgid "invalid reference: %s"
 msgstr "geçersiz başvuru: %s"
 
-#: builtin/checkout.c:1365 builtin/checkout.c:1744
 #, c-format
 msgid "reference is not a tree: %s"
 msgstr "başvuru bir ağaca değil: %s"
 
-#: builtin/checkout.c:1413
 #, c-format
 msgid "a branch is expected, got tag '%s'"
 msgstr "bir dal bekleniyordu, '%s' etiketi alındı"
 
-#: builtin/checkout.c:1415
 #, c-format
 msgid "a branch is expected, got remote branch '%s'"
 msgstr "bir dal bekleniyordu, '%s' uzak dalı alındı"
 
-#: builtin/checkout.c:1417 builtin/checkout.c:1426
 #, c-format
 msgid "a branch is expected, got '%s'"
 msgstr "bir dal bekleniyordu, '%s' alındı"
 
-#: builtin/checkout.c:1420
 #, c-format
 msgid "a branch is expected, got commit '%s'"
 msgstr "bir dal bekleniyordu, '%s' işlemesi alındı"
 
-#: builtin/checkout.c:1429
 msgid ""
 "If you want to detach HEAD at the commit, try again with the --detach option."
 msgstr ""
 "HEAD'i işlemede ayırmak istiyorsanız --detach seçeneğiyle yeniden deneyin."
 
-#: builtin/checkout.c:1442
 msgid ""
 "cannot switch branch while merging\n"
 "Consider \"git merge --quit\" or \"git worktree add\"."
@@ -13062,7 +3707,6 @@ msgstr ""
 "Birleştirme yaparken dal değiştirilemiyor.\n"
 "\"git merge --quit\" veya \"git worktree add\" yapmayı düşünün."
 
-#: builtin/checkout.c:1446
 msgid ""
 "cannot switch branch in the middle of an am session\n"
 "Consider \"git am --quit\" or \"git worktree add\"."
@@ -13070,7 +3714,6 @@ msgstr ""
 "Bir \"am\" oturumunun ortasında dal değiştirilemiyor.\n"
 "\"git am --quit\" veya \"git worktree add\" yapmayı düşünün."
 
-#: builtin/checkout.c:1450
 msgid ""
 "cannot switch branch while rebasing\n"
 "Consider \"git rebase --quit\" or \"git worktree add\"."
@@ -13078,7 +3721,6 @@ msgstr ""
 "Yeniden temellendirme yaparken dal değiştirilemiyor.\n"
 "\"git rebase --quit\" veya \"git worktree add\" yapmayı düşünün."
 
-#: builtin/checkout.c:1454
 msgid ""
 "cannot switch branch while cherry-picking\n"
 "Consider \"git cherry-pick --quit\" or \"git worktree add\"."
@@ -13086,7 +3728,6 @@ msgstr ""
 "Seç-al yaparken dal değiştirilemiyor.\n"
 "\"git cherry-pick --quit\" veya \"git worktree add\" yapmayı düşünün."
 
-#: builtin/checkout.c:1458
 msgid ""
 "cannot switch branch while reverting\n"
 "Consider \"git revert --quit\" or \"git worktree add\"."
@@ -13094,122 +3735,94 @@ msgstr ""
 "Geriye al yaparken dal değiştirilemiyor.\n"
 "\"git revert --quit\" veya \"git worktree add\" yapmayı düşünün."
 
-#: builtin/checkout.c:1462
 msgid "you are switching branch while bisecting"
 msgstr "ikili arama yaparken dal değiştiriyorsunuz"
 
-#: builtin/checkout.c:1469
 msgid "paths cannot be used with switching branches"
 msgstr "dal değiştirilirken yollar kullanılamaz"
 
-#: builtin/checkout.c:1472 builtin/checkout.c:1476 builtin/checkout.c:1480
 #, c-format
 msgid "'%s' cannot be used with switching branches"
 msgstr "dal değiştirilirken '%s' kullanılamaz"
 
-#: builtin/checkout.c:1484 builtin/checkout.c:1487 builtin/checkout.c:1490
-#: builtin/checkout.c:1495 builtin/checkout.c:1500
 #, c-format
 msgid "'%s' cannot be used with '%s'"
 msgstr "'%s', '%s' ile birlikte kullanılamaz"
 
-#: builtin/checkout.c:1497
 #, c-format
 msgid "'%s' cannot take <start-point>"
 msgstr "'%s', <başlama-noktası> alamaz"
 
-#: builtin/checkout.c:1505
 #, c-format
 msgid "Cannot switch branch to a non-commit '%s'"
 msgstr "Dal, işleme olmayan '%s' ögesine değiştirilemez"
 
-#: builtin/checkout.c:1512
 msgid "missing branch or commit argument"
 msgstr "dal veya işleme argümanı eksik"
 
-#: builtin/checkout.c:1555
 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:1556 builtin/log.c:1844 parse-options.h:354
 msgid "style"
 msgstr "stil"
 
-#: builtin/checkout.c:1557
 msgid "conflict style (merge, diff3, or zdiff3)"
 msgstr "çakışma stili (birleştirme, diff3 veya zdiff3)"
 
-#: builtin/checkout.c:1569 builtin/worktree.c:560
 msgid "detach HEAD at named commit"
 msgstr "adı verilen işlemede HEAD'i ayır"
 
-#: builtin/checkout.c:1574
 msgid "force checkout (throw away local modifications)"
 msgstr "zorla çıkış yap (yerel değişiklikleri çöpe at)"
 
-#: builtin/checkout.c:1576
 msgid "new-branch"
 msgstr "yeni dal"
 
-#: builtin/checkout.c:1576
 msgid "new unparented branch"
 msgstr "yeni üst ögesi olmayan dal"
 
-#: builtin/checkout.c:1578 builtin/merge.c:305
 msgid "update ignored files (default)"
 msgstr "yok sayılan dosyaları güncelle (öntanımlı)"
 
-#: builtin/checkout.c:1581
 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:1594
 msgid "checkout our version for unmerged files"
 msgstr "birleştirilmeyen dosyalar için bizdeki sürümü çıkış yap"
 
-#: builtin/checkout.c:1597
 msgid "checkout their version for unmerged files"
 msgstr "birleştirilmeyen dosyalar için onlardaki sürümünü çıkış yap"
 
-#: builtin/checkout.c:1601
 msgid "do not limit pathspecs to sparse entries only"
 msgstr "yol belirteçlerini yalnızca aralıklı girdilere kısıtlama"
 
-#: builtin/checkout.c:1659
 #, c-format
 msgid "options '-%c', '-%c', and '%s' cannot be used together"
 msgstr "'-%c', '-%c' ve '%s' seçenekleri birlikte kullanılamaz"
 
-#: builtin/checkout.c:1700
 msgid "--track needs a branch name"
 msgstr "--track için bir dal adı gerekli"
 
-#: builtin/checkout.c:1705
 #, c-format
 msgid "missing branch name; try -%c"
 msgstr "eksik dal adı; -%c deneyin"
 
-#: builtin/checkout.c:1737
 #, c-format
 msgid "could not resolve %s"
 msgstr "%s çözülemedi"
 
-#: builtin/checkout.c:1753
 msgid "invalid path specification"
 msgstr "geçersiz yol belirtimi"
 
-#: builtin/checkout.c:1760
 #, 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:1764
 #, 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:1789
 msgid ""
 "git checkout: --ours/--theirs, --force and --merge are incompatible when\n"
 "checking out of the index."
@@ -13217,114 +3830,89 @@ msgstr ""
 "git checkout: --ours/--theirs, --force ve --merge indeks çıkışı yapılırken\n"
 "birlikte kullanılamaz."
 
-#: builtin/checkout.c:1794
 msgid "you must specify path(s) to restore"
 msgstr "eski durumuna getirilecek yolları belirtmelisiniz"
 
-#: builtin/checkout.c:1819 builtin/checkout.c:1821 builtin/checkout.c:1873
-#: builtin/checkout.c:1875 builtin/clone.c:130 builtin/remote.c:171
-#: builtin/remote.c:173 builtin/submodule--helper.c:3038
-#: builtin/submodule--helper.c:3371 builtin/worktree.c:556
-#: builtin/worktree.c:558
 msgid "branch"
 msgstr "dal"
 
-#: builtin/checkout.c:1820
 msgid "create and checkout a new branch"
 msgstr "yeni bir dal oluştur ve çıkış yap"
 
-#: builtin/checkout.c:1822
 msgid "create/reset and checkout a branch"
 msgstr "bir dal oluştur/sıfırla ve çıkış yap"
 
-#: builtin/checkout.c:1823
 msgid "create reflog for new branch"
 msgstr "yeni dal için başvuru günlüğü oluştur"
 
-#: builtin/checkout.c:1825
 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:1826
 msgid "use overlay mode (default)"
 msgstr "yerpaylaşım kipini kullan (öntanımlı)"
 
-#: builtin/checkout.c:1874
 msgid "create and switch to a new branch"
 msgstr "yeni bir dal oluştur ve ona geç"
 
-#: builtin/checkout.c:1876
 msgid "create/reset and switch to a branch"
 msgstr "bir dal oluştur/sıfırla ve ona geç"
 
-#: builtin/checkout.c:1878
 msgid "second guess 'git switch <no-such-branch>'"
 msgstr "'git switch <böyle-bir-dal-yok>'a temkinli yaklaş"
 
-#: builtin/checkout.c:1880
 msgid "throw away local modifications"
 msgstr "yerel değişiklikleri çöpe at"
 
-#: builtin/checkout.c:1916
 msgid "which tree-ish to checkout from"
 msgstr "çıkış yapılacak ağacımsı"
 
-#: builtin/checkout.c:1918
 msgid "restore the index"
 msgstr "indeksi eski durumuna getir"
 
-#: builtin/checkout.c:1920
 msgid "restore the working tree (default)"
 msgstr "çalışma ağacını eski durumuna getir"
 
-#: builtin/checkout.c:1922
 msgid "ignore unmerged entries"
 msgstr "birleştirilmemiş girdileri yok say"
 
-#: builtin/checkout.c:1923
 msgid "use overlay mode"
 msgstr "yerpaylaşım kipini kullan"
 
-#: builtin/clean.c:29
 msgid ""
 "git clean [-d] [-f] [-i] [-n] [-q] [-e <pattern>] [-x | -X] [--] <paths>..."
 msgstr ""
 "git clean [-d] [-f] [-i] [-n] [-q] [-e <dizgi>] [-x | -X] [--] <yollar>..."
 
-#: builtin/clean.c:33
 #, c-format
 msgid "Removing %s\n"
 msgstr "%s kaldırılıyor\n"
 
-#: builtin/clean.c:34
 #, c-format
 msgid "Would remove %s\n"
 msgstr "%s kaldırılacak\n"
 
-#: builtin/clean.c:35
 #, c-format
 msgid "Skipping repository %s\n"
 msgstr "%s dizini atlanıyor\n"
 
-#: builtin/clean.c:36
 #, c-format
 msgid "Would skip repository %s\n"
 msgstr "%s dizini atlanacak\n"
 
-#: builtin/clean.c:38
+#, c-format
+msgid "failed to remove %s"
+msgstr "%s kaldırılamadı"
+
 #, c-format
 msgid "could not lstat %s\n"
 msgstr "%s 'lstat' yapılamadı\n"
 
-#: builtin/clean.c:39
 msgid "Refusing to remove current working directory\n"
 msgstr "Geçerli çalışma dizinini kaldırma reddediliyor\n"
 
-#: builtin/clean.c:40
 msgid "Would refuse to remove current working directory\n"
 msgstr "Geçerli çalışma dizinini kaldırmayı reddederdim\n"
 
-#: builtin/clean.c:326 git-add--interactive.perl:593
 #, c-format
 msgid ""
 "Prompt help:\n"
@@ -13337,7 +3925,6 @@ msgstr ""
 "foo        - benzersiz öneke dayanarak bir öge seç\n"
 "           - (boş) hiçbir şey seçme\n"
 
-#: builtin/clean.c:330 git-add--interactive.perl:602
 #, c-format
 msgid ""
 "Prompt help:\n"
@@ -13358,33 +3945,26 @@ msgstr ""
 "*          - tüm ögeleri seç\n"
 "           - (boş) seçimi bitir\n"
 
-#: builtin/clean.c:545 git-add--interactive.perl:568
-#: git-add--interactive.perl:573
 #, c-format, perl-format
 msgid "Huh (%s)?\n"
 msgstr "Pardon (%s)?\n"
 
-#: builtin/clean.c:685
 #, c-format
 msgid "Input ignore patterns>> "
 msgstr "Girdi için yok sayma dizgileri>> "
 
-#: builtin/clean.c:719
 #, c-format
 msgid "WARNING: Cannot find items matched by: %s"
 msgstr "UYARI: Şununla eşleşen ögeler bulunamıyor: %s"
 
-#: builtin/clean.c:740
 msgid "Select items to delete"
 msgstr "Silinecek ögeleri seçin"
 
 #. TRANSLATORS: Make sure to keep [y/N] as is
-#: builtin/clean.c:781
 #, c-format
 msgid "Remove %s [y/N]? "
 msgstr "%s kaldırılsın mı [y/N]? "
 
-#: builtin/clean.c:812
 msgid ""
 "clean               - start cleaning\n"
 "filter by pattern   - exclude items from deletion\n"
@@ -13402,52 +3982,38 @@ msgstr ""
 "help                - bu ekranı görüntüle\n"
 "?                   - istem seçimi için yardım"
 
-#: builtin/clean.c:848
 msgid "Would remove the following item:"
 msgid_plural "Would remove the following items:"
 msgstr[0] "Aşağıdaki öge kaldırılacak:"
 msgstr[1] "Aşağıdaki ögeler kaldırılacak:"
 
-#: builtin/clean.c:864
 msgid "No more files to clean, exiting."
 msgstr "Temizlenecek başka dosya yok, çıkılıyor."
 
-#: builtin/clean.c:926
 msgid "do not print names of files removed"
 msgstr "kaldırılan dosyaların adlarını yazdırma"
 
-#: builtin/clean.c:928
 msgid "force"
 msgstr "zorla"
 
-#: builtin/clean.c:929
 msgid "interactive cleaning"
 msgstr "etkileşimli temizlik"
 
-#: builtin/clean.c:931
 msgid "remove whole directories"
 msgstr "dizinleri tümüyle kaldır"
 
-#: builtin/clean.c:932 builtin/describe.c:565 builtin/describe.c:567
-#: builtin/grep.c:938 builtin/log.c:185 builtin/log.c:187
-#: builtin/ls-files.c:651 builtin/name-rev.c:585 builtin/name-rev.c:587
-#: builtin/show-ref.c:179
 msgid "pattern"
 msgstr "dizgi"
 
-#: builtin/clean.c:933
 msgid "add <pattern> to ignore rules"
 msgstr "yok sayma kurallarına <dizgi> ekle"
 
-#: builtin/clean.c:934
 msgid "remove ignored files, too"
 msgstr "yok sayılan dosyalar da kaldırıldı"
 
-#: builtin/clean.c:936
 msgid "remove only ignored files"
 msgstr "yalnızca yok sayılan dosyaları kaldır"
 
-#: builtin/clean.c:951
 msgid ""
 "clean.requireForce set to true and neither -i, -n, nor -f given; refusing to "
 "clean"
@@ -13455,7 +4021,6 @@ msgstr ""
 "clean.requireForce 'true' olarak ayarlanmış ve ne -i ne -n ne de -f "
 "verilmiş; temizleme reddediliyor"
 
-#: builtin/clean.c:954
 msgid ""
 "clean.requireForce defaults to true and neither -i, -n, nor -f given; "
 "refusing to clean"
@@ -13463,218 +4028,164 @@ msgstr ""
 "clean.requireForce öntanımlı olarak 'true' ve ne -i ne -n ne de -f verilmiş; "
 "temizleme reddediliyor"
 
-#: builtin/clean.c:966
 msgid "-x and -X cannot be used together"
 msgstr "-x ve -X birlikte kullanılamaz"
 
-#: builtin/clone.c:47
 msgid "git clone [<options>] [--] <repo> [<dir>]"
 msgstr "git clone [<seçenekler>] [--] <depo> [<dizin>]"
 
-#: builtin/clone.c:100
 msgid "don't clone shallow repository"
 msgstr "sığ depoyu klonlama"
 
-#: builtin/clone.c:102
 msgid "don't create a checkout"
 msgstr "çıkış yapma!"
 
-#: builtin/clone.c:103 builtin/clone.c:105 builtin/init-db.c:542
 msgid "create a bare repository"
 msgstr "çıplak bir depo oluştur"
 
-#: builtin/clone.c:107
 msgid "create a mirror repository (implies bare)"
 msgstr "bir yansı depo oluştur (çıplak ima eder)"
 
-#: builtin/clone.c:109
 msgid "to clone from a local repository"
 msgstr "bir yerel depodan klonla"
 
-#: builtin/clone.c:111
 msgid "don't use local hardlinks, always copy"
 msgstr "yerel sabit bağları kullanma, her zaman kopyala"
 
-#: builtin/clone.c:113
 msgid "setup as shared repository"
 msgstr "paylaşılan depo ayarla"
 
-#: builtin/clone.c:115
 msgid "pathspec"
 msgstr "yol belirteci"
 
-#: builtin/clone.c:115
 msgid "initialize submodules in the clone"
 msgstr "klon içerisindeki altmodülleri ilklendir"
 
-#: builtin/clone.c:119
 msgid "number of submodules cloned in parallel"
 msgstr "paralelde klonlanan altmodüllerin sayısı"
 
-#: builtin/clone.c:120 builtin/init-db.c:539
 msgid "template-directory"
 msgstr "şablon dizini"
 
-#: builtin/clone.c:121 builtin/init-db.c:540
 msgid "directory from which templates will be used"
 msgstr "şablonların kullanılacağı dizin"
 
-#: builtin/clone.c:123 builtin/clone.c:125 builtin/submodule--helper.c:1885
-#: builtin/submodule--helper.c:2719 builtin/submodule--helper.c:3378
 msgid "reference repository"
 msgstr "başvuru deposu"
 
-#: builtin/clone.c:127 builtin/submodule--helper.c:1887
-#: builtin/submodule--helper.c:2721
 msgid "use --reference only while cloning"
 msgstr "--reference'ı yalnızca klonlarken kullan"
 
-#: builtin/clone.c:128 builtin/column.c:27 builtin/fmt-merge-msg.c:27
-#: builtin/init-db.c:550 builtin/merge-file.c:48 builtin/merge.c:290
-#: builtin/pack-objects.c:3967 builtin/repack.c:669
-#: builtin/submodule--helper.c:3380 t/helper/test-simple-ipc.c:595
-#: t/helper/test-simple-ipc.c:597
 msgid "name"
 msgstr "ad"
 
-#: builtin/clone.c:129
 msgid "use <name> instead of 'origin' to track upstream"
 msgstr "üstkaynağı izlemek için 'origin' yerine <ad> kullan"
 
-#: builtin/clone.c:131
 msgid "checkout <branch> instead of the remote's HEAD"
 msgstr "uzak konumun HEAD'i yerine <dal>'ı çıkış yap"
 
-#: builtin/clone.c:133
 msgid "path to git-upload-pack on the remote"
 msgstr "uzak konumdaki git-upload-pack'e olan yol"
 
-#: builtin/clone.c:134 builtin/fetch.c:182 builtin/grep.c:877
-#: builtin/pull.c:212
 msgid "depth"
 msgstr "derinlik"
 
-#: builtin/clone.c:135
 msgid "create a shallow clone of that depth"
 msgstr "verilen derinlikte sığ bir depo oluştur"
 
-#: builtin/clone.c:136 builtin/fetch.c:184 builtin/pack-objects.c:3956
-#: builtin/pull.c:215
 msgid "time"
 msgstr "zaman"
 
-#: builtin/clone.c:137
 msgid "create a shallow clone since a specific time"
 msgstr "verilen zamandan sonrasını içeren bir sığ depo oluştur"
 
-#: builtin/clone.c:138 builtin/fetch.c:186 builtin/fetch.c:212
-#: builtin/pull.c:218 builtin/pull.c:243 builtin/rebase.c:1050
 msgid "revision"
 msgstr "revizyon"
 
-#: builtin/clone.c:139 builtin/fetch.c:187 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:141 builtin/submodule--helper.c:1897
-#: builtin/submodule--helper.c:2735
 msgid "clone only one branch, HEAD or --branch"
 msgstr "yalnızca bir dal klonla, HEAD veya --branch"
 
-#: builtin/clone.c:143
 msgid "don't clone any tags, and make later fetches not to follow them"
 msgstr "etiket klonlama ve sonraki getirmeler de onları izlemesin"
 
-#: builtin/clone.c:145
 msgid "any cloned submodules will be shallow"
 msgstr "klonlanan altmodüller sığ olacak"
 
-#: builtin/clone.c:146 builtin/init-db.c:548
 msgid "gitdir"
 msgstr "git dizini"
 
-#: builtin/clone.c:147 builtin/init-db.c:549
 msgid "separate git dir from working tree"
 msgstr "git dizinini çalışma ağacından ayır"
 
-#: builtin/clone.c:148
 msgid "key=value"
 msgstr "anahtar=değer"
 
-#: builtin/clone.c:149
 msgid "set config inside the new repository"
 msgstr "yapılandırmayı yeni deponun içinde ayarla"
 
-#: builtin/clone.c:151 builtin/fetch.c:207 builtin/ls-remote.c:77
-#: builtin/pull.c:234 builtin/push.c:575 builtin/send-pack.c:200
 msgid "server-specific"
 msgstr "sunucuya özel"
 
-#: builtin/clone.c:151 builtin/fetch.c:207 builtin/ls-remote.c:77
-#: 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:152 builtin/fetch.c:208 builtin/pull.c:238
-#: builtin/push.c:576
 msgid "use IPv4 addresses only"
 msgstr "yalnızca IPv4 adresleri kullan"
 
-#: builtin/clone.c:154 builtin/fetch.c:210 builtin/pull.c:241
-#: builtin/push.c:578
 msgid "use IPv6 addresses only"
 msgstr "yalnızca IPv6 adresleri kullan"
 
-#: builtin/clone.c:158
 msgid "apply partial clone filters to submodules"
 msgstr "altmodüllere kısımsal klon süzgeçlerini uygula"
 
-#: builtin/clone.c:160
 msgid "any cloned submodules will use their remote-tracking branch"
 msgstr "klonlanan herhangi bir altmodül kendi uzak izleme dallarını kullanacak"
 
-#: builtin/clone.c:162
 msgid "initialize sparse-checkout file to include only files at root"
 msgstr ""
 "sparse-checkout dosyasını yalnızca kökteki dosyaları içerecek biçimde "
 "ilklendir"
 
-#: builtin/clone.c:237
 #, c-format
 msgid "info: Could not add alternate for '%s': %s\n"
 msgstr "info: '%s' için alternatif eklenemedi: %s\n"
 
-#: builtin/clone.c:310
+#, c-format
+msgid "failed to stat '%s'"
+msgstr "'%s' dosyasının bilgileri alınamadı"
+
 #, c-format
 msgid "%s exists and is not a directory"
 msgstr "%s var ve bir dizin değil"
 
-#: builtin/clone.c:328
 #, c-format
 msgid "failed to start iterator over '%s'"
 msgstr "yineleyici '%s' üzerinden çalıştırılamadı"
 
-#: builtin/clone.c:359
+#, c-format
+msgid "failed to unlink '%s'"
+msgstr "'%s' bağlantısı kesilemedi"
+
 #, c-format
 msgid "failed to create link '%s'"
 msgstr "'%s' bağı oluşturulamadı"
 
-#: builtin/clone.c:363
 #, c-format
 msgid "failed to copy file to '%s'"
 msgstr "dosya şuraya kopyalanamadı: '%s'"
 
-#: builtin/clone.c:368
 #, c-format
 msgid "failed to iterate over '%s'"
 msgstr "'%s' üzerinde yinelenemedi"
 
-#: builtin/clone.c:395
 #, c-format
 msgid "done.\n"
 msgstr "bitti.\n"
 
-#: builtin/clone.c:409
 msgid ""
 "Clone succeeded, but checkout failed.\n"
 "You can inspect what was checked out with 'git status'\n"
@@ -13684,193 +4195,156 @@ msgstr ""
 "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:486
 #, c-format
 msgid "Could not find remote branch %s to clone."
 msgstr "Klonlanacak %s uzak dal bulunamadı."
 
-#: builtin/clone.c:603
+msgid "remote did not send all necessary objects"
+msgstr "uzak konum gereken tüm nesneleri göndermedi"
+
 #, c-format
 msgid "unable to update %s"
 msgstr "%s güncellenemiyor"
 
-#: builtin/clone.c:651
 msgid "failed to initialize sparse-checkout"
 msgstr "sparse-checkout ilklendirilemedi"
 
-#: builtin/clone.c:674
 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:709
 msgid "unable to checkout working tree"
 msgstr "çalışma ağacı çıkış yapılamıyor"
 
-#: builtin/clone.c:793
 msgid "unable to write parameters to config file"
 msgstr "parametreler yapılandırma dosyasına yazılamıyor"
 
-#: builtin/clone.c:856
 msgid "cannot repack to clean up"
 msgstr "temizlik için yeniden paketlenemiyor"
 
-#: builtin/clone.c:858
 msgid "cannot unlink temporary alternates file"
 msgstr "geçici alternatifler dosyasının bağlantısı kesilemiyor"
 
-#: builtin/clone.c:901
 msgid "Too many arguments."
 msgstr "Çok fazla argüman."
 
-#: builtin/clone.c:905 contrib/scalar/scalar.c:413
 msgid "You must specify a repository to clone."
 msgstr "Klonlamak için bir depo belirtmelisiniz."
 
-#: builtin/clone.c:918
 #, c-format
 msgid "options '%s' and '%s %s' cannot be used together"
 msgstr "'%s' ve '%s %s' seçenekleri birlikte kullanılamaz"
 
-#: builtin/clone.c:935
 #, c-format
 msgid "repository '%s' does not exist"
 msgstr "'%s' deposu mevcut değil"
 
-#: builtin/clone.c:939 builtin/fetch.c:2176
 #, c-format
 msgid "depth %s is not a positive number"
 msgstr "%s derinliği pozitif bir sayı değil"
 
-#: builtin/clone.c:949
 #, 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:955
 #, 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:969
 #, c-format
 msgid "working tree '%s' already exists."
 msgstr "Çalışma ağacı '%s' halihazırda mevcut."
 
-#: builtin/clone.c:984 builtin/clone.c:1005 builtin/difftool.c:256
-#: builtin/log.c:2037 builtin/worktree.c:350 builtin/worktree.c:382
 #, c-format
 msgid "could not create leading directories of '%s'"
 msgstr "şunun öncü dizinleri oluşturulamadı: '%s'"
 
-#: builtin/clone.c:989
 #, c-format
 msgid "could not create work tree dir '%s'"
 msgstr "'%s' çalışma ağacı dizini oluşturulamadı"
 
-#: builtin/clone.c:1009
 #, c-format
 msgid "Cloning into bare repository '%s'...\n"
 msgstr "'%s' çıplak deposuna klonlanıyor...\n"
 
-#: builtin/clone.c:1011
 #, c-format
 msgid "Cloning into '%s'...\n"
 msgstr "Klonlama konumu: '%s'...\n"
 
-#: builtin/clone.c:1040
 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:1116 builtin/remote.c:201 builtin/remote.c:721
 #, c-format
 msgid "'%s' is not a valid remote name"
 msgstr "'%s' geçerli bir uzak konum adı değil"
 
-#: builtin/clone.c:1157
 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:1159
 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:1161
 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:1163
 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:1168
+msgid "source repository is shallow, reject to clone."
+msgstr "kaynak depo sığ, klonlama için reddet."
+
 msgid "source repository is shallow, ignoring --local"
 msgstr "kaynak depo sığ, --local yok sayılıyor"
 
-#: builtin/clone.c:1173
 msgid "--local is ignored"
 msgstr "--local yok sayıldı"
 
-#: builtin/clone.c:1185
 msgid "cannot clone from filtered bundle"
 msgstr "süzülmüş demetten klonlanamıyor"
 
-#: builtin/clone.c:1265 builtin/clone.c:1324
 msgid "remote transport reported error"
 msgstr "uzak konum taşıması hata bildirdi"
 
-#: builtin/clone.c:1277 builtin/clone.c:1289
 #, c-format
 msgid "Remote branch %s not found in upstream %s"
 msgstr "%s uzak dalı %s üstkaynağında bulunamadı"
 
-#: builtin/clone.c:1292
 msgid "You appear to have cloned an empty repository."
 msgstr "Boş bir depoyu klonlamış görünüyorsunuz."
 
-#: builtin/column.c:10
 msgid "git column [<options>]"
 msgstr "git column [<seçenekler>]"
 
-#: builtin/column.c:27
 msgid "lookup config vars"
 msgstr "yapılandırma değişkenlerini ara"
 
-#: builtin/column.c:28 builtin/column.c:29
 msgid "layout to use"
 msgstr "kullanılacak yerleşim"
 
-#: builtin/column.c:30
 msgid "maximum width"
 msgstr "olabilecek en çok genişlik"
 
-#: builtin/column.c:31
 msgid "padding space on left border"
 msgstr "sol kenardaki dolgu boşluğu"
 
-#: builtin/column.c:32
 msgid "padding space on right border"
 msgstr "sağ kenardaki dolgu boşluğu"
 
-#: builtin/column.c:33
 msgid "padding space between columns"
 msgstr "sütunlar arasındaki dolgu boşluğu"
 
-#: builtin/column.c:51
 msgid "--command must be the first argument"
 msgstr "--command ilk argüman olmalı"
 
-#: 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:16
 msgid ""
 "git commit-graph write [--object-dir <objdir>] [--append] [--"
 "split[=<strategy>]] [--reachable|--stdin-packs|--stdin-commits] [--changed-"
@@ -13880,96 +4354,79 @@ msgstr ""
 "split[=<strateji>]] [--reachable|--stdin-packs|--stdin-commits] [--changed-"
 "paths] [--[no-]max-new-filters <n>] [--[no-]progress] <bölme-seçenekleri>"
 
-#: builtin/commit-graph.c:51 builtin/fetch.c:196 builtin/log.c:1813
 msgid "dir"
 msgstr "dizin"
 
-#: builtin/commit-graph.c:52
 msgid "the object directory to store the graph"
 msgstr "Grafiğin depolanacağı nesne dizini"
 
-#: 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:100
 #, c-format
 msgid "Could not open commit-graph '%s'"
 msgstr "commit-graph '%s' açılamadı"
 
-#: builtin/commit-graph.c:137
 #, c-format
 msgid "unrecognized --split argument, %s"
 msgstr "tanımlanamayan --split argümanı, %s"
 
-#: 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:155
 #, c-format
 msgid "invalid object: %s"
 msgstr "geçersiz nesne: %s"
 
-#: builtin/commit-graph.c:205
+#, c-format
+msgid "option `%s' expects a numerical value"
+msgstr "'%s' seçeneği sayısal bir değer bekliyor"
+
 msgid "start walk at all refs"
 msgstr "tüm başvurularda gezinmeyi başlat"
 
-#: 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: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: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:213
 msgid "enable computation for changed paths"
 msgstr "değiştirilen yollar için hesaplamayı etkinleştir"
 
-#: 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: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: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: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: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: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:282
 msgid "Collecting commits from input"
 msgstr "Girdiden işlemeler toplanıyor"
 
-#: builtin/commit-graph.c:328 builtin/multi-pack-index.c:259
 #, 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 "
 "<file>)...] <tree>"
@@ -13977,70 +4434,52 @@ msgstr ""
 "git commit-tree [(-p <üst-öge>)...] [-S[<değer-no>]] [(-m <ileti>)...] [(-F "
 "<dosya>)...] <ağaç>"
 
-#: builtin/commit-tree.c:31
 #, c-format
 msgid "duplicate parent %s ignored"
 msgstr "yinelenmiş üst öge %s yok sayıldı"
 
-#: builtin/commit-tree.c:56 builtin/commit-tree.c:134 builtin/log.c:590
 #, c-format
 msgid "not a valid object name %s"
 msgstr "%s geçerli bir nesne adı değil"
 
-#: 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:96
 #, c-format
 msgid "git commit-tree: failed to close '%s'"
 msgstr "git commit-tree: '%s' kapatılamadı"
 
-#: builtin/commit-tree.c:109
 msgid "parent"
 msgstr "üst öge"
 
-#: builtin/commit-tree.c:110
 msgid "id of a parent commit object"
 msgstr "bir üst işleme ögesinin no'su"
 
-#: builtin/commit-tree.c:112 builtin/commit.c:1626 builtin/merge.c:284
-#: builtin/notes.c:407 builtin/notes.c:573 builtin/stash.c:1666
-#: builtin/tag.c:455
 msgid "message"
 msgstr "ileti"
 
-#: builtin/commit-tree.c:113 builtin/commit.c:1626
 msgid "commit message"
 msgstr "işleme iletisi"
 
-#: 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:119 builtin/commit.c:1643 builtin/merge.c:303
-#: builtin/pull.c:180 builtin/revert.c:118
 msgid "GPG sign commit"
 msgstr "işlemeyi GPG ile imzala"
 
-#: builtin/commit-tree.c:131
 msgid "must give exactly one tree"
 msgstr "bir tam ağaç vermeli"
 
-#: builtin/commit-tree.c:138
 msgid "git commit-tree: failed to read"
 msgstr "git commit-tree: okunamadı"
 
-#: builtin/commit.c:43
 msgid "git commit [<options>] [--] <pathspec>..."
 msgstr "git commit [<seçenekler>] [--] <yol-blrtç>..."
 
-#: builtin/commit.c:48
 msgid "git status [<options>] [--] <pathspec>..."
 msgstr "git status [<seçenekler>] [--] <yol-blrtç>..."
 
-#: builtin/commit.c:53
 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"
@@ -14050,7 +4489,6 @@ msgstr ""
 "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:58
 msgid ""
 "The previous cherry-pick is now empty, possibly due to conflict resolution.\n"
 "If you wish to commit it anyway, use:\n"
@@ -14064,15 +4502,12 @@ msgstr ""
 "\tgit commit --allow-empty\n"
 "\n"
 
-#: builtin/commit.c:65
 msgid "Otherwise, please use 'git rebase --skip'\n"
 msgstr "Aksi durumda, lütfen 'git rebase --skip' kullanın.\n"
 
-#: builtin/commit.c:68
 msgid "Otherwise, please use 'git cherry-pick --skip'\n"
 msgstr "Aksi durumda, lütfen 'git cherry-pick --skip' kullanın.\n"
 
-#: builtin/commit.c:71
 msgid ""
 "and then use:\n"
 "\n"
@@ -14094,69 +4529,57 @@ msgstr ""
 "\tgit cherry-pick --skip\n"
 "\n"
 
-#: builtin/commit.c:326
 msgid "failed to unpack HEAD tree object"
 msgstr "HEAD ağaç nesnesi açılamadı"
 
-#: builtin/commit.c:376
 msgid "No paths with --include/--only does not make sense."
 msgstr "--include/--only içermeyen yollar bir anlam ifade etmiyor."
 
-#: builtin/commit.c:388
 msgid "unable to create temporary index"
 msgstr "geçici indeks oluşturulamıyor"
 
-#: builtin/commit.c:397
 msgid "interactive add failed"
 msgstr "etkileşimli ekleme başarısız"
 
-#: builtin/commit.c:412
 msgid "unable to update temporary index"
 msgstr "geçici indeks güncellenemiyor"
 
-#: builtin/commit.c:414
 msgid "Failed to update main cache tree"
 msgstr "Ana önbellek ağacı güncellenemedi"
 
-#: builtin/commit.c:439 builtin/commit.c:462 builtin/commit.c:510
 msgid "unable to write new_index file"
 msgstr "new_index dosyası yazılamıyor"
 
-#: builtin/commit.c:491
 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:493
 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:495
 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:503
 msgid "cannot read the index"
 msgstr "indeks okunamıyor"
 
-#: builtin/commit.c:522
 msgid "unable to write temporary index file"
 msgstr "geçici indeks dosyası yazılamıyor"
 
-#: builtin/commit.c:620
 #, c-format
 msgid "commit '%s' lacks author header"
 msgstr "'%s' işlemesinde yazar üstbilgisi yok"
 
-#: builtin/commit.c:622
 #, c-format
 msgid "commit '%s' has malformed author line"
 msgstr "'%s' işlemesindeki yazar satırı hatalı oluşturulmuş"
 
-#: builtin/commit.c:641
 msgid "malformed --author parameter"
 msgstr "hatalı oluşturulmuş --author parametresi"
 
-#: builtin/commit.c:694
+#, c-format
+msgid "invalid date format: %s"
+msgstr "geçersiz tarih biçimi: %s"
+
 msgid ""
 "unable to select a comment character that is not used\n"
 "in the current commit message"
@@ -14164,43 +4587,38 @@ msgstr ""
 "mevcut işleme iletisinde kullanılmayan bir yorum\n"
 "karakteri seçilemiyor"
 
-#: builtin/commit.c:750 builtin/commit.c:784 builtin/commit.c:1170
 #, c-format
 msgid "could not lookup commit %s"
 msgstr "%s işlemesi aranamadı"
 
-#: builtin/commit.c:762 builtin/shortlog.c:417
 #, c-format
 msgid "(reading log message from standard input)\n"
 msgstr "(günlük iletisi standart girdi'den okunuyor)\n"
 
-#: builtin/commit.c:764
 msgid "could not read log from standard input"
 msgstr "günlük standart girdi'den okunamadı"
 
-#: builtin/commit.c:768
 #, c-format
 msgid "could not read log file '%s'"
 msgstr "günlük dosyası '%s' okunamadı"
 
-#: builtin/commit.c:805
 #, c-format
 msgid "options '%s' and '%s:%s' cannot be used together"
 msgstr "'%s' ve '%s:%s' seçenekleri birlikte kullanılamaz"
 
-#: builtin/commit.c:817 builtin/commit.c:833
 msgid "could not read SQUASH_MSG"
 msgstr "SQUASH_MSG okunamadı"
 
-#: builtin/commit.c:824
 msgid "could not read MERGE_MSG"
 msgstr "MERGE_MSG okunamadı"
 
-#: builtin/commit.c:884
+#, c-format
+msgid "could not open '%s'"
+msgstr "'%s' açılamadı"
+
 msgid "could not write commit template"
 msgstr "işleme şablonu yazılamadı"
 
-#: builtin/commit.c:897
 #, c-format
 msgid ""
 "Please enter the commit message for your changes. Lines starting\n"
@@ -14209,7 +4627,6 @@ msgstr ""
 "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:899
 #, c-format
 msgid ""
 "Please enter the commit message for your changes. Lines starting\n"
@@ -14218,7 +4635,6 @@ msgstr ""
 "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:903
 #, c-format
 msgid ""
 "Please enter the commit message for your changes. Lines starting\n"
@@ -14227,7 +4643,6 @@ msgstr ""
 "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:907
 #, c-format
 msgid ""
 "Please enter the commit message for your changes. Lines starting\n"
@@ -14238,7 +4653,6 @@ msgstr ""
 "satırlar tutulacaktır; isterseniz onları kaldırabilirsiniz.\n"
 "Boş bir ileti işlemeyi iptal eder.\n"
 
-#: builtin/commit.c:919
 msgid ""
 "\n"
 "It looks like you may be committing a merge.\n"
@@ -14252,7 +4666,6 @@ msgstr ""
 "\tgit update-ref -d MERGE_HEAD\n"
 "ve yeniden deneyin.\n"
 
-#: builtin/commit.c:924
 msgid ""
 "\n"
 "It looks like you may be committing a cherry-pick.\n"
@@ -14266,152 +4679,117 @@ msgstr ""
 "\tgit update-ref -d CHERRY_PICK_HEAD\n"
 "ve yeniden deneyin.\n"
 
-#: builtin/commit.c:951
 #, c-format
 msgid "%sAuthor:    %.*s <%.*s>"
 msgstr "%sYazar:     %.*s <%.*s>"
 
-#: builtin/commit.c:959
 #, c-format
 msgid "%sDate:      %s"
 msgstr "%sTarih:     %s"
 
-#: builtin/commit.c:966
 #, c-format
 msgid "%sCommitter: %.*s <%.*s>"
 msgstr "%sİşleyici:  %.*s <%.*s>"
 
-#: builtin/commit.c:984
 msgid "Cannot read index"
 msgstr "İndeks okunamıyor"
 
-#: builtin/commit.c:1029
 msgid "unable to pass trailers to --trailers"
 msgstr "--trailers'a artbilgiler geçirilemiyor"
 
-#: builtin/commit.c:1069
 msgid "Error building trees"
 msgstr "Ağaçlar yapılırken hata"
 
-#: builtin/commit.c:1083 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:1128
 #, 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:1142
 #, c-format
 msgid "Invalid ignored mode '%s'"
 msgstr "Geçersiz yok sayılanları göster kipi '%s'"
 
-#: builtin/commit.c:1160 builtin/commit.c:1450
 #, c-format
 msgid "Invalid untracked files mode '%s'"
 msgstr "Geçersiz izlenmeyen dosyaları göster kipi '%s'"
 
-#: builtin/commit.c:1231
 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:1233
 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:1236
 #, c-format
 msgid "reword option of '%s' and path '%s' cannot be used together"
 msgstr ""
 "'%s' ögesinin yeniden yazım seçeneği ve '%s' yolu birlikte kullanılamaz"
 
-#: builtin/commit.c:1238
 #, c-format
 msgid "reword option of '%s' and '%s' cannot be used together"
 msgstr "'%s' ögesinin yeniden yazım seçeneği ve '%s' birlikte kullanılamaz"
 
-#: builtin/commit.c:1263
 msgid "You have nothing to amend."
 msgstr "Değiştirecek bir şeyiniz yok."
 
-#: builtin/commit.c:1266
 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:1268
 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:1270
 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:1290
 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:1337
 #, c-format
 msgid "unknown option: --fixup=%s:%s"
 msgstr "bilinmeyen seçenek: --fixup=%s:%s"
 
-#: 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:1485 builtin/commit.c:1654
 msgid "show status concisely"
 msgstr "durumu kısaca göster"
 
-#: builtin/commit.c:1487 builtin/commit.c:1656
 msgid "show branch information"
 msgstr "dal bilgisini göster"
 
-#: builtin/commit.c:1489
 msgid "show stash information"
 msgstr "zula bilgisini göster"
 
-#: 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:1493
 msgid "version"
 msgstr "sürüm"
 
-#: builtin/commit.c:1493 builtin/commit.c:1660 builtin/push.c:551
-#: builtin/worktree.c:765
 msgid "machine-readable output"
 msgstr "makine tarafından okunabilir çıktı"
 
-#: 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:1499 builtin/commit.c:1665
 msgid "terminate entries with NUL"
 msgstr "girdileri NUL ile sonlandır"
 
-#: builtin/commit.c:1501 builtin/commit.c:1505 builtin/commit.c:1668
-#: builtin/fast-export.c:1172 builtin/fast-export.c:1175
-#: builtin/fast-export.c:1178 builtin/rebase.c:1139 parse-options.h:368
 msgid "mode"
 msgstr "kip"
 
-#: 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:1506
 msgid ""
 "show ignored files, optional modes: traditional, matching, no. (Default: "
 "traditional)"
@@ -14419,11 +4797,9 @@ msgstr ""
 "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:1508 parse-options.h:197
 msgid "when"
 msgstr "ne zaman"
 
-#: builtin/commit.c:1509
 msgid ""
 "ignore changes to submodules, optional when: all, dirty, untracked. "
 "(Default: all)"
@@ -14431,198 +4807,155 @@ msgstr ""
 "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:1511
 msgid "list untracked files in columns"
 msgstr "izlenmeyen dosyaları sütunlarla göster"
 
-#: builtin/commit.c:1512
 msgid "do not detect renames"
 msgstr "yeniden adlandırmaları algılama"
 
-#: 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: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:1619
 msgid "suppress summary after successful commit"
 msgstr "başarılı işlemenin ardından özeti gizle"
 
-#: builtin/commit.c:1620
 msgid "show diff in commit message template"
 msgstr "diff'i işleme iletisi şablonunda göster"
 
-#: builtin/commit.c:1622
 msgid "Commit message options"
 msgstr "İşleme iletisi seçenekleri"
 
-#: builtin/commit.c:1623 builtin/merge.c:288 builtin/tag.c:457
 msgid "read message from file"
 msgstr "iletiyi dosyadan oku"
 
-#: builtin/commit.c:1624
 msgid "author"
 msgstr "yazar"
 
-#: builtin/commit.c:1624
 msgid "override author for commit"
 msgstr "işleme yazarını geçersiz kıl"
 
-#: builtin/commit.c:1625 builtin/gc.c:551
 msgid "date"
 msgstr "tarih"
 
-#: builtin/commit.c:1625
 msgid "override date for commit"
 msgstr "işleme tarihini geçersiz kıl"
 
-#: builtin/commit.c:1627 builtin/commit.c:1628 builtin/commit.c:1634
-#: parse-options.h:360 ref-filter.h:89
 msgid "commit"
 msgstr "işleme"
 
-#: 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: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:1633
 msgid "[(amend|reword):]commit"
 msgstr "[(amend|reword):]işleme"
 
-#: 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: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: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:1636 builtin/interpret-trailers.c:111
 msgid "trailer"
 msgstr "artbilgi"
 
-#: builtin/commit.c:1636
 msgid "add custom trailer(s)"
 msgstr "özel artbilgiler ekle"
 
-#: builtin/commit.c:1637 builtin/log.c:1788 builtin/merge.c:306
-#: 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:1638
 msgid "use specified template file"
 msgstr "belirtilen şablon dosyasını kullan"
 
-#: builtin/commit.c:1639
 msgid "force edit of commit"
 msgstr "işlemeyi zorla düzenle"
 
-#: builtin/commit.c:1641
 msgid "include status in commit message template"
 msgstr "işleme iletisi şablonunda durumu içer"
 
-#: builtin/commit.c:1646
 msgid "Commit contents options"
 msgstr "İşleme içeriği seçenekleri"
 
-#: builtin/commit.c:1647
 msgid "commit all changed files"
 msgstr "değiştirilen tüm dosyaları gönder"
 
-#: builtin/commit.c:1648
 msgid "add specified files to index for commit"
 msgstr "belirtilen dosyaları işleme için indekse ekle"
 
-#: builtin/commit.c:1649
 msgid "interactively add files"
 msgstr "dosyaları etkileşimli olarak ekle"
 
-#: builtin/commit.c:1650
 msgid "interactively add changes"
 msgstr "değişiklikleri etkileşimli olarak ekle"
 
-#: builtin/commit.c:1651
 msgid "commit only specified files"
 msgstr "yalnızca belirtilen dosyaları gönder"
 
-#: builtin/commit.c:1652
 msgid "bypass pre-commit and commit-msg hooks"
 msgstr "pre-commit ve commit-msg kancalarını atla"
 
-#: builtin/commit.c:1653
 msgid "show what would be committed"
 msgstr "neyin işleneceğini göster"
 
-#: builtin/commit.c:1666
 msgid "amend previous commit"
 msgstr "önceki işlemeyi değiştir"
 
-#: builtin/commit.c:1667
 msgid "bypass post-rewrite hook"
 msgstr "post-rewrite kancasını atla"
 
-#: builtin/commit.c:1674
 msgid "ok to record an empty change"
 msgstr "boş bir değişikliğin kaydı yazılabilir"
 
-#: 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:1752
+msgid "could not parse HEAD commit"
+msgstr "HEAD işlemesi ayrıştırılamadı"
+
 #, c-format
 msgid "Corrupt MERGE_HEAD file (%s)"
 msgstr "Hasar görmüş MERGE_HEAD dosyası (%s)"
 
-#: builtin/commit.c:1759
 msgid "could not read MERGE_MODE"
 msgstr "MERGE_MODE okunamadı"
 
-#: builtin/commit.c:1780
 #, c-format
 msgid "could not read commit message: %s"
 msgstr "işleme iletisi okunamadı: %s"
 
-#: builtin/commit.c:1787
 #, c-format
 msgid "Aborting commit due to empty commit message.\n"
 msgstr "İşleme iletisinin boş bırakılmasından ötürü iptal ediliyor.\n"
 
-#: 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:1803
 #, c-format
 msgid "Aborting commit due to empty commit message body.\n"
 msgstr "İşleme iletisi gövdesinin boş bırakılmasından ötürü iptal ediliyor.\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"
@@ -14632,228 +4965,178 @@ msgstr ""
 "Diskin dolu olup olmadığını ve kotanızı aşıp aşmadığınızı denetleyin,\n"
 "sonra kurtarmak için \"git restore --staged :/\" kullanın."
 
-#: builtin/config.c:11
 msgid "git config [<options>]"
 msgstr "git config [<seçenekler>]"
 
-#: builtin/config.c:109 builtin/env--helper.c:27
 #, c-format
 msgid "unrecognized --type argument, %s"
 msgstr "tanımlanamayan --type argümanı, %s"
 
-#: builtin/config.c:121
 msgid "only one type at a time"
 msgstr "bir kerede yalnızca bir tür"
 
-#: builtin/config.c:130
 msgid "Config file location"
 msgstr "Yapılandırma dosyası konumu"
 
-#: builtin/config.c:131
 msgid "use global config file"
 msgstr "global yapılandırma dosyası kullan"
 
-#: builtin/config.c:132
 msgid "use system config file"
 msgstr "sistem yapılandırma dosyası kullan"
 
-#: builtin/config.c:133
 msgid "use repository config file"
 msgstr "depo yapılandırma dosyası kullan"
 
-#: builtin/config.c:134
 msgid "use per-worktree config file"
 msgstr "her çalışma ağacına özel bir yapılandırma dosyası kullan"
 
-#: builtin/config.c:135
 msgid "use given config file"
 msgstr "verilen yapılandırma dosyasını kullan"
 
-#: builtin/config.c:136
 msgid "blob-id"
 msgstr "ikili nesne numarası"
 
-#: builtin/config.c:136
 msgid "read config from given blob object"
 msgstr "verilen ikili nesneden yapılandırmayı oku"
 
-#: builtin/config.c:137
 msgid "Action"
 msgstr "Eylem"
 
-#: builtin/config.c:138
 msgid "get value: name [value-pattern]"
 msgstr "değer al: ad [değer-dizgisi]"
 
-#: builtin/config.c:139
 msgid "get all values: key [value-pattern]"
 msgstr "tüm değerleri al: anahtar [değer-dizgisi]"
 
-#: builtin/config.c:140
 msgid "get values for regexp: name-regex [value-pattern]"
 msgstr "düzenli ifade için değerleri al: düzenli ifade adı [değer-dizgisi]"
 
-#: builtin/config.c:141
 msgid "get value specific for the URL: section[.var] URL"
 msgstr "URL için özel olan değeri al: bölüm[.var] URL"
 
-#: builtin/config.c:142
 msgid "replace all matching variables: name value [value-pattern]"
 msgstr "tüm eşleşen değişkenleri değiştir: ad değer [değer-dizgisi]"
 
-#: builtin/config.c:143
 msgid "add a new variable: name value"
 msgstr "yeni bir değişken ekle: ad değer"
 
-#: builtin/config.c:144
 msgid "remove a variable: name [value-pattern]"
 msgstr "bir değişken kaldır: ad [değer-dizgisi]"
 
-#: builtin/config.c:145
 msgid "remove all matches: name [value-pattern]"
 msgstr "tüm eşleşmeleri kaldır: ad [değer-dizgisi]"
 
-#: builtin/config.c:146
 msgid "rename section: old-name new-name"
 msgstr "bölümü yeniden adlandır: eski-ad yeni-ad"
 
-#: builtin/config.c:147
 msgid "remove a section: name"
 msgstr "bir bölümü kaldır: ad"
 
-#: builtin/config.c:148
 msgid "list all"
 msgstr "tümünü listele"
 
-#: builtin/config.c:149
 msgid "use string equality when comparing values to 'value-pattern'"
 msgstr "değerleri 'değer-dizgisi' ile karşılaştırırken dizi eşitliği kullan"
 
-#: builtin/config.c:150
 msgid "open an editor"
 msgstr "bir düzenleyici aç"
 
-#: builtin/config.c:151
 msgid "find the color configured: slot [default]"
 msgstr "yapılandırılan rengi bul: yuva [öntanımlı]"
 
-#: builtin/config.c:152
 msgid "find the color setting: slot [stdout-is-tty]"
 msgstr "renk ayarını bul: yuva [stdout tty]"
 
-#: builtin/config.c:153
 msgid "Type"
 msgstr "Tür"
 
-#: builtin/config.c:154 builtin/env--helper.c:42 builtin/hash-object.c:97
 msgid "type"
 msgstr "tür"
 
-#: builtin/config.c:154 builtin/env--helper.c:43
 msgid "value is given this type"
 msgstr "değer bu türde verildi"
 
-#: builtin/config.c:155
 msgid "value is \"true\" or \"false\""
 msgstr "değer \"true\" (doğru) veya \"false\" (yanlış)"
 
-#: builtin/config.c:156
 msgid "value is decimal number"
 msgstr "değer ondalık sayı"
 
-#: builtin/config.c:157
 msgid "value is --bool or --int"
 msgstr "değer --bool veya --int"
 
-#: builtin/config.c:158
 msgid "value is --bool or string"
 msgstr "değer --bool veya dizi"
 
-#: builtin/config.c:159
 msgid "value is a path (file or directory name)"
 msgstr "değer bir yol (dosya veya dizin adı)"
 
-#: builtin/config.c:160
 msgid "value is an expiry date"
 msgstr "değer bir son kullanım tarihi"
 
-#: builtin/config.c:161
 msgid "Other"
 msgstr "Diğer"
 
-#: builtin/config.c:162
 msgid "terminate values with NUL byte"
 msgstr "değerleri NUL baytı ile sonlandır"
 
-#: builtin/config.c:163
 msgid "show variable names only"
 msgstr "yalnızca değişken adlarını göster"
 
-#: builtin/config.c:164
 msgid "respect include directives on lookup"
 msgstr "arama sırasında içerme yönergelerine uy"
 
-#: builtin/config.c:165
 msgid "show origin of config (file, standard input, blob, command line)"
 msgstr ""
 "yapılandırmanın kökenini göster (dosya, stdin, ikili nesne, komut satırı)"
 
-#: builtin/config.c:166
 msgid "show scope of config (worktree, local, global, system, command)"
 msgstr ""
 "yapılandırmanın kapsamını göster (çalışma ağacı, yerel, global, sistem, "
 "komut)"
 
-#: builtin/config.c:167 builtin/env--helper.c:45
 msgid "value"
 msgstr "değer"
 
-#: builtin/config.c:167
 msgid "with --get, use default value when missing entry"
 msgstr "--get ile girdi verilmemişse öntanımlı değeri kullan"
 
-#: builtin/config.c:181
 #, c-format
 msgid "wrong number of arguments, should be %d"
 msgstr "yanlış argüman sayısı, %d olmalı"
 
-#: builtin/config.c:183
 #, c-format
 msgid "wrong number of arguments, should be from %d to %d"
 msgstr "yanlış argüman sayısı, %d ile %d arasında olmalı"
 
-#: builtin/config.c:339
 #, c-format
 msgid "invalid key pattern: %s"
 msgstr "geçersiz anahtar dizgisi: %s"
 
-#: builtin/config.c:377
+#, c-format
+msgid "invalid pattern: %s"
+msgstr "geçersiz dizgi: %s"
+
 #, c-format
 msgid "failed to format default config value: %s"
 msgstr "öntanımlı yapılandırma değeri biçimlendirilemedi: %s"
 
-#: builtin/config.c:441
 #, c-format
 msgid "cannot parse color '%s'"
 msgstr "renk ayrıştırılamıyor: '%s'"
 
-#: builtin/config.c:483
 msgid "unable to parse default color value"
 msgstr "öntanımlı renk değeri ayrıştırılamıyor"
 
-#: builtin/config.c:536 builtin/config.c:833
 msgid "not in a git directory"
 msgstr "bir git dizininde değil"
 
-#: builtin/config.c:539
 msgid "writing to stdin is not supported"
 msgstr "stdin'e yazma desteklenmiyor"
 
-#: builtin/config.c:542
 msgid "writing config blobs is not supported"
 msgstr "yapılandırma ikili nesneleri yazımı desteklenmiyor"
 
-#: builtin/config.c:627
 #, c-format
 msgid ""
 "# This is Git's per-user configuration file.\n"
@@ -14868,27 +5151,21 @@ msgstr ""
 "#\tad = %s\n"
 "#\te-posta = %s\n"
 
-#: builtin/config.c:652
 msgid "only one config file at a time"
 msgstr "bir kerede yalnızca bir yapılandırma dosyası"
 
-#: builtin/config.c:658
 msgid "--local can only be used inside a git repository"
 msgstr "--local yalnızca bir git deposu içinde kullanılabilir"
 
-#: builtin/config.c:660
 msgid "--blob can only be used inside a git repository"
 msgstr "--blob yalnızca bir git deposu içinde kullanılabilir"
 
-#: builtin/config.c:662
 msgid "--worktree can only be used inside a git repository"
 msgstr "--worktree yalnızca bir git deposu içinde kullanılabilir"
 
-#: builtin/config.c:684
 msgid "$HOME not set"
 msgstr "$HOME ayarlanmamış"
 
-#: builtin/config.c:708
 msgid ""
 "--worktree cannot be used with multiple working trees unless the config\n"
 "extension worktreeConfig is enabled. Please read \"CONFIGURATION FILE\"\n"
@@ -14898,19 +5175,15 @@ msgstr ""
 "sürece birden çok çalışma ağacı ile birlikte kullanılamaz. Ayrıntılar için\n"
 "lütfen \"git help worktree\" içindeki \"CONFIGURATION FILE\" bölümünü okuyun."
 
-#: builtin/config.c:743
 msgid "--get-color and variable type are incoherent"
 msgstr "--get-color ve değişken türü tutarsız"
 
-#: builtin/config.c:748
 msgid "only one action at a time"
 msgstr "bir kerede yalnızca bir eylem"
 
-#: builtin/config.c:761
 msgid "--name-only is only applicable to --list or --get-regexp"
 msgstr "--name-only yalnızca şunlara uygulanabilir: --list, --get-regexp"
 
-#: builtin/config.c:767
 msgid ""
 "--show-origin is only applicable to --get, --get-all, --get-regexp, and --"
 "list"
@@ -14918,37 +5191,29 @@ msgstr ""
 "--show-origin yalnızca şunlara uygulanabilir: --get, --get-all, --get-regexp "
 "ve --list"
 
-#: builtin/config.c:773
 msgid "--default is only applicable to --get"
 msgstr "--default yalnızca şuna uygulanabilir: --get"
 
-#: builtin/config.c:806
 msgid "--fixed-value only applies with 'value-pattern'"
 msgstr "--fixed-value yalnızca 'değer-dizgisi' ile uygulanır"
 
-#: builtin/config.c:822
 #, c-format
 msgid "unable to read config file '%s'"
 msgstr "'%s' yapılandırma dosyası okunamıyor"
 
-#: builtin/config.c:825
 msgid "error processing config file(s)"
 msgstr "yapılandırma dosyaları işlenirken hata"
 
-#: builtin/config.c:835
 msgid "editing stdin is not supported"
 msgstr "stdin'i düzenleme desteklenmiyor"
 
-#: builtin/config.c:837
 msgid "editing blobs is not supported"
 msgstr "ikili nesneleri düzenleme desteklenmiyor"
 
-#: builtin/config.c:851
 #, c-format
 msgid "cannot create configuration file %s"
 msgstr "%s yapılandırma dosyası oluşturulamıyor"
 
-#: builtin/config.c:864
 #, c-format
 msgid ""
 "cannot overwrite multiple values with a single value\n"
@@ -14958,16 +5223,13 @@ msgstr ""
 "       %s değerini değiştirmek için bir düzenli ifade, --add veya --replace-"
 "all kullanın."
 
-#: builtin/config.c:943 builtin/config.c:954
 #, c-format
 msgid "no such section: %s"
 msgstr "böyle bir bölüm yok: %s"
 
-#: builtin/count-objects.c:100
 msgid "print sizes in human readable format"
 msgstr "yazdırma boyutları kişi tarafından okunabilir biçimde"
 
-#: builtin/credential-cache--daemon.c:227
 #, c-format
 msgid ""
 "The permissions on your socket directory are too loose; other\n"
@@ -14980,70 +5242,55 @@ msgstr ""
 "\n"
 "\tchmod 0700 %s"
 
-#: builtin/credential-cache--daemon.c:276
 msgid "print debugging messages to stderr"
 msgstr "hata ayıklama iletilerini stderr'e yazdır"
 
-#: builtin/credential-cache--daemon.c:316
 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:180
 msgid "credential-cache unavailable; no unix socket support"
 msgstr "credential-cache kullanılamıyor; unix soket desteği yok"
 
-#: builtin/credential-store.c:66
 #, c-format
 msgid "unable to get credential storage lock in %d ms"
 msgstr "kimlik depo kilidi %d ms içinde alınamadı"
 
-#: builtin/describe.c:26
 msgid "git describe [<options>] [<commit-ish>...]"
 msgstr "git describe [<seçenekler>] [<işlememsi>...]"
 
-#: builtin/describe.c:27
 msgid "git describe [<options>] --dirty"
 msgstr "git describe [<seçenekler>] --dirty"
 
-#: builtin/describe.c:63
 msgid "head"
 msgstr "dal ucu"
 
-#: builtin/describe.c:63
 msgid "lightweight"
 msgstr "hafif"
 
-#: builtin/describe.c:63
 msgid "annotated"
 msgstr "ek açıklamalı"
 
-#: builtin/describe.c:277
 #, c-format
 msgid "annotated tag %s not available"
 msgstr "%s ek açıklamalı etiketi mevcut değil"
 
-#: builtin/describe.c:281
 #, c-format
 msgid "tag '%s' is externally known as '%s'"
 msgstr "'%s' etiketi dışarıda '%s' olarak biliniyor"
 
-#: builtin/describe.c:328
 #, c-format
 msgid "no tag exactly matches '%s'"
 msgstr "'%s' ile herhangi bir etiket tam olarak eşleşmiyor"
 
-#: builtin/describe.c:330
 #, c-format
 msgid "No exact match on refs or tags, searching to describe\n"
 msgstr ""
 "Kesin olarak eşleşen başvuru veya etiket yok, betimlemek için aranıyor\n"
 
-#: builtin/describe.c:397
 #, c-format
 msgid "finished search at %s\n"
 msgstr "arama şurada bitirildi: %s\n"
 
-#: builtin/describe.c:424
 #, c-format
 msgid ""
 "No annotated tags can describe '%s'.\n"
@@ -15052,7 +5299,6 @@ msgstr ""
 "Hiçbir ek açıklamalı etiket şunu betimleyemiyor: '%s'.\n"
 "Bunun yanında ek açıklaması olmayan etiketler vardı, --tags deneyin."
 
-#: builtin/describe.c:428
 #, c-format
 msgid ""
 "No tags can describe '%s'.\n"
@@ -15061,12 +5307,10 @@ msgstr ""
 "Şunu hiçbir etiket betimleyemez: '%s'.\n"
 "--always deneyin veya birkaç etiket oluşturun."
 
-#: builtin/describe.c:458
 #, c-format
 msgid "traversed %lu commits\n"
 msgstr "%lu işleme katedildi\n"
 
-#: builtin/describe.c:461
 #, c-format
 msgid ""
 "more than %i tags found; listed %i most recent\n"
@@ -15075,149 +5319,116 @@ msgstr ""
 "%i etiketten fazla etiket bulundu; en son %i listelendi\n"
 "şu konumda arama bırakıldı: %s\n"
 
-#: builtin/describe.c:529
 #, c-format
 msgid "describe %s\n"
 msgstr "şunu tanımla: %s\n"
 
-#: builtin/describe.c:532
 #, c-format
 msgid "Not a valid object name %s"
 msgstr "%s geçerli bir nesne adı değil"
 
-#: builtin/describe.c:540
 #, c-format
 msgid "%s is neither a commit nor blob"
 msgstr "%s ne bir işleme ne de ikili nesne"
 
-#: builtin/describe.c:554
 msgid "find the tag that comes after the commit"
 msgstr "işlemenin ardından gelen etiketi bul"
 
-#: builtin/describe.c:555
 msgid "debug search strategy on stderr"
 msgstr "stderr'deki arama stratejisini ayıkla"
 
-#: builtin/describe.c:556
 msgid "use any ref"
 msgstr "herhangi bir başvuruyu kullan"
 
-#: builtin/describe.c:557
 msgid "use any tag, even unannotated"
 msgstr "herhangi bir etiketi kullan, ek açıklaması olmasa bile"
 
-#: builtin/describe.c:558
 msgid "always use long format"
 msgstr "her zaman uzun biçimi kullan"
 
-#: builtin/describe.c:559
 msgid "only follow first parent"
 msgstr "yalnızca ilk üst ögeyi izle"
 
-#: builtin/describe.c:562
 msgid "only output exact matches"
 msgstr "yalnızca kesin eşleşmeleri çıktı ver"
 
-#: builtin/describe.c:564
 msgid "consider <n> most recent tags (default: 10)"
 msgstr "<n> en son etiketi dikkate al (öntanımlı: 10)"
 
-#: builtin/describe.c:566
 msgid "only consider tags matching <pattern>"
 msgstr "yalnızca <dizgi> ile eşleşen etiketleri dikkate al"
 
-#: builtin/describe.c:568
 msgid "do not consider tags matching <pattern>"
 msgstr "<dizgi> ile eşleşen etiketleri dikkate alma"
 
-#: builtin/describe.c:570 builtin/name-rev.c:595
 msgid "show abbreviated commit object as fallback"
 msgstr "kısaltılmış işleme nesnesini geri çekilinecek nesne olarak göster"
 
-#: builtin/describe.c:571 builtin/describe.c:574
 msgid "mark"
 msgstr "im"
 
-#: builtin/describe.c:572
 msgid "append <mark> on dirty working tree (default: \"-dirty\")"
 msgstr "<im>'i kirli çalışma ağacına iliştir (öntanımlı: \"-dirty\")"
 
-#: builtin/describe.c:575
 msgid "append <mark> on broken working tree (default: \"-broken\")"
 msgstr "<im>'i bozuk çalışma ağacına iliştir (öntanımlı: \"-broken\")"
 
-#: builtin/describe.c:622
 msgid "No names found, cannot describe anything."
 msgstr "Hiçbir ad bulunamadı, hiçbir şey betimlenemiyor."
 
-#: builtin/describe.c:673 builtin/describe.c:675
 #, c-format
 msgid "option '%s' and commit-ishes cannot be used together"
 msgstr "'%s' seçeneği ve işlememsiler birlikte kullanılamaz"
 
-#: builtin/diff-tree.c:157
 msgid "--merge-base only works with two commits"
 msgstr "--merge-base yalnızca iki işleme ile kullanılabilir"
 
-#: builtin/diff.c:92
 #, c-format
 msgid "'%s': not a regular file or symlink"
 msgstr "'%s': Sıradan bir dosya veya sembolik bağ değil"
 
-#: builtin/diff.c:259
 #, c-format
 msgid "invalid option: %s"
 msgstr "geçersiz seçenek: %s"
 
-#: builtin/diff.c:376
 #, c-format
 msgid "%s...%s: no merge base"
 msgstr "%s...%s: birleştirme temeli yok"
 
-#: builtin/diff.c:491
 msgid "Not a git repository"
 msgstr "Bir git deposu değil"
 
-#: builtin/diff.c:537 builtin/grep.c:700
 #, c-format
 msgid "invalid object '%s' given."
 msgstr "geçersiz nesne '%s' verildi"
 
-#: builtin/diff.c:548
 #, c-format
 msgid "more than two blobs given: '%s'"
 msgstr "ikiden çok ikili nesne verildi: '%s'"
 
-#: builtin/diff.c:553
 #, c-format
 msgid "unhandled object '%s' given."
 msgstr "ele alınmayan nesne '%s' verildi"
 
-#: builtin/diff.c:587
 #, c-format
 msgid "%s...%s: multiple merge bases, using %s"
 msgstr "%s...%s: çoklu birleştirme temelleri, %s kullanılıyor"
 
-#: builtin/difftool.c:31
 msgid "git difftool [<options>] [<commit> [<commit>]] [--] [<path>...]"
 msgstr "git difftool [<seçenekler>] [<işleme> [<işleme>]] [--] [<yol>...]"
 
-#: builtin/difftool.c:287
 #, c-format
 msgid "could not read symlink %s"
 msgstr "%s sembolik bağı okunamadı"
 
-#: builtin/difftool.c:289
 #, c-format
 msgid "could not read symlink file %s"
 msgstr "%s sembolik bağ dosyası okunamadı"
 
-#: builtin/difftool.c:297
 #, c-format
 msgid "could not read object %s for symlink %s"
 msgstr "%s nesnesi %s sembolik bağı için okunamadı"
 
-#: builtin/difftool.c:421
 msgid ""
 "combined diff formats ('-c' and '--cc') are not supported in\n"
 "directory diff mode ('-d' and '--dir-diff')."
@@ -15225,59 +5436,50 @@ msgstr ""
 "Birleştirilmiş diff biçimleri ('-c' ve '--cc') dizin diff kipinde\n"
 "('-d' ve '--dir-diff') desteklenmiyor."
 
-#: builtin/difftool.c:626
 #, c-format
 msgid "both files modified: '%s' and '%s'."
 msgstr "Her iki dosya da değiştirildi: '%s' ve '%s'."
 
-#: builtin/difftool.c:628
 msgid "working tree file has been left."
 msgstr "Çalışma ağacı dosyası bırakıldı."
 
-#: builtin/difftool.c:639
+#, c-format
+msgid "could not copy '%s' to '%s'"
+msgstr "'%s', '%s' konumuna kopyalanamadı"
+
 #, c-format
 msgid "temporary files exist in '%s'."
 msgstr "'%s' konumunda geçici dosyalar var."
 
-#: builtin/difftool.c:640
 msgid "you may want to cleanup or recover these."
 msgstr "Bunları temizlemek veya kurtarmak isteyebilirsiniz."
 
-#: builtin/difftool.c:645
 #, c-format
 msgid "failed: %d"
 msgstr "başarısız: %d"
 
-#: builtin/difftool.c:690
 msgid "use `diff.guitool` instead of `diff.tool`"
 msgstr "'diff.tool' yerine 'diff.guitool' kullan"
 
-#: builtin/difftool.c:692
 msgid "perform a full-directory diff"
 msgstr "bir tam dizin diff'i gerçekleştir"
 
-#: builtin/difftool.c:694
 msgid "do not prompt before launching a diff tool"
 msgstr "bir diff aracı çalıştırmadan önce sorma"
 
-#: builtin/difftool.c:699
 msgid "use symlinks in dir-diff mode"
 msgstr "dir-diff kipinde sembolik bağlar kullan"
 
-#: builtin/difftool.c:700
 msgid "tool"
 msgstr "araç"
 
-#: builtin/difftool.c:701
 msgid "use the specified diff tool"
 msgstr "belirtilen diff aracını kullan"
 
-#: builtin/difftool.c:703
 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"
 
-#: builtin/difftool.c:706
 msgid ""
 "make 'git-difftool' exit when an invoked diff tool returns a non-zero exit "
 "code"
@@ -15285,46 +5487,36 @@ 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:709
 msgid "specify a custom command for viewing diffs"
 msgstr "diff'leri görüntülemek için özel bir komut belirle"
 
-#: builtin/difftool.c:710
 msgid "passed to `diff`"
 msgstr "'diff'e aktarıldı"
 
-#: builtin/difftool.c:726
 msgid "difftool requires worktree or --no-index"
 msgstr "difftool, çalışma ağacı veya --no-index gerektiriyor"
 
-#: builtin/difftool.c:745
 msgid "no <tool> given for --tool=<tool>"
 msgstr "--tool=<araç> için bir <araç> verilmedi"
 
-#: builtin/difftool.c:752
 msgid "no <cmd> given for --extcmd=<cmd>"
 msgstr "--extcmd=<komut> için bir <komut> verilmedi"
 
-#: builtin/env--helper.c:6
 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:46
 msgid "default for git_env_*(...) to fall back on"
 msgstr "git_env_*(...)'ın geri çekileceği öntanımlı"
 
-#: builtin/env--helper.c:48
 msgid "be quiet only use git_env_*() value as exit code"
 msgstr "sessiz ol, yalnızca git_env_*() değerini çıkış kodu olarak kullan"
 
-#: builtin/env--helper.c:67
 #, c-format
 msgid "option `--default' expects a boolean value with `--type=bool`, not `%s`"
 msgstr ""
 "--default seçeneği, --type=bool ile birlikte bir Boole değeri bekliyor, '%s' "
 "değil"
 
-#: builtin/env--helper.c:82
 #, c-format
 msgid ""
 "option `--default' expects an unsigned long value with `--type=ulong`, not `"
@@ -15333,249 +5525,190 @@ msgstr ""
 "--default seçeneği, --type=ulong ile birlikte bir imzalanmamış uzun değer "
 "bekliyor, '%s' değil"
 
-#: builtin/fast-export.c:29
 msgid "git fast-export [<rev-list-opts>]"
 msgstr "git fast-export [<revizyon-listesi-seçenekleri>]"
 
-#: builtin/fast-export.c:843
 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:1152
 msgid "--anonymize-map token cannot be empty"
 msgstr "--anonymize-map jetonu boş olamaz"
 
-#: builtin/fast-export.c:1171
 msgid "show progress after <n> objects"
 msgstr "<n> nesneden sonra ilerlemeyi göster"
 
-#: builtin/fast-export.c:1173
 msgid "select handling of signed tags"
 msgstr "imzalanan etiketlerin nasıl ele alınacağını seçin"
 
-#: builtin/fast-export.c:1176
 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:1179
 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:1182
 msgid "dump marks to this file"
 msgstr "imleri bu dosyaya boşalt"
 
-#: builtin/fast-export.c:1184
 msgid "import marks from this file"
 msgstr "imleri bu dosyadan içe aktar"
 
-#: builtin/fast-export.c:1188
 msgid "import marks from this file if it exists"
 msgstr "eğer varsa bu dosyadan imleri içe aktar"
 
-#: builtin/fast-export.c:1190
 msgid "fake a tagger when tags lack one"
 msgstr "etiketlerin bir etiketleyicisi yoksa varmış gibi davran"
 
-#: builtin/fast-export.c:1192
 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:1194
 msgid "use the done feature to terminate the stream"
 msgstr "akışı sonlandırmak için 'done' özelliğini kullan"
 
-#: builtin/fast-export.c:1195
 msgid "skip output of blob data"
 msgstr "ikili nesne verisi çıktısını atla"
 
-#: builtin/fast-export.c:1196 builtin/log.c:1860
 msgid "refspec"
 msgstr "başvuru belirteci"
 
-#: builtin/fast-export.c:1197
 msgid "apply refspec to exported refs"
 msgstr "başvuru belirtecini dışa aktarılan başvurulara uygula"
 
-#: builtin/fast-export.c:1198
 msgid "anonymize output"
 msgstr "çıktı kimliğini gizle"
 
-#: builtin/fast-export.c:1199
 msgid "from:to"
 msgstr "kimden:kime"
 
-#: builtin/fast-export.c:1200
 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:1203
 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:1205
 msgid "show original object ids of blobs/commits"
 msgstr "ikili nesnelerin/işlemelerin orijinal nesne numaralarını göster"
 
-#: builtin/fast-export.c:1207
 msgid "label tags with mark ids"
 msgstr "etiketleri im numaralarıyla adlandır"
 
-#: builtin/fast-import.c:3097
 #, c-format
 msgid "Missing from marks for submodule '%s'"
 msgstr "'%s' altmodülü için '(on)-dan' imleri eksik"
 
-#: builtin/fast-import.c:3099
 #, c-format
 msgid "Missing to marks for submodule '%s'"
 msgstr "'%s' altmodülü için '(o)-na' imleri eksik"
 
-#: builtin/fast-import.c:3234
 #, c-format
 msgid "Expected 'mark' command, got %s"
 msgstr "'mark' komutu bekleniyordu, %s alındı"
 
-#: builtin/fast-import.c:3239
 #, c-format
 msgid "Expected 'to' command, got %s"
 msgstr "'to' komutu bekleniyordu, %s alındı"
 
-#: builtin/fast-import.c:3331
 msgid "Expected format name:filename for submodule rewrite option"
 msgstr "Altmodül yeniden yazım seçeneği için name:filename biçimi bekleniyordu"
 
-#: builtin/fast-import.c:3386
 #, c-format
 msgid "feature '%s' forbidden in input without --allow-unsafe-features"
 msgstr "'%s' özelliği --allow-unsafe-features olmadan girdide yasaklı"
 
-#: builtin/fetch-pack.c:246
 #, c-format
 msgid "Lockfile created but not reported: %s"
 msgstr "Kilit dosyası oluşturuldu; ancak raporlanmadı: %s"
 
-#: builtin/fetch.c:36
 msgid "git fetch [<options>] [<repository> [<refspec>...]]"
 msgstr "git fetch [<seçenekler>] [<depo> [<bşvr-blrtç>...]]"
 
-#: builtin/fetch.c:37
 msgid "git fetch [<options>] <group>"
 msgstr "git fetch [<seçenekler>] <grup>"
 
-#: builtin/fetch.c:38
 msgid "git fetch --multiple [<options>] [(<repository> | <group>)...]"
 msgstr "git fetch --multiple [<seçenekler>] [(<depo> | <grup>)...]"
 
-#: builtin/fetch.c:39
 msgid "git fetch --all [<options>]"
 msgstr "git fetch --all [<seçenekler>]"
 
-#: builtin/fetch.c:124
 msgid "fetch.parallel cannot be negative"
 msgstr "fetch.parallel negatif olamaz"
 
-#: builtin/fetch.c:147 builtin/pull.c:189
 msgid "fetch from all remotes"
 msgstr "tüm uzak konumlardan getir"
 
-#: builtin/fetch.c:149 builtin/pull.c:249
 msgid "set upstream for git pull/fetch"
 msgstr "git pull/fetch için üstkaynak ayarla"
 
-#: builtin/fetch.c:151 builtin/pull.c:192
 msgid "append to .git/FETCH_HEAD instead of overwriting"
 msgstr ".git/FETCH_HEAD'in üzerine yazmak yerine ona iliştir"
 
-#: builtin/fetch.c:153
 msgid "use atomic transaction to update references"
 msgstr "başvuruları güncellemek için atomsal işlem kullan"
 
-#: builtin/fetch.c:155 builtin/pull.c:195
 msgid "path to upload pack on remote end"
 msgstr "uzak uçtaki yükleme paketine olan yol"
 
-#: builtin/fetch.c:156
 msgid "force overwrite of local reference"
 msgstr "yerel başvurunun üzerine zorla yaz"
 
-#: builtin/fetch.c:158
 msgid "fetch from multiple remotes"
 msgstr "birden çok uzak konumdan getir"
 
-#: builtin/fetch.c:160 builtin/pull.c:199
 msgid "fetch all tags and associated objects"
 msgstr "tüm etiketleri ve ilişkilendirilen nesneleri getir"
 
-#: builtin/fetch.c:162
 msgid "do not fetch all tags (--no-tags)"
 msgstr "tüm etiketleri getirme (--no-tags)"
 
-#: builtin/fetch.c:164
 msgid "number of submodules fetched in parallel"
 msgstr "paralelde getirilen altmodüllerin sayısı"
 
-#: builtin/fetch.c:166
 msgid "modify the refspec to place all refs within refs/prefetch/"
 msgstr ""
 "başvuru belirtecini tüm başvuruları refs/prefetch/'e yerleştirecek biçimde "
 "değiştir"
 
-#: builtin/fetch.c:168 builtin/pull.c:202
 msgid "prune remote-tracking branches no longer on remote"
 msgstr "artık uzak konumda olmayan uzak izleme dallarını buda"
 
-#: builtin/fetch.c:170
 msgid "prune local tags no longer on remote and clobber changed tags"
 msgstr ""
 "artık uzak konumda olmayan yerel etiketleri buda ve değiştirilen etiketleri "
 "güncelle"
 
-#: builtin/fetch.c:171 builtin/fetch.c:199 builtin/pull.c:123
 msgid "on-demand"
 msgstr "istek üzerine"
 
-#: builtin/fetch.c:172
 msgid "control recursive fetching of submodules"
 msgstr "altmodüllerin özyineli getirilmesini denetle"
 
-#: builtin/fetch.c:177
 msgid "write fetched references to the FETCH_HEAD file"
 msgstr "getirilen başvuruları FETCH_HEAD dosyasına yaz"
 
-#: builtin/fetch.c:178 builtin/pull.c:210
 msgid "keep downloaded pack"
 msgstr "indirilen paketi tut"
 
-#: builtin/fetch.c:180
 msgid "allow updating of HEAD ref"
 msgstr "HEAD başvurusunun güncellenmesine izin ver"
 
-#: builtin/fetch.c:183 builtin/fetch.c:189 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:185 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:191 builtin/pull.c:225
 msgid "convert to a complete repository"
 msgstr "tam bir depoya dönüştür"
 
-#: builtin/fetch.c:194
 msgid "re-fetch without negotiating common commits"
 msgstr "ortak işlemeleri pazarlık etmeden yeniden getir"
 
-#: builtin/fetch.c:197
 msgid "prepend this to submodule path output"
 msgstr "bunu altmodül yol çıktısının başına ekle"
 
-#: builtin/fetch.c:200
 msgid ""
 "default for recursive fetching of submodules (lower priority than config "
 "files)"
@@ -15583,103 +5716,82 @@ msgstr ""
 "altmodüllerin özyineli getirilmesi için öntanımlı (yapılandırma "
 "dosyalarından daha az önceliğe iye)"
 
-#: builtin/fetch.c:204 builtin/pull.c:228
 msgid "accept refs that update .git/shallow"
 msgstr ".git/shallow'u güncelleyen başvuruları kabul et"
 
-#: builtin/fetch.c:205 builtin/pull.c:230
 msgid "refmap"
 msgstr "ilgili başvuru"
 
-#: builtin/fetch.c:206 builtin/pull.c:231
 msgid "specify fetch refmap"
 msgstr "getirme ile ilgili başvuruları belirt"
 
-#: builtin/fetch.c:213 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"
 
-#: builtin/fetch.c:215
 msgid "do not fetch a packfile; instead, print ancestors of negotiation tips"
 msgstr ""
 "bir paket dosyasını getirme; bunun yerine pazarlık ipuçlarının atalarını "
 "yazdır"
 
-#: builtin/fetch.c:218 builtin/fetch.c:220
 msgid "run 'maintenance --auto' after fetching"
 msgstr "getirme sonrasında 'maintenance --auto' çalıştır"
 
-#: builtin/fetch.c:222 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"
 
-#: builtin/fetch.c:224
 msgid "write the commit-graph after fetching"
 msgstr "getirdikten sonra işleme grafiğini yaz"
 
-#: builtin/fetch.c:226
 msgid "accept refspecs from stdin"
 msgstr "başvuru belirteçlerini stdin'den oku"
 
-#: builtin/fetch.c:618
 msgid "couldn't find remote ref HEAD"
 msgstr "uzak HEAD başvurusu bulunamadı"
 
-#: builtin/fetch.c:893
 #, c-format
 msgid "object %s not found"
 msgstr "%s nesnesi bulunamadı"
 
-#: builtin/fetch.c:897
 msgid "[up to date]"
 msgstr "[güncel]"
 
-#: builtin/fetch.c:909 builtin/fetch.c:927 builtin/fetch.c:999
 msgid "[rejected]"
 msgstr "[reddedildi]"
 
-#: builtin/fetch.c:911
 msgid "can't fetch in current branch"
 msgstr "geçerli dalda getirme yapılamıyor"
 
-#: builtin/fetch.c:912
 msgid "checked out in another worktree"
 msgstr "başka bir çalışma ağacında çıkış yapıldı"
 
-#: builtin/fetch.c:922
 msgid "[tag update]"
 msgstr "[etiket güncellemesi]"
 
-#: builtin/fetch.c:923 builtin/fetch.c:960 builtin/fetch.c:982
-#: builtin/fetch.c:994
 msgid "unable to update local ref"
 msgstr "yerel başvuru güncellenemiyor"
 
-#: builtin/fetch.c:927
 msgid "would clobber existing tag"
 msgstr "var olan etiketi değiştirecektir"
 
-#: builtin/fetch.c:949
 msgid "[new tag]"
 msgstr "[yeni etiket]"
 
-#: builtin/fetch.c:952
 msgid "[new branch]"
 msgstr "[yeni dal]"
 
-#: builtin/fetch.c:955
 msgid "[new ref]"
 msgstr "[yeni başvuru]"
 
-#: builtin/fetch.c:994
 msgid "forced update"
 msgstr "zorlanmış güncelleme"
 
-#: builtin/fetch.c:999
 msgid "non-fast-forward"
 msgstr "ileri sarım değil"
 
-#: builtin/fetch.c:1102
+#, c-format
+msgid "cannot open '%s'"
+msgstr "'%s' açılamıyor"
+
 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"
@@ -15689,7 +5801,6 @@ msgstr ""
 "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:1106
 #, c-format
 msgid ""
 "it took %.2f seconds to check forced updates; you can use\n"
@@ -15702,22 +5813,18 @@ msgstr ""
 "kullanarak veya 'git config fetch.showForcedUpdates false' çalıştırarak\n"
 "bu denetlemeden kaçınabilirsiniz.\n"
 
-#: builtin/fetch.c:1136
 #, c-format
 msgid "%s did not send all necessary objects\n"
 msgstr "%s tüm gerekli nesneleri göndermedi\n"
 
-#: builtin/fetch.c:1156
 #, 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:1259 builtin/fetch.c:1418
 #, c-format
 msgid "From %.*s\n"
 msgstr "Şu konumdan: %.*s\n"
 
-#: builtin/fetch.c:1269
 #, c-format
 msgid ""
 "some local refs could not be updated; try running\n"
@@ -15726,49 +5833,43 @@ msgstr ""
 "bazı yerel başvurular güncellenemedi; 'git remote prune %s'\n"
 "kullanarak eski ve çakışan dalları kaldırmayı deneyin"
 
-#: builtin/fetch.c:1377
 #, c-format
 msgid "   (%s will become dangling)"
 msgstr "   (%s sarkacak)"
 
-#: builtin/fetch.c:1378
 #, c-format
 msgid "   (%s has become dangling)"
 msgstr "   (%s sarkmaya başladı)"
 
-#: builtin/fetch.c:1421
 msgid "[deleted]"
 msgstr "[silindi]"
 
-#: builtin/fetch.c:1422 builtin/remote.c:1153
 msgid "(none)"
 msgstr "(hiçbiri)"
 
-#: builtin/fetch.c:1446
 #, c-format
 msgid "refusing to fetch into branch '%s' checked out at '%s'"
 msgstr "'%s' dalına getirme reddediliyor, '%s' konumunda çıkış yapıldı"
 
-#: builtin/fetch.c:1466
 #, 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:1469
 #, 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:1496
+#, c-format
+msgid "%s is not a valid object"
+msgstr "%s geçerli bir nesne değil"
+
 #, c-format
 msgid "the object %s does not exist"
 msgstr "%s diye bir nesne yok"
 
-#: builtin/fetch.c:1748
 msgid "multiple branches detected, incompatible with --set-upstream"
 msgstr "birden çok dal algılandı, --set-upstream ile uyumsuz"
 
-#: builtin/fetch.c:1760
 #, c-format
 msgid ""
 "could not set upstream of HEAD to '%s' from '%s' when it does not point to "
@@ -15777,19 +5878,15 @@ msgstr ""
 "HEAD'in üst kaynağı '%s' olarak '%s' konumundan ayarlanamadı; çünkü herhangi "
 "bir dala işaret etmiyor."
 
-#: builtin/fetch.c:1773
 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:1775
 msgid "not setting upstream for a remote tag"
 msgstr "bir uzak konum etiketi için üstkaynak ayarlanmıyor"
 
-#: builtin/fetch.c:1777
 msgid "unknown branch type"
 msgstr "bilinmeyen dal türü"
 
-#: builtin/fetch.c:1779
 msgid ""
 "no source branch found;\n"
 "you need to specify exactly one branch with the --set-upstream option"
@@ -15797,22 +5894,18 @@ msgstr ""
 "Kaynak dal bulunamadı.\n"
 "--set-upstream seçeneği ile tam olarak bir dal belirtmeniz gerekiyor."
 
-#: builtin/fetch.c:1904 builtin/fetch.c:1967
 #, c-format
 msgid "Fetching %s\n"
 msgstr "%s getiriliyor\n"
 
-#: builtin/fetch.c:1914 builtin/fetch.c:1969
 #, c-format
 msgid "could not fetch %s"
 msgstr "%s getirilemedi"
 
-#: builtin/fetch.c:1926
 #, c-format
 msgid "could not fetch '%s' (exit code: %d)\n"
 msgstr "'%s' getirilemedi (çıkış kodu: %d)\n"
 
-#: builtin/fetch.c:2030
 msgid ""
 "no remote repository specified; please specify either a URL or a\n"
 "remote name from which new revisions should be fetched"
@@ -15820,49 +5913,38 @@ msgstr ""
 "Bir uzak dal belirtilmedi. Lütfen yeni revizyonların\n"
 "getirileceği bir URL veya uzak konum adı belirtin."
 
-#: builtin/fetch.c:2066
 msgid "you need to specify a tag name"
 msgstr "bir etiket adı belirtmeniz gerekiyor"
 
-#: builtin/fetch.c:2156
 msgid "--negotiate-only needs one or more --negotiation-tip=*"
 msgstr "--negotiate-only'e bir veya daha çok --negotiation-tip=* gerekiyor"
 
-#: builtin/fetch.c:2160
 msgid "negative depth in --deepen is not supported"
 msgstr "--deepen içinde negatif derinlik desteklenmiyor"
 
-#: builtin/fetch.c:2169
 msgid "--unshallow on a complete repository does not make sense"
 msgstr "tam bir depo üzerinde --unshallow bir anlam ifade etmiyor"
 
-#: builtin/fetch.c:2186
 msgid "fetch --all does not take a repository argument"
 msgstr "fetch --all bir depo argümanı almıyor"
 
-#: builtin/fetch.c:2188
 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:2197
 #, 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:2205
 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:2221
 msgid "must supply remote when using --negotiate-only"
 msgstr "--negotiate-only kullanırken uzak konum sağlanmalıdır"
 
-#: builtin/fetch.c:2226
 msgid "protocol does not support --negotiate-only, exiting"
 msgstr "protokol, --negotiate-only desteklemediğinden çıkılıyor"
 
-#: builtin/fetch.c:2246
 msgid ""
 "--filter can only be used with the remote configured in extensions."
 "partialclone"
@@ -15870,147 +5952,113 @@ msgstr ""
 "--filter yalnızca extensions.partialclone içinde yapılandırılmış uzak konum "
 "ile kullanılabilir."
 
-#: builtin/fetch.c:2250
 msgid "--atomic can only be used when fetching from one remote"
 msgstr "--atomic yalnızca bir uzak konumdan getirirken kullanılabilir"
 
-#: builtin/fetch.c:2254
 msgid "--stdin can only be used when fetching from one remote"
 msgstr ""
 "--stdin seçeneği yalnızca bir uzak konumdan getirilirken kullanılabilir"
 
-#: builtin/fmt-merge-msg.c:7
 msgid ""
 "git fmt-merge-msg [-m <message>] [--log[=<n>] | --no-log] [--file <file>]"
 msgstr ""
 "git fmt-merge-msg [-m <ileti>] [--log[=<n>] | --no-log] [--file <dosya>]"
 
-#: builtin/fmt-merge-msg.c:19
 msgid "populate log with at most <n> entries from shortlog"
 msgstr "günlüğü kısa günlükten en az <n> girdi ile doldur"
 
-#: builtin/fmt-merge-msg.c:22
 msgid "alias for --log (deprecated)"
 msgstr "--log için arma (kullanılmamalı)"
 
-#: builtin/fmt-merge-msg.c:25
 msgid "text"
 msgstr "metin"
 
-#: builtin/fmt-merge-msg.c:26
 msgid "use <text> as start of message"
 msgstr "iletinin başlangıcı olarak <metin> kullan"
 
-#: builtin/fmt-merge-msg.c:28
 msgid "use <name> instead of the real target branch"
 msgstr "gerçek hedef dal yerine <ad> kullan"
 
-#: builtin/fmt-merge-msg.c:29
 msgid "file to read from"
 msgstr "okunacak dosya"
 
-#: builtin/for-each-ref.c:10
 msgid "git for-each-ref [<options>] [<pattern>]"
 msgstr "git for-each-ref [<seçenekler>] [<dizgi>]"
 
-#: builtin/for-each-ref.c:11
 msgid "git for-each-ref [--points-at <object>]"
 msgstr "git for-each-ref [--points-at <nesne>]"
 
-#: builtin/for-each-ref.c:12
 msgid "git for-each-ref [--merged [<commit>]] [--no-merged [<commit>]]"
 msgstr "git for-each-ref [--merged [<işleme>]] [--no-merged [<işleme>]]"
 
-#: builtin/for-each-ref.c:13
 msgid "git for-each-ref [--contains [<commit>]] [--no-contains [<commit>]]"
 msgstr "git for-each-ref [--contains [<işleme>]] [--no-contains [<işleme>]]"
 
-#: builtin/for-each-ref.c:31
 msgid "quote placeholders suitably for shells"
 msgstr "yer tutucuları kabuğun anlayabileceği biçimde tırnak içine al"
 
-#: builtin/for-each-ref.c:33
 msgid "quote placeholders suitably for perl"
 msgstr "yer tutucuları perl'in anlayabileceği biçimde tırnak içine al"
 
-#: builtin/for-each-ref.c:35
 msgid "quote placeholders suitably for python"
 msgstr "yer tutucuları python'un anlayabileceği biçimde tırnak içine al"
 
-#: builtin/for-each-ref.c:37
 msgid "quote placeholders suitably for Tcl"
 msgstr "yer tutucuları Tcl'nin anlayabileceği biçimde tırnak içine al"
 
-#: builtin/for-each-ref.c:40
 msgid "show only <n> matched refs"
 msgstr "yalnızca <n> eşleşen başvuruyu göster"
 
-#: builtin/for-each-ref.c:42 builtin/tag.c:482
 msgid "respect format colors"
 msgstr "biçim renklerine uy"
 
-#: builtin/for-each-ref.c:45
 msgid "print only refs which points at the given object"
 msgstr "yalnızca verilen nesneye işaret eden başvuruları yazdır"
 
-#: builtin/for-each-ref.c:47
 msgid "print only refs that are merged"
 msgstr "yalnızca birleştirilen başvuruları yazdır"
 
-#: builtin/for-each-ref.c:48
 msgid "print only refs that are not merged"
 msgstr "yalnızca birleştirilmemiş başvuruları yazdır"
 
-#: builtin/for-each-ref.c:49
 msgid "print only refs which contain the commit"
 msgstr "yalnızca işlemeyi içeren başvuruları yazdır"
 
-#: builtin/for-each-ref.c:50
 msgid "print only refs which don't contain the commit"
 msgstr "yalnızca işlemeyi içermeyen başvuruları yazdır"
 
-#: builtin/for-each-repo.c:9
 msgid "git for-each-repo --config=<config> <command-args>"
 msgstr "git for-each-repo --config=<yapılandırma> <komut-argümanları>"
 
-#: builtin/for-each-repo.c:34
 msgid "config"
 msgstr "yapılandırma"
 
-#: builtin/for-each-repo.c:35
 msgid "config key storing a list of repository paths"
 msgstr "bir depo yolları listesi tutan yapılandırma anahtarı"
 
-#: builtin/for-each-repo.c:43
 msgid "missing --config=<config>"
 msgstr "--config=<yapılandırma> eksik"
 
-#: builtin/fsck.c:69 builtin/fsck.c:128 builtin/fsck.c:129
 msgid "unknown"
 msgstr "bilinmeyen"
 
 #. 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 "%s %s içinde hata: %s"
 
 #. TRANSLATORS: e.g. warning in tree 01bfda: <more explanation>
-#: builtin/fsck.c:94
 #, c-format
 msgid "warning in %s %s: %s"
 msgstr "%s %s içinde uyarı: %s"
 
-#: builtin/fsck.c:124 builtin/fsck.c:127
 #, c-format
 msgid "broken link from %7s %s"
 msgstr "şuradan kırık bağ: %7s %s"
 
-#: builtin/fsck.c:136
 msgid "wrong object type in link"
 msgstr "bağda yanlış nesne türü"
 
-#: builtin/fsck.c:152
 #, c-format
 msgid ""
 "broken link from %7s %s\n"
@@ -16019,357 +6067,296 @@ msgstr ""
 "şuradan kırık bağ: %7s %s\n"
 "           şuraya: %7s %s"
 
-#: builtin/fsck.c:264
+msgid "Checking connectivity"
+msgstr "Bağlantı denetleniyor"
+
 #, c-format
 msgid "missing %s %s"
 msgstr "eksik %s %s"
 
-#: builtin/fsck.c:291
 #, c-format
 msgid "unreachable %s %s"
 msgstr "ulaşılamayan %s %s"
 
-#: builtin/fsck.c:311
 #, c-format
 msgid "dangling %s %s"
 msgstr "sarkan %s %s"
 
-#: builtin/fsck.c:321
 msgid "could not create lost-found"
 msgstr "lost-found oluşturulamadı"
 
-#: builtin/fsck.c:332
+#, c-format
+msgid "could not write '%s'"
+msgstr "'%s' yazılamadı"
+
 #, c-format
 msgid "could not finish '%s'"
 msgstr "'%s' bitirilemedi"
 
-#: builtin/fsck.c:349
 #, c-format
 msgid "Checking %s"
 msgstr "%s denetleniyor"
 
-#: builtin/fsck.c:387
 #, c-format
 msgid "Checking connectivity (%d objects)"
 msgstr "Bağlanabilirlik denetleniyor (%d nesne)"
 
-#: builtin/fsck.c:406
 #, c-format
 msgid "Checking %s %s"
 msgstr "%s %s denetleniyor"
 
-#: builtin/fsck.c:411
 msgid "broken links"
 msgstr "kırık bağlar"
 
-#: builtin/fsck.c:420
 #, c-format
 msgid "root %s"
 msgstr "kök %s"
 
-#: builtin/fsck.c:428
 #, c-format
 msgid "tagged %s %s (%s) in %s"
 msgstr "%s %s (%s) şurada etiketlendi: %s"
 
-#: builtin/fsck.c:457
 #, c-format
 msgid "%s: object corrupt or missing"
 msgstr "%s: nesne hasar görmüş veya kayıp"
 
-#: builtin/fsck.c:482
 #, c-format
 msgid "%s: invalid reflog entry %s"
 msgstr "%s: geçersiz başvuru günlüğü girdisi %s"
 
-#: builtin/fsck.c:496
 #, c-format
 msgid "Checking reflog %s->%s"
 msgstr "Başvuru günlüğü denetleniyor: %s->%s"
 
-#: builtin/fsck.c:530
 #, c-format
 msgid "%s: invalid sha1 pointer %s"
 msgstr "%s: geçersiz sha1 işaretçisi %s"
 
-#: builtin/fsck.c:537
 #, c-format
 msgid "%s: not a commit"
 msgstr "%s: bir işleme değil"
 
-#: builtin/fsck.c:591
 msgid "notice: No default references"
 msgstr "Uyarı: Öntanımlı başvurular yok"
 
-#: 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:628
 #, c-format
 msgid "%s: object is of unknown type '%s': %s"
 msgstr "%s: nesne bilinmeyen bir türde: '%s': %s"
 
-#: builtin/fsck.c:645
 #, c-format
 msgid "%s: object could not be parsed: %s"
 msgstr "%s: nesne ayrıştırılamadı: %s"
 
-#: builtin/fsck.c:665
 #, c-format
 msgid "bad sha1 file: %s"
 msgstr "hatalı sha1 dosyası: %s"
 
-#: builtin/fsck.c:686
 msgid "Checking object directory"
 msgstr "Nesne dizini denetleniyor"
 
-#: builtin/fsck.c:689
 msgid "Checking object directories"
 msgstr "Nesne dizinleri denetleniyor"
 
-#: builtin/fsck.c:705
 #, c-format
 msgid "Checking %s link"
 msgstr "%s bağ denetleniyor"
 
-#: builtin/fsck.c:710 builtin/index-pack.c:862
 #, c-format
 msgid "invalid %s"
 msgstr "geçersiz %s"
 
-#: builtin/fsck.c:717
 #, c-format
 msgid "%s points to something strange (%s)"
 msgstr "%s garip bir şeye işaret ediyor (%s)"
 
-#: builtin/fsck.c:723
 #, c-format
 msgid "%s: detached HEAD points at nothing"
 msgstr "%s: ayrık HEAD bir şeye işaret etmiyor"
 
-#: builtin/fsck.c:727
 #, 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:739
 msgid "Checking cache tree"
 msgstr "Önbellek ağacı denetleniyor"
 
-#: builtin/fsck.c:744
 #, 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:753
 msgid "non-tree in cache-tree"
 msgstr "cache-tree içinde ağaç olmayan öge"
 
-#: builtin/fsck.c:784
 msgid "git fsck [<options>] [<object>...]"
 msgstr "git fsck [<seçenekler>] [<nesne>...]"
 
-#: builtin/fsck.c:790
 msgid "show unreachable objects"
 msgstr "ulaşılamayan nesneleri göster"
 
-#: builtin/fsck.c:791
 msgid "show dangling objects"
 msgstr "sarkan nesneleri göster"
 
-#: builtin/fsck.c:792
 msgid "report tags"
 msgstr "etiketleri bildir"
 
-#: builtin/fsck.c:793
 msgid "report root nodes"
 msgstr "kök düğümleri bildir"
 
-#: builtin/fsck.c:794
 msgid "make index objects head nodes"
 msgstr "indeks nesnelerini dal ucu düğümü yap"
 
-#: builtin/fsck.c:795
 msgid "make reflogs head nodes (default)"
 msgstr "başvuru günlüklerini dal ucu düğümü yap (öntanımlı)"
 
-#: builtin/fsck.c:796
 msgid "also consider packs and alternate objects"
 msgstr "ek olarak paketleri ve alternatif nesneleri de dikkate al"
 
-#: builtin/fsck.c:797
 msgid "check only connectivity"
 msgstr "yalnızca bağlanabilirliği denetle"
 
-#: builtin/fsck.c:798 builtin/mktag.c:75
 msgid "enable more strict checking"
 msgstr "daha kesin denetlemeyi etkinleştir"
 
-#: builtin/fsck.c:800
 msgid "write dangling objects in .git/lost-found"
 msgstr "sarkan nesneleri .git/lost-found'a yaz"
 
-#: builtin/fsck.c:801 builtin/prune.c:146
 msgid "show progress"
 msgstr "ilerlemeyi göster"
 
-#: builtin/fsck.c:802
 msgid "show verbose names for reachable objects"
 msgstr "ulaşılabilir nesneler için ayrıntılı adları göster"
 
-#: builtin/fsck.c:862 builtin/index-pack.c:261
 msgid "Checking objects"
 msgstr "Nesneler denetleniyor"
 
-#: builtin/fsck.c:890
 #, c-format
 msgid "%s: object missing"
 msgstr "%s: nesne kayıp"
 
-#: builtin/fsck.c:901
 #, c-format
 msgid "invalid parameter: expected sha1, got '%s'"
 msgstr "geçersiz parametre: sha1 bekleniyordu, '%s' alındı"
 
-#: builtin/fsmonitor--daemon.c:13
 msgid "git fsmonitor--daemon start [<options>]"
 msgstr "git fsmonitor--daemon start [<seçenekler>]"
 
-#: builtin/fsmonitor--daemon.c:14
 msgid "git fsmonitor--daemon run [<options>]"
 msgstr "git fsmonitor--daemon run [<seçenekler>]"
 
-#: builtin/fsmonitor--daemon.c:15
 msgid "git fsmonitor--daemon stop"
 msgstr "git fsmonitor--daemon stop"
 
-#: builtin/fsmonitor--daemon.c:16
 msgid "git fsmonitor--daemon status"
 msgstr "git fsmonitor--daemon status"
 
-#: builtin/fsmonitor--daemon.c:38 builtin/fsmonitor--daemon.c:47
 #, c-format
 msgid "value of '%s' out of range: %d"
 msgstr "'%s' değeri erim dışında: %d"
 
-#: builtin/fsmonitor--daemon.c:57
 #, c-format
 msgid "value of '%s' not bool or int: %d"
 msgstr "'%s' değeri Boole veya tamsayı değil: %d"
 
-#: builtin/fsmonitor--daemon.c:99
 #, c-format
 msgid "fsmonitor-daemon is watching '%s'\n"
 msgstr "fsmonitor-daemon, '%s' ögesini izliyor\n"
 
-#: builtin/fsmonitor--daemon.c:104
 #, c-format
 msgid "fsmonitor-daemon is not watching '%s'\n"
 msgstr "fsmonitor-daemon, '%s' ögesini izlemiyor\n"
 
-#: builtin/fsmonitor--daemon.c:170
 #, c-format
 msgid "could not create fsmonitor cookie '%s'"
 msgstr "fsmonitor çerezi '%s' oluşturulamadı"
 
-#: builtin/fsmonitor--daemon.c:753
 #, c-format
 msgid "fsmonitor: cookie_result '%d' != SEEN"
 msgstr "fsmonitor: cookie_result '%d' != SEEN"
 
-#: builtin/fsmonitor--daemon.c:1187
 #, c-format
 msgid "could not start IPC thread pool on '%s'"
 msgstr "'%s' üzerinde IPC iş parçacığı havuzu başlatılamadı"
 
-#: builtin/fsmonitor--daemon.c:1199
 msgid "could not start fsmonitor listener thread"
 msgstr "fsmonitor dinleyici iş parçacığı başlatılamadı"
 
-#: builtin/fsmonitor--daemon.c:1297
+msgid "could not start fsmonitor health thread"
+msgstr "fsmonitor sağlık iş parçacığı başlatılamadı"
+
 msgid "could not initialize listener thread"
 msgstr "dinleyici iş parçacığı ilklendirilemedi"
 
-#: builtin/fsmonitor--daemon.c:1328 builtin/fsmonitor--daemon.c:1383
+msgid "could not initialize health thread"
+msgstr "sağlık iş parçacığı ilklendirilemedi"
+
+#, c-format
+msgid "could not cd home '%s'"
+msgstr "'%s' ev dizinine cd yapılamadı"
+
 #, c-format
 msgid "fsmonitor--daemon is already running '%s'"
 msgstr "fsmonitor--daemon, halihazırda '%s' çalıştırıyor"
 
-#: builtin/fsmonitor--daemon.c:1332
 #, c-format
 msgid "running fsmonitor-daemon in '%s'\n"
 msgstr "fsmonitor-daemon '%s' içinde çalışıyor\n"
 
-#: builtin/fsmonitor--daemon.c:1387
 #, c-format
 msgid "starting fsmonitor-daemon in '%s'\n"
 msgstr "'%s' içinde fsmonitor-daemon başlatılıyor\n"
 
-#: builtin/fsmonitor--daemon.c:1413
 msgid "daemon failed to start"
 msgstr "ardalan süreci başlatılamadı"
 
-#: builtin/fsmonitor--daemon.c:1416
 msgid "daemon not online yet"
 msgstr "ardalan süreci henüz çalışmaya başlamadı"
 
-#: builtin/fsmonitor--daemon.c:1419
 msgid "daemon terminated"
 msgstr "ardalan süreci sonlandırıldı"
 
-#: builtin/fsmonitor--daemon.c:1429
 msgid "detach from console"
 msgstr "konsoldan ayrıl"
 
-#: builtin/fsmonitor--daemon.c:1432
 msgid "use <n> ipc worker threads"
 msgstr "<n> ipc işçisi iş parçacığı kullan"
 
-#: builtin/fsmonitor--daemon.c:1435
 msgid "max seconds to wait for background daemon startup"
 msgstr "ardalan sürecinin başlaması için beklenecek en çok saniye"
 
-#: builtin/fsmonitor--daemon.c:1449
 #, c-format
 msgid "invalid 'ipc-threads' value (%d)"
 msgstr "geçersiz 'ipc-threads' değeri (%d)"
 
-#: builtin/fsmonitor--daemon.c:1464
 #, c-format
 msgid "Unhandled subcommand '%s'"
 msgstr "İşlenmemiş altkomut '%s'"
 
-#: builtin/fsmonitor--daemon.c:1477
 msgid "fsmonitor--daemon not supported on this platform"
 msgstr "fsmonitor--daemon bu platformda desteklenmiyor"
 
-#: builtin/gc.c:39
 msgid "git gc [<options>]"
 msgstr "git gc [<seçenekler>]"
 
-#: builtin/gc.c:93
 #, c-format
 msgid "Failed to fstat %s: %s"
 msgstr "%s fstat yapılamadı: %s"
 
-#: builtin/gc.c:129
 #, c-format
 msgid "failed to parse '%s' value '%s'"
 msgstr "'%s' değeri '%s' ayrıştırılamadı"
 
-#: builtin/gc.c:488 builtin/init-db.c:57
 #, c-format
 msgid "cannot stat '%s'"
 msgstr "'%s' bilgileri alınamıyor"
 
-#: builtin/gc.c:504
 #, c-format
 msgid ""
 "The last gc run reported the following. Please correct the root cause\n"
@@ -16384,52 +6371,44 @@ msgstr ""
 "\n"
 "%s"
 
-#: builtin/gc.c:552
 msgid "prune unreferenced objects"
 msgstr "başvurulmayan nesneleri buda"
 
-#: builtin/gc.c:554
+msgid "pack unreferenced objects separately"
+msgstr "başvurulmamış nesneleri ayrı olarak paketle"
+
 msgid "be more thorough (increased runtime)"
 msgstr "biraz daha titiz ol (artırılmış işleyiş süresi)"
 
-#: builtin/gc.c:555
 msgid "enable auto-gc mode"
 msgstr "auto-gc kipini etkinleştir"
 
-#: builtin/gc.c:558
 msgid "force running gc even if there may be another gc running"
 msgstr "başka bir gc çalışıyor olsa bile zorla gc çalıştır"
 
-#: builtin/gc.c:561
 msgid "repack all other packs except the largest pack"
 msgstr "en büyük paket dışındaki diğer tüm paketleri yeniden paketle"
 
-#: builtin/gc.c:577
 #, c-format
-msgid "failed to parse gc.logexpiry value %s"
-msgstr "gc.logexpiry değeri %s ayrıştırılamadı"
+msgid "failed to parse gc.logExpiry value %s"
+msgstr "gc.logExpiry değeri %s ayrıştırılamadı"
 
-#: builtin/gc.c:588
 #, c-format
 msgid "failed to parse prune expiry value %s"
 msgstr "'prune expiry' değeri %s ayrıştırılamadı"
 
-#: builtin/gc.c:608
 #, c-format
 msgid "Auto packing the repository in background for optimum performance.\n"
 msgstr "En iyi başarım için depo arka planda kendiliğinden paketleniyor.\n"
 
-#: builtin/gc.c:610
 #, c-format
 msgid "Auto packing the repository for optimum performance.\n"
 msgstr "En iyi başarım için depo kendiliğinden paketleniyor.\n"
 
-#: builtin/gc.c:611
 #, c-format
 msgid "See \"git help gc\" for manual housekeeping.\n"
 msgstr "El ile ortalık temizliği için \"git help gc\"ye bakın.\n"
 
-#: builtin/gc.c:652
 #, c-format
 msgid ""
 "gc is already running on machine '%s' pid %<PRIuMAX> (use --force if not)"
@@ -16437,480 +6416,372 @@ msgstr ""
 "gc %s makinesinde halihazırda çalışıyor (pid %<PRIuMAX> - çalışmıyorsa --"
 "force kullanın)"
 
-#: builtin/gc.c:707
 msgid ""
 "There are too many unreachable loose objects; run 'git prune' to remove them."
 msgstr ""
 "Çok fazla ulaşılabilir boşta nesne var; kaldırmak için 'git prune' kullanın."
 
-#: builtin/gc.c:717
 msgid ""
 "git maintenance run [--auto] [--[no-]quiet] [--task=<task>] [--schedule]"
 msgstr ""
 "git maintenance run [--auto] [--[no-]quiet] [--task=<görev>] [--schedule]"
 
-#: builtin/gc.c:747
 msgid "--no-schedule is not allowed"
 msgstr "--no-schedule kullanımına izin yok"
 
-#: builtin/gc.c:752
 #, c-format
 msgid "unrecognized --schedule argument '%s'"
 msgstr "tanımlanamayan --schedule argümanı, %s"
 
-#: builtin/gc.c:870
 msgid "failed to write commit-graph"
 msgstr "commit-graph yazılamadı"
 
-#: builtin/gc.c:906
 msgid "failed to prefetch remotes"
 msgstr "uzak konumlar önden getirilemedi"
 
-#: builtin/gc.c:1022
 msgid "failed to start 'git pack-objects' process"
 msgstr "'git pack-objects' işlemi başlatılamadı"
 
-#: builtin/gc.c:1039
 msgid "failed to finish 'git pack-objects' process"
 msgstr "'git pack-objects' işlemi bitirilemedi"
 
-#: builtin/gc.c:1090
 msgid "failed to write multi-pack-index"
 msgstr "multi-pack-index yazılamadı"
 
-#: builtin/gc.c:1106
 msgid "'git multi-pack-index expire' failed"
 msgstr "'git multi-pack-index expire' başarısız oldu"
 
-#: builtin/gc.c:1165
 msgid "'git multi-pack-index repack' failed"
 msgstr "'git multi-pack-index repack' başarısız oldu"
 
-#: builtin/gc.c:1174
 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:1278
 #, c-format
 msgid "lock file '%s' exists, skipping maintenance"
 msgstr "kilit dosyası '%s' mevcut, bakım atlanıyor"
 
-#: builtin/gc.c:1308
 #, c-format
 msgid "task '%s' failed"
 msgstr "'%s' görevi başarısız oldu"
 
-#: builtin/gc.c:1390
 #, c-format
 msgid "'%s' is not a valid task"
 msgstr "'%s' geçerli bir görev değil"
 
-#: builtin/gc.c:1395
 #, c-format
 msgid "task '%s' cannot be selected multiple times"
 msgstr "'%s' görevi birden çok kez seçilemez"
 
-#: builtin/gc.c:1410
 msgid "run tasks based on the state of the repository"
 msgstr "görevleri deponun durumuna göre çalıştır"
 
-#: builtin/gc.c:1411
 msgid "frequency"
 msgstr "sıklık"
 
-#: builtin/gc.c:1412
 msgid "run tasks based on frequency"
 msgstr "görevleri sıklığa göre çalıştır"
 
-#: builtin/gc.c:1415
 msgid "do not report progress or other information over stderr"
 msgstr "stderr üzerinden ilerlemeyi veya başka bir bilgiyi raporlama"
 
-#: builtin/gc.c:1416
 msgid "task"
 msgstr "görev"
 
-#: builtin/gc.c:1417
 msgid "run a specific task"
 msgstr "belirli bir görevi çalıştır"
 
-#: builtin/gc.c:1434
 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:1477
 msgid "failed to run 'git config'"
 msgstr "'git config' çalıştırılamadı"
 
-#: builtin/gc.c:1629
 #, c-format
 msgid "failed to expand path '%s'"
 msgstr "'%s' yolu oluşturulamadı"
 
-#: builtin/gc.c:1656 builtin/gc.c:1694
 msgid "failed to start launchctl"
 msgstr "launchctl başlatılamadı"
 
-#: builtin/gc.c:1769 builtin/gc.c:2237
 #, c-format
 msgid "failed to create directories for '%s'"
 msgstr "'%s' için dizinler oluşturulamadı"
 
-#: builtin/gc.c:1796
 #, c-format
 msgid "failed to bootstrap service %s"
 msgstr "%s servisi özyüklenemedi"
 
-#: builtin/gc.c:1889
 msgid "failed to create temp xml file"
 msgstr "geçici xml dosyası oluşturulamadı"
 
-#: builtin/gc.c:1979
 msgid "failed to start schtasks"
 msgstr "schtasks başlatılamadı"
 
-#: builtin/gc.c:2063
 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:2080
 msgid "failed to run 'crontab'; your system might not support 'cron'"
 msgstr "'crontab' çalıştırılamadı; sisteminiz 'cron' desteklemiyor olabilir"
 
-#: builtin/gc.c:2084
 msgid "failed to open stdin of 'crontab'"
 msgstr "'crontab' stdin'i açılamadı"
 
-#: builtin/gc.c:2126
 msgid "'crontab' died"
 msgstr "'crontab' beklenmedik bir biçimde sonlandı"
 
-#: builtin/gc.c:2191
 msgid "failed to start systemctl"
 msgstr "systemctl başlatılamadı"
 
-#: builtin/gc.c:2201
 msgid "failed to run systemctl"
 msgstr "systemctl çalıştırılamadı"
 
-#: builtin/gc.c:2210 builtin/gc.c:2215 builtin/worktree.c:63
-#: builtin/worktree.c:1024
 #, c-format
 msgid "failed to delete '%s'"
 msgstr "'%s' silinemedi"
 
-#: builtin/gc.c:2395
+#, c-format
+msgid "failed to flush '%s'"
+msgstr "'%s' floş yapılamadı"
+
 #, c-format
 msgid "unrecognized --scheduler argument '%s'"
 msgstr "tanımlanamayan --scheduler argümanı, '%s'"
 
-#: builtin/gc.c:2420
 msgid "neither systemd timers nor crontab are available"
 msgstr "ne systemd zamanlayıcıları ne de crontab mevcut değil"
 
-#: builtin/gc.c:2435
 #, c-format
 msgid "%s scheduler is not available"
 msgstr "%s planlayıcısı mevcut değil"
 
-#: builtin/gc.c:2449
 msgid "another process is scheduling background maintenance"
 msgstr "başka bir işlem arka plan bakımı zamanını planlıyor"
 
-#: builtin/gc.c:2471
 msgid "git maintenance start [--scheduler=<scheduler>]"
 msgstr "git maintenance start [--scheduler=<görev-planlayıcı>]"
 
-#: builtin/gc.c:2480
 msgid "scheduler"
 msgstr "görev planlayıcı"
 
-#: builtin/gc.c:2481
 msgid "scheduler to trigger git maintenance run"
 msgstr "git bakımını tetikleyecek görev planlayıcı"
 
-#: builtin/gc.c:2495
 msgid "failed to add repo to global config"
 msgstr "depo, global yapılandırmaya eklenemedi"
 
-#: builtin/gc.c:2504
 msgid "git maintenance <subcommand> [<options>]"
 msgstr "git maintenance <altkomut> [<seçenekler>]"
 
-#: builtin/gc.c:2523
 #, c-format
 msgid "invalid subcommand: %s"
 msgstr "geçersiz altkomut: %s"
 
-#: builtin/grep.c:32
 msgid "git grep [<options>] [-e] <pattern> [<rev>...] [[--] <path>...]"
 msgstr "git grep [<seçenekler>] [-e] <dizgi> [<rev>...] [[--] <yol>...]"
 
-#: builtin/grep.c:241
 #, c-format
 msgid "grep: failed to create thread: %s"
 msgstr "grep: iş parçacığı oluşturulamadı: %s"
 
-#: builtin/grep.c:295
 #, c-format
 msgid "invalid number of threads specified (%d) for %s"
 msgstr "geçersiz belirtilen iş parçacığı sayısı (%d), %s için"
 
+#. #-#-#-#-#  grep.c.po  #-#-#-#-#
 #. TRANSLATORS: %s is the configuration
 #. variable for tweaking threads, currently
 #. grep.threads
 #.
-#: builtin/grep.c:303 builtin/index-pack.c:1587 builtin/index-pack.c:1791
-#: builtin/pack-objects.c:3150
 #, c-format
 msgid "no threads support, ignoring %s"
 msgstr "iş parçacığı desteği yok, %s yok sayılıyor"
 
-#: builtin/grep.c:490 builtin/grep.c:619 builtin/grep.c:659
 #, c-format
 msgid "unable to read tree (%s)"
 msgstr "ağaç okunamıyor (%s)"
 
-#: builtin/grep.c:674
 #, 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:754
 #, c-format
 msgid "switch `%c' expects a numerical value"
 msgstr "'%c' anahtarı sayısal bir değer bekliyor"
 
-#: builtin/grep.c:852
 msgid "search in index instead of in the work tree"
 msgstr "çalışma ağacı yerine indekste ara"
 
-#: builtin/grep.c:854
 msgid "find in contents not managed by git"
 msgstr "git tarafından yönetilmeyen içerikte bul"
 
-#: builtin/grep.c:856
 msgid "search in both tracked and untracked files"
 msgstr "hem izlenen hem izlenmeyen dosyalar içinde ara"
 
-#: builtin/grep.c:858
 msgid "ignore files specified via '.gitignore'"
 msgstr "'.gitignore'da belirtilen dosyaları yok say"
 
-#: builtin/grep.c:860
 msgid "recursively search in each submodule"
 msgstr "her altmodülde özyineli olarak ara"
 
-#: builtin/grep.c:863
 msgid "show non-matching lines"
 msgstr "eşleşmeyen satırları göster"
 
-#: builtin/grep.c:865
 msgid "case insensitive matching"
 msgstr "BÜYÜK/küçük harf duyarsız eşleşme"
 
-#: builtin/grep.c:867
 msgid "match patterns only at word boundaries"
 msgstr "yalnızca sözcük sınırlarındaki dizgileri eşleştir"
 
-#: builtin/grep.c:869
 msgid "process binary files as text"
 msgstr "ikili dosyaları metin olarak işle"
 
-#: builtin/grep.c:871
 msgid "don't match patterns in binary files"
 msgstr "ikili dosyalardaki dizgileri eşleştirme"
 
-#: builtin/grep.c:874
 msgid "process binary files with textconv filters"
 msgstr "ikili dosyaları textconv süzgeçleri ile işle"
 
-#: builtin/grep.c:876
 msgid "search in subdirectories (default)"
 msgstr "altdizinlerde ara (öntanımlı)"
 
-#: builtin/grep.c:878
 msgid "descend at most <depth> levels"
 msgstr "en çok <derinlik> düzey in"
 
-#: builtin/grep.c:882
 msgid "use extended POSIX regular expressions"
 msgstr "genişletilmiş POSIX düzenli ifadelerini kullan"
 
-#: builtin/grep.c:885
 msgid "use basic POSIX regular expressions (default)"
 msgstr "temel POSIX düzenli ifadelerini kullan (öntanımlı)"
 
-#: builtin/grep.c:888
 msgid "interpret patterns as fixed strings"
 msgstr "dizgileri sabit diziler olarak yorumla"
 
-#: builtin/grep.c:891
 msgid "use Perl-compatible regular expressions"
 msgstr "Perl uyumlu düzenli ifadeler kullan"
 
-#: builtin/grep.c:894
 msgid "show line numbers"
 msgstr "satır numaralarını göster"
 
-#: builtin/grep.c:895
 msgid "show column number of first match"
 msgstr "ilk eşleşmenin sütun numarasını göster"
 
-#: builtin/grep.c:896
 msgid "don't show filenames"
 msgstr "dosya adlarını gösterme"
 
-#: builtin/grep.c:897
 msgid "show filenames"
 msgstr "dosya adlarını göster"
 
-#: builtin/grep.c:899
 msgid "show filenames relative to top directory"
 msgstr "dosya adlarını en üst dizine göreceli olarak göster"
 
-#: builtin/grep.c:901
 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:903
 msgid "synonym for --files-with-matches"
 msgstr "--files-with-matches eşanlamlısı"
 
-#: builtin/grep.c:906
 msgid "show only the names of files without match"
 msgstr "eşleşme olmadan yalnızca dosya adlarını göster"
 
-#: builtin/grep.c:908
 msgid "print NUL after filenames"
 msgstr "dosya adlarından sonra NUL yazdır"
 
-#: builtin/grep.c:911
 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:913
 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:914
 msgid "highlight matches"
 msgstr "eşleşmeleri vurgula"
 
-#: builtin/grep.c:916
 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:918
 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:921
 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:924
 msgid "show <n> context lines before matches"
 msgstr "eşleşmelerden önce <n> satır bağlam göster"
 
-#: builtin/grep.c:926
 msgid "show <n> context lines after matches"
 msgstr "eşleşmelerden sonra <n> satır bağlam göster"
 
-#: builtin/grep.c:928
 msgid "use <n> worker threads"
 msgstr "<n> iş parçacığı kullan"
 
-#: builtin/grep.c:929
 msgid "shortcut for -C NUM"
 msgstr "-C NUM için kısayol"
 
-#: builtin/grep.c:932
 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:934
 msgid "show the surrounding function"
 msgstr "çevresindeki işlevi göster"
 
-#: builtin/grep.c:937
 msgid "read patterns from file"
 msgstr "dizgileri dosyadan oku"
 
-#: builtin/grep.c:939
 msgid "match <pattern>"
 msgstr "<dizgi> ile eşleş"
 
-#: builtin/grep.c:941
 msgid "combine patterns specified with -e"
 msgstr "-e ile belirtilen dizgileri birleştir"
 
-#: builtin/grep.c:953
 msgid "indicate hit with exit status without output"
 msgstr "çıkış durumu ile olan eşleşmelerde çıktı verme"
 
-#: builtin/grep.c:955
 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:958
 msgid "pager"
 msgstr "sayfalayıcı"
 
-#: builtin/grep.c:958
 msgid "show matching files in the pager"
 msgstr "sayfalayıcıda eşleşen dosyaları göster"
 
-#: builtin/grep.c:962
 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:1028
 msgid "no pattern given"
 msgstr "bir dizgi verilmedi"
 
-#: builtin/grep.c:1064
 msgid "--no-index or --untracked cannot be used with revs"
 msgstr "--no-index veya --untracked revizyonlarla birlikte kullanılamaz"
 
-#: builtin/grep.c:1072
 #, c-format
 msgid "unable to resolve revision: %s"
 msgstr "revizyon çözülemiyor: %s"
 
-#: builtin/grep.c:1102
 msgid "--untracked not supported with --recurse-submodules"
 msgstr "--untracked, --recurse-submodules ile desteklenmiyor"
 
-#: builtin/grep.c:1106
 msgid "invalid option combination, ignoring --threads"
 msgstr "geçersiz seçenek birleştirmesi, --threads yok sayılıyor"
 
-#: builtin/grep.c:1109 builtin/pack-objects.c:4084
 msgid "no threads support, ignoring --threads"
 msgstr "iş parçacığı desteği yok, --threads yok sayılıyor"
 
-#: builtin/grep.c:1112 builtin/index-pack.c:1584 builtin/pack-objects.c:3147
 #, c-format
 msgid "invalid number of threads specified (%d)"
 msgstr "geçersiz belirtilen iş parçacığı sayısı (%d)"
 
-#: builtin/grep.c:1146
 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:1179
 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:1187
 msgid "both --cached and trees are given"
 msgstr "hem --cached hem ağaçlar verilmiş"
 
-#: builtin/hash-object.c:83
 msgid ""
 "git hash-object [-t <type>] [-w] [--path=<file> | --no-filters] [--stdin] "
 "[--] <file>..."
@@ -16918,101 +6789,78 @@ msgstr ""
 "git hash-object [-t <tür>] [-w] [--path=<dosya> | --no-filters] [--stdin] "
 "[--] <dosya>..."
 
-#: builtin/hash-object.c:97
 msgid "object type"
 msgstr "nesne türü"
 
-#: builtin/hash-object.c:98
 msgid "write the object into the object database"
 msgstr "nesneyi nesne veritabanına yaz"
 
-#: builtin/hash-object.c:100
 msgid "read the object from stdin"
 msgstr "nesneyi stdin'den oku"
 
-#: builtin/hash-object.c:102
 msgid "store file as is without filters"
 msgstr "dosyayı süzgeçler olmadan olduğu gibi depola"
 
-#: builtin/hash-object.c:103
 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:104
 msgid "process file as it were from this path"
 msgstr "dosyayı sanki bu yoldanmış gibi işle"
 
-#: builtin/help.c:57
 msgid "print all available commands"
 msgstr "tüm kullanılabilir komutları yazdır"
 
-#: builtin/help.c:60
 msgid "show external commands in --all"
 msgstr "--all içinde dış komutları göster"
 
-#: builtin/help.c:61
 msgid "show aliases in --all"
 msgstr "--all içinde armaları göster"
 
-#: builtin/help.c:62
 msgid "exclude guides"
 msgstr "kılavuzları hariç tut"
 
-#: builtin/help.c:63
 msgid "show man page"
 msgstr "man sayfasını göster"
 
-#: builtin/help.c:64
 msgid "show manual in web browser"
 msgstr "kılavuzu web tarayıcısında göster"
 
-#: builtin/help.c:66
 msgid "show info page"
 msgstr "bilgi sayfasını göster"
 
-#: builtin/help.c:68
 msgid "print command description"
 msgstr "komut açıklamasını yazdır"
 
-#: builtin/help.c:70
 msgid "print list of useful guides"
 msgstr "kullanışlı kılavuzların listesini çıkar"
 
-#: builtin/help.c:72
 msgid "print all configuration variable names"
 msgstr "tüm yapılandırma değişkenleri adlarını yazdır"
 
-#: builtin/help.c:84
 msgid "git help [[-i|--info] [-m|--man] [-w|--web]] [<command>]"
 msgstr "git help [[-i|--info] [-m|--man] [-w|--web]] [<komutlar>]"
 
-#: builtin/help.c:201
 #, c-format
 msgid "unrecognized help format '%s'"
 msgstr "tanımlanamayan yardım biçimi '%s'"
 
-#: builtin/help.c:227
 msgid "Failed to start emacsclient."
 msgstr "emacsclient başlatılamadı."
 
-#: builtin/help.c:240
 msgid "Failed to parse emacsclient version."
 msgstr "emacsclient sürümü ayrıştırılamadı."
 
-#: builtin/help.c:248
 #, c-format
 msgid "emacsclient version '%d' too old (< 22)."
 msgstr "emacsclient sürümü '%d' pek eski (<22)."
 
-#: builtin/help.c:266 builtin/help.c:288 builtin/help.c:298 builtin/help.c:306
 #, c-format
 msgid "failed to exec '%s'"
 msgstr "'%s' çalıştırılamadı"
 
-#: builtin/help.c:344
 #, c-format
 msgid ""
 "'%s': path for unsupported man viewer.\n"
@@ -17021,7 +6869,6 @@ msgstr ""
 "'%s': desteklenmeyen man görüntüleyicisi yolu.\n"
 "Bunun yerine 'man.<araç>.cmd' kullanmayı düşünün."
 
-#: builtin/help.c:356
 #, c-format
 msgid ""
 "'%s': cmd for supported man viewer.\n"
@@ -17030,423 +6877,333 @@ msgstr ""
 "'%s': desteklenmeyen man görüntüleyicisi komutu.\n"
 "Bunun yerine 'man.<araç>.path' kullanmayı düşünün."
 
-#: builtin/help.c:471
 #, c-format
 msgid "'%s': unknown man viewer."
 msgstr "'%s': Bilinmeyen man görüntüleyicisi."
 
-#: builtin/help.c:487
 msgid "no man viewer handled the request"
 msgstr "isteğe hiçbir man görüntüleyicisi ele almadı"
 
-#: builtin/help.c:494
 msgid "no info viewer handled the request"
 msgstr "isteğe hiçbir bilgi görüntüleyicisi ele almadı"
 
-#: builtin/help.c:555 builtin/help.c:566 git.c:348
 #, c-format
 msgid "'%s' is aliased to '%s'"
 msgstr "'%s', '%s' olarak armalanmış"
 
-#: builtin/help.c:569 git.c:380
 #, c-format
 msgid "bad alias.%s string: %s"
 msgstr "hatalı alias.%s dizisi: %s"
 
-#: builtin/help.c:611
 #, c-format
 msgid "the '%s' option doesn't take any non-option arguments"
 msgstr "'%s', seçenek olmayan bir argüman almıyor"
 
-#: builtin/help.c:631
 msgid ""
 "the '--no-[external-commands|aliases]' options can only be used with '--all'"
 msgstr ""
 "'--no-[external-commands|aliases]', yalnızca '--all' ile kullanılabilir"
 
-#: builtin/help.c:643 builtin/help.c:671
 #, c-format
 msgid "usage: %s%s"
 msgstr "kullanım: %s%s"
 
-#: builtin/help.c:666
 msgid "'git help config' for more information"
 msgstr "ek bilgi için: 'git help config'"
 
-#: builtin/hook.c:10
 msgid "git hook run [--ignore-missing] <hook-name> [-- <hook-args>]"
 msgstr "git hook run [--ignore-missing] <kanca-adı> [-- <kanca-argümanları>]"
 
-#: builtin/hook.c:30
 msgid "silently ignore missing requested <hook-name>"
 msgstr "istenen eksik <kanca-adı> sessizce yok sayılıyor"
 
-#: 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:241
 #, c-format
 msgid "did not receive expected object %s"
 msgstr "beklenen nesne %s alınmadı"
 
-#: 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: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:304
 msgid "early EOF"
 msgstr "erken dosya sonu"
 
-#: builtin/index-pack.c:305
 msgid "read error on input"
 msgstr "girdide okuma hatası"
 
-#: 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:324 builtin/pack-objects.c:754
 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:329
 #, c-format
 msgid "pack exceeds maximum allowed size (%s)"
 msgstr "paket izin verilen en büyük boyutu aşıyor (%s)"
 
-#: builtin/index-pack.c:362
 msgid "pack signature mismatch"
 msgstr "paket imzası uyuşmazlığı"
 
-#: builtin/index-pack.c:364
 #, c-format
 msgid "pack version %<PRIu32> unsupported"
 msgstr "paket sürümü %<PRIu32> desteklenmiyor"
 
-#: builtin/index-pack.c:380
 #, c-format
 msgid "pack has bad object at offset %<PRIuMAX>: %s"
 msgstr "paketin %<PRIuMAX> ofsetinde hatalı nesne var: %s"
 
-#: builtin/index-pack.c:485
 #, c-format
 msgid "inflate returned %d"
 msgstr "şişirme programı %d döndürdü"
 
-#: builtin/index-pack.c:534
 msgid "offset value overflow for delta base object"
 msgstr "delta tabanı nesnesi için ofset değeri taşımı"
 
-#: builtin/index-pack.c:542
 msgid "delta base offset is out of bound"
 msgstr "delta tabanı ofseti sınırlar dışında"
 
-#: builtin/index-pack.c:550
 #, c-format
 msgid "unknown object type %d"
 msgstr "bilinmeyen nesne türü %d"
 
-#: builtin/index-pack.c:581
 msgid "cannot pread pack file"
 msgstr "paket dosyası 'pread' yapılamıyor"
 
-#: builtin/index-pack.c:583
 #, 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:609
 msgid "serious inflate inconsistency"
 msgstr "ciddi şişirme programı tutarsızlığı"
 
-#: builtin/index-pack.c:754 builtin/index-pack.c:760 builtin/index-pack.c:784
-#: builtin/index-pack.c:823 builtin/index-pack.c:832
 #, c-format
 msgid "SHA1 COLLISION FOUND WITH %s !"
 msgstr "%s İLE SHA1 ÇARPIŞMASI BULUNDU!"
 
-#: builtin/index-pack.c:757 builtin/pack-objects.c:290
-#: builtin/pack-objects.c:350 builtin/pack-objects.c:456
 #, c-format
 msgid "unable to read %s"
 msgstr "%s okunamıyor"
 
-#: builtin/index-pack.c:821
 #, c-format
 msgid "cannot read existing object info %s"
 msgstr "mevcut %s nesne bilgisi okunamıyor"
 
-#: builtin/index-pack.c:829
 #, c-format
 msgid "cannot read existing object %s"
 msgstr "mevcut %s nesnesi okunamıyor"
 
-#: builtin/index-pack.c:843
 #, c-format
 msgid "invalid blob object %s"
 msgstr "geçersiz %s ikili nesnesi"
 
-#: builtin/index-pack.c:846 builtin/index-pack.c:865
 msgid "fsck error in packed object"
 msgstr "paketlenmiş nesne içinde fsck hatası"
 
-#: builtin/index-pack.c:867
 #, 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:928 builtin/index-pack.c:975
 msgid "failed to apply delta"
 msgstr "delta uygulanamadı"
 
-#: builtin/index-pack.c:1161
 msgid "Receiving objects"
 msgstr "Nesneler alınıyor"
 
-#: builtin/index-pack.c:1161
 msgid "Indexing objects"
 msgstr "Nesneler indeksleniyor"
 
-#: builtin/index-pack.c:1195
 msgid "pack is corrupted (SHA1 mismatch)"
 msgstr "paket hasar görmüş (SHA1 uyumsuzluğu)"
 
-#: builtin/index-pack.c:1200
 msgid "cannot fstat packfile"
 msgstr "paket dosyası fstat yapılamıyor"
 
-#: builtin/index-pack.c:1203
 msgid "pack has junk at the end"
 msgstr "paket sonunda döküntüler var"
 
-#: builtin/index-pack.c:1215
 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:1238
 msgid "Resolving deltas"
 msgstr "Deltalar çözülüyor"
 
-#: builtin/index-pack.c:1249 builtin/pack-objects.c:2913
 #, c-format
 msgid "unable to create thread: %s"
 msgstr "iş parçacığı oluşturulamadı: %s"
 
-#: builtin/index-pack.c:1282
 msgid "confusion beyond insanity"
 msgstr "karmaşa akıl almaz düzeyde"
 
-#: builtin/index-pack.c:1288
 #, 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:1300
 #, c-format
 msgid "Unexpected tail checksum for %s (disk corruption?)"
 msgstr "%s için beklenmedik kuyruk sağlaması (disk hasarı?)"
 
-#: builtin/index-pack.c:1304
 #, 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:1328
 #, c-format
 msgid "unable to deflate appended object (%d)"
 msgstr "iliştirilen nesne söndürülemedi (%d)"
 
-#: builtin/index-pack.c:1423
 #, c-format
 msgid "local object %s is corrupt"
 msgstr "yerel nesne %s hasarlı"
 
-#: builtin/index-pack.c:1445
 #, c-format
 msgid "packfile name '%s' does not end with '.%s'"
 msgstr "paket dosyası adı '%s', '.%s' ile bitmiyor"
 
-#: builtin/index-pack.c:1469
 #, c-format
 msgid "cannot write %s file '%s'"
 msgstr "%s dosyası '%s' yazılamıyor"
 
-#: builtin/index-pack.c:1477
 #, c-format
 msgid "cannot close written %s file '%s'"
 msgstr "yazılmış %s dosyası '%s' kapatılamıyor"
 
-#: builtin/index-pack.c:1494
 #, 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:1519
 msgid "error while closing pack file"
 msgstr "paket dosyası kapatılırken hata"
 
-#: builtin/index-pack.c:1578 builtin/pack-objects.c:3158
 #, c-format
-msgid "bad pack.indexversion=%<PRIu32>"
-msgstr "hatalı pack.indexversion=%<PRIu32>"
+msgid "bad pack.indexVersion=%<PRIu32>"
+msgstr "hatalı pack.indexVersion=%<PRIu32>"
 
-#: builtin/index-pack.c:1648
 #, c-format
 msgid "Cannot open existing pack file '%s'"
 msgstr "Mevcut paket dosyası '%s' açılamıyor"
 
-#: builtin/index-pack.c:1650
 #, 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:1698
 #, 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:1705
 #, 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
 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:1825 builtin/index-pack.c:1829
 #, c-format
 msgid "bad %s"
 msgstr "hatalı %s"
 
-#: builtin/index-pack.c:1835 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:1856
 msgid "--stdin requires a git repository"
 msgstr "--stdin bir git dizini gerektirir"
 
-#: builtin/index-pack.c:1873
 msgid "--verify with no packfile name given"
 msgstr "--verify ile bir paket dosyası adı verilmedi"
 
-#: builtin/index-pack.c:1939 builtin/unpack-objects.c:584
 msgid "fsck error in pack objects"
 msgstr "paket nesnelerinde fsck hatası"
 
-#: builtin/init-db.c:63
 #, c-format
 msgid "cannot stat template '%s'"
 msgstr "'%s' şablonunun bilgileri alınamıyor"
 
-#: builtin/init-db.c:68
 #, c-format
 msgid "cannot opendir '%s'"
 msgstr "'%s' opendir yapılamıyor"
 
-#: builtin/init-db.c:80
 #, c-format
 msgid "cannot readlink '%s'"
 msgstr "'%s' readlink yapılamıyor"
 
-#: builtin/init-db.c:82
 #, c-format
 msgid "cannot symlink '%s' '%s'"
 msgstr "'%s', '%s' ögesine sembolik bağla bağlanamıyor"
 
-#: builtin/init-db.c:88
 #, c-format
 msgid "cannot copy '%s' to '%s'"
 msgstr "'%s' şuraya kopyalanamıyor: '%s'"
 
-#: builtin/init-db.c:92
 #, c-format
 msgid "ignoring template %s"
 msgstr "%s şablonu yok sayılıyor"
 
-#: builtin/init-db.c:123
 #, c-format
 msgid "templates not found in %s"
 msgstr "şablonlar %s içinde bulunamadı"
 
-#: builtin/init-db.c:138
 #, c-format
 msgid "not copying templates from '%s': %s"
 msgstr "şablonlar '%s' konumundan kopyalanmıyor: %s"
 
-#: builtin/init-db.c:263
 #, c-format
 msgid "invalid initial branch name: '%s'"
 msgstr "geçersiz başlangıç dalı adı: '%s'"
 
-#: builtin/init-db.c:354
 #, c-format
 msgid "unable to handle file type %d"
 msgstr "%d dosya türü ele alınamıyor"
 
-#: builtin/init-db.c:357
 #, c-format
 msgid "unable to move %s to %s"
 msgstr "%s şuraya taşınamıyor: %s"
 
-#: builtin/init-db.c:373
 msgid "attempt to reinitialize repository with different hash"
 msgstr "depoyu başka bir sağlama ile yeniden ilklendirme deneniyor"
 
-#: builtin/init-db.c:397 builtin/init-db.c:400
 #, c-format
 msgid "%s already exists"
 msgstr "%s halihazırda var"
 
-#: builtin/init-db.c:432
 #, c-format
 msgid "re-init: ignored --initial-branch=%s"
 msgstr "re-init: --initial-branch=%s yok sayıldı"
 
-#: builtin/init-db.c:463
 #, c-format
 msgid "Reinitialized existing shared Git repository in %s%s\n"
 msgstr "%s%s içindeki mevcut paylaşılan Git deposu yeniden ilklendirildi\n"
 
-#: builtin/init-db.c:464
 #, c-format
 msgid "Reinitialized existing Git repository in %s%s\n"
 msgstr "%s%s içindeki mevcut Git deposu yeniden ilklendirildi\n"
 
-#: builtin/init-db.c:468
 #, c-format
 msgid "Initialized empty shared Git repository in %s%s\n"
 msgstr "%s%s içinde paylaşılan boş Git deposu ilklendirildi\n"
 
-#: builtin/init-db.c:469
 #, c-format
 msgid "Initialized empty Git repository in %s%s\n"
 msgstr "%s%s içinde boş Git deposu ilklendirildi\n"
 
-#: builtin/init-db.c:518
 msgid ""
 "git init [-q | --quiet] [--bare] [--template=<template-directory>] [--"
 "shared[=<permissions>]] [<directory>]"
@@ -17454,37 +7211,29 @@ msgstr ""
 "git init [-q | --quiet] [--bare] [--template=<şablon-dizini>] [--"
 "shared[=<izinler>]] [<dizin>]"
 
-#: builtin/init-db.c:544
 msgid "permissions"
 msgstr "izinler"
 
-#: builtin/init-db.c:545
 msgid "specify that the git repository is to be shared amongst several users"
 msgstr "git deposunun kullanıcılar arasında paylaşıp paylaşılmayacağını belirt"
 
-#: builtin/init-db.c:551
 msgid "override the name of the initial branch"
 msgstr "başlangıç dalının adını geçersiz kıl"
 
-#: builtin/init-db.c:552 builtin/verify-pack.c:74
 msgid "hash"
 msgstr "sağlama"
 
-#: builtin/init-db.c:553 builtin/show-index.c:22 builtin/verify-pack.c:75
 msgid "specify the hash algorithm to use"
 msgstr "kullanılacak sağlama algoritmasını belirle"
 
-#: builtin/init-db.c:591 builtin/init-db.c:596
 #, c-format
 msgid "cannot mkdir %s"
 msgstr "%s mkdir yapılamıyor"
 
-#: builtin/init-db.c:600 builtin/init-db.c:655
 #, c-format
 msgid "cannot chdir to %s"
 msgstr "%s ögesine chdir yapılamıyor"
 
-#: builtin/init-db.c:627
 #, c-format
 msgid ""
 "%s (or --work-tree=<directory>) not allowed without specifying %s (or --git-"
@@ -17493,16 +7242,13 @@ msgstr ""
 "%s (veya --work-tree=<dizin>), %s (veya --git-dir=<dizin>) belirlenmeden "
 "izin verilmiyor"
 
-#: builtin/init-db.c:679
 #, c-format
 msgid "Cannot access work tree '%s'"
 msgstr "'%s' çalışma ağacı erişilemiyor"
 
-#: builtin/init-db.c:684
 msgid "--separate-git-dir incompatible with bare repository"
 msgstr "--separate-git-dir, çıplak depo ile uyumsuz"
 
-#: builtin/interpret-trailers.c:16
 msgid ""
 "git interpret-trailers [--in-place] [--trim-empty] [(--trailer "
 "<token>[(=|:)<value>])...] [<file>...]"
@@ -17510,92 +7256,73 @@ msgstr ""
 "git interpret-trailers [--in-place] [--trim-empty] [(--trailer "
 "<jeton>[(=|:)<değer>])...] [<dosya>...]"
 
-#: builtin/interpret-trailers.c:95
 msgid "edit files in place"
 msgstr "dosyaları yerinde düzenle"
 
-#: builtin/interpret-trailers.c:96
 msgid "trim empty trailers"
 msgstr "boş artbilgileri kırp"
 
-#: builtin/interpret-trailers.c:99
 msgid "where to place the new trailer"
 msgstr "yeni artbilgiler nereye yerleştirilecek"
 
-#: builtin/interpret-trailers.c:101
 msgid "action if trailer already exists"
 msgstr "artbilgi halihazırda varsa yapılacak eylem"
 
-#: builtin/interpret-trailers.c:103
 msgid "action if trailer is missing"
 msgstr "artbilgi eksikse yapılacak eylem"
 
-#: builtin/interpret-trailers.c:105
 msgid "output only the trailers"
 msgstr "yalnızca artbilgileri çıktı ver"
 
-#: builtin/interpret-trailers.c:106
 msgid "do not apply config rules"
 msgstr "yapılandırma kurallarını uygulama"
 
-#: builtin/interpret-trailers.c:107
 msgid "join whitespace-continued values"
 msgstr "boşluk ile sürdürülen değerleri uç uca ekle"
 
-#: builtin/interpret-trailers.c:108
 msgid "set parsing options"
 msgstr "ayrıştırma seçeneklerini ayarla"
 
-#: builtin/interpret-trailers.c:110
 msgid "do not treat --- specially"
 msgstr "ayırma çizgilerine (---) özel davranma"
 
-#: builtin/interpret-trailers.c:112
 msgid "trailer(s) to add"
 msgstr "eklenecek artbilgi(ler)"
 
-#: builtin/interpret-trailers.c:123
 msgid "--trailer with --only-input does not make sense"
 msgstr "--trailer ile --only-input bir anlam ifade etmiyor"
 
-#: builtin/interpret-trailers.c:133
 msgid "no input file given for in-place editing"
 msgstr "yerinde düzenleme için girdi dosyası verilmedi"
 
-#: builtin/log.c:60
 msgid "git log [<options>] [<revision-range>] [[--] <path>...]"
 msgstr "git log [<seçenekler>] [<revizyon-erimi>] [[--] <yol>...]"
 
-#: builtin/log.c:61
 msgid "git show [<options>] <object>..."
 msgstr "git show [<seçenekler>] <nesne>..."
 
-#: builtin/log.c:114
 #, c-format
 msgid "invalid --decorate option: %s"
 msgstr "geçersiz --decorate seçeneği: %s"
 
-#: builtin/log.c:181
+msgid "suppress diff output"
+msgstr "diff çıktısını gizle"
+
 msgid "show source"
 msgstr "kaynağı göster"
 
-#: builtin/log.c:182
 msgid "use mail map file"
 msgstr "posta eşlem dosyasını kullan"
 
-#: builtin/log.c:185
 msgid "only decorate refs that match <pattern>"
 msgstr "yalnızca <dizgi> ile eşleşen başvuruları süsle"
 
-#: builtin/log.c:187
 msgid "do not decorate refs that match <pattern>"
 msgstr "<dizgi> ile eşleşen başvuruları süsleme"
 
-#: builtin/log.c:188
 msgid "decorate options"
 msgstr "süsleme seçenekleri"
 
-#: builtin/log.c:191
 msgid ""
 "trace the evolution of line range <start>,<end> or function :<funcname> in "
 "<file>"
@@ -17603,93 +7330,76 @@ msgstr ""
 "<dosya> içindeki <başlangıç>,<bitiş> satır eriminin veya :<işlevadı> "
 "işlevinin evrimini izle"
 
-#: builtin/log.c:214
+#, c-format
+msgid "unrecognized argument: %s"
+msgstr "tanımlanamayan argüman: %s"
+
 msgid "-L<range>:<file> cannot be used with pathspec"
 msgstr "-L<erim>:<dosya>, yol belirteci ile kullanılamıyor"
 
-#: builtin/log.c:322
 #, c-format
 msgid "Final output: %d %s\n"
 msgstr "Son çıktı: %d %s\n"
 
-#: builtin/log.c:429
 msgid "unable to create temporary object directory"
 msgstr "geçici nesne dizini oluşturulamıyor"
 
-#: builtin/log.c:599
 #, c-format
 msgid "git show %s: bad file"
 msgstr "git show %s: hatalı dosya"
 
-#: builtin/log.c:614 builtin/log.c:706
 #, c-format
 msgid "could not read object %s"
 msgstr "%s nesnesi okunamadı"
 
-#: builtin/log.c:731
 #, c-format
 msgid "unknown type: %d"
 msgstr "bilinmeyen tür: %d"
 
-#: builtin/log.c:880
 #, c-format
 msgid "%s: invalid cover from description mode"
 msgstr "%s: açıklama kipinden geçersiz kapak sayfası"
 
-#: builtin/log.c:887
 msgid "format.headers without value"
 msgstr "format.headers değere iye değil"
 
-#: builtin/log.c:1016
 #, c-format
 msgid "cannot open patch file %s"
 msgstr "%s yama dosyası okunamıyor"
 
-#: builtin/log.c:1033
 msgid "need exactly one range"
 msgstr "bir tam erim gerekiyor"
 
-#: builtin/log.c:1043
 msgid "not a range"
 msgstr "bir erim değil"
 
-#: builtin/log.c:1207
 msgid "cover letter needs email format"
 msgstr "ön yazı için e-posta biçimi gerekli"
 
-#: builtin/log.c:1213
 msgid "failed to create cover-letter file"
 msgstr "cover-letter dosyası oluşturulamadı"
 
-#: builtin/log.c:1300
 #, c-format
 msgid "insane in-reply-to: %s"
 msgstr "akıl almaz in-reply-to: %s"
 
-#: builtin/log.c:1327
 msgid "git format-patch [<options>] [<since> | <revision-range>]"
 msgstr "git format-patch [<seçenekler>] [<-beri> | <revizyon-erimi>]"
 
-#: builtin/log.c:1385
 msgid "two output directories?"
 msgstr "iki çıktı dizini?"
 
-#: builtin/log.c:1536 builtin/log.c:2369 builtin/log.c:2371 builtin/log.c:2383
 #, c-format
 msgid "unknown commit %s"
 msgstr "bilinmeyen işleme %s"
 
-#: builtin/log.c:1547 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' geçerli bir başvuru olarak çözülemedi"
 
-#: builtin/log.c:1556
 msgid "could not find exact merge base"
 msgstr "kesin birleştirme temeli bulunamadı"
 
-#: builtin/log.c:1566
 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"
@@ -17700,396 +7410,304 @@ msgstr ""
 "izleyin. Bunun dışında taban işlemesini kendiniz --base=<taban-işlemesi-no>\n"
 "kullanarak el ile belirtebilirsiniz."
 
-#: builtin/log.c:1589
 msgid "failed to find exact merge base"
 msgstr "kesin birleştirme temeli bulunamadı"
 
-#: builtin/log.c:1606
 msgid "base commit should be the ancestor of revision list"
 msgstr "taban işlemesi revizyon listesinin atası olmalı"
 
-#: builtin/log.c:1616
 msgid "base commit shouldn't be in revision list"
 msgstr "taban işlemesi revizyon listesinde olmamalı"
 
-#: builtin/log.c:1674
 msgid "cannot get patch id"
 msgstr "yama numarası alınamıyor"
 
-#: builtin/log.c:1737
 msgid "failed to infer range-diff origin of current series"
 msgstr "geçerli dizinin range-diff kökeninden bir anlam çıkartılamadı"
 
-#: builtin/log.c:1739
 #, c-format
 msgid "using '%s' as range-diff origin of current series"
 msgstr "geçerli dizinin range-diff kökeni olarak '%s' kullanılıyor"
 
-#: builtin/log.c:1783
 msgid "use [PATCH n/m] even with a single patch"
 msgstr "bir yamayla bile olsa [PATCH n/m] kullan"
 
-#: builtin/log.c:1786
 msgid "use [PATCH] even with multiple patches"
 msgstr "birden çok yama bile olsa [PATCH] kullan"
 
-#: builtin/log.c:1790
 msgid "print patches to standard out"
 msgstr "yamaları standart çıktıya yazdır"
 
-#: builtin/log.c:1792
 msgid "generate a cover letter"
 msgstr "bir ön yazı oluştur"
 
-#: builtin/log.c:1794
 msgid "use simple number sequence for output file names"
 msgstr "çıktı dosya adları için yalın sayı dizisi oluştur"
 
-#: builtin/log.c:1795
 msgid "sfx"
 msgstr "sonek"
 
-#: builtin/log.c:1796
 msgid "use <sfx> instead of '.patch'"
 msgstr "'.patch' yerine <sonek> kullan"
 
-#: builtin/log.c:1798
 msgid "start numbering patches at <n> instead of 1"
 msgstr "yamaları 1 yerine <n>'de numaralandırmaya başla"
 
-#: builtin/log.c:1799
 msgid "reroll-count"
 msgstr "reroll-count"
 
-#: builtin/log.c:1800
 msgid "mark the series as Nth re-roll"
 msgstr "diziyi n. deneme olarak imle"
 
-#: builtin/log.c:1802
 msgid "max length of output filename"
 msgstr "çıktı dosya adının olabilecek en çok uzunluğu"
 
-#: builtin/log.c:1804
 msgid "use [RFC PATCH] instead of [PATCH]"
 msgstr "[PATCH] yerine [RFC PATCH] kullan"
 
-#: builtin/log.c:1807
 msgid "cover-from-description-mode"
 msgstr "açıklama kipinden kapak sayfası kipi"
 
-#: builtin/log.c:1808
 msgid "generate parts of a cover letter based on a branch's description"
 msgstr "ön yazının bazı kısımlarını dalın açıklamasından oluştur"
 
-#: builtin/log.c:1810
 msgid "use [<prefix>] instead of [PATCH]"
 msgstr "[PATCH] yerine [<önek>] kullan"
 
-#: builtin/log.c:1813
 msgid "store resulting files in <dir>"
 msgstr "ortaya çıkan dosyaları <dizin>'de depola"
 
-#: builtin/log.c:1816
 msgid "don't strip/add [PATCH]"
 msgstr "[PATCH]'i soyma/ekleme"
 
-#: builtin/log.c:1819
 msgid "don't output binary diffs"
 msgstr "ikili diff'leri çıktı verme"
 
-#: builtin/log.c:1821
 msgid "output all-zero hash in From header"
 msgstr "From başlığında tümü sıfırdan oluşan sağlama çıktısı ver"
 
-#: builtin/log.c:1823
 msgid "don't include a patch matching a commit upstream"
 msgstr "üstkaynaktaki bir işleme ile eşleşen bir yamayı içerme"
 
-#: builtin/log.c:1825
 msgid "show patch format instead of default (patch + stat)"
 msgstr "öntanımlı yerine yama biçimini göster (patch + stat)"
 
-#: builtin/log.c:1827
 msgid "Messaging"
 msgstr "İletileşme"
 
-#: builtin/log.c:1828
 msgid "header"
 msgstr "üstbilgi"
 
-#: builtin/log.c:1829
 msgid "add email header"
 msgstr "e-posta üstbilgisi ekle"
 
-#: builtin/log.c:1830 builtin/log.c:1831
 msgid "email"
 msgstr "e-posta"
 
-#: builtin/log.c:1830
 msgid "add To: header"
 msgstr "To: üstbilgisi ekle"
 
-#: builtin/log.c:1831
 msgid "add Cc: header"
 msgstr "Cc: üstbilgisi ekle"
 
-#: builtin/log.c:1832
 msgid "ident"
 msgstr "tanımlayıcı"
 
-#: builtin/log.c:1833
 msgid "set From address to <ident> (or committer ident if absent)"
 msgstr ""
 "From adresini <tanımlayıcı> olarak ayarla (veya yoksa işleyici tanımlayıcısı)"
 
-#: builtin/log.c:1835
 msgid "message-id"
 msgstr "ileti no"
 
-#: builtin/log.c:1836
 msgid "make first mail a reply to <message-id>"
 msgstr "ilk postayı <ileti no>'ya bir yanıt yap"
 
-#: builtin/log.c:1837 builtin/log.c:1840
 msgid "boundary"
 msgstr "sınır"
 
-#: builtin/log.c:1838
 msgid "attach the patch"
 msgstr "yamayı ekle"
 
-#: builtin/log.c:1841
 msgid "inline the patch"
 msgstr "yamayı iletiye koy"
 
-#: builtin/log.c:1845
 msgid "enable message threading, styles: shallow, deep"
 msgstr "iletileri kataloglamayı etkinleştir, stiller: shallow, deep"
 
-#: builtin/log.c:1847
 msgid "signature"
 msgstr "imza"
 
-#: builtin/log.c:1848
 msgid "add a signature"
 msgstr "imza ekle"
 
-#: builtin/log.c:1849
 msgid "base-commit"
 msgstr "taban işleme"
 
-#: builtin/log.c:1850
 msgid "add prerequisite tree info to the patch series"
 msgstr "yama dizisine önkoşul ağaç bilgisini ekle"
 
-#: builtin/log.c:1853
 msgid "add a signature from a file"
 msgstr "dosyadan bir imza ekle"
 
-#: builtin/log.c:1854
 msgid "don't print the patch filenames"
 msgstr "yama dosya adlarını yazdırma"
 
-#: builtin/log.c:1856
 msgid "show progress while generating patches"
 msgstr "yamalar oluşturulurken ilerlemeyi göster"
 
-#: builtin/log.c:1858
 msgid "show changes against <rev> in cover letter or single patch"
 msgstr "<rev> karşısındaki değişiklikleri ön yazıda veya tek bir yamada göster"
 
-#: builtin/log.c:1861
 msgid "show changes against <refspec> in cover letter or single patch"
 msgstr ""
 "<bşvr-blrtç> karşısındaki değişiklikleri ön yazıda veya tek bir yamada göster"
 
-#: builtin/log.c:1863 builtin/range-diff.c:28
 msgid "percentage by which creation is weighted"
 msgstr "oluşumun tartıldığı yüzde"
 
-#: builtin/log.c:1953
 #, c-format
 msgid "invalid ident line: %s"
 msgstr "geçersiz tanımlayıcı satırı: %s"
 
-#: builtin/log.c:1978
 msgid "--name-only does not make sense"
 msgstr "--name-only bir anlam ifade etmiyor"
 
-#: builtin/log.c:1980
 msgid "--name-status does not make sense"
 msgstr "--name-status bir anlam ifade etmiyor"
 
-#: builtin/log.c:1982
 msgid "--check does not make sense"
 msgstr "--check bir anlam ifade etmiyor"
 
-#: builtin/log.c:1984
 msgid "--remerge-diff does not make sense"
 msgstr "--remerge-diff bir anlam ifade etmiyor"
 
-#: builtin/log.c:2129
+#, c-format
+msgid "could not create directory '%s'"
+msgstr "'%s' dizini oluşturulamadı"
+
 msgid "--interdiff requires --cover-letter or single patch"
 msgstr "--interdiff, --cover-letter veya tek yama gerektiriyor"
 
-#: builtin/log.c:2133
 msgid "Interdiff:"
 msgstr "Interdiff:"
 
-#: builtin/log.c:2134
 #, c-format
 msgid "Interdiff against v%d:"
 msgstr "Interdiff v%d karşısında:"
 
-#: builtin/log.c:2144
 msgid "--range-diff requires --cover-letter or single patch"
 msgstr "--range-diff, --cover-letter veya tek yama gerektiriyor"
 
-#: builtin/log.c:2152
 msgid "Range-diff:"
 msgstr "Range-diff:"
 
-#: builtin/log.c:2153
 #, c-format
 msgid "Range-diff against v%d:"
 msgstr "Range-diff v%d karşısında:"
 
-#: builtin/log.c:2164
 #, c-format
 msgid "unable to read signature file '%s'"
 msgstr "'%s' imza dosyası okunamıyor"
 
-#: builtin/log.c:2200
 msgid "Generating patches"
 msgstr "Yamalar oluşturuluyor"
 
-#: builtin/log.c:2244
 msgid "failed to create output files"
 msgstr "çıktı dosyaları oluşturulamadı"
 
-#: builtin/log.c:2304
 msgid "git cherry [-v] [<upstream> [<head> [<limit>]]]"
 msgstr "git cherry [-v] [<üstkaynak> [<dal-ucu> [<sınır>]]]"
 
-#: builtin/log.c:2358
 #, c-format
 msgid ""
 "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:564
 msgid "git ls-files [<options>] [<file>...]"
 msgstr "git ls-files [<seçenekler>] [<dosya>...]"
 
-#: builtin/ls-files.c:618
 msgid "separate paths with the NUL character"
 msgstr "yolları NUL karakteri ile ayır"
 
-#: builtin/ls-files.c:620
 msgid "identify the file status with tags"
 msgstr "dosya durumunu etiketlerle tanımla"
 
-#: builtin/ls-files.c:622
 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:624
 msgid "use lowercase letters for 'fsmonitor clean' files"
 msgstr "'fsmonitor clean' dosyalarını küçük harflerle göster"
 
-#: builtin/ls-files.c:626
 msgid "show cached files in the output (default)"
 msgstr "önbelleğe alınan dosyaları çıktıda göster (öntanımlı)"
 
-#: builtin/ls-files.c:628
 msgid "show deleted files in the output"
 msgstr "silinen dosyaları çıktıda göster"
 
-#: builtin/ls-files.c:630
 msgid "show modified files in the output"
 msgstr "değiştirilen dosyaları çıktıda göster"
 
-#: builtin/ls-files.c:632
 msgid "show other files in the output"
 msgstr "diğer dosyaları çıktıda göster"
 
-#: builtin/ls-files.c:634
 msgid "show ignored files in the output"
 msgstr "yok sayılan dosyaları çıktıda göster"
 
-#: builtin/ls-files.c:637
 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:639
 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:641
 msgid "show 'other' directories' names only"
 msgstr "'diğer' dizinlerin yalnızca adını göster"
 
-#: builtin/ls-files.c:643
 msgid "show line endings of files"
 msgstr "dosyaların satır sonlarını göster"
 
-#: builtin/ls-files.c:645
 msgid "don't show empty directories"
 msgstr "boş dizinleri gösterme"
 
-#: builtin/ls-files.c:648
 msgid "show unmerged files in the output"
 msgstr "birleştirilmemiş dosyaları çıktıda göster"
 
-#: builtin/ls-files.c:650
 msgid "show resolve-undo information"
 msgstr "'resolve-undo' bilgisini göster"
 
-#: builtin/ls-files.c:652
 msgid "skip files matching pattern"
 msgstr "dizgi ile eşleşen dosyaları atla"
 
-#: builtin/ls-files.c:655
 msgid "read exclude patterns from <file>"
 msgstr "hariç bırakma dizgilerini <dosya>'dan oku"
 
-#: builtin/ls-files.c:658
 msgid "read additional per-directory exclude patterns in <file>"
 msgstr "ek dizin başı hariç tutma dizgilerini <dosya>'dan oku"
 
-#: builtin/ls-files.c:660
 msgid "add the standard git exclusions"
 msgstr "standart git hariç tutmalarını ekle"
 
-#: builtin/ls-files.c:664
 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:669
 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:670
 msgid "tree-ish"
 msgstr "ağacımsı"
 
-#: builtin/ls-files.c:671
 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:673
 msgid "show debugging data"
 msgstr "hata ayıklama verisini göster"
 
-#: builtin/ls-files.c:675
 msgid "suppress duplicate entries"
 msgstr "yinelenen girdileri sustur"
 
-#: builtin/ls-files.c:677
 msgid "show sparse directories in the presence of a sparse index"
 msgstr "bir aralıklı indeks bulunurluğunda aralıklı dizinleri göster"
 
-#: builtin/ls-remote.c:9
 msgid ""
 "git ls-remote [--heads] [--tags] [--refs] [--upload-pack=<exec>]\n"
 "              [-q | --quiet] [--exit-code] [--get-url]\n"
@@ -18099,205 +7717,156 @@ msgstr ""
 "              [-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:1131
 msgid "exec"
 msgstr "çalıştır"
 
-#: builtin/ls-remote.c:62 builtin/ls-remote.c:64
 msgid "path of git-upload-pack on the remote host"
 msgstr "uzak konum makinesindeki git-upload-pack yolu"
 
-#: builtin/ls-remote.c:66
 msgid "limit to tags"
 msgstr "etiketlere kısıtla"
 
-#: builtin/ls-remote.c:67
 msgid "limit to heads"
 msgstr "uç işlemelere kısıtla"
 
-#: builtin/ls-remote.c:68
 msgid "do not show peeled tags"
 msgstr "soyulmuş etiketleri gösterme"
 
-#: builtin/ls-remote.c:70
 msgid "take url.<base>.insteadOf into account"
 msgstr "url.<temel>.insteadOf'u dikkate al"
 
-#: builtin/ls-remote.c:73
 msgid "exit with exit code 2 if no matching refs are found"
 msgstr "eşleşen başvuru bulunamazsa 2 numaralı çıkış koduyla çık"
 
-#: builtin/ls-remote.c:76
 msgid "show underlying ref in addition to the object pointed by it"
 msgstr "işaret ettiği nesneye ek olarak altında yatan başvuruyu göster"
 
-#: builtin/ls-tree.c:36
 msgid "git ls-tree [<options>] <tree-ish> [<path>...]"
 msgstr "git ls-tree [<seçenekler>] <ağacımsı> [<yol>...]"
 
-#: builtin/ls-tree.c:54
 #, c-format
 msgid "could not get object info about '%s'"
 msgstr "'%s' hakkında nesne bilgisi alınamadı"
 
-#: builtin/ls-tree.c:79
 #, c-format
 msgid "bad ls-tree format: element '%s' does not start with '('"
 msgstr "hatalı ls-tree biçimi: '%s' ögesi '(' ile başlamıyor"
 
-#: builtin/ls-tree.c:83
 #, c-format
 msgid "bad ls-tree format: element '%s' does not end in ')'"
 msgstr "hatalı ls-tree biçimi: '%s' ögesi ')' ile sonlanmıyor"
 
-#: builtin/ls-tree.c:109
 #, c-format
 msgid "bad ls-tree format: %%%.*s"
 msgstr "hatalı ls-tree biçimi: %%%.*s"
 
-#: builtin/ls-tree.c:336
 msgid "only show trees"
 msgstr "yalnızca ağaçları göster"
 
-#: builtin/ls-tree.c:338
 msgid "recurse into subtrees"
 msgstr "altağaçlara özyinele"
 
-#: builtin/ls-tree.c:340
 msgid "show trees when recursing"
 msgstr "özyinelerken ağaçları göster"
 
-#: builtin/ls-tree.c:343
 msgid "terminate entries with NUL byte"
 msgstr "girdileri NUL baytı ile sonlandır"
 
-#: builtin/ls-tree.c:344
 msgid "include object size"
 msgstr "nesne boyutunu içer"
 
-#: builtin/ls-tree.c:346 builtin/ls-tree.c:348
 msgid "list only filenames"
 msgstr "yalnızca dosya adlarını listele"
 
-#: builtin/ls-tree.c:350
 msgid "list only objects"
 msgstr "yalnızca nesneleri listele"
 
-#: builtin/ls-tree.c:353
 msgid "use full path names"
 msgstr "tam yol adlarını kullan"
 
-#: builtin/ls-tree.c:355
 msgid "list entire tree; not just current directory (implies --full-name)"
 msgstr "yalnızca geçerli dizini değil tüm ağacı listele (--full-name ima eder)"
 
-#: builtin/ls-tree.c:391
 msgid "--format can't be combined with other format-altering options"
 msgstr "--format, diğer format-altering seçenekleriyle birlikte kullanılamaz"
 
 #. TRANSLATORS: keep <> in "<" mail ">" info.
-#: builtin/mailinfo.c:14
 msgid "git mailinfo [<options>] <msg> <patch> < mail >info"
 msgstr "git mailinfo [<seçenekler>] <ileti> <yama> < mail >info"
 
-#: builtin/mailinfo.c:58
 msgid "keep subject"
 msgstr "konuyu tut"
 
-#: builtin/mailinfo.c:60
 msgid "keep non patch brackets in subject"
 msgstr "yama olmayan ayraçları konuda tut"
 
-#: builtin/mailinfo.c:62
 msgid "copy Message-ID to the end of commit message"
 msgstr "Message-ID'yi işleme iletisinin sonuna kopyala"
 
-#: builtin/mailinfo.c:64
 msgid "re-code metadata to i18n.commitEncoding"
 msgstr "üstveriyi i18n.commitEncoding olarak yeniden kodla"
 
-#: builtin/mailinfo.c:67
 msgid "disable charset re-coding of metadata"
 msgstr "üstverinin karakter seti yeniden kodlamasını devre dışı bırak"
 
-#: builtin/mailinfo.c:69
 msgid "encoding"
 msgstr "kodlama"
 
-#: builtin/mailinfo.c:70
 msgid "re-code metadata to this encoding"
 msgstr "üstveriyi bu kodlama olacak biçimde yeniden kodla"
 
-#: builtin/mailinfo.c:72
 msgid "use scissors"
 msgstr "makas kullan"
 
-#: builtin/mailinfo.c:73
 msgid "<action>"
 msgstr "<eylem>"
 
-#: builtin/mailinfo.c:74
 msgid "action when quoted CR is found"
 msgstr "alıntılanmış CR bulunduğu zaman yapılacak eylem"
 
-#: builtin/mailinfo.c:77
 msgid "use headers in message's body"
 msgstr "ileti gövdesinde üstbilgi kullan"
 
-#: builtin/mailsplit.c:227
 msgid "reading patches from stdin/tty..."
 msgstr "yamalar stdin/tty'den okunuyor..."
 
-#: builtin/mailsplit.c:242
 #, c-format
 msgid "empty mbox: '%s'"
 msgstr "boş mbox: '%s'"
 
-#: builtin/merge-base.c:32
 msgid "git merge-base [-a | --all] <commit> <commit>..."
 msgstr "git merge-base [-a | --all] <işleme> <işleme>..."
 
-#: builtin/merge-base.c:33
 msgid "git merge-base [-a | --all] --octopus <commit>..."
 msgstr "git merge-base [-a | --all] --octopus <işleme>..."
 
-#: builtin/merge-base.c:34
 msgid "git merge-base --independent <commit>..."
 msgstr "git merge-base --independent <işleme>..."
 
-#: builtin/merge-base.c:35
 msgid "git merge-base --is-ancestor <commit> <commit>"
 msgstr "git merge-base --is-ancestor <işleme> <işleme>"
 
-#: builtin/merge-base.c:36
 msgid "git merge-base --fork-point <ref> [<commit>]"
 msgstr "git merge-base --fork-point <başvuru> [<işleme>]"
 
-#: builtin/merge-base.c:144
 msgid "output all common ancestors"
 msgstr "tüm ortak ataları çıktı ver"
 
-#: builtin/merge-base.c:146
 msgid "find ancestors for a single n-way merge"
 msgstr "tek bir n yönlü birleştirme için ataları bul"
 
-#: builtin/merge-base.c:148
 msgid "list revs not reachable from others"
 msgstr "başkaları tarafından ulaşılabilir revizyonları listele"
 
-#: builtin/merge-base.c:150
 msgid "is the first one ancestor of the other?"
 msgstr "ilki diğerlerinin atası mı?"
 
-#: builtin/merge-base.c:152
 msgid "find where <commit> forked from reflog of <ref>"
 msgstr "<işleme>'nin nerede <başvuru>'nun günlüğünden çatallandığını bul"
 
-#: builtin/merge-file.c:9
 msgid ""
 "git merge-file [<options>] [-L <name1> [-L <orig> [-L <name2>]]] <file1> "
 "<orig-file> <file2>"
@@ -18305,254 +7874,202 @@ msgstr ""
 "git merge-file [<seçenekler>] [-L <ad1> [-L <orij> [-L <ad2>]]] <dosya1> "
 "<orij-dosya> <dosya2>"
 
-#: builtin/merge-file.c:35
 msgid "send results to standard output"
 msgstr "sonuçları standart çıktıya gönder"
 
-#: builtin/merge-file.c:36
 msgid "use a diff3 based merge"
 msgstr "diff3 tabanlı birleştirme kullan"
 
-#: builtin/merge-file.c:37
 msgid "use a zealous diff3 based merge"
 msgstr "gayretli bir diff3 tabanlı birleştirme kullan"
 
-#: builtin/merge-file.c:39
 msgid "for conflicts, use our version"
 msgstr "çakışmalarda bizim sürümü kullan"
 
-#: builtin/merge-file.c:41
 msgid "for conflicts, use their version"
 msgstr "çakışmalarda onların sürümünü kullan"
 
-#: builtin/merge-file.c:43
 msgid "for conflicts, use a union version"
 msgstr "çakışmalarda birlik olmuş bir sürüm kullan"
 
-#: builtin/merge-file.c:46
 msgid "for conflicts, use this marker size"
 msgstr "çakışmalarda bu imleyici boyutunu kullan"
 
-#: builtin/merge-file.c:47
 msgid "do not warn about conflicts"
 msgstr "çakışmalar hakkında uyarma"
 
-#: builtin/merge-file.c:49
 msgid "set labels for file1/orig-file/file2"
 msgstr "file1/orig-file/file2 için etiketler yapıştır"
 
-#: builtin/merge-recursive.c:47
 #, c-format
 msgid "unknown option %s"
 msgstr "bilinmeyen seçenek %s"
 
-#: builtin/merge-recursive.c:53
 #, c-format
 msgid "could not parse object '%s'"
 msgstr "'%s' nesnesi ayrıştırılamadı"
 
-#: builtin/merge-recursive.c:57
 #, c-format
 msgid "cannot handle more than %d base. Ignoring %s."
 msgid_plural "cannot handle more than %d bases. Ignoring %s."
 msgstr[0] "%d tabandan fazlası ele alınamıyor. %s yok sayılıyor."
 msgstr[1] "%d tabandan fazlası ele alınamıyor. %s yok sayılıyor."
 
-#: builtin/merge-recursive.c:65
 msgid "not handling anything other than two heads merge."
-msgstr "iki dal ucu birleştirmesinden başka bir şey işlenmiyor"
+msgstr "iki dal ucu birleştirmesinden başka bir şey işlenmiyor."
 
-#: builtin/merge-recursive.c:74 builtin/merge-recursive.c:76
 #, c-format
 msgid "could not resolve ref '%s'"
 msgstr "'%s' başvurusu çözülemedi"
 
-#: builtin/merge-recursive.c:82
 #, c-format
 msgid "Merging %s with %s\n"
 msgstr "%s, %s ile birleştiriliyor\n"
 
-#: builtin/merge.c:59
 msgid "git merge [<options>] [<commit>...]"
 msgstr "git merge [<seçenekler>] [<işleme>...]"
 
-#: builtin/merge.c:125
 msgid "switch `m' requires a value"
 msgstr "'m' anahtarı bir değer gerektiriyor"
 
-#: builtin/merge.c:148
 #, c-format
 msgid "option `%s' requires a value"
 msgstr "'%s' seçeneği bir değer gerektiriyor"
 
-#: builtin/merge.c:201
 #, c-format
 msgid "Could not find merge strategy '%s'.\n"
 msgstr "Birleştirme stratejisi '%s' bulunamadı.\n"
 
-#: builtin/merge.c:202
 #, c-format
 msgid "Available strategies are:"
 msgstr "Kullanılabilir stratejiler:"
 
-#: builtin/merge.c:207
 #, c-format
 msgid "Available custom strategies are:"
 msgstr "Kullanılabilir özel stratejiler:"
 
-#: builtin/merge.c:258 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:261 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:262 builtin/pull.c:140
 msgid "(synonym to --stat)"
 msgstr "(--stat eşanlamlısı)"
 
-#: builtin/merge.c:264 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:267 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:269 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:271 builtin/pull.c:155
 msgid "edit message before committing"
 msgstr "göndermeden önce iletiyi düzenle"
 
-#: builtin/merge.c:273
 msgid "allow fast-forward (default)"
 msgstr "ileri sarıma izin ver (öntanımlı)"
 
-#: builtin/merge.c:275 builtin/pull.c:162
 msgid "abort if fast-forward is not possible"
 msgstr "ileri sarım olanaklı değilse iptal et"
 
-#: builtin/merge.c:279 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:280 builtin/notes.c:785 builtin/pull.c:172
-#: builtin/rebase.c:1145 builtin/revert.c:114
 msgid "strategy"
 msgstr "strateji"
 
-#: builtin/merge.c:281 builtin/pull.c:173
 msgid "merge strategy to use"
 msgstr "kullanılacak birleştirme stratejisi"
 
-#: builtin/merge.c:282 builtin/pull.c:176
 msgid "option=value"
 msgstr "seçenek=değer"
 
-#: builtin/merge.c:283 builtin/pull.c:177
 msgid "option for selected merge strategy"
 msgstr "seçili birleştirme stratejisi için seçenekler"
 
-#: builtin/merge.c:285
 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:291
 msgid "use <name> instead of the real target"
 msgstr "gerçek hedef yerine <ad> kullan"
 
-#: builtin/merge.c:294
 msgid "abort the current in-progress merge"
 msgstr "ilerlemekte olan geçerli birleştirmeyi iptal et"
 
-#: builtin/merge.c:296
 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:298
 msgid "continue the current in-progress merge"
 msgstr "ilerlemekte olan geçerli birleştirmeyi sürdürün"
 
-#: builtin/merge.c:300 builtin/pull.c:184
 msgid "allow merging unrelated histories"
 msgstr "birbiriyle ilişkisi olmayan geçmişlerin birleştirilmesine izin ver"
 
-#: builtin/merge.c:307
 msgid "bypass pre-merge-commit and commit-msg hooks"
 msgstr "pre-merge-commit ve commit-msg kancalarını atla"
 
-#: builtin/merge.c:323
 msgid "could not run stash."
-msgstr "zula yapılamadı"
+msgstr "zula çalıştırılamadı."
 
-#: builtin/merge.c:328
 msgid "stash failed"
 msgstr "zulalama başarısız oldu"
 
-#: builtin/merge.c:333
 #, c-format
 msgid "not a valid object: %s"
 msgstr "geçerli bir nesne değil: %s"
 
-#: builtin/merge.c:355 builtin/merge.c:372
 msgid "read-tree failed"
 msgstr "read-tree başarısız oldu"
 
-#: builtin/merge.c:403
 msgid "Already up to date. (nothing to squash)"
 msgstr "Tümü güncel (tıkıştırılacak bir şey yok)."
 
-#: builtin/merge.c:417
+msgid "Already up to date."
+msgstr "Tümü güncel."
+
 #, c-format
 msgid "Squash commit -- not updating HEAD\n"
 msgstr "Tıkıştırma işlemesi -- HEAD güncellenmiyor\n"
 
-#: builtin/merge.c:467
 #, c-format
 msgid "No merge message -- not updating HEAD\n"
 msgstr "Birleştirme iletisi yok -- HEAD güncellenmiyor\n"
 
-#: builtin/merge.c:517
 #, c-format
 msgid "'%s' does not point to a commit"
 msgstr "'%s' bir işlemeye işaret etmiyor"
 
-#: builtin/merge.c:605
 #, c-format
 msgid "Bad branch.%s.mergeoptions string: %s"
 msgstr "Hatalı branch.%s.mergeoptions dizisi: %s"
 
-#: builtin/merge.c:732
+msgid "Unable to write index."
+msgstr "İndeks yazılamıyor."
+
 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:745
 #, c-format
 msgid "unknown strategy option: -X%s"
 msgstr "bilinmeyen strateji seçeneği: -X%s"
 
-#: builtin/merge.c:764 t/helper/test-fast-rebase.c:223
 #, c-format
 msgid "unable to write %s"
 msgstr "%s yazılamıyor"
 
-#: builtin/merge.c:816
 #, c-format
 msgid "Could not read from '%s'"
 msgstr "Şu konumdan okunamadı: '%s'"
 
-#: builtin/merge.c:825
 #, 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:831
 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"
@@ -18562,11 +8079,9 @@ msgstr ""
 "girin, özellikle güncellenmiş bir üstkaynağı kişisel dala birleştiriyorsa.\n"
 "\n"
 
-#: builtin/merge.c:836
 msgid "An empty message aborts the commit.\n"
 msgstr "Boş bir ileti işlemeyi iptal eder.\n"
 
-#: builtin/merge.c:839
 #, c-format
 msgid ""
 "Lines starting with '%c' will be ignored, and an empty message aborts\n"
@@ -18575,72 +8090,60 @@ msgstr ""
 "'%c' ile başlayan satırlar yok sayılacaktır. Boş bir ileti işlemeyi\n"
 "iptal eder.\n"
 
-#: builtin/merge.c:900
 msgid "Empty commit message."
 msgstr "Boş işleme iletisi."
 
-#: builtin/merge.c:915
 #, c-format
 msgid "Wonderful.\n"
 msgstr "Harika.\n"
 
-#: builtin/merge.c:976
 #, 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:1015
 msgid "No current branch."
 msgstr "Geçerli dal yok."
 
-#: builtin/merge.c:1017
 msgid "No remote for the current branch."
 msgstr "Geçerli dal için uzak konum yok."
 
-#: builtin/merge.c:1019
 msgid "No default upstream defined for the current branch."
 msgstr "Geçerli dal için öntanımlı üstkaynak tanımlanmamış."
 
-#: builtin/merge.c:1024
 #, c-format
 msgid "No remote-tracking branch for %s from %s"
 msgstr "%s için %s konumundan uzak izleme dalı yok"
 
-#: builtin/merge.c:1081
 #, c-format
 msgid "Bad value '%s' in environment '%s'"
 msgstr "Hatalı değer '%s', '%s' ortamında"
 
-#: builtin/merge.c:1183
+#, c-format
+msgid "could not close '%s'"
+msgstr "'%s' kapatılamadı"
+
 #, 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:1217
 msgid "not something we can merge"
 msgstr "birleştirebileceğimiz bir şey değil"
 
-#: builtin/merge.c:1330
 msgid "--abort expects no arguments"
 msgstr "--abort bir argüman beklemez"
 
-#: builtin/merge.c:1334
 msgid "There is no merge to abort (MERGE_HEAD missing)."
 msgstr "İptal edilecek bir birleştirme yok (MERGE_HEAD eksik)."
 
-#: builtin/merge.c:1352
 msgid "--quit expects no arguments"
 msgstr "--quit bir argüman beklemez"
 
-#: builtin/merge.c:1365
 msgid "--continue expects no arguments"
 msgstr "--continue bir argüman beklemez"
 
-#: builtin/merge.c:1369
 msgid "There is no merge in progress (MERGE_HEAD missing)."
 msgstr "İlerlemekte olan bir birleştirme yok (MERGE_HEAD eksik)."
 
-#: builtin/merge.c:1385
 msgid ""
 "You have not concluded your merge (MERGE_HEAD exists).\n"
 "Please, commit your changes before you merge."
@@ -18648,7 +8151,6 @@ msgstr ""
 "Birleştirmenizi sonuçlandırmadınız (MERGE_HEAD mevcut).\n"
 "Lütfen birleştirmeden önce değişikliklerinizi işleyin."
 
-#: builtin/merge.c:1392
 msgid ""
 "You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists).\n"
 "Please, commit your changes before you merge."
@@ -18656,132 +8158,107 @@ msgstr ""
 "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:1395
 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:1427
 msgid "No commit specified and merge.defaultToUpstream not set."
 msgstr "Belirtilen bir işleme yok ve merge.defaultToUpstream ayarlanmamış."
 
-#: builtin/merge.c:1444
 msgid "Squash commit into empty head not supported yet"
 msgstr "İşlemeyi boş dal ucuna tıkıştırma henüz desteklenmiyor"
 
-#: builtin/merge.c:1446
 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:1451
 #, c-format
 msgid "%s - not something we can merge"
 msgstr "%s - birleştirebileceğimiz bir şey değil"
 
-#: builtin/merge.c:1453
 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:1540
 msgid "refusing to merge unrelated histories"
 msgstr "birbiriyle ilişkisi olmayan geçmişleri birleştirme reddediliyor"
 
-#: builtin/merge.c:1559
 #, c-format
 msgid "Updating %s..%s\n"
 msgstr "Güncelleniyor: %s..%s\n"
 
-#: builtin/merge.c:1606
 #, c-format
 msgid "Trying really trivial in-index merge...\n"
 msgstr "Gerçekten önemsiz indeks içi birleştirme deneniyor...\n"
 
-#: builtin/merge.c:1613
 #, c-format
 msgid "Nope.\n"
 msgstr "Yok.\n"
 
-#: builtin/merge.c:1671 builtin/merge.c:1737
 #, c-format
 msgid "Rewinding the tree to pristine...\n"
 msgstr "Ağaç bozulmamış durumuna geri sarılıyor...\n"
 
-#: builtin/merge.c:1675
 #, c-format
 msgid "Trying merge strategy %s...\n"
 msgstr "%s birleştirme stratejisi deneniyor...\n"
 
-#: builtin/merge.c:1727
 #, c-format
 msgid "No merge strategy handled the merge.\n"
 msgstr "Birleştirmeyi hiçbir birleştirme stratejisi işlemedi\n"
 
-#: builtin/merge.c:1729
 #, c-format
 msgid "Merge with strategy %s failed.\n"
 msgstr "%s stratejisi ile birleştirme başarısız oldu.\n"
 
-#: builtin/merge.c:1739
 #, 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:1753
 #, c-format
 msgid "Automatic merge went well; stopped before committing as requested\n"
 msgstr ""
 "Otomatik birleştirme iyi geçti; istendiği üzere gönderme öncesinde durdu.\n"
 
-#: builtin/mktag.c:27
 #, c-format
 msgid "warning: tag input does not pass fsck: %s"
 msgstr "uyarı: etiket girdisi fsck'den geçemiyor: %s"
 
-#: builtin/mktag.c:38
 #, c-format
 msgid "error: tag input does not pass fsck: %s"
 msgstr "hata: etiket girdisi fsck'den geçemiyor: %s"
 
-#: builtin/mktag.c:41
 #, c-format
 msgid "%d (FSCK_IGNORE?) should never trigger this callback"
 msgstr "%d (FSCK_IGNORE?) hiçbir zaman bu geri çağırmayı tetiklememeli"
 
-#: builtin/mktag.c:56
 #, c-format
 msgid "could not read tagged object '%s'"
 msgstr "etiketlenmiş nesne '%s' okunamadı"
 
-#: builtin/mktag.c:59
 #, c-format
 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
+msgid "could not read from stdin"
+msgstr "stdin'den okunamadı"
+
 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
 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
 msgid "unable to write tag file"
 msgstr "etiket dosyası yazılamıyor"
 
-#: builtin/mktree.c:154
 msgid "input is NUL terminated"
 msgstr "girdi NUL ile sonlandırıldı"
 
-#: builtin/mktree.c:155 builtin/write-tree.c:26
 msgid "allow missing objects"
 msgstr "eksik nesnelere izin ver"
 
-#: builtin/mktree.c:156
 msgid "allow creation of more than one tree"
 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>][--refs-"
 "snapshot=<path>]"
@@ -18789,43 +8266,36 @@ msgstr ""
 "git multi-pack-index [<seçenekler>] write [--preferred-pack=<paket>][--refs-"
 "snapshot=<yol>]"
 
-#: 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:17
 msgid "git multi-pack-index [<options>] expire"
 msgstr "git multi-pack-index [<seçenekler>] expire"
 
-#: 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:57
+msgid "directory"
+msgstr "dizin"
+
 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:98
 msgid "preferred-pack"
 msgstr "preferred-pack"
 
-#: 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: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:206
 msgid ""
 "during repack, collect pack-files of smaller size into a batch that is "
 "larger than this size"
@@ -18833,157 +8303,121 @@ msgstr ""
 "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/mv.c:18
 msgid "git mv [<options>] <source>... <destination>"
 msgstr "git mv [<seçenekler>] <kaynak>... <hedef>"
 
-#: builtin/mv.c:83
 #, c-format
 msgid "Directory %s is in index and no submodule?"
 msgstr "%s dizini indekste ve altmodül değil mi?"
 
-#: builtin/mv.c:85
 msgid "Please stage your changes to .gitmodules or stash them to proceed"
 msgstr ""
 "İlerlemek için lütfen değişikliklerinizi .gitmodules'e hazırlayın veya "
 "zulalayın"
 
-#: builtin/mv.c:103
 #, c-format
 msgid "%.*s is in index"
 msgstr "%.*s indekste"
 
-#: builtin/mv.c:125
 msgid "force move/rename even if target exists"
 msgstr "hedef var olsa bile zorla taşı/yeniden adlandır"
 
-#: builtin/mv.c:127
 msgid "skip move/rename errors"
 msgstr "taşı/yeniden adlandır hatalarını atla"
 
-#: builtin/mv.c:172
 #, c-format
 msgid "destination '%s' is not a directory"
 msgstr "'%s' hedefi bir dizin değil"
 
-#: 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:190
 msgid "bad source"
 msgstr "hatalı kaynak"
 
-#: builtin/mv.c:193
 msgid "can not move directory into itself"
 msgstr "dizin kendi içine taşınamıyor"
 
-#: builtin/mv.c:196
 msgid "cannot move directory over file"
 msgstr "dizin dosya üzerinden taşınamıyor"
 
-#: builtin/mv.c:205
 msgid "source directory is empty"
 msgstr "kaynak dizin boş"
 
-#: builtin/mv.c:231
 msgid "not under version control"
 msgstr "sürüm denetimi altında değil"
 
-#: builtin/mv.c:233
 msgid "conflicted"
 msgstr "çakışmalı"
 
-#: builtin/mv.c:236
 msgid "destination exists"
 msgstr "hedef mevcut"
 
-#: builtin/mv.c:244
 #, c-format
 msgid "overwriting '%s'"
 msgstr "üzerine yazılıyor: '%s'"
 
-#: builtin/mv.c:247
 msgid "Cannot overwrite"
 msgstr "Üzerine yazılamıyor"
 
-#: builtin/mv.c:250
 msgid "multiple sources for the same target"
 msgstr "aynı hedef için birden çok kaynak"
 
-#: builtin/mv.c:252
 msgid "destination directory does not exist"
 msgstr "hedef dizin mevcut değil"
 
-#: builtin/mv.c:280
 #, c-format
 msgid "%s, source=%s, destination=%s"
 msgstr "%s, kaynak=%s, hedef:%s"
 
-#: 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:314 builtin/remote.c:812 builtin/repack.c:861
 #, c-format
 msgid "renaming '%s' failed"
 msgstr "'%s' yeniden adlandırılamadı"
 
-#: builtin/name-rev.c:524
 msgid "git name-rev [<options>] <commit>..."
 msgstr "git name-rev [<seçenekler>] <işleme>..."
 
-#: builtin/name-rev.c:525
 msgid "git name-rev [<options>] --all"
 msgstr "git name-rev [<seçenekler>] --all"
 
-#: builtin/name-rev.c:526
 msgid "git name-rev [<options>] --annotate-stdin"
 msgstr "git name-rev [<seçenekler>] --annotate-stdin"
 
-#: builtin/name-rev.c:583
 msgid "print only ref-based names (no object names)"
 msgstr "yalnızca başvuru tabanlı adları yazdır (nesne adı yok)"
 
-#: builtin/name-rev.c:584
 msgid "only use tags to name the commits"
 msgstr "işlemeleri adlandırmak için yalnızca etiketleri kullan"
 
-#: builtin/name-rev.c:586
 msgid "only use refs matching <pattern>"
 msgstr "yalnızca <dizgi> ile eşleşen başvuruları kullan"
 
-#: builtin/name-rev.c:588
 msgid "ignore refs matching <pattern>"
 msgstr "<dizgi> ile eşleşen başvuruları yok say"
 
-#: builtin/name-rev.c:590
 msgid "list all commits reachable from all refs"
 msgstr "tüm başvurulardan ulaşılabilir olan tüm işlemeleri listele"
 
-#: builtin/name-rev.c:591
-msgid "deprecated: use annotate-stdin instead"
-msgstr "kullanılmıyor: Yerine annotate-stdin kullanın"
+msgid "deprecated: use --annotate-stdin instead"
+msgstr "kullanılmıyor: Yerine --annotate-stdin kullanın"
 
-#: builtin/name-rev.c:592
 msgid "annotate text from stdin"
 msgstr "metne stdin'den açıklama ekle"
 
-#: builtin/name-rev.c:593
 msgid "allow to print `undefined` names (default)"
 msgstr "'tanımlanmayan' adların yazdırılmasına izin ver (öntanımlı)"
 
-#: builtin/name-rev.c:599
 msgid "dereference tags in the input (internal use)"
 msgstr "girdide etiketlerin başvurularını kaldır (iç kullanım)"
 
-#: builtin/notes.c:28
 msgid "git notes [--ref <notes-ref>] [list [<object>]]"
 msgstr "git notes [--ref <not-bşvr>] [list [<nesne>]]"
 
-#: builtin/notes.c:29
 msgid ""
 "git notes [--ref <notes-ref>] add [-f] [--allow-empty] [-m <msg> | -F <file> "
 "| (-c | -C) <object>] [<object>]"
@@ -18991,11 +8425,9 @@ msgstr ""
 "git notes [--ref <not-bşvr>] add [-f] [--allow-empty] [-m <ileti> | -F "
 "<dosya> | (-c | -C) <nesne>] [<nesne>]"
 
-#: builtin/notes.c:30
 msgid "git notes [--ref <notes-ref>] copy [-f] <from-object> <to-object>"
 msgstr "git notes [--ref <not-bşvr>] copy [-f] <nesneden> <nesneye>"
 
-#: builtin/notes.c:31
 msgid ""
 "git notes [--ref <notes-ref>] append [--allow-empty] [-m <msg> | -F <file> | "
 "(-c | -C) <object>] [<object>]"
@@ -19003,139 +8435,106 @@ msgstr ""
 "git notes [--ref <not-bşvr>] append [--allow-empty] [-m <ileti> | -F <dosya> "
 "| (-c | -C) <nesne>] [<nesne>]"
 
-#: builtin/notes.c:32
 msgid "git notes [--ref <notes-ref>] edit [--allow-empty] [<object>]"
 msgstr "git notes [--ref <not-bşvr>] edit [--allow-empty] [<nesne>]"
 
-#: builtin/notes.c:33
 msgid "git notes [--ref <notes-ref>] show [<object>]"
 msgstr "git notes [--ref <not-bşvr>] show [<nesne>]"
 
-#: builtin/notes.c:34
 msgid ""
 "git notes [--ref <notes-ref>] merge [-v | -q] [-s <strategy>] <notes-ref>"
 msgstr ""
 "git notes [--ref <not-bşvr>] merge [-v | -q] [-s <strateji>] <not-bşvr>"
 
-#: builtin/notes.c:37
 msgid "git notes [--ref <notes-ref>] remove [<object>...]"
 msgstr "git notes [--ref <not-bşvr>] remove [<nesne>...]"
 
-#: builtin/notes.c:38
 msgid "git notes [--ref <notes-ref>] prune [-n] [-v]"
 msgstr "git notes [--ref <not-bşvr>] prune [-n] [-v]"
 
-#: builtin/notes.c:39
 msgid "git notes [--ref <notes-ref>] get-ref"
 msgstr "git notes [--ref <not-bşvr>] get-ref"
 
-#: builtin/notes.c:44
 msgid "git notes [list [<object>]]"
 msgstr "git notes [list [<nesne>]]"
 
-#: builtin/notes.c:49
 msgid "git notes add [<options>] [<object>]"
 msgstr "git notes add [<seçenekler>] [<nesne>]"
 
-#: builtin/notes.c:54
 msgid "git notes copy [<options>] <from-object> <to-object>"
 msgstr "git notes copy [<seçenekler>] <nesneden> <nesneye>"
 
-#: builtin/notes.c:55
 msgid "git notes copy --stdin [<from-object> <to-object>]..."
 msgstr "git notes copy --stdin [<nesneden> <nesneye>]..."
 
-#: builtin/notes.c:60
 msgid "git notes append [<options>] [<object>]"
 msgstr "git notes append [<seçenekler>] [<nesne>]"
 
-#: builtin/notes.c:65
 msgid "git notes edit [<object>]"
 msgstr "git notes edit [<nesne>]"
 
-#: builtin/notes.c:70
 msgid "git notes show [<object>]"
 msgstr "git notes show [<nesne>]"
 
-#: builtin/notes.c:75
 msgid "git notes merge [<options>] <notes-ref>"
 msgstr "git notes merge [<seçenekler>] <not-bşvr>"
 
-#: builtin/notes.c:76
 msgid "git notes merge --commit [<options>]"
 msgstr "git notes merge --commit [<seçenekler>]"
 
-#: builtin/notes.c:77
 msgid "git notes merge --abort [<options>]"
 msgstr "git notes merge --abort [<seçenekler>]"
 
-#: builtin/notes.c:82
 msgid "git notes remove [<object>]"
 msgstr "git notes remove [<nesne>]"
 
-#: builtin/notes.c:87
 msgid "git notes prune [<options>]"
 msgstr "git notes prune [<seçenekler>]"
 
-#: builtin/notes.c:97
 msgid "Write/edit the notes for the following object:"
 msgstr "Aşağıdaki nesneler için not yaz/düzenle:"
 
-#: builtin/notes.c:149
 #, c-format
 msgid "unable to start 'show' for object '%s'"
 msgstr "'%s' nesnesi için 'show' başlatılamıyor"
 
-#: builtin/notes.c:153
 msgid "could not read 'show' output"
 msgstr "'show' çıktısı okunamadı"
 
-#: builtin/notes.c:161
 #, c-format
 msgid "failed to finish 'show' for object '%s'"
 msgstr "'%s' nesnesi için 'show' bitirilemedi"
 
-#: builtin/notes.c:194
 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:203
 msgid "unable to write note object"
 msgstr "not nesnesi yazılamıyor"
 
-#: 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:240 builtin/tag.c:582
 #, c-format
 msgid "could not open or read '%s'"
 msgstr "'%s' açılamadı veya okunamadı"
 
-#: 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:263
 #, c-format
 msgid "failed to read object '%s'."
 msgstr "'%s' nesnesi okunamadı."
 
-#: 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:307
 #, c-format
 msgid "malformed input line: '%s'."
 msgstr "hatalı oluşturulmuş girdi satırı: '%s'"
 
-#: builtin/notes.c:322
 #, c-format
 msgid "failed to copy notes from '%s' to '%s'"
 msgstr "notlar '%s' konumundan '%s' konumuna kopyalanamadı"
@@ -19143,41 +8542,32 @@ msgstr "notlar '%s' konumundan '%s' konumuna kopyalanamadı"
 #. TRANSLATORS: the first %s will be replaced by a git
 #. notes command: 'add', 'merge', 'remove', etc.
 #.
-#: 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:387 builtin/notes.c:676
 #, c-format
 msgid "no note found for object %s."
 msgstr "%s nesnesi için not bulunamadı."
 
-#: builtin/notes.c:408 builtin/notes.c:574
 msgid "note contents as a string"
 msgstr "not içeriği dizi olarak"
 
-#: builtin/notes.c:411 builtin/notes.c:577
 msgid "note contents in a file"
 msgstr "not içeriği bir dosyada"
 
-#: 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:417 builtin/notes.c:583
 msgid "reuse specified note object"
 msgstr "belirtilen not nesnesini yeniden kullan"
 
-#: builtin/notes.c:420 builtin/notes.c:586
 msgid "allow storing empty note"
 msgstr "boş not depolamasına izin ver"
 
-#: 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:446
 #, c-format
 msgid ""
 "Cannot add notes. Found existing notes for object %s. Use '-f' to overwrite "
@@ -19186,29 +8576,23 @@ msgstr ""
 "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: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:473 builtin/notes.c:635 builtin/notes.c:904
 #, c-format
 msgid "Removing note for object %s\n"
 msgstr "%s nesnesi için olan not kaldırılıyor\n"
 
-#: builtin/notes.c:495
 msgid "read objects from stdin"
 msgstr "nesneleri stdin'den oku"
 
-#: 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:515
 msgid "too few arguments"
 msgstr "pek az argüman"
 
-#: builtin/notes.c:536
 #, c-format
 msgid ""
 "Cannot copy notes. Found existing notes for object %s. Use '-f' to overwrite "
@@ -19217,12 +8601,10 @@ msgstr ""
 "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: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:601
 #, c-format
 msgid ""
 "The -m/-F/-c/-C options have been deprecated for the 'edit' subcommand.\n"
@@ -19231,52 +8613,40 @@ msgstr ""
 "'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:696
 msgid "failed to delete ref NOTES_MERGE_PARTIAL"
 msgstr "NOTES_MERGE_PARTIAL başvurusu silinemedi"
 
-#: builtin/notes.c:698
 msgid "failed to delete ref NOTES_MERGE_REF"
 msgstr "NOTES_MERGE_REF başvurusu silinemedi"
 
-#: 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:720
 msgid "failed to read ref NOTES_MERGE_PARTIAL"
 msgstr "NOTES_MERGE_PARTIAL başvurusu okunamadı"
 
-#: builtin/notes.c:722
 msgid "could not find commit from NOTES_MERGE_PARTIAL."
 msgstr "işleme, NOTES_MERGE_PARTIAL ögesinden bulunamadı."
 
-#: 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:737
 msgid "failed to resolve NOTES_MERGE_REF"
 msgstr "NOTES_MERGE_REF çözülemedi"
 
-#: builtin/notes.c:740
 msgid "failed to finalize notes merge"
 msgstr "not birleştirilmesi tamamlanamadı"
 
-#: builtin/notes.c:766
 #, c-format
 msgid "unknown notes merge strategy %s"
 msgstr "bilinmeyen not birleştirme stratejisi %s"
 
-#: builtin/notes.c:782
 msgid "General options"
 msgstr "Genel seçenekler"
 
-#: builtin/notes.c:784
 msgid "Merge options"
 msgstr "Birleştirme seçenekleri"
 
-#: builtin/notes.c:786
 msgid ""
 "resolve notes conflicts using the given strategy (manual/ours/theirs/union/"
 "cat_sort_uniq)"
@@ -19284,46 +8654,36 @@ msgstr ""
 "not çakışmalarını verilen stratejiyi kullanarak çöz (el ile/bizimkionlarınki/"
 "birlik olmuş/cat_sort_uniq)"
 
-#: builtin/notes.c:788
 msgid "Committing unmerged notes"
 msgstr "Birleştirilmemiş notlar işleniyor"
 
-#: 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:792
 msgid "Aborting notes merge resolution"
 msgstr "Notlar birleştirmesi çözümü iptal ediliyor"
 
-#: builtin/notes.c:794
 msgid "abort notes merge"
 msgstr "not birleştirmesini iptal et"
 
-#: 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:810
 msgid "must specify a notes ref to merge"
 msgstr "birleştirmek için bir not başvurusu belirtilmeli"
 
-#: builtin/notes.c:834
 #, c-format
 msgid "unknown -s/--strategy: %s"
 msgstr "bilinmeyen -s/--strategy: %s"
 
-#: builtin/notes.c:874
 #, 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:878
 #, 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:880
 #, c-format
 msgid ""
 "Automatic notes merge failed. Fix conflicts in %s and commit the result with "
@@ -19334,59 +8694,47 @@ msgstr ""
 "çö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:899 builtin/tag.c:595
 #, c-format
 msgid "Failed to resolve '%s' as a valid ref."
 msgstr "'%s' geçerli bir başvuru olarak çözülemiyor"
 
-#: builtin/notes.c:902
 #, c-format
 msgid "Object %s has no note\n"
 msgstr "%s nesnesinin notu yok\n"
 
-#: builtin/notes.c:914
 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:917
 msgid "read object names from the standard input"
 msgstr "nesne adlarını standart girdi'den oku"
 
-#: builtin/notes.c:956 builtin/prune.c:144 builtin/worktree.c:148
 msgid "do not remove, show only"
 msgstr "kaldırma, yalnızca göster"
 
-#: builtin/notes.c:957
 msgid "report pruned notes"
 msgstr "budanmış notları kaldır"
 
-#: builtin/notes.c:1000
 msgid "notes-ref"
 msgstr "not başvurusu"
 
-#: builtin/notes.c:1001
 msgid "use notes from <notes-ref>"
 msgstr "notları <not-bşvr>'ndan kullan"
 
-#: builtin/notes.c:1036 builtin/stash.c:1802
 #, c-format
 msgid "unknown subcommand: %s"
 msgstr "bilinmeyen altkomut: %s"
 
-#: builtin/pack-objects.c:182
 msgid ""
 "git pack-objects --stdout [<options>...] [< <ref-list> | < <object-list>]"
 msgstr ""
 "git pack-objects --stdout [<seçenekler>...] [< <bşvr-liste> | < <nesne-"
 "liste>]"
 
-#: builtin/pack-objects.c:183
 msgid ""
 "git pack-objects [<options>...] <base-name> [< <ref-list> | < <object-list>]"
 msgstr ""
 "git pack-objects [<sçnklr>...] <base-name> [< <bşvr-liste> | < <nesne-liste>]"
 
-#: builtin/pack-objects.c:570
 #, c-format
 msgid ""
 "write_reuse_object: could not locate %s, expected at offset %<PRIuMAX> in "
@@ -19395,112 +8743,100 @@ msgstr ""
 "write_reuse_object: %s bulunamıyor, %<PRIuMAX> ofsetinde bekleniyordu (%s "
 "paketinde)"
 
-#: builtin/pack-objects.c:578
 #, c-format
 msgid "bad packed object CRC for %s"
 msgstr "%s için hatalı paketlenmiş nesne CRC'si"
 
-#: builtin/pack-objects.c:589
 #, c-format
 msgid "corrupt packed object for %s"
 msgstr "%s için hasar görmüş paketlenmiş nesne"
 
-#: builtin/pack-objects.c:720
 #, c-format
 msgid "recursive delta detected for object %s"
 msgstr "%s nesnesi için özyineli delta algılandı"
 
-#: builtin/pack-objects.c:939
 #, c-format
 msgid "ordered %u objects, expected %<PRIu32>"
 msgstr "%u nesne sipariş verildi, %<PRIu32> bekleniyordu"
 
-#: builtin/pack-objects.c:1034
 #, c-format
 msgid "expected object at offset %<PRIuMAX> in pack %s"
 msgstr "şu paketin %<PRIuMAX> ofsetinde nesne bekleniyordu: %s"
 
-#: builtin/pack-objects.c:1158
 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:1171
 msgid "Writing objects"
 msgstr "Nesneler yazılıyor"
 
-#: builtin/pack-objects.c:1243 builtin/update-index.c:90
 #, c-format
 msgid "failed to stat %s"
 msgstr "%s bilgileri alınamıyor"
 
-#: builtin/pack-objects.c:1276
+#, c-format
+msgid "failed utime() on %s"
+msgstr "%s üzerinde utime() başarısız"
+
 msgid "failed to write bitmap index"
 msgstr "biteşlem indeksi yazılamadı"
 
-#: builtin/pack-objects.c:1302
 #, c-format
 msgid "wrote %<PRIu32> objects while expecting %<PRIu32>"
 msgstr "%<PRIu32> nesne yazıldı (%<PRIu32> bekleniyordu)"
 
-#: builtin/pack-objects.c:1544
 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:1992
 #, 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:2001
 #, 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:2282
 msgid "Counting objects"
 msgstr "Nesneler sayılıyor"
 
-#: builtin/pack-objects.c:2447
+#, c-format
+msgid "unable to get size of %s"
+msgstr "%s boyutu alınamıyor"
+
 #, c-format
 msgid "unable to parse object header of %s"
 msgstr "%s nesne üstbilgisi ayrıştırılamıyor"
 
-#: builtin/pack-objects.c:2517 builtin/pack-objects.c:2533
-#: builtin/pack-objects.c:2543
 #, c-format
 msgid "object %s cannot be read"
 msgstr "%s nesnesi okunamıyor"
 
-#: builtin/pack-objects.c:2520 builtin/pack-objects.c:2547
 #, 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:2557
 msgid "suboptimal pack - out of memory"
 msgstr "standart altı paket - bellek yetersiz"
 
-#: builtin/pack-objects.c:2872
 #, 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:3011
 #, c-format
 msgid "unable to pack objects reachable from tag %s"
 msgstr "%s etiketinden ulaşılabilir nesneler paketlenemiyor"
 
-#: builtin/pack-objects.c:3097
+#, c-format
+msgid "unable to get type of object %s"
+msgstr "%s nesnesinin türü alınamıyor"
+
 msgid "Compressing objects"
 msgstr "Nesneler sıkıştırılıyor"
 
-#: builtin/pack-objects.c:3103
 msgid "inconsistency with delta count"
 msgstr "delta sayımında tutarsızlık"
 
-#: builtin/pack-objects.c:3182
 #, c-format
 msgid ""
 "value of uploadpack.blobpackfileuri must be of the form '<object-hash> <pack-"
@@ -19509,7 +8845,6 @@ msgstr ""
 "uploadpack.blobpackfileuri değeri '<nesne-sağlaması> <paket-sağlaması> <uri> "
 "biçiminde olmalıdır ('%s' alındı)"
 
-#: builtin/pack-objects.c:3185
 #, c-format
 msgid ""
 "object already configured in another uploadpack.blobpackfileuri (got '%s')"
@@ -19517,18 +8852,27 @@ msgstr ""
 "nesne halihazırda başka bir uploadpack.blobpackfileuri içinde yapılandırıldı "
 "('%s' alındı)"
 
-#: builtin/pack-objects.c:3220
 #, 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:3348 builtin/pack-objects.c:3359
-#: builtin/pack-objects.c:3373
 #, c-format
 msgid "could not find pack '%s'"
 msgstr "'%s' paketi bulunamadı"
 
-#: builtin/pack-objects.c:3416
+#, c-format
+msgid "packfile %s cannot be accessed"
+msgstr "paket dosyası %s erişilemedi"
+
+msgid "Enumerating cruft objects"
+msgstr "Süprüntü nesneler ortaya dökülüyor"
+
+msgid "unable to add cruft objects"
+msgstr "süprüntü nesneler eklenemiyor"
+
+msgid "Traversing cruft objects"
+msgstr "Süprüntü nesneler basamaklandırılıyor"
+
 #, c-format
 msgid ""
 "expected edge object ID, got garbage:\n"
@@ -19537,7 +8881,6 @@ msgstr ""
 "sınır nesnesi numarası bekleniyordu, anlamsız veri alındı:\n"
 " %s"
 
-#: builtin/pack-objects.c:3422
 #, c-format
 msgid ""
 "expected object ID, got garbage:\n"
@@ -19546,241 +8889,206 @@ msgstr ""
 "nesne numarası bekleniyordu, anlamsız veri alındı:\n"
 "%s"
 
-#: builtin/pack-objects.c:3540 builtin/pack-objects.c:3627
+msgid "could not load cruft pack .mtimes"
+msgstr "süprüntü paket .mtimes yüklenemedi"
+
 msgid "cannot open pack index"
 msgstr "paket indeksi açılamıyor"
 
-#: builtin/pack-objects.c:3549
 #, c-format
 msgid "loose object at %s could not be examined"
 msgstr "%s konumundaki gevşek nesne incelenemedi"
 
-#: builtin/pack-objects.c:3635
 msgid "unable to force loose object"
 msgstr "gevşek nesne zorlanamıyor"
 
-#: builtin/pack-objects.c:3763
 #, c-format
 msgid "not a rev '%s'"
 msgstr "bir revizyon değil: '%s'"
 
-#: builtin/pack-objects.c:3766 builtin/rev-parse.c:1061
 #, c-format
 msgid "bad revision '%s'"
 msgstr "hatalı revizyon: '%s'"
 
-#: builtin/pack-objects.c:3794
 msgid "unable to add recent objects"
 msgstr "en son nesneler eklenemiyor"
 
-#: builtin/pack-objects.c:3847
 #, c-format
 msgid "unsupported index version %s"
 msgstr "desteklenmeyen indeks sürümü %s"
 
-#: builtin/pack-objects.c:3851
 #, c-format
 msgid "bad index version '%s'"
 msgstr "hatalı indeks sürümü '%s'"
 
-#: builtin/pack-objects.c:3907
 msgid "<version>[,<offset>]"
 msgstr "<sürüm>[,<ofset>]"
 
-#: builtin/pack-objects.c:3908
 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:3911
 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:3913
 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:3915
 msgid "ignore packed objects"
 msgstr "paketlenmiş nesneleri yok say"
 
-#: builtin/pack-objects.c:3917
 msgid "limit pack window by objects"
 msgstr "paket penceresini nesnelerle sınırla"
 
-#: builtin/pack-objects.c:3919
 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:3921
 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:3923
 msgid "reuse existing deltas"
 msgstr "var olan deltaları yeniden kullan"
 
-#: builtin/pack-objects.c:3925
 msgid "reuse existing objects"
 msgstr "var olan nesneleri yeniden kullan"
 
-#: builtin/pack-objects.c:3927
 msgid "use OFS_DELTA objects"
 msgstr "OFS_DELTA nesneleri kullan"
 
-#: builtin/pack-objects.c:3929
 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:3931
 msgid "do not create an empty pack output"
 msgstr "boş bir paket çıktısı oluşturma"
 
-#: builtin/pack-objects.c:3933
 msgid "read revision arguments from standard input"
 msgstr "revizyon argümanlarını standart girdi'den oku"
 
-#: builtin/pack-objects.c:3935
 msgid "limit the objects to those that are not yet packed"
 msgstr "nesneleri henüz paketlenmeyenlere kısıtla"
 
-#: builtin/pack-objects.c:3938
 msgid "include objects reachable from any reference"
 msgstr "herhangi bir başvurudan ulaşılabilir olan nesneleri içer"
 
-#: builtin/pack-objects.c:3941
 msgid "include objects referred by reflog entries"
 msgstr "başvuru günlüğü tarafından başvurulan nesneleri içer"
 
-#: builtin/pack-objects.c:3944
 msgid "include objects referred to by the index"
 msgstr "indeks tarafından başvurulan nesneleri içer"
 
-#: builtin/pack-objects.c:3947
 msgid "read packs from stdin"
 msgstr "paketleri stdin'den oku"
 
-#: builtin/pack-objects.c:3949
 msgid "output pack to stdout"
 msgstr "paketi stdout'a çıktı ver"
 
-#: builtin/pack-objects.c:3951
 msgid "include tag objects that refer to objects to be packed"
 msgstr "paketlenecek nesnelere başvuran etiket nesnelerini içer"
 
-#: builtin/pack-objects.c:3953
 msgid "keep unreachable objects"
 msgstr "ulaşılamayan nesneleri tut"
 
-#: builtin/pack-objects.c:3955
 msgid "pack loose unreachable objects"
 msgstr "ulaşılamayan gevşek nesneleri paketle"
 
-#: builtin/pack-objects.c:3957
 msgid "unpack unreachable objects newer than <time>"
 msgstr "<zaman>'dan daha yeni ulaşılamayan nesneleri aç"
 
-#: builtin/pack-objects.c:3960
+msgid "create a cruft pack"
+msgstr "bir süprüntü paket oluştur"
+
+msgid "expire cruft objects older than <time>"
+msgstr "<zaman>'dan daha eski süprüntü nesneleri yürürlükten kaldır"
+
 msgid "use the sparse reachability algorithm"
 msgstr "aralıklı ulaşılabilirlik algoritmasını kullan"
 
-#: builtin/pack-objects.c:3962
 msgid "create thin packs"
 msgstr "ince paketler oluştur"
 
-#: builtin/pack-objects.c:3964
 msgid "create packs suitable for shallow fetches"
 msgstr "sığ getirmelere uygun paketler oluştur"
 
-#: builtin/pack-objects.c:3966
 msgid "ignore packs that have companion .keep file"
 msgstr "eşlik eden .keep dosyasına iye paketleri yok say"
 
-#: builtin/pack-objects.c:3968
 msgid "ignore this pack"
 msgstr "bu paketi yok say"
 
-#: builtin/pack-objects.c:3970
 msgid "pack compression level"
 msgstr "paket sıkıştırma düzeyi"
 
-#: builtin/pack-objects.c:3972
 msgid "do not hide commits by grafts"
 msgstr "aşılarla gelen işlemeleri gizleme"
 
-#: builtin/pack-objects.c:3974
 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:3976
 msgid "write a bitmap index together with the pack index"
 msgstr "paket indeksiyle birlikte bir biteşlem indeksi de yaz"
 
-#: builtin/pack-objects.c:3980
 msgid "write a bitmap index if possible"
 msgstr "eğer olanaklıysa bir biteşlem indeksi yaz"
 
-#: builtin/pack-objects.c:3984
 msgid "handling for missing objects"
 msgstr "eksik nesneler için işlem"
 
-#: builtin/pack-objects.c:3987
 msgid "do not pack objects in promisor packfiles"
 msgstr "nesneleri vaatçi paket dosyalarıyla paketleme"
 
-#: builtin/pack-objects.c:3989
 msgid "respect islands during delta compression"
 msgstr "delta sıkıştırması sırasında adalara uy"
 
-#: builtin/pack-objects.c:3991
 msgid "protocol"
 msgstr "protokol"
 
-#: builtin/pack-objects.c:3992
 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:4027
 #, 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:4032
 #, c-format
 msgid "pack.deltaCacheLimit is too high, forcing %d"
 msgstr "pack.deltaCacheLimit çok yüksek, %d zorlanıyor"
 
-#: builtin/pack-objects.c:4088
+#, c-format
+msgid "bad pack compression level %d"
+msgstr "hatalı paket sıkıştırma düzeyi %d"
+
 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:4090
 msgid "minimum pack size limit is 1 MiB"
 msgstr "olabilecek en küçük paket boyutu limiti 1 MiB'dır"
 
-#: builtin/pack-objects.c:4095
 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
 msgid "cannot use --filter without --stdout"
 msgstr "--filter, --stdout olmadan kullanılamaz"
 
-#: builtin/pack-objects.c:4106
 msgid "cannot use --filter with --stdin-packs"
 msgstr "--filter, --stdin-packs ile birlikte kullanılamıyor"
 
-#: builtin/pack-objects.c:4110
 msgid "cannot use internal rev list with --stdin-packs"
 msgstr "iç revizyon listeleri, --stdin-packs ile birlikte kullanılamıyor"
 
-#: builtin/pack-objects.c:4169
+msgid "cannot use internal rev list with --cruft"
+msgstr "iç revizyon listeleri, --cruft ile birlikte kullanılamıyor"
+
+msgid "cannot use --stdin-packs with --cruft"
+msgstr "--stdin-packs, --cruft ile birlikte kullanılamıyor"
+
+msgid "cannot use --max-pack-size with --cruft"
+msgstr "--max-pack-size, --cruft ile birlikte kullanılamıyor"
+
 msgid "Enumerating objects"
 msgstr "Nesneler ortaya dökülüyor"
 
-#: builtin/pack-objects.c:4210
 #, c-format
 msgid ""
 "Total %<PRIu32> (delta %<PRIu32>), reused %<PRIu32> (delta %<PRIu32>), pack-"
@@ -19789,7 +9097,6 @@ msgstr ""
 "Toplam %<PRIu32> (delta %<PRIu32>), yeniden kullanılan %<PRIu32> (delta "
 "%<PRIu32>), yeniden kullanılan paket %<PRIu32>"
 
-#: builtin/pack-redundant.c:601
 msgid ""
 "'git pack-redundant' is nominated for removal.\n"
 "If you still use this command, please add an extra\n"
@@ -19804,92 +9111,71 @@ msgstr ""
 "<git@vger.kernel.org> adresine bir e-posta atarak\n"
 "bize haber verin. Sağ olun.\n"
 
-#: builtin/pack-refs.c:8
 msgid "git pack-refs [<options>]"
 msgstr "git pack-refs [<seçenekler>]"
 
-#: builtin/pack-refs.c:16
 msgid "pack everything"
 msgstr "her şeyi paketle"
 
-#: builtin/pack-refs.c:17
 msgid "prune loose refs (default)"
 msgstr "gevşek başvuruları buda (öntanımlı)"
 
-#: builtin/prune.c:14
 msgid "git prune [-n] [-v] [--progress] [--expire <time>] [--] [<head>...]"
 msgstr ""
 "git prune [-n] [-v] [--progress] [--expire <zaman>] [--] [<dal-ucu>...]"
 
-#: builtin/prune.c:145
 msgid "report pruned objects"
 msgstr "budanmış nesneleri bildir"
 
-#: builtin/prune.c:148
 msgid "expire objects older than <time>"
 msgstr "<zaman>'dan daha eski nesnelerin hükmünü kaldır"
 
-#: builtin/prune.c:150
 msgid "limit traversal to objects outside promisor packfiles"
 msgstr "promisor paket dosyalarının dışındaki nesnelere taramayı kısıtla"
 
-#: builtin/prune.c:163
 msgid "cannot prune in a precious-objects repo"
 msgstr "bir precious-objects deposu içinde budama yapılamıyor"
 
-#: builtin/pull.c:67
 msgid "git pull [<options>] [<repository> [<refspec>...]]"
 msgstr "git pull [<seçenekler>] [<depo> [<bşvr-blrtç>...]]"
 
-#: builtin/pull.c:124
 msgid "control for recursive fetching of submodules"
 msgstr "altmodüllerin özyineli getirilmesi için denetleme"
 
-#: builtin/pull.c:128
 msgid "Options related to merging"
 msgstr "Birleştirme ile ilgili seçenekler"
 
-#: 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:159 builtin/revert.c:126
 msgid "allow fast-forward"
 msgstr "ileri sarıma izin ver"
 
-#: 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:371
 msgid "automatically stash/stash pop before and after"
 msgstr "öncesinde ve sonrasında kendiliğinden zulala/zulaları patlat"
 
-#: builtin/pull.c:187
 msgid "Options related to fetching"
 msgstr "Getirme ile ilgili seçenekler"
 
-#: builtin/pull.c:197
 msgid "force overwrite of local branch"
 msgstr "zorla yerel dalın üzerine yaz"
 
-#: builtin/pull.c:205
 msgid "number of submodules pulled in parallel"
 msgstr "paralelde çekilen altmodüllerin sayısı"
 
-#: 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: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:452
 msgid ""
 "Generally this means that you provided a wildcard refspec which had no\n"
 "matches on the remote end."
@@ -19897,7 +9183,6 @@ msgstr ""
 "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:455
 #, c-format
 msgid ""
 "You asked to pull from the remote '%s', but did not specify\n"
@@ -19908,44 +9193,33 @@ msgstr ""
 "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:460 builtin/rebase.c:978
 msgid "You are not currently on a branch."
 msgstr "Şu anda bir dal üzerinde değilsiniz."
 
-#: 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: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:465 builtin/pull.c:480
 msgid "See git-pull(1) for details."
 msgstr "Ayrıntılar için: git-pull(1)"
 
-#: builtin/pull.c:467 builtin/pull.c:473 builtin/pull.c:482
-#: builtin/rebase.c:984
 msgid "<remote>"
 msgstr "<uzak-konum>"
 
-#: builtin/pull.c:467 builtin/pull.c:482 builtin/pull.c:487
-#: contrib/scalar/scalar.c:374
 msgid "<branch>"
 msgstr "<dal>"
 
-#: builtin/pull.c:475 builtin/rebase.c:976
 msgid "There is no tracking information for the current branch."
 msgstr "Geçerli dal için izleme bilgisi yok."
 
-#: 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:489
 #, c-format
 msgid ""
 "Your configuration specifies to merge with the ref '%s'\n"
@@ -19954,16 +9228,13 @@ msgstr ""
 "Yapılandırmanız uzak konumdan '%s' başvurusu ile birleştirmeyi belirtiyor,\n"
 "ancak böyle bir başvuru getirilmedi."
 
-#: builtin/pull.c:600
 #, c-format
 msgid "unable to access commit %s"
 msgstr "%s işlemesine erişilemedi"
 
-#: builtin/pull.c:908
 msgid "ignoring --verify-signatures for rebase"
 msgstr "yeniden temellendirme için --verify-signatures yok sayılıyor"
 
-#: builtin/pull.c:969
 msgid ""
 "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"
@@ -19992,19 +9263,15 @@ msgstr ""
 "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:1047
 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:1051
 msgid "pull with rebase"
 msgstr "yeniden temellendirme ile çekim"
 
-#: builtin/pull.c:1052
 msgid "please commit or stash them."
 msgstr "Lütfen onları işleyin veya zulalayın."
 
-#: builtin/pull.c:1077
 #, c-format
 msgid ""
 "fetch updated the current branch head.\n"
@@ -20015,7 +9282,6 @@ msgstr ""
 "Çalışma ağacınız %s işlemesinden\n"
 "ileri sarılıyor."
 
-#: builtin/pull.c:1083
 #, c-format
 msgid ""
 "Cannot fast-forward your working tree.\n"
@@ -20032,50 +9298,51 @@ msgstr ""
 "$ git reset --hard\n"
 "komutunu çalıştırın."
 
-#: builtin/pull.c:1098
 msgid "Cannot merge multiple branches into empty head."
 msgstr "Boş dal ucuna birden çok dal birleştirilemez."
 
-#: builtin/pull.c:1103
 msgid "Cannot rebase onto multiple branches."
 msgstr "Birden çok dala yeniden temellendirme yapılamaz."
 
-#: builtin/pull.c:1105
 msgid "Cannot fast-forward to multiple branches."
 msgstr "Birden çok dala ileri sarım yapılamaz."
 
-#: builtin/pull.c:1120
 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:1134
 msgid "cannot rebase with locally recorded submodule modifications"
 msgstr ""
 "yerelde kaydı yazılmış altmodül değişiklikleriyle yeniden temellendirme "
 "yapılamaz"
 
-#: builtin/push.c:19
 msgid "git push [<options>] [<repository> [<refspec>...]]"
 msgstr "git push [<seçenekler>] [<depo> [<bşvr-blrtç>...]]"
 
-#: builtin/push.c:111
 msgid "tag shorthand without <tag>"
 msgstr "stenografiyi <etiket> olmadan etiketle"
 
-#: builtin/push.c:119
 msgid "--delete only accepts plain target ref names"
 msgstr "--delete yalnızca düz hedef başvuru adlarını kabul eder"
 
-#: builtin/push.c:164
 msgid ""
 "\n"
-"To choose either option permanently, see push.default in 'git help config'."
+"To choose either option permanently, see push.default in 'git help config'.\n"
 msgstr ""
 "\n"
-"Bu seçeneklerden birini kalıcı olarak seçmek için 'git help config' içinde "
-"push.default girdisine bakın."
+"Bir seçeneği kalıcı seçmek için 'git help config' içinde bkz. push.default.\n"
+
+msgid ""
+"\n"
+"To avoid automatically configuring upstream branches when their name\n"
+"doesn't match the local branch, see option 'simple' of branch."
+"autoSetupMerge\n"
+"in 'git help config'.\n"
+msgstr ""
+"\n"
+"Yerel dal ile adı eşleşmeyen uzak dalları kendiliğinden\n"
+"yapılandırmaktan kaçınmak için, 'git help config' içinde\n"
+"branch.autoSetupMerge'ün 'simple' seçeneğine bakın.\n"
 
-#: builtin/push.c:167
 #, c-format
 msgid ""
 "The upstream branch of your current branch does not match\n"
@@ -20087,19 +9354,18 @@ msgid ""
 "To push to the branch of the same name on the remote, use\n"
 "\n"
 "    git push %s HEAD\n"
-"%s"
+"%s%s"
 msgstr ""
 "Geçerli dalınızın üstkaynak dalı, geçerli dalınızın adıyla\n"
-"eşleşmiyor. Uzak konumdaki üstkaynağa gitmek için şunu kullanın:\n"
+"eşleşmiyor. Uzak konumdaki üstkaynağa itmek için şunu kullanın:\n"
 "\n"
-"\tgit push %s HEAD:%s\n"
+"    git push %s HEAD:%s\n"
 "\n"
 "Uzak konumdaki aynı adlı dala itmek içinse şunu kullanın:\n"
 "\n"
-"\tgit push %s HEAD\n"
-"%s"
+"    git push %s HEAD\n"
+"%s%s"
 
-#: builtin/push.c:182
 #, c-format
 msgid ""
 "You are not currently on a branch.\n"
@@ -20114,32 +9380,39 @@ msgstr ""
 "\n"
 "\tgit push %s HEAD:<uzak-konum-dalının-adı>\n"
 
-#: builtin/push.c:191
+msgid ""
+"\n"
+"To have this happen automatically for branches without a tracking\n"
+"upstream, see 'push.autoSetupRemote' in 'git help config'.\n"
+msgstr ""
+"\n"
+"Bunun, izleyen bir üstkaynağı olmayan dallarda kendiliğinden\n"
+"olması için, 'git help config' içinde 'push.autoSetupRemote'a bakın.\n"
+
 #, c-format
 msgid ""
 "The current branch %s has no upstream branch.\n"
 "To push the current branch and set the remote as upstream, use\n"
 "\n"
 "    git push --set-upstream %s %s\n"
+"%s"
 msgstr ""
 "Geçerli %s dalının bir üstkaynak dalı yok.\n"
 "Geçerli dalı itmek ve uzak konumu üstkaynak olarak ayarlamak\n"
 "için şunu kullanın:\n"
 "\n"
-"\tgit push --set-upstream %s %s\n"
+"    git push --set-upstream %s %s\n"
+"%s"
 
-#: builtin/push.c:199
 #, c-format
 msgid "The current branch %s has multiple upstream branches, refusing to push."
 msgstr "Geçerli %s dalının birden çok üstkaynağı var, itme reddediliyor."
 
-#: builtin/push.c:217
 msgid ""
 "You didn't specify any refspecs to push, and push.default is \"nothing\"."
 msgstr ""
 "İtmek için bir başvuru belirteci belirtmediniz ve push.default \"nothing\"."
 
-#: builtin/push.c:243
 #, c-format
 msgid ""
 "You are pushing to remote '%s', which is not the upstream of\n"
@@ -20150,7 +9423,6 @@ msgstr ""
 "itileceğini belirtmeden itiyorsunuz; ancak o geçerli '%s'\n"
 "dalınızın üstkaynağı değil."
 
-#: 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"
@@ -20163,7 +9435,6 @@ msgstr ""
 "Ayrıntılar için 'git push --help' içinde 'Notes about fast-forwards'a\n"
 "bakın."
 
-#: 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"
@@ -20176,7 +9447,6 @@ msgstr ""
 "...'). Ayrıntılar için 'git push --help' içinde 'Notes about\n"
 "fast-forwards'a bakın."
 
-#: 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"
@@ -20191,11 +9461,9 @@ msgstr ""
 "Ayrıntılar için 'git push --help' içinde 'Notes about fast-forwards'a\n"
 "bakın."
 
-#: builtin/push.c:277
 msgid "Updates were rejected because the tag already exists in the remote."
 msgstr "Güncellemeler reddedildi; çünkü etiket uzak konumda halihazırda var."
 
-#: 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"
@@ -20205,7 +9473,6 @@ msgstr ""
 "veya --force seçeneğini kullanmadan bir uzak başvuruyu işlemesi\n"
 "olmayan bir nesneye işaret etmesini sağlaması için güncelleyemezsiniz.\n"
 
-#: 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"
@@ -20217,99 +9484,79 @@ msgstr ""
 "önce bu değişiklikleri yerel olarak entegre etmek isteye-\n"
 "bilirsiniz (örn. 'git pull ...'\n"
 
-#: builtin/push.c:355
 #, c-format
 msgid "Pushing to %s\n"
 msgstr "İtme konumu: %s\n"
 
-#: builtin/push.c:362
 #, c-format
 msgid "failed to push some refs to '%s'"
 msgstr "bazı başvurular '%s' konumuna itilemedi"
 
-#: builtin/push.c:544 builtin/submodule--helper.c:3377
+#, c-format
+msgid "invalid value for '%s'"
+msgstr "'%s' için geçersiz değer"
+
 msgid "repository"
 msgstr "depo"
 
-#: 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:195
 msgid "mirror all refs"
 msgstr "tüm başvuruları yansıla"
 
-#: builtin/push.c:548
 msgid "delete refs"
 msgstr "başvuruları sil"
 
-#: builtin/push.c:549
 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:196
 msgid "force updates"
 msgstr "zorla güncelle"
 
-#: builtin/push.c:553 builtin/send-pack.c:208
 msgid "<refname>:<expect>"
 msgstr "<başvuruadı>:<bekle>"
 
-#: 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:212
 msgid "require remote updates to be integrated locally"
 msgstr "uzak güncellemelerin yerele entegre edilmesini gerektir"
 
-#: builtin/push.c:560
 msgid "control recursive pushing of submodules"
 msgstr "altmodüllerin özyineli itilmesini denetle"
 
-#: 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:190
-#: builtin/send-pack.c:191
 msgid "receive pack program"
 msgstr "paket programını al"
 
-#: builtin/push.c:564
 msgid "set upstream for git pull/status"
 msgstr "git pull/status için üstkaynak ayarla"
 
-#: builtin/push.c:567
 msgid "prune locally removed refs"
 msgstr "yerelde kaldırılan başvuruları buda"
 
-#: builtin/push.c:569
 msgid "bypass pre-push hook"
 msgstr "pre-push kancasını atla"
 
-#: builtin/push.c:570
 msgid "push missing but relevant tags"
 msgstr "eksik; ancak ilgili etiketleri it"
 
-#: 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:204
 msgid "request atomic transaction on remote side"
 msgstr "uzak tarafta atomsal işlem iste"
 
-#: builtin/push.c:594
 msgid "--delete doesn't make sense without any refs"
 msgstr "--delete bir başvuru olmadan anlam ifade etmiyor"
 
-#: builtin/push.c:614
 #, c-format
 msgid "bad repository '%s'"
 msgstr "hatalı depo '%s'"
 
-#: builtin/push.c:615
 msgid ""
 "No configured push destination.\n"
 "Either specify the URL from the command-line or configure a remote "
@@ -20331,65 +9578,50 @@ msgstr ""
 "\n"
 "\tgit push <ad>\n"
 
-#: builtin/push.c:632
 msgid "--all can't be combined with refspecs"
 msgstr "--all başvuru belirteçleriyle birleştirilemez"
 
-#: builtin/push.c:638
 msgid "--mirror can't be combined with refspecs"
 msgstr "--mirror başvuru belirteçleriyle birleştirilemez"
 
-#: builtin/push.c:648
 msgid "push options must not have new line characters"
 msgstr "itme seçeneklerinde yeni satır karakterleri olmamalı"
 
-#: builtin/range-diff.c:9
 msgid "git range-diff [<options>] <old-base>..<old-tip> <new-base>..<new-tip>"
 msgstr ""
 "git range-diff [<seçenekler>] <old-base>..<old-tip> <new-base>..<new-tip>"
 
-#: builtin/range-diff.c:10
 msgid "git range-diff [<options>] <old-tip>...<new-tip>"
 msgstr "git range-diff [<seçenekler>] <old-tip>...<new-tip>"
 
-#: builtin/range-diff.c:11
 msgid "git range-diff [<options>] <base> <old-tip> <new-tip>"
 msgstr "git range-diff [<seçenekler>] <base> <old-tip> <new-tip>"
 
-#: builtin/range-diff.c:30
 msgid "use simple diff colors"
 msgstr "yalın diff renklerini kullan"
 
-#: builtin/range-diff.c:32
 msgid "notes"
 msgstr "notlar"
 
-#: builtin/range-diff.c:32
 msgid "passed to 'git log'"
 msgstr "'git log'a aktarıldı"
 
-#: builtin/range-diff.c:35
 msgid "only emit output related to the first range"
 msgstr "yalnızca ilk erimle ilişkili çıktıyı yay"
 
-#: builtin/range-diff.c:37
 msgid "only emit output related to the second range"
 msgstr "yalnızca ikinci erimle ilişkili çıktıyı yay"
 
-#: builtin/range-diff.c:60 builtin/range-diff.c:64
 #, c-format
 msgid "not a commit range: '%s'"
 msgstr "bir işleme erimi değil: '%s'"
 
-#: builtin/range-diff.c:74
 msgid "single arg format must be symmetric range"
 msgstr "tekli argüman biçimi simetrik erim olmalı"
 
-#: builtin/range-diff.c:89
 msgid "need two commit ranges"
 msgstr "iki işleme erimi gerekli"
 
-#: builtin/read-tree.c:41
 msgid ""
 "git read-tree [(-m [--trivial] [--aggressive] | --reset | --prefix=<prefix>) "
 "[-u | -i]] [--no-sparse-checkout] [--index-output=<file>] (--empty | <tree-"
@@ -20399,79 +9631,60 @@ msgstr ""
 "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:116
 msgid "write resulting index to <file>"
 msgstr "ortaya çıkan indeksi <dosya>'ya yaz"
 
-#: builtin/read-tree.c:119
 msgid "only empty the index"
 msgstr "yalnızca indeksi boşalt"
 
-#: builtin/read-tree.c:121
 msgid "Merging"
 msgstr "Birleştiriliyor"
 
-#: 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: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: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:129
 msgid "same as -m, but discard unmerged entries"
 msgstr "-m ile aynı; ancak birleştirilmeyen girdileri atar"
 
-#: builtin/read-tree.c:130
 msgid "<subdirectory>/"
 msgstr "<altdizin>/"
 
-#: 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:134
 msgid "update working tree with merge result"
 msgstr "birleştirme sonucuyla çalışma ağacını güncelleştir"
 
-#: builtin/read-tree.c:136
 msgid "gitignore"
 msgstr "gitignore"
 
-#: 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:140
 msgid "don't check the working tree after merging"
 msgstr "birleştirmeden sonra çalışma ağacını denetleme"
 
-#: 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:143
 msgid "skip applying sparse checkout filter"
 msgstr "aralıklı çıkış süzgeci uygulamayı atla"
 
-#: builtin/read-tree.c:145
 msgid "debug unpack-trees"
 msgstr "unpack-trees hatalarını ayıkla"
 
-#: builtin/read-tree.c:149
 msgid "suppress feedback messages"
 msgstr "geribildirim iletilerini gizle"
 
-#: builtin/read-tree.c:190
 msgid "You need to resolve your current index first"
 msgstr "Öncelikle geçerli indeksinizi çözmelisiniz"
 
-#: builtin/rebase.c:36
 msgid ""
 "git rebase [-i] [options] [--exec <cmd>] [--onto <newbase> | --keep-base] "
 "[<upstream> [<branch>]]"
@@ -20479,51 +9692,49 @@ msgstr ""
 "git rebase [-i] [options] [--exec <komut>] [--onto <yeni-temel> | --keep-"
 "base] [<üstkaynak> [<dal>]]"
 
-#: builtin/rebase.c:38
 msgid ""
 "git rebase [-i] [options] [--exec <cmd>] [--onto <newbase>] --root [<branch>]"
 msgstr ""
 "git rebase [-i] [options] [--exec <komut>] [--onto <yeni-temel>] --root "
 "[<dal>]"
 
-#: builtin/rebase.c:231
+#, c-format
+msgid "could not read '%s'."
+msgstr "'%s' okunamadı."
+
 #, c-format
 msgid "could not create temporary %s"
 msgstr "geçici %s oluşturulamadı"
 
-#: builtin/rebase.c:237
 msgid "could not mark as interactive"
 msgstr "etkileşimli olarak imlenemedi"
 
-#: builtin/rebase.c:290
 msgid "could not generate todo list"
 msgstr "yapılacaklar listesi oluşturulamadı"
 
-#: builtin/rebase.c:332
 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:391
 #, c-format
 msgid "%s requires the merge backend"
 msgstr "%s birleştirme arka ucunu gerektiriyor"
 
-#: builtin/rebase.c:433
 #, c-format
 msgid "could not get 'onto': '%s'"
 msgstr "'onto' alınamadı: '%s'"
 
-#: builtin/rebase.c:450
 #, c-format
 msgid "invalid orig-head: '%s'"
 msgstr "geçersiz orig-head: '%s'"
 
-#: builtin/rebase.c:475
 #, c-format
 msgid "ignoring invalid allow_rerere_autoupdate: '%s'"
 msgstr "geçersiz allow_rerere_autoupdate yok sayılıyor: '%s'"
 
-#: builtin/rebase.c:600
+#, c-format
+msgid "could not remove '%s'"
+msgstr "'%s' kaldırılamadı"
+
 msgid ""
 "Resolve all conflicts manually, mark them as resolved with\n"
 "\"git add/rm <conflicted_files>\", then run \"git rebase --continue\".\n"
@@ -20537,7 +9748,6 @@ msgstr ""
 "--skip\" yapın. İptal edip \"git rebase\" öncesine geri dönmek için\n"
 "\"git rebase --abort\" çalıştırın."
 
-#: builtin/rebase.c:685
 #, c-format
 msgid ""
 "\n"
@@ -20556,12 +9766,10 @@ msgstr ""
 "\n"
 "Bunun sonucu olarak git onları yeniden temellendiremiyor."
 
-#: builtin/rebase.c:836
 #, c-format
 msgid "could not switch to %s"
 msgstr "şuraya geçilemedi: %s"
 
-#: builtin/rebase.c:952
 #, c-format
 msgid ""
 "unrecognized empty type '%s'; valid values are \"drop\", \"keep\", and \"ask"
@@ -20569,7 +9777,6 @@ msgid ""
 msgstr ""
 "Tanımlanamayan boş tür '%s'; geçerli türler: \"drop\", \"keep\" ve \"ask\"."
 
-#: builtin/rebase.c:970
 #, c-format
 msgid ""
 "%s\n"
@@ -20586,7 +9793,6 @@ msgstr ""
 "\tgit rebase '<dal>'\n"
 "\n"
 
-#: builtin/rebase.c:986
 #, c-format
 msgid ""
 "If you wish to set tracking information for this branch you can do so with:\n"
@@ -20599,187 +9805,159 @@ msgstr ""
 "\tgit branch --set-upstream-to=%s/<dal> %s\n"
 "\n"
 
-#: builtin/rebase.c:1016
 msgid "exec commands cannot contain newlines"
 msgstr "'exec' komutları yenisatırlar içeremez"
 
-#: builtin/rebase.c:1020
 msgid "empty exec command"
 msgstr "boş 'exec' komutu"
 
-#: builtin/rebase.c:1051
 msgid "rebase onto given branch instead of upstream"
 msgstr "üstkaynak yerine verilen dalın üzerine yeniden temellendir"
 
-#: builtin/rebase.c:1053
 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:1055
 msgid "allow pre-rebase hook to run"
 msgstr "pre-rebase kancasının çalışmasına izin ver"
 
-#: builtin/rebase.c:1057
 msgid "be quiet. implies --no-stat"
 msgstr "sessiz ol (--no-stat ima eder)"
 
-#: builtin/rebase.c:1060
 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:1063
 msgid "do not show diffstat of what changed upstream"
 msgstr "üstkaynakta nelerin değiştiğini gösteren diffstat gösterme"
 
-#: builtin/rebase.c:1066
 msgid "add a Signed-off-by trailer to each commit"
 msgstr "her işlemeye bir Signed-off-by artbilgisi ekle"
 
-#: builtin/rebase.c:1069
 msgid "make committer date match author date"
 msgstr "işleyici tarihi ile yazar tarihini aynı yap"
 
-#: builtin/rebase.c:1071
 msgid "ignore author date and use current date"
 msgstr "yazar tarihini yok say ve geçerli tarihi kullan"
 
-#: builtin/rebase.c:1073
 msgid "synonym of --reset-author-date"
 msgstr "--reset-author-date eşanlamlısı"
 
-#: builtin/rebase.c:1075 builtin/rebase.c:1079
 msgid "passed to 'git apply'"
 msgstr "'git apply'a aktarıldı"
 
-#: builtin/rebase.c:1077
 msgid "ignore changes in whitespace"
 msgstr "boşluk değişikliklerini yok say"
 
-#: builtin/rebase.c:1081 builtin/rebase.c:1084
 msgid "cherry-pick all commits, even if unchanged"
 msgstr "değiştirilmemiş olsa bile tüm işlemeleri seç-al yap"
 
-#: builtin/rebase.c:1086
 msgid "continue"
 msgstr "sürdür"
 
-#: builtin/rebase.c:1089
 msgid "skip current patch and continue"
 msgstr "geçerli yamayı atla ve sürdür"
 
-#: builtin/rebase.c:1091
 msgid "abort and check out the original branch"
 msgstr "iptal et ve orijinal dalı çıkış yap"
 
-#: builtin/rebase.c:1094
 msgid "abort but keep HEAD where it is"
 msgstr "iptal et; ancak HEAD'i olduğu yerde bırak"
 
-#: builtin/rebase.c:1095
 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:1098
 msgid "show the patch file being applied or merged"
 msgstr "yama dosyası uygulanırken veya birleştirilirken göster"
 
-#: builtin/rebase.c:1101
 msgid "use apply strategies to rebase"
 msgstr "yeniden temellendirmek için \"apply\" stratejilerini kullan"
 
-#: builtin/rebase.c:1105
 msgid "use merging strategies to rebase"
 msgstr "yeniden temellendirmek için birleştirme stratejilerini kullan"
 
-#: builtin/rebase.c:1109
 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:1113
-msgid "(DEPRECATED) try to recreate merges instead of ignoring them"
+msgid "(REMOVED) was: try to recreate merges instead of ignoring them"
 msgstr ""
-"(KULLANILMAMALI) birleştirmeleri yok saymak yerine onları yeniden "
+"şu (KALDIRILDI): Birleştirmeleri yok saymak yerine onları yeniden "
 "oluşturmaya çalış"
 
-#: builtin/rebase.c:1118
 msgid "how to handle commits that become empty"
 msgstr "boşalan işlemelerin nasıl ele alınacağı"
 
-#: builtin/rebase.c:1121
 msgid "keep commits which start empty"
 msgstr "boş başlayan işlemeleri tut"
 
-#: builtin/rebase.c:1125
 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:1132
 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:1136
 msgid "allow rebasing commits with empty messages"
 msgstr "boş iletili işlemelerin yeniden temellendirilmesine izin ver"
 
-#: builtin/rebase.c:1140
 msgid "try to rebase merges instead of skipping them"
 msgstr "birleştirmeleri atlamak yerine onları yeniden temellendirmeyi dene"
 
-#: builtin/rebase.c:1143
 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:1145
 msgid "use the given merge strategy"
 msgstr "verilen birleştirme stratejisini kullan"
 
-#: builtin/rebase.c:1147 builtin/revert.c:115
 msgid "option"
 msgstr "seçenek"
 
-#: builtin/rebase.c:1148
 msgid "pass the argument through to the merge strategy"
 msgstr "argümanı birleştirme stratejisine aktar"
 
-#: builtin/rebase.c:1151
 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:1154
 msgid "automatically re-schedule any `exec` that fails"
 msgstr "başarısız olan her 'exec'i kendiliğinden yeniden zamanla"
 
-#: builtin/rebase.c:1156
 msgid "apply all changes, even those already present upstream"
 msgstr "tüm değişiklikleri uygula, halihazırda üstkaynakta olanları bile"
 
-#: builtin/rebase.c:1177
 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:1208
-msgid "--preserve-merges was replaced by --rebase-merges"
-msgstr "--preserve-merges, --rebase-merges olarak değiştirildi"
+msgid ""
+"`rebase --preserve-merges` (-p) is no longer supported.\n"
+"Use `git rebase --abort` to terminate current rebase.\n"
+"Or downgrade to v2.33, or earlier, to complete the rebase."
+msgstr ""
+"`rebase --preserve-merges` (-p), artık desteklenmiyor.\n"
+"Geçerli yeniden birleştirmeyi sonlandırmak için `git rebase --abort` "
+"kullanın.\n"
+"Yeniden birleştirmeyi tamamlamak için 2.33 veya daha eski bir sürüme geçin."
+
+msgid ""
+"--preserve-merges was replaced by --rebase-merges\n"
+"Note: Your `pull.rebase` configuration may also be set to 'preserve',\n"
+"which is no longer supported; use 'merges' instead"
+msgstr ""
+"--preserve-merges, --rebase-merges olarak değiştirildi\n"
+"Not: `pull.rebase` yapılandırmanız, artık desteklenmeyen'\n"
+"'preserve' olarak ayarlı olabilir; yerine 'merges' kullanın"
 
-#: builtin/rebase.c:1230
 msgid "No rebase in progress?"
 msgstr "Sürmekte olan bir yeniden temellendirme yok"
 
-#: builtin/rebase.c:1234
 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:1257 t/helper/test-fast-rebase.c:122
 msgid "Cannot read HEAD"
 msgstr "HEAD okunamıyor"
 
-#: builtin/rebase.c:1269
 msgid ""
 "You must edit all merge conflicts and then\n"
 "mark them as resolved using git add"
@@ -20787,16 +9965,13 @@ msgstr ""
 "Önce tüm birleştirme çakışmalarını düzenlemeli ve onları\n"
 "git add kullanarak tamamlandı olarak imlemelisiniz."
 
-#: builtin/rebase.c:1287
 msgid "could not discard worktree changes"
 msgstr "çalışma ağacı değişiklikleri atılamadı"
 
-#: builtin/rebase.c:1308
 #, c-format
 msgid "could not move back to %s"
 msgstr "%s konumuna geri taşınamadı"
 
-#: builtin/rebase.c:1354
 #, c-format
 msgid ""
 "It seems that there is already a %s directory, and\n"
@@ -20817,128 +9992,100 @@ msgstr ""
 "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:1382
 msgid "switch `C' expects a numerical value"
 msgstr "'C' anahtarı sayısal bir değer bekliyor"
 
-#: builtin/rebase.c:1424
 #, c-format
 msgid "Unknown mode: %s"
 msgstr "Bilinmeyen kip: %s"
 
-#: builtin/rebase.c:1463
 msgid "--strategy requires --merge or --interactive"
 msgstr "--strategy, --merge veya --interactive gerektiriyor"
 
-#: builtin/rebase.c:1492
 msgid "apply options and merge options cannot be used together"
 msgstr "uygulama seçenekleri ve birleştirme seçenekleri birlikte kullanılamaz"
 
-#: builtin/rebase.c:1505
 #, c-format
 msgid "Unknown rebase backend: %s"
 msgstr "Bilinmeyen yeniden temellendirme arka ucu: %s"
 
-#: builtin/rebase.c:1534
 msgid "--reschedule-failed-exec requires --exec or --interactive"
 msgstr "--reschedule-failed-exec, --exec veya --interactive gerektiriyor"
 
-#: builtin/rebase.c:1565
 #, c-format
 msgid "invalid upstream '%s'"
 msgstr "geçersiz üstkaynak '%s'"
 
-#: builtin/rebase.c:1571
 msgid "Could not create new root commit"
 msgstr "Yeni kök işleme oluşturulamadı"
 
-#: builtin/rebase.c:1597
+#, c-format
+msgid "no such branch/commit '%s'"
+msgstr "böyle bir dal/işleme yok: '%s'"
+
+#, c-format
+msgid "No such ref: %s"
+msgstr "Böyle bir başvuru yok: %s"
+
+msgid "Could not resolve HEAD to a revision"
+msgstr "HEAD bir revizyona çözülemedi"
+
 #, c-format
 msgid "'%s': need exactly one merge base with branch"
 msgstr "'%s': tam olarak dallı bir birleştirme temeli gerekli"
 
-#: builtin/rebase.c:1600
 #, c-format
 msgid "'%s': need exactly one merge base"
 msgstr "'%s': tam olarak bir birleştirme temeli gerekiyor"
 
-#: builtin/rebase.c:1609
 #, c-format
 msgid "Does not point to a valid commit '%s'"
 msgstr "'%s' geçerli bir işlemeye işaret etmiyor"
 
-#: builtin/rebase.c:1636
-#, c-format
-msgid "no such branch/commit '%s'"
-msgstr "böyle bir dal/işleme yok: '%s'"
-
-#: builtin/rebase.c:1647 builtin/submodule--helper.c:43
-#: builtin/submodule--helper.c:2477
-#, c-format
-msgid "No such ref: %s"
-msgstr "Böyle bir başvuru yok: %s"
-
-#: builtin/rebase.c:1658
-msgid "Could not resolve HEAD to a revision"
-msgstr "HEAD bir revizyona çözülemedi"
-
-#: builtin/rebase.c:1679
 msgid "Please commit or stash them."
 msgstr "Lütfen onları işleyin veya zulalayın."
 
-#: builtin/rebase.c:1714
 msgid "HEAD is up to date."
 msgstr "HEAD güncel."
 
-#: builtin/rebase.c:1716
 #, c-format
 msgid "Current branch %s is up to date.\n"
 msgstr "Geçerli dal %s güncel.\n"
 
-#: builtin/rebase.c:1724
 msgid "HEAD is up to date, rebase forced."
 msgstr "HEAD güncel, yeniden temellendirme zorla yapıldı."
 
-#: builtin/rebase.c:1726
 #, 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:1734
 msgid "The pre-rebase hook refused to rebase."
 msgstr "'pre-rebase' kancası yeniden temellendirmeyi reddetti."
 
-#: builtin/rebase.c:1741
 #, c-format
 msgid "Changes to %s:\n"
 msgstr "%s için olan değişiklikler:\n"
 
-#: builtin/rebase.c:1744
 #, c-format
 msgid "Changes from %s to %s:\n"
 msgstr "%s -> %s değişiklikleri:\n"
 
-#: builtin/rebase.c:1769
 #, 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:1781
 msgid "Could not detach HEAD"
 msgstr "HEAD ayrılamadı"
 
-#: builtin/rebase.c:1790
 #, c-format
 msgid "Fast-forwarded %s to %s.\n"
 msgstr "%s, %s konumuna ileri sarıldı.\n"
 
-#: builtin/receive-pack.c:35
 msgid "git receive-pack <git-dir>"
 msgstr "git receive-pack <git-dizini>"
 
-#: builtin/receive-pack.c:1263
 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"
@@ -20966,7 +10113,6 @@ msgstr ""
 "'receive.denyCurrentBranch' yapılandırma değişkenini 'refuse'\n"
 "olarak ayarlayın."
 
-#: builtin/receive-pack.c:1283
 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"
@@ -20988,19 +10134,15 @@ msgstr ""
 "\n"
 "Bu iletiyi susturmak için onu 'refuse' olarak ayarlayın."
 
-#: builtin/receive-pack.c:2476
 msgid "quiet"
 msgstr "sessiz"
 
-#: builtin/receive-pack.c:2491
 msgid "you must specify a directory"
 msgstr "bir dizin belirtmelisiniz"
 
-#: builtin/reflog.c:9
 msgid "git reflog [show] [<log-options>] [<ref>]"
 msgstr "git reflog [show] [<günlük-seçenekleri>] [<başvuru>]"
 
-#: builtin/reflog.c:12
 msgid ""
 "git reflog expire [--expire=<time>] [--expire-unreachable=<time>]\n"
 "                  [--rewrite] [--updateref] [--stale-fix]\n"
@@ -21012,7 +10154,6 @@ msgstr ""
 "                  [--dry-run | -n] [--verbose] [--all [--single-worktree] | "
 "<zaman>...]"
 
-#: builtin/reflog.c:17
 msgid ""
 "git reflog delete [--rewrite] [--updateref]\n"
 "                  [--dry-run | -n] [--verbose] <ref>@{<specifier>}..."
@@ -21020,81 +10161,64 @@ msgstr ""
 "git reflog delete [--rewrite] [--updateref]\n"
 "                  [--dry-run | -n] [--verbose] <başvuru>@{<belirteç>}..."
 
-#: builtin/reflog.c:21
 msgid "git reflog exists <ref>"
 msgstr "git reflog exists <başvuru>"
 
-#: builtin/reflog.c:197 builtin/reflog.c:211
 #, c-format
 msgid "invalid timestamp '%s' given to '--%s'"
 msgstr "geçersiz zaman damgası '%s', '--%s' argümanına verildi"
 
-#: builtin/reflog.c:240 builtin/reflog.c:359
 msgid "do not actually prune any entries"
 msgstr "özünde, hiçbir girdiyi budama"
 
-#: builtin/reflog.c:243 builtin/reflog.c:362
 msgid ""
 "rewrite the old SHA1 with the new SHA1 of the entry that now precedes it"
 msgstr ""
 "eski SHA-1'i, onun öncesinde gelen girdinin yeni SHA-1'i ile üzerine yaz"
 
-#: builtin/reflog.c:246 builtin/reflog.c:365
 msgid "update the reference to the value of the top reflog entry"
 msgstr "başvuruyu, en üst başvuru günlüğü girdisinin değerine güncelle"
 
-#: builtin/reflog.c:248 builtin/reflog.c:367
 msgid "print extra information on screen"
 msgstr "ekranda ek bilgi yazdır"
 
-#: builtin/reflog.c:249 builtin/reflog.c:253
 msgid "timestamp"
 msgstr "zaman damgası"
 
-#: builtin/reflog.c:250
 msgid "prune entries older than the specified time"
 msgstr "belirtilen zamandan daha eski girdileri buda"
 
-#: builtin/reflog.c:254
 msgid ""
 "prune entries older than <time> that are not reachable from the current tip "
 "of the branch"
 msgstr ""
 "dalın geçerli ucundan erişilemeyen ve <zaman>'dan daha eski girdileri buda"
 
-#: builtin/reflog.c:258
 msgid "prune any reflog entries that point to broken commits"
 msgstr "hatalı işlemelere işaret eden tüm başvuru günlüğü girdilerini buda"
 
-#: builtin/reflog.c:259
 msgid "process the reflogs of all references"
 msgstr "tüm başvuruların başvuru günlüklerini işle"
 
-#: builtin/reflog.c:261
 msgid "limits processing to reflogs from the current worktree only"
 msgstr ""
 "başvuru günlüklerine işlemeyi yalnızca geçerli çalışma ağacına sınırlar"
 
-#: builtin/reflog.c:294
 #, c-format
 msgid "Marking reachable objects..."
 msgstr "Ulaşılabilir nesneler imleniyor..."
 
-#: builtin/reflog.c:338
 #, c-format
 msgid "%s points nowhere!"
 msgstr "%s hiçbir yere işaret etmiyor!"
 
-#: builtin/reflog.c:374
 msgid "no reflog specified to delete"
 msgstr "silmek için bir başvuru günlüğü belirtilmedi"
 
-#: builtin/reflog.c:396
 #, c-format
 msgid "invalid ref format: %s"
 msgstr "geçersiz başvuru biçimi: %s"
 
-#: builtin/remote.c:19
 msgid ""
 "git remote add [-t <branch>] [-m <master>] [-f] [--tags | --no-tags] [--"
 "mirror=<fetch|push>] <name> <url>"
@@ -21102,87 +10226,67 @@ msgstr ""
 "git remote add [-t <dal>] [-m <master>] [-f] [--tags | --no-tags] [--"
 "mirror=<getir|it>] <ad> <url>"
 
-#: builtin/remote.c:20 builtin/remote.c:40
 msgid "git remote rename [--[no-]progress] <old> <new>"
 msgstr "git remote rename [--[no-]progress] <eski> <yeni>"
 
-#: builtin/remote.c:21 builtin/remote.c:45
 msgid "git remote remove <name>"
 msgstr "git remote remove <ad>"
 
-#: builtin/remote.c:22 builtin/remote.c:50
 msgid "git remote set-head <name> (-a | --auto | -d | --delete | <branch>)"
 msgstr "git remote set-head <ad> (-a | --auto | -d | --delete | <dal>)"
 
-#: builtin/remote.c:23
 msgid "git remote [-v | --verbose] show [-n] <name>"
 msgstr "git remote [-v | --verbose] show [-n] <ad>"
 
-#: builtin/remote.c:24
 msgid "git remote prune [-n | --dry-run] <name>"
 msgstr "git remote prune [-n | --dry-run] <ad>"
 
-#: builtin/remote.c:25
 msgid ""
 "git remote [-v | --verbose] update [-p | --prune] [(<group> | <remote>)...]"
 msgstr ""
 "git remote [-v | --verbose] update [-p | --prune] [(<grup> | <uzak-k>)...]"
 
-#: builtin/remote.c:26
 msgid "git remote set-branches [--add] <name> <branch>..."
 msgstr "git remote set-branches [--add] <ad> <dal>..."
 
-#: builtin/remote.c:27 builtin/remote.c:76
 msgid "git remote get-url [--push] [--all] <name>"
 msgstr "git remote get-url [--push] [--all] <ad>"
 
-#: builtin/remote.c:28 builtin/remote.c:81
 msgid "git remote set-url [--push] <name> <newurl> [<oldurl>]"
 msgstr "git remote set-url [--push] <ad> <yeni-url> [<eski-url>]"
 
-#: builtin/remote.c:29 builtin/remote.c:82
 msgid "git remote set-url --add <name> <newurl>"
 msgstr "git remote set-url --add <ad> <yeni-url>"
 
-#: builtin/remote.c:30 builtin/remote.c:83
 msgid "git remote set-url --delete <name> <url>"
 msgstr "git remote set-url --delete <ad> <url>"
 
-#: builtin/remote.c:35
 msgid "git remote add [<options>] <name> <url>"
 msgstr "git remote add [<seçenekler>] <ad> <url>"
 
-#: builtin/remote.c:55
 msgid "git remote set-branches <name> <branch>..."
 msgstr "git remote set-branches <ad> <dal>..."
 
-#: builtin/remote.c:56
 msgid "git remote set-branches --add <name> <branch>..."
 msgstr "git remote set-branches --add <ad> <dal>..."
 
-#: builtin/remote.c:61
 msgid "git remote show [<options>] <name>"
 msgstr "git remote show [<seçenekler>] <ad>"
 
-#: builtin/remote.c:66
 msgid "git remote prune [<options>] <name>"
 msgstr "git remote prune [<seçenekler>] <ad>"
 
-#: builtin/remote.c:71
 msgid "git remote update [<options>] [<group> | <remote>]..."
 msgstr "git remote update [<seçenekler>] [<grup> | <uzak-konum>]..."
 
-#: builtin/remote.c:100
 #, c-format
 msgid "Updating %s"
 msgstr "%s güncelleniyor"
 
-#: builtin/remote.c:102
 #, c-format
 msgid "Could not fetch %s"
 msgstr "%s getirilemedi"
 
-#: builtin/remote.c:132
 msgid ""
 "--mirror is dangerous and deprecated; please\n"
 "\t use --mirror=fetch or --mirror=push instead"
@@ -21190,80 +10294,71 @@ msgstr ""
 "--mirror tehlikeli ve artık kullanılmamalı; lütfen\n"
 "\t yerine --mirror=fetch veya --mirror=push kullanın."
 
-#: builtin/remote.c:149
 #, c-format
 msgid "unknown mirror argument: %s"
 msgstr "bilinmeyen yansı argümanı: %s"
 
-#: builtin/remote.c:165
 msgid "fetch the remote branches"
 msgstr "uzak konum dallarını getir"
 
-#: builtin/remote.c:167
 msgid "import all tags and associated objects when fetching"
 msgstr "getirirken tüm etiketleri ve ilişkili nesneleri içe aktar"
 
-#: builtin/remote.c:170
 msgid "or do not fetch any tag at all (--no-tags)"
 msgstr "veya hiçbir etiketi getirme (--no-tags)"
 
-#: builtin/remote.c:172
 msgid "branch(es) to track"
 msgstr "izlenecek dal(lar)"
 
-#: builtin/remote.c:173
 msgid "master branch"
 msgstr "ana dal"
 
-#: builtin/remote.c:175
 msgid "set up remote as a mirror to push to or fetch from"
 msgstr ""
 "uzak konum deposunu ona itilecek veya ondan getirilecek bir yansı olarak "
 "ayarla"
 
-#: builtin/remote.c:187
 msgid "specifying a master branch makes no sense with --mirror"
 msgstr "--mirror ile bir ana dal belirtmek anlam ifade etmiyor"
 
-#: builtin/remote.c:189
 msgid "specifying branches to track makes sense only with fetch mirrors"
 msgstr ""
 "izlemek için dallar belirtmek yalnızca getirme yansılarıyla anlamifade ediyor"
 
-#: builtin/remote.c:196 builtin/remote.c:716
 #, c-format
 msgid "remote %s already exists."
 msgstr "%s uzak konumu halihazırda var."
 
-#: builtin/remote.c:241
 #, c-format
 msgid "Could not setup master '%s'"
 msgstr "'%s' ana dalı ayarlanamadı"
 
-#: builtin/remote.c:323
+#, c-format
+msgid "more than one %s"
+msgstr "birden çok %s"
+
 #, 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:367
 #, 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:461 builtin/remote.c:469
 msgid "(matching)"
 msgstr "(eşleşiyor)"
 
-#: builtin/remote.c:473
 msgid "(delete)"
 msgstr "(sil)"
 
-#: builtin/remote.c:664
 #, c-format
 msgid "could not set '%s'"
 msgstr "'%s' ayarlanamadı"
 
-#: builtin/remote.c:669
+#, c-format
+msgid "could not unset '%s'"
+msgstr "'%s' ayarı kapatılamadı"
+
 #, c-format
 msgid ""
 "The %s configuration remote.pushDefault in:\n"
@@ -21274,17 +10369,14 @@ msgstr ""
 "\t%s:%d\n"
 "artık var olmayan '%s' uzak konumunu adlandırıyor."
 
-#: builtin/remote.c:707 builtin/remote.c:866 builtin/remote.c:973
 #, c-format
 msgid "No such remote: '%s'"
 msgstr "Böyle bir uzak konum yok: '%s'"
 
-#: builtin/remote.c:726
 #, 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:746
 #, c-format
 msgid ""
 "Not updating non-default fetch refspec\n"
@@ -21295,21 +10387,17 @@ msgstr ""
 "\t%s\n"
 "\tLütfen gerekirse yapılandırmayı el ile güncelleyin."
 
-#: builtin/remote.c:783
 msgid "Renaming remote references"
 msgstr "Uzak konum başvuruları yeniden adlandırılıyor"
 
-#: builtin/remote.c:794
 #, c-format
 msgid "deleting '%s' failed"
 msgstr "'%s' silinmesi başarısız"
 
-#: builtin/remote.c:832
 #, c-format
 msgid "creating '%s' failed"
 msgstr "'%s' oluşturulması başarısız"
 
-#: builtin/remote.c:912
 msgid ""
 "Note: A branch outside the refs/remotes/ hierarchy was not removed;\n"
 "to delete it, use:"
@@ -21323,120 +10411,95 @@ msgstr[1] ""
 "Not: refs/remotes hiyerarşisi dışındaki bazı dallar kaldırılmadı;\n"
 "onları silmek için şunu kullanın:"
 
-#: builtin/remote.c:926
 #, c-format
 msgid "Could not remove config section '%s'"
 msgstr "'%s' yapılandırsa bölümü kaldırılamadı"
 
-#: builtin/remote.c:1034
 #, c-format
 msgid " new (next fetch will store in remotes/%s)"
 msgstr " yeni (bir sonraki getirme uzak konumlarda depolayacak/%s"
 
-#: builtin/remote.c:1037
 msgid " tracked"
 msgstr " izlendi"
 
-#: builtin/remote.c:1039
 msgid " stale (use 'git remote prune' to remove)"
 msgstr " eskimiş (kaldırmak için 'git remote prune' kullanın)"
 
-#: builtin/remote.c:1041
 msgid " ???"
 msgstr " ???"
 
-#: builtin/remote.c:1082
 #, 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:1091
 #, c-format
 msgid "rebases interactively onto remote %s"
 msgstr "%s uzak konumuna etkileşimli olarak yeniden temellendirir"
 
-#: builtin/remote.c:1093
 #, 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:1096
 #, c-format
 msgid "rebases onto remote %s"
 msgstr "%s uzak konumuna yeniden temellendirir"
 
-#: builtin/remote.c:1100
 #, c-format
 msgid " merges with remote %s"
 msgstr " %s uzak konumu ile birleştirir"
 
-#: builtin/remote.c:1103
 #, c-format
 msgid "merges with remote %s"
 msgstr "%s uzak konumu ile birleştirir"
 
-#: builtin/remote.c:1106
 #, c-format
 msgid "%-*s    and with remote %s\n"
 msgstr "%-*s    ve %s uzak konumu ile birlikte\n"
 
-#: builtin/remote.c:1149
 msgid "create"
 msgstr "oluştur"
 
-#: builtin/remote.c:1152
 msgid "delete"
 msgstr "sil"
 
-#: builtin/remote.c:1156
 msgid "up to date"
 msgstr "güncel"
 
-#: builtin/remote.c:1159
 msgid "fast-forwardable"
 msgstr "ileri sarılabilir"
 
-#: builtin/remote.c:1162
 msgid "local out of date"
 msgstr "yerelin tarihi geçmiş"
 
-#: builtin/remote.c:1169
 #, c-format
 msgid "    %-*s forces to %-*s (%s)"
 msgstr "    %-*s şuna zorluyor: %-*s (%s)"
 
-#: builtin/remote.c:1172
 #, c-format
 msgid "    %-*s pushes to %-*s (%s)"
 msgstr "    %-*s şuna itiyor: %-*s (%s)"
 
-#: builtin/remote.c:1176
 #, c-format
 msgid "    %-*s forces to %s"
 msgstr "    %-*s şuna zorluyor: %s"
 
-#: builtin/remote.c:1179
 #, c-format
 msgid "    %-*s pushes to %s"
 msgstr "    %-*s şuna itiyor: %s"
 
-#: builtin/remote.c:1247
 msgid "do not query remotes"
 msgstr "uzak konumları sorgulama"
 
-#: builtin/remote.c:1268
 #, c-format
 msgid "* remote %s"
 msgstr "* uzak konum %s"
 
-#: builtin/remote.c:1269
 #, c-format
 msgid "  Fetch URL: %s"
 msgstr "  URL'yi getir: %s"
 
-#: builtin/remote.c:1270 builtin/remote.c:1286 builtin/remote.c:1423
 msgid "(no URL)"
 msgstr "(URL yok)"
 
@@ -21444,361 +10507,291 @@ msgstr "(URL yok)"
 #. with the one in " Fetch URL: %s"
 #. translation.
 #.
-#: builtin/remote.c:1284 builtin/remote.c:1286
 #, c-format
 msgid "  Push  URL: %s"
 msgstr "     URL'yi it: %s"
 
-#: builtin/remote.c:1288 builtin/remote.c:1290 builtin/remote.c:1292
 #, c-format
 msgid "  HEAD branch: %s"
 msgstr "     HEAD dalı: %s"
 
-#: builtin/remote.c:1288
 msgid "(not queried)"
 msgstr "(sorgulanmadı"
 
-#: builtin/remote.c:1290
 msgid "(unknown)"
 msgstr "(bilinmiyor)"
 
-#: builtin/remote.c:1294
 #, 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:1306
 #, c-format
 msgid "  Remote branch:%s"
 msgid_plural "  Remote branches:%s"
 msgstr[0] "  Uzak dal:%s"
 msgstr[1] "  Uzak dallar:%s"
 
-#: builtin/remote.c:1309 builtin/remote.c:1335
 msgid " (status not queried)"
 msgstr " (durum sorgulanmadı)"
 
-#: builtin/remote.c:1318
 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:1326
 msgid "  Local refs will be mirrored by 'git push'"
 msgstr "  Yerel başvurular 'git pull' tarafından yansılanacak"
 
-#: builtin/remote.c:1332
 #, 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:1353
 msgid "set refs/remotes/<name>/HEAD according to remote"
 msgstr "refs/remotes/<ad>/HEAD'i uzak konuma göre ayarla"
 
-#: builtin/remote.c:1355
 msgid "delete refs/remotes/<name>/HEAD"
 msgstr "refs/remotes/<ad>/HEAD'i sil"
 
-#: builtin/remote.c:1369
 msgid "Cannot determine remote HEAD"
 msgstr "Uzak konum HEAD'i belirlenemiyor"
 
-#: builtin/remote.c:1371
 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:1381
 #, c-format
 msgid "Could not delete %s"
 msgstr "%s silinemedi"
 
-#: builtin/remote.c:1389
 #, c-format
 msgid "Not a valid ref: %s"
 msgstr "Geçerli bir başvuru değil: %s"
 
-#: builtin/remote.c:1391
 #, c-format
 msgid "Could not setup %s"
 msgstr "%s ayarlanamadı"
 
-#: builtin/remote.c:1409
 #, c-format
 msgid " %s will become dangling!"
 msgstr " %s sarkacak!"
 
-#: builtin/remote.c:1410
 #, c-format
 msgid " %s has become dangling!"
 msgstr " %s sarkmaya başladı!"
 
-#: builtin/remote.c:1419
 #, c-format
 msgid "Pruning %s"
 msgstr "%s budanıyor"
 
-#: builtin/remote.c:1420
 #, c-format
 msgid "URL: %s"
 msgstr "URL: %s"
 
-#: builtin/remote.c:1436
 #, c-format
 msgid " * [would prune] %s"
 msgstr " * %s [budanacak]"
 
-#: builtin/remote.c:1439
 #, c-format
 msgid " * [pruned] %s"
 msgstr " * %s [budandı]"
 
-#: builtin/remote.c:1484
 msgid "prune remotes after fetching"
 msgstr "getirme sonrasında uzak konumları buda"
 
-#: builtin/remote.c:1548 builtin/remote.c:1604 builtin/remote.c:1674
 #, c-format
 msgid "No such remote '%s'"
 msgstr "Böyle bir uzak konum yok '%s'"
 
-#: builtin/remote.c:1566
 msgid "add branch"
 msgstr "dal ekle"
 
-#: builtin/remote.c:1573
 msgid "no remote specified"
 msgstr "uzak konum belirtilmedi"
 
-#: builtin/remote.c:1590
 msgid "query push URLs rather than fetch URLs"
 msgstr "itme URL'lerinden çok getirme URL'lerini sorgula"
 
-#: builtin/remote.c:1592
 msgid "return all URLs"
 msgstr "tüm URL'leri döndür"
 
-#: builtin/remote.c:1622
 #, c-format
 msgid "no URLs configured for remote '%s'"
 msgstr "'%s' uzak konumu için URL yapılandırılmamış"
 
-#: builtin/remote.c:1648
 msgid "manipulate push URLs"
 msgstr "itme URL'lerini değiştir"
 
-#: builtin/remote.c:1650
 msgid "add URL"
 msgstr "URL ekle"
 
-#: builtin/remote.c:1652
 msgid "delete URLs"
 msgstr "URL'leri sil"
 
-#: builtin/remote.c:1659
 msgid "--add --delete doesn't make sense"
 msgstr "--add --delete bir anlam ifade etmiyor"
 
-#: builtin/remote.c:1700
 #, c-format
 msgid "Invalid old URL pattern: %s"
 msgstr "Geçersiz eski URL dizgisi: %s"
 
-#: builtin/remote.c:1708
 #, c-format
 msgid "No such URL found: %s"
 msgstr "Böyle bir URL bulunamadı: %s"
 
-#: builtin/remote.c:1710
 msgid "Will not delete all non-push URLs"
 msgstr "Tüm itme olmayan URL'ler silinmeyecek"
 
-#: builtin/remote.c:1727
 msgid "be verbose; must be placed before a subcommand"
 msgstr "ayrıntılı anlat; bir altkomuttan önce yerleştirilmelidir"
 
-#: builtin/repack.c:29
 msgid "git repack [<options>]"
 msgstr "git repack [<seçenekler>]"
 
-#: builtin/repack.c:34
 msgid ""
 "Incremental repacks are incompatible with bitmap indexes.  Use\n"
-"--no-write-bitmap-index or disable the pack.writebitmaps configuration."
+"--no-write-bitmap-index or disable the pack.writeBitmaps configuration."
 msgstr ""
 "Artan yeniden paketlemeler biteşlem indeksleri ile uyumsuzdur.\n"
-"--no-write-bitmap-index kullanın veya pack.writebitmaps\n"
+"--no-write-bitmap-index kullanın veya pack.writeBitmaps\n"
 "yapılandırmasını devre dışı bırakın."
 
-#: builtin/repack.c:206
 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:280 builtin/repack.c:824
 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:304
 msgid "could not finish pack-objects to repack promisor objects"
 msgstr "vaatçi nesneleri yeniden paketleme için pack-objects bitirilemedi"
 
-#: builtin/repack.c:319
 #, c-format
 msgid "cannot open index for %s"
 msgstr "%s için indeks açılamıyor"
 
-#: builtin/repack.c:378
 #, 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:411 builtin/repack.c:418 builtin/repack.c:423
 #, c-format
 msgid "pack %s too large to roll up"
 msgstr "%s paketi, sarmak için pek büyük"
 
-#: builtin/repack.c:503
 #, c-format
 msgid "could not open tempfile %s for writing"
 msgstr "geçici dosya '%s', yazma için açılamadı"
 
-#: builtin/repack.c:521
 msgid "could not close refs snapshot tempfile"
 msgstr "başvurular anlık görüntü geçici dosyası kapatılamadı"
 
-#: builtin/repack.c:634
 msgid "pack everything in a single pack"
 msgstr "her şeyi tek bir pakete sığdır"
 
-#: builtin/repack.c:636
 msgid "same as -a, and turn unreachable objects loose"
-msgstr "-a ile aynı ve ulaşılamayan nesneleri serbest bırakır"
+msgstr "-a ile aynı, ulaşılamayan nesneleri serbest bırak"
+
+msgid "same as -a, pack unreachable cruft objects separately"
+msgstr "-a ile aynı, ulaşılamayan süprüntü nesneleri ayrı paketle"
+
+msgid "approxidate"
+msgstr "yaklaşık tarih"
+
+msgid "with -C, expire objects older than this"
+msgstr "-C ile, bundan daha eski nesneleri yürürlükten kaldır"
 
-#: builtin/repack.c:639
 msgid "remove redundant packs, and run git-prune-packed"
 msgstr "gereksiz paketleri kaldır ve 'git-prune-packed' çalıştır"
 
-#: builtin/repack.c:641
 msgid "pass --no-reuse-delta to git-pack-objects"
 msgstr "'git-pack-objects'e --no-reuse-delta geçir"
 
-#: builtin/repack.c:643
 msgid "pass --no-reuse-object to git-pack-objects"
 msgstr "'git-pack-objects'e --no-reuse-object geçir"
 
-#: builtin/repack.c:645
 msgid "do not run git-update-server-info"
 msgstr "'git-update-server-info' çalıştırma"
 
-#: builtin/repack.c:648
 msgid "pass --local to git-pack-objects"
 msgstr "--local'ı 'git-pack-objects'e geçir"
 
-#: builtin/repack.c:650
 msgid "write bitmap index"
 msgstr "biteşlem indeksi yaz"
 
-#: builtin/repack.c:652
 msgid "pass --delta-islands to git-pack-objects"
 msgstr "--delta-islands'ı 'git-pack-objects'e geçir"
 
-#: builtin/repack.c:653
-msgid "approxidate"
-msgstr "yaklaşık tarih"
-
-#: builtin/repack.c:654
 msgid "with -A, do not loosen objects older than this"
 msgstr "-A ile, bundan daha eski nesneleri bırakma"
 
-#: builtin/repack.c:656
 msgid "with -a, repack unreachable objects"
 msgstr "-a ile, ulaşılamayan nesneleri yeniden paketle"
 
-#: builtin/repack.c:658
 msgid "size of the window used for delta compression"
 msgstr "delta sıkıştırması için kullanılan pencerenin boyutu"
 
-#: builtin/repack.c:659 builtin/repack.c:665
 msgid "bytes"
 msgstr "baytlar"
 
-#: builtin/repack.c:660
 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:662
 msgid "limits the maximum delta depth"
 msgstr "olabilecek en büyük delta derinliğini kısıtlar"
 
-#: builtin/repack.c:664
 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:666
 msgid "maximum size of each packfile"
 msgstr "her paket dosyasının olabilecek en büyük boyutu"
 
-#: builtin/repack.c:668
 msgid "repack objects in packs marked with .keep"
 msgstr "nesneleri .keep ile imlenmiş paketlerde yeniden paketle"
 
-#: builtin/repack.c:670
 msgid "do not repack this pack"
 msgstr "bu paketi yeniden paketleme"
 
-#: builtin/repack.c:672
 msgid "find a geometric progression with factor <N>"
 msgstr "<N> faktörlü bir geometrik ilerleme bul"
 
-#: builtin/repack.c:674
 msgid "write a multi-pack index of the resulting packs"
 msgstr "ortaya çıkan paketlerin bir çoklu paket indeksini yaz"
 
-#: builtin/repack.c:684
 msgid "cannot delete packs in a precious-objects repo"
 msgstr "bir precious-objects deposundaki paketler silinemiyor"
 
-#: builtin/repack.c:833
 msgid "Nothing new to pack."
 msgstr "Paketlenecek yeni bir şey yok."
 
-#: builtin/repack.c:863
+#, c-format
+msgid "pack prefix %s does not begin with objdir %s"
+msgstr "paket öneki %s, nesne dizini %s ile başlamıyor"
+
 #, c-format
 msgid "missing required file: %s"
 msgstr "gereken dosya eksik: %s"
 
-#: builtin/repack.c:865
 #, c-format
 msgid "could not unlink: %s"
 msgstr "bağlantı kaldırılamadı: %s"
 
-#: builtin/replace.c:22
 msgid "git replace [-f] <object> <replacement>"
 msgstr "git replace [-f] <nesne> <değişim>"
 
-#: builtin/replace.c:23
 msgid "git replace [-f] --edit <object>"
 msgstr "git replace [-f] --edit <nesne>"
 
-#: builtin/replace.c:24
 msgid "git replace [-f] --graft <commit> [<parent>...]"
 msgstr "git replace [-f] --graft <işleme> [<üst-öge>...]"
 
-#: builtin/replace.c:26
 msgid "git replace -d <object>..."
 msgstr "git replace -d <nesne>..."
 
-#: builtin/replace.c:27
 msgid "git replace [--format=<format>] [-l [<pattern>]]"
 msgstr "git replace [--format=<biçim>] [-l [<dizgi>]]"
 
-#: builtin/replace.c:90
 #, c-format
 msgid ""
 "invalid replace format '%s'\n"
@@ -21807,27 +10800,22 @@ msgstr ""
 "geçersiz değiştirme biçimi '%s'\n"
 "geçerli biçimler: 'short' (kısa), 'medium' (orta) ve 'long' (uzun)"
 
-#: builtin/replace.c:125
 #, c-format
 msgid "replace ref '%s' not found"
 msgstr "değiştirme başvurusu '%s' bulunamadı"
 
-#: builtin/replace.c:141
 #, c-format
 msgid "Deleted replace ref '%s'"
 msgstr "Değiştirme başvurusu '%s' silindi"
 
-#: builtin/replace.c:153
 #, c-format
 msgid "'%s' is not a valid ref name"
 msgstr "'%s' geçerli bir başvuru adı değil"
 
-#: builtin/replace.c:158
 #, c-format
 msgid "replace ref '%s' already exists"
 msgstr "değiştirme başvurusu '%s' halihazırda mevcut"
 
-#: builtin/replace.c:178
 #, c-format
 msgid ""
 "Objects must be of the same type.\n"
@@ -21838,75 +10826,59 @@ msgstr ""
 "'%s', '%s' türünden değiştirilmiş bir nesneye işaret ederken\n"
 "'%s' ise yerine geçecek '%s' türünden bir nesneye işaret ediyor."
 
-#: builtin/replace.c:229
 #, c-format
 msgid "unable to open %s for writing"
 msgstr "%s yazma için açılamıyor"
 
-#: builtin/replace.c:242
 msgid "cat-file reported failure"
 msgstr "cat-file hata bildirdi"
 
-#: builtin/replace.c:258
 #, c-format
 msgid "unable to open %s for reading"
 msgstr "%s okuma için açılamıyor"
 
-#: builtin/replace.c:271
 msgid "unable to spawn mktree"
 msgstr "mktree ortaya çıkarılamıyor"
 
-#: builtin/replace.c:275
 msgid "unable to read from mktree"
 msgstr "mktree'den okunamıyor"
 
-#: builtin/replace.c:284
 msgid "mktree reported failure"
 msgstr "mktree hata bildirdi"
 
-#: builtin/replace.c:288
 msgid "mktree did not return an object name"
 msgstr "mktree bir nesne adı döndürmedi"
 
-#: builtin/replace.c:297
 #, c-format
 msgid "unable to fstat %s"
 msgstr "%s 'fstat' yapılamıyor"
 
-#: builtin/replace.c:302
 msgid "unable to write object to database"
 msgstr "nesne veritabanına yazılamıyor"
 
-#: builtin/replace.c:325
 #, c-format
 msgid "unable to get object type for %s"
 msgstr "%s için nesne türü alınamadı"
 
-#: builtin/replace.c:341
 msgid "editing object file failed"
 msgstr "nesne dosyasını düzenleme başarısız"
 
-#: builtin/replace.c:350
 #, c-format
 msgid "new object is the same as the old one: '%s'"
 msgstr "yeni nesne eskisiyle aynı: '%s'"
 
-#: builtin/replace.c:383
 #, c-format
 msgid "could not parse %s as a commit"
 msgstr "%s, bir işleme olarak ayrıştırılamadı"
 
-#: builtin/replace.c:415
 #, c-format
 msgid "bad mergetag in commit '%s'"
 msgstr "'%s' işlemesinde hatalı birleştirme etiketi"
 
-#: builtin/replace.c:417
 #, c-format
 msgid "malformed mergetag in commit '%s'"
 msgstr "'%s' işlemesinde hatalı oluşturulmuş birleştirme etiketi"
 
-#: builtin/replace.c:429
 #, c-format
 msgid ""
 "original commit '%s' contains mergetag '%s' that is discarded; use --edit "
@@ -21915,31 +10887,25 @@ msgstr ""
 "'%s' orijinal işlemesi atılmış olan '%s' birleştirme etiketini içeriyor; --"
 "graft yerine --edit kullanın"
 
-#: builtin/replace.c:468
 #, c-format
 msgid "the original commit '%s' has a gpg signature"
 msgstr "'%s' orijinal işlemesinin bir gpg imzası var"
 
-#: builtin/replace.c:469
 msgid "the signature will be removed in the replacement commit!"
 msgstr "imza, yerine geçecek işlemede kaldırılacak"
 
-#: builtin/replace.c:479
 #, c-format
 msgid "could not write replacement commit for: '%s'"
 msgstr "şunun yerine geçecek işleme yazılamadı: '%s'"
 
-#: builtin/replace.c:487
 #, c-format
 msgid "graft for '%s' unnecessary"
 msgstr "'%s' için aşı gereksiz"
 
-#: builtin/replace.c:491
 #, c-format
 msgid "new commit is the same as the old one: '%s'"
 msgstr "yeni işleme eskisiyle aynı: '%s'"
 
-#: builtin/replace.c:526
 #, c-format
 msgid ""
 "could not convert the following graft(s):\n"
@@ -21948,215 +10914,165 @@ msgstr ""
 "aşağıdaki aşı(lar) dönüştürülemedi:\n"
 "%s"
 
-#: builtin/replace.c:547
 msgid "list replace refs"
 msgstr "değiştirme başvurularını listele"
 
-#: builtin/replace.c:548
 msgid "delete replace refs"
 msgstr "değiştirme başvurularını sil"
 
-#: builtin/replace.c:549
 msgid "edit existing object"
 msgstr "geçerli nesneyi düzenle"
 
-#: builtin/replace.c:550
 msgid "change a commit's parents"
 msgstr "bir işlemenin üst ögelerini değiştir"
 
-#: builtin/replace.c:551
 msgid "convert existing graft file"
 msgstr "mevcut aşı dosyasını dönüştür"
 
-#: builtin/replace.c:552
 msgid "replace the ref if it exists"
 msgstr "başvuru mevcutsa onu değiştir"
 
-#: builtin/replace.c:554
 msgid "do not pretty-print contents for --edit"
 msgstr "--edit içeriğini hoş biçimde gösterme"
 
-#: builtin/replace.c:555
 msgid "use this format"
 msgstr "bu biçimi kullan"
 
-#: builtin/replace.c:568
 msgid "--format cannot be used when not listing"
 msgstr "--format, listelemiyorken kullanılamaz"
 
-#: builtin/replace.c:576
 msgid "-f only makes sense when writing a replacement"
 msgstr "-f yalnızca yerine geçecek bir nesne yazılırken anlam ifade eder"
 
-#: builtin/replace.c:580
 msgid "--raw only makes sense with --edit"
 msgstr "--raw yalnızca --edit ile anlam ifade eder"
 
-#: builtin/replace.c:586
 msgid "-d needs at least one argument"
 msgstr "-d için en azından bir argüman gerekli"
 
-#: builtin/replace.c:592
 msgid "bad number of arguments"
 msgstr "hatalı argüman sayısı"
 
-#: builtin/replace.c:598
 msgid "-e needs exactly one argument"
 msgstr "-e için tam olarak bir argüman gerekli"
 
-#: builtin/replace.c:604
 msgid "-g needs at least one argument"
 msgstr "-g için en azından bir argüman gerekli"
 
-#: builtin/replace.c:610
 msgid "--convert-graft-file takes no argument"
 msgstr "--convert-graft-file argüman almaz"
 
-#: builtin/replace.c:616
 msgid "only one pattern can be given with -l"
 msgstr "-l ile yalnızca bir dizgi verilebilir"
 
-#: builtin/rerere.c:13
 msgid "git rerere [clear | forget <path>... | status | remaining | diff | gc]"
 msgstr "git rerere [clear | forget <yol>... | status | remaining | diff | gc]"
 
-#: builtin/rerere.c:58
 msgid "register clean resolutions in index"
 msgstr "indeksteki temiz çözümlerin kaydını yap"
 
-#: builtin/rerere.c:77
 msgid "'git rerere forget' without paths is deprecated"
 msgstr "yol olmadan 'git rerere forget' kullanım dışı"
 
-#: builtin/rerere.c:111
 #, c-format
 msgid "unable to generate diff for '%s'"
 msgstr "'%s' için diff oluşturulamıyor"
 
-#: builtin/reset.c:33
 msgid ""
 "git reset [--mixed | --soft | --hard | --merge | --keep] [-q] [<commit>]"
 msgstr ""
 "git reset [--mixed | --soft | --hard | --merge | --keep] [-q] [<işleme>]"
 
-#: builtin/reset.c:34
 msgid "git reset [-q] [<tree-ish>] [--] <pathspec>..."
 msgstr "git reset [-q] [<ağacımsı>] [--] <yol-blrtç>..."
 
-#: builtin/reset.c:35
 msgid ""
 "git reset [-q] [--pathspec-from-file [--pathspec-file-nul]] [<tree-ish>]"
 msgstr ""
 "git reset [-q] [--pathspec-from-file [--pathspec-file-nul]] [<ağacımsı>]"
 
-#: builtin/reset.c:36
 msgid "git reset --patch [<tree-ish>] [--] [<pathspec>...]"
 msgstr "git reset --patch [<ağacımsı>] [--] [<yol-blrtç>...]"
 
-#: builtin/reset.c:42
 msgid "mixed"
 msgstr "karışık"
 
-#: builtin/reset.c:42
 msgid "soft"
 msgstr "yumuşak"
 
-#: builtin/reset.c:42
 msgid "hard"
 msgstr "sert"
 
-#: builtin/reset.c:42
 msgid "merge"
 msgstr "birleştir"
 
-#: builtin/reset.c:42
 msgid "keep"
 msgstr "tut"
 
-#: builtin/reset.c:90
 msgid "You do not have a valid HEAD."
 msgstr "Geçerli bir HEAD'iniz yok."
 
-#: builtin/reset.c:92
 msgid "Failed to find tree of HEAD."
 msgstr "HEAD ağacı bulunamadı."
 
-#: builtin/reset.c:98
 #, c-format
 msgid "Failed to find tree of %s."
 msgstr "%s ağacı bulunamadı."
 
-#: builtin/reset.c:123
 #, c-format
 msgid "HEAD is now at %s"
 msgstr "HEAD şimdi şurada: %s"
 
-#: builtin/reset.c:304
 #, 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:402 builtin/stash.c:606 builtin/stash.c:669
-#: builtin/stash.c:693
 msgid "be quiet, only report errors"
 msgstr "sessiz ol, yalnızca hataları bildir"
 
-#: builtin/reset.c:404
 msgid "skip refreshing the index after reset"
 msgstr "sıfırlama sonrası indeksi yenilemeyi atla"
 
-#: builtin/reset.c:406
 msgid "reset HEAD and index"
 msgstr "HEAD'i ve indeksi sıfırla"
 
-#: builtin/reset.c:407
 msgid "reset only HEAD"
 msgstr "yalnızca HEAD'i sıfırla"
 
-#: builtin/reset.c:409 builtin/reset.c:411
 msgid "reset HEAD, index and working tree"
 msgstr "HEAD'i, indeksi ve çalışma ağacını sıfırla"
 
-#: builtin/reset.c:413
 msgid "reset HEAD but keep local changes"
 msgstr "HEAD'i sıfırla; ancak yerel değişiklikleri tut"
 
-#: builtin/reset.c:419
 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:452
 #, c-format
 msgid "Failed to resolve '%s' as a valid revision."
 msgstr "'%s' geçerli bir revizyon olarak çözülemedi."
 
-#: builtin/reset.c:460
 #, c-format
 msgid "Failed to resolve '%s' as a valid tree."
 msgstr "'%s' geçerli bir ağaç olarak çözülemedi."
 
-#: builtin/reset.c:479
 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:481
 #, c-format
 msgid "Cannot do %s reset with paths."
 msgstr "Belirtilmiş yol varken %s sıfırlaması yapılamıyor."
 
-#: builtin/reset.c:496
 #, 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:527
 msgid "Unstaged changes after reset:"
 msgstr "Sıfırlama sonrasında hazırlanmamış değişiklikler:"
 
-#: builtin/reset.c:530
 #, c-format
 msgid ""
 "It took %.2f seconds to refresh the index after reset.  You can use\n"
@@ -22166,53 +11082,45 @@ msgstr ""
 "için\n"
 "'--no-refresh' kullanabilirsiniz."
 
-#: builtin/reset.c:547
 #, c-format
 msgid "Could not reset index file to revision '%s'."
 msgstr "İndeks dosyası '%s' revizyonuna sıfırlanamadı."
 
-#: builtin/reset.c:552
 msgid "Could not write new index file."
 msgstr "Yeni indeks dosyası yazılamadı."
 
-#: builtin/rev-list.c:659
+#, c-format
+msgid "unable to get disk usage of %s"
+msgstr "%s ögesinin disk kullanımı alınamıyor"
+
 msgid "rev-list does not support display of notes"
 msgstr "rev-list not görüntülemesini desteklemiyor"
 
-#: builtin/rev-list.c:664
 #, c-format
 msgid "marked counting and '%s' cannot be used together"
 msgstr "imli sayım ve '%s' birlikte kullanılamaz"
 
-#: builtin/rev-parse.c:409
 msgid "git rev-parse --parseopt [<options>] -- [<args>...]"
 msgstr "git rev-parse --parseopt [<seçenekler>] -- [<argümanlar>...]"
 
-#: builtin/rev-parse.c:414
 msgid "keep the `--` passed as an arg"
 msgstr "'--'i geçirilen bir argüman olarak tut"
 
-#: builtin/rev-parse.c:416
 msgid "stop parsing after the first non-option argument"
 msgstr "seçenek olmayan ilk argümandan sonra ayrıştırmayı durdur"
 
-#: builtin/rev-parse.c:419
 msgid "output in stuck long form"
 msgstr "uzun biçimde çıktı ver"
 
-#: builtin/rev-parse.c:438
 msgid "premature end of input"
 msgstr "zamansız girdi sonu"
 
-#: builtin/rev-parse.c:442
 msgid "no usage string given before the `--' separator"
 msgstr "'--' ayırıcısı öncesinde bir kullanım dizisi verilmedi"
 
-#: builtin/rev-parse.c:548
 msgid "Needed a single revision"
 msgstr "Tek bir revizyon gerekiyordu"
 
-#: builtin/rev-parse.c:552
 msgid ""
 "git rev-parse --parseopt [<options>] -- [<args>...]\n"
 "   or: git rev-parse --sq-quote [<arg>...]\n"
@@ -22226,145 +11134,117 @@ msgstr ""
 "\n"
 "İlki hakkında ek bilgi için \"git rev-parse --parseopt -h\" çalıştırın."
 
-#: builtin/rev-parse.c:712
 msgid "--resolve-git-dir requires an argument"
 msgstr "--resolve-git-dir bir argüman gerektiriyor"
 
-#: builtin/rev-parse.c:715
 #, c-format
 msgid "not a gitdir '%s'"
 msgstr "bir git dizini değil: '%s'"
 
-#: builtin/rev-parse.c:739
 msgid "--git-path requires an argument"
 msgstr "--git-path bir argüman gerektiriyor"
 
-#: builtin/rev-parse.c:749
 msgid "-n requires an argument"
 msgstr "-n bir argüman gerektiriyor"
 
-#: builtin/rev-parse.c:763
 msgid "--path-format requires an argument"
 msgstr "--path-format bir argüman gerektiriyor"
 
-#: builtin/rev-parse.c:769
 #, c-format
 msgid "unknown argument to --path-format: %s"
 msgstr "--path-format için bilinmeyen bir argüman: %s"
 
-#: builtin/rev-parse.c:776
 msgid "--default requires an argument"
 msgstr "--default bir argüman gerektiriyor"
 
-#: builtin/rev-parse.c:782
 msgid "--prefix requires an argument"
 msgstr "--prefix bir argüman gerektiriyor"
 
-#: builtin/rev-parse.c:851
 #, c-format
 msgid "unknown mode for --abbrev-ref: %s"
 msgstr "--abbrev-ref için bilinmeyen kip: %s"
 
-#: builtin/rev-parse.c:1023
+msgid "this operation must be run in a work tree"
+msgstr "bu işlem bir çalışma ağacı içinde çalıştırılmalı"
+
 #, c-format
 msgid "unknown mode for --show-object-format: %s"
 msgstr "--show-object-format için bilinmeyen kip: %s"
 
-#: builtin/revert.c:24
 msgid "git revert [<options>] <commit-ish>..."
 msgstr "git revert [<seçenekler>] <işlememsi>..."
 
-#: builtin/revert.c:25
 msgid "git revert <subcommand>"
 msgstr "git revert <altkomut>"
 
-#: builtin/revert.c:30
 msgid "git cherry-pick [<options>] <commit-ish>..."
 msgstr "git cherry-pick [<seçenekler>] <işlememsi>..."
 
-#: builtin/revert.c:31
 msgid "git cherry-pick <subcommand>"
 msgstr "git cherry-pick <altkomut>"
 
-#: builtin/revert.c:72
 #, c-format
 msgid "option `%s' expects a number greater than zero"
 msgstr "'%s' seçeneği sıfırdan büyük bir sayı bekliyor"
 
-#: builtin/revert.c:92
 #, c-format
 msgid "%s: %s cannot be used with %s"
 msgstr "%s: %s, %s ile birlikte kullanılamaz"
 
-#: builtin/revert.c:102
 msgid "end revert or cherry-pick sequence"
 msgstr "geri al veya seç-al dizisini sonlandır"
 
-#: builtin/revert.c:103
 msgid "resume revert or cherry-pick sequence"
 msgstr "geri al veya seç-al dizisini sürdür"
 
-#: builtin/revert.c:104
 msgid "cancel revert or cherry-pick sequence"
 msgstr "geri al veya seç-al dizisini iptal et"
 
-#: builtin/revert.c:105
 msgid "skip current commit and continue"
 msgstr "geçerli işlemeyi atla ve sürdür"
 
-#: builtin/revert.c:107
 msgid "don't automatically commit"
 msgstr "kendiliğinden gönderme"
 
-#: builtin/revert.c:108
 msgid "edit the commit message"
 msgstr "işleme iletisini düzenle"
 
-#: builtin/revert.c:111
 msgid "parent-number"
 msgstr "üst öge numarası"
 
-#: builtin/revert.c:112
 msgid "select mainline parent"
 msgstr "ana üst ögeyi seç"
 
-#: builtin/revert.c:114
 msgid "merge strategy"
 msgstr "birleştirme stratejisi"
 
-#: builtin/revert.c:116
 msgid "option for merge strategy"
 msgstr "birleştirme stratejisi için seçenek"
 
-#: builtin/revert.c:125
 msgid "append commit name"
 msgstr "işleme adını iliştir"
 
-#: builtin/revert.c:127
 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:241
+msgid "use the 'reference' format to refer to commits"
+msgstr "işlemelere başvurmak için 'reference' biçimini kullan"
+
 msgid "revert failed"
 msgstr "geri al başarısız"
 
-#: builtin/revert.c:254
 msgid "cherry-pick failed"
 msgstr "seç-al başarısız"
 
-#: builtin/rm.c:20
 msgid "git rm [<options>] [--] <file>..."
 msgstr "git rm [<seçenekler>] [--] <dosya>..."
 
-#: builtin/rm.c:208
 msgid ""
 "the following file has staged content different from both the\n"
 "file and the HEAD:"
@@ -22378,7 +11258,6 @@ msgstr[1] ""
 "Aşağıdaki dosyaların hem HEAD'den hem de dosyadan farklı hazırlanmış\n"
 "içeriği mevcut:"
 
-#: builtin/rm.c:213
 msgid ""
 "\n"
 "(use -f to force removal)"
@@ -22386,13 +11265,11 @@ msgstr ""
 "\n"
 "(zorla kaldırmak için -f kullanın)"
 
-#: 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] "Aşağıdaki dosyanın indekste hazırlanmış değişiklikleri mevcut:"
 msgstr[1] "Aşağıdaki dosyaların indekste hazırlanmış değişiklikleri mevcut:"
 
-#: builtin/rm.c:221 builtin/rm.c:230
 msgid ""
 "\n"
 "(use --cached to keep the file, or -f to force removal)"
@@ -22400,53 +11277,42 @@ msgstr ""
 "\n"
 "(dosyayı tutmak için --cached, zorla kaldırmak için -f kullanın)"
 
-#: builtin/rm.c:227
 msgid "the following file has local modifications:"
 msgid_plural "the following files have local modifications:"
 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:245
 msgid "do not list removed files"
 msgstr "kaldırılan dosyaları listeleme"
 
-#: builtin/rm.c:246
 msgid "only remove from the index"
 msgstr "yalnızca indeksten kaldır"
 
-#: builtin/rm.c:247
 msgid "override the up-to-date check"
 msgstr "güncellik denetlemesini geçersiz kıl"
 
-#: builtin/rm.c:248
 msgid "allow recursive removal"
 msgstr "özyineli kaldırmaya izin ver"
 
-#: 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:285
 msgid "No pathspec was given. Which files should I remove?"
 msgstr "Yol belirteci verilmedi. Hangi dosyaları kaldırmalıyım?"
 
-#: 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:337
 #, c-format
 msgid "not removing '%s' recursively without -r"
 msgstr "'%s', -r olmadan özyineli olarak kaldırılmıyor"
 
-#: 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 [--mirror] [--dry-run] [--force]\n"
 "              [--receive-pack=<git-receive-pack>]\n"
@@ -22458,80 +11324,61 @@ msgstr ""
 "              [--verbose] [--thin] [--atomic]\n"
 "              [<makine>:]<dizin> (--all | <başvurular>...)"
 
-#: builtin/send-pack.c:192
 msgid "remote name"
 msgstr "uzak konum adı"
 
-#: builtin/send-pack.c:205
 msgid "use stateless RPC protocol"
 msgstr "durumsuz RPC protokolünü kullan"
 
-#: builtin/send-pack.c:206
 msgid "read refs from stdin"
 msgstr "başvuruları stdin'den oku"
 
-#: builtin/send-pack.c:207
 msgid "print status from remote helper"
 msgstr "uzak konum yardımcısından durum yazdır"
 
-#: builtin/shortlog.c:16
 msgid "git shortlog [<options>] [<revision-range>] [[--] <path>...]"
 msgstr "git shortlog [<seçenekler>] [<revizyon-erimi>] [[--] <yol>...]"
 
-#: builtin/shortlog.c:17
 msgid "git log --pretty=short | git shortlog [<options>]"
 msgstr "git log --pretty=short | git shortlog [<seçenekler>]"
 
-#: builtin/shortlog.c:123
 msgid "using multiple --group options with stdin is not supported"
 msgstr "stdin ile çoklu --group seçenekleri kullanımı desteklenmiyor"
 
-#: builtin/shortlog.c:133
 msgid "using --group=trailer with stdin is not supported"
 msgstr "stdin ile --group=trailer kullanımı desteklenmiyor"
 
-#: builtin/shortlog.c:323
 #, c-format
 msgid "unknown group type: %s"
 msgstr "bilinmeyen grup türü: %s"
 
-#: builtin/shortlog.c:351
 msgid "group by committer rather than author"
 msgstr "yazar yerine işleyici ile grupla"
 
-#: builtin/shortlog.c:354
 msgid "sort output according to the number of commits per author"
 msgstr "çıktıyı yazar başına olan işleme sayısına göre sırala"
 
-#: builtin/shortlog.c:356
 msgid "suppress commit descriptions, only provides commit count"
 msgstr "işleme açıklamalarını gizle, yalnızca işleme sayısını ver"
 
-#: builtin/shortlog.c:358
 msgid "show the email address of each author"
 msgstr "her yazarın e-posta adresini göster"
 
-#: builtin/shortlog.c:359
 msgid "<w>[,<i1>[,<i2>]]"
 msgstr "<w>[,<i1>[,<i2>]]"
 
-#: builtin/shortlog.c:360
 msgid "linewrap output"
 msgstr "çıktıyı kaydır"
 
-#: builtin/shortlog.c:362
 msgid "field"
 msgstr "alan"
 
-#: builtin/shortlog.c:363
 msgid "group by field"
 msgstr "alan ile grupla"
 
-#: builtin/shortlog.c:395
 msgid "too many arguments given outside repository"
 msgstr "depo dışında çok fazla argüman verildi"
 
-#: builtin/show-branch.c:14
 msgid ""
 "git show-branch [-a | --all] [-r | --remotes] [--topo-order | --date-order]\n"
 "                [--current] [--color[=<when>] | --no-color] [--sparse]\n"
@@ -22543,132 +11390,103 @@ msgstr ""
 "                [--more=<n> | --list | --independent | --merge-base]\n"
 "                [--no-name | --sha1-name] [--topics] [(<bşvr> | <glob>)...]"
 
-#: builtin/show-branch.c:18
 msgid "git show-branch (-g | --reflog)[=<n>[,<base>]] [--list] [<ref>]"
 msgstr "git show-branch (-g | --reflog)[=<n>[,<temel>]] [--list] [<başvuru>]"
 
-#: builtin/show-branch.c:396
 #, c-format
 msgid "ignoring %s; cannot handle more than %d ref"
 msgid_plural "ignoring %s; cannot handle more than %d refs"
 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
 #, c-format
 msgid "no matching refs with %s"
 msgstr "%s ile eşleşen başvuru yok"
 
-#: builtin/show-branch.c:645
 msgid "show remote-tracking and local branches"
 msgstr "uzak izleme dallarını ve yerel dalları göster"
 
-#: builtin/show-branch.c:647
 msgid "show remote-tracking branches"
 msgstr "uzak izleme dallarını göster"
 
-#: builtin/show-branch.c:649
 msgid "color '*!+-' corresponding to the branch"
 msgstr "'*!+-'i dala göre renklendir"
 
-#: builtin/show-branch.c:651
 msgid "show <n> more commits after the common ancestor"
 msgstr "ortak atadan sonra <n> işleme daha göster"
 
-#: builtin/show-branch.c:653
 msgid "synonym to more=-1"
 msgstr "more=-+ eşanlamlısı"
 
-#: builtin/show-branch.c:654
 msgid "suppress naming strings"
 msgstr "adlandırma dizilerini gizle"
 
-#: builtin/show-branch.c:656
 msgid "include the current branch"
 msgstr "geçerli dalı içer"
 
-#: builtin/show-branch.c:658
 msgid "name commits with their object names"
 msgstr "işlemeleri kendi nesne adlarıyla adlandır"
 
-#: builtin/show-branch.c:660
 msgid "show possible merge bases"
 msgstr "olası birleştirme temellerini göster"
 
-#: builtin/show-branch.c:662
 msgid "show refs unreachable from any other ref"
 msgstr "başka başvurudan erişilemeyen başvuruları göster"
 
-#: builtin/show-branch.c:664
 msgid "show commits in topological order"
 msgstr "işlemeleri ilingesel sırada göster"
 
-#: builtin/show-branch.c:667
 msgid "show only commits not on the first branch"
 msgstr "yalnızca birinci dalda olmayan işlemeleri göster"
 
-#: builtin/show-branch.c:669
 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
 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
 msgid "<n>[,<base>]"
 msgstr "<n>[,<temel>]"
 
-#: builtin/show-branch.c:675
 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:735
 msgid "no branches given, and HEAD is not valid"
 msgstr "dal verilmedi ve HEAD geçersiz"
 
-#: builtin/show-branch.c:738
 msgid "--reflog option needs one branch name"
 msgstr "--reflog seçeneği için bir dal adı gerekli"
 
-#: builtin/show-branch.c:741
 #, 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
 #, c-format
 msgid "no such ref %s"
 msgstr "böyle bir başvuru yok: %s"
 
-#: builtin/show-branch.c:831
 #, 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
 #, c-format
 msgid "'%s' is not a valid ref."
 msgstr "'%s' geçerli bir başvuru değil."
 
-#: builtin/show-branch.c:838
 #, c-format
 msgid "cannot find commit %s (%s)"
 msgstr "%s işlemesi bulunamıyor (%s)"
 
-#: builtin/show-index.c:21
 msgid "hash-algorithm"
 msgstr "sağlama algoritması"
 
-#: builtin/show-index.c:31
 msgid "Unknown hash algorithm"
 msgstr "bilinmeyen sağlama algoritması '%s'"
 
-#: builtin/show-ref.c:12
 msgid ""
 "git show-ref [-q | --quiet] [--verify] [--head] [-d | --dereference] [-s | --"
 "hash[=<n>]] [--abbrev[=<n>]] [--tags] [--heads] [--] [<pattern>...]"
@@ -22676,56 +11494,43 @@ msgstr ""
 "git show-ref [-q | --quiet] [--verify] [--head] [-d | --dereference] [-s | --"
 "hash[=<n>]] [--abbrev[=<n>]] [--tags] [--heads] [--] [<dizgi>...]"
 
-#: builtin/show-ref.c:13
 msgid "git show-ref --exclude-existing[=<pattern>]"
 msgstr "git show-ref --exclude-existing[=<dizgi>]"
 
-#: builtin/show-ref.c:162
 msgid "only show tags (can be combined with heads)"
 msgstr "yalnızca etiketleri göster (dal uçlarıyla birlikte kullanılabilir)"
 
-#: builtin/show-ref.c:163
 msgid "only show heads (can be combined with tags)"
 msgstr "yalnızca dal uçlarını göster (etiketlerle birlikte kullanılabilir)"
 
-#: builtin/show-ref.c:164
 msgid "stricter reference checking, requires exact ref path"
 msgstr "daha sıkı başvuru denetlemesi; kesin başvuru yolu gerektirir"
 
-#: builtin/show-ref.c:167 builtin/show-ref.c:169
 msgid "show the HEAD reference, even if it would be filtered out"
 msgstr "süzülüp dışarıda kalsa bile HEAD başvurusunu göster"
 
-#: builtin/show-ref.c:171
 msgid "dereference tags into object IDs"
 msgstr "etiketleri nesne numaralarına çevir"
 
-#: builtin/show-ref.c:173
 msgid "only show SHA1 hash using <n> digits"
 msgstr "SHA1 sağlamasını yalnızca <n> basamak kullanarak göster"
 
-#: builtin/show-ref.c:177
 msgid "do not print results to stdout (useful with --verify)"
 msgstr "sonuçları stdout'a yazdırma (--verify ile birlikte kullanışlı)"
 
-#: builtin/show-ref.c:179
 msgid "show refs from stdin that aren't in local repository"
 msgstr "stdin'den yerel bir depoda olmayan başvuruları göster"
 
-#: builtin/sparse-checkout.c:23
 msgid "git sparse-checkout (init|list|set|add|reapply|disable) <options>"
 msgstr "git sparse-checkout (init|list|set|add|reapply|disable) <seçenekler>"
 
-#: builtin/sparse-checkout.c:61
 msgid "this worktree is not sparse"
 msgstr "bu çalışma ağacı aralıklı değil"
 
-#: builtin/sparse-checkout.c:76
 msgid "this worktree is not sparse (sparse-checkout file may not exist)"
 msgstr ""
 "bu çalışma ağacı aralıklı değil (sparse-checkout dosyası var olmayabilir)"
 
-#: builtin/sparse-checkout.c:177
 #, c-format
 msgid ""
 "directory '%s' contains untracked files, but is not in the sparse-checkout "
@@ -22734,65 +11539,53 @@ msgstr ""
 "'%s' dizini izlenmeyen dosyalar içeriyor; ancak aralıklı çıkış konisinde "
 "değil"
 
-#: builtin/sparse-checkout.c:185
 #, c-format
 msgid "failed to remove directory '%s'"
 msgstr "'%s' dizini kaldırılamadı"
 
-#: builtin/sparse-checkout.c:327
 msgid "failed to create directory for sparse-checkout file"
 msgstr "aralıklı çıkış dosyası için dizin oluşturulamadı"
 
-#: builtin/sparse-checkout.c:366
 msgid "failed to initialize worktree config"
 msgstr "çalışma ağacı yapılandırması ilklendirilemedi"
 
-#: builtin/sparse-checkout.c:411
 msgid "failed to modify sparse-index config"
 msgstr "sparse-index yapılandırması değiştirilemedi"
 
-#: builtin/sparse-checkout.c:441 builtin/sparse-checkout.c:793
-#: builtin/sparse-checkout.c:847
 msgid "initialize the sparse-checkout in cone mode"
 msgstr "aralıklı çıkışı koni kipinde ilklendir"
 
-#: builtin/sparse-checkout.c:443 builtin/sparse-checkout.c:795
-#: builtin/sparse-checkout.c:849
 msgid "toggle the use of a sparse index"
 msgstr "bir aralıklı indeksin kullanımını aç/kapat"
 
-#: builtin/sparse-checkout.c:479
+#, c-format
+msgid "unable to create leading directories of %s"
+msgstr "%s öncü dizinleri oluşturulamıyor"
+
 #, c-format
 msgid "failed to open '%s'"
 msgstr "'%s' açılamadı"
 
-#: builtin/sparse-checkout.c:531
 #, c-format
 msgid "could not normalize path %s"
 msgstr "'%s' yolu olağanlaştırılamadı"
 
-#: builtin/sparse-checkout.c:560
 #, 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:615 builtin/sparse-checkout.c:643
 msgid "unable to load existing sparse-checkout patterns"
 msgstr "mevcut aralıklı çıkış dizgileri yüklenemiyor"
 
-#: builtin/sparse-checkout.c:619
 msgid "existing sparse-checkout patterns do not use cone mode"
 msgstr "mevcut aralıklı çıkış dizgileri koni kipini kullanmıyor"
 
-#: builtin/sparse-checkout.c:707
 msgid "please run from the toplevel directory in non-cone mode"
 msgstr "koni dışı kipte en üst düzey dizinden çalıştırın"
 
-#: builtin/sparse-checkout.c:712
 msgid "specify directories rather than patterns (no leading slash)"
 msgstr "dizgiler yerine dizinleri belirt (önünde eğik çizgi yok)"
 
-#: builtin/sparse-checkout.c:714
 msgid ""
 "specify directories rather than patterns.  If your directory starts with a "
 "'!', pass --skip-checks"
@@ -22800,7 +11593,6 @@ msgstr ""
 "dizgiler yerine dizinleri belirt; dizininiz bir '!' ile başlıyorsa --skip-"
 "checks'i geç"
 
-#: builtin/sparse-checkout.c:716
 msgid ""
 "specify directories rather than patterns.  If your directory really has any "
 "of '*?[]\\' in it, pass --skip-checks"
@@ -22808,7 +11600,6 @@ msgstr ""
 "dizgiler yerine dizinleri belirt; dizininizin içinde '*?[[\\' varsa --skip-"
 "checks'i geç"
 
-#: builtin/sparse-checkout.c:732
 #, c-format
 msgid ""
 "'%s' is not a directory; to treat it as a directory anyway, rerun with --"
@@ -22817,7 +11608,6 @@ msgstr ""
 "%s, bir dizin değil; yine de bir dizinmiş gibi davranmak için --skip-checks "
 "ile yeniden çalıştır"
 
-#: builtin/sparse-checkout.c:734
 #, c-format
 msgid ""
 "pass a leading slash before paths such as '%s' if you want a single file "
@@ -22826,24 +11616,19 @@ msgstr ""
 "Tek bir dosya istiyorsanız yollardan önce bir eğik çizgi geçirin ('%s' gibi) "
 "git-sparse-checkout kılavuzunda NON-CONE PROBLEMS'a bakın)."
 
-#: builtin/sparse-checkout.c:739
 msgid "git sparse-checkout add [--skip-checks] (--stdin | <patterns>)"
 msgstr "git sparse-checkout add [--skip-checks] (--stdin | <dizgiler>)"
 
-#: builtin/sparse-checkout.c:752 builtin/sparse-checkout.c:797
 msgid ""
 "skip some sanity checks on the given paths that might give false positives"
 msgstr "yanlış pozitif verebilen yollarda düzgünlük denetimlerini atla"
 
-#: builtin/sparse-checkout.c:755 builtin/sparse-checkout.c:800
 msgid "read patterns from standard in"
 msgstr "dizgileri stdin'den oku"
 
-#: builtin/sparse-checkout.c:760
 msgid "no sparse-checkout to add to"
 msgstr "kendisine eklenecek bir aralıklı çıkış yok"
 
-#: builtin/sparse-checkout.c:775
 msgid ""
 "git sparse-checkout set [--[no-]cone] [--[no-]sparse-index] [--skip-checks] "
 "(--stdin | <patterns>)"
@@ -22851,37 +11636,29 @@ msgstr ""
 "git sparse-checkout set [--[no-]cone] [--[no-]sparse-index] [--skip-checks] "
 "(--stdin | <dizgiler>)"
 
-#: builtin/sparse-checkout.c:854
 msgid "must be in a sparse-checkout to reapply sparsity patterns"
 msgstr ""
 "aralıklılık dizgilerinin yeniden uygulanması için bir aralıklı çıkış içinde "
 "olmalı"
 
-#: builtin/sparse-checkout.c:914
 msgid "error while refreshing working directory"
 msgstr "çalışma dizini yenilenirken hata"
 
-#: builtin/stash.c:24 builtin/stash.c:40
 msgid "git stash list [<options>]"
 msgstr "git stash list [<seçenekler>]"
 
-#: builtin/stash.c:25 builtin/stash.c:45
 msgid "git stash show [<options>] [<stash>]"
 msgstr "git stash show [<seçenekler>] [<zula>]"
 
-#: builtin/stash.c:26 builtin/stash.c:50
 msgid "git stash drop [-q|--quiet] [<stash>]"
 msgstr "git stash drop [-q|--quiet] [<zula>]"
 
-#: builtin/stash.c:27
 msgid "git stash ( pop | apply ) [--index] [-q|--quiet] [<stash>]"
 msgstr "git stash ( pop | apply ) [--index] [-q|--quiet] [<zula>]"
 
-#: builtin/stash.c:28 builtin/stash.c:65
 msgid "git stash branch <branchname> [<stash>]"
 msgstr "git stash branch <dal-adı> [<zula>]"
 
-#: builtin/stash.c:30
 msgid ""
 "git stash [push [-p|--patch] [-S|--staged] [-k|--[no-]keep-index] [-q|--"
 "quiet]\n"
@@ -22895,7 +11672,6 @@ msgstr ""
 "          [--pathspec-from-file=<dosya> [--pathspec-file-nul]]\n"
 "          [--] [<yol-blrtç>...]]"
 
-#: builtin/stash.c:34
 msgid ""
 "git stash save [-p|--patch] [-S|--staged] [-k|--[no-]keep-index] [-q|--"
 "quiet]\n"
@@ -22905,19 +11681,15 @@ msgstr ""
 "quiet]\n"
 "          [-u|--include-untracked] [-a|--all] [<ileti>]"
 
-#: builtin/stash.c:55
 msgid "git stash pop [--index] [-q|--quiet] [<stash>]"
 msgstr "git stash pop [--index] [-q|--quiet] [<zula>]"
 
-#: builtin/stash.c:60
 msgid "git stash apply [--index] [-q|--quiet] [<stash>]"
 msgstr "git stash apply [--index] [-q|--quiet] [<zula>]"
 
-#: builtin/stash.c:75
 msgid "git stash store [-m|--message <message>] [-q|--quiet] <commit>"
 msgstr "git stash store [-m|--message <ileti>] [-q|--quiet] <işleme>"
 
-#: 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"
@@ -22927,7 +11699,6 @@ msgstr ""
 "          [-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>]"
@@ -22935,30 +11706,24 @@ 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"
 msgstr "'%s' zulaya benzer bir işleme değil"
 
-#: builtin/stash.c:150
 #, c-format
 msgid "Too many revisions specified:%s"
 msgstr "Çok fazla revizyon belirtildi:%s"
 
-#: builtin/stash.c:164
 msgid "No stash entries found."
 msgstr "Zula girdisi bulunamadı."
 
-#: builtin/stash.c:178
 #, c-format
 msgid "%s is not a valid reference"
 msgstr "%s geçerli bir başvuru değil"
 
-#: builtin/stash.c:227
 msgid "git stash clear with arguments is unimplemented"
 msgstr "parametreli git stash clear henüz kullanılabilir değil"
 
-#: builtin/stash.c:447
 #, c-format
 msgid ""
 "WARNING: Untracked file in way of tracked file!  Renaming\n"
@@ -22970,200 +11735,149 @@ msgstr ""
 "            %s -> %s\n"
 "         yeniden adlandırılıyor.\n"
 
-#: 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:519
 #, c-format
 msgid "could not generate diff %s^!."
 msgstr "diff oluşturulamadı: %s^!."
 
-#: builtin/stash.c:526
 msgid "conflicts in index. Try without --index."
 msgstr "İndekste çakışmalar var. --index olmadan deneyin."
 
-#: builtin/stash.c:532
 msgid "could not save index tree"
 msgstr "indeks ağacı kaydedilemedi"
 
-#: builtin/stash.c:552
 #, c-format
 msgid "Merging %s with %s"
 msgstr "%s, %s ile birleştiriliyor"
 
-#: builtin/stash.c:562
 msgid "Index was not unstashed."
 msgstr "İndeks zuladan çıkartılmamıştı."
 
-#: builtin/stash.c:576
 msgid "could not restore untracked files from stash"
 msgstr "izlenmeyen dosyalar zuladan geri getirilemedi"
 
-#: builtin/stash.c:608 builtin/stash.c:695
 msgid "attempt to recreate the index"
 msgstr "indeks yeniden oluşturulmaya çalışılıyor"
 
-#: builtin/stash.c:641
 #, c-format
 msgid "Dropped %s (%s)"
 msgstr "%s bırakıldı (%s)"
 
-#: builtin/stash.c:644
 #, c-format
 msgid "%s: Could not drop stash entry"
 msgstr "%s: Zula girdisi bırakılamadı"
 
-#: builtin/stash.c:657
 #, c-format
 msgid "'%s' is not a stash reference"
 msgstr "'%s' bir zula başvurusu değil"
 
-#: builtin/stash.c:707
 msgid "The stash entry is kept in case you need it again."
 msgstr "Zula girdisi yeniden gereksiniminiz olursa diye saklanıyor."
 
-#: builtin/stash.c:730
 msgid "No branch name specified"
 msgstr "Dal adı belirtilmedi"
 
-#: builtin/stash.c:809
 msgid "failed to parse tree"
 msgstr "ağaç ayrıştırılamadı"
 
-#: builtin/stash.c:820
 msgid "failed to unpack trees"
 msgstr "ağaçların paketi açılamadı"
 
-#: builtin/stash.c:840
 msgid "include untracked files in the stash"
 msgstr "zulada izlenmeyen dosyaları içer"
 
-#: builtin/stash.c:843
 msgid "only show untracked files in the stash"
 msgstr "zulada yalnızca izlenmeyen dosyaları göster"
 
-#: builtin/stash.c:930 builtin/stash.c:967
 #, c-format
 msgid "Cannot update %s with %s"
 msgstr "%s, %s ile güncellenemiyor"
 
-#: builtin/stash.c:948 builtin/stash.c:1667 builtin/stash.c:1739
 msgid "stash message"
 msgstr "zula iletisi"
 
-#: builtin/stash.c:958
 msgid "\"git stash store\" requires one <commit> argument"
 msgstr "\"git stash store\" bir <işleme> argümanı gerektirir"
 
-#: builtin/stash.c:1143
 msgid "No staged changes"
 msgstr "Hazırlanan değişiklik yok"
 
-#: builtin/stash.c:1204
 msgid "No changes selected"
 msgstr "Değişiklik seçilmedi"
 
-#: builtin/stash.c:1304
 msgid "You do not have the initial commit yet"
 msgstr "Henüz ilk işleme yapılmamış"
 
-#: builtin/stash.c:1331
 msgid "Cannot save the current index state"
 msgstr "Geçerli indeks durumu kaydedilemiyor"
 
-#: builtin/stash.c:1340
 msgid "Cannot save the untracked files"
 msgstr "İzlenmeyen dosyalar kaydedilemiyor"
 
-#: builtin/stash.c:1351 builtin/stash.c:1370
 msgid "Cannot save the current worktree state"
 msgstr "Geçerli çalışma ağacı durumu kaydedilemiyor"
 
-#: builtin/stash.c:1361
 msgid "Cannot save the current staged state"
 msgstr "Geçerli hazırlananlar durumu kaydedilemiyor"
 
-#: builtin/stash.c:1398
 msgid "Cannot record working tree state"
 msgstr "Çalışma ağacı durumu kaydı yazılamıyor"
 
-#: builtin/stash.c:1447
 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:1458
 msgid "Can't use --staged and --include-untracked or --all at the same time"
 msgstr "--staged, --include-untracked veya --all hepsi bir anda kullanılamıyor"
 
-#: builtin/stash.c:1476
 msgid "Did you forget to 'git add'?"
 msgstr "'git add' yapmayı mı unuttunuz?"
 
-#: builtin/stash.c:1491
 msgid "No local changes to save"
 msgstr "Kaydedilecek yerel değişiklik yok"
 
-#: builtin/stash.c:1498
 msgid "Cannot initialize stash"
 msgstr "Zula ilklendirilemiyor"
 
-#: builtin/stash.c:1513
 msgid "Cannot save the current status"
 msgstr "Geçerli durum kaydedilemiyor"
 
-#: builtin/stash.c:1518
 #, c-format
 msgid "Saved working directory and index state %s"
 msgstr "Çalışma dizini ve indeks durumu %s kaydedildi"
 
-#: builtin/stash.c:1615
 msgid "Cannot remove worktree changes"
 msgstr "Çalışma ağacı değişiklikleri kaldırılamıyor"
 
-#: builtin/stash.c:1656 builtin/stash.c:1728
 msgid "keep index"
 msgstr "indeksi tut"
 
-#: builtin/stash.c:1658 builtin/stash.c:1730
 msgid "stash staged changes only"
 msgstr "yalnızca hazırlanan değişiklikleri zulala"
 
-#: builtin/stash.c:1660 builtin/stash.c:1732
 msgid "stash in patch mode"
 msgstr "yama kipinde zula"
 
-#: builtin/stash.c:1661 builtin/stash.c:1733
 msgid "quiet mode"
 msgstr "sessiz kip"
 
-#: builtin/stash.c:1663 builtin/stash.c:1735
 msgid "include untracked files in stash"
 msgstr "zulada izlenmeyen dosyaları içer"
 
-#: builtin/stash.c:1665 builtin/stash.c:1737
 msgid "include ignore files"
 msgstr "yok sayma dosyalarını içer"
 
-#: builtin/stripspace.c:37
 msgid "skip and remove all lines starting with comment character"
 msgstr "yorum karakteri ile başlayan tüm satırları atla ve kaldır"
 
-#: builtin/stripspace.c:40
 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:50 builtin/submodule--helper.c:2486
 #, c-format
 msgid "Expecting a full ref name, got %s"
 msgstr "Tam bir başvuru adı bekleniyordu, %s alındı"
 
-#: builtin/submodule--helper.c:103
-#, c-format
-msgid "cannot strip one component off url '%s'"
-msgstr "'%s' url'sinden bir bileşen çıkarılamıyor"
-
-#: builtin/submodule--helper.c:213
 #, c-format
 msgid ""
 "could not look up configuration '%s'. Assuming this repository is its own "
@@ -23172,26 +11886,20 @@ msgstr ""
 "'%s' yapılandırması aranamadı. Bu deponun kendi yetkili üstkaynağı olduğu "
 "varsayılıyor."
 
-#: builtin/submodule--helper.c:413 builtin/submodule--helper.c:1873
 msgid "alternative anchor for relative paths"
 msgstr "göreceli yollar için alternatif tutturucu"
 
-#: builtin/submodule--helper.c:418
 msgid "git submodule--helper list [--prefix=<path>] [<path>...]"
 msgstr "git submodule--helper list [--prefix=<yol>] [<yol>...]"
 
-#: builtin/submodule--helper.c:476 builtin/submodule--helper.c:617
-#: builtin/submodule--helper.c:640
 #, 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:528
 #, c-format
 msgid "Entering '%s'\n"
 msgstr "Giriliyor: '%s'\n"
 
-#: builtin/submodule--helper.c:531
 #, c-format
 msgid ""
 "run_command returned non-zero status for %s\n"
@@ -23200,7 +11908,6 @@ msgstr ""
 "run_command, %s için sıfır olmayan durum döndürdü\n"
 "."
 
-#: builtin/submodule--helper.c:553
 #, c-format
 msgid ""
 "run_command returned non-zero status while recursing in the nested "
@@ -23210,67 +11917,52 @@ msgstr ""
 "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:569
 msgid "suppress output of entering each submodule command"
 msgstr "her bir altmodül komutu girişinin çıktısını gizle"
 
-#: builtin/submodule--helper.c:571 builtin/submodule--helper.c:876
-#: builtin/submodule--helper.c:1458
 msgid "recurse into nested submodules"
 msgstr "iç içe geçmiş altmodüle özyinele"
 
-#: builtin/submodule--helper.c:576
 msgid "git submodule--helper foreach [--quiet] [--recursive] [--] <command>"
 msgstr "git submodule--helper foreach [--quiet] [--recursive] [--] <komut>"
 
-#: builtin/submodule--helper.c:654
 #, 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:658
 #, 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:668
 #, 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:675
 #, 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:697
 msgid "suppress output for initializing a submodule"
 msgstr "bir altmodül ilklendirmesi çıktısını gizle"
 
-#: builtin/submodule--helper.c:702
 msgid "git submodule--helper init [<options>] [<path>]"
 msgstr "git submodule--helper init [<seçenekler>] [<yol>]"
 
-#: builtin/submodule--helper.c:775 builtin/submodule--helper.c:910
 #, 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:823
 #, 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:850 builtin/submodule--helper.c:1428
 #, c-format
 msgid "failed to recurse into submodule '%s'"
 msgstr "'%s' altmodülüne özyinelenemedi"
 
-#: builtin/submodule--helper.c:874 builtin/submodule--helper.c:1595
 msgid "suppress submodule status output"
 msgstr "altmodül durum çıktısını gizle"
 
-#: builtin/submodule--helper.c:875
 msgid ""
 "use commit stored in the index instead of the one stored in the submodule "
 "HEAD"
@@ -23278,92 +11970,72 @@ msgstr ""
 "altmodül HEAD'i içinde depolanan işleme yerine indekste depolanan işlemeyi "
 "kullan"
 
-#: builtin/submodule--helper.c:881
 msgid "git submodule status [--quiet] [--cached] [--recursive] [<path>...]"
 msgstr "git submodule status [--quiet] [--cached] [--recursive] [<yol>...]"
 
-#: builtin/submodule--helper.c:905
 msgid "git submodule--helper name <path>"
 msgstr "git submodule--helper name <yol>"
 
-#: builtin/submodule--helper.c:977
 #, c-format
 msgid "* %s %s(blob)->%s(submodule)"
 msgstr "* %s %s(ikili nesne)->%s(altmodül)"
 
-#: builtin/submodule--helper.c:980
 #, c-format
 msgid "* %s %s(submodule)->%s(blob)"
 msgstr "* %s %s(altmodül)->%s(ikili nesne)"
 
-#: builtin/submodule--helper.c:993
 #, c-format
 msgid "%s"
 msgstr "%s"
 
-#: builtin/submodule--helper.c:1043
 #, c-format
 msgid "couldn't hash object from '%s'"
 msgstr "'%s' üzerinden nesne sağlaması yapılamadı"
 
-#: builtin/submodule--helper.c:1047
 #, c-format
 msgid "unexpected mode %o\n"
 msgstr "beklenmedik kip %o\n"
 
-#: builtin/submodule--helper.c:1288
 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:1290
 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:1292
 msgid "skip submodules with 'ignore_config' value set to 'all'"
 msgstr "'ignore_config' değeri 'all' olan altmodülleri atla"
 
-#: builtin/submodule--helper.c:1294
 msgid "limit the summary size"
 msgstr "özet boyutunu sınırla"
 
-#: builtin/submodule--helper.c:1299
 msgid "git submodule--helper summary [<options>] [<commit>] [--] [<path>]"
 msgstr "git submodule--helper summary [<seçenekler>] [<işleme>] [--] [<yol>]"
 
-#: builtin/submodule--helper.c:1323
 msgid "could not fetch a revision for HEAD"
 msgstr "HEAD için bir revizyon getirilemedi"
 
-#: builtin/submodule--helper.c:1384
 #, c-format
 msgid "Synchronizing submodule url for '%s'\n"
 msgstr "'%s' için altmodül url'si eşitleniyor\n"
 
-#: builtin/submodule--helper.c:1390
 #, 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:1399
 #, 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:1409
 #, c-format
 msgid "failed to update remote for submodule '%s'"
 msgstr "'%s' altmodülü için uzak konum güncellenemedi"
 
-#: builtin/submodule--helper.c:1456
 msgid "suppress output of synchronizing submodule url"
 msgstr "altmodül url'si eşitleme çıktısını gizle"
 
-#: builtin/submodule--helper.c:1463
 msgid "git submodule--helper sync [--quiet] [--recursive] [<path>]"
 msgstr "git submodule--helper sync [--quiet] [--recursive] [<yol>]"
 
-#: builtin/submodule--helper.c:1513
 #, c-format
 msgid ""
 "Submodule work tree '%s' contains a .git directory. This will be replaced "
@@ -23372,7 +12044,6 @@ msgstr ""
 "Altmodül çalışma ağacı '%s' bir .git dizini içeriyor. Bu, absorbgitdirs "
 "kullanılarak bir .git dosyası ile değiştirilecek."
 
-#: builtin/submodule--helper.c:1530
 #, c-format
 msgid ""
 "Submodule work tree '%s' contains local modifications; use '-f' to discard "
@@ -23381,47 +12052,38 @@ msgstr ""
 "Altmodül çalışma ağacı '%s' yerel değişiklikler içeriyor; onları atmak için "
 "'-f' kullanın"
 
-#: builtin/submodule--helper.c:1538
 #, c-format
 msgid "Cleared directory '%s'\n"
 msgstr "'%s' dizini temizlendi\n"
 
-#: builtin/submodule--helper.c:1540
 #, 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:1551
 #, c-format
 msgid "could not create empty submodule directory %s"
 msgstr "boş altmodül dizini %s oluşturulamadı"
 
-#: builtin/submodule--helper.c:1567
 #, 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:1596
 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:1597
 msgid "unregister all submodules"
 msgstr "tüm altmodüllerin kaydını kaldır"
 
-#: builtin/submodule--helper.c:1602
 msgid ""
 "git submodule deinit [--quiet] [-f | --force] [--all | [--] [<path>...]]"
 msgstr ""
 "git submodule deinit [--quiet] [-f | --force] [--all | [--] [<yol>...]]"
 
-#: builtin/submodule--helper.c:1616
 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:1665
 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"
@@ -23433,164 +12095,131 @@ msgstr ""
 "submodule.alternateErrorStrategy ayarını 'info'ya ayarlayın veya\n"
 "--reference yerine --reference-if-able kullanarak klonlayın."
 
-#: builtin/submodule--helper.c:1710 builtin/submodule--helper.c:1713
 #, c-format
 msgid "submodule '%s' cannot add alternate: %s"
 msgstr "'%s' altmodülü alternatif ekleyemiyor: %s"
 
-#: builtin/submodule--helper.c:1749
 #, c-format
 msgid "Value '%s' for submodule.alternateErrorStrategy is not recognized"
 msgstr "'%s' submodule.alternateErrorStrategy değeri tanımlanamadı"
 
-#: builtin/submodule--helper.c:1756
 #, c-format
 msgid "Value '%s' for submodule.alternateLocation is not recognized"
 msgstr "'%s' submodule.alternateLocation değeri tanımlanamadı"
 
-#: builtin/submodule--helper.c:1781
 #, 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:1826
 #, 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:1831
 #, c-format
 msgid "directory not empty: '%s'"
 msgstr "dizin boş değil: '%s'"
 
-#: builtin/submodule--helper.c:1843
 #, c-format
 msgid "could not get submodule directory for '%s'"
 msgstr "'%s' için altmodül dizini alınamadı"
 
-#: builtin/submodule--helper.c:1876
 msgid "where the new submodule will be cloned to"
 msgstr "yeni altmodülün nereye klonlanacağı"
 
-#: builtin/submodule--helper.c:1879
 msgid "name of the new submodule"
 msgstr "yeni altmodülün adı"
 
-#: builtin/submodule--helper.c:1882
 msgid "url where to clone the submodule from"
 msgstr "altmodülün klonlanacağı url konumu"
 
-#: builtin/submodule--helper.c:1890 builtin/submodule--helper.c:3383
 msgid "depth for shallow clones"
 msgstr "sığ klonların derinliği"
 
-#: builtin/submodule--helper.c:1893 builtin/submodule--helper.c:2731
-#: builtin/submodule--helper.c:3376
 msgid "force cloning progress"
 msgstr "zorla klonla"
 
-#: builtin/submodule--helper.c:1895 builtin/submodule--helper.c:2733
 msgid "disallow cloning into non-empty directory"
 msgstr "boş olmayan dizine klonlamaya izin verme"
 
-#: builtin/submodule--helper.c:1903
 msgid ""
 "git submodule--helper clone [--prefix=<path>] [--quiet] [--reference "
 "<repository>] [--name <name>] [--depth <depth>] [--single-branch] [--filter "
 "<filter-spec>] --url <url> --path <path>"
 msgstr ""
-"git submodule--helper clone [--prefix=<yol>] [--quiet] [--reference "
-"<depo>] [--name <ad>] [--depth <derinlik>] [--single-branch] [--filter "
-"<süzgeç-belirteci>] --url <url> --path <yol>"
+"git submodule--helper clone [--prefix=<yol>] [--quiet] [--reference <depo>] "
+"[--name <ad>] [--depth <derinlik>] [--single-branch] [--filter <süzgeç-"
+"belirteci>] --url <url> --path <yol>"
 
-#: builtin/submodule--helper.c:1943
 #, 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:1947
 #, 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:2041
 #, c-format
 msgid "Submodule path '%s' not initialized"
 msgstr "Altmodül yolu '%s' ilklendirilmedi"
 
-#: builtin/submodule--helper.c:2045
 msgid "Maybe you want to use 'update --init'?"
 msgstr "'update --init' mi kullanmak istersiniz?"
 
-#: builtin/submodule--helper.c:2075
 #, c-format
 msgid "Skipping unmerged submodule %s"
 msgstr "Birleştirilmemiş altmodül %s atlanıyor"
 
-#: builtin/submodule--helper.c:2104
 #, c-format
 msgid "Skipping submodule '%s'"
 msgstr "'%s' altmodülü atlanıyor"
 
-#: builtin/submodule--helper.c:2257
 #, c-format
 msgid "Failed to clone '%s'. Retry scheduled"
 msgstr "'%s' klonlanamadı. Yeniden deneme zamanlandı."
 
-#: builtin/submodule--helper.c:2268
 #, c-format
 msgid "Failed to clone '%s' a second time, aborting"
 msgstr "'%s' ikinci bir kez klonlanamadı, iptal ediliyor"
 
-#: builtin/submodule--helper.c:2371
 #, 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:2375
 #, c-format
 msgid "Unable to rebase '%s' in submodule path '%s'"
 msgstr "Şu altmodül yolunda '%s' yeniden temellendirilemedi: '%s'"
 
-#: builtin/submodule--helper.c:2379
 #, c-format
 msgid "Unable to merge '%s' in submodule path '%s'"
 msgstr "Şu altmodül yolunda '%s' birleştirilemedi: '%s'"
 
-#: builtin/submodule--helper.c:2383
 #, 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:2402
 #, c-format
 msgid "Submodule path '%s': checked out '%s'\n"
 msgstr "Altmodül yolu '%s': '%s' çıkışı yapıldı\n"
 
-#: builtin/submodule--helper.c:2406
 #, c-format
 msgid "Submodule path '%s': rebased into '%s'\n"
 msgstr "Altmodül yolu '%s': '%s' üzerine yeniden temellendirildi\n"
 
-#: builtin/submodule--helper.c:2410
 #, 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:2414
 #, c-format
 msgid "Submodule path '%s': '%s %s'\n"
 msgstr "Altmodül yolu '%s': '%s %s'\n"
 
-#: builtin/submodule--helper.c:2438
 #, 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:2447
 #, c-format
 msgid ""
 "Fetched in submodule path '%s', but it did not contain %s. Direct fetching "
@@ -23599,7 +12228,6 @@ 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:2481
 #, c-format
 msgid ""
 "Submodule (%s) branch configured to inherit branch from superproject, but "
@@ -23608,80 +12236,62 @@ msgstr ""
 "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:2499
 #, 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:2588
 #, c-format
 msgid "Unable to find current revision in submodule path '%s'"
 msgstr "'%s' altmodül yolunda geçerli revizyon bulunamadı"
 
-#: builtin/submodule--helper.c:2599
 #, c-format
 msgid "Unable to fetch in submodule path '%s'"
 msgstr "'%s' altmodül yolunda getirme yapılamadı"
 
-#: builtin/submodule--helper.c:2604
 #, c-format
 msgid "Unable to find %s revision in submodule path '%s'"
 msgstr "%s revizyonu, '%s' altmodül yolunda bulunamadı"
 
-#: builtin/submodule--helper.c:2640
 #, c-format
 msgid "Failed to recurse into submodule path '%s'"
 msgstr "'%s' altmodül yoluna özyineleme yapılamadı"
 
-#: builtin/submodule--helper.c:2699
 msgid "force checkout updates"
 msgstr "güncellemeleri zorla çıkış yap"
 
-#: builtin/submodule--helper.c:2701
 msgid "initialize uninitialized submodules before update"
 msgstr "güncellemeden önce ilklendirilmemiş altmodülleri ilklendir"
 
-#: builtin/submodule--helper.c:2703
 msgid "use SHA-1 of submodule's remote tracking branch"
 msgstr "altmodül uzak izleme dalının SHA-1'ini kullan"
 
-#: builtin/submodule--helper.c:2705
 msgid "traverse submodules recursively"
 msgstr "altmodülleri özyineli basamaklandır"
 
-#: builtin/submodule--helper.c:2707
 msgid "don't fetch new objects from the remote site"
 msgstr "yeni nesneleri uzak konumdan getirme"
 
-#: builtin/submodule--helper.c:2710 builtin/submodule--helper.c:2892
 msgid "path into the working tree"
 msgstr "çalışma ağacına giden yol"
 
-#: builtin/submodule--helper.c:2713
 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:2717
 msgid "rebase, merge, checkout or none"
 msgstr "rebase, merge, checkout veya none"
 
-#: builtin/submodule--helper.c:2723
 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:2726
 msgid "parallel jobs"
 msgstr "paralel işler"
 
-#: builtin/submodule--helper.c:2728
 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:2729
 msgid "don't print cloning progress"
 msgstr "klonlama işlemini yazdırma"
 
-#: builtin/submodule--helper.c:2741
 msgid ""
 "git submodule [--quiet] update [--init [--filter=<filter-spec>]] [--remote] "
 "[-N|--no-fetch] [-f|--force] [--checkout|--merge|--rebase] [--[no-]recommend-"
@@ -23693,82 +12303,62 @@ msgstr ""
 "shallow] [--reference <depo>] [--recursive] [--[no-]single-branch] [--] "
 "[<yol>...]"
 
-#: builtin/submodule--helper.c:2767
 msgid "bad value for update parameter"
 msgstr "güncelleme parametresi için hatalı değer"
 
-#: builtin/submodule--helper.c:2893
 msgid "recurse into submodules"
 msgstr "altmodüllere özyinele"
 
-#: builtin/submodule--helper.c:2899
 msgid "git submodule--helper absorb-git-dirs [<options>] [<path>...]"
 msgstr "git submodule--helper absorb-git-dirs [<seçenekler>] [<yol>...]"
 
-#: builtin/submodule--helper.c:2955
 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:2958
 msgid "unset the config in the .gitmodules file"
 msgstr ".gitmodules dosyasındaki yapılandırmayı kaldır"
 
-#: builtin/submodule--helper.c:2963
 msgid "git submodule--helper config <name> [<value>]"
 msgstr "git submodule--helper config <ad> [<değer>]"
 
-#: builtin/submodule--helper.c:2964
 msgid "git submodule--helper config --unset <name>"
 msgstr "git submodule--helper config --unset <ad>"
 
-#: builtin/submodule--helper.c:2984 builtin/submodule--helper.c:3238
-#: builtin/submodule--helper.c:3395
 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:3000
 msgid "suppress output for setting url of a submodule"
 msgstr "bir altmodül url ayarlanması çıktısını gizle"
 
-#: builtin/submodule--helper.c:3004
 msgid "git submodule--helper set-url [--quiet] <path> <newurl>"
 msgstr "git submodule--helper set-url [--quiet] <yol> <yeniurl>"
 
-#: builtin/submodule--helper.c:3037
 msgid "set the default tracking branch to master"
 msgstr "öntanımlı izleme dalını master olarak ayarla"
 
-#: builtin/submodule--helper.c:3039
 msgid "set the default tracking branch"
 msgstr "öntanımlı izleme dalını ayarla"
 
-#: builtin/submodule--helper.c:3043
 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:3044
 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:3051
 msgid "--branch or --default required"
 msgstr "--branch veya --default gerekli"
 
-#: builtin/submodule--helper.c:3072 builtin/submodule--helper.c:3375
 msgid "print only error messages"
 msgstr "yalnızca hata iletilerini yazdır"
 
-#: builtin/submodule--helper.c:3073
 msgid "force creation"
 msgstr "oluşturmayı zorla"
 
-#: builtin/submodule--helper.c:3081
 msgid "show whether the branch would be created"
 msgstr "dalın oluşturulup oluşturulmayacağını göster"
 
-#: builtin/submodule--helper.c:3085
 msgid ""
 "git submodule--helper create-branch [-f|--force] [--create-reflog] [-q|--"
 "quiet] [-t|--track] [-n|--dry-run] <name> <start-oid> <start-name>"
@@ -23776,27 +12366,22 @@ msgstr ""
 "git submodule--helper create-branch [-f|--force] [--create-reflog] [-q|--"
 "quiet] [-t|--track] [-n|--dry-run] <ad> <başlangıç-oid> <başlangıç-adı>"
 
-#: builtin/submodule--helper.c:3097
 #, c-format
 msgid "creating branch '%s'"
 msgstr "'%s' dalı oluşturuluyor"
 
-#: builtin/submodule--helper.c:3155
 #, c-format
 msgid "Adding existing repo at '%s' to the index\n"
 msgstr "'%s' konumundaki mevcut repo indekse ekleniyor\n"
 
-#: builtin/submodule--helper.c:3158
 #, 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:3171
 #, c-format
 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:3178
 #, c-format
 msgid ""
 "If you want to reuse this local git directory instead of cloning again from\n"
@@ -23813,114 +12398,93 @@ msgstr ""
 "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:3190
 #, 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:3227
 #, c-format
 msgid "unable to checkout submodule '%s'"
 msgstr "'%s' altmodülü çıkış yapılamıyor"
 
-#: builtin/submodule--helper.c:3266
 #, c-format
 msgid "Failed to add submodule '%s'"
 msgstr "'%s' altmodülü eklenemedi"
 
-#: builtin/submodule--helper.c:3270 builtin/submodule--helper.c:3275
-#: builtin/submodule--helper.c:3283
 #, c-format
 msgid "Failed to register submodule '%s'"
 msgstr "'%s' altmodülü kaydı yapılamadı"
 
-#: builtin/submodule--helper.c:3339
 #, c-format
 msgid "'%s' already exists in the index"
 msgstr "'%s' indekste halihazırda var"
 
-#: builtin/submodule--helper.c:3342
 #, 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:3372
+#, c-format
+msgid "'%s' does not have a commit checked out"
+msgstr "'%s' çıkışı yapılmış bir işlemeye iye değil"
+
 msgid "branch of repository to add as submodule"
 msgstr "altmodül olarak eklenecek depo dalı"
 
-#: builtin/submodule--helper.c:3373
 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:3379
 msgid "borrow the objects from reference repositories"
 msgstr "nesneleri başvuru depolarından ödünç al"
 
-#: builtin/submodule--helper.c:3381
 msgid ""
-"sets the submodule’s name to the given string instead of defaulting to its "
+"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:3388
 msgid "git submodule--helper add [<options>] [--] <repository> [<path>]"
 msgstr "git submodule--helper add [<seçenekler>] [--] <depo> [<yol>]"
 
-#: builtin/submodule--helper.c:3416
 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:3425
 #, 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:3460
 #, c-format
 msgid "'%s' is not a valid submodule name"
 msgstr "'%s' geçerli bir altmodül adı değil"
 
-#: builtin/submodule--helper.c:3520 git.c:453 git.c:729
 #, c-format
 msgid "%s doesn't support --super-prefix"
 msgstr "%s, --super-prefix desteklemiyor"
 
-#: builtin/submodule--helper.c:3526
 #, c-format
 msgid "'%s' is not a valid submodule--helper subcommand"
 msgstr "'%s' geçerli bir submodule--helper altkomutu değil"
 
-#: builtin/symbolic-ref.c:8
 msgid "git symbolic-ref [<options>] <name> [<ref>]"
 msgstr "git symbolic-ref [<seçenekler>] <ad> [<başvuru>]"
 
-#: builtin/symbolic-ref.c:9
 msgid "git symbolic-ref -d [-q] <name>"
 msgstr "git symbolic-ref -d [-q] <ad>"
 
-#: builtin/symbolic-ref.c:42
 msgid "suppress error message for non-symbolic (detached) refs"
 msgstr "sembolik olmayan (ayrık) başvurular için hata iletisini gizle"
 
-#: builtin/symbolic-ref.c:43
 msgid "delete symbolic ref"
 msgstr "sembolik başvuruyu sil"
 
-#: builtin/symbolic-ref.c:44
 msgid "shorten ref output"
 msgstr "başvuru çıktısını kısalt"
 
-#: builtin/symbolic-ref.c:45 builtin/update-ref.c:505
 msgid "reason"
 msgstr "neden"
 
-#: builtin/symbolic-ref.c:45 builtin/update-ref.c:505
 msgid "reason of the update"
 msgstr "güncelleme nedeni"
 
-#: builtin/tag.c:26
 msgid ""
 "git tag [-a | -s | -u <key-id>] [-f] [-m <msg> | -F <file>]\n"
 "        <tagname> [<head>]"
@@ -23928,11 +12492,9 @@ msgstr ""
 "git tag [-a | -s | -u <anahtar-kimliği>] [-f] [-m <ileti> | -F <dosya>]\n"
 "        <etiket-adı> [<head>]"
 
-#: builtin/tag.c:28
 msgid "git tag -d <tagname>..."
 msgstr "git tag -d <etiket-adı>..."
 
-#: builtin/tag.c:29
 msgid ""
 "git tag -l [-n[<num>]] [--contains <commit>] [--no-contains <commit>] [--"
 "points-at <object>]\n"
@@ -23943,21 +12505,17 @@ msgstr ""
 " [-- points-at <nesne>] [--format=<biçim>] [--merged <işleme>]\n"
 " [--no-merged <işleme>] [<dizgi>...]"
 
-#: builtin/tag.c:31
 msgid "git tag -v [--format=<format>] <tagname>..."
 msgstr "git tag -v [--format=<biçim>] <etiket-adı>..."
 
-#: builtin/tag.c:101
 #, c-format
 msgid "tag '%s' not found."
 msgstr "'%s' etiketi bulunamadı."
 
-#: builtin/tag.c:136
 #, c-format
 msgid "Deleted tag '%s' (was %s)\n"
 msgstr "'%s' etiketi silindi (%s idi)\n"
 
-#: builtin/tag.c:171
 #, c-format
 msgid ""
 "\n"
@@ -23970,7 +12528,6 @@ msgstr ""
 "  %s\n"
 "'%c' ile başlayan satırlar yok sayılacaktır.\n"
 
-#: builtin/tag.c:175
 #, c-format
 msgid ""
 "\n"
@@ -23985,11 +12542,9 @@ msgstr ""
 "'%c' ile başlayan satırlar tutulacaktır; isterseniz onları "
 "kaldırabilirsiniz.\n"
 
-#: builtin/tag.c:241
 msgid "unable to sign the tag"
 msgstr "etiket imzalanamıyor"
 
-#: builtin/tag.c:259
 #, c-format
 msgid ""
 "You have created a nested tag. The object referred to by your new tag is\n"
@@ -24002,312 +12557,241 @@ msgstr ""
 "\n"
 "\tgit tag -f %s %s^{}"
 
-#: builtin/tag.c:275
 msgid "bad object type."
 msgstr "hatalı nesne türü."
 
-#: builtin/tag.c:326
 msgid "no tag message?"
 msgstr "etiket iletisi yok mu?"
 
-#: 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:445
 msgid "list tag names"
 msgstr "etiket adlarını listele"
 
-#: builtin/tag.c:447
 msgid "print <n> lines of each tag message"
 msgstr "her etiket iletisinin <n> satırını listele"
 
-#: builtin/tag.c:449
 msgid "delete tags"
 msgstr "etiketleri sil"
 
-#: builtin/tag.c:450
 msgid "verify tags"
 msgstr "etiketleri doğrula"
 
-#: builtin/tag.c:452
 msgid "Tag creation options"
 msgstr "Etiket oluşturma seçenekleri"
 
-#: builtin/tag.c:454
 msgid "annotated tag, needs a message"
 msgstr "açıklama eklenmiş etiket için bir ileti gerek"
 
-#: builtin/tag.c:456
 msgid "tag message"
 msgstr "etiket iletisi"
 
-#: builtin/tag.c:458
 msgid "force edit of tag message"
 msgstr "etiket iletisini zorla düzenle"
 
-#: builtin/tag.c:459
 msgid "annotated and GPG-signed tag"
 msgstr "açıklama eklenmiş ve GPG imzalı etiket"
 
-#: builtin/tag.c:462
 msgid "use another key to sign the tag"
 msgstr "etiketi imzalamak için başka bir anahtar kullanın"
 
-#: builtin/tag.c:463
 msgid "replace the tag if exists"
 msgstr "eğer varsa etiketi başkasıyla değiştir"
 
-#: builtin/tag.c:464 builtin/update-ref.c:511
 msgid "create a reflog"
 msgstr "bir başvuru günlüğü oluştur"
 
-#: builtin/tag.c:466
 msgid "Tag listing options"
 msgstr "Etiket listeleme seçenekleri"
 
-#: builtin/tag.c:467
 msgid "show tag list in columns"
 msgstr "etiket listesini sütunlarla göster"
 
-#: builtin/tag.c:468 builtin/tag.c:470
 msgid "print only tags that contain the commit"
 msgstr "yalnızca işlemeyi içeren etiketleri yazdır"
 
-#: builtin/tag.c:469 builtin/tag.c:471
 msgid "print only tags that don't contain the commit"
 msgstr "yalnızca işleme içermeyen etiketleri yazdır"
 
-#: builtin/tag.c:472
 msgid "print only tags that are merged"
 msgstr "yalnızca birleştirilen etiketleri yazdır"
 
-#: builtin/tag.c:473
 msgid "print only tags that are not merged"
 msgstr "yalnızca birleştirilmeyen etiketleri yazdır"
 
-#: builtin/tag.c:477
 msgid "print only tags of the object"
 msgstr "yalnızca nesnenin etiketlerini yazdır"
 
-#: builtin/tag.c:559
 #, c-format
 msgid "the '%s' option is only allowed in list mode"
 msgstr "'%s' seçeneğine yalnızca liste kipinde izin verilir"
 
-#: builtin/tag.c:598
 #, c-format
 msgid "'%s' is not a valid tag name."
 msgstr "'%s' geçerli bir etiket adı değil."
 
-#: builtin/tag.c:603
 #, c-format
 msgid "tag '%s' already exists"
 msgstr "'%s' etiketi halihazırda var"
 
-#: builtin/tag.c:634
+#, c-format
+msgid "Invalid cleanup mode %s"
+msgstr "Geçersiz temizlik kipi %s"
+
 #, c-format
 msgid "Updated tag '%s' (was %s)\n"
 msgstr "'%s' etiketi güncellendi (%s idi)\n"
 
-#: builtin/unpack-objects.c:95
 msgid "pack exceeds maximum allowed size"
 msgstr "paket izin verilen en büyük boyutu aşıyor"
 
-#: builtin/unpack-objects.c:504
 msgid "Unpacking objects"
 msgstr "Nesneler açılıyor"
 
-#: builtin/update-index.c:84
 #, c-format
 msgid "failed to create directory %s"
 msgstr "%s dizini oluşturulamadı"
 
-#: builtin/update-index.c:106
 #, c-format
 msgid "failed to delete file %s"
 msgstr "%s dosyası silinemedi"
 
-#: 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:138
 #, c-format
 msgid "Testing mtime in '%s' "
 msgstr "'%s' içindeki mtime sınanıyor "
 
-#: 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: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: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: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: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: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:220
 msgid " OK"
 msgstr " Tamam"
 
-#: builtin/update-index.c:589
 msgid "git update-index [<options>] [--] [<file>...]"
 msgstr "git update-index [<seçenekler>] [--] [<dosya>...]"
 
-#: builtin/update-index.c:993
 msgid "continue refresh even when index needs update"
 msgstr "indeksin güncellenmesi gerekse bile yenilemeyi sürdür"
 
-#: builtin/update-index.c:996
 msgid "refresh: ignore submodules"
 msgstr "refresh: altmodülleri yok say"
 
-#: builtin/update-index.c:999
 msgid "do not ignore new files"
 msgstr "yeni dosyaları yok sayma"
 
-#: builtin/update-index.c:1001
 msgid "let files replace directories and vice-versa"
 msgstr "dosyaların dizinlerin yerine geçmesine ve tersine izin ver"
 
-#: builtin/update-index.c:1003
 msgid "notice files missing from worktree"
 msgstr "çalışma ağacından eksik olan dosyaları fark et"
 
-#: builtin/update-index.c:1005
 msgid "refresh even if index contains unmerged entries"
 msgstr "indekste birleştirilmemiş girdiler olsa bile yenile"
 
-#: builtin/update-index.c:1008
 msgid "refresh stat information"
 msgstr "dosya durum bilgisini yenile"
 
-#: builtin/update-index.c:1012
 msgid "like --refresh, but ignore assume-unchanged setting"
 msgstr "--refresh gibi; ancak assume-unchanged ayarını yok sayar"
 
-#: builtin/update-index.c:1016
 msgid "<mode>,<object>,<path>"
 msgstr "<kip>,<nesne>,<yol>"
 
-#: builtin/update-index.c:1017
 msgid "add the specified entry to the index"
 msgstr "belirtilen girdiyi indekse ekle"
 
-#: builtin/update-index.c:1027
 msgid "mark files as \"not changing\""
 msgstr "dosyaları \"not changing\" olarak imle"
 
-#: builtin/update-index.c:1030
 msgid "clear assumed-unchanged bit"
 msgstr "assumed-unchanged kısmını temizle"
 
-#: builtin/update-index.c:1033
 msgid "mark files as \"index-only\""
 msgstr "dosyaları \"index-only\" olarak imle"
 
-#: builtin/update-index.c:1036
 msgid "clear skip-worktree bit"
 msgstr "skip-worktree kısmını atla"
 
-#: builtin/update-index.c:1039
 msgid "do not touch index-only entries"
 msgstr "'index-only' girdilerine dokunma"
 
-#: builtin/update-index.c:1041
 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:1043
 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:1045
 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:1047
 msgid "read list of paths to be updated from standard input"
 msgstr "güncellenecek yol listelerini standart girdi'den oku"
 
-#: builtin/update-index.c:1051
 msgid "add entries from standard input to the index"
 msgstr "indekse standart girdi'den girdiler ekle"
 
-#: builtin/update-index.c:1055
 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:1059
 msgid "only update entries that differ from HEAD"
 msgstr "yalnızca HEAD'den farklı olan girdileri güncelle"
 
-#: builtin/update-index.c:1063
 msgid "ignore files missing from worktree"
 msgstr "çalışma ağacından eksik olan dosyaları yok say"
 
-#: builtin/update-index.c:1066
 msgid "report actions to standard output"
 msgstr "eylemleri standart çıktı'ya bildir"
 
-#: builtin/update-index.c:1068
 msgid "(for porcelains) forget saved unresolved conflicts"
 msgstr "(okunabilir veri için) kaydedilmiş çözülmeyen çakışmaları unut"
 
-#: builtin/update-index.c:1072
 msgid "write index in this format"
 msgstr "indeksi bu biçimle yaz"
 
-#: builtin/update-index.c:1074
 msgid "enable or disable split index"
 msgstr "bölünmüş indeksi etkinleştir veya devre dışı bırak"
 
-#: builtin/update-index.c:1076
 msgid "enable/disable untracked cache"
 msgstr "izlenmeyen önbelleği etkinleştir/devre dışı bırak"
 
-#: builtin/update-index.c:1078
 msgid "test if the filesystem supports untracked cache"
 msgstr "dosya sisteminin izlenmeyen önbellek destekleyip desteklemediğini sına"
 
-#: builtin/update-index.c:1080
 msgid "enable untracked cache without testing the filesystem"
 msgstr "dosya sistemini sınamadan izlenmeyen önbelleği etkinleştir"
 
-#: builtin/update-index.c:1082
 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:1084
 msgid "enable or disable file system monitor"
 msgstr "dosya sistemi monitörünü etkinleştir veya devre dışı bırak"
 
-#: builtin/update-index.c:1086
 msgid "mark files as fsmonitor valid"
 msgstr "dosyaları dosya sistemi monitöründe geçerli olarak imle"
 
-#: builtin/update-index.c:1089
 msgid "clear fsmonitor valid bit"
 msgstr "dosya sistemi monitöründe geçerli kısmını temizle"
 
-#: builtin/update-index.c:1195
 msgid ""
 "core.splitIndex is set to false; remove or change it, if you really want to "
 "enable split index"
@@ -24315,7 +12799,6 @@ msgstr ""
 "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:1204
 msgid ""
 "core.splitIndex is set to true; remove or change it, if you really want to "
 "disable split index"
@@ -24323,7 +12806,6 @@ msgstr ""
 "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:1216
 msgid ""
 "core.untrackedCache is set to true; remove or change it, if you really want "
 "to disable the untracked cache"
@@ -24331,11 +12813,9 @@ msgstr ""
 "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:1220
 msgid "Untracked cache disabled"
 msgstr "İzlenmeyen önbellek devre dışı bırakıldı"
 
-#: builtin/update-index.c:1228
 msgid ""
 "core.untrackedCache is set to false; remove or change it, if you really want "
 "to enable the untracked cache"
@@ -24343,173 +12823,133 @@ msgstr ""
 "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:1232
 #, c-format
 msgid "Untracked cache enabled for '%s'"
 msgstr "İzlenmeyen önbellek '%s' için etkinleştirildi"
 
-#: builtin/update-index.c:1241
 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:1246
 msgid "fsmonitor enabled"
 msgstr "dosya sistemi monitörü etkin"
 
-#: builtin/update-index.c:1250
 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:1254
 msgid "fsmonitor disabled"
 msgstr "dosya sistemi monitörü devre dışı"
 
-#: builtin/update-ref.c:10
 msgid "git update-ref [<options>] -d <refname> [<old-val>]"
 msgstr "git update-ref [<seçenekler>] -d <bşvr-adı> [<eski-değer>]"
 
-#: builtin/update-ref.c:11
 msgid "git update-ref [<options>]    <refname> <new-val> [<old-val>]"
 msgstr ""
 "git update-ref [<seçenekler>]    <bşvr-adı> <yeni-değer> [<eski-değer>]"
 
-#: builtin/update-ref.c:12
 msgid "git update-ref [<options>] --stdin [-z]"
 msgstr "git update-ref [<seçenekler>] --stdin [-z]"
 
-#: builtin/update-ref.c:506
 msgid "delete the reference"
 msgstr "başvuruyu sil"
 
-#: 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:509
 msgid "stdin has NUL-terminated arguments"
 msgstr "stdin'de NUL ile sonlandırılan argümanlar var"
 
-#: builtin/update-ref.c:510
 msgid "read updates from stdin"
 msgstr "güncellemeleri stdin'den oku"
 
-#: builtin/update-server-info.c:15
 msgid "update the info files from scratch"
 msgstr "bilgi dosyalarını en baştan güncelle"
 
-#: builtin/upload-pack.c:11
 msgid "git upload-pack [<options>] <dir>"
 msgstr "git upload-pack [<seçenekler>] <dizin>"
 
-#: 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: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: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:31
 msgid "interrupt transfer after <n> seconds of inactivity"
 msgstr "aktarımı <n> saniye hareketsizlikten sonra kes"
 
-#: builtin/verify-commit.c:19
 msgid "git verify-commit [-v | --verbose] <commit>..."
 msgstr "git verify-commit [-v | --verbose] <işleme>..."
 
-#: builtin/verify-commit.c:68
 msgid "print commit contents"
 msgstr "işleme içeriğini yazdır"
 
-#: builtin/verify-commit.c:69 builtin/verify-tag.c:37
 msgid "print raw gpg status output"
 msgstr "ham gpg durum çıktısını yazdır"
 
-#: builtin/verify-pack.c:59
 msgid "git verify-pack [-v | --verbose] [-s | --stat-only] <pack>..."
 msgstr "git verify-pack [-v | --verbose] [-s | --stat-only] <paket>..."
 
-#: builtin/verify-pack.c:70
 msgid "verbose"
 msgstr "ayrıntılı anlatım"
 
-#: builtin/verify-pack.c:72
 msgid "show statistics only"
 msgstr "yalnızca istatistikleri göster"
 
-#: builtin/verify-tag.c:18
 msgid "git verify-tag [-v | --verbose] [--format=<format>] <tag>..."
 msgstr "git verify-tag [-v | --verbose] [--format=<biçim>] <etiket>..."
 
-#: builtin/verify-tag.c:36
 msgid "print tag contents"
 msgstr "etiket içeriğini yazdır"
 
-#: builtin/worktree.c:19
 msgid "git worktree add [<options>] <path> [<commit-ish>]"
 msgstr "git worktree add [<seçenekler>] <yol> [<işlememsi>]"
 
-#: builtin/worktree.c:20
 msgid "git worktree list [<options>]"
 msgstr "git worktree list [<seçenekler>]"
 
-#: builtin/worktree.c:21
 msgid "git worktree lock [<options>] <path>"
 msgstr "git worktree lock [<seçenekler>] <yol>"
 
-#: builtin/worktree.c:22
 msgid "git worktree move <worktree> <new-path>"
 msgstr "git worktree move <ç-ağacı> <yeni-yol>"
 
-#: builtin/worktree.c:23
 msgid "git worktree prune [<options>]"
 msgstr "git worktree prune [<seçenekler>]"
 
-#: builtin/worktree.c:24
 msgid "git worktree remove [<options>] <worktree>"
 msgstr "git worktree remove [<seçenekler>] <ç-ağacı>"
 
-#: builtin/worktree.c:25
 msgid "git worktree repair [<path>...]"
 msgstr "git worktree repair [<yol>...]"
 
-#: builtin/worktree.c:26
 msgid "git worktree unlock <path>"
 msgstr "git worktree unlock <yol>"
 
-#: builtin/worktree.c:76
 #, c-format
 msgid "Removing %s/%s: %s"
 msgstr "%s/%s kaldırılıyor: %s"
 
-#: builtin/worktree.c:149
 msgid "report pruned working trees"
 msgstr "budanan çalışma ağaçlarını bildir"
 
-#: builtin/worktree.c:151
 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:221
 #, c-format
 msgid "'%s' already exists"
 msgstr "'%s' halihazırda var"
 
-#: builtin/worktree.c:230
 #, c-format
 msgid "unusable worktree destination '%s'"
 msgstr "kullanılamayan çalışma ağacı konumu '%s'"
 
-#: builtin/worktree.c:235
 #, c-format
 msgid ""
 "'%s' is a missing but locked worktree;\n"
@@ -24519,7 +12959,6 @@ msgstr ""
 "geçersiz kılmak için '%s -f -f', temizlemek için 'unlock', 'prune' veya "
 "'remove' kullanın"
 
-#: builtin/worktree.c:237
 #, c-format
 msgid ""
 "'%s' is a missing but already registered worktree;\n"
@@ -24528,146 +12967,117 @@ msgstr ""
 "'%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:248
 #, c-format
 msgid "failed to copy '%s' to '%s'; sparse-checkout may not work correctly"
 msgstr "'%s' -> '%s' kopyalanamadı; aralıklı çıkış düzgün çalışmayabilir"
 
-#: builtin/worktree.c:268
 #, c-format
 msgid "failed to copy worktree config from '%s' to '%s'"
 msgstr "çalışma ağacı yapılandırması '%s' -> '%s' konumuna kopyalanamadı"
 
-#: builtin/worktree.c:280 builtin/worktree.c:285
 #, c-format
 msgid "failed to unset '%s' in '%s'"
 msgstr "'%s' ayarı, '%s' içinde kaldırılamadı"
 
-#: builtin/worktree.c:356
 #, c-format
 msgid "could not create directory of '%s'"
 msgstr "'%s' dizini oluşturulamadı"
 
-#: builtin/worktree.c:378
 msgid "initializing"
 msgstr "ilklendiriliyor"
 
-#: builtin/worktree.c:492 builtin/worktree.c:498
 #, c-format
 msgid "Preparing worktree (new branch '%s')"
 msgstr "Çalışma ağacı hazırlanıyor (yeni dal '%s')"
 
-#: builtin/worktree.c:494
 #, 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:503
 #, c-format
 msgid "Preparing worktree (checking out '%s')"
 msgstr "Çalışma ağacı hazırlanıyor ('%s' çıkış yapılıyor)"
 
-#: builtin/worktree.c:509
 #, c-format
 msgid "Preparing worktree (detached HEAD %s)"
 msgstr "Çalışma ağacı hazırlanıyor (ayrık HEAD %s)"
 
-#: builtin/worktree.c:554
 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:557
 msgid "create a new branch"
 msgstr "yeni bir dal oluştur"
 
-#: builtin/worktree.c:559
 msgid "create or reset a branch"
 msgstr "yeni bir dal oluştur veya sıfırla"
 
-#: builtin/worktree.c:561
 msgid "populate the new working tree"
 msgstr "yeni çalışma ağacını doldur"
 
-#: builtin/worktree.c:562
 msgid "keep the new working tree locked"
 msgstr "yeni çalışma ağacını kilitli tut"
 
-#: builtin/worktree.c:564 builtin/worktree.c:809
 msgid "reason for locking"
 msgstr "kilitleme nedeni"
 
-#: builtin/worktree.c:567
 msgid "set up tracking mode (see git-branch(1))"
 msgstr "izleme kipini ayarla (bkz: git-branch(1))"
 
-#: builtin/worktree.c:570
 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:584
+#, c-format
+msgid "options '%s', '%s', and '%s' cannot be used together"
+msgstr "'%s', '%s' ve '%s' seçenekleri birlikte kullanılamaz"
+
 msgid "added with --lock"
 msgstr "--lock ile eklendi"
 
-#: builtin/worktree.c:646
 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:766
 msgid "show extended annotations and reasons, if available"
 msgstr "varsa genişletilmiş açıklamaları ve nedenleri göster"
 
-#: builtin/worktree.c:768
 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:770
 msgid "terminate records with a NUL character"
 msgstr "kayıtları bir NUL karakteriyle sonlandır"
 
-#: builtin/worktree.c:821 builtin/worktree.c:854 builtin/worktree.c:928
-#: builtin/worktree.c:1052
 #, c-format
 msgid "'%s' is not a working tree"
 msgstr "'%s' bir çalışma ağacı değil"
 
-#: builtin/worktree.c:823 builtin/worktree.c:856
 msgid "The main working tree cannot be locked or unlocked"
 msgstr "Ana çalışma ağacı kilitlenemez veya kilidi açılamaz"
 
-#: builtin/worktree.c:828
 #, c-format
 msgid "'%s' is already locked, reason: %s"
 msgstr "'%s' halihazırda kilitli, nedeni: %s"
 
-#: builtin/worktree.c:830
 #, c-format
 msgid "'%s' is already locked"
 msgstr "'%s' halihazırda kilitli"
 
-#: builtin/worktree.c:858
 #, c-format
 msgid "'%s' is not locked"
 msgstr "'%s' kilitli değil"
 
-#: builtin/worktree.c:899
 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:907
 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:930 builtin/worktree.c:1054
 #, c-format
 msgid "'%s' is a main working tree"
 msgstr "'%s' bir ana çalışma ağacı"
 
-#: builtin/worktree.c:935
 #, c-format
 msgid "could not figure out destination name from '%s'"
 msgstr "hedef adı şuradan anlaşılamadı: '%s'"
 
-#: builtin/worktree.c:948
 #, c-format
 msgid ""
 "cannot move a locked working tree, lock reason: %s\n"
@@ -24676,7 +13086,6 @@ msgstr ""
 "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:950
 msgid ""
 "cannot move a locked working tree;\n"
 "use 'move -f -f' to override or unlock first"
@@ -24684,38 +13093,31 @@ msgstr ""
 "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:953
 #, 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:958
 #, c-format
 msgid "failed to move '%s' to '%s'"
 msgstr "'%s' -> '%s' taşıması başarısız"
 
-#: builtin/worktree.c:1004
 #, c-format
 msgid "failed to run 'git status' on '%s'"
 msgstr "'%s' üzerinde 'git status' çalıştırılamadı"
 
-#: builtin/worktree.c:1008
 #, 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:1013
 #, 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:1036
 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:1059
 #, c-format
 msgid ""
 "cannot remove a locked working tree, lock reason: %s\n"
@@ -24724,7 +13126,6 @@ msgstr ""
 "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:1061
 msgid ""
 "cannot remove a locked working tree;\n"
 "use 'remove -f -f' to override or unlock first"
@@ -24732,1381 +13133,7956 @@ msgstr ""
 "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:1064
 #, 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:1088
 #, c-format
 msgid "repair: %s: %s"
 msgstr "şunu onar %s: %s"
 
-#: builtin/worktree.c:1091
 #, c-format
 msgid "error: %s: %s"
 msgstr "hata: %s: %s"
 
-#: builtin/write-tree.c:15
 msgid "git write-tree [--missing-ok] [--prefix=<prefix>/]"
 msgstr "git write-tree [--missing-ok] [--prefix=<önek>/]"
 
-#: builtin/write-tree.c:28
 msgid "<prefix>/"
 msgstr "<önek>/"
 
-#: builtin/write-tree.c:29
 msgid "write tree object for a subdirectory <prefix>"
 msgstr "bir <önek> altdizini için ağaç nesnesi yaz"
 
-#: builtin/write-tree.c:31
 msgid "only useful for debugging"
 msgstr "yalnızca hata ayıklama için yararlı"
 
-#: git.c:28
-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"
-"           [--git-dir=<path>] [--work-tree=<path>] [--namespace=<name>]\n"
-"           [--super-prefix=<path>] [--config-env=<name>=<envvar>]\n"
-"           <command> [<args>]"
-msgstr ""
-"git [--version] [--help] [-C <yol>] [-c <ad>=<değer>]\n"
-"           [--exec-path[=<yol>]] [--html-path] [--man-path] [--info-path]\n"
-"           [-p | --paginate | -P | --no-pager] [--no-replace-objects] [--"
-"bare]\n"
-"           [--git-dir=<yol>] [--work-tree=<yol>] [--namespace=<ad>]\n"
-"           [--super-prefix=<yol>] [--config-env=<ad>=<ortamdeğişkeni>]\n"
-"           <komut> [<argümanlar>]"
-
-#: git.c:36
-msgid ""
-"'git help -a' and 'git help -g' list available subcommands and some\n"
-"concept guides. See 'git help <command>' or 'git help <concept>'\n"
-"to read about a specific subcommand or concept.\n"
-"See 'git help git' for an overview of the system."
-msgstr ""
-"'git help -a' ve 'git help -g' kullanılabilir komutları ve bazı konsept\n"
-"kılavuzlarını listeler. Belirli bir komut veya konsept üzerine bilgi almak\n"
-"için 'git help <komut>' veya 'git help <konsept>' yazın. Genel bir görünüm\n"
-"için 'git help git' kullanabilirsiniz."
-
-#: git.c:188 git.c:216 git.c:300
-#, c-format
-msgid "no directory given for '%s' option\n"
-msgstr "'%s' seçeneği için bir dizin verilmedi\n"
-
-#: git.c:202
-#, c-format
-msgid "no namespace given for --namespace\n"
-msgstr "--namespace için ad alanı verilmedi\n"
-
-#: git.c:230
 #, c-format
-msgid "no prefix given for --super-prefix\n"
-msgstr "--super-prefix için önek verilmedi\n"
-
-#: git.c:252
-#, c-format
-msgid "-c expects a configuration string\n"
-msgstr "-c bir yapılandırma dizisi bekliyor\n"
-
-#: git.c:260
-#, c-format
-msgid "no config key given for --config-env\n"
-msgstr "--config-env için bir yapılandırma anahtarı verilmedi\n"
-
-#: git.c:326
-#, c-format
-msgid "unknown option: %s\n"
-msgstr "bilinmeyen seçenek: %s\n"
-
-#: git.c:375
-#, c-format
-msgid "while expanding alias '%s': '%s'"
-msgstr "'%s' arması genişletirilirken: '%s'"
-
-#: git.c:384
-#, c-format
-msgid ""
-"alias '%s' changes environment variables.\n"
-"You can use '!git' in the alias to do this"
-msgstr ""
-"'%s' arması ortam değişkenlerini değiştirir.\n"
-"Bunu yapmak için armada '!git' kullanabilirsiniz."
-
-#: git.c:391
-#, c-format
-msgid "empty alias for %s"
-msgstr "%s için boş arma"
-
-#: git.c:394
-#, c-format
-msgid "recursive alias: %s"
-msgstr "özyineli arma: %s"
-
-#: git.c:480
-msgid "write failure on standard output"
-msgstr "standart çıktı'da yazma hatası"
-
-#: git.c:482
-msgid "unknown write failure on standard output"
-msgstr "standart çıktı'da bilinmeyen yazma hatası"
-
-#: git.c:484
-msgid "close failed on standard output"
-msgstr "standart çıktı'da kapatma başarısız"
-
-#: git.c:838
-#, 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:888
-#, c-format
-msgid "cannot handle %s as a builtin"
-msgstr "%s bir yerleşik olarak ele alınamıyor"
-
-#: git.c:901
-#, c-format
-msgid ""
-"usage: %s\n"
-"\n"
-msgstr ""
-"kullanım: %s\n"
-"\n"
-
-#: git.c:921
-#, 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:933
-#, c-format
-msgid "failed to run command '%s': %s\n"
-msgstr "'%s' komutu çalıştırılamadı: %s\n"
-
-#: http-fetch.c:128
-#, c-format
-msgid "argument to --packfile must be a valid hash (got '%s')"
-msgstr "--packfile için argüman geçerli bir sağlama olmalıdır ('%s' alındı)"
-
-#: http-fetch.c:138
-msgid "not a git repository"
-msgstr "bir git deposu değil"
-
-#: t/helper/test-fast-rebase.c:141
-msgid "unhandled options"
-msgstr "beklenmeyen seçenekler"
-
-#: t/helper/test-fast-rebase.c:146
-msgid "error preparing revisions"
-msgstr "revizyonlar hazırlanırken hata"
-
-#: t/helper/test-reach.c:154
-#, c-format
-msgid "commit %s is not marked reachable"
-msgstr "%s işlemesi ulaşılabilir olarak imlenmedi"
-
-#: t/helper/test-reach.c:164
-msgid "too many commits marked reachable"
-msgstr "çok fazla işleme ulaşılabilir olarak imlenmiş"
-
-#: t/helper/test-serve-v2.c:7
-msgid "test-tool serve-v2 [<options>]"
-msgstr "test-tool serve-v2 [<seçenekler>]"
-
-#: t/helper/test-serve-v2.c:19
-msgid "exit immediately after advertising capabilities"
-msgstr "becerileri gösterdikten hemen sonra çık"
-
-#: 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: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: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: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:585
-msgid "test-helper simple-ipc send         [<name>] [<token>]"
-msgstr "test-helper simple-ipc send         [<ad>] [<jeton>]"
-
-#: 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:587
-msgid ""
-"test-helper simple-ipc multiple     [<name>] [<threads>] [<bytecount>] "
-"[<batchsize>]"
-msgstr ""
-"test-helper simple-ipc multiple     [<ad>] [<iş-parçacığı>] [<bayt-sayısı>] "
-"[<parti-boyutu>]"
-
-#: 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:597
-msgid "named-pipe name"
-msgstr "named-pipe adı"
-
-#: 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:600
-msgid "seconds to wait for daemon to start or stop"
-msgstr "ardalan sürecinin başlaması veya durması için beklenecek saniye"
-
-#: t/helper/test-simple-ipc.c:602
-msgid "number of bytes"
-msgstr "bayt sayısı"
-
-#: 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:605
-msgid "byte"
-msgstr "bayt"
-
-#: t/helper/test-simple-ipc.c:605
-msgid "ballast character"
-msgstr "dengeleyici karakter"
-
-#: t/helper/test-simple-ipc.c:606
-msgid "token"
-msgstr "jeton"
-
-#: t/helper/test-simple-ipc.c:606
-msgid "command token to send to the server"
-msgstr "sunucuya gönderilecek komut jetonu"
-
-#: 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:371
-msgid "Delegation control is not supported with cURL < 7.22.0"
-msgstr "Delegasyon denetimi cURL < 7.22.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: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:1016
-#, c-format
-msgid "Unsupported SSL backend '%s'. Supported SSL backends:"
-msgstr "Desteklenmeyen SSL arka ucu '%s'. Desteklenen SSL arka uçları:"
-
-#: 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: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:1876
-#, c-format
-msgid ""
-"unable to update url base from redirection:\n"
-"  asked for: %s\n"
-"   redirect: %s"
-msgstr ""
-"yeniden yönlendirerek url tabanı güncellenemiyor:\n"
-" şu istendi: %s\n"
-"   yönlenen: %s"
-
-#: remote-curl.c:184
-#, c-format
-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:308
-#, 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:409
-msgid "invalid server response; expected service, got flush packet"
-msgstr "geçersiz sunucu yanıtı; servis bekleniyordu, floş paketi alındı"
-
-#: remote-curl.c:440
-#, c-format
-msgid "invalid server response; got '%s'"
-msgstr "geçersiz sunucu yanıtı; '%s' alındı"
-
-#: remote-curl.c:500
-#, c-format
-msgid "repository '%s' not found"
-msgstr "'%s' deposu bulunamadı"
-
-#: remote-curl.c:504
-#, c-format
-msgid "Authentication failed for '%s'"
-msgstr "'%s' için kimlik doğrulaması başarısız"
-
-#: remote-curl.c:508
-#, 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:512
-#, c-format
-msgid "unable to access '%s': %s"
-msgstr "'%s' erişilemiyor: %s"
-
-#: remote-curl.c:518
-#, c-format
-msgid "redirecting to %s"
-msgstr "şuraya yeniden yönlendiriliyor: %s"
-
-#: remote-curl.c:649
-msgid "shouldn't have EOF when not gentle on EOF"
-msgstr "dosya sonuna dikkat edilmiyorsa dosya sonu olmamalıdır"
-
-#: remote-curl.c:661
-msgid "remote server sent unexpected response end packet"
-msgstr "uzak sunucu beklenmedik yanıt sonu paketi gönderdi"
-
-#: remote-curl.c:730
-msgid "unable to rewind rpc post data - try increasing http.postBuffer"
-msgstr ""
-"rpc sonrası verisi geri sarılamıyor - http.postBuffer'ı artırmayı deneyin"
+msgid "unrecognized bundle hash algorithm: %s"
+msgstr "bilinmeyen demet sağlama algoritması: %s"
 
-#: remote-curl.c:759
 #, c-format
-msgid "remote-curl: bad line length character: %.4s"
-msgstr "remote-curl: hatalı satır uzunluğu karakteri: %.4s"
-
-#: remote-curl.c:761
-msgid "remote-curl: unexpected response end packet"
-msgstr "remote-curl: beklenmedik yanıt sonu paketi"
+msgid "unknown capability '%s'"
+msgstr "bilinmeyen yetenek '%s'"
 
-#: remote-curl.c:837
 #, c-format
-msgid "RPC failed; %s"
-msgstr "RPC başarısız oldu; %s"
-
-#: remote-curl.c:877
-msgid "cannot handle pushes this big"
-msgstr "bu kadar büyük itmeler ele alınamıyor"
+msgid "'%s' does not look like a v2 or v3 bundle file"
+msgstr "'%s' bir v2 veya v3 demet dosyası gibi görünmüyor"
 
-#: remote-curl.c:990
 #, c-format
-msgid "cannot deflate request; zlib deflate error %d"
-msgstr "istek söndürülemiyor; 'zlib deflate' hatası %d"
+msgid "unrecognized header: %s%s (%d)"
+msgstr "tanımlanamayan üstbilgi: %s%s (%d)"
 
-#: remote-curl.c:994
-#, c-format
-msgid "cannot deflate request; zlib end error %d"
-msgstr "istek söndürülemiyor; 'zlib end' hatası %d"
+msgid "Repository lacks these prerequisite commits:"
+msgstr "Depo aşağıdaki önkoşul işlemelere iye değil:"
 
-#: remote-curl.c:1044
-#, c-format
-msgid "%d bytes of length header were received"
-msgstr "üstbilginin %d baytı alındı"
+msgid "need a repository to verify a bundle"
+msgstr "bir demeti doğrulamak için bir depo gerekiyor"
 
-#: remote-curl.c:1046
 #, c-format
-msgid "%d bytes of body are still expected"
-msgstr "gövdenin %d baytı hâlâ bekleniyor"
-
-#: remote-curl.c:1135
-msgid "dumb http transport does not support shallow capabilities"
-msgstr "programlanamayan http taşıyıcısı sığ işlevleri desteklemiyor"
-
-#: remote-curl.c:1150
-msgid "fetch failed."
-msgstr "getirme başarısız."
-
-#: remote-curl.c:1198
-msgid "cannot fetch by sha1 over smart http"
-msgstr "akıllı http üzerinden sha1 ile getirme yapılamıyor"
+msgid "The bundle contains this ref:"
+msgid_plural "The bundle contains these %<PRIuMAX> refs:"
+msgstr[0] "Demet bu başvuruyu içeriyor:"
+msgstr[1] "Demet bu %<PRIuMAX> başvuruyu içeriyor:"
 
-#: remote-curl.c:1242 remote-curl.c:1248
-#, c-format
-msgid "protocol error: expected sha/ref, got '%s'"
-msgstr "protokol hatası: sha/ref bekleniyordu, '%s' alındı"
+msgid "The bundle records a complete history."
+msgstr "Demet tam bir geçmiş kaydını yazar."
 
-#: remote-curl.c:1260 remote-curl.c:1378
 #, c-format
-msgid "http transport does not support %s"
-msgstr "http taşıyıcısı %s desteklemiyor"
-
-#: remote-curl.c:1296
-msgid "git-http-push failed"
-msgstr "git-http-push başarısız"
-
-#: remote-curl.c:1485
-msgid "remote-curl: usage: git remote-curl <remote> [<url>]"
-msgstr "remote-curl: kullanım: git remote-curl <uzak-konum> [<url>]"
-
-#: remote-curl.c:1517
-msgid "remote-curl: error reading command stream from git"
-msgstr "remote-curl: git'ten komut akışı okunurken hata"
-
-#: remote-curl.c:1524
-msgid "remote-curl: fetch attempted without a local repo"
-msgstr "remote-curl: yerel bir depo olmadan getirme yapılmaya çalışıldı"
+msgid "The bundle requires this ref:"
+msgid_plural "The bundle requires these %<PRIuMAX> refs:"
+msgstr[0] "Demet bu başvuruyu gerektiriyor:"
+msgstr[1] "Demet bu %<PRIuMAX> başvuruyu gerektiriyor:"
 
-#: remote-curl.c:1565
-#, c-format
-msgid "remote-curl: unknown command '%s' from git"
-msgstr "remote-curl: git'ten bilinmeyen komut '%s'"
+msgid "unable to dup bundle descriptor"
+msgstr "demet açıklayıcısı çoğaltılamıyor"
 
-#: contrib/scalar/scalar.c:49
-msgid "need a working directory"
-msgstr "bir çalışma dizini gerekiyor"
+msgid "Could not spawn pack-objects"
+msgstr "pack-objects ortaya çıkarılamadı"
 
-#: contrib/scalar/scalar.c:86
-msgid "could not find enlistment root"
-msgstr "gönüllü yazılma kaydı bulunamıyor"
+msgid "pack-objects died"
+msgstr "pack-objects sonlandı"
 
-#: contrib/scalar/scalar.c:89 contrib/scalar/scalar.c:350
-#: contrib/scalar/scalar.c:435 contrib/scalar/scalar.c:578
 #, c-format
-msgid "could not switch to '%s'"
-msgstr "şuraya geçilemedi: '%s'"
+msgid "ref '%s' is excluded by the rev-list options"
+msgstr "'%s' başvurusu revizyon listesi seçenekleri tarafından dışlandı"
 
-#: contrib/scalar/scalar.c:179
 #, c-format
-msgid "could not configure %s=%s"
-msgstr "%s=%s yapılandırılamadı"
-
-#: contrib/scalar/scalar.c:197
-msgid "could not configure log.excludeDecoration"
-msgstr "log.excludeDecoration yapılandırılamadı"
-
-#: contrib/scalar/scalar.c:218
-msgid "Scalar enlistments require a worktree"
-msgstr "Scalar gönüllü kayıtları bir çalışma ağacı gerektiriyor"
+msgid "unsupported bundle version %d"
+msgstr "desteklenmeyen demet sürümü %d"
 
-#: contrib/scalar/scalar.c:310
 #, c-format
-msgid "remote HEAD is not a branch: '%.*s'"
-msgstr "uzak konum HEAD'i bir dal değil: '%.*s'"
-
-#: contrib/scalar/scalar.c:316
-msgid "failed to get default branch name from remote; using local default"
-msgstr ""
-"uzak konumdan öntanımlı dal adı alınamadı; yerel öntanımlı kullanılıyor"
-
-#: contrib/scalar/scalar.c:329
-msgid "failed to get default branch name"
-msgstr "öntanımlı dal adı alınamadı"
-
-#: contrib/scalar/scalar.c:340
-msgid "failed to unregister repository"
-msgstr "depo kaydı silinemedi"
-
-#: contrib/scalar/scalar.c:355
-msgid "failed to delete enlistment directory"
-msgstr "gönüllü kayıt dizini silinemedi"
-
-#: contrib/scalar/scalar.c:375
-msgid "branch to checkout after clone"
-msgstr "klonlama sonrası çıkış yapılacak dal"
-
-#: contrib/scalar/scalar.c:377
-msgid "when cloning, create full working directory"
-msgstr "klonlama sırasında tam çalışma dizini oluştur"
-
-#: contrib/scalar/scalar.c:379
-msgid "only download metadata for the branch that will be checked out"
-msgstr "yalnızca çıkış yapılacak dalın üstverisini indir"
-
-#: contrib/scalar/scalar.c:384
-msgid "scalar clone [<options>] [--] <repo> [<dir>]"
-msgstr "scalar clone [<seçenekler>] [--] <depo> [<dizin>]"
+msgid "cannot write bundle version %d with algorithm %s"
+msgstr "demet sürümü %d, %s algoritması ile yazılamıyor"
 
-#: contrib/scalar/scalar.c:409
-#, c-format
-msgid "cannot deduce worktree name from '%s'"
-msgstr "'%s' ögesinden çalışma ağacı adı ortaya çıkarılamıyor"
+msgid "Refusing to create empty bundle."
+msgstr "Boş demet oluşturma reddediliyor."
 
-#: contrib/scalar/scalar.c:418
 #, c-format
-msgid "directory '%s' exists already"
-msgstr "'%s' dizini halihazırda var"
+msgid "cannot create '%s'"
+msgstr "'%s' oluşturulamıyor"
 
-#: contrib/scalar/scalar.c:445
-#, c-format
-msgid "failed to get default branch for '%s'"
-msgstr "'%s' için öntanımlı dal alınamadı"
+msgid "index-pack died"
+msgstr "index-pack sonlandı"
 
-#: contrib/scalar/scalar.c:456
-#, c-format
-msgid "could not configure remote in '%s'"
-msgstr "'%s' içindeki uzak konum yapılandırılamadı"
+msgid "terminating chunk id appears earlier than expected"
+msgstr "iri parça numarası sonlandırması beklenenden önce ortaya çıkıyor"
 
-#: contrib/scalar/scalar.c:465
 #, c-format
-msgid "could not configure '%s'"
-msgstr "'%s' yapılandırılamadı"
-
-#: contrib/scalar/scalar.c:468
-msgid "partial clone failed; attempting full clone"
-msgstr "kısımsal klonlama başarısız; tam klonlama deneniyor"
-
-#: contrib/scalar/scalar.c:472
-msgid "could not configure for full clone"
-msgstr "tam klonlama için yapılandırılamadı"
-
-#: contrib/scalar/scalar.c:504
-msgid "`scalar list` does not take arguments"
-msgstr "'scalar list' argüman almıyor"
-
-#: contrib/scalar/scalar.c:517
-msgid "scalar register [<enlistment>]"
-msgstr "scalar register [<gönüllükayıt>]"
-
-#: contrib/scalar/scalar.c:544
-msgid "reconfigure all registered enlistments"
-msgstr "tüm kaydı yapılmış gönüllü kayıtları yeniden yapılandır"
-
-#: contrib/scalar/scalar.c:548
-msgid "scalar reconfigure [--all | <enlistment>]"
-msgstr "scalar reconfigure [--all | <gönüllükayıt>]"
-
-#: contrib/scalar/scalar.c:566
-msgid "--all or <enlistment>, but not both"
-msgstr "--all veya <gönüllükayıt>; ancak ikisi değil"
+msgid "improper chunk offset(s) %<PRIx64> and %<PRIx64>"
+msgstr "düzgün olmayan iri parça ofseti %<PRIx64> ve %<PRIx64>"
 
-#: contrib/scalar/scalar.c:581
 #, c-format
-msgid "git repository gone in '%s'"
-msgstr "git deposu '%s' içinde gitti"
-
-#: contrib/scalar/scalar.c:621
-msgid ""
-"scalar run <task> [<enlistment>]\n"
-"Tasks:\n"
-msgstr ""
-"scalar run <görev> [<gönüllükayıt>]\n"
-"Görevler:\n"
+msgid "duplicate chunk ID %<PRIx32> found"
+msgstr "yinelenmiş iri parça numarası %<PRIx32> bulundu"
 
-#: contrib/scalar/scalar.c:639
 #, c-format
-msgid "no such task: '%s'"
-msgstr "böyle bir görev yok: '%s'"
-
-#: contrib/scalar/scalar.c:689
-msgid "scalar unregister [<enlistment>]"
-msgstr "scalar unregister [<enlistment>]"
-
-#: contrib/scalar/scalar.c:736
-msgid "scalar delete <enlistment>"
-msgstr "scalar delete <gönüllükayıt>"
-
-#: contrib/scalar/scalar.c:751
-msgid "refusing to delete current working directory"
-msgstr "geçerli çalışma dizinini silme reddediliyor"
-
-#: contrib/scalar/scalar.c:766
-msgid "include Git version"
-msgstr "Git sürümünü içer"
-
-#: contrib/scalar/scalar.c:768
-msgid "include Git's build options"
-msgstr "Git'in yapı seçeneklerini içer"
-
-#: contrib/scalar/scalar.c:772
-msgid "scalar verbose [-v | --verbose] [--build-options]"
-msgstr "scalar verbose [-v | --verbose] [--build-options]"
+msgid "final chunk has non-zero id %<PRIx32>"
+msgstr "en son iri parçanın numarası sıfır olmayan %<PRIx32>"
 
-#: contrib/scalar/scalar.c:813
-msgid "-C requires a <directory>"
-msgstr "-C, bir <dizin> gerektiriyor"
+msgid "invalid hash version"
+msgstr "geçersiz sağlama sürümü"
 
-#: contrib/scalar/scalar.c:815
 #, c-format
-msgid "could not change to '%s'"
-msgstr "'%s' olarak değiştirilemedi"
-
-#: contrib/scalar/scalar.c:821
-msgid "-c requires a <key>=<value> argument"
-msgstr "-c, bir <anahtar>=<değer> argümanı gerektiriyor"
-
-#: contrib/scalar/scalar.c:839
-msgid ""
-"scalar [-C <directory>] [-c <key>=<value>] <command> [<options>]\n"
-"\n"
-"Commands:\n"
-msgstr ""
-"scalar [-C <dizin>] [-c <anahtar>=<değer>] <komut> [<seçenekler>]\n"
-"\n"
-"Komutlar:\n"
-
-#: compat/compiler.h:26
-msgid "no compiler information available\n"
-msgstr "derleyici bilgisi mevcut değil\n"
-
-#: compat/compiler.h:38
-msgid "no libc information available\n"
-msgstr "libc bilgisi mevcut değil\n"
-
-#: list-objects-filter-options.h:126
-msgid "args"
-msgstr "argümanlar"
-
-#: list-objects-filter-options.h:127
-msgid "object filtering"
-msgstr "nesne süzümü"
-
-#: parse-options.h:188
-msgid "expiry-date"
-msgstr "son kullanım tarihi"
-
-#: parse-options.h:202
-msgid "no-op (backward compatibility)"
-msgstr "işlem yok (geriye dönük uyumluluk için)"
-
-#: parse-options.h:341
-msgid "be more verbose"
-msgstr "daha ayrıntılı anlat"
-
-#: parse-options.h:343
-msgid "be more quiet"
-msgstr "daha sessiz ol"
-
-#: parse-options.h:349
-msgid "use <n> digits to display object names"
-msgstr "nesne adlarını görüntülemek için <n> basamak kullan"
-
-#: parse-options.h:368
-msgid "how to strip spaces and #comments from message"
-msgstr "iletiden boşlukları ve #yorumları çıkart"
-
-#: parse-options.h:369
-msgid "read pathspec from file"
-msgstr "yol belirtecini dosyadan oku"
-
-#: parse-options.h:370
-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:98
-msgid "key"
-msgstr "anahtar"
-
-#: ref-filter.h:98
-msgid "field name to sort on"
-msgstr "üzerine sıralanacak alan adı"
-
-#: rerere.h:44
-msgid "update the index with reused conflict resolution if possible"
-msgstr ""
-"eğer olanaklıysa indeksi yeniden kullanılmış çakışma çözümü ile güncelle"
+msgid "invalid color value: %.*s"
+msgstr "geçersiz renk değeri: %.*s"
 
-#: command-list.h:50
 msgid "Add file contents to the index"
 msgstr "Dosya içeriğini indekse ekle"
 
-#: command-list.h:51
 msgid "Apply a series of patches from a mailbox"
 msgstr "Bir posta kutusundan bir dizi yama uygula"
 
-#: command-list.h:52
 msgid "Annotate file lines with commit information"
 msgstr "İşleme bilgisini dosya içi açıklama olarak ekle"
 
-#: command-list.h:53
 msgid "Apply a patch to files and/or to the index"
 msgstr "İndekse ve/veya dosyalara bir yama uygula"
 
-#: command-list.h:54
 msgid "Import a GNU Arch repository into Git"
 msgstr "Git'e bir GNU Arch deposu içe aktar"
 
-#: command-list.h:55
 msgid "Create an archive of files from a named tree"
 msgstr "Ad verilmiş ağaçtan bir dosyalar arşivi oluştur"
 
-#: command-list.h:56
 msgid "Use binary search to find the commit that introduced a bug"
 msgstr "Hatalara neden olan işlemeyi bulmada ikili arama kullan"
 
-#: command-list.h:57
 msgid "Show what revision and author last modified each line of a file"
 msgstr "Dosya satırlarını son değiştiren revizyon/yazarı göster"
 
-#: command-list.h:58
 msgid "List, create, or delete branches"
 msgstr "Dal oluştur, sil veya listele"
 
-#: command-list.h:59
 msgid "Collect information for user to file a bug report"
 msgstr "Hata raporu bildirimi için veri topla"
 
-#: command-list.h:60
 msgid "Move objects and refs by archive"
 msgstr "Nesneleri ve başvuruları arşive göre taşı"
 
-#: command-list.h:61
 msgid "Provide content or type and size information for repository objects"
 msgstr "Depo nesneleri için içerik veya tür/boyut bilgisi sağla"
 
-#: command-list.h:62
 msgid "Display gitattributes information"
 msgstr "gitattributes bilgisini görüntüle"
 
-#: command-list.h:63
 msgid "Debug gitignore / exclude files"
 msgstr "gitignore / exclude dosyalarında hata ayıkla"
 
-#: command-list.h:64
 msgid "Show canonical names and email addresses of contacts"
 msgstr "Kişilerin adlarını ve e-posta adreslerini göster"
 
-#: command-list.h:65
 msgid "Ensures that a reference name is well formed"
 msgstr "Bir başvuru adının düzgünce oluşturulduğundan emin ol"
 
-#: command-list.h:66
 msgid "Switch branches or restore working tree files"
 msgstr "Dal değiştir veya çalışma ağacını eski haline geri getir"
 
-#: command-list.h:67
 msgid "Copy files from the index to the working tree"
 msgstr "Dosyaları indeksten çalışma ağacına kopyala"
 
-#: command-list.h:68
 msgid "Find commits yet to be applied to upstream"
 msgstr "Henüz üstkaynağa uygulanmayan işlemeleri bul"
 
-#: command-list.h:69
 msgid "Apply the changes introduced by some existing commits"
 msgstr "Mevcut bazı işlemelerin getirdiği değişiklikleri uygula"
 
-#: command-list.h:70
 msgid "Graphical alternative to git-commit"
 msgstr "git-commit için grafik tabanlı alternatif"
 
-#: command-list.h:71
 msgid "Remove untracked files from the working tree"
 msgstr "İzlenmeyen dosyaları çalışma ağacından kaldır"
 
-#: command-list.h:72
 msgid "Clone a repository into a new directory"
 msgstr "Bir depoyu yeni bir dizine klonla"
 
-#: command-list.h:73
 msgid "Display data in columns"
 msgstr "Verileri sütunlarla göster"
 
-#: command-list.h:74
 msgid "Record changes to the repository"
 msgstr "Değişikliklerin kaydını depoya yaz"
 
-#: command-list.h:75
 msgid "Write and verify Git commit-graph files"
 msgstr "Git commit-graph dosyalarını doğrula ve yaz"
 
-#: command-list.h:76
 msgid "Create a new commit object"
 msgstr "Yeni bir işleme nesnesi oluştur"
 
-#: command-list.h:77
 msgid "Get and set repository or global options"
 msgstr "Depoyu veya global seçenekleri al ve ayarla"
 
-#: command-list.h:78
 msgid "Count unpacked number of objects and their disk consumption"
 msgstr "Açılmamış nesne sayısını ve disk kullanımını hesapla"
 
-#: command-list.h:79
 msgid "Retrieve and store user credentials"
 msgstr "Kullanıcı yetkilerini al ve depola"
 
-#: command-list.h:80
 msgid "Helper to temporarily store passwords in memory"
 msgstr "Parolaları geçici olarak bellekte saklamak için yardımcı"
 
-#: command-list.h:81
 msgid "Helper to store credentials on disk"
 msgstr "Yetkileri diskte saklamak için yardımcı"
 
-#: command-list.h:82
 msgid "Export a single commit to a CVS checkout"
 msgstr "Bir CVS çıkışına tek bir işlemeyi dışa aktar"
 
-#: command-list.h:83
 msgid "Salvage your data out of another SCM people love to hate"
 msgstr "'Tiskindiğiniz' başka bir KDY'den verinizi kurtarın"
 
-#: command-list.h:84
 msgid "A CVS server emulator for Git"
 msgstr "Git için bir SCV sunucusu öykünücüsü"
 
-#: command-list.h:85
 msgid "A really simple server for Git repositories"
 msgstr "Git depoları için gerçekten yalın bir sunucu"
 
-#: command-list.h:86
 msgid "Give an object a human readable name based on an available ref"
 msgstr "Uygun bir başvuruyu temel alıp nesneye okunabilir ad ver"
 
-#: command-list.h:87
 msgid "Show changes between commits, commit and working tree, etc"
 msgstr "İşlemeler, işleme ve ağaçlar vb. arası değişiklikler"
 
-#: command-list.h:88
 msgid "Compares files in the working tree and the index"
 msgstr "İndeksteki ve çalışma ağacındaki dosyaları sıkıştır"
 
-#: command-list.h:89
 msgid "Compare a tree to the working tree or index"
 msgstr "Bir ağacı çalışma ağacı veya indeks ile karşılaştır"
 
-#: command-list.h:90
 msgid "Compares the content and mode of blobs found via two tree objects"
 msgstr ""
 "İki ağaç nesnesi aracılığıyla bulunan ikililerin içerik ve kipini karşılaştır"
 
-#: command-list.h:91
 msgid "Show changes using common diff tools"
 msgstr "Değişiklikleri yaygın diff araçlarıyla göster"
 
-#: command-list.h:92
 msgid "Git data exporter"
 msgstr "Git veri dışa aktarıcısı"
 
-#: command-list.h:93
 msgid "Backend for fast Git data importers"
 msgstr "Hızlı Git veri dışa aktarıcıları için arka uç"
 
-#: command-list.h:94
 msgid "Download objects and refs from another repository"
 msgstr "Başka bir depodan nesneleri ve başvuruları indir"
 
-#: command-list.h:95
 msgid "Receive missing objects from another repository"
 msgstr "Başka bir depodan eksik nesneleri al"
 
-#: command-list.h:96
 msgid "Rewrite branches"
 msgstr "Dalları yeniden yaz"
 
-#: command-list.h:97
 msgid "Produce a merge commit message"
 msgstr "Bir birleştirme işlemesi iletisi oluştur"
 
-#: command-list.h:98
 msgid "Output information on each ref"
 msgstr "Her başvuru üzerine bilgi çıktı ver"
 
-#: command-list.h:99
 msgid "Run a Git command on a list of repositories"
 msgstr "Listedeki depolar üzerinde bir Git komutu çalıştır"
 
-#: command-list.h:100
 msgid "Prepare patches for e-mail submission"
 msgstr "E-posta teslimi için yamaları hazırla"
 
-#: command-list.h:101
 msgid "Verifies the connectivity and validity of the objects in the database"
 msgstr "Veritab. nesnelerin bağlanırlığını ve geçerliliğini sına"
 
-#: command-list.h:102
 msgid "Cleanup unnecessary files and optimize the local repository"
 msgstr "Gereksiz dosyaları temizle ve yerel depoyu eniyile"
 
-#: command-list.h:103
 msgid "Extract commit ID from an archive created using git-archive"
 msgstr "İşleme iletisini bir git-archive arşivinden çıkartıp al"
 
-#: command-list.h:104
 msgid "Print lines matching a pattern"
 msgstr "Bir dizgi ile eşleşen satırları yazdır"
 
-#: command-list.h:105
 msgid "A portable graphical interface to Git"
 msgstr "Git için taşınabilir bir grafik arabirim"
 
-#: command-list.h:106
 msgid "Compute object ID and optionally creates a blob from a file"
 msgstr "Sağlamayı hesapla ve isteğe göre dosyadan ikili oluştur"
 
-#: command-list.h:107
 msgid "Display help information about Git"
 msgstr "Git yardım bilgisini görüntüle"
 
-#: command-list.h:108
 msgid "Run git hooks"
 msgstr "Git kancalarını çalıştır"
 
-#: command-list.h:109
 msgid "Server side implementation of Git over HTTP"
 msgstr "Git'in HTTP üzerinden sunucu tarafı uygulaması"
 
-#: command-list.h:110
 msgid "Download from a remote Git repository via HTTP"
 msgstr "HTTP üzerinden uzak bir Git deposundan indir"
 
-#: command-list.h:111
 msgid "Push objects over HTTP/DAV to another repository"
 msgstr "Nesneleri HTTP/DAV üzerinden başka bir depoya it"
 
-#: command-list.h:112
 msgid "Send a collection of patches from stdin to an IMAP folder"
 msgstr "stdin'den bir IMAP klasörüne bir yama derlemesi gönder"
 
-#: command-list.h:113
 msgid "Build pack index file for an existing packed archive"
 msgstr "Mevcut paketli bir arşiv için paket indeks dosyası yap"
 
-#: command-list.h:114
 msgid "Create an empty Git repository or reinitialize an existing one"
 msgstr "Boş bir Git deposu oluştur veya olanı yeniden ilklendir"
 
-#: command-list.h:115
 msgid "Instantly browse your working repository in gitweb"
 msgstr "gitweb'deki çalışma deposuna anında göz at"
 
-#: command-list.h:116
 msgid "Add or parse structured information in commit messages"
 msgstr "İşleme iletilerine düzenli bilgi ekle veya ayrıştır"
 
-#: command-list.h:117
 msgid "Show commit logs"
 msgstr "İşleme günlüklerini göster"
 
-#: command-list.h:118
 msgid "Show information about files in the index and the working tree"
 msgstr "İndeks ve çalışma ağacındaki dosya bilgilerini göster"
 
-#: command-list.h:119
 msgid "List references in a remote repository"
 msgstr "Uzak bir depodaki başvuruları listele"
 
-#: command-list.h:120
 msgid "List the contents of a tree object"
 msgstr "Bir ağaç nesnesinin içeriğini listele"
 
-#: command-list.h:121
 msgid "Extracts patch and authorship from a single e-mail message"
 msgstr "E-posta iletisinden yama ve yazar bilgisini çıkart"
 
-#: command-list.h:122
 msgid "Simple UNIX mbox splitter program"
 msgstr "Yalın UNIX mbox bölücü yazılımı"
 
-#: command-list.h:123
 msgid "Run tasks to optimize Git repository data"
 msgstr "Git depo verisini eniyilemek için görevler çalıştır"
 
-#: command-list.h:124
 msgid "Join two or more development histories together"
 msgstr "İki veya daha fazla geliştirme geçmişini birleştir"
 
-#: command-list.h:125
 msgid "Find as good common ancestors as possible for a merge"
 msgstr "Birleştirme için olabildiğince en iyi ortak ataları bul"
 
-#: command-list.h:126
 msgid "Run a three-way file merge"
 msgstr "Bir 3 yönlü dosya birleştirmesi çalıştır"
 
-#: command-list.h:127
 msgid "Run a merge for files needing merging"
 msgstr "Birleştirilmesi gereken dosyaları birleştir"
 
-#: command-list.h:128
 msgid "The standard helper program to use with git-merge-index"
 msgstr "Bu yardımcı program git-merge-index kullanımı içindir"
 
-#: command-list.h:129
 msgid "Show three-way merge without touching index"
 msgstr "İndekse dokunmadan üçlü birleştirmeyi göster"
 
-#: command-list.h:130
 msgid "Run merge conflict resolution tools to resolve merge conflicts"
 msgstr "Çakışmaları çözmek için çözüm araçlarını çalıştır"
 
-#: command-list.h:131
 msgid "Creates a tag object with extra validation"
 msgstr "Ek doğrulamalı bir etiket nesnesi oluştur"
 
-#: command-list.h:132
 msgid "Build a tree-object from ls-tree formatted text"
 msgstr "ls-tree biçimli metinden bir ağaç nesnesi yap"
 
-#: command-list.h:133
 msgid "Write and verify multi-pack-indexes"
 msgstr "multi-pack-index doğrula ve yaz"
 
-#: command-list.h:134
 msgid "Move or rename a file, a directory, or a symlink"
 msgstr "Dosya, dizin veya sembolik bağları taşı/yeniden adlandır"
 
-#: command-list.h:135
 msgid "Find symbolic names for given revs"
 msgstr "Verilen revizyonlar için sembolik adları bul"
 
-#: command-list.h:136
 msgid "Add or inspect object notes"
 msgstr "Nesne notları ekle veya incele"
 
-#: command-list.h:137
 msgid "Import from and submit to Perforce repositories"
 msgstr "Perforce depolarından içe aktar ve onlara gönder"
 
-#: command-list.h:138
 msgid "Create a packed archive of objects"
 msgstr "Paketlenmiş bir nesne arşivi oluştur"
 
-#: command-list.h:139
 msgid "Find redundant pack files"
 msgstr "Gereksiz paket dosyalarını bul"
 
-#: command-list.h:140
 msgid "Pack heads and tags for efficient repository access"
 msgstr "Etkili depo erişimi için dal uçları ve etiketler paketle"
 
-#: command-list.h:141
 msgid "Compute unique ID for a patch"
 msgstr "Bir yama için eşi olmayan numara hesapla"
 
-#: command-list.h:142
 msgid "Prune all unreachable objects from the object database"
 msgstr "Ulaşılamayan tüm nesneleri nesne veritabanından buda"
 
-#: command-list.h:143
 msgid "Remove extra objects that are already in pack files"
 msgstr "Halihazırda paket dosyalarında olan ek nesneleri kaldır"
 
-#: command-list.h:144
 msgid "Fetch from and integrate with another repository or a local branch"
 msgstr "Başka bir depo veya yerel daldan getir ve entegre et"
 
-#: command-list.h:145
 msgid "Update remote refs along with associated objects"
 msgstr "İlişkin nesnelerle birlikte uzak başvuruları da güncelle"
 
-#: command-list.h:146
 msgid "Applies a quilt patchset onto the current branch"
 msgstr "Geçerli dala bir \"Quilt\" yama seti uygula"
 
-#: command-list.h:147
 msgid "Compare two commit ranges (e.g. two versions of a branch)"
 msgstr "İki işleme erimini karşılaştır (bir dalın iki sürümü)"
 
-#: command-list.h:148
 msgid "Reads tree information into the index"
 msgstr "Ağaç bilgisini indekse okur"
 
-#: command-list.h:149
 msgid "Reapply commits on top of another base tip"
 msgstr "İşlemeleri başka bir temel ucu üzerine uygula"
 
-#: command-list.h:150
 msgid "Receive what is pushed into the repository"
 msgstr "Depoya ne itildiyse al"
 
-#: command-list.h:151
 msgid "Manage reflog information"
 msgstr "Başvuru günlüğü bilgisini yönet"
 
-#: command-list.h:152
 msgid "Manage set of tracked repositories"
 msgstr "İzlenen depolar setini yönet"
 
-#: command-list.h:153
 msgid "Pack unpacked objects in a repository"
 msgstr "Bir depodaki paketlenmemiş nesneleri paketle"
 
-#: command-list.h:154
 msgid "Create, list, delete refs to replace objects"
 msgstr "Nesne değiştirmek için başvurular oluştur, sil, listele"
 
-#: command-list.h:155
 msgid "Generates a summary of pending changes"
 msgstr "Bekleyen değişikliklerin bir özetini çıkart"
 
-#: command-list.h:156
 msgid "Reuse recorded resolution of conflicted merges"
 msgstr "Çakışan birleştirmelerin kayıtlı çözümlerini yen. kullan"
 
-#: command-list.h:157
 msgid "Reset current HEAD to the specified state"
 msgstr "Geçerli HEAD'i belirtilen duruma sıfırla"
 
-#: command-list.h:158
 msgid "Restore working tree files"
 msgstr "Çalışma ağacı dosyalarını eski durumuna getir"
 
-#: command-list.h:159
 msgid "Lists commit objects in reverse chronological order"
 msgstr "İşleme nesnelerini ters kronolojik sırada listele"
 
-#: command-list.h:160
 msgid "Pick out and massage parameters"
 msgstr "Parametreleri al ve üzerinde çalış"
 
-#: command-list.h:161
 msgid "Revert some existing commits"
 msgstr "Bazı var olan işlemeleri geri al"
 
-#: command-list.h:162
 msgid "Remove files from the working tree and from the index"
 msgstr "Dosyaları çalışma ağacından ve indeksten kaldır"
 
-#: command-list.h:163
 msgid "Send a collection of patches as emails"
 msgstr "Bir yama derlemesini e-posta olarak gönder"
 
-#: command-list.h:164
 msgid "Push objects over Git protocol to another repository"
 msgstr "Nesneleri Git protokolü üzerinden başka bir depoya it"
 
-#: command-list.h:165
 msgid "Git's i18n setup code for shell scripts"
 msgstr "Kabuk betikleri için Git'in i18n kurulum kodu"
 
-#: command-list.h:166
 msgid "Common Git shell script setup code"
 msgstr "Ortak Git kabuk betiği kurulum kodu"
 
-#: command-list.h:167
 msgid "Restricted login shell for Git-only SSH access"
 msgstr "Yalnızca Git SSH erişimi için kısıtlandırılmış oturum açma kabuğu"
 
-#: command-list.h:168
 msgid "Summarize 'git log' output"
 msgstr "'git log' çıktısını özetle"
 
-#: command-list.h:169
 msgid "Show various types of objects"
 msgstr "Çeşitli türlerden nesneleri göster"
 
-#: command-list.h:170
 msgid "Show branches and their commits"
 msgstr "Dalları ve onların işlemelerini göster"
 
-#: command-list.h:171
 msgid "Show packed archive index"
 msgstr "Paketlenmiş arşiv indeksini göster"
 
-#: command-list.h:172
 msgid "List references in a local repository"
 msgstr "Yerel bir depodaki başvuruları listele"
 
-#: command-list.h:173
 msgid "Reduce your working tree to a subset of tracked files"
 msgstr "Çalışma ağacını izlenen dosyaların bir alt kümesine küçült"
 
-#: command-list.h:174
 msgid "Add file contents to the staging area"
 msgstr "Dosya içeriğini hazırlama alanına ekle"
 
-#: command-list.h:175
 msgid "Stash the changes in a dirty working directory away"
 msgstr "Kirli bir çalışma dizinindeki değişiklikleri zulala"
 
-#: command-list.h:176
 msgid "Show the working tree status"
 msgstr "Çalışma ağacı durumunu göster"
 
-#: command-list.h:177
 msgid "Remove unnecessary whitespace"
 msgstr "Gereksiz boşlukları kaldır"
 
-#: command-list.h:178
 msgid "Initialize, update or inspect submodules"
 msgstr "Altmodülleri ilklendir, güncelle veya incele"
 
-#: command-list.h:179
 msgid "Bidirectional operation between a Subversion repository and Git"
 msgstr "Bir Subversion ve Git deposu arasında iki yönlü işlemler"
 
-#: command-list.h:180
 msgid "Switch branches"
 msgstr "Dal değiştir"
 
-#: command-list.h:181
 msgid "Read, modify and delete symbolic refs"
 msgstr "Sembolik başvuruları oku, düzenle ve sil"
 
-#: command-list.h:182
 msgid "Create, list, delete or verify a tag object signed with GPG"
 msgstr "GPG imzalı bir etiket oluştur, sil, listele veya doğrula"
 
-#: command-list.h:183
 msgid "Creates a temporary file with a blob's contents"
 msgstr "Bir ikili nesnenin içeriği ile geçici bir dosya oluştur"
 
-#: command-list.h:184
 msgid "Unpack objects from a packed archive"
 msgstr "Paketlenmiş bir arşivden nesneleri çıkar"
 
-#: command-list.h:185
 msgid "Register file contents in the working tree to the index"
 msgstr "Çalışma ağacındaki dosya içeriğini indekse kaydet"
 
-#: command-list.h:186
 msgid "Update the object name stored in a ref safely"
 msgstr "Güvenlice bir başvuruda depolanan nesne adını güncelle"
 
-#: command-list.h:187
 msgid "Update auxiliary info file to help dumb servers"
 msgstr ""
 "Programlanamayan sunuculara destek için yardımcı veri dosyasını güncelle"
 
-#: command-list.h:188
 msgid "Send archive back to git-archive"
 msgstr "Arşivi git-archive'e geri gönder"
 
-#: command-list.h:189
 msgid "Send objects packed back to git-fetch-pack"
 msgstr "Nesneleri git-fetch-pack'e paketlenmiş olarak geri gönder"
 
-#: command-list.h:190
 msgid "Show a Git logical variable"
 msgstr "Bir mantıksal Git değişkeni göster"
 
-#: command-list.h:191
 msgid "Check the GPG signature of commits"
 msgstr "İşlemelerin GPG imzasını denetle"
 
-#: command-list.h:192
 msgid "Validate packed Git archive files"
 msgstr "Paketlenmiş Git arşiv dosyalarını doğrula"
 
-#: command-list.h:193
 msgid "Check the GPG signature of tags"
 msgstr "Etiketlerin GPG imzasını doğrula"
 
-#: command-list.h:194
 msgid "Show logs with difference each commit introduces"
 msgstr "Günlükleri her işlemenin sunduğu değişikliklerle göster"
 
-#: command-list.h:195
 msgid "Manage multiple working trees"
 msgstr "Birden çok çalışma ağacını yönet"
 
-#: command-list.h:196
 msgid "Create a tree object from the current index"
 msgstr "Geçerli indeksten bir ağaç nesnesi oluştur"
 
-#: command-list.h:197
 msgid "Defining attributes per path"
 msgstr "Öznitelikleri yola göre tanımla"
 
-#: command-list.h:198
 msgid "Git command-line interface and conventions"
 msgstr "Git komut satırı arabirimi ve kuralları"
 
-#: command-list.h:199
 msgid "A Git core tutorial for developers"
 msgstr "Geliştiriciler için Git çekirdeği eğitmeni"
 
-#: command-list.h:200
 msgid "Providing usernames and passwords to Git"
 msgstr "Git'e kullanıcı adları ve parolalar belirt"
 
-#: command-list.h:201
 msgid "Git for CVS users"
 msgstr "CVS kullanıcıları için Git"
 
-#: command-list.h:202
 msgid "Tweaking diff output"
 msgstr "diff çıktısı için ince ayarlar"
 
-#: command-list.h:203
 msgid "A useful minimum set of commands for Everyday Git"
 msgstr "Günlük Git kullanımı için yararlı komutlar"
 
-#: command-list.h:204
 msgid "Frequently asked questions about using Git"
 msgstr "Git kullanımı hakkında sıkça sorulan sorular"
 
-#: command-list.h:205
 msgid "A Git Glossary"
 msgstr "Git Kavram Dizini"
 
-#: command-list.h:206
 msgid "Hooks used by Git"
 msgstr "Git tarafından kullanılan kancalar"
 
-#: command-list.h:207
 msgid "Specifies intentionally untracked files to ignore"
 msgstr "Özellikle yok sayılması istenen dosyaları belirt"
 
-#: command-list.h:208
 msgid "The Git repository browser"
 msgstr "Git depo tarayıcısı"
 
-#: command-list.h:209
 msgid "Map author/committer names and/or E-Mail addresses"
 msgstr "Yazar/İşleyici adlarını ve/veya e-posta adreslerini eşlemle"
 
-#: command-list.h:210
 msgid "Defining submodule properties"
 msgstr "Altmodül özelliklerini tanımlama"
 
-#: command-list.h:211
 msgid "Git namespaces"
 msgstr "Git ad alanları"
 
-#: command-list.h:212
 msgid "Helper programs to interact with remote repositories"
 msgstr "Uzak depolar ile etkileşim için yardımcı programlar"
 
-#: command-list.h:213
 msgid "Git Repository Layout"
 msgstr "Git Depo Yerleşimi"
 
-#: command-list.h:214
 msgid "Specifying revisions and ranges for Git"
 msgstr "Git için revizyonları ve erimleri belirtme"
 
-#: command-list.h:215
 msgid "Mounting one repository inside another"
 msgstr "Bir depoyu bir başkasının içine bağlama"
 
-#: command-list.h:216
 msgid "A tutorial introduction to Git"
 msgstr "Git'e Giriş"
 
-#: command-list.h:217
 msgid "A tutorial introduction to Git: part two"
 msgstr "Git'e Giriş: Bölüm 2"
 
-#: command-list.h:218
 msgid "Git web interface (web frontend to Git repositories)"
 msgstr "Git web arabirimi (Git depoları için web ön ucu)"
 
-#: command-list.h:219
 msgid "An overview of recommended workflows with Git"
 msgstr "Önerilen Git çalışma akışlarına genel bakış"
 
-#: git-merge-octopus.sh:46
+msgid "commit-graph file is too small"
+msgstr "commit-graph dosyası pek küçük"
+
+#, c-format
+msgid "commit-graph signature %X does not match signature %X"
+msgstr "commit-graph imzası %X, %X ile eşleşmiyor"
+
+#, c-format
+msgid "commit-graph version %X does not match version %X"
+msgstr "commit-graph sürümü %x, %X ile eşleşmiyor"
+
+#, c-format
+msgid "commit-graph hash version %X does not match version %X"
+msgstr "commit-graph sağlama sürümü %X, %X ile eşleşmiyor"
+
+#, c-format
+msgid "commit-graph file is too small to hold %u chunks"
+msgstr "commit-graph dosyası %u iri parça tutmak için pek küçük"
+
+msgid "commit-graph has no base graphs chunk"
+msgstr "commit-graph temel grafiği iri parçasına iye değil"
+
+msgid "commit-graph chain does not match"
+msgstr "commit-graph zinciri eşleşmiyor"
+
+#, c-format
+msgid "invalid commit-graph chain: line '%s' not a hash"
+msgstr "geçersiz commit-graph zinciri: '%s'. satır bir sağlama değil"
+
+msgid "unable to find all commit-graph files"
+msgstr "tüm commit-graph dosyaları bulunamıyor"
+
+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üş"
+
+#, c-format
+msgid "could not find commit %s"
+msgstr "%s işlemesi bulunamadı"
+
+msgid "commit-graph requires overflow generation data but has none"
+msgstr "commit-graph, taşım oluşturma verisi gerektiriyor; ancak hiç yok"
+
+msgid "Loading known commits in commit graph"
+msgstr "İşleme grafiğindeki bilinen işlemeler yükleniyor"
+
+msgid "Expanding reachable commits in commit graph"
+msgstr "İşleme grafiğindeki ulaşılabilir işlemeler genişletiliyor"
+
+msgid "Clearing commit marks in commit graph"
+msgstr "İşleme grafiğindeki işleme imleri temizleniyor"
+
+msgid "Computing commit graph topological levels"
+msgstr "İşleme grafiği ilingesel düzeyleri hesaplanıyor"
+
+msgid "Computing commit graph generation numbers"
+msgstr "İşleme grafiği kuşak sayıları hesaplanıyor"
+
+msgid "Computing commit changed paths Bloom filters"
+msgstr ""
+"Geçerli işlemelerdeki değiştirilmiş yollar için Bloom süzgeci hesaplanıyor"
+
+msgid "Collecting referenced commits"
+msgstr "Başvurulmuş işlemeler toplanıyor"
+
+#, c-format
+msgid "Finding commits for commit graph in %<PRIuMAX> pack"
+msgid_plural "Finding commits for commit graph in %<PRIuMAX> packs"
+msgstr[0] "%<PRIuMAX> pakette işleme grafiği için işlemeler bulunuyor"
+msgstr[1] "%<PRIuMAX> pakette işleme grafiği için işlemeler bulunuyor"
+
+#, c-format
+msgid "error adding pack %s"
+msgstr "%s paketi eklenirken hata"
+
+#, c-format
+msgid "error opening index for %s"
+msgstr "%s için indeks açılırken hata"
+
+msgid "Finding commits for commit graph among packed objects"
+msgstr "Paketlenmiş nesneler arasından işleme grafiği için işlemeler bulunuyor"
+
+msgid "Finding extra edges in commit graph"
+msgstr "İşleme grafiğindeki ek sınırlar bulunuyor"
+
+msgid "failed to write correct number of base graph ids"
+msgstr "temel grafiği numaralarının doğru sayısı yazılamadı"
+
+msgid "unable to create temporary graph layer"
+msgstr "geçici grafik katmanı oluşturulamıyor"
+
+#, c-format
+msgid "unable to adjust shared permissions for '%s'"
+msgstr "'%s' için paylaşılan izinler ayarlanamıyor"
+
+#, 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"
+
+msgid "unable to open commit-graph chain file"
+msgstr "commit-graph zincir dosyası açılamıyor"
+
+msgid "failed to rename base commit-graph file"
+msgstr "temel commit-graph dosyası yeniden adlandırılamadı"
+
+msgid "failed to rename temporary commit-graph file"
+msgstr "geçici commit-graph dosyası yeniden adlandırılamadı"
+
+msgid "Scanning merged commits"
+msgstr "Birleştirilen işlemeler taranıyor"
+
+msgid "Merging commit-graph"
+msgstr "commit-graph birleştiriliyor"
+
+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ışı"
+
+msgid "too many commits to write graph"
+msgstr "grafik yazımı için çok fazla işleme"
+
+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üş"
+
+#, 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"
+
+#, 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"
+
+#, c-format
+msgid "failed to parse commit %s from commit-graph"
+msgstr "%s işlemesi commit-graph'tan ayrıştırılamadı"
+
+msgid "Verifying commits in commit graph"
+msgstr "İşleme grafiğindeki işlemeler doğrulanıyor"
+
+#, 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ı"
+
+#, 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"
+
+#, 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"
+
+#, c-format
+msgid "commit-graph parent for %s is %s != %s"
+msgstr "%s için olan commit-graph üst ögesi %s != %s"
+
+#, 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"
+
+#, c-format
+msgid ""
+"commit-graph has generation number zero for commit %s, but non-zero elsewhere"
+msgstr ""
+"%s işlemesi için commit-graph kuşak sayısı sıfır; ancak başka yerlerde "
+"sıfırdan farklı"
+
+#, c-format
+msgid ""
+"commit-graph has non-zero generation number for commit %s, but zero elsewhere"
+msgstr ""
+"%s işlemesi için commit-graph kuşak sayısı sıfırdan farklı; ancak başka "
+"yerlerde sıfır"
+
+#, c-format
+msgid "commit-graph generation for commit %s is %<PRIuMAX> < %<PRIuMAX>"
+msgstr "%s işlemesi için commit-graph kuşağı %<PRIuMAX> < %<PRIuMAX>"
+
+#, 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>"
+
+#, c-format
+msgid "%s %s is not a commit!"
+msgstr "%s %s bir işleme değil!"
+
+msgid ""
+"Support for <GIT_DIR>/info/grafts is deprecated\n"
+"and will be removed in a future Git version.\n"
+"\n"
+"Please use \"git replace --convert-graft-file\"\n"
+"to convert the grafts into replace refs.\n"
+"\n"
+"Turn this message off by running\n"
+"\"git config advice.graftFileDeprecated false\""
+msgstr ""
+"<GIT_DIR>/info/grafts desteği artık kullanılmamalı\n"
+"ve ileriki bir Git sürümünde kaldırılacak.\n"
+"\n"
+"Aşıları değiştirme başvurularına dönüştürmek için\n"
+"lütfen \"git replace --convert-graft-file\" kullanın.\n"
+"\n"
+"\"git config advice.graftFileDeprecated false\"\n"
+"kullanarak bu iletiyi kapatabilirsiniz."
+
+#, 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."
+
+#, 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."
+
+#, c-format
+msgid "Commit %s does not have a GPG signature."
+msgstr "%s işlemesinin bir GPG imzası yok."
+
+#, 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"
+
+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"
+"variable i18n.commitEncoding to the encoding your project uses.\n"
+msgstr ""
+"Uyarı: İşleme iletisi UTF-8'e uymuyor.\n"
+"İletiyi düzelttikten sonra bunu değiştirmek isteyebilir veya\n"
+"i18n.commitEncoding yapılandırma değişkenini projenizin kullandığı\n"
+"kodlama ile değiştirmek isteyebilirsiniz.\n"
+
+msgid "no compiler information available\n"
+msgstr "derleyici bilgisi mevcut değil\n"
+
+msgid "no libc information available\n"
+msgstr "libc bilgisi mevcut değil\n"
+
+#, c-format
+msgid "[GLE %ld] health thread could not open '%ls'"
+msgstr "[GLE %ld] sağlık iş parçacığı şunu açamadı: '%ls'"
+
+#, c-format
+msgid "[GLE %ld] health thread getting BHFI for '%ls'"
+msgstr "[GLE %ld] sağlık iş parçacığı '%ls' için BHFI alıyor"
+
+#, c-format
+msgid "could not convert to wide characters: '%s'"
+msgstr "geniş karakterlere dönüştürülemedi: '%s'"
+
+#, c-format
+msgid "BHFI changed '%ls'"
+msgstr "BHFI, şunu değiştirdi: '%ls'"
+
+#, c-format
+msgid "unhandled case in 'has_worktree_moved': %d"
+msgstr "'has_worktree_moved' içinde işlenmemiş senaryo: %d"
+
+#, c-format
+msgid "health thread wait failed [GLE %ld]"
+msgstr "sağlık iş parçacığı bekleme başarısız oldu [GLE %ld]"
+
+msgid "Unable to create FSEventStream."
+msgstr "FSEventStream oluşturulamadı."
+
+msgid "Failed to start the FSEventStream"
+msgstr "FSEventStream başlatılamadı"
+
+#, c-format
+msgid "[GLE %ld] could not convert path to UTF-8: '%.*ls'"
+msgstr "[GLE %ld] yol UTF-8'e dönüştürülemedi: '%.*ls"
+
+#, c-format
+msgid "[GLE %ld] could not watch '%s'"
+msgstr "[GLE %ld] '%s' izlenemedi"
+
+#, c-format
+msgid "[GLE %ld] could not get longname of '%s'"
+msgstr "[GLE %ld] şunun uzun adı alınamadı: '%s'"
+
+#, c-format
+msgid "ReadDirectoryChangedW failed on '%s' [GLE %ld]"
+msgstr "ReadDirectoryChangedW, '%s' üzerinde başarısız oldu [GLE %ld]"
+
+#, c-format
+msgid "GetOverlappedResult failed on '%s' [GLE %ld]"
+msgstr "GetOverlappedResult, '%s' üzerinde başarısız oldu [GLE %ld]"
+
+#, c-format
+msgid "could not read directory changes [GLE %ld]"
+msgstr "dizin değişiklikleri okunamadı [GLE %ld]"
+
+#, c-format
+msgid "failed to copy SID (%ld)"
+msgstr "SID kopyalanamadı (%ld)"
+
+#, c-format
+msgid "failed to get owner for '%s' (%ld)"
+msgstr "'%s' için sahip alınamadı (%ld)"
+
+msgid "memory exhausted"
+msgstr "bellek tükendi"
+
+msgid "Success"
+msgstr "Başarılı"
+
+msgid "No match"
+msgstr "Eşleşme yok"
+
+msgid "Invalid regular expression"
+msgstr "Geçersiz düzenli ifade"
+
+msgid "Invalid collation character"
+msgstr "Geçersiz harmanlama karakteri"
+
+msgid "Invalid character class name"
+msgstr "Geçersiz karakter sınıfı adı"
+
+msgid "Trailing backslash"
+msgstr "Sonda ters eğik çizgi"
+
+msgid "Invalid back reference"
+msgstr "geçersiz geri başvuru"
+
+msgid "Unmatched [ or [^"
+msgstr "Eşleşmemiş [ veya [^"
+
+msgid "Unmatched ( or \\("
+msgstr "Eşleşmemiş ( veya \\("
+
+msgid "Unmatched \\{"
+msgstr "Eşleşmemiş \\{"
+
+msgid "Invalid content of \\{\\}"
+msgstr "Şunun geçersiz içeriği: \\(\\)"
+
+msgid "Invalid range end"
+msgstr "Geçersiz erim sonu"
+
+msgid "Memory exhausted"
+msgstr "Bellek tükendi"
+
+msgid "Invalid preceding regular expression"
+msgstr "Geçersiz önde bulunan düzenli ifade"
+
+msgid "Premature end of regular expression"
+msgstr "Düzenli ifadenin erken bitimi"
+
+msgid "Regular expression too big"
+msgstr "Düzenli ifade pek büyük"
+
+msgid "Unmatched ) or \\)"
+msgstr "Eşleşmemiş ) veya \\)"
+
+msgid "No previous regular expression"
+msgstr "Öncesinde düzenli ifade yok"
+
+msgid "could not send IPC command"
+msgstr "IPC komutu gönderilemedi"
+
+msgid "could not read IPC response"
+msgstr "IPC yanıtı okunamadı"
+
+#, c-format
+msgid "could not start accept_thread '%s'"
+msgstr "accept_thread '%s' başlatılamadı"
+
+#, c-format
+msgid "could not start worker[0] for '%s'"
+msgstr "'%s' için worker[0] başlatılamadı"
+
+#, c-format
+msgid "ConnectNamedPipe failed for '%s' (%lu)"
+msgstr "ConnectNamedPipe, '%s' için başarısız oldu (%lu)"
+
+#, c-format
+msgid "could not create fd from pipe for '%s'"
+msgstr "'%s' için veri yolundan fd oluşturulamadı"
+
+#, c-format
+msgid "could not start thread[0] for '%s'"
+msgstr "'%s' için thread[0] başlatılamadı"
+
+#, c-format
+msgid "wait for hEvent failed for '%s'"
+msgstr "'%s' için hEvent beklemesi başarısız"
+
+msgid "cannot resume in the background, please use 'fg' to resume"
+msgstr "arka planda sürdürülemiyor, sürdürmek için 'fg' kullanın"
+
+msgid "cannot restore terminal settings"
+msgstr "uçbirim ayarları geri yüklenemiyor"
+
+#, c-format
+msgid ""
+"exceeded maximum include depth (%d) while including\n"
+"\t%s\n"
+"from\n"
+"\t%s\n"
+"This might be due to circular includes."
+msgstr ""
+"aşağıdaki içerilirken olabilecek en çok içerme derinliği (%d) aşıldı:\n"
+"\t%s\n"
+"içerme konumu:\n"
+"\t%s\n"
+"Bu dairesel içermelerden dolayı olabilir."
+
+#, c-format
+msgid "could not expand include path '%s'"
+msgstr "içerme yolu '%s' genişletilemedi"
+
+msgid "relative config includes must come from files"
+msgstr "göreceli yapılandırma içermeleri dosyalardan gelmeli"
+
+msgid "relative config include conditionals must come from files"
+msgstr "göreceli yapılandırma içerme koşulluları dosyalardan gelmeli"
+
+msgid ""
+"remote URLs cannot be configured in file directly or indirectly included by "
+"includeIf.hasconfig:remote.*.url"
+msgstr ""
+"uzak URL'ler dosya içinde doğrudan veya başka türlü includeIf.hasconfig:"
+"remote.*.url kullanarak yapılandırılamaz"
+
+#, c-format
+msgid "invalid config format: %s"
+msgstr "geçersiz yapılandırma biçimi: %s"
+
+#, c-format
+msgid "missing environment variable name for configuration '%.*s'"
+msgstr "'%.*s' yapılandırması için çevre değişkeni adı eksik"
+
+#, c-format
+msgid "missing environment variable '%s' for configuration '%.*s'"
+msgstr "şu yapılandırma için '%s' çevre değişkeni eksik: '%.*s'"
+
+#, c-format
+msgid "key does not contain a section: %s"
+msgstr "anahtar, bir bölüm içermiyor: %s"
+
+#, c-format
+msgid "key does not contain variable name: %s"
+msgstr "anahtar, bir değişken adı içermiyor: %s"
+
+#, c-format
+msgid "invalid key: %s"
+msgstr "geçersiz anahtar: %s"
+
+#, c-format
+msgid "invalid key (newline): %s"
+msgstr "geçersiz anahtar (yenisatır): %s"
+
+msgid "empty config key"
+msgstr "boş yapılandırma anahtarı"
+
+#, c-format
+msgid "bogus config parameter: %s"
+msgstr "düzmece yapılandırma parametresi: %s"
+
+#, c-format
+msgid "bogus format in %s"
+msgstr "%s içinde düzmece biçim"
+
+#, c-format
+msgid "bogus count in %s"
+msgstr "%s içinde düzmece sayım"
+
+#, c-format
+msgid "too many entries in %s"
+msgstr "%s içinde çok fazla girdi"
+
+#, c-format
+msgid "missing config key %s"
+msgstr "%s yapılandırma anahtarı eksik"
+
+#, c-format
+msgid "missing config value %s"
+msgstr "%s yapılandırma değeri eksik"
+
+#, c-format
+msgid "bad config line %d in blob %s"
+msgstr "hatalı yapılandırma satırı %d, %s ikili nesnesi içinde"
+
+#, c-format
+msgid "bad config line %d in file %s"
+msgstr "hatalı yapılandırma satırı %d, %s dosyası içinde"
+
+#, c-format
+msgid "bad config line %d in standard input"
+msgstr "standart girdi içinde hatalı yapılandırma satırı %d"
+
+#, 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"
+
+#, 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"
+
+#, c-format
+msgid "bad config line %d in %s"
+msgstr "hatalı yapılandırma satırı %d (%s içinde)"
+
+msgid "out of range"
+msgstr "erim dışı"
+
+msgid "invalid unit"
+msgstr "geçersiz birim"
+
+#, 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"
+
+#, 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"
+
+#, 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"
+
+#, 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"
+
+#, 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"
+
+#, 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"
+
+#, 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"
+
+#, c-format
+msgid "invalid value for variable %s"
+msgstr "%s değişkeni için geçersiz değer"
+
+#, c-format
+msgid "ignoring unknown core.fsync component '%s'"
+msgstr "bilinmeyen core.fsync bileşeni '%s' yok sayılıyor"
+
+#, c-format
+msgid "bad boolean config value '%s' for '%s'"
+msgstr "hatalı Boole yapılandırma değeri '%s', '%s' için"
+
+#, c-format
+msgid "failed to expand user dir in: '%s'"
+msgstr "şuradaki kullanıcı dizini genişletilemedi: '%s'"
+
+#, c-format
+msgid "'%s' for '%s' is not a valid timestamp"
+msgstr "%s', '%s' için geçerli bir zaman damgası değil"
+
+#, c-format
+msgid "abbrev length out of range: %d"
+msgstr "kısaltma uzunluğu erim dışında: %d"
+
+#, c-format
+msgid "bad zlib compression level %d"
+msgstr "hatalı zlib sıkıştırma düzeyi %d"
+
+msgid "core.commentChar should only be one character"
+msgstr "core.commentChar yalnızca bir karakter olmalı"
+
+#, c-format
+msgid "ignoring unknown core.fsyncMethod value '%s'"
+msgstr "bilinmeyen core.fsyncMethod değeri '%s' yok sayılıyor"
+
+msgid "core.fsyncObjectFiles is deprecated; use core.fsync instead"
+msgstr "core.fsyncObjectFiles artık kullanılmıyor; yerine core.fsync kullanın"
+
+#, c-format
+msgid "invalid mode for object creation: %s"
+msgstr "nesne oluşturma için geçersiz kip: %s"
+
+#, c-format
+msgid "malformed value for %s"
+msgstr "%s için hatalı oluşturulmuş değer"
+
+#, c-format
+msgid "malformed value for %s: %s"
+msgstr "%s için hatalı oluşturulmuş değer: %s"
+
+msgid "must be one of nothing, matching, simple, upstream or current"
+msgstr "nothing, matching, simple, upstream veya current içinden biri olmalı"
+
+#, c-format
+msgid "unable to load config blob object '%s'"
+msgstr "'%s' yapılandırma ikili nesnesi yüklenemiyor"
+
+#, c-format
+msgid "reference '%s' does not point to a blob"
+msgstr "'%s' başvurusu ikili bir nesneye işaret etmiyor"
+
+#, c-format
+msgid "unable to resolve config blob '%s'"
+msgstr "'%s' yapılandırma ikili nesnesi çözülemiyor"
+
+#, c-format
+msgid "failed to parse %s"
+msgstr "%s ayrıştırılamadı"
+
+msgid "unable to parse command-line config"
+msgstr "komut satırı yapılandırması ayrıştırılamıyor"
+
+msgid "unknown error occurred while reading the configuration files"
+msgstr "yapılandırma dosyaları okunurken beklenmedik bir hata oluştu"
+
+#, c-format
+msgid "Invalid %s: '%s'"
+msgstr "Geçersiz %s: '%s'"
+
+#, 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ı"
+
+#, 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"
+
+#, 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"
+
+#, c-format
+msgid "invalid section name '%s'"
+msgstr "geçersiz bölüm adı '%s'"
+
+#, c-format
+msgid "%s has multiple values"
+msgstr "%s birden çok değere iye"
+
+#, c-format
+msgid "failed to write new configuration file %s"
+msgstr "yeni yapılandırma dosyası %s yazılamadı"
+
+#, c-format
+msgid "could not lock config file %s"
+msgstr "%s yapılandırma dosyası kilitlenemedi"
+
+#, c-format
+msgid "opening %s"
+msgstr "%s açılıyor"
+
+#, c-format
+msgid "invalid config file %s"
+msgstr "geçersiz yapılandırma dosyası %s"
+
+#, c-format
+msgid "fstat on %s failed"
+msgstr "%s üzerinde fstat başarısız oldu"
+
+#, c-format
+msgid "unable to mmap '%s'%s"
+msgstr "'%s'%s mmap yapılamıyor"
+
+#, c-format
+msgid "chmod on %s failed"
+msgstr "%s üzerinde chmod başarısız oldu"
+
+#, c-format
+msgid "could not write config file %s"
+msgstr "%s yapılandırma dosyası yazılamadı"
+
+#, c-format
+msgid "could not set '%s' to '%s'"
+msgstr "'%s', '%s' olarak ayarlanamadı"
+
+#, c-format
+msgid "invalid section name: %s"
+msgstr "geçersiz bölüm adı: %s"
+
+#, c-format
+msgid "missing value for '%s'"
+msgstr "'%s' için değer eksik"
+
+msgid "the remote end hung up upon initial contact"
+msgstr "uzak uç ilk iletişimle birlikte hattı kapattı"
+
+msgid ""
+"Could not read from remote repository.\n"
+"\n"
+"Please make sure you have the correct access rights\n"
+"and the repository exists."
+msgstr ""
+"Uzak konum deposu okunamadı.\n"
+"\n"
+"Lütfen doğru erişim haklarına iye olduğunuzdan ve\n"
+"deponun var olduğundan emin olun."
+
+#, c-format
+msgid "server doesn't support '%s'"
+msgstr "sunucu '%s' desteklemiyor"
+
+#, c-format
+msgid "server doesn't support feature '%s'"
+msgstr "sunucu '%s' özelliğini desteklemiyor"
+
+msgid "expected flush after capabilities"
+msgstr "yeteneklerden sonra floş bekleniyordu"
+
+#, c-format
+msgid "ignoring capabilities after first line '%s'"
+msgstr "'%s' ilk satırından sonra yetenekler yok sayılıyor"
+
+msgid "protocol error: unexpected capabilities^{}"
+msgstr "protokol hatası: beklenmedik yetenekler^{}"
+
+#, c-format
+msgid "protocol error: expected shallow sha-1, got '%s'"
+msgstr "protokol hatası: sığ sha-1 bekleniyordu, '%s' alındı"
+
+msgid "repository on the other end cannot be shallow"
+msgstr "diğer uçtaki depo sığ olamaz"
+
+msgid "invalid packet"
+msgstr "geçersiz paket"
+
+#, c-format
+msgid "protocol error: unexpected '%s'"
+msgstr "protokol hatası: beklenmedik '%s'"
+
+#, c-format
+msgid "unknown object format '%s' specified by server"
+msgstr "sunucu tarafından bilinmeyen nesne biçimi '%s' belirtildi"
+
+#, c-format
+msgid "invalid ls-refs response: %s"
+msgstr "geçersiz ls-refs yanıtı: %s"
+
+msgid "expected flush after ref listing"
+msgstr "başvuru listelemesinden sonra floş bekleniyordu"
+
+msgid "expected response end packet after ref listing"
+msgstr "başvuru listelemesinden sonra yanıt sonu paketi bekleniyordu"
+
+#, c-format
+msgid "protocol '%s' is not supported"
+msgstr "'%s' protokolü desteklenmiyor"
+
+msgid "unable to set SO_KEEPALIVE on socket"
+msgstr "soket üzerinde SO_KEEPALIVE ayarlanamıyor"
+
+#, c-format
+msgid "Looking up %s ... "
+msgstr "%s adresi aranıyor ... "
+
+#, 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 ... "
+#, c-format
+msgid ""
+"done.\n"
+"Connecting to %s (port %s) ... "
+msgstr ""
+"bitti.\n"
+"%s adresine bağlanılıyor (kapı %s) ... "
+
+#, c-format
+msgid ""
+"unable to connect to %s:\n"
+"%s"
+msgstr ""
+"%s adresine bağlanılıyor:\n"
+"%s"
+
+#. TRANSLATORS: this is the end of "Connecting to %s (port %s) ... "
+msgid "done."
+msgstr "bitti."
+
+#, c-format
+msgid "unable to look up %s (%s)"
+msgstr "%s aranamıyor (%s)"
+
+#, c-format
+msgid "unknown port %s"
+msgstr "bilinmeyen kapı %s"
+
+#, c-format
+msgid "strange hostname '%s' blocked"
+msgstr "garip makine adı '%s' engellendi"
+
+#, c-format
+msgid "strange port '%s' blocked"
+msgstr "garip kapı '%s' engellendi"
+
+#, c-format
+msgid "cannot start proxy %s"
+msgstr "vekil %s başlatılamıyor"
+
+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"
+
+msgid "newline is forbidden in git:// hosts and repo paths"
+msgstr "git:// makinelerinde ve depo yollarında yenisatır karakteri yasak"
+
+msgid "ssh variant 'simple' does not support -4"
+msgstr "ssh değişik biçimi 'simple' -4 desteklemiyor"
+
+msgid "ssh variant 'simple' does not support -6"
+msgstr "ssh değişik biçimi 'simple' -6 desteklemiyor"
+
+msgid "ssh variant 'simple' does not support setting port"
+msgstr "ssh değişik biçimi 'simple' kapı ayarlamayı desteklemiyor"
+
+#, c-format
+msgid "strange pathname '%s' blocked"
+msgstr "garip yol adı '%s' engellendi"
+
+msgid "unable to fork"
+msgstr "çatallanamıyor"
+
+msgid "Could not run 'git rev-list'"
+msgstr "'git rev-list' çalıştırılamadı"
+
+msgid "failed write to rev-list"
+msgstr "rev-list yazılamadı"
+
+msgid "failed to close rev-list's stdin"
+msgstr "rev-list'in stdin'i kapatılamadı"
+
+#, c-format
+msgid "'%s' does not exist"
+msgstr "'%s' mevcut değil"
+
+msgid "need a working directory"
+msgstr "bir çalışma dizini gerekiyor"
+
+msgid "could not find enlistment root"
+msgstr "gönüllü yazılma kaydı bulunamıyor"
+
+#, c-format
+msgid "could not switch to '%s'"
+msgstr "şuraya geçilemedi: '%s'"
+
+#, c-format
+msgid "could not configure %s=%s"
+msgstr "%s=%s yapılandırılamadı"
+
+msgid "could not configure log.excludeDecoration"
+msgstr "log.excludeDecoration yapılandırılamadı"
+
+msgid "Scalar enlistments require a worktree"
+msgstr "Scalar gönüllü kayıtları bir çalışma ağacı gerektiriyor"
+
+#, c-format
+msgid "could not open directory '%s'"
+msgstr "'%s' dizini açılamadı"
+
+#, c-format
+msgid "skipping '%s', which is neither file nor directory"
+msgstr "ne bir dosya ne de dizin olan '%s' atlanıyor"
+
+#, c-format
+msgid "could not determine free disk size for '%s'"
+msgstr "'%s' için boş disk alanı belirlenemedi"
+
+#, c-format
+msgid "could not get info for '%s'"
+msgstr "'%s' için bilgi alınamadı"
+
+#, c-format
+msgid "remote HEAD is not a branch: '%.*s'"
+msgstr "uzak konum HEAD'i bir dal değil: '%.*s'"
+
+msgid "failed to get default branch name from remote; using local default"
+msgstr ""
+"uzak konumdan öntanımlı dal adı alınamadı; yerel öntanımlı kullanılıyor"
+
+msgid "failed to get default branch name"
+msgstr "öntanımlı dal adı alınamadı"
+
+msgid "failed to unregister repository"
+msgstr "depo kaydı silinemedi"
+
+msgid "failed to delete enlistment directory"
+msgstr "gönüllü kayıt dizini silinemedi"
+
+msgid "branch to checkout after clone"
+msgstr "klonlama sonrası çıkış yapılacak dal"
+
+msgid "when cloning, create full working directory"
+msgstr "klonlama sırasında tam çalışma dizini oluştur"
+
+msgid "only download metadata for the branch that will be checked out"
+msgstr "yalnızca çıkış yapılacak dalın üstverisini indir"
+
+msgid "scalar clone [<options>] [--] <repo> [<dir>]"
+msgstr "scalar clone [<seçenekler>] [--] <depo> [<dizin>]"
+
+#, c-format
+msgid "cannot deduce worktree name from '%s'"
+msgstr "'%s' ögesinden çalışma ağacı adı ortaya çıkarılamıyor"
+
+#, c-format
+msgid "directory '%s' exists already"
+msgstr "'%s' dizini halihazırda var"
+
+#, c-format
+msgid "failed to get default branch for '%s'"
+msgstr "'%s' için öntanımlı dal alınamadı"
+
+#, c-format
+msgid "could not configure remote in '%s'"
+msgstr "'%s' içindeki uzak konum yapılandırılamadı"
+
+#, c-format
+msgid "could not configure '%s'"
+msgstr "'%s' yapılandırılamadı"
+
+msgid "partial clone failed; attempting full clone"
+msgstr "kısımsal klonlama başarısız; tam klonlama deneniyor"
+
+msgid "could not configure for full clone"
+msgstr "tam klonlama için yapılandırılamadı"
+
+msgid "scalar diagnose [<enlistment>]"
+msgstr "scalar diagnose [<gönüllükayıt>]"
+
+#, c-format
+msgid "could not create directory for '%s'"
+msgstr "'%s' için dizin oluşturulamadı"
+
+msgid "could not duplicate stdout"
+msgstr "stdout çoğaltılamadı"
+
+msgid "failed to write archive"
+msgstr "arşiv yazılamadı"
+
+msgid "`scalar list` does not take arguments"
+msgstr "'scalar list' argüman almıyor"
+
+msgid "scalar register [<enlistment>]"
+msgstr "scalar register [<gönüllükayıt>]"
+
+msgid "reconfigure all registered enlistments"
+msgstr "tüm kaydı yapılmış gönüllü kayıtları yeniden yapılandır"
+
+msgid "scalar reconfigure [--all | <enlistment>]"
+msgstr "scalar reconfigure [--all | <gönüllükayıt>]"
+
+msgid "--all or <enlistment>, but not both"
+msgstr "--all veya <gönüllükayıt>; ancak ikisi değil"
+
+#, c-format
+msgid "git repository gone in '%s'"
+msgstr "git deposu '%s' içinde gitti"
+
+msgid ""
+"scalar run <task> [<enlistment>]\n"
+"Tasks:\n"
+msgstr ""
+"scalar run <görev> [<gönüllükayıt>]\n"
+"Görevler:\n"
+
+#, c-format
+msgid "no such task: '%s'"
+msgstr "böyle bir görev yok: '%s'"
+
+msgid "scalar unregister [<enlistment>]"
+msgstr "scalar unregister [<enlistment>]"
+
+msgid "scalar delete <enlistment>"
+msgstr "scalar delete <gönüllükayıt>"
+
+msgid "refusing to delete current working directory"
+msgstr "geçerli çalışma dizinini silme reddediliyor"
+
+msgid "include Git version"
+msgstr "Git sürümünü içer"
+
+msgid "include Git's build options"
+msgstr "Git'in yapı seçeneklerini içer"
+
+msgid "scalar verbose [-v | --verbose] [--build-options]"
+msgstr "scalar verbose [-v | --verbose] [--build-options]"
+
+msgid "-C requires a <directory>"
+msgstr "-C, bir <dizin> gerektiriyor"
+
+#, c-format
+msgid "could not change to '%s'"
+msgstr "'%s' olarak değiştirilemedi"
+
+msgid "-c requires a <key>=<value> argument"
+msgstr "-c, bir <anahtar>=<değer> argümanı gerektiriyor"
+
+msgid ""
+"scalar [-C <directory>] [-c <key>=<value>] <command> [<options>]\n"
+"\n"
+"Commands:\n"
+msgstr ""
+"scalar [-C <dizin>] [-c <anahtar>=<değer>] <komut> [<seçenekler>]\n"
+"\n"
+"Komutlar:\n"
+
+#, c-format
+msgid "illegal crlf_action %d"
+msgstr "izin verilmeyen crlf_action %d"
+
+#, c-format
+msgid "CRLF would be replaced by LF in %s"
+msgstr "CRLF %s içinde LF ile değiştirilecek"
+
+#, c-format
+msgid ""
+"in the working copy of '%s', CRLF will be replaced by LF the next time Git "
+"touches it"
+msgstr ""
+"Git'in bir sonraki dokunuşunda, '%s' çalışma kopyasındaki CRLF'ler LF ile "
+"değiştirilecektir"
+
+#, c-format
+msgid "LF would be replaced by CRLF in %s"
+msgstr "LF %s içinde CRLF ile değiştirilecek"
+
+#, c-format
+msgid ""
+"in the working copy of '%s', LF will be replaced by CRLF the next time Git "
+"touches it"
+msgstr ""
+"Git'in bir sonraki dokunuşunda, '%s' çalışma kopyasındaki LF'ler CRLF ile "
+"değiştirilecektir"
+
+#, c-format
+msgid "BOM is prohibited in '%s' if encoded as %s"
+msgstr "BOM '%s' içinde yasaklı, eğer %s olarak kodlanmışsa"
+
+#, c-format
+msgid ""
+"The file '%s' contains a byte order mark (BOM). Please use UTF-%.*s as "
+"working-tree-encoding."
+msgstr ""
+"'%s' dosyası bir bayt sıra imi (BOM) içeriyor. Lütfen çalışma ağacı "
+"kodlaması için UTF-%.*s kullanın."
+
+#, c-format
+msgid "BOM is required in '%s' if encoded as %s"
+msgstr "BOM '%s' içinde gerekli, eğer %s olarak kodlanmışsa"
+
+#, 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."
+msgstr ""
+"'%s' dosyasında bir bayt sıra imi (BOM) eksik. Lütfen çalışma ağacı "
+"kodlaması için UTF-%sBE veya UTF-%sLE (bayt sırasına göre) kullanın."
+
+#, c-format
+msgid "failed to encode '%s' from %s to %s"
+msgstr "'%s', %s değerinden %s değerine kodlanamadı"
+
+#, c-format
+msgid "encoding '%s' from %s to %s and back is not the same"
+msgstr ""
+"'%s' kodlamasını %s -> %s biçiminde yapıp tersine döndürmek aynı şey değil"
+
+#, c-format
+msgid "cannot fork to run external filter '%s'"
+msgstr "'%s' dış süzgecini çalıştırmak için çatallama yapılamıyor"
+
+#, c-format
+msgid "cannot feed the input to external filter '%s'"
+msgstr "girdi '%s' dış süzgecine beslenemiyor"
+
+#, c-format
+msgid "external filter '%s' failed %d"
+msgstr "'%s' dış süzgeci %d için başarısız oldu"
+
+#, c-format
+msgid "read from external filter '%s' failed"
+msgstr "'%s' dış süzgecinden okuma başarısız oldu"
+
+#, c-format
+msgid "external filter '%s' failed"
+msgstr "'%s' dış süzgeci başarısız oldu"
+
+msgid "unexpected filter type"
+msgstr "beklenmedik süzgeç türü"
+
+msgid "path name too long for external filter"
+msgstr "dış süzgeç için yol adı pek uzun"
+
+#, c-format
+msgid ""
+"external filter '%s' is not available anymore although not all paths have "
+"been filtered"
+msgstr ""
+"'%s' dış süzgeci artık kullanılamıyor; ancak tüm yolların süzümü bitmedi"
+
+msgid "true/false are no valid working-tree-encodings"
+msgstr "doğru/yanlış geçerli bir çalışma ağacı kodlaması değil"
+
+#, c-format
+msgid "%s: clean filter '%s' failed"
+msgstr "%s: temiz süzgeç '%s' başarısız oldu"
+
+#, c-format
+msgid "%s: smudge filter %s failed"
+msgstr "%s: is süzgeci %s başarısız oldu"
+
+#, c-format
+msgid "skipping credential lookup for key: credential.%s"
+msgstr "şu anahtar için yetki araması atlanıyor: credential.%s"
+
+msgid "refusing to work with credential missing host field"
+msgstr "ana makine bilgisi eksik yetki ile çalışma reddediliyor"
+
+msgid "refusing to work with credential missing protocol field"
+msgstr "protokol bilgisi eksik yetki ile çalışma reddediliyor"
+
+#, c-format
+msgid "url contains a newline in its %s component: %s"
+msgstr "url, kendisinin %s bileşeninde bir yenisatır içeriyor: %s"
+
+#, c-format
+msgid "url has no scheme: %s"
+msgstr "url'nin şeması yok: %s"
+
+#, c-format
+msgid "credential url cannot be parsed: %s"
+msgstr "yetki url'si ayrıştırılamıyor: %s"
+
+msgid "in the future"
+msgstr "gelecekte"
+
+#, c-format
+msgid "%<PRIuMAX> second ago"
+msgid_plural "%<PRIuMAX> seconds ago"
+msgstr[0] "%<PRIuMAX> saniye önce"
+msgstr[1] "%<PRIuMAX> saniye önce"
+
+#, c-format
+msgid "%<PRIuMAX> minute ago"
+msgid_plural "%<PRIuMAX> minutes ago"
+msgstr[0] "%<PRIuMAX> dakika önce"
+msgstr[1] "%<PRIuMAX> dakika önce"
+
+#, c-format
+msgid "%<PRIuMAX> hour ago"
+msgid_plural "%<PRIuMAX> hours ago"
+msgstr[0] "%<PRIuMAX> saat önce"
+msgstr[1] "%<PRIuMAX> saat önce"
+
+#, c-format
+msgid "%<PRIuMAX> day ago"
+msgid_plural "%<PRIuMAX> days ago"
+msgstr[0] "%<PRIuMAX> gün önce"
+msgstr[1] "%<PRIuMAX> gün önce"
+
+#, c-format
+msgid "%<PRIuMAX> week ago"
+msgid_plural "%<PRIuMAX> weeks ago"
+msgstr[0] "%<PRIuMAX> hafta önce"
+msgstr[1] "%<PRIuMAX> hafta önce"
+
+#, c-format
+msgid "%<PRIuMAX> month ago"
+msgid_plural "%<PRIuMAX> months ago"
+msgstr[0] "%<PRIuMAX> ay önce"
+msgstr[1] "%<PRIuMAX> ay önce"
+
+#, c-format
+msgid "%<PRIuMAX> year"
+msgid_plural "%<PRIuMAX> years"
+msgstr[0] "%<PRIuMAX> yıl"
+msgstr[1] "%<PRIuMAX> yıl"
+
+#. TRANSLATORS: "%s" is "<n> years"
+#, c-format
+msgid "%s, %<PRIuMAX> month ago"
+msgid_plural "%s, %<PRIuMAX> months ago"
+msgstr[0] "%s, %<PRIuMAX> ay önce"
+msgstr[1] "%s, %<PRIuMAX> ay önce"
+
+#, c-format
+msgid "%<PRIuMAX> year ago"
+msgid_plural "%<PRIuMAX> years ago"
+msgstr[0] "%<PRIuMAX> yıl önce"
+msgstr[1] "%<PRIuMAX> yıl önce"
+
+msgid "Propagating island marks"
+msgstr "Delta adası imleri yayılıyor"
+
+#, c-format
+msgid "bad tree object %s"
+msgstr "hatalı ağaç nesnesi %s"
+
+#, c-format
+msgid "failed to load island regex for '%s': %s"
+msgstr "'%s' için delta adası düzenli ifadesi yüklenemedi: %s"
+
+#, c-format
+msgid "island regex from config has too many capture groups (max=%d)"
+msgstr ""
+"yapılandırmanın delta adası düzenli ifadesinde çok fazla yakalama grubu var "
+"(en çok %d)"
+
+#, c-format
+msgid "Marked %d islands, done.\n"
+msgstr "%d delta adası imlendi, bitti.\n"
+
+msgid "--merge-base does not work with ranges"
+msgstr "--merge-base erimlerle çalışmaz"
+
+msgid "--merge-base only works with commits"
+msgstr "--merge-base yalnızca işlemelerle çalışır"
+
+msgid "unable to get HEAD"
+msgstr "HEAD alınamıyor"
+
+msgid "no merge base found"
+msgstr "bir birleştirme temeli bulunamadı"
+
+msgid "multiple merge bases found"
+msgstr "birden çok birleştirme temeli bulundu"
+
+msgid "git diff --no-index [<options>] <path> <path>"
+msgstr "git diff --no-index [<seçenekler>] <yol> <yol>"
+
+msgid ""
+"Not a git repository. Use --no-index to compare two paths outside a working "
+"tree"
+msgstr ""
+"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."
+
+#, c-format
+msgid "  Failed to parse dirstat cut-off percentage '%s'\n"
+msgstr "  dirstat kesim yüzdesi '%s' ayrıştırılamadı\n"
+
+#, c-format
+msgid "  Unknown dirstat parameter '%s'\n"
+msgstr "  Bilinmeyen dirstat parametresi '%s'\n"
+
+msgid ""
+"color moved setting must be one of 'no', 'default', 'blocks', 'zebra', "
+"'dimmed-zebra', 'plain'"
+msgstr ""
+"\"color-moved\" ayarı 'no', 'default', 'blocks', 'zebra', 'dimmed-zebra', "
+"'plain' seçeneklerinden biri olmalıdır"
+
+#, 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 ""
+"bilinmeyen color-moved-ws kipi '%s', olabilecek değerler: 'ignore-space-"
+"change', 'ignore-space-at-eol', 'ignore-all-space' 'allow-indentation-change'"
+
+msgid ""
+"color-moved-ws: allow-indentation-change cannot be combined with other "
+"whitespace modes"
+msgstr ""
+"color-moved-ws: allow-indentation-change diğer boşluk kipleri ile birlikte "
+"kullanılamaz"
+
+#, 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'"
+
+#, c-format
+msgid ""
+"Found errors in 'diff.dirstat' config variable:\n"
+"%s"
+msgstr ""
+"'diff.dirstat' yapılandırma değişkeninde hatalar bulundu:\n"
+"%s"
+
+#, c-format
+msgid "external diff died, stopping at %s"
+msgstr "dış diff sonlandı, %s konumunda durdu"
+
+#, c-format
+msgid "options '%s', '%s', '%s', and '%s' cannot be used together"
+msgstr "'%s', '%s', '%s' ve '%s' seçenekleri birlikte kullanılamaz"
+
+#, c-format
+msgid "options '%s' and '%s' cannot be used together, use '%s' with '%s'"
+msgstr ""
+"'%s' ve '%s' seçenekleri birlikte kullanılamaz, '%s' seçeneğini '%s' ile "
+"kullanın"
+
+#, c-format
+msgid ""
+"options '%s' and '%s' cannot be used together, use '%s' with '%s' and '%s'"
+msgstr ""
+"'%s' ve '%s' seçenekleri birlikte kullanılamaz, '%s' seçeneğini '%s' ve '%s' "
+"ile kullanın"
+
+msgid "--follow requires exactly one pathspec"
+msgstr "--follow tam olarak yalnızca bir yol belirteci gerektiriyor"
+
+#, c-format
+msgid "invalid --stat value: %s"
+msgstr "geçersiz --stat değeri: %s"
+
+#, c-format
+msgid "%s expects a numerical value"
+msgstr "%s bir sayısal değer bekliyor"
+
+#, c-format
+msgid ""
+"Failed to parse --dirstat/-X option parameter:\n"
+"%s"
+msgstr ""
+"--dirstat/-X seçenek parametresi ayrıştırılamadı:\n"
+"%s"
+
+#, c-format
+msgid "unknown change class '%c' in --diff-filter=%s"
+msgstr "şurada bilinmeyen değişiklik sınıfı '%c': --diff-filter=%s"
+
+#, c-format
+msgid "unknown value after ws-error-highlight=%.*s"
+msgstr "şundan sonra bilinmeyen değer: ws-error-highlight=%.*s"
+
+#, c-format
+msgid "unable to resolve '%s'"
+msgstr "'%s' çözülemiyor"
+
+#, c-format
+msgid "%s expects <n>/<m> form"
+msgstr "%s <n>/<m> biçimi bekliyor"
+
+#, c-format
+msgid "%s expects a character, got '%s'"
+msgstr "%s bir karakter bekliyor, '%s' aldı"
+
+#, c-format
+msgid "bad --color-moved argument: %s"
+msgstr "hatalı --color-moved argümanı: %s"
+
+#, c-format
+msgid "invalid mode '%s' in --color-moved-ws"
+msgstr "--color-moved-ws içinde geçersiz kip '%s'"
+
+msgid ""
+"option diff-algorithm accepts \"myers\", \"minimal\", \"patience\" and "
+"\"histogram\""
+msgstr ""
+"diff-algorithm seçeneği şunları kabul eder: \"myers\", \"minimal\", "
+"\"patience\" ve \"histogram\""
+
+#, c-format
+msgid "invalid argument to %s"
+msgstr "%s için geçersiz argüman"
+
+#, c-format
+msgid "invalid regex given to -I: '%s'"
+msgstr "-I'ya geçersiz düzenli ifade verildi: '%s'"
+
+#, c-format
+msgid "failed to parse --submodule option parameter: '%s'"
+msgstr "--submodule seçenek parametresi ayrıştırılamadı: '%s'"
+
+#, c-format
+msgid "bad --word-diff argument: %s"
+msgstr "hatalı --word-diff argümanı: %s"
+
+msgid "Diff output format options"
+msgstr "Diff çıktısı biçimlendirme seçenekleri"
+
+msgid "generate patch"
+msgstr "yama oluştur"
+
+msgid "<n>"
+msgstr "<n>"
+
+msgid "generate diffs with <n> lines context"
+msgstr "diff'leri <n> satır bağlamlı oluştur"
+
+msgid "generate the diff in raw format"
+msgstr "diff'i ham biçimde oluştur"
+
+msgid "synonym for '-p --raw'"
+msgstr "'-p --raw eşanlamlısı"
+
+msgid "synonym for '-p --stat'"
+msgstr "'-p --stat eşanlamlısı"
+
+msgid "machine friendly --stat"
+msgstr "makinede okunabilen --stat"
+
+msgid "output only the last line of --stat"
+msgstr "--stat'ın yalnızca son satırını çıktı ver"
+
+msgid "<param1,param2>..."
+msgstr "<param1,param2>..."
+
+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"
+
+msgid "synonym for --dirstat=cumulative"
+msgstr "--dirstat=cumulative eşanlamlısı"
+
+msgid "synonym for --dirstat=files,param1,param2..."
+msgstr "--dirstat=files,param1,param2... eşanlamlısı"
+
+msgid "warn if changes introduce conflict markers or whitespace errors"
+msgstr ""
+"değişiklikler çakışma imleyicileri veya boşluk hataları doğuruyorsa uyar"
+
+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"
+
+msgid "show only names of changed files"
+msgstr "yalnızca değiştirilen dosyaların adlarını göster"
+
+msgid "show only names and status of changed files"
+msgstr "yalnızca değiştirilen dosyaların adlarını ve durumlarını göster"
+
+msgid "<width>[,<name-width>[,<count>]]"
+msgstr "<genişlik>[,<ad-genişlik>[,<sayım>]]"
+
+msgid "generate diffstat"
+msgstr "diffstat oluştur"
+
+msgid "<width>"
+msgstr "<genişlik>"
+
+msgid "generate diffstat with a given width"
+msgstr "diffstat'ı verilmiş bir genişlik ile oluştur"
+
+msgid "generate diffstat with a given name width"
+msgstr "diffstat'ı verilmiş bir ad genişliği ile oluştur"
+
+msgid "generate diffstat with a given graph width"
+msgstr "diffstat'ı verilmiş bir grafik genişliği ile oluştur"
+
+msgid "<count>"
+msgstr "<sayım>"
+
+msgid "generate diffstat with limited lines"
+msgstr "diffstat'ı kısıtlı satırlarla oluştur"
+
+msgid "generate compact summary in diffstat"
+msgstr "diffstat içinde ufak özet oluştur"
+
+msgid "output a binary diff that can be applied"
+msgstr "uygulanabilir bir ikili diff çıktısı ver"
+
+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"
+
+msgid "show colored diff"
+msgstr "renkli diff göster"
+
+msgid "<kind>"
+msgstr "<çeşit>"
+
+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"
+
+msgid ""
+"do not munge pathnames and use NULs as output field terminators in --raw or "
+"--numstat"
+msgstr ""
+"--raw veya --numstat içinde yol adlarını tahrip etme ve çıktı alanı "
+"sonlandırıcıları olarak NUL'ları kullan"
+
+msgid "<prefix>"
+msgstr "<önek>"
+
+msgid "show the given source prefix instead of \"a/\""
+msgstr "\"a/\" yerine verilmiş kaynak önekini göster"
+
+msgid "show the given destination prefix instead of \"b/\""
+msgstr "\"b/\"yerine verilmiş kaynak önekini göster"
+
+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"
+
+msgid "do not show any source or destination prefix"
+msgstr "hiçbir kaynak ve hedef önekini gösterme"
+
+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"
+
+msgid "<char>"
+msgstr "<karakter>"
+
+msgid "specify the character to indicate a new line instead of '+'"
+msgstr "yeni satırı belirtmek için '+' yerine kullanılacak karakteri belirle"
+
+msgid "specify the character to indicate an old line instead of '-'"
+msgstr "eski satırı belirtmek için '-' yerine kullanılacak karakteri belirle"
+
+msgid "specify the character to indicate a context instead of ' '"
+msgstr "bağlam belirtmek için ' ' yerine kullanılacak karakteri belirle"
+
+msgid "Diff rename options"
+msgstr "Diff yeniden adlandırma seçenekleri"
+
+msgid "<n>[/<m>]"
+msgstr "<n>[/<m>]"
+
+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"
+
+msgid "detect renames"
+msgstr "yeniden adlandırmaları algıla"
+
+msgid "omit the preimage for deletes"
+msgstr "silmeler için öngörüntüyü atla"
+
+msgid "detect copies"
+msgstr "kopyaları algıla"
+
+msgid "use unmodified files as source to find copies"
+msgstr "değiştirilmemiş dosyaları kopyaları bulmak için kaynak olarak kullan"
+
+msgid "disable rename detection"
+msgstr "yeniden adlandırma algılamasını devre dışı bırak"
+
+msgid "use empty blobs as rename source"
+msgstr "boş ikili nesneleri yeniden adlandırma kaynağı olarak kullan"
+
+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"
+
+msgid ""
+"prevent rename/copy detection if the number of rename/copy targets exceeds "
+"given limit"
+msgstr ""
+"eğer yeniden adlandırma/kopyalama hedeflerinin sayısı verilen sınırı aşarsa "
+"yeniden adlandırma/kopyalama algılamasını önle"
+
+msgid "Diff algorithm options"
+msgstr "Diff algoritma seçenekleri"
+
+msgid "produce the smallest possible diff"
+msgstr "olabilecek en küçük diff'i üret"
+
+msgid "ignore whitespace when comparing lines"
+msgstr "satırları karşılaştırırken boşlukları yok say"
+
+msgid "ignore changes in amount of whitespace"
+msgstr "boşluk sayısındaki değişiklikleri yok say"
+
+msgid "ignore changes in whitespace at EOL"
+msgstr "satır sonundaki boşluk değişikliklerini yok say"
+
+msgid "ignore carrier-return at the end of line"
+msgstr "satır sonundaki satırbaşı karakterini yok say"
+
+msgid "ignore changes whose lines are all blank"
+msgstr "satırlarının tümü boş olan değişiklikleri yok say"
+
+msgid "<regex>"
+msgstr "<ifade>"
+
+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"
+
+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"
+
+msgid "generate diff using the \"patience diff\" algorithm"
+msgstr "diff'i \"patience diff\" algoritmasını kullanarak oluştur"
+
+msgid "generate diff using the \"histogram diff\" algorithm"
+msgstr "diff'i \"histogram diff\" algoritmasını kullanarak oluştur"
+
+msgid "<algorithm>"
+msgstr "<algoritma>"
+
+msgid "choose a diff algorithm"
+msgstr "bir diff algoritması seç"
+
+msgid "<text>"
+msgstr "<metin>"
+
+msgid "generate diff using the \"anchored diff\" algorithm"
+msgstr "diff'i \"anchored diff\" algoritmasını kullanarak oluştur"
+
+msgid "<mode>"
+msgstr "<kip>"
+
+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"
+
+msgid "use <regex> to decide what a word is"
+msgstr "bir sözcüğün ne olduğuna karar vermek için <ifade> kullan"
+
+msgid "equivalent to --word-diff=color --word-diff-regex=<regex>"
+msgstr "şuna eşdeğer: --word-diff=color --word-diff-regex=<ifade>"
+
+msgid "moved lines of code are colored differently"
+msgstr "taşınan kod satırları farklı renklendirilir"
+
+msgid "how white spaces are ignored in --color-moved"
+msgstr "boşluklar --color-moved içinde nasıl yok sayılır"
+
+msgid "Other diff options"
+msgstr "Diğer diff seçenekleri"
+
+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"
+
+msgid "treat all files as text"
+msgstr "tüm dosyaları metin olarak varsay"
+
+msgid "swap two inputs, reverse the diff"
+msgstr "iki girdiyi değiştir, diff'i tersine döndür"
+
+msgid "exit with 1 if there were differences, 0 otherwise"
+msgstr "ayrımlar varsa 1 ile, yoksa 0 ile çık"
+
+msgid "disable all output of the program"
+msgstr "tüm program çıktısını devre dışı bırak"
+
+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"
+
+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"
+
+msgid "<when>"
+msgstr "<ne-zaman>"
+
+msgid "ignore changes to submodules in the diff generation"
+msgstr "diff oluştururken altmodüllere olan değişiklikleri yok say"
+
+msgid "<format>"
+msgstr "<biçim>"
+
+msgid "specify how differences in submodules are shown"
+msgstr "altmodüllerdeki değişikliklerin nasıl gösterileceğini belirt"
+
+msgid "hide 'git add -N' entries from the index"
+msgstr "indeksten 'git add -N' girdilerini gizle"
+
+msgid "treat 'git add -N' entries as real in the index"
+msgstr "indekste 'git add -N' girdilerine gerçekmiş gibi davran"
+
+msgid "<string>"
+msgstr "<dizi>"
+
+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"
+
+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"
+
+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"
+
+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"
+
+msgid "control the order in which files appear in the output"
+msgstr "dosyaların çıktıda hangi sırayla görüneceğini denetle"
+
+msgid "<path>"
+msgstr "<yol>"
+
+msgid "show the change in the specified path first"
+msgstr "öncelikle belirtilen yoldaki değişikliği göster"
+
+msgid "skip the output to the specified path"
+msgstr "belirtilen yola olan çıktıyı atla"
+
+msgid "<object-id>"
+msgstr "<nesne-no>"
+
+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"
+
+msgid "[(A|C|D|M|R|T|U|X|B)...[*]]"
+msgstr "[(A|C|D|M|R|T|U|X|B)...[*]]"
+
+msgid "select files by diff type"
+msgstr "dosyaları diff türüne göre seç"
+
+msgid "<file>"
+msgstr "<dosya>"
+
+msgid "output to a specific file"
+msgstr "belirli bir dosyaya çıktıla"
+
+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ı."
+
+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."
+
+#, c-format
+msgid ""
+"you may want to set your %s variable to at least %d and retry the command."
+msgstr ""
+"%s değişkeninizi en azından %d olarak ayarlamak ve komutu yeniden denemek "
+"isteyebilirsiniz."
+
+#, c-format
+msgid "failed to read orderfile '%s'"
+msgstr "orderfile '%s' okunamadı"
+
+msgid "Performing inexact rename detection"
+msgstr "Kesin olmayan yeniden adlandırma algılaması gerçekleştiriliyor"
+
+#, c-format
+msgid "No such path '%s' in the diff"
+msgstr "diff'te '%s' diye bir yol yok"
+
+#, c-format
+msgid "pathspec '%s' did not match any file(s) known to git"
+msgstr "yol belirteci '%s' git'in tanıdığı herhangi bir dosya ile eşleşmedi"
+
+#, c-format
+msgid "unrecognized pattern: '%s'"
+msgstr "tanımlanamayan dizgi: '%s'"
+
+#, c-format
+msgid "unrecognized negative pattern: '%s'"
+msgstr "tanımlanamayan negatif dizgi: '%s'"
+
+#, c-format
+msgid "your sparse-checkout file may have issues: pattern '%s' is repeated"
+msgstr "sparse-checkout dosyanızın sorunları olabilir: '%s' dizgisi yinelenmiş"
+
+msgid "disabling cone pattern matching"
+msgstr "koni dizgi eşleşmesi devre dışı bırakılıyor"
+
+#, c-format
+msgid "cannot use %s as an exclude file"
+msgstr "%s bir 'exclude' dosyası olarak kullanılamıyor"
+
+msgid "failed to get kernel name and information"
+msgstr "çekirdek adı ve bilgisi alınamadı"
+
+msgid "untracked cache is disabled on this system or location"
+msgstr "izlenmeyen önbellek bu sistemde veya konumda devre dışı bırakılmış"
+
+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."
+
+#, c-format
+msgid "index file corrupt in repo %s"
+msgstr "%s deposundaki indeks dosyası hasarlı"
+
+#, c-format
+msgid "could not create directories for %s"
+msgstr "%s için dizinler oluşturulamadı"
+
+#, c-format
+msgid "could not migrate git directory from '%s' to '%s'"
+msgstr "git dizini '%s' konumundan '%s' konumuna göç ettirilemedi"
+
+#, c-format
+msgid "hint: Waiting for your editor to close the file...%c"
+msgstr "İpucu: Düzenleyicinizin dosyayı kapatması bekleniyor...%c"
+
+msgid "Filtering content"
+msgstr "İçerik süzülüyor"
+
+#, c-format
+msgid "could not stat file '%s'"
+msgstr "'%s' dosyasının bilgileri alınamadı"
+
+#, c-format
+msgid "bad git namespace path \"%s\""
+msgstr "hatalı git ad alanı yolu \"%s\""
+
+#, c-format
+msgid "too many args to run %s"
+msgstr "%s çalıştırmak için çok fazla argüman"
+
+msgid "git fetch-pack: expected shallow list"
+msgstr "git fetch-pack: sığ bir liste bekleniyordu"
+
+msgid "git fetch-pack: expected a flush packet after shallow list"
+msgstr "git fetch-pack: sığ listeden sonra floş paketi bekleniyordu"
+
+msgid "git fetch-pack: expected ACK/NAK, got a flush packet"
+msgstr "git fetch-pack: ACK/NAK bekleniyordu, floş paket alındı"
+
+#, c-format
+msgid "git fetch-pack: expected ACK/NAK, got '%s'"
+msgstr "git fetch-pack: ACK/NAK bekleniyordu, '%s' alındı"
+
+msgid "unable to write to remote"
+msgstr "uzak konuma yazılamıyor"
+
+#, c-format
+msgid "invalid shallow line: %s"
+msgstr "geçersiz sığ satır: %s"
+
+#, c-format
+msgid "invalid unshallow line: %s"
+msgstr "geçersiz sığ olmayan satır: %s"
+
+#, c-format
+msgid "object not found: %s"
+msgstr "nesne bulunamadı: %s"
+
+#, c-format
+msgid "error in object: %s"
+msgstr "nesne içinde hata: %s"
+
+#, c-format
+msgid "no shallow found: %s"
+msgstr "sığ bulunamadı: %s"
+
+#, c-format
+msgid "expected shallow/unshallow, got %s"
+msgstr "sığ/sığ olmayan bekleniyordu, %s alındı"
+
+#, c-format
+msgid "got %s %d %s"
+msgstr "%s %d %s alındı"
+
+#, c-format
+msgid "invalid commit %s"
+msgstr "geçersiz işleme %s"
+
+msgid "giving up"
+msgstr "vazgeçiliyor"
+
+msgid "done"
+msgstr "bitti"
+
+#, c-format
+msgid "got %s (%d) %s"
+msgstr "%s (%d) %s alındı"
+
+#, c-format
+msgid "Marking %s as complete"
+msgstr "%s tamam olarak imleniyor"
+
+#, c-format
+msgid "already have %s (%s)"
+msgstr "%s halihazırda var (%s)"
+
+msgid "fetch-pack: unable to fork off sideband demultiplexer"
+msgstr "fetch-pack: yanbant çoğullama çözücüsü ayrı çatallanamıyor"
+
+msgid "protocol error: bad pack header"
+msgstr "protokol hatası: hatalı paket üstbilgisi"
+
+#, c-format
+msgid "fetch-pack: unable to fork off %s"
+msgstr "fetch-pack: %s ayrı çatallanamıyor"
+
+msgid "fetch-pack: invalid index-pack output"
+msgstr "fetch-pack: geçersiz index-pack çıktısı"
+
+#, c-format
+msgid "%s failed"
+msgstr "%s başarısız oldu"
+
+msgid "error in sideband demultiplexer"
+msgstr "yanbant çoğullama çözücüsünde hata"
+
+#, c-format
+msgid "Server version is %.*s"
+msgstr "Sunucu sürümü %.*s"
+
+#, c-format
+msgid "Server supports %s"
+msgstr "Sunucu %s destekliyor"
+
+msgid "Server does not support shallow clients"
+msgstr "Sunucu sığ istemcileri desteklemiyor"
+
+msgid "Server does not support --shallow-since"
+msgstr "Sunucu --shallow-since desteklemiyor"
+
+msgid "Server does not support --shallow-exclude"
+msgstr "Sunucu --shallow-exclude desteklemiyor"
+
+msgid "Server does not support --deepen"
+msgstr "Sunucu --deepen desteklemiyor"
+
+msgid "Server does not support this repository's object format"
+msgstr "Sunucu bu deponun nesne türünü desteklemiyor"
+
+msgid "no common commits"
+msgstr "ortak işleme yok"
+
+msgid "git fetch-pack: fetch failed."
+msgstr "git fetch-pack: Getirme başarısız."
+
+#, c-format
+msgid "mismatched algorithms: client %s; server %s"
+msgstr "eşleşmeyen algoritmalar: İstemci %s; sunucu %s"
+
+#, c-format
+msgid "the server does not support algorithm '%s'"
+msgstr "sunucu '%s' algoritmasını desteklemiyor"
+
+msgid "Server does not support shallow requests"
+msgstr "Sunucu sığ istekleri desteklemiyor"
+
+msgid "Server supports filter"
+msgstr "Sunucu süzgeç destekliyor"
+
+msgid "unable to write request to remote"
+msgstr "uzak konuma istek yazılamıyor"
+
+#, c-format
+msgid "expected '%s', received '%s'"
+msgstr "'%s' bekleniyordu, '%s' alındı"
+
+#, c-format
+msgid "expected '%s'"
+msgstr "'%s' bekleniyordu"
+
+#, c-format
+msgid "unexpected acknowledgment line: '%s'"
+msgstr "beklenmedik alındı satırı: '%s'"
+
+#, c-format
+msgid "error processing acks: %d"
+msgstr "alındılar işlenirken hata: %d"
+
+#. TRANSLATORS: The parameter will be 'ready', a protocol
+#. keyword.
+#.
+#, c-format
+msgid "expected packfile to be sent after '%s'"
+msgstr "paket dosyasının '%s' ögesinden sonra gönderilmesi bekleniyordu"
+
+#. TRANSLATORS: The parameter will be 'ready', a protocol
+#. keyword.
+#.
+#, c-format
+msgid "expected no other sections to be sent after no '%s'"
+msgstr "'%s' \"yok\" iken başka hiçbir bölümün gönderilmemesi bekleniyordu"
+
+#, c-format
+msgid "error processing shallow info: %d"
+msgstr "sığ bilgi işlenirken hata: %d"
+
+#, c-format
+msgid "expected wanted-ref, got '%s'"
+msgstr "wanted-ref bekleniyordu, '%s' alındı"
+
+#, c-format
+msgid "unexpected wanted-ref: '%s'"
+msgstr "beklenmedik wanted-ref: '%s'"
+
+#, c-format
+msgid "error processing wanted refs: %d"
+msgstr "aranan başvurular işlenirken hata: %d"
+
+msgid "git fetch-pack: expected response end packet"
+msgstr "git fetch-pack: yanıt sonu paketi bekleniyordu"
+
+msgid "no matching remote head"
+msgstr "eşleşen uzak dal ucu yok"
+
+msgid "unexpected 'ready' from remote"
+msgstr "uzak konumdan beklenmedik 'ready'"
+
+#, c-format
+msgid "no such remote ref %s"
+msgstr "böyle bir uzak başvuru yok: %s"
+
+#, 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"
+
+#, c-format
+msgid "fsmonitor_ipc__send_query: invalid path '%s'"
+msgstr "fsmonitor_ipc__send_query: geçersiz yol '%s'"
+
+#, c-format
+msgid "fsmonitor_ipc__send_query: unspecified error on '%s'"
+msgstr "fsmonitor_ipc__send_query: '%s' üzerinde belirtilmemiş hata"
+
+msgid "fsmonitor--daemon is not running"
+msgstr "fsmonitor--daemon çalışmıyor"
+
+#, c-format
+msgid "could not send '%s' command to fsmonitor--daemon"
+msgstr "fsmonitor--daemon'a '%s' komutu gönderilemedi"
+
+#, c-format
+msgid "bare repository '%s' is incompatible with fsmonitor"
+msgstr "çıplak depo '%s', fsmonitor ile uyumsuz"
+
+#, c-format
+msgid "repository '%s' is incompatible with fsmonitor due to errors"
+msgstr "'%s' deposu, hatalardan dolayı fsmonitor ile uyumsuz"
+
+#, c-format
+msgid "remote repository '%s' is incompatible with fsmonitor"
+msgstr "uzak depo '%s', fsmonitor ile uyumsuz"
+
+#, c-format
+msgid "virtual repository '%s' is incompatible with fsmonitor"
+msgstr "sanal depo '%s', fsmonitor ile uyumsuz"
+
+#, c-format
+msgid ""
+"repository '%s' is incompatible with fsmonitor due to lack of Unix sockets"
+msgstr ""
+"Unix soketleri eksik olduğundan dolayı; '%s' deposu, fsmonitor ile uyumsuz"
+
+msgid ""
+"git [-v | --version] [-h | --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"
+"           [--git-dir=<path>] [--work-tree=<path>] [--namespace=<name>]\n"
+"           [--super-prefix=<path>] [--config-env=<name>=<envvar>]\n"
+"           <command> [<args>]"
+msgstr ""
+"git [-v | --version] [-h | --help] [-C <yol>] [-c <ad>=<değer>]\n"
+"           [--exec-path[=<yol>]] [--html-path] [--man-path] [--info-path]\n"
+"           [-p | --paginate | -P | --no-pager] [--no-replace-objects] [--"
+"bare]\n"
+"           [--git-dir=<yol>] [--work-tree=<yol>] [--namespace=<ad>]\n"
+"           [--super-prefix=<yol>] [--config-env=<ad>=<çevredeğişkeni>]\n"
+"           <komut> [<argümanlar>]"
+
+msgid ""
+"'git help -a' and 'git help -g' list available subcommands and some\n"
+"concept guides. See 'git help <command>' or 'git help <concept>'\n"
+"to read about a specific subcommand or concept.\n"
+"See 'git help git' for an overview of the system."
+msgstr ""
+"'git help -a' ve 'git help -g' kullanılabilir komutları ve bazı konsept\n"
+"kılavuzlarını listeler. Belirli bir komut veya konsept üzerine bilgi almak\n"
+"için 'git help <komut>' veya 'git help <konsept>' yazın. Genel bir görünüm\n"
+"için 'git help git' kullanabilirsiniz."
+
+#, c-format
+msgid "unsupported command listing type '%s'"
+msgstr "desteklenmeyen komut listeleme türü '%s'"
+
+#, c-format
+msgid "no directory given for '%s' option\n"
+msgstr "'%s' seçeneği için bir dizin verilmedi\n"
+
+#, c-format
+msgid "no namespace given for --namespace\n"
+msgstr "--namespace için ad alanı verilmedi\n"
+
+#, c-format
+msgid "no prefix given for --super-prefix\n"
+msgstr "--super-prefix için önek verilmedi\n"
+
+#, c-format
+msgid "-c expects a configuration string\n"
+msgstr "-c bir yapılandırma dizisi bekliyor\n"
+
+#, c-format
+msgid "no config key given for --config-env\n"
+msgstr "--config-env için bir yapılandırma anahtarı verilmedi\n"
+
+#, c-format
+msgid "unknown option: %s\n"
+msgstr "bilinmeyen seçenek: %s\n"
+
+#, c-format
+msgid "while expanding alias '%s': '%s'"
+msgstr "'%s' arması genişletirilirken: '%s'"
+
+#, c-format
+msgid ""
+"alias '%s' changes environment variables.\n"
+"You can use '!git' in the alias to do this"
+msgstr ""
+"'%s' arması çevre değişkenlerini değiştirir.\n"
+"Bunu yapmak için armada '!git' kullanabilirsiniz."
+
+#, c-format
+msgid "empty alias for %s"
+msgstr "%s için boş arma"
+
+#, c-format
+msgid "recursive alias: %s"
+msgstr "özyineli arma: %s"
+
+msgid "write failure on standard output"
+msgstr "standart çıktı'da yazma hatası"
+
+msgid "unknown write failure on standard output"
+msgstr "standart çıktı'da bilinmeyen yazma hatası"
+
+msgid "close failed on standard output"
+msgstr "standart çıktı'da kapatma başarısız"
+
+#, 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"
+
+#, c-format
+msgid "cannot handle %s as a builtin"
+msgstr "%s bir yerleşik olarak ele alınamıyor"
+
+#, c-format
+msgid ""
+"usage: %s\n"
+"\n"
+msgstr ""
+"kullanım: %s\n"
+"\n"
+
+#, 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"
+
+#, c-format
+msgid "failed to run command '%s': %s\n"
+msgstr "'%s' komutu çalıştırılamadı: %s\n"
+
+msgid "could not create temporary file"
+msgstr "geçici dosya oluşturulamadı"
+
+#, c-format
+msgid "failed writing detached signature to '%s'"
+msgstr "şuna ayrık imza yazılamadı: '%s'"
+
+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"
+
+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)"
+
+#, 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"
+
+#, c-format
+msgid "bad/incompatible signature '%s'"
+msgstr "hatalı/uyumsuz imza '%s'"
+
+#, c-format
+msgid "failed to get the ssh fingerprint for key '%s'"
+msgstr "'%s' anahtarı için ssh parmak izi alınamadı"
+
+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"
+
+#, 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"
+
+#, c-format
+msgid "gpg.ssh.defaultKeyCommand failed: %s %s"
+msgstr "gpg.ssh.defaultKeyCommand başarısız oldu: %s %s"
+
+msgid "gpg failed to sign the data"
+msgstr "gpg veriyi imzalayamadı"
+
+msgid "user.signingKey needs to be set for ssh signing"
+msgstr "user.signingKey'in ssh imzalaması için ayarlanması gerekiyor"
+
+#, c-format
+msgid "failed writing ssh signing key to '%s'"
+msgstr "ssh imzalama anahtarı '%s' konumuna yazılamadı"
+
+#, c-format
+msgid "failed writing ssh signing key buffer to '%s'"
+msgstr "ssh imzalama anahtarı arabelleği '%s' konumuna yazılamadı"
+
+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)"
+
+#, c-format
+msgid "failed reading ssh signing data buffer from '%s'"
+msgstr "ssh imzalama verisi arabelleği '%s' konumundan okunamadı"
+
+#, c-format
+msgid "ignored invalid color '%.*s' in log.graphColors"
+msgstr "log.graphColors içindeki '%.*s' geçersiz renk yok sayıldı"
+
+msgid ""
+"given pattern contains NULL byte (via -f <file>). This is only supported "
+"with -P under PCRE v2"
+msgstr ""
+"verilen dizgi NULL baytı içeriyor (-f <dosya> aracılığıyla). Bu yalnızca "
+"PCRE v2 altında -P ile desteklenir"
+
+#, c-format
+msgid "'%s': unable to read %s"
+msgstr "'%s': %s okunamıyor"
+
+#, c-format
+msgid "'%s': short read"
+msgstr "'%s': kısa okuma"
+
+msgid "start a working area (see also: git help tutorial)"
+msgstr "bir çalışma alanı başlatın (ayrıca bkz: git help tutorial)"
+
+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)"
+
+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)"
+
+msgid "grow, mark and tweak your common history"
+msgstr "ortak geçmişinizi büyütün, imleyin ve geliştirin"
+
+msgid "collaborate (see also: git help workflows)"
+msgstr "birlikte çalışın (ayrıca bkz: git help workflows)"
+
+msgid "Main Porcelain Commands"
+msgstr "Ana Komutlar"
+
+msgid "Ancillary Commands / Manipulators"
+msgstr "Yan Komutlar / Yönlendiriciler"
+
+msgid "Ancillary Commands / Interrogators"
+msgstr "Yan Komutlar / Sorgucular"
+
+msgid "Interacting with Others"
+msgstr "Başkaları ile Etkileşim"
+
+msgid "Low-level Commands / Manipulators"
+msgstr "Düşük Düzeyli Komutlar / Yönlendiriciler"
+
+msgid "Low-level Commands / Interrogators"
+msgstr "Düşük Düzeyli Komutlar / Sorgucular"
+
+msgid "Low-level Commands / Syncing Repositories"
+msgstr "Düşük Düzeyli Komutlar / Depo Eşitleme"
+
+msgid "Low-level Commands / Internal Helpers"
+msgstr "Düşük Düzeyli Komutlar / İç Yardımcılar"
+
+#, c-format
+msgid "available git commands in '%s'"
+msgstr "'%s' içindeki kullanılabilir git komutları"
+
+msgid "git commands available from elsewhere on your $PATH"
+msgstr "$PATH içindeki başka yerlerden kullanılabilen git komutları"
+
+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:"
+
+msgid "The Git concept guides are:"
+msgstr "Git konsept kılavuzları şunlardır:"
+
+msgid "External commands"
+msgstr "Dış komutlar"
+
+msgid "Command aliases"
+msgstr "Komut armaları"
+
+msgid "See 'git help <command>' to read about a specific subcommand"
+msgstr "Belirli bir altkomut üzerine okumak için 'git help <komut>' kullanın"
+
+#, c-format
+msgid ""
+"'%s' appears to be a git command, but we were not\n"
+"able to execute it. Maybe git-%s is broken?"
+msgstr ""
+"'%s' bir git komutu gibi görünüyor; ancak biz onu\n"
+"çalıştıramadık. git-%s bozuk olabilir mi?"
+
+#, 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'."
+
+msgid "Uh oh. Your system reports no Git commands at all."
+msgstr "Tüh. Sisteminiz hiçbir Git komutu bildirmiyor."
+
+#, 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."
+
+#, c-format
+msgid "Continuing under the assumption that you meant '%s'."
+msgstr "'%s' demek istediğiniz varsayılarak sürdürülüyor."
+
+#, c-format
+msgid "Run '%s' instead [y/N]? "
+msgstr "Bunun yerine '%s' çalıştırılsın mı? (y/N)? "
+
+#, 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."
+
+msgid ""
+"\n"
+"The most similar command is"
+msgid_plural ""
+"\n"
+"The most similar commands are"
+msgstr[0] ""
+"\n"
+"Buna en yakın komut:"
+msgstr[1] ""
+"\n"
+"Buna en yakın komutlar:"
+
+msgid "git version [<options>]"
+msgstr "git version [<seçenekler>]"
+
+#, c-format
+msgid "%s: %s - %s"
+msgstr "%s: %s - %s"
+
+msgid ""
+"\n"
+"Did you mean this?"
+msgid_plural ""
+"\n"
+"Did you mean one of these?"
+msgstr[0] ""
+"\n"
+"Şunu mu demek istediniz?"
+msgstr[1] ""
+"\n"
+"Şunlardan birini mi demek istediniz?"
+
+#, 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."
+
+#, c-format
+msgid "Couldn't start hook '%s'\n"
+msgstr "'%s' kancası başlatılamadı\n"
+
+#, c-format
+msgid "argument to --packfile must be a valid hash (got '%s')"
+msgstr "--packfile için argüman geçerli bir sağlama olmalıdır ('%s' alındı)"
+
+msgid "not a git repository"
+msgstr "bir git deposu değil"
+
+msgid "negative value for http.postBuffer; defaulting to %d"
+msgstr "http.postBuffer için negatif değer; %d olarak varsayılıyor"
+
+msgid "Delegation control is not supported with cURL < 7.22.0"
+msgstr "Delegasyon denetimi cURL < 7.22.0 tarafından desteklenmiyor"
+
+msgid "Public key pinning not supported with cURL < 7.39.0"
+msgstr "Ortak anahtar iğnelemesi cURL < 7.39.0 tarafından desteklenmiyor"
+
+msgid "CURLSSLOPT_NO_REVOKE not supported with cURL < 7.44.0"
+msgstr "CURLSSLOPT_NO_REVOKE cURL < 7.44.0 tarafından desteklenmiyor"
+
+#, c-format
+msgid "Unsupported SSL backend '%s'. Supported SSL backends:"
+msgstr "Desteklenmeyen SSL arka ucu '%s'. Desteklenen SSL arka uçları:"
+
+#, 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ış"
+
+#, c-format
+msgid "Could not set SSL backend to '%s': already set"
+msgstr "SSL arka ucu '%s' olarak ayarlanamadı: Halihazırda ayarlanmış"
+
+#, c-format
+msgid ""
+"unable to update url base from redirection:\n"
+"  asked for: %s\n"
+"   redirect: %s"
+msgstr ""
+"yeniden yönlendirerek url tabanı güncellenemiyor:\n"
+" şu istendi: %s\n"
+"   yönlenen: %s"
+
+msgid "Author identity unknown\n"
+msgstr "Yazar kimliği bilinmiyor\n"
+
+msgid "Committer identity unknown\n"
+msgstr "İşleyici kimliği bilinmiyor\n"
+
+msgid ""
+"\n"
+"*** Please tell me who you are.\n"
+"\n"
+"Run\n"
+"\n"
+"  git config --global user.email \"you@example.com\"\n"
+"  git config --global user.name \"Your Name\"\n"
+"\n"
+"to set your account's default identity.\n"
+"Omit --global to set the identity only in this repository.\n"
+"\n"
+msgstr ""
+"\n"
+"*** Lütfen bana kim olduğunuzu söyleyin.\n"
+"\n"
+"Hesabınızın öntanımlı kimliğini ayarlamak için\n"
+"\n"
+"\tgit config --global user.name \"Adınız\"\n"
+"\tgit config --global user.email \"siz@e-posta.com\"\n"
+"\n"
+"komutlarını çalıştırın.\n"
+"Kimliğinizi yalnızca bu depo için geçerli kılmak isterseniz --global\n"
+"değişkenini kullanmayın.\n"
+"\n"
+
+msgid "no email was given and auto-detection is disabled"
+msgstr "bir e-posta verilmedi ve kendiliğinden algılama devre dışı"
+
+#, c-format
+msgid "unable to auto-detect email address (got '%s')"
+msgstr "e-posta adresi kendiliğinden algılanamıyor ('%s' alındı)"
+
+msgid "no name was given and auto-detection is disabled"
+msgstr "bir ad verilmedi ve kendiliğinden algılama devre dışı"
+
+#, c-format
+msgid "unable to auto-detect name (got '%s')"
+msgstr "ad kendiliğinden algılanamıyor ('%s' alındı)"
+
+#, c-format
+msgid "empty ident name (for <%s>) not allowed"
+msgstr "boş tanımlayıcı adına (<%s> için) izin verilmiyor"
+
+#, c-format
+msgid "name consists only of disallowed characters: %s"
+msgstr "ad yalnızca izin verilmeyen karakterlerden oluşuyor: %s"
+
+msgid "expected 'tree:<depth>'"
+msgstr "'tree:<derinlik>' bekleniyordu"
+
+msgid "sparse:path filters support has been dropped"
+msgstr "sparse:path süzgeçleri desteği artık yok"
+
+#, c-format
+msgid "'%s' for 'object:type=<type>' is not a valid object type"
+msgstr "'object:type=<tür>' için '%s' geçerli bir nesne türü değil"
+
+#, c-format
+msgid "invalid filter-spec '%s'"
+msgstr "geçersiz filter-spec '%s'"
+
+#, c-format
+msgid "must escape char in sub-filter-spec: '%c'"
+msgstr "sub-filter-spec içinde kaçış karakteri olmalı: '%c'"
+
+msgid "expected something after combine:"
+msgstr "birlikte kullanımdan sonra bir şeyler bekleniyordu:"
+
+msgid "multiple filter-specs cannot be combined"
+msgstr "çoklu filter-specs birlikte kullanılamaz"
+
+msgid "unable to upgrade repository format to support partial clone"
+msgstr "depo biçimi kısımsal klonları desteklemesi için yükseltilemiyor"
+
+msgid "args"
+msgstr "argümanlar"
+
+msgid "object filtering"
+msgstr "nesne süzümü"
+
+#, c-format
+msgid "unable to access sparse blob in '%s'"
+msgstr "'%s' içindeki aralıklı ikili nesneye erişilemiyor"
+
+#, c-format
+msgid "unable to parse sparse filter data in %s"
+msgstr "%s içindeki aralıklı süzgeç verisi ayrıştırılamıyor"
+
+#, c-format
+msgid "entry '%s' in tree %s has tree mode, but is not a tree"
+msgstr "'%s' girdisi (%s ağacında) ağaç kipine iye; ancak bir ağaç değil"
+
+#, c-format
+msgid "entry '%s' in tree %s has blob mode, but is not a blob"
+msgstr ""
+"'%s' girdisi (%s ağacında) ikili nesne kipine iye; ancak bir ikili nesne "
+"değil"
+
+#, c-format
+msgid "unable to load root tree for commit %s"
+msgstr "%s işlemesi için kök ağacı yüklenemiyor"
+
+#, c-format
+msgid ""
+"Unable to create '%s.lock': %s.\n"
+"\n"
+"Another git process seems to be running in this repository, e.g.\n"
+"an editor opened by 'git commit'. Please make sure all processes\n"
+"are terminated then try again. If it still fails, a git process\n"
+"may have crashed in this repository earlier:\n"
+"remove the file manually to continue."
+msgstr ""
+"'%s.lock' oluşturulamıyor: %s.\n"
+"\n"
+"Bu depoda başka bir git işlemi çalışıyor gibi görünüyor, örneğin\n"
+"'git commit' kullanılarak açılmış bir düzenleyici. Lütfen tüm işlemlerin\n"
+"sonlandırıldığından emin olun ve yeniden deneyin. Eğer hâlâ başarısız\n"
+"oluyorsa bir git işlemi bu depo içinde daha önceden çakılmış olabilir:\n"
+"Sürdürmek için dosyayı el ile kaldırın."
+
+#, c-format
+msgid "Unable to create '%s.lock': %s"
+msgstr "'%s.lock' oluşturulamıyor: %s"
+
+#, c-format
+msgid "unexpected line: '%s'"
+msgstr "beklenmedik satır: '%s'"
+
+msgid "expected flush after ls-refs arguments"
+msgstr "ls-refs argümanlarından sonra floş bekleniyordu"
+
+msgid "quoted CRLF detected"
+msgstr "alıntılanmış CRLF algılandı"
+
+#, c-format
+msgid ""
+"Your local changes to the following files would be overwritten by merge:\n"
+"  %s"
+msgstr ""
+"Birleştirme ile aşağıdaki dosyalardaki yerel değişikliklerin üzerine "
+"yazılacak:\n"
+"\t%s"
+
+#, c-format
+msgid "Failed to merge submodule %s (not checked out)"
+msgstr "%s altmodülü birleştirilemedi (çıkış yapılmadı)"
+
+#, c-format
+msgid "Failed to merge submodule %s (commits not present)"
+msgstr "%s altmodülü birleştirilemedi (işlemeler mevcut değil)"
+
+#, 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)"
+
+#, c-format
+msgid "Note: Fast-forwarding submodule %s to %s"
+msgstr "Not: %s altmodülü %s yönüne ileri sarılıyor"
+
+#, c-format
+msgid "Failed to merge submodule %s"
+msgstr "'%s' altmodülü birleştirilemedi"
+
+#, c-format
+msgid ""
+"Failed to merge submodule %s, but a possible merge resolution exists:\n"
+"%s\n"
+msgstr ""
+"%s altmodülü birleştirilemedi; ancak olası bir birleştirme çözümü mevcut:\n"
+"%s\n"
+
+#, c-format
+msgid ""
+"If this is correct simply add it to the index for example\n"
+"by using:\n"
+"\n"
+"  git update-index --cacheinfo 160000 %s \"%s\"\n"
+"\n"
+"which will accept this suggestion.\n"
+msgstr ""
+"Eğer bu doğruysa yalnızca indekse ekleyin, örneğin:\n"
+"\n"
+"\tgit update-index --cacheinfo 160000 %s \"%s\"\n"
+"\n"
+"komutu bu öneriyi kabul edecektir.\n"
+
+#, c-format
+msgid ""
+"Failed to merge submodule %s, but multiple possible merges exist:\n"
+"%s"
+msgstr ""
+"%s altmodülü birleştirilemedi; ancak birden çok olası birleştirmeler "
+"mevcut:\n"
+"%s"
+
+msgid "Failed to execute internal merge"
+msgstr "İç birleştirme çalıştırılamadı"
+
+#, c-format
+msgid "Unable to add %s to database"
+msgstr "%s veritabanına eklenemedi"
+
+#, c-format
+msgid "Auto-merging %s"
+msgstr "%s kendiliğinden birleştiriliyor"
+
+#, 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 ""
+"ÇAKIŞMA (örtülü dizin yeniden adlandırma): %s konumundaki mevcut dosya/dizin "
+"örtülü yeniden adlandırmanın aşağıdaki yolları oraya koymasına engel oluyor: "
+"%s."
+
+#, 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 ""
+"ÇAKIŞMA (örtülü dizin yeniden adlandırma): %s için birden çok yol "
+"eşlemlenemiyor; örtülü dizin yeniden adlandırmaları aşağıdaki yolları oraya "
+"koymayı denedi: %s."
+
+#, c-format
+msgid ""
+"CONFLICT (directory rename split): Unclear where to rename %s to; it was "
+"renamed to multiple other directories, with no destination getting a "
+"majority of the files."
+msgstr ""
+"ÇAKIŞMA: (dizin yeniden adlandırma ayrılması): %s ögesinin nereye yeniden "
+"adlandırılacağı belirsiz; herhangi bir hedef dosyaların çoğunu almadan "
+"birden çok başka dizine yeniden adlandırılmıştı."
+
+#, c-format
+msgid ""
+"WARNING: Avoiding applying %s -> %s rename to %s, because %s itself was "
+"renamed."
+msgstr ""
+"UYARI: %s -> %s yeniden adlandırmasını %s ögesine uygulamadan kaçınılıyor, "
+"çünkü %s ögesinin kendisi yeniden adlandırıldı."
+
+#, c-format
+msgid ""
+"Path updated: %s added in %s inside a directory that was renamed in %s; "
+"moving it to %s."
+msgstr ""
+"Yol güncellendi: %s, (%s içinde eklenen) %s içinde yeniden adlandırılan bir "
+"dizinde; onu %s konumuna taşıdı."
+
+#, c-format
+msgid ""
+"Path updated: %s renamed to %s in %s, inside a directory that was renamed in "
+"%s; moving it to %s."
+msgstr ""
+"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ı."
+
+#, 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 ""
+"ÇAKIŞMA (dosya konumu): %s, (%s içinde eklenen) %s içinde yeniden "
+"adlandırılan bir dizinde, belki de %s konumuna taşınmalı."
+
+#, 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 ""
+"Ç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ı."
+
+#, 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)."
+
+#, 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."
+msgstr ""
+"ÇAKIŞMA (yeniden adlandırma çarpışması): %s -> %s yeniden adlandırmasının "
+"içerik çakışmaları var ve başka bir yolla çarpışıyor; bu iç içe geçmiş "
+"çakışma imleyicilerine neden olabilir."
+
+#, 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."
+
+#, c-format
+msgid "cannot read object %s"
+msgstr "%s nesnesi okunamıyor"
+
+#, c-format
+msgid "object %s is not a blob"
+msgstr "%s nesnesi ikili bir nesne değil"
+
+#, c-format
+msgid ""
+"CONFLICT (file/directory): directory in the way of %s from %s; moving it to "
+"%s instead."
+msgstr ""
+"ÇAKIŞMA (dosya/dizin): Dizin, şuradan %s yolunda: %s; bunun yerine %s "
+"konumuna taşınıyor."
+
+#, c-format
+msgid ""
+"CONFLICT (distinct types): %s had different types on each side; renamed both "
+"of them so each can be recorded somewhere."
+msgstr ""
+"ÇAKIŞMA (belirgin türler): %s ögesinin her bir yanında değişik türler vardı; "
+"ikisi de yeniden adlandırıldı; böylelikle başka bir yerde kayıtları "
+"yazılabilir."
+
+#, c-format
+msgid ""
+"CONFLICT (distinct types): %s had different types on each side; renamed one "
+"of them so each can be recorded somewhere."
+msgstr ""
+"ÇAKIŞMA (belirgin türler): %s ögesinin her bir yanında değişik türler vardı; "
+"bir tanesi yeniden adlandırıldı; böylelikle her birinin başka bir yerde "
+"kayıtları yazılabilir."
+
+msgid "content"
+msgstr "içerik"
+
+msgid "add/add"
+msgstr "ekle/ekle"
+
+msgid "submodule"
+msgstr "altmodül"
+
+#, c-format
+msgid "CONFLICT (%s): Merge conflict in %s"
+msgstr "ÇAKIŞMA (%s): %s içinde birleştirme çakışması"
+
+#, c-format
+msgid ""
+"CONFLICT (modify/delete): %s deleted in %s and modified in %s.  Version %s "
+"of %s left in tree."
+msgstr ""
+"Ç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ı."
+
+#, c-format
+msgid ""
+"Note: %s not up to date and in way of checking out conflicted version; old "
+"copy renamed to %s"
+msgstr ""
+"Not: %s güncel değil ve çakışmalı sürümlerin çıkışının önünde; eski kopya %s "
+"olarak yeniden adlandırıldı."
+
+#. TRANSLATORS: The %s arguments are: 1) tree hash of a merge
+#. base, and 2-3) the trees for the two trees we're merging.
+#.
+#, 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"
+
+msgid "(bad commit)\n"
+msgstr "(hatalı işleme)\n"
+
+#, 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."
+
+#, 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."
+
+#, c-format
+msgid "failed to create path '%s'%s"
+msgstr "'%s'%s yolu oluşturulamadı"
+
+#, c-format
+msgid "Removing %s to make room for subdirectory\n"
+msgstr "Altdizine yer açmak için %s kaldırılıyor\n"
+
+msgid ": perhaps a D/F conflict?"
+msgstr ": bir D/F çakışması olabilir mi?"
+
+#, c-format
+msgid "refusing to lose untracked file at '%s'"
+msgstr "'%s' konumundaki izlenmeyen dosyayı kaybetme reddediliyor"
+
+#, c-format
+msgid "blob expected for %s '%s'"
+msgstr "%s '%s' için ikili nesne bekleniyordu"
+
+#, c-format
+msgid "failed to open '%s': %s"
+msgstr "'%s' açılamadı: %s"
+
+#, c-format
+msgid "failed to symlink '%s': %s"
+msgstr "'%s' için sembolik bağ oluşturulamadı: %s"
+
+#, c-format
+msgid "do not know what to do with %06o %s '%s'"
+msgstr "şununla ne yapılacağı bilinmiyor: %06o %s '%s'"
+
+#, c-format
+msgid "Fast-forwarding submodule %s to the following commit:"
+msgstr "%s altmodülü şu işlemeye ileri sarılıyor:"
+
+#, c-format
+msgid "Fast-forwarding submodule %s"
+msgstr "%s altmodülü ileri sarılıyor"
+
+#, 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ı)"
+
+#, c-format
+msgid "Failed to merge submodule %s (not fast-forward)"
+msgstr "%s altmodülü birleştirilemedi (ileri sarım değil)"
+
+msgid "Found a possible merge resolution for the submodule:\n"
+msgstr "Şu altmodül için olası bir birleştirme çözümü bulundu:\n"
+
+#, c-format
+msgid "Failed to merge submodule %s (multiple merges found)"
+msgstr "%s altmodülü birleştirilemedi (birden çok birleştirme bulundu)"
+
+#, 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."
+
+#, c-format
+msgid ""
+"CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s left "
+"in tree."
+msgstr ""
+"Ç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ı."
+
+#, c-format
+msgid ""
+"CONFLICT (%s/delete): %s deleted in %s and %s to %s in %s. Version %s of %s "
+"left in tree."
+msgstr ""
+"Ç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ı."
+
+#, c-format
+msgid ""
+"CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s left "
+"in tree at %s."
+msgstr ""
+"Ç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ı."
+
+#, 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 ""
+"Ç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ı."
+
+msgid "rename"
+msgstr "yeniden adlandır"
+
+msgid "renamed"
+msgstr "yeniden adlandırıldı"
+
+#, c-format
+msgid "Refusing to lose dirty file at %s"
+msgstr "%s konumundaki kirli dosyayı kaybetme reddediliyor"
+
+#, 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."
+
+#, 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)."
+
+#, 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"
+
+#, 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"
+
+#, c-format
+msgid ""
+"CONFLICT (rename/rename): Rename \"%s\"->\"%s\" in branch \"%s\" rename \"%s"
+"\"->\"%s\" in \"%s\"%s"
+msgstr ""
+"Ç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)"
+
+msgid " (left unresolved)"
+msgstr " (çözülmeden bırakıldı)"
+
+#, 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)"
+
+#, c-format
+msgid ""
+"CONFLICT (directory rename split): Unclear where to place %s because "
+"directory %s was renamed to multiple other directories, with no destination "
+"getting a majority of the files."
+msgstr ""
+"ÇAKIŞMA: (dizin yeniden adlandırma ayrılması): %s ögesinin nereye "
+"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ı."
+
+#, c-format
+msgid ""
+"CONFLICT (rename/rename): Rename directory %s->%s in %s. Rename directory %s-"
+">%s in %s"
+msgstr ""
+"Ç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)."
+
+msgid "modify"
+msgstr "değiştir"
+
+msgid "modified"
+msgstr "değiştirilmiş"
+
+#, c-format
+msgid "Skipped %s (merged same as existing)"
+msgstr "%s atlandı (mevcut ile aynı biçimde birleştirildi)"
+
+#, c-format
+msgid "Adding as %s instead"
+msgstr "Bunun yerine %s olarak ekleniyor"
+
+#, c-format
+msgid "Removing %s"
+msgstr "%s kaldırılıyor"
+
+msgid "file/directory"
+msgstr "dosya/dizin"
+
+msgid "directory/file"
+msgstr "dizin/dosya"
+
+#, 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."
+
+#, c-format
+msgid "Adding %s"
+msgstr "%s ekleniyor"
+
+#, c-format
+msgid "CONFLICT (add/add): Merge conflict in %s"
+msgstr "ÇAKIŞMA (ekle/ekle): %s içinde birleştirme çakışması"
+
+#, 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"
+
+msgid "Merging:"
+msgstr "Birleştiriliyor:"
+
+#, 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:"
+
+msgid "merge returned no commit"
+msgstr "birleştirme herhangi bir işleme döndürmedi"
+
+#, c-format
+msgid "Could not parse object '%s'"
+msgstr "'%s' nesnesi ayrıştırılamadı"
+
+msgid "failed to read the cache"
+msgstr "önbellek okunamadı"
+
+msgid "multi-pack-index OID fanout is of the wrong size"
+msgstr "multi-pack-index OID ikiye bölümünün boyutu hatalı"
+
+#, c-format
+msgid "multi-pack-index file %s is too small"
+msgstr "multi-pack-index dosyası %s pek küçük"
+
+#, 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"
+
+#, c-format
+msgid "multi-pack-index version %d not recognized"
+msgstr "multi-pack-index sürümü %d tanımlanamıyor"
+
+#, 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"
+
+msgid "multi-pack-index missing required pack-name chunk"
+msgstr "multi-pack-index'ten gerekli pack-name iri parçası eksik"
+
+msgid "multi-pack-index missing required OID fanout chunk"
+msgstr "multi-pack-index'ten gerekli OID fanout iri parçası eksik"
+
+msgid "multi-pack-index missing required OID lookup chunk"
+msgstr "multi-pack-index'ten gerekli OID arama iri parçası eksik"
+
+msgid "multi-pack-index missing required object offsets chunk"
+msgstr "multi-pack-index'ten gerekli nesne ofsetleri iri parçası eksik"
+
+#, 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'"
+
+#, c-format
+msgid "bad pack-int-id: %u (%u total packs)"
+msgstr "hatalı pack-int-id: %u (%u toplam paket)"
+
+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"
+
+#, c-format
+msgid "failed to add packfile '%s'"
+msgstr "paket dosyası '%s' eklenemedi"
+
+#, c-format
+msgid "failed to open pack-index '%s'"
+msgstr "pack-index '%s' açılamadı"
+
+#, c-format
+msgid "failed to locate object %d in packfile"
+msgstr "%d nesnesi paket dosyasında bulunamadı"
+
+msgid "cannot store reverse index file"
+msgstr "ters indeks dosyası depolanamıyor"
+
+#, c-format
+msgid "could not parse line: %s"
+msgstr "satır ayrıştırılamadı: %s"
+
+#, c-format
+msgid "malformed line: %s"
+msgstr "hatalı oluşturulmuş satır: %s"
+
+msgid "ignoring existing multi-pack-index; checksum mismatch"
+msgstr "mevcut multi-pack-index yok sayılıyor; sağlama toplamı uyumsuzluğu"
+
+msgid "could not load pack"
+msgstr "paket yüklenemedi"
+
+#, c-format
+msgid "could not open index for %s"
+msgstr "%s için indeks açılamadı"
+
+msgid "Adding packfiles to multi-pack-index"
+msgstr "Paket dosyaları multi-pack-index'e ekleniyor"
+
+#, c-format
+msgid "unknown preferred pack: '%s'"
+msgstr "bilinmeyen tercih edilen paket: '%s'"
+
+#, c-format
+msgid "cannot select preferred pack %s with no objects"
+msgstr "yeğlenen paket %s nesnesiz seçilemiyor"
+
+#, c-format
+msgid "did not see pack-file %s to drop"
+msgstr "bırakılacak pack-file %s görülmedi"
+
+#, c-format
+msgid "preferred pack '%s' is expired"
+msgstr "tercih edilen '%s' paketinin süresi geçmiş"
+
+msgid "no pack files to index."
+msgstr "indekslenecek paket dosyası yok."
+
+msgid "refusing to write multi-pack .bitmap without any objects"
+msgstr "bir nesne olmadan multi-pack .bitmap yazımı reddediliyor"
+
+msgid "could not write multi-pack bitmap"
+msgstr "çoklu paket biteşlem yazılamadı"
+
+msgid "could not write multi-pack-index"
+msgstr "multi-pack-index yazılamadı"
+
+#, c-format
+msgid "failed to clear multi-pack-index at %s"
+msgstr "multi-pack-index %s konumunda temizlenemedi"
+
+msgid "multi-pack-index file exists, but failed to parse"
+msgstr "multi-pack-index dosyası mevcut, ancak ayrıştırılamadı"
+
+msgid "incorrect checksum"
+msgstr "yanlış sağlama toplamı"
+
+msgid "Looking for referenced packfiles"
+msgstr "Başvurulmuş paket dosyaları aranıyor"
+
+#, 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]"
+
+msgid "the midx contains no oid"
+msgstr "midx bir oid içermiyor"
+
+msgid "Verifying OID order in multi-pack-index"
+msgstr "multi-pack-index içindeki OID sırası doğrulanıyor"
+
+#, 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]"
+
+msgid "Sorting objects by packfile"
+msgstr "Nesneler paket dosyasına göre sıralanıyor"
+
+msgid "Verifying object offsets"
+msgstr "Nesne ofsetleri doğrulanıyor"
+
+#, c-format
+msgid "failed to load pack entry for oid[%d] = %s"
+msgstr "şunun için paket girdisi yüklenemedi: oid[%d] = %s"
+
+#, c-format
+msgid "failed to load pack-index for packfile %s"
+msgstr "paket dosyası %s için pack-index yüklenemedi"
+
+#, c-format
+msgid "incorrect object offset for oid[%d] = %s: %<PRIx64> != %<PRIx64>"
+msgstr "şunun için yanlış nesne ofseti: oid[%d] = %s: %<PRIx64> != %<PRIx64>"
+
+msgid "Counting referenced objects"
+msgstr "Başvurulmuş nesneler sayılıyor"
+
+msgid "Finding and deleting unreferenced packfiles"
+msgstr "Başvurulmamış paket dosyaları bulunuyor ve siliniyor"
+
+msgid "could not start pack-objects"
+msgstr "pack-objects başlatılamadı"
+
+msgid "could not finish pack-objects"
+msgstr "pack-objects bitirilemedi"
+
+#, c-format
+msgid "unable to create lazy_dir thread: %s"
+msgstr "lazy_dir iş parçacığı oluşturulamıyor: %s"
+
+#, c-format
+msgid "unable to create lazy_name thread: %s"
+msgstr "lazy_name oluşturulamıyor: %s"
+
+#, c-format
+msgid "unable to join lazy_name thread: %s"
+msgstr "lazy_name iş parçacığı ucu birleştirilemiyor: %s"
+
+#, 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."
+msgstr ""
+"Bir önceki not birleştirmenizi sonuçlandırmadınız (%s var).\n"
+"Lütfen başka bir not birleştirmesine başlamadan önce 'git notes merge --"
+"commit' veya 'git notes merge --abort' kullanarak bir önceki birleştirmeyi "
+"işleyin/durdurun."
+
+#, c-format
+msgid "You have not concluded your notes merge (%s exists)."
+msgstr "Notlar birleştirmenizi sonuçlandırmadınız (%s var)."
+
+msgid "Cannot commit uninitialized/unreferenced notes tree"
+msgstr "İlklendirilmemiş/Başvurulmamış not ağacı işlenemiyor"
+
+#, c-format
+msgid "Bad notes.rewriteMode value: '%s'"
+msgstr "Hatalı notes.rewriteMode değeri: '%s'"
+
+#, c-format
+msgid "Refusing to rewrite notes in %s (outside of refs/notes/)"
+msgstr "%s içindeki notları yeniden yazma reddediliyor (refs/notes/ dışında)"
+
+#. TRANSLATORS: The first %s is the name of
+#. the environment variable, the second %s is
+#. its value.
+#.
+#, c-format
+msgid "Bad %s value: '%s'"
+msgstr "Hatalı %s değeri: '%s'"
+
+#, 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"
+
+#, c-format
+msgid "unable to normalize alternate object path: %s"
+msgstr "alternatif nesne yolu olağanlaştırılamıyor: %s"
+
+#, 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"
+
+#, c-format
+msgid "unable to normalize object directory: %s"
+msgstr "nesne dizini olağanlaştırılamıyor: %s"
+
+msgid "unable to fdopen alternates lockfile"
+msgstr "alternatifler kilit dosyası fdopen yapılamıyor"
+
+msgid "unable to read alternates file"
+msgstr "alternatifler dosyası okunamıyor"
+
+msgid "unable to move new alternates file into place"
+msgstr "yeni alternatifler dosyası yerine taşınamıyor"
+
+#, c-format
+msgid "path '%s' does not exist"
+msgstr "'%s' diye bir yol yok"
+
+#, 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."
+
+#, c-format
+msgid "reference repository '%s' is not a local repository."
+msgstr "Başvuru deposu '%s' yerel bir depo değil."
+
+#, c-format
+msgid "reference repository '%s' is shallow"
+msgstr "başvuru deposu '%s' sığ"
+
+#, c-format
+msgid "reference repository '%s' is grafted"
+msgstr "başvuru deposu '%s' aşılı"
+
+#, c-format
+msgid "could not find object directory matching %s"
+msgstr "'%s' ile eşleşen nesne dizini bulunamadı"
+
+#, c-format
+msgid "invalid line while parsing alternate refs: %s"
+msgstr "alternatif başvurular ayrıştırılırken geçersiz satır: %s"
+
+#, c-format
+msgid "attempting to mmap %<PRIuMAX> over limit %<PRIuMAX>"
+msgstr "%<PRIuMAX>, %<PRIuMAX> sınırı üzerinden mmap yapılmaya çalışılıyor"
+
+#, c-format
+msgid "mmap failed%s"
+msgstr "mmap başarısız%s"
+
+#, c-format
+msgid "object file %s is empty"
+msgstr "nesne dosyası %s boş"
+
+#, c-format
+msgid "corrupt loose object '%s'"
+msgstr "hasar görmüş gevşek nesne '%s'"
+
+#, c-format
+msgid "garbage at end of loose object '%s'"
+msgstr "gevşek nesne '%s' sonunda anlamsız veri"
+
+#, c-format
+msgid "unable to parse %s header"
+msgstr "%s üstbilgisi ayrıştırılamıyor"
+
+msgid "invalid object type"
+msgstr "geçersiz nesne türü"
+
+#, c-format
+msgid "unable to unpack %s header"
+msgstr "%s üstbilgisi açılamıyor"
+
+#, c-format
+msgid "header for %s too long, exceeds %d bytes"
+msgstr "%s üstbilgisi pek uzun, %d bayt'ı aşıyor"
+
+#, c-format
+msgid "failed to read object %s"
+msgstr "%s nesnesi okunamadı"
+
+#, c-format
+msgid "replacement %s not found for %s"
+msgstr "%s yedeği %s için bulunamadı"
+
+#, c-format
+msgid "loose object %s (stored in %s) is corrupt"
+msgstr "%s gevşek nesnesi (%s içinde depolanıyor) hasar görmüş"
+
+#, c-format
+msgid "packed object %s (stored in %s) is corrupt"
+msgstr "paketlenmiş nesne %s (%s içinde depolanıyor) hasar görmüş"
+
+#, c-format
+msgid "unable to write file %s"
+msgstr "%s dosyası yazılamıyor"
+
+#, c-format
+msgid "unable to set permission to '%s'"
+msgstr "'%s' ögesine izin ayarlanamıyor"
+
+msgid "file write error"
+msgstr "dosya yazım hatası"
+
+msgid "error when closing loose object file"
+msgstr "gevşek nesne dosyası kapatılırken hata"
+
+#, c-format
+msgid "insufficient permission for adding an object to repository database %s"
+msgstr "%s depo veritabanına nesne eklemek için yetersiz izin"
+
+msgid "unable to create temporary file"
+msgstr "geçici dosya oluşturulamıyor"
+
+msgid "unable to write loose object file"
+msgstr "gevşek nesne dosyası yazılamıyor"
+
+#, c-format
+msgid "unable to deflate new object %s (%d)"
+msgstr "yeni nesne %s söndürülemiyor (%d)"
+
+#, c-format
+msgid "deflateEnd on object %s failed (%d)"
+msgstr "%s nesnesi üzerinde deflateEnd başarısız oldu (%d)"
+
+#, c-format
+msgid "confused by unstable object source data for %s"
+msgstr "%s için olan nesne kaynak verisinden dolayı kafa karışıklığı"
+
+#, c-format
+msgid "cannot read object for %s"
+msgstr "%s için nesne okunamıyor"
+
+msgid "corrupt commit"
+msgstr "hasar görmüş işleme"
+
+msgid "corrupt tag"
+msgstr "hasar görmüş etiket"
+
+#, c-format
+msgid "read error while indexing %s"
+msgstr "%s indekslenirken okuma hatası"
+
+#, c-format
+msgid "short read while indexing %s"
+msgstr "%s indekslenirken kısa read"
+
+#, c-format
+msgid "%s: failed to insert into database"
+msgstr "%s: veritabanına ekleme başarısız"
+
+#, c-format
+msgid "%s: unsupported file type"
+msgstr "%s: desteklenmeyen dosya türü"
+
+#, c-format
+msgid "%s is not a valid '%s' object"
+msgstr "%s geçerli bir '%s' nesnesi değil"
+
+#, c-format
+msgid "unable to open %s"
+msgstr "%s açılamıyor"
+
+#, c-format
+msgid "hash mismatch for %s (expected %s)"
+msgstr "%s için sağlama uyuşmazlığı (%s bekleniyordu)"
+
+#, c-format
+msgid "unable to mmap %s"
+msgstr "%s mmap yapılamadı"
+
+#, c-format
+msgid "unable to unpack header of %s"
+msgstr "%s üstbilgisi açılamıyor"
+
+#, c-format
+msgid "unable to parse header of %s"
+msgstr "%s üstbilgisi ayrıştırılamıyor"
+
+#, c-format
+msgid "unable to unpack contents of %s"
+msgstr "%s içeriği açılamıyor"
+
+#. TRANSLATORS: This is a line of ambiguous object
+#. output shown when we cannot look up or parse the
+#. object in question. E.g. "deadbeef [bad object]".
+#.
+#, c-format
+msgid "%s [bad object]"
+msgstr "%s [hatalı nesne]"
+
+#. TRANSLATORS: This is a line of ambiguous commit
+#. object output. E.g.:
+#. *
+#.    "deadbeef commit 2021-01-01 - Some Commit Message"
+#.
+#, c-format
+msgid "%s commit %s - %s"
+msgstr "%s %s işlemesi - %s"
+
+#. TRANSLATORS: This is a line of ambiguous
+#. tag object output. E.g.:
+#. *
+#.    "deadbeef tag 2022-01-01 - Some Tag Message"
+#. *
+#. The second argument is the YYYY-MM-DD found
+#. in the tag.
+#. *
+#. The third argument is the "tag" string
+#. from object.c.
+#.
+#, c-format
+msgid "%s tag %s - %s"
+msgstr "%s %s etiketi - %s"
+
+#. TRANSLATORS: This is a line of ambiguous
+#. tag object output where we couldn't parse
+#. the tag itself. E.g.:
+#. *
+#.    "deadbeef [bad tag, could not parse it]"
+#.
+#, c-format
+msgid "%s [bad tag, could not parse it]"
+msgstr "%s [hatalı etiket, ayrıştırılamadı]"
+
+#. TRANSLATORS: This is a line of ambiguous <type>
+#. object output. E.g. "deadbeef tree".
+#.
+#, c-format
+msgid "%s tree"
+msgstr "%s ağacı"
+
+#. TRANSLATORS: This is a line of ambiguous <type>
+#. object output. E.g. "deadbeef blob".
+#.
+#, c-format
+msgid "%s blob"
+msgstr "%s ikili nesnesi"
+
+#, c-format
+msgid "short object ID %s is ambiguous"
+msgstr "kısa nesne kimliği %s belirsiz"
+
+#. TRANSLATORS: The argument is the list of ambiguous
+#. objects composed in show_ambiguous_object(). See
+#. its "TRANSLATORS" comments for details.
+#.
+#, c-format
+msgid ""
+"The candidates are:\n"
+"%s"
+msgstr ""
+"Adaylar:\n"
+"%s"
+
+msgid ""
+"Git normally never creates a ref that ends with 40 hex characters\n"
+"because it will be ignored when you just specify 40-hex. These refs\n"
+"may be created by mistake. For example,\n"
+"\n"
+"  git switch -c $br $(git rev-parse ...)\n"
+"\n"
+"where \"$br\" is somehow empty and a 40-hex ref is created. Please\n"
+"examine these refs and maybe delete them. Turn this message off by\n"
+"running \"git config advice.objectNameWarning false\""
+msgstr ""
+"Git normalde hiçbir zaman 40 onaltılı karakterlerle biten bir başvuru\n"
+"oluşturmaz; çünkü 40 onaltılı bir başvuru, onu belirlediğiniz zaman yok\n"
+"sayılacaktır. Bu başvurular yanlışlıkla oluşturulmuş olabilir. Örneğin:\n"
+"\n"
+"\tgit switch -c $br $(git rev-parse ...)\n"
+"\n"
+"komutunda \"$br\" bir şekilde boş kalmış ve 40 onaltılı bir başvuru\n"
+"oluşturulmuş. Lütfen bu başvuruları inceleyin ve gerekirse silin. Bu "
+"iletiyi\n"
+"kapatmak için \"git config advice.objectNameWarning\" yapın."
+
+#, c-format
+msgid "log for '%.*s' only goes back to %s"
+msgstr "'%.*s' günlüğü yalnızca şuna geri gider: %s"
+
+#, c-format
+msgid "log for '%.*s' only has %d entries"
+msgstr "'%.*s' günlüğünde yalnızca %d girdi var"
+
+#, c-format
+msgid "path '%s' exists on disk, but not in '%.*s'"
+msgstr "'%s' yolu disk üzerinde mevcut; ancak '%.*s' içinde değil"
+
+#, c-format
+msgid ""
+"path '%s' exists, but not '%s'\n"
+"hint: Did you mean '%.*s:%s' aka '%.*s:./%s'?"
+msgstr ""
+"'%s' yolu mevcut; ancak '%s' değil\n"
+"İpucu: Şunu mu demek istediniz: '%.*s:%s', nam-ı diğer '%.*s:./%s'?"
+
+#, c-format
+msgid "path '%s' does not exist in '%.*s'"
+msgstr "'%s' yolu '%.*s' içinde mevcut değil"
+
+#, c-format
+msgid ""
+"path '%s' is in the index, but not at stage %d\n"
+"hint: Did you mean ':%d:%s'?"
+msgstr ""
+"'%s' yolu indekste; ancak %d numaralı alanda değil\n"
+"İpucu: Şunu mu demek istediniz: ':%d:%s'?"
+
+#, c-format
+msgid ""
+"path '%s' is in the index, but not '%s'\n"
+"hint: Did you mean ':%d:%s' aka ':%d:./%s'?"
+msgstr ""
+"'%s' yolu indekste; ancak '%s' değil\n"
+"İpucu: Şunu mu demek istediniz: '%d:%s', nam-ı diğer ':%d:./%s'?"
+
+#, c-format
+msgid "path '%s' exists on disk, but not in the index"
+msgstr "'%s' yolu diskte mevcut; ancak indekste değil"
+
+#, c-format
+msgid "path '%s' does not exist (neither on disk nor in the index)"
+msgstr "'%s' diye bir yol yok (ne diskte ne de indekste)"
+
+msgid "relative path syntax can't be used outside working tree"
+msgstr "göreceli yol sözdizimi çalışma ağacı dışında kullanılamaz"
+
+#, c-format
+msgid "<object>:<path> required, only <object> '%s' given"
+msgstr "<nesne>:<yol> gerekiyor, yalnızca <nesne> '%s' verildi"
+
+#, c-format
+msgid "invalid object name '%.*s'."
+msgstr "geçersiz nesne adı: '%.*s'."
+
+#, c-format
+msgid "invalid object type \"%s\""
+msgstr "geçersiz nesne türü \"%s\""
+
+#, c-format
+msgid "object %s is a %s, not a %s"
+msgstr "%s nesnesi bir %s, %s değil"
+
+#, c-format
+msgid "object %s has unknown type id %d"
+msgstr "%s nesnesi %d bilinmeyen tür numarasına iye"
+
+#, c-format
+msgid "unable to parse object: %s"
+msgstr "nesne ayrıştırılamıyor: %s"
+
+#, c-format
+msgid "hash mismatch %s"
+msgstr "sağlama uyuşmazlığı %s"
+
+msgid "multi-pack bitmap is missing required reverse index"
+msgstr "çoklu paket biteşlemi gereken ters indeksi içermiyor"
+
+#, c-format
+msgid "could not open pack %s"
+msgstr "%s paketi açılamadı"
+
+#, c-format
+msgid "preferred pack (%s) is invalid"
+msgstr "tercih edilen (%s) paket geçersiz"
+
+#, c-format
+msgid "could not find %s in pack %s at offset %<PRIuMAX>"
+msgstr "%s, %s paketi %<PRIuMAX> ofsetinde bulunamadı"
+
+#, c-format
+msgid "mtimes file %s is too small"
+msgstr "mtimes dosyası %s pek küçük"
+
+#, c-format
+msgid "mtimes file %s has unknown signature"
+msgstr "%s mtimes dosyasında bilinmeyen imza var"
+
+#, c-format
+msgid "mtimes file %s has unsupported version %<PRIu32>"
+msgstr "%s mtimes dosyasında desteklenmeyen sürüm %<PRIu32> var"
+
+#, c-format
+msgid "mtimes file %s has unsupported hash id %<PRIu32>"
+msgstr "%s mtimes dosyasında desteklenmeyen sağlama kimliği %<PRIu32> var"
+
+#, c-format
+msgid "mtimes file %s is corrupt"
+msgstr "%s mtimes dosyası hasarlı"
+
+#, c-format
+msgid "reverse-index file %s is too small"
+msgstr "reverse-index dosyası %s pek küçük"
+
+#, c-format
+msgid "reverse-index file %s is corrupt"
+msgstr "reverse-index dosyası %s hasar görmüş"
+
+#, c-format
+msgid "reverse-index file %s has unknown signature"
+msgstr "%s reverse-index dosyasının bilinmeyen bir imzası var"
+
+#, c-format
+msgid "reverse-index file %s has unsupported version %<PRIu32>"
+msgstr "%s reverse-index dosyasının sürümü %<PRIu32> desteklenmiyor"
+
+#, c-format
+msgid "reverse-index file %s has unsupported hash id %<PRIu32>"
+msgstr "%s reverse-index dosyasının sağlama numarası %<PRIu32> desteklenmiyor"
+
+msgid "cannot both write and verify reverse index"
+msgstr "ters indeks dosyası hem yazılıp hem doğrulanamıyor"
+
+#, c-format
+msgid "could not stat: %s"
+msgstr "dosya bilgileri alınamadı: %s"
+
+#, c-format
+msgid "failed to make %s readable"
+msgstr "%s, yazılabilir yapılamadı"
+
+#, c-format
+msgid "could not write '%s' promisor file"
+msgstr "vaat dosyası '%s' yazılamadı"
+
+msgid "offset before end of packfile (broken .idx?)"
+msgstr "ofset paket dosyasının sonundan önce (bozuk .idx?)"
+
+#, c-format
+msgid "packfile %s cannot be mapped%s"
+msgstr "paket dosyası %s eşlemlenemiyor%s"
+
+#, 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?)"
+
+#, 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?)"
+
+#, c-format
+msgid "malformed expiration date '%s'"
+msgstr "hatalı oluşturulmuş son kullanım tarihi '%s'"
+
+#, c-format
+msgid "option `%s' expects \"always\", \"auto\", or \"never\""
+msgstr "'%s' seçeneği \"always\", \"auto\" veya \"never\" bekliyor"
+
+#, c-format
+msgid "malformed object name '%s'"
+msgstr "hatalı oluşturulmuş nesne adı '%s'"
+
+#, c-format
+msgid "option `%s' expects \"%s\" or \"%s\""
+msgstr "'%s' seçeneği \"%s\" veya \"%s\" bekliyor"
+
+#, c-format
+msgid "%s requires a value"
+msgstr "%s bir değer gerektiriyor"
+
+#, c-format
+msgid "%s is incompatible with %s"
+msgstr "%s, %s ile uyumsuz"
+
+#, c-format
+msgid "%s : incompatible with something else"
+msgstr "%s: başka bir şeyle uyumsuz"
+
+#, c-format
+msgid "%s takes no value"
+msgstr "%s bir değer almıyor"
+
+#, c-format
+msgid "%s isn't available"
+msgstr "%s kullanılabilir değil"
+
+#, 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"
+
+#, c-format
+msgid "ambiguous option: %s (could be --%s%s or --%s%s)"
+msgstr "belirsiz seçenek: %s (--%s%s veya --%s%s olabilir)"
+
+#, c-format
+msgid "did you mean `--%s` (with two dashes)?"
+msgstr "şunu mu demek istediniz: '--%s' (iki tire ile)?"
+
+#, c-format
+msgid "alias of --%s"
+msgstr "şunun arması: --%s"
+
+#, c-format
+msgid "unknown option `%s'"
+msgstr "bilinmeyen seçenek '%s'"
+
+#, c-format
+msgid "unknown switch `%c'"
+msgstr "bilinmeyen anahtar '%c'"
+
+#, c-format
+msgid "unknown non-ascii option in string: `%s'"
+msgstr "dizi içinde bilinmeyen ascii dışı seçenek: '%s'"
+
+msgid "..."
+msgstr "..."
+
+#, c-format
+msgid "usage: %s"
+msgstr "kullanım: %s"
+
+#. TRANSLATORS: the colon here should align with the
+#. one in "usage: %s" translation.
+#.
+#, c-format
+msgid "   or: %s"
+msgstr "    veya: %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.
+#.
+#, c-format
+msgid "%*s%s"
+msgstr "%*s%s"
+
+#, c-format
+msgid "    %s"
+msgstr "    %s"
+
+msgid "-NUM"
+msgstr "-SAYI"
+
+msgid "expiry-date"
+msgstr "son kullanım tarihi"
+
+msgid "no-op (backward compatibility)"
+msgstr "işlem yok (geriye dönük uyumluluk için)"
+
+msgid "be more verbose"
+msgstr "daha ayrıntılı anlat"
+
+msgid "be more quiet"
+msgstr "daha sessiz ol"
+
+msgid "use <n> digits to display object names"
+msgstr "nesne adlarını görüntülemek için <n> basamak kullan"
+
+msgid "how to strip spaces and #comments from message"
+msgstr "iletiden boşlukları ve #yorumları çıkart"
+
+msgid "read pathspec from file"
+msgstr "yol belirtecini dosyadan oku"
+
+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"
+
+#, c-format
+msgid "Could not make %s writable by group"
+msgstr "%s grup ile yazılabilir yapılamadı"
+
+msgid "Escape character '\\' not allowed as last character in attr value"
+msgstr "Kaçış karakteri '\\' attr değerindeki son karakter olarak kullanılamaz"
+
+msgid "Only one 'attr:' specification is allowed."
+msgstr "Yalnızca bir 'attr:' belirtimine izin verilir."
+
+msgid "attr spec must not be empty"
+msgstr "attr belirteci boş bırakılmamalı"
+
+#, c-format
+msgid "invalid attribute name %s"
+msgstr "geçersiz öznitelik adı %s"
+
+msgid "global 'glob' and 'noglob' pathspec settings are incompatible"
+msgstr "global 'glob' ve 'noglob' yol belirteci ayarları birbiriyle uyumsuz"
+
+msgid ""
+"global 'literal' pathspec setting is incompatible with all other global "
+"pathspec settings"
+msgstr ""
+"global 'literal' yol belirteci ayarı diğer tüm global yol belirteci "
+"ayarlarıyla uyumsuz"
+
+msgid "invalid parameter for pathspec magic 'prefix'"
+msgstr "yol belirteci sihri 'prefix' için geçersiz parametre"
+
+#, c-format
+msgid "Invalid pathspec magic '%.*s' in '%s'"
+msgstr "Geçersiz yol belirteci sihri '%.*s' (%s içinde)"
+
+#, c-format
+msgid "Missing ')' at the end of pathspec magic in '%s'"
+msgstr "'%s' içindeki yol belirteci sihrinin sonunda eksik ')'"
+
+#, c-format
+msgid "Unimplemented pathspec magic '%c' in '%s'"
+msgstr "Yerine getirilmemiş yol belirteci sihri '%c' ('%s' içinde)"
+
+#, c-format
+msgid "%s: 'literal' and 'glob' are incompatible"
+msgstr "%s: 'literal' ve 'glob' birbiriyle uyumsuz"
+
+#, c-format
+msgid "%s: '%s' is outside repository at '%s'"
+msgstr "%s: '%s', '%s' konumunda depo dışında"
+
+#, c-format
+msgid "'%s' (mnemonic: '%c')"
+msgstr "'%s' (belleten: '%c')"
+
+#, c-format
+msgid "%s: pathspec magic not supported by this command: %s"
+msgstr "%s: yol belirteci sihri bu komut tarafından desteklenmiyor: %s"
+
+#, c-format
+msgid "pathspec '%s' is beyond a symbolic link"
+msgstr "yol belirteci '%s' bir sembolik bağın ötesinde"
+
+#, c-format
+msgid "line is badly quoted: %s"
+msgstr "satırda hatalı tırnaklar: %s"
+
+msgid "unable to write flush packet"
+msgstr "floş paketi yazılamıyor"
+
+msgid "unable to write delim packet"
+msgstr "sınırlandıran paket yazılamıyor"
+
+msgid "unable to write response end packet"
+msgstr "yanıt sonu paketi yazılamıyor"
+
+msgid "flush packet write failed"
+msgstr "floş paketi yazımı başarısız"
+
+msgid "protocol error: impossibly long line"
+msgstr "protokol hatası: olanaksız uzun satır"
+
+msgid "packet write with format failed"
+msgstr "biçimlendirilmiş paket yazımı başarısız"
+
+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"
+
+#, c-format
+msgid "packet write failed: %s"
+msgstr "paket yazımı başarısız: %s"
+
+msgid "read error"
+msgstr "okuma hatası"
+
+msgid "the remote end hung up unexpectedly"
+msgstr "uzak konum beklenmedik bir biçimde hattı kapattı"
+
+#, c-format
+msgid "protocol error: bad line length character: %.4s"
+msgstr "protokol hatası: hatalı satır uzunluğu karakteri: %.4s"
+
+#, c-format
+msgid "protocol error: bad line length %d"
+msgstr "protokol hatası: hatalı satır uzunluğu %d"
+
+#, c-format
+msgid "remote error: %s"
+msgstr "uzak konum hatası: %s"
+
+msgid "Refreshing index"
+msgstr "İndeks yenileniyor"
+
+#, c-format
+msgid "unable to create threaded lstat: %s"
+msgstr "iş parçacıklarına ayrılmış 'lstat' oluşturulamıyor: %s"
+
+msgid "unable to parse --pretty format"
+msgstr "--pretty biçimi ayrıştırılamıyor"
+
+msgid "promisor-remote: unable to fork off fetch subprocess"
+msgstr "promisor-remote: getirme alt süreci çatallanamıyor"
+
+msgid "promisor-remote: could not write to fetch subprocess"
+msgstr "promisor-remote: getirme alt sürecine yazılamıyor"
+
+msgid "promisor-remote: could not close stdin to fetch subprocess"
+msgstr "promisor-remote: alt sürecine getirmek için stdin kapatılamıyor"
+
+#, c-format
+msgid "promisor remote name cannot begin with '/': %s"
+msgstr "vaatçi uzak konum adı '/' ile başlayamaz: %s"
+
+msgid "object-info: expected flush after arguments"
+msgstr "object-info: argümanlardan sonra floş bekleniyordu"
+
+msgid "Removing duplicate objects"
+msgstr "Yinelenmiş nesneler kaldırılıyor"
+
+msgid "could not start `log`"
+msgstr "'log' başlatılamadı"
+
+msgid "could not read `log` output"
+msgstr "'log' çıktısı okunamadı"
+
+#, c-format
+msgid "could not parse commit '%s'"
+msgstr "'%s' işlemesi ayrıştırılamadı"
+
+#, c-format
+msgid ""
+"could not parse first line of `log` output: did not start with 'commit ': "
+"'%s'"
+msgstr ""
+"'log' çıktısının ilk satırı ayrıştırılamadı: 'commit ' ile başlamıyor: '%s'"
+
+#, c-format
+msgid "could not parse git header '%.*s'"
+msgstr "git üstbilgisi '%.*s' ayrıştırılamadı"
+
+msgid "failed to generate diff"
+msgstr "diff oluşturulamadı"
+
+#, c-format
+msgid "could not parse log for '%s'"
+msgstr "'%s' günlüğü ayrıştırılamadı"
+
+#, c-format
+msgid "will not add file alias '%s' ('%s' already exists in index)"
+msgstr "dosya arması '%s' eklenmeyecek ('%s' indekste halihazırda var)"
+
+msgid "cannot create an empty blob in the object database"
+msgstr "nesne veritabanında boş ikili bir nesne oluşturulamıyor"
+
+#, c-format
+msgid "%s: can only add regular files, symbolic links or git-directories"
+msgstr ""
+"%s: yalnızca sıradan dosyalar, sembolik bağlar ve git dizinleri eklenebilir"
+
+#, c-format
+msgid "unable to index file '%s'"
+msgstr "'%s' dosyası indekslenemiyor"
+
+#, c-format
+msgid "unable to add '%s' to index"
+msgstr "'%s' indekse eklenemiyor"
+
+#, c-format
+msgid "unable to stat '%s'"
+msgstr "'%s' dosyasının bilgileri alınamıyor"
+
+#, 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"
+
+msgid "Refresh index"
+msgstr "İndeks yenileniyor"
+
+#, c-format
+msgid ""
+"index.version set, but the value is invalid.\n"
+"Using version %i"
+msgstr ""
+"index.version ayarlanmış; ancak değer geçersiz.\n"
+"%i sürümü kullanılıyor"
+
+#, c-format
+msgid ""
+"GIT_INDEX_VERSION set, but the value is invalid.\n"
+"Using version %i"
+msgstr ""
+"GIT_INDEX_VERSION ayarlanmış; ancak değer geçersiz.\n"
+"%i sürümü kullanılıyor"
+
+#, c-format
+msgid "bad signature 0x%08x"
+msgstr "hatalı imza 0x%08x"
+
+#, c-format
+msgid "bad index version %d"
+msgstr "hatalı indeks sürümü %d"
+
+msgid "bad index file sha1 signature"
+msgstr "hatalı indeks dosyası sha1 imzası"
+
+#, c-format
+msgid "index uses %.4s extension, which we do not understand"
+msgstr "indeks bizim anlamadığımız %.4s imzası kullanıyor"
+
+#, c-format
+msgid "ignoring %.4s extension"
+msgstr "%.4s uzantısı yok sayılıyor"
+
+#, c-format
+msgid "unknown index entry format 0x%08x"
+msgstr "bilinmeyen indeks girdisi biçimi 0x%08x"
+
+#, c-format
+msgid "malformed name field in the index, near path '%s'"
+msgstr "indekste hatalı oluşturulmuş ad alanı, '%s' yolu yakınında"
+
+msgid "unordered stage entries in index"
+msgstr "indekste sırasız hazırlama alanı girdileri"
+
+#, c-format
+msgid "multiple stage entries for merged file '%s'"
+msgstr "birleştirilmiş dosya '%s' için çoklu hazırlama alanı girdileri"
+
+#, c-format
+msgid "unordered stage entries for '%s'"
+msgstr "'%s' için sırasız hazırlama alanı girdileri"
+
+#, c-format
+msgid "unable to create load_cache_entries thread: %s"
+msgstr "load_cache_entries iş parçacığı oluşturulamıyor: %s"
+
+#, c-format
+msgid "unable to join load_cache_entries thread: %s"
+msgstr "load_cache_entries iş parçacığı ucu birleştirilemiyor: %s"
+
+#, c-format
+msgid "%s: index file open failed"
+msgstr "%s: indeks dosyası açılamadı"
+
+#, c-format
+msgid "%s: cannot stat the open index"
+msgstr "%s: açık indeksin bilgileri alınamıyor"
+
+#, c-format
+msgid "%s: index file smaller than expected"
+msgstr "%s: indeks dosyası beklenenden daha küçük"
+
+#, c-format
+msgid "%s: unable to map index file%s"
+msgstr "%s: indeks dosyası eşlemlenemiyor%s"
+
+#, c-format
+msgid "unable to create load_index_extensions thread: %s"
+msgstr "load_index_extensions iş parçacığı oluşturulamıyor: %s"
+
+#, c-format
+msgid "unable to join load_index_extensions thread: %s"
+msgstr "load_index_extensions iş parçacığı ucu birleştirilemiyor: %s"
+
+#, c-format
+msgid "could not freshen shared index '%s'"
+msgstr "paylaşılan indeks '%s' tazelenemedi"
+
+#, c-format
+msgid "broken index, expect %s in %s, got %s"
+msgstr "bozuk indeks, %s bekleniyordu (%s içinde), %s alındı"
+
+msgid "cannot write split index for a sparse index"
+msgstr "bir aralıklı indeks için bölünmüş indeks yazılamıyor"
+
+msgid "failed to convert to a sparse-index"
+msgstr "bir sparse-index'e dönüştürülemedi"
+
+#, c-format
+msgid "could not stat '%s'"
+msgstr "'%s' bilgileri alınamadı"
+
+#, c-format
+msgid "unable to open git dir: %s"
+msgstr "git dizini açılamıyor: %s"
+
+#, c-format
+msgid "unable to unlink: %s"
+msgstr "bağlantı kesilemiyor: %s"
+
+#, c-format
+msgid "cannot fix permission bits on '%s'"
+msgstr "'%s' üzerindeki izin bitleri onarılamıyor"
+
+#, c-format
+msgid "%s: cannot drop to stage #0"
+msgstr "%s: #0 numaralı hazırlama alanına bırakılamıyor"
+
+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 ""
+"Bunu 'git rebase --edit-todo' ile düzeltebilir ve ardından 'git rebase --"
+"continue' yapabilirsiniz.\n"
+"Yeniden temellendirmeyi durdurmak isterseniz 'git rebase --abort' yapın.\n"
+
+#, c-format
+msgid ""
+"unrecognized setting %s for option rebase.missingCommitsCheck. Ignoring."
+msgstr ""
+"rebase.missingCommitsCheck seçeneği için tanımlanamayan %s ayarı. Yok "
+"sayılıyor."
+
+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 [-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"
+"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ştirmek için dur\n"
+"s, squash <işleme> = işlemeyi kullan; ancak önceki işleme içine karıştır\n"
+"f, fixup [-C | -c] <işleme> = \"squash\" gibi; ancak yalnızca bir önceki\n"
+"                   işlemenin günlük iletisini tutar (-C kullanılmadıysa,\n"
+"                   o zaman yalnızca bu işlemenin iletisini tutar; -c, -C\n"
+"                   ile aynıdır; ancak ek olarak düzenleyiciyi açar)\n"
+"x, exec <komut> = komutu (satırın geri kalanı) kabuk kullanarak çalıştır\n"
+"b, break = burada dur (daha sonra sürdürmek için 'git rebase --continue')\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> [# <teksatı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"
+
+#, c-format
+msgid "Rebase %s onto %s (%d command)"
+msgid_plural "Rebase %s onto %s (%d commands)"
+msgstr[0] "%s ögesini %s üzerine yeniden temellendir (%d komut)"
+msgstr[1] "%s ögesini %s üzerine yeniden temellendir (%d komut)"
+
+msgid ""
+"\n"
+"Do not remove any line. Use 'drop' explicitly to remove a commit.\n"
+msgstr ""
+"\n"
+"Hiçbir satırı kaldırmayın. Bir işlemeyi kaldırmak için 'drop'u açıkça "
+"kullanın.\n"
+
+msgid ""
+"\n"
+"If you remove a line here THAT COMMIT WILL BE LOST.\n"
+msgstr ""
+"\n"
+"Buradaki bir satırı kaldırırsanız İŞLEME KAYBOLUR.\n"
+
+msgid ""
+"\n"
+"You are editing the todo file of an ongoing interactive rebase.\n"
+"To continue rebase after editing, run:\n"
+"    git rebase --continue\n"
+"\n"
+msgstr ""
+"\n"
+"Sürmekte olan bir etkileşimli yeniden temellendirmenin yapılacaklar "
+"dosyasını düzenlemektesiniz.\n"
+"Düzenlemenin ardından yeniden temellendirmeyi sürdürmek için şunu kullanın:\n"
+"\tgit rebase --continue\n"
+"\n"
+
+msgid ""
+"\n"
+"However, if you remove everything, the rebase will be aborted.\n"
+"\n"
+msgstr ""
+"\n"
+"Ancak tümünü kaldırırsanız yeniden temellendirme iptal edilecektir.\n"
+"\n"
+
+#, c-format
+msgid "could not write '%s'."
+msgstr "'%s' yazılamadı."
+
+#, c-format
+msgid ""
+"Warning: some commits may have been dropped accidentally.\n"
+"Dropped commits (newer to older):\n"
+msgstr ""
+"Uyarı: Bazı işlemeler yanlışlıkla bırakılmış olabilir.\n"
+"Bırakılan işlemeler: (yeniden eskiye):\n"
+
+#, c-format
+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"
+"The possible behaviours are: ignore, warn, error.\n"
+"\n"
+msgstr ""
+"Bu iletiden kaçınmak için, bir işlemeyi kaldırırken açıkça \"drop\" "
+"kullanın.\n"
+"Uyarıların düzeyini değiştirmek için 'git config rebase.missingCommitsCheck' "
+"kullanın.\n"
+"Kullanılabilir davranışlar: ignore, warn, error.\n"
+"\n"
+
+#, c-format
+msgid "%s: 'preserve' superseded by 'merges'"
+msgstr "%s: 'preserve'in yerini 'merges' aldı"
+
+msgid "gone"
+msgstr "gitti"
+
+#, c-format
+msgid "ahead %d"
+msgstr "%d önünde"
+
+#, c-format
+msgid "behind %d"
+msgstr "%d arkasında"
+
+#, c-format
+msgid "ahead %d, behind %d"
+msgstr "%d önünde, %d arkasında"
+
+#, c-format
+msgid "expected format: %%(color:<color>)"
+msgstr "beklenen biçim: %%(color:<renk>)"
+
+#, c-format
+msgid "unrecognized color: %%(color:%s)"
+msgstr "tanımlanamayan renk: %%(color:%s)"
+
+#, c-format
+msgid "Integer value expected refname:lstrip=%s"
+msgstr "Tamsayı değeri şunu bekliyordu: refname:lstrip=%s"
+
+#, c-format
+msgid "Integer value expected refname:rstrip=%s"
+msgstr "Tamsayı değeri şunu bekliyordu: refname:rstrip=%s"
+
+#, c-format
+msgid "unrecognized %%(%s) argument: %s"
+msgstr "tanımlanamayan %%(%s) argümanı: %s"
+
+#, c-format
+msgid "%%(objecttype) does not take arguments"
+msgstr "%%(objecttype) argüman almıyor"
+
+#, c-format
+msgid "%%(deltabase) does not take arguments"
+msgstr "%%(deltabase) argüman almıyor"
+
+#, c-format
+msgid "%%(body) does not take arguments"
+msgstr "%%(body) argüman almıyor"
+
+#, c-format
+msgid "expected %%(trailers:key=<value>)"
+msgstr "%%(trailers:key=<değer>) bekleniyordu"
+
+#, c-format
+msgid "unknown %%(trailers) argument: %s"
+msgstr "bilinmeyen %%(trailers) argümanı: %s"
+
+#, c-format
+msgid "positive value expected contents:lines=%s"
+msgstr "pozitif değer şunu bekliyordu: contents:lines=%s"
+
+#, c-format
+msgid "positive value expected '%s' in %%(%s)"
+msgstr "pozitif değer şurada '%s' bekliyordu: %%(%s)"
+
+#, c-format
+msgid "unrecognized email option: %s"
+msgstr "tanımlanamayan e-posta seçeneği: %s"
+
+#, c-format
+msgid "expected format: %%(align:<width>,<position>)"
+msgstr "beklenen biçim: %%(align:<genişlik>,<konum>)"
+
+#, c-format
+msgid "unrecognized position:%s"
+msgstr "tanımlanamayan konum:%s"
+
+#, c-format
+msgid "unrecognized width:%s"
+msgstr "tanımlanamayan genişlik:%s"
+
+#, c-format
+msgid "positive width expected with the %%(align) atom"
+msgstr "pozitif genişlik %%(align) ögeciği ile birlikte bekleniyordu"
+
+#, c-format
+msgid "%%(rest) does not take arguments"
+msgstr "%%(rest) argüman almıyor"
+
+#, c-format
+msgid "malformed field name: %.*s"
+msgstr "hatalı oluşturulmuş alan adı: %.*s"
+
+#, c-format
+msgid "unknown field name: %.*s"
+msgstr "bilinmeyen alan adı: %.*s"
+
+#, 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"
+
+#, c-format
+msgid "format: %%(%s) atom used without a %%(%s) atom"
+msgstr "biçim: %%(%s) ögeciği bir %%(%s) ögeciği olmadan kullanıldı"
+
+#, c-format
+msgid "format: %%(then) atom used more than once"
+msgstr "biçim: %%(then) ögeciği birden çok kez kullanıldı"
+
+#, c-format
+msgid "format: %%(then) atom used after %%(else)"
+msgstr "biçim: %%(then) ögeciği %%(else) ögeciğinden sonra kullanıldı"
+
+#, c-format
+msgid "format: %%(else) atom used more than once"
+msgstr "biçim: %%(else) ögeciği birden çok kez kullanıldı"
+
+#, c-format
+msgid "format: %%(end) atom used without corresponding atom"
+msgstr "biçim: %%(end) ögeciği eş ögeciği olmadan kullanıldı"
+
+#, c-format
+msgid "malformed format string %s"
+msgstr "hatalı oluşturulmuş biçim dizisi %s"
+
+#, c-format
+msgid "this command reject atom %%(%.*s)"
+msgstr "bu komut atom %%(%.*s) reddediyor"
+
+#, c-format
+msgid "--format=%.*s cannot be used with --python, --shell, --tcl"
+msgstr "--format=%.*s, --python, --shell ve --tcl ile kullanılamaz"
+
+#, c-format
+msgid "(no branch, rebasing %s)"
+msgstr "(dal yok, %s yeniden temellendiriliyor)"
+
+#, c-format
+msgid "(no branch, rebasing detached HEAD %s)"
+msgstr "(dal yok, ayrık HEAD %s yeniden temellendiriliyor)"
+
+#, c-format
+msgid "(no branch, bisect started on %s)"
+msgstr "(dal yok, ikili arama %s üzerinde başladı)"
+
+#, c-format
+msgid "(HEAD detached at %s)"
+msgstr "(HEAD, %s konumunda ayrıldı)"
+
+#, c-format
+msgid "(HEAD detached from %s)"
+msgstr "(HEAD, %s ögesinden ayrıldı)"
+
+msgid "(no branch)"
+msgstr "(dal yok)"
+
+#, c-format
+msgid "missing object %s for %s"
+msgstr "eksik nesne %s (%s için)"
+
+#, 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)"
+
+#, c-format
+msgid "malformed object at '%s'"
+msgstr "'%s' konumunda hatalı oluşturulmuş nesne"
+
+#, c-format
+msgid "ignoring ref with broken name %s"
+msgstr "bozuk ada iye %s başvurusu yok sayılıyor"
+
+#, c-format
+msgid "ignoring broken ref %s"
+msgstr "bozuk başvuru %s yok sayılıyor"
+
+#, c-format
+msgid "format: %%(end) atom missing"
+msgstr "biçim: %%(end) ögeciği eksik"
+
+#, c-format
+msgid "malformed object name %s"
+msgstr "hatalı oluşturulmuş nesne adı %s"
+
+#, c-format
+msgid "option `%s' must point to a commit"
+msgstr "'%s' bir işlemeye işaret etmeli"
+
+msgid "key"
+msgstr "anahtar"
+
+msgid "field name to sort on"
+msgstr "üzerine sıralanacak alan adı"
+
+#, c-format
+msgid "not a reflog: %s"
+msgstr "bir başvuru günlüğü değil: %s"
+
+#, c-format
+msgid "no reflog for '%s'"
+msgstr "'%s' için başvuru günlüğü yok"
+
+#, c-format
+msgid "%s does not point to a valid object!"
+msgstr "%s geçerli bir nesneye işaret etmiyor!"
+
+#, 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"
+"of your new repositories, which will suppress this warning, call:\n"
+"\n"
+"\tgit config --global init.defaultBranch <name>\n"
+"\n"
+"Names commonly chosen instead of 'master' are 'main', 'trunk' and\n"
+"'development'. The just-created branch can be renamed via this command:\n"
+"\n"
+"\tgit branch -m <name>\n"
+msgstr ""
+"Başlangıç dal adı olarak %s kullanılıyor. Bu öntanımlı dal adı\n"
+"değiştirilebilir. Bu iletiyi kapatmak ve yeni depolarınızda kullanılacak\n"
+"başlangıç dal adını yapılandırmak için şu komutu kullanın:\n"
+"\n"
+"\tgit config --global init.defaultBranch <ad>\n"
+"\n"
+"'master' yerine kullanılan diğer yaygın dal adları 'main', 'trunk'\n"
+"ve/veya 'development'tır. Yeni oluşturulan dal şu komutla yeniden\n"
+"adlandırılabilir:\n"
+"\n"
+"\tgit branch -m <ad>\n"
+
+#, c-format
+msgid "could not retrieve `%s`"
+msgstr "'%s' alınamadı"
+
+#, c-format
+msgid "invalid branch name: %s = %s"
+msgstr "geçersiz dal adı: %s = %s"
+
+#, c-format
+msgid "ignoring dangling symref %s"
+msgstr "sarkan sembolik başvuru %s yok sayılıyor"
+
+#, 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"
+
+#, 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ı"
+
+#, c-format
+msgid "log for %s is empty"
+msgstr "%s için olan günlük boş"
+
+#, c-format
+msgid "refusing to update ref with bad name '%s'"
+msgstr "hatalı ada iye '%s' başvurusunu güncelleme reddediliyor"
+
+#, c-format
+msgid "update_ref failed for ref '%s': %s"
+msgstr "'%s' başvurusu için update_ref başarısız oldu: %s"
+
+#, c-format
+msgid "multiple updates for ref '%s' not allowed"
+msgstr "'%s' başvurusu için birden çok güncellemeye izin verilmiyor"
+
+msgid "ref updates forbidden inside quarantine environment"
+msgstr "başvuru güncellemeleri karantina ortamı içinde yasak"
+
+msgid "ref updates aborted by hook"
+msgstr "başvuru güncellemeleri kanca tarafından iptal edildi"
+
+#, c-format
+msgid "'%s' exists; cannot create '%s'"
+msgstr "'%s' mevcut; '%s' oluşturulamıyor"
+
+#, c-format
+msgid "cannot process '%s' and '%s' at the same time"
+msgstr "'%s' ve '%s' aynı anda işlenemiyor"
+
+#, c-format
+msgid "could not remove reference %s"
+msgstr "%s başvurusu kaldırılamadı"
+
+#, c-format
+msgid "could not delete reference %s: %s"
+msgstr "%s başvurusu silinemedi: %s"
+
+#, c-format
+msgid "could not delete references: %s"
+msgstr "başvurular silinemedi: %s"
+
+#, c-format
+msgid "invalid refspec '%s'"
+msgstr "geçersiz başvuru belirteci '%s'"
+
+#, c-format
+msgid "invalid quoting in push-option value: '%s'"
+msgstr "push-option değerinde geçersiz tırnak içine alım: '%s'"
+
+#, c-format
+msgid "%sinfo/refs not valid: is this a git repository?"
+msgstr "%sinfo/refs geçerli değil: bu bir git deposu mu?"
+
+msgid "invalid server response; expected service, got flush packet"
+msgstr "geçersiz sunucu yanıtı; servis bekleniyordu, floş paketi alındı"
+
+#, c-format
+msgid "invalid server response; got '%s'"
+msgstr "geçersiz sunucu yanıtı; '%s' alındı"
+
+#, c-format
+msgid "repository '%s' not found"
+msgstr "'%s' deposu bulunamadı"
+
+#, c-format
+msgid "Authentication failed for '%s'"
+msgstr "'%s' için kimlik doğrulaması başarısız"
+
+#, c-format
+msgid "unable to access '%s' with http.pinnedPubkey configuration: %s"
+msgstr "'%s', http.pinnedPubkey yapılandırması ile erişilemiyor: %s"
+
+#, c-format
+msgid "unable to access '%s': %s"
+msgstr "'%s' erişilemiyor: %s"
+
+#, c-format
+msgid "redirecting to %s"
+msgstr "şuraya yeniden yönlendiriliyor: %s"
+
+msgid "shouldn't have EOF when not gentle on EOF"
+msgstr "dosya sonuna dikkat edilmiyorsa dosya sonu olmamalıdır"
+
+msgid "remote server sent unexpected response end packet"
+msgstr "uzak sunucu beklenmedik yanıt sonu paketi gönderdi"
+
+msgid "unable to rewind rpc post data - try increasing http.postBuffer"
+msgstr ""
+"rpc sonrası verisi geri sarılamıyor - http.postBuffer'ı artırmayı deneyin"
+
+#, c-format
+msgid "remote-curl: bad line length character: %.4s"
+msgstr "remote-curl: hatalı satır uzunluğu karakteri: %.4s"
+
+msgid "remote-curl: unexpected response end packet"
+msgstr "remote-curl: beklenmedik yanıt sonu paketi"
+
+#, c-format
+msgid "RPC failed; %s"
+msgstr "RPC başarısız oldu; %s"
+
+msgid "cannot handle pushes this big"
+msgstr "bu kadar büyük itmeler ele alınamıyor"
+
+#, c-format
+msgid "cannot deflate request; zlib deflate error %d"
+msgstr "istek söndürülemiyor; 'zlib deflate' hatası %d"
+
+#, c-format
+msgid "cannot deflate request; zlib end error %d"
+msgstr "istek söndürülemiyor; 'zlib end' hatası %d"
+
+#, c-format
+msgid "%d bytes of length header were received"
+msgstr "üstbilginin %d baytı alındı"
+
+#, c-format
+msgid "%d bytes of body are still expected"
+msgstr "gövdenin %d baytı hâlâ bekleniyor"
+
+msgid "dumb http transport does not support shallow capabilities"
+msgstr "programlanamayan http taşıyıcısı sığ işlevleri desteklemiyor"
+
+msgid "fetch failed."
+msgstr "getirme başarısız."
+
+msgid "cannot fetch by sha1 over smart http"
+msgstr "akıllı http üzerinden sha1 ile getirme yapılamıyor"
+
+#, c-format
+msgid "protocol error: expected sha/ref, got '%s'"
+msgstr "protokol hatası: sha/ref bekleniyordu, '%s' alındı"
+
+#, c-format
+msgid "http transport does not support %s"
+msgstr "http taşıyıcısı %s desteklemiyor"
+
+msgid "git-http-push failed"
+msgstr "git-http-push başarısız"
+
+msgid "remote-curl: usage: git remote-curl <remote> [<url>]"
+msgstr "remote-curl: kullanım: git remote-curl <uzak-konum> [<url>]"
+
+msgid "remote-curl: error reading command stream from git"
+msgstr "remote-curl: git'ten komut akışı okunurken hata"
+
+msgid "remote-curl: fetch attempted without a local repo"
+msgstr "remote-curl: yerel bir depo olmadan getirme yapılmaya çalışıldı"
+
+#, c-format
+msgid "remote-curl: unknown command '%s' from git"
+msgstr "remote-curl: git'ten bilinmeyen komut '%s'"
+
+#, c-format
+msgid "config remote shorthand cannot begin with '/': %s"
+msgstr "uzak konum yapılandırma stenografisi '/' ile başlayamaz: %s"
+
+msgid "more than one receivepack given, using the first"
+msgstr "birden fazla receivepack verildi, birincisi kullanılıyor"
+
+msgid "more than one uploadpack given, using the first"
+msgstr "birden fazla uploadpack verildi, birincisi kullanılıyor"
+
+msgid "unrecognized value transfer.credentialsInUrl: '%s'"
+msgstr "tanımlanamayan değer transfer.credentialsInUrl: '%s'"
+
+#, c-format
+msgid "URL '%s' uses plaintext credentials"
+msgstr "'%s' URL'si, düz metin kimlik bilgileri kullanıyor"
+
+#, c-format
+msgid "Cannot fetch both %s and %s to %s"
+msgstr "Hem %s hem %s şuraya getirilemiyor: %s"
+
+#, c-format
+msgid "%s usually tracks %s, not %s"
+msgstr "%s genelde %s ögesini izler, %s değil"
+
+#, c-format
+msgid "%s tracks both %s and %s"
+msgstr "%s hem %s hem %s ögelerini izler"
+
+#, c-format
+msgid "key '%s' of pattern had no '*'"
+msgstr "dizginin '%s' anahtarında '*' yoktu"
+
+#, c-format
+msgid "value '%s' of pattern has no '*'"
+msgstr "dizginin '%s' değerinde '*' yok"
+
+#, c-format
+msgid "src refspec %s does not match any"
+msgstr "kaynak başvuru belirteci %s başka hiçbir şeyle eşleşmiyor"
+
+#, c-format
+msgid "src refspec %s matches more than one"
+msgstr "kaynak başvuru belirteci %s birden fazlası ile eşleşiyor"
+
+#. TRANSLATORS: "matches '%s'%" is the <dst> part of "git push
+#. <remote> <src>:<dst>" push, and "being pushed ('%s')" is
+#. the <src>.
+#.
+#, c-format
+msgid ""
+"The destination you provided is not a full refname (i.e.,\n"
+"starting with \"refs/\"). We tried to guess what you meant by:\n"
+"\n"
+"- Looking for a ref that matches '%s' on the remote side.\n"
+"- Checking if the <src> being pushed ('%s')\n"
+"  is a ref in \"refs/{heads,tags}/\". If so we add a corresponding\n"
+"  refs/{heads,tags}/ prefix on the remote side.\n"
+"\n"
+"Neither worked, so we gave up. You must fully qualify the ref."
+msgstr ""
+"Sağladığınız kaynak tam bir başvuru belirteci değil (örneğin \"refs/\"\n"
+"ile başlamıyor. Bununla ne demek istediğinizi bulabilmek için:\n"
+"\n"
+"- Uzak konumda '%s' ile eşleşen bir başvuru aradık.\n"
+"- İtilen <kaynak>'ın ('%s') \"refs/{heads,tags}/\" içinde bir\n"
+"  başvuru olup olmadığına baktık. Eğer öyleyse uzak konum tarafında\n"
+"  eşleşen bir refs/{heads,tags}/ öneki ekledik.\n"
+"\n"
+"Hiçbiri işe yaramadı, biz de bıraktık. Başvuruyu tam olarak "
+"nitelendirmelisiniz."
+
+#, c-format
+msgid ""
+"The <src> part of the refspec is a commit object.\n"
+"Did you mean to create a new branch by pushing to\n"
+"'%s:refs/heads/%s'?"
+msgstr ""
+"Başvuru belirtecinin <kaynak> kısmı bir işleme nesnesi.\n"
+"'%s:refs/heads/%s' konumuna iterek yeni bir dal mı\n"
+"oluşturmak istediniz?"
+
+#, c-format
+msgid ""
+"The <src> part of the refspec is a tag object.\n"
+"Did you mean to create a new tag by pushing to\n"
+"'%s:refs/tags/%s'?"
+msgstr ""
+"Başvuru belirtecinin <kaynak> kısmı bir etiket nesnesi.\n"
+"'%s:refs/tags/%s' konumuna iterek yeni bir etiket mi\n"
+"oluşturmak istediniz?"
+
+#, c-format
+msgid ""
+"The <src> part of the refspec is a tree object.\n"
+"Did you mean to tag a new tree by pushing to\n"
+"'%s:refs/tags/%s'?"
+msgstr ""
+"Başvuru belirtecinin <kaynak> kısmı bir ağaç nesnesi.\n"
+"'%s:refs/tags/%s' konumuna iterek yeni bir ağaç mı\n"
+"etiketlemek istediniz?"
+
+#, c-format
+msgid ""
+"The <src> part of the refspec is a blob object.\n"
+"Did you mean to tag a new blob by pushing to\n"
+"'%s:refs/tags/%s'?"
+msgstr ""
+"Başvuru belirtecinin <kaynak> kısmı ikili bir nesne.\n"
+"'%s:refs/tags/%s' konumuna iterek yeni ikili bir nesne mi\n"
+"etiketlemek istediniz?"
+
+#, c-format
+msgid "%s cannot be resolved to branch"
+msgstr "%s dala çözülemiyor"
+
+#, c-format
+msgid "unable to delete '%s': remote ref does not exist"
+msgstr "'%s' silinemiyor: uzak başvuru yok"
+
+#, c-format
+msgid "dst refspec %s matches more than one"
+msgstr "birden çok hedef başvuru belirteci %s eşleşmesi"
+
+#, c-format
+msgid "dst ref %s receives from more than one src"
+msgstr "hedef başvurusu %s birden çok kaynaktan alıyor"
+
+msgid "HEAD does not point to a branch"
+msgstr "HEAD bir dala işaret etmiyor"
+
+#, c-format
+msgid "no such branch: '%s'"
+msgstr "böyle bir dal yok: '%s'"
+
+#, c-format
+msgid "no upstream configured for branch '%s'"
+msgstr "'%s' dalı için üstkaynak yapılandırılmamış"
+
+#, c-format
+msgid "upstream branch '%s' not stored as a remote-tracking branch"
+msgstr "üstkaynak dalı '%s' bir uzak izleme dalı olarak depolanmıyor"
+
+#, c-format
+msgid "push destination '%s' on remote '%s' has no local tracking branch"
+msgstr "'%s' itme hedefinin ('%s' uzak konumunda) yerel izleme dalı yok"
+
+#, c-format
+msgid "branch '%s' has no remote for pushing"
+msgstr "'%s' dalının itme için uzak konumu yok"
+
+#, c-format
+msgid "push refspecs for '%s' do not include '%s'"
+msgstr "'%s' için olan başvuru belirteçleri '%s' içermiyor"
+
+msgid "push has no destination (push.default is 'nothing')"
+msgstr "itilecek bir hedef yok (push.default: 'nothing')"
+
+msgid "cannot resolve 'simple' push to a single destination"
+msgstr "tek bir konuma 'simple' itme çözülemiyor"
+
+#, c-format
+msgid "couldn't find remote ref %s"
+msgstr "%s uzak başvurusu bulunamadı"
+
+#, c-format
+msgid "* Ignoring funny ref '%s' locally"
+msgstr "* Eğlenceli başvuru '%s' yerel olarak yok sayılıyor"
+
+#, c-format
+msgid "Your branch is based on '%s', but the upstream is gone.\n"
+msgstr "Dalınız '%s' temelli; ancak üstkaynak kaybolmuş.\n"
+
+msgid "  (use \"git branch --unset-upstream\" to fixup)\n"
+msgstr "  (düzeltmek için \"git branch --unset-upstream\" kullan)\n"
+
+#, c-format
+msgid "Your branch is up to date with '%s'.\n"
+msgstr "Dalınız '%s' ile güncel.\n"
+
+#, c-format
+msgid "Your branch and '%s' refer to different commits.\n"
+msgstr "Sizin dalınız ve '%s' başka işlemelere başvuruyor.\n"
+
+#, c-format
+msgid "  (use \"%s\" for details)\n"
+msgstr "  (ayrıntılar için \"%s\" kullanın)\n"
+
+#, c-format
+msgid "Your branch is ahead of '%s' by %d commit.\n"
+msgid_plural "Your branch is ahead of '%s' by %d commits.\n"
+msgstr[0] "Dalınız '%s' dalından %d işleme ileride.\n"
+msgstr[1] "Dalınız '%s' dalından %d işleme ileride.\n"
+
+msgid "  (use \"git push\" to publish your local commits)\n"
+msgstr "  (yerel işlemelerinizi yayımlamak için \"git push\" kullanın)\n"
+
+#, c-format
+msgid "Your branch is behind '%s' by %d commit, and can be fast-forwarded.\n"
+msgid_plural ""
+"Your branch is behind '%s' by %d commits, and can be fast-forwarded.\n"
+msgstr[0] "Dalınız '%s' dalından %d işleme geride ve ileri sarılabilir.\n"
+msgstr[1] "Dalınız '%s' dalından %d işleme geride ve ileri sarılabilir.\n"
+
+msgid "  (use \"git pull\" to update your local branch)\n"
+msgstr "  (yerel dalınızı güncellemek için \"git pull\" kullanın)\n"
+
+#, c-format
+msgid ""
+"Your branch and '%s' have diverged,\n"
+"and have %d and %d different commit each, respectively.\n"
+msgid_plural ""
+"Your branch and '%s' have diverged,\n"
+"and have %d and %d different commits each, respectively.\n"
+msgstr[0] ""
+"Sizin dalınız ve '%s' birbirinden uzaklaşmış ve sırasıyla\n"
+"her birinde %d ve %d işleme var.\n"
+msgstr[1] ""
+"Sizin dalınız ve '%s' birbirinden uzaklaşmış ve sırasıyla\n"
+"her birinde %d ve %d işleme var.\n"
+
+msgid "  (use \"git pull\" to merge the remote branch into yours)\n"
+msgstr "  (uzak dalı kendi dalınıza birleştirmek için \"git pull\" kullanın)\n"
+
+#, c-format
+msgid "cannot parse expected object name '%s'"
+msgstr "beklenen nesne adı '%s' ayrıştırılamıyor"
+
+#, c-format
+msgid "cannot strip one component off url '%s'"
+msgstr "'%s' url'sinden bir bileşen çıkarılamıyor"
+
+#, c-format
+msgid "bad replace ref name: %s"
+msgstr "hatalı değiştirme başvurusu adı: %s"
+
+#, c-format
+msgid "duplicate replace ref: %s"
+msgstr "yinelenmiş değiştirme başvurusu: %s"
+
+#, c-format
+msgid "replace depth too high for object %s"
+msgstr "%s nesnesi için değiştirme derinliği pek yüksek"
+
+msgid "corrupt MERGE_RR"
+msgstr "hasar görmüş MERGE_RR"
+
+msgid "unable to write rerere record"
+msgstr "rerere kaydı yazılamıyor"
+
+#, c-format
+msgid "there were errors while writing '%s' (%s)"
+msgstr "'%s' yazılırken hatalar vardı (%s)"
+
+#, c-format
+msgid "could not parse conflict hunks in '%s'"
+msgstr "'%s' içindeki çakışan parçalar ayrıştırılamadı"
+
+#, c-format
+msgid "failed utime() on '%s'"
+msgstr "'%s' üzerinde utime() başarısız"
+
+#, c-format
+msgid "writing '%s' failed"
+msgstr "'%s' yazılamadı"
+
+#, c-format
+msgid "Staged '%s' using previous resolution."
+msgstr "'%s' bir önceki çözüm kullanılarak hazırlama alanına alındı."
+
+#, c-format
+msgid "Recorded resolution for '%s'."
+msgstr "'%s' için çözüm kaydedildi."
+
+#, c-format
+msgid "Resolved '%s' using previous resolution."
+msgstr "'%s' bir önceki çözüm kullanılarak çözüldü."
+
+#, c-format
+msgid "cannot unlink stray '%s'"
+msgstr "'%s' başıboşunun bağlantısı kesilemiyor"
+
+#, c-format
+msgid "Recorded preimage for '%s'"
+msgstr "'%s' için öngörüntü kaydedildi"
+
+#, c-format
+msgid "failed to update conflicted state in '%s'"
+msgstr "'%s' içindeki çakışan durum güncellenemedi"
+
+#, c-format
+msgid "no remembered resolution for '%s'"
+msgstr "'%s' için hatırlanan çözüm yok"
+
+#, c-format
+msgid "cannot unlink '%s'"
+msgstr "'%s' bağlantısı kesilemiyor"
+
+#, c-format
+msgid "Updated preimage for '%s'"
+msgstr "'%s' için öngörüntü güncellendi"
+
+#, c-format
+msgid "Forgot resolution for '%s'\n"
+msgstr "'%s' için çözüm unutuldu\n"
+
+msgid "unable to open rr-cache directory"
+msgstr "rr-cache dizini açılamıyor"
+
+msgid "update the index with reused conflict resolution if possible"
+msgstr ""
+"eğer olanaklıysa indeksi yeniden kullanılmış çakışma çözümü ile güncelle"
+
+msgid "could not determine HEAD revision"
+msgstr "HEAD revizyonu saptanamadı"
+
+#, c-format
+msgid "failed to find tree of %s"
+msgstr "%s ögesinin ağacı bulunamadı"
+
+msgid "--unpacked=<packfile> no longer supported"
+msgstr "--unpacked=<paketdosyası> artık desteklenmiyor"
+
+msgid "your current branch appears to be broken"
+msgstr "geçerli dalınız bozuk gibi görünüyor"
+
+#, 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"
+
+msgid "object filtering requires --objects"
+msgstr "nesne süzme --objects gerektiriyor"
+
+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"
+
+#, c-format
+msgid "cannot create async thread: %s"
+msgstr "async iş parçacığı oluşturulamadı: %s"
+
+msgid "unexpected flush packet while reading remote unpack status"
+msgstr "uzak konum açım durumu okunurken beklenmedik floş paketi"
+
+#, c-format
+msgid "unable to parse remote unpack status: %s"
+msgstr "uzak konum açım durumu ayrıştırılamadı: %s"
+
+#, c-format
+msgid "remote unpack failed: %s"
+msgstr "uzak konum açımı başarısız: %s"
+
+msgid "failed to sign the push certificate"
+msgstr "itme sertifikası imzalanamadı"
+
+msgid "send-pack: unable to fork off fetch subprocess"
+msgstr "send-pack: getirme alt süreci çatallanamıyor"
+
+msgid "push negotiation failed; proceeding anyway with push"
+msgstr "itme pazarlığı başarısız; yine de itme olmadan sürdürülüyor"
+
+msgid "the receiving end does not support this repository's hash algorithm"
+msgstr "alıcı uç bu deponun sağlama algoritmasını desteklemiyor"
+
+msgid "the receiving end does not support --signed push"
+msgstr "alıcı uç --signed itmeyi desteklemiyor"
+
+msgid ""
+"not sending a push certificate since the receiving end does not support --"
+"signed push"
+msgstr ""
+"alıcı uç --signed itmeyi desteklemediğinden dolayı bir itme sertifikası "
+"gönderilmiyor"
+
+msgid "the receiving end does not support --atomic push"
+msgstr "alıcı uç --atomic itmeyi desteklemiyor"
+
+msgid "the receiving end does not support push options"
+msgstr "alıcı uç itme seçeneklerini desteklemiyor"
+
+#, c-format
+msgid "invalid commit message cleanup mode '%s'"
+msgstr "geçersiz işleme iletisi temizleme kipi '%s'"
+
+#, c-format
+msgid "could not delete '%s'"
+msgstr "'%s' silinemedi"
+
+msgid "revert"
+msgstr "geri al"
+
+msgid "cherry-pick"
+msgstr "seç-al"
+
+msgid "rebase"
+msgstr "yeniden temellendirme"
+
+#, c-format
+msgid "unknown action: %d"
+msgstr "bilinmeyen eylem: %d"
+
+msgid ""
+"after resolving the conflicts, mark the corrected paths\n"
+"with 'git add <paths>' or 'git rm <paths>'"
+msgstr ""
+"çakışmaları çözdükten sonra doğrusu verilen yolları 'git add <yollar>'\n"
+"veya 'git rm <yollar>' ile imleyin"
+
+msgid ""
+"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 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."
+
+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."
+
+#, c-format
+msgid "could not lock '%s'"
+msgstr "'%s' kilitlenemedi"
+
+#, c-format
+msgid "could not write to '%s'"
+msgstr "şuraya yazılamadı: '%s'"
+
+#, c-format
+msgid "could not write eol to '%s'"
+msgstr "satır sonu şuraya yazılamadı: '%s'"
+
+#, c-format
+msgid "failed to finalize '%s'"
+msgstr "'%s' tamamlanamadı"
+
+#, c-format
+msgid "your local changes would be overwritten by %s."
+msgstr "%s ile yerel değişikliklerinizin üzerine yazılacaktır."
+
+msgid "commit your changes or stash them to proceed."
+msgstr "İlerlemek için değişikliklerinizi işleyin veya zulalayın."
+
+#, c-format
+msgid "%s: fast-forward"
+msgstr "%s: ileri sar"
+
+#. TRANSLATORS: %s will be "revert", "cherry-pick" or
+#. "rebase".
+#.
+#, c-format
+msgid "%s: Unable to write new index file"
+msgstr "%s: Yeni indeks dosyası yazılamıyor"
+
+msgid "unable to update cache tree"
+msgstr "önbellek ağacı güncellenemiyor"
+
+msgid "could not resolve HEAD commit"
+msgstr "HEAD işlemesi çözülemedi"
+
+#, c-format
+msgid "no key present in '%.*s'"
+msgstr "'%.*s' içinde bir anahtar yok"
+
+#, c-format
+msgid "unable to dequote value of '%s'"
+msgstr "'%s' ögesinin tırnakları kaldırılamıyor"
+
+msgid "'GIT_AUTHOR_NAME' already given"
+msgstr "'GIT_AUTHOR_NAME' halihazırda verilmiş"
+
+msgid "'GIT_AUTHOR_EMAIL' already given"
+msgstr "'GIT_AUTHOR_EMAIL' halihazırda verilmiş"
+
+msgid "'GIT_AUTHOR_DATE' already given"
+msgstr "'GIT_AUTHOR_DATE' halihazırda verilmiş"
+
+#, c-format
+msgid "unknown variable '%s'"
+msgstr "bilinmeyen değişken '%s'"
+
+msgid "missing 'GIT_AUTHOR_NAME'"
+msgstr "'GIT_AUTHOR_NAME' eksik"
+
+msgid "missing 'GIT_AUTHOR_EMAIL'"
+msgstr "'GIT_AUTHOR_EMAIL' eksik"
+
+msgid "missing 'GIT_AUTHOR_DATE'"
+msgstr "'GIT_AUTHOR_DATE' eksik"
+
+#, c-format
+msgid ""
+"you have staged changes in your working tree\n"
+"If these changes are meant to be squashed into the previous commit, run:\n"
+"\n"
+"  git commit --amend %s\n"
+"\n"
+"If they are meant to go into a new commit, run:\n"
+"\n"
+"  git commit %s\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şikliklerin bir önceki işlemeye eklenmesi\n"
+"gerekiyorsa şu komutu çalıştırın:\n"
+"\n"
+"\tgit commit --amend %s\n"
+"\n"
+"Yeni bir işleme yapmak istiyorsanız şu komutu çalıştırın:\n"
+"\n"
+"\tgit commit %s\n"
+"\n"
+"Her iki durumda da işiniz bittikten sonra şu komut ile sürdürün:\n"
+"\n"
+"\tgit rebase --continue\n"
+
+msgid "'prepare-commit-msg' hook failed"
+msgstr "'prepare-commit-msg' başarısız oldu"
+
+msgid ""
+"Your name and email address were configured automatically based\n"
+"on your username and hostname. Please check that they are accurate.\n"
+"You can suppress this message by setting them explicitly. Run the\n"
+"following command and follow the instructions in your editor to edit\n"
+"your configuration file:\n"
+"\n"
+"    git config --global --edit\n"
+"\n"
+"After doing this, you may fix the identity used for this commit with:\n"
+"\n"
+"    git commit --amend --reset-author\n"
+msgstr ""
+"Adınız ve e-posta adresiniz kullanıcı adınız ve makine adı temel alınarak\n"
+"kendiliğinden yapılandırıldı. Lütfen doğru olup olmadığını denetleyin.\n"
+"Bu iletiyi onları el ile belirterek gizleyebilirsiniz. Aşağıdaki komutu\n"
+"çalıştırın ve yapılandırma dosyanızı düzenlemek için düzenleyicinizdeki\n"
+"yönergeleri izleyin:\n"
+"\n"
+"\tgit config --global --edit\n"
+"\n"
+"Bundan sonra bu işleme için kullanılan kimliği düzeltmek isteyebilirsiniz:\n"
+"\n"
+"\tgit commit --amend --reset-author\n"
+
+msgid ""
+"Your name and email address were configured automatically based\n"
+"on your username and hostname. Please check that they are accurate.\n"
+"You can suppress this message by setting them explicitly:\n"
+"\n"
+"    git config --global user.name \"Your Name\"\n"
+"    git config --global user.email you@example.com\n"
+"\n"
+"After doing this, you may fix the identity used for this commit with:\n"
+"\n"
+"    git commit --amend --reset-author\n"
+msgstr ""
+"Adınız ve e-posta adresiniz kullanıcı adınız ve makine adı temel alınarak\n"
+"kendiliğinden yapılandırıldı. Lütfen doğru olup olmadığını denetleyin.\n"
+"Bu iletiyi onları el ile belirterek gizleyebilirsiniz:\n"
+"\n"
+"\tgit config --global user.name \"Adınız\"\n"
+"\tgit config --global user.email \"siz@e-posta.com\"\n"
+"\n"
+"Bundan sonra bu işleme için kullanılan kimliği düzeltmek isteyebilirsiniz:\n"
+"\n"
+"\tgit commit --amend --reset-author\n"
+
+msgid "couldn't look up newly created commit"
+msgstr "yeni yapılan işleme aranamadı"
+
+msgid "could not parse newly created commit"
+msgstr "yeni yapılan işleme ayrıştırılamadı"
+
+msgid "unable to resolve HEAD after creating commit"
+msgstr "HEAD, işleme yapıldıktan sonra çözülemiyor"
+
+msgid "detached HEAD"
+msgstr "ayrık HEAD"
+
+msgid " (root-commit)"
+msgstr " (kök işleme)"
+
+msgid "could not parse HEAD"
+msgstr "HEAD ayrıştırılamadı"
+
+#, c-format
+msgid "HEAD %s is not a commit!"
+msgstr "HEAD %s bir işleme değil"
+
+msgid "unable to parse commit author"
+msgstr "işleme yazarı ayrıştırılamıyor"
+
+#, c-format
+msgid "unable to read commit message from '%s'"
+msgstr "'%s' konumundan işleme iletisi okunamıyor"
+
+#, c-format
+msgid "invalid author identity '%s'"
+msgstr "geçersiz yazar kimliği '%s'"
+
+msgid "corrupt author: missing date information"
+msgstr "hasar görmüş yazar: tarih bilgisi eksik"
+
+#, c-format
+msgid "could not update %s"
+msgstr "%s güncellenemedi"
+
+#, c-format
+msgid "could not parse commit %s"
+msgstr "%s işlemesi ayrıştırılamadı"
+
+#, c-format
+msgid "could not parse parent commit %s"
+msgstr "üst işleme %s ayrıştırılamadı"
+
+#, c-format
+msgid "unknown command: %d"
+msgstr "bilinmeyen komut: %d"
+
+msgid "This is the 1st commit message:"
+msgstr "Birinci işleme iletisi bu:"
+
+#, c-format
+msgid "This is the commit message #%d:"
+msgstr "İşleme iletisi #%d bu:"
+
+msgid "The 1st commit message will be skipped:"
+msgstr "Birinci işlemenin iletisi atlanacak:"
+
+#, c-format
+msgid "The commit message #%d will be skipped:"
+msgstr "İşleme iletisi #%d atlanacak:"
+
+#, c-format
+msgid "This is a combination of %d commits."
+msgstr "Bu %d işlemenin bir birleşimi."
+
+#, c-format
+msgid "cannot write '%s'"
+msgstr "'%s' yazılamıyor"
+
+msgid "need a HEAD to fixup"
+msgstr "düzeltmek için bir HEAD gerekiyor"
+
+msgid "could not read HEAD"
+msgstr "HEAD okunamadı"
+
+msgid "could not read HEAD's commit message"
+msgstr "HEAD'in işleme iletisi okunamadı"
+
+#, c-format
+msgid "could not read commit message of %s"
+msgstr "%s işleme iletisi okunamadı"
+
+msgid "your index file is unmerged."
+msgstr "indeks dosyanız birleştirilmemiş."
+
+msgid "cannot fixup root commit"
+msgstr "kök işleme düzeltilemiyor"
+
+#, 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."
+
+#, c-format
+msgid "commit %s does not have parent %d"
+msgstr "%s işlemesinin %d diye bir üst ögesi yok"
+
+#, 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.
+#, c-format
+msgid "%s: cannot parse parent commit %s"
+msgstr "%s: üst işleme %s ayrıştırılamıyor"
+
+#, c-format
+msgid "could not rename '%s' to '%s'"
+msgstr "'%s', '%s' olarak yeniden adlandırılamadı"
+
+#, c-format
+msgid "could not revert %s... %s"
+msgstr "%s geri alınamadı... %s"
+
+#, c-format
+msgid "could not apply %s... %s"
+msgstr "%s uygulanamadı... %s"
+
+#, 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"
+
+#, c-format
+msgid "git %s: failed to read the index"
+msgstr "git %s: indeks okunamadı"
+
+#, c-format
+msgid "git %s: failed to refresh the index"
+msgstr "git %s: indeks yenilenemedi"
+
+#, c-format
+msgid "%s does not accept arguments: '%s'"
+msgstr "%s argüman kabul etmiyor: '%s'"
+
+#, c-format
+msgid "missing arguments for %s"
+msgstr "%s için eksik argüman"
+
+#, c-format
+msgid "could not parse '%s'"
+msgstr "'%s' ayrıştırılamadı"
+
+#, c-format
+msgid "invalid line %d: %.*s"
+msgstr "geçersiz satır %d: %.*s"
+
+#, c-format
+msgid "cannot '%s' without a previous commit"
+msgstr "öncesinde bir işleme olmadan '%s' yapılamıyor"
+
+msgid "cancelling a cherry picking in progress"
+msgstr "sürmekte olan bir seç-al iptal ediliyor"
+
+msgid "cancelling a revert in progress"
+msgstr "sürmekte olan bir geri al iptal ediliyor"
+
+msgid "please fix this using 'git rebase --edit-todo'."
+msgstr "lütfen bunu 'git rebase --edit-todo' kullanarak onarın."
+
+#, c-format
+msgid "unusable instruction sheet: '%s'"
+msgstr "kullanılabilir olmayan yönerge tablosu: '%s'"
+
+msgid "no commits parsed."
+msgstr "Hiçbir işleme ayrıştırılmadı."
+
+msgid "cannot cherry-pick during a revert."
+msgstr "bir geri al sırasında seç-al yapılamıyor."
+
+msgid "cannot revert during a cherry-pick."
+msgstr "bir seç-al sırasında geri al yapılamıyor."
+
+msgid "unusable squash-onto"
+msgstr "kullanılabilir olmayan squash-onto"
+
+#, c-format
+msgid "malformed options sheet: '%s'"
+msgstr "hatalı oluşturulmuş seçenekler tablosu: '%s'"
+
+msgid "empty commit set passed"
+msgstr "boş işleme seti aktarıldı"
+
+msgid "revert is already in progress"
+msgstr "geri al halihazırda sürüyor"
+
+#, c-format
+msgid "try \"git revert (--continue | %s--abort | --quit)\""
+msgstr "\"git revert (--continue | %s--abort | --quit)\" deneyin"
+
+msgid "cherry-pick is already in progress"
+msgstr "seç-al halihazırda sürüyor"
+
+#, c-format
+msgid "try \"git cherry-pick (--continue | %s--abort | --quit)\""
+msgstr "\"git cherry-pick (--continue | %s--abort | --quit)\" deneyin"
+
+#, c-format
+msgid "could not create sequencer directory '%s'"
+msgstr "ardıştırıcı dizini '%s' oluşturulamadı"
+
+msgid "could not lock HEAD"
+msgstr "HEAD kilitlenemedi"
+
+msgid "no cherry-pick or revert in progress"
+msgstr "süren bir seç-al veya geri al yok"
+
+msgid "cannot resolve HEAD"
+msgstr "HEAD çözülemiyor"
+
+msgid "cannot abort from a branch yet to be born"
+msgstr "daha doğmamış bir daldan iptal edilemiyor"
+
+#, c-format
+msgid "cannot read '%s': %s"
+msgstr "'%s' okunamıyor: %s"
+
+msgid "unexpected end of file"
+msgstr "beklenmedik dosya sonu"
+
+#, c-format
+msgid "stored pre-cherry-pick HEAD file '%s' is corrupt"
+msgstr "depolanmış seç-al öncesi HEAD dosyası '%s' hasar görmüş"
+
+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!"
+
+msgid "no revert in progress"
+msgstr "süren bir geri al yok"
+
+msgid "no cherry-pick in progress"
+msgstr "süren bir seç-al yok"
+
+msgid "failed to skip the commit"
+msgstr "işleme atlanamadı"
+
+msgid "there is nothing to skip"
+msgstr "atlanacak bir şey yok"
+
+#, c-format
+msgid ""
+"have you committed already?\n"
+"try \"git %s --continue\""
+msgstr ""
+"İşlemeyi yaptınız mı?\n"
+"\"git %s --continue\" deneyin.\""
+
+msgid "cannot read HEAD"
+msgstr "HEAD okunamıyor"
+
+#, c-format
+msgid "unable to copy '%s' to '%s'"
+msgstr "'%s', '%s' konumuna kopyalanamıyor"
+
+#, c-format
+msgid ""
+"You can amend the commit now, with\n"
+"\n"
+"  git commit --amend %s\n"
+"\n"
+"Once you are satisfied with your changes, run\n"
+"\n"
+"  git rebase --continue\n"
+msgstr ""
+"İşlemeyi şimdi şu komutla değiştirebilirsiniz:\n"
+"\n"
+"\tgit commit --amend %s\n"
+"\n"
+"Değişikliklerinizden memnunsanız şu komutla sürdürün:\n"
+"\n"
+"\tgit rebase --continue\n"
+
+#, c-format
+msgid "Could not apply %s... %.*s"
+msgstr "%s uygulanamıyor... %.*s"
+
+#, c-format
+msgid "Could not merge %.*s"
+msgstr "%.*s birleştirilemedi"
+
+#, c-format
+msgid "Executing: %s\n"
+msgstr "Çalıştırılıyor: %s\n"
+
+#, c-format
+msgid ""
+"execution failed: %s\n"
+"%sYou can fix the problem, and then run\n"
+"\n"
+"  git rebase --continue\n"
+"\n"
+msgstr ""
+"Çalıştırma başarısız: %s\n"
+"%sSorunu çözüp sürdürmek için şunu çalıştırın:\n"
+"\n"
+"\tgit rebase --continue\n"
+"\n"
+
+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"
+
+#, c-format
+msgid ""
+"execution succeeded: %s\n"
+"but left changes to the index and/or the working tree\n"
+"Commit or stash your changes, and then run\n"
+"\n"
+"  git rebase --continue\n"
+"\n"
+msgstr ""
+"Çalıştırma başarılı oldu: %s,\n"
+"ancak indeksinize ve/veya çalışma ağacınıza 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\n"
+"\n"
+
+#, c-format
+msgid "illegal label name: '%.*s'"
+msgstr "izin verilmeyen etiket adı: '%.*s'"
+
+msgid "writing fake root commit"
+msgstr "sahte kök işlemesi yazılıyor"
+
+msgid "writing squash-onto"
+msgstr "squash-onto yazılıyor"
+
+#, c-format
+msgid "could not resolve '%s'"
+msgstr "'%s' çözülemedi"
+
+msgid "cannot merge without a current revision"
+msgstr "güncel bir revizyon olmadan birleştirilemiyor"
+
+#, c-format
+msgid "unable to parse '%.*s'"
+msgstr "'%.*s' ayrıştırılamıyor"
+
+#, c-format
+msgid "nothing to merge: '%.*s'"
+msgstr "birleştirilecek bir şey yok: '%.*s'"
+
+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"
+
+#, c-format
+msgid "could not get commit message of '%s'"
+msgstr "'%s' işlemesinin işleme iletisi alınamadı"
+
+#, c-format
+msgid "could not even attempt to merge '%.*s'"
+msgstr "şunu birleştirme girişiminde bulunulamadı bile: '%.*s'"
+
+msgid "merge: Unable to write new index file"
+msgstr "merge: Yeni indeks dosyası yazılamıyor"
+
+msgid "Cannot autostash"
+msgstr "Kendiliğinden zulalanamıyor"
+
+#, c-format
+msgid "Unexpected stash response: '%s'"
+msgstr "Beklenmedik zula yanıtı: '%s'"
+
+#, c-format
+msgid "Could not create directory for '%s'"
+msgstr "'%s' için dizin oluşturulamadı"
+
+#, c-format
+msgid "Created autostash: %s\n"
+msgstr "Zula kendiliğinden oluşturuldu: %s\n"
+
+msgid "could not reset --hard"
+msgstr "'reset --hard' yapılamadı"
+
+#, c-format
+msgid "Applied autostash.\n"
+msgstr "Kendiliğinden zulalama uygulandı.\n"
+
+#, c-format
+msgid "cannot store %s"
+msgstr "%s depolanamıyor"
+
+#, c-format
+msgid ""
+"%s\n"
+"Your changes are safe in the stash.\n"
+"You can run \"git stash pop\" or \"git stash drop\" at any time.\n"
+msgstr ""
+"%s\n"
+"Değişiklikleriniz zulada güvende.\n"
+"İstediğiniz zaman \"git stash pop\" veya \"git stash drop\" yapabilirsiniz.\n"
+
+msgid "Applying autostash resulted in conflicts."
+msgstr "Kendiliğinden zulalama çakışmalara neden oldu."
+
+msgid "Autostash exists; creating a new stash entry."
+msgstr "Kendiliğinden zulalama mevcut; yeni bir zula girdisi oluşturuluyor."
+
+msgid "could not detach HEAD"
+msgstr "HEAD ayrılamadı"
+
+#, c-format
+msgid "Stopped at HEAD\n"
+msgstr "HEAD'de duruldu\n"
+
+#, c-format
+msgid "Stopped at %s\n"
+msgstr "%s konumunda duruldu\n"
+
+#, c-format
+msgid ""
+"Could not execute the todo command\n"
+"\n"
+"    %.*s\n"
+"It has been rescheduled; To edit the command before continuing, please\n"
+"edit the todo list first:\n"
+"\n"
+"    git rebase --edit-todo\n"
+"    git rebase --continue\n"
+msgstr ""
+"todo komutu çalıştırılamadı.\n"
+"\n"
+"\t%.*s\n"
+"Yeniden zamanlandı; sürdürmeden önce komutu düzenlemek için lütfen\n"
+"önce yapılacaklar listesini düzenleyin:\n"
+"\n"
+"\tgit rebase --edit-todo\n"
+"\tgit rebase --continue\n"
+
+#, c-format
+msgid "Rebasing (%d/%d)%s"
+msgstr "Yeniden temellendiriliyor: (%d/%d)%s"
+
+#, c-format
+msgid "Stopped at %s...  %.*s\n"
+msgstr "%s konumunda durdu... %.*s\n"
+
+#, c-format
+msgid "unknown command %d"
+msgstr "bilinmeyen komut %d"
+
+msgid "could not read orig-head"
+msgstr "orig-head okunamadı"
+
+msgid "could not read 'onto'"
+msgstr "'onto' okunamadı"
+
+#, c-format
+msgid "could not update HEAD to %s"
+msgstr "HEAD şu konuma güncellenemedi: %s"
+
+#, c-format
+msgid "Successfully rebased and updated %s.\n"
+msgstr "%s başarıyla yeniden temellendirildi ve güncellendi.\n"
+
+msgid "cannot rebase: You have unstaged changes."
+msgstr "Yeniden temellendirilemiyor: Hazırlanmamış değişiklikleriniz var."
+
+msgid "cannot amend non-existing commit"
+msgstr "var olmayan işleme değiştirilemiyor"
+
+#, c-format
+msgid "invalid file: '%s'"
+msgstr "geçersiz dosya: '%s'"
+
+#, c-format
+msgid "invalid contents: '%s'"
+msgstr "geçersiz içerik: '%s'"
+
+msgid ""
+"\n"
+"You have uncommitted changes in your working tree. Please, commit them\n"
+"first and then run 'git rebase --continue' again."
+msgstr ""
+"\n"
+"Ç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."
+
+#, c-format
+msgid "could not write file: '%s'"
+msgstr "dosya yazılamadı: '%s'"
+
+msgid "could not remove CHERRY_PICK_HEAD"
+msgstr "CHERRY_PICK_HEAD kaldırılamadı"
+
+msgid "could not commit staged changes."
+msgstr "Hazırlanmış değişiklikler işlenemedi."
+
+#, c-format
+msgid "%s: can't cherry-pick a %s"
+msgstr "%s: Bir %s seçip alınamıyor"
+
+#, c-format
+msgid "%s: bad revision"
+msgstr "%s hatalı revizyon"
+
+msgid "can't revert as initial commit"
+msgstr "ilk işleme geri alınamaz"
+
+#, c-format
+msgid "skipped previously applied commit %s"
+msgstr "daha önce uygulanan %s işlemesi atlandı"
+
+msgid "use --reapply-cherry-picks to include skipped commits"
+msgstr "atlanan işlemeleri içermek için --reapply-cherry-picks kullanın"
+
+msgid "make_script: unhandled options"
+msgstr "make_script: ele alınmayan seçenekler"
+
+msgid "make_script: error preparing revisions"
+msgstr "make_script: revizyonlar hazırlanırken hata"
+
+msgid "nothing to do"
+msgstr "yapılacak bir şey yok"
+
+msgid "could not skip unnecessary pick commands"
+msgstr "gerekli olmayan seçim komutları atlanamadı"
+
+msgid "the script was already rearranged."
+msgstr "betik halihazırda yeniden düzenlenmişti."
+
+#, c-format
+msgid "'%s' is outside repository at '%s'"
+msgstr "'%s', '%s' konumunda depo dışında"
+
+#, c-format
+msgid ""
+"%s: no such path in the working tree.\n"
+"Use 'git <command> -- <path>...' to specify paths that do not exist locally."
+msgstr ""
+"%s: Çalışma ağacında böyle bir yol yok.\n"
+"Yerelde var olmayan yolları belirtmek için 'git <komut> -- <yol>... kullanın."
+
+#, c-format
+msgid ""
+"ambiguous argument '%s': unknown revision or path not in the working tree.\n"
+"Use '--' to separate paths from revisions, like this:\n"
+"'git <command> [<revision>...] -- [<file>...]'"
+msgstr ""
+"Belirsiz argüman '%s': Çalışma ağacında olmayan bilinmeyen revizyon veya "
+"yol.\n"
+"Yolları revizyonlardan ayırmak için '--' kullanın, şöyle:\n"
+"'git <komut> [<revizyon>...] -- [<dosya>...]'"
+
+#, c-format
+msgid "option '%s' must come before non-option arguments"
+msgstr "'%s' seçeneği seçenek olmayan argümanlardan önce gelmeli"
+
+#, c-format
+msgid ""
+"ambiguous argument '%s': both revision and filename\n"
+"Use '--' to separate paths from revisions, like this:\n"
+"'git <command> [<revision>...] -- [<file>...]'"
+msgstr ""
+"Belirsiz argüman '%s': Hem revizyon hem dosya adı.\n"
+"Yolları revizyonlardan ayırmak için '--' kullanın, şöyle:\n"
+"'git <komut> [<revizyon>...] -- [<dosya>...]'"
+
+msgid "unable to set up work tree using invalid config"
+msgstr "geçersiz yapılandırma kullanılarak çalışma ağacı kurulamıyor"
+
+#, c-format
+msgid "Expected git repo version <= %d, found %d"
+msgstr "Beklenen git repo sürümü <= %d, %d bulundu"
+
+msgid "unknown repository extension found:"
+msgid_plural "unknown repository extensions found:"
+msgstr[0] "bilinmeyen depo genişletmesi bulundu:"
+msgstr[1] "bilinmeyen depo genişletmeleri bulundu:"
+
+msgid "repo version is 0, but v1-only extension found:"
+msgid_plural "repo version is 0, but v1-only extensions found:"
+msgstr[0] "depo sürümü 0; ancak v1'e özel genişletme bulundu:"
+msgstr[1] "depo sürümü 0; ancak v1'e özel genişletmeler bulundu:"
+
+#, c-format
+msgid "error opening '%s'"
+msgstr "'%s' açılırken hata"
+
+#, c-format
+msgid "too large to be a .git file: '%s'"
+msgstr "bir .git dosyası olabilmek için çok büyük: '%s'"
+
+#, c-format
+msgid "error reading %s"
+msgstr "%s okunurken hata"
+
+#, c-format
+msgid "invalid gitfile format: %s"
+msgstr "geçersiz gitfile biçimi: %s"
+
+#, c-format
+msgid "no path in gitfile: %s"
+msgstr "gitfile içinde yol yok: %s"
+
+#, c-format
+msgid "not a git repository: %s"
+msgstr "bir git deposu değil: %s"
+
+#, c-format
+msgid "'$%s' too big"
+msgstr "'$%s' çok büyük"
+
+#, c-format
+msgid "not a git repository: '%s'"
+msgstr "bir git deposu değil: '%s'"
+
+#, c-format
+msgid "cannot chdir to '%s'"
+msgstr "'%s' konumuna chdir yapılamıyor"
+
+msgid "cannot come back to cwd"
+msgstr "cwd'ye geri dönülemiyor"
+
+#, c-format
+msgid "failed to stat '%*s%s%s'"
+msgstr "'%*s%s%s' bilgileri alınamadı"
+
+msgid "Unable to read current working directory"
+msgstr "Şu anki çalışma dizini okunamıyor"
+
+#, c-format
+msgid "cannot change to '%s'"
+msgstr "şuraya değiştirilemiyor: '%s'"
+
+#, c-format
+msgid "not a git repository (or any of the parent directories): %s"
+msgstr "bir git deposu (veya üst dizinlerinden birisi) değil: %s"
+
+#, 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 ""
+"Bir git deposu veya (%s bağlama noktasına kadar olan üstü) değil\n"
+"Dosya sistemi sınırında duruluyor (GIT_DISCOVERY_ACROSS_FILESYSTEM "
+"ayarlanmamış)."
+
+#, c-format
+msgid ""
+"unsafe repository ('%s' is owned by someone else)\n"
+"To add an exception for this directory, call:\n"
+"\n"
+"\tgit config --global --add safe.directory %s"
+msgstr ""
+"güvensiz depo ('%s' sahibi bir başkası)\n"
+"Bu dizin için bir istisna eklemek için şunu çağırın:\n"
+"\n"
+"\tgit config --global --add safe.directory %s"
+
+#, c-format
+msgid ""
+"problem with core.sharedRepository filemode value (0%.3o).\n"
+"The owner of files must always have read and write permissions."
+msgstr ""
+"core.sharedRepository dosya kipi değeri ile sorun (0%.3o).\n"
+"Dosyaların sahibinin her zaman okuma ve yazma izni olması gerekir."
+
+msgid "fork failed"
+msgstr "çatallama başarısız"
+
+msgid "setsid failed"
+msgstr "setsid başarısız"
+
+#, c-format
+msgid "index entry is a directory, but not sparse (%08x)"
+msgstr "indeks girdisi bir dizin; ancak aralıklı değil (%08x)"
+
+msgid "cannot use split index with a sparse index"
+msgstr "bir aralıklı indeksle bölünmüş indeks kullanılamıyor"
+
+#. TRANSLATORS: IEC 80000-13:2008 gibibyte
+#, c-format
+msgid "%u.%2.2u GiB"
+msgstr "%u.%2.2u GiB"
+
+#. TRANSLATORS: IEC 80000-13:2008 gibibyte/second
+#, c-format
+msgid "%u.%2.2u GiB/s"
+msgstr "%u.%2.2u GiB/sn"
+
+#. TRANSLATORS: IEC 80000-13:2008 mebibyte
+#, c-format
+msgid "%u.%2.2u MiB"
+msgstr "%u.%2.2u MiB"
+
+#. TRANSLATORS: IEC 80000-13:2008 mebibyte/second
+#, c-format
+msgid "%u.%2.2u MiB/s"
+msgstr "%u.%2.2u MiB/sn"
+
+#. TRANSLATORS: IEC 80000-13:2008 kibibyte
+#, c-format
+msgid "%u.%2.2u KiB"
+msgstr "%u.%2.2u KiB"
+
+#. TRANSLATORS: IEC 80000-13:2008 kibibyte/second
+#, c-format
+msgid "%u.%2.2u KiB/s"
+msgstr "%u.%2.2u KiB/sn"
+
+#. TRANSLATORS: IEC 80000-13:2008 byte
+#, c-format
+msgid "%u byte"
+msgid_plural "%u bytes"
+msgstr[0] "%u bayt"
+msgstr[1] "%u bayt"
+
+#. TRANSLATORS: IEC 80000-13:2008 byte/second
+#, c-format
+msgid "%u byte/s"
+msgid_plural "%u bytes/s"
+msgstr[0] "%u bayt/sn"
+msgstr[1] "%u bayt/sn"
+
+#, c-format
+msgid "could not edit '%s'"
+msgstr "'%s' düzenlenemedi"
+
+#, c-format
+msgid "ignoring suspicious submodule name: %s"
+msgstr "kuşku doğuran altmodül yok sayılıyor: %s"
+
+msgid "negative values not allowed for submodule.fetchJobs"
+msgstr "submodule.fetchJobs için negatif değerlere izin verilmiyor"
+
+#, c-format
+msgid "ignoring '%s' which may be interpreted as a command-line option: %s"
+msgstr ""
+"'%s' bir komut satırı seçeneği olarak yorumlanabileceğinden yok sayılıyor: %s"
+
+#, c-format
+msgid "Could not update .gitmodules entry %s"
+msgstr ".gitmodules girdisi %s güncellenemedi"
+
+msgid "Cannot change unmerged .gitmodules, resolve merge conflicts first"
+msgstr ""
+"Birleştirilmemiş .gitmodules değiştirilemiyor, önce birleştirme "
+"çakışmalarını çözün"
+
+#, c-format
+msgid "Could not find section in .gitmodules where path=%s"
+msgstr ".gitmodules içinde path=%s olan bölüm bulunamadı"
+
+#, c-format
+msgid "Could not remove .gitmodules entry for %s"
+msgstr "%s için .gitmodules girdisi kaldırılamadı"
+
+msgid "staging updated .gitmodules failed"
+msgstr "güncellenmiş .gitmodules'u hazırlama başarısız oldu"
+
+#, c-format
+msgid "in unpopulated submodule '%s'"
+msgstr "içi doldurulmamış '%s' altmodülünde"
+
+#, c-format
+msgid "Pathspec '%s' is in submodule '%.*s'"
+msgstr "Yol belirteci '%s' '%.*s' altmodülünde"
+
+#, c-format
+msgid "bad --ignore-submodules argument: %s"
+msgstr "hatalı --ignore-submodules argümanı: %s"
+
+#, c-format
+msgid ""
+"Submodule in commit %s at path: '%s' collides with a submodule named the "
+"same. Skipping it."
+msgstr ""
+"%s işlemesinde '%s' yolunda bulunan altmodül, aynı adlı bir altmodülle "
+"çarpışıyor. Atlanıyor."
+
+#, 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"
+
+#, c-format
+msgid ""
+"Could not run 'git rev-list <commits> --not --remotes -n 1' command in "
+"submodule %s"
+msgstr ""
+"'%s' altmodülünde 'git rev-list <commits> --not --remotes -n 1' "
+"çalıştırılamadı"
+
+#, c-format
+msgid "process for submodule '%s' failed"
+msgstr "'%s' altmodülü için işlem başarısız oldu"
+
+#, c-format
+msgid "Pushing submodule '%s'\n"
+msgstr "'%s' altmodülü itiliyor\n"
+
+#, c-format
+msgid "Unable to push submodule '%s'\n"
+msgstr "'%s' altmodülü itilemiyor\n"
+
+#, c-format
+msgid "Fetching submodule %s%s\n"
+msgstr "%s%s altmodülü getiriliyor\n"
+
+#, c-format
+msgid "Could not access submodule '%s'\n"
+msgstr "'%s' altmodülüne erişilemedi\n"
+
+#, c-format
+msgid "Could not access submodule '%s' at commit %s\n"
+msgstr "'%s' altmodülüne %s işlemesinde erişilemedi\n"
+
+#, c-format
+msgid "Fetching submodule %s%s at commit %s\n"
+msgstr "%s%s altmodülü %s işlemesinde getiriliyor\n"
+
+#, c-format
+msgid ""
+"Errors during submodule fetch:\n"
+"%s"
+msgstr ""
+"Altmodül getirilirken hata:\n"
+"%s"
+
+#, c-format
+msgid "'%s' not recognized as a git repository"
+msgstr "'%s' bir git deposu olarak tanımlanamadı"
+
+#, 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ı"
+
+#, 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"
+
+#, c-format
+msgid "could not start 'git status' in submodule '%s'"
+msgstr "'%s' altmodülü içinde 'git status' başlatılamadı"
+
+#, c-format
+msgid "could not run 'git status' in submodule '%s'"
+msgstr "'%s' altmodülü içinde 'git status' çalıştırılamadı"
+
+#, c-format
+msgid "Could not unset core.worktree setting in submodule '%s'"
+msgstr "'%s' altmodülü içinde core.worktree ayarı kapatılamadı"
+
+#, c-format
+msgid "could not recurse into submodule '%s'"
+msgstr "'%s' altmodülüne özyinelenemedi"
+
+msgid "could not reset submodule index"
+msgstr "altmodül indeksi sıfırlanamadı"
+
+#, c-format
+msgid "submodule '%s' has dirty index"
+msgstr "'%s' altmodülü indeksi kirli"
+
+#, c-format
+msgid "Submodule '%s' could not be updated."
+msgstr "'%s' altmodülü güncellenemedi."
+
+#, c-format
+msgid "submodule git dir '%s' is inside git dir '%.*s'"
+msgstr "altmodül git dizini '%s', '%.*s' git dizini içinde"
+
+#, 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"
+
+#, c-format
+msgid "could not lookup name for submodule '%s'"
+msgstr "'%s' altmodülü adı aranamadı"
+
+#, c-format
+msgid "refusing to move '%s' into an existing git dir"
+msgstr "'%s' ögesini mevcut bir git dizinine taşıma reddediliyor"
+
+#, c-format
+msgid ""
+"Migrating git directory of '%s%s' from\n"
+"'%s' to\n"
+"'%s'\n"
+msgstr ""
+"'%s%s' git dizini göç ettiriliyor:\n"
+"şuradan: '%s'\n"
+"şuraya: '%s'\n"
+
+msgid "could not start ls-files in .."
+msgstr "ls-files şurada başlatılamadı .."
+
+#, c-format
+msgid "ls-tree returned unexpected return code %d"
+msgstr "ls-tree beklenmedik bir biçimde %d kodu ile çıktı"
+
+#, c-format
+msgid "failed to lstat '%s'"
+msgstr "'%s', lstat yapılamadı"
+
+msgid "unhandled options"
+msgstr "beklenmeyen seçenekler"
+
+msgid "error preparing revisions"
+msgstr "revizyonlar hazırlanırken hata"
+
+#, c-format
+msgid "commit %s is not marked reachable"
+msgstr "%s işlemesi ulaşılabilir olarak imlenmedi"
+
+msgid "too many commits marked reachable"
+msgstr "çok fazla işleme ulaşılabilir olarak imlenmiş"
+
+msgid "test-tool serve-v2 [<options>]"
+msgstr "test-tool serve-v2 [<seçenekler>]"
+
+msgid "exit immediately after advertising capabilities"
+msgstr "becerileri gösterdikten hemen sonra çık"
+
+msgid "test-helper simple-ipc is-active    [<name>] [<options>]"
+msgstr "test-helper simple-ipc is-active    [<ad>] [<seçenekler>]"
+
+msgid "test-helper simple-ipc run-daemon   [<name>] [<threads>]"
+msgstr "test-helper simple-ipc run-daemon   [<ad>] [<iş-parçacıkları>]"
+
+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>]"
+
+msgid "test-helper simple-ipc stop-daemon  [<name>] [<max-wait>]"
+msgstr "test-helper simple-ipc stop-daemon  [<ad>] [<maks-bekle>]"
+
+msgid "test-helper simple-ipc send         [<name>] [<token>]"
+msgstr "test-helper simple-ipc send         [<ad>] [<jeton>]"
+
+msgid "test-helper simple-ipc sendbytes    [<name>] [<bytecount>] [<byte>]"
+msgstr "test-helper simple-ipc sendbytes    [<ad>] [<bayt-sayısı>] [<bayt>]"
+
+msgid ""
+"test-helper simple-ipc multiple     [<name>] [<threads>] [<bytecount>] "
+"[<batchsize>]"
+msgstr ""
+"test-helper simple-ipc multiple     [<ad>] [<iş-parçacığı>] [<bayt-sayısı>] "
+"[<parti-boyutu>]"
+
+msgid "name or pathname of unix domain socket"
+msgstr "unix ad alanının adı veya yol adı"
+
+msgid "named-pipe name"
+msgstr "named-pipe adı"
+
+msgid "number of threads in server thread pool"
+msgstr "sunucu iş parçacığı havuzundaki iş parçacığı sayısı"
+
+msgid "seconds to wait for daemon to start or stop"
+msgstr "ardalan sürecinin başlaması veya durması için beklenecek saniye"
+
+msgid "number of bytes"
+msgstr "bayt sayısı"
+
+msgid "number of requests per thread"
+msgstr "iş parçacığı başına düşen istek sayısı"
+
+msgid "byte"
+msgstr "bayt"
+
+msgid "ballast character"
+msgstr "dengeleyici karakter"
+
+msgid "token"
+msgstr "jeton"
+
+msgid "command token to send to the server"
+msgstr "sunucuya gönderilecek komut jetonu"
+
+#, c-format
+msgid "running trailer command '%s' failed"
+msgstr "'%s' artbilgi komutunu çalıştırma başarısız oldu"
+
+#, c-format
+msgid "unknown value '%s' for key '%s'"
+msgstr "bilinmeyen değer '%s' ('%s' anahtarı için)"
+
+#, c-format
+msgid "empty trailer token in trailer '%.*s'"
+msgstr "'%.*s' artbilgisi içinde boş artbilgi jetonu"
+
+#, c-format
+msgid "could not read input file '%s'"
+msgstr "'%s' girdi dosyası okunamadı"
+
+#, c-format
+msgid "could not stat %s"
+msgstr "%s dosya bilgileri alınamadı"
+
+#, c-format
+msgid "file %s is not a regular file"
+msgstr "%s dosyası sıradan bir dosya değil"
+
+#, c-format
+msgid "file %s is not writable by user"
+msgstr "%s dosyası kullanıcı tarafından yazılabilir değil"
+
+msgid "could not open temporary file"
+msgstr "geçici dosya açılamadı"
+
+#, c-format
+msgid "could not rename temporary file to %s"
+msgstr "geçici dosya adı %s olarak değiştirilemedi"
+
+msgid "full write to remote helper failed"
+msgstr "uzak konum yardımcısına tam yazım başarısız"
+
+#, c-format
+msgid "unable to find remote helper for '%s'"
+msgstr "'%s' için uzak konum yardımcısı bulunamadı"
+
+msgid "can't dup helper output fd"
+msgstr "uzak konum yardımcısı çıktısı için dosya açıklayıcısı çoğaltılamıyor"
+
+#, c-format
+msgid ""
+"unknown mandatory capability %s; this remote helper probably needs newer "
+"version of Git"
+msgstr ""
+"bilinmeyen zorunlu %s yeteneği; bu uzak konum yardımcısı büyük olasılıkla "
+"Git'in daha yeni bir sürümüne gereksinim duyuyor"
+
+msgid "this remote helper should implement refspec capability"
+msgstr "bu uzak konum yardımcısı refspec yapabilirliğini yerine getirmeli"
+
+#, c-format
+msgid "%s unexpectedly said: '%s'"
+msgstr "%s beklenmedik bir biçimde şunu söyledi: '%s'"
+
+#, c-format
+msgid "%s also locked %s"
+msgstr "%s ayrıca şunu kilitledi: %s"
+
+msgid "couldn't run fast-import"
+msgstr "fast-import çalıştırılamadı"
+
+msgid "error while running fast-import"
+msgstr "fast-import çalıştırılırken hata"
+
+#, c-format
+msgid "could not read ref %s"
+msgstr "%s başvurusu okunamadı"
+
+#, c-format
+msgid "unknown response to connect: %s"
+msgstr "'connect'e bilinmeyen yanıt: %s"
+
+msgid "setting remote service path not supported by protocol"
+msgstr "uzak servis yolu ayarlama protokol tarafından desteklenmiyor"
+
+msgid "invalid remote service path"
+msgstr "geçersiz uzak konum servis yolu"
+
+msgid "operation not supported by protocol"
+msgstr "işlem protokol tarafından desteklenmiyor"
+
+#, c-format
+msgid "can't connect to subservice %s"
+msgstr "%s altservisine bağlanılamıyor"
+
+msgid "--negotiate-only requires protocol v2"
+msgstr "--negotiate-only protokolün ikinci sürümünü gerektiriyor"
+
+msgid "'option' without a matching 'ok/error' directive"
+msgstr "eşleşen bir 'tamam/hata' direktifi olmadan 'option'"
+
+#, c-format
+msgid "expected ok/error, helper said '%s'"
+msgstr "tamam/hata bekleniyordu, yardımcı şunu söyledi: '%s'"
+
+#, c-format
+msgid "helper reported unexpected status of %s"
+msgstr "yardımcı %s beklenmedik durumu bildirdi"
+
+#, c-format
+msgid "helper %s does not support dry-run"
+msgstr "%s yardımcısı 'dry-run' desteklemiyor"
+
+#, c-format
+msgid "helper %s does not support --signed"
+msgstr "%s yardımcısı --signed desteklemiyor"
+
+#, c-format
+msgid "helper %s does not support --signed=if-asked"
+msgstr "%s yardımcısı --signed=if-asked desteklemiyor"
+
+#, c-format
+msgid "helper %s does not support --atomic"
+msgstr "%s yardımcısı --atomic desteklemiyor"
+
+#, c-format
+msgid "helper %s does not support --%s"
+msgstr "%s yardımcısı --%s desteklemiyor"
+
+#, c-format
+msgid "helper %s does not support 'push-option'"
+msgstr "%s yardımcısı 'push-option' desteklemiyor"
+
+msgid "remote-helper doesn't support push; refspec needed"
+msgstr "remote-helper itme desteklemiyor; başvuru belirteci gerekli"
+
+#, c-format
+msgid "helper %s does not support 'force'"
+msgstr "%s yardımcısı 'force' desteklemiyor"
+
+msgid "couldn't run fast-export"
+msgstr "fast-export çalıştırılamadı"
+
+msgid "error while running fast-export"
+msgstr "fast-export çalıştırılırken hata"
+
+#, c-format
+msgid ""
+"No refs in common and none specified; doing nothing.\n"
+"Perhaps you should specify a branch.\n"
+msgstr ""
+"Ortak başvuru yok ve hiç belirtilmemiş; bir şey yapılmayacak.\n"
+"Belki de bir dal belirtmelisiniz.\n"
+
+#, c-format
+msgid "unsupported object format '%s'"
+msgstr "desteklenmeyen nesne biçimi '%s'"
+
+#, c-format
+msgid "malformed response in ref list: %s"
+msgstr "başvuru listesinde hatalı oluşturulmuş yanıt: %s"
+
+#, c-format
+msgid "read(%s) failed"
+msgstr "read(%s) başarısız oldu"
+
+#, c-format
+msgid "write(%s) failed"
+msgstr "write(%s) başarısız oldu"
+
+#, c-format
+msgid "%s thread failed"
+msgstr "%s iş parçacığı başarısız oldu"
+
+#, c-format
+msgid "%s thread failed to join: %s"
+msgstr "%s iş parçacığı eklenemedi: %s"
+
+#, c-format
+msgid "can't start thread for copying data: %s"
+msgstr "veri kopyalama için iş parçacığı başlatılamıyor: %s"
+
+#, c-format
+msgid "%s process failed to wait"
+msgstr "%s işlemi bekleyemedi"
+
+#, c-format
+msgid "%s process failed"
+msgstr "%s işlemi başarısız oldu"
+
+msgid "can't start thread for copying data"
+msgstr "veri kopyalama için iş parçacığı başlatılamıyor"
+
+#, c-format
+msgid "Would set upstream of '%s' to '%s' of '%s'\n"
+msgstr "'%s' üst kaynağı '%s' (kaynak: '%s') olarak ayarlanacak\n"
+
+#, c-format
+msgid "could not read bundle '%s'"
+msgstr "'%s' demeti okunamadı"
+
+#, c-format
+msgid "transport: invalid depth option '%s'"
+msgstr "transport: Geçersiz derinlik seçeneği '%s'"
+
+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"
+
+msgid "server options require protocol version 2 or later"
+msgstr "sunucu seçenekleri protokol sürüm 2 veya sonrasını gerektirir"
+
+msgid "server does not support wait-for-done"
+msgstr "Sunucu, wait-for-done desteklemiyor"
+
+msgid "could not parse transport.color.* config"
+msgstr "transport.color.* yapılandırması ayrıştırılamadı"
+
+msgid "support for protocol v2 not implemented yet"
+msgstr "protokol v2 desteği henüz yerine getirilmedi"
+
+#, c-format
+msgid "unknown value for config '%s': %s"
+msgstr "'%s' yapılandırması için bilinmeyen değer: %s"
+
+#, c-format
+msgid "transport '%s' not allowed"
+msgstr "'%s' taşıyıcısına izin verilmiyor"
+
+msgid "git-over-rsync is no longer supported"
+msgstr "git-over-rsync artık desteklenmiyor"
+
+#, c-format
+msgid ""
+"The following submodule paths contain changes that can\n"
+"not be found on any remote:\n"
+msgstr ""
+"Aşağıdaki altmodül yolları başka hiçbir uzak konumda bulunamayan\n"
+"değişiklikler içeriyor:\n"
+
+#, c-format
+msgid ""
+"\n"
+"Please try\n"
+"\n"
+"\tgit push --recurse-submodules=on-demand\n"
+"\n"
+"or cd to the path and use\n"
+"\n"
+"\tgit push\n"
+"\n"
+"to push them to a remote.\n"
+"\n"
+msgstr ""
+"\n"
+"Lütfen\n"
+"\n"
+"\tgit push --recurse-submodules=on-demand\n"
+"\n"
+"deneyin veya bir uzak konuma itmek için yola cd yapıp\n"
+"\n"
+"\tgit push\n"
+"\n"
+"kullanın.\n"
+"\n"
+
+msgid "Aborting."
+msgstr "İptal ediliyor."
+
+msgid "failed to push all needed submodules"
+msgstr "gereken tüm altmodüller itilemedi"
+
+msgid "too-short tree object"
+msgstr "ağaç nesnesi çok kısa"
+
+msgid "malformed mode in tree entry"
+msgstr "ağaç girdisinde hatalı oluşturulmuş kip"
+
+msgid "empty filename in tree entry"
+msgstr "ağaç girdisinde boş dosya adı"
+
+msgid "too-short tree file"
+msgstr "ağaç dosyası çok kısa"
+
+#, c-format
+msgid ""
+"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 ""
+"Çıkış ile aşağıdaki dosyalardaki yerel değişikliklerin üzerine yazılacak:\n"
+"%%sLütfen dal değiştirmeden önce değişikliklerinizi işleyin veya zulalayın."
+
+#, c-format
+msgid ""
+"Your local changes to the following files would be overwritten by checkout:\n"
+"%%s"
+msgstr ""
+"Çıkış ile aşağıdaki dosyalardaki yerel değişikliklerin üzerine yazılacak:\n"
+"%%s"
+
+#, c-format
+msgid ""
+"Your local changes to the following files would be overwritten by merge:\n"
+"%%sPlease commit your changes or stash them before you merge."
+msgstr ""
+"Birleştirme ile aşağıdaki dosyalardaki yerel değişikliklerin üzerine "
+"yazılacak:\n"
+"%%sLütfen birleştirmeden önce değişikliklerinizi işleyin veya zulalayın."
+
+#, c-format
+msgid ""
+"Your local changes to the following files would be overwritten by merge:\n"
+"%%s"
+msgstr ""
+"Birleştirme ile aşağıdaki dosyalardaki yerel değişikliklerin üzerine "
+"yazılacak:\n"
+"%%s"
+
+#, c-format
+msgid ""
+"Your local changes to the following files would be overwritten by %s:\n"
+"%%sPlease commit your changes or stash them before you %s."
+msgstr ""
+"%s ile aşağıdaki dosyalardaki yerel değişikliklerin üzerine yazılacak:\n"
+"%%sLütfen %s yapmadan önce değişikliklerinizi işleyin veya zulalayın."
+
+#, c-format
+msgid ""
+"Your local changes to the following files would be overwritten by %s:\n"
+"%%s"
+msgstr ""
+"%s ile aşağıdaki dosyalardaki yerel değişikliklerin üzerine yazılacak:\n"
+"%%s"
+
+#, c-format
+msgid ""
+"Updating the following directories would lose untracked files in them:\n"
+"%s"
+msgstr ""
+"Aşağıdaki dizinleri güncellemek içlerindeki izlenmeyen dosyaları kaybeder:\n"
+"%s"
+
+#, c-format
+msgid ""
+"Refusing to remove the current working directory:\n"
+"%s"
+msgstr ""
+"Geçerli çalışma dizinini kaldırma reddediliyor:\n"
+"%s"
+
+#, c-format
+msgid ""
+"The following untracked working tree files would be removed by checkout:\n"
+"%%sPlease move or remove them before you switch branches."
+msgstr ""
+"Çıkış ile aşağıdaki izlenmeyen çalışma ağacı dosyaları kaldırılacak:\n"
+"%%sLütfen dal değiştirmeden önce onları taşıyın veya kaldırın."
+
+#, c-format
+msgid ""
+"The following untracked working tree files would be removed by checkout:\n"
+"%%s"
+msgstr ""
+"Çıkış ile aşağıdaki izlenmeyen çalışma ağacı dosyaları kaldırılacak:\n"
+"%%s"
+
+#, c-format
+msgid ""
+"The following untracked working tree files would be removed by merge:\n"
+"%%sPlease move or remove them before you merge."
+msgstr ""
+"Birleştirme ile aşağıdaki izlenmeyen çalışma ağacı dosyaları kaldırılacak:\n"
+"%%sLütfen birleştirmeden önce onları taşıyın veya kaldırın."
+
+#, c-format
+msgid ""
+"The following untracked working tree files would be removed by merge:\n"
+"%%s"
+msgstr ""
+"Birleştirme ile aşağıdaki izlenmeyen çalışma ağacı dosyaları kaldırılacak:\n"
+"%%s"
+
+#, c-format
+msgid ""
+"The following untracked working tree files would be removed by %s:\n"
+"%%sPlease move or remove them before you %s."
+msgstr ""
+"%s ile aşağıdaki izlenmeyen çalışma ağacı dosyaları kaldırılacak:\n"
+"%%sLütfen %s yapmadan önce onları taşıyın veya kaldırın."
+
+#, c-format
+msgid ""
+"The following untracked working tree files would be removed by %s:\n"
+"%%s"
+msgstr ""
+"%s ile aşağıdaki izlenmeyen çalışma ağacı dosyaları kaldırılacak:\n"
+"%%s"
+
+#, c-format
+msgid ""
+"The following untracked working tree files would be overwritten by "
+"checkout:\n"
+"%%sPlease move or remove them before you switch branches."
+msgstr ""
+"Çıkış ile aşağıdaki izlenmeyen çalışma ağacı dosyalarının üzerine "
+"yazılacak:\n"
+"%%sLütfen dal değiştirmeden önce onları taşıyın veya kaldırın."
+
+#, c-format
+msgid ""
+"The following untracked working tree files would be overwritten by "
+"checkout:\n"
+"%%s"
+msgstr ""
+"Çıkış ile aşağıdaki izlenmeyen çalışma ağacı dosyalarının üzerine "
+"yazılacak:\n"
+"%%s"
+
+#, c-format
+msgid ""
+"The following untracked working tree files would be overwritten by merge:\n"
+"%%sPlease move or remove them before you merge."
+msgstr ""
+"Birleştirme ile aşağıdaki izlenmeyen çalışma ağacı dosyalarının üzerine "
+"yazılacak:\n"
+"%%sLütfen birleştirmeden önce onları taşıyın veya kaldırın."
+
+#, c-format
+msgid ""
+"The following untracked working tree files would be overwritten by merge:\n"
+"%%s"
+msgstr ""
+"Birleştirme ile aşağıdaki izlenmeyen çalışma ağacı dosyalarının üzerine "
+"yazılacak:\n"
+"%%s"
+
+#, c-format
+msgid ""
+"The following untracked working tree files would be overwritten by %s:\n"
+"%%sPlease move or remove them before you %s."
+msgstr ""
+"%s ile aşağıdaki izlenmeyen çalışma ağacı dosyalarının üzerine yazılacak:\n"
+"%%sLütfen %s yapmadan önce onları taşıyın veya kaldırın."
+
+#, c-format
+msgid ""
+"The following untracked working tree files would be overwritten by %s:\n"
+"%%s"
+msgstr ""
+"%s ile aşağıdaki izlenmeyen çalışma ağacı dosyalarının üzerine yazılacak:\n"
+"%%s"
+
+#, c-format
+msgid "Entry '%s' overlaps with '%s'.  Cannot bind."
+msgstr "'%s' girdisi '%s' ile üst üste biniyor. Bağlanamıyor."
+
+#, c-format
+msgid ""
+"Cannot update submodule:\n"
+"%s"
+msgstr ""
+"Altmodül güncellenemiyor:\n"
+"%s"
+
+#, c-format
+msgid ""
+"The following paths are not up to date and were left despite sparse "
+"patterns:\n"
+"%s"
+msgstr ""
+"Aşağıdaki yollar güncel değil ve seyrek dizgilere rağmen terk edilmiş:\n"
+"%s"
+
+#, c-format
+msgid ""
+"The following paths are unmerged and were left despite sparse patterns:\n"
+"%s"
+msgstr ""
+"Aşağıdaki yollar birleştirilmemiş ve seyrek dizgilere rağmen terk edilmiş:\n"
+"%s"
+
+#, c-format
+msgid ""
+"The following paths were already present and thus not updated despite sparse "
+"patterns:\n"
+"%s"
+msgstr ""
+"Aşağıdaki yollar halihazırda vardı ve buna göre, seyrek dizgilere rağmen "
+"güncellenmedi:\n"
+"%s"
+
+#, c-format
+msgid "Aborting\n"
+msgstr "İptal ediliyor\n"
+
+#, c-format
+msgid ""
+"After fixing the above paths, you may want to run `git sparse-checkout "
+"reapply`.\n"
+msgstr ""
+"Yukarıdaki yolları onardıktan sonra 'git sparse-checkout reapply' yapmak "
+"isteyebilirsiniz.\n"
+
+msgid "Updating files"
+msgstr "Dosyalar güncelleniyor"
+
+msgid ""
+"the following paths have collided (e.g. case-sensitive paths\n"
+"on a case-insensitive filesystem) and only one from the same\n"
+"colliding group is in the working tree:\n"
+msgstr ""
+"Aşağıdaki yollar birbiriyle çarpıştı (örn. BÜYÜK/küçük harf duyarlı\n"
+"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"
+
+msgid "Updating index flags"
+msgstr "İndeks bayrakları güncelleniyor"
+
+#, c-format
+msgid "worktree and untracked commit have duplicate entries: %s"
+msgstr "çalışma ağacı ve izlenmeyen işlemenin yinelenmiş girdileri var: %s"
+
+msgid "expected flush after fetch arguments"
+msgstr "getir argümanlarından sonra floş bekleniyordu"
+
+msgid "invalid URL scheme name or missing '://' suffix"
+msgstr "geçersiz URL şeması veya eksik '://' eki"
+
+#, c-format
+msgid "invalid %XX escape sequence"
+msgstr "geçersiz %XX kaçış sırası"
+
+msgid "missing host and scheme is not 'file:'"
+msgstr "ana bilgisayar eksik ve şema 'file:' değil"
+
+msgid "a 'file:' URL may not have a port number"
+msgstr "bir 'file:' URL'sinin kapı numarası olmayabilir"
+
+msgid "invalid characters in host name"
+msgstr "ana bilgisayar adında geçersiz karakter"
+
+msgid "invalid port number"
+msgstr "geçersiz kapı numarası"
+
+msgid "invalid '..' path segment"
+msgstr "geçersiz '..' yol kesimi"
+
+msgid "Fetching objects"
+msgstr "Nesneler getiriliyor"
+
+#, c-format
+msgid "'%s' at main working tree is not the repository directory"
+msgstr "ana çalışma ağacındaki '%s' depo dizini değil"
+
+#, c-format
+msgid "'%s' file does not contain absolute path to the working tree location"
+msgstr "'%s' dosyası çalışma ağacı konumuna olan tam yolu içermiyor"
+
+#, c-format
+msgid "'%s' is not a .git file, error code %d"
+msgstr "'%s' bir .git dosyası değil, hata kodu %d"
+
+#, c-format
+msgid "'%s' does not point back to '%s'"
+msgstr "'%s' şuna geri işaret etmiyor: '%s'"
+
+msgid "not a directory"
+msgstr "bir dizin değil"
+
+msgid ".git is not a file"
+msgstr ".git bir dosya değil"
+
+msgid ".git file broken"
+msgstr ".git dosyası bozuk"
+
+msgid ".git file incorrect"
+msgstr ".git dosyası doğru değil"
+
+msgid "not a valid path"
+msgstr "geçerli bir yol değil"
+
+msgid "unable to locate repository; .git is not a file"
+msgstr "depo konumu bulunamıyor: .git bir dosya değil"
+
+msgid "unable to locate repository; .git file does not reference a repository"
+msgstr "depo konumu bulunamıyor: .git dosyası bir depoya başvurmuyor"
+
+msgid "unable to locate repository; .git file broken"
+msgstr "depo konumu bulunamıyor: .git dosyası bozuk"
+
+msgid "gitdir unreadable"
+msgstr "okunamayan gitdir"
+
+msgid "gitdir incorrect"
+msgstr "doğru olmayan gitdir"
+
+msgid "not a valid directory"
+msgstr "geçerli bir dizin değil"
+
+msgid "gitdir file does not exist"
+msgstr "gitdir dosyası mevcut değil"
+
+#, c-format
+msgid "unable to read gitdir file (%s)"
+msgstr "gitdir dosyası (%s) okunamıyor"
+
+#, c-format
+msgid "short read (expected %<PRIuMAX> bytes, read %<PRIuMAX>)"
+msgstr "az okundu (%<PRIuMAX> bayt bekleniyordu, %<PRIuMAX> okundu)"
+
+msgid "invalid gitdir file"
+msgstr "geçersiz gitdir dosyası"
+
+msgid "gitdir file points to non-existent location"
+msgstr "gitdir dosyası var olmayan bir konuma işaret ediyor"
+
+#, c-format
+msgid "unable to set %s in '%s'"
+msgstr "%s, '%s' içinde ayarlanamıyor"
+
+#, c-format
+msgid "unable to unset %s in '%s'"
+msgstr "%s, '%s' içinde ayarı kaldırılamıyor"
+
+msgid "failed to set extensions.worktreeConfig setting"
+msgstr "extensions.worktreeConfig yapılandırması ayarlanamadı"
+
+#, c-format
+msgid "could not setenv '%s'"
+msgstr "setenv '%s' yapılamadı"
+
+#, c-format
+msgid "unable to create '%s'"
+msgstr "'%s' oluşturulamıyor"
+
+#, c-format
+msgid "could not open '%s' for reading and writing"
+msgstr "'%s' okuma ve yazma için açılamadı"
+
+#, c-format
+msgid "unable to access '%s'"
+msgstr "'%s' erişilemiyor"
+
+msgid "unable to get current working directory"
+msgstr "geçerli çalışma dizini alınamıyor"
+
+msgid "Unmerged paths:"
+msgstr "Birleştirilmemiş yollar:"
+
+msgid "  (use \"git restore --staged <file>...\" to unstage)"
+msgstr ""
+"  (hazırlıktan çıkarmak için \"git restore --staged <dosya>...\" kullanın)"
+
+#, c-format
+msgid "  (use \"git restore --source=%s --staged <file>...\" to unstage)"
+msgstr ""
+"  (hazırlıktan çıkarmak için \"git restore --source=%s --staged <dosya>...\" "
+"kullanın)"
+
+msgid "  (use \"git rm --cached <file>...\" to unstage)"
+msgstr "  (hazırlıktan çıkarmak için \"git rm --cached <dosya>...\" kullanın)"
+
+msgid "  (use \"git add <file>...\" to mark resolution)"
+msgstr "  (hazırlığı bitirmek için \"git add <dosya>...\" kullanın)"
+
+msgid "  (use \"git add/rm <file>...\" as appropriate to mark resolution)"
+msgstr ""
+"  (hazırlığı bitirmek için uygun bir biçimde \"git add/rm <dosya>...\" "
+"kullanın)"
+
+msgid "  (use \"git rm <file>...\" to mark resolution)"
+msgstr "  (hazırlığı bitirmek için \"git rm <dosya>...\" kullanın)"
+
+msgid "Changes to be committed:"
+msgstr "İşlenecek değişiklikler:"
+
+msgid "Changes not staged for commit:"
+msgstr "İşleme için hazırlanmamış değişiklikler:"
+
+msgid "  (use \"git add <file>...\" to update what will be committed)"
+msgstr "  (işlenecekleri güncellemek için \"git add <dosya>...\" kullanın)"
+
+msgid "  (use \"git add/rm <file>...\" to update what will be committed)"
+msgstr "  (işlenecekleri güncellemek için \"git add/rm <dosya>...\" kullanın)"
+
+msgid ""
+"  (use \"git restore <file>...\" to discard changes in working directory)"
+msgstr ""
+"  (çalışma dizinindeki değişiklikleri atmak için \"git restore <dosya>...\" "
+"kullanın)"
+
+msgid "  (commit or discard the untracked or modified content in submodules)"
+msgstr "  (altmodüllerdeki izlenmeyen/değiştirilen içeriği gönder veya at)"
+
+#, c-format
+msgid "  (use \"git %s <file>...\" to include in what will be committed)"
+msgstr "  (işlenecekler arasına koymak için \"git %s <dosya>...\" kullanın)"
+
+msgid "both deleted:"
+msgstr "ikimiz de sildik:"
+
+msgid "added by us:"
+msgstr "biz ekledik:"
+
+msgid "deleted by them:"
+msgstr "onlar sildi:"
+
+msgid "added by them:"
+msgstr "onlar ekledi:"
+
+msgid "deleted by us:"
+msgstr "biz sildik:"
+
+msgid "both added:"
+msgstr "ikimiz de ekledik:"
+
+msgid "both modified:"
+msgstr "ikimiz de değiştirdik:"
+
+msgid "new file:"
+msgstr "yeni dosya:"
+
+msgid "copied:"
+msgstr "kopyalandı:"
+
+msgid "deleted:"
+msgstr "silindi:"
+
+msgid "modified:"
+msgstr "değiştirildi:"
+
+msgid "renamed:"
+msgstr "yeniden adlandırıldı:"
+
+msgid "typechange:"
+msgstr "türü değiştirildi:"
+
+msgid "unknown:"
+msgstr "bilinmiyor:"
+
+msgid "unmerged:"
+msgstr "birleştirilmedi:"
+
+msgid "new commits, "
+msgstr "yeni işlemeler, "
+
+msgid "modified content, "
+msgstr "değiştirilen içerik, "
+
+msgid "untracked content, "
+msgstr "izlenmeyen içerik, "
+
+#, c-format
+msgid "Your stash currently has %d entry"
+msgid_plural "Your stash currently has %d entries"
+msgstr[0] "Zulanızda şu anda %d girdi var"
+msgstr[1] "Zulanızda şu anda %d girdi var"
+
+msgid "Submodules changed but not updated:"
+msgstr "Değiştirilen; ancak güncellenmeyen altmodüller:"
+
+msgid "Submodule changes to be committed:"
+msgstr "İşlenecek altmodül değişiklikleri:"
+
+msgid ""
+"Do not modify or remove the line above.\n"
+"Everything below it will be ignored."
+msgstr ""
+"Yukarıdaki satırı değiştirmeyin veya kaldırmayın.\n"
+"Altındaki her şey yok sayılacaktır."
+
+#, c-format
+msgid ""
+"\n"
+"It took %.2f seconds to compute the branch ahead/behind values.\n"
+"You can use '--no-ahead-behind' to avoid this.\n"
+msgstr ""
+"\n"
+"Dal önünde/arkasında değerlerini hesaplama %.2f saniye sürdü.\n"
+"Bundan kaçınmak için --no-ahead-behind kullanabilirsiniz.\n"
+
+msgid "You have unmerged paths."
+msgstr "Birleştirilmemiş yollarınız var."
+
+msgid "  (fix conflicts and run \"git commit\")"
+msgstr "  (çakışmaları onar ve \"git commit\" çalıştır)"
+
+msgid "  (use \"git merge --abort\" to abort the merge)"
+msgstr "  (birleştirmeyi iptal etmek için \"git merge --abort\" kullanın)"
+
+msgid "All conflicts fixed but you are still merging."
+msgstr "Tüm çakışmalar onarıldı; ancak siz hâlâ birleştiriyorsunuz."
+
+msgid "  (use \"git commit\" to conclude merge)"
+msgstr "  (birleştirmeyi sonuçlandırmak için \"git commit\" kullanın)"
+
+msgid "You are in the middle of an am session."
+msgstr "Bir 'am' oturumunun tam ortasındasınız."
+
+msgid "The current patch is empty."
+msgstr "Mevcut yama boş."
+
+msgid "  (fix conflicts and then run \"git am --continue\")"
+msgstr "  (çakışmaları onar ve ardından \"git am --continue\" çalıştır)"
+
+msgid "  (use \"git am --skip\" to skip this patch)"
+msgstr "  (bu yamayı atlamak için \"git am --skip\" kullanın"
+
+msgid ""
+"  (use \"git am --allow-empty\" to record this patch as an empty commit)"
+msgstr ""
+"  (yamayı boş işleme kaydı olarak yazmak için \"git am --allow-empty\" "
+"kullanın)"
+
+msgid "  (use \"git am --abort\" to restore the original branch)"
+msgstr "  (ilk dalı eski durumuna getirmek için \"git am --abort\" kullanın)"
+
+msgid "git-rebase-todo is missing."
+msgstr "git-rebase-todo eksik."
+
+msgid "No commands done."
+msgstr "Yerine getirilen bir komut yok."
+
+#, c-format
+msgid "Last command done (%<PRIuMAX> command done):"
+msgid_plural "Last commands done (%<PRIuMAX> commands done):"
+msgstr[0] "Son yerine getirilen komut (%<PRIuMAX> komut yapıldı):"
+msgstr[1] "Son yerine getirilen komutlar (%<PRIuMAX> komut yapıldı):"
+
+#, c-format
+msgid "  (see more in file %s)"
+msgstr "  (ek bilgi için %s dosyasına bakın)"
+
+msgid "No commands remaining."
+msgstr "Kalan komut yok."
+
+#, c-format
+msgid "Next command to do (%<PRIuMAX> remaining command):"
+msgid_plural "Next commands to do (%<PRIuMAX> remaining commands):"
+msgstr[0] "Sıradaki yerine getirilecek komut (%<PRIuMAX> kalan komut):"
+msgstr[1] "Sıradaki yerine getirilecek komutlar (%<PRIuMAX> kalan komut):"
+
+msgid "  (use \"git rebase --edit-todo\" to view and edit)"
+msgstr "  (görüntüleme ve düzenleme için \"git rebase --edit-todo\" kullanın)"
+
+#, c-format
+msgid "You are currently rebasing branch '%s' on '%s'."
+msgstr "Şu anda '%s' dalını '%s' üzerine yeniden temellendiriyorsunuz."
+
+msgid "You are currently rebasing."
+msgstr "Şu anda yeniden temellendirme yapmaktasınız."
+
+msgid "  (fix conflicts and then run \"git rebase --continue\")"
+msgstr "  (çakışmaları çözün ve ardından \"git rebase --continue\" çalıştır)"
+
+msgid "  (use \"git rebase --skip\" to skip this patch)"
+msgstr "  (bu yamayı atlamak için \"git rebase --skip\" kullanın)"
+
+msgid "  (use \"git rebase --abort\" to check out the original branch)"
+msgstr "  (ilk dalı çıkış yapmak için \"git rebase --abort\" kullanın)"
+
+msgid "  (all conflicts fixed: run \"git rebase --continue\")"
+msgstr "  (tüm çakışmalar onarıldı: \"git rebase --continue\" çalıştır)"
+
+#, c-format
+msgid ""
+"You are currently splitting a commit while rebasing branch '%s' on '%s'."
+msgstr ""
+"Şu anda '%s' dalını '%s' üzerine yeniden temellendirirken bir işlemeyi "
+"parçalara bölüyorsunuz."
+
+msgid "You are currently splitting a commit during a rebase."
+msgstr ""
+"Şu anda yeniden temellendirme sırasında bir işlemeyi parçalara bölüyorsunuz."
+
+msgid "  (Once your working directory is clean, run \"git rebase --continue\")"
+msgstr ""
+"  (Çalışma dizininiz temizlendiğinde \"git rebase --continue\" çalıştır)"
+
+#, c-format
+msgid "You are currently editing a commit while rebasing branch '%s' on '%s'."
+msgstr ""
+"Şu anda '%s' dalını '%s' üzerine yeniden temellendirirken bir işlemeyi "
+"düzenliyorsunuz."
+
+msgid "You are currently editing a commit during a rebase."
+msgstr "Şu anda yeniden temellendirme sırasında bir işlemeyi düzenliyorsunuz."
+
+msgid "  (use \"git commit --amend\" to amend the current commit)"
+msgstr "  (geçerli işlemeyi değiştirmek için \"git commit --amend\" kullanın)"
+
+msgid ""
+"  (use \"git rebase --continue\" once you are satisfied with your changes)"
+msgstr ""
+"  (değişikliklerinizden memnunsanız \"git rebase --continue\" kullanın)"
+
+msgid "Cherry-pick currently in progress."
+msgstr "Seç-al şu anda sürmekte."
+
+#, c-format
+msgid "You are currently cherry-picking commit %s."
+msgstr "Şu anda %s işlemesini seç-al yapıyorsunuz."
+
+msgid "  (fix conflicts and run \"git cherry-pick --continue\")"
+msgstr "  (çakışmaları onar ve \"git cherry-pick --continue\" çalıştır)"
+
+msgid "  (run \"git cherry-pick --continue\" to continue)"
+msgstr "  (sürdürmek için \"git cherry-pick --continue\" çalıştır)"
+
+msgid "  (all conflicts fixed: run \"git cherry-pick --continue\")"
+msgstr "  (tüm çakışmalar onarıldı: \"git cherry-pick --continue\" çalıştır)"
+
+msgid "  (use \"git cherry-pick --skip\" to skip this patch)"
+msgstr "  (bu yamayı atlamak için \"git cherry-pick --skip\" kullanın)"
+
+msgid "  (use \"git cherry-pick --abort\" to cancel the cherry-pick operation)"
+msgstr "  (seç-al işlemini iptal için \"git cherry-pick --abort\" kullanın)"
+
+msgid "Revert currently in progress."
+msgstr "Geriye al şu anda sürmekte."
+
+#, c-format
+msgid "You are currently reverting commit %s."
+msgstr "Şu anda %s işlemesini geri alıyorsunuz."
+
+msgid "  (fix conflicts and run \"git revert --continue\")"
+msgstr "  (çakışmaları onar ve \"git revert --continue\" çalıştır)"
+
+msgid "  (run \"git revert --continue\" to continue)"
+msgstr "  (sürdürmek için \"git revert --continue\" çalıştır)"
+
+msgid "  (all conflicts fixed: run \"git revert --continue\")"
+msgstr "  (tüm çakışmalar onarıldı: \"git revert --continue\" çalıştır)"
+
+msgid "  (use \"git revert --skip\" to skip this patch)"
+msgstr "  (bu yamayı atlamak için \"git revert --skip\" kullanın)"
+
+msgid "  (use \"git revert --abort\" to cancel the revert operation)"
+msgstr "  (geri al işlemini iptal için \"git revert --abort\" kullanın)"
+
+#, c-format
+msgid "You are currently bisecting, started from branch '%s'."
+msgstr "Şu anda ikili arama yapıyorsunuz, '%s' dalından başlandı."
+
+msgid "You are currently bisecting."
+msgstr "Şu anda ikili arama yapıyorsunuz."
+
+msgid "  (use \"git bisect reset\" to get back to the original branch)"
+msgstr "  (ilk dala dönmek için \"git bisect reset\" kullanın)"
+
+msgid "You are in a sparse checkout."
+msgstr "Bir aralıklı çıkış içindesiniz."
+
+#, c-format
+msgid "You are in a sparse checkout with %d%% of tracked files present."
+msgstr "İzlenen dosyaların %%%d mevcut olduğu aralıklı bir çıkıştasınız."
+
+msgid "On branch "
+msgstr "Üzerinde bulunulan dal: "
+
+msgid "interactive rebase in progress; onto "
+msgstr "şunun üzerine etkileşimli yeniden temellendirme sürmekte: "
+
+msgid "rebase in progress; onto "
+msgstr "şunun üzerine yeniden temellendirme sürmekte: "
+
+msgid "HEAD detached at "
+msgstr "HEAD şurada ayrıldı: "
+
+msgid "HEAD detached from "
+msgstr "HEAD şundan ayrıldı: "
+
+msgid "Not currently on any branch."
+msgstr "Şu anda bir dal üzerinde değil."
+
+msgid "Initial commit"
+msgstr "İlk işleme"
+
+msgid "No commits yet"
+msgstr "Henüz bir işleme yok"
+
+msgid "Untracked files"
+msgstr "İzlenmeyen dosyalar"
+
+msgid "Ignored files"
+msgstr "Yok sayılan dosyalar"
+
+#, c-format
+msgid ""
+"It took %.2f seconds to enumerate untracked files. 'status -uno'\n"
+"may speed it up, but you have to be careful not to forget to add\n"
+"new files yourself (see 'git help status')."
+msgstr ""
+"İzlenmeyen dosyaların ortaya dökülmesi %.2f saniye sürdü. 'status -uno'\n"
+"bunu hızlandırabilir; ancak yeni dosyaları eklemeyi unutmamanız\n"
+"konusunda dikkatli olmalısınız (ek bilgi için 'git help status')."
+
+#, c-format
+msgid "Untracked files not listed%s"
+msgstr "İzlenmeyen dosyalar listelenmiyor%s"
+
+msgid " (use -u option to show untracked files)"
+msgstr " (izlenmeyen dosyaları göstermek için -u seçeneğini kullanın)"
+
+msgid "No changes"
+msgstr "Değişiklik yok"
+
+#, c-format
+msgid "no changes added to commit (use \"git add\" and/or \"git commit -a\")\n"
+msgstr ""
+"İşlemeye eklenen değişiklik yok (\"git add\" ve/veya \"git commit -a\" "
+"kullanın)\n"
+
+#, c-format
+msgid "no changes added to commit\n"
+msgstr "İşlemeye eklenen değişiklik yok\n"
+
+#, c-format
+msgid ""
+"nothing added to commit but untracked files present (use \"git add\" to "
+"track)\n"
+msgstr ""
+"işlemeye bir şey eklenmedi; ancak izlenmeyen dosyalar var (izlemek için "
+"\"git add\" kullanın)\n"
+
+#, c-format
+msgid "nothing added to commit but untracked files present\n"
+msgstr "işlemeye bir şey eklenmedi; ancak izlenmeyen dosyalar var\n"
+
+#, c-format
+msgid "nothing to commit (create/copy files and use \"git add\" to track)\n"
+msgstr ""
+"İşlenecek bir şey yok (dosyalar oluşturun/kopyalayın ve izlemek için \"git "
+"add\" kullanın)\n"
+
+#, c-format
+msgid "nothing to commit\n"
+msgstr "İşlenecek bir şey yok\n"
+
+#, c-format
+msgid "nothing to commit (use -u to show untracked files)\n"
+msgstr ""
+"İşlenecek bir şey yok (izlenmeyen dosyaları göstermek için -u kullanın)\n"
+
+#, c-format
+msgid "nothing to commit, working tree clean\n"
+msgstr "İşlenecek bir şey yok, çalışma ağacı temiz\n"
+
+msgid "No commits yet on "
+msgstr "Şurada henüz bir işleme yok: "
+
+msgid "HEAD (no branch)"
+msgstr "HEAD (dal yok)"
+
+msgid "different"
+msgstr "değişik"
+
+msgid "behind "
+msgstr "şunun arkasında: "
+
+msgid "ahead "
+msgstr "şunun önünde: "
+
+#. TRANSLATORS: the action is e.g. "pull with rebase"
+#, c-format
+msgid "cannot %s: You have unstaged changes."
+msgstr "%s yapılamıyor: Hazırlanmamış değişiklikleriniz var."
+
+msgid "additionally, your index contains uncommitted changes."
+msgstr "Ek olarak, indeksiniz işlenmemiş değişiklikler içeriyor."
+
+#, c-format
+msgid "cannot %s: Your index contains uncommitted changes."
+msgstr "%s yapılamıyor: İndeksiniz işlenmemiş değişiklikler içeriyor."
+
 msgid ""
 "Error: Your local changes to the following files would be overwritten by "
 "merge"
@@ -26114,93 +21090,74 @@ msgstr ""
 "Hata: Birleştirme ile aşağıdaki dosyalara olan değişikliklerin üzerine "
 "yazılacak"
 
-#: git-merge-octopus.sh:61
 msgid "Automated merge did not work."
 msgstr "Otomatikleştirilmiş birleştirme işe yaramadı."
 
-#: git-merge-octopus.sh:62
 msgid "Should not be doing an octopus."
 msgstr "Bir ahtapot birleştirmesi yapılmamalı."
 
-#: git-merge-octopus.sh:73
 #, sh-format
 msgid "Unable to find common commit with $pretty_name"
 msgstr "$pretty_name ile olan ortak işleme bulunamıyor"
 
-#: git-merge-octopus.sh:77
 #, sh-format
 msgid "Already up to date with $pretty_name"
 msgstr "$pretty_name ile her şey güncel"
 
-#: git-merge-octopus.sh:89
 #, sh-format
 msgid "Fast-forwarding to: $pretty_name"
 msgstr "İleri sarma konumu: $pretty_name"
 
-#: git-merge-octopus.sh:97
 #, sh-format
 msgid "Trying simple merge with $pretty_name"
 msgstr "$pretty_name ile yalın birleştirme deneniyor"
 
-#: git-merge-octopus.sh:102
 msgid "Simple merge did not work, trying automatic merge."
 msgstr "Yalın birleştirme işe yaramadı, otomatik birleştirme deneniyor."
 
-#: git-sh-setup.sh:89 git-sh-setup.sh:94
 #, sh-format
 msgid "usage: $dashless $USAGE"
 msgstr "kullanım: $dashless $USAGE"
 
-#: git-sh-setup.sh:182
 #, sh-format
 msgid "Cannot chdir to $cdup, the toplevel of the working tree"
 msgstr "$cdup konumuna chdir yapılamıyor, çalışma ağacının en üst düzeyi"
 
-#: git-sh-setup.sh:191 git-sh-setup.sh:198
 #, sh-format
 msgid "fatal: $program_name cannot be used without a working tree."
 msgstr "onulmaz: $program_name bir çalışma ağacı olmadan kullanılamaz."
 
-#: git-sh-setup.sh:212
 msgid "Cannot rewrite branches: You have unstaged changes."
 msgstr "Dallar yeniden yazılamıyor: Hazırlanmamış değişiklikleriniz var."
 
-#: git-sh-setup.sh:215
 #, sh-format
 msgid "Cannot $action: You have unstaged changes."
 msgstr "$action yapılamıyor: Hazırlanmamış değişiklikleriniz var."
 
-#: git-sh-setup.sh:226
 #, 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:228
 msgid "Additionally, your index contains uncommitted changes."
 msgstr "Ek olarak, indeksinizde işlenmemiş değişiklikleriniz var."
 
-#: git-sh-setup.sh:348
 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:353
 msgid "Unable to determine absolute path of git directory"
 msgstr "Git dizininin kesin yolu algılanamıyor"
 
 #. TRANSLATORS: you can adjust this to align "git add -i" status menu
-#: git-add--interactive.perl:212
 #, perl-format
 msgid "%12s %12s %s"
 msgstr "%12s %12s %s"
 
-#: git-add--interactive.perl:632
 #, perl-format
 msgid "touched %d path\n"
 msgid_plural "touched %d paths\n"
 msgstr[0] "%d yola dokunuldu\n"
 msgstr[1] "%d yola dokunuldu\n"
 
-#: git-add--interactive.perl:1056
 msgid ""
 "If the patch applies cleanly, the edited hunk will immediately be\n"
 "marked for staging."
@@ -26208,7 +21165,6 @@ msgstr ""
 "Eğer yama sorunsuzca uygulanırsa düzenlenen parça derhal hazırlama\n"
 "için imlenecektir."
 
-#: git-add--interactive.perl:1059
 msgid ""
 "If the patch applies cleanly, the edited hunk will immediately be\n"
 "marked for stashing."
@@ -26216,7 +21172,6 @@ msgstr ""
 "Eğer yama sorunsuzca uygulanırsa düzenlenen parça derhal zulalama\n"
 "için imlenecektir."
 
-#: git-add--interactive.perl:1062
 msgid ""
 "If the patch applies cleanly, the edited hunk will immediately be\n"
 "marked for unstaging."
@@ -26224,8 +21179,6 @@ msgstr ""
 "Eğer yama sorunsuzca uygulanırsa, düzenlenen parça derhal hazırlıktan\n"
 "çıkarılma için imlenecektir."
 
-#: git-add--interactive.perl:1065 git-add--interactive.perl:1074
-#: git-add--interactive.perl:1080
 msgid ""
 "If the patch applies cleanly, the edited hunk will immediately be\n"
 "marked for applying."
@@ -26233,8 +21186,6 @@ msgstr ""
 "Eğer yama sorunsuzca uygulanırsa düzenlenen parça derhal uygulama\n"
 "için imlenecektir."
 
-#: git-add--interactive.perl:1068 git-add--interactive.perl:1071
-#: git-add--interactive.perl:1077
 msgid ""
 "If the patch applies cleanly, the edited hunk will immediately be\n"
 "marked for discarding."
@@ -26242,12 +21193,10 @@ msgstr ""
 "Eğer yama sorunsuzca uygulanırsa düzenlenen parça derhal ıskartaya\n"
 "çıkarım için imlenecektir."
 
-#: git-add--interactive.perl:1114
 #, perl-format
 msgid "failed to open hunk edit file for writing: %s"
 msgstr "parça düzenleme dosyası yazım için açılamadı: %s"
 
-#: git-add--interactive.perl:1121
 #, perl-format
 msgid ""
 "---\n"
@@ -26260,12 +21209,10 @@ msgstr ""
 "'%s' satır kaldırmak için onları silin.\n"
 "%s ile başlayan satırlar kaldırılacaktır.\n"
 
-#: git-add--interactive.perl:1143
 #, perl-format
 msgid "failed to open hunk edit file for reading: %s"
 msgstr "parça düzenleme dosyası okuma için açılamadı: %s"
 
-#: git-add--interactive.perl:1253
 msgid ""
 "y - stage this hunk\n"
 "n - do not stage this hunk\n"
@@ -26279,7 +21226,6 @@ msgstr ""
 "a - bu parçayı ve sonraki tüm parçaları hazırla\n"
 "d - bu parçayı veya sonraki parçalardan herhangi birini hazırlama"
 
-#: git-add--interactive.perl:1259
 msgid ""
 "y - stash this hunk\n"
 "n - do not stash this hunk\n"
@@ -26293,7 +21239,6 @@ msgstr ""
 "a - bu parçayı ve sonraki tüm parçaları zulala\n"
 "d - bu parçayı veya sonraki parçalardan herhangi birini zulalama"
 
-#: git-add--interactive.perl:1265
 msgid ""
 "y - unstage this hunk\n"
 "n - do not unstage this hunk\n"
@@ -26307,7 +21252,6 @@ msgstr ""
 "a - bu parçayı ve sonraki tüm parçaları hazırlıktan çıkar\n"
 "d - bu parçayı veya sonraki parçalardan herhangi birini hazırlıktan çıkarma"
 
-#: git-add--interactive.perl:1271
 msgid ""
 "y - apply this hunk to index\n"
 "n - do not apply this hunk to index\n"
@@ -26321,7 +21265,6 @@ msgstr ""
 "a - bu parçayı ve sonraki tüm parçaları uygula\n"
 "d - bu parçayı veya sonraki parçalardan herhangi birini uygulama"
 
-#: git-add--interactive.perl:1277 git-add--interactive.perl:1295
 msgid ""
 "y - discard this hunk from worktree\n"
 "n - do not discard this hunk from worktree\n"
@@ -26335,7 +21278,6 @@ msgstr ""
 "a - bu parçayı ve sonraki tüm parçaları at\n"
 "d - bu parçayı veya sonraki parçalardan herhangi birini atma"
 
-#: git-add--interactive.perl:1283
 msgid ""
 "y - discard this hunk from index and worktree\n"
 "n - do not discard this hunk from index and worktree\n"
@@ -26349,7 +21291,6 @@ msgstr ""
 "a - bu parçayı ve sonraki tüm parçaları at\n"
 "d - bu parçayı veya sonraki parçalardan herhangi birini atma"
 
-#: git-add--interactive.perl:1289
 msgid ""
 "y - apply this hunk to index and worktree\n"
 "n - do not apply this hunk to index and worktree\n"
@@ -26363,7 +21304,6 @@ msgstr ""
 "a - bu parçayı ve sonraki tüm parçaları uygula\n"
 "d - bu parçayı veya sonraki parçalardan herhangi birini uygulama"
 
-#: git-add--interactive.perl:1301
 msgid ""
 "y - apply this hunk to worktree\n"
 "n - do not apply this hunk to worktree\n"
@@ -26377,7 +21317,6 @@ msgstr ""
 "a - bu parçayı ve sonraki tüm parçaları uygula\n"
 "d - bu parçayı veya sonraki parçalardan herhangi birini uygulama"
 
-#: git-add--interactive.perl:1316
 msgid ""
 "g - select a hunk to go to\n"
 "/ - search for a hunk matching the given regex\n"
@@ -26399,90 +21338,72 @@ msgstr ""
 "e - geçerli parçayı el ile düzenle\n"
 "? - yardımı yazdır\n"
 
-#: git-add--interactive.perl:1347
 msgid "The selected hunks do not apply to the index!\n"
 msgstr "Seçili parçalar indekse uygulanamıyor!\n"
 
-#: git-add--interactive.perl:1362
 #, perl-format
 msgid "ignoring unmerged: %s\n"
 msgstr "birleştirilmeyenler yok sayılıyor: %s\n"
 
-#: git-add--interactive.perl:1481
 #, perl-format
 msgid "Apply mode change to worktree [y,n,q,a,d%s,?]? "
 msgstr "Kip değişimi çalışma ağacına uygulansın mı [y,n,q,a,d%s,?]? "
 
-#: git-add--interactive.perl:1482
 #, perl-format
 msgid "Apply deletion to worktree [y,n,q,a,d%s,?]? "
 msgstr "Silme çalışma ağacına uygulansın mı [y,n,q,a,d%s,?]? "
 
-#: git-add--interactive.perl:1483
 #, perl-format
 msgid "Apply addition to worktree [y,n,q,a,d%s,?]? "
 msgstr "Ekleme çalışma ağacına uygulansın mı [y,n,q,a,d%s,?]? "
 
-#: git-add--interactive.perl:1484
 #, perl-format
 msgid "Apply this hunk to worktree [y,n,q,a,d%s,?]? "
 msgstr "Bu parça çalışma ağacına uygulansın mı [y,n,q,a,d%s,?]? "
 
-#: git-add--interactive.perl:1601
 msgid "No other hunks to goto\n"
 msgstr "Gidilecek başka parça yok\n"
 
-#: git-add--interactive.perl:1619
 #, perl-format
 msgid "Invalid number: '%s'\n"
 msgstr "Geçersiz sayı: '%s'\n"
 
-#: git-add--interactive.perl:1624
 #, perl-format
 msgid "Sorry, only %d hunk available.\n"
 msgid_plural "Sorry, only %d hunks available.\n"
 msgstr[0] "Üzgünüm, yalnızca %d parça kullanılabilir.\n"
 msgstr[1] "Üzgünüm, yalnızca %d parça kullanılabilir.\n"
 
-#: git-add--interactive.perl:1659
 msgid "No other hunks to search\n"
 msgstr "Aranacak başka parça yok\n"
 
-#: git-add--interactive.perl:1676
 #, perl-format
 msgid "Malformed search regexp %s: %s\n"
 msgstr "Hatalı oluşturulmuş arama düzenli ifadesi %s: %s\n"
 
-#: git-add--interactive.perl:1686
 msgid "No hunk matches the given pattern\n"
 msgstr "Verilen dizgi ile hiçbir parça eşleşmiyor\n"
 
-#: git-add--interactive.perl:1698 git-add--interactive.perl:1720
 msgid "No previous hunk\n"
 msgstr "Öncesinde parça yok\n"
 
-#: git-add--interactive.perl:1707 git-add--interactive.perl:1726
 msgid "No next hunk\n"
 msgstr "Sonrasında parça yok\n"
 
-#: git-add--interactive.perl:1732
 msgid "Sorry, cannot split this hunk\n"
 msgstr "Üzgünüm, bu parça bölünemiyor\n"
 
-#: git-add--interactive.perl:1738
 #, perl-format
 msgid "Split into %d hunk.\n"
 msgid_plural "Split into %d hunks.\n"
 msgstr[0] "%d parçaya bölündü.\n"
 msgstr[1] "%d parçaya bölündü.\n"
 
-#: git-add--interactive.perl:1748
 msgid "Sorry, cannot edit this hunk\n"
 msgstr "Üzgünüm, bu parça düzenlenemiyor\n"
 
 #. TRANSLATORS: please do not translate the command names
 #. 'status', 'update', 'revert', etc.
-#: git-add--interactive.perl:1813
 msgid ""
 "status        - show paths with changes\n"
 "update        - add working tree state to the staged set of changes\n"
@@ -26500,56 +21421,42 @@ msgstr ""
 "add untracked - izlenmeyen dosyaların içeriğini hazırlanan değişiklik setine "
 "ekle\n"
 
-#: git-add--interactive.perl:1830 git-add--interactive.perl:1842
-#: git-add--interactive.perl:1845 git-add--interactive.perl:1852
-#: git-add--interactive.perl:1855 git-add--interactive.perl:1862
-#: git-add--interactive.perl:1866 git-add--interactive.perl:1872
 msgid "missing --"
 msgstr "-- eksik"
 
-#: git-add--interactive.perl:1868
 #, perl-format
 msgid "unknown --patch mode: %s"
 msgstr "bilinmeyen --patch kipi: %s"
 
-#: git-add--interactive.perl:1874 git-add--interactive.perl:1880
 #, perl-format
 msgid "invalid argument %s, expecting --"
 msgstr "geçersiz argüman %s, -- bekleniyor"
 
-#: git-send-email.perl:159
 msgid "local zone differs from GMT by a non-minute interval\n"
 msgstr "yerel dilim GMT'den bir dakikadan az bir aralıkla ayrımlı\n"
 
-#: git-send-email.perl:166 git-send-email.perl:172
 msgid "local time offset greater than or equal to 24 hours\n"
 msgstr "yerel saat ofseti 24 saate eşit veya daha büyük\n"
 
-#: git-send-email.perl:244
 #, perl-format
 msgid "fatal: command '%s' died with exit code %d"
 msgstr "onulmaz: '%s' komutu %d çıkış koduyla sonlandı"
 
-#: git-send-email.perl:257
 msgid "the editor exited uncleanly, aborting everything"
 msgstr "düzenleyici düzgünce çıkmadı, her şey iptal ediliyor"
 
-#: git-send-email.perl:346
 #, perl-format
 msgid ""
 "'%s' contains an intermediate version of the email you were composing.\n"
 msgstr "'%s' yazmakta olduğunuz e-postanın orta düzey bir sürümünü içeriyor.\n"
 
-#: git-send-email.perl:351
 #, perl-format
 msgid "'%s.final' contains the composed email.\n"
 msgstr "'%s.final' yazılan e-postayı içeriyor.\n"
 
-#: git-send-email.perl:484
 msgid "--dump-aliases incompatible with other options\n"
 msgstr "--dump-aliases diğer seçeneklerle uyumsuz\n"
 
-#: git-send-email.perl:561
 msgid ""
 "fatal: found configuration options for 'sendmail'\n"
 "git-send-email is configured with the sendemail.* options - note the 'e'.\n"
@@ -26560,11 +21467,9 @@ msgstr ""
 "'e'ye dikkat edin. sendemail.forbidSendmailVariables seçeneğini\n"
 "'false' yaparak bu denetimi devre dışı bırakabilirsiniz.\n"
 
-#: git-send-email.perl:566 git-send-email.perl:782
 msgid "Cannot run git format-patch from outside a repository\n"
 msgstr "'git format-patch' bir deponun dışından çalıştırılamıyor\n"
 
-#: git-send-email.perl:569
 msgid ""
 "`batch-size` and `relogin` must be specified together (via command-line or "
 "configuration option)\n"
@@ -26572,37 +21477,30 @@ msgstr ""
 "'batch-size' ve 'relogin' birlikte belirtilmeli (komut satırı veya "
 "yapılandırma seçeneklerinden)\n"
 
-#: git-send-email.perl:582
 #, perl-format
 msgid "Unknown --suppress-cc field: '%s'\n"
 msgstr "Bilinmeyen --suppress-cc alanı: '%s'\n"
 
-#: git-send-email.perl:613
 #, perl-format
 msgid "Unknown --confirm setting: '%s'\n"
 msgstr "Bilinmeyen --confirm ayarı: '%s'\n"
 
-#: git-send-email.perl:653
 #, perl-format
 msgid "warning: sendmail alias with quotes is not supported: %s\n"
 msgstr "uyarı: tırnak içine alınmış sendmail arması desteklenmiyor: %s\n"
 
-#: git-send-email.perl:655
 #, perl-format
 msgid "warning: `:include:` not supported: %s\n"
 msgstr "uyarı: ':include:' desteklenmiyor: %s\n"
 
-#: git-send-email.perl:657
 #, perl-format
 msgid "warning: `/file` or `|pipe` redirection not supported: %s\n"
 msgstr "uyarı: '/file' veya '|pipe' yeniden yönlendirmesi desteklenmiyor: %s\n"
 
-#: git-send-email.perl:662
 #, perl-format
 msgid "warning: sendmail line is not recognized: %s\n"
 msgstr "uyarı: sendmail satırı tanımlanamadı: %s\n"
 
-#: git-send-email.perl:747
 #, perl-format
 msgid ""
 "File '%s' exists but it could also be the range of commits\n"
@@ -26617,12 +21515,10 @@ msgstr ""
 "\t* Bir dosya demek istiyorsanız \"./%s\" diyerek veya\n"
 "\t* Bir erim demek istiyorsanız --format-patch seçeneğini vererek\n"
 
-#: git-send-email.perl:768
 #, perl-format
 msgid "Failed to opendir %s: %s"
 msgstr "%s opendir yapılamadı: %s"
 
-#: git-send-email.perl:803
 msgid ""
 "\n"
 "No patch files specified!\n"
@@ -26632,17 +21528,14 @@ msgstr ""
 "Hiçbir yama dosyası belirtilmedi!\n"
 "\n"
 
-#: git-send-email.perl:816
 #, perl-format
 msgid "No subject line in %s?"
 msgstr "%s içinde konu satırı yok mu?"
 
-#: git-send-email.perl:827
 #, perl-format
 msgid "Failed to open for writing %s: %s"
 msgstr "%s yazma için açılamadı: %s"
 
-#: git-send-email.perl:838
 msgid ""
 "Lines beginning in \"GIT:\" will be removed.\n"
 "Consider including an overall diffstat or table of contents\n"
@@ -26656,38 +21549,31 @@ msgstr ""
 "\n"
 "Bir özet göndermek istemiyorsanız gövde kısmını temizleyin.\n"
 
-#: git-send-email.perl:862
 #, perl-format
 msgid "Failed to open %s: %s"
 msgstr "%s açılamadı: %s"
 
-#: git-send-email.perl:879
 #, perl-format
 msgid "Failed to open %s.final: %s"
 msgstr "%s.final açılamadı: %s"
 
-#: git-send-email.perl:922
 msgid "Summary email is empty, skipping it\n"
 msgstr "Özet e-postası boş, atlanıyor\n"
 
 #. TRANSLATORS: please keep [y/N] as is.
-#: git-send-email.perl:971
 #, perl-format
 msgid "Are you sure you want to use <%s> [y/N]? "
 msgstr "<%s> kullanmak istediğinizden emin misiniz [y/N]? "
 
-#: git-send-email.perl:1026
 msgid ""
 "The following files are 8bit, but do not declare a Content-Transfer-"
 "Encoding.\n"
 msgstr ""
 "Aşağıdaki dosyalar 8 bit; ancak Content-Transfer-Encoding desteklemiyorlar.\n"
 
-#: git-send-email.perl:1031
 msgid "Which 8bit encoding should I declare [UTF-8]? "
 msgstr "Hangi 8 bit kodlamayı beyan etmeliyim [UTF-8]? "
 
-#: git-send-email.perl:1039
 #, perl-format
 msgid ""
 "Refusing to send because the patch\n"
@@ -26700,22 +21586,18 @@ msgstr ""
 "içinde '*** SUBJECT HERE ***' konu şablonu var. Yine de göndermek "
 "istiyorsanız --force kullanın.\n"
 
-#: git-send-email.perl:1058
 msgid "To whom should the emails be sent (if anyone)?"
 msgstr "E-postalar kime gönderilmeli (eğer gerekliyse)?"
 
-#: git-send-email.perl:1076
 #, perl-format
 msgid "fatal: alias '%s' expands to itself\n"
 msgstr "onulmaz: '%s' arması kendisine genişliyor\n"
 
-#: git-send-email.perl:1088
 msgid "Message-ID to be used as In-Reply-To for the first email (if any)? "
 msgstr ""
 "İlk e-posta için Message-ID, In-Reply-To olarak kullanılsın mı (eğer "
 "gerekliyse)? "
 
-#: git-send-email.perl:1150 git-send-email.perl:1158
 #, perl-format
 msgid "error: unable to extract a valid address from: %s\n"
 msgstr "hata: şuradan geçerli bir adres çıkartılamadı: %s\n"
@@ -26723,16 +21605,13 @@ msgstr "hata: şuradan geçerli bir adres çıkartılamadı: %s\n"
 #. 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:1162
 msgid "What to do with this address? ([q]uit|[d]rop|[e]dit): "
 msgstr "Bu adresle ne yapılsın? ([q] çık|[d] bırak|düz[e]nle): "
 
-#: git-send-email.perl:1482
 #, perl-format
 msgid "CA path \"%s\" does not exist"
 msgstr "CA yolu \"%s\" mevcut değil"
 
-#: git-send-email.perl:1565
 msgid ""
 "    The Cc list above has been expanded by additional\n"
 "    addresses found in the patch commit message. By default\n"
@@ -26758,115 +21637,91 @@ msgstr ""
 #. 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:1580
 msgid "Send this email? ([y]es|[n]o|[e]dit|[q]uit|[a]ll): "
 msgstr ""
 "Bu e-posta gönderilsin mi? ([y] evet|[n] hayır|düz[e]nle|[q] çık|[a] tümü): "
 
-#: git-send-email.perl:1583
 msgid "Send this email reply required"
 msgstr "Bu e-postayı yanıt gerektirme seçeneğiyle gönder"
 
-#: git-send-email.perl:1617
 msgid "The required SMTP server is not properly defined."
 msgstr "Gerekli SMTP sunucusu düzgünce tanımlanmamış."
 
-#: git-send-email.perl:1664
 #, perl-format
 msgid "Server does not support STARTTLS! %s"
 msgstr "Sunucu STARTTLS desteklemiyor! %s"
 
-#: git-send-email.perl:1669 git-send-email.perl:1673
 #, perl-format
 msgid "STARTTLS failed! %s"
 msgstr "STARTTLS başarısız oldu! %s"
 
-#: git-send-email.perl:1682
 msgid "Unable to initialize SMTP properly. Check config and use --smtp-debug."
 msgstr ""
 "SMTP düzgünce başlatılamıyor. Yapılandırmayı denetleyin ve --smtp-debug "
 "yapın."
 
-#: git-send-email.perl:1700
 #, perl-format
 msgid "Failed to send %s\n"
 msgstr "%s gönderilemedi\n"
 
-#: git-send-email.perl:1703
 #, perl-format
 msgid "Dry-Sent %s\n"
 msgstr "%s gönderilir gibi yapıldı\n"
 
-#: git-send-email.perl:1703
 #, perl-format
 msgid "Sent %s\n"
 msgstr "%s gönderildi\n"
 
-#: git-send-email.perl:1705
 msgid "Dry-OK. Log says:\n"
 msgstr "Sınama tamam. Günlük çıktısı:\n"
 
-#: git-send-email.perl:1705
 msgid "OK. Log says:\n"
 msgstr "Tamam. Günlük çıktısı:\n"
 
-#: git-send-email.perl:1724
 msgid "Result: "
 msgstr "Sonuç: "
 
-#: git-send-email.perl:1727
 msgid "Result: OK\n"
 msgstr "Sonuç: Tamam\n"
 
-#: git-send-email.perl:1744
 #, perl-format
 msgid "can't open file %s"
 msgstr "%s dosyası açılamıyor"
 
-#: git-send-email.perl:1792 git-send-email.perl:1812
 #, perl-format
 msgid "(mbox) Adding cc: %s from line '%s'\n"
 msgstr "(mbox) Cc: %s, '%s' satırından ekleniyor\n"
 
-#: git-send-email.perl:1798
 #, perl-format
 msgid "(mbox) Adding to: %s from line '%s'\n"
 msgstr "(mbox) To: %s, '%s' satırından ekleniyor\n"
 
-#: git-send-email.perl:1855
 #, perl-format
 msgid "(non-mbox) Adding cc: %s from line '%s'\n"
 msgstr "(non-mbox) Cc: %s, '%s' satırından ekleniyor\n"
 
-#: git-send-email.perl:1890
 #, perl-format
 msgid "(body) Adding cc: %s from line '%s'\n"
 msgstr "(body) Cc: %s, '%s' satırından ekleniyor\n"
 
-#: git-send-email.perl:2009
 #, perl-format
 msgid "(%s) Could not execute '%s'"
 msgstr "(%s) '%s' çalıştırılamadı"
 
-#: git-send-email.perl:2016
 #, perl-format
 msgid "(%s) Adding %s: %s from: '%s'\n"
 msgstr "(%s) %s: %s, '%s' konumundan ekleniyor\n"
 
-#: git-send-email.perl:2020
 #, perl-format
 msgid "(%s) failed to close pipe to '%s'"
 msgstr "(%s) şuraya olan veri yolu kapatılamadı: '%s'"
 
-#: git-send-email.perl:2050
 msgid "cannot send message as 7bit"
 msgstr "ileti 7 bit olarak gönderilemiyor"
 
-#: git-send-email.perl:2058
 msgid "invalid transfer encoding"
 msgstr "geçersiz aktarım kodlaması"
 
-#: git-send-email.perl:2100
 #, perl-format
 msgid ""
 "fatal: %s: rejected by %s hook\n"
@@ -26877,12 +21732,10 @@ msgstr ""
 "%s\n"
 "uyarı: hiçbir yama gönderilmedi\n"
 
-#: git-send-email.perl:2110 git-send-email.perl:2163 git-send-email.perl:2173
 #, perl-format
 msgid "unable to open %s: %s\n"
 msgstr "%s açılamıyor: %s\n"
 
-#: git-send-email.perl:2113
 #, perl-format
 msgid ""
 "fatal: %s:%d is longer than 998 characters\n"
@@ -26891,13 +21744,11 @@ msgstr ""
 "onulmaz: %s:%d, 998 karakterden uzun\n"
 "uyarı: hiçbir yama gönderilmedi\n"
 
-#: git-send-email.perl:2131
 #, 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:2135
 #, perl-format
 msgid "Do you really want to send %s? [y|N]: "
 msgstr "%s ögesini gerçekten göndermek istiyor musunuz? [y|N]: "
diff --git a/po/vi.po b/po/vi.po
index 69c3b93154..d673745ac5 100644
--- a/po/vi.po
+++ b/po/vi.po
@@ -1,260 +1,199 @@
 # Vietnamese translation for GIT-CORE.
 # Bản dịch tiếng Việt dành cho GIT-CORE.
 # This file is distributed under the same license as the git-core package.
+# https://raw.githubusercontent.com/git-l10n/git-po/pot/main/po/git.pot
 # Nguyễn Thái Ngọc Duy <pclouds@gmail.com>, 2012.
-# Trần Ngọc Quân <vnwildman@gmail.com>, 2012-2022.
 # Đoàn Trần Công Danh <congdanhqx@gmail.com>, 2020.
+# Trần Ngọc Quân <vnwildman@gmail.com>, 2012-2022.
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: git v2.36.0 round 2\n"
+"Project-Id-Version: git v2.37.0\n"
 "Report-Msgid-Bugs-To: Git Mailing List <git@vger.kernel.org>\n"
-"POT-Creation-Date: 2022-04-13 14:52+0800\n"
-"PO-Revision-Date: 2022-04-14 15:34+0700\n"
+"POT-Creation-Date: 2022-06-21 20:20+0000\n"
+"PO-Revision-Date: 2022-06-25 08:37+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"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=1; plural=0;\n"
+"Plural-Forms: nplurals=1; plural=0\n"
 "X-Language-Team-Website: <http://translationproject.org/team/vi.html>\n"
-"X-Generator: Poedit 3.0.1\n"
+"X-Generator: Gtranslator 42.0\n"
 
-#: add-interactive.c:382
 #, c-format
 msgid "Huh (%s)?"
 msgstr "Hả (%s)?"
 
-#: add-interactive.c:535 add-interactive.c:836 reset.c:136 sequencer.c:3505
-#: sequencer.c:3970 sequencer.c:4127 builtin/rebase.c:1261
-#: builtin/rebase.c:1671
 msgid "could not read index"
 msgstr "không thể đọc bảng mục lục"
 
-#: add-interactive.c:590 git-add--interactive.perl:269
-#: git-add--interactive.perl:294
 msgid "binary"
 msgstr "nhị phân"
 
-#: add-interactive.c:648 git-add--interactive.perl:278
-#: git-add--interactive.perl:332
 msgid "nothing"
 msgstr "không có gì"
 
-#: add-interactive.c:649 git-add--interactive.perl:314
-#: git-add--interactive.perl:329
 msgid "unchanged"
 msgstr "không thay đổi"
 
-#: add-interactive.c:686 git-add--interactive.perl:641
 msgid "Update"
 msgstr "Cập nhật"
 
-#: add-interactive.c:703 add-interactive.c:891
 #, c-format
 msgid "could not stage '%s'"
 msgstr "không thể đưa “%s” lên bệ phóng"
 
-#: add-interactive.c:709 add-interactive.c:898 reset.c:160 sequencer.c:3709
 msgid "could not write index"
 msgstr "không thể ghi bảng mục lục"
 
-#: add-interactive.c:712 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:730 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:735 apply.c:4133 builtin/checkout.c:311
-#: builtin/reset.c:167
 #, 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:765 git-add--interactive.perl:653
 msgid "Revert"
 msgstr "Hoàn nguyên"
 
-#: add-interactive.c:781
 msgid "Could not parse HEAD^{tree}"
 msgstr "Không thể phân tích cú pháp HEAD^{tree}"
 
-#: add-interactive.c:819 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:870 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:874 git-add--interactive.perl:687
 msgid "Add untracked"
 msgstr "Thêm các cái chưa được theo dõi"
 
-#: add-interactive.c:901 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:931
 #, c-format
 msgid "ignoring unmerged: %s"
 msgstr "bỏ qua những thứ chưa hòa trộn: %s"
 
-#: add-interactive.c:943 add-patch.c:1758 git-add--interactive.perl:1371
 #, 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:945 add-patch.c:1756 git-add--interactive.perl:1373
 #, c-format
 msgid "No changes.\n"
 msgstr "Không có thay đổi nào.\n"
 
-#: add-interactive.c:949 git-add--interactive.perl:1381
 msgid "Patch update"
 msgstr "Cập nhật miếng vá"
 
-#: add-interactive.c:988 git-add--interactive.perl:1794
 msgid "Review diff"
 msgstr "Xem xét lại diff"
 
-#: add-interactive.c:1016
 msgid "show paths with changes"
 msgstr "hiển thị đường dẫn với các thay đổi"
 
-#: add-interactive.c:1018
 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:1020
 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:1022
 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:1024
 msgid "view diff between HEAD and index"
 msgstr "xem khác biệt giữa HEAD và mục lục"
 
-#: add-interactive.c:1026
 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:1034 add-interactive.c:1083
 msgid "Prompt help:"
 msgstr "Trợ giúp về nhắc:"
 
-#: add-interactive.c:1036
 msgid "select a single item"
 msgstr "chọn một mục đơn"
 
-#: add-interactive.c:1038
 msgid "select a range of items"
 msgstr "chọn một vùng các mục"
 
-#: add-interactive.c:1040
 msgid "select multiple ranges"
 msgstr "chọn nhiều vùng"
 
-#: add-interactive.c:1042 add-interactive.c:1087
 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:1044
 msgid "unselect specified items"
 msgstr "bỏ chọn các mục đã cho"
 
-#: add-interactive.c:1046
 msgid "choose all items"
 msgstr "chọn tất cả các mục"
 
-#: add-interactive.c:1048
 msgid "(empty) finish selecting"
 msgstr "(để trống) hoàn tất chọn lựa"
 
-#: add-interactive.c:1085
 msgid "select a numbered item"
 msgstr "tùy chọn mục bằng số"
 
-#: add-interactive.c:1089
 msgid "(empty) select nothing"
 msgstr "(để trống) không chọn gì"
 
-#: add-interactive.c:1097 builtin/clean.c:839 git-add--interactive.perl:1898
 msgid "*** Commands ***"
 msgstr "*** Lệnh ***"
 
-#: add-interactive.c:1098 builtin/clean.c:840 git-add--interactive.perl:1895
 msgid "What now"
 msgstr "Giờ thì sao"
 
-#: add-interactive.c:1150 git-add--interactive.perl:213
 msgid "staged"
 msgstr "đã đưa lên bệ phóng"
 
-#: add-interactive.c:1150 git-add--interactive.perl:213
 msgid "unstaged"
 msgstr "chưa đưa lên bệ phóng"
 
-#: add-interactive.c:1150 apply.c:5002 apply.c:5005 builtin/am.c:2370
-#: builtin/am.c:2373 builtin/bugreport.c:107 builtin/clone.c:132
-#: builtin/fetch.c:154 builtin/merge.c:287 builtin/pull.c:194
-#: builtin/submodule--helper.c:412 builtin/submodule--helper.c:1872
-#: builtin/submodule--helper.c:1875 builtin/submodule--helper.c:2709
-#: builtin/submodule--helper.c:2712 builtin/submodule--helper.c:2891
-#: git-add--interactive.perl:213
 msgid "path"
 msgstr "đường-dẫn"
 
-#: add-interactive.c:1157
 msgid "could not refresh index"
 msgstr "không thể đọc lại bảng mục lục"
 
-#: add-interactive.c:1171 builtin/clean.c:804 git-add--interactive.perl:1805
 #, c-format
 msgid "Bye.\n"
 msgstr "Tạm biệt.\n"
 
-#: add-patch.c:34 git-add--interactive.perl:1433
 #, c-format, perl-format
 msgid "Stage mode change [y,n,q,a,d%s,?]? "
 msgstr "Thay đổi chế độ bệ phóng [y,n,q,a,d%s,?]? "
 
-#: add-patch.c:35 git-add--interactive.perl:1434
 #, c-format, perl-format
 msgid "Stage deletion [y,n,q,a,d%s,?]? "
 msgstr "Xóa khỏi bệ phóng [y,n,q,a,d%s,?]? "
 
-#: add-patch.c:36 git-add--interactive.perl:1435
 #, c-format, perl-format
 msgid "Stage addition [y,n,q,a,d%s,?]? "
 msgstr "Thêm vào bệ phóng [y,n,q,a,d%s,?]? "
 
-#: add-patch.c:37 git-add--interactive.perl:1436
 #, c-format, perl-format
 msgid "Stage this hunk [y,n,q,a,d%s,?]? "
 msgstr "Đưa lên bệ phóng khúc này [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."
@@ -262,7 +201,6 @@ msgstr ""
 "Nếu miếng vá được áp dụng sạch sẽ, khúc đã sửa sẽ ngay lập tức được đánh dấu "
 "để chuyển lên bệ phóng."
 
-#: add-patch.c:42
 msgid ""
 "y - stage this hunk\n"
 "n - do not stage this hunk\n"
@@ -277,27 +215,22 @@ msgstr ""
 "d - đừng đưa lên bệ phóng khúc này cũng như bất kỳ cái nào còn lại trong tập "
 "tin\n"
 
-#: add-patch.c:56 git-add--interactive.perl:1439
 #, c-format, perl-format
 msgid "Stash mode change [y,n,q,a,d%s,?]? "
 msgstr "Thay đổi chế độ tạm cất đi [y,n,q,a,d%s,?]? "
 
-#: add-patch.c:57 git-add--interactive.perl:1440
 #, c-format, perl-format
 msgid "Stash deletion [y,n,q,a,d%s,?]? "
 msgstr "Xóa tạm cất [y,n,q,a,d%s,?]? "
 
-#: add-patch.c:58 git-add--interactive.perl:1441
 #, c-format, perl-format
 msgid "Stash addition [y,n,q,a,d%s,?]? "
 msgstr "Thêm vào tạm cất [y,n,q,a,d%s,?]? "
 
-#: add-patch.c:59 git-add--interactive.perl:1442
 #, c-format, perl-format
 msgid "Stash this hunk [y,n,q,a,d%s,?]? "
 msgstr "Tạm cất khúc này [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."
@@ -305,7 +238,6 @@ msgstr ""
 "Nếu miếng vá được áp dụng sạch sẽ, khúc đã sửa sẽ ngay lập tức được đánh dấu "
 "để tạm cất."
 
-#: add-patch.c:64
 msgid ""
 "y - stash this hunk\n"
 "n - do not stash this hunk\n"
@@ -319,27 +251,22 @@ msgstr ""
 "a - tạm cất khúc này và tất cả các khúc sau này trong tập tin\n"
 "d - đừng tạm cất khúc này cũng như bất kỳ cái nào còn lại trong tập tin\n"
 
-#: add-patch.c:80 git-add--interactive.perl:1445
 #, c-format, perl-format
 msgid "Unstage mode change [y,n,q,a,d%s,?]? "
 msgstr "Thay đổi chế độ bỏ ra khỏi bệ phóng [y,n,q,a,d%s,?]? "
 
-#: add-patch.c:81 git-add--interactive.perl:1446
 #, c-format, perl-format
 msgid "Unstage deletion [y,n,q,a,d%s,?]? "
 msgstr "Xóa bỏ việc bỏ ra khỏi bệ phóng [y,n,q,a,d%s,?]? "
 
-#: add-patch.c:82 git-add--interactive.perl:1447
 #, c-format, perl-format
 msgid "Unstage addition [y,n,q,a,d%s,?]? "
 msgstr "Thêm vào việc bỏ ra khỏi bệ phóng [y,n,q,a,d%s,?]? "
 
-#: add-patch.c:83 git-add--interactive.perl:1448
 #, c-format, perl-format
 msgid "Unstage this hunk [y,n,q,a,d%s,?]? "
 msgstr "Bỏ ra khỏi bệ phóng khúc này [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."
@@ -347,7 +274,6 @@ msgstr ""
 "Nếu miếng vá được áp dụng sạch sẽ, khúc đã sửa sẽ ngay lập tức được đánh dấu "
 "để bỏ ra khỏi bệ phóng."
 
-#: add-patch.c:88
 msgid ""
 "y - unstage this hunk\n"
 "n - do not unstage this hunk\n"
@@ -363,27 +289,22 @@ msgstr ""
 "d - đừng đưa ra khỏi bệ phóng khúc này cũng như bất kỳ cái nào còn lại trong "
 "tập tin\n"
 
-#: add-patch.c:103 git-add--interactive.perl:1451
 #, c-format, perl-format
 msgid "Apply mode change to index [y,n,q,a,d%s,?]? "
 msgstr "Áp dụng thay đổi chế độ cho mục lục [y,n,q,a,d%s,?]? "
 
-#: add-patch.c:104 git-add--interactive.perl:1452
 #, c-format, perl-format
 msgid "Apply deletion to index [y,n,q,a,d%s,?]? "
 msgstr "Áp dụng việc xóa vào mục lục [y,n,q,a,d%s,?]? "
 
-#: add-patch.c:105 git-add--interactive.perl:1453
 #, c-format, perl-format
 msgid "Apply addition to index [y,n,q,a,d%s,?]? "
 msgstr "Áp dụng các thêm vào mục lục [y,n,q,a,d%s,?]? "
 
-#: add-patch.c:106 git-add--interactive.perl:1454
 #, c-format, perl-format
 msgid "Apply this hunk to index [y,n,q,a,d%s,?]? "
 msgstr "Áo dụng khúc này vào mục lục [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."
@@ -391,7 +312,6 @@ msgstr ""
 "Nếu miếng vá được áp dụng sạch sẽ, khúc đã sửa sẽ ngay lập tức được đánh dấu "
 "để áp dụng."
 
-#: add-patch.c:111
 msgid ""
 "y - apply this hunk to index\n"
 "n - do not apply this hunk to index\n"
@@ -405,31 +325,22 @@ msgstr ""
 "a - áp dụng khúc này và tất cả các khúc sau này trong tập tin\n"
 "d - đừng áp dụng khúc này cũng như bất kỳ cái nào sau này trong tập tin\n"
 
-#: add-patch.c:126 git-add--interactive.perl:1457
-#: git-add--interactive.perl:1475
 #, c-format, perl-format
 msgid "Discard mode change from worktree [y,n,q,a,d%s,?]? "
 msgstr "Loại bỏ các thay đổi chế độ từ cây làm việc [y,n,q,a,d%s,?]? "
 
-#: add-patch.c:127 git-add--interactive.perl:1458
-#: git-add--interactive.perl:1476
 #, c-format, perl-format
 msgid "Discard deletion from worktree [y,n,q,a,d%s,?]? "
 msgstr "Loại bỏ việc xóa khỏi cây làm việc [y,n,q,a,d%s,?]? "
 
-#: add-patch.c:128 git-add--interactive.perl:1459
-#: git-add--interactive.perl:1477
 #, c-format, perl-format
 msgid "Discard addition from worktree [y,n,q,a,d%s,?]? "
 msgstr "Thêm các loại bỏ khỏi cây làm việc [y,n,q,a,d%s,?]? "
 
-#: add-patch.c:129 git-add--interactive.perl:1460
-#: git-add--interactive.perl:1478
 #, c-format, perl-format
 msgid "Discard this hunk from worktree [y,n,q,a,d%s,?]? "
 msgstr "Loại bỏ khúc này khỏi cây làm việc [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."
@@ -437,7 +348,6 @@ msgstr ""
 "Nếu miếng vá được áp dụng sạch sẽ, khúc đã sửa sẽ ngay lập tức được đánh dấu "
 "để loại bỏ."
 
-#: add-patch.c:134 add-patch.c:202
 msgid ""
 "y - discard this hunk from worktree\n"
 "n - do not discard this hunk from worktree\n"
@@ -451,27 +361,22 @@ msgstr ""
 "a - loại bỏ khúc này và tất cả các khúc sau này trong tập tin\n"
 "d - đừng loại bỏ khúc này cũng như bất kỳ cái nào sau này trong tập tin\n"
 
-#: add-patch.c:149 add-patch.c:194 git-add--interactive.perl:1463
 #, c-format, perl-format
 msgid "Discard mode change from index and worktree [y,n,q,a,d%s,?]? "
 msgstr "Loại bỏ thay đổi chế độ từ mục lục và cây làm việc [y,n,q,a,d%s,?]? "
 
-#: add-patch.c:150 add-patch.c:195 git-add--interactive.perl:1464
 #, c-format, perl-format
 msgid "Discard deletion from index and worktree [y,n,q,a,d%s,?]? "
 msgstr "Loại bỏ việc xóa khỏi mục lục và cây làm việc [y,n,q,a,d%s,?]? "
 
-#: add-patch.c:151 add-patch.c:196 git-add--interactive.perl:1465
 #, c-format, perl-format
 msgid "Discard addition from index and worktree [y,n,q,a,d%s,?]? "
 msgstr "Thêm các loại bỏ từ mục lục và cây làm việc [y,n,q,a,d%s,?]? "
 
-#: add-patch.c:152 add-patch.c:197 git-add--interactive.perl:1466
 #, c-format, perl-format
 msgid "Discard this hunk from index and worktree [y,n,q,a,d%s,?]? "
 msgstr "Loại bỏ khúc này khỏi mục lục và cây làm việc [y,n,q,a,d%s,?]? "
 
-#: add-patch.c:157
 msgid ""
 "y - discard this hunk from index and worktree\n"
 "n - do not discard this hunk from index and worktree\n"
@@ -485,27 +390,22 @@ msgstr ""
 "a - loại bỏ khúc này và tất cả các khúc sau này trong tập tin\n"
 "d - đừng loại bỏ khúc này cũng như bất kỳ cái nào sau này trong tập tin\n"
 
-#: add-patch.c:171 add-patch.c:216 git-add--interactive.perl:1469
 #, c-format, perl-format
 msgid "Apply mode change to index and worktree [y,n,q,a,d%s,?]? "
 msgstr "Áp dụng thay đổi chế độ cho mục lục và cây làm việc [y,n,q,a,d%s,?]? "
 
-#: add-patch.c:172 add-patch.c:217 git-add--interactive.perl:1470
 #, c-format, perl-format
 msgid "Apply deletion to index and worktree [y,n,q,a,d%s,?]? "
 msgstr "Áp dụng việc xóa vào mục lục và cây làm việc [y,n,q,a,d%s,?]? "
 
-#: add-patch.c:173 add-patch.c:218 git-add--interactive.perl:1471
 #, c-format, perl-format
 msgid "Apply addition to index and worktree [y,n,q,a,d%s,?]? "
 msgstr "Áp dụng thêm vào mục lục và cây làm việc [y,n,q,a,d%s,?]? "
 
-#: add-patch.c:174 add-patch.c:219 git-add--interactive.perl:1472
 #, c-format, perl-format
 msgid "Apply this hunk to index and worktree [y,n,q,a,d%s,?]? "
 msgstr "Áp dụng khúc này vào mục lục và cây làm việc [y,n,q,a,d%s,?]? "
 
-#: add-patch.c:179
 msgid ""
 "y - apply this hunk to index and worktree\n"
 "n - do not apply this hunk to index and worktree\n"
@@ -519,7 +419,6 @@ msgstr ""
 "a - áp dụng khúc này và tất cả các khúc sau này trong tập tin\n"
 "d - đừng áp dụng khúc này cũng như bất kỳ cái nào sau này trong tập tin\n"
 
-#: add-patch.c:224
 msgid ""
 "y - apply this hunk to worktree\n"
 "n - do not apply this hunk to worktree\n"
@@ -533,34 +432,27 @@ msgstr ""
 "a - áp dụng khúc này và tất cả các khúc sau này trong tập tin\n"
 "d - đừng áp dụng khúc này cũng như bất kỳ cái nào sau này trong tập tin\n"
 
-#: add-patch.c:343
 #, c-format
 msgid "could not parse hunk header '%.*s'"
 msgstr "không thể phân tích cú pháp phần đầu của khúc “%.*s”"
 
-#: add-patch.c:362 add-patch.c:366
 #, c-format
 msgid "could not parse colored hunk header '%.*s'"
 msgstr "không thể phân tích cú pháp phần đầu khúc đã tô màu “%.*s”"
 
-#: add-patch.c:431
 msgid "could not parse diff"
 msgstr "không thể phân tích cú pháp khác biệt"
 
-#: add-patch.c:450
 msgid "could not parse colored diff"
 msgstr "không thể phân tích khác biệt được tô màu"
 
-#: add-patch.c:464
 #, c-format
 msgid "failed to run '%s'"
 msgstr "gặp lỗi khi chạy “%s”"
 
-#: add-patch.c:618
 msgid "mismatched output from interactive.diffFilter"
 msgstr "đầu ra không khớp từ interactive.diffFilter"
 
-#: add-patch.c:619
 msgid ""
 "Your filter must maintain a one-to-one correspondence\n"
 "between its input and output lines."
@@ -568,7 +460,6 @@ msgstr ""
 "Bộ lọc của bạn phải duy trì một quan hệ một-đến-một\n"
 "giữa các dòng đầu vào và đầu ra của nó."
 
-#: add-patch.c:797
 #, c-format
 msgid ""
 "expected context line #%d in\n"
@@ -577,7 +468,6 @@ msgstr ""
 "cần dòng ngữ cảnh #%d trong\n"
 "%.*s"
 
-#: add-patch.c:812
 #, c-format
 msgid ""
 "hunks do not overlap:\n"
@@ -590,11 +480,9 @@ msgstr ""
 "\tkhông được kết thúc bằng:\n"
 "%.*s"
 
-#: add-patch.c:1088 git-add--interactive.perl:1115
 msgid "Manual hunk edit mode -- see bottom for a quick guide.\n"
 msgstr "Chế độ sửa khúc bằng tay -- xem ở đáy để có hướng dẫn sử dụng nhanh.\n"
 
-#: add-patch.c:1092
 #, c-format
 msgid ""
 "---\n"
@@ -607,8 +495,8 @@ msgstr ""
 "Để 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"
 
+#. #-#-#-#-#  git-add--interactive.perl.po  #-#-#-#-#
 #. TRANSLATORS: 'it' refers to the patch mentioned in the previous messages.
-#: add-patch.c:1106 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"
@@ -618,46 +506,41 @@ msgstr ""
 "để sửa lần nữa. Nếu mọi dòng của khúc bị xóa bỏ, thế thì những\n"
 "sửa dổi sẽ bị loại bỏ, và khúc vẫn giữ nguyên.\n"
 
-#: add-patch.c:1139
 msgid "could not parse hunk header"
 msgstr "không thể phân tích cú pháp phần đầu khúc"
 
-#: add-patch.c:1184
 msgid "'git apply --cached' failed"
 msgstr "“git apply --cached” gặp lỗi"
 
+#. #-#-#-#-#  add-patch.c.po  #-#-#-#-#
 #. 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.
 #.
+#. #-#-#-#-#  git-add--interactive.perl.po  #-#-#-#-#
 #. 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:1253 git-add--interactive.perl:1244
 msgid ""
 "Your edited hunk does not apply. Edit again (saying \"no\" discards!) [y/n]? "
 msgstr ""
 "Hunk đã sửa của bạn không được áp dụng. Sửa lại lần nữa (nói \"n\" để loại "
 "bỏ!) [y/n]? "
 
-#: add-patch.c:1296
 msgid "The selected hunks do not apply to the index!"
 msgstr "Các khúc đã chọn không được áp dụng vào bảng mục lục!"
 
-#: add-patch.c:1297 git-add--interactive.perl:1348
 msgid "Apply them to the worktree anyway? "
 msgstr "Vẫn áp dụng chúng cho cây làm việc? "
 
-#: add-patch.c:1304 git-add--interactive.perl:1351
 msgid "Nothing was applied.\n"
 msgstr "Đã không áp dụng gì cả.\n"
 
-#: add-patch.c:1361
 msgid ""
 "j - leave this hunk undecided, see next undecided hunk\n"
 "J - leave this hunk undecided, see next hunk\n"
@@ -679,72 +562,56 @@ msgstr ""
 "e - sửa bằng tay khúc hiện hành\n"
 "? - hiển thị trợ giúp\n"
 
-#: add-patch.c:1523 add-patch.c:1533
 msgid "No previous hunk"
 msgstr "Không có khúc kế trước"
 
-#: add-patch.c:1528 add-patch.c:1538
 msgid "No next hunk"
 msgstr "Không có khúc kế tiếp"
 
-#: add-patch.c:1544
 msgid "No other hunks to goto"
 msgstr "Không còn khúc nào để mà nhảy đến"
 
-#: add-patch.c:1555 git-add--interactive.perl:1608
 msgid "go to which hunk (<ret> to see more)? "
 msgstr "nhảy đến khúc nào (<ret> để xem thêm)? "
 
-#: add-patch.c:1556 git-add--interactive.perl:1610
 msgid "go to which hunk? "
 msgstr "nhảy đến khúc nào? "
 
-#: add-patch.c:1567
 #, c-format
 msgid "Invalid number: '%s'"
 msgstr "Số không hợp lệ: “%s”"
 
-#: add-patch.c:1572
 #, c-format
 msgid "Sorry, only %d hunk available."
 msgid_plural "Sorry, only %d hunks available."
 msgstr[0] "Rất tiếc, chỉ có sẵn %d khúc."
 
-#: add-patch.c:1581
 msgid "No other hunks to search"
 msgstr "Không còn khúc nào để mà tìm kiếm"
 
-#: add-patch.c:1587 git-add--interactive.perl:1663
 msgid "search for regex? "
 msgstr "tìm kiếm cho biểu thức chính quy? "
 
-#: add-patch.c:1602
 #, c-format
 msgid "Malformed search regexp %s: %s"
 msgstr "Định dạng tìm kiếm của biểu thức chính quy không đúng %s: %s"
 
-#: add-patch.c:1619
 msgid "No hunk matches the given pattern"
 msgstr "Không thấy khúc nào khớp mẫu đã cho"
 
-#: add-patch.c:1626
 msgid "Sorry, cannot split this hunk"
 msgstr "Rất tiếc, không thể chia nhỏ khúc này"
 
-#: add-patch.c:1630
 #, c-format
 msgid "Split into %d hunks."
 msgstr "Chi nhỏ thành %d khúc."
 
-#: add-patch.c:1634
 msgid "Sorry, cannot edit this hunk"
 msgstr "Rất tiếc, không thể sửa khúc này"
 
-#: add-patch.c:1686
 msgid "'git apply' failed"
 msgstr "“git apply” gặp lỗi"
 
-#: advice.c:81
 #, c-format
 msgid ""
 "\n"
@@ -753,47 +620,39 @@ msgstr ""
 "\n"
 "Tắt lời nhắn này bằng \"git config advice.%s false\""
 
-#: advice.c:97
 #, c-format
 msgid "%shint: %.*s%s\n"
 msgstr "%sgợi ý: %.*s%s\n"
 
-#: advice.c:181
 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:183
 msgid "Committing is not possible because you have unmerged files."
 msgstr ""
 "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:185
 msgid "Merging is not possible because you have unmerged files."
 msgstr ""
 "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:187
 msgid "Pulling is not possible because you have unmerged files."
 msgstr ""
 "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:189
 msgid "Reverting is not possible because you have unmerged files."
 msgstr ""
 "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:191
 #, 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:199
 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."
@@ -801,27 +660,21 @@ msgstr ""
 "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:207
 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:212 builtin/merge.c:1388
 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:214
 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:215
 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:220
 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:230
 #, c-format
 msgid ""
 "The following paths and/or pathspecs matched paths that exist\n"
@@ -833,7 +686,6 @@ msgstr ""
 "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:237
 msgid ""
 "If you intend to update such entries, try one of the following:\n"
 "* Use the --sparse option.\n"
@@ -843,7 +695,6 @@ msgstr ""
 "* 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:245
 #, c-format
 msgid ""
 "Note: switching to '%s'.\n"
@@ -885,104 +736,67 @@ msgstr ""
 "Tắt hướng dẫn này bằng cách đặt biến advice.detachedHead thành false\n"
 "\n"
 
-#: alias.c:50
 msgid "cmdline ends with \\"
 msgstr "cmdline kết thúc với \\"
 
-#: alias.c:51
 msgid "unclosed quote"
 msgstr "chưa có dấu nháy đóng"
 
-#: apply.c:70
 #, c-format
 msgid "unrecognized whitespace option '%s'"
 msgstr "không nhận ra tùy chọn về khoảng trắng “%s”"
 
-#: apply.c:86
 #, c-format
 msgid "unrecognized whitespace ignore option '%s'"
 msgstr "không nhận ra tùy chọn bỏ qua khoảng trắng “%s”"
 
-#: apply.c:138 archive.c:584 parse-options.c:1122 range-diff.c:555
-#: revision.c:2314 revision.c:2318 revision.c:2327 revision.c:2332
-#: revision.c:2560 revision.c:2895 revision.c:2899 revision.c:2907
-#: revision.c:2910 revision.c:2912 builtin/add.c:507 builtin/add.c:509
-#: builtin/add.c:515 builtin/add.c:527 builtin/branch.c:755
-#: builtin/checkout.c:472 builtin/checkout.c:475 builtin/checkout.c:1663
-#: builtin/checkout.c:1773 builtin/checkout.c:1776 builtin/clone.c:921
-#: builtin/commit.c:359 builtin/commit.c:362 builtin/commit.c:1200
-#: builtin/commit.c:1256 builtin/commit.c:1273 builtin/describe.c:593
-#: builtin/diff-tree.c:155 builtin/difftool.c:733 builtin/fast-export.c:1245
-#: builtin/fetch.c:2141 builtin/fetch.c:2162 builtin/fetch.c:2167
-#: builtin/help.c:602 builtin/index-pack.c:1858 builtin/init-db.c:560
-#: builtin/log.c:1968 builtin/log.c:1970 builtin/ls-files.c:778
-#: builtin/merge-base.c:163 builtin/merge-base.c:169 builtin/merge.c:1409
-#: builtin/merge.c:1411 builtin/pack-objects.c:4098 builtin/push.c:592
-#: builtin/push.c:630 builtin/push.c:636 builtin/push.c:641
-#: builtin/rebase.c:1221 builtin/rebase.c:1223 builtin/rebase.c:1227
-#: builtin/repack.c:688 builtin/repack.c:719 builtin/reset.c:433
-#: builtin/reset.c:469 builtin/rev-list.c:537 builtin/show-branch.c:711
-#: builtin/stash.c:1696 builtin/stash.c:1699 builtin/submodule--helper.c:1328
-#: builtin/submodule--helper.c:3054 builtin/tag.c:527 builtin/tag.c:573
-#: builtin/worktree.c:779
 #, c-format
 msgid "options '%s' and '%s' cannot be used together"
 msgstr "tùy chọn '%s' và '%s' không thể dùng cùng nhau"
 
-#: apply.c:141 apply.c:152 apply.c:155
 #, c-format
 msgid "'%s' outside a repository"
 msgstr "'%s' ở ngoài một kho chứa"
 
-#: apply.c:807
 #, c-format
 msgid "Cannot prepare timestamp regexp %s"
 msgstr ""
 "Không thể chuẩn bị biểu thức chính qui dấu vết thời gian (timestamp regexp) "
 "%s"
 
-#: apply.c:816
 #, c-format
 msgid "regexec returned %d for input: %s"
 msgstr "thi hành biểu thức chính quy trả về %d cho đầu vào: %s"
 
-#: apply.c:890
 #, c-format
 msgid "unable to find filename in patch at line %d"
 msgstr "không thể tìm thấy tên tập tin trong miếng vá tại dòng %d"
 
-#: apply.c:928
 #, c-format
 msgid "git apply: bad git-diff - expected /dev/null, got %s on line %d"
 msgstr ""
 "git apply: git-diff sai - cần /dev/null, nhưng lại nhận được %s trên dòng %d"
 
-#: apply.c:934
 #, c-format
 msgid "git apply: bad git-diff - inconsistent new filename on line %d"
 msgstr "git apply: git-diff sai - tên tập tin mới không nhất quán trên dòng %d"
 
-#: apply.c:935
 #, c-format
 msgid "git apply: bad git-diff - inconsistent old filename on line %d"
 msgstr "git apply: git-diff sai - tên tập tin cũ không nhất quán trên dòng %d"
 
-#: apply.c:940
 #, c-format
 msgid "git apply: bad git-diff - expected /dev/null on line %d"
 msgstr "git apply: git-diff sai - cần “/dev/null” trên dòng %d"
 
-#: apply.c:969
 #, c-format
 msgid "invalid mode on line %d: %s"
 msgstr "chế độ không hợp lệ trên dòng %d: %s"
 
-#: apply.c:1288
 #, c-format
 msgid "inconsistent header lines %d and %d"
 msgstr "phần đầu mâu thuẫn dòng %d và %d"
 
-#: apply.c:1378
 #, c-format
 msgid ""
 "git diff header lacks filename information when removing %d leading pathname "
@@ -994,91 +808,73 @@ msgstr[0] ""
 "phần đầu diff cho git  thiếu thông tin tên tập tin khi gỡ bỏ đi %d trong "
 "thành phần dẫn đầu tên của đường dẫn (dòng %d)"
 
-#: apply.c:1391
 #, c-format
 msgid "git diff header lacks filename information (line %d)"
 msgstr "phần đầu diff cho git thiếu thông tin tên tập tin (dòng %d)"
 
-#: apply.c:1487
 #, c-format
 msgid "recount: unexpected line: %.*s"
 msgstr "chi tiết: dòng không cần: %.*s"
 
-#: apply.c:1556
 #, c-format
 msgid "patch fragment without header at line %d: %.*s"
 msgstr "miếng vá phân mảnh mà không có phần đầu tại dòng %d: %.*s"
 
-#: apply.c:1759
 msgid "new file depends on old contents"
 msgstr "tập tin mới phụ thuộc vào nội dung cũ"
 
-#: apply.c:1761
 msgid "deleted file still has contents"
 msgstr "tập tin đã xóa vẫn còn nội dung"
 
-#: apply.c:1795
 #, c-format
 msgid "corrupt patch at line %d"
 msgstr "miếng vá hỏng tại dòng %d"
 
-#: apply.c:1832
 #, c-format
 msgid "new file %s depends on old contents"
 msgstr "tập tin mới %s phụ thuộc vào nội dung cũ"
 
-#: apply.c:1834
 #, c-format
 msgid "deleted file %s still has contents"
 msgstr "tập tin đã xóa %s vẫn còn nội dung"
 
-#: apply.c:1837
 #, c-format
 msgid "** warning: file %s becomes empty but is not deleted"
 msgstr "** cảnh báo: tập tin %s trở nên trống rỗng nhưng không bị xóa"
 
-#: apply.c:1985
 #, 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:2022
 #, 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:2184
 #, c-format
 msgid "patch with only garbage at line %d"
 msgstr "vá chỉ với “rác” tại dòng %d"
 
-#: apply.c:2270
 #, c-format
 msgid "unable to read symlink %s"
 msgstr "không thể đọc liên kết mềm %s"
 
-#: apply.c:2274
 #, c-format
 msgid "unable to open or read %s"
 msgstr "không thể mở hay đọc %s"
 
-#: apply.c:2943
 #, c-format
 msgid "invalid start of line: '%c'"
 msgstr "sai khởi đầu dòng: “%c”"
 
-#: apply.c:3064
 #, 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:3076
 #, 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:3082
 #, c-format
 msgid ""
 "while searching for:\n"
@@ -1087,657 +883,518 @@ msgstr ""
 "trong khi đang tìm kiếm cho:\n"
 "%.*s"
 
-#: apply.c:3104
 #, 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:3112
 #, 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:3159
 #, 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:3170
 #, 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:3178
 #, 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:3196
 #, 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:3209
 #, 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:3216
 #, 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:3237
 #, c-format
 msgid "patch failed: %s:%ld"
 msgstr "gặp lỗi khi vá: %s:%ld"
 
-#: apply.c:3360
 #, c-format
 msgid "cannot checkout %s"
 msgstr "không thể lấy ra %s"
 
-#: apply.c:3412 apply.c:3423 apply.c:3469 midx.c:105 pack-revindex.c:214
-#: setup.c:310
 #, c-format
 msgid "failed to read %s"
 msgstr "gặp lỗi khi đọc %s"
 
-#: apply.c:3420
 #, 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:3449 apply.c:3721
 #, c-format
 msgid "path %s has been renamed/deleted"
 msgstr "đường dẫn %s đã bị xóa hoặc đổi tên"
 
-#: apply.c:3559 apply.c:3736
 #, 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:3568 apply.c:3744 apply.c:3960
 #, c-format
 msgid "%s: does not match index"
 msgstr "%s: không khớp trong mục lục"
 
-#: apply.c:3605
 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:3608
 #, c-format
 msgid "Performing three-way merge...\n"
 msgstr "Đang thực hiện hòa trộn “3-đường”…\n"
 
-#: apply.c:3624 apply.c:3628
 #, 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:3640
 #, 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:3654
 #, 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:3659
 #, 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:3676
 #, c-format
 msgid "Falling back to direct application...\n"
 msgstr "Đang trở lại ứng dụng chi phối…\n"
 
-#: apply.c:3688
 msgid "removal patch leaves file contents"
 msgstr "loại bỏ miếng vá để lại nội dung tập tin"
 
-#: apply.c:3761
 #, c-format
 msgid "%s: wrong type"
 msgstr "%s: sai kiểu"
 
-#: apply.c:3763
 #, c-format
 msgid "%s has type %o, expected %o"
 msgstr "%s có kiểu %o, cần %o"
 
-#: apply.c:3900 apply.c:3902 read-cache.c:903 read-cache.c:932
-#: read-cache.c:1399
 #, c-format
 msgid "invalid path '%s'"
 msgstr "đường dẫn không hợp lệ “%s”"
 
-#: apply.c:3958
 #, c-format
 msgid "%s: already exists in index"
 msgstr "%s: đã có từ trước trong bảng mục lục"
 
-#: apply.c:3962
 #, 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:3982
 #, 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:3987
 #, 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:4007
 #, 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:4011
 #, c-format
 msgid "%s: patch does not apply"
 msgstr "%s: miếng vá không được áp dụng"
 
-#: apply.c:4026
 #, c-format
 msgid "Checking patch %s..."
 msgstr "Đang kiểm tra miếng vá %s…"
 
-#: apply.c:4118
 #, 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:4125
 #, 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:4128
 #, 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:4137
 #, 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:4147
 #, 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:4285
 #, c-format
 msgid "unable to remove %s from index"
 msgstr "không thể gỡ bỏ %s từ mục lục"
 
-#: apply.c:4319
 #, c-format
 msgid "corrupt patch for submodule %s"
 msgstr "miếng vá sai hỏng cho mô-đun-con %s"
 
-#: apply.c:4325
 #, 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:4333
 #, 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:4339 apply.c:4484
 #, c-format
 msgid "unable to add cache entry for %s"
 msgstr "không thể thêm mục nhớ đệm cho %s"
 
-#: apply.c:4382 builtin/bisect--helper.c:540 builtin/gc.c:2258
-#: builtin/gc.c:2293
 #, c-format
 msgid "failed to write to '%s'"
 msgstr "gặp lỗi khi ghi vào “%s”"
 
-#: apply.c:4386
 #, c-format
 msgid "closing file '%s'"
 msgstr "đang đóng tập tin “%s”"
 
-#: apply.c:4456
 #, 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:4554
 #, c-format
 msgid "Applied patch %s cleanly."
 msgstr "Đã áp dụng miếng vá %s một cách sạch sẽ."
 
-#: apply.c:4562
 msgid "internal error"
 msgstr "lỗi nội bộ"
 
-#: apply.c:4565
 #, 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:4576
 #, 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:4584
 #, c-format
 msgid "cannot open %s"
 msgstr "không mở được “%s”"
 
-#: apply.c:4598
 #, c-format
 msgid "Hunk #%d applied cleanly."
 msgstr "Khối nhớ #%d được áp dụng gọn gàng."
 
-#: apply.c:4602
 #, c-format
 msgid "Rejected hunk #%d."
 msgstr "Đoạn dữ liệu #%d bị từ chối."
 
-#: apply.c:4731
 #, c-format
 msgid "Skipped patch '%s'."
 msgstr "Bỏ qua đường dẫn “%s”."
 
-#: apply.c:4740
 msgid "No valid patches in input (allow with \"--allow-empty\")"
 msgstr ""
 "Không có miếng vá hợp lệ nào trong đầu vào (cho phép với \"--allow-empty\")"
 
-#: apply.c:4761
 msgid "unable to read index file"
 msgstr "không thể đọc tập tin lưu bảng mục lục"
 
-#: apply.c:4918
 #, c-format
 msgid "can't open patch '%s': %s"
 msgstr "không thể mở miếng vá “%s”: %s"
 
-#: apply.c:4945
 #, 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:4951 apply.c:4966
 #, 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:4959
 #, 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:4975 builtin/add.c:690 builtin/mv.c:338 builtin/rm.c:430
 msgid "Unable to write new index file"
 msgstr "Không thể ghi tập tin lưu bảng mục lục mới"
 
-#: apply.c:5003
 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:5006
 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:5008 builtin/am.c:2379
 msgid "num"
 msgstr "số"
 
-#: apply.c:5009
 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:5012
 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:5014
 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:5018
 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:5020
 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:5022
 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:5024
 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:5026
 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:5028
 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:5030
 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:5033
 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:5035
 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:5037
 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:5040 builtin/checkout-index.c:230
 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:5042
 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:5043 builtin/am.c:2355 builtin/am.c:2358
-#: builtin/interpret-trailers.c:98 builtin/interpret-trailers.c:100
-#: builtin/interpret-trailers.c:102 builtin/pack-objects.c:3983
-#: builtin/rebase.c:1079
 msgid "action"
 msgstr "hành động"
 
-#: apply.c:5044
 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:5047 apply.c:5050
 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:5053
 msgid "apply the patch in reverse"
 msgstr "áp dụng miếng vá theo chiều ngược"
 
-#: apply.c:5055
 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:5057
 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:5059
 msgid "allow overlapping hunks"
 msgstr "cho phép chồng khối nhớ"
 
-#: apply.c:5062
 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:5065
 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:5067 builtin/am.c:2367
 msgid "root"
 msgstr "gốc"
 
-#: apply.c:5068
 msgid "prepend <root> to all filenames"
 msgstr "treo thêm <root> vào tất cả các tên tập tin"
 
-#: apply.c:5071
 msgid "don't return error for empty patches"
 msgstr "đừng trả về lỗi khi các miếng vá trống rỗng"
 
-#: archive-tar.c:125 archive-zip.c:346
 #, c-format
 msgid "cannot stream blob %s"
 msgstr "không thể stream blob “%s”"
 
-#: archive-tar.c:265 archive-zip.c:359
 #, c-format
 msgid "unsupported file mode: 0%o (SHA1: %s)"
 msgstr "chế độ tập tin không được hỗ trợ: 0%o (SHA1: %s)"
 
-#: archive-tar.c:447
 #, c-format
 msgid "unable to start '%s' filter"
 msgstr "không thể bắt đầu bộ lọc “%s”"
 
-#: archive-tar.c:450
 msgid "unable to redirect descriptor"
 msgstr "không thể chuyển hướng mô tả"
 
-#: archive-tar.c:457
 #, c-format
 msgid "'%s' filter reported error"
 msgstr "bộ lọc “%s” đã báo cáo lỗi"
 
-#: archive-zip.c:319
 #, c-format
 msgid "path is not valid UTF-8: %s"
 msgstr "đường dẫn không hợp lệ UTF-8: %s"
 
-#: archive-zip.c:323
 #, c-format
 msgid "path too long (%d chars, SHA1: %s): %s"
 msgstr "đường dẫn quá dài (%d ký tự, SHA1: %s): %s"
 
-#: archive-zip.c:470 builtin/pack-objects.c:363 builtin/pack-objects.c:366
 #, c-format
 msgid "deflate error (%d)"
 msgstr "lỗi giải nén (%d)"
 
-#: archive-zip.c:604
 #, c-format
 msgid "timestamp too large for this system: %<PRIuMAX>"
 msgstr "dấu vết thời gian là quá lớn cho hệ thống này: %<PRIuMAX>"
 
-#: archive.c:14
 msgid "git archive [<options>] <tree-ish> [<path>...]"
 msgstr "git archive [<các tùy chọn>] <tree-ish> [</đường/dẫn>…]"
 
-#: archive.c:16
 msgid ""
 "git archive --remote <repo> [--exec <cmd>] [<options>] <tree-ish> [<path>...]"
 msgstr ""
 "git archive --remote <kho> [--exec <lệnh>] [<các tùy chọn>] <tree-ish> [</"
 "đường/dẫn>…]"
 
-#: archive.c:17
 msgid "git archive --remote <repo> [--exec <cmd>] --list"
 msgstr "git archive --remote <kho> [--exec <lệnh>] --list"
 
-#: archive.c:188 archive.c:341 builtin/gc.c:497 builtin/notes.c:238
-#: builtin/tag.c:579
 #, c-format
 msgid "cannot read '%s'"
 msgstr "không thể đọc “%s”"
 
-#: archive.c:426 builtin/add.c:214 builtin/add.c:657 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:450
 #, c-format
 msgid "no such ref: %.*s"
 msgstr "không có tham chiếu nào như thế: %.*s"
 
-#: 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:469
 #, c-format
 msgid "not a tree object: %s"
 msgstr "không phải là đối tượng cây: “%s”"
 
-#: 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:522
 #, c-format
 msgid "File not found: %s"
 msgstr "Không tìm thấy tập tin: %s"
 
-#: 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:551
+#, c-format
+msgid "unclosed quote: '%s'"
+msgstr "chưa có dấu nháy đóng: '%s'"
+
+#, c-format
+msgid "missing colon: '%s'"
+msgstr "thiếu dấu hai chấm: “%s”"
+
+#, c-format
+msgid "empty file name: '%s'"
+msgstr "tên tập tin trống rỗng: “%s”"
+
 msgid "fmt"
 msgstr "định_dạng"
 
-#: archive.c:551
 msgid "archive format"
 msgstr "định dạng lưu trữ"
 
-#: archive.c:552 builtin/log.c:1809
 msgid "prefix"
 msgstr "tiền_tố"
 
-#: 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:554 archive.c:557 builtin/blame.c:881 builtin/blame.c:885
-#: builtin/blame.c:886 builtin/commit-tree.c:115 builtin/config.c:135
-#: builtin/fast-export.c:1181 builtin/fast-export.c:1183
-#: builtin/fast-export.c:1187 builtin/grep.c:936 builtin/hash-object.c:104
-#: builtin/ls-files.c:654 builtin/ls-files.c:657 builtin/notes.c:410
-#: builtin/notes.c:576 builtin/read-tree.c:115 parse-options.h:195
 msgid "file"
 msgstr "tập_tin"
 
-#: 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:558 builtin/archive.c:88
+msgid "path:content"
+msgstr "đường dẫn:nội dung"
+
 msgid "write the archive to this file"
 msgstr "ghi kho lưu vào tập tin này"
 
-#: archive.c:560
 msgid "read .gitattributes in working directory"
 msgstr "đọc .gitattributes trong thư mục làm việc"
 
-#: 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:563
 msgid "set compression level"
 msgstr "đặt mức nén"
 
-#: archive.c:566
 msgid "list supported archive formats"
 msgstr "liệt kê các kiểu nén được hỗ trợ"
 
-#: archive.c:568 builtin/archive.c:89 builtin/clone.c:122 builtin/clone.c:125
-#: builtin/submodule--helper.c:1884 builtin/submodule--helper.c:2718
 msgid "repo"
 msgstr "kho"
 
-#: 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:570 builtin/archive.c:91 builtin/difftool.c:708
-#: builtin/notes.c:496
 msgid "command"
 msgstr "lệnh"
 
-#: 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:578
 msgid "Unexpected option --remote"
 msgstr "Gặp tùy chọn không cần --remote"
 
-#: archive.c:580 fetch-pack.c:300 revision.c:2914 builtin/add.c:530
-#: builtin/add.c:562 builtin/checkout.c:1782 builtin/clone.c:1099
-#: builtin/clone.c:1102 builtin/commit.c:371 builtin/fast-export.c:1230
-#: builtin/index-pack.c:1854 builtin/log.c:2140 builtin/reset.c:442
-#: builtin/reset.c:500 builtin/rm.c:281 builtin/stash.c:1708
-#: builtin/worktree.c:580 builtin/worktree.c:781 http-fetch.c:144
-#: http-fetch.c:153
 #, c-format
 msgid "the option '%s' requires '%s'"
 msgstr "tùy chọn “%s” yêu cầu “%s”"
 
-#: archive.c:582
 msgid "Unexpected option --output"
 msgstr "Gặp tùy chọn không cần --output"
 
-#: archive.c:606
 #, c-format
 msgid "Unknown archive format '%s'"
 msgstr "Không hiểu định dạng “%s”"
 
-#: 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
 #, 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
 #, c-format
 msgid "%s not allowed: %s:%d"
 msgstr "%s không được phép: %s:%d"
 
-#: attr.c:403
 msgid ""
 "Negative patterns are ignored in git attributes\n"
 "Use '\\!' for literal leading exclamation."
@@ -1745,22 +1402,18 @@ msgstr ""
 "Các mẫu dạng phủ định bị cấm dùng cho các thuộc tính của git\n"
 "Dùng “\\!” cho các chuỗi văn bản có dấu chấm than dẫn đầu."
 
-#: 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:698
 #, c-format
 msgid "We cannot bisect more!\n"
 msgstr "Chúng tôi không bisect thêm nữa!\n"
 
-#: bisect.c:765
 #, 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:790
 #, c-format
 msgid ""
 "The merge base %s is bad.\n"
@@ -1769,7 +1422,6 @@ msgstr ""
 "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:795
 #, c-format
 msgid ""
 "The merge base %s is new.\n"
@@ -1778,7 +1430,6 @@ msgstr ""
 "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:800
 #, c-format
 msgid ""
 "The merge base %s is %s.\n"
@@ -1787,7 +1438,6 @@ msgstr ""
 "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:808
 #, c-format
 msgid ""
 "Some %s revs are not ancestors of the %s rev.\n"
@@ -1798,7 +1448,6 @@ msgstr ""
 "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:821
 #, c-format
 msgid ""
 "the merge base between %s and [%s] must be skipped.\n"
@@ -1810,36 +1459,29 @@ msgstr ""
 "%s.\n"
 "Chúng tôi vẫn cứ tiếp tục."
 
-#: bisect.c:860
 #, 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:910
 #, c-format
 msgid "a %s revision is needed"
 msgstr "cần một điểm xét duyệt %s"
 
-#: bisect.c:940
 #, c-format
 msgid "could not create file '%s'"
 msgstr "không thể tạo tập tin “%s”"
 
-#: bisect.c:986 builtin/merge.c:155
 #, c-format
 msgid "could not read file '%s'"
 msgstr "không thể đọc tập tin “%s”"
 
-#: bisect.c:1026
 msgid "reading bisect refs failed"
 msgstr "việc đọc tham chiếu bisect gặp lỗi"
 
-#: bisect.c:1056
 #, c-format
 msgid "%s was both %s and %s\n"
 msgstr "%s là cả %s và %s\n"
 
-#: bisect.c:1065
 #, c-format
 msgid ""
 "No testable commit found.\n"
@@ -1848,7 +1490,6 @@ msgstr ""
 "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:1094
 #, c-format
 msgid "(roughly %d step)"
 msgid_plural "(roughly %d steps)"
@@ -1857,52 +1498,38 @@ msgstr[0] "(ước chừng %d bước)"
 #. TRANSLATORS: the last %s will be replaced with "(roughly %d
 #. steps)" translation.
 #.
-#: bisect.c:1100
 #, 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"
 msgstr[0] "Bisecting: còn %d điểm xét duyệt để kiểm sau %s này\n"
 
-#: blame.c:2773
 msgid "--contents and --reverse do not blend well."
 msgstr "tùy chọn --contents và --reverse không được trộn vào nhau."
 
-#: blame.c:2787
 msgid "cannot use --contents with final commit object name"
 msgstr "không thể dùng --contents với tên đối tượng chuyển giao cuối cùng"
 
-#: blame.c:2808
 msgid "--reverse and --first-parent together require specified latest commit"
 msgstr ""
 "cùng sử dụng --reverse và --first-parent cần chỉ định lần chuyển giao cuối"
 
-#: blame.c:2817 bundle.c:231 midx.c:1058 ref-filter.c:2371 remote.c:2157
-#: sequencer.c:2348 sequencer.c:4872 submodule.c:913 builtin/commit.c:1118
-#: builtin/log.c:437 builtin/log.c:1055 builtin/log.c:1663 builtin/log.c:2096
-#: builtin/log.c:2387 builtin/merge.c:431 builtin/pack-objects.c:3381
-#: builtin/pack-objects.c:3781 builtin/pack-objects.c:3796
-#: 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"
 
-#: blame.c:2835
 msgid ""
 "--reverse --first-parent together require range along first-parent chain"
 msgstr ""
 "cùng sử dụng --reverse --first-parent yêu cầu vùng cùng với chuỗi cha-mẹ-đầu-"
 "tiên"
 
-#: blame.c:2846
 #, c-format
 msgid "no such path %s in %s"
 msgstr "không có đường dẫn %s trong “%s”"
 
-#: blame.c:2857
 #, c-format
 msgid "cannot read blob %s for path %s"
 msgstr "không thể đọc blob %s cho đường dẫn “%s”"
 
-#: branch.c:93
 msgid ""
 "cannot inherit upstream tracking configuration of multiple refs when "
 "rebasing is requested"
@@ -1910,31 +1537,25 @@ msgstr ""
 "không thể kế thừa cấu hình theo dõi thượng nguồn của nhiều tham chiếu khi mà "
 "lệnh cải tổ được yêu cầu"
 
-#: branch.c:104
 #, c-format
 msgid "not setting branch '%s' as its own upstream"
 msgstr "không cài đặt nhánh '%s' như là thượng nguồn của nó"
 
-#: branch.c:160
 #, c-format
 msgid "branch '%s' set up to track '%s' by rebasing."
 msgstr "nhánh “%s” cài đặt để theo dõi “%s” bằng cách rebase."
 
-#: branch.c:161
 #, c-format
 msgid "branch '%s' set up to track '%s'."
 msgstr "nhánh “%s” cài đặt để theo dõi “%s”."
 
-#: branch.c:164
 #, c-format
 msgid "branch '%s' set up to track:"
 msgstr "nhánh “%s” cài đặt để theo dõi:"
 
-#: branch.c:176
 msgid "unable to write upstream branch configuration"
 msgstr "không thể ghi cấu hình nhánh thượng nguồn"
 
-#: branch.c:178
 msgid ""
 "\n"
 "After fixing the error cause you may try to fix up\n"
@@ -1944,34 +1565,32 @@ msgstr ""
 "Sau khi sửa nguyên nhân gây lỗi bạn có lẻ cần thử sửa\n"
 "thông tin theo dõi máy chủ bằng cách gọi lệnh:"
 
-#: branch.c:219
 #, c-format
 msgid "asked to inherit tracking from '%s', but no remote is set"
 msgstr ""
 "đã hỏi để kế thừa theo dõi từ '%s', nhưng không có máy chủ nào được đặt"
 
-#: branch.c:225
 #, c-format
 msgid "asked to inherit tracking from '%s', but no merge configuration is set"
 msgstr ""
 "đã hỏi để kế thừa theo dõi từ '%s', nhưng không có cấu hình hòa trộn nào "
 "được đặt"
 
-#: branch.c:277
 #, c-format
 msgid "not tracking: ambiguous information for ref '%s'"
 msgstr "không theo dõi: thông tin chưa rõ ràng cho tham chiếu '%s'"
 
+#. #-#-#-#-#  branch.c.po  #-#-#-#-#
 #. TRANSLATORS: This is a line listing a remote with duplicate
 #. refspecs in the advice message below. For RTL languages you'll
 #. probably want to swap the "%s" and leading "  " space around.
 #.
+#. #-#-#-#-#  object-name.c.po  #-#-#-#-#
 #. TRANSLATORS: This is line item of ambiguous object output
 #. from describe_ambiguous_object() above. For RTL languages
 #. you'll probably want to swap the "%s" and leading " " space
 #. around.
 #.
-#: branch.c:289 object-name.c:464
 #, c-format
 msgid "  %s\n"
 msgstr "  %s\n"
@@ -1979,7 +1598,6 @@ msgstr "  %s\n"
 #. TRANSLATORS: The second argument is a \n-delimited list of
 #. duplicate refspecs, composed above.
 #.
-#: branch.c:295
 #, c-format
 msgid ""
 "There are multiple remotes whose fetch refspecs map to the remote\n"
@@ -2000,34 +1618,28 @@ msgstr ""
 "các máy chủ khác nhau lấy các refspecs ánh xạ đến\n"
 "không gian tên theo dõi khác."
 
-#: branch.c:344
 #, c-format
 msgid "'%s' is not a valid branch name"
 msgstr "“%s” không phải là một tên nhánh hợp lệ"
 
-#: branch.c:364
 #, c-format
 msgid "a branch named '%s' already exists"
 msgstr "đã có nhánh mang tên “%s”"
 
-#: branch.c:370
 #, c-format
 msgid "cannot force update the branch '%s' checked out at '%s'"
 msgstr "không thể ép buộc cập nhật nhánh “%s” đã được lấy ra tại “%s”"
 
-#: branch.c:393
 #, c-format
 msgid "cannot set up tracking information; starting point '%s' is not a branch"
 msgstr ""
 "không thể cài đặt thông tin theo dõi; điểm bắt đầu “%s” không phải là một "
 "nhánh"
 
-#: branch.c:395
 #, c-format
 msgid "the requested upstream branch '%s' does not exist"
 msgstr "nhánh thượng nguồn đã yêu cầu “%s” không tồn tại"
 
-#: branch.c:397
 msgid ""
 "\n"
 "If you are planning on basing your work on an upstream\n"
@@ -2047,28 +1659,22 @@ msgstr ""
 "sẽ theo dõi bản đối chiếu máy chủ của nó, bạn cần dùng lệnh\n"
 "\"git push -u\" để đặt cấu hình thượng nguồn bạn muốn push."
 
-#: branch.c:445 builtin/replace.c:321 builtin/replace.c:377
-#: builtin/replace.c:423 builtin/replace.c:453
 #, c-format
 msgid "not a valid object name: '%s'"
 msgstr "không phải là tên đối tượng hợp lệ: “%s”"
 
-#: branch.c:465
 #, c-format
 msgid "ambiguous object name: '%s'"
 msgstr "tên đối tượng chưa rõ ràng: “%s”."
 
-#: branch.c:470
 #, c-format
 msgid "not a valid branch point: '%s'"
 msgstr "không phải là một điểm nhánh hợp lệ: “%s”"
 
-#: branch.c:658
 #, c-format
 msgid "submodule '%s': unable to find submodule"
 msgstr "mô-đun-con “%s”: không thể tìm thấy mô-đun-con"
 
-#: branch.c:661
 #, c-format
 msgid ""
 "You may try updating the submodules using 'git checkout %s && git submodule "
@@ -2077,8717 +1683,120 @@ msgstr ""
 "Bạn có thể thử cập nhật các mô-đun-con bằng cách sử dụng 'git checkout %s && "
 "git submodule update --init'"
 
-#: branch.c:672 branch.c:698
 #, c-format
 msgid "submodule '%s': cannot create branch '%s'"
 msgstr "mô-đun-con “%s”: không thể tạo nhánh “%s”"
 
-#: branch.c:730
 #, c-format
 msgid "'%s' is already checked out at '%s'"
 msgstr "“%s” đã được lấy ra tại “%s” rồi"
 
-#: branch.c:755
 #, c-format
 msgid "HEAD of working tree %s is not updated"
 msgstr "HEAD của cây làm việc %s chưa được cập nhật"
 
-#: bundle.c:45
-#, c-format
-msgid "unrecognized bundle hash algorithm: %s"
-msgstr "không hiểu thuật toán băm dữ liệu bundle: %s"
-
-#: bundle.c:53
-#, c-format
-msgid "unknown capability '%s'"
-msgstr "không hiểu dung lượng “%s”"
-
-#: bundle.c:79
-#, c-format
-msgid "'%s' does not look like a v2 or v3 bundle file"
-msgstr "“%s” không giống như tập tin v2 hay v3 bundle (định dạng dump của git)"
-
-#: bundle.c:118
-#, c-format
-msgid "unrecognized header: %s%s (%d)"
-msgstr "phần đầu không được thừa nhận: %s%s (%d)"
-
-#: bundle.c:145 rerere.c:464 rerere.c:675 sequencer.c:2616 sequencer.c:3402
-#: builtin/commit.c:865
-#, c-format
-msgid "could not open '%s'"
-msgstr "không thể mở “%s”"
-
-#: bundle.c:203
-msgid "Repository lacks these prerequisite commits:"
-msgstr "Kho chứa thiếu những lần chuyển giao tiên quyết này:"
-
-#: bundle.c:206
-msgid "need a repository to verify a bundle"
-msgstr "cần một kho chứa để thẩm tra một bundle"
-
-#: bundle.c:264
-#, c-format
-msgid "The bundle contains this ref:"
-msgid_plural "The bundle contains these %<PRIuMAX> refs:"
-msgstr[0] "Bó dữ liệu chứa %<PRIuMAX> tham chiếu:"
-
-#: bundle.c:272
-msgid "The bundle records a complete history."
-msgstr "Lệnh bundle ghi lại toàn bộ lịch sử."
-
-#: bundle.c:274
-#, c-format
-msgid "The bundle requires this ref:"
-msgid_plural "The bundle requires these %<PRIuMAX> refs:"
-msgstr[0] "Lệnh bundle yêu cầu %<PRIuMAX> tham chiếu này:"
-
-#: bundle.c:350
-msgid "unable to dup bundle descriptor"
-msgstr "không thể nhân đôi bộ mô tả bundle"
-
-#: bundle.c:357
-msgid "Could not spawn pack-objects"
-msgstr "Không thể sản sinh đối tượng gói"
-
-#: bundle.c:368
-msgid "pack-objects died"
-msgstr "đối tượng gói đã chết"
-
-#: bundle.c:417
-#, c-format
-msgid "ref '%s' is excluded by the rev-list options"
-msgstr "th.chiếu “%s” bị loại trừ bởi các tùy chọn rev-list"
-
-#: bundle.c:533 builtin/log.c:211 builtin/log.c:1975 builtin/shortlog.c:400
-#, c-format
-msgid "unrecognized argument: %s"
-msgstr "đối số không được thừa nhận: %s"
-
-#: bundle.c:548
-#, c-format
-msgid "unsupported bundle version %d"
-msgstr "phiên bản bundle %d không được hỗ trợ"
-
-#: bundle.c:550
-#, c-format
-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:600
-msgid "Refusing to create empty bundle."
-msgstr "Từ chối tạo một bó dữ liệu trống rỗng."
-
-#: bundle.c:610
-#, c-format
-msgid "cannot create '%s'"
-msgstr "không thể tạo “%s”"
-
-#: bundle.c:639
-msgid "index-pack died"
-msgstr "mục lục gói đã chết"
-
-#: chunk-format.c:117
-msgid "terminating chunk id appears earlier than expected"
-msgstr "mã mảnh kết thúc sớm hơn bình thường"
-
-#: chunk-format.c:126
-#, c-format
-msgid "improper chunk offset(s) %<PRIx64> and %<PRIx64>"
-msgstr "bù mảnh không đúng cách %<PRIx64> và %<PRIx64>"
-
-#: chunk-format.c:133
-#, c-format
-msgid "duplicate chunk ID %<PRIx32> found"
-msgstr "tìm thấy ID của mảnh bị trùng lặp %<PRIx32>"
-
-#: chunk-format.c:147
-#, c-format
-msgid "final chunk has non-zero id %<PRIx32>"
-msgstr "mảnh cuối cùng có id không bằng không %<PRIx32>"
-
-#: color.c:354
-#, c-format
-msgid "invalid color value: %.*s"
-msgstr "giá trị màu không hợp lệ: %.*s"
-
-#: commit-graph.c:204 midx.c:52
-msgid "invalid hash version"
-msgstr "phiên bản băm không hợp lệ"
-
-#: commit-graph.c:262
-msgid "commit-graph file is too small"
-msgstr "tập tin đồ-thị-các-lần-chuyển-giao quá nhỏ"
-
-#: commit-graph.c:355
-#, c-format
-msgid "commit-graph signature %X does not match signature %X"
-msgstr "chữ ký đồ-thị-các-lần-chuyển-giao %X không khớp chữ ký %X"
-
-#: commit-graph.c:362
-#, c-format
-msgid "commit-graph version %X does not match version %X"
-msgstr "phiên bản đồ-thị-các-lần-chuyển-giao %X không khớp phiên bản %X"
-
-#: commit-graph.c:369
-#, c-format
-msgid "commit-graph hash version %X does not match version %X"
-msgstr "phiên bản đồ-thị-các-lần-chuyển-giao %X không khớp phiên bản %X"
-
-#: commit-graph.c:386
-#, c-format
-msgid "commit-graph file is too small to hold %u chunks"
-msgstr "tập tin đồ-thị-các-lần-chuyển-giao quá nhỏ để giữ %u mảnh dữ liệu"
-
-#: commit-graph.c:485
-msgid "commit-graph has no base graphs chunk"
-msgstr "đồ-thị-các-lần-chuyển-giao có không có mảnh các đồ họa cơ sở"
-
-#: commit-graph.c:495
-msgid "commit-graph chain does not match"
-msgstr "móc xích đồ-thị-các-lần-chuyển-giao không khớp"
-
-#: commit-graph.c:543
-#, c-format
-msgid "invalid commit-graph chain: line '%s' not a hash"
-msgstr ""
-"móc xích đồ-thị-các-lần-chuyển-giao không hợp lệ: dòng “%s” không phải là "
-"một mã băm"
-
-#: commit-graph.c:567
-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:752 commit-graph.c:789
-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:773
-#, 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:806
-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:1111 builtin/am.c:1370 builtin/checkout.c:775
-#: builtin/clone.c:705
-#, 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:1373 builtin/pack-objects.c:3078
-#, 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:1404
-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:1421
-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:1441
-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:1460
-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:1513
-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:1598
-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:1675
-msgid "Collecting referenced commits"
-msgstr "Đang sưu tập các lần chuyển giao được tham chiếu"
-
-#: commit-graph.c:1701
-#, c-format
-msgid "Finding commits for commit graph in %<PRIuMAX> pack"
-msgid_plural "Finding commits for commit graph in %<PRIuMAX> packs"
-msgstr[0] ""
-"Đang tìm các lần chuyển giao cho đồ thị lần chuyển giao trong %<PRIuMAX> gói"
-
-#: commit-graph.c:1714
-#, c-format
-msgid "error adding pack %s"
-msgstr "gặp lỗi thêm gói %s"
-
-#: commit-graph.c:1718
-#, c-format
-msgid "error opening index for %s"
-msgstr "gặp lỗi khi mở mục lục cho “%s”"
-
-#: commit-graph.c:1756
-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:1774
-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:1823
-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:1854 midx.c:1168 builtin/sparse-checkout.c:475
-#, 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:1868
-msgid "unable to create temporary graph layer"
-msgstr "không thể tạo lớp sơ đồ tạm thời"
-
-#: commit-graph.c:1873
-#, 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:1930
-#, 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:1967
-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:1983
-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:2004
-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:2137
-msgid "Scanning merged commits"
-msgstr "Đang quét các lần chuyển giao đã hòa trộn"
-
-#: commit-graph.c:2181
-msgid "Merging commit-graph"
-msgstr "Đang hòa trộn đồ-thị-các-lần-chuyển-giao"
-
-#: commit-graph.c:2289
-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:2396
-msgid "too many commits to write graph"
-msgstr "có quá nhiều lần chuyển giao để ghi đồ thị"
-
-#: commit-graph.c:2494
-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:2504
-#, 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:2514 commit-graph.c:2529
-#, 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:2521
-#, 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:2539
-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:2554
-#, 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:2561
-#, 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:2571
-#, 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:2580
-#, 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:2594
-#, 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:2599
-#, c-format
-msgid ""
-"commit-graph has generation number zero for commit %s, but non-zero elsewhere"
-msgstr ""
-"đồ-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:2603
-#, c-format
-msgid ""
-"commit-graph has non-zero generation number for commit %s, but zero elsewhere"
-msgstr ""
-"đồ-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:2620
-#, 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:2626
-#, 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:54 sequencer.c:3105 builtin/am.c:400 builtin/am.c:445
-#: builtin/am.c:450 builtin/am.c:1449 builtin/am.c:2124 builtin/replace.c:456
-#, c-format
-msgid "could not parse %s"
-msgstr "không thể phân tích cú pháp %s"
-
-#: commit.c:56
-#, 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:197
-msgid ""
-"Support for <GIT_DIR>/info/grafts is deprecated\n"
-"and will be removed in a future Git version.\n"
-"\n"
-"Please use \"git replace --convert-graft-file\"\n"
-"to convert the grafts into replace refs.\n"
-"\n"
-"Turn this message off by running\n"
-"\"git config advice.graftFileDeprecated false\""
-msgstr ""
-"Việc hỗ trợ cho <GIT_DIR>/info/grafts đã lạc hậu\n"
-"và sẽ bị xóa bỏ ở phiên bản Git tương lai.\n"
-"\n"
-"Vui lòng dùng \"git replace --convert-graft-file\"\n"
-"để chuyển đổi các graft thành các tham chiếu thay thế.\n"
-"\n"
-"Tắt lời nhắn này bằng cách chạy\n"
-"\"git config advice.graftFileDeprecated false\""
-
-#: commit.c:1252
-#, 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:1256
-#, 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:1259
-#, 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:1262
-#, 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:1516
-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"
-"variable i18n.commitencoding to the encoding your project uses.\n"
-msgstr ""
-"Cảnh báo: ghi chú cho lần chuyển giao không hợp chuẩn UTF-8.\n"
-"Bạn có lẽ muốn tu bổ nó sau khi sửa lời chú thích, hoặc là đặt biến\n"
-"cấu hình i18n.commitencoding thành bảng mã mà dự án của bạn muốn dùng.\n"
-
-#: compat/obstack.c:406 compat/obstack.c:408
-msgid "memory exhausted"
-msgstr "hết bộ nhớ"
-
-#: compat/terminal.c:167
-msgid "cannot resume in the background, please use 'fg' to resume"
-msgstr ""
-"không thể khôi phục lại trong nền hệ thống, vui lòng sử dụng 'fg' để khôi "
-"phục lại"
-
-#: compat/terminal.c:168
-msgid "cannot restore terminal settings"
-msgstr "không thể phục hồi lại các cài đặt thiết bị cuối"
-
-#: config.c:143
-#, c-format
-msgid ""
-"exceeded maximum include depth (%d) while including\n"
-"\t%s\n"
-"from\n"
-"\t%s\n"
-"This might be due to circular includes."
-msgstr ""
-"vượt quá độ sâu bao gồm tối đa (%d) trong khi bao gồm\n"
-"\t%s\n"
-"từ\n"
-"\t%s\n"
-"Nguyên nhân có thể là gồm quẩn vòng."
-
-#: config.c:159
-#, c-format
-msgid "could not expand include path '%s'"
-msgstr "không thể khai triển đường dẫn “%s”"
-
-#: config.c:170
-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:219
-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:364
-msgid ""
-"remote URLs cannot be configured in file directly or indirectly included by "
-"includeIf.hasconfig:remote.*.url"
-msgstr ""
-"các URL máy chủ không thể được cấu hình trong tệp trực tiếp hoặc gián tiếp "
-"được bao gồm bởi includeIf.hasconfig:remote.*.url"
-
-#: config.c:508
-#, c-format
-msgid "invalid config format: %s"
-msgstr "định dạng cấu hình không hợp lệ: %s"
-
-#: config.c:512
-#, 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”"
-
-#: config.c:517
-#, 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”"
-
-#: config.c:553
-#, c-format
-msgid "key does not contain a section: %s"
-msgstr "khóa không chứa một phần: %s"
-
-#: config.c:558
-#, c-format
-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:580 sequencer.c:2802
-#, c-format
-msgid "invalid key: %s"
-msgstr "khóa không đúng: %s"
-
-#: config.c:585
-#, c-format
-msgid "invalid key (newline): %s"
-msgstr "khóa không hợp lệ (dòng mới): %s"
-
-#: config.c:605
-msgid "empty config key"
-msgstr "khóa cấu hình trống rỗng"
-
-#: config.c:623 config.c:635
-#, c-format
-msgid "bogus config parameter: %s"
-msgstr "tham số cấu hình không có thực: %s"
-
-#: config.c:649 config.c:666 config.c:673 config.c:682
-#, c-format
-msgid "bogus format in %s"
-msgstr "định dạng không có thực trong %s"
-
-#: config.c:716
-#, c-format
-msgid "bogus count in %s"
-msgstr "số lượng không có thực trong %s"
-
-#: config.c:720
-#, c-format
-msgid "too many entries in %s"
-msgstr "quá nhiều mục tin trong %s"
-
-#: config.c:730
-#, c-format
-msgid "missing config key %s"
-msgstr "thiếu khóa cấu hình “%s”"
-
-#: config.c:738
-#, c-format
-msgid "missing config value %s"
-msgstr "thiếu giá trị cấu hình “%s”"
-
-#: config.c:1089
-#, 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:1093
-#, 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:1097
-#, 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:1101
-#, 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:1105
-#, 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:1109
-#, c-format
-msgid "bad config line %d in %s"
-msgstr "cấu hình sai tại dòng %d trong %s"
-
-#: config.c:1246
-msgid "out of range"
-msgstr "nằm ngoài phạm vi"
-
-#: config.c:1246
-msgid "invalid unit"
-msgstr "đơn vị không hợp lệ"
-
-#: config.c:1247
-#, 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:1257
-#, 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:1260
-#, 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:1263
-#, 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:1266
-#, 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:1269
-#, 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:1272
-#, 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:1368
-#, c-format
-msgid "invalid value for variable %s"
-msgstr "giá trị không hợp lệ cho biến %s"
-
-#: config.c:1389
-#, c-format
-msgid "ignoring unknown core.fsync component '%s'"
-msgstr "bỏ qua thành phần core.fsync chưa biết '%s'"
-
-#: config.c:1425
-#, 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:1443
-#, 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:1452
-#, 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:1545
-#, 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:1559 config.c:1570
-#, c-format
-msgid "bad zlib compression level %d"
-msgstr "mức nén zlib %d là sai"
-
-#: config.c:1660
-msgid "core.commentChar should only be one character"
-msgstr "core.commentChar chỉ được có một ký tự"
-
-#: config.c:1692
-#, c-format
-msgid "ignoring unknown core.fsyncMethod value '%s'"
-msgstr "bỏ qua giá trị core.fsyncMethod chưa biết '%s'"
-
-#: config.c:1698
-msgid "core.fsyncObjectFiles is deprecated; use core.fsync instead"
-msgstr "core.fsyncObjectFiles đã lạc hậu; hãy dùng core.fsync để thay thế"
-
-#: config.c:1714
-#, 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:1800
-#, c-format
-msgid "malformed value for %s"
-msgstr "giá trị cho %s sai dạng"
-
-#: config.c:1826
-#, c-format
-msgid "malformed value for %s: %s"
-msgstr "giá trị cho %s sai dạng: %s"
-
-#: config.c:1827
-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:1888 builtin/pack-objects.c:4078
-#, c-format
-msgid "bad pack compression level %d"
-msgstr "mức nén gói %d không hợp lệ"
-
-#: config.c:2014
-#, 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:2017
-#, 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:2035
-#, 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:2080
-#, c-format
-msgid "failed to parse %s"
-msgstr "gặp lỗi khi phân tích cú pháp %s"
-
-#: config.c:2136
-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:2512
-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:2686
-#, c-format
-msgid "Invalid %s: '%s'"
-msgstr "%s không hợp lệ: “%s”"
-
-#: config.c:2731
-#, 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:2763
-#, 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:2765
-#, 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:2850
-#, c-format
-msgid "invalid section name '%s'"
-msgstr "tên của phần không hợp lệ “%s”"
-
-#: config.c:2882
-#, c-format
-msgid "%s has multiple values"
-msgstr "%s có đa giá trị"
-
-#: config.c:2911
-#, 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:3177 config.c:3518
-#, 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:3188
-#, c-format
-msgid "opening %s"
-msgstr "đang mở “%s”"
-
-#: config.c:3225 builtin/config.c:361
-#, c-format
-msgid "invalid pattern: %s"
-msgstr "mẫu không hợp lệ: %s"
-
-#: config.c:3250
-#, c-format
-msgid "invalid config file %s"
-msgstr "tập tin cấu hình “%s” không hợp lệ"
-
-#: config.c:3263 config.c:3531
-#, c-format
-msgid "fstat on %s failed"
-msgstr "fstat trên %s gặp lỗi"
-
-#: config.c:3274
-#, c-format
-msgid "unable to mmap '%s'%s"
-msgstr "không thể mmap “%s”%s"
-
-#: config.c:3284 config.c:3536
-#, c-format
-msgid "chmod on %s failed"
-msgstr "chmod trên %s gặp lỗi"
-
-#: config.c:3369 config.c:3633
-#, c-format
-msgid "could not write config file %s"
-msgstr "không thể ghi tập tin cấu hình “%s”"
-
-#: config.c:3403
-#, c-format
-msgid "could not set '%s' to '%s'"
-msgstr "không thể đặt “%s” thành “%s”"
-
-#: config.c:3405 builtin/remote.c:666 builtin/remote.c:885 builtin/remote.c:893
-#, c-format
-msgid "could not unset '%s'"
-msgstr "không thể thôi đặt “%s”"
-
-#: config.c:3509
-#, c-format
-msgid "invalid section name: %s"
-msgstr "tên của phần không hợp lệ: %s"
-
-#: config.c:3676
-#, c-format
-msgid "missing value for '%s'"
-msgstr "thiếu giá trị cho cho “%s”"
-
-#: connect.c:61
-msgid "the remote end hung up upon initial contact"
-msgstr "máy chủ bị treo trên lần tiếp xúc đầu tiên"
-
-#: connect.c:63
-msgid ""
-"Could not read from remote repository.\n"
-"\n"
-"Please make sure you have the correct access rights\n"
-"and the repository exists."
-msgstr ""
-"Không thể đọc từ kho trên mạng.\n"
-"\n"
-"Vui lòng chắc chắn là bạn có đủ thẩm quyền truy cập\n"
-"và kho chứa đã sẵn có."
-
-#: connect.c:81
-#, c-format
-msgid "server doesn't support '%s'"
-msgstr "máy chủ không hỗ trợ “%s”"
-
-#: connect.c:118
-#, c-format
-msgid "server doesn't support feature '%s'"
-msgstr "máy chủ không hỗ trợ tính năng “%s”"
-
-#: connect.c:129
-msgid "expected flush after capabilities"
-msgstr "cần đẩy dữ liệu lên đĩa sau các capabilities"
-
-#: 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:286
-msgid "protocol error: unexpected capabilities^{}"
-msgstr "lỗi giao thức: không cần capabilities^{}"
-
-#: 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: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:349
-msgid "invalid packet"
-msgstr "gói không hợp lệ"
-
-#: connect.c:369
-#, c-format
-msgid "protocol error: unexpected '%s'"
-msgstr "lỗi giao thức: không cần “%s”"
-
-#: 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:528
-#, c-format
-msgid "invalid ls-refs response: %s"
-msgstr "trả về của ls-refs không hợp lệ: %s"
-
-#: 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: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:670
-#, c-format
-msgid "protocol '%s' is not supported"
-msgstr "giao thức “%s” chưa được hỗ trợ"
-
-#: connect.c:721
-msgid "unable to set SO_KEEPALIVE on socket"
-msgstr "không thể đặt SO_KEEPALIVE trên ổ cắm"
-
-#: connect.c:761 connect.c:824
-#, c-format
-msgid "Looking up %s ... "
-msgstr "Đang tìm kiếm %s … "
-
-#: 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:769 connect.c:840
-#, c-format
-msgid ""
-"done.\n"
-"Connecting to %s (port %s) ... "
-msgstr ""
-"xong.\n"
-"Đang kết nối đến %s (cổng %s) … "
-
-#: connect.c:791 connect.c:868
-#, c-format
-msgid ""
-"unable to connect to %s:\n"
-"%s"
-msgstr ""
-"không thể kết nối đến %s:\n"
-"%s"
-
-#. TRANSLATORS: this is the end of "Connecting to %s (port %s) ... "
-#: connect.c:797 connect.c:874
-msgid "done."
-msgstr "hoàn tất."
-
-#: connect.c:828
-#, c-format
-msgid "unable to look up %s (%s)"
-msgstr "không thể tìm thấy %s (%s)"
-
-#: connect.c:834
-#, c-format
-msgid "unknown port %s"
-msgstr "không hiểu cổng %s"
-
-#: connect.c:971 connect.c:1303
-#, c-format
-msgid "strange hostname '%s' blocked"
-msgstr "đã khóa tên máy lạ “%s”"
-
-#: connect.c:973
-#, c-format
-msgid "strange port '%s' blocked"
-msgstr "đã khóa cổng lạ “%s”"
-
-#: connect.c:983
-#, c-format
-msgid "cannot start proxy %s"
-msgstr "không thể khởi chạy ủy nhiệm “%s”"
-
-#: 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: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:1251
-msgid "ssh variant 'simple' does not support -4"
-msgstr "ssh biến thể “simple” không hỗ trợ -4"
-
-#: connect.c:1263
-msgid "ssh variant 'simple' does not support -6"
-msgstr "ssh biến thể “simple” không hỗ trợ -6"
-
-#: 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:1392
-#, c-format
-msgid "strange pathname '%s' blocked"
-msgstr "đã khóa tên đường dẫn lạ “%s”"
-
-#: connect.c:1440
-msgid "unable to fork"
-msgstr "không thể rẽ nhánh tiến trình con"
-
-#: connected.c:109 builtin/fsck.c:189 builtin/prune.c:57
-msgid "Checking connectivity"
-msgstr "Đang kiểm tra kết nối"
-
-#: connected.c:122
-msgid "Could not run 'git rev-list'"
-msgstr "Không thể chạy “git rev-list”"
-
-#: connected.c:146
-msgid "failed write to rev-list"
-msgstr "gặp lỗi khi ghi vào rev-list"
-
-#: 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"
-
-#: convert.c:183
-#, c-format
-msgid "illegal crlf_action %d"
-msgstr "crlf_action %d không hợp lệ"
-
-#: convert.c:196
-#, c-format
-msgid "CRLF would be replaced by LF in %s"
-msgstr "CRLF nên được thay bằng LF trong %s"
-
-#: convert.c:198
-#, c-format
-msgid ""
-"CRLF will be replaced by LF in %s.\n"
-"The file will have its original line endings in your working directory"
-msgstr ""
-"CRLF sẽ bị thay thế bằng LF trong %s.\n"
-"Tập tin sẽ có kiểu xuống dòng như bản gốc trong thư mục làm việc của bạn"
-
-#: convert.c:206
-#, c-format
-msgid "LF would be replaced by CRLF in %s"
-msgstr "LF nên thay bằng CRLF trong %s"
-
-#: convert.c:208
-#, c-format
-msgid ""
-"LF will be replaced by CRLF in %s.\n"
-"The file will have its original line endings in your working directory"
-msgstr ""
-"LF sẽ bị thay thế bằng CRLF trong %s.\n"
-"Tập tin sẽ có kiểu xuống dòng như bản gốc trong thư mục làm việc của bạn"
-
-#: convert.c:273
-#, c-format
-msgid "BOM is prohibited in '%s' if encoded as %s"
-msgstr "BOM bị cấm trong “%s” nếu được mã hóa là %s"
-
-#: convert.c:280
-#, c-format
-msgid ""
-"The file '%s' contains a byte order mark (BOM). Please use UTF-%.*s as "
-"working-tree-encoding."
-msgstr ""
-"Tập tin “%s” có chứa ký hiệu thứ tự byte (BOM). Vui lòng dùng UTF-%.*s như "
-"là bảng mã cây làm việc."
-
-#: convert.c:293
-#, c-format
-msgid "BOM is required in '%s' if encoded as %s"
-msgstr "BOM là bắt buộc trong “%s” nếu được mã hóa là %s"
-
-#: 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."
-msgstr ""
-"Tập tin “%s” còn thiếu ký hiệu thứ tự byte (BOM). Vui lòng dùng UTF-%sBE hay "
-"UTF-%sLE (còn phục thuộc vào thứ tự byte) như là bảng mã cây làm việc."
-
-#: convert.c:408 convert.c:479
-#, c-format
-msgid "failed to encode '%s' from %s to %s"
-msgstr "gặp lỗi khi mã hóa “%s”  từ “%s” sang “%s”"
-
-#: convert.c:451
-#, c-format
-msgid "encoding '%s' from %s to %s and back is not the same"
-msgstr "mã hóa “%s” từ %s thành %s và ngược trở lại không phải là cùng"
-
-#: convert.c:654
-#, c-format
-msgid "cannot fork to run external filter '%s'"
-msgstr "không thể rẽ nhánh tiến trình để chạy bộ lọc bên ngoài “%s”"
-
-#: convert.c:674
-#, c-format
-msgid "cannot feed the input to external filter '%s'"
-msgstr "không thể cấp đầu vào cho bộ lọc bên ngoài “%s”"
-
-#: convert.c:681
-#, c-format
-msgid "external filter '%s' failed %d"
-msgstr "chạy bộ lọc bên ngoài “%s” gặp lỗi %d"
-
-#: convert.c:716 convert.c:719
-#, c-format
-msgid "read from external filter '%s' failed"
-msgstr "đọc từ bộ lọc bên ngoài “%s” gặp lỗi"
-
-#: convert.c:722 convert.c:777
-#, c-format
-msgid "external filter '%s' failed"
-msgstr "gặp lỗi khi chạy bộ lọc bên ngoài “%s”"
-
-#: convert.c:826
-msgid "unexpected filter type"
-msgstr "gặp kiểu bộ lọc thừa"
-
-#: convert.c:837
-msgid "path name too long for external filter"
-msgstr "tên đường dẫn quá dài cho bộ lọc bên ngoài"
-
-#: convert.c:935
-#, c-format
-msgid ""
-"external filter '%s' is not available anymore although not all paths have "
-"been filtered"
-msgstr ""
-"bộ lọc bên ngoài “%s” không sẵn sàng nữa mặc dù không phải tất cả các đường "
-"dẫn đã được lọc"
-
-#: convert.c:1236
-msgid "true/false are no valid working-tree-encodings"
-msgstr "true/false là không phải bảng-mã-cây-làm-việc hợp lệ"
-
-#: convert.c:1416 convert.c:1449
-#, c-format
-msgid "%s: clean filter '%s' failed"
-msgstr "%s: gặp lỗi khi xóa bộ lọc “%s”"
-
-#: convert.c:1492
-#, c-format
-msgid "%s: smudge filter %s failed"
-msgstr "%s: smudge bộ lọc %s gặp lỗi"
-
-#: credential.c:96
-#, c-format
-msgid "skipping credential lookup for key: credential.%s"
-msgstr "bỏ qua tìm kiếm giấy chứng chực cho khóa: credential.%s"
-
-#: credential.c:112
-msgid "refusing to work with credential missing host field"
-msgstr "từ chối làm việc với giấy chứng thực thiếu trường máy chủ"
-
-#: credential.c:114
-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:396
-#, 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:440
-#, c-format
-msgid "url has no scheme: %s"
-msgstr "url không có lược đồ: %s"
-
-#: credential.c:513
-#, 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"
-
-#: date.c:139
-msgid "in the future"
-msgstr "ở thời tương lai"
-
-#: date.c:145
-#, c-format
-msgid "%<PRIuMAX> second ago"
-msgid_plural "%<PRIuMAX> seconds ago"
-msgstr[0] "%<PRIuMAX> giây trước"
-
-#: date.c:152
-#, c-format
-msgid "%<PRIuMAX> minute ago"
-msgid_plural "%<PRIuMAX> minutes ago"
-msgstr[0] "%<PRIuMAX> phút trước"
-
-#: date.c:159
-#, c-format
-msgid "%<PRIuMAX> hour ago"
-msgid_plural "%<PRIuMAX> hours ago"
-msgstr[0] "%<PRIuMAX> giờ trước"
-
-#: date.c:166
-#, c-format
-msgid "%<PRIuMAX> day ago"
-msgid_plural "%<PRIuMAX> days ago"
-msgstr[0] "%<PRIuMAX> ngày trước"
-
-#: date.c:172
-#, c-format
-msgid "%<PRIuMAX> week ago"
-msgid_plural "%<PRIuMAX> weeks ago"
-msgstr[0] "%<PRIuMAX> tuần trước"
-
-#: date.c:179
-#, c-format
-msgid "%<PRIuMAX> month ago"
-msgid_plural "%<PRIuMAX> months ago"
-msgstr[0] "%<PRIuMAX> tháng trước"
-
-#: date.c:190
-#, c-format
-msgid "%<PRIuMAX> year"
-msgid_plural "%<PRIuMAX> years"
-msgstr[0] "%<PRIuMAX> năm"
-
-#. TRANSLATORS: "%s" is "<n> years"
-#: date.c:193
-#, c-format
-msgid "%s, %<PRIuMAX> month ago"
-msgid_plural "%s, %<PRIuMAX> months ago"
-msgstr[0] "%s, %<PRIuMAX> tháng trước"
-
-#: date.c:198 date.c:203
-#, c-format
-msgid "%<PRIuMAX> year ago"
-msgid_plural "%<PRIuMAX> years ago"
-msgstr[0] "%<PRIuMAX> năm trước"
-
-#: delta-islands.c:272
-msgid "Propagating island marks"
-msgstr "Đang lan truyền các đánh dấu island"
-
-#: delta-islands.c:290
-#, c-format
-msgid "bad tree object %s"
-msgstr "đối tượng cây sai “%s”"
-
-#: delta-islands.c:334
-#, c-format
-msgid "failed to load island regex for '%s': %s"
-msgstr "gặp lỗi khi tải biểu thức chính quy island cho “%s”: %s"
-
-#: delta-islands.c:390
-#, c-format
-msgid "island regex from config has too many capture groups (max=%d)"
-msgstr ""
-"biểu thức chính quy island từ cấu hình có quá nhiều nhóm chụp (tối đa=%d)"
-
-#: delta-islands.c:467
-#, c-format
-msgid "Marked %d islands, done.\n"
-msgstr "Đã đánh dấu %d island, xong.\n"
-
-#: diff-merges.c:81 gpg-interface.c:719 gpg-interface.c:734 ls-refs.c:37
-#: parallel-checkout.c:42 sequencer.c:2805 setup.c:563 builtin/am.c:203
-#: builtin/am.c:2243 builtin/am.c:2287 builtin/blame.c:724 builtin/blame.c:742
-#: builtin/fetch.c:792 builtin/pack-objects.c:3515 builtin/pull.c:45
-#: builtin/pull.c:47 builtin/pull.c:321
-#, c-format
-msgid "invalid value for '%s': '%s'"
-msgstr "giá trị không hợp lệ cho '%s': '%s'"
-
-#: 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: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:580
-msgid "unable to get HEAD"
-msgstr "không thể lấy HEAD"
-
-#: 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:589
-msgid "multiple merge bases found"
-msgstr "có nhiều cơ sở để hòa trộn"
-
-#: diff-no-index.c:237
-msgid "git diff --no-index [<options>] <path> <path>"
-msgstr "git diff --no-index [<các tùy chọn>] </đường/dẫn> </đường/dẫn>"
-
-#: diff-no-index.c:262
-msgid ""
-"Not a git repository. Use --no-index to compare two paths outside a working "
-"tree"
-msgstr ""
-"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:159
-#, 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:164
-#, c-format
-msgid "  Unknown dirstat parameter '%s'\n"
-msgstr "  Không hiểu đối số dirstat “%s”\n"
-
-#: diff.c:300
-msgid ""
-"color moved setting must be one of 'no', 'default', 'blocks', 'zebra', "
-"'dimmed-zebra', 'plain'"
-msgstr ""
-"cài đặt màu đã di chuyển phải là một trong “no”, “default”, “blocks”, "
-"“zebra”, “dimmed-zebra”, “plain”"
-
-#: diff.c:328
-#, 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 ""
-"không hiểu chế độ color-moved-ws “%s”, các giá trị có thể là “ignore-space-"
-"change”, “ignore-space-at-eol”, “ignore-all-space”, “allow-indentation-"
-"change”"
-
-#: diff.c:336
-msgid ""
-"color-moved-ws: allow-indentation-change cannot be combined with other "
-"whitespace modes"
-msgstr ""
-"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:413
-#, 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:473
-#, c-format
-msgid ""
-"Found errors in 'diff.dirstat' config variable:\n"
-"%s"
-msgstr ""
-"Tìm thấy các lỗi trong biến cấu hình “diff.dirstat”:\n"
-"%s"
-
-#: diff.c:4282
-#, 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:4677 parse-options.c:1114
-#, c-format
-msgid "options '%s', '%s', '%s', and '%s' cannot be used together"
-msgstr "tùy chọn '%s', '%s', '%s' và '%s' không thể dùng cùng nhau"
-
-#: diff.c:4681 parse-options.c:1118 builtin/worktree.c:578
-#, c-format
-msgid "options '%s', '%s', and '%s' cannot be used together"
-msgstr "tùy chọn '%s', '%s' và '%s' không thể dùng cùng nhau"
-
-#: diff.c:4685
-#, c-format
-msgid "options '%s' and '%s' cannot be used together, use '%s' with '%s'"
-msgstr "tùy chọn '%s' và '%s' không thể dùng cùng nhau, dùng '%s' với '%s'"
-
-#: diff.c:4689
-#, c-format
-msgid ""
-"options '%s' and '%s' cannot be used together, use '%s' with '%s' and '%s'"
-msgstr ""
-"tùy chọn '%s' và '%s' không thể dùng cùng nhau, dùng '%s' với '%s' và '%s'"
-
-#: diff.c:4769
-msgid "--follow requires exactly one pathspec"
-msgstr "--follow cần chính xác một đặc tả đường dẫn"
-
-#: diff.c:4823
-#, c-format
-msgid "invalid --stat value: %s"
-msgstr "giá trị --stat không hợp lệ: “%s”"
-
-#: diff.c:4828 diff.c:4833 diff.c:4838 diff.c:4843 diff.c:5319
-#: 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:4860
-#, c-format
-msgid ""
-"Failed to parse --dirstat/-X option parameter:\n"
-"%s"
-msgstr ""
-"Gặp lỗi khi phân tích đối số tùy chọn --dirstat/-X:\n"
-"%s"
-
-#: diff.c:4893
-#, 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:4917
-#, c-format
-msgid "unknown value after ws-error-highlight=%.*s"
-msgstr "không hiểu giá trị sau ws-error-highlight=%.*s"
-
-#: diff.c:4931
-#, c-format
-msgid "unable to resolve '%s'"
-msgstr "không thể phân giải “%s”"
-
-#: diff.c:4981 diff.c:4987
-#, c-format
-msgid "%s expects <n>/<m> form"
-msgstr "%s cần dạng <n>/<m>"
-
-#: diff.c:4999
-#, 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:5020
-#, c-format
-msgid "bad --color-moved argument: %s"
-msgstr "đối số --color-moved sai: %s"
-
-#: diff.c:5039
-#, c-format
-msgid "invalid mode '%s' in --color-moved-ws"
-msgstr "chế độ “%s” không hợp lệ trong --color-moved-ws"
-
-#: diff.c:5079
-msgid ""
-"option diff-algorithm accepts \"myers\", \"minimal\", \"patience\" and "
-"\"histogram\""
-msgstr ""
-"tùy chọn  diff-algorithm chấp nhận \"myers\", \"minimal\", \"patience\" và "
-"\"histogram\""
-
-#: diff.c:5115 diff.c:5135
-#, c-format
-msgid "invalid argument to %s"
-msgstr "tham số cho %s không hợp lệ"
-
-#: diff.c:5239
-#, 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:5288
-#, 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:5344
-#, c-format
-msgid "bad --word-diff argument: %s"
-msgstr "đối số --word-diff sai: %s"
-
-#: diff.c:5380
-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:5382 diff.c:5388
-msgid "generate patch"
-msgstr "tạo miếng vá"
-
-#: diff.c:5385 builtin/log.c:180
-msgid "suppress diff output"
-msgstr "chặn mọi kết xuất từ diff"
-
-#: diff.c:5390 diff.c:5504 diff.c:5511
-msgid "<n>"
-msgstr "<n>"
-
-#: diff.c:5391 diff.c:5394
-msgid "generate diffs with <n> lines context"
-msgstr "tạo khác biệt với <n> dòng ngữ cảnh"
-
-#: diff.c:5396
-msgid "generate the diff in raw format"
-msgstr "tạo khác biệt ở định dạng thô"
-
-#: diff.c:5399
-msgid "synonym for '-p --raw'"
-msgstr "đồng nghĩa với “-p --raw”"
-
-#: diff.c:5403
-msgid "synonym for '-p --stat'"
-msgstr "đồng nghĩa với “-p --stat”"
-
-#: diff.c:5407
-msgid "machine friendly --stat"
-msgstr "--stat thuận tiện cho máy đọc"
-
-#: diff.c:5410
-msgid "output only the last line of --stat"
-msgstr "chỉ xuất những dòng cuối của --stat"
-
-#: diff.c:5412 diff.c:5420
-msgid "<param1,param2>..."
-msgstr "<tham_số_1,tham_số_2>…"
-
-#: diff.c:5413
-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:5417
-msgid "synonym for --dirstat=cumulative"
-msgstr "đồng nghĩa với --dirstat=cumulative"
-
-#: diff.c:5421
-msgid "synonym for --dirstat=files,param1,param2..."
-msgstr "đồng nghĩa với --dirstat=files,param1,param2…"
-
-#: diff.c:5425
-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:5428
-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:5431
-msgid "show only names of changed files"
-msgstr "chỉ hiển thị tên của các tập tin đổi"
-
-#: diff.c:5434
-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:5436
-msgid "<width>[,<name-width>[,<count>]]"
-msgstr "<rộng>[,<name-width>[,<số-lượng>]]"
-
-#: diff.c:5437
-msgid "generate diffstat"
-msgstr "tạo diffstat"
-
-#: diff.c:5439 diff.c:5442 diff.c:5445
-msgid "<width>"
-msgstr "<rộng>"
-
-#: diff.c:5440
-msgid "generate diffstat with a given width"
-msgstr "tạo diffstat với độ rộng đã cho"
-
-#: diff.c:5443
-msgid "generate diffstat with a given name width"
-msgstr "tạo diffstat với tên độ rộng đã cho"
-
-#: diff.c:5446
-msgid "generate diffstat with a given graph width"
-msgstr "tạo diffstat với độ rộng đồ thị đã cho"
-
-#: diff.c:5448
-msgid "<count>"
-msgstr "<số_lượng>"
-
-#: diff.c:5449
-msgid "generate diffstat with limited lines"
-msgstr "tạo diffstat với các dòng bị giới hạn"
-
-#: diff.c:5452
-msgid "generate compact summary in diffstat"
-msgstr "tạo tổng hợp xúc tích trong diffstat"
-
-#: diff.c:5455
-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:5458
-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:5460
-msgid "show colored diff"
-msgstr "hiển thị thay đổi được tô màu"
-
-#: diff.c:5461
-msgid "<kind>"
-msgstr "<kiểu>"
-
-#: diff.c:5462
-msgid ""
-"highlight whitespace errors in the 'context', 'old' or 'new' lines in the "
-"diff"
-msgstr ""
-"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:5465
-msgid ""
-"do not munge pathnames and use NULs as output field terminators in --raw or "
-"--numstat"
-msgstr ""
-"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:5468 diff.c:5471 diff.c:5474 diff.c:5583
-msgid "<prefix>"
-msgstr "<tiền_tố>"
-
-#: diff.c:5469
-msgid "show the given source prefix instead of \"a/\""
-msgstr "hiển thị tiền tố nguồn đã cho thay cho \"a/\""
-
-#: diff.c:5472
-msgid "show the given destination prefix instead of \"b/\""
-msgstr "hiển thị tiền tố đích đã cho thay cho \"b/\""
-
-#: diff.c:5475
-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:5478
-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:5481
-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:5485 diff.c:5490 diff.c:5495
-msgid "<char>"
-msgstr "<ký_tự>"
-
-#: diff.c:5486
-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:5491
-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:5496
-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:5499
-msgid "Diff rename options"
-msgstr "Tùy chọn khác biệt đổi tên"
-
-#: diff.c:5500
-msgid "<n>[/<m>]"
-msgstr "<n>[/<m>]"
-
-#: diff.c:5501
-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:5505
-msgid "detect renames"
-msgstr "dò tìm các tên thay đổi"
-
-#: diff.c:5509
-msgid "omit the preimage for deletes"
-msgstr "bỏ qua preimage (tiền ảnh??) cho các việc xóa"
-
-#: diff.c:5512
-msgid "detect copies"
-msgstr "dò bản sao"
-
-#: diff.c:5516
-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:5518
-msgid "disable rename detection"
-msgstr "tắt dò tìm đổi tên"
-
-#: diff.c:5521
-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:5523
-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:5526
-msgid ""
-"prevent rename/copy detection if the number of rename/copy targets exceeds "
-"given limit"
-msgstr ""
-"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:5528
-msgid "Diff algorithm options"
-msgstr "Tùy chọn thuật toán khác biệt"
-
-#: diff.c:5530
-msgid "produce the smallest possible diff"
-msgstr "sản sinh khác biệt ít nhất có thể"
-
-#: diff.c:5533
-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:5536
-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:5539
-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:5542
-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:5545
-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:5547 diff.c:5569 diff.c:5572 diff.c:5617
-msgid "<regex>"
-msgstr "<regex>"
-
-#: diff.c:5548
-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:5551
-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:5554
-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:5558
-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:5560
-msgid "<algorithm>"
-msgstr "<thuật toán>"
-
-#: diff.c:5561
-msgid "choose a diff algorithm"
-msgstr "chọn một thuật toán khác biệt"
-
-#: diff.c:5563
-msgid "<text>"
-msgstr "<văn bản>"
-
-#: diff.c:5564
-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:5566 diff.c:5575 diff.c:5578
-msgid "<mode>"
-msgstr "<chế độ>"
-
-#: diff.c:5567
-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:5570
-msgid "use <regex> to decide what a word is"
-msgstr "dùng <regex> để quyết định từ là cái gì"
-
-#: diff.c:5573
-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:5576
-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:5579
-msgid "how white spaces are ignored in --color-moved"
-msgstr "cách bỏ qua khoảng trắng trong --color-moved"
-
-#: diff.c:5582
-msgid "Other diff options"
-msgstr "Các tùy chọn khác biệt khác"
-
-#: diff.c:5584
-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:5588
-msgid "treat all files as text"
-msgstr "coi mọi tập tin là dạng văn bản thường"
-
-#: diff.c:5590
-msgid "swap two inputs, reverse the diff"
-msgstr "tráo đổi hai đầu vào, đảo ngược khác biệt"
-
-#: diff.c:5592
-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:5594
-msgid "disable all output of the program"
-msgstr "tắt mọi kết xuất của chương trình"
-
-#: diff.c:5596
-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:5598
-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:5600
-msgid "<when>"
-msgstr "<khi>"
-
-#: diff.c:5601
-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:5604
-msgid "<format>"
-msgstr "<định dạng>"
-
-#: diff.c:5605
-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:5609
-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:5612
-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:5614
-msgid "<string>"
-msgstr "<chuỗi>"
-
-#: diff.c:5615
-msgid ""
-"look for differences that change the number of occurrences of the specified "
-"string"
-msgstr ""
-"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:5618
-msgid ""
-"look for differences that change the number of occurrences of the specified "
-"regex"
-msgstr ""
-"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:5621
-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:5624
-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:5627
-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:5628 diff.c:5631
-msgid "<path>"
-msgstr "<đường-dẫn>"
-
-#: diff.c:5629
-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:5632
-msgid "skip the output to the specified path"
-msgstr "bỏ qua đầu ra đến đường dẫn đã cho"
-
-#: diff.c:5634
-msgid "<object-id>"
-msgstr "<mã-số-đối-tượng>"
-
-#: diff.c:5635
-msgid ""
-"look for differences that change the number of occurrences of the specified "
-"object"
-msgstr ""
-"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:5637
-msgid "[(A|C|D|M|R|T|U|X|B)...[*]]"
-msgstr "[(A|C|D|M|R|T|U|X|B)…[*]]"
-
-#: diff.c:5638
-msgid "select files by diff type"
-msgstr "chọn các tập tin theo kiểu khác biệt"
-
-#: diff.c:5640
-msgid "<file>"
-msgstr "<tập_tin>"
-
-#: diff.c:5641
-msgid "output to a specific file"
-msgstr "xuất ra một tập tin cụ thể"
-
-#: diff.c:6321
-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:6324
-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:6327
-#, c-format
-msgid ""
-"you may want to set your %s variable to at least %d and retry the command."
-msgstr ""
-"bạn có lẽ muốn đặt biến %s của bạn thành ít nhất là %d và thử lại lệnh lần "
-"nữa."
-
-#: diffcore-order.c:24
-#, c-format
-msgid "failed to read orderfile '%s'"
-msgstr "gặp lỗi khi đọc tập-tin-thứ-tự “%s”"
-
-#: 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"
-
-#: diffcore-rotate.c:29
-#, c-format
-msgid "No such path '%s' in the diff"
-msgstr "Không có đường dẫn %s trong diff"
-
-#: dir.c:593
-#, c-format
-msgid "pathspec '%s' did not match any file(s) known to git"
-msgstr "đặc tả đường dẫn “%s” không khớp với bất kỳ tập tin nào mà git biết"
-
-#: dir.c:733 dir.c:762 dir.c:775
-#, c-format
-msgid "unrecognized pattern: '%s'"
-msgstr "mẫu không được thừa nhận: “%s”"
-
-#: dir.c:790 dir.c:804
-#, c-format
-msgid "unrecognized negative pattern: '%s'"
-msgstr "mẫu âm không được thừa nhận: “%s”"
-
-#: dir.c:820
-#, c-format
-msgid "your sparse-checkout file may have issues: pattern '%s' is repeated"
-msgstr "tập tin sparse-checkout của bạn có lẽ gặp lỗi: mẫu “%s” đã bị lặp lại"
-
-#: dir.c:828
-msgid "disabling cone pattern matching"
-msgstr "vô hiệu khớp mẫu nón"
-
-#: dir.c:1212
-#, c-format
-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:2419
-#, c-format
-msgid "could not open directory '%s'"
-msgstr "không thể mở thư mục “%s”"
-
-#: dir.c:2721
-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:2846
-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:3119
-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:3807
-#, 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:3854 dir.c:3859
-#, c-format
-msgid "could not create directories for %s"
-msgstr "không thể tạo thư mục cho %s"
-
-#: dir.c:3888
-#, 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
-#, 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:179
-msgid "Filtering content"
-msgstr "Nội dung lọc"
-
-#: entry.c:500
-#, c-format
-msgid "could not stat file '%s'"
-msgstr "không thể lấy thống kê tập tin “%s”"
-
-#: environment.c:147
-#, c-format
-msgid "bad git namespace path \"%s\""
-msgstr "đường dẫn không gian tên git \"%s\" sai"
-
-#: 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:194
-msgid "git fetch-pack: expected shallow list"
-msgstr "git fetch-pack: cần danh sách shallow"
-
-#: fetch-pack.c:197
-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:208
-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:228
-#, 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:239
-msgid "unable to write to remote"
-msgstr "không thể ghi lên máy phục vụ"
-
-#: fetch-pack.c:397 fetch-pack.c:1460
-#, c-format
-msgid "invalid shallow line: %s"
-msgstr "dòng shallow không hợp lệ: %s"
-
-#: fetch-pack.c:403 fetch-pack.c:1466
-#, c-format
-msgid "invalid unshallow line: %s"
-msgstr "dòng unshallow không hợp lệ: %s"
-
-#: fetch-pack.c:405 fetch-pack.c:1468
-#, c-format
-msgid "object not found: %s"
-msgstr "không tìm thấy đối tượng: %s"
-
-#: fetch-pack.c:408 fetch-pack.c:1471
-#, c-format
-msgid "error in object: %s"
-msgstr "lỗi trong đối tượng: %s"
-
-#: fetch-pack.c:410 fetch-pack.c:1473
-#, c-format
-msgid "no shallow found: %s"
-msgstr "không tìm shallow nào: %s"
-
-#: fetch-pack.c:413 fetch-pack.c:1477
-#, c-format
-msgid "expected shallow/unshallow, got %s"
-msgstr "cần shallow/unshallow, nhưng lại nhận được %s"
-
-#: fetch-pack.c:453
-#, c-format
-msgid "got %s %d %s"
-msgstr "nhận %s %d - %s"
-
-#: fetch-pack.c:470
-#, c-format
-msgid "invalid commit %s"
-msgstr "lần chuyển giao %s không hợp lệ"
-
-#: fetch-pack.c:501
-msgid "giving up"
-msgstr "chịu thua"
-
-#: fetch-pack.c:514 progress.h:25
-msgid "done"
-msgstr "xong"
-
-#: fetch-pack.c:526
-#, c-format
-msgid "got %s (%d) %s"
-msgstr "nhận %s (%d) %s"
-
-#: fetch-pack.c:562
-#, c-format
-msgid "Marking %s as complete"
-msgstr "Đánh dấu %s là đã hoàn thành"
-
-#: fetch-pack.c:784
-#, c-format
-msgid "already have %s (%s)"
-msgstr "đã sẵn có %s (%s)"
-
-#: fetch-pack.c:870
-msgid "fetch-pack: unable to fork off sideband demultiplexer"
-msgstr "fetch-pack: không thể rẽ nhánh sideband demultiplexer"
-
-#: fetch-pack.c:878
-msgid "protocol error: bad pack header"
-msgstr "lỗi giao thức: phần đầu gói bị sai"
-
-#: fetch-pack.c:974
-#, c-format
-msgid "fetch-pack: unable to fork off %s"
-msgstr "fetch-pack: không thể rẽ nhánh %s"
-
-#: fetch-pack.c:980
-msgid "fetch-pack: invalid index-pack output"
-msgstr "fetch-pack: kết xuất index-pack không hợp lệ"
-
-#: fetch-pack.c:997
-#, c-format
-msgid "%s failed"
-msgstr "%s gặp lỗi"
-
-#: fetch-pack.c:999
-msgid "error in sideband demultiplexer"
-msgstr "có lỗi trong sideband demultiplexer"
-
-#: fetch-pack.c:1048
-#, c-format
-msgid "Server version is %.*s"
-msgstr "Phiên bản máy chủ là %.*s"
-
-#: fetch-pack.c:1056 fetch-pack.c:1062 fetch-pack.c:1065 fetch-pack.c:1071
-#: fetch-pack.c:1075 fetch-pack.c:1079 fetch-pack.c:1083 fetch-pack.c:1087
-#: fetch-pack.c:1091 fetch-pack.c:1095 fetch-pack.c:1099 fetch-pack.c:1103
-#: fetch-pack.c:1109 fetch-pack.c:1115 fetch-pack.c:1120 fetch-pack.c:1125
-#, c-format
-msgid "Server supports %s"
-msgstr "Máy chủ hỗ trợ %s"
-
-#: fetch-pack.c:1058
-msgid "Server does not support shallow clients"
-msgstr "Máy chủ không hỗ trợ máy khách shallow"
-
-#: fetch-pack.c:1118
-msgid "Server does not support --shallow-since"
-msgstr "Máy chủ không hỗ trợ --shallow-since"
-
-#: fetch-pack.c:1123
-msgid "Server does not support --shallow-exclude"
-msgstr "Máy chủ không hỗ trợ --shallow-exclude"
-
-#: fetch-pack.c:1127
-msgid "Server does not support --deepen"
-msgstr "Máy chủ không hỗ trợ --deepen"
-
-#: fetch-pack.c:1129
-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:1142
-msgid "no common commits"
-msgstr "không có lần chuyển giao chung nào"
-
-#: fetch-pack.c:1151 fetch-pack.c:1506 builtin/clone.c:1166
-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:1157 fetch-pack.c:1705
-msgid "git fetch-pack: fetch failed."
-msgstr "git fetch-pack: fetch gặp lỗi."
-
-#: fetch-pack.c:1271
-#, 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:1275
-#, 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:1308
-msgid "Server does not support shallow requests"
-msgstr "Máy chủ không hỗ trợ yêu cầu shallow"
-
-#: fetch-pack.c:1315
-msgid "Server supports filter"
-msgstr "Máy chủ hỗ trợ bộ lọc"
-
-#: fetch-pack.c:1358 fetch-pack.c:2087
-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:1376
-#, 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:1382
-#, c-format
-msgid "expected '%s', received '%s'"
-msgstr "cần “%s”, nhưng lại nhận “%s”"
-
-#: fetch-pack.c:1416
-#, c-format
-msgid "unexpected acknowledgment line: '%s'"
-msgstr "gặp dòng không được thừa nhận: “%s”"
-
-#: fetch-pack.c:1421
-#, c-format
-msgid "error processing acks: %d"
-msgstr "gặp lỗi khi xử lý tín hiệu trả lời: %d"
-
-#. TRANSLATORS: The parameter will be 'ready', a protocol
-#. keyword.
-#.
-#: fetch-pack.c:1435
-#, c-format
-msgid "expected packfile to be sent after '%s'"
-msgstr "cần tập tin gói để gửi sau “%s”"
-
-#. TRANSLATORS: The parameter will be 'ready', a protocol
-#. keyword.
-#.
-#: fetch-pack.c:1441
-#, c-format
-msgid "expected no other sections to be sent after no '%s'"
-msgstr "không cần thêm phần nào để gửi sau không “%s”"
-
-#: fetch-pack.c:1482
-#, c-format
-msgid "error processing shallow info: %d"
-msgstr "lỗi xử lý thông tin shallow: %d"
-
-#: fetch-pack.c:1531
-#, c-format
-msgid "expected wanted-ref, got '%s'"
-msgstr "cần wanted-ref, nhưng lại nhận được “%s”"
-
-#: fetch-pack.c:1536
-#, c-format
-msgid "unexpected wanted-ref: '%s'"
-msgstr "wanted-ref không được mong đợi: “%s”"
-
-#: fetch-pack.c:1541
-#, c-format
-msgid "error processing wanted refs: %d"
-msgstr "lỗi khi xử lý wanted refs: %d"
-
-#: fetch-pack.c:1571
-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:1983
-msgid "no matching remote head"
-msgstr "không khớp phần đầu máy chủ"
-
-#: fetch-pack.c:2006 builtin/clone.c:587
-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:2109
-msgid "unexpected 'ready' from remote"
-msgstr "gặp “ready” đột xuất từ máy chủ"
-
-#: fetch-pack.c:2132
-#, 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:2135
-#, 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"
-
-#: fsmonitor-ipc.c:119
-#, c-format
-msgid "fsmonitor_ipc__send_query: invalid path '%s'"
-msgstr "fsmonitor_ipc__send_query: đường dẫn không hợp lệ '%s'"
-
-#: fsmonitor-ipc.c:125
-#, c-format
-msgid "fsmonitor_ipc__send_query: unspecified error on '%s'"
-msgstr "fsmonitor_ipc__send_query: lỗi chưa rõ trên '%s'"
-
-#: fsmonitor-ipc.c:155
-msgid "fsmonitor--daemon is not running"
-msgstr "fsmonitor--daemon hiện tại chưa chạy"
-
-#: fsmonitor-ipc.c:164
-#, c-format
-msgid "could not send '%s' command to fsmonitor--daemon"
-msgstr "không thể gửi lệnh '%s' đến fsmonitor--daemon"
-
-#: gpg-interface.c:329 gpg-interface.c:456 gpg-interface.c:995
-#: gpg-interface.c:1011
-msgid "could not create temporary file"
-msgstr "không thể tạo tập tin tạm thời"
-
-#: gpg-interface.c:332 gpg-interface.c:459
-#, 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:450
-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:479
-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:550
-#, 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:638
-#, c-format
-msgid "bad/incompatible signature '%s'"
-msgstr "chữ sai / không tương thích “%s”"
-
-#: gpg-interface.c:815 gpg-interface.c:820
-#, 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:843
-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:865
-#, 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:871
-#, c-format
-msgid "gpg.ssh.defaultKeyCommand failed: %s %s"
-msgstr "gpg.ssh.defaultKeyCommand gặp lỗi: %s %s"
-
-#: gpg-interface.c:966
-msgid "gpg failed to sign the data"
-msgstr "gpg gặp lỗi khi ký dữ liệu"
-
-#: gpg-interface.c:988
-msgid "user.signingkey needs to be set for ssh signing"
-msgstr "user.signingkey cần được đặt cho ký ssh"
-
-#: gpg-interface.c:999
-#, 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:1017
-#, 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:1035
-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:1047
-#, 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:446
-msgid ""
-"given pattern contains NULL byte (via -f <file>). This is only supported "
-"with -P under PCRE v2"
-msgstr ""
-"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:1859
-#, c-format
-msgid "'%s': unable to read %s"
-msgstr "“%s”: không thể đọc %s"
-
-#: grep.c:1876 setup.c:178 builtin/clone.c:308 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:1887
-#, c-format
-msgid "'%s': short read"
-msgstr "“%s”: đọc ngắn"
-
-#: help.c:25
-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:26
-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:27
-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:28
-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:29
-msgid "collaborate (see also: git help workflows)"
-msgstr "làm việc nhóm (xem thêm: git help workflows)"
-
-#: help.c:33
-msgid "Main Porcelain Commands"
-msgstr "Các lệnh Porcelain chính"
-
-#: help.c:34
-msgid "Ancillary Commands / Manipulators"
-msgstr "Lệnh/thao tác thứ cấp"
-
-#: help.c:35
-msgid "Ancillary Commands / Interrogators"
-msgstr "Lệnh/bộ hỏi thứ cấp"
-
-#: help.c:36
-msgid "Interacting with Others"
-msgstr "Tương tác với những cái khác"
-
-#: help.c:37
-msgid "Low-level Commands / Manipulators"
-msgstr "Lệnh/thao tác ở mức thấp"
-
-#: help.c:38
-msgid "Low-level Commands / Interrogators"
-msgstr "Lệnh/bộ hỏi ở mức thấp"
-
-#: help.c:39
-msgid "Low-level Commands / Syncing Repositories"
-msgstr "Lệnh/Đồng bộ kho ở mức thấp"
-
-#: help.c:40
-msgid "Low-level Commands / Internal Helpers"
-msgstr "Lệnh/Hỗ trợ nội tại ở mức thấp"
-
-#: help.c:316
-#, c-format
-msgid "available git commands in '%s'"
-msgstr "các lệnh git sẵn có trong thư mục “%s”:"
-
-#: help.c:323
-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:332
-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:382 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:422
-msgid "The Git concept guides are:"
-msgstr "Các chỉ dẫn khái niệm về Git là:"
-
-#: help.c:446
-msgid "External commands"
-msgstr "Các lệnh bên ngoài"
-
-#: help.c:468
-msgid "Command aliases"
-msgstr "Các bí danh lệnh"
-
-#: help.c:486
-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:563
-#, c-format
-msgid ""
-"'%s' appears to be a git command, but we were not\n"
-"able to execute it. Maybe git-%s is broken?"
-msgstr ""
-"“%s” 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:585 help.c:682
-#, 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:633
-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:655
-#, 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:660
-#, 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:666
-#, c-format
-msgid "Run '%s' instead [y/N]? "
-msgstr "Chạy “%s” để thay thế? (y/N)? "
-
-#: help.c:674
-#, 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:686
-msgid ""
-"\n"
-"The most similar command is"
-msgid_plural ""
-"\n"
-"The most similar commands are"
-msgstr[0] ""
-"\n"
-"Những lệnh giống nhất là"
-
-#: help.c:729
-msgid "git version [<options>]"
-msgstr "git version [<các tùy chọn>]"
-
-#: help.c:784
-#, c-format
-msgid "%s: %s - %s"
-msgstr "%s: %s - %s"
-
-#: help.c:788
-msgid ""
-"\n"
-"Did you mean this?"
-msgid_plural ""
-"\n"
-"Did you mean one of these?"
-msgstr[0] ""
-"\n"
-"Có phải ý bạn là một trong số những cái này không?"
-
-#: hook.c:28
-#, 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“."
-
-#: hook.c:87
-#, c-format
-msgid "Couldn't start hook '%s'\n"
-msgstr "Không thể khởi chạy móc “%s”\n"
-
-#: ident.c:354
-msgid "Author identity unknown\n"
-msgstr "Chưa biết định danh tác giả\n"
-
-#: ident.c:357
-msgid "Committer identity unknown\n"
-msgstr "Chưa biết định danh người chuyển giao\n"
-
-#: ident.c:363
-msgid ""
-"\n"
-"*** Please tell me who you are.\n"
-"\n"
-"Run\n"
-"\n"
-"  git config --global user.email \"you@example.com\"\n"
-"  git config --global user.name \"Your Name\"\n"
-"\n"
-"to set your account's default identity.\n"
-"Omit --global to set the identity only in this repository.\n"
-"\n"
-msgstr ""
-"\n"
-"*** Vui lòng cho biết bạn là ai.\n"
-"\n"
-"Chạy\n"
-"\n"
-"  git config --global user.email \"bạn@ví_dụ.com\"\n"
-"  git config --global user.name \"Tên Của Bạn\"\n"
-"\n"
-"để đặt định danh mặc định cho tài khoản của bạn.\n"
-"Bỏ tùy chọn --global nếu chỉ định danh riêng cho kho này.\n"
-"\n"
-
-#: ident.c:398
-msgid "no email was given and auto-detection is disabled"
-msgstr "không đưa ra địa chỉ thư điện tử và auto-detection bị tắt"
-
-#: ident.c:403
-#, c-format
-msgid "unable to auto-detect email address (got '%s')"
-msgstr "không thể tự dò tìm địa chỉ thư điện tử (nhận “%s”)"
-
-#: ident.c:420
-msgid "no name was given and auto-detection is disabled"
-msgstr "chưa chỉ ra tên và tự-động-dò-tìm bị tắt"
-
-#: ident.c:426
-#, c-format
-msgid "unable to auto-detect name (got '%s')"
-msgstr "không thể dò-tìm-tự động tên (đã nhận “%s”)"
-
-#: ident.c:434
-#, c-format
-msgid "empty ident name (for <%s>) not allowed"
-msgstr "không cho phép tên định danh là rỗng (cho <%s>)"
-
-#: ident.c:440
-#, c-format
-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:455 builtin/commit.c:649
-#, c-format
-msgid "invalid date format: %s"
-msgstr "ngày tháng không hợp lệ: %s"
-
-#: list-objects-filter-options.c:68
-msgid "expected 'tree:<depth>'"
-msgstr "cần “tree:<depth>”"
-
-#: list-objects-filter-options.c:83
-msgid "sparse:path filters support has been dropped"
-msgstr "việc hỗ trợ bộ lọc sparse:đường/dẫn đã bị bỏ"
-
-#: list-objects-filter-options.c:90
-#, c-format
-msgid "'%s' for 'object:type=<type>' is not a valid object type"
-msgstr "“%s” dành cho “object:type=<type>” không phải là kiểu đối tượng hợp lệ"
-
-#: list-objects-filter-options.c:109
-#, c-format
-msgid "invalid filter-spec '%s'"
-msgstr "đặc tả bộ lọc không hợp lệ “%s”"
-
-#: list-objects-filter-options.c:125
-#, c-format
-msgid "must escape char in sub-filter-spec: '%c'"
-msgstr "phải thoát char trong sub-filter-spec: “%c”"
-
-#: list-objects-filter-options.c:167
-msgid "expected something after combine:"
-msgstr "mong đợi một cái gì đó sau khi kết hợp:"
-
-#: list-objects-filter-options.c:249
-msgid "multiple filter-specs cannot be combined"
-msgstr "không thể tổ hợp nhiều đặc tả kiểu lọc"
-
-#: list-objects-filter-options.c:365
-msgid "unable to upgrade repository format to support partial clone"
-msgstr "không thể nâng cấp định định dạng kho chứa để hỗ trợ nhân bản cục bộ"
-
-#: list-objects-filter.c:532
-#, c-format
-msgid "unable to access sparse blob in '%s'"
-msgstr "không thể truy cập các blob rải rác trong “%s”"
-
-#: list-objects-filter.c:535
-#, c-format
-msgid "unable to parse sparse filter data in %s"
-msgstr "không thể phân tích dữ liệu bộ lọc rải rác trong %s"
-
-#: list-objects.c:144
-#, c-format
-msgid "entry '%s' in tree %s has tree mode, but is not a tree"
-msgstr "mục “%s” trong cây %s có nút cây, nhưng không phải là một cây"
-
-#: list-objects.c:157
-#, c-format
-msgid "entry '%s' in tree %s has blob mode, but is not a blob"
-msgstr "mục “%s” trong cây %s có nút blob, nhưng không phải là một blob"
-
-#: list-objects.c:415
-#, c-format
-msgid "unable to load root tree for commit %s"
-msgstr "không thể tải cây gốc cho lần chuyển giao “%s”"
-
-#: lockfile.c:152
-#, c-format
-msgid ""
-"Unable to create '%s.lock': %s.\n"
-"\n"
-"Another git process seems to be running in this repository, e.g.\n"
-"an editor opened by 'git commit'. Please make sure all processes\n"
-"are terminated then try again. If it still fails, a git process\n"
-"may have crashed in this repository earlier:\n"
-"remove the file manually to continue."
-msgstr ""
-"Không thể tạo “%s.lock”: %s.\n"
-"\n"
-"Tiến trình git khác có lẽ đang chạy ở kho này, ví dụ\n"
-"một trình soạn thảo được mở bởi “git commit”. Vui lòng chắc chắn\n"
-"rằng mọi tiến trình đã chấm dứt và sau đó thử lại. Nếu vẫn lỗi,\n"
-"một tiến trình git có lẽ đã đổ vỡ khi thực hiện ở kho này trước đó:\n"
-"gõ bỏ tập tin một cách thủ công để tiếp tục."
-
-#: lockfile.c:160
-#, c-format
-msgid "Unable to create '%s.lock': %s"
-msgstr "Không thể tạo “%s.lock”: %s"
-
-#: ls-refs.c:175
-#, c-format
-msgid "unexpected line: '%s'"
-msgstr "dòng không cần: “%s”"
-
-#: ls-refs.c:179
-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)"
-
-#: mailinfo.c:1050
-msgid "quoted CRLF detected"
-msgstr "phát hiện CRLF được trích dẫn"
-
-#: mailinfo.c:1254 builtin/am.c:185 builtin/mailinfo.c:46
-#, c-format
-msgid "bad action '%s' for '%s'"
-msgstr "thao tác sai “%s” cho “%s”"
-
-#: merge-ort.c:1630 merge-recursive.c:1214
-#, 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:1639 merge-recursive.c:1221
-#, 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:1648 merge-recursive.c:1228
-#, 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:1658 merge-ort.c:1666
-#, 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:1688
-#, 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:1695
-#, c-format
-msgid ""
-"Failed to merge submodule %s, but a possible merge resolution exists:\n"
-"%s\n"
-msgstr ""
-"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:1699 merge-recursive.c:1284
-#, c-format
-msgid ""
-"If this is correct simply add it to the index for example\n"
-"by using:\n"
-"\n"
-"  git update-index --cacheinfo 160000 %s \"%s\"\n"
-"\n"
-"which will accept this suggestion.\n"
-msgstr ""
-"Nếu đây là đúng đơn giản thêm nó vào mục lục ví dụ\n"
-"bằng cách dùng:\n"
-"\n"
-"  git update-index --cacheinfo 160000 %s \"%s\"\n"
-"\n"
-"cái mà sẽ chấp nhận gợi ý này.\n"
-
-#: merge-ort.c:1712
-#, c-format
-msgid ""
-"Failed to merge submodule %s, but multiple possible merges exist:\n"
-"%s"
-msgstr ""
-"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:1937 merge-recursive.c:1375
-msgid "Failed to execute internal merge"
-msgstr "Gặp lỗi khi thực hiện trộn nội bộ"
-
-#: merge-ort.c:1942 merge-recursive.c:1380
-#, 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:1949 merge-recursive.c:1413
-#, c-format
-msgid "Auto-merging %s"
-msgstr "Tự-động-hòa-trộn %s"
-
-#: merge-ort.c:2088 merge-recursive.c:2135
-#, 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 ""
-"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:2098 merge-recursive.c:2145
-#, 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 ""
-"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:2156
-#, c-format
-msgid ""
-"CONFLICT (directory rename split): Unclear where to rename %s to; it was "
-"renamed to multiple other directories, with no destination getting a "
-"majority of the files."
-msgstr ""
-"XUNG ĐỘT: (thư mục đổi tên chia tách): Không rõ ràng nơi để đổi tên %s "
-"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:2310 merge-recursive.c:2481
-#, c-format
-msgid ""
-"WARNING: Avoiding applying %s -> %s rename to %s, because %s itself was "
-"renamed."
-msgstr ""
-"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:2450 merge-recursive.c:3264
-#, c-format
-msgid ""
-"Path updated: %s added in %s inside a directory that was renamed in %s; "
-"moving it to %s."
-msgstr ""
-"Đườ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:2457 merge-recursive.c:3271
-#, c-format
-msgid ""
-"Path updated: %s renamed to %s in %s, inside a directory that was renamed in "
-"%s; moving it to %s."
-msgstr ""
-"Đườ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:2470 merge-recursive.c:3267
-#, 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 ""
-"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:2478 merge-recursive.c:3274
-#, 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 ""
-"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:2634
-#, 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:2729
-#, 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."
-msgstr ""
-"XUNG ĐỘT (đổi tên liên quan đến va chạm): đổi tên %s -> %s xung đột nội dung "
-"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:2748 merge-ort.c:2772
-#, 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:3261 merge-recursive.c:3025
-#, c-format
-msgid "cannot read object %s"
-msgstr "không thể đọc đối tượng %s"
-
-#: merge-ort.c:3264 merge-recursive.c:3028
-#, 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:3693
-#, c-format
-msgid ""
-"CONFLICT (file/directory): directory in the way of %s from %s; moving it to "
-"%s instead."
-msgstr ""
-"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:3770
-#, c-format
-msgid ""
-"CONFLICT (distinct types): %s had different types on each side; renamed both "
-"of them so each can be recorded somewhere."
-msgstr ""
-"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:3777
-#, c-format
-msgid ""
-"CONFLICT (distinct types): %s had different types on each side; renamed one "
-"of them so each can be recorded somewhere."
-msgstr ""
-"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:3866 merge-recursive.c:3104
-msgid "content"
-msgstr "nội dung"
-
-#: merge-ort.c:3868 merge-recursive.c:3108
-msgid "add/add"
-msgstr "thêm/thêm"
-
-#: merge-ort.c:3870 merge-recursive.c:3153
-msgid "submodule"
-msgstr "mô-đun-con"
-
-#: merge-ort.c:3872 merge-recursive.c:3154
-#, c-format
-msgid "CONFLICT (%s): Merge conflict in %s"
-msgstr "XUNG ĐỘT (%s): Xung đột hòa trộn trong %s"
-
-#: merge-ort.c:3916
-#, c-format
-msgid ""
-"CONFLICT (modify/delete): %s deleted in %s and modified in %s.  Version %s "
-"of %s left in tree."
-msgstr ""
-"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:4212
-#, c-format
-msgid ""
-"Note: %s not up to date and in way of checking out conflicted version; old "
-"copy renamed to %s"
-msgstr ""
-"Lưu ý: %s không được cập nhật và theo cách lấy ra phiên bản xung đột; bản "
-"sao cũ được đổi tên thành %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:4586
-#, 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:3723
-#, c-format
-msgid ""
-"Your local changes to the following files would be overwritten by merge:\n"
-"  %s"
-msgstr ""
-"Các thay đổi nội bộ của bạn với các tập tin sau đây sẽ bị ghi đè bởi lệnh "
-"hòa trộn:\n"
-"  %s"
-
-#: merge-ort-wrappers.c:33 merge-recursive.c:3485 builtin/merge.c:405
-msgid "Already up to date."
-msgstr "Đã cập nhật rồi."
-
-#: merge-recursive.c:353
-msgid "(bad commit)\n"
-msgstr "(commit sai)\n"
-
-#: 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: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: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: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:906 merge-recursive.c:925
-msgid ": perhaps a D/F conflict?"
-msgstr ": có lẽ là một xung đột D/F?"
-
-#: 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:956 builtin/cat-file.c:47
-#, c-format
-msgid "cannot read object %s '%s'"
-msgstr "không thể đọc đối tượng %s “%s”"
-
-#: 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:986
-#, c-format
-msgid "failed to open '%s': %s"
-msgstr "gặp lỗi khi mở “%s”: %s"
-
-#: 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: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:1236 merge-recursive.c:1249
-#, 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:1239 merge-recursive.c:1252
-#, c-format
-msgid "Fast-forwarding submodule %s"
-msgstr "Chuyển-tiếp-nhanh mô-đun-con “%s”"
-
-#: merge-recursive.c:1276
-#, 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:1280
-#, 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:1281
-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:1293
-#, 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:1437
-#, 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:1509
-#, c-format
-msgid ""
-"CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s left "
-"in tree."
-msgstr ""
-"XUNG ĐỘT (%s/xóa): %s bị xóa trong %s và %s trong %s. Phiên bản %s của %s "
-"còn lại trong cây (tree)."
-
-#: merge-recursive.c:1514
-#, c-format
-msgid ""
-"CONFLICT (%s/delete): %s deleted in %s and %s to %s in %s. Version %s of %s "
-"left in tree."
-msgstr ""
-"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:1521
-#, c-format
-msgid ""
-"CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s left "
-"in tree at %s."
-msgstr ""
-"XUNG ĐỘT (%s/xóa): %s bị xóa trong %s và %s trong %s. Phiên bản %s của %s "
-"còn lại trong cây (tree) tại %s."
-
-#: merge-recursive.c:1526
-#, 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 ""
-"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:1561
-msgid "rename"
-msgstr "đổi tên"
-
-#: merge-recursive.c:1561
-msgid "renamed"
-msgstr "đã đổi tên"
-
-#: merge-recursive.c:1612 merge-recursive.c:2518 merge-recursive.c:3181
-#, 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:1622
-#, 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:1680
-#, 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:1711
-#, 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:1716
-#, 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:1743
-#, c-format
-msgid ""
-"CONFLICT (rename/rename): Rename \"%s\"->\"%s\" in branch \"%s\" rename \"%s"
-"\"->\"%s\" in \"%s\"%s"
-msgstr ""
-"XUNG ĐỘT (đổi-tên/đổi-tên): Đổi tên \"%s\"->\"%s\" trong nhánh \"%s\" đổi "
-"tên \"%s\"->\"%s\" trong \"%s\"%s"
-
-#: merge-recursive.c:1748
-msgid " (left unresolved)"
-msgstr " (cần giải quyết)"
-
-#: merge-recursive.c:1840
-#, 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:2103
-#, c-format
-msgid ""
-"CONFLICT (directory rename split): Unclear where to place %s because "
-"directory %s was renamed to multiple other directories, with no destination "
-"getting a majority of the files."
-msgstr ""
-"XUNG ĐỘT: (thư mục đổi tên chia tách): Không rõ ràng để đặt địa điểm %s bởi "
-"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:2237
-#, c-format
-msgid ""
-"CONFLICT (rename/rename): Rename directory %s->%s in %s. Rename directory %s-"
-">%s in %s"
-msgstr ""
-"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:3092
-msgid "modify"
-msgstr "sửa đổi"
-
-#: merge-recursive.c:3092
-msgid "modified"
-msgstr "đã sửa"
-
-#: merge-recursive.c:3131
-#, 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:3184
-#, c-format
-msgid "Adding as %s instead"
-msgstr "Thay vào đó thêm vào %s"
-
-#: merge-recursive.c:3388
-#, c-format
-msgid "Removing %s"
-msgstr "Đang xóa %s"
-
-#: merge-recursive.c:3411
-msgid "file/directory"
-msgstr "tập-tin/thư-mục"
-
-#: merge-recursive.c:3416
-msgid "directory/file"
-msgstr "thư-mục/tập-tin"
-
-#: merge-recursive.c:3423
-#, 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:3432
-#, c-format
-msgid "Adding %s"
-msgstr "Thêm \"%s\""
-
-#: merge-recursive.c:3441
-#, 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:3494
-#, 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:3588
-msgid "Merging:"
-msgstr "Đang trộn:"
-
-#: merge-recursive.c:3601
-#, 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:3651
-msgid "merge returned no commit"
-msgstr "hòa trộn không trả về lần chuyển giao nào"
-
-#: merge-recursive.c:3823
-#, c-format
-msgid "Could not parse object '%s'"
-msgstr "Không thể phân tích đối tượng “%s”"
-
-#: merge-recursive.c:3841 builtin/merge.c:720 builtin/merge.c:912
-#: builtin/stash.c:489
-msgid "Unable to write index."
-msgstr "Không thể ghi bảng mục lục."
-
-#: merge.c:41
-msgid "failed to read the cache"
-msgstr "gặp lỗi khi đọc bộ nhớ đệm"
-
-#: merge.c:102 rerere.c:705 builtin/am.c:1989 builtin/am.c:2023
-#: builtin/checkout.c:603 builtin/checkout.c:865 builtin/clone.c:714
-#: 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:79
-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:112
-#, c-format
-msgid "multi-pack-index file %s is too small"
-msgstr "tập tin đồ thị multi-pack-index %s quá nhỏ"
-
-#: midx.c:128
-#, 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:133
-#, 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:138
-#, 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:155
-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:157
-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:159
-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:161
-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:180
-#, 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:228
-#, 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:278
-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:509
-#, c-format
-msgid "failed to add packfile '%s'"
-msgstr "gặp lỗi khi thêm tập tin gói “%s”"
-
-#: midx.c:515
-#, c-format
-msgid "failed to open pack-index '%s'"
-msgstr "gặp lỗi khi mở pack-index “%s”"
-
-#: midx.c:583
-#, 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:911
-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:1009
-#, c-format
-msgid "could not parse line: %s"
-msgstr "không thể phân tích cú pháp dòng: %s"
-
-#: midx.c:1011
-#, c-format
-msgid "malformed line: %s"
-msgstr "dòng dị hình: %s"
-
-#: midx.c:1181
-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:1206
-msgid "could not load pack"
-msgstr "không thể tải gói"
-
-#: midx.c:1212
-#, c-format
-msgid "could not open index for %s"
-msgstr "không thể mở mục lục cho %s"
-
-#: midx.c:1223
-msgid "Adding packfiles to multi-pack-index"
-msgstr "Đang thêm tập tin gói từ multi-pack-index"
-
-#: midx.c:1266
-#, c-format
-msgid "unknown preferred pack: '%s'"
-msgstr "không hiểu \"preferred pack\": %s"
-
-#: midx.c:1311
-#, 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:1343
-#, 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:1389
-#, c-format
-msgid "preferred pack '%s' is expired"
-msgstr "\"preferred pack\" “%s” đã hết hạn"
-
-#: midx.c:1402
-msgid "no pack files to index."
-msgstr "không có tập tin gói để đánh mục lục."
-
-#: midx.c:1409
-msgid "refusing to write multi-pack .bitmap without any objects"
-msgstr "từ chối ghi “multi-pack bitmap” mà không có bất kỳ đối tượng nào"
-
-#: midx.c:1451
-msgid "could not write multi-pack bitmap"
-msgstr "không thể ghi “multi-pack bitmap”"
-
-#: midx.c:1461
-msgid "could not write multi-pack-index"
-msgstr "không thể ghi “multi-pack-index”"
-
-#: midx.c:1520 builtin/clean.c:37
-#, c-format
-msgid "failed to remove %s"
-msgstr "gặp lỗi khi gỡ bỏ %s"
-
-#: midx.c:1553
-#, 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:1616
-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:1624
-msgid "incorrect checksum"
-msgstr "tổng kiểm không đúng"
-
-#: midx.c:1627
-msgid "Looking for referenced packfiles"
-msgstr "Đang khóa cho các gói bị tham chiếu"
-
-#: midx.c:1642
-#, 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:1647
-msgid "the midx contains no oid"
-msgstr "midx chẳng chứa oid nào"
-
-#: midx.c:1656
-msgid "Verifying OID order in multi-pack-index"
-msgstr "Thẩm tra thứ tự OID trong multi-pack-index"
-
-#: midx.c:1665
-#, 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:1685
-msgid "Sorting objects by packfile"
-msgstr "Đang sắp xếp các đối tượng theo tập tin gói"
-
-#: midx.c:1692
-msgid "Verifying object offsets"
-msgstr "Đang thẩm tra các khoảng bù đối tượng"
-
-#: midx.c:1708
-#, 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:1714
-#, 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:1723
-#, 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:1750
-msgid "Counting referenced objects"
-msgstr "Đang đếm các đối tượng được tham chiếu"
-
-#: midx.c:1760
-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:1952
-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:1972
-msgid "could not finish pack-objects"
-msgstr "không thể hoàn thiện các đối tượng gói"
-
-#: name-hash.c:542
-#, c-format
-msgid "unable to create lazy_dir thread: %s"
-msgstr "không thể tạo tuyến lazy_dir: %s"
-
-#: name-hash.c:564
-#, c-format
-msgid "unable to create lazy_name thread: %s"
-msgstr "không thể tạo tuyến lazy_name: %s"
-
-#: name-hash.c:570
-#, c-format
-msgid "unable to join lazy_name thread: %s"
-msgstr "không thể gia nhập tuyến lazy_name: %s"
-
-#: notes-merge.c:276
-#, 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."
-msgstr ""
-"Bạn đã chưa hoàn tất hòa trộn ghi chú trước đây (%s vẫn còn).\n"
-"Vui lòng dùng “git notes merge --commit” hay “git notes merge --abort” để "
-"chuyển giao hay bãi bỏ lần hòa trộn trước đây và bắt đầu một hòa trộn ghi "
-"chú mới."
-
-#: notes-merge.c:283
-#, c-format
-msgid "You have not concluded your notes merge (%s exists)."
-msgstr "Bạn chưa kết thúc việc hòa trộn ghi chú (%s vẫn tồn tại)."
-
-#: notes-utils.c:46
-msgid "Cannot commit uninitialized/unreferenced notes tree"
-msgstr ""
-"Không thể chuyển giao cây ghi chú chưa được khởi tạo hoặc không được tham "
-"chiếu"
-
-#: notes-utils.c:105
-#, c-format
-msgid "Bad notes.rewriteMode value: '%s'"
-msgstr "Giá trị notes.rewriteMode sai: “%s”"
-
-#: notes-utils.c:115
-#, c-format
-msgid "Refusing to rewrite notes in %s (outside of refs/notes/)"
-msgstr "Từ chối ghi đè ghi chú trong %s (nằm ngoài refs/notes/)"
-
-#. 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 "Giá trị %s sai: “%s”"
-
-#: object-file.c:457
-#, 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:515
-#, 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:589
-#, 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:596
-#, 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:639
-msgid "unable to fdopen alternates lockfile"
-msgstr "không thể fdopen tập tin khóa thay thế"
-
-#: object-file.c:657
-msgid "unable to read alternates file"
-msgstr "không thể đọc tập tin thay thế"
-
-#: object-file.c:664
-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:742
-#, c-format
-msgid "path '%s' does not exist"
-msgstr "đường dẫn “%s” không tồn tại"
-
-#: object-file.c:763
-#, 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:769
-#, 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:775
-#, c-format
-msgid "reference repository '%s' is shallow"
-msgstr "kho tham chiếu “%s” là nông"
-
-#: object-file.c:783
-#, c-format
-msgid "reference repository '%s' is grafted"
-msgstr "kho tham chiếu “%s” bị cấy ghép"
-
-#: object-file.c:814
-#, 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:864
-#, 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:1014
-#, 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:1049
-#, c-format
-msgid "mmap failed%s"
-msgstr "mmap gặp lỗi%s"
-
-#: object-file.c:1230
-#, c-format
-msgid "object file %s is empty"
-msgstr "tập tin đối tượng %s trống rỗng"
-
-#: object-file.c:1349 object-file.c:2588
-#, c-format
-msgid "corrupt loose object '%s'"
-msgstr "đối tượng mất hỏng “%s”"
-
-#: object-file.c:1351 object-file.c:2592
-#, 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:1473
-#, 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:1475
-msgid "invalid object type"
-msgstr "kiểu đối tượng không hợp lệ"
-
-#: object-file.c:1486
-#, 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 "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:1720
-#, c-format
-msgid "failed to read object %s"
-msgstr "gặp lỗi khi đọc đối tượng “%s”"
-
-#: object-file.c:1724
-#, 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:1728
-#, 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:1732
-#, 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:1855
-#, c-format
-msgid "unable to write file %s"
-msgstr "không thể ghi tập tin %s"
-
-#: object-file.c:1862
-#, c-format
-msgid "unable to set permission to '%s'"
-msgstr "không thể đặt quyền thành “%s”"
-
-#: object-file.c:1869
-msgid "file write error"
-msgstr "lỗi ghi tập tin"
-
-#: object-file.c:1904
-msgid "error when closing loose object file"
-msgstr "gặp lỗi trong khi đóng tập tin đối tượng"
-
-#: object-file.c:1971
-#, 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:1973
-msgid "unable to create temporary file"
-msgstr "không thể tạo tập tin tạm thời"
-
-#: object-file.c:1997
-msgid "unable to write loose object file"
-msgstr "không thể ghi tập tin đối tượng đã mất"
-
-#: object-file.c:2003
-#, 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:2007
-#, 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:2011
-#, 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:2022 builtin/pack-objects.c:1251
-#, c-format
-msgid "failed utime() on %s"
-msgstr "gặp lỗi utime() trên “%s”"
-
-#: object-file.c:2100
-#, c-format
-msgid "cannot read object for %s"
-msgstr "không thể đọc đối tượng cho %s"
-
-#: object-file.c:2151
-msgid "corrupt commit"
-msgstr "lần chuyển giao sai hỏng"
-
-#: object-file.c:2159
-msgid "corrupt tag"
-msgstr "thẻ sai hỏng"
-
-#: object-file.c:2259
-#, c-format
-msgid "read error while indexing %s"
-msgstr "gặp lỗi đọc khi đánh mục lục %s"
-
-#: object-file.c:2262
-#, c-format
-msgid "short read while indexing %s"
-msgstr "không đọc ngắn khi đánh mục lục %s"
-
-#: object-file.c:2335 object-file.c:2345
-#, 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:2351
-#, c-format
-msgid "%s: unsupported file type"
-msgstr "%s: kiểu tập tin không được hỗ trợ"
-
-#: object-file.c:2375 builtin/fetch.c:1494
-#, 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:2377
-#, 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:2404
-#, c-format
-msgid "unable to open %s"
-msgstr "không thể mở %s"
-
-#: object-file.c:2599
-#, 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:2622
-#, c-format
-msgid "unable to mmap %s"
-msgstr "không thể mmap %s"
-
-#: object-file.c:2628
-#, 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:2633
-#, 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:2644
-#, c-format
-msgid "unable to unpack contents of %s"
-msgstr "không thể giải gói nội dung của “%s”"
-
-#. TRANSLATORS: This is a line of ambiguous object
-#. output shown when we cannot look up or parse the
-#. object in question. E.g. "deadbeef [bad object]".
-#.
-#: object-name.c:382
-#, c-format
-msgid "%s [bad object]"
-msgstr "%s [đối tượng sai.]"
-
-#. TRANSLATORS: This is a line of ambiguous commit
-#. object output. E.g.:
-#. *
-#. "deadbeef commit 2021-01-01 - Some Commit Message"
-#.
-#: object-name.c:407
-#, c-format
-msgid "%s commit %s - %s"
-msgstr "%s lần chuyển giao %s - %s"
-
-#. TRANSLATORS: This is a line of ambiguous
-#. tag object output. E.g.:
-#. *
-#. "deadbeef tag 2022-01-01 - Some Tag Message"
-#. *
-#. The second argument is the YYYY-MM-DD found
-#. in the tag.
-#. *
-#. The third argument is the "tag" string
-#. from object.c.
-#.
-#: object-name.c:428
-#, c-format
-msgid "%s tag %s - %s"
-msgstr "%s thẻ %s - %s"
-
-#. TRANSLATORS: This is a line of ambiguous
-#. tag object output where we couldn't parse
-#. the tag itself. E.g.:
-#. *
-#. "deadbeef [bad tag, could not parse it]"
-#.
-#: object-name.c:439
-#, c-format
-msgid "%s [bad tag, could not parse it]"
-msgstr "%s [thẻ sai, không thể phân tích cú pháp nó]"
-
-#. TRANSLATORS: This is a line of ambiguous <type>
-#. object output. E.g. "deadbeef tree".
-#.
-#: object-name.c:447
-#, c-format
-msgid "%s tree"
-msgstr "%s tree"
-
-#. TRANSLATORS: This is a line of ambiguous <type>
-#. object output. E.g. "deadbeef blob".
-#.
-#: object-name.c:453
-#, c-format
-msgid "%s blob"
-msgstr "%s blob"
-
-#: object-name.c:569
-#, c-format
-msgid "short object ID %s is ambiguous"
-msgstr "mã đối tượng dạng rút gọn %s chưa rõ ràng"
-
-#. TRANSLATORS: The argument is the list of ambiguous
-#. objects composed in show_ambiguous_object(). See
-#. its "TRANSLATORS" comments for details.
-#.
-#: object-name.c:591
-#, c-format
-msgid ""
-"The candidates are:\n"
-"%s"
-msgstr ""
-"Các ứng cử là:\n"
-"%s"
-
-#: object-name.c:888
-msgid ""
-"Git normally never creates a ref that ends with 40 hex characters\n"
-"because it will be ignored when you just specify 40-hex. These refs\n"
-"may be created by mistake. For example,\n"
-"\n"
-"  git switch -c $br $(git rev-parse ...)\n"
-"\n"
-"where \"$br\" is somehow empty and a 40-hex ref is created. Please\n"
-"examine these refs and maybe delete them. Turn this message off by\n"
-"running \"git config advice.objectNameWarning false\""
-msgstr ""
-"Git thường không bao giờ tạo tham chiếu mà nó kết thúc với 40 ký tự hex\n"
-"bởi vì nó sẽ bị bỏ qua khi bạn chỉ định 40-hex. Những tham chiếu này\n"
-"có lẽ được tạo ra bởi một sai sót nào đó. Ví dụ,\n"
-"\n"
-"  git switch -c $br $(git rev-parse …)\n"
-"\n"
-"với \"$br\" không hiểu lý do vì sao trống rỗng và một tham chiếu 40-hex được "
-"tạo ra.\n"
-"Xin hãy kiểm tra những tham chiếu này và có thể xóa chúng đi. Tắt lời nhắn "
-"này\n"
-"bằng cách chạy lệnh \"git config advice.objectNameWarning false\""
-
-#: object-name.c:1008
-#, c-format
-msgid "log for '%.*s' only goes back to %s"
-msgstr "nhật ký cho “%.*s” chỉ trở lại đến %s"
-
-#: object-name.c:1016
-#, c-format
-msgid "log for '%.*s' only has %d entries"
-msgstr "nhật ký cho “%.*s” chỉ có %d mục"
-
-#: object-name.c:1794
-#, c-format
-msgid "path '%s' exists on disk, but not in '%.*s'"
-msgstr "đường dẫn “%s” có ở trên đĩa, nhưng không trong “%.*s”"
-
-#: object-name.c:1800
-#, c-format
-msgid ""
-"path '%s' exists, but not '%s'\n"
-"hint: Did you mean '%.*s:%s' aka '%.*s:./%s'?"
-msgstr ""
-"đường dẫn “%s” tồn tại, nhưng không phải “%s”\n"
-"gợi ý: Có phải ý bạn là “%.*s:%s” aka “%.*s:./%s”?"
-
-#: object-name.c:1809
-#, c-format
-msgid "path '%s' does not exist in '%.*s'"
-msgstr "đường dẫn “%s” không tồn tại trong “%.*s”"
-
-#: object-name.c:1837
-#, c-format
-msgid ""
-"path '%s' is in the index, but not at stage %d\n"
-"hint: Did you mean ':%d:%s'?"
-msgstr ""
-"đường dẫn “%s” nằm trong chỉ mục, nhưng không phải ở giai đoạn %d\n"
-"gợi ý: Có phải ý bạn là “:%d:%s”?"
-
-#: object-name.c:1853
-#, c-format
-msgid ""
-"path '%s' is in the index, but not '%s'\n"
-"hint: Did you mean ':%d:%s' aka ':%d:./%s'?"
-msgstr ""
-"đường dẫn “%s” nằm trong chỉ mục, nhưng không phải “%s”\n"
-"gợi ý: Có phải ý bạn là “:% d:%s “ aka “:%d:./%s”?"
-
-#: object-name.c:1861
-#, c-format
-msgid "path '%s' exists on disk, but not in the index"
-msgstr "đường dẫn “%s” tồn tại trên đĩa, nhưng không có trong chỉ mục"
-
-#: object-name.c:1863
-#, c-format
-msgid "path '%s' does not exist (neither on disk nor in the index)"
-msgstr "đường dẫn “%s” không tồn tại (không trên đĩa cũng không trong mục lục)"
-
-#: object-name.c:1876
-msgid "relative path syntax can't be used outside working tree"
-msgstr "cú pháp đường dẫn tương đối không thể thể dùng ngoài cây làm việc"
-
-#: object-name.c:1901
-#, c-format
-msgid "<object>:<path> required, only <object> '%s' given"
-msgstr "<object>:<path> cần cả hai, nhưng chỉ <object> '%s' được đưa ra"
-
-#: object-name.c:2014
-#, c-format
-msgid "invalid object name '%.*s'."
-msgstr "“%.*s” không phải là tên đối tượng hợp lệ."
-
-#: object.c:53
-#, c-format
-msgid "invalid object type \"%s\""
-msgstr "kiểu đối tượng \"%s\" không hợp lệ"
-
-#: object.c:173
-#, c-format
-msgid "object %s is a %s, not a %s"
-msgstr "đối tượng %s là một %s, không phải là một %s"
-
-#: object.c:250
-#, c-format
-msgid "object %s has unknown type id %d"
-msgstr "đối tượng %s có mã kiểu %d chưa biết"
-
-#: object.c:263
-#, c-format
-msgid "unable to parse object: %s"
-msgstr "không thể phân tích đối tượng: “%s”"
-
-#: object.c:283 object.c:294
-#, c-format
-msgid "hash mismatch %s"
-msgstr "mã băm không khớp %s"
-
-#: pack-bitmap.c:353
-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:433
-msgid "load_reverse_index: could not open pack"
-msgstr "load_reverse_index: không thể mở gói"
-
-#: pack-bitmap.c:1072 pack-bitmap.c:1078 builtin/pack-objects.c:2432
-#, c-format
-msgid "unable to get size of %s"
-msgstr "không thể lấy kích cỡ của %s"
-
-#: pack-bitmap.c:1937
-#, 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:1973 builtin/rev-list.c:91
-#, c-format
-msgid "unable to get disk usage of %s"
-msgstr "không thể dung lượng đĩa đã dùng của %s"
-
-#: pack-revindex.c:221
-#, c-format
-msgid "reverse-index file %s is too small"
-msgstr "tập tin reverse-index %s quá nhỏ"
-
-#: pack-revindex.c:226
-#, c-format
-msgid "reverse-index file %s is corrupt"
-msgstr "tập tin reverse-index %s bị hỏng"
-
-#: pack-revindex.c:234
-#, c-format
-msgid "reverse-index file %s has unknown signature"
-msgstr "tập tin reverse-index %s có chữ ký chưa biết"
-
-#: pack-revindex.c:238
-#, c-format
-msgid "reverse-index file %s has unsupported version %<PRIu32>"
-msgstr "tệp chỉ mục ngược %s có phiên bản không được hỗ trợ %<PRIu32>"
-
-#: pack-revindex.c:243
-#, c-format
-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: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:270
-#, c-format
-msgid "could not stat: %s"
-msgstr "không thể lấy thông tin thống kê: %s"
-
-#: 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:521
-#, c-format
-msgid "could not write '%s' promisor file"
-msgstr "không thể ghi tập tin promisor “%s”"
-
-#: packfile.c:627
-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:657
-#, 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:1924
-#, 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:1928
-#, 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:21 parse-options-cb.c:25 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ố"
-
-#: parse-options-cb.c:42
-#, c-format
-msgid "malformed expiration date '%s'"
-msgstr "ngày tháng hết hạn dị hình “%s”"
-
-#: parse-options-cb.c:55
-#, c-format
-msgid "option `%s' expects \"always\", \"auto\", or \"never\""
-msgstr "tùy chọn “%s” cần \"always\", \"auto\", hoặc \"never\""
-
-#: parse-options-cb.c:133 parse-options-cb.c:150
-#, c-format
-msgid "malformed object name '%s'"
-msgstr "tên đối tượng dị hình “%s”"
-
-#: parse-options-cb.c:307
-#, c-format
-msgid "option `%s' expects \"%s\" or \"%s\""
-msgstr "tùy chọn “%s” cần \"%s\" hoặc \"%s\""
-
-#: parse-options.c:58
-#, c-format
-msgid "%s requires a value"
-msgstr "“%s” yêu cầu một giá trị"
-
-#: parse-options.c:93
-#, c-format
-msgid "%s is incompatible with %s"
-msgstr "%s là xung khắc với %s"
-
-#: 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:112 parse-options.c:116
-#, c-format
-msgid "%s takes no value"
-msgstr "%s k nhận giá trị"
-
-#: parse-options.c:114
-#, c-format
-msgid "%s isn't available"
-msgstr "%s không sẵn có"
-
-#: 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: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:428 parse-options.c:436
-#, 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:678 parse-options.c:1054
-#, c-format
-msgid "alias of --%s"
-msgstr "bí danh của --%s"
-
-#: parse-options.c:892
-#, c-format
-msgid "unknown option `%s'"
-msgstr "không hiểu tùy chọn “%s”"
-
-#: parse-options.c:894
-#, c-format
-msgid "unknown switch `%c'"
-msgstr "không hiểu tùy chọn “%c”"
-
-#: parse-options.c:896
-#, 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:920
-msgid "..."
-msgstr "…"
-
-#: parse-options.c:934
-#, c-format
-msgid "usage: %s"
-msgstr "cách dùng: %s"
-
-#. TRANSLATORS: the colon here should align with the
-#. one in "usage: %s" translation.
-#.
-#: parse-options.c:949
-#, c-format
-msgid "   or: %s"
-msgstr "     hoặc: %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:970
-#, c-format
-msgid "%*s%s"
-msgstr "%*s%s"
-
-#: parse-options.c:993
-#, c-format
-msgid "    %s"
-msgstr "    %s"
-
-#: parse-options.c:1040
-msgid "-NUM"
-msgstr "-SỐ"
-
-#: 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: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:168
-msgid "Only one 'attr:' specification is allowed."
-msgstr "Chỉ có một đặc tả “attr:” là được phép."
-
-#: pathspec.c:171
-msgid "attr spec must not be empty"
-msgstr "đặc tả attr phải không được để trống"
-
-#: 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: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:286
-msgid ""
-"global 'literal' pathspec setting is incompatible with all other global "
-"pathspec settings"
-msgstr ""
-"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: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: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: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: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:449
-#, c-format
-msgid "%s: 'literal' and 'glob' are incompatible"
-msgstr "%s: “literal” và “glob” xung khắc nhau"
-
-#: 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:541
-#, c-format
-msgid "'%s' (mnemonic: '%c')"
-msgstr "“%s” (mnemonic: “%c”)"
-
-#: 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: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:663
-#, c-format
-msgid "line is badly quoted: %s"
-msgstr "dòng được trích dẫn sai: %s"
-
-#: pkt-line.c:92
-msgid "unable to write flush packet"
-msgstr "không thể đẩy dữ liệu của gói lên đĩa"
-
-#: pkt-line.c:99
-msgid "unable to write delim packet"
-msgstr "không thể ghi gói delim"
-
-#: pkt-line.c:106
-msgid "unable to write response end packet"
-msgstr "không thể ghi gói cuối trả về"
-
-#: pkt-line.c:113
-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
-msgid "protocol error: impossibly long line"
-msgstr "lỗi giao thức: không thể làm được dòng dài"
-
-#: pkt-line.c:169 pkt-line.c:171
-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: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"
-
-#: pkt-line.c:222
-#, c-format
-msgid "packet write failed: %s"
-msgstr "gặp lỗi khi ghi gói: %s"
-
-#: pkt-line.c:349 pkt-line.c:350
-msgid "read error"
-msgstr "lỗi đọc"
-
-#: 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:417 pkt-line.c:419
-#, 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:434 pkt-line.c:436 pkt-line.c:442 pkt-line.c:444
-#, 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:472 sideband.c:165
-#, c-format
-msgid "remote error: %s"
-msgstr "lỗi máy chủ: %s"
-
-#: preload-index.c:125
-msgid "Refreshing index"
-msgstr "Làm mới bảng mục lục"
-
-#: preload-index.c:144
-#, c-format
-msgid "unable to create threaded lstat: %s"
-msgstr "không thể tạo tuyến trình lstat: %s"
-
-#: pretty.c:1051
-msgid "unable to parse --pretty format"
-msgstr "không thể phân tích định dạng --pretty"
-
-#: promisor-remote.c:31
-msgid "promisor-remote: unable to fork off fetch subprocess"
-msgstr "promisor-remote: không thể rẽ nhánh tuyến trình con fetch"
-
-#: promisor-remote.c:38 promisor-remote.c:40
-msgid "promisor-remote: could not write to fetch subprocess"
-msgstr "promisor-remote: không thể ghi tiến trình con fetch"
-
-#: promisor-remote.c:44
-msgid "promisor-remote: could not close stdin to fetch subprocess"
-msgstr ""
-"promisor-remote: không thể đóng đầu vào tiêu chuẩn tiến trình con fetch"
-
-#: promisor-remote.c:54
-#, c-format
-msgid "promisor remote name cannot begin with '/': %s"
-msgstr "tên máy chủ hứa hẹn không thể bắt đầu bằng “/”: %s"
-
-#: protocol-caps.c:103
-msgid "object-info: expected flush after arguments"
-msgstr "object-info: cần đẩy dữ liệu lên đĩa sau các tham số"
-
-#: prune-packed.c:35
-msgid "Removing duplicate objects"
-msgstr "Đang gỡ các đối tượng trùng lặp"
-
-#: range-diff.c:68
-msgid "could not start `log`"
-msgstr "không thể lấy thông tin thống kê về “log“"
-
-#: range-diff.c:70
-msgid "could not read `log` output"
-msgstr "không thể đọc kết xuất “log”"
-
-#: range-diff.c:98 sequencer.c:5575
-#, 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:109
-#, c-format
-msgid ""
-"could not parse first line of `log` output: did not start with 'commit ': "
-"'%s'"
-msgstr ""
-"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:132
-#, 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:300
-msgid "failed to generate diff"
-msgstr "gặp lỗi khi tạo khác biệt"
-
-#: range-diff.c:558 range-diff.c:560
-#, c-format
-msgid "could not parse log for '%s'"
-msgstr "không thể phân tích nhật ký cho “%s”"
-
-#: read-cache.c:737
-#, c-format
-msgid "will not add file alias '%s' ('%s' already exists in index)"
-msgstr ""
-"sẽ không thêm các bí danh “%s” (“%s” đã có từ trước trong bảng mục lục)"
-
-#: read-cache.c:753
-msgid "cannot create an empty blob in the object database"
-msgstr "không thể tạo một blob rỗng trong cơ sở dữ liệu đối tượng"
-
-#: read-cache.c:775
-#, c-format
-msgid "%s: can only add regular files, symbolic links or git-directories"
-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:780 builtin/submodule--helper.c:3359
-#, 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"
-
-#: read-cache.c:832
-#, c-format
-msgid "unable to index file '%s'"
-msgstr "không thể đánh mục lục tập tin “%s”"
-
-#: read-cache.c:851
-#, c-format
-msgid "unable to add '%s' to index"
-msgstr "không thể thêm %s vào bảng mục lục"
-
-#: read-cache.c:862
-#, c-format
-msgid "unable to stat '%s'"
-msgstr "không thể lấy thống kê “%s”"
-
-#: read-cache.c:1404
-#, 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:1619
-msgid "Refresh index"
-msgstr "Làm tươi mới bảng mục lục"
-
-#: read-cache.c:1751
-#, c-format
-msgid ""
-"index.version set, but the value is invalid.\n"
-"Using version %i"
-msgstr ""
-"index.version được đặt, nhưng giá trị của nó lại không hợp lệ.\n"
-"Dùng phiên bản %i"
-
-#: read-cache.c:1761
-#, c-format
-msgid ""
-"GIT_INDEX_VERSION set, but the value is invalid.\n"
-"Using version %i"
-msgstr ""
-"GIT_INDEX_VERSION được đặt, nhưng giá trị của nó lại không hợp lệ.\n"
-"Dùng phiên bản %i"
-
-#: read-cache.c:1817
-#, c-format
-msgid "bad signature 0x%08x"
-msgstr "chữ ký sai 0x%08x"
-
-#: read-cache.c:1820
-#, c-format
-msgid "bad index version %d"
-msgstr "phiên bản mục lục sai %d"
-
-#: read-cache.c:1829
-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:1863
-#, 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:1865
-#, c-format
-msgid "ignoring %.4s extension"
-msgstr "đang lờ đi phần mở rộng %.4s"
-
-#: read-cache.c:1902
-#, 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:1918
-#, 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:1975
-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:1978
-#, 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:1981
-#, 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:2096 read-cache.c:2402 rerere.c:549 rerere.c:583 rerere.c:1096
-#: submodule.c:1831 builtin/add.c:586 builtin/check-ignore.c:183
-#: builtin/checkout.c:532 builtin/checkout.c:724 builtin/clean.c:1016
-#: builtin/commit.c:379 builtin/diff-tree.c:122 builtin/grep.c:521
-#: builtin/mv.c:148 builtin/reset.c:506 builtin/rm.c:293
-#: builtin/submodule--helper.c:335 builtin/submodule--helper.c:3319
-msgid "index file corrupt"
-msgstr "tập tin ghi bảng mục lục bị hỏng"
-
-#: read-cache.c:2240
-#, 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:2253
-#, 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:2286
-#, 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:2290
-#, 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:2294
-#, 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:2298
-#, 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:2341
-#, 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:2368
-#, 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:2414
-#, 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:2473
-#, 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
-msgid "cannot write split index for a sparse index"
-msgstr "không thể ghi mục lục chia tách cho \"sparse index\""
-
-#: read-cache.c:3114 strbuf.c:1192 wrapper.c:717 builtin/merge.c:1156
-#, c-format
-msgid "could not close '%s'"
-msgstr "không thể đóng “%s”"
-
-#: read-cache.c:3157
-msgid "failed to convert to a sparse-index"
-msgstr "gặp lỗi khi chuyển đổi sang \"sparse-index\""
-
-#: read-cache.c:3228
-#, c-format
-msgid "could not stat '%s'"
-msgstr "không thể lấy thông tin thống kê về “%s”"
-
-#: read-cache.c:3241
-#, c-format
-msgid "unable to open git dir: %s"
-msgstr "không thể mở thư mục git: %s"
-
-#: read-cache.c:3253
-#, c-format
-msgid "unable to unlink: %s"
-msgstr "không thể bỏ liên kết (unlink): “%s”"
-
-#: read-cache.c:3282
-#, 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:3439
-#, c-format
-msgid "%s: cannot drop to stage #0"
-msgstr "%s: không thể xóa bỏ stage #0"
-
-#: rebase-interactive.c:11
-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 ""
-"Bạn có thể sửa nó bằng “git rebase --edit-todo” và sau đó chạy “git rebase --"
-"continue”.\n"
-"Hoặc là bạn có thể bãi bỏ việc cải tổ bằng “git rebase --abort”.\n"
-
-#: rebase-interactive.c:33
-#, c-format
-msgid ""
-"unrecognized setting %s for option rebase.missingCommitsCheck. Ignoring."
-msgstr ""
-"không nhận ra cài đặt %s cho tùy chọn rebase.missingCommitsCheck. Nên bỏ qua."
-
-#: rebase-interactive.c:42
-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 [-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"
-"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 trộn vào lần chuyển giao kế "
-"trước\n"
-"f, fixup [-C | -c] <commit> = giống như \"squash\", nhưng chỉ giữ lại phần "
-"lời nhắn\n"
-"                   nhật ký của lần chuyển giao kế trước, trừ phi -C được "
-"dùng, trong trường hợp\n"
-"                   chỉ giữ ghi chú của lần chuyển giao này; -c giống như -C "
-"nhưng\n"
-"                   mở trình biên soạn\n"
-"x, exec <commit> = chạy lệnh (phần còn lại của dòng) dùng hệ vỏ\n"
-"b, break = dừng tại đây (tiếp tục cải tổ sau này bằng “git rebase --"
-"continue”)\n"
-"d, drop <commit> = xóa bỏ 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ể được thay đổi thứ tự; chúng chạy từ trên đỉnh xuống "
-"dưới đáy.\n"
-
-#: rebase-interactive.c:66
-#, c-format
-msgid "Rebase %s onto %s (%d command)"
-msgid_plural "Rebase %s onto %s (%d commands)"
-msgstr[0] "Cải tổ %s vào %s (%d lệnh )"
-
-#: rebase-interactive.c:75
-msgid ""
-"\n"
-"Do not remove any line. Use 'drop' explicitly to remove a commit.\n"
-msgstr ""
-"\n"
-"Đừ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
-msgid ""
-"\n"
-"If you remove a line here THAT COMMIT WILL BE LOST.\n"
-msgstr ""
-"\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
-msgid ""
-"\n"
-"You are editing the todo file of an ongoing interactive rebase.\n"
-"To continue rebase after editing, run:\n"
-"    git rebase --continue\n"
-"\n"
-msgstr ""
-"\n"
-"Bạn đang sửa tập tin todo của một lần cải tổ tương tác đang thực hiện.\n"
-"Để tiếp tục cải tổ sau khi sửa, chạy:\n"
-"    git rebase --continue\n"
-"\n"
-
-#: rebase-interactive.c:89
-msgid ""
-"\n"
-"However, if you remove everything, the rebase will be aborted.\n"
-"\n"
-msgstr ""
-"\n"
-"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:677 sequencer.c:3879
-#: sequencer.c:3905 sequencer.c:5681 builtin/fsck.c:328 builtin/gc.c:1791
-#: builtin/rebase.c:191
-#, c-format
-msgid "could not write '%s'"
-msgstr "không thể ghi “%s”"
-
-#: rebase-interactive.c:119
-#, c-format
-msgid "could not write '%s'."
-msgstr "không thể ghi “%s”."
-
-#: rebase-interactive.c:196
-#, c-format
-msgid ""
-"Warning: some commits may have been dropped accidentally.\n"
-"Dropped commits (newer to older):\n"
-msgstr ""
-"Cảnh báo: một số lần chuyển giao có lẽ đã bị xóa một cách tình cờ.\n"
-"Các lần chuyển giao bị xóa (từ mới đến cũ):\n"
-
-#: rebase-interactive.c:203
-#, c-format
-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"
-"The possible behaviours are: ignore, warn, error.\n"
-"\n"
-msgstr ""
-"Để tránh thông báo này, dùng \"drop\" một cách rõ ràng để xóa bỏ một lần "
-"chuyển giao.\n"
-"\n"
-"Dùng “git config rebase.missingCommitsCheck” để thay đổi mức độ của cảnh "
-"báo.\n"
-"Cánh ứng xử có thể là: ignore, warn, error.\n"
-"\n"
-
-#: rebase.c:29
-#, c-format
-msgid "%s: 'preserve' superseded by 'merges'"
-msgstr "%s: “preserve” bị cấm bởi “merges”"
-
-#: ref-filter.c:42 wt-status.c:2057
-msgid "gone"
-msgstr "đã ra đi"
-
-#: ref-filter.c:43
-#, c-format
-msgid "ahead %d"
-msgstr "phía trước %d"
-
-#: ref-filter.c:44
-#, c-format
-msgid "behind %d"
-msgstr "đằng sau %d"
-
-#: ref-filter.c:45
-#, c-format
-msgid "ahead %d, behind %d"
-msgstr "trước %d, sau %d"
-
-#: ref-filter.c:235
-#, c-format
-msgid "expected format: %%(color:<color>)"
-msgstr "cần định dạng: %%(color:<color>)"
-
-#: ref-filter.c:237
-#, c-format
-msgid "unrecognized color: %%(color:%s)"
-msgstr "không nhận ra màu: %%(color:%s)"
-
-#: 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: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:265 ref-filter.c:344 ref-filter.c:377 ref-filter.c:431
-#: ref-filter.c:443 ref-filter.c:462 ref-filter.c:534 ref-filter.c:560
-#, c-format
-msgid "unrecognized %%(%s) argument: %s"
-msgstr "đối số không được thừa nhận %%(%s): %s"
-
-#: 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:352
-#, c-format
-msgid "%%(deltabase) does not take arguments"
-msgstr "%%(deltabase) không nhận các đối số"
-
-#: 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:396
-#, c-format
-msgid "expected %%(trailers:key=<value>)"
-msgstr "cần %%(trailers:key=<giá trị>)"
-
-#: ref-filter.c:398
-#, c-format
-msgid "unknown %%(trailers) argument: %s"
-msgstr "không hiểu tham số %%(trailers): %s"
-
-#: 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:458
-#, c-format
-msgid "positive value expected '%s' in %%(%s)"
-msgstr "cần giá trị dương “%s” trong %%(%s)"
-
-#: 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:506
-#, c-format
-msgid "expected format: %%(align:<width>,<position>)"
-msgstr "cần định dạng: %%(align:<width>,<position>)"
-
-#: ref-filter.c:518
-#, c-format
-msgid "unrecognized position:%s"
-msgstr "vị trí không được thừa nhận:%s"
-
-#: 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: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: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:707
-#, c-format
-msgid "unknown field name: %.*s"
-msgstr "không hiểu tên trường: %.*s"
-
-#: ref-filter.c:711
-#, c-format
-msgid ""
-"not a git repository, but the field '%.*s' requires access to object data"
-msgstr ""
-"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:844 ref-filter.c:910 ref-filter.c:946 ref-filter.c:948
-#, c-format
-msgid "format: %%(%s) atom used without a %%(%s) atom"
-msgstr "định dạng: nguyên tử %%(%s) được dùng mà không có nguyên tử %%(%s)"
-
-#: 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: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: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: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:1027
-#, c-format
-msgid "malformed format string %s"
-msgstr "chuỗi định dạng dị hình %s"
-
-#: 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:1707
-#, c-format
-msgid "(no branch, rebasing %s)"
-msgstr "(không nhánh, đang cải tổ %s)"
-
-#: ref-filter.c:1710
-#, 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:1713
-#, 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:1717
-#, c-format
-msgid "(HEAD detached at %s)"
-msgstr "(HEAD được tách rời tại %s)"
-
-#: ref-filter.c:1720
-#, c-format
-msgid "(HEAD detached from %s)"
-msgstr "(HEAD được tách rời khỏi %s)"
-
-#: ref-filter.c:1723
-msgid "(no branch)"
-msgstr "(không nhánh)"
-
-#: ref-filter.c:1755 ref-filter.c:1973
-#, c-format
-msgid "missing object %s for %s"
-msgstr "thiếu đối tượng %s cho %s"
-
-#: ref-filter.c:1765
-#, 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:2156
-#, c-format
-msgid "malformed object at '%s'"
-msgstr "đối tượng dị hình tại “%s”"
-
-#: ref-filter.c:2246
-#, 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:2251 refs.c:672
-#, c-format
-msgid "ignoring broken ref %s"
-msgstr "đang lờ đi tham chiếu hỏng %s"
-
-#: ref-filter.c:2630
-#, c-format
-msgid "format: %%(end) atom missing"
-msgstr "định dạng: thiếu nguyên tử %%(end)"
-
-#: ref-filter.c:2741
-#, c-format
-msgid "malformed object name %s"
-msgstr "tên đối tượng dị hình %s"
-
-#: ref-filter.c:2746
-#, 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"
-
-#: reflog.c:407
-#, c-format
-msgid "not a reflog: %s"
-msgstr "không phải một reflog: %s"
-
-#: reflog.c:410
-#, c-format
-msgid "no reflog for '%s'"
-msgstr "không reflog cho “%s”"
-
-#: refs.c:262
-#, 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:561
-#, 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"
-"of your new repositories, which will suppress this warning, call:\n"
-"\n"
-"\tgit config --global init.defaultBranch <name>\n"
-"\n"
-"Names commonly chosen instead of 'master' are 'main', 'trunk' and\n"
-"'development'. The just-created branch can be renamed via this command:\n"
-"\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"
-"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"
-"\n"
-"\tgit branch -m <tên>\n"
-
-#: refs.c:583
-#, c-format
-msgid "could not retrieve `%s`"
-msgstr "không thể lấy về “%s”"
-
-#: refs.c:593
-#, c-format
-msgid "invalid branch name: %s = %s"
-msgstr "tên nhánh không hợp lệ: %s = %s"
-
-#: refs.c:670
-#, c-format
-msgid "ignoring dangling symref %s"
-msgstr "đang lờ đi tham chiếu mềm thừa %s"
-
-#: refs.c:919
-#, 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:926
-#, 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:991
-#, c-format
-msgid "log for %s is empty"
-msgstr "nhật ký cho %s trống rỗng"
-
-#: refs.c:1086
-#, 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:1164
-#, c-format
-msgid "update_ref failed for ref '%s': %s"
-msgstr "update_ref bị lỗi cho ref “%s”: %s"
-
-#: refs.c:2059
-#, 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:2145
-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:2156
-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:2264 refs.c:2294
-#, c-format
-msgid "'%s' exists; cannot create '%s'"
-msgstr "“%s” sẵn có; không thể tạo “%s”"
-
-#: refs.c:2270 refs.c:2305
-#, 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:1295
-#, c-format
-msgid "could not remove reference %s"
-msgstr "không thể gỡ bỏ tham chiếu: %s"
-
-#: refs/files-backend.c:1310 refs/packed-backend.c:1565
-#: refs/packed-backend.c:1575
-#, 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:1313 refs/packed-backend.c:1578
-#, c-format
-msgid "could not delete references: %s"
-msgstr "không thể xóa bỏ tham chiếu: %s"
-
-#: refspec.c:170
-#, c-format
-msgid "invalid refspec '%s'"
-msgstr "refspec không hợp lệ “%s”"
-
-#: remote.c:402
-#, c-format
-msgid "config remote shorthand cannot begin with '/': %s"
-msgstr "cấu hình viết tắt máy chủ không thể bắt đầu bằng “/”: %s"
-
-#: remote.c:450
-msgid "more than one receivepack given, using the first"
-msgstr "đã đưa ra nhiều hơn một gói nhận về, đang sử dụng cái đầu tiên"
-
-#: remote.c:458
-msgid "more than one uploadpack given, using the first"
-msgstr "đã đưa ra nhiều hơn một gói tải lên, đang sử dụng cái đầu tiên"
-
-#: remote.c:698
-#, c-format
-msgid "Cannot fetch both %s and %s to %s"
-msgstr "Không thể lấy về cả %s và %s cho %s"
-
-#: remote.c:702
-#, c-format
-msgid "%s usually tracks %s, not %s"
-msgstr "%s thường theo dõi %s, không phải %s"
-
-#: remote.c:706
-#, c-format
-msgid "%s tracks both %s and %s"
-msgstr "%s theo dõi cả %s và %s"
-
-#: remote.c:774
-#, c-format
-msgid "key '%s' of pattern had no '*'"
-msgstr "khóa “%s” của mẫu k có “*”"
-
-#: remote.c:784
-#, c-format
-msgid "value '%s' of pattern has no '*'"
-msgstr "giá trị “%s” của mẫu k có “*”"
-
-#: remote.c:1191
-#, c-format
-msgid "src refspec %s does not match any"
-msgstr "refspec %s nguồn không khớp bất kỳ cái gì"
-
-#: remote.c:1196
-#, c-format
-msgid "src refspec %s matches more than one"
-msgstr "refspec %s nguồn khớp nhiều hơn một"
-
-#. TRANSLATORS: "matches '%s'%" is the <dst> part of "git push
-#. <remote> <src>:<dst>" push, and "being pushed ('%s')" is
-#. the <src>.
-#.
-#: remote.c:1211
-#, c-format
-msgid ""
-"The destination you provided is not a full refname (i.e.,\n"
-"starting with \"refs/\"). We tried to guess what you meant by:\n"
-"\n"
-"- Looking for a ref that matches '%s' on the remote side.\n"
-"- Checking if the <src> being pushed ('%s')\n"
-"  is a ref in \"refs/{heads,tags}/\". If so we add a corresponding\n"
-"  refs/{heads,tags}/ prefix on the remote side.\n"
-"\n"
-"Neither worked, so we gave up. You must fully qualify the ref."
-msgstr ""
-"Đích bạn đã cung cấp không phải tên tham chiếu đầy đủ (tức là\n"
-"bắt đầu bằng \"refs/\"). Chúng tôi đã cố suy luận rằng ý của bạn là:\n"
-"\n"
-"- Tìm kiếm một tham chiếu mà nó khớp “%s” bên phía máy chủ.\n"
-"- Kiểm tra xem <src> được đẩy lên (“%s”)\n"
-"  là một tham chiếu trong \"refs/{heads,tags}/\". Nếu thế chúng tôi thêm một "
-"tiền tố\n"
-"  refs/{heads,tags}/ tương ứng bên phía máy chủ.\n"
-"\n"
-"Nếu cả hai là không thể, thì chúng tôi cũng chịu thua. Bạn phải dùng tham "
-"chiếu dạng đầy đủ."
-
-#: remote.c:1231
-#, c-format
-msgid ""
-"The <src> part of the refspec is a commit object.\n"
-"Did you mean to create a new branch by pushing to\n"
-"'%s:refs/heads/%s'?"
-msgstr ""
-"Phần <src> của đặc tả đường dẫn là một đối tượng lần chuyển giao.\n"
-"Có phải ý bạn là một tạo một nhánh mới bằng cách đẩy lên\n"
-"“%s:refs/heads/%s”?"
-
-#: remote.c:1236
-#, c-format
-msgid ""
-"The <src> part of the refspec is a tag object.\n"
-"Did you mean to create a new tag by pushing to\n"
-"'%s:refs/tags/%s'?"
-msgstr ""
-"Phần <src> của đặc tả đường dẫn là một đối tượng thẻ.\n"
-"Có phải ý bạn là một tạo một thẻ mới bằng cách đẩy lên\n"
-"“%s:refs/tags/%s”?"
-
-#: remote.c:1241
-#, c-format
-msgid ""
-"The <src> part of the refspec is a tree object.\n"
-"Did you mean to tag a new tree by pushing to\n"
-"'%s:refs/tags/%s'?"
-msgstr ""
-"Phần <src> của đặc tả đường dẫn là một đối tượng cây.\n"
-"Có phải ý bạn là một tạo một cây mới bằng cách đẩy lên\n"
-"“%s:refs/tags/%s”?"
-
-#: remote.c:1246
-#, c-format
-msgid ""
-"The <src> part of the refspec is a blob object.\n"
-"Did you mean to tag a new blob by pushing to\n"
-"'%s:refs/tags/%s'?"
-msgstr ""
-"Phần <src> của đặc tả đường dẫn là một đối tượng blob.\n"
-"Có phải ý bạn là một tạo một blob mới bằng cách đẩy lên\n"
-"“%s:refs/tags/%s”?"
-
-#: remote.c:1282
-#, c-format
-msgid "%s cannot be resolved to branch"
-msgstr "“%s” không thể được phân giải thành nhánh"
-
-#: remote.c:1293
-#, c-format
-msgid "unable to delete '%s': remote ref does not exist"
-msgstr "không thể xóa “%s”: tham chiếu trên máy chủ không tồn tại"
-
-#: remote.c:1305
-#, c-format
-msgid "dst refspec %s matches more than one"
-msgstr "dst refspec %s khớp nhiều hơn một"
-
-#: remote.c:1312
-#, c-format
-msgid "dst ref %s receives from more than one src"
-msgstr "dst ref %s nhận từ hơn một nguồn"
-
-#: remote.c:1833 remote.c:1940
-msgid "HEAD does not point to a branch"
-msgstr "HEAD không chỉ đến một nhánh nào cả"
-
-#: remote.c:1842
-#, c-format
-msgid "no such branch: '%s'"
-msgstr "không có nhánh nào như thế: “%s”"
-
-#: remote.c:1845
-#, c-format
-msgid "no upstream configured for branch '%s'"
-msgstr "không có thượng nguồn được cấu hình cho nhánh “%s”"
-
-#: remote.c:1851
-#, c-format
-msgid "upstream branch '%s' not stored as a remote-tracking branch"
-msgstr ""
-"nhánh thượng nguồn “%s” không được lưu lại như là một nhánh theo dõi máy chủ"
-
-#: remote.c:1866
-#, c-format
-msgid "push destination '%s' on remote '%s' has no local tracking branch"
-msgstr "đẩy lên đích “%s” trên máy chủ “%s” không có nhánh theo dõi nội bộ"
-
-#: remote.c:1881
-#, c-format
-msgid "branch '%s' has no remote for pushing"
-msgstr "nhánh “%s” không có máy chủ để đẩy lên"
-
-#: remote.c:1891
-#, c-format
-msgid "push refspecs for '%s' do not include '%s'"
-msgstr "đẩy refspecs cho “%s” không bao gồm “%s”"
-
-#: remote.c:1904
-msgid "push has no destination (push.default is 'nothing')"
-msgstr "đẩy lên mà không có đích (push.default là “nothing”)"
-
-#: remote.c:1926
-msgid "cannot resolve 'simple' push to a single destination"
-msgstr "không thể phân giải đẩy “đơn giản” đến một đích đơn"
-
-#: remote.c:2059
-#, c-format
-msgid "couldn't find remote ref %s"
-msgstr "không thể tìm thấy tham chiếu máy chủ %s"
-
-#: remote.c:2072
-#, c-format
-msgid "* Ignoring funny ref '%s' locally"
-msgstr "* Đang bỏ qua tham chiếu thú vị nội bộ “%s”"
-
-#: remote.c:2235
-#, c-format
-msgid "Your branch is based on '%s', but the upstream is gone.\n"
-msgstr ""
-"Nhánh của bạn dựa trên cơ sở là “%s”, nhưng trên thượng nguồn không còn.\n"
-
-#: remote.c:2239
-msgid "  (use \"git branch --unset-upstream\" to fixup)\n"
-msgstr "   (dùng \" git branch --unset-upstream\" để sửa)\n"
-
-#: remote.c:2242
-#, c-format
-msgid "Your branch is up to date with '%s'.\n"
-msgstr "Nhánh của bạn đã cập nhật với “%s”.\n"
-
-#: remote.c:2246
-#, c-format
-msgid "Your branch and '%s' refer to different commits.\n"
-msgstr "Nhánh của bạn và “%s” tham chiếu đến các lần chuyển giao khác nhau.\n"
-
-#: remote.c:2249
-#, c-format
-msgid "  (use \"%s\" for details)\n"
-msgstr "  (dùng \"%s\" để biết thêm chi tiết)\n"
-
-#: remote.c:2253
-#, c-format
-msgid "Your branch is ahead of '%s' by %d commit.\n"
-msgid_plural "Your branch is ahead of '%s' by %d commits.\n"
-msgstr[0] "Nhánh của bạn đứng trước “%s” %d lần chuyển giao.\n"
-
-#: remote.c:2259
-msgid "  (use \"git push\" to publish your local commits)\n"
-msgstr "  (dùng \"git push\" để xuất bản các lần chuyển giao nội bộ của bạn)\n"
-
-#: remote.c:2262
-#, c-format
-msgid "Your branch is behind '%s' by %d commit, and can be fast-forwarded.\n"
-msgid_plural ""
-"Your branch is behind '%s' by %d commits, and can be fast-forwarded.\n"
-msgstr[0] ""
-"Nhánh của bạn đứng đằng sau “%s” %d lần chuyển giao, và có thể được chuyển-"
-"tiếp-nhanh.\n"
-
-#: remote.c:2270
-msgid "  (use \"git pull\" to update your local branch)\n"
-msgstr "  (dùng \"git pull\" để cập nhật nhánh nội bộ của bạn)\n"
-
-#: remote.c:2273
-#, c-format
-msgid ""
-"Your branch and '%s' have diverged,\n"
-"and have %d and %d different commit each, respectively.\n"
-msgid_plural ""
-"Your branch and '%s' have diverged,\n"
-"and have %d and %d different commits each, respectively.\n"
-msgstr[0] ""
-"Nhánh của bạn và “%s” bị phân kỳ,\n"
-"và có %d và %d lần chuyển giao khác nhau cho từng cái,\n"
-"tương ứng với mỗi lần.\n"
-
-#: remote.c:2283
-msgid "  (use \"git pull\" to merge the remote branch into yours)\n"
-msgstr ""
-"  (dùng \"git pull\" để hòa trộn nhánh trên máy chủ vào trong nhánh của "
-"bạn)\n"
-
-#: remote.c:2475
-#, c-format
-msgid "cannot parse expected object name '%s'"
-msgstr "không thể phân tích tên đối tượng mong muốn “%s”"
-
-#: replace-object.c:21
-#, c-format
-msgid "bad replace ref name: %s"
-msgstr "tên tham chiếu thay thế bị sai: %s"
-
-#: replace-object.c:30
-#, c-format
-msgid "duplicate replace ref: %s"
-msgstr "tham chiếu thay thế bị trùng: %s"
-
-#: replace-object.c:82
-#, c-format
-msgid "replace depth too high for object %s"
-msgstr "độ sâu thay thế quá cao cho đối tượng %s"
-
-#: rerere.c:201 rerere.c:210 rerere.c:213
-msgid "corrupt MERGE_RR"
-msgstr "MERGE_RR sai hỏng"
-
-#: rerere.c:248 rerere.c:253
-msgid "unable to write rerere record"
-msgstr "không thể ghi bản ghi rerere"
-
-#: rerere.c:479
-#, c-format
-msgid "there were errors while writing '%s' (%s)"
-msgstr "gặp lỗi đọc khi đang ghi “%s” (%s)"
-
-#: rerere.c:482 builtin/gc.c:2263 builtin/gc.c:2298
-#, c-format
-msgid "failed to flush '%s'"
-msgstr "gặp lỗi khi đẩy dữ liệu “%s” lên đĩa"
-
-#: rerere.c:487 rerere.c:1024
-#, c-format
-msgid "could not parse conflict hunks in '%s'"
-msgstr "không thể phân tích các mảnh xung đột trong “%s”"
-
-#: rerere.c:669
-#, c-format
-msgid "failed utime() on '%s'"
-msgstr "gặp lỗi utime() trên “%s”"
-
-#: rerere.c:679
-#, c-format
-msgid "writing '%s' failed"
-msgstr "gặp lỗi khi đang ghi “%s”"
-
-#: rerere.c:699
-#, c-format
-msgid "Staged '%s' using previous resolution."
-msgstr "Đã tạm cất “%s” sử dụng cách phân giải kế trước."
-
-#: rerere.c:738
-#, c-format
-msgid "Recorded resolution for '%s'."
-msgstr "Cách giải quyết đã ghi lại cho “%s”."
-
-#: rerere.c:773
-#, c-format
-msgid "Resolved '%s' using previous resolution."
-msgstr "Đã phân giải giải “%s” sử dụng cách giải quyết kế trước."
-
-#: rerere.c:788
-#, c-format
-msgid "cannot unlink stray '%s'"
-msgstr "không thể unlink stray “%s”"
-
-#: rerere.c:792
-#, c-format
-msgid "Recorded preimage for '%s'"
-msgstr "Preimage đã được ghi lại cho “%s”"
-
-#: rerere.c:866 submodule.c:2290 builtin/log.c:2042
-#: builtin/submodule--helper.c:1786 builtin/submodule--helper.c:1833
-#, c-format
-msgid "could not create directory '%s'"
-msgstr "không thể tạo thư mục “%s”"
-
-#: rerere.c:1042
-#, c-format
-msgid "failed to update conflicted state in '%s'"
-msgstr "gặp lỗi khi chạy cập nhật trạng thái bị xung đột trong “%s”"
-
-#: rerere.c:1053 rerere.c:1060
-#, c-format
-msgid "no remembered resolution for '%s'"
-msgstr "đừng nhó các giải quyết cho “%s”"
-
-#: rerere.c:1062
-#, c-format
-msgid "cannot unlink '%s'"
-msgstr "không thể unlink “%s”"
-
-#: rerere.c:1072
-#, c-format
-msgid "Updated preimage for '%s'"
-msgstr "Đã cập nhật preimage cho “%s”"
-
-#: rerere.c:1081
-#, c-format
-msgid "Forgot resolution for '%s'\n"
-msgstr "Quên phân giải cho “%s”\n"
-
-#: rerere.c:1192
-msgid "unable to open rr-cache directory"
-msgstr "không thể mở thư mục rr-cache"
-
-#: reset.c:112
-msgid "could not determine HEAD revision"
-msgstr "không thể dò tìm điểm xét duyệt HEAD"
-
-#: reset.c:141 reset.c:147 sequencer.c:3696
-#, c-format
-msgid "failed to find tree of %s"
-msgstr "gặp lỗi khi tìm cây của %s"
-
-#: revision.c:2358
-msgid "--unpacked=<packfile> no longer supported"
-msgstr "--unpacked=<packfile> không còn được hỗ trợ nữa"
-
-#: revision.c:2712
-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:2715
-#, 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:2901
-msgid "object filtering requires --objects"
-msgstr "lọc đối tượng yêu cầu --objects"
-
-#: revision.c:2918
-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:1262
-#, c-format
-msgid "cannot create async thread: %s"
-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"
-msgstr ""
-"gặp gói flush không cần trong khi đọc tình trạng giải nén gói trên máy chủ"
-
-#: send-pack.c:152
-#, c-format
-msgid "unable to parse remote unpack status: %s"
-msgstr "không thể phân tích tình trạng unpack máy chủ: %s"
-
-#: send-pack.c:154
-#, c-format
-msgid "remote unpack failed: %s"
-msgstr "máy chủ gặp lỗi unpack: %s"
-
-#: send-pack.c:378
-msgid "failed to sign the push certificate"
-msgstr "gặp lỗi khi ký chứng thực đẩy"
-
-#: 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: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: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: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:539
-msgid ""
-"not sending a push certificate since the receiving end does not support --"
-"signed push"
-msgstr ""
-"đừ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: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: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: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:325
-#, c-format
-msgid "could not delete '%s'"
-msgstr "không thể xóa bỏ “%s”"
-
-#: sequencer.c:345 sequencer.c:4724 builtin/rebase.c:564 builtin/rebase.c:1326
-#: builtin/rm.c:409
-#, c-format
-msgid "could not remove '%s'"
-msgstr "không thể gỡ bỏ “%s”"
-
-#: sequencer.c:355
-msgid "revert"
-msgstr "hoàn nguyên"
-
-#: sequencer.c:357
-msgid "cherry-pick"
-msgstr "cherry-pick"
-
-#: sequencer.c:359
-msgid "rebase"
-msgstr "rebase"
-
-#: sequencer.c:361
-#, c-format
-msgid "unknown action: %d"
-msgstr "không nhận ra thao tác: %d"
-
-#: sequencer.c:420
-msgid ""
-"after resolving the conflicts, mark the corrected paths\n"
-"with 'git add <paths>' or 'git rm <paths>'"
-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>”"
-
-#: sequencer.c:423
-msgid ""
-"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 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: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:3288
-#, c-format
-msgid "could not lock '%s'"
-msgstr "không thể khóa “%s”"
-
-#: sequencer.c:450 sequencer.c:3087 sequencer.c:3292 sequencer.c:3306
-#: sequencer.c:3557 sequencer.c:5591 strbuf.c:1189 wrapper.c:715
-#, c-format
-msgid "could not write to '%s'"
-msgstr "không thể ghi vào “%s”"
-
-#: sequencer.c:455
-#, c-format
-msgid "could not write eol to '%s'"
-msgstr "không thể ghi eol vào “%s”"
-
-#: sequencer.c:460 sequencer.c:3092 sequencer.c:3294 sequencer.c:3308
-#: sequencer.c:3565
-#, c-format
-msgid "failed to finalize '%s'"
-msgstr "gặp lỗi khi hoàn thành “%s”"
-
-#: sequencer.c:473 sequencer.c:1930 sequencer.c:3112 sequencer.c:3547
-#: sequencer.c:3675 builtin/am.c:290 builtin/commit.c:837 builtin/merge.c:1154
-#, c-format
-msgid "could not read '%s'"
-msgstr "không thể đọc “%s”"
-
-#: 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: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:535
-#, c-format
-msgid "%s: fast-forward"
-msgstr "%s: chuyển-tiếp-nhanh"
-
-#: sequencer.c:574 builtin/tag.c:615
-#, c-format
-msgid "Invalid cleanup mode %s"
-msgstr "Chế độ dọn dẹp không hợp lệ %s"
-
-#. TRANSLATORS: %s will be "revert", "cherry-pick" or
-#. "rebase".
-#.
-#: 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:699
-msgid "unable to update cache tree"
-msgstr "không thể cập nhật cây bộ nhớ đệm"
-
-#: 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:793
-#, c-format
-msgid "no key present in '%.*s'"
-msgstr "không có khóa hiện diện trong “%.*s”"
-
-#: 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:841 wrapper.c:219 wrapper.c:389 builtin/am.c:757
-#: builtin/am.c:849 builtin/rebase.c:699
-#, c-format
-msgid "could not open '%s' for reading"
-msgstr "không thể mở “%s” để đọc"
-
-#: sequencer.c:851
-msgid "'GIT_AUTHOR_NAME' already given"
-msgstr "“GIT_AUTHOR_NAME” đã sẵn đưa ra rồi"
-
-#: sequencer.c:856
-msgid "'GIT_AUTHOR_EMAIL' already given"
-msgstr "“GIT_AUTHOR_EMAIL” đã sẵn đưa ra rồi"
-
-#: sequencer.c:861
-msgid "'GIT_AUTHOR_DATE' already given"
-msgstr "“GIT_AUTHOR_DATE” đã sẵn đưa ra rồi"
-
-#: sequencer.c:865
-#, c-format
-msgid "unknown variable '%s'"
-msgstr "không hiểu biến “%s”"
-
-#: sequencer.c:870
-msgid "missing 'GIT_AUTHOR_NAME'"
-msgstr "thiếu “GIT_AUTHOR_NAME”"
-
-#: sequencer.c:872
-msgid "missing 'GIT_AUTHOR_EMAIL'"
-msgstr "thiếu “GIT_AUTHOR_EMAIL”"
-
-#: sequencer.c:874
-msgid "missing 'GIT_AUTHOR_DATE'"
-msgstr "thiếu “GIT_AUTHOR_DATE”"
-
-#: sequencer.c:939
-#, c-format
-msgid ""
-"you have staged changes in your working tree\n"
-"If these changes are meant to be squashed into the previous commit, run:\n"
-"\n"
-"  git commit --amend %s\n"
-"\n"
-"If they are meant to go into a new commit, run:\n"
-"\n"
-"  git commit %s\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 thư mục làm việc của bạn.\n"
-"Nếu các thay đổi này là muốn squash vào lần chuyển giao kế trước, chạy:\n"
-"\n"
-"  git commit --amend %s\n"
-"\n"
-"Nếu chúng có ý là đi đến lần chuyển giao mới, thì chạy:\n"
-"\n"
-"  git commit %s\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"
-
-#: sequencer.c:1225
-msgid "'prepare-commit-msg' hook failed"
-msgstr "móc “prepare-commit-msg” bị lỗi"
-
-#: sequencer.c:1231
-msgid ""
-"Your name and email address were configured automatically based\n"
-"on your username and hostname. Please check that they are accurate.\n"
-"You can suppress this message by setting them explicitly. Run the\n"
-"following command and follow the instructions in your editor to edit\n"
-"your configuration file:\n"
-"\n"
-"    git config --global --edit\n"
-"\n"
-"After doing this, you may fix the identity used for this commit with:\n"
-"\n"
-"    git commit --amend --reset-author\n"
-msgstr ""
-"Tên và địa chỉ thư điện tử của bạn được cấu hình một cách tự động trên cơ "
-"sở\n"
-"tài khoản và địa chỉ máy chủ của bạn. Xin hãy kiểm tra xem chúng có chính "
-"xác không.\n"
-"Bạn có thể chặn những thông báo kiểu này bằng cách cài đặt các thông tin "
-"trên\n"
-"một cách rõ ràng. Chạy lệnh sau đây là theo các hướng dẫn trong bộ soạn "
-"thảo\n"
-"để chỉnh sửa tập tin cấu hình của mình:\n"
-"\n"
-"    git config --global --edit\n"
-"\n"
-"Sau khi thực hiện xong, bạn có thể sửa chữa định danh được sử dụng cho\n"
-"lần chuyển giao này với lệnh:\n"
-"\n"
-"    git commit --amend --reset-author\n"
-
-#: sequencer.c:1244
-msgid ""
-"Your name and email address were configured automatically based\n"
-"on your username and hostname. Please check that they are accurate.\n"
-"You can suppress this message by setting them explicitly:\n"
-"\n"
-"    git config --global user.name \"Your Name\"\n"
-"    git config --global user.email you@example.com\n"
-"\n"
-"After doing this, you may fix the identity used for this commit with:\n"
-"\n"
-"    git commit --amend --reset-author\n"
-msgstr ""
-"Tên và địa chỉ thư điện tử của bạn được cấu hình một cách tự động trên cơ "
-"sở\n"
-"tài khoản và địa chỉ máy chủ của bạn. Xin hãy kiểm tra xem chúng có chính "
-"xác không.\n"
-"Bạn có thể chặn những thông báo kiểu này bằng cách cài đặt các thông tin "
-"trên một cách rõ ràng:\n"
-"\n"
-"    git config --global user.name \"Tên của bạn\"\n"
-"    git config --global user.email you@example.com\n"
-"\n"
-"Sau khi thực hiện xong, bạn có thể sửa chữa định danh được sử dụng cho lần "
-"chuyển giao này với lệnh:\n"
-"\n"
-"    git commit --amend --reset-author\n"
-
-#: sequencer.c:1287
-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:1289
-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:1336
-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:1338
-msgid "detached HEAD"
-msgstr "đã rời khỏi HEAD"
-
-#: sequencer.c:1342
-msgid " (root-commit)"
-msgstr " (root-commit)"
-
-#: sequencer.c:1363
-msgid "could not parse HEAD"
-msgstr "không thể phân tích HEAD"
-
-#: sequencer.c:1365
-#, 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:1369 sequencer.c:1447 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:1425 sequencer.c:2310
-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:1436 builtin/am.c:1644 builtin/merge.c:710
-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:1469 sequencer.c:1589
-#, 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:1500 sequencer.c:1532
-#, c-format
-msgid "invalid author identity '%s'"
-msgstr "định danh tác giả không hợp lệ “%s”"
-
-#: sequencer.c:1506
-msgid "corrupt author: missing date information"
-msgstr "tác giả sai hỏng: thiếu thông tin ngày tháng"
-
-#: sequencer.c:1545 builtin/am.c:1671 builtin/commit.c:1821 builtin/merge.c:921
-#: builtin/merge.c:946 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:1572 sequencer.c:4496 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:1621
-#, c-format
-msgid "could not parse commit %s"
-msgstr "không thể phân tích lần chuyển giao %s"
-
-#: sequencer.c:1626
-#, 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:1709 sequencer.c:1990
-#, c-format
-msgid "unknown command: %d"
-msgstr "không hiểu câu lệnh %d"
-
-#: sequencer.c:1751
-msgid "This is the 1st commit message:"
-msgstr "Đây là chú thích cho lần chuyển giao thứ nhất:"
-
-#: sequencer.c:1752
-#, 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:1753
-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:1754
-#, 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:1755
-#, 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:1902 sequencer.c:1959
-#, c-format
-msgid "cannot write '%s'"
-msgstr "không thể ghi “%s”"
-
-#: sequencer.c:1949
-msgid "need a HEAD to fixup"
-msgstr "cần một HEAD để sửa"
-
-#: sequencer.c:1951 sequencer.c:3592
-msgid "could not read HEAD"
-msgstr "không thể đọc HEAD"
-
-#: sequencer.c:1953
-msgid "could not read HEAD's commit message"
-msgstr "không thể đọc phần chú thích (message) của HEAD"
-
-#: sequencer.c:1977
-#, 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:2087
-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:2094
-msgid "cannot fixup root commit"
-msgstr "không thể sửa chữa lần chuyển giao gốc"
-
-#: sequencer.c:2113
-#, 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:2121 sequencer.c:2129
-#, 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:2135
-#, 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:2154
-#, 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:2220
-#, c-format
-msgid "could not rename '%s' to '%s'"
-msgstr "không thể đổi tên “%s” thành “%s”"
-
-#: sequencer.c:2280
-#, c-format
-msgid "could not revert %s... %s"
-msgstr "không thể hoàn nguyên %s… %s"
-
-#: sequencer.c:2281
-#, c-format
-msgid "could not apply %s... %s"
-msgstr "không thể áp dụng miếng vá %s… %s"
-
-#: sequencer.c:2302
-#, 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:2360
-#, 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:2368
-#, 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:2448
-#, c-format
-msgid "%s does not accept arguments: '%s'"
-msgstr "%s không nhận các đối số: “%s”"
-
-#: sequencer.c:2457
-#, c-format
-msgid "missing arguments for %s"
-msgstr "thiếu đối số cho %s"
-
-#: sequencer.c:2500
-#, c-format
-msgid "could not parse '%s'"
-msgstr "không thể phân tích cú pháp “%s”"
-
-#: sequencer.c:2561
-#, c-format
-msgid "invalid line %d: %.*s"
-msgstr "dòng không hợp lệ %d: %.*s"
-
-#: sequencer.c:2572
-#, 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:2620 builtin/rebase.c:185
-#, c-format
-msgid "could not read '%s'."
-msgstr "không thể đọc “%s”."
-
-#: sequencer.c:2658
-msgid "cancelling a cherry picking in progress"
-msgstr "đang hủy bỏ thao tác cherry pick đang thực hiện"
-
-#: sequencer.c:2667
-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:2707
-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:2709
-#, c-format
-msgid "unusable instruction sheet: '%s'"
-msgstr "bảng chỉ thị không thể dùng được: %s"
-
-#: sequencer.c:2714
-msgid "no commits parsed."
-msgstr "không có lần chuyển giao nào được phân tích."
-
-#: sequencer.c:2725
-msgid "cannot cherry-pick during a revert."
-msgstr "không thể cherry-pick trong khi hoàn nguyên."
-
-#: sequencer.c:2727
-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:2914
-msgid "unusable squash-onto"
-msgstr "squash-onto không dùng được"
-
-#: sequencer.c:2934
-#, c-format
-msgid "malformed options sheet: '%s'"
-msgstr "bảng tùy chọn dị hình: “%s”"
-
-#: sequencer.c:3029 sequencer.c:4875
-msgid "empty commit set passed"
-msgstr "lần chuyển giao trống rỗng đặt là hợp quy cách"
-
-#: sequencer.c:3046
-msgid "revert is already in progress"
-msgstr "có thao tác hoàn nguyên đang được thực hiện"
-
-#: sequencer.c:3048
-#, c-format
-msgid "try \"git revert (--continue | %s--abort | --quit)\""
-msgstr "hãy thử \"git revert (--continue | %s--abort | --quit)\""
-
-#: sequencer.c:3051
-msgid "cherry-pick is already in progress"
-msgstr "có thao tác “cherry-pick” đang được thực hiện"
-
-#: sequencer.c:3053
-#, c-format
-msgid "try \"git cherry-pick (--continue | %s--abort | --quit)\""
-msgstr "hãy thử \"git cherry-pick (--continue | %s--abort | --quit)\""
-
-#: sequencer.c:3067
-#, 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:3082
-msgid "could not lock HEAD"
-msgstr "không thể khóa HEAD"
-
-#: sequencer.c:3142 sequencer.c:4585
-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:3144 sequencer.c:3155
-msgid "cannot resolve HEAD"
-msgstr "không thể phân giải HEAD"
-
-#: sequencer.c:3146 sequencer.c:3190
-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:3176 builtin/fetch.c:1030 builtin/fetch.c:1457
-#: builtin/grep.c:774
-#, c-format
-msgid "cannot open '%s'"
-msgstr "không mở được “%s”"
-
-#: sequencer.c:3178
-#, c-format
-msgid "cannot read '%s': %s"
-msgstr "không thể đọc “%s”: %s"
-
-#: sequencer.c:3179
-msgid "unexpected end of file"
-msgstr "gặp kết thúc tập tin đột xuất"
-
-#: sequencer.c:3185
-#, 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:3196
-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:3237
-msgid "no revert in progress"
-msgstr "không có tiến trình hoàn nguyên nào"
-
-#: sequencer.c:3246
-msgid "no cherry-pick in progress"
-msgstr "không có cherry-pick đang được thực hiện"
-
-#: sequencer.c:3256
-msgid "failed to skip the commit"
-msgstr "gặp lỗi khi bỏ qua đối tượng chuyển giao"
-
-#: sequencer.c:3263
-msgid "there is nothing to skip"
-msgstr "ở đây không có gì để mà bỏ qua cả"
-
-#: sequencer.c:3266
-#, c-format
-msgid ""
-"have you committed already?\n"
-"try \"git %s --continue\""
-msgstr ""
-"bạn đã sẵn sàng chuyển giao chưa?\n"
-"thử \"git %s --continue\""
-
-#: sequencer.c:3428 sequencer.c:4476
-msgid "cannot read HEAD"
-msgstr "không thể đọc HEAD"
-
-#: sequencer.c:3445
-#, c-format
-msgid "unable to copy '%s' to '%s'"
-msgstr "không thể chép “%s” sang “%s”"
-
-#: sequencer.c:3453
-#, c-format
-msgid ""
-"You can amend the commit now, with\n"
-"\n"
-"  git commit --amend %s\n"
-"\n"
-"Once you are satisfied with your changes, run\n"
-"\n"
-"  git rebase --continue\n"
-msgstr ""
-"Bạn có thể tu bổ lần chuyển giao ngay bây giờ bằng:\n"
-"\n"
-"  git commit --amend %s\n"
-"\n"
-"Một khi đã hài lòng với những thay đổi của mình, thì chạy:\n"
-"\n"
-"  git rebase --continue\n"
-
-#: sequencer.c:3463
-#, c-format
-msgid "Could not apply %s... %.*s"
-msgstr "Không thể áp dụng %s… %.*s"
-
-#: sequencer.c:3470
-#, c-format
-msgid "Could not merge %.*s"
-msgstr "Không hòa trộn %.*s"
-
-#: sequencer.c:3484 sequencer.c:3488 builtin/difftool.c:633
-#, c-format
-msgid "could not copy '%s' to '%s'"
-msgstr "không thể chép “%s” sang “%s”"
-
-#: sequencer.c:3499
-#, c-format
-msgid "Executing: %s\n"
-msgstr "Đang thực thi: %s\n"
-
-#: sequencer.c:3510
-#, c-format
-msgid ""
-"execution failed: %s\n"
-"%sYou can fix the problem, and then run\n"
-"\n"
-"  git rebase --continue\n"
-"\n"
-msgstr ""
-"thực thi gặp lỗi: %s\n"
-"%sBạn có thể sửa các trục trặc, và sau đó chạy lệnh\n"
-"\n"
-"  git rebase --continue\n"
-"\n"
-
-#: sequencer.c:3516
-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:3522
-#, c-format
-msgid ""
-"execution succeeded: %s\n"
-"but left changes to the index and/or the working tree\n"
-"Commit or stash your changes, and then run\n"
-"\n"
-"  git rebase --continue\n"
-"\n"
-msgstr ""
-"thực thi thành công: %s\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"
-"  git rebase --continue\n"
-"\n"
-
-#: sequencer.c:3582
-#, c-format
-msgid "illegal label name: '%.*s'"
-msgstr "tên nhãn dị hình: “%.*s”"
-
-#: sequencer.c:3655
-msgid "writing fake root commit"
-msgstr "ghi lần chuyển giao gốc giả"
-
-#: sequencer.c:3660
-msgid "writing squash-onto"
-msgstr "đang ghi squash-onto"
-
-#: sequencer.c:3739
-#, c-format
-msgid "could not resolve '%s'"
-msgstr "không thể phân giải “%s”"
-
-#: sequencer.c:3771
-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:3793
-#, c-format
-msgid "unable to parse '%.*s'"
-msgstr "không thể phân tích “%.*s”"
-
-#: sequencer.c:3802
-#, c-format
-msgid "nothing to merge: '%.*s'"
-msgstr "chẳng có gì để hòa trộn: “%.*s”"
-
-#: sequencer.c:3814
-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:3869
-#, 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:4013
-#, 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:4029
-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:4110
-msgid "Cannot autostash"
-msgstr "Không thể autostash"
-
-#: sequencer.c:4113
-#, c-format
-msgid "Unexpected stash response: '%s'"
-msgstr "Gặp đáp ứng stash không cần: “%s”"
-
-#: sequencer.c:4119
-#, c-format
-msgid "Could not create directory for '%s'"
-msgstr "Không thể tạo thư mục cho “%s”"
-
-#: sequencer.c:4122
-#, c-format
-msgid "Created autostash: %s\n"
-msgstr "Đã tạo autostash: %s\n"
-
-#: sequencer.c:4124
-msgid "could not reset --hard"
-msgstr "không thể reset --hard"
-
-#: sequencer.c:4148
-#, c-format
-msgid "Applied autostash.\n"
-msgstr "Đã áp dụng autostash.\n"
-
-#: sequencer.c:4160
-#, c-format
-msgid "cannot store %s"
-msgstr "không thử lưu “%s”"
-
-#: sequencer.c:4163
-#, c-format
-msgid ""
-"%s\n"
-"Your changes are safe in the stash.\n"
-"You can run \"git stash pop\" or \"git stash drop\" at any time.\n"
-msgstr ""
-"%s\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"
-
-#: sequencer.c:4168
-msgid "Applying autostash resulted in conflicts."
-msgstr "Áp dụng autostash có hiệu quả trong các xung đột."
-
-#: sequencer.c:4169
-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:4225
-msgid "could not detach HEAD"
-msgstr "không thể tách rời HEAD"
-
-#: sequencer.c:4240
-#, c-format
-msgid "Stopped at HEAD\n"
-msgstr "Dừng lại ở HEAD\n"
-
-#: sequencer.c:4242
-#, c-format
-msgid "Stopped at %s\n"
-msgstr "Dừng lại ở %s\n"
-
-#: sequencer.c:4274
-#, c-format
-msgid ""
-"Could not execute the todo command\n"
-"\n"
-"    %.*s\n"
-"It has been rescheduled; To edit the command before continuing, please\n"
-"edit the todo list first:\n"
-"\n"
-"    git rebase --edit-todo\n"
-"    git rebase --continue\n"
-msgstr ""
-"Không thể thực thi lệnh todo\n"
-"\n"
-"    %.*s\n"
-"Nó đã được lên lịch lại: Để sửa lệnh trước khi tiếp tục, vui lòng\n"
-"sửa danh sách todo trước:\n"
-"\n"
-"    git rebase --edit-todo\n"
-"    git rebase --continue\n"
-
-#: sequencer.c:4320
-#, c-format
-msgid "Rebasing (%d/%d)%s"
-msgstr "Đang cải tổ (%d/%d)%s"
-
-#: sequencer.c:4366
-#, c-format
-msgid "Stopped at %s...  %.*s\n"
-msgstr "Dừng lại ở %s…  %.*s\n"
-
-#: sequencer.c:4436
-#, c-format
-msgid "unknown command %d"
-msgstr "không hiểu câu lệnh %d"
-
-#: sequencer.c:4484
-msgid "could not read orig-head"
-msgstr "không thể đọc orig-head"
-
-#: sequencer.c:4489
-msgid "could not read 'onto'"
-msgstr "không thể đọc “onto”."
-
-#: sequencer.c:4503
-#, c-format
-msgid "could not update HEAD to %s"
-msgstr "không thể cập nhật HEAD thành %s"
-
-#: sequencer.c:4563
-#, 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:4615
-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:4624
-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:4626
-#, c-format
-msgid "invalid file: '%s'"
-msgstr "tập tin không hợp lệ: “%s”"
-
-#: sequencer.c:4628
-#, c-format
-msgid "invalid contents: '%s'"
-msgstr "nội dung không hợp lệ: “%s”"
-
-#: sequencer.c:4631
-msgid ""
-"\n"
-"You have uncommitted changes in your working tree. Please, commit them\n"
-"first and then run 'git rebase --continue' again."
-msgstr ""
-"\n"
-"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:4667 sequencer.c:4706
-#, c-format
-msgid "could not write file: '%s'"
-msgstr "không thể ghi tập tin: “%s”"
-
-#: sequencer.c:4722
-msgid "could not remove CHERRY_PICK_HEAD"
-msgstr "không thể xóa bỏ CHERRY_PICK_HEAD"
-
-#: sequencer.c:4732
-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:4852
-#, c-format
-msgid "%s: can't cherry-pick a %s"
-msgstr "%s: không thể cherry-pick một %s"
-
-#: sequencer.c:4856
-#, c-format
-msgid "%s: bad revision"
-msgstr "%s: điểm xét duyệt sai"
-
-#: sequencer.c:4891
-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:5162 sequencer.c:5391
-#, 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:5232 sequencer.c:5407
-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:5378
-msgid "make_script: unhandled options"
-msgstr "make_script: các tùy chọn được không xử lý"
-
-#: sequencer.c:5381
-msgid "make_script: error preparing revisions"
-msgstr "make_script: lỗi chuẩn bị điểm hiệu chỉnh"
-
-#: sequencer.c:5639 sequencer.c:5656
-msgid "nothing to do"
-msgstr "không có gì để làm"
-
-#: sequencer.c:5675
-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:5775
-msgid "the script was already rearranged."
-msgstr "văn lệnh đã sẵn được sắp đặt rồi."
-
-#: setup.c:135
-#, c-format
-msgid "'%s' is outside repository at '%s'"
-msgstr "“%s” ngoài một kho chứa tại “%s”"
-
-#: setup.c:187
-#, c-format
-msgid ""
-"%s: no such path in the working tree.\n"
-"Use 'git <command> -- <path>...' to specify paths that do not exist locally."
-msgstr ""
-"%s: không có đường dẫn nào như thế ở trong cây làm việc.\n"
-"Dùng “git <lệnh> -- <đường/dẫn>…” để chỉ định đường dẫn mà nó không tồn tại "
-"một cách nội bộ."
-
-#: setup.c:200
-#, c-format
-msgid ""
-"ambiguous argument '%s': unknown revision or path not in the working tree.\n"
-"Use '--' to separate paths from revisions, like this:\n"
-"'git <command> [<revision>...] -- [<file>...]'"
-msgstr ""
-"tham số chưa rõ ràng “%s”: chưa biết điểm xem xét hay đường dẫn không trong "
-"cây làm việc.\n"
-"Dùng “--” để ngăn cách các đường dẫn khỏi điểm xem xét, như thế này:\n"
-"“git <lệnh> [<điểm xem xét>…] -- [<tập tin>…]”"
-
-#: setup.c:266
-#, c-format
-msgid "option '%s' must come before non-option arguments"
-msgstr "tùy chọn “%s” phải trước các đối số đầu tiên không có tùy chọn"
-
-#: setup.c:285
-#, c-format
-msgid ""
-"ambiguous argument '%s': both revision and filename\n"
-"Use '--' to separate paths from revisions, like this:\n"
-"'git <command> [<revision>...] -- [<file>...]'"
-msgstr ""
-"tham số chưa rõ ràng “%s”: cả điểm xem xét và tên tập tin.\n"
-"Dùng “--” để ngăn cách các đường dẫn khỏi điểm xem xét, như thế này:\n"
-"“git <lệnh> [<điểm xem xét>…] -- [<tập tin>…]”"
-
-#: setup.c:421
-msgid "unable to set up work tree using invalid config"
-msgstr "không thể cài đặt thư mục làm việc sử dụng cấu hình không hợp lệ"
-
-#: setup.c:425 builtin/rev-parse.c:895
-msgid "this operation must be run in a work tree"
-msgstr "thao tác này phải được thực hiện trong thư mục làm việc"
-
-#: setup.c:724
-#, c-format
-msgid "Expected git repo version <= %d, found %d"
-msgstr "Cần phiên bản kho git <= %d, nhưng lại nhận được %d"
-
-#: setup.c:732
-msgid "unknown repository extension found:"
-msgid_plural "unknown repository extensions found:"
-msgstr[0] "tìm thấy phần mở rộng kho chưa biết:"
-
-#: setup.c:746
-msgid "repo version is 0, but v1-only extension found:"
-msgid_plural "repo version is 0, but v1-only extensions found:"
-msgstr[0] "phiên bản kho là 0, nhưng lại tìm thấy phần mở rộng chỉ v1:"
-
-#: setup.c:767
-#, c-format
-msgid "error opening '%s'"
-msgstr "gặp lỗi khi mở “%s”"
-
-#: setup.c:769
-#, c-format
-msgid "too large to be a .git file: '%s'"
-msgstr "tập tin .git là quá lớn: “%s”"
-
-#: setup.c:771
-#, c-format
-msgid "error reading %s"
-msgstr "gặp lỗi khi đọc %s"
-
-#: setup.c:773
-#, c-format
-msgid "invalid gitfile format: %s"
-msgstr "định dạng tập tin git không hợp lệ: %s"
-
-#: setup.c:775
-#, c-format
-msgid "no path in gitfile: %s"
-msgstr "không có đường dẫn trong tập tin git: %s"
-
-#: setup.c:777
-#, c-format
-msgid "not a git repository: %s"
-msgstr "không phải là kho git: %s"
-
-#: setup.c:879
-#, c-format
-msgid "'$%s' too big"
-msgstr "“$%s” quá lớn"
-
-#: setup.c:893
-#, c-format
-msgid "not a git repository: '%s'"
-msgstr "không phải là kho git: “%s”"
-
-#: setup.c:922 setup.c:924 setup.c:955
-#, c-format
-msgid "cannot chdir to '%s'"
-msgstr "không thể chdir (chuyển đổi thư mục) sang “%s”"
-
-#: setup.c:927 setup.c:983 setup.c:993 setup.c:1032 setup.c:1040
-msgid "cannot come back to cwd"
-msgstr "không thể quay lại cwd"
-
-#: setup.c:1054
-#, c-format
-msgid "failed to stat '%*s%s%s'"
-msgstr "gặp lỗi khi lấy thống kê về “%*s%s%s”"
-
-#: setup.c:1338
-msgid "Unable to read current working directory"
-msgstr "Không thể đọc thư mục làm việc hiện hành"
-
-#: setup.c:1347 setup.c:1353
-#, c-format
-msgid "cannot change to '%s'"
-msgstr "không thể chuyển sang “%s”"
-
-#: setup.c:1358
-#, c-format
-msgid "not a git repository (or any of the parent directories): %s"
-msgstr "không phải là kho git (hoặc bất kỳ thư mục cha mẹ nào): %s"
-
-#: setup.c:1364
-#, 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 ""
-"không phải là kho git (hay bất kỳ cha mẹ nào đến tận điểm gắn kết %s)\n"
-"Dừng tại biên của hệ thống tập tin (GIT_DISCOVERY_ACROSS_FILESYSTEM chưa "
-"đặt)."
-
-#: setup.c:1374
-#, c-format
-msgid ""
-"unsafe repository ('%s' is owned by someone else)\n"
-"To add an exception for this directory, call:\n"
-"\n"
-"\tgit config --global --add safe.directory %s"
-msgstr ""
-"kho lưu trữ không an toàn ('%s' thuộc sở hữu của người khác)\n"
-"Để thêm ngoại lệ cho thư mục này, hãy gọi:\n"
-"\n"
-"\tgit config --global --add safe.directory %s"
-
-#: setup.c:1502
-#, c-format
-msgid ""
-"problem with core.sharedRepository filemode value (0%.3o).\n"
-"The owner of files must always have read and write permissions."
-msgstr ""
-"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:1564
-msgid "fork failed"
-msgstr "gặp lỗi khi rẽ nhánh tiến trình"
-
-#: setup.c:1569
-msgid "setsid failed"
-msgstr "setsid gặp lỗi"
-
-#: sparse-index.c:285
-#, 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)"
-
-#: split-index.c:9
-msgid "cannot use split index with a sparse index"
-msgstr "không thể sử dụng bảng mục lục chia tách với một \"sparse index\""
-
-#. TRANSLATORS: IEC 80000-13:2008 gibibyte
-#: strbuf.c:851
-#, c-format
-msgid "%u.%2.2u GiB"
-msgstr "%u.%2.2u GiB"
-
-#. TRANSLATORS: IEC 80000-13:2008 gibibyte/second
-#: strbuf.c:853
-#, c-format
-msgid "%u.%2.2u GiB/s"
-msgstr "%u.%2.2u GiB/giây"
-
-#. TRANSLATORS: IEC 80000-13:2008 mebibyte
-#: strbuf.c:861
-#, c-format
-msgid "%u.%2.2u MiB"
-msgstr "%u.%2.2u MiB"
-
-#. TRANSLATORS: IEC 80000-13:2008 mebibyte/second
-#: strbuf.c:863
-#, c-format
-msgid "%u.%2.2u MiB/s"
-msgstr "%u.%2.2u MiB/giây"
-
-#. TRANSLATORS: IEC 80000-13:2008 kibibyte
-#: strbuf.c:870
-#, c-format
-msgid "%u.%2.2u KiB"
-msgstr "%u.%2.2u KiB"
-
-#. TRANSLATORS: IEC 80000-13:2008 kibibyte/second
-#: strbuf.c:872
-#, c-format
-msgid "%u.%2.2u KiB/s"
-msgstr "%u.%2.2u KiB/giây"
-
-#. TRANSLATORS: IEC 80000-13:2008 byte
-#: strbuf.c:878
-#, c-format
-msgid "%u byte"
-msgid_plural "%u bytes"
-msgstr[0] "%u byte"
-
-#. TRANSLATORS: IEC 80000-13:2008 byte/second
-#: strbuf.c:880
-#, c-format
-msgid "%u byte/s"
-msgid_plural "%u bytes/s"
-msgstr[0] "%u byte/giây"
-
-#: strbuf.c:1187 wrapper.c:217 wrapper.c:387 builtin/am.c:766
-#: builtin/rebase.c:653
-#, c-format
-msgid "could not open '%s' for writing"
-msgstr "không thể mở “%s” để ghi"
-
-#: strbuf.c:1196
-#, c-format
-msgid "could not edit '%s'"
-msgstr "không thể sửa “%s”"
-
-#: submodule-config.c:238
-#, c-format
-msgid "ignoring suspicious submodule name: %s"
-msgstr "đang lờ đi tên mô-đun-con mập mờ: %s"
-
-#: submodule-config.c:305
-msgid "negative values not allowed for submodule.fetchjobs"
-msgstr "không cho phép giá trị âm ở submodule.fetchjobs"
-
-#: submodule-config.c:403
-#, c-format
-msgid "ignoring '%s' which may be interpreted as a command-line option: %s"
-msgstr ""
-"đang bỏ qua “%s” cái mà có thể được phiên dịch như là một tùy chọn dòng "
-"lệnh: %s"
-
-#: submodule-config.c:500 builtin/push.c:489 builtin/send-pack.c:148
-#, c-format
-msgid "invalid value for '%s'"
-msgstr "giá trị cho '%s' không hợp lệ"
-
-#: submodule-config.c:828
-#, c-format
-msgid "Could not update .gitmodules entry %s"
-msgstr "Không thể cập nhật mục .gitmodules %s"
-
-#: submodule.c:115 submodule.c:144
-msgid "Cannot change unmerged .gitmodules, resolve merge conflicts first"
-msgstr ""
-"Không thể thay đổi .gitmodules chưa hòa trộn, hãy giải quyết xung đột trộn "
-"trước"
-
-#: submodule.c:119 submodule.c:148
-#, c-format
-msgid "Could not find section in .gitmodules where path=%s"
-msgstr "Không thể tìm thấy phần trong .gitmodules nơi mà đường_dẫn=%s"
-
-#: submodule.c:155
-#, c-format
-msgid "Could not remove .gitmodules entry for %s"
-msgstr "Không thể gỡ bỏ mục .gitmodules dành cho %s"
-
-#: submodule.c:166
-msgid "staging updated .gitmodules failed"
-msgstr "gặp lỗi khi tổ chức .gitmodules đã cập nhật"
-
-#: submodule.c:346
-#, c-format
-msgid "in unpopulated submodule '%s'"
-msgstr "trong mô-đun-con không có gì “%s”"
-
-#: submodule.c:377
-#, c-format
-msgid "Pathspec '%s' is in submodule '%.*s'"
-msgstr "Đặc tả đường dẫn “%s” thì ở trong mô-đun-con “%.*s”"
-
-#: submodule.c:454
-#, c-format
-msgid "bad --ignore-submodules argument: %s"
-msgstr "đối số --ignore-submodules sai: %s"
-
-#: submodule.c:866
-#, c-format
-msgid ""
-"Submodule in commit %s at path: '%s' collides with a submodule named the "
-"same. Skipping it."
-msgstr ""
-"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:987
-#, 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:1069
-#, c-format
-msgid ""
-"Could not run 'git rev-list <commits> --not --remotes -n 1' command in "
-"submodule %s"
-msgstr ""
-"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:1192
-#, c-format
-msgid "process for submodule '%s' failed"
-msgstr "xử lý cho mô-đun-con “%s” gặp lỗi"
-
-#: submodule.c:1221 builtin/branch.c:714 builtin/submodule--helper.c:2827
-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:1232
-#, c-format
-msgid "Pushing submodule '%s'\n"
-msgstr "Đẩy lên mô-đun-con “%s”\n"
-
-#: submodule.c:1235
-#, c-format
-msgid "Unable to push submodule '%s'\n"
-msgstr "Không thể đẩy lên mô-đun-con “%s”\n"
-
-#: submodule.c:1567
-#, c-format
-msgid "Fetching submodule %s%s\n"
-msgstr "Đang lấy về mô-đun-con %s%s\n"
-
-#: submodule.c:1589
-#, c-format
-msgid "Could not access submodule '%s'\n"
-msgstr "Không thể truy cập mô-đun-con “%s”\n"
-
-#: submodule.c:1618
-#, c-format
-msgid "Could not access submodule '%s' at commit %s\n"
-msgstr "Không thể truy cập mô-đun-con “%s” ở lần chuyển giao %s\n"
-
-#: submodule.c:1629
-#, c-format
-msgid "Fetching submodule %s%s at commit %s\n"
-msgstr "Đang lấy về mô-đun-con %s%s tại lần chuyển giao %s\n"
-
-#: submodule.c:1849
-#, c-format
-msgid ""
-"Errors during submodule fetch:\n"
-"%s"
-msgstr ""
-"Có lỗi khi lấy về mô-đun-con:\n"
-" “%s”"
-
-#: submodule.c:1874
-#, c-format
-msgid "'%s' not recognized as a git repository"
-msgstr "không nhận ra “%s” là một kho git"
-
-#: submodule.c:1891
-#, 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:1932
-#, 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:2007
-#, 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:2020
-#, 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:2037
-#, 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:2064 submodule.c:2379
-#, c-format
-msgid "could not recurse into submodule '%s'"
-msgstr "không thể đệ quy vào trong mô-đun-con “%s”"
-
-#: submodule.c:2086
-msgid "could not reset submodule index"
-msgstr "không thể đặt lại mục lục của mô-đun-con"
-
-#: submodule.c:2128
-#, c-format
-msgid "submodule '%s' has dirty index"
-msgstr "mô-đun-con “%s” có mục lục còn bẩn"
-
-#: submodule.c:2182
-#, c-format
-msgid "Submodule '%s' could not be updated."
-msgstr "Mô-đun-con “%s” không thể được cập nhật."
-
-#: submodule.c:2250
-#, 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:2271
-#, c-format
-msgid ""
-"relocate_gitdir for submodule '%s' with more than one worktree not supported"
-msgstr ""
-"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:2283 submodule.c:2343
-#, 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:2287
-#, 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:2293
-#, c-format
-msgid ""
-"Migrating git directory of '%s%s' from\n"
-"'%s' to\n"
-"'%s'\n"
-msgstr ""
-"Di cư thư mục git của “%s%s” từ\n"
-"“%s” sang\n"
-"“%s”\n"
-
-#: submodule.c:2424
-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:2464
-#, c-format
-msgid "ls-tree returned unexpected return code %d"
-msgstr "ls-tree trả về mã không như mong đợi %d"
-
-#: symlinks.c:244
-#, c-format
-msgid "failed to lstat '%s'"
-msgstr "gặp lỗi khi lstat “%s”"
-
-#: trailer.c:244
-#, c-format
-msgid "running trailer command '%s' failed"
-msgstr "chạy lệnh kéo theo “%s” gặp lỗi"
-
-#: 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 "không hiểu giá trị “%s” cho khóa “%s”"
-
-#: trailer.c:547 trailer.c:552 trailer.c:557 builtin/remote.c:300
-#: builtin/remote.c:328
-#, c-format
-msgid "more than one %s"
-msgstr "nhiều hơn một %s"
-
-#: trailer.c:743
-#, c-format
-msgid "empty trailer token in trailer '%.*s'"
-msgstr "thẻ thừa trống rỗng trong phần thừa “%.*s”"
-
-#: trailer.c:763
-#, c-format
-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:1563
-msgid "could not read from stdin"
-msgstr "không thể đọc từ đầu vào tiêu chuẩn"
-
-#: trailer.c:1024 wrapper.c:760
-#, c-format
-msgid "could not stat %s"
-msgstr "không thể lấy thông tin thống kê về %s"
-
-#: trailer.c:1026
-#, c-format
-msgid "file %s is not a regular file"
-msgstr "\"%s\" không phải là tập tin bình thường"
-
-#: trailer.c:1028
-#, c-format
-msgid "file %s is not writable by user"
-msgstr "tập tin %s người dùng không thể ghi được"
-
-#: trailer.c:1040
-msgid "could not open temporary file"
-msgstr "không thể tạo tập tin tạm thời"
-
-#: trailer.c:1080
-#, c-format
-msgid "could not rename temporary file to %s"
-msgstr "không thể đổi tên tập tin tạm thời thành %s"
-
-#: transport-helper.c:62 transport-helper.c:91
-msgid "full write to remote helper failed"
-msgstr "ghi đầy đủ lên bộ hỗ trợ máy chủ gặp lỗi"
-
-#: transport-helper.c:145
-#, c-format
-msgid "unable to find remote helper for '%s'"
-msgstr "không thể tìm thấy bộ hỗ trợ máy chủ cho “%s”"
-
-#: transport-helper.c:161 transport-helper.c:575
-msgid "can't dup helper output fd"
-msgstr "không thể nhân đôi fd dầu ra bộ hỗ trợ"
-
-#: transport-helper.c:214
-#, c-format
-msgid ""
-"unknown mandatory capability %s; this remote helper probably needs newer "
-"version of Git"
-msgstr ""
-"không hiểu capability bắt buộc %s; bộ hỗ trợ máy chủ này gần như chắc chắn "
-"là cần phiên bản Git mới hơn"
-
-#: transport-helper.c:220
-msgid "this remote helper should implement refspec capability"
-msgstr "bộ hỗ trợ máy chủ này cần phải thực thi capability đặc tả tham chiếu"
-
-#: transport-helper.c:287 transport-helper.c:429
-#, c-format
-msgid "%s unexpectedly said: '%s'"
-msgstr "%s said bất ngờ: “%s”"
-
-#: transport-helper.c:417
-#, c-format
-msgid "%s also locked %s"
-msgstr "%s cũng khóa %s"
-
-#: transport-helper.c:497
-msgid "couldn't run fast-import"
-msgstr "không thể chạy fast-import"
-
-#: transport-helper.c:520
-msgid "error while running fast-import"
-msgstr "gặp lỗi trong khi chạy fast-import"
-
-#: transport-helper.c:549 transport-helper.c:1254
-#, c-format
-msgid "could not read ref %s"
-msgstr "không thể đọc tham chiếu %s"
-
-#: transport-helper.c:594
-#, c-format
-msgid "unknown response to connect: %s"
-msgstr "không hiểu đáp ứng để kết nối: %s"
-
-#: transport-helper.c:616
-msgid "setting remote service path not supported by protocol"
-msgstr "giao thức này không hỗ trợ cài đặt đường dẫn dịch vụ máy chủ"
-
-#: transport-helper.c:618
-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:1496
-msgid "operation not supported by protocol"
-msgstr "thao tác không được gia thức hỗ trợ"
-
-#: transport-helper.c:664
-#, c-format
-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:415
-msgid "--negotiate-only requires protocol v2"
-msgstr "--negotiate-only cần giao thức v2"
-
-#: transport-helper.c:758
-msgid "'option' without a matching 'ok/error' directive"
-msgstr "“option” không có chỉ thị “ok/error” tương ứng"
-
-#: transport-helper.c:801
-#, c-format
-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:862
-#, 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:945
-#, c-format
-msgid "helper %s does not support dry-run"
-msgstr "helper %s không hỗ trợ dry-run"
-
-#: transport-helper.c:948
-#, c-format
-msgid "helper %s does not support --signed"
-msgstr "helper %s không hỗ trợ --signed"
-
-#: transport-helper.c:951
-#, c-format
-msgid "helper %s does not support --signed=if-asked"
-msgstr "helper %s không hỗ trợ --signed=if-asked"
-
-#: transport-helper.c:956
-#, c-format
-msgid "helper %s does not support --atomic"
-msgstr "helper %s không hỗ trợ --atomic"
-
-#: transport-helper.c:960
-#, c-format
-msgid "helper %s does not support --%s"
-msgstr "helper %s không hỗ trợ --%s"
-
-#: transport-helper.c:967
-#, c-format
-msgid "helper %s does not support 'push-option'"
-msgstr "helper %s không hỗ trợ “push-option”"
-
-#: transport-helper.c:1067
-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:1072
-#, c-format
-msgid "helper %s does not support 'force'"
-msgstr "helper %s không hỗ trợ “force”"
-
-#: transport-helper.c:1119
-msgid "couldn't run fast-export"
-msgstr "không thể chạy fast-export"
-
-#: transport-helper.c:1124
-msgid "error while running fast-export"
-msgstr "gặp lỗi trong khi chạy fast-export"
-
-#: transport-helper.c:1149
-#, c-format
-msgid ""
-"No refs in common and none specified; doing nothing.\n"
-"Perhaps you should specify a branch.\n"
-msgstr ""
-"Không có các tham chiếu trong phần chung và chưa chỉ định; nên không làm gì "
-"cả.\n"
-"Tuy nhiên bạn nên chỉ định một nhánh.\n"
-
-#: transport-helper.c:1231
-#, c-format
-msgid "unsupported object format '%s'"
-msgstr "không hỗ trợ định dạng đối tượng “%s”"
-
-#: transport-helper.c:1240
-#, 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:1392
-#, c-format
-msgid "read(%s) failed"
-msgstr "read(%s) gặp lỗi"
-
-#: transport-helper.c:1419
-#, c-format
-msgid "write(%s) failed"
-msgstr "write(%s) gặp lỗi"
-
-#: transport-helper.c:1468
-#, c-format
-msgid "%s thread failed"
-msgstr "tuyến trình %s gặp lỗi"
-
-#: transport-helper.c:1472
-#, 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:1491 transport-helper.c:1495
-#, 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:1532
-#, c-format
-msgid "%s process failed to wait"
-msgstr "xử lý %s gặp lỗi khi đợi"
-
-#: transport-helper.c:1536
-#, c-format
-msgid "%s process failed"
-msgstr "xử lý %s gặp lỗi"
-
-#: transport-helper.c:1554 transport-helper.c:1563
-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"
-
-#: transport.c:116
-#, c-format
-msgid "Would set upstream of '%s' to '%s' of '%s'\n"
-msgstr "Không thể đặt thượng nguồn của “%s” thành “%s” của “%s”\n"
-
-#: transport.c:138
-#, c-format
-msgid "could not read bundle '%s'"
-msgstr "không thể đọc bó “%s”"
-
-#: transport.c:234
-#, 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:289
-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:290
-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:418
-msgid "server does not support wait-for-done"
-msgstr "máy chủ không hỗ trợ wait-for-done"
-
-#: transport.c:770
-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:845
-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:978
-#, 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:1044
-#, c-format
-msgid "transport '%s' not allowed"
-msgstr "không cho phép phương thức vận chuyển “%s”"
-
-#: transport.c:1093
-msgid "git-over-rsync is no longer supported"
-msgstr "git-over-rsync không còn được hỗ trợ nữa"
-
-#: transport.c:1196
-#, c-format
-msgid ""
-"The following submodule paths contain changes that can\n"
-"not be found on any remote:\n"
-msgstr ""
-"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:1200
-#, c-format
-msgid ""
-"\n"
-"Please try\n"
-"\n"
-"\tgit push --recurse-submodules=on-demand\n"
-"\n"
-"or cd to the path and use\n"
-"\n"
-"\tgit push\n"
-"\n"
-"to push them to a remote.\n"
-"\n"
-msgstr ""
-"\n"
-"Hãy thử\n"
-"\n"
-"\tgit push --recurse-submodules=on-demand\n"
-"\n"
-"hoặc cd đến đường dẫn và dùng\n"
-"\n"
-"\tgit push\n"
-"\n"
-"để đẩy chúng lên máy phục vụ.\n"
-"\n"
-
-#: transport.c:1208
-msgid "Aborting."
-msgstr "Bãi bỏ."
-
-#: transport.c:1354
-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"
-
-#: tree-walk.c:33
-msgid "too-short tree object"
-msgstr "đối tượng cây quá ngắn"
-
-#: tree-walk.c:39
-msgid "malformed mode in tree entry"
-msgstr "chế độ dị hình trong đề mục cây"
-
-#: tree-walk.c:43
-msgid "empty filename in tree entry"
-msgstr "tên tập tin trống rỗng trong mục tin cây"
-
-#: tree-walk.c:118
-msgid "too-short tree file"
-msgstr "tập tin cây quá ngắn"
-
-#: unpack-trees.c:118
-#, c-format
-msgid ""
-"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 ""
-"Các thay đổi nội bộ của bạn với các tập tin sau đây sẽ bị ghi đè bởi lệnh "
-"checkout:\n"
-"%%sVui lòng chuyển giao các thay đổi hay tạm cất chúng đi trước khi bạn "
-"chuyển nhánh."
-
-#: unpack-trees.c:120
-#, c-format
-msgid ""
-"Your local changes to the following files would be overwritten by checkout:\n"
-"%%s"
-msgstr ""
-"Các thay đổi nội bộ của bạn với các tập tin sau đây sẽ bị ghi đè bởi lệnh "
-"checkout:\n"
-"%%s"
-
-#: unpack-trees.c:123
-#, c-format
-msgid ""
-"Your local changes to the following files would be overwritten by merge:\n"
-"%%sPlease commit your changes or stash them before you merge."
-msgstr ""
-"Các thay đổi nội bộ của bạn với các tập tin sau đây sẽ bị ghi đè bởi lệnh "
-"hòa trộn:\n"
-"%%sVui lòng chuyển giao các thay đổi hay tạm cất chúng đi trước khi bạn hòa "
-"trộn."
-
-#: unpack-trees.c:125
-#, c-format
-msgid ""
-"Your local changes to the following files would be overwritten by merge:\n"
-"%%s"
-msgstr ""
-"Các thay đổi nội bộ của bạn với các tập tin sau đây sẽ bị ghi đè bởi lệnh "
-"hòa trộn:\n"
-"%%s"
-
-#: unpack-trees.c:128
-#, c-format
-msgid ""
-"Your local changes to the following files would be overwritten by %s:\n"
-"%%sPlease commit your changes or stash them before you %s."
-msgstr ""
-"Các thay đổi nội bộ của bạn với các tập tin sau đây sẽ bị ghi đè bởi lệnh "
-"%s:\n"
-"%%sVui lòng chuyển giao các thay đổi hay tạm cất chúng đi trước khi bạn %s."
-
-#: unpack-trees.c:130
-#, c-format
-msgid ""
-"Your local changes to the following files would be overwritten by %s:\n"
-"%%s"
-msgstr ""
-"Các thay đổi nội bộ của bạn với các tập tin sau đây sẽ bị ghi đè bởi lệnh "
-"%s:\n"
-"%%s"
-
-#: unpack-trees.c:135
-#, c-format
-msgid ""
-"Updating the following directories would lose untracked files in them:\n"
-"%s"
-msgstr ""
-"Việc cập nhật các thư mục sau đây có thể làm mất các tập tin chưa theo dõi "
-"trong nó:\n"
-"%s"
-
-#: unpack-trees.c:138
-#, c-format
-msgid ""
-"Refusing to remove the current working directory:\n"
-"%s"
-msgstr ""
-"Từ chối gỡ bỏ thư mục làm việc hiện tại:\n"
-"%s"
-
-#: unpack-trees.c:142
-#, c-format
-msgid ""
-"The following untracked working tree files would be removed by checkout:\n"
-"%%sPlease move or remove them before you switch branches."
-msgstr ""
-"Các tập tin cây làm việc chưa được theo dõi sau đây sẽ bị gỡ bỏ bởi lệnh "
-"checkout:\n"
-"%%sVui lòng di chuyển hay gỡ bỏ chúng trước khi bạn chuyển nhánh."
-
-#: unpack-trees.c:144
-#, c-format
-msgid ""
-"The following untracked working tree files would be removed by checkout:\n"
-"%%s"
-msgstr ""
-"Các tập tin cây làm việc chưa được theo dõi sau đây sẽ bị gỡ bỏ bởi lệnh "
-"checkout:\n"
-"%%s"
-
-#: unpack-trees.c:147
-#, c-format
-msgid ""
-"The following untracked working tree files would be removed by merge:\n"
-"%%sPlease move or remove them before you merge."
-msgstr ""
-"Các tập tin cây làm việc chưa được theo dõi sau đây sẽ bị gỡ bỏ bởi lệnh hòa "
-"trộn:\n"
-"%%sVui lòng di chuyển hay gỡ bỏ chúng trước khi bạn hòa trộn."
-
-#: unpack-trees.c:149
-#, c-format
-msgid ""
-"The following untracked working tree files would be removed by merge:\n"
-"%%s"
-msgstr ""
-"Các tập tin cây làm việc chưa được theo dõi sau đây sẽ bị gỡ bỏ bởi lệnh hòa "
-"trộn:\n"
-"%%s"
-
-#: unpack-trees.c:152
-#, c-format
-msgid ""
-"The following untracked working tree files would be removed by %s:\n"
-"%%sPlease move or remove them before you %s."
-msgstr ""
-"Các tập tin cây làm việc chưa được theo dõi sau đây sẽ bị gỡ bỏ bởi %s:\n"
-"%%sVui lòng di chuyển hay gỡ bỏ chúng trước khi bạn %s."
-
-#: unpack-trees.c:154
-#, c-format
-msgid ""
-"The following untracked working tree files would be removed by %s:\n"
-"%%s"
-msgstr ""
-"Các tập tin cây làm việc chưa được theo dõi sau đây sẽ bị gỡ bỏ bởi %s:\n"
-"%%s"
-
-#: unpack-trees.c:160
-#, c-format
-msgid ""
-"The following untracked working tree files would be overwritten by "
-"checkout:\n"
-"%%sPlease move or remove them before you switch branches."
-msgstr ""
-"Các tập tin cây làm việc chưa được theo dõi sau đây sẽ bị ghi đè bởi lệnh "
-"checkout:\n"
-"%%sVui lòng di chuyển hay gỡ bỏ chúng trước khi bạn chuyển nhánh."
-
-#: unpack-trees.c:162
-#, c-format
-msgid ""
-"The following untracked working tree files would be overwritten by "
-"checkout:\n"
-"%%s"
-msgstr ""
-"Các tập tin cây làm việc chưa được theo dõi sau đây sẽ bị ghi đè bởi lệnh "
-"checkout:\n"
-"%%s"
-
-#: unpack-trees.c:165
-#, c-format
-msgid ""
-"The following untracked working tree files would be overwritten by merge:\n"
-"%%sPlease move or remove them before you merge."
-msgstr ""
-"Các tập tin cây làm việc chưa được theo dõi sau đây sẽ bị ghi đè bởi lệnh "
-"hòa trộn:\n"
-"%%sVui lòng di chuyển hay gỡ bỏ chúng trước khi bạn hòa trộn."
-
-#: unpack-trees.c:167
-#, c-format
-msgid ""
-"The following untracked working tree files would be overwritten by merge:\n"
-"%%s"
-msgstr ""
-"Các tập tin cây làm việc chưa được theo dõi sau đây sẽ bị ghi đè bởi lệnh "
-"hòa trộn:\n"
-"%%s"
-
-#: unpack-trees.c:170
-#, c-format
-msgid ""
-"The following untracked working tree files would be overwritten by %s:\n"
-"%%sPlease move or remove them before you %s."
-msgstr ""
-"Các tập tin cây làm việc chưa được theo dõi sau đây sẽ bị ghi đè bởi lệnh "
-"%s:\n"
-"%%sVui lòng di chuyển hay gỡ bỏ chúng trước khi bạn %s."
-
-#: unpack-trees.c:172
-#, c-format
-msgid ""
-"The following untracked working tree files would be overwritten by %s:\n"
-"%%s"
-msgstr ""
-"Các tập tin cây làm việc chưa được theo dõi sau đây sẽ bị ghi đè bởi lệnh "
-"%s:\n"
-"%%s"
-
-#: unpack-trees.c:180
-#, c-format
-msgid "Entry '%s' overlaps with '%s'.  Cannot bind."
-msgstr "Mục “%s” đè lên “%s”. Không thể buộc."
-
-#: unpack-trees.c:183
-#, c-format
-msgid ""
-"Cannot update submodule:\n"
-"%s"
-msgstr ""
-"Không thể cập nhật mô-đun-con:\n"
-"%s"
-
-#: unpack-trees.c:186
-#, c-format
-msgid ""
-"The following paths are not up to date and were left despite sparse "
-"patterns:\n"
-"%s"
-msgstr ""
-"Các đường dẫn sau đây không được cập nhật và vẫn được để lại bất chấp các "
-"mẫu sparse:\n"
-"%s"
-
-#: unpack-trees.c:188
-#, c-format
-msgid ""
-"The following paths are unmerged and were left despite sparse patterns:\n"
-"%s"
-msgstr ""
-"Các đường dẫn theo sau đây chưa được hòa trộn và để bất chấp các mẫu "
-"sparse:\n"
-"%s"
-
-#: unpack-trees.c:190
-#, c-format
-msgid ""
-"The following paths were already present and thus not updated despite sparse "
-"patterns:\n"
-"%s"
-msgstr ""
-"Các đường dẫn sau đây đã sẵn hiện diện và như vậy không được cập nhật bất "
-"cấp các mẫu sparse:\n"
-"%s"
-
-#: unpack-trees.c:270
-#, c-format
-msgid "Aborting\n"
-msgstr "Bãi bỏ\n"
-
-#: unpack-trees.c:297
-#, c-format
-msgid ""
-"After fixing the above paths, you may want to run `git sparse-checkout "
-"reapply`.\n"
-msgstr ""
-"Sau khi sửa các đường dẫn phía trên, bạn có thể chạy “git sparse-checkout "
-"reapply“.\n"
-
-#: unpack-trees.c:358
-msgid "Updating files"
-msgstr "Đang cập nhật các tập tin"
-
-#: unpack-trees.c:390
-msgid ""
-"the following paths have collided (e.g. case-sensitive paths\n"
-"on a case-insensitive filesystem) and only one from the same\n"
-"colliding group is in the working tree:\n"
-msgstr ""
-"các đường dẫn sau đây có xung đột(vd: các đường dẫn phân biệt\n"
-"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:1664
-msgid "Updating index flags"
-msgstr "Đang cập nhật các cờ mục lục"
-
-#: unpack-trees.c:2925
-#, 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:1579
-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"
-
-#: urlmatch.c:163
-msgid "invalid URL scheme name or missing '://' suffix"
-msgstr "tên lược đồ URL không hợp lệ, hoặc thiếu hậu tố “://”"
-
-#: urlmatch.c:187 urlmatch.c:346 urlmatch.c:405
-#, c-format
-msgid "invalid %XX escape sequence"
-msgstr "thoát chuỗi %XX không hợp lệ"
-
-#: urlmatch.c:215
-msgid "missing host and scheme is not 'file:'"
-msgstr "thiếu máy chủ và lược đồ thì không phải là giao thức “file:”"
-
-#: urlmatch.c:232
-msgid "a 'file:' URL may not have a port number"
-msgstr "một URL kiểu “file:” không được chứa cổng"
-
-#: urlmatch.c:247
-msgid "invalid characters in host name"
-msgstr "có các ký tự không hợp lệ trong tên máy"
-
-#: urlmatch.c:292 urlmatch.c:303
-msgid "invalid port number"
-msgstr "tên cổng không hợp lệ"
-
-#: urlmatch.c:371
-msgid "invalid '..' path segment"
-msgstr "đoạn đường dẫn “..” không hợp lệ"
-
-#: walker.c:170
-msgid "Fetching objects"
-msgstr "Đang lấy về các đối tượng"
-
-#: worktree.c:237 builtin/am.c:2210 builtin/bisect--helper.c:156
-#, c-format
-msgid "failed to read '%s'"
-msgstr "gặp lỗi khi đọc “%s”"
-
-#: worktree.c:304
-#, c-format
-msgid "'%s' at main working tree is not the repository directory"
-msgstr "“%s” tại cây làm việc chình không phải là thư mục kho"
-
-#: worktree.c:315
-#, c-format
-msgid "'%s' file does not contain absolute path to the working tree location"
-msgstr ""
-"tập tin “%s” không chứa đường dẫn tuyệt đối đến vị trí cây làm việc hiện"
-
-#: worktree.c:327
-#, c-format
-msgid "'%s' does not exist"
-msgstr "\"%s\" không tồn tại"
-
-#: worktree.c:333
-#, c-format
-msgid "'%s' is not a .git file, error code %d"
-msgstr "“%s” không phải là tập tin .git, mã lỗi %d"
-
-#: worktree.c:342
-#, c-format
-msgid "'%s' does not point back to '%s'"
-msgstr "“%s” không chỉ ngược đến “%s”"
-
-#: worktree.c:600
-msgid "not a directory"
-msgstr "không phải thư mục"
-
-#: worktree.c:609
-msgid ".git is not a file"
-msgstr ".git không phải là một tập tin"
-
-#: worktree.c:611
-msgid ".git file broken"
-msgstr "tệp .git bị hỏng"
-
-#: worktree.c:613
-msgid ".git file incorrect"
-msgstr "tập tin .git không chính xác"
-
-#: worktree.c:719
-msgid "not a valid path"
-msgstr "không phải là một đường dẫn hợp lệ"
-
-#: worktree.c:725
-msgid "unable to locate repository; .git is not a file"
-msgstr "không thể phân bổ kho chứa; .git không phải là một tập tin"
-
-#: worktree.c:729
-msgid "unable to locate repository; .git file does not reference a repository"
-msgstr "không thể phân bổ kho chứa; tập tin .git tham chiếu đến một kho"
-
-#: worktree.c:733
-msgid "unable to locate repository; .git file broken"
-msgstr "không thể phân bổ kho chứa; tập tin .git bị hỏng"
-
-#: worktree.c:739
-msgid "gitdir unreadable"
-msgstr "gitdir không thể đọc được"
-
-#: worktree.c:743
-msgid "gitdir incorrect"
-msgstr "gitdir không chính xác"
-
-#: worktree.c:768
-msgid "not a valid directory"
-msgstr "không phải thư mục hợp lệ"
-
-#: worktree.c:774
-msgid "gitdir file does not exist"
-msgstr "tập tin gitdir không tồn tại"
-
-#: worktree.c:779 worktree.c:788
-#, c-format
-msgid "unable to read gitdir file (%s)"
-msgstr "không thể đọc tập tin gitdir (%s)"
-
-#: worktree.c:798
-#, c-format
-msgid "short read (expected %<PRIuMAX> bytes, read %<PRIuMAX>)"
-msgstr "đọc ngắn (cần %<PRIuMAX> byte, đọc %<PRIuMAX>)"
-
-#: worktree.c:806
-msgid "invalid gitdir file"
-msgstr "tập tin gitdir (thư mục git) không hợp lệ"
-
-#: worktree.c:814
-msgid "gitdir file points to non-existent location"
-msgstr "tập tin gitdir chỉ đến vị trí không tồn tại"
-
-#: worktree.c:830
-#, c-format
-msgid "unable to set %s in '%s'"
-msgstr "không thể đặt %s trong “%s”"
-
-#: worktree.c:832
-#, c-format
-msgid "unable to unset %s in '%s'"
-msgstr "không thể bỏ đặt %s trong '%s'"
-
-#: worktree.c:852
-msgid "failed to set extensions.worktreeConfig setting"
-msgstr "gặp lỗi khi đặt cài đặt extensions.worktreeConfig"
-
-#: wrapper.c:161
-#, c-format
-msgid "could not setenv '%s'"
-msgstr "không thể setenv “%s”"
-
-#: wrapper.c:213
-#, c-format
-msgid "unable to create '%s'"
-msgstr "không thể tạo “%s”"
-
-#: wrapper.c:215 wrapper.c:385
-#, c-format
-msgid "could not open '%s' for reading and writing"
-msgstr "không thể mở “%s” để đọc và ghi"
-
-#: wrapper.c:416 wrapper.c:683
-#, c-format
-msgid "unable to access '%s'"
-msgstr "không thể truy cập “%s”"
-
-#: wrapper.c:691
-msgid "unable to get current working directory"
-msgstr "không thể lấy thư mục làm việc hiện hành"
-
-#: wt-status.c:158
-msgid "Unmerged paths:"
-msgstr "Những đường dẫn chưa được hòa trộn:"
-
-#: wt-status.c:187 wt-status.c:219
-msgid "  (use \"git restore --staged <file>...\" to unstage)"
-msgstr "  (dùng \"git restore --staged <tập-tin>…\" để bỏ ra khỏi bệ phóng)"
-
-#: wt-status.c:190 wt-status.c:222
-#, c-format
-msgid "  (use \"git restore --source=%s --staged <file>...\" to unstage)"
-msgstr ""
-"  (dùng \"git restore --source=%s --staged <tập-tin>…\" để bỏ ra khỏi bệ "
-"phóng)"
-
-#: wt-status.c:193 wt-status.c:225
-msgid "  (use \"git rm --cached <file>...\" to unstage)"
-msgstr "  (dùng \"git rm --cached <tập-tin>…\" để bỏ ra khỏi bệ phóng)"
-
-#: wt-status.c:197
-msgid "  (use \"git add <file>...\" to mark resolution)"
-msgstr "  (dùng \"git add <tập-tin>…\" để đánh dấu là cần giải quyết)"
-
-#: wt-status.c:199 wt-status.c:203
-msgid "  (use \"git add/rm <file>...\" as appropriate to mark resolution)"
-msgstr ""
-"  (dùng \"git add/rm <tập-tin>…\" như là một cách thích hợp để đánh dấu là "
-"cần được giải quyết)"
-
-#: wt-status.c:201
-msgid "  (use \"git rm <file>...\" to mark resolution)"
-msgstr "  (dùng \"git rm <tập-tin>…\" để đánh dấu là cần giải quyết)"
-
-#: wt-status.c:211 wt-status.c:1140
-msgid "Changes to be committed:"
-msgstr "Những thay đổi sẽ được chuyển giao:"
-
-#: wt-status.c:234 wt-status.c:1149
-msgid "Changes not staged for commit:"
-msgstr "Các thay đổi chưa được đặt lên bệ phóng để chuyển giao:"
-
-#: wt-status.c:238
-msgid "  (use \"git add <file>...\" to update what will be committed)"
-msgstr "  (dùng \"git add <tập-tin>…\" để cập nhật những gì sẽ chuyển giao)"
-
-#: wt-status.c:240
-msgid "  (use \"git add/rm <file>...\" to update what will be committed)"
-msgstr ""
-"  (dùng \"git add/rm <tập-tin>…\" để cập nhật những gì sẽ được chuyển giao)"
-
-#: wt-status.c:241
-msgid ""
-"  (use \"git restore <file>...\" to discard changes in working directory)"
-msgstr ""
-"  (dùng \"git restore <tập-tin>…\" để loại bỏ các thay đổi trong thư mục làm "
-"việc)"
-
-#: wt-status.c:243
-msgid "  (commit or discard the untracked or modified content in submodules)"
-msgstr ""
-"  (chuyển giao hoặc là loại bỏ các nội dung chưa được theo dõi hay đã sửa "
-"chữa trong mô-đun-con)"
-
-#: wt-status.c:254
-#, c-format
-msgid "  (use \"git %s <file>...\" to include in what will be committed)"
-msgstr ""
-"  (dùng \"git %s <tập-tin>…\" để thêm vào những gì cần được chuyển giao)"
-
-#: wt-status.c:266
-msgid "both deleted:"
-msgstr "bị xóa bởi cả hai:"
-
-#: wt-status.c:268
-msgid "added by us:"
-msgstr "được thêm vào bởi chúng ta:"
-
-#: wt-status.c:270
-msgid "deleted by them:"
-msgstr "bị xóa đi bởi họ:"
-
-#: wt-status.c:272
-msgid "added by them:"
-msgstr "được thêm vào bởi họ:"
-
-#: wt-status.c:274
-msgid "deleted by us:"
-msgstr "bị xóa bởi chúng ta:"
-
-#: wt-status.c:276
-msgid "both added:"
-msgstr "được thêm vào bởi cả hai:"
-
-#: wt-status.c:278
-msgid "both modified:"
-msgstr "bị sửa bởi cả hai:"
-
-#: wt-status.c:288
-msgid "new file:"
-msgstr "tập tin mới:"
-
-#: wt-status.c:290
-msgid "copied:"
-msgstr "đã chép:"
-
-#: wt-status.c:292
-msgid "deleted:"
-msgstr "đã xóa:"
-
-#: wt-status.c:294
-msgid "modified:"
-msgstr "đã sửa:"
-
-#: wt-status.c:296
-msgid "renamed:"
-msgstr "đã đổi tên:"
-
-#: wt-status.c:298
-msgid "typechange:"
-msgstr "đổi-kiểu:"
-
-#: wt-status.c:300
-msgid "unknown:"
-msgstr "không hiểu:"
-
-#: wt-status.c:302
-msgid "unmerged:"
-msgstr "chưa hòa trộn:"
-
-#: wt-status.c:382
-msgid "new commits, "
-msgstr "lần chuyển giao mới, "
-
-#: wt-status.c:384
-msgid "modified content, "
-msgstr "nội dung bị sửa đổi, "
-
-#: wt-status.c:386
-msgid "untracked content, "
-msgstr "nội dung chưa được theo dõi, "
-
-#: wt-status.c:973
-#, c-format
-msgid "Your stash currently has %d entry"
-msgid_plural "Your stash currently has %d entries"
-msgstr[0] "Bạn hiện nay ở trong phần cất đi đang có %d mục"
-
-#: wt-status.c:1004
-msgid "Submodules changed but not updated:"
-msgstr "Những mô-đun-con đã bị thay đổi nhưng chưa được cập nhật:"
-
-#: wt-status.c:1006
-msgid "Submodule changes to be committed:"
-msgstr "Những mô-đun-con thay đổi đã được chuyển giao:"
-
-#: wt-status.c:1088
-msgid ""
-"Do not modify or remove the line above.\n"
-"Everything below it will be ignored."
-msgstr ""
-"Không sửa hay xóa bỏ đường ở trên.\n"
-"Mọi thứ phía dưới sẽ được xóa bỏ."
-
-#: wt-status.c:1180
-#, c-format
-msgid ""
-"\n"
-"It took %.2f seconds to compute the branch ahead/behind values.\n"
-"You can use '--no-ahead-behind' to avoid this.\n"
-msgstr ""
-"\n"
-"Nó cần %.2f giây để tính toán giá trị của trước/sau của nhánh.\n"
-"Bạn có thể dùng “--no-ahead-behind” tránh phải điều này.\n"
-
-#: wt-status.c:1210
-msgid "You have unmerged paths."
-msgstr "Bạn có những đường dẫn chưa được hòa trộn."
-
-#: wt-status.c:1213
-msgid "  (fix conflicts and run \"git commit\")"
-msgstr "  (sửa các xung đột rồi chạy \"git commit\")"
-
-#: wt-status.c:1215
-msgid "  (use \"git merge --abort\" to abort the merge)"
-msgstr "  (dùng \"git merge --abort\" để bãi bỏ việc hòa trộn)"
-
-#: wt-status.c:1219
-msgid "All conflicts fixed but you are still merging."
-msgstr "Tất cả các xung đột đã được giải quyết nhưng bạn vẫn đang hòa trộn."
-
-#: wt-status.c:1222
-msgid "  (use \"git commit\" to conclude merge)"
-msgstr "  (dùng \"git commit\" để hoàn tất việc hòa trộn)"
-
-#: wt-status.c:1233
-msgid "You are in the middle of an am session."
-msgstr "Bạn đang ở giữa của một phiên “am”."
-
-#: wt-status.c:1236
-msgid "The current patch is empty."
-msgstr "Miếng vá hiện tại bị trống rỗng."
-
-#: wt-status.c:1241
-msgid "  (fix conflicts and then run \"git am --continue\")"
-msgstr "  (sửa các xung đột và sau đó chạy lệnh \"git am --continue\")"
-
-#: wt-status.c:1243
-msgid "  (use \"git am --skip\" to skip this patch)"
-msgstr "  (dùng \"git am --skip\" để bỏ qua miếng vá này)"
-
-#: wt-status.c:1246
-msgid ""
-"  (use \"git am --allow-empty\" to record this patch as an empty commit)"
-msgstr ""
-"  (dùng \"git am --allow-empty\" ghi miếng vá này như một lần chuyển giao "
-"rỗng)"
-
-#: wt-status.c:1248
-msgid "  (use \"git am --abort\" to restore the original branch)"
-msgstr "  (dùng \"git am --abort\" để phục hồi lại nhánh nguyên thủy)"
-
-#: wt-status.c:1381
-msgid "git-rebase-todo is missing."
-msgstr "thiếu git-rebase-todo."
-
-#: wt-status.c:1383
-msgid "No commands done."
-msgstr "Không thực hiện lệnh nào."
-
-#: wt-status.c:1386
-#, c-format
-msgid "Last command done (%<PRIuMAX> command done):"
-msgid_plural "Last commands done (%<PRIuMAX> commands done):"
-msgstr[0] "Lệnh thực hiện cuối (%<PRIuMAX> lệnh được thực thi):"
-
-#: wt-status.c:1397
-#, c-format
-msgid "  (see more in file %s)"
-msgstr "  (xem thêm trong %s)"
-
-#: wt-status.c:1402
-msgid "No commands remaining."
-msgstr "Không có lệnh nào còn lại."
-
-#: wt-status.c:1405
-#, c-format
-msgid "Next command to do (%<PRIuMAX> remaining command):"
-msgid_plural "Next commands to do (%<PRIuMAX> remaining commands):"
-msgstr[0] "Lệnh cần làm kế tiếp (%<PRIuMAX> lệnh còn lại):"
-
-#: wt-status.c:1413
-msgid "  (use \"git rebase --edit-todo\" to view and edit)"
-msgstr "  (dùng lệnh \"git rebase --edit-todo\" để xem và sửa)"
-
-#: wt-status.c:1425
-#, c-format
-msgid "You are currently rebasing branch '%s' on '%s'."
-msgstr "Bạn hiện nay đang thực hiện việc “rebase” nhánh “%s” trên “%s”."
-
-#: wt-status.c:1430
-msgid "You are currently rebasing."
-msgstr "Bạn hiện nay đang thực hiện việc “rebase” (cải tổ)."
-
-#: wt-status.c:1443
-msgid "  (fix conflicts and then run \"git rebase --continue\")"
-msgstr ""
-"  (sửa các xung đột và sau đó chạy lệnh “cải tổ” \"git rebase --continue\")"
-
-#: wt-status.c:1445
-msgid "  (use \"git rebase --skip\" to skip this patch)"
-msgstr "  (dùng lệnh “cải tổ” \"git rebase --skip\" để bỏ qua lần vá này)"
-
-#: wt-status.c:1447
-msgid "  (use \"git rebase --abort\" to check out the original branch)"
-msgstr ""
-"  (dùng lệnh “cải tổ” \"git rebase --abort\" để check-out nhánh nguyên thủy)"
-
-#: wt-status.c:1454
-msgid "  (all conflicts fixed: run \"git rebase --continue\")"
-msgstr ""
-"  (khi tất cả các xung đột đã sửa xong: chạy lệnh “cải tổ” \"git rebase --"
-"continue\")"
-
-#: wt-status.c:1458
-#, c-format
-msgid ""
-"You are currently splitting a commit while rebasing branch '%s' on '%s'."
-msgstr ""
-"Bạn hiện nay đang thực hiện việc chia tách một lần chuyển giao trong khi "
-"đang “rebase” nhánh “%s” trên “%s”."
-
-#: wt-status.c:1463
-msgid "You are currently splitting a commit during a rebase."
-msgstr ""
-"Bạn hiện tại đang cắt đôi một lần chuyển giao trong khi đang thực hiện việc "
-"rebase."
-
-#: wt-status.c:1466
-msgid "  (Once your working directory is clean, run \"git rebase --continue\")"
-msgstr ""
-"  (Một khi thư mục làm việc của bạn đã gọn gàng, chạy lệnh “cải tổ” \"git "
-"rebase --continue\")"
-
-#: wt-status.c:1470
-#, c-format
-msgid "You are currently editing a commit while rebasing branch '%s' on '%s'."
-msgstr ""
-"Bạn hiện nay đang thực hiện việc sửa chữa một lần chuyển giao trong khi đang "
-"rebase nhánh “%s” trên “%s”."
-
-#: wt-status.c:1475
-msgid "You are currently editing a commit during a rebase."
-msgstr "Bạn hiện đang sửa một lần chuyển giao trong khi bạn thực hiện rebase."
-
-#: wt-status.c:1478
-msgid "  (use \"git commit --amend\" to amend the current commit)"
-msgstr "  (dùng \"git commit --amend\" để “tu bổ” lần chuyển giao hiện tại)"
-
-#: wt-status.c:1480
-msgid ""
-"  (use \"git rebase --continue\" once you are satisfied with your changes)"
-msgstr ""
-"  (chạy lệnh “cải tổ” \"git rebase --continue\" một khi bạn cảm thấy hài "
-"lòng về những thay đổi của mình)"
-
-#: wt-status.c:1491
-msgid "Cherry-pick currently in progress."
-msgstr "Cherry-pick hiện tại đang được thực hiện."
-
-#: wt-status.c:1494
-#, c-format
-msgid "You are currently cherry-picking commit %s."
-msgstr "Bạn hiện nay đang thực hiện việc cherry-pick lần chuyển giao %s."
-
-#: wt-status.c:1501
-msgid "  (fix conflicts and run \"git cherry-pick --continue\")"
-msgstr ""
-"  (sửa các xung đột và sau đó chạy lệnh \"git cherry-pick --continue\")"
-
-#: wt-status.c:1504
-msgid "  (run \"git cherry-pick --continue\" to continue)"
-msgstr "  (chạy lệnh \"git cherry-pick --continue\" để tiếp tục)"
-
-#: wt-status.c:1507
-msgid "  (all conflicts fixed: run \"git cherry-pick --continue\")"
-msgstr ""
-"  (khi tất cả các xung đột đã sửa xong: chạy lệnh \"git cherry-pick --"
-"continue\")"
-
-#: wt-status.c:1509
-msgid "  (use \"git cherry-pick --skip\" to skip this patch)"
-msgstr "  (dùng \"git cherry-pick --skip\" để bỏ qua miếng vá này)"
-
-#: wt-status.c:1511
-msgid "  (use \"git cherry-pick --abort\" to cancel the cherry-pick operation)"
-msgstr "  (dùng \"git cherry-pick --abort\" để hủy bỏ thao tác cherry-pick)"
-
-#: wt-status.c:1521
-msgid "Revert currently in progress."
-msgstr "Hoàn nguyên hiện tại đang thực hiện."
-
-#: wt-status.c:1524
-#, c-format
-msgid "You are currently reverting commit %s."
-msgstr "Bạn hiện nay đang thực hiện thao tác hoàn nguyên lần chuyển giao “%s”."
-
-#: wt-status.c:1530
-msgid "  (fix conflicts and run \"git revert --continue\")"
-msgstr "  (sửa các xung đột và sau đó chạy lệnh \"git revert --continue\")"
-
-#: wt-status.c:1533
-msgid "  (run \"git revert --continue\" to continue)"
-msgstr "  (chạy lệnh \"git revert --continue\" để tiếp tục)"
-
-#: wt-status.c:1536
-msgid "  (all conflicts fixed: run \"git revert --continue\")"
-msgstr ""
-"  (khi tất cả các xung đột đã sửa xong: chạy lệnh \"git revert --continue\")"
-
-#: wt-status.c:1538
-msgid "  (use \"git revert --skip\" to skip this patch)"
-msgstr "  (dùng lệnh \"git revert --skip\" để bỏ qua lần vá này)"
-
-#: wt-status.c:1540
-msgid "  (use \"git revert --abort\" to cancel the revert operation)"
-msgstr "  (dùng \"git revert --abort\" để hủy bỏ thao tác hoàn nguyên)"
-
-#: wt-status.c:1550
-#, c-format
-msgid "You are currently bisecting, started from branch '%s'."
-msgstr ""
-"Bạn hiện nay đang thực hiện thao tác di chuyển nửa bước (bisect), bắt đầu từ "
-"nhánh “%s”."
-
-#: wt-status.c:1554
-msgid "You are currently bisecting."
-msgstr "Bạn hiện tại đang thực hiện việc bisect (di chuyển nửa bước)."
-
-#: wt-status.c:1557
-msgid "  (use \"git bisect reset\" to get back to the original branch)"
-msgstr "  (dùng \"git bisect reset\" để quay trở lại nhánh nguyên thủy)"
-
-#: wt-status.c:1568
-msgid "You are in a sparse checkout."
-msgstr "Bạn đang trong lần lấy ra sparse."
-
-#: wt-status.c:1571
-#, c-format
-msgid "You are in a sparse checkout with %d%% of tracked files present."
-msgstr ""
-"Bạn đang ở trong lần lấy ra sparser %d%% của các tập tin được theo dõi hiện "
-"tại."
-
-#: wt-status.c:1815
-msgid "On branch "
-msgstr "Trên nhánh "
-
-#: wt-status.c:1822
-msgid "interactive rebase in progress; onto "
-msgstr "rebase ở chế độ tương tác đang được thực hiện; lên trên "
-
-#: wt-status.c:1824
-msgid "rebase in progress; onto "
-msgstr "rebase đang được thực hiện: lên trên "
-
-#: wt-status.c:1829
-msgid "HEAD detached at "
-msgstr "HEAD được tách rời tại "
-
-#: wt-status.c:1831
-msgid "HEAD detached from "
-msgstr "HEAD được tách rời từ "
-
-#: wt-status.c:1834
-msgid "Not currently on any branch."
-msgstr "Hiện tại chẳng ở nhánh nào cả."
-
-#: wt-status.c:1851
-msgid "Initial commit"
-msgstr "Lần chuyển giao khởi tạo"
-
-#: wt-status.c:1852
-msgid "No commits yet"
-msgstr "Vẫn chưa chuyển giao"
-
-#: wt-status.c:1866
-msgid "Untracked files"
-msgstr "Những tập tin chưa được theo dõi"
-
-#: wt-status.c:1868
-msgid "Ignored files"
-msgstr "Những tập tin bị lờ đi"
-
-#: wt-status.c:1872
-#, c-format
-msgid ""
-"It took %.2f seconds to enumerate untracked files. 'status -uno'\n"
-"may speed it up, but you have to be careful not to forget to add\n"
-"new files yourself (see 'git help status')."
-msgstr ""
-"Cần %.2f giây để liệt kê tất cả các tập tin chưa được theo dõi. “status -"
-"uno”\n"
-"có lẽ làm nó nhanh hơn, nhưng bạn phải cẩn thận đừng quên mình phải\n"
-"tự thêm các tập tin mới (xem “git help status”.."
-
-#: wt-status.c:1878
-#, c-format
-msgid "Untracked files not listed%s"
-msgstr "Những tập tin chưa được theo dõi không được liệt kê ra %s"
-
-#: wt-status.c:1880
-msgid " (use -u option to show untracked files)"
-msgstr " (dùng tùy chọn -u để hiển thị các tập tin chưa được theo dõi)"
-
-#: wt-status.c:1886
-msgid "No changes"
-msgstr "Không có thay đổi nào"
-
-#: wt-status.c:1891
-#, c-format
-msgid "no changes added to commit (use \"git add\" and/or \"git commit -a\")\n"
-msgstr ""
-"không có thay đổi nào được thêm vào để chuyển giao (dùng \"git add\" và/hoặc "
-"\"git commit -a\")\n"
-
-#: wt-status.c:1895
-#, c-format
-msgid "no changes added to commit\n"
-msgstr "không có thay đổi nào được thêm vào để chuyển giao\n"
-
-#: wt-status.c:1899
-#, c-format
-msgid ""
-"nothing added to commit but untracked files present (use \"git add\" to "
-"track)\n"
-msgstr ""
-"không có gì được thêm vào lần chuyển giao nhưng có những tập tin chưa được "
-"theo dõi hiện diện (dùng \"git add\" để đưa vào theo dõi)\n"
-
-#: wt-status.c:1903
-#, c-format
-msgid "nothing added to commit but untracked files present\n"
-msgstr ""
-"không có gì được thêm vào lần chuyển giao nhưng có những tập tin chưa được "
-"theo dõi hiện diện\n"
-
-#: wt-status.c:1907
-#, c-format
-msgid "nothing to commit (create/copy files and use \"git add\" to track)\n"
-msgstr ""
-"không có gì để chuyển giao (tạo/sao-chép các tập tin và dùng \"git add\" để "
-"đưa vào theo dõi)\n"
-
-#: wt-status.c:1911 wt-status.c:1917
-#, c-format
-msgid "nothing to commit\n"
-msgstr "không có gì để chuyển giao\n"
-
-#: wt-status.c:1914
-#, c-format
-msgid "nothing to commit (use -u to show untracked files)\n"
-msgstr ""
-"không có gì để chuyển giao (dùng -u xem các tập tin chưa được theo dõi)\n"
-
-#: wt-status.c:1919
-#, c-format
-msgid "nothing to commit, working tree clean\n"
-msgstr "không có gì để chuyển giao, thư mục làm việc sạch sẽ\n"
-
-#: wt-status.c:2024
-msgid "No commits yet on "
-msgstr "Vẫn không thực hiện lệnh chuyển giao nào "
-
-#: wt-status.c:2028
-msgid "HEAD (no branch)"
-msgstr "HEAD (không nhánh)"
-
-#: wt-status.c:2059
-msgid "different"
-msgstr "khác"
-
-#: wt-status.c:2061 wt-status.c:2069
-msgid "behind "
-msgstr "đằng sau "
-
-#: wt-status.c:2064 wt-status.c:2067
-msgid "ahead "
-msgstr "phía trước "
-
-#. TRANSLATORS: the action is e.g. "pull with rebase"
-#: wt-status.c:2605
-#, c-format
-msgid "cannot %s: You have unstaged changes."
-msgstr "không thể %s: Bạn có các thay đổi chưa được đưa lên bệ phóng."
-
-#: wt-status.c:2611
-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."
-
-#: wt-status.c:2613
-#, c-format
-msgid "cannot %s: Your index contains uncommitted changes."
-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:205
-msgid "could not send IPC command"
-msgstr "không thể gửi lệnh IPC"
-
-#: compat/simple-ipc/ipc-unix-socket.c:212
-msgid "could not read IPC response"
-msgstr "không thể đọc đáp ứng IPC"
-
-#: compat/simple-ipc/ipc-unix-socket.c:892
-#, 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:904
-#, 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:353
-#, c-format
-msgid "failed to unlink '%s'"
-msgstr "gặp lỗi khi bỏ liên kết (unlink) “%s”"
-
-#: compat/fsmonitor/fsm-listen-darwin.c:355
-msgid "Unable to create FSEventStream."
-msgstr "Không thể tạo FSEventStream."
-
-#: compat/fsmonitor/fsm-listen-darwin.c:403
-msgid "Failed to start the FSEventStream"
-msgstr "Gặp lỗi khi khởi chạy FSEventStream"
-
-#: builtin/add.c:26
 msgid "git add [<options>] [--] <pathspec>..."
 msgstr "git add [<các tùy chọn>] [--]  <pathspec>…"
 
-#: builtin/add.c:63
 #, c-format
 msgid "cannot chmod %cx '%s'"
 msgstr "không thể chmod %cx “%s”"
 
-#: builtin/add.c:105
 #, c-format
 msgid "unexpected diff status %c"
 msgstr "trạng thái lệnh diff không như mong đợi %c"
 
-#: builtin/add.c:110 builtin/commit.c:299
 msgid "updating files failed"
 msgstr "cập nhật tập tin gặp lỗi"
 
-#: builtin/add.c:120
 #, c-format
 msgid "remove '%s'\n"
 msgstr "gỡ bỏ “%s”\n"
 
-#: builtin/add.c:204
 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:312 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:325
 msgid "Could not write patch"
 msgstr "Không thể ghi ra miếng vá"
 
-#: builtin/add.c:328
 msgid "editing patch failed"
 msgstr "gặp lỗi khi sửa miếng vá"
 
-#: builtin/add.c:331
 #, c-format
 msgid "Could not stat '%s'"
 msgstr "Không thể lấy thông tin thống kê về “%s”"
 
-#: builtin/add.c:333
 msgid "Empty patch. Aborted."
 msgstr "Miếng vá trống rỗng. Nên bỏ qua."
 
-#: builtin/add.c:339
 #, c-format
 msgid "Could not apply '%s'"
 msgstr "Không thể áp dụng miếng vá “%s”"
 
-#: builtin/add.c:347
 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:367 builtin/clean.c:927 builtin/fetch.c:175 builtin/mv.c:124
-#: builtin/prune-packed.c:14 builtin/pull.c:208 builtin/push.c:550
-#: builtin/remote.c:1454 builtin/rm.c:244 builtin/send-pack.c:194
 msgid "dry run"
 msgstr "chạy thử"
 
-#: builtin/add.c:368 builtin/check-ignore.c:22 builtin/commit.c:1483
-#: builtin/count-objects.c:98 builtin/fsck.c:789 builtin/log.c:2338
-#: builtin/mv.c:123 builtin/read-tree.c:120
 msgid "be verbose"
 msgstr "chi tiết"
 
-#: builtin/add.c:370
 msgid "interactive picking"
 msgstr "sửa bằng cách tương tác"
 
-#: builtin/add.c:371 builtin/checkout.c:1599 builtin/reset.c:417
 msgid "select hunks interactively"
 msgstr "chọn “hunks” theo kiểu tương tác"
 
-#: builtin/add.c:372
 msgid "edit current diff and apply"
 msgstr "sửa diff hiện nay và áp dụng nó"
 
-#: builtin/add.c:373
 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:374
 msgid "update tracked files"
 msgstr "cập nhật các tập tin được theo dõi"
 
-#: builtin/add.c:375
 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:376
 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:377
 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:380
 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:382
 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:383
 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:384
 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:385 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:387 builtin/update-index.c:1023
 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:389
 msgid "warn when adding an embedded repository"
 msgstr "cảnh báo khi thêm một kho nhúng"
 
-#: builtin/add.c:407
 #, c-format
 msgid ""
 "You've added another git repository inside your current repository.\n"
@@ -10818,12 +1827,10 @@ msgstr ""
 "\n"
 "Xem \"git help submodule\" để biết thêm chi tiết."
 
-#: builtin/add.c:436
 #, c-format
 msgid "adding embedded git repository: %s"
 msgstr "thêm cần một kho git nhúng: %s"
 
-#: builtin/add.c:456
 msgid ""
 "Use -f if you really want to add them.\n"
 "Turn this message off by running\n"
@@ -10833,27 +1840,21 @@ msgstr ""
 "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:471
 msgid "adding files failed"
 msgstr "thêm tập tin gặp lỗi"
 
-#: builtin/add.c:534
 #, 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:555 builtin/checkout.c:1770 builtin/commit.c:365
-#: builtin/reset.c:436 builtin/rm.c:275 builtin/stash.c:1702
 #, c-format
 msgid "'%s' and pathspec arguments cannot be used together"
 msgstr "'%s' và các tham số đặc tả đường dẫn không thể dùng cùng nhau"
 
-#: builtin/add.c:566
 #, 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:568
 msgid ""
 "Maybe you wanted to say 'git add .'?\n"
 "Turn this message off by running\n"
@@ -10863,112 +1864,120 @@ msgstr ""
 "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:393
+msgid "index file corrupt"
+msgstr "tập tin ghi bảng mục lục bị hỏng"
+
+#, c-format
+msgid "bad action '%s' for '%s'"
+msgstr "thao tác sai “%s” cho “%s”"
+
+#, c-format
+msgid "invalid value for '%s': '%s'"
+msgstr "giá trị không hợp lệ cho '%s': '%s'"
+
+#, c-format
+msgid "could not read '%s'"
+msgstr "không thể đọc “%s”"
+
 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:483
+#, c-format
+msgid "could not parse %s"
+msgstr "không thể phân tích cú pháp %s"
+
 #, 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:525
 #, c-format
 msgid "Malformed input line: '%s'."
 msgstr "Dòng đầu vào dị hình: “%s”."
 
-#: builtin/am.c:563
 #, 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:589
 msgid "fseek failed"
 msgstr "fseek gặp lỗi"
 
-#: builtin/am.c:777
+#, c-format
+msgid "could not open '%s' for reading"
+msgstr "không thể mở “%s” để đọc"
+
+#, c-format
+msgid "could not open '%s' for writing"
+msgstr "không thể mở “%s” để ghi"
+
 #, c-format
 msgid "could not parse patch '%s'"
 msgstr "không thể phân tích cú pháp “%s”"
 
-#: builtin/am.c:842
 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:890
 msgid "invalid timestamp"
 msgstr "dấu thời gian không hợp lệ"
 
-#: builtin/am.c:895 builtin/am.c:907
 msgid "invalid Date line"
 msgstr "dòng Ngày tháng không hợp lệ"
 
-#: builtin/am.c:902
 msgid "invalid timezone offset"
 msgstr "độ lệch múi giờ không hợp lệ"
 
-#: builtin/am.c:995
 msgid "Patch format detection failed."
 msgstr "Dò tìm định dạng miếng vá gặp lỗi."
 
-#: builtin/am.c:1000 builtin/clone.c:306
 #, c-format
 msgid "failed to create directory '%s'"
 msgstr "tạo thư mục \"%s\" gặp lỗi"
 
-#: builtin/am.c:1005
 msgid "Failed to split patches."
 msgstr "Gặp lỗi khi chia nhỏ các miếng vá."
 
-#: builtin/am.c:1154
 #, 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:1155
 #, 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:1160
 #, c-format
 msgid "To record the empty patch as an empty commit, run \"%s --allow-empty\"."
 msgstr ""
 "Để ghi một miếng vá trống rỗng như một lần chuyển giao rông, \"%s --allow-"
 "empty\"."
 
-#: builtin/am.c:1162
 #, 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:1257
 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:1345
 #, 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:1348
 #, c-format
 msgid "invalid ident line: %.*s"
 msgstr "dòng định danh không hợp lệ: %.*s"
 
-#: builtin/am.c:1567
+#, c-format
+msgid "unable to parse commit %s"
+msgstr "không thể phân tích lần chuyển giao “%s”"
+
 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:1569
 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:1588
 msgid ""
 "Did you hand edit your patch?\n"
 "It does not apply to blobs recorded in its index."
@@ -10976,24 +1985,25 @@ msgstr ""
 "Bạn đã sửa miếng vá của mình bằng cách thủ công à?\n"
 "Nó không thể áp dụng các blob đã được ghi lại trong bảng mục lục của nó."
 
-#: builtin/am.c:1594
 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:1620
 msgid "Failed to merge in the changes."
 msgstr "Gặp lỗi khi trộn vào các thay đổi."
 
-#: builtin/am.c:1652
+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"
+
 msgid "applying to an empty history"
 msgstr "áp dụng vào một lịch sử trống rỗng"
 
-#: builtin/am.c:1704 builtin/am.c:1708
+msgid "failed to write commit object"
+msgstr "gặp lỗi khi ghi đối tượng chuyển giao"
+
 #, 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:1726
 msgid "Commit Body is:"
 msgstr "Thân của lần chuyển giao là:"
 
@@ -11001,59 +2011,47 @@ msgstr "Thân của lần chuyển giao là:"
 #. in your translation. The program will only accept English
 #. input at this point.
 #.
-#: builtin/am.c:1736
 #, 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:1782 builtin/commit.c:410
 msgid "unable to write index file"
 msgstr "không thể ghi tập tin lưu mục lục"
 
-#: builtin/am.c:1786
 #, 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:1828
 #, c-format
 msgid "Skipping: %.*s"
 msgstr "Đang bỏ qua: %.*s"
 
-#: builtin/am.c:1833
 #, c-format
 msgid "Creating an empty commit: %.*s"
 msgstr "Đang tạo một lần chuyển giao trống rỗng: %.*s"
 
-#: builtin/am.c:1837
 msgid "Patch is empty."
 msgstr "Miếng vá trống rỗng."
 
-#: builtin/am.c:1848 builtin/am.c:1917
 #, c-format
 msgid "Applying: %.*s"
 msgstr "Áp dụng: %.*s"
 
-#: builtin/am.c:1865
 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:1871
 #, c-format
 msgid "Patch failed at %s %.*s"
 msgstr "Gặp lỗi khi vá tại %s %.*s"
 
-#: builtin/am.c:1875
 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"
 
-#: builtin/am.c:1921
 msgid "No changes - recorded it as an empty commit."
 msgstr "Không có thay đổi nào - được ghi thành một lần chuyển giao rỗng."
 
-#: builtin/am.c:1923
 msgid ""
 "No changes - did you forget to use 'git add'?\n"
 "If there is nothing left to stage, chances are that something else\n"
@@ -11064,7 +2062,6 @@ msgstr ""
 "đã sẵn được đưa vào với cùng nội dung thay đổi; bạn có lẽ muốn bỏ qua miếng "
 "vá này."
 
-#: builtin/am.c:1931
 msgid ""
 "You still have unmerged paths in your index.\n"
 "You should 'git add' each file with resolved conflicts to mark them as "
@@ -11077,17 +2074,16 @@ msgstr ""
 "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:2039 builtin/am.c:2043 builtin/am.c:2055 builtin/reset.c:455
-#: builtin/reset.c:463
+msgid "unable to write new index file"
+msgstr "không thể ghi tập tin lưu bảng mục lục mới"
+
 #, c-format
 msgid "Could not parse object '%s'."
 msgstr "Không thể phân tích đối tượng “%s”."
 
-#: builtin/am.c:2091 builtin/am.c:2167
 msgid "failed to clean index"
 msgstr "gặp lỗi khi dọn bảng mục lục"
 
-#: builtin/am.c:2135
 msgid ""
 "You seem to have moved HEAD since the last 'am' failure.\n"
 "Not rewinding to ORIG_HEAD"
@@ -11095,159 +2091,114 @@ msgstr ""
 "Bạn có lẽ đã có HEAD đã bị di chuyển đi kể từ lần “am” thất bại cuối cùng.\n"
 "Không thể chuyển tới ORIG_HEAD"
 
-#: builtin/am.c:2292
+#, c-format
+msgid "failed to read '%s'"
+msgstr "gặp lỗi khi đọc “%s”"
+
 #, c-format
 msgid "options '%s=%s' and '%s=%s' cannot be used together"
 msgstr "tùy chọn '%s=%s' và '%s=%s' không thể dùng cùng nhau"
 
-#: builtin/am.c:2323
 msgid "git am [<options>] [(<mbox> | <Maildir>)...]"
 msgstr "git am [<các tùy chọn>] [(<mbox>|<Maildir>)…]"
 
-#: builtin/am.c:2324
 msgid "git am [<options>] (--continue | --skip | --abort)"
 msgstr "git am [<các tùy chọn>] (--continue | --skip | --abort)"
 
-#: builtin/am.c:2330
 msgid "run interactively"
 msgstr "chạy kiểu tương tác"
 
-#: builtin/am.c:2332
 msgid "historical option -- no-op"
 msgstr "tùy chọn lịch sử -- không-toán-tử"
 
-#: builtin/am.c:2334
 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:2335 builtin/init-db.c:547 builtin/prune-packed.c:16
-#: builtin/repack.c:646 builtin/stash.c:946
 msgid "be quiet"
 msgstr "im lặng"
 
-#: builtin/am.c:2337
 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:2340
 msgid "recode into utf8 (default)"
 msgstr "chuyển mã thành utf8 (mặc định)"
 
-#: builtin/am.c:2342
 msgid "pass -k flag to git-mailinfo"
 msgstr "chuyển cờ -k cho git-mailinfo"
 
-#: builtin/am.c:2344
 msgid "pass -b flag to git-mailinfo"
 msgstr "chuyển cờ -b cho git-mailinfo"
 
-#: builtin/am.c:2346
 msgid "pass -m flag to git-mailinfo"
 msgstr "chuyển cờ -m cho git-mailinfo"
 
-#: builtin/am.c:2348
 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:2351
 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:2354
 msgid "strip everything before a scissors line"
 msgstr "cắt mọi thứ trước dòng scissors"
 
-#: builtin/am.c:2356
 msgid "pass it through git-mailinfo"
 msgstr "chuyển nó qua git-mailinfo"
 
-#: builtin/am.c:2359 builtin/am.c:2362 builtin/am.c:2365 builtin/am.c:2368
-#: builtin/am.c:2371 builtin/am.c:2374 builtin/am.c:2377 builtin/am.c:2380
-#: builtin/am.c:2386
 msgid "pass it through git-apply"
 msgstr "chuyển nó qua git-apply"
 
-#: builtin/am.c:2376 builtin/commit.c:1514 builtin/fmt-merge-msg.c:18
-#: builtin/fmt-merge-msg.c:21 builtin/grep.c:920 builtin/merge.c:263
-#: builtin/pull.c:142 builtin/pull.c:204 builtin/pull.c:221
-#: builtin/rebase.c:1074 builtin/repack.c:657 builtin/repack.c:661
-#: builtin/repack.c:663 builtin/show-branch.c:650 builtin/show-ref.c:172
-#: builtin/tag.c:446 parse-options.h:159 parse-options.h:180
-#: parse-options.h:348
 msgid "n"
 msgstr "n"
 
-#: builtin/am.c:2382 builtin/branch.c:695 builtin/bugreport.c:109
-#: builtin/cat-file.c:848 builtin/cat-file.c:852 builtin/cat-file.c:856
-#: builtin/for-each-ref.c:41 builtin/ls-tree.c:357 builtin/replace.c:555
-#: builtin/tag.c:480 builtin/verify-tag.c:38
 msgid "format"
 msgstr "định dạng"
 
-#: builtin/am.c:2383
 msgid "format the patch(es) are in"
 msgstr "định dạng (các) miếng vá theo"
 
-#: builtin/am.c:2389
 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:2391
 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:2394
 msgid "synonyms for --continue"
 msgstr "đồng nghĩa với --continue"
 
-#: builtin/am.c:2397
 msgid "skip the current patch"
 msgstr "bỏ qua miếng vá hiện hành"
 
-#: builtin/am.c:2400
 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:2403
 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:2407
 msgid "show the patch being applied"
 msgstr "hiển thị miếng vá đã được áp dụng rồi"
 
-#: builtin/am.c:2411
 msgid "record the empty patch as an empty commit"
 msgstr "ghi lại miếng vá trống rỗng như là một lần chuyển giao trống"
 
-#: builtin/am.c:2415
 msgid "lie about committer date"
 msgstr "nói dối về ngày chuyển giao"
 
-#: builtin/am.c:2417
 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:2419 builtin/commit-tree.c:118 builtin/commit.c:1642
-#: builtin/merge.c:302 builtin/pull.c:179 builtin/rebase.c:1127
-#: builtin/revert.c:117 builtin/tag.c:461
 msgid "key-id"
 msgstr "mã-số-khóa"
 
-#: builtin/am.c:2420 builtin/rebase.c:1128
 msgid "GPG-sign commits"
 msgstr "Các lần chuyển giao ký-GPG"
 
-#: builtin/am.c:2423
 msgid "how to handle empty patches"
 msgstr "xử lý các miếng vá trống rỗng như thế nào"
 
-#: builtin/am.c:2426
 msgid "(internal use for git-rebase)"
 msgstr "(dùng nội bộ cho git-rebase)"
 
-#: builtin/am.c:2444
 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."
@@ -11255,16 +2206,13 @@ msgstr ""
 "Tùy chọn -b/--binary đã không dùng từ lâu rồi, và\n"
 "nó sẽ được bỏ đi. Xin đừng sử dụng nó thêm nữa."
 
-#: builtin/am.c:2451
 msgid "failed to read the index"
 msgstr "gặp lỗi đọc bảng mục lục"
 
-#: builtin/am.c:2466
 #, 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:2490
 #, c-format
 msgid ""
 "Stray %s directory found.\n"
@@ -11273,48 +2221,37 @@ msgstr ""
 "Tìm thấy thư mục lạc %s.\n"
 "Dùng \"git am --abort\" để loại bỏ nó đi."
 
-#: builtin/am.c:2496
 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:2506
 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"
 
-#: builtin/apply.c:8
 msgid "git apply [<options>] [<patch>...]"
 msgstr "git apply [<các tùy chọn>] [<miếng-vá>…]"
 
-#: builtin/archive.c:18
 msgid "could not redirect output"
 msgstr "không thể chuyển hướng kết xuất"
 
-#: 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: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:62
 #, c-format
 msgid "git archive: NACK %s"
 msgstr "git archive: NACK %s"
 
-#: builtin/archive.c:63
 msgid "git archive: protocol error"
 msgstr "git archive: lỗi giao thức"
 
-#: 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:24
 msgid "git bisect--helper --bisect-reset [<commit>]"
 msgstr "git bisect--helper --bisect-reset [<lần_chuyển_giao>]"
 
-#: builtin/bisect--helper.c:26
 msgid ""
 "git bisect--helper --bisect-start [--term-{new,bad}=<term> --term-{old,good}"
 "=<term>] [--no-checkout] [--first-parent] [<bad> [<good>...]] [--] "
@@ -11324,71 +2261,56 @@ msgstr ""
 "=<term>] [--no-checkout] [--first-parent] [<bad> [<good>…]] [--] [</các/"
 "đường/dẫn>…]"
 
-#: builtin/bisect--helper.c:29
 msgid "git bisect--helper --bisect-state (bad|new) [<rev>]"
 msgstr "git bisect--helper --bisect-state (bad|new) [<lần_chuyển_giao>]"
 
-#: builtin/bisect--helper.c:30
 msgid "git bisect--helper --bisect-state (good|old) [<rev>...]"
 msgstr "git bisect--helper --bisect-state (good|old) [<lần_chuyển_giao>…]"
 
-#: builtin/bisect--helper.c:31
 msgid "git bisect--helper --bisect-replay <filename>"
 msgstr "git bisect--helper --bisect-replay <tên_tập_tin>"
 
-#: builtin/bisect--helper.c:32
 msgid "git bisect--helper --bisect-skip [(<rev>|<range>)...]"
 msgstr "git bisect--helper --bisect-skip [(<rev>|<vùng>)…]"
 
-#: 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: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: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: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: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:194
 msgid "please use two different terms"
 msgstr "vui lòng dùng hai thời kỳ khác nhau"
 
-#: 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: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:227
 #, c-format
 msgid ""
 "could not check out original HEAD '%s'. Try 'git bisect reset <commit>'."
@@ -11396,27 +2318,22 @@ msgstr ""
 "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:271
 #, c-format
 msgid "Bad bisect_write argument: %s"
 msgstr "Đối số bisect_write sai: %s"
 
-#: 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:288
 #, c-format
 msgid "couldn't open the file '%s'"
 msgstr "không thể mở tập tin “%s”"
 
-#: 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:341
 #, c-format
 msgid ""
 "You need to give me at least one %s and %s revision.\n"
@@ -11425,7 +2342,6 @@ msgstr ""
 "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:345
 #, c-format
 msgid ""
 "You need to start by \"git bisect start\".\n"
@@ -11436,7 +2352,6 @@ msgstr ""
 "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: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"
@@ -11445,15 +2360,26 @@ msgstr "chỉ thực hiện việc bisect với một lần chuyển giao %s"
 #. translation. The program will only accept English input
 #. at this point.
 #.
-#: 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:434
+msgid "status: waiting for both good and bad commits\n"
+msgstr "trạng thái: đang chờ cho cả các lần chuyển giao tốt và sai\n"
+
+#, c-format
+msgid "status: waiting for bad commit, %d good commit known\n"
+msgid_plural "status: waiting for bad commit, %d good commits known\n"
+msgstr[0] ""
+"trạng thái: đang chờ cho lần chuyển giao sai, đã biết %d lần chuyển giao "
+"tốt\n"
+
+msgid "status: waiting for good commit(s), bad commit known\n"
+msgstr ""
+"trạng thái: đang chờ cho lần chuyển giao tốt, chưa biết lần chuyển giao sai\n"
+
 msgid "no terms defined"
 msgstr "chưa định nghĩa thời kỳ nào"
 
-#: builtin/bisect--helper.c:437
 #, c-format
 msgid ""
 "Your current terms are %s for the old state\n"
@@ -11462,7 +2388,6 @@ msgstr ""
 "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:447
 #, c-format
 msgid ""
 "invalid argument %s for 'git bisect terms'.\n"
@@ -11471,52 +2396,41 @@ msgstr ""
 "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: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:536
 #, c-format
 msgid "could not open '%s' for appending"
 msgstr "không thể mở “%s” để nối thêm"
 
-#: 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:678
 #, c-format
 msgid "unrecognized option: '%s'"
 msgstr "tùy chọn không được thừa nhận: “%s”"
 
-#: 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:713
 msgid "bad HEAD - I need a HEAD"
 msgstr "sai HEAD - Tôi cần một HEAD"
 
-#: 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: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:752
 msgid "bad HEAD - strange symbolic ref"
 msgstr "sai HEAD - tham chiếu mềm kỳ lạ"
 
-#: builtin/bisect--helper.c:772
 #, c-format
 msgid "invalid ref: '%s'"
 msgstr "refspec không hợp lệ: “%s”"
 
-#: 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"
 
@@ -11524,87 +2438,69 @@ msgstr "Bạn cần khởi đầu bằng \"git bisect start\"\n"
 #. translation. The program will only accept English input
 #. at this point.
 #.
-#: 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: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: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:884 builtin/bisect--helper.c:897
 #, c-format
 msgid "Bad rev input: %s"
 msgstr "Đầu vào rev sai: %s"
 
-#: 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:936
 msgid "We are not bisecting."
 msgstr "Chúng tôi không bisect."
 
-#: builtin/bisect--helper.c:986
 #, c-format
 msgid "'%s'?? what are you talking about?"
 msgstr "“%s”?? bạn đang nói gì thế?"
 
-#: 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"
 
-#: builtin/bisect--helper.c:1120 builtin/bisect--helper.c:1152
 #, c-format
 msgid "running %s\n"
 msgstr "đang chạy %s\n"
 
-#: builtin/bisect--helper.c:1145 builtin/bisect--helper.c:1335
 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:1166
 #, c-format
 msgid "unable to verify '%s' on good revision"
 msgstr "không thể xác nhận “%s” trên điểm xét duyệt tốt"
 
-#: builtin/bisect--helper.c:1172
 #, c-format
 msgid "bogus exit code %d for good revision"
 msgstr "mã thoát giả %d cho điểm xét duyệt tốt"
 
-#: builtin/bisect--helper.c:1180
 #, 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:1195
 #, c-format
 msgid "cannot open file '%s' for writing"
 msgstr "không thể mở “%s” để ghi"
 
-#: builtin/bisect--helper.c:1213
 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:1215
 #, c-format
 msgid "bisect run success"
 msgstr "bisect chạy thành công"
 
-#: builtin/bisect--helper.c:1218
 #, 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:1221
 #, c-format
 msgid ""
 "bisect run failed: 'git bisect--helper --bisect-state %s' exited with error "
@@ -11613,222 +2509,165 @@ 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:1253
 msgid "reset the bisection state"
 msgstr "đặt lại trạng di chuyển nửa bước"
 
-#: builtin/bisect--helper.c:1255
 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:1257
 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:1259
 msgid "start the bisect session"
 msgstr "bắt đầu phiên di chuyển nửa bước"
 
-#: builtin/bisect--helper.c:1261
 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:1263
 msgid "mark the state of ref (or refs)"
 msgstr "đánh dấu trạng thái ref (hoặc refs)"
 
-#: builtin/bisect--helper.c:1265
 msgid "list the bisection steps so far"
 msgstr "liệt kê các bước bisection đi quá xa"
 
-#: builtin/bisect--helper.c:1267
 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:1269
 msgid "skip some commits for checkout"
 msgstr "bỏ qua một số lần chuyển giao để lấy ra"
 
-#: builtin/bisect--helper.c:1271
 msgid "visualize the bisection"
 msgstr "trực quan việc di chuyển nửa bước"
 
-#: builtin/bisect--helper.c:1273
 msgid "use <cmd>... to automatically bisect"
 msgstr "dùng <cmd>… để bisect một cách tự động"
 
-#: builtin/bisect--helper.c:1275
 msgid "no log for BISECT_WRITE"
 msgstr "không có nhật ký cho BISECT_WRITE"
 
-#: builtin/bisect--helper.c:1290
 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:1295
 msgid "--bisect-terms requires 0 or 1 argument"
 msgstr "--bisect-terms cần 0 hoặc 1 tham số"
 
-#: builtin/bisect--helper.c:1304
 msgid "--bisect-next requires 0 arguments"
 msgstr "--bisect-next cần 0 tham số"
 
-#: builtin/bisect--helper.c:1315
 msgid "--bisect-log requires 0 arguments"
 msgstr "--bisect-log cần 0 tham số"
 
-#: builtin/bisect--helper.c:1320
 msgid "no logfile given"
 msgstr "chưa chỉ ra tập tin ghi nhật ký"
 
-#: builtin/blame.c:32
 msgid "git blame [<options>] [<rev-opts>] [<rev>] [--] <file>"
 msgstr "git blame [<các tùy chọn>] [<rev-opts>] [<rev>] [--] <tập-tin>"
 
-#: builtin/blame.c:37
 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:406
 #, c-format
 msgid "expecting a color: %s"
 msgstr "cần một màu: %s"
 
-#: 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:842
 #, 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:864
 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:865
 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:866
 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:867
 msgid "show work cost statistics"
 msgstr "hiển thị thống kê công sức làm việc"
 
-#: builtin/blame.c:868 builtin/checkout.c:1554 builtin/clone.c:98
-#: builtin/commit-graph.c:75 builtin/commit-graph.c:228 builtin/fetch.c:181
-#: builtin/merge.c:301 builtin/multi-pack-index.c:103
-#: builtin/multi-pack-index.c:154 builtin/multi-pack-index.c:180
-#: builtin/multi-pack-index.c:208 builtin/pull.c:120 builtin/push.c:566
-#: builtin/remote.c:683 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:869
 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:870
 msgid "show original filename (Default: auto)"
 msgstr "hiển thị tên tập tin gốc (Mặc định: auto)"
 
-#: builtin/blame.c:871
 msgid "show original linenumber (Default: off)"
 msgstr "hiển thị số dòng gốc (Mặc định: off)"
 
-#: builtin/blame.c:872
 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:873
 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:874
 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:875
 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:876
 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:877
 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:878
 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:879
 msgid "ignore whitespace differences"
 msgstr "bỏ qua các khác biệt do khoảng trắng gây ra"
 
-#: builtin/blame.c:880 builtin/log.c:1857
 msgid "rev"
 msgstr "rev"
 
-#: builtin/blame.c:880
 msgid "ignore <rev> when blaming"
 msgstr "bỏ qua <rev> khi blame"
 
-#: builtin/blame.c:881
 msgid "ignore revisions from <file>"
 msgstr "bỏ qua các điểm xét duyệt từ <tập tin>"
 
-#: builtin/blame.c:882
 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:883
 msgid "color lines by age"
 msgstr "các dòng màu theo tuổi"
 
-#: builtin/blame.c:884
 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:885
 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:886
 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:887 builtin/blame.c:888
 msgid "score"
 msgstr "điểm số"
 
-#: builtin/blame.c:887
 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:888
 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:889
 msgid "range"
 msgstr "vùng"
 
-#: builtin/blame.c:890
 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:949
 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"
@@ -11841,25 +2680,20 @@ msgstr ""
 #. your language may need more or fewer display
 #. columns.
 #.
-#: builtin/blame.c:1000
 msgid "4 years, 11 months ago"
 msgstr "4 năm, 11 tháng trước"
 
-#: builtin/blame.c:1116
 #, 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:1161
 msgid "Blaming lines"
 msgstr "Các dòng blame"
 
-#: builtin/branch.c:29
 msgid "git branch [<options>] [-r | -a] [--merged] [--no-merged]"
 msgstr "git branch [<các tùy chọn>] [-r | -a] [--merged] [ --no-merged]"
 
-#: builtin/branch.c:30
 msgid ""
 "git branch [<options>] [-f] [--recurse-submodules] <branch-name> [<start-"
 "point>]"
@@ -11867,31 +2701,24 @@ msgstr ""
 "git branch [<các tùy chọn>] [-f] [--recurse-submodules] <tên-nhánh> [<điểm-"
 "đầu>]"
 
-#: builtin/branch.c:31
 msgid "git branch [<options>] [-l] [<pattern>...]"
 msgstr "git branch [<các tùy chọn>] [-l] [<mẫu>...]"
 
-#: builtin/branch.c:32
 msgid "git branch [<options>] [-r] (-d | -D) <branch-name>..."
 msgstr "git branch [<các tùy chọn>] [-r] (-d | -D) <tên-nhánh> …"
 
-#: builtin/branch.c:33
 msgid "git branch [<options>] (-m | -M) [<old-branch>] <new-branch>"
 msgstr "git branch [<các tùy chọn>] (-m | -M) [<nhánh-cũ>] <nhánh-mới>"
 
-#: builtin/branch.c:34
 msgid "git branch [<options>] (-c | -C) [<old-branch>] <new-branch>"
 msgstr "git branch [<các tùy chọn>] (-c | -C) [<nhánh-cũ>] <nhánh-mới>"
 
-#: builtin/branch.c:35
 msgid "git branch [<options>] [-r | -a] [--points-at]"
 msgstr "git branch [<các tùy chọn>] [-r | -a] [--points-at]"
 
-#: builtin/branch.c:36
 msgid "git branch [<options>] [-r | -a] [--format]"
 msgstr "git branch [<các tùy chọn>] [-r | -a] [--format]"
 
-#: builtin/branch.c:165
 #, c-format
 msgid ""
 "deleting branch '%s' that has been merged to\n"
@@ -11900,7 +2727,6 @@ msgstr ""
 "đang xóa nhánh “%s” mà nó lại đã được hòa trộn vào\n"
 "         “%s”, nhưng vẫn chưa được hòa trộn vào HEAD."
 
-#: builtin/branch.c:169
 #, c-format
 msgid ""
 "not deleting branch '%s' that is not yet merged to\n"
@@ -11909,12 +2735,10 @@ msgstr ""
 "không xóa nhánh “%s” cái mà chưa được hòa trộn vào\n"
 "         “%s”, cho dù là nó đã được hòa trộn vào HEAD."
 
-#: builtin/branch.c:183
 #, c-format
 msgid "Couldn't look up commit object for '%s'"
 msgstr "Không thể tìm kiếm đối tượng chuyển giao cho “%s”"
 
-#: builtin/branch.c:187
 #, c-format
 msgid ""
 "The branch '%s' is not fully merged.\n"
@@ -11923,111 +2747,87 @@ msgstr ""
 "Nhánh “%s” không được trộn một cách đầy đủ.\n"
 "Nếu bạn thực sự muốn xóa nó, thì chạy lệnh “git branch -D %s”."
 
-#: builtin/branch.c:200
 msgid "Update of config-file failed"
 msgstr "Cập nhật tập tin cấu hình gặp lỗi"
 
-#: builtin/branch.c:235
 msgid "cannot use -a with -d"
 msgstr "không thể dùng tùy chọn -a với -d"
 
-#: builtin/branch.c:242
 msgid "Couldn't look up commit object for HEAD"
 msgstr "Không thể tìm kiếm đối tượng chuyển giao cho HEAD"
 
-#: builtin/branch.c:259
 #, c-format
 msgid "Cannot delete branch '%s' checked out at '%s'"
 msgstr "Không thể xóa nhánh “%s” đã được lấy ra tại “%s”"
 
-#: builtin/branch.c:274
 #, c-format
 msgid "remote-tracking branch '%s' not found."
 msgstr "không tìm thấy nhánh theo dõi máy chủ “%s”."
 
-#: builtin/branch.c:275
 #, c-format
 msgid "branch '%s' not found."
 msgstr "không tìm thấy nhánh “%s”."
 
-#: builtin/branch.c:306
 #, c-format
 msgid "Deleted remote-tracking branch %s (was %s).\n"
 msgstr "Đã xóa nhánh theo dõi máy chủ \"%s\" (từng là %s).\n"
 
-#: builtin/branch.c:307
 #, c-format
 msgid "Deleted branch %s (was %s).\n"
 msgstr "Nhánh “%s” đã bị xóa (từng là %s)\n"
 
-#: builtin/branch.c:457 builtin/tag.c:64
 msgid "unable to parse format string"
 msgstr "không thể phân tích chuỗi định dạng"
 
-#: builtin/branch.c:488
 msgid "could not resolve HEAD"
 msgstr "không thể phân giải HEAD"
 
-#: builtin/branch.c:494
 #, 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:509
 #, 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:513
 #, 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:530
 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:532
 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:543
 #, c-format
 msgid "Invalid branch name: '%s'"
 msgstr "Tên nhánh không hợp lệ: “%s”"
 
-#: builtin/branch.c:572
 msgid "Branch rename failed"
 msgstr "Gặp lỗi khi đổi tên nhánh"
 
-#: builtin/branch.c:574
 msgid "Branch copy failed"
 msgstr "Gặp lỗi khi sao chép nhánh"
 
-#: builtin/branch.c:578
 #, 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:581
 #, c-format
 msgid "Renamed a misnamed branch '%s' away"
 msgstr "Đã đổi tên nhánh khuyết danh “%s” đi"
 
-#: builtin/branch.c:587
 #, 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:596
 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:598
 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:614
 #, c-format
 msgid ""
 "Please edit the description for the branch\n"
@@ -12038,147 +2838,111 @@ msgstr ""
 "  %s\n"
 "Những dòng được bắt đầu bằng “%c” sẽ được cắt bỏ.\n"
 
-#: builtin/branch.c:651
 msgid "Generic options"
 msgstr "Tùy chọn chung"
 
-#: builtin/branch.c:653
 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:654
 msgid "suppress informational messages"
 msgstr "không xuất các thông tin"
 
-#: builtin/branch.c:656 builtin/checkout.c:1571
-#: builtin/submodule--helper.c:3077
 msgid "set branch tracking configuration"
 msgstr "đặt cấu hình thao dõi nhánh"
 
-#: builtin/branch.c:659
 msgid "do not use"
 msgstr "không dùng"
 
-#: builtin/branch.c:661
 msgid "upstream"
 msgstr "thượng nguồn"
 
-#: builtin/branch.c:661
 msgid "change the upstream info"
 msgstr "thay đổi thông tin thượng nguồn"
 
-#: builtin/branch.c:662
 msgid "unset the upstream info"
 msgstr "bỏ đặt thông tin thượng nguồn"
 
-#: builtin/branch.c:663
 msgid "use colored output"
 msgstr "tô màu kết xuất"
 
-#: builtin/branch.c:664
 msgid "act on remote-tracking branches"
 msgstr "thao tác trên nhánh “remote-tracking”"
 
-#: builtin/branch.c:666 builtin/branch.c:668
 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:667 builtin/branch.c:669
 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:672
 msgid "Specific git-branch actions:"
 msgstr "Hành động git-branch:"
 
-#: builtin/branch.c:673
 msgid "list both remote-tracking and local branches"
 msgstr "liệt kê cả nhánh “remote-tracking” và nội bộ"
 
-#: builtin/branch.c:675
 msgid "delete fully merged branch"
 msgstr "xóa một toàn bộ nhánh đã hòa trộn"
 
-#: builtin/branch.c:676
 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:677
 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:678
 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:679
 msgid "copy a branch and its reflog"
 msgstr "sao chép một nhánh và reflog của nó"
 
-#: builtin/branch.c:680
 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:681
 msgid "list branch names"
 msgstr "liệt kê các tên nhánh"
 
-#: builtin/branch.c:682
 msgid "show current branch name"
 msgstr "hiển thị nhánh hiện hành"
 
-#: builtin/branch.c:683 builtin/submodule--helper.c:3075
 msgid "create the branch's reflog"
 msgstr "tạo reflog của nhánh"
 
-#: builtin/branch.c:685
 msgid "edit the description for the branch"
 msgstr "sửa mô tả cho nhánh"
 
-#: builtin/branch.c:686
 msgid "force creation, move/rename, deletion"
 msgstr "buộc tạo, di chuyển/đổi tên, xóa"
 
-#: builtin/branch.c:687
 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:688
 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:689
 msgid "list branches in columns"
 msgstr "liệt kê các nhánh trong các cột"
 
-#: builtin/branch.c:691 builtin/for-each-ref.c:45 builtin/notes.c:413
-#: builtin/notes.c:416 builtin/notes.c:579 builtin/notes.c:582
-#: builtin/tag.c:476
 msgid "object"
 msgstr "đối tượng"
 
-#: builtin/branch.c:692
 msgid "print only branches of the object"
 msgstr "chỉ hiển thị các nhánh của đối tượng"
 
-#: builtin/branch.c:693 builtin/for-each-ref.c:51 builtin/tag.c:483
 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:694 builtin/ls-files.c:667
 msgid "recurse through submodules"
 msgstr "đệ quy xuyên qua mô-đun con"
 
-#: builtin/branch.c:695 builtin/for-each-ref.c:41 builtin/ls-tree.c:358
-#: builtin/tag.c:481 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:718 builtin/clone.c:684
+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ệ."
+
 msgid "HEAD not found below refs/heads!"
 msgstr "Không tìm thấy HEAD ở dưới refs/heads!"
 
-#: builtin/branch.c:739
 msgid ""
 "branch with --recurse-submodules can only be used if submodule."
 "propagateBranches is enabled"
@@ -12186,45 +2950,35 @@ msgstr ""
 "nhánh với --recurse-submodules chỉ có thể được sử dụng nếu submodule."
 "propagateBranches được kích hoạt"
 
-#: builtin/branch.c:741
 msgid "--recurse-submodules can only be used to create branches"
 msgstr "--recurse-submodules chỉ có thể được sử dụng để tạo ra các nhánh"
 
-#: builtin/branch.c:770 builtin/branch.c:826 builtin/branch.c:835
 msgid "branch name required"
 msgstr "cần chỉ ra tên nhánh"
 
-#: builtin/branch.c:802
 msgid "Cannot give description to detached HEAD"
 msgstr "Không thể đưa ra mô tả HEAD đã tách rời"
 
-#: builtin/branch.c:807
 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:814
 #, 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:817
 #, c-format
 msgid "No branch named '%s'."
 msgstr "Không có nhánh nào có tên “%s”."
 
-#: builtin/branch.c:832
 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:841
 msgid "too many arguments for a rename operation"
 msgstr "quá nhiều tham số cho thao tác đổi tên"
 
-#: builtin/branch.c:846
 msgid "too many arguments to set new upstream"
 msgstr "quá nhiều tham số để đặt thượng nguồn mới"
 
-#: builtin/branch.c:850
 #, c-format
 msgid ""
 "could not set upstream of HEAD to %s when it does not point to any branch."
@@ -12232,30 +2986,24 @@ msgstr ""
 "không thể đặt thượng nguồn của HEAD thành %s khi mà nó chẳng chỉ đến nhánh "
 "nào cả."
 
-#: builtin/branch.c:853 builtin/branch.c:873
 #, c-format
 msgid "no such branch '%s'"
 msgstr "không có nhánh nào như thế “%s”"
 
-#: builtin/branch.c:857
 #, c-format
 msgid "branch '%s' does not exist"
 msgstr "chưa có nhánh “%s”"
 
-#: builtin/branch.c:867
 msgid "too many arguments to unset upstream"
 msgstr "quá nhiều tham số để bỏ đặt thượng nguồn"
 
-#: builtin/branch.c:871
 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:877
 #, 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:890
 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>?"
@@ -12264,7 +3012,6 @@ msgstr ""
 "nhánh.\n"
 "Có phải ý bạn là dùng: -a|-r --list <mẫu>?"
 
-#: builtin/branch.c:894
 msgid ""
 "the '--set-upstream' option is no longer supported. Please use '--track' or "
 "'--set-upstream-to' instead."
@@ -12272,33 +3019,26 @@ msgstr ""
 "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:16
 msgid "git version:\n"
 msgstr "phiên bản git:\n"
 
-#: 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:32
 msgid "compiler info: "
 msgstr "thông tin trình biên dịch: "
 
-#: builtin/bugreport.c:35
 msgid "libc info: "
 msgstr "thông tin libc: "
 
-#: 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: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:69
 msgid ""
 "Thank you for filling out a Git bug report!\n"
 "Please answer the following questions to help us understand your issue.\n"
@@ -12332,145 +3072,116 @@ msgstr ""
 "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: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: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: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:139
 msgid "System Info"
 msgstr "Thông tin hệ thống"
 
-#: builtin/bugreport.c:142
 msgid "Enabled Hooks"
 msgstr "Các Móc đã được bật"
 
-#: builtin/bugreport.c:149
 #, c-format
 msgid "unable to write to %s"
 msgstr "không thể ghi vào %s"
 
-#: 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"
 
-#: builtin/bundle.c:15 builtin/bundle.c:23
 msgid "git bundle create [<options>] <file> <git-rev-list args>"
 msgstr "git bundle create [<các tùy chọn>] <tập_tin> <git-rev-list args>"
 
-#: builtin/bundle.c:16 builtin/bundle.c:28
 msgid "git bundle verify [<options>] <file>"
 msgstr "git bundle verify [<các tùy chọn>] <tập-tin>"
 
-#: builtin/bundle.c:17 builtin/bundle.c:33
 msgid "git bundle list-heads <file> [<refname>...]"
 msgstr "git bundle list-heads <tập tin> [<tên tham chiếu>…]"
 
-#: builtin/bundle.c:18 builtin/bundle.c:38
 msgid "git bundle unbundle <file> [<refname>...]"
 msgstr "git bundle unbundle <tập tin> [<tên tham chiếu>…]"
 
-#: builtin/bundle.c:65 builtin/pack-objects.c:3899
 msgid "do not show progress meter"
 msgstr "không hiển thị bộ đo tiến trình"
 
-#: builtin/bundle.c:67 builtin/bundle.c:168 builtin/pack-objects.c:3901
 msgid "show progress meter"
 msgstr "hiển thị bộ đo tiến trình"
 
-#: builtin/bundle.c:69 builtin/pack-objects.c:3903
 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:72 builtin/pack-objects.c:3906
 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:74
 msgid "specify bundle format version"
 msgstr "chỉ điịnh định dạng cho bundle"
 
-#: 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:108
 msgid "do not show bundle details"
 msgstr "không hiển thị chi tiết bundle (bó)"
 
-#: builtin/bundle.c:127
 #, c-format
 msgid "%s is okay\n"
 msgstr "“%s” tốt\n"
 
-#: builtin/bundle.c:183
 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:186
 msgid "Unbundling objects"
 msgstr "Tháo rời các đối tượng"
 
-#: builtin/bundle.c:220 builtin/remote.c:1758
 #, c-format
 msgid "Unknown subcommand: %s"
 msgstr "Không hiểu câu lệnh con: %s"
 
-#: builtin/cat-file.c:568
+#, c-format
+msgid "cannot read object %s '%s'"
+msgstr "không thể đọc đối tượng %s “%s”"
+
 msgid "flush is only for --buffer mode"
 msgstr "flush chỉ dành cho chế độ --buffer"
 
-#: builtin/cat-file.c:612
 msgid "empty command in input"
 msgstr "lệnh thực thi trống rỗng trong đầu vào"
 
-#: builtin/cat-file.c:614
 #, c-format
 msgid "whitespace before command: '%s'"
 msgstr "có khoảng trắng trước lệnh: '%s'"
 
-#: builtin/cat-file.c:623
 #, c-format
 msgid "%s requires arguments"
 msgstr "%s cần các tham số"
 
-#: builtin/cat-file.c:628
 #, c-format
 msgid "%s takes no arguments"
 msgstr "%s không nhận tham số"
 
-#: builtin/cat-file.c:636
 #, c-format
 msgid "unknown command: '%s'"
 msgstr "không hiểu câu lệnh: '%s'"
 
-#: builtin/cat-file.c:795
 msgid "only one batch option may be specified"
 msgstr "chỉ một tùy chọn batch được chỉ ra"
 
-#: builtin/cat-file.c:824
 msgid "git cat-file <type> <object>"
 msgstr "git cat-file <kiểu> <đối tượng>"
 
-#: builtin/cat-file.c:825
 msgid "git cat-file (-e | -p) <object>"
 msgstr "git cat-file (-e | -p) <đối tượng>"
 
-#: builtin/cat-file.c:826
 msgid "git cat-file (-t | -s) [--allow-unknown-type] <object>"
 msgstr "git cat-file (-t | -s) [--allow-unknown-type] <đối_tượng>"
 
-#: builtin/cat-file.c:827
 msgid ""
 "git cat-file (--batch | --batch-check | --batch-command) [--batch-all-"
 "objects]\n"
@@ -12482,7 +3193,6 @@ msgstr ""
 "             [--buffer] [--follow-symlinks] [--unordered]\n"
 "             [--textconv | --filters]"
 
-#: builtin/cat-file.c:830
 msgid ""
 "git cat-file (--textconv | --filters)\n"
 "             [<rev>:<path|tree-ish> | --path=<path|tree-ish> <rev>]"
@@ -12490,77 +3200,60 @@ msgstr ""
 "git cat-file (--textconv | --filters)\n"
 "             [<rev>:<path|tree-ish> | --path=<path|tree-ish> <rev>]"
 
-#: builtin/cat-file.c:836
 msgid "Check object existence or emit object contents"
 msgstr "Kiểm tra đối tượng có sẵn hay không hoặc phát nội dung của đối tượng"
 
-#: builtin/cat-file.c:838
 msgid "check if <object> exists"
 msgstr "không tra xem <đối tượng> có sẵn hay không"
 
-#: builtin/cat-file.c:839
 msgid "pretty-print <object> content"
 msgstr "in nội dung <đối tượng> dạng dễ đọc"
 
-#: builtin/cat-file.c:841
 msgid "Emit [broken] object attributes"
 msgstr "Phát các thuộc tính đối tượng [hỏng]"
 
-#: builtin/cat-file.c:842
 msgid "show object type (one of 'blob', 'tree', 'commit', 'tag', ...)"
 msgstr ""
 "hiển thị kiểu của đối tượng (là một trong số 'blob', 'tree', 'commit', "
 "'tag', ...)"
 
-#: builtin/cat-file.c:843
 msgid "show object size"
 msgstr "hiển thị kích thước đối tượng"
 
-#: builtin/cat-file.c:845
 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:847
 msgid "Batch objects requested on stdin (or --batch-all-objects)"
 msgstr ""
 "Đã yêu cầu các đối tượng batch trên đầu vào tiêu chuẩn stdin (hoặc --batch-"
 "all-objects)"
 
-#: builtin/cat-file.c:849
 msgid "show full <object> or <rev> contents"
 msgstr "hiển thị đầy đủ nội dung <object> hay <rev>"
 
-#: builtin/cat-file.c:853
 msgid "like --batch, but don't emit <contents>"
 msgstr "giống --batch, nhưng không phát ra <contents>"
 
-#: builtin/cat-file.c:857
 msgid "read commands from stdin"
 msgstr "đọc các lệnh từ đầu vào tiêu chuẩn"
 
-#: builtin/cat-file.c:861
 msgid "with --batch[-check]: ignores stdin, batches all known objects"
 msgstr ""
 "với --batch[-check]: bỏ qua đầu vào tiêu chuẩn stdin, batch mọi đối tượng đã "
 "biết"
 
-#: builtin/cat-file.c:863
 msgid "Change or optimize batch output"
 msgstr "Thay đổi hay tối ưu hóa đầu ra batch"
 
-#: builtin/cat-file.c:864
 msgid "buffer --batch output"
 msgstr "đệm kết xuất --batch"
 
-#: builtin/cat-file.c:866
 msgid "follow in-tree symlinks"
 msgstr "theo liên kết mềm trong-cây"
 
-#: builtin/cat-file.c:868
 msgid "do not order objects before emitting them"
 msgstr "đừng sắp xếp các đối tượng trước khi phát chúng"
 
-#: builtin/cat-file.c:870
 msgid ""
 "Emit object (blob or tree) with conversion or filter (stand-alone, or with "
 "batch)"
@@ -12568,309 +3261,232 @@ msgstr ""
 "Phát đối tượng (blob hoặc cây) với bộ chuyển đổi hoặc bộ lọc (stand-alone, "
 "hoặc với batch)"
 
-#: builtin/cat-file.c:872
 msgid "run textconv on object's content"
 msgstr "chạy lệnh textconv trên nội dung của đối tượng"
 
-#: builtin/cat-file.c:874
 msgid "run filters on object's content"
 msgstr "chạy các bộ lọc nội dung của đối tượng"
 
-#: builtin/cat-file.c:875
 msgid "blob|tree"
 msgstr "blob|tree"
 
-#: builtin/cat-file.c:876
 msgid "use a <path> for (--textconv | --filters); Not with 'batch'"
 msgstr ""
 "dùng một </đường/dẫn/> rõ ràng cho (--textconv/--filters); Không với 'batch'"
 
-#: builtin/cat-file.c:894
 #, c-format
 msgid "'%s=<%s>' needs '%s' or '%s'"
 msgstr "'%s=<%s>' cần '%s' hoặc '%s'"
 
-#: builtin/cat-file.c:896
 msgid "path|tree-ish"
 msgstr "path|tree-ish"
 
-#: builtin/cat-file.c:903 builtin/cat-file.c:906 builtin/cat-file.c:909
 #, c-format
 msgid "'%s' requires a batch mode"
 msgstr "“%s” cần một chế độ batch"
 
-#: builtin/cat-file.c:921
 #, c-format
 msgid "'-%c' is incompatible with batch mode"
 msgstr "'-%c' là xung khắc với chế độ batch"
 
-#: builtin/cat-file.c:924
 msgid "batch modes take no arguments"
 msgstr "chế độ batch không nhận các đối số"
 
-#: builtin/cat-file.c:932 builtin/cat-file.c:935
 #, c-format
 msgid "<rev> required with '%s'"
 msgstr "cần <rev> với '%s'"
 
-#: builtin/cat-file.c:938
 #, c-format
 msgid "<object> required with '-%c'"
 msgstr "cần <object> với '-%c'"
 
-#: builtin/cat-file.c:943 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:965
-#: builtin/notes.c:987 builtin/prune-packed.c:25 builtin/receive-pack.c:2489
-#: builtin/tag.c:592
 msgid "too many arguments"
 msgstr "có quá nhiều đối số"
 
-#: builtin/cat-file.c:947
 #, c-format
 msgid "only two arguments allowed in <type> <object> mode, not %d"
 msgstr "chỉ hai đối số được phép trong chế độ <type> <object>, không phải %d"
 
-#: builtin/check-attr.c:13
 msgid "git check-attr [-a | --all | <attr>...] [--] <pathname>..."
 msgstr "git check-attr [-a | --all | <attr>…] [--] tên-đường-dẫn…"
 
-#: builtin/check-attr.c:14
 msgid "git check-attr --stdin [-z] [-a | --all | <attr>...]"
 msgstr "git check-attr --stdin [-z] [-a | --all | <attr>…]"
 
-#: builtin/check-attr.c:21
 msgid "report all attributes set on file"
 msgstr "báo cáo tất cả các thuộc tính đặt trên tập tin"
 
-#: builtin/check-attr.c:22
 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:101
 msgid "read file names from stdin"
 msgstr "đọc tên tập tin từ đầu vào tiêu chuẩn"
 
-#: builtin/check-attr.c:25 builtin/check-ignore.c:27
 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:1550 builtin/gc.c:550
-#: builtin/worktree.c:565
 msgid "suppress progress reporting"
 msgstr "chặn các báo cáo tiến trình hoạt động"
 
-#: builtin/check-ignore.c:29
 msgid "show non-matching input paths"
 msgstr "hiển thị những đường dẫn đầu vào không khớp với mẫu"
 
-#: builtin/check-ignore.c:31
 msgid "ignore index when checking"
 msgstr "bỏ qua mục lục khi kiểm tra"
 
-#: builtin/check-ignore.c:165
 msgid "cannot specify pathnames with --stdin"
 msgstr "không thể chỉ định các tên đường dẫn với --stdin"
 
-#: builtin/check-ignore.c:168
 msgid "-z only makes sense with --stdin"
 msgstr "-z chỉ hợp lý với --stdin"
 
-#: builtin/check-ignore.c:170
 msgid "no path specified"
 msgstr "chưa chỉ ra đường dẫn"
 
-#: builtin/check-ignore.c:174
 msgid "--quiet is only valid with a single pathname"
 msgstr "--quiet chỉ hợp lệ với tên đường dẫn đơn"
 
-#: builtin/check-ignore.c:176
 msgid "cannot have both --quiet and --verbose"
 msgstr "không thể dùng cả hai tùy chọn --quiet và --verbose"
 
-#: builtin/check-ignore.c:179
 msgid "--non-matching is only valid with --verbose"
 msgstr "tùy-chọn --non-matching chỉ hợp lệ khi dùng với --verbose"
 
-#: builtin/check-mailmap.c:9
 msgid "git check-mailmap [<options>] <contact>..."
 msgstr "git check-mailmap [<các tùy chọn>] <danh-bạ>…"
 
-#: builtin/check-mailmap.c:14
 msgid "also read contacts from stdin"
 msgstr "đồng thời đọc các danh bạ từ đầu vào tiêu chuẩn"
 
-#: builtin/check-mailmap.c:25
 #, c-format
 msgid "unable to parse contact: %s"
 msgstr "không thể phân tích danh bạ: “%s”"
 
-#: builtin/check-mailmap.c:48
 msgid "no contacts specified"
 msgstr "chưa chỉ ra danh bạ"
 
-#: builtin/checkout--worker.c:110
 msgid "git checkout--worker [<options>]"
 msgstr "git checkout--worker [<các tùy chọn>]"
 
-#: builtin/checkout--worker.c:118 builtin/checkout-index.c:235
-#: builtin/column.c:31 builtin/column.c:32 builtin/submodule--helper.c:1878
-#: builtin/submodule--helper.c:1881 builtin/submodule--helper.c:1889
-#: builtin/submodule--helper.c:2716 builtin/worktree.c:563
-#: builtin/worktree.c:808
 msgid "string"
 msgstr "chuỗi"
 
-#: builtin/checkout--worker.c:119 builtin/checkout-index.c:236
 msgid "when creating files, prepend <string>"
 msgstr "khi tạo các tập tin, nối thêm <chuỗi>"
 
-#: builtin/checkout-index.c:184
 msgid "git checkout-index [<options>] [--] [<file>...]"
 msgstr "git checkout-index [<các tùy chọn>] [--] [<tập-tin>…]"
 
-#: builtin/checkout-index.c:201
 msgid "stage should be between 1 and 3 or all"
 msgstr "stage nên giữa 1 và 3 hay all"
 
-#: builtin/checkout-index.c:219
 msgid "check out all files in the index"
 msgstr "lấy ra toàn bộ các tập tin trong bảng mục lục"
 
-#: builtin/checkout-index.c:221
 msgid "do not skip files with skip-worktree set"
 msgstr "đừng bỏ qua các tập tin với skip-worktree được đặt"
 
-#: builtin/checkout-index.c:222
 msgid "force overwrite of existing files"
 msgstr "ép buộc ghi đè lên tập tin đã sẵn có từ trước"
 
-#: builtin/checkout-index.c:224
 msgid "no warning for existing files and files not in index"
 msgstr ""
 "không cảnh báo cho những tập tin tồn tại và không có trong bảng mục lục"
 
-#: builtin/checkout-index.c:226
 msgid "don't checkout new files"
 msgstr "không checkout các tập tin mới"
 
-#: builtin/checkout-index.c:228
 msgid "update stat information in the index file"
 msgstr "cập nhật thông tin thống kê trong tập tin lưu bảng mục lục mới"
 
-#: builtin/checkout-index.c:232
 msgid "read list of paths from the standard input"
 msgstr "đọc danh sách đường dẫn từ đầu vào tiêu chuẩn"
 
-#: builtin/checkout-index.c:234
 msgid "write the content to temporary files"
 msgstr "ghi nội dung vào tập tin tạm"
 
-#: builtin/checkout-index.c:238
 msgid "copy out the files from named stage"
 msgstr "sao chép ra các tập tin từ bệ phóng có tên"
 
-#: builtin/checkout.c:34
 msgid "git checkout [<options>] <branch>"
 msgstr "git checkout [<các tùy chọn>] <nhánh>"
 
-#: builtin/checkout.c:35
 msgid "git checkout [<options>] [<branch>] -- <file>..."
 msgstr "git checkout [<các tùy chọn>] [<nhánh>] -- <tập-tin>…"
 
-#: builtin/checkout.c:40
 msgid "git switch [<options>] [<branch>]"
 msgstr "git switch [<các tùy chọn>] [<nhánh>]"
 
-#: builtin/checkout.c:45
 msgid "git restore [<options>] [--source=<branch>] <file>..."
 msgstr "git restore [<các tùy chọn>] [--source=<nhánh>] <tập tin>…"
 
-#: builtin/checkout.c:199 builtin/checkout.c:238
 #, c-format
 msgid "path '%s' does not have our version"
 msgstr "đường dẫn “%s” không có các phiên bản của chúng ta"
 
-#: builtin/checkout.c:201 builtin/checkout.c:240
 #, c-format
 msgid "path '%s' does not have their version"
 msgstr "đường dẫn “%s” không có các phiên bản của chúng"
 
-#: builtin/checkout.c:217
 #, c-format
 msgid "path '%s' does not have all necessary versions"
 msgstr "đường dẫn “%s” không có tất cả các phiên bản cần thiết"
 
-#: builtin/checkout.c:271
 #, c-format
 msgid "path '%s' does not have necessary versions"
 msgstr "đường dẫn “%s” không có các phiên bản cần thiết"
 
-#: builtin/checkout.c:291
 #, c-format
 msgid "path '%s': cannot merge"
 msgstr "đường dẫn “%s”: không thể hòa trộn"
 
-#: builtin/checkout.c:307
 #, c-format
 msgid "Unable to add merge result for '%s'"
 msgstr "Không thể thêm kết quả hòa trộn cho “%s”"
 
-#: builtin/checkout.c:424
 #, c-format
 msgid "Recreated %d merge conflict"
 msgid_plural "Recreated %d merge conflicts"
 msgstr[0] "Đã tạo lại %d xung đột hòa trộn"
 
-#: builtin/checkout.c:429
 #, c-format
 msgid "Updated %d path from %s"
 msgid_plural "Updated %d paths from %s"
 msgstr[0] "Đã cập nhật đường dẫn %d từ %s"
 
-#: builtin/checkout.c:436
 #, c-format
 msgid "Updated %d path from the index"
 msgid_plural "Updated %d paths from the index"
 msgstr[0] "Đã cập nhật đường dẫn %d từ mục lục"
 
-#: builtin/checkout.c:459 builtin/checkout.c:462 builtin/checkout.c:465
-#: builtin/checkout.c:469
 #, c-format
 msgid "'%s' cannot be used with updating paths"
 msgstr "không được dùng “%s” với các đường dẫn cập nhật"
 
-#: builtin/checkout.c:479
 #, c-format
 msgid "Cannot update paths and switch to branch '%s' at the same time."
 msgstr ""
 "Không thể cập nhật các đường dẫn và chuyển đến nhánh “%s” cùng một lúc."
 
-#: builtin/checkout.c:483
 #, c-format
 msgid "neither '%s' or '%s' is specified"
 msgstr "không chỉ định “%s” cũng không “%s”"
 
-#: builtin/checkout.c:487
 #, c-format
 msgid "'%s' must be used when '%s' is not specified"
 msgstr "phải có “%s” khi không chỉ định “%s”"
 
-#: builtin/checkout.c:492 builtin/checkout.c:497
 #, c-format
 msgid "'%s' or '%s' cannot be used with %s"
 msgstr "“%s” hay “%s” không thể được sử dụng với %s"
 
-#: builtin/checkout.c:571 builtin/checkout.c:578
 #, c-format
 msgid "path '%s' is unmerged"
 msgstr "đường dẫn “%s” không được hòa trộn"
 
-#: builtin/checkout.c:753
 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:809
 #, c-format
 msgid ""
 "cannot continue with staged changes in the following files:\n"
@@ -12880,50 +3496,40 @@ msgstr ""
 "sau:\n"
 "%s"
 
-#: builtin/checkout.c:902
 #, 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:947
 msgid "HEAD is now at"
 msgstr "HEAD hiện giờ tại"
 
-#: builtin/checkout.c:951 builtin/clone.c:615 t/helper/test-fast-rebase.c:203
 msgid "unable to update HEAD"
 msgstr "không thể cập nhật HEAD"
 
-#: builtin/checkout.c:955
 #, c-format
 msgid "Reset branch '%s'\n"
 msgstr "Đặt lại nhánh “%s”\n"
 
-#: builtin/checkout.c:958
 #, c-format
 msgid "Already on '%s'\n"
 msgstr "Đã sẵn sàng trên “%s”\n"
 
-#: builtin/checkout.c:962
 #, 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:964 builtin/checkout.c:1398
 #, c-format
 msgid "Switched to a new branch '%s'\n"
 msgstr "Đã chuyển đến nhánh mới “%s”\n"
 
-#: builtin/checkout.c:966
 #, c-format
 msgid "Switched to branch '%s'\n"
 msgstr "Đã chuyển đến nhánh “%s”\n"
 
-#: builtin/checkout.c:1017
 #, c-format
 msgid " ... and %d more.\n"
 msgstr " … và nhiều hơn %d.\n"
 
-#: builtin/checkout.c:1023
 #, c-format
 msgid ""
 "Warning: you are leaving %d commit behind, not connected to\n"
@@ -12942,7 +3548,6 @@ msgstr[0] ""
 "\n"
 "%s\n"
 
-#: builtin/checkout.c:1042
 #, c-format
 msgid ""
 "If you want to keep it by creating a new branch, this may be a good time\n"
@@ -12963,19 +3568,15 @@ msgstr[0] ""
 " git branch <tên_nhánh_mới> %s\n"
 "\n"
 
-#: builtin/checkout.c:1077
 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:1081
 msgid "Previous HEAD position was"
 msgstr "Vị trí trước kia của HEAD là"
 
-#: builtin/checkout.c:1124 builtin/checkout.c:1393
 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:1206
 #, c-format
 msgid ""
 "'%s' could be both a local file and a tracking branch.\n"
@@ -12984,7 +3585,6 @@ msgstr ""
 "“%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:1213
 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"
@@ -13004,58 +3604,47 @@ msgstr ""
 "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:1223
 #, 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:1289
 msgid "only one reference expected"
 msgstr "chỉ cần một tham chiếu"
 
-#: builtin/checkout.c:1306
 #, 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:1352 builtin/worktree.c:338 builtin/worktree.c:508
 #, c-format
 msgid "invalid reference: %s"
 msgstr "tham chiếu không hợp lệ: %s"
 
-#: builtin/checkout.c:1365 builtin/checkout.c:1744
 #, 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:1413
 #, 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:1415
 #, 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:1417 builtin/checkout.c:1426
 #, 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:1420
 #, 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:1429
 msgid ""
 "If you want to detach HEAD at the commit, try again with the --detach option."
 msgstr ""
 "Nếu bạn muốn tách rời HEAD ở lần chuyển giao, hay thử lại với tùy chọn --"
 "detach."
 
-#: builtin/checkout.c:1442
 msgid ""
 "cannot switch branch while merging\n"
 "Consider \"git merge --quit\" or \"git worktree add\"."
@@ -13063,7 +3652,6 @@ msgstr ""
 "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:1446
 msgid ""
 "cannot switch branch in the middle of an am session\n"
 "Consider \"git am --quit\" or \"git worktree add\"."
@@ -13071,7 +3659,6 @@ msgstr ""
 "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:1450
 msgid ""
 "cannot switch branch while rebasing\n"
 "Consider \"git rebase --quit\" or \"git worktree add\"."
@@ -13079,7 +3666,6 @@ msgstr ""
 "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:1454
 msgid ""
 "cannot switch branch while cherry-picking\n"
 "Consider \"git cherry-pick --quit\" or \"git worktree add\"."
@@ -13087,7 +3673,6 @@ msgstr ""
 "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:1458
 msgid ""
 "cannot switch branch while reverting\n"
 "Consider \"git revert --quit\" or \"git worktree add\"."
@@ -13095,127 +3680,99 @@ msgstr ""
 "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:1462
 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:1469
 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:1472 builtin/checkout.c:1476 builtin/checkout.c:1480
 #, 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:1484 builtin/checkout.c:1487 builtin/checkout.c:1490
-#: builtin/checkout.c:1495 builtin/checkout.c:1500
 #, c-format
 msgid "'%s' cannot be used with '%s'"
 msgstr "“%s” không thể được dùng với “%s”"
 
-#: builtin/checkout.c:1497
 #, c-format
 msgid "'%s' cannot take <start-point>"
 msgstr "“%s” không thể nhận <điểm-đầu>"
 
-#: builtin/checkout.c:1505
 #, 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:1512
 msgid "missing branch or commit argument"
 msgstr "thiếu tham số là nhánh hoặc lần chuyển giao"
 
-#: builtin/checkout.c:1555
 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:1556 builtin/log.c:1844 parse-options.h:354
 msgid "style"
 msgstr "kiểu"
 
-#: builtin/checkout.c:1557
 msgid "conflict style (merge, diff3, or zdiff3)"
 msgstr "xung đột kiểu (hòa trộn, diff3 hoặc zdiff3)"
 
-#: builtin/checkout.c:1569 builtin/worktree.c:560
 msgid "detach HEAD at named commit"
 msgstr "rời bỏ HEAD tại lần chuyển giao theo tên"
 
-#: builtin/checkout.c:1574
 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:1576
 msgid "new-branch"
 msgstr "nhánh-mới"
 
-#: builtin/checkout.c:1576
 msgid "new unparented branch"
 msgstr "nhánh không cha mới"
 
-#: builtin/checkout.c:1578 builtin/merge.c:305
 msgid "update ignored files (default)"
 msgstr "cập nhật các tập tin bị bỏ qua (mặc định)"
 
-#: builtin/checkout.c:1581
 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:1594
 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:1597
 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:1601
 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:1659
 #, c-format
 msgid "options '-%c', '-%c', and '%s' cannot be used together"
 msgstr "tùy chọn '-%c', '-%c' và '%s' không thể dùng cùng nhau"
 
-#: builtin/checkout.c:1700
 msgid "--track needs a branch name"
 msgstr "--track cần tên một nhánh"
 
-#: builtin/checkout.c:1705
 #, c-format
 msgid "missing branch name; try -%c"
 msgstr "thiếu tên nhánh; hãy thử -%c"
 
-#: builtin/checkout.c:1737
 #, c-format
 msgid "could not resolve %s"
 msgstr "không thể phân giải “%s”"
 
-#: builtin/checkout.c:1753
 msgid "invalid path specification"
 msgstr "đường dẫn đã cho không hợp lệ"
 
-#: builtin/checkout.c:1760
 #, 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:1764
 #, 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:1789
 msgid ""
 "git checkout: --ours/--theirs, --force and --merge are incompatible when\n"
 "checking out of the index."
@@ -13223,115 +3780,90 @@ msgstr ""
 "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:1794
 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:1819 builtin/checkout.c:1821 builtin/checkout.c:1873
-#: builtin/checkout.c:1875 builtin/clone.c:130 builtin/remote.c:171
-#: builtin/remote.c:173 builtin/submodule--helper.c:3038
-#: builtin/submodule--helper.c:3371 builtin/worktree.c:556
-#: builtin/worktree.c:558
 msgid "branch"
 msgstr "nhánh"
 
-#: builtin/checkout.c:1820
 msgid "create and checkout a new branch"
 msgstr "tạo và checkout một nhánh mới"
 
-#: builtin/checkout.c:1822
 msgid "create/reset and checkout a branch"
 msgstr "tạo/đặt_lại và checkout một nhánh"
 
-#: builtin/checkout.c:1823
 msgid "create reflog for new branch"
 msgstr "tạo reflog cho nhánh mới"
 
-#: builtin/checkout.c:1825
 msgid "second guess 'git checkout <no-such-branch>' (default)"
 msgstr "gợi ý thứ hai “git checkout <không-nhánh-nào-như-vậy>” (mặc định)"
 
-#: builtin/checkout.c:1826
 msgid "use overlay mode (default)"
 msgstr "dùng chế độ che phủ (mặc định)"
 
-#: builtin/checkout.c:1874
 msgid "create and switch to a new branch"
 msgstr "tạo và chuyển đến một nhánh mới"
 
-#: builtin/checkout.c:1876
 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:1878
 msgid "second guess 'git switch <no-such-branch>'"
 msgstr "gợi ý thứ hai \"git switch <không-nhánh-nào-như-vậy>\""
 
-#: builtin/checkout.c:1880
 msgid "throw away local modifications"
 msgstr "vứt bỏ các sửa đổi địa phương"
 
-#: builtin/checkout.c:1916
 msgid "which tree-ish to checkout from"
 msgstr "lấy ra từ tree-ish nào"
 
-#: builtin/checkout.c:1918
 msgid "restore the index"
 msgstr "phục hồi bảng mục lục"
 
-#: builtin/checkout.c:1920
 msgid "restore the working tree (default)"
 msgstr "phục hồi cây làm việc (mặc định)"
 
-#: builtin/checkout.c:1922
 msgid "ignore unmerged entries"
 msgstr "bỏ qua những thứ chưa hòa trộn: %s"
 
-#: builtin/checkout.c:1923
 msgid "use overlay mode"
 msgstr "dùng chế độ che phủ"
 
-#: builtin/clean.c:29
 msgid ""
 "git clean [-d] [-f] [-i] [-n] [-q] [-e <pattern>] [-x | -X] [--] <paths>..."
 msgstr ""
 "git clean [-d] [-f] [-i] [-n] [-q] [-e <mẫu>] [-x | -X] [--] </các/đường/"
 "dẫn>…"
 
-#: builtin/clean.c:33
 #, c-format
 msgid "Removing %s\n"
 msgstr "Đang gỡ bỏ %s\n"
 
-#: builtin/clean.c:34
 #, c-format
 msgid "Would remove %s\n"
 msgstr "Có thể gỡ bỏ %s\n"
 
-#: builtin/clean.c:35
 #, c-format
 msgid "Skipping repository %s\n"
 msgstr "Đang bỏ qua kho chứa %s\n"
 
-#: builtin/clean.c:36
 #, c-format
 msgid "Would skip repository %s\n"
 msgstr "Nên bỏ qua kho chứa %s\n"
 
-#: builtin/clean.c:38
+#, c-format
+msgid "failed to remove %s"
+msgstr "gặp lỗi khi gỡ bỏ %s"
+
 #, c-format
 msgid "could not lstat %s\n"
 msgstr "không thể lấy thông tin thống kê đầy đủ của %s\n"
 
-#: builtin/clean.c:39
 msgid "Refusing to remove current working directory\n"
 msgstr "Từ chối gỡ bỏ thư mục làm việc hiện tại\n"
 
-#: builtin/clean.c:40
 msgid "Would refuse to remove current working directory\n"
 msgstr "Nên từ chối gỡ bỏ thư mục làm việc hiện tại\n"
 
-#: builtin/clean.c:326 git-add--interactive.perl:593
 #, c-format
 msgid ""
 "Prompt help:\n"
@@ -13344,7 +3876,6 @@ msgstr ""
 "foo        - chọn mục trên cơ sở tiền tố duy nhất\n"
 "           - (để trống) không chọn gì cả\n"
 
-#: builtin/clean.c:330 git-add--interactive.perl:602
 #, c-format
 msgid ""
 "Prompt help:\n"
@@ -13365,33 +3896,26 @@ msgstr ""
 "*          - chọn tất\n"
 "           - (để trống) kết thúc việc chọn\n"
 
-#: builtin/clean.c:545 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:685
 #, c-format
 msgid "Input ignore patterns>> "
 msgstr "Mẫu để lọc các tập tin đầu vào cần lờ đi>> "
 
-#: builtin/clean.c:719
 #, c-format
 msgid "WARNING: Cannot find items matched by: %s"
 msgstr "CẢNH BÁO: Không tìm thấy các mục được khớp bởi: %s"
 
-#: builtin/clean.c:740
 msgid "Select items to delete"
 msgstr "Chọn mục muốn xóa"
 
 #. TRANSLATORS: Make sure to keep [y/N] as is
-#: builtin/clean.c:781
 #, c-format
 msgid "Remove %s [y/N]? "
 msgstr "Xóa bỏ “%s” [y/N]? "
 
-#: builtin/clean.c:812
 msgid ""
 "clean               - start cleaning\n"
 "filter by pattern   - exclude items from deletion\n"
@@ -13409,51 +3933,37 @@ msgstr ""
 "help                - hiển thị chính trợ giúp này\n"
 "?                   - trợ giúp dành cho chọn bằng cách nhắc"
 
-#: builtin/clean.c:848
 msgid "Would remove the following item:"
 msgid_plural "Would remove the following items:"
 msgstr[0] "Có muốn gỡ bỏ (các) mục sau đây không:"
 
-#: builtin/clean.c:864
 msgid "No more files to clean, exiting."
 msgstr "Không còn tập-tin nào để dọn dẹp, đang thoát ra."
 
-#: builtin/clean.c:926
 msgid "do not print names of files removed"
 msgstr "không hiển thị tên của các tập tin đã gỡ bỏ"
 
-#: builtin/clean.c:928
 msgid "force"
 msgstr "ép buộc"
 
-#: builtin/clean.c:929
 msgid "interactive cleaning"
 msgstr "dọn bằng kiểu tương tác"
 
-#: builtin/clean.c:931
 msgid "remove whole directories"
 msgstr "gỡ bỏ toàn bộ thư mục"
 
-#: builtin/clean.c:932 builtin/describe.c:565 builtin/describe.c:567
-#: builtin/grep.c:938 builtin/log.c:185 builtin/log.c:187
-#: builtin/ls-files.c:651 builtin/name-rev.c:585 builtin/name-rev.c:587
-#: builtin/show-ref.c:179
 msgid "pattern"
 msgstr "mẫu"
 
-#: builtin/clean.c:933
 msgid "add <pattern> to ignore rules"
 msgstr "thêm <mẫu> vào trong qui tắc bỏ qua"
 
-#: builtin/clean.c:934
 msgid "remove ignored files, too"
 msgstr "đồng thời gỡ bỏ cả các tập tin bị bỏ qua"
 
-#: builtin/clean.c:936
 msgid "remove only ignored files"
 msgstr "chỉ gỡ bỏ những tập tin bị bỏ qua"
 
-#: builtin/clean.c:951
 msgid ""
 "clean.requireForce set to true and neither -i, -n, nor -f given; refusing to "
 "clean"
@@ -13461,7 +3971,6 @@ msgstr ""
 "clean.requireForce được đặt thành true và không đưa ra tùy chọn -i, -n mà "
 "cũng không -f; từ chối lệnh dọn dẹp (clean)"
 
-#: builtin/clean.c:954
 msgid ""
 "clean.requireForce defaults to true and neither -i, -n, nor -f given; "
 "refusing to clean"
@@ -13469,218 +3978,164 @@ msgstr ""
 "clean.requireForce mặc định được đặt là true và không đưa ra tùy chọn -i, -n "
 "mà cũng không -f; từ chối lệnh dọn dẹp (clean)"
 
-#: builtin/clean.c:966
 msgid "-x and -X cannot be used together"
 msgstr "-x và -X không thể dùng cùng nhau"
 
-#: builtin/clone.c:47
 msgid "git clone [<options>] [--] <repo> [<dir>]"
 msgstr "git clone [<các tùy chọn>] [--] <kho> [<t.mục>]"
 
-#: builtin/clone.c:100
 msgid "don't clone shallow repository"
 msgstr "đừng nhân bản từ kho nông"
 
-#: builtin/clone.c:102
 msgid "don't create a checkout"
 msgstr "không tạo một checkout"
 
-#: builtin/clone.c:103 builtin/clone.c:105 builtin/init-db.c:542
 msgid "create a bare repository"
 msgstr "tạo kho thuần"
 
-#: builtin/clone.c:107
 msgid "create a mirror repository (implies bare)"
 msgstr "tạo kho bản sao (ý là kho thuần)"
 
-#: builtin/clone.c:109
 msgid "to clone from a local repository"
 msgstr "để nhân bản từ kho nội bộ"
 
-#: builtin/clone.c:111
 msgid "don't use local hardlinks, always copy"
 msgstr "không sử dụng liên kết cứng nội bộ, luôn sao chép"
 
-#: builtin/clone.c:113
 msgid "setup as shared repository"
 msgstr "cài đặt đây là kho chia sẻ"
 
-#: builtin/clone.c:115
 msgid "pathspec"
 msgstr "đặc-tả-đường-dẫn"
 
-#: builtin/clone.c:115
 msgid "initialize submodules in the clone"
 msgstr "khởi tạo mô-đun-con trong bản sao"
 
-#: builtin/clone.c:119
 msgid "number of submodules cloned in parallel"
 msgstr "số lượng mô-đun-con được nhân bản đồng thời"
 
-#: builtin/clone.c:120 builtin/init-db.c:539
 msgid "template-directory"
 msgstr "thư-mục-mẫu"
 
-#: builtin/clone.c:121 builtin/init-db.c:540
 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:123 builtin/clone.c:125 builtin/submodule--helper.c:1885
-#: builtin/submodule--helper.c:2719 builtin/submodule--helper.c:3378
 msgid "reference repository"
 msgstr "kho tham chiếu"
 
-#: builtin/clone.c:127 builtin/submodule--helper.c:1887
-#: builtin/submodule--helper.c:2721
 msgid "use --reference only while cloning"
 msgstr "chỉ dùng --reference khi nhân bản"
 
-#: builtin/clone.c:128 builtin/column.c:27 builtin/fmt-merge-msg.c:27
-#: builtin/init-db.c:550 builtin/merge-file.c:48 builtin/merge.c:290
-#: builtin/pack-objects.c:3967 builtin/repack.c:669
-#: builtin/submodule--helper.c:3380 t/helper/test-simple-ipc.c:595
-#: t/helper/test-simple-ipc.c:597
 msgid "name"
 msgstr "tên"
 
-#: builtin/clone.c:129
 msgid "use <name> instead of 'origin' to track upstream"
 msgstr "dùng <tên> thay cho “origin” để theo dõi thượng nguồn"
 
-#: builtin/clone.c:131
 msgid "checkout <branch> instead of the remote's HEAD"
 msgstr "lấy ra <nhánh> thay cho HEAD của máy chủ"
 
-#: builtin/clone.c:133
 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:134 builtin/fetch.c:182 builtin/grep.c:877
-#: builtin/pull.c:212
 msgid "depth"
 msgstr "độ-sâu"
 
-#: builtin/clone.c:135
 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:136 builtin/fetch.c:184 builtin/pack-objects.c:3956
-#: builtin/pull.c:215
 msgid "time"
 msgstr "thời-gian"
 
-#: builtin/clone.c:137
 msgid "create a shallow clone since a specific time"
 msgstr "tạo bản sao không đầy đủ từ thời điểm đã cho"
 
-#: builtin/clone.c:138 builtin/fetch.c:186 builtin/fetch.c:212
-#: builtin/pull.c:218 builtin/pull.c:243 builtin/rebase.c:1050
 msgid "revision"
 msgstr "điểm xét duyệt"
 
-#: builtin/clone.c:139 builtin/fetch.c:187 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:141 builtin/submodule--helper.c:1897
-#: builtin/submodule--helper.c:2735
 msgid "clone only one branch, HEAD or --branch"
 msgstr "chỉ nhân bản một nhánh, HEAD hoặc --branch"
 
-#: builtin/clone.c:143
 msgid "don't clone any tags, and make later fetches not to follow them"
 msgstr ""
 "đứng có nhân bản bất kỳ nhánh nào, và làm cho những lần lấy về sau không "
 "theo chúng nữa"
 
-#: builtin/clone.c:145
 msgid "any cloned submodules will be shallow"
 msgstr "mọi mô-đun-con nhân bản sẽ là shallow (nông)"
 
-#: builtin/clone.c:146 builtin/init-db.c:548
 msgid "gitdir"
 msgstr "gitdir"
 
-#: builtin/clone.c:147 builtin/init-db.c:549
 msgid "separate git dir from working tree"
 msgstr "không dùng chung thư mục dành riêng cho git và thư mục làm việc"
 
-#: builtin/clone.c:148
 msgid "key=value"
 msgstr "khóa=giá_trị"
 
-#: builtin/clone.c:149
 msgid "set config inside the new repository"
 msgstr "đặt cấu hình bên trong một kho chứa mới"
 
-#: builtin/clone.c:151 builtin/fetch.c:207 builtin/ls-remote.c:77
-#: 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:151 builtin/fetch.c:207 builtin/ls-remote.c:77
-#: 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:152 builtin/fetch.c:208 builtin/pull.c:238
-#: builtin/push.c:576
 msgid "use IPv4 addresses only"
 msgstr "chỉ dùng địa chỉ IPv4"
 
-#: builtin/clone.c:154 builtin/fetch.c:210 builtin/pull.c:241
-#: builtin/push.c:578
 msgid "use IPv6 addresses only"
 msgstr "chỉ dùng địa chỉ IPv6"
 
-#: builtin/clone.c:158
 msgid "apply partial clone filters to submodules"
 msgstr "áp dụng các bộ lọc nhân bản một phần cho mô-đun-con"
 
-#: builtin/clone.c:160
 msgid "any cloned submodules will use their remote-tracking branch"
 msgstr "mọi mô-đun-con nhân bản sẽ dung nhánh theo dõi máy chủ của chúng"
 
-#: builtin/clone.c:162
 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:237
 #, 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:310
+#, c-format
+msgid "failed to stat '%s'"
+msgstr "gặp lỗi khi lấy thống kê về “%s”"
+
 #, 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:328
 #, 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:359
+#, c-format
+msgid "failed to unlink '%s'"
+msgstr "gặp lỗi khi bỏ liên kết (unlink) “%s”"
+
 #, 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:363
 #, 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:368
 #, c-format
 msgid "failed to iterate over '%s'"
 msgstr "gặp lỗi khi lặp qua “%s”"
 
-#: builtin/clone.c:395
 #, c-format
 msgid "done.\n"
 msgstr "hoàn tất.\n"
 
-#: builtin/clone.c:409
 msgid ""
 "Clone succeeded, but checkout failed.\n"
 "You can inspect what was checked out with 'git status'\n"
@@ -13690,101 +4145,82 @@ msgstr ""
 "Bạn kiểm tra kỹ xem cái gì được lấy ra bằng lệnh “git status”\n"
 "và thử lấy ra với lệnh “git restore --source=HEAD :/”\n"
 
-#: builtin/clone.c:486
 #, 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:603
+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"
+
 #, c-format
 msgid "unable to update %s"
 msgstr "không thể cập nhật %s"
 
-#: builtin/clone.c:651
 msgid "failed to initialize sparse-checkout"
 msgstr "gặp lỗi khi khởi tạo sparse-checkout"
 
-#: builtin/clone.c:674
 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:709
 msgid "unable to checkout working tree"
 msgstr "không thể lấy ra (checkout) cây làm việc"
 
-#: builtin/clone.c:793
 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:856
 msgid "cannot repack to clean up"
 msgstr "không thể đóng gói để dọn dẹp"
 
-#: builtin/clone.c:858
 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:901
 msgid "Too many arguments."
 msgstr "Có quá nhiều đối số."
 
-#: builtin/clone.c:905 contrib/scalar/scalar.c:413
 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:918
 #, c-format
 msgid "options '%s' and '%s %s' cannot be used together"
 msgstr "tùy chọn '%s', và '%s %s' không thể dùng cùng nhau"
 
-#: builtin/clone.c:935
 #, c-format
 msgid "repository '%s' does not exist"
 msgstr "kho chứa “%s” chưa tồn tại"
 
-#: builtin/clone.c:939 builtin/fetch.c:2176
 #, 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:949
 #, 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:955
 #, 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:969
 #, 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:984 builtin/clone.c:1005 builtin/difftool.c:256
-#: builtin/log.c:2037 builtin/worktree.c:350 builtin/worktree.c:382
 #, 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:989
 #, 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:1009
 #, 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:1011
 #, c-format
 msgid "Cloning into '%s'...\n"
 msgstr "Đang nhân bản thành “%s”…\n"
 
-#: builtin/clone.c:1040
 msgid ""
 "clone --recursive is not compatible with both --reference and --reference-if-"
 "able"
@@ -13792,97 +4228,79 @@ msgstr ""
 "nhân bản --recursive không tương thích với cả hai --reference và --reference-"
 "if-able"
 
-#: builtin/clone.c:1116 builtin/remote.c:201 builtin/remote.c:721
 #, 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:1157
 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:1159
 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:1161
 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:1163
 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:1168
+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."
+
 msgid "source repository is shallow, ignoring --local"
 msgstr "kho nguồn là nông, nên bỏ qua --local"
 
-#: builtin/clone.c:1173
 msgid "--local is ignored"
 msgstr "--local bị lờ đi"
 
-#: builtin/clone.c:1185
 msgid "cannot clone from filtered bundle"
 msgstr "không thể nhân bản từ bundle được lọc ra"
 
-#: builtin/clone.c:1265 builtin/clone.c:1324
 msgid "remote transport reported error"
 msgstr "vận chuyển máy mạng đã báo cáo lỗi"
 
-#: builtin/clone.c:1277 builtin/clone.c:1289
 #, 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:1292
 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."
 
-#: builtin/column.c:10
 msgid "git column [<options>]"
 msgstr "git column [<các tùy chọn>]"
 
-#: builtin/column.c:27
 msgid "lookup config vars"
 msgstr "tìm kiếm biến cấu hình"
 
-#: builtin/column.c:28 builtin/column.c:29
 msgid "layout to use"
 msgstr "bố cục để dùng"
 
-#: builtin/column.c:30
 msgid "maximum width"
 msgstr "độ rộng tối đa"
 
-#: builtin/column.c:31
 msgid "padding space on left border"
 msgstr "chèn thêm khoảng trống vào bên trái"
 
-#: builtin/column.c:32
 msgid "padding space on right border"
 msgstr "chèn thêm khoảng trắng vào bên phải"
 
-#: builtin/column.c:33
 msgid "padding space between columns"
 msgstr "chèn thêm khoảng trắng giữa các cột"
 
-#: builtin/column.c:51
 msgid "--command must be the first argument"
 msgstr "--command phải là đối số đầu tiên"
 
-#: 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:16
 msgid ""
 "git commit-graph write [--object-dir <objdir>] [--append] [--"
 "split[=<strategy>]] [--reachable|--stdin-packs|--stdin-commits] [--changed-"
@@ -13893,101 +4311,84 @@ msgstr ""
 "paths] [--[no-]max-new-filters <n>] [--[no-]progress] <các tùy chọn chia "
 "tách>"
 
-#: builtin/commit-graph.c:51 builtin/fetch.c:196 builtin/log.c:1813
 msgid "dir"
 msgstr "tmục"
 
-#: 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: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:100
 #, c-format
 msgid "Could not open commit-graph '%s'"
 msgstr "Không thể mở đồ thị chuyển giao “%s”"
 
-#: 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: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:155
 #, c-format
 msgid "invalid object: %s"
 msgstr "đối tượng không hợp lệ: %s"
 
-#: builtin/commit-graph.c:205
+#, c-format
+msgid "option `%s' expects a numerical value"
+msgstr "tùy chọn “%s” cần một giá trị bằng số"
+
 msgid "start walk at all refs"
 msgstr "bắt đầu di chuyển tại mọi tham chiếu"
 
-#: 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: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: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: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: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: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: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: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: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: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: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:259
 #, 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 "
 "<file>)...] <tree>"
@@ -13995,70 +4396,52 @@ msgstr ""
 "git commit-tree [(-p <cha>)…] [-S[<keyid>]] [(-m <ghi chú>)…] [(-F <tập tin>)"
 "…] <cây>"
 
-#: builtin/commit-tree.c:31
 #, c-format
 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:134 builtin/log.c:590
 #, 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: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: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:109
 msgid "parent"
 msgstr "cha-mẹ"
 
-#: 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:112 builtin/commit.c:1626 builtin/merge.c:284
-#: builtin/notes.c:407 builtin/notes.c:573 builtin/stash.c:1666
-#: builtin/tag.c:455
 msgid "message"
 msgstr "chú thích"
 
-#: 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: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:119 builtin/commit.c:1643 builtin/merge.c:303
-#: 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:131
 msgid "must give exactly one tree"
 msgstr "phải đưa ra chính xác một cây"
 
-#: 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:43
 msgid "git commit [<options>] [--] <pathspec>..."
 msgstr "git commit [<các tùy chọn>] [--] <pathspec>…"
 
-#: builtin/commit.c:48
 msgid "git status [<options>] [--] <pathspec>..."
 msgstr "git status [<các tùy chọn>] [--] <pathspec>…"
 
-#: builtin/commit.c:53
 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"
@@ -14071,7 +4454,6 @@ msgstr ""
 "hoặc là bạn gỡ bỏ các lần chuyển giao một cách hoàn toàn bằng lệnh:\n"
 "\"git reset HEAD^\".\n"
 
-#: builtin/commit.c:58
 msgid ""
 "The previous cherry-pick is now empty, possibly due to conflict resolution.\n"
 "If you wish to commit it anyway, use:\n"
@@ -14086,15 +4468,12 @@ msgstr ""
 "    git commit --allow-empty\n"
 "\n"
 
-#: builtin/commit.c:65
 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:68
 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:71
 msgid ""
 "and then use:\n"
 "\n"
@@ -14116,72 +4495,60 @@ msgstr ""
 "    git cherry-pick --skip\n"
 "\n"
 
-#: builtin/commit.c:326
 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:376
 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:388
 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:397
 msgid "interactive add failed"
 msgstr "gặp lỗi khi thêm bằng cách tương"
 
-#: builtin/commit.c:412
 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:414
 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:439 builtin/commit.c:462 builtin/commit.c:510
 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:491
 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:493
 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:495
 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:503
 msgid "cannot read the index"
 msgstr "không đọc được bảng mục lục"
 
-#: builtin/commit.c:522
 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:620
 #, 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:622
 #, 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:641
 msgid "malformed --author parameter"
 msgstr "đối số cho --author bị dị hình"
 
-#: builtin/commit.c:694
+#, c-format
+msgid "invalid date format: %s"
+msgstr "ngày tháng không hợp lệ: %s"
+
 msgid ""
 "unable to select a comment character that is not used\n"
 "in the current commit message"
@@ -14189,43 +4556,38 @@ msgstr ""
 "không thể chọn một ký tự ghi chú cái mà không được dùng\n"
 "trong phần ghi chú hiện tại"
 
-#: builtin/commit.c:750 builtin/commit.c:784 builtin/commit.c:1170
 #, 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:762 builtin/shortlog.c:417
 #, 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:764
 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:768
 #, c-format
 msgid "could not read log file '%s'"
 msgstr "không đọc được tệp nhật ký “%s”"
 
-#: builtin/commit.c:805
 #, c-format
 msgid "options '%s' and '%s:%s' cannot be used together"
 msgstr "tùy chọn '%s', và '%s:%s' không thể dùng cùng nhau"
 
-#: builtin/commit.c:817 builtin/commit.c:833
 msgid "could not read SQUASH_MSG"
 msgstr "không thể đọc SQUASH_MSG"
 
-#: builtin/commit.c:824
 msgid "could not read MERGE_MSG"
 msgstr "không thể đọc MERGE_MSG"
 
-#: builtin/commit.c:884
+#, c-format
+msgid "could not open '%s'"
+msgstr "không thể mở “%s”"
+
 msgid "could not write commit template"
 msgstr "không thể ghi mẫu chuyển giao"
 
-#: builtin/commit.c:897
 #, c-format
 msgid ""
 "Please enter the commit message for your changes. Lines starting\n"
@@ -14234,7 +4596,6 @@ msgstr ""
 "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:899
 #, c-format
 msgid ""
 "Please enter the commit message for your changes. Lines starting\n"
@@ -14245,7 +4606,6 @@ msgstr ""
 "bắt đầu bằng “%c” sẽ được bỏ qua, nếu phần chú thích rỗng sẽ hủy bỏ lần "
 "chuyển giao.\n"
 
-#: builtin/commit.c:903
 #, c-format
 msgid ""
 "Please enter the commit message for your changes. Lines starting\n"
@@ -14255,7 +4615,6 @@ msgstr ""
 "đượ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:907
 #, c-format
 msgid ""
 "Please enter the commit message for your changes. Lines starting\n"
@@ -14267,7 +4626,6 @@ msgstr ""
 "bắt đầu bằng “%c” sẽ được bỏ qua; bạn có thể xóa chúng đi nếu muốn thế.\n"
 "Phần chú thích này nếu trống rỗng sẽ hủy bỏ lần chuyển giao.\n"
 
-#: builtin/commit.c:919
 msgid ""
 "\n"
 "It looks like you may be committing a merge.\n"
@@ -14281,7 +4639,6 @@ msgstr ""
 "\tgit update-ref -d MERGE_HEAD\n"
 "và thử lại.\n"
 
-#: builtin/commit.c:924
 msgid ""
 "\n"
 "It looks like you may be committing a cherry-pick.\n"
@@ -14295,158 +4652,123 @@ msgstr ""
 "\tgit update-ref -d CHERRY_PICK_HEAD\n"
 "và thử lại.\n"
 
-#: builtin/commit.c:951
 #, c-format
 msgid "%sAuthor:    %.*s <%.*s>"
 msgstr "%sTác giả:           %.*s <%.*s>"
 
-#: builtin/commit.c:959
 #, c-format
 msgid "%sDate:      %s"
 msgstr "%sNgày tháng:        %s"
 
-#: builtin/commit.c:966
 #, c-format
 msgid "%sCommitter: %.*s <%.*s>"
 msgstr "%sNgười chuyển giao: %.*s <%.*s>"
 
-#: builtin/commit.c:984
 msgid "Cannot read index"
 msgstr "Không đọc được bảng mục lục"
 
-#: builtin/commit.c:1029
 msgid "unable to pass trailers to --trailers"
 msgstr "không thể chuyển phần đuôi cho “--trailers”"
 
-#: builtin/commit.c:1069
 msgid "Error building trees"
 msgstr "Gặp lỗi khi xây dựng cây"
 
-#: builtin/commit.c:1083 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:1128
 #, 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:1142
 #, c-format
 msgid "Invalid ignored mode '%s'"
 msgstr "Chế độ bỏ qua không hợp lệ “%s”"
 
-#: builtin/commit.c:1160 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:1231
 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:1233
 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:1236
 #, c-format
 msgid "reword option of '%s' and path '%s' cannot be used together"
 msgstr ""
 "không thể tổ hợp tùy chọn \"reword\" của '%s' với đường dẫn '%s' cùng nhau"
 
-#: builtin/commit.c:1238
 #, c-format
 msgid "reword option of '%s' and '%s' cannot be used together"
 msgstr "không thể tổ hợp tùy chọn \"reword\" của '%s' với '%s' cùng nhau"
 
-#: builtin/commit.c:1263
 msgid "You have nothing to amend."
 msgstr "Không có gì để mà “tu bổ” cả."
 
-#: builtin/commit.c:1266
 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:1268
 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:1270
 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:1290
 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:1337
 #, c-format
 msgid "unknown option: --fixup=%s:%s"
 msgstr "không hiểu tùy chọn: --fixup=%s:%s"
 
-#: 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: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:1487 builtin/commit.c:1656
 msgid "show branch information"
 msgstr "hiển thị thông tin nhánh"
 
-#: builtin/commit.c:1489
 msgid "show stash information"
 msgstr "hiển thị thông tin về tạm cất"
 
-#: 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:1493
 msgid "version"
 msgstr "phiên bản"
 
-#: builtin/commit.c:1493 builtin/commit.c:1660 builtin/push.c:551
-#: builtin/worktree.c:765
 msgid "machine-readable output"
 msgstr "kết xuất dạng máy-có-thể-đọc"
 
-#: 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: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:1501 builtin/commit.c:1505 builtin/commit.c:1668
-#: builtin/fast-export.c:1172 builtin/fast-export.c:1175
-#: builtin/fast-export.c:1178 builtin/rebase.c:1139 parse-options.h:368
 msgid "mode"
 msgstr "chế độ"
 
-#: 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:1506
 msgid ""
 "show ignored files, optional modes: traditional, matching, no. (Default: "
 "traditional)"
@@ -14454,11 +4776,9 @@ msgstr ""
 "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:1508 parse-options.h:197
 msgid "when"
 msgstr "khi"
 
-#: builtin/commit.c:1509
 msgid ""
 "ignore changes to submodules, optional when: all, dirty, untracked. "
 "(Default: all)"
@@ -14466,199 +4786,156 @@ msgstr ""
 "bỏ qua các thay đổi trong mô-đun-con, tùy chọn khi: all, dirty, untracked. "
 "(Mặc định: all)"
 
-#: builtin/commit.c: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:1512
 msgid "do not detect renames"
 msgstr "không dò tìm các tên thay đổi"
 
-#: 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: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: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: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:1622
 msgid "Commit message options"
 msgstr "Các tùy chọn ghi chú commit"
 
-#: builtin/commit.c:1623 builtin/merge.c:288 builtin/tag.c:457
 msgid "read message from file"
 msgstr "đọc chú thích từ tập tin"
 
-#: builtin/commit.c:1624
 msgid "author"
 msgstr "tác giả"
 
-#: builtin/commit.c:1624
 msgid "override author for commit"
 msgstr "ghi đè tác giả cho commit"
 
-#: builtin/commit.c:1625 builtin/gc.c:551
 msgid "date"
 msgstr "ngày tháng"
 
-#: builtin/commit.c:1625
 msgid "override date for commit"
 msgstr "ghi đè ngày tháng cho lần chuyển giao"
 
-#: builtin/commit.c:1627 builtin/commit.c:1628 builtin/commit.c:1634
-#: parse-options.h:360 ref-filter.h:89
 msgid "commit"
 msgstr "lần_chuyển_giao"
 
-#: 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: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:1633
 msgid "[(amend|reword):]commit"
 msgstr "[(amend|reword):]commit"
 
-#: 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: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: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:1636 builtin/interpret-trailers.c:111
 msgid "trailer"
 msgstr "bộ dò vết"
 
-#: builtin/commit.c:1636
 msgid "add custom trailer(s)"
 msgstr "thêm đuôi tự chọn"
 
-#: builtin/commit.c:1637 builtin/log.c:1788 builtin/merge.c:306
-#: 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:1638
 msgid "use specified template file"
 msgstr "sử dụng tập tin mẫu đã cho"
 
-#: builtin/commit.c:1639
 msgid "force edit of commit"
 msgstr "ép buộc sửa lần commit"
 
-#: 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:1646
 msgid "Commit contents options"
 msgstr "Các tùy nội dung ghi chú commit"
 
-#: 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: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:1649
 msgid "interactively add files"
 msgstr "thêm các tập-tin bằng tương tác"
 
-#: builtin/commit.c:1650
 msgid "interactively add changes"
 msgstr "thêm các thay đổi bằng tương tác"
 
-#: builtin/commit.c:1651
 msgid "commit only specified files"
 msgstr "chỉ chuyển giao các tập tin đã chỉ ra"
 
-#: 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:1653
 msgid "show what would be committed"
 msgstr "hiển thị xem cái gì có thể được chuyển giao"
 
-#: builtin/commit.c:1666
 msgid "amend previous commit"
 msgstr "“tu bổ” (amend) lần commit trước"
 
-#: builtin/commit.c:1667
 msgid "bypass post-rewrite hook"
 msgstr "vòng qua móc (hook) post-rewrite"
 
-#: 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: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:1752
+msgid "could not parse HEAD commit"
+msgstr "không thể phân tích commit (lần chuyển giao) HEAD"
+
 #, c-format
 msgid "Corrupt MERGE_HEAD file (%s)"
 msgstr "Tập tin MERGE_HEAD sai hỏng (%s)"
 
-#: builtin/commit.c:1759
 msgid "could not read MERGE_MODE"
 msgstr "không thể đọc MERGE_MODE"
 
-#: 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: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: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: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:1839
 msgid ""
 "repository has been updated, but unable to write\n"
 "new_index file. Check that disk is not full and quota is\n"
@@ -14669,229 +4946,179 @@ msgstr ""
 "có bị đầy quá hay quota (hạn nghạch đĩa cứng) bị vượt quá,\n"
 "và sau đó \"git restore --staged :/\" để khắc phục."
 
-#: builtin/config.c:11
 msgid "git config [<options>]"
 msgstr "git config [<các tùy chọn>]"
 
-#: builtin/config.c:109 builtin/env--helper.c:27
 #, c-format
 msgid "unrecognized --type argument, %s"
 msgstr "đối số không được thừa nhận --type, %s"
 
-#: builtin/config.c:121
 msgid "only one type at a time"
 msgstr "chỉ một kiểu một lần"
 
-#: builtin/config.c:130
 msgid "Config file location"
 msgstr "Vị trí tập tin cấu hình"
 
-#: builtin/config.c:131
 msgid "use global config file"
 msgstr "dùng tập tin cấu hình toàn cục"
 
-#: builtin/config.c:132
 msgid "use system config file"
 msgstr "sử dụng tập tin cấu hình hệ thống"
 
-#: builtin/config.c:133
 msgid "use repository config file"
 msgstr "dùng tập tin cấu hình của kho"
 
-#: builtin/config.c:134
 msgid "use per-worktree config file"
 msgstr "dùng tập tin cấu hình per-worktree"
 
-#: builtin/config.c:135
 msgid "use given config file"
 msgstr "sử dụng tập tin cấu hình đã cho"
 
-#: builtin/config.c:136
 msgid "blob-id"
 msgstr "blob-id"
 
-#: builtin/config.c:136
 msgid "read config from given blob object"
 msgstr "đọc cấu hình từ đối tượng blob đã cho"
 
-#: builtin/config.c:137
 msgid "Action"
 msgstr "Hành động"
 
-#: builtin/config.c:138
 msgid "get value: name [value-pattern]"
 msgstr "lấy giá trị: tên [value-pattern]"
 
-#: builtin/config.c:139
 msgid "get all values: key [value-pattern]"
 msgstr "lấy tất cả giá trị: khóa [value-pattern]"
 
-#: builtin/config.c:140
 msgid "get values for regexp: name-regex [value-pattern]"
 msgstr "lấy giá trị cho regexp: name-regex [value-pattern]"
 
-#: builtin/config.c:141
 msgid "get value specific for the URL: section[.var] URL"
 msgstr "lấy đặc tả giá trị cho URL: phần[.biến] URL"
 
-#: builtin/config.c:142
 msgid "replace all matching variables: name value [value-pattern]"
 msgstr "thay thế tất cả các biến khớp mẫu: tên giá-trị [value-pattern]"
 
-#: builtin/config.c:143
 msgid "add a new variable: name value"
 msgstr "thêm biến mới: tên giá-trị"
 
-#: builtin/config.c:144
 msgid "remove a variable: name [value-pattern]"
 msgstr "gỡ bỏ biến: tên [value-pattern]"
 
-#: builtin/config.c:145
 msgid "remove all matches: name [value-pattern]"
 msgstr "gỡ bỏ mọi cái khớp: tên [value-pattern]"
 
-#: builtin/config.c:146
 msgid "rename section: old-name new-name"
 msgstr "đổi tên phần: tên-cũ tên-mới"
 
-#: builtin/config.c:147
 msgid "remove a section: name"
 msgstr "gỡ bỏ phần: tên"
 
-#: builtin/config.c:148
 msgid "list all"
 msgstr "liệt kê tất"
 
-#: builtin/config.c:149
 msgid "use string equality when comparing values to 'value-pattern'"
 msgstr "sử dụng so sánh bằng chuỗi khi so sánh các giá trị với “value-pattern”"
 
-#: builtin/config.c:150
 msgid "open an editor"
 msgstr "mở một trình biên soạn"
 
-#: builtin/config.c:151
 msgid "find the color configured: slot [default]"
 msgstr "tìm cấu hình màu sắc: slot [mặc định]"
 
-#: builtin/config.c:152
 msgid "find the color setting: slot [stdout-is-tty]"
 msgstr "tìm các cài đặt về màu sắc: slot [stdout-là-tty]"
 
-#: builtin/config.c:153
 msgid "Type"
 msgstr "Kiểu"
 
-#: builtin/config.c:154 builtin/env--helper.c:42 builtin/hash-object.c:97
 msgid "type"
 msgstr "kiểu"
 
-#: builtin/config.c:154 builtin/env--helper.c:43
 msgid "value is given this type"
 msgstr "giá trị được đưa kiểu này"
 
-#: builtin/config.c:155
 msgid "value is \"true\" or \"false\""
 msgstr "giá trị là \"true\" hoặc \"false\""
 
-#: builtin/config.c:156
 msgid "value is decimal number"
 msgstr "giá trị ở dạng số thập phân"
 
-#: builtin/config.c:157
 msgid "value is --bool or --int"
 msgstr "giá trị là --bool hoặc --int"
 
-#: builtin/config.c:158
 msgid "value is --bool or string"
 msgstr "giá trị là --bool hoặc chuỗi"
 
-#: builtin/config.c:159
 msgid "value is a path (file or directory name)"
 msgstr "giá trị là đường dẫn (tên tập tin hay thư mục)"
 
-#: builtin/config.c:160
 msgid "value is an expiry date"
 msgstr "giá trị là một ngày hết hạn"
 
-#: builtin/config.c:161
 msgid "Other"
 msgstr "Khác"
 
-#: builtin/config.c:162
 msgid "terminate values with NUL byte"
 msgstr "chấm dứt giá trị với byte NUL"
 
-#: builtin/config.c:163
 msgid "show variable names only"
 msgstr "chỉ hiển thị các tên biến"
 
-#: builtin/config.c:164
 msgid "respect include directives on lookup"
 msgstr "tôn trọng kể cà các hướng trong tìm kiếm"
 
-#: builtin/config.c:165
 msgid "show origin of config (file, standard input, blob, command line)"
 msgstr ""
 "hiển thị nguyên gốc của cấu hình (tập tin, đầu vào tiêu chuẩn, blob, dòng "
 "lệnh)"
 
-#: builtin/config.c:166
 msgid "show scope of config (worktree, local, global, system, command)"
 msgstr ""
 "hiển thị phạm vi của cấu hình (cây làm việc, cục bộ, toàn cầu, hệ thống, "
 "lệnh)"
 
-#: builtin/config.c:167 builtin/env--helper.c:45
 msgid "value"
 msgstr "giá trị"
 
-#: builtin/config.c:167
 msgid "with --get, use default value when missing entry"
 msgstr "với --get, dùng giá trị mặc định khi thiếu mục tin"
 
-#: builtin/config.c:181
 #, c-format
 msgid "wrong number of arguments, should be %d"
 msgstr "sai số lượng tham số, phải là %d"
 
-#: builtin/config.c:183
 #, c-format
 msgid "wrong number of arguments, should be from %d to %d"
 msgstr "sai số lượng tham số, phải từ %d đến %d"
 
-#: builtin/config.c:339
 #, c-format
 msgid "invalid key pattern: %s"
 msgstr "mẫu khóa không hợp lệ: %s"
 
-#: builtin/config.c:377
+#, c-format
+msgid "invalid pattern: %s"
+msgstr "mẫu không hợp lệ: %s"
+
 #, c-format
 msgid "failed to format default config value: %s"
 msgstr "gặp lỗi khi định dạng giá trị cấu hình mặc định: %s"
 
-#: builtin/config.c:441
 #, c-format
 msgid "cannot parse color '%s'"
 msgstr "không thể phân tích màu “%s”"
 
-#: builtin/config.c:483
 msgid "unable to parse default color value"
 msgstr "không thể phân tích giá trị màu mặc định"
 
-#: builtin/config.c:536 builtin/config.c:833
 msgid "not in a git directory"
 msgstr "không trong thư mục git"
 
-#: builtin/config.c:539
 msgid "writing to stdin is not supported"
 msgstr "việc ghi ra đầu ra tiêu chuẩn là không được hỗ trợ"
 
-#: builtin/config.c:542
 msgid "writing config blobs is not supported"
 msgstr "không hỗ trợ ghi cấu hình các blob"
 
-#: builtin/config.c:627
 #, c-format
 msgid ""
 "# This is Git's per-user configuration file.\n"
@@ -14906,27 +5133,21 @@ msgstr ""
 "#\tname = %s\n"
 "#\temail = %s\n"
 
-#: builtin/config.c:652
 msgid "only one config file at a time"
 msgstr "chỉ một tập tin cấu hình một lần"
 
-#: builtin/config.c:658
 msgid "--local can only be used inside a git repository"
 msgstr "--local chỉ có thể được dùng bên trong một kho git"
 
-#: builtin/config.c:660
 msgid "--blob can only be used inside a git repository"
 msgstr "--blob chỉ có thể được dùng bên trong một kho git"
 
-#: builtin/config.c:662
 msgid "--worktree can only be used inside a git repository"
 msgstr "--worktree chỉ có thể được dùng bên trong một kho git"
 
-#: builtin/config.c:684
 msgid "$HOME not set"
 msgstr "Chưa đặt biến môi trường $HOME"
 
-#: builtin/config.c:708
 msgid ""
 "--worktree cannot be used with multiple working trees unless the config\n"
 "extension worktreeConfig is enabled. Please read \"CONFIGURATION FILE\"\n"
@@ -14936,19 +5157,15 @@ msgstr ""
 "worktreeConfig được bật. Vui lòng đọc phần \"CONFIGURATION FILE\"\n"
 "trong \"git help worktree\" để biết thêm chi tiết"
 
-#: builtin/config.c:743
 msgid "--get-color and variable type are incoherent"
 msgstr "--get-color và kiểu biến là không mạch lạc"
 
-#: builtin/config.c:748
 msgid "only one action at a time"
 msgstr "chỉ một thao tác mỗi lần"
 
-#: builtin/config.c:761
 msgid "--name-only is only applicable to --list or --get-regexp"
 msgstr "--name-only chỉ được áp dụng cho --list hoặc --get-regexp"
 
-#: builtin/config.c:767
 msgid ""
 "--show-origin is only applicable to --get, --get-all, --get-regexp, and --"
 "list"
@@ -14956,37 +5173,29 @@ msgstr ""
 "--show-origin chỉ được áp dụng cho --get, --get-all, --get-regexp, hoặc --"
 "list"
 
-#: builtin/config.c:773
 msgid "--default is only applicable to --get"
 msgstr "--default chỉ được áp dụng cho --get"
 
-#: builtin/config.c:806
 msgid "--fixed-value only applies with 'value-pattern'"
 msgstr "--fixed-value chỉ áp dụng với “value-pattern”"
 
-#: builtin/config.c:822
 #, c-format
 msgid "unable to read config file '%s'"
 msgstr "không thể đọc tập tin cấu hình “%s”"
 
-#: builtin/config.c:825
 msgid "error processing config file(s)"
 msgstr "gặp lỗi khi xử lý các tập tin cấu hình"
 
-#: builtin/config.c:835
 msgid "editing stdin is not supported"
 msgstr "sửa chữa đầu ra tiêu chuẩn là không được hỗ trợ"
 
-#: builtin/config.c:837
 msgid "editing blobs is not supported"
 msgstr "việc sửa chữa các blob là không được hỗ trợ"
 
-#: builtin/config.c:851
 #, c-format
 msgid "cannot create configuration file %s"
 msgstr "không thể tạo tập tin cấu hình “%s”"
 
-#: builtin/config.c:864
 #, c-format
 msgid ""
 "cannot overwrite multiple values with a single value\n"
@@ -14995,16 +5204,13 @@ msgstr ""
 "không thể ghi đè nhiều giá trị với một giá trị đơn\n"
 "      Dùng một biểu thức chính quy, --add hay --replace-all để thay đổi %s."
 
-#: builtin/config.c:943 builtin/config.c:954
 #, c-format
 msgid "no such section: %s"
 msgstr "không có đoạn: %s"
 
-#: builtin/count-objects.c:100
 msgid "print sizes in human readable format"
 msgstr "hiển thị kích cỡ theo định dạng dành cho người đọc"
 
-#: builtin/credential-cache--daemon.c:227
 #, c-format
 msgid ""
 "The permissions on your socket directory are too loose; other\n"
@@ -15017,69 +5223,54 @@ msgstr ""
 "\n"
 "\tchmod 0700 %s"
 
-#: builtin/credential-cache--daemon.c:276
 msgid "print debugging messages to stderr"
 msgstr "in thông tin gỡ lỗi ra đầu ra lỗi tiêu chuẩn"
 
-#: builtin/credential-cache--daemon.c:316
 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:180
 msgid "credential-cache unavailable; no unix socket support"
 msgstr "credential-cache không sẵn có; không hỗ trợ unix socket"
 
-#: builtin/credential-store.c:66
 #, c-format
 msgid "unable to get credential storage lock in %d ms"
 msgstr "không thể lấy khóa lưu trữ ủy nhiệm %d ms"
 
-#: builtin/describe.c:26
 msgid "git describe [<options>] [<commit-ish>...]"
 msgstr "git describe [<các tùy chọn>] <commit-ish>*"
 
-#: builtin/describe.c:27
 msgid "git describe [<options>] --dirty"
 msgstr "git describe [<các tùy chọn>] --dirty"
 
-#: builtin/describe.c:63
 msgid "head"
 msgstr "phía trước"
 
-#: builtin/describe.c:63
 msgid "lightweight"
 msgstr "hạng nhẹ"
 
-#: builtin/describe.c:63
 msgid "annotated"
 msgstr "có diễn giải"
 
-#: builtin/describe.c:277
 #, c-format
 msgid "annotated tag %s not available"
 msgstr "thẻ đã được ghi chú %s không sẵn để dùng"
 
-#: builtin/describe.c:281
 #, c-format
 msgid "tag '%s' is externally known as '%s'"
 msgstr "ở bên ngoài, thẻ “%s” đã được biết đến là “%s”"
 
-#: builtin/describe.c:328
 #, c-format
 msgid "no tag exactly matches '%s'"
 msgstr "không có thẻ nào khớp chính xác với “%s”"
 
-#: builtin/describe.c:330
 #, c-format
 msgid "No exact match on refs or tags, searching to describe\n"
 msgstr "Không có tham chiếu hay thẻ khớp đúng, đang tìm kiếm mô tả\n"
 
-#: builtin/describe.c:397
 #, c-format
 msgid "finished search at %s\n"
 msgstr "việc tìm kiếm đã kết thúc tại %s\n"
 
-#: builtin/describe.c:424
 #, c-format
 msgid ""
 "No annotated tags can describe '%s'.\n"
@@ -15088,7 +5279,6 @@ msgstr ""
 "Không có thẻ được chú giải nào được mô tả là “%s”.\n"
 "Tuy nhiên, ở đây có những thẻ không được chú giải: hãy thử --tags."
 
-#: builtin/describe.c:428
 #, c-format
 msgid ""
 "No tags can describe '%s'.\n"
@@ -15097,12 +5287,10 @@ msgstr ""
 "Không có thẻ có thể mô tả “%s”.\n"
 "Hãy thử --always, hoặc tạo một số thẻ."
 
-#: builtin/describe.c:458
 #, c-format
 msgid "traversed %lu commits\n"
 msgstr "đã xuyên %lu qua lần chuyển giao\n"
 
-#: builtin/describe.c:461
 #, c-format
 msgid ""
 "more than %i tags found; listed %i most recent\n"
@@ -15111,151 +5299,118 @@ msgstr ""
 "tìm thấy nhiều hơn %i thẻ; đã liệt kê %i cái gần\n"
 "đây nhất bỏ đi tìm kiếm tại %s\n"
 
-#: builtin/describe.c:529
 #, c-format
 msgid "describe %s\n"
 msgstr "mô tả %s\n"
 
-#: builtin/describe.c:532
 #, c-format
 msgid "Not a valid object name %s"
 msgstr "Không phải tên đối tượng %s hợp lệ"
 
-#: builtin/describe.c:540
 #, c-format
 msgid "%s is neither a commit nor blob"
 msgstr "%s không phải là một lần commit cũng không phải blob"
 
-#: builtin/describe.c:554
 msgid "find the tag that comes after the commit"
 msgstr "tìm các thẻ mà nó đến trước lần chuyển giao"
 
-#: builtin/describe.c:555
 msgid "debug search strategy on stderr"
 msgstr "chiến lược tìm kiếm gỡ lỗi trên đầu ra lỗi chuẩn stderr"
 
-#: builtin/describe.c:556
 msgid "use any ref"
 msgstr "dùng ref bất kỳ"
 
-#: builtin/describe.c:557
 msgid "use any tag, even unannotated"
 msgstr "dùng thẻ bất kỳ, cả khi “unannotated”"
 
-#: builtin/describe.c:558
 msgid "always use long format"
 msgstr "luôn dùng định dạng dài"
 
-#: builtin/describe.c:559
 msgid "only follow first parent"
 msgstr "chỉ theo cha mẹ đầu tiên"
 
-#: builtin/describe.c:562
 msgid "only output exact matches"
 msgstr "chỉ xuất những gì khớp chính xác"
 
-#: builtin/describe.c:564
 msgid "consider <n> most recent tags (default: 10)"
 msgstr "coi như <n> thẻ gần đây nhất (mặc định: 10)"
 
-#: builtin/describe.c:566
 msgid "only consider tags matching <pattern>"
 msgstr "chỉ cân nhắc đến những thẻ khớp với <mẫu>"
 
-#: builtin/describe.c:568
 msgid "do not consider tags matching <pattern>"
 msgstr "không coi rằng các thẻ khớp với <mẫu>"
 
-#: builtin/describe.c:570 builtin/name-rev.c:595
 msgid "show abbreviated commit object as fallback"
 msgstr "hiển thị đối tượng chuyển giao vắn tắt như là fallback"
 
-#: builtin/describe.c:571 builtin/describe.c:574
 msgid "mark"
 msgstr "dấu"
 
-#: builtin/describe.c:572
 msgid "append <mark> on dirty working tree (default: \"-dirty\")"
 msgstr "thêm <dấu> trên cây thư mục làm việc bẩn (mặc định \"-dirty\")"
 
-#: builtin/describe.c:575
 msgid "append <mark> on broken working tree (default: \"-broken\")"
 msgstr "thêm <dấu> trên cây thư mục làm việc bị hỏng (mặc định \"-broken\")"
 
-#: builtin/describe.c:622
 msgid "No names found, cannot describe anything."
 msgstr "Không tìm thấy các tên, không thể mô tả gì cả."
 
-#: builtin/describe.c:673 builtin/describe.c:675
 #, c-format
 msgid "option '%s' and commit-ishes cannot be used together"
 msgstr "tùy chọn '%s' và commit-ishes không thể dùng cùng nhau"
 
-#: builtin/diff-tree.c:157
 msgid "--merge-base only works with two commits"
 msgstr "--merge-base chỉ hoạt động với hai lần chuyển giao"
 
-#: builtin/diff.c:92
 #, c-format
 msgid "'%s': not a regular file or symlink"
 msgstr "“%s”: không phải tập tin bình thường hay liên kết mềm"
 
-#: builtin/diff.c:259
 #, c-format
 msgid "invalid option: %s"
 msgstr "tùy chọn không hợp lệ: %s"
 
-#: builtin/diff.c:376
 #, c-format
 msgid "%s...%s: no merge base"
 msgstr "%s…%s: không có cơ sở hòa trộn"
 
-#: builtin/diff.c:491
 msgid "Not a git repository"
 msgstr "Không phải là kho git"
 
-#: builtin/diff.c:537 builtin/grep.c:700
 #, c-format
 msgid "invalid object '%s' given."
 msgstr "đối tượng đã cho “%s” không hợp lệ."
 
-#: builtin/diff.c:548
 #, c-format
 msgid "more than two blobs given: '%s'"
 msgstr "đã cho nhiều hơn hai đối tượng blob: “%s”"
 
-#: builtin/diff.c:553
 #, c-format
 msgid "unhandled object '%s' given."
 msgstr "đã cho đối tượng không thể nắm giữ “%s”."
 
-#: builtin/diff.c:587
 #, c-format
 msgid "%s...%s: multiple merge bases, using %s"
 msgstr "%s…%s: có nhiều cơ sở để hòa trộn, nên dùng %s"
 
-#: builtin/difftool.c:31
 msgid "git difftool [<options>] [<commit> [<commit>]] [--] [<path>...]"
 msgstr ""
 "git difftool [<các tùy chọn>] [<lần_chuyển_giao> [<lần_chuyển_giao>]] [--] </"
 "đường/dẫn>…]"
 
-#: builtin/difftool.c:287
 #, c-format
 msgid "could not read symlink %s"
 msgstr "không thể đọc liên kết mềm %s"
 
-#: builtin/difftool.c:289
 #, 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:297
 #, 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:421
 msgid ""
 "combined diff formats ('-c' and '--cc') are not supported in\n"
 "directory diff mode ('-d' and '--dir-diff')."
@@ -15263,102 +5418,83 @@ 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:626
 #, c-format
 msgid "both files modified: '%s' and '%s'."
 msgstr "cả hai tập tin đã bị sửa: “%s” và “%s”."
 
-#: builtin/difftool.c:628
 msgid "working tree file has been left."
 msgstr "cây làm việc ở bên trái."
 
-#: builtin/difftool.c:639
+#, c-format
+msgid "could not copy '%s' to '%s'"
+msgstr "không thể chép “%s” sang “%s”"
+
 #, c-format
 msgid "temporary files exist in '%s'."
 msgstr "các tập tin tạm đã sẵn có trong “%s”."
 
-#: builtin/difftool.c:640
 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:645
 #, c-format
 msgid "failed: %d"
 msgstr "gặp lỗi: %d"
 
-#: builtin/difftool.c:690
 msgid "use `diff.guitool` instead of `diff.tool`"
 msgstr "dùng “diff.guitool“ thay vì dùng “diff.tool“"
 
-#: builtin/difftool.c:692
 msgid "perform a full-directory diff"
 msgstr "thực hiện một diff toàn thư mục"
 
-#: builtin/difftool.c:694
 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:699
 msgid "use symlinks in dir-diff mode"
 msgstr "dùng liên kết mềm trong diff-thư-mục"
 
-#: builtin/difftool.c:700
 msgid "tool"
 msgstr "công cụ"
 
-#: builtin/difftool.c:701
 msgid "use the specified diff tool"
 msgstr "dùng công cụ diff đã cho"
 
-#: builtin/difftool.c:703
 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:706
 msgid ""
 "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ác không"
 
-#: builtin/difftool.c:709
 msgid "specify a custom command for viewing diffs"
 msgstr "chỉ định một lệnh tùy ý để xem diff"
 
-#: builtin/difftool.c:710
 msgid "passed to `diff`"
 msgstr "chuyển cho “diff”"
 
-#: builtin/difftool.c:726
 msgid "difftool requires worktree or --no-index"
 msgstr "difftool cần cây làm việc hoặc --no-index"
 
-#: builtin/difftool.c:745
 msgid "no <tool> given for --tool=<tool>"
 msgstr "chưa đưa ra <công_cụ> cho --tool=<công_cụ>"
 
-#: builtin/difftool.c:752
 msgid "no <cmd> given for --extcmd=<cmd>"
 msgstr "chưa đưa ra <lệnh> cho --extcmd=<lệnh>"
 
-#: builtin/env--helper.c:6
 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:46
 msgid "default for git_env_*(...) to fall back on"
 msgstr "mặc định cho git_env_*(…) để quay về"
 
-#: builtin/env--helper.c:48
 msgid "be quiet only use git_env_*() value as exit code"
 msgstr "im lặng chỉ khi dung giá trị git_env_*() làm mã thoát"
 
-#: builtin/env--helper.c:67
 #, c-format
 msgid "option `--default' expects a boolean value with `--type=bool`, not `%s`"
 msgstr ""
 "tùy chọn “--default” cần một giá trị logic với “--type=bool“, không phải “%s“"
 
-#: builtin/env--helper.c:82
 #, c-format
 msgid ""
 "option `--default' expects an unsigned long value with `--type=ulong`, not `"
@@ -15367,249 +5503,190 @@ msgstr ""
 "tùy chọn “--default” cần một giá trị số nguyên dài không dấu với “--"
 "type=ulong“, không phải “%s“"
 
-#: builtin/fast-export.c:29
 msgid "git fast-export [<rev-list-opts>]"
 msgstr "git fast-export [<rev-list-opts>]"
 
-#: builtin/fast-export.c:843
 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:1152
 msgid "--anonymize-map token cannot be empty"
 msgstr "--anonymize-map thẻ không thể là rỗng"
 
-#: builtin/fast-export.c:1171
 msgid "show progress after <n> objects"
 msgstr "hiển thị tiến triển sau <n> đối tượng"
 
-#: builtin/fast-export.c:1173
 msgid "select handling of signed tags"
 msgstr "chọn điều khiển của thẻ đã ký"
 
-#: builtin/fast-export.c:1176
 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:1179
 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:1182
 msgid "dump marks to this file"
 msgstr "đổ các đánh dấu này vào tập-tin"
 
-#: builtin/fast-export.c:1184
 msgid "import marks from this file"
 msgstr "nhập vào đánh dấu từ tập tin này"
 
-#: builtin/fast-export.c:1188
 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:1190
 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:1192
 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:1194
 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:1195
 msgid "skip output of blob data"
 msgstr "bỏ qua kết xuất của dữ liệu blob"
 
-#: builtin/fast-export.c:1196 builtin/log.c:1860
 msgid "refspec"
 msgstr "refspec"
 
-#: builtin/fast-export.c:1197
 msgid "apply refspec to exported refs"
 msgstr "áp dụng refspec cho refs đã xuất"
 
-#: builtin/fast-export.c:1198
 msgid "anonymize output"
 msgstr "kết xuất anonymize"
 
-#: builtin/fast-export.c:1199
 msgid "from:to"
 msgstr "từ:đến"
 
-#: builtin/fast-export.c:1200
 msgid "convert <from> to <to> in anonymized output"
 msgstr "chuyển đổi <from> sang <to> đầu ra ẩn danh"
 
-#: builtin/fast-export.c:1203
 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:1205
 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:1207
 msgid "label tags with mark ids"
 msgstr "gắn thẻ với các mã ID đánh dấu"
 
-#: builtin/fast-import.c:3097
 #, c-format
 msgid "Missing from marks for submodule '%s'"
 msgstr "Thiếu các đánh dấu cho mô-đun-con “%s”"
 
-#: builtin/fast-import.c:3099
 #, c-format
 msgid "Missing to marks for submodule '%s'"
 msgstr "Thiếu đánh dấu cho mô-đun-con “%s”"
 
-#: builtin/fast-import.c:3234
 #, c-format
 msgid "Expected 'mark' command, got %s"
 msgstr "Cần lệnh “mark”, nhưng lại nhận được %s"
 
-#: builtin/fast-import.c:3239
 #, c-format
 msgid "Expected 'to' command, got %s"
 msgstr "Cần lệnh “to”, nhưng lại nhận được %s"
 
-#: builtin/fast-import.c:3331
 msgid "Expected format name:filename for submodule rewrite option"
 msgstr "Cần định dạng tên:tên_tập_tin cho tùy chọn ghi lại mô-đun-con"
 
-#: builtin/fast-import.c:3386
 #, c-format
 msgid "feature '%s' forbidden in input without --allow-unsafe-features"
 msgstr ""
 "tính năng “%s” bị cấm chỉ trong đầu vào mà không có --allow-unsafe-features"
 
-#: builtin/fetch-pack.c:246
 #, c-format
 msgid "Lockfile created but not reported: %s"
 msgstr "Tập tin khóa đã được tạo nhưng chưa được báo cáo: %s"
 
-#: builtin/fetch.c:36
 msgid "git fetch [<options>] [<repository> [<refspec>...]]"
 msgstr "git fetch [<các tùy chọn>] [<kho-chứa> [<refspec>…]]"
 
-#: builtin/fetch.c:37
 msgid "git fetch [<options>] <group>"
 msgstr "git fetch [<các tùy chọn>] [<nhóm>"
 
-#: builtin/fetch.c:38
 msgid "git fetch --multiple [<options>] [(<repository> | <group>)...]"
 msgstr "git fetch --multiple [<các tùy chọn>] [(<kho> | <nhóm>)…]"
 
-#: builtin/fetch.c:39
 msgid "git fetch --all [<options>]"
 msgstr "git fetch --all [<các tùy chọn>]"
 
-#: builtin/fetch.c:124
 msgid "fetch.parallel cannot be negative"
 msgstr "fetch.parallel không thể âm"
 
-#: builtin/fetch.c:147 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:149 builtin/pull.c:249
 msgid "set upstream for git pull/fetch"
 msgstr "đặt thượng nguồn cho git pull/fetch"
 
-#: builtin/fetch.c:151 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ó"
 
-#: builtin/fetch.c:153
 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:155 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"
 
-#: builtin/fetch.c:156
 msgid "force overwrite of local reference"
 msgstr "ép buộc ghi đè lên tham chiếu nội bộ"
 
-#: builtin/fetch.c:158
 msgid "fetch from multiple remotes"
 msgstr "lấy từ nhiều máy chủ cùng lúc"
 
-#: builtin/fetch.c:160 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ó"
 
-#: builtin/fetch.c:162
 msgid "do not fetch all tags (--no-tags)"
 msgstr "không lấy tất cả các thẻ (--no-tags)"
 
-#: builtin/fetch.c:164
 msgid "number of submodules fetched in parallel"
 msgstr "số lượng mô-đun-con được lấy đồng thời"
 
-#: builtin/fetch.c:166
 msgid "modify the refspec to place all refs within refs/prefetch/"
 msgstr ""
 "sửa đặc tả đường dẫn cho các tham chiếu mọi chỗ có trong refs/prefetch/"
 
-#: builtin/fetch.c:168 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ủ "
 "nữa"
 
-#: builtin/fetch.c:170
 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:171 builtin/fetch.c:199 builtin/pull.c:123
 msgid "on-demand"
 msgstr "khi-cần"
 
-#: builtin/fetch.c:172
 msgid "control recursive fetching of submodules"
 msgstr "điều khiển việc lấy về đệ quy trong các mô-đun-con"
 
-#: builtin/fetch.c:177
 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:178 builtin/pull.c:210
 msgid "keep downloaded pack"
 msgstr "giữ lại gói đã tải về"
 
-#: builtin/fetch.c:180
 msgid "allow updating of HEAD ref"
 msgstr "cho phép cập nhật th.chiếu HEAD"
 
-#: builtin/fetch.c:183 builtin/fetch.c:189 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:185 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:191 builtin/pull.c:225
 msgid "convert to a complete repository"
 msgstr "chuyển đổi hoàn toàn sang kho git"
 
-#: builtin/fetch.c:194
 msgid "re-fetch without negotiating common commits"
 msgstr "re-fetch mà không dàn xếp các lần chuyển giao chung"
 
-#: builtin/fetch.c:197
 msgid "prepend this to submodule path output"
 msgstr "soạn sẵn cái này cho kết xuất đường dẫn mô-đun-con"
 
-#: builtin/fetch.c:200
 msgid ""
 "default for recursive fetching of submodules (lower priority than config "
 "files)"
@@ -15617,103 +5694,82 @@ msgstr ""
 "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:204 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:205 builtin/pull.c:230
 msgid "refmap"
 msgstr "refmap"
 
-#: builtin/fetch.c:206 builtin/pull.c:231
 msgid "specify fetch refmap"
 msgstr "chỉ ra refmap cần lấy về"
 
-#: builtin/fetch.c:213 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"
 
-#: builtin/fetch.c:215
 msgid "do not fetch a packfile; instead, print ancestors of negotiation tips"
 msgstr ""
 "không lấy về một packfile; thay vào đó, hãy in tổ tiên của đỉnh đàm phán"
 
-#: builtin/fetch.c:218 builtin/fetch.c:220
 msgid "run 'maintenance --auto' after fetching"
 msgstr "chạy “maintenance --auto” sau khi lấy về"
 
-#: builtin/fetch.c:222 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"
 
-#: builtin/fetch.c:224
 msgid "write the commit-graph after fetching"
 msgstr "ghi ra đồ thị các lần chuyển giao sau khi lấy về"
 
-#: builtin/fetch.c:226
 msgid "accept refspecs from stdin"
 msgstr "chấp nhận tham chiếu từ đầu vào tiêu chuẩn"
 
-#: builtin/fetch.c:618
 msgid "couldn't find remote ref HEAD"
 msgstr "không thể tìm thấy HEAD tham chiếu máy chủ"
 
-#: builtin/fetch.c:893
 #, c-format
 msgid "object %s not found"
 msgstr "không tìm thấy đối tượng %s"
 
-#: builtin/fetch.c:897
 msgid "[up to date]"
 msgstr "[đã cập nhật]"
 
-#: builtin/fetch.c:909 builtin/fetch.c:927 builtin/fetch.c:999
 msgid "[rejected]"
 msgstr "[Bị từ chối]"
 
-#: builtin/fetch.c:911
 msgid "can't fetch in current branch"
 msgstr "không thể fetch (lấy) về nhánh hiện hành"
 
-#: builtin/fetch.c:912
 msgid "checked out in another worktree"
 msgstr "lấy ra trong cây làm việc khác"
 
-#: builtin/fetch.c:922
 msgid "[tag update]"
 msgstr "[cập nhật thẻ]"
 
-#: builtin/fetch.c:923 builtin/fetch.c:960 builtin/fetch.c:982
-#: builtin/fetch.c:994
 msgid "unable to update local ref"
 msgstr "không thể cập nhật tham chiếu nội bộ"
 
-#: builtin/fetch.c:927
 msgid "would clobber existing tag"
 msgstr "nên xóa chồng các thẻ có sẵn"
 
-#: builtin/fetch.c:949
 msgid "[new tag]"
 msgstr "[thẻ mới]"
 
-#: builtin/fetch.c:952
 msgid "[new branch]"
 msgstr "[nhánh mới]"
 
-#: builtin/fetch.c:955
 msgid "[new ref]"
 msgstr "[ref (tham chiếu) mới]"
 
-#: builtin/fetch.c:994
 msgid "forced update"
 msgstr "cưỡng bức cập nhật"
 
-#: builtin/fetch.c:999
 msgid "non-fast-forward"
 msgstr "không-phải-chuyển-tiếp-nhanh"
 
-#: builtin/fetch.c:1102
+#, c-format
+msgid "cannot open '%s'"
+msgstr "không mở được “%s”"
+
 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"
@@ -15723,7 +5779,6 @@ msgstr ""
 "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:1106
 #, c-format
 msgid ""
 "it took %.2f seconds to check forced updates; you can use\n"
@@ -15736,22 +5791,18 @@ msgstr ""
 "false”\n"
 "để tránh kiểm tra này\n"
 
-#: builtin/fetch.c:1136
 #, 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:1156
 #, 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:1259 builtin/fetch.c:1418
 #, c-format
 msgid "From %.*s\n"
 msgstr "Từ %.*s\n"
 
-#: builtin/fetch.c:1269
 #, c-format
 msgid ""
 "some local refs could not be updated; try running\n"
@@ -15760,49 +5811,43 @@ msgstr ""
 "một số tham chiếu nội bộ không thể được cập nhật; hãy thử chạy\n"
 " “git remote prune %s” để bỏ đi những nhánh cũ, hay bị xung đột"
 
-#: builtin/fetch.c:1377
 #, 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:1378
 #, c-format
 msgid "   (%s has become dangling)"
 msgstr "   (%s đã trở thành không đầu (không được quản lý))"
 
-#: builtin/fetch.c:1421
 msgid "[deleted]"
 msgstr "[đã xóa]"
 
-#: builtin/fetch.c:1422 builtin/remote.c:1153
 msgid "(none)"
 msgstr "(không)"
 
-#: builtin/fetch.c:1446
 #, c-format
 msgid "refusing to fetch into branch '%s' checked out at '%s'"
 msgstr "từ chối lấy về vào nhánh “%s” đã được lấy ra tại “%s”"
 
-#: builtin/fetch.c:1466
 #, 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:1469
 #, 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:1496
+#, c-format
+msgid "%s is not a valid object"
+msgstr "%s không phải là một đối tượng hợp lệ"
+
 #, c-format
 msgid "the object %s does not exist"
 msgstr "đối tượng “%s” không tồn tại"
 
-#: builtin/fetch.c:1748
 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:1760
 #, c-format
 msgid ""
 "could not set upstream of HEAD to '%s' from '%s' when it does not point to "
@@ -15811,19 +5856,15 @@ msgstr ""
 "không thể đặt thượng nguồn của HEAD thành '%s' từ '%s' khi mà nó chẳng chỉ "
 "đến nhánh nào cả."
 
-#: builtin/fetch.c:1773
 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:1775
 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:1777
 msgid "unknown branch type"
 msgstr "không hiểu kiểu nhánh"
 
-#: builtin/fetch.c:1779
 msgid ""
 "no source branch found;\n"
 "you need to specify exactly one branch with the --set-upstream option"
@@ -15831,22 +5872,18 @@ msgstr ""
 "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:1904 builtin/fetch.c:1967
 #, c-format
 msgid "Fetching %s\n"
 msgstr "Đang lấy “%s” về\n"
 
-#: builtin/fetch.c:1914 builtin/fetch.c:1969
 #, c-format
 msgid "could not fetch %s"
 msgstr "không thể lấy “%s” về"
 
-#: builtin/fetch.c:1926
 #, 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:2030
 msgid ""
 "no remote repository specified; please specify either a URL or a\n"
 "remote name from which new revisions should be fetched"
@@ -15854,48 +5891,37 @@ msgstr ""
 "chưa chỉ ra kho chứa máy chủ; xin hãy chỉ định hoặc là URL hoặc\n"
 "tên máy chủ từ cái mà những điểm xét duyệt mới có thể được fetch (lấy về)"
 
-#: builtin/fetch.c:2066
 msgid "you need to specify a tag name"
 msgstr "bạn cần chỉ định một tên thẻ"
 
-#: builtin/fetch.c:2156
 msgid "--negotiate-only needs one or more --negotiation-tip=*"
 msgstr "--negotiate-only cần một hay nhiều --negotiation-tip=* hơn"
 
-#: builtin/fetch.c:2160
 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:2169
 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:2186
 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:2188
 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:2197
 #, 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:2205
 msgid "fetching a group and specifying refspecs does not make sense"
 msgstr "việc lấy về một nhóm và chỉ định refspecs là không hợp lý"
 
-#: builtin/fetch.c:2221
 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:2226
 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:2246
 msgid ""
 "--filter can only be used with the remote configured in extensions."
 "partialclone"
@@ -15903,151 +5929,117 @@ msgstr ""
 "--filter chỉ có thể được dùng với máy chủ được cấu hình bằng extensions."
 "partialclone"
 
-#: builtin/fetch.c:2250
 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:2254
 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ủ"
 
-#: builtin/fmt-merge-msg.c:7
 msgid ""
 "git fmt-merge-msg [-m <message>] [--log[=<n>] | --no-log] [--file <file>]"
 msgstr ""
 "git fmt-merge-msg [-m <chú_thích>] [--log[=<n>] | --no-log] [--file <tập-"
 "tin>]"
 
-#: builtin/fmt-merge-msg.c:19
 msgid "populate log with at most <n> entries from shortlog"
 msgstr "gắn nhật ký với ít nhất <n> mục từ lệnh “shortlog”"
 
-#: builtin/fmt-merge-msg.c:22
 msgid "alias for --log (deprecated)"
 msgstr "bí danh cho --log (không được dùng)"
 
-#: builtin/fmt-merge-msg.c:25
 msgid "text"
 msgstr "văn bản"
 
-#: builtin/fmt-merge-msg.c:26
 msgid "use <text> as start of message"
 msgstr "dùng <văn bản thường> để bắt đầu ghi chú"
 
-#: builtin/fmt-merge-msg.c:28
 msgid "use <name> instead of the real target branch"
 msgstr "dùng <tên> thay cho nhánh đích thật"
 
-#: builtin/fmt-merge-msg.c:29
 msgid "file to read from"
 msgstr "tập tin để đọc dữ liệu từ đó"
 
-#: builtin/for-each-ref.c:10
 msgid "git for-each-ref [<options>] [<pattern>]"
 msgstr "git for-each-ref [<các tùy chọn>] [<mẫu>]"
 
-#: builtin/for-each-ref.c:11
 msgid "git for-each-ref [--points-at <object>]"
 msgstr "git for-each-ref [--points-at <đối tượng>]"
 
-#: builtin/for-each-ref.c:12
 msgid "git for-each-ref [--merged [<commit>]] [--no-merged [<commit>]]"
 msgstr ""
 "git for-each-ref [--merged [<lần-chuyển-giao>]] [--no-merged [<lần-chuyển-"
 "giao>]]"
 
-#: builtin/for-each-ref.c:13
 msgid "git for-each-ref [--contains [<commit>]] [--no-contains [<commit>]]"
 msgstr ""
 "git for-each-ref [--contains [<lần-chuyển-giao>]] [--no-contains [<lần-"
 "chuyển-giao>]]"
 
-#: builtin/for-each-ref.c:31
 msgid "quote placeholders suitably for shells"
 msgstr "trích dẫn để phù hợp cho hệ vỏ (shell)"
 
-#: builtin/for-each-ref.c:33
 msgid "quote placeholders suitably for perl"
 msgstr "trích dẫn để phù hợp cho perl"
 
-#: builtin/for-each-ref.c:35
 msgid "quote placeholders suitably for python"
 msgstr "trích dẫn để phù hợp cho python"
 
-#: builtin/for-each-ref.c:37
 msgid "quote placeholders suitably for Tcl"
 msgstr "trích dẫn để phù hợp cho Tcl"
 
-#: builtin/for-each-ref.c:40
 msgid "show only <n> matched refs"
 msgstr "hiển thị chỉ <n> tham chiếu khớp"
 
-#: builtin/for-each-ref.c:42 builtin/tag.c:482
 msgid "respect format colors"
 msgstr "các màu định dạng lưu tâm"
 
-#: builtin/for-each-ref.c:45
 msgid "print only refs which points at the given object"
 msgstr "chỉ hiển thị các tham chiếu mà nó chỉ đến đối tượng đã cho"
 
-#: builtin/for-each-ref.c:47
 msgid "print only refs that are merged"
 msgstr "chỉ hiển thị những tham chiếu mà nó được hòa trộn"
 
-#: builtin/for-each-ref.c:48
 msgid "print only refs that are not merged"
 msgstr "chỉ hiển thị những tham chiếu mà nó không được hòa trộn"
 
-#: builtin/for-each-ref.c:49
 msgid "print only refs which contain the commit"
 msgstr "chỉ hiển thị những tham chiếu mà nó chứa lần chuyển giao"
 
-#: builtin/for-each-ref.c:50
 msgid "print only refs which don't contain the commit"
 msgstr "chỉ hiển thị những tham chiếu mà nó không chứa lần chuyển giao"
 
-#: builtin/for-each-repo.c:9
 msgid "git for-each-repo --config=<config> <command-args>"
 msgstr "git for-each-repo --config=<config> <command-args>"
 
-#: builtin/for-each-repo.c:34
 msgid "config"
 msgstr "config"
 
-#: builtin/for-each-repo.c:35
 msgid "config key storing a list of repository paths"
 msgstr "khóa cấu hình lưu trữ danh sách đường dẫn kho lưu trữ"
 
-#: builtin/for-each-repo.c:43
 msgid "missing --config=<config>"
 msgstr "thiếu --config=<config>"
 
-#: builtin/fsck.c:69 builtin/fsck.c:128 builtin/fsck.c:129
 msgid "unknown"
 msgstr "không hiểu"
 
 #. 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 "lỗi trong %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 "có cảnh báo trong %s %s: %s"
 
-#: builtin/fsck.c:124 builtin/fsck.c:127
 #, c-format
 msgid "broken link from %7s %s"
 msgstr "liên kết gãy từ %7s %s"
 
-#: builtin/fsck.c:136
 msgid "wrong object type in link"
 msgstr "kiểu đối tượng sai trong liên kết"
 
-#: builtin/fsck.c:152
 #, c-format
 msgid ""
 "broken link from %7s %s\n"
@@ -16056,357 +6048,297 @@ msgstr ""
 "liên kết gãy từ %7s %s \n"
 "              tới %7s %s"
 
-#: builtin/fsck.c:264
+msgid "Checking connectivity"
+msgstr "Đang kiểm tra kết nối"
+
 #, c-format
 msgid "missing %s %s"
 msgstr "thiếu %s %s"
 
-#: builtin/fsck.c:291
 #, c-format
 msgid "unreachable %s %s"
 msgstr "không tiếp cận được %s %s"
 
-#: builtin/fsck.c:311
 #, c-format
 msgid "dangling %s %s"
 msgstr "dangling %s %s"
 
-#: builtin/fsck.c:321
 msgid "could not create lost-found"
 msgstr "không thể tạo lost-found"
 
-#: builtin/fsck.c:332
+#, c-format
+msgid "could not write '%s'"
+msgstr "không thể ghi “%s”"
+
 #, c-format
 msgid "could not finish '%s'"
 msgstr "không thể hoàn thành “%s”"
 
-#: builtin/fsck.c:349
 #, c-format
 msgid "Checking %s"
 msgstr "Đang kiểm tra %s"
 
-#: builtin/fsck.c:387
 #, c-format
 msgid "Checking connectivity (%d objects)"
 msgstr "Đang kiểm tra kết nối (%d đối tượng)"
 
-#: builtin/fsck.c:406
 #, c-format
 msgid "Checking %s %s"
 msgstr "Đang kiểm tra %s %s"
 
-#: builtin/fsck.c:411
 msgid "broken links"
 msgstr "các liên kết bị gẫy"
 
-#: builtin/fsck.c:420
 #, c-format
 msgid "root %s"
 msgstr "gốc %s"
 
-#: builtin/fsck.c:428
 #, c-format
 msgid "tagged %s %s (%s) in %s"
 msgstr "đã đánh thẻ %s %s (%s) trong %s"
 
-#: builtin/fsck.c:457
 #, c-format
 msgid "%s: object corrupt or missing"
 msgstr "%s: đối tượng thiếu hay hỏng"
 
-#: builtin/fsck.c:482
 #, c-format
 msgid "%s: invalid reflog entry %s"
 msgstr "%s: mục reflog không hợp lệ %s"
 
-#: builtin/fsck.c:496
 #, c-format
 msgid "Checking reflog %s->%s"
 msgstr "Đang kiểm tra việc đổi tên của “%s” thành “%s”"
 
-#: builtin/fsck.c:530
 #, c-format
 msgid "%s: invalid sha1 pointer %s"
 msgstr "%s: con trỏ sha1 không hợp lệ %s"
 
-#: builtin/fsck.c:537
 #, c-format
 msgid "%s: not a commit"
 msgstr "%s: không phải là một lần chuyển giao"
 
-#: builtin/fsck.c:591
 msgid "notice: No default references"
 msgstr "cảnh báo: Không có các tham chiếu mặc định"
 
-#: 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: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:645
 #, 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:665
 #, c-format
 msgid "bad sha1 file: %s"
 msgstr "tập tin sha1 sai: %s"
 
-#: builtin/fsck.c:686
 msgid "Checking object directory"
 msgstr "Đang kiểm tra thư mục đối tượng"
 
-#: builtin/fsck.c:689
 msgid "Checking object directories"
 msgstr "Đang kiểm tra các thư mục đối tượng"
 
-#: builtin/fsck.c:705
 #, c-format
 msgid "Checking %s link"
 msgstr "Đang lấy liên kết %s"
 
-#: builtin/fsck.c:710 builtin/index-pack.c:862
 #, c-format
 msgid "invalid %s"
 msgstr "%s không hợp lệ"
 
-#: builtin/fsck.c:717
 #, c-format
 msgid "%s points to something strange (%s)"
 msgstr "%s chỉ đến thứ gì đó xa lạ (%s)"
 
-#: builtin/fsck.c:723
 #, 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:727
 #, 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:739
 msgid "Checking cache tree"
 msgstr "Đang kiểm tra cây nhớ tạm"
 
-#: builtin/fsck.c:744
 #, 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:753
 msgid "non-tree in cache-tree"
 msgstr "non-tree trong cache-tree"
 
-#: builtin/fsck.c:784
 msgid "git fsck [<options>] [<object>...]"
 msgstr "git fsck [<các tùy chọn>] [<đối-tượng>…]"
 
-#: builtin/fsck.c:790
 msgid "show unreachable objects"
 msgstr "hiển thị các đối tượng không thể đọc được"
 
-#: builtin/fsck.c:791
 msgid "show dangling objects"
 msgstr "hiển thị các đối tượng không được quản lý"
 
-#: builtin/fsck.c:792
 msgid "report tags"
 msgstr "báo cáo các thẻ"
 
-#: builtin/fsck.c:793
 msgid "report root nodes"
 msgstr "báo cáo node gốc"
 
-#: builtin/fsck.c:794
 msgid "make index objects head nodes"
 msgstr "tạo “index objects head nodes”"
 
-#: builtin/fsck.c:795
 msgid "make reflogs head nodes (default)"
 msgstr "tạo “reflogs head nodes” (mặc định)"
 
-#: builtin/fsck.c:796
 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:797
 msgid "check only connectivity"
 msgstr "chỉ kiểm tra kết nối"
 
-#: builtin/fsck.c:798 builtin/mktag.c:75
 msgid "enable more strict checking"
 msgstr "cho phép kiểm tra hạn chế hơn"
 
-#: builtin/fsck.c:800
 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:801 builtin/prune.c:146
 msgid "show progress"
 msgstr "hiển thị quá trình"
 
-#: builtin/fsck.c:802
 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:862 builtin/index-pack.c:261
 msgid "Checking objects"
 msgstr "Đang kiểm tra các đối tượng"
 
-#: builtin/fsck.c:890
 #, c-format
 msgid "%s: object missing"
 msgstr "%s: thiếu đối tượng"
 
-#: builtin/fsck.c:901
 #, 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”"
 
-#: builtin/fsmonitor--daemon.c:13
 msgid "git fsmonitor--daemon start [<options>]"
 msgstr "git fsmonitor--daemon start [<các tùy chọn>]"
 
-#: builtin/fsmonitor--daemon.c:14
 msgid "git fsmonitor--daemon run [<options>]"
 msgstr "git fsmonitor--daemon run [<các tùy chọn>]"
 
-#: builtin/fsmonitor--daemon.c:15
 msgid "git fsmonitor--daemon stop"
 msgstr "git fsmonitor--daemon stop"
 
-#: builtin/fsmonitor--daemon.c:16
 msgid "git fsmonitor--daemon status"
 msgstr "git fsmonitor--daemon status"
 
-#: builtin/fsmonitor--daemon.c:38 builtin/fsmonitor--daemon.c:47
 #, c-format
 msgid "value of '%s' out of range: %d"
 msgstr "siá trị '%s' ngoài phạm vi cho phép: %d"
 
-#: builtin/fsmonitor--daemon.c:57
 #, c-format
 msgid "value of '%s' not bool or int: %d"
 msgstr "giá trị của '%s' không là bool hoặc int: %d"
 
-#: builtin/fsmonitor--daemon.c:99
 #, c-format
 msgid "fsmonitor-daemon is watching '%s'\n"
 msgstr "fsmonitor-daemon đang theo dõi '%s'\n"
 
-#: builtin/fsmonitor--daemon.c:104
 #, c-format
 msgid "fsmonitor-daemon is not watching '%s'\n"
 msgstr "fsmonitor-daemon hiện không theo dõi '%s'\n"
 
-#: builtin/fsmonitor--daemon.c:170
 #, c-format
 msgid "could not create fsmonitor cookie '%s'"
 msgstr "không thể tạo fsmonitor cookie “%s”"
 
-#: builtin/fsmonitor--daemon.c:753
 #, c-format
 msgid "fsmonitor: cookie_result '%d' != SEEN"
 msgstr "fsmonitor: cookie_result '%d' != SEEN"
 
-#: builtin/fsmonitor--daemon.c:1187
 #, c-format
 msgid "could not start IPC thread pool on '%s'"
 msgstr "không thể khởi chạy bể tiến trình IPC trêm “%s”"
 
-#: builtin/fsmonitor--daemon.c:1199
 msgid "could not start fsmonitor listener thread"
 msgstr "không thể lấy thông tin thống kê về tuyến trình lắng nghe fsmonitor"
 
-#: builtin/fsmonitor--daemon.c:1297
+msgid "could not start fsmonitor health thread"
+msgstr ""
+"không thể lấy thông tin thống kê về tuyến trình theo dõi sức khỏe fsmonitor"
+
 msgid "could not initialize listener thread"
 msgstr "không thể khởi tạo tuyến trình lắng nghe"
 
-#: builtin/fsmonitor--daemon.c:1328 builtin/fsmonitor--daemon.c:1383
+msgid "could not initialize health thread"
+msgstr "không thể khởi tạo tuyến trình sức "
+
+#, c-format
+msgid "could not cd home '%s'"
+msgstr "không thể chuyển đến thư mục cá nhân “%s”"
+
 #, c-format
 msgid "fsmonitor--daemon is already running '%s'"
 msgstr "fsmonitor--daemon hiện đang chạy rồi '%s'"
 
-#: builtin/fsmonitor--daemon.c:1332
 #, c-format
 msgid "running fsmonitor-daemon in '%s'\n"
 msgstr "chạy fsmonitor-daemon trong '%s'\n"
 
-#: builtin/fsmonitor--daemon.c:1387
 #, c-format
 msgid "starting fsmonitor-daemon in '%s'\n"
 msgstr "đang khởi chạy fsmonitor-daemon trong “%s”\n"
 
-#: builtin/fsmonitor--daemon.c:1413
 msgid "daemon failed to start"
 msgstr "gặp lỗi khi khởi chạy dịch vụ chạy ngầm"
 
-#: builtin/fsmonitor--daemon.c:1416
 msgid "daemon not online yet"
 msgstr "ứng dụng chạy ngầm hiện chưa trực tuyến"
 
-#: builtin/fsmonitor--daemon.c:1419
 msgid "daemon terminated"
 msgstr "dịch vụ chạy ngầm đã bị dừng"
 
-#: builtin/fsmonitor--daemon.c:1429
 msgid "detach from console"
 msgstr "tách rời khỏi bảng điều khiển"
 
-#: builtin/fsmonitor--daemon.c:1432
 msgid "use <n> ipc worker threads"
 msgstr "dùng <n> tuyến trình làm việc ipc"
 
-#: builtin/fsmonitor--daemon.c:1435
 msgid "max seconds to wait for background daemon startup"
 msgstr "số giây chờ tối đa khi khởi động dịch vụ chạy nền"
 
-#: builtin/fsmonitor--daemon.c:1449
 #, c-format
 msgid "invalid 'ipc-threads' value (%d)"
 msgstr "giá trị 'ipc-threads' không hợp lệ (%d)"
 
-#: builtin/fsmonitor--daemon.c:1464
 #, c-format
 msgid "Unhandled subcommand '%s'"
 msgstr "Lệnh con không được xử lý '%s'"
 
-#: builtin/fsmonitor--daemon.c:1477
 msgid "fsmonitor--daemon not supported on this platform"
 msgstr "fsmonitor--daemon không hỗ trợ trên nền tảng này"
 
-#: builtin/gc.c:39
 msgid "git gc [<options>]"
 msgstr "git gc [<các tùy chọn>]"
 
-#: builtin/gc.c:93
 #, c-format
 msgid "Failed to fstat %s: %s"
 msgstr "Gặp lỗi khi lấy thông tin thống kê về tập tin %s: %s"
 
-#: builtin/gc.c:129
 #, c-format
 msgid "failed to parse '%s' value '%s'"
 msgstr "gặp lỗi khi phân tích “%s” giá trị “%s”"
 
-#: builtin/gc.c:488 builtin/init-db.c:57
 #, c-format
 msgid "cannot stat '%s'"
 msgstr "không thể lấy thông tin thống kê về “%s”"
 
-#: builtin/gc.c:504
 #, c-format
 msgid ""
 "The last gc run reported the following. Please correct the root cause\n"
@@ -16421,54 +6353,46 @@ msgstr ""
 "\n"
 "%s"
 
-#: builtin/gc.c:552
 msgid "prune unreferenced objects"
 msgstr "xóa bỏ các đối tượng không được tham chiếu"
 
-#: builtin/gc.c:554
+msgid "pack unreferenced objects separately"
+msgstr "đóng gói riêng các đối tượng không được tham chiếu"
+
 msgid "be more thorough (increased runtime)"
 msgstr "cẩn thận hơn nữa (tăng thời gian chạy)"
 
-#: builtin/gc.c:555
 msgid "enable auto-gc mode"
 msgstr "bật chế độ auto-gc"
 
-#: builtin/gc.c:558
 msgid "force running gc even if there may be another gc running"
 msgstr "buộc gc chạy ngay cả khi có tiến trình gc khác đang chạy"
 
-#: builtin/gc.c:561
 msgid "repack all other packs except the largest pack"
 msgstr "đóng gói lại tất cả các gói khác ngoại trừ gói lớn nhất"
 
-#: builtin/gc.c:577
 #, c-format
-msgid "failed to parse gc.logexpiry value %s"
-msgstr "gặp lỗi khi phân tích giá trị gc.logexpiry %s"
+msgid "failed to parse gc.logExpiry value %s"
+msgstr "gặp lỗi khi phân tích giá trị gc.logExpiry %s"
 
-#: builtin/gc.c:588
 #, c-format
 msgid "failed to parse prune expiry value %s"
 msgstr "gặp lỗi khi phân tích giá trị prune %s"
 
-#: builtin/gc.c:608
 #, c-format
 msgid "Auto packing the repository in background for optimum performance.\n"
 msgstr ""
 "Tự động đóng gói kho chứa trên nền hệ thống để tối ưu hóa hiệu suất làm "
 "việc.\n"
 
-#: builtin/gc.c:610
 #, c-format
 msgid "Auto packing the repository for optimum performance.\n"
 msgstr "Tự động đóng gói kho chứa để tối ưu hóa hiệu suất làm việc.\n"
 
-#: builtin/gc.c:611
 #, c-format
 msgid "See \"git help gc\" for manual housekeeping.\n"
 msgstr "Xem \"git help gc\" để có hướng dẫn cụ thể về cách dọn dẹp kho git.\n"
 
-#: builtin/gc.c:652
 #, c-format
 msgid ""
 "gc is already running on machine '%s' pid %<PRIuMAX> (use --force if not)"
@@ -16476,481 +6400,373 @@ msgstr ""
 "gc đang được thực hiện trên máy “%s” pid %<PRIuMAX> (dùng --force nếu không "
 "phải thế)"
 
-#: builtin/gc.c:707
 msgid ""
 "There are too many unreachable loose objects; run 'git prune' to remove them."
 msgstr ""
 "Có quá nhiều đối tượng tự do không được dùng đến; hãy chạy lệnh “git prune” "
 "để xóa bỏ chúng đi."
 
-#: builtin/gc.c:717
 msgid ""
 "git maintenance run [--auto] [--[no-]quiet] [--task=<task>] [--schedule]"
 msgstr ""
 "git maintenance run [--auto] [--[no-]quiet] [--task=<nhiệm vụ>] [--schedule]"
 
-#: builtin/gc.c:747
 msgid "--no-schedule is not allowed"
 msgstr "--no-schedule không được phép"
 
-#: builtin/gc.c:752
 #, c-format
 msgid "unrecognized --schedule argument '%s'"
 msgstr "đối số --schedule không được thừa nhận %s"
 
-#: builtin/gc.c:870
 msgid "failed to write commit-graph"
 msgstr "gặp lỗi khi ghi đồ thị các lần chuyển giao"
 
-#: builtin/gc.c:906
 msgid "failed to prefetch remotes"
 msgstr "gặp lỗi khi tải trước các máy chủ"
 
-#: builtin/gc.c:1022
 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
 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:1090
 msgid "failed to write multi-pack-index"
 msgstr "gặp lỗi khi ghi multi-pack-index"
 
-#: builtin/gc.c:1106
 msgid "'git multi-pack-index expire' failed"
 msgstr "gặp lỗi khi chạy “git multi-pack-index expire”"
 
-#: builtin/gc.c:1165
 msgid "'git multi-pack-index repack' failed"
 msgstr "gặp lỗi khi chạy “git multi-pack-index repack”"
 
-#: builtin/gc.c:1174
 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:1278
 #, 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:1308
 #, c-format
 msgid "task '%s' failed"
 msgstr "gặp lỗi khi thực hiện nhiệm vụ “%s”"
 
-#: builtin/gc.c:1390
 #, 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:1395
 #, 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:1410
 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:1411
 msgid "frequency"
 msgstr "tần số"
 
-#: builtin/gc.c:1412
 msgid "run tasks based on frequency"
 msgstr "chạy nhiệm vụ dựa trên tần suất"
 
-#: builtin/gc.c:1415
 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:1416
 msgid "task"
 msgstr "tác vụ"
 
-#: builtin/gc.c:1417
 msgid "run a specific task"
 msgstr "chạy một nhiệm vụ cụ thể"
 
-#: builtin/gc.c:1434
 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:1477
 msgid "failed to run 'git config'"
 msgstr "gặp lỗi khi chạy “git config”"
 
-#: builtin/gc.c:1629
 #, c-format
 msgid "failed to expand path '%s'"
 msgstr "gặp lỗi khi khai triển đường dẫn “%s”"
 
-#: builtin/gc.c:1656 builtin/gc.c:1694
 msgid "failed to start launchctl"
 msgstr "gặp lỗi khi khởi chạy launchctl"
 
-#: builtin/gc.c:1769 builtin/gc.c:2237
 #, 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:1796
 #, c-format
 msgid "failed to bootstrap service %s"
 msgstr "gặp lỗi khi mồi dịch vụ %s"
 
-#: builtin/gc.c:1889
 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:1979
 msgid "failed to start schtasks"
 msgstr "gặp lỗi khi lấy thông tin thống kê về schtasks"
 
-#: builtin/gc.c:2063
 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:2080
 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:2084
 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:2126
 msgid "'crontab' died"
 msgstr "“crontab” đã chết"
 
-#: builtin/gc.c:2191
 msgid "failed to start systemctl"
 msgstr "gặp lỗi khi khởi chạy systemctl"
 
-#: builtin/gc.c:2201
 msgid "failed to run systemctl"
 msgstr "gặp lỗi khi chạy systemctl"
 
-#: builtin/gc.c:2210 builtin/gc.c:2215 builtin/worktree.c:63
-#: builtin/worktree.c:1024
 #, c-format
 msgid "failed to delete '%s'"
 msgstr "gặp lỗi khi xóa “%s”"
 
-#: builtin/gc.c:2395
+#, c-format
+msgid "failed to flush '%s'"
+msgstr "gặp lỗi khi đẩy dữ liệu “%s” lên đĩa"
+
 #, c-format
 msgid "unrecognized --scheduler argument '%s'"
 msgstr "đối số --scheduler không được thừa nhận “%s”"
 
-#: builtin/gc.c:2420
 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:2435
 #, c-format
 msgid "%s scheduler is not available"
 msgstr "bộ lên lịch %s không sẵn có"
 
-#: builtin/gc.c:2449
 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:2471
 msgid "git maintenance start [--scheduler=<scheduler>]"
 msgstr "git maintenance start [--scheduler=<bộ lên lịch>]"
 
-#: builtin/gc.c:2480
 msgid "scheduler"
 msgstr "bộ lên lịch"
 
-#: builtin/gc.c:2481
 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:2495
 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:2504
 msgid "git maintenance <subcommand> [<options>]"
 msgstr "git maintenance run <lệnh_con> [<các tùy chọn>]"
 
-#: builtin/gc.c:2523
 #, c-format
 msgid "invalid subcommand: %s"
 msgstr "lện con không hợp lệ: %s"
 
-#: builtin/grep.c:32
 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:241
 #, c-format
 msgid "grep: failed to create thread: %s"
 msgstr "grep: gặp lỗi tạo tuyến (thread): %s"
 
-#: builtin/grep.c:295
 #, c-format
 msgid "invalid number of threads specified (%d) for %s"
 msgstr "số tuyến đã cho không hợp lệ (%d) cho %s"
 
+#. #-#-#-#-#  grep.c.po  #-#-#-#-#
 #. TRANSLATORS: %s is the configuration
 #. variable for tweaking threads, currently
 #. grep.threads
 #.
-#: builtin/grep.c:303 builtin/index-pack.c:1587 builtin/index-pack.c:1791
-#: builtin/pack-objects.c:3150
 #, c-format
 msgid "no threads support, ignoring %s"
 msgstr "không hỗ trợ đa tuyến, bỏ qua %s"
 
-#: builtin/grep.c:490 builtin/grep.c:619 builtin/grep.c:659
 #, c-format
 msgid "unable to read tree (%s)"
 msgstr "không thể đọc cây (%s)"
 
-#: builtin/grep.c:674
 #, 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:754
 #, 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:852
 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:854
 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:856
 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:858
 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:860
 msgid "recursively search in each submodule"
 msgstr "tìm kiếm đệ quy trong từng mô-đun-con"
 
-#: builtin/grep.c:863
 msgid "show non-matching lines"
 msgstr "hiển thị những dòng không khớp với mẫu"
 
-#: builtin/grep.c:865
 msgid "case insensitive matching"
 msgstr "phân biệt HOA/thường"
 
-#: builtin/grep.c:867
 msgid "match patterns only at word boundaries"
 msgstr "chỉ khớp mẫu tại đường ranh giới từ"
 
-#: builtin/grep.c:869
 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:871
 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:874
 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:876
 msgid "search in subdirectories (default)"
 msgstr "tìm kiếm trong thư mục con (mặc định)"
 
-#: builtin/grep.c:878
 msgid "descend at most <depth> levels"
 msgstr "hạ xuống ít nhất là mức <sâu>"
 
-#: builtin/grep.c:882
 msgid "use extended POSIX regular expressions"
 msgstr "dùng biểu thức chính qui POSIX có mở rộng"
 
-#: builtin/grep.c:885
 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:888
 msgid "interpret patterns as fixed strings"
 msgstr "diễn dịch các mẫu như là chuỗi cố định"
 
-#: builtin/grep.c:891
 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:894
 msgid "show line numbers"
 msgstr "hiển thị số của dòng"
 
-#: builtin/grep.c:895
 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:896
 msgid "don't show filenames"
 msgstr "không hiển thị tên tập tin"
 
-#: builtin/grep.c:897
 msgid "show filenames"
 msgstr "hiển thị các tên tập tin"
 
-#: builtin/grep.c:899
 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:901
 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:903
 msgid "synonym for --files-with-matches"
 msgstr "đồng nghĩa với --files-with-matches"
 
-#: builtin/grep.c:906
 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:908
 msgid "print NUL after filenames"
 msgstr "thêm NUL vào sau tên tập tin"
 
-#: builtin/grep.c:911
 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:913
 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:914
 msgid "highlight matches"
 msgstr "tô sáng phần khớp mẫu"
 
-#: builtin/grep.c:916
 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:918
 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:921
 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:924
 msgid "show <n> context lines before matches"
 msgstr "hiển thị <n> dòng nội dung trước khớp"
 
-#: builtin/grep.c:926
 msgid "show <n> context lines after matches"
 msgstr "hiển thị <n> dòng nội dung sau khớp"
 
-#: builtin/grep.c:928
 msgid "use <n> worker threads"
 msgstr "dùng <n> tuyến trình làm việc"
 
-#: builtin/grep.c:929
 msgid "shortcut for -C NUM"
 msgstr "dạng viết tắt của -C SỐ"
 
-#: builtin/grep.c:932
 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:934
 msgid "show the surrounding function"
 msgstr "hiển thị hàm bao quanh"
 
-#: builtin/grep.c:937
 msgid "read patterns from file"
 msgstr "đọc mẫu từ tập-tin"
 
-#: builtin/grep.c:939
 msgid "match <pattern>"
 msgstr "match <mẫu>"
 
-#: builtin/grep.c:941
 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:953
 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:955
 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:958
 msgid "pager"
 msgstr "dàn trang"
 
-#: builtin/grep.c:958
 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:962
 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:1028
 msgid "no pattern given"
 msgstr "chưa chỉ ra mẫu"
 
-#: builtin/grep.c:1064
 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:1072
 #, 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:1102
 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:1106
 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:1109 builtin/pack-objects.c:4084
 msgid "no threads support, ignoring --threads"
 msgstr "không hỗ trợ đa tuyến, bỏ qua --threads"
 
-#: builtin/grep.c:1112 builtin/index-pack.c:1584 builtin/pack-objects.c:3147
 #, c-format
 msgid "invalid number of threads specified (%d)"
 msgstr "số tuyến chỉ ra không hợp lệ (%d)"
 
-#: builtin/grep.c:1146
 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:1179
 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:1187
 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:83
 msgid ""
 "git hash-object [-t <type>] [-w] [--path=<file> | --no-filters] [--stdin] "
 "[--] <file>..."
@@ -16958,99 +6774,76 @@ msgstr ""
 "git hash-object [-t <kiểu>] [-w] [--path=<tập-tin> | --no-filters] [--stdin] "
 "[--] <tập-tin>…"
 
-#: builtin/hash-object.c:97
 msgid "object type"
 msgstr "kiểu đối tượng"
 
-#: builtin/hash-object.c:98
 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:100
 msgid "read the object from stdin"
 msgstr "đọc đối tượng từ đầu vào tiêu chuẩn stdin"
 
-#: builtin/hash-object.c:102
 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:103
 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:104
 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:57
 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:60
 msgid "show external commands in --all"
 msgstr "hiển thị các lệnh bên ngoài trong --all"
 
-#: builtin/help.c:61
 msgid "show aliases in --all"
 msgstr "hiển thị các bí danh trong --all"
 
-#: builtin/help.c:62
 msgid "exclude guides"
 msgstr "hướng dẫn loại trừ"
 
-#: builtin/help.c:63
 msgid "show man page"
 msgstr "hiển thị trang man"
 
-#: builtin/help.c:64
 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:66
 msgid "show info page"
 msgstr "hiển thị trang info"
 
-#: builtin/help.c:68
 msgid "print command description"
 msgstr "hiển thị mô tả lệnh"
 
-#: builtin/help.c:70
 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:72
 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:84
 msgid "git help [[-i|--info] [-m|--man] [-w|--web]] [<command>]"
 msgstr "git help [[-i|--info] [-m|--man] [-w|--web]] [<lệnh>]"
 
-#: builtin/help.c:201
 #, c-format
 msgid "unrecognized help format '%s'"
 msgstr "không nhận ra định dạng trợ giúp “%s”"
 
-#: builtin/help.c:227
 msgid "Failed to start emacsclient."
 msgstr "Gặp lỗi khi khởi chạy emacsclient."
 
-#: builtin/help.c:240
 msgid "Failed to parse emacsclient version."
 msgstr "Gặp lỗi khi phân tích phiên bản emacsclient."
 
-#: builtin/help.c:248
 #, c-format
 msgid "emacsclient version '%d' too old (< 22)."
 msgstr "phiên bản của emacsclient “%d” quá cũ (< 22)."
 
-#: builtin/help.c:266 builtin/help.c:288 builtin/help.c:298 builtin/help.c:306
 #, c-format
 msgid "failed to exec '%s'"
 msgstr "gặp lỗi khi thực thi “%s”"
 
-#: builtin/help.c:344
 #, c-format
 msgid ""
 "'%s': path for unsupported man viewer.\n"
@@ -17059,7 +6852,6 @@ msgstr ""
 "“%s”: đường dẫn không hỗ trợ bộ trình chiếu man.\n"
 "Hãy cân nhắc đến việc sử dụng “man.<tool>.cmd” để thay thế."
 
-#: builtin/help.c:356
 #, c-format
 msgid ""
 "'%s': cmd for supported man viewer.\n"
@@ -17068,418 +6860,328 @@ msgstr ""
 "“%s”: cmd (lệnh) hỗ trợ bộ trình chiếu man.\n"
 "Hãy cân nhắc đến việc sử dụng “man.<tool>.path” để thay thế."
 
-#: builtin/help.c:471
 #, c-format
 msgid "'%s': unknown man viewer."
 msgstr "“%s”: không rõ chương trình xem man."
 
-#: builtin/help.c:487
 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:494
 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:555 builtin/help.c:566 git.c:348
 #, c-format
 msgid "'%s' is aliased to '%s'"
 msgstr "“%s” được đặt bí danh thành “%s”"
 
-#: builtin/help.c:569 git.c:380
 #, c-format
 msgid "bad alias.%s string: %s"
 msgstr "chuỗi alias.%s sai: %s"
 
-#: builtin/help.c:611
 #, c-format
 msgid "the '%s' option doesn't take any non-option arguments"
 msgstr "tùy chọn '%s' không nhận bất kỳ tham số không phải tùy chọn nào khác"
 
-#: builtin/help.c:631
 msgid ""
 "the '--no-[external-commands|aliases]' options can only be used with '--all'"
 msgstr ""
 "tùy chọn '--no-[external-commands|aliases]' chỉ có thể sử dụng cùng với '--"
 "all'"
 
-#: builtin/help.c:643 builtin/help.c:671
 #, c-format
 msgid "usage: %s%s"
 msgstr "cách dùng: %s%s"
 
-#: builtin/help.c:666
 msgid "'git help config' for more information"
 msgstr "Chạy lệnh “git help config” để có thêm thông tin"
 
-#: builtin/hook.c:10
 msgid "git hook run [--ignore-missing] <hook-name> [-- <hook-args>]"
 msgstr "git hook run [--ignore-missing] <tên-móc> [-- <các tham số cho móc>]"
 
-#: builtin/hook.c:30
 msgid "silently ignore missing requested <hook-name>"
 msgstr "bỏ qua âm thầm các <hook-name> đã yêu cầu còn thiếu"
 
-#: 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: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: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: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:304
 msgid "early EOF"
 msgstr "gặp kết thúc tập tin EOF quá sớm"
 
-#: builtin/index-pack.c:305
 msgid "read error on input"
 msgstr "lỗi đọc ở đầu vào"
 
-#: 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:324 builtin/pack-objects.c:754
 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:329
 #, c-format
 msgid "pack exceeds maximum allowed size (%s)"
 msgstr "gói đã vượt quá cỡ tối đa được phép (%s)"
 
-#: builtin/index-pack.c:362
 msgid "pack signature mismatch"
 msgstr "chữ ký cho gói không khớp"
 
-#: builtin/index-pack.c:364
 #, c-format
 msgid "pack version %<PRIu32> unsupported"
 msgstr "không hỗ trợ phiên bản gói %<PRIu32>"
 
-#: builtin/index-pack.c:380
 #, 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:485
 #, c-format
 msgid "inflate returned %d"
 msgstr "xả nén trả về %d"
 
-#: builtin/index-pack.c:534
 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:542
 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:550
 #, c-format
 msgid "unknown object type %d"
 msgstr "không hiểu kiểu đối tượng %d"
 
-#: builtin/index-pack.c:581
 msgid "cannot pread pack file"
 msgstr "không thể chạy hàm pread cho tập tin gói"
 
-#: builtin/index-pack.c:583
 #, 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:609
 msgid "serious inflate inconsistency"
 msgstr "sự mâu thuẫn xả nén nghiêm trọng"
 
-#: builtin/index-pack.c:754 builtin/index-pack.c:760 builtin/index-pack.c:784
-#: builtin/index-pack.c:823 builtin/index-pack.c:832
 #, c-format
 msgid "SHA1 COLLISION FOUND WITH %s !"
 msgstr "SỰ VA CHẠM SHA1 ĐÃ XẢY RA VỚI %s!"
 
-#: builtin/index-pack.c:757 builtin/pack-objects.c:290
-#: builtin/pack-objects.c:350 builtin/pack-objects.c:456
 #, c-format
 msgid "unable to read %s"
 msgstr "không thể đọc %s"
 
-#: builtin/index-pack.c:821
 #, 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:829
 #, 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:843
 #, c-format
 msgid "invalid blob object %s"
 msgstr "đối tượng blob không hợp lệ %s"
 
-#: builtin/index-pack.c:846 builtin/index-pack.c:865
 msgid "fsck error in packed object"
 msgstr "lỗi fsck trong đối tượng đóng gói"
 
-#: builtin/index-pack.c:867
 #, 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:928 builtin/index-pack.c:975
 msgid "failed to apply delta"
 msgstr "gặp lỗi khi áp dụng delta"
 
-#: builtin/index-pack.c:1161
 msgid "Receiving objects"
 msgstr "Đang nhận về các đối tượng"
 
-#: builtin/index-pack.c:1161
 msgid "Indexing objects"
 msgstr "Các đối tượng bảng mục lục"
 
-#: builtin/index-pack.c:1195
 msgid "pack is corrupted (SHA1 mismatch)"
 msgstr "gói bị sai hỏng (SHA1 không khớp)"
 
-#: builtin/index-pack.c:1200
 msgid "cannot fstat packfile"
 msgstr "không thể lấy thông tin thống kê packfile"
 
-#: builtin/index-pack.c:1203
 msgid "pack has junk at the end"
 msgstr "pack có phần thừa ở cuối"
 
-#: builtin/index-pack.c:1215
 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:1238
 msgid "Resolving deltas"
 msgstr "Đang phân giải các delta"
 
-#: builtin/index-pack.c:1249 builtin/pack-objects.c:2913
 #, c-format
 msgid "unable to create thread: %s"
 msgstr "không thể tạo tuyến: %s"
 
-#: builtin/index-pack.c:1282
 msgid "confusion beyond insanity"
 msgstr "lộn xộn hơn cả điên rồ"
 
-#: builtin/index-pack.c:1288
 #, 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:1300
 #, 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:1304
 #, 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:1328
 #, 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
 #, c-format
 msgid "local object %s is corrupt"
 msgstr "đối tượng nội bộ %s bị hỏng"
 
-#: builtin/index-pack.c:1445
 #, 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:1469
 #, c-format
 msgid "cannot write %s file '%s'"
 msgstr "không thể ghi %s tập tin “%s”"
 
-#: builtin/index-pack.c:1477
 #, 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:1494
 #, 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:1519
 msgid "error while closing pack file"
 msgstr "gặp lỗi trong khi đóng tập tin gói"
 
-#: builtin/index-pack.c:1578 builtin/pack-objects.c:3158
 #, c-format
-msgid "bad pack.indexversion=%<PRIu32>"
-msgstr "sai pack.indexversion=%<PRIu32>"
+msgid "bad pack.indexVersion=%<PRIu32>"
+msgstr "sai pack.indexVersion=%<PRIu32>"
 
-#: builtin/index-pack.c:1648
 #, 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:1650
 #, 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:1698
 #, 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:1705
 #, 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
 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:1825 builtin/index-pack.c:1829
 #, c-format
 msgid "bad %s"
 msgstr "%s sai"
 
-#: builtin/index-pack.c:1835 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:1856
 msgid "--stdin requires a git repository"
 msgstr "--stdin cần một kho git"
 
-#: builtin/index-pack.c:1873
 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:1939 builtin/unpack-objects.c:584
 msgid "fsck error in pack objects"
 msgstr "lỗi fsck trong các đối tượng gói"
 
-#: builtin/init-db.c:63
 #, c-format
 msgid "cannot stat template '%s'"
 msgstr "không thể lấy thông tin thống kê về mẫu “%s”"
 
-#: builtin/init-db.c:68
 #, c-format
 msgid "cannot opendir '%s'"
 msgstr "không thể opendir() “%s”"
 
-#: builtin/init-db.c:80
 #, c-format
 msgid "cannot readlink '%s'"
 msgstr "không thể readlink “%s”"
 
-#: builtin/init-db.c:82
 #, c-format
 msgid "cannot symlink '%s' '%s'"
 msgstr "không thể tạo liên kết mềm (symlink) “%s” “%s”"
 
-#: builtin/init-db.c:88
 #, c-format
 msgid "cannot copy '%s' to '%s'"
 msgstr "không thể sao chép “%s” sang “%s”"
 
-#: builtin/init-db.c:92
 #, c-format
 msgid "ignoring template %s"
 msgstr "đang lờ đi mẫu “%s”"
 
-#: builtin/init-db.c:123
 #, c-format
 msgid "templates not found in %s"
 msgstr "các mẫu không được tìm thấy trong %s"
 
-#: builtin/init-db.c:138
 #, c-format
 msgid "not copying templates from '%s': %s"
 msgstr "không sao chép các mẫu từ “%s”: %s"
 
-#: builtin/init-db.c:263
 #, c-format
 msgid "invalid initial branch name: '%s'"
 msgstr "tên nhánh khởi tạo không hợp lệ: “%s”"
 
-#: builtin/init-db.c:354
 #, c-format
 msgid "unable to handle file type %d"
 msgstr "không thể xử lý (handle) tập tin kiểu %d"
 
-#: builtin/init-db.c:357
 #, c-format
 msgid "unable to move %s to %s"
 msgstr "không di chuyển được %s vào %s"
 
-#: builtin/init-db.c:373
 msgid "attempt to reinitialize repository with different hash"
 msgstr "cố để khởi tạo lại một kho với kiểu băm dữ liệu khác"
 
-#: builtin/init-db.c:397 builtin/init-db.c:400
 #, c-format
 msgid "%s already exists"
 msgstr "%s đã có từ trước rồi"
 
-#: builtin/init-db.c:432
 #, c-format
 msgid "re-init: ignored --initial-branch=%s"
 msgstr "re-init: --initial-branch=%s bị bỏ qua"
 
-#: builtin/init-db.c:463
 #, c-format
 msgid "Reinitialized existing shared Git repository in %s%s\n"
 msgstr "Đã khởi tạo lại kho Git chia sẻ sẵn có trong %s%s\n"
 
-#: builtin/init-db.c:464
 #, c-format
 msgid "Reinitialized existing Git repository in %s%s\n"
 msgstr "Đã khởi tạo lại kho Git sẵn có trong %s%s\n"
 
-#: builtin/init-db.c:468
 #, c-format
 msgid "Initialized empty shared Git repository in %s%s\n"
 msgstr "Đã khởi tạo lại kho Git chia sẻ trống rỗng sẵn có trong %s%s\n"
 
-#: builtin/init-db.c:469
 #, c-format
 msgid "Initialized empty Git repository in %s%s\n"
 msgstr "Đã khởi tạo lại kho Git trống rỗng sẵn có trong %s%s\n"
 
-#: builtin/init-db.c:518
 msgid ""
 "git init [-q | --quiet] [--bare] [--template=<template-directory>] [--"
 "shared[=<permissions>]] [<directory>]"
@@ -17487,37 +7189,29 @@ msgstr ""
 "git init [-q | --quiet] [--bare] [--template=<thư-mục-tạm>] [--shared[=<các-"
 "quyền>]] [thư-mục]"
 
-#: builtin/init-db.c:544
 msgid "permissions"
 msgstr "các quyền"
 
-#: builtin/init-db.c:545
 msgid "specify that the git repository is to be shared amongst several users"
 msgstr "chỉ ra cái mà kho git được chia sẻ giữa nhiều người dùng"
 
-#: builtin/init-db.c:551
 msgid "override the name of the initial branch"
 msgstr "ghi đè lên tên của nhánh khởi tạo"
 
-#: builtin/init-db.c:552 builtin/verify-pack.c:74
 msgid "hash"
 msgstr "băm"
 
-#: builtin/init-db.c:553 builtin/show-index.c:22 builtin/verify-pack.c:75
 msgid "specify the hash algorithm to use"
 msgstr "chỉ định thuật toán băm dữ liệu muốn dùng"
 
-#: builtin/init-db.c:591 builtin/init-db.c:596
 #, c-format
 msgid "cannot mkdir %s"
 msgstr "không thể mkdir (tạo thư mục): %s"
 
-#: builtin/init-db.c:600 builtin/init-db.c:655
 #, c-format
 msgid "cannot chdir to %s"
 msgstr "không thể chdir (chuyển đổi thư mục) sang %s"
 
-#: builtin/init-db.c:627
 #, c-format
 msgid ""
 "%s (or --work-tree=<directory>) not allowed without specifying %s (or --git-"
@@ -17526,16 +7220,13 @@ msgstr ""
 "%s (hoặc --work-tree=<thư-mục>) không cho phép không chỉ định %s (hoặc --git-"
 "dir=<thư-mục>)"
 
-#: builtin/init-db.c:679
 #, c-format
 msgid "Cannot access work tree '%s'"
 msgstr "Không thể truy cập cây (tree) làm việc “%s”"
 
-#: builtin/init-db.c:684
 msgid "--separate-git-dir incompatible with bare repository"
 msgstr "--separate-git-dir xung khắc với kho thuần"
 
-#: builtin/interpret-trailers.c:16
 msgid ""
 "git interpret-trailers [--in-place] [--trim-empty] [(--trailer "
 "<token>[(=|:)<value>])...] [<file>...]"
@@ -17543,92 +7234,73 @@ msgstr ""
 "git interpret-trailers [--in-place] [--trim-empty] [(--trailer "
 "<thẻ>[(=|:)<giá-trị>])…] [<tập-tin>…]"
 
-#: builtin/interpret-trailers.c:95
 msgid "edit files in place"
 msgstr "sửa các tập tin tại chỗ"
 
-#: builtin/interpret-trailers.c:96
 msgid "trim empty trailers"
 msgstr "bộ dò vết cắt bỏ phần trống rỗng"
 
-#: builtin/interpret-trailers.c:99
 msgid "where to place the new trailer"
 msgstr "đặt phần đuôi mới ở đâu"
 
-#: builtin/interpret-trailers.c:101
 msgid "action if trailer already exists"
 msgstr "thao tác khi đã có phần đuôi"
 
-#: builtin/interpret-trailers.c:103
 msgid "action if trailer is missing"
 msgstr "thao tác khi thiếu phần đuôi"
 
-#: builtin/interpret-trailers.c:105
 msgid "output only the trailers"
 msgstr "chỉ xuất phần đuôi"
 
-#: builtin/interpret-trailers.c:106
 msgid "do not apply config rules"
 msgstr "đừng áp dụng các quy tắc cấu hình"
 
-#: builtin/interpret-trailers.c:107
 msgid "join whitespace-continued values"
 msgstr "nối các giá trị khoảng-trắng-liên-tiếp"
 
-#: builtin/interpret-trailers.c:108
 msgid "set parsing options"
 msgstr "đặt các tùy chọn phân tích cú pháp"
 
-#: builtin/interpret-trailers.c:110
 msgid "do not treat --- specially"
 msgstr "không coi --- là đặc biệt"
 
-#: builtin/interpret-trailers.c:112
 msgid "trailer(s) to add"
 msgstr "bộ dò vết cần thêm"
 
-#: builtin/interpret-trailers.c:123
 msgid "--trailer with --only-input does not make sense"
 msgstr "--trailer cùng với --only-input không hợp lý"
 
-#: builtin/interpret-trailers.c:133
 msgid "no input file given for in-place editing"
 msgstr "không đưa ra tập tin đầu vào để sửa tại-chỗ"
 
-#: builtin/log.c:60
 msgid "git log [<options>] [<revision-range>] [[--] <path>...]"
 msgstr "git log [<các tùy chọn>] [<vùng-xem-xét>] [[--] </đường/dẫn>…]"
 
-#: builtin/log.c:61
 msgid "git show [<options>] <object>..."
 msgstr "git show [<các tùy chọn>] <đối-tượng>…"
 
-#: builtin/log.c:114
 #, c-format
 msgid "invalid --decorate option: %s"
 msgstr "tùy chọn --decorate không hợp lệ: %s"
 
-#: builtin/log.c:181
+msgid "suppress diff output"
+msgstr "chặn mọi kết xuất từ diff"
+
 msgid "show source"
 msgstr "hiển thị mã nguồn"
 
-#: builtin/log.c:182
 msgid "use mail map file"
 msgstr "sử dụng tập tin ánh xạ thư"
 
-#: builtin/log.c:185
 msgid "only decorate refs that match <pattern>"
 msgstr "chỉ tô sáng các tham chiếu khớp với <mẫu>"
 
-#: builtin/log.c:187
 msgid "do not decorate refs that match <pattern>"
 msgstr "không tô sáng các tham chiếu khớp với <mẫu>"
 
-#: builtin/log.c:188
 msgid "decorate options"
 msgstr "các tùy chọn trang trí"
 
-#: builtin/log.c:191
 msgid ""
 "trace the evolution of line range <start>,<end> or function :<funcname> in "
 "<file>"
@@ -17636,93 +7308,76 @@ msgstr ""
 "theo dõi sự tiến hóa của phạm vi <start><end> dòng, hoặc chức năng:"
 "<funcname> trong <file>"
 
-#: builtin/log.c:214
+#, c-format
+msgid "unrecognized argument: %s"
+msgstr "đối số không được thừa nhận: %s"
+
 msgid "-L<range>:<file> cannot be used with pathspec"
 msgstr "-L<vùng>:<tập_tin> không thể được sử dụng với đặc tả đường dẫn"
 
-#: builtin/log.c:322
 #, c-format
 msgid "Final output: %d %s\n"
 msgstr "Kết xuất cuối cùng: %d %s\n"
 
-#: builtin/log.c:429
 msgid "unable to create temporary object directory"
 msgstr "không thể tạo thư mục đối tượng tạm thời"
 
-#: builtin/log.c:599
 #, c-format
 msgid "git show %s: bad file"
 msgstr "git show %s: sai tập tin"
 
-#: builtin/log.c:614 builtin/log.c:706
 #, c-format
 msgid "could not read object %s"
 msgstr "không thể đọc đối tượng %s"
 
-#: builtin/log.c:731
 #, c-format
 msgid "unknown type: %d"
 msgstr "không nhận ra kiểu: %d"
 
-#: builtin/log.c:880
 #, c-format
 msgid "%s: invalid cover from description mode"
 msgstr "%s: bao bọc không hợp lệ từ chế độ mô tả"
 
-#: builtin/log.c:887
 msgid "format.headers without value"
 msgstr "format.headers không có giá trị cụ thể"
 
-#: builtin/log.c:1016
 #, c-format
 msgid "cannot open patch file %s"
 msgstr "không thể mở tập tin miếng vá: %s"
 
-#: builtin/log.c:1033
 msgid "need exactly one range"
 msgstr "cần chính xác một vùng"
 
-#: builtin/log.c:1043
 msgid "not a range"
 msgstr "không phải là một vùng"
 
-#: builtin/log.c:1207
 msgid "cover letter needs email format"
 msgstr "“cover letter” cần cho định dạng thư"
 
-#: builtin/log.c:1213
 msgid "failed to create cover-letter file"
 msgstr "gặp lỗi khi tạo các tập tin cover-letter"
 
-#: builtin/log.c:1300
 #, c-format
 msgid "insane in-reply-to: %s"
 msgstr "in-reply-to điên rồ: %s"
 
-#: builtin/log.c:1327
 msgid "git format-patch [<options>] [<since> | <revision-range>]"
 msgstr "git format-patch [<các tùy chọn>] [<kể-từ> | <vùng-xem-xét>]"
 
-#: builtin/log.c:1385
 msgid "two output directories?"
 msgstr "hai thư mục kết xuất?"
 
-#: builtin/log.c:1536 builtin/log.c:2369 builtin/log.c:2371 builtin/log.c:2383
 #, c-format
 msgid "unknown commit %s"
 msgstr "không hiểu lần chuyển giao %s"
 
-#: builtin/log.c:1547 builtin/replace.c:58 builtin/replace.c:207
-#: builtin/replace.c:210
 #, 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/log.c:1556
 msgid "could not find exact merge base"
 msgstr "không tìm thấy nền hòa trộn chính xác"
 
-#: builtin/log.c:1566
 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"
@@ -17733,281 +7388,218 @@ msgstr ""
 "nhánh máy chủ. Hoặc là bạn có thể chỉ định lần chuyển giao nền bằng\n"
 "\"--base=<base-commit-id>\" một cách thủ công"
 
-#: builtin/log.c:1589
 msgid "failed to find exact merge base"
 msgstr "gặp lỗi khi tìm nền hòa trộn chính xác"
 
-#: builtin/log.c:1606
 msgid "base commit should be the ancestor of revision list"
 msgstr "lần chuyển giao nền không là tổ tiên của danh sách điểm xét duyệt"
 
-#: builtin/log.c:1616
 msgid "base commit shouldn't be in revision list"
 msgstr "lần chuyển giao nền không được trong danh sách điểm xét duyệt"
 
-#: builtin/log.c:1674
 msgid "cannot get patch id"
 msgstr "không thể lấy mã miếng vá"
 
-#: builtin/log.c:1737
 msgid "failed to infer range-diff origin of current series"
 msgstr ""
 "gặp lỗi khi suy luận range-diff (vùng khác biệt) gốc của sê-ri hiện tại"
 
-#: builtin/log.c:1739
 #, c-format
 msgid "using '%s' as range-diff origin of current series"
 msgstr "dùng “%s” như là gốc range-diff của sê-ri hiện tại"
 
-#: builtin/log.c:1783
 msgid "use [PATCH n/m] even with a single patch"
 msgstr "dùng [PATCH n/m] ngay cả với miếng vá đơn"
 
-#: builtin/log.c:1786
 msgid "use [PATCH] even with multiple patches"
 msgstr "dùng [VÁ] ngay cả với các miếng vá phức tạp"
 
-#: builtin/log.c:1790
 msgid "print patches to standard out"
 msgstr "hiển thị miếng vá ra đầu ra chuẩn"
 
-#: builtin/log.c:1792
 msgid "generate a cover letter"
 msgstr "tạo bì thư"
 
-#: builtin/log.c:1794
 msgid "use simple number sequence for output file names"
 msgstr "sử dụng chỗi dãy số dạng đơn giản cho tên tập-tin xuất ra"
 
-#: builtin/log.c:1795
 msgid "sfx"
 msgstr "sfx"
 
-#: builtin/log.c:1796
 msgid "use <sfx> instead of '.patch'"
 msgstr "sử dụng <sfx> thay cho “.patch”"
 
-#: builtin/log.c:1798
 msgid "start numbering patches at <n> instead of 1"
 msgstr "bắt đầu đánh số miếng vá từ <n> thay vì 1"
 
-#: builtin/log.c:1799
 msgid "reroll-count"
 msgstr "đếm reroll"
 
-#: builtin/log.c:1800
 msgid "mark the series as Nth re-roll"
 msgstr "đánh dấu chuỗi nối tiếp dạng thứ-N re-roll"
 
-#: builtin/log.c:1802
 msgid "max length of output filename"
 msgstr "chiều dài tên tập tin đầu ra tối đa"
 
-#: builtin/log.c:1804
 msgid "use [RFC PATCH] instead of [PATCH]"
 msgstr "dùng [VÁ RFC] thay cho [VÁ]"
 
-#: builtin/log.c:1807
 msgid "cover-from-description-mode"
 msgstr "cover-from-description-mode"
 
-#: builtin/log.c:1808
 msgid "generate parts of a cover letter based on a branch's description"
 msgstr "tạo ra các phần của một lá thư bao gồm dựa trên mô tả của nhánh"
 
-#: builtin/log.c:1810
 msgid "use [<prefix>] instead of [PATCH]"
 msgstr "dùng [<tiền-tố>] thay cho [VÁ]"
 
-#: builtin/log.c:1813
 msgid "store resulting files in <dir>"
 msgstr "lưu các tập tin kết quả trong <t.mục>"
 
-#: builtin/log.c:1816
 msgid "don't strip/add [PATCH]"
 msgstr "không strip/add [VÁ]"
 
-#: builtin/log.c:1819
 msgid "don't output binary diffs"
 msgstr "không kết xuất diff (những khác biệt) nhị phân"
 
-#: builtin/log.c:1821
 msgid "output all-zero hash in From header"
 msgstr "xuất mọi mã băm all-zero trong phần đầu From"
 
-#: builtin/log.c:1823
 msgid "don't include a patch matching a commit upstream"
 msgstr "không bao gồm miếng vá khớp với một lần chuyển giao thượng nguồn"
 
-#: builtin/log.c:1825
 msgid "show patch format instead of default (patch + stat)"
 msgstr "hiển thị định dạng miếng vá thay vì mặc định (miếng vá + thống kê)"
 
-#: builtin/log.c:1827
 msgid "Messaging"
 msgstr "Lời nhắn"
 
-#: builtin/log.c:1828
 msgid "header"
 msgstr "đầu đề thư"
 
-#: builtin/log.c:1829
 msgid "add email header"
 msgstr "thêm đầu đề thư"
 
-#: builtin/log.c:1830 builtin/log.c:1831
 msgid "email"
 msgstr "thư điện tử"
 
-#: builtin/log.c:1830
 msgid "add To: header"
 msgstr "thêm To: đầu đề thư"
 
-#: builtin/log.c:1831
 msgid "add Cc: header"
 msgstr "thêm Cc: đầu đề thư"
 
-#: builtin/log.c:1832
 msgid "ident"
 msgstr "thụt lề"
 
-#: builtin/log.c:1833
 msgid "set From address to <ident> (or committer ident if absent)"
 msgstr ""
 "đặt “Địa chỉ gửi” thành <thụ lề> (hoặc thụt lề người commit nếu bỏ quên)"
 
-#: builtin/log.c:1835
 msgid "message-id"
 msgstr "message-id"
 
-#: builtin/log.c:1836
 msgid "make first mail a reply to <message-id>"
 msgstr "dùng thư đầu tiên để trả lời <message-id>"
 
-#: builtin/log.c:1837 builtin/log.c:1840
 msgid "boundary"
 msgstr "ranh giới"
 
-#: builtin/log.c:1838
 msgid "attach the patch"
 msgstr "đính kèm miếng vá"
 
-#: builtin/log.c:1841
 msgid "inline the patch"
 msgstr "dùng miếng vá làm nội dung"
 
-#: builtin/log.c:1845
 msgid "enable message threading, styles: shallow, deep"
 msgstr "cho phép luồng lời nhắn, kiểu: “shallow”, “deep”"
 
-#: builtin/log.c:1847
 msgid "signature"
 msgstr "chữ ký"
 
-#: builtin/log.c:1848
 msgid "add a signature"
 msgstr "thêm chữ ký"
 
-#: builtin/log.c:1849
 msgid "base-commit"
 msgstr "lần_chuyển_giao_nền"
 
-#: builtin/log.c:1850
 msgid "add prerequisite tree info to the patch series"
 msgstr "add trước hết đòi hỏi thông tin cây tới sê-ri miếng vá"
 
-#: builtin/log.c:1853
 msgid "add a signature from a file"
 msgstr "thêm chữ ký từ một tập tin"
 
-#: builtin/log.c:1854
 msgid "don't print the patch filenames"
 msgstr "không hiển thị các tên tập tin của miếng vá"
 
-#: builtin/log.c:1856
 msgid "show progress while generating patches"
 msgstr "hiển thị bộ đo tiến triển trong khi tạo các miếng vá"
 
-#: builtin/log.c:1858
 msgid "show changes against <rev> in cover letter or single patch"
 msgstr ""
 "hiển thị các thay đổi dựa trên <rev> trong các chữ bao bọc hoặc miếng vá đơn"
 
-#: builtin/log.c:1861
 msgid "show changes against <refspec> in cover letter or single patch"
 msgstr ""
 "hiển thị các thay đổi dựa trên <refspec> trong các chữ bao bọc hoặc miếng vá "
 "đơn"
 
-#: builtin/log.c:1863 builtin/range-diff.c:28
 msgid "percentage by which creation is weighted"
 msgstr "tỷ lệ phần trăm theo cái tạo là weighted"
 
-#: builtin/log.c:1953
 #, c-format
 msgid "invalid ident line: %s"
 msgstr "dòng định danh không hợp lệ: %s"
 
-#: builtin/log.c:1978
 msgid "--name-only does not make sense"
 msgstr "--name-only không hợp lý"
 
-#: builtin/log.c:1980
 msgid "--name-status does not make sense"
 msgstr "--name-status không hợp lý"
 
-#: builtin/log.c:1982
 msgid "--check does not make sense"
 msgstr "--check không hợp lý"
 
-#: builtin/log.c:1984
 msgid "--remerge-diff does not make sense"
 msgstr "--remerge-diff không hợp lý"
 
-#: builtin/log.c:2129
+#, c-format
+msgid "could not create directory '%s'"
+msgstr "không thể tạo thư mục “%s”"
+
 msgid "--interdiff requires --cover-letter or single patch"
 msgstr "--interdiff cần --cover-letter hoặc vá đơn"
 
-#: builtin/log.c:2133
 msgid "Interdiff:"
 msgstr "Interdiff:"
 
-#: builtin/log.c:2134
 #, c-format
 msgid "Interdiff against v%d:"
 msgstr "Interdiff dựa trên v%d:"
 
-#: builtin/log.c:2144
 msgid "--range-diff requires --cover-letter or single patch"
 msgstr "--range-diff yêu cầu --cover-letter hoặc miếng vá đơn"
 
-#: builtin/log.c:2152
 msgid "Range-diff:"
 msgstr "Range-diff:"
 
-#: builtin/log.c:2153
 #, c-format
 msgid "Range-diff against v%d:"
 msgstr "Range-diff dựa trên v%d:"
 
-#: builtin/log.c:2164
 #, c-format
 msgid "unable to read signature file '%s'"
 msgstr "không thể đọc tập tin chữ ký “%s”"
 
-#: builtin/log.c:2200
 msgid "Generating patches"
 msgstr "Đang tạo các miếng vá"
 
-#: builtin/log.c:2244
 msgid "failed to create output files"
 msgstr "gặp lỗi khi tạo các tập tin kết xuất"
 
-#: builtin/log.c:2304
 msgid "git cherry [-v] [<upstream> [<head> [<limit>]]]"
 msgstr "git cherry [-v] [<thượng-nguồn> [<đầu> [<giới-hạn>]]]"
 
-#: builtin/log.c:2358
 #, c-format
 msgid ""
 "Could not find a tracked remote branch, please specify <upstream> manually.\n"
@@ -18015,122 +7607,93 @@ msgstr ""
 "Không tìm thấy nhánh mạng được theo dõi, hãy chỉ định <thượng-nguồn> một "
 "cách thủ công.\n"
 
-#: builtin/ls-files.c:564
 msgid "git ls-files [<options>] [<file>...]"
 msgstr "git ls-files [<các tùy chọn>] [<tập-tin>…]"
 
-#: builtin/ls-files.c:618
 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:620
 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:622
 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:624
 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:626
 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:628
 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:630
 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:632
 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:634
 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:637
 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:639
 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:641
 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:643
 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:645
 msgid "don't show empty directories"
 msgstr "không hiển thị thư mục rỗng"
 
-#: builtin/ls-files.c:648
 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:650
 msgid "show resolve-undo information"
 msgstr "hiển thị thông tin resolve-undo"
 
-#: builtin/ls-files.c:652
 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:655
 msgid "read exclude patterns from <file>"
 msgstr "đọc mẫu cần loại trừ từ <tập-tin>"
 
-#: builtin/ls-files.c:658
 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:660
 msgid "add the standard git exclusions"
 msgstr "thêm loại trừ tiêu chuẩn kiểu git"
 
-#: builtin/ls-files.c:664
 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:669
 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:670
 msgid "tree-ish"
 msgstr "tree-ish"
 
-#: builtin/ls-files.c:671
 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:673
 msgid "show debugging data"
 msgstr "hiển thị dữ liệu gỡ lỗi"
 
-#: builtin/ls-files.c:675
 msgid "suppress duplicate entries"
 msgstr "chặn các mục tin trùng lặp"
 
-#: builtin/ls-files.c:677
 msgid "show sparse directories in the presence of a sparse index"
 msgstr "hiển thị thư mục \"sparse\" trong sự có mặt của mục lục \"sparse\""
 
-#: builtin/ls-remote.c:9
 msgid ""
 "git ls-remote [--heads] [--tags] [--refs] [--upload-pack=<exec>]\n"
 "              [-q | --quiet] [--exit-code] [--get-url]\n"
@@ -18140,206 +7703,157 @@ msgstr ""
 "              [-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:1131
 msgid "exec"
 msgstr "thực thi"
 
-#: builtin/ls-remote.c:62 builtin/ls-remote.c:64
 msgid "path of git-upload-pack on the remote host"
 msgstr "đường dẫn của git-upload-pack trên máy chủ"
 
-#: builtin/ls-remote.c:66
 msgid "limit to tags"
 msgstr "giới hạn tới các thẻ"
 
-#: builtin/ls-remote.c:67
 msgid "limit to heads"
 msgstr "giới hạn cho các đầu"
 
-#: builtin/ls-remote.c:68
 msgid "do not show peeled tags"
 msgstr "không hiển thị thẻ bị peel (gọt bỏ)"
 
-#: builtin/ls-remote.c:70
 msgid "take url.<base>.insteadOf into account"
 msgstr "lấy url.<base>.insteadOf vào trong tài khoản"
 
-#: builtin/ls-remote.c:73
 msgid "exit with exit code 2 if no matching refs are found"
 msgstr "thoát với mã là 2 nếu không tìm thấy tham chiếu nào khớp"
 
-#: builtin/ls-remote.c:76
 msgid "show underlying ref in addition to the object pointed by it"
 msgstr "hiển thị tham chiếu nằm dưới để thêm vào đối tượng được chỉ bởi nó"
 
-#: builtin/ls-tree.c:36
 msgid "git ls-tree [<options>] <tree-ish> [<path>...]"
 msgstr "git ls-tree [<các tùy chọn>] <tree-ish> [</đường/dẫn>…]"
 
-#: builtin/ls-tree.c:54
 #, c-format
 msgid "could not get object info about '%s'"
 msgstr "không thể lấy thông tin đối tượng về “%s”"
 
-#: builtin/ls-tree.c:79
 #, c-format
 msgid "bad ls-tree format: element '%s' does not start with '('"
 msgstr "định dạng ls-tree sai: phần tử “%s” không bắt đầu bằng “(”"
 
-#: builtin/ls-tree.c:83
 #, c-format
 msgid "bad ls-tree format: element '%s' does not end in ')'"
 msgstr "định dạng ls-tree sai: phần tử “%s” không bắt kết thúc bằng “)”"
 
-#: builtin/ls-tree.c:109
 #, c-format
 msgid "bad ls-tree format: %%%.*s"
 msgstr "định dạng ls-tree sai: %%%.*s"
 
-#: builtin/ls-tree.c:336
 msgid "only show trees"
 msgstr "chỉ hiển thị các tree"
 
-#: builtin/ls-tree.c:338
 msgid "recurse into subtrees"
 msgstr "đệ quy vào các thư mục con"
 
-#: builtin/ls-tree.c:340
 msgid "show trees when recursing"
 msgstr "hiển thị cây khi đệ quy"
 
-#: builtin/ls-tree.c:343
 msgid "terminate entries with NUL byte"
 msgstr "chấm dứt mục tin với byte NUL"
 
-#: builtin/ls-tree.c:344
 msgid "include object size"
 msgstr "gồm cả kích thước đối tượng"
 
-#: builtin/ls-tree.c:346 builtin/ls-tree.c:348
 msgid "list only filenames"
 msgstr "chỉ liệt kê tên tập tin"
 
-#: builtin/ls-tree.c:350
 msgid "list only objects"
 msgstr "chỉ liệt kê các đối tượng"
 
-#: builtin/ls-tree.c:353
 msgid "use full path names"
 msgstr "dùng tên đường dẫn đầy đủ"
 
-#: builtin/ls-tree.c:355
 msgid "list entire tree; not just current directory (implies --full-name)"
 msgstr "liệt kê cây mục tin; không chỉ thư mục hiện hành (ngụ ý --full-name)"
 
-#: builtin/ls-tree.c:391
 msgid "--format can't be combined with other format-altering options"
 msgstr ""
 "--format không thể được tổ hợp cùng với các tùy chọn format-alterin khác"
 
 #. TRANSLATORS: keep <> in "<" mail ">" info.
-#: builtin/mailinfo.c:14
 msgid "git mailinfo [<options>] <msg> <patch> < mail >info"
 msgstr "git mailinfo [<các tùy chọn>] <msg> <patch> < mail >info"
 
-#: builtin/mailinfo.c:58
 msgid "keep subject"
 msgstr "giữ lại phần chủ đề"
 
-#: builtin/mailinfo.c:60
 msgid "keep non patch brackets in subject"
 msgstr "giữ không dấu ngoặc vá trong chủ đề"
 
-#: builtin/mailinfo.c:62
 msgid "copy Message-ID to the end of commit message"
 msgstr "sao chép Message-ID vào cuối của ghi chú lần chuyển giao"
 
-#: builtin/mailinfo.c:64
 msgid "re-code metadata to i18n.commitEncoding"
 msgstr "mã hóa lại siêu dữ liệu thành i18n.commitEncoding"
 
-#: builtin/mailinfo.c:67
 msgid "disable charset re-coding of metadata"
 msgstr "vô hiệu hóa mã hóa lại bộ ký tự của siêu dữ liệu"
 
-#: builtin/mailinfo.c:69
 msgid "encoding"
 msgstr "bảng mã"
 
-#: builtin/mailinfo.c:70
 msgid "re-code metadata to this encoding"
 msgstr "mã hóa lại siêu dữ liệu vào bảng mã này"
 
-#: builtin/mailinfo.c:72
 msgid "use scissors"
 msgstr "dùng \"scissor\""
 
-#: builtin/mailinfo.c:73
 msgid "<action>"
 msgstr "<hành động>"
 
-#: builtin/mailinfo.c:74
 msgid "action when quoted CR is found"
 msgstr "hành động khi CR được trích dẫn được tìm thấy"
 
-#: builtin/mailinfo.c:77
 msgid "use headers in message's body"
 msgstr "sử dụng phần đầu trong nội dung thư"
 
-#: builtin/mailsplit.c:227
 msgid "reading patches from stdin/tty..."
 msgstr "đọc các miếng vá từ đầu vào tiêu chuẩn stdin/tty..."
 
-#: builtin/mailsplit.c:242
 #, c-format
 msgid "empty mbox: '%s'"
 msgstr "mbox trống rỗng: “%s”"
 
-#: builtin/merge-base.c:32
 msgid "git merge-base [-a | --all] <commit> <commit>..."
 msgstr "git merge-base [-a | --all] <lần_chuyển_giao> <lần_chuyển_giao>…"
 
-#: builtin/merge-base.c:33
 msgid "git merge-base [-a | --all] --octopus <commit>..."
 msgstr "git merge-base [-a | --all] --octopus <lần_chuyển_giao>…"
 
-#: builtin/merge-base.c:34
 msgid "git merge-base --independent <commit>..."
 msgstr "git merge-base --independent <lần_chuyển_giao>…"
 
-#: builtin/merge-base.c:35
 msgid "git merge-base --is-ancestor <commit> <commit>"
 msgstr "git merge-base --is-ancestor <commit> <lần_chuyển_giao>"
 
-#: builtin/merge-base.c:36
 msgid "git merge-base --fork-point <ref> [<commit>]"
 msgstr "git merge-base --fork-point <tham-chiếu> [<lần_chuyển_giao>]"
 
-#: builtin/merge-base.c:144
 msgid "output all common ancestors"
 msgstr "xuất ra tất cả các ông bà, tổ tiên chung"
 
-#: builtin/merge-base.c:146
 msgid "find ancestors for a single n-way merge"
 msgstr "tìm tổ tiên của hòa trộn n-way đơn"
 
-#: builtin/merge-base.c:148
 msgid "list revs not reachable from others"
 msgstr "liệt kê các “rev” mà nó không thể đọc được từ cái khác"
 
-#: builtin/merge-base.c:150
 msgid "is the first one ancestor of the other?"
 msgstr "là cha mẹ đầu tiên của cái khác?"
 
-#: builtin/merge-base.c:152
 msgid "find where <commit> forked from reflog of <ref>"
 msgstr "tìm xem <commit> được rẽ nhánh ở đâu từ reflog của <th.chiếu>"
 
-#: builtin/merge-file.c:9
 msgid ""
 "git merge-file [<options>] [-L <name1> [-L <orig> [-L <name2>]]] <file1> "
 "<orig-file> <file2>"
@@ -18347,255 +7861,203 @@ msgstr ""
 "git merge-file [<các tùy chọn>] [-L <tên1> [-L <gốc> [-L <tên2>]]] <tập-"
 "tin1> <tập-tin-gốc> <tập-tin2>"
 
-#: builtin/merge-file.c:35
 msgid "send results to standard output"
 msgstr "gửi kết quả vào đầu ra tiêu chuẩn"
 
-#: builtin/merge-file.c:36
 msgid "use a diff3 based merge"
 msgstr "dùng kiểu hòa dựa trên diff3"
 
-#: builtin/merge-file.c:37
 msgid "use a zealous diff3 based merge"
 msgstr "dùng kiểu hòa trộn dựa trên 'zealous diff3'"
 
-#: builtin/merge-file.c:39
 msgid "for conflicts, use our version"
 msgstr "để tránh xung đột, sử dụng phiên bản của chúng ta"
 
-#: builtin/merge-file.c:41
 msgid "for conflicts, use their version"
 msgstr "để tránh xung đột, sử dụng phiên bản của họ"
 
-#: builtin/merge-file.c:43
 msgid "for conflicts, use a union version"
 msgstr "để tránh xung đột, sử dụng phiên bản kết hợp"
 
-#: builtin/merge-file.c:46
 msgid "for conflicts, use this marker size"
 msgstr "để tránh xung đột, hãy sử dụng kích thước bộ tạo này"
 
-#: builtin/merge-file.c:47
 msgid "do not warn about conflicts"
 msgstr "không cảnh báo về các xung đột xảy ra"
 
-#: builtin/merge-file.c:49
 msgid "set labels for file1/orig-file/file2"
 msgstr "đặt nhãn cho tập-tin-1/tập-tin-gốc/tập-tin-2"
 
-#: builtin/merge-recursive.c:47
 #, c-format
 msgid "unknown option %s"
 msgstr "không hiểu tùy chọn %s"
 
-#: builtin/merge-recursive.c:53
 #, c-format
 msgid "could not parse object '%s'"
 msgstr "không thể phân tích đối tượng “%s”"
 
-#: builtin/merge-recursive.c:57
 #, c-format
 msgid "cannot handle more than %d base. Ignoring %s."
 msgid_plural "cannot handle more than %d bases. Ignoring %s."
 msgstr[0] "không thể xử lý nhiều hơn %d nền. Bỏ qua %s."
 
-#: builtin/merge-recursive.c:65
 msgid "not handling anything other than two heads merge."
 msgstr "không xử lý gì ngoài hai head hòa trộn."
 
-#: builtin/merge-recursive.c:74 builtin/merge-recursive.c:76
 #, c-format
 msgid "could not resolve ref '%s'"
 msgstr "không thể phân giải tham chiếu %s"
 
-#: builtin/merge-recursive.c:82
 #, c-format
 msgid "Merging %s with %s\n"
 msgstr "Đang hòa trộn %s với %s\n"
 
-#: builtin/merge.c:59
 msgid "git merge [<options>] [<commit>...]"
 msgstr "git merge [<các tùy chọn>] [<commit>…]"
 
-#: builtin/merge.c:125
 msgid "switch `m' requires a value"
 msgstr "switch “m” yêu cầu một giá trị"
 
-#: builtin/merge.c:148
 #, 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:201
 #, 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:202
 #, c-format
 msgid "Available strategies are:"
 msgstr "Các chiến lược sẵn sàng là:"
 
-#: builtin/merge.c:207
 #, 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:258 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:261 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:262 builtin/pull.c:140
 msgid "(synonym to --stat)"
 msgstr "(đồng nghĩa với --stat)"
 
-#: builtin/merge.c:264 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:267 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:269 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:271 builtin/pull.c:155
 msgid "edit message before committing"
 msgstr "sửa chú thích trước khi chuyển giao"
 
-#: builtin/merge.c:273
 msgid "allow fast-forward (default)"
 msgstr "cho phép chuyển-tiếp-nhanh (mặc định)"
 
-#: builtin/merge.c:275 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:279 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:280 builtin/notes.c:785 builtin/pull.c:172
-#: builtin/rebase.c:1145 builtin/revert.c:114
 msgid "strategy"
 msgstr "chiến lược"
 
-#: builtin/merge.c:281 builtin/pull.c:173
 msgid "merge strategy to use"
 msgstr "chiến lược hòa trộn sẽ dùng"
 
-#: builtin/merge.c:282 builtin/pull.c:176
 msgid "option=value"
 msgstr "tùy_chọn=giá_trị"
 
-#: builtin/merge.c:283 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:285
 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:291
 msgid "use <name> instead of the real target"
 msgstr "dùng <tên> thay cho đích thật"
 
-#: builtin/merge.c:294
 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:296
 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:298
 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:300 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:307
 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:323
 msgid "could not run stash."
 msgstr "không thể chạy stash."
 
-#: builtin/merge.c:328
 msgid "stash failed"
 msgstr "lệnh tạm cất gặp lỗi"
 
-#: builtin/merge.c:333
 #, 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:355 builtin/merge.c:372
 msgid "read-tree failed"
 msgstr "read-tree gặp lỗi"
 
-#: builtin/merge.c:403
 msgid "Already up to date. (nothing to squash)"
 msgstr "Đã cập nhật rồi. (không có gì để squash)"
 
-#: builtin/merge.c:417
+msgid "Already up to date."
+msgstr "Đã cập nhật rồi."
+
 #, c-format
 msgid "Squash commit -- not updating HEAD\n"
 msgstr "Squash commit -- không cập nhật HEAD\n"
 
-#: builtin/merge.c:467
 #, 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"
 
-#: builtin/merge.c:517
 #, c-format
 msgid "'%s' does not point to a commit"
 msgstr "“%s” không chỉ đến một lần chuyển giao nào cả"
 
-#: builtin/merge.c:605
 #, c-format
 msgid "Bad branch.%s.mergeoptions string: %s"
 msgstr "Chuỗi branch.%s.mergeoptions sai: %s"
 
-#: builtin/merge.c:732
+msgid "Unable to write index."
+msgstr "Không thể ghi bảng mục lục."
+
 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:745
 #, c-format
 msgid "unknown strategy option: -X%s"
 msgstr "không hiểu chiến lược: -X%s"
 
-#: builtin/merge.c:764 t/helper/test-fast-rebase.c:223
 #, c-format
 msgid "unable to write %s"
 msgstr "không thể ghi %s"
 
-#: builtin/merge.c:816
 #, c-format
 msgid "Could not read from '%s'"
 msgstr "Không thể đọc từ “%s”"
 
-#: builtin/merge.c:825
 #, 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:831
 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"
@@ -18607,11 +8069,9 @@ msgstr ""
 "topic.\n"
 "\n"
 
-#: builtin/merge.c:836
 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:839
 #, c-format
 msgid ""
 "Lines starting with '%c' will be ignored, and an empty message aborts\n"
@@ -18620,75 +8080,63 @@ msgstr ""
 "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:900
 msgid "Empty commit message."
 msgstr "Chú thích của lần commit (chuyển giao) bị trống rỗng."
 
-#: builtin/merge.c:915
 #, c-format
 msgid "Wonderful.\n"
 msgstr "Tuyệt vời.\n"
 
-#: builtin/merge.c:976
 #, 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:1015
 msgid "No current branch."
 msgstr "Không phải nhánh hiện hành."
 
-#: builtin/merge.c:1017
 msgid "No remote for the current branch."
 msgstr "Không có máy chủ cho nhánh hiện hành."
 
-#: builtin/merge.c:1019
 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:1024
 #, 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:1081
 #, 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:1183
+#, c-format
+msgid "could not close '%s'"
+msgstr "không thể đóng “%s”"
+
 #, 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:1217
 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:1330
 msgid "--abort expects no arguments"
 msgstr "--abort không nhận các đối số"
 
-#: builtin/merge.c:1334
 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:1352
 msgid "--quit expects no arguments"
 msgstr "--quit không nhận các đối số"
 
-#: builtin/merge.c:1365
 msgid "--continue expects no arguments"
 msgstr "--continue không nhận đối số"
 
-#: builtin/merge.c:1369
 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:1385
 msgid ""
 "You have not concluded your merge (MERGE_HEAD exists).\n"
 "Please, commit your changes before you merge."
@@ -18696,7 +8144,6 @@ msgstr ""
 "Bạn chưa kết thúc việc hòa trộn (MERGE_HEAD vẫn tồn tại).\n"
 "Hãy chuyển giao các thay đổi trước khi bạn có thể hòa trộn."
 
-#: builtin/merge.c:1392
 msgid ""
 "You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists).\n"
 "Please, commit your changes before you merge."
@@ -18704,136 +8151,111 @@ msgstr ""
 "Bạn chưa kết thúc việc cherry-pick (CHERRY_PICK_HEAD vẫn tồn tại).\n"
 "Hãy chuyển giao các thay đổi trước khi bạn có thể hòa trộn."
 
-#: builtin/merge.c:1395
 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:1427
 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:1444
 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:1446
 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:1451
 #, 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:1453
 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:1540
 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:1559
 #, c-format
 msgid "Updating %s..%s\n"
 msgstr "Đang cập nhật %s..%s\n"
 
-#: builtin/merge.c:1606
 #, 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:1613
 #, c-format
 msgid "Nope.\n"
 msgstr "Không.\n"
 
-#: builtin/merge.c:1671 builtin/merge.c:1737
 #, 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:1675
 #, c-format
 msgid "Trying merge strategy %s...\n"
 msgstr "Đang thử chiến lược hòa trộn %s…\n"
 
-#: builtin/merge.c:1727
 #, 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:1729
 #, 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:1739
 #, 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:1753
 #, c-format
 msgid "Automatic merge went well; stopped before committing as requested\n"
 msgstr ""
 "Hòa trộn tự động đã trở nên tốt; bị dừng trước khi việc chuyển giao được yêu "
 "cầu\n"
 
-#: builtin/mktag.c:27
 #, c-format
 msgid "warning: tag input does not pass fsck: %s"
 msgstr "cảnh báo: đầu vào thẻ không qua kiểm tra fsck: %s"
 
-#: builtin/mktag.c:38
 #, c-format
 msgid "error: tag input does not pass fsck: %s"
 msgstr "lỗi: đầu vào thẻ không vượt qua fsck: %s"
 
-#: builtin/mktag.c:41
 #, c-format
 msgid "%d (FSCK_IGNORE?) should never trigger this callback"
 msgstr "%d (FSCK_IGNORE?) không bao giờ nên kích hoạt cuộc gọi ngược này"
 
-#: builtin/mktag.c:56
 #, c-format
 msgid "could not read tagged object '%s'"
 msgstr "không thể đọc đối tượng được đánh thẻ %s"
 
-#: builtin/mktag.c:59
 #, c-format
 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
+msgid "could not read from stdin"
+msgstr "không thể đọc từ đầu vào tiêu chuẩn"
+
 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
 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
 msgid "unable to write tag file"
 msgstr "không thể ghi vào tập tin lưu thẻ"
 
-#: builtin/mktree.c:154
 msgid "input is NUL terminated"
 msgstr "đầu vào được chấm dứt bởi NUL"
 
-#: builtin/mktree.c:155 builtin/write-tree.c:26
 msgid "allow missing objects"
 msgstr "cho phép thiếu đối tượng"
 
-#: builtin/mktree.c:156
 msgid "allow creation of more than one tree"
 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>][--refs-"
 "snapshot=<path>]"
@@ -18841,43 +8263,36 @@ 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: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: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: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:57
+msgid "directory"
+msgstr "thư mục"
+
 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:98
 msgid "preferred-pack"
 msgstr "preferred-pack"
 
-#: 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: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:206
 msgid ""
 "during repack, collect pack-files of smaller size into a batch that is "
 "larger than this size"
@@ -18885,157 +8300,121 @@ msgstr ""
 "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/mv.c:18
 msgid "git mv [<options>] <source>... <destination>"
 msgstr "git mv [<các tùy chọn>] <nguồn>… <đích>"
 
-#: builtin/mv.c:83
 #, c-format
 msgid "Directory %s is in index and no submodule?"
 msgstr "Thư mục “%s” có ở trong chỉ mục mà không có mô-đun con?"
 
-#: builtin/mv.c:85
 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/mv.c:103
 #, c-format
 msgid "%.*s is in index"
 msgstr "%.*s trong bảng mục lục"
 
-#: builtin/mv.c:125
 msgid "force move/rename even if target exists"
 msgstr "ép buộc di chuyển hay đổi tên thậm chí cả khi đích đã tồn tại"
 
-#: builtin/mv.c:127
 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: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: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:190
 msgid "bad source"
 msgstr "nguồn sai"
 
-#: 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: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:205
 msgid "source directory is empty"
 msgstr "thư mục nguồn là trống rỗng"
 
-#: 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:233
 msgid "conflicted"
 msgstr "bị xung đột"
 
-#: builtin/mv.c:236
 msgid "destination exists"
 msgstr "đích đã tồn tại sẵn rồi"
 
-#: builtin/mv.c:244
 #, c-format
 msgid "overwriting '%s'"
 msgstr "đang ghi đè lên “%s”"
 
-#: builtin/mv.c:247
 msgid "Cannot overwrite"
 msgstr "Không thể ghi đè"
 
-#: 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:252
 msgid "destination directory does not exist"
 msgstr "thư mục đích không tồn tại"
 
-#: builtin/mv.c:280
 #, c-format
 msgid "%s, source=%s, destination=%s"
 msgstr "%s, nguồn=%s, đích=%s"
 
-#: builtin/mv.c:308
 #, c-format
 msgid "Renaming %s to %s\n"
 msgstr "Đổi tên %s thành %s\n"
 
-#: builtin/mv.c:314 builtin/remote.c:812 builtin/repack.c:861
 #, c-format
 msgid "renaming '%s' failed"
 msgstr "gặp lỗi khi đổi tên “%s”"
 
-#: builtin/name-rev.c:524
 msgid "git name-rev [<options>] <commit>..."
 msgstr "git name-rev [<các tùy chọn>] <commit>…"
 
-#: builtin/name-rev.c:525
 msgid "git name-rev [<options>] --all"
 msgstr "git name-rev [<các tùy chọn>] --all"
 
-#: builtin/name-rev.c:526
 msgid "git name-rev [<options>] --annotate-stdin"
 msgstr "git name-rev [<các tùy chọn>] --annotate-stdin"
 
-#: builtin/name-rev.c:583
 msgid "print only ref-based names (no object names)"
 msgstr "chỉ hiển thị các tham chiếu cơ sở (không phải các tên đối tượng)"
 
-#: builtin/name-rev.c:584
 msgid "only use tags to name the commits"
 msgstr "chỉ dùng các thẻ để đặt tên cho các lần chuyển giao"
 
-#: builtin/name-rev.c:586
 msgid "only use refs matching <pattern>"
 msgstr "chỉ sử dụng các tham chiếu khớp với <mẫu>"
 
-#: builtin/name-rev.c:588
 msgid "ignore refs matching <pattern>"
 msgstr "bỏ qua các tham chiếu khớp với <mẫu>"
 
-#: builtin/name-rev.c:590
 msgid "list all commits reachable from all refs"
 msgstr ""
 "liệt kê tất cả các lần chuyển giao có thể đọc được từ tất cả các tham chiếu"
 
-#: builtin/name-rev.c:591
-msgid "deprecated: use annotate-stdin instead"
-msgstr "đã lạc hậu: hãy dùng annotate-stdin để thay thế"
+msgid "deprecated: use --annotate-stdin instead"
+msgstr "đã lạc hậu: hãy dùng --annotate-stdin để thay thế"
 
-#: builtin/name-rev.c:592
 msgid "annotate text from stdin"
 msgstr "chú giải chữ từ đầu vào tiêu chuẩn stdin"
 
-#: builtin/name-rev.c:593
 msgid "allow to print `undefined` names (default)"
 msgstr "cho phép in các tên “chưa định nghĩa” (mặc định)"
 
-#: builtin/name-rev.c:599
 msgid "dereference tags in the input (internal use)"
 msgstr "bãi bỏ tham chiếu các thẻ trong đầu vào (dùng nội bộ)"
 
-#: builtin/notes.c:28
 msgid "git notes [--ref <notes-ref>] [list [<object>]]"
 msgstr "git notes [--ref <notes-ref>] [list [<đối-tượng>]]"
 
-#: builtin/notes.c:29
 msgid ""
 "git notes [--ref <notes-ref>] add [-f] [--allow-empty] [-m <msg> | -F <file> "
 "| (-c | -C) <object>] [<object>]"
@@ -19043,11 +8422,9 @@ msgstr ""
 "git notes [--ref <notes-ref>] add [-f] [--allow-empty] [-m <lời-nhắn> | -F "
 "<tập-tin> | (-c | -C) <đối-tượng>] [<đối-tượng>]"
 
-#: builtin/notes.c:30
 msgid "git notes [--ref <notes-ref>] copy [-f] <from-object> <to-object>"
 msgstr "git notes [--ref <notes-ref>] copy [-f] <từ-đối-tượng> <đến-đối-tượng>"
 
-#: builtin/notes.c:31
 msgid ""
 "git notes [--ref <notes-ref>] append [--allow-empty] [-m <msg> | -F <file> | "
 "(-c | -C) <object>] [<object>]"
@@ -19055,140 +8432,107 @@ msgstr ""
 "git notes [--ref <notes-ref>] append [--allow-empty] [-m <lời-nhắn> | -F "
 "<tập-tin> | (-c | -C) <đối-tượng>] [<đối-tượng>]"
 
-#: builtin/notes.c:32
 msgid "git notes [--ref <notes-ref>] edit [--allow-empty] [<object>]"
 msgstr "git notes [--ref <notes-ref>] edit [--allow-empty] [<đối-tượng>]"
 
-#: builtin/notes.c:33
 msgid "git notes [--ref <notes-ref>] show [<object>]"
 msgstr "git notes [--ref <notes-ref>] show [<đối-tượng>]"
 
-#: 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 <chiến-lược> ] <notes-ref>"
 
-#: builtin/notes.c:37
 msgid "git notes [--ref <notes-ref>] remove [<object>...]"
 msgstr "git notes [--ref <notes-ref>] remove [<đối-tượng>…]"
 
-#: builtin/notes.c:38
 msgid "git notes [--ref <notes-ref>] prune [-n] [-v]"
 msgstr "git notes [--ref <notes-ref>] prune [-n] [-v]"
 
-#: builtin/notes.c:39
 msgid "git notes [--ref <notes-ref>] get-ref"
 msgstr "git notes [--ref <notes-ref>] get-ref"
 
-#: builtin/notes.c:44
 msgid "git notes [list [<object>]]"
 msgstr "git notes [list [<đối tượng>]]"
 
-#: builtin/notes.c:49
 msgid "git notes add [<options>] [<object>]"
 msgstr "git notes add [<các tùy chọn>] [<đối-tượng>]"
 
-#: builtin/notes.c:54
 msgid "git notes copy [<options>] <from-object> <to-object>"
 msgstr "git notes copy [<các tùy chọn>] <từ-đối-tượng> <đến-đối-tượng>"
 
-#: builtin/notes.c:55
 msgid "git notes copy --stdin [<from-object> <to-object>]..."
 msgstr "git notes copy --stdin [<từ-đối-tượng> <đến-đối-tượng>]…"
 
-#: builtin/notes.c:60
 msgid "git notes append [<options>] [<object>]"
 msgstr "git notes append [<các tùy chọn>] [<đối-tượng>]"
 
-#: builtin/notes.c:65
 msgid "git notes edit [<object>]"
 msgstr "git notes edit [<đối tượng>]"
 
-#: builtin/notes.c:70
 msgid "git notes show [<object>]"
 msgstr "git notes show [<đối tượng>]"
 
-#: builtin/notes.c:75
 msgid "git notes merge [<options>] <notes-ref>"
 msgstr "git notes merge [<các tùy chọn>] <notes-ref>"
 
-#: builtin/notes.c:76
 msgid "git notes merge --commit [<options>]"
 msgstr "git notes merge --commit [<các tùy chọn>]"
 
-#: builtin/notes.c:77
 msgid "git notes merge --abort [<options>]"
 msgstr "git notes merge --abort [<các tùy chọn>]"
 
-#: builtin/notes.c:82
 msgid "git notes remove [<object>]"
 msgstr "git notes remove [<đối tượng>]"
 
-#: builtin/notes.c:87
 msgid "git notes prune [<options>]"
 msgstr "git notes prune [<các tùy chọn>]"
 
-#: builtin/notes.c:97
 msgid "Write/edit the notes for the following object:"
 msgstr "Ghi hay sửa ghi chú cho đối tượng sau đây:"
 
-#: builtin/notes.c:149
 #, c-format
 msgid "unable to start 'show' for object '%s'"
 msgstr "không thể khởi chạy “show” cho đối tượng “%s”"
 
-#: builtin/notes.c:153
 msgid "could not read 'show' output"
 msgstr "không thể đọc kết xuất “show”"
 
-#: builtin/notes.c:161
 #, c-format
 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:194
 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:203
 msgid "unable to write note object"
 msgstr "không thể ghi đối tượng ghi chú (note)"
 
-#: 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:240 builtin/tag.c:582
 #, c-format
 msgid "could not open or read '%s'"
 msgstr "không thể mở hay đọc “%s”"
 
-#: 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:263
 #, c-format
 msgid "failed to read object '%s'."
 msgstr "gặp lỗi khi đọc đối tượng “%s”."
 
-#: 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:307
 #, c-format
 msgid "malformed input line: '%s'."
 msgstr "dòng đầu vào dị hình: “%s”."
 
-#: 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”"
@@ -19196,41 +8540,32 @@ msgstr "gặp lỗi khi sao chép ghi chú (note) từ “%s” sang “%s”"
 #. TRANSLATORS: the first %s will be replaced by a git
 #. notes command: 'add', 'merge', 'remove', etc.
 #.
-#: 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: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: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: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: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: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:420 builtin/notes.c:586
 msgid "allow storing empty note"
 msgstr "cho lưu trữ ghi chú trống rỗng"
 
-#: builtin/notes.c:421 builtin/notes.c:494
 msgid "replace existing notes"
 msgstr "thay thế ghi chú trước"
 
-#: builtin/notes.c:446
 #, c-format
 msgid ""
 "Cannot add notes. Found existing notes for object %s. Use '-f' to overwrite "
@@ -19239,29 +8574,23 @@ msgstr ""
 "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: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:473 builtin/notes.c:635 builtin/notes.c:904
 #, 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:495
 msgid "read objects from stdin"
 msgstr "đọc các đối tượng từ đầu vào tiêu chuẩn"
 
-#: 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:515
 msgid "too few arguments"
 msgstr "quá ít đối số"
 
-#: builtin/notes.c:536
 #, c-format
 msgid ""
 "Cannot copy notes. Found existing notes for object %s. Use '-f' to overwrite "
@@ -19270,12 +8599,10 @@ msgstr ""
 "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: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:601
 #, c-format
 msgid ""
 "The -m/-F/-c/-C options have been deprecated for the 'edit' subcommand.\n"
@@ -19284,52 +8611,40 @@ msgstr ""
 "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: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: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: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: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: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: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:737
 msgid "failed to resolve NOTES_MERGE_REF"
 msgstr "gặp lỗi khi phân giải NOTES_MERGE_REF"
 
-#: 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: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:782
 msgid "General options"
 msgstr "Tùy chọn chung"
 
-#: builtin/notes.c:784
 msgid "Merge options"
 msgstr "Tùy chọn về hòa trộn"
 
-#: builtin/notes.c:786
 msgid ""
 "resolve notes conflicts using the given strategy (manual/ours/theirs/union/"
 "cat_sort_uniq)"
@@ -19337,48 +8652,38 @@ msgstr ""
 "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:788
 msgid "Committing unmerged notes"
 msgstr "Chuyển giao các note chưa được hòa trộn"
 
-#: 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:792
 msgid "Aborting notes merge resolution"
 msgstr "Hủy bỏ phân giải ghi chú (note) hòa trộn"
 
-#: builtin/notes.c:794
 msgid "abort notes merge"
 msgstr "bỏ qua hòa trộn các ghi chú (note)"
 
-#: 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: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:834
 #, c-format
 msgid "unknown -s/--strategy: %s"
 msgstr "không hiểu -s/--strategy: %s"
 
-#: builtin/notes.c:874
 #, 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:878
 #, 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:880
 #, c-format
 msgid ""
 "Automatic notes merge failed. Fix conflicts in %s and commit the result with "
@@ -19389,60 +8694,48 @@ msgstr ""
 "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:899 builtin/tag.c:595
 #, 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:902
 #, c-format
 msgid "Object %s has no note\n"
 msgstr "Đối tượng %s không có ghi chú (note)\n"
 
-#: builtin/notes.c:914
 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:917
 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:956 builtin/prune.c:144 builtin/worktree.c:148
 msgid "do not remove, show only"
 msgstr "không gỡ bỏ, chỉ hiển thị"
 
-#: builtin/notes.c:957
 msgid "report pruned notes"
 msgstr "báo cáo các đối tượng đã prune"
 
-#: builtin/notes.c:1000
 msgid "notes-ref"
 msgstr "notes-ref"
 
-#: builtin/notes.c:1001
 msgid "use notes from <notes-ref>"
 msgstr "dùng “notes” từ <notes-ref>"
 
-#: builtin/notes.c:1036 builtin/stash.c:1802
 #, c-format
 msgid "unknown subcommand: %s"
 msgstr "không hiểu câu lệnh con: %s"
 
-#: builtin/pack-objects.c:182
 msgid ""
 "git pack-objects --stdout [<options>...] [< <ref-list> | < <object-list>]"
 msgstr ""
 "git pack-objects --stdout [các tùy chọn…] [< <danh-sách-tham-chiếu> | < "
 "<danh-sách-đối-tượng>]"
 
-#: builtin/pack-objects.c:183
 msgid ""
 "git pack-objects [<options>...] <base-name> [< <ref-list> | < <object-list>]"
 msgstr ""
 "git pack-objects [các tùy chọn…] <base-name> [< <danh-sách-ref> | < <danh-"
 "sách-đối-tượng>]"
 
-#: builtin/pack-objects.c:570
 #, c-format
 msgid ""
 "write_reuse_object: could not locate %s, expected at offset %<PRIuMAX> in "
@@ -19451,112 +8744,100 @@ msgstr ""
 "write_reuse_object: không thể phân bổ %s, cần tại vị trí bù %<PRIuMAX> trong "
 "gói %s"
 
-#: builtin/pack-objects.c:578
 #, c-format
 msgid "bad packed object CRC for %s"
 msgstr "CRC của đối tượng gói sai với %s"
 
-#: builtin/pack-objects.c:589
 #, c-format
 msgid "corrupt packed object for %s"
 msgstr "đối tượng đã đóng gói sai hỏng cho %s"
 
-#: builtin/pack-objects.c:720
 #, c-format
 msgid "recursive delta detected for object %s"
 msgstr "dò thấy delta đệ quy cho đối tượng %s"
 
-#: builtin/pack-objects.c:939
 #, c-format
 msgid "ordered %u objects, expected %<PRIu32>"
 msgstr "đã sắp xếp %u đối tượng, cần %<PRIu32>"
 
-#: builtin/pack-objects.c:1034
 #, c-format
 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:1158
 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:1171
 msgid "Writing objects"
 msgstr "Đang ghi lại các đối tượng"
 
-#: builtin/pack-objects.c:1243 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:1276
+#, c-format
+msgid "failed utime() on %s"
+msgstr "gặp lỗi utime() trên “%s”"
+
 msgid "failed to write bitmap index"
 msgstr "gặp lỗi khi ghi mục lục ánh xạ"
 
-#: builtin/pack-objects.c:1302
 #, c-format
 msgid "wrote %<PRIu32> objects while expecting %<PRIu32>"
 msgstr "đã ghi %<PRIu32> đối tượng trong khi cần %<PRIu32>"
 
-#: builtin/pack-objects.c:1544
 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:1992
 #, 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:2001
 #, 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:2282
 msgid "Counting objects"
 msgstr "Đang đếm các đối tượng"
 
-#: builtin/pack-objects.c:2447
+#, c-format
+msgid "unable to get size of %s"
+msgstr "không thể lấy kích cỡ của %s"
+
 #, 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:2517 builtin/pack-objects.c:2533
-#: builtin/pack-objects.c:2543
 #, c-format
 msgid "object %s cannot be read"
 msgstr "không thể đọc đối tượng %s"
 
-#: builtin/pack-objects.c:2520 builtin/pack-objects.c:2547
 #, 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:2557
 msgid "suboptimal pack - out of memory"
 msgstr "suboptimal pack - hết bộ nhớ"
 
-#: builtin/pack-objects.c:2872
 #, 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:3011
 #, 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:3097
+#, c-format
+msgid "unable to get type of object %s"
+msgstr "không thể lấy kiểu của đối tượng “%s”"
+
 msgid "Compressing objects"
 msgstr "Đang nén các đối tượng"
 
-#: builtin/pack-objects.c:3103
 msgid "inconsistency with delta count"
 msgstr "mâu thuẫn với số lượng delta"
 
-#: builtin/pack-objects.c:3182
 #, c-format
 msgid ""
 "value of uploadpack.blobpackfileuri must be of the form '<object-hash> <pack-"
@@ -19565,7 +8846,6 @@ msgstr ""
 "giá trị của uploadpack.blobpackfileuri phải có dạng “<object-hash> <pack-"
 "hash> <uri>” (nhận “%s”)"
 
-#: builtin/pack-objects.c:3185
 #, c-format
 msgid ""
 "object already configured in another uploadpack.blobpackfileuri (got '%s')"
@@ -19573,18 +8853,27 @@ msgstr ""
 "đối tượng đã được cấu hình trong một uploadpack.blobpackfileuri khác (đã "
 "nhận “%s”)"
 
-#: builtin/pack-objects.c:3220
 #, 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:3348 builtin/pack-objects.c:3359
-#: builtin/pack-objects.c:3373
 #, c-format
 msgid "could not find pack '%s'"
 msgstr "không thể tìm thấy gói “%s”"
 
-#: builtin/pack-objects.c:3416
+#, c-format
+msgid "packfile %s cannot be accessed"
+msgstr "tập tin gói %s không thể được truy "
+
+msgid "Enumerating cruft objects"
+msgstr "Đánh số các đối tượng cruft"
+
+msgid "unable to add cruft objects"
+msgstr "không thể thêm các đối tượng cruft"
+
+msgid "Traversing cruft objects"
+msgstr "Đang duyệt các đối tượng cruft"
+
 #, c-format
 msgid ""
 "expected edge object ID, got garbage:\n"
@@ -19593,7 +8882,6 @@ msgstr ""
 "cần ID đối tượng cạnh, nhận được rác:\n"
 " %s"
 
-#: builtin/pack-objects.c:3422
 #, c-format
 msgid ""
 "expected object ID, got garbage:\n"
@@ -19602,240 +8890,205 @@ msgstr ""
 "cần ID đối tượng, nhận được rác:\n"
 " %s"
 
-#: builtin/pack-objects.c:3540 builtin/pack-objects.c:3627
+msgid "could not load cruft pack .mtimes"
+msgstr "không thể tải cruft pack .mtimes"
+
 msgid "cannot open pack index"
 msgstr "không thể mở mục lục của gói"
 
-#: builtin/pack-objects.c:3549
 #, 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:3635
 msgid "unable to force loose object"
 msgstr "không thể buộc mất đối tượng"
 
-#: builtin/pack-objects.c:3763
 #, c-format
 msgid "not a rev '%s'"
 msgstr "không phải một rev “%s”"
 
-#: builtin/pack-objects.c:3766 builtin/rev-parse.c:1061
 #, c-format
 msgid "bad revision '%s'"
 msgstr "điểm xem xét sai “%s”"
 
-#: builtin/pack-objects.c:3794
 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:3847
 #, 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:3851
 #, c-format
 msgid "bad index version '%s'"
 msgstr "phiên bản mục lục sai “%s”"
 
-#: builtin/pack-objects.c:3907
 msgid "<version>[,<offset>]"
 msgstr "<phiên bản>[,offset]"
 
-#: builtin/pack-objects.c:3908
 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:3911
 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:3913
 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:3915
 msgid "ignore packed objects"
 msgstr "bỏ qua các đối tượng đóng gói"
 
-#: builtin/pack-objects.c:3917
 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:3919
 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:3921
 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:3923
 msgid "reuse existing deltas"
 msgstr "dùng lại các delta sẵn có"
 
-#: builtin/pack-objects.c:3925
 msgid "reuse existing objects"
 msgstr "dùng lại các đối tượng sẵn có"
 
-#: builtin/pack-objects.c:3927
 msgid "use OFS_DELTA objects"
 msgstr "dùng các đối tượng OFS_DELTA"
 
-#: builtin/pack-objects.c:3929
 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:3931
 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:3933
 msgid "read revision arguments from standard input"
 msgstr "đọc tham số “revision” từ thiết bị nhập chuẩn"
 
-#: builtin/pack-objects.c:3935
 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:3938
 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:3941
 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:3944
 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:3947
 msgid "read packs from stdin"
 msgstr "đọc các gói từ đầu vào tiêu chuẩn"
 
-#: builtin/pack-objects.c:3949
 msgid "output pack to stdout"
 msgstr "xuất gói ra đầu ra tiêu chuẩn"
 
-#: builtin/pack-objects.c:3951
 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:3953
 msgid "keep unreachable objects"
 msgstr "giữ lại các đối tượng không thể đọc được"
 
-#: builtin/pack-objects.c:3955
 msgid "pack loose unreachable objects"
 msgstr "pack mất các đối tượng không thể đọc được"
 
-#: builtin/pack-objects.c:3957
 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:3960
+msgid "create a cruft pack"
+msgstr "tạo gói cruft"
+
+msgid "expire cruft objects older than <time>"
+msgstr "các đối tượng cruft hết hạn cũ hơn khoảng <thời gian>"
+
 msgid "use the sparse reachability algorithm"
 msgstr "sử dụng thuật toán “sparse reachability”"
 
-#: builtin/pack-objects.c:3962
 msgid "create thin packs"
 msgstr "tạo gói nhẹ"
 
-#: builtin/pack-objects.c:3964
 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:3966
 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:3968
 msgid "ignore this pack"
 msgstr "bỏ qua gói này"
 
-#: builtin/pack-objects.c:3970
 msgid "pack compression level"
 msgstr "mức nén gói"
 
-#: builtin/pack-objects.c:3972
 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:3974
 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:3976
 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:3980
 msgid "write a bitmap index if possible"
 msgstr "ghi mục lục ánh xạ nếu được"
 
-#: builtin/pack-objects.c:3984
 msgid "handling for missing objects"
 msgstr "xử lý cho thiếu đối tượng"
 
-#: builtin/pack-objects.c:3987
 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:3989
 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:3991
 msgid "protocol"
 msgstr "giao thức"
 
-#: builtin/pack-objects.c:3992
 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:4027
 #, 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:4032
 #, c-format
 msgid "pack.deltaCacheLimit is too high, forcing %d"
 msgstr "pack.deltaCacheLimit là quá cao, ép dùng %d"
 
-#: builtin/pack-objects.c:4088
+#, c-format
+msgid "bad pack compression level %d"
+msgstr "mức nén gói %d không hợp lệ"
+
 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:4090
 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:4095
 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
 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:4106
 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:4110
 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:4169
+msgid "cannot use internal rev list with --cruft"
+msgstr "không thể dùng danh sách rev bên trong với --cruft"
+
+msgid "cannot use --stdin-packs with --cruft"
+msgstr "không thể dùng tùy chọn --stdin-packs  với --cruft"
+
+msgid "cannot use --max-pack-size with --cruft"
+msgstr "không thể dùng tùy chọn --max-pack-size với --cruft"
+
 msgid "Enumerating objects"
 msgstr "Đánh số các đối tượng"
 
-#: builtin/pack-objects.c:4210
 #, c-format
 msgid ""
 "Total %<PRIu32> (delta %<PRIu32>), reused %<PRIu32> (delta %<PRIu32>), pack-"
@@ -19844,7 +9097,6 @@ msgstr ""
 "Tổng %<PRIu32> (delta %<PRIu32>), dùng lại %<PRIu32> (delta %<PRIu32>), pack-"
 "reused %<PRIu32>"
 
-#: builtin/pack-redundant.c:601
 msgid ""
 "'git pack-redundant' is nominated for removal.\n"
 "If you still use this command, please add an extra\n"
@@ -19858,79 +9110,60 @@ msgstr ""
 "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"
 
-#: builtin/pack-refs.c:8
 msgid "git pack-refs [<options>]"
 msgstr "git pack-refs [<các tùy chọn>]"
 
-#: builtin/pack-refs.c:16
 msgid "pack everything"
 msgstr "đóng gói mọi thứ"
 
-#: builtin/pack-refs.c:17
 msgid "prune loose refs (default)"
 msgstr "prune (cắt cụt) những tham chiếu bị mất (mặc định)"
 
-#: builtin/prune.c:14
 msgid "git prune [-n] [-v] [--progress] [--expire <time>] [--] [<head>...]"
 msgstr "git prune [-n] [-v] [--progress] [--expire <thời-gian>] [--] [<head>…]"
 
-#: builtin/prune.c:145
 msgid "report pruned objects"
 msgstr "báo cáo các đối tượng đã prune"
 
-#: builtin/prune.c:148
 msgid "expire objects older than <time>"
 msgstr "các đối tượng hết hạn cũ hơn khoảng <thời gian>"
 
-#: builtin/prune.c:150
 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:163
 msgid "cannot prune in a precious-objects repo"
 msgstr "không thể tỉa bớt trong một kho đối_tượng_vĩ_đại"
 
-#: builtin/pull.c:67
 msgid "git pull [<options>] [<repository> [<refspec>...]]"
 msgstr "git pull [<các tùy chọn>] [<kho-chứa> [<refspec>…]]"
 
-#: 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:128
 msgid "Options related to merging"
 msgstr "Các tùy chọn liên quan đến hòa trộn"
 
-#: 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:159 builtin/revert.c:126
 msgid "allow fast-forward"
 msgstr "cho phép chuyển-tiếp-nhanh"
 
-#: 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:371
 msgid "automatically stash/stash pop before and after"
 msgstr "tự động stash/stash pop trước và sau"
 
-#: 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:197
 msgid "force overwrite of local branch"
 msgstr "ép buộc ghi đè lên nhánh nội bộ"
 
-#: 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:449
 msgid ""
 "There is no candidate for rebasing against among the refs that you just "
 "fetched."
@@ -19938,14 +9171,12 @@ msgstr ""
 "Ở đâ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: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:452
 msgid ""
 "Generally this means that you provided a wildcard refspec which had no\n"
 "matches on the remote end."
@@ -19954,7 +9185,6 @@ msgstr ""
 "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:455
 #, c-format
 msgid ""
 "You asked to pull from the remote '%s', but did not specify\n"
@@ -19966,43 +9196,32 @@ msgstr ""
 "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:460 builtin/rebase.c:978
 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: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: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: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:467 builtin/pull.c:473 builtin/pull.c:482
-#: builtin/rebase.c:984
 msgid "<remote>"
 msgstr "<máy chủ>"
 
-#: builtin/pull.c:467 builtin/pull.c:482 builtin/pull.c:487
-#: contrib/scalar/scalar.c:374
 msgid "<branch>"
 msgstr "<nhánh>"
 
-#: builtin/pull.c:475 builtin/rebase.c:976
 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: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:489
 #, c-format
 msgid ""
 "Your configuration specifies to merge with the ref '%s'\n"
@@ -20011,16 +9230,13 @@ msgstr ""
 "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: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:908
 msgid "ignoring --verify-signatures for rebase"
 msgstr "bỏ qua --verify-signatures khi rebase"
 
-#: builtin/pull.c:969
 msgid ""
 "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"
@@ -20051,21 +9267,17 @@ msgstr ""
 "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:1047
 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:1051
 msgid "pull with rebase"
 msgstr "pull với rebase"
 
-#: builtin/pull.c:1052
 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:1077
 #, c-format
 msgid ""
 "fetch updated the current branch head.\n"
@@ -20076,7 +9288,6 @@ msgstr ""
 "đ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:1083
 #, c-format
 msgid ""
 "Cannot fast-forward your working tree.\n"
@@ -20094,49 +9305,52 @@ msgstr ""
 "$ git reset --hard\n"
 "để khôi phục lại."
 
-#: builtin/pull.c:1098
 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:1103
 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:1105
 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:1120
 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:1134
 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ộ"
 
-#: builtin/push.c:19
 msgid "git push [<options>] [<repository> [<refspec>...]]"
 msgstr "git push [<các tùy chọn>] [<kho-chứa> [<refspec>…]]"
 
-#: builtin/push.c:111
 msgid "tag shorthand without <tag>"
 msgstr "dùng tốc ký thẻ không có <thẻ>"
 
-#: builtin/push.c:119
 msgid "--delete only accepts plain target ref names"
 msgstr "--delete chỉ chấp nhận các tên tham chiếu dạng thường"
 
-#: builtin/push.c:164
 msgid ""
 "\n"
-"To choose either option permanently, see push.default in 'git help config'."
+"To choose either option permanently, see push.default in 'git help config'.\n"
 msgstr ""
 "\n"
 "Để chọn mỗi tùy chọn một cách cố định, xem push.default trong “git help "
-"config”."
+"config”.\n"
+
+msgid ""
+"\n"
+"To avoid automatically configuring upstream branches when their name\n"
+"doesn't match the local branch, see option 'simple' of branch."
+"autoSetupMerge\n"
+"in 'git help config'.\n"
+msgstr ""
+"\n"
+"Để tránh tự động cấu hình nhánh thượng nguồn khi tên của chúng\n"
+"không khớp với nhánh nội bộ, xem tùy chọn 'simple' của branch."
+"autoSetupMerge\n"
+"trong 'git help config'.\n"
 
-#: builtin/push.c:167
 #, c-format
 msgid ""
 "The upstream branch of your current branch does not match\n"
@@ -20148,7 +9362,7 @@ msgid ""
 "To push to the branch of the same name on the remote, use\n"
 "\n"
 "    git push %s HEAD\n"
-"%s"
+"%s%s"
 msgstr ""
 "Nhánh thượng nguồn của nhánh hiện tại của bạn không khớp\n"
 "với tên của nhánh hiện tại của bạn.  Để đẩy lên đến nhánh\n"
@@ -20159,9 +9373,8 @@ msgstr ""
 "Để đẩy tới nhánh cùng tên trên máy chủ, sử dụng\n"
 "\n"
 "    git push %s HEAD\n"
-"%s"
+"%s%s"
 
-#: builtin/push.c:182
 #, c-format
 msgid ""
 "You are not currently on a branch.\n"
@@ -20176,33 +9389,40 @@ msgstr ""
 "\n"
 "    git push %s HEAD:<tên-của-nhánh-máy-chủ>\n"
 
-#: builtin/push.c:191
+msgid ""
+"\n"
+"To have this happen automatically for branches without a tracking\n"
+"upstream, see 'push.autoSetupRemote' in 'git help config'.\n"
+msgstr ""
+"\n"
+"Để việc này xảy ra tự động cho các nhánh mà không có thượng nguồn\n"
+"theo dõi, xem 'push.autoSetupRemote' trong 'git help config'.\n"
+
 #, c-format
 msgid ""
 "The current branch %s has no upstream branch.\n"
 "To push the current branch and set the remote as upstream, use\n"
 "\n"
 "    git push --set-upstream %s %s\n"
+"%s"
 msgstr ""
 "Nhánh hiện tại %s không có nhánh thượng nguồn nào.\n"
 "Để push (đẩy lên) nhánh hiện tại và đặt máy chủ này làm thượng nguồn "
 "(upstream), sử dụng\n"
 "\n"
 "    git push --set-upstream %s %s\n"
+"%s"
 
-#: builtin/push.c:199
 #, c-format
 msgid "The current branch %s has multiple upstream branches, refusing to push."
 msgstr "Nhánh hiện tại %s có nhiều nhánh thượng nguồn, từ chối push."
 
-#: builtin/push.c:217
 msgid ""
 "You didn't specify any refspecs to push, and push.default is \"nothing\"."
 msgstr ""
 "Bạn đã không chỉ ra một refspecs nào để đẩy lên, và push.default là \"không "
 "là gì cả\"."
 
-#: builtin/push.c:243
 #, c-format
 msgid ""
 "You are pushing to remote '%s', which is not the upstream of\n"
@@ -20214,7 +9434,6 @@ msgstr ""
 "nhánh hiện tại “%s” của bạn, mà không báo cho tôi biết là cái gì được push\n"
 "để cập nhật nhánh máy chủ nào."
 
-#: 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"
@@ -20227,7 +9446,6 @@ msgstr ""
 "Xem “Note about fast-forwards” trong “git push --help” để có thông tin chi "
 "tiết."
 
-#: 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"
@@ -20241,7 +9459,6 @@ msgstr ""
 "Xem “Note about fast-forwards” trong “git push --help” để có thông tin chi "
 "tiết."
 
-#: 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"
@@ -20256,11 +9473,9 @@ msgstr ""
 "Xem “Note about fast-forwards” trong “git push --help” để có thông tin chi "
 "tiết."
 
-#: builtin/push.c:277
 msgid "Updates were rejected because the tag already exists in the remote."
 msgstr "Việc cập nhật bị từ chối bởi vì thẻ đã sẵn có từ trước trên máy chủ."
 
-#: 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"
@@ -20272,7 +9487,6 @@ msgstr ""
 "đối tượng\n"
 "không phải chuyển giao, mà không sử dụng tùy chọn “--force”.\n"
 
-#: 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"
@@ -20284,99 +9498,79 @@ msgstr ""
 "tích hợp các thay đổi này một cách cục bộ (v.d. \"git pull …\")\n"
 "trước khi ép buộc một cập nhật.\n"
 
-#: builtin/push.c:355
 #, c-format
 msgid "Pushing to %s\n"
 msgstr "Đang đẩy lên %s\n"
 
-#: builtin/push.c:362
 #, c-format
 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/submodule--helper.c:3377
+#, c-format
+msgid "invalid value for '%s'"
+msgstr "giá trị cho '%s' không hợp lệ"
+
 msgid "repository"
 msgstr "kho"
 
-#: 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:195
 msgid "mirror all refs"
 msgstr "mirror tất cả các tham chiếu"
 
-#: builtin/push.c:548
 msgid "delete refs"
 msgstr "xóa các tham chiếu"
 
-#: builtin/push.c:549
 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:196
 msgid "force updates"
 msgstr "ép buộc cập nhật"
 
-#: 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: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: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ộ"
 
-#: builtin/push.c:560
 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:203
 msgid "use thin pack"
 msgstr "tạo gói nhẹ"
 
-#: 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"
 
-#: builtin/push.c:564
 msgid "set upstream for git pull/status"
 msgstr "đặt thượng nguồn cho git pull/status"
 
-#: builtin/push.c:567
 msgid "prune locally removed refs"
 msgstr "xén tỉa những tham chiếu bị gỡ bỏ"
 
-#: builtin/push.c:569
 msgid "bypass pre-push hook"
 msgstr "vòng qua móc tiền-đẩy (pre-push)"
 
-#: builtin/push.c:570
 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:197
 msgid "GPG sign the push"
 msgstr "ký lần đẩy dùng GPG"
 
-#: 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ủ"
 
-#: builtin/push.c:594
 msgid "--delete doesn't make sense without any refs"
 msgstr "--delete không hợp lý nếu không có bất kỳ tham chiếu nào"
 
-#: builtin/push.c:614
 #, c-format
 msgid "bad repository '%s'"
 msgstr "repository (kho) sai “%s”"
 
-#: builtin/push.c:615
 msgid ""
 "No configured push destination.\n"
 "Either specify the URL from the command-line or configure a remote "
@@ -20397,65 +9591,50 @@ msgstr ""
 "\n"
 "    git push <tên>\n"
 
-#: builtin/push.c:632
 msgid "--all can't be combined with refspecs"
 msgstr "--all không thể được tổ hợp cùng với đặc tả đường dẫn"
 
-#: builtin/push.c:638
 msgid "--mirror can't be combined with refspecs"
 msgstr "--mirror không thể được tổ hợp cùng với đặc tả đường dẫn"
 
-#: builtin/push.c:648
 msgid "push options must not have new line characters"
 msgstr "các tùy chọn push phải không có ký tự dòng mới"
 
-#: builtin/range-diff.c:9
 msgid "git range-diff [<options>] <old-base>..<old-tip> <new-base>..<new-tip>"
 msgstr ""
 "git range-diff [<các tùy chọn>] <old-base>..<old-tip> <new-base>..<new-tip>"
 
-#: builtin/range-diff.c:10
 msgid "git range-diff [<options>] <old-tip>...<new-tip>"
 msgstr "git range-diff [<các tùy chọn>] <old-tip>…<new-tip>"
 
-#: builtin/range-diff.c:11
 msgid "git range-diff [<options>] <base> <old-tip> <new-tip>"
 msgstr "git range-diff [<các tùy chọn>] <base> <old-tip> <new-tip>"
 
-#: builtin/range-diff.c:30
 msgid "use simple diff colors"
 msgstr "dùng màu diff đơn giản"
 
-#: builtin/range-diff.c:32
 msgid "notes"
 msgstr "ghi chú"
 
-#: builtin/range-diff.c:32
 msgid "passed to 'git log'"
 msgstr "chuyển cho “git log”"
 
-#: builtin/range-diff.c:35
 msgid "only emit output related to the first range"
 msgstr "chỉ phát ra kết xuất liên quan đến vùng đầu tiên"
 
-#: builtin/range-diff.c:37
 msgid "only emit output related to the second range"
 msgstr "chỉ phát ra kết xuất liên quan đến vùng thứ hai"
 
-#: builtin/range-diff.c:60 builtin/range-diff.c:64
 #, c-format
 msgid "not a commit range: '%s'"
 msgstr "không phải là vùng chuyển giao: “%s”"
 
-#: builtin/range-diff.c:74
 msgid "single arg format must be symmetric range"
 msgstr "định dạng đối số đơn phải là một vùng đối xứng"
 
-#: builtin/range-diff.c:89
 msgid "need two commit ranges"
 msgstr "cần hai vùng lần chuyển giao"
 
-#: builtin/read-tree.c:41
 msgid ""
 "git read-tree [(-m [--trivial] [--aggressive] | --reset | --prefix=<prefix>) "
 "[-u | -i]] [--no-sparse-checkout] [--index-output=<file>] (--empty | <tree-"
@@ -20465,80 +9644,61 @@ msgstr ""
 "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: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:119
 msgid "only empty the index"
 msgstr "chỉ với bảng mục lục trống rỗng"
 
-#: builtin/read-tree.c:121
 msgid "Merging"
 msgstr "Hòa trộn"
 
-#: 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: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: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: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:130
 msgid "<subdirectory>/"
 msgstr "<thư-mục-con>/"
 
-#: 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: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:136
 msgid "gitignore"
 msgstr "gitignore"
 
-#: 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: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: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: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:145
 msgid "debug unpack-trees"
 msgstr "gỡ lỗi “unpack-trees”"
 
-#: 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:190
 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/rebase.c:36
 msgid ""
 "git rebase [-i] [options] [--exec <cmd>] [--onto <newbase> | --keep-base] "
 "[<upstream> [<branch>]]"
@@ -20546,51 +9706,49 @@ msgstr ""
 "git rebase [-i] [các tùy chọn] [--exec <lệnh>] [--onto <newbase> | --keep-"
 "base] [<upstream>] [<nhánh>]]"
 
-#: builtin/rebase.c:38
 msgid ""
 "git rebase [-i] [options] [--exec <cmd>] [--onto <newbase>] --root [<branch>]"
 msgstr ""
 "git rebase [-i] [các tùy chọn] [--exec <lệnh>] [--onto <newbase>] --root "
 "[<nhánh>]"
 
-#: builtin/rebase.c:231
+#, c-format
+msgid "could not read '%s'."
+msgstr "không thể đọc “%s”."
+
 #, c-format
 msgid "could not create temporary %s"
 msgstr "không thể tạo %s tạm thời"
 
-#: builtin/rebase.c:237
 msgid "could not mark as interactive"
 msgstr "không thể đánh dấu là tương tác"
 
-#: builtin/rebase.c:290
 msgid "could not generate todo list"
 msgstr "không thể tạo danh sách cần làm"
 
-#: builtin/rebase.c:332
 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:391
 #, 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:433
 #, c-format
 msgid "could not get 'onto': '%s'"
 msgstr "không thể đặt lấy “onto”: “%s”"
 
-#: builtin/rebase.c:450
 #, c-format
 msgid "invalid orig-head: '%s'"
 msgstr "orig-head không hợp lệ: “%s”"
 
-#: builtin/rebase.c:475
 #, 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:600
+#, c-format
+msgid "could not remove '%s'"
+msgstr "không thể gỡ bỏ “%s”"
+
 msgid ""
 "Resolve all conflicts manually, mark them as resolved with\n"
 "\"git add/rm <conflicted_files>\", then run \"git rebase --continue\".\n"
@@ -20605,7 +9763,6 @@ msgstr ""
 "Để bãi bỏ và quay trở lại trạng thái trước \"git rebase\", chạy \"git rebase "
 "--abort\"."
 
-#: builtin/rebase.c:685
 #, c-format
 msgid ""
 "\n"
@@ -20624,12 +9781,10 @@ msgstr ""
 "\n"
 "Kết quả là git không thể cải tổ lại chúng."
 
-#: builtin/rebase.c:836
 #, c-format
 msgid "could not switch to %s"
 msgstr "không thể chuyển đến %s"
 
-#: builtin/rebase.c:952
 #, c-format
 msgid ""
 "unrecognized empty type '%s'; valid values are \"drop\", \"keep\", and \"ask"
@@ -20638,7 +9793,6 @@ msgstr ""
 "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:970
 #, c-format
 msgid ""
 "%s\n"
@@ -20655,7 +9809,6 @@ msgstr ""
 "    git rebase “<nhánh>”\n"
 "\n"
 
-#: builtin/rebase.c:986
 #, c-format
 msgid ""
 "If you wish to set tracking information for this branch you can do so with:\n"
@@ -20669,185 +9822,158 @@ msgstr ""
 "    git branch --set-upstream-to=%s/<nhánh> %s\n"
 "\n"
 
-#: builtin/rebase.c:1016
 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:1020
 msgid "empty exec command"
 msgstr "lệnh thực thi trống rỗng"
 
-#: builtin/rebase.c:1051
 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:1053
 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:1055
 msgid "allow pre-rebase hook to run"
 msgstr "cho phép móc (hook) pre-rebase được chạy"
 
-#: builtin/rebase.c:1057
 msgid "be quiet. implies --no-stat"
 msgstr "hãy im lặng. ý là --no-stat"
 
-#: builtin/rebase.c:1060
 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:1063
 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:1066
 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:1069
 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:1071
 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:1073
 msgid "synonym of --reset-author-date"
 msgstr "đồng nghĩa với --reset-author-date"
 
-#: builtin/rebase.c:1075 builtin/rebase.c:1079
 msgid "passed to 'git apply'"
 msgstr "chuyển cho “git apply”"
 
-#: builtin/rebase.c:1077
 msgid "ignore changes in whitespace"
 msgstr "lờ đi sự thay đổi do khoảng trắng gây ra"
 
-#: builtin/rebase.c:1081 builtin/rebase.c:1084
 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:1086
 msgid "continue"
 msgstr "tiếp tục"
 
-#: builtin/rebase.c:1089
 msgid "skip current patch and continue"
 msgstr "bỏ qua miếng vá hiện hành và tiếp tục"
 
-#: builtin/rebase.c:1091
 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:1094
 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:1095
 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:1098
 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:1101
 msgid "use apply strategies to rebase"
 msgstr "dùng chiến lược áp dụng để cải tổ"
 
-#: builtin/rebase.c:1105
 msgid "use merging strategies to rebase"
 msgstr "dùng chiến lược hòa trộn để cải tổ"
 
-#: builtin/rebase.c:1109
 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:1113
-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"
+msgid "(REMOVED) was: try to recreate merges instead of ignoring them"
+msgstr "(ĐÃ BỊ XÓA BỎ) hãy thử tạo lại các hòa trộn thay vì bỏ qua chúng"
 
-#: builtin/rebase.c:1118
 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:1121
 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:1125
 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:1132
 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:1136
 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:1140
 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:1143
 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:1145
 msgid "use the given merge strategy"
 msgstr "dùng chiến lược hòa trộn đã cho"
 
-#: builtin/rebase.c:1147 builtin/revert.c:115
 msgid "option"
 msgstr "tùy chọn"
 
-#: builtin/rebase.c:1148
 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:1151
 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:1154
 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:1156
 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:1177
 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:1208
-msgid "--preserve-merges was replaced by --rebase-merges"
-msgstr "--preserve-merges đã bị thay thế bằng --rebase-merges"
+msgid ""
+"`rebase --preserve-merges` (-p) is no longer supported.\n"
+"Use `git rebase --abort` to terminate current rebase.\n"
+"Or downgrade to v2.33, or earlier, to complete the rebase."
+msgstr ""
+"`rebase --preserve-merges` (-p) không còn được hỗ trợ nữa.\n"
+"Dùng `git rebase --abort` để chấm dứt việc cải tổ hiện tại.\n"
+"Hoặc là hạ phiên bản phần mềm xuống v2.33,\n"
+"hoặc trước nữa, để hoàn thành việc cải tổ."
+
+msgid ""
+"--preserve-merges was replaced by --rebase-merges\n"
+"Note: Your `pull.rebase` configuration may also be set to 'preserve',\n"
+"which is no longer supported; use 'merges' instead"
+msgstr ""
+"--preserve-merges được thay bằng --rebase-merges\n"
+"Chú ý: Cấu hình `pull.rebase` của bạn cũng có thể được đặt thành "
+"'preserve',\n"
+"cái mà giờ không còn được hỗ trợ nữa; dùng 'merges' để thay thế"
 
-#: builtin/rebase.c:1230
 msgid "No rebase in progress?"
 msgstr "Không có tiến trình rebase nào phải không?"
 
-#: builtin/rebase.c:1234
 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:1257 t/helper/test-fast-rebase.c:122
 msgid "Cannot read HEAD"
 msgstr "Không thể đọc HEAD"
 
-#: builtin/rebase.c:1269
 msgid ""
 "You must edit all merge conflicts and then\n"
 "mark them as resolved using git add"
@@ -20855,16 +9981,13 @@ msgstr ""
 "Bạn phải sửa tất cả các lần hòa trộn xung đột và sau\n"
 "đó đánh dấu chúng là cần xử lý sử dụng lệnh git add"
 
-#: builtin/rebase.c:1287
 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:1308
 #, c-format
 msgid "could not move back to %s"
 msgstr "không thể quay trở lại %s"
 
-#: builtin/rebase.c:1354
 #, c-format
 msgid ""
 "It seems that there is already a %s directory, and\n"
@@ -20885,128 +10008,100 @@ msgstr ""
 "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:1382
 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:1424
 #, c-format
 msgid "Unknown mode: %s"
 msgstr "Không hiểu chế độ: %s"
 
-#: builtin/rebase.c:1463
 msgid "--strategy requires --merge or --interactive"
 msgstr "--strategy cần --merge hay --interactive"
 
-#: builtin/rebase.c:1492
 msgid "apply options and merge options cannot be used together"
 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 với nhau"
 
-#: builtin/rebase.c:1505
 #, 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:1534
 msgid "--reschedule-failed-exec requires --exec or --interactive"
 msgstr "--reschedule-failed-exec cần --exec hay --interactive"
 
-#: builtin/rebase.c:1565
 #, c-format
 msgid "invalid upstream '%s'"
 msgstr "thượng nguồn không hợp lệ “%s”"
 
-#: builtin/rebase.c:1571
 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:1597
+#, c-format
+msgid "no such branch/commit '%s'"
+msgstr "không có nhánh/lần chuyển giao “%s” như thế"
+
+#, c-format
+msgid "No such ref: %s"
+msgstr "Không có tham chiếu nào như thế: %s"
+
+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"
+
 #, 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:1600
 #, 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:1609
 #, 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:1636
-#, c-format
-msgid "no such branch/commit '%s'"
-msgstr "không có nhánh/lần chuyển giao “%s” như thế"
-
-#: builtin/rebase.c:1647 builtin/submodule--helper.c:43
-#: builtin/submodule--helper.c:2477
-#, c-format
-msgid "No such ref: %s"
-msgstr "Không có tham chiếu nào như thế: %s"
-
-#: builtin/rebase.c:1658
-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:1679
 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:1714
 msgid "HEAD is up to date."
 msgstr "HEAD đã cập nhật."
 
-#: builtin/rebase.c:1716
 #, 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:1724
 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:1726
 #, 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:1734
 msgid "The pre-rebase hook refused to rebase."
 msgstr "Móc (hook) pre-rebase từ chối rebase."
 
-#: builtin/rebase.c:1741
 #, c-format
 msgid "Changes to %s:\n"
 msgstr "Thay đổi thành %s:\n"
 
-#: builtin/rebase.c:1744
 #, c-format
 msgid "Changes from %s to %s:\n"
 msgstr "Thay đổi từ %s thành %s:\n"
 
-#: builtin/rebase.c:1769
 #, 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:1781
 msgid "Could not detach HEAD"
 msgstr "Không thể tách rời HEAD"
 
-#: builtin/rebase.c:1790
 #, c-format
 msgid "Fast-forwarded %s to %s.\n"
 msgstr "Chuyển-tiếp-nhanh %s đến %s.\n"
 
-#: builtin/receive-pack.c:35
 msgid "git receive-pack <git-dir>"
 msgstr "git receive-pack <thư-mục-git>"
 
-#: builtin/receive-pack.c:1263
 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"
@@ -21036,7 +10131,6 @@ msgstr ""
 "Để 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:1283
 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"
@@ -21057,19 +10151,15 @@ msgstr ""
 "\n"
 "Để chấm dứt lời nhắn này, bạn hãy đặt nó thành “refuse”."
 
-#: builtin/receive-pack.c:2476
 msgid "quiet"
 msgstr "im lặng"
 
-#: builtin/receive-pack.c:2491
 msgid "you must specify a directory"
 msgstr "bạn phải chỉ định thư mục"
 
-#: builtin/reflog.c:9
 msgid "git reflog [show] [<log-options>] [<ref>]"
 msgstr "git reflog [show] [<các tùy chọn>] [<tham chiếu>]"
 
-#: builtin/reflog.c:12
 msgid ""
 "git reflog expire [--expire=<time>] [--expire-unreachable=<time>]\n"
 "                  [--rewrite] [--updateref] [--stale-fix]\n"
@@ -21081,7 +10171,6 @@ msgstr ""
 "                  [--dry-run | -n] [--verbose] [--all [--single-worktree] | "
 "<refs>...]"
 
-#: builtin/reflog.c:17
 msgid ""
 "git reflog delete [--rewrite] [--updateref]\n"
 "                  [--dry-run | -n] [--verbose] <ref>@{<specifier>}..."
@@ -21089,41 +10178,32 @@ msgstr ""
 "git reflog delete [--rewrite] [--updateref]\n"
 "                  [--dry-run | -n] [--verbose] <ref>@{<specifier>}..."
 
-#: builtin/reflog.c:21
 msgid "git reflog exists <ref>"
 msgstr "git reflog exists <tham_chiếu>"
 
-#: builtin/reflog.c:197 builtin/reflog.c:211
 #, c-format
 msgid "invalid timestamp '%s' given to '--%s'"
 msgstr "dấu vết thời gian không hợp lệ '%s' đưa cho '--%s'"
 
-#: builtin/reflog.c:240 builtin/reflog.c:359
 msgid "do not actually prune any entries"
 msgstr "thực tế không cắt ngắn bất kỳ mục tin nào"
 
-#: builtin/reflog.c:243 builtin/reflog.c:362
 msgid ""
 "rewrite the old SHA1 with the new SHA1 of the entry that now precedes it"
 msgstr "ghi lại SHA1 cũ bằng một SHA1 mới của mục tin mà giờ đứng trước nó"
 
-#: builtin/reflog.c:246 builtin/reflog.c:365
 msgid "update the reference to the value of the top reflog entry"
 msgstr "cập nhật tham chiếu đến giá trị của mục tin reflog trên cùng"
 
-#: builtin/reflog.c:248 builtin/reflog.c:367
 msgid "print extra information on screen"
 msgstr "xuất thông tin thêm trên màn hình"
 
-#: builtin/reflog.c:249 builtin/reflog.c:253
 msgid "timestamp"
 msgstr "dấu vết thời gian"
 
-#: builtin/reflog.c:250
 msgid "prune entries older than the specified time"
 msgstr "cắt cụt các mục tin cũ hơn khoảng thời gian đã cho"
 
-#: builtin/reflog.c:254
 msgid ""
 "prune entries older than <time> that are not reachable from the current tip "
 "of the branch"
@@ -21131,38 +10211,30 @@ msgstr ""
 "cắt cụt các mục tin cũ hơn <thời gian> cái mà không thể tiếp cận được từ "
 "đỉnh hiện tại của nhánh"
 
-#: builtin/reflog.c:258
 msgid "prune any reflog entries that point to broken commits"
 msgstr "cắt ngắn bất kỳ mục tin reflog cái mà chỉ đến lần chuyển giao hỏng"
 
-#: builtin/reflog.c:259
 msgid "process the reflogs of all references"
 msgstr "xử lý các reflogs cho mọi tham chiếu"
 
-#: builtin/reflog.c:261
 msgid "limits processing to reflogs from the current worktree only"
 msgstr "giới hạn xử lý với reflogs chỉ từ thư mục làm việc hiện tại"
 
-#: builtin/reflog.c:294
 #, c-format
 msgid "Marking reachable objects..."
 msgstr "Đánh dấu các đối tượng tiếp cận được…"
 
-#: builtin/reflog.c:338
 #, c-format
 msgid "%s points nowhere!"
 msgstr "%s chẳng chỉ đến đâu cả!"
 
-#: builtin/reflog.c:374
 msgid "no reflog specified to delete"
 msgstr "chưa chỉ ra reflog để xóa"
 
-#: builtin/reflog.c:396
 #, c-format
 msgid "invalid ref format: %s"
 msgstr "định dạng tham chiếu không hợp lệ: %s"
 
-#: builtin/remote.c:19
 msgid ""
 "git remote add [-t <branch>] [-m <master>] [-f] [--tags | --no-tags] [--"
 "mirror=<fetch|push>] <name> <url>"
@@ -21170,87 +10242,67 @@ msgstr ""
 "git remote add [-t <nhánh>] [-m <master>] [-f] [--tags|--no-tags] [--"
 "mirror=<fetch|push>] <tên> <url>"
 
-#: builtin/remote.c:20 builtin/remote.c:40
 msgid "git remote rename [--[no-]progress] <old> <new>"
 msgstr "git remote rename [--[no-]progress] <tên-cũ> <tên-mới>"
 
-#: builtin/remote.c:21 builtin/remote.c:45
 msgid "git remote remove <name>"
 msgstr "git remote remove <tên>"
 
-#: builtin/remote.c:22 builtin/remote.c:50
 msgid "git remote set-head <name> (-a | --auto | -d | --delete | <branch>)"
 msgstr "git remote set-head <tên> (-a | --auto | -d | --delete | <nhánh>)"
 
-#: builtin/remote.c:23
 msgid "git remote [-v | --verbose] show [-n] <name>"
 msgstr "git remote [-v | --verbose] show [-n] <tên>"
 
-#: builtin/remote.c:24
 msgid "git remote prune [-n | --dry-run] <name>"
 msgstr "git remote prune [-n | --dry-run] <tên>"
 
-#: builtin/remote.c:25
 msgid ""
 "git remote [-v | --verbose] update [-p | --prune] [(<group> | <remote>)...]"
 msgstr ""
 "git remote [-v | --verbose] update [-p | --prune] [(<nhóm> | <máy-chủ>)…]"
 
-#: builtin/remote.c:26
 msgid "git remote set-branches [--add] <name> <branch>..."
 msgstr "git remote set-branches [--add] <tên> <nhánh>…"
 
-#: builtin/remote.c:27 builtin/remote.c:76
 msgid "git remote get-url [--push] [--all] <name>"
 msgstr "git remote set-url [--push] [--all] <tên>"
 
-#: builtin/remote.c:28 builtin/remote.c:81
 msgid "git remote set-url [--push] <name> <newurl> [<oldurl>]"
 msgstr "git remote set-url [--push] <tên> <url-mới> [<url-cũ>]"
 
-#: builtin/remote.c:29 builtin/remote.c:82
 msgid "git remote set-url --add <name> <newurl>"
 msgstr "git remote set-url --add <tên> <url-mới>"
 
-#: builtin/remote.c:30 builtin/remote.c:83
 msgid "git remote set-url --delete <name> <url>"
 msgstr "git remote set-url --delete <tên> <url>"
 
-#: builtin/remote.c:35
 msgid "git remote add [<options>] <name> <url>"
 msgstr "git remote add [<các tùy chọn>] <tên> <url>"
 
-#: builtin/remote.c:55
 msgid "git remote set-branches <name> <branch>..."
 msgstr "git remote set-branches <tên> <nhánh>…"
 
-#: builtin/remote.c:56
 msgid "git remote set-branches --add <name> <branch>..."
 msgstr "git remote set-branches --add <tên> <nhánh>…"
 
-#: builtin/remote.c:61
 msgid "git remote show [<options>] <name>"
 msgstr "git remote show [<các tùy chọn>] <tên>"
 
-#: builtin/remote.c:66
 msgid "git remote prune [<options>] <name>"
 msgstr "git remote prune [<các tùy chọn>] <tên>"
 
-#: builtin/remote.c:71
 msgid "git remote update [<options>] [<group> | <remote>]..."
 msgstr "git remote update [<các tùy chọn>] [<nhóm> | <máy-chủ>]…"
 
-#: builtin/remote.c:100
 #, c-format
 msgid "Updating %s"
 msgstr "Đang cập nhật %s"
 
-#: builtin/remote.c:102
 #, c-format
 msgid "Could not fetch %s"
 msgstr "Không thể lấy“%s” về"
 
-#: builtin/remote.c:132
 msgid ""
 "--mirror is dangerous and deprecated; please\n"
 "\t use --mirror=fetch or --mirror=push instead"
@@ -21258,77 +10310,68 @@ msgstr ""
 "--mirror nguy hiểm và không dùng nữa; xin hãy\n"
 "\t sử dụng tùy chọn --mirror=fetch hoặc --mirror=push để thay thế"
 
-#: builtin/remote.c:149
 #, c-format
 msgid "unknown mirror argument: %s"
 msgstr "không hiểu tham số máy bản sao (mirror): %s"
 
-#: builtin/remote.c:165
 msgid "fetch the remote branches"
 msgstr "lấy về các nhánh từ máy chủ"
 
-#: builtin/remote.c:167
 msgid "import all tags and associated objects when fetching"
 msgstr "nhập vào tất cả các đối tượng thẻ và thành phần liên quan khi lấy về"
 
-#: builtin/remote.c:170
 msgid "or do not fetch any tag at all (--no-tags)"
 msgstr "hoặc không lấy về bất kỳ thẻ nào (--no-tags)"
 
-#: builtin/remote.c:172
 msgid "branch(es) to track"
 msgstr "các nhánh để theo dõi"
 
-#: builtin/remote.c:173
 msgid "master branch"
 msgstr "nhánh master"
 
-#: builtin/remote.c:175
 msgid "set up remote as a mirror to push to or fetch from"
 msgstr "đặt máy chủ (remote) như là một máy bản sao để push hay fetch từ đó"
 
-#: builtin/remote.c:187
 msgid "specifying a master branch makes no sense with --mirror"
 msgstr "đang chỉ định một nhánh master không hợp lý với tùy chọn --mirror"
 
-#: builtin/remote.c:189
 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:196 builtin/remote.c:716
 #, c-format
 msgid "remote %s already exists."
 msgstr "máy chủ %s đã tồn tại rồi."
 
-#: builtin/remote.c:241
 #, c-format
 msgid "Could not setup master '%s'"
 msgstr "Không thể cài đặt nhánh master “%s”"
 
-#: builtin/remote.c:323
+#, c-format
+msgid "more than one %s"
+msgstr "nhiều hơn một %s"
+
 #, 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:367
 #, 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:461 builtin/remote.c:469
 msgid "(matching)"
 msgstr "(khớp)"
 
-#: builtin/remote.c:473
 msgid "(delete)"
 msgstr "(xóa)"
 
-#: builtin/remote.c:664
 #, c-format
 msgid "could not set '%s'"
 msgstr "không thể đặt “%s”"
 
-#: builtin/remote.c:669
+#, c-format
+msgid "could not unset '%s'"
+msgstr "không thể thôi đặt “%s”"
+
 #, c-format
 msgid ""
 "The %s configuration remote.pushDefault in:\n"
@@ -21339,17 +10382,14 @@ msgstr ""
 "\t%s:%d\n"
 "bây giờ tên trên máy chủ không tồn tại “%s”"
 
-#: builtin/remote.c:707 builtin/remote.c:866 builtin/remote.c:973
 #, c-format
 msgid "No such remote: '%s'"
 msgstr "Không có máy chủ nào như vậy: “%s”"
 
-#: builtin/remote.c:726
 #, 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:746
 #, c-format
 msgid ""
 "Not updating non-default fetch refspec\n"
@@ -21360,21 +10400,17 @@ msgstr ""
 "\t%s\n"
 "\tXin hãy cập nhật phần cấu hình một cách thủ công nếu thấy cần thiết."
 
-#: builtin/remote.c:783
 msgid "Renaming remote references"
 msgstr "Đổi tên các tham chiếu máy chủ"
 
-#: builtin/remote.c:794
 #, c-format
 msgid "deleting '%s' failed"
 msgstr "gặp lỗi khi xóa “%s”"
 
-#: builtin/remote.c:832
 #, c-format
 msgid "creating '%s' failed"
 msgstr "gặp lỗi khi tạo “%s”"
 
-#: builtin/remote.c:912
 msgid ""
 "Note: A branch outside the refs/remotes/ hierarchy was not removed;\n"
 "to delete it, use:"
@@ -21386,119 +10422,94 @@ msgstr[0] ""
 "đi;\n"
 "để xóa đi, sử dụng:"
 
-#: builtin/remote.c:926
 #, 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:1034
 #, 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:1037
 msgid " tracked"
 msgstr " được theo dõi"
 
-#: builtin/remote.c:1039
 msgid " stale (use 'git remote prune' to remove)"
 msgstr " cũ rích (dùng “git remote prune” để gỡ bỏ)"
 
-#: builtin/remote.c:1041
 msgid " ???"
 msgstr " ???"
 
-#: builtin/remote.c:1082
 #, 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:1091
 #, 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:1093
 #, 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:1096
 #, c-format
 msgid "rebases onto remote %s"
 msgstr "thực hiện rebase trên máy chủ %s"
 
-#: builtin/remote.c:1100
 #, c-format
 msgid " merges with remote %s"
 msgstr " hòa trộn với máy chủ %s"
 
-#: builtin/remote.c:1103
 #, c-format
 msgid "merges with remote %s"
 msgstr "hòa trộn với máy chủ %s"
 
-#: builtin/remote.c:1106
 #, c-format
 msgid "%-*s    and with remote %s\n"
 msgstr "%-*s    và với máy chủ %s\n"
 
-#: builtin/remote.c:1149
 msgid "create"
 msgstr "tạo"
 
-#: builtin/remote.c:1152
 msgid "delete"
 msgstr "xóa"
 
-#: builtin/remote.c:1156
 msgid "up to date"
 msgstr "đã cập nhật"
 
-#: builtin/remote.c:1159
 msgid "fast-forwardable"
 msgstr "có-thể-chuyển-tiếp-nhanh"
 
-#: builtin/remote.c:1162
 msgid "local out of date"
 msgstr "dữ liệu nội bộ đã cũ"
 
-#: builtin/remote.c:1169
 #, c-format
 msgid "    %-*s forces to %-*s (%s)"
 msgstr "    %-*s ép buộc thành %-*s (%s)"
 
-#: builtin/remote.c:1172
 #, c-format
 msgid "    %-*s pushes to %-*s (%s)"
 msgstr "    %-*s đẩy lên thành %-*s (%s)"
 
-#: builtin/remote.c:1176
 #, c-format
 msgid "    %-*s forces to %s"
 msgstr "    %-*s ép buộc thành %s"
 
-#: builtin/remote.c:1179
 #, c-format
 msgid "    %-*s pushes to %s"
 msgstr "    %-*s đẩy lên thành %s"
 
-#: builtin/remote.c:1247
 msgid "do not query remotes"
 msgstr "không truy vấn các máy chủ"
 
-#: builtin/remote.c:1268
 #, c-format
 msgid "* remote %s"
 msgstr "* máy chủ %s"
 
-#: builtin/remote.c:1269
 #, c-format
 msgid "  Fetch URL: %s"
 msgstr "  URL để lấy về: %s"
 
-#: builtin/remote.c:1270 builtin/remote.c:1286 builtin/remote.c:1423
 msgid "(no URL)"
 msgstr "(không có URL)"
 
@@ -21506,359 +10517,290 @@ msgstr "(không có URL)"
 #. with the one in " Fetch URL: %s"
 #. translation.
 #.
-#: builtin/remote.c:1284 builtin/remote.c:1286
 #, c-format
 msgid "  Push  URL: %s"
 msgstr "  URL để đẩy lên: %s"
 
-#: builtin/remote.c:1288 builtin/remote.c:1290 builtin/remote.c:1292
 #, c-format
 msgid "  HEAD branch: %s"
 msgstr "  Nhánh HEAD: %s"
 
-#: builtin/remote.c:1288
 msgid "(not queried)"
 msgstr "(không yêu cầu)"
 
-#: builtin/remote.c:1290
 msgid "(unknown)"
 msgstr "(không hiểu)"
 
-#: builtin/remote.c:1294
 #, 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:1306
 #, 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:1309 builtin/remote.c:1335
 msgid " (status not queried)"
 msgstr " (trạng thái không được yêu cầu)"
 
-#: builtin/remote.c:1318
 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:1326
 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:1332
 #, 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:1353
 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:1355
 msgid "delete refs/remotes/<name>/HEAD"
 msgstr "xóa refs/remotes/<tên>/HEAD"
 
-#: builtin/remote.c:1369
 msgid "Cannot determine remote HEAD"
 msgstr "Không thể xác định được HEAD máy chủ"
 
-#: builtin/remote.c:1371
 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:1381
 #, c-format
 msgid "Could not delete %s"
 msgstr "Không thể xóa bỏ %s"
 
-#: builtin/remote.c:1389
 #, c-format
 msgid "Not a valid ref: %s"
 msgstr "Không phải là tham chiếu hợp lệ: %s"
 
-#: builtin/remote.c:1391
 #, c-format
 msgid "Could not setup %s"
 msgstr "Không thể cài đặt %s"
 
-#: builtin/remote.c:1409
 #, 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:1410
 #, c-format
 msgid " %s has become dangling!"
 msgstr " %s đã trở thành không đầu (không được quản lý)!"
 
-#: builtin/remote.c:1419
 #, c-format
 msgid "Pruning %s"
 msgstr "Đang xén bớt %s"
 
-#: builtin/remote.c:1420
 #, c-format
 msgid "URL: %s"
 msgstr "URL: %s"
 
-#: builtin/remote.c:1436
 #, c-format
 msgid " * [would prune] %s"
 msgstr " * [nên xén bớt] %s"
 
-#: builtin/remote.c:1439
 #, c-format
 msgid " * [pruned] %s"
 msgstr " * [đã bị xén] %s"
 
-#: builtin/remote.c:1484
 msgid "prune remotes after fetching"
 msgstr "cắt máy chủ sau khi lấy về"
 
-#: builtin/remote.c:1548 builtin/remote.c:1604 builtin/remote.c:1674
 #, c-format
 msgid "No such remote '%s'"
 msgstr "Không có máy chủ nào có tên “%s”"
 
-#: builtin/remote.c:1566
 msgid "add branch"
 msgstr "thêm nhánh"
 
-#: builtin/remote.c:1573
 msgid "no remote specified"
 msgstr "chưa chỉ ra máy chủ nào"
 
-#: builtin/remote.c:1590
 msgid "query push URLs rather than fetch URLs"
 msgstr "truy vấn đẩy URL thay vì lấy"
 
-#: builtin/remote.c:1592
 msgid "return all URLs"
 msgstr "trả về mọi URL"
 
-#: builtin/remote.c:1622
 #, 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:1648
 msgid "manipulate push URLs"
 msgstr "đẩy các “URL” bằng tay"
 
-#: builtin/remote.c:1650
 msgid "add URL"
 msgstr "thêm URL"
 
-#: builtin/remote.c:1652
 msgid "delete URLs"
 msgstr "xóa URLs"
 
-#: builtin/remote.c:1659
 msgid "--add --delete doesn't make sense"
 msgstr "--add --delete không hợp lý"
 
-#: builtin/remote.c:1700
 #, c-format
 msgid "Invalid old URL pattern: %s"
 msgstr "Kiểu mẫu URL cũ không hợp lệ: %s"
 
-#: builtin/remote.c:1708
 #, c-format
 msgid "No such URL found: %s"
 msgstr "Không tìm thấy URL như vậy: %s"
 
-#: builtin/remote.c:1710
 msgid "Will not delete all non-push URLs"
 msgstr "Sẽ không xóa những địa chỉ URL không-push"
 
-#: builtin/remote.c:1727
 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:29
 msgid "git repack [<options>]"
 msgstr "git repack [<các tùy chọn>]"
 
-#: builtin/repack.c:34
 msgid ""
 "Incremental repacks are incompatible with bitmap indexes.  Use\n"
-"--no-write-bitmap-index or disable the pack.writebitmaps configuration."
+"--no-write-bitmap-index or disable the pack.writeBitmaps configuration."
 msgstr ""
-"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."
+"Gia tăng các 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:206
 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:280 builtin/repack.c:824
 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:304
 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:319
 #, c-format
 msgid "cannot open index for %s"
 msgstr "không thể mở mục lục cho “%s”"
 
-#: builtin/repack.c:378
 #, 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:411 builtin/repack.c:418 builtin/repack.c:423
 #, 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:503
 #, 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:521
 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:634
 msgid "pack everything in a single pack"
 msgstr "đóng gói mọi thứ trong một gói đơn"
 
-#: builtin/repack.c:636
 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:639
+msgid "same as -a, pack unreachable cruft objects separately"
+msgstr ""
+"giống với -a, đóng gói các đối tượng cruft không tiếp cận được riêng ra"
+
+msgid "approxidate"
+msgstr "ngày ước tính"
+
+msgid "with -C, expire objects older than this"
+msgstr "với -C, các đối tượng hết hạn cũ hơn khoảng này"
+
 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:641
 msgid "pass --no-reuse-delta to git-pack-objects"
 msgstr "chuyển --no-reuse-delta cho git-pack-objects"
 
-#: builtin/repack.c:643
 msgid "pass --no-reuse-object to git-pack-objects"
 msgstr "chuyển --no-reuse-object cho git-pack-objects"
 
-#: builtin/repack.c:645
 msgid "do not run git-update-server-info"
 msgstr "không chạy git-update-server-info"
 
-#: builtin/repack.c:648
 msgid "pass --local to git-pack-objects"
 msgstr "chuyển --local cho git-pack-objects"
 
-#: builtin/repack.c:650
 msgid "write bitmap index"
 msgstr "ghi mục lục ánh xạ"
 
-#: builtin/repack.c:652
 msgid "pass --delta-islands to git-pack-objects"
 msgstr "chuyển --delta-islands cho git-pack-objects"
 
-#: builtin/repack.c:653
-msgid "approxidate"
-msgstr "ngày ước tính"
-
-#: builtin/repack.c:654
 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:656
 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:658
 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:659 builtin/repack.c:665
 msgid "bytes"
 msgstr "byte"
 
-#: builtin/repack.c:660
 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:662
 msgid "limits the maximum delta depth"
 msgstr "giới hạn độ sâu tối đa của “delta”"
 
-#: builtin/repack.c:664
 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:666
 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:668
 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:670
 msgid "do not repack this pack"
 msgstr "đừng đóng gói lại gói này"
 
-#: builtin/repack.c:672
 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:674
 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:684
 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:833
 msgid "Nothing new to pack."
 msgstr "Không có gì mới để mà đóng gói."
 
-#: builtin/repack.c:863
+#, c-format
+msgid "pack prefix %s does not begin with objdir %s"
+msgstr "tiền tố gói “%s” không được bắt đầu với objdir “.%s”"
+
 #, c-format
 msgid "missing required file: %s"
 msgstr "thiếu tập tin cần thiết: %s"
 
-#: builtin/repack.c:865
 #, c-format
 msgid "could not unlink: %s"
 msgstr "không thể bỏ liên kết: %s"
 
-#: builtin/replace.c:22
 msgid "git replace [-f] <object> <replacement>"
 msgstr "git replace [-f] <đối-tượng> <thay-thế>"
 
-#: builtin/replace.c:23
 msgid "git replace [-f] --edit <object>"
 msgstr "git replace [-f] --edit <đối tượng>"
 
-#: builtin/replace.c:24
 msgid "git replace [-f] --graft <commit> [<parent>...]"
 msgstr "git replace [-f] --graft <lần_chuyển_giao> [<cha_mẹ>…]"
 
-#: builtin/replace.c:26
 msgid "git replace -d <object>..."
 msgstr "git replace -d <đối tượng>…"
 
-#: builtin/replace.c:27
 msgid "git replace [--format=<format>] [-l [<pattern>]]"
 msgstr "git replace [--format=<định_dạng>] [-l [<mẫu>]]"
 
-#: builtin/replace.c:90
 #, c-format
 msgid ""
 "invalid replace format '%s'\n"
@@ -21867,27 +10809,22 @@ msgstr ""
 "định dạng thay thế không hợp lệ “%s”\n"
 "định dạng hợp lệ là “short”, “medium” và “long”"
 
-#: builtin/replace.c:125
 #, c-format
 msgid "replace ref '%s' not found"
 msgstr "không tìm thấy tham chiếu thay thế “%s”"
 
-#: builtin/replace.c:141
 #, c-format
 msgid "Deleted replace ref '%s'"
 msgstr "Đã xóa tham chiếu thay thế “%s”"
 
-#: builtin/replace.c:153
 #, c-format
 msgid "'%s' is not a valid ref name"
 msgstr "“%s” không phải tên tham chiếu hợp lệ"
 
-#: builtin/replace.c:158
 #, c-format
 msgid "replace ref '%s' already exists"
 msgstr "tham chiếu thay thế “%s” đã tồn tại rồi"
 
-#: builtin/replace.c:178
 #, c-format
 msgid ""
 "Objects must be of the same type.\n"
@@ -21898,75 +10835,59 @@ msgstr ""
 "“%s” chỉ đến đối tượng thay thế của kiểu “%s”\n"
 "trong khi “%s” chỉ đến đối tượng tham chiếu của kiểu “%s”."
 
-#: builtin/replace.c:229
 #, c-format
 msgid "unable to open %s for writing"
 msgstr "không thể mở “%s” để ghi"
 
-#: builtin/replace.c:242
 msgid "cat-file reported failure"
 msgstr "cat-file đã báo cáo gặp lỗi nghiêm trọng"
 
-#: builtin/replace.c:258
 #, c-format
 msgid "unable to open %s for reading"
 msgstr "không thể mở “%s” để đọc"
 
-#: builtin/replace.c:271
 msgid "unable to spawn mktree"
 msgstr "không thể sinh tiến trình con mktree"
 
-#: builtin/replace.c:275
 msgid "unable to read from mktree"
 msgstr "không thể đọc từ mktree"
 
-#: builtin/replace.c:284
 msgid "mktree reported failure"
 msgstr "mktree đã báo cáo gặp lỗi nghiêm trọng"
 
-#: builtin/replace.c:288
 msgid "mktree did not return an object name"
 msgstr "mktree đã không trả về một tên đối tượng"
 
-#: builtin/replace.c:297
 #, c-format
 msgid "unable to fstat %s"
 msgstr "không thể fstat %s"
 
-#: builtin/replace.c:302
 msgid "unable to write object to database"
 msgstr "không thể ghi đối tượng vào cơ sở dữ liệu"
 
-#: builtin/replace.c:325
 #, c-format
 msgid "unable to get object type for %s"
 msgstr "không thể lấy kiểu đối tượng cho %s"
 
-#: builtin/replace.c:341
 msgid "editing object file failed"
 msgstr "việc sửa tập tin đối tượng gặp lỗi"
 
-#: builtin/replace.c:350
 #, c-format
 msgid "new object is the same as the old one: '%s'"
 msgstr "đối tượng mới là giống với cái cũ: “%s”"
 
-#: builtin/replace.c:383
 #, c-format
 msgid "could not parse %s as a commit"
 msgstr "không thể phân tích %s như là một lần chuyển giao"
 
-#: builtin/replace.c:415
 #, c-format
 msgid "bad mergetag in commit '%s'"
 msgstr "thẻ hòa trộn sai trong lần chuyển giao “%s”"
 
-#: builtin/replace.c:417
 #, c-format
 msgid "malformed mergetag in commit '%s'"
 msgstr "thẻ hòa trộn không đúng dạng ở lần chuyển giao “%s”"
 
-#: builtin/replace.c:429
 #, c-format
 msgid ""
 "original commit '%s' contains mergetag '%s' that is discarded; use --edit "
@@ -21975,31 +10896,25 @@ msgstr ""
 "lần chuyển giao gốc “%s” có chứa thẻ hòa trộn “%s” cái mà bị loại bỏ; dùng "
 "tùy chọn --edit thay cho --graft"
 
-#: builtin/replace.c:468
 #, c-format
 msgid "the original commit '%s' has a gpg signature"
 msgstr "lần chuyển giao gốc “%s” có chữ ký GPG"
 
-#: builtin/replace.c:469
 msgid "the signature will be removed in the replacement commit!"
 msgstr "chữ ký sẽ được bỏ đi trong lần chuyển giao thay thế!"
 
-#: builtin/replace.c:479
 #, c-format
 msgid "could not write replacement commit for: '%s'"
 msgstr "không thể ghi lần chuyển giao thay thế cho: “%s”"
 
-#: builtin/replace.c:487
 #, c-format
 msgid "graft for '%s' unnecessary"
 msgstr "graft cho “%s” không cần thiết"
 
-#: builtin/replace.c:491
 #, c-format
 msgid "new commit is the same as the old one: '%s'"
 msgstr "lần chuyển giao mới là giống với cái cũ: “%s”"
 
-#: builtin/replace.c:526
 #, c-format
 msgid ""
 "could not convert the following graft(s):\n"
@@ -22008,215 +10923,165 @@ msgstr ""
 "không thể chuyển đổi các graft sau đây:\n"
 "%s"
 
-#: builtin/replace.c:547
 msgid "list replace refs"
 msgstr "liệt kê các refs thay thế"
 
-#: builtin/replace.c:548
 msgid "delete replace refs"
 msgstr "xóa tham chiếu thay thế"
 
-#: builtin/replace.c:549
 msgid "edit existing object"
 msgstr "sửa đối tượng sẵn có"
 
-#: builtin/replace.c:550
 msgid "change a commit's parents"
 msgstr "thay đổi cha mẹ của lần chuyển giao"
 
-#: builtin/replace.c:551
 msgid "convert existing graft file"
 msgstr "chuyển đổi các tập tin graft sẵn có"
 
-#: builtin/replace.c:552
 msgid "replace the ref if it exists"
 msgstr "thay thế tham chiếu nếu nó đã sẵn có"
 
-#: builtin/replace.c:554
 msgid "do not pretty-print contents for --edit"
 msgstr "đừng in đẹp các nội dung cho --edit"
 
-#: builtin/replace.c:555
 msgid "use this format"
 msgstr "dùng định dạng này"
 
-#: builtin/replace.c:568
 msgid "--format cannot be used when not listing"
 msgstr "--format không thể được dùng khi không liệt kê gì"
 
-#: builtin/replace.c:576
 msgid "-f only makes sense when writing a replacement"
 msgstr "-f chỉ hợp lý khi ghi một cái thay thế"
 
-#: builtin/replace.c:580
 msgid "--raw only makes sense with --edit"
 msgstr "--raw chỉ hợp lý với --edit"
 
-#: builtin/replace.c:586
 msgid "-d needs at least one argument"
 msgstr "-d cần ít nhất một tham số"
 
-#: builtin/replace.c:592
 msgid "bad number of arguments"
 msgstr "số lượng đối số không đúng"
 
-#: builtin/replace.c:598
 msgid "-e needs exactly one argument"
 msgstr "-e cần chính các là một đối số"
 
-#: builtin/replace.c:604
 msgid "-g needs at least one argument"
 msgstr "-q cần ít nhất một tham số"
 
-#: builtin/replace.c:610
 msgid "--convert-graft-file takes no argument"
 msgstr "--convert-graft-file không nhận đối số"
 
-#: builtin/replace.c:616
 msgid "only one pattern can be given with -l"
 msgstr "chỉ một mẫu được chỉ ra với tùy chọn -l"
 
-#: builtin/rerere.c:13
 msgid "git rerere [clear | forget <path>... | status | remaining | diff | gc]"
 msgstr ""
 "git rerere [clear | forget <đường dẫn>… | status | remaining | diff | gc]"
 
-#: builtin/rerere.c:58
 msgid "register clean resolutions in index"
 msgstr "sổ ghi dọn sạch các phân giải trong bản mục lục"
 
-#: builtin/rerere.c:77
 msgid "'git rerere forget' without paths is deprecated"
 msgstr "“git rerere forget” mà không có các đường dẫn là đã lạc hậu"
 
-#: builtin/rerere.c:111
 #, c-format
 msgid "unable to generate diff for '%s'"
 msgstr "không thể tạo khác biệt cho “%s”"
 
-#: builtin/reset.c:33
 msgid ""
 "git reset [--mixed | --soft | --hard | --merge | --keep] [-q] [<commit>]"
 msgstr ""
 "git reset [--mixed | --soft | --hard | --merge | --keep] [-q] [<commit>]"
 
-#: builtin/reset.c:34
 msgid "git reset [-q] [<tree-ish>] [--] <pathspec>..."
 msgstr "git reset [-q] [<tree-ish>] [--] <đặc/tả/đường/dẫn>…"
 
-#: builtin/reset.c:35
 msgid ""
 "git reset [-q] [--pathspec-from-file [--pathspec-file-nul]] [<tree-ish>]"
 msgstr ""
 "git reset [-q] [--pathspec-from-file [--pathspec-file-nul]] [<tree-ish>]"
 
-#: builtin/reset.c:36
 msgid "git reset --patch [<tree-ish>] [--] [<pathspec>...]"
 msgstr "git reset --patch [<tree-ish>] [--] [<đặc/tả/đường/dẫn>…]"
 
-#: builtin/reset.c:42
 msgid "mixed"
 msgstr "pha trộn"
 
-#: builtin/reset.c:42
 msgid "soft"
 msgstr "mềm"
 
-#: builtin/reset.c:42
 msgid "hard"
 msgstr "cứng"
 
-#: builtin/reset.c:42
 msgid "merge"
 msgstr "hòa trộn"
 
-#: builtin/reset.c:42
 msgid "keep"
 msgstr "giữ lại"
 
-#: builtin/reset.c:90
 msgid "You do not have a valid HEAD."
 msgstr "Bạn không có HEAD nào hợp lệ."
 
-#: builtin/reset.c:92
 msgid "Failed to find tree of HEAD."
 msgstr "Gặp lỗi khi tìm cây của HEAD."
 
-#: builtin/reset.c:98
 #, 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:123
 #, c-format
 msgid "HEAD is now at %s"
 msgstr "HEAD hiện giờ tại %s"
 
-#: builtin/reset.c:304
 #, 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:402 builtin/stash.c:606 builtin/stash.c:669
-#: builtin/stash.c:693
 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:404
 msgid "skip refreshing the index after reset"
 msgstr "bỏ qua làm tươi mục lục sau khi đặt lại"
 
-#: builtin/reset.c:406
 msgid "reset HEAD and index"
 msgstr "đặt lại (reset) HEAD và bảng mục lục"
 
-#: builtin/reset.c:407
 msgid "reset only HEAD"
 msgstr "chỉ đặt lại (reset) HEAD"
 
-#: builtin/reset.c:409 builtin/reset.c:411
 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:413
 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:419
 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:452
 #, 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:460
 #, 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:479
 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:481
 #, 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:496
 #, 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:527
 msgid "Unstaged changes after reset:"
 msgstr "Những thay đổi được đưa ra khỏi bệ phóng sau khi reset:"
 
-#: builtin/reset.c:530
 #, c-format
 msgid ""
 "It took %.2f seconds to refresh the index after reset.  You can use\n"
@@ -22226,53 +11091,45 @@ msgstr ""
 "sử dụng\n"
 "“--no-refresh” tránh điều này."
 
-#: builtin/reset.c:547
 #, 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:552
 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."
 
-#: builtin/rev-list.c:659
+#, c-format
+msgid "unable to get disk usage of %s"
+msgstr "không thể dung lượng đĩa đã dùng của %s"
+
 msgid "rev-list does not support display of notes"
 msgstr "rev-list không hỗ trợ hiển thị các ghi chú"
 
-#: builtin/rev-list.c:664
 #, c-format
 msgid "marked counting and '%s' cannot be used together"
 msgstr "đánh dấu để đếm và '%s' không thể dùng cùng nhau"
 
-#: builtin/rev-parse.c:409
 msgid "git rev-parse --parseopt [<options>] -- [<args>...]"
 msgstr "git rev-parse --parseopt [<các tùy chọn>] -- [<các tham số>…]"
 
-#: builtin/rev-parse.c:414
 msgid "keep the `--` passed as an arg"
 msgstr "giữ lại “--” chuyển sang làm tham số"
 
-#: builtin/rev-parse.c:416
 msgid "stop parsing after the first non-option argument"
 msgstr "dừng phân tích sau đối số đầu tiên không có tùy chọn"
 
-#: builtin/rev-parse.c:419
 msgid "output in stuck long form"
 msgstr "kết xuất trong định dạng gậy dài"
 
-#: builtin/rev-parse.c:438
 msgid "premature end of input"
 msgstr "đầu vào chấm dứt bất thường"
 
-#: 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 “--”"
 
-#: builtin/rev-parse.c:548
 msgid "Needed a single revision"
 msgstr "Cần một điểm xét duyệt đơn"
 
-#: builtin/rev-parse.c:552
 msgid ""
 "git rev-parse --parseopt [<options>] -- [<args>...]\n"
 "   or: git rev-parse --sq-quote [<arg>...]\n"
@@ -22286,145 +11143,117 @@ msgstr ""
 "\n"
 "Chạy lệnh \"git rev-parse --parseopt -h\" để có thêm thông tin về cách dùng."
 
-#: builtin/rev-parse.c:712
 msgid "--resolve-git-dir requires an argument"
 msgstr "--resolve-git-dir cần một tham số"
 
-#: builtin/rev-parse.c:715
 #, c-format
 msgid "not a gitdir '%s'"
 msgstr "không phải một thư mục git “%s”"
 
-#: builtin/rev-parse.c:739
 msgid "--git-path requires an argument"
 msgstr "--git-path cần một tham số"
 
-#: builtin/rev-parse.c:749
 msgid "-n requires an argument"
 msgstr "-n cần một tham số"
 
-#: builtin/rev-parse.c:763
 msgid "--path-format requires an argument"
 msgstr "--path-format cần một tham số"
 
-#: builtin/rev-parse.c:769
 #, c-format
 msgid "unknown argument to --path-format: %s"
 msgstr "không hiểu tham số cho --path-format: %s"
 
-#: builtin/rev-parse.c:776
 msgid "--default requires an argument"
 msgstr "--default cần một tham số"
 
-#: builtin/rev-parse.c:782
 msgid "--prefix requires an argument"
 msgstr "--prefix cần một tham số"
 
-#: builtin/rev-parse.c:851
 #, c-format
 msgid "unknown mode for --abbrev-ref: %s"
 msgstr "không hiểu chế độ cho --abbrev-ref: %s"
 
-#: builtin/rev-parse.c:1023
+msgid "this operation must be run in a work tree"
+msgstr "thao tác này phải được thực hiện trong thư mục làm việc"
+
 #, c-format
 msgid "unknown mode for --show-object-format: %s"
 msgstr "không hiểu chế độ cho --show-object-format: %s"
 
-#: builtin/revert.c:24
 msgid "git revert [<options>] <commit-ish>..."
 msgstr "git revert [<các tùy chọn>] <commit-ish>…"
 
-#: builtin/revert.c:25
 msgid "git revert <subcommand>"
 msgstr "git revert <lệnh-con>"
 
-#: builtin/revert.c:30
 msgid "git cherry-pick [<options>] <commit-ish>..."
 msgstr "git cherry-pick [<các tùy chọn>] <commit-ish>…"
 
-#: builtin/revert.c:31
 msgid "git cherry-pick <subcommand>"
 msgstr "git cherry-pick <lệnh-con>"
 
-#: builtin/revert.c:72
 #, c-format
 msgid "option `%s' expects a number greater than zero"
 msgstr "tùy chọn “%s” cần một giá trị bằng số lớn hơn không"
 
-#: builtin/revert.c:92
 #, c-format
 msgid "%s: %s cannot be used with %s"
 msgstr "%s: %s không thể được sử dụng với %s"
 
-#: builtin/revert.c:102
 msgid "end revert or cherry-pick sequence"
 msgstr "kết thúc cherry-pick hay hoàn nguyên liên tiếp nhau"
 
-#: builtin/revert.c:103
 msgid "resume revert or cherry-pick sequence"
 msgstr "phục hồi lại cherry-pick hay hoàn nguyên liên tiếp nhau"
 
-#: builtin/revert.c:104
 msgid "cancel revert or cherry-pick sequence"
 msgstr "không cherry-pick hay hoàn nguyên liên tiếp nhau"
 
-#: builtin/revert.c:105
 msgid "skip current commit and continue"
 msgstr "bỏ qua lần chuyển giao hiện tại và tiếp tục"
 
-#: builtin/revert.c:107
 msgid "don't automatically commit"
 msgstr "đừng chuyển giao một cách tự động"
 
-#: builtin/revert.c:108
 msgid "edit the commit message"
 msgstr "sửa lại chú thích cho lần chuyển giao"
 
-#: builtin/revert.c:111
 msgid "parent-number"
 msgstr "số-cha-mẹ"
 
-#: builtin/revert.c:112
 msgid "select mainline parent"
 msgstr "chọn cha mẹ luồng chính"
 
-#: builtin/revert.c:114
 msgid "merge strategy"
 msgstr "chiến lược hòa trộn"
 
-#: builtin/revert.c:116
 msgid "option for merge strategy"
 msgstr "tùy chọn cho chiến lược hòa trộn"
 
-#: builtin/revert.c:125
 msgid "append commit name"
 msgstr "nối thêm tên lần chuyển giao"
 
-#: builtin/revert.c:127
 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:241
+msgid "use the 'reference' format to refer to commits"
+msgstr "dùng định dạng 'tham chiếu' để quy cho các lần chuyển giao"
+
 msgid "revert failed"
 msgstr "hoàn nguyên gặp lỗi"
 
-#: builtin/revert.c:254
 msgid "cherry-pick failed"
 msgstr "cherry-pick gặp lỗi"
 
-#: builtin/rm.c:20
 msgid "git rm [<options>] [--] <file>..."
 msgstr "git rm [<các tùy chọn>] [--] <tập-tin>…"
 
-#: builtin/rm.c:208
 msgid ""
 "the following file has staged content different from both the\n"
 "file and the HEAD:"
@@ -22435,7 +11264,6 @@ msgstr[0] ""
 "các tập tin sau đây có khác biệt nội dung đã đưa lên bệ phóng\n"
 "từ cả tập tin và cả HEAD:"
 
-#: builtin/rm.c:213
 msgid ""
 "\n"
 "(use -f to force removal)"
@@ -22443,12 +11271,10 @@ msgstr ""
 "\n"
 "(dùng -f để buộc gỡ bỏ)"
 
-#: 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] "các tập tin sau đây có thay đổi trạng thái trong bảng mục lục:"
 
-#: builtin/rm.c:221 builtin/rm.c:230
 msgid ""
 "\n"
 "(use --cached to keep the file, or -f to force removal)"
@@ -22456,51 +11282,40 @@ msgstr ""
 "\n"
 "(dùng tùy chọn --cached để giữ tập tin, hoặc -f để ép buộc gỡ bỏ)"
 
-#: builtin/rm.c:227
 msgid "the following file has local modifications:"
 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:245
 msgid "do not list removed files"
 msgstr "không liệt kê các tập tin đã gỡ bỏ"
 
-#: builtin/rm.c:246
 msgid "only remove from the index"
 msgstr "chỉ gỡ bỏ từ mục lục"
 
-#: 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:248
 msgid "allow recursive removal"
 msgstr "cho phép gỡ bỏ đệ qui"
 
-#: 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: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: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: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: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 [--mirror] [--dry-run] [--force]\n"
 "              [--receive-pack=<git-receive-pack>]\n"
@@ -22512,81 +11327,62 @@ msgstr ""
 "              [--verbose] [--thin] [--atomic]\n"
 "              [<host>:]<thư mục> (--all | <tham chiếu>…)"
 
-#: builtin/send-pack.c:192
 msgid "remote name"
 msgstr "tên máy dịch vụ"
 
-#: 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:206
 msgid "read refs from stdin"
 msgstr "đọc tham chiếu từ đầu vào tiêu chuẩn"
 
-#: 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ụ"
 
-#: builtin/shortlog.c:16
 msgid "git shortlog [<options>] [<revision-range>] [[--] <path>...]"
 msgstr "git shortlog [<các tùy chọn>] [<vùng-xét-duyệt>] [[--] [<đường/dẫn>…]]"
 
-#: builtin/shortlog.c:17
 msgid "git log --pretty=short | git shortlog [<options>]"
 msgstr "git log --pretty=short | git shortlog [<các tùy chọn>]"
 
-#: builtin/shortlog.c:123
 msgid "using multiple --group options with stdin is not supported"
 msgstr ""
 "việc dùng nhiều tùy chọn --group với đầu ra tiêu chuẩn là không được hỗ trợ"
 
-#: builtin/shortlog.c:133
 msgid "using --group=trailer with stdin is not supported"
 msgstr "việc dùng --group=trailer với đầu ra tiêu chuẩn là không được hỗ trợ"
 
-#: builtin/shortlog.c:323
 #, c-format
 msgid "unknown group type: %s"
 msgstr "không nhận ra kiểu nhóm: %s"
 
-#: builtin/shortlog.c:351
 msgid "group by committer rather than author"
 msgstr "nhóm theo người chuyển giao thay vì tác giả"
 
-#: builtin/shortlog.c:354
 msgid "sort output according to the number of commits per author"
 msgstr "sắp xếp kết xuất tuân theo số lượng chuyển giao trên mỗi tác giả"
 
-#: builtin/shortlog.c:356
 msgid "suppress commit descriptions, only provides commit count"
 msgstr "chặn mọi mô tả lần chuyển giao, chỉ đưa ra số lượng lần chuyển giao"
 
-#: builtin/shortlog.c:358
 msgid "show the email address of each author"
 msgstr "hiển thị thư điện tử cho từng tác giả"
 
-#: builtin/shortlog.c:359
 msgid "<w>[,<i1>[,<i2>]]"
 msgstr "<w>[,<i1>[,<i2>]]"
 
-#: builtin/shortlog.c:360
 msgid "linewrap output"
 msgstr "ngắt dòng khi quá dài"
 
-#: builtin/shortlog.c:362
 msgid "field"
 msgstr "trường"
 
-#: builtin/shortlog.c:363
 msgid "group by field"
 msgstr "nhóm theo trường"
 
-#: builtin/shortlog.c:395
 msgid "too many arguments given outside repository"
 msgstr "quá nhiều tham số đưa ra ngoài kho chứa"
 
-#: builtin/show-branch.c:14
 msgid ""
 "git show-branch [-a | --all] [-r | --remotes] [--topo-order | --date-order]\n"
 "                [--current] [--color[=<when>] | --no-color] [--sparse]\n"
@@ -22598,129 +11394,100 @@ msgstr ""
 "                [--more=<n> | --list | --independent | --merge-base]\n"
 "                [--no-name | --sha1-name] [--topics] [(<rev> | <glob>)…]"
 
-#: builtin/show-branch.c:18
 msgid "git show-branch (-g | --reflog)[=<n>[,<base>]] [--list] [<ref>]"
 msgstr "git show-branch (-g | --reflog)[=<n>[,<nền>]] [--list] [<ref>]"
 
-#: builtin/show-branch.c:396
 #, c-format
 msgid "ignoring %s; cannot handle more than %d ref"
 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
 #, 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
 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
 msgid "show remote-tracking branches"
 msgstr "hiển thị các nhánh remote-tracking"
 
-#: builtin/show-branch.c:649
 msgid "color '*!+-' corresponding to the branch"
 msgstr "màu “*!+-” tương ứng với nhánh"
 
-#: builtin/show-branch.c:651
 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
 msgid "synonym to more=-1"
 msgstr "đồng nghĩa với more=-1"
 
-#: builtin/show-branch.c:654
 msgid "suppress naming strings"
 msgstr "chặn các chuỗi đặt tên"
 
-#: builtin/show-branch.c:656
 msgid "include the current branch"
 msgstr "bao gồm nhánh hiện hành"
 
-#: builtin/show-branch.c:658
 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
 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
 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
 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
 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
 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
 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
 msgid "<n>[,<base>]"
 msgstr "<n>[,<cơ_sở>]"
 
-#: builtin/show-branch.c:675
 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:735
 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
 msgid "--reflog option needs one branch name"
 msgstr "--reflog cần tên một nhánh"
 
-#: builtin/show-branch.c:741
 #, 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
 #, c-format
 msgid "no such ref %s"
 msgstr "không có tham chiếu nào như thế %s"
 
-#: builtin/show-branch.c:831
 #, 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
 #, 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
 #, c-format
 msgid "cannot find commit %s (%s)"
 msgstr "không thể tìm thấy lần chuyển giao %s (%s)"
 
-#: builtin/show-index.c:21
 msgid "hash-algorithm"
 msgstr "thuật-toán-băm"
 
-#: builtin/show-index.c:31
 msgid "Unknown hash algorithm"
 msgstr "Không hiểu thuật toán băm dữ liệu"
 
-#: builtin/show-ref.c:12
 msgid ""
 "git show-ref [-q | --quiet] [--verify] [--head] [-d | --dereference] [-s | --"
 "hash[=<n>]] [--abbrev[=<n>]] [--tags] [--heads] [--] [<pattern>...]"
@@ -22728,61 +11495,48 @@ msgstr ""
 "git show-ref [-q | --quiet] [--verify] [--head] [-d | --dereference] [-s | --"
 "hash[=<n>]] [--abbrev[=<n>]] [--tags] [--heads] [--] [<mẫu>…]"
 
-#: builtin/show-ref.c:13
 msgid "git show-ref --exclude-existing[=<pattern>]"
 msgstr "git show-ref --exclude-existing[=<mẫu>]"
 
-#: builtin/show-ref.c:162
 msgid "only show tags (can be combined with heads)"
 msgstr "chỉ hiển thị thẻ (có thể tổ hợp cùng với đầu)"
 
-#: builtin/show-ref.c:163
 msgid "only show heads (can be combined with tags)"
 msgstr "chỉ hiển thị đầu (có thể tổ hợp cùng với thẻ)"
 
-#: builtin/show-ref.c:164
 msgid "stricter reference checking, requires exact ref path"
 msgstr ""
 "việc kiểm tra tham chiếu chính xác, đòi hỏi chính xác đường dẫn tham chiếu"
 
-#: builtin/show-ref.c:167 builtin/show-ref.c:169
 msgid "show the HEAD reference, even if it would be filtered out"
 msgstr "hiển thị tham chiếu HEAD, ngay cả khi nó đã được lọc ra"
 
-#: builtin/show-ref.c:171
 msgid "dereference tags into object IDs"
 msgstr "bãi bỏ tham chiếu các thẻ thành ra các ID đối tượng"
 
-#: builtin/show-ref.c:173
 msgid "only show SHA1 hash using <n> digits"
 msgstr "chỉ hiển thị mã băm SHA1 sử dụng <n> chữ số"
 
-#: builtin/show-ref.c:177
 msgid "do not print results to stdout (useful with --verify)"
 msgstr ""
 "không hiển thị kết quả ra đầu ra chuẩn (stdout) (chỉ hữu dụng với --verify)"
 
-#: builtin/show-ref.c:179
 msgid "show refs from stdin that aren't in local repository"
 msgstr ""
 "hiển thị các tham chiếu từ đầu vào tiêu chuẩn (stdin) cái mà không ở kho nội "
 "bộ"
 
-#: builtin/sparse-checkout.c:23
 msgid "git sparse-checkout (init|list|set|add|reapply|disable) <options>"
 msgstr "git sparse-checkout (init|list|set|add|reapply|disable) <các-tùy-chọn>"
 
-#: builtin/sparse-checkout.c:61
 msgid "this worktree is not sparse"
 msgstr "cây làm việc này không phải là sparse"
 
-#: builtin/sparse-checkout.c:76
 msgid "this worktree is not sparse (sparse-checkout file may not exist)"
 msgstr ""
 "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:177
 #, c-format
 msgid ""
 "directory '%s' contains untracked files, but is not in the sparse-checkout "
@@ -22791,65 +11545,53 @@ 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:185
 #, c-format
 msgid "failed to remove directory '%s'"
 msgstr "gặp lỗi khi gỡ bỏ thư mục \"%s\""
 
-#: builtin/sparse-checkout.c:327
 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:366
 msgid "failed to initialize worktree config"
 msgstr "gặp lỗi khi khởi tạo cấu hình cây làm việc"
 
-#: builtin/sparse-checkout.c:411
 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:441 builtin/sparse-checkout.c:793
-#: builtin/sparse-checkout.c:847
 msgid "initialize the sparse-checkout in cone mode"
 msgstr "khởi tạo sparse-checkout trong chế độ nón"
 
-#: builtin/sparse-checkout.c:443 builtin/sparse-checkout.c:795
-#: builtin/sparse-checkout.c:849
 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:479
+#, 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”"
+
 #, c-format
 msgid "failed to open '%s'"
 msgstr "gặp lỗi khi mở “%s”"
 
-#: builtin/sparse-checkout.c:531
 #, c-format
 msgid "could not normalize path %s"
 msgstr "không thể thường hóa đường dẫn “%s”"
 
-#: builtin/sparse-checkout.c:560
 #, 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:615 builtin/sparse-checkout.c:643
 msgid "unable to load existing sparse-checkout patterns"
 msgstr "không thể tải các mẫu sparse-checkout"
 
-#: builtin/sparse-checkout.c:619
 msgid "existing sparse-checkout patterns do not use cone mode"
 msgstr "đặt các mẫu sparse-checkout sẵn có không sử dụng chế độ cone"
 
-#: builtin/sparse-checkout.c:707
 msgid "please run from the toplevel directory in non-cone mode"
 msgstr "vui lòng chạy từ thư mục mức cao nhất trong chế độ non-cone"
 
-#: builtin/sparse-checkout.c:712
 msgid "specify directories rather than patterns (no leading slash)"
 msgstr "chỉ định các thư mục thay mẫu (không có dấu gạch chéo đứng đầu)"
 
-#: builtin/sparse-checkout.c:714
 msgid ""
 "specify directories rather than patterns.  If your directory starts with a "
 "'!', pass --skip-checks"
@@ -22857,7 +11599,6 @@ msgstr ""
 "chỉ định các thư mục thay mẫu. Nếu thư mục của bạn bắt đầu với một '!', "
 "chuyển qua --skip-checks"
 
-#: builtin/sparse-checkout.c:716
 msgid ""
 "specify directories rather than patterns.  If your directory really has any "
 "of '*?[]\\' in it, pass --skip-checks"
@@ -22865,7 +11606,6 @@ msgstr ""
 "chỉ định các thư mục thay mẫu. Nếu thư mục của bạn đã sẵn có chứa một trong "
 "số bất kỳ '*?[]\\', chuyển qua --skip-checks"
 
-#: builtin/sparse-checkout.c:732
 #, c-format
 msgid ""
 "'%s' is not a directory; to treat it as a directory anyway, rerun with --"
@@ -22874,7 +11614,6 @@ msgstr ""
 "'%s' không phải là một thư mục; để vẫn coi nó là một thư mục hãy chạy với --"
 "skip-checks"
 
-#: builtin/sparse-checkout.c:734
 #, c-format
 msgid ""
 "pass a leading slash before paths such as '%s' if you want a single file "
@@ -22883,26 +11622,21 @@ msgstr ""
 "chuyển một dấu xổ chéo dẫn đầu đường dẫn như là '%s' nếu bạn muốn một tập "
 "tin đơn (xem NON-CONE PROBLEMS trong hướng dẫn sử dụng git-sparse-checkout)."
 
-#: builtin/sparse-checkout.c:739
 msgid "git sparse-checkout add [--skip-checks] (--stdin | <patterns>)"
 msgstr "git sparse-checkout add [--skip-checks] (--stdin | <các mẫu>)"
 
-#: builtin/sparse-checkout.c:752 builtin/sparse-checkout.c:797
 msgid ""
 "skip some sanity checks on the given paths that might give false positives"
 msgstr ""
 "bỏ qua một số kiểm tra đúng mục trên đường dẫn đã cho cái mà có thể đưa ra "
 "xác thực sai"
 
-#: builtin/sparse-checkout.c:755 builtin/sparse-checkout.c:800
 msgid "read patterns from standard in"
 msgstr "đọc các mẫu từ đầu vào tiêu chuẩn"
 
-#: builtin/sparse-checkout.c:760
 msgid "no sparse-checkout to add to"
 msgstr "không có sparse-checkout để thêm vào"
 
-#: builtin/sparse-checkout.c:775
 msgid ""
 "git sparse-checkout set [--[no-]cone] [--[no-]sparse-index] [--skip-checks] "
 "(--stdin | <patterns>)"
@@ -22910,35 +11644,27 @@ msgstr ""
 "git sparse-checkout set [--[no-]cone] [--[no-]sparse-index] [--skip-checks] "
 "(--stdin | <các mẫu>)"
 
-#: builtin/sparse-checkout.c:854
 msgid "must be in a sparse-checkout to reapply sparsity patterns"
 msgstr "phải trong một sparse-checkout để áp dụng lại các mẫu sparse"
 
-#: builtin/sparse-checkout.c:914
 msgid "error while refreshing working directory"
 msgstr "gặp lỗi khi đọc lại thư mục làm việc"
 
-#: builtin/stash.c:24 builtin/stash.c:40
 msgid "git stash list [<options>]"
 msgstr "git stash list [<các tùy chọn>]"
 
-#: builtin/stash.c:25 builtin/stash.c:45
 msgid "git stash show [<options>] [<stash>]"
 msgstr "git stash show [<các tùy chọn>] <stash>"
 
-#: builtin/stash.c:26 builtin/stash.c:50
 msgid "git stash drop [-q|--quiet] [<stash>]"
 msgstr "git stash drop [-q|--quiet] [<stash>]"
 
-#: builtin/stash.c:27
 msgid "git stash ( pop | apply ) [--index] [-q|--quiet] [<stash>]"
 msgstr "git stash ( pop | apply ) [--index] [-q|--quiet] [<stash>]"
 
-#: builtin/stash.c:28 builtin/stash.c:65
 msgid "git stash branch <branchname> [<stash>]"
 msgstr "git stash branch <tên-nhánh> [<stash>]"
 
-#: builtin/stash.c:30
 msgid ""
 "git stash [push [-p|--patch] [-S|--staged] [-k|--[no-]keep-index] [-q|--"
 "quiet]\n"
@@ -22952,7 +11678,6 @@ msgstr ""
 "          [--pathspec-from-file=<tập_tin> [--pathspec-file-nul]]\n"
 "          [--] [<đặc/tả/đường/dẫn>…]]"
 
-#: builtin/stash.c:34
 msgid ""
 "git stash save [-p|--patch] [-S|--staged] [-k|--[no-]keep-index] [-q|--"
 "quiet]\n"
@@ -22962,19 +11687,15 @@ msgstr ""
 "quiet]\n"
 "          [-u|--include-untracked] [-a|--all] [<ghi chú>]"
 
-#: builtin/stash.c:55
 msgid "git stash pop [--index] [-q|--quiet] [<stash>]"
 msgstr "git stash pop [--index] [-q|--quiet] [<stash>]"
 
-#: builtin/stash.c:60
 msgid "git stash apply [--index] [-q|--quiet] [<stash>]"
 msgstr "git stash apply [--index] [-q|--quiet] [<stash>]"
 
-#: builtin/stash.c:75
 msgid "git stash store [-m|--message <message>] [-q|--quiet] <commit>"
 msgstr "git stash store [-m|--message <ghi chú>] [-q|--quiet] <commit>"
 
-#: 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"
@@ -22984,7 +11705,6 @@ msgstr ""
 "          [-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>]"
@@ -22992,30 +11712,24 @@ 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"
 msgstr "“%s” không phải là lần chuyển giao kiểu-stash (cất đi)"
 
-#: builtin/stash.c:150
 #, c-format
 msgid "Too many revisions specified:%s"
 msgstr "Chỉ ra quá nhiều điểm xét duyệt: %s"
 
-#: builtin/stash.c:164
 msgid "No stash entries found."
 msgstr "Không tìm thấy các mục tạm cất (stash) nào."
 
-#: builtin/stash.c:178
 #, c-format
 msgid "%s is not a valid reference"
 msgstr "“%s” không phải một tham chiếu hợp lệ"
 
-#: builtin/stash.c:227
 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:447
 #, c-format
 msgid ""
 "WARNING: Untracked file in way of tracked file!  Renaming\n"
@@ -23026,200 +11740,149 @@ msgstr ""
 "            %s -> %s\n"
 "         để nhường chỗ.\n"
 
-#: 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:519
 #, c-format
 msgid "could not generate diff %s^!."
 msgstr "không thể tạo diff %s^!."
 
-#: 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:532
 msgid "could not save index tree"
 msgstr "không thể ghi lại cây chỉ mục"
 
-#: builtin/stash.c:552
 #, c-format
 msgid "Merging %s with %s"
 msgstr "Đang hòa trộn %s với %s"
 
-#: builtin/stash.c:562
 msgid "Index was not unstashed."
 msgstr "Bảng mục lục đã không được bỏ stash."
 
-#: builtin/stash.c:576
 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:608 builtin/stash.c:695
 msgid "attempt to recreate the index"
 msgstr "gặp lỗi đọc bảng mục lục"
 
-#: builtin/stash.c:641
 #, c-format
 msgid "Dropped %s (%s)"
 msgstr "Đã xóa %s (%s)"
 
-#: builtin/stash.c:644
 #, c-format
 msgid "%s: Could not drop stash entry"
 msgstr "%s: Không thể xóa bỏ mục stash"
 
-#: builtin/stash.c:657
 #, c-format
 msgid "'%s' is not a stash reference"
 msgstr "”%s” không phải tham chiếu đến stash"
 
-#: builtin/stash.c:707
 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:730
 msgid "No branch name specified"
 msgstr "Chưa chỉ ra tên của nhánh"
 
-#: builtin/stash.c:809
 msgid "failed to parse tree"
 msgstr "gặp lỗi khi phân tích cây"
 
-#: builtin/stash.c:820
 msgid "failed to unpack trees"
 msgstr "gặp lỗi khi tháo dỡ cây"
 
-#: builtin/stash.c:840
 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:843
 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:930 builtin/stash.c:967
 #, c-format
 msgid "Cannot update %s with %s"
 msgstr "Không thể cập nhật %s với %s"
 
-#: builtin/stash.c:948 builtin/stash.c:1667 builtin/stash.c:1739
 msgid "stash message"
 msgstr "phần chú thích cho stash"
 
-#: builtin/stash.c:958
 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:1143
 msgid "No staged changes"
 msgstr "Không có thay đổi đã được đưa lên bệ phóng"
 
-#: builtin/stash.c:1204
 msgid "No changes selected"
 msgstr "Chưa có thay đổi nào được chọn"
 
-#: builtin/stash.c:1304
 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:1331
 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:1340
 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:1351 builtin/stash.c:1370
 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:1361
 msgid "Cannot save the current staged state"
 msgstr "Không thể ghi lại trạng thái bệ phóng hiện hành"
 
-#: builtin/stash.c:1398
 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:1447
 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:1458
 msgid "Can't use --staged and --include-untracked or --all at the same time"
 msgstr "Không thể dùng --staged và --include-untracked hay --all cùng một lúc"
 
-#: builtin/stash.c:1476
 msgid "Did you forget to 'git add'?"
 msgstr "Có lẽ bạn đã quên “git add ” phải không?"
 
-#: builtin/stash.c:1491
 msgid "No local changes to save"
 msgstr "Không có thay đổi nội bộ nào được ghi lại"
 
-#: builtin/stash.c:1498
 msgid "Cannot initialize stash"
 msgstr "Không thể khởi tạo stash"
 
-#: builtin/stash.c:1513
 msgid "Cannot save the current status"
 msgstr "Không thể ghi lại trạng thái hiện hành"
 
-#: builtin/stash.c:1518
 #, 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:1615
 msgid "Cannot remove worktree changes"
 msgstr "Không thể gỡ bỏ các thay đổi cây-làm-việc"
 
-#: builtin/stash.c:1656 builtin/stash.c:1728
 msgid "keep index"
 msgstr "giữ nguyên bảng mục lục"
 
-#: builtin/stash.c:1658 builtin/stash.c:1730
 msgid "stash staged changes only"
 msgstr "chỉ tạm cất đi các thay đổi đã đưa lên bệ phóng"
 
-#: builtin/stash.c:1660 builtin/stash.c:1732
 msgid "stash in patch mode"
 msgstr "cất đi ở chế độ miếng vá"
 
-#: builtin/stash.c:1661 builtin/stash.c:1733
 msgid "quiet mode"
 msgstr "chế độ im lặng"
 
-#: builtin/stash.c:1663 builtin/stash.c:1735
 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:1665 builtin/stash.c:1737
 msgid "include ignore files"
 msgstr "bao gồm các tập tin bị bỏ qua"
 
-#: builtin/stripspace.c:37
 msgid "skip and remove all lines starting with comment character"
 msgstr "giữ và xóa bỏ mọi dòng bắt đầu bằng ký tự ghi chú"
 
-#: builtin/stripspace.c:40
 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:50 builtin/submodule--helper.c:2486
 #, 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"
 
-#: builtin/submodule--helper.c:103
-#, c-format
-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:213
 #, c-format
 msgid ""
 "could not look up configuration '%s'. Assuming this repository is its own "
@@ -23228,26 +11891,20 @@ 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:413 builtin/submodule--helper.c:1873
 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:418
 msgid "git submodule--helper list [--prefix=<path>] [<path>...]"
 msgstr "git submodule--helper list [--prefix=</đường/dẫn>] [</đường/dẫn>…]"
 
-#: builtin/submodule--helper.c:476 builtin/submodule--helper.c:617
-#: builtin/submodule--helper.c:640
 #, 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:528
 #, c-format
 msgid "Entering '%s'\n"
 msgstr "Đang vào “%s”\n"
 
-#: builtin/submodule--helper.c:531
 #, c-format
 msgid ""
 "run_command returned non-zero status for %s\n"
@@ -23256,7 +11913,6 @@ msgstr ""
 "run_command trả về trạng thái khác không cho %s\n"
 "."
 
-#: builtin/submodule--helper.c:553
 #, c-format
 msgid ""
 "run_command returned non-zero status while recursing in the nested "
@@ -23267,69 +11923,54 @@ msgstr ""
 "con lồng nhau của %s\n"
 "."
 
-#: builtin/submodule--helper.c:569
 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:571 builtin/submodule--helper.c:876
-#: builtin/submodule--helper.c:1458
 msgid "recurse into nested submodules"
 msgstr "đệ quy vào trong mô-đun-con lồng nhau"
 
-#: builtin/submodule--helper.c:576
 msgid "git submodule--helper foreach [--quiet] [--recursive] [--] <command>"
 msgstr "git submodule--helper foreach [--quiet] [--recursive] [--]  <lệnh>"
 
-#: builtin/submodule--helper.c:654
 #, 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:658
 #, 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:668
 #, 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:675
 #, 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:697
 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:702
 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:775 builtin/submodule--helper.c:910
 #, 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:823
 #, 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:850 builtin/submodule--helper.c:1428
 #, 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:874 builtin/submodule--helper.c:1595
 msgid "suppress submodule status output"
 msgstr "chặn kết xuất về tình trạng mô-đun-con"
 
-#: builtin/submodule--helper.c:875
 msgid ""
 "use commit stored in the index instead of the one stored in the submodule "
 "HEAD"
@@ -23337,98 +11978,78 @@ msgstr ""
 "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:881
 msgid "git submodule status [--quiet] [--cached] [--recursive] [<path>...]"
 msgstr ""
 "git submodule status [--quiet] [--cached] [--recursive] [</đường/dẫn>…]"
 
-#: builtin/submodule--helper.c:905
 msgid "git submodule--helper name <path>"
 msgstr "git submodule--helper name </đường/dẫn>"
 
-#: builtin/submodule--helper.c:977
 #, c-format
 msgid "* %s %s(blob)->%s(submodule)"
 msgstr ""
 "* %s %s(blob)->%s(\n"
 ")"
 
-#: builtin/submodule--helper.c:980
 #, c-format
 msgid "* %s %s(submodule)->%s(blob)"
 msgstr "* %s %s(mô-đun-con)->%s(blob)"
 
-#: builtin/submodule--helper.c:993
 #, c-format
 msgid "%s"
 msgstr "%s"
 
-#: builtin/submodule--helper.c:1043
 #, c-format
 msgid "couldn't hash object from '%s'"
 msgstr "không thể băm đối tượng từ “%s”"
 
-#: builtin/submodule--helper.c:1047
 #, c-format
 msgid "unexpected mode %o\n"
 msgstr "gặp chế độ không như mong chờ %o\n"
 
-#: builtin/submodule--helper.c:1288
 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:1290
 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:1292
 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:1294
 msgid "limit the summary size"
 msgstr "giới hạn kích cỡ tổng hợp"
 
-#: builtin/submodule--helper.c:1299
 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:1323
 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:1384
 #, 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:1390
 #, 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:1399
 #, 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:1409
 #, 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:1456
 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:1463
 msgid "git submodule--helper sync [--quiet] [--recursive] [<path>]"
 msgstr "git submodule--helper sync [--quiet] [--recursive] [</đường/dẫn>]"
 
-#: builtin/submodule--helper.c:1513
 #, c-format
 msgid ""
 "Submodule work tree '%s' contains a .git directory. This will be replaced "
@@ -23437,7 +12058,6 @@ msgstr ""
 "Cây làm việc mô-đun-con “%s” có chứa thư mục .git. Việc này sẽ được thay thế "
 "với một tập tin .git bằng các sử dụng absorbgitdirs."
 
-#: builtin/submodule--helper.c:1530
 #, c-format
 msgid ""
 "Submodule work tree '%s' contains local modifications; use '-f' to discard "
@@ -23446,45 +12066,36 @@ msgstr ""
 "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:1538
 #, c-format
 msgid "Cleared directory '%s'\n"
 msgstr "Đã xóa thư mục “%s”\n"
 
-#: builtin/submodule--helper.c:1540
 #, 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:1551
 #, 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:1567
 #, 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:1596
 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:1597
 msgid "unregister all submodules"
 msgstr "bỏ đăng ký tất cả các trong mô-đun-con"
 
-#: builtin/submodule--helper.c:1602
 msgid ""
 "git submodule deinit [--quiet] [-f | --force] [--all | [--] [<path>...]]"
 msgstr ""
 "git submodule deinit [--quiet] [-f | --force] [--all | [--]  [</đường/dẫn>…]]"
 
-#: builtin/submodule--helper.c:1616
 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:1665
 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"
@@ -23499,67 +12110,52 @@ msgstr ""
 "bằng\n"
 "“--reference-if-able” thay vì dùng “--reference”."
 
-#: builtin/submodule--helper.c:1710 builtin/submodule--helper.c:1713
 #, 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:1749
 #, 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:1756
 #, 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:1781
 #, 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:1826
 #, 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:1831
 #, c-format
 msgid "directory not empty: '%s'"
 msgstr "thư mục không trống: “%s”"
 
-#: builtin/submodule--helper.c:1843
 #, 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:1876
 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:1879
 msgid "name of the new submodule"
 msgstr "tên của mô-đun-con mới"
 
-#: builtin/submodule--helper.c:1882
 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:1890 builtin/submodule--helper.c:3383
 msgid "depth for shallow clones"
 msgstr "chiều sâu lịch sử khi tạo bản sao"
 
-#: builtin/submodule--helper.c:1893 builtin/submodule--helper.c:2731
-#: builtin/submodule--helper.c:3376
 msgid "force cloning progress"
 msgstr "ép buộc tiến trình nhân bản"
 
-#: builtin/submodule--helper.c:1895 builtin/submodule--helper.c:2733
 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:1903
 msgid ""
 "git submodule--helper clone [--prefix=<path>] [--quiet] [--reference "
 "<repository>] [--name <name>] [--depth <depth>] [--single-branch] [--filter "
@@ -23569,94 +12165,76 @@ msgstr ""
 "<kho>] [--name <tên>] [--depth <sâu>] [--single-branch] [--filter <filter-"
 "spec>] --url <url> --path </đường/dẫn>"
 
-#: builtin/submodule--helper.c:1943
 #, 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:1947
 #, 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:2041
 #, 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:2045
 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:2075
 #, 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:2104
 #, c-format
 msgid "Skipping submodule '%s'"
 msgstr "Bỏ qua mô-đun-con “%s”"
 
-#: builtin/submodule--helper.c:2257
 #, 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:2268
 #, 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:2371
 #, 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:2375
 #, 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:2379
 #, 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:2383
 #, 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:2402
 #, 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:2406
 #, 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:2410
 #, 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:2414
 #, c-format
 msgid "Submodule path '%s': '%s %s'\n"
 msgstr "Đường dẫn mô-đun-con “%s”: “%s %s”\n"
 
-#: builtin/submodule--helper.c:2438
 #, 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:2447
 #, c-format
 msgid ""
 "Fetched in submodule path '%s', but it did not contain %s. Direct fetching "
@@ -23665,7 +12243,6 @@ 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:2481
 #, c-format
 msgid ""
 "Submodule (%s) branch configured to inherit branch from superproject, but "
@@ -23674,82 +12251,64 @@ msgstr ""
 "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:2499
 #, 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:2588
 #, c-format
 msgid "Unable to find current revision in submodule path '%s'"
 msgstr ""
 "Không tìm thấy điểm xét duyệt hiện hành trong đường dẫn mô-đun-con “%s”"
 
-#: builtin/submodule--helper.c:2599
 #, c-format
 msgid "Unable to fetch in submodule path '%s'"
 msgstr "Không thể lấy về trong đường dẫn mô-đun-con “%s”"
 
-#: builtin/submodule--helper.c:2604
 #, c-format
 msgid "Unable to find %s revision in submodule path '%s'"
 msgstr "Không tìm thấy điểm xét duyệt %s trong đường dẫn mô-đun-con “%s”"
 
-#: builtin/submodule--helper.c:2640
 #, c-format
 msgid "Failed to recurse into submodule path '%s'"
 msgstr "Gặp lỗi khi đệ quy vào trong đường dẫn mô-đun-con “%s”"
 
-#: builtin/submodule--helper.c:2699
 msgid "force checkout updates"
 msgstr "ép buộc lấy ra các cập nhật"
 
-#: builtin/submodule--helper.c:2701
 msgid "initialize uninitialized submodules before update"
 msgstr "khởi tạo mô-đun-con chưa khởi tạo trước khi cập nhật"
 
-#: builtin/submodule--helper.c:2703
 msgid "use SHA-1 of submodule's remote tracking branch"
 msgstr "sử dụng SHA-1 của nhánh theo dõi máy chủ của mô-đun-con"
 
-#: builtin/submodule--helper.c:2705
 msgid "traverse submodules recursively"
 msgstr "đi theo mô-đun con một cách đệ quy"
 
-#: builtin/submodule--helper.c:2707
 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:2710 builtin/submodule--helper.c:2892
 msgid "path into the working tree"
 msgstr "đường dẫn đến cây làm việc"
 
-#: builtin/submodule--helper.c:2713
 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:2717
 msgid "rebase, merge, checkout or none"
 msgstr "rebase, merge, checkout hoặc không làm gì cả"
 
-#: builtin/submodule--helper.c:2723
 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:2726
 msgid "parallel jobs"
 msgstr "công việc đồng thời"
 
-#: builtin/submodule--helper.c:2728
 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:2729
 msgid "don't print cloning progress"
 msgstr "đừng in tiến trình nhân bản"
 
-#: builtin/submodule--helper.c:2741
 msgid ""
 "git submodule [--quiet] update [--init [--filter=<filter-spec>]] [--remote] "
 "[-N|--no-fetch] [-f|--force] [--checkout|--merge|--rebase] [--[no-]recommend-"
@@ -23761,84 +12320,64 @@ msgstr ""
 "shallow] [--reference <kho>] [--recursive] [--[no-]single-branch] [--] [</"
 "đường/dẫn/>...]"
 
-#: builtin/submodule--helper.c:2767
 msgid "bad value for update parameter"
 msgstr "giá trị cho  tham số cập nhật bị sai"
 
-#: builtin/submodule--helper.c:2893
 msgid "recurse into submodules"
 msgstr "đệ quy vào trong mô-đun-con"
 
-#: builtin/submodule--helper.c:2899
 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:2955
 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:2958
 msgid "unset the config in the .gitmodules file"
 msgstr "bỏ đặt cấu hình trong tập tin .gitmodules"
 
-#: builtin/submodule--helper.c:2963
 msgid "git submodule--helper config <name> [<value>]"
 msgstr "git submodule--helper config <tên> [<giá trị>]"
 
-#: builtin/submodule--helper.c:2964
 msgid "git submodule--helper config --unset <name>"
 msgstr "git submodule--helper config --unset <tên>"
 
-#: builtin/submodule--helper.c:2984 builtin/submodule--helper.c:3238
-#: builtin/submodule--helper.c:3395
 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:3000
 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:3004
 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:3037
 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:3039
 msgid "set the default tracking branch"
 msgstr "đặt nhánh theo dõi mặc định"
 
-#: builtin/submodule--helper.c:3043
 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:3044
 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:3051
 msgid "--branch or --default required"
 msgstr "cần --branch hoặc --default"
 
-#: builtin/submodule--helper.c:3072 builtin/submodule--helper.c:3375
 msgid "print only error messages"
 msgstr "chỉ hiển thị các thông điệp báo lỗi"
 
-#: builtin/submodule--helper.c:3073
 msgid "force creation"
 msgstr "buộc tạo"
 
-#: builtin/submodule--helper.c:3081
 msgid "show whether the branch would be created"
 msgstr "hiển thị xem nhánh nào nên được tạo ra"
 
-#: builtin/submodule--helper.c:3085
 msgid ""
 "git submodule--helper create-branch [-f|--force] [--create-reflog] [-q|--"
 "quiet] [-t|--track] [-n|--dry-run] <name> <start-oid> <start-name>"
@@ -23846,27 +12385,22 @@ msgstr ""
 "git submodule--helper create-branch [-f|--force] [--create-reflog] [-q|--"
 "quiet] [-t|--track] [-n|--dry-run] <tên> <start-oid> <start-name>"
 
-#: builtin/submodule--helper.c:3097
 #, c-format
 msgid "creating branch '%s'"
 msgstr "đang tạo nhánh “%s”"
 
-#: builtin/submodule--helper.c:3155
 #, 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:3158
 #, 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:3171
 #, c-format
 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:3178
 #, c-format
 msgid ""
 "If you want to reuse this local git directory instead of cloning again from\n"
@@ -23884,116 +12418,95 @@ msgstr ""
 "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:3190
 #, 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:3227
 #, c-format
 msgid "unable to checkout submodule '%s'"
 msgstr "không thể lấy ra mô-đun-con “%s”"
 
-#: builtin/submodule--helper.c:3266
 #, c-format
 msgid "Failed to add submodule '%s'"
 msgstr "Gặp lỗi khi thêm mô-đun-con “%s”"
 
-#: builtin/submodule--helper.c:3270 builtin/submodule--helper.c:3275
-#: builtin/submodule--helper.c:3283
 #, c-format
 msgid "Failed to register submodule '%s'"
 msgstr "Gặp lỗi khi đăng ký mô-đun-con “%s”"
 
-#: builtin/submodule--helper.c:3339
 #, 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:3342
 #, 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:3372
+#, 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"
+
 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:3373
 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:3379
 msgid "borrow the objects from reference repositories"
 msgstr "vay mượn các đối tượng từ kho thay thế"
 
-#: builtin/submodule--helper.c:3381
 msgid ""
-"sets the submodule’s name to the given string instead of defaulting to its "
+"sets the submodule's name to the given string instead of defaulting to its "
 "path"
 msgstr ""
 "đặt tên của mô-đun-con bằng chuỗi đã cho thay vì mặc định là đường dẫn của nó"
 
-#: builtin/submodule--helper.c:3388
 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:3416
 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:3425
 #, 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:3460
 #, 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:3520 git.c:453 git.c:729
 #, c-format
 msgid "%s doesn't support --super-prefix"
 msgstr "%s không hỗ trợ --super-prefix"
 
-#: builtin/submodule--helper.c:3526
 #, 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ệ"
 
-#: builtin/symbolic-ref.c:8
 msgid "git symbolic-ref [<options>] <name> [<ref>]"
 msgstr "git symbolic-ref [<các tùy chọn>] <tên> [<t.chiếu>]"
 
-#: builtin/symbolic-ref.c:9
 msgid "git symbolic-ref -d [-q] <name>"
 msgstr "git symbolic-ref -d [-q] <tên>"
 
-#: builtin/symbolic-ref.c:42
 msgid "suppress error message for non-symbolic (detached) refs"
 msgstr "chặn các thông tin lỗi cho các tham chiếu “không-mềm” (bị tách ra)"
 
-#: builtin/symbolic-ref.c:43
 msgid "delete symbolic ref"
 msgstr "xóa tham chiếu mềm"
 
-#: builtin/symbolic-ref.c:44
 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:505
 msgid "reason"
 msgstr "lý do"
 
-#: 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:26
 msgid ""
 "git tag [-a | -s | -u <key-id>] [-f] [-m <msg> | -F <file>]\n"
 "        <tagname> [<head>]"
@@ -24001,11 +12514,9 @@ msgstr ""
 "git tag [-a | -s | -u <key-id>] [-f] [-m <msg> | -F <tập-tin>]\n"
 "        <tên-thẻ> [<head>]"
 
-#: builtin/tag.c:28
 msgid "git tag -d <tagname>..."
 msgstr "git tag -d <tên-thẻ>…"
 
-#: builtin/tag.c:29
 msgid ""
 "git tag -l [-n[<num>]] [--contains <commit>] [--no-contains <commit>] [--"
 "points-at <object>]\n"
@@ -24017,21 +12528,17 @@ msgstr ""
 "        [--format=<định_dạng>] [--merged <lần_chuyển_giao>] [--no-merged "
 "[<lần_chuyển_giao>]] [<mẫu>…]"
 
-#: builtin/tag.c:31
 msgid "git tag -v [--format=<format>] <tagname>..."
 msgstr "git tag -v [--format=<định_dạng>]  <tên-thẻ>…"
 
-#: builtin/tag.c:101
 #, c-format
 msgid "tag '%s' not found."
 msgstr "không tìm thấy tìm thấy thẻ “%s”."
 
-#: builtin/tag.c:136
 #, c-format
 msgid "Deleted tag '%s' (was %s)\n"
 msgstr "Thẻ đã bị xóa “%s” (từng là %s)\n"
 
-#: builtin/tag.c:171
 #, c-format
 msgid ""
 "\n"
@@ -24044,7 +12551,6 @@ msgstr ""
 "  %s\n"
 "Những dòng được bắt đầu bằng “%c” sẽ được bỏ qua.\n"
 
-#: builtin/tag.c:175
 #, c-format
 msgid ""
 "\n"
@@ -24059,11 +12565,9 @@ msgstr ""
 "Những dòng được bắt đầu bằng “%c” sẽ được giữ lại; bạn có thể xóa chúng đi "
 "nếu muốn.\n"
 
-#: builtin/tag.c:241
 msgid "unable to sign the tag"
 msgstr "không thể ký thẻ"
 
-#: builtin/tag.c:259
 #, c-format
 msgid ""
 "You have created a nested tag. The object referred to by your new tag is\n"
@@ -24076,318 +12580,247 @@ msgstr ""
 "\n"
 "\tgit tag -f %s %s^{}"
 
-#: builtin/tag.c:275
 msgid "bad object type."
 msgstr "kiểu đối tượng sai."
 
-#: builtin/tag.c:326
 msgid "no tag message?"
 msgstr "không có chú thích gì cho cho thẻ à?"
 
-#: 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:445
 msgid "list tag names"
 msgstr "chỉ liệt kê tên các thẻ"
 
-#: builtin/tag.c:447
 msgid "print <n> lines of each tag message"
 msgstr "hiển thị <n> dòng cho mỗi ghi chú"
 
-#: builtin/tag.c:449
 msgid "delete tags"
 msgstr "xóa thẻ"
 
-#: builtin/tag.c:450
 msgid "verify tags"
 msgstr "thẩm tra thẻ"
 
-#: builtin/tag.c:452
 msgid "Tag creation options"
 msgstr "Tùy chọn tạo thẻ"
 
-#: builtin/tag.c:454
 msgid "annotated tag, needs a message"
 msgstr "để chú giải cho thẻ, cần một lời ghi chú"
 
-#: builtin/tag.c:456
 msgid "tag message"
 msgstr "phần chú thích cho thẻ"
 
-#: builtin/tag.c:458
 msgid "force edit of tag message"
 msgstr "ép buộc sửa thẻ lần commit"
 
-#: builtin/tag.c:459
 msgid "annotated and GPG-signed tag"
 msgstr "thẻ chú giải và ký kiểu GPG"
 
-#: builtin/tag.c:462
 msgid "use another key to sign the tag"
 msgstr "dùng kháo khác để ký thẻ"
 
-#: builtin/tag.c:463
 msgid "replace the tag if exists"
 msgstr "thay thế nếu thẻ đó đã có trước"
 
-#: builtin/tag.c:464 builtin/update-ref.c:511
 msgid "create a reflog"
 msgstr "tạo một reflog"
 
-#: builtin/tag.c:466
 msgid "Tag listing options"
 msgstr "Các tùy chọn liệt kê thẻ"
 
-#: builtin/tag.c:467
 msgid "show tag list in columns"
 msgstr "hiển thị danh sách thẻ trong các cột"
 
-#: builtin/tag.c:468 builtin/tag.c:470
 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:469 builtin/tag.c:471
 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:472
 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:473
 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:477
 msgid "print only tags of the object"
 msgstr "chỉ hiển thị các thẻ của đối tượng"
 
-#: builtin/tag.c:559
 #, c-format
 msgid "the '%s' option is only allowed in list mode"
 msgstr "tùy chọn '%s' chỉ cho phép dùng trong chế độ liệt kê"
 
-#: builtin/tag.c:598
 #, c-format
 msgid "'%s' is not a valid tag name."
 msgstr "“%s” không phải thẻ hợp lệ."
 
-#: builtin/tag.c:603
 #, c-format
 msgid "tag '%s' already exists"
 msgstr "thẻ “%s” đã tồn tại rồi"
 
-#: builtin/tag.c:634
+#, c-format
+msgid "Invalid cleanup mode %s"
+msgstr "Chế độ dọn dẹp không hợp lệ %s"
+
 #, c-format
 msgid "Updated tag '%s' (was %s)\n"
 msgstr "Đã cập nhật thẻ “%s” (trước là %s)\n"
 
-#: 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/unpack-objects.c:504
 msgid "Unpacking objects"
 msgstr "Đang giải nén các đối tượng"
 
-#: builtin/update-index.c:84
 #, c-format
 msgid "failed to create directory %s"
 msgstr "tạo thư mục \"%s\" gặp lỗi"
 
-#: 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: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:138
 #, c-format
 msgid "Testing mtime in '%s' "
 msgstr "Đang kiểm thử mtime trong “%s” "
 
-#: 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: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: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: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: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: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:220
 msgid " OK"
 msgstr " Đồng ý"
 
-#: 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:993
 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:996
 msgid "refresh: ignore submodules"
 msgstr "refresh: lờ đi mô-đun-con"
 
-#: builtin/update-index.c:999
 msgid "do not ignore new files"
 msgstr "không bỏ qua các tập tin mới tạo"
 
-#: builtin/update-index.c:1001
 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:1003
 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:1005
 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:1008
 msgid "refresh stat information"
 msgstr "lấy lại thông tin thống kê"
 
-#: builtin/update-index.c:1012
 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:1016
 msgid "<mode>,<object>,<path>"
 msgstr "<chế_độ>,<đối_tượng>,<đường_dẫn>"
 
-#: builtin/update-index.c:1017
 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:1027
 msgid "mark files as \"not changing\""
 msgstr "đánh dấu các tập tin là \"không thay đổi\""
 
-#: builtin/update-index.c:1030
 msgid "clear assumed-unchanged bit"
 msgstr "xóa bít assumed-unchanged (giả định là không thay đổi)"
 
-#: builtin/update-index.c:1033
 msgid "mark files as \"index-only\""
 msgstr "đánh dấu các tập tin là “chỉ-đọc”"
 
-#: builtin/update-index.c:1036
 msgid "clear skip-worktree bit"
 msgstr "xóa bít skip-worktree"
 
-#: builtin/update-index.c:1039
 msgid "do not touch index-only entries"
 msgstr "đừng động vào các mục index-only"
 
-#: builtin/update-index.c:1041
 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:1043
 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:1045
 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:1047
 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:1051
 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:1055
 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:1059
 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:1063
 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:1066
 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:1068
 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:1072
 msgid "write index in this format"
 msgstr "ghi mục lục ở định dạng này"
 
-#: builtin/update-index.c:1074
 msgid "enable or disable split index"
 msgstr "bật/tắt chia cắt bảng mục lục"
 
-#: builtin/update-index.c:1076
 msgid "enable/disable untracked cache"
 msgstr "bật/tắt bộ đệm không theo vết"
 
-#: builtin/update-index.c:1078
 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:1080
 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:1082
 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:1084
 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:1086
 msgid "mark files as fsmonitor valid"
 msgstr "đánh dấu các tập tin là hợp lệ fsmonitor"
 
-#: builtin/update-index.c:1089
 msgid "clear fsmonitor valid bit"
 msgstr "xóa bít hợp lệ fsmonitor"
 
-#: builtin/update-index.c:1195
 msgid ""
 "core.splitIndex is set to false; remove or change it, if you really want to "
 "enable split index"
@@ -24395,7 +12828,6 @@ msgstr ""
 "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:1204
 msgid ""
 "core.splitIndex is set to true; remove or change it, if you really want to "
 "disable split index"
@@ -24403,7 +12835,6 @@ msgstr ""
 "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:1216
 msgid ""
 "core.untrackedCache is set to true; remove or change it, if you really want "
 "to disable the untracked cache"
@@ -24411,11 +12842,9 @@ msgstr ""
 "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:1220
 msgid "Untracked cache disabled"
 msgstr "Nhớ đệm không theo vết bị tắt"
 
-#: builtin/update-index.c:1228
 msgid ""
 "core.untrackedCache is set to false; remove or change it, if you really want "
 "to enable the untracked cache"
@@ -24423,172 +12852,132 @@ msgstr ""
 "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:1232
 #, 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:1241
 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:1246
 msgid "fsmonitor enabled"
 msgstr "fsmonitor được bật"
 
-#: builtin/update-index.c:1250
 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:1254
 msgid "fsmonitor disabled"
 msgstr "fsmonitor bị tắt"
 
-#: builtin/update-ref.c:10
 msgid "git update-ref [<options>] -d <refname> [<old-val>]"
 msgstr "git update-ref [<các tùy chọn>] -d <refname> [<biến-cũ>]"
 
-#: builtin/update-ref.c:11
 msgid "git update-ref [<options>]    <refname> <new-val> [<old-val>]"
 msgstr "git update-ref [<các tùy chọn>]    <refname> <biến-mới> [<biến-cũ>]"
 
-#: builtin/update-ref.c:12
 msgid "git update-ref [<options>] --stdin [-z]"
 msgstr "git update-ref [<các tùy chọn>] --stdin [-z]"
 
-#: builtin/update-ref.c:506
 msgid "delete the reference"
 msgstr "xóa tham chiếu"
 
-#: 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: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:510
 msgid "read updates from stdin"
 msgstr "đọc cập nhật từ đầu vào tiêu chuẩn"
 
-#: builtin/update-server-info.c:15
 msgid "update the info files from scratch"
 msgstr "cập nhật các tập tin thông tin từ điểm xuất phát"
 
-#: builtin/upload-pack.c:11
 msgid "git upload-pack [<options>] <dir>"
 msgstr "git upload-pack [<các tùy chọn>] </đường/dẫn>"
 
-#: 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: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: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: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"
 
-#: builtin/verify-commit.c:19
 msgid "git verify-commit [-v | --verbose] <commit>..."
 msgstr "git verify-commit [-v | --verbose] <lần_chuyển_giao>…"
 
-#: builtin/verify-commit.c:68
 msgid "print commit contents"
 msgstr "hiển thị nội dung của lần chuyển giao"
 
-#: builtin/verify-commit.c:69 builtin/verify-tag.c:37
 msgid "print raw gpg status output"
 msgstr "in kết xuất trạng thái gpg dạng thô"
 
-#: builtin/verify-pack.c:59
 msgid "git verify-pack [-v | --verbose] [-s | --stat-only] <pack>..."
 msgstr "git verify-pack [-v | --verbose] [-s | --stat-only] <gói>…"
 
-#: builtin/verify-pack.c:70
 msgid "verbose"
 msgstr "chi tiết"
 
-#: builtin/verify-pack.c:72
 msgid "show statistics only"
 msgstr "chỉ hiển thị thống kê"
 
-#: builtin/verify-tag.c:18
 msgid "git verify-tag [-v | --verbose] [--format=<format>] <tag>..."
 msgstr "git verify-tag [-v | --verbose] [--format=<định_dạng>] <thẻ>…"
 
-#: builtin/verify-tag.c:36
 msgid "print tag contents"
 msgstr "hiển thị nội dung của thẻ"
 
-#: 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:20
 msgid "git worktree list [<options>]"
 msgstr "git worktree list [<các tùy chọn>]"
 
-#: 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:22
 msgid "git worktree move <worktree> <new-path>"
 msgstr "git worktree move <worktree> </đường/dẫn/mới>"
 
-#: builtin/worktree.c:23
 msgid "git worktree prune [<options>]"
 msgstr "git worktree prune [<các tùy chọn>]"
 
-#: builtin/worktree.c:24
 msgid "git worktree remove [<options>] <worktree>"
 msgstr "git worktree remove [<các tùy chọn>] <worktree>"
 
-#: builtin/worktree.c:25
 msgid "git worktree repair [<path>...]"
 msgstr "git worktree repair [</đường/dẫn/>...]"
 
-#: builtin/worktree.c:26
 msgid "git worktree unlock <path>"
 msgstr "git worktree unlock </đường/dẫn>"
 
-#: builtin/worktree.c:76
 #, c-format
 msgid "Removing %s/%s: %s"
 msgstr "Đang xóa %s/%s: %s"
 
-#: builtin/worktree.c:149
 msgid "report pruned working trees"
 msgstr "báo cáo các cây làm việc đã prune"
 
-#: builtin/worktree.c:151
 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:221
 #, c-format
 msgid "'%s' already exists"
 msgstr "“%s” đã có từ trước rồi"
 
-#: builtin/worktree.c:230
 #, 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:235
 #, c-format
 msgid ""
 "'%s' is a missing but locked worktree;\n"
@@ -24597,7 +12986,6 @@ msgstr ""
 "“%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:237
 #, c-format
 msgid ""
 "'%s' is a missing but already registered worktree;\n"
@@ -24606,148 +12994,119 @@ msgstr ""
 "“%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:248
 #, c-format
 msgid "failed to copy '%s' to '%s'; sparse-checkout may not work correctly"
 msgstr "gặp lỗi khi sao chép '%s' sang '%s'; không thể làm việc đúng được"
 
-#: builtin/worktree.c:268
 #, c-format
 msgid "failed to copy worktree config from '%s' to '%s'"
 msgstr "gặp lỗi khi sao chép cấu hình cây làm việc từ “%s” sang “%s”"
 
-#: builtin/worktree.c:280 builtin/worktree.c:285
 #, c-format
 msgid "failed to unset '%s' in '%s'"
 msgstr "gặp lỗi bỏ đặt “%s” trong “%s”"
 
-#: builtin/worktree.c:356
 #, c-format
 msgid "could not create directory of '%s'"
 msgstr "không thể tạo thư mục của “%s”"
 
-#: builtin/worktree.c:378
 msgid "initializing"
 msgstr "khởi tạo"
 
-#: builtin/worktree.c:492 builtin/worktree.c:498
 #, 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:494
 #, 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:503
 #, 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:509
 #, 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:554
 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:557
 msgid "create a new branch"
 msgstr "tạo nhánh mới"
 
-#: builtin/worktree.c:559
 msgid "create or reset a branch"
 msgstr "tạo hay đặt lại một nhánh"
 
-#: builtin/worktree.c:561
 msgid "populate the new working tree"
 msgstr "di chuyển cây làm việc mới"
 
-#: builtin/worktree.c:562
 msgid "keep the new working tree locked"
 msgstr "giữ cây làm việc mới bị khóa"
 
-#: builtin/worktree.c:564 builtin/worktree.c:809
 msgid "reason for locking"
 msgstr "lý do khóa"
 
-#: builtin/worktree.c:567
 msgid "set up tracking mode (see git-branch(1))"
 msgstr "cài đặt chế độ theo dõi (xem git-branch(1))"
 
-#: builtin/worktree.c:570
 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:584
+#, c-format
+msgid "options '%s', '%s', and '%s' cannot be used together"
+msgstr "tùy chọn '%s', '%s' và '%s' không thể dùng cùng nhau"
+
 msgid "added with --lock"
 msgstr "được thêm với --lock"
 
-#: builtin/worktree.c:646
 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:766
 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:768
 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ời gian>"
 
-#: builtin/worktree.c:770
 msgid "terminate records with a NUL character"
 msgstr "chấm dứt các bản ghi bằng ký tự NULL"
 
-#: builtin/worktree.c:821 builtin/worktree.c:854 builtin/worktree.c:928
-#: builtin/worktree.c:1052
 #, 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:823 builtin/worktree.c:856
 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:828
 #, c-format
 msgid "'%s' is already locked, reason: %s"
 msgstr "“%s” đã được khóa rồi, lý do: %s"
 
-#: builtin/worktree.c:830
 #, c-format
 msgid "'%s' is already locked"
 msgstr "“%s” đã được khóa rồi"
 
-#: builtin/worktree.c:858
 #, c-format
 msgid "'%s' is not locked"
 msgstr "“%s” chưa bị khóa"
 
-#: builtin/worktree.c:899
 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:907
 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:930 builtin/worktree.c:1054
 #, c-format
 msgid "'%s' is a main working tree"
 msgstr "“%s” là cây làm việc chính"
 
-#: builtin/worktree.c:935
 #, 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:948
 #, c-format
 msgid ""
 "cannot move a locked working tree, lock reason: %s\n"
@@ -24756,7 +13115,6 @@ msgstr ""
 "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:950
 msgid ""
 "cannot move a locked working tree;\n"
 "use 'move -f -f' to override or unlock first"
@@ -24764,38 +13122,31 @@ msgstr ""
 "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:953
 #, 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:958
 #, c-format
 msgid "failed to move '%s' to '%s'"
 msgstr "gặp lỗi khi chuyển “%s” sang “%s”"
 
-#: builtin/worktree.c:1004
 #, 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:1008
 #, 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:1013
 #, 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:1036
 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:1059
 #, c-format
 msgid ""
 "cannot remove a locked working tree, lock reason: %s\n"
@@ -24804,7 +13155,6 @@ msgstr ""
 "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:1061
 msgid ""
 "cannot remove a locked working tree;\n"
 "use 'remove -f -f' to override or unlock first"
@@ -24812,1402 +13162,8037 @@ msgstr ""
 "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:1064
 #, 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:1088
 #, c-format
 msgid "repair: %s: %s"
 msgstr "sửa chữa: %s: %s"
 
-#: builtin/worktree.c:1091
 #, c-format
 msgid "error: %s: %s"
 msgstr "lỗi: %s: %s"
 
-#: builtin/write-tree.c:15
 msgid "git write-tree [--missing-ok] [--prefix=<prefix>/]"
 msgstr "git write-tree [--missing-ok] [--prefix=<tiền-tố>/]"
 
-#: builtin/write-tree.c:28
 msgid "<prefix>/"
 msgstr "<tiền tố>/"
 
-#: builtin/write-tree.c:29
 msgid "write tree object for a subdirectory <prefix>"
 msgstr "ghi đối tượng cây (tree) cho <tiền tố> thư mục con"
 
-#: builtin/write-tree.c:31
 msgid "only useful for debugging"
 msgstr "chỉ hữu ích khi cần gỡ lỗi"
 
-#: git.c:28
-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"
-"           [--git-dir=<path>] [--work-tree=<path>] [--namespace=<name>]\n"
-"           [--super-prefix=<path>] [--config-env=<name>=<envvar>]\n"
-"           <command> [<args>]"
-msgstr ""
-"git [--version] [--help] [-C </đường/dẫn/>] [-c <tên>=<giá trị>]\n"
-"           [--exec-path[=</đường/dẫn/>]] [--html-path] [--man-path] [--info-"
-"path]\n"
-"           [-p | --paginate | -P --no-pager] [--no-replace-objects] [--"
-"bare]\n"
-"           [--git-dir=</đường/dẫn/>] [--work-tree=</đường/dẫn/>] [--"
-"namespace=<tên>]\n"
-"           [--super-prefix=</đường/dẫn/>] [--config-env=<tên>=<envvar>]\n"
-"           <lệnh> [<các tham số>]"
-
-#: git.c:36
-msgid ""
-"'git help -a' and 'git help -g' list available subcommands and some\n"
-"concept guides. See 'git help <command>' or 'git help <concept>'\n"
-"to read about a specific subcommand or concept.\n"
-"See 'git help git' for an overview of the system."
-msgstr ""
-"“git help -a” và “git help -g” liệt kê các câu lệnh con sẵn có và một số\n"
-"hướng dẫn về khái niệm. Xem “git help <lệnh>” hay “git help <khái-niệm>”\n"
-"để xem các đặc tả cho lệnh hay khái niệm cụ thể.\n"
-"Xem “git help git” để biết tổng quan của hệ thống."
-
-#: git.c:188 git.c:216 git.c:300
-#, c-format
-msgid "no directory given for '%s' option\n"
-msgstr "không đưa ra thư mục cho tùy chọn '%s'\n"
-
-#: git.c:202
-#, c-format
-msgid "no namespace given for --namespace\n"
-msgstr "chưa đưa ra không gian làm việc cho --namespace\n"
-
-#: git.c:230
-#, c-format
-msgid "no prefix given for --super-prefix\n"
-msgstr "chưa đưa ra tiền tố cho --super-prefix\n"
-
-#: git.c:252
-#, c-format
-msgid "-c expects a configuration string\n"
-msgstr "-c cần một chuỗi cấu hình\n"
-
-#: git.c:260
-#, c-format
-msgid "no config key given for --config-env\n"
-msgstr "không đưa ra khóa cấu hình cho --config-env\n"
-
-#: git.c:326
-#, c-format
-msgid "unknown option: %s\n"
-msgstr "không hiểu tùy chọn: %s\n"
-
-#: git.c:375
-#, c-format
-msgid "while expanding alias '%s': '%s'"
-msgstr "trong khi triển khai bí danh “%s”: “%s”"
-
-#: git.c:384
-#, c-format
-msgid ""
-"alias '%s' changes environment variables.\n"
-"You can use '!git' in the alias to do this"
-msgstr ""
-"bí danh “%s” thay đổi biến môi trường.\n"
-"Bạn có thể sử dụng “!git” trong đặt bí danh để làm việc này"
-
-#: git.c:391
-#, c-format
-msgid "empty alias for %s"
-msgstr "làm trống bí danh cho %s"
-
-#: git.c:394
-#, c-format
-msgid "recursive alias: %s"
-msgstr "đệ quy các bí danh: %s"
-
-#: git.c:480
-msgid "write failure on standard output"
-msgstr "lỗi ghi nghiêm trong trên đầu ra tiêu chuẩn"
-
-#: git.c:482
-msgid "unknown write failure on standard output"
-msgstr "lỗi nghiêm trọng chưa biết khi ghi ra đầu ra tiêu chuẩn"
-
-#: git.c:484
-msgid "close failed on standard output"
-msgstr "gặp lỗi khi đóng đầu ra tiêu chuẩn"
-
-#: git.c:838
-#, 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:888
-#, 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:901
-#, c-format
-msgid ""
-"usage: %s\n"
-"\n"
-msgstr ""
-"cách dùng: %s\n"
-"\n"
-
-#: git.c:921
-#, 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:933
-#, c-format
-msgid "failed to run command '%s': %s\n"
-msgstr "gặp lỗi khi chạy lệnh “%s”: %s\n"
-
-#: http-fetch.c:128
-#, c-format
-msgid "argument to --packfile must be a valid hash (got '%s')"
-msgstr "tham số cho --packfile phải là một giá trị băm hợp lệ (nhận được “%s”)"
-
-#: http-fetch.c:138
-msgid "not a git repository"
-msgstr "không phải là kho git"
-
-#: t/helper/test-fast-rebase.c:141
-msgid "unhandled options"
-msgstr "các tùy chọn được không xử lý"
-
-#: t/helper/test-fast-rebase.c:146
-msgid "error preparing revisions"
-msgstr "gặp lỗi khi chuẩn bị các điểm xét duyệt"
-
-#: t/helper/test-reach.c:154
-#, c-format
-msgid "commit %s is not marked reachable"
-msgstr "lần chuyển giao %s chưa được đánh dấu là tiếp cận được"
-
-#: t/helper/test-reach.c:164
-msgid "too many commits marked reachable"
-msgstr "có quá nhiều lần chuyển giao được đánh dấu là tiếp cận được"
-
-#: t/helper/test-serve-v2.c:7
-msgid "test-tool serve-v2 [<options>]"
-msgstr "test-tool serve-v2 [<các tùy chọn>]"
-
-#: t/helper/test-serve-v2.c:19
-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: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: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: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: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:585
-msgid "test-helper simple-ipc send         [<name>] [<token>]"
-msgstr "test-helper simple-ipc send         [<tên>] [<thẻ>]"
-
-#: 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:587
-msgid ""
-"test-helper simple-ipc multiple     [<name>] [<threads>] [<bytecount>] "
-"[<batchsize>]"
-msgstr ""
-"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: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:597
-msgid "named-pipe name"
-msgstr "tên named-pipe"
-
-#: 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: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:602
-msgid "number of bytes"
-msgstr "số lượng byte"
-
-#: 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:605
-msgid "byte"
-msgstr "byte"
-
-#: t/helper/test-simple-ipc.c:605
-msgid "ballast character"
-msgstr "ký tự ballast"
-
-#: t/helper/test-simple-ipc.c:606
-msgid "token"
-msgstr "thẻ bài"
-
-#: 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: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: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: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: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: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: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: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:1876
-#, c-format
-msgid ""
-"unable to update url base from redirection:\n"
-"  asked for: %s\n"
-"   redirect: %s"
-msgstr ""
-"không thể cập nhật dựa trên cơ sở url từ chuyển hướng:\n"
-"      hỏi cho: %s\n"
-" chuyển hướng: %s"
-
-#: remote-curl.c:184
-#, c-format
-msgid "invalid quoting in push-option value: '%s'"
-msgstr "sai trích dẫn trong giá trị push-option :“%s”"
-
-#: remote-curl.c:308
-#, 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:409
-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:440
-#, 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:500
-#, c-format
-msgid "repository '%s' not found"
-msgstr "không tìm thấy kho “%s”"
-
-#: remote-curl.c:504
-#, c-format
-msgid "Authentication failed for '%s'"
-msgstr "Xác thực gặp lỗi cho “%s”"
-
-#: remote-curl.c:508
-#, 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:512
-#, c-format
-msgid "unable to access '%s': %s"
-msgstr "không thể truy cập “%s”: %s"
-
-#: remote-curl.c:518
-#, c-format
-msgid "redirecting to %s"
-msgstr "chuyển hướng đến %s"
-
-#: remote-curl.c:649
-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:661
-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"
-
-#: remote-curl.c:730
-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"
+msgid "unrecognized bundle hash algorithm: %s"
+msgstr "không hiểu thuật toán băm dữ liệu bundle: %s"
 
-#: remote-curl.c:759
 #, 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:761
-msgid "remote-curl: unexpected response end packet"
-msgstr "remote-curl: gặp đáp ứng là gói kết thúc bất ngờ"
+msgid "unknown capability '%s'"
+msgstr "không hiểu dung lượng “%s”"
 
-#: remote-curl.c:837
 #, c-format
-msgid "RPC failed; %s"
-msgstr "RPC gặp lỗi; %s"
-
-#: remote-curl.c:877
-msgid "cannot handle pushes this big"
-msgstr "không thể xử lý đẩy cái lớn này"
+msgid "'%s' does not look like a v2 or v3 bundle file"
+msgstr "“%s” không giống như tập tin v2 hay v3 bundle (định dạng dump của git)"
 
-#: remote-curl.c:990
 #, 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"
+msgid "unrecognized header: %s%s (%d)"
+msgstr "phần đầu không được thừa nhận: %s%s (%d)"
 
-#: remote-curl.c:994
-#, 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"
+msgid "Repository lacks these prerequisite commits:"
+msgstr "Kho chứa thiếu những lần chuyển giao tiên quyết này:"
 
-#: remote-curl.c:1044
-#, c-format
-msgid "%d bytes of length header were received"
-msgstr "đã nhận về phần đầu có chiều dài %d byte"
+msgid "need a repository to verify a bundle"
+msgstr "cần một kho chứa để thẩm tra một bundle"
 
-#: remote-curl.c:1046
 #, 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:1135
-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:1150
-msgid "fetch failed."
-msgstr "lấy về gặp lỗi."
-
-#: remote-curl.c:1198
-msgid "cannot fetch by sha1 over smart http"
-msgstr "không thể lấy về bằng sha1 thông qua smart http"
+msgid "The bundle contains this ref:"
+msgid_plural "The bundle contains these %<PRIuMAX> refs:"
+msgstr[0] "Bó dữ liệu chứa %<PRIuMAX> tham chiếu:"
 
-#: remote-curl.c:1242 remote-curl.c:1248
-#, 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”"
+msgid "The bundle records a complete history."
+msgstr "Lệnh bundle ghi lại toàn bộ lịch sử."
 
-#: remote-curl.c:1260 remote-curl.c:1378
 #, c-format
-msgid "http transport does not support %s"
-msgstr "vận chuyển http không hỗ trợ %s"
-
-#: remote-curl.c:1296
-msgid "git-http-push failed"
-msgstr "git-http-push gặp lỗi"
-
-#: remote-curl.c:1485
-msgid "remote-curl: usage: git remote-curl <remote> [<url>]"
-msgstr "remote-curl: usage: git remote-curl <máy chủ> [<url>]"
-
-#: remote-curl.c:1517
-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:1524
-msgid "remote-curl: fetch attempted without a local repo"
-msgstr "remote-curl: đã cố gắng fetch mà không có kho nội bộ"
+msgid "The bundle requires this ref:"
+msgid_plural "The bundle requires these %<PRIuMAX> refs:"
+msgstr[0] "Lệnh bundle yêu cầu %<PRIuMAX> tham chiếu này:"
 
-#: remote-curl.c:1565
-#, c-format
-msgid "remote-curl: unknown command '%s' from git"
-msgstr "remote-curl: không hiểu lệnh “%s” từ git"
+msgid "unable to dup bundle descriptor"
+msgstr "không thể nhân đôi bộ mô tả bundle"
 
-#: contrib/scalar/scalar.c:49
-msgid "need a working directory"
-msgstr "cần một thư mục làm việc"
+msgid "Could not spawn pack-objects"
+msgstr "Không thể sản sinh đối tượng gói"
 
-#: contrib/scalar/scalar.c:86
-msgid "could not find enlistment root"
-msgstr "không tìm thấy gốc enlistment"
+msgid "pack-objects died"
+msgstr "đối tượng gói đã chết"
 
-#: contrib/scalar/scalar.c:89 contrib/scalar/scalar.c:350
-#: contrib/scalar/scalar.c:435 contrib/scalar/scalar.c:578
 #, c-format
-msgid "could not switch to '%s'"
-msgstr "không thể chuyển đến '%s'"
+msgid "ref '%s' is excluded by the rev-list options"
+msgstr "th.chiếu “%s” bị loại trừ bởi các tùy chọn rev-list"
 
-#: contrib/scalar/scalar.c:179
 #, c-format
-msgid "could not configure %s=%s"
-msgstr "không thể đóng cấu hình %s=%s"
-
-#: contrib/scalar/scalar.c:197
-msgid "could not configure log.excludeDecoration"
-msgstr "không thể cấu hình log.excludeDecoration"
-
-#: contrib/scalar/scalar.c:218
-msgid "Scalar enlistments require a worktree"
-msgstr "'Scalar enlistments' cần một cây làm việc"
+msgid "unsupported bundle version %d"
+msgstr "phiên bản bundle %d không được hỗ trợ"
 
-#: contrib/scalar/scalar.c:310
 #, c-format
-msgid "remote HEAD is not a branch: '%.*s'"
-msgstr "HEAD của máy chủ không phải một nhánh: '%.*s'"
-
-#: contrib/scalar/scalar.c:316
-msgid "failed to get default branch name from remote; using local default"
-msgstr "gặp lỗi khi lấy tên nhánh mặc định từ máy chủ; sử dụng mặc định nội bộ"
-
-#: contrib/scalar/scalar.c:329
-msgid "failed to get default branch name"
-msgstr "gặp lỗi khi lấy tên nhánh mặc định"
-
-#: contrib/scalar/scalar.c:340
-msgid "failed to unregister repository"
-msgstr "gặp lỗi khi hủy đăng ký kho chứa"
-
-#: contrib/scalar/scalar.c:355
-msgid "failed to delete enlistment directory"
-msgstr "gặp lỗi khi xóa thư mục dành được"
-
-#: contrib/scalar/scalar.c:375
-msgid "branch to checkout after clone"
-msgstr "nhánh để lấy ra sau khi nhân bản"
-
-#: contrib/scalar/scalar.c:377
-msgid "when cloning, create full working directory"
-msgstr "khi nhân bản, tạo đầy đủ thư mục làm việc"
-
-#: contrib/scalar/scalar.c:379
-msgid "only download metadata for the branch that will be checked out"
-msgstr "chỉ siêu dữ liệu tải về cho nhánh mà sẽ được lấy ra"
-
-#: contrib/scalar/scalar.c:384
-msgid "scalar clone [<options>] [--] <repo> [<dir>]"
-msgstr "scalar clone [<các tùy chọn>] [--] <kho> [<t.mục>]"
+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"
 
-#: contrib/scalar/scalar.c:409
-#, c-format
-msgid "cannot deduce worktree name from '%s'"
-msgstr "không thể suy diễn tên cây làm việc từ '%s'"
+msgid "Refusing to create empty bundle."
+msgstr "Từ chối tạo một bó dữ liệu trống rỗng."
 
-#: contrib/scalar/scalar.c:418
 #, c-format
-msgid "directory '%s' exists already"
-msgstr "thư mục '%s' đã sẵn có"
+msgid "cannot create '%s'"
+msgstr "không thể tạo “%s”"
 
-#: contrib/scalar/scalar.c:445
-#, c-format
-msgid "failed to get default branch for '%s'"
-msgstr "gặp lỗi khi lấy nhánh mặc định cho '%s'"
+msgid "index-pack died"
+msgstr "mục lục gói đã chết"
 
-#: contrib/scalar/scalar.c:456
-#, c-format
-msgid "could not configure remote in '%s'"
-msgstr "không thể cấu hình máy chủ trong '%s'"
+msgid "terminating chunk id appears earlier than expected"
+msgstr "mã mảnh kết thúc sớm hơn bình thường"
 
-#: contrib/scalar/scalar.c:465
 #, c-format
-msgid "could not configure '%s'"
-msgstr "không thể cấu hình '%s'"
-
-#: contrib/scalar/scalar.c:468
-msgid "partial clone failed; attempting full clone"
-msgstr "nhân bản từng phần gặp lỗi; đang cố thử nhân bản đầy đủ"
-
-#: contrib/scalar/scalar.c:472
-msgid "could not configure for full clone"
-msgstr "không thể cấu hình cho nhân bản đầy đủ"
-
-#: contrib/scalar/scalar.c:504
-msgid "`scalar list` does not take arguments"
-msgstr "`scalar list` không nhận các tham số"
-
-#: contrib/scalar/scalar.c:517
-msgid "scalar register [<enlistment>]"
-msgstr "scalar register [<enlistment>]"
-
-#: contrib/scalar/scalar.c:544
-msgid "reconfigure all registered enlistments"
-msgstr "cấu hình mọi enlistments đã đăng ký"
-
-#: contrib/scalar/scalar.c:548
-msgid "scalar reconfigure [--all | <enlistment>]"
-msgstr "scalar reconfigure [--all | <enlistment>]"
-
-#: contrib/scalar/scalar.c:566
-msgid "--all or <enlistment>, but not both"
-msgstr "--all hoặc <enlistment>, không thể là cả hai"
+msgid "improper chunk offset(s) %<PRIx64> and %<PRIx64>"
+msgstr "bù mảnh không đúng cách %<PRIx64> và %<PRIx64>"
 
-#: contrib/scalar/scalar.c:581
 #, c-format
-msgid "git repository gone in '%s'"
-msgstr "kho git ra đi trong '%s'"
-
-#: contrib/scalar/scalar.c:621
-msgid ""
-"scalar run <task> [<enlistment>]\n"
-"Tasks:\n"
-msgstr ""
-"scalar run <task> [<enlistment>]\n"
-"Nhiệm vụ:\n"
+msgid "duplicate chunk ID %<PRIx32> found"
+msgstr "tìm thấy ID của mảnh bị trùng lặp %<PRIx32>"
 
-#: contrib/scalar/scalar.c:639
 #, c-format
-msgid "no such task: '%s'"
-msgstr "không có nhiệm vụ nào như thế: “%s”"
-
-#: contrib/scalar/scalar.c:689
-msgid "scalar unregister [<enlistment>]"
-msgstr "scalar unregister [<enlistment>]"
-
-#: contrib/scalar/scalar.c:736
-msgid "scalar delete <enlistment>"
-msgstr "scalar delete <enlistment>"
-
-#: contrib/scalar/scalar.c:751
-msgid "refusing to delete current working directory"
-msgstr "từ chối gỡ bỏ thư mục làm việc hiện tại"
-
-#: contrib/scalar/scalar.c:766
-msgid "include Git version"
-msgstr "bao gồm phiên bản Git"
-
-#: contrib/scalar/scalar.c:768
-msgid "include Git's build options"
-msgstr "bao gồm các tùy chọn biên dịch của Git"
-
-#: contrib/scalar/scalar.c:772
-msgid "scalar verbose [-v | --verbose] [--build-options]"
-msgstr "scalar verbose [-v | --verbose] [--build-options]"
+msgid "final chunk has non-zero id %<PRIx32>"
+msgstr "mảnh cuối cùng có id không bằng không %<PRIx32>"
 
-#: contrib/scalar/scalar.c:813
-msgid "-C requires a <directory>"
-msgstr "-C cần một <thư_mục>"
+msgid "invalid hash version"
+msgstr "phiên bản băm không hợp lệ"
 
-#: contrib/scalar/scalar.c:815
 #, c-format
-msgid "could not change to '%s'"
-msgstr "không thể chuyển sang “%s”"
-
-#: contrib/scalar/scalar.c:821
-msgid "-c requires a <key>=<value> argument"
-msgstr "-c cần một tham số <key>=<value>"
-
-#: contrib/scalar/scalar.c:839
-msgid ""
-"scalar [-C <directory>] [-c <key>=<value>] <command> [<options>]\n"
-"\n"
-"Commands:\n"
-msgstr ""
-"scalar [-C </thư/mục/>] [-c <khóa>=<giá trị>] <lệnh> [<các tùy chọn>]\n"
-"\n"
-"Các lệnh:\n"
-
-#: compat/compiler.h:26
-msgid "no compiler information available\n"
-msgstr "hiện không có thông tin về trình biên dịch\n"
-
-#: compat/compiler.h:38
-msgid "no libc information available\n"
-msgstr "không có thông tin về libc\n"
-
-#: list-objects-filter-options.h:126
-msgid "args"
-msgstr "các_tham_số"
-
-#: list-objects-filter-options.h:127
-msgid "object filtering"
-msgstr "lọc đối tượng"
-
-#: parse-options.h:188
-msgid "expiry-date"
-msgstr "ngày hết hạn"
-
-#: parse-options.h:202
-msgid "no-op (backward compatibility)"
-msgstr "no-op (tương thích ngược)"
-
-#: parse-options.h:341
-msgid "be more verbose"
-msgstr "chi tiết hơn nữa"
-
-#: parse-options.h:343
-msgid "be more quiet"
-msgstr "im lặng hơn nữa"
-
-#: parse-options.h:349
-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:368
-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:369
-msgid "read pathspec from file"
-msgstr "đọc đặc tả đường dẫn từ tập tin"
-
-#: parse-options.h:370
-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:98
-msgid "key"
-msgstr "khóa"
-
-#: ref-filter.h:98
-msgid "field name to sort on"
-msgstr "tên trường cần sắp xếp"
-
-#: rerere.h:44
-msgid "update the index with reused conflict resolution if possible"
-msgstr "cập nhật bảng mục lục với phân giải xung đột dùng lại nếu được"
+msgid "invalid color value: %.*s"
+msgstr "giá trị màu không hợp lệ: %.*s"
 
-#: command-list.h:50
 msgid "Add file contents to the index"
 msgstr "Thêm nội dung tập tin vào bảng mục lục"
 
-#: command-list.h:51
 msgid "Apply a series of patches from a mailbox"
 msgstr "Áp dụng một chuỗi các miếng và từ một mailbox"
 
-#: command-list.h:52
 msgid "Annotate file lines with commit information"
 msgstr "Các dòng diễn giải tập tin với thông tin chuyển giao"
 
-#: command-list.h:53
 msgid "Apply a patch to files and/or to the index"
 msgstr ""
 "Áp dụng một miếng vá cho các tập tin đã chỉ ra và/hoặc vào bảng mục lục"
 
-#: command-list.h:54
 msgid "Import a GNU Arch repository into Git"
 msgstr "Nhập một kho GNU Arch vào một kho Git"
 
-#: command-list.h:55
 msgid "Create an archive of files from a named tree"
 msgstr "Tạo một kho nén các tập tin từ cây làm việc có tên"
 
-#: command-list.h:56
 msgid "Use binary search to find the commit that introduced a bug"
 msgstr "Tìm kiếm dạng nhị phân để tìm ra lần chuyển giao nào đưa ra lỗi"
 
-#: command-list.h:57
 msgid "Show what revision and author last modified each line of a file"
 msgstr ""
 "Hiển thị số hiệu phiên bản và tác giả sửa đổi cuối cho từng dòng của một tập "
 "tin"
 
-#: command-list.h:58
 msgid "List, create, or delete branches"
 msgstr "Liệt kê, tạo hay là xóa các nhánh"
 
-#: command-list.h:59
 msgid "Collect information for user to file a bug report"
 msgstr "Sưu tập thông tin người dùng để báo cáo lỗi"
 
-#: command-list.h:60
 msgid "Move objects and refs by archive"
 msgstr "Di chuyển các đối tượng và tham chiếu theo kho lưu"
 
-#: command-list.h:61
 msgid "Provide content or type and size information for repository objects"
 msgstr "Cung cấp nội dung hoặc thông tin về kiểu và cỡ cho các đối tượng kho"
 
-#: command-list.h:62
 msgid "Display gitattributes information"
 msgstr "Hiển thị thông tin gitattributes"
 
-#: command-list.h:63
 msgid "Debug gitignore / exclude files"
 msgstr "Gỡ lỗi các tập tin gitignore / exclude"
 
-#: command-list.h:64
 msgid "Show canonical names and email addresses of contacts"
 msgstr "Hiển thị tên và địa chỉ thư điện tử của các liên hệ dạng chuẩn hóa"
 
-#: command-list.h:65
 msgid "Ensures that a reference name is well formed"
 msgstr "Đảm bảo rằng một tên tham chiếu ở dạng thức tốt"
 
-#: command-list.h:66
 msgid "Switch branches or restore working tree files"
 msgstr "Chuyển các nhánh hoặc phục hồi lại các tập tin cây làm việc"
 
-#: command-list.h:67
 msgid "Copy files from the index to the working tree"
 msgstr "Sao chép các tập tin từ mục lục ra cây làm việc"
 
-#: command-list.h:68
 msgid "Find commits yet to be applied to upstream"
 msgstr "Tìm những lần chuyển giao còn chưa được áp dụng lên thượng nguồn"
 
-#: command-list.h:69
 msgid "Apply the changes introduced by some existing commits"
 msgstr "Áp dụng các thay đổi được đưa ra bởi một số lần chuyển giao sẵn có"
 
-#: command-list.h:70
 msgid "Graphical alternative to git-commit"
 msgstr "Tương tác đồ họa với git-commit"
 
-#: command-list.h:71
 msgid "Remove untracked files from the working tree"
 msgstr "Gỡ bỏ các tập tin không được theo dõi từ cây làm việc"
 
-#: command-list.h:72
 msgid "Clone a repository into a new directory"
 msgstr "Nhân bản một kho chứa đến một thư mục mới"
 
-#: command-list.h:73
 msgid "Display data in columns"
 msgstr "Hiển thị dữ liệu dạng các cột"
 
-#: command-list.h:74
 msgid "Record changes to the repository"
 msgstr "Ghi các thay đổi vào kho chứa"
 
-#: command-list.h:75
 msgid "Write and verify Git commit-graph files"
 msgstr "Ghi và thẩm tra các tập tin đồ họa các lần chuyển giao Git"
 
-#: command-list.h:76
 msgid "Create a new commit object"
 msgstr "Tạo một đối tượng chuyển giao"
 
-#: command-list.h:77
 msgid "Get and set repository or global options"
 msgstr "Lấy và đặt kho hoặc các tùy chọn toàn cục"
 
-#: command-list.h:78
 msgid "Count unpacked number of objects and their disk consumption"
 msgstr ""
 "Đếm số lượng đối tượng chưa được đóng gói và mức tiêu dùng đĩa của chúng"
 
-#: command-list.h:79
 msgid "Retrieve and store user credentials"
 msgstr "Nhận và lưu chứng nhận của người dùng"
 
-#: command-list.h:80
 msgid "Helper to temporarily store passwords in memory"
 msgstr "Bộ hỗ trợ để lưu mật khẩu tạm thời trong bộ nhớ"
 
-#: command-list.h:81
 msgid "Helper to store credentials on disk"
 msgstr "Bộ hỗ trợ để lưu chứng nhận vào đĩa"
 
-#: command-list.h:82
 msgid "Export a single commit to a CVS checkout"
 msgstr "Xuất một lần chuyển giao thành một lần lấy ra CVS"
 
-#: command-list.h:83
 msgid "Salvage your data out of another SCM people love to hate"
 msgstr "Xem xét giá trị dữ liệu của bạn khỏi người khác yêu SCM để ghét"
 
-#: command-list.h:84
 msgid "A CVS server emulator for Git"
 msgstr "Một bộ mô phỏng máy dịch vụ CVS cho Git"
 
-#: command-list.h:85
 msgid "A really simple server for Git repositories"
 msgstr "Một máy phục vụ thực sự đơn giản dành cho kho Git"
 
-#: command-list.h:86
 msgid "Give an object a human readable name based on an available ref"
 msgstr ""
 "Đưa ra một đối tượng dựa trên một tên ở dạng con người đọc được trên một "
 "tham chiếu sẵn có"
 
-#: command-list.h:87
 msgid "Show changes between commits, commit and working tree, etc"
 msgstr ""
 "Hiển thị các thay đổi giữa những lần chuyển giao, giữa một lần chuyển giao "
 "và cây làm việc, v.v.."
 
-#: command-list.h:88
 msgid "Compares files in the working tree and the index"
 msgstr "So sánh các tập tin trong cây làm việc và bảng mục lục"
 
-#: command-list.h:89
 msgid "Compare a tree to the working tree or index"
 msgstr "So sánh các cây trong cây làm việc hoặc bảng mục lục"
 
-#: command-list.h:90
 msgid "Compares the content and mode of blobs found via two tree objects"
 msgstr ""
 "So sánh nội dung và chế độ của các blob tìm thấy thông qua hai đối tượng cây"
 
-#: command-list.h:91
 msgid "Show changes using common diff tools"
 msgstr "Hiển thị các thay đổi sử dụng các công cụ diff chung"
 
-#: command-list.h:92
 msgid "Git data exporter"
 msgstr "Bộ xuất dữ liệu Git"
 
-#: command-list.h:93
 msgid "Backend for fast Git data importers"
 msgstr "Ứng dụng chạy phía sau cho bộ nhập nhanh dữ liệu Git"
 
-#: command-list.h:94
 msgid "Download objects and refs from another repository"
 msgstr "Tải về các đối tượng và tham chiếu từ kho chứa khác"
 
-#: command-list.h:95
 msgid "Receive missing objects from another repository"
 msgstr "Tải về các đối tượng còn thiếu từ kho chứa khác"
 
-#: command-list.h:96
 msgid "Rewrite branches"
 msgstr "Những nhánh ghi lại"
 
-#: command-list.h:97
 msgid "Produce a merge commit message"
 msgstr "Sản sinh một ghi chú lần chuyển giao hòa trộn"
 
-#: command-list.h:98
 msgid "Output information on each ref"
 msgstr "Xuất thông tin cho từng tham chiếu"
 
-#: command-list.h:99
 msgid "Run a Git command on a list of repositories"
 msgstr "Chạy lệnh Git trên danh sách các kho chứa"
 
-#: command-list.h:100
 msgid "Prepare patches for e-mail submission"
 msgstr "Chuẩn bị các miếng vá để gửi qua thư điện tử"
 
-#: command-list.h:101
 msgid "Verifies the connectivity and validity of the objects in the database"
 msgstr ""
 "Thẩm tra lại tính kết nối và tính hiệu lực cảu các đối tượng trong cơ sở dữ "
 "liệu"
 
-#: command-list.h:102
 msgid "Cleanup unnecessary files and optimize the local repository"
 msgstr "Dọn dẹp các tập tin không cần thiết và tối ưu kho nội bộ"
 
-#: command-list.h:103
 msgid "Extract commit ID from an archive created using git-archive"
 msgstr ""
 "Rút trích mã số lần chuyển giao từ một kho nén đã được tạo bởi git-archive"
 
-#: command-list.h:104
 msgid "Print lines matching a pattern"
 msgstr "In ra những dòng khớp với một mẫu"
 
-#: command-list.h:105
 msgid "A portable graphical interface to Git"
 msgstr "Một giao diện đồ họa khả chuyển cho Git"
 
-#: command-list.h:106
 msgid "Compute object ID and optionally creates a blob from a file"
 msgstr "Tính toán ID đối tượng và tùy chọn là tạo một blob từ một tập tin"
 
-#: command-list.h:107
 msgid "Display help information about Git"
 msgstr "Hiển thị thông tin trợ giúp về Git"
 
-#: command-list.h:108
 msgid "Run git hooks"
 msgstr "Chạy các móc git"
 
-#: command-list.h:109
 msgid "Server side implementation of Git over HTTP"
 msgstr "Thi hành phía máy chủ của Git qua HTTP"
 
-#: command-list.h:110
 msgid "Download from a remote Git repository via HTTP"
 msgstr "Tải về từ một kho chứa Git trên mạng thông qua HTTP"
 
-#: command-list.h:111
 msgid "Push objects over HTTP/DAV to another repository"
 msgstr "Đẩy các đối tượng lên thông qua HTTP/DAV đến kho chứa khác"
 
-#: command-list.h:112
 msgid "Send a collection of patches from stdin to an IMAP folder"
 msgstr ""
 "Gửi một bộ sưu tập các miếng vá từ đầu vào tiêu chuẩn đến một thư mục IMAP"
 
-#: command-list.h:113
 msgid "Build pack index file for an existing packed archive"
 msgstr "Xây dựng tập tin mục lục gói cho một kho nén đã đóng gói sẵn có"
 
-#: command-list.h:114
 msgid "Create an empty Git repository or reinitialize an existing one"
 msgstr "Tạo một kho git mới hay khởi tạo lại một kho đã tồn tại từ trước"
 
-#: command-list.h:115
 msgid "Instantly browse your working repository in gitweb"
 msgstr "Duyệt ngay kho làm việc của bạn trong gitweb"
 
-#: command-list.h:116
 msgid "Add or parse structured information in commit messages"
 msgstr "Thêm hay phân tích thông tin cấu trúc trong ghi chú lần chuyển giao"
 
-#: command-list.h:117
 msgid "Show commit logs"
 msgstr "Hiển thị nhật ký các lần chuyển giao"
 
-#: command-list.h:118
 msgid "Show information about files in the index and the working tree"
 msgstr "Hiển thị thông tin về các tập tin trong bảng mục lục và cây làm việc"
 
-#: command-list.h:119
 msgid "List references in a remote repository"
 msgstr "Liệt kê các tham chiếu trong một kho chứa trên mạng"
 
-#: command-list.h:120
 msgid "List the contents of a tree object"
 msgstr "Liệt kê nội dung của đối tượng cây"
 
-#: command-list.h:121
 msgid "Extracts patch and authorship from a single e-mail message"
 msgstr "Trích xuất miếng và và nguồn tác giả từ một thư điện tử đơn"
 
-#: command-list.h:122
 msgid "Simple UNIX mbox splitter program"
 msgstr "Chương trình phân tách UNIX mbox đơn giản"
 
-#: command-list.h:123
 msgid "Run tasks to optimize Git repository data"
 msgstr "Chạy các nhiệm vụ để tối ưu hóa dữ liệu kho Git"
 
-#: command-list.h:124
 msgid "Join two or more development histories together"
 msgstr "Hợp nhất hai hay nhiều hơn lịch sử của các nhà phát triển"
 
-#: command-list.h:125
 msgid "Find as good common ancestors as possible for a merge"
 msgstr "Tìm các tổ tiên chung tốt có thể được cho hòa trộn"
 
-#: command-list.h:126
 msgid "Run a three-way file merge"
 msgstr "Chạy một hòa trộn tập tin “3-đường”"
 
-#: command-list.h:127
 msgid "Run a merge for files needing merging"
 msgstr "Chạy một hòa trộn cho các tập tin cần hòa trộn"
 
-#: command-list.h:128
 msgid "The standard helper program to use with git-merge-index"
 msgstr "Một chương trình hỗ trợ tiêu chuẩn dùng với git-merge-index"
 
-#: command-list.h:129
 msgid "Show three-way merge without touching index"
 msgstr "Hiển thị hòa trộn ba-đường mà không đụng chạm đến mục lục"
 
-#: command-list.h:130
 msgid "Run merge conflict resolution tools to resolve merge conflicts"
 msgstr ""
 "Chạy công cụ phân giải xung đột hòa trộn để mà giải quyết các xung đột hòa "
 "trộn"
 
-#: command-list.h:131
 msgid "Creates a tag object with extra validation"
 msgstr "Tạo một đối tượng thẻ với kiểm tra mở rộng"
 
-#: command-list.h:132
 msgid "Build a tree-object from ls-tree formatted text"
 msgstr "Xây dựng một tree-object từ văn bản định dạng ls-tree"
 
-#: command-list.h:133
 msgid "Write and verify multi-pack-indexes"
 msgstr "Ghi và thẩm tra các multi-pack-indexes"
 
-#: command-list.h:134
 msgid "Move or rename a file, a directory, or a symlink"
 msgstr "Di chuyển hay đổi tên một tập tin, thư mục hoặc liên kết mềm"
 
-#: command-list.h:135
 msgid "Find symbolic names for given revs"
 msgstr "Tìm các tên liên kết mềm cho điểm xét đã cho"
 
-#: command-list.h:136
 msgid "Add or inspect object notes"
 msgstr "Thêm hoặc điều tra đối tượng ghi chú"
 
-#: command-list.h:137
 msgid "Import from and submit to Perforce repositories"
 msgstr "Nhập vào từ và gửi đến các kho cần thiết"
 
-#: command-list.h:138
 msgid "Create a packed archive of objects"
 msgstr "Tạo một kho lưu được đóng gói cho các đối"
 
-#: command-list.h:139
 msgid "Find redundant pack files"
 msgstr "Tìm các tập tin gói dư thừa"
 
-#: command-list.h:140
 msgid "Pack heads and tags for efficient repository access"
 msgstr "Đóng gói các phần đầu và thẻ để truy cập kho hiệu quả hơn"
 
-#: command-list.h:141
 msgid "Compute unique ID for a patch"
 msgstr "Tính toán ID duy nhất cho một miếng vá"
 
-#: command-list.h:142
 msgid "Prune all unreachable objects from the object database"
 msgstr ""
 "Xén bớt tất các các đối tượng không tiếp cận được từ cơ sở dữ liệu đối tượng"
 
-#: command-list.h:143
 msgid "Remove extra objects that are already in pack files"
 msgstr "Xóa bỏ các đối tượng mở rộng cái mà đã sẵn có trong các tập tin gói"
 
-#: command-list.h:144
 msgid "Fetch from and integrate with another repository or a local branch"
 msgstr "Lấy về và hợp nhất với kho khác hay một nhánh nội bộ"
 
-#: command-list.h:145
 msgid "Update remote refs along with associated objects"
 msgstr "Cập nhật th.chiếu máy chủ cùng với các đối tượng liên quan đến nó"
 
-#: command-list.h:146
 msgid "Applies a quilt patchset onto the current branch"
 msgstr "Ấp dụng một bộ miếng vá quilt vào trong nhánh hiện hành"
 
-#: command-list.h:147
 msgid "Compare two commit ranges (e.g. two versions of a branch)"
 msgstr "So sánh hai vùng chuyển giao (vd: hai phiên bản của một nhánh)"
 
-#: command-list.h:148
 msgid "Reads tree information into the index"
 msgstr "Đọc thông tin cây vào trong mục lục"
 
-#: command-list.h:149
 msgid "Reapply commits on top of another base tip"
 msgstr "Thu hoạch các lần chuyển giao trên đỉnh của đầu mút cơ sở khác"
 
-#: command-list.h:150
 msgid "Receive what is pushed into the repository"
 msgstr "Nhận cái mà được đẩy vào trong kho"
 
-#: command-list.h:151
 msgid "Manage reflog information"
 msgstr "Quản lý thông tin reflog"
 
-#: command-list.h:152
 msgid "Manage set of tracked repositories"
 msgstr "Quản lý tập hợp các kho chứa đã được theo dõi"
 
-#: command-list.h:153
 msgid "Pack unpacked objects in a repository"
 msgstr "Đóng gói các đối tượng chưa đóng gói ở một kho chứa"
 
-#: command-list.h:154
 msgid "Create, list, delete refs to replace objects"
 msgstr "Tạo, liệt kê, xóa các tham chiếu để thay thế các đối tượng"
 
-#: command-list.h:155
 msgid "Generates a summary of pending changes"
 msgstr "Tạo ra một tóm tắt các thay đổi còn treo"
 
-#: command-list.h:156
 msgid "Reuse recorded resolution of conflicted merges"
 msgstr "Dùng lại các giải pháp đã ghi lại của các hòa trộn bị xung đột"
 
-#: command-list.h:157
 msgid "Reset current HEAD to the specified state"
 msgstr "Đặt lại HEAD hiện hành thành trạng thái đã cho"
 
-#: command-list.h:158
 msgid "Restore working tree files"
 msgstr "Hoàn nguyên các tập tin cây làm việc"
 
-#: command-list.h:159
 msgid "Lists commit objects in reverse chronological order"
 msgstr "Liệt kê các đối tượng chuyển giao theo thứ tự tôpô đảo ngược"
 
-#: command-list.h:160
 msgid "Pick out and massage parameters"
 msgstr "Cậy ra và xử lý các tham số"
 
-#: command-list.h:161
 msgid "Revert some existing commits"
 msgstr "Hoàn lại một số lần chuyển giao sẵn có"
 
-#: command-list.h:162
 msgid "Remove files from the working tree and from the index"
 msgstr "Gỡ bỏ các tập tin từ cây làm việc và từ bảng mục lục"
 
-#: command-list.h:163
 msgid "Send a collection of patches as emails"
 msgstr "Gửi một tập hợp của các miếng vá ở dạng thư điện tử"
 
-#: command-list.h:164
 msgid "Push objects over Git protocol to another repository"
 msgstr "Đẩy các đối tượng lên thông qua giao thức Git đến kho chứa khác"
 
-#: command-list.h:165
 msgid "Git's i18n setup code for shell scripts"
-msgstr "Nã cài đặt quốc tế hóa của Git cho văn lệnh hệ vỏ"
+msgstr "Mã cài đặt quốc tế hóa của Git cho văn lệnh hệ vỏ"
 
-#: command-list.h:166
 msgid "Common Git shell script setup code"
 msgstr "Mã cài đặt văn lệnh hệ vỏ Git chung"
 
-#: command-list.h:167
 msgid "Restricted login shell for Git-only SSH access"
 msgstr "Hệ vỏ đăng nhập có hạn chế cho truy cập SSH chỉ-Git"
 
-#: command-list.h:168
 msgid "Summarize 'git log' output"
 msgstr "Kết xuất “git log” dạng tóm tắt"
 
-#: command-list.h:169
 msgid "Show various types of objects"
 msgstr "Hiển thị các kiểu khác nhau của các đối tượng"
 
-#: command-list.h:170
 msgid "Show branches and their commits"
 msgstr "Hiển thị những nhánh và các lần chuyển giao của chúng"
 
-#: command-list.h:171
 msgid "Show packed archive index"
 msgstr "Hiển thị các muc lục kho nén đã đóng gói"
 
-#: command-list.h:172
 msgid "List references in a local repository"
 msgstr "Liệt kê các tham chiếu trong một kho nội bộ"
 
-#: command-list.h:173
 msgid "Reduce your working tree to a subset of tracked files"
 msgstr ""
 "Giảm lược cây làm việc của bạn thành tập hợp con của các tập tin được theo "
 "dõi"
 
-#: command-list.h:174
 msgid "Add file contents to the staging area"
 msgstr "Thêm nội dung tập tin vào vùng bệ phóng"
 
-#: command-list.h:175
 msgid "Stash the changes in a dirty working directory away"
 msgstr "Tạm cất đi các thay đổi trong một thư mục làm việc bẩn"
 
-#: command-list.h:176
 msgid "Show the working tree status"
 msgstr "Hiển thị trạng thái cây làm việc"
 
-#: command-list.h:177
 msgid "Remove unnecessary whitespace"
 msgstr "Xóa bỏ các khoảng trắng không cần thiết"
 
-#: command-list.h:178
 msgid "Initialize, update or inspect submodules"
 msgstr "Khởi tạo, cập nhật hay điều tra các mô-đun-con"
 
-#: command-list.h:179
 msgid "Bidirectional operation between a Subversion repository and Git"
 msgstr "Thao tác hai hướng giữ hai kho Subversion và Git"
 
-#: command-list.h:180
 msgid "Switch branches"
 msgstr "Các nhánh chuyển"
 
-#: command-list.h:181
 msgid "Read, modify and delete symbolic refs"
 msgstr "Đọc, sửa và xóa tham chiếu mềm"
 
-#: command-list.h:182
 msgid "Create, list, delete or verify a tag object signed with GPG"
 msgstr "Tạo, liệt kê, xóa hay xác thực một đối tượng thẻ được ký bằng GPG"
 
-#: command-list.h:183
 msgid "Creates a temporary file with a blob's contents"
 msgstr "Tạo một tập tin tạm với nội dung của blob"
 
-#: command-list.h:184
 msgid "Unpack objects from a packed archive"
 msgstr "Gỡ các đối tượng khỏi một kho lưu đã đóng gói"
 
-#: command-list.h:185
 msgid "Register file contents in the working tree to the index"
 msgstr "Đăng ký nội dung tập tin từ cây làm việc đến bảng mục lục"
 
-#: command-list.h:186
 msgid "Update the object name stored in a ref safely"
 msgstr "Cập nhật tên đối tượng được lưu trong một tham chiếu một cách an toàn"
 
-#: command-list.h:187
 msgid "Update auxiliary info file to help dumb servers"
 msgstr "Cập nhật tập tin thông tin phụ trợ để giúp đỡ các dịch vụ dumb"
 
-#: command-list.h:188
 msgid "Send archive back to git-archive"
 msgstr "Gửi kho lưu trở lại cho git-archive"
 
-#: command-list.h:189
 msgid "Send objects packed back to git-fetch-pack"
 msgstr "Gửi các đối tượng đã đóng gói trở lại cho git-fetch-pack"
 
-#: command-list.h:190
 msgid "Show a Git logical variable"
 msgstr "Hiển thị một biến Git luận lý"
 
-#: command-list.h:191
 msgid "Check the GPG signature of commits"
 msgstr "Kiểm tra ký lần chuyển giao dùng GPG"
 
-#: command-list.h:192
 msgid "Validate packed Git archive files"
 msgstr "Kiểm tra lại các tập tin kho (lưu trữ, nén) Git đã được đóng gói"
 
-#: command-list.h:193
 msgid "Check the GPG signature of tags"
 msgstr "Kiểm tra chữ ký GPG của các thẻ"
 
-#: command-list.h:194
 msgid "Show logs with difference each commit introduces"
 msgstr "Hiển thị các nhật ký với từng lần chuyển giao khác nhau đưa ra"
 
-#: command-list.h:195
 msgid "Manage multiple working trees"
 msgstr "Quản lý nhiều cây làm việc"
 
-#: command-list.h:196
 msgid "Create a tree object from the current index"
 msgstr "Tạo một đối tượng cây từ đầu vào tiêu chuẩn stdin hiện tại"
 
-#: command-list.h:197
 msgid "Defining attributes per path"
 msgstr "Định nghĩa các thuộc tính cho mỗi đường dẫn"
 
-#: command-list.h:198
 msgid "Git command-line interface and conventions"
 msgstr "Giao diện dòng lệnh Git và quy ước"
 
-#: command-list.h:199
 msgid "A Git core tutorial for developers"
 msgstr "Hướng dẫn Git cơ bản cho nhà phát triển"
 
-#: command-list.h:200
 msgid "Providing usernames and passwords to Git"
 msgstr "Cung cấp tài khoản và mật khẩu cho Git"
 
-#: command-list.h:201
 msgid "Git for CVS users"
 msgstr "Git dành cho những người dùng CVS"
 
-#: command-list.h:202
 msgid "Tweaking diff output"
 msgstr "Chỉnh kết xuất diff"
 
-#: command-list.h:203
 msgid "A useful minimum set of commands for Everyday Git"
 msgstr "Một tập hợp lệnh hữu dụng tối thiểu để dùng Git hàng ngày"
 
-#: command-list.h:204
 msgid "Frequently asked questions about using Git"
 msgstr "Các câu hỏi thường gặp về cách sử dụng Git"
 
-#: command-list.h:205
 msgid "A Git Glossary"
 msgstr "Thuật ngữ chuyên môn Git"
 
-#: command-list.h:206
 msgid "Hooks used by Git"
 msgstr "Các móc được sử dụng bởi Git"
 
-#: command-list.h:207
 msgid "Specifies intentionally untracked files to ignore"
 msgstr "Chỉ định các tập tin không cần theo dõi"
 
-#: command-list.h:208
 msgid "The Git repository browser"
 msgstr "Bộ duyện kho Git"
 
-#: command-list.h:209
 msgid "Map author/committer names and/or E-Mail addresses"
 msgstr "Ánh xạ tên tác giả/người chuyển giao và/hoặc địa chỉ E-Mail"
 
-#: command-list.h:210
 msgid "Defining submodule properties"
 msgstr "Định nghĩa thuộc tính mô-đun-con"
 
-#: command-list.h:211
 msgid "Git namespaces"
 msgstr "Không gian tên Git"
 
-#: command-list.h:212
 msgid "Helper programs to interact with remote repositories"
 msgstr "Các chương trình hỗ trợ để tương tác với các kho chứa trên máy chủ"
 
-#: command-list.h:213
 msgid "Git Repository Layout"
 msgstr "Bố cục kho Git"
 
-#: command-list.h:214
 msgid "Specifying revisions and ranges for Git"
 msgstr "Chỉ định điểm xét duyệt và vùng cho Git"
 
-#: command-list.h:215
 msgid "Mounting one repository inside another"
 msgstr "Gắn một kho chứa vào trong một cái khác"
 
-#: command-list.h:216
 msgid "A tutorial introduction to Git"
 msgstr "Hướng dẫn cách dùng Git"
 
-#: command-list.h:217
 msgid "A tutorial introduction to Git: part two"
 msgstr "Hướng dẫn cách dùng Git: phần hai"
 
-#: command-list.h:218
 msgid "Git web interface (web frontend to Git repositories)"
 msgstr "Giao diện Git trên nền web (ứng dụng web chạy trên kho Git)"
 
-#: command-list.h:219
 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-merge-octopus.sh:46
+msgid "commit-graph file is too small"
+msgstr "tập tin đồ-thị-các-lần-chuyển-giao quá nhỏ"
+
+#, c-format
+msgid "commit-graph signature %X does not match signature %X"
+msgstr "chữ ký đồ-thị-các-lần-chuyển-giao %X không khớp chữ ký %X"
+
+#, c-format
+msgid "commit-graph version %X does not match version %X"
+msgstr "phiên bản đồ-thị-các-lần-chuyển-giao %X không khớp phiên bản %X"
+
+#, c-format
+msgid "commit-graph hash version %X does not match version %X"
+msgstr "phiên bản đồ-thị-các-lần-chuyển-giao %X không khớp phiên bản %X"
+
+#, c-format
+msgid "commit-graph file is too small to hold %u chunks"
+msgstr "tập tin đồ-thị-các-lần-chuyển-giao quá nhỏ để giữ %u mảnh dữ liệu"
+
+msgid "commit-graph has no base graphs chunk"
+msgstr "đồ-thị-các-lần-chuyển-giao có không có mảnh các đồ họa cơ sở"
+
+msgid "commit-graph chain does not match"
+msgstr "móc xích đồ-thị-các-lần-chuyển-giao không khớp"
+
+#, c-format
+msgid "invalid commit-graph chain: line '%s' not a hash"
+msgstr ""
+"móc xích đồ-thị-các-lần-chuyển-giao không hợp lệ: dòng “%s” không phải là "
+"một mã băm"
+
+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"
+
+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"
+
+#, c-format
+msgid "could not find commit %s"
+msgstr "không thể tìm thấy lần chuyển giao %s"
+
+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ó"
+
+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"
+
+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"
+
+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"
+
+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"
+
+msgid "Computing commit graph generation numbers"
+msgstr "Đang tính toán số tạo đồ thị các lần chuyển giao"
+
+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"
+
+msgid "Collecting referenced commits"
+msgstr "Đang sưu tập các lần chuyển giao được tham chiếu"
+
+#, c-format
+msgid "Finding commits for commit graph in %<PRIuMAX> pack"
+msgid_plural "Finding commits for commit graph in %<PRIuMAX> packs"
+msgstr[0] ""
+"Đang tìm các lần chuyển giao cho đồ thị lần chuyển giao trong %<PRIuMAX> gói"
+
+#, c-format
+msgid "error adding pack %s"
+msgstr "gặp lỗi thêm gói %s"
+
+#, c-format
+msgid "error opening index for %s"
+msgstr "gặp lỗi khi mở mục lục cho “%s”"
+
+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"
+
+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"
+
+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ở"
+
+msgid "unable to create temporary graph layer"
+msgstr "không thể tạo lớp sơ đồ tạm thời"
+
+#, 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”"
+
+#, 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"
+
+msgid "unable to open commit-graph chain file"
+msgstr "không thể mở tập tin mắt xích đồ thị chuyển giao"
+
+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"
+
+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"
+
+msgid "Scanning merged commits"
+msgstr "Đang quét các lần chuyển giao đã hòa trộn"
+
+msgid "Merging commit-graph"
+msgstr "Đang hòa trộn đồ-thị-các-lần-chuyển-giao"
+
+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"
+
+msgid "too many commits to write graph"
+msgstr "có quá nhiều lần chuyển giao để ghi đồ thị"
+
+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"
+
+#, 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"
+
+#, 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"
+
+#, 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"
+
+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"
+
+#, 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"
+
+#, 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"
+
+#, 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"
+
+#, 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"
+
+#, 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"
+
+#, c-format
+msgid ""
+"commit-graph has generation number zero for commit %s, but non-zero elsewhere"
+msgstr ""
+"đồ-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"
+
+#, c-format
+msgid ""
+"commit-graph has non-zero generation number for commit %s, but zero elsewhere"
+msgstr ""
+"đồ-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"
+
+#, 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>"
+
+#, 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>"
+
+#, c-format
+msgid "%s %s is not a commit!"
+msgstr "%s %s không phải là một lần chuyển giao!"
+
+msgid ""
+"Support for <GIT_DIR>/info/grafts is deprecated\n"
+"and will be removed in a future Git version.\n"
+"\n"
+"Please use \"git replace --convert-graft-file\"\n"
+"to convert the grafts into replace refs.\n"
+"\n"
+"Turn this message off by running\n"
+"\"git config advice.graftFileDeprecated false\""
+msgstr ""
+"Việc hỗ trợ cho <GIT_DIR>/info/grafts đã lạc hậu\n"
+"và sẽ bị xóa bỏ ở phiên bản Git tương lai.\n"
+"\n"
+"Vui lòng dùng \"git replace --convert-graft-file\"\n"
+"để chuyển đổi các graft thành các tham chiếu thay thế.\n"
+"\n"
+"Tắt lời nhắn này bằng cách chạy\n"
+"\"git config advice.graftFileDeprecated false\""
+
+#, 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."
+
+#, 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."
+
+#, c-format
+msgid "Commit %s does not have a GPG signature."
+msgstr "Lần chuyển giao %s không có chữ ký GPG."
+
+#, 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"
+
+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"
+"variable i18n.commitEncoding to the encoding your project uses.\n"
+msgstr ""
+"Cảnh báo: ghi chú cho lần chuyển giao không hợp chuẩn UTF-8.\n"
+"Bạn có lẽ muốn tu bổ nó sau khi sửa lời chú thích, hoặc là đặt biến\n"
+"cấu hình i18n.commitEncoding thành bảng mã mà dự án của bạn muốn dùng.\n"
+
+msgid "no compiler information available\n"
+msgstr "hiện không có thông tin về trình biên dịch\n"
+
+msgid "no libc information available\n"
+msgstr "không có thông tin về libc\n"
+
+#, c-format
+msgid "[GLE %ld] health thread could not open '%ls'"
+msgstr "[GLE %ld] không thể mở tuyến trình sức khỏe '%ls'"
+
+#, c-format
+msgid "[GLE %ld] health thread getting BHFI for '%ls'"
+msgstr "[GLE %ld] tuyến trình sức khỏe lấy BHFI cho '%ls'"
+
+#, c-format
+msgid "could not convert to wide characters: '%s'"
+msgstr "không thể chuyển đổi các ký tự rộng: '%s'"
+
+#, c-format
+msgid "BHFI changed '%ls'"
+msgstr "BHFI đã thay  '%ls'"
+
+#, c-format
+msgid "unhandled case in 'has_worktree_moved': %d"
+msgstr "có trường hợp không được xử lý trong  'has_worktree_moved': %d"
+
+#, c-format
+msgid "health thread wait failed [GLE %ld]"
+msgstr "gặp lỗi khi chờ tiến trình sức khỏe [GLE %ld]"
+
+msgid "Unable to create FSEventStream."
+msgstr "Không thể tạo FSEventStream."
+
+msgid "Failed to start the FSEventStream"
+msgstr "Gặp lỗi khi khởi chạy FSEventStream"
+
+#, c-format
+msgid "[GLE %ld] could not convert path to UTF-8: '%.*ls'"
+msgstr "[GLE %ld] không thể chuyển đổi đường dẫn sang UTF-8: '%.*ls'"
+
+#, c-format
+msgid "[GLE %ld] could not watch '%s'"
+msgstr "[GLE %ld] không thể theo dõi '%s'"
+
+#, c-format
+msgid "[GLE %ld] could not get longname of '%s'"
+msgstr "[GLE %ld] không thể lấy tên dài cho '%s'"
+
+#, c-format
+msgid "ReadDirectoryChangedW failed on '%s' [GLE %ld]"
+msgstr "ReadDirectoryChangedW gặp lỗi trên '%s' [GLE %ld]"
+
+#, c-format
+msgid "GetOverlappedResult failed on '%s' [GLE %ld]"
+msgstr "GetOverlappedResult gặp lỗi trên '%s' [GLE %ld]"
+
+#, c-format
+msgid "could not read directory changes [GLE %ld]"
+msgstr "không thể đọc các thay đổi thư mục [GLE %ld]"
+
+#, c-format
+msgid "failed to copy SID (%ld)"
+msgstr "gặp lỗi khi sao chép SID (%ld)"
+
+#, c-format
+msgid "failed to get owner for '%s' (%ld)"
+msgstr "gặp lỗi khi lấy chủ sở hữu cho '%s' (%ld)"
+
+msgid "memory exhausted"
+msgstr "hết bộ nhớ"
+
+msgid "Success"
+msgstr "Thành công"
+
+msgid "No match"
+msgstr "Không tìm thấy"
+
+msgid "Invalid regular expression"
+msgstr "Biểu thức chính quy không hợp lệ"
+
+msgid "Invalid collation character"
+msgstr "Ký tự đối chiếu không hợp lệ"
+
+msgid "Invalid character class name"
+msgstr "Tên lớp ký tự không hợp lệ"
+
+msgid "Trailing backslash"
+msgstr "Có dấu gạch ngược theo sau"
+
+msgid "Invalid back reference"
+msgstr "Tham chiếu ngược không hợp lệ"
+
+msgid "Unmatched [ or [^"
+msgstr "Chưa khớp [ hay [^"
+
+msgid "Unmatched ( or \\("
+msgstr "Chưa khớp ( hay \\("
+
+msgid "Unmatched \\{"
+msgstr "Chưa khớp cặp “\\{”"
+
+msgid "Invalid content of \\{\\}"
+msgstr "Nội dung của \\{\\} không hợp lệ"
+
+msgid "Invalid range end"
+msgstr "Sai kết thúc phạm vi"
+
+msgid "Memory exhausted"
+msgstr "Hết bộ nhớ"
+
+msgid "Invalid preceding regular expression"
+msgstr "Biểu thức chính quy nằm trước không hợp lệ"
+
+msgid "Premature end of regular expression"
+msgstr "Biểu thức chính quy kết thúc quá sớm"
+
+msgid "Regular expression too big"
+msgstr "Biểu thức chính quy quá lớn"
+
+msgid "Unmatched ) or \\)"
+msgstr "Chưa khớp ) hay \\)"
+
+msgid "No previous regular expression"
+msgstr "Không có biểu thức chính quy nằm trước"
+
+msgid "could not send IPC command"
+msgstr "không thể gửi lệnh IPC"
+
+msgid "could not read IPC response"
+msgstr "không thể đọc đáp ứng IPC"
+
+#, c-format
+msgid "could not start accept_thread '%s'"
+msgstr "không thể khởi chạy accept_thread “%s”"
+
+#, 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”"
+
+#, c-format
+msgid "ConnectNamedPipe failed for '%s' (%lu)"
+msgstr "ConnectNamedPipe gặp lỗi  '%s' (%lu)"
+
+#, c-format
+msgid "could not create fd from pipe for '%s'"
+msgstr "không thể tạo mô tả tập tin từ đường ống cho '%s'"
+
+#, c-format
+msgid "could not start thread[0] for '%s'"
+msgstr "không thể khởi chạy tiến trình[0] cho “%s”"
+
+#, c-format
+msgid "wait for hEvent failed for '%s'"
+msgstr "chờ cho hEvent gặp lỗi với “%s”"
+
+msgid "cannot resume in the background, please use 'fg' to resume"
+msgstr ""
+"không thể khôi phục lại trong nền hệ thống, vui lòng sử dụng 'fg' để khôi "
+"phục lại"
+
+msgid "cannot restore terminal settings"
+msgstr "không thể phục hồi lại các cài đặt thiết bị cuối"
+
+#, c-format
+msgid ""
+"exceeded maximum include depth (%d) while including\n"
+"\t%s\n"
+"from\n"
+"\t%s\n"
+"This might be due to circular includes."
+msgstr ""
+"vượt quá độ sâu bao gồm tối đa (%d) trong khi bao gồm\n"
+"\t%s\n"
+"từ\n"
+"\t%s\n"
+"Nguyên nhân có thể là gồm quẩn vòng."
+
+#, c-format
+msgid "could not expand include path '%s'"
+msgstr "không thể khai triển đường dẫn “%s”"
+
+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"
+
+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"
+
+msgid ""
+"remote URLs cannot be configured in file directly or indirectly included by "
+"includeIf.hasconfig:remote.*.url"
+msgstr ""
+"các URL máy chủ không thể được cấu hình trong tệp trực tiếp hoặc gián tiếp "
+"được bao gồm bởi includeIf.hasconfig:remote.*.url"
+
+#, c-format
+msgid "invalid config format: %s"
+msgstr "định dạng cấu hình không hợp lệ: %s"
+
+#, 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”"
+
+#, 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”"
+
+#, c-format
+msgid "key does not contain a section: %s"
+msgstr "khóa không chứa một phần: %s"
+
+#, c-format
+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"
+
+#, c-format
+msgid "invalid key: %s"
+msgstr "khóa không đúng: %s"
+
+#, c-format
+msgid "invalid key (newline): %s"
+msgstr "khóa không hợp lệ (dòng mới): %s"
+
+msgid "empty config key"
+msgstr "khóa cấu hình trống rỗng"
+
+#, c-format
+msgid "bogus config parameter: %s"
+msgstr "tham số cấu hình không có thực: %s"
+
+#, c-format
+msgid "bogus format in %s"
+msgstr "định dạng không có thực trong %s"
+
+#, c-format
+msgid "bogus count in %s"
+msgstr "số lượng không có thực trong %s"
+
+#, c-format
+msgid "too many entries in %s"
+msgstr "quá nhiều mục tin trong %s"
+
+#, c-format
+msgid "missing config key %s"
+msgstr "thiếu khóa cấu hình “%s”"
+
+#, c-format
+msgid "missing config value %s"
+msgstr "thiếu giá trị cấu hình “%s”"
+
+#, 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"
+
+#, 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"
+
+#, 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"
+
+#, 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"
+
+#, 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"
+
+#, c-format
+msgid "bad config line %d in %s"
+msgstr "cấu hình sai tại dòng %d trong %s"
+
+msgid "out of range"
+msgstr "nằm ngoài phạm vi"
+
+msgid "invalid unit"
+msgstr "đơn vị không hợp lệ"
+
+#, 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"
+
+#, 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"
+
+#, 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"
+
+#, 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"
+
+#, 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"
+
+#, 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"
+
+#, 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"
+
+#, c-format
+msgid "invalid value for variable %s"
+msgstr "giá trị không hợp lệ cho biến %s"
+
+#, c-format
+msgid "ignoring unknown core.fsync component '%s'"
+msgstr "bỏ qua thành phần core.fsync chưa biết '%s'"
+
+#, 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”"
+
+#, 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”"
+
+#, 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ệ"
+
+#, c-format
+msgid "abbrev length out of range: %d"
+msgstr "chiều dài abbrev nằm ngoài phạm vi: %d"
+
+#, c-format
+msgid "bad zlib compression level %d"
+msgstr "mức nén zlib %d là sai"
+
+msgid "core.commentChar should only be one character"
+msgstr "core.commentChar chỉ được có một ký tự"
+
+#, c-format
+msgid "ignoring unknown core.fsyncMethod value '%s'"
+msgstr "bỏ qua giá trị core.fsyncMethod chưa biết '%s'"
+
+msgid "core.fsyncObjectFiles is deprecated; use core.fsync instead"
+msgstr "core.fsyncObjectFiles đã lạc hậu; hãy dùng core.fsync để thay thế"
+
+#, 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"
+
+#, c-format
+msgid "malformed value for %s"
+msgstr "giá trị cho %s sai dạng"
+
+#, c-format
+msgid "malformed value for %s: %s"
+msgstr "giá trị cho %s sai dạng: %s"
+
+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"
+
+#, 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”"
+
+#, 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ả"
+
+#, c-format
+msgid "unable to resolve config blob '%s'"
+msgstr "không thể phân giải điểm xét duyệt “%s”"
+
+#, c-format
+msgid "failed to parse %s"
+msgstr "gặp lỗi khi phân tích cú pháp %s"
+
+msgid "unable to parse command-line config"
+msgstr "không thể phân tích cấu hình dòng lệnh"
+
+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"
+
+#, c-format
+msgid "Invalid %s: '%s'"
+msgstr "%s không hợp lệ: “%s”"
+
+#, 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"
+
+#, 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"
+
+#, 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"
+
+#, c-format
+msgid "invalid section name '%s'"
+msgstr "tên của phần không hợp lệ “%s”"
+
+#, c-format
+msgid "%s has multiple values"
+msgstr "%s có đa giá trị"
+
+#, 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”"
+
+#, c-format
+msgid "could not lock config file %s"
+msgstr "không thể khóa tập tin cấu hình %s"
+
+#, c-format
+msgid "opening %s"
+msgstr "đang mở “%s”"
+
+#, c-format
+msgid "invalid config file %s"
+msgstr "tập tin cấu hình “%s” không hợp lệ"
+
+#, c-format
+msgid "fstat on %s failed"
+msgstr "fstat trên %s gặp lỗi"
+
+#, c-format
+msgid "unable to mmap '%s'%s"
+msgstr "không thể mmap “%s”%s"
+
+#, c-format
+msgid "chmod on %s failed"
+msgstr "chmod trên %s gặp lỗi"
+
+#, c-format
+msgid "could not write config file %s"
+msgstr "không thể ghi tập tin cấu hình “%s”"
+
+#, c-format
+msgid "could not set '%s' to '%s'"
+msgstr "không thể đặt “%s” thành “%s”"
+
+#, c-format
+msgid "invalid section name: %s"
+msgstr "tên của phần không hợp lệ: %s"
+
+#, c-format
+msgid "missing value for '%s'"
+msgstr "thiếu giá trị cho cho “%s”"
+
+msgid "the remote end hung up upon initial contact"
+msgstr "máy chủ bị treo trên lần tiếp xúc đầu tiên"
+
+msgid ""
+"Could not read from remote repository.\n"
+"\n"
+"Please make sure you have the correct access rights\n"
+"and the repository exists."
+msgstr ""
+"Không thể đọc từ kho trên mạng.\n"
+"\n"
+"Vui lòng chắc chắn là bạn có đủ thẩm quyền truy cập\n"
+"và kho chứa đã sẵn có."
+
+#, c-format
+msgid "server doesn't support '%s'"
+msgstr "máy chủ không hỗ trợ “%s”"
+
+#, c-format
+msgid "server doesn't support feature '%s'"
+msgstr "máy chủ không hỗ trợ tính năng “%s”"
+
+msgid "expected flush after capabilities"
+msgstr "cần đẩy dữ liệu lên đĩa sau các capabilities"
+
+#, c-format
+msgid "ignoring capabilities after first line '%s'"
+msgstr "bỏ qua capabilities sau dòng đầu tiên “%s”"
+
+msgid "protocol error: unexpected capabilities^{}"
+msgstr "lỗi giao thức: không cần capabilities^{}"
+
+#, 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”"
+
+msgid "repository on the other end cannot be shallow"
+msgstr "kho đã ở điểm cuối khoác nên không thể được shallow"
+
+msgid "invalid packet"
+msgstr "gói không hợp lệ"
+
+#, c-format
+msgid "protocol error: unexpected '%s'"
+msgstr "lỗi giao thức: không cần “%s”"
+
+#, 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ụ"
+
+#, c-format
+msgid "invalid ls-refs response: %s"
+msgstr "trả về của ls-refs không hợp lệ: %s"
+
+msgid "expected flush after ref listing"
+msgstr "cần đẩy dữ liệu lên đĩa sau khi liệt kê tham chiếu"
+
+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"
+
+#, c-format
+msgid "protocol '%s' is not supported"
+msgstr "giao thức “%s” chưa được hỗ trợ"
+
+msgid "unable to set SO_KEEPALIVE on socket"
+msgstr "không thể đặt SO_KEEPALIVE trên ổ cắm"
+
+#, c-format
+msgid "Looking up %s ... "
+msgstr "Đang tìm kiếm %s … "
+
+#, 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 ... "
+#, c-format
+msgid ""
+"done.\n"
+"Connecting to %s (port %s) ... "
+msgstr ""
+"xong.\n"
+"Đang kết nối đến %s (cổng %s) … "
+
+#, c-format
+msgid ""
+"unable to connect to %s:\n"
+"%s"
+msgstr ""
+"không thể kết nối đến %s:\n"
+"%s"
+
+#. TRANSLATORS: this is the end of "Connecting to %s (port %s) ... "
+msgid "done."
+msgstr "hoàn tất."
+
+#, c-format
+msgid "unable to look up %s (%s)"
+msgstr "không thể tìm thấy %s (%s)"
+
+#, c-format
+msgid "unknown port %s"
+msgstr "không hiểu cổng %s"
+
+#, c-format
+msgid "strange hostname '%s' blocked"
+msgstr "đã khóa tên máy lạ “%s”"
+
+#, c-format
+msgid "strange port '%s' blocked"
+msgstr "đã khóa cổng lạ “%s”"
+
+#, c-format
+msgid "cannot start proxy %s"
+msgstr "không thể khởi chạy ủy nhiệm “%s”"
+
+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ệ"
+
+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"
+
+msgid "ssh variant 'simple' does not support -4"
+msgstr "ssh biến thể “simple” không hỗ trợ -4"
+
+msgid "ssh variant 'simple' does not support -6"
+msgstr "ssh biến thể “simple” không hỗ trợ -6"
+
+msgid "ssh variant 'simple' does not support setting port"
+msgstr "ssh biến thể “simple” không hỗ trợ đặt cổng"
+
+#, c-format
+msgid "strange pathname '%s' blocked"
+msgstr "đã khóa tên đường dẫn lạ “%s”"
+
+msgid "unable to fork"
+msgstr "không thể rẽ nhánh tiến trình con"
+
+msgid "Could not run 'git rev-list'"
+msgstr "Không thể chạy “git rev-list”"
+
+msgid "failed write to rev-list"
+msgstr "gặp lỗi khi ghi vào rev-list"
+
+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"
+
+#, c-format
+msgid "'%s' does not exist"
+msgstr "\"%s\" không tồn tại"
+
+msgid "need a working directory"
+msgstr "cần một thư mục làm việc"
+
+msgid "could not find enlistment root"
+msgstr "không tìm thấy gốc enlistment"
+
+#, c-format
+msgid "could not switch to '%s'"
+msgstr "không thể chuyển đến '%s'"
+
+#, c-format
+msgid "could not configure %s=%s"
+msgstr "không thể đóng cấu hình %s=%s"
+
+msgid "could not configure log.excludeDecoration"
+msgstr "không thể cấu hình log.excludeDecoration"
+
+msgid "Scalar enlistments require a worktree"
+msgstr "'Scalar enlistments' cần một cây làm việc"
+
+#, c-format
+msgid "could not open directory '%s'"
+msgstr "không thể mở thư mục “%s”"
+
+#, c-format
+msgid "skipping '%s', which is neither file nor directory"
+msgstr ""
+"đang bỏ qua “%s”, cái không phải là một tập tin, cũng không phải thư mục"
+
+#, c-format
+msgid "could not determine free disk size for '%s'"
+msgstr "không thể dò tìm chỗ trống trên đĩa  cho “%s”"
+
+#, c-format
+msgid "could not get info for '%s'"
+msgstr "không thể lấy thông tin cho “%s”"
+
+#, c-format
+msgid "remote HEAD is not a branch: '%.*s'"
+msgstr "HEAD của máy chủ không phải một nhánh: '%.*s'"
+
+msgid "failed to get default branch name from remote; using local default"
+msgstr "gặp lỗi khi lấy tên nhánh mặc định từ máy chủ; sử dụng mặc định nội bộ"
+
+msgid "failed to get default branch name"
+msgstr "gặp lỗi khi lấy tên nhánh mặc định"
+
+msgid "failed to unregister repository"
+msgstr "gặp lỗi khi hủy đăng ký kho chứa"
+
+msgid "failed to delete enlistment directory"
+msgstr "gặp lỗi khi xóa thư mục dành được"
+
+msgid "branch to checkout after clone"
+msgstr "nhánh để lấy ra sau khi nhân bản"
+
+msgid "when cloning, create full working directory"
+msgstr "khi nhân bản, tạo đầy đủ thư mục làm việc"
+
+msgid "only download metadata for the branch that will be checked out"
+msgstr "chỉ siêu dữ liệu tải về cho nhánh mà sẽ được lấy ra"
+
+msgid "scalar clone [<options>] [--] <repo> [<dir>]"
+msgstr "scalar clone [<các tùy chọn>] [--] <kho> [<t.mục>]"
+
+#, c-format
+msgid "cannot deduce worktree name from '%s'"
+msgstr "không thể suy diễn tên cây làm việc từ '%s'"
+
+#, c-format
+msgid "directory '%s' exists already"
+msgstr "thư mục '%s' đã sẵn có"
+
+#, c-format
+msgid "failed to get default branch for '%s'"
+msgstr "gặp lỗi khi lấy nhánh mặc định cho '%s'"
+
+#, c-format
+msgid "could not configure remote in '%s'"
+msgstr "không thể cấu hình máy chủ trong '%s'"
+
+#, c-format
+msgid "could not configure '%s'"
+msgstr "không thể cấu hình '%s'"
+
+msgid "partial clone failed; attempting full clone"
+msgstr "nhân bản từng phần gặp lỗi; đang cố thử nhân bản đầy đủ"
+
+msgid "could not configure for full clone"
+msgstr "không thể cấu hình cho nhân bản đầy đủ"
+
+msgid "scalar diagnose [<enlistment>]"
+msgstr "scalar diagnose [<enlistment>]"
+
+#, c-format
+msgid "could not create directory for '%s'"
+msgstr "không thể tạo thư mục cho “%s”"
+
+msgid "could not duplicate stdout"
+msgstr "không thể nhân đôi đầu vào tiêu chuẩn"
+
+msgid "failed to write archive"
+msgstr "gặp lỗi khi khi kho nén"
+
+msgid "`scalar list` does not take arguments"
+msgstr "`scalar list` không nhận các tham số"
+
+msgid "scalar register [<enlistment>]"
+msgstr "scalar register [<enlistment>]"
+
+msgid "reconfigure all registered enlistments"
+msgstr "cấu hình mọi enlistments đã đăng ký"
+
+msgid "scalar reconfigure [--all | <enlistment>]"
+msgstr "scalar reconfigure [--all | <enlistment>]"
+
+msgid "--all or <enlistment>, but not both"
+msgstr "--all hoặc <enlistment>, không thể là cả hai"
+
+#, c-format
+msgid "git repository gone in '%s'"
+msgstr "kho git ra đi trong '%s'"
+
+msgid ""
+"scalar run <task> [<enlistment>]\n"
+"Tasks:\n"
+msgstr ""
+"scalar run <task> [<enlistment>]\n"
+"Nhiệm vụ:\n"
+
+#, c-format
+msgid "no such task: '%s'"
+msgstr "không có nhiệm vụ nào như thế: “%s”"
+
+msgid "scalar unregister [<enlistment>]"
+msgstr "scalar unregister [<enlistment>]"
+
+msgid "scalar delete <enlistment>"
+msgstr "scalar delete <enlistment>"
+
+msgid "refusing to delete current working directory"
+msgstr "từ chối gỡ bỏ thư mục làm việc hiện tại"
+
+msgid "include Git version"
+msgstr "bao gồm phiên bản Git"
+
+msgid "include Git's build options"
+msgstr "bao gồm các tùy chọn biên dịch của Git"
+
+msgid "scalar verbose [-v | --verbose] [--build-options]"
+msgstr "scalar verbose [-v | --verbose] [--build-options]"
+
+msgid "-C requires a <directory>"
+msgstr "-C cần một <thư_mục>"
+
+#, c-format
+msgid "could not change to '%s'"
+msgstr "không thể chuyển sang “%s”"
+
+msgid "-c requires a <key>=<value> argument"
+msgstr "-c cần một tham số <key>=<value>"
+
+msgid ""
+"scalar [-C <directory>] [-c <key>=<value>] <command> [<options>]\n"
+"\n"
+"Commands:\n"
+msgstr ""
+"scalar [-C </thư/mục/>] [-c <khóa>=<giá trị>] <lệnh> [<các tùy chọn>]\n"
+"\n"
+"Các lệnh:\n"
+
+#, c-format
+msgid "illegal crlf_action %d"
+msgstr "crlf_action %d không hợp lệ"
+
+#, c-format
+msgid "CRLF would be replaced by LF in %s"
+msgstr "CRLF nên được thay bằng LF trong %s"
+
+#, c-format
+msgid ""
+"in the working copy of '%s', CRLF will be replaced by LF the next time Git "
+"touches it"
+msgstr ""
+"trong bản sao làm việc của '%s', CRLF được thay thế bằng LF lần tới Git tiếp "
+"xúc với nó"
+
+#, c-format
+msgid "LF would be replaced by CRLF in %s"
+msgstr "LF nên thay bằng CRLF trong %s"
+
+#, c-format
+msgid ""
+"in the working copy of '%s', LF will be replaced by CRLF the next time Git "
+"touches it"
+msgstr ""
+"trong bản sao làm việc của '%s', LF được thay thế bằng CRLF lần tới Git tiếp "
+"xúc với nó"
+
+#, c-format
+msgid "BOM is prohibited in '%s' if encoded as %s"
+msgstr "BOM bị cấm trong “%s” nếu được mã hóa là %s"
+
+#, c-format
+msgid ""
+"The file '%s' contains a byte order mark (BOM). Please use UTF-%.*s as "
+"working-tree-encoding."
+msgstr ""
+"Tập tin “%s” có chứa ký hiệu thứ tự byte (BOM). Vui lòng dùng UTF-%.*s như "
+"là bảng mã cây làm việc."
+
+#, c-format
+msgid "BOM is required in '%s' if encoded as %s"
+msgstr "BOM là bắt buộc trong “%s” nếu được mã hóa là %s"
+
+#, 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."
+msgstr ""
+"Tập tin “%s” còn thiếu ký hiệu thứ tự byte (BOM). Vui lòng dùng UTF-%sBE hay "
+"UTF-%sLE (còn phục thuộc vào thứ tự byte) như là bảng mã cây làm việc."
+
+#, c-format
+msgid "failed to encode '%s' from %s to %s"
+msgstr "gặp lỗi khi mã hóa “%s”  từ “%s” sang “%s”"
+
+#, c-format
+msgid "encoding '%s' from %s to %s and back is not the same"
+msgstr "mã hóa “%s” từ %s thành %s và ngược trở lại không phải là cùng"
+
+#, c-format
+msgid "cannot fork to run external filter '%s'"
+msgstr "không thể rẽ nhánh tiến trình để chạy bộ lọc bên ngoài “%s”"
+
+#, c-format
+msgid "cannot feed the input to external filter '%s'"
+msgstr "không thể cấp đầu vào cho bộ lọc bên ngoài “%s”"
+
+#, c-format
+msgid "external filter '%s' failed %d"
+msgstr "chạy bộ lọc bên ngoài “%s” gặp lỗi %d"
+
+#, c-format
+msgid "read from external filter '%s' failed"
+msgstr "đọc từ bộ lọc bên ngoài “%s” gặp lỗi"
+
+#, c-format
+msgid "external filter '%s' failed"
+msgstr "gặp lỗi khi chạy bộ lọc bên ngoài “%s”"
+
+msgid "unexpected filter type"
+msgstr "gặp kiểu bộ lọc thừa"
+
+msgid "path name too long for external filter"
+msgstr "tên đường dẫn quá dài cho bộ lọc bên ngoài"
+
+#, c-format
+msgid ""
+"external filter '%s' is not available anymore although not all paths have "
+"been filtered"
+msgstr ""
+"bộ lọc bên ngoài “%s” không sẵn sàng nữa mặc dù không phải tất cả các đường "
+"dẫn đã được lọc"
+
+msgid "true/false are no valid working-tree-encodings"
+msgstr "true/false là không phải bảng-mã-cây-làm-việc hợp lệ"
+
+#, c-format
+msgid "%s: clean filter '%s' failed"
+msgstr "%s: gặp lỗi khi xóa bộ lọc “%s”"
+
+#, c-format
+msgid "%s: smudge filter %s failed"
+msgstr "%s: smudge bộ lọc %s gặp lỗi"
+
+#, c-format
+msgid "skipping credential lookup for key: credential.%s"
+msgstr "bỏ qua tìm kiếm giấy chứng chực cho khóa: credential.%s"
+
+msgid "refusing to work with credential missing host field"
+msgstr "từ chối làm việc với giấy chứng thực thiếu trường máy chủ"
+
+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"
+
+#, 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"
+
+#, c-format
+msgid "url has no scheme: %s"
+msgstr "url không có lược đồ: %s"
+
+#, 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"
+
+msgid "in the future"
+msgstr "ở thời tương lai"
+
+#, c-format
+msgid "%<PRIuMAX> second ago"
+msgid_plural "%<PRIuMAX> seconds ago"
+msgstr[0] "%<PRIuMAX> giây trước"
+
+#, c-format
+msgid "%<PRIuMAX> minute ago"
+msgid_plural "%<PRIuMAX> minutes ago"
+msgstr[0] "%<PRIuMAX> phút trước"
+
+#, c-format
+msgid "%<PRIuMAX> hour ago"
+msgid_plural "%<PRIuMAX> hours ago"
+msgstr[0] "%<PRIuMAX> giờ trước"
+
+#, c-format
+msgid "%<PRIuMAX> day ago"
+msgid_plural "%<PRIuMAX> days ago"
+msgstr[0] "%<PRIuMAX> ngày trước"
+
+#, c-format
+msgid "%<PRIuMAX> week ago"
+msgid_plural "%<PRIuMAX> weeks ago"
+msgstr[0] "%<PRIuMAX> tuần trước"
+
+#, c-format
+msgid "%<PRIuMAX> month ago"
+msgid_plural "%<PRIuMAX> months ago"
+msgstr[0] "%<PRIuMAX> tháng trước"
+
+#, c-format
+msgid "%<PRIuMAX> year"
+msgid_plural "%<PRIuMAX> years"
+msgstr[0] "%<PRIuMAX> năm"
+
+#. TRANSLATORS: "%s" is "<n> years"
+#, c-format
+msgid "%s, %<PRIuMAX> month ago"
+msgid_plural "%s, %<PRIuMAX> months ago"
+msgstr[0] "%s, %<PRIuMAX> tháng trước"
+
+#, c-format
+msgid "%<PRIuMAX> year ago"
+msgid_plural "%<PRIuMAX> years ago"
+msgstr[0] "%<PRIuMAX> năm trước"
+
+msgid "Propagating island marks"
+msgstr "Đang lan truyền các đánh dấu island"
+
+#, c-format
+msgid "bad tree object %s"
+msgstr "đối tượng cây sai “%s”"
+
+#, c-format
+msgid "failed to load island regex for '%s': %s"
+msgstr "gặp lỗi khi tải biểu thức chính quy island cho “%s”: %s"
+
+#, c-format
+msgid "island regex from config has too many capture groups (max=%d)"
+msgstr ""
+"biểu thức chính quy island từ cấu hình có quá nhiều nhóm chụp (tối đa=%d)"
+
+#, c-format
+msgid "Marked %d islands, done.\n"
+msgstr "Đã đánh dấu %d island, xong.\n"
+
+msgid "--merge-base does not work with ranges"
+msgstr "--merge-base không hoạt động với phạm vi"
+
+msgid "--merge-base only works with commits"
+msgstr "--merge-base chỉ hoạt động với các lần chuyển giao"
+
+msgid "unable to get HEAD"
+msgstr "không thể lấy HEAD"
+
+msgid "no merge base found"
+msgstr "không tìm thấy cơ sở để hòa trộn"
+
+msgid "multiple merge bases found"
+msgstr "có nhiều cơ sở để hòa trộn"
+
+msgid "git diff --no-index [<options>] <path> <path>"
+msgstr "git diff --no-index [<các tùy chọn>] </đường/dẫn> </đường/dẫn>"
+
+msgid ""
+"Not a git repository. Use --no-index to compare two paths outside a working "
+"tree"
+msgstr ""
+"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"
+
+#, 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"
+
+#, c-format
+msgid "  Unknown dirstat parameter '%s'\n"
+msgstr "  Không hiểu đối số dirstat “%s”\n"
+
+msgid ""
+"color moved setting must be one of 'no', 'default', 'blocks', 'zebra', "
+"'dimmed-zebra', 'plain'"
+msgstr ""
+"cài đặt màu đã di chuyển phải là một trong “no”, “default”, “blocks”, "
+"“zebra”, “dimmed-zebra”, “plain”"
+
+#, 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 ""
+"không hiểu chế độ color-moved-ws “%s”, các giá trị có thể là “ignore-space-"
+"change”, “ignore-space-at-eol”, “ignore-all-space”, “allow-indentation-"
+"change”"
+
+msgid ""
+"color-moved-ws: allow-indentation-change cannot be combined with other "
+"whitespace modes"
+msgstr ""
+"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"
+
+#, 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”"
+
+#, c-format
+msgid ""
+"Found errors in 'diff.dirstat' config variable:\n"
+"%s"
+msgstr ""
+"Tìm thấy các lỗi trong biến cấu hình “diff.dirstat”:\n"
+"%s"
+
+#, 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"
+
+#, c-format
+msgid "options '%s', '%s', '%s', and '%s' cannot be used together"
+msgstr "tùy chọn '%s', '%s', '%s' và '%s' không thể dùng cùng nhau"
+
+#, c-format
+msgid "options '%s' and '%s' cannot be used together, use '%s' with '%s'"
+msgstr "tùy chọn '%s' và '%s' không thể dùng cùng nhau, dùng '%s' với '%s'"
+
+#, c-format
+msgid ""
+"options '%s' and '%s' cannot be used together, use '%s' with '%s' and '%s'"
+msgstr ""
+"tùy chọn '%s' và '%s' không thể dùng cùng nhau, dùng '%s' với '%s' và '%s'"
+
+msgid "--follow requires exactly one pathspec"
+msgstr "--follow cần chính xác một đặc tả đường dẫn"
+
+#, c-format
+msgid "invalid --stat value: %s"
+msgstr "giá trị --stat không hợp lệ: “%s”"
+
+#, c-format
+msgid "%s expects a numerical value"
+msgstr "tùy chọn “%s” cần một giá trị bằng số"
+
+#, c-format
+msgid ""
+"Failed to parse --dirstat/-X option parameter:\n"
+"%s"
+msgstr ""
+"Gặp lỗi khi phân tích đối số tùy chọn --dirstat/-X:\n"
+"%s"
+
+#, 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"
+
+#, c-format
+msgid "unknown value after ws-error-highlight=%.*s"
+msgstr "không hiểu giá trị sau ws-error-highlight=%.*s"
+
+#, c-format
+msgid "unable to resolve '%s'"
+msgstr "không thể phân giải “%s”"
+
+#, c-format
+msgid "%s expects <n>/<m> form"
+msgstr "%s cần dạng <n>/<m>"
+
+#, 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”"
+
+#, c-format
+msgid "bad --color-moved argument: %s"
+msgstr "đối số --color-moved sai: %s"
+
+#, c-format
+msgid "invalid mode '%s' in --color-moved-ws"
+msgstr "chế độ “%s” không hợp lệ trong --color-moved-ws"
+
+msgid ""
+"option diff-algorithm accepts \"myers\", \"minimal\", \"patience\" and "
+"\"histogram\""
+msgstr ""
+"tùy chọn  diff-algorithm chấp nhận \"myers\", \"minimal\", \"patience\" và "
+"\"histogram\""
+
+#, c-format
+msgid "invalid argument to %s"
+msgstr "tham số cho %s không hợp lệ"
+
+#, 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”"
+
+#, 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”"
+
+#, c-format
+msgid "bad --word-diff argument: %s"
+msgstr "đối số --word-diff sai: %s"
+
+msgid "Diff output format options"
+msgstr "Các tùy chọn định dạng khi xuất các khác biệt"
+
+msgid "generate patch"
+msgstr "tạo miếng vá"
+
+msgid "<n>"
+msgstr "<n>"
+
+msgid "generate diffs with <n> lines context"
+msgstr "tạo khác biệt với <n> dòng ngữ cảnh"
+
+msgid "generate the diff in raw format"
+msgstr "tạo khác biệt ở định dạng thô"
+
+msgid "synonym for '-p --raw'"
+msgstr "đồng nghĩa với “-p --raw”"
+
+msgid "synonym for '-p --stat'"
+msgstr "đồng nghĩa với “-p --stat”"
+
+msgid "machine friendly --stat"
+msgstr "--stat thuận tiện cho máy đọc"
+
+msgid "output only the last line of --stat"
+msgstr "chỉ xuất những dòng cuối của --stat"
+
+msgid "<param1,param2>..."
+msgstr "<tham_số_1,tham_số_2>…"
+
+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"
+
+msgid "synonym for --dirstat=cumulative"
+msgstr "đồng nghĩa với --dirstat=cumulative"
+
+msgid "synonym for --dirstat=files,param1,param2..."
+msgstr "đồng nghĩa với --dirstat=files,param1,param2…"
+
+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"
+
+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ế độ"
+
+msgid "show only names of changed files"
+msgstr "chỉ hiển thị tên của các tập tin đổi"
+
+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"
+
+msgid "<width>[,<name-width>[,<count>]]"
+msgstr "<rộng>[,<name-width>[,<số-lượng>]]"
+
+msgid "generate diffstat"
+msgstr "tạo diffstat"
+
+msgid "<width>"
+msgstr "<rộng>"
+
+msgid "generate diffstat with a given width"
+msgstr "tạo diffstat với độ rộng đã cho"
+
+msgid "generate diffstat with a given name width"
+msgstr "tạo diffstat với tên độ rộng đã cho"
+
+msgid "generate diffstat with a given graph width"
+msgstr "tạo diffstat với độ rộng đồ thị đã cho"
+
+msgid "<count>"
+msgstr "<số_lượng>"
+
+msgid "generate diffstat with limited lines"
+msgstr "tạo diffstat với các dòng bị giới hạn"
+
+msgid "generate compact summary in diffstat"
+msgstr "tạo tổng hợp xúc tích trong diffstat"
+
+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"
+
+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"
+"\""
+
+msgid "show colored diff"
+msgstr "hiển thị thay đổi được tô màu"
+
+msgid "<kind>"
+msgstr "<kiểu>"
+
+msgid ""
+"highlight whitespace errors in the 'context', 'old' or 'new' lines in the "
+"diff"
+msgstr ""
+"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"
+
+msgid ""
+"do not munge pathnames and use NULs as output field terminators in --raw or "
+"--numstat"
+msgstr ""
+"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"
+
+msgid "<prefix>"
+msgstr "<tiền_tố>"
+
+msgid "show the given source prefix instead of \"a/\""
+msgstr "hiển thị tiền tố nguồn đã cho thay cho \"a/\""
+
+msgid "show the given destination prefix instead of \"b/\""
+msgstr "hiển thị tiền tố đích đã cho thay cho \"b/\""
+
+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"
+
+msgid "do not show any source or destination prefix"
+msgstr "đừng hiển thị bất kỳ tiền tố nguồn hay đích"
+
+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"
+
+msgid "<char>"
+msgstr "<ký_tự>"
+
+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 “+”"
+
+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 “-”"
+
+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 “”"
+
+msgid "Diff rename options"
+msgstr "Tùy chọn khác biệt đổi tên"
+
+msgid "<n>[/<m>]"
+msgstr "<n>[/<m>]"
+
+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"
+
+msgid "detect renames"
+msgstr "dò tìm các tên thay đổi"
+
+msgid "omit the preimage for deletes"
+msgstr "bỏ qua preimage (tiền ảnh??) cho các việc xóa"
+
+msgid "detect copies"
+msgstr "dò bản sao"
+
+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"
+
+msgid "disable rename detection"
+msgstr "tắt dò tìm đổi tên"
+
+msgid "use empty blobs as rename source"
+msgstr "dùng các blob trống rống như là nguồn đổi tên"
+
+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"
+
+msgid ""
+"prevent rename/copy detection if the number of rename/copy targets exceeds "
+"given limit"
+msgstr ""
+"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"
+
+msgid "Diff algorithm options"
+msgstr "Tùy chọn thuật toán khác biệt"
+
+msgid "produce the smallest possible diff"
+msgstr "sản sinh khác biệt ít nhất có thể"
+
+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"
+
+msgid "ignore changes in amount of whitespace"
+msgstr "lờ đi sự thay đổi do số lượng khoảng trắng gây ra"
+
+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"
+
+msgid "ignore carrier-return at the end of line"
+msgstr "bỏ qua ký tự về đầu dòng tại cuối dòng"
+
+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"
+
+msgid "<regex>"
+msgstr "<regex>"
+
+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>"
+
+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"
+
+msgid "generate diff using the \"patience diff\" algorithm"
+msgstr "tạo khác biệt sử dung thuật toán \"patience diff\""
+
+msgid "generate diff using the \"histogram diff\" algorithm"
+msgstr "tạo khác biệt sử dung thuật toán \"histogram diff\""
+
+msgid "<algorithm>"
+msgstr "<thuật toán>"
+
+msgid "choose a diff algorithm"
+msgstr "chọn một thuật toán khác biệt"
+
+msgid "<text>"
+msgstr "<văn bản>"
+
+msgid "generate diff using the \"anchored diff\" algorithm"
+msgstr "tạo khác biệt sử dung thuật toán \"anchored diff\""
+
+msgid "<mode>"
+msgstr "<chế độ>"
+
+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"
+
+msgid "use <regex> to decide what a word is"
+msgstr "dùng <regex> để quyết định từ là cái gì"
+
+msgid "equivalent to --word-diff=color --word-diff-regex=<regex>"
+msgstr "tương đương với --word-diff=color --word-diff-regex=<regex>"
+
+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"
+
+msgid "how white spaces are ignored in --color-moved"
+msgstr "cách bỏ qua khoảng trắng trong --color-moved"
+
+msgid "Other diff options"
+msgstr "Các tùy chọn khác biệt khác"
+
+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"
+
+msgid "treat all files as text"
+msgstr "coi mọi tập tin là dạng văn bản thường"
+
+msgid "swap two inputs, reverse the diff"
+msgstr "tráo đổi hai đầu vào, đảo ngược khác biệt"
+
+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"
+
+msgid "disable all output of the program"
+msgstr "tắt mọi kết xuất của chương trình"
+
+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"
+
+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"
+
+msgid "<when>"
+msgstr "<khi>"
+
+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"
+
+msgid "<format>"
+msgstr "<định dạng>"
+
+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ị"
+
+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"
+
+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"
+
+msgid "<string>"
+msgstr "<chuỗi>"
+
+msgid ""
+"look for differences that change the number of occurrences of the specified "
+"string"
+msgstr ""
+"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"
+
+msgid ""
+"look for differences that change the number of occurrences of the specified "
+"regex"
+msgstr ""
+"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"
+
+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"
+
+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"
+
+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"
+
+msgid "<path>"
+msgstr "<đường-dẫn>"
+
+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"
+
+msgid "skip the output to the specified path"
+msgstr "bỏ qua đầu ra đến đường dẫn đã cho"
+
+msgid "<object-id>"
+msgstr "<mã-số-đối-tượng>"
+
+msgid ""
+"look for differences that change the number of occurrences of the specified "
+"object"
+msgstr ""
+"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"
+
+msgid "[(A|C|D|M|R|T|U|X|B)...[*]]"
+msgstr "[(A|C|D|M|R|T|U|X|B)…[*]]"
+
+msgid "select files by diff type"
+msgstr "chọn các tập tin theo kiểu khác biệt"
+
+msgid "<file>"
+msgstr "<tập_tin>"
+
+msgid "output to a specific file"
+msgstr "xuất ra một tập tin cụ thể"
+
+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."
+
+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."
+
+#, c-format
+msgid ""
+"you may want to set your %s variable to at least %d and retry the command."
+msgstr ""
+"bạn có lẽ muốn đặt biến %s của bạn thành ít nhất là %d và thử lại lệnh lần "
+"nữa."
+
+#, c-format
+msgid "failed to read orderfile '%s'"
+msgstr "gặp lỗi khi đọc tập-tin-thứ-tự “%s”"
+
+msgid "Performing inexact rename detection"
+msgstr "Đang thực hiện dò tìm đổi tên không chính xác"
+
+#, c-format
+msgid "No such path '%s' in the diff"
+msgstr "Không có đường dẫn %s trong diff"
+
+#, c-format
+msgid "pathspec '%s' did not match any file(s) known to git"
+msgstr "đặc tả đường dẫn “%s” không khớp với bất kỳ tập tin nào mà git biết"
+
+#, c-format
+msgid "unrecognized pattern: '%s'"
+msgstr "mẫu không được thừa nhận: “%s”"
+
+#, c-format
+msgid "unrecognized negative pattern: '%s'"
+msgstr "mẫu âm không được thừa nhận: “%s”"
+
+#, c-format
+msgid "your sparse-checkout file may have issues: pattern '%s' is repeated"
+msgstr "tập tin sparse-checkout của bạn có lẽ gặp lỗi: mẫu “%s” đã bị lặp lại"
+
+msgid "disabling cone pattern matching"
+msgstr "vô hiệu khớp mẫu nón"
+
+#, c-format
+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ừ"
+
+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"
+
+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"
+
+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"
+
+#, 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"
+
+#, c-format
+msgid "could not create directories for %s"
+msgstr "không thể tạo thư mục cho %s"
+
+#, 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”"
+
+#, 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"
+
+msgid "Filtering content"
+msgstr "Nội dung lọc"
+
+#, c-format
+msgid "could not stat file '%s'"
+msgstr "không thể lấy thống kê tập tin “%s”"
+
+#, c-format
+msgid "bad git namespace path \"%s\""
+msgstr "đường dẫn không gian tên git \"%s\" sai"
+
+#, c-format
+msgid "too many args to run %s"
+msgstr "quá nhiều tham số để chạy %s"
+
+msgid "git fetch-pack: expected shallow list"
+msgstr "git fetch-pack: cần danh sách shallow"
+
+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"
+
+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"
+
+#, 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”"
+
+msgid "unable to write to remote"
+msgstr "không thể ghi lên máy phục vụ"
+
+#, c-format
+msgid "invalid shallow line: %s"
+msgstr "dòng shallow không hợp lệ: %s"
+
+#, c-format
+msgid "invalid unshallow line: %s"
+msgstr "dòng unshallow không hợp lệ: %s"
+
+#, c-format
+msgid "object not found: %s"
+msgstr "không tìm thấy đối tượng: %s"
+
+#, c-format
+msgid "error in object: %s"
+msgstr "lỗi trong đối tượng: %s"
+
+#, c-format
+msgid "no shallow found: %s"
+msgstr "không tìm shallow nào: %s"
+
+#, c-format
+msgid "expected shallow/unshallow, got %s"
+msgstr "cần shallow/unshallow, nhưng lại nhận được %s"
+
+#, c-format
+msgid "got %s %d %s"
+msgstr "nhận %s %d - %s"
+
+#, c-format
+msgid "invalid commit %s"
+msgstr "lần chuyển giao %s không hợp lệ"
+
+msgid "giving up"
+msgstr "chịu thua"
+
+msgid "done"
+msgstr "xong"
+
+#, c-format
+msgid "got %s (%d) %s"
+msgstr "nhận %s (%d) %s"
+
+#, c-format
+msgid "Marking %s as complete"
+msgstr "Đánh dấu %s là đã hoàn thành"
+
+#, c-format
+msgid "already have %s (%s)"
+msgstr "đã sẵn có %s (%s)"
+
+msgid "fetch-pack: unable to fork off sideband demultiplexer"
+msgstr "fetch-pack: không thể rẽ nhánh sideband demultiplexer"
+
+msgid "protocol error: bad pack header"
+msgstr "lỗi giao thức: phần đầu gói bị sai"
+
+#, c-format
+msgid "fetch-pack: unable to fork off %s"
+msgstr "fetch-pack: không thể rẽ nhánh %s"
+
+msgid "fetch-pack: invalid index-pack output"
+msgstr "fetch-pack: kết xuất index-pack không hợp lệ"
+
+#, c-format
+msgid "%s failed"
+msgstr "%s gặp lỗi"
+
+msgid "error in sideband demultiplexer"
+msgstr "có lỗi trong sideband demultiplexer"
+
+#, c-format
+msgid "Server version is %.*s"
+msgstr "Phiên bản máy chủ là %.*s"
+
+#, c-format
+msgid "Server supports %s"
+msgstr "Máy chủ hỗ trợ %s"
+
+msgid "Server does not support shallow clients"
+msgstr "Máy chủ không hỗ trợ máy khách shallow"
+
+msgid "Server does not support --shallow-since"
+msgstr "Máy chủ không hỗ trợ --shallow-since"
+
+msgid "Server does not support --shallow-exclude"
+msgstr "Máy chủ không hỗ trợ --shallow-exclude"
+
+msgid "Server does not support --deepen"
+msgstr "Máy chủ không hỗ trợ --deepen"
+
+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"
+
+msgid "no common commits"
+msgstr "không có lần chuyển giao chung nào"
+
+msgid "git fetch-pack: fetch failed."
+msgstr "git fetch-pack: fetch gặp lỗi."
+
+#, 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"
+
+#, c-format
+msgid "the server does not support algorithm '%s'"
+msgstr "máy chủ không hỗ trợ thuật toán “%s”"
+
+msgid "Server does not support shallow requests"
+msgstr "Máy chủ không hỗ trợ yêu cầu shallow"
+
+msgid "Server supports filter"
+msgstr "Máy chủ hỗ trợ bộ lọc"
+
+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ụ"
+
+#, c-format
+msgid "expected '%s', received '%s'"
+msgstr "cần “%s”, nhưng lại nhận “%s”"
+
+#, c-format
+msgid "expected '%s'"
+msgstr "cần “%s”"
+
+#, c-format
+msgid "unexpected acknowledgment line: '%s'"
+msgstr "gặp dòng không được thừa nhận: “%s”"
+
+#, c-format
+msgid "error processing acks: %d"
+msgstr "gặp lỗi khi xử lý tín hiệu trả lời: %d"
+
+#. TRANSLATORS: The parameter will be 'ready', a protocol
+#. keyword.
+#.
+#, c-format
+msgid "expected packfile to be sent after '%s'"
+msgstr "cần tập tin gói để gửi sau “%s”"
+
+#. TRANSLATORS: The parameter will be 'ready', a protocol
+#. keyword.
+#.
+#, c-format
+msgid "expected no other sections to be sent after no '%s'"
+msgstr "không cần thêm phần nào để gửi sau không “%s”"
+
+#, c-format
+msgid "error processing shallow info: %d"
+msgstr "lỗi xử lý thông tin shallow: %d"
+
+#, c-format
+msgid "expected wanted-ref, got '%s'"
+msgstr "cần wanted-ref, nhưng lại nhận được “%s”"
+
+#, c-format
+msgid "unexpected wanted-ref: '%s'"
+msgstr "wanted-ref không được mong đợi: “%s”"
+
+#, c-format
+msgid "error processing wanted refs: %d"
+msgstr "lỗi khi xử lý wanted refs: %d"
+
+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"
+
+msgid "no matching remote head"
+msgstr "không khớp phần đầu máy chủ"
+
+msgid "unexpected 'ready' from remote"
+msgstr "gặp “ready” đột xuất từ máy chủ"
+
+#, c-format
+msgid "no such remote ref %s"
+msgstr "không có máy chủ tham chiếu nào như %s"
+
+#, 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"
+
+#, c-format
+msgid "fsmonitor_ipc__send_query: invalid path '%s'"
+msgstr "fsmonitor_ipc__send_query: đường dẫn không hợp lệ '%s'"
+
+#, c-format
+msgid "fsmonitor_ipc__send_query: unspecified error on '%s'"
+msgstr "fsmonitor_ipc__send_query: lỗi chưa rõ trên '%s'"
+
+msgid "fsmonitor--daemon is not running"
+msgstr "fsmonitor--daemon hiện tại chưa chạy"
+
+#, c-format
+msgid "could not send '%s' command to fsmonitor--daemon"
+msgstr "không thể gửi lệnh '%s' đến fsmonitor--daemon"
+
+#, c-format
+msgid "bare repository '%s' is incompatible with fsmonitor"
+msgstr "kho thuần '%s' là không tương thích với fsmonitor"
+
+#, c-format
+msgid "repository '%s' is incompatible with fsmonitor due to errors"
+msgstr "kho '%s' là không tương thích với fsmonitor bởi vì có lỗi"
+
+#, c-format
+msgid "remote repository '%s' is incompatible with fsmonitor"
+msgstr "kho trên mạng '%s' là không tương thích với fsmonitor"
+
+#, c-format
+msgid "virtual repository '%s' is incompatible with fsmonitor"
+msgstr "kho ảo '%s' là không tương thích với fsmonitor"
+
+#, c-format
+msgid ""
+"repository '%s' is incompatible with fsmonitor due to lack of Unix sockets"
+msgstr "kho '%s' là không tương thích với fsmonitor bởi vì thiếu Unix sockets"
+
+msgid ""
+"git [-v | --version] [-h | --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"
+"           [--git-dir=<path>] [--work-tree=<path>] [--namespace=<name>]\n"
+"           [--super-prefix=<path>] [--config-env=<name>=<envvar>]\n"
+"           <command> [<args>]"
+msgstr ""
+"git [--version] [-h | --help] [-C </đường/dẫn/>] [-c <tên>=<giá trị>]\n"
+"           [--exec-path[=</đường/dẫn/>]] [--html-path] [--man-path] [--info-"
+"path]\n"
+"           [-p | --paginate | -P --no-pager] [--no-replace-objects] [--"
+"bare]\n"
+"           [--git-dir=</đường/dẫn/>] [--work-tree=</đường/dẫn/>] [--"
+"namespace=<tên>]\n"
+"           [--super-prefix=</đường/dẫn/>] [--config-env=<tên>=<envvar>]\n"
+"           <lệnh> [<các tham số>]"
+
+msgid ""
+"'git help -a' and 'git help -g' list available subcommands and some\n"
+"concept guides. See 'git help <command>' or 'git help <concept>'\n"
+"to read about a specific subcommand or concept.\n"
+"See 'git help git' for an overview of the system."
+msgstr ""
+"“git help -a” và “git help -g” liệt kê các câu lệnh con sẵn có và một số\n"
+"hướng dẫn về khái niệm. Xem “git help <lệnh>” hay “git help <khái-niệm>”\n"
+"để xem các đặc tả cho lệnh hay khái niệm cụ thể.\n"
+"Xem “git help git” để biết tổng quan của hệ thống."
+
+#, c-format
+msgid "unsupported command listing type '%s'"
+msgstr "không hỗ trợ liệt kê lệnh kiểu “%s”"
+
+#, c-format
+msgid "no directory given for '%s' option\n"
+msgstr "không đưa ra thư mục cho tùy chọn '%s'\n"
+
+#, c-format
+msgid "no namespace given for --namespace\n"
+msgstr "chưa đưa ra không gian làm việc cho --namespace\n"
+
+#, c-format
+msgid "no prefix given for --super-prefix\n"
+msgstr "chưa đưa ra tiền tố cho --super-prefix\n"
+
+#, c-format
+msgid "-c expects a configuration string\n"
+msgstr "-c cần một chuỗi cấu hình\n"
+
+#, c-format
+msgid "no config key given for --config-env\n"
+msgstr "không đưa ra khóa cấu hình cho --config-env\n"
+
+#, c-format
+msgid "unknown option: %s\n"
+msgstr "không hiểu tùy chọn: %s\n"
+
+#, c-format
+msgid "while expanding alias '%s': '%s'"
+msgstr "trong khi triển khai bí danh “%s”: “%s”"
+
+#, c-format
+msgid ""
+"alias '%s' changes environment variables.\n"
+"You can use '!git' in the alias to do this"
+msgstr ""
+"bí danh “%s” thay đổi biến môi trường.\n"
+"Bạn có thể sử dụng “!git” trong đặt bí danh để làm việc này"
+
+#, c-format
+msgid "empty alias for %s"
+msgstr "làm trống bí danh cho %s"
+
+#, c-format
+msgid "recursive alias: %s"
+msgstr "đệ quy các bí danh: %s"
+
+msgid "write failure on standard output"
+msgstr "lỗi ghi nghiêm trong trên đầu ra tiêu chuẩn"
+
+msgid "unknown write failure on standard output"
+msgstr "lỗi nghiêm trọng chưa biết khi ghi ra đầu ra tiêu chuẩn"
+
+msgid "close failed on standard output"
+msgstr "gặp lỗi khi đóng đầu ra tiêu chuẩn"
+
+#, 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"
+
+#, c-format
+msgid "cannot handle %s as a builtin"
+msgstr "không thể xử lý %s như là một phần bổ sung"
+
+#, c-format
+msgid ""
+"usage: %s\n"
+"\n"
+msgstr ""
+"cách dùng: %s\n"
+"\n"
+
+#, 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"
+
+#, c-format
+msgid "failed to run command '%s': %s\n"
+msgstr "gặp lỗi khi chạy lệnh “%s”: %s\n"
+
+msgid "could not create temporary file"
+msgstr "không thể tạo tập tin tạm thời"
+
+#, c-format
+msgid "failed writing detached signature to '%s'"
+msgstr "gặp lỗi khi ghi chữ ký đính kèm vào “%s”"
+
+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"
+
+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+)"
+
+#, 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"
+
+#, c-format
+msgid "bad/incompatible signature '%s'"
+msgstr "chữ sai / không tương thích “%s”"
+
+#, 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”"
+
+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"
+
+#, 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"
+
+#, c-format
+msgid "gpg.ssh.defaultKeyCommand failed: %s %s"
+msgstr "gpg.ssh.defaultKeyCommand gặp lỗi: %s %s"
+
+msgid "gpg failed to sign the data"
+msgstr "gpg gặp lỗi khi ký dữ liệu"
+
+msgid "user.signingKey needs to be set for ssh signing"
+msgstr "user.signingKey cần được đặt cho ký ssh"
+
+#, 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”"
+
+#, 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”"
+
+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+)"
+
+#, 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”"
+
+#, c-format
+msgid "ignored invalid color '%.*s' in log.graphColors"
+msgstr "bỏ qua màu không hợp lệ “%.*s” trong log.graphColors"
+
+msgid ""
+"given pattern contains NULL byte (via -f <file>). This is only supported "
+"with -P under PCRE v2"
+msgstr ""
+"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"
+
+#, c-format
+msgid "'%s': unable to read %s"
+msgstr "“%s”: không thể đọc %s"
+
+#, c-format
+msgid "'%s': short read"
+msgstr "“%s”: đọc ngắn"
+
+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)"
+
+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)"
+
+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)"
+
+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"
+
+msgid "collaborate (see also: git help workflows)"
+msgstr "làm việc nhóm (xem thêm: git help workflows)"
+
+msgid "Main Porcelain Commands"
+msgstr "Các lệnh Porcelain chính"
+
+msgid "Ancillary Commands / Manipulators"
+msgstr "Lệnh/thao tác thứ cấp"
+
+msgid "Ancillary Commands / Interrogators"
+msgstr "Lệnh/bộ hỏi thứ cấp"
+
+msgid "Interacting with Others"
+msgstr "Tương tác với những cái khác"
+
+msgid "Low-level Commands / Manipulators"
+msgstr "Lệnh/thao tác ở mức thấp"
+
+msgid "Low-level Commands / Interrogators"
+msgstr "Lệnh/bộ hỏi ở mức thấp"
+
+msgid "Low-level Commands / Syncing Repositories"
+msgstr "Lệnh/Đồng bộ kho ở mức thấp"
+
+msgid "Low-level Commands / Internal Helpers"
+msgstr "Lệnh/Hỗ trợ nội tại ở mức thấp"
+
+#, c-format
+msgid "available git commands in '%s'"
+msgstr "các lệnh git sẵn có trong thư mục “%s”:"
+
+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"
+
+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:"
+
+msgid "The Git concept guides are:"
+msgstr "Các chỉ dẫn khái niệm về Git là:"
+
+msgid "External commands"
+msgstr "Các lệnh bên ngoài"
+
+msgid "Command aliases"
+msgstr "Các bí danh lệnh"
+
+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"
+
+#, c-format
+msgid ""
+"'%s' appears to be a git command, but we were not\n"
+"able to execute it. Maybe git-%s is broken?"
+msgstr ""
+"“%s” 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?"
+
+#, 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”."
+
+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ả."
+
+#, 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."
+
+#, c-format
+msgid "Continuing under the assumption that you meant '%s'."
+msgstr "Tiếp tục và coi rằng ý bạn là “%s”."
+
+#, c-format
+msgid "Run '%s' instead [y/N]? "
+msgstr "Chạy “%s” để thay thế? (y/N)? "
+
+#, 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”."
+
+msgid ""
+"\n"
+"The most similar command is"
+msgid_plural ""
+"\n"
+"The most similar commands are"
+msgstr[0] ""
+"\n"
+"Những lệnh giống nhất là"
+
+msgid "git version [<options>]"
+msgstr "git version [<các tùy chọn>]"
+
+#, c-format
+msgid "%s: %s - %s"
+msgstr "%s: %s - %s"
+
+msgid ""
+"\n"
+"Did you mean this?"
+msgid_plural ""
+"\n"
+"Did you mean one of these?"
+msgstr[0] ""
+"\n"
+"Có phải ý bạn là một trong số những cái này không?"
+
+#, 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“."
+
+#, c-format
+msgid "Couldn't start hook '%s'\n"
+msgstr "Không thể khởi chạy móc “%s”\n"
+
+#, c-format
+msgid "argument to --packfile must be a valid hash (got '%s')"
+msgstr "tham số cho --packfile phải là một giá trị băm hợp lệ (nhận được “%s”)"
+
+msgid "not a git repository"
+msgstr "không phải là kho git"
+
+#, 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"
+
+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"
+
+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"
+
+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"
+
+#, 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:"
+
+#, 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"
+
+#, 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"
+
+#, c-format
+msgid ""
+"unable to update url base from redirection:\n"
+"  asked for: %s\n"
+"   redirect: %s"
+msgstr ""
+"không thể cập nhật dựa trên cơ sở url từ chuyển hướng:\n"
+"      hỏi cho: %s\n"
+" chuyển hướng: %s"
+
+msgid "Author identity unknown\n"
+msgstr "Chưa biết định danh tác giả\n"
+
+msgid "Committer identity unknown\n"
+msgstr "Chưa biết định danh người chuyển giao\n"
+
+msgid ""
+"\n"
+"*** Please tell me who you are.\n"
+"\n"
+"Run\n"
+"\n"
+"  git config --global user.email \"you@example.com\"\n"
+"  git config --global user.name \"Your Name\"\n"
+"\n"
+"to set your account's default identity.\n"
+"Omit --global to set the identity only in this repository.\n"
+"\n"
+msgstr ""
+"\n"
+"*** Vui lòng cho biết bạn là ai.\n"
+"\n"
+"Chạy\n"
+"\n"
+"  git config --global user.email \"bạn@ví_dụ.com\"\n"
+"  git config --global user.name \"Tên Của Bạn\"\n"
+"\n"
+"để đặt định danh mặc định cho tài khoản của bạn.\n"
+"Bỏ tùy chọn --global nếu chỉ định danh riêng cho kho này.\n"
+"\n"
+
+msgid "no email was given and auto-detection is disabled"
+msgstr "không đưa ra địa chỉ thư điện tử và auto-detection bị tắt"
+
+#, c-format
+msgid "unable to auto-detect email address (got '%s')"
+msgstr "không thể tự dò tìm địa chỉ thư điện tử (nhận “%s”)"
+
+msgid "no name was given and auto-detection is disabled"
+msgstr "chưa chỉ ra tên và tự-động-dò-tìm bị tắt"
+
+#, c-format
+msgid "unable to auto-detect name (got '%s')"
+msgstr "không thể dò-tìm-tự động tên (đã nhận “%s”)"
+
+#, c-format
+msgid "empty ident name (for <%s>) not allowed"
+msgstr "không cho phép tên định danh là rỗng (cho <%s>)"
+
+#, c-format
+msgid "name consists only of disallowed characters: %s"
+msgstr "tên chỉ được phép bao gồm các ký tự sau: %s"
+
+msgid "expected 'tree:<depth>'"
+msgstr "cần “tree:<depth>”"
+
+msgid "sparse:path filters support has been dropped"
+msgstr "việc hỗ trợ bộ lọc sparse:đường/dẫn đã bị bỏ"
+
+#, c-format
+msgid "'%s' for 'object:type=<type>' is not a valid object type"
+msgstr "“%s” dành cho “object:type=<type>” không phải là kiểu đối tượng hợp lệ"
+
+#, c-format
+msgid "invalid filter-spec '%s'"
+msgstr "đặc tả bộ lọc không hợp lệ “%s”"
+
+#, c-format
+msgid "must escape char in sub-filter-spec: '%c'"
+msgstr "phải thoát char trong sub-filter-spec: “%c”"
+
+msgid "expected something after combine:"
+msgstr "mong đợi một cái gì đó sau khi kết hợp:"
+
+msgid "multiple filter-specs cannot be combined"
+msgstr "không thể tổ hợp nhiều đặc tả kiểu lọc"
+
+msgid "unable to upgrade repository format to support partial clone"
+msgstr "không thể nâng cấp định định dạng kho chứa để hỗ trợ nhân bản cục bộ"
+
+msgid "args"
+msgstr "các_tham_số"
+
+msgid "object filtering"
+msgstr "lọc đối tượng"
+
+#, c-format
+msgid "unable to access sparse blob in '%s'"
+msgstr "không thể truy cập các blob rải rác trong “%s”"
+
+#, c-format
+msgid "unable to parse sparse filter data in %s"
+msgstr "không thể phân tích dữ liệu bộ lọc rải rác trong %s"
+
+#, c-format
+msgid "entry '%s' in tree %s has tree mode, but is not a tree"
+msgstr "mục “%s” trong cây %s có nút cây, nhưng không phải là một cây"
+
+#, c-format
+msgid "entry '%s' in tree %s has blob mode, but is not a blob"
+msgstr "mục “%s” trong cây %s có nút blob, nhưng không phải là một blob"
+
+#, c-format
+msgid "unable to load root tree for commit %s"
+msgstr "không thể tải cây gốc cho lần chuyển giao “%s”"
+
+#, c-format
+msgid ""
+"Unable to create '%s.lock': %s.\n"
+"\n"
+"Another git process seems to be running in this repository, e.g.\n"
+"an editor opened by 'git commit'. Please make sure all processes\n"
+"are terminated then try again. If it still fails, a git process\n"
+"may have crashed in this repository earlier:\n"
+"remove the file manually to continue."
+msgstr ""
+"Không thể tạo “%s.lock”: %s.\n"
+"\n"
+"Tiến trình git khác có lẽ đang chạy ở kho này, ví dụ\n"
+"một trình soạn thảo được mở bởi “git commit”. Vui lòng chắc chắn\n"
+"rằng mọi tiến trình đã chấm dứt và sau đó thử lại. Nếu vẫn lỗi,\n"
+"một tiến trình git có lẽ đã đổ vỡ khi thực hiện ở kho này trước đó:\n"
+"gõ bỏ tập tin một cách thủ công để tiếp tục."
+
+#, c-format
+msgid "Unable to create '%s.lock': %s"
+msgstr "Không thể tạo “%s.lock”: %s"
+
+#, c-format
+msgid "unexpected line: '%s'"
+msgstr "dòng không cần: “%s”"
+
+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)"
+
+msgid "quoted CRLF detected"
+msgstr "phát hiện CRLF được trích dẫn"
+
+#, c-format
+msgid ""
+"Your local changes to the following files would be overwritten by merge:\n"
+"  %s"
+msgstr ""
+"Các thay đổi nội bộ của bạn với các tập tin sau đây sẽ bị ghi đè bởi lệnh "
+"hòa trộn:\n"
+"  %s"
+
+#, 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)"
+
+#, 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)"
+
+#, 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)"
+
+#, c-format
+msgid "Note: Fast-forwarding submodule %s to %s"
+msgstr "Chú ý: Chuyển-tiếp-nhanh mô-đun-con “%s” sang “%s”"
+
+#, c-format
+msgid "Failed to merge submodule %s"
+msgstr "Gặp lỗi khi hòa trộn mô-đun-con “%s”"
+
+#, c-format
+msgid ""
+"Failed to merge submodule %s, but a possible merge resolution exists:\n"
+"%s\n"
+msgstr ""
+"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"
+
+#, c-format
+msgid ""
+"If this is correct simply add it to the index for example\n"
+"by using:\n"
+"\n"
+"  git update-index --cacheinfo 160000 %s \"%s\"\n"
+"\n"
+"which will accept this suggestion.\n"
+msgstr ""
+"Nếu đây là đúng đơn giản thêm nó vào mục lục ví dụ\n"
+"bằng cách dùng:\n"
+"\n"
+"  git update-index --cacheinfo 160000 %s \"%s\"\n"
+"\n"
+"cái mà sẽ chấp nhận gợi ý này.\n"
+
+#, c-format
+msgid ""
+"Failed to merge submodule %s, but multiple possible merges exist:\n"
+"%s"
+msgstr ""
+"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"
+
+msgid "Failed to execute internal merge"
+msgstr "Gặp lỗi khi thực hiện trộn nội bộ"
+
+#, c-format
+msgid "Unable to add %s to database"
+msgstr "Không thể thêm %s vào cơ sở dữ liệu"
+
+#, c-format
+msgid "Auto-merging %s"
+msgstr "Tự-động-hòa-trộn %s"
+
+#, 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 ""
+"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."
+
+#, 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 ""
+"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"
+
+#, c-format
+msgid ""
+"CONFLICT (directory rename split): Unclear where to rename %s to; it was "
+"renamed to multiple other directories, with no destination getting a "
+"majority of the files."
+msgstr ""
+"XUNG ĐỘT: (thư mục đổi tên chia tách): Không rõ ràng nơi để đổi tên %s "
+"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."
+
+#, c-format
+msgid ""
+"WARNING: Avoiding applying %s -> %s rename to %s, because %s itself was "
+"renamed."
+msgstr ""
+"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."
+
+#, c-format
+msgid ""
+"Path updated: %s added in %s inside a directory that was renamed in %s; "
+"moving it to %s."
+msgstr ""
+"Đườ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."
+
+#, c-format
+msgid ""
+"Path updated: %s renamed to %s in %s, inside a directory that was renamed in "
+"%s; moving it to %s."
+msgstr ""
+"Đườ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."
+
+#, 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 ""
+"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."
+
+#, 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 ""
+"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."
+
+#, 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."
+
+#, 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."
+msgstr ""
+"XUNG ĐỘT (đổi tên liên quan đến va chạm): đổi tên %s -> %s xung đột nội dung "
+"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."
+
+#, 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."
+
+#, c-format
+msgid "cannot read object %s"
+msgstr "không thể đọc đối tượng %s"
+
+#, c-format
+msgid "object %s is not a blob"
+msgstr "đối tượng %s không phải là một blob"
+
+#, c-format
+msgid ""
+"CONFLICT (file/directory): directory in the way of %s from %s; moving it to "
+"%s instead."
+msgstr ""
+"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."
+
+#, c-format
+msgid ""
+"CONFLICT (distinct types): %s had different types on each side; renamed both "
+"of them so each can be recorded somewhere."
+msgstr ""
+"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 đó."
+
+#, c-format
+msgid ""
+"CONFLICT (distinct types): %s had different types on each side; renamed one "
+"of them so each can be recorded somewhere."
+msgstr ""
+"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 đó."
+
+msgid "content"
+msgstr "nội dung"
+
+msgid "add/add"
+msgstr "thêm/thêm"
+
+msgid "submodule"
+msgstr "mô-đun-con"
+
+#, c-format
+msgid "CONFLICT (%s): Merge conflict in %s"
+msgstr "XUNG ĐỘT (%s): Xung đột hòa trộn trong %s"
+
+#, c-format
+msgid ""
+"CONFLICT (modify/delete): %s deleted in %s and modified in %s.  Version %s "
+"of %s left in tree."
+msgstr ""
+"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)."
+
+#, c-format
+msgid ""
+"Note: %s not up to date and in way of checking out conflicted version; old "
+"copy renamed to %s"
+msgstr ""
+"Lưu ý: %s không được cập nhật và theo cách lấy ra phiên bản xung đột; bản "
+"sao cũ được đổi tên thành %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.
+#.
+#, 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"
+
+msgid "(bad commit)\n"
+msgstr "(commit sai)\n"
+
+#, 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ỏ."
+
+#, 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ỏ."
+
+#, c-format
+msgid "failed to create path '%s'%s"
+msgstr "gặp lỗi khi tạo đường dẫn “%s”%s"
+
+#, 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"
+
+msgid ": perhaps a D/F conflict?"
+msgstr ": có lẽ là một xung đột D/F?"
+
+#, 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”"
+
+#, c-format
+msgid "blob expected for %s '%s'"
+msgstr "mong đợi đối tượng blob cho %s “%s”"
+
+#, c-format
+msgid "failed to open '%s': %s"
+msgstr "gặp lỗi khi mở “%s”: %s"
+
+#, 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"
+
+#, 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”"
+
+#, 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:"
+
+#, c-format
+msgid "Fast-forwarding submodule %s"
+msgstr "Chuyển-tiếp-nhanh mô-đun-con “%s”"
+
+#, 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)"
+
+#, 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)"
+
+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"
+
+#, 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)"
+
+#, 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."
+
+#, c-format
+msgid ""
+"CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s left "
+"in tree."
+msgstr ""
+"XUNG ĐỘT (%s/xóa): %s bị xóa trong %s và %s trong %s. Phiên bản %s của %s "
+"còn lại trong cây (tree)."
+
+#, c-format
+msgid ""
+"CONFLICT (%s/delete): %s deleted in %s and %s to %s in %s. Version %s of %s "
+"left in tree."
+msgstr ""
+"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)."
+
+#, c-format
+msgid ""
+"CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s left "
+"in tree at %s."
+msgstr ""
+"XUNG ĐỘT (%s/xóa): %s bị xóa trong %s và %s trong %s. Phiên bản %s của %s "
+"còn lại trong cây (tree) tại %s."
+
+#, 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 ""
+"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."
+
+msgid "rename"
+msgstr "đổi tên"
+
+msgid "renamed"
+msgstr "đã đổi tên"
+
+#, 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”"
+
+#, 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."
+
+#, 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"
+
+#, 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"
+
+#, 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"
+
+#, c-format
+msgid ""
+"CONFLICT (rename/rename): Rename \"%s\"->\"%s\" in branch \"%s\" rename \"%s"
+"\"->\"%s\" in \"%s\"%s"
+msgstr ""
+"XUNG ĐỘT (đổi-tên/đổi-tên): Đổi tên \"%s\"->\"%s\" trong nhánh \"%s\" đổi "
+"tên \"%s\"->\"%s\" trong \"%s\"%s"
+
+msgid " (left unresolved)"
+msgstr " (cần giải quyết)"
+
+#, 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"
+
+#, c-format
+msgid ""
+"CONFLICT (directory rename split): Unclear where to place %s because "
+"directory %s was renamed to multiple other directories, with no destination "
+"getting a majority of the files."
+msgstr ""
+"XUNG ĐỘT: (thư mục đổi tên chia tách): Không rõ ràng để đặt địa điểm %s bởi "
+"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."
+
+#, c-format
+msgid ""
+"CONFLICT (rename/rename): Rename directory %s->%s in %s. Rename directory %s-"
+">%s in %s"
+msgstr ""
+"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"
+
+msgid "modify"
+msgstr "sửa đổi"
+
+msgid "modified"
+msgstr "đã sửa"
+
+#, c-format
+msgid "Skipped %s (merged same as existing)"
+msgstr "Đã bỏ qua %s (đã có sẵn lần hòa trộn này)"
+
+#, c-format
+msgid "Adding as %s instead"
+msgstr "Thay vào đó thêm vào %s"
+
+#, c-format
+msgid "Removing %s"
+msgstr "Đang xóa %s"
+
+msgid "file/directory"
+msgstr "tập-tin/thư-mục"
+
+msgid "directory/file"
+msgstr "thư-mục/tập-tin"
+
+#, 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"
+
+#, c-format
+msgid "Adding %s"
+msgstr "Thêm \"%s\""
+
+#, 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"
+
+#, 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"
+
+msgid "Merging:"
+msgstr "Đang trộn:"
+
+#, c-format
+msgid "found %u common ancestor:"
+msgid_plural "found %u common ancestors:"
+msgstr[0] "tìm thấy %u tổ tiên chung:"
+
+msgid "merge returned no commit"
+msgstr "hòa trộn không trả về lần chuyển giao nào"
+
+#, c-format
+msgid "Could not parse object '%s'"
+msgstr "Không thể phân tích đối tượng “%s”"
+
+msgid "failed to read the cache"
+msgstr "gặp lỗi khi đọc bộ nhớ đệm"
+
+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"
+
+#, c-format
+msgid "multi-pack-index file %s is too small"
+msgstr "tập tin đồ thị multi-pack-index %s quá nhỏ"
+
+#, 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"
+
+#, 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"
+
+#, 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"
+
+msgid "multi-pack-index missing required pack-name chunk"
+msgstr "multi-pack-index thiếu mảnh pack-name cần thiết"
+
+msgid "multi-pack-index missing required OID fanout chunk"
+msgstr "multi-pack-index thiếu mảnh OID fanout cần thiết"
+
+msgid "multi-pack-index missing required OID lookup chunk"
+msgstr "multi-pack-index thiếu mảnh OID lookup cần thiết"
+
+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"
+
+#, 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”"
+
+#, c-format
+msgid "bad pack-int-id: %u (%u total packs)"
+msgstr "pack-int-id sai: %u (%u các gói tổng)"
+
+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ỏ"
+
+#, c-format
+msgid "failed to add packfile '%s'"
+msgstr "gặp lỗi khi thêm tập tin gói “%s”"
+
+#, c-format
+msgid "failed to open pack-index '%s'"
+msgstr "gặp lỗi khi mở pack-index “%s”"
+
+#, 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"
+
+msgid "cannot store reverse index file"
+msgstr "không thể lưu trữ tập tin ghi mục lục đảo ngược"
+
+#, c-format
+msgid "could not parse line: %s"
+msgstr "không thể phân tích cú pháp dòng: %s"
+
+#, c-format
+msgid "malformed line: %s"
+msgstr "dòng dị hình: %s"
+
+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"
+
+msgid "could not load pack"
+msgstr "không thể tải gói"
+
+#, c-format
+msgid "could not open index for %s"
+msgstr "không thể mở mục lục cho %s"
+
+msgid "Adding packfiles to multi-pack-index"
+msgstr "Đang thêm tập tin gói từ multi-pack-index"
+
+#, c-format
+msgid "unknown preferred pack: '%s'"
+msgstr "không hiểu \"preferred pack\": %s"
+
+#, 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"
+
+#, 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"
+
+#, c-format
+msgid "preferred pack '%s' is expired"
+msgstr "\"preferred pack\" “%s” đã hết hạn"
+
+msgid "no pack files to index."
+msgstr "không có tập tin gói để đánh mục lục."
+
+msgid "refusing to write multi-pack .bitmap without any objects"
+msgstr "từ chối ghi “multi-pack bitmap” mà không có bất kỳ đối tượng nào"
+
+msgid "could not write multi-pack bitmap"
+msgstr "không thể ghi “multi-pack bitmap”"
+
+msgid "could not write multi-pack-index"
+msgstr "không thể ghi “multi-pack-index”"
+
+#, 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"
+
+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"
+
+msgid "incorrect checksum"
+msgstr "tổng kiểm không đúng"
+
+msgid "Looking for referenced packfiles"
+msgstr "Đang khóa cho các gói bị tham chiếu"
+
+#, 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]"
+
+msgid "the midx contains no oid"
+msgstr "midx chẳng chứa oid nào"
+
+msgid "Verifying OID order in multi-pack-index"
+msgstr "Thẩm tra thứ tự OID trong multi-pack-index"
+
+#, 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]"
+
+msgid "Sorting objects by packfile"
+msgstr "Đang sắp xếp các đối tượng theo tập tin gói"
+
+msgid "Verifying object offsets"
+msgstr "Đang thẩm tra các khoảng bù đối tượng"
+
+#, 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"
+
+#, 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"
+
+#, 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>"
+
+msgid "Counting referenced objects"
+msgstr "Đang đếm các đối tượng được tham chiếu"
+
+msgid "Finding and deleting unreferenced packfiles"
+msgstr "Đang tìm và xóa các gói không được tham chiếu"
+
+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"
+
+msgid "could not finish pack-objects"
+msgstr "không thể hoàn thiện các đối tượng gói"
+
+#, c-format
+msgid "unable to create lazy_dir thread: %s"
+msgstr "không thể tạo tuyến lazy_dir: %s"
+
+#, c-format
+msgid "unable to create lazy_name thread: %s"
+msgstr "không thể tạo tuyến lazy_name: %s"
+
+#, c-format
+msgid "unable to join lazy_name thread: %s"
+msgstr "không thể gia nhập tuyến lazy_name: %s"
+
+#, 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."
+msgstr ""
+"Bạn đã chưa hoàn tất hòa trộn ghi chú trước đây (%s vẫn còn).\n"
+"Vui lòng dùng “git notes merge --commit” hay “git notes merge --abort” để "
+"chuyển giao hay bãi bỏ lần hòa trộn trước đây và bắt đầu một hòa trộn ghi "
+"chú mới."
+
+#, c-format
+msgid "You have not concluded your notes merge (%s exists)."
+msgstr "Bạn chưa kết thúc việc hòa trộn ghi chú (%s vẫn tồn tại)."
+
+msgid "Cannot commit uninitialized/unreferenced notes tree"
+msgstr ""
+"Không thể chuyển giao cây ghi chú chưa được khởi tạo hoặc không được tham "
+"chiếu"
+
+#, c-format
+msgid "Bad notes.rewriteMode value: '%s'"
+msgstr "Giá trị notes.rewriteMode sai: “%s”"
+
+#, c-format
+msgid "Refusing to rewrite notes in %s (outside of refs/notes/)"
+msgstr "Từ chối ghi đè ghi chú trong %s (nằm ngoài refs/notes/)"
+
+#. TRANSLATORS: The first %s is the name of
+#. the environment variable, the second %s is
+#. its value.
+#.
+#, c-format
+msgid "Bad %s value: '%s'"
+msgstr "Giá trị %s sai: “%s”"
+
+#, 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"
+
+#, 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”"
+
+#, 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"
+
+#, c-format
+msgid "unable to normalize object directory: %s"
+msgstr "không thể chuẩn hóa thư mục đối tượng: “%s”"
+
+msgid "unable to fdopen alternates lockfile"
+msgstr "không thể fdopen tập tin khóa thay thế"
+
+msgid "unable to read alternates file"
+msgstr "không thể đọc tập tin thay thế"
+
+msgid "unable to move new alternates file into place"
+msgstr "không thể di chuyển tập tin thay thế vào chỗ"
+
+#, c-format
+msgid "path '%s' does not exist"
+msgstr "đường dẫn “%s” không tồn tại"
+
+#, 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ợ."
+
+#, 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ộ."
+
+#, c-format
+msgid "reference repository '%s' is shallow"
+msgstr "kho tham chiếu “%s” là nông"
+
+#, c-format
+msgid "reference repository '%s' is grafted"
+msgstr "kho tham chiếu “%s” bị cấy ghép"
+
+#, 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”"
+
+#, 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"
+
+#, c-format
+msgid "attempting to mmap %<PRIuMAX> over limit %<PRIuMAX>"
+msgstr "đang cố để mmap %<PRIuMAX> vượt quá giới hạn %<PRIuMAX>"
+
+#, c-format
+msgid "mmap failed%s"
+msgstr "mmap gặp lỗi%s"
+
+#, c-format
+msgid "object file %s is empty"
+msgstr "tập tin đối tượng %s trống rỗng"
+
+#, c-format
+msgid "corrupt loose object '%s'"
+msgstr "đối tượng mất hỏng “%s”"
+
+#, 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”"
+
+#, c-format
+msgid "unable to parse %s header"
+msgstr "không thể phân tích phần đầu của “%s”"
+
+msgid "invalid object type"
+msgstr "kiểu đối tượng không hợp lệ"
+
+#, c-format
+msgid "unable to unpack %s header"
+msgstr "không thể giải gói phần đầu %s"
+
+#, 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"
+
+#, c-format
+msgid "failed to read object %s"
+msgstr "gặp lỗi khi đọc đối tượng “%s”"
+
+#, c-format
+msgid "replacement %s not found for %s"
+msgstr "c%s thay thế không được tìm thấy cho %s"
+
+#, 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"
+
+#, 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"
+
+#, c-format
+msgid "unable to write file %s"
+msgstr "không thể ghi tập tin %s"
+
+#, c-format
+msgid "unable to set permission to '%s'"
+msgstr "không thể đặt quyền thành “%s”"
+
+msgid "file write error"
+msgstr "lỗi ghi tập tin"
+
+msgid "error when closing loose object file"
+msgstr "gặp lỗi trong khi đóng tập tin đối tượng"
+
+#, 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"
+
+msgid "unable to create temporary file"
+msgstr "không thể tạo tập tin tạm thời"
+
+msgid "unable to write loose object file"
+msgstr "không thể ghi tập tin đối tượng đã mất"
+
+#, c-format
+msgid "unable to deflate new object %s (%d)"
+msgstr "không thể xả nén đối tượng mới %s (%d)"
+
+#, c-format
+msgid "deflateEnd on object %s failed (%d)"
+msgstr "deflateEnd trên đối tượng %s gặp lỗi (%d)"
+
+#, 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"
+
+#, c-format
+msgid "cannot read object for %s"
+msgstr "không thể đọc đối tượng cho %s"
+
+msgid "corrupt commit"
+msgstr "lần chuyển giao sai hỏng"
+
+msgid "corrupt tag"
+msgstr "thẻ sai hỏng"
+
+#, c-format
+msgid "read error while indexing %s"
+msgstr "gặp lỗi đọc khi đánh mục lục %s"
+
+#, c-format
+msgid "short read while indexing %s"
+msgstr "không đọc ngắn khi đánh mục lục %s"
+
+#, 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"
+
+#, c-format
+msgid "%s: unsupported file type"
+msgstr "%s: kiểu tập tin không được hỗ trợ"
+
+#, 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ệ"
+
+#, c-format
+msgid "unable to open %s"
+msgstr "không thể mở %s"
+
+#, c-format
+msgid "hash mismatch for %s (expected %s)"
+msgstr "mã băm không khớp cho %s (cần %s)"
+
+#, c-format
+msgid "unable to mmap %s"
+msgstr "không thể mmap %s"
+
+#, c-format
+msgid "unable to unpack header of %s"
+msgstr "không thể giải gói phần đầu của “%s”"
+
+#, c-format
+msgid "unable to parse header of %s"
+msgstr "không thể phân tích phần đầu của “%s”"
+
+#, c-format
+msgid "unable to unpack contents of %s"
+msgstr "không thể giải gói nội dung của “%s”"
+
+#. TRANSLATORS: This is a line of ambiguous object
+#. output shown when we cannot look up or parse the
+#. object in question. E.g. "deadbeef [bad object]".
+#.
+#, c-format
+msgid "%s [bad object]"
+msgstr "%s [đối tượng sai.]"
+
+#. TRANSLATORS: This is a line of ambiguous commit
+#. object output. E.g.:
+#. *
+#.    "deadbeef commit 2021-01-01 - Some Commit Message"
+#.
+#, c-format
+msgid "%s commit %s - %s"
+msgstr "%s lần chuyển giao %s - %s"
+
+#. TRANSLATORS: This is a line of ambiguous
+#. tag object output. E.g.:
+#. *
+#.    "deadbeef tag 2022-01-01 - Some Tag Message"
+#. *
+#. The second argument is the YYYY-MM-DD found
+#. in the tag.
+#. *
+#. The third argument is the "tag" string
+#. from object.c.
+#.
+#, c-format
+msgid "%s tag %s - %s"
+msgstr "%s thẻ %s - %s"
+
+#. TRANSLATORS: This is a line of ambiguous
+#. tag object output where we couldn't parse
+#. the tag itself. E.g.:
+#. *
+#.    "deadbeef [bad tag, could not parse it]"
+#.
+#, c-format
+msgid "%s [bad tag, could not parse it]"
+msgstr "%s [thẻ sai, không thể phân tích cú pháp nó]"
+
+#. TRANSLATORS: This is a line of ambiguous <type>
+#. object output. E.g. "deadbeef tree".
+#.
+#, c-format
+msgid "%s tree"
+msgstr "%s tree"
+
+#. TRANSLATORS: This is a line of ambiguous <type>
+#. object output. E.g. "deadbeef blob".
+#.
+#, c-format
+msgid "%s blob"
+msgstr "%s blob"
+
+#, c-format
+msgid "short object ID %s is ambiguous"
+msgstr "mã đối tượng dạng rút gọn %s chưa rõ ràng"
+
+#. TRANSLATORS: The argument is the list of ambiguous
+#. objects composed in show_ambiguous_object(). See
+#. its "TRANSLATORS" comments for details.
+#.
+#, c-format
+msgid ""
+"The candidates are:\n"
+"%s"
+msgstr ""
+"Các ứng cử là:\n"
+"%s"
+
+msgid ""
+"Git normally never creates a ref that ends with 40 hex characters\n"
+"because it will be ignored when you just specify 40-hex. These refs\n"
+"may be created by mistake. For example,\n"
+"\n"
+"  git switch -c $br $(git rev-parse ...)\n"
+"\n"
+"where \"$br\" is somehow empty and a 40-hex ref is created. Please\n"
+"examine these refs and maybe delete them. Turn this message off by\n"
+"running \"git config advice.objectNameWarning false\""
+msgstr ""
+"Git thường không bao giờ tạo tham chiếu mà nó kết thúc với 40 ký tự hex\n"
+"bởi vì nó sẽ bị bỏ qua khi bạn chỉ định 40-hex. Những tham chiếu này\n"
+"có lẽ được tạo ra bởi một sai sót nào đó. Ví dụ,\n"
+"\n"
+"  git switch -c $br $(git rev-parse …)\n"
+"\n"
+"với \"$br\" không hiểu lý do vì sao trống rỗng và một tham chiếu 40-hex được "
+"tạo ra.\n"
+"Xin hãy kiểm tra những tham chiếu này và có thể xóa chúng đi. Tắt lời nhắn "
+"này\n"
+"bằng cách chạy lệnh \"git config advice.objectNameWarning false\""
+
+#, c-format
+msgid "log for '%.*s' only goes back to %s"
+msgstr "nhật ký cho “%.*s” chỉ trở lại đến %s"
+
+#, c-format
+msgid "log for '%.*s' only has %d entries"
+msgstr "nhật ký cho “%.*s” chỉ có %d mục"
+
+#, c-format
+msgid "path '%s' exists on disk, but not in '%.*s'"
+msgstr "đường dẫn “%s” có ở trên đĩa, nhưng không trong “%.*s”"
+
+#, c-format
+msgid ""
+"path '%s' exists, but not '%s'\n"
+"hint: Did you mean '%.*s:%s' aka '%.*s:./%s'?"
+msgstr ""
+"đường dẫn “%s” tồn tại, nhưng không phải “%s”\n"
+"gợi ý: Có phải ý bạn là “%.*s:%s” aka “%.*s:./%s”?"
+
+#, c-format
+msgid "path '%s' does not exist in '%.*s'"
+msgstr "đường dẫn “%s” không tồn tại trong “%.*s”"
+
+#, c-format
+msgid ""
+"path '%s' is in the index, but not at stage %d\n"
+"hint: Did you mean ':%d:%s'?"
+msgstr ""
+"đường dẫn “%s” nằm trong chỉ mục, nhưng không phải ở giai đoạn %d\n"
+"gợi ý: Có phải ý bạn là “:%d:%s”?"
+
+#, c-format
+msgid ""
+"path '%s' is in the index, but not '%s'\n"
+"hint: Did you mean ':%d:%s' aka ':%d:./%s'?"
+msgstr ""
+"đường dẫn “%s” nằm trong chỉ mục, nhưng không phải “%s”\n"
+"gợi ý: Có phải ý bạn là “:% d:%s “ aka “:%d:./%s”?"
+
+#, c-format
+msgid "path '%s' exists on disk, but not in the index"
+msgstr "đường dẫn “%s” tồn tại trên đĩa, nhưng không có trong chỉ mục"
+
+#, c-format
+msgid "path '%s' does not exist (neither on disk nor in the index)"
+msgstr "đường dẫn “%s” không tồn tại (không trên đĩa cũng không trong mục lục)"
+
+msgid "relative path syntax can't be used outside working tree"
+msgstr "cú pháp đường dẫn tương đối không thể thể dùng ngoài cây làm việc"
+
+#, c-format
+msgid "<object>:<path> required, only <object> '%s' given"
+msgstr "<object>:<path> cần cả hai, nhưng chỉ <object> '%s' được đưa ra"
+
+#, c-format
+msgid "invalid object name '%.*s'."
+msgstr "“%.*s” không phải là tên đối tượng hợp lệ."
+
+#, c-format
+msgid "invalid object type \"%s\""
+msgstr "kiểu đối tượng \"%s\" không hợp lệ"
+
+#, c-format
+msgid "object %s is a %s, not a %s"
+msgstr "đối tượng %s là một %s, không phải là một %s"
+
+#, c-format
+msgid "object %s has unknown type id %d"
+msgstr "đối tượng %s có mã kiểu %d chưa biết"
+
+#, c-format
+msgid "unable to parse object: %s"
+msgstr "không thể phân tích đối tượng: “%s”"
+
+#, c-format
+msgid "hash mismatch %s"
+msgstr "mã băm không khớp %s"
+
+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"
+
+#, c-format
+msgid "could not open pack %s"
+msgstr "không thể mở gói “%s”"
+
+#, c-format
+msgid "preferred pack (%s) is invalid"
+msgstr "\"preferred pack\" (%s) không hợp lệ"
+
+#, 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>"
+
+#, c-format
+msgid "mtimes file %s is too small"
+msgstr "tập tin mtimes %s quá nhỏ"
+
+#, c-format
+msgid "mtimes file %s has unknown signature"
+msgstr "tập tin mtimes %s có chữ ký chưa biết"
+
+#, c-format
+msgid "mtimes file %s has unsupported version %<PRIu32>"
+msgstr "tệp mtimes %s có phiên bản không được hỗ trợ %<PRIu32>"
+
+#, c-format
+msgid "mtimes file %s has unsupported hash id %<PRIu32>"
+msgstr "tập tin mtimes %s có mã băm không được hỗ trợ %<PRIu32>"
+
+#, c-format
+msgid "mtimes file %s is corrupt"
+msgstr "tập tin mtimes %s bị hỏng"
+
+#, c-format
+msgid "reverse-index file %s is too small"
+msgstr "tập tin reverse-index %s quá nhỏ"
+
+#, c-format
+msgid "reverse-index file %s is corrupt"
+msgstr "tập tin reverse-index %s bị hỏng"
+
+#, c-format
+msgid "reverse-index file %s has unknown signature"
+msgstr "tập tin reverse-index %s có chữ ký chưa biết"
+
+#, c-format
+msgid "reverse-index file %s has unsupported version %<PRIu32>"
+msgstr "tệp chỉ mục ngược %s có phiên bản không được hỗ trợ %<PRIu32>"
+
+#, c-format
+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>"
+
+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"
+
+#, c-format
+msgid "could not stat: %s"
+msgstr "không thể lấy thông tin thống kê: %s"
+
+#, c-format
+msgid "failed to make %s readable"
+msgstr "gặp lỗi làm cho %s đọc được"
+
+#, c-format
+msgid "could not write '%s' promisor file"
+msgstr "không thể ghi tập tin promisor “%s”"
+
+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 à?)"
+
+#, c-format
+msgid "packfile %s cannot be mapped%s"
+msgstr "tập tin gói %s không thể được ánh xạ %s"
+
+#, 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 à?)"
+
+#, 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 à?)"
+
+#, c-format
+msgid "malformed expiration date '%s'"
+msgstr "ngày tháng hết hạn dị hình “%s”"
+
+#, c-format
+msgid "option `%s' expects \"always\", \"auto\", or \"never\""
+msgstr "tùy chọn “%s” cần \"always\", \"auto\", hoặc \"never\""
+
+#, c-format
+msgid "malformed object name '%s'"
+msgstr "tên đối tượng dị hình “%s”"
+
+#, c-format
+msgid "option `%s' expects \"%s\" or \"%s\""
+msgstr "tùy chọn “%s” cần \"%s\" hoặc \"%s\""
+
+#, c-format
+msgid "%s requires a value"
+msgstr "“%s” yêu cầu một giá trị"
+
+#, c-format
+msgid "%s is incompatible with %s"
+msgstr "%s là xung khắc với %s"
+
+#, c-format
+msgid "%s : incompatible with something else"
+msgstr "%s : xung khắc với các cái khác"
+
+#, c-format
+msgid "%s takes no value"
+msgstr "%s k nhận giá trị"
+
+#, c-format
+msgid "%s isn't available"
+msgstr "%s không sẵn có"
+
+#, 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"
+
+#, 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)"
+
+#, 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)?"
+
+#, c-format
+msgid "alias of --%s"
+msgstr "bí danh của --%s"
+
+#, c-format
+msgid "unknown option `%s'"
+msgstr "không hiểu tùy chọn “%s”"
+
+#, c-format
+msgid "unknown switch `%c'"
+msgstr "không hiểu tùy chọn “%c”"
+
+#, 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”"
+
+msgid "..."
+msgstr "…"
+
+#, c-format
+msgid "usage: %s"
+msgstr "cách dùng: %s"
+
+#. TRANSLATORS: the colon here should align with the
+#. one in "usage: %s" translation.
+#.
+#, c-format
+msgid "   or: %s"
+msgstr "     hoặc: %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.
+#.
+#, c-format
+msgid "%*s%s"
+msgstr "%*s%s"
+
+#, c-format
+msgid "    %s"
+msgstr "    %s"
+
+msgid "-NUM"
+msgstr "-SỐ"
+
+msgid "expiry-date"
+msgstr "ngày hết hạn"
+
+msgid "no-op (backward compatibility)"
+msgstr "no-op (tương thích ngược)"
+
+msgid "be more verbose"
+msgstr "chi tiết hơn nữa"
+
+msgid "be more quiet"
+msgstr "im lặng hơn nữa"
+
+msgid "use <n> digits to display object names"
+msgstr "sử dụng <n> chữ số để hiển thị tên đối tượng"
+
+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"
+
+msgid "read pathspec from file"
+msgstr "đọc đặc tả đường dẫn từ tập tin"
+
+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"
+
+#, c-format
+msgid "Could not make %s writable by group"
+msgstr "Không thể làm %s được ghi bởi nhóm"
+
+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"
+
+msgid "Only one 'attr:' specification is allowed."
+msgstr "Chỉ có một đặc tả “attr:” là được phép."
+
+msgid "attr spec must not be empty"
+msgstr "đặc tả attr phải không được để trống"
+
+#, c-format
+msgid "invalid attribute name %s"
+msgstr "tên thuộc tính không hợp lệ %s"
+
+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"
+
+msgid ""
+"global 'literal' pathspec setting is incompatible with all other global "
+"pathspec settings"
+msgstr ""
+"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"
+
+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"
+
+#, 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”"
+
+#, 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”"
+
+#, 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”"
+
+#, c-format
+msgid "%s: 'literal' and 'glob' are incompatible"
+msgstr "%s: “literal” và “glob” xung khắc nhau"
+
+#, c-format
+msgid "%s: '%s' is outside repository at '%s'"
+msgstr "%s: “%s” ngoài một kho chứa tại “%s”"
+
+#, c-format
+msgid "'%s' (mnemonic: '%c')"
+msgstr "“%s” (mnemonic: “%c”)"
+
+#, 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"
+
+#, 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"
+
+#, c-format
+msgid "line is badly quoted: %s"
+msgstr "dòng được trích dẫn sai: %s"
+
+msgid "unable to write flush packet"
+msgstr "không thể đẩy dữ liệu của gói lên đĩa"
+
+msgid "unable to write delim packet"
+msgstr "không thể ghi gói delim"
+
+msgid "unable to write response end packet"
+msgstr "không thể ghi gói cuối trả về"
+
+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ớ"
+
+msgid "protocol error: impossibly long line"
+msgstr "lỗi giao thức: không thể làm được dòng dài"
+
+msgid "packet write with format failed"
+msgstr "gặp lỗi khi ghi gói có định dạng"
+
+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"
+
+#, c-format
+msgid "packet write failed: %s"
+msgstr "gặp lỗi khi ghi gói: %s"
+
+msgid "read error"
+msgstr "lỗi đọc"
+
+msgid "the remote end hung up unexpectedly"
+msgstr "máy chủ bị treo bất ngờ"
+
+#, 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"
+
+#, c-format
+msgid "protocol error: bad line length %d"
+msgstr "lỗi giao thức: chiều dài dòng bị sai %d"
+
+#, c-format
+msgid "remote error: %s"
+msgstr "lỗi máy chủ: %s"
+
+msgid "Refreshing index"
+msgstr "Làm mới bảng mục lục"
+
+#, c-format
+msgid "unable to create threaded lstat: %s"
+msgstr "không thể tạo tuyến trình lstat: %s"
+
+msgid "unable to parse --pretty format"
+msgstr "không thể phân tích định dạng --pretty"
+
+msgid "promisor-remote: unable to fork off fetch subprocess"
+msgstr "promisor-remote: không thể rẽ nhánh tuyến trình con fetch"
+
+msgid "promisor-remote: could not write to fetch subprocess"
+msgstr "promisor-remote: không thể ghi tiến trình con fetch"
+
+msgid "promisor-remote: could not close stdin to fetch subprocess"
+msgstr ""
+"promisor-remote: không thể đóng đầu vào tiêu chuẩn tiến trình con fetch"
+
+#, c-format
+msgid "promisor remote name cannot begin with '/': %s"
+msgstr "tên máy chủ hứa hẹn không thể bắt đầu bằng “/”: %s"
+
+msgid "object-info: expected flush after arguments"
+msgstr "object-info: cần đẩy dữ liệu lên đĩa sau các tham số"
+
+msgid "Removing duplicate objects"
+msgstr "Đang gỡ các đối tượng trùng lặp"
+
+msgid "could not start `log`"
+msgstr "không thể lấy thông tin thống kê về “log“"
+
+msgid "could not read `log` output"
+msgstr "không thể đọc kết xuất “log”"
+
+#, c-format
+msgid "could not parse commit '%s'"
+msgstr "không thể phân tích lần chuyển giao “%s”"
+
+#, c-format
+msgid ""
+"could not parse first line of `log` output: did not start with 'commit ': "
+"'%s'"
+msgstr ""
+"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”"
+
+#, 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”"
+
+msgid "failed to generate diff"
+msgstr "gặp lỗi khi tạo khác biệt"
+
+#, c-format
+msgid "could not parse log for '%s'"
+msgstr "không thể phân tích nhật ký cho “%s”"
+
+#, c-format
+msgid "will not add file alias '%s' ('%s' already exists in index)"
+msgstr ""
+"sẽ không thêm các bí danh “%s” (“%s” đã có từ trước trong bảng mục lục)"
+
+msgid "cannot create an empty blob in the object database"
+msgstr "không thể tạo một blob rỗng trong cơ sở dữ liệu đối tượng"
+
+#, c-format
+msgid "%s: can only add regular files, symbolic links or git-directories"
+msgstr ""
+"%s: chỉ có thể thêm tập tin thông thường, liên kết mềm hoặc git-directories"
+
+#, c-format
+msgid "unable to index file '%s'"
+msgstr "không thể đánh mục lục tập tin “%s”"
+
+#, c-format
+msgid "unable to add '%s' to index"
+msgstr "không thể thêm %s vào bảng mục lục"
+
+#, c-format
+msgid "unable to stat '%s'"
+msgstr "không thể lấy thống kê “%s”"
+
+#, 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"
+
+msgid "Refresh index"
+msgstr "Làm tươi mới bảng mục lục"
+
+#, c-format
+msgid ""
+"index.version set, but the value is invalid.\n"
+"Using version %i"
+msgstr ""
+"index.version được đặt, nhưng giá trị của nó lại không hợp lệ.\n"
+"Dùng phiên bản %i"
+
+#, c-format
+msgid ""
+"GIT_INDEX_VERSION set, but the value is invalid.\n"
+"Using version %i"
+msgstr ""
+"GIT_INDEX_VERSION được đặt, nhưng giá trị của nó lại không hợp lệ.\n"
+"Dùng phiên bản %i"
+
+#, c-format
+msgid "bad signature 0x%08x"
+msgstr "chữ ký sai 0x%08x"
+
+#, c-format
+msgid "bad index version %d"
+msgstr "phiên bản mục lục sai %d"
+
+msgid "bad index file sha1 signature"
+msgstr "chữ ký dạng sha1 cho tập tin mục lục không đúng"
+
+#, 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"
+
+#, c-format
+msgid "ignoring %.4s extension"
+msgstr "đang lờ đi phần mở rộng %.4s"
+
+#, c-format
+msgid "unknown index entry format 0x%08x"
+msgstr "không hiểu định dạng mục lục 0x%08x"
+
+#, 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”"
+
+msgid "unordered stage entries in index"
+msgstr "các mục tin stage không đúng thứ tự trong mục lục"
+
+#, 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”"
+
+#, c-format
+msgid "unordered stage entries for '%s'"
+msgstr "các mục tin stage không đúng thứ tự cho “%s”"
+
+#, c-format
+msgid "unable to create load_cache_entries thread: %s"
+msgstr "không thể tạo tuyến load_cache_entries: %s"
+
+#, c-format
+msgid "unable to join load_cache_entries thread: %s"
+msgstr "không thể gia nhập tuyến load_cache_entries: %s"
+
+#, c-format
+msgid "%s: index file open failed"
+msgstr "%s: mở tập tin mục lục gặp lỗi"
+
+#, 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ở"
+
+#, c-format
+msgid "%s: index file smaller than expected"
+msgstr "%s: tập tin mục lục nhỏ hơn mong đợi"
+
+#, 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"
+
+#, c-format
+msgid "unable to create load_index_extensions thread: %s"
+msgstr "không thể tạo tuyến load_index_extensions: %s"
+
+#, c-format
+msgid "unable to join load_index_extensions thread: %s"
+msgstr "không thể gia nhập tuyến load_index_extensions: %s"
+
+#, 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”"
+
+#, 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"
+
+msgid "cannot write split index for a sparse index"
+msgstr "không thể ghi mục lục chia tách cho \"sparse index\""
+
+msgid "failed to convert to a sparse-index"
+msgstr "gặp lỗi khi chuyển đổi sang \"sparse-index\""
+
+#, c-format
+msgid "could not stat '%s'"
+msgstr "không thể lấy thông tin thống kê về “%s”"
+
+#, c-format
+msgid "unable to open git dir: %s"
+msgstr "không thể mở thư mục git: %s"
+
+#, c-format
+msgid "unable to unlink: %s"
+msgstr "không thể bỏ liên kết (unlink): “%s”"
+
+#, 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”"
+
+#, c-format
+msgid "%s: cannot drop to stage #0"
+msgstr "%s: không thể xóa bỏ stage #0"
+
+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 ""
+"Bạn có thể sửa nó bằng “git rebase --edit-todo” và sau đó chạy “git rebase --"
+"continue”.\n"
+"Hoặc là bạn có thể bãi bỏ việc cải tổ bằng “git rebase --abort”.\n"
+
+#, c-format
+msgid ""
+"unrecognized setting %s for option rebase.missingCommitsCheck. Ignoring."
+msgstr ""
+"không nhận ra cài đặt %s cho tùy chọn rebase.missingCommitsCheck. Nên bỏ qua."
+
+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 [-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"
+"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 trộn vào lần chuyển giao kế "
+"trước\n"
+"f, fixup [-C | -c] <commit> = giống như \"squash\", nhưng chỉ giữ lại phần "
+"lời nhắn\n"
+"                   nhật ký của lần chuyển giao kế trước, trừ phi -C được "
+"dùng, trong trường hợp\n"
+"                   chỉ giữ ghi chú của lần chuyển giao này; -c giống như -C "
+"nhưng\n"
+"                   mở trình biên soạn\n"
+"x, exec <commit> = chạy lệnh (phần còn lại của dòng) dùng hệ vỏ\n"
+"b, break = dừng tại đây (tiếp tục cải tổ sau này bằng “git rebase --"
+"continue”)\n"
+"d, drop <commit> = xóa bỏ 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ể được thay đổi thứ tự; chúng chạy từ trên đỉnh xuống "
+"dưới đáy.\n"
+
+#, c-format
+msgid "Rebase %s onto %s (%d command)"
+msgid_plural "Rebase %s onto %s (%d commands)"
+msgstr[0] "Cải tổ %s vào %s (%d lệnh )"
+
+msgid ""
+"\n"
+"Do not remove any line. Use 'drop' explicitly to remove a commit.\n"
+msgstr ""
+"\n"
+"Đừ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"
+
+msgid ""
+"\n"
+"If you remove a line here THAT COMMIT WILL BE LOST.\n"
+msgstr ""
+"\n"
+"Nếu bạn xóa bỏ một dòng ở đây thì LẦN CHUYỂN GIAO ĐÓ SẼ MẤT.\n"
+
+msgid ""
+"\n"
+"You are editing the todo file of an ongoing interactive rebase.\n"
+"To continue rebase after editing, run:\n"
+"    git rebase --continue\n"
+"\n"
+msgstr ""
+"\n"
+"Bạn đang sửa tập tin todo của một lần cải tổ tương tác đang thực hiện.\n"
+"Để tiếp tục cải tổ sau khi sửa, chạy:\n"
+"    git rebase --continue\n"
+"\n"
+
+msgid ""
+"\n"
+"However, if you remove everything, the rebase will be aborted.\n"
+"\n"
+msgstr ""
+"\n"
+"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"
+
+#, c-format
+msgid "could not write '%s'."
+msgstr "không thể ghi “%s”."
+
+#, c-format
+msgid ""
+"Warning: some commits may have been dropped accidentally.\n"
+"Dropped commits (newer to older):\n"
+msgstr ""
+"Cảnh báo: một số lần chuyển giao có lẽ đã bị xóa một cách tình cờ.\n"
+"Các lần chuyển giao bị xóa (từ mới đến cũ):\n"
+
+#, c-format
+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"
+"The possible behaviours are: ignore, warn, error.\n"
+"\n"
+msgstr ""
+"Để tránh thông báo này, dùng \"drop\" một cách rõ ràng để xóa bỏ một lần "
+"chuyển giao.\n"
+"\n"
+"Dùng “git config rebase.missingCommitsCheck” để thay đổi mức độ của cảnh "
+"báo.\n"
+"Cánh ứng xử có thể là: ignore, warn, error.\n"
+"\n"
+
+#, c-format
+msgid "%s: 'preserve' superseded by 'merges'"
+msgstr "%s: “preserve” bị cấm bởi “merges”"
+
+msgid "gone"
+msgstr "đã ra đi"
+
+#, c-format
+msgid "ahead %d"
+msgstr "phía trước %d"
+
+#, c-format
+msgid "behind %d"
+msgstr "đằng sau %d"
+
+#, c-format
+msgid "ahead %d, behind %d"
+msgstr "trước %d, sau %d"
+
+#, c-format
+msgid "expected format: %%(color:<color>)"
+msgstr "cần định dạng: %%(color:<color>)"
+
+#, c-format
+msgid "unrecognized color: %%(color:%s)"
+msgstr "không nhận ra màu: %%(color:%s)"
+
+#, c-format
+msgid "Integer value expected refname:lstrip=%s"
+msgstr "Giá trị nguyên cần tên tham chiếu:lstrip=%s"
+
+#, c-format
+msgid "Integer value expected refname:rstrip=%s"
+msgstr "Giá trị nguyên cần tên tham chiếu:rstrip=%s"
+
+#, c-format
+msgid "unrecognized %%(%s) argument: %s"
+msgstr "đối số không được thừa nhận %%(%s): %s"
+
+#, c-format
+msgid "%%(objecttype) does not take arguments"
+msgstr "%%(objecttype) không nhận các đối số"
+
+#, c-format
+msgid "%%(deltabase) does not take arguments"
+msgstr "%%(deltabase) không nhận các đối số"
+
+#, c-format
+msgid "%%(body) does not take arguments"
+msgstr "%%(body) không nhận các đối số"
+
+#, c-format
+msgid "expected %%(trailers:key=<value>)"
+msgstr "cần %%(trailers:key=<giá trị>)"
+
+#, c-format
+msgid "unknown %%(trailers) argument: %s"
+msgstr "không hiểu tham số %%(trailers): %s"
+
+#, c-format
+msgid "positive value expected contents:lines=%s"
+msgstr "cần nội dung mang giá trị dương:lines=%s"
+
+#, c-format
+msgid "positive value expected '%s' in %%(%s)"
+msgstr "cần giá trị dương “%s” trong %%(%s)"
+
+#, c-format
+msgid "unrecognized email option: %s"
+msgstr "không nhận ra tùy chọn thư điện tử: “%s”"
+
+#, c-format
+msgid "expected format: %%(align:<width>,<position>)"
+msgstr "cần định dạng: %%(align:<width>,<position>)"
+
+#, c-format
+msgid "unrecognized position:%s"
+msgstr "vị trí không được thừa nhận:%s"
+
+#, c-format
+msgid "unrecognized width:%s"
+msgstr "chiều rộng không được thừa nhận:%s"
+
+#, 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)"
+
+#, c-format
+msgid "%%(rest) does not take arguments"
+msgstr "%%(rest) không nhận các đối số"
+
+#, c-format
+msgid "malformed field name: %.*s"
+msgstr "tên trường dị hình: %.*s"
+
+#, c-format
+msgid "unknown field name: %.*s"
+msgstr "không hiểu tên trường: %.*s"
+
+#, c-format
+msgid ""
+"not a git repository, but the field '%.*s' requires access to object data"
+msgstr ""
+"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"
+
+#, c-format
+msgid "format: %%(%s) atom used without a %%(%s) atom"
+msgstr "định dạng: nguyên tử %%(%s) được dùng mà không có nguyên tử %%(%s)"
+
+#, 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"
+
+#, c-format
+msgid "format: %%(then) atom used after %%(else)"
+msgstr "định dạng: nguyên tử %%(then) được dùng sau %%(else)"
+
+#, 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"
+
+#, 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"
+
+#, c-format
+msgid "malformed format string %s"
+msgstr "chuỗi định dạng dị hình %s"
+
+#, c-format
+msgid "this command reject atom %%(%.*s)"
+msgstr "lệnh này từ chối atom %%(%.*s)"
+
+#, 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"
+
+#, c-format
+msgid "(no branch, rebasing %s)"
+msgstr "(không nhánh, đang cải tổ %s)"
+
+#, c-format
+msgid "(no branch, rebasing detached HEAD %s)"
+msgstr "(không nhánh, đang cải tổ HEAD %s đã tách rời)"
+
+#, 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)"
+
+#, c-format
+msgid "(HEAD detached at %s)"
+msgstr "(HEAD được tách rời tại %s)"
+
+#, c-format
+msgid "(HEAD detached from %s)"
+msgstr "(HEAD được tách rời khỏi %s)"
+
+msgid "(no branch)"
+msgstr "(không nhánh)"
+
+#, c-format
+msgid "missing object %s for %s"
+msgstr "thiếu đối tượng %s cho %s"
+
+#, c-format
+msgid "parse_object_buffer failed on %s for %s"
+msgstr "parse_object_buffer gặp lỗi trên %s cho %s"
+
+#, c-format
+msgid "malformed object at '%s'"
+msgstr "đối tượng dị hình tại “%s”"
+
+#, c-format
+msgid "ignoring ref with broken name %s"
+msgstr "đang lờ đi tham chiếu với tên hỏng %s"
+
+#, c-format
+msgid "ignoring broken ref %s"
+msgstr "đang lờ đi tham chiếu hỏng %s"
+
+#, c-format
+msgid "format: %%(end) atom missing"
+msgstr "định dạng: thiếu nguyên tử %%(end)"
+
+#, c-format
+msgid "malformed object name %s"
+msgstr "tên đối tượng dị hình %s"
+
+#, 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"
+
+msgid "key"
+msgstr "khóa"
+
+msgid "field name to sort on"
+msgstr "tên trường cần sắp xếp"
+
+#, c-format
+msgid "not a reflog: %s"
+msgstr "không phải một reflog: %s"
+
+#, c-format
+msgid "no reflog for '%s'"
+msgstr "không reflog cho “%s”"
+
+#, 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ả!"
+
+#, 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"
+"of your new repositories, which will suppress this warning, call:\n"
+"\n"
+"\tgit config --global init.defaultBranch <name>\n"
+"\n"
+"Names commonly chosen instead of 'master' are 'main', 'trunk' and\n"
+"'development'. The just-created branch can be renamed via this command:\n"
+"\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"
+"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"
+"\n"
+"\tgit branch -m <tên>\n"
+
+#, c-format
+msgid "could not retrieve `%s`"
+msgstr "không thể lấy về “%s”"
+
+#, c-format
+msgid "invalid branch name: %s = %s"
+msgstr "tên nhánh không hợp lệ: %s = %s"
+
+#, c-format
+msgid "ignoring dangling symref %s"
+msgstr "đang lờ đi tham chiếu mềm thừa %s"
+
+#, 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"
+
+#, 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"
+
+#, c-format
+msgid "log for %s is empty"
+msgstr "nhật ký cho %s trống rỗng"
+
+#, 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”"
+
+#, c-format
+msgid "update_ref failed for ref '%s': %s"
+msgstr "update_ref bị lỗi cho ref “%s”: %s"
+
+#, 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”"
+
+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"
+
+msgid "ref updates aborted by hook"
+msgstr "các cập nhật tham chiếu bị bãi bỏ bởi móc"
+
+#, c-format
+msgid "'%s' exists; cannot create '%s'"
+msgstr "“%s” sẵn có; không thể tạo “%s”"
+
+#, 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"
+
+#, c-format
+msgid "could not remove reference %s"
+msgstr "không thể gỡ bỏ tham chiếu: %s"
+
+#, c-format
+msgid "could not delete reference %s: %s"
+msgstr "không thể xóa bỏ tham chiếu %s: %s"
+
+#, c-format
+msgid "could not delete references: %s"
+msgstr "không thể xóa bỏ tham chiếu: %s"
+
+#, c-format
+msgid "invalid refspec '%s'"
+msgstr "refspec không hợp lệ “%s”"
+
+#, c-format
+msgid "invalid quoting in push-option value: '%s'"
+msgstr "sai trích dẫn trong giá trị push-option :“%s”"
+
+#, 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?"
+
+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"
+
+#, 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"
+
+#, c-format
+msgid "repository '%s' not found"
+msgstr "không tìm thấy kho “%s”"
+
+#, c-format
+msgid "Authentication failed for '%s'"
+msgstr "Xác thực gặp lỗi cho “%s”"
+
+#, 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"
+
+#, c-format
+msgid "unable to access '%s': %s"
+msgstr "không thể truy cập “%s”: %s"
+
+#, c-format
+msgid "redirecting to %s"
+msgstr "chuyển hướng đến %s"
+
+msgid "shouldn't have EOF when not gentle on EOF"
+msgstr "không nên có EOF khi không gentle trên EOF"
+
+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"
+
+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"
+
+#, c-format
+msgid "remote-curl: bad line length character: %.4s"
+msgstr "remote-curl: ký tự chiều dài dòng bị sai: %.4s"
+
+msgid "remote-curl: unexpected response end packet"
+msgstr "remote-curl: gặp đáp ứng là gói kết thúc bất ngờ"
+
+#, c-format
+msgid "RPC failed; %s"
+msgstr "RPC gặp lỗi; %s"
+
+msgid "cannot handle pushes this big"
+msgstr "không thể xử lý đẩy cái lớn này"
+
+#, 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"
+
+#, 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"
+
+#, c-format
+msgid "%d bytes of length header were received"
+msgstr "đã nhận về phần đầu có chiều dài %d byte"
+
+#, c-format
+msgid "%d bytes of body are still expected"
+msgstr "phần thân vẫn còn cần %d byte"
+
+msgid "dumb http transport does not support shallow capabilities"
+msgstr "đổ vận chuyển http không hỗ trợ khả năng nông"
+
+msgid "fetch failed."
+msgstr "lấy về gặp lỗi."
+
+msgid "cannot fetch by sha1 over smart http"
+msgstr "không thể lấy về bằng sha1 thông qua smart http"
+
+#, 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”"
+
+#, c-format
+msgid "http transport does not support %s"
+msgstr "vận chuyển http không hỗ trợ %s"
+
+msgid "git-http-push failed"
+msgstr "git-http-push gặp lỗi"
+
+msgid "remote-curl: usage: git remote-curl <remote> [<url>]"
+msgstr "remote-curl: usage: git remote-curl <máy chủ> [<url>]"
+
+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"
+
+msgid "remote-curl: fetch attempted without a local repo"
+msgstr "remote-curl: đã cố gắng fetch mà không có kho nội bộ"
+
+#, c-format
+msgid "remote-curl: unknown command '%s' from git"
+msgstr "remote-curl: không hiểu lệnh “%s” từ git"
+
+#, c-format
+msgid "config remote shorthand cannot begin with '/': %s"
+msgstr "cấu hình viết tắt máy chủ không thể bắt đầu bằng “/”: %s"
+
+msgid "more than one receivepack given, using the first"
+msgstr "đã đưa ra nhiều hơn một gói nhận về, đang sử dụng cái đầu tiên"
+
+msgid "more than one uploadpack given, using the first"
+msgstr "đã đưa ra nhiều hơn một gói tải lên, đang sử dụng cái đầu tiên"
+
+#, c-format
+msgid "unrecognized value transfer.credentialsInUrl: '%s'"
+msgstr "không chấp nhận giá trị  transfer.credentialsInUrl: '%s'"
+
+#, c-format
+msgid "URL '%s' uses plaintext credentials"
+msgstr "URL '%s' sử dụng chứng thư dạng chữ thường"
+
+#, c-format
+msgid "Cannot fetch both %s and %s to %s"
+msgstr "Không thể lấy về cả %s và %s cho %s"
+
+#, c-format
+msgid "%s usually tracks %s, not %s"
+msgstr "%s thường theo dõi %s, không phải %s"
+
+#, c-format
+msgid "%s tracks both %s and %s"
+msgstr "%s theo dõi cả %s và %s"
+
+#, c-format
+msgid "key '%s' of pattern had no '*'"
+msgstr "khóa “%s” của mẫu k có “*”"
+
+#, c-format
+msgid "value '%s' of pattern has no '*'"
+msgstr "giá trị “%s” của mẫu k có “*”"
+
+#, c-format
+msgid "src refspec %s does not match any"
+msgstr "refspec %s nguồn không khớp bất kỳ cái gì"
+
+#, c-format
+msgid "src refspec %s matches more than one"
+msgstr "refspec %s nguồn khớp nhiều hơn một"
+
+#. TRANSLATORS: "matches '%s'%" is the <dst> part of "git push
+#. <remote> <src>:<dst>" push, and "being pushed ('%s')" is
+#. the <src>.
+#.
+#, c-format
+msgid ""
+"The destination you provided is not a full refname (i.e.,\n"
+"starting with \"refs/\"). We tried to guess what you meant by:\n"
+"\n"
+"- Looking for a ref that matches '%s' on the remote side.\n"
+"- Checking if the <src> being pushed ('%s')\n"
+"  is a ref in \"refs/{heads,tags}/\". If so we add a corresponding\n"
+"  refs/{heads,tags}/ prefix on the remote side.\n"
+"\n"
+"Neither worked, so we gave up. You must fully qualify the ref."
+msgstr ""
+"Đích bạn đã cung cấp không phải tên tham chiếu đầy đủ (tức là\n"
+"bắt đầu bằng \"refs/\"). Chúng tôi đã cố suy luận rằng ý của bạn là:\n"
+"\n"
+"- Tìm kiếm một tham chiếu mà nó khớp “%s” bên phía máy chủ.\n"
+"- Kiểm tra xem <src> được đẩy lên (“%s”)\n"
+"  là một tham chiếu trong \"refs/{heads,tags}/\". Nếu thế chúng tôi thêm một "
+"tiền tố\n"
+"  refs/{heads,tags}/ tương ứng bên phía máy chủ.\n"
+"\n"
+"Nếu cả hai là không thể, thì chúng tôi cũng chịu thua. Bạn phải dùng tham "
+"chiếu dạng đầy đủ."
+
+#, c-format
+msgid ""
+"The <src> part of the refspec is a commit object.\n"
+"Did you mean to create a new branch by pushing to\n"
+"'%s:refs/heads/%s'?"
+msgstr ""
+"Phần <src> của đặc tả đường dẫn là một đối tượng lần chuyển giao.\n"
+"Có phải ý bạn là một tạo một nhánh mới bằng cách đẩy lên\n"
+"“%s:refs/heads/%s”?"
+
+#, c-format
+msgid ""
+"The <src> part of the refspec is a tag object.\n"
+"Did you mean to create a new tag by pushing to\n"
+"'%s:refs/tags/%s'?"
+msgstr ""
+"Phần <src> của đặc tả đường dẫn là một đối tượng thẻ.\n"
+"Có phải ý bạn là một tạo một thẻ mới bằng cách đẩy lên\n"
+"“%s:refs/tags/%s”?"
+
+#, c-format
+msgid ""
+"The <src> part of the refspec is a tree object.\n"
+"Did you mean to tag a new tree by pushing to\n"
+"'%s:refs/tags/%s'?"
+msgstr ""
+"Phần <src> của đặc tả đường dẫn là một đối tượng cây.\n"
+"Có phải ý bạn là một tạo một cây mới bằng cách đẩy lên\n"
+"“%s:refs/tags/%s”?"
+
+#, c-format
+msgid ""
+"The <src> part of the refspec is a blob object.\n"
+"Did you mean to tag a new blob by pushing to\n"
+"'%s:refs/tags/%s'?"
+msgstr ""
+"Phần <src> của đặc tả đường dẫn là một đối tượng blob.\n"
+"Có phải ý bạn là một tạo một blob mới bằng cách đẩy lên\n"
+"“%s:refs/tags/%s”?"
+
+#, c-format
+msgid "%s cannot be resolved to branch"
+msgstr "“%s” không thể được phân giải thành nhánh"
+
+#, c-format
+msgid "unable to delete '%s': remote ref does not exist"
+msgstr "không thể xóa “%s”: tham chiếu trên máy chủ không tồn tại"
+
+#, c-format
+msgid "dst refspec %s matches more than one"
+msgstr "dst refspec %s khớp nhiều hơn một"
+
+#, c-format
+msgid "dst ref %s receives from more than one src"
+msgstr "dst ref %s nhận từ hơn một nguồn"
+
+msgid "HEAD does not point to a branch"
+msgstr "HEAD không chỉ đến một nhánh nào cả"
+
+#, c-format
+msgid "no such branch: '%s'"
+msgstr "không có nhánh nào như thế: “%s”"
+
+#, c-format
+msgid "no upstream configured for branch '%s'"
+msgstr "không có thượng nguồn được cấu hình cho nhánh “%s”"
+
+#, c-format
+msgid "upstream branch '%s' not stored as a remote-tracking branch"
+msgstr ""
+"nhánh thượng nguồn “%s” không được lưu lại như là một nhánh theo dõi máy chủ"
+
+#, c-format
+msgid "push destination '%s' on remote '%s' has no local tracking branch"
+msgstr "đẩy lên đích “%s” trên máy chủ “%s” không có nhánh theo dõi nội bộ"
+
+#, c-format
+msgid "branch '%s' has no remote for pushing"
+msgstr "nhánh “%s” không có máy chủ để đẩy lên"
+
+#, c-format
+msgid "push refspecs for '%s' do not include '%s'"
+msgstr "đẩy refspecs cho “%s” không bao gồm “%s”"
+
+msgid "push has no destination (push.default is 'nothing')"
+msgstr "đẩy lên mà không có đích (push.default là “nothing”)"
+
+msgid "cannot resolve 'simple' push to a single destination"
+msgstr "không thể phân giải đẩy “đơn giản” đến một đích đơn"
+
+#, c-format
+msgid "couldn't find remote ref %s"
+msgstr "không thể tìm thấy tham chiếu máy chủ %s"
+
+#, c-format
+msgid "* Ignoring funny ref '%s' locally"
+msgstr "* Đang bỏ qua tham chiếu thú vị nội bộ “%s”"
+
+#, c-format
+msgid "Your branch is based on '%s', but the upstream is gone.\n"
+msgstr ""
+"Nhánh của bạn dựa trên cơ sở là “%s”, nhưng trên thượng nguồn không còn.\n"
+
+msgid "  (use \"git branch --unset-upstream\" to fixup)\n"
+msgstr "   (dùng \" git branch --unset-upstream\" để sửa)\n"
+
+#, c-format
+msgid "Your branch is up to date with '%s'.\n"
+msgstr "Nhánh của bạn đã cập nhật với “%s”.\n"
+
+#, c-format
+msgid "Your branch and '%s' refer to different commits.\n"
+msgstr "Nhánh của bạn và “%s” tham chiếu đến các lần chuyển giao khác nhau.\n"
+
+#, c-format
+msgid "  (use \"%s\" for details)\n"
+msgstr "  (dùng \"%s\" để biết thêm chi tiết)\n"
+
+#, c-format
+msgid "Your branch is ahead of '%s' by %d commit.\n"
+msgid_plural "Your branch is ahead of '%s' by %d commits.\n"
+msgstr[0] "Nhánh của bạn đứng trước “%s” %d lần chuyển giao.\n"
+
+msgid "  (use \"git push\" to publish your local commits)\n"
+msgstr "  (dùng \"git push\" để xuất bản các lần chuyển giao nội bộ của bạn)\n"
+
+#, c-format
+msgid "Your branch is behind '%s' by %d commit, and can be fast-forwarded.\n"
+msgid_plural ""
+"Your branch is behind '%s' by %d commits, and can be fast-forwarded.\n"
+msgstr[0] ""
+"Nhánh của bạn đứng đằng sau “%s” %d lần chuyển giao, và có thể được chuyển-"
+"tiếp-nhanh.\n"
+
+msgid "  (use \"git pull\" to update your local branch)\n"
+msgstr "  (dùng \"git pull\" để cập nhật nhánh nội bộ của bạn)\n"
+
+#, c-format
+msgid ""
+"Your branch and '%s' have diverged,\n"
+"and have %d and %d different commit each, respectively.\n"
+msgid_plural ""
+"Your branch and '%s' have diverged,\n"
+"and have %d and %d different commits each, respectively.\n"
+msgstr[0] ""
+"Nhánh của bạn và “%s” bị phân kỳ,\n"
+"và có %d và %d lần chuyển giao khác nhau cho từng cái,\n"
+"tương ứng với mỗi lần.\n"
+
+msgid "  (use \"git pull\" to merge the remote branch into yours)\n"
+msgstr ""
+"  (dùng \"git pull\" để hòa trộn nhánh trên máy chủ vào trong nhánh của "
+"bạn)\n"
+
+#, c-format
+msgid "cannot parse expected object name '%s'"
+msgstr "không thể phân tích tên đối tượng mong muốn “%s”"
+
+#, c-format
+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"
+
+#, c-format
+msgid "bad replace ref name: %s"
+msgstr "tên tham chiếu thay thế bị sai: %s"
+
+#, c-format
+msgid "duplicate replace ref: %s"
+msgstr "tham chiếu thay thế bị trùng: %s"
+
+#, c-format
+msgid "replace depth too high for object %s"
+msgstr "độ sâu thay thế quá cao cho đối tượng %s"
+
+msgid "corrupt MERGE_RR"
+msgstr "MERGE_RR sai hỏng"
+
+msgid "unable to write rerere record"
+msgstr "không thể ghi bản ghi rerere"
+
+#, c-format
+msgid "there were errors while writing '%s' (%s)"
+msgstr "gặp lỗi đọc khi đang ghi “%s” (%s)"
+
+#, c-format
+msgid "could not parse conflict hunks in '%s'"
+msgstr "không thể phân tích các mảnh xung đột trong “%s”"
+
+#, c-format
+msgid "failed utime() on '%s'"
+msgstr "gặp lỗi utime() trên “%s”"
+
+#, c-format
+msgid "writing '%s' failed"
+msgstr "gặp lỗi khi đang ghi “%s”"
+
+#, c-format
+msgid "Staged '%s' using previous resolution."
+msgstr "Đã tạm cất “%s” sử dụng cách phân giải kế trước."
+
+#, c-format
+msgid "Recorded resolution for '%s'."
+msgstr "Cách giải quyết đã ghi lại cho “%s”."
+
+#, c-format
+msgid "Resolved '%s' using previous resolution."
+msgstr "Đã phân giải giải “%s” sử dụng cách giải quyết kế trước."
+
+#, c-format
+msgid "cannot unlink stray '%s'"
+msgstr "không thể unlink stray “%s”"
+
+#, c-format
+msgid "Recorded preimage for '%s'"
+msgstr "Preimage đã được ghi lại cho “%s”"
+
+#, c-format
+msgid "failed to update conflicted state in '%s'"
+msgstr "gặp lỗi khi chạy cập nhật trạng thái bị xung đột trong “%s”"
+
+#, c-format
+msgid "no remembered resolution for '%s'"
+msgstr "đừng nhó các giải quyết cho “%s”"
+
+#, c-format
+msgid "cannot unlink '%s'"
+msgstr "không thể unlink “%s”"
+
+#, c-format
+msgid "Updated preimage for '%s'"
+msgstr "Đã cập nhật preimage cho “%s”"
+
+#, c-format
+msgid "Forgot resolution for '%s'\n"
+msgstr "Quên phân giải cho “%s”\n"
+
+msgid "unable to open rr-cache directory"
+msgstr "không thể mở thư mục rr-cache"
+
+msgid "update the index with reused conflict resolution if possible"
+msgstr "cập nhật bảng mục lục với phân giải xung đột dùng lại nếu được"
+
+msgid "could not determine HEAD revision"
+msgstr "không thể dò tìm điểm xét duyệt HEAD"
+
+#, c-format
+msgid "failed to find tree of %s"
+msgstr "gặp lỗi khi tìm cây của %s"
+
+msgid "--unpacked=<packfile> no longer supported"
+msgstr "--unpacked=<packfile> không còn được hỗ trợ nữa"
+
+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"
+
+#, 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ả"
+
+msgid "object filtering requires --objects"
+msgstr "lọc đối tượng yêu cầu --objects"
+
+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"
+
+#, c-format
+msgid "cannot create async thread: %s"
+msgstr "không thể tạo tuyến trình async: %s"
+
+msgid "unexpected flush packet while reading remote unpack status"
+msgstr ""
+"gặp gói flush không cần trong khi đọc tình trạng giải nén gói trên máy chủ"
+
+#, c-format
+msgid "unable to parse remote unpack status: %s"
+msgstr "không thể phân tích tình trạng unpack máy chủ: %s"
+
+#, c-format
+msgid "remote unpack failed: %s"
+msgstr "máy chủ gặp lỗi unpack: %s"
+
+msgid "failed to sign the push certificate"
+msgstr "gặp lỗi khi ký chứng thực đẩy"
+
+msgid "send-pack: unable to fork off fetch subprocess"
+msgstr "send-pack: không thể rẽ nhánh tuyến trình con fetch"
+
+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"
+
+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"
+
+msgid "the receiving end does not support --signed push"
+msgstr "kết thúc nhận không hỗ trợ đẩy --signed"
+
+msgid ""
+"not sending a push certificate since the receiving end does not support --"
+"signed push"
+msgstr ""
+"đừ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"
+
+msgid "the receiving end does not support --atomic push"
+msgstr "kết thúc nhận không hỗ trợ đẩy --atomic"
+
+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"
+
+#, 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”"
+
+#, c-format
+msgid "could not delete '%s'"
+msgstr "không thể xóa bỏ “%s”"
+
+msgid "revert"
+msgstr "hoàn nguyên"
+
+msgid "cherry-pick"
+msgstr "cherry-pick"
+
+msgid "rebase"
+msgstr "rebase"
+
+#, c-format
+msgid "unknown action: %d"
+msgstr "không nhận ra thao tác: %d"
+
+msgid ""
+"after resolving the conflicts, mark the corrected paths\n"
+"with 'git add <paths>' or 'git rm <paths>'"
+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>”"
+
+msgid ""
+"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 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\"."
+
+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\"."
+
+#, c-format
+msgid "could not lock '%s'"
+msgstr "không thể khóa “%s”"
+
+#, c-format
+msgid "could not write to '%s'"
+msgstr "không thể ghi vào “%s”"
+
+#, c-format
+msgid "could not write eol to '%s'"
+msgstr "không thể ghi eol vào “%s”"
+
+#, c-format
+msgid "failed to finalize '%s'"
+msgstr "gặp lỗi khi hoàn thành “%s”"
+
+#, 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."
+
+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ý."
+
+#, c-format
+msgid "%s: fast-forward"
+msgstr "%s: chuyển-tiếp-nhanh"
+
+#. TRANSLATORS: %s will be "revert", "cherry-pick" or
+#. "rebase".
+#.
+#, 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"
+
+msgid "unable to update cache tree"
+msgstr "không thể cập nhật cây bộ nhớ đệm"
+
+msgid "could not resolve HEAD commit"
+msgstr "không thể phân giải lần chuyển giao HEAD"
+
+#, c-format
+msgid "no key present in '%.*s'"
+msgstr "không có khóa hiện diện trong “%.*s”"
+
+#, c-format
+msgid "unable to dequote value of '%s'"
+msgstr "không thể giải trích dẫn giá trị của “%s”"
+
+msgid "'GIT_AUTHOR_NAME' already given"
+msgstr "“GIT_AUTHOR_NAME” đã sẵn đưa ra rồi"
+
+msgid "'GIT_AUTHOR_EMAIL' already given"
+msgstr "“GIT_AUTHOR_EMAIL” đã sẵn đưa ra rồi"
+
+msgid "'GIT_AUTHOR_DATE' already given"
+msgstr "“GIT_AUTHOR_DATE” đã sẵn đưa ra rồi"
+
+#, c-format
+msgid "unknown variable '%s'"
+msgstr "không hiểu biến “%s”"
+
+msgid "missing 'GIT_AUTHOR_NAME'"
+msgstr "thiếu “GIT_AUTHOR_NAME”"
+
+msgid "missing 'GIT_AUTHOR_EMAIL'"
+msgstr "thiếu “GIT_AUTHOR_EMAIL”"
+
+msgid "missing 'GIT_AUTHOR_DATE'"
+msgstr "thiếu “GIT_AUTHOR_DATE”"
+
+#, c-format
+msgid ""
+"you have staged changes in your working tree\n"
+"If these changes are meant to be squashed into the previous commit, run:\n"
+"\n"
+"  git commit --amend %s\n"
+"\n"
+"If they are meant to go into a new commit, run:\n"
+"\n"
+"  git commit %s\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 thư mục làm việc của bạn.\n"
+"Nếu các thay đổi này là muốn squash vào lần chuyển giao kế trước, chạy:\n"
+"\n"
+"  git commit --amend %s\n"
+"\n"
+"Nếu chúng có ý là đi đến lần chuyển giao mới, thì chạy:\n"
+"\n"
+"  git commit %s\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 "'prepare-commit-msg' hook failed"
+msgstr "móc “prepare-commit-msg” bị lỗi"
+
+msgid ""
+"Your name and email address were configured automatically based\n"
+"on your username and hostname. Please check that they are accurate.\n"
+"You can suppress this message by setting them explicitly. Run the\n"
+"following command and follow the instructions in your editor to edit\n"
+"your configuration file:\n"
+"\n"
+"    git config --global --edit\n"
+"\n"
+"After doing this, you may fix the identity used for this commit with:\n"
+"\n"
+"    git commit --amend --reset-author\n"
+msgstr ""
+"Tên và địa chỉ thư điện tử của bạn được cấu hình một cách tự động trên cơ "
+"sở\n"
+"tài khoản và địa chỉ máy chủ của bạn. Xin hãy kiểm tra xem chúng có chính "
+"xác không.\n"
+"Bạn có thể chặn những thông báo kiểu này bằng cách cài đặt các thông tin "
+"trên\n"
+"một cách rõ ràng. Chạy lệnh sau đây là theo các hướng dẫn trong bộ soạn "
+"thảo\n"
+"để chỉnh sửa tập tin cấu hình của mình:\n"
+"\n"
+"    git config --global --edit\n"
+"\n"
+"Sau khi thực hiện xong, bạn có thể sửa chữa định danh được sử dụng cho\n"
+"lần chuyển giao này với lệnh:\n"
+"\n"
+"    git commit --amend --reset-author\n"
+
+msgid ""
+"Your name and email address were configured automatically based\n"
+"on your username and hostname. Please check that they are accurate.\n"
+"You can suppress this message by setting them explicitly:\n"
+"\n"
+"    git config --global user.name \"Your Name\"\n"
+"    git config --global user.email you@example.com\n"
+"\n"
+"After doing this, you may fix the identity used for this commit with:\n"
+"\n"
+"    git commit --amend --reset-author\n"
+msgstr ""
+"Tên và địa chỉ thư điện tử của bạn được cấu hình một cách tự động trên cơ "
+"sở\n"
+"tài khoản và địa chỉ máy chủ của bạn. Xin hãy kiểm tra xem chúng có chính "
+"xác không.\n"
+"Bạn có thể chặn những thông báo kiểu này bằng cách cài đặt các thông tin "
+"trên một cách rõ ràng:\n"
+"\n"
+"    git config --global user.name \"Tên của bạn\"\n"
+"    git config --global user.email you@example.com\n"
+"\n"
+"Sau khi thực hiện xong, bạn có thể sửa chữa định danh được sử dụng cho lần "
+"chuyển giao này với lệnh:\n"
+"\n"
+"    git commit --amend --reset-author\n"
+
+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"
+
+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"
+
+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"
+
+msgid "detached HEAD"
+msgstr "đã rời khỏi HEAD"
+
+msgid " (root-commit)"
+msgstr " (root-commit)"
+
+msgid "could not parse HEAD"
+msgstr "không thể phân tích HEAD"
+
+#, c-format
+msgid "HEAD %s is not a commit!"
+msgstr "HEAD %s không phải là một lần chuyển giao!"
+
+msgid "unable to parse commit author"
+msgstr "không thể phân tích tác giả của lần chuyển giao"
+
+#, c-format
+msgid "unable to read commit message from '%s'"
+msgstr "không thể đọc phần chú thích (message) từ “%s”"
+
+#, c-format
+msgid "invalid author identity '%s'"
+msgstr "định danh tác giả không hợp lệ “%s”"
+
+msgid "corrupt author: missing date information"
+msgstr "tác giả sai hỏng: thiếu thông tin ngày tháng"
+
+#, c-format
+msgid "could not update %s"
+msgstr "không thể cập nhật %s"
+
+#, c-format
+msgid "could not parse commit %s"
+msgstr "không thể phân tích lần chuyển giao %s"
+
+#, 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”"
+
+#, c-format
+msgid "unknown command: %d"
+msgstr "không hiểu câu lệnh %d"
+
+msgid "This is the 1st commit message:"
+msgstr "Đây là chú thích cho lần chuyển giao thứ nhất:"
+
+#, c-format
+msgid "This is the commit message #%d:"
+msgstr "Đây là chú thích cho lần chuyển giao thứ #%d:"
+
+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:"
+
+#, 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:"
+
+#, c-format
+msgid "This is a combination of %d commits."
+msgstr "Đây là tổ hợp của %d lần chuyển giao."
+
+#, c-format
+msgid "cannot write '%s'"
+msgstr "không thể ghi “%s”"
+
+msgid "need a HEAD to fixup"
+msgstr "cần một HEAD để sửa"
+
+msgid "could not read HEAD"
+msgstr "không thể đọc HEAD"
+
+msgid "could not read HEAD's commit message"
+msgstr "không thể đọc phần chú thích (message) của HEAD"
+
+#, c-format
+msgid "could not read commit message of %s"
+msgstr "không thể đọc phần chú thích (message) của %s"
+
+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."
+
+msgid "cannot fixup root commit"
+msgstr "không thể sửa chữa lần chuyển giao gốc"
+
+#, 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."
+
+#, c-format
+msgid "commit %s does not have parent %d"
+msgstr "lần chuyển giao %s không có cha mẹ %d"
+
+#, 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.
+#, 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"
+
+#, c-format
+msgid "could not rename '%s' to '%s'"
+msgstr "không thể đổi tên “%s” thành “%s”"
+
+#, c-format
+msgid "could not revert %s... %s"
+msgstr "không thể hoàn nguyên %s… %s"
+
+#, c-format
+msgid "could not apply %s... %s"
+msgstr "không thể áp dụng miếng vá %s… %s"
+
+#, 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"
+
+#, c-format
+msgid "git %s: failed to read the index"
+msgstr "git %s: gặp lỗi đọc bảng mục lục"
+
+#, 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"
+
+#, c-format
+msgid "%s does not accept arguments: '%s'"
+msgstr "%s không nhận các đối số: “%s”"
+
+#, c-format
+msgid "missing arguments for %s"
+msgstr "thiếu đối số cho %s"
+
+#, c-format
+msgid "could not parse '%s'"
+msgstr "không thể phân tích cú pháp “%s”"
+
+#, c-format
+msgid "invalid line %d: %.*s"
+msgstr "dòng không hợp lệ %d: %.*s"
+
+#, 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"
+
+msgid "cancelling a cherry picking in progress"
+msgstr "đang hủy bỏ thao tác cherry pick đang thực hiện"
+
+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"
+
+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”."
+
+#, c-format
+msgid "unusable instruction sheet: '%s'"
+msgstr "bảng chỉ thị không thể dùng được: %s"
+
+msgid "no commits parsed."
+msgstr "không có lần chuyển giao nào được phân tích."
+
+msgid "cannot cherry-pick during a revert."
+msgstr "không thể cherry-pick trong khi hoàn nguyên."
+
+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."
+
+msgid "unusable squash-onto"
+msgstr "squash-onto không dùng được"
+
+#, c-format
+msgid "malformed options sheet: '%s'"
+msgstr "bảng tùy chọn dị hình: “%s”"
+
+msgid "empty commit set passed"
+msgstr "lần chuyển giao trống rỗng đặt là hợp quy cách"
+
+msgid "revert is already in progress"
+msgstr "có thao tác hoàn nguyên đang được thực hiện"
+
+#, c-format
+msgid "try \"git revert (--continue | %s--abort | --quit)\""
+msgstr "hãy thử \"git revert (--continue | %s--abort | --quit)\""
+
+msgid "cherry-pick is already in progress"
+msgstr "có thao tác “cherry-pick” đang được thực hiện"
+
+#, c-format
+msgid "try \"git cherry-pick (--continue | %s--abort | --quit)\""
+msgstr "hãy thử \"git cherry-pick (--continue | %s--abort | --quit)\""
+
+#, c-format
+msgid "could not create sequencer directory '%s'"
+msgstr "không thể tạo thư mục xếp dãy “%s”"
+
+msgid "could not lock HEAD"
+msgstr "không thể khóa HEAD"
+
+msgid "no cherry-pick or revert in progress"
+msgstr "không cherry-pick hay hoàn nguyên trong tiến trình"
+
+msgid "cannot resolve HEAD"
+msgstr "không thể phân giải HEAD"
+
+msgid "cannot abort from a branch yet to be born"
+msgstr "không thể hủy bỏ từ một nhánh mà nó còn chưa được tạo ra"
+
+#, c-format
+msgid "cannot read '%s': %s"
+msgstr "không thể đọc “%s”: %s"
+
+msgid "unexpected end of file"
+msgstr "gặp kết thúc tập tin đột xuất"
+
+#, 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"
+
+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!"
+
+msgid "no revert in progress"
+msgstr "không có tiến trình hoàn nguyên nào"
+
+msgid "no cherry-pick in progress"
+msgstr "không có cherry-pick đang được thực hiện"
+
+msgid "failed to skip the commit"
+msgstr "gặp lỗi khi bỏ qua đối tượng chuyển giao"
+
+msgid "there is nothing to skip"
+msgstr "ở đây không có gì để mà bỏ qua cả"
+
+#, c-format
+msgid ""
+"have you committed already?\n"
+"try \"git %s --continue\""
+msgstr ""
+"bạn đã sẵn sàng chuyển giao chưa?\n"
+"thử \"git %s --continue\""
+
+msgid "cannot read HEAD"
+msgstr "không thể đọc HEAD"
+
+#, c-format
+msgid "unable to copy '%s' to '%s'"
+msgstr "không thể chép “%s” sang “%s”"
+
+#, c-format
+msgid ""
+"You can amend the commit now, with\n"
+"\n"
+"  git commit --amend %s\n"
+"\n"
+"Once you are satisfied with your changes, run\n"
+"\n"
+"  git rebase --continue\n"
+msgstr ""
+"Bạn có thể tu bổ lần chuyển giao ngay bây giờ bằng:\n"
+"\n"
+"  git commit --amend %s\n"
+"\n"
+"Một khi đã hài lòng với những thay đổi của mình, thì chạy:\n"
+"\n"
+"  git rebase --continue\n"
+
+#, c-format
+msgid "Could not apply %s... %.*s"
+msgstr "Không thể áp dụng %s… %.*s"
+
+#, c-format
+msgid "Could not merge %.*s"
+msgstr "Không hòa trộn %.*s"
+
+#, c-format
+msgid "Executing: %s\n"
+msgstr "Đang thực thi: %s\n"
+
+#, c-format
+msgid ""
+"execution failed: %s\n"
+"%sYou can fix the problem, and then run\n"
+"\n"
+"  git rebase --continue\n"
+"\n"
+msgstr ""
+"thực thi gặp lỗi: %s\n"
+"%sBạn có thể sửa các trục trặc, và sau đó chạy lệnh\n"
+"\n"
+"  git rebase --continue\n"
+"\n"
+
+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"
+
+#, c-format
+msgid ""
+"execution succeeded: %s\n"
+"but left changes to the index and/or the working tree\n"
+"Commit or stash your changes, and then run\n"
+"\n"
+"  git rebase --continue\n"
+"\n"
+msgstr ""
+"thực thi thành công: %s\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"
+"  git rebase --continue\n"
+"\n"
+
+#, c-format
+msgid "illegal label name: '%.*s'"
+msgstr "tên nhãn dị hình: “%.*s”"
+
+msgid "writing fake root commit"
+msgstr "ghi lần chuyển giao gốc giả"
+
+msgid "writing squash-onto"
+msgstr "đang ghi squash-onto"
+
+#, c-format
+msgid "could not resolve '%s'"
+msgstr "không thể phân giải “%s”"
+
+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"
+
+#, c-format
+msgid "unable to parse '%.*s'"
+msgstr "không thể phân tích “%.*s”"
+
+#, c-format
+msgid "nothing to merge: '%.*s'"
+msgstr "chẳng có gì để hòa trộn: “%.*s”"
+
+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]"
+
+#, 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”"
+
+#, c-format
+msgid "could not even attempt to merge '%.*s'"
+msgstr "không thể ngay cả khi thử hòa trộn “%.*s”"
+
+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"
+
+msgid "Cannot autostash"
+msgstr "Không thể autostash"
+
+#, c-format
+msgid "Unexpected stash response: '%s'"
+msgstr "Gặp đáp ứng stash không cần: “%s”"
+
+#, c-format
+msgid "Could not create directory for '%s'"
+msgstr "Không thể tạo thư mục cho “%s”"
+
+#, c-format
+msgid "Created autostash: %s\n"
+msgstr "Đã tạo autostash: %s\n"
+
+msgid "could not reset --hard"
+msgstr "không thể reset --hard"
+
+#, c-format
+msgid "Applied autostash.\n"
+msgstr "Đã áp dụng autostash.\n"
+
+#, c-format
+msgid "cannot store %s"
+msgstr "không thử lưu “%s”"
+
+#, c-format
+msgid ""
+"%s\n"
+"Your changes are safe in the stash.\n"
+"You can run \"git stash pop\" or \"git stash drop\" at any time.\n"
+msgstr ""
+"%s\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 "Applying autostash resulted in conflicts."
+msgstr "Áp dụng autostash có hiệu quả trong các xung đột."
+
+msgid "Autostash exists; creating a new stash entry."
+msgstr "Autostash đã sẵn có; nên tạo một mục stash mới."
+
+msgid "could not detach HEAD"
+msgstr "không thể tách rời HEAD"
+
+#, c-format
+msgid "Stopped at HEAD\n"
+msgstr "Dừng lại ở HEAD\n"
+
+#, c-format
+msgid "Stopped at %s\n"
+msgstr "Dừng lại ở %s\n"
+
+#, c-format
+msgid ""
+"Could not execute the todo command\n"
+"\n"
+"    %.*s\n"
+"It has been rescheduled; To edit the command before continuing, please\n"
+"edit the todo list first:\n"
+"\n"
+"    git rebase --edit-todo\n"
+"    git rebase --continue\n"
+msgstr ""
+"Không thể thực thi lệnh todo\n"
+"\n"
+"    %.*s\n"
+"Nó đã được lên lịch lại: Để sửa lệnh trước khi tiếp tục, vui lòng\n"
+"sửa danh sách todo trước:\n"
+"\n"
+"    git rebase --edit-todo\n"
+"    git rebase --continue\n"
+
+#, c-format
+msgid "Rebasing (%d/%d)%s"
+msgstr "Đang cải tổ (%d/%d)%s"
+
+#, c-format
+msgid "Stopped at %s...  %.*s\n"
+msgstr "Dừng lại ở %s…  %.*s\n"
+
+#, c-format
+msgid "unknown command %d"
+msgstr "không hiểu câu lệnh %d"
+
+msgid "could not read orig-head"
+msgstr "không thể đọc orig-head"
+
+msgid "could not read 'onto'"
+msgstr "không thể đọc “onto”."
+
+#, c-format
+msgid "could not update HEAD to %s"
+msgstr "không thể cập nhật HEAD thành %s"
+
+#, 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"
+
+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 amend non-existing commit"
+msgstr "không thể tu bỏ một lần chuyển giao không tồn tại"
+
+#, c-format
+msgid "invalid file: '%s'"
+msgstr "tập tin không hợp lệ: “%s”"
+
+#, c-format
+msgid "invalid contents: '%s'"
+msgstr "nội dung không hợp lệ: “%s”"
+
+msgid ""
+"\n"
+"You have uncommitted changes in your working tree. Please, commit them\n"
+"first and then run 'git rebase --continue' again."
+msgstr ""
+"\n"
+"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."
+
+#, c-format
+msgid "could not write file: '%s'"
+msgstr "không thể ghi tập tin: “%s”"
+
+msgid "could not remove CHERRY_PICK_HEAD"
+msgstr "không thể xóa bỏ CHERRY_PICK_HEAD"
+
+msgid "could not commit staged changes."
+msgstr "không thể chuyển giao các thay đổi đã đưa lên bệ phóng."
+
+#, c-format
+msgid "%s: can't cherry-pick a %s"
+msgstr "%s: không thể cherry-pick một %s"
+
+#, c-format
+msgid "%s: bad revision"
+msgstr "%s: điểm xét duyệt sai"
+
+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"
+
+#, c-format
+msgid "skipped previously applied commit %s"
+msgstr "bỏ qua lần chuyển giao được áp dụng kế trước %s"
+
+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"
+
+msgid "make_script: unhandled options"
+msgstr "make_script: các tùy chọn được không xử lý"
+
+msgid "make_script: error preparing revisions"
+msgstr "make_script: lỗi chuẩn bị điểm hiệu chỉnh"
+
+msgid "nothing to do"
+msgstr "không có gì để làm"
+
+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"
+
+msgid "the script was already rearranged."
+msgstr "văn lệnh đã sẵn được sắp đặt rồi."
+
+#, c-format
+msgid "'%s' is outside repository at '%s'"
+msgstr "“%s” ngoài một kho chứa tại “%s”"
+
+#, c-format
+msgid ""
+"%s: no such path in the working tree.\n"
+"Use 'git <command> -- <path>...' to specify paths that do not exist locally."
+msgstr ""
+"%s: không có đường dẫn nào như thế ở trong cây làm việc.\n"
+"Dùng “git <lệnh> -- <đường/dẫn>…” để chỉ định đường dẫn mà nó không tồn tại "
+"một cách nội bộ."
+
+#, c-format
+msgid ""
+"ambiguous argument '%s': unknown revision or path not in the working tree.\n"
+"Use '--' to separate paths from revisions, like this:\n"
+"'git <command> [<revision>...] -- [<file>...]'"
+msgstr ""
+"tham số chưa rõ ràng “%s”: chưa biết điểm xem xét hay đường dẫn không trong "
+"cây làm việc.\n"
+"Dùng “--” để ngăn cách các đường dẫn khỏi điểm xem xét, như thế này:\n"
+"“git <lệnh> [<điểm xem xét>…] -- [<tập tin>…]”"
+
+#, c-format
+msgid "option '%s' must come before non-option arguments"
+msgstr "tùy chọn “%s” phải trước các đối số đầu tiên không có tùy chọn"
+
+#, c-format
+msgid ""
+"ambiguous argument '%s': both revision and filename\n"
+"Use '--' to separate paths from revisions, like this:\n"
+"'git <command> [<revision>...] -- [<file>...]'"
+msgstr ""
+"tham số chưa rõ ràng “%s”: cả điểm xem xét và tên tập tin.\n"
+"Dùng “--” để ngăn cách các đường dẫn khỏi điểm xem xét, như thế này:\n"
+"“git <lệnh> [<điểm xem xét>…] -- [<tập tin>…]”"
+
+msgid "unable to set up work tree using invalid config"
+msgstr "không thể cài đặt thư mục làm việc sử dụng cấu hình không hợp lệ"
+
+#, c-format
+msgid "Expected git repo version <= %d, found %d"
+msgstr "Cần phiên bản kho git <= %d, nhưng lại nhận được %d"
+
+msgid "unknown repository extension found:"
+msgid_plural "unknown repository extensions found:"
+msgstr[0] "tìm thấy phần mở rộng kho chưa biết:"
+
+msgid "repo version is 0, but v1-only extension found:"
+msgid_plural "repo version is 0, but v1-only extensions found:"
+msgstr[0] "phiên bản kho là 0, nhưng lại tìm thấy phần mở rộng chỉ v1:"
+
+#, c-format
+msgid "error opening '%s'"
+msgstr "gặp lỗi khi mở “%s”"
+
+#, c-format
+msgid "too large to be a .git file: '%s'"
+msgstr "tập tin .git là quá lớn: “%s”"
+
+#, c-format
+msgid "error reading %s"
+msgstr "gặp lỗi khi đọc %s"
+
+#, c-format
+msgid "invalid gitfile format: %s"
+msgstr "định dạng tập tin git không hợp lệ: %s"
+
+#, c-format
+msgid "no path in gitfile: %s"
+msgstr "không có đường dẫn trong tập tin git: %s"
+
+#, c-format
+msgid "not a git repository: %s"
+msgstr "không phải là kho git: %s"
+
+#, c-format
+msgid "'$%s' too big"
+msgstr "“$%s” quá lớn"
+
+#, c-format
+msgid "not a git repository: '%s'"
+msgstr "không phải là kho git: “%s”"
+
+#, c-format
+msgid "cannot chdir to '%s'"
+msgstr "không thể chdir (chuyển đổi thư mục) sang “%s”"
+
+msgid "cannot come back to cwd"
+msgstr "không thể quay lại cwd"
+
+#, c-format
+msgid "failed to stat '%*s%s%s'"
+msgstr "gặp lỗi khi lấy thống kê về “%*s%s%s”"
+
+msgid "Unable to read current working directory"
+msgstr "Không thể đọc thư mục làm việc hiện hành"
+
+#, c-format
+msgid "cannot change to '%s'"
+msgstr "không thể chuyển sang “%s”"
+
+#, c-format
+msgid "not a git repository (or any of the parent directories): %s"
+msgstr "không phải là kho git (hoặc bất kỳ thư mục cha mẹ nào): %s"
+
+#, 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 ""
+"không phải là kho git (hay bất kỳ cha mẹ nào đến tận điểm gắn kết %s)\n"
+"Dừng tại biên của hệ thống tập tin (GIT_DISCOVERY_ACROSS_FILESYSTEM chưa "
+"đặt)."
+
+#, c-format
+msgid ""
+"unsafe repository ('%s' is owned by someone else)\n"
+"To add an exception for this directory, call:\n"
+"\n"
+"\tgit config --global --add safe.directory %s"
+msgstr ""
+"kho lưu trữ không an toàn ('%s' thuộc sở hữu của người khác)\n"
+"Để thêm ngoại lệ cho thư mục này, hãy gọi:\n"
+"\n"
+"\tgit config --global --add safe.directory %s"
+
+#, c-format
+msgid ""
+"problem with core.sharedRepository filemode value (0%.3o).\n"
+"The owner of files must always have read and write permissions."
+msgstr ""
+"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."
+
+msgid "fork failed"
+msgstr "gặp lỗi khi rẽ nhánh tiến trình"
+
+msgid "setsid failed"
+msgstr "setsid gặp lỗi"
+
+#, 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)"
+
+msgid "cannot use split index with a sparse index"
+msgstr "không thể sử dụng bảng mục lục chia tách với một \"sparse index\""
+
+#. TRANSLATORS: IEC 80000-13:2008 gibibyte
+#, c-format
+msgid "%u.%2.2u GiB"
+msgstr "%u.%2.2u GiB"
+
+#. TRANSLATORS: IEC 80000-13:2008 gibibyte/second
+#, c-format
+msgid "%u.%2.2u GiB/s"
+msgstr "%u.%2.2u GiB/giây"
+
+#. TRANSLATORS: IEC 80000-13:2008 mebibyte
+#, c-format
+msgid "%u.%2.2u MiB"
+msgstr "%u.%2.2u MiB"
+
+#. TRANSLATORS: IEC 80000-13:2008 mebibyte/second
+#, c-format
+msgid "%u.%2.2u MiB/s"
+msgstr "%u.%2.2u MiB/giây"
+
+#. TRANSLATORS: IEC 80000-13:2008 kibibyte
+#, c-format
+msgid "%u.%2.2u KiB"
+msgstr "%u.%2.2u KiB"
+
+#. TRANSLATORS: IEC 80000-13:2008 kibibyte/second
+#, c-format
+msgid "%u.%2.2u KiB/s"
+msgstr "%u.%2.2u KiB/giây"
+
+#. TRANSLATORS: IEC 80000-13:2008 byte
+#, c-format
+msgid "%u byte"
+msgid_plural "%u bytes"
+msgstr[0] "%u byte"
+
+#. TRANSLATORS: IEC 80000-13:2008 byte/second
+#, c-format
+msgid "%u byte/s"
+msgid_plural "%u bytes/s"
+msgstr[0] "%u byte/giây"
+
+#, c-format
+msgid "could not edit '%s'"
+msgstr "không thể sửa “%s”"
+
+#, c-format
+msgid "ignoring suspicious submodule name: %s"
+msgstr "đang lờ đi tên mô-đun-con mập mờ: %s"
+
+msgid "negative values not allowed for submodule.fetchJobs"
+msgstr "không cho phép giá trị âm ở submodule.fetchJobs"
+
+#, c-format
+msgid "ignoring '%s' which may be interpreted as a command-line option: %s"
+msgstr ""
+"đang bỏ qua “%s” cái mà có thể được phiên dịch như là một tùy chọn dòng "
+"lệnh: %s"
+
+#, c-format
+msgid "Could not update .gitmodules entry %s"
+msgstr "Không thể cập nhật mục .gitmodules %s"
+
+msgid "Cannot change unmerged .gitmodules, resolve merge conflicts first"
+msgstr ""
+"Không thể thay đổi .gitmodules chưa hòa trộn, hãy giải quyết xung đột trộn "
+"trước"
+
+#, c-format
+msgid "Could not find section in .gitmodules where path=%s"
+msgstr "Không thể tìm thấy phần trong .gitmodules nơi mà đường_dẫn=%s"
+
+#, c-format
+msgid "Could not remove .gitmodules entry for %s"
+msgstr "Không thể gỡ bỏ mục .gitmodules dành cho %s"
+
+msgid "staging updated .gitmodules failed"
+msgstr "gặp lỗi khi tổ chức .gitmodules đã cập nhật"
+
+#, c-format
+msgid "in unpopulated submodule '%s'"
+msgstr "trong mô-đun-con không có gì “%s”"
+
+#, c-format
+msgid "Pathspec '%s' is in submodule '%.*s'"
+msgstr "Đặc tả đường dẫn “%s” thì ở trong mô-đun-con “%.*s”"
+
+#, c-format
+msgid "bad --ignore-submodules argument: %s"
+msgstr "đối số --ignore-submodules sai: %s"
+
+#, c-format
+msgid ""
+"Submodule in commit %s at path: '%s' collides with a submodule named the "
+"same. Skipping it."
+msgstr ""
+"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ó."
+
+#, 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"
+
+#, c-format
+msgid ""
+"Could not run 'git rev-list <commits> --not --remotes -n 1' command in "
+"submodule %s"
+msgstr ""
+"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”"
+
+#, c-format
+msgid "process for submodule '%s' failed"
+msgstr "xử lý cho mô-đun-con “%s” gặp lỗi"
+
+#, c-format
+msgid "Pushing submodule '%s'\n"
+msgstr "Đẩy lên mô-đun-con “%s”\n"
+
+#, c-format
+msgid "Unable to push submodule '%s'\n"
+msgstr "Không thể đẩy lên mô-đun-con “%s”\n"
+
+#, c-format
+msgid "Fetching submodule %s%s\n"
+msgstr "Đang lấy về mô-đun-con %s%s\n"
+
+#, c-format
+msgid "Could not access submodule '%s'\n"
+msgstr "Không thể truy cập mô-đun-con “%s”\n"
+
+#, c-format
+msgid "Could not access submodule '%s' at commit %s\n"
+msgstr "Không thể truy cập mô-đun-con “%s” ở lần chuyển giao %s\n"
+
+#, c-format
+msgid "Fetching submodule %s%s at commit %s\n"
+msgstr "Đang lấy về mô-đun-con %s%s tại lần chuyển giao %s\n"
+
+#, c-format
+msgid ""
+"Errors during submodule fetch:\n"
+"%s"
+msgstr ""
+"Có lỗi khi lấy về mô-đun-con:\n"
+" “%s”"
+
+#, c-format
+msgid "'%s' not recognized as a git repository"
+msgstr "không nhận ra “%s” là một kho git"
+
+#, 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”"
+
+#, 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”"
+
+#, 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”"
+
+#, c-format
+msgid "could not run 'git status' in submodule '%s'"
+msgstr "không thể chạy “git status” trong mô-đun-con “%s”"
+
+#, c-format
+msgid "Could not unset core.worktree setting in submodule '%s'"
+msgstr "Không thể đặt core.worktree trong mô-đun-con “%s”"
+
+#, c-format
+msgid "could not recurse into submodule '%s'"
+msgstr "không thể đệ quy vào trong mô-đun-con “%s”"
+
+msgid "could not reset submodule index"
+msgstr "không thể đặt lại mục lục của mô-đun-con"
+
+#, c-format
+msgid "submodule '%s' has dirty index"
+msgstr "mô-đun-con “%s” có mục lục còn bẩn"
+
+#, c-format
+msgid "Submodule '%s' could not be updated."
+msgstr "Mô-đun-con “%s” không thể được cập nhật."
+
+#, 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”"
+
+#, c-format
+msgid ""
+"relocate_gitdir for submodule '%s' with more than one worktree not supported"
+msgstr ""
+"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ợ"
+
+#, 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”"
+
+#, 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ó"
+
+#, c-format
+msgid ""
+"Migrating git directory of '%s%s' from\n"
+"'%s' to\n"
+"'%s'\n"
+msgstr ""
+"Di cư thư mục git của “%s%s” từ\n"
+"“%s” sang\n"
+"“%s”\n"
+
+msgid "could not start ls-files in .."
+msgstr "không thể lấy thông tin thống kê về ls-files trong .."
+
+#, c-format
+msgid "ls-tree returned unexpected return code %d"
+msgstr "ls-tree trả về mã không như mong đợi %d"
+
+#, c-format
+msgid "failed to lstat '%s'"
+msgstr "gặp lỗi khi lstat “%s”"
+
+msgid "unhandled options"
+msgstr "các tùy chọn được không xử lý"
+
+msgid "error preparing revisions"
+msgstr "gặp lỗi khi chuẩn bị các điểm xét duyệt"
+
+#, c-format
+msgid "commit %s is not marked reachable"
+msgstr "lần chuyển giao %s chưa được đánh dấu là tiếp cận được"
+
+msgid "too many commits marked reachable"
+msgstr "có quá nhiều lần chuyển giao được đánh dấu là tiếp cận được"
+
+msgid "test-tool serve-v2 [<options>]"
+msgstr "test-tool serve-v2 [<các tùy chọn>]"
+
+msgid "exit immediately after advertising capabilities"
+msgstr "thoát ngay sau khi khởi tạo quảng cáo capabilities"
+
+msgid "test-helper simple-ipc is-active    [<name>] [<options>]"
+msgstr "test-helper simple-ipc is-active    [<tên>] [<các tùy chọn>]"
+
+msgid "test-helper simple-ipc run-daemon   [<name>] [<threads>]"
+msgstr "test-helper simple-ipc run-daemon   [<tên>] [<các tiến trình>]"
+
+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>]"
+
+msgid "test-helper simple-ipc stop-daemon  [<name>] [<max-wait>]"
+msgstr "test-helper simple-ipc stop-daemon  [<tên>] [<chờ tối đa>]"
+
+msgid "test-helper simple-ipc send         [<name>] [<token>]"
+msgstr "test-helper simple-ipc send         [<tên>] [<thẻ>]"
+
+msgid "test-helper simple-ipc sendbytes    [<name>] [<bytecount>] [<byte>]"
+msgstr "test-helper simple-ipc sendbytes    [<tên>] [<số lượng byte>] [<byte>]"
+
+msgid ""
+"test-helper simple-ipc multiple     [<name>] [<threads>] [<bytecount>] "
+"[<batchsize>]"
+msgstr ""
+"test-helper simple-ipc multiple     [<tên>] [<các tiến trình>] [<số lượng "
+"byte>] [<cỡ bó>]"
+
+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"
+
+msgid "named-pipe name"
+msgstr "tên named-pipe"
+
+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ụ"
+
+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"
+
+msgid "number of bytes"
+msgstr "số lượng byte"
+
+msgid "number of requests per thread"
+msgstr "số lượng yêu cầu mỗi tiến trình"
+
+msgid "byte"
+msgstr "byte"
+
+msgid "ballast character"
+msgstr "ký tự ballast"
+
+msgid "token"
+msgstr "thẻ bài"
+
+msgid "command token to send to the server"
+msgstr "thẻ bài lệnh để gửi lên cho máy phục vụ"
+
+#, c-format
+msgid "running trailer command '%s' failed"
+msgstr "chạy lệnh kéo theo “%s” gặp lỗi"
+
+#, c-format
+msgid "unknown value '%s' for key '%s'"
+msgstr "không hiểu giá trị “%s” cho khóa “%s”"
+
+#, c-format
+msgid "empty trailer token in trailer '%.*s'"
+msgstr "thẻ thừa trống rỗng trong phần thừa “%.*s”"
+
+#, c-format
+msgid "could not read input file '%s'"
+msgstr "không đọc được tập tin đầu vào “%s”"
+
+#, c-format
+msgid "could not stat %s"
+msgstr "không thể lấy thông tin thống kê về %s"
+
+#, c-format
+msgid "file %s is not a regular file"
+msgstr "\"%s\" không phải là tập tin bình thường"
+
+#, c-format
+msgid "file %s is not writable by user"
+msgstr "tập tin %s người dùng không thể ghi được"
+
+msgid "could not open temporary file"
+msgstr "không thể tạo tập tin tạm thời"
+
+#, c-format
+msgid "could not rename temporary file to %s"
+msgstr "không thể đổi tên tập tin tạm thời thành %s"
+
+msgid "full write to remote helper failed"
+msgstr "ghi đầy đủ lên bộ hỗ trợ máy chủ gặp lỗi"
+
+#, c-format
+msgid "unable to find remote helper for '%s'"
+msgstr "không thể tìm thấy bộ hỗ trợ máy chủ cho “%s”"
+
+msgid "can't dup helper output fd"
+msgstr "không thể nhân đôi fd dầu ra bộ hỗ trợ"
+
+#, c-format
+msgid ""
+"unknown mandatory capability %s; this remote helper probably needs newer "
+"version of Git"
+msgstr ""
+"không hiểu capability bắt buộc %s; bộ hỗ trợ máy chủ này gần như chắc chắn "
+"là cần phiên bản Git mới hơn"
+
+msgid "this remote helper should implement refspec capability"
+msgstr "bộ hỗ trợ máy chủ này cần phải thực thi capability đặc tả tham chiếu"
+
+#, c-format
+msgid "%s unexpectedly said: '%s'"
+msgstr "%s said bất ngờ: “%s”"
+
+#, c-format
+msgid "%s also locked %s"
+msgstr "%s cũng khóa %s"
+
+msgid "couldn't run fast-import"
+msgstr "không thể chạy fast-import"
+
+msgid "error while running fast-import"
+msgstr "gặp lỗi trong khi chạy fast-import"
+
+#, c-format
+msgid "could not read ref %s"
+msgstr "không thể đọc tham chiếu %s"
+
+#, c-format
+msgid "unknown response to connect: %s"
+msgstr "không hiểu đáp ứng để kết nối: %s"
+
+msgid "setting remote service path not supported by protocol"
+msgstr "giao thức này không hỗ trợ cài đặt đường dẫn dịch vụ máy chủ"
+
+msgid "invalid remote service path"
+msgstr "đường dẫn dịch vụ máy chủ không hợp lệ"
+
+msgid "operation not supported by protocol"
+msgstr "thao tác không được gia thức hỗ trợ"
+
+#, c-format
+msgid "can't connect to subservice %s"
+msgstr "không thể kết nối đến dịch vụ phụ %s"
+
+msgid "--negotiate-only requires protocol v2"
+msgstr "--negotiate-only cần giao thức v2"
+
+msgid "'option' without a matching 'ok/error' directive"
+msgstr "“option” không có chỉ thị “ok/error” tương ứng"
+
+#, c-format
+msgid "expected ok/error, helper said '%s'"
+msgstr "cần ok/error, nhưng bộ hỗ trợ lại nói “%s”"
+
+#, 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"
+
+#, c-format
+msgid "helper %s does not support dry-run"
+msgstr "helper %s không hỗ trợ dry-run"
+
+#, c-format
+msgid "helper %s does not support --signed"
+msgstr "helper %s không hỗ trợ --signed"
+
+#, c-format
+msgid "helper %s does not support --signed=if-asked"
+msgstr "helper %s không hỗ trợ --signed=if-asked"
+
+#, c-format
+msgid "helper %s does not support --atomic"
+msgstr "helper %s không hỗ trợ --atomic"
+
+#, c-format
+msgid "helper %s does not support --%s"
+msgstr "helper %s không hỗ trợ --%s"
+
+#, c-format
+msgid "helper %s does not support 'push-option'"
+msgstr "helper %s không hỗ trợ “push-option”"
+
+msgid "remote-helper doesn't support push; refspec needed"
+msgstr "remote-helper không hỗ trợ push; cần đặc tả tham chiếu"
+
+#, c-format
+msgid "helper %s does not support 'force'"
+msgstr "helper %s không hỗ trợ “force”"
+
+msgid "couldn't run fast-export"
+msgstr "không thể chạy fast-export"
+
+msgid "error while running fast-export"
+msgstr "gặp lỗi trong khi chạy fast-export"
+
+#, c-format
+msgid ""
+"No refs in common and none specified; doing nothing.\n"
+"Perhaps you should specify a branch.\n"
+msgstr ""
+"Không có các tham chiếu trong phần chung và chưa chỉ định; nên không làm gì "
+"cả.\n"
+"Tuy nhiên bạn nên chỉ định một nhánh.\n"
+
+#, c-format
+msgid "unsupported object format '%s'"
+msgstr "không hỗ trợ định dạng đối tượng “%s”"
+
+#, c-format
+msgid "malformed response in ref list: %s"
+msgstr "đáp ứng sai dạng trong danh sách tham chiếu: %s"
+
+#, c-format
+msgid "read(%s) failed"
+msgstr "read(%s) gặp lỗi"
+
+#, c-format
+msgid "write(%s) failed"
+msgstr "write(%s) gặp lỗi"
+
+#, c-format
+msgid "%s thread failed"
+msgstr "tuyến trình %s gặp lỗi"
+
+#, c-format
+msgid "%s thread failed to join: %s"
+msgstr "tuyến trình %s gặp lỗi khi gia nhập: %s"
+
+#, 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"
+
+#, c-format
+msgid "%s process failed to wait"
+msgstr "xử lý %s gặp lỗi khi đợi"
+
+#, c-format
+msgid "%s process failed"
+msgstr "xử lý %s gặp lỗi"
+
+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"
+
+#, c-format
+msgid "Would set upstream of '%s' to '%s' of '%s'\n"
+msgstr "Không thể đặt thượng nguồn của “%s” thành “%s” của “%s”\n"
+
+#, c-format
+msgid "could not read bundle '%s'"
+msgstr "không thể đọc bó “%s”"
+
+#, 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ệ"
+
+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"
+
+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"
+
+msgid "server does not support wait-for-done"
+msgstr "máy chủ không hỗ trợ wait-for-done"
+
+msgid "could not parse transport.color.* config"
+msgstr "không thể phân tích cú pháp cấu hình transport.color.*"
+
+msgid "support for protocol v2 not implemented yet"
+msgstr "việc hỗ trợ giao thức v2 chưa được thực hiện"
+
+#, c-format
+msgid "unknown value for config '%s': %s"
+msgstr "không hiểu giá trị cho cho cấu hình “%s”: %s"
+
+#, c-format
+msgid "transport '%s' not allowed"
+msgstr "không cho phép phương thức vận chuyển “%s”"
+
+msgid "git-over-rsync is no longer supported"
+msgstr "git-over-rsync không còn được hỗ trợ nữa"
+
+#, c-format
+msgid ""
+"The following submodule paths contain changes that can\n"
+"not be found on any remote:\n"
+msgstr ""
+"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"
+
+#, c-format
+msgid ""
+"\n"
+"Please try\n"
+"\n"
+"\tgit push --recurse-submodules=on-demand\n"
+"\n"
+"or cd to the path and use\n"
+"\n"
+"\tgit push\n"
+"\n"
+"to push them to a remote.\n"
+"\n"
+msgstr ""
+"\n"
+"Hãy thử\n"
+"\n"
+"\tgit push --recurse-submodules=on-demand\n"
+"\n"
+"hoặc cd đến đường dẫn và dùng\n"
+"\n"
+"\tgit push\n"
+"\n"
+"để đẩy chúng lên máy phục vụ.\n"
+"\n"
+
+msgid "Aborting."
+msgstr "Bãi bỏ."
+
+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"
+
+msgid "too-short tree object"
+msgstr "đối tượng cây quá ngắn"
+
+msgid "malformed mode in tree entry"
+msgstr "chế độ dị hình trong đề mục cây"
+
+msgid "empty filename in tree entry"
+msgstr "tên tập tin trống rỗng trong mục tin cây"
+
+msgid "too-short tree file"
+msgstr "tập tin cây quá ngắn"
+
+#, c-format
+msgid ""
+"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 ""
+"Các thay đổi nội bộ của bạn với các tập tin sau đây sẽ bị ghi đè bởi lệnh "
+"checkout:\n"
+"%%sVui lòng chuyển giao các thay đổi hay tạm cất chúng đi trước khi bạn "
+"chuyển nhánh."
+
+#, c-format
+msgid ""
+"Your local changes to the following files would be overwritten by checkout:\n"
+"%%s"
+msgstr ""
+"Các thay đổi nội bộ của bạn với các tập tin sau đây sẽ bị ghi đè bởi lệnh "
+"checkout:\n"
+"%%s"
+
+#, c-format
+msgid ""
+"Your local changes to the following files would be overwritten by merge:\n"
+"%%sPlease commit your changes or stash them before you merge."
+msgstr ""
+"Các thay đổi nội bộ của bạn với các tập tin sau đây sẽ bị ghi đè bởi lệnh "
+"hòa trộn:\n"
+"%%sVui lòng chuyển giao các thay đổi hay tạm cất chúng đi trước khi bạn hòa "
+"trộn."
+
+#, c-format
+msgid ""
+"Your local changes to the following files would be overwritten by merge:\n"
+"%%s"
+msgstr ""
+"Các thay đổi nội bộ của bạn với các tập tin sau đây sẽ bị ghi đè bởi lệnh "
+"hòa trộn:\n"
+"%%s"
+
+#, c-format
+msgid ""
+"Your local changes to the following files would be overwritten by %s:\n"
+"%%sPlease commit your changes or stash them before you %s."
+msgstr ""
+"Các thay đổi nội bộ của bạn với các tập tin sau đây sẽ bị ghi đè bởi lệnh "
+"%s:\n"
+"%%sVui lòng chuyển giao các thay đổi hay tạm cất chúng đi trước khi bạn %s."
+
+#, c-format
+msgid ""
+"Your local changes to the following files would be overwritten by %s:\n"
+"%%s"
+msgstr ""
+"Các thay đổi nội bộ của bạn với các tập tin sau đây sẽ bị ghi đè bởi lệnh "
+"%s:\n"
+"%%s"
+
+#, c-format
+msgid ""
+"Updating the following directories would lose untracked files in them:\n"
+"%s"
+msgstr ""
+"Việc cập nhật các thư mục sau đây có thể làm mất các tập tin chưa theo dõi "
+"trong nó:\n"
+"%s"
+
+#, c-format
+msgid ""
+"Refusing to remove the current working directory:\n"
+"%s"
+msgstr ""
+"Từ chối gỡ bỏ thư mục làm việc hiện tại:\n"
+"%s"
+
+#, c-format
+msgid ""
+"The following untracked working tree files would be removed by checkout:\n"
+"%%sPlease move or remove them before you switch branches."
+msgstr ""
+"Các tập tin cây làm việc chưa được theo dõi sau đây sẽ bị gỡ bỏ bởi lệnh "
+"checkout:\n"
+"%%sVui lòng di chuyển hay gỡ bỏ chúng trước khi bạn chuyển nhánh."
+
+#, c-format
+msgid ""
+"The following untracked working tree files would be removed by checkout:\n"
+"%%s"
+msgstr ""
+"Các tập tin cây làm việc chưa được theo dõi sau đây sẽ bị gỡ bỏ bởi lệnh "
+"checkout:\n"
+"%%s"
+
+#, c-format
+msgid ""
+"The following untracked working tree files would be removed by merge:\n"
+"%%sPlease move or remove them before you merge."
+msgstr ""
+"Các tập tin cây làm việc chưa được theo dõi sau đây sẽ bị gỡ bỏ bởi lệnh hòa "
+"trộn:\n"
+"%%sVui lòng di chuyển hay gỡ bỏ chúng trước khi bạn hòa trộn."
+
+#, c-format
+msgid ""
+"The following untracked working tree files would be removed by merge:\n"
+"%%s"
+msgstr ""
+"Các tập tin cây làm việc chưa được theo dõi sau đây sẽ bị gỡ bỏ bởi lệnh hòa "
+"trộn:\n"
+"%%s"
+
+#, c-format
+msgid ""
+"The following untracked working tree files would be removed by %s:\n"
+"%%sPlease move or remove them before you %s."
+msgstr ""
+"Các tập tin cây làm việc chưa được theo dõi sau đây sẽ bị gỡ bỏ bởi %s:\n"
+"%%sVui lòng di chuyển hay gỡ bỏ chúng trước khi bạn %s."
+
+#, c-format
+msgid ""
+"The following untracked working tree files would be removed by %s:\n"
+"%%s"
+msgstr ""
+"Các tập tin cây làm việc chưa được theo dõi sau đây sẽ bị gỡ bỏ bởi %s:\n"
+"%%s"
+
+#, c-format
+msgid ""
+"The following untracked working tree files would be overwritten by "
+"checkout:\n"
+"%%sPlease move or remove them before you switch branches."
+msgstr ""
+"Các tập tin cây làm việc chưa được theo dõi sau đây sẽ bị ghi đè bởi lệnh "
+"checkout:\n"
+"%%sVui lòng di chuyển hay gỡ bỏ chúng trước khi bạn chuyển nhánh."
+
+#, c-format
+msgid ""
+"The following untracked working tree files would be overwritten by "
+"checkout:\n"
+"%%s"
+msgstr ""
+"Các tập tin cây làm việc chưa được theo dõi sau đây sẽ bị ghi đè bởi lệnh "
+"checkout:\n"
+"%%s"
+
+#, c-format
+msgid ""
+"The following untracked working tree files would be overwritten by merge:\n"
+"%%sPlease move or remove them before you merge."
+msgstr ""
+"Các tập tin cây làm việc chưa được theo dõi sau đây sẽ bị ghi đè bởi lệnh "
+"hòa trộn:\n"
+"%%sVui lòng di chuyển hay gỡ bỏ chúng trước khi bạn hòa trộn."
+
+#, c-format
+msgid ""
+"The following untracked working tree files would be overwritten by merge:\n"
+"%%s"
+msgstr ""
+"Các tập tin cây làm việc chưa được theo dõi sau đây sẽ bị ghi đè bởi lệnh "
+"hòa trộn:\n"
+"%%s"
+
+#, c-format
+msgid ""
+"The following untracked working tree files would be overwritten by %s:\n"
+"%%sPlease move or remove them before you %s."
+msgstr ""
+"Các tập tin cây làm việc chưa được theo dõi sau đây sẽ bị ghi đè bởi lệnh "
+"%s:\n"
+"%%sVui lòng di chuyển hay gỡ bỏ chúng trước khi bạn %s."
+
+#, c-format
+msgid ""
+"The following untracked working tree files would be overwritten by %s:\n"
+"%%s"
+msgstr ""
+"Các tập tin cây làm việc chưa được theo dõi sau đây sẽ bị ghi đè bởi lệnh "
+"%s:\n"
+"%%s"
+
+#, c-format
+msgid "Entry '%s' overlaps with '%s'.  Cannot bind."
+msgstr "Mục “%s” đè lên “%s”. Không thể buộc."
+
+#, c-format
+msgid ""
+"Cannot update submodule:\n"
+"%s"
+msgstr ""
+"Không thể cập nhật mô-đun-con:\n"
+"%s"
+
+#, c-format
+msgid ""
+"The following paths are not up to date and were left despite sparse "
+"patterns:\n"
+"%s"
+msgstr ""
+"Các đường dẫn sau đây không được cập nhật và vẫn được để lại bất chấp các "
+"mẫu sparse:\n"
+"%s"
+
+#, c-format
+msgid ""
+"The following paths are unmerged and were left despite sparse patterns:\n"
+"%s"
+msgstr ""
+"Các đường dẫn theo sau đây chưa được hòa trộn và để bất chấp các mẫu "
+"sparse:\n"
+"%s"
+
+#, c-format
+msgid ""
+"The following paths were already present and thus not updated despite sparse "
+"patterns:\n"
+"%s"
+msgstr ""
+"Các đường dẫn sau đây đã sẵn hiện diện và như vậy không được cập nhật bất "
+"cấp các mẫu sparse:\n"
+"%s"
+
+#, c-format
+msgid "Aborting\n"
+msgstr "Bãi bỏ\n"
+
+#, c-format
+msgid ""
+"After fixing the above paths, you may want to run `git sparse-checkout "
+"reapply`.\n"
+msgstr ""
+"Sau khi sửa các đường dẫn phía trên, bạn có thể chạy “git sparse-checkout "
+"reapply“.\n"
+
+msgid "Updating files"
+msgstr "Đang cập nhật các tập tin"
+
+msgid ""
+"the following paths have collided (e.g. case-sensitive paths\n"
+"on a case-insensitive filesystem) and only one from the same\n"
+"colliding group is in the working tree:\n"
+msgstr ""
+"các đường dẫn sau đây có xung đột(vd: các đường dẫn phân biệt\n"
+"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"
+
+msgid "Updating index flags"
+msgstr "Đang cập nhật các cờ mục lục"
+
+#, 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"
+
+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"
+
+msgid "invalid URL scheme name or missing '://' suffix"
+msgstr "tên lược đồ URL không hợp lệ, hoặc thiếu hậu tố “://”"
+
+#, c-format
+msgid "invalid %XX escape sequence"
+msgstr "thoát chuỗi %XX không hợp lệ"
+
+msgid "missing host and scheme is not 'file:'"
+msgstr "thiếu máy chủ và lược đồ thì không phải là giao thức “file:”"
+
+msgid "a 'file:' URL may not have a port number"
+msgstr "một URL kiểu “file:” không được chứa cổng"
+
+msgid "invalid characters in host name"
+msgstr "có các ký tự không hợp lệ trong tên máy"
+
+msgid "invalid port number"
+msgstr "tên cổng không hợp lệ"
+
+msgid "invalid '..' path segment"
+msgstr "đoạn đường dẫn “..” không hợp lệ"
+
+msgid "Fetching objects"
+msgstr "Đang lấy về các đối tượng"
+
+#, c-format
+msgid "'%s' at main working tree is not the repository directory"
+msgstr "“%s” tại cây làm việc chình không phải là thư mục kho"
+
+#, c-format
+msgid "'%s' file does not contain absolute path to the working tree location"
+msgstr ""
+"tập tin “%s” không chứa đường dẫn tuyệt đối đến vị trí cây làm việc hiện"
+
+#, c-format
+msgid "'%s' is not a .git file, error code %d"
+msgstr "“%s” không phải là tập tin .git, mã lỗi %d"
+
+#, c-format
+msgid "'%s' does not point back to '%s'"
+msgstr "“%s” không chỉ ngược đến “%s”"
+
+msgid "not a directory"
+msgstr "không phải thư mục"
+
+msgid ".git is not a file"
+msgstr ".git không phải là một tập tin"
+
+msgid ".git file broken"
+msgstr "tệp .git bị hỏng"
+
+msgid ".git file incorrect"
+msgstr "tập tin .git không chính xác"
+
+msgid "not a valid path"
+msgstr "không phải là một đường dẫn hợp lệ"
+
+msgid "unable to locate repository; .git is not a file"
+msgstr "không thể phân bổ kho chứa; .git không phải là một tập tin"
+
+msgid "unable to locate repository; .git file does not reference a repository"
+msgstr "không thể phân bổ kho chứa; tập tin .git tham chiếu đến một kho"
+
+msgid "unable to locate repository; .git file broken"
+msgstr "không thể phân bổ kho chứa; tập tin .git bị hỏng"
+
+msgid "gitdir unreadable"
+msgstr "gitdir không thể đọc được"
+
+msgid "gitdir incorrect"
+msgstr "gitdir không chính xác"
+
+msgid "not a valid directory"
+msgstr "không phải thư mục hợp lệ"
+
+msgid "gitdir file does not exist"
+msgstr "tập tin gitdir không tồn tại"
+
+#, c-format
+msgid "unable to read gitdir file (%s)"
+msgstr "không thể đọc tập tin gitdir (%s)"
+
+#, c-format
+msgid "short read (expected %<PRIuMAX> bytes, read %<PRIuMAX>)"
+msgstr "đọc ngắn (cần %<PRIuMAX> byte, đọc %<PRIuMAX>)"
+
+msgid "invalid gitdir file"
+msgstr "tập tin gitdir (thư mục git) không hợp lệ"
+
+msgid "gitdir file points to non-existent location"
+msgstr "tập tin gitdir chỉ đến vị trí không tồn tại"
+
+#, c-format
+msgid "unable to set %s in '%s'"
+msgstr "không thể đặt %s trong “%s”"
+
+#, c-format
+msgid "unable to unset %s in '%s'"
+msgstr "không thể bỏ đặt %s trong '%s'"
+
+msgid "failed to set extensions.worktreeConfig setting"
+msgstr "gặp lỗi khi đặt cài đặt extensions.worktreeConfig"
+
+#, c-format
+msgid "could not setenv '%s'"
+msgstr "không thể setenv “%s”"
+
+#, c-format
+msgid "unable to create '%s'"
+msgstr "không thể tạo “%s”"
+
+#, c-format
+msgid "could not open '%s' for reading and writing"
+msgstr "không thể mở “%s” để đọc và ghi"
+
+#, c-format
+msgid "unable to access '%s'"
+msgstr "không thể truy cập “%s”"
+
+msgid "unable to get current working directory"
+msgstr "không thể lấy thư mục làm việc hiện hành"
+
+msgid "Unmerged paths:"
+msgstr "Những đường dẫn chưa được hòa trộn:"
+
+msgid "  (use \"git restore --staged <file>...\" to unstage)"
+msgstr "  (dùng \"git restore --staged <tập-tin>…\" để bỏ ra khỏi bệ phóng)"
+
+#, c-format
+msgid "  (use \"git restore --source=%s --staged <file>...\" to unstage)"
+msgstr ""
+"  (dùng \"git restore --source=%s --staged <tập-tin>…\" để bỏ ra khỏi bệ "
+"phóng)"
+
+msgid "  (use \"git rm --cached <file>...\" to unstage)"
+msgstr "  (dùng \"git rm --cached <tập-tin>…\" để bỏ ra khỏi bệ phóng)"
+
+msgid "  (use \"git add <file>...\" to mark resolution)"
+msgstr "  (dùng \"git add <tập-tin>…\" để đánh dấu là cần giải quyết)"
+
+msgid "  (use \"git add/rm <file>...\" as appropriate to mark resolution)"
+msgstr ""
+"  (dùng \"git add/rm <tập-tin>…\" như là một cách thích hợp để đánh dấu là "
+"cần được giải quyết)"
+
+msgid "  (use \"git rm <file>...\" to mark resolution)"
+msgstr "  (dùng \"git rm <tập-tin>…\" để đánh dấu là cần giải quyết)"
+
+msgid "Changes to be committed:"
+msgstr "Những thay đổi sẽ được chuyển giao:"
+
+msgid "Changes not staged for commit:"
+msgstr "Các thay đổi chưa được đặt lên bệ phóng để chuyển giao:"
+
+msgid "  (use \"git add <file>...\" to update what will be committed)"
+msgstr "  (dùng \"git add <tập-tin>…\" để cập nhật những gì sẽ chuyển giao)"
+
+msgid "  (use \"git add/rm <file>...\" to update what will be committed)"
+msgstr ""
+"  (dùng \"git add/rm <tập-tin>…\" để cập nhật những gì sẽ được chuyển giao)"
+
+msgid ""
+"  (use \"git restore <file>...\" to discard changes in working directory)"
+msgstr ""
+"  (dùng \"git restore <tập-tin>…\" để loại bỏ các thay đổi trong thư mục làm "
+"việc)"
+
+msgid "  (commit or discard the untracked or modified content in submodules)"
+msgstr ""
+"  (chuyển giao hoặc là loại bỏ các nội dung chưa được theo dõi hay đã sửa "
+"chữa trong mô-đun-con)"
+
+#, c-format
+msgid "  (use \"git %s <file>...\" to include in what will be committed)"
+msgstr ""
+"  (dùng \"git %s <tập-tin>…\" để thêm vào những gì cần được chuyển giao)"
+
+msgid "both deleted:"
+msgstr "bị xóa bởi cả hai:"
+
+msgid "added by us:"
+msgstr "được thêm vào bởi chúng ta:"
+
+msgid "deleted by them:"
+msgstr "bị xóa đi bởi họ:"
+
+msgid "added by them:"
+msgstr "được thêm vào bởi họ:"
+
+msgid "deleted by us:"
+msgstr "bị xóa bởi chúng ta:"
+
+msgid "both added:"
+msgstr "được thêm vào bởi cả hai:"
+
+msgid "both modified:"
+msgstr "bị sửa bởi cả hai:"
+
+msgid "new file:"
+msgstr "tập tin mới:"
+
+msgid "copied:"
+msgstr "đã chép:"
+
+msgid "deleted:"
+msgstr "đã xóa:"
+
+msgid "modified:"
+msgstr "đã sửa:"
+
+msgid "renamed:"
+msgstr "đã đổi tên:"
+
+msgid "typechange:"
+msgstr "đổi-kiểu:"
+
+msgid "unknown:"
+msgstr "không hiểu:"
+
+msgid "unmerged:"
+msgstr "chưa hòa trộn:"
+
+msgid "new commits, "
+msgstr "lần chuyển giao mới, "
+
+msgid "modified content, "
+msgstr "nội dung bị sửa đổi, "
+
+msgid "untracked content, "
+msgstr "nội dung chưa được theo dõi, "
+
+#, c-format
+msgid "Your stash currently has %d entry"
+msgid_plural "Your stash currently has %d entries"
+msgstr[0] "Bạn hiện nay ở trong phần cất đi đang có %d mục"
+
+msgid "Submodules changed but not updated:"
+msgstr "Những mô-đun-con đã bị thay đổi nhưng chưa được cập nhật:"
+
+msgid "Submodule changes to be committed:"
+msgstr "Những mô-đun-con thay đổi đã được chuyển giao:"
+
+msgid ""
+"Do not modify or remove the line above.\n"
+"Everything below it will be ignored."
+msgstr ""
+"Không sửa hay xóa bỏ đường ở trên.\n"
+"Mọi thứ phía dưới sẽ được xóa bỏ."
+
+#, c-format
+msgid ""
+"\n"
+"It took %.2f seconds to compute the branch ahead/behind values.\n"
+"You can use '--no-ahead-behind' to avoid this.\n"
+msgstr ""
+"\n"
+"Nó cần %.2f giây để tính toán giá trị của trước/sau của nhánh.\n"
+"Bạn có thể dùng “--no-ahead-behind” tránh phải điều này.\n"
+
+msgid "You have unmerged paths."
+msgstr "Bạn có những đường dẫn chưa được hòa trộn."
+
+msgid "  (fix conflicts and run \"git commit\")"
+msgstr "  (sửa các xung đột rồi chạy \"git commit\")"
+
+msgid "  (use \"git merge --abort\" to abort the merge)"
+msgstr "  (dùng \"git merge --abort\" để bãi bỏ việc hòa trộn)"
+
+msgid "All conflicts fixed but you are still merging."
+msgstr "Tất cả các xung đột đã được giải quyết nhưng bạn vẫn đang hòa trộn."
+
+msgid "  (use \"git commit\" to conclude merge)"
+msgstr "  (dùng \"git commit\" để hoàn tất việc hòa trộn)"
+
+msgid "You are in the middle of an am session."
+msgstr "Bạn đang ở giữa của một phiên “am”."
+
+msgid "The current patch is empty."
+msgstr "Miếng vá hiện tại bị trống rỗng."
+
+msgid "  (fix conflicts and then run \"git am --continue\")"
+msgstr "  (sửa các xung đột và sau đó chạy lệnh \"git am --continue\")"
+
+msgid "  (use \"git am --skip\" to skip this patch)"
+msgstr "  (dùng \"git am --skip\" để bỏ qua miếng vá này)"
+
+msgid ""
+"  (use \"git am --allow-empty\" to record this patch as an empty commit)"
+msgstr ""
+"  (dùng \"git am --allow-empty\" ghi miếng vá này như một lần chuyển giao "
+"rỗng)"
+
+msgid "  (use \"git am --abort\" to restore the original branch)"
+msgstr "  (dùng \"git am --abort\" để phục hồi lại nhánh nguyên thủy)"
+
+msgid "git-rebase-todo is missing."
+msgstr "thiếu git-rebase-todo."
+
+msgid "No commands done."
+msgstr "Không thực hiện lệnh nào."
+
+#, c-format
+msgid "Last command done (%<PRIuMAX> command done):"
+msgid_plural "Last commands done (%<PRIuMAX> commands done):"
+msgstr[0] "Lệnh thực hiện cuối (%<PRIuMAX> lệnh được thực thi):"
+
+#, c-format
+msgid "  (see more in file %s)"
+msgstr "  (xem thêm trong %s)"
+
+msgid "No commands remaining."
+msgstr "Không có lệnh nào còn lại."
+
+#, c-format
+msgid "Next command to do (%<PRIuMAX> remaining command):"
+msgid_plural "Next commands to do (%<PRIuMAX> remaining commands):"
+msgstr[0] "Lệnh cần làm kế tiếp (%<PRIuMAX> lệnh còn lại):"
+
+msgid "  (use \"git rebase --edit-todo\" to view and edit)"
+msgstr "  (dùng lệnh \"git rebase --edit-todo\" để xem và sửa)"
+
+#, c-format
+msgid "You are currently rebasing branch '%s' on '%s'."
+msgstr "Bạn hiện nay đang thực hiện việc “rebase” nhánh “%s” trên “%s”."
+
+msgid "You are currently rebasing."
+msgstr "Bạn hiện nay đang thực hiện việc “rebase” (cải tổ)."
+
+msgid "  (fix conflicts and then run \"git rebase --continue\")"
+msgstr ""
+"  (sửa các xung đột và sau đó chạy lệnh “cải tổ” \"git rebase --continue\")"
+
+msgid "  (use \"git rebase --skip\" to skip this patch)"
+msgstr "  (dùng lệnh “cải tổ” \"git rebase --skip\" để bỏ qua lần vá này)"
+
+msgid "  (use \"git rebase --abort\" to check out the original branch)"
+msgstr ""
+"  (dùng lệnh “cải tổ” \"git rebase --abort\" để check-out nhánh nguyên thủy)"
+
+msgid "  (all conflicts fixed: run \"git rebase --continue\")"
+msgstr ""
+"  (khi tất cả các xung đột đã sửa xong: chạy lệnh “cải tổ” \"git rebase --"
+"continue\")"
+
+#, c-format
+msgid ""
+"You are currently splitting a commit while rebasing branch '%s' on '%s'."
+msgstr ""
+"Bạn hiện nay đang thực hiện việc chia tách một lần chuyển giao trong khi "
+"đang “rebase” nhánh “%s” trên “%s”."
+
+msgid "You are currently splitting a commit during a rebase."
+msgstr ""
+"Bạn hiện tại đang cắt đôi một lần chuyển giao trong khi đang thực hiện việc "
+"rebase."
+
+msgid "  (Once your working directory is clean, run \"git rebase --continue\")"
+msgstr ""
+"  (Một khi thư mục làm việc của bạn đã gọn gàng, chạy lệnh “cải tổ” \"git "
+"rebase --continue\")"
+
+#, c-format
+msgid "You are currently editing a commit while rebasing branch '%s' on '%s'."
+msgstr ""
+"Bạn hiện nay đang thực hiện việc sửa chữa một lần chuyển giao trong khi đang "
+"rebase nhánh “%s” trên “%s”."
+
+msgid "You are currently editing a commit during a rebase."
+msgstr "Bạn hiện đang sửa một lần chuyển giao trong khi bạn thực hiện rebase."
+
+msgid "  (use \"git commit --amend\" to amend the current commit)"
+msgstr "  (dùng \"git commit --amend\" để “tu bổ” lần chuyển giao hiện tại)"
+
+msgid ""
+"  (use \"git rebase --continue\" once you are satisfied with your changes)"
+msgstr ""
+"  (chạy lệnh “cải tổ” \"git rebase --continue\" một khi bạn cảm thấy hài "
+"lòng về những thay đổi của mình)"
+
+msgid "Cherry-pick currently in progress."
+msgstr "Cherry-pick hiện tại đang được thực hiện."
+
+#, c-format
+msgid "You are currently cherry-picking commit %s."
+msgstr "Bạn hiện nay đang thực hiện việc cherry-pick lần chuyển giao %s."
+
+msgid "  (fix conflicts and run \"git cherry-pick --continue\")"
+msgstr ""
+"  (sửa các xung đột và sau đó chạy lệnh \"git cherry-pick --continue\")"
+
+msgid "  (run \"git cherry-pick --continue\" to continue)"
+msgstr "  (chạy lệnh \"git cherry-pick --continue\" để tiếp tục)"
+
+msgid "  (all conflicts fixed: run \"git cherry-pick --continue\")"
+msgstr ""
+"  (khi tất cả các xung đột đã sửa xong: chạy lệnh \"git cherry-pick --"
+"continue\")"
+
+msgid "  (use \"git cherry-pick --skip\" to skip this patch)"
+msgstr "  (dùng \"git cherry-pick --skip\" để bỏ qua miếng vá này)"
+
+msgid "  (use \"git cherry-pick --abort\" to cancel the cherry-pick operation)"
+msgstr "  (dùng \"git cherry-pick --abort\" để hủy bỏ thao tác cherry-pick)"
+
+msgid "Revert currently in progress."
+msgstr "Hoàn nguyên hiện tại đang thực hiện."
+
+#, c-format
+msgid "You are currently reverting commit %s."
+msgstr "Bạn hiện nay đang thực hiện thao tác hoàn nguyên lần chuyển giao “%s”."
+
+msgid "  (fix conflicts and run \"git revert --continue\")"
+msgstr "  (sửa các xung đột và sau đó chạy lệnh \"git revert --continue\")"
+
+msgid "  (run \"git revert --continue\" to continue)"
+msgstr "  (chạy lệnh \"git revert --continue\" để tiếp tục)"
+
+msgid "  (all conflicts fixed: run \"git revert --continue\")"
+msgstr ""
+"  (khi tất cả các xung đột đã sửa xong: chạy lệnh \"git revert --continue\")"
+
+msgid "  (use \"git revert --skip\" to skip this patch)"
+msgstr "  (dùng lệnh \"git revert --skip\" để bỏ qua lần vá này)"
+
+msgid "  (use \"git revert --abort\" to cancel the revert operation)"
+msgstr "  (dùng \"git revert --abort\" để hủy bỏ thao tác hoàn nguyên)"
+
+#, c-format
+msgid "You are currently bisecting, started from branch '%s'."
+msgstr ""
+"Bạn hiện nay đang thực hiện thao tác di chuyển nửa bước (bisect), bắt đầu từ "
+"nhánh “%s”."
+
+msgid "You are currently bisecting."
+msgstr "Bạn hiện tại đang thực hiện việc bisect (di chuyển nửa bước)."
+
+msgid "  (use \"git bisect reset\" to get back to the original branch)"
+msgstr "  (dùng \"git bisect reset\" để quay trở lại nhánh nguyên thủy)"
+
+msgid "You are in a sparse checkout."
+msgstr "Bạn đang trong lần lấy ra sparse."
+
+#, c-format
+msgid "You are in a sparse checkout with %d%% of tracked files present."
+msgstr ""
+"Bạn đang ở trong lần lấy ra sparser %d%% của các tập tin được theo dõi hiện "
+"tại."
+
+msgid "On branch "
+msgstr "Trên nhánh "
+
+msgid "interactive rebase in progress; onto "
+msgstr "rebase ở chế độ tương tác đang được thực hiện; lên trên "
+
+msgid "rebase in progress; onto "
+msgstr "rebase đang được thực hiện: lên trên "
+
+msgid "HEAD detached at "
+msgstr "HEAD được tách rời tại "
+
+msgid "HEAD detached from "
+msgstr "HEAD được tách rời từ "
+
+msgid "Not currently on any branch."
+msgstr "Hiện tại chẳng ở nhánh nào cả."
+
+msgid "Initial commit"
+msgstr "Lần chuyển giao khởi tạo"
+
+msgid "No commits yet"
+msgstr "Vẫn chưa chuyển giao"
+
+msgid "Untracked files"
+msgstr "Những tập tin chưa được theo dõi"
+
+msgid "Ignored files"
+msgstr "Những tập tin bị lờ đi"
+
+#, c-format
+msgid ""
+"It took %.2f seconds to enumerate untracked files. 'status -uno'\n"
+"may speed it up, but you have to be careful not to forget to add\n"
+"new files yourself (see 'git help status')."
+msgstr ""
+"Cần %.2f giây để liệt kê tất cả các tập tin chưa được theo dõi. “status -"
+"uno”\n"
+"có lẽ làm nó nhanh hơn, nhưng bạn phải cẩn thận đừng quên mình phải\n"
+"tự thêm các tập tin mới (xem “git help status”.."
+
+#, c-format
+msgid "Untracked files not listed%s"
+msgstr "Những tập tin chưa được theo dõi không được liệt kê ra %s"
+
+msgid " (use -u option to show untracked files)"
+msgstr " (dùng tùy chọn -u để hiển thị các tập tin chưa được theo dõi)"
+
+msgid "No changes"
+msgstr "Không có thay đổi nào"
+
+#, c-format
+msgid "no changes added to commit (use \"git add\" and/or \"git commit -a\")\n"
+msgstr ""
+"không có thay đổi nào được thêm vào để chuyển giao (dùng \"git add\" và/hoặc "
+"\"git commit -a\")\n"
+
+#, c-format
+msgid "no changes added to commit\n"
+msgstr "không có thay đổi nào được thêm vào để chuyển giao\n"
+
+#, c-format
+msgid ""
+"nothing added to commit but untracked files present (use \"git add\" to "
+"track)\n"
+msgstr ""
+"không có gì được thêm vào lần chuyển giao nhưng có những tập tin chưa được "
+"theo dõi hiện diện (dùng \"git add\" để đưa vào theo dõi)\n"
+
+#, c-format
+msgid "nothing added to commit but untracked files present\n"
+msgstr ""
+"không có gì được thêm vào lần chuyển giao nhưng có những tập tin chưa được "
+"theo dõi hiện diện\n"
+
+#, c-format
+msgid "nothing to commit (create/copy files and use \"git add\" to track)\n"
+msgstr ""
+"không có gì để chuyển giao (tạo/sao-chép các tập tin và dùng \"git add\" để "
+"đưa vào theo dõi)\n"
+
+#, c-format
+msgid "nothing to commit\n"
+msgstr "không có gì để chuyển giao\n"
+
+#, c-format
+msgid "nothing to commit (use -u to show untracked files)\n"
+msgstr ""
+"không có gì để chuyển giao (dùng -u xem các tập tin chưa được theo dõi)\n"
+
+#, c-format
+msgid "nothing to commit, working tree clean\n"
+msgstr "không có gì để chuyển giao, thư mục làm việc sạch sẽ\n"
+
+msgid "No commits yet on "
+msgstr "Vẫn không thực hiện lệnh chuyển giao nào "
+
+msgid "HEAD (no branch)"
+msgstr "HEAD (không nhánh)"
+
+msgid "different"
+msgstr "khác"
+
+msgid "behind "
+msgstr "đằng sau "
+
+msgid "ahead "
+msgstr "phía trước "
+
+#. TRANSLATORS: the action is e.g. "pull with rebase"
+#, c-format
+msgid "cannot %s: You have unstaged changes."
+msgstr "không thể %s: Bạn có các thay đổi chưa được đưa lên bệ phóng."
+
+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."
+
+#, c-format
+msgid "cannot %s: Your index contains uncommitted changes."
+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."
+
 msgid ""
 "Error: Your local changes to the following files would be overwritten by "
 "merge"
@@ -26215,99 +21200,80 @@ msgstr ""
 "Lỗi: Các thay đổi nội bộ của bạn với các tập tin sau đây sẽ bị ghi đè bởi "
 "lệnh hòa trộn"
 
-#: git-merge-octopus.sh:61
 msgid "Automated merge did not work."
 msgstr "Hòa trộn một cách tự động không làm việc."
 
-#: git-merge-octopus.sh:62
 msgid "Should not be doing an octopus."
 msgstr "Không thể thực hiện một octopus."
 
-#: git-merge-octopus.sh:73
 #, sh-format
 msgid "Unable to find common commit with $pretty_name"
 msgstr "Không thể tìm thấy lần chuyển giao chung với $pretty_name"
 
-#: git-merge-octopus.sh:77
 #, sh-format
 msgid "Already up to date with $pretty_name"
 msgstr "Đã cập nhật với $pretty_name rồi"
 
-#: git-merge-octopus.sh:89
 #, sh-format
 msgid "Fast-forwarding to: $pretty_name"
 msgstr "Chuyển-tiếp-nhanh đến: $pretty_name"
 
-#: git-merge-octopus.sh:97
 #, sh-format
 msgid "Trying simple merge with $pretty_name"
 msgstr "Đang thử hòa trộn đơn giản với $pretty_name"
 
-#: git-merge-octopus.sh:102
 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-sh-setup.sh:89 git-sh-setup.sh:94
 #, sh-format
 msgid "usage: $dashless $USAGE"
 msgstr "cách dùng: $dashless $USAGE"
 
-#: git-sh-setup.sh:182
 #, sh-format
 msgid "Cannot chdir to $cdup, the toplevel of the working tree"
 msgstr ""
 "Không thể chuyển thư mục (chdir) sang $cdup, thư mục ở mức cao nhất của cây "
 "làm việc"
 
-#: git-sh-setup.sh:191 git-sh-setup.sh:198
 #, sh-format
 msgid "fatal: $program_name cannot be used without a working tree."
 msgstr ""
 "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:212
 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:215
 #, 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:226
 #, 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:228
 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:348
 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:353
 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"
 
 #. TRANSLATORS: you can adjust this to align "git add -i" status menu
-#: git-add--interactive.perl:212
 #, perl-format
 msgid "%12s %12s %s"
 msgstr "%12s %12s %s"
 
-#: git-add--interactive.perl:632
 #, perl-format
 msgid "touched %d path\n"
 msgid_plural "touched %d paths\n"
 msgstr[0] "%d đường dẫn đã touch (chạm)\n"
 
-#: git-add--interactive.perl:1056
 msgid ""
 "If the patch applies cleanly, the edited hunk will immediately be\n"
 "marked for staging."
@@ -26315,7 +21281,6 @@ msgstr ""
 "Nếu miếng vá được áp dụng sạch sẽ, khúc đã sửa sẽ ngay lập tức\n"
 "được đánh dấu để chuyển lên bệ phóng."
 
-#: git-add--interactive.perl:1059
 msgid ""
 "If the patch applies cleanly, the edited hunk will immediately be\n"
 "marked for stashing."
@@ -26323,7 +21288,6 @@ msgstr ""
 "Nếu miếng vá được áp dụng sạch sẽ, khúc đã sửa sẽ ngay lập tức\n"
 "được đánh dấu để tạm cất."
 
-#: git-add--interactive.perl:1062
 msgid ""
 "If the patch applies cleanly, the edited hunk will immediately be\n"
 "marked for unstaging."
@@ -26331,8 +21295,6 @@ msgstr ""
 "Nếu miếng vá được áp dụng sạch sẽ, khúc đã sửa sẽ ngay lập tức\n"
 "được đánh dấu để bỏ chuyển lên bệ phóng."
 
-#: git-add--interactive.perl:1065 git-add--interactive.perl:1074
-#: git-add--interactive.perl:1080
 msgid ""
 "If the patch applies cleanly, the edited hunk will immediately be\n"
 "marked for applying."
@@ -26340,8 +21302,6 @@ msgstr ""
 "Nếu miếng vá được áp dụng sạch sẽ, khúc đã sửa sẽ ngay lập tức\n"
 "được đánh dấu để áp dụng."
 
-#: git-add--interactive.perl:1068 git-add--interactive.perl:1071
-#: git-add--interactive.perl:1077
 msgid ""
 "If the patch applies cleanly, the edited hunk will immediately be\n"
 "marked for discarding."
@@ -26349,12 +21309,10 @@ msgstr ""
 "Nếu miếng vá được áp dụng sạch sẽ, khúc đã sửa sẽ ngay lập tức\n"
 "được đánh dấu để loại bỏ."
 
-#: git-add--interactive.perl:1114
 #, perl-format
 msgid "failed to open hunk edit file for writing: %s"
 msgstr "gặp lỗi khi tập tin sửa khúc để ghi: %s"
 
-#: git-add--interactive.perl:1121
 #, perl-format
 msgid ""
 "---\n"
@@ -26367,12 +21325,10 @@ msgstr ""
 "Để xóa bỏ dòng “%s”, xóa chúng đi.\n"
 "Những dòng bắt đầu bằng %s sẽ bị loại bỏ.\n"
 
-#: git-add--interactive.perl:1143
 #, perl-format
 msgid "failed to open hunk edit file for reading: %s"
 msgstr "gặp lỗi khi mở tập tin khúc để đọc: %s"
 
-#: git-add--interactive.perl:1253
 msgid ""
 "y - stage this hunk\n"
 "n - do not stage this hunk\n"
@@ -26387,7 +21343,6 @@ msgstr ""
 "d - đừng đưa lên bệ phóng khúc này cũng như bất kỳ cái nào còn lại trong tập "
 "tin"
 
-#: git-add--interactive.perl:1259
 msgid ""
 "y - stash this hunk\n"
 "n - do not stash this hunk\n"
@@ -26401,7 +21356,6 @@ msgstr ""
 "a - tạm cất khúc này và tất cả các khúc sau này trong tập tin\n"
 "d - đừng tạm cất khúc này cũng như bất kỳ cái nào còn lại trong tập tin"
 
-#: git-add--interactive.perl:1265
 msgid ""
 "y - unstage this hunk\n"
 "n - do not unstage this hunk\n"
@@ -26417,7 +21371,6 @@ msgstr ""
 "d - đừng đưa ra khỏi bệ phóng khúc này cũng như bất kỳ cái nào còn lại trong "
 "tập tin"
 
-#: git-add--interactive.perl:1271
 msgid ""
 "y - apply this hunk to index\n"
 "n - do not apply this hunk to index\n"
@@ -26431,7 +21384,6 @@ msgstr ""
 "a - áp dụng khúc này và tất cả các khúc sau này trong tập tin\n"
 "d - đừng áp dụng khúc này cũng như bất kỳ cái nào sau này trong tập tin"
 
-#: git-add--interactive.perl:1277 git-add--interactive.perl:1295
 msgid ""
 "y - discard this hunk from worktree\n"
 "n - do not discard this hunk from worktree\n"
@@ -26445,7 +21397,6 @@ msgstr ""
 "a - loại bỏ khúc này và tất cả các khúc sau này trong tập tin\n"
 "d - đừng loại bỏ khúc này cũng như bất kỳ cái nào sau này trong tập tin"
 
-#: git-add--interactive.perl:1283
 msgid ""
 "y - discard this hunk from index and worktree\n"
 "n - do not discard this hunk from index and worktree\n"
@@ -26459,7 +21410,6 @@ msgstr ""
 "a - loại bỏ khúc này và tất cả các khúc sau này trong tập tin\n"
 "d - đừng loại bỏ khúc này cũng như bất kỳ cái nào sau này trong tập tin"
 
-#: git-add--interactive.perl:1289
 msgid ""
 "y - apply this hunk to index and worktree\n"
 "n - do not apply this hunk to index and worktree\n"
@@ -26473,7 +21423,6 @@ msgstr ""
 "a - áp dụng khúc này và tất cả các khúc sau này trong tập tin\n"
 "d - đừng áp dụng khúc này cũng như bất kỳ cái nào sau này trong tập tin"
 
-#: git-add--interactive.perl:1301
 msgid ""
 "y - apply this hunk to worktree\n"
 "n - do not apply this hunk to worktree\n"
@@ -26487,7 +21436,6 @@ msgstr ""
 "a - áp dụng khúc này và tất cả các khúc sau này trong tập tin\n"
 "d - đừng áp dụng khúc này cũng như bất kỳ cái nào sau này trong tập tin"
 
-#: git-add--interactive.perl:1316
 msgid ""
 "g - select a hunk to go to\n"
 "/ - search for a hunk matching the given regex\n"
@@ -26509,88 +21457,70 @@ msgstr ""
 "e - sửa bằng tay khúc hiện hành\n"
 "? - in trợ giúp\n"
 
-#: git-add--interactive.perl:1347
 msgid "The selected hunks do not apply to the index!\n"
 msgstr "Các khúc đã chọn không được áp dụng vào bảng mục lục!\n"
 
-#: git-add--interactive.perl:1362
 #, perl-format
 msgid "ignoring unmerged: %s\n"
 msgstr "bỏ qua những thứ chưa hòa trộn: %s\n"
 
-#: git-add--interactive.perl:1481
 #, perl-format
 msgid "Apply mode change to worktree [y,n,q,a,d%s,?]? "
 msgstr "Áp dụng thay đổi chế độ cho cây làm việc [y,n,q,a,d%s,?]? "
 
-#: git-add--interactive.perl:1482
 #, perl-format
 msgid "Apply deletion to worktree [y,n,q,a,d%s,?]? "
 msgstr "Áp dụng việc xóa cho cây làm việc [y,n,q,a,d%s,?]? "
 
-#: git-add--interactive.perl:1483
 #, perl-format
 msgid "Apply addition to worktree [y,n,q,a,d%s,?]? "
 msgstr "Áp dụng việc thêm cho cây làm việc [y,n,q,a,d%s,?]? "
 
-#: git-add--interactive.perl:1484
 #, perl-format
 msgid "Apply this hunk to worktree [y,n,q,a,d%s,?]? "
 msgstr "Áp dụng khúc này vào cây làm việc [y,n,q,a,d%s,?]? "
 
-#: git-add--interactive.perl:1601
 msgid "No other hunks to goto\n"
 msgstr "Không còn khúc nào để mà nhảy đến\n"
 
-#: git-add--interactive.perl:1619
 #, perl-format
 msgid "Invalid number: '%s'\n"
 msgstr "Số không hợp lệ: “%s”\n"
 
-#: git-add--interactive.perl:1624
 #, perl-format
 msgid "Sorry, only %d hunk available.\n"
 msgid_plural "Sorry, only %d hunks available.\n"
 msgstr[0] "Rất tiếc, chỉ có sẵn %d khúc.\n"
 
-#: git-add--interactive.perl:1659
 msgid "No other hunks to search\n"
 msgstr "Không còn khúc nào để mà tìm kiếm\n"
 
-#: git-add--interactive.perl:1676
 #, perl-format
 msgid "Malformed search regexp %s: %s\n"
 msgstr "Định dạng tìm kiếm của biểu thức chính quy không đúng %s: %s\n"
 
-#: git-add--interactive.perl:1686
 msgid "No hunk matches the given pattern\n"
 msgstr "Không thấy khúc nào khớp mẫu đã cho\n"
 
-#: git-add--interactive.perl:1698 git-add--interactive.perl:1720
 msgid "No previous hunk\n"
 msgstr "Không có khúc kế trước\n"
 
-#: git-add--interactive.perl:1707 git-add--interactive.perl:1726
 msgid "No next hunk\n"
 msgstr "Không có khúc kế tiếp\n"
 
-#: git-add--interactive.perl:1732
 msgid "Sorry, cannot split this hunk\n"
 msgstr "Rất tiếc, không thể chia nhỏ khúc này\n"
 
-#: git-add--interactive.perl:1738
 #, perl-format
 msgid "Split into %d hunk.\n"
 msgid_plural "Split into %d hunks.\n"
 msgstr[0] "Chi nhỏ thành %d khúc.\n"
 
-#: git-add--interactive.perl:1748
 msgid "Sorry, cannot edit this hunk\n"
 msgstr "Rất tiếc, không thể sửa khúc này\n"
 
 #. TRANSLATORS: please do not translate the command names
 #. 'status', 'update', 'revert', etc.
-#: git-add--interactive.perl:1813
 msgid ""
 "status        - show paths with changes\n"
 "update        - add working tree state to the staged set of changes\n"
@@ -26610,56 +21540,42 @@ msgstr ""
 "add untracked - thêm nội dung các các tập tin chưa theo dõi và tập hợp các "
 "thay đổi đã đặt lên bệ phóng\n"
 
-#: git-add--interactive.perl:1830 git-add--interactive.perl:1842
-#: git-add--interactive.perl:1845 git-add--interactive.perl:1852
-#: git-add--interactive.perl:1855 git-add--interactive.perl:1862
-#: git-add--interactive.perl:1866 git-add--interactive.perl:1872
 msgid "missing --"
 msgstr "thiếu --"
 
-#: git-add--interactive.perl:1868
 #, perl-format
 msgid "unknown --patch mode: %s"
 msgstr "không hiểu chế độ --patch: %s"
 
-#: git-add--interactive.perl:1874 git-add--interactive.perl:1880
 #, perl-format
 msgid "invalid argument %s, expecting --"
 msgstr "đối số không hợp lệ %s, cần --"
 
-#: git-send-email.perl:159
 msgid "local zone differs from GMT by a non-minute interval\n"
 msgstr "múi giờ nội bộ khác biệt với GMT bởi khoảng thời gian không-phút\n"
 
-#: git-send-email.perl:166 git-send-email.perl:172
 msgid "local time offset greater than or equal to 24 hours\n"
 msgstr "khoảng bù thời gian nội bộ lớn hơn hoặc bằng 24 giờ\n"
 
-#: git-send-email.perl:244
 #, 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"
 
-#: git-send-email.perl:257
 msgid "the editor exited uncleanly, aborting everything"
 msgstr "trình soạn thảo thoát không sạch sẽ, bãi bỏ mọi thứ"
 
-#: git-send-email.perl:346
 #, perl-format
 msgid ""
 "'%s' contains an intermediate version of the email you were composing.\n"
 msgstr "“%s” có chưa một phiên bản trung gian của thư bạn đã soạn.\n"
 
-#: git-send-email.perl:351
 #, perl-format
 msgid "'%s.final' contains the composed email.\n"
 msgstr "“%s.final” chứa thư điện tử đã soạn thảo.\n"
 
-#: git-send-email.perl:484
 msgid "--dump-aliases incompatible with other options\n"
 msgstr "--dump-aliases xung khắc với các tùy chọn khác\n"
 
-#: git-send-email.perl:561
 msgid ""
 "fatal: found configuration options for 'sendmail'\n"
 "git-send-email is configured with the sendemail.* options - note the 'e'.\n"
@@ -26669,11 +21585,9 @@ msgstr ""
 "git-send-email được cấu hình với các tùy chọn sendemail.* - chú ý “e”.\n"
 "Đặt sendemail.forbidSendmailVariables thành false để tắt kiểm tra này.\n"
 
-#: git-send-email.perl:566 git-send-email.perl:782
 msgid "Cannot run git format-patch from outside a repository\n"
 msgstr "Không thể chạy git format-patch ở ngoài một kho chứa\n"
 
-#: git-send-email.perl:569
 msgid ""
 "`batch-size` and `relogin` must be specified together (via command-line or "
 "configuration option)\n"
@@ -26681,37 +21595,30 @@ msgstr ""
 "“batch-size” và “relogin” phải được chỉ định cùng với nhau (thông qua dòng "
 "lệnh hoặc tùy chọn cấu hình)\n"
 
-#: git-send-email.perl:582
 #, perl-format
 msgid "Unknown --suppress-cc field: '%s'\n"
 msgstr "Không hiểu trường --suppress-cc: “%s”\n"
 
-#: git-send-email.perl:613
 #, perl-format
 msgid "Unknown --confirm setting: '%s'\n"
 msgstr "Không hiểu cài đặt --confirm: “%s”\n"
 
-#: git-send-email.perl:653
 #, perl-format
 msgid "warning: sendmail alias with quotes is not supported: %s\n"
 msgstr "cảnh báo: bí danh sendmail với dấu trích dẫn không được hỗ trợ: %s\n"
 
-#: git-send-email.perl:655
 #, perl-format
 msgid "warning: `:include:` not supported: %s\n"
 msgstr "cảnh báo: “:include:“ không được hỗ trợ: %s\n"
 
-#: git-send-email.perl:657
 #, perl-format
 msgid "warning: `/file` or `|pipe` redirection not supported: %s\n"
 msgstr "cảnh báo: chuyển hướng “/file“ hay “|pipe“ không được hỗ trợ: %s\n"
 
-#: git-send-email.perl:662
 #, perl-format
 msgid "warning: sendmail line is not recognized: %s\n"
 msgstr "cảnh báo: dòng sendmail không nhận ra được: %s\n"
 
-#: git-send-email.perl:747
 #, perl-format
 msgid ""
 "File '%s' exists but it could also be the range of commits\n"
@@ -26726,12 +21633,10 @@ msgstr ""
 "    * Nói \"./%s\" nếu ý bạn là một tập tin; hoặc\n"
 "    * Đưa ra tùy chọn --format-patch nếu ý bạn là chuẩn bị.\n"
 
-#: git-send-email.perl:768
 #, perl-format
 msgid "Failed to opendir %s: %s"
 msgstr "Gặp lỗi khi mở thư mục “%s”: %s"
 
-#: git-send-email.perl:803
 msgid ""
 "\n"
 "No patch files specified!\n"
@@ -26741,17 +21646,14 @@ msgstr ""
 "Chưa chỉ định các tập tin miếng vá!\n"
 "\n"
 
-#: git-send-email.perl:816
 #, perl-format
 msgid "No subject line in %s?"
 msgstr "Không có dòng chủ đề trong %s?"
 
-#: git-send-email.perl:827
 #, perl-format
 msgid "Failed to open for writing %s: %s"
 msgstr "Gặp lỗi khi mở “%s” để ghi: %s"
 
-#: git-send-email.perl:838
 msgid ""
 "Lines beginning in \"GIT:\" will be removed.\n"
 "Consider including an overall diffstat or table of contents\n"
@@ -26765,27 +21667,22 @@ msgstr ""
 "\n"
 "Xóa nội dung phần thân nếu bạn không muốn gửi tóm tắt.\n"
 
-#: git-send-email.perl:862
 #, perl-format
 msgid "Failed to open %s: %s"
 msgstr "Gặp lỗi khi mở “%s”: %s"
 
-#: git-send-email.perl:879
 #, perl-format
 msgid "Failed to open %s.final: %s"
 msgstr "Gặp lỗi khi mở %s.final: %s"
 
-#: git-send-email.perl:922
 msgid "Summary email is empty, skipping it\n"
 msgstr "Thư tổng thể là trống rỗng, nên bỏ qua nó\n"
 
 #. TRANSLATORS: please keep [y/N] as is.
-#: git-send-email.perl:971
 #, perl-format
 msgid "Are you sure you want to use <%s> [y/N]? "
 msgstr "Bạn có chắc muốn dùng <%s> [y/N]? "
 
-#: git-send-email.perl:1026
 msgid ""
 "The following files are 8bit, but do not declare a Content-Transfer-"
 "Encoding.\n"
@@ -26793,11 +21690,9 @@ msgstr ""
 "Các trường sau đây là 8bit, nhưng không khai báo một Content-Transfer-"
 "Encoding.\n"
 
-#: git-send-email.perl:1031
 msgid "Which 8bit encoding should I declare [UTF-8]? "
 msgstr "Bảng mã 8bit nào tôi nên khai báo [UTF-8]? "
 
-#: git-send-email.perl:1039
 #, perl-format
 msgid ""
 "Refusing to send because the patch\n"
@@ -26810,20 +21705,16 @@ msgstr ""
 "có chủ đề ở dạng mẫu “*** SUBJECT HERE ***”. Dùng --force nếu bạn thực sự "
 "muốn gửi.\n"
 
-#: git-send-email.perl:1058
 msgid "To whom should the emails be sent (if anyone)?"
 msgstr "Tới người mà thư được gửi (nếu có)?"
 
-#: git-send-email.perl:1076
 #, perl-format
 msgid "fatal: alias '%s' expands to itself\n"
 msgstr "nghiêm trọng: bí danh “%s” được khai triển thành chính nó\n"
 
-#: git-send-email.perl:1088
 msgid "Message-ID to be used as In-Reply-To for the first email (if any)? "
 msgstr "Message-ID được dùng như là In-Reply-To cho thư đầu tiên (nếu có)? "
 
-#: git-send-email.perl:1150 git-send-email.perl:1158
 #, perl-format
 msgid "error: unable to extract a valid address from: %s\n"
 msgstr "lỗi: không thể rút trích một địa chỉ hợp lệ từ: %s\n"
@@ -26831,16 +21722,13 @@ msgstr "lỗi: không thể rút trích một địa chỉ hợp lệ từ: %s\n
 #. 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:1162
 msgid "What to do with this address? ([q]uit|[d]rop|[e]dit): "
 msgstr "Làm gì với địa chỉ này? (thoát[q]|xóa[d]|sửa[e]): "
 
-#: git-send-email.perl:1482
 #, perl-format
 msgid "CA path \"%s\" does not exist"
 msgstr "Đường dẫn CA “%s” không tồn tại"
 
-#: git-send-email.perl:1565
 msgid ""
 "    The Cc list above has been expanded by additional\n"
 "    addresses found in the patch commit message. By default\n"
@@ -26867,114 +21755,90 @@ msgstr ""
 #. 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:1580
 msgid "Send this email? ([y]es|[n]o|[e]dit|[q]uit|[a]ll): "
 msgstr "Gửi thư này chứ? ([y]có|[n]không|[e]sửa|[q]thoát|[a]tất): "
 
-#: git-send-email.perl:1583
 msgid "Send this email reply required"
 msgstr "Gửi thư này trả lời yêu cầu"
 
-#: git-send-email.perl:1617
 msgid "The required SMTP server is not properly defined."
 msgstr "Máy phục vụ SMTP chưa được định nghĩa một cách thích hợp."
 
-#: git-send-email.perl:1664
 #, perl-format
 msgid "Server does not support STARTTLS! %s"
 msgstr "Máy chủ không hỗ trợ STARTTLS! %s"
 
-#: git-send-email.perl:1669 git-send-email.perl:1673
 #, perl-format
 msgid "STARTTLS failed! %s"
 msgstr "STARTTLS gặp lỗi! %s"
 
-#: git-send-email.perl:1682
 msgid "Unable to initialize SMTP properly. Check config and use --smtp-debug."
 msgstr ""
 "Không thể khởi tạo SMTP một cách đúng đắn. Kiểm tra cấu hình và dùng --smtp-"
 "debug."
 
-#: git-send-email.perl:1700
 #, perl-format
 msgid "Failed to send %s\n"
 msgstr "Gặp lỗi khi gửi %s\n"
 
-#: git-send-email.perl:1703
 #, perl-format
 msgid "Dry-Sent %s\n"
 msgstr "Thử gửi %s\n"
 
-#: git-send-email.perl:1703
 #, perl-format
 msgid "Sent %s\n"
 msgstr "Gửi %s\n"
 
-#: git-send-email.perl:1705
 msgid "Dry-OK. Log says:\n"
 msgstr "Dry-OK. Nhật ký nói rằng:\n"
 
-#: git-send-email.perl:1705
 msgid "OK. Log says:\n"
 msgstr "OK. Nhật ký nói rằng:\n"
 
-#: git-send-email.perl:1724
 msgid "Result: "
 msgstr "Kết quả: "
 
-#: git-send-email.perl:1727
 msgid "Result: OK\n"
 msgstr "Kết quả: Tốt\n"
 
-#: git-send-email.perl:1744
 #, perl-format
 msgid "can't open file %s"
 msgstr "không thể mở tập tin “%s”"
 
-#: git-send-email.perl:1792 git-send-email.perl:1812
 #, perl-format
 msgid "(mbox) Adding cc: %s from line '%s'\n"
 msgstr "(mbox) Thêm cc: %s từ dòng “%s”\n"
 
-#: git-send-email.perl:1798
 #, perl-format
 msgid "(mbox) Adding to: %s from line '%s'\n"
 msgstr "(mbox) Đang thêm to: %s từ dòng “%s”\n"
 
-#: git-send-email.perl:1855
 #, perl-format
 msgid "(non-mbox) Adding cc: %s from line '%s'\n"
 msgstr "(non-mbox) Thêm cc: %s từ dòng “%s”\n"
 
-#: git-send-email.perl:1890
 #, perl-format
 msgid "(body) Adding cc: %s from line '%s'\n"
 msgstr "(body) Thêm cc: %s từ dòng “%s”\n"
 
-#: git-send-email.perl:2009
 #, perl-format
 msgid "(%s) Could not execute '%s'"
 msgstr "(%s) Không thể thực thi “%s”"
 
-#: git-send-email.perl:2016
 #, perl-format
 msgid "(%s) Adding %s: %s from: '%s'\n"
 msgstr "(%s) Đang thêm %s: %s từ: “%s”\n"
 
-#: git-send-email.perl:2020
 #, 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:2050
 msgid "cannot send message as 7bit"
 msgstr "không thể lấy gửi thư dạng 7 bít"
 
-#: git-send-email.perl:2058
 msgid "invalid transfer encoding"
 msgstr "bảng mã truyền không hợp lệ"
 
-#: git-send-email.perl:2100
 #, perl-format
 msgid ""
 "fatal: %s: rejected by %s hook\n"
@@ -26985,12 +21849,10 @@ msgstr ""
 "%s\n"
 "cảnh báo: không có miếng vá nào được gửi đi\n"
 
-#: git-send-email.perl:2110 git-send-email.perl:2163 git-send-email.perl:2173
 #, perl-format
 msgid "unable to open %s: %s\n"
 msgstr "không thể mở %s: %s\n"
 
-#: git-send-email.perl:2113
 #, perl-format
 msgid ""
 "fatal: %s:%d is longer than 998 characters\n"
@@ -26999,17 +21861,41 @@ msgstr ""
 "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:2131
 #, 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:2135
 #, 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 "--preserve-merges was replaced by --rebase-merges"
+#~ msgstr "--preserve-merges đã bị thay thế bằng --rebase-merges"
+
+#, c-format
+#~ msgid ""
+#~ "CRLF will be replaced by LF in %s.\n"
+#~ "The file will have its original line endings in your working directory"
+#~ msgstr ""
+#~ "CRLF sẽ bị thay thế bằng LF trong %s.\n"
+#~ "Tập tin sẽ có kiểu xuống dòng như bản gốc trong thư mục làm việc của bạn"
+
+#, c-format
+#~ msgid ""
+#~ "LF will be replaced by CRLF in %s.\n"
+#~ "The file will have its original line endings in your working directory"
+#~ msgstr ""
+#~ "LF sẽ bị thay thế bằng CRLF trong %s.\n"
+#~ "Tập tin sẽ có kiểu xuống dòng như bản gốc trong thư mục làm việc của bạn"
+
+#, c-format
+#~ msgid "error reading section header '%s'"
+#~ msgstr "gặp lỗi khi đọc phần đầu của đoạn %s"
+
+#~ msgid "load_reverse_index: could not open pack"
+#~ msgstr "load_reverse_index: không thể mở gói"
+
 #, perl-format
 #~ msgid "fatal: %s: rejected by %s hook\n"
 #~ msgstr "lỗi nghiêm trọng: %s: bị từ chối bởi móc %s\n"
diff --git a/po/zh_CN.po b/po/zh_CN.po
index f0551f2c68..7de9c72d56 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -144,8 +144,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Git\n"
 "Report-Msgid-Bugs-To: Git Mailing List <git@vger.kernel.org>\n"
-"POT-Creation-Date: 2022-04-13 14:52+0800\n"
-"PO-Revision-Date: 2022-04-14 15:39+0100\n"
+"POT-Creation-Date: 2022-06-22 10:25+0100\n"
+"PO-Revision-Date: 2022-06-14 20:52+0100\n"
 "Last-Translator: Fangyi Zhou <me@fangyi.io>\n"
 "Language-Team: GitHub <https://github.com/fangyi-zhou/git-po/>\n"
 "Language: zh_CN\n"
@@ -155,243 +155,233 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 "X-Generator: Gtranslator 40.0\n"
 
-#: add-interactive.c:382
+#: add-interactive.c
 #, c-format
 msgid "Huh (%s)?"
 msgstr "嗯（%s）？"
 
-#: add-interactive.c:535 add-interactive.c:836 reset.c:136 sequencer.c:3505
-#: sequencer.c:3970 sequencer.c:4127 builtin/rebase.c:1261
-#: builtin/rebase.c:1671
+#: add-interactive.c builtin/rebase.c reset.c sequencer.c
 msgid "could not read index"
 msgstr "不能读取索引"
 
-#: add-interactive.c:590 git-add--interactive.perl:269
-#: git-add--interactive.perl:294
+#: add-interactive.c git-add--interactive.perl
 msgid "binary"
 msgstr "二进制"
 
-#: add-interactive.c:648 git-add--interactive.perl:278
-#: git-add--interactive.perl:332
+#: add-interactive.c git-add--interactive.perl
 msgid "nothing"
 msgstr "无"
 
-#: add-interactive.c:649 git-add--interactive.perl:314
-#: git-add--interactive.perl:329
+#: add-interactive.c git-add--interactive.perl
 msgid "unchanged"
 msgstr "没有修改"
 
-#: add-interactive.c:686 git-add--interactive.perl:641
+#: add-interactive.c git-add--interactive.perl
 msgid "Update"
 msgstr "更新"
 
-#: add-interactive.c:703 add-interactive.c:891
+#: add-interactive.c
 #, c-format
 msgid "could not stage '%s'"
 msgstr "不能暂存 '%s'"
 
-#: add-interactive.c:709 add-interactive.c:898 reset.c:160 sequencer.c:3709
+#: add-interactive.c builtin/stash.c reset.c sequencer.c
 msgid "could not write index"
 msgstr "不能写入索引"
 
-#: add-interactive.c:712 git-add--interactive.perl:626
+#: add-interactive.c git-add--interactive.perl
 #, 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:730 git-add--interactive.perl:676
+#: add-interactive.c git-add--interactive.perl
 #, c-format, perl-format
 msgid "note: %s is untracked now.\n"
 msgstr "说明：%s 现已成为未跟踪的。\n"
 
-#: add-interactive.c:735 apply.c:4133 builtin/checkout.c:311
-#: builtin/reset.c:167
+#: add-interactive.c apply.c builtin/checkout.c builtin/reset.c
 #, c-format
 msgid "make_cache_entry failed for path '%s'"
 msgstr "对路径 '%s' 的 make_cache_entry 操作失败"
 
-#: add-interactive.c:765 git-add--interactive.perl:653
+#: add-interactive.c git-add--interactive.perl
 msgid "Revert"
 msgstr "还原"
 
-#: add-interactive.c:781
+#: add-interactive.c
 msgid "Could not parse HEAD^{tree}"
 msgstr "不能解析 HEAD^{tree}"
 
-#: add-interactive.c:819 git-add--interactive.perl:629
+#: add-interactive.c git-add--interactive.perl
 #, 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:870 git-add--interactive.perl:693
+#: add-interactive.c git-add--interactive.perl
 #, c-format
 msgid "No untracked files.\n"
 msgstr "没有未跟踪的文件。\n"
 
-#: add-interactive.c:874 git-add--interactive.perl:687
+#: add-interactive.c git-add--interactive.perl
 msgid "Add untracked"
 msgstr "添加未跟踪的"
 
-#: add-interactive.c:901 git-add--interactive.perl:623
+#: add-interactive.c git-add--interactive.perl
 #, 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:931
+#: add-interactive.c
 #, c-format
 msgid "ignoring unmerged: %s"
 msgstr "忽略未合入的：%s"
 
-#: add-interactive.c:943 add-patch.c:1758 git-add--interactive.perl:1371
+#: add-interactive.c add-patch.c git-add--interactive.perl
 #, c-format
 msgid "Only binary files changed.\n"
 msgstr "只有二进制文件被修改。\n"
 
-#: add-interactive.c:945 add-patch.c:1756 git-add--interactive.perl:1373
+#: add-interactive.c add-patch.c git-add--interactive.perl
 #, c-format
 msgid "No changes.\n"
 msgstr "没有修改。\n"
 
-#: add-interactive.c:949 git-add--interactive.perl:1381
+#: add-interactive.c git-add--interactive.perl
 msgid "Patch update"
 msgstr "补丁更新"
 
-#: add-interactive.c:988 git-add--interactive.perl:1794
+#: add-interactive.c git-add--interactive.perl
 msgid "Review diff"
 msgstr "检视 diff"
 
-#: add-interactive.c:1016
+#: add-interactive.c
 msgid "show paths with changes"
 msgstr "显示含变更的路径"
 
-#: add-interactive.c:1018
+#: add-interactive.c
 msgid "add working tree state to the staged set of changes"
 msgstr "将工作区状态添加到暂存区修改集中"
 
-#: add-interactive.c:1020
+#: add-interactive.c
 msgid "revert staged set of changes back to the HEAD version"
 msgstr "将暂存的修改集恢复为 HEAD 版本"
 
-#: add-interactive.c:1022
+#: add-interactive.c
 msgid "pick hunks and update selectively"
 msgstr "挑选数据块并有选择地更新"
 
-#: add-interactive.c:1024
+#: add-interactive.c
 msgid "view diff between HEAD and index"
 msgstr "显示 HEAD 和索引的差异"
 
-#: add-interactive.c:1026
+#: add-interactive.c
 msgid "add contents of untracked files to the staged set of changes"
 msgstr "将未跟踪文件的内容添加到暂存区修改集中"
 
-#: add-interactive.c:1034 add-interactive.c:1083
+#: add-interactive.c
 msgid "Prompt help:"
 msgstr "帮助："
 
-#: add-interactive.c:1036
+#: add-interactive.c
 msgid "select a single item"
 msgstr "选择一个条目"
 
-#: add-interactive.c:1038
+#: add-interactive.c
 msgid "select a range of items"
 msgstr "选择一系列条目"
 
-#: add-interactive.c:1040
+#: add-interactive.c
 msgid "select multiple ranges"
 msgstr "选择多个范围"
 
-#: add-interactive.c:1042 add-interactive.c:1087
+#: add-interactive.c
 msgid "select item based on unique prefix"
 msgstr "基于唯一前缀选择条目"
 
-#: add-interactive.c:1044
+#: add-interactive.c
 msgid "unselect specified items"
 msgstr "反选指定的条目"
 
-#: add-interactive.c:1046
+#: add-interactive.c
 msgid "choose all items"
 msgstr "选择所有条目"
 
-#: add-interactive.c:1048
+#: add-interactive.c
 msgid "(empty) finish selecting"
 msgstr "（空）结束选择"
 
-#: add-interactive.c:1085
+#: add-interactive.c
 msgid "select a numbered item"
 msgstr "选择一个编号条目"
 
-#: add-interactive.c:1089
+#: add-interactive.c
 msgid "(empty) select nothing"
 msgstr "（空）不选择任何内容"
 
-#: add-interactive.c:1097 builtin/clean.c:839 git-add--interactive.perl:1898
+#: add-interactive.c builtin/clean.c git-add--interactive.perl
 msgid "*** Commands ***"
 msgstr "*** 命令 ***"
 
-#: add-interactive.c:1098 builtin/clean.c:840 git-add--interactive.perl:1895
+#: add-interactive.c builtin/clean.c git-add--interactive.perl
 msgid "What now"
 msgstr "请选择"
 
-#: add-interactive.c:1150 git-add--interactive.perl:213
+#: add-interactive.c git-add--interactive.perl
 msgid "staged"
 msgstr "缓存"
 
-#: add-interactive.c:1150 git-add--interactive.perl:213
+#: add-interactive.c git-add--interactive.perl
 msgid "unstaged"
 msgstr "未缓存"
 
-#: add-interactive.c:1150 apply.c:5002 apply.c:5005 builtin/am.c:2370
-#: builtin/am.c:2373 builtin/bugreport.c:107 builtin/clone.c:132
-#: builtin/fetch.c:154 builtin/merge.c:287 builtin/pull.c:194
-#: builtin/submodule--helper.c:412 builtin/submodule--helper.c:1872
-#: builtin/submodule--helper.c:1875 builtin/submodule--helper.c:2709
-#: builtin/submodule--helper.c:2712 builtin/submodule--helper.c:2891
-#: git-add--interactive.perl:213
+#: add-interactive.c apply.c builtin/am.c builtin/bugreport.c builtin/clone.c
+#: builtin/fetch.c builtin/merge.c builtin/pull.c builtin/submodule--helper.c
+#: git-add--interactive.perl
 msgid "path"
 msgstr "路径"
 
-#: add-interactive.c:1157
+#: add-interactive.c
 msgid "could not refresh index"
 msgstr "不能刷新索引"
 
-#: add-interactive.c:1171 builtin/clean.c:804 git-add--interactive.perl:1805
+#: add-interactive.c builtin/clean.c git-add--interactive.perl
 #, c-format
 msgid "Bye.\n"
 msgstr "再见。\n"
 
-#: add-patch.c:34 git-add--interactive.perl:1433
+#: add-patch.c git-add--interactive.perl
 #, c-format, perl-format
 msgid "Stage mode change [y,n,q,a,d%s,?]? "
 msgstr "暂存模式变更 [y,n,q,a,d%s,?]? "
 
-#: add-patch.c:35 git-add--interactive.perl:1434
+#: add-patch.c git-add--interactive.perl
 #, c-format, perl-format
 msgid "Stage deletion [y,n,q,a,d%s,?]? "
 msgstr "暂存删除动作 [y,n,q,a,d%s,?]? "
 
-#: add-patch.c:36 git-add--interactive.perl:1435
+#: add-patch.c git-add--interactive.perl
 #, c-format, perl-format
 msgid "Stage addition [y,n,q,a,d%s,?]? "
 msgstr "暂存添加动作 [y,n,q,a,d%s,?]? "
 
-#: add-patch.c:37 git-add--interactive.perl:1436
+#: add-patch.c git-add--interactive.perl
 #, c-format, perl-format
 msgid "Stage this hunk [y,n,q,a,d%s,?]? "
 msgstr "暂存该块 [y,n,q,a,d%s,?]? "
 
-#: add-patch.c:39
+#: add-patch.c
 msgid ""
 "If the patch applies cleanly, the edited hunk will immediately be marked for "
 "staging."
 msgstr "如果补丁能正确地应用，编辑块将立即标记为暂存。"
 
-#: add-patch.c:42
+#: add-patch.c
 msgid ""
 "y - stage this hunk\n"
 "n - do not stage this hunk\n"
@@ -405,33 +395,33 @@ msgstr ""
 "a - 暂存该块和本文件中后面的全部块\n"
 "d - 不暂存该块和本文件中后面的全部块\n"
 
-#: add-patch.c:56 git-add--interactive.perl:1439
+#: add-patch.c git-add--interactive.perl
 #, c-format, perl-format
 msgid "Stash mode change [y,n,q,a,d%s,?]? "
 msgstr "贮藏模式变更 [y,n,q,a,d%s,?]? "
 
-#: add-patch.c:57 git-add--interactive.perl:1440
+#: add-patch.c git-add--interactive.perl
 #, c-format, perl-format
 msgid "Stash deletion [y,n,q,a,d%s,?]? "
 msgstr "贮藏删除动作 [y,n,q,a,d%s,?]? "
 
-#: add-patch.c:58 git-add--interactive.perl:1441
+#: add-patch.c git-add--interactive.perl
 #, c-format, perl-format
 msgid "Stash addition [y,n,q,a,d%s,?]? "
 msgstr "贮藏添加动作 [y,n,q,a,d%s,?]? "
 
-#: add-patch.c:59 git-add--interactive.perl:1442
+#: add-patch.c git-add--interactive.perl
 #, c-format, perl-format
 msgid "Stash this hunk [y,n,q,a,d%s,?]? "
 msgstr "贮藏该块 [y,n,q,a,d%s,?]? "
 
-#: add-patch.c:61
+#: add-patch.c
 msgid ""
 "If the patch applies cleanly, the edited hunk will immediately be marked for "
 "stashing."
 msgstr "如果补丁能正确地应用，编辑块将立即标记为贮藏。"
 
-#: add-patch.c:64
+#: add-patch.c
 msgid ""
 "y - stash this hunk\n"
 "n - do not stash this hunk\n"
@@ -445,33 +435,33 @@ msgstr ""
 "a - 贮藏该块和本文件中后面的全部块\n"
 "d - 不贮藏该块和本文件中后面的全部块\n"
 
-#: add-patch.c:80 git-add--interactive.perl:1445
+#: add-patch.c git-add--interactive.perl
 #, c-format, perl-format
 msgid "Unstage mode change [y,n,q,a,d%s,?]? "
 msgstr "取消暂存模式变更 [y,n,q,a,d%s,?]? "
 
-#: add-patch.c:81 git-add--interactive.perl:1446
+#: add-patch.c git-add--interactive.perl
 #, c-format, perl-format
 msgid "Unstage deletion [y,n,q,a,d%s,?]? "
 msgstr "取消暂存删除动作 [y,n,q,a,d%s,?]? "
 
-#: add-patch.c:82 git-add--interactive.perl:1447
+#: add-patch.c git-add--interactive.perl
 #, c-format, perl-format
 msgid "Unstage addition [y,n,q,a,d%s,?]? "
 msgstr "取消暂存添加动作 [y,n,q,a,d%s,?]? "
 
-#: add-patch.c:83 git-add--interactive.perl:1448
+#: add-patch.c git-add--interactive.perl
 #, c-format, perl-format
 msgid "Unstage this hunk [y,n,q,a,d%s,?]? "
 msgstr "取消暂存该块 [y,n,q,a,d%s,?]? "
 
-#: add-patch.c:85
+#: add-patch.c
 msgid ""
 "If the patch applies cleanly, the edited hunk will immediately be marked for "
 "unstaging."
 msgstr "如果补丁能正确地应用，编辑块将立即标记为未暂存。"
 
-#: add-patch.c:88
+#: add-patch.c
 msgid ""
 "y - unstage this hunk\n"
 "n - do not unstage this hunk\n"
@@ -485,33 +475,33 @@ msgstr ""
 "a - 取消暂存该块和本文件中后面的全部块\n"
 "d - 不要取消暂存该块和本文件中后面的全部块\n"
 
-#: add-patch.c:103 git-add--interactive.perl:1451
+#: add-patch.c git-add--interactive.perl
 #, c-format, perl-format
 msgid "Apply mode change to index [y,n,q,a,d%s,?]? "
 msgstr "将模式变更应用到索引 [y,n,q,a,d%s,?]? "
 
-#: add-patch.c:104 git-add--interactive.perl:1452
+#: add-patch.c git-add--interactive.perl
 #, c-format, perl-format
 msgid "Apply deletion to index [y,n,q,a,d%s,?]? "
 msgstr "将删除操作应用到索引 [y,n,q,a,d%s,?]? "
 
-#: add-patch.c:105 git-add--interactive.perl:1453
+#: add-patch.c git-add--interactive.perl
 #, c-format, perl-format
 msgid "Apply addition to index [y,n,q,a,d%s,?]? "
 msgstr "将添加操作应用到索引 [y,n,q,a,d%s,?]? "
 
-#: add-patch.c:106 git-add--interactive.perl:1454
+#: add-patch.c git-add--interactive.perl
 #, c-format, perl-format
 msgid "Apply this hunk to index [y,n,q,a,d%s,?]? "
 msgstr "将该块应用到索引 [y,n,q,a,d%s,?]? "
 
-#: add-patch.c:108 add-patch.c:176 add-patch.c:221
+#: add-patch.c
 msgid ""
 "If the patch applies cleanly, the edited hunk will immediately be marked for "
 "applying."
 msgstr "如果补丁能正确地应用，编辑块将立即标记为应用。"
 
-#: add-patch.c:111
+#: add-patch.c
 msgid ""
 "y - apply this hunk to index\n"
 "n - do not apply this hunk to index\n"
@@ -525,37 +515,33 @@ msgstr ""
 "a - 应用该块和本文件中后面的全部块\n"
 "d - 不要应用该块和本文件中后面的全部块\n"
 
-#: add-patch.c:126 git-add--interactive.perl:1457
-#: git-add--interactive.perl:1475
+#: add-patch.c git-add--interactive.perl
 #, c-format, perl-format
 msgid "Discard mode change from worktree [y,n,q,a,d%s,?]? "
 msgstr "从工作区中丢弃模式变更 [y,n,q,a,d%s,?]? "
 
-#: add-patch.c:127 git-add--interactive.perl:1458
-#: git-add--interactive.perl:1476
+#: add-patch.c git-add--interactive.perl
 #, c-format, perl-format
 msgid "Discard deletion from worktree [y,n,q,a,d%s,?]? "
 msgstr "从工作区中丢弃删除动作 [y,n,q,a,d%s,?]? "
 
-#: add-patch.c:128 git-add--interactive.perl:1459
-#: git-add--interactive.perl:1477
+#: add-patch.c git-add--interactive.perl
 #, c-format, perl-format
 msgid "Discard addition from worktree [y,n,q,a,d%s,?]? "
 msgstr "从工作区中丢弃添加动作 [y,n,q,a,d%s,?]? "
 
-#: add-patch.c:129 git-add--interactive.perl:1460
-#: git-add--interactive.perl:1478
+#: add-patch.c git-add--interactive.perl
 #, c-format, perl-format
 msgid "Discard this hunk from worktree [y,n,q,a,d%s,?]? "
 msgstr "从工作区中丢弃该块 [y,n,q,a,d%s,?]? "
 
-#: add-patch.c:131 add-patch.c:154 add-patch.c:199
+#: add-patch.c
 msgid ""
 "If the patch applies cleanly, the edited hunk will immediately be marked for "
 "discarding."
 msgstr "如果补丁能正确地应用，编辑块将立即标记为丢弃。"
 
-#: add-patch.c:134 add-patch.c:202
+#: add-patch.c
 msgid ""
 "y - discard this hunk from worktree\n"
 "n - do not discard this hunk from worktree\n"
@@ -569,27 +555,27 @@ msgstr ""
 "a - 丢弃该块和本文件中后面的全部块\n"
 "d - 不要丢弃该块和本文件中后面的全部块\n"
 
-#: add-patch.c:149 add-patch.c:194 git-add--interactive.perl:1463
+#: add-patch.c git-add--interactive.perl
 #, c-format, perl-format
 msgid "Discard mode change from index and worktree [y,n,q,a,d%s,?]? "
 msgstr "从索引和工作区中丢弃模式变更 [y,n,q,a,d%s,?]? "
 
-#: add-patch.c:150 add-patch.c:195 git-add--interactive.perl:1464
+#: add-patch.c git-add--interactive.perl
 #, c-format, perl-format
 msgid "Discard deletion from index and worktree [y,n,q,a,d%s,?]? "
 msgstr "从索引和工作区中丢弃删除动作 [y,n,q,a,d%s,?]? "
 
-#: add-patch.c:151 add-patch.c:196 git-add--interactive.perl:1465
+#: add-patch.c git-add--interactive.perl
 #, c-format, perl-format
 msgid "Discard addition from index and worktree [y,n,q,a,d%s,?]? "
 msgstr "从索引和工作区中丢弃添加动作 [y,n,q,a,d%s,?]? "
 
-#: add-patch.c:152 add-patch.c:197 git-add--interactive.perl:1466
+#: add-patch.c git-add--interactive.perl
 #, c-format, perl-format
 msgid "Discard this hunk from index and worktree [y,n,q,a,d%s,?]? "
 msgstr "从索引和工作区中丢弃该块 [y,n,q,a,d%s,?]? "
 
-#: add-patch.c:157
+#: add-patch.c
 msgid ""
 "y - discard this hunk from index and worktree\n"
 "n - do not discard this hunk from index and worktree\n"
@@ -603,27 +589,27 @@ msgstr ""
 "a - 丢弃该块和本文件中后面的全部块\n"
 "d - 不要丢弃该块和本文件中后面的全部块\n"
 
-#: add-patch.c:171 add-patch.c:216 git-add--interactive.perl:1469
+#: add-patch.c git-add--interactive.perl
 #, c-format, perl-format
 msgid "Apply mode change to index and worktree [y,n,q,a,d%s,?]? "
 msgstr "将模式变更应用到索引和工作区 [y,n,q,a,d%s,?]? "
 
-#: add-patch.c:172 add-patch.c:217 git-add--interactive.perl:1470
+#: add-patch.c git-add--interactive.perl
 #, c-format, perl-format
 msgid "Apply deletion to index and worktree [y,n,q,a,d%s,?]? "
 msgstr "将删除操作应用到索引和工作区 [y,n,q,a,d%s,?]? "
 
-#: add-patch.c:173 add-patch.c:218 git-add--interactive.perl:1471
+#: add-patch.c git-add--interactive.perl
 #, c-format, perl-format
 msgid "Apply addition to index and worktree [y,n,q,a,d%s,?]? "
 msgstr "将添加操作应用到索引和工作区 [y,n,q,a,d%s,?]? "
 
-#: add-patch.c:174 add-patch.c:219 git-add--interactive.perl:1472
+#: add-patch.c git-add--interactive.perl
 #, c-format, perl-format
 msgid "Apply this hunk to index and worktree [y,n,q,a,d%s,?]? "
 msgstr "将该块应用到索引和工作区 [y,n,q,a,d%s,?]? "
 
-#: add-patch.c:179
+#: add-patch.c
 msgid ""
 "y - apply this hunk to index and worktree\n"
 "n - do not apply this hunk to index and worktree\n"
@@ -637,7 +623,7 @@ msgstr ""
 "a - 应用该块和本文件中后面的全部块\n"
 "d - 不要应用该块和本文件中后面的全部块\n"
 
-#: add-patch.c:224
+#: add-patch.c
 msgid ""
 "y - apply this hunk to worktree\n"
 "n - do not apply this hunk to worktree\n"
@@ -651,40 +637,40 @@ msgstr ""
 "a - 应用该块和本文件中后面的全部块\n"
 "d - 不要应用该块和本文件中后面的全部块\n"
 
-#: add-patch.c:343
+#: add-patch.c
 #, c-format
 msgid "could not parse hunk header '%.*s'"
 msgstr "无法解析数据块头信息 '%.*s'"
 
-#: add-patch.c:362 add-patch.c:366
+#: add-patch.c
 #, c-format
 msgid "could not parse colored hunk header '%.*s'"
 msgstr "无法解析彩色数据块头信息 '%.*s'"
 
-#: add-patch.c:431
+#: add-patch.c
 msgid "could not parse diff"
 msgstr "不能解析差异信息"
 
-#: add-patch.c:450
+#: add-patch.c
 msgid "could not parse colored diff"
 msgstr "不能解析彩色差异信息"
 
-#: add-patch.c:464
+#: add-patch.c
 #, c-format
 msgid "failed to run '%s'"
 msgstr "无法运行 '%s'"
 
-#: add-patch.c:618
+#: add-patch.c
 msgid "mismatched output from interactive.diffFilter"
 msgstr "interactive.diffFilter 的输出不匹配"
 
-#: add-patch.c:619
+#: add-patch.c
 msgid ""
 "Your filter must maintain a one-to-one correspondence\n"
 "between its input and output lines."
 msgstr "您的过滤器必须在其输入和输出的行之间保持一一对应的关系。"
 
-#: add-patch.c:797
+#: add-patch.c
 #, c-format
 msgid ""
 "expected context line #%d in\n"
@@ -693,7 +679,7 @@ msgstr ""
 "预期上下文行 #%d 于\n"
 "%.*s"
 
-#: add-patch.c:812
+#: add-patch.c
 #, c-format
 msgid ""
 "hunks do not overlap:\n"
@@ -706,11 +692,11 @@ msgstr ""
 "\t不是结尾于：\n"
 "%.*s"
 
-#: add-patch.c:1088 git-add--interactive.perl:1115
+#: add-patch.c git-add--interactive.perl
 msgid "Manual hunk edit mode -- see bottom for a quick guide.\n"
 msgstr "手动块编辑模式 -- 查看底部的快速指南。\n"
 
-#: add-patch.c:1092
+#: add-patch.c
 #, c-format
 msgid ""
 "---\n"
@@ -723,8 +709,9 @@ msgstr ""
 "要删除 '%c' 开始的行，删除它们。\n"
 "以 %c 开始的行将被删除。\n"
 
+#. #-#-#-#-#  git-add--interactive.perl.po  #-#-#-#-#
 #. TRANSLATORS: 'it' refers to the patch mentioned in the previous messages.
-#: add-patch.c:1106 git-add--interactive.perl:1129
+#: add-patch.c git-add--interactive.perl
 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"
@@ -733,44 +720,46 @@ msgstr ""
 "如果不能干净地应用，您将有机会重新编辑。如果该块的全部内容删除，则\n"
 "此次编辑被终止，该块不会被修改。\n"
 
-#: add-patch.c:1139
+#: add-patch.c
 msgid "could not parse hunk header"
 msgstr "无法解析数据块头信息"
 
-#: add-patch.c:1184
+#: add-patch.c
 msgid "'git apply --cached' failed"
 msgstr "'git apply --cached' 失败"
 
+#. #-#-#-#-#  add-patch.c.po  #-#-#-#-#
 #. 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.
 #.
+#. #-#-#-#-#  git-add--interactive.perl.po  #-#-#-#-#
 #. 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:1253 git-add--interactive.perl:1244
+#: add-patch.c git-add--interactive.perl
 msgid ""
 "Your edited hunk does not apply. Edit again (saying \"no\" discards!) [y/n]? "
 msgstr "您的编辑块不能被应用。重新编辑（选择 \"no\" 丢弃！） [y/n]? "
 
-#: add-patch.c:1296
+#: add-patch.c
 msgid "The selected hunks do not apply to the index!"
 msgstr "选中的块不能应用到索引！"
 
-#: add-patch.c:1297 git-add--interactive.perl:1348
+#: add-patch.c git-add--interactive.perl
 msgid "Apply them to the worktree anyway? "
 msgstr "无论如何都要应用到工作区么？"
 
-#: add-patch.c:1304 git-add--interactive.perl:1351
+#: add-patch.c git-add--interactive.perl
 msgid "Nothing was applied.\n"
 msgstr "未应用。\n"
 
-#: add-patch.c:1361
+#: add-patch.c
 msgid ""
 "j - leave this hunk undecided, see next undecided hunk\n"
 "J - leave this hunk undecided, see next hunk\n"
@@ -792,73 +781,73 @@ msgstr ""
 "e - 手动编辑当前块\n"
 "? - 显示帮助\n"
 
-#: add-patch.c:1523 add-patch.c:1533
+#: add-patch.c
 msgid "No previous hunk"
 msgstr "没有前一个块"
 
-#: add-patch.c:1528 add-patch.c:1538
+#: add-patch.c
 msgid "No next hunk"
 msgstr "没有下一个块"
 
-#: add-patch.c:1544
+#: add-patch.c
 msgid "No other hunks to goto"
 msgstr "没有其它可供跳转的块"
 
-#: add-patch.c:1555 git-add--interactive.perl:1608
+#: add-patch.c git-add--interactive.perl
 msgid "go to which hunk (<ret> to see more)? "
 msgstr "跳转到哪个块（<回车> 查看更多）？ "
 
-#: add-patch.c:1556 git-add--interactive.perl:1610
+#: add-patch.c git-add--interactive.perl
 msgid "go to which hunk? "
 msgstr "跳转到哪个块？"
 
-#: add-patch.c:1567
+#: add-patch.c
 #, c-format
 msgid "Invalid number: '%s'"
 msgstr "无效数字：'%s'"
 
-#: add-patch.c:1572
+#: add-patch.c
 #, c-format
 msgid "Sorry, only %d hunk available."
 msgid_plural "Sorry, only %d hunks available."
 msgstr[0] "对不起，只有 %d 个可用块。"
 msgstr[1] "对不起，只有 %d 个可用块。"
 
-#: add-patch.c:1581
+#: add-patch.c
 msgid "No other hunks to search"
 msgstr "没有其它可供查找的块"
 
-#: add-patch.c:1587 git-add--interactive.perl:1663
+#: add-patch.c git-add--interactive.perl
 msgid "search for regex? "
 msgstr "使用正则表达式搜索？"
 
-#: add-patch.c:1602
+#: add-patch.c
 #, c-format
 msgid "Malformed search regexp %s: %s"
 msgstr "错误的正则表达式 %s：%s"
 
-#: add-patch.c:1619
+#: add-patch.c
 msgid "No hunk matches the given pattern"
 msgstr "没有和给定模式相匹配的块"
 
-#: add-patch.c:1626
+#: add-patch.c
 msgid "Sorry, cannot split this hunk"
 msgstr "对不起，不能拆分这个块"
 
-#: add-patch.c:1630
+#: add-patch.c
 #, c-format
 msgid "Split into %d hunks."
 msgstr "拆分为 %d 块。"
 
-#: add-patch.c:1634
+#: add-patch.c
 msgid "Sorry, cannot edit this hunk"
 msgstr "对不起，不能编辑这个块"
 
-#: add-patch.c:1686
+#: add-patch.c
 msgid "'git apply' failed"
 msgstr "'git apply' 失败"
 
-#: advice.c:81
+#: advice.c
 #, c-format
 msgid ""
 "\n"
@@ -867,37 +856,37 @@ msgstr ""
 "\n"
 "使用 \"git config advice.%s false\" 来关闭此消息"
 
-#: advice.c:97
+#: advice.c
 #, c-format
 msgid "%shint: %.*s%s\n"
 msgstr "%s提示：%.*s%s\n"
 
-#: advice.c:181
+#: advice.c
 msgid "Cherry-picking is not possible because you have unmerged files."
 msgstr "无法拣选，因为您有未合并的文件。"
 
-#: advice.c:183
+#: advice.c
 msgid "Committing is not possible because you have unmerged files."
 msgstr "无法提交，因为您有未合并的文件。"
 
-#: advice.c:185
+#: advice.c
 msgid "Merging is not possible because you have unmerged files."
 msgstr "无法合并，因为您有未合并的文件。"
 
-#: advice.c:187
+#: advice.c
 msgid "Pulling is not possible because you have unmerged files."
 msgstr "无法拉取，因为您有未合并的文件。"
 
-#: advice.c:189
+#: advice.c
 msgid "Reverting is not possible because you have unmerged files."
 msgstr "无法回退，因为您有未合并的文件。"
 
-#: advice.c:191
+#: advice.c
 #, c-format
 msgid "It is not possible to %s because you have unmerged files."
 msgstr "无法 %s，因为您有未合并的文件。"
 
-#: advice.c:199
+#: advice.c
 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."
@@ -905,27 +894,27 @@ msgstr ""
 "请在工作区改正文件，然后酌情使用 'git add/rm <文件>' 命令标记\n"
 "解决方案并提交。"
 
-#: advice.c:207
+#: advice.c
 msgid "Exiting because of an unresolved conflict."
 msgstr "因为存在未解决的冲突而退出。"
 
-#: advice.c:212 builtin/merge.c:1388
+#: advice.c builtin/merge.c
 msgid "You have not concluded your merge (MERGE_HEAD exists)."
 msgstr "您尚未结束您的合并（存在 MERGE_HEAD）。"
 
-#: advice.c:214
+#: advice.c
 msgid "Please, commit your changes before merging."
 msgstr "请在合并前先提交您的修改。"
 
-#: advice.c:215
+#: advice.c
 msgid "Exiting because of unfinished merge."
 msgstr "因为存在未完成的合并而退出。"
 
-#: advice.c:220
+#: advice.c
 msgid "Not possible to fast-forward, aborting."
 msgstr "无法快进，终止。"
 
-#: advice.c:230
+#: advice.c
 #, c-format
 msgid ""
 "The following paths and/or pathspecs matched paths that exist\n"
@@ -935,7 +924,7 @@ msgstr ""
 "下面的路径和/或者路径规格匹配了您定义的稀疏检出以外的路径，\n"
 "所以不会在索引中更新：\n"
 
-#: advice.c:237
+#: advice.c
 msgid ""
 "If you intend to update such entries, try one of the following:\n"
 "* Use the --sparse option.\n"
@@ -945,7 +934,7 @@ msgstr ""
 "* 使用 --sparse 选项。\n"
 "* 禁用或者修改稀疏规则。"
 
-#: advice.c:245
+#: advice.c
 #, c-format
 msgid ""
 "Note: switching to '%s'.\n"
@@ -984,101 +973,87 @@ msgstr ""
 "通过将配置变量 advice.detachedHead 设置为 false 来关闭此建议\n"
 "\n"
 
-#: alias.c:50
+#: alias.c
 msgid "cmdline ends with \\"
 msgstr "命令行以 \\ 结尾"
 
-#: alias.c:51
+#: alias.c
 msgid "unclosed quote"
 msgstr "未关闭的引号"
 
-#: apply.c:70
+#: apply.c
 #, c-format
 msgid "unrecognized whitespace option '%s'"
 msgstr "未能识别的空白字符选项 '%s'"
 
-#: apply.c:86
+#: apply.c
 #, c-format
 msgid "unrecognized whitespace ignore option '%s'"
 msgstr "未能识别的空白字符忽略选项 '%s'"
 
-#: apply.c:138 archive.c:584 parse-options.c:1122 range-diff.c:555
-#: revision.c:2314 revision.c:2318 revision.c:2327 revision.c:2332
-#: revision.c:2560 revision.c:2895 revision.c:2899 revision.c:2907
-#: revision.c:2910 revision.c:2912 builtin/add.c:507 builtin/add.c:509
-#: builtin/add.c:515 builtin/add.c:527 builtin/branch.c:755
-#: builtin/checkout.c:472 builtin/checkout.c:475 builtin/checkout.c:1663
-#: builtin/checkout.c:1773 builtin/checkout.c:1776 builtin/clone.c:921
-#: builtin/commit.c:359 builtin/commit.c:362 builtin/commit.c:1200
-#: builtin/commit.c:1256 builtin/commit.c:1273 builtin/describe.c:593
-#: builtin/diff-tree.c:155 builtin/difftool.c:733 builtin/fast-export.c:1245
-#: builtin/fetch.c:2141 builtin/fetch.c:2162 builtin/fetch.c:2167
-#: builtin/help.c:602 builtin/index-pack.c:1858 builtin/init-db.c:560
-#: builtin/log.c:1968 builtin/log.c:1970 builtin/ls-files.c:778
-#: builtin/merge-base.c:163 builtin/merge-base.c:169 builtin/merge.c:1409
-#: builtin/merge.c:1411 builtin/pack-objects.c:4098 builtin/push.c:592
-#: builtin/push.c:630 builtin/push.c:636 builtin/push.c:641
-#: builtin/rebase.c:1221 builtin/rebase.c:1223 builtin/rebase.c:1227
-#: builtin/repack.c:688 builtin/repack.c:719 builtin/reset.c:433
-#: builtin/reset.c:469 builtin/rev-list.c:537 builtin/show-branch.c:711
-#: builtin/stash.c:1696 builtin/stash.c:1699 builtin/submodule--helper.c:1328
-#: builtin/submodule--helper.c:3054 builtin/tag.c:527 builtin/tag.c:573
-#: builtin/worktree.c:779
+#: apply.c archive.c builtin/add.c builtin/branch.c builtin/checkout.c
+#: builtin/clone.c builtin/commit.c builtin/describe.c builtin/diff-tree.c
+#: builtin/difftool.c builtin/fast-export.c builtin/fetch.c builtin/help.c
+#: builtin/index-pack.c builtin/init-db.c builtin/log.c builtin/ls-files.c
+#: builtin/merge-base.c builtin/merge.c builtin/pack-objects.c builtin/push.c
+#: builtin/rebase.c builtin/repack.c builtin/reset.c builtin/rev-list.c
+#: builtin/show-branch.c builtin/stash.c builtin/submodule--helper.c
+#: builtin/tag.c builtin/worktree.c parse-options.c range-diff.c revision.c
 #, c-format
 msgid "options '%s' and '%s' cannot be used together"
 msgstr "选项 '%s' 和 '%s' 不能同时使用"
 
-#: apply.c:141 apply.c:152 apply.c:155
+#: apply.c
 #, c-format
 msgid "'%s' outside a repository"
 msgstr "'%s' 在仓库之外"
 
-#: apply.c:807
+#: apply.c
 #, c-format
 msgid "Cannot prepare timestamp regexp %s"
 msgstr "无法准备时间戳正则表达式 %s"
 
-#: apply.c:816
+#: apply.c
 #, c-format
 msgid "regexec returned %d for input: %s"
 msgstr "regexec 返回 %d，输入为：%s"
 
-#: apply.c:890
+#: apply.c
 #, c-format
 msgid "unable to find filename in patch at line %d"
 msgstr "不能在补丁的第 %d 行找到文件名"
 
-#: apply.c:928
+#: apply.c
 #, c-format
 msgid "git apply: bad git-diff - expected /dev/null, got %s on line %d"
 msgstr "git apply：错误的 git-diff - 应为 /dev/null，但在第 %2$d 行得到 %1$s"
 
-#: apply.c:934
+#: apply.c
 #, c-format
 msgid "git apply: bad git-diff - inconsistent new filename on line %d"
 msgstr "git apply：错误的 git-diff - 第 %d 行上新文件名不一致"
 
-#: apply.c:935
+#: apply.c
 #, c-format
 msgid "git apply: bad git-diff - inconsistent old filename on line %d"
 msgstr "git apply：错误的 git-diff - 第 %d 行上旧文件名不一致"
 
-#: apply.c:940
+#: apply.c
 #, c-format
 msgid "git apply: bad git-diff - expected /dev/null on line %d"
 msgstr "git apply：错误的 git-diff - 第 %d 行处应为 /dev/null"
 
-#: apply.c:969
+#: apply.c
 #, c-format
 msgid "invalid mode on line %d: %s"
 msgstr "第 %d 行包含无效文件模式：%s"
 
-#: apply.c:1288
+#: apply.c
 #, c-format
 msgid "inconsistent header lines %d and %d"
 msgstr "不一致的文件头，%d 行和 %d 行"
 
-#: apply.c:1378
+#: apply.c
 #, c-format
 msgid ""
 "git diff header lacks filename information when removing %d leading pathname "
@@ -1089,92 +1064,92 @@ msgid_plural ""
 msgstr[0] "当移除 %d 个前导路径后 git diff 头缺乏文件名信息（第 %d 行）"
 msgstr[1] "当移除 %d 个前导路径后 git diff 头缺乏文件名信息（第 %d 行）"
 
-#: apply.c:1391
+#: apply.c
 #, c-format
 msgid "git diff header lacks filename information (line %d)"
 msgstr "git diff 的头信息中缺乏文件名信息（第 %d 行）"
 
-#: apply.c:1487
+#: apply.c
 #, c-format
 msgid "recount: unexpected line: %.*s"
 msgstr "recount：意外的行：%.*s"
 
-#: apply.c:1556
+#: apply.c
 #, c-format
 msgid "patch fragment without header at line %d: %.*s"
 msgstr "第 %d 行的补丁片段没有头信息：%.*s"
 
-#: apply.c:1759
+#: apply.c
 msgid "new file depends on old contents"
 msgstr "新文件依赖旧内容"
 
-#: apply.c:1761
+#: apply.c
 msgid "deleted file still has contents"
 msgstr "删除的文件仍有内容"
 
-#: apply.c:1795
+#: apply.c
 #, c-format
 msgid "corrupt patch at line %d"
 msgstr "补丁在第 %d 行损坏"
 
-#: apply.c:1832
+#: apply.c
 #, c-format
 msgid "new file %s depends on old contents"
 msgstr "新文件 %s 依赖旧内容"
 
-#: apply.c:1834
+#: apply.c
 #, c-format
 msgid "deleted file %s still has contents"
 msgstr "删除的文件 %s 仍有内容"
 
-#: apply.c:1837
+#: apply.c
 #, c-format
 msgid "** warning: file %s becomes empty but is not deleted"
 msgstr "** 警告：文件 %s 成为空文件但并未删除"
 
-#: apply.c:1985
+#: apply.c
 #, c-format
 msgid "corrupt binary patch at line %d: %.*s"
 msgstr "二进制补丁在第 %d 行损坏：%.*s"
 
-#: apply.c:2022
+#: apply.c
 #, c-format
 msgid "unrecognized binary patch at line %d"
 msgstr "未能识别的二进制补丁位于第 %d 行"
 
-#: apply.c:2184
+#: apply.c
 #, c-format
 msgid "patch with only garbage at line %d"
 msgstr "补丁文件的第 %d 行只有垃圾数据"
 
-#: apply.c:2270
+#: apply.c
 #, c-format
 msgid "unable to read symlink %s"
 msgstr "无法读取符号链接 %s"
 
-#: apply.c:2274
+#: apply.c
 #, c-format
 msgid "unable to open or read %s"
 msgstr "不能打开或读取 %s"
 
-#: apply.c:2943
+#: apply.c
 #, c-format
 msgid "invalid start of line: '%c'"
 msgstr "无效的行首字符：'%c'"
 
-#: apply.c:3064
+#: apply.c
 #, 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:3076
+#: apply.c
 #, c-format
 msgid "Context reduced to (%ld/%ld) to apply fragment at %d"
 msgstr "上下文减少到（%ld/%ld）以在第 %d 行应用补丁片段"
 
-#: apply.c:3082
+#: apply.c
 #, c-format
 msgid ""
 "while searching for:\n"
@@ -1183,645 +1158,650 @@ msgstr ""
 "当查询：\n"
 "%.*s"
 
-#: apply.c:3104
+#: apply.c
 #, c-format
 msgid "missing binary patch data for '%s'"
 msgstr "缺失 '%s' 的二进制补丁数据"
 
-#: apply.c:3112
+#: apply.c
 #, c-format
 msgid "cannot reverse-apply a binary patch without the reverse hunk to '%s'"
 msgstr "不能反向应用一个缺少到 '%s' 的反向数据块的二进制补丁"
 
-#: apply.c:3159
+#: apply.c
 #, c-format
 msgid "cannot apply binary patch to '%s' without full index line"
 msgstr "不能在 '%s' 上应用没有完整索引行的二进制补丁"
 
-#: apply.c:3170
+#: apply.c
 #, c-format
 msgid ""
 "the patch applies to '%s' (%s), which does not match the current contents."
 msgstr "补丁应用到 '%s'（%s），但是和当前内容不匹配。"
 
-#: apply.c:3178
+#: apply.c
 #, c-format
 msgid "the patch applies to an empty '%s' but it is not empty"
 msgstr "补丁应用到空文件 '%s'，但其并非空文件"
 
-#: apply.c:3196
+#: apply.c
 #, c-format
 msgid "the necessary postimage %s for '%s' cannot be read"
 msgstr "无法读取 '%2$s' 必需的目标文件 %1$s"
 
-#: apply.c:3209
+#: apply.c
 #, c-format
 msgid "binary patch does not apply to '%s'"
 msgstr "二进制补丁未应用到 '%s'"
 
-#: apply.c:3216
+#: apply.c
 #, c-format
 msgid "binary patch to '%s' creates incorrect result (expecting %s, got %s)"
 msgstr "到 '%s' 的二进制补丁产生了不正确的结果（应为 %s，却为 %s）"
 
-#: apply.c:3237
+#: apply.c
 #, c-format
 msgid "patch failed: %s:%ld"
 msgstr "打补丁失败：%s:%ld"
 
-#: apply.c:3360
+#: apply.c
 #, c-format
 msgid "cannot checkout %s"
 msgstr "不能检出 %s"
 
-#: apply.c:3412 apply.c:3423 apply.c:3469 midx.c:105 pack-revindex.c:214
-#: setup.c:310
+#: apply.c midx.c pack-mtimes.c pack-revindex.c setup.c
 #, c-format
 msgid "failed to read %s"
 msgstr "无法读取 %s"
 
-#: apply.c:3420
+#: apply.c
 #, c-format
 msgid "reading from '%s' beyond a symbolic link"
 msgstr "读取位于符号链接中的 '%s'"
 
-#: apply.c:3449 apply.c:3721
+#: apply.c
 #, c-format
 msgid "path %s has been renamed/deleted"
 msgstr "路径 %s 已经被重命名/删除"
 
-#: apply.c:3559 apply.c:3736
+#: apply.c
 #, c-format
 msgid "%s: does not exist in index"
 msgstr "%s：不存在于索引中"
 
-#: apply.c:3568 apply.c:3744 apply.c:3960
+#: apply.c
 #, c-format
 msgid "%s: does not match index"
 msgstr "%s：和索引不匹配"
 
-#: apply.c:3605
+#: apply.c
 msgid "repository lacks the necessary blob to perform 3-way merge."
 msgstr "仓库缺乏执行三方合并所必需的数据对象。"
 
-#: apply.c:3608
+#: apply.c
 #, c-format
 msgid "Performing three-way merge...\n"
 msgstr "执行三方合并...\n"
 
-#: apply.c:3624 apply.c:3628
+#: apply.c
 #, c-format
 msgid "cannot read the current contents of '%s'"
 msgstr "无法读取 '%s' 的当前内容"
 
-#: apply.c:3640
+#: apply.c
 #, c-format
 msgid "Failed to perform three-way merge...\n"
 msgstr "无法执行三方合并...\n"
 
-#: apply.c:3654
+#: apply.c
 #, c-format
 msgid "Applied patch to '%s' with conflicts.\n"
 msgstr "应用补丁到 '%s' 存在冲突。\n"
 
-#: apply.c:3659
+#: apply.c
 #, c-format
 msgid "Applied patch to '%s' cleanly.\n"
 msgstr "成功应用补丁到 '%s'。\n"
 
-#: apply.c:3676
+#: apply.c
 #, c-format
 msgid "Falling back to direct application...\n"
 msgstr "回落到直接应用...\n"
 
-#: apply.c:3688
+#: apply.c
 msgid "removal patch leaves file contents"
 msgstr "移除补丁仍留下了文件内容"
 
-#: apply.c:3761
+#: apply.c
 #, c-format
 msgid "%s: wrong type"
 msgstr "%s：错误类型"
 
-#: apply.c:3763
+#: apply.c
 #, c-format
 msgid "%s has type %o, expected %o"
 msgstr "%s 的类型是 %o，应为 %o"
 
-#: apply.c:3900 apply.c:3902 read-cache.c:903 read-cache.c:932
-#: read-cache.c:1399
+#: apply.c read-cache.c
 #, c-format
 msgid "invalid path '%s'"
 msgstr "无效路径 '%s'"
 
-#: apply.c:3958
+#: apply.c
 #, c-format
 msgid "%s: already exists in index"
 msgstr "%s：已经存在于索引中"
 
-#: apply.c:3962
+#: apply.c
 #, c-format
 msgid "%s: already exists in working directory"
 msgstr "%s：已经存在于工作区中"
 
-#: apply.c:3982
+#: apply.c
 #, c-format
 msgid "new mode (%o) of %s does not match old mode (%o)"
 msgstr "%2$s 的新模式（%1$o）和旧模式（%3$o）不匹配"
 
-#: apply.c:3987
+#: apply.c
 #, 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:4007
+#: apply.c
 #, c-format
 msgid "affected file '%s' is beyond a symbolic link"
 msgstr "受影响的文件 '%s' 位于符号链接中"
 
-#: apply.c:4011
+#: apply.c
 #, c-format
 msgid "%s: patch does not apply"
 msgstr "%s：补丁未应用"
 
-#: apply.c:4026
+#: apply.c
 #, c-format
 msgid "Checking patch %s..."
 msgstr "正在检查补丁 %s..."
 
-#: apply.c:4118
+#: apply.c
 #, c-format
 msgid "sha1 information is lacking or useless for submodule %s"
 msgstr "子模组 %s 的 sha1 信息缺失或无效"
 
-#: apply.c:4125
+#: apply.c
 #, c-format
 msgid "mode change for %s, which is not in current HEAD"
 msgstr "%s 的模式变更，但它不在当前 HEAD 中"
 
-#: apply.c:4128
+#: apply.c
 #, c-format
 msgid "sha1 information is lacking or useless (%s)."
 msgstr "sha1 信息缺失或无效（%s）。"
 
-#: apply.c:4137
+#: apply.c
 #, c-format
 msgid "could not add %s to temporary index"
 msgstr "不能在临时索引中添加 %s"
 
-#: apply.c:4147
+#: apply.c
 #, c-format
 msgid "could not write temporary index to %s"
 msgstr "不能把临时索引写入到 %s"
 
-#: apply.c:4285
+#: apply.c
 #, c-format
 msgid "unable to remove %s from index"
 msgstr "不能从索引中移除 %s"
 
-#: apply.c:4319
+#: apply.c
 #, c-format
 msgid "corrupt patch for submodule %s"
 msgstr "子模组 %s 损坏的补丁"
 
-#: apply.c:4325
+#: apply.c
 #, c-format
 msgid "unable to stat newly created file '%s'"
 msgstr "不能对新建文件 '%s' 调用 stat"
 
-#: apply.c:4333
+#: apply.c
 #, c-format
 msgid "unable to create backing store for newly created file %s"
 msgstr "不能为新建文件 %s 创建后端存储"
 
-#: apply.c:4339 apply.c:4484
+#: apply.c
 #, c-format
 msgid "unable to add cache entry for %s"
 msgstr "无法为 %s 添加缓存条目"
 
-#: apply.c:4382 builtin/bisect--helper.c:540 builtin/gc.c:2258
-#: builtin/gc.c:2293
+#: apply.c builtin/bisect--helper.c builtin/gc.c
 #, c-format
 msgid "failed to write to '%s'"
 msgstr "无法写入 '%s'"
 
-#: apply.c:4386
+#: apply.c
 #, c-format
 msgid "closing file '%s'"
 msgstr "关闭文件 '%s'"
 
-#: apply.c:4456
+#: apply.c
 #, c-format
 msgid "unable to write file '%s' mode %o"
 msgstr "不能写文件 '%s' 权限 %o"
 
-#: apply.c:4554
+#: apply.c
 #, c-format
 msgid "Applied patch %s cleanly."
 msgstr "成功应用补丁 %s。"
 
-#: apply.c:4562
+#: apply.c
 msgid "internal error"
 msgstr "内部错误"
 
-#: apply.c:4565
+#: apply.c
 #, 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:4576
+#: apply.c
 #, c-format
 msgid "truncating .rej filename to %.*s.rej"
 msgstr "截短 .rej 文件名为 %.*s.rej"
 
-#: apply.c:4584
+#: apply.c
 #, c-format
 msgid "cannot open %s"
 msgstr "不能打开 %s"
 
-#: apply.c:4598
+#: apply.c
 #, c-format
 msgid "Hunk #%d applied cleanly."
 msgstr "第 #%d 个片段成功应用。"
 
-#: apply.c:4602
+#: apply.c
 #, c-format
 msgid "Rejected hunk #%d."
 msgstr "拒绝第 #%d 个片段。"
 
-#: apply.c:4731
+#: apply.c
 #, c-format
 msgid "Skipped patch '%s'."
 msgstr "略过补丁 '%s'。"
 
-#: apply.c:4740
+#: apply.c
 msgid "No valid patches in input (allow with \"--allow-empty\")"
 msgstr "输入中没有合法的补丁 （使用 \"--allow-empty\" 来允许）"
 
-#: apply.c:4761
+#: apply.c
 msgid "unable to read index file"
 msgstr "无法读取索引文件"
 
-#: apply.c:4918
+#: apply.c
 #, c-format
 msgid "can't open patch '%s': %s"
 msgstr "不能打开补丁 '%s'：%s"
 
-#: apply.c:4945
+#: apply.c
 #, c-format
 msgid "squelched %d whitespace error"
 msgid_plural "squelched %d whitespace errors"
 msgstr[0] "抑制下仍有 %d 个空白字符误用"
 msgstr[1] "抑制下仍有 %d 个空白字符误用"
 
-#: apply.c:4951 apply.c:4966
+#: apply.c
 #, c-format
 msgid "%d line adds whitespace errors."
 msgid_plural "%d lines add whitespace errors."
 msgstr[0] "%d 行新增了空白字符误用。"
 msgstr[1] "%d 行新增了空白字符误用。"
 
-#: apply.c:4959
+#: apply.c
 #, 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:4975 builtin/add.c:690 builtin/mv.c:338 builtin/rm.c:430
+#: apply.c builtin/add.c builtin/mv.c builtin/rm.c
 msgid "Unable to write new index file"
 msgstr "无法写入新索引文件"
 
-#: apply.c:5003
+#: apply.c
 msgid "don't apply changes matching the given path"
 msgstr "不要应用与给出路径向匹配的变更"
 
-#: apply.c:5006
+#: apply.c
 msgid "apply changes matching the given path"
 msgstr "应用与给出路径向匹配的变更"
 
-#: apply.c:5008 builtin/am.c:2379
+#: apply.c builtin/am.c
 msgid "num"
 msgstr "数字"
 
-#: apply.c:5009
+#: apply.c
 msgid "remove <num> leading slashes from traditional diff paths"
 msgstr "从传统的 diff 路径中移除指定数量的前导斜线"
 
-#: apply.c:5012
+#: apply.c
 msgid "ignore additions made by the patch"
 msgstr "忽略补丁中的添加的文件"
 
-#: apply.c:5014
+#: apply.c
 msgid "instead of applying the patch, output diffstat for the input"
 msgstr "不应用补丁，而是显示输入的差异统计（diffstat）"
 
-#: apply.c:5018
+#: apply.c
 msgid "show number of added and deleted lines in decimal notation"
 msgstr "以十进制数显示添加和删除的行数"
 
-#: apply.c:5020
+#: apply.c
 msgid "instead of applying the patch, output a summary for the input"
 msgstr "不应用补丁，而是显示输入的概要"
 
-#: apply.c:5022
+#: apply.c
 msgid "instead of applying the patch, see if the patch is applicable"
 msgstr "不应用补丁，而是查看补丁是否可应用"
 
-#: apply.c:5024
+#: apply.c
 msgid "make sure the patch is applicable to the current index"
 msgstr "确认补丁可以应用到当前索引"
 
-#: apply.c:5026
+#: apply.c
 msgid "mark new files with `git add --intent-to-add`"
 msgstr "使用命令 `git add --intent-to-add` 标记新增文件"
 
-#: apply.c:5028
+#: apply.c
 msgid "apply a patch without touching the working tree"
 msgstr "应用补丁而不修改工作区"
 
-#: apply.c:5030
+#: apply.c
 msgid "accept a patch that touches outside the working area"
 msgstr "接受修改工作区之外文件的补丁"
 
-#: apply.c:5033
+#: apply.c
 msgid "also apply the patch (use with --stat/--summary/--check)"
 msgstr "还应用此补丁（与 --stat/--summary/--check 选项同时使用）"
 
-#: apply.c:5035
+#: apply.c
 msgid "attempt three-way merge, fall back on normal patch if that fails"
 msgstr "尝试三路合并，如果失败则回落至正常补丁模式"
 
-#: apply.c:5037
+#: apply.c
 msgid "build a temporary index based on embedded index information"
 msgstr "创建一个临时索引基于嵌入的索引信息"
 
-#: apply.c:5040 builtin/checkout-index.c:230
+#: apply.c builtin/checkout-index.c
 msgid "paths are separated with NUL character"
 msgstr "路径以 NUL 字符分隔"
 
-#: apply.c:5042
+#: apply.c
 msgid "ensure at least <n> lines of context match"
 msgstr "确保至少匹配 <n> 行上下文"
 
-#: apply.c:5043 builtin/am.c:2355 builtin/am.c:2358
-#: builtin/interpret-trailers.c:98 builtin/interpret-trailers.c:100
-#: builtin/interpret-trailers.c:102 builtin/pack-objects.c:3983
-#: builtin/rebase.c:1079
+#: apply.c builtin/am.c builtin/interpret-trailers.c builtin/pack-objects.c
+#: builtin/rebase.c
 msgid "action"
 msgstr "动作"
 
-#: apply.c:5044
+#: apply.c
 msgid "detect new or modified lines that have whitespace errors"
 msgstr "检查新增和修改的行中间的空白字符滥用"
 
-#: apply.c:5047 apply.c:5050
+#: apply.c
 msgid "ignore changes in whitespace when finding context"
 msgstr "查找上下文时忽略空白字符的变更"
 
-#: apply.c:5053
+#: apply.c
 msgid "apply the patch in reverse"
 msgstr "反向应用补丁"
 
-#: apply.c:5055
+#: apply.c
 msgid "don't expect at least one line of context"
 msgstr "无需至少一行上下文"
 
-#: apply.c:5057
+#: apply.c
 msgid "leave the rejected hunks in corresponding *.rej files"
 msgstr "将拒绝的补丁片段保存在对应的 *.rej 文件中"
 
-#: apply.c:5059
+#: apply.c
 msgid "allow overlapping hunks"
 msgstr "允许重叠的补丁片段"
 
-#: apply.c:5062
+#: apply.c
 msgid "tolerate incorrectly detected missing new-line at the end of file"
 msgstr "允许不正确的文件末尾换行符"
 
-#: apply.c:5065
+#: apply.c
 msgid "do not trust the line counts in the hunk headers"
 msgstr "不信任补丁片段的头信息中的行号"
 
-#: apply.c:5067 builtin/am.c:2367
+#: apply.c builtin/am.c
 msgid "root"
 msgstr "根目录"
 
-#: apply.c:5068
+#: apply.c
 msgid "prepend <root> to all filenames"
 msgstr "为所有文件名前添加 <根目录>"
 
-#: apply.c:5071
+#: apply.c
 msgid "don't return error for empty patches"
 msgstr "对空的补丁不返回错误"
 
-#: archive-tar.c:125 archive-zip.c:346
+#: archive-tar.c archive-zip.c
 #, c-format
 msgid "cannot stream blob %s"
 msgstr "不能打开数据对象 %s"
 
-#: archive-tar.c:265 archive-zip.c:359
+#: archive-tar.c archive-zip.c
 #, c-format
 msgid "unsupported file mode: 0%o (SHA1: %s)"
 msgstr "不支持的文件模式：0%o (SHA1: %s)"
 
-#: archive-tar.c:447
+#: archive-tar.c
 #, c-format
 msgid "unable to start '%s' filter"
 msgstr "无法启动 '%s' 过滤器"
 
-#: archive-tar.c:450
+#: archive-tar.c
 msgid "unable to redirect descriptor"
 msgstr "无法重定向描述符"
 
-#: archive-tar.c:457
+#: archive-tar.c
 #, c-format
 msgid "'%s' filter reported error"
 msgstr "'%s' 过滤器报告了错误"
 
-#: archive-zip.c:319
+#: archive-zip.c
 #, c-format
 msgid "path is not valid UTF-8: %s"
 msgstr "路径不是有效的 UTF-8：%s"
 
-#: archive-zip.c:323
+#: archive-zip.c
 #, c-format
 msgid "path too long (%d chars, SHA1: %s): %s"
 msgstr "路径太长（%d 字符，SHA1：%s）：%s"
 
-#: archive-zip.c:470 builtin/pack-objects.c:363 builtin/pack-objects.c:366
+#: archive-zip.c builtin/pack-objects.c
 #, c-format
 msgid "deflate error (%d)"
 msgstr "压缩错误 (%d)"
 
-#: archive-zip.c:604
+#: archive-zip.c
 #, c-format
 msgid "timestamp too large for this system: %<PRIuMAX>"
 msgstr "对于本系统时间戳太大：%<PRIuMAX>"
 
-#: archive.c:14
+#: archive.c
 msgid "git archive [<options>] <tree-ish> [<path>...]"
 msgstr "git archive [<选项>] <树对象> [<路径>...]"
 
-#: archive.c:16
+#: archive.c
 msgid ""
 "git archive --remote <repo> [--exec <cmd>] [<options>] <tree-ish> [<path>...]"
 msgstr ""
 "git archive --remote <仓库> [--exec <命令>] [<选项>] <树对象> [<路径>...]"
 
-#: archive.c:17
+#: archive.c
 msgid "git archive --remote <repo> [--exec <cmd>] --list"
 msgstr "git archive --remote <仓库> [--exec <命令>] --list"
 
-#: archive.c:188 archive.c:341 builtin/gc.c:497 builtin/notes.c:238
-#: builtin/tag.c:579
+#: archive.c builtin/gc.c builtin/notes.c builtin/tag.c
 #, c-format
 msgid "cannot read '%s'"
 msgstr "不能读取 '%s'"
 
-#: archive.c:426 builtin/add.c:214 builtin/add.c:657 builtin/rm.c:334
+#: archive.c builtin/add.c builtin/rm.c
 #, c-format
 msgid "pathspec '%s' did not match any files"
 msgstr "路径规格 '%s' 未匹配任何文件"
 
-#: archive.c:450
+#: archive.c
 #, c-format
 msgid "no such ref: %.*s"
 msgstr "无此引用：%.*s"
 
-#: archive.c:456
+#: archive.c
 #, c-format
 msgid "not a valid object name: %s"
 msgstr "不是一个有效的对象名：%s"
 
-#: archive.c:469
+#: archive.c
 #, c-format
 msgid "not a tree object: %s"
 msgstr "不是一个树对象：%s"
 
-#: archive.c:481
+#: archive.c
 msgid "current working directory is untracked"
 msgstr "当前工作目录未被跟踪"
 
-#: archive.c:522
+#: archive.c
 #, c-format
 msgid "File not found: %s"
 msgstr "文件未找到：%s"
 
-#: archive.c:524
+#: archive.c
 #, c-format
 msgid "Not a regular file: %s"
 msgstr "不是一个常规文件：%s"
 
-#: archive.c:551
+#: archive.c
+#, c-format
+msgid "unclosed quote: '%s'"
+msgstr "未关闭的引号：'%s'"
+
+#: archive.c
+#, c-format
+msgid "missing colon: '%s'"
+msgstr "缺失冒号：'%s'"
+
+#: archive.c
+#, c-format
+msgid "empty file name: '%s'"
+msgstr "空的文件名：'%s'"
+
+#: archive.c
 msgid "fmt"
 msgstr "格式"
 
-#: archive.c:551
+#: archive.c
 msgid "archive format"
 msgstr "归档格式"
 
-#: archive.c:552 builtin/log.c:1809
+#: archive.c builtin/log.c
 msgid "prefix"
 msgstr "前缀"
 
-#: archive.c:553
+#: archive.c
 msgid "prepend prefix to each pathname in the archive"
 msgstr "为归档中每个路径名加上前缀"
 
-#: archive.c:554 archive.c:557 builtin/blame.c:881 builtin/blame.c:885
-#: builtin/blame.c:886 builtin/commit-tree.c:115 builtin/config.c:135
-#: builtin/fast-export.c:1181 builtin/fast-export.c:1183
-#: builtin/fast-export.c:1187 builtin/grep.c:936 builtin/hash-object.c:104
-#: builtin/ls-files.c:654 builtin/ls-files.c:657 builtin/notes.c:410
-#: builtin/notes.c:576 builtin/read-tree.c:115 parse-options.h:195
+#: archive.c builtin/blame.c builtin/commit-tree.c builtin/config.c
+#: builtin/fast-export.c builtin/grep.c builtin/hash-object.c
+#: builtin/ls-files.c builtin/notes.c builtin/read-tree.c parse-options.h
 msgid "file"
 msgstr "文件"
 
-#: archive.c:555
+#: archive.c
 msgid "add untracked file to archive"
 msgstr "将未跟踪文件添加到归档"
 
-#: archive.c:558 builtin/archive.c:88
+#: archive.c
+msgid "path:content"
+msgstr "路径:内容"
+
+#: archive.c builtin/archive.c
 msgid "write the archive to this file"
 msgstr "归档写入此文件"
 
-#: archive.c:560
+#: archive.c
 msgid "read .gitattributes in working directory"
 msgstr "读取工作区中的 .gitattributes"
 
-#: archive.c:561
+#: archive.c
 msgid "report archived files on stderr"
 msgstr "在标准错误上报告归档文件"
 
-#: archive.c:563
+#: archive.c
 msgid "set compression level"
 msgstr "设置压缩级别"
 
-#: archive.c:566
+#: archive.c
 msgid "list supported archive formats"
 msgstr "列出支持的归档格式"
 
-#: archive.c:568 builtin/archive.c:89 builtin/clone.c:122 builtin/clone.c:125
-#: builtin/submodule--helper.c:1884 builtin/submodule--helper.c:2718
+#: archive.c builtin/archive.c builtin/clone.c builtin/submodule--helper.c
 msgid "repo"
 msgstr "仓库"
 
-#: archive.c:569 builtin/archive.c:90
+#: archive.c builtin/archive.c
 msgid "retrieve the archive from remote repository <repo>"
 msgstr "从远程仓库（<仓库>）提取归档文件"
 
-#: archive.c:570 builtin/archive.c:91 builtin/difftool.c:708
-#: builtin/notes.c:496
+#: archive.c builtin/archive.c builtin/difftool.c builtin/notes.c
 msgid "command"
 msgstr "命令"
 
-#: archive.c:571 builtin/archive.c:92
+#: archive.c builtin/archive.c
 msgid "path to the remote git-upload-archive command"
 msgstr "远程 git-upload-archive 命令的路径"
 
-#: archive.c:578
+#: archive.c
 msgid "Unexpected option --remote"
 msgstr "未知参数 --remote"
 
-#: archive.c:580 fetch-pack.c:300 revision.c:2914 builtin/add.c:530
-#: builtin/add.c:562 builtin/checkout.c:1782 builtin/clone.c:1099
-#: builtin/clone.c:1102 builtin/commit.c:371 builtin/fast-export.c:1230
-#: builtin/index-pack.c:1854 builtin/log.c:2140 builtin/reset.c:442
-#: builtin/reset.c:500 builtin/rm.c:281 builtin/stash.c:1708
-#: builtin/worktree.c:580 builtin/worktree.c:781 http-fetch.c:144
-#: http-fetch.c:153
+#: archive.c builtin/add.c builtin/checkout.c builtin/clone.c builtin/commit.c
+#: builtin/fast-export.c builtin/index-pack.c builtin/log.c builtin/reset.c
+#: builtin/rm.c builtin/stash.c builtin/worktree.c fetch-pack.c http-fetch.c
+#: revision.c
 #, c-format
 msgid "the option '%s' requires '%s'"
 msgstr "选项 '%s' 需要 '%s'"
 
-#: archive.c:582
+#: archive.c
 msgid "Unexpected option --output"
 msgstr "未知参数 --output"
 
-#: archive.c:606
+#: archive.c
 #, c-format
 msgid "Unknown archive format '%s'"
 msgstr "未知归档格式 '%s'"
 
-#: archive.c:615
+#: archive.c
 #, c-format
 msgid "Argument not supported for format '%s': -%d"
 msgstr "参数不支持此格式 '%s'：-%d"
 
-#: attr.c:202
+#: attr.c
 #, c-format
 msgid "%.*s is not a valid attribute name"
 msgstr "%.*s 不是一个有效的属性名"
 
-#: attr.c:363
+#: attr.c
 #, c-format
 msgid "%s not allowed: %s:%d"
 msgstr "不允许 %s：%s:%d"
 
-#: attr.c:403
+#: attr.c
 msgid ""
 "Negative patterns are ignored in git attributes\n"
 "Use '\\!' for literal leading exclamation."
@@ -1829,22 +1809,22 @@ msgstr ""
 "负值模版在 git attributes 中被忽略\n"
 "当字符串确实要以感叹号开始时，使用 '\\!'。"
 
-#: bisect.c:488
+#: bisect.c
 #, c-format
 msgid "Badly quoted content in file '%s': %s"
 msgstr "文件 '%s' 包含错误的引用格式：%s"
 
-#: bisect.c:698
+#: bisect.c
 #, c-format
 msgid "We cannot bisect more!\n"
 msgstr "我们无法进行更多的二分查找！\n"
 
-#: bisect.c:765
+#: bisect.c
 #, c-format
 msgid "Not a valid commit name %s"
 msgstr "不是一个有效的提交名 %s"
 
-#: bisect.c:790
+#: bisect.c
 #, c-format
 msgid ""
 "The merge base %s is bad.\n"
@@ -1853,7 +1833,7 @@ msgstr ""
 "合并基线 %s 是坏的。\n"
 "这意味着介于 %s 和 [%s] 之间的 bug 已经被修复。\n"
 
-#: bisect.c:795
+#: bisect.c
 #, c-format
 msgid ""
 "The merge base %s is new.\n"
@@ -1862,7 +1842,7 @@ msgstr ""
 "合并基线 %s 是新的。\n"
 "介于 %s 和 [%s] 之间的属性已经被修改。\n"
 
-#: bisect.c:800
+#: bisect.c
 #, c-format
 msgid ""
 "The merge base %s is %s.\n"
@@ -1871,7 +1851,7 @@ msgstr ""
 "合并基线 %s 是 %s。\n"
 "这意味着第一个 '%s' 提交位于 %s 和 [%s] 之间。\n"
 
-#: bisect.c:808
+#: bisect.c
 #, c-format
 msgid ""
 "Some %s revs are not ancestors of the %s rev.\n"
@@ -1882,7 +1862,7 @@ msgstr ""
 "这种情况下 git 二分查找无法正常工作。\n"
 "您可能弄错了 %s 和 %s 版本？\n"
 
-#: bisect.c:821
+#: bisect.c
 #, c-format
 msgid ""
 "the merge base between %s and [%s] must be skipped.\n"
@@ -1893,36 +1873,36 @@ msgstr ""
 "所以我们无法确认第一个 %s 提交是否介于 %s 和 %s 之间。\n"
 "我们仍旧继续。"
 
-#: bisect.c:860
+#: bisect.c
 #, c-format
 msgid "Bisecting: a merge base must be tested\n"
 msgstr "二分查找中：合并基线必须是经过测试的\n"
 
-#: bisect.c:910
+#: bisect.c
 #, c-format
 msgid "a %s revision is needed"
 msgstr "需要一个 %s 版本"
 
-#: bisect.c:940
+#: bisect.c
 #, c-format
 msgid "could not create file '%s'"
 msgstr "不能创建文件 '%s'"
 
-#: bisect.c:986 builtin/merge.c:155
+#: bisect.c builtin/merge.c
 #, c-format
 msgid "could not read file '%s'"
 msgstr "不能读取文件 '%s'"
 
-#: bisect.c:1026
+#: bisect.c
 msgid "reading bisect refs failed"
 msgstr "读取二分查找引用失败"
 
-#: bisect.c:1056
+#: bisect.c
 #, c-format
 msgid "%s was both %s and %s\n"
 msgstr "%s 同时为 %s 和 %s\n"
 
-#: bisect.c:1065
+#: bisect.c
 #, c-format
 msgid ""
 "No testable commit found.\n"
@@ -1931,7 +1911,7 @@ msgstr ""
 "没有发现可测试的提交。\n"
 "可能您在运行时使用了错误的路径参数？\n"
 
-#: bisect.c:1094
+#: bisect.c
 #, c-format
 msgid "(roughly %d step)"
 msgid_plural "(roughly %d steps)"
@@ -1941,80 +1921,77 @@ msgstr[1] "（大概 %d 步）"
 #. TRANSLATORS: the last %s will be replaced with "(roughly %d
 #. steps)" translation.
 #.
-#: bisect.c:1100
+#: bisect.c
 #, 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"
 msgstr[0] "二分查找中：在此之后，还剩 %d 个版本待测试 %s\n"
 msgstr[1] "二分查找中：在此之后，还剩 %d 个版本待测试 %s\n"
 
-#: blame.c:2773
+#: blame.c
 msgid "--contents and --reverse do not blend well."
 msgstr "--contents 和 --reverse 不能混用。"
 
-#: blame.c:2787
+#: blame.c
 msgid "cannot use --contents with final commit object name"
 msgstr "不能将 --contents 和最终的提交对象名共用"
 
-#: blame.c:2808
+#: blame.c
 msgid "--reverse and --first-parent together require specified latest commit"
 msgstr "--reverse 和 --first-parent 共用，需要指定最新的提交"
 
-#: blame.c:2817 bundle.c:231 midx.c:1058 ref-filter.c:2371 remote.c:2157
-#: sequencer.c:2348 sequencer.c:4872 submodule.c:913 builtin/commit.c:1118
-#: builtin/log.c:437 builtin/log.c:1055 builtin/log.c:1663 builtin/log.c:2096
-#: builtin/log.c:2387 builtin/merge.c:431 builtin/pack-objects.c:3381
-#: builtin/pack-objects.c:3781 builtin/pack-objects.c:3796
-#: builtin/shortlog.c:255
+#: blame.c builtin/commit.c builtin/log.c builtin/merge.c
+#: builtin/pack-objects.c builtin/shortlog.c bundle.c midx.c ref-filter.c
+#: remote.c sequencer.c submodule.c
 msgid "revision walk setup failed"
 msgstr "版本遍历设置失败"
 
-#: blame.c:2835
+#: blame.c
 msgid ""
 "--reverse --first-parent together require range along first-parent chain"
 msgstr "--reverse 和 --first-parent 共用，需要第一祖先链上的提交范围"
 
-#: blame.c:2846
+#: blame.c
 #, c-format
 msgid "no such path %s in %s"
 msgstr "在 %2$s 中无此路径 %1$s"
 
-#: blame.c:2857
+#: blame.c
 #, c-format
 msgid "cannot read blob %s for path %s"
 msgstr "不能为路径 %2$s 读取数据对象 %1$s"
 
-#: branch.c:93
+#: branch.c
 msgid ""
 "cannot inherit upstream tracking configuration of multiple refs when "
 "rebasing is requested"
 msgstr "在请求变基时无法继承上游多个引用的跟踪设置"
 
-#: branch.c:104
+#: branch.c
 #, c-format
 msgid "not setting branch '%s' as its own upstream"
 msgstr "没有将分支 '%s' 设置为它自己的上游"
 
-#: branch.c:160
+#: branch.c
 #, c-format
 msgid "branch '%s' set up to track '%s' by rebasing."
 msgstr "分支 '%s' 设置为使用变基来跟踪 '%s'。"
 
-#: branch.c:161
+#: branch.c
 #, c-format
 msgid "branch '%s' set up to track '%s'."
 msgstr "分支 '%s' 设置为跟踪 '%s'。"
 
-#: branch.c:164
+#: branch.c
 #, c-format
 msgid "branch '%s' set up to track:"
 msgstr "分支 '%s' 设置为跟踪："
 
-#: branch.c:176
+#: branch.c
 msgid "unable to write upstream branch configuration"
 msgstr "无法写入上游分支配置"
 
-#: branch.c:178
+#: branch.c
 msgid ""
 "\n"
 "After fixing the error cause you may try to fix up\n"
@@ -2023,32 +2000,34 @@ msgstr ""
 "\n"
 "在修复错误后，您可以通过执行以下命令来尝试修改远程跟踪分支："
 
-#: branch.c:219
+#: branch.c
 #, c-format
 msgid "asked to inherit tracking from '%s', but no remote is set"
 msgstr "要求从 '%s' 继承跟踪信息，但是没有设置远程"
 
-#: branch.c:225
+#: branch.c
 #, c-format
 msgid "asked to inherit tracking from '%s', but no merge configuration is set"
 msgstr "要求从 '%s' 继承跟踪信息，但是没有设置合并配置"
 
-#: branch.c:277
+#: branch.c
 #, c-format
 msgid "not tracking: ambiguous information for ref '%s'"
 msgstr "不在跟踪中：引用 '%s' 有歧义的信息"
 
 #  译者：为保证在输出中对齐，注意调整句中空格！
+#. #-#-#-#-#  branch.c.po  #-#-#-#-#
 #. TRANSLATORS: This is a line listing a remote with duplicate
 #. refspecs in the advice message below. For RTL languages you'll
 #. probably want to swap the "%s" and leading "  " space around.
 #.
+#. #-#-#-#-#  object-name.c.po  #-#-#-#-#
 #. TRANSLATORS: This is line item of ambiguous object output
 #. from describe_ambiguous_object() above. For RTL languages
 #. you'll probably want to swap the "%s" and leading " " space
 #. around.
 #.
-#: branch.c:289 object-name.c:464
+#: branch.c object-name.c
 #, c-format
 msgid "  %s\n"
 msgstr "  %s\n"
@@ -2056,7 +2035,7 @@ msgstr "  %s\n"
 #. TRANSLATORS: The second argument is a \n-delimited list of
 #. duplicate refspecs, composed above.
 #.
-#: branch.c:295
+#: branch.c
 #, c-format
 msgid ""
 "There are multiple remotes whose fetch refspecs map to the remote\n"
@@ -2075,32 +2054,32 @@ msgstr ""
 "如果要支持设置追踪分支，请保证不同远程的获取引用规格映射至不同的追踪命名空"
 "间。"
 
-#: branch.c:344
+#: branch.c
 #, c-format
 msgid "'%s' is not a valid branch name"
 msgstr "'%s' 不是一个有效的分支名称"
 
-#: branch.c:364
+#: branch.c
 #, c-format
 msgid "a branch named '%s' already exists"
 msgstr "一个名为 '%s' 的分支已经存在"
 
-#: branch.c:370
+#: branch.c
 #, c-format
 msgid "cannot force update the branch '%s' checked out at '%s'"
 msgstr "无法强制更新检出于 '%2$s' 的分支 '%1$s'"
 
-#: branch.c:393
+#: branch.c
 #, c-format
 msgid "cannot set up tracking information; starting point '%s' is not a branch"
 msgstr "无法设置跟踪信息；起始点 '%s' 不是一个分支"
 
-#: branch.c:395
+#: branch.c
 #, c-format
 msgid "the requested upstream branch '%s' does not exist"
 msgstr "请求的上游分支 '%s' 不存在"
 
-#: branch.c:397
+#: branch.c
 msgid ""
 "\n"
 "If you are planning on basing your work on an upstream\n"
@@ -2118,28 +2097,27 @@ msgstr ""
 "如果您正计划推送一个能与对应远程分支建立跟踪的新的本地分支，\n"
 "您可能需要使用 \"git push -u\" 推送分支并配置和上游的关联。"
 
-#: branch.c:445 builtin/replace.c:321 builtin/replace.c:377
-#: builtin/replace.c:423 builtin/replace.c:453
+#: branch.c builtin/replace.c
 #, c-format
 msgid "not a valid object name: '%s'"
 msgstr "不是一个有效的对象名：'%s'"
 
-#: branch.c:465
+#: branch.c
 #, c-format
 msgid "ambiguous object name: '%s'"
 msgstr "歧义的对象名：'%s'"
 
-#: branch.c:470
+#: branch.c
 #, c-format
 msgid "not a valid branch point: '%s'"
 msgstr "无效的分支点：'%s'"
 
-#: branch.c:658
+#: branch.c
 #, c-format
 msgid "submodule '%s': unable to find submodule"
 msgstr "子模组 '%s'：无法找到子模组"
 
-#: branch.c:661
+#: branch.c
 #, c-format
 msgid ""
 "You may try updating the submodules using 'git checkout %s && git submodule "
@@ -2147,8519 +2125,151 @@ msgid ""
 msgstr ""
 "你可以用 'git checkout %s && git submodule update --init' 来尝试更新子模组"
 
-#: branch.c:672 branch.c:698
+#: branch.c
 #, c-format
 msgid "submodule '%s': cannot create branch '%s'"
 msgstr "子模组 '%s'：不能创建分支 '%s'"
 
-#: branch.c:730
+#: branch.c
 #, c-format
 msgid "'%s' is already checked out at '%s'"
 msgstr "'%s' 已经检出到 '%s'"
 
-#: branch.c:755
+#: branch.c
 #, c-format
 msgid "HEAD of working tree %s is not updated"
 msgstr "工作区 %s 的 HEAD 指向没有被更新"
 
-#: bundle.c:45
-#, c-format
-msgid "unrecognized bundle hash algorithm: %s"
-msgstr "未能识别的归档包哈希算法：%s"
-
-#: bundle.c:53
-#, c-format
-msgid "unknown capability '%s'"
-msgstr "未知能力 '%s'"
-
-#: bundle.c:79
-#, c-format
-msgid "'%s' does not look like a v2 or v3 bundle file"
-msgstr "'%s' 不像是一个 v2 或 v3 版本的归档包文件"
-
-#: bundle.c:118
-#, c-format
-msgid "unrecognized header: %s%s (%d)"
-msgstr "未能识别的包头：%s%s (%d)"
-
-#: bundle.c:145 rerere.c:464 rerere.c:675 sequencer.c:2616 sequencer.c:3402
-#: builtin/commit.c:865
-#, c-format
-msgid "could not open '%s'"
-msgstr "不能打开 '%s'"
-
-#: bundle.c:203
-msgid "Repository lacks these prerequisite commits:"
-msgstr "仓库中缺少这些必备的提交："
-
-#: bundle.c:206
-msgid "need a repository to verify a bundle"
-msgstr "需要一个仓库来校验一个归档包"
-
-#: bundle.c:264
-#, c-format
-msgid "The bundle contains this ref:"
-msgid_plural "The bundle contains these %<PRIuMAX> refs:"
-msgstr[0] "这个归档包中含有这个引用："
-msgstr[1] "这个归档包中含有 %<PRIuMAX> 个引用："
-
-#: bundle.c:272
-msgid "The bundle records a complete history."
-msgstr "这个归档包记录一个完整历史。"
-
-#: bundle.c:274
-#, c-format
-msgid "The bundle requires this ref:"
-msgid_plural "The bundle requires these %<PRIuMAX> refs:"
-msgstr[0] "这个归档包需要这个引用："
-msgstr[1] "这个归档包需要 %<PRIuMAX> 个引用："
-
-#: bundle.c:350
-msgid "unable to dup bundle descriptor"
-msgstr "无法复制归档包描述符"
-
-#: bundle.c:357
-msgid "Could not spawn pack-objects"
-msgstr "不能生成 pack-objects 进程"
-
-#: bundle.c:368
-msgid "pack-objects died"
-msgstr "pack-objects 终止"
-
-#: bundle.c:417
-#, c-format
-msgid "ref '%s' is excluded by the rev-list options"
-msgstr "引用 '%s' 被 rev-list 选项排除"
-
-#: bundle.c:533 builtin/log.c:211 builtin/log.c:1975 builtin/shortlog.c:400
-#, c-format
-msgid "unrecognized argument: %s"
-msgstr "未能识别的参数：%s"
-
-#: bundle.c:548
-#, c-format
-msgid "unsupported bundle version %d"
-msgstr "不支持的归档包版本 %d"
-
-#: bundle.c:550
-#, c-format
-msgid "cannot write bundle version %d with algorithm %s"
-msgstr "不能写入，归档包版本 %d 不支持算法 %s"
-
-#: bundle.c:600
-msgid "Refusing to create empty bundle."
-msgstr "不能创建空的归档包。"
-
-#: bundle.c:610
-#, c-format
-msgid "cannot create '%s'"
-msgstr "不能创建 '%s'"
-
-#: bundle.c:639
-msgid "index-pack died"
-msgstr "index-pack 终止"
-
-#: chunk-format.c:117
-msgid "terminating chunk id appears earlier than expected"
-msgstr "终止块 ID 比预期更早出现"
-
-#: chunk-format.c:126
-#, c-format
-msgid "improper chunk offset(s) %<PRIx64> and %<PRIx64>"
-msgstr "不正确的块偏移 %<PRIx64> 和 %<PRIx64>"
-
-#: chunk-format.c:133
-#, c-format
-msgid "duplicate chunk ID %<PRIx32> found"
-msgstr "发现重复的块ID %<PRIx32>"
-
-#: chunk-format.c:147
-#, c-format
-msgid "final chunk has non-zero id %<PRIx32>"
-msgstr "最终块有非零 ID %<PRIx32>"
-
-#: color.c:354
-#, c-format
-msgid "invalid color value: %.*s"
-msgstr "无效的颜色值：%.*s"
-
-#: commit-graph.c:204 midx.c:52
-msgid "invalid hash version"
-msgstr "无效的哈希版本"
-
-#: commit-graph.c:262
-msgid "commit-graph file is too small"
-msgstr "提交图形文件太小"
-
-#: commit-graph.c:355
-#, c-format
-msgid "commit-graph signature %X does not match signature %X"
-msgstr "提交图形签名 %X 和签名 %X 不匹配"
-
-#: commit-graph.c:362
-#, c-format
-msgid "commit-graph version %X does not match version %X"
-msgstr "提交图形版本 %X 和版本 %X 不匹配"
-
-#: commit-graph.c:369
-#, c-format
-msgid "commit-graph hash version %X does not match version %X"
-msgstr "提交图形哈希版本 %X 和版本 %X 不匹配"
-
-#: commit-graph.c:386
-#, c-format
-msgid "commit-graph file is too small to hold %u chunks"
-msgstr "提交图形文件太小，容不下 %u 个块"
-
-#: commit-graph.c:485
-msgid "commit-graph has no base graphs chunk"
-msgstr "提交图形没有基础图形块"
-
-#: commit-graph.c:495
-msgid "commit-graph chain does not match"
-msgstr "提交图形链不匹配"
-
-#: commit-graph.c:543
-#, c-format
-msgid "invalid commit-graph chain: line '%s' not a hash"
-msgstr "无效的提交图形链：行 '%s' 不是一个哈希值"
-
-#: commit-graph.c:567
-msgid "unable to find all commit-graph files"
-msgstr "无法找到所有提交图形文件"
-
-#: commit-graph.c:752 commit-graph.c:789
-msgid "invalid commit position. commit-graph is likely corrupt"
-msgstr "无效的提交位置。提交图形可能已损坏"
-
-#: commit-graph.c:773
-#, c-format
-msgid "could not find commit %s"
-msgstr "无法找到提交 %s"
-
-#: commit-graph.c:806
-msgid "commit-graph requires overflow generation data but has none"
-msgstr "提交图需要溢出世代数据，但是没有"
-
-#: commit-graph.c:1111 builtin/am.c:1370 builtin/checkout.c:775
-#: builtin/clone.c:705
-#, c-format
-msgid "unable to parse commit %s"
-msgstr "不能解析提交 %s"
-
-#: commit-graph.c:1373 builtin/pack-objects.c:3078
-#, c-format
-msgid "unable to get type of object %s"
-msgstr "无法获得对象 %s 类型"
-
-#: commit-graph.c:1404
-msgid "Loading known commits in commit graph"
-msgstr "正在加载提交图中的已知提交"
-
-#: commit-graph.c:1421
-msgid "Expanding reachable commits in commit graph"
-msgstr "正在扩展提交图中的可达提交"
-
-#: commit-graph.c:1441
-msgid "Clearing commit marks in commit graph"
-msgstr "正在清除提交图中的提交标记"
-
-#: commit-graph.c:1460
-msgid "Computing commit graph topological levels"
-msgstr "正在计算提交图拓扑级别"
-
-#: commit-graph.c:1513
-msgid "Computing commit graph generation numbers"
-msgstr "正在计算提交图世代数字"
-
-#: commit-graph.c:1598
-msgid "Computing commit changed paths Bloom filters"
-msgstr "计算提交变更路径的布隆过滤器"
-
-#: commit-graph.c:1675
-msgid "Collecting referenced commits"
-msgstr "正在收集引用的提交"
-
-#: commit-graph.c:1701
-#, c-format
-msgid "Finding commits for commit graph in %<PRIuMAX> pack"
-msgid_plural "Finding commits for commit graph in %<PRIuMAX> packs"
-msgstr[0] "正在 %<PRIuMAX> 个包中查找提交图的提交"
-msgstr[1] "正在 %<PRIuMAX> 个包中查找提交图的提交"
-
-#: commit-graph.c:1714
-#, c-format
-msgid "error adding pack %s"
-msgstr "添加包 %s 出错"
-
-#: commit-graph.c:1718
-#, c-format
-msgid "error opening index for %s"
-msgstr "为 %s 打开索引出错"
-
-#: commit-graph.c:1756
-msgid "Finding commits for commit graph among packed objects"
-msgstr "正在打包对象中查找提交图的提交"
-
-#: commit-graph.c:1774
-msgid "Finding extra edges in commit graph"
-msgstr "正在查找提交图中额外的边"
-
-#: commit-graph.c:1823
-msgid "failed to write correct number of base graph ids"
-msgstr "无法写入正确数量的基础图形 ID"
-
-#: commit-graph.c:1854 midx.c:1168 builtin/sparse-checkout.c:475
-#, c-format
-msgid "unable to create leading directories of %s"
-msgstr "不能为 %s 创建先导目录"
-
-#: commit-graph.c:1868
-msgid "unable to create temporary graph layer"
-msgstr "无法创建临时图层"
-
-#: commit-graph.c:1873
-#, c-format
-msgid "unable to adjust shared permissions for '%s'"
-msgstr "无法为 '%s' 调整共享权限"
-
-#: commit-graph.c:1930
-#, 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:1967
-msgid "unable to open commit-graph chain file"
-msgstr "无法打开提交图形链文件"
-
-#: commit-graph.c:1983
-msgid "failed to rename base commit-graph file"
-msgstr "无法重命名基础提交图形文件"
-
-#: commit-graph.c:2004
-msgid "failed to rename temporary commit-graph file"
-msgstr "无法重命名临时提交图形文件"
-
-#: commit-graph.c:2137
-msgid "Scanning merged commits"
-msgstr "正在扫描合并提交"
-
-#: commit-graph.c:2181
-msgid "Merging commit-graph"
-msgstr "正在合并提交图形"
-
-#: commit-graph.c:2289
-msgid "attempting to write a commit-graph, but 'core.commitGraph' is disabled"
-msgstr "正尝试写提交图，但是 'core.commitGraph' 被禁用"
-
-#: commit-graph.c:2396
-msgid "too many commits to write graph"
-msgstr "提交太多不能画图"
-
-#: commit-graph.c:2494
-msgid "the commit-graph file has incorrect checksum and is likely corrupt"
-msgstr "提交图文件的校验码错误，可能已经损坏"
-
-#: commit-graph.c:2504
-#, c-format
-msgid "commit-graph has incorrect OID order: %s then %s"
-msgstr "提交图形的对象 ID 顺序不正确：%s 然后 %s"
-
-#: commit-graph.c:2514 commit-graph.c:2529
-#, c-format
-msgid "commit-graph has incorrect fanout value: fanout[%d] = %u != %u"
-msgstr "提交图形有不正确的扇出值：fanout[%d] = %u != %u"
-
-#: commit-graph.c:2521
-#, c-format
-msgid "failed to parse commit %s from commit-graph"
-msgstr "无法从提交图形中解析提交 %s"
-
-#: commit-graph.c:2539
-msgid "Verifying commits in commit graph"
-msgstr "正在校验提交图中的提交"
-
-#: commit-graph.c:2554
-#, c-format
-msgid "failed to parse commit %s from object database for commit-graph"
-msgstr "无法从提交图形的对象库中解析提交 %s"
-
-#: commit-graph.c:2561
-#, c-format
-msgid "root tree OID for commit %s in commit-graph is %s != %s"
-msgstr "提交图形中的提交 %s 的根树对象 ID 是 %s != %s"
-
-#: commit-graph.c:2571
-#, c-format
-msgid "commit-graph parent list for commit %s is too long"
-msgstr "提交 %s 的提交图形父提交列表太长了"
-
-#: commit-graph.c:2580
-#, c-format
-msgid "commit-graph parent for %s is %s != %s"
-msgstr "%s 的提交图形父提交是 %s != %s"
-
-#: commit-graph.c:2594
-#, c-format
-msgid "commit-graph parent list for commit %s terminates early"
-msgstr "提交 %s 的提交图形父提交列表过早终止"
-
-#: commit-graph.c:2599
-#, c-format
-msgid ""
-"commit-graph has generation number zero for commit %s, but non-zero elsewhere"
-msgstr "提交图形中提交 %s 的世代号是零，但其它地方非零"
-
-#: commit-graph.c:2603
-#, c-format
-msgid ""
-"commit-graph has non-zero generation number for commit %s, but zero elsewhere"
-msgstr "提交图形中提交 %s 的世代号非零，但其它地方是零"
-
-#: commit-graph.c:2620
-#, c-format
-msgid "commit-graph generation for commit %s is %<PRIuMAX> < %<PRIuMAX>"
-msgstr "提交图形中的提交 %s 的世代号是 %<PRIuMAX> < %<PRIuMAX>"
-
-#: commit-graph.c:2626
-#, c-format
-msgid "commit date for commit %s in commit-graph is %<PRIuMAX> != %<PRIuMAX>"
-msgstr "提交图形中提交 %s 的提交日期是 %<PRIuMAX> != %<PRIuMAX>"
-
-#: commit.c:54 sequencer.c:3105 builtin/am.c:400 builtin/am.c:445
-#: builtin/am.c:450 builtin/am.c:1449 builtin/am.c:2124 builtin/replace.c:456
-#, c-format
-msgid "could not parse %s"
-msgstr "不能解析 %s"
-
-#: commit.c:56
-#, c-format
-msgid "%s %s is not a commit!"
-msgstr "%s %s 不是一个提交！"
-
-#: commit.c:197
-msgid ""
-"Support for <GIT_DIR>/info/grafts is deprecated\n"
-"and will be removed in a future Git version.\n"
-"\n"
-"Please use \"git replace --convert-graft-file\"\n"
-"to convert the grafts into replace refs.\n"
-"\n"
-"Turn this message off by running\n"
-"\"git config advice.graftFileDeprecated false\""
-msgstr ""
-"对 <GIT_DIR>/info/grafts 的支持已过时，并将在\n"
-"未来的Git版本中被移除。\n"
-"\n"
-"请使用 \"git replace --convert-graft-file\" 将\n"
-"grafts 转换为替换引用。\n"
-"\n"
-"设置 \"git config advice.graftFileDeprecated false\"\n"
-"可关闭本消息"
-
-#: commit.c:1252
-#, c-format
-msgid "Commit %s has an untrusted GPG signature, allegedly by %s."
-msgstr "提交 %s 有一个非可信的声称来自 %s 的 GPG 签名。"
-
-#: commit.c:1256
-#, c-format
-msgid "Commit %s has a bad GPG signature allegedly by %s."
-msgstr "提交 %s 有一个错误的声称来自 %s 的 GPG 签名。"
-
-#: commit.c:1259
-#, c-format
-msgid "Commit %s does not have a GPG signature."
-msgstr "提交 %s 没有 GPG 签名。"
-
-#: commit.c:1262
-#, c-format
-msgid "Commit %s has a good GPG signature by %s\n"
-msgstr "提交 %s 有一个来自 %s 的好的 GPG 签名。\n"
-
-#: commit.c:1516
-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"
-"variable i18n.commitencoding to the encoding your project uses.\n"
-msgstr ""
-"警告：提交说明不符合 UTF-8 字符编码。\n"
-"您可以通过修补提交来改正提交说明，或者将配置变量 i18n.commitencoding\n"
-"设置为您项目所用的字符编码。\n"
-
-#: compat/obstack.c:406 compat/obstack.c:408
-msgid "memory exhausted"
-msgstr "内存耗尽"
-
-#: compat/terminal.c:167
-msgid "cannot resume in the background, please use 'fg' to resume"
-msgstr "无法从后台中恢复，请使用 'fg' 来恢复"
-
-#: compat/terminal.c:168
-msgid "cannot restore terminal settings"
-msgstr "无法恢复终端设置"
-
-#: config.c:143
-#, c-format
-msgid ""
-"exceeded maximum include depth (%d) while including\n"
-"\t%s\n"
-"from\n"
-"\t%s\n"
-"This might be due to circular includes."
-msgstr ""
-"超过了最大包含深度（%1$d），当从\n"
-"\t%3$s\n"
-"包含\n"
-"\t%2$s\n"
-"这可能是因为循环包含。"
-
-#: config.c:159
-#, c-format
-msgid "could not expand include path '%s'"
-msgstr "无法扩展包含路径 '%s'"
-
-#: config.c:170
-msgid "relative config includes must come from files"
-msgstr "相对路径的配置文件引用必须来自于文件"
-
-#: config.c:219
-msgid "relative config include conditionals must come from files"
-msgstr "相对路径的配置文件条件引用必须来自于文件"
-
-#: config.c:364
-msgid ""
-"remote URLs cannot be configured in file directly or indirectly included by "
-"includeIf.hasconfig:remote.*.url"
-msgstr ""
-"远程 URL 不能在文件中配置，不管直接地还是通过 includeIf.hasconfig:remote.*."
-"url 间接地包含。"
-
-#: config.c:508
-#, c-format
-msgid "invalid config format: %s"
-msgstr "无效的配置格式：%s"
-
-#: config.c:512
-#, c-format
-msgid "missing environment variable name for configuration '%.*s'"
-msgstr "配置 '%.*s' 缺少环境变量名称"
-
-#: config.c:517
-#, c-format
-msgid "missing environment variable '%s' for configuration '%.*s'"
-msgstr "缺少环境变量 '%s' 于配置 '%.*s' "
-
-#: config.c:553
-#, c-format
-msgid "key does not contain a section: %s"
-msgstr "键名没有包含一个小节名称：%s"
-
-#: config.c:558
-#, c-format
-msgid "key does not contain variable name: %s"
-msgstr "键名没有包含变量名：%s"
-
-#: config.c:580 sequencer.c:2802
-#, c-format
-msgid "invalid key: %s"
-msgstr "无效键名：%s"
-
-#: config.c:585
-#, c-format
-msgid "invalid key (newline): %s"
-msgstr "无效键名（有换行符）：%s"
-
-#: config.c:605
-msgid "empty config key"
-msgstr "空的配置键名"
-
-#: config.c:623 config.c:635
-#, c-format
-msgid "bogus config parameter: %s"
-msgstr "伪配置参数：%s"
-
-#: config.c:649 config.c:666 config.c:673 config.c:682
-#, c-format
-msgid "bogus format in %s"
-msgstr "%s 中格式错误"
-
-#: config.c:716
-#, c-format
-msgid "bogus count in %s"
-msgstr "%s 中错误计数"
-
-#: config.c:720
-#, c-format
-msgid "too many entries in %s"
-msgstr "%s 中太多的条目"
-
-#: config.c:730
-#, c-format
-msgid "missing config key %s"
-msgstr "缺失配置键名 %s"
-
-#: config.c:738
-#, c-format
-msgid "missing config value %s"
-msgstr "缺失配置取值 %s"
-
-#: config.c:1089
-#, c-format
-msgid "bad config line %d in blob %s"
-msgstr "数据对象 %2$s 中错误的配置行 %1$d"
-
-#: config.c:1093
-#, c-format
-msgid "bad config line %d in file %s"
-msgstr "文件 %2$s 中错误的配置行 %1$d"
-
-#: config.c:1097
-#, c-format
-msgid "bad config line %d in standard input"
-msgstr "标准输入中错误的配置行 %d"
-
-#: config.c:1101
-#, c-format
-msgid "bad config line %d in submodule-blob %s"
-msgstr "子模组数据对象 %2$s 中错误的配置行 %1$d"
-
-#: config.c:1105
-#, c-format
-msgid "bad config line %d in command line %s"
-msgstr "命令行 %2$s 中错误的配置行 %1$d"
-
-#: config.c:1109
-#, c-format
-msgid "bad config line %d in %s"
-msgstr "在 %2$s 中错误的配置行 %1$d"
-
-#: config.c:1246
-msgid "out of range"
-msgstr "超出范围"
-
-#: config.c:1246
-msgid "invalid unit"
-msgstr "无效的单位"
-
-#: config.c:1247
-#, c-format
-msgid "bad numeric config value '%s' for '%s': %s"
-msgstr "配置变量 '%2$s' 的数字取值 '%1$s' 设置错误：%3$s"
-
-#: config.c:1257
-#, 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:1260
-#, 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:1263
-#, c-format
-msgid "bad numeric config value '%s' for '%s' in standard input: %s"
-msgstr "标准输入中配置变量 '%2$s' 错误的取值 '%1$s'：%3$s"
-
-#: config.c:1266
-#, 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:1269
-#, 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:1272
-#, c-format
-msgid "bad numeric config value '%s' for '%s' in %s: %s"
-msgstr "在 %3$s 中配置变量 '%2$s' 错误的取值 '%1$s'：%4$s"
-
-#: config.c:1368
-#, c-format
-msgid "invalid value for variable %s"
-msgstr "变量 %s 的值无效"
-
-#: config.c:1389
-#, c-format
-msgid "ignoring unknown core.fsync component '%s'"
-msgstr "忽略未知的 core.fsync 组件 '%s'"
-
-#: config.c:1425
-#, c-format
-msgid "bad boolean config value '%s' for '%s'"
-msgstr "'%2$s' 的错误的布尔取值 '%1$s'"
-
-#: config.c:1443
-#, c-format
-msgid "failed to expand user dir in: '%s'"
-msgstr "无法扩展用户目录：'%s'"
-
-#: config.c:1452
-#, c-format
-msgid "'%s' for '%s' is not a valid timestamp"
-msgstr "'%2$s' 的值 '%1$s' 不是一个有效的时间戳"
-
-#: config.c:1545
-#, c-format
-msgid "abbrev length out of range: %d"
-msgstr "缩写长度超出范围：%d"
-
-#: config.c:1559 config.c:1570
-#, c-format
-msgid "bad zlib compression level %d"
-msgstr "错误的 zlib 压缩级别 %d"
-
-#: config.c:1660
-msgid "core.commentChar should only be one character"
-msgstr "core.commentChar 应该是一个字符"
-
-#: config.c:1692
-#, c-format
-msgid "ignoring unknown core.fsyncMethod value '%s'"
-msgstr "忽略未知的 core.fsyncMethod 值 '%s'"
-
-#: config.c:1698
-msgid "core.fsyncObjectFiles is deprecated; use core.fsync instead"
-msgstr "core.fsyncObjectFiles 已经被弃用；取而代之使用 core.fsync"
-
-#: config.c:1714
-#, c-format
-msgid "invalid mode for object creation: %s"
-msgstr "无效的对象创建模式：%s"
-
-#: config.c:1800
-#, c-format
-msgid "malformed value for %s"
-msgstr "%s 的取值格式错误"
-
-#: config.c:1826
-#, c-format
-msgid "malformed value for %s: %s"
-msgstr "%s 的取值格式错误：%s"
-
-#: config.c:1827
-msgid "must be one of nothing, matching, simple, upstream or current"
-msgstr "必须是其中之一：nothing、matching、simple、upstream 或 current"
-
-#: config.c:1888 builtin/pack-objects.c:4078
-#, c-format
-msgid "bad pack compression level %d"
-msgstr "错误的打包压缩级别 %d"
-
-#: config.c:2014
-#, c-format
-msgid "unable to load config blob object '%s'"
-msgstr "无法从数据对象 '%s' 加载配置"
-
-#: config.c:2017
-#, c-format
-msgid "reference '%s' does not point to a blob"
-msgstr "引用 '%s' 没有指向一个数据对象"
-
-#: config.c:2035
-#, c-format
-msgid "unable to resolve config blob '%s'"
-msgstr "不能解析配置对象 '%s'"
-
-#: config.c:2080
-#, c-format
-msgid "failed to parse %s"
-msgstr "无法解析 %s"
-
-#: config.c:2136
-msgid "unable to parse command-line config"
-msgstr "无法解析命令行中的配置"
-
-#: config.c:2512
-msgid "unknown error occurred while reading the configuration files"
-msgstr "在读取配置文件时遇到未知错误"
-
-#: config.c:2686
-#, c-format
-msgid "Invalid %s: '%s'"
-msgstr "无效 %s：'%s'"
-
-#: config.c:2731
-#, c-format
-msgid "splitIndex.maxPercentChange value '%d' should be between 0 and 100"
-msgstr "splitIndex.maxPercentChange 的取值 '%d' 应该介于 0 和 100 之间"
-
-#: config.c:2763
-#, c-format
-msgid "unable to parse '%s' from command-line config"
-msgstr "无法解析命令行配置中的 '%s'"
-
-#: config.c:2765
-#, c-format
-msgid "bad config variable '%s' in file '%s' at line %d"
-msgstr "在文件 '%2$s' 的第 %3$d 行发现错误的配置变量 '%1$s'"
-
-#: config.c:2850
-#, c-format
-msgid "invalid section name '%s'"
-msgstr "无效的小节名称 '%s'"
-
-#: config.c:2882
-#, c-format
-msgid "%s has multiple values"
-msgstr "%s 有多个取值"
-
-#: config.c:2911
-#, c-format
-msgid "failed to write new configuration file %s"
-msgstr "无法写入新的配置文件 %s"
-
-#: config.c:3177 config.c:3518
-#, c-format
-msgid "could not lock config file %s"
-msgstr "不能锁定配置文件 %s"
-
-#: config.c:3188
-#, c-format
-msgid "opening %s"
-msgstr "打开 %s"
-
-#: config.c:3225 builtin/config.c:361
-#, c-format
-msgid "invalid pattern: %s"
-msgstr "无效模式：%s"
-
-#: config.c:3250
-#, c-format
-msgid "invalid config file %s"
-msgstr "无效的配置文件 %s"
-
-#: config.c:3263 config.c:3531
-#, c-format
-msgid "fstat on %s failed"
-msgstr "对 %s 调用 fstat 失败"
-
-#: config.c:3274
-#, c-format
-msgid "unable to mmap '%s'%s"
-msgstr "不能 mmap '%s'%s"
-
-#: config.c:3284 config.c:3536
-#, c-format
-msgid "chmod on %s failed"
-msgstr "对 %s 调用 chmod 失败"
-
-#: config.c:3369 config.c:3633
-#, c-format
-msgid "could not write config file %s"
-msgstr "不能写入配置文件 %s"
-
-#: config.c:3403
-#, c-format
-msgid "could not set '%s' to '%s'"
-msgstr "不能设置 '%s' 为 '%s'"
-
-#: config.c:3405 builtin/remote.c:666 builtin/remote.c:885 builtin/remote.c:893
-#, c-format
-msgid "could not unset '%s'"
-msgstr "不能取消设置 '%s'"
-
-#: config.c:3509
-#, c-format
-msgid "invalid section name: %s"
-msgstr "无效的小节名称：%s"
-
-#: config.c:3676
-#, c-format
-msgid "missing value for '%s'"
-msgstr "%s 的取值缺失"
-
-#: connect.c:61
-msgid "the remote end hung up upon initial contact"
-msgstr "远端在初始连接时即挂断"
-
-#: connect.c:63
-msgid ""
-"Could not read from remote repository.\n"
-"\n"
-"Please make sure you have the correct access rights\n"
-"and the repository exists."
-msgstr ""
-"无法读取远程仓库。\n"
-"\n"
-"请确认您有正确的访问权限并且仓库存在。"
-
-#: connect.c:81
-#, c-format
-msgid "server doesn't support '%s'"
-msgstr "服务器不支持 '%s'"
-
-#: connect.c:118
-#, c-format
-msgid "server doesn't support feature '%s'"
-msgstr "服务器不支持特性 '%s'"
-
-#: connect.c:129
-msgid "expected flush after capabilities"
-msgstr "在能力之后应为一个 flush 包"
-
-#: connect.c:265
-#, c-format
-msgid "ignoring capabilities after first line '%s'"
-msgstr "忽略第一行 '%s' 之后的能力字段"
-
-#: connect.c:286
-msgid "protocol error: unexpected capabilities^{}"
-msgstr "协议错误：意外的 capabilities^{}"
-
-#: connect.c:308
-#, c-format
-msgid "protocol error: expected shallow sha-1, got '%s'"
-msgstr "协议错误：预期浅克隆 sha-1，却得到 '%s'"
-
-#: connect.c:310
-msgid "repository on the other end cannot be shallow"
-msgstr "另一端的仓库不能是浅克隆仓库"
-
-#: connect.c:349
-msgid "invalid packet"
-msgstr "无效数据包"
-
-#: connect.c:369
-#, c-format
-msgid "protocol error: unexpected '%s'"
-msgstr "协议错误：意外的 '%s'"
-
-#: connect.c:499
-#, c-format
-msgid "unknown object format '%s' specified by server"
-msgstr "服务器给出未知的对象格式 '%s'"
-
-#: connect.c:528
-#, c-format
-msgid "invalid ls-refs response: %s"
-msgstr "无效的 ls-refs 响应：%s"
-
-#: connect.c:532
-msgid "expected flush after ref listing"
-msgstr "在引用列表之后应该有一个 flush 包"
-
-#: connect.c:535
-msgid "expected response end packet after ref listing"
-msgstr "在引用列表之后应该有响应结束包"
-
-#: connect.c:670
-#, c-format
-msgid "protocol '%s' is not supported"
-msgstr "不支持 '%s' 协议"
-
-#: connect.c:721
-msgid "unable to set SO_KEEPALIVE on socket"
-msgstr "无法为 socket 设置 SO_KEEPALIVE"
-
-#: connect.c:761 connect.c:824
-#, c-format
-msgid "Looking up %s ... "
-msgstr "查找 %s ..."
-
-#: 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:769 connect.c:840
-#, c-format
-msgid ""
-"done.\n"
-"Connecting to %s (port %s) ... "
-msgstr ""
-"完成。\n"
-"连接到 %s（端口 %s）... "
-
-#: connect.c:791 connect.c:868
-#, c-format
-msgid ""
-"unable to connect to %s:\n"
-"%s"
-msgstr ""
-"无法连接到 %s：\n"
-"%s"
-
-#. TRANSLATORS: this is the end of "Connecting to %s (port %s) ... "
-#: connect.c:797 connect.c:874
-msgid "done."
-msgstr "完成。"
-
-#: connect.c:828
-#, c-format
-msgid "unable to look up %s (%s)"
-msgstr "无法查找 %s（%s）"
-
-#: connect.c:834
-#, c-format
-msgid "unknown port %s"
-msgstr "未知端口 %s"
-
-#: connect.c:971 connect.c:1303
-#, c-format
-msgid "strange hostname '%s' blocked"
-msgstr "已阻止奇怪的主机名 '%s'"
-
-#: connect.c:973
-#, c-format
-msgid "strange port '%s' blocked"
-msgstr "已阻止奇怪的端口号 '%s'"
-
-#: connect.c:983
-#, c-format
-msgid "cannot start proxy %s"
-msgstr "不能启动代理 %s"
-
-#: connect.c:1054
-msgid "no path specified; see 'git help pull' for valid url syntax"
-msgstr "未指定路径，执行 'git help pull' 查看有效的 url 语法"
-
-#: connect.c:1194
-msgid "newline is forbidden in git:// hosts and repo paths"
-msgstr "在 git:// 主机和仓库路径中禁止使用换行符"
-
-#: connect.c:1251
-msgid "ssh variant 'simple' does not support -4"
-msgstr "ssh 变体 'simple' 不支持 -4"
-
-#: connect.c:1263
-msgid "ssh variant 'simple' does not support -6"
-msgstr "ssh 变体 'simple' 不支持 -6"
-
-#: connect.c:1280
-msgid "ssh variant 'simple' does not support setting port"
-msgstr "ssh 变体 'simple' 不支持设置端口"
-
-#: connect.c:1392
-#, c-format
-msgid "strange pathname '%s' blocked"
-msgstr "已阻止奇怪的路径名 '%s'"
-
-#: connect.c:1440
-msgid "unable to fork"
-msgstr "无法 fork"
-
-#: connected.c:109 builtin/fsck.c:189 builtin/prune.c:57
-msgid "Checking connectivity"
-msgstr "正在检查连通性"
-
-#: connected.c:122
-msgid "Could not run 'git rev-list'"
-msgstr "不能执行 'git rev-list'"
-
-#: connected.c:146
-msgid "failed write to rev-list"
-msgstr "写入 rev-list 失败"
-
-#: connected.c:151
-msgid "failed to close rev-list's stdin"
-msgstr "无法关闭 rev-list 的标准输入"
-
-#: convert.c:183
-#, c-format
-msgid "illegal crlf_action %d"
-msgstr "非法的 crlf_action %d"
-
-#: convert.c:196
-#, c-format
-msgid "CRLF would be replaced by LF in %s"
-msgstr "%s 中的 CRLF 将被 LF 替换"
-
-#: convert.c:198
-#, c-format
-msgid ""
-"CRLF will be replaced by LF in %s.\n"
-"The file will have its original line endings in your working directory"
-msgstr ""
-"%s 中的 CRLF 将被 LF 替换。<\n"
-"在工作区中该文件仍保持原有的换行符。"
-
-#: convert.c:206
-#, c-format
-msgid "LF would be replaced by CRLF in %s"
-msgstr "文件 %s 中的 LF 将被 CRLF 替换"
-
-#: convert.c:208
-#, c-format
-msgid ""
-"LF will be replaced by CRLF in %s.\n"
-"The file will have its original line endings in your working directory"
-msgstr ""
-"%s 中的 LF 将被 CRLF 替换。\n"
-"在工作区中该文件仍保持原有的换行符"
-
-#: convert.c:273
-#, c-format
-msgid "BOM is prohibited in '%s' if encoded as %s"
-msgstr "如果使用 %2$s 编码，禁止在 '%1$s' 中使用 BOM"
-
-#: convert.c:280
-#, c-format
-msgid ""
-"The file '%s' contains a byte order mark (BOM). Please use UTF-%.*s as "
-"working-tree-encoding."
-msgstr ""
-"文件 '%s' 包含一个字节顺序标记（BOM）。请使用 UTF-%.*s 作为工作区编码。"
-
-#: convert.c:293
-#, c-format
-msgid "BOM is required in '%s' if encoded as %s"
-msgstr "如果编码为 %2$s，需要在 '%1$s' 中使用 BOM"
-
-#: 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."
-msgstr ""
-"文件 '%s' 缺失一个字节顺序标记（BOM）。请使用 UTF-%sBE or UTF-%sLE（取决于字"
-"节序）作为工作区编码。"
-
-#: convert.c:408 convert.c:479
-#, c-format
-msgid "failed to encode '%s' from %s to %s"
-msgstr "无法对 '%s' 进行从 %s 到 %s 的编码"
-
-#: convert.c:451
-#, c-format
-msgid "encoding '%s' from %s to %s and back is not the same"
-msgstr "将'%s' 的编码从 %s 到 %s 来回转换不一致"
-
-#: convert.c:654
-#, c-format
-msgid "cannot fork to run external filter '%s'"
-msgstr "不能 fork 以执行外部过滤器 '%s'"
-
-#: convert.c:674
-#, c-format
-msgid "cannot feed the input to external filter '%s'"
-msgstr "不能将输入传递给外部过滤器 '%s'"
-
-#: convert.c:681
-#, c-format
-msgid "external filter '%s' failed %d"
-msgstr "外部过滤器 '%s' 失败码 %d"
-
-#: convert.c:716 convert.c:719
-#, c-format
-msgid "read from external filter '%s' failed"
-msgstr "从外部过滤器 '%s' 读取失败"
-
-#: convert.c:722 convert.c:777
-#, c-format
-msgid "external filter '%s' failed"
-msgstr "外部过滤器 '%s' 失败"
-
-#: convert.c:826
-msgid "unexpected filter type"
-msgstr "意外的过滤类型"
-
-#: convert.c:837
-msgid "path name too long for external filter"
-msgstr "外部过滤器的路径名太长"
-
-#: convert.c:935
-#, c-format
-msgid ""
-"external filter '%s' is not available anymore although not all paths have "
-"been filtered"
-msgstr "外部过滤器 '%s' 不再可用，但并非所有路径都已过滤"
-
-#: convert.c:1236
-msgid "true/false are no valid working-tree-encodings"
-msgstr "true/false 不是有效的工作区编码"
-
-#: convert.c:1416 convert.c:1449
-#, c-format
-msgid "%s: clean filter '%s' failed"
-msgstr "%s：clean 过滤器 '%s' 失败"
-
-#: convert.c:1492
-#, c-format
-msgid "%s: smudge filter %s failed"
-msgstr "%s：smudge 过滤器 %s 失败"
-
-#: credential.c:96
-#, c-format
-msgid "skipping credential lookup for key: credential.%s"
-msgstr "跳过凭据查询：credential.%s"
-
-#: credential.c:112
-msgid "refusing to work with credential missing host field"
-msgstr "拒绝使用缺少主机字段的凭据"
-
-#: credential.c:114
-msgid "refusing to work with credential missing protocol field"
-msgstr "拒绝使用缺少协议字段的凭据"
-
-#: credential.c:396
-#, c-format
-msgid "url contains a newline in its %s component: %s"
-msgstr "URL 的 %s 组件中包含换行符：%s"
-
-#: credential.c:440
-#, c-format
-msgid "url has no scheme: %s"
-msgstr "URL 没有 scheme：%s"
-
-#: credential.c:513
-#, c-format
-msgid "credential url cannot be parsed: %s"
-msgstr "不能解析凭据 URL：%s"
-
-#: date.c:139
-msgid "in the future"
-msgstr "在将来"
-
-#: date.c:145
-#, c-format
-msgid "%<PRIuMAX> second ago"
-msgid_plural "%<PRIuMAX> seconds ago"
-msgstr[0] "%<PRIuMAX> 秒钟前"
-msgstr[1] "%<PRIuMAX> 秒钟前"
-
-#: date.c:152
-#, c-format
-msgid "%<PRIuMAX> minute ago"
-msgid_plural "%<PRIuMAX> minutes ago"
-msgstr[0] "%<PRIuMAX> 分钟前"
-msgstr[1] "%<PRIuMAX> 分钟前"
-
-#: date.c:159
-#, c-format
-msgid "%<PRIuMAX> hour ago"
-msgid_plural "%<PRIuMAX> hours ago"
-msgstr[0] "%<PRIuMAX> 小时前"
-msgstr[1] "%<PRIuMAX> 小时前"
-
-#: date.c:166
-#, c-format
-msgid "%<PRIuMAX> day ago"
-msgid_plural "%<PRIuMAX> days ago"
-msgstr[0] "%<PRIuMAX> 天前"
-msgstr[1] "%<PRIuMAX> 天前"
-
-#: date.c:172
-#, c-format
-msgid "%<PRIuMAX> week ago"
-msgid_plural "%<PRIuMAX> weeks ago"
-msgstr[0] "%<PRIuMAX> 周前"
-msgstr[1] "%<PRIuMAX> 周前"
-
-#: date.c:179
-#, c-format
-msgid "%<PRIuMAX> month ago"
-msgid_plural "%<PRIuMAX> months ago"
-msgstr[0] "%<PRIuMAX> 个月前"
-msgstr[1] "%<PRIuMAX> 个月前"
-
-#: date.c:190
-#, c-format
-msgid "%<PRIuMAX> year"
-msgid_plural "%<PRIuMAX> years"
-msgstr[0] "%<PRIuMAX> 年"
-msgstr[1] "%<PRIuMAX> 年"
-
-#. TRANSLATORS: "%s" is "<n> years"
-#: date.c:193
-#, c-format
-msgid "%s, %<PRIuMAX> month ago"
-msgid_plural "%s, %<PRIuMAX> months ago"
-msgstr[0] "%s %<PRIuMAX> 个月前"
-msgstr[1] "%s %<PRIuMAX> 个月前"
-
-#: date.c:198 date.c:203
-#, c-format
-msgid "%<PRIuMAX> year ago"
-msgid_plural "%<PRIuMAX> years ago"
-msgstr[0] "%<PRIuMAX> 年前"
-msgstr[1] "%<PRIuMAX> 年前"
-
-#: delta-islands.c:272
-msgid "Propagating island marks"
-msgstr "正在传播数据岛标记"
-
-#: delta-islands.c:290
-#, c-format
-msgid "bad tree object %s"
-msgstr "坏的树对象 %s"
-
-#: delta-islands.c:334
-#, c-format
-msgid "failed to load island regex for '%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 个）"
-
-#: delta-islands.c:467
-#, c-format
-msgid "Marked %d islands, done.\n"
-msgstr "已标记 %d 个数据岛，结束。\n"
-
-#: diff-merges.c:81 gpg-interface.c:719 gpg-interface.c:734 ls-refs.c:37
-#: parallel-checkout.c:42 sequencer.c:2805 setup.c:563 builtin/am.c:203
-#: builtin/am.c:2243 builtin/am.c:2287 builtin/blame.c:724 builtin/blame.c:742
-#: builtin/fetch.c:792 builtin/pack-objects.c:3515 builtin/pull.c:45
-#: builtin/pull.c:47 builtin/pull.c:321
-#, c-format
-msgid "invalid value for '%s': '%s'"
-msgstr "'%s' 的值无效：'%s'"
-
-#: diff-lib.c:561
-msgid "--merge-base does not work with ranges"
-msgstr "--merge-base 不适用于范围"
-
-#: diff-lib.c:563
-msgid "--merge-base only works with commits"
-msgstr "--merge-base 仅适用于提交"
-
-#: diff-lib.c:580
-msgid "unable to get HEAD"
-msgstr "不能解析 HEAD"
-
-#: diff-lib.c:587
-msgid "no merge base found"
-msgstr "未找到合并基线"
-
-#: diff-lib.c:589
-msgid "multiple merge bases found"
-msgstr "找到了多条合并基线"
-
-#: diff-no-index.c:237
-msgid "git diff --no-index [<options>] <path> <path>"
-msgstr "git diff --no-index [<选项>] <路径> <路径>"
-
-#: diff-no-index.c:262
-msgid ""
-"Not a git repository. Use --no-index to compare two paths outside a working "
-"tree"
-msgstr "不是 git 仓库。使用 --no-index 比较工作区之外的两个路径"
-
-#  译者：注意保持前导空格
-#: diff.c:159
-#, c-format
-msgid "  Failed to parse dirstat cut-off percentage '%s'\n"
-msgstr "  无法解析 dirstat 截止（cut-off）百分比 '%s'\n"
-
-#  译者：注意保持前导空格
-#: diff.c:164
-#, c-format
-msgid "  Unknown dirstat parameter '%s'\n"
-msgstr "  未知的 dirstat 参数 '%s'\n"
-
-#: diff.c:300
-msgid ""
-"color moved setting must be one of 'no', 'default', 'blocks', 'zebra', "
-"'dimmed-zebra', 'plain'"
-msgstr ""
-"移动的颜色设置必须是 'no'、'default'、'blocks'、'zebra'、'dimmed-zebra' 或 "
-"'plain'"
-
-#: diff.c:328
-#, 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 ""
-"未知的 color-moved-ws 模式 '%s'，可能的取值有 'ignore-space-change'、'ignore-"
-"space-at-eol'、'ignore-all-space'、'allow-indentation-change'"
-
-#: diff.c:336
-msgid ""
-"color-moved-ws: allow-indentation-change cannot be combined with other "
-"whitespace modes"
-msgstr "color-moved-ws：allow-indentation-change 不能与其它空白字符模式共用"
-
-#: diff.c:413
-#, c-format
-msgid "Unknown value for 'diff.submodule' config variable: '%s'"
-msgstr "配置变量 'diff.submodule' 未知的取值：'%s'"
-
-#: diff.c:473
-#, c-format
-msgid ""
-"Found errors in 'diff.dirstat' config variable:\n"
-"%s"
-msgstr ""
-"发现配置变量 'diff.dirstat' 中的错误：\n"
-"%s"
-
-#: diff.c:4282
-#, c-format
-msgid "external diff died, stopping at %s"
-msgstr "外部 diff 退出，停止在 %s"
-
-#: diff.c:4677 parse-options.c:1114
-#, c-format
-msgid "options '%s', '%s', '%s', and '%s' cannot be used together"
-msgstr "选项 '%s'、'%s'、'%s' 和 '%s' 不能同时使用"
-
-#: diff.c:4681 parse-options.c:1118 builtin/worktree.c:578
-#, c-format
-msgid "options '%s', '%s', and '%s' cannot be used together"
-msgstr "选项 '%s'、'%s' 和 '%s' 不能同时使用"
-
-#: diff.c:4685
-#, c-format
-msgid "options '%s' and '%s' cannot be used together, use '%s' with '%s'"
-msgstr "选项 '%1$s'、'%2$s' 不能同时使用，与 '%4$s' 一起使用 '%3$s'"
-
-#: diff.c:4689
-#, c-format
-msgid ""
-"options '%s' and '%s' cannot be used together, use '%s' with '%s' and '%s'"
-msgstr "选项 '%1$s'、'%2$s' 不能同时使用，与 '%4$s' 和 '%5$s' 一起使用 '%3$s'"
-
-#: diff.c:4769
-msgid "--follow requires exactly one pathspec"
-msgstr "--follow 明确要求只跟一个路径规格"
-
-#: diff.c:4823
-#, c-format
-msgid "invalid --stat value: %s"
-msgstr "无效的 --stat 值：%s"
-
-#: diff.c:4828 diff.c:4833 diff.c:4838 diff.c:4843 diff.c:5319
-#: parse-options.c:217 parse-options.c:221
-#, c-format
-msgid "%s expects a numerical value"
-msgstr "%s 期望一个数字值"
-
-#: diff.c:4860
-#, c-format
-msgid ""
-"Failed to parse --dirstat/-X option parameter:\n"
-"%s"
-msgstr ""
-"无法解析 --dirstat/-X 选项的参数：\n"
-"%s"
-
-#: diff.c:4893
-#, c-format
-msgid "unknown change class '%c' in --diff-filter=%s"
-msgstr "--diff-filter=%2$s 中未知的变更类 '%1$c'"
-
-#: diff.c:4917
-#, c-format
-msgid "unknown value after ws-error-highlight=%.*s"
-msgstr "ws-error-highlight=%.*s 之后未知的值"
-
-#: diff.c:4931
-#, c-format
-msgid "unable to resolve '%s'"
-msgstr "不能解析 '%s'"
-
-#: diff.c:4981 diff.c:4987
-#, c-format
-msgid "%s expects <n>/<m> form"
-msgstr "%s 期望 <n>/<m> 格式"
-
-#: diff.c:4999
-#, c-format
-msgid "%s expects a character, got '%s'"
-msgstr "%s 期望一个字符，得到 '%s'"
-
-#: diff.c:5020
-#, c-format
-msgid "bad --color-moved argument: %s"
-msgstr "坏的 --color-moved 参数：%s"
-
-#: diff.c:5039
-#, c-format
-msgid "invalid mode '%s' in --color-moved-ws"
-msgstr "--color-moved-ws 中的无效模式 '%s' "
-
-#: diff.c:5079
-msgid ""
-"option diff-algorithm accepts \"myers\", \"minimal\", \"patience\" and "
-"\"histogram\""
-msgstr ""
-"diff-algorithm 选项有 \"myers\"、\"minimal\"、\"patience\" 和 \"histogram\""
-
-#: diff.c:5115 diff.c:5135
-#, c-format
-msgid "invalid argument to %s"
-msgstr "%s 的参数无效"
-
-#: diff.c:5239
-#, c-format
-msgid "invalid regex given to -I: '%s'"
-msgstr "选项 -I 的正则表达式无效：'%s'"
-
-#: diff.c:5288
-#, c-format
-msgid "failed to parse --submodule option parameter: '%s'"
-msgstr "无法解析 --submodule 选项的参数：'%s'"
-
-#: diff.c:5344
-#, c-format
-msgid "bad --word-diff argument: %s"
-msgstr "坏的 --word-diff 参数：%s"
-
-#: diff.c:5380
-msgid "Diff output format options"
-msgstr "差异输出格式化选项"
-
-#: diff.c:5382 diff.c:5388
-msgid "generate patch"
-msgstr "生成补丁"
-
-#: diff.c:5385 builtin/log.c:180
-msgid "suppress diff output"
-msgstr "不显示差异输出"
-
-#: diff.c:5390 diff.c:5504 diff.c:5511
-msgid "<n>"
-msgstr "<n>"
-
-#: diff.c:5391 diff.c:5394
-msgid "generate diffs with <n> lines context"
-msgstr "生成含 <n> 行上下文的差异"
-
-#: diff.c:5396
-msgid "generate the diff in raw format"
-msgstr "生成原始格式的差异"
-
-#: diff.c:5399
-msgid "synonym for '-p --raw'"
-msgstr "和 '-p --raw' 同义"
-
-#: diff.c:5403
-msgid "synonym for '-p --stat'"
-msgstr "和 '-p --stat' 同义"
-
-#: diff.c:5407
-msgid "machine friendly --stat"
-msgstr "机器友好的 --stat"
-
-#: diff.c:5410
-msgid "output only the last line of --stat"
-msgstr "只输出 --stat 的最后一行"
-
-#: diff.c:5412 diff.c:5420
-msgid "<param1,param2>..."
-msgstr "<参数1,参数2>..."
-
-#: diff.c:5413
-msgid ""
-"output the distribution of relative amount of changes for each sub-directory"
-msgstr "输出每个子目录相对变更的分布"
-
-#: diff.c:5417
-msgid "synonym for --dirstat=cumulative"
-msgstr "和 --dirstat=cumulative 同义"
-
-#: diff.c:5421
-msgid "synonym for --dirstat=files,param1,param2..."
-msgstr "是 --dirstat=files,param1,param2... 的同义词"
-
-#: diff.c:5425
-msgid "warn if changes introduce conflict markers or whitespace errors"
-msgstr "如果变更中引入冲突定界符或空白错误，给出警告"
-
-#: diff.c:5428
-msgid "condensed summary such as creations, renames and mode changes"
-msgstr "精简摘要，例如创建、重命名和模式变更"
-
-#: diff.c:5431
-msgid "show only names of changed files"
-msgstr "只显示变更文件的文件名"
-
-#: diff.c:5434
-msgid "show only names and status of changed files"
-msgstr "只显示变更文件的文件名和状态"
-
-#: diff.c:5436
-msgid "<width>[,<name-width>[,<count>]]"
-msgstr "<宽度>[,<文件名宽度>[,<次数>]]"
-
-#: diff.c:5437
-msgid "generate diffstat"
-msgstr "生成差异统计（diffstat）"
-
-#: diff.c:5439 diff.c:5442 diff.c:5445
-msgid "<width>"
-msgstr "<宽度>"
-
-#: diff.c:5440
-msgid "generate diffstat with a given width"
-msgstr "使用给定的长度生成差异统计"
-
-#: diff.c:5443
-msgid "generate diffstat with a given name width"
-msgstr "使用给定的文件名长度生成差异统计"
-
-#: diff.c:5446
-msgid "generate diffstat with a given graph width"
-msgstr "使用给定的图形长度生成差异统计"
-
-#: diff.c:5448
-msgid "<count>"
-msgstr "<次数>"
-
-#: diff.c:5449
-msgid "generate diffstat with limited lines"
-msgstr "生成有限行数的差异统计"
-
-#: diff.c:5452
-msgid "generate compact summary in diffstat"
-msgstr "生成差异统计的简洁摘要"
-
-#: diff.c:5455
-msgid "output a binary diff that can be applied"
-msgstr "输出一个可以应用的二进制差异"
-
-#: diff.c:5458
-msgid "show full pre- and post-image object names on the \"index\" lines"
-msgstr "在 \"index\" 行显示完整的前后对象名称"
-
-#: diff.c:5460
-msgid "show colored diff"
-msgstr "显示带颜色的差异"
-
-#: diff.c:5461
-msgid "<kind>"
-msgstr "<类型>"
-
-#: diff.c:5462
-msgid ""
-"highlight whitespace errors in the 'context', 'old' or 'new' lines in the "
-"diff"
-msgstr "对于差异中的上下文、旧的和新的行，加亮显示错误的空白字符"
-
-#: diff.c:5465
-msgid ""
-"do not munge pathnames and use NULs as output field terminators in --raw or "
-"--numstat"
-msgstr ""
-"在 --raw 或者 --numstat 中，不对路径字符转码并使用 NUL 字符做为输出字段的分隔"
-"符"
-
-#: diff.c:5468 diff.c:5471 diff.c:5474 diff.c:5583
-msgid "<prefix>"
-msgstr "<前缀>"
-
-#: diff.c:5469
-msgid "show the given source prefix instead of \"a/\""
-msgstr "显示给定的源前缀取代 \"a/\""
-
-#: diff.c:5472
-msgid "show the given destination prefix instead of \"b/\""
-msgstr "显示给定的目标前缀取代 \"b/\""
-
-#: diff.c:5475
-msgid "prepend an additional prefix to every line of output"
-msgstr "输出的每一行附加前缀"
-
-#: diff.c:5478
-msgid "do not show any source or destination prefix"
-msgstr "不显示任何源和目标前缀"
-
-#: diff.c:5481
-msgid "show context between diff hunks up to the specified number of lines"
-msgstr "显示指定行数的差异块间的上下文"
-
-#: diff.c:5485 diff.c:5490 diff.c:5495
-msgid "<char>"
-msgstr "<字符>"
-
-#: diff.c:5486
-msgid "specify the character to indicate a new line instead of '+'"
-msgstr "指定一个字符取代 '+' 来表示新的一行"
-
-#: diff.c:5491
-msgid "specify the character to indicate an old line instead of '-'"
-msgstr "指定一个字符取代 '-' 来表示旧的一行"
-
-#: diff.c:5496
-msgid "specify the character to indicate a context instead of ' '"
-msgstr "指定一个字符取代 ' ' 来表示一行上下文"
-
-#: diff.c:5499
-msgid "Diff rename options"
-msgstr "差异重命名选项"
-
-#: diff.c:5500
-msgid "<n>[/<m>]"
-msgstr "<n>[/<m>]"
-
-#: diff.c:5501
-msgid "break complete rewrite changes into pairs of delete and create"
-msgstr "将完全重写的变更打破为成对的删除和创建"
-
-#: diff.c:5505
-msgid "detect renames"
-msgstr "检测重命名"
-
-#: diff.c:5509
-msgid "omit the preimage for deletes"
-msgstr "省略删除操作的差异输出"
-
-#: diff.c:5512
-msgid "detect copies"
-msgstr "检测拷贝"
-
-#: diff.c:5516
-msgid "use unmodified files as source to find copies"
-msgstr "使用未修改的文件做为发现拷贝的源"
-
-#: diff.c:5518
-msgid "disable rename detection"
-msgstr "禁用重命名探测"
-
-#: diff.c:5521
-msgid "use empty blobs as rename source"
-msgstr "使用空的数据对象做为重命名的源"
-
-#: diff.c:5523
-msgid "continue listing the history of a file beyond renames"
-msgstr "继续列出文件重命名以外的历史记录"
-
-#: diff.c:5526
-msgid ""
-"prevent rename/copy detection if the number of rename/copy targets exceeds "
-"given limit"
-msgstr "如果重命名/拷贝目标超过给定的限制，禁止重命名/拷贝检测"
-
-#: diff.c:5528
-msgid "Diff algorithm options"
-msgstr "差异算法选项"
-
-#: diff.c:5530
-msgid "produce the smallest possible diff"
-msgstr "生成尽可能小的差异"
-
-#: diff.c:5533
-msgid "ignore whitespace when comparing lines"
-msgstr "行比较时忽略空白字符"
-
-#: diff.c:5536
-msgid "ignore changes in amount of whitespace"
-msgstr "忽略空白字符的变更"
-
-#: diff.c:5539
-msgid "ignore changes in whitespace at EOL"
-msgstr "忽略行尾的空白字符变更"
-
-#: diff.c:5542
-msgid "ignore carrier-return at the end of line"
-msgstr "忽略行尾的回车符（CR）"
-
-#: diff.c:5545
-msgid "ignore changes whose lines are all blank"
-msgstr "忽略整行都是空白的变更"
-
-#: diff.c:5547 diff.c:5569 diff.c:5572 diff.c:5617
-msgid "<regex>"
-msgstr "<正则>"
-
-#: diff.c:5548
-msgid "ignore changes whose all lines match <regex>"
-msgstr "忽略所有行都和正则表达式匹配的变更"
-
-#: diff.c:5551
-msgid "heuristic to shift diff hunk boundaries for easy reading"
-msgstr "启发式转换差异边界以便阅读"
-
-#: diff.c:5554
-msgid "generate diff using the \"patience diff\" algorithm"
-msgstr "使用 \"patience diff\" 算法生成差异"
-
-#: diff.c:5558
-msgid "generate diff using the \"histogram diff\" algorithm"
-msgstr "使用 \"histogram diff\" 算法生成差异"
-
-#: diff.c:5560
-msgid "<algorithm>"
-msgstr "<算法>"
-
-#: diff.c:5561
-msgid "choose a diff algorithm"
-msgstr "选择一个差异算法"
-
-#: diff.c:5563
-msgid "<text>"
-msgstr "<文本>"
-
-#: diff.c:5564
-msgid "generate diff using the \"anchored diff\" algorithm"
-msgstr "使用 \"anchored diff\" 算法生成差异"
-
-#: diff.c:5566 diff.c:5575 diff.c:5578
-msgid "<mode>"
-msgstr "<模式>"
-
-#: diff.c:5567
-msgid "show word diff, using <mode> to delimit changed words"
-msgstr "显示单词差异，使用 <模式> 分隔变更的单词"
-
-#: diff.c:5570
-msgid "use <regex> to decide what a word is"
-msgstr "使用 <正则表达式> 确定何为一个词"
-
-#: diff.c:5573
-msgid "equivalent to --word-diff=color --word-diff-regex=<regex>"
-msgstr "相当于 --word-diff=color --word-diff-regex=<正则>"
-
-#: diff.c:5576
-msgid "moved lines of code are colored differently"
-msgstr "移动的代码行用不同方式着色"
-
-#: diff.c:5579
-msgid "how white spaces are ignored in --color-moved"
-msgstr "在 --color-moved 下如何忽略空白字符"
-
-#: diff.c:5582
-msgid "Other diff options"
-msgstr "其它差异选项"
-
-#: diff.c:5584
-msgid "when run from subdir, exclude changes outside and show relative paths"
-msgstr "当从子目录运行，排除目录之外的变更并显示相对路径"
-
-#: diff.c:5588
-msgid "treat all files as text"
-msgstr "把所有文件当做文本处理"
-
-#: diff.c:5590
-msgid "swap two inputs, reverse the diff"
-msgstr "交换两个输入，反转差异"
-
-#: diff.c:5592
-msgid "exit with 1 if there were differences, 0 otherwise"
-msgstr "有差异时退出码为 1，否则为 0"
-
-#: diff.c:5594
-msgid "disable all output of the program"
-msgstr "禁用本程序的所有输出"
-
-#: diff.c:5596
-msgid "allow an external diff helper to be executed"
-msgstr "允许执行一个外置的差异助手"
-
-#: diff.c:5598
-msgid "run external text conversion filters when comparing binary files"
-msgstr "当比较二进制文件时，运行外部的文本转换过滤器"
-
-#: diff.c:5600
-msgid "<when>"
-msgstr "<何时>"
-
-#: diff.c:5601
-msgid "ignore changes to submodules in the diff generation"
-msgstr "在生成差异时，忽略子模组的更改"
-
-#: diff.c:5604
-msgid "<format>"
-msgstr "<格式>"
-
-#: diff.c:5605
-msgid "specify how differences in submodules are shown"
-msgstr "指定子模组的差异如何显示"
-
-#: diff.c:5609
-msgid "hide 'git add -N' entries from the index"
-msgstr "隐藏索引中 'git add -N' 条目"
-
-#: diff.c:5612
-msgid "treat 'git add -N' entries as real in the index"
-msgstr "将索引中 'git add -N' 条目当做真实的"
-
-#: diff.c:5614
-msgid "<string>"
-msgstr "<字符串>"
-
-#: diff.c:5615
-msgid ""
-"look for differences that change the number of occurrences of the specified "
-"string"
-msgstr "查找改变了指定字符串出现次数的差异"
-
-#: diff.c:5618
-msgid ""
-"look for differences that change the number of occurrences of the specified "
-"regex"
-msgstr "查找改变指定正则匹配出现次数的差异"
-
-#: diff.c:5621
-msgid "show all changes in the changeset with -S or -G"
-msgstr "显示使用 -S 或 -G 的变更集的所有变更"
-
-#: diff.c:5624
-msgid "treat <string> in -S as extended POSIX regular expression"
-msgstr "将 -S 的 <string> 当做扩展的 POSIX 正则表达式"
-
-#: diff.c:5627
-msgid "control the order in which files appear in the output"
-msgstr "控制输出中的文件显示顺序"
-
-#: diff.c:5628 diff.c:5631
-msgid "<path>"
-msgstr "<路径>"
-
-#: diff.c:5629
-msgid "show the change in the specified path first"
-msgstr "先显示指定路径的变更"
-
-#: diff.c:5632
-msgid "skip the output to the specified path"
-msgstr "跳过指定路径的输出"
-
-#: diff.c:5634
-msgid "<object-id>"
-msgstr "<对象 ID>"
-
-#: diff.c:5635
-msgid ""
-"look for differences that change the number of occurrences of the specified "
-"object"
-msgstr "查找改变指定对象出现次数的差异"
-
-#: diff.c:5637
-msgid "[(A|C|D|M|R|T|U|X|B)...[*]]"
-msgstr "[(A|C|D|M|R|T|U|X|B)...[*]]"
-
-#: diff.c:5638
-msgid "select files by diff type"
-msgstr "通过差异类型选择文件"
-
-#: diff.c:5640
-msgid "<file>"
-msgstr "<文件>"
-
-#: diff.c:5641
-msgid "output to a specific file"
-msgstr "输出到指定的文件"
-
-#: diff.c:6321
-msgid "exhaustive rename detection was skipped due to too many files."
-msgstr "由于文件太多，跳过详尽的重命名检查。"
-
-#: diff.c:6324
-msgid "only found copies from modified paths due to too many files."
-msgstr "由于文件太多，只在修改的路径中找到了拷贝。"
-
-#: diff.c:6327
-#, c-format
-msgid ""
-"you may want to set your %s variable to at least %d and retry the command."
-msgstr "您可能想要将变量 %s 设置为至少 %d 并再次执行此命令。"
-
-#: diffcore-order.c:24
-#, c-format
-msgid "failed to read orderfile '%s'"
-msgstr "无法读取排序文件 '%s'"
-
-#: diffcore-rename.c:1564
-msgid "Performing inexact rename detection"
-msgstr "正在进行非精确的重命名探测"
-
-#: diffcore-rotate.c:29
-#, c-format
-msgid "No such path '%s' in the diff"
-msgstr "在差异中无此路径 '%s'"
-
-#: dir.c:593
-#, c-format
-msgid "pathspec '%s' did not match any file(s) known to git"
-msgstr "路径规格 '%s' 未匹配任何 git 已知文件"
-
-#: dir.c:733 dir.c:762 dir.c:775
-#, c-format
-msgid "unrecognized pattern: '%s'"
-msgstr "未识别的模式：'%s'"
-
-#: dir.c:790 dir.c:804
-#, c-format
-msgid "unrecognized negative pattern: '%s'"
-msgstr "未识别的反向模式：'%s'"
-
-#: dir.c:820
-#, c-format
-msgid "your sparse-checkout file may have issues: pattern '%s' is repeated"
-msgstr "您的 sparse-checkout 文件可能有问题：重复的模式 '%s'"
-
-#: dir.c:828
-msgid "disabling cone pattern matching"
-msgstr "停用锥形模式匹配"
-
-#: dir.c:1212
-#, c-format
-msgid "cannot use %s as an exclude file"
-msgstr "不能将 %s 用作排除文件"
-
-#: dir.c:2419
-#, c-format
-msgid "could not open directory '%s'"
-msgstr "不能打开目录 '%s'"
-
-#: dir.c:2721
-msgid "failed to get kernel name and information"
-msgstr "无法获得内核名称和信息"
-
-#: dir.c:2846
-msgid "untracked cache is disabled on this system or location"
-msgstr "缓存未跟踪文件在本系统或位置中被禁用"
-
-#: dir.c:3119
-msgid ""
-"No directory name could be guessed.\n"
-"Please specify a directory on the command line"
-msgstr ""
-"无法猜到目录名。\n"
-"请在命令行指定一个目录"
-
-#: dir.c:3807
-#, c-format
-msgid "index file corrupt in repo %s"
-msgstr "仓库 %s 中的索引文件损坏"
-
-#: dir.c:3854 dir.c:3859
-#, c-format
-msgid "could not create directories for %s"
-msgstr "不能为 %s 创建目录"
-
-#: dir.c:3888
-#, c-format
-msgid "could not migrate git directory from '%s' to '%s'"
-msgstr "不能从 '%s' 迁移 git 目录到 '%s'"
-
-#: editor.c:74
-#, c-format
-msgid "hint: Waiting for your editor to close the file...%c"
-msgstr "提示：等待您的编辑器关闭文件...%c"
-
-#: entry.c:179
-msgid "Filtering content"
-msgstr "过滤内容"
-
-#: entry.c:500
-#, c-format
-msgid "could not stat file '%s'"
-msgstr "不能对文件 '%s' 调用 stat"
-
-#: environment.c:147
-#, c-format
-msgid "bad git namespace path \"%s\""
-msgstr "错误的 git 名字空间路径 \"%s\""
-
-#: exec-cmd.c:363
-#, c-format
-msgid "too many args to run %s"
-msgstr "执行 %s 的参数太多"
-
-#: fetch-pack.c:194
-msgid "git fetch-pack: expected shallow list"
-msgstr "git fetch-pack：应为 shallow 列表"
-
-#: fetch-pack.c:197
-msgid "git fetch-pack: expected a flush packet after shallow list"
-msgstr "git fetch-pack：在浅克隆列表之后期望一个 flush 包"
-
-#: fetch-pack.c:208
-msgid "git fetch-pack: expected ACK/NAK, got a flush packet"
-msgstr "git fetch-pack：期望 ACK/NAK，却得到 flush 包"
-
-#: fetch-pack.c:228
-#, c-format
-msgid "git fetch-pack: expected ACK/NAK, got '%s'"
-msgstr "git fetch-pack：应为 ACK/NAK，却得到 '%s'"
-
-#: fetch-pack.c:239
-msgid "unable to write to remote"
-msgstr "无法写到远程"
-
-#: fetch-pack.c:397 fetch-pack.c:1460
-#, c-format
-msgid "invalid shallow line: %s"
-msgstr "无效的 shallow 信息：%s"
-
-#: fetch-pack.c:403 fetch-pack.c:1466
-#, c-format
-msgid "invalid unshallow line: %s"
-msgstr "无效的 unshallow 信息：%s"
-
-#: fetch-pack.c:405 fetch-pack.c:1468
-#, c-format
-msgid "object not found: %s"
-msgstr "对象未找到：%s"
-
-#: fetch-pack.c:408 fetch-pack.c:1471
-#, c-format
-msgid "error in object: %s"
-msgstr "对象中出错：%s"
-
-#: fetch-pack.c:410 fetch-pack.c:1473
-#, c-format
-msgid "no shallow found: %s"
-msgstr "未发现 shallow：%s"
-
-#: fetch-pack.c:413 fetch-pack.c:1477
-#, c-format
-msgid "expected shallow/unshallow, got %s"
-msgstr "应为 shallow/unshallow，却得到 %s"
-
-#: fetch-pack.c:453
-#, c-format
-msgid "got %s %d %s"
-msgstr "得到 %s %d %s"
-
-#: fetch-pack.c:470
-#, c-format
-msgid "invalid commit %s"
-msgstr "无效提交 %s"
-
-#: fetch-pack.c:501
-msgid "giving up"
-msgstr "放弃"
-
-#: fetch-pack.c:514 progress.h:25
-msgid "done"
-msgstr "完成"
-
-#: fetch-pack.c:526
-#, c-format
-msgid "got %s (%d) %s"
-msgstr "得到 %s (%d) %s"
-
-#: fetch-pack.c:562
-#, c-format
-msgid "Marking %s as complete"
-msgstr "标记 %s 为完成"
-
-#: fetch-pack.c:784
-#, c-format
-msgid "already have %s (%s)"
-msgstr "已经有 %s（%s）"
-
-#: fetch-pack.c:870
-msgid "fetch-pack: unable to fork off sideband demultiplexer"
-msgstr "fetch-pack：无法派生 sideband 多路输出"
-
-#: fetch-pack.c:878
-msgid "protocol error: bad pack header"
-msgstr "协议错误：坏的包头"
-
-#: fetch-pack.c:974
-#, c-format
-msgid "fetch-pack: unable to fork off %s"
-msgstr "fetch-pack：无法派生进程 %s"
-
-#: fetch-pack.c:980
-msgid "fetch-pack: invalid index-pack output"
-msgstr "fetch-pack：无效的 index-pack 输出"
-
-#: fetch-pack.c:997
-#, c-format
-msgid "%s failed"
-msgstr "%s 失败"
-
-#: fetch-pack.c:999
-msgid "error in sideband demultiplexer"
-msgstr "sideband 多路输出出错"
-
-#: fetch-pack.c:1048
-#, c-format
-msgid "Server version is %.*s"
-msgstr "服务器版本 %.*s"
-
-#: fetch-pack.c:1056 fetch-pack.c:1062 fetch-pack.c:1065 fetch-pack.c:1071
-#: fetch-pack.c:1075 fetch-pack.c:1079 fetch-pack.c:1083 fetch-pack.c:1087
-#: fetch-pack.c:1091 fetch-pack.c:1095 fetch-pack.c:1099 fetch-pack.c:1103
-#: fetch-pack.c:1109 fetch-pack.c:1115 fetch-pack.c:1120 fetch-pack.c:1125
-#, c-format
-msgid "Server supports %s"
-msgstr "服务器支持 %s"
-
-#: fetch-pack.c:1058
-msgid "Server does not support shallow clients"
-msgstr "服务器不支持浅客户端"
-
-#: fetch-pack.c:1118
-msgid "Server does not support --shallow-since"
-msgstr "服务器不支持 --shallow-since"
-
-#: fetch-pack.c:1123
-msgid "Server does not support --shallow-exclude"
-msgstr "服务器不支持 --shallow-exclude"
-
-#: fetch-pack.c:1127
-msgid "Server does not support --deepen"
-msgstr "服务器不支持 --deepen"
-
-#: fetch-pack.c:1129
-msgid "Server does not support this repository's object format"
-msgstr "服务器不支持这个仓库的对象格式"
-
-#: fetch-pack.c:1142
-msgid "no common commits"
-msgstr "没有共同的提交"
-
-#: fetch-pack.c:1151 fetch-pack.c:1506 builtin/clone.c:1166
-msgid "source repository is shallow, reject to clone."
-msgstr "源仓库是浅克隆，拒绝克隆。"
-
-#: fetch-pack.c:1157 fetch-pack.c:1705
-msgid "git fetch-pack: fetch failed."
-msgstr "git fetch-pack：获取失败。"
-
-#: fetch-pack.c:1271
-#, c-format
-msgid "mismatched algorithms: client %s; server %s"
-msgstr "不匹配的算法：客户端 %s，服务端 %s"
-
-#: fetch-pack.c:1275
-#, c-format
-msgid "the server does not support algorithm '%s'"
-msgstr "服务器不支持算法 '%s'"
-
-#: fetch-pack.c:1308
-msgid "Server does not support shallow requests"
-msgstr "服务器不支持浅克隆请求"
-
-#: fetch-pack.c:1315
-msgid "Server supports filter"
-msgstr "服务器支持 filter"
-
-#: fetch-pack.c:1358 fetch-pack.c:2087
-msgid "unable to write request to remote"
-msgstr "无法将请求写到远程"
-
-#: fetch-pack.c:1376
-#, c-format
-msgid "error reading section header '%s'"
-msgstr "读取节标题 '%s' 出错"
-
-#: fetch-pack.c:1382
-#, c-format
-msgid "expected '%s', received '%s'"
-msgstr "预期 '%s'，得到 '%s'"
-
-#: fetch-pack.c:1416
-#, c-format
-msgid "unexpected acknowledgment line: '%s'"
-msgstr "意外的确认行：'%s'"
-
-#: fetch-pack.c:1421
-#, c-format
-msgid "error processing acks: %d"
-msgstr "处理 ack 出错：%d"
-
-#. TRANSLATORS: The parameter will be 'ready', a protocol
-#. keyword.
-#.
-#: fetch-pack.c:1435
-#, c-format
-msgid "expected packfile to be sent after '%s'"
-msgstr "预期在 '%s' 之后发送 packfile"
-
-#. TRANSLATORS: The parameter will be 'ready', a protocol
-#. keyword.
-#.
-#: fetch-pack.c:1441
-#, c-format
-msgid "expected no other sections to be sent after no '%s'"
-msgstr "在没有 '%s' 后不应该发送其它小节"
-
-#: fetch-pack.c:1482
-#, c-format
-msgid "error processing shallow info: %d"
-msgstr "处理浅克隆信息出错：%d"
-
-#: fetch-pack.c:1531
-#, c-format
-msgid "expected wanted-ref, got '%s'"
-msgstr "预期 wanted-ref，得到 '%s'"
-
-#: fetch-pack.c:1536
-#, c-format
-msgid "unexpected wanted-ref: '%s'"
-msgstr "意外的 wanted-ref：'%s'"
-
-#: fetch-pack.c:1541
-#, c-format
-msgid "error processing wanted refs: %d"
-msgstr "处理要获取的引用出错：%d"
-
-#: fetch-pack.c:1571
-msgid "git fetch-pack: expected response end packet"
-msgstr "git fetch-pack：预期响应结束包"
-
-#: fetch-pack.c:1983
-msgid "no matching remote head"
-msgstr "没有匹配的远程分支"
-
-#: fetch-pack.c:2006 builtin/clone.c:587
-msgid "remote did not send all necessary objects"
-msgstr "远程没有发送所有必需的对象"
-
-#: fetch-pack.c:2109
-msgid "unexpected 'ready' from remote"
-msgstr "来自远程的意外的 'ready'"
-
-#: fetch-pack.c:2132
-#, c-format
-msgid "no such remote ref %s"
-msgstr "没有这样的远程引用 %s"
-
-#: fetch-pack.c:2135
-#, c-format
-msgid "Server does not allow request for unadvertised object %s"
-msgstr "服务器不允许请求未公开的对象 %s"
-
-#: fsmonitor-ipc.c:119
-#, c-format
-msgid "fsmonitor_ipc__send_query: invalid path '%s'"
-msgstr "fsmonitor_ipc__send_query: 无效路径 '%s'"
-
-#: fsmonitor-ipc.c:125
-#, c-format
-msgid "fsmonitor_ipc__send_query: unspecified error on '%s'"
-msgstr "fsmonitor_ipc__send_query: 未知错误于 '%s'"
-
-#: fsmonitor-ipc.c:155
-msgid "fsmonitor--daemon is not running"
-msgstr "fsmonitor--daemon 没有运行"
-
-#: fsmonitor-ipc.c:164
-#, c-format
-msgid "could not send '%s' command to fsmonitor--daemon"
-msgstr "无法发送 '%s' 命令至 fsmonitor--daemon"
-
-#: gpg-interface.c:329 gpg-interface.c:456 gpg-interface.c:995
-#: gpg-interface.c:1011
-msgid "could not create temporary file"
-msgstr "不能创建临时文件"
-
-#: gpg-interface.c:332 gpg-interface.c:459
-#, c-format
-msgid "failed writing detached signature to '%s'"
-msgstr "无法将分离式签名写入 '%s'"
-
-#: gpg-interface.c:450
-msgid ""
-"gpg.ssh.allowedSignersFile needs to be configured and exist for ssh "
-"signature verification"
-msgstr "ssh 签名验证需要 gpg.ssh.allowedSignersFile 被设置且存在"
-
-#: gpg-interface.c:479
-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:550
-#, c-format
-msgid "ssh signing revocation file configured but not found: %s"
-msgstr "设置了 ssh 签名吊销文件但无法找到：%s"
-
-#: gpg-interface.c:638
-#, c-format
-msgid "bad/incompatible signature '%s'"
-msgstr "坏的/不兼容的签名 '%s‘"
-
-#: gpg-interface.c:815 gpg-interface.c:820
-#, c-format
-msgid "failed to get the ssh fingerprint for key '%s'"
-msgstr "无法得到密钥 '%s' 的 ssh 指纹"
-
-#: gpg-interface.c:843
-msgid ""
-"either user.signingkey or gpg.ssh.defaultKeyCommand needs to be configured"
-msgstr "需要配置 user.signingkey 或者 gpg.ssh.defaultKeyCommand 其中之一"
-
-#: gpg-interface.c:865
-#, c-format
-msgid "gpg.ssh.defaultKeyCommand succeeded but returned no keys: %s %s"
-msgstr "gpg.ssh.defaultKeyCommand 成功，但没有返回密钥：%s %s"
-
-#: gpg-interface.c:871
-#, c-format
-msgid "gpg.ssh.defaultKeyCommand failed: %s %s"
-msgstr "gpg.ssh.defaultKeyCommand 失败：%s %s"
-
-#: gpg-interface.c:966
-msgid "gpg failed to sign the data"
-msgstr "gpg 无法为数据签名"
-
-#: gpg-interface.c:988
-msgid "user.signingkey needs to be set for ssh signing"
-msgstr "ssh 签名需要设置 user.signingkey"
-
-#: gpg-interface.c:999
-#, c-format
-msgid "failed writing ssh signing key to '%s'"
-msgstr "无法将 ssh 签名密钥写入 '%s'"
-
-#: gpg-interface.c:1017
-#, c-format
-msgid "failed writing ssh signing key buffer to '%s'"
-msgstr "无法将 ssh 签名密钥缓冲区写入 '%s'"
-
-#: gpg-interface.c:1035
-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:1047
-#, 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:446
-msgid ""
-"given pattern contains NULL byte (via -f <file>). This is only supported "
-"with -P under PCRE v2"
-msgstr ""
-"给定的模式包含 NULL 字符（通过 -f <文件> 参数）。只有 PCRE v2 下的 -P 支持此"
-"功能"
-
-#: grep.c:1859
-#, c-format
-msgid "'%s': unable to read %s"
-msgstr "'%s'：无法读取 %s"
-
-#: grep.c:1876 setup.c:178 builtin/clone.c:308 builtin/diff.c:90
-#: builtin/rm.c:136
-#, c-format
-msgid "failed to stat '%s'"
-msgstr "无法对 '%s' 调用 stat"
-
-#: grep.c:1887
-#, c-format
-msgid "'%s': short read"
-msgstr "'%s'：读取不完整"
-
-#: help.c:25
-msgid "start a working area (see also: git help tutorial)"
-msgstr "开始一个工作区（参见：git help tutorial）"
-
-#: help.c:26
-msgid "work on the current change (see also: git help everyday)"
-msgstr "在当前变更上工作（参见：git help everyday）"
-
-#: help.c:27
-msgid "examine the history and state (see also: git help revisions)"
-msgstr "检查历史和状态（参见：git help revisions）"
-
-#: help.c:28
-msgid "grow, mark and tweak your common history"
-msgstr "扩展、标记和调校您的历史记录"
-
-#: help.c:29
-msgid "collaborate (see also: git help workflows)"
-msgstr "协同（参见：git help workflows）"
-
-#: help.c:33
-msgid "Main Porcelain Commands"
-msgstr "主要的上层命令"
-
-#: help.c:34
-msgid "Ancillary Commands / Manipulators"
-msgstr "辅助命令/操作者"
-
-#: help.c:35
-msgid "Ancillary Commands / Interrogators"
-msgstr "辅助命令/询问者"
-
-#: help.c:36
-msgid "Interacting with Others"
-msgstr "与其它系统交互"
-
-#: help.c:37
-msgid "Low-level Commands / Manipulators"
-msgstr "低级命令/操作者"
-
-#: help.c:38
-msgid "Low-level Commands / Interrogators"
-msgstr "低级命令/询问者"
-
-#: help.c:39
-msgid "Low-level Commands / Syncing Repositories"
-msgstr "低级命令/同步仓库"
-
-#: help.c:40
-msgid "Low-level Commands / Internal Helpers"
-msgstr "低级命令/内部助手"
-
-#: help.c:316
-#, c-format
-msgid "available git commands in '%s'"
-msgstr "在 '%s' 下可用的 git 命令"
-
-#: help.c:323
-msgid "git commands available from elsewhere on your $PATH"
-msgstr "在 $PATH 路径中的其他地方可用的 git 命令"
-
-#: help.c:332
-msgid "These are common Git commands used in various situations:"
-msgstr "这些是各种场合常见的 Git 命令："
-
-#: help.c:382 git.c:100
-#, c-format
-msgid "unsupported command listing type '%s'"
-msgstr "不支持的命令列表类型 '%s'"
-
-#: help.c:422
-msgid "The Git concept guides are:"
-msgstr "Git 概念向导有："
-
-#: help.c:446
-msgid "External commands"
-msgstr "外部命令"
-
-#: help.c:468
-msgid "Command aliases"
-msgstr "命令别名"
-
-#: help.c:486
-msgid "See 'git help <command>' to read about a specific subcommand"
-msgstr "执行　'git help <command>' 来了解特定子命令"
-
-#: help.c:563
-#, c-format
-msgid ""
-"'%s' appears to be a git command, but we were not\n"
-"able to execute it. Maybe git-%s is broken?"
-msgstr ""
-"'%s' 像是一个 git 命令，但却无法运行。\n"
-"可能是 git-%s 受损？"
-
-#: help.c:585 help.c:682
-#, c-format
-msgid "git: '%s' is not a git command. See 'git --help'."
-msgstr "git：'%s' 不是一个 git 命令。参见 'git --help'。"
-
-#: help.c:633
-msgid "Uh oh. Your system reports no Git commands at all."
-msgstr "唉呀，您的系统中未发现 Git 命令。"
-
-#: help.c:655
-#, c-format
-msgid "WARNING: You called a Git command named '%s', which does not exist."
-msgstr "警告：您运行了一个并不存在的 Git 命令 '%s'。"
-
-#: help.c:660
-#, c-format
-msgid "Continuing under the assumption that you meant '%s'."
-msgstr "假定您想要的是 '%s' 并继续。"
-
-#: help.c:666
-#, c-format
-msgid "Run '%s' instead [y/N]? "
-msgstr "取而代之运行 '%s' [y/N]？"
-
-#: help.c:674
-#, c-format
-msgid "Continuing in %0.1f seconds, assuming that you meant '%s'."
-msgstr "假定您想要的是 '%2$s'，在 %1$0.1f 秒钟后继续。"
-
-#: help.c:686
-msgid ""
-"\n"
-"The most similar command is"
-msgid_plural ""
-"\n"
-"The most similar commands are"
-msgstr[0] ""
-"\n"
-"最相似的命令是"
-msgstr[1] ""
-"\n"
-"最相似的命令是"
-
-#: help.c:729
-msgid "git version [<options>]"
-msgstr "git version [<选项>]"
-
-#: help.c:784
-#, c-format
-msgid "%s: %s - %s"
-msgstr "%s：%s - %s"
-
-#: help.c:788
-msgid ""
-"\n"
-"Did you mean this?"
-msgid_plural ""
-"\n"
-"Did you mean one of these?"
-msgstr[0] ""
-"\n"
-"您指的是这个么？"
-msgstr[1] ""
-"\n"
-"您指的是这其中的某一个么？"
-
-#: hook.c:28
-#, 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` 来关闭这条警告。"
-
-#: hook.c:87
-#, c-format
-msgid "Couldn't start hook '%s'\n"
-msgstr "不能启动钩子 '%s'\n"
-
-#: ident.c:354
-msgid "Author identity unknown\n"
-msgstr "作者身份未知\n"
-
-#: ident.c:357
-msgid "Committer identity unknown\n"
-msgstr "提交者身份未知\n"
-
-#: ident.c:363
-msgid ""
-"\n"
-"*** Please tell me who you are.\n"
-"\n"
-"Run\n"
-"\n"
-"  git config --global user.email \"you@example.com\"\n"
-"  git config --global user.name \"Your Name\"\n"
-"\n"
-"to set your account's default identity.\n"
-"Omit --global to set the identity only in this repository.\n"
-"\n"
-msgstr ""
-"\n"
-"*** 请告诉我您是谁。\n"
-"\n"
-"运行\n"
-"\n"
-"  git config --global user.email \"you@example.com\"\n"
-"  git config --global user.name \"Your Name\"\n"
-"\n"
-"来设置您账号的缺省身份标识。\n"
-"如果仅在本仓库设置身份标识，则省略 --global 参数。\n"
-
-#: ident.c:398
-msgid "no email was given and auto-detection is disabled"
-msgstr "未提供邮件地址且自动探测被禁用"
-
-#: ident.c:403
-#, c-format
-msgid "unable to auto-detect email address (got '%s')"
-msgstr "无法自动探测邮件地址（得到 '%s'）"
-
-#: ident.c:420
-msgid "no name was given and auto-detection is disabled"
-msgstr "未提供姓名且自动探测被禁用"
-
-#: ident.c:426
-#, c-format
-msgid "unable to auto-detect name (got '%s')"
-msgstr "无法自动探测姓名（得到 '%s'）"
-
-#: ident.c:434
-#, c-format
-msgid "empty ident name (for <%s>) not allowed"
-msgstr "不允许空的姓名（对于 <%s>）"
-
-#: ident.c:440
-#, c-format
-msgid "name consists only of disallowed characters: %s"
-msgstr "姓名中仅包含禁用字符：%s"
-
-#: ident.c:455 builtin/commit.c:649
-#, c-format
-msgid "invalid date format: %s"
-msgstr "无效的日期格式：%s"
-
-#: list-objects-filter-options.c:68
-msgid "expected 'tree:<depth>'"
-msgstr "期望 'tree:<深度>'"
-
-#: list-objects-filter-options.c:83
-msgid "sparse:path filters support has been dropped"
-msgstr "sparse:path 过滤器支持已被删除"
-
-#: list-objects-filter-options.c:90
-#, c-format
-msgid "'%s' for 'object:type=<type>' is not a valid object type"
-msgstr "'object:type=<type>' 的值 '%s' 不是有效的对象类型"
-
-#: list-objects-filter-options.c:109
-#, c-format
-msgid "invalid filter-spec '%s'"
-msgstr "无效的过滤器表达式 '%s'"
-
-#: list-objects-filter-options.c:125
-#, c-format
-msgid "must escape char in sub-filter-spec: '%c'"
-msgstr "必须对 sub-filter-spec 中的字符进行转义：'%c'"
-
-#: list-objects-filter-options.c:167
-msgid "expected something after combine:"
-msgstr "期望在组合后有一些东西："
-
-#: list-objects-filter-options.c:249
-msgid "multiple filter-specs cannot be combined"
-msgstr "不能混用多种过滤规格"
-
-#: list-objects-filter-options.c:365
-msgid "unable to upgrade repository format to support partial clone"
-msgstr "无法升级仓库格式以支持部分克隆"
-
-#: list-objects-filter.c:532
-#, c-format
-msgid "unable to access sparse blob in '%s'"
-msgstr "不能访问 '%s' 中的稀疏数据对象"
-
-#: list-objects-filter.c:535
-#, c-format
-msgid "unable to parse sparse filter data in %s"
-msgstr "无法解析 %s 中的稀疏过滤器数据"
-
-#: list-objects.c:144
-#, c-format
-msgid "entry '%s' in tree %s has tree mode, but is not a tree"
-msgstr "树 %2$s 中的条目 '%1$s' 具有树的模式，但不是一个树对象"
-
-#: list-objects.c:157
-#, c-format
-msgid "entry '%s' in tree %s has blob mode, but is not a blob"
-msgstr "树 %2$s 中的条目 '%1$s' 具有数据对象的模式，但不是一个数据对象"
-
-#: list-objects.c:415
-#, c-format
-msgid "unable to load root tree for commit %s"
-msgstr "无法为提交 %s 加载根树"
-
-#: lockfile.c:152
-#, c-format
-msgid ""
-"Unable to create '%s.lock': %s.\n"
-"\n"
-"Another git process seems to be running in this repository, e.g.\n"
-"an editor opened by 'git commit'. Please make sure all processes\n"
-"are terminated then try again. If it still fails, a git process\n"
-"may have crashed in this repository earlier:\n"
-"remove the file manually to continue."
-msgstr ""
-"无法创建 '%s.lock'：%s。\n"
-"\n"
-"似乎另外一个 git 进程在这个仓库中运行，例如：'git commit' 命令打\n"
-"开了一个编辑器。请确认所有进程都已经关闭然后重试。如果仍然报错，\n"
-"可能之前有一个 git 进程在这个仓库中异常退出：\n"
-"手动删除这个文件再继续。"
-
-#: lockfile.c:160
-#, c-format
-msgid "Unable to create '%s.lock': %s"
-msgstr "不能创建 '%s.lock'：%s"
-
-#: ls-refs.c:175
-#, c-format
-msgid "unexpected line: '%s'"
-msgstr "意外的行：'%s'"
-
-#: ls-refs.c:179
-msgid "expected flush after ls-refs arguments"
-msgstr "在 ls-refs 参数后应该有一个 flush 包"
-
-#: mailinfo.c:1050
-msgid "quoted CRLF detected"
-msgstr "检测到被引用的 CRLF"
-
-#: mailinfo.c:1254 builtin/am.c:185 builtin/mailinfo.c:46
-#, c-format
-msgid "bad action '%s' for '%s'"
-msgstr "'%2$s' 的错误动作 '%1$s'"
-
-#: merge-ort.c:1630 merge-recursive.c:1214
-#, c-format
-msgid "Failed to merge submodule %s (not checked out)"
-msgstr "无法合并子模组 %s （没有检出）"
-
-#: merge-ort.c:1639 merge-recursive.c:1221
-#, c-format
-msgid "Failed to merge submodule %s (commits not present)"
-msgstr "无法合并子模组 %s（提交不存在）"
-
-#: merge-ort.c:1648 merge-recursive.c:1228
-#, c-format
-msgid "Failed to merge submodule %s (commits don't follow merge-base)"
-msgstr "无法合并子模组 %s （提交未跟随合并基线）"
-
-#: merge-ort.c:1658 merge-ort.c:1666
-#, c-format
-msgid "Note: Fast-forwarding submodule %s to %s"
-msgstr "注意：快进子模组 %s 到 %s"
-
-#: merge-ort.c:1688
-#, c-format
-msgid "Failed to merge submodule %s"
-msgstr "无法合并子模组 %s"
-
-#: merge-ort.c:1695
-#, c-format
-msgid ""
-"Failed to merge submodule %s, but a possible merge resolution exists:\n"
-"%s\n"
-msgstr ""
-"无法合并子模组 %s，但是存在一个可能的合并方案：\n"
-"%s\n"
-
-#: merge-ort.c:1699 merge-recursive.c:1284
-#, c-format
-msgid ""
-"If this is correct simply add it to the index for example\n"
-"by using:\n"
-"\n"
-"  git update-index --cacheinfo 160000 %s \"%s\"\n"
-"\n"
-"which will accept this suggestion.\n"
-msgstr ""
-"如果这个正确，将其添加到索引，例如使用命令：\n"
-"\n"
-"  git update-index --cacheinfo 160000 %s \"%s\"\n"
-"\n"
-"以接受此建议。\n"
-
-#: merge-ort.c:1712
-#, c-format
-msgid ""
-"Failed to merge submodule %s, but multiple possible merges exist:\n"
-"%s"
-msgstr ""
-"无法合并子模组 %s，但是存在多个可能的合并：\n"
-"%s"
-
-#: merge-ort.c:1937 merge-recursive.c:1375
-msgid "Failed to execute internal merge"
-msgstr "无法执行内部合并"
-
-#: merge-ort.c:1942 merge-recursive.c:1380
-#, c-format
-msgid "Unable to add %s to database"
-msgstr "不能添加 %s 至对象库"
-
-#: merge-ort.c:1949 merge-recursive.c:1413
-#, c-format
-msgid "Auto-merging %s"
-msgstr "自动合并 %s"
-
-#: merge-ort.c:2088 merge-recursive.c:2135
-#, 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 ""
-"冲突（隐式目录重命名）：处于隐式目录重命名的现存文件/目录 %s，将以下路径放"
-"在：%s。"
-
-#: merge-ort.c:2098 merge-recursive.c:2145
-#, 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 ""
-"冲突（隐式目录重命名）：无法映射一个以上路径到 %s，隐式目录重命名尝试将这些路"
-"径放置于此：%s"
-
-#: merge-ort.c:2156
-#, c-format
-msgid ""
-"CONFLICT (directory rename split): Unclear where to rename %s to; it was "
-"renamed to multiple other directories, with no destination getting a "
-"majority of the files."
-msgstr ""
-"冲突（分割的目录重命名）：不清楚重命名 %s 到哪里，因为它被重命名到多个其他目"
-"录中，没有一个目标目录中包含多数文件。"
-
-#: merge-ort.c:2310 merge-recursive.c:2481
-#, c-format
-msgid ""
-"WARNING: Avoiding applying %s -> %s rename to %s, because %s itself was "
-"renamed."
-msgstr "警告：避免应用 %s -> %s 的重命名到 %s，因为 %s 本身已被重命名。"
-
-#: merge-ort.c:2450 merge-recursive.c:3264
-#, c-format
-msgid ""
-"Path updated: %s added in %s inside a directory that was renamed in %s; "
-"moving it to %s."
-msgstr ""
-"路径已更新：%s 添加到 %s，位于一个被重命名到 %s 的目录中，将其移动到 %s。"
-
-#: merge-ort.c:2457 merge-recursive.c:3271
-#, c-format
-msgid ""
-"Path updated: %s renamed to %s in %s, inside a directory that was renamed in "
-"%s; moving it to %s."
-msgstr ""
-"路径已更新：%1$s 重命名为 %3$s 中的 %2$s，而该目录被重命名到 %4$s 中，将其移"
-"动到 %5$s。"
-
-#: merge-ort.c:2470 merge-recursive.c:3267
-#, 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 ""
-"冲突（文件位置）：%s 添加到 %s，位于一个被重命名为 %s 的目录中，建议将其移动"
-"到 %s。"
-
-#: merge-ort.c:2478 merge-recursive.c:3274
-#, 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 ""
-"冲突（文件位置）：%1$s 重命名为 %3$s 中的 %2$s，而该目录被重命名到 %4$s 中，"
-"建议将其移动到 %5$s。"
-
-#: merge-ort.c:2634
-#, 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:2729
-#, 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."
-msgstr ""
-"冲突（重命名卷入冲突）：重命名 %s -> %s 有内容冲突并且和另外一个路径碰撞，这"
-"可能导致嵌套的冲突标签。"
-
-#: merge-ort.c:2748 merge-ort.c:2772
-#, 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:3261 merge-recursive.c:3025
-#, c-format
-msgid "cannot read object %s"
-msgstr "不能读取对象 %s"
-
-#: merge-ort.c:3264 merge-recursive.c:3028
-#, c-format
-msgid "object %s is not a blob"
-msgstr "对象 %s 不是一个数据对象"
-
-#: merge-ort.c:3693
-#, 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:3770
-#, c-format
-msgid ""
-"CONFLICT (distinct types): %s had different types on each side; renamed both "
-"of them so each can be recorded somewhere."
-msgstr ""
-"冲突（不同类型）：%s 在两侧有不同的类型，将两者都重命名以便它们能记录在不同位"
-"置。"
-
-#: merge-ort.c:3777
-#, c-format
-msgid ""
-"CONFLICT (distinct types): %s had different types on each side; renamed one "
-"of them so each can be recorded somewhere."
-msgstr ""
-"冲突（不同类型）：%s 在两侧有不同的类型，将其中之一重命名以便它们能记录在不同"
-"位置。"
-
-#: merge-ort.c:3866 merge-recursive.c:3104
-msgid "content"
-msgstr "内容"
-
-#: merge-ort.c:3868 merge-recursive.c:3108
-msgid "add/add"
-msgstr "添加/添加"
-
-#: merge-ort.c:3870 merge-recursive.c:3153
-msgid "submodule"
-msgstr "子模组"
-
-#: merge-ort.c:3872 merge-recursive.c:3154
-#, c-format
-msgid "CONFLICT (%s): Merge conflict in %s"
-msgstr "冲突（%s）：合并冲突于 %s"
-
-#: merge-ort.c:3916
-#, c-format
-msgid ""
-"CONFLICT (modify/delete): %s deleted in %s and modified in %s.  Version %s "
-"of %s left in tree."
-msgstr ""
-"冲突（修改/删除）：%1$s 在 %2$s 中被删除，在 %3$s 中被修改。%5$s 的 %4$s 版本"
-"在树中被保留。"
-
-#: merge-ort.c:4212
-#, c-format
-msgid ""
-"Note: %s not up to date and in way of checking out conflicted version; old "
-"copy renamed to %s"
-msgstr "注意：%s 不是最新的，并且与要检出的版本冲突。旧副本重命名为 %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:4586
-#, c-format
-msgid "collecting merge info failed for trees %s, %s, %s"
-msgstr "无法收集树 %s、%s、%s 的合并信息"
-
-#: merge-ort-wrappers.c:13 merge-recursive.c:3723
-#, c-format
-msgid ""
-"Your local changes to the following files would be overwritten by merge:\n"
-"  %s"
-msgstr ""
-"您对下列文件的本地修改将被合并操作覆盖：\n"
-"  %s"
-
-#: merge-ort-wrappers.c:33 merge-recursive.c:3485 builtin/merge.c:405
-msgid "Already up to date."
-msgstr "已经是最新的。"
-
-#: merge-recursive.c:353
-msgid "(bad commit)\n"
-msgstr "（坏提交）\n"
-
-#: merge-recursive.c:381
-#, c-format
-msgid "add_cacheinfo failed for path '%s'; merge aborting."
-msgstr "add_cacheinfo 对路径 '%s' 执行失败，合并终止。"
-
-#: merge-recursive.c:390
-#, c-format
-msgid "add_cacheinfo failed to refresh for path '%s'; merge aborting."
-msgstr "add_cacheinfo 无法刷新路径 '%s'，合并终止。"
-
-#: merge-recursive.c:881
-#, c-format
-msgid "failed to create path '%s'%s"
-msgstr "无法创建路径 '%s'%s"
-
-#: merge-recursive.c:892
-#, c-format
-msgid "Removing %s to make room for subdirectory\n"
-msgstr "删除 %s 以便为子目录留出空间\n"
-
-#: merge-recursive.c:906 merge-recursive.c:925
-msgid ": perhaps a D/F conflict?"
-msgstr "：可能是一个目录/文件冲突？"
-
-#: merge-recursive.c:915
-#, c-format
-msgid "refusing to lose untracked file at '%s'"
-msgstr "拒绝丢弃 '%s' 中的未跟踪文件"
-
-#: merge-recursive.c:956 builtin/cat-file.c:47
-#, c-format
-msgid "cannot read object %s '%s'"
-msgstr "不能读取对象 %s '%s'"
-
-#: merge-recursive.c:961
-#, c-format
-msgid "blob expected for %s '%s'"
-msgstr "%s '%s' 应为数据对象"
-
-#: merge-recursive.c:986
-#, c-format
-msgid "failed to open '%s': %s"
-msgstr "无法打开 '%s'：%s"
-
-#: merge-recursive.c:997
-#, c-format
-msgid "failed to symlink '%s': %s"
-msgstr "无法创建符号链接 '%s'：%s"
-
-#: merge-recursive.c:1002
-#, c-format
-msgid "do not know what to do with %06o %s '%s'"
-msgstr "不知道如何处理 %06o %s '%s'"
-
-#: merge-recursive.c:1236 merge-recursive.c:1249
-#, c-format
-msgid "Fast-forwarding submodule %s to the following commit:"
-msgstr "子模组 %s 快进到如下提交："
-
-#: merge-recursive.c:1239 merge-recursive.c:1252
-#, c-format
-msgid "Fast-forwarding submodule %s"
-msgstr "快进子模组 %s"
-
-#: merge-recursive.c:1276
-#, c-format
-msgid "Failed to merge submodule %s (merge following commits not found)"
-msgstr "无法合并子模组 %s （没发现合并跟随的提交）"
-
-#: merge-recursive.c:1280
-#, c-format
-msgid "Failed to merge submodule %s (not fast-forward)"
-msgstr "无法合并子模组 %s（非快进）"
-
-#: merge-recursive.c:1281
-msgid "Found a possible merge resolution for the submodule:\n"
-msgstr "找到子模组的一个可能的合并方案：\n"
-
-#: merge-recursive.c:1293
-#, c-format
-msgid "Failed to merge submodule %s (multiple merges found)"
-msgstr "无法合并子模组 %s （发现多个合并）"
-
-#: merge-recursive.c:1437
-#, c-format
-msgid "Error: Refusing to lose untracked file at %s; writing to %s instead."
-msgstr "错误：拒绝丢失未跟踪文件 '%s'，而是写入 %s。"
-
-#: merge-recursive.c:1509
-#, c-format
-msgid ""
-"CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s left "
-"in tree."
-msgstr ""
-"冲突（%1$s/删除）：%2$s 在 %3$s 中被删除，在 %5$s 中被 %4$s。%7$s 的 %6$s 版"
-"本被保留。"
-
-#: merge-recursive.c:1514
-#, c-format
-msgid ""
-"CONFLICT (%s/delete): %s deleted in %s and %s to %s in %s. Version %s of %s "
-"left in tree."
-msgstr ""
-"冲突（%1$s/删除）：%2$s 在 %3$s 中被删除，在 %6$s 中的 %5$s 被 %4$s。%8$s 的 "
-"%7$s 版本被保留。"
-
-#: merge-recursive.c:1521
-#, c-format
-msgid ""
-"CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s left "
-"in tree at %s."
-msgstr ""
-"冲突（%1$s/删除）：%2$s 在 %3$s 中被删除，在 %5$s 中被 %4$s。%7$s 的 %6$s 版"
-"本保留在 %8$s 中。"
-
-#: merge-recursive.c:1526
-#, 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 ""
-"冲突（%1$s/删除）：%2$s 在 %3$s 中被删除，在 %6$s 中的 %5$s 被 %4$s。%8$s 的 "
-"%7$s 版本保留在 %9$s 中。"
-
-#: merge-recursive.c:1561
-msgid "rename"
-msgstr "重命名"
-
-#: merge-recursive.c:1561
-msgid "renamed"
-msgstr "重命名"
-
-#: merge-recursive.c:1612 merge-recursive.c:2518 merge-recursive.c:3181
-#, c-format
-msgid "Refusing to lose dirty file at %s"
-msgstr "拒绝丢失脏文件 '%s'"
-
-#: merge-recursive.c:1622
-#, c-format
-msgid "Refusing to lose untracked file at %s, even though it's in the way."
-msgstr "拒绝在 '%s' 处失去未跟踪文件，即使它存在于重命名中。"
-
-#: merge-recursive.c:1680
-#, 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:1711
-#, c-format
-msgid "%s is a directory in %s adding as %s instead"
-msgstr "%s 是 %s 中的一个目录而以 %s 为名被添加"
-
-#: merge-recursive.c:1716
-#, c-format
-msgid "Refusing to lose untracked file at %s; adding as %s instead"
-msgstr "拒绝丢失未跟踪文件 '%s'，而是添加为 %s"
-
-#: merge-recursive.c:1743
-#, c-format
-msgid ""
-"CONFLICT (rename/rename): Rename \"%s\"->\"%s\" in branch \"%s\" rename "
-"\"%s\"->\"%s\" in \"%s\"%s"
-msgstr ""
-"冲突（重命名/重命名）：在分支 \"%3$s\" 中重命名 \"%1$s\"->\"%2$s\"，在分支 "
-"\"%6$s\" 中重命名 \"%4$s\"->\"%5$s\"%7$s"
-
-#: merge-recursive.c:1748
-msgid " (left unresolved)"
-msgstr "（留下未解决）"
-
-#: merge-recursive.c:1840
-#, 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:2103
-#, c-format
-msgid ""
-"CONFLICT (directory rename split): Unclear where to place %s because "
-"directory %s was renamed to multiple other directories, with no destination "
-"getting a majority of the files."
-msgstr ""
-"冲突（分割的目录重命名）：不清楚 %s 应该放在哪里，因为目录 %s 被重命名到多个"
-"其它目录，没有目录包含大部分文件。"
-
-#: merge-recursive.c:2237
-#, c-format
-msgid ""
-"CONFLICT (rename/rename): Rename directory %s->%s in %s. Rename directory %s-"
-">%s in %s"
-msgstr ""
-"冲突（重命名/重命名）：在 %3$s 中重命名目录 %1$s->%2$s，在 %6$s 中重命名目录 "
-"%4$s->%5$s"
-
-#: merge-recursive.c:3092
-msgid "modify"
-msgstr "修改"
-
-#: merge-recursive.c:3092
-msgid "modified"
-msgstr "修改"
-
-#: merge-recursive.c:3131
-#, c-format
-msgid "Skipped %s (merged same as existing)"
-msgstr "略过 %s（已经做过相同合并）"
-
-#: merge-recursive.c:3184
-#, c-format
-msgid "Adding as %s instead"
-msgstr "而是以 %s 为名添加"
-
-#: merge-recursive.c:3388
-#, c-format
-msgid "Removing %s"
-msgstr "删除 %s"
-
-#: merge-recursive.c:3411
-msgid "file/directory"
-msgstr "文件/目录"
-
-#: merge-recursive.c:3416
-msgid "directory/file"
-msgstr "目录/文件"
-
-#: merge-recursive.c:3423
-#, 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:3432
-#, c-format
-msgid "Adding %s"
-msgstr "添加 %s"
-
-#: merge-recursive.c:3441
-#, c-format
-msgid "CONFLICT (add/add): Merge conflict in %s"
-msgstr "冲突（add/add）：合并冲突于 %s"
-
-#: merge-recursive.c:3494
-#, c-format
-msgid "merging of trees %s and %s failed"
-msgstr "无法合并树 %s 和 %s"
-
-#: merge-recursive.c:3588
-msgid "Merging:"
-msgstr "合并："
-
-#: merge-recursive.c:3601
-#, c-format
-msgid "found %u common ancestor:"
-msgid_plural "found %u common ancestors:"
-msgstr[0] "发现 %u 个共同祖先："
-msgstr[1] "发现 %u 个共同祖先："
-
-#: merge-recursive.c:3651
-msgid "merge returned no commit"
-msgstr "合并未返回提交"
-
-#: merge-recursive.c:3823
-#, c-format
-msgid "Could not parse object '%s'"
-msgstr "不能解析对象 '%s'"
-
-#: merge-recursive.c:3841 builtin/merge.c:720 builtin/merge.c:912
-#: builtin/stash.c:489
-msgid "Unable to write index."
-msgstr "不能写入索引。"
-
-#: merge.c:41
-msgid "failed to read the cache"
-msgstr "无法读取缓存"
-
-#: merge.c:102 rerere.c:705 builtin/am.c:1989 builtin/am.c:2023
-#: builtin/checkout.c:603 builtin/checkout.c:865 builtin/clone.c:714
-#: builtin/stash.c:269
-msgid "unable to write new index file"
-msgstr "无法写新的索引文件"
-
-#: midx.c:79
-msgid "multi-pack-index OID fanout is of the wrong size"
-msgstr "多包索引的对象ID扇出表大小错误"
-
-#: midx.c:112
-#, c-format
-msgid "multi-pack-index file %s is too small"
-msgstr "多包索引文件 %s 太小"
-
-#: midx.c:128
-#, c-format
-msgid "multi-pack-index signature 0x%08x does not match signature 0x%08x"
-msgstr "多包索引签名 0x%08x 和签名 0x%08x 不匹配"
-
-#: midx.c:133
-#, c-format
-msgid "multi-pack-index version %d not recognized"
-msgstr "multi-pack-index 版本 %d 不能被识别"
-
-#: midx.c:138
-#, c-format
-msgid "multi-pack-index hash version %u does not match version %u"
-msgstr "多包索引哈希版本 %u 和版本 %u 不匹配"
-
-#: midx.c:155
-msgid "multi-pack-index missing required pack-name chunk"
-msgstr "多包索引缺少必需的包名块"
-
-#: midx.c:157
-msgid "multi-pack-index missing required OID fanout chunk"
-msgstr "多包索引缺少必需的对象 ID 扇出块"
-
-#: midx.c:159
-msgid "multi-pack-index missing required OID lookup chunk"
-msgstr "多包索引缺少必需的对象 ID 查询块"
-
-#: midx.c:161
-msgid "multi-pack-index missing required object offsets chunk"
-msgstr "多包索引缺少必需的对象偏移块"
-
-#: midx.c:180
-#, c-format
-msgid "multi-pack-index pack names out of order: '%s' before '%s'"
-msgstr "多包索引包名无序：'%s' 在 '%s' 之前"
-
-#: midx.c:228
-#, c-format
-msgid "bad pack-int-id: %u (%u total packs)"
-msgstr "错的 pack-int-id：%u（共有 %u 个包）"
-
-#: midx.c:278
-msgid "multi-pack-index stores a 64-bit offset, but off_t is too small"
-msgstr "多包索引存储一个64位偏移，但是 off_t 太小"
-
-#: midx.c:509
-#, c-format
-msgid "failed to add packfile '%s'"
-msgstr "无法添加包文件 '%s'"
-
-#: midx.c:515
-#, c-format
-msgid "failed to open pack-index '%s'"
-msgstr "无法打开包索引 '%s'"
-
-#: midx.c:583
-#, c-format
-msgid "failed to locate object %d in packfile"
-msgstr "无法在包文件中定位对象 %d"
-
-#: midx.c:911
-msgid "cannot store reverse index file"
-msgstr "无法存储反向索引文件"
-
-#: midx.c:1009
-#, c-format
-msgid "could not parse line: %s"
-msgstr "不能解析行：%s"
-
-#: midx.c:1011
-#, c-format
-msgid "malformed line: %s"
-msgstr "格式错误的行：%s"
-
-#: midx.c:1181
-msgid "ignoring existing multi-pack-index; checksum mismatch"
-msgstr "忽略已存在的多包索引，校验码不匹配"
-
-#: midx.c:1206
-msgid "could not load pack"
-msgstr "不能载入包"
-
-#: midx.c:1212
-#, c-format
-msgid "could not open index for %s"
-msgstr "不能打开 %s 的索引"
-
-#: midx.c:1223
-msgid "Adding packfiles to multi-pack-index"
-msgstr "添加包文件到多包索引"
-
-#: midx.c:1266
-#, c-format
-msgid "unknown preferred pack: '%s'"
-msgstr "未知的首选包：'%s'"
-
-#: midx.c:1311
-#, c-format
-msgid "cannot select preferred pack %s with no objects"
-msgstr "不能选择没有对象的首选包 %s"
-
-#: midx.c:1343
-#, c-format
-msgid "did not see pack-file %s to drop"
-msgstr "没有看到要丢弃的包文件 %s"
-
-#: midx.c:1389
-#, c-format
-msgid "preferred pack '%s' is expired"
-msgstr "首选包 '%s' 已过期"
-
-#: midx.c:1402
-msgid "no pack files to index."
-msgstr "没有要索引的包文件。"
-
-#: midx.c:1409
-msgid "refusing to write multi-pack .bitmap without any objects"
-msgstr "拒绝写入没有任何对象的多包位图 .bitmap"
-
-#: midx.c:1451
-msgid "could not write multi-pack bitmap"
-msgstr "无法写入多包位图"
-
-#: midx.c:1461
-msgid "could not write multi-pack-index"
-msgstr "无法写入多包索引"
-
-#: midx.c:1520 builtin/clean.c:37
-#, c-format
-msgid "failed to remove %s"
-msgstr "无法删除 %s"
-
-#: midx.c:1553
-#, c-format
-msgid "failed to clear multi-pack-index at %s"
-msgstr "无法清理位于 %s 的多包索引"
-
-#: midx.c:1616
-msgid "multi-pack-index file exists, but failed to parse"
-msgstr "多包索引文件存在，但无法解析"
-
-#: midx.c:1624
-msgid "incorrect checksum"
-msgstr "不正确的校验码"
-
-#: midx.c:1627
-msgid "Looking for referenced packfiles"
-msgstr "正在查找引用的包文件"
-
-#: midx.c:1642
-#, c-format
-msgid ""
-"oid fanout out of order: fanout[%d] = %<PRIx32> > %<PRIx32> = fanout[%d]"
-msgstr "对象 ID 扇出无序：fanout[%d] = %<PRIx32> > %<PRIx32> = fanout[%d]"
-
-#: midx.c:1647
-msgid "the midx contains no oid"
-msgstr "midx 不包含 oid"
-
-#: midx.c:1656
-msgid "Verifying OID order in multi-pack-index"
-msgstr "校验多包索引中的 OID 顺序"
-
-#: midx.c:1665
-#, c-format
-msgid "oid lookup out of order: oid[%d] = %s >= %s = oid[%d]"
-msgstr "对象 ID 查询无序：oid[%d] = %s >= %s = oid[%d]"
-
-#: midx.c:1685
-msgid "Sorting objects by packfile"
-msgstr "通过包文件为对象排序"
-
-#: midx.c:1692
-msgid "Verifying object offsets"
-msgstr "校验对象偏移"
-
-#: midx.c:1708
-#, c-format
-msgid "failed to load pack entry for oid[%d] = %s"
-msgstr "无法为 oid[%d] = %s 加载包条目"
-
-#: midx.c:1714
-#, c-format
-msgid "failed to load pack-index for packfile %s"
-msgstr "无法为包文件 %s 加载包索引"
-
-#: midx.c:1723
-#, c-format
-msgid "incorrect object offset for oid[%d] = %s: %<PRIx64> != %<PRIx64>"
-msgstr "oid[%d] = %s 错误的对象偏移：%<PRIx64> != %<PRIx64>"
-
-#: midx.c:1750
-msgid "Counting referenced objects"
-msgstr "正在对引用对象计数"
-
-#: midx.c:1760
-msgid "Finding and deleting unreferenced packfiles"
-msgstr "正在查找和删除未引用的包文件"
-
-#: midx.c:1952
-msgid "could not start pack-objects"
-msgstr "不能开始 pack-objects"
-
-#: midx.c:1972
-msgid "could not finish pack-objects"
-msgstr "不能结束 pack-objects"
-
-#: name-hash.c:542
-#, c-format
-msgid "unable to create lazy_dir thread: %s"
-msgstr "不能创建 lazy_dir 线程：%s"
-
-#: name-hash.c:564
-#, c-format
-msgid "unable to create lazy_name thread: %s"
-msgstr "不能创建 lazy_name 线程：%s"
-
-#: name-hash.c:570
-#, c-format
-msgid "unable to join lazy_name thread: %s"
-msgstr "不能加入 lazy_name 线程：%s"
-
-#: notes-merge.c:276
-#, 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."
-msgstr ""
-"您的前一次注释合并尚未结束（存在 %s）。\n"
-"在开始一个新的注释合并之前，请使用 'git notes merge --commit' 或者 'git "
-"notes merge --abort' 来提交/终止前一次合并。"
-
-#: notes-merge.c:283
-#, c-format
-msgid "You have not concluded your notes merge (%s exists)."
-msgstr "您尚未结束注释合并（存在 %s）。"
-
-#: notes-utils.c:46
-msgid "Cannot commit uninitialized/unreferenced notes tree"
-msgstr "不能提交未初始化/未引用的注解树"
-
-#: notes-utils.c:105
-#, c-format
-msgid "Bad notes.rewriteMode value: '%s'"
-msgstr "坏的 notes.rewriteMode 值：'%s'"
-
-#: notes-utils.c:115
-#, c-format
-msgid "Refusing to rewrite notes in %s (outside of refs/notes/)"
-msgstr "拒绝向 %s（在 refs/notes/ 之外）写入注解"
-
-#. TRANSLATORS: The first %s is the name of
-#. the environment variable, the second %s is
-#. its value.
-#.
-#: notes-utils.c:145
-#, c-format
-msgid "Bad %s value: '%s'"
-msgstr "坏的 %s 值：'%s'"
-
-#: object-file.c:457
-#, c-format
-msgid "object directory %s does not exist; check .git/objects/info/alternates"
-msgstr "对象目录 %s 不存在，检查 .git/objects/info/alternates"
-
-#: object-file.c:515
-#, c-format
-msgid "unable to normalize alternate object path: %s"
-msgstr "无法规范化备用对象路径：%s"
-
-#: object-file.c:589
-#, c-format
-msgid "%s: ignoring alternate object stores, nesting too deep"
-msgstr "%s：忽略备用对象库，嵌套太深"
-
-#: object-file.c:596
-#, c-format
-msgid "unable to normalize object directory: %s"
-msgstr "无法规范化对象目录: %s"
-
-#: object-file.c:639
-msgid "unable to fdopen alternates lockfile"
-msgstr "无法 fdopen 替换锁文件"
-
-#: object-file.c:657
-msgid "unable to read alternates file"
-msgstr "无法读取替代文件"
-
-#: object-file.c:664
-msgid "unable to move new alternates file into place"
-msgstr "无法将新的替代文件移动到位"
-
-#: object-file.c:742
-#, c-format
-msgid "path '%s' does not exist"
-msgstr "路径 '%s' 不存在"
-
-#: object-file.c:763
-#, c-format
-msgid "reference repository '%s' as a linked checkout is not supported yet."
-msgstr "尚不支持将参考仓库 '%s' 作为一个链接检出。"
-
-#: object-file.c:769
-#, c-format
-msgid "reference repository '%s' is not a local repository."
-msgstr "参考仓库 '%s' 不是一个本地仓库。"
-
-#: object-file.c:775
-#, c-format
-msgid "reference repository '%s' is shallow"
-msgstr "参考仓库 '%s' 是一个浅克隆"
-
-#: object-file.c:783
-#, c-format
-msgid "reference repository '%s' is grafted"
-msgstr "参考仓库 '%s' 已被移植"
-
-#: object-file.c:814
-#, c-format
-msgid "could not find object directory matching %s"
-msgstr "无法找到和 %s 匹配的对象目录"
-
-#: object-file.c:864
-#, c-format
-msgid "invalid line while parsing alternate refs: %s"
-msgstr "解析备用引用时无效的行：%s"
-
-#: object-file.c:1014
-#, c-format
-msgid "attempting to mmap %<PRIuMAX> over limit %<PRIuMAX>"
-msgstr "尝试 mmap %<PRIuMAX>，超过了最大值 %<PRIuMAX>"
-
-#: object-file.c:1049
-#, c-format
-msgid "mmap failed%s"
-msgstr "mmap 失败%s"
-
-#: object-file.c:1230
-#, c-format
-msgid "object file %s is empty"
-msgstr "对象文件 %s 为空"
-
-#: object-file.c:1349 object-file.c:2588
-#, c-format
-msgid "corrupt loose object '%s'"
-msgstr "损坏的松散对象 '%s'"
-
-#: object-file.c:1351 object-file.c:2592
-#, c-format
-msgid "garbage at end of loose object '%s'"
-msgstr "松散对象 '%s' 后面有垃圾数据"
-
-#: object-file.c:1473
-#, c-format
-msgid "unable to parse %s header"
-msgstr "无法解析 %s 头部"
-
-#: object-file.c:1475
-msgid "invalid object type"
-msgstr "无效的对象类型"
-
-#: object-file.c:1486
-#, c-format
-msgid "unable to unpack %s header"
-msgstr "无法解开 %s 头部"
-
-#: object-file.c:1490
-#, c-format
-msgid "header for %s too long, exceeds %d bytes"
-msgstr "%s 的头部太长，超出了 %d 字节"
-
-#: object-file.c:1720
-#, c-format
-msgid "failed to read object %s"
-msgstr "无法读取对象 %s"
-
-#: object-file.c:1724
-#, c-format
-msgid "replacement %s not found for %s"
-msgstr "找不到 %2$s 的替代 %1$s"
-
-#: object-file.c:1728
-#, c-format
-msgid "loose object %s (stored in %s) is corrupt"
-msgstr "松散对象 %s（保存在 %s）已损坏"
-
-#: object-file.c:1732
-#, c-format
-msgid "packed object %s (stored in %s) is corrupt"
-msgstr "打包对象 %s（保存在 %s）已损坏"
-
-#: object-file.c:1855
-#, c-format
-msgid "unable to write file %s"
-msgstr "无法写文件 %s"
-
-#: object-file.c:1862
-#, c-format
-msgid "unable to set permission to '%s'"
-msgstr "无法为 '%s' 设置权限"
-
-#: object-file.c:1869
-msgid "file write error"
-msgstr "文件写错误"
-
-#: object-file.c:1904
-msgid "error when closing loose object file"
-msgstr "关闭松散对象文件时出错"
-
-#: object-file.c:1971
-#, c-format
-msgid "insufficient permission for adding an object to repository database %s"
-msgstr "权限不足，无法在仓库对象库 %s 中添加对象"
-
-#: object-file.c:1973
-msgid "unable to create temporary file"
-msgstr "无法创建临时文件"
-
-#: object-file.c:1997
-msgid "unable to write loose object file"
-msgstr "不能写松散对象文件"
-
-#: object-file.c:2003
-#, c-format
-msgid "unable to deflate new object %s (%d)"
-msgstr "不能压缩新对象 %s（%d）"
-
-#: object-file.c:2007
-#, c-format
-msgid "deflateEnd on object %s failed (%d)"
-msgstr "在对象 %s 上调用 deflateEnd 失败（%d）"
-
-#: object-file.c:2011
-#, c-format
-msgid "confused by unstable object source data for %s"
-msgstr "被 %s 的不稳定对象源数据搞糊涂了"
-
-#: object-file.c:2022 builtin/pack-objects.c:1251
-#, c-format
-msgid "failed utime() on %s"
-msgstr "在 %s 上调用 utime() 失败"
-
-#: object-file.c:2100
-#, c-format
-msgid "cannot read object for %s"
-msgstr "不能读取对象 %s"
-
-#: object-file.c:2151
-msgid "corrupt commit"
-msgstr "损坏的提交"
-
-#: object-file.c:2159
-msgid "corrupt tag"
-msgstr "损坏的标签"
-
-#: object-file.c:2259
-#, c-format
-msgid "read error while indexing %s"
-msgstr "索引 %s 时读取错误"
-
-#: object-file.c:2262
-#, c-format
-msgid "short read while indexing %s"
-msgstr "索引 %s 时读入不完整"
-
-#: object-file.c:2335 object-file.c:2345
-#, c-format
-msgid "%s: failed to insert into database"
-msgstr "%s：无法插入数据库"
-
-#: object-file.c:2351
-#, c-format
-msgid "%s: unsupported file type"
-msgstr "%s：不支持的文件类型"
-
-#: object-file.c:2375 builtin/fetch.c:1494
-#, c-format
-msgid "%s is not a valid object"
-msgstr "%s 不是一个有效的对象"
-
-#: object-file.c:2377
-#, c-format
-msgid "%s is not a valid '%s' object"
-msgstr "%s 不是一个有效的 '%s' 对象"
-
-#: object-file.c:2404
-#, c-format
-msgid "unable to open %s"
-msgstr "不能打开 %s"
-
-#: object-file.c:2599
-#, c-format
-msgid "hash mismatch for %s (expected %s)"
-msgstr "%s 的哈希值不匹配（预期 %s）"
-
-#: object-file.c:2622
-#, c-format
-msgid "unable to mmap %s"
-msgstr "不能 mmap %s"
-
-#: object-file.c:2628
-#, c-format
-msgid "unable to unpack header of %s"
-msgstr "无法解压缩 %s 的头部"
-
-#: object-file.c:2633
-#, c-format
-msgid "unable to parse header of %s"
-msgstr "无法解析 %s 的头部"
-
-#: object-file.c:2644
-#, c-format
-msgid "unable to unpack contents of %s"
-msgstr "无法解压缩 %s 的内容"
-
-#. TRANSLATORS: This is a line of ambiguous object
-#. output shown when we cannot look up or parse the
-#. object in question. E.g. "deadbeef [bad object]".
-#.
-#: object-name.c:382
-#, c-format
-msgid "%s [bad object]"
-msgstr "%s [坏的对象]"
-
-#. TRANSLATORS: This is a line of ambiguous commit
-#. object output. E.g.:
-#. *
-#.    "deadbeef commit 2021-01-01 - Some Commit Message"
-#.
-#: object-name.c:407
-#, c-format
-msgid "%s commit %s - %s"
-msgstr "%s 提交 %s - %s"
-
-#. TRANSLATORS: This is a line of ambiguous
-#. tag object output. E.g.:
-#. *
-#.    "deadbeef tag 2022-01-01 - Some Tag Message"
-#. *
-#. The second argument is the YYYY-MM-DD found
-#. in the tag.
-#. *
-#. The third argument is the "tag" string
-#. from object.c.
-#.
-#: object-name.c:428
-#, c-format
-msgid "%s tag %s - %s"
-msgstr "%s 标签 %s - %s"
-
-#. TRANSLATORS: This is a line of ambiguous
-#. tag object output where we couldn't parse
-#. the tag itself. E.g.:
-#. *
-#.    "deadbeef [bad tag, could not parse it]"
-#.
-#: object-name.c:439
-#, c-format
-msgid "%s [bad tag, could not parse it]"
-msgstr "%s [坏的标签，无法解析]"
-
-#. TRANSLATORS: This is a line of ambiguous <type>
-#. object output. E.g. "deadbeef tree".
-#.
-#: object-name.c:447
-#, c-format
-msgid "%s tree"
-msgstr "%s 树"
-
-#. TRANSLATORS: This is a line of ambiguous <type>
-#. object output. E.g. "deadbeef blob".
-#.
-#: object-name.c:453
-#, c-format
-msgid "%s blob"
-msgstr "%s 数据对象"
-
-#: object-name.c:569
-#, c-format
-msgid "short object ID %s is ambiguous"
-msgstr "短对象ID %s 存在歧义"
-
-#. TRANSLATORS: The argument is the list of ambiguous
-#. objects composed in show_ambiguous_object(). See
-#. its "TRANSLATORS" comments for details.
-#.
-#: object-name.c:591
-#, c-format
-msgid ""
-"The candidates are:\n"
-"%s"
-msgstr ""
-"候选者有：\n"
-"%s"
-
-#: object-name.c:888
-msgid ""
-"Git normally never creates a ref that ends with 40 hex characters\n"
-"because it will be ignored when you just specify 40-hex. These refs\n"
-"may be created by mistake. For example,\n"
-"\n"
-"  git switch -c $br $(git rev-parse ...)\n"
-"\n"
-"where \"$br\" is somehow empty and a 40-hex ref is created. Please\n"
-"examine these refs and maybe delete them. Turn this message off by\n"
-"running \"git config advice.objectNameWarning false\""
-msgstr ""
-"Git 通常不会创建一个以40个十六进制字符结尾的引用，因为当您只提供40\n"
-"个十六进制字符时将被忽略。这些引用可能被错误地创建。例如：\n"
-"\n"
-"  git switch -c $br $(git rev-parse ...)\n"
-"\n"
-"当 \"$br\" 某种原因空白时，一个40位十六进制的引用将被创建。请检查这些\n"
-"引用，可能需要删除它们。运行 \"git config advice.objectNameWarning\n"
-"false\" 命令关闭本消息通知。"
-
-#: object-name.c:1008
-#, c-format
-msgid "log for '%.*s' only goes back to %s"
-msgstr "'%.*s' 的日志仅能回到 %s"
-
-#: object-name.c:1016
-#, c-format
-msgid "log for '%.*s' only has %d entries"
-msgstr "'%.*s' 的日志仅有 %d 个条目"
-
-#: object-name.c:1794
-#, c-format
-msgid "path '%s' exists on disk, but not in '%.*s'"
-msgstr "路径 '%s' 在磁盘上，但是不在 '%.*s' 中"
-
-#: object-name.c:1800
-#, c-format
-msgid ""
-"path '%s' exists, but not '%s'\n"
-"hint: Did you mean '%.*s:%s' aka '%.*s:./%s'?"
-msgstr ""
-"路径 '%s' 存在，而 '%s' 不存在\n"
-"提示：您的意思是 '%.*s:%s' 亦即 '%.*s:./%s'？"
-
-#: object-name.c:1809
-#, c-format
-msgid "path '%s' does not exist in '%.*s'"
-msgstr "路径 '%s' 不在 '%.*s' 中"
-
-#: object-name.c:1837
-#, c-format
-msgid ""
-"path '%s' is in the index, but not at stage %d\n"
-"hint: Did you mean ':%d:%s'?"
-msgstr ""
-"路径 '%s' 在索引中，但不在暂存区 %d 中\n"
-"提示：您的意思是 ':%d:%s'？"
-
-#: object-name.c:1853
-#, c-format
-msgid ""
-"path '%s' is in the index, but not '%s'\n"
-"hint: Did you mean ':%d:%s' aka ':%d:./%s'?"
-msgstr ""
-"路径 '%s' 在索引中，但 '%s' 不在\n"
-"提示：您的意思是 ':%d:%s' 亦即 ':%d:./%s'？"
-
-#: object-name.c:1861
-#, c-format
-msgid "path '%s' exists on disk, but not in the index"
-msgstr "路径 '%s' 在磁盘上，但不在索引里"
-
-#: object-name.c:1863
-#, c-format
-msgid "path '%s' does not exist (neither on disk nor in the index)"
-msgstr "路径 '%s' 不存在（既不在磁盘上，也不在索引中）"
-
-#: object-name.c:1876
-msgid "relative path syntax can't be used outside working tree"
-msgstr "不能在工作区之外使用相对路径语法"
-
-#: object-name.c:1901
-#, c-format
-msgid "<object>:<path> required, only <object> '%s' given"
-msgstr "需要 <对象>:<路径>，只给出了 <对象> '%s'"
-
-#: object-name.c:2014
-#, c-format
-msgid "invalid object name '%.*s'."
-msgstr "无效的对象名 '%.*s'。"
-
-#: object.c:53
-#, c-format
-msgid "invalid object type \"%s\""
-msgstr "无效的对象类型 \"%s\""
-
-#: object.c:173
-#, c-format
-msgid "object %s is a %s, not a %s"
-msgstr "对象 %s 是一个 %s，不是一个 %s"
-
-#: object.c:250
-#, c-format
-msgid "object %s has unknown type id %d"
-msgstr "对象 %s 有未知的类型 id %d"
-
-#: object.c:263
-#, c-format
-msgid "unable to parse object: %s"
-msgstr "不能解析对象：%s"
-
-#: object.c:283 object.c:294
-#, c-format
-msgid "hash mismatch %s"
-msgstr "哈希值与 %s 不匹配"
-
-#: pack-bitmap.c:353
-msgid "multi-pack bitmap is missing required reverse index"
-msgstr "多包位图缺少必需的反向索引"
-
-#: pack-bitmap.c:433
-msgid "load_reverse_index: could not open pack"
-msgstr "load_reverse_index：无法打开包"
-
-#: pack-bitmap.c:1072 pack-bitmap.c:1078 builtin/pack-objects.c:2432
-#, c-format
-msgid "unable to get size of %s"
-msgstr "无法得到 %s 的大小"
-
-#: pack-bitmap.c:1937
-#, c-format
-msgid "could not find %s in pack %s at offset %<PRIuMAX>"
-msgstr "在包 %2$s 偏移 %3$<PRIuMAX> 中无法找到 %1$s"
-
-#: pack-bitmap.c:1973 builtin/rev-list.c:91
-#, c-format
-msgid "unable to get disk usage of %s"
-msgstr "无法得到 %s 的磁盘使用量"
-
-#: pack-revindex.c:221
-#, c-format
-msgid "reverse-index file %s is too small"
-msgstr "反向索引文件 %s 太小"
-
-#: pack-revindex.c:226
-#, c-format
-msgid "reverse-index file %s is corrupt"
-msgstr "反向索引文件 %s 损坏"
-
-#: pack-revindex.c:234
-#, c-format
-msgid "reverse-index file %s has unknown signature"
-msgstr "反向索引文件 %s 有错误的签名"
-
-#: pack-revindex.c:238
-#, c-format
-msgid "reverse-index file %s has unsupported version %<PRIu32>"
-msgstr "反向索引文件 %s 不支持的版本 %<PRIu32>"
-
-#: pack-revindex.c:243
-#, c-format
-msgid "reverse-index file %s has unsupported hash id %<PRIu32>"
-msgstr "反向索引文件 %s 有不支持的哈希 ID %<PRIu32>"
-
-#: pack-write.c:251
-msgid "cannot both write and verify reverse index"
-msgstr "无法同时写入和校验反向索引"
-
-#: pack-write.c:270
-#, c-format
-msgid "could not stat: %s"
-msgstr "不能调用 stat：%s"
-
-#: pack-write.c:282
-#, c-format
-msgid "failed to make %s readable"
-msgstr "无法设置 %s 为可读"
-
-#: pack-write.c:521
-#, c-format
-msgid "could not write '%s' promisor file"
-msgstr "无法写入 '%s' 承诺者文件"
-
-#: packfile.c:627
-msgid "offset before end of packfile (broken .idx?)"
-msgstr "偏移量在包文件结束之前（损坏的 .idx？）"
-
-#: packfile.c:657
-#, c-format
-msgid "packfile %s cannot be mapped%s"
-msgstr "包文件 %s 不能被映射%s"
-
-#: packfile.c:1924
-#, c-format
-msgid "offset before start of pack index for %s (corrupt index?)"
-msgstr "偏移量在 %s 的包索引开始之前（损坏的索引？）"
-
-#: packfile.c:1928
-#, c-format
-msgid "offset beyond end of pack index for %s (truncated index?)"
-msgstr "偏移量越过了 %s 的包索引的结尾（被截断的索引？）"
-
-#: parse-options-cb.c:21 parse-options-cb.c:25 builtin/commit-graph.c:175
-#, c-format
-msgid "option `%s' expects a numerical value"
-msgstr "选项 `%s' 期望一个数字值"
-
-#: parse-options-cb.c:42
-#, c-format
-msgid "malformed expiration date '%s'"
-msgstr "格式错误的到期时间：'%s'"
-
-#: parse-options-cb.c:55
-#, c-format
-msgid "option `%s' expects \"always\", \"auto\", or \"never\""
-msgstr "选项 `%s' 期望 \"always\"、\"auto\" 或 \"never\""
-
-#: parse-options-cb.c:133 parse-options-cb.c:150
-#, c-format
-msgid "malformed object name '%s'"
-msgstr "格式错误的对象名 '%s'"
-
-#: parse-options-cb.c:307
-#, c-format
-msgid "option `%s' expects \"%s\" or \"%s\""
-msgstr "选项 `%s' 期望 \"%s\" 或 \"%s\""
-
-#: parse-options.c:58
-#, c-format
-msgid "%s requires a value"
-msgstr "%s 需要一个值"
-
-#: parse-options.c:93
-#, c-format
-msgid "%s is incompatible with %s"
-msgstr "%s 与 %s 不兼容"
-
-#: parse-options.c:98
-#, c-format
-msgid "%s : incompatible with something else"
-msgstr "%s：和其它的不兼容"
-
-#: parse-options.c:112 parse-options.c:116
-#, c-format
-msgid "%s takes no value"
-msgstr "%s 不取值"
-
-#: parse-options.c:114
-#, c-format
-msgid "%s isn't available"
-msgstr "%s 不可用"
-
-#: 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:393
-#, c-format
-msgid "ambiguous option: %s (could be --%s%s or --%s%s)"
-msgstr "有歧义的选项：%s（可以是 --%s%s 或 --%s%s）"
-
-#: parse-options.c:428 parse-options.c:436
-#, c-format
-msgid "did you mean `--%s` (with two dashes)?"
-msgstr "您的意思是 `--%s`（有两个短线）？"
-
-#: parse-options.c:678 parse-options.c:1054
-#, c-format
-msgid "alias of --%s"
-msgstr "--%s 的别名"
-
-#: parse-options.c:892
-#, c-format
-msgid "unknown option `%s'"
-msgstr "未知选项 `%s'"
-
-#: parse-options.c:894
-#, c-format
-msgid "unknown switch `%c'"
-msgstr "未知开关 `%c'"
-
-#: parse-options.c:896
-#, c-format
-msgid "unknown non-ascii option in string: `%s'"
-msgstr "字符串中未知的非 ascii 字符选项：`%s'"
-
-#: parse-options.c:920
-msgid "..."
-msgstr "..."
-
-#: parse-options.c:934
-#, c-format
-msgid "usage: %s"
-msgstr "用法：%s"
-
-#. TRANSLATORS: the colon here should align with the
-#. one in "usage: %s" translation.
-#.
-#: parse-options.c:949
-#, 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:970
-#, c-format
-msgid "%*s%s"
-msgstr "%*s%s"
-
-#  译者：为保证在输出中对齐，注意调整句中空格！
-#: parse-options.c:993
-#, c-format
-msgid "    %s"
-msgstr "    %s"
-
-#: parse-options.c:1040
-msgid "-NUM"
-msgstr "-数字"
-
-#: path.c:922
-#, c-format
-msgid "Could not make %s writable by group"
-msgstr "不能设置 %s 为组可写"
-
-#: pathspec.c:150
-msgid "Escape character '\\' not allowed as last character in attr value"
-msgstr "转义字符 '\\' 不能作为属性值的最后一个字符"
-
-#: pathspec.c:168
-msgid "Only one 'attr:' specification is allowed."
-msgstr "只允许一个 'attr:' 规格。"
-
-#: pathspec.c:171
-msgid "attr spec must not be empty"
-msgstr "属性规格不能为空"
-
-#: pathspec.c:214
-#, c-format
-msgid "invalid attribute name %s"
-msgstr "无效的属性名 %s"
-
-#: pathspec.c:279
-msgid "global 'glob' and 'noglob' pathspec settings are incompatible"
-msgstr "全局的 'glob' 和 'noglob' 路径规格设置不兼容"
-
-#: pathspec.c:286
-msgid ""
-"global 'literal' pathspec setting is incompatible with all other global "
-"pathspec settings"
-msgstr "全局的 'literal' 路径规格设置和其它的全局路径规格设置不兼容"
-
-#: pathspec.c:326
-msgid "invalid parameter for pathspec magic 'prefix'"
-msgstr "路径规格包含无效的神奇前缀"
-
-#: pathspec.c:347
-#, c-format
-msgid "Invalid pathspec magic '%.*s' in '%s'"
-msgstr "在路径规格 '%3$s' 中无效的神奇前缀 '%2$.*1$s'"
-
-#: pathspec.c:352
-#, c-format
-msgid "Missing ')' at the end of pathspec magic in '%s'"
-msgstr "路径规格 '%s' 的神奇前缀结尾少了一个 ')'"
-
-#: pathspec.c:390
-#, c-format
-msgid "Unimplemented pathspec magic '%c' in '%s'"
-msgstr "路径规格 '%2$s' 中包含未实现的神奇前缀 '%1$c'"
-
-#: pathspec.c:449
-#, c-format
-msgid "%s: 'literal' and 'glob' are incompatible"
-msgstr "%s：'literal' 和 'glob' 不兼容"
-
-#: pathspec.c:465
-#, c-format
-msgid "%s: '%s' is outside repository at '%s'"
-msgstr "%s：'%s' 在位于 '%s' 的仓库之外"
-
-#: pathspec.c:541
-#, c-format
-msgid "'%s' (mnemonic: '%c')"
-msgstr "'%s'（助记符：'%c'）"
-
-#: pathspec.c:551
-#, c-format
-msgid "%s: pathspec magic not supported by this command: %s"
-msgstr "%s：路径规格神奇前缀不被此命令支持：%s"
-
-#: pathspec.c:618
-#, c-format
-msgid "pathspec '%s' is beyond a symbolic link"
-msgstr "路径规格 '%s' 位于符号链接中"
-
-#: pathspec.c:663
-#, c-format
-msgid "line is badly quoted: %s"
-msgstr "行被错误地引用：%s"
-
-#: pkt-line.c:92
-msgid "unable to write flush packet"
-msgstr "无法写 flush 包"
-
-#: pkt-line.c:99
-msgid "unable to write delim packet"
-msgstr "无法写 delim 包"
-
-#: pkt-line.c:106
-msgid "unable to write response end packet"
-msgstr "无法写入响应结束数据包"
-
-#: pkt-line.c:113
-msgid "flush packet write failed"
-msgstr "flush 包写错误"
-
-#: pkt-line.c:153
-msgid "protocol error: impossibly long line"
-msgstr "协议错误：不可能的长行"
-
-#: pkt-line.c:169 pkt-line.c:171
-msgid "packet write with format failed"
-msgstr "格式化包写入错误"
-
-#: pkt-line.c:204 pkt-line.c:252
-msgid "packet write failed - data exceeds max packet size"
-msgstr "写数据包失败：数据超过了包的最大长度"
-
-#: pkt-line.c:222
-#, c-format
-msgid "packet write failed: %s"
-msgstr "数据包写入失败：%s"
-
-#: pkt-line.c:349 pkt-line.c:350
-msgid "read error"
-msgstr "读取错误"
-
-#: pkt-line.c:360 pkt-line.c:361
-msgid "the remote end hung up unexpectedly"
-msgstr "远端意外挂断了"
-
-#: pkt-line.c:417 pkt-line.c:419
-#, c-format
-msgid "protocol error: bad line length character: %.4s"
-msgstr "协议错误：错误的行长度字符串：%.4s"
-
-#: pkt-line.c:434 pkt-line.c:436 pkt-line.c:442 pkt-line.c:444
-#, c-format
-msgid "protocol error: bad line length %d"
-msgstr "协议错误：错误的行长度 %d"
-
-#: pkt-line.c:472 sideband.c:165
-#, c-format
-msgid "remote error: %s"
-msgstr "远程错误：%s"
-
-#: preload-index.c:125
-msgid "Refreshing index"
-msgstr "正在刷新索引"
-
-#: preload-index.c:144
-#, c-format
-msgid "unable to create threaded lstat: %s"
-msgstr "无法创建线程 lstat：%s"
-
-#: pretty.c:1051
-msgid "unable to parse --pretty format"
-msgstr "不能解析 --pretty 格式"
-
-#: promisor-remote.c:31
-msgid "promisor-remote: unable to fork off fetch subprocess"
-msgstr "promisor-remote：无法派生 fetch 子进程"
-
-#: promisor-remote.c:38 promisor-remote.c:40
-msgid "promisor-remote: could not write to fetch subprocess"
-msgstr "promisor-remote：无法向 fetch 子进程写入"
-
-#: promisor-remote.c:44
-msgid "promisor-remote: could not close stdin to fetch subprocess"
-msgstr "promisor-remote：无法关闭至 fetch 子进程的标准输入"
-
-#: promisor-remote.c:54
-#, c-format
-msgid "promisor remote name cannot begin with '/': %s"
-msgstr "promisor 远程名称不能以 '/' 开始：%s"
-
-#: protocol-caps.c:103
-msgid "object-info: expected flush after arguments"
-msgstr "object-info：在参数之后应有一个 flush"
-
-#: prune-packed.c:35
-msgid "Removing duplicate objects"
-msgstr "正在删除重复对象"
-
-#: range-diff.c:68
-msgid "could not start `log`"
-msgstr "不能启动 `log`"
-
-#: range-diff.c:70
-msgid "could not read `log` output"
-msgstr "不能读取 `log` 的输出"
-
-#: range-diff.c:98 sequencer.c:5575
-#, c-format
-msgid "could not parse commit '%s'"
-msgstr "不能解析提交 '%s'"
-
-#: range-diff.c:109
-#, c-format
-msgid ""
-"could not parse first line of `log` output: did not start with 'commit ': "
-"'%s'"
-msgstr "无法解析 `log` 输出的首行：不是以 'commit ' 开头：'%s'"
-
-#: range-diff.c:132
-#, c-format
-msgid "could not parse git header '%.*s'"
-msgstr "无法解析 git 头 '%.*s'"
-
-#: range-diff.c:300
-msgid "failed to generate diff"
-msgstr "无法生成 diff"
-
-#: range-diff.c:558 range-diff.c:560
-#, c-format
-msgid "could not parse log for '%s'"
-msgstr "不能解析 '%s' 的日志"
-
-#: read-cache.c:737
-#, c-format
-msgid "will not add file alias '%s' ('%s' already exists in index)"
-msgstr "将不会添加文件别名 '%s'（'%s' 已经存在于索引中）"
-
-#: read-cache.c:753
-msgid "cannot create an empty blob in the object database"
-msgstr "不能在对象数据库中创建空的数据对象"
-
-#: read-cache.c:775
-#, c-format
-msgid "%s: can only add regular files, symbolic links or git-directories"
-msgstr "%s：只能添加常规文件、符号链接或 git 目录"
-
-#: read-cache.c:780 builtin/submodule--helper.c:3359
-#, c-format
-msgid "'%s' does not have a commit checked out"
-msgstr "'%s' 没有检出一个提交"
-
-#: read-cache.c:832
-#, c-format
-msgid "unable to index file '%s'"
-msgstr "无法索引文件 '%s'"
-
-#: read-cache.c:851
-#, c-format
-msgid "unable to add '%s' to index"
-msgstr "无法在索引中添加 '%s'"
-
-#: read-cache.c:862
-#, c-format
-msgid "unable to stat '%s'"
-msgstr "无法对 %s 执行 stat"
-
-#: read-cache.c:1404
-#, c-format
-msgid "'%s' appears as both a file and as a directory"
-msgstr "'%s' 看起来既是文件又是目录"
-
-#: read-cache.c:1619
-msgid "Refresh index"
-msgstr "刷新索引"
-
-#: read-cache.c:1751
-#, c-format
-msgid ""
-"index.version set, but the value is invalid.\n"
-"Using version %i"
-msgstr ""
-"设置了 index.version，但是取值无效。\n"
-"使用版本 %i"
-
-#: read-cache.c:1761
-#, c-format
-msgid ""
-"GIT_INDEX_VERSION set, but the value is invalid.\n"
-"Using version %i"
-msgstr ""
-"设置了 GIT_INDEX_VERSION，但是取值无效。\n"
-"使用版本 %i"
-
-#: read-cache.c:1817
-#, c-format
-msgid "bad signature 0x%08x"
-msgstr "坏的签名 0x%08x"
-
-#: read-cache.c:1820
-#, c-format
-msgid "bad index version %d"
-msgstr "坏的索引版本 %d"
-
-#: read-cache.c:1829
-msgid "bad index file sha1 signature"
-msgstr "坏的索引文件 sha1 签名"
-
-#: read-cache.c:1863
-#, c-format
-msgid "index uses %.4s extension, which we do not understand"
-msgstr "索引使用不被支持的 %.4s 扩展"
-
-# 	
-#: read-cache.c:1865
-#, c-format
-msgid "ignoring %.4s extension"
-msgstr "忽略 %.4s 扩展"
-
-#: read-cache.c:1902
-#, c-format
-msgid "unknown index entry format 0x%08x"
-msgstr "未知的索引条目格式 0x%08x"
-
-#: read-cache.c:1918
-#, c-format
-msgid "malformed name field in the index, near path '%s'"
-msgstr "索引中靠近路径 '%s' 有错误的名称字段"
-
-#: read-cache.c:1975
-msgid "unordered stage entries in index"
-msgstr "索引中有未排序的暂存条目"
-
-#: read-cache.c:1978
-#, c-format
-msgid "multiple stage entries for merged file '%s'"
-msgstr "合并文件 '%s' 有多个暂存条目"
-
-#: read-cache.c:1981
-#, c-format
-msgid "unordered stage entries for '%s'"
-msgstr "'%s' 的未排序暂存条目"
-
-#: read-cache.c:2096 read-cache.c:2402 rerere.c:549 rerere.c:583 rerere.c:1096
-#: submodule.c:1831 builtin/add.c:586 builtin/check-ignore.c:183
-#: builtin/checkout.c:532 builtin/checkout.c:724 builtin/clean.c:1016
-#: builtin/commit.c:379 builtin/diff-tree.c:122 builtin/grep.c:521
-#: builtin/mv.c:148 builtin/reset.c:506 builtin/rm.c:293
-#: builtin/submodule--helper.c:335 builtin/submodule--helper.c:3319
-msgid "index file corrupt"
-msgstr "索引文件损坏"
-
-#: read-cache.c:2240
-#, c-format
-msgid "unable to create load_cache_entries thread: %s"
-msgstr "无法创建 load_cache_entries 线程：%s"
-
-#: read-cache.c:2253
-#, c-format
-msgid "unable to join load_cache_entries thread: %s"
-msgstr "无法加入 load_cache_entries 线程：%s"
-
-#: read-cache.c:2286
-#, c-format
-msgid "%s: index file open failed"
-msgstr "%s：打开索引文件失败"
-
-#: read-cache.c:2290
-#, c-format
-msgid "%s: cannot stat the open index"
-msgstr "%s：不能对打开的索引执行 stat 操作"
-
-#: read-cache.c:2294
-#, c-format
-msgid "%s: index file smaller than expected"
-msgstr "%s：索引文件比预期的小"
-
-#: read-cache.c:2298
-#, c-format
-msgid "%s: unable to map index file%s"
-msgstr "%s：无法映射索引文件%s"
-
-#: read-cache.c:2341
-#, c-format
-msgid "unable to create load_index_extensions thread: %s"
-msgstr "无法创建 load_index_extensions 线程：%s"
-
-#: read-cache.c:2368
-#, c-format
-msgid "unable to join load_index_extensions thread: %s"
-msgstr "无法加入 load_index_extensions 线程：%s"
-
-#: read-cache.c:2414
-#, c-format
-msgid "could not freshen shared index '%s'"
-msgstr "无法刷新共享索引 '%s'"
-
-#: read-cache.c:2473
-#, c-format
-msgid "broken index, expect %s in %s, got %s"
-msgstr "损坏的索引，期望在 %2$s 中的 %1$s，得到 %3$s"
-
-#: read-cache.c:3032
-msgid "cannot write split index for a sparse index"
-msgstr "无法为稀疏索引写入拆分索引"
-
-#: read-cache.c:3114 strbuf.c:1192 wrapper.c:717 builtin/merge.c:1156
-#, c-format
-msgid "could not close '%s'"
-msgstr "不能关闭 '%s'"
-
-#: read-cache.c:3157
-msgid "failed to convert to a sparse-index"
-msgstr "无法转换为稀疏索引"
-
-#: read-cache.c:3228
-#, c-format
-msgid "could not stat '%s'"
-msgstr "不能对 '%s' 调用 stat"
-
-#: read-cache.c:3241
-#, c-format
-msgid "unable to open git dir: %s"
-msgstr "不能打开 git 目录：%s"
-
-#: read-cache.c:3253
-#, c-format
-msgid "unable to unlink: %s"
-msgstr "无法删除：%s"
-
-#: read-cache.c:3282
-#, c-format
-msgid "cannot fix permission bits on '%s'"
-msgstr "不能修复 '%s' 的权限位"
-
-#: read-cache.c:3439
-#, c-format
-msgid "%s: cannot drop to stage #0"
-msgstr "%s：不能落到暂存区 #0"
-
-#: rebase-interactive.c:11
-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 ""
-"您可以用 'git rebase --edit-todo' 修正，然后执行 'git rebase --continue'。\n"
-"或者您可以用 'git rebase --abort' 终止变基。\n"
-
-#: rebase-interactive.c:33
-#, c-format
-msgid ""
-"unrecognized setting %s for option rebase.missingCommitsCheck. Ignoring."
-msgstr "选项 rebase.missingCommitsCheck 的值 %s 无法识别。已忽略。"
-
-#: rebase-interactive.c:42
-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 [-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"
-"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 <提交> = 使用提交，但停止以便在 shell 中修补提交\n"
-"s, squash <提交> = 使用提交，但挤压到前一个提交\n"
-"f, fixup [-C | -c] <提交> = 类似于 \"squash\"，但只保留前一个提交\n"
-"                   的提交说明，除非使用了 -C 参数，此情况下则只\n"
-"                   保留本提交说明。使用 -c 和 -C 类似，但会打开\n"
-"                   编辑器修改提交说明\n"
-"x, exec <命令> = 使用 shell 运行命令（此行剩余部分）\n"
-"b, break = 在此处停止（使用 'git rebase --continue' 继续变基）\n"
-"d, drop <提交> = 删除提交\n"
-"l, label <label> = 为当前 HEAD 打上标记\n"
-"t, reset <label> = 重置 HEAD 到该标记\n"
-"m, merge [-C <commit> | -c <commit>] <label> [# <oneline>]\n"
-".       创建一个合并提交，并使用原始的合并提交说明（如果没有指定\n"
-".       原始提交，使用注释部分的 oneline 作为提交说明）。使用\n"
-".       -c <提交> 可以编辑提交说明。\n"
-"\n"
-"可以对这些行重新排序，将从上至下执行。\n"
-
-#: rebase-interactive.c:66
-#, c-format
-msgid "Rebase %s onto %s (%d command)"
-msgid_plural "Rebase %s onto %s (%d commands)"
-msgstr[0] "变基 %s 到 %s（%d 个提交）"
-msgstr[1] "变基 %s 到 %s（%d 个提交）"
-
-#: rebase-interactive.c:75
-msgid ""
-"\n"
-"Do not remove any line. Use 'drop' explicitly to remove a commit.\n"
-msgstr ""
-"\n"
-"不要删除任意一行。使用 'drop' 显式地删除一个提交。\n"
-
-#: rebase-interactive.c:78
-msgid ""
-"\n"
-"If you remove a line here THAT COMMIT WILL BE LOST.\n"
-msgstr ""
-"\n"
-"如果您在这里删除一行，对应的提交将会丢失。\n"
-
-#: rebase-interactive.c:84
-msgid ""
-"\n"
-"You are editing the todo file of an ongoing interactive rebase.\n"
-"To continue rebase after editing, run:\n"
-"    git rebase --continue\n"
-"\n"
-msgstr ""
-"\n"
-"您正在修改进行中的交互式变基待办列表。若要在编辑结束后继续变基，\n"
-"请执行：\n"
-"    git rebase --continue\n"
-"\n"
-
-#: rebase-interactive.c:89
-msgid ""
-"\n"
-"However, if you remove everything, the rebase will be aborted.\n"
-"\n"
-msgstr ""
-"\n"
-"然而，如果您删除全部内容，变基操作将会终止。\n"
-"\n"
-
-#: rebase-interactive.c:113 rerere.c:469 rerere.c:677 sequencer.c:3879
-#: sequencer.c:3905 sequencer.c:5681 builtin/fsck.c:328 builtin/gc.c:1791
-#: builtin/rebase.c:191
-#, c-format
-msgid "could not write '%s'"
-msgstr "不能写入 '%s'"
-
-#: rebase-interactive.c:119
-#, c-format
-msgid "could not write '%s'."
-msgstr "不能写入 '%s'。"
-
-#: rebase-interactive.c:196
-#, c-format
-msgid ""
-"Warning: some commits may have been dropped accidentally.\n"
-"Dropped commits (newer to older):\n"
-msgstr ""
-"警告：一些提交可能被意外丢弃。\n"
-"丢弃的提交（从新到旧）：\n"
-
-#: rebase-interactive.c:203
-#, c-format
-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"
-"The possible behaviours are: ignore, warn, error.\n"
-"\n"
-msgstr ""
-"为避免这条信息，使用 \"drop\" 指令显式地删除一个提交。\n"
-"\n"
-"使用 'git config rebase.missingCommitsCheck' 来修改警告级别。\n"
-"可选值有：ignore、warn、error。\n"
-"\n"
-
-#: rebase.c:29
-#, c-format
-msgid "%s: 'preserve' superseded by 'merges'"
-msgstr "%s：'preserve' 被 'merges' 取代"
-
-#: ref-filter.c:42 wt-status.c:2057
-msgid "gone"
-msgstr "丢失"
-
-#: ref-filter.c:43
-#, c-format
-msgid "ahead %d"
-msgstr "领先 %d"
-
-#: ref-filter.c:44
-#, c-format
-msgid "behind %d"
-msgstr "落后 %d"
-
-#: ref-filter.c:45
-#, c-format
-msgid "ahead %d, behind %d"
-msgstr "领先 %d，落后 %d"
-
-#: ref-filter.c:235
-#, c-format
-msgid "expected format: %%(color:<color>)"
-msgstr "期望的格式：%%(color:<颜色>)"
-
-#: ref-filter.c:237
-#, c-format
-msgid "unrecognized color: %%(color:%s)"
-msgstr "未能识别的颜色：%%(color:%s)"
-
-#: ref-filter.c:259
-#, c-format
-msgid "Integer value expected refname:lstrip=%s"
-msgstr "期望整数值 refname:lstrip=%s"
-
-#: ref-filter.c:263
-#, c-format
-msgid "Integer value expected refname:rstrip=%s"
-msgstr "期望整数值 refname:rstrip=%s"
-
-#: ref-filter.c:265 ref-filter.c:344 ref-filter.c:377 ref-filter.c:431
-#: ref-filter.c:443 ref-filter.c:462 ref-filter.c:534 ref-filter.c:560
-#, c-format
-msgid "unrecognized %%(%s) argument: %s"
-msgstr "未能识别的 %%(%s) 参数：%s"
-
-#: ref-filter.c:320
-#, c-format
-msgid "%%(objecttype) does not take arguments"
-msgstr "%%(objecttype) 不带参数"
-
-#: ref-filter.c:352
-#, c-format
-msgid "%%(deltabase) does not take arguments"
-msgstr "%%(deltabase) 不带参数"
-
-#: ref-filter.c:364
-#, c-format
-msgid "%%(body) does not take arguments"
-msgstr "%%(body) 不带参数"
-
-#: ref-filter.c:396
-#, c-format
-msgid "expected %%(trailers:key=<value>)"
-msgstr "预期 %%(trailers:key=<值>)"
-
-#: ref-filter.c:398
-#, c-format
-msgid "unknown %%(trailers) argument: %s"
-msgstr "未知的 %%(trailers) 参数：%s"
-
-#: ref-filter.c:429
-#, c-format
-msgid "positive value expected contents:lines=%s"
-msgstr "期望一个正数 contents:lines=%s"
-
-#: ref-filter.c:458
-#, c-format
-msgid "positive value expected '%s' in %%(%s)"
-msgstr "期望 %%(%2$s) 中的 '%1$s' 是一个正数"
-
-#: ref-filter.c:476
-#, c-format
-msgid "unrecognized email option: %s"
-msgstr "未识别的邮件选项：%s"
-
-#: ref-filter.c:506
-#, c-format
-msgid "expected format: %%(align:<width>,<position>)"
-msgstr "期望的格式：%%(align:<宽度>,<位置>)"
-
-#: ref-filter.c:518
-#, c-format
-msgid "unrecognized position:%s"
-msgstr "未能识别的位置：%s"
-
-#: ref-filter.c:525
-#, c-format
-msgid "unrecognized width:%s"
-msgstr "未能识别的宽度：%s"
-
-#: ref-filter.c:542
-#, c-format
-msgid "positive width expected with the %%(align) atom"
-msgstr "元素 %%(align) 需要一个正数的宽度"
-
-#: 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:707
-#, c-format
-msgid "unknown field name: %.*s"
-msgstr "未知的字段名：%.*s"
-
-#: 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:844 ref-filter.c:910 ref-filter.c:946 ref-filter.c:948
-#, c-format
-msgid "format: %%(%s) atom used without a %%(%s) atom"
-msgstr "格式：在没有 %%(%2$s) 元素的情况下使用了 %%(%1$s) 元素"
-
-#: ref-filter.c:912
-#, c-format
-msgid "format: %%(then) atom used more than once"
-msgstr "格式：%%(then) 元素用了多次"
-
-#: ref-filter.c:914
-#, c-format
-msgid "format: %%(then) atom used after %%(else)"
-msgstr "格式：%%(then) 元素用在了 %%(else) 之后"
-
-#: ref-filter.c:950
-#, c-format
-msgid "format: %%(else) atom used more than once"
-msgstr "格式：%%(else) 元素用了多次"
-
-#: ref-filter.c:965
-#, c-format
-msgid "format: %%(end) atom used without corresponding atom"
-msgstr "格式：使用了 %%(end) 元素却没有它的对应元素"
-
-#: ref-filter.c:1027
-#, c-format
-msgid "malformed format string %s"
-msgstr "错误的格式化字符串 %s"
-
-#: 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:1707
-#, c-format
-msgid "(no branch, rebasing %s)"
-msgstr "（非分支，正变基 %s）"
-
-#: ref-filter.c:1710
-#, c-format
-msgid "(no branch, rebasing detached HEAD %s)"
-msgstr "（非分支，正变基分离头指针 %s）"
-
-#: ref-filter.c:1713
-#, c-format
-msgid "(no branch, bisect started on %s)"
-msgstr "（非分支，二分查找开始于 %s）"
-
-#: ref-filter.c:1717
-#, c-format
-msgid "(HEAD detached at %s)"
-msgstr "（头指针在 %s 分离）"
-
-#: ref-filter.c:1720
-#, c-format
-msgid "(HEAD detached from %s)"
-msgstr "（头指针自 %s 分离）"
-
-#: ref-filter.c:1723
-msgid "(no branch)"
-msgstr "（非分支）"
-
-#: ref-filter.c:1755 ref-filter.c:1973
-#, c-format
-msgid "missing object %s for %s"
-msgstr "缺失 %2$s 的对象 %1$s"
-
-#: ref-filter.c:1765
-#, c-format
-msgid "parse_object_buffer failed on %s for %s"
-msgstr "parse_object_buffer 失败于 %2$s 的 %1$s"
-
-#: ref-filter.c:2156
-#, c-format
-msgid "malformed object at '%s'"
-msgstr "格式错误的对象 '%s'"
-
-#: ref-filter.c:2246
-#, c-format
-msgid "ignoring ref with broken name %s"
-msgstr "忽略带有错误名称 %s 的引用"
-
-#: ref-filter.c:2251 refs.c:672
-#, c-format
-msgid "ignoring broken ref %s"
-msgstr "忽略损坏的引用 %s"
-
-#: ref-filter.c:2630
-#, c-format
-msgid "format: %%(end) atom missing"
-msgstr "格式：缺少 %%(end) 元素"
-
-#: ref-filter.c:2741
-#, c-format
-msgid "malformed object name %s"
-msgstr "格式错误的对象名 %s"
-
-#: ref-filter.c:2746
-#, c-format
-msgid "option `%s' must point to a commit"
-msgstr "选项 `%s' 必须指向一个提交"
-
-#: reflog.c:407
-#, c-format
-msgid "not a reflog: %s"
-msgstr "不是一个引用日志：%s"
-
-#: reflog.c:410
-#, c-format
-msgid "no reflog for '%s'"
-msgstr "没有 '%s' 的引用日志"
-
-#: refs.c:262
-#, c-format
-msgid "%s does not point to a valid object!"
-msgstr "%s 没有指向一个有效的对象！"
-
-#: refs.c:561
-#, 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"
-"of your new repositories, which will suppress this warning, call:\n"
-"\n"
-"\tgit config --global init.defaultBranch <name>\n"
-"\n"
-"Names commonly chosen instead of 'master' are 'main', 'trunk' and\n"
-"'development'. The just-created branch can be renamed via this command:\n"
-"\n"
-"\tgit branch -m <name>\n"
-msgstr ""
-"使用 '%s' 作为初始分支的名称。这个默认分支名称可能会更改。要在新仓库中\n"
-"配置使用初始分支名，并消除这条警告，请执行：\n"
-"\n"
-"\tgit config --global init.defaultBranch <名称>\n"
-"\n"
-"除了 'master' 之外，通常选定的名字有 'main'、'trunk' 和 'development'。\n"
-"可以通过以下命令重命名刚创建的分支：\n"
-"\n"
-"\tgit branch -m <name>\n"
-
-#: refs.c:583
-#, c-format
-msgid "could not retrieve `%s`"
-msgstr "无法获取 `%s`"
-
-#: refs.c:593
-#, c-format
-msgid "invalid branch name: %s = %s"
-msgstr "无效的分支名：%s = %s"
-
-#: refs.c:670
-#, c-format
-msgid "ignoring dangling symref %s"
-msgstr "忽略悬空符号引用 %s"
-
-#: refs.c:919
-#, c-format
-msgid "log for ref %s has gap after %s"
-msgstr "引用 %s 的日志在 %s 之后有缺口"
-
-#: refs.c:926
-#, c-format
-msgid "log for ref %s unexpectedly ended on %s"
-msgstr "引用 %s 的日志意外终止于 %s "
-
-#: refs.c:991
-#, c-format
-msgid "log for %s is empty"
-msgstr "%s 的日志为空"
-
-#: refs.c:1086
-#, c-format
-msgid "refusing to update ref with bad name '%s'"
-msgstr "拒绝更新有错误名称 '%s' 的引用"
-
-#: refs.c:1164
-#, c-format
-msgid "update_ref failed for ref '%s': %s"
-msgstr "对引用 '%s' 执行 update_ref 失败：%s"
-
-#: refs.c:2059
-#, c-format
-msgid "multiple updates for ref '%s' not allowed"
-msgstr "不允许对引用 '%s' 多次更新"
-
-#: refs.c:2145
-msgid "ref updates forbidden inside quarantine environment"
-msgstr "在隔离环境中禁止更新引用"
-
-#: refs.c:2156
-msgid "ref updates aborted by hook"
-msgstr "引用更新被钩子中止"
-
-#: refs.c:2264 refs.c:2294
-#, c-format
-msgid "'%s' exists; cannot create '%s'"
-msgstr "'%s' 已存在，无法创建 '%s'"
-
-#: refs.c:2270 refs.c:2305
-#, c-format
-msgid "cannot process '%s' and '%s' at the same time"
-msgstr "无法同时处理 '%s' 和 '%s'"
-
-#: refs/files-backend.c:1295
-#, c-format
-msgid "could not remove reference %s"
-msgstr "无法删除引用 %s"
-
-#: refs/files-backend.c:1310 refs/packed-backend.c:1565
-#: refs/packed-backend.c:1575
-#, c-format
-msgid "could not delete reference %s: %s"
-msgstr "无法删除引用 %s：%s"
-
-#: refs/files-backend.c:1313 refs/packed-backend.c:1578
-#, c-format
-msgid "could not delete references: %s"
-msgstr "无法删除引用：%s"
-
-#: refspec.c:170
-#, c-format
-msgid "invalid refspec '%s'"
-msgstr "无效的引用规格：'%s'"
-
-#: remote.c:402
-#, c-format
-msgid "config remote shorthand cannot begin with '/': %s"
-msgstr "配置的远程短名称不能以 '/' 开始：%s"
-
-#: remote.c:450
-msgid "more than one receivepack given, using the first"
-msgstr "提供了一个以上的 receivepack，使用第一个"
-
-#: remote.c:458
-msgid "more than one uploadpack given, using the first"
-msgstr "提供了一个以上的 uploadpack，使用第一个"
-
-#: remote.c:698
-#, c-format
-msgid "Cannot fetch both %s and %s to %s"
-msgstr "不能同时获取 %s 和 %s 至 %s"
-
-#: remote.c:702
-#, c-format
-msgid "%s usually tracks %s, not %s"
-msgstr "%s 通常跟踪 %s，而非 %s"
-
-#: remote.c:706
-#, c-format
-msgid "%s tracks both %s and %s"
-msgstr "%s 同时跟踪 %s 和 %s"
-
-#: remote.c:774
-#, c-format
-msgid "key '%s' of pattern had no '*'"
-msgstr "模式的键 '%s' 没有 '*'"
-
-#: remote.c:784
-#, c-format
-msgid "value '%s' of pattern has no '*'"
-msgstr "模式的值 '%s' 没有 '*'"
-
-#: remote.c:1191
-#, c-format
-msgid "src refspec %s does not match any"
-msgstr "源引用规格 %s 没有匹配"
-
-#: remote.c:1196
-#, c-format
-msgid "src refspec %s matches more than one"
-msgstr "源引用规格 %s 匹配超过一个"
-
-#. TRANSLATORS: "matches '%s'%" is the <dst> part of "git push
-#. <remote> <src>:<dst>" push, and "being pushed ('%s')" is
-#. the <src>.
-#.
-#: remote.c:1211
-#, c-format
-msgid ""
-"The destination you provided is not a full refname (i.e.,\n"
-"starting with \"refs/\"). We tried to guess what you meant by:\n"
-"\n"
-"- Looking for a ref that matches '%s' on the remote side.\n"
-"- Checking if the <src> being pushed ('%s')\n"
-"  is a ref in \"refs/{heads,tags}/\". If so we add a corresponding\n"
-"  refs/{heads,tags}/ prefix on the remote side.\n"
-"\n"
-"Neither worked, so we gave up. You must fully qualify the ref."
-msgstr ""
-"您提供的目标不是一个完整的引用名称（即以 \"refs/\" 开头）。我们\n"
-"试着猜测您的想法：\n"
-"\n"
-"- 在远端查询和 '%s' 匹配的引用。\n"
-"- 检查要推送的 <src>（'%s'）是不是在 \"refs/{heads,tags}/\" 中的\n"
-"  引用。如果是，我们会在对应的远端添加 refs/{heads,tags}/ 前缀。\n"
-"\n"
-"都不行，所以我们已放弃。您必须给出完整的引用。"
-
-#: remote.c:1231
-#, c-format
-msgid ""
-"The <src> part of the refspec is a commit object.\n"
-"Did you mean to create a new branch by pushing to\n"
-"'%s:refs/heads/%s'?"
-msgstr ""
-"引用规格的 <src> 是一个提交对象。您是想创建一个新的分支而向\n"
-"'%s:refs/heads/%s' 推送么？"
-
-#: remote.c:1236
-#, c-format
-msgid ""
-"The <src> part of the refspec is a tag object.\n"
-"Did you mean to create a new tag by pushing to\n"
-"'%s:refs/tags/%s'?"
-msgstr ""
-"引用规格的 <src> 是一个标签对象。您是想创建一个新的标签而向\n"
-"'%s:refs/tags/%s' 推送么？"
-
-#: remote.c:1241
-#, c-format
-msgid ""
-"The <src> part of the refspec is a tree object.\n"
-"Did you mean to tag a new tree by pushing to\n"
-"'%s:refs/tags/%s'?"
-msgstr ""
-"引用规格的 <src> 是一个树对象。您是想为这个树对象创建标签而向\n"
-"'%s:refs/tags/%s' 推送么？"
-
-#: remote.c:1246
-#, c-format
-msgid ""
-"The <src> part of the refspec is a blob object.\n"
-"Did you mean to tag a new blob by pushing to\n"
-"'%s:refs/tags/%s'?"
-msgstr ""
-"引用规格的 <src> 是一个数据对象。您是想为这个数据对象创建标签而向\n"
-"'%s:refs/tags/%s' 推送么？"
-
-#: remote.c:1282
-#, c-format
-msgid "%s cannot be resolved to branch"
-msgstr "%s 无法被解析为分支"
-
-#: remote.c:1293
-#, c-format
-msgid "unable to delete '%s': remote ref does not exist"
-msgstr "无法删除 '%s'：远程引用不存在"
-
-#: remote.c:1305
-#, c-format
-msgid "dst refspec %s matches more than one"
-msgstr "目标引用规格 %s 匹配超过一个"
-
-#: remote.c:1312
-#, c-format
-msgid "dst ref %s receives from more than one src"
-msgstr "目标引用 %s 接收超过一个源"
-
-#: remote.c:1833 remote.c:1940
-msgid "HEAD does not point to a branch"
-msgstr "HEAD 没有指向一个分支"
-
-#: remote.c:1842
-#, c-format
-msgid "no such branch: '%s'"
-msgstr "没有此分支：'%s'"
-
-#: remote.c:1845
-#, c-format
-msgid "no upstream configured for branch '%s'"
-msgstr "尚未给分支 '%s' 设置上游"
-
-#: remote.c:1851
-#, c-format
-msgid "upstream branch '%s' not stored as a remote-tracking branch"
-msgstr "上游分支 '%s' 没有存储为一个远程跟踪分支"
-
-#: remote.c:1866
-#, c-format
-msgid "push destination '%s' on remote '%s' has no local tracking branch"
-msgstr "推送目标 '%s' 至远程 '%s' 没有本地跟踪分支"
-
-#: remote.c:1881
-#, c-format
-msgid "branch '%s' has no remote for pushing"
-msgstr "分支 '%s' 没有设置要推送的远程服务器"
-
-#: remote.c:1891
-#, c-format
-msgid "push refspecs for '%s' do not include '%s'"
-msgstr "向 '%s' 推送引用规格未包含 '%s'"
-
-#: remote.c:1904
-msgid "push has no destination (push.default is 'nothing')"
-msgstr "推送无目标（push.default 是 'nothing'）"
-
-#: remote.c:1926
-msgid "cannot resolve 'simple' push to a single destination"
-msgstr "无法解析 'simple' 推送至一个单独的目标"
-
-#: remote.c:2059
-#, c-format
-msgid "couldn't find remote ref %s"
-msgstr "无法找到远程引用 %s"
-
-#: remote.c:2072
-#, c-format
-msgid "* Ignoring funny ref '%s' locally"
-msgstr "* 在本地忽略可笑的引用 '%s'"
-
-#: remote.c:2235
-#, c-format
-msgid "Your branch is based on '%s', but the upstream is gone.\n"
-msgstr "您的分支基于 '%s'，但此上游分支已经不存在。\n"
-
-#: remote.c:2239
-msgid "  (use \"git branch --unset-upstream\" to fixup)\n"
-msgstr "  （使用 \"git branch --unset-upstream\" 来修复）\n"
-
-#: remote.c:2242
-#, c-format
-msgid "Your branch is up to date with '%s'.\n"
-msgstr "您的分支与上游分支 '%s' 一致。\n"
-
-#: remote.c:2246
-#, c-format
-msgid "Your branch and '%s' refer to different commits.\n"
-msgstr "您的分支和 '%s' 指向不同的提交。\n"
-
-#: remote.c:2249
-#, c-format
-msgid "  (use \"%s\" for details)\n"
-msgstr "  （使用 \"%s\" 查看详情）\n"
-
-#: remote.c:2253
-#, c-format
-msgid "Your branch is ahead of '%s' by %d commit.\n"
-msgid_plural "Your branch is ahead of '%s' by %d commits.\n"
-msgstr[0] "您的分支领先 '%s' 共 %d 个提交。\n"
-msgstr[1] "您的分支领先 '%s' 共 %d 个提交。\n"
-
-#: remote.c:2259
-msgid "  (use \"git push\" to publish your local commits)\n"
-msgstr "  （使用 \"git push\" 来发布您的本地提交）\n"
-
-#: remote.c:2262
-#, c-format
-msgid "Your branch is behind '%s' by %d commit, and can be fast-forwarded.\n"
-msgid_plural ""
-"Your branch is behind '%s' by %d commits, and can be fast-forwarded.\n"
-msgstr[0] "您的分支落后 '%s' 共 %d 个提交，并且可以快进。\n"
-msgstr[1] "您的分支落后 '%s' 共 %d 个提交，并且可以快进。\n"
-
-#  译者：注意保持前导空格
-#: remote.c:2270
-msgid "  (use \"git pull\" to update your local branch)\n"
-msgstr "  （使用 \"git pull\" 来更新您的本地分支）\n"
-
-#: remote.c:2273
-#, c-format
-msgid ""
-"Your branch and '%s' have diverged,\n"
-"and have %d and %d different commit each, respectively.\n"
-msgid_plural ""
-"Your branch and '%s' have diverged,\n"
-"and have %d and %d different commits each, respectively.\n"
-msgstr[0] ""
-"您的分支和 '%s' 出现了偏离，\n"
-"并且分别有 %d 和 %d 处不同的提交。\n"
-msgstr[1] ""
-"您的分支和 '%s' 出现了偏离，\n"
-"并且分别有 %d 和 %d 处不同的提交。\n"
-
-#  译者：注意保持前导空格
-#: remote.c:2283
-msgid "  (use \"git pull\" to merge the remote branch into yours)\n"
-msgstr "  （使用 \"git pull\" 来合并远程分支）\n"
-
-#: remote.c:2475
-#, c-format
-msgid "cannot parse expected object name '%s'"
-msgstr "无法解析期望的对象名 '%s'"
-
-#: replace-object.c:21
-#, c-format
-msgid "bad replace ref name: %s"
-msgstr "错误的替换引用名称：%s"
-
-#: replace-object.c:30
-#, c-format
-msgid "duplicate replace ref: %s"
-msgstr "重复的替换引用：%s"
-
-#: replace-object.c:82
-#, c-format
-msgid "replace depth too high for object %s"
-msgstr "对象 %s 的替换层级太深"
-
-#: rerere.c:201 rerere.c:210 rerere.c:213
-msgid "corrupt MERGE_RR"
-msgstr "损坏的 MERGE_RR"
-
-#: rerere.c:248 rerere.c:253
-msgid "unable to write rerere record"
-msgstr "无法写入 rerere 记录"
-
-#: rerere.c:479
-#, c-format
-msgid "there were errors while writing '%s' (%s)"
-msgstr "写入 '%s' (%s) 时出错"
-
-#: rerere.c:482 builtin/gc.c:2263 builtin/gc.c:2298
-#, c-format
-msgid "failed to flush '%s'"
-msgstr "无法刷新 '%s'"
-
-#: rerere.c:487 rerere.c:1024
-#, c-format
-msgid "could not parse conflict hunks in '%s'"
-msgstr "不能解析 '%s' 中的冲突块"
-
-#: rerere.c:669
-#, c-format
-msgid "failed utime() on '%s'"
-msgstr "在 '%s' 上调用 utime() 失败"
-
-#: rerere.c:679
-#, c-format
-msgid "writing '%s' failed"
-msgstr "写入 '%s' 失败"
-
-#: rerere.c:699
-#, c-format
-msgid "Staged '%s' using previous resolution."
-msgstr "使用之前的解决方案暂存 '%s'。"
-
-#: rerere.c:738
-#, c-format
-msgid "Recorded resolution for '%s'."
-msgstr "已记录 '%s' 的解决方案。"
-
-#: rerere.c:773
-#, c-format
-msgid "Resolved '%s' using previous resolution."
-msgstr "使用之前的解决方案解决 '%s'。"
-
-#: rerere.c:788
-#, c-format
-msgid "cannot unlink stray '%s'"
-msgstr "不能删除 stray '%s'"
-
-#: rerere.c:792
-#, c-format
-msgid "Recorded preimage for '%s'"
-msgstr "为 '%s' 记录 preimage"
-
-#: rerere.c:866 submodule.c:2290 builtin/log.c:2042
-#: builtin/submodule--helper.c:1786 builtin/submodule--helper.c:1833
-#, c-format
-msgid "could not create directory '%s'"
-msgstr "不能创建目录 '%s'"
-
-#: rerere.c:1042
-#, c-format
-msgid "failed to update conflicted state in '%s'"
-msgstr "无法更新 '%s' 中的冲突状态"
-
-#: rerere.c:1053 rerere.c:1060
-#, c-format
-msgid "no remembered resolution for '%s'"
-msgstr "没有为 '%s' 记忆的解决方案"
-
-#: rerere.c:1062
-#, c-format
-msgid "cannot unlink '%s'"
-msgstr "不能删除 '%s'"
-
-#: rerere.c:1072
-#, c-format
-msgid "Updated preimage for '%s'"
-msgstr "已为 '%s' 更新 preimage"
-
-#: rerere.c:1081
-#, c-format
-msgid "Forgot resolution for '%s'\n"
-msgstr "忘记 '%s' 的解决方案\n"
-
-#: rerere.c:1192
-msgid "unable to open rr-cache directory"
-msgstr "不能打开 rr-cache 目录"
-
-#: reset.c:112
-msgid "could not determine HEAD revision"
-msgstr "不能确定 HEAD 版本"
-
-#: reset.c:141 reset.c:147 sequencer.c:3696
-#, c-format
-msgid "failed to find tree of %s"
-msgstr "无法找到 %s 指向的树"
-
-#: revision.c:2358
-msgid "--unpacked=<packfile> no longer supported"
-msgstr "不再支持 --unpacked=<packfile>"
-
-#: revision.c:2712
-msgid "your current branch appears to be broken"
-msgstr "您的当前分支好像被损坏"
-
-#: revision.c:2715
-#, c-format
-msgid "your current branch '%s' does not have any commits yet"
-msgstr "您的当前分支 '%s' 尚无任何提交"
-
-#: revision.c:2901
-msgid "object filtering requires --objects"
-msgstr "对象过滤需要 --objects"
-
-#: revision.c:2918
-msgid "-L does not yet support diff formats besides -p and -s"
-msgstr "-L 尚不支持 -p 和 -s 之外的差异格式"
-
-#: run-command.c:1262
-#, c-format
-msgid "cannot create async thread: %s"
-msgstr "不能创建 async 线程：%s"
-
-#: send-pack.c:150
-msgid "unexpected flush packet while reading remote unpack status"
-msgstr "读取远程解包状态时收到意外的 flush 包"
-
-#: send-pack.c:152
-#, c-format
-msgid "unable to parse remote unpack status: %s"
-msgstr "不能解析远程解包状态：%s"
-
-#: send-pack.c:154
-#, c-format
-msgid "remote unpack failed: %s"
-msgstr "远程解包失败：%s"
-
-#: send-pack.c:378
-msgid "failed to sign the push certificate"
-msgstr "无法为推送证书签名"
-
-#: send-pack.c:435
-msgid "send-pack: unable to fork off fetch subprocess"
-msgstr "send-pack：无法派生 fetch 子进程"
-
-#: send-pack.c:457
-msgid "push negotiation failed; proceeding anyway with push"
-msgstr "推送协商失败，但还是继续推送"
-
-#: send-pack.c:528
-msgid "the receiving end does not support this repository's hash algorithm"
-msgstr "接收端不支持这个仓库的哈希算法"
-
-#: send-pack.c:537
-msgid "the receiving end does not support --signed push"
-msgstr "接收端不支持签名推送（--signed）"
-
-#: send-pack.c:539
-msgid ""
-"not sending a push certificate since the receiving end does not support --"
-"signed push"
-msgstr "未发送推送证书，因为接收端不支持签名推送（--signed）"
-
-#: send-pack.c:546
-msgid "the receiving end does not support --atomic push"
-msgstr "接收端不支持原子推送（--atomic）"
-
-#: send-pack.c:551
-msgid "the receiving end does not support push options"
-msgstr "接收端不支持推送选项"
-
-#: sequencer.c:197
-#, c-format
-msgid "invalid commit message cleanup mode '%s'"
-msgstr "无效的提交信息清理模式 '%s'"
-
-#: sequencer.c:325
-#, c-format
-msgid "could not delete '%s'"
-msgstr "无法删除 '%s'"
-
-#: sequencer.c:345 sequencer.c:4724 builtin/rebase.c:564 builtin/rebase.c:1326
-#: builtin/rm.c:409
-#, c-format
-msgid "could not remove '%s'"
-msgstr "无法删除 '%s'"
-
-#: sequencer.c:355
-msgid "revert"
-msgstr "还原"
-
-#: sequencer.c:357
-msgid "cherry-pick"
-msgstr "拣选"
-
-#: sequencer.c:359
-msgid "rebase"
-msgstr "变基"
-
-#: sequencer.c:361
-#, c-format
-msgid "unknown action: %d"
-msgstr "未知动作：%d"
-
-#: sequencer.c:420
-msgid ""
-"after resolving the conflicts, mark the corrected paths\n"
-"with 'git add <paths>' or 'git rm <paths>'"
-msgstr ""
-"冲突解决完毕后，用 'git add <路径>' 或 'git rm <路径>'\n"
-"命令标记修正后的文件"
-
-#: sequencer.c:423
-msgid ""
-"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/rm <路径规格>\" 标记它们，\n"
-"然后执行 \"git cherry-pick --continue\"。您也可以执行\n"
-"\"git cherry-pick --skip\" 命令跳过这个提交。如果想要终止执行并回到\n"
-"执行 \"git cherry-pick\" 之前的状态，执行 \"git cherry-pick --abort\"。"
-
-#: 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:3288
-#, c-format
-msgid "could not lock '%s'"
-msgstr "不能锁定 '%s'"
-
-#: sequencer.c:450 sequencer.c:3087 sequencer.c:3292 sequencer.c:3306
-#: sequencer.c:3557 sequencer.c:5591 strbuf.c:1189 wrapper.c:715
-#, c-format
-msgid "could not write to '%s'"
-msgstr "不能写入 '%s'"
-
-#: sequencer.c:455
-#, c-format
-msgid "could not write eol to '%s'"
-msgstr "不能将换行符写入 '%s'"
-
-#: sequencer.c:460 sequencer.c:3092 sequencer.c:3294 sequencer.c:3308
-#: sequencer.c:3565
-#, c-format
-msgid "failed to finalize '%s'"
-msgstr "无法完成 '%s'"
-
-#: sequencer.c:473 sequencer.c:1930 sequencer.c:3112 sequencer.c:3547
-#: sequencer.c:3675 builtin/am.c:290 builtin/commit.c:837 builtin/merge.c:1154
-#, c-format
-msgid "could not read '%s'"
-msgstr "不能读取 '%s'"
-
-#: sequencer.c:499
-#, c-format
-msgid "your local changes would be overwritten by %s."
-msgstr "您的本地修改将被%s覆盖。"
-
-#: sequencer.c:503
-msgid "commit your changes or stash them to proceed."
-msgstr "提交您的修改或贮藏后再继续。"
-
-#: sequencer.c:535
-#, c-format
-msgid "%s: fast-forward"
-msgstr "%s：快进"
-
-#: sequencer.c:574 builtin/tag.c:615
-#, c-format
-msgid "Invalid cleanup mode %s"
-msgstr "无效的清理模式 %s"
-
-#. TRANSLATORS: %s will be "revert", "cherry-pick" or
-#. "rebase".
-#.
-#: sequencer.c:685
-#, c-format
-msgid "%s: Unable to write new index file"
-msgstr "%s：无法写入新索引文件"
-
-#: sequencer.c:699
-msgid "unable to update cache tree"
-msgstr "不能更新缓存树"
-
-#: sequencer.c:713
-msgid "could not resolve HEAD commit"
-msgstr "不能解析 HEAD 提交"
-
-#: sequencer.c:793
-#, c-format
-msgid "no key present in '%.*s'"
-msgstr "在 '%.*s' 中没有 key"
-
-#: sequencer.c:804
-#, c-format
-msgid "unable to dequote value of '%s'"
-msgstr "无法为 '%s' 的值去引号"
-
-#: sequencer.c:841 wrapper.c:219 wrapper.c:389 builtin/am.c:757
-#: builtin/am.c:849 builtin/rebase.c:699
-#, c-format
-msgid "could not open '%s' for reading"
-msgstr "无法打开 '%s' 进行读取"
-
-#: sequencer.c:851
-msgid "'GIT_AUTHOR_NAME' already given"
-msgstr "已经给出 'GIT_AUTHOR_NAME'"
-
-#: sequencer.c:856
-msgid "'GIT_AUTHOR_EMAIL' already given"
-msgstr "已经给出 'GIT_AUTHOR_EMAIL'"
-
-#: sequencer.c:861
-msgid "'GIT_AUTHOR_DATE' already given"
-msgstr "已经给出 'GIT_AUTHOR_DATE'"
-
-#: sequencer.c:865
-#, c-format
-msgid "unknown variable '%s'"
-msgstr "未知变量 '%s'"
-
-#: sequencer.c:870
-msgid "missing 'GIT_AUTHOR_NAME'"
-msgstr "缺少 'GIT_AUTHOR_NAME'"
-
-#: sequencer.c:872
-msgid "missing 'GIT_AUTHOR_EMAIL'"
-msgstr "缺少 'GIT_AUTHOR_EMAIL'"
-
-#: sequencer.c:874
-msgid "missing 'GIT_AUTHOR_DATE'"
-msgstr "缺少 'GIT_AUTHOR_DATE'"
-
-#: sequencer.c:939
-#, c-format
-msgid ""
-"you have staged changes in your working tree\n"
-"If these changes are meant to be squashed into the previous commit, run:\n"
-"\n"
-"  git commit --amend %s\n"
-"\n"
-"If they are meant to go into a new commit, run:\n"
-"\n"
-"  git commit %s\n"
-"\n"
-"In both cases, once you're done, continue with:\n"
-"\n"
-"  git rebase --continue\n"
-msgstr ""
-"您的工作区中存在已暂存的修改\n"
-"如果这些修改需要被挤压到前一个提交，执行：\n"
-"\n"
-"  git commit --amend %s\n"
-"\n"
-"如果这些修改要形成一个新提交，执行：\n"
-"\n"
-"  git commit %s\n"
-"\n"
-"无论哪种情况，当您完成提交，继续执行：\n"
-"\n"
-"  git rebase --continue\n"
-
-#: sequencer.c:1225
-msgid "'prepare-commit-msg' hook failed"
-msgstr "'prepare-commit-msg' 钩子失败"
-
-#: sequencer.c:1231
-msgid ""
-"Your name and email address were configured automatically based\n"
-"on your username and hostname. Please check that they are accurate.\n"
-"You can suppress this message by setting them explicitly. Run the\n"
-"following command and follow the instructions in your editor to edit\n"
-"your configuration file:\n"
-"\n"
-"    git config --global --edit\n"
-"\n"
-"After doing this, you may fix the identity used for this commit with:\n"
-"\n"
-"    git commit --amend --reset-author\n"
-msgstr ""
-"您的姓名和邮件地址基于登录名和主机名进行了自动设置。请检查它们正确\n"
-"与否。您可以对其进行设置以免再出现本提示信息。运行如下命令在编辑器\n"
-"中编辑您的配置文件：\n"
-"\n"
-"    git config --global --edit\n"
-"\n"
-"设置完毕后，您可以用下面的命令来修正本次提交所使用的用户身份：\n"
-"\n"
-"    git commit --amend --reset-author\n"
-
-#: sequencer.c:1244
-msgid ""
-"Your name and email address were configured automatically based\n"
-"on your username and hostname. Please check that they are accurate.\n"
-"You can suppress this message by setting them explicitly:\n"
-"\n"
-"    git config --global user.name \"Your Name\"\n"
-"    git config --global user.email you@example.com\n"
-"\n"
-"After doing this, you may fix the identity used for this commit with:\n"
-"\n"
-"    git commit --amend --reset-author\n"
-msgstr ""
-"您的姓名和邮件地址基于登录名和主机名进行了自动设置。请检查它们正确\n"
-"与否。您可以对其进行设置以免再出现本提示信息：\n"
-"\n"
-"    git config --global user.name \"Your Name\"\n"
-"    git config --global user.email you@example.com\n"
-"\n"
-"设置完毕后，您可以用下面的命令来修正本次提交所使用的用户身份：\n"
-"\n"
-"    git commit --amend --reset-author\n"
-
-#: sequencer.c:1287
-msgid "couldn't look up newly created commit"
-msgstr "无法找到新创建的提交"
-
-#: sequencer.c:1289
-msgid "could not parse newly created commit"
-msgstr "不能解析新创建的提交"
-
-#: sequencer.c:1336
-msgid "unable to resolve HEAD after creating commit"
-msgstr "创建提交后，不能解析 HEAD"
-
-#: sequencer.c:1338
-msgid "detached HEAD"
-msgstr "分离头指针"
-
-#  译者：中文字符串拼接，可删除前导空格
-#: sequencer.c:1342
-msgid " (root-commit)"
-msgstr "（根提交）"
-
-#: sequencer.c:1363
-msgid "could not parse HEAD"
-msgstr "不能解析 HEAD"
-
-#: sequencer.c:1365
-#, c-format
-msgid "HEAD %s is not a commit!"
-msgstr "HEAD %s 不是一个提交！"
-
-#: sequencer.c:1369 sequencer.c:1447 builtin/commit.c:1707
-msgid "could not parse HEAD commit"
-msgstr "不能解析 HEAD 提交"
-
-#: sequencer.c:1425 sequencer.c:2310
-msgid "unable to parse commit author"
-msgstr "不能解析提交作者"
-
-#: sequencer.c:1436 builtin/am.c:1644 builtin/merge.c:710
-msgid "git write-tree failed to write a tree"
-msgstr "git write-tree 无法写入树对象"
-
-#: sequencer.c:1469 sequencer.c:1589
-#, c-format
-msgid "unable to read commit message from '%s'"
-msgstr "不能从 '%s' 读取提交说明"
-
-#: sequencer.c:1500 sequencer.c:1532
-#, c-format
-msgid "invalid author identity '%s'"
-msgstr "无效的作者身份 '%s'"
-
-#: sequencer.c:1506
-msgid "corrupt author: missing date information"
-msgstr "损坏的作者：缺失日期信息"
-
-#: sequencer.c:1545 builtin/am.c:1671 builtin/commit.c:1821 builtin/merge.c:921
-#: builtin/merge.c:946 t/helper/test-fast-rebase.c:78
-msgid "failed to write commit object"
-msgstr "无法写提交对象"
-
-#: sequencer.c:1572 sequencer.c:4496 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:1621
-#, c-format
-msgid "could not parse commit %s"
-msgstr "不能解析提交 %s"
-
-#: sequencer.c:1626
-#, c-format
-msgid "could not parse parent commit %s"
-msgstr "不能解析父提交 %s"
-
-#: sequencer.c:1709 sequencer.c:1990
-#, c-format
-msgid "unknown command: %d"
-msgstr "未知命令：%d"
-
-#: sequencer.c:1751
-msgid "This is the 1st commit message:"
-msgstr "这是第一个提交说明："
-
-#: sequencer.c:1752
-#, c-format
-msgid "This is the commit message #%d:"
-msgstr "这是提交说明 #%d："
-
-#: sequencer.c:1753
-msgid "The 1st commit message will be skipped:"
-msgstr "第一个提交说明将被跳过："
-
-#: sequencer.c:1754
-#, c-format
-msgid "The commit message #%d will be skipped:"
-msgstr "提交说明 #%d 将被跳过："
-
-#: sequencer.c:1755
-#, c-format
-msgid "This is a combination of %d commits."
-msgstr "这是一个 %d 个提交的组合。"
-
-#: sequencer.c:1902 sequencer.c:1959
-#, c-format
-msgid "cannot write '%s'"
-msgstr "不能写 '%s'"
-
-#: sequencer.c:1949
-msgid "need a HEAD to fixup"
-msgstr "需要一个 HEAD 来修复"
-
-#: sequencer.c:1951 sequencer.c:3592
-msgid "could not read HEAD"
-msgstr "不能读取 HEAD"
-
-#: sequencer.c:1953
-msgid "could not read HEAD's commit message"
-msgstr "不能读取 HEAD 的提交说明"
-
-#: sequencer.c:1977
-#, c-format
-msgid "could not read commit message of %s"
-msgstr "不能读取 %s 的提交说明"
-
-#: sequencer.c:2087
-msgid "your index file is unmerged."
-msgstr "您的索引文件未完成合并。"
-
-#: sequencer.c:2094
-msgid "cannot fixup root commit"
-msgstr "不能修复根提交"
-
-#: sequencer.c:2113
-#, c-format
-msgid "commit %s is a merge but no -m option was given."
-msgstr "提交 %s 是一个合并提交但未提供 -m 选项。"
-
-#: sequencer.c:2121 sequencer.c:2129
-#, c-format
-msgid "commit %s does not have parent %d"
-msgstr "提交 %s 没有第 %d 个父提交"
-
-#: sequencer.c:2135
-#, 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:2154
-#, c-format
-msgid "%s: cannot parse parent commit %s"
-msgstr "%s：不能解析父提交 %s"
-
-#: sequencer.c:2220
-#, c-format
-msgid "could not rename '%s' to '%s'"
-msgstr "不能将 '%s' 重命名为 '%s'"
-
-#: sequencer.c:2280
-#, c-format
-msgid "could not revert %s... %s"
-msgstr "不能还原 %s... %s"
-
-#: sequencer.c:2281
-#, c-format
-msgid "could not apply %s... %s"
-msgstr "不能应用 %s... %s"
-
-#: sequencer.c:2302
-#, c-format
-msgid "dropping %s %s -- patch contents already upstream\n"
-msgstr "丢弃 %s %s -- 补丁内容已在上游\n"
-
-#: sequencer.c:2360
-#, c-format
-msgid "git %s: failed to read the index"
-msgstr "git %s：无法读取索引"
-
-#: sequencer.c:2368
-#, c-format
-msgid "git %s: failed to refresh the index"
-msgstr "git %s：无法刷新索引"
-
-#: sequencer.c:2448
-#, c-format
-msgid "%s does not accept arguments: '%s'"
-msgstr "%s 不接受参数：'%s'"
-
-#: sequencer.c:2457
-#, c-format
-msgid "missing arguments for %s"
-msgstr "缺少 %s 的参数"
-
-#: sequencer.c:2500
-#, c-format
-msgid "could not parse '%s'"
-msgstr "无法解析 '%s'"
-
-#: sequencer.c:2561
-#, c-format
-msgid "invalid line %d: %.*s"
-msgstr "无效行 %d：%.*s"
-
-#: sequencer.c:2572
-#, c-format
-msgid "cannot '%s' without a previous commit"
-msgstr "没有父提交的情况下不能 '%s'"
-
-#: sequencer.c:2620 builtin/rebase.c:185
-#, c-format
-msgid "could not read '%s'."
-msgstr "不能读取 '%s'。"
-
-#: sequencer.c:2658
-msgid "cancelling a cherry picking in progress"
-msgstr "正在取消一个进行中的拣选"
-
-#: sequencer.c:2667
-msgid "cancelling a revert in progress"
-msgstr "正在取消一个进行中的还原"
-
-#: sequencer.c:2707
-msgid "please fix this using 'git rebase --edit-todo'."
-msgstr "请用 'git rebase --edit-todo' 来修改。"
-
-#: sequencer.c:2709
-#, c-format
-msgid "unusable instruction sheet: '%s'"
-msgstr "不可用的指令清单：'%s'"
-
-#: sequencer.c:2714
-msgid "no commits parsed."
-msgstr "没有解析提交。"
-
-#: sequencer.c:2725
-msgid "cannot cherry-pick during a revert."
-msgstr "不能在回退中执行拣选。"
-
-#: sequencer.c:2727
-msgid "cannot revert during a cherry-pick."
-msgstr "不能在拣选中执行回退。"
-
-#: sequencer.c:2914
-msgid "unusable squash-onto"
-msgstr "不可用的 squash-onto"
-
-#: sequencer.c:2934
-#, c-format
-msgid "malformed options sheet: '%s'"
-msgstr "格式错误的选项清单：'%s'"
-
-#: sequencer.c:3029 sequencer.c:4875
-msgid "empty commit set passed"
-msgstr "提供了空的提交集"
-
-#: sequencer.c:3046
-msgid "revert is already in progress"
-msgstr "一个还原操作已在进行"
-
-#: sequencer.c:3048
-#, c-format
-msgid "try \"git revert (--continue | %s--abort | --quit)\""
-msgstr "尝试 \"git revert (--continue | %s--abort | --quit)\""
-
-#: sequencer.c:3051
-msgid "cherry-pick is already in progress"
-msgstr "拣选操作已在进行"
-
-#: sequencer.c:3053
-#, c-format
-msgid "try \"git cherry-pick (--continue | %s--abort | --quit)\""
-msgstr "尝试 \"git cherry-pick (--continue | %s--abort | --quit)\""
-
-#: sequencer.c:3067
-#, c-format
-msgid "could not create sequencer directory '%s'"
-msgstr "不能创建序列目录 '%s'"
-
-#: sequencer.c:3082
-msgid "could not lock HEAD"
-msgstr "不能锁定 HEAD"
-
-#: sequencer.c:3142 sequencer.c:4585
-msgid "no cherry-pick or revert in progress"
-msgstr "拣选或还原操作并未进行"
-
-#: sequencer.c:3144 sequencer.c:3155
-msgid "cannot resolve HEAD"
-msgstr "不能解析 HEAD"
-
-#: sequencer.c:3146 sequencer.c:3190
-msgid "cannot abort from a branch yet to be born"
-msgstr "不能从尚未建立的分支终止"
-
-#: sequencer.c:3176 builtin/fetch.c:1030 builtin/fetch.c:1457
-#: builtin/grep.c:774
-#, c-format
-msgid "cannot open '%s'"
-msgstr "不能打开 '%s'"
-
-#: sequencer.c:3178
-#, c-format
-msgid "cannot read '%s': %s"
-msgstr "不能读取 '%s'：%s"
-
-#: sequencer.c:3179
-msgid "unexpected end of file"
-msgstr "意外的文件结束"
-
-#: sequencer.c:3185
-#, c-format
-msgid "stored pre-cherry-pick HEAD file '%s' is corrupt"
-msgstr "保存拣选提交前的 HEAD 文件 '%s' 损坏"
-
-#: sequencer.c:3196
-msgid "You seem to have moved HEAD. Not rewinding, check your HEAD!"
-msgstr "您好像移动了 HEAD。未能回退，检查您的 HEAD！"
-
-#: sequencer.c:3237
-msgid "no revert in progress"
-msgstr "没有正在进行的还原"
-
-#: sequencer.c:3246
-msgid "no cherry-pick in progress"
-msgstr "没有正在进行的拣选"
-
-#: sequencer.c:3256
-msgid "failed to skip the commit"
-msgstr "无法跳过这个提交"
-
-#: sequencer.c:3263
-msgid "there is nothing to skip"
-msgstr "没有要跳过的"
-
-#: sequencer.c:3266
-#, c-format
-msgid ""
-"have you committed already?\n"
-"try \"git %s --continue\""
-msgstr ""
-"您已经提交了么？\n"
-"试试 \"git %s --continue\""
-
-#: sequencer.c:3428 sequencer.c:4476
-msgid "cannot read HEAD"
-msgstr "不能读取 HEAD"
-
-#: sequencer.c:3445
-#, c-format
-msgid "unable to copy '%s' to '%s'"
-msgstr "无法拷贝 '%s' 至 '%s'"
-
-#: sequencer.c:3453
-#, c-format
-msgid ""
-"You can amend the commit now, with\n"
-"\n"
-"  git commit --amend %s\n"
-"\n"
-"Once you are satisfied with your changes, run\n"
-"\n"
-"  git rebase --continue\n"
-msgstr ""
-"您现在可以修补这个提交，使用\n"
-"\n"
-"  git commit --amend %s\n"
-"\n"
-"当您对变更感到满意，执行\n"
-"\n"
-"  git rebase --continue\n"
-
-#: sequencer.c:3463
-#, c-format
-msgid "Could not apply %s... %.*s"
-msgstr "不能应用 %s... %.*s"
-
-#: sequencer.c:3470
-#, c-format
-msgid "Could not merge %.*s"
-msgstr "不能合并 %.*s"
-
-#: sequencer.c:3484 sequencer.c:3488 builtin/difftool.c:633
-#, c-format
-msgid "could not copy '%s' to '%s'"
-msgstr "不能拷贝 '%s' 至 '%s'"
-
-#: sequencer.c:3499
-#, c-format
-msgid "Executing: %s\n"
-msgstr "正在执行：%s\n"
-
-#: sequencer.c:3510
-#, c-format
-msgid ""
-"execution failed: %s\n"
-"%sYou can fix the problem, and then run\n"
-"\n"
-"  git rebase --continue\n"
-"\n"
-msgstr ""
-"执行失败：%s\n"
-"%s您可以改正该问题，然后运行\n"
-"\n"
-"  git rebase --continue\n"
-"\n"
-
-#: sequencer.c:3516
-msgid "and made changes to the index and/or the working tree\n"
-msgstr "并且修改索引和/或工作区\n"
-
-#: sequencer.c:3522
-#, c-format
-msgid ""
-"execution succeeded: %s\n"
-"but left changes to the index and/or the working tree\n"
-"Commit or stash your changes, and then run\n"
-"\n"
-"  git rebase --continue\n"
-"\n"
-msgstr ""
-"执行成功：%s\n"
-"但是在索引和/或工作区中存在变更\n"
-"提交或贮藏修改，然后运行\n"
-"\n"
-"  git rebase --continue\n"
-"\n"
-
-#: sequencer.c:3582
-#, c-format
-msgid "illegal label name: '%.*s'"
-msgstr "非法的标签名称：'%.*s'"
-
-#: sequencer.c:3655
-msgid "writing fake root commit"
-msgstr "写伪根提交"
-
-#: sequencer.c:3660
-msgid "writing squash-onto"
-msgstr "写入 squash-onto"
-
-#: sequencer.c:3739
-#, c-format
-msgid "could not resolve '%s'"
-msgstr "无法解析 '%s'"
-
-#: sequencer.c:3771
-msgid "cannot merge without a current revision"
-msgstr "没有当前版本不能合并"
-
-#: sequencer.c:3793
-#, c-format
-msgid "unable to parse '%.*s'"
-msgstr "无法解析 '%.*s'"
-
-#: sequencer.c:3802
-#, c-format
-msgid "nothing to merge: '%.*s'"
-msgstr "无可用合并：'%.*s'"
-
-#: sequencer.c:3814
-msgid "octopus merge cannot be executed on top of a [new root]"
-msgstr "章鱼合并不能在一个新的根提交上执行"
-
-#: sequencer.c:3869
-#, c-format
-msgid "could not get commit message of '%s'"
-msgstr "不能获取 '%s' 的提交说明"
-
-#: sequencer.c:4013
-#, c-format
-msgid "could not even attempt to merge '%.*s'"
-msgstr "甚至不能尝试合并 '%.*s'"
-
-#: sequencer.c:4029
-msgid "merge: Unable to write new index file"
-msgstr "合并：无法写入新索引文件"
-
-#: sequencer.c:4110
-msgid "Cannot autostash"
-msgstr "无法自动贮藏"
-
-#: sequencer.c:4113
-#, c-format
-msgid "Unexpected stash response: '%s'"
-msgstr "意外的贮藏响应：'%s'"
-
-#: sequencer.c:4119
-#, c-format
-msgid "Could not create directory for '%s'"
-msgstr "不能为 '%s' 创建目录"
-
-#: sequencer.c:4122
-#, c-format
-msgid "Created autostash: %s\n"
-msgstr "创建了自动贮藏：%s\n"
-
-#: sequencer.c:4124
-msgid "could not reset --hard"
-msgstr "无法硬性重置（reset --hard）"
-
-#: sequencer.c:4148
-#, c-format
-msgid "Applied autostash.\n"
-msgstr "已应用自动贮藏。\n"
-
-#: sequencer.c:4160
-#, c-format
-msgid "cannot store %s"
-msgstr "不能存储 %s"
-
-#: sequencer.c:4163
-#, c-format
-msgid ""
-"%s\n"
-"Your changes are safe in the stash.\n"
-"You can run \"git stash pop\" or \"git stash drop\" at any time.\n"
-msgstr ""
-"%s\n"
-"您的修改在贮藏区中很安全。\n"
-"您可以在任何时候运行 \"git stash pop\" 或 \"git stash drop\"。\n"
-
-#: sequencer.c:4168
-msgid "Applying autostash resulted in conflicts."
-msgstr "应用自动贮藏导致冲突。"
-
-#: sequencer.c:4169
-msgid "Autostash exists; creating a new stash entry."
-msgstr "自动贮藏已经存在；正在创建一个新的贮藏条目。"
-
-#: sequencer.c:4225
-msgid "could not detach HEAD"
-msgstr "不能分离头指针"
-
-#: sequencer.c:4240
-#, c-format
-msgid "Stopped at HEAD\n"
-msgstr "停止在 HEAD\n"
-
-#: sequencer.c:4242
-#, c-format
-msgid "Stopped at %s\n"
-msgstr "停止在 %s\n"
-
-#: sequencer.c:4274
-#, c-format
-msgid ""
-"Could not execute the todo command\n"
-"\n"
-"    %.*s\n"
-"It has been rescheduled; To edit the command before continuing, please\n"
-"edit the todo list first:\n"
-"\n"
-"    git rebase --edit-todo\n"
-"    git rebase --continue\n"
-msgstr ""
-"无法执行待办命令\n"
-"\n"
-"    %.*s\n"
-"已被重新安排，在继续之前编辑命令，请先编辑待办列表：\n"
-"\n"
-"    git rebase --edit-todo\n"
-"    git rebase --continue\n"
-
-#: sequencer.c:4320
-#, c-format
-msgid "Rebasing (%d/%d)%s"
-msgstr "正在变基（%d/%d）%s"
-
-#: sequencer.c:4366
-#, c-format
-msgid "Stopped at %s...  %.*s\n"
-msgstr "停止在 %s... %.*s\n"
-
-#: sequencer.c:4436
-#, c-format
-msgid "unknown command %d"
-msgstr "未知命令 %d"
-
-#: sequencer.c:4484
-msgid "could not read orig-head"
-msgstr "不能读取 orig-head"
-
-#: sequencer.c:4489
-msgid "could not read 'onto'"
-msgstr "不能读取 'onto'"
-
-#: sequencer.c:4503
-#, c-format
-msgid "could not update HEAD to %s"
-msgstr "不能更新 HEAD 为 %s"
-
-#: sequencer.c:4563
-#, c-format
-msgid "Successfully rebased and updated %s.\n"
-msgstr "成功变基并更新 %s。\n"
-
-#: sequencer.c:4615
-msgid "cannot rebase: You have unstaged changes."
-msgstr "不能变基：您有未暂存的变更。"
-
-#: sequencer.c:4624
-msgid "cannot amend non-existing commit"
-msgstr "不能修补不存在的提交"
-
-#: sequencer.c:4626
-#, c-format
-msgid "invalid file: '%s'"
-msgstr "无效文件：'%s'"
-
-#: sequencer.c:4628
-#, c-format
-msgid "invalid contents: '%s'"
-msgstr "无效内容：'%s'"
-
-#: sequencer.c:4631
-msgid ""
-"\n"
-"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'。"
-
-#: sequencer.c:4667 sequencer.c:4706
-#, c-format
-msgid "could not write file: '%s'"
-msgstr "不能写入文件：'%s'"
-
-#: sequencer.c:4722
-msgid "could not remove CHERRY_PICK_HEAD"
-msgstr "不能删除 CHERRY_PICK_HEAD"
-
-#: sequencer.c:4732
-msgid "could not commit staged changes."
-msgstr "不能提交暂存的修改。"
-
-#: sequencer.c:4852
-#, c-format
-msgid "%s: can't cherry-pick a %s"
-msgstr "%s：不能拣选一个%s"
-
-#: sequencer.c:4856
-#, c-format
-msgid "%s: bad revision"
-msgstr "%s：错误的版本"
-
-#: sequencer.c:4891
-msgid "can't revert as initial commit"
-msgstr "不能作为初始提交回退"
-
-#: sequencer.c:5162 sequencer.c:5391
-#, c-format
-msgid "skipped previously applied commit %s"
-msgstr "跳过了先前已应用的提交 %s"
-
-#: sequencer.c:5232 sequencer.c:5407
-msgid "use --reapply-cherry-picks to include skipped commits"
-msgstr "使用 --reapply-cherry-picks 来包括跳过的提交"
-
-#: sequencer.c:5378
-msgid "make_script: unhandled options"
-msgstr "make_script：有未能处理的选项"
-
-#: sequencer.c:5381
-msgid "make_script: error preparing revisions"
-msgstr "make_script：准备版本时错误"
-
-#: sequencer.c:5639 sequencer.c:5656
-msgid "nothing to do"
-msgstr "无事可做"
-
-#: sequencer.c:5675
-msgid "could not skip unnecessary pick commands"
-msgstr "无法跳过不必要的拣选"
-
-#: sequencer.c:5775
-msgid "the script was already rearranged."
-msgstr "脚本已经重新编排。"
-
-#: setup.c:135
-#, c-format
-msgid "'%s' is outside repository at '%s'"
-msgstr "'%s' 在位于 '%s' 的仓库之外"
-
-#: setup.c:187
-#, c-format
-msgid ""
-"%s: no such path in the working tree.\n"
-"Use 'git <command> -- <path>...' to specify paths that do not exist locally."
-msgstr ""
-"%s：工作区中无此路径。\n"
-"使用命令 'git <命令> -- <路径>...' 来指定本地不存在的路径。"
-
-#: setup.c:200
-#, c-format
-msgid ""
-"ambiguous argument '%s': unknown revision or path not in the working tree.\n"
-"Use '--' to separate paths from revisions, like this:\n"
-"'git <command> [<revision>...] -- [<file>...]'"
-msgstr ""
-"有歧义的参数 '%s'：未知的版本或路径不存在于工作区中。\n"
-"使用 '--' 来分隔版本和路径，例如：\n"
-"'git <命令> [<版本>...] -- [<文件>...]'"
-
-#: setup.c:266
-#, c-format
-msgid "option '%s' must come before non-option arguments"
-msgstr "选项 '%s' 必须在其他非选项参数之前"
-
-#: setup.c:285
-#, c-format
-msgid ""
-"ambiguous argument '%s': both revision and filename\n"
-"Use '--' to separate paths from revisions, like this:\n"
-"'git <command> [<revision>...] -- [<file>...]'"
-msgstr ""
-"有歧义的参数 '%s'：可同时是版本和文件\n"
-"使用 '--' 来分隔版本和路径，例如：\n"
-"'git <命令> [<版本>...] -- [<文件>...]'"
-
-#: setup.c:421
-msgid "unable to set up work tree using invalid config"
-msgstr "无法使用无效配置来创建工作区"
-
-#: setup.c:425 builtin/rev-parse.c:895
-msgid "this operation must be run in a work tree"
-msgstr "该操作必须在一个工作区中运行"
-
-#: setup.c:724
-#, c-format
-msgid "Expected git repo version <= %d, found %d"
-msgstr "期望 git 仓库版本 <= %d，却得到 %d"
-
-#: setup.c:732
-msgid "unknown repository extension found:"
-msgid_plural "unknown repository extensions found:"
-msgstr[0] "发现未知的仓库扩展："
-msgstr[1] "发现未知的仓库扩展："
-
-#: setup.c:746
-msgid "repo version is 0, but v1-only extension found:"
-msgid_plural "repo version is 0, but v1-only extensions found:"
-msgstr[0] "仓库的版本是 0，但是发现仅用于 v1 的扩展："
-msgstr[1] "仓库的版本是 0，但是发现仅用于 v1 的扩展："
-
-#: setup.c:767
-#, c-format
-msgid "error opening '%s'"
-msgstr "打开 '%s' 出错"
-
-#: setup.c:769
-#, c-format
-msgid "too large to be a .git file: '%s'"
-msgstr "文件太大，无法作为 .git 文件：'%s'"
-
-#: setup.c:771
-#, c-format
-msgid "error reading %s"
-msgstr "读取 %s 出错"
-
-#: setup.c:773
-#, c-format
-msgid "invalid gitfile format: %s"
-msgstr "无效的 gitfile 格式：%s"
-
-#: setup.c:775
-#, c-format
-msgid "no path in gitfile: %s"
-msgstr "在 gitfile 中没有路径：%s"
-
-#: setup.c:777
-#, c-format
-msgid "not a git repository: %s"
-msgstr "不是 git 仓库：%s"
-
-#: setup.c:879
-#, c-format
-msgid "'$%s' too big"
-msgstr "'$%s' 太大"
-
-#: setup.c:893
-#, c-format
-msgid "not a git repository: '%s'"
-msgstr "不是 git 仓库：'%s'"
-
-#: setup.c:922 setup.c:924 setup.c:955
-#, c-format
-msgid "cannot chdir to '%s'"
-msgstr "不能切换目录到 '%s'"
-
-#: setup.c:927 setup.c:983 setup.c:993 setup.c:1032 setup.c:1040
-msgid "cannot come back to cwd"
-msgstr "无法返回当前工作目录"
-
-#: setup.c:1054
-#, c-format
-msgid "failed to stat '%*s%s%s'"
-msgstr "无法获取 '%*s%s%s' 状态（stat）"
-
-#: setup.c:1338
-msgid "Unable to read current working directory"
-msgstr "不能读取当前工作目录"
-
-#: setup.c:1347 setup.c:1353
-#, c-format
-msgid "cannot change to '%s'"
-msgstr "不能切换到 '%s'"
-
-#: setup.c:1358
-#, c-format
-msgid "not a git repository (or any of the parent directories): %s"
-msgstr "不是 git 仓库（或者任何父目录）：%s"
-
-#: setup.c:1364
-#, 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 ""
-"不是 git 仓库（或者直至挂载点 %s 的任何父目录）\n"
-"停止在文件系统边界（未设置 GIT_DISCOVERY_ACROSS_FILESYSTEM）。"
-
-#: setup.c:1374
-#, c-format
-msgid ""
-"unsafe repository ('%s' is owned by someone else)\n"
-"To add an exception for this directory, call:\n"
-"\n"
-"\tgit config --global --add safe.directory %s"
-msgstr ""
-"仓库不安全（'%s' 的所有者是其他人）\n"
-"要为本仓库创建特例，请使用：\n"
-"\n"
-"\tgit config --global --add safe.directory %s"
-
-
-#: setup.c:1502
-#, c-format
-msgid ""
-"problem with core.sharedRepository filemode value (0%.3o).\n"
-"The owner of files must always have read and write permissions."
-msgstr ""
-"参数 core.sharedRepository 的文件属性值有问题（0%.3o）。\n"
-"文件属主必须始终拥有读写权限。"
-
-#: setup.c:1564
-msgid "fork failed"
-msgstr "fork 失败"
-
-#: setup.c:1569
-msgid "setsid failed"
-msgstr "setsid 失败"
-
-#: sparse-index.c:285
-#, c-format
-msgid "index entry is a directory, but not sparse (%08x)"
-msgstr "索引条目是一个目录，但不是稀疏的 (%08x)"
-
-#: split-index.c:9
-msgid "cannot use split index with a sparse index"
-msgstr "拆分索引无法与稀疏索引一起使用"
-
-#. TRANSLATORS: IEC 80000-13:2008 gibibyte
-#: strbuf.c:851
-#, c-format
-msgid "%u.%2.2u GiB"
-msgstr "%u.%2.2u GiB"
-
-#. TRANSLATORS: IEC 80000-13:2008 gibibyte/second
-#: strbuf.c:853
-#, c-format
-msgid "%u.%2.2u GiB/s"
-msgstr "%u.%2.2u GiB/s"
-
-#. TRANSLATORS: IEC 80000-13:2008 mebibyte
-#: strbuf.c:861
-#, c-format
-msgid "%u.%2.2u MiB"
-msgstr "%u.%2.2u MiB"
-
-#. TRANSLATORS: IEC 80000-13:2008 mebibyte/second
-#: strbuf.c:863
-#, c-format
-msgid "%u.%2.2u MiB/s"
-msgstr "%u.%2.2u MiB/s"
-
-#. TRANSLATORS: IEC 80000-13:2008 kibibyte
-#: strbuf.c:870
-#, c-format
-msgid "%u.%2.2u KiB"
-msgstr "%u.%2.2u KiB"
-
-#. TRANSLATORS: IEC 80000-13:2008 kibibyte/second
-#: strbuf.c:872
-#, c-format
-msgid "%u.%2.2u KiB/s"
-msgstr "%u.%2.2u KiB/s"
-
-#. TRANSLATORS: IEC 80000-13:2008 byte
-#: strbuf.c:878
-#, c-format
-msgid "%u byte"
-msgid_plural "%u bytes"
-msgstr[0] "%u 字节"
-msgstr[1] "%u 字节"
-
-#. TRANSLATORS: IEC 80000-13:2008 byte/second
-#: strbuf.c:880
-#, c-format
-msgid "%u byte/s"
-msgid_plural "%u bytes/s"
-msgstr[0] "%u 字节/秒"
-msgstr[1] "%u 字节/秒"
-
-#: strbuf.c:1187 wrapper.c:217 wrapper.c:387 builtin/am.c:766
-#: builtin/rebase.c:653
-#, c-format
-msgid "could not open '%s' for writing"
-msgstr "无法打开 '%s' 进行写入"
-
-#: strbuf.c:1196
-#, c-format
-msgid "could not edit '%s'"
-msgstr "不能编辑 '%s'"
-
-#: submodule-config.c:238
-#, c-format
-msgid "ignoring suspicious submodule name: %s"
-msgstr "忽略可疑的子模组名称：%s"
-
-#: submodule-config.c:305
-msgid "negative values not allowed for submodule.fetchjobs"
-msgstr "submodule.fetchjobs 不允许为负值"
-
-#: submodule-config.c:403
-#, c-format
-msgid "ignoring '%s' which may be interpreted as a command-line option: %s"
-msgstr "忽略可能被解析为命令行选项的 '%s'：%s"
-
-#: submodule-config.c:500 builtin/push.c:489 builtin/send-pack.c:148
-#, c-format
-msgid "invalid value for '%s'"
-msgstr "'%s' 的值无效"
-
-#: submodule-config.c:828
-#, c-format
-msgid "Could not update .gitmodules entry %s"
-msgstr "不能更新 .gitmodules 条目 %s"
-
-#: submodule.c:115 submodule.c:144
-msgid "Cannot change unmerged .gitmodules, resolve merge conflicts first"
-msgstr "无法修改未合并的 .gitmodules，先解决合并冲突"
-
-#: submodule.c:119 submodule.c:148
-#, c-format
-msgid "Could not find section in .gitmodules where path=%s"
-msgstr "无法在 .gitmodules 中找到 path=%s 的小节"
-
-#: submodule.c:155
-#, c-format
-msgid "Could not remove .gitmodules entry for %s"
-msgstr "无法移除 %s 的 .gitmodules 条目"
-
-#: submodule.c:166
-msgid "staging updated .gitmodules failed"
-msgstr "将更新后 .gitmodules 添加暂存区失败"
-
-#: submodule.c:346
-#, c-format
-msgid "in unpopulated submodule '%s'"
-msgstr "位于未检出的子模组 '%s'"
-
-#: submodule.c:377
-#, c-format
-msgid "Pathspec '%s' is in submodule '%.*s'"
-msgstr "路径规格 '%s' 在子模组 '%.*s' 中"
-
-#: submodule.c:454
-#, c-format
-msgid "bad --ignore-submodules argument: %s"
-msgstr "坏的 --ignore-submodules 参数：%s"
-
-#: submodule.c:866
-#, c-format
-msgid ""
-"Submodule in commit %s at path: '%s' collides with a submodule named the "
-"same. Skipping it."
-msgstr "提交 %s 中位于路径 '%s' 的子模组和同名的子模组冲突。 跳过它。"
-
-#: submodule.c:987
-#, c-format
-msgid "submodule entry '%s' (%s) is a %s, not a commit"
-msgstr "子模组条目 '%s'（%s）是一个 %s，不是一个提交"
-
-#: submodule.c:1069
-#, 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:1192
-#, c-format
-msgid "process for submodule '%s' failed"
-msgstr "处理子模组 '%s' 失败"
-
-#: submodule.c:1221 builtin/branch.c:714 builtin/submodule--helper.c:2827
-msgid "Failed to resolve HEAD as a valid ref."
-msgstr "无法将 HEAD 解析为有效引用。"
-
-#: submodule.c:1232
-#, c-format
-msgid "Pushing submodule '%s'\n"
-msgstr "正在推送子模组 '%s'\n"
-
-#: submodule.c:1235
-#, c-format
-msgid "Unable to push submodule '%s'\n"
-msgstr "无法推送子模组 '%s'\n"
-
-#: submodule.c:1567
-#, c-format
-msgid "Fetching submodule %s%s\n"
-msgstr "正在获取子模组 %s%s\n"
-
-#: submodule.c:1589
-#, c-format
-msgid "Could not access submodule '%s'\n"
-msgstr "无法访问子模组 '%s'\n"
-
-#: submodule.c:1618
-#, c-format
-msgid "Could not access submodule '%s' at commit %s\n"
-msgstr "无法访问子模组 '%s' 提交 %s\n"
-
-#: submodule.c:1629
-#, c-format
-msgid "Fetching submodule %s%s at commit %s\n"
-msgstr "正在获取子模组 %s%s 提交 %s\n"
-
-#: submodule.c:1849
-#, c-format
-msgid ""
-"Errors during submodule fetch:\n"
-"%s"
-msgstr ""
-"获取子模组时的错误：\n"
-"%s"
-
-#: submodule.c:1874
-#, c-format
-msgid "'%s' not recognized as a git repository"
-msgstr "无法将 '%s' 识别为 git 仓库"
-
-#: submodule.c:1891
-#, c-format
-msgid "Could not run 'git status --porcelain=2' in submodule %s"
-msgstr "无法在子模组 %s 中执行 'git status --porcelain=2'"
-
-#: submodule.c:1932
-#, c-format
-msgid "'git status --porcelain=2' failed in submodule %s"
-msgstr "在子模组 %s 中执行 'git status --porcelain=2' 失败"
-
-#: submodule.c:2007
-#, c-format
-msgid "could not start 'git status' in submodule '%s'"
-msgstr "无法在子模组 '%s' 中启动 'git status'"
-
-#: submodule.c:2020
-#, c-format
-msgid "could not run 'git status' in submodule '%s'"
-msgstr "无法在子模组 '%s' 中执行 'git status'"
-
-#: submodule.c:2037
-#, c-format
-msgid "Could not unset core.worktree setting in submodule '%s'"
-msgstr "无法在子模组 '%s' 中取消 core.worktree 的设置"
-
-#: submodule.c:2064 submodule.c:2379
-#, c-format
-msgid "could not recurse into submodule '%s'"
-msgstr "无法递归进子模组路径 '%s'"
-
-#: submodule.c:2086
-msgid "could not reset submodule index"
-msgstr "无法重置子模组索引"
-
-#: submodule.c:2128
-#, c-format
-msgid "submodule '%s' has dirty index"
-msgstr "子模组 '%s' 中有脏索引"
-
-#: submodule.c:2182
-#, c-format
-msgid "Submodule '%s' could not be updated."
-msgstr "子模组 '%s' 无法被更新。"
-
-#: submodule.c:2250
-#, c-format
-msgid "submodule git dir '%s' is inside git dir '%.*s'"
-msgstr "子模组 git 目录 '%s' 位于 git 目录 '%.*s' 中"
-
-#: submodule.c:2271
-#, c-format
-msgid ""
-"relocate_gitdir for submodule '%s' with more than one worktree not supported"
-msgstr "不支持对有多个工作区的子模组 '%s' 执行 relocate_gitdir"
-
-#: submodule.c:2283 submodule.c:2343
-#, c-format
-msgid "could not lookup name for submodule '%s'"
-msgstr "不能查询子模组 '%s' 的名称"
-
-#: submodule.c:2287
-#, c-format
-msgid "refusing to move '%s' into an existing git dir"
-msgstr "禁止移动 '%s' 到现存 git 目录中"
-
-#: submodule.c:2293
-#, c-format
-msgid ""
-"Migrating git directory of '%s%s' from\n"
-"'%s' to\n"
-"'%s'\n"
-msgstr ""
-"将 '%s%s' 的 git 目录从\n"
-"'%s' 迁移至\n"
-"'%s'\n"
-
-#: submodule.c:2424
-msgid "could not start ls-files in .."
-msgstr "无法在 .. 中启动 ls-files"
-
-#: submodule.c:2464
-#, c-format
-msgid "ls-tree returned unexpected return code %d"
-msgstr "ls-tree 返回未知返回值 %d"
-
-#: symlinks.c:244
-#, c-format
-msgid "failed to lstat '%s'"
-msgstr "无法执行 lstat '%s'"
-
-#: trailer.c:244
-#, c-format
-msgid "running trailer command '%s' failed"
-msgstr "执行 trailer 命令 '%s' 失败"
-
-#: 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 "键 '%2$s' 的未知取值 '%1$s'"
-
-#: trailer.c:547 trailer.c:552 trailer.c:557 builtin/remote.c:300
-#: builtin/remote.c:328
-#, c-format
-msgid "more than one %s"
-msgstr "多于一个 %s"
-
-#: trailer.c:743
-#, c-format
-msgid "empty trailer token in trailer '%.*s'"
-msgstr "尾注 '%.*s' 的键为空"
-
-#: trailer.c:763
-#, c-format
-msgid "could not read input file '%s'"
-msgstr "不能读取输入文件 '%s'"
-
-#: trailer.c:766 builtin/mktag.c:88 imap-send.c:1563
-msgid "could not read from stdin"
-msgstr "不能自标准输入读取"
-
-#: trailer.c:1024 wrapper.c:760
-#, c-format
-msgid "could not stat %s"
-msgstr "不能对 %s 调用 stat"
-
-#: trailer.c:1026
-#, c-format
-msgid "file %s is not a regular file"
-msgstr "文件 %s 不是一个正规文件"
-
-#: trailer.c:1028
-#, c-format
-msgid "file %s is not writable by user"
-msgstr "文件 %s 用户不可写"
-
-#: trailer.c:1040
-msgid "could not open temporary file"
-msgstr "不能打开临时文件"
-
-#: trailer.c:1080
-#, c-format
-msgid "could not rename temporary file to %s"
-msgstr "不能重命名临时文件为 %s"
-
-#: transport-helper.c:62 transport-helper.c:91
-msgid "full write to remote helper failed"
-msgstr "完整写入远程助手失败"
-
-#: transport-helper.c:145
-#, c-format
-msgid "unable to find remote helper for '%s'"
-msgstr "无法为 '%s' 找到远程助手"
-
-#: transport-helper.c:161 transport-helper.c:575
-msgid "can't dup helper output fd"
-msgstr "无法复制助手输出文件句柄"
-
-#: transport-helper.c:214
-#, c-format
-msgid ""
-"unknown mandatory capability %s; this remote helper probably needs newer "
-"version of Git"
-msgstr "未知的强制能力 %s，该远程助手可能需要新版本的Git"
-
-#: transport-helper.c:220
-msgid "this remote helper should implement refspec capability"
-msgstr "远程助手需要实现 refspec 能力"
-
-#: transport-helper.c:287 transport-helper.c:429
-#, c-format
-msgid "%s unexpectedly said: '%s'"
-msgstr "%s 意外地说：'%s'"
-
-#: transport-helper.c:417
-#, c-format
-msgid "%s also locked %s"
-msgstr "%s 也锁定了 %s"
-
-#: transport-helper.c:497
-msgid "couldn't run fast-import"
-msgstr "不能执行 fast-import"
-
-#: transport-helper.c:520
-msgid "error while running fast-import"
-msgstr "执行 fast-import 出错"
-
-#: transport-helper.c:549 transport-helper.c:1254
-#, c-format
-msgid "could not read ref %s"
-msgstr "无法读取引用 %s"
-
-#: transport-helper.c:594
-#, c-format
-msgid "unknown response to connect: %s"
-msgstr "连接时未知的响应：%s"
-
-#: transport-helper.c:616
-msgid "setting remote service path not supported by protocol"
-msgstr "协议不支持设置远程服务路径"
-
-#: transport-helper.c:618
-msgid "invalid remote service path"
-msgstr "无效的远程服务路径"
-
-#: transport-helper.c:661 transport.c:1496
-msgid "operation not supported by protocol"
-msgstr "协议不支持该操作"
-
-#: transport-helper.c:664
-#, c-format
-msgid "can't connect to subservice %s"
-msgstr "不能连接到子服务 %s"
-
-#: transport-helper.c:693 transport.c:415
-msgid "--negotiate-only requires protocol v2"
-msgstr "--negotiate-only 需要协议 v2"
-
-#: transport-helper.c:758
-msgid "'option' without a matching 'ok/error' directive"
-msgstr "'option' 缺乏一个匹配的 'ok/error' 指令"
-
-#: transport-helper.c:801
-#, c-format
-msgid "expected ok/error, helper said '%s'"
-msgstr "预期 ok/error，助手说 '%s'"
-
-#: transport-helper.c:862
-#, c-format
-msgid "helper reported unexpected status of %s"
-msgstr "助手报告 %s 的意外状态"
-
-#: transport-helper.c:945
-#, c-format
-msgid "helper %s does not support dry-run"
-msgstr "助手 %s 不支持 dry-run"
-
-#: transport-helper.c:948
-#, c-format
-msgid "helper %s does not support --signed"
-msgstr "助手 %s 不支持 --signed"
-
-#: transport-helper.c:951
-#, c-format
-msgid "helper %s does not support --signed=if-asked"
-msgstr "助手 %s 不支持 --signed=if-asked"
-
-#: transport-helper.c:956
-#, c-format
-msgid "helper %s does not support --atomic"
-msgstr "助手 %s 不支持 --atomic"
-
-#: transport-helper.c:960
-#, c-format
-msgid "helper %s does not support --%s"
-msgstr "助手 %s 不支持 --%s"
-
-#: transport-helper.c:967
-#, c-format
-msgid "helper %s does not support 'push-option'"
-msgstr "助手 %s 不支持 'push-option'"
-
-#: transport-helper.c:1067
-msgid "remote-helper doesn't support push; refspec needed"
-msgstr "remote-heper 不支持推送，需要引用规格"
-
-#: transport-helper.c:1072
-#, c-format
-msgid "helper %s does not support 'force'"
-msgstr "助手 %s 不支持 'force'"
-
-#: transport-helper.c:1119
-msgid "couldn't run fast-export"
-msgstr "无法执行 fast-export"
-
-#: transport-helper.c:1124
-msgid "error while running fast-export"
-msgstr "执行 fast-export 时出错"
-
-#: transport-helper.c:1149
-#, c-format
-msgid ""
-"No refs in common and none specified; doing nothing.\n"
-"Perhaps you should specify a branch.\n"
-msgstr ""
-"没有共同的引用并且也没有指定，什么也不会做。\n"
-"也许您应该指定一个分支。\n"
-
-#: transport-helper.c:1231
-#, c-format
-msgid "unsupported object format '%s'"
-msgstr "不支持的对象格式 '%s'"
-
-#: transport-helper.c:1240
-#, c-format
-msgid "malformed response in ref list: %s"
-msgstr "引用列表中格式错误的响应：%s"
-
-#: transport-helper.c:1392
-#, c-format
-msgid "read(%s) failed"
-msgstr "读取（%s）失败"
-
-#: transport-helper.c:1419
-#, c-format
-msgid "write(%s) failed"
-msgstr "写（%s）失败"
-
-#: transport-helper.c:1468
-#, c-format
-msgid "%s thread failed"
-msgstr "%s 线程失败"
-
-#: transport-helper.c:1472
-#, c-format
-msgid "%s thread failed to join: %s"
-msgstr "%s 线程等待失败：%s"
-
-#: transport-helper.c:1491 transport-helper.c:1495
-#, c-format
-msgid "can't start thread for copying data: %s"
-msgstr "不能启动线程来拷贝数据：%s"
-
-#: transport-helper.c:1532
-#, c-format
-msgid "%s process failed to wait"
-msgstr "%s 进程等待失败"
-
-#: transport-helper.c:1536
-#, c-format
-msgid "%s process failed"
-msgstr "%s 进程失败"
-
-#: transport-helper.c:1554 transport-helper.c:1563
-msgid "can't start thread for copying data"
-msgstr "不能启动线程来拷贝数据"
-
-#: transport.c:116
-#, c-format
-msgid "Would set upstream of '%s' to '%s' of '%s'\n"
-msgstr "将要设置 '%1$s' 的上游为 '%3$s' 的 '%2$s'\n"
-
-#: transport.c:138
-#, c-format
-msgid "could not read bundle '%s'"
-msgstr "无法读取归档包 '%s'"
-
-#: transport.c:234
-#, c-format
-msgid "transport: invalid depth option '%s'"
-msgstr "传输：无效的深度选项 '%s'"
-
-#: transport.c:289
-msgid "see protocol.version in 'git help config' for more details"
-msgstr "查看 'git help config' 中的 protocol.version 获取更多信息"
-
-#: transport.c:290
-msgid "server options require protocol version 2 or later"
-msgstr "服务端选项需要版本 2 协议或更高"
-
-#: transport.c:418
-msgid "server does not support wait-for-done"
-msgstr "服务器不支持 wait-for-done"
-
-#: transport.c:770
-msgid "could not parse transport.color.* config"
-msgstr "不能解析 transport.color.* 配置"
-
-#: transport.c:845
-msgid "support for protocol v2 not implemented yet"
-msgstr "协议 v2 的支持尚未实现"
-
-#: transport.c:978
-#, c-format
-msgid "unknown value for config '%s': %s"
-msgstr "配置 '%s' 的取值未知：%s"
-
-#: transport.c:1044
-#, c-format
-msgid "transport '%s' not allowed"
-msgstr "传输 '%s' 不允许"
-
-#: transport.c:1093
-msgid "git-over-rsync is no longer supported"
-msgstr "不再支持 git-over-rsync"
-
-#: transport.c:1196
-#, c-format
-msgid ""
-"The following submodule paths contain changes that can\n"
-"not be found on any remote:\n"
-msgstr "下列子模组路径所包含的修改在任何远程源中都找不到：\n"
-
-#: transport.c:1200
-#, c-format
-msgid ""
-"\n"
-"Please try\n"
-"\n"
-"\tgit push --recurse-submodules=on-demand\n"
-"\n"
-"or cd to the path and use\n"
-"\n"
-"\tgit push\n"
-"\n"
-"to push them to a remote.\n"
-"\n"
-msgstr ""
-"\n"
-"请尝试\n"
-"\n"
-"\tgit push --recurse-submodules=on-demand\n"
-"\n"
-"或者进入到子目录执行\n"
-"\n"
-"\tgit push\n"
-"\n"
-"以推送至远程。\n"
-"\n"
-
-#: transport.c:1208
-msgid "Aborting."
-msgstr "正在终止。"
-
-#: transport.c:1354
-msgid "failed to push all needed submodules"
-msgstr "不能推送全部需要的子模组"
-
-#: tree-walk.c:33
-msgid "too-short tree object"
-msgstr "太短的树对象"
-
-#: tree-walk.c:39
-msgid "malformed mode in tree entry"
-msgstr "树对象中的条目模式错误"
-
-#: tree-walk.c:43
-msgid "empty filename in tree entry"
-msgstr "树对象条目中空的文件名"
-
-#: tree-walk.c:118
-msgid "too-short tree file"
-msgstr "太短的树文件"
-
-#: unpack-trees.c:118
-#, c-format
-msgid ""
-"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 ""
-"您对下列文件的本地修改将被检出操作覆盖：\n"
-"%%s请在切换分支前提交或贮藏您的修改。"
-
-#: unpack-trees.c:120
-#, c-format
-msgid ""
-"Your local changes to the following files would be overwritten by checkout:\n"
-"%%s"
-msgstr ""
-"您对下列文件的本地修改将被检出操作覆盖：\n"
-"%%s"
-
-#: unpack-trees.c:123
-#, c-format
-msgid ""
-"Your local changes to the following files would be overwritten by merge:\n"
-"%%sPlease commit your changes or stash them before you merge."
-msgstr ""
-"您对下列文件的本地修改将被合并操作覆盖：\n"
-"%%s请在合并前提交或贮藏您的修改。"
-
-#: unpack-trees.c:125
-#, c-format
-msgid ""
-"Your local changes to the following files would be overwritten by merge:\n"
-"%%s"
-msgstr ""
-"您对下列文件的本地修改将被合并操作覆盖：\n"
-"%%s"
-
-#: unpack-trees.c:128
-#, c-format
-msgid ""
-"Your local changes to the following files would be overwritten by %s:\n"
-"%%sPlease commit your changes or stash them before you %s."
-msgstr ""
-"您对下列文件的本地修改将被 %s 覆盖：\n"
-"%%s请在 %s 之前提交或贮藏您的修改。"
-
-#: unpack-trees.c:130
-#, c-format
-msgid ""
-"Your local changes to the following files would be overwritten by %s:\n"
-"%%s"
-msgstr ""
-"您对下列文件的本地修改将被 %s 覆盖：\n"
-"%%s"
-
-#: unpack-trees.c:135
-#, c-format
-msgid ""
-"Updating the following directories would lose untracked files in them:\n"
-"%s"
-msgstr ""
-"更新如下目录将会丢失其中未跟踪的文件：\n"
-"%s"
-
-#: unpack-trees.c:138
-#, c-format
-msgid ""
-"Refusing to remove the current working directory:\n"
-"%s"
-msgstr ""
-"拒绝删除当前工作目录：\n"
-"%s"
-
-#: unpack-trees.c:142
-#, c-format
-msgid ""
-"The following untracked working tree files would be removed by checkout:\n"
-"%%sPlease move or remove them before you switch branches."
-msgstr ""
-"工作区中下列未跟踪的文件将会因为检出操作而被删除：\n"
-"%%s请在切换分支之前移动或删除。"
-
-#: unpack-trees.c:144
-#, c-format
-msgid ""
-"The following untracked working tree files would be removed by checkout:\n"
-"%%s"
-msgstr ""
-"工作区中下列未跟踪的文件将会因为检出操作而被删除：\n"
-"%%s"
-
-#: unpack-trees.c:147
-#, c-format
-msgid ""
-"The following untracked working tree files would be removed by merge:\n"
-"%%sPlease move or remove them before you merge."
-msgstr ""
-"工作区中下列未跟踪的文件将会因为合并操作而被删除：\n"
-"%%s请在合并前移动或删除。"
-
-#: unpack-trees.c:149
-#, c-format
-msgid ""
-"The following untracked working tree files would be removed by merge:\n"
-"%%s"
-msgstr ""
-"工作区中下列未跟踪的文件将会因为合并操作而被删除：\n"
-"%%s"
-
-#: unpack-trees.c:152
-#, c-format
-msgid ""
-"The following untracked working tree files would be removed by %s:\n"
-"%%sPlease move or remove them before you %s."
-msgstr ""
-"工作区中下列未跟踪的文件将会因为 %s 操作而被删除：\n"
-"%%s请在 %s 前移动或删除。"
-
-#: unpack-trees.c:154
-#, c-format
-msgid ""
-"The following untracked working tree files would be removed by %s:\n"
-"%%s"
-msgstr ""
-"工作区中下列未跟踪的文件将会因为 %s 操作而被删除：\n"
-"%%s"
-
-#: unpack-trees.c:160
-#, c-format
-msgid ""
-"The following untracked working tree files would be overwritten by "
-"checkout:\n"
-"%%sPlease move or remove them before you switch branches."
-msgstr ""
-"工作区中下列未跟踪的文件将会因为检出操作而被覆盖：\n"
-"%%s请在切换分支前移动或删除。"
-
-#: unpack-trees.c:162
-#, c-format
-msgid ""
-"The following untracked working tree files would be overwritten by "
-"checkout:\n"
-"%%s"
-msgstr ""
-"工作区中下列未跟踪的文件将会因为检出操作而被覆盖：\n"
-"%%s"
-
-#: unpack-trees.c:165
-#, c-format
-msgid ""
-"The following untracked working tree files would be overwritten by merge:\n"
-"%%sPlease move or remove them before you merge."
-msgstr ""
-"工作区中下列未跟踪的文件将会因为合并操作而被覆盖：\n"
-"%%s请在合并前移动或删除。"
-
-#: unpack-trees.c:167
-#, c-format
-msgid ""
-"The following untracked working tree files would be overwritten by merge:\n"
-"%%s"
-msgstr ""
-"工作区中下列未跟踪的文件将会因为合并操作而被覆盖：\n"
-"%%s"
-
-#: unpack-trees.c:170
-#, c-format
-msgid ""
-"The following untracked working tree files would be overwritten by %s:\n"
-"%%sPlease move or remove them before you %s."
-msgstr ""
-"工作区中下列未跟踪的文件将会因为 %s 操作而被覆盖：\n"
-"%%s请在 %s 前移动或删除。"
-
-#: unpack-trees.c:172
-#, c-format
-msgid ""
-"The following untracked working tree files would be overwritten by %s:\n"
-"%%s"
-msgstr ""
-"工作区中下列未跟踪的文件将会因为 %s 操作而被覆盖：\n"
-"%%s"
-
-#: unpack-trees.c:180
-#, c-format
-msgid "Entry '%s' overlaps with '%s'.  Cannot bind."
-msgstr "条目 '%s' 和 '%s' 重叠。无法合并。"
-
-#: unpack-trees.c:183
-#, c-format
-msgid ""
-"Cannot update submodule:\n"
-"%s"
-msgstr ""
-"无法更新子模组：\n"
-"%s"
-
-#: unpack-trees.c:186
-#, c-format
-msgid ""
-"The following paths are not up to date and were left despite sparse "
-"patterns:\n"
-"%s"
-msgstr ""
-"尽管存在稀疏检出模板，以下路径不是最新，因而保留：\n"
-"%s"
-
-#: unpack-trees.c:188
-#, c-format
-msgid ""
-"The following paths are unmerged and were left despite sparse patterns:\n"
-"%s"
-msgstr ""
-"尽管存在稀疏检出模板，以下路径处于未合并状态，因而保留：\n"
-"%s"
-
-#: unpack-trees.c:190
-#, c-format
-msgid ""
-"The following paths were already present and thus not updated despite sparse "
-"patterns:\n"
-"%s"
-msgstr ""
-"尽管存在稀疏检出模板，以下路径已经存在，因而未更新：\n"
-"%s"
-
-#: unpack-trees.c:270
-#, c-format
-msgid "Aborting\n"
-msgstr "正在终止\n"
-
-#: unpack-trees.c:297
-#, c-format
-msgid ""
-"After fixing the above paths, you may want to run `git sparse-checkout "
-"reapply`.\n"
-msgstr "在修复上述路径之后，您可能要执行 `git sparse-checkout reapply`。\n"
-
-#: unpack-trees.c:358
-msgid "Updating files"
-msgstr "正在更新文件"
-
-#: unpack-trees.c:390
-msgid ""
-"the following paths have collided (e.g. case-sensitive paths\n"
-"on a case-insensitive filesystem) and only one from the same\n"
-"colliding group is in the working tree:\n"
-msgstr ""
-"以下路径发生碰撞（如：在不区分大小写的文件系统上的区分大小写的路径），\n"
-"并且碰撞组中只有一个文件存在工作区中：\n"
-
-#: unpack-trees.c:1664
-msgid "Updating index flags"
-msgstr "正在更新索引标志"
-
-#: unpack-trees.c:2925
-#, c-format
-msgid "worktree and untracked commit have duplicate entries: %s"
-msgstr "工作树和未跟踪提交具有重复条目：%s"
-
-#: upload-pack.c:1579
-msgid "expected flush after fetch arguments"
-msgstr "在 fetch 参数之后应该有一个 flush 包"
-
-#: urlmatch.c:163
-msgid "invalid URL scheme name or missing '://' suffix"
-msgstr "无效的 URL 方案名称或丢失 '://' 后缀"
-
-#: urlmatch.c:187 urlmatch.c:346 urlmatch.c:405
-#, c-format
-msgid "invalid %XX escape sequence"
-msgstr "无效的 %XX 转义序列"
-
-#: urlmatch.c:215
-msgid "missing host and scheme is not 'file:'"
-msgstr "缺失主机名且 URL 方案不是 'file:'"
-
-#: urlmatch.c:232
-msgid "a 'file:' URL may not have a port number"
-msgstr "一个 'file:' URL 不应该包含端口号"
-
-#: urlmatch.c:247
-msgid "invalid characters in host name"
-msgstr "主机名中包含无效的字符"
-
-#: urlmatch.c:292 urlmatch.c:303
-msgid "invalid port number"
-msgstr "无效的端口号"
-
-#: urlmatch.c:371
-msgid "invalid '..' path segment"
-msgstr "无效的 '..' 路径片段"
-
-#: walker.c:170
-msgid "Fetching objects"
-msgstr "正在获取对象"
-
-#: worktree.c:237 builtin/am.c:2210 builtin/bisect--helper.c:156
-#, c-format
-msgid "failed to read '%s'"
-msgstr "无法读取 '%s'"
-
-#: worktree.c:304
-#, c-format
-msgid "'%s' at main working tree is not the repository directory"
-msgstr "在主工作区的 '%s' 不是仓库目录"
-
-#: worktree.c:315
-#, c-format
-msgid "'%s' file does not contain absolute path to the working tree location"
-msgstr "文件 '%s' 不包含工作区的绝对路径"
-
-#: worktree.c:327
-#, c-format
-msgid "'%s' does not exist"
-msgstr "'%s' 不存在"
-
-#: worktree.c:333
-#, c-format
-msgid "'%s' is not a .git file, error code %d"
-msgstr "'%s' 不是一个 .git 文件，错误码 %d"
-
-#: worktree.c:342
-#, c-format
-msgid "'%s' does not point back to '%s'"
-msgstr "'%s' 没有指回到 '%s'"
-
-#: worktree.c:600
-msgid "not a directory"
-msgstr "不是一个目录"
-
-#: worktree.c:609
-msgid ".git is not a file"
-msgstr ".git 不是一个文件"
-
-#: worktree.c:611
-msgid ".git file broken"
-msgstr ".git 文件损坏"
-
-#: worktree.c:613
-msgid ".git file incorrect"
-msgstr ".git 文件不正确"
-
-#: worktree.c:719
-msgid "not a valid path"
-msgstr "不是一个有效的路径"
-
-#: worktree.c:725
-msgid "unable to locate repository; .git is not a file"
-msgstr "无法定位仓库，.git 不是一个文件"
-
-#: worktree.c:729
-msgid "unable to locate repository; .git file does not reference a repository"
-msgstr "无法定位仓库，.git 文件没有指向一个仓库"
-
-#: worktree.c:733
-msgid "unable to locate repository; .git file broken"
-msgstr "无法定位仓库，.git 文件损坏"
-
-#: worktree.c:739
-msgid "gitdir unreadable"
-msgstr "gitdir 不可读"
-
-#: worktree.c:743
-msgid "gitdir incorrect"
-msgstr "gitdir 不正确"
-
-#: worktree.c:768
-msgid "not a valid directory"
-msgstr "不是一个有效的目录"
-
-#: worktree.c:774
-msgid "gitdir file does not exist"
-msgstr "gitdir 文件不存在"
-
-#: worktree.c:779 worktree.c:788
-#, c-format
-msgid "unable to read gitdir file (%s)"
-msgstr "无法读取 gitdir 文件（%s）"
-
-#: worktree.c:798
-#, c-format
-msgid "short read (expected %<PRIuMAX> bytes, read %<PRIuMAX>)"
-msgstr "读取过短（期望 %<PRIuMAX> 字节，读取 %<PRIuMAX>）"
-
-#: worktree.c:806
-msgid "invalid gitdir file"
-msgstr "无效的 gitdir 文件"
-
-#: worktree.c:814
-msgid "gitdir file points to non-existent location"
-msgstr "gitdir 文件指向一个不存在的位置"
-
-#: worktree.c:830
-#, c-format
-msgid "unable to set %s in '%s'"
-msgstr "无法在 '%2$s' 中设置 %1$s"
-
-#: worktree.c:832
-#, c-format
-msgid "unable to unset %s in '%s'"
-msgstr "无法在 '%2$s' 中取消设置 %1$s"
-
-#: worktree.c:852
-msgid "failed to set extensions.worktreeConfig setting"
-msgstr "无法设置 extensions.worktreeConfig"
-
-#: wrapper.c:161
-#, c-format
-msgid "could not setenv '%s'"
-msgstr "无法设置环境变量 '%s'"
-
-#: wrapper.c:213
-#, c-format
-msgid "unable to create '%s'"
-msgstr "无法创建 '%s'"
-
-#: wrapper.c:215 wrapper.c:385
-#, c-format
-msgid "could not open '%s' for reading and writing"
-msgstr "无法打开 '%s' 进行读写"
-
-#: wrapper.c:416 wrapper.c:683
-#, c-format
-msgid "unable to access '%s'"
-msgstr "不能访问 '%s'"
-
-#: wrapper.c:691
-msgid "unable to get current working directory"
-msgstr "不能获取当前工作目录"
-
-#: wt-status.c:158
-msgid "Unmerged paths:"
-msgstr "未合并的路径："
-
-#  译者：注意保持前导空格
-#: wt-status.c:187 wt-status.c:219
-msgid "  (use \"git restore --staged <file>...\" to unstage)"
-msgstr "  （使用 \"git restore --staged <文件>...\" 以取消暂存）"
-
-#  译者：注意保持前导空格
-#: wt-status.c:190 wt-status.c:222
-#, c-format
-msgid "  (use \"git restore --source=%s --staged <file>...\" to unstage)"
-msgstr "  （使用 \"git restore --source=%s --staged <文件>...\" 以取消暂存）"
-
-#  译者：注意保持前导空格
-#: wt-status.c:193 wt-status.c:225
-msgid "  (use \"git rm --cached <file>...\" to unstage)"
-msgstr "  （使用 \"git rm --cached <文件>...\" 以取消暂存）"
-
-#  译者：注意保持前导空格
-#: wt-status.c:197
-msgid "  (use \"git add <file>...\" to mark resolution)"
-msgstr "  （使用 \"git add <文件>...\" 标记解决方案）"
-
-#  译者：注意保持前导空格
-#: wt-status.c:199 wt-status.c:203
-msgid "  (use \"git add/rm <file>...\" as appropriate to mark resolution)"
-msgstr "  （酌情使用 \"git add/rm <文件>...\" 标记解决方案）"
-
-#  译者：注意保持前导空格
-#: wt-status.c:201
-msgid "  (use \"git rm <file>...\" to mark resolution)"
-msgstr "  （使用 \"git rm <文件>...\" 标记解决方案）"
-
-#: wt-status.c:211 wt-status.c:1140
-msgid "Changes to be committed:"
-msgstr "要提交的变更："
-
-#: wt-status.c:234 wt-status.c:1149
-msgid "Changes not staged for commit:"
-msgstr "尚未暂存以备提交的变更："
-
-#  译者：注意保持前导空格
-#: wt-status.c:238
-msgid "  (use \"git add <file>...\" to update what will be committed)"
-msgstr "  （使用 \"git add <文件>...\" 更新要提交的内容）"
-
-#  译者：注意保持前导空格
-#: wt-status.c:240
-msgid "  (use \"git add/rm <file>...\" to update what will be committed)"
-msgstr "  （使用 \"git add/rm <文件>...\" 更新要提交的内容）"
-
-#  译者：注意保持前导空格
-#: wt-status.c:241
-msgid ""
-"  (use \"git restore <file>...\" to discard changes in working directory)"
-msgstr "  （使用 \"git restore <文件>...\" 丢弃工作区的改动）"
-
-#  译者：注意保持前导空格
-#: wt-status.c:243
-msgid "  (commit or discard the untracked or modified content in submodules)"
-msgstr "  （提交或丢弃子模组中未跟踪或修改的内容）"
-
-#  译者：注意保持前导空格
-#: wt-status.c:254
-#, c-format
-msgid "  (use \"git %s <file>...\" to include in what will be committed)"
-msgstr "  （使用 \"git %s <文件>...\" 以包含要提交的内容）"
-
-#: wt-status.c:266
-msgid "both deleted:"
-msgstr "双方删除："
-
-#: wt-status.c:268
-msgid "added by us:"
-msgstr "由我们添加："
-
-#: wt-status.c:270
-msgid "deleted by them:"
-msgstr "由他们删除："
-
-#: wt-status.c:272
-msgid "added by them:"
-msgstr "由他们添加："
-
-#: wt-status.c:274
-msgid "deleted by us:"
-msgstr "由我们删除："
-
-#: wt-status.c:276
-msgid "both added:"
-msgstr "双方添加："
-
-#: wt-status.c:278
-msgid "both modified:"
-msgstr "双方修改："
-
-#: wt-status.c:288
-msgid "new file:"
-msgstr "新文件："
-
-#: wt-status.c:290
-msgid "copied:"
-msgstr "拷贝："
-
-#: wt-status.c:292
-msgid "deleted:"
-msgstr "删除："
-
-#: wt-status.c:294
-msgid "modified:"
-msgstr "修改："
-
-#: wt-status.c:296
-msgid "renamed:"
-msgstr "重命名："
-
-#: wt-status.c:298
-msgid "typechange:"
-msgstr "类型变更："
-
-#: wt-status.c:300
-msgid "unknown:"
-msgstr "未知："
-
-#: wt-status.c:302
-msgid "unmerged:"
-msgstr "未合并："
-
-#  译者：末尾两个字节可能被删减，如果翻译为中文标点会出现半个汉字
-#: wt-status.c:382
-msgid "new commits, "
-msgstr "新提交, "
-
-#  译者：末尾两个字节可能被删减，如果翻译为中文标点会出现半个汉字
-#: wt-status.c:384
-msgid "modified content, "
-msgstr "修改的内容, "
-
-#  译者：末尾两个字节可能被删减，如果翻译为中文标点会出现半个汉字
-#: wt-status.c:386
-msgid "untracked content, "
-msgstr "未跟踪的内容, "
-
-#: wt-status.c:973
-#, c-format
-msgid "Your stash currently has %d entry"
-msgid_plural "Your stash currently has %d entries"
-msgstr[0] "您的贮藏区当前有 %d 条记录"
-msgstr[1] "您的贮藏区当前有 %d 条记录"
-
-#: wt-status.c:1004
-msgid "Submodules changed but not updated:"
-msgstr "子模组已修改但尚未更新："
-
-#: wt-status.c:1006
-msgid "Submodule changes to be committed:"
-msgstr "要提交的子模组变更："
-
-#: wt-status.c:1088
-msgid ""
-"Do not modify or remove the line above.\n"
-"Everything below it will be ignored."
-msgstr ""
-"不要改动或删除上面的一行。\n"
-"其下所有内容都将被忽略。"
-
-#: wt-status.c:1180
-#, c-format
-msgid ""
-"\n"
-"It took %.2f seconds to compute the branch ahead/behind values.\n"
-"You can use '--no-ahead-behind' to avoid this.\n"
-msgstr ""
-"\n"
-"花了 %.2f 秒才计算出分支的领先/落后范围。\n"
-"为避免，您可以使用 '--no-ahead-behind'。\n"
-
-#: wt-status.c:1210
-msgid "You have unmerged paths."
-msgstr "您有尚未合并的路径。"
-
-#  译者：注意保持前导空格
-#: wt-status.c:1213
-msgid "  (fix conflicts and run \"git commit\")"
-msgstr "  （解决冲突并运行 \"git commit\"）"
-
-#  译者：注意保持前导空格
-#: wt-status.c:1215
-msgid "  (use \"git merge --abort\" to abort the merge)"
-msgstr "  （使用 \"git merge --abort\" 终止合并）"
-
-#: wt-status.c:1219
-msgid "All conflicts fixed but you are still merging."
-msgstr "所有冲突已解决但您仍处于合并中。"
-
-#  译者：注意保持前导空格
-#: wt-status.c:1222
-msgid "  (use \"git commit\" to conclude merge)"
-msgstr "  （使用 \"git commit\" 结束合并）"
-
-#: wt-status.c:1233
-msgid "You are in the middle of an am session."
-msgstr "您正处于 am 操作过程中。"
-
-#: wt-status.c:1236
-msgid "The current patch is empty."
-msgstr "当前的补丁为空。"
-
-#  译者：注意保持前导空格
-#: wt-status.c:1241
-msgid "  (fix conflicts and then run \"git am --continue\")"
-msgstr "  （解决冲突，然后运行 \"git am --continue\"）"
-
-#  译者：注意保持前导空格
-#: wt-status.c:1243
-msgid "  (use \"git am --skip\" to skip this patch)"
-msgstr "  （使用 \"git am --skip\" 跳过此补丁）"
-
-#  译者：注意保持前导空格
-#: wt-status.c:1246
-msgid ""
-"  (use \"git am --allow-empty\" to record this patch as an empty commit)"
-msgstr "  （使用 \"git am --allow-empty\" 将这个补丁记录为空提交）"
-
-#  译者：注意保持前导空格
-#: wt-status.c:1248
-msgid "  (use \"git am --abort\" to restore the original branch)"
-msgstr "  （使用 \"git am --abort\" 恢复原有分支）"
-
-#: wt-status.c:1381
-msgid "git-rebase-todo is missing."
-msgstr "git-rebase-todo 丢失。"
-
-#: wt-status.c:1383
-msgid "No commands done."
-msgstr "没有命令被执行。"
-
-#: wt-status.c:1386
-#, c-format
-msgid "Last command done (%<PRIuMAX> command done):"
-msgid_plural "Last commands done (%<PRIuMAX> commands done):"
-msgstr[0] "最后完成的命令（%<PRIuMAX> 条命令被执行）："
-msgstr[1] "最后完成的命令（%<PRIuMAX> 条命令被执行）："
-
-#: wt-status.c:1397
-#, c-format
-msgid "  (see more in file %s)"
-msgstr "  （更多参见文件 %s）"
-
-#: wt-status.c:1402
-msgid "No commands remaining."
-msgstr "未剩下任何命令。"
-
-#: wt-status.c:1405
-#, c-format
-msgid "Next command to do (%<PRIuMAX> remaining command):"
-msgid_plural "Next commands to do (%<PRIuMAX> remaining commands):"
-msgstr[0] "接下来要执行的命令（剩余 %<PRIuMAX> 条命令）："
-msgstr[1] "接下来要执行的命令（剩余 %<PRIuMAX> 条命令）："
-
-#  译者：注意保持前导空格
-#: wt-status.c:1413
-msgid "  (use \"git rebase --edit-todo\" to view and edit)"
-msgstr "  （使用 \"git rebase --edit-todo\" 来查看和编辑）"
-
-#: wt-status.c:1425
-#, c-format
-msgid "You are currently rebasing branch '%s' on '%s'."
-msgstr "您在执行将分支 '%s' 变基到 '%s' 的操作。"
-
-#: wt-status.c:1430
-msgid "You are currently rebasing."
-msgstr "您在执行变基操作。"
-
-#  译者：注意保持前导空格
-#: wt-status.c:1443
-msgid "  (fix conflicts and then run \"git rebase --continue\")"
-msgstr "  （解决冲突，然后运行 \"git rebase --continue\"）"
-
-#  译者：注意保持前导空格
-#: wt-status.c:1445
-msgid "  (use \"git rebase --skip\" to skip this patch)"
-msgstr "  （使用 \"git rebase --skip\" 跳过此补丁）"
-
-#  译者：注意保持前导空格
-#: wt-status.c:1447
-msgid "  (use \"git rebase --abort\" to check out the original branch)"
-msgstr "  （使用 \"git rebase --abort\" 以检出原有分支）"
-
-#  译者：注意保持前导空格
-#: wt-status.c:1454
-msgid "  (all conflicts fixed: run \"git rebase --continue\")"
-msgstr "  （所有冲突已解决：运行 \"git rebase --continue\"）"
-
-#: wt-status.c:1458
-#, c-format
-msgid ""
-"You are currently splitting a commit while rebasing branch '%s' on '%s'."
-msgstr "您在执行将分支 '%s' 变基到 '%s' 的操作时拆分提交。"
-
-#: wt-status.c:1463
-msgid "You are currently splitting a commit during a rebase."
-msgstr "您在执行变基操作时拆分提交。"
-
-#  译者：注意保持前导空格
-#: wt-status.c:1466
-msgid "  (Once your working directory is clean, run \"git rebase --continue\")"
-msgstr "  （一旦您工作目录提交干净后，运行 \"git rebase --continue\"）"
-
-#: wt-status.c:1470
-#, c-format
-msgid "You are currently editing a commit while rebasing branch '%s' on '%s'."
-msgstr "您在执行将分支 '%s' 变基到 '%s' 的操作时编辑提交。"
-
-#: wt-status.c:1475
-msgid "You are currently editing a commit during a rebase."
-msgstr "您在执行变基操作时编辑提交。"
-
-#  译者：注意保持前导空格
-#: wt-status.c:1478
-msgid "  (use \"git commit --amend\" to amend the current commit)"
-msgstr "  （使用 \"git commit --amend\" 修补当前提交）"
-
-#  译者：注意保持前导空格
-#: wt-status.c:1480
-msgid ""
-"  (use \"git rebase --continue\" once you are satisfied with your changes)"
-msgstr "  （当您对您的修改满意后执行 \"git rebase --continue\"）"
-
-#: wt-status.c:1491
-msgid "Cherry-pick currently in progress."
-msgstr "拣选操作正在进行中。"
-
-#: wt-status.c:1494
-#, c-format
-msgid "You are currently cherry-picking commit %s."
-msgstr "您在执行拣选提交 %s 的操作。"
-
-#  译者：注意保持前导空格
-#: wt-status.c:1501
-msgid "  (fix conflicts and run \"git cherry-pick --continue\")"
-msgstr "  （解决冲突并运行 \"git cherry-pick --continue\"）"
-
-#  译者：注意保持前导空格
-#: wt-status.c:1504
-msgid "  (run \"git cherry-pick --continue\" to continue)"
-msgstr "  （执行 \"git cherry-pick --continue\" 以继续）"
-
-#  译者：注意保持前导空格
-#: wt-status.c:1507
-msgid "  (all conflicts fixed: run \"git cherry-pick --continue\")"
-msgstr "  （所有冲突已解决：运行 \"git cherry-pick --continue\"）"
-
-#  译者：注意保持前导空格
-#: wt-status.c:1509
-msgid "  (use \"git cherry-pick --skip\" to skip this patch)"
-msgstr "  （使用 \"git cherry-pick --skip\" 跳过此补丁）"
-
-#  译者：注意保持前导空格
-#: wt-status.c:1511
-msgid "  (use \"git cherry-pick --abort\" to cancel the cherry-pick operation)"
-msgstr "  （使用 \"git cherry-pick --abort\" 以取消拣选操作）"
-
-#: wt-status.c:1521
-msgid "Revert currently in progress."
-msgstr "还原操作正在行中。"
-
-#: wt-status.c:1524
-#, c-format
-msgid "You are currently reverting commit %s."
-msgstr "您在执行反转提交 %s 的操作。"
-
-#  译者：注意保持前导空格
-#: wt-status.c:1530
-msgid "  (fix conflicts and run \"git revert --continue\")"
-msgstr "  （解决冲突并执行 \"git revert --continue\"）"
-
-#  译者：注意保持前导空格
-#: wt-status.c:1533
-msgid "  (run \"git revert --continue\" to continue)"
-msgstr "  （执行 \"git revert --continue\" 以继续）"
-
-#  译者：注意保持前导空格
-#: wt-status.c:1536
-msgid "  (all conflicts fixed: run \"git revert --continue\")"
-msgstr "  （所有冲突已解决：执行 \"git revert --continue\"）"
-
-#  译者：注意保持前导空格
-#: wt-status.c:1538
-msgid "  (use \"git revert --skip\" to skip this patch)"
-msgstr "  （使用 \"git revert --skip\" 跳过此补丁）"
-
-#  译者：注意保持前导空格
-#: wt-status.c:1540
-msgid "  (use \"git revert --abort\" to cancel the revert operation)"
-msgstr "  （使用 \"git revert --abort\" 以取消反转提交操作）"
-
-#: wt-status.c:1550
-#, c-format
-msgid "You are currently bisecting, started from branch '%s'."
-msgstr "您在执行从分支 '%s' 开始的二分查找操作。"
-
-#: wt-status.c:1554
-msgid "You are currently bisecting."
-msgstr "您在执行二分查找操作。"
-
-#  译者：注意保持前导空格
-#: wt-status.c:1557
-msgid "  (use \"git bisect reset\" to get back to the original branch)"
-msgstr "  （使用 \"git bisect reset\" 以回到原有分支）"
-
-#: wt-status.c:1568
-msgid "You are in a sparse checkout."
-msgstr "您处于一个稀疏检出中。"
-
-#: wt-status.c:1571
-#, c-format
-msgid "You are in a sparse checkout with %d%% of tracked files present."
-msgstr "您处于稀疏检出状态，包含 %d%% 的跟踪文件"
-
-#: wt-status.c:1815
-msgid "On branch "
-msgstr "位于分支 "
-
-#: wt-status.c:1822
-msgid "interactive rebase in progress; onto "
-msgstr "交互式变基操作正在进行中；至 "
-
-#: wt-status.c:1824
-msgid "rebase in progress; onto "
-msgstr "变基操作正在进行中；至 "
-
-#: wt-status.c:1829
-msgid "HEAD detached at "
-msgstr "头指针分离于 "
-
-#: wt-status.c:1831
-msgid "HEAD detached from "
-msgstr "头指针分离自 "
-
-#: wt-status.c:1834
-msgid "Not currently on any branch."
-msgstr "当前不在任何分支上。"
-
-#: wt-status.c:1851
-msgid "Initial commit"
-msgstr "初始提交"
-
-#: wt-status.c:1852
-msgid "No commits yet"
-msgstr "尚无提交"
-
-#: wt-status.c:1866
-msgid "Untracked files"
-msgstr "未跟踪的文件"
-
-#: wt-status.c:1868
-msgid "Ignored files"
-msgstr "忽略的文件"
-
-#: wt-status.c:1872
-#, c-format
-msgid ""
-"It took %.2f seconds to enumerate untracked files. 'status -uno'\n"
-"may speed it up, but you have to be careful not to forget to add\n"
-"new files yourself (see 'git help status')."
-msgstr ""
-"耗费了 %.2f 秒以枚举未跟踪的文件。'status -uno' 也许能提高速度，\n"
-"但您需要小心不要忘了添加新文件（参见 'git help status'）。"
-
-#: wt-status.c:1878
-#, c-format
-msgid "Untracked files not listed%s"
-msgstr "未跟踪的文件没有列出%s"
-
-#  译者：中文字符串拼接，可删除前导空格
-#: wt-status.c:1880
-msgid " (use -u option to show untracked files)"
-msgstr "（使用 -u 参数显示未跟踪的文件）"
-
-#: wt-status.c:1886
-msgid "No changes"
-msgstr "没有修改"
-
-#: wt-status.c:1891
-#, c-format
-msgid "no changes added to commit (use \"git add\" and/or \"git commit -a\")\n"
-msgstr "修改尚未加入提交（使用 \"git add\" 和/或 \"git commit -a\"）\n"
-
-#: wt-status.c:1895
-#, c-format
-msgid "no changes added to commit\n"
-msgstr "修改尚未加入提交\n"
-
-#: wt-status.c:1899
-#, c-format
-msgid ""
-"nothing added to commit but untracked files present (use \"git add\" to "
-"track)\n"
-msgstr "提交为空，但是存在尚未跟踪的文件（使用 \"git add\" 建立跟踪）\n"
-
-#: wt-status.c:1903
-#, c-format
-msgid "nothing added to commit but untracked files present\n"
-msgstr "提交为空，但是存在尚未跟踪的文件\n"
-
-#: wt-status.c:1907
-#, c-format
-msgid "nothing to commit (create/copy files and use \"git add\" to track)\n"
-msgstr "无文件要提交（创建/拷贝文件并使用 \"git add\" 建立跟踪）\n"
-
-#: wt-status.c:1911 wt-status.c:1917
-#, c-format
-msgid "nothing to commit\n"
-msgstr "无文件要提交\n"
-
-#: wt-status.c:1914
-#, c-format
-msgid "nothing to commit (use -u to show untracked files)\n"
-msgstr "无文件要提交（使用 -u 显示未跟踪的文件）\n"
-
-#: wt-status.c:1919
-#, c-format
-msgid "nothing to commit, working tree clean\n"
-msgstr "无文件要提交，干净的工作区\n"
-
-#: wt-status.c:2024
-msgid "No commits yet on "
-msgstr "尚无提交在 "
-
-#: wt-status.c:2028
-msgid "HEAD (no branch)"
-msgstr "HEAD（非分支）"
-
-#: wt-status.c:2059
-msgid "different"
-msgstr "不同"
-
-#  译者：注意保持句尾空格
-#: wt-status.c:2061 wt-status.c:2069
-msgid "behind "
-msgstr "落后 "
-
-#: wt-status.c:2064 wt-status.c:2067
-msgid "ahead "
-msgstr "领先 "
-
-#. TRANSLATORS: the action is e.g. "pull with rebase"
-#: wt-status.c:2605
-#, c-format
-msgid "cannot %s: You have unstaged changes."
-msgstr "不能%s：您有未暂存的变更。"
-
-#: wt-status.c:2611
-msgid "additionally, your index contains uncommitted changes."
-msgstr "另外，您的索引中包含未提交的变更。"
-
-#: wt-status.c:2613
-#, c-format
-msgid "cannot %s: Your index contains uncommitted changes."
-msgstr "不能%s：您的索引中包含未提交的变更。"
-
-#: compat/simple-ipc/ipc-unix-socket.c:205
-msgid "could not send IPC command"
-msgstr "无法发送 IPC 命令"
-
-#: compat/simple-ipc/ipc-unix-socket.c:212
-msgid "could not read IPC response"
-msgstr "无法读取 IPC 响应"
-
-#: compat/simple-ipc/ipc-unix-socket.c:892
-#, c-format
-msgid "could not start accept_thread '%s'"
-msgstr "无法启动 accept_thread '%s'"
-
-#: compat/simple-ipc/ipc-unix-socket.c:904
-#, c-format
-msgid "could not start worker[0] for '%s'"
-msgstr "无法启动 '%s' 的 worker[0]"
-
-#: compat/precompose_utf8.c:58 builtin/clone.c:353
-#, c-format
-msgid "failed to unlink '%s'"
-msgstr "无法删除 '%s'"
-
-#: compat/fsmonitor/fsm-listen-darwin.c:355
-msgid "Unable to create FSEventStream."
-msgstr "无法创建 FSEventStream。"
-
-#: compat/fsmonitor/fsm-listen-darwin.c:403
-msgid "Failed to start the FSEventStream"
-msgstr "无法启动 FSEventStream"
-
-#: builtin/add.c:26
+#: builtin/add.c
 msgid "git add [<options>] [--] <pathspec>..."
 msgstr "git add [<选项>] [--] <路径规格>..."
 
-#: builtin/add.c:63
+#: builtin/add.c
 #, c-format
 msgid "cannot chmod %cx '%s'"
 msgstr "不能 chmod %cx '%s'"
 
-#: builtin/add.c:105
+#: builtin/add.c
 #, c-format
 msgid "unexpected diff status %c"
 msgstr "意外的差异状态 %c"
 
-#: builtin/add.c:110 builtin/commit.c:299
+#: builtin/add.c builtin/commit.c
 msgid "updating files failed"
 msgstr "更新文件失败"
 
-#: builtin/add.c:120
+#: builtin/add.c
 #, c-format
 msgid "remove '%s'\n"
 msgstr "删除 '%s'\n"
 
-#: builtin/add.c:204
+#: builtin/add.c
 msgid "Unstaged changes after refreshing the index:"
 msgstr "刷新索引之后尚未被暂存的变更："
 
-#: builtin/add.c:312 builtin/rev-parse.c:993
+#: builtin/add.c builtin/rev-parse.c
 msgid "Could not read the index"
 msgstr "不能读取索引"
 
-#: builtin/add.c:325
+#: builtin/add.c
 msgid "Could not write patch"
 msgstr "不能生成补丁"
 
-#: builtin/add.c:328
+#: builtin/add.c
 msgid "editing patch failed"
 msgstr "编辑补丁失败"
 
-#: builtin/add.c:331
+#: builtin/add.c
 #, c-format
 msgid "Could not stat '%s'"
 msgstr "不能对 '%s' 调用 stat"
 
-#: builtin/add.c:333
+#: builtin/add.c
 msgid "Empty patch. Aborted."
 msgstr "空补丁。异常终止。"
 
-#: builtin/add.c:339
+#: builtin/add.c
 #, c-format
 msgid "Could not apply '%s'"
 msgstr "不能应用 '%s'"
 
-#: builtin/add.c:347
+#: builtin/add.c
 msgid "The following paths are ignored by one of your .gitignore files:\n"
 msgstr "下列路径根据您的一个 .gitignore 文件而被忽略：\n"
 
-#: builtin/add.c:367 builtin/clean.c:927 builtin/fetch.c:175 builtin/mv.c:124
-#: builtin/prune-packed.c:14 builtin/pull.c:208 builtin/push.c:550
-#: builtin/remote.c:1454 builtin/rm.c:244 builtin/send-pack.c:194
+#: builtin/add.c builtin/clean.c builtin/fetch.c builtin/mv.c
+#: builtin/prune-packed.c builtin/pull.c builtin/push.c builtin/remote.c
+#: builtin/rm.c builtin/send-pack.c
 msgid "dry run"
 msgstr "演习"
 
-#: builtin/add.c:368 builtin/check-ignore.c:22 builtin/commit.c:1483
-#: builtin/count-objects.c:98 builtin/fsck.c:789 builtin/log.c:2338
-#: builtin/mv.c:123 builtin/read-tree.c:120
+#: builtin/add.c builtin/check-ignore.c builtin/commit.c
+#: builtin/count-objects.c builtin/fsck.c builtin/log.c builtin/mv.c
+#: builtin/read-tree.c
 msgid "be verbose"
 msgstr "冗长输出"
 
-#: builtin/add.c:370
+#: builtin/add.c
 msgid "interactive picking"
 msgstr "交互式拣选"
 
-#: builtin/add.c:371 builtin/checkout.c:1599 builtin/reset.c:417
+#: builtin/add.c builtin/checkout.c builtin/reset.c
 msgid "select hunks interactively"
 msgstr "交互式挑选数据块"
 
-#: builtin/add.c:372
+#: builtin/add.c
 msgid "edit current diff and apply"
 msgstr "编辑当前差异并应用"
 
-#: builtin/add.c:373
+#: builtin/add.c
 msgid "allow adding otherwise ignored files"
 msgstr "允许添加忽略的文件"
 
-#: builtin/add.c:374
+#: builtin/add.c
 msgid "update tracked files"
 msgstr "更新已跟踪的文件"
 
-#: builtin/add.c:375
+#: builtin/add.c
 msgid "renormalize EOL of tracked files (implies -u)"
 msgstr "对已跟踪文件（暗含 -u）重新归一换行符"
 
-#: builtin/add.c:376
+#: builtin/add.c
 msgid "record only the fact that the path will be added later"
 msgstr "只记录，该路径稍后再添加"
 
-#: builtin/add.c:377
+#: builtin/add.c
 msgid "add changes from all tracked and untracked files"
 msgstr "添加所有改变的已跟踪文件和未跟踪文件"
 
-#: builtin/add.c:380
+#: builtin/add.c
 msgid "ignore paths removed in the working tree (same as --no-all)"
 msgstr "忽略工作区中移除的路径（和 --no-all 相同）"
 
-#: builtin/add.c:382
+#: builtin/add.c
 msgid "don't add, only refresh the index"
 msgstr "不添加，只刷新索引"
 
-#: builtin/add.c:383
+#: builtin/add.c
 msgid "just skip files which cannot be added because of errors"
 msgstr "跳过因出错不能添加的文件"
 
-#: builtin/add.c:384
+#: builtin/add.c
 msgid "check if - even missing - files are ignored in dry run"
 msgstr "检查在演习模式下文件（即使不存在）是否被忽略"
 
-#: builtin/add.c:385 builtin/mv.c:128 builtin/rm.c:251
+#: builtin/add.c builtin/mv.c builtin/rm.c
 msgid "allow updating entries outside of the sparse-checkout cone"
 msgstr "允许更新稀疏检出锥以外的条目"
 
-#: builtin/add.c:387 builtin/update-index.c:1023
+#: builtin/add.c builtin/update-index.c
 msgid "override the executable bit of the listed files"
 msgstr "覆盖列表里文件的可执行位"
 
-#: builtin/add.c:389
+#: builtin/add.c
 msgid "warn when adding an embedded repository"
 msgstr "创建一个嵌入式仓库时给予警告"
 
-#: builtin/add.c:407
+#: builtin/add.c
 #, c-format
 msgid ""
 "You've added another git repository inside your current repository.\n"
@@ -10687,12 +2297,12 @@ msgstr ""
 "\n"
 "参见 \"git help submodule\" 获取更多信息。"
 
-#: builtin/add.c:436
+#: builtin/add.c
 #, c-format
 msgid "adding embedded git repository: %s"
 msgstr "正在添加嵌入式 git 仓库：%s"
 
-#: builtin/add.c:456
+#: builtin/add.c
 msgid ""
 "Use -f if you really want to add them.\n"
 "Turn this message off by running\n"
@@ -10702,27 +2312,27 @@ msgstr ""
 "运行下面的命令来关闭本消息\n"
 "\"git config advice.addIgnoredFile false\""
 
-#: builtin/add.c:471
+#: builtin/add.c
 msgid "adding files failed"
 msgstr "添加文件失败"
 
-#: builtin/add.c:534
+#: builtin/add.c
 #, c-format
 msgid "--chmod param '%s' must be either -x or +x"
 msgstr "参数 --chmod 取值 '%s' 必须是 -x 或 +x"
 
-#: builtin/add.c:555 builtin/checkout.c:1770 builtin/commit.c:365
-#: builtin/reset.c:436 builtin/rm.c:275 builtin/stash.c:1702
+#: builtin/add.c builtin/checkout.c builtin/commit.c builtin/reset.c
+#: builtin/rm.c builtin/stash.c
 #, c-format
 msgid "'%s' and pathspec arguments cannot be used together"
 msgstr "'%s' 和路径规格参数不能同时使用"
 
-#: builtin/add.c:566
+#: builtin/add.c
 #, c-format
 msgid "Nothing specified, nothing added.\n"
 msgstr "没有指定文件，也没有文件被添加。\n"
 
-#: builtin/add.c:568
+#: builtin/add.c
 msgid ""
 "Maybe you wanted to say 'git add .'?\n"
 "Turn this message off by running\n"
@@ -10732,106 +2342,150 @@ msgstr ""
 "运行下面的命令来关闭本消息\n"
 "\"git config advice.addEmptyPathspec false\""
 
-#: builtin/am.c:393
+#: builtin/add.c builtin/check-ignore.c builtin/checkout.c builtin/clean.c
+#: builtin/commit.c builtin/diff-tree.c builtin/grep.c builtin/mv.c
+#: builtin/reset.c builtin/rm.c builtin/submodule--helper.c read-cache.c
+#: rerere.c submodule.c
+msgid "index file corrupt"
+msgstr "索引文件损坏"
+
+#: builtin/am.c builtin/mailinfo.c mailinfo.c
+#, c-format
+msgid "bad action '%s' for '%s'"
+msgstr "'%2$s' 的错误动作 '%1$s'"
+
+#: builtin/am.c builtin/blame.c builtin/fetch.c builtin/pack-objects.c
+#: builtin/pull.c diff-merges.c gpg-interface.c ls-refs.c parallel-checkout.c
+#: sequencer.c setup.c
+#, c-format
+msgid "invalid value for '%s': '%s'"
+msgstr "'%s' 的值无效：'%s'"
+
+#: builtin/am.c builtin/commit.c builtin/merge.c sequencer.c
+#, c-format
+msgid "could not read '%s'"
+msgstr "不能读取 '%s'"
+
+#: builtin/am.c
 msgid "could not parse author script"
 msgstr "不能解析作者脚本"
 
-#: builtin/am.c:483
+#: builtin/am.c builtin/replace.c commit.c sequencer.c
+#, c-format
+msgid "could not parse %s"
+msgstr "不能解析 %s"
+
+#: builtin/am.c
 #, c-format
 msgid "'%s' was deleted by the applypatch-msg hook"
 msgstr "'%s' 被 applypatch-msg 钩子删除"
 
-#: builtin/am.c:525
+#: builtin/am.c
 #, c-format
 msgid "Malformed input line: '%s'."
 msgstr "非法的输入行：'%s'。"
 
-#: builtin/am.c:563
+#: builtin/am.c
 #, c-format
 msgid "Failed to copy notes from '%s' to '%s'"
 msgstr "从 '%s' 拷贝注解到 '%s' 时失败"
 
-#: builtin/am.c:589
+#: builtin/am.c
 msgid "fseek failed"
 msgstr "fseek 失败"
 
-#: builtin/am.c:777
+#: builtin/am.c builtin/rebase.c sequencer.c wrapper.c
+#, c-format
+msgid "could not open '%s' for reading"
+msgstr "无法打开 '%s' 进行读取"
+
+#: builtin/am.c builtin/rebase.c strbuf.c wrapper.c
+#, c-format
+msgid "could not open '%s' for writing"
+msgstr "无法打开 '%s' 进行写入"
+
+#: builtin/am.c
 #, c-format
 msgid "could not parse patch '%s'"
 msgstr "无法解析补丁 '%s'"
 
-#: builtin/am.c:842
+#: builtin/am.c
 msgid "Only one StGIT patch series can be applied at once"
 msgstr "一次只能有一个 StGIT 补丁队列被应用"
 
-#: builtin/am.c:890
+#: builtin/am.c
 msgid "invalid timestamp"
 msgstr "无效的时间戳"
 
-#: builtin/am.c:895 builtin/am.c:907
+#: builtin/am.c
 msgid "invalid Date line"
 msgstr "无效的日期行"
 
-#: builtin/am.c:902
+#: builtin/am.c
 msgid "invalid timezone offset"
 msgstr "无效的时区偏移值"
 
-#: builtin/am.c:995
+#: builtin/am.c
 msgid "Patch format detection failed."
 msgstr "补丁格式探测失败。"
 
-#: builtin/am.c:1000 builtin/clone.c:306
+#: builtin/am.c builtin/clone.c
 #, c-format
 msgid "failed to create directory '%s'"
 msgstr "无法创建目录 '%s'"
 
-#: builtin/am.c:1005
+#: builtin/am.c
 msgid "Failed to split patches."
 msgstr "无法拆分补丁。"
 
-#: builtin/am.c:1154
+#: builtin/am.c
 #, c-format
 msgid "When you have resolved this problem, run \"%s --continue\"."
 msgstr "当您解决这一问题，执行 \"%s --continue\"。"
 
-#: builtin/am.c:1155
+#: builtin/am.c
 #, c-format
 msgid "If you prefer to skip this patch, run \"%s --skip\" instead."
 msgstr "如果您想要跳过这一补丁，则执行 \"%s --skip\"。"
 
-#: builtin/am.c:1160
+#: builtin/am.c
 #, c-format
 msgid "To record the empty patch as an empty commit, run \"%s --allow-empty\"."
 msgstr "若要把空补丁记录为空提交，执行 \"%s --allow-empty\"。"
 
-#: builtin/am.c:1162
+#: builtin/am.c
 #, c-format
 msgid "To restore the original branch and stop patching, run \"%s --abort\"."
 msgstr "若要复原至原始分支并停止补丁操作，执行 \"%s --abort\"。"
 
-#: builtin/am.c:1257
+#: builtin/am.c
 msgid "Patch sent with format=flowed; space at the end of lines might be lost."
 msgstr "补丁使用 format=flowed 格式发送，行尾的空格可能会丢失。"
 
-#: builtin/am.c:1345
+#: builtin/am.c
 #, c-format
 msgid "missing author line in commit %s"
 msgstr "在提交 %s 中缺失作者行"
 
-#: builtin/am.c:1348
+#: builtin/am.c
 #, c-format
 msgid "invalid ident line: %.*s"
 msgstr "无效的身份标识：%.*s"
 
-#: builtin/am.c:1567
+#: builtin/am.c builtin/checkout.c builtin/clone.c commit-graph.c
+#, c-format
+msgid "unable to parse commit %s"
+msgstr "不能解析提交 %s"
+
+#: builtin/am.c
 msgid "Repository lacks necessary blobs to fall back on 3-way merge."
 msgstr "仓库缺乏必要的数据对象以进行三方合并。"
 
-#: builtin/am.c:1569
+#: builtin/am.c
 msgid "Using index info to reconstruct a base tree..."
 msgstr "使用索引来重建一个（三方合并的）基础目录树..."
 
-#: builtin/am.c:1588
+#: builtin/am.c
 msgid ""
 "Did you hand edit your patch?\n"
 "It does not apply to blobs recorded in its index."
@@ -10839,24 +2493,33 @@ msgstr ""
 "您是否曾手动编辑过您的补丁？\n"
 "无法应用补丁到索引中的数据对象上。"
 
-#: builtin/am.c:1594
+#: builtin/am.c
 msgid "Falling back to patching base and 3-way merge..."
 msgstr "回落到基础版本上打补丁及进行三方合并..."
 
-#: builtin/am.c:1620
+#: builtin/am.c
 msgid "Failed to merge in the changes."
 msgstr "无法合并变更。"
 
-#: builtin/am.c:1652
+#: builtin/am.c builtin/merge.c sequencer.c
+msgid "git write-tree failed to write a tree"
+msgstr "git write-tree 无法写入树对象"
+
+#: builtin/am.c
 msgid "applying to an empty history"
 msgstr "正应用到一个空历史上"
 
-#: builtin/am.c:1704 builtin/am.c:1708
+#: builtin/am.c builtin/commit.c builtin/merge.c sequencer.c
+#: t/helper/test-fast-rebase.c
+msgid "failed to write commit object"
+msgstr "无法写提交对象"
+
+#: builtin/am.c
 #, c-format
 msgid "cannot resume: %s does not exist."
 msgstr "无法继续：%s 不存在。"
 
-#: builtin/am.c:1726
+#: builtin/am.c
 msgid "Commit Body is:"
 msgstr "提交内容为："
 
@@ -10864,57 +2527,57 @@ msgstr "提交内容为："
 #. in your translation. The program will only accept English
 #. input at this point.
 #.
-#: builtin/am.c:1736
+#: builtin/am.c
 #, 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:1782 builtin/commit.c:410
+#: builtin/am.c builtin/commit.c
 msgid "unable to write index file"
 msgstr "无法写入索引文件"
 
-#: builtin/am.c:1786
+#: builtin/am.c
 #, c-format
 msgid "Dirty index: cannot apply patches (dirty: %s)"
 msgstr "脏索引：不能应用补丁（脏文件：%s）"
 
-#: builtin/am.c:1828
+#: builtin/am.c
 #, c-format
 msgid "Skipping: %.*s"
 msgstr "跳过：%.*s"
 
-#: builtin/am.c:1833
+#: builtin/am.c
 #, c-format
 msgid "Creating an empty commit: %.*s"
 msgstr "创建空提交：%.*s"
 
-#: builtin/am.c:1837
+#: builtin/am.c
 msgid "Patch is empty."
 msgstr "补丁为空。"
 
-#: builtin/am.c:1848 builtin/am.c:1917
+#: builtin/am.c
 #, c-format
 msgid "Applying: %.*s"
 msgstr "应用：%.*s"
 
-#: builtin/am.c:1865
+#: builtin/am.c
 msgid "No changes -- Patch already applied."
 msgstr "没有变更 —— 补丁已经应用过。"
 
-#: builtin/am.c:1871
+#: builtin/am.c
 #, c-format
 msgid "Patch failed at %s %.*s"
 msgstr "打补丁失败于 %s %.*s"
 
-#: builtin/am.c:1875
+#: builtin/am.c
 msgid "Use 'git am --show-current-patch=diff' to see the failed patch"
 msgstr "用 'git am --show-current-patch=diff' 命令查看失败的补丁"
 
-#: builtin/am.c:1921
+#: builtin/am.c
 msgid "No changes - recorded it as an empty commit."
 msgstr "没有变更 —— 记录为空提交。"
 
-#: builtin/am.c:1923
+#: builtin/am.c
 msgid ""
 "No changes - did you forget to use 'git add'?\n"
 "If there is nothing left to stage, chances are that something else\n"
@@ -10924,7 +2587,7 @@ msgstr ""
 "如果没有什么要添加到暂存区的，则很可能是其它提交已经引入了相同的变更。\n"
 "您也许想要跳过这个补丁。"
 
-#: builtin/am.c:1931
+#: builtin/am.c
 msgid ""
 "You still have unmerged paths in your index.\n"
 "You should 'git add' each file with resolved conflicts to mark them as "
@@ -10935,174 +2598,175 @@ msgstr ""
 "您应该对已经冲突解决的每一个文件执行 'git add' 来标记已经完成。 \n"
 "您可以对 \"由他们删除\" 的文件执行 `git rm` 命令。"
 
-#: builtin/am.c:2039 builtin/am.c:2043 builtin/am.c:2055 builtin/reset.c:455
-#: builtin/reset.c:463
+#: builtin/am.c builtin/checkout.c builtin/clone.c builtin/stash.c merge.c
+#: rerere.c
+msgid "unable to write new index file"
+msgstr "无法写新的索引文件"
+
+#: builtin/am.c builtin/reset.c
 #, c-format
 msgid "Could not parse object '%s'."
 msgstr "不能解析对象 '%s'。"
 
-#: builtin/am.c:2091 builtin/am.c:2167
+#: builtin/am.c
 msgid "failed to clean index"
 msgstr "无法清空索引"
 
-#: builtin/am.c:2135
+#: builtin/am.c
 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:2292
+#: builtin/am.c builtin/bisect--helper.c worktree.c
+#, c-format
+msgid "failed to read '%s'"
+msgstr "无法读取 '%s'"
+
+#: builtin/am.c
 #, c-format
 msgid "options '%s=%s' and '%s=%s' cannot be used together"
 msgstr "选项 '%s=%s' 和 '%s=%s' 不能同时使用"
 
-#: builtin/am.c:2323
+#: builtin/am.c
 msgid "git am [<options>] [(<mbox> | <Maildir>)...]"
 msgstr "git am [<选项>] [(<mbox> | <Maildir>)...]"
 
-#: builtin/am.c:2324
+#: builtin/am.c
 msgid "git am [<options>] (--continue | --skip | --abort)"
 msgstr "git am [<选项>] (--continue | --skip | --abort)"
 
-#: builtin/am.c:2330
+#: builtin/am.c
 msgid "run interactively"
 msgstr "以交互式方式运行"
 
-#: builtin/am.c:2332
+#: builtin/am.c
 msgid "historical option -- no-op"
 msgstr "老的参数 —— 无作用"
 
-#: builtin/am.c:2334
+#: builtin/am.c
 msgid "allow fall back on 3way merging if needed"
 msgstr "如果必要，允许使用三方合并。"
 
-#: builtin/am.c:2335 builtin/init-db.c:547 builtin/prune-packed.c:16
-#: builtin/repack.c:646 builtin/stash.c:946
+#: builtin/am.c builtin/init-db.c builtin/prune-packed.c builtin/repack.c
+#: builtin/stash.c
 msgid "be quiet"
 msgstr "静默模式"
 
-#: builtin/am.c:2337
+#: builtin/am.c
 msgid "add a Signed-off-by trailer to the commit message"
 msgstr "在提交说明中添加 Signed-off-by 尾注"
 
-#: builtin/am.c:2340
+#: builtin/am.c
 msgid "recode into utf8 (default)"
 msgstr "使用 utf8 字符集（默认）"
 
-#: builtin/am.c:2342
+#: builtin/am.c
 msgid "pass -k flag to git-mailinfo"
 msgstr "向 git-mailinfo 传递 -k 参数"
 
-#: builtin/am.c:2344
+#: builtin/am.c
 msgid "pass -b flag to git-mailinfo"
 msgstr "向 git-mailinfo 传递 -b 参数"
 
-#: builtin/am.c:2346
+#: builtin/am.c
 msgid "pass -m flag to git-mailinfo"
 msgstr "向 git-mailinfo 传递 -m 参数"
 
-#: builtin/am.c:2348
+#: builtin/am.c
 msgid "pass --keep-cr flag to git-mailsplit for mbox format"
 msgstr "针对 mbox 格式，向 git-mailsplit 传递 --keep-cr 参数"
 
-#: builtin/am.c:2351
+#: builtin/am.c
 msgid "do not pass --keep-cr flag to git-mailsplit independent of am.keepcr"
 msgstr "不向 git-mailsplit 传递 --keep-cr 参数，覆盖 am.keepcr 的设置"
 
-#: builtin/am.c:2354
+#: builtin/am.c
 msgid "strip everything before a scissors line"
 msgstr "丢弃裁切线前的所有内容"
 
-#: builtin/am.c:2356
+#: builtin/am.c
 msgid "pass it through git-mailinfo"
 msgstr "传递给 git-mailinfo"
 
-#: builtin/am.c:2359 builtin/am.c:2362 builtin/am.c:2365 builtin/am.c:2368
-#: builtin/am.c:2371 builtin/am.c:2374 builtin/am.c:2377 builtin/am.c:2380
-#: builtin/am.c:2386
+#: builtin/am.c
 msgid "pass it through git-apply"
 msgstr "传递给 git-apply"
 
-#: builtin/am.c:2376 builtin/commit.c:1514 builtin/fmt-merge-msg.c:18
-#: builtin/fmt-merge-msg.c:21 builtin/grep.c:920 builtin/merge.c:263
-#: builtin/pull.c:142 builtin/pull.c:204 builtin/pull.c:221
-#: builtin/rebase.c:1074 builtin/repack.c:657 builtin/repack.c:661
-#: builtin/repack.c:663 builtin/show-branch.c:650 builtin/show-ref.c:172
-#: builtin/tag.c:446 parse-options.h:159 parse-options.h:180
-#: parse-options.h:348
+#: builtin/am.c builtin/commit.c builtin/fmt-merge-msg.c builtin/grep.c
+#: builtin/merge.c builtin/pull.c builtin/rebase.c builtin/repack.c
+#: builtin/show-branch.c builtin/show-ref.c builtin/tag.c parse-options.h
 msgid "n"
 msgstr "n"
 
-#: builtin/am.c:2382 builtin/branch.c:695 builtin/bugreport.c:109
-#: builtin/cat-file.c:848 builtin/cat-file.c:852 builtin/cat-file.c:856
-#: builtin/for-each-ref.c:41 builtin/ls-tree.c:357 builtin/replace.c:555
-#: builtin/tag.c:480 builtin/verify-tag.c:38
+#: builtin/am.c builtin/branch.c builtin/bugreport.c builtin/cat-file.c
+#: builtin/for-each-ref.c builtin/ls-tree.c builtin/replace.c builtin/tag.c
+#: builtin/verify-tag.c
 msgid "format"
 msgstr "格式"
 
-#: builtin/am.c:2383
+#: builtin/am.c
 msgid "format the patch(es) are in"
 msgstr "补丁的格式"
 
-#: builtin/am.c:2389
+#: builtin/am.c
 msgid "override error message when patch failure occurs"
 msgstr "打补丁失败时显示的错误信息"
 
-#: builtin/am.c:2391
+#: builtin/am.c
 msgid "continue applying patches after resolving a conflict"
 msgstr "冲突解决后继续应用补丁"
 
-#: builtin/am.c:2394
+#: builtin/am.c
 msgid "synonyms for --continue"
 msgstr "和 --continue 同义"
 
-#: builtin/am.c:2397
+#: builtin/am.c
 msgid "skip the current patch"
 msgstr "跳过当前补丁"
 
-#: builtin/am.c:2400
+#: builtin/am.c
 msgid "restore the original branch and abort the patching operation"
 msgstr "恢复原始分支并终止打补丁操作"
 
-#: builtin/am.c:2403
+#: builtin/am.c
 msgid "abort the patching operation but keep HEAD where it is"
 msgstr "终止补丁操作但保持 HEAD 不变"
 
-#: builtin/am.c:2407
+#: builtin/am.c
 msgid "show the patch being applied"
 msgstr "显示正在应用的补丁"
 
-#: builtin/am.c:2411
+#: builtin/am.c
 msgid "record the empty patch as an empty commit"
 msgstr "把空补丁记录为空提交"
 
-#: builtin/am.c:2415
+#: builtin/am.c
 msgid "lie about committer date"
 msgstr "将作者日期作为提交日期"
 
-#: builtin/am.c:2417
+#: builtin/am.c
 msgid "use current timestamp for author date"
 msgstr "用当前时间作为作者日期"
 
-#: builtin/am.c:2419 builtin/commit-tree.c:118 builtin/commit.c:1642
-#: builtin/merge.c:302 builtin/pull.c:179 builtin/rebase.c:1127
-#: builtin/revert.c:117 builtin/tag.c:461
+#: builtin/am.c builtin/commit-tree.c builtin/commit.c builtin/merge.c
+#: builtin/pull.c builtin/rebase.c builtin/revert.c builtin/tag.c
 msgid "key-id"
 msgstr "key-id"
 
-#: builtin/am.c:2420 builtin/rebase.c:1128
+#: builtin/am.c builtin/rebase.c
 msgid "GPG-sign commits"
 msgstr "使用 GPG 签名提交"
 
-#: builtin/am.c:2423
+#: builtin/am.c
 msgid "how to handle empty patches"
 msgstr "如何处理空补丁"
 
-#: builtin/am.c:2426
+#: builtin/am.c
 msgid "(internal use for git-rebase)"
 msgstr "（内部使用，用于 git-rebase）"
 
-#: builtin/am.c:2444
+#: builtin/am.c
 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."
@@ -11110,16 +2774,16 @@ msgstr ""
 "参数 -b/--binary 已经很长时间不做任何实质操作了，并且将被移除。\n"
 "请不要再使用它了。"
 
-#: builtin/am.c:2451
+#: builtin/am.c
 msgid "failed to read the index"
 msgstr "无法读取索引"
 
-#: builtin/am.c:2466
+#: builtin/am.c
 #, c-format
 msgid "previous rebase directory %s still exists but mbox given."
 msgstr "之前的变基目录 %s 仍然存在，但却提供了 mbox。"
 
-#: builtin/am.c:2490
+#: builtin/am.c
 #, c-format
 msgid ""
 "Stray %s directory found.\n"
@@ -11128,48 +2792,48 @@ msgstr ""
 "发现了错误的 %s 目录。\n"
 "使用 \"git am --abort\" 删除它。"
 
-#: builtin/am.c:2496
+#: builtin/am.c
 msgid "Resolve operation not in progress, we are not resuming."
 msgstr "解决操作未进行，我们不会继续。"
 
-#: builtin/am.c:2506
+#: builtin/am.c
 msgid "interactive mode requires patches on the command line"
 msgstr "交互式模式需要命令行上提供补丁"
 
-#: builtin/apply.c:8
+#: builtin/apply.c
 msgid "git apply [<options>] [<patch>...]"
 msgstr "git apply [<选项>] [<补丁>...]"
 
-#: builtin/archive.c:18
+#: builtin/archive.c contrib/scalar/scalar.c
 msgid "could not redirect output"
 msgstr "不能重定向输出"
 
-#: builtin/archive.c:35
+#: builtin/archive.c
 msgid "git archive: Remote with no URL"
 msgstr "git archive：未提供远程 URL"
 
-#: builtin/archive.c:59
+#: builtin/archive.c
 msgid "git archive: expected ACK/NAK, got a flush packet"
 msgstr "git archive：期望是 ACK/NAK，却得到 flush 包"
 
-#: builtin/archive.c:62
+#: builtin/archive.c
 #, c-format
 msgid "git archive: NACK %s"
 msgstr "git archive：NACK %s"
 
-#: builtin/archive.c:63
+#: builtin/archive.c
 msgid "git archive: protocol error"
 msgstr "git archive：协议错误"
 
-#: builtin/archive.c:67
+#: builtin/archive.c
 msgid "git archive: expected a flush"
 msgstr "git archive：应有一个 flush 包"
 
-#: builtin/bisect--helper.c:24
+#: builtin/bisect--helper.c
 msgid "git bisect--helper --bisect-reset [<commit>]"
 msgstr "git bisect--helper --bisect-reset [<提交>]"
 
-#: builtin/bisect--helper.c:26
+#: builtin/bisect--helper.c
 msgid ""
 "git bisect--helper --bisect-start [--term-{new,bad}=<term> --term-{old,good}"
 "=<term>] [--no-checkout] [--first-parent] [<bad> [<good>...]] [--] "
@@ -11178,97 +2842,97 @@ msgstr ""
 "git bisect--helper --bisect-start [--term-{new,bad}=<术语> --term-{old,good}"
 "=<术语>] [--no-checkout] [--first-parent] [<坏> [<好>...]] [--] [<路径>...]"
 
-#: builtin/bisect--helper.c:29
+#: builtin/bisect--helper.c
 msgid "git bisect--helper --bisect-state (bad|new) [<rev>]"
 msgstr "git bisect--helper --bisect-state (bad|new) [<版本>]"
 
-#: builtin/bisect--helper.c:30
+#: builtin/bisect--helper.c
 msgid "git bisect--helper --bisect-state (good|old) [<rev>...]"
 msgstr "git bisect--helper --bisect-state (good|old) [<版本>...]"
 
-#: builtin/bisect--helper.c:31
+#: builtin/bisect--helper.c
 msgid "git bisect--helper --bisect-replay <filename>"
 msgstr "git bisect--helper --bisect-replay <文件>"
 
-#: builtin/bisect--helper.c:32
+#: builtin/bisect--helper.c
 msgid "git bisect--helper --bisect-skip [(<rev>|<range>)...]"
 msgstr "git bisect--helper --bisect-skip [(<版本>|<范围>)...]"
 
-#: builtin/bisect--helper.c:34
+#: builtin/bisect--helper.c
 msgid "git bisect--helper --bisect-run <cmd>..."
 msgstr "git bisect--helper --bisect-run <命令>..."
 
-#: builtin/bisect--helper.c:109
+#: builtin/bisect--helper.c
 #, c-format
 msgid "cannot open file '%s' in mode '%s'"
 msgstr "不能以 '%2$s' 模式打开文件 '%1$s'"
 
-#: builtin/bisect--helper.c:116
+#: builtin/bisect--helper.c
 #, c-format
 msgid "could not write to file '%s'"
 msgstr "不能写入文件 '%s'"
 
-#: builtin/bisect--helper.c:154
+#: builtin/bisect--helper.c
 #, c-format
 msgid "cannot open file '%s' for reading"
 msgstr "不能打开文件 '%s' 来读取"
 
-#: builtin/bisect--helper.c:170
+#: builtin/bisect--helper.c
 #, c-format
 msgid "'%s' is not a valid term"
 msgstr "'%s' 不是一个有效的术语"
 
-#: builtin/bisect--helper.c:174
+#: builtin/bisect--helper.c
 #, c-format
 msgid "can't use the builtin command '%s' as a term"
 msgstr "不能使用内置命令 '%s' 作为术语"
 
-#: builtin/bisect--helper.c:184
+#: builtin/bisect--helper.c
 #, c-format
 msgid "can't change the meaning of the term '%s'"
 msgstr "不能修改术语 '%s' 的含义"
 
-#: builtin/bisect--helper.c:194
+#: builtin/bisect--helper.c
 msgid "please use two different terms"
 msgstr "请使用两个不同的术语"
 
-#: builtin/bisect--helper.c:210
+#: builtin/bisect--helper.c
 #, c-format
 msgid "We are not bisecting.\n"
 msgstr "我们没有在二分查找。\n"
 
-#: builtin/bisect--helper.c:218
+#: builtin/bisect--helper.c
 #, c-format
 msgid "'%s' is not a valid commit"
 msgstr "'%s' 不是一个有效的提交"
 
-#: builtin/bisect--helper.c:227
+#: builtin/bisect--helper.c
 #, 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:271
+#: builtin/bisect--helper.c
 #, c-format
 msgid "Bad bisect_write argument: %s"
 msgstr "坏的 bisect_write 参数：%s"
 
-#: builtin/bisect--helper.c:276
+#: builtin/bisect--helper.c
 #, c-format
 msgid "couldn't get the oid of the rev '%s'"
 msgstr "无法获取版本 '%s' 的对象 ID"
 
-#: builtin/bisect--helper.c:288
+#: builtin/bisect--helper.c
 #, c-format
 msgid "couldn't open the file '%s'"
 msgstr "无法打开文件 '%s'"
 
-#: builtin/bisect--helper.c:314
+#: builtin/bisect--helper.c
 #, c-format
 msgid "Invalid command: you're currently in a %s/%s bisect"
 msgstr "无效的命令：您当前正处于一个 %s/%s 二分查找中"
 
-#: builtin/bisect--helper.c:341
+#: builtin/bisect--helper.c
 #, c-format
 msgid ""
 "You need to give me at least one %s and %s revision.\n"
@@ -11277,7 +2941,7 @@ msgstr ""
 "您需要给我至少一个 %s 和一个 %s 版本。\n"
 "为此您可以用 \"git bisect %s\" 和 \"git bisect %s\"。"
 
-#: builtin/bisect--helper.c:345
+#: builtin/bisect--helper.c
 #, c-format
 msgid ""
 "You need to start by \"git bisect start\".\n"
@@ -11288,7 +2952,7 @@ msgstr ""
 "然后需要提供我至少一个 %s 和一个 %s 版本。\n"
 "为此您可以用 \"git bisect %s\" 和 \"git bisect %s\" 命令。"
 
-#: builtin/bisect--helper.c:365
+#: builtin/bisect--helper.c
 #, c-format
 msgid "bisecting only with a %s commit"
 msgstr "在只有一个 %s 提交的情况下二分查找"
@@ -11297,22 +2961,37 @@ msgstr "在只有一个 %s 提交的情况下二分查找"
 #. translation. The program will only accept English input
 #. at this point.
 #.
-#: builtin/bisect--helper.c:373
+#: builtin/bisect--helper.c
 msgid "Are you sure [Y/n]? "
 msgstr "您确认么[Y/n]？ "
 
-#: builtin/bisect--helper.c:434
+#: builtin/bisect--helper.c
+msgid "status: waiting for both good and bad commits\n"
+msgstr "状态：正在等待好的和坏的提交\n"
+
+#: builtin/bisect--helper.c
+#, c-format
+msgid "status: waiting for bad commit, %d good commit known\n"
+msgid_plural "status: waiting for bad commit, %d good commits known\n"
+msgstr[0] "状态：正在等待坏的提交，已知 %d 个好的提交\n"
+msgstr[1] "状态：正在等待坏的提交，已知 %d 个好的提交\n"
+
+#: builtin/bisect--helper.c
+msgid "status: waiting for good commit(s), bad commit known\n"
+msgstr "状态：正在等待好的提交，已知坏的提交\n"
+
+#: builtin/bisect--helper.c
 msgid "no terms defined"
 msgstr "未定义术语"
 
-#: builtin/bisect--helper.c:437
+#: builtin/bisect--helper.c
 #, 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:447
+#: builtin/bisect--helper.c
 #, c-format
 msgid ""
 "invalid argument %s for 'git bisect terms'.\n"
@@ -11321,52 +3000,52 @@ msgstr ""
 "命令 'git bisect terms' 的参数 %s 无效。\n"
 "支持的选项有：--term-good|--term-old 和 --term-bad|--term-new。"
 
-#: builtin/bisect--helper.c:514 builtin/bisect--helper.c:1038
+#: builtin/bisect--helper.c
 msgid "revision walk setup failed\n"
 msgstr "版本遍历设置失败\n"
 
-#: builtin/bisect--helper.c:536
+#: builtin/bisect--helper.c
 #, c-format
 msgid "could not open '%s' for appending"
 msgstr "无法打开 '%s' 进行追加"
 
-#: builtin/bisect--helper.c:655 builtin/bisect--helper.c:668
+#: builtin/bisect--helper.c
 msgid "'' is not a valid term"
 msgstr "'' 不是一个有效的术语"
 
-#: builtin/bisect--helper.c:678
+#: builtin/bisect--helper.c
 #, c-format
 msgid "unrecognized option: '%s'"
 msgstr "未识别的选项：'%s'"
 
-#: builtin/bisect--helper.c:682
+#: builtin/bisect--helper.c
 #, c-format
 msgid "'%s' does not appear to be a valid revision"
 msgstr "'%s' 看起来不是一个有效的版本"
 
-#: builtin/bisect--helper.c:713
+#: builtin/bisect--helper.c
 msgid "bad HEAD - I need a HEAD"
 msgstr "坏的 HEAD - 我需要一个 HEAD"
 
-#: builtin/bisect--helper.c:728
+#: builtin/bisect--helper.c
 #, c-format
 msgid "checking out '%s' failed. Try 'git bisect start <valid-branch>'."
 msgstr "检出 '%s' 失败。尝试 'git bisect start <有效分支>'。"
 
-#: builtin/bisect--helper.c:749
+#: builtin/bisect--helper.c
 msgid "won't bisect on cg-seek'ed tree"
 msgstr "不会在做了 cg-seek 的树上做二分查找"
 
-#: builtin/bisect--helper.c:752
+#: builtin/bisect--helper.c
 msgid "bad HEAD - strange symbolic ref"
 msgstr "坏的 HEAD - 奇怪的符号引用"
 
-#: builtin/bisect--helper.c:772
+#: builtin/bisect--helper.c
 #, c-format
 msgid "invalid ref: '%s'"
 msgstr "无效的引用：'%s'"
 
-#: builtin/bisect--helper.c:830
+#: builtin/bisect--helper.c
 msgid "You need to start by \"git bisect start\"\n"
 msgstr "您需要执行 \"git bisect start\" 来开始\n"
 
@@ -11374,305 +3053,302 @@ msgstr "您需要执行 \"git bisect start\" 来开始\n"
 #. translation. The program will only accept English input
 #. at this point.
 #.
-#: builtin/bisect--helper.c:841
+#: builtin/bisect--helper.c
 msgid "Do you want me to do it for you [Y/n]? "
 msgstr "您想让我为您这样做么[Y/n]？ "
 
-#: builtin/bisect--helper.c:859
+#: builtin/bisect--helper.c
 msgid "Please call `--bisect-state` with at least one argument"
 msgstr "请使用至少一个参数调用 `--bisect-state`"
 
-#: builtin/bisect--helper.c:872
+#: builtin/bisect--helper.c
 #, c-format
 msgid "'git bisect %s' can take only one argument."
 msgstr "'git bisect %s' 只能带一个参数。"
 
-#: builtin/bisect--helper.c:884 builtin/bisect--helper.c:897
+#: builtin/bisect--helper.c
 #, c-format
 msgid "Bad rev input: %s"
 msgstr "坏的版本输入：%s"
 
-#: builtin/bisect--helper.c:904
+#: builtin/bisect--helper.c
 #, c-format
 msgid "Bad rev input (not a commit): %s"
 msgstr "坏的版本输入（不是提交）：%s"
 
-#: builtin/bisect--helper.c:936
+#: builtin/bisect--helper.c
 msgid "We are not bisecting."
 msgstr "我们没有在二分查找。"
 
-#: builtin/bisect--helper.c:986
+#: builtin/bisect--helper.c
 #, c-format
 msgid "'%s'?? what are you talking about?"
 msgstr "'%s'?? 您在说什么?"
 
-#: builtin/bisect--helper.c:998
+#: builtin/bisect--helper.c
 #, c-format
 msgid "cannot read file '%s' for replaying"
 msgstr "不能读取文件 '%s' 来重放"
 
-#: builtin/bisect--helper.c:1120 builtin/bisect--helper.c:1152
+#: builtin/bisect--helper.c
 #, c-format
 msgid "running %s\n"
 msgstr "正在执行 %s\n"
 
-#: builtin/bisect--helper.c:1145 builtin/bisect--helper.c:1335
+#: builtin/bisect--helper.c
 msgid "bisect run failed: no command provided."
 msgstr "二分查找运行失败：没有提供命令。"
 
-#: builtin/bisect--helper.c:1166
+#: builtin/bisect--helper.c
 #, c-format
 msgid "unable to verify '%s' on good revision"
 msgstr "无法在好版本中验证 '%s'"
 
-#: builtin/bisect--helper.c:1172
+#: builtin/bisect--helper.c
 #, c-format
 msgid "bogus exit code %d for good revision"
 msgstr "好版本返回错误的退出码 %d"
 
-#: builtin/bisect--helper.c:1180
+#: builtin/bisect--helper.c
 #, 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:1195
+#: builtin/bisect--helper.c
 #, c-format
 msgid "cannot open file '%s' for writing"
 msgstr "无法打开文件 '%s' 进行写入"
 
-#: builtin/bisect--helper.c:1213
+#: builtin/bisect--helper.c
 msgid "bisect run cannot continue any more"
 msgstr "二分查找不能继续运行"
 
-#: builtin/bisect--helper.c:1215
+#: builtin/bisect--helper.c
 #, c-format
 msgid "bisect run success"
 msgstr "二分查找运行成功"
 
-#: builtin/bisect--helper.c:1218
+#: builtin/bisect--helper.c
 #, c-format
 msgid "bisect found first bad commit"
 msgstr "二分查找找到了第一个坏的提交"
 
-#: builtin/bisect--helper.c:1221
+#: builtin/bisect--helper.c
 #, 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:1253
+#: builtin/bisect--helper.c
 msgid "reset the bisection state"
 msgstr "清除二分查找状态"
 
-#: builtin/bisect--helper.c:1255
+#: builtin/bisect--helper.c
 msgid "check whether bad or good terms exist"
 msgstr "检查坏的或好的术语是否存在"
 
-#: builtin/bisect--helper.c:1257
+#: builtin/bisect--helper.c
 msgid "print out the bisect terms"
 msgstr "打印二分查找术语"
 
-#: builtin/bisect--helper.c:1259
+#: builtin/bisect--helper.c
 msgid "start the bisect session"
 msgstr "启动二分查找过程"
 
-#: builtin/bisect--helper.c:1261
+#: builtin/bisect--helper.c
 msgid "find the next bisection commit"
 msgstr "查询下一个二分查找提交"
 
-#: builtin/bisect--helper.c:1263
+#: builtin/bisect--helper.c
 msgid "mark the state of ref (or refs)"
 msgstr "标记引用的状态"
 
-#: builtin/bisect--helper.c:1265
+#: builtin/bisect--helper.c
 msgid "list the bisection steps so far"
 msgstr "列出到目前为止的二分查找步骤"
 
-#: builtin/bisect--helper.c:1267
+#: builtin/bisect--helper.c
 msgid "replay the bisection process from the given file"
 msgstr "从给定文件重放二分查找进程"
 
-#: builtin/bisect--helper.c:1269
+#: builtin/bisect--helper.c
 msgid "skip some commits for checkout"
 msgstr "跳过要检出的一些提交"
 
-#: builtin/bisect--helper.c:1271
+#: builtin/bisect--helper.c
 msgid "visualize the bisection"
 msgstr "可视化二分查找过程"
 
-#: builtin/bisect--helper.c:1273
+#: builtin/bisect--helper.c
 msgid "use <cmd>... to automatically bisect"
 msgstr "使用 <命令>... 来自动二分查找"
 
-#: builtin/bisect--helper.c:1275
+#: builtin/bisect--helper.c
 msgid "no log for BISECT_WRITE"
 msgstr "BISECT_WRITE 无日志"
 
-#: builtin/bisect--helper.c:1290
+#: builtin/bisect--helper.c
 msgid "--bisect-reset requires either no argument or a commit"
 msgstr "--bisect-reset 无需参数或者需要一个提交"
 
-#: builtin/bisect--helper.c:1295
+#: builtin/bisect--helper.c
 msgid "--bisect-terms requires 0 or 1 argument"
 msgstr "--bisect-terms 需要 0 或 1 个参数"
 
-#: builtin/bisect--helper.c:1304
+#: builtin/bisect--helper.c
 msgid "--bisect-next requires 0 arguments"
 msgstr "--bisect-next 需要 0 个参数"
 
-#: builtin/bisect--helper.c:1315
+#: builtin/bisect--helper.c
 msgid "--bisect-log requires 0 arguments"
 msgstr "--bisect-log 需要 0 个参数"
 
-#: builtin/bisect--helper.c:1320
+#: builtin/bisect--helper.c
 msgid "no logfile given"
 msgstr "未提供日志文件"
 
-#: builtin/blame.c:32
+#: builtin/blame.c
 msgid "git blame [<options>] [<rev-opts>] [<rev>] [--] <file>"
 msgstr "git blame [<选项>] [<版本选项>] [<版本>] [--] <文件>"
 
-#: builtin/blame.c:37
+#: builtin/blame.c
 msgid "<rev-opts> are documented in git-rev-list(1)"
 msgstr "<版本选项> 的文档记录在 git-rev-list(1) 中"
 
-#: builtin/blame.c:406
+#: builtin/blame.c
 #, c-format
 msgid "expecting a color: %s"
 msgstr "期望一个颜色：%s"
 
-#: builtin/blame.c:413
+#: builtin/blame.c
 msgid "must end with a color"
 msgstr "必须以一个颜色结尾"
 
-#: builtin/blame.c:842
+#: builtin/blame.c
 #, c-format
 msgid "cannot find revision %s to ignore"
 msgstr "不能找到要忽略的版本 %s"
 
-#: builtin/blame.c:864
+#: builtin/blame.c
 msgid "show blame entries as we find them, incrementally"
 msgstr "增量式地显示发现的 blame 条目"
 
-#: builtin/blame.c:865
+#: builtin/blame.c
 msgid "do not show object names of boundary commits (Default: off)"
 msgstr "不显示边界提交的对象名（默认：关闭）"
 
-#: builtin/blame.c:866
+#: builtin/blame.c
 msgid "do not treat root commits as boundaries (Default: off)"
 msgstr "不把根提交作为边界（默认：关闭）"
 
-#: builtin/blame.c:867
+#: builtin/blame.c
 msgid "show work cost statistics"
 msgstr "显示工作消耗统计"
 
-#: builtin/blame.c:868 builtin/checkout.c:1554 builtin/clone.c:98
-#: builtin/commit-graph.c:75 builtin/commit-graph.c:228 builtin/fetch.c:181
-#: builtin/merge.c:301 builtin/multi-pack-index.c:103
-#: builtin/multi-pack-index.c:154 builtin/multi-pack-index.c:180
-#: builtin/multi-pack-index.c:208 builtin/pull.c:120 builtin/push.c:566
-#: builtin/remote.c:683 builtin/send-pack.c:202
+#: builtin/blame.c builtin/checkout.c builtin/clone.c builtin/commit-graph.c
+#: builtin/fetch.c builtin/merge.c builtin/multi-pack-index.c builtin/pull.c
+#: builtin/push.c builtin/remote.c builtin/send-pack.c
 msgid "force progress reporting"
 msgstr "强制显示进度报告"
 
-#: builtin/blame.c:869
+#: builtin/blame.c
 msgid "show output score for blame entries"
 msgstr "显示 blame 条目的输出得分"
 
-#: builtin/blame.c:870
+#: builtin/blame.c
 msgid "show original filename (Default: auto)"
 msgstr "显示原始文件名（默认：自动）"
 
-#: builtin/blame.c:871
+#: builtin/blame.c
 msgid "show original linenumber (Default: off)"
 msgstr "显示原始的行号（默认：关闭）"
 
-#: builtin/blame.c:872
+#: builtin/blame.c
 msgid "show in a format designed for machine consumption"
 msgstr "显示为一个适合机器读取的格式"
 
-#: builtin/blame.c:873
+#: builtin/blame.c
 msgid "show porcelain format with per-line commit information"
 msgstr "为每一行显示机器适用的提交信息"
 
-#: builtin/blame.c:874
+#: builtin/blame.c
 msgid "use the same output mode as git-annotate (Default: off)"
 msgstr "使用和 git-annotate 相同的输出模式（默认：关闭）"
 
-#: builtin/blame.c:875
+#: builtin/blame.c
 msgid "show raw timestamp (Default: off)"
 msgstr "显示原始时间戳（默认：关闭）"
 
-#: builtin/blame.c:876
+#: builtin/blame.c
 msgid "show long commit SHA1 (Default: off)"
 msgstr "显示长的 SHA1 提交号（默认：关闭）"
 
-#: builtin/blame.c:877
+#: builtin/blame.c
 msgid "suppress author name and timestamp (Default: off)"
 msgstr "隐藏作者名字和时间戳（默认：关闭）"
 
-#: builtin/blame.c:878
+#: builtin/blame.c
 msgid "show author email instead of name (Default: off)"
 msgstr "显示作者的邮箱而不是名字（默认：关闭）"
 
-#: builtin/blame.c:879
+#: builtin/blame.c
 msgid "ignore whitespace differences"
 msgstr "忽略空白差异"
 
-#: builtin/blame.c:880 builtin/log.c:1857
+#: builtin/blame.c builtin/log.c
 msgid "rev"
 msgstr "版本"
 
-#: builtin/blame.c:880
+#: builtin/blame.c
 msgid "ignore <rev> when blaming"
 msgstr "在执行 blame 操作时忽略 <版本>"
 
-#: builtin/blame.c:881
+#: builtin/blame.c
 msgid "ignore revisions from <file>"
 msgstr "忽略来自 <文件> 中的版本"
 
-#: builtin/blame.c:882
+#: builtin/blame.c
 msgid "color redundant metadata from previous line differently"
 msgstr "使用颜色间隔输出与前一行不同的重复元信息"
 
-#: builtin/blame.c:883
+#: builtin/blame.c
 msgid "color lines by age"
 msgstr "依据时间着色"
 
-#: builtin/blame.c:884
+#: builtin/blame.c
 msgid "spend extra cycles to find better match"
 msgstr "花费额外的循环来找到更好的匹配"
 
-#: builtin/blame.c:885
+#: builtin/blame.c
 msgid "use revisions from <file> instead of calling git-rev-list"
 msgstr "使用来自 <文件> 的修订集而不是调用 git-rev-list"
 
-#: builtin/blame.c:886
+#: builtin/blame.c
 msgid "use <file>'s contents as the final image"
 msgstr "使用 <文件> 的内容作为最终的镜像"
 
-#: builtin/blame.c:887 builtin/blame.c:888
+#: builtin/blame.c
 msgid "score"
 msgstr "得分"
 
-#: builtin/blame.c:887
+#: builtin/blame.c
 msgid "find line copies within and across files"
 msgstr "找到文件内及跨文件的行拷贝"
 
-#: builtin/blame.c:888
+#: builtin/blame.c
 msgid "find line movements within and across files"
 msgstr "找到文件内及跨文件的行移动"
 
-#: builtin/blame.c:889
+#: builtin/blame.c
 msgid "range"
 msgstr "范围"
 
-#: builtin/blame.c:890
+#: builtin/blame.c
 msgid "process only line range <start>,<end> or function :<funcname>"
 msgstr "只处理在 <开始>,<结束> 范围内的行，或者函数：<函数名>"
 
-#: builtin/blame.c:949
+#: builtin/blame.c
 msgid "--progress can't be used with --incremental or porcelain formats"
 msgstr "--progress 不能和 --incremental 或机器内部格式一起使用"
 
@@ -11684,57 +3360,57 @@ msgstr "--progress 不能和 --incremental 或机器内部格式一起使用"
 #. your language may need more or fewer display
 #. columns.
 #.
-#: builtin/blame.c:1000
+#: builtin/blame.c
 msgid "4 years, 11 months ago"
 msgstr "4 年 11 个月前"
 
-#: builtin/blame.c:1116
+#: builtin/blame.c
 #, 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:1161
+#: builtin/blame.c
 msgid "Blaming lines"
 msgstr "追踪代码行"
 
-#: builtin/branch.c:29
+#: builtin/branch.c
 msgid "git branch [<options>] [-r | -a] [--merged] [--no-merged]"
 msgstr "git branch [<选项>] [-r | -a] [--merged] [--no-merged]"
 
-#: builtin/branch.c:30
+#: builtin/branch.c
 msgid ""
 "git branch [<options>] [-f] [--recurse-submodules] <branch-name> [<start-"
 "point>]"
 msgstr "git branch [<选项>] [-f] [--recurse-submodules] <分支名> [<起始点>]"
 
-#: builtin/branch.c:31
+#: builtin/branch.c
 msgid "git branch [<options>] [-l] [<pattern>...]"
 msgstr "git branch [<选项>] [-l] [<模式>...]"
 
-#: builtin/branch.c:32
+#: builtin/branch.c
 msgid "git branch [<options>] [-r] (-d | -D) <branch-name>..."
 msgstr "git branch [<选项>] [-r] (-d | -D) <分支名>..."
 
-#: builtin/branch.c:33
+#: builtin/branch.c
 msgid "git branch [<options>] (-m | -M) [<old-branch>] <new-branch>"
 msgstr "git branch [<选项>] (-m | -M) [<旧分支>] <新分支>"
 
-#: builtin/branch.c:34
+#: builtin/branch.c
 msgid "git branch [<options>] (-c | -C) [<old-branch>] <new-branch>"
 msgstr "git branch [<选项>] (-c | -C) [<老分支>] <新分支>"
 
-#: builtin/branch.c:35
+#: builtin/branch.c
 msgid "git branch [<options>] [-r | -a] [--points-at]"
 msgstr "git branch [<选项>] [-r | -a] [--points-at]"
 
-#: builtin/branch.c:36
+#: builtin/branch.c
 msgid "git branch [<options>] [-r | -a] [--format]"
 msgstr "git branch [<选项>] [-r | -a] [--format]"
 
 #  译者：保持原换行格式，在输出时 %s 的替代内容会让字符串变长
-#: builtin/branch.c:165
+#: builtin/branch.c
 #, c-format
 msgid ""
 "deleting branch '%s' that has been merged to\n"
@@ -11744,7 +3420,7 @@ msgstr ""
 "         '%s'，但未合并到 HEAD。"
 
 #  译者：保持原换行格式，在输出时 %s 的替代内容会让字符串变长
-#: builtin/branch.c:169
+#: builtin/branch.c
 #, c-format
 msgid ""
 "not deleting branch '%s' that is not yet merged to\n"
@@ -11753,12 +3429,12 @@ msgstr ""
 "并未删除分支 '%s'， 虽然它已经合并到 HEAD，\n"
 "         然而却尚未被合并到分支 '%s' 。"
 
-#: builtin/branch.c:183
+#: builtin/branch.c
 #, c-format
 msgid "Couldn't look up commit object for '%s'"
 msgstr "无法查询 '%s' 指向的提交对象"
 
-#: builtin/branch.c:187
+#: builtin/branch.c
 #, c-format
 msgid ""
 "The branch '%s' is not fully merged.\n"
@@ -11767,111 +3443,111 @@ msgstr ""
 "分支 '%s' 没有完全合并。\n"
 "如果您确认要删除它，执行 'git branch -D %s'。"
 
-#: builtin/branch.c:200
+#: builtin/branch.c
 msgid "Update of config-file failed"
 msgstr "更新配置文件失败"
 
-#: builtin/branch.c:235
+#: builtin/branch.c
 msgid "cannot use -a with -d"
 msgstr "不能将 -a 和 -d 同时使用"
 
-#: builtin/branch.c:242
+#: builtin/branch.c
 msgid "Couldn't look up commit object for HEAD"
 msgstr "无法查询 HEAD 指向的提交对象"
 
-#: builtin/branch.c:259
+#: builtin/branch.c
 #, c-format
 msgid "Cannot delete branch '%s' checked out at '%s'"
 msgstr "无法删除检出于 '%2$s' 的分支 '%1$s'。"
 
-#: builtin/branch.c:274
+#: builtin/branch.c
 #, c-format
 msgid "remote-tracking branch '%s' not found."
 msgstr "未能找到远程跟踪分支 '%s'。"
 
-#: builtin/branch.c:275
+#: builtin/branch.c
 #, c-format
 msgid "branch '%s' not found."
 msgstr "分支 '%s' 未发现。"
 
-#: builtin/branch.c:306
+#: builtin/branch.c
 #, c-format
 msgid "Deleted remote-tracking branch %s (was %s).\n"
 msgstr "已删除远程跟踪分支 %s（曾为 %s）。\n"
 
-#: builtin/branch.c:307
+#: builtin/branch.c
 #, c-format
 msgid "Deleted branch %s (was %s).\n"
 msgstr "已删除分支 %s（曾为 %s）。\n"
 
-#: builtin/branch.c:457 builtin/tag.c:64
+#: builtin/branch.c builtin/tag.c
 msgid "unable to parse format string"
 msgstr "不能解析格式化字符串"
 
-#: builtin/branch.c:488
+#: builtin/branch.c
 msgid "could not resolve HEAD"
 msgstr "不能解析 HEAD 提交"
 
-#: builtin/branch.c:494
+#: builtin/branch.c
 #, c-format
 msgid "HEAD (%s) points outside of refs/heads/"
 msgstr "HEAD (%s) 指向 refs/heads/ 之外"
 
-#: builtin/branch.c:509
+#: builtin/branch.c
 #, c-format
 msgid "Branch %s is being rebased at %s"
 msgstr "分支 %s 正被变基到 %s"
 
-#: builtin/branch.c:513
+#: builtin/branch.c
 #, c-format
 msgid "Branch %s is being bisected at %s"
 msgstr "分支 %s 正被二分查找于 %s"
 
-#: builtin/branch.c:530
+#: builtin/branch.c
 msgid "cannot copy the current branch while not on any."
 msgstr "无法拷贝当前分支因为不处于任何分支上。"
 
-#: builtin/branch.c:532
+#: builtin/branch.c
 msgid "cannot rename the current branch while not on any."
 msgstr "无法重命名当前分支因为不处于任何分支上。"
 
-#: builtin/branch.c:543
+#: builtin/branch.c
 #, c-format
 msgid "Invalid branch name: '%s'"
 msgstr "无效的分支名：'%s'"
 
-#: builtin/branch.c:572
+#: builtin/branch.c
 msgid "Branch rename failed"
 msgstr "分支重命名失败"
 
-#: builtin/branch.c:574
+#: builtin/branch.c
 msgid "Branch copy failed"
 msgstr "分支拷贝失败"
 
-#: builtin/branch.c:578
+#: builtin/branch.c
 #, c-format
 msgid "Created a copy of a misnamed branch '%s'"
 msgstr "已为错误命名的分支 '%s' 创建了一个副本"
 
-#: builtin/branch.c:581
+#: builtin/branch.c
 #, c-format
 msgid "Renamed a misnamed branch '%s' away"
 msgstr "已将错误命名的分支 '%s' 重命名"
 
-#: builtin/branch.c:587
+#: builtin/branch.c
 #, c-format
 msgid "Branch renamed to %s, but HEAD is not updated!"
 msgstr "分支重命名为 %s，但 HEAD 没有更新！"
 
-#: builtin/branch.c:596
+#: builtin/branch.c
 msgid "Branch is renamed, but update of config-file failed"
 msgstr "分支被重命名，但更新配置文件失败"
 
-#: builtin/branch.c:598
+#: builtin/branch.c
 msgid "Branch is copied, but update of config-file failed"
 msgstr "分支已拷贝，但更新配置文件失败"
 
-#: builtin/branch.c:614
+#: builtin/branch.c
 #, c-format
 msgid ""
 "Please edit the description for the branch\n"
@@ -11882,221 +3558,222 @@ msgstr ""
 "  %s\n"
 "以 '%c' 开头的行将被过滤。\n"
 
-#: builtin/branch.c:651
+#: builtin/branch.c
 msgid "Generic options"
 msgstr "通用选项"
 
-#: builtin/branch.c:653
+#: builtin/branch.c
 msgid "show hash and subject, give twice for upstream branch"
 msgstr "显示哈希值和主题，若参数出现两次则显示上游分支"
 
-#: builtin/branch.c:654
+#: builtin/branch.c
 msgid "suppress informational messages"
 msgstr "不显示信息"
 
-#: builtin/branch.c:656 builtin/checkout.c:1571
-#: builtin/submodule--helper.c:3077
+#: builtin/branch.c builtin/checkout.c builtin/submodule--helper.c
 msgid "set branch tracking configuration"
 msgstr "设置分支跟踪配置"
 
-#: builtin/branch.c:659
+#: builtin/branch.c
 msgid "do not use"
 msgstr "不要使用"
 
-#: builtin/branch.c:661
+#: builtin/branch.c
 msgid "upstream"
 msgstr "上游"
 
-#: builtin/branch.c:661
+#: builtin/branch.c
 msgid "change the upstream info"
 msgstr "改变上游信息"
 
-#: builtin/branch.c:662
+#: builtin/branch.c
 msgid "unset the upstream info"
 msgstr "取消上游信息的设置"
 
-#: builtin/branch.c:663
+#: builtin/branch.c
 msgid "use colored output"
 msgstr "使用彩色输出"
 
-#: builtin/branch.c:664
+#: builtin/branch.c
 msgid "act on remote-tracking branches"
 msgstr "作用于远程跟踪分支"
 
-#: builtin/branch.c:666 builtin/branch.c:668
+#: builtin/branch.c
 msgid "print only branches that contain the commit"
 msgstr "只打印包含该提交的分支"
 
-#: builtin/branch.c:667 builtin/branch.c:669
+#: builtin/branch.c
 msgid "print only branches that don't contain the commit"
 msgstr "只打印不包含该提交的分支"
 
-#: builtin/branch.c:672
+#: builtin/branch.c
 msgid "Specific git-branch actions:"
 msgstr "具体的 git-branch 动作："
 
-#: builtin/branch.c:673
+#: builtin/branch.c
 msgid "list both remote-tracking and local branches"
 msgstr "列出远程跟踪及本地分支"
 
-#: builtin/branch.c:675
+#: builtin/branch.c
 msgid "delete fully merged branch"
 msgstr "删除完全合并的分支"
 
-#: builtin/branch.c:676
+#: builtin/branch.c
 msgid "delete branch (even if not merged)"
 msgstr "删除分支（即使没有合并）"
 
-#: builtin/branch.c:677
+#: builtin/branch.c
 msgid "move/rename a branch and its reflog"
 msgstr "移动/重命名一个分支，以及它的引用日志"
 
-#: builtin/branch.c:678
+#: builtin/branch.c
 msgid "move/rename a branch, even if target exists"
 msgstr "移动/重命名一个分支，即使目标已存在"
 
-#: builtin/branch.c:679
+#: builtin/branch.c
 msgid "copy a branch and its reflog"
 msgstr "拷贝一个分支和它的引用日志"
 
-#: builtin/branch.c:680
+#: builtin/branch.c
 msgid "copy a branch, even if target exists"
 msgstr "拷贝一个分支，即使目标已存在"
 
-#: builtin/branch.c:681
+#: builtin/branch.c
 msgid "list branch names"
 msgstr "列出分支名"
 
-#: builtin/branch.c:682
+#: builtin/branch.c
 msgid "show current branch name"
 msgstr "显示当前分支名"
 
-#: builtin/branch.c:683 builtin/submodule--helper.c:3075
+#: builtin/branch.c builtin/submodule--helper.c
 msgid "create the branch's reflog"
 msgstr "创建分支的引用日志"
 
-#: builtin/branch.c:685
+#: builtin/branch.c
 msgid "edit the description for the branch"
 msgstr "标记分支的描述"
 
-#: builtin/branch.c:686
+#: builtin/branch.c
 msgid "force creation, move/rename, deletion"
 msgstr "强制创建、移动/重命名、删除"
 
-#: builtin/branch.c:687
+#: builtin/branch.c
 msgid "print only branches that are merged"
 msgstr "只打印已经合并的分支"
 
-#: builtin/branch.c:688
+#: builtin/branch.c
 msgid "print only branches that are not merged"
 msgstr "只打印尚未合并的分支"
 
-#: builtin/branch.c:689
+#: builtin/branch.c
 msgid "list branches in columns"
 msgstr "以列的方式显示分支"
 
-#: builtin/branch.c:691 builtin/for-each-ref.c:45 builtin/notes.c:413
-#: builtin/notes.c:416 builtin/notes.c:579 builtin/notes.c:582
-#: builtin/tag.c:476
+#: builtin/branch.c builtin/for-each-ref.c builtin/notes.c builtin/tag.c
 msgid "object"
 msgstr "对象"
 
-#: builtin/branch.c:692
+#: builtin/branch.c
 msgid "print only branches of the object"
 msgstr "只打印指向该对象的分支"
 
-#: builtin/branch.c:693 builtin/for-each-ref.c:51 builtin/tag.c:483
+#: builtin/branch.c builtin/for-each-ref.c builtin/tag.c
 msgid "sorting and filtering are case insensitive"
 msgstr "排序和过滤属于大小写不敏感"
 
-#: builtin/branch.c:694 builtin/ls-files.c:667
+#: builtin/branch.c builtin/ls-files.c
 msgid "recurse through submodules"
 msgstr "在子模组中递归"
 
-#: builtin/branch.c:695 builtin/for-each-ref.c:41 builtin/ls-tree.c:358
-#: builtin/tag.c:481 builtin/verify-tag.c:38
+#: builtin/branch.c builtin/for-each-ref.c builtin/ls-tree.c builtin/tag.c
+#: builtin/verify-tag.c
 msgid "format to use for the output"
 msgstr "输出格式"
 
-#: builtin/branch.c:718 builtin/clone.c:684
+#: builtin/branch.c builtin/submodule--helper.c submodule.c
+msgid "Failed to resolve HEAD as a valid ref."
+msgstr "无法将 HEAD 解析为有效引用。"
+
+#: builtin/branch.c builtin/clone.c
 msgid "HEAD not found below refs/heads!"
 msgstr "HEAD 没有位于 /refs/heads 之下！"
 
-#: builtin/branch.c:739
+#: builtin/branch.c
 msgid ""
 "branch with --recurse-submodules can only be used if submodule."
 "propagateBranches is enabled"
 msgstr ""
 "带有 --recurse-submodules 的分支只能在 submodule.propagateBranches 启用时使用"
 
-#: builtin/branch.c:741
+#: builtin/branch.c
 msgid "--recurse-submodules can only be used to create branches"
 msgstr "--recurse-submodules 只能用于创建分支"
 
-#: builtin/branch.c:770 builtin/branch.c:826 builtin/branch.c:835
+#: builtin/branch.c
 msgid "branch name required"
 msgstr "必须提供分支名"
 
-#: builtin/branch.c:802
+#: builtin/branch.c
 msgid "Cannot give description to detached HEAD"
 msgstr "不能向分离头指针提供描述"
 
-#: builtin/branch.c:807
+#: builtin/branch.c
 msgid "cannot edit description of more than one branch"
 msgstr "不能为一个以上的分支编辑描述"
 
-#: builtin/branch.c:814
+#: builtin/branch.c
 #, c-format
 msgid "No commit on branch '%s' yet."
 msgstr "分支 '%s' 尚无提交。"
 
-#: builtin/branch.c:817
+#: builtin/branch.c
 #, c-format
 msgid "No branch named '%s'."
 msgstr "没有分支 '%s'。"
 
-#: builtin/branch.c:832
+#: builtin/branch.c
 msgid "too many branches for a copy operation"
 msgstr "为拷贝操作提供了太多的分支名"
 
-#: builtin/branch.c:841
+#: builtin/branch.c
 msgid "too many arguments for a rename operation"
 msgstr "为重命名操作提供了太多的参数"
 
-#: builtin/branch.c:846
+#: builtin/branch.c
 msgid "too many arguments to set new upstream"
 msgstr "为设置新上游提供了太多的参数"
 
-#: builtin/branch.c:850
+#: builtin/branch.c
 #, 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:853 builtin/branch.c:873
+#: builtin/branch.c
 #, c-format
 msgid "no such branch '%s'"
 msgstr "没有此分支 '%s'"
 
-#: builtin/branch.c:857
+#: builtin/branch.c
 #, c-format
 msgid "branch '%s' does not exist"
 msgstr "分支 '%s' 不存在"
 
-#: builtin/branch.c:867
+#: builtin/branch.c
 msgid "too many arguments to unset upstream"
 msgstr "为取消上游设置操作提供了太多的参数"
 
-#: builtin/branch.c:871
+#: builtin/branch.c
 msgid "could not unset upstream of HEAD when it does not point to any branch."
 msgstr "无法取消 HEAD 的上游设置因为它没有指向一个分支"
 
-#: builtin/branch.c:877
+#: builtin/branch.c
 #, c-format
 msgid "Branch '%s' has no upstream information"
 msgstr "分支 '%s' 没有上游信息"
 
-#: builtin/branch.c:890
+#: builtin/branch.c
 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>?"
@@ -12104,39 +3781,39 @@ msgstr ""
 "'git branch' 的 -a 和 -r 选项不带一个分支名。\n"
 "您是否想要使用：-a|-r --list <模式>？"
 
-#: builtin/branch.c:894
+#: builtin/branch.c
 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:16
+#: builtin/bugreport.c
 msgid "git version:\n"
 msgstr "git 版本：\n"
 
-#: builtin/bugreport.c:22
+#: builtin/bugreport.c
 #, c-format
 msgid "uname() failed with error '%s' (%d)\n"
 msgstr "uname() 失败，错误为 '%s'（%d）\n"
 
-#: builtin/bugreport.c:32
+#: builtin/bugreport.c
 msgid "compiler info: "
 msgstr "编译器信息："
 
-#: builtin/bugreport.c:35
+#: builtin/bugreport.c
 msgid "libc info: "
 msgstr "libc 信息："
 
-#: builtin/bugreport.c:49
+#: builtin/bugreport.c
 msgid "not run from a git repository - no hooks to show\n"
 msgstr "不是在 git 仓库中执行 - 没有可显示的钩子\n"
 
-#: builtin/bugreport.c:62
+#: builtin/bugreport.c
 msgid "git bugreport [-o|--output-directory <file>] [-s|--suffix <format>]"
 msgstr "git bugreport [-o|--output-directory <文件>] [-s|--suffix <格式>]"
 
-#: builtin/bugreport.c:69
+#: builtin/bugreport.c
 msgid ""
 "Thank you for filling out a Git bug report!\n"
 "Please answer the following questions to help us understand your issue.\n"
@@ -12170,144 +3847,149 @@ msgstr ""
 "请检查下面错误报告中余下的内容。\n"
 "您可以删除任何您不想共享的内容。\n"
 
-#: builtin/bugreport.c:108
+#: builtin/bugreport.c
 msgid "specify a destination for the bugreport file"
 msgstr "指定错误报告文件的目标位置"
 
-#: builtin/bugreport.c:110
+#: builtin/bugreport.c
 msgid "specify a strftime format suffix for the filename"
 msgstr "指定文件的 strftime 格式后缀"
 
-#: builtin/bugreport.c:132
+#: builtin/bugreport.c
 #, c-format
 msgid "could not create leading directories for '%s'"
 msgstr "不能为 '%s' 创建先导目录"
 
-#: builtin/bugreport.c:139
+#: builtin/bugreport.c
 msgid "System Info"
 msgstr "系统信息"
 
-#: builtin/bugreport.c:142
+#: builtin/bugreport.c
 msgid "Enabled Hooks"
 msgstr "启用的钩子"
 
-#: builtin/bugreport.c:149
+#: builtin/bugreport.c
 #, c-format
 msgid "unable to write to %s"
 msgstr "无法写入 %s"
 
-#: builtin/bugreport.c:159
+#: builtin/bugreport.c
 #, c-format
 msgid "Created new report at '%s'.\n"
 msgstr "在 '%s' 创建了新报告。\n"
 
-#: builtin/bundle.c:15 builtin/bundle.c:23
+#: builtin/bundle.c
 msgid "git bundle create [<options>] <file> <git-rev-list args>"
 msgstr "git bundle create [<选项>] <文件> <git-rev-list 参数>"
 
-#: builtin/bundle.c:16 builtin/bundle.c:28
+#: builtin/bundle.c
 msgid "git bundle verify [<options>] <file>"
 msgstr "git bundle verify [<选项>] <文件>"
 
-#: builtin/bundle.c:17 builtin/bundle.c:33
+#: builtin/bundle.c
 msgid "git bundle list-heads <file> [<refname>...]"
 msgstr "git bundle list-heads <文件> [<引用名>...]"
 
-#: builtin/bundle.c:18 builtin/bundle.c:38
+#: builtin/bundle.c
 msgid "git bundle unbundle <file> [<refname>...]"
 msgstr "git bundle unbundle <文件> [<引用名>...]"
 
-#: builtin/bundle.c:65 builtin/pack-objects.c:3899
+#: builtin/bundle.c builtin/pack-objects.c
 msgid "do not show progress meter"
 msgstr "不显示进度表"
 
-#: builtin/bundle.c:67 builtin/bundle.c:168 builtin/pack-objects.c:3901
+#: builtin/bundle.c builtin/pack-objects.c
 msgid "show progress meter"
 msgstr "显示进度表"
 
-#: builtin/bundle.c:69 builtin/pack-objects.c:3903
+#: builtin/bundle.c builtin/pack-objects.c
 msgid "show progress meter during object writing phase"
 msgstr "在对象写入阶段显示进度表"
 
-#: builtin/bundle.c:72 builtin/pack-objects.c:3906
+#: builtin/bundle.c builtin/pack-objects.c
 msgid "similar to --all-progress when progress meter is shown"
 msgstr "当进度表显示时类似于 --all-progress"
 
-#: builtin/bundle.c:74
+#: builtin/bundle.c
 msgid "specify bundle format version"
 msgstr "指定归档包的格式版本"
 
-#: builtin/bundle.c:94
+#: builtin/bundle.c
 msgid "Need a repository to create a bundle."
 msgstr "需要一个仓库来创建归档包。"
 
-#: builtin/bundle.c:108
+#: builtin/bundle.c
 msgid "do not show bundle details"
 msgstr "不显示归档包的细节"
 
-#: builtin/bundle.c:127
+#: builtin/bundle.c
 #, c-format
 msgid "%s is okay\n"
 msgstr "%s 可以\n"
 
-#: builtin/bundle.c:183
+#: builtin/bundle.c
 msgid "Need a repository to unbundle."
 msgstr "需要一个仓库来解开归档包。"
 
-#: builtin/bundle.c:186
+#: builtin/bundle.c
 msgid "Unbundling objects"
 msgstr "解包对象中"
 
-#: builtin/bundle.c:220 builtin/remote.c:1758
+#: builtin/bundle.c builtin/remote.c
 #, c-format
 msgid "Unknown subcommand: %s"
 msgstr "未知子命令：%s"
 
-#: builtin/cat-file.c:568
+#: builtin/cat-file.c merge-recursive.c
+#, c-format
+msgid "cannot read object %s '%s'"
+msgstr "不能读取对象 %s '%s'"
+
+#: builtin/cat-file.c
 msgid "flush is only for --buffer mode"
 msgstr "flush 只在 --buffer 模式中使用"
 
-#: builtin/cat-file.c:612
+#: builtin/cat-file.c
 msgid "empty command in input"
 msgstr "输入为空的命令"
 
-#: builtin/cat-file.c:614
+#: builtin/cat-file.c
 #, c-format
 msgid "whitespace before command: '%s'"
 msgstr "命令前存在空白：'%s'"
 
-#: builtin/cat-file.c:623
+#: builtin/cat-file.c
 #, c-format
 msgid "%s requires arguments"
 msgstr "%s 需要参数"
 
-#: builtin/cat-file.c:628
+#: builtin/cat-file.c
 #, c-format
 msgid "%s takes no arguments"
 msgstr "%s 不需要参数"
 
-#: builtin/cat-file.c:636
+#: builtin/cat-file.c
 #, c-format
 msgid "unknown command: '%s'"
 msgstr "未知命令：'%s'"
 
-#: builtin/cat-file.c:795
+#: builtin/cat-file.c
 msgid "only one batch option may be specified"
 msgstr "只能指定一个批处理选项"
 
-#: builtin/cat-file.c:824
+#: builtin/cat-file.c
 msgid "git cat-file <type> <object>"
 msgstr "git cat-file <类型> <对象>"
 
-#: builtin/cat-file.c:825
+#: builtin/cat-file.c
 msgid "git cat-file (-e | -p) <object>"
 msgstr "git cat-file (-e | -p) <对象>"
 
-#: builtin/cat-file.c:826
+#: builtin/cat-file.c
 msgid "git cat-file (-t | -s) [--allow-unknown-type] <object>"
 msgstr "git cat-file (-t | -s) [--allow-unknown-type] <对象>"
 
-#: builtin/cat-file.c:827
+#: builtin/cat-file.c
 msgid ""
 "git cat-file (--batch | --batch-check | --batch-command) [--batch-all-"
 "objects]\n"
@@ -12319,7 +4001,7 @@ msgstr ""
 "             [--buffer] [--follow-symlinks] [--unordered]\n"
 "             [--textconv | --filters]"
 
-#: builtin/cat-file.c:830
+#: builtin/cat-file.c
 msgid ""
 "git cat-file (--textconv | --filters)\n"
 "             [<rev>:<path|tree-ish> | --path=<path|tree-ish> <rev>]"
@@ -12327,379 +4009,371 @@ msgstr ""
 "git cat-file (--textconv | --filters)\n"
 "             [<版本>:<路径|树对象> | --path=<路径|树对象> <版本>]"
 
-#: builtin/cat-file.c:836
+#: builtin/cat-file.c
 msgid "Check object existence or emit object contents"
 msgstr "检查对象存在或输出对象内容"
 
-#: builtin/cat-file.c:838
+#: builtin/cat-file.c
 msgid "check if <object> exists"
 msgstr "检查 <对象> 是否存在"
 
-#: builtin/cat-file.c:839
+#: builtin/cat-file.c
 msgid "pretty-print <object> content"
 msgstr "美观地打印 <对象> 的内容"
 
-#: builtin/cat-file.c:841
+#: builtin/cat-file.c
 msgid "Emit [broken] object attributes"
 msgstr "输出 [坏的] 对象属性"
 
-#: builtin/cat-file.c:842
+#: builtin/cat-file.c
 msgid "show object type (one of 'blob', 'tree', 'commit', 'tag', ...)"
 msgstr "显示对象的类型（'blob'、'tree'、'commit'、'tag'……其中之一）"
 
-#: builtin/cat-file.c:843
+#: builtin/cat-file.c
 msgid "show object size"
 msgstr "显示对象大小"
 
-#: builtin/cat-file.c:845
+#: builtin/cat-file.c
 msgid "allow -s and -t to work with broken/corrupt objects"
 msgstr "允许 -s 和 -t 对损坏的对象生效"
 
-#: builtin/cat-file.c:847
+#: builtin/cat-file.c
 msgid "Batch objects requested on stdin (or --batch-all-objects)"
 msgstr "批量处理标准输入中请求的对象（或者 --batch-all-objects）"
 
-#: builtin/cat-file.c:849
+#: builtin/cat-file.c
 msgid "show full <object> or <rev> contents"
 msgstr "显示完整的 <对象> 或 <版本> 内容"
 
-#: builtin/cat-file.c:853
+#: builtin/cat-file.c
 msgid "like --batch, but don't emit <contents>"
 msgstr "类似于 --batch，但不输出 <内容>"
 
-#: builtin/cat-file.c:857
+#: builtin/cat-file.c
 msgid "read commands from stdin"
 msgstr "从标准输入读取命令"
 
-#: builtin/cat-file.c:861
+#: builtin/cat-file.c
 msgid "with --batch[-check]: ignores stdin, batches all known objects"
 msgstr "带有 --batch[-check]：忽略标准输入，批量处理所有已知的对象"
 
-#: builtin/cat-file.c:863
+#: builtin/cat-file.c
 msgid "Change or optimize batch output"
 msgstr "更改或优化批处理输出"
 
-#: builtin/cat-file.c:864
+#: builtin/cat-file.c
 msgid "buffer --batch output"
 msgstr "缓冲 --batch 的输出"
 
-#: builtin/cat-file.c:866
+#: builtin/cat-file.c
 msgid "follow in-tree symlinks"
 msgstr "跟随树内符号链接"
 
-#: builtin/cat-file.c:868
+#: builtin/cat-file.c
 msgid "do not order objects before emitting them"
 msgstr "在输出对象前不要排序"
 
-#: builtin/cat-file.c:870
+#: builtin/cat-file.c
 msgid ""
 "Emit object (blob or tree) with conversion or filter (stand-alone, or with "
 "batch)"
 msgstr "转换或过滤后输出对象（数据对象或树）（单独或批处理）"
 
-#: builtin/cat-file.c:872
+#: builtin/cat-file.c
 msgid "run textconv on object's content"
 msgstr "对对象内容做文本转换"
 
-#: builtin/cat-file.c:874
+#: builtin/cat-file.c
 msgid "run filters on object's content"
 msgstr "对对象内容做过滤"
 
-#: builtin/cat-file.c:875
+#: builtin/cat-file.c
 msgid "blob|tree"
 msgstr "数据对象|树"
 
-#: builtin/cat-file.c:876
+#: builtin/cat-file.c
 msgid "use a <path> for (--textconv | --filters); Not with 'batch'"
 msgstr "(--textconv | --filters) 使用 <路径>；而不是 'batch'"
 
-#: builtin/cat-file.c:894
+#: builtin/cat-file.c
 #, c-format
 msgid "'%s=<%s>' needs '%s' or '%s'"
 msgstr "'%s=<%s>' 需要 '%s' 或 '%s'"
 
-#: builtin/cat-file.c:896
+#: builtin/cat-file.c
 msgid "path|tree-ish"
 msgstr "路径|树对象"
 
-#: builtin/cat-file.c:903 builtin/cat-file.c:906 builtin/cat-file.c:909
+#: builtin/cat-file.c
 #, c-format
 msgid "'%s' requires a batch mode"
 msgstr "'%s' 需要批处理模式"
 
-#: builtin/cat-file.c:921
+#: builtin/cat-file.c
 #, c-format
 msgid "'-%c' is incompatible with batch mode"
 msgstr "'-%c' 与批处理模式不兼容"
 
-#: builtin/cat-file.c:924
+#: builtin/cat-file.c
 msgid "batch modes take no arguments"
 msgstr "批处理模式不带其他参数"
 
-#: builtin/cat-file.c:932 builtin/cat-file.c:935
+#: builtin/cat-file.c
 #, c-format
 msgid "<rev> required with '%s'"
 msgstr "'%s' 需要 <版本>"
 
-#: builtin/cat-file.c:938
+#: builtin/cat-file.c
 #, c-format
 msgid "<object> required with '-%c'"
 msgstr "'-%c' 需要 <对象>"
 
-#: builtin/cat-file.c:943 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:965
-#: builtin/notes.c:987 builtin/prune-packed.c:25 builtin/receive-pack.c:2489
-#: builtin/tag.c:592
+#: builtin/cat-file.c builtin/notes.c builtin/prune-packed.c
+#: builtin/receive-pack.c builtin/tag.c
 msgid "too many arguments"
 msgstr "太多参数"
 
-#: builtin/cat-file.c:947
+#: builtin/cat-file.c
 #, c-format
 msgid "only two arguments allowed in <type> <object> mode, not %d"
 msgstr "<类型> <对象> 模式只允许两个参数，而不是 %d 个"
 
-#: builtin/check-attr.c:13
+#: builtin/check-attr.c
 msgid "git check-attr [-a | --all | <attr>...] [--] <pathname>..."
 msgstr "git check-attr [-a | --all | <属性>...] [--] <路径名>..."
 
-#: builtin/check-attr.c:14
+#: builtin/check-attr.c
 msgid "git check-attr --stdin [-z] [-a | --all | <attr>...]"
 msgstr "git check-attr --stdin [-z] [-a | --all | <属性>...]"
 
-#: builtin/check-attr.c:21
+#: builtin/check-attr.c
 msgid "report all attributes set on file"
 msgstr "报告设置在文件上的所有属性"
 
-#: builtin/check-attr.c:22
+#: builtin/check-attr.c
 msgid "use .gitattributes only from the index"
 msgstr "只使用索引中的 .gitattributes"
 
-#: builtin/check-attr.c:23 builtin/check-ignore.c:25 builtin/hash-object.c:101
+#: builtin/check-attr.c builtin/check-ignore.c builtin/hash-object.c
 msgid "read file names from stdin"
 msgstr "从标准输入读出文件名"
 
-#: builtin/check-attr.c:25 builtin/check-ignore.c:27
+#: builtin/check-attr.c builtin/check-ignore.c
 msgid "terminate input and output records by a NUL character"
 msgstr "输入和输出的记录使用 NUL 字符终结"
 
-#: builtin/check-ignore.c:21 builtin/checkout.c:1550 builtin/gc.c:550
-#: builtin/worktree.c:565
+#: builtin/check-ignore.c builtin/checkout.c builtin/gc.c builtin/worktree.c
 msgid "suppress progress reporting"
 msgstr "不显示进度报告"
 
-#: builtin/check-ignore.c:29
+#: builtin/check-ignore.c
 msgid "show non-matching input paths"
 msgstr "显示未匹配的输入路径"
 
-#: builtin/check-ignore.c:31
+#: builtin/check-ignore.c
 msgid "ignore index when checking"
 msgstr "检查时忽略索引"
 
-#: builtin/check-ignore.c:165
+#: builtin/check-ignore.c
 msgid "cannot specify pathnames with --stdin"
 msgstr "不能同时指定路径及 --stdin 参数"
 
-#: builtin/check-ignore.c:168
+#: builtin/check-ignore.c
 msgid "-z only makes sense with --stdin"
 msgstr "-z 需要和 --stdin 参数共用才有意义"
 
-#: builtin/check-ignore.c:170
+#: builtin/check-ignore.c
 msgid "no path specified"
 msgstr "未指定路径"
 
-#: builtin/check-ignore.c:174
+#: builtin/check-ignore.c
 msgid "--quiet is only valid with a single pathname"
 msgstr "参数 --quiet 只在提供一个路径名时有效"
 
-#: builtin/check-ignore.c:176
+#: builtin/check-ignore.c
 msgid "cannot have both --quiet and --verbose"
 msgstr "不能同时提供 --quiet 和 --verbose 参数"
 
-#: builtin/check-ignore.c:179
+#: builtin/check-ignore.c
 msgid "--non-matching is only valid with --verbose"
 msgstr "--non-matching 选项只在使用 --verbose 时有效"
 
-#: builtin/check-mailmap.c:9
+#: builtin/check-mailmap.c
 msgid "git check-mailmap [<options>] <contact>..."
 msgstr "git check-mailmap [<选项>] <联系地址>..."
 
-#: builtin/check-mailmap.c:14
+#: builtin/check-mailmap.c
 msgid "also read contacts from stdin"
 msgstr "还从标准输入读取联系地址"
 
-#: builtin/check-mailmap.c:25
+#: builtin/check-mailmap.c
 #, c-format
 msgid "unable to parse contact: %s"
 msgstr "不能解析联系地址：%s"
 
-#: builtin/check-mailmap.c:48
+#: builtin/check-mailmap.c
 msgid "no contacts specified"
 msgstr "未指定联系地址"
 
-#: builtin/checkout--worker.c:110
+#: builtin/checkout--worker.c
 msgid "git checkout--worker [<options>]"
 msgstr "git checkout--worker [<选项>]"
 
-#: builtin/checkout--worker.c:118 builtin/checkout-index.c:235
-#: builtin/column.c:31 builtin/column.c:32 builtin/submodule--helper.c:1878
-#: builtin/submodule--helper.c:1881 builtin/submodule--helper.c:1889
-#: builtin/submodule--helper.c:2716 builtin/worktree.c:563
-#: builtin/worktree.c:808
+#: builtin/checkout--worker.c builtin/checkout-index.c builtin/column.c
+#: builtin/submodule--helper.c builtin/worktree.c
 msgid "string"
 msgstr "字符串"
 
-#: builtin/checkout--worker.c:119 builtin/checkout-index.c:236
+#: builtin/checkout--worker.c builtin/checkout-index.c
 msgid "when creating files, prepend <string>"
 msgstr "在创建文件时，在前面加上 <字符串>"
 
-#: builtin/checkout-index.c:184
+#: builtin/checkout-index.c
 msgid "git checkout-index [<options>] [--] [<file>...]"
 msgstr "git checkout-index [<选项>] [--] [<文件>...]"
 
-#: builtin/checkout-index.c:201
+#: builtin/checkout-index.c
 msgid "stage should be between 1 and 3 or all"
 msgstr "索引值应该取值 1 到 3 或者 all"
 
-#: builtin/checkout-index.c:219
+#: builtin/checkout-index.c
 msgid "check out all files in the index"
 msgstr "检出索引区的所有文件"
 
-#: builtin/checkout-index.c:221
+#: builtin/checkout-index.c
 msgid "do not skip files with skip-worktree set"
 msgstr "在 skip-worktree 设置时不要跳过文件"
 
-#: builtin/checkout-index.c:222
+#: builtin/checkout-index.c
 msgid "force overwrite of existing files"
 msgstr "强制覆盖现有的文件"
 
-#: builtin/checkout-index.c:224
+#: builtin/checkout-index.c
 msgid "no warning for existing files and files not in index"
 msgstr "存在或不在索引中的文件都没有警告"
 
-#: builtin/checkout-index.c:226
+#: builtin/checkout-index.c
 msgid "don't checkout new files"
 msgstr "不检出新文件"
 
-#: builtin/checkout-index.c:228
+#: builtin/checkout-index.c
 msgid "update stat information in the index file"
 msgstr "更新索引中文件的状态信息"
 
-#: builtin/checkout-index.c:232
+#: builtin/checkout-index.c
 msgid "read list of paths from the standard input"
 msgstr "从标准输入读取路径列表"
 
-#: builtin/checkout-index.c:234
+#: builtin/checkout-index.c
 msgid "write the content to temporary files"
 msgstr "将内容写入临时文件"
 
-#: builtin/checkout-index.c:238
+#: builtin/checkout-index.c
 msgid "copy out the files from named stage"
 msgstr "从指定暂存区中拷出文件"
 
-#: builtin/checkout.c:34
+#: builtin/checkout.c
 msgid "git checkout [<options>] <branch>"
 msgstr "git checkout [<选项>] <分支>"
 
-#: builtin/checkout.c:35
+#: builtin/checkout.c
 msgid "git checkout [<options>] [<branch>] -- <file>..."
 msgstr "git checkout [<选项>] [<分支>] -- <文件>..."
 
-#: builtin/checkout.c:40
+#: builtin/checkout.c
 msgid "git switch [<options>] [<branch>]"
 msgstr "git switch [<选项>] [<分支>]"
 
-#: builtin/checkout.c:45
+#: builtin/checkout.c
 msgid "git restore [<options>] [--source=<branch>] <file>..."
 msgstr "git restore [<选项>] [--source=<分支>] <文件>..."
 
-#: builtin/checkout.c:199 builtin/checkout.c:238
+#: builtin/checkout.c
 #, c-format
 msgid "path '%s' does not have our version"
 msgstr "路径 '%s' 没有我们的版本"
 
-#: builtin/checkout.c:201 builtin/checkout.c:240
+#: builtin/checkout.c
 #, c-format
 msgid "path '%s' does not have their version"
 msgstr "路径 '%s' 没有他们的版本"
 
-#: builtin/checkout.c:217
+#: builtin/checkout.c
 #, c-format
 msgid "path '%s' does not have all necessary versions"
 msgstr "路径 '%s' 没有全部必需的版本"
 
-#: builtin/checkout.c:271
+#: builtin/checkout.c
 #, c-format
 msgid "path '%s' does not have necessary versions"
 msgstr "路径 '%s' 没有必需的版本"
 
-#: builtin/checkout.c:291
+#: builtin/checkout.c
 #, c-format
 msgid "path '%s': cannot merge"
 msgstr "path '%s'：无法合并"
 
-#: builtin/checkout.c:307
+#: builtin/checkout.c
 #, c-format
 msgid "Unable to add merge result for '%s'"
 msgstr "无法为 '%s' 添加合并结果"
 
-#: builtin/checkout.c:424
+#: builtin/checkout.c
 #, c-format
 msgid "Recreated %d merge conflict"
 msgid_plural "Recreated %d merge conflicts"
 msgstr[0] "重新创建了 %d 个合并冲突"
 msgstr[1] "重新创建了 %d 个合并冲突"
 
-#: builtin/checkout.c:429
+#: builtin/checkout.c
 #, c-format
 msgid "Updated %d path from %s"
 msgid_plural "Updated %d paths from %s"
 msgstr[0] "从 %2$s 更新了 %1$d 个路径"
 msgstr[1] "从 %2$s 更新了 %1$d 个路径"
 
-#: builtin/checkout.c:436
+#: builtin/checkout.c
 #, 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:459 builtin/checkout.c:462 builtin/checkout.c:465
-#: builtin/checkout.c:469
+#: builtin/checkout.c
 #, c-format
 msgid "'%s' cannot be used with updating paths"
 msgstr "'%s' 不能在更新路径时使用"
 
-#: builtin/checkout.c:479
+#: builtin/checkout.c
 #, c-format
 msgid "Cannot update paths and switch to branch '%s' at the same time."
 msgstr "不能同时更新路径并切换到分支'%s'。"
 
-#: builtin/checkout.c:483
+#: builtin/checkout.c
 #, c-format
 msgid "neither '%s' or '%s' is specified"
 msgstr "'%s' 或 '%s' 都没有指定"
 
-#: builtin/checkout.c:487
+#: builtin/checkout.c
 #, c-format
 msgid "'%s' must be used when '%s' is not specified"
 msgstr "未指定 '%2$s' 时，必须使用 '%1$s'"
 
-#: builtin/checkout.c:492 builtin/checkout.c:497
+#: builtin/checkout.c
 #, c-format
 msgid "'%s' or '%s' cannot be used with %s"
 msgstr "'%s' 或 '%s' 不能和 %s 一起使用"
 
-#: builtin/checkout.c:571 builtin/checkout.c:578
+#: builtin/checkout.c
 #, c-format
 msgid "path '%s' is unmerged"
 msgstr "路径 '%s' 未合并"
 
-#: builtin/checkout.c:753
+#: builtin/checkout.c
 msgid "you need to resolve your current index first"
 msgstr "您需要先解决当前索引的冲突"
 
-#: builtin/checkout.c:809
+#: builtin/checkout.c
 #, c-format
 msgid ""
 "cannot continue with staged changes in the following files:\n"
@@ -12708,51 +4382,51 @@ msgstr ""
 "不能继续，下列文件有暂存的修改：\n"
 "%s"
 
-#: builtin/checkout.c:902
+#: builtin/checkout.c
 #, c-format
 msgid "Can not do reflog for '%s': %s\n"
 msgstr "不能对 '%s' 执行 reflog 操作：%s\n"
 
-#: builtin/checkout.c:947
+#: builtin/checkout.c
 msgid "HEAD is now at"
 msgstr "HEAD 目前位于"
 
-#: builtin/checkout.c:951 builtin/clone.c:615 t/helper/test-fast-rebase.c:203
+#: builtin/checkout.c builtin/clone.c t/helper/test-fast-rebase.c
 msgid "unable to update HEAD"
 msgstr "不能更新 HEAD"
 
-#: builtin/checkout.c:955
+#: builtin/checkout.c
 #, c-format
 msgid "Reset branch '%s'\n"
 msgstr "重置分支 '%s'\n"
 
-#: builtin/checkout.c:958
+#: builtin/checkout.c
 #, c-format
 msgid "Already on '%s'\n"
 msgstr "已经位于 '%s'\n"
 
-#: builtin/checkout.c:962
+#: builtin/checkout.c
 #, c-format
 msgid "Switched to and reset branch '%s'\n"
 msgstr "切换并重置分支 '%s'\n"
 
-#: builtin/checkout.c:964 builtin/checkout.c:1398
+#: builtin/checkout.c
 #, c-format
 msgid "Switched to a new branch '%s'\n"
 msgstr "切换到一个新分支 '%s'\n"
 
-#: builtin/checkout.c:966
+#: builtin/checkout.c
 #, c-format
 msgid "Switched to branch '%s'\n"
 msgstr "切换到分支 '%s'\n"
 
 #  译者：注意保持前导空格
-#: builtin/checkout.c:1017
+#: builtin/checkout.c
 #, c-format
 msgid " ... and %d more.\n"
 msgstr " ... 及其它 %d 个。\n"
 
-#: builtin/checkout.c:1023
+#: builtin/checkout.c
 #, c-format
 msgid ""
 "Warning: you are leaving %d commit behind, not connected to\n"
@@ -12773,7 +4447,7 @@ msgstr[1] ""
 "\n"
 "%s\n"
 
-#: builtin/checkout.c:1042
+#: builtin/checkout.c
 #, c-format
 msgid ""
 "If you want to keep it by creating a new branch, this may be a good time\n"
@@ -12800,19 +4474,19 @@ msgstr[1] ""
 " git branch <新分支名> %s\n"
 "\n"
 
-#: builtin/checkout.c:1077
+#: builtin/checkout.c
 msgid "internal error in revision walk"
 msgstr "在版本遍历时遇到内部错误"
 
-#: builtin/checkout.c:1081
+#: builtin/checkout.c
 msgid "Previous HEAD position was"
 msgstr "之前的 HEAD 位置是"
 
-#: builtin/checkout.c:1124 builtin/checkout.c:1393
+#: builtin/checkout.c
 msgid "You are on a branch yet to be born"
 msgstr "您位于一个尚未初始化的分支"
 
-#: builtin/checkout.c:1206
+#: builtin/checkout.c
 #, c-format
 msgid ""
 "'%s' could be both a local file and a tracking branch.\n"
@@ -12821,7 +4495,7 @@ msgstr ""
 "'%s' 既可以是一个本地文件，也可以是一个跟踪分支。\n"
 "请使用 --（和可选的 --no-guess）来消除歧义"
 
-#: builtin/checkout.c:1213
+#: builtin/checkout.c
 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"
@@ -12840,56 +4514,56 @@ msgstr ""
 "如果您总是喜欢使用模糊的简短分支名 <名称>，而不喜欢如 'origin' 的远程\n"
 "名称，可以在配置中设置 checkout.defaultRemote=origin。"
 
-#: builtin/checkout.c:1223
+#: builtin/checkout.c
 #, c-format
 msgid "'%s' matched multiple (%d) remote tracking branches"
 msgstr "'%s' 匹配多个（%d 个）远程跟踪分支"
 
-#: builtin/checkout.c:1289
+#: builtin/checkout.c
 msgid "only one reference expected"
 msgstr "只期望一个引用"
 
-#: builtin/checkout.c:1306
+#: builtin/checkout.c
 #, c-format
 msgid "only one reference expected, %d given."
 msgstr "应只有一个引用，却给出了 %d 个"
 
-#: builtin/checkout.c:1352 builtin/worktree.c:338 builtin/worktree.c:508
+#: builtin/checkout.c builtin/worktree.c
 #, c-format
 msgid "invalid reference: %s"
 msgstr "无效引用：%s"
 
-#: builtin/checkout.c:1365 builtin/checkout.c:1744
+#: builtin/checkout.c
 #, c-format
 msgid "reference is not a tree: %s"
 msgstr "引用不是一个树：%s"
 
-#: builtin/checkout.c:1413
+#: builtin/checkout.c
 #, c-format
 msgid "a branch is expected, got tag '%s'"
 msgstr "期望一个分支，得到标签 '%s'"
 
-#: builtin/checkout.c:1415
+#: builtin/checkout.c
 #, c-format
 msgid "a branch is expected, got remote branch '%s'"
 msgstr "期望一个分支，得到远程分支 '%s'"
 
-#: builtin/checkout.c:1417 builtin/checkout.c:1426
+#: builtin/checkout.c
 #, c-format
 msgid "a branch is expected, got '%s'"
 msgstr "期望一个分支，得到 '%s'"
 
-#: builtin/checkout.c:1420
+#: builtin/checkout.c
 #, c-format
 msgid "a branch is expected, got commit '%s'"
 msgstr "期望一个分支，得到提交 '%s'"
 
-#: builtin/checkout.c:1429
+#: builtin/checkout.c
 msgid ""
 "If you want to detach HEAD at the commit, try again with the --detach option."
 msgstr "如果你在本提交分离头指针，使用 --detach 选项重试。"
 
-#: builtin/checkout.c:1442
+#: builtin/checkout.c
 msgid ""
 "cannot switch branch while merging\n"
 "Consider \"git merge --quit\" or \"git worktree add\"."
@@ -12897,7 +4571,7 @@ msgstr ""
 "不能在合并时切换分支\n"
 "考虑使用 \"git merge --quit\" 或 \"git worktree add\"。"
 
-#: builtin/checkout.c:1446
+#: builtin/checkout.c
 msgid ""
 "cannot switch branch in the middle of an am session\n"
 "Consider \"git am --quit\" or \"git worktree add\"."
@@ -12905,7 +4579,7 @@ msgstr ""
 "不能在一个 am 会话期间切换分支\n"
 "考虑使用 \"git am --quit\" 或 \"git worktree add\"。"
 
-#: builtin/checkout.c:1450
+#: builtin/checkout.c
 msgid ""
 "cannot switch branch while rebasing\n"
 "Consider \"git rebase --quit\" or \"git worktree add\"."
@@ -12913,7 +4587,7 @@ msgstr ""
 "不能在变基时切换分支\n"
 "考虑使用 \"git rebase --quit\" 或 \"git worktree add\"。"
 
-#: builtin/checkout.c:1454
+#: builtin/checkout.c
 msgid ""
 "cannot switch branch while cherry-picking\n"
 "Consider \"git cherry-pick --quit\" or \"git worktree add\"."
@@ -12921,7 +4595,7 @@ msgstr ""
 "不能在拣选时切换分支\n"
 "考虑使用 \"git cherry-pick --quit\" 或 \"git worktree add\"。"
 
-#: builtin/checkout.c:1458
+#: builtin/checkout.c
 msgid ""
 "cannot switch branch while reverting\n"
 "Consider \"git revert --quit\" or \"git worktree add\"."
@@ -12929,235 +4603,236 @@ msgstr ""
 "不能在还原时切换分支\n"
 "考虑使用 \"git revert --quit\" 或 \"git worktree add\"。"
 
-#: builtin/checkout.c:1462
+#: builtin/checkout.c
 msgid "you are switching branch while bisecting"
 msgstr "您在执行二分查找时切换分支"
 
-#: builtin/checkout.c:1469
+#: builtin/checkout.c
 msgid "paths cannot be used with switching branches"
 msgstr "路径不能和切换分支同时使用"
 
-#: builtin/checkout.c:1472 builtin/checkout.c:1476 builtin/checkout.c:1480
+#: builtin/checkout.c
 #, c-format
 msgid "'%s' cannot be used with switching branches"
 msgstr "'%s' 不能和切换分支同时使用"
 
-#: builtin/checkout.c:1484 builtin/checkout.c:1487 builtin/checkout.c:1490
-#: builtin/checkout.c:1495 builtin/checkout.c:1500
+#: builtin/checkout.c
 #, c-format
 msgid "'%s' cannot be used with '%s'"
 msgstr "'%s' 不能和 '%s' 同时使用"
 
-#: builtin/checkout.c:1497
+#: builtin/checkout.c
 #, c-format
 msgid "'%s' cannot take <start-point>"
 msgstr "'%s' 不带 <起始点>"
 
-#: builtin/checkout.c:1505
+#: builtin/checkout.c
 #, c-format
 msgid "Cannot switch branch to a non-commit '%s'"
 msgstr "不能切换分支到一个非提交 '%s'"
 
-#: builtin/checkout.c:1512
+#: builtin/checkout.c
 msgid "missing branch or commit argument"
 msgstr "缺少分支或提交参数"
 
-#: builtin/checkout.c:1555
+#: builtin/checkout.c
 msgid "perform a 3-way merge with the new branch"
 msgstr "和新的分支执行三方合并"
 
-#: builtin/checkout.c:1556 builtin/log.c:1844 parse-options.h:354
+#: builtin/checkout.c builtin/log.c parse-options.h
 msgid "style"
 msgstr "风格"
 
-#: builtin/checkout.c:1557
+#: builtin/checkout.c
 msgid "conflict style (merge, diff3, or zdiff3)"
 msgstr "冲突输出风格（merge、diff3 或 zdiff3）"
 
-#: builtin/checkout.c:1569 builtin/worktree.c:560
+#: builtin/checkout.c builtin/worktree.c
 msgid "detach HEAD at named commit"
 msgstr "HEAD 从指定的提交分离"
 
-#: builtin/checkout.c:1574
+#: builtin/checkout.c
 msgid "force checkout (throw away local modifications)"
 msgstr "强制检出（丢弃本地修改）"
 
-#: builtin/checkout.c:1576
+#: builtin/checkout.c
 msgid "new-branch"
 msgstr "新分支"
 
-#: builtin/checkout.c:1576
+#: builtin/checkout.c
 msgid "new unparented branch"
 msgstr "新的没有父提交的分支"
 
-#: builtin/checkout.c:1578 builtin/merge.c:305
+#: builtin/checkout.c builtin/merge.c
 msgid "update ignored files (default)"
 msgstr "更新忽略的文件（默认）"
 
-#: builtin/checkout.c:1581
+#: builtin/checkout.c
 msgid "do not check if another worktree is holding the given ref"
 msgstr "不检查指定的引用是否被其他工作区所占用"
 
-#: builtin/checkout.c:1594
+#: builtin/checkout.c
 msgid "checkout our version for unmerged files"
 msgstr "对尚未合并的文件检出我们的版本"
 
-#: builtin/checkout.c:1597
+#: builtin/checkout.c
 msgid "checkout their version for unmerged files"
 msgstr "对尚未合并的文件检出他们的版本"
 
-#: builtin/checkout.c:1601
+#: builtin/checkout.c
 msgid "do not limit pathspecs to sparse entries only"
 msgstr "对路径不做稀疏检出的限制"
 
-#: builtin/checkout.c:1659
+#: builtin/checkout.c
 #, c-format
 msgid "options '-%c', '-%c', and '%s' cannot be used together"
 msgstr "选项 '-%c'、'-%c' 和 ‘%s' 不能同时使用"
 
-#: builtin/checkout.c:1700
+#: builtin/checkout.c
 msgid "--track needs a branch name"
 msgstr "--track 需要一个分支名"
 
-#: builtin/checkout.c:1705
+#: builtin/checkout.c
 #, c-format
 msgid "missing branch name; try -%c"
 msgstr "缺少分支名，尝试 -%c"
 
-#: builtin/checkout.c:1737
+#: builtin/checkout.c
 #, c-format
 msgid "could not resolve %s"
 msgstr "无法解析 %s"
 
-#: builtin/checkout.c:1753
+#: builtin/checkout.c
 msgid "invalid path specification"
 msgstr "无效的路径规格"
 
-#: builtin/checkout.c:1760
+#: builtin/checkout.c
 #, c-format
 msgid "'%s' is not a commit and a branch '%s' cannot be created from it"
 msgstr "'%s' 不是一个提交，不能基于它创建分支 '%s'"
 
-#: builtin/checkout.c:1764
+#: builtin/checkout.c
 #, c-format
 msgid "git checkout: --detach does not take a path argument '%s'"
 msgstr "git checkout：--detach 不能接收路径参数 '%s'"
 
-#: builtin/checkout.c:1789
+#: builtin/checkout.c
 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:1794
+#: builtin/checkout.c
 msgid "you must specify path(s) to restore"
 msgstr "您必须指定一个要恢复的路径"
 
-#: builtin/checkout.c:1819 builtin/checkout.c:1821 builtin/checkout.c:1873
-#: builtin/checkout.c:1875 builtin/clone.c:130 builtin/remote.c:171
-#: builtin/remote.c:173 builtin/submodule--helper.c:3038
-#: builtin/submodule--helper.c:3371 builtin/worktree.c:556
-#: builtin/worktree.c:558
+#: builtin/checkout.c builtin/clone.c builtin/remote.c
+#: builtin/submodule--helper.c builtin/worktree.c
 msgid "branch"
 msgstr "分支"
 
-#: builtin/checkout.c:1820
+#: builtin/checkout.c
 msgid "create and checkout a new branch"
 msgstr "创建并检出一个新的分支"
 
-#: builtin/checkout.c:1822
+#: builtin/checkout.c
 msgid "create/reset and checkout a branch"
 msgstr "创建/重置并检出一个分支"
 
-#: builtin/checkout.c:1823
+#: builtin/checkout.c
 msgid "create reflog for new branch"
 msgstr "为新的分支创建引用日志"
 
-#: builtin/checkout.c:1825
+#: builtin/checkout.c
 msgid "second guess 'git checkout <no-such-branch>' (default)"
 msgstr "二次猜测 'git checkout <无此分支>'（默认）"
 
-#: builtin/checkout.c:1826
+#: builtin/checkout.c
 msgid "use overlay mode (default)"
 msgstr "使用叠加模式（默认）"
 
-#: builtin/checkout.c:1874
+#: builtin/checkout.c
 msgid "create and switch to a new branch"
 msgstr "创建并切换一个新分支"
 
-#: builtin/checkout.c:1876
+#: builtin/checkout.c
 msgid "create/reset and switch to a branch"
 msgstr "创建/重置并切换一个分支"
 
-#: builtin/checkout.c:1878
+#: builtin/checkout.c
 msgid "second guess 'git switch <no-such-branch>'"
 msgstr "二次猜测 'git switch <无此分支>'"
 
-#: builtin/checkout.c:1880
+#: builtin/checkout.c
 msgid "throw away local modifications"
 msgstr "丢弃本地修改"
 
-#: builtin/checkout.c:1916
+#: builtin/checkout.c
 msgid "which tree-ish to checkout from"
 msgstr "要检出哪一个树"
 
-#: builtin/checkout.c:1918
+#: builtin/checkout.c
 msgid "restore the index"
 msgstr "恢复索引"
 
-#: builtin/checkout.c:1920
+#: builtin/checkout.c
 msgid "restore the working tree (default)"
 msgstr "恢复工作区（默认）"
 
-#: builtin/checkout.c:1922
+#: builtin/checkout.c
 msgid "ignore unmerged entries"
 msgstr "忽略未合并条目"
 
-#: builtin/checkout.c:1923
+#: builtin/checkout.c
 msgid "use overlay mode"
 msgstr "使用叠加模式"
 
-#: builtin/clean.c:29
+#: builtin/clean.c
 msgid ""
 "git clean [-d] [-f] [-i] [-n] [-q] [-e <pattern>] [-x | -X] [--] <paths>..."
 msgstr ""
 "git clean [-d] [-f] [-i] [-n] [-q] [-e <模式>] [-x | -X] [--] <路径>..."
 
-#: builtin/clean.c:33
+#: builtin/clean.c
 #, c-format
 msgid "Removing %s\n"
 msgstr "正删除 %s\n"
 
-#: builtin/clean.c:34
+#: builtin/clean.c
 #, c-format
 msgid "Would remove %s\n"
 msgstr "将删除 %s\n"
 
-#: builtin/clean.c:35
+#: builtin/clean.c
 #, c-format
 msgid "Skipping repository %s\n"
 msgstr "忽略仓库 %s\n"
 
-#: builtin/clean.c:36
+#: builtin/clean.c
 #, c-format
 msgid "Would skip repository %s\n"
 msgstr "将忽略仓库 %s\n"
 
-#: builtin/clean.c:38
+#: builtin/clean.c midx.c
+#, c-format
+msgid "failed to remove %s"
+msgstr "无法删除 %s"
+
+#: builtin/clean.c
 #, c-format
 msgid "could not lstat %s\n"
 msgstr "不能对 %s 调用 lstat\n"
 
-#: builtin/clean.c:39
+#: builtin/clean.c
 msgid "Refusing to remove current working directory\n"
 msgstr "拒绝删除当前工作目录\n"
 
-#: builtin/clean.c:40
+#: builtin/clean.c
 msgid "Would refuse to remove current working directory\n"
 msgstr "将拒绝删除当前工作目录\n"
 
-#: builtin/clean.c:326 git-add--interactive.perl:593
+#: builtin/clean.c git-add--interactive.perl
 #, c-format
 msgid ""
 "Prompt help:\n"
@@ -13170,7 +4845,7 @@ msgstr ""
 "foo        - 通过唯一前缀选择一个选项\n"
 "           - （空）什么也不选择\n"
 
-#: builtin/clean.c:330 git-add--interactive.perl:602
+#: builtin/clean.c git-add--interactive.perl
 #, c-format
 msgid ""
 "Prompt help:\n"
@@ -13191,33 +4866,32 @@ msgstr ""
 "*          - 选择所有选项\n"
 "           - （空）结束选择\n"
 
-#: builtin/clean.c:545 git-add--interactive.perl:568
-#: git-add--interactive.perl:573
+#: builtin/clean.c git-add--interactive.perl
 #, c-format, perl-format
 msgid "Huh (%s)?\n"
 msgstr "嗯（%s）？\n"
 
-#: builtin/clean.c:685
+#: builtin/clean.c
 #, c-format
 msgid "Input ignore patterns>> "
 msgstr "输入模版以排除条目>> "
 
-#: builtin/clean.c:719
+#: builtin/clean.c
 #, c-format
 msgid "WARNING: Cannot find items matched by: %s"
 msgstr "警告：无法找到和 %s 匹配的条目"
 
-#: builtin/clean.c:740
+#: builtin/clean.c
 msgid "Select items to delete"
 msgstr "选择要删除的条目"
 
 #. TRANSLATORS: Make sure to keep [y/N] as is
-#: builtin/clean.c:781
+#: builtin/clean.c
 #, c-format
 msgid "Remove %s [y/N]? "
 msgstr "删除 %s [y/N]？"
 
-#: builtin/clean.c:812
+#: builtin/clean.c
 msgid ""
 "clean               - start cleaning\n"
 "filter by pattern   - exclude items from deletion\n"
@@ -13235,275 +4909,273 @@ msgstr ""
 "help                - 显示本帮助\n"
 "?                   - 显示如何在提示符下选择的帮助"
 
-#: builtin/clean.c:848
+#: builtin/clean.c
 msgid "Would remove the following item:"
 msgid_plural "Would remove the following items:"
 msgstr[0] "将删除如下条目："
 msgstr[1] "将删除如下条目："
 
-#: builtin/clean.c:864
+#: builtin/clean.c
 msgid "No more files to clean, exiting."
 msgstr "没有要清理的文件，退出。"
 
-#: builtin/clean.c:926
+#: builtin/clean.c
 msgid "do not print names of files removed"
 msgstr "不打印删除文件的名称"
 
-#: builtin/clean.c:928
+#: builtin/clean.c
 msgid "force"
 msgstr "强制"
 
-#: builtin/clean.c:929
+#: builtin/clean.c
 msgid "interactive cleaning"
 msgstr "交互式清除"
 
-#: builtin/clean.c:931
+#: builtin/clean.c
 msgid "remove whole directories"
 msgstr "删除整个目录"
 
-#: builtin/clean.c:932 builtin/describe.c:565 builtin/describe.c:567
-#: builtin/grep.c:938 builtin/log.c:185 builtin/log.c:187
-#: builtin/ls-files.c:651 builtin/name-rev.c:585 builtin/name-rev.c:587
-#: builtin/show-ref.c:179
+#: builtin/clean.c builtin/describe.c builtin/grep.c builtin/log.c
+#: builtin/ls-files.c builtin/name-rev.c builtin/show-ref.c
 msgid "pattern"
 msgstr "模式"
 
-#: builtin/clean.c:933
+#: builtin/clean.c
 msgid "add <pattern> to ignore rules"
 msgstr "添加 <模式> 到忽略规则"
 
-#: builtin/clean.c:934
+#: builtin/clean.c
 msgid "remove ignored files, too"
 msgstr "也删除忽略的文件"
 
-#: builtin/clean.c:936
+#: builtin/clean.c
 msgid "remove only ignored files"
 msgstr "只删除忽略的文件"
 
-#: builtin/clean.c:951
+#: builtin/clean.c
 msgid ""
 "clean.requireForce set to true and neither -i, -n, nor -f given; refusing to "
 "clean"
 msgstr ""
 "clean.requireForce 设置为 true 且未提供 -i、-n 或 -f 选项，拒绝执行清理动作"
 
-#: builtin/clean.c:954
+#: builtin/clean.c
 msgid ""
 "clean.requireForce defaults to true and neither -i, -n, nor -f given; "
 "refusing to clean"
 msgstr ""
 "clean.requireForce 默认为 true 且未提供 -i、-n 或 -f 选项，拒绝执行清理动作"
 
-#: builtin/clean.c:966
+#: builtin/clean.c
 msgid "-x and -X cannot be used together"
 msgstr "-x 和 -X 不能同时使用"
 
-#: builtin/clone.c:47
+#: builtin/clone.c
 msgid "git clone [<options>] [--] <repo> [<dir>]"
 msgstr "git clone [<选项>] [--] <仓库> [<路径>]"
 
-#: builtin/clone.c:100
+#: builtin/clone.c
 msgid "don't clone shallow repository"
 msgstr "不克隆浅仓库"
 
-#: builtin/clone.c:102
+#: builtin/clone.c
 msgid "don't create a checkout"
 msgstr "不创建一个检出"
 
-#: builtin/clone.c:103 builtin/clone.c:105 builtin/init-db.c:542
+#: builtin/clone.c builtin/init-db.c
 msgid "create a bare repository"
 msgstr "创建一个纯仓库"
 
-#: builtin/clone.c:107
+#: builtin/clone.c
 msgid "create a mirror repository (implies bare)"
 msgstr "创建一个镜像仓库（也是纯仓库）"
 
-#: builtin/clone.c:109
+#: builtin/clone.c
 msgid "to clone from a local repository"
 msgstr "从本地仓库克隆"
 
-#: builtin/clone.c:111
+#: builtin/clone.c
 msgid "don't use local hardlinks, always copy"
 msgstr "不使用本地硬链接，始终复制"
 
-#: builtin/clone.c:113
+#: builtin/clone.c
 msgid "setup as shared repository"
 msgstr "设置为共享仓库"
 
-#: builtin/clone.c:115
+#: builtin/clone.c
 msgid "pathspec"
 msgstr "路径规格"
 
-#: builtin/clone.c:115
+#: builtin/clone.c
 msgid "initialize submodules in the clone"
 msgstr "在克隆时初始化子模组"
 
-#: builtin/clone.c:119
+#: builtin/clone.c
 msgid "number of submodules cloned in parallel"
 msgstr "并发克隆的子模组的数量"
 
-#: builtin/clone.c:120 builtin/init-db.c:539
+#: builtin/clone.c builtin/init-db.c
 msgid "template-directory"
 msgstr "模板目录"
 
-#: builtin/clone.c:121 builtin/init-db.c:540
+#: builtin/clone.c builtin/init-db.c
 msgid "directory from which templates will be used"
 msgstr "模板目录将被使用"
 
-#: builtin/clone.c:123 builtin/clone.c:125 builtin/submodule--helper.c:1885
-#: builtin/submodule--helper.c:2719 builtin/submodule--helper.c:3378
+#: builtin/clone.c builtin/submodule--helper.c
 msgid "reference repository"
 msgstr "参考仓库"
 
-#: builtin/clone.c:127 builtin/submodule--helper.c:1887
-#: builtin/submodule--helper.c:2721
+#: builtin/clone.c builtin/submodule--helper.c
 msgid "use --reference only while cloning"
 msgstr "仅在克隆时参考 --reference 指向的本地仓库"
 
-#: builtin/clone.c:128 builtin/column.c:27 builtin/fmt-merge-msg.c:27
-#: builtin/init-db.c:550 builtin/merge-file.c:48 builtin/merge.c:290
-#: builtin/pack-objects.c:3967 builtin/repack.c:669
-#: builtin/submodule--helper.c:3380 t/helper/test-simple-ipc.c:595
-#: t/helper/test-simple-ipc.c:597
+#: builtin/clone.c builtin/column.c builtin/fmt-merge-msg.c builtin/init-db.c
+#: builtin/merge-file.c builtin/merge.c builtin/pack-objects.c builtin/repack.c
+#: builtin/submodule--helper.c t/helper/test-simple-ipc.c
 msgid "name"
 msgstr "名称"
 
-#: builtin/clone.c:129
+#: builtin/clone.c
 msgid "use <name> instead of 'origin' to track upstream"
 msgstr "使用 <名称> 而不是 'origin' 去跟踪上游"
 
-#: builtin/clone.c:131
+#: builtin/clone.c
 msgid "checkout <branch> instead of the remote's HEAD"
 msgstr "检出 <分支> 而不是远程 HEAD"
 
-#: builtin/clone.c:133
+#: builtin/clone.c
 msgid "path to git-upload-pack on the remote"
 msgstr "远程 git-upload-pack 路径"
 
-#: builtin/clone.c:134 builtin/fetch.c:182 builtin/grep.c:877
-#: builtin/pull.c:212
+#: builtin/clone.c builtin/fetch.c builtin/grep.c builtin/pull.c
 msgid "depth"
 msgstr "深度"
 
-#: builtin/clone.c:135
+#: builtin/clone.c
 msgid "create a shallow clone of that depth"
 msgstr "创建一个指定深度的浅克隆"
 
-#: builtin/clone.c:136 builtin/fetch.c:184 builtin/pack-objects.c:3956
-#: builtin/pull.c:215
+#: builtin/clone.c builtin/fetch.c builtin/pack-objects.c builtin/pull.c
 msgid "time"
 msgstr "时间"
 
-#: builtin/clone.c:137
+#: builtin/clone.c
 msgid "create a shallow clone since a specific time"
 msgstr "从一个特定时间创建一个浅克隆"
 
-#: builtin/clone.c:138 builtin/fetch.c:186 builtin/fetch.c:212
-#: builtin/pull.c:218 builtin/pull.c:243 builtin/rebase.c:1050
+#: builtin/clone.c builtin/fetch.c builtin/pull.c builtin/rebase.c
 msgid "revision"
 msgstr "版本"
 
-#: builtin/clone.c:139 builtin/fetch.c:187 builtin/pull.c:219
+#: builtin/clone.c builtin/fetch.c builtin/pull.c
 msgid "deepen history of shallow clone, excluding rev"
 msgstr "深化浅克隆的历史，除了特定版本"
 
-#: builtin/clone.c:141 builtin/submodule--helper.c:1897
-#: builtin/submodule--helper.c:2735
+#: builtin/clone.c builtin/submodule--helper.c
 msgid "clone only one branch, HEAD or --branch"
 msgstr "只克隆一个分支、HEAD 或 --branch"
 
-#: builtin/clone.c:143
+#: builtin/clone.c
 msgid "don't clone any tags, and make later fetches not to follow them"
 msgstr "不要克隆任何标签，并且后续获取操作也不下载它们"
 
-#: builtin/clone.c:145
+#: builtin/clone.c
 msgid "any cloned submodules will be shallow"
 msgstr "子模组将以浅下载模式克隆"
 
-#: builtin/clone.c:146 builtin/init-db.c:548
+#: builtin/clone.c builtin/init-db.c
 msgid "gitdir"
 msgstr "git目录"
 
-#: builtin/clone.c:147 builtin/init-db.c:549
+#: builtin/clone.c builtin/init-db.c
 msgid "separate git dir from working tree"
 msgstr "git目录和工作区分离"
 
-#: builtin/clone.c:148
+#: builtin/clone.c
 msgid "key=value"
 msgstr "key=value"
 
-#: builtin/clone.c:149
+#: builtin/clone.c
 msgid "set config inside the new repository"
 msgstr "在新仓库中设置配置信息"
 
-#: builtin/clone.c:151 builtin/fetch.c:207 builtin/ls-remote.c:77
-#: builtin/pull.c:234 builtin/push.c:575 builtin/send-pack.c:200
+#: builtin/clone.c builtin/fetch.c builtin/ls-remote.c builtin/pull.c
+#: builtin/push.c builtin/send-pack.c
 msgid "server-specific"
 msgstr "server-specific"
 
-#: builtin/clone.c:151 builtin/fetch.c:207 builtin/ls-remote.c:77
-#: builtin/pull.c:235 builtin/push.c:575 builtin/send-pack.c:201
+#: builtin/clone.c builtin/fetch.c builtin/ls-remote.c builtin/pull.c
+#: builtin/push.c builtin/send-pack.c
 msgid "option to transmit"
 msgstr "传输选项"
 
-#: builtin/clone.c:152 builtin/fetch.c:208 builtin/pull.c:238
-#: builtin/push.c:576
+#: builtin/clone.c builtin/fetch.c builtin/pull.c builtin/push.c
 msgid "use IPv4 addresses only"
 msgstr "只使用 IPv4 地址"
 
-#: builtin/clone.c:154 builtin/fetch.c:210 builtin/pull.c:241
-#: builtin/push.c:578
+#: builtin/clone.c builtin/fetch.c builtin/pull.c builtin/push.c
 msgid "use IPv6 addresses only"
 msgstr "只使用 IPv6 地址"
 
-#: builtin/clone.c:158
+#: builtin/clone.c
 msgid "apply partial clone filters to submodules"
 msgstr "对子模组使用部分克隆过滤器"
 
-#: builtin/clone.c:160
+#: builtin/clone.c
 msgid "any cloned submodules will use their remote-tracking branch"
 msgstr "任何克隆的子模组将使用它们的远程跟踪分支"
 
-#: builtin/clone.c:162
+#: builtin/clone.c
 msgid "initialize sparse-checkout file to include only files at root"
 msgstr "初始化稀疏检出文件，只包含根目录文件"
 
-#: builtin/clone.c:237
+#: builtin/clone.c
 #, c-format
 msgid "info: Could not add alternate for '%s': %s\n"
 msgstr "info: 不能为 '%s' 添加一个备用：%s\n"
 
-#: builtin/clone.c:310
+#: builtin/clone.c builtin/diff.c builtin/rm.c grep.c setup.c
+#, c-format
+msgid "failed to stat '%s'"
+msgstr "无法对 '%s' 调用 stat"
+
+#: builtin/clone.c
 #, c-format
 msgid "%s exists and is not a directory"
 msgstr "%s 存在且不是一个目录"
 
-#: builtin/clone.c:328
+#: builtin/clone.c
 #, c-format
 msgid "failed to start iterator over '%s'"
 msgstr "无法在 '%s' 上启动迭代器"
 
-#: builtin/clone.c:359
+#: builtin/clone.c compat/precompose_utf8.c
+#, c-format
+msgid "failed to unlink '%s'"
+msgstr "无法删除 '%s'"
+
+#: builtin/clone.c
 #, c-format
 msgid "failed to create link '%s'"
 msgstr "无法创建链接 '%s'"
 
-#: builtin/clone.c:363
+#: builtin/clone.c
 #, c-format
 msgid "failed to copy file to '%s'"
 msgstr "无法拷贝文件至 '%s'"
 
-#: builtin/clone.c:368
+#: builtin/clone.c
 #, c-format
 msgid "failed to iterate over '%s'"
 msgstr "无法在 '%s' 上迭代"
 
-#: builtin/clone.c:395
+#: builtin/clone.c
 #, c-format
 msgid "done.\n"
 msgstr "完成。\n"
 
-#: builtin/clone.c:409
+#: builtin/clone.c
 msgid ""
 "Clone succeeded, but checkout failed.\n"
 "You can inspect what was checked out with 'git status'\n"
@@ -13513,191 +5185,198 @@ msgstr ""
 "您可以通过 'git status' 检查哪些已被检出，然后使用命令\n"
 "'git restore --source=HEAD :/' 重试\n"
 
-#: builtin/clone.c:486
+#: builtin/clone.c
 #, c-format
 msgid "Could not find remote branch %s to clone."
 msgstr "不能发现要克隆的远程分支 %s。"
 
-#: builtin/clone.c:603
+#: builtin/clone.c fetch-pack.c
+msgid "remote did not send all necessary objects"
+msgstr "远程没有发送所有必需的对象"
+
+#: builtin/clone.c
 #, c-format
 msgid "unable to update %s"
 msgstr "不能更新 %s"
 
-#: builtin/clone.c:651
+#: builtin/clone.c
 msgid "failed to initialize sparse-checkout"
 msgstr "无法初始化稀疏检出"
 
-#: builtin/clone.c:674
+#: builtin/clone.c
 msgid "remote HEAD refers to nonexistent ref, unable to checkout.\n"
 msgstr "远程 HEAD 指向一个不存在的引用，无法检出。\n"
 
-#: builtin/clone.c:709
+#: builtin/clone.c
 msgid "unable to checkout working tree"
 msgstr "不能检出工作区"
 
-#: builtin/clone.c:793
+#: builtin/clone.c
 msgid "unable to write parameters to config file"
 msgstr "无法将参数写入配置文件"
 
-#: builtin/clone.c:856
+#: builtin/clone.c
 msgid "cannot repack to clean up"
 msgstr "无法执行 repack 来清理"
 
-#: builtin/clone.c:858
+#: builtin/clone.c
 msgid "cannot unlink temporary alternates file"
 msgstr "无法删除临时的 alternates 文件"
 
-#: builtin/clone.c:901
+#: builtin/clone.c
 msgid "Too many arguments."
 msgstr "太多参数。"
 
-#: builtin/clone.c:905 contrib/scalar/scalar.c:413
+#: builtin/clone.c contrib/scalar/scalar.c
 msgid "You must specify a repository to clone."
 msgstr "您必须指定一个仓库来克隆。"
 
-#: builtin/clone.c:918
+#: builtin/clone.c
 #, c-format
 msgid "options '%s' and '%s %s' cannot be used together"
 msgstr "选项 '%s' 和 '%s %s' 不能同时使用"
 
-#: builtin/clone.c:935
+#: builtin/clone.c
 #, c-format
 msgid "repository '%s' does not exist"
 msgstr "仓库 '%s' 不存在"
 
-#: builtin/clone.c:939 builtin/fetch.c:2176
+#: builtin/clone.c builtin/fetch.c
 #, c-format
 msgid "depth %s is not a positive number"
 msgstr "深度 %s 不是一个正数"
 
-#: builtin/clone.c:949
+#: builtin/clone.c
 #, c-format
 msgid "destination path '%s' already exists and is not an empty directory."
 msgstr "目标路径 '%s' 已经存在，并且不是一个空目录。"
 
-#: builtin/clone.c:955
+#: builtin/clone.c
 #, c-format
 msgid "repository path '%s' already exists and is not an empty directory."
 msgstr "仓库路径 '%s' 已经存在，并且不是一个空目录。"
 
-#: builtin/clone.c:969
+#: builtin/clone.c
 #, c-format
 msgid "working tree '%s' already exists."
 msgstr "工作区 '%s' 已经存在。"
 
-#: builtin/clone.c:984 builtin/clone.c:1005 builtin/difftool.c:256
-#: builtin/log.c:2037 builtin/worktree.c:350 builtin/worktree.c:382
+#: builtin/clone.c builtin/difftool.c builtin/log.c builtin/worktree.c
 #, c-format
 msgid "could not create leading directories of '%s'"
 msgstr "不能为 '%s' 创建先导目录"
 
-#: builtin/clone.c:989
+#: builtin/clone.c
 #, c-format
 msgid "could not create work tree dir '%s'"
 msgstr "不能创建工作区目录 '%s'"
 
-#: builtin/clone.c:1009
+#: builtin/clone.c
 #, c-format
 msgid "Cloning into bare repository '%s'...\n"
 msgstr "克隆到纯仓库 '%s'...\n"
 
-#: builtin/clone.c:1011
+#: builtin/clone.c
 #, c-format
 msgid "Cloning into '%s'...\n"
 msgstr "正克隆到 '%s'...\n"
 
-#: builtin/clone.c:1040
+#: builtin/clone.c
 msgid ""
 "clone --recursive is not compatible with both --reference and --reference-if-"
 "able"
 msgstr "clone --recursive 和 --reference 以及 --reference-if-able 不兼容"
 
-#: builtin/clone.c:1116 builtin/remote.c:201 builtin/remote.c:721
+#: builtin/clone.c builtin/remote.c
 #, c-format
 msgid "'%s' is not a valid remote name"
 msgstr "'%s' 不是一个有效的远程名称"
 
-#: builtin/clone.c:1157
+#: builtin/clone.c
 msgid "--depth is ignored in local clones; use file:// instead."
 msgstr "--depth 在本地克隆时被忽略，请改用 file:// 协议。"
 
-#: builtin/clone.c:1159
+#: builtin/clone.c
 msgid "--shallow-since is ignored in local clones; use file:// instead."
 msgstr "--shallow-since 在本地克隆时被忽略，请改用 file:// 协议。"
 
-#: builtin/clone.c:1161
+#: builtin/clone.c
 msgid "--shallow-exclude is ignored in local clones; use file:// instead."
 msgstr "--shallow-exclude 在本地克隆时被忽略，请改用 file:// 协议。"
 
-#: builtin/clone.c:1163
+#: builtin/clone.c
 msgid "--filter is ignored in local clones; use file:// instead."
 msgstr "--filter 在本地克隆时被忽略，请改用 file:// 协议。"
 
-#: builtin/clone.c:1168
+#: builtin/clone.c fetch-pack.c
+msgid "source repository is shallow, reject to clone."
+msgstr "源仓库是浅克隆，拒绝克隆。"
+
+#: builtin/clone.c
 msgid "source repository is shallow, ignoring --local"
 msgstr "源仓库是浅克隆，忽略 --local"
 
-#: builtin/clone.c:1173
+#: builtin/clone.c
 msgid "--local is ignored"
 msgstr "--local 被忽略"
 
-#: builtin/clone.c:1185
+#: builtin/clone.c
 msgid "cannot clone from filtered bundle"
 msgstr "无法从经过过滤的归档包克隆"
 
-#: builtin/clone.c:1265 builtin/clone.c:1324
+#: builtin/clone.c
 msgid "remote transport reported error"
 msgstr "远程传输报告错误"
 
-#: builtin/clone.c:1277 builtin/clone.c:1289
+#: builtin/clone.c
 #, c-format
 msgid "Remote branch %s not found in upstream %s"
 msgstr "远程分支 %s 在上游 %s 未发现"
 
-#: builtin/clone.c:1292
+#: builtin/clone.c
 msgid "You appear to have cloned an empty repository."
 msgstr "您似乎克隆了一个空仓库。"
 
-#: builtin/column.c:10
+#: builtin/column.c
 msgid "git column [<options>]"
 msgstr "git column [<选项>]"
 
-#: builtin/column.c:27
+#: builtin/column.c
 msgid "lookup config vars"
 msgstr "查找配置变量"
 
-#: builtin/column.c:28 builtin/column.c:29
+#: builtin/column.c
 msgid "layout to use"
 msgstr "要使用的布局"
 
-#: builtin/column.c:30
+#: builtin/column.c
 msgid "maximum width"
 msgstr "最大宽度"
 
-#: builtin/column.c:31
+#: builtin/column.c
 msgid "padding space on left border"
 msgstr "左边框的填充空间"
 
-#: builtin/column.c:32
+#: builtin/column.c
 msgid "padding space on right border"
 msgstr "右边框的填充空间"
 
-#: builtin/column.c:33
+#: builtin/column.c
 msgid "padding space between columns"
 msgstr "两列之间的填充空间"
 
-#: builtin/column.c:51
+#: builtin/column.c
 msgid "--command must be the first argument"
 msgstr "--command 必须是第一个参数"
 
-#: builtin/commit-graph.c:13
+#: builtin/commit-graph.c
 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:16
+#: builtin/commit-graph.c
 msgid ""
 "git commit-graph write [--object-dir <objdir>] [--append] [--"
 "split[=<strategy>]] [--reachable|--stdin-packs|--stdin-commits] [--changed-"
@@ -13707,92 +5386,97 @@ msgstr ""
 ">]] [--reachable|--stdin-packs|--stdin-commits] [--changed-paths] [--"
 "[no-]max-new-filters <n>] [--[no-]progress] <切分选项>"
 
-#: builtin/commit-graph.c:51 builtin/fetch.c:196 builtin/log.c:1813
+#: builtin/commit-graph.c builtin/fetch.c builtin/log.c
 msgid "dir"
 msgstr "目录"
 
-#: builtin/commit-graph.c:52
+#: builtin/commit-graph.c
 msgid "the object directory to store the graph"
 msgstr "保存图形的对象目录"
 
-#: builtin/commit-graph.c:73
+#: builtin/commit-graph.c
 msgid "if the commit-graph is split, only verify the tip file"
 msgstr "如果提交图形被拆分，只验证头一个文件"
 
-#: builtin/commit-graph.c:100
+#: builtin/commit-graph.c
 #, c-format
 msgid "Could not open commit-graph '%s'"
 msgstr "无法打开提交图形 '%s'"
 
-#: builtin/commit-graph.c:137
+#: builtin/commit-graph.c
 #, c-format
 msgid "unrecognized --split argument, %s"
 msgstr "未能识别的 --split 参数，%s"
 
-#: builtin/commit-graph.c:150
+#: builtin/commit-graph.c
 #, c-format
 msgid "unexpected non-hex object ID: %s"
 msgstr "意外的非十六进制对象 ID：%s"
 
-#: builtin/commit-graph.c:155
+#: builtin/commit-graph.c
 #, c-format
 msgid "invalid object: %s"
 msgstr "无效对象：%s"
 
-#: builtin/commit-graph.c:205
+#: builtin/commit-graph.c parse-options-cb.c
+#, c-format
+msgid "option `%s' expects a numerical value"
+msgstr "选项 `%s' 期望一个数字值"
+
+#: builtin/commit-graph.c
 msgid "start walk at all refs"
 msgstr "开始遍历所有引用"
 
-#: builtin/commit-graph.c:207
+#: builtin/commit-graph.c
 msgid "scan pack-indexes listed by stdin for commits"
 msgstr "从标准输入中的包索引文件列表中扫描提交"
 
-#: builtin/commit-graph.c:209
+#: builtin/commit-graph.c
 msgid "start walk at commits listed by stdin"
 msgstr "从标准输入中的提交开始扫描"
 
-#: builtin/commit-graph.c:211
+#: builtin/commit-graph.c
 msgid "include all commits already in the commit-graph file"
 msgstr "包含 commit-graph 文件中已有所有提交"
 
-#: builtin/commit-graph.c:213
+#: builtin/commit-graph.c
 msgid "enable computation for changed paths"
 msgstr "启用变更路径的计算"
 
-#: builtin/commit-graph.c:215
+#: builtin/commit-graph.c
 msgid "allow writing an incremental commit-graph file"
 msgstr "允许写一个增量提交图形文件"
 
-#: builtin/commit-graph.c:219
+#: builtin/commit-graph.c
 msgid "maximum number of commits in a non-base split commit-graph"
 msgstr "在非基本拆分提交图形中的最大提交数"
 
-#: builtin/commit-graph.c:221
+#: builtin/commit-graph.c
 msgid "maximum ratio between two levels of a split commit-graph"
 msgstr "一个拆分提交图形的两个级别之间的最大比率"
 
-#: builtin/commit-graph.c:223
+#: builtin/commit-graph.c
 msgid "only expire files older than a given date-time"
 msgstr "只让早于给定时间的文件过期"
 
-#: builtin/commit-graph.c:225
+#: builtin/commit-graph.c
 msgid "maximum number of changed-path Bloom filters to compute"
 msgstr "要计算的变更路径布隆过滤器的最大数"
 
-#: builtin/commit-graph.c:251
+#: builtin/commit-graph.c
 msgid "use at most one of --reachable, --stdin-commits, or --stdin-packs"
 msgstr "不能同时使用 --reachable、--stdin-commits 或 --stdin-packs"
 
-#: builtin/commit-graph.c:282
+#: builtin/commit-graph.c
 msgid "Collecting commits from input"
 msgstr "正从标准输入收集提交"
 
-#: builtin/commit-graph.c:328 builtin/multi-pack-index.c:259
+#: builtin/commit-graph.c builtin/multi-pack-index.c
 #, c-format
 msgid "unrecognized subcommand: %s"
 msgstr "未识别的子命令：%s"
 
-#: builtin/commit-tree.c:18
+#: builtin/commit-tree.c
 msgid ""
 "git commit-tree [(-p <parent>)...] [-S[<keyid>]] [(-m <message>)...] [(-F "
 "<file>)...] <tree>"
@@ -13800,70 +5484,69 @@ msgstr ""
 "git commit-tree [(-p <父提交>)...] [-S[<keyid>]] [(-m <消息>)...] [(-F <文件"
 ">)...] <树>"
 
-#: builtin/commit-tree.c:31
+#: builtin/commit-tree.c
 #, c-format
 msgid "duplicate parent %s ignored"
 msgstr "忽略重复的父提交 %s"
 
-#: builtin/commit-tree.c:56 builtin/commit-tree.c:134 builtin/log.c:590
+#: builtin/commit-tree.c builtin/log.c
 #, c-format
 msgid "not a valid object name %s"
 msgstr "不是一个有效的对象名 %s"
 
-#: builtin/commit-tree.c:94
+#: builtin/commit-tree.c
 #, c-format
 msgid "git commit-tree: failed to read '%s'"
 msgstr "git commit-tree：无法读取 '%s'"
 
-#: builtin/commit-tree.c:96
+#: builtin/commit-tree.c
 #, c-format
 msgid "git commit-tree: failed to close '%s'"
 msgstr "git commit-tree：无法关闭 '%s'"
 
-#: builtin/commit-tree.c:109
+#: builtin/commit-tree.c
 msgid "parent"
 msgstr "父提交"
 
-#: builtin/commit-tree.c:110
+#: builtin/commit-tree.c
 msgid "id of a parent commit object"
 msgstr "父提交对象 ID"
 
-#: builtin/commit-tree.c:112 builtin/commit.c:1626 builtin/merge.c:284
-#: builtin/notes.c:407 builtin/notes.c:573 builtin/stash.c:1666
-#: builtin/tag.c:455
+#: builtin/commit-tree.c builtin/commit.c builtin/merge.c builtin/notes.c
+#: builtin/stash.c builtin/tag.c
 msgid "message"
 msgstr "说明"
 
-#: builtin/commit-tree.c:113 builtin/commit.c:1626
+#: builtin/commit-tree.c builtin/commit.c
 msgid "commit message"
 msgstr "提交说明"
 
-#: builtin/commit-tree.c:116
+#: builtin/commit-tree.c
 msgid "read commit log message from file"
 msgstr "从文件中读取提交说明"
 
-#: builtin/commit-tree.c:119 builtin/commit.c:1643 builtin/merge.c:303
-#: builtin/pull.c:180 builtin/revert.c:118
+#: builtin/commit-tree.c builtin/commit.c builtin/merge.c builtin/pull.c
+#: builtin/revert.c
 msgid "GPG sign commit"
 msgstr "GPG 提交签名"
 
-#: builtin/commit-tree.c:131
+#: builtin/commit-tree.c
 msgid "must give exactly one tree"
 msgstr "必须精确地提供一个树"
 
-#: builtin/commit-tree.c:138
+#: builtin/commit-tree.c
 msgid "git commit-tree: failed to read"
 msgstr "git commit-tree：无法读取"
 
-#: builtin/commit.c:43
+#: builtin/commit.c
 msgid "git commit [<options>] [--] <pathspec>..."
 msgstr "git commit [<选项>] [--] <路径规格>..."
 
-#: builtin/commit.c:48
+#: builtin/commit.c
 msgid "git status [<options>] [--] <pathspec>..."
 msgstr "git status [<选项>] [--] <路径规格>..."
 
-#: builtin/commit.c:53
+#: builtin/commit.c
 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"
@@ -13872,7 +5555,7 @@ msgstr ""
 "您要修补最近的提交，但这么做会让它成为空提交。您可以重复您的命令并带上\n"
 "--allow-empty 选项，或者您可用命令 \"git reset HEAD^\" 整个删除该提交。\n"
 
-#: builtin/commit.c:58
+#: builtin/commit.c
 msgid ""
 "The previous cherry-pick is now empty, possibly due to conflict resolution.\n"
 "If you wish to commit it anyway, use:\n"
@@ -13886,15 +5569,15 @@ msgstr ""
 "    git commit --allow-empty\n"
 "\n"
 
-#: builtin/commit.c:65
+#: builtin/commit.c
 msgid "Otherwise, please use 'git rebase --skip'\n"
 msgstr "否则，请使用 'git rebase --skip'\n"
 
-#: builtin/commit.c:68
+#: builtin/commit.c
 msgid "Otherwise, please use 'git cherry-pick --skip'\n"
 msgstr "否则，请使用 'git cherry-pick --skip'\n"
 
-#: builtin/commit.c:71
+#: builtin/commit.c
 msgid ""
 "and then use:\n"
 "\n"
@@ -13915,118 +5598,128 @@ msgstr ""
 "    git cherry-pick --skip\n"
 "\n"
 
-#: builtin/commit.c:326
+#: builtin/commit.c
 msgid "failed to unpack HEAD tree object"
 msgstr "无法解包 HEAD 树对象"
 
-#: builtin/commit.c:376
+#: builtin/commit.c
 msgid "No paths with --include/--only does not make sense."
 msgstr "参数 --include/--only 不跟路径没有意义。"
 
-#: builtin/commit.c:388
+#: builtin/commit.c
 msgid "unable to create temporary index"
 msgstr "不能创建临时索引"
 
-#: builtin/commit.c:397
+#: builtin/commit.c
 msgid "interactive add failed"
 msgstr "交互式添加失败"
 
-#: builtin/commit.c:412
+#: builtin/commit.c
 msgid "unable to update temporary index"
 msgstr "无法更新临时索引"
 
-#: builtin/commit.c:414
+#: builtin/commit.c
 msgid "Failed to update main cache tree"
 msgstr "不能更新树的主缓存"
 
-#: builtin/commit.c:439 builtin/commit.c:462 builtin/commit.c:510
+#: builtin/commit.c
 msgid "unable to write new_index file"
 msgstr "无法写 new_index 文件"
 
-#: builtin/commit.c:491
+#: builtin/commit.c
 msgid "cannot do a partial commit during a merge."
 msgstr "在合并过程中不能做部分提交。"
 
-#: builtin/commit.c:493
+#: builtin/commit.c
 msgid "cannot do a partial commit during a cherry-pick."
 msgstr "在拣选过程中不能做部分提交。"
 
-#: builtin/commit.c:495
+#: builtin/commit.c
 msgid "cannot do a partial commit during a rebase."
 msgstr "在变基过程中不能做部分提交。"
 
-#: builtin/commit.c:503
+#: builtin/commit.c
 msgid "cannot read the index"
 msgstr "无法读取索引"
 
-#: builtin/commit.c:522
+#: builtin/commit.c
 msgid "unable to write temporary index file"
 msgstr "无法写临时索引文件"
 
-#: builtin/commit.c:620
+#: builtin/commit.c
 #, c-format
 msgid "commit '%s' lacks author header"
 msgstr "提交 '%s' 缺少作者信息"
 
-#: builtin/commit.c:622
+#: builtin/commit.c
 #, c-format
 msgid "commit '%s' has malformed author line"
 msgstr "提交 '%s' 有格式错误的作者信息"
 
-#: builtin/commit.c:641
+#: builtin/commit.c
 msgid "malformed --author parameter"
 msgstr "格式错误的 --author 参数"
 
-#: builtin/commit.c:694
+#: builtin/commit.c ident.c
+#, c-format
+msgid "invalid date format: %s"
+msgstr "无效的日期格式：%s"
+
+#: builtin/commit.c
 msgid ""
 "unable to select a comment character that is not used\n"
 "in the current commit message"
 msgstr "无法选择一个未被当前提交说明使用的注释字符"
 
-#: builtin/commit.c:750 builtin/commit.c:784 builtin/commit.c:1170
+#: builtin/commit.c
 #, c-format
 msgid "could not lookup commit %s"
 msgstr "不能查询提交 %s"
 
-#: builtin/commit.c:762 builtin/shortlog.c:417
+#: builtin/commit.c builtin/shortlog.c
 #, c-format
 msgid "(reading log message from standard input)\n"
 msgstr "（正从标准输入中读取日志信息）\n"
 
-#: builtin/commit.c:764
+#: builtin/commit.c
 msgid "could not read log from standard input"
 msgstr "不能从标准输入中读取日志信息"
 
-#: builtin/commit.c:768
+#: builtin/commit.c
 #, c-format
 msgid "could not read log file '%s'"
 msgstr "不能读取日志文件 '%s'"
 
-#: builtin/commit.c:805
+#: builtin/commit.c
 #, c-format
 msgid "options '%s' and '%s:%s' cannot be used together"
 msgstr "选项 '%s' 和 '%s:%s' 不能同时使用"
 
-#: builtin/commit.c:817 builtin/commit.c:833
+#: builtin/commit.c
 msgid "could not read SQUASH_MSG"
 msgstr "不能读取 SQUASH_MSG"
 
-#: builtin/commit.c:824
+#: builtin/commit.c
 msgid "could not read MERGE_MSG"
 msgstr "不能读取 MERGE_MSG"
 
-#: builtin/commit.c:884
+#: builtin/commit.c bundle.c rerere.c sequencer.c
+#, c-format
+msgid "could not open '%s'"
+msgstr "不能打开 '%s'"
+
+#: builtin/commit.c
 msgid "could not write commit template"
 msgstr "不能写提交模版"
 
-#: builtin/commit.c:897
+#: builtin/commit.c
 #, 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:899
+#: builtin/commit.c
 #, c-format
 msgid ""
 "Please enter the commit message for your changes. Lines starting\n"
@@ -14035,7 +5728,7 @@ msgstr ""
 "请为您的变更输入提交说明。以 '%c' 开始的行将被忽略，而一个空的提交\n"
 "说明将会终止提交。\n"
 
-#: builtin/commit.c:903
+#: builtin/commit.c
 #, c-format
 msgid ""
 "Please enter the commit message for your changes. Lines starting\n"
@@ -14044,7 +5737,7 @@ msgstr ""
 "请为您的变更输入提交说明。以 '%c' 开始的行将被保留，如果您愿意\n"
 "也可以删除它们。\n"
 
-#: builtin/commit.c:907
+#: builtin/commit.c
 #, c-format
 msgid ""
 "Please enter the commit message for your changes. Lines starting\n"
@@ -14054,7 +5747,7 @@ msgstr ""
 "请为您的变更输入提交说明。以 '%c' 开始的行将被保留，如果您愿意\n"
 "也可以删除它们。一个空的提交说明将会终止提交。\n"
 
-#: builtin/commit.c:919
+#: builtin/commit.c
 msgid ""
 "\n"
 "It looks like you may be committing a merge.\n"
@@ -14067,7 +5760,7 @@ msgstr ""
 "\tgit update-ref -d MERGE_HEAD\n"
 "然后重试。\n"
 
-#: builtin/commit.c:924
+#: builtin/commit.c
 msgid ""
 "\n"
 "It looks like you may be committing a cherry-pick.\n"
@@ -14081,348 +5774,348 @@ msgstr ""
 "然后重试。\n"
 
 #  译者：为保证在输出中对齐，注意调整句中空格！
-#: builtin/commit.c:951
+#: builtin/commit.c
 #, c-format
 msgid "%sAuthor:    %.*s <%.*s>"
 msgstr "%s作者：  %.*s <%.*s>"
 
 #  译者：为保证在输出中对齐，注意调整句中空格！
-#: builtin/commit.c:959
+#: builtin/commit.c
 #, c-format
 msgid "%sDate:      %s"
 msgstr "%s日期：  %s"
 
 #  译者：为保证在输出中对齐，注意调整句中空格！
-#: builtin/commit.c:966
+#: builtin/commit.c
 #, c-format
 msgid "%sCommitter: %.*s <%.*s>"
 msgstr "%s提交者：%.*s <%.*s>"
 
-#: builtin/commit.c:984
+#: builtin/commit.c
 msgid "Cannot read index"
 msgstr "无法读取索引"
 
-#: builtin/commit.c:1029
+#: builtin/commit.c
 msgid "unable to pass trailers to --trailers"
 msgstr "无法将尾注传递给 --trailers"
 
-#: builtin/commit.c:1069
+#: builtin/commit.c
 msgid "Error building trees"
 msgstr "无法创建树对象"
 
-#: builtin/commit.c:1083 builtin/tag.c:317
+#: builtin/commit.c builtin/tag.c
 #, c-format
 msgid "Please supply the message using either -m or -F option.\n"
 msgstr "请使用 -m 或 -F 选项提供提交说明。\n"
 
-#: builtin/commit.c:1128
+#: builtin/commit.c
 #, c-format
 msgid "--author '%s' is not 'Name <email>' and matches no existing author"
 msgstr "--author '%s' 不是 '姓名 <邮箱>' 格式，且未能在现有作者中找到匹配"
 
-#: builtin/commit.c:1142
+#: builtin/commit.c
 #, c-format
 msgid "Invalid ignored mode '%s'"
 msgstr "无效的忽略模式 '%s'"
 
-#: builtin/commit.c:1160 builtin/commit.c:1450
+#: builtin/commit.c
 #, c-format
 msgid "Invalid untracked files mode '%s'"
 msgstr "无效的未跟踪文件参数 '%s'"
 
-#: builtin/commit.c:1231
+#: builtin/commit.c
 msgid "You are in the middle of a merge -- cannot reword."
 msgstr "您正处于一个合并过程中 -- 无法改写说明。"
 
-#: builtin/commit.c:1233
+#: builtin/commit.c
 msgid "You are in the middle of a cherry-pick -- cannot reword."
 msgstr "您正处于一个拣选过程中 -- 无法改写说明。"
 
-#: builtin/commit.c:1236
+#: builtin/commit.c
 #, c-format
 msgid "reword option of '%s' and path '%s' cannot be used together"
 msgstr "改写说明选项 '%s' 和路径 '%s' 不能同时使用"
 
-#: builtin/commit.c:1238
+#: builtin/commit.c
 #, c-format
 msgid "reword option of '%s' and '%s' cannot be used together"
 msgstr "改写说明选项 '%s' 和 '%s' 不能同时使用"
 
-#: builtin/commit.c:1263
+#: builtin/commit.c
 msgid "You have nothing to amend."
 msgstr "您没有可修补的提交。"
 
-#: builtin/commit.c:1266
+#: builtin/commit.c
 msgid "You are in the middle of a merge -- cannot amend."
 msgstr "您正处于一个合并过程中 -- 无法修补提交。"
 
-#: builtin/commit.c:1268
+#: builtin/commit.c
 msgid "You are in the middle of a cherry-pick -- cannot amend."
 msgstr "您正处于一个拣选过程中 -- 无法修补提交。"
 
-#: builtin/commit.c:1270
+#: builtin/commit.c
 msgid "You are in the middle of a rebase -- cannot amend."
 msgstr "您正处于一个变基过程中 -- 无法修补提交。"
 
-#: builtin/commit.c:1290
+#: builtin/commit.c
 msgid "--reset-author can be used only with -C, -c or --amend."
 msgstr "--reset-author 只能和 -C、-c 或 --amend 同时使用。"
 
-#: builtin/commit.c:1337
+#: builtin/commit.c
 #, c-format
 msgid "unknown option: --fixup=%s:%s"
 msgstr "未知选项：--fixup=%s:%s"
 
-#: builtin/commit.c:1354
+#: builtin/commit.c
 #, c-format
 msgid "paths '%s ...' with -a does not make sense"
 msgstr "路径  '%s ...' 和 -a 选项同时使用没有意义"
 
-#: builtin/commit.c:1485 builtin/commit.c:1654
+#: builtin/commit.c
 msgid "show status concisely"
 msgstr "以简洁的格式显示状态"
 
-#: builtin/commit.c:1487 builtin/commit.c:1656
+#: builtin/commit.c
 msgid "show branch information"
 msgstr "显示分支信息"
 
-#: builtin/commit.c:1489
+#: builtin/commit.c
 msgid "show stash information"
 msgstr "显示贮藏区信息"
 
-#: builtin/commit.c:1491 builtin/commit.c:1658
+#: builtin/commit.c
 msgid "compute full ahead/behind values"
 msgstr "计算完整的领先/落后值"
 
-#: builtin/commit.c:1493
+#: builtin/commit.c
 msgid "version"
 msgstr "版本"
 
-#: builtin/commit.c:1493 builtin/commit.c:1660 builtin/push.c:551
-#: builtin/worktree.c:765
+#: builtin/commit.c builtin/push.c builtin/worktree.c
 msgid "machine-readable output"
 msgstr "机器可读的输出"
 
-#: builtin/commit.c:1496 builtin/commit.c:1662
+#: builtin/commit.c
 msgid "show status in long format (default)"
 msgstr "以长格式显示状态（默认）"
 
-#: builtin/commit.c:1499 builtin/commit.c:1665
+#: builtin/commit.c
 msgid "terminate entries with NUL"
 msgstr "条目以 NUL 字符结尾"
 
-#: builtin/commit.c:1501 builtin/commit.c:1505 builtin/commit.c:1668
-#: builtin/fast-export.c:1172 builtin/fast-export.c:1175
-#: builtin/fast-export.c:1178 builtin/rebase.c:1139 parse-options.h:368
+#: builtin/commit.c builtin/fast-export.c builtin/rebase.c parse-options.h
 msgid "mode"
 msgstr "模式"
 
-#: builtin/commit.c:1502 builtin/commit.c:1668
+#: builtin/commit.c
 msgid "show untracked files, optional modes: all, normal, no. (Default: all)"
 msgstr "显示未跟踪的文件，“模式”的可选参数：all、normal、no。（默认：all）"
 
-#: builtin/commit.c:1506
+#: builtin/commit.c
 msgid ""
 "show ignored files, optional modes: traditional, matching, no. (Default: "
 "traditional)"
 msgstr ""
 "显示已忽略的文件，可选模式：traditional、matching、no。（默认：traditional）"
 
-#: builtin/commit.c:1508 parse-options.h:197
+#: builtin/commit.c parse-options.h
 msgid "when"
 msgstr "何时"
 
-#: builtin/commit.c:1509
+#: builtin/commit.c
 msgid ""
 "ignore changes to submodules, optional when: all, dirty, untracked. "
 "(Default: all)"
 msgstr ""
 "忽略子模组的更改，“何时”的可选参数：all、dirty、untracked。（默认：all）"
 
-#: builtin/commit.c:1511
+#: builtin/commit.c
 msgid "list untracked files in columns"
 msgstr "以列的方式显示未跟踪的文件"
 
-#: builtin/commit.c:1512
+#: builtin/commit.c
 msgid "do not detect renames"
 msgstr "不检测重命名"
 
-#: builtin/commit.c:1514
+#: builtin/commit.c
 msgid "detect renames, optionally set similarity index"
 msgstr "检测重命名，可以设置索引相似度"
 
-#: builtin/commit.c:1537
+#: builtin/commit.c
 msgid "Unsupported combination of ignored and untracked-files arguments"
 msgstr "不支持已忽略和未跟踪文件参数的组合"
 
-#: builtin/commit.c:1619
+#: builtin/commit.c
 msgid "suppress summary after successful commit"
 msgstr "提交成功后不显示概述信息"
 
-#: builtin/commit.c:1620
+#: builtin/commit.c
 msgid "show diff in commit message template"
 msgstr "在提交说明模板里显示差异"
 
-#: builtin/commit.c:1622
+#: builtin/commit.c
 msgid "Commit message options"
 msgstr "提交说明选项"
 
-#: builtin/commit.c:1623 builtin/merge.c:288 builtin/tag.c:457
+#: builtin/commit.c builtin/merge.c builtin/tag.c
 msgid "read message from file"
 msgstr "从文件中读取提交说明"
 
-#: builtin/commit.c:1624
+#: builtin/commit.c
 msgid "author"
 msgstr "作者"
 
-#: builtin/commit.c:1624
+#: builtin/commit.c
 msgid "override author for commit"
 msgstr "提交时覆盖作者"
 
-#: builtin/commit.c:1625 builtin/gc.c:551
+#: builtin/commit.c builtin/gc.c
 msgid "date"
 msgstr "日期"
 
-#: builtin/commit.c:1625
+#: builtin/commit.c
 msgid "override date for commit"
 msgstr "提交时覆盖日期"
 
-#: builtin/commit.c:1627 builtin/commit.c:1628 builtin/commit.c:1634
-#: parse-options.h:360 ref-filter.h:89
+#: builtin/commit.c parse-options.h ref-filter.h
 msgid "commit"
 msgstr "提交"
 
-#: builtin/commit.c:1627
+#: builtin/commit.c
 msgid "reuse and edit message from specified commit"
 msgstr "重用并编辑指定提交的提交说明"
 
-#: builtin/commit.c:1628
+#: builtin/commit.c
 msgid "reuse message from specified commit"
 msgstr "重用指定提交的提交说明"
 
 #. TRANSLATORS: Leave "[(amend|reword):]" as-is,
 #. and only translate <commit>.
 #.
-#: builtin/commit.c:1633
+#: builtin/commit.c
 msgid "[(amend|reword):]commit"
 msgstr "[(amend|reword):]提交"
 
-#: builtin/commit.c:1633
+#: builtin/commit.c
 msgid ""
 "use autosquash formatted message to fixup or amend/reword specified commit"
 msgstr "使用自动挤压格式的提交说明对指定的提交进行修正、修补或改写说明"
 
-#: builtin/commit.c:1634
+#: builtin/commit.c
 msgid "use autosquash formatted message to squash specified commit"
 msgstr "使用自动挤压格式的提交说明用以挤压至指定的提交"
 
-#: builtin/commit.c:1635
+#: builtin/commit.c
 msgid "the commit is authored by me now (used with -C/-c/--amend)"
 msgstr "现在将该提交的作者改为我（和 -C/-c/--amend 参数共用）"
 
-#: builtin/commit.c:1636 builtin/interpret-trailers.c:111
+#: builtin/commit.c builtin/interpret-trailers.c
 msgid "trailer"
 msgstr "尾注"
 
-#: builtin/commit.c:1636
+#: builtin/commit.c
 msgid "add custom trailer(s)"
 msgstr "添加自定义尾注"
 
-#: builtin/commit.c:1637 builtin/log.c:1788 builtin/merge.c:306
-#: builtin/pull.c:146 builtin/revert.c:110
+#: builtin/commit.c builtin/log.c builtin/merge.c builtin/pull.c
+#: builtin/revert.c
 msgid "add a Signed-off-by trailer"
 msgstr "添加 Signed-off-by 尾注"
 
-#: builtin/commit.c:1638
+#: builtin/commit.c
 msgid "use specified template file"
 msgstr "使用指定的模板文件"
 
-#: builtin/commit.c:1639
+#: builtin/commit.c
 msgid "force edit of commit"
 msgstr "强制编辑提交"
 
-#: builtin/commit.c:1641
+#: builtin/commit.c
 msgid "include status in commit message template"
 msgstr "在提交说明模板里包含状态信息"
 
-#: builtin/commit.c:1646
+#: builtin/commit.c
 msgid "Commit contents options"
 msgstr "提交内容选项"
 
-#: builtin/commit.c:1647
+#: builtin/commit.c
 msgid "commit all changed files"
 msgstr "提交所有改动的文件"
 
-#: builtin/commit.c:1648
+#: builtin/commit.c
 msgid "add specified files to index for commit"
 msgstr "添加指定的文件到索引区等待提交"
 
-#: builtin/commit.c:1649
+#: builtin/commit.c
 msgid "interactively add files"
 msgstr "交互式添加文件"
 
-#: builtin/commit.c:1650
+#: builtin/commit.c
 msgid "interactively add changes"
 msgstr "交互式添加变更"
 
-#: builtin/commit.c:1651
+#: builtin/commit.c
 msgid "commit only specified files"
 msgstr "只提交指定的文件"
 
-#: builtin/commit.c:1652
+#: builtin/commit.c
 msgid "bypass pre-commit and commit-msg hooks"
 msgstr "绕过 pre-commit 和 commit-msg 钩子"
 
-#: builtin/commit.c:1653
+#: builtin/commit.c
 msgid "show what would be committed"
 msgstr "显示将要提交的内容"
 
-#: builtin/commit.c:1666
+#: builtin/commit.c
 msgid "amend previous commit"
 msgstr "修改先前的提交"
 
-#: builtin/commit.c:1667
+#: builtin/commit.c
 msgid "bypass post-rewrite hook"
 msgstr "绕过 post-rewrite 钩子"
 
-#: builtin/commit.c:1674
+#: builtin/commit.c
 msgid "ok to record an empty change"
 msgstr "允许一个空提交"
 
-#: builtin/commit.c:1676
+#: builtin/commit.c
 msgid "ok to record a change with an empty message"
 msgstr "允许空的提交说明"
 
-#: builtin/commit.c:1752
+#: builtin/commit.c sequencer.c
+msgid "could not parse HEAD commit"
+msgstr "不能解析 HEAD 提交"
+
+#: builtin/commit.c
 #, c-format
 msgid "Corrupt MERGE_HEAD file (%s)"
 msgstr "损坏的 MERGE_HEAD 文件（%s）"
 
-#: builtin/commit.c:1759
+#: builtin/commit.c
 msgid "could not read MERGE_MODE"
 msgstr "不能读取 MERGE_MODE"
 
-#: builtin/commit.c:1780
+#: builtin/commit.c
 #, c-format
 msgid "could not read commit message: %s"
 msgstr "不能读取提交说明：%s"
 
-#: builtin/commit.c:1787
+#: builtin/commit.c
 #, c-format
 msgid "Aborting commit due to empty commit message.\n"
 msgstr "终止提交因为提交说明为空。\n"
 
-#: builtin/commit.c:1792
+#: builtin/commit.c
 #, c-format
 msgid "Aborting commit; you did not edit the message.\n"
 msgstr "终止提交；您未更改来自模版的提交说明。\n"
 
-#: builtin/commit.c:1803
+#: builtin/commit.c
 #, c-format
 msgid "Aborting commit due to empty commit message body.\n"
 msgstr "因提交说明的正文为空而终止提交。\n"
 
-#: builtin/commit.c:1839
+#: builtin/commit.c
 msgid ""
 "repository has been updated, but unable to write\n"
 "new_index file. Check that disk is not full and quota is\n"
@@ -14431,225 +6124,230 @@ msgstr ""
 "仓库已更新，但无法写 new_index 文件。检查是否磁盘已满或\n"
 "磁盘配额已耗尽，然后执行 \"git restore --staged :/\" 恢复。"
 
-#: builtin/config.c:11
+#: builtin/config.c
 msgid "git config [<options>]"
 msgstr "git config [<选项>]"
 
-#: builtin/config.c:109 builtin/env--helper.c:27
+#: builtin/config.c builtin/env--helper.c
 #, c-format
 msgid "unrecognized --type argument, %s"
 msgstr "未能识别的 --type 参数，%s"
 
-#: builtin/config.c:121
+#: builtin/config.c
 msgid "only one type at a time"
 msgstr "一次只能一个类型"
 
-#: builtin/config.c:130
+#: builtin/config.c
 msgid "Config file location"
 msgstr "配置文件位置"
 
-#: builtin/config.c:131
+#: builtin/config.c
 msgid "use global config file"
 msgstr "使用全局配置文件"
 
-#: builtin/config.c:132
+#: builtin/config.c
 msgid "use system config file"
 msgstr "使用系统级配置文件"
 
-#: builtin/config.c:133
+#: builtin/config.c
 msgid "use repository config file"
 msgstr "使用仓库级配置文件"
 
-#: builtin/config.c:134
+#: builtin/config.c
 msgid "use per-worktree config file"
 msgstr "使用工作区级别的配置文件"
 
-#: builtin/config.c:135
+#: builtin/config.c
 msgid "use given config file"
 msgstr "使用指定的配置文件"
 
-#: builtin/config.c:136
+#: builtin/config.c
 msgid "blob-id"
 msgstr "数据对象 ID"
 
-#: builtin/config.c:136
+#: builtin/config.c
 msgid "read config from given blob object"
 msgstr "从给定的数据对象读取配置"
 
-#: builtin/config.c:137
+#: builtin/config.c
 msgid "Action"
 msgstr "操作"
 
-#: builtin/config.c:138
+#: builtin/config.c
 msgid "get value: name [value-pattern]"
 msgstr "获取值：名称 [值模式]"
 
-#: builtin/config.c:139
+#: builtin/config.c
 msgid "get all values: key [value-pattern]"
 msgstr "获得所有的值：键 [值模式]"
 
-#: builtin/config.c:140
+#: builtin/config.c
 msgid "get values for regexp: name-regex [value-pattern]"
 msgstr "根据正则表达式获得值：名称正则 [值模式]"
 
-#: builtin/config.c:141
+#: builtin/config.c
 msgid "get value specific for the URL: section[.var] URL"
 msgstr "获得 URL 取值：section[.var] URL"
 
-#: builtin/config.c:142
+#: builtin/config.c
 msgid "replace all matching variables: name value [value-pattern]"
 msgstr "替换所有匹配的变量：名称 值 [值模式]"
 
-#: builtin/config.c:143
+#: builtin/config.c
 msgid "add a new variable: name value"
 msgstr "添加一个新的变量：名称 值"
 
-#: builtin/config.c:144
+#: builtin/config.c
 msgid "remove a variable: name [value-pattern]"
 msgstr "删除一个变量：名称 [值模式]"
 
-#: builtin/config.c:145
+#: builtin/config.c
 msgid "remove all matches: name [value-pattern]"
 msgstr "删除所有匹配项：名称 [值模式]"
 
-#: builtin/config.c:146
+#: builtin/config.c
 msgid "rename section: old-name new-name"
 msgstr "重命名小节：old-name new-name"
 
-#: builtin/config.c:147
+#: builtin/config.c
 msgid "remove a section: name"
 msgstr "删除一个小节：name"
 
-#: builtin/config.c:148
+#: builtin/config.c
 msgid "list all"
 msgstr "列出所有"
 
-#: builtin/config.c:149
+#: builtin/config.c
 msgid "use string equality when comparing values to 'value-pattern'"
 msgstr "在比较值与 '值模式' 时，使用字符串字面比较"
 
-#: builtin/config.c:150
+#: builtin/config.c
 msgid "open an editor"
 msgstr "打开一个编辑器"
 
-#: builtin/config.c:151
+#: builtin/config.c
 msgid "find the color configured: slot [default]"
 msgstr "获得配置的颜色：配置 [默认]"
 
-#: builtin/config.c:152
+#: builtin/config.c
 msgid "find the color setting: slot [stdout-is-tty]"
 msgstr "获得颜色设置：配置 [stdout-is-tty]"
 
-#: builtin/config.c:153
+#: builtin/config.c
 msgid "Type"
 msgstr "类型"
 
-#: builtin/config.c:154 builtin/env--helper.c:42 builtin/hash-object.c:97
+#: builtin/config.c builtin/env--helper.c builtin/hash-object.c
 msgid "type"
 msgstr "类型"
 
-#: builtin/config.c:154 builtin/env--helper.c:43
+#: builtin/config.c builtin/env--helper.c
 msgid "value is given this type"
 msgstr "取值为该类型"
 
-#: builtin/config.c:155
+#: builtin/config.c
 msgid "value is \"true\" or \"false\""
 msgstr "值是 \"true\" 或 \"false\""
 
-#: builtin/config.c:156
+#: builtin/config.c
 msgid "value is decimal number"
 msgstr "值是十进制数"
 
-#: builtin/config.c:157
+#: builtin/config.c
 msgid "value is --bool or --int"
 msgstr "值是 --bool 或 --int"
 
-#: builtin/config.c:158
+#: builtin/config.c
 msgid "value is --bool or string"
 msgstr "值是 --bool 或字符串"
 
-#: builtin/config.c:159
+#: builtin/config.c
 msgid "value is a path (file or directory name)"
 msgstr "值是一个路径（文件或目录名）"
 
-#: builtin/config.c:160
+#: builtin/config.c
 msgid "value is an expiry date"
 msgstr "值是一个到期日期"
 
-#: builtin/config.c:161
+#: builtin/config.c
 msgid "Other"
 msgstr "其它"
 
-#: builtin/config.c:162
+#: builtin/config.c
 msgid "terminate values with NUL byte"
 msgstr "终止值是 NUL 字节"
 
-#: builtin/config.c:163
+#: builtin/config.c
 msgid "show variable names only"
 msgstr "只显示变量名"
 
-#: builtin/config.c:164
+#: builtin/config.c
 msgid "respect include directives on lookup"
 msgstr "查询时参照 include 指令递归查找"
 
-#: builtin/config.c:165
+#: builtin/config.c
 msgid "show origin of config (file, standard input, blob, command line)"
 msgstr "显示配置的来源（文件、标准输入、数据对象，或命令行）"
 
-#: builtin/config.c:166
+#: builtin/config.c
 msgid "show scope of config (worktree, local, global, system, command)"
 msgstr "显示配置的作用域（工作区、本地、全局、系统、命令）"
 
-#: builtin/config.c:167 builtin/env--helper.c:45
+#: builtin/config.c builtin/env--helper.c
 msgid "value"
 msgstr "取值"
 
-#: builtin/config.c:167
+#: builtin/config.c
 msgid "with --get, use default value when missing entry"
 msgstr "使用 --get 参数，当缺少设置时使用默认值"
 
-#: builtin/config.c:181
+#: builtin/config.c
 #, c-format
 msgid "wrong number of arguments, should be %d"
 msgstr "错误的参数个数，应该为 %d 个"
 
-#: builtin/config.c:183
+#: builtin/config.c
 #, c-format
 msgid "wrong number of arguments, should be from %d to %d"
 msgstr "错误的参数个数，应该为从 %d 个到 %d 个"
 
-#: builtin/config.c:339
+#: builtin/config.c
 #, c-format
 msgid "invalid key pattern: %s"
 msgstr "无效键名模式：%s"
 
-#: builtin/config.c:377
+#: builtin/config.c config.c
+#, c-format
+msgid "invalid pattern: %s"
+msgstr "无效模式：%s"
+
+#: builtin/config.c
 #, c-format
 msgid "failed to format default config value: %s"
 msgstr "无法格式化默认配置值：%s"
 
-#: builtin/config.c:441
+#: builtin/config.c
 #, c-format
 msgid "cannot parse color '%s'"
 msgstr "无法解析颜色 '%s'"
 
-#: builtin/config.c:483
+#: builtin/config.c
 msgid "unable to parse default color value"
 msgstr "无法解析默认颜色值"
 
-#: builtin/config.c:536 builtin/config.c:833
+#: builtin/config.c
 msgid "not in a git directory"
 msgstr "不在 git 仓库中"
 
-#: builtin/config.c:539
+#: builtin/config.c
 msgid "writing to stdin is not supported"
 msgstr "不支持写到标准输入"
 
-#: builtin/config.c:542
+#: builtin/config.c
 msgid "writing config blobs is not supported"
 msgstr "不支持写到配置数据对象"
 
-#: builtin/config.c:627
+#: builtin/config.c
 #, c-format
 msgid ""
 "# This is Git's per-user configuration file.\n"
@@ -14664,27 +6362,27 @@ msgstr ""
 "#\tname = %s\n"
 "#\temail = %s\n"
 
-#: builtin/config.c:652
+#: builtin/config.c
 msgid "only one config file at a time"
 msgstr "一次只能有一个配置文件"
 
-#: builtin/config.c:658
+#: builtin/config.c
 msgid "--local can only be used inside a git repository"
 msgstr "--local 只能在 git 仓库内使用"
 
-#: builtin/config.c:660
+#: builtin/config.c
 msgid "--blob can only be used inside a git repository"
 msgstr "--blob 只能在 git 仓库内使用"
 
-#: builtin/config.c:662
+#: builtin/config.c
 msgid "--worktree can only be used inside a git repository"
 msgstr "--worktree 只能在 git 仓库内使用"
 
-#: builtin/config.c:684
+#: builtin/config.c
 msgid "$HOME not set"
 msgstr "$HOME 未设置"
 
-#: builtin/config.c:708
+#: builtin/config.c
 msgid ""
 "--worktree cannot be used with multiple working trees unless the config\n"
 "extension worktreeConfig is enabled. Please read \"CONFIGURATION FILE\"\n"
@@ -14693,55 +6391,55 @@ msgstr ""
 "不能和多个工作区一起使用 --worktree，除非启用 worktreeConfig 配置扩展。\n"
 "详情请阅读“git help worktree”的“CONFIGURATION FILE”小节"
 
-#: builtin/config.c:743
+#: builtin/config.c
 msgid "--get-color and variable type are incoherent"
 msgstr "--get-color 和变量类型不兼容"
 
-#: builtin/config.c:748
+#: builtin/config.c
 msgid "only one action at a time"
 msgstr "一次只能有一个动作"
 
-#: builtin/config.c:761
+#: builtin/config.c
 msgid "--name-only is only applicable to --list or --get-regexp"
 msgstr "--name-only 仅适用于 --list 或 --get-regexp"
 
-#: builtin/config.c:767
+#: builtin/config.c
 msgid ""
 "--show-origin is only applicable to --get, --get-all, --get-regexp, and --"
 "list"
 msgstr "--show-origin 仅适用于 --get、--get-all、--get-regexp 和 --list"
 
-#: builtin/config.c:773
+#: builtin/config.c
 msgid "--default is only applicable to --get"
 msgstr "--default 仅适用于 --get"
 
-#: builtin/config.c:806
+#: builtin/config.c
 msgid "--fixed-value only applies with 'value-pattern'"
 msgstr "--fixed-value 仅适用于有 '值模式'"
 
-#: builtin/config.c:822
+#: builtin/config.c
 #, c-format
 msgid "unable to read config file '%s'"
 msgstr "无法读取配置文件 '%s'"
 
-#: builtin/config.c:825
+#: builtin/config.c
 msgid "error processing config file(s)"
 msgstr "处理配置文件出错"
 
-#: builtin/config.c:835
+#: builtin/config.c
 msgid "editing stdin is not supported"
 msgstr "不支持编辑标准输入"
 
-#: builtin/config.c:837
+#: builtin/config.c
 msgid "editing blobs is not supported"
 msgstr "不支持编辑数据对象"
 
-#: builtin/config.c:851
+#: builtin/config.c
 #, c-format
 msgid "cannot create configuration file %s"
 msgstr "不能创建配置文件 %s"
 
-#: builtin/config.c:864
+#: builtin/config.c
 #, c-format
 msgid ""
 "cannot overwrite multiple values with a single value\n"
@@ -14750,16 +6448,16 @@ msgstr ""
 "无法用一个值覆盖多个值\n"
 "       使用一个正则表达式、--add 或 --replace-all 来修改 %s。"
 
-#: builtin/config.c:943 builtin/config.c:954
+#: builtin/config.c
 #, c-format
 msgid "no such section: %s"
 msgstr "无此小节：%s"
 
-#: builtin/count-objects.c:100
+#: builtin/count-objects.c
 msgid "print sizes in human readable format"
 msgstr "以用户可读的格式显示大小"
 
-#: builtin/credential-cache--daemon.c:227
+#: builtin/credential-cache--daemon.c
 #, c-format
 msgid ""
 "The permissions on your socket directory are too loose; other\n"
@@ -14772,69 +6470,69 @@ msgstr ""
 "\n"
 "\tchmod 0700 %s"
 
-#: builtin/credential-cache--daemon.c:276
+#: builtin/credential-cache--daemon.c
 msgid "print debugging messages to stderr"
 msgstr "输出调试信息到标准错误"
 
-#: builtin/credential-cache--daemon.c:316
+#: builtin/credential-cache--daemon.c
 msgid "credential-cache--daemon unavailable; no unix socket support"
 msgstr "credential-cache--daemon 不可用，不支持 unix 套接字"
 
-#: builtin/credential-cache.c:180
+#: builtin/credential-cache.c
 msgid "credential-cache unavailable; no unix socket support"
 msgstr "credential-cache 不可用，不支持 unix 套接字"
 
-#: builtin/credential-store.c:66
+#: builtin/credential-store.c
 #, c-format
 msgid "unable to get credential storage lock in %d ms"
 msgstr "无法在 %d ms 获得凭证存储锁"
 
-#: builtin/describe.c:26
+#: builtin/describe.c
 msgid "git describe [<options>] [<commit-ish>...]"
 msgstr "git describe [<选项>] [<提交号>...]"
 
-#: builtin/describe.c:27
+#: builtin/describe.c
 msgid "git describe [<options>] --dirty"
 msgstr "git describe [<选项>] --dirty"
 
-#: builtin/describe.c:63
+#: builtin/describe.c
 msgid "head"
 msgstr "头"
 
-#: builtin/describe.c:63
+#: builtin/describe.c
 msgid "lightweight"
 msgstr "轻量级的"
 
-#: builtin/describe.c:63
+#: builtin/describe.c
 msgid "annotated"
 msgstr "附注的"
 
-#: builtin/describe.c:277
+#: builtin/describe.c
 #, c-format
 msgid "annotated tag %s not available"
 msgstr "附注标签 %s 无效"
 
-#: builtin/describe.c:281
+#: builtin/describe.c
 #, c-format
 msgid "tag '%s' is externally known as '%s'"
 msgstr "标签 '%s' 在外部被认为是 '%s'"
 
-#: builtin/describe.c:328
+#: builtin/describe.c
 #, c-format
 msgid "no tag exactly matches '%s'"
 msgstr "没有标签准确匹配 '%s'"
 
-#: builtin/describe.c:330
+#: builtin/describe.c
 #, c-format
 msgid "No exact match on refs or tags, searching to describe\n"
 msgstr "没有精确匹配到引用或标签，继续搜索进行描述\n"
 
-#: builtin/describe.c:397
+#: builtin/describe.c
 #, c-format
 msgid "finished search at %s\n"
 msgstr "完成搜索 %s\n"
 
-#: builtin/describe.c:424
+#: builtin/describe.c
 #, c-format
 msgid ""
 "No annotated tags can describe '%s'.\n"
@@ -14843,7 +6541,7 @@ msgstr ""
 "没有附注标签能描述 '%s'。\n"
 "然而，存在未附注标签：尝试 --tags。"
 
-#: builtin/describe.c:428
+#: builtin/describe.c
 #, c-format
 msgid ""
 "No tags can describe '%s'.\n"
@@ -14852,12 +6550,12 @@ msgstr ""
 "没有标签能描述 '%s'。\n"
 "尝试 --always，或者创建一些标签。"
 
-#: builtin/describe.c:458
+#: builtin/describe.c
 #, c-format
 msgid "traversed %lu commits\n"
 msgstr "已遍历 %lu 个提交\n"
 
-#: builtin/describe.c:461
+#: builtin/describe.c
 #, c-format
 msgid ""
 "more than %i tags found; listed %i most recent\n"
@@ -14866,149 +6564,149 @@ msgstr ""
 "发现多于 %i 个标签，列出最近的 %i 个\n"
 "在 %s 放弃搜索\n"
 
-#: builtin/describe.c:529
+#: builtin/describe.c
 #, c-format
 msgid "describe %s\n"
 msgstr "描述 %s\n"
 
-#: builtin/describe.c:532
+#: builtin/describe.c
 #, c-format
 msgid "Not a valid object name %s"
 msgstr "不是一个有效的对象名 %s"
 
-#: builtin/describe.c:540
+#: builtin/describe.c
 #, c-format
 msgid "%s is neither a commit nor blob"
 msgstr "%s 既不是提交也不是数据对象"
 
-#: builtin/describe.c:554
+#: builtin/describe.c
 msgid "find the tag that comes after the commit"
 msgstr "寻找该提交之后的标签"
 
-#: builtin/describe.c:555
+#: builtin/describe.c
 msgid "debug search strategy on stderr"
 msgstr "在标准错误上调试搜索策略"
 
-#: builtin/describe.c:556
+#: builtin/describe.c
 msgid "use any ref"
 msgstr "使用任意引用"
 
-#: builtin/describe.c:557
+#: builtin/describe.c
 msgid "use any tag, even unannotated"
 msgstr "使用任意标签，即使未附带注释"
 
-#: builtin/describe.c:558
+#: builtin/describe.c
 msgid "always use long format"
 msgstr "始终使用长提交号格式"
 
-#: builtin/describe.c:559
+#: builtin/describe.c
 msgid "only follow first parent"
 msgstr "只跟随第一个父提交"
 
-#: builtin/describe.c:562
+#: builtin/describe.c
 msgid "only output exact matches"
 msgstr "只输出精确匹配"
 
-#: builtin/describe.c:564
+#: builtin/describe.c
 msgid "consider <n> most recent tags (default: 10)"
 msgstr "考虑最近 <n> 个标签（默认：10）"
 
-#: builtin/describe.c:566
+#: builtin/describe.c
 msgid "only consider tags matching <pattern>"
 msgstr "只考虑匹配 <模式> 的标签"
 
-#: builtin/describe.c:568
+#: builtin/describe.c
 msgid "do not consider tags matching <pattern>"
 msgstr "不考虑匹配 <模式> 的标签"
 
-#: builtin/describe.c:570 builtin/name-rev.c:595
+#: builtin/describe.c builtin/name-rev.c
 msgid "show abbreviated commit object as fallback"
 msgstr "显示简写的提交号作为后备"
 
-#: builtin/describe.c:571 builtin/describe.c:574
+#: builtin/describe.c
 msgid "mark"
 msgstr "标记"
 
-#: builtin/describe.c:572
+#: builtin/describe.c
 msgid "append <mark> on dirty working tree (default: \"-dirty\")"
 msgstr "对于脏工作区，追加 <标记>（默认：\"-dirty\"）"
 
-#: builtin/describe.c:575
+#: builtin/describe.c
 msgid "append <mark> on broken working tree (default: \"-broken\")"
 msgstr "对于损坏的工作区，追加 <标记>（默认：\"-broken\"）"
 
-#: builtin/describe.c:622
+#: builtin/describe.c
 msgid "No names found, cannot describe anything."
 msgstr "没有发现名称，无法描述任何东西。"
 
-#: builtin/describe.c:673 builtin/describe.c:675
+#: builtin/describe.c
 #, c-format
 msgid "option '%s' and commit-ishes cannot be used together"
 msgstr "选项 '%s' 和提交号不能同时使用"
 
-#: builtin/diff-tree.c:157
+#: builtin/diff-tree.c
 msgid "--merge-base only works with two commits"
 msgstr "--merge-base 仅适用于两个提交"
 
-#: builtin/diff.c:92
+#: builtin/diff.c
 #, c-format
 msgid "'%s': not a regular file or symlink"
 msgstr "'%s'：不是一个正规文件或符号链接"
 
-#: builtin/diff.c:259
+#: builtin/diff.c
 #, c-format
 msgid "invalid option: %s"
 msgstr "无效选项：%s"
 
-#: builtin/diff.c:376
+#: builtin/diff.c
 #, c-format
 msgid "%s...%s: no merge base"
 msgstr "%s...%s：无合并基线"
 
-#: builtin/diff.c:491
+#: builtin/diff.c
 msgid "Not a git repository"
 msgstr "不是 git 仓库"
 
-#: builtin/diff.c:537 builtin/grep.c:700
+#: builtin/diff.c builtin/grep.c
 #, c-format
 msgid "invalid object '%s' given."
 msgstr "提供了无效对象 '%s'。"
 
-#: builtin/diff.c:548
+#: builtin/diff.c
 #, c-format
 msgid "more than two blobs given: '%s'"
 msgstr "提供了超过两个数据对象：'%s'"
 
-#: builtin/diff.c:553
+#: builtin/diff.c
 #, c-format
 msgid "unhandled object '%s' given."
 msgstr "无法处理的对象 '%s'。"
 
-#: builtin/diff.c:587
+#: builtin/diff.c
 #, c-format
 msgid "%s...%s: multiple merge bases, using %s"
 msgstr "%s...%s：多条合并基线，使用 %s"
 
-#: builtin/difftool.c:31
+#: builtin/difftool.c
 msgid "git difftool [<options>] [<commit> [<commit>]] [--] [<path>...]"
 msgstr "git difftool [<选项>] [<提交> [<提交>]] [--] [<路径>...]"
 
-#: builtin/difftool.c:287
+#: builtin/difftool.c
 #, c-format
 msgid "could not read symlink %s"
 msgstr "无法读取符号链接 %s"
 
-#: builtin/difftool.c:289
+#: builtin/difftool.c
 #, c-format
 msgid "could not read symlink file %s"
 msgstr "无法读取符号链接文件 %s"
 
-#: builtin/difftool.c:297
+#: builtin/difftool.c
 #, c-format
 msgid "could not read object %s for symlink %s"
 msgstr "无法读取符号链接 %2$s 指向的对象 %1$s"
 
-#: builtin/difftool.c:421
+#: builtin/difftool.c
 msgid ""
 "combined diff formats ('-c' and '--cc') are not supported in\n"
 "directory diff mode ('-d' and '--dir-diff')."
@@ -15016,444 +6714,452 @@ msgstr ""
 "不支持在目录比较模式（'-d' 和 '--dir-diff'）中采用组合差异格式（'-c' 和 '--"
 "cc'）。"
 
-#: builtin/difftool.c:626
+#: builtin/difftool.c
 #, c-format
 msgid "both files modified: '%s' and '%s'."
 msgstr "两个文件都被修改：'%s' 和 '%s'。"
 
-#: builtin/difftool.c:628
+#: builtin/difftool.c
 msgid "working tree file has been left."
 msgstr "工作区文件被留了下来。"
 
-#: builtin/difftool.c:639
+#: builtin/difftool.c sequencer.c
+#, c-format
+msgid "could not copy '%s' to '%s'"
+msgstr "不能拷贝 '%s' 至 '%s'"
+
+#: builtin/difftool.c
 #, c-format
 msgid "temporary files exist in '%s'."
 msgstr "临时文件存在于 '%s'。"
 
-#: builtin/difftool.c:640
+#: builtin/difftool.c
 msgid "you may want to cleanup or recover these."
 msgstr "您可能想要清理或者恢复它们。"
 
-#: builtin/difftool.c:645
+#: builtin/difftool.c
 #, c-format
 msgid "failed: %d"
 msgstr "失败：%d"
 
-#: builtin/difftool.c:690
+#: builtin/difftool.c
 msgid "use `diff.guitool` instead of `diff.tool`"
 msgstr "使用 `diff.guitool` 代替 `diff.tool`"
 
-#: builtin/difftool.c:692
+#: builtin/difftool.c
 msgid "perform a full-directory diff"
 msgstr "执行一个全目录差异比较"
 
-#: builtin/difftool.c:694
+#: builtin/difftool.c
 msgid "do not prompt before launching a diff tool"
 msgstr "启动差异比较工具之前不提示"
 
-#: builtin/difftool.c:699
+#: builtin/difftool.c
 msgid "use symlinks in dir-diff mode"
 msgstr "在 dir-diff 模式中使用符号链接"
 
-#: builtin/difftool.c:700
+#: builtin/difftool.c
 msgid "tool"
 msgstr "工具"
 
-#: builtin/difftool.c:701
+#: builtin/difftool.c
 msgid "use the specified diff tool"
 msgstr "使用指定的差异比较工具"
 
-#: builtin/difftool.c:703
+#: builtin/difftool.c
 msgid "print a list of diff tools that may be used with `--tool`"
 msgstr "显示可以用在 `--tool` 参数后的差异工具列表"
 
-#: builtin/difftool.c:706
+#: builtin/difftool.c
 msgid ""
 "make 'git-difftool' exit when an invoked diff tool returns a non-zero exit "
 "code"
 msgstr "当执行的 diff 工具返回非零退出码时，使 'git-difftool' 退出"
 
-#: builtin/difftool.c:709
+#: builtin/difftool.c
 msgid "specify a custom command for viewing diffs"
 msgstr "指定一个用于查看差异的自定义命令"
 
-#: builtin/difftool.c:710
+#: builtin/difftool.c
 msgid "passed to `diff`"
 msgstr "传递给 `diff`"
 
-#: builtin/difftool.c:726
+#: builtin/difftool.c
 msgid "difftool requires worktree or --no-index"
 msgstr "difftool 要求工作区或者 --no-index"
 
-#: builtin/difftool.c:745
+#: builtin/difftool.c
 msgid "no <tool> given for --tool=<tool>"
 msgstr "没有为 --tool=<工具> 参数提供 <工具>"
 
-#: builtin/difftool.c:752
+#: builtin/difftool.c
 msgid "no <cmd> given for --extcmd=<cmd>"
 msgstr "没有为 --extcmd=<命令> 参数提供 <命令>"
 
-#: builtin/env--helper.c:6
+#: builtin/env--helper.c
 msgid "git env--helper --type=[bool|ulong] <options> <env-var>"
 msgstr "git env--helper --type=[bool|ulong] <选项> <环境变量>"
 
-#: builtin/env--helper.c:46
+#: builtin/env--helper.c
 msgid "default for git_env_*(...) to fall back on"
 msgstr "git_env_*(...) 的默认值"
 
-#: builtin/env--helper.c:48
+#: builtin/env--helper.c
 msgid "be quiet only use git_env_*() value as exit code"
 msgstr "安静模式，只使用 git_env_*() 的值作为退出码"
 
-#: builtin/env--helper.c:67
+#: builtin/env--helper.c
 #, c-format
 msgid "option `--default' expects a boolean value with `--type=bool`, not `%s`"
 msgstr "选项 `--default' 和 `--type=bool` 期望一个布尔值，不是 `%s`"
 
-#: builtin/env--helper.c:82
+#: builtin/env--helper.c
 #, c-format
 msgid ""
 "option `--default' expects an unsigned long value with `--type=ulong`, not "
 "`%s`"
 msgstr "选项 `--default' 和 `--type=ulong` 期望一个无符号长整型，不是 `%s`"
 
-#: builtin/fast-export.c:29
+#: builtin/fast-export.c
 msgid "git fast-export [<rev-list-opts>]"
 msgstr "git fast-export [<rev-list 选项>]"
 
-#: builtin/fast-export.c:843
+#: builtin/fast-export.c
 msgid "Error: Cannot export nested tags unless --mark-tags is specified."
 msgstr "错误：除非指定 --mark-tags，否则无法导出嵌套标签。"
 
-#: builtin/fast-export.c:1152
+#: builtin/fast-export.c
 msgid "--anonymize-map token cannot be empty"
 msgstr "--anonymize-map 取值不能为空"
 
-#: builtin/fast-export.c:1171
+#: builtin/fast-export.c
 msgid "show progress after <n> objects"
 msgstr "在 <n> 个对象之后显示进度"
 
-#: builtin/fast-export.c:1173
+#: builtin/fast-export.c
 msgid "select handling of signed tags"
 msgstr "选择如何处理签名标签"
 
-#: builtin/fast-export.c:1176
+#: builtin/fast-export.c
 msgid "select handling of tags that tag filtered objects"
 msgstr "选择当标签指向被过滤对象时该标签的处理方式"
 
-#: builtin/fast-export.c:1179
+#: builtin/fast-export.c
 msgid "select handling of commit messages in an alternate encoding"
 msgstr "选择使用备用编码处理提交说明"
 
-#: builtin/fast-export.c:1182
+#: builtin/fast-export.c
 msgid "dump marks to this file"
 msgstr "把标记存储到这个文件"
 
-#: builtin/fast-export.c:1184
+#: builtin/fast-export.c
 msgid "import marks from this file"
 msgstr "从这个文件导入标记"
 
-#: builtin/fast-export.c:1188
+#: builtin/fast-export.c
 msgid "import marks from this file if it exists"
 msgstr "如果文件存在，从该文件导入标记"
 
-#: builtin/fast-export.c:1190
+#: builtin/fast-export.c
 msgid "fake a tagger when tags lack one"
 msgstr "当标签缺少标记人字段时，假装提供一个"
 
-#: builtin/fast-export.c:1192
+#: builtin/fast-export.c
 msgid "output full tree for each commit"
 msgstr "每次提交都输出整个树"
 
-#: builtin/fast-export.c:1194
+#: builtin/fast-export.c
 msgid "use the done feature to terminate the stream"
 msgstr "使用 done 功能来终止流"
 
-#: builtin/fast-export.c:1195
+#: builtin/fast-export.c
 msgid "skip output of blob data"
 msgstr "跳过数据对象的输出"
 
-#: builtin/fast-export.c:1196 builtin/log.c:1860
+#: builtin/fast-export.c builtin/log.c
 msgid "refspec"
 msgstr "引用规格"
 
-#: builtin/fast-export.c:1197
+#: builtin/fast-export.c
 msgid "apply refspec to exported refs"
 msgstr "对导出的引用应用引用规格"
 
-#: builtin/fast-export.c:1198
+#: builtin/fast-export.c
 msgid "anonymize output"
 msgstr "匿名输出"
 
-#: builtin/fast-export.c:1199
+#: builtin/fast-export.c
 msgid "from:to"
 msgstr "from:to"
 
-#: builtin/fast-export.c:1200
+#: builtin/fast-export.c
 msgid "convert <from> to <to> in anonymized output"
 msgstr "在匿名输出中将 <from> 转换为 <to>"
 
-#: builtin/fast-export.c:1203
+#: builtin/fast-export.c
 msgid "reference parents which are not in fast-export stream by object id"
 msgstr "引用父对象 ID 不在 fast-export 流中"
 
-#: builtin/fast-export.c:1205
+#: builtin/fast-export.c
 msgid "show original object ids of blobs/commits"
 msgstr "显示数据对象/提交的原始对象 ID"
 
-#: builtin/fast-export.c:1207
+#: builtin/fast-export.c
 msgid "label tags with mark ids"
 msgstr "对带有标记 ID 的标签做标记"
 
-#: builtin/fast-import.c:3097
+#: builtin/fast-import.c
 #, c-format
 msgid "Missing from marks for submodule '%s'"
 msgstr "子模组 '%s' 缺少 from 标记"
 
-#: builtin/fast-import.c:3099
+#: builtin/fast-import.c
 #, c-format
 msgid "Missing to marks for submodule '%s'"
 msgstr "子模组 '%s' 缺少 to 标记"
 
-#: builtin/fast-import.c:3234
+#: builtin/fast-import.c
 #, c-format
 msgid "Expected 'mark' command, got %s"
 msgstr "预期 'mark' 命令，得到 %s"
 
-#: builtin/fast-import.c:3239
+#: builtin/fast-import.c
 #, c-format
 msgid "Expected 'to' command, got %s"
 msgstr "预期 'to' 命令，得到 %s"
 
-#: builtin/fast-import.c:3331
+#: builtin/fast-import.c
 msgid "Expected format name:filename for submodule rewrite option"
 msgstr "子模组重写选项的预期格式为 name:filename"
 
-#: builtin/fast-import.c:3386
+#: builtin/fast-import.c
 #, c-format
 msgid "feature '%s' forbidden in input without --allow-unsafe-features"
 msgstr "不带 --allow-unsafe-features 的输入中禁止使用功能 '%s'"
 
-#: builtin/fetch-pack.c:246
+#: builtin/fetch-pack.c
 #, c-format
 msgid "Lockfile created but not reported: %s"
 msgstr "Lockfile 已创建但未报告：%s"
 
-#: builtin/fetch.c:36
+#: builtin/fetch.c
 msgid "git fetch [<options>] [<repository> [<refspec>...]]"
 msgstr "git fetch [<选项>] [<仓库> [<引用规格>...]]"
 
-#: builtin/fetch.c:37
+#: builtin/fetch.c
 msgid "git fetch [<options>] <group>"
 msgstr "git fetch [<选项>] <组>"
 
-#: builtin/fetch.c:38
+#: builtin/fetch.c
 msgid "git fetch --multiple [<options>] [(<repository> | <group>)...]"
 msgstr "git fetch --multiple [<选项>] [(<仓库> | <组>)...]"
 
-#: builtin/fetch.c:39
+#: builtin/fetch.c
 msgid "git fetch --all [<options>]"
 msgstr "git fetch --all [<选项>]"
 
-#: builtin/fetch.c:124
+#: builtin/fetch.c
 msgid "fetch.parallel cannot be negative"
 msgstr "fetch.parallel 不能为负数"
 
-#: builtin/fetch.c:147 builtin/pull.c:189
+#: builtin/fetch.c builtin/pull.c
 msgid "fetch from all remotes"
 msgstr "从所有的远程抓取"
 
-#: builtin/fetch.c:149 builtin/pull.c:249
+#: builtin/fetch.c builtin/pull.c
 msgid "set upstream for git pull/fetch"
 msgstr "为 git pull/fetch 设置上游"
 
-#: builtin/fetch.c:151 builtin/pull.c:192
+#: builtin/fetch.c builtin/pull.c
 msgid "append to .git/FETCH_HEAD instead of overwriting"
 msgstr "追加到 .git/FETCH_HEAD 而不是覆盖它"
 
-#: builtin/fetch.c:153
+#: builtin/fetch.c
 msgid "use atomic transaction to update references"
 msgstr "使用原子事务更新引用"
 
-#: builtin/fetch.c:155 builtin/pull.c:195
+#: builtin/fetch.c builtin/pull.c
 msgid "path to upload pack on remote end"
 msgstr "上传包到远程的路径"
 
-#: builtin/fetch.c:156
+#: builtin/fetch.c
 msgid "force overwrite of local reference"
 msgstr "强制覆盖本地引用"
 
-#: builtin/fetch.c:158
+#: builtin/fetch.c
 msgid "fetch from multiple remotes"
 msgstr "从多个远程抓取"
 
-#: builtin/fetch.c:160 builtin/pull.c:199
+#: builtin/fetch.c builtin/pull.c
 msgid "fetch all tags and associated objects"
 msgstr "抓取所有的标签和关联对象"
 
-#: builtin/fetch.c:162
+#: builtin/fetch.c
 msgid "do not fetch all tags (--no-tags)"
 msgstr "不抓取任何标签(--no-tags)"
 
-#: builtin/fetch.c:164
+#: builtin/fetch.c
 msgid "number of submodules fetched in parallel"
 msgstr "子模组获取的并发数"
 
-#: builtin/fetch.c:166
+#: builtin/fetch.c
 msgid "modify the refspec to place all refs within refs/prefetch/"
 msgstr "修改引用规格以将所有引用放入 refs/prefetch/"
 
-#: builtin/fetch.c:168 builtin/pull.c:202
+#: builtin/fetch.c builtin/pull.c
 msgid "prune remote-tracking branches no longer on remote"
 msgstr "清除远程已经不存在的分支的跟踪分支"
 
-#: builtin/fetch.c:170
+#: builtin/fetch.c
 msgid "prune local tags no longer on remote and clobber changed tags"
 msgstr "清除远程不存在的本地标签，并且替换变更标签"
 
 #  译者：可选值，不能翻译
-#: builtin/fetch.c:171 builtin/fetch.c:199 builtin/pull.c:123
+#: builtin/fetch.c builtin/pull.c
 msgid "on-demand"
 msgstr "on-demand"
 
-#: builtin/fetch.c:172
+#: builtin/fetch.c
 msgid "control recursive fetching of submodules"
 msgstr "控制子模组的递归抓取"
 
-#: builtin/fetch.c:177
+#: builtin/fetch.c
 msgid "write fetched references to the FETCH_HEAD file"
 msgstr "将获取到的引用写入 FETCH_HEAD 文件"
 
-#: builtin/fetch.c:178 builtin/pull.c:210
+#: builtin/fetch.c builtin/pull.c
 msgid "keep downloaded pack"
 msgstr "保持下载包"
 
-#: builtin/fetch.c:180
+#: builtin/fetch.c
 msgid "allow updating of HEAD ref"
 msgstr "允许更新 HEAD 引用"
 
-#: builtin/fetch.c:183 builtin/fetch.c:189 builtin/pull.c:213
-#: builtin/pull.c:222
+#: builtin/fetch.c builtin/pull.c
 msgid "deepen history of shallow clone"
 msgstr "深化浅克隆的历史"
 
-#: builtin/fetch.c:185 builtin/pull.c:216
+#: builtin/fetch.c builtin/pull.c
 msgid "deepen history of shallow repository based on time"
 msgstr "基于时间来深化浅克隆的历史"
 
-#: builtin/fetch.c:191 builtin/pull.c:225
+#: builtin/fetch.c builtin/pull.c
 msgid "convert to a complete repository"
 msgstr "转换为一个完整的仓库"
 
-#: builtin/fetch.c:194
+#: builtin/fetch.c
 msgid "re-fetch without negotiating common commits"
 msgstr "不协商共有提交重新获取"
 
-#: builtin/fetch.c:197
+#: builtin/fetch.c
 msgid "prepend this to submodule path output"
 msgstr "在子模组路径输出的前面加上此目录"
 
-#: builtin/fetch.c:200
+#: builtin/fetch.c
 msgid ""
 "default for recursive fetching of submodules (lower priority than config "
 "files)"
 msgstr "递归获取子模组的缺省值（比配置文件优先级低）"
 
-#: builtin/fetch.c:204 builtin/pull.c:228
+#: builtin/fetch.c builtin/pull.c
 msgid "accept refs that update .git/shallow"
 msgstr "接受更新 .git/shallow 的引用"
 
-#: builtin/fetch.c:205 builtin/pull.c:230
+#: builtin/fetch.c builtin/pull.c
 msgid "refmap"
 msgstr "引用映射"
 
-#: builtin/fetch.c:206 builtin/pull.c:231
+#: builtin/fetch.c builtin/pull.c
 msgid "specify fetch refmap"
 msgstr "指定获取操作的引用映射"
 
-#: builtin/fetch.c:213 builtin/pull.c:244
+#: builtin/fetch.c builtin/pull.c
 msgid "report that we have only objects reachable from this object"
 msgstr "报告我们只拥有从该对象开始可达的对象"
 
-#: builtin/fetch.c:215
+#: builtin/fetch.c
 msgid "do not fetch a packfile; instead, print ancestors of negotiation tips"
 msgstr "不获取包文件；而是打印协商的祖先提交"
 
-#: builtin/fetch.c:218 builtin/fetch.c:220
+#: builtin/fetch.c
 msgid "run 'maintenance --auto' after fetching"
 msgstr "获取后执行 'maintenance --auto'"
 
-#: builtin/fetch.c:222 builtin/pull.c:247
+#: builtin/fetch.c builtin/pull.c
 msgid "check for forced-updates on all updated branches"
 msgstr "在所有更新分支上检查强制更新"
 
-#: builtin/fetch.c:224
+#: builtin/fetch.c
 msgid "write the commit-graph after fetching"
 msgstr "抓取后写提交图"
 
-#: builtin/fetch.c:226
+#: builtin/fetch.c
 msgid "accept refspecs from stdin"
 msgstr "从标准输入获取引用规格"
 
-#: builtin/fetch.c:618
+#: builtin/fetch.c
 msgid "couldn't find remote ref HEAD"
 msgstr "无法发现远程 HEAD 引用"
 
-#: builtin/fetch.c:893
+#: builtin/fetch.c
 #, c-format
 msgid "object %s not found"
 msgstr "对象 %s 未发现"
 
-#: builtin/fetch.c:897
+#: builtin/fetch.c
 msgid "[up to date]"
 msgstr "[最新]"
 
-#: builtin/fetch.c:909 builtin/fetch.c:927 builtin/fetch.c:999
+#: builtin/fetch.c
 msgid "[rejected]"
 msgstr "[已拒绝]"
 
-#: builtin/fetch.c:911
+#: builtin/fetch.c
 msgid "can't fetch in current branch"
 msgstr "当前分支下不能执行获取操作"
 
-#: builtin/fetch.c:912
+#: builtin/fetch.c
 msgid "checked out in another worktree"
 msgstr "已在另一个工作树中检出"
 
-#: builtin/fetch.c:922
+#: builtin/fetch.c
 msgid "[tag update]"
 msgstr "[标签更新]"
 
-#: builtin/fetch.c:923 builtin/fetch.c:960 builtin/fetch.c:982
-#: builtin/fetch.c:994
+#: builtin/fetch.c
 msgid "unable to update local ref"
 msgstr "不能更新本地引用"
 
-#: builtin/fetch.c:927
+#: builtin/fetch.c
 msgid "would clobber existing tag"
 msgstr "会破坏现有的标签"
 
-#: builtin/fetch.c:949
+#: builtin/fetch.c
 msgid "[new tag]"
 msgstr "[新标签]"
 
-#: builtin/fetch.c:952
+#: builtin/fetch.c
 msgid "[new branch]"
 msgstr "[新分支]"
 
-#: builtin/fetch.c:955
+#: builtin/fetch.c
 msgid "[new ref]"
 msgstr "[新引用]"
 
-#: builtin/fetch.c:994
+#: builtin/fetch.c
 msgid "forced update"
 msgstr "强制更新"
 
-#: builtin/fetch.c:999
+#: builtin/fetch.c
 msgid "non-fast-forward"
 msgstr "非快进"
 
-#: builtin/fetch.c:1102
+#: builtin/fetch.c builtin/grep.c sequencer.c
+#, c-format
+msgid "cannot open '%s'"
+msgstr "不能打开 '%s'"
+
+#: builtin/fetch.c
 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"
@@ -15463,7 +7169,7 @@ msgstr ""
 "要重新启用，请使用 '--show-forced-updates' 选项或运行\n"
 "'git config fetch.showForcedUpdates true'"
 
-#: builtin/fetch.c:1106
+#: builtin/fetch.c
 #, c-format
 msgid ""
 "it took %.2f seconds to check forced updates; you can use\n"
@@ -15474,22 +7180,22 @@ msgstr ""
 "花了 %.2f 秒来检查强制更新；您可以使用 '--no-show-forced-updates'\n"
 "或运行 'git config fetch.showForcedUpdates false' 以避免此项检查\n"
 
-#: builtin/fetch.c:1136
+#: builtin/fetch.c
 #, c-format
 msgid "%s did not send all necessary objects\n"
 msgstr "%s 未发送所有必需的对象\n"
 
-#: builtin/fetch.c:1156
+#: builtin/fetch.c
 #, c-format
 msgid "rejected %s because shallow roots are not allowed to be updated"
 msgstr "拒绝 %s 因为浅克隆的根不允许被更新"
 
-#: builtin/fetch.c:1259 builtin/fetch.c:1418
+#: builtin/fetch.c
 #, c-format
 msgid "From %.*s\n"
 msgstr "来自 %.*s\n"
 
-#: builtin/fetch.c:1269
+#: builtin/fetch.c
 #, c-format
 msgid ""
 "some local refs could not be updated; try running\n"
@@ -15499,69 +7205,74 @@ msgstr ""
 " 'git remote prune %s' 来删除旧的、有冲突的分支"
 
 #  译者：注意保持前导空格
-#: builtin/fetch.c:1377
+#: builtin/fetch.c
 #, c-format
 msgid "   (%s will become dangling)"
 msgstr "   （%s 将成为悬空状态）"
 
 #  译者：注意保持前导空格
-#: builtin/fetch.c:1378
+#: builtin/fetch.c
 #, c-format
 msgid "   (%s has become dangling)"
 msgstr "   （%s 已成为悬空状态）"
 
-#: builtin/fetch.c:1421
+#: builtin/fetch.c
 msgid "[deleted]"
 msgstr "[已删除]"
 
-#: builtin/fetch.c:1422 builtin/remote.c:1153
+#: builtin/fetch.c builtin/remote.c
 msgid "(none)"
 msgstr "（无）"
 
-#: builtin/fetch.c:1446
+#: builtin/fetch.c
 #, c-format
 msgid "refusing to fetch into branch '%s' checked out at '%s'"
 msgstr "拒绝获取于 '%2$s' 检出的分支 '%1$s'"
 
-#: builtin/fetch.c:1466
+#: builtin/fetch.c
 #, c-format
 msgid "option \"%s\" value \"%s\" is not valid for %s"
 msgstr "选项 \"%s\" 的值 \"%s\" 对于 %s 是无效的"
 
-#: builtin/fetch.c:1469
+#: builtin/fetch.c
 #, c-format
 msgid "option \"%s\" is ignored for %s\n"
 msgstr "选项 \"%s\" 为 %s 所忽略\n"
 
-#: builtin/fetch.c:1496
+#: builtin/fetch.c object-file.c
+#, c-format
+msgid "%s is not a valid object"
+msgstr "%s 不是一个有效的对象"
+
+#: builtin/fetch.c
 #, c-format
 msgid "the object %s does not exist"
 msgstr "对象 '%s' 不存在"
 
-#: builtin/fetch.c:1748
+#: builtin/fetch.c
 msgid "multiple branches detected, incompatible with --set-upstream"
 msgstr "检测到多分支，和 --set-upstream 不兼容"
 
-#: builtin/fetch.c:1760
+#: builtin/fetch.c
 #, c-format
 msgid ""
 "could not set upstream of HEAD to '%s' from '%s' when it does not point to "
 "any branch."
 msgstr "无法在不指向任何分支时将 HEAD 的上游从 '%s' 设置为 '%s'。"
 
-#: builtin/fetch.c:1773
+#: builtin/fetch.c
 msgid "not setting upstream for a remote remote-tracking branch"
 msgstr "没有为一个远程跟踪分支设置上游"
 
-#: builtin/fetch.c:1775
+#: builtin/fetch.c
 msgid "not setting upstream for a remote tag"
 msgstr "没有为一个远程标签设置上游"
 
-#: builtin/fetch.c:1777
+#: builtin/fetch.c
 msgid "unknown branch type"
 msgstr "未知的分支类型"
 
-#: builtin/fetch.c:1779
+#: builtin/fetch.c
 msgid ""
 "no source branch found;\n"
 "you need to specify exactly one branch with the --set-upstream option"
@@ -15569,213 +7280,213 @@ msgstr ""
 "未发现源分支；\n"
 "您需要使用 --set-upstream 选项指定一个分支"
 
-#: builtin/fetch.c:1904 builtin/fetch.c:1967
+#: builtin/fetch.c
 #, c-format
 msgid "Fetching %s\n"
 msgstr "正在获取 %s\n"
 
-#: builtin/fetch.c:1914 builtin/fetch.c:1969
+#: builtin/fetch.c
 #, c-format
 msgid "could not fetch %s"
 msgstr "不能获取 %s"
 
-#: builtin/fetch.c:1926
+#: builtin/fetch.c
 #, c-format
 msgid "could not fetch '%s' (exit code: %d)\n"
 msgstr "无法获取 '%s'（退出码：%d）\n"
 
-#: builtin/fetch.c:2030
+#: builtin/fetch.c
 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:2066
+#: builtin/fetch.c
 msgid "you need to specify a tag name"
 msgstr "您需要指定一个标签名称"
 
-#: builtin/fetch.c:2156
+#: builtin/fetch.c
 msgid "--negotiate-only needs one or more --negotiation-tip=*"
 msgstr "--negotiate-only 需要一个或多个 --negotiation-tip=*"
 
-#: builtin/fetch.c:2160
+#: builtin/fetch.c
 msgid "negative depth in --deepen is not supported"
 msgstr "--deepen 不支持负数深度"
 
-#: builtin/fetch.c:2169
+#: builtin/fetch.c
 msgid "--unshallow on a complete repository does not make sense"
 msgstr "对于一个完整的仓库，参数 --unshallow 没有意义"
 
-#: builtin/fetch.c:2186
+#: builtin/fetch.c
 msgid "fetch --all does not take a repository argument"
 msgstr "fetch --all 不能带一个仓库参数"
 
-#: builtin/fetch.c:2188
+#: builtin/fetch.c
 msgid "fetch --all does not make sense with refspecs"
 msgstr "fetch --all 带引用规格没有任何意义"
 
-#: builtin/fetch.c:2197
+#: builtin/fetch.c
 #, c-format
 msgid "no such remote or remote group: %s"
 msgstr "没有这样的远程或远程组：%s"
 
-#: builtin/fetch.c:2205
+#: builtin/fetch.c
 msgid "fetching a group and specifying refspecs does not make sense"
 msgstr "获取组并指定引用规格没有意义"
 
-#: builtin/fetch.c:2221
+#: builtin/fetch.c
 msgid "must supply remote when using --negotiate-only"
 msgstr "在使用 --negotiate-only 时必须提供远程仓库"
 
-#: builtin/fetch.c:2226
+#: builtin/fetch.c
 msgid "protocol does not support --negotiate-only, exiting"
 msgstr "协议不支持 --negotiate-only，退出"
 
-#: builtin/fetch.c:2246
+#: builtin/fetch.c
 msgid ""
 "--filter can only be used with the remote configured in extensions."
 "partialclone"
 msgstr "只可以将 --filter 用于在 extensions.partialclone 中配置的远程仓库"
 
-#: builtin/fetch.c:2250
+#: builtin/fetch.c
 msgid "--atomic can only be used when fetching from one remote"
 msgstr "--atomic 仅在从一个远程仓库获取的时候可用"
 
-#: builtin/fetch.c:2254
+#: builtin/fetch.c
 msgid "--stdin can only be used when fetching from one remote"
 msgstr "--stdin 仅在从一个远程仓库获取的时候可用"
 
-#: builtin/fmt-merge-msg.c:7
+#: builtin/fmt-merge-msg.c
 msgid ""
 "git fmt-merge-msg [-m <message>] [--log[=<n>] | --no-log] [--file <file>]"
 msgstr "git fmt-merge-msg [-m <说明>] [--log[=<n>] | --no-log] [--file <文件>]"
 
-#: builtin/fmt-merge-msg.c:19
+#: builtin/fmt-merge-msg.c
 msgid "populate log with at most <n> entries from shortlog"
 msgstr "向提交说明中最多复制指定条目（合并而来的提交）的简短说明"
 
-#: builtin/fmt-merge-msg.c:22
+#: builtin/fmt-merge-msg.c
 msgid "alias for --log (deprecated)"
 msgstr "参数 --log 的别名（已弃用）"
 
-#: builtin/fmt-merge-msg.c:25
+#: builtin/fmt-merge-msg.c
 msgid "text"
 msgstr "文本"
 
-#: builtin/fmt-merge-msg.c:26
+#: builtin/fmt-merge-msg.c
 msgid "use <text> as start of message"
 msgstr "使用 <文本> 作为提交说明的开始"
 
-#: builtin/fmt-merge-msg.c:28
+#: builtin/fmt-merge-msg.c
 msgid "use <name> instead of the real target branch"
 msgstr "使用 <名称> 而不是真正的目标分支"
 
-#: builtin/fmt-merge-msg.c:29
+#: builtin/fmt-merge-msg.c
 msgid "file to read from"
 msgstr "从文件中读取"
 
-#: builtin/for-each-ref.c:10
+#: builtin/for-each-ref.c
 msgid "git for-each-ref [<options>] [<pattern>]"
 msgstr "git for-each-ref [<选项>] [<模式>]"
 
-#: builtin/for-each-ref.c:11
+#: builtin/for-each-ref.c
 msgid "git for-each-ref [--points-at <object>]"
 msgstr "git for-each-ref [--points-at <对象>]"
 
-#: builtin/for-each-ref.c:12
+#: builtin/for-each-ref.c
 msgid "git for-each-ref [--merged [<commit>]] [--no-merged [<commit>]]"
 msgstr "git for-each-ref [--merged [<提交>]] [--no-merged [<提交>]]"
 
-#: builtin/for-each-ref.c:13
+#: builtin/for-each-ref.c
 msgid "git for-each-ref [--contains [<commit>]] [--no-contains [<commit>]]"
 msgstr "git for-each-ref [--contains [<提交>]] [--no-contains [<提交>]]"
 
-#: builtin/for-each-ref.c:31
+#: builtin/for-each-ref.c
 msgid "quote placeholders suitably for shells"
 msgstr "引用占位符适用于 shells"
 
-#: builtin/for-each-ref.c:33
+#: builtin/for-each-ref.c
 msgid "quote placeholders suitably for perl"
 msgstr "引用占位符适用于 perl"
 
-#: builtin/for-each-ref.c:35
+#: builtin/for-each-ref.c
 msgid "quote placeholders suitably for python"
 msgstr "引用占位符适用于 python"
 
-#: builtin/for-each-ref.c:37
+#: builtin/for-each-ref.c
 msgid "quote placeholders suitably for Tcl"
 msgstr "引用占位符适用于 Tcl"
 
-#: builtin/for-each-ref.c:40
+#: builtin/for-each-ref.c
 msgid "show only <n> matched refs"
 msgstr "只显示 <n> 个匹配的引用"
 
-#: builtin/for-each-ref.c:42 builtin/tag.c:482
+#: builtin/for-each-ref.c builtin/tag.c
 msgid "respect format colors"
 msgstr "遵照格式中的颜色输出"
 
-#: builtin/for-each-ref.c:45
+#: builtin/for-each-ref.c
 msgid "print only refs which points at the given object"
 msgstr "只打印指向给定对象的引用"
 
-#: builtin/for-each-ref.c:47
+#: builtin/for-each-ref.c
 msgid "print only refs that are merged"
 msgstr "只打印已经合并的引用"
 
-#: builtin/for-each-ref.c:48
+#: builtin/for-each-ref.c
 msgid "print only refs that are not merged"
 msgstr "只打印没有合并的引用"
 
-#: builtin/for-each-ref.c:49
+#: builtin/for-each-ref.c
 msgid "print only refs which contain the commit"
 msgstr "只打印包含该提交的引用"
 
-#: builtin/for-each-ref.c:50
+#: builtin/for-each-ref.c
 msgid "print only refs which don't contain the commit"
 msgstr "只打印不包含该提交的引用"
 
-#: builtin/for-each-repo.c:9
+#: builtin/for-each-repo.c
 msgid "git for-each-repo --config=<config> <command-args>"
 msgstr "git for-each-repo --config=<配置> <命令参数>"
 
-#: builtin/for-each-repo.c:34
+#: builtin/for-each-repo.c
 msgid "config"
 msgstr "配置"
 
-#: builtin/for-each-repo.c:35
+#: builtin/for-each-repo.c
 msgid "config key storing a list of repository paths"
 msgstr "存储着仓库路径列表的配置项键名"
 
-#: builtin/for-each-repo.c:43
+#: builtin/for-each-repo.c
 msgid "missing --config=<config>"
 msgstr "缺少 --config=<配置>"
 
-#: builtin/fsck.c:69 builtin/fsck.c:128 builtin/fsck.c:129
+#: builtin/fsck.c
 msgid "unknown"
 msgstr "未知"
 
 #. TRANSLATORS: e.g. error in tree 01bfda: <more explanation>
-#: builtin/fsck.c:78 builtin/fsck.c:100
+#: builtin/fsck.c
 #, c-format
 msgid "error in %s %s: %s"
 msgstr "%s %s 错误：%s"
 
 #. TRANSLATORS: e.g. warning in tree 01bfda: <more explanation>
-#: builtin/fsck.c:94
+#: builtin/fsck.c
 #, c-format
 msgid "warning in %s %s: %s"
 msgstr "%s %s 警告：%s"
 
-#: builtin/fsck.c:124 builtin/fsck.c:127
+#: builtin/fsck.c
 #, c-format
 msgid "broken link from %7s %s"
 msgstr "来自 %7s %s 的损坏的链接"
 
-#: builtin/fsck.c:136
+#: builtin/fsck.c
 msgid "wrong object type in link"
 msgstr "链接中错误的对象类型"
 
-#: builtin/fsck.c:152
+#: builtin/fsck.c
 #, c-format
 msgid ""
 "broken link from %7s %s\n"
@@ -15784,357 +7495,380 @@ msgstr ""
 "损坏的链接来自于 %7s %s\n"
 "              到 %7s %s"
 
-#: builtin/fsck.c:264
+#: builtin/fsck.c builtin/prune.c connected.c
+msgid "Checking connectivity"
+msgstr "正在检查连通性"
+
+#: builtin/fsck.c
 #, c-format
 msgid "missing %s %s"
 msgstr "缺失 %s %s"
 
-#: builtin/fsck.c:291
+#: builtin/fsck.c
 #, c-format
 msgid "unreachable %s %s"
 msgstr "不可达 %s %s"
 
-#: builtin/fsck.c:311
+#: builtin/fsck.c
 #, c-format
 msgid "dangling %s %s"
 msgstr "悬空 %s %s"
 
-#: builtin/fsck.c:321
+#: builtin/fsck.c
 msgid "could not create lost-found"
 msgstr "不能创建 lost-found"
 
-#: builtin/fsck.c:332
+#: builtin/fsck.c builtin/gc.c builtin/rebase.c rebase-interactive.c rerere.c
+#: sequencer.c
+#, c-format
+msgid "could not write '%s'"
+msgstr "不能写入 '%s'"
+
+#: builtin/fsck.c
 #, c-format
 msgid "could not finish '%s'"
 msgstr "不能完成 '%s'"
 
-#: builtin/fsck.c:349
+#: builtin/fsck.c
 #, c-format
 msgid "Checking %s"
 msgstr "正在检查 %s"
 
-#: builtin/fsck.c:387
+#: builtin/fsck.c
 #, c-format
 msgid "Checking connectivity (%d objects)"
 msgstr "正在检查连通性（%d 个对象）"
 
-#: builtin/fsck.c:406
+#: builtin/fsck.c
 #, c-format
 msgid "Checking %s %s"
 msgstr "正在检查 %s %s"
 
-#: builtin/fsck.c:411
+#: builtin/fsck.c
 msgid "broken links"
 msgstr "损坏的链接"
 
-#: builtin/fsck.c:420
+#: builtin/fsck.c
 #, c-format
 msgid "root %s"
 msgstr "根 %s"
 
-#: builtin/fsck.c:428
+#: builtin/fsck.c
 #, c-format
 msgid "tagged %s %s (%s) in %s"
 msgstr "标记 %s %s (%s) 于 %s"
 
-#: builtin/fsck.c:457
+#: builtin/fsck.c
 #, c-format
 msgid "%s: object corrupt or missing"
 msgstr "%s：对象损坏或丢失"
 
-#: builtin/fsck.c:482
+#: builtin/fsck.c
 #, c-format
 msgid "%s: invalid reflog entry %s"
 msgstr "%s：无效的引用日志条目 %s"
 
-#: builtin/fsck.c:496
+#: builtin/fsck.c
 #, c-format
 msgid "Checking reflog %s->%s"
 msgstr "正在检查引用日志 %s->%s"
 
-#: builtin/fsck.c:530
+#: builtin/fsck.c
 #, c-format
 msgid "%s: invalid sha1 pointer %s"
 msgstr "%s：无效的 sha1 指针 %s"
 
-#: builtin/fsck.c:537
+#: builtin/fsck.c
 #, c-format
 msgid "%s: not a commit"
 msgstr "%s：不是一个提交"
 
-#: builtin/fsck.c:591
+#: builtin/fsck.c
 msgid "notice: No default references"
 msgstr "注意：无默认引用"
 
-#: builtin/fsck.c:621
+#: builtin/fsck.c
 #, c-format
 msgid "%s: hash-path mismatch, found at: %s"
 msgstr "%s：哈希路径不匹配，发现于 %s"
 
-#: builtin/fsck.c:624
+#: builtin/fsck.c
 #, c-format
 msgid "%s: object corrupt or missing: %s"
 msgstr "%s：对象损坏或丢失：%s"
 
-#: builtin/fsck.c:628
+#: builtin/fsck.c
 #, c-format
 msgid "%s: object is of unknown type '%s': %s"
 msgstr "%s：对象有未知的类型 '%s': %s"
 
-#: builtin/fsck.c:645
+#: builtin/fsck.c
 #, c-format
 msgid "%s: object could not be parsed: %s"
 msgstr "%s：不能解析对象：%s"
 
-#: builtin/fsck.c:665
+#: builtin/fsck.c
 #, c-format
 msgid "bad sha1 file: %s"
 msgstr "坏的 sha1 文件：%s"
 
-#: builtin/fsck.c:686
+#: builtin/fsck.c
 msgid "Checking object directory"
 msgstr "正在检查对象目录"
 
-#: builtin/fsck.c:689
+#: builtin/fsck.c
 msgid "Checking object directories"
 msgstr "正在检查对象目录"
 
-#: builtin/fsck.c:705
+#: builtin/fsck.c
 #, c-format
 msgid "Checking %s link"
 msgstr "正在检查 %s 链接"
 
-#: builtin/fsck.c:710 builtin/index-pack.c:862
+#: builtin/fsck.c builtin/index-pack.c
 #, c-format
 msgid "invalid %s"
 msgstr "无效的 %s"
 
-#: builtin/fsck.c:717
+#: builtin/fsck.c
 #, c-format
 msgid "%s points to something strange (%s)"
 msgstr "%s 指向奇怪的东西（%s）"
 
-#: builtin/fsck.c:723
+#: builtin/fsck.c
 #, c-format
 msgid "%s: detached HEAD points at nothing"
 msgstr "%s：分离头指针的指向不存在"
 
-#: builtin/fsck.c:727
+#: builtin/fsck.c
 #, c-format
 msgid "notice: %s points to an unborn branch (%s)"
 msgstr "注意：%s 指向一个尚未诞生的分支（%s）"
 
-#: builtin/fsck.c:739
+#: builtin/fsck.c
 msgid "Checking cache tree"
 msgstr "正在检查缓存树"
 
-#: builtin/fsck.c:744
+#: builtin/fsck.c
 #, c-format
 msgid "%s: invalid sha1 pointer in cache-tree"
 msgstr "%s：cache-tree 中无效的 sha1 指针"
 
-#: builtin/fsck.c:753
+#: builtin/fsck.c
 msgid "non-tree in cache-tree"
 msgstr "cache-tree 中非树对象"
 
-#: builtin/fsck.c:784
+#: builtin/fsck.c
 msgid "git fsck [<options>] [<object>...]"
 msgstr "git fsck [<选项>] [<对象>...]"
 
-#: builtin/fsck.c:790
+#: builtin/fsck.c
 msgid "show unreachable objects"
 msgstr "显示不可达的对象"
 
-#: builtin/fsck.c:791
+#: builtin/fsck.c
 msgid "show dangling objects"
 msgstr "显示悬空的对象"
 
-#: builtin/fsck.c:792
+#: builtin/fsck.c
 msgid "report tags"
 msgstr "报告标签"
 
-#: builtin/fsck.c:793
+#: builtin/fsck.c
 msgid "report root nodes"
 msgstr "报告根节点"
 
-#: builtin/fsck.c:794
+#: builtin/fsck.c
 msgid "make index objects head nodes"
 msgstr "将索引亦作为检查的头节点"
 
-#: builtin/fsck.c:795
+#: builtin/fsck.c
 msgid "make reflogs head nodes (default)"
 msgstr "将引用日志作为检查的头节点（默认）"
 
-#: builtin/fsck.c:796
+#: builtin/fsck.c
 msgid "also consider packs and alternate objects"
 msgstr "也考虑包和备用对象"
 
-#: builtin/fsck.c:797
+#: builtin/fsck.c
 msgid "check only connectivity"
 msgstr "仅检查连通性"
 
-#: builtin/fsck.c:798 builtin/mktag.c:75
+#: builtin/fsck.c builtin/mktag.c
 msgid "enable more strict checking"
 msgstr "启用更严格的检查"
 
-#: builtin/fsck.c:800
+#: builtin/fsck.c
 msgid "write dangling objects in .git/lost-found"
 msgstr "将悬空对象写入 .git/lost-found 中"
 
-#: builtin/fsck.c:801 builtin/prune.c:146
+#: builtin/fsck.c builtin/prune.c
 msgid "show progress"
 msgstr "显示进度"
 
-#: builtin/fsck.c:802
+#: builtin/fsck.c
 msgid "show verbose names for reachable objects"
 msgstr "显示可达对象的详细名称"
 
-#: builtin/fsck.c:862 builtin/index-pack.c:261
+#: builtin/fsck.c builtin/index-pack.c
 msgid "Checking objects"
 msgstr "正在检查对象"
 
-#: builtin/fsck.c:890
+#: builtin/fsck.c
 #, c-format
 msgid "%s: object missing"
 msgstr "%s：对象缺失"
 
-#: builtin/fsck.c:901
+#: builtin/fsck.c
 #, c-format
 msgid "invalid parameter: expected sha1, got '%s'"
 msgstr "无效的参数：期望 sha1，得到 '%s'"
 
-#: builtin/fsmonitor--daemon.c:13
+#: builtin/fsmonitor--daemon.c
 msgid "git fsmonitor--daemon start [<options>]"
 msgstr "git fsmonitor--daemon start [<选项>]"
 
-#: builtin/fsmonitor--daemon.c:14
+#: builtin/fsmonitor--daemon.c
 msgid "git fsmonitor--daemon run [<options>]"
 msgstr "git fsmonitor--daemon run [<选项>]"
 
-#: builtin/fsmonitor--daemon.c:15
+#: builtin/fsmonitor--daemon.c
 msgid "git fsmonitor--daemon stop"
 msgstr "git fsmonitor--daemon stop"
 
-#: builtin/fsmonitor--daemon.c:16
+#: builtin/fsmonitor--daemon.c
 msgid "git fsmonitor--daemon status"
 msgstr "git fsmonitor--daemon status"
 
-#: builtin/fsmonitor--daemon.c:38 builtin/fsmonitor--daemon.c:47
+#: builtin/fsmonitor--daemon.c
 #, c-format
 msgid "value of '%s' out of range: %d"
 msgstr "'%s' 的值超出范围：%d"
 
-#: builtin/fsmonitor--daemon.c:57
+#: builtin/fsmonitor--daemon.c
 #, c-format
 msgid "value of '%s' not bool or int: %d"
 msgstr "'%s' 的值不是 bool 或 int：%d"
 
-#: builtin/fsmonitor--daemon.c:99
+#: builtin/fsmonitor--daemon.c
 #, c-format
 msgid "fsmonitor-daemon is watching '%s'\n"
 msgstr "fsmonitor-daemon 正在监视 '%s'\n"
 
-#: builtin/fsmonitor--daemon.c:104
+#: builtin/fsmonitor--daemon.c
 #, c-format
 msgid "fsmonitor-daemon is not watching '%s'\n"
 msgstr "fsmonitor-daemon 不在监视 '%s'\n"
 
-#: builtin/fsmonitor--daemon.c:170
+#: builtin/fsmonitor--daemon.c
 #, c-format
 msgid "could not create fsmonitor cookie '%s'"
 msgstr "无法创建 fsmonitor cookie '%s'"
 
-#: builtin/fsmonitor--daemon.c:753
+#: builtin/fsmonitor--daemon.c
 #, c-format
 msgid "fsmonitor: cookie_result '%d' != SEEN"
 msgstr "fsmonitor: cookie_result '%d' != SEEN"
 
-#: builtin/fsmonitor--daemon.c:1187
+#: builtin/fsmonitor--daemon.c
 #, c-format
 msgid "could not start IPC thread pool on '%s'"
 msgstr "无法在 '%s' 启动 IPC 线程池"
 
-#: builtin/fsmonitor--daemon.c:1199
+#: builtin/fsmonitor--daemon.c
 msgid "could not start fsmonitor listener thread"
 msgstr "无法启动 fsmonitor 监听线程"
 
-#: builtin/fsmonitor--daemon.c:1297
+#: builtin/fsmonitor--daemon.c
+msgid "could not start fsmonitor health thread"
+msgstr "无法启动 fsmonitor 健康检查线程"
+
+#: builtin/fsmonitor--daemon.c
 msgid "could not initialize listener thread"
 msgstr "无法初始化监听线程"
 
-#: builtin/fsmonitor--daemon.c:1328 builtin/fsmonitor--daemon.c:1383
+#: builtin/fsmonitor--daemon.c
+msgid "could not initialize health thread"
+msgstr "无法初始化健康检查线程"
+
+#: builtin/fsmonitor--daemon.c
+#, c-format
+msgid "could not cd home '%s'"
+msgstr "不能切换至家目录 '%s'"
+
+#: builtin/fsmonitor--daemon.c
 #, c-format
 msgid "fsmonitor--daemon is already running '%s'"
 msgstr "fsmonitor--daemon 已经在运行 '%s'"
 
-#: builtin/fsmonitor--daemon.c:1332
+#: builtin/fsmonitor--daemon.c
 #, c-format
 msgid "running fsmonitor-daemon in '%s'\n"
 msgstr "在 '%s' 中运行 fsmonitor-daemon\n"
 
-#: builtin/fsmonitor--daemon.c:1387
+#: builtin/fsmonitor--daemon.c
 #, c-format
 msgid "starting fsmonitor-daemon in '%s'\n"
 msgstr "在 '%s' 中启动 fsmonitor-daemon\n"
 
-#: builtin/fsmonitor--daemon.c:1413
+#: builtin/fsmonitor--daemon.c
 msgid "daemon failed to start"
 msgstr "守护进程无法启动"
 
-#: builtin/fsmonitor--daemon.c:1416
+#: builtin/fsmonitor--daemon.c
 msgid "daemon not online yet"
 msgstr "守护进程尚未在线"
 
-#: builtin/fsmonitor--daemon.c:1419
+#: builtin/fsmonitor--daemon.c
 msgid "daemon terminated"
 msgstr "守护进程被终结"
 
-#: builtin/fsmonitor--daemon.c:1429
+#: builtin/fsmonitor--daemon.c
 msgid "detach from console"
 msgstr "从控制台分离"
 
-#: builtin/fsmonitor--daemon.c:1432
+#: builtin/fsmonitor--daemon.c
 msgid "use <n> ipc worker threads"
 msgstr "使用 <n> 个 IPC 工作线程"
 
-#: builtin/fsmonitor--daemon.c:1435
+#: builtin/fsmonitor--daemon.c
 msgid "max seconds to wait for background daemon startup"
 msgstr "等待守护进程启动的最大秒数"
 
-#: builtin/fsmonitor--daemon.c:1449
+#: builtin/fsmonitor--daemon.c
 #, c-format
 msgid "invalid 'ipc-threads' value (%d)"
 msgstr "无效的 'ipc-threads' 值（%d）"
 
-#: builtin/fsmonitor--daemon.c:1464
+#: builtin/fsmonitor--daemon.c
 #, c-format
 msgid "Unhandled subcommand '%s'"
 msgstr "未处理的子命令 '%s'"
 
-#: builtin/fsmonitor--daemon.c:1477
+#: builtin/fsmonitor--daemon.c
 msgid "fsmonitor--daemon not supported on this platform"
 msgstr "fsmonitor--daemon 不支持本平台"
 
-#: builtin/gc.c:39
+#: builtin/gc.c
 msgid "git gc [<options>]"
 msgstr "git gc [<选项>]"
 
-#: builtin/gc.c:93
+#: builtin/gc.c
 #, c-format
 msgid "Failed to fstat %s: %s"
 msgstr "对 %s 调用 fstat 失败：%s"
 
-#: builtin/gc.c:129
+#: builtin/gc.c
 #, c-format
 msgid "failed to parse '%s' value '%s'"
 msgstr "无法解析 '%s' 值 '%s'"
 
-#: builtin/gc.c:488 builtin/init-db.c:57
+#: builtin/gc.c builtin/init-db.c
 #, c-format
 msgid "cannot stat '%s'"
 msgstr "不能对 '%s' 调用 stat"
 
-#: builtin/gc.c:504
+#: builtin/gc.c
 #, c-format
 msgid ""
 "The last gc run reported the following. Please correct the root cause\n"
@@ -16148,529 +7882,537 @@ msgstr ""
 "\n"
 "%s"
 
-#: builtin/gc.c:552
+#: builtin/gc.c
 msgid "prune unreferenced objects"
 msgstr "清除未引用的对象"
 
-#: builtin/gc.c:554
+#: builtin/gc.c
+msgid "pack unreferenced objects separately"
+msgstr "分开打包未引用的对象"
+
+#: builtin/gc.c
 msgid "be more thorough (increased runtime)"
 msgstr "更彻底（增加运行时间）"
 
-#: builtin/gc.c:555
+#: builtin/gc.c
 msgid "enable auto-gc mode"
 msgstr "启用自动垃圾回收模式"
 
-#: builtin/gc.c:558
+#: builtin/gc.c
 msgid "force running gc even if there may be another gc running"
 msgstr "强制执行 gc 即使另外一个 gc 正在执行"
 
-#: builtin/gc.c:561
+#: builtin/gc.c
 msgid "repack all other packs except the largest pack"
 msgstr "除了最大的包之外，对所有其它包文件重新打包"
 
-#: builtin/gc.c:577
+#: builtin/gc.c
 #, c-format
-msgid "failed to parse gc.logexpiry value %s"
-msgstr "无法解析 gc.logexpiry 的值 %s"
+msgid "failed to parse gc.logExpiry value %s"
+msgstr "无法解析 gc.logExpiry 的值 %s"
 
-#: builtin/gc.c:588
+#: builtin/gc.c
 #, c-format
 msgid "failed to parse prune expiry value %s"
 msgstr "无法解析清除期限值 %s"
 
-#: builtin/gc.c:608
+#: builtin/gc.c
 #, c-format
 msgid "Auto packing the repository in background for optimum performance.\n"
 msgstr "自动在后台执行仓库打包以求最佳性能。\n"
 
-#: builtin/gc.c:610
+#: builtin/gc.c
 #, c-format
 msgid "Auto packing the repository for optimum performance.\n"
 msgstr "自动打包仓库以求最佳性能。\n"
 
-#: builtin/gc.c:611
+#: builtin/gc.c
 #, c-format
 msgid "See \"git help gc\" for manual housekeeping.\n"
 msgstr "手工维护参见 \"git help gc\"。\n"
 
-#: builtin/gc.c:652
+#: builtin/gc.c
 #, c-format
 msgid ""
 "gc is already running on machine '%s' pid %<PRIuMAX> (use --force if not)"
 msgstr ""
 "已经有一个 gc 正运行在机器 '%s' pid %<PRIuMAX>（如果不是，使用 --force）"
 
-#: builtin/gc.c:707
+#: builtin/gc.c
 msgid ""
 "There are too many unreachable loose objects; run 'git prune' to remove them."
 msgstr "有太多不可达的松散对象，运行 'git prune' 删除它们。"
 
-#: builtin/gc.c:717
+#: builtin/gc.c
 msgid ""
 "git maintenance run [--auto] [--[no-]quiet] [--task=<task>] [--schedule]"
 msgstr ""
 "git maintenance run [--auto] [--[no-]quiet] [--task=<任务>] [--schedule]"
 
-#: builtin/gc.c:747
+#: builtin/gc.c
 msgid "--no-schedule is not allowed"
 msgstr "--no-schedule 不被允许"
 
-#: builtin/gc.c:752
+#: builtin/gc.c
 #, c-format
 msgid "unrecognized --schedule argument '%s'"
 msgstr "无法识别的 --schedule 参数 '%s'"
 
-#: builtin/gc.c:870
+#: builtin/gc.c
 msgid "failed to write commit-graph"
 msgstr "无法写入提交图"
 
-#: builtin/gc.c:906
+#: builtin/gc.c
 msgid "failed to prefetch remotes"
 msgstr "无法预先获取远程仓库"
 
-#: builtin/gc.c:1022
+#: builtin/gc.c
 msgid "failed to start 'git pack-objects' process"
 msgstr "无法启动 'git pack-objects' 进程"
 
-#: builtin/gc.c:1039
+#: builtin/gc.c
 msgid "failed to finish 'git pack-objects' process"
 msgstr "无法完成 'git pack-objects' 进程"
 
-#: builtin/gc.c:1090
+#: builtin/gc.c
 msgid "failed to write multi-pack-index"
 msgstr "无法写入多包索引"
 
-#: builtin/gc.c:1106
+#: builtin/gc.c
 msgid "'git multi-pack-index expire' failed"
 msgstr "'git multi-pack-index expire' 失败"
 
-#: builtin/gc.c:1165
+#: builtin/gc.c
 msgid "'git multi-pack-index repack' failed"
 msgstr "'git multi-pack-index repack' 失败"
 
-#: builtin/gc.c:1174
+#: builtin/gc.c
 msgid ""
 "skipping incremental-repack task because core.multiPackIndex is disabled"
 msgstr "跳过增量重新打包任务，因为 core.multiPackIndex 被禁用"
 
-#: builtin/gc.c:1278
+#: builtin/gc.c
 #, c-format
 msgid "lock file '%s' exists, skipping maintenance"
 msgstr "锁文件 '%s' 已存在，跳过维护"
 
-#: builtin/gc.c:1308
+#: builtin/gc.c
 #, c-format
 msgid "task '%s' failed"
 msgstr "任务 '%s' 失败"
 
-#: builtin/gc.c:1390
+#: builtin/gc.c
 #, c-format
 msgid "'%s' is not a valid task"
 msgstr "'%s' 不是一个有效的任务"
 
-#: builtin/gc.c:1395
+#: builtin/gc.c
 #, c-format
 msgid "task '%s' cannot be selected multiple times"
 msgstr "任务 '%s' 不能被多次选择"
 
-#: builtin/gc.c:1410
+#: builtin/gc.c
 msgid "run tasks based on the state of the repository"
 msgstr "基于仓库状态来运行任务"
 
-#: builtin/gc.c:1411
+#: builtin/gc.c
 msgid "frequency"
 msgstr "频率"
 
-#: builtin/gc.c:1412
+#: builtin/gc.c
 msgid "run tasks based on frequency"
 msgstr "基于频率运行任务"
 
-#: builtin/gc.c:1415
+#: builtin/gc.c
 msgid "do not report progress or other information over stderr"
 msgstr "不通过标准错误报告进度或其它信息"
 
-#: builtin/gc.c:1416
+#: builtin/gc.c
 msgid "task"
 msgstr "任务"
 
-#: builtin/gc.c:1417
+#: builtin/gc.c
 msgid "run a specific task"
 msgstr "运行一个特定的任务"
 
-#: builtin/gc.c:1434
+#: builtin/gc.c
 msgid "use at most one of --auto and --schedule=<frequency>"
 msgstr "最多使用 --auto 和 --schedule=<频率> 其中之一"
 
-#: builtin/gc.c:1477
+#: builtin/gc.c
 msgid "failed to run 'git config'"
 msgstr "无法运行 'git config'"
 
-#: builtin/gc.c:1629
+#: builtin/gc.c
 #, c-format
 msgid "failed to expand path '%s'"
 msgstr "无法扩展路径 '%s'"
 
-#: builtin/gc.c:1656 builtin/gc.c:1694
+#: builtin/gc.c
 msgid "failed to start launchctl"
 msgstr "无法启动 launchctl"
 
-#: builtin/gc.c:1769 builtin/gc.c:2237
+#: builtin/gc.c
 #, c-format
 msgid "failed to create directories for '%s'"
 msgstr "无法为 '%s' 创建目录"
 
-#: builtin/gc.c:1796
+#: builtin/gc.c
 #, c-format
 msgid "failed to bootstrap service %s"
 msgstr "无法引导服务 %s"
 
-#: builtin/gc.c:1889
+#: builtin/gc.c
 msgid "failed to create temp xml file"
 msgstr "无法创建临时 XML 文件"
 
-#: builtin/gc.c:1979
+#: builtin/gc.c
 msgid "failed to start schtasks"
 msgstr "无法启动计划任务"
 
-#: builtin/gc.c:2063
+#: builtin/gc.c
 msgid "failed to run 'crontab -l'; your system might not support 'cron'"
 msgstr "无法执行 'crontab -l'，您的系统可能不支持 'cron'"
 
-#: builtin/gc.c:2080
+#: builtin/gc.c
 msgid "failed to run 'crontab'; your system might not support 'cron'"
 msgstr "无法运行 'crontab'，您的系统可能不支持 'cron'"
 
-#: builtin/gc.c:2084
+#: builtin/gc.c
 msgid "failed to open stdin of 'crontab'"
 msgstr "无法打开 'crontab' 的标准输入"
 
-#: builtin/gc.c:2126
+#: builtin/gc.c
 msgid "'crontab' died"
 msgstr "'crontab' 终止"
 
-#: builtin/gc.c:2191
+#: builtin/gc.c
 msgid "failed to start systemctl"
 msgstr "无法启动 systemctl"
 
-#: builtin/gc.c:2201
+#: builtin/gc.c
 msgid "failed to run systemctl"
 msgstr "无法运行 systemctl"
 
-#: builtin/gc.c:2210 builtin/gc.c:2215 builtin/worktree.c:63
-#: builtin/worktree.c:1024
+#: builtin/gc.c builtin/worktree.c
 #, c-format
 msgid "failed to delete '%s'"
 msgstr "无法删除 '%s'"
 
-#: builtin/gc.c:2395
+#: builtin/gc.c rerere.c
+#, c-format
+msgid "failed to flush '%s'"
+msgstr "无法刷新 '%s'"
+
+#: builtin/gc.c
 #, c-format
 msgid "unrecognized --scheduler argument '%s'"
 msgstr "无法识别的 --scheduler 参数 '%s'"
 
-#: builtin/gc.c:2420
+#: builtin/gc.c
 msgid "neither systemd timers nor crontab are available"
 msgstr "systemd 和 crontab 的定时器都不可用"
 
-#: builtin/gc.c:2435
+#: builtin/gc.c
 #, c-format
 msgid "%s scheduler is not available"
 msgstr "%s 调度器不可用"
 
-#: builtin/gc.c:2449
+#: builtin/gc.c
 msgid "another process is scheduling background maintenance"
 msgstr "另外一个进程正运行于后台维护"
 
-#: builtin/gc.c:2471
+#: builtin/gc.c
 msgid "git maintenance start [--scheduler=<scheduler>]"
 msgstr "git maintenance start [--scheduler=<调度器>]"
 
-#: builtin/gc.c:2480
+#: builtin/gc.c
 msgid "scheduler"
 msgstr "调度器"
 
-#: builtin/gc.c:2481
+#: builtin/gc.c
 msgid "scheduler to trigger git maintenance run"
 msgstr "触发 git maintenance 执行的调度器"
 
-#: builtin/gc.c:2495
+#: builtin/gc.c
 msgid "failed to add repo to global config"
 msgstr "无法将仓库添加到全局配置"
 
-#: builtin/gc.c:2504
+#: builtin/gc.c
 msgid "git maintenance <subcommand> [<options>]"
 msgstr "git maintenance <子命令> [<选项>]"
 
-#: builtin/gc.c:2523
+#: builtin/gc.c
 #, c-format
 msgid "invalid subcommand: %s"
 msgstr "无效子命令：%s"
 
-#: builtin/grep.c:32
+#: builtin/grep.c
 msgid "git grep [<options>] [-e] <pattern> [<rev>...] [[--] <path>...]"
 msgstr "git grep [<选项>] [-e] <模式> [<版本>...] [[--] <路径>...]"
 
-#: builtin/grep.c:241
+#: builtin/grep.c
 #, c-format
 msgid "grep: failed to create thread: %s"
 msgstr "grep：无法创建线程：%s"
 
-#: builtin/grep.c:295
+#: builtin/grep.c
 #, c-format
 msgid "invalid number of threads specified (%d) for %s"
 msgstr "为 %2$s 设定的线程数 (%1$d) 无效"
 
+#. #-#-#-#-#  grep.c.po  #-#-#-#-#
 #. TRANSLATORS: %s is the configuration
 #. variable for tweaking threads, currently
 #. grep.threads
 #.
-#: builtin/grep.c:303 builtin/index-pack.c:1587 builtin/index-pack.c:1791
-#: builtin/pack-objects.c:3150
+#: builtin/grep.c builtin/index-pack.c builtin/pack-objects.c
 #, c-format
 msgid "no threads support, ignoring %s"
 msgstr "没有线程支持，忽略 %s"
 
-#: builtin/grep.c:490 builtin/grep.c:619 builtin/grep.c:659
+#: builtin/grep.c
 #, c-format
 msgid "unable to read tree (%s)"
 msgstr "无法读取树（%s）"
 
-#: builtin/grep.c:674
+#: builtin/grep.c
 #, c-format
 msgid "unable to grep from object of type %s"
 msgstr "无法抓取来自于 %s 类型的对象"
 
-#: builtin/grep.c:754
+#: builtin/grep.c
 #, c-format
 msgid "switch `%c' expects a numerical value"
 msgstr "开关 `%c' 期望一个数字值"
 
-#: builtin/grep.c:852
+#: builtin/grep.c
 msgid "search in index instead of in the work tree"
 msgstr "在索引区搜索而不是在工作区"
 
-#: builtin/grep.c:854
+#: builtin/grep.c
 msgid "find in contents not managed by git"
 msgstr "在未被 git 管理的内容中查找"
 
-#: builtin/grep.c:856
+#: builtin/grep.c
 msgid "search in both tracked and untracked files"
 msgstr "在跟踪和未跟踪的文件中搜索"
 
-#: builtin/grep.c:858
+#: builtin/grep.c
 msgid "ignore files specified via '.gitignore'"
 msgstr "忽略 '.gitignore' 包含的文件"
 
-#: builtin/grep.c:860
+#: builtin/grep.c
 msgid "recursively search in each submodule"
 msgstr "在每一个子模组中递归搜索"
 
-#: builtin/grep.c:863
+#: builtin/grep.c
 msgid "show non-matching lines"
 msgstr "显示未匹配的行"
 
-#: builtin/grep.c:865
+#: builtin/grep.c
 msgid "case insensitive matching"
 msgstr "不区分大小写匹配"
 
-#: builtin/grep.c:867
+#: builtin/grep.c
 msgid "match patterns only at word boundaries"
 msgstr "只在单词边界匹配模式"
 
-#: builtin/grep.c:869
+#: builtin/grep.c
 msgid "process binary files as text"
 msgstr "把二进制文件当做文本处理"
 
-#: builtin/grep.c:871
+#: builtin/grep.c
 msgid "don't match patterns in binary files"
 msgstr "不在二进制文件中匹配模式"
 
-#: builtin/grep.c:874
+#: builtin/grep.c
 msgid "process binary files with textconv filters"
 msgstr "用 textconv 过滤器处理二进制文件"
 
-#: builtin/grep.c:876
+#: builtin/grep.c
 msgid "search in subdirectories (default)"
 msgstr "在子目录中寻找（默认）"
 
-#: builtin/grep.c:878
+#: builtin/grep.c
 msgid "descend at most <depth> levels"
 msgstr "最多以指定的深度向下寻找"
 
-#: builtin/grep.c:882
+#: builtin/grep.c
 msgid "use extended POSIX regular expressions"
 msgstr "使用扩展的 POSIX 正则表达式"
 
-#: builtin/grep.c:885
+#: builtin/grep.c
 msgid "use basic POSIX regular expressions (default)"
 msgstr "使用基本的 POSIX 正则表达式（默认）"
 
-#: builtin/grep.c:888
+#: builtin/grep.c
 msgid "interpret patterns as fixed strings"
 msgstr "把模式解析为固定的字符串"
 
-#: builtin/grep.c:891
+#: builtin/grep.c
 msgid "use Perl-compatible regular expressions"
 msgstr "使用 Perl 兼容的正则表达式"
 
-#: builtin/grep.c:894
+#: builtin/grep.c
 msgid "show line numbers"
 msgstr "显示行号"
 
-#: builtin/grep.c:895
+#: builtin/grep.c
 msgid "show column number of first match"
 msgstr "显示第一个匹配的列号"
 
-#: builtin/grep.c:896
+#: builtin/grep.c
 msgid "don't show filenames"
 msgstr "不显示文件名"
 
-#: builtin/grep.c:897
+#: builtin/grep.c
 msgid "show filenames"
 msgstr "显示文件名"
 
-#: builtin/grep.c:899
+#: builtin/grep.c
 msgid "show filenames relative to top directory"
 msgstr "显示相对于顶级目录的文件名"
 
-#: builtin/grep.c:901
+#: builtin/grep.c
 msgid "show only filenames instead of matching lines"
 msgstr "只显示文件名而不显示匹配的行"
 
-#: builtin/grep.c:903
+#: builtin/grep.c
 msgid "synonym for --files-with-matches"
 msgstr "和 --files-with-matches 同义"
 
-#: builtin/grep.c:906
+#: builtin/grep.c
 msgid "show only the names of files without match"
 msgstr "只显示未匹配的文件名"
 
-#: builtin/grep.c:908
+#: builtin/grep.c
 msgid "print NUL after filenames"
 msgstr "在文件名后输出 NUL 字符"
 
-#: builtin/grep.c:911
+#: builtin/grep.c
 msgid "show only matching parts of a line"
 msgstr "只显示行中的匹配的部分"
 
-#: builtin/grep.c:913
+#: builtin/grep.c
 msgid "show the number of matches instead of matching lines"
 msgstr "显示总匹配行数，而不显示匹配的行"
 
-#: builtin/grep.c:914
+#: builtin/grep.c
 msgid "highlight matches"
 msgstr "高亮显示匹配项"
 
-#: builtin/grep.c:916
+#: builtin/grep.c
 msgid "print empty line between matches from different files"
 msgstr "在不同文件的匹配项之间打印空行"
 
-#: builtin/grep.c:918
+#: builtin/grep.c
 msgid "show filename only once above matches from same file"
 msgstr "只在同一文件的匹配项的上面显示一次文件名"
 
-#: builtin/grep.c:921
+#: builtin/grep.c
 msgid "show <n> context lines before and after matches"
 msgstr "显示匹配项前后的 <n> 行上下文"
 
-#: builtin/grep.c:924
+#: builtin/grep.c
 msgid "show <n> context lines before matches"
 msgstr "显示匹配项前 <n> 行上下文"
 
-#: builtin/grep.c:926
+#: builtin/grep.c
 msgid "show <n> context lines after matches"
 msgstr "显示匹配项后 <n> 行上下文"
 
-#: builtin/grep.c:928
+#: builtin/grep.c
 msgid "use <n> worker threads"
 msgstr "使用 <n> 个工作线程"
 
-#: builtin/grep.c:929
+#: builtin/grep.c
 msgid "shortcut for -C NUM"
 msgstr "快捷键 -C 数字"
 
-#: builtin/grep.c:932
+#: builtin/grep.c
 msgid "show a line with the function name before matches"
 msgstr "在匹配的前面显示一行函数名"
 
-#: builtin/grep.c:934
+#: builtin/grep.c
 msgid "show the surrounding function"
 msgstr "显示所在函数的前后内容"
 
-#: builtin/grep.c:937
+#: builtin/grep.c
 msgid "read patterns from file"
 msgstr "从文件读取模式"
 
-#: builtin/grep.c:939
+#: builtin/grep.c
 msgid "match <pattern>"
 msgstr "匹配 <模式>"
 
-#: builtin/grep.c:941
+#: builtin/grep.c
 msgid "combine patterns specified with -e"
 msgstr "组合用 -e 参数设定的模式"
 
-#: builtin/grep.c:953
+#: builtin/grep.c
 msgid "indicate hit with exit status without output"
 msgstr "不输出，而用退出码标识命中状态"
 
-#: builtin/grep.c:955
+#: builtin/grep.c
 msgid "show only matches from files that match all patterns"
 msgstr "只显示匹配所有模式的文件中的匹配"
 
-#: builtin/grep.c:958
+#: builtin/grep.c
 msgid "pager"
 msgstr "分页"
 
-#: builtin/grep.c:958
+#: builtin/grep.c
 msgid "show matching files in the pager"
 msgstr "分页显示匹配的文件"
 
-#: builtin/grep.c:962
+#: builtin/grep.c
 msgid "allow calling of grep(1) (ignored by this build)"
 msgstr "允许调用 grep(1)（本次构建忽略）"
 
-#: builtin/grep.c:1028
+#: builtin/grep.c
 msgid "no pattern given"
 msgstr "未提供匹配模式"
 
-#: builtin/grep.c:1064
+#: builtin/grep.c
 msgid "--no-index or --untracked cannot be used with revs"
 msgstr "--no-index 或 --untracked 不能和版本同时使用"
 
-#: builtin/grep.c:1072
+#: builtin/grep.c
 #, c-format
 msgid "unable to resolve revision: %s"
 msgstr "不能解析版本：%s"
 
-#: builtin/grep.c:1102
+#: builtin/grep.c
 msgid "--untracked not supported with --recurse-submodules"
 msgstr "--untracked 不支持和 --recurse-submodules 共用"
 
-#: builtin/grep.c:1106
+#: builtin/grep.c
 msgid "invalid option combination, ignoring --threads"
 msgstr "无效的选项组合，忽略 --threads"
 
-#: builtin/grep.c:1109 builtin/pack-objects.c:4084
+#: builtin/grep.c builtin/pack-objects.c
 msgid "no threads support, ignoring --threads"
 msgstr "没有线程支持，忽略 --threads"
 
-#: builtin/grep.c:1112 builtin/index-pack.c:1584 builtin/pack-objects.c:3147
+#: builtin/grep.c builtin/index-pack.c builtin/pack-objects.c
 #, c-format
 msgid "invalid number of threads specified (%d)"
 msgstr "指定的线程数无效（%d）"
 
-#: builtin/grep.c:1146
+#: builtin/grep.c
 msgid "--open-files-in-pager only works on the worktree"
 msgstr "--open-files-in-pager 仅用于工作区"
 
-#: builtin/grep.c:1179
+#: builtin/grep.c
 msgid "--[no-]exclude-standard cannot be used for tracked contents"
 msgstr "--[no-]exclude-standard 不能用于已跟踪内容"
 
-#: builtin/grep.c:1187
+#: builtin/grep.c
 msgid "both --cached and trees are given"
 msgstr "同时给出了 --cached 和树对象"
 
-#: builtin/hash-object.c:83
+#: builtin/hash-object.c
 msgid ""
 "git hash-object [-t <type>] [-w] [--path=<file> | --no-filters] [--stdin] "
 "[--] <file>..."
@@ -16678,99 +8420,99 @@ msgstr ""
 "git hash-object [-t <类型>] [-w] [--path=<文件> | --no-filters] [--stdin] "
 "[--] <文件>..."
 
-#: builtin/hash-object.c:97
+#: builtin/hash-object.c
 msgid "object type"
 msgstr "对象类型"
 
-#: builtin/hash-object.c:98
+#: builtin/hash-object.c
 msgid "write the object into the object database"
 msgstr "将对象写入对象数据库"
 
-#: builtin/hash-object.c:100
+#: builtin/hash-object.c
 msgid "read the object from stdin"
 msgstr "从标准输入读取对象"
 
-#: builtin/hash-object.c:102
+#: builtin/hash-object.c
 msgid "store file as is without filters"
 msgstr "原样存储文件不使用过滤器"
 
-#: builtin/hash-object.c:103
+#: builtin/hash-object.c
 msgid ""
 "just hash any random garbage to create corrupt objects for debugging Git"
 msgstr "允许对任意随机垃圾数据做散列来创建损坏的对象以便调试 Git"
 
-#: builtin/hash-object.c:104
+#: builtin/hash-object.c
 msgid "process file as it were from this path"
 msgstr "处理文件并假设其来自于此路径"
 
-#: builtin/help.c:57
+#: builtin/help.c
 msgid "print all available commands"
 msgstr "打印所有可用的命令"
 
-#: builtin/help.c:60
+#: builtin/help.c
 msgid "show external commands in --all"
 msgstr "在 --all 中显示外部命令"
 
-#: builtin/help.c:61
+#: builtin/help.c
 msgid "show aliases in --all"
 msgstr "在 --all 中显示别名"
 
-#: builtin/help.c:62
+#: builtin/help.c
 msgid "exclude guides"
 msgstr "排除向导"
 
-#: builtin/help.c:63
+#: builtin/help.c
 msgid "show man page"
 msgstr "显示 man 手册"
 
-#: builtin/help.c:64
+#: builtin/help.c
 msgid "show manual in web browser"
 msgstr "在 web 浏览器中显示手册"
 
-#: builtin/help.c:66
+#: builtin/help.c
 msgid "show info page"
 msgstr "显示 info 手册"
 
-#: builtin/help.c:68
+#: builtin/help.c
 msgid "print command description"
 msgstr "打印命令描述"
 
-#: builtin/help.c:70
+#: builtin/help.c
 msgid "print list of useful guides"
 msgstr "显示有用的指南列表"
 
-#: builtin/help.c:72
+#: builtin/help.c
 msgid "print all configuration variable names"
 msgstr "打印所有配置变量名称"
 
-#: builtin/help.c:84
+#: builtin/help.c
 msgid "git help [[-i|--info] [-m|--man] [-w|--web]] [<command>]"
 msgstr "git help [[-i|--info] [-m|--man] [-w|--web]] [<命令>]"
 
-#: builtin/help.c:201
+#: builtin/help.c
 #, c-format
 msgid "unrecognized help format '%s'"
 msgstr "未能识别的帮助格式 '%s'"
 
-#: builtin/help.c:227
+#: builtin/help.c
 msgid "Failed to start emacsclient."
 msgstr "无法启动 emacsclient。"
 
-#: builtin/help.c:240
+#: builtin/help.c
 msgid "Failed to parse emacsclient version."
 msgstr "无法解析 emacsclient 版本。"
 
-#: builtin/help.c:248
+#: builtin/help.c
 #, c-format
 msgid "emacsclient version '%d' too old (< 22)."
 msgstr "emacsclient 版本 '%d' 太老（< 22）。"
 
-#: builtin/help.c:266 builtin/help.c:288 builtin/help.c:298 builtin/help.c:306
+#: builtin/help.c
 #, c-format
 msgid "failed to exec '%s'"
 msgstr "无法执行 '%s'"
 
-#: builtin/help.c:344
+#: builtin/help.c
 #, c-format
 msgid ""
 "'%s': path for unsupported man viewer.\n"
@@ -16779,7 +8521,7 @@ msgstr ""
 "'%s'：不支持的 man 手册查看器的路径。\n"
 "请使用 'man.<工具>.cmd'。"
 
-#: builtin/help.c:356
+#: builtin/help.c
 #, c-format
 msgid ""
 "'%s': cmd for supported man viewer.\n"
@@ -16788,422 +8530,419 @@ msgstr ""
 "'%s': 支持的 man 手册查看器命令。\n"
 "请使用 'man.<工具>.path'。"
 
-#: builtin/help.c:471
+#: builtin/help.c
 #, c-format
 msgid "'%s': unknown man viewer."
 msgstr "'%s'：未知的 man 查看器。"
 
-#: builtin/help.c:487
+#: builtin/help.c
 msgid "no man viewer handled the request"
 msgstr "没有 man 查看器处理此请求"
 
-#: builtin/help.c:494
+#: builtin/help.c
 msgid "no info viewer handled the request"
 msgstr "没有 info 查看器处理此请求"
 
-#: builtin/help.c:555 builtin/help.c:566 git.c:348
+#: builtin/help.c git.c
 #, c-format
 msgid "'%s' is aliased to '%s'"
 msgstr "'%s' 是 '%s' 的别名"
 
-#: builtin/help.c:569 git.c:380
+#: builtin/help.c git.c
 #, c-format
 msgid "bad alias.%s string: %s"
 msgstr "坏的 alias.%s 字符串：%s"
 
-#: builtin/help.c:611
+#: builtin/help.c
 #, c-format
 msgid "the '%s' option doesn't take any non-option arguments"
 msgstr "'%s' 选项不带任何非选项参数"
 
-#: builtin/help.c:631
+#: builtin/help.c
 msgid ""
 "the '--no-[external-commands|aliases]' options can only be used with '--all'"
 msgstr "'--no-[external-commands|aliases]' 选项只能和 '--all' 一起使用"
 
-#: builtin/help.c:643 builtin/help.c:671
+#: builtin/help.c
 #, c-format
 msgid "usage: %s%s"
 msgstr "用法：%s%s"
 
-#: builtin/help.c:666
+#: builtin/help.c
 msgid "'git help config' for more information"
 msgstr "'git help config' 获取更多信息"
 
-#: builtin/hook.c:10
+#: builtin/hook.c
 msgid "git hook run [--ignore-missing] <hook-name> [-- <hook-args>]"
 msgstr "git hook run [--ignore-missing] <钩子名称> [-- <钩子参数>]"
 
-#: builtin/hook.c:30
+#: builtin/hook.c
 msgid "silently ignore missing requested <hook-name>"
 msgstr "静默地忽略缺失的 <钩子名称>"
 
-#: builtin/index-pack.c:221
+#: builtin/index-pack.c
 #, c-format
 msgid "object type mismatch at %s"
 msgstr "%s 的对象类型不匹配"
 
-#: builtin/index-pack.c:241
+#: builtin/index-pack.c
 #, c-format
 msgid "did not receive expected object %s"
 msgstr "未能获取预期的对象 %s"
 
-#: builtin/index-pack.c:244
+#: builtin/index-pack.c
 #, c-format
 msgid "object %s: expected type %s, found %s"
 msgstr "对象 %s：应为类型 %s，却是 %s"
 
-#: builtin/index-pack.c:294
+#: builtin/index-pack.c
 #, c-format
 msgid "cannot fill %d byte"
 msgid_plural "cannot fill %d bytes"
 msgstr[0] "无法填充 %d 字节"
 msgstr[1] "无法填充 %d 字节"
 
-#: builtin/index-pack.c:304
+#: builtin/index-pack.c
 msgid "early EOF"
 msgstr "过早的文件结束符（EOF）"
 
-#: builtin/index-pack.c:305
+#: builtin/index-pack.c
 msgid "read error on input"
 msgstr "输入上的读错误"
 
-#: builtin/index-pack.c:317
+#: builtin/index-pack.c
 msgid "used more bytes than were available"
 msgstr "用掉了超过可用的字节"
 
-#: builtin/index-pack.c:324 builtin/pack-objects.c:754
+#: builtin/index-pack.c builtin/pack-objects.c
 msgid "pack too large for current definition of off_t"
 msgstr "包太大超过了当前 off_t 的定义"
 
-#: builtin/index-pack.c:329
+#: builtin/index-pack.c
 #, c-format
 msgid "pack exceeds maximum allowed size (%s)"
 msgstr "包超过了最大允许大小（%s）"
 
-#: builtin/index-pack.c:362
+#: builtin/index-pack.c
 msgid "pack signature mismatch"
 msgstr "包签名不匹配"
 
-#: builtin/index-pack.c:364
+#: builtin/index-pack.c
 #, c-format
 msgid "pack version %<PRIu32> unsupported"
 msgstr "不支持包版本 %<PRIu32>"
 
-#: builtin/index-pack.c:380
+#: builtin/index-pack.c
 #, c-format
 msgid "pack has bad object at offset %<PRIuMAX>: %s"
 msgstr "包中有错误的对象位于偏移量 %<PRIuMAX>：%s"
 
-#: builtin/index-pack.c:485
+#: builtin/index-pack.c
 #, c-format
 msgid "inflate returned %d"
 msgstr "解压缩返回 %d"
 
-#: builtin/index-pack.c:534
+#: builtin/index-pack.c
 msgid "offset value overflow for delta base object"
 msgstr "偏移值覆盖了 delta 基准对象"
 
-#: builtin/index-pack.c:542
+#: builtin/index-pack.c
 msgid "delta base offset is out of bound"
 msgstr "delta 基准偏移越界"
 
-#: builtin/index-pack.c:550
+#: builtin/index-pack.c
 #, c-format
 msgid "unknown object type %d"
 msgstr "未知对象类型 %d"
 
-#: builtin/index-pack.c:581
+#: builtin/index-pack.c
 msgid "cannot pread pack file"
 msgstr "无法读取包文件"
 
-#: builtin/index-pack.c:583
+#: builtin/index-pack.c
 #, 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:609
+#: builtin/index-pack.c
 msgid "serious inflate inconsistency"
 msgstr "解压缩严重的不一致"
 
-#: builtin/index-pack.c:754 builtin/index-pack.c:760 builtin/index-pack.c:784
-#: builtin/index-pack.c:823 builtin/index-pack.c:832
+#: builtin/index-pack.c
 #, c-format
 msgid "SHA1 COLLISION FOUND WITH %s !"
 msgstr "发现 %s 出现 SHA1 冲突！"
 
-#: builtin/index-pack.c:757 builtin/pack-objects.c:290
-#: builtin/pack-objects.c:350 builtin/pack-objects.c:456
+#: builtin/index-pack.c builtin/pack-objects.c
 #, c-format
 msgid "unable to read %s"
 msgstr "不能读 %s"
 
-#: builtin/index-pack.c:821
+#: builtin/index-pack.c
 #, c-format
 msgid "cannot read existing object info %s"
 msgstr "不能读取现存对象信息 %s"
 
-#: builtin/index-pack.c:829
+#: builtin/index-pack.c
 #, c-format
 msgid "cannot read existing object %s"
 msgstr "不能读取现存对象 %s"
 
-#: builtin/index-pack.c:843
+#: builtin/index-pack.c
 #, c-format
 msgid "invalid blob object %s"
 msgstr "无效的数据对象 %s"
 
-#: builtin/index-pack.c:846 builtin/index-pack.c:865
+#: builtin/index-pack.c
 msgid "fsck error in packed object"
 msgstr "对打包对象 fsck 检查出错"
 
-#: builtin/index-pack.c:867
+#: builtin/index-pack.c
 #, c-format
 msgid "Not all child objects of %s are reachable"
 msgstr "%s 的所有子对象并非都可达"
 
-#: builtin/index-pack.c:928 builtin/index-pack.c:975
+#: builtin/index-pack.c
 msgid "failed to apply delta"
 msgstr "无法应用 delta"
 
-#: builtin/index-pack.c:1161
+#: builtin/index-pack.c
 msgid "Receiving objects"
 msgstr "接收对象中"
 
-#: builtin/index-pack.c:1161
+#: builtin/index-pack.c
 msgid "Indexing objects"
 msgstr "索引对象中"
 
-#: builtin/index-pack.c:1195
+#: builtin/index-pack.c
 msgid "pack is corrupted (SHA1 mismatch)"
 msgstr "包冲突（SHA1 不匹配）"
 
-#: builtin/index-pack.c:1200
+#: builtin/index-pack.c
 msgid "cannot fstat packfile"
 msgstr "不能对包文件调用 fstat"
 
-#: builtin/index-pack.c:1203
+#: builtin/index-pack.c
 msgid "pack has junk at the end"
 msgstr "包的结尾有垃圾数据"
 
-#: builtin/index-pack.c:1215
+#: builtin/index-pack.c
 msgid "confusion beyond insanity in parse_pack_objects()"
 msgstr "parse_pack_objects() 中遇到不可理喻的问题"
 
-#: builtin/index-pack.c:1238
+#: builtin/index-pack.c
 msgid "Resolving deltas"
 msgstr "处理 delta 中"
 
-#: builtin/index-pack.c:1249 builtin/pack-objects.c:2913
+#: builtin/index-pack.c builtin/pack-objects.c
 #, c-format
 msgid "unable to create thread: %s"
 msgstr "不能创建线程：%s"
 
-#: builtin/index-pack.c:1282
+#: builtin/index-pack.c
 msgid "confusion beyond insanity"
 msgstr "不可理喻"
 
-#: builtin/index-pack.c:1288
+#: builtin/index-pack.c
 #, 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:1300
+#: builtin/index-pack.c
 #, c-format
 msgid "Unexpected tail checksum for %s (disk corruption?)"
 msgstr "对 %s 的尾部校验出现意外（磁盘损坏？）"
 
-#: builtin/index-pack.c:1304
+#: builtin/index-pack.c
 #, 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:1328
+#: builtin/index-pack.c
 #, c-format
 msgid "unable to deflate appended object (%d)"
 msgstr "不能压缩附加对象（%d）"
 
-#: builtin/index-pack.c:1423
+#: builtin/index-pack.c
 #, c-format
 msgid "local object %s is corrupt"
 msgstr "本地对象 %s 已损坏"
 
-#: builtin/index-pack.c:1445
+#: builtin/index-pack.c
 #, c-format
 msgid "packfile name '%s' does not end with '.%s'"
 msgstr "包文件名 '%s' 没有以 '.%s' 结尾"
 
-#: builtin/index-pack.c:1469
+#: builtin/index-pack.c
 #, c-format
 msgid "cannot write %s file '%s'"
 msgstr "无法写入 %s 文件 '%s'"
 
-#: builtin/index-pack.c:1477
+#: builtin/index-pack.c
 #, c-format
 msgid "cannot close written %s file '%s'"
 msgstr "无法关闭已写入的 %s 文件 '%s'"
 
-#: builtin/index-pack.c:1494
+#: builtin/index-pack.c
 #, c-format
 msgid "unable to rename temporary '*.%s' file to '%s'"
 msgstr "不能重命名临时文件 '*.%s' 为 '%s'"
 
-#: builtin/index-pack.c:1519
+#: builtin/index-pack.c
 msgid "error while closing pack file"
 msgstr "关闭包文件时出错"
 
-#: builtin/index-pack.c:1578 builtin/pack-objects.c:3158
+#: builtin/index-pack.c builtin/pack-objects.c
 #, c-format
-msgid "bad pack.indexversion=%<PRIu32>"
-msgstr "坏的 pack.indexversion=%<PRIu32>"
+msgid "bad pack.indexVersion=%<PRIu32>"
+msgstr "坏的 pack.indexVersion=%<PRIu32>"
 
-#: builtin/index-pack.c:1648
+#: builtin/index-pack.c
 #, c-format
 msgid "Cannot open existing pack file '%s'"
 msgstr "无法打开现存包文件 '%s'"
 
-#: builtin/index-pack.c:1650
+#: builtin/index-pack.c
 #, c-format
 msgid "Cannot open existing pack idx file for '%s'"
 msgstr "无法为 %s 打开包索引文件"
 
-#: builtin/index-pack.c:1698
+#: builtin/index-pack.c
 #, 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:1705
+#: builtin/index-pack.c
 #, 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
 msgid "Cannot come back to cwd"
 msgstr "无法返回当前工作目录"
 
-#: builtin/index-pack.c:1802 builtin/index-pack.c:1805
-#: builtin/index-pack.c:1825 builtin/index-pack.c:1829
+#: builtin/index-pack.c
 #, c-format
 msgid "bad %s"
 msgstr "错误选项 %s"
 
-#: builtin/index-pack.c:1835 builtin/init-db.c:379 builtin/init-db.c:614
+#: builtin/index-pack.c builtin/init-db.c
 #, c-format
 msgid "unknown hash algorithm '%s'"
 msgstr "未知的哈希算法 '%s'"
 
-#: builtin/index-pack.c:1856
+#: builtin/index-pack.c
 msgid "--stdin requires a git repository"
 msgstr "--stdin 需要 git 仓库"
 
-#: builtin/index-pack.c:1873
+#: builtin/index-pack.c
 msgid "--verify with no packfile name given"
 msgstr "--verify 没有提供包文件名参数"
 
-#: builtin/index-pack.c:1939 builtin/unpack-objects.c:584
+#: builtin/index-pack.c builtin/unpack-objects.c
 msgid "fsck error in pack objects"
 msgstr "在打包对象中 fsck 检查出错"
 
-#: builtin/init-db.c:63
+#: builtin/init-db.c
 #, c-format
 msgid "cannot stat template '%s'"
 msgstr "不能对模版 '%s' 调用 stat"
 
-#: builtin/init-db.c:68
+#: builtin/init-db.c
 #, c-format
 msgid "cannot opendir '%s'"
 msgstr "不能打开目录 '%s'"
 
-#: builtin/init-db.c:80
+#: builtin/init-db.c
 #, c-format
 msgid "cannot readlink '%s'"
 msgstr "不能读取链接 '%s'"
 
-#: builtin/init-db.c:82
+#: builtin/init-db.c
 #, c-format
 msgid "cannot symlink '%s' '%s'"
 msgstr "不能自 '%s' 到 '%s' 创建符号链接"
 
-#: builtin/init-db.c:88
+#: builtin/init-db.c
 #, c-format
 msgid "cannot copy '%s' to '%s'"
 msgstr "不能拷贝 '%s' 至 '%s'"
 
-#: builtin/init-db.c:92
+#: builtin/init-db.c
 #, c-format
 msgid "ignoring template %s"
 msgstr "忽略模版 %s"
 
-#: builtin/init-db.c:123
+#: builtin/init-db.c
 #, c-format
 msgid "templates not found in %s"
 msgstr "没有在 %s 中找到模版"
 
-#: builtin/init-db.c:138
+#: builtin/init-db.c
 #, c-format
 msgid "not copying templates from '%s': %s"
 msgstr "没有从 '%s' 复制模版：%s"
 
-#: builtin/init-db.c:263
+#: builtin/init-db.c
 #, c-format
 msgid "invalid initial branch name: '%s'"
 msgstr "无效的初始分支名：'%s'"
 
-#: builtin/init-db.c:354
+#: builtin/init-db.c
 #, c-format
 msgid "unable to handle file type %d"
 msgstr "不能处理 %d 类型的文件"
 
-#: builtin/init-db.c:357
+#: builtin/init-db.c
 #, c-format
 msgid "unable to move %s to %s"
 msgstr "不能移动 %s 至 %s"
 
-#: builtin/init-db.c:373
+#: builtin/init-db.c
 msgid "attempt to reinitialize repository with different hash"
 msgstr "尝试用不同的哈希算法重新初始化仓库"
 
-#: builtin/init-db.c:397 builtin/init-db.c:400
+#: builtin/init-db.c
 #, c-format
 msgid "%s already exists"
 msgstr "%s 已经存在"
 
-#: builtin/init-db.c:432
+#: builtin/init-db.c
 #, c-format
 msgid "re-init: ignored --initial-branch=%s"
 msgstr "re-init：已忽略 --initial-branch=%s"
 
-#: builtin/init-db.c:463
+#: builtin/init-db.c
 #, c-format
 msgid "Reinitialized existing shared Git repository in %s%s\n"
 msgstr "重新初始化已存在的共享 Git 仓库于 %s%s\n"
 
-#: builtin/init-db.c:464
+#: builtin/init-db.c
 #, c-format
 msgid "Reinitialized existing Git repository in %s%s\n"
 msgstr "已重新初始化已存在的 Git 仓库于 %s%s\n"
 
-#: builtin/init-db.c:468
+#: builtin/init-db.c
 #, c-format
 msgid "Initialized empty shared Git repository in %s%s\n"
 msgstr "已初始化空的共享 Git 仓库于 %s%s\n"
 
-#: builtin/init-db.c:469
+#: builtin/init-db.c
 #, c-format
 msgid "Initialized empty Git repository in %s%s\n"
 msgstr "已初始化空的 Git 仓库于 %s%s\n"
 
-#: builtin/init-db.c:518
+#: builtin/init-db.c
 msgid ""
 "git init [-q | --quiet] [--bare] [--template=<template-directory>] [--"
 "shared[=<permissions>]] [<directory>]"
@@ -17211,53 +8950,53 @@ msgstr ""
 "git init [-q | --quiet] [--bare] [--template=<模板目录>] [--shared[=<权限>]] "
 "[<目录>]"
 
-#: builtin/init-db.c:544
+#: builtin/init-db.c
 msgid "permissions"
 msgstr "权限"
 
-#: builtin/init-db.c:545
+#: builtin/init-db.c
 msgid "specify that the git repository is to be shared amongst several users"
 msgstr "指定 git 仓库是多个用户之间共享的"
 
-#: builtin/init-db.c:551
+#: builtin/init-db.c
 msgid "override the name of the initial branch"
 msgstr "覆盖初始分支名称"
 
-#: builtin/init-db.c:552 builtin/verify-pack.c:74
+#: builtin/init-db.c builtin/verify-pack.c
 msgid "hash"
 msgstr "hash"
 
-#: builtin/init-db.c:553 builtin/show-index.c:22 builtin/verify-pack.c:75
+#: builtin/init-db.c builtin/show-index.c builtin/verify-pack.c
 msgid "specify the hash algorithm to use"
 msgstr "指定要使用的哈希算法"
 
-#: builtin/init-db.c:591 builtin/init-db.c:596
+#: builtin/init-db.c
 #, c-format
 msgid "cannot mkdir %s"
 msgstr "不能创建目录 %s"
 
-#: builtin/init-db.c:600 builtin/init-db.c:655
+#: builtin/init-db.c
 #, c-format
 msgid "cannot chdir to %s"
 msgstr "不能切换目录到 %s"
 
-#: builtin/init-db.c:627
+#: builtin/init-db.c
 #, c-format
 msgid ""
 "%s (or --work-tree=<directory>) not allowed without specifying %s (or --git-"
 "dir=<directory>)"
 msgstr "不允许 %s（或 --work-tree=<目录>）而没有指定 %s（或 --git-dir=<目录>）"
 
-#: builtin/init-db.c:679
+#: builtin/init-db.c
 #, c-format
 msgid "Cannot access work tree '%s'"
 msgstr "不能访问工作区 '%s'"
 
-#: builtin/init-db.c:684
+#: builtin/init-db.c
 msgid "--separate-git-dir incompatible with bare repository"
 msgstr "--separate-git-dir 不能用于纯仓库"
 
-#: builtin/interpret-trailers.c:16
+#: builtin/interpret-trailers.c
 msgid ""
 "git interpret-trailers [--in-place] [--trim-empty] [(--trailer "
 "<token>[(=|:)<value>])...] [<file>...]"
@@ -17265,184 +9004,192 @@ msgstr ""
 "git interpret-trailers [--in-place] [--trim-empty] [(--trailer <键>[(=|:)<值"
 ">])...] [<文件>...]"
 
-#: builtin/interpret-trailers.c:95
+#: builtin/interpret-trailers.c
 msgid "edit files in place"
 msgstr "在原位编辑文件"
 
-#: builtin/interpret-trailers.c:96
+#: builtin/interpret-trailers.c
 msgid "trim empty trailers"
 msgstr "删除空的尾注"
 
-#: builtin/interpret-trailers.c:99
+#: builtin/interpret-trailers.c
 msgid "where to place the new trailer"
 msgstr "在哪里放置新的尾注"
 
-#: builtin/interpret-trailers.c:101
+#: builtin/interpret-trailers.c
 msgid "action if trailer already exists"
 msgstr "当尾注已经存在时所采取的动作"
 
-#: builtin/interpret-trailers.c:103
+#: builtin/interpret-trailers.c
 msgid "action if trailer is missing"
 msgstr "当尾注缺失时所采取的动作"
 
-#: builtin/interpret-trailers.c:105
+#: builtin/interpret-trailers.c
 msgid "output only the trailers"
 msgstr "只输出尾注"
 
-#: builtin/interpret-trailers.c:106
+#: builtin/interpret-trailers.c
 msgid "do not apply config rules"
 msgstr "不要应用配置规则"
 
-#: builtin/interpret-trailers.c:107
+#: builtin/interpret-trailers.c
 msgid "join whitespace-continued values"
 msgstr "连接空白折行的值"
 
-#: builtin/interpret-trailers.c:108
+#: builtin/interpret-trailers.c
 msgid "set parsing options"
 msgstr "设置解析选项"
 
-#: builtin/interpret-trailers.c:110
+#: builtin/interpret-trailers.c
 msgid "do not treat --- specially"
 msgstr "不要对 --- 特殊处理"
 
-#: builtin/interpret-trailers.c:112
+#: builtin/interpret-trailers.c
 msgid "trailer(s) to add"
 msgstr "要添加的尾注"
 
-#: builtin/interpret-trailers.c:123
+#: builtin/interpret-trailers.c
 msgid "--trailer with --only-input does not make sense"
 msgstr "--trailer 和 --only-input 同时使用没有意义"
 
-#: builtin/interpret-trailers.c:133
+#: builtin/interpret-trailers.c
 msgid "no input file given for in-place editing"
 msgstr "没有给出要原位编辑的文件"
 
-#: builtin/log.c:60
+#: builtin/log.c
 msgid "git log [<options>] [<revision-range>] [[--] <path>...]"
 msgstr "git log [<选项>] [<版本范围>] [[--] <路径>...]"
 
-#: builtin/log.c:61
+#: builtin/log.c
 msgid "git show [<options>] <object>..."
 msgstr "git show [<选项>] <对象>..."
 
-#: builtin/log.c:114
+#: builtin/log.c
 #, c-format
 msgid "invalid --decorate option: %s"
 msgstr "无效的 --decorate 选项：%s"
 
-#: builtin/log.c:181
+#: builtin/log.c diff.c
+msgid "suppress diff output"
+msgstr "不显示差异输出"
+
+#: builtin/log.c
 msgid "show source"
 msgstr "显示源"
 
-#: builtin/log.c:182
+#: builtin/log.c
 msgid "use mail map file"
 msgstr "使用邮件映射文件"
 
-#: builtin/log.c:185
+#: builtin/log.c
 msgid "only decorate refs that match <pattern>"
 msgstr "只修饰与 <模式> 匹配的引用"
 
-#: builtin/log.c:187
+#: builtin/log.c
 msgid "do not decorate refs that match <pattern>"
 msgstr "不修饰和 <模式> 匹配的引用"
 
-#: builtin/log.c:188
+#: builtin/log.c
 msgid "decorate options"
 msgstr "修饰选项"
 
-#: builtin/log.c:191
+#: builtin/log.c
 msgid ""
 "trace the evolution of line range <start>,<end> or function :<funcname> in "
 "<file>"
 msgstr "跟踪 <文件> 中 <开始>,<结束> 范围内的行或函数 :<函数名> 的演变"
 
-#: builtin/log.c:214
+#: builtin/log.c builtin/shortlog.c bundle.c
+#, c-format
+msgid "unrecognized argument: %s"
+msgstr "未能识别的参数：%s"
+
+#: builtin/log.c
 msgid "-L<range>:<file> cannot be used with pathspec"
 msgstr "-L<范围>:<文件> 不能和路径表达式共用"
 
-#: builtin/log.c:322
+#: builtin/log.c
 #, c-format
 msgid "Final output: %d %s\n"
 msgstr "最终输出：%d %s\n"
 
-#: builtin/log.c:429
+#: builtin/log.c
 msgid "unable to create temporary object directory"
 msgstr "无法创建临时对象目录"
 
-#: builtin/log.c:599
+#: builtin/log.c
 #, c-format
 msgid "git show %s: bad file"
 msgstr "git show %s: 损坏的文件"
 
-#: builtin/log.c:614 builtin/log.c:706
+#: builtin/log.c
 #, c-format
 msgid "could not read object %s"
 msgstr "不能读取对象 %s"
 
-#: builtin/log.c:731
+#: builtin/log.c
 #, c-format
 msgid "unknown type: %d"
 msgstr "未知类型：%d"
 
-#: builtin/log.c:880
+#: builtin/log.c
 #, c-format
 msgid "%s: invalid cover from description mode"
 msgstr "%s：从描述生成附函的模式无效"
 
-#: builtin/log.c:887
+#: builtin/log.c
 msgid "format.headers without value"
 msgstr "format.headers 没有值"
 
-#: builtin/log.c:1016
+#: builtin/log.c
 #, c-format
 msgid "cannot open patch file %s"
 msgstr "无法打开补丁文件 %s"
 
-#: builtin/log.c:1033
+#: builtin/log.c
 msgid "need exactly one range"
 msgstr "只需要一个范围"
 
-#: builtin/log.c:1043
+#: builtin/log.c
 msgid "not a range"
 msgstr "不是一个范围"
 
-#: builtin/log.c:1207
+#: builtin/log.c
 msgid "cover letter needs email format"
 msgstr "附函需要邮件地址格式"
 
-#: builtin/log.c:1213
+#: builtin/log.c
 msgid "failed to create cover-letter file"
 msgstr "无法创建附函文件"
 
-#: builtin/log.c:1300
+#: builtin/log.c
 #, c-format
 msgid "insane in-reply-to: %s"
 msgstr "不正常的 in-reply-to：%s"
 
-#: builtin/log.c:1327
+#: builtin/log.c
 msgid "git format-patch [<options>] [<since> | <revision-range>]"
 msgstr "git format-patch [<选项>] [<从> | <版本范围>]"
 
-#: builtin/log.c:1385
+#: builtin/log.c
 msgid "two output directories?"
 msgstr "两个输出目录？"
 
-#: builtin/log.c:1536 builtin/log.c:2369 builtin/log.c:2371 builtin/log.c:2383
+#: builtin/log.c
 #, c-format
 msgid "unknown commit %s"
 msgstr "未知提交 %s"
 
-#: builtin/log.c:1547 builtin/replace.c:58 builtin/replace.c:207
-#: builtin/replace.c:210
+#: builtin/log.c builtin/replace.c
 #, c-format
 msgid "failed to resolve '%s' as a valid ref"
 msgstr "无法将 '%s' 解析为一个有效引用"
 
-#: builtin/log.c:1556
+#: builtin/log.c
 msgid "could not find exact merge base"
 msgstr "不能找到准确的合并基线"
 
-#: builtin/log.c:1566
+#: builtin/log.c
 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"
@@ -17452,394 +9199,399 @@ msgstr ""
 "git branch --set-upstream-to 来跟踪一个远程分支。或者您可以通过\n"
 "参数 --base=<基线提交> 手动指定一个基线提交"
 
-#: builtin/log.c:1589
+#: builtin/log.c
 msgid "failed to find exact merge base"
 msgstr "无法找到准确的合并基线"
 
-#: builtin/log.c:1606
+#: builtin/log.c
 msgid "base commit should be the ancestor of revision list"
 msgstr "基线提交应该是版本列表的祖先"
 
-#: builtin/log.c:1616
+#: builtin/log.c
 msgid "base commit shouldn't be in revision list"
 msgstr "基线提交不应该出现在版本列表中"
 
-#: builtin/log.c:1674
+#: builtin/log.c
 msgid "cannot get patch id"
 msgstr "无法得到补丁 id"
 
-#: builtin/log.c:1737
+#: builtin/log.c
 msgid "failed to infer range-diff origin of current series"
 msgstr "无法推断当前系列的 range-diff 起始"
 
-#: builtin/log.c:1739
+#: builtin/log.c
 #, c-format
 msgid "using '%s' as range-diff origin of current series"
 msgstr "使用 '%s' 作为当前系列的 range-diff 源"
 
-#: builtin/log.c:1783
+#: builtin/log.c
 msgid "use [PATCH n/m] even with a single patch"
 msgstr "使用 [PATCH n/m]，即使只有一个补丁"
 
-#: builtin/log.c:1786
+#: builtin/log.c
 msgid "use [PATCH] even with multiple patches"
 msgstr "使用 [PATCH]，即使有多个补丁"
 
-#: builtin/log.c:1790
+#: builtin/log.c
 msgid "print patches to standard out"
 msgstr "打印补丁到标准输出"
 
-#: builtin/log.c:1792
+#: builtin/log.c
 msgid "generate a cover letter"
 msgstr "生成一封附函"
 
-#: builtin/log.c:1794
+#: builtin/log.c
 msgid "use simple number sequence for output file names"
 msgstr "使用简单的数字序列作为输出文件名"
 
-#: builtin/log.c:1795
+#: builtin/log.c
 msgid "sfx"
 msgstr "后缀"
 
-#: builtin/log.c:1796
+#: builtin/log.c
 msgid "use <sfx> instead of '.patch'"
 msgstr "使用 <后缀> 代替 '.patch'"
 
-#: builtin/log.c:1798
+#: builtin/log.c
 msgid "start numbering patches at <n> instead of 1"
 msgstr "补丁以 <n> 开始编号，而不是1"
 
-#: builtin/log.c:1799
+#: builtin/log.c
 msgid "reroll-count"
 msgstr "重制-计数"
 
-#: builtin/log.c:1800
+#: builtin/log.c
 msgid "mark the series as Nth re-roll"
 msgstr "标记补丁系列是第几次重制"
 
-#: builtin/log.c:1802
+#: builtin/log.c
 msgid "max length of output filename"
 msgstr "输出文件名的最大长度"
 
-#: builtin/log.c:1804
+#: builtin/log.c
 msgid "use [RFC PATCH] instead of [PATCH]"
 msgstr "使用 [RFC PATCH] 代替 [PATCH]"
 
-#: builtin/log.c:1807
+#: builtin/log.c
 msgid "cover-from-description-mode"
 msgstr "从分支描述获取附函的模式"
 
-#: builtin/log.c:1808
+#: builtin/log.c
 msgid "generate parts of a cover letter based on a branch's description"
 msgstr "基于一个分支描述生成部分附函"
 
-#: builtin/log.c:1810
+#: builtin/log.c
 msgid "use [<prefix>] instead of [PATCH]"
 msgstr "使用 [<前缀>] 代替 [PATCH]"
 
-#: builtin/log.c:1813
+#: builtin/log.c
 msgid "store resulting files in <dir>"
 msgstr "把结果文件存储在 <目录>"
 
-#: builtin/log.c:1816
+#: builtin/log.c
 msgid "don't strip/add [PATCH]"
 msgstr "不删除/添加 [PATCH]"
 
-#: builtin/log.c:1819
+#: builtin/log.c
 msgid "don't output binary diffs"
 msgstr "不输出二进制差异"
 
-#: builtin/log.c:1821
+#: builtin/log.c
 msgid "output all-zero hash in From header"
 msgstr "在 From 头信息中输出全为零的哈希值"
 
-#: builtin/log.c:1823
+#: builtin/log.c
 msgid "don't include a patch matching a commit upstream"
 msgstr "不包含已在上游提交中的补丁"
 
-#: builtin/log.c:1825
+#: builtin/log.c
 msgid "show patch format instead of default (patch + stat)"
 msgstr "显示纯补丁格式而非默认的（补丁+状态）"
 
-#: builtin/log.c:1827
+#: builtin/log.c
 msgid "Messaging"
 msgstr "邮件发送"
 
-#: builtin/log.c:1828
+#: builtin/log.c
 msgid "header"
 msgstr "header"
 
-#: builtin/log.c:1829
+#: builtin/log.c
 msgid "add email header"
 msgstr "添加邮件头"
 
-#: builtin/log.c:1830 builtin/log.c:1831
+#: builtin/log.c
 msgid "email"
 msgstr "邮件地址"
 
-#: builtin/log.c:1830
+#: builtin/log.c
 msgid "add To: header"
 msgstr "添加收件人"
 
-#: builtin/log.c:1831
+#: builtin/log.c
 msgid "add Cc: header"
 msgstr "添加抄送"
 
-#: builtin/log.c:1832
+#: builtin/log.c
 msgid "ident"
 msgstr "标识"
 
-#: builtin/log.c:1833
+#: builtin/log.c
 msgid "set From address to <ident> (or committer ident if absent)"
 msgstr "将 From 地址设置为 <标识>（如若不提供，则用提交者 ID 做为地址）"
 
-#: builtin/log.c:1835
+#: builtin/log.c
 msgid "message-id"
 msgstr "邮件标识"
 
-#: builtin/log.c:1836
+#: builtin/log.c
 msgid "make first mail a reply to <message-id>"
 msgstr "使第一封邮件作为对 <邮件标识> 的回复"
 
-#: builtin/log.c:1837 builtin/log.c:1840
+#: builtin/log.c
 msgid "boundary"
 msgstr "边界"
 
-#: builtin/log.c:1838
+#: builtin/log.c
 msgid "attach the patch"
 msgstr "附件方式添加补丁"
 
-#: builtin/log.c:1841
+#: builtin/log.c
 msgid "inline the patch"
 msgstr "内联显示补丁"
 
-#: builtin/log.c:1845
+#: builtin/log.c
 msgid "enable message threading, styles: shallow, deep"
 msgstr "启用邮件线索，风格：浅，深"
 
-#: builtin/log.c:1847
+#: builtin/log.c
 msgid "signature"
 msgstr "签名"
 
-#: builtin/log.c:1848
+#: builtin/log.c
 msgid "add a signature"
 msgstr "添加一个签名"
 
-#: builtin/log.c:1849
+#: builtin/log.c
 msgid "base-commit"
 msgstr "基线提交"
 
-#: builtin/log.c:1850
+#: builtin/log.c
 msgid "add prerequisite tree info to the patch series"
 msgstr "为补丁列表添加前置树信息"
 
-#: builtin/log.c:1853
+#: builtin/log.c
 msgid "add a signature from a file"
 msgstr "从文件添加一个签名"
 
-#: builtin/log.c:1854
+#: builtin/log.c
 msgid "don't print the patch filenames"
 msgstr "不要打印补丁文件名"
 
-#: builtin/log.c:1856
+#: builtin/log.c
 msgid "show progress while generating patches"
 msgstr "在生成补丁时显示进度"
 
-#: builtin/log.c:1858
+#: builtin/log.c
 msgid "show changes against <rev> in cover letter or single patch"
 msgstr "在附函或单个补丁中显示和 <版本> 的差异"
 
-#: builtin/log.c:1861
+#: builtin/log.c
 msgid "show changes against <refspec> in cover letter or single patch"
 msgstr "在附函或单个补丁中显示和 <引用规格> 的差异"
 
-#: builtin/log.c:1863 builtin/range-diff.c:28
+#: builtin/log.c builtin/range-diff.c
 msgid "percentage by which creation is weighted"
 msgstr "创建权重的百分比"
 
-#: builtin/log.c:1953
+#: builtin/log.c
 #, c-format
 msgid "invalid ident line: %s"
 msgstr "包含无效的身份标识：%s"
 
-#: builtin/log.c:1978
+#: builtin/log.c
 msgid "--name-only does not make sense"
 msgstr "--name-only 无意义"
 
-#: builtin/log.c:1980
+#: builtin/log.c
 msgid "--name-status does not make sense"
 msgstr "--name-status 无意义"
 
-#: builtin/log.c:1982
+#: builtin/log.c
 msgid "--check does not make sense"
 msgstr "--check 无意义"
 
-#: builtin/log.c:1984
+#: builtin/log.c
 msgid "--remerge-diff does not make sense"
 msgstr "--remerge-diff 无意义"
 
-#: builtin/log.c:2129
+#: builtin/log.c builtin/submodule--helper.c rerere.c submodule.c
+#, c-format
+msgid "could not create directory '%s'"
+msgstr "不能创建目录 '%s'"
+
+#: builtin/log.c
 msgid "--interdiff requires --cover-letter or single patch"
 msgstr "--interdiff 需要 --cover-letter 或单一补丁"
 
-#: builtin/log.c:2133
+#: builtin/log.c
 msgid "Interdiff:"
 msgstr "版本间差异："
 
-#: builtin/log.c:2134
+#: builtin/log.c
 #, c-format
 msgid "Interdiff against v%d:"
 msgstr "对 v%d 的版本差异："
 
-#: builtin/log.c:2144
+#: builtin/log.c
 msgid "--range-diff requires --cover-letter or single patch"
 msgstr "--range-diff 需要 --cover-letter 或单一补丁"
 
-#: builtin/log.c:2152
+#: builtin/log.c
 msgid "Range-diff:"
 msgstr "范围差异："
 
-#: builtin/log.c:2153
+#: builtin/log.c
 #, c-format
 msgid "Range-diff against v%d:"
 msgstr "对 v%d 的范围差异："
 
-#: builtin/log.c:2164
+#: builtin/log.c
 #, c-format
 msgid "unable to read signature file '%s'"
 msgstr "无法读取签名文件 '%s'"
 
-#: builtin/log.c:2200
+#: builtin/log.c
 msgid "Generating patches"
 msgstr "生成补丁"
 
-#: builtin/log.c:2244
+#: builtin/log.c
 msgid "failed to create output files"
 msgstr "无法创建输出文件"
 
-#: builtin/log.c:2304
+#: builtin/log.c
 msgid "git cherry [-v] [<upstream> [<head> [<limit>]]]"
 msgstr "git cherry [-v] [<上游> [<头> [<限制>]]]"
 
-#: builtin/log.c:2358
+#: builtin/log.c
 #, c-format
 msgid ""
 "Could not find a tracked remote branch, please specify <upstream> manually.\n"
 msgstr "不能找到跟踪的远程分支，请手工指定 <上游>。\n"
 
-#: builtin/ls-files.c:564
+#: builtin/ls-files.c
 msgid "git ls-files [<options>] [<file>...]"
 msgstr "git ls-files [<选项>] [<文件>...]"
 
-#: builtin/ls-files.c:618
+#: builtin/ls-files.c
 msgid "separate paths with the NUL character"
 msgstr "用 NUL 字符分隔路径"
 
-#: builtin/ls-files.c:620
+#: builtin/ls-files.c
 msgid "identify the file status with tags"
 msgstr "用标签标识文件的状态"
 
-#: builtin/ls-files.c:622
+#: builtin/ls-files.c
 msgid "use lowercase letters for 'assume unchanged' files"
 msgstr "使用小写字母表示 '假设未改变的' 文件"
 
-#: builtin/ls-files.c:624
+#: builtin/ls-files.c
 msgid "use lowercase letters for 'fsmonitor clean' files"
 msgstr "使用小写字母表示 'fsmonitor clean' 文件"
 
-#: builtin/ls-files.c:626
+#: builtin/ls-files.c
 msgid "show cached files in the output (default)"
 msgstr "显示缓存的文件（默认）"
 
-#: builtin/ls-files.c:628
+#: builtin/ls-files.c
 msgid "show deleted files in the output"
 msgstr "显示已删除的文件"
 
-#: builtin/ls-files.c:630
+#: builtin/ls-files.c
 msgid "show modified files in the output"
 msgstr "显示已修改的文件"
 
-#: builtin/ls-files.c:632
+#: builtin/ls-files.c
 msgid "show other files in the output"
 msgstr "显示其它文件"
 
-#: builtin/ls-files.c:634
+#: builtin/ls-files.c
 msgid "show ignored files in the output"
 msgstr "显示忽略的文件"
 
-#: builtin/ls-files.c:637
+#: builtin/ls-files.c
 msgid "show staged contents' object name in the output"
 msgstr "显示暂存区内容的对象名称"
 
-#: builtin/ls-files.c:639
+#: builtin/ls-files.c
 msgid "show files on the filesystem that need to be removed"
 msgstr "显示文件系统需要删除的文件"
 
-#: builtin/ls-files.c:641
+#: builtin/ls-files.c
 msgid "show 'other' directories' names only"
 msgstr "只显示“其他”目录的名称"
 
-#: builtin/ls-files.c:643
+#: builtin/ls-files.c
 msgid "show line endings of files"
 msgstr "显示文件换行符格式"
 
-#: builtin/ls-files.c:645
+#: builtin/ls-files.c
 msgid "don't show empty directories"
 msgstr "不显示空目录"
 
-#: builtin/ls-files.c:648
+#: builtin/ls-files.c
 msgid "show unmerged files in the output"
 msgstr "显示未合并的文件"
 
-#: builtin/ls-files.c:650
+#: builtin/ls-files.c
 msgid "show resolve-undo information"
 msgstr "显示 resolve-undo 信息"
 
-#: builtin/ls-files.c:652
+#: builtin/ls-files.c
 msgid "skip files matching pattern"
 msgstr "跳过和模式匹配的文件"
 
-#: builtin/ls-files.c:655
+#: builtin/ls-files.c
 msgid "read exclude patterns from <file>"
 msgstr "从 <文件> 读取排除模式"
 
-#: builtin/ls-files.c:658
+#: builtin/ls-files.c
 msgid "read additional per-directory exclude patterns in <file>"
 msgstr "从 <文件> 读取额外的每个目录的排除模式"
 
-#: builtin/ls-files.c:660
+#: builtin/ls-files.c
 msgid "add the standard git exclusions"
 msgstr "添加标准的 git 排除"
 
-#: builtin/ls-files.c:664
+#: builtin/ls-files.c
 msgid "make the output relative to the project top directory"
 msgstr "显示相对于顶级目录的文件名"
 
-#: builtin/ls-files.c:669
+#: builtin/ls-files.c
 msgid "if any <file> is not in the index, treat this as an error"
 msgstr "如果任何 <文件> 都不在索引区，视为错误"
 
-#: builtin/ls-files.c:670
+#: builtin/ls-files.c
 msgid "tree-ish"
 msgstr "树对象"
 
-#: builtin/ls-files.c:671
+#: builtin/ls-files.c
 msgid "pretend that paths removed since <tree-ish> are still present"
 msgstr "假装自从 <树对象> 之后删除的路径仍然存在"
 
-#: builtin/ls-files.c:673
+#: builtin/ls-files.c
 msgid "show debugging data"
 msgstr "显示调试数据"
 
-#: builtin/ls-files.c:675
+#: builtin/ls-files.c
 msgid "suppress duplicate entries"
 msgstr "抑制重复条目"
 
-#: builtin/ls-files.c:677
+#: builtin/ls-files.c
 msgid "show sparse directories in the presence of a sparse index"
 msgstr "在稀疏索引存在时显示稀疏目录"
 
-#: builtin/ls-remote.c:9
+#: builtin/ls-remote.c
 msgid ""
 "git ls-remote [--heads] [--tags] [--refs] [--upload-pack=<exec>]\n"
 "              [-q | --quiet] [--exit-code] [--get-url]\n"
@@ -17849,205 +9601,205 @@ msgstr ""
 "              [-q | --quiet] [--exit-code] [--get-url]\n"
 "              [--symref] [<仓库> [<引用>...]]"
 
-#: builtin/ls-remote.c:60
+#: builtin/ls-remote.c
 msgid "do not print remote URL"
 msgstr "不打印远程 URL"
 
-#: builtin/ls-remote.c:61 builtin/ls-remote.c:63 builtin/rebase.c:1131
+#: builtin/ls-remote.c builtin/rebase.c
 msgid "exec"
 msgstr "exec"
 
-#: builtin/ls-remote.c:62 builtin/ls-remote.c:64
+#: builtin/ls-remote.c
 msgid "path of git-upload-pack on the remote host"
 msgstr "远程主机上的 git-upload-pack 路径"
 
-#: builtin/ls-remote.c:66
+#: builtin/ls-remote.c
 msgid "limit to tags"
 msgstr "仅限于标签"
 
-#: builtin/ls-remote.c:67
+#: builtin/ls-remote.c
 msgid "limit to heads"
 msgstr "仅限于分支"
 
-#: builtin/ls-remote.c:68
+#: builtin/ls-remote.c
 msgid "do not show peeled tags"
 msgstr "不显示已解析的标签"
 
-#: builtin/ls-remote.c:70
+#: builtin/ls-remote.c
 msgid "take url.<base>.insteadOf into account"
 msgstr "参考 url.<base>.insteadOf 设置"
 
-#: builtin/ls-remote.c:73
+#: builtin/ls-remote.c
 msgid "exit with exit code 2 if no matching refs are found"
 msgstr "若未找到匹配的引用则以退出码2退出"
 
-#: builtin/ls-remote.c:76
+#: builtin/ls-remote.c
 msgid "show underlying ref in addition to the object pointed by it"
 msgstr "除了显示指向的对象外，显示指向的引用名"
 
-#: builtin/ls-tree.c:36
+#: builtin/ls-tree.c
 msgid "git ls-tree [<options>] <tree-ish> [<path>...]"
 msgstr "git ls-tree [<选项>] <树对象> [<路径>...]"
 
-#: builtin/ls-tree.c:54
+#: builtin/ls-tree.c
 #, c-format
 msgid "could not get object info about '%s'"
 msgstr "无法获得关于 '%s' 的对象信息"
 
-#: builtin/ls-tree.c:79
+#: builtin/ls-tree.c
 #, c-format
 msgid "bad ls-tree format: element '%s' does not start with '('"
 msgstr "坏的 ls-tree 格式：元素 '%s' 没有以 '(' 开头"
 
-#: builtin/ls-tree.c:83
+#: builtin/ls-tree.c
 #, c-format
 msgid "bad ls-tree format: element '%s' does not end in ')'"
 msgstr "坏的 ls-tree 格式：元素 '%s' 没有以 ')' 结尾"
 
-#: builtin/ls-tree.c:109
+#: builtin/ls-tree.c
 #, c-format
 msgid "bad ls-tree format: %%%.*s"
 msgstr "坏的 ls-tree 格式: %%%.*s"
 
-#: builtin/ls-tree.c:336
+#: builtin/ls-tree.c
 msgid "only show trees"
 msgstr "只显示树"
 
-#: builtin/ls-tree.c:338
+#: builtin/ls-tree.c
 msgid "recurse into subtrees"
 msgstr "递归到子树"
 
-#: builtin/ls-tree.c:340
+#: builtin/ls-tree.c
 msgid "show trees when recursing"
 msgstr "当递归时显示树"
 
-#: builtin/ls-tree.c:343
+#: builtin/ls-tree.c
 msgid "terminate entries with NUL byte"
 msgstr "条目以 NUL 字符终止"
 
-#: builtin/ls-tree.c:344
+#: builtin/ls-tree.c
 msgid "include object size"
 msgstr "包括对象大小"
 
-#: builtin/ls-tree.c:346 builtin/ls-tree.c:348
+#: builtin/ls-tree.c
 msgid "list only filenames"
 msgstr "只列出文件名"
 
-#: builtin/ls-tree.c:350
+#: builtin/ls-tree.c
 msgid "list only objects"
 msgstr "只列出对象"
 
-#: builtin/ls-tree.c:353
+#: builtin/ls-tree.c
 msgid "use full path names"
 msgstr "使用文件的全路径"
 
-#: builtin/ls-tree.c:355
+#: builtin/ls-tree.c
 msgid "list entire tree; not just current directory (implies --full-name)"
 msgstr "列出整个树；不仅仅当前目录（隐含 --full-name）"
 
-#: builtin/ls-tree.c:391
+#: builtin/ls-tree.c
 msgid "--format can't be combined with other format-altering options"
 msgstr "--format 不能和改变格式的选项同时使用"
 
 #. TRANSLATORS: keep <> in "<" mail ">" info.
-#: builtin/mailinfo.c:14
+#: builtin/mailinfo.c
 msgid "git mailinfo [<options>] <msg> <patch> < mail >info"
 msgstr "git mailinfo [<选项>] <消息> <补丁> < mail >info"
 
-#: builtin/mailinfo.c:58
+#: builtin/mailinfo.c
 msgid "keep subject"
 msgstr "保持主题"
 
-#: builtin/mailinfo.c:60
+#: builtin/mailinfo.c
 msgid "keep non patch brackets in subject"
 msgstr "在主题中保持无补丁括号标注"
 
-#: builtin/mailinfo.c:62
+#: builtin/mailinfo.c
 msgid "copy Message-ID to the end of commit message"
 msgstr "拷贝 Message-ID 至提交说明结尾"
 
-#: builtin/mailinfo.c:64
+#: builtin/mailinfo.c
 msgid "re-code metadata to i18n.commitEncoding"
 msgstr "将元数据重新编码为 i18n.commitEncoding"
 
-#: builtin/mailinfo.c:67
+#: builtin/mailinfo.c
 msgid "disable charset re-coding of metadata"
 msgstr "禁用元数据的字符集重新编码"
 
-#: builtin/mailinfo.c:69
+#: builtin/mailinfo.c
 msgid "encoding"
 msgstr "编码"
 
-#: builtin/mailinfo.c:70
+#: builtin/mailinfo.c
 msgid "re-code metadata to this encoding"
 msgstr "将元数据用此编码重新编码"
 
-#: builtin/mailinfo.c:72
+#: builtin/mailinfo.c
 msgid "use scissors"
 msgstr "使用剪刀标记"
 
-#: builtin/mailinfo.c:73
+#: builtin/mailinfo.c
 msgid "<action>"
 msgstr "<动作>"
 
-#: builtin/mailinfo.c:74
+#: builtin/mailinfo.c
 msgid "action when quoted CR is found"
 msgstr "找到引号中的 CR 时的操作"
 
-#: builtin/mailinfo.c:77
+#: builtin/mailinfo.c
 msgid "use headers in message's body"
 msgstr "在消息正文中使用标头"
 
-#: builtin/mailsplit.c:227
+#: builtin/mailsplit.c
 msgid "reading patches from stdin/tty..."
 msgstr "从标准输入或tty读取补丁……"
 
-#: builtin/mailsplit.c:242
+#: builtin/mailsplit.c
 #, c-format
 msgid "empty mbox: '%s'"
 msgstr "空的 mbox：'%s'"
 
-#: builtin/merge-base.c:32
+#: builtin/merge-base.c
 msgid "git merge-base [-a | --all] <commit> <commit>..."
 msgstr "git merge-base [-a | --all] <提交> <提交>..."
 
-#: builtin/merge-base.c:33
+#: builtin/merge-base.c
 msgid "git merge-base [-a | --all] --octopus <commit>..."
 msgstr "git merge-base [-a | --all] --octopus <提交>..."
 
-#: builtin/merge-base.c:34
+#: builtin/merge-base.c
 msgid "git merge-base --independent <commit>..."
 msgstr "git merge-base --independent <提交>..."
 
-#: builtin/merge-base.c:35
+#: builtin/merge-base.c
 msgid "git merge-base --is-ancestor <commit> <commit>"
 msgstr "git merge-base --is-ancestor <提交> <提交>"
 
-#: builtin/merge-base.c:36
+#: builtin/merge-base.c
 msgid "git merge-base --fork-point <ref> [<commit>]"
 msgstr "git merge-base --fork-point <引用> [<提交>]"
 
-#: builtin/merge-base.c:144
+#: builtin/merge-base.c
 msgid "output all common ancestors"
 msgstr "输出所有共同的祖先"
 
-#: builtin/merge-base.c:146
+#: builtin/merge-base.c
 msgid "find ancestors for a single n-way merge"
 msgstr "查找一个多路合并的祖先提交"
 
-#: builtin/merge-base.c:148
+#: builtin/merge-base.c
 msgid "list revs not reachable from others"
 msgstr "显示不能被其他访问到的版本"
 
-#: builtin/merge-base.c:150
+#: builtin/merge-base.c
 msgid "is the first one ancestor of the other?"
 msgstr "第一个是其他的祖先提交么？"
 
-#: builtin/merge-base.c:152
+#: builtin/merge-base.c
 msgid "find where <commit> forked from reflog of <ref>"
 msgstr "根据 <引用> 的引用日志查找 <提交> 的分叉点"
 
-#: builtin/merge-file.c:9
+#: builtin/merge-file.c
 msgid ""
 "git merge-file [<options>] [-L <name1> [-L <orig> [-L <name2>]]] <file1> "
 "<orig-file> <file2>"
@@ -18055,253 +9807,261 @@ msgstr ""
 "git merge-file [<选项>] [-L <名字1> [-L <初始名字> [-L <名字2>]]] <文件1> <初"
 "始文件> <文件2>"
 
-#: builtin/merge-file.c:35
+#: builtin/merge-file.c
 msgid "send results to standard output"
 msgstr "将结果发送到标准输出"
 
-#: builtin/merge-file.c:36
+#: builtin/merge-file.c
 msgid "use a diff3 based merge"
 msgstr "使用基于 diff3 的合并"
 
-#: builtin/merge-file.c:37
+#: builtin/merge-file.c
 msgid "use a zealous diff3 based merge"
 msgstr "使用基于狂热 diff3（zealous diff3）的合并"
 
-#: builtin/merge-file.c:39
+#: builtin/merge-file.c
 msgid "for conflicts, use our version"
 msgstr "如果冲突，使用我们的版本"
 
-#: builtin/merge-file.c:41
+#: builtin/merge-file.c
 msgid "for conflicts, use their version"
 msgstr "如果冲突，使用他们的版本"
 
-#: builtin/merge-file.c:43
+#: builtin/merge-file.c
 msgid "for conflicts, use a union version"
 msgstr "如果冲突，使用联合版本"
 
-#: builtin/merge-file.c:46
+#: builtin/merge-file.c
 msgid "for conflicts, use this marker size"
 msgstr "如果冲突，使用指定长度的标记"
 
-#: builtin/merge-file.c:47
+#: builtin/merge-file.c
 msgid "do not warn about conflicts"
 msgstr "不要警告冲突"
 
-#: builtin/merge-file.c:49
+#: builtin/merge-file.c
 msgid "set labels for file1/orig-file/file2"
 msgstr "为 文件1/初始文件/文件2 设置标签"
 
-#: builtin/merge-recursive.c:47
+#: builtin/merge-recursive.c
 #, c-format
 msgid "unknown option %s"
 msgstr "未知选项 %s"
 
-#: builtin/merge-recursive.c:53
+#: builtin/merge-recursive.c
 #, c-format
 msgid "could not parse object '%s'"
 msgstr "不能解析对象 '%s'"
 
-#: builtin/merge-recursive.c:57
+#: builtin/merge-recursive.c
 #, c-format
 msgid "cannot handle more than %d base. Ignoring %s."
 msgid_plural "cannot handle more than %d bases. Ignoring %s."
 msgstr[0] "无法处理 %d 条以上的基线。忽略 %s。"
 msgstr[1] "无法处理 %d 条以上的基线。忽略 %s。"
 
-#: builtin/merge-recursive.c:65
+#: builtin/merge-recursive.c
 msgid "not handling anything other than two heads merge."
 msgstr "不能处理两个头合并之外的任何操作。"
 
-#: builtin/merge-recursive.c:74 builtin/merge-recursive.c:76
+#: builtin/merge-recursive.c
 #, c-format
 msgid "could not resolve ref '%s'"
 msgstr "无法解析引用 '%s'"
 
-#: builtin/merge-recursive.c:82
+#: builtin/merge-recursive.c
 #, c-format
 msgid "Merging %s with %s\n"
 msgstr "合并 %s 和 %s\n"
 
-#: builtin/merge.c:59
+#: builtin/merge.c
 msgid "git merge [<options>] [<commit>...]"
 msgstr "git merge [<选项>] [<提交>...]"
 
-#: builtin/merge.c:125
+#: builtin/merge.c
 msgid "switch `m' requires a value"
 msgstr "开关 `m' 需要一个值"
 
-#: builtin/merge.c:148
+#: builtin/merge.c
 #, c-format
 msgid "option `%s' requires a value"
 msgstr "选项 `%s' 需要一个值"
 
-#: builtin/merge.c:201
+#: builtin/merge.c
 #, c-format
 msgid "Could not find merge strategy '%s'.\n"
 msgstr "不能找到合并策略 '%s'。\n"
 
-#: builtin/merge.c:202
+#: builtin/merge.c
 #, c-format
 msgid "Available strategies are:"
 msgstr "可用的策略有："
 
-#: builtin/merge.c:207
+#: builtin/merge.c
 #, c-format
 msgid "Available custom strategies are:"
 msgstr "可用的自定义策略有："
 
-#: builtin/merge.c:258 builtin/pull.c:134
+#: builtin/merge.c builtin/pull.c
 msgid "do not show a diffstat at the end of the merge"
 msgstr "在合并的最后不显示差异统计"
 
-#: builtin/merge.c:261 builtin/pull.c:137
+#: builtin/merge.c builtin/pull.c
 msgid "show a diffstat at the end of the merge"
 msgstr "在合并的最后显示差异统计"
 
-#: builtin/merge.c:262 builtin/pull.c:140
+#: builtin/merge.c builtin/pull.c
 msgid "(synonym to --stat)"
 msgstr "（和 --stat 同义）"
 
-#: builtin/merge.c:264 builtin/pull.c:143
+#: builtin/merge.c builtin/pull.c
 msgid "add (at most <n>) entries from shortlog to merge commit message"
 msgstr "在合并提交信息中添加（最多 <n> 条）精简提交记录"
 
-#: builtin/merge.c:267 builtin/pull.c:149
+#: builtin/merge.c builtin/pull.c
 msgid "create a single commit instead of doing a merge"
 msgstr "创建一个单独的提交而不是做一次合并"
 
-#: builtin/merge.c:269 builtin/pull.c:152
+#: builtin/merge.c builtin/pull.c
 msgid "perform a commit if the merge succeeds (default)"
 msgstr "如果合并成功，执行一次提交（默认）"
 
-#: builtin/merge.c:271 builtin/pull.c:155
+#: builtin/merge.c builtin/pull.c
 msgid "edit message before committing"
 msgstr "在提交前编辑提交说明"
 
-#: builtin/merge.c:273
+#: builtin/merge.c
 msgid "allow fast-forward (default)"
 msgstr "允许快进（默认）"
 
-#: builtin/merge.c:275 builtin/pull.c:162
+#: builtin/merge.c builtin/pull.c
 msgid "abort if fast-forward is not possible"
 msgstr "如果不能快进就放弃合并"
 
-#: builtin/merge.c:279 builtin/pull.c:168
+#: builtin/merge.c builtin/pull.c
 msgid "verify that the named commit has a valid GPG signature"
 msgstr "验证指定的提交是否包含一个有效的 GPG 签名"
 
-#: builtin/merge.c:280 builtin/notes.c:785 builtin/pull.c:172
-#: builtin/rebase.c:1145 builtin/revert.c:114
+#: builtin/merge.c builtin/notes.c builtin/pull.c builtin/rebase.c
+#: builtin/revert.c
 msgid "strategy"
 msgstr "策略"
 
-#: builtin/merge.c:281 builtin/pull.c:173
+#: builtin/merge.c builtin/pull.c
 msgid "merge strategy to use"
 msgstr "要使用的合并策略"
 
-#: builtin/merge.c:282 builtin/pull.c:176
+#: builtin/merge.c builtin/pull.c
 msgid "option=value"
 msgstr "option=value"
 
-#: builtin/merge.c:283 builtin/pull.c:177
+#: builtin/merge.c builtin/pull.c
 msgid "option for selected merge strategy"
 msgstr "所选的合并策略的选项"
 
-#: builtin/merge.c:285
+#: builtin/merge.c
 msgid "merge commit message (for a non-fast-forward merge)"
 msgstr "合并的提交说明（针对非快进式合并）"
 
-#: builtin/merge.c:291
+#: builtin/merge.c
 msgid "use <name> instead of the real target"
 msgstr "使用 <名称> 而不是真正的目标"
 
-#: builtin/merge.c:294
+#: builtin/merge.c
 msgid "abort the current in-progress merge"
 msgstr "放弃当前正在进行的合并"
 
 #
-#: builtin/merge.c:296
+#: builtin/merge.c
 msgid "--abort but leave index and working tree alone"
 msgstr "--abort，但是保留索引和工作区"
 
-#: builtin/merge.c:298
+#: builtin/merge.c
 msgid "continue the current in-progress merge"
 msgstr "继续当前正在进行的合并"
 
-#: builtin/merge.c:300 builtin/pull.c:184
+#: builtin/merge.c builtin/pull.c
 msgid "allow merging unrelated histories"
 msgstr "允许合并不相关的历史"
 
-#: builtin/merge.c:307
+#: builtin/merge.c
 msgid "bypass pre-merge-commit and commit-msg hooks"
 msgstr "绕过 pre-merge-commit 和 commit-msg 钩子"
 
-#: builtin/merge.c:323
+#: builtin/merge.c
 msgid "could not run stash."
 msgstr "不能运行贮藏。"
 
-#: builtin/merge.c:328
+#: builtin/merge.c
 msgid "stash failed"
 msgstr "贮藏失败"
 
-#: builtin/merge.c:333
+#: builtin/merge.c
 #, c-format
 msgid "not a valid object: %s"
 msgstr "不是一个有效对象：%s"
 
-#: builtin/merge.c:355 builtin/merge.c:372
+#: builtin/merge.c
 msgid "read-tree failed"
 msgstr "读取树失败"
 
-#: builtin/merge.c:403
+#: builtin/merge.c
 msgid "Already up to date. (nothing to squash)"
 msgstr "已经是最新的。（无可挤压）"
 
-#: builtin/merge.c:417
+#: builtin/merge.c merge-ort-wrappers.c merge-recursive.c
+msgid "Already up to date."
+msgstr "已经是最新的。"
+
+#: builtin/merge.c
 #, c-format
 msgid "Squash commit -- not updating HEAD\n"
 msgstr "挤压提交 -- 未更新 HEAD\n"
 
-#: builtin/merge.c:467
+#: builtin/merge.c
 #, c-format
 msgid "No merge message -- not updating HEAD\n"
 msgstr "无合并信息 -- 未更新 HEAD\n"
 
-#: builtin/merge.c:517
+#: builtin/merge.c
 #, c-format
 msgid "'%s' does not point to a commit"
 msgstr "'%s' 没有指向一个提交"
 
-#: builtin/merge.c:605
+#: builtin/merge.c
 #, c-format
 msgid "Bad branch.%s.mergeoptions string: %s"
 msgstr "坏的 branch.%s.mergeoptions 字符串：%s"
 
-#: builtin/merge.c:732
+#: builtin/merge.c builtin/stash.c merge-recursive.c
+msgid "Unable to write index."
+msgstr "不能写入索引。"
+
+#: builtin/merge.c
 msgid "Not handling anything other than two heads merge."
 msgstr "未处理两个头合并之外的任何操作。"
 
-#: builtin/merge.c:745
+#: builtin/merge.c
 #, c-format
 msgid "unknown strategy option: -X%s"
 msgstr "未知的策略选项：-X%s"
 
-#: builtin/merge.c:764 t/helper/test-fast-rebase.c:223
+#: builtin/merge.c t/helper/test-fast-rebase.c
 #, c-format
 msgid "unable to write %s"
 msgstr "不能写 %s"
 
-#: builtin/merge.c:816
+#: builtin/merge.c
 #, c-format
 msgid "Could not read from '%s'"
 msgstr "不能从 '%s' 读取"
 
-#: builtin/merge.c:825
+#: builtin/merge.c
 #, c-format
 msgid "Not committing merge; use 'git commit' to complete the merge.\n"
 msgstr "未提交合并，使用 'git commit' 完成此次合并。\n"
 
-#: builtin/merge.c:831
+#: builtin/merge.c
 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"
@@ -18311,83 +10071,88 @@ msgstr ""
 "合并到主题分支。\n"
 "\n"
 
-#: builtin/merge.c:836
+#: builtin/merge.c
 msgid "An empty message aborts the commit.\n"
 msgstr "空的提交说明会终止提交。\n"
 
-#: builtin/merge.c:839
+#: builtin/merge.c
 #, 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:900
+#: builtin/merge.c
 msgid "Empty commit message."
 msgstr "空提交信息。"
 
-#: builtin/merge.c:915
+#: builtin/merge.c
 #, c-format
 msgid "Wonderful.\n"
 msgstr "太棒了。\n"
 
-#: builtin/merge.c:976
+#: builtin/merge.c
 #, c-format
 msgid "Automatic merge failed; fix conflicts and then commit the result.\n"
 msgstr "自动合并失败，修正冲突然后提交修正的结果。\n"
 
-#: builtin/merge.c:1015
+#: builtin/merge.c
 msgid "No current branch."
 msgstr "没有当前分支。"
 
-#: builtin/merge.c:1017
+#: builtin/merge.c
 msgid "No remote for the current branch."
 msgstr "当前分支没有对应的远程仓库。"
 
-#: builtin/merge.c:1019
+#: builtin/merge.c
 msgid "No default upstream defined for the current branch."
 msgstr "当前分支没有定义默认的上游分支。"
 
-#: builtin/merge.c:1024
+#: builtin/merge.c
 #, c-format
 msgid "No remote-tracking branch for %s from %s"
 msgstr "对于 %s 没有来自 %s 的远程跟踪分支"
 
-#: builtin/merge.c:1081
+#: builtin/merge.c
 #, c-format
 msgid "Bad value '%s' in environment '%s'"
 msgstr "环境 '%2$s' 中存在坏的取值 '%1$s'"
 
-#: builtin/merge.c:1183
+#: builtin/merge.c read-cache.c strbuf.c wrapper.c
+#, c-format
+msgid "could not close '%s'"
+msgstr "不能关闭 '%s'"
+
+#: builtin/merge.c
 #, c-format
 msgid "not something we can merge in %s: %s"
 msgstr "不能在 %s 中合并：%s"
 
-#: builtin/merge.c:1217
+#: builtin/merge.c
 msgid "not something we can merge"
 msgstr "不能合并"
 
-#: builtin/merge.c:1330
+#: builtin/merge.c
 msgid "--abort expects no arguments"
 msgstr "--abort 不带参数"
 
-#: builtin/merge.c:1334
+#: builtin/merge.c
 msgid "There is no merge to abort (MERGE_HEAD missing)."
 msgstr "没有要终止的合并（MERGE_HEAD 丢失）。"
 
-#: builtin/merge.c:1352
+#: builtin/merge.c
 msgid "--quit expects no arguments"
 msgstr "--quit 不带参数"
 
-#: builtin/merge.c:1365
+#: builtin/merge.c
 msgid "--continue expects no arguments"
 msgstr "--continue 不带参数"
 
-#: builtin/merge.c:1369
+#: builtin/merge.c
 msgid "There is no merge in progress (MERGE_HEAD missing)."
 msgstr "没有进行中的合并（MERGE_HEAD 丢失）。"
 
-#: builtin/merge.c:1385
+#: builtin/merge.c
 msgid ""
 "You have not concluded your merge (MERGE_HEAD exists).\n"
 "Please, commit your changes before you merge."
@@ -18395,7 +10160,7 @@ msgstr ""
 "您尚未结束您的合并（存在 MERGE_HEAD）。\n"
 "请在合并前先提交您的修改。"
 
-#: builtin/merge.c:1392
+#: builtin/merge.c
 msgid ""
 "You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists).\n"
 "Please, commit your changes before you merge."
@@ -18403,130 +10168,134 @@ msgstr ""
 "您尚未结束您的拣选（存在 CHERRY_PICK_HEAD）。\n"
 "请在合并前先提交您的修改。"
 
-#: builtin/merge.c:1395
+#: builtin/merge.c
 msgid "You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists)."
 msgstr "您尚未结束您的拣选（存在 CHERRY_PICK_HEAD）。"
 
-#: builtin/merge.c:1427
+#: builtin/merge.c
 msgid "No commit specified and merge.defaultToUpstream not set."
 msgstr "未指定提交并且 merge.defaultToUpstream 未设置。"
 
-#: builtin/merge.c:1444
+#: builtin/merge.c
 msgid "Squash commit into empty head not supported yet"
 msgstr "尚不支持到空分支的压缩提交"
 
-#: builtin/merge.c:1446
+#: builtin/merge.c
 msgid "Non-fast-forward commit does not make sense into an empty head"
 msgstr "到空分支的非快进式提交没有意义"
 
-#: builtin/merge.c:1451
+#: builtin/merge.c
 #, c-format
 msgid "%s - not something we can merge"
 msgstr "%s - 不能被合并"
 
-#: builtin/merge.c:1453
+#: builtin/merge.c
 msgid "Can merge only exactly one commit into empty head"
 msgstr "只能将一个提交合并到空分支上"
 
-#: builtin/merge.c:1540
+#: builtin/merge.c
 msgid "refusing to merge unrelated histories"
 msgstr "拒绝合并无关的历史"
 
-#: builtin/merge.c:1559
+#: builtin/merge.c
 #, c-format
 msgid "Updating %s..%s\n"
 msgstr "更新 %s..%s\n"
 
-#: builtin/merge.c:1606
+#: builtin/merge.c
 #, c-format
 msgid "Trying really trivial in-index merge...\n"
 msgstr "尝试非常小的索引内合并...\n"
 
-#: builtin/merge.c:1613
+#: builtin/merge.c
 #, c-format
 msgid "Nope.\n"
 msgstr "无。\n"
 
-#: builtin/merge.c:1671 builtin/merge.c:1737
+#: builtin/merge.c
 #, c-format
 msgid "Rewinding the tree to pristine...\n"
 msgstr "将树回滚至原始状态...\n"
 
-#: builtin/merge.c:1675
+#: builtin/merge.c
 #, c-format
 msgid "Trying merge strategy %s...\n"
 msgstr "尝试合并策略 %s...\n"
 
-#: builtin/merge.c:1727
+#: builtin/merge.c
 #, c-format
 msgid "No merge strategy handled the merge.\n"
 msgstr "没有合并策略处理此合并。\n"
 
-#: builtin/merge.c:1729
+#: builtin/merge.c
 #, c-format
 msgid "Merge with strategy %s failed.\n"
 msgstr "使用策略 %s 合并失败。\n"
 
-#: builtin/merge.c:1739
+#: builtin/merge.c
 #, c-format
 msgid "Using the %s strategy to prepare resolving by hand.\n"
 msgstr "使用 %s 策略以准备手工解决。\n"
 
-#: builtin/merge.c:1753
+#: builtin/merge.c
 #, c-format
 msgid "Automatic merge went well; stopped before committing as requested\n"
 msgstr "自动合并进展顺利，按要求在提交前停止\n"
 
-#: builtin/mktag.c:27
+#: builtin/mktag.c
 #, c-format
 msgid "warning: tag input does not pass fsck: %s"
 msgstr "警告：标签输入未通过 fsck：%s"
 
-#: builtin/mktag.c:38
+#: builtin/mktag.c
 #, c-format
 msgid "error: tag input does not pass fsck: %s"
 msgstr "错误：标签输入未通过 fsck：%s"
 
-#: builtin/mktag.c:41
+#: builtin/mktag.c
 #, c-format
 msgid "%d (FSCK_IGNORE?) should never trigger this callback"
 msgstr "%d (FSCK_IGNORE?) 永远不应该触发这个回调"
 
-#: builtin/mktag.c:56
+#: builtin/mktag.c
 #, c-format
 msgid "could not read tagged object '%s'"
 msgstr "不能读取被标记的对象 '%s'"
 
-#: builtin/mktag.c:59
+#: builtin/mktag.c
 #, c-format
 msgid "object '%s' tagged as '%s', but is a '%s' type"
 msgstr "对象 '%s' 被标记为 '%s'，然而是一个 '%s' 类型"
 
-#: builtin/mktag.c:97
+#: builtin/mktag.c imap-send.c trailer.c
+msgid "could not read from stdin"
+msgstr "不能自标准输入读取"
+
+#: builtin/mktag.c
 msgid "tag on stdin did not pass our strict fsck check"
 msgstr "标准输入上的标签未通过我们严格的 fsck 检查"
 
-#: builtin/mktag.c:100
+#: builtin/mktag.c
 msgid "tag on stdin did not refer to a valid object"
 msgstr "标准输入上的标签未指向一个有效的对象"
 
-#: builtin/mktag.c:103 builtin/tag.c:243
+#: builtin/mktag.c builtin/tag.c
 msgid "unable to write tag file"
 msgstr "无法写标签文件"
 
-#: builtin/mktree.c:154
+#: builtin/mktree.c
 msgid "input is NUL terminated"
 msgstr "输入以 NUL 字符终止"
 
-#: builtin/mktree.c:155 builtin/write-tree.c:26
+#: builtin/mktree.c builtin/write-tree.c
 msgid "allow missing objects"
 msgstr "允许丢失的对象"
 
-#: builtin/mktree.c:156
+#: builtin/mktree.c
 msgid "allow creation of more than one tree"
 msgstr "允许创建一个以上的树"
 
-#: builtin/multi-pack-index.c:10
+#: builtin/multi-pack-index.c
 msgid ""
 "git multi-pack-index [<options>] write [--preferred-pack=<pack>][--refs-"
 "snapshot=<path>]"
@@ -18534,197 +10303,201 @@ msgstr ""
 "git multi-pack-index [<选项>] write [--preferred-pack=<包>][--refs-snapshot=<"
 "路径>]"
 
-#: builtin/multi-pack-index.c:14
+#: builtin/multi-pack-index.c
 msgid "git multi-pack-index [<options>] verify"
 msgstr "git multi-pack-index [<选项>] verify"
 
-#: builtin/multi-pack-index.c:17
+#: builtin/multi-pack-index.c
 msgid "git multi-pack-index [<options>] expire"
 msgstr "git multi-pack-index [<选项>] expire"
 
-#: builtin/multi-pack-index.c:20
+#: builtin/multi-pack-index.c
 msgid "git multi-pack-index [<options>] repack [--batch-size=<size>]"
 msgstr "git multi-pack-index [<选项>] repack [--batch-size=<尺寸>]"
 
-#: builtin/multi-pack-index.c:57
+#: builtin/multi-pack-index.c
+msgid "directory"
+msgstr "目录"
+
+#: builtin/multi-pack-index.c
 msgid "object directory containing set of packfile and pack-index pairs"
 msgstr "包含成对包文件和包索引的对象目录"
 
-#: builtin/multi-pack-index.c:98
+#: builtin/multi-pack-index.c
 msgid "preferred-pack"
 msgstr "首选包"
 
-#: builtin/multi-pack-index.c:99
+#: builtin/multi-pack-index.c
 msgid "pack for reuse when computing a multi-pack bitmap"
 msgstr "在计算多包位图时打包以供重用"
 
-#: builtin/multi-pack-index.c:100
+#: builtin/multi-pack-index.c
 msgid "write multi-pack bitmap"
 msgstr "写入多包位图"
 
-#: builtin/multi-pack-index.c:105
+#: builtin/multi-pack-index.c
 msgid "write multi-pack index containing only given indexes"
 msgstr "写入只包括给定索引的多包索引"
 
-#: builtin/multi-pack-index.c:107
+#: builtin/multi-pack-index.c
 msgid "refs snapshot for selecting bitmap commits"
 msgstr "用于选择位图提交的引用快照"
 
-#: builtin/multi-pack-index.c:206
+#: builtin/multi-pack-index.c
 msgid ""
 "during repack, collect pack-files of smaller size into a batch that is "
 "larger than this size"
 msgstr "在 repack 期间，将较小尺寸的包文件收集到大于此大小的批次中"
 
-#: builtin/mv.c:18
+#: builtin/mv.c
 msgid "git mv [<options>] <source>... <destination>"
 msgstr "git mv [<选项>] <源>... <目标>"
 
-#: builtin/mv.c:83
+#: builtin/mv.c
 #, c-format
 msgid "Directory %s is in index and no submodule?"
 msgstr "目录 %s 在索引中并且不是子模组？"
 
-#: builtin/mv.c:85
+#: builtin/mv.c
 msgid "Please stage your changes to .gitmodules or stash them to proceed"
 msgstr "请将您的修改暂存到 .gitmodules 中或贮藏后再继续"
 
-#: builtin/mv.c:103
+#: builtin/mv.c
 #, c-format
 msgid "%.*s is in index"
 msgstr "%.*s 在索引中"
 
-#: builtin/mv.c:125
+#: builtin/mv.c
 msgid "force move/rename even if target exists"
 msgstr "强制移动/重命令，即使目标存在"
 
-#: builtin/mv.c:127
+#: builtin/mv.c
 msgid "skip move/rename errors"
 msgstr "跳过移动/重命名错误"
 
-#: builtin/mv.c:172
+#: builtin/mv.c
 #, c-format
 msgid "destination '%s' is not a directory"
 msgstr "目标 '%s' 不是一个目录"
 
-#: builtin/mv.c:184
+#: builtin/mv.c
 #, c-format
 msgid "Checking rename of '%s' to '%s'\n"
 msgstr "检查 '%s' 到 '%s' 的重命名\n"
 
-#: builtin/mv.c:190
+#: builtin/mv.c
 msgid "bad source"
 msgstr "坏的源"
 
-#: builtin/mv.c:193
+#: builtin/mv.c
 msgid "can not move directory into itself"
 msgstr "不能将目录移动到自身"
 
-#: builtin/mv.c:196
+#: builtin/mv.c
 msgid "cannot move directory over file"
 msgstr "不能将目录移动到文件"
 
-#: builtin/mv.c:205
+#: builtin/mv.c
 msgid "source directory is empty"
 msgstr "源目录为空"
 
-#: builtin/mv.c:231
+#: builtin/mv.c
 msgid "not under version control"
 msgstr "不在版本控制之下"
 
-#: builtin/mv.c:233
+#: builtin/mv.c
 msgid "conflicted"
 msgstr "冲突"
 
-#: builtin/mv.c:236
+#: builtin/mv.c
 msgid "destination exists"
 msgstr "目标已存在"
 
-#: builtin/mv.c:244
+#: builtin/mv.c
 #, c-format
 msgid "overwriting '%s'"
 msgstr "覆盖 '%s'"
 
-#: builtin/mv.c:247
+#: builtin/mv.c
 msgid "Cannot overwrite"
 msgstr "不能覆盖"
 
-#: builtin/mv.c:250
+#: builtin/mv.c
 msgid "multiple sources for the same target"
 msgstr "同一目标具有多个源"
 
-#: builtin/mv.c:252
+#: builtin/mv.c
 msgid "destination directory does not exist"
 msgstr "目标目录不存在"
 
-#: builtin/mv.c:280
+#: builtin/mv.c
 #, c-format
 msgid "%s, source=%s, destination=%s"
 msgstr "%s，源=%s，目标=%s"
 
-#: builtin/mv.c:308
+#: builtin/mv.c
 #, c-format
 msgid "Renaming %s to %s\n"
 msgstr "重命名 %s 至 %s\n"
 
-#: builtin/mv.c:314 builtin/remote.c:812 builtin/repack.c:861
+#: builtin/mv.c builtin/remote.c builtin/repack.c
 #, c-format
 msgid "renaming '%s' failed"
 msgstr "重命名 '%s' 失败"
 
-#: builtin/name-rev.c:524
+#: builtin/name-rev.c
 msgid "git name-rev [<options>] <commit>..."
 msgstr "git name-rev [<选项>] <提交>..."
 
-#: builtin/name-rev.c:525
+#: builtin/name-rev.c
 msgid "git name-rev [<options>] --all"
 msgstr "git name-rev [<选项>] --all"
 
-#: builtin/name-rev.c:526
+#: builtin/name-rev.c
 msgid "git name-rev [<options>] --annotate-stdin"
 msgstr "git name-rev [<选项>] --annotate-stdin"
 
-#: builtin/name-rev.c:583
+#: builtin/name-rev.c
 msgid "print only ref-based names (no object names)"
 msgstr "只打印基于引用的名称（非对象名）"
 
-#: builtin/name-rev.c:584
+#: builtin/name-rev.c
 msgid "only use tags to name the commits"
 msgstr "只使用标签来命名提交"
 
-#: builtin/name-rev.c:586
+#: builtin/name-rev.c
 msgid "only use refs matching <pattern>"
 msgstr "只使用和 <模式> 相匹配的引用"
 
-#: builtin/name-rev.c:588
+#: builtin/name-rev.c
 msgid "ignore refs matching <pattern>"
 msgstr "忽略和 <模式> 相匹配的引用"
 
-#: builtin/name-rev.c:590
+#: builtin/name-rev.c
 msgid "list all commits reachable from all refs"
 msgstr "列出可以从所有引用访问的提交"
 
-#: builtin/name-rev.c:591
-msgid "deprecated: use annotate-stdin instead"
-msgstr "已弃用：取而代之使用 annotate-stdin"
+#: builtin/name-rev.c
+msgid "deprecated: use --annotate-stdin instead"
+msgstr "已弃用：取而代之使用 --annotate-stdin"
 
-#: builtin/name-rev.c:592
+#: builtin/name-rev.c
 msgid "annotate text from stdin"
 msgstr "标注标准输入的文字"
 
-#: builtin/name-rev.c:593
+#: builtin/name-rev.c
 msgid "allow to print `undefined` names (default)"
 msgstr "允许打印 `未定义` 的名称（默认）"
 
-#: builtin/name-rev.c:599
+#: builtin/name-rev.c
 msgid "dereference tags in the input (internal use)"
 msgstr "反向解析输入中的标签（内部使用）"
 
-#: builtin/notes.c:28
+#: builtin/notes.c
 msgid "git notes [--ref <notes-ref>] [list [<object>]]"
 msgstr "git notes [--ref <注解引用>] [list [<对象>]]"
 
-#: builtin/notes.c:29
+#: builtin/notes.c
 msgid ""
 "git notes [--ref <notes-ref>] add [-f] [--allow-empty] [-m <msg> | -F <file> "
 "| (-c | -C) <object>] [<object>]"
@@ -18732,11 +10505,11 @@ msgstr ""
 "git notes [--ref <注解引用>] add [-f] [--allow-empty] [-m <说明> | -F <文件> "
 "| (-c | -C) <对象>] [<对象>]"
 
-#: builtin/notes.c:30
+#: builtin/notes.c
 msgid "git notes [--ref <notes-ref>] copy [-f] <from-object> <to-object>"
 msgstr "git notes [--ref <注解引用>] copy [-f] <源对象> <目标对象>"
 
-#: builtin/notes.c:31
+#: builtin/notes.c
 msgid ""
 "git notes [--ref <notes-ref>] append [--allow-empty] [-m <msg> | -F <file> | "
 "(-c | -C) <object>] [<object>]"
@@ -18744,138 +10517,136 @@ msgstr ""
 "git notes [--ref <注解引用>] append [--allow-empty] [-m <说明> | -F <文件> | "
 "(-c | -C) <对象>] [<对象>]"
 
-#: builtin/notes.c:32
+#: builtin/notes.c
 msgid "git notes [--ref <notes-ref>] edit [--allow-empty] [<object>]"
 msgstr "git notes [--ref <注解引用>] edit [--allow-empty] [<对象>]"
 
-#: builtin/notes.c:33
+#: builtin/notes.c
 msgid "git notes [--ref <notes-ref>] show [<object>]"
 msgstr "git notes [--ref <注解引用>] show [<对象>]"
 
-#: builtin/notes.c:34
+#: builtin/notes.c
 msgid ""
 "git notes [--ref <notes-ref>] merge [-v | -q] [-s <strategy>] <notes-ref>"
 msgstr "git notes [--ref <注解引用>] merge [-v | -q] [-s <策略> ] <注解引用>"
 
-#: builtin/notes.c:37
+#: builtin/notes.c
 msgid "git notes [--ref <notes-ref>] remove [<object>...]"
 msgstr "git notes [--ref <注解引用>] remove [<对象>...]"
 
-#: builtin/notes.c:38
+#: builtin/notes.c
 msgid "git notes [--ref <notes-ref>] prune [-n] [-v]"
 msgstr "git notes [--ref <注解引用>] prune [-n] [-v]"
 
-#: builtin/notes.c:39
+#: builtin/notes.c
 msgid "git notes [--ref <notes-ref>] get-ref"
 msgstr "git notes [--ref <注解引用>] get-ref"
 
-#: builtin/notes.c:44
+#: builtin/notes.c
 msgid "git notes [list [<object>]]"
 msgstr "git notes [list [<对象>]]"
 
-#: builtin/notes.c:49
+#: builtin/notes.c
 msgid "git notes add [<options>] [<object>]"
 msgstr "git notes add [<选项>] [<对象>]"
 
-#: builtin/notes.c:54
+#: builtin/notes.c
 msgid "git notes copy [<options>] <from-object> <to-object>"
 msgstr "git notes copy [<选项>] <源对象> <目标对象>"
 
-#: builtin/notes.c:55
+#: builtin/notes.c
 msgid "git notes copy --stdin [<from-object> <to-object>]..."
 msgstr "git notes copy --stdin [<源对象> <目标对象>]..."
 
-#: builtin/notes.c:60
+#: builtin/notes.c
 msgid "git notes append [<options>] [<object>]"
 msgstr "git notes append [<选项>] [<对象>]"
 
-#: builtin/notes.c:65
+#: builtin/notes.c
 msgid "git notes edit [<object>]"
 msgstr "git notes edit [<对象>]"
 
-#: builtin/notes.c:70
+#: builtin/notes.c
 msgid "git notes show [<object>]"
 msgstr "git notes show [<对象>]"
 
-#: builtin/notes.c:75
+#: builtin/notes.c
 msgid "git notes merge [<options>] <notes-ref>"
 msgstr "git notes merge [<选项>] <注解引用>"
 
-#: builtin/notes.c:76
+#: builtin/notes.c
 msgid "git notes merge --commit [<options>]"
 msgstr "git notes merge --commit [<选项>]"
 
-#: builtin/notes.c:77
+#: builtin/notes.c
 msgid "git notes merge --abort [<options>]"
 msgstr "git notes merge --abort [<选项>]"
 
-#: builtin/notes.c:82
+#: builtin/notes.c
 msgid "git notes remove [<object>]"
 msgstr "git notes remove [<对象>]"
 
-#: builtin/notes.c:87
+#: builtin/notes.c
 msgid "git notes prune [<options>]"
 msgstr "git notes prune [<选项>]"
 
-#: builtin/notes.c:97
+#: builtin/notes.c
 msgid "Write/edit the notes for the following object:"
 msgstr "为下面的对象写/编辑说明："
 
-#: builtin/notes.c:149
+#: builtin/notes.c
 #, c-format
 msgid "unable to start 'show' for object '%s'"
 msgstr "不能为对象 '%s' 开始 'show'"
 
-#: builtin/notes.c:153
+#: builtin/notes.c
 msgid "could not read 'show' output"
 msgstr "不能读取 'show' 的输出"
 
-#: builtin/notes.c:161
+#: builtin/notes.c
 #, c-format
 msgid "failed to finish 'show' for object '%s'"
 msgstr "无法为对象 '%s' 完成 'show'"
 
-#: builtin/notes.c:194
+#: builtin/notes.c
 msgid "please supply the note contents using either -m or -F option"
 msgstr "请通过 -m 或 -F 选项为注解提供内容"
 
-#: builtin/notes.c:203
+#: builtin/notes.c
 msgid "unable to write note object"
 msgstr "不能写注解对象"
 
-#: builtin/notes.c:206
+#: builtin/notes.c
 #, c-format
 msgid "the note contents have been left in %s"
 msgstr "注解内容被留在 %s 中"
 
-#: builtin/notes.c:240 builtin/tag.c:582
+#: builtin/notes.c builtin/tag.c
 #, c-format
 msgid "could not open or read '%s'"
 msgstr "不能打开或读取 '%s'"
 
-#: 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
+#: builtin/notes.c
 #, c-format
 msgid "failed to resolve '%s' as a valid ref."
 msgstr "无法解析 '%s' 为一个有效引用。"
 
-#: builtin/notes.c:263
+#: builtin/notes.c
 #, c-format
 msgid "failed to read object '%s'."
 msgstr "无法读取对象 '%s'。"
 
-#: builtin/notes.c:266
+#: builtin/notes.c
 #, c-format
 msgid "cannot read note data from non-blob object '%s'."
 msgstr "不能从非数据对象 '%s' 中读取注解数据。"
 
-#: builtin/notes.c:307
+#: builtin/notes.c
 #, c-format
 msgid "malformed input line: '%s'."
 msgstr "格式错误的输入行：'%s'。"
 
-#: builtin/notes.c:322
+#: builtin/notes.c
 #, c-format
 msgid "failed to copy notes from '%s' to '%s'"
 msgstr "无法把注解从 '%s' 拷贝到 '%s'"
@@ -18883,82 +10654,82 @@ msgstr "无法把注解从 '%s' 拷贝到 '%s'"
 #. TRANSLATORS: the first %s will be replaced by a git
 #. notes command: 'add', 'merge', 'remove', etc.
 #.
-#: builtin/notes.c:354
+#: builtin/notes.c
 #, c-format
 msgid "refusing to %s notes in %s (outside of refs/notes/)"
 msgstr "拒绝向 %2$s（在 refs/notes/ 之外）%1$s注解"
 
-#: builtin/notes.c:387 builtin/notes.c:676
+#: builtin/notes.c
 #, c-format
 msgid "no note found for object %s."
 msgstr "未发现对象 %s 的注解。"
 
-#: builtin/notes.c:408 builtin/notes.c:574
+#: builtin/notes.c
 msgid "note contents as a string"
 msgstr "注解内容作为一个字符串"
 
-#: builtin/notes.c:411 builtin/notes.c:577
+#: builtin/notes.c
 msgid "note contents in a file"
 msgstr "注解内容到一个文件中"
 
-#: builtin/notes.c:414 builtin/notes.c:580
+#: builtin/notes.c
 msgid "reuse and edit specified note object"
 msgstr "重用和编辑指定的注解对象"
 
-#: builtin/notes.c:417 builtin/notes.c:583
+#: builtin/notes.c
 msgid "reuse specified note object"
 msgstr "重用指定的注解对象"
 
-#: builtin/notes.c:420 builtin/notes.c:586
+#: builtin/notes.c
 msgid "allow storing empty note"
 msgstr "允许保存空白注释"
 
-#: builtin/notes.c:421 builtin/notes.c:494
+#: builtin/notes.c
 msgid "replace existing notes"
 msgstr "替换已存在的注解"
 
-#: builtin/notes.c:446
+#: builtin/notes.c
 #, c-format
 msgid ""
 "Cannot add notes. Found existing notes for object %s. Use '-f' to overwrite "
 "existing notes"
 msgstr "不能添加注解。发现对象 %s 已存在注解。使用 '-f' 覆盖现存注解"
 
-#: builtin/notes.c:461 builtin/notes.c:542
+#: builtin/notes.c
 #, c-format
 msgid "Overwriting existing notes for object %s\n"
 msgstr "覆盖对象 %s 现存注解\n"
 
-#: builtin/notes.c:473 builtin/notes.c:635 builtin/notes.c:904
+#: builtin/notes.c
 #, c-format
 msgid "Removing note for object %s\n"
 msgstr "删除对象 %s 的注解\n"
 
-#: builtin/notes.c:495
+#: builtin/notes.c
 msgid "read objects from stdin"
 msgstr "从标准输入读取对象"
 
-#: builtin/notes.c:497
+#: builtin/notes.c
 msgid "load rewriting config for <command> (implies --stdin)"
 msgstr "重新加载 <命令> 的配置（隐含 --stdin）"
 
-#: builtin/notes.c:515
+#: builtin/notes.c
 msgid "too few arguments"
 msgstr "参数太少"
 
-#: builtin/notes.c:536
+#: builtin/notes.c
 #, c-format
 msgid ""
 "Cannot copy notes. Found existing notes for object %s. Use '-f' to overwrite "
 "existing notes"
 msgstr "不能拷贝注解。发现对象 %s 已存在注解。使用 '-f' 覆盖现存注解"
 
-#: builtin/notes.c:548
+#: builtin/notes.c
 #, c-format
 msgid "missing notes on source object %s. Cannot copy."
 msgstr "源对象 %s 缺少注解。不能拷贝。"
 
-#: builtin/notes.c:601
+#: builtin/notes.c
 #, c-format
 msgid ""
 "The -m/-F/-c/-C options have been deprecated for the 'edit' subcommand.\n"
@@ -18967,97 +10738,97 @@ msgstr ""
 "子命令 'edit' 的选项 -m/-F/-c/-C 已弃用。\n"
 "请换用 'git notes add -f -m/-F/-c/-C'。\n"
 
-#: builtin/notes.c:696
+#: builtin/notes.c
 msgid "failed to delete ref NOTES_MERGE_PARTIAL"
 msgstr "无法删除引用 NOTES_MERGE_PARTIAL"
 
-#: builtin/notes.c:698
+#: builtin/notes.c
 msgid "failed to delete ref NOTES_MERGE_REF"
 msgstr "无法删除引用 NOTES_MERGE_REF"
 
-#: builtin/notes.c:700
+#: builtin/notes.c
 msgid "failed to remove 'git notes merge' worktree"
 msgstr "无法删除 'git notes merge' 工作区"
 
-#: builtin/notes.c:720
+#: builtin/notes.c
 msgid "failed to read ref NOTES_MERGE_PARTIAL"
 msgstr "无法读取引用 NOTES_MERGE_PARTIAL"
 
-#: builtin/notes.c:722
+#: builtin/notes.c
 msgid "could not find commit from NOTES_MERGE_PARTIAL."
 msgstr "无法从 NOTES_MERGE_PARTIAL 中找到提交。"
 
-#: builtin/notes.c:724
+#: builtin/notes.c
 msgid "could not parse commit from NOTES_MERGE_PARTIAL."
 msgstr "无法从 NOTES_MERGE_PARTIAL 中解析提交。"
 
-#: builtin/notes.c:737
+#: builtin/notes.c
 msgid "failed to resolve NOTES_MERGE_REF"
 msgstr "无法解析 NOTES_MERGE_REF"
 
-#: builtin/notes.c:740
+#: builtin/notes.c
 msgid "failed to finalize notes merge"
 msgstr "无法完成注解合并"
 
-#: builtin/notes.c:766
+#: builtin/notes.c
 #, c-format
 msgid "unknown notes merge strategy %s"
 msgstr "未知的注解合并策略 %s"
 
-#: builtin/notes.c:782
+#: builtin/notes.c
 msgid "General options"
 msgstr "通用选项"
 
-#: builtin/notes.c:784
+#: builtin/notes.c
 msgid "Merge options"
 msgstr "合并选项"
 
-#: builtin/notes.c:786
+#: builtin/notes.c
 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:788
+#: builtin/notes.c
 msgid "Committing unmerged notes"
 msgstr "提交未合并的注解"
 
-#: builtin/notes.c:790
+#: builtin/notes.c
 msgid "finalize notes merge by committing unmerged notes"
 msgstr "通过提交未合并的注解来完成注解合并"
 
-#: builtin/notes.c:792
+#: builtin/notes.c
 msgid "Aborting notes merge resolution"
 msgstr "中止注解合并的方案"
 
-#: builtin/notes.c:794
+#: builtin/notes.c
 msgid "abort notes merge"
 msgstr "中止注解合并"
 
-#: builtin/notes.c:805
+#: builtin/notes.c
 msgid "cannot mix --commit, --abort or -s/--strategy"
 msgstr "不能混用 --commit、--abort 或 -s/--strategy"
 
-#: builtin/notes.c:810
+#: builtin/notes.c
 msgid "must specify a notes ref to merge"
 msgstr "必须指定一个注解引用来合并"
 
-#: builtin/notes.c:834
+#: builtin/notes.c
 #, c-format
 msgid "unknown -s/--strategy: %s"
 msgstr "未知的 -s/--strategy：%s"
 
-#: builtin/notes.c:874
+#: builtin/notes.c
 #, c-format
 msgid "a notes merge into %s is already in-progress at %s"
 msgstr "位于 %2$s 的一个到 %1$s 中的注解合并正在执行中"
 
-#: builtin/notes.c:878
+#: builtin/notes.c
 #, c-format
 msgid "failed to store link to current notes ref (%s)"
 msgstr "无法存储链接到当前的注解引用（%s）"
 
-#: builtin/notes.c:880
+#: builtin/notes.c
 #, c-format
 msgid ""
 "Automatic notes merge failed. Fix conflicts in %s and commit the result with "
@@ -19067,56 +10838,56 @@ msgstr ""
 "自动合并说明失败。修改 %s 中的冲突并且使用命令 'git notes merge --commit' 提"
 "交结果，或者使用命令 'git notes merge --abort' 终止合并。\n"
 
-#: builtin/notes.c:899 builtin/tag.c:595
+#: builtin/notes.c builtin/tag.c
 #, c-format
 msgid "Failed to resolve '%s' as a valid ref."
 msgstr "无法解析 '%s' 为一个有效引用。"
 
-#: builtin/notes.c:902
+#: builtin/notes.c
 #, c-format
 msgid "Object %s has no note\n"
 msgstr "对象 %s 没有注解\n"
 
-#: builtin/notes.c:914
+#: builtin/notes.c
 msgid "attempt to remove non-existent note is not an error"
 msgstr "尝试删除不存在的注解不是一个错误"
 
-#: builtin/notes.c:917
+#: builtin/notes.c
 msgid "read object names from the standard input"
 msgstr "从标准输入读取对象名称"
 
-#: builtin/notes.c:956 builtin/prune.c:144 builtin/worktree.c:148
+#: builtin/notes.c builtin/prune.c builtin/worktree.c
 msgid "do not remove, show only"
 msgstr "不删除，只显示"
 
-#: builtin/notes.c:957
+#: builtin/notes.c
 msgid "report pruned notes"
 msgstr "报告清除的注解"
 
-#: builtin/notes.c:1000
+#: builtin/notes.c
 msgid "notes-ref"
 msgstr "注解引用"
 
-#: builtin/notes.c:1001
+#: builtin/notes.c
 msgid "use notes from <notes-ref>"
 msgstr "从 <注解引用> 使用注解"
 
-#: builtin/notes.c:1036 builtin/stash.c:1802
+#: builtin/notes.c builtin/stash.c
 #, c-format
 msgid "unknown subcommand: %s"
 msgstr "未知子命令：%s"
 
-#: builtin/pack-objects.c:182
+#: builtin/pack-objects.c
 msgid ""
 "git pack-objects --stdout [<options>...] [< <ref-list> | < <object-list>]"
 msgstr "git pack-objects --stdout [<选项>...] [< <引用列表> | < <对象列表>]"
 
-#: builtin/pack-objects.c:183
+#: builtin/pack-objects.c
 msgid ""
 "git pack-objects [<options>...] <base-name> [< <ref-list> | < <object-list>]"
 msgstr "git pack-objects [<选项>...] <前缀名称> [< <引用列表> | < <对象列表>]"
 
-#: builtin/pack-objects.c:570
+#: builtin/pack-objects.c
 #, c-format
 msgid ""
 "write_reuse_object: could not locate %s, expected at offset %<PRIuMAX> in "
@@ -19124,110 +10895,124 @@ msgid ""
 msgstr ""
 "write_reuse_object：无法定位 %1$s，预期在包 %3$s 中的偏移量 %2$<PRIuMAX> 上"
 
-#: builtin/pack-objects.c:578
+#: builtin/pack-objects.c
 #, c-format
 msgid "bad packed object CRC for %s"
 msgstr "%s 错的包对象 CRC"
 
-#: builtin/pack-objects.c:589
+#: builtin/pack-objects.c
 #, c-format
 msgid "corrupt packed object for %s"
 msgstr "%s 损坏的包对象"
 
-#: builtin/pack-objects.c:720
+#: builtin/pack-objects.c
 #, c-format
 msgid "recursive delta detected for object %s"
 msgstr "发现对象 %s 递归 delta"
 
-#: builtin/pack-objects.c:939
+#: builtin/pack-objects.c
 #, c-format
 msgid "ordered %u objects, expected %<PRIu32>"
 msgstr "排序了 %u 个对象，预期 %<PRIu32> 个"
 
-#: builtin/pack-objects.c:1034
+#: builtin/pack-objects.c
 #, c-format
 msgid "expected object at offset %<PRIuMAX> in pack %s"
 msgstr "预期对象在包文件 %2$s 的偏移量 %1$<PRIuMAX> 上"
 
-#: builtin/pack-objects.c:1158
+#: builtin/pack-objects.c
 msgid "disabling bitmap writing, packs are split due to pack.packSizeLimit"
 msgstr "禁用 bitmap 写入，因为 pack.packSizeLimit 设置使得包被切分为多个"
 
-#: builtin/pack-objects.c:1171
+#: builtin/pack-objects.c
 msgid "Writing objects"
 msgstr "写入对象中"
 
-#: builtin/pack-objects.c:1243 builtin/update-index.c:90
+#: builtin/pack-objects.c builtin/update-index.c
 #, c-format
 msgid "failed to stat %s"
 msgstr "无法对 %s 调用 stat"
 
-#: builtin/pack-objects.c:1276
+#: builtin/pack-objects.c object-file.c
+#, c-format
+msgid "failed utime() on %s"
+msgstr "在 %s 上调用 utime() 失败"
+
+#: builtin/pack-objects.c
 msgid "failed to write bitmap index"
 msgstr "无法写入位图索引"
 
-#: builtin/pack-objects.c:1302
+#: builtin/pack-objects.c
 #, c-format
 msgid "wrote %<PRIu32> objects while expecting %<PRIu32>"
 msgstr "写入 %<PRIu32> 个对象而预期 %<PRIu32> 个"
 
-#: builtin/pack-objects.c:1544
+#: builtin/pack-objects.c
 msgid "disabling bitmap writing, as some objects are not being packed"
 msgstr "禁用 bitmap 写入，因为一些对象将不会被打包"
 
-#: builtin/pack-objects.c:1992
+#: builtin/pack-objects.c
 #, c-format
 msgid "delta base offset overflow in pack for %s"
 msgstr "%s 压缩中 delta 基准偏移越界"
 
-#: builtin/pack-objects.c:2001
+#: builtin/pack-objects.c
 #, c-format
 msgid "delta base offset out of bound for %s"
 msgstr "%s 的 delta 基准偏移越界"
 
-#: builtin/pack-objects.c:2282
+#: builtin/pack-objects.c
 msgid "Counting objects"
 msgstr "对象计数中"
 
-#: builtin/pack-objects.c:2447
+#: builtin/pack-objects.c pack-bitmap.c
+#, c-format
+msgid "unable to get size of %s"
+msgstr "无法得到 %s 的大小"
+
+#: builtin/pack-objects.c
 #, c-format
 msgid "unable to parse object header of %s"
 msgstr "无法解析对象 %s 头信息"
 
-#: builtin/pack-objects.c:2517 builtin/pack-objects.c:2533
-#: builtin/pack-objects.c:2543
+#: builtin/pack-objects.c
 #, c-format
 msgid "object %s cannot be read"
 msgstr "对象 %s 无法读取"
 
-#: builtin/pack-objects.c:2520 builtin/pack-objects.c:2547
+#: builtin/pack-objects.c
 #, c-format
 msgid "object %s inconsistent object length (%<PRIuMAX> vs %<PRIuMAX>)"
 msgstr "对象 %s 不一致的对象长度（%<PRIuMAX> vs %<PRIuMAX>）"
 
-#: builtin/pack-objects.c:2557
+#: builtin/pack-objects.c
 msgid "suboptimal pack - out of memory"
 msgstr "次优（suboptimal）打包 - 内存不足"
 
-#: builtin/pack-objects.c:2872
+#: builtin/pack-objects.c
 #, c-format
 msgid "Delta compression using up to %d threads"
 msgstr "使用 %d 个线程进行压缩"
 
-#: builtin/pack-objects.c:3011
+#: builtin/pack-objects.c
 #, c-format
 msgid "unable to pack objects reachable from tag %s"
 msgstr "无法为标签 %s 压缩对象"
 
-#: builtin/pack-objects.c:3097
+#: builtin/pack-objects.c commit-graph.c
+#, c-format
+msgid "unable to get type of object %s"
+msgstr "无法获得对象 %s 类型"
+
+#: builtin/pack-objects.c
 msgid "Compressing objects"
 msgstr "压缩对象中"
 
-#: builtin/pack-objects.c:3103
+#: builtin/pack-objects.c
 msgid "inconsistency with delta count"
 msgstr "不一致的差异计数"
 
-#: builtin/pack-objects.c:3182
+#: builtin/pack-objects.c
 #, c-format
 msgid ""
 "value of uploadpack.blobpackfileuri must be of the form '<object-hash> <pack-"
@@ -19236,24 +11021,40 @@ msgstr ""
 "uploadpack.blobpackfileuri 的取值必须是 '<object-hash> <pack-hash> <uri>' 格"
 "式（得到 '%s'）"
 
-#: builtin/pack-objects.c:3185
+#: builtin/pack-objects.c
 #, c-format
 msgid ""
 "object already configured in another uploadpack.blobpackfileuri (got '%s')"
 msgstr "对象已经在另外的 uploadpack.blobpackfileuri 中配置（得到 '%s'）"
 
-#: builtin/pack-objects.c:3220
+#: builtin/pack-objects.c
 #, c-format
 msgid "could not get type of object %s in pack %s"
 msgstr "无法获得包 %2$s 中对象 %1$s 的类型"
 
-#: builtin/pack-objects.c:3348 builtin/pack-objects.c:3359
-#: builtin/pack-objects.c:3373
+#: builtin/pack-objects.c
 #, c-format
 msgid "could not find pack '%s'"
 msgstr "不能找到包 '%s'"
 
-#: builtin/pack-objects.c:3416
+#: builtin/pack-objects.c
+#, c-format
+msgid "packfile %s cannot be accessed"
+msgstr "无法访问包文件 %s"
+
+#: builtin/pack-objects.c
+msgid "Enumerating cruft objects"
+msgstr "枚举废弃对象中"
+
+#: builtin/pack-objects.c
+msgid "unable to add cruft objects"
+msgstr "无法添加废弃对象"
+
+#: builtin/pack-objects.c
+msgid "Traversing cruft objects"
+msgstr "遍历废弃对象中"
+
+#: builtin/pack-objects.c
 #, c-format
 msgid ""
 "expected edge object ID, got garbage:\n"
@@ -19262,7 +11063,7 @@ msgstr ""
 "预期边界对象（edge object）ID，却得到垃圾数据：\n"
 " %s"
 
-#: builtin/pack-objects.c:3422
+#: builtin/pack-objects.c
 #, c-format
 msgid ""
 "expected object ID, got garbage:\n"
@@ -19271,238 +11072,267 @@ msgstr ""
 "预期对象 ID，却得到垃圾数据：\n"
 " %s"
 
-#: builtin/pack-objects.c:3540 builtin/pack-objects.c:3627
+#: builtin/pack-objects.c reachable.c
+msgid "could not load cruft pack .mtimes"
+msgstr "不能载入废弃包 .mtimes"
+
+#: builtin/pack-objects.c
 msgid "cannot open pack index"
 msgstr "无法打开包文件索引"
 
-#: builtin/pack-objects.c:3549
+#: builtin/pack-objects.c
 #, c-format
 msgid "loose object at %s could not be examined"
 msgstr "无法检查 %s 处的松散对象"
 
-#: builtin/pack-objects.c:3635
+#: builtin/pack-objects.c
 msgid "unable to force loose object"
 msgstr "无法强制松散对象"
 
-#: builtin/pack-objects.c:3763
+#: builtin/pack-objects.c
 #, c-format
 msgid "not a rev '%s'"
 msgstr "不是一个版本 '%s'"
 
-#: builtin/pack-objects.c:3766 builtin/rev-parse.c:1061
+#: builtin/pack-objects.c builtin/rev-parse.c
 #, c-format
 msgid "bad revision '%s'"
 msgstr "坏的版本 '%s'"
 
-#: builtin/pack-objects.c:3794
+#: builtin/pack-objects.c
 msgid "unable to add recent objects"
 msgstr "无法添加最近的对象"
 
-#: builtin/pack-objects.c:3847
+#: builtin/pack-objects.c
 #, c-format
 msgid "unsupported index version %s"
 msgstr "不支持的索引版本 %s"
 
-#: builtin/pack-objects.c:3851
+#: builtin/pack-objects.c
 #, c-format
 msgid "bad index version '%s'"
 msgstr "坏的索引版本 '%s'"
 
-#: builtin/pack-objects.c:3907
+#: builtin/pack-objects.c
 msgid "<version>[,<offset>]"
 msgstr "<版本>[,<偏移>]"
 
-#: builtin/pack-objects.c:3908
+#: builtin/pack-objects.c
 msgid "write the pack index file in the specified idx format version"
 msgstr "用指定的 idx 格式版本来写包索引文件"
 
-#: builtin/pack-objects.c:3911
+#: builtin/pack-objects.c
 msgid "maximum size of each output pack file"
 msgstr "每个输出包的最大尺寸"
 
-#: builtin/pack-objects.c:3913
+#: builtin/pack-objects.c
 msgid "ignore borrowed objects from alternate object store"
 msgstr "忽略从备用对象存储里借用对象"
 
-#: builtin/pack-objects.c:3915
+#: builtin/pack-objects.c
 msgid "ignore packed objects"
 msgstr "忽略包对象"
 
-#: builtin/pack-objects.c:3917
+#: builtin/pack-objects.c
 msgid "limit pack window by objects"
 msgstr "限制打包窗口的对象数"
 
-#: builtin/pack-objects.c:3919
+#: builtin/pack-objects.c
 msgid "limit pack window by memory in addition to object limit"
 msgstr "除对象数量限制外设置打包窗口的内存限制"
 
-#: builtin/pack-objects.c:3921
+#: builtin/pack-objects.c
 msgid "maximum length of delta chain allowed in the resulting pack"
 msgstr "打包允许的 delta 链的最大长度"
 
-#: builtin/pack-objects.c:3923
+#: builtin/pack-objects.c
 msgid "reuse existing deltas"
 msgstr "重用已存在的 deltas"
 
-#: builtin/pack-objects.c:3925
+#: builtin/pack-objects.c
 msgid "reuse existing objects"
 msgstr "重用已存在的对象"
 
-#: builtin/pack-objects.c:3927
+#: builtin/pack-objects.c
 msgid "use OFS_DELTA objects"
 msgstr "使用 OFS_DELTA 对象"
 
-#: builtin/pack-objects.c:3929
+#: builtin/pack-objects.c
 msgid "use threads when searching for best delta matches"
 msgstr "使用线程查询最佳 delta 匹配"
 
-#: builtin/pack-objects.c:3931
+#: builtin/pack-objects.c
 msgid "do not create an empty pack output"
 msgstr "不创建空的包输出"
 
-#: builtin/pack-objects.c:3933
+#: builtin/pack-objects.c
 msgid "read revision arguments from standard input"
 msgstr "从标准输入读取版本号参数"
 
-#: builtin/pack-objects.c:3935
+#: builtin/pack-objects.c
 msgid "limit the objects to those that are not yet packed"
 msgstr "限制那些尚未打包的对象"
 
-#: builtin/pack-objects.c:3938
+#: builtin/pack-objects.c
 msgid "include objects reachable from any reference"
 msgstr "包括可以从任何引用访问到的对象"
 
-#: builtin/pack-objects.c:3941
+#: builtin/pack-objects.c
 msgid "include objects referred by reflog entries"
 msgstr "包括被引用日志引用到的对象"
 
-#: builtin/pack-objects.c:3944
+#: builtin/pack-objects.c
 msgid "include objects referred to by the index"
 msgstr "包括被索引引用到的对象"
 
-#: builtin/pack-objects.c:3947
+#: builtin/pack-objects.c
 msgid "read packs from stdin"
 msgstr "从标准输入读取包"
 
-#: builtin/pack-objects.c:3949
+#: builtin/pack-objects.c
 msgid "output pack to stdout"
 msgstr "输出包到标准输出"
 
-#: builtin/pack-objects.c:3951
+#: builtin/pack-objects.c
 msgid "include tag objects that refer to objects to be packed"
 msgstr "包括那些引用了待打包对象的标签对象"
 
-#: builtin/pack-objects.c:3953
+#: builtin/pack-objects.c
 msgid "keep unreachable objects"
 msgstr "维持不可达的对象"
 
-#: builtin/pack-objects.c:3955
+#: builtin/pack-objects.c
 msgid "pack loose unreachable objects"
 msgstr "打包松散的不可达对象"
 
-#: builtin/pack-objects.c:3957
+#: builtin/pack-objects.c
 msgid "unpack unreachable objects newer than <time>"
 msgstr "将比给定 <时间> 新的无法访问的对象解包"
 
-#: builtin/pack-objects.c:3960
+#: builtin/pack-objects.c
+msgid "create a cruft pack"
+msgstr "创建废弃包"
+
+#: builtin/pack-objects.c
+msgid "expire cruft objects older than <time>"
+msgstr "使早于给定 <时间> 的废弃对象过期"
+
+#: builtin/pack-objects.c
 msgid "use the sparse reachability algorithm"
 msgstr "使用稀疏可达性算法"
 
-#: builtin/pack-objects.c:3962
+#: builtin/pack-objects.c
 msgid "create thin packs"
 msgstr "创建精简包"
 
-#: builtin/pack-objects.c:3964
+#: builtin/pack-objects.c
 msgid "create packs suitable for shallow fetches"
 msgstr "创建适合浅克隆仓库获取的包"
 
-#: builtin/pack-objects.c:3966
+#: builtin/pack-objects.c
 msgid "ignore packs that have companion .keep file"
 msgstr "忽略配有 .keep 文件的包"
 
-#: builtin/pack-objects.c:3968
+#: builtin/pack-objects.c
 msgid "ignore this pack"
 msgstr "忽略该 pack"
 
-#: builtin/pack-objects.c:3970
+#: builtin/pack-objects.c
 msgid "pack compression level"
 msgstr "打包压缩级别"
 
-#: builtin/pack-objects.c:3972
+#: builtin/pack-objects.c
 msgid "do not hide commits by grafts"
 msgstr "显示被移植隐藏的提交"
 
-#: builtin/pack-objects.c:3974
+#: builtin/pack-objects.c
 msgid "use a bitmap index if available to speed up counting objects"
 msgstr "使用 bitmap 索引（如果有的话）以提高对象计数时的速度"
 
-#: builtin/pack-objects.c:3976
+#: builtin/pack-objects.c
 msgid "write a bitmap index together with the pack index"
 msgstr "在建立包索引的同时创建 bitmap 索引"
 
-#: builtin/pack-objects.c:3980
+#: builtin/pack-objects.c
 msgid "write a bitmap index if possible"
 msgstr "如果可能，写 bitmap 索引"
 
-#: builtin/pack-objects.c:3984
+#: builtin/pack-objects.c
 msgid "handling for missing objects"
 msgstr "处理丢失的对象"
 
-#: builtin/pack-objects.c:3987
+#: builtin/pack-objects.c
 msgid "do not pack objects in promisor packfiles"
 msgstr "不要打包 promisor 包文件中的对象"
 
-#: builtin/pack-objects.c:3989
+#: builtin/pack-objects.c
 msgid "respect islands during delta compression"
 msgstr "在增量压缩时参考数据岛"
 
-#: builtin/pack-objects.c:3991
+#: builtin/pack-objects.c
 msgid "protocol"
 msgstr "协议"
 
-#: builtin/pack-objects.c:3992
+#: builtin/pack-objects.c
 msgid "exclude any configured uploadpack.blobpackfileuri with this protocol"
 msgstr "使用此协议排除任何已配置的 uploadpack.blobpackfileuri"
 
-#: builtin/pack-objects.c:4027
+#: builtin/pack-objects.c
 #, c-format
 msgid "delta chain depth %d is too deep, forcing %d"
 msgstr "增量链深度 %d 太深了，强制为 %d"
 
-#: builtin/pack-objects.c:4032
+#: builtin/pack-objects.c
 #, c-format
 msgid "pack.deltaCacheLimit is too high, forcing %d"
 msgstr "配置 pack.deltaCacheLimit 太高了，强制为 %d"
 
-#: builtin/pack-objects.c:4088
+#: builtin/pack-objects.c config.c
+#, c-format
+msgid "bad pack compression level %d"
+msgstr "错误的打包压缩级别 %d"
+
+#: builtin/pack-objects.c
 msgid "--max-pack-size cannot be used to build a pack for transfer"
 msgstr "不能使用 --max-pack-size 来构建传输用的包文件"
 
-#: builtin/pack-objects.c:4090
+#: builtin/pack-objects.c
 msgid "minimum pack size limit is 1 MiB"
 msgstr "最小的包文件大小是 1 MiB"
 
-#: builtin/pack-objects.c:4095
+#: builtin/pack-objects.c
 msgid "--thin cannot be used to build an indexable pack"
 msgstr "--thin 不能用于创建一个可索引包"
 
-#: builtin/pack-objects.c:4104
+#: builtin/pack-objects.c
 msgid "cannot use --filter without --stdout"
 msgstr "不能在没有 --stdout 的情况下使用 --filter"
 
-#: builtin/pack-objects.c:4106
+#: builtin/pack-objects.c
 msgid "cannot use --filter with --stdin-packs"
 msgstr "不能同时使用 --filter 和 --stdin-packs"
 
-#: builtin/pack-objects.c:4110
+#: builtin/pack-objects.c
 msgid "cannot use internal rev list with --stdin-packs"
 msgstr "不能同时使用内部版本列表和 --stdin-packs"
 
-#: builtin/pack-objects.c:4169
+#: builtin/pack-objects.c
+msgid "cannot use internal rev list with --cruft"
+msgstr "不能同时使用内部版本列表和 --cruft"
+
+#: builtin/pack-objects.c
+msgid "cannot use --stdin-packs with --cruft"
+msgstr "不能将 --stdin-packs 和 --cruft 同时使用"
+
+#: builtin/pack-objects.c
+msgid "cannot use --max-pack-size with --cruft"
+msgstr "不能将 --max-pack-size 和 --cruft 同时使用"
+
+#: builtin/pack-objects.c
 msgid "Enumerating objects"
 msgstr "枚举对象中"
 
-#: builtin/pack-objects.c:4210
+#: builtin/pack-objects.c
 #, c-format
 msgid ""
 "Total %<PRIu32> (delta %<PRIu32>), reused %<PRIu32> (delta %<PRIu32>), pack-"
@@ -19511,7 +11341,7 @@ msgstr ""
 "总共 %<PRIu32>（差异 %<PRIu32>），复用 %<PRIu32>（差异 %<PRIu32>），包复用 "
 "%<PRIu32>"
 
-#: builtin/pack-redundant.c:601
+#: builtin/pack-redundant.c
 msgid ""
 "'git pack-redundant' is nominated for removal.\n"
 "If you still use this command, please add an extra\n"
@@ -19524,96 +11354,96 @@ msgstr ""
 "并通过发送邮件到 <git@vger.kernel.org> 让我们知道您仍旧\n"
 "使用它。 谢谢。\n"
 
-#: builtin/pack-refs.c:8
+#: builtin/pack-refs.c
 msgid "git pack-refs [<options>]"
 msgstr "git pack-refs [<选项>]"
 
-#: builtin/pack-refs.c:16
+#: builtin/pack-refs.c
 msgid "pack everything"
 msgstr "打包一切"
 
-#: builtin/pack-refs.c:17
+#: builtin/pack-refs.c
 msgid "prune loose refs (default)"
 msgstr "清除松散的引用（默认）"
 
-#: builtin/prune.c:14
+#: builtin/prune.c
 msgid "git prune [-n] [-v] [--progress] [--expire <time>] [--] [<head>...]"
 msgstr "git prune [-n] [-v] [--progress] [--expire <时间>] [--] [<head>...]"
 
-#: builtin/prune.c:145
+#: builtin/prune.c
 msgid "report pruned objects"
 msgstr "报告清除的对象"
 
-#: builtin/prune.c:148
+#: builtin/prune.c
 msgid "expire objects older than <time>"
 msgstr "使早于给定时间的对象过期"
 
-#: builtin/prune.c:150
+#: builtin/prune.c
 msgid "limit traversal to objects outside promisor packfiles"
 msgstr "限制遍历 promisor 包以外的对象"
 
-#: builtin/prune.c:163
+#: builtin/prune.c
 msgid "cannot prune in a precious-objects repo"
 msgstr "不能在珍品仓库中执行清理操作"
 
-#: builtin/pull.c:67
+#: builtin/pull.c
 msgid "git pull [<options>] [<repository> [<refspec>...]]"
 msgstr "git pull [<选项>] [<仓库> [<引用规格>...]]"
 
-#: builtin/pull.c:124
+#: builtin/pull.c
 msgid "control for recursive fetching of submodules"
 msgstr "控制子模组的递归获取"
 
-#: builtin/pull.c:128
+#: builtin/pull.c
 msgid "Options related to merging"
 msgstr "和合并相关的选项"
 
-#: builtin/pull.c:131
+#: builtin/pull.c
 msgid "incorporate changes by rebasing rather than merging"
 msgstr "使用变基操作取代合并操作以合入修改"
 
-#: builtin/pull.c:159 builtin/revert.c:126
+#: builtin/pull.c builtin/revert.c
 msgid "allow fast-forward"
 msgstr "允许快进式"
 
-#: builtin/pull.c:165
+#: builtin/pull.c
 msgid "control use of pre-merge-commit and commit-msg hooks"
 msgstr "控制 pre-merge-commit 和 commit-msg 钩子的使用"
 
-#: builtin/pull.c:171 parse-options.h:371
+#: builtin/pull.c parse-options.h
 msgid "automatically stash/stash pop before and after"
 msgstr "在操作前后执行自动贮藏和弹出贮藏"
 
-#: builtin/pull.c:187
+#: builtin/pull.c
 msgid "Options related to fetching"
 msgstr "和获取相关的参数"
 
-#: builtin/pull.c:197
+#: builtin/pull.c
 msgid "force overwrite of local branch"
 msgstr "强制覆盖本地分支"
 
-#: builtin/pull.c:205
+#: builtin/pull.c
 msgid "number of submodules pulled in parallel"
 msgstr "并发拉取的子模组的数量"
 
-#: builtin/pull.c:449
+#: builtin/pull.c
 msgid ""
 "There is no candidate for rebasing against among the refs that you just "
 "fetched."
 msgstr "在您刚刚获取到的引用中没有变基操作的候选。"
 
-#: builtin/pull.c:451
+#: builtin/pull.c
 msgid ""
 "There are no candidates for merging among the refs that you just fetched."
 msgstr "在您刚刚获取到的引用中没有合并操作的候选。"
 
-#: builtin/pull.c:452
+#: builtin/pull.c
 msgid ""
 "Generally this means that you provided a wildcard refspec which had no\n"
 "matches on the remote end."
 msgstr "通常这意味着您提供了一个通配符引用规格但未能和远端匹配。"
 
-#: builtin/pull.c:455
+#: builtin/pull.c
 #, c-format
 msgid ""
 "You asked to pull from the remote '%s', but did not specify\n"
@@ -19623,42 +11453,40 @@ msgstr ""
 "您要求从远程 '%s' 拉取，但是未指定一个分支。因为这不是当前\n"
 "分支默认的远程仓库，您必须在命令行中指定一个分支名。"
 
-#: builtin/pull.c:460 builtin/rebase.c:978
+#: builtin/pull.c builtin/rebase.c
 msgid "You are not currently on a branch."
 msgstr "您当前不在一个分支上。"
 
-#: builtin/pull.c:462 builtin/pull.c:477
+#: builtin/pull.c
 msgid "Please specify which branch you want to rebase against."
 msgstr "请指定您要变基到哪一个分支。"
 
-#: builtin/pull.c:464 builtin/pull.c:479
+#: builtin/pull.c
 msgid "Please specify which branch you want to merge with."
 msgstr "请指定您要合并哪一个分支。"
 
-#: builtin/pull.c:465 builtin/pull.c:480
+#: builtin/pull.c
 msgid "See git-pull(1) for details."
 msgstr "详见 git-pull(1)。"
 
-#: builtin/pull.c:467 builtin/pull.c:473 builtin/pull.c:482
-#: builtin/rebase.c:984
+#: builtin/pull.c builtin/rebase.c
 msgid "<remote>"
 msgstr "<远程>"
 
-#: builtin/pull.c:467 builtin/pull.c:482 builtin/pull.c:487
-#: contrib/scalar/scalar.c:374
+#: builtin/pull.c contrib/scalar/scalar.c
 msgid "<branch>"
 msgstr "<分支>"
 
-#: builtin/pull.c:475 builtin/rebase.c:976
+#: builtin/pull.c builtin/rebase.c
 msgid "There is no tracking information for the current branch."
 msgstr "当前分支没有跟踪信息。"
 
-#: builtin/pull.c:484
+#: builtin/pull.c
 msgid ""
 "If you wish to set tracking information for this branch you can do so with:"
 msgstr "如果您想要为此分支创建跟踪信息，您可以执行："
 
-#: builtin/pull.c:489
+#: builtin/pull.c
 #, c-format
 msgid ""
 "Your configuration specifies to merge with the ref '%s'\n"
@@ -19667,16 +11495,16 @@ msgstr ""
 "您的配置中指定要合并远程的引用 '%s'，\n"
 "但是没有获取到这个引用。"
 
-#: builtin/pull.c:600
+#: builtin/pull.c
 #, c-format
 msgid "unable to access commit %s"
 msgstr "无法访问提交 %s"
 
-#: builtin/pull.c:908
+#: builtin/pull.c
 msgid "ignoring --verify-signatures for rebase"
 msgstr "为变基操作忽略 --verify-signatures"
 
-#: builtin/pull.c:969
+#: builtin/pull.c
 msgid ""
 "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"
@@ -19703,19 +11531,19 @@ msgstr ""
 "缺省的配置项。您也可以在每次执行 pull 命令时添加 --rebase、--no-rebase，\n"
 "或者 --ff-only 参数覆盖缺省设置。\n"
 
-#: builtin/pull.c:1047
+#: builtin/pull.c
 msgid "Updating an unborn branch with changes added to the index."
 msgstr "更新尚未诞生的分支，变更添加至索引。"
 
-#: builtin/pull.c:1051
+#: builtin/pull.c
 msgid "pull with rebase"
 msgstr "变基式拉取"
 
-#: builtin/pull.c:1052
+#: builtin/pull.c
 msgid "please commit or stash them."
 msgstr "请提交或贮藏它们。"
 
-#: builtin/pull.c:1077
+#: builtin/pull.c
 #, c-format
 msgid ""
 "fetch updated the current branch head.\n"
@@ -19725,7 +11553,7 @@ msgstr ""
 "fetch 更新了当前的分支。快进您的工作区\n"
 "至提交 %s。"
 
-#: builtin/pull.c:1083
+#: builtin/pull.c
 #, c-format
 msgid ""
 "Cannot fast-forward your working tree.\n"
@@ -19742,47 +11570,59 @@ msgstr ""
 "$ git reset --hard\n"
 "恢复之前的状态。"
 
-#: builtin/pull.c:1098
+#: builtin/pull.c
 msgid "Cannot merge multiple branches into empty head."
 msgstr "无法将多个分支合并到空分支。"
 
-#: builtin/pull.c:1103
+#: builtin/pull.c
 msgid "Cannot rebase onto multiple branches."
 msgstr "无法变基到多个分支。"
 
-#: builtin/pull.c:1105
+#: builtin/pull.c
 msgid "Cannot fast-forward to multiple branches."
 msgstr "无法快进到多个分支。"
 
-#: builtin/pull.c:1120
+#: builtin/pull.c
 msgid "Need to specify how to reconcile divergent branches."
 msgstr "需要指定如何调和偏离的分支。"
 
-#: builtin/pull.c:1134
+#: builtin/pull.c
 msgid "cannot rebase with locally recorded submodule modifications"
 msgstr "本地子模组中有修改，无法变基"
 
-#: builtin/push.c:19
+#: builtin/push.c
 msgid "git push [<options>] [<repository> [<refspec>...]]"
 msgstr "git push [<选项>] [<仓库> [<引用规格>...]]"
 
-#: builtin/push.c:111
+#: builtin/push.c
 msgid "tag shorthand without <tag>"
 msgstr "标签后面未提供 <标签> 参数"
 
-#: builtin/push.c:119
+#: builtin/push.c
 msgid "--delete only accepts plain target ref names"
 msgstr "--delete 只接受简单的目标引用名"
 
-#: builtin/push.c:164
+#: builtin/push.c
 msgid ""
 "\n"
-"To choose either option permanently, see push.default in 'git help config'."
+"To choose either option permanently, see push.default in 'git help config'.\n"
 msgstr ""
 "\n"
-"为了永久地选择任一选项，参见 'git help config' 中的 push.default。"
+"为了永久地选择任一选项，参见 'git help config' 中的 push.default。\n"
 
-#: builtin/push.c:167
+#: builtin/push.c
+msgid ""
+"\n"
+"To avoid automatically configuring upstream branches when their name\n"
+"doesn't match the local branch, see option 'simple' of branch."
+"autoSetupMerge\n"
+"in 'git help config'.\n"
+msgstr ""
+"\n"
+"为了避免在与本地分支名字不匹配时自动设置上游分支，参见 'git help config'\n"
+"中 branch.autoSetupMerge 的 'simple' 选项。\n"
+
+#: builtin/push.c
 #, c-format
 msgid ""
 "The upstream branch of your current branch does not match\n"
@@ -19794,7 +11634,7 @@ msgid ""
 "To push to the branch of the same name on the remote, use\n"
 "\n"
 "    git push %s HEAD\n"
-"%s"
+"%s%s"
 msgstr ""
 "您当前分支的上游分支和您当前分支名不匹配，为推送到远程的上游分支，\n"
 "使用\n"
@@ -19804,9 +11644,9 @@ msgstr ""
 "为推送至远程同名分支，使用\n"
 "\n"
 "    git push %s HEAD\n"
-"%s"
+"%s%s"
 
-#: builtin/push.c:182
+#: builtin/push.c
 #, c-format
 msgid ""
 "You are not currently on a branch.\n"
@@ -19820,30 +11660,42 @@ msgstr ""
 "\n"
 "    git push %s HEAD:<远程分支名字>\n"
 
-#: builtin/push.c:191
+#: builtin/push.c
+msgid ""
+"\n"
+"To have this happen automatically for branches without a tracking\n"
+"upstream, see 'push.autoSetupRemote' in 'git help config'.\n"
+msgstr ""
+"\n"
+"为了让没有追踪上游的分支自动配置，参见 'git help config' 中的 push."
+"autoSetupRemote。\n"
+
+#: builtin/push.c
 #, c-format
 msgid ""
 "The current branch %s has no upstream branch.\n"
 "To push the current branch and set the remote as upstream, use\n"
 "\n"
 "    git push --set-upstream %s %s\n"
+"%s"
 msgstr ""
 "当前分支 %s 没有对应的上游分支。\n"
 "为推送当前分支并建立与远程上游的跟踪，使用\n"
 "\n"
 "    git push --set-upstream %s %s\n"
+"%s"
 
-#: builtin/push.c:199
+#: builtin/push.c
 #, c-format
 msgid "The current branch %s has multiple upstream branches, refusing to push."
 msgstr "当前分支 %s 有多个上游分支，拒绝推送。"
 
-#: builtin/push.c:217
+#: builtin/push.c
 msgid ""
 "You didn't specify any refspecs to push, and push.default is \"nothing\"."
 msgstr "您没有为推送指定任何引用规格，并且 push.default 为 \"nothing\"。"
 
-#: builtin/push.c:243
+#: builtin/push.c
 #, c-format
 msgid ""
 "You are pushing to remote '%s', which is not the upstream of\n"
@@ -19853,7 +11705,7 @@ msgstr ""
 "您正推送至远程 '%s'（其并非当前分支 '%s' 的上游），\n"
 "而没有告诉我要推送什么、更新哪个远程分支。"
 
-#: builtin/push.c:258
+#: builtin/push.c
 msgid ""
 "Updates were rejected because the tip of your current branch is behind\n"
 "its remote counterpart. Integrate the remote changes (e.g.\n"
@@ -19864,7 +11716,7 @@ msgstr ""
 "再次推送前，先与远程变更合并（如 'git pull ...'）。详见\n"
 "'git push --help' 中的 'Note about fast-forwards' 小节。"
 
-#: builtin/push.c:264
+#: builtin/push.c
 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"
@@ -19875,7 +11727,7 @@ msgstr ""
 "检出该分支并整合远程变更（如 'git pull ...'），然后再推送。详见\n"
 "'git push --help' 中的 'Note about fast-forwards' 小节。"
 
-#: builtin/push.c:270
+#: builtin/push.c
 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"
@@ -19888,11 +11740,11 @@ msgstr ""
 "（如 'git pull ...'）。\n"
 "详见 'git push --help' 中的 'Note about fast-forwards' 小节。"
 
-#: builtin/push.c:277
+#: builtin/push.c
 msgid "Updates were rejected because the tag already exists in the remote."
 msgstr "更新被拒绝，因为该标签在远程已经存在。"
 
-#: builtin/push.c:280
+#: builtin/push.c
 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"
@@ -19901,7 +11753,7 @@ msgstr ""
 "如果不使用 '--force' 参数，您不能更新一个指向非提交对象的远程引用，\n"
 "也不能更新远程引用让其指向一个非提交对象。\n"
 
-#: builtin/push.c:285
+#: builtin/push.c
 msgid ""
 "Updates were rejected because the tip of the remote-tracking\n"
 "branch has been updated since the last checkout. You may want\n"
@@ -19911,99 +11763,103 @@ msgstr ""
 "更新被拒绝，因为远程跟踪分支的最新提交自从上次检出之后已被更新。\n"
 "在强制更新前，您可能想将这些变更整合到本地（如 'git pull ...'）。\n"
 
-#: builtin/push.c:355
+#: builtin/push.c
 #, c-format
 msgid "Pushing to %s\n"
 msgstr "推送到 %s\n"
 
-#: builtin/push.c:362
+#: builtin/push.c
 #, c-format
 msgid "failed to push some refs to '%s'"
 msgstr "无法推送一些引用到 '%s'"
 
-#: builtin/push.c:544 builtin/submodule--helper.c:3377
+#: builtin/push.c builtin/send-pack.c submodule-config.c
+#, c-format
+msgid "invalid value for '%s'"
+msgstr "'%s' 的值无效"
+
+#: builtin/push.c builtin/submodule--helper.c
 msgid "repository"
 msgstr "仓库"
 
-#: builtin/push.c:545 builtin/send-pack.c:193
+#: builtin/push.c builtin/send-pack.c
 msgid "push all refs"
 msgstr "推送所有引用"
 
-#: builtin/push.c:546 builtin/send-pack.c:195
+#: builtin/push.c builtin/send-pack.c
 msgid "mirror all refs"
 msgstr "镜像所有引用"
 
-#: builtin/push.c:548
+#: builtin/push.c
 msgid "delete refs"
 msgstr "删除引用"
 
-#: builtin/push.c:549
+#: builtin/push.c
 msgid "push tags (can't be used with --all or --mirror)"
 msgstr "推送标签（不能使用 --all or --mirror）"
 
-#: builtin/push.c:552 builtin/send-pack.c:196
+#: builtin/push.c builtin/send-pack.c
 msgid "force updates"
 msgstr "强制更新"
 
-#: builtin/push.c:553 builtin/send-pack.c:208
+#: builtin/push.c builtin/send-pack.c
 msgid "<refname>:<expect>"
 msgstr "<引用名>:<期望值>"
 
-#: builtin/push.c:554 builtin/send-pack.c:209
+#: builtin/push.c builtin/send-pack.c
 msgid "require old value of ref to be at this value"
 msgstr "要求引用旧的取值为设定值"
 
-#: builtin/push.c:557 builtin/send-pack.c:212
+#: builtin/push.c builtin/send-pack.c
 msgid "require remote updates to be integrated locally"
 msgstr "要求远程更新在本地被整合"
 
-#: builtin/push.c:560
+#: builtin/push.c
 msgid "control recursive pushing of submodules"
 msgstr "控制子模组的递归推送"
 
-#: builtin/push.c:561 builtin/send-pack.c:203
+#: builtin/push.c builtin/send-pack.c
 msgid "use thin pack"
 msgstr "使用精简打包"
 
-#: builtin/push.c:562 builtin/push.c:563 builtin/send-pack.c:190
-#: builtin/send-pack.c:191
+#: builtin/push.c builtin/send-pack.c
 msgid "receive pack program"
 msgstr "接收包程序"
 
-#: builtin/push.c:564
+#: builtin/push.c
 msgid "set upstream for git pull/status"
 msgstr "设置 git pull/status 的上游"
 
-#: builtin/push.c:567
+#: builtin/push.c
 msgid "prune locally removed refs"
 msgstr "清除本地删除的引用"
 
-#: builtin/push.c:569
+#: builtin/push.c
 msgid "bypass pre-push hook"
 msgstr "绕过 pre-push 钩子"
 
-#: builtin/push.c:570
+#: builtin/push.c
 msgid "push missing but relevant tags"
 msgstr "推送缺失但有关的标签"
 
-#: builtin/push.c:572 builtin/send-pack.c:197
+#: builtin/push.c builtin/send-pack.c
 msgid "GPG sign the push"
 msgstr "用 GPG 为推送签名"
 
-#: builtin/push.c:574 builtin/send-pack.c:204
+#: builtin/push.c builtin/send-pack.c
 msgid "request atomic transaction on remote side"
 msgstr "需要远端支持原子事务"
 
-#: builtin/push.c:594
+#: builtin/push.c
 msgid "--delete doesn't make sense without any refs"
 msgstr "--delete 未接任何引用没有意义"
 
-#: builtin/push.c:614
+#: builtin/push.c
 #, c-format
 msgid "bad repository '%s'"
 msgstr "坏的仓库 '%s'"
 
-#: builtin/push.c:615
+#: builtin/push.c
 msgid ""
 "No configured push destination.\n"
 "Either specify the URL from the command-line or configure a remote "
@@ -20024,64 +11880,64 @@ msgstr ""
 "\n"
 "    git push <名称>\n"
 
-#: builtin/push.c:632
+#: builtin/push.c
 msgid "--all can't be combined with refspecs"
 msgstr "--all 不能和引用规格同时使用"
 
-#: builtin/push.c:638
+#: builtin/push.c
 msgid "--mirror can't be combined with refspecs"
 msgstr "--mirror 不能和引用规格同时使用"
 
-#: builtin/push.c:648
+#: builtin/push.c
 msgid "push options must not have new line characters"
 msgstr "推送选项不能有换行符"
 
-#: builtin/range-diff.c:9
+#: builtin/range-diff.c
 msgid "git range-diff [<options>] <old-base>..<old-tip> <new-base>..<new-tip>"
 msgstr "git range-diff [<选项>] <old-base>..<old-tip> <new-base>..<new-tip>"
 
-#: builtin/range-diff.c:10
+#: builtin/range-diff.c
 msgid "git range-diff [<options>] <old-tip>...<new-tip>"
 msgstr "git range-diff [<选项>] <old-tip>...<new-tip>"
 
-#: builtin/range-diff.c:11
+#: builtin/range-diff.c
 msgid "git range-diff [<options>] <base> <old-tip> <new-tip>"
 msgstr "git range-diff [<选项>] <base> <old-tip> <new-tip>"
 
-#: builtin/range-diff.c:30
+#: builtin/range-diff.c
 msgid "use simple diff colors"
 msgstr "使用简单差异颜色"
 
-#: builtin/range-diff.c:32
+#: builtin/range-diff.c
 msgid "notes"
 msgstr "注解"
 
-#: builtin/range-diff.c:32
+#: builtin/range-diff.c
 msgid "passed to 'git log'"
 msgstr "传递给 'git log'"
 
-#: builtin/range-diff.c:35
+#: builtin/range-diff.c
 msgid "only emit output related to the first range"
 msgstr "仅显示与第一个范围有关的输出"
 
-#: builtin/range-diff.c:37
+#: builtin/range-diff.c
 msgid "only emit output related to the second range"
 msgstr "仅显示与第二个范围有关的输出"
 
-#: builtin/range-diff.c:60 builtin/range-diff.c:64
+#: builtin/range-diff.c
 #, c-format
 msgid "not a commit range: '%s'"
 msgstr "不是一个提交范围：'%s'"
 
-#: builtin/range-diff.c:74
+#: builtin/range-diff.c
 msgid "single arg format must be symmetric range"
 msgstr "单个参数格式必须是对称范围（即包含...）"
 
-#: builtin/range-diff.c:89
+#: builtin/range-diff.c
 msgid "need two commit ranges"
 msgstr "需要两个提交范围"
 
-#: builtin/read-tree.c:41
+#: builtin/read-tree.c
 msgid ""
 "git read-tree [(-m [--trivial] [--aggressive] | --reset | --prefix=<prefix>) "
 "[-u | -i]] [--no-sparse-checkout] [--index-output=<file>] (--empty | <tree-"
@@ -20091,79 +11947,79 @@ msgstr ""
 "u | -i]] [--no-sparse-checkout] [--index-output=<文件>] (--empty | <树对象一"
 "> [<树对象二> [<树对象三>]])"
 
-#: builtin/read-tree.c:116
+#: builtin/read-tree.c
 msgid "write resulting index to <file>"
 msgstr "将索引结果写入 <文件>"
 
-#: builtin/read-tree.c:119
+#: builtin/read-tree.c
 msgid "only empty the index"
 msgstr "只是清空索引"
 
-#: builtin/read-tree.c:121
+#: builtin/read-tree.c
 msgid "Merging"
 msgstr "合并"
 
-#: builtin/read-tree.c:123
+#: builtin/read-tree.c
 msgid "perform a merge in addition to a read"
 msgstr "读取之余再执行一个合并"
 
-#: builtin/read-tree.c:125
+#: builtin/read-tree.c
 msgid "3-way merge if no file level merging required"
 msgstr "如果没有文件级合并需要，执行三方合并"
 
-#: builtin/read-tree.c:127
+#: builtin/read-tree.c
 msgid "3-way merge in presence of adds and removes"
 msgstr "存在添加和删除时，也执行三方合并"
 
-#: builtin/read-tree.c:129
+#: builtin/read-tree.c
 msgid "same as -m, but discard unmerged entries"
 msgstr "类似于 -m，但丢弃未合并的条目"
 
-#: builtin/read-tree.c:130
+#: builtin/read-tree.c
 msgid "<subdirectory>/"
 msgstr "<子目录>/"
 
-#: builtin/read-tree.c:131
+#: builtin/read-tree.c
 msgid "read the tree into the index under <subdirectory>/"
 msgstr "读取树对象到索引的 <子目录>/ 下"
 
-#: builtin/read-tree.c:134
+#: builtin/read-tree.c
 msgid "update working tree with merge result"
 msgstr "用合并的结果更新工作区"
 
-#: builtin/read-tree.c:136
+#: builtin/read-tree.c
 msgid "gitignore"
 msgstr "gitignore"
 
-#: builtin/read-tree.c:137
+#: builtin/read-tree.c
 msgid "allow explicitly ignored files to be overwritten"
 msgstr "允许忽略文件中设定的文件可以被覆盖"
 
-#: builtin/read-tree.c:140
+#: builtin/read-tree.c
 msgid "don't check the working tree after merging"
 msgstr "合并后不检查工作区"
 
-#: builtin/read-tree.c:141
+#: builtin/read-tree.c
 msgid "don't update the index or the work tree"
 msgstr "不更新索引区和工作区"
 
-#: builtin/read-tree.c:143
+#: builtin/read-tree.c
 msgid "skip applying sparse checkout filter"
 msgstr "跳过应用稀疏检出过滤器"
 
-#: builtin/read-tree.c:145
+#: builtin/read-tree.c
 msgid "debug unpack-trees"
 msgstr "调试 unpack-trees"
 
-#: builtin/read-tree.c:149
+#: builtin/read-tree.c
 msgid "suppress feedback messages"
 msgstr "抑制反馈信息"
 
-#: builtin/read-tree.c:190
+#: builtin/read-tree.c
 msgid "You need to resolve your current index first"
 msgstr "您需要先解决当前索引的冲突"
 
-#: builtin/rebase.c:36
+#: builtin/rebase.c
 msgid ""
 "git rebase [-i] [options] [--exec <cmd>] [--onto <newbase> | --keep-base] "
 "[<upstream> [<branch>]]"
@@ -20171,50 +12027,60 @@ msgstr ""
 "git rebase [-i] [options] [--exec <命令>] [--onto <新基线> | --keep-base] [<"
 "上游> [<分支>]]"
 
-#: builtin/rebase.c:38
+#: builtin/rebase.c
 msgid ""
 "git rebase [-i] [options] [--exec <cmd>] [--onto <newbase>] --root [<branch>]"
 msgstr ""
 "git rebase [-i] [选项] [--exec <命令>] [--onto <新基线>] --root [<分支>]"
 
-#: builtin/rebase.c:231
+#: builtin/rebase.c sequencer.c
+#, c-format
+msgid "could not read '%s'."
+msgstr "不能读取 '%s'。"
+
+#: builtin/rebase.c
 #, c-format
 msgid "could not create temporary %s"
 msgstr "无法创建临时的 %s"
 
-#: builtin/rebase.c:237
+#: builtin/rebase.c
 msgid "could not mark as interactive"
 msgstr "无法标记为交互式"
 
-#: builtin/rebase.c:290
+#: builtin/rebase.c
 msgid "could not generate todo list"
 msgstr "无法生成待办列表"
 
-#: builtin/rebase.c:332
+#: builtin/rebase.c
 msgid "a base commit must be provided with --upstream or --onto"
 msgstr "使用 --upstream 或 --onto 必须提供一个基线提交"
 
-#: builtin/rebase.c:391
+#: builtin/rebase.c
 #, c-format
 msgid "%s requires the merge backend"
 msgstr "%s 需要合并后端"
 
-#: builtin/rebase.c:433
+#: builtin/rebase.c
 #, c-format
 msgid "could not get 'onto': '%s'"
 msgstr "无法获取 'onto'：'%s'"
 
-#: builtin/rebase.c:450
+#: builtin/rebase.c
 #, c-format
 msgid "invalid orig-head: '%s'"
 msgstr "无效的原始 head：'%s'"
 
-#: builtin/rebase.c:475
+#: builtin/rebase.c
 #, c-format
 msgid "ignoring invalid allow_rerere_autoupdate: '%s'"
 msgstr "忽略无效的 allow_rerere_autoupdate：'%s'"
 
-#: builtin/rebase.c:600
+#: builtin/rebase.c builtin/rm.c sequencer.c
+#, c-format
+msgid "could not remove '%s'"
+msgstr "无法删除 '%s'"
+
+#: builtin/rebase.c
 msgid ""
 "Resolve all conflicts manually, mark them as resolved with\n"
 "\"git add/rm <conflicted_files>\", then run \"git rebase --continue\".\n"
@@ -20227,7 +12093,7 @@ msgstr ""
 "\"git rebase --skip\" 命令跳过这个提交。如果想要终止执行并回到\n"
 "\"git rebase\" 执行之前的状态，执行 \"git rebase --abort\"。"
 
-#: builtin/rebase.c:685
+#: builtin/rebase.c
 #, c-format
 msgid ""
 "\n"
@@ -20245,19 +12111,19 @@ msgstr ""
 "\n"
 "因此 git 无法对其变基。"
 
-#: builtin/rebase.c:836
+#: builtin/rebase.c
 #, c-format
 msgid "could not switch to %s"
 msgstr "无法切换到 %s"
 
-#: builtin/rebase.c:952
+#: builtin/rebase.c
 #, c-format
 msgid ""
 "unrecognized empty type '%s'; valid values are \"drop\", \"keep\", and "
 "\"ask\"."
 msgstr "无法识别的空类型 '%s'；有效值有 \"drop\"、\"keep\" 和 \"ask\"。"
 
-#: builtin/rebase.c:970
+#: builtin/rebase.c
 #, c-format
 msgid ""
 "%s\n"
@@ -20274,7 +12140,7 @@ msgstr ""
 "    git rebase '<branch>'\n"
 "\n"
 
-#: builtin/rebase.c:986
+#: builtin/rebase.c
 #, c-format
 msgid ""
 "If you wish to set tracking information for this branch you can do so with:\n"
@@ -20287,179 +12153,195 @@ msgstr ""
 "    git branch --set-upstream-to=%s/<branch> %s\n"
 "\n"
 
-#: builtin/rebase.c:1016
+#: builtin/rebase.c
 msgid "exec commands cannot contain newlines"
 msgstr "exec 命令不能包含换行符"
 
-#: builtin/rebase.c:1020
+#: builtin/rebase.c
 msgid "empty exec command"
 msgstr "空的 exec 命令"
 
-#: builtin/rebase.c:1051
+#: builtin/rebase.c
 msgid "rebase onto given branch instead of upstream"
 msgstr "变基到给定的分支而非上游"
 
-#: builtin/rebase.c:1053
+#: builtin/rebase.c
 msgid "use the merge-base of upstream and branch as the current base"
 msgstr "使用上游和分支的合并基线做为当前基线"
 
-#: builtin/rebase.c:1055
+#: builtin/rebase.c
 msgid "allow pre-rebase hook to run"
 msgstr "允许执行 pre-rebase 钩子"
 
-#: builtin/rebase.c:1057
+#: builtin/rebase.c
 msgid "be quiet. implies --no-stat"
 msgstr "安静。暗示 --no-stat"
 
-#: builtin/rebase.c:1060
+#: builtin/rebase.c
 msgid "display a diffstat of what changed upstream"
 msgstr "显示上游变化的差异统计"
 
-#: builtin/rebase.c:1063
+#: builtin/rebase.c
 msgid "do not show diffstat of what changed upstream"
 msgstr "不显示上游变化的差异统计"
 
-#: builtin/rebase.c:1066
+#: builtin/rebase.c
 msgid "add a Signed-off-by trailer to each commit"
 msgstr "为每一个提交添加 Signed-off-by 尾注"
 
-#: builtin/rebase.c:1069
+#: builtin/rebase.c
 msgid "make committer date match author date"
 msgstr "使提交者日期和作者日期一致"
 
-#: builtin/rebase.c:1071
+#: builtin/rebase.c
 msgid "ignore author date and use current date"
 msgstr "忽略作者日期，使用当前日期"
 
-#: builtin/rebase.c:1073
+#: builtin/rebase.c
 msgid "synonym of --reset-author-date"
 msgstr "--reset-author-date 的同义词"
 
-#: builtin/rebase.c:1075 builtin/rebase.c:1079
+#: builtin/rebase.c
 msgid "passed to 'git apply'"
 msgstr "传递给 'git apply'"
 
-#: builtin/rebase.c:1077
+#: builtin/rebase.c
 msgid "ignore changes in whitespace"
 msgstr "忽略空白字符的变更"
 
-#: builtin/rebase.c:1081 builtin/rebase.c:1084
+#: builtin/rebase.c
 msgid "cherry-pick all commits, even if unchanged"
 msgstr "拣选所有提交，即使未修改"
 
-#: builtin/rebase.c:1086
+#: builtin/rebase.c
 msgid "continue"
 msgstr "继续"
 
-#: builtin/rebase.c:1089
+#: builtin/rebase.c
 msgid "skip current patch and continue"
 msgstr "跳过当前补丁并继续"
 
-#: builtin/rebase.c:1091
+#: builtin/rebase.c
 msgid "abort and check out the original branch"
 msgstr "终止并检出原有分支"
 
-#: builtin/rebase.c:1094
+#: builtin/rebase.c
 msgid "abort but keep HEAD where it is"
 msgstr "终止但保持 HEAD 不变"
 
-#: builtin/rebase.c:1095
+#: builtin/rebase.c
 msgid "edit the todo list during an interactive rebase"
 msgstr "在交互式变基中编辑待办列表"
 
-#: builtin/rebase.c:1098
+#: builtin/rebase.c
 msgid "show the patch file being applied or merged"
 msgstr "显示正在应用或合并的补丁文件"
 
-#: builtin/rebase.c:1101
+#: builtin/rebase.c
 msgid "use apply strategies to rebase"
 msgstr "使用应用策略进行变基"
 
-#: builtin/rebase.c:1105
+#: builtin/rebase.c
 msgid "use merging strategies to rebase"
 msgstr "使用合并策略进行变基"
 
-#: builtin/rebase.c:1109
+#: builtin/rebase.c
 msgid "let the user edit the list of commits to rebase"
 msgstr "让用户编辑要变基的提交列表"
 
-#: builtin/rebase.c:1113
-msgid "(DEPRECATED) try to recreate merges instead of ignoring them"
-msgstr "（已弃用）尝试重建合并提交而非忽略它们"
+#: builtin/rebase.c
+msgid "(REMOVED) was: try to recreate merges instead of ignoring them"
+msgstr "（已删除）曾是：尝试重建合并提交而非忽略它们"
 
-#: builtin/rebase.c:1118
+#: builtin/rebase.c
 msgid "how to handle commits that become empty"
 msgstr "如何处理成为空提交的提交"
 
-#: builtin/rebase.c:1121
+#: builtin/rebase.c
 msgid "keep commits which start empty"
 msgstr "保留初始为空的提交"
 
-#: builtin/rebase.c:1125
+#: builtin/rebase.c
 msgid "move commits that begin with squash!/fixup! under -i"
 msgstr "在 -i 交互模式下，移动以 squash!/fixup! 开头的提交"
 
-#: builtin/rebase.c:1132
+#: builtin/rebase.c
 msgid "add exec lines after each commit of the editable list"
 msgstr "可编辑列表的每一个提交下面增加一行 exec"
 
-#: builtin/rebase.c:1136
+#: builtin/rebase.c
 msgid "allow rebasing commits with empty messages"
 msgstr "允许针对空提交说明的提交变基"
 
-#: builtin/rebase.c:1140
+#: builtin/rebase.c
 msgid "try to rebase merges instead of skipping them"
 msgstr "尝试对合并提交变基而不是忽略它们"
 
-#: builtin/rebase.c:1143
+#: builtin/rebase.c
 msgid "use 'merge-base --fork-point' to refine upstream"
 msgstr "使用 'merge-base --fork-point' 来优化上游"
 
-#: builtin/rebase.c:1145
+#: builtin/rebase.c
 msgid "use the given merge strategy"
 msgstr "使用给定的合并策略"
 
-#: builtin/rebase.c:1147 builtin/revert.c:115
+#: builtin/rebase.c builtin/revert.c
 msgid "option"
 msgstr "选项"
 
-#: builtin/rebase.c:1148
+#: builtin/rebase.c
 msgid "pass the argument through to the merge strategy"
 msgstr "将参数传递给合并策略"
 
-#: builtin/rebase.c:1151
+#: builtin/rebase.c
 msgid "rebase all reachable commits up to the root(s)"
 msgstr "将所有可达的提交变基到根提交"
 
-#: builtin/rebase.c:1154
+#: builtin/rebase.c
 msgid "automatically re-schedule any `exec` that fails"
 msgstr "自动重新安排任何失败的 `exec`"
 
-#: builtin/rebase.c:1156
+#: builtin/rebase.c
 msgid "apply all changes, even those already present upstream"
 msgstr "应用所有更改，甚至那些已在上游存在的"
 
-#: builtin/rebase.c:1177
+#: builtin/rebase.c
 msgid "It looks like 'git am' is in progress. Cannot rebase."
 msgstr "看起来 'git am' 正在执行中。无法变基。"
 
-#: builtin/rebase.c:1208
-msgid "--preserve-merges was replaced by --rebase-merges"
-msgstr "--preserve-merges 被 --rebase-merges 代替。"
+#: builtin/rebase.c
+msgid ""
+"`rebase --preserve-merges` (-p) is no longer supported.\n"
+"Use `git rebase --abort` to terminate current rebase.\n"
+"Or downgrade to v2.33, or earlier, to complete the rebase."
+msgstr ""
+"`rebase --preserve-merges` (-p) 不再被支持。\n"
+"使用 `git rebase --abort` 来终止当前的变基。\n"
+"或者降级至 v2.33 或更早的版本来完成此次变基。"
+
+#: builtin/rebase.c
+msgid ""
+"--preserve-merges was replaced by --rebase-merges\n"
+"Note: Your `pull.rebase` configuration may also be set to 'preserve',\n"
+"which is no longer supported; use 'merges' instead"
+msgstr ""
+"--preserve-merges 被 --rebase-merges 取代\n"
+"提示：你的 `pull.rebase` 配置可能是不再被支持的 'preserve' 选项；\n"
+"取而代之请使用 'merges'"
 
-#: builtin/rebase.c:1230
+#: builtin/rebase.c
 msgid "No rebase in progress?"
 msgstr "没有正在进行的变基？"
 
-#: builtin/rebase.c:1234
+#: builtin/rebase.c
 msgid "The --edit-todo action can only be used during interactive rebase."
 msgstr "动作 --edit-todo 只能用在交互式变基过程中。"
 
-#: builtin/rebase.c:1257 t/helper/test-fast-rebase.c:122
+#: builtin/rebase.c t/helper/test-fast-rebase.c
 msgid "Cannot read HEAD"
 msgstr "不能读取 HEAD"
 
-#: builtin/rebase.c:1269
+#: builtin/rebase.c
 msgid ""
 "You must edit all merge conflicts and then\n"
 "mark them as resolved using git add"
@@ -20467,16 +12349,16 @@ msgstr ""
 "您必须编辑所有的合并冲突，然后通过 git add\n"
 "命令将它们标记为已解决"
 
-#: builtin/rebase.c:1287
+#: builtin/rebase.c
 msgid "could not discard worktree changes"
 msgstr "无法丢弃工作区变更"
 
-#: builtin/rebase.c:1308
+#: builtin/rebase.c
 #, c-format
 msgid "could not move back to %s"
 msgstr "无法移回 %s"
 
-#: builtin/rebase.c:1354
+#: builtin/rebase.c
 #, c-format
 msgid ""
 "It seems that there is already a %s directory, and\n"
@@ -20495,126 +12377,125 @@ msgstr ""
 "\t%s\n"
 "然后再重新执行。 为避免丢失重要数据，我已经停止当前操作。\n"
 
-#: builtin/rebase.c:1382
+#: builtin/rebase.c
 msgid "switch `C' expects a numerical value"
 msgstr "开关 `C' 期望一个数字值"
 
-#: builtin/rebase.c:1424
+#: builtin/rebase.c
 #, c-format
 msgid "Unknown mode: %s"
 msgstr "未知模式：%s"
 
-#: builtin/rebase.c:1463
+#: builtin/rebase.c
 msgid "--strategy requires --merge or --interactive"
 msgstr "--strategy 需要 --merge 或 --interactive"
 
-#: builtin/rebase.c:1492
+#: builtin/rebase.c
 msgid "apply options and merge options cannot be used together"
 msgstr "应用选项和合并选项不能同时使用"
 
-#: builtin/rebase.c:1505
+#: builtin/rebase.c
 #, c-format
 msgid "Unknown rebase backend: %s"
 msgstr "未知的变基后端：%s"
 
-#: builtin/rebase.c:1534
+#: builtin/rebase.c
 msgid "--reschedule-failed-exec requires --exec or --interactive"
 msgstr "--reschedule-failed-exec 需要 --exec 或 --interactive"
 
-#: builtin/rebase.c:1565
+#: builtin/rebase.c
 #, c-format
 msgid "invalid upstream '%s'"
 msgstr "无效的上游 '%s'"
 
-#: builtin/rebase.c:1571
+#: builtin/rebase.c
 msgid "Could not create new root commit"
 msgstr "不能创建新的根提交"
 
-#: builtin/rebase.c:1597
+#: builtin/rebase.c
+#, c-format
+msgid "no such branch/commit '%s'"
+msgstr "无此分支/提交 '%s'"
+
+#: builtin/rebase.c builtin/submodule--helper.c
+#, c-format
+msgid "No such ref: %s"
+msgstr "没有这样的引用：%s"
+
+#: builtin/rebase.c
+msgid "Could not resolve HEAD to a revision"
+msgstr "无法将 HEAD 解析为一个版本"
+
+#: builtin/rebase.c
 #, c-format
 msgid "'%s': need exactly one merge base with branch"
 msgstr "'%s'：只需要与分支的一个合并基线"
 
-#: builtin/rebase.c:1600
+#: builtin/rebase.c
 #, c-format
 msgid "'%s': need exactly one merge base"
 msgstr "'%s'：只需要一个合并基线"
 
-#: builtin/rebase.c:1609
+#: builtin/rebase.c
 #, c-format
 msgid "Does not point to a valid commit '%s'"
 msgstr "没有指向一个有效的提交 '%s'"
 
-#: builtin/rebase.c:1636
-#, c-format
-msgid "no such branch/commit '%s'"
-msgstr "无此分支/提交 '%s'"
-
-#: builtin/rebase.c:1647 builtin/submodule--helper.c:43
-#: builtin/submodule--helper.c:2477
-#, c-format
-msgid "No such ref: %s"
-msgstr "没有这样的引用：%s"
-
-#: builtin/rebase.c:1658
-msgid "Could not resolve HEAD to a revision"
-msgstr "无法将 HEAD 解析为一个版本"
-
-#: builtin/rebase.c:1679
+#: builtin/rebase.c
 msgid "Please commit or stash them."
 msgstr "请提交或贮藏修改。"
 
-#: builtin/rebase.c:1714
+#: builtin/rebase.c
 msgid "HEAD is up to date."
 msgstr "HEAD 是最新的。"
 
-#: builtin/rebase.c:1716
+#: builtin/rebase.c
 #, c-format
 msgid "Current branch %s is up to date.\n"
 msgstr "当前分支 %s 是最新的。\n"
 
-#: builtin/rebase.c:1724
+#: builtin/rebase.c
 msgid "HEAD is up to date, rebase forced."
 msgstr "HEAD 是最新的，强制变基。"
 
-#: builtin/rebase.c:1726
+#: builtin/rebase.c
 #, c-format
 msgid "Current branch %s is up to date, rebase forced.\n"
 msgstr "当前分支 %s 是最新的，强制变基。\n"
 
-#: builtin/rebase.c:1734
+#: builtin/rebase.c
 msgid "The pre-rebase hook refused to rebase."
 msgstr "pre-rebase 钩子拒绝了变基操作。"
 
-#: builtin/rebase.c:1741
+#: builtin/rebase.c
 #, c-format
 msgid "Changes to %s:\n"
 msgstr "到 %s 的变更：\n"
 
-#: builtin/rebase.c:1744
+#: builtin/rebase.c
 #, c-format
 msgid "Changes from %s to %s:\n"
 msgstr "从 %s 到 %s 的变更：\n"
 
-#: builtin/rebase.c:1769
+#: builtin/rebase.c
 #, c-format
 msgid "First, rewinding head to replay your work on top of it...\n"
 msgstr "首先，回退头指针以便在其上重放您的工作...\n"
 
-#: builtin/rebase.c:1781
+#: builtin/rebase.c
 msgid "Could not detach HEAD"
 msgstr "无法分离头指针"
 
-#: builtin/rebase.c:1790
+#: builtin/rebase.c
 #, c-format
 msgid "Fast-forwarded %s to %s.\n"
 msgstr "快进 %s 到 %s。\n"
 
-#: builtin/receive-pack.c:35
+#: builtin/receive-pack.c
 msgid "git receive-pack <git-dir>"
 msgstr "git receive-pack <仓库目录>"
 
-#: builtin/receive-pack.c:1263
+#: builtin/receive-pack.c
 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"
@@ -20640,7 +12521,7 @@ msgstr ""
 "若要屏蔽此信息且保持默认行为，设置 'receive.denyCurrentBranch'\n"
 "配置变量为 'refuse'。"
 
-#: builtin/receive-pack.c:1283
+#: builtin/receive-pack.c
 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"
@@ -20659,19 +12540,19 @@ msgstr ""
 "\n"
 "若要屏蔽此信息，您可以设置它为 'refuse'。"
 
-#: builtin/receive-pack.c:2476
+#: builtin/receive-pack.c
 msgid "quiet"
 msgstr "静默模式"
 
-#: builtin/receive-pack.c:2491
+#: builtin/receive-pack.c
 msgid "you must specify a directory"
 msgstr "您必须指定一个目录"
 
-#: builtin/reflog.c:9
+#: builtin/reflog.c
 msgid "git reflog [show] [<log-options>] [<ref>]"
 msgstr "git reflog [show] [<log 选项>] [<引用>]"
 
-#: builtin/reflog.c:12
+#: builtin/reflog.c
 msgid ""
 "git reflog expire [--expire=<time>] [--expire-unreachable=<time>]\n"
 "                  [--rewrite] [--updateref] [--stale-fix]\n"
@@ -20683,7 +12564,7 @@ msgstr ""
 "                  [--dry-run | -n] [--verbose] [--all [--single-worktree] | <"
 "引用>...]"
 
-#: builtin/reflog.c:17
+#: builtin/reflog.c
 msgid ""
 "git reflog delete [--rewrite] [--updateref]\n"
 "                  [--dry-run | -n] [--verbose] <ref>@{<specifier>}..."
@@ -20691,78 +12572,78 @@ msgstr ""
 "git reflog delete [--rewrite] [--updateref]\n"
 "                  [--dry-run | -n] [--verbose] <引用>@{<指定符>}..."
 
-#: builtin/reflog.c:21
+#: builtin/reflog.c
 msgid "git reflog exists <ref>"
 msgstr "git reflog exists <引用>"
 
-#: builtin/reflog.c:197 builtin/reflog.c:211
+#: builtin/reflog.c
 #, c-format
 msgid "invalid timestamp '%s' given to '--%s'"
 msgstr "给 '--%2$s' 的时间戳 '%1$s' 无效"
 
-#: builtin/reflog.c:240 builtin/reflog.c:359
+#: builtin/reflog.c
 msgid "do not actually prune any entries"
 msgstr "不要实际清除任何条目"
 
-#: builtin/reflog.c:243 builtin/reflog.c:362
+#: builtin/reflog.c
 msgid ""
 "rewrite the old SHA1 with the new SHA1 of the entry that now precedes it"
 msgstr "用现在前继条目的 SHA1 来重写旧的 SHA1"
 
-#: builtin/reflog.c:246 builtin/reflog.c:365
+#: builtin/reflog.c
 msgid "update the reference to the value of the top reflog entry"
 msgstr "更新引用至引用日志顶部的条目"
 
-#: builtin/reflog.c:248 builtin/reflog.c:367
+#: builtin/reflog.c
 msgid "print extra information on screen"
 msgstr "在屏幕上打印额外信息"
 
-#: builtin/reflog.c:249 builtin/reflog.c:253
+#: builtin/reflog.c
 msgid "timestamp"
 msgstr "时间戳"
 
-#: builtin/reflog.c:250
+#: builtin/reflog.c
 msgid "prune entries older than the specified time"
 msgstr "清除早于指定时间之前的条目"
 
-#: builtin/reflog.c:254
+#: builtin/reflog.c
 msgid ""
 "prune entries older than <time> that are not reachable from the current tip "
 "of the branch"
 msgstr "清除早于 <时间> 且自当前分支顶部不可达的条目"
 
-#: builtin/reflog.c:258
+#: builtin/reflog.c
 msgid "prune any reflog entries that point to broken commits"
 msgstr "清除指向损坏提交的引用条目"
 
-#: builtin/reflog.c:259
+#: builtin/reflog.c
 msgid "process the reflogs of all references"
 msgstr "处理所有引用的引用日志"
 
-#: builtin/reflog.c:261
+#: builtin/reflog.c
 msgid "limits processing to reflogs from the current worktree only"
 msgstr "仅处理当前工作树的引用日志"
 
-#: builtin/reflog.c:294
+#: builtin/reflog.c
 #, c-format
 msgid "Marking reachable objects..."
 msgstr "正在标记可达对象..."
 
-#: builtin/reflog.c:338
+#: builtin/reflog.c
 #, c-format
 msgid "%s points nowhere!"
 msgstr "%s 指向不存在！"
 
-#: builtin/reflog.c:374
+#: builtin/reflog.c
 msgid "no reflog specified to delete"
 msgstr "未指定要删除的引用日志"
 
-#: builtin/reflog.c:396
+#: builtin/reflog.c
 #, c-format
 msgid "invalid ref format: %s"
 msgstr "无效的引用格式：%s"
 
-#: builtin/remote.c:19
+#: builtin/remote.c
 msgid ""
 "git remote add [-t <branch>] [-m <master>] [-f] [--tags | --no-tags] [--"
 "mirror=<fetch|push>] <name> <url>"
@@ -20770,86 +12651,86 @@ msgstr ""
 "git remote add [-t <分支>] [-m <master>] [-f] [--tags | --no-tags] [--"
 "mirror=<fetch|push>] <名称> <地址>"
 
-#: builtin/remote.c:20 builtin/remote.c:40
+#: builtin/remote.c
 msgid "git remote rename [--[no-]progress] <old> <new>"
 msgstr "git remote rename [--[no-]progress] <旧> <新>"
 
-#: builtin/remote.c:21 builtin/remote.c:45
+#: builtin/remote.c
 msgid "git remote remove <name>"
 msgstr "git remote remove <名称>"
 
-#: builtin/remote.c:22 builtin/remote.c:50
+#: builtin/remote.c
 msgid "git remote set-head <name> (-a | --auto | -d | --delete | <branch>)"
 msgstr "git remote set-head <名称> (-a | --auto | -d | --delete | <分支>)"
 
-#: builtin/remote.c:23
+#: builtin/remote.c
 msgid "git remote [-v | --verbose] show [-n] <name>"
 msgstr "git remote [-v | --verbose] show [-n] <名称>"
 
-#: builtin/remote.c:24
+#: builtin/remote.c
 msgid "git remote prune [-n | --dry-run] <name>"
 msgstr "git remote prune [-n | --dry-run] <名称>"
 
-#: builtin/remote.c:25
+#: builtin/remote.c
 msgid ""
 "git remote [-v | --verbose] update [-p | --prune] [(<group> | <remote>)...]"
 msgstr "git remote [-v | --verbose] update [-p | --prune] [(<组> | <远程>)...]"
 
-#: builtin/remote.c:26
+#: builtin/remote.c
 msgid "git remote set-branches [--add] <name> <branch>..."
 msgstr "git remote set-branches [--add] <名称> <分支>..."
 
-#: builtin/remote.c:27 builtin/remote.c:76
+#: builtin/remote.c
 msgid "git remote get-url [--push] [--all] <name>"
 msgstr "git remote get-url [--push] [--all] <名称>"
 
-#: builtin/remote.c:28 builtin/remote.c:81
+#: builtin/remote.c
 msgid "git remote set-url [--push] <name> <newurl> [<oldurl>]"
 msgstr "git remote set-url [--push] <名称> <新的地址> [<旧的地址>]"
 
-#: builtin/remote.c:29 builtin/remote.c:82
+#: builtin/remote.c
 msgid "git remote set-url --add <name> <newurl>"
 msgstr "git remote set-url --add <名称> <新的地址>"
 
-#: builtin/remote.c:30 builtin/remote.c:83
+#: builtin/remote.c
 msgid "git remote set-url --delete <name> <url>"
 msgstr "git remote set-url --delete <名称> <地址>"
 
-#: builtin/remote.c:35
+#: builtin/remote.c
 msgid "git remote add [<options>] <name> <url>"
 msgstr "git remote add [<选项>] <名称> <地址>"
 
-#: builtin/remote.c:55
+#: builtin/remote.c
 msgid "git remote set-branches <name> <branch>..."
 msgstr "git remote set-branches <名称> <分支>..."
 
-#: builtin/remote.c:56
+#: builtin/remote.c
 msgid "git remote set-branches --add <name> <branch>..."
 msgstr "git remote set-branches --add <名称> <分支>..."
 
-#: builtin/remote.c:61
+#: builtin/remote.c
 msgid "git remote show [<options>] <name>"
 msgstr "git remote show [<选项>] <名称>"
 
-#: builtin/remote.c:66
+#: builtin/remote.c
 msgid "git remote prune [<options>] <name>"
 msgstr "git remote prune [<选项>] <名称>"
 
-#: builtin/remote.c:71
+#: builtin/remote.c
 msgid "git remote update [<options>] [<group> | <remote>]..."
 msgstr "git remote update [<选项>] [<组> | <远程>]..."
 
-#: builtin/remote.c:100
+#: builtin/remote.c
 #, c-format
 msgid "Updating %s"
 msgstr "更新 %s 中"
 
-#: builtin/remote.c:102
+#: builtin/remote.c
 #, c-format
 msgid "Could not fetch %s"
 msgstr "不能获取 %s"
 
-#: builtin/remote.c:132
+#: builtin/remote.c
 msgid ""
 "--mirror is dangerous and deprecated; please\n"
 "\t use --mirror=fetch or --mirror=push instead"
@@ -20857,77 +12738,87 @@ msgstr ""
 "--mirror 选项危险且过时，请使用 --mirror=fetch\n"
 "\t 或 --mirror=push"
 
-#: builtin/remote.c:149
+#: builtin/remote.c
 #, c-format
 msgid "unknown mirror argument: %s"
 msgstr "未知的镜像参数：%s"
 
-#: builtin/remote.c:165
+#: builtin/remote.c
 msgid "fetch the remote branches"
 msgstr "抓取远程的分支"
 
-#: builtin/remote.c:167
+#: builtin/remote.c
 msgid "import all tags and associated objects when fetching"
 msgstr "抓取时导入所有的标签和关联对象"
 
-#: builtin/remote.c:170
+#: builtin/remote.c
 msgid "or do not fetch any tag at all (--no-tags)"
 msgstr "或不抓取任何标签（--no-tags）"
 
-#: builtin/remote.c:172
+#: builtin/remote.c
 msgid "branch(es) to track"
 msgstr "跟踪的分支"
 
-#: builtin/remote.c:173
+#: builtin/remote.c
 msgid "master branch"
 msgstr "主线分支"
 
-#: builtin/remote.c:175
+#: builtin/remote.c
 msgid "set up remote as a mirror to push to or fetch from"
 msgstr "把远程设置为用以推送或抓取的镜像"
 
-#: builtin/remote.c:187
+#: builtin/remote.c
 msgid "specifying a master branch makes no sense with --mirror"
 msgstr "指定一个 master 分支并使用 --mirror 选项没有意义"
 
-#: builtin/remote.c:189
+#: builtin/remote.c
 msgid "specifying branches to track makes sense only with fetch mirrors"
 msgstr "指定要跟踪的分支只在与获取镜像同时使用才有意义"
 
-#: builtin/remote.c:196 builtin/remote.c:716
+#: builtin/remote.c
 #, c-format
 msgid "remote %s already exists."
 msgstr "远程 %s 已经存在。"
 
-#: builtin/remote.c:241
+#: builtin/remote.c
 #, c-format
 msgid "Could not setup master '%s'"
 msgstr "无法设置 master '%s'"
 
-#: builtin/remote.c:323
+#: builtin/remote.c trailer.c
+#, c-format
+msgid "more than one %s"
+msgstr "多于一个 %s"
+
+#: builtin/remote.c
 #, c-format
 msgid "unhandled branch.%s.rebase=%s; assuming 'true'"
 msgstr "未处理的 branch.%s.rebase=%s; 假定为 'true'"
 
-#: builtin/remote.c:367
+#: builtin/remote.c
 #, c-format
 msgid "Could not get fetch map for refspec %s"
 msgstr "无法得到引用规格 %s 的获取列表"
 
-#: builtin/remote.c:461 builtin/remote.c:469
+#: builtin/remote.c
 msgid "(matching)"
 msgstr "（匹配）"
 
-#: builtin/remote.c:473
+#: builtin/remote.c
 msgid "(delete)"
 msgstr "（删除）"
 
-#: builtin/remote.c:664
+#: builtin/remote.c
 #, c-format
 msgid "could not set '%s'"
 msgstr "不能设置 '%s'"
 
-#: builtin/remote.c:669
+#: builtin/remote.c config.c
+#, c-format
+msgid "could not unset '%s'"
+msgstr "不能取消设置 '%s'"
+
+#: builtin/remote.c
 #, c-format
 msgid ""
 "The %s configuration remote.pushDefault in:\n"
@@ -20938,17 +12829,17 @@ msgstr ""
 "\t%s:%d\n"
 "现在在为不存在的远程名 '%s' 命名"
 
-#: builtin/remote.c:707 builtin/remote.c:866 builtin/remote.c:973
+#: builtin/remote.c
 #, c-format
 msgid "No such remote: '%s'"
 msgstr "没有此远程仓库：'%s'"
 
-#: builtin/remote.c:726
+#: builtin/remote.c
 #, c-format
 msgid "Could not rename config section '%s' to '%s'"
 msgstr "不能重命名配置小节 '%s' 到 '%s'"
 
-#: builtin/remote.c:746
+#: builtin/remote.c
 #, c-format
 msgid ""
 "Not updating non-default fetch refspec\n"
@@ -20959,21 +12850,21 @@ msgstr ""
 "\t%s\n"
 "\t如果必要请手动更新配置。"
 
-#: builtin/remote.c:783
+#: builtin/remote.c
 msgid "Renaming remote references"
 msgstr "正在重命名远程引用"
 
-#: builtin/remote.c:794
+#: builtin/remote.c
 #, c-format
 msgid "deleting '%s' failed"
 msgstr "删除 '%s' 失败"
 
-#: builtin/remote.c:832
+#: builtin/remote.c
 #, c-format
 msgid "creating '%s' failed"
 msgstr "创建 '%s' 失败"
 
-#: builtin/remote.c:912
+#: builtin/remote.c
 msgid ""
 "Note: A branch outside the refs/remotes/ hierarchy was not removed;\n"
 "to delete it, use:"
@@ -20983,118 +12874,118 @@ msgid_plural ""
 msgstr[0] "注意：ref/remotes 层级之外的一个分支未被移除。要删除它，使用："
 msgstr[1] "注意：ref/remotes 层级之外的一些分支未被移除。要删除它们，使用："
 
-#: builtin/remote.c:926
+#: builtin/remote.c
 #, c-format
 msgid "Could not remove config section '%s'"
 msgstr "不能移除配置小节 '%s'"
 
-#: builtin/remote.c:1034
+#: builtin/remote.c
 #, c-format
 msgid " new (next fetch will store in remotes/%s)"
 msgstr " 新的（下一次获取将存储于 remotes/%s）"
 
-#: builtin/remote.c:1037
+#: builtin/remote.c
 msgid " tracked"
 msgstr " 已跟踪"
 
-#: builtin/remote.c:1039
+#: builtin/remote.c
 msgid " stale (use 'git remote prune' to remove)"
 msgstr " 过时（使用 'git remote prune' 来移除）"
 
-#: builtin/remote.c:1041
+#: builtin/remote.c
 msgid " ???"
 msgstr " ???"
 
-#: builtin/remote.c:1082
+#: builtin/remote.c
 #, c-format
 msgid "invalid branch.%s.merge; cannot rebase onto > 1 branch"
 msgstr "无效的 branch.%s.merge，不能变基到一个以上的分支"
 
-#: builtin/remote.c:1091
+#: builtin/remote.c
 #, c-format
 msgid "rebases interactively onto remote %s"
 msgstr "交互式变基到远程 %s"
 
-#: builtin/remote.c:1093
+#: builtin/remote.c
 #, c-format
 msgid "rebases interactively (with merges) onto remote %s"
 msgstr "交互式变基（含合并提交）到远程 %s"
 
-#: builtin/remote.c:1096
+#: builtin/remote.c
 #, c-format
 msgid "rebases onto remote %s"
 msgstr "变基到远程 %s"
 
-#: builtin/remote.c:1100
+#: builtin/remote.c
 #, c-format
 msgid " merges with remote %s"
 msgstr " 与远程 %s 合并"
 
-#: builtin/remote.c:1103
+#: builtin/remote.c
 #, c-format
 msgid "merges with remote %s"
 msgstr "与远程 %s 合并"
 
-#: builtin/remote.c:1106
+#: builtin/remote.c
 #, c-format
 msgid "%-*s    and with remote %s\n"
 msgstr "%-*s    以及和远程 %s\n"
 
-#: builtin/remote.c:1149
+#: builtin/remote.c
 msgid "create"
 msgstr "创建"
 
-#: builtin/remote.c:1152
+#: builtin/remote.c
 msgid "delete"
 msgstr "删除"
 
-#: builtin/remote.c:1156
+#: builtin/remote.c
 msgid "up to date"
 msgstr "最新"
 
-#: builtin/remote.c:1159
+#: builtin/remote.c
 msgid "fast-forwardable"
 msgstr "可快进"
 
-#: builtin/remote.c:1162
+#: builtin/remote.c
 msgid "local out of date"
 msgstr "本地已过时"
 
-#: builtin/remote.c:1169
+#: builtin/remote.c
 #, c-format
 msgid "    %-*s forces to %-*s (%s)"
 msgstr "    %-*s 强制推送至 %-*s (%s)"
 
-#: builtin/remote.c:1172
+#: builtin/remote.c
 #, c-format
 msgid "    %-*s pushes to %-*s (%s)"
 msgstr "    %-*s 推送至 %-*s (%s)"
 
-#: builtin/remote.c:1176
+#: builtin/remote.c
 #, c-format
 msgid "    %-*s forces to %s"
 msgstr "    %-*s 强制推送至 %s"
 
-#: builtin/remote.c:1179
+#: builtin/remote.c
 #, c-format
 msgid "    %-*s pushes to %s"
 msgstr "    %-*s 推送至 %s"
 
-#: builtin/remote.c:1247
+#: builtin/remote.c
 msgid "do not query remotes"
 msgstr "不查询远程"
 
-#: builtin/remote.c:1268
+#: builtin/remote.c
 #, c-format
 msgid "* remote %s"
 msgstr "* 远程 %s"
 
-#: builtin/remote.c:1269
+#: builtin/remote.c
 #, c-format
 msgid "  Fetch URL: %s"
 msgstr "  获取地址：%s"
 
-#: builtin/remote.c:1270 builtin/remote.c:1286 builtin/remote.c:1423
+#: builtin/remote.c
 msgid "(no URL)"
 msgstr "(无 URL)"
 
@@ -21102,31 +12993,31 @@ msgstr "(无 URL)"
 #. with the one in " Fetch URL: %s"
 #. translation.
 #.
-#: builtin/remote.c:1284 builtin/remote.c:1286
+#: builtin/remote.c
 #, c-format
 msgid "  Push  URL: %s"
 msgstr "  推送地址：%s"
 
-#: builtin/remote.c:1288 builtin/remote.c:1290 builtin/remote.c:1292
+#: builtin/remote.c
 #, c-format
 msgid "  HEAD branch: %s"
 msgstr "  HEAD 分支：%s"
 
-#: builtin/remote.c:1288
+#: builtin/remote.c
 msgid "(not queried)"
 msgstr "（未查询）"
 
-#: builtin/remote.c:1290
+#: builtin/remote.c
 msgid "(unknown)"
 msgstr "（未知）"
 
-#: builtin/remote.c:1294
+#: builtin/remote.c
 #, c-format
 msgid ""
 "  HEAD branch (remote HEAD is ambiguous, may be one of the following):\n"
 msgstr "  HEAD 分支（远程 HEAD 模糊，可能是下列中的一个）：\n"
 
-#: builtin/remote.c:1306
+#: builtin/remote.c
 #, c-format
 msgid "  Remote branch:%s"
 msgid_plural "  Remote branches:%s"
@@ -21134,329 +13025,342 @@ msgstr[0] "  远程分支：%s"
 msgstr[1] "  远程分支：%s"
 
 #  译者：中文字符串拼接，可删除前导空格
-#: builtin/remote.c:1309 builtin/remote.c:1335
+#: builtin/remote.c
 msgid " (status not queried)"
 msgstr "（状态未查询）"
 
-#: builtin/remote.c:1318
+#: builtin/remote.c
 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:1326
+#: builtin/remote.c
 msgid "  Local refs will be mirrored by 'git push'"
 msgstr "  本地引用将在 'git push' 时被镜像"
 
-#: builtin/remote.c:1332
+#: builtin/remote.c
 #, 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:1353
+#: builtin/remote.c
 msgid "set refs/remotes/<name>/HEAD according to remote"
 msgstr "根据远程设置 refs/remotes/<名称>/HEAD"
 
-#: builtin/remote.c:1355
+#: builtin/remote.c
 msgid "delete refs/remotes/<name>/HEAD"
 msgstr "删除 refs/remotes/<名称>/HEAD"
 
-#: builtin/remote.c:1369
+#: builtin/remote.c
 msgid "Cannot determine remote HEAD"
 msgstr "无法确定远程 HEAD"
 
-#: builtin/remote.c:1371
+#: builtin/remote.c
 msgid "Multiple remote HEAD branches. Please choose one explicitly with:"
 msgstr "多个远程 HEAD 分支。请明确地选择一个用命令："
 
-#: builtin/remote.c:1381
+#: builtin/remote.c
 #, c-format
 msgid "Could not delete %s"
 msgstr "无法删除 %s"
 
-#: builtin/remote.c:1389
+#: builtin/remote.c
 #, c-format
 msgid "Not a valid ref: %s"
 msgstr "不是一个有效引用：%s"
 
-#: builtin/remote.c:1391
+#: builtin/remote.c
 #, c-format
 msgid "Could not setup %s"
 msgstr "不能设置 %s"
 
 #  译者：注意保持前导空格
-#: builtin/remote.c:1409
+#: builtin/remote.c
 #, c-format
 msgid " %s will become dangling!"
 msgstr " %s 将成为悬空状态！"
 
 #  译者：注意保持前导空格
-#: builtin/remote.c:1410
+#: builtin/remote.c
 #, c-format
 msgid " %s has become dangling!"
 msgstr " %s 已成为悬空状态！"
 
-#: builtin/remote.c:1419
+#: builtin/remote.c
 #, c-format
 msgid "Pruning %s"
 msgstr "修剪 %s"
 
-#: builtin/remote.c:1420
+#: builtin/remote.c
 #, c-format
 msgid "URL: %s"
 msgstr "URL：%s"
 
-#: builtin/remote.c:1436
+#: builtin/remote.c
 #, c-format
 msgid " * [would prune] %s"
 msgstr " * [将删除] %s"
 
-#: builtin/remote.c:1439
+#: builtin/remote.c
 #, c-format
 msgid " * [pruned] %s"
 msgstr " * [已删除] %s"
 
-#: builtin/remote.c:1484
+#: builtin/remote.c
 msgid "prune remotes after fetching"
 msgstr "抓取后清除远程"
 
-#: builtin/remote.c:1548 builtin/remote.c:1604 builtin/remote.c:1674
+#: builtin/remote.c
 #, c-format
 msgid "No such remote '%s'"
 msgstr "没有此远程 '%s'"
 
-#: builtin/remote.c:1566
+#: builtin/remote.c
 msgid "add branch"
 msgstr "添加分支"
 
-#: builtin/remote.c:1573
+#: builtin/remote.c
 msgid "no remote specified"
 msgstr "未指定远程"
 
-#: builtin/remote.c:1590
+#: builtin/remote.c
 msgid "query push URLs rather than fetch URLs"
 msgstr "查询推送 URL 地址，而非获取 URL 地址"
 
-#: builtin/remote.c:1592
+#: builtin/remote.c
 msgid "return all URLs"
 msgstr "返回所有 URL 地址"
 
-#: builtin/remote.c:1622
+#: builtin/remote.c
 #, c-format
 msgid "no URLs configured for remote '%s'"
 msgstr "没有给远程仓库 '%s' 设定 URL"
 
-#: builtin/remote.c:1648
+#: builtin/remote.c
 msgid "manipulate push URLs"
 msgstr "操作推送 URLS"
 
-#: builtin/remote.c:1650
+#: builtin/remote.c
 msgid "add URL"
 msgstr "添加 URL"
 
-#: builtin/remote.c:1652
+#: builtin/remote.c
 msgid "delete URLs"
 msgstr "删除 URLS"
 
-#: builtin/remote.c:1659
+#: builtin/remote.c
 msgid "--add --delete doesn't make sense"
 msgstr "--add --delete 无意义"
 
-#: builtin/remote.c:1700
+#: builtin/remote.c
 #, c-format
 msgid "Invalid old URL pattern: %s"
 msgstr "无效的旧 URL 匹配模版：%s"
 
-#: builtin/remote.c:1708
+#: builtin/remote.c
 #, c-format
 msgid "No such URL found: %s"
 msgstr "未找到此 URL：%s"
 
-#: builtin/remote.c:1710
+#: builtin/remote.c
 msgid "Will not delete all non-push URLs"
 msgstr "将不会删除所有非推送 URL 地址"
 
-#: builtin/remote.c:1727
+#: builtin/remote.c
 msgid "be verbose; must be placed before a subcommand"
 msgstr "冗长输出；必须置于子命令之前"
 
-#: builtin/repack.c:29
+#: builtin/repack.c
 msgid "git repack [<options>]"
 msgstr "git repack [<选项>]"
 
-#: builtin/repack.c:34
+#: builtin/repack.c
 msgid ""
 "Incremental repacks are incompatible with bitmap indexes.  Use\n"
-"--no-write-bitmap-index or disable the pack.writebitmaps configuration."
+"--no-write-bitmap-index or disable the pack.writeBitmaps configuration."
 msgstr ""
 "增量 repack 和 bitmap 索引不兼容。  使用 --no-write-bitmap-index\n"
-"或禁用 pack.writebitmaps 配置。"
+"或禁用 pack.writeBitmaps 配置。"
 
-#: builtin/repack.c:206
+#: builtin/repack.c
 msgid "could not start pack-objects to repack promisor objects"
 msgstr "无法开始 pack-objects 来重新打包 promisor 对象"
 
-#: builtin/repack.c:280 builtin/repack.c:824
+#: builtin/repack.c
 msgid "repack: Expecting full hex object ID lines only from pack-objects."
 msgstr "repack：期望来自 pack-objects 的完整十六进制对象 ID。"
 
-#: builtin/repack.c:304
+#: builtin/repack.c
 msgid "could not finish pack-objects to repack promisor objects"
 msgstr "无法完成 pack-objects 来重新打包 promisor 对象"
 
-#: builtin/repack.c:319
+#: builtin/repack.c
 #, c-format
 msgid "cannot open index for %s"
 msgstr "不能打开 %s 的索引"
 
-#: builtin/repack.c:378
+#: builtin/repack.c
 #, c-format
 msgid "pack %s too large to consider in geometric progression"
 msgstr "包 %s 太大，不在几何级数中考虑"
 
-#: builtin/repack.c:411 builtin/repack.c:418 builtin/repack.c:423
+#: builtin/repack.c
 #, c-format
 msgid "pack %s too large to roll up"
 msgstr "包 %s 太大导致数字溢出"
 
-#: builtin/repack.c:503
+#: builtin/repack.c
 #, c-format
 msgid "could not open tempfile %s for writing"
 msgstr "无法打开临时文件 %s 进行写入"
 
-#: builtin/repack.c:521
+#: builtin/repack.c
 msgid "could not close refs snapshot tempfile"
 msgstr "不能关闭引用快照临时文件"
 
-#: builtin/repack.c:634
+#: builtin/repack.c
 msgid "pack everything in a single pack"
 msgstr "所有内容打包到一个包文件中"
 
-#: builtin/repack.c:636
+#: builtin/repack.c
 msgid "same as -a, and turn unreachable objects loose"
 msgstr "和 -a 相同，并将不可达的对象设为松散对象"
 
-#: builtin/repack.c:639
+#: builtin/repack.c
+msgid "same as -a, pack unreachable cruft objects separately"
+msgstr "和 -a 相同，将不可达的废弃对象分开打包"
+
+#: builtin/repack.c
+msgid "approxidate"
+msgstr "近似日期"
+
+#: builtin/repack.c
+msgid "with -C, expire objects older than this"
+msgstr "使用 -C，使早于给定时间的对象过期"
+
+#: builtin/repack.c
 msgid "remove redundant packs, and run git-prune-packed"
 msgstr "删除多余的包，运行 git-prune-packed"
 
-#: builtin/repack.c:641
+#: builtin/repack.c
 msgid "pass --no-reuse-delta to git-pack-objects"
 msgstr "向 git-pack-objects 传递参数 --no-reuse-delta"
 
-#: builtin/repack.c:643
+#: builtin/repack.c
 msgid "pass --no-reuse-object to git-pack-objects"
 msgstr "向 git-pack-objects 传递参数 --no-reuse-object"
 
-#: builtin/repack.c:645
+#: builtin/repack.c
 msgid "do not run git-update-server-info"
 msgstr "不运行 git-update-server-info"
 
-#: builtin/repack.c:648
+#: builtin/repack.c
 msgid "pass --local to git-pack-objects"
 msgstr "向 git-pack-objects 传递参数 --local"
 
-#: builtin/repack.c:650
+#: builtin/repack.c
 msgid "write bitmap index"
 msgstr "写 bitmap 索引"
 
-#: builtin/repack.c:652
+#: builtin/repack.c
 msgid "pass --delta-islands to git-pack-objects"
 msgstr "向 git-pack-objects 传递参数 --delta-islands"
 
-#: builtin/repack.c:653
-msgid "approxidate"
-msgstr "近似日期"
-
-#: builtin/repack.c:654
+#: builtin/repack.c
 msgid "with -A, do not loosen objects older than this"
 msgstr "使用 -A，不要将早于给定时间的对象过期"
 
-#: builtin/repack.c:656
+#: builtin/repack.c
 msgid "with -a, repack unreachable objects"
 msgstr "使用 -a ，重新对不可达对象打包"
 
-#: builtin/repack.c:658
+#: builtin/repack.c
 msgid "size of the window used for delta compression"
 msgstr "用于增量压缩的窗口值"
 
-#: builtin/repack.c:659 builtin/repack.c:665
+#: builtin/repack.c
 msgid "bytes"
 msgstr "字节"
 
-#: builtin/repack.c:660
+#: builtin/repack.c
 msgid "same as the above, but limit memory size instead of entries count"
 msgstr "和上面的相似，但限制内存大小而非条目数"
 
-#: builtin/repack.c:662
+#: builtin/repack.c
 msgid "limits the maximum delta depth"
 msgstr "限制最大增量深度"
 
-#: builtin/repack.c:664
+#: builtin/repack.c
 msgid "limits the maximum number of threads"
 msgstr "限制最大线程数"
 
-#: builtin/repack.c:666
+#: builtin/repack.c
 msgid "maximum size of each packfile"
 msgstr "每个包文件的最大尺寸"
 
-#: builtin/repack.c:668
+#: builtin/repack.c
 msgid "repack objects in packs marked with .keep"
 msgstr "对标记为 .keep 的包中的对象重新打包"
 
-#: builtin/repack.c:670
+#: builtin/repack.c
 msgid "do not repack this pack"
 msgstr "不要对该包文件重新打包"
 
-#: builtin/repack.c:672
+#: builtin/repack.c
 msgid "find a geometric progression with factor <N>"
 msgstr "使用因子 <n> 查找几何级数"
 
-#: builtin/repack.c:674
+#: builtin/repack.c
 msgid "write a multi-pack index of the resulting packs"
 msgstr "写入结果包的多包索引"
 
-#: builtin/repack.c:684
+#: builtin/repack.c
 msgid "cannot delete packs in a precious-objects repo"
 msgstr "不能删除珍品仓库中的打包文件"
 
-#: builtin/repack.c:833
+#: builtin/repack.c
 msgid "Nothing new to pack."
 msgstr "没有新的要打包。"
 
-#: builtin/repack.c:863
+#: builtin/repack.c
+#, c-format
+msgid "pack prefix %s does not begin with objdir %s"
+msgstr "包前缀 %s 没有以对象目录 .%s 开始"
+
+#: builtin/repack.c
 #, c-format
 msgid "missing required file: %s"
 msgstr "缺少需要的文件：%s"
 
-#: builtin/repack.c:865
+#: builtin/repack.c
 #, c-format
 msgid "could not unlink: %s"
 msgstr "不能删除：%s"
 
-#: builtin/replace.c:22
+#: builtin/replace.c
 msgid "git replace [-f] <object> <replacement>"
 msgstr "git replace [-f] <对象> <替换物>"
 
-#: builtin/replace.c:23
+#: builtin/replace.c
 msgid "git replace [-f] --edit <object>"
 msgstr "git replace [-f] --edit <对象>"
 
-#: builtin/replace.c:24
+#: builtin/replace.c
 msgid "git replace [-f] --graft <commit> [<parent>...]"
 msgstr "git replace [-f] --graft <提交> [<父提交>...]"
 
-#: builtin/replace.c:26
+#: builtin/replace.c
 msgid "git replace -d <object>..."
 msgstr "git replace -d <对象>..."
 
-#: builtin/replace.c:27
+#: builtin/replace.c
 msgid "git replace [--format=<format>] [-l [<pattern>]]"
 msgstr "git replace [--format=<格式>] [-l [<模式>]]"
 
-#: builtin/replace.c:90
+#: builtin/replace.c
 #, c-format
 msgid ""
 "invalid replace format '%s'\n"
@@ -21465,27 +13369,27 @@ msgstr ""
 "无效的替换格式 '%s'\n"
 "有效的格式有 'short'、'medium' 和 'long'"
 
-#: builtin/replace.c:125
+#: builtin/replace.c
 #, c-format
 msgid "replace ref '%s' not found"
 msgstr "未发现替换引用 '%s'"
 
-#: builtin/replace.c:141
+#: builtin/replace.c
 #, c-format
 msgid "Deleted replace ref '%s'"
 msgstr "已删除替换引用 '%s'"
 
-#: builtin/replace.c:153
+#: builtin/replace.c
 #, c-format
 msgid "'%s' is not a valid ref name"
 msgstr "'%s' 不是一个有效的引用名"
 
-#: builtin/replace.c:158
+#: builtin/replace.c
 #, c-format
 msgid "replace ref '%s' already exists"
 msgstr "替换引用 '%s' 已经存在"
 
-#: builtin/replace.c:178
+#: builtin/replace.c
 #, c-format
 msgid ""
 "Objects must be of the same type.\n"
@@ -21496,106 +13400,106 @@ msgstr ""
 "'%s' 指向 '%s' 类型的替换对象\n"
 "而 '%s' 指向 '%s' 类型的替换对象。"
 
-#: builtin/replace.c:229
+#: builtin/replace.c
 #, c-format
 msgid "unable to open %s for writing"
 msgstr "无法为写入打开 %s"
 
-#: builtin/replace.c:242
+#: builtin/replace.c
 msgid "cat-file reported failure"
 msgstr "cat-file 报告失败"
 
-#: builtin/replace.c:258
+#: builtin/replace.c
 #, c-format
 msgid "unable to open %s for reading"
 msgstr "无法为读取打开 %s"
 
-#: builtin/replace.c:271
+#: builtin/replace.c
 msgid "unable to spawn mktree"
 msgstr "无法启动 mktree"
 
-#: builtin/replace.c:275
+#: builtin/replace.c
 msgid "unable to read from mktree"
 msgstr "无法从 mktree 读取"
 
-#: builtin/replace.c:284
+#: builtin/replace.c
 msgid "mktree reported failure"
 msgstr "mktree 报告失败"
 
-#: builtin/replace.c:288
+#: builtin/replace.c
 msgid "mktree did not return an object name"
 msgstr "mktree 没有返回一个对象名"
 
-#: builtin/replace.c:297
+#: builtin/replace.c
 #, c-format
 msgid "unable to fstat %s"
 msgstr "无法对 %s 执行 fstat"
 
-#: builtin/replace.c:302
+#: builtin/replace.c
 msgid "unable to write object to database"
 msgstr "无法向数据库写入对象"
 
-#: builtin/replace.c:325
+#: builtin/replace.c
 #, c-format
 msgid "unable to get object type for %s"
 msgstr "无法得到 %s 的对象类型"
 
-#: builtin/replace.c:341
+#: builtin/replace.c
 msgid "editing object file failed"
 msgstr "编辑对象文件失败"
 
-#: builtin/replace.c:350
+#: builtin/replace.c
 #, c-format
 msgid "new object is the same as the old one: '%s'"
 msgstr "新对象和旧对象相同：'%s'"
 
-#: builtin/replace.c:383
+#: builtin/replace.c
 #, c-format
 msgid "could not parse %s as a commit"
 msgstr "无法将 %s 解析为一个提交"
 
-#: builtin/replace.c:415
+#: builtin/replace.c
 #, c-format
 msgid "bad mergetag in commit '%s'"
 msgstr "提交 '%s' 中含有损坏的合并标签"
 
-#: builtin/replace.c:417
+#: builtin/replace.c
 #, c-format
 msgid "malformed mergetag in commit '%s'"
 msgstr "提交 '%s' 中含有格式错误的合并标签"
 
-#: builtin/replace.c:429
+#: builtin/replace.c
 #, c-format
 msgid ""
 "original commit '%s' contains mergetag '%s' that is discarded; use --edit "
 "instead of --graft"
 msgstr "原始提交 '%s' 包含已经丢弃的合并标签 '%s'，使用 --edit 代替 --graft"
 
-#: builtin/replace.c:468
+#: builtin/replace.c
 #, c-format
 msgid "the original commit '%s' has a gpg signature"
 msgstr "原始提交 '%s' 中有一个 gpg 签名"
 
-#: builtin/replace.c:469
+#: builtin/replace.c
 msgid "the signature will be removed in the replacement commit!"
 msgstr "在替换的提交中签名将被移除！"
 
-#: builtin/replace.c:479
+#: builtin/replace.c
 #, c-format
 msgid "could not write replacement commit for: '%s'"
 msgstr "不能为 '%s' 写替换提交"
 
-#: builtin/replace.c:487
+#: builtin/replace.c
 #, c-format
 msgid "graft for '%s' unnecessary"
 msgstr "对 '%s' 移植没有必要"
 
-#: builtin/replace.c:491
+#: builtin/replace.c
 #, c-format
 msgid "new commit is the same as the old one: '%s'"
 msgstr "新提交和旧的一样：'%s'"
 
-#: builtin/replace.c:526
+#: builtin/replace.c
 #, c-format
 msgid ""
 "could not convert the following graft(s):\n"
@@ -21604,266 +13508,270 @@ msgstr ""
 "不能转换下列移植：\n"
 "%s"
 
-#: builtin/replace.c:547
+#: builtin/replace.c
 msgid "list replace refs"
 msgstr "列出替换的引用"
 
-#: builtin/replace.c:548
+#: builtin/replace.c
 msgid "delete replace refs"
 msgstr "删除替换的引用"
 
-#: builtin/replace.c:549
+#: builtin/replace.c
 msgid "edit existing object"
 msgstr "编辑现存的对象"
 
-#: builtin/replace.c:550
+#: builtin/replace.c
 msgid "change a commit's parents"
 msgstr "修改一个提交的父提交"
 
-#: builtin/replace.c:551
+#: builtin/replace.c
 msgid "convert existing graft file"
 msgstr "转换现存的移植文件"
 
-#: builtin/replace.c:552
+#: builtin/replace.c
 msgid "replace the ref if it exists"
 msgstr "如果存在则替换引用"
 
-#: builtin/replace.c:554
+#: builtin/replace.c
 msgid "do not pretty-print contents for --edit"
 msgstr "不要为 --edit 操作美观显示内容"
 
-#: builtin/replace.c:555
+#: builtin/replace.c
 msgid "use this format"
 msgstr "使用此格式"
 
-#: builtin/replace.c:568
+#: builtin/replace.c
 msgid "--format cannot be used when not listing"
 msgstr "不列出时不能使用 --format"
 
-#: builtin/replace.c:576
+#: builtin/replace.c
 msgid "-f only makes sense when writing a replacement"
 msgstr "只有写一个替换时 -f 才有意义"
 
-#: builtin/replace.c:580
+#: builtin/replace.c
 msgid "--raw only makes sense with --edit"
 msgstr "--raw 只有和 --edit 共用才有意义"
 
-#: builtin/replace.c:586
+#: builtin/replace.c
 msgid "-d needs at least one argument"
 msgstr "-d 需要至少一个参数"
 
-#: builtin/replace.c:592
+#: builtin/replace.c
 msgid "bad number of arguments"
 msgstr "错误的参数个数"
 
-#: builtin/replace.c:598
+#: builtin/replace.c
 msgid "-e needs exactly one argument"
 msgstr "-e 需要且仅需要一个参数"
 
-#: builtin/replace.c:604
+#: builtin/replace.c
 msgid "-g needs at least one argument"
 msgstr "-g 需要至少一个参数"
 
-#: builtin/replace.c:610
+#: builtin/replace.c
 msgid "--convert-graft-file takes no argument"
 msgstr "--convert-graft-file 不带参数"
 
-#: builtin/replace.c:616
+#: builtin/replace.c
 msgid "only one pattern can be given with -l"
 msgstr "只能为 -l 提供一个模式"
 
-#: builtin/rerere.c:13
+#: builtin/rerere.c
 msgid "git rerere [clear | forget <path>... | status | remaining | diff | gc]"
 msgstr "git rerere [clear | forget <路径>... | status | remaining | diff | gc]"
 
-#: builtin/rerere.c:58
+#: builtin/rerere.c
 msgid "register clean resolutions in index"
 msgstr "在索引中注册干净的解决方案"
 
-#: builtin/rerere.c:77
+#: builtin/rerere.c
 msgid "'git rerere forget' without paths is deprecated"
 msgstr "没有路径的 'git rerere forget' 已经过时"
 
-#: builtin/rerere.c:111
+#: builtin/rerere.c
 #, c-format
 msgid "unable to generate diff for '%s'"
 msgstr "无法为 '%s' 生成差异"
 
-#: builtin/reset.c:33
+#: builtin/reset.c
 msgid ""
 "git reset [--mixed | --soft | --hard | --merge | --keep] [-q] [<commit>]"
 msgstr "git reset [--mixed | --soft | --hard | --merge | --keep] [-q] [<提交>]"
 
-#: builtin/reset.c:34
+#: builtin/reset.c
 msgid "git reset [-q] [<tree-ish>] [--] <pathspec>..."
 msgstr "git reset [-q] [<树对象>] [--] <路径表达式>..."
 
-#: builtin/reset.c:35
+#: builtin/reset.c
 msgid ""
 "git reset [-q] [--pathspec-from-file [--pathspec-file-nul]] [<tree-ish>]"
 msgstr "git reset [-q] [--pathspec-from-file [--pathspec-file-nul]] [<树对象>]"
 
-#: builtin/reset.c:36
+#: builtin/reset.c
 msgid "git reset --patch [<tree-ish>] [--] [<pathspec>...]"
 msgstr "git reset --patch [<树对象>] [--] [<路径表达式>...]"
 
-#: builtin/reset.c:42
+#: builtin/reset.c
 msgid "mixed"
 msgstr "混杂"
 
-#: builtin/reset.c:42
+#: builtin/reset.c
 msgid "soft"
 msgstr "软性"
 
-#: builtin/reset.c:42
+#: builtin/reset.c
 msgid "hard"
 msgstr "硬性"
 
-#: builtin/reset.c:42
+#: builtin/reset.c
 msgid "merge"
 msgstr "合并"
 
-#: builtin/reset.c:42
+#: builtin/reset.c
 msgid "keep"
 msgstr "保持"
 
-#: builtin/reset.c:90
+#: builtin/reset.c
 msgid "You do not have a valid HEAD."
 msgstr "您没有一个有效的 HEAD。"
 
-#: builtin/reset.c:92
+#: builtin/reset.c
 msgid "Failed to find tree of HEAD."
 msgstr "无法找到 HEAD 指向的树。"
 
-#: builtin/reset.c:98
+#: builtin/reset.c
 #, c-format
 msgid "Failed to find tree of %s."
 msgstr "无法找到 %s 指向的树。"
 
-#: builtin/reset.c:123
+#: builtin/reset.c
 #, c-format
 msgid "HEAD is now at %s"
 msgstr "HEAD 现在位于 %s"
 
 #  译者：汉字之间无空格，故删除%s前后空格
-#: builtin/reset.c:304
+#: builtin/reset.c
 #, c-format
 msgid "Cannot do a %s reset in the middle of a merge."
 msgstr "在合并过程中不能做%s重置操作。"
 
-#: builtin/reset.c:402 builtin/stash.c:606 builtin/stash.c:669
-#: builtin/stash.c:693
+#: builtin/reset.c builtin/stash.c
 msgid "be quiet, only report errors"
 msgstr "安静模式，只报告错误"
 
-#: builtin/reset.c:404
+#: builtin/reset.c
 msgid "skip refreshing the index after reset"
 msgstr "重置后跳过刷新索引"
 
-#: builtin/reset.c:406
+#: builtin/reset.c
 msgid "reset HEAD and index"
 msgstr "重置 HEAD 和索引"
 
-#: builtin/reset.c:407
+#: builtin/reset.c
 msgid "reset only HEAD"
 msgstr "只重置 HEAD"
 
-#: builtin/reset.c:409 builtin/reset.c:411
+#: builtin/reset.c
 msgid "reset HEAD, index and working tree"
 msgstr "重置 HEAD、索引和工作区"
 
-#: builtin/reset.c:413
+#: builtin/reset.c
 msgid "reset HEAD but keep local changes"
 msgstr "重置 HEAD 但保存本地变更"
 
-#: builtin/reset.c:419
+#: builtin/reset.c
 msgid "record only the fact that removed paths will be added later"
 msgstr "将删除的路径标记为稍后添加"
 
-#: builtin/reset.c:452
+#: builtin/reset.c
 #, c-format
 msgid "Failed to resolve '%s' as a valid revision."
 msgstr "无法将 '%s' 解析为一个有效的版本。"
 
-#: builtin/reset.c:460
+#: builtin/reset.c
 #, c-format
 msgid "Failed to resolve '%s' as a valid tree."
 msgstr "无法将 '%s' 解析为一个有效的树对象。"
 
-#: builtin/reset.c:479
+#: builtin/reset.c
 msgid "--mixed with paths is deprecated; use 'git reset -- <paths>' instead."
 msgstr "--mixed 带路径已弃用，而是用 'git reset -- <路径>'。"
 
 #  译者：汉字之间无空格，故删除%s前后空格
-#: builtin/reset.c:481
+#: builtin/reset.c
 #, c-format
 msgid "Cannot do %s reset with paths."
 msgstr "不能带路径进行%s重置。"
 
 #  译者：汉字之间无空格，故删除%s前后空格
-#: builtin/reset.c:496
+#: builtin/reset.c
 #, c-format
 msgid "%s reset is not allowed in a bare repository"
 msgstr "不能对纯仓库进行%s重置"
 
-#: builtin/reset.c:527
+#: builtin/reset.c
 msgid "Unstaged changes after reset:"
 msgstr "重置后取消暂存的变更："
 
-#: builtin/reset.c:530
+#: builtin/reset.c
 #, c-format
 msgid ""
 "It took %.2f seconds to refresh the index after reset.  You can use\n"
 "'--no-refresh' to avoid this."
 msgstr "在重置后花了 %.2f 秒来刷新索引。使用 '--no-refresh' 以避免之。"
 
-#: builtin/reset.c:547
+#: builtin/reset.c
 #, c-format
 msgid "Could not reset index file to revision '%s'."
 msgstr "不能重置索引文件至版本 '%s'。"
 
-#: builtin/reset.c:552
+#: builtin/reset.c
 msgid "Could not write new index file."
 msgstr "不能写入新的索引文件。"
 
-#: builtin/rev-list.c:659
+#: builtin/rev-list.c pack-bitmap.c
+#, c-format
+msgid "unable to get disk usage of %s"
+msgstr "无法得到 %s 的磁盘使用量"
+
+#: builtin/rev-list.c
 msgid "rev-list does not support display of notes"
 msgstr "rev-list 不支持显示注解"
 
-#: builtin/rev-list.c:664
+#: builtin/rev-list.c
 #, c-format
 msgid "marked counting and '%s' cannot be used together"
 msgstr "标记计数和 '%s' 不能同时使用"
 
-#: builtin/rev-parse.c:409
+#: builtin/rev-parse.c
 msgid "git rev-parse --parseopt [<options>] -- [<args>...]"
 msgstr "git rev-parse --parseopt [<选项>] -- [<参数>...]"
 
-#: builtin/rev-parse.c:414
+#: builtin/rev-parse.c
 msgid "keep the `--` passed as an arg"
 msgstr "保持 `--` 作为一个参数传递"
 
-#: builtin/rev-parse.c:416
+#: builtin/rev-parse.c
 msgid "stop parsing after the first non-option argument"
 msgstr "遇到第一个非选项参数后停止解析"
 
-#: builtin/rev-parse.c:419
+#: builtin/rev-parse.c
 msgid "output in stuck long form"
 msgstr "以固定长格式输出"
 
-#: builtin/rev-parse.c:438
+#: builtin/rev-parse.c
 msgid "premature end of input"
 msgstr "输入过早结束"
 
-#: builtin/rev-parse.c:442
+#: builtin/rev-parse.c
 msgid "no usage string given before the `--' separator"
 msgstr "在 `--' 分隔符之前没有给出使用方法字符串"
 
-#: builtin/rev-parse.c:548
+#: builtin/rev-parse.c
 msgid "Needed a single revision"
 msgstr "需要一个单独的版本"
 
-#: builtin/rev-parse.c:552
+#: builtin/rev-parse.c
 msgid ""
 "git rev-parse --parseopt [<options>] -- [<args>...]\n"
 "   or: git rev-parse --sq-quote [<arg>...]\n"
@@ -21877,145 +13785,153 @@ msgstr ""
 "\n"
 "初次使用时执行 \"git rev-parse --parseopt -h\" 来获得更多信息。"
 
-#: builtin/rev-parse.c:712
+#: builtin/rev-parse.c
 msgid "--resolve-git-dir requires an argument"
 msgstr "--resolve-git-dir 需要一个参数"
 
-#: builtin/rev-parse.c:715
+#: builtin/rev-parse.c
 #, c-format
 msgid "not a gitdir '%s'"
 msgstr "不是一个git目录 '%s'"
 
-#: builtin/rev-parse.c:739
+#: builtin/rev-parse.c
 msgid "--git-path requires an argument"
 msgstr "--git-path 需要一个参数"
 
-#: builtin/rev-parse.c:749
+#: builtin/rev-parse.c
 msgid "-n requires an argument"
 msgstr "-n 需要一个参数"
 
-#: builtin/rev-parse.c:763
+#: builtin/rev-parse.c
 msgid "--path-format requires an argument"
 msgstr "--path-format 需要一个参数"
 
-#: builtin/rev-parse.c:769
+#: builtin/rev-parse.c
 #, c-format
 msgid "unknown argument to --path-format: %s"
 msgstr "未知的 --path-format 参数：%s"
 
-#: builtin/rev-parse.c:776
+#: builtin/rev-parse.c
 msgid "--default requires an argument"
 msgstr "--default 需要一个参数"
 
-#: builtin/rev-parse.c:782
+#: builtin/rev-parse.c
 msgid "--prefix requires an argument"
 msgstr "--prefix 需要一个参数"
 
-#: builtin/rev-parse.c:851
+#: builtin/rev-parse.c
 #, c-format
 msgid "unknown mode for --abbrev-ref: %s"
 msgstr "未知的 --abbrev-ref 模式：%s"
 
-#: builtin/rev-parse.c:1023
+#: builtin/rev-parse.c setup.c
+msgid "this operation must be run in a work tree"
+msgstr "该操作必须在一个工作区中运行"
+
+#: builtin/rev-parse.c
 #, c-format
 msgid "unknown mode for --show-object-format: %s"
 msgstr "未知的 --show-object-format 模式：%s"
 
-#: builtin/revert.c:24
+#: builtin/revert.c
 msgid "git revert [<options>] <commit-ish>..."
 msgstr "git revert [<选项>] <提交号>..."
 
-#: builtin/revert.c:25
+#: builtin/revert.c
 msgid "git revert <subcommand>"
 msgstr "git revert <子命令>"
 
-#: builtin/revert.c:30
+#: builtin/revert.c
 msgid "git cherry-pick [<options>] <commit-ish>..."
 msgstr "git cherry-pick [<选项>] <提交号>..."
 
-#: builtin/revert.c:31
+#: builtin/revert.c
 msgid "git cherry-pick <subcommand>"
 msgstr "git cherry-pick <子命令>"
 
-#: builtin/revert.c:72
+#: builtin/revert.c
 #, c-format
 msgid "option `%s' expects a number greater than zero"
 msgstr "选项 `%s' 期望一个大于零的数字"
 
-#: builtin/revert.c:92
+#: builtin/revert.c
 #, c-format
 msgid "%s: %s cannot be used with %s"
 msgstr "%s：%s 不能和 %s 同时使用"
 
-#: builtin/revert.c:102
+#: builtin/revert.c
 msgid "end revert or cherry-pick sequence"
 msgstr "终止反转或拣选操作"
 
-#: builtin/revert.c:103
+#: builtin/revert.c
 msgid "resume revert or cherry-pick sequence"
 msgstr "继续反转或拣选操作"
 
-#: builtin/revert.c:104
+#: builtin/revert.c
 msgid "cancel revert or cherry-pick sequence"
 msgstr "取消反转或拣选操作"
 
-#: builtin/revert.c:105
+#: builtin/revert.c
 msgid "skip current commit and continue"
 msgstr "跳过当前提交并继续"
 
-#: builtin/revert.c:107
+#: builtin/revert.c
 msgid "don't automatically commit"
 msgstr "不要自动提交"
 
-#: builtin/revert.c:108
+#: builtin/revert.c
 msgid "edit the commit message"
 msgstr "编辑提交说明"
 
-#: builtin/revert.c:111
+#: builtin/revert.c
 msgid "parent-number"
 msgstr "父编号"
 
-#: builtin/revert.c:112
+#: builtin/revert.c
 msgid "select mainline parent"
 msgstr "选择主干父提交编号"
 
-#: builtin/revert.c:114
+#: builtin/revert.c
 msgid "merge strategy"
 msgstr "合并策略"
 
-#: builtin/revert.c:116
+#: builtin/revert.c
 msgid "option for merge strategy"
 msgstr "合并策略的选项"
 
-#: builtin/revert.c:125
+#: builtin/revert.c
 msgid "append commit name"
 msgstr "追加提交名称"
 
-#: builtin/revert.c:127
+#: builtin/revert.c
 msgid "preserve initially empty commits"
 msgstr "保留初始化的空提交"
 
-#: builtin/revert.c:128
+#: builtin/revert.c
 msgid "allow commits with empty messages"
 msgstr "允许提交说明为空"
 
-#: builtin/revert.c:129
+#: builtin/revert.c
 msgid "keep redundant, empty commits"
 msgstr "保持多余的、空的提交"
 
-#: builtin/revert.c:241
+#: builtin/revert.c
+msgid "use the 'reference' format to refer to commits"
+msgstr "使用 'reference' 格式来指向提交"
+
+#: builtin/revert.c
 msgid "revert failed"
 msgstr "还原失败"
 
-#: builtin/revert.c:254
+#: builtin/revert.c
 msgid "cherry-pick failed"
 msgstr "拣选失败"
 
-#: builtin/rm.c:20
+#: builtin/rm.c
 msgid "git rm [<options>] [--] <file>..."
 msgstr "git rm [<选项>] [--] <文件>..."
 
-#: builtin/rm.c:208
+#: builtin/rm.c
 msgid ""
 "the following file has staged content different from both the\n"
 "file and the HEAD:"
@@ -22025,7 +13941,7 @@ msgid_plural ""
 msgstr[0] "如下文件其暂存的内容和工作区及 HEAD 中的都不一样："
 msgstr[1] "如下文件其暂存的内容和工作区及 HEAD 中的都不一样："
 
-#: builtin/rm.c:213
+#: builtin/rm.c
 msgid ""
 "\n"
 "(use -f to force removal)"
@@ -22033,13 +13949,13 @@ msgstr ""
 "\n"
 "（使用 -f 强制删除）"
 
-#: builtin/rm.c:217
+#: builtin/rm.c
 msgid "the following file has changes staged in the index:"
 msgid_plural "the following files have changes staged in the index:"
 msgstr[0] "下列文件索引中有变更"
 msgstr[1] "下列文件索引中有变更"
 
-#: builtin/rm.c:221 builtin/rm.c:230
+#: builtin/rm.c
 msgid ""
 "\n"
 "(use --cached to keep the file, or -f to force removal)"
@@ -22047,51 +13963,51 @@ msgstr ""
 "\n"
 "（使用 --cached 保留本地文件，或用 -f 强制删除）"
 
-#: builtin/rm.c:227
+#: builtin/rm.c
 msgid "the following file has local modifications:"
 msgid_plural "the following files have local modifications:"
 msgstr[0] "如下文件有本地修改："
 msgstr[1] "如下文件有本地修改："
 
-#: builtin/rm.c:245
+#: builtin/rm.c
 msgid "do not list removed files"
 msgstr "不列出删除的文件"
 
-#: builtin/rm.c:246
+#: builtin/rm.c
 msgid "only remove from the index"
 msgstr "只从索引区删除"
 
-#: builtin/rm.c:247
+#: builtin/rm.c
 msgid "override the up-to-date check"
 msgstr "忽略文件更新状态检查"
 
-#: builtin/rm.c:248
+#: builtin/rm.c
 msgid "allow recursive removal"
 msgstr "允许递归删除"
 
-#: builtin/rm.c:250
+#: builtin/rm.c
 msgid "exit with a zero status even if nothing matched"
 msgstr "即使没有匹配，也以零状态退出"
 
-#: builtin/rm.c:285
+#: builtin/rm.c
 msgid "No pathspec was given. Which files should I remove?"
 msgstr "没有提供路径规格。我应该删除哪些文件？"
 
-#: builtin/rm.c:315
+#: builtin/rm.c
 msgid "please stage your changes to .gitmodules or stash them to proceed"
 msgstr "请将您的修改暂存到 .gitmodules 中或贮藏后再继续"
 
-#: builtin/rm.c:337
+#: builtin/rm.c
 #, c-format
 msgid "not removing '%s' recursively without -r"
 msgstr "未提供 -r 选项不会递归删除 '%s'"
 
-#: builtin/rm.c:385
+#: builtin/rm.c
 #, c-format
 msgid "git rm: unable to remove %s"
 msgstr "git rm：不能删除 %s"
 
-#: builtin/send-pack.c:20
+#: builtin/send-pack.c
 msgid ""
 "git send-pack [--mirror] [--dry-run] [--force]\n"
 "              [--receive-pack=<git-receive-pack>]\n"
@@ -22103,80 +14019,80 @@ msgstr ""
 "              [--verbose] [--thin] [--atomic]\n"
 "              [<主机>:]<目录> (--all | <引用>...)"
 
-#: builtin/send-pack.c:192
+#: builtin/send-pack.c
 msgid "remote name"
 msgstr "远程名称"
 
-#: builtin/send-pack.c:205
+#: builtin/send-pack.c
 msgid "use stateless RPC protocol"
 msgstr "使用无状态的 RPC 协议"
 
-#: builtin/send-pack.c:206
+#: builtin/send-pack.c
 msgid "read refs from stdin"
 msgstr "从标准输入读取引用"
 
-#: builtin/send-pack.c:207
+#: builtin/send-pack.c
 msgid "print status from remote helper"
 msgstr "打印来自远程 helper 的状态"
 
-#: builtin/shortlog.c:16
+#: builtin/shortlog.c
 msgid "git shortlog [<options>] [<revision-range>] [[--] <path>...]"
 msgstr "git shortlog [<选项>] [<版本范围>] [[--] <路径>...]"
 
-#: builtin/shortlog.c:17
+#: builtin/shortlog.c
 msgid "git log --pretty=short | git shortlog [<options>]"
 msgstr "git log --pretty=short | git shortlog [<选项>]"
 
-#: builtin/shortlog.c:123
+#: builtin/shortlog.c
 msgid "using multiple --group options with stdin is not supported"
 msgstr "不支持和标准输入一起使用多个 --group 选项"
 
-#: builtin/shortlog.c:133
+#: builtin/shortlog.c
 msgid "using --group=trailer with stdin is not supported"
 msgstr "不支持和标准输入一起使用 --group=trailer"
 
-#: builtin/shortlog.c:323
+#: builtin/shortlog.c
 #, c-format
 msgid "unknown group type: %s"
 msgstr "未知分组类型：%s"
 
-#: builtin/shortlog.c:351
+#: builtin/shortlog.c
 msgid "group by committer rather than author"
 msgstr "按照提交者而不是作者分组"
 
-#: builtin/shortlog.c:354
+#: builtin/shortlog.c
 msgid "sort output according to the number of commits per author"
 msgstr "根据每个作者的提交数量排序"
 
-#: builtin/shortlog.c:356
+#: builtin/shortlog.c
 msgid "suppress commit descriptions, only provides commit count"
 msgstr "抑制提交描述，只提供提交数量"
 
-#: builtin/shortlog.c:358
+#: builtin/shortlog.c
 msgid "show the email address of each author"
 msgstr "显示每个作者的电子邮件地址"
 
-#: builtin/shortlog.c:359
+#: builtin/shortlog.c
 msgid "<w>[,<i1>[,<i2>]]"
 msgstr "<w>[,<i1>[,<i2>]]"
 
-#: builtin/shortlog.c:360
+#: builtin/shortlog.c
 msgid "linewrap output"
 msgstr "折行输出"
 
-#: builtin/shortlog.c:362
+#: builtin/shortlog.c
 msgid "field"
 msgstr "字段"
 
-#: builtin/shortlog.c:363
+#: builtin/shortlog.c
 msgid "group by field"
 msgstr "按字段分组"
 
-#: builtin/shortlog.c:395
+#: builtin/shortlog.c
 msgid "too many arguments given outside repository"
 msgstr "仓库外执行提供了太多的参数"
 
-#: builtin/show-branch.c:14
+#: builtin/show-branch.c
 msgid ""
 "git show-branch [-a | --all] [-r | --remotes] [--topo-order | --date-order]\n"
 "                [--current] [--color[=<when>] | --no-color] [--sparse]\n"
@@ -22188,132 +14104,132 @@ msgstr ""
 "                [--more=<n> | --list | --independent | --merge-base]\n"
 "                [--no-name | --sha1-name] [--topics] [(<版本> | <通配符>)...]"
 
-#: builtin/show-branch.c:18
+#: builtin/show-branch.c
 msgid "git show-branch (-g | --reflog)[=<n>[,<base>]] [--list] [<ref>]"
 msgstr "git show-branch (-g | --reflog)[=<n>[,<起始点>]] [--list] [<引用>]"
 
-#: builtin/show-branch.c:396
+#: builtin/show-branch.c
 #, c-format
 msgid "ignoring %s; cannot handle more than %d ref"
 msgid_plural "ignoring %s; cannot handle more than %d refs"
 msgstr[0] "忽略 %s，无法处理 %d 个以上的引用"
 msgstr[1] "忽略 %s，无法处理 %d 个以上的引用"
 
-#: builtin/show-branch.c:548
+#: builtin/show-branch.c
 #, c-format
 msgid "no matching refs with %s"
 msgstr "没有和 %s 匹配的引用"
 
-#: builtin/show-branch.c:645
+#: builtin/show-branch.c
 msgid "show remote-tracking and local branches"
 msgstr "显示远程跟踪的和本地的分支"
 
-#: builtin/show-branch.c:647
+#: builtin/show-branch.c
 msgid "show remote-tracking branches"
 msgstr "显示远程跟踪的分支"
 
-#: builtin/show-branch.c:649
+#: builtin/show-branch.c
 msgid "color '*!+-' corresponding to the branch"
 msgstr "着色 '*!+-' 到相应的分支"
 
-#: builtin/show-branch.c:651
+#: builtin/show-branch.c
 msgid "show <n> more commits after the common ancestor"
 msgstr "显示共同祖先后的 <n> 个提交"
 
-#: builtin/show-branch.c:653
+#: builtin/show-branch.c
 msgid "synonym to more=-1"
 msgstr "和 more=-1 同义"
 
-#: builtin/show-branch.c:654
+#: builtin/show-branch.c
 msgid "suppress naming strings"
 msgstr "不显示字符串命名"
 
-#: builtin/show-branch.c:656
+#: builtin/show-branch.c
 msgid "include the current branch"
 msgstr "包括当前分支"
 
-#: builtin/show-branch.c:658
+#: builtin/show-branch.c
 msgid "name commits with their object names"
 msgstr "以对象名字命名提交"
 
-#: builtin/show-branch.c:660
+#: builtin/show-branch.c
 msgid "show possible merge bases"
 msgstr "显示可能合并的基线"
 
-#: builtin/show-branch.c:662
+#: builtin/show-branch.c
 msgid "show refs unreachable from any other ref"
 msgstr "显示没有任何引用的的引用"
 
-#: builtin/show-branch.c:664
+#: builtin/show-branch.c
 msgid "show commits in topological order"
 msgstr "以拓扑顺序显示提交"
 
-#: builtin/show-branch.c:667
+#: builtin/show-branch.c
 msgid "show only commits not on the first branch"
 msgstr "只显示不在第一个分支上的提交"
 
-#: builtin/show-branch.c:669
+#: builtin/show-branch.c
 msgid "show merges reachable from only one tip"
 msgstr "显示仅一个分支可访问的合并提交"
 
-#: builtin/show-branch.c:671
+#: builtin/show-branch.c
 msgid "topologically sort, maintaining date order where possible"
 msgstr "拓扑方式排序，并尽可能地保持日期顺序"
 
-#: builtin/show-branch.c:674
+#: builtin/show-branch.c
 msgid "<n>[,<base>]"
 msgstr "<n>[,<base>]"
 
-#: builtin/show-branch.c:675
+#: builtin/show-branch.c
 msgid "show <n> most recent ref-log entries starting at base"
 msgstr "显示从起始点开始的 <n> 条最近的引用日志记录"
 
-#: builtin/show-branch.c:735
+#: builtin/show-branch.c
 msgid "no branches given, and HEAD is not valid"
 msgstr "未提供分支，且 HEAD 无效"
 
-#: builtin/show-branch.c:738
+#: builtin/show-branch.c
 msgid "--reflog option needs one branch name"
 msgstr "选项 --reflog 需要一个分支名"
 
-#: builtin/show-branch.c:741
+#: builtin/show-branch.c
 #, 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
 #, c-format
 msgid "no such ref %s"
 msgstr "无此引用 %s"
 
-#: builtin/show-branch.c:831
+#: builtin/show-branch.c
 #, 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
 #, c-format
 msgid "'%s' is not a valid ref."
 msgstr "'%s' 不是一个有效的引用。"
 
-#: builtin/show-branch.c:838
+#: builtin/show-branch.c
 #, c-format
 msgid "cannot find commit %s (%s)"
 msgstr "不能找到提交 %s（%s）"
 
-#: builtin/show-index.c:21
+#: builtin/show-index.c
 msgid "hash-algorithm"
 msgstr "哈希算法"
 
-#: builtin/show-index.c:31
+#: builtin/show-index.c
 msgid "Unknown hash algorithm"
 msgstr "未知的哈希算法"
 
-#: builtin/show-ref.c:12
+#: builtin/show-ref.c
 msgid ""
 "git show-ref [-q | --quiet] [--verify] [--head] [-d | --dereference] [-s | --"
 "hash[=<n>]] [--abbrev[=<n>]] [--tags] [--heads] [--] [<pattern>...]"
@@ -22321,140 +14237,143 @@ msgstr ""
 "git show-ref [-q | --quiet] [--verify] [--head] [-d | --dereference] [-s | --"
 "hash[=<n>]] [--abbrev[=<n>]] [--tags] [--heads] [--] [<模式>...]"
 
-#: builtin/show-ref.c:13
+#: builtin/show-ref.c
 msgid "git show-ref --exclude-existing[=<pattern>]"
 msgstr "git show-ref --exclude-existing[=<模式>]"
 
-#: builtin/show-ref.c:162
+#: builtin/show-ref.c
 msgid "only show tags (can be combined with heads)"
 msgstr "只显示标签（可以和头共用）"
 
-#: builtin/show-ref.c:163
+#: builtin/show-ref.c
 msgid "only show heads (can be combined with tags)"
 msgstr "只显示头（可以和标签共用）"
 
-#: builtin/show-ref.c:164
+#: builtin/show-ref.c
 msgid "stricter reference checking, requires exact ref path"
 msgstr "更严格的引用检测，需要精确的引用路径"
 
-#: builtin/show-ref.c:167 builtin/show-ref.c:169
+#: builtin/show-ref.c
 msgid "show the HEAD reference, even if it would be filtered out"
 msgstr "显示 HEAD 引用，即使被过滤掉"
 
-#: builtin/show-ref.c:171
+#: builtin/show-ref.c
 msgid "dereference tags into object IDs"
 msgstr "转换标签到对象 ID"
 
-#: builtin/show-ref.c:173
+#: builtin/show-ref.c
 msgid "only show SHA1 hash using <n> digits"
 msgstr "只显示使用 <n> 个数字的 SHA1 哈希"
 
-#: builtin/show-ref.c:177
+#: builtin/show-ref.c
 msgid "do not print results to stdout (useful with --verify)"
 msgstr "不打印结果到标准输出（例如与 --verify 参数共用）"
 
-#: builtin/show-ref.c:179
+#: builtin/show-ref.c
 msgid "show refs from stdin that aren't in local repository"
 msgstr "显示从标准输入中读入的不在本地仓库中的引用"
 
-#: builtin/sparse-checkout.c:23
+#: builtin/sparse-checkout.c
 msgid "git sparse-checkout (init|list|set|add|reapply|disable) <options>"
 msgstr "git sparse-checkout (init|list|set|add|reapply|disable) <选项>"
 
-#: builtin/sparse-checkout.c:61
+#: builtin/sparse-checkout.c
 msgid "this worktree is not sparse"
 msgstr "这个工作区不是稀疏的"
 
-#: builtin/sparse-checkout.c:76
+#: builtin/sparse-checkout.c
 msgid "this worktree is not sparse (sparse-checkout file may not exist)"
 msgstr "本工作区不是稀疏模式（稀疏检出文件可能不存在）"
 
-#: builtin/sparse-checkout.c:177
+#: builtin/sparse-checkout.c
 #, c-format
 msgid ""
 "directory '%s' contains untracked files, but is not in the sparse-checkout "
 "cone"
 msgstr "目录 '%s' 包括了未跟踪文件，但不在稀疏检出锥中"
 
-#: builtin/sparse-checkout.c:185
+#: builtin/sparse-checkout.c
 #, c-format
 msgid "failed to remove directory '%s'"
 msgstr "无法删除目录 '%s'"
 
-#: builtin/sparse-checkout.c:327
+#: builtin/sparse-checkout.c
 msgid "failed to create directory for sparse-checkout file"
 msgstr "无法为稀疏检出文件创建目录"
 
-#: builtin/sparse-checkout.c:366
+#: builtin/sparse-checkout.c
 msgid "failed to initialize worktree config"
 msgstr "无法初始化工作树配置"
 
-#: builtin/sparse-checkout.c:411
+#: builtin/sparse-checkout.c
 msgid "failed to modify sparse-index config"
 msgstr "无法修改 sparse-index 配置"
 
-#: builtin/sparse-checkout.c:441 builtin/sparse-checkout.c:793
-#: builtin/sparse-checkout.c:847
+#: builtin/sparse-checkout.c
 msgid "initialize the sparse-checkout in cone mode"
 msgstr "初始化稀疏检出为锥形模式"
 
-#: builtin/sparse-checkout.c:443 builtin/sparse-checkout.c:795
-#: builtin/sparse-checkout.c:849
+#: builtin/sparse-checkout.c
 msgid "toggle the use of a sparse index"
 msgstr "切换稀疏索引的使用"
 
-#: builtin/sparse-checkout.c:479
+#: builtin/sparse-checkout.c commit-graph.c midx.c
+#, c-format
+msgid "unable to create leading directories of %s"
+msgstr "不能为 %s 创建先导目录"
+
+#: builtin/sparse-checkout.c
 #, c-format
 msgid "failed to open '%s'"
 msgstr "无法打开 '%s'"
 
-#: builtin/sparse-checkout.c:531
+#: builtin/sparse-checkout.c
 #, c-format
 msgid "could not normalize path %s"
 msgstr "无法规范化路径 %s"
 
-#: builtin/sparse-checkout.c:560
+#: builtin/sparse-checkout.c
 #, c-format
 msgid "unable to unquote C-style string '%s'"
 msgstr "无法为 C 语言风格的字符串 '%s' 去引号"
 
-#: builtin/sparse-checkout.c:615 builtin/sparse-checkout.c:643
+#: builtin/sparse-checkout.c
 msgid "unable to load existing sparse-checkout patterns"
 msgstr "无法加载现存的稀疏检出模式"
 
-#: builtin/sparse-checkout.c:619
+#: builtin/sparse-checkout.c
 msgid "existing sparse-checkout patterns do not use cone mode"
 msgstr "已有的稀疏检出模式不使用锥形模式"
 
-#: builtin/sparse-checkout.c:707
+#: builtin/sparse-checkout.c
 msgid "please run from the toplevel directory in non-cone mode"
 msgstr "请在非锥形模式的顶级目录中运行"
 
-#: builtin/sparse-checkout.c:712
+#: builtin/sparse-checkout.c
 msgid "specify directories rather than patterns (no leading slash)"
 msgstr "指定目录而不是模式（无前导斜线）"
 
-#: builtin/sparse-checkout.c:714
+#: builtin/sparse-checkout.c
 msgid ""
 "specify directories rather than patterns.  If your directory starts with a "
 "'!', pass --skip-checks"
 msgstr "指定目录而不是模式。若你的目录以 '!' 开头，传入 --skip-checks"
 
-#: builtin/sparse-checkout.c:716
+#: builtin/sparse-checkout.c
 msgid ""
 "specify directories rather than patterns.  If your directory really has any "
 "of '*?[]\\' in it, pass --skip-checks"
 msgstr ""
 "指定目录而不是模式。若你的目录真的包含 '*?[]\\' 中的字符，传入 --skip-checks"
 
-#: builtin/sparse-checkout.c:732
+#: builtin/sparse-checkout.c
 #, c-format
 msgid ""
 "'%s' is not a directory; to treat it as a directory anyway, rerun with --"
 "skip-checks"
 msgstr "'%s' 不是目录；若无论如何都要将它当作目录，使用 --skip-checks 重新运行"
 
-#: builtin/sparse-checkout.c:734
+#: builtin/sparse-checkout.c
 #, c-format
 msgid ""
 "pass a leading slash before paths such as '%s' if you want a single file "
@@ -22463,24 +14382,24 @@ msgstr ""
 "如果您想要单独一个文件，在类似于 '%s' 的路径前传入前置斜线 （参见 git-sparse-"
 "checkout 手册中的 NON-CONE PROBLEMS）。"
 
-#: builtin/sparse-checkout.c:739
+#: builtin/sparse-checkout.c
 msgid "git sparse-checkout add [--skip-checks] (--stdin | <patterns>)"
 msgstr "git sparse-checkout add [--skip-checks] (--stdin | <模式>)"
 
-#: builtin/sparse-checkout.c:752 builtin/sparse-checkout.c:797
+#: builtin/sparse-checkout.c
 msgid ""
 "skip some sanity checks on the given paths that might give false positives"
 msgstr "跳过可能对一些目录产生假阳性错误的合理性检查"
 
-#: builtin/sparse-checkout.c:755 builtin/sparse-checkout.c:800
+#: builtin/sparse-checkout.c
 msgid "read patterns from standard in"
 msgstr "从标准输入读取模式"
 
-#: builtin/sparse-checkout.c:760
+#: builtin/sparse-checkout.c
 msgid "no sparse-checkout to add to"
 msgstr "没有可以添加到的稀疏检出"
 
-#: builtin/sparse-checkout.c:775
+#: builtin/sparse-checkout.c
 msgid ""
 "git sparse-checkout set [--[no-]cone] [--[no-]sparse-index] [--skip-checks] "
 "(--stdin | <patterns>)"
@@ -22488,35 +14407,35 @@ msgstr ""
 "git sparse-checkout set [--[no-]cone] [--[no-]sparse-index] [--skip-checks] "
 "(--stdin | <模式>)"
 
-#: builtin/sparse-checkout.c:854
+#: builtin/sparse-checkout.c
 msgid "must be in a sparse-checkout to reapply sparsity patterns"
 msgstr "必须在稀疏检出中重应用稀疏模式"
 
-#: builtin/sparse-checkout.c:914
+#: builtin/sparse-checkout.c
 msgid "error while refreshing working directory"
 msgstr "刷新工作目录时出错"
 
-#: builtin/stash.c:24 builtin/stash.c:40
+#: builtin/stash.c
 msgid "git stash list [<options>]"
 msgstr "git stash list [<选项>]"
 
-#: builtin/stash.c:25 builtin/stash.c:45
+#: builtin/stash.c
 msgid "git stash show [<options>] [<stash>]"
 msgstr "git stash show [<选项>] [<stash>]"
 
-#: builtin/stash.c:26 builtin/stash.c:50
+#: builtin/stash.c
 msgid "git stash drop [-q|--quiet] [<stash>]"
 msgstr "git stash drop [-q|--quiet] [<stash>]"
 
-#: builtin/stash.c:27
+#: builtin/stash.c
 msgid "git stash ( pop | apply ) [--index] [-q|--quiet] [<stash>]"
 msgstr "git stash ( pop | apply ) [--index] [-q|--quiet] [<stash>]"
 
-#: builtin/stash.c:28 builtin/stash.c:65
+#: builtin/stash.c
 msgid "git stash branch <branchname> [<stash>]"
 msgstr "git stash branch <分支名> [<stash>]"
 
-#: builtin/stash.c:30
+#: builtin/stash.c
 msgid ""
 "git stash [push [-p|--patch] [-S|--staged] [-k|--[no-]keep-index] [-q|--"
 "quiet]\n"
@@ -22530,7 +14449,7 @@ msgstr ""
 "          [--pathspec-from-file=<文件> [--pathspec-file-nul]]\n"
 "          [--] [<路径规格>...]]"
 
-#: builtin/stash.c:34
+#: builtin/stash.c
 msgid ""
 "git stash save [-p|--patch] [-S|--staged] [-k|--[no-]keep-index] [-q|--"
 "quiet]\n"
@@ -22540,19 +14459,19 @@ msgstr ""
 "quiet]\n"
 "          [-u|--include-untracked] [-a|--all] [<消息>]"
 
-#: builtin/stash.c:55
+#: builtin/stash.c
 msgid "git stash pop [--index] [-q|--quiet] [<stash>]"
 msgstr "git stash pop [--index] [-q|--quiet] [<stash>]"
 
-#: builtin/stash.c:60
+#: builtin/stash.c
 msgid "git stash apply [--index] [-q|--quiet] [<stash>]"
 msgstr "git stash apply [--index] [-q|--quiet] [<stash>]"
 
-#: builtin/stash.c:75
+#: builtin/stash.c
 msgid "git stash store [-m|--message <message>] [-q|--quiet] <commit>"
 msgstr "git stash store [-m|--message <消息>] [-q|--quiet] <提交>"
 
-#: builtin/stash.c:80
+#: builtin/stash.c
 msgid ""
 "git stash [push [-p|--patch] [-k|--[no-]keep-index] [-q|--quiet]\n"
 "          [-u|--include-untracked] [-a|--all] [-m|--message <message>]\n"
@@ -22562,7 +14481,7 @@ msgstr ""
 "          [-u|--include-untracked] [-a|--all] [-m|--message <消息>]\n"
 "          [--] [<路径规格>...]]"
 
-#: builtin/stash.c:87
+#: builtin/stash.c
 msgid ""
 "git stash save [-p|--patch] [-k|--[no-]keep-index] [-q|--quiet]\n"
 "               [-u|--include-untracked] [-a|--all] [<message>]"
@@ -22570,30 +14489,30 @@ msgstr ""
 "git stash save [-p|--patch] [-k|--[no-]keep-index] [-q|--quiet]\n"
 "               [-u|--include-untracked] [-a|--all] [<消息>]"
 
-#: builtin/stash.c:130
+#: builtin/stash.c
 #, c-format
 msgid "'%s' is not a stash-like commit"
 msgstr "'%s' 不像是一个贮藏提交"
 
-#: builtin/stash.c:150
+#: builtin/stash.c
 #, c-format
 msgid "Too many revisions specified:%s"
 msgstr "指定了太多的版本：%s"
 
-#: builtin/stash.c:164
+#: builtin/stash.c
 msgid "No stash entries found."
 msgstr "未发现贮藏条目。"
 
-#: builtin/stash.c:178
+#: builtin/stash.c
 #, c-format
 msgid "%s is not a valid reference"
 msgstr "%s 不是一个有效的引用名"
 
-#: builtin/stash.c:227
+#: builtin/stash.c
 msgid "git stash clear with arguments is unimplemented"
 msgstr "git stash clear 不支持参数"
 
-#: builtin/stash.c:447
+#: builtin/stash.c
 #, c-format
 msgid ""
 "WARNING: Untracked file in way of tracked file!  Renaming\n"
@@ -22604,226 +14523,220 @@ msgstr ""
 "            %s -> %s\n"
 "         以腾出空间。\n"
 
-#: builtin/stash.c:508
+#: builtin/stash.c
 msgid "cannot apply a stash in the middle of a merge"
 msgstr "无法在合并过程中应用贮藏"
 
-#: builtin/stash.c:519
+#: builtin/stash.c
 #, c-format
 msgid "could not generate diff %s^!."
 msgstr "无法生成差异 %s^!."
 
-#: builtin/stash.c:526
+#: builtin/stash.c
 msgid "conflicts in index. Try without --index."
 msgstr "索引中有冲突。尝试不用 --index。"
 
-#: builtin/stash.c:532
+#: builtin/stash.c
 msgid "could not save index tree"
 msgstr "不能保存索引树"
 
-#: builtin/stash.c:552
+#: builtin/stash.c
 #, c-format
 msgid "Merging %s with %s"
 msgstr "正在合并 %s 和 %s"
 
-#: builtin/stash.c:562
+#: builtin/stash.c
 msgid "Index was not unstashed."
 msgstr "索引未从贮藏中恢复。"
 
-#: builtin/stash.c:576
+#: builtin/stash.c
 msgid "could not restore untracked files from stash"
 msgstr "无法从贮藏条目中恢复未跟踪文件"
 
-#: builtin/stash.c:608 builtin/stash.c:695
+#: builtin/stash.c
 msgid "attempt to recreate the index"
 msgstr "尝试重建索引"
 
-#: builtin/stash.c:641
+#: builtin/stash.c
 #, c-format
 msgid "Dropped %s (%s)"
 msgstr "丢弃了 %s（%s）"
 
-#: builtin/stash.c:644
+#: builtin/stash.c
 #, c-format
 msgid "%s: Could not drop stash entry"
 msgstr "%s：无法丢弃贮藏条目"
 
-#: builtin/stash.c:657
+#: builtin/stash.c
 #, c-format
 msgid "'%s' is not a stash reference"
 msgstr "'%s' 不是一个贮藏引用"
 
-#: builtin/stash.c:707
+#: builtin/stash.c
 msgid "The stash entry is kept in case you need it again."
 msgstr "贮藏条目被保留以备您再次需要。"
 
-#: builtin/stash.c:730
+#: builtin/stash.c
 msgid "No branch name specified"
 msgstr "未指定分支名"
 
-#: builtin/stash.c:809
+#: builtin/stash.c
 msgid "failed to parse tree"
 msgstr "无法解析树"
 
-#: builtin/stash.c:820
+#: builtin/stash.c
 msgid "failed to unpack trees"
 msgstr "无法解包目录树"
 
-#: builtin/stash.c:840
+#: builtin/stash.c
 msgid "include untracked files in the stash"
 msgstr "在贮藏中包含未跟踪文件"
 
-#: builtin/stash.c:843
+#: builtin/stash.c
 msgid "only show untracked files in the stash"
 msgstr "仅显示贮藏中的未跟踪文件"
 
-#: builtin/stash.c:930 builtin/stash.c:967
+#: builtin/stash.c
 #, c-format
 msgid "Cannot update %s with %s"
 msgstr "无法用 %2$s 更新 %1$s"
 
-#: builtin/stash.c:948 builtin/stash.c:1667 builtin/stash.c:1739
+#: builtin/stash.c
 msgid "stash message"
 msgstr "贮藏说明"
 
-#: builtin/stash.c:958
+#: builtin/stash.c
 msgid "\"git stash store\" requires one <commit> argument"
 msgstr "\"git stash store\" 需要一个 <提交> 参数"
 
-#: builtin/stash.c:1143
+#: builtin/stash.c
 msgid "No staged changes"
 msgstr "没有暂存的修改"
 
-#: builtin/stash.c:1204
+#: builtin/stash.c
 msgid "No changes selected"
 msgstr "没有选择变更"
 
-#: builtin/stash.c:1304
+#: builtin/stash.c
 msgid "You do not have the initial commit yet"
 msgstr "您尚未建立初始提交"
 
-#: builtin/stash.c:1331
+#: builtin/stash.c
 msgid "Cannot save the current index state"
 msgstr "无法保存当前索引状态"
 
-#: builtin/stash.c:1340
+#: builtin/stash.c
 msgid "Cannot save the untracked files"
 msgstr "无法保存未跟踪文件"
 
-#: builtin/stash.c:1351 builtin/stash.c:1370
+#: builtin/stash.c
 msgid "Cannot save the current worktree state"
 msgstr "无法保存当前工作区状态"
 
-#: builtin/stash.c:1361
+#: builtin/stash.c
 msgid "Cannot save the current staged state"
 msgstr "无法保存当前暂存状态"
 
-#: builtin/stash.c:1398
+#: builtin/stash.c
 msgid "Cannot record working tree state"
 msgstr "不能记录工作区状态"
 
-#: builtin/stash.c:1447
+#: builtin/stash.c
 msgid "Can't use --patch and --include-untracked or --all at the same time"
 msgstr "不能同时使用参数 --patch 和 --include-untracked 或 --all"
 
-#: builtin/stash.c:1458
+#: builtin/stash.c
 msgid "Can't use --staged and --include-untracked or --all at the same time"
 msgstr "不能同时使用参数 --staged 和 --include-untracked 或 --all"
 
-#: builtin/stash.c:1476
+#: builtin/stash.c
 msgid "Did you forget to 'git add'?"
 msgstr "您是否忘了执行 'git add'？"
 
-#: builtin/stash.c:1491
+#: builtin/stash.c
 msgid "No local changes to save"
 msgstr "没有要保存的本地修改"
 
-#: builtin/stash.c:1498
+#: builtin/stash.c
 msgid "Cannot initialize stash"
 msgstr "无法初始化贮藏"
 
-#: builtin/stash.c:1513
+#: builtin/stash.c
 msgid "Cannot save the current status"
 msgstr "无法保存当前状态"
 
-#: builtin/stash.c:1518
+#: builtin/stash.c
 #, c-format
 msgid "Saved working directory and index state %s"
 msgstr "保存工作目录和索引状态 %s"
 
-#: builtin/stash.c:1615
+#: builtin/stash.c
 msgid "Cannot remove worktree changes"
 msgstr "无法删除工作区变更"
 
-#: builtin/stash.c:1656 builtin/stash.c:1728
+#: builtin/stash.c
 msgid "keep index"
 msgstr "保持索引"
 
-#: builtin/stash.c:1658 builtin/stash.c:1730
+#: builtin/stash.c
 msgid "stash staged changes only"
 msgstr "只贮藏暂存的变更"
 
-#: builtin/stash.c:1660 builtin/stash.c:1732
+#: builtin/stash.c
 msgid "stash in patch mode"
 msgstr "以补丁模式贮藏"
 
-#: builtin/stash.c:1661 builtin/stash.c:1733
+#: builtin/stash.c
 msgid "quiet mode"
 msgstr "静默模式"
 
-#: builtin/stash.c:1663 builtin/stash.c:1735
+#: builtin/stash.c
 msgid "include untracked files in stash"
 msgstr "贮藏中包含未跟踪文件"
 
-#: builtin/stash.c:1665 builtin/stash.c:1737
+#: builtin/stash.c
 msgid "include ignore files"
 msgstr "包含忽略的文件"
 
-#: builtin/stripspace.c:37
+#: builtin/stripspace.c
 msgid "skip and remove all lines starting with comment character"
 msgstr "跳过和移除所有的注释行"
 
-#: builtin/stripspace.c:40
+#: builtin/stripspace.c
 msgid "prepend comment character and space to each line"
 msgstr "为每一行的行首添加注释符和空格"
 
-#: builtin/submodule--helper.c:50 builtin/submodule--helper.c:2486
+#: builtin/submodule--helper.c
 #, c-format
 msgid "Expecting a full ref name, got %s"
 msgstr "期望一个完整的引用名称，却得到 %s"
 
-#: builtin/submodule--helper.c:103
-#, c-format
-msgid "cannot strip one component off url '%s'"
-msgstr "无法从 url '%s' 剥离一个组件"
-
-#: builtin/submodule--helper.c:213
+#: builtin/submodule--helper.c
 #, c-format
 msgid ""
 "could not look up configuration '%s'. Assuming this repository is its own "
 "authoritative upstream."
 msgstr "无法找到配置 '%s'。假定这个仓库是其自身的官方上游。"
 
-#: builtin/submodule--helper.c:413 builtin/submodule--helper.c:1873
+#: builtin/submodule--helper.c
 msgid "alternative anchor for relative paths"
 msgstr "相对路径的替代锚记（anchor）"
 
-#: builtin/submodule--helper.c:418
+#: builtin/submodule--helper.c
 msgid "git submodule--helper list [--prefix=<path>] [<path>...]"
 msgstr "git submodule--helper list [--prefix=<路径>] [<路径>...]"
 
-#: builtin/submodule--helper.c:476 builtin/submodule--helper.c:617
-#: builtin/submodule--helper.c:640
+#: builtin/submodule--helper.c
 #, c-format
 msgid "No url found for submodule path '%s' in .gitmodules"
 msgstr "在 .gitmodules 中未找到子模组路径 '%s' 的 url"
 
-#: builtin/submodule--helper.c:528
+#: builtin/submodule--helper.c
 #, c-format
 msgid "Entering '%s'\n"
 msgstr "进入 '%s'\n"
 
-#: builtin/submodule--helper.c:531
+#: builtin/submodule--helper.c
 #, c-format
 msgid ""
 "run_command returned non-zero status for %s\n"
@@ -22832,7 +14745,7 @@ msgstr ""
 "对 %s 执行 run_command 返回非零值。\n"
 "."
 
-#: builtin/submodule--helper.c:553
+#: builtin/submodule--helper.c
 #, c-format
 msgid ""
 "run_command returned non-zero status while recursing in the nested "
@@ -22842,158 +14755,157 @@ msgstr ""
 "在递归 %s 的子模组执行 run_command 时返回非零值。\n"
 "."
 
-#: builtin/submodule--helper.c:569
+#: builtin/submodule--helper.c
 msgid "suppress output of entering each submodule command"
 msgstr "抑制进入每一个子模组命令的输出"
 
-#: builtin/submodule--helper.c:571 builtin/submodule--helper.c:876
-#: builtin/submodule--helper.c:1458
+#: builtin/submodule--helper.c
 msgid "recurse into nested submodules"
 msgstr "递归进入嵌套子模组中"
 
-#: builtin/submodule--helper.c:576
+#: builtin/submodule--helper.c
 msgid "git submodule--helper foreach [--quiet] [--recursive] [--] <command>"
 msgstr "git submodule--helper foreach [--quiet] [--recursive] [--] <命令>"
 
-#: builtin/submodule--helper.c:654
+#: builtin/submodule--helper.c
 #, c-format
 msgid "Failed to register url for submodule path '%s'"
 msgstr "无法为子模组路径 '%s' 注册 url"
 
-#: builtin/submodule--helper.c:658
+#: builtin/submodule--helper.c
 #, c-format
 msgid "Submodule '%s' (%s) registered for path '%s'\n"
 msgstr "子模组 '%s'（%s）已对路径 '%s' 注册\n"
 
-#: builtin/submodule--helper.c:668
+#: builtin/submodule--helper.c
 #, c-format
 msgid "warning: command update mode suggested for submodule '%s'\n"
 msgstr "警告：建议子模组 '%s' 使用命令更新模式\n"
 
-#: builtin/submodule--helper.c:675
+#: builtin/submodule--helper.c
 #, c-format
 msgid "Failed to register update mode for submodule path '%s'"
 msgstr "无法为子模组路径 '%s' 注册更新模式"
 
-#: builtin/submodule--helper.c:697
+#: builtin/submodule--helper.c
 msgid "suppress output for initializing a submodule"
 msgstr "抑制子模组初始化的输出"
 
-#: builtin/submodule--helper.c:702
+#: builtin/submodule--helper.c
 msgid "git submodule--helper init [<options>] [<path>]"
 msgstr "git submodule--helper init [<选项>] [<路径>]"
 
-#: builtin/submodule--helper.c:775 builtin/submodule--helper.c:910
+#: builtin/submodule--helper.c
 #, c-format
 msgid "no submodule mapping found in .gitmodules for path '%s'"
 msgstr "在 .gitmodules 中没有发现路径 '%s' 的子模组映射"
 
-#: builtin/submodule--helper.c:823
+#: builtin/submodule--helper.c
 #, c-format
 msgid "could not resolve HEAD ref inside the submodule '%s'"
 msgstr "无法解析子模组 '%s' 的 HEAD 引用"
 
-#: builtin/submodule--helper.c:850 builtin/submodule--helper.c:1428
+#: builtin/submodule--helper.c
 #, c-format
 msgid "failed to recurse into submodule '%s'"
 msgstr "无法递归进入子模组 '%s'"
 
-#: builtin/submodule--helper.c:874 builtin/submodule--helper.c:1595
+#: builtin/submodule--helper.c
 msgid "suppress submodule status output"
 msgstr "抑制子模组状态输出"
 
-#: builtin/submodule--helper.c:875
+#: builtin/submodule--helper.c
 msgid ""
 "use commit stored in the index instead of the one stored in the submodule "
 "HEAD"
 msgstr "使用存储在索引中的提交，而非存储在子模组 HEAD 中的提交"
 
-#: builtin/submodule--helper.c:881
+#: builtin/submodule--helper.c
 msgid "git submodule status [--quiet] [--cached] [--recursive] [<path>...]"
 msgstr "git submodule status [--quiet] [--cached] [--recursive] [<路径>...]"
 
-#: builtin/submodule--helper.c:905
+#: builtin/submodule--helper.c
 msgid "git submodule--helper name <path>"
 msgstr "git submodule--helper name <路径>"
 
-#: builtin/submodule--helper.c:977
+#: builtin/submodule--helper.c
 #, c-format
 msgid "* %s %s(blob)->%s(submodule)"
 msgstr "* %s %s（数据对象）->%s（子模组）"
 
-#: builtin/submodule--helper.c:980
+#: builtin/submodule--helper.c
 #, c-format
 msgid "* %s %s(submodule)->%s(blob)"
 msgstr "* %s %s（子模组）->%s（数据对象）"
 
-#: builtin/submodule--helper.c:993
+#: builtin/submodule--helper.c
 #, c-format
 msgid "%s"
 msgstr "%s"
 
-#: builtin/submodule--helper.c:1043
+#: builtin/submodule--helper.c
 #, c-format
 msgid "couldn't hash object from '%s'"
 msgstr "不能从 '%s' 创建哈希对象"
 
-#: builtin/submodule--helper.c:1047
+#: builtin/submodule--helper.c
 #, c-format
 msgid "unexpected mode %o\n"
 msgstr "意外的模式 %o\n"
 
-#: builtin/submodule--helper.c:1288
+#: builtin/submodule--helper.c
 msgid "use the commit stored in the index instead of the submodule HEAD"
 msgstr "使用存储在索引中的提交，而非存储在子模组 HEAD 中的提交"
 
-#: builtin/submodule--helper.c:1290
+#: builtin/submodule--helper.c
 msgid "compare the commit in the index with that in the submodule HEAD"
 msgstr "比较存储在索引和子模组 HEAD 中的提交"
 
-#: builtin/submodule--helper.c:1292
+#: builtin/submodule--helper.c
 msgid "skip submodules with 'ignore_config' value set to 'all'"
 msgstr "跳过设置了 'ignore_config' 为 'all' 的子模组"
 
-#: builtin/submodule--helper.c:1294
+#: builtin/submodule--helper.c
 msgid "limit the summary size"
 msgstr "限制总结的大小"
 
-#: builtin/submodule--helper.c:1299
+#: builtin/submodule--helper.c
 msgid "git submodule--helper summary [<options>] [<commit>] [--] [<path>]"
 msgstr "git submodule--helper summary [<选项>] [<提交>] [--] [<路径>]"
 
-#: builtin/submodule--helper.c:1323
+#: builtin/submodule--helper.c
 msgid "could not fetch a revision for HEAD"
 msgstr "不能为 HEAD 获取一个版本"
 
-#: builtin/submodule--helper.c:1384
+#: builtin/submodule--helper.c
 #, c-format
 msgid "Synchronizing submodule url for '%s'\n"
 msgstr "为 '%s' 同步子模组 url\n"
 
-#: builtin/submodule--helper.c:1390
+#: builtin/submodule--helper.c
 #, c-format
 msgid "failed to register url for submodule path '%s'"
 msgstr "无法为子模组路径 '%s' 注册 url"
 
-#: builtin/submodule--helper.c:1399
+#: builtin/submodule--helper.c
 #, c-format
 msgid "failed to get the default remote for submodule '%s'"
 msgstr "无法得到子模组 '%s' 的默认远程关联"
 
-#: builtin/submodule--helper.c:1409
+#: builtin/submodule--helper.c
 #, c-format
 msgid "failed to update remote for submodule '%s'"
 msgstr "无法为子模组 '%s' 更新远程关联"
 
-#: builtin/submodule--helper.c:1456
+#: builtin/submodule--helper.c
 msgid "suppress output of synchronizing submodule url"
 msgstr "抑制子模组 URL 同步的输出"
 
-#: builtin/submodule--helper.c:1463
+#: builtin/submodule--helper.c
 msgid "git submodule--helper sync [--quiet] [--recursive] [<path>]"
 msgstr "git submodule--helper sync [--quiet] [--recursive] [<路径>]"
 
-#: builtin/submodule--helper.c:1513
+#: builtin/submodule--helper.c
 #, c-format
 msgid ""
 "Submodule work tree '%s' contains a .git directory. This will be replaced "
@@ -23002,52 +14914,52 @@ msgstr ""
 "子模组工作区 '%s' 包含一个 .git 目录。这将会用 absorbgitdirs 子命令替换成一"
 "个 .git 文件。"
 
-#: builtin/submodule--helper.c:1530
+#: builtin/submodule--helper.c
 #, c-format
 msgid ""
 "Submodule work tree '%s' contains local modifications; use '-f' to discard "
 "them"
 msgstr "子模组工作区 '%s' 包含本地修改；使用 '-f' 丢弃它们"
 
-#: builtin/submodule--helper.c:1538
+#: builtin/submodule--helper.c
 #, c-format
 msgid "Cleared directory '%s'\n"
 msgstr "已清除目录 '%s'\n"
 
-#: builtin/submodule--helper.c:1540
+#: builtin/submodule--helper.c
 #, c-format
 msgid "Could not remove submodule work tree '%s'\n"
 msgstr "无法移除子模组工作区 '%s'\n"
 
-#: builtin/submodule--helper.c:1551
+#: builtin/submodule--helper.c
 #, c-format
 msgid "could not create empty submodule directory %s"
 msgstr "不能创建空的子模组目录 %s"
 
-#: builtin/submodule--helper.c:1567
+#: builtin/submodule--helper.c
 #, c-format
 msgid "Submodule '%s' (%s) unregistered for path '%s'\n"
 msgstr "子模组 '%s'（%s）未对路径 '%s' 注册\n"
 
-#: builtin/submodule--helper.c:1596
+#: builtin/submodule--helper.c
 msgid "remove submodule working trees even if they contain local changes"
 msgstr "删除子模组工作区，即使包含本地修改"
 
-#: builtin/submodule--helper.c:1597
+#: builtin/submodule--helper.c
 msgid "unregister all submodules"
 msgstr "将所有子模组取消注册"
 
-#: builtin/submodule--helper.c:1602
+#: builtin/submodule--helper.c
 msgid ""
 "git submodule deinit [--quiet] [-f | --force] [--all | [--] [<path>...]]"
 msgstr ""
 "git submodule deinit [--quiet] [-f | --force] [--all | [--] [<路径>...]]"
 
-#: builtin/submodule--helper.c:1616
+#: builtin/submodule--helper.c
 msgid "Use '--all' if you really want to deinitialize all submodules"
 msgstr "如果您确实想要对所有子模组执行取消初始化，请使用 '--all'"
 
-#: builtin/submodule--helper.c:1665
+#: builtin/submodule--helper.c
 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"
@@ -23059,67 +14971,66 @@ msgstr ""
 "Git 不使用备用仓库克隆，或者等效地使用 '--reference-if-able' 而非\n"
 "'--reference' 来克隆。"
 
-#: builtin/submodule--helper.c:1710 builtin/submodule--helper.c:1713
+#: builtin/submodule--helper.c
 #, c-format
 msgid "submodule '%s' cannot add alternate: %s"
 msgstr "子模组 '%s' 不能添加仓库备选：%s"
 
-#: builtin/submodule--helper.c:1749
+#: builtin/submodule--helper.c
 #, c-format
 msgid "Value '%s' for submodule.alternateErrorStrategy is not recognized"
 msgstr "不能识别 submodule.alternateErrorStrategy 的取值 '%s'"
 
-#: builtin/submodule--helper.c:1756
+#: builtin/submodule--helper.c
 #, c-format
 msgid "Value '%s' for submodule.alternateLocation is not recognized"
 msgstr "不能识别 submodule.alternateLocation 的取值 '%s'"
 
-#: builtin/submodule--helper.c:1781
+#: builtin/submodule--helper.c
 #, c-format
 msgid "refusing to create/use '%s' in another submodule's git dir"
 msgstr "拒绝在另一个子模组的 git 目录中创建/使用 '%s'"
 
-#: builtin/submodule--helper.c:1826
+#: builtin/submodule--helper.c
 #, c-format
 msgid "clone of '%s' into submodule path '%s' failed"
 msgstr "无法克隆 '%s' 到子模组路径 '%s'"
 
-#: builtin/submodule--helper.c:1831
+#: builtin/submodule--helper.c
 #, c-format
 msgid "directory not empty: '%s'"
 msgstr "目录非空：'%s'"
 
-#: builtin/submodule--helper.c:1843
+#: builtin/submodule--helper.c
 #, c-format
 msgid "could not get submodule directory for '%s'"
 msgstr "无法得到 '%s' 的子模组目录"
 
-#: builtin/submodule--helper.c:1876
+#: builtin/submodule--helper.c
 msgid "where the new submodule will be cloned to"
 msgstr "新的子模组将要克隆的路径"
 
-#: builtin/submodule--helper.c:1879
+#: builtin/submodule--helper.c
 msgid "name of the new submodule"
 msgstr "新子模组的名称"
 
-#: builtin/submodule--helper.c:1882
+#: builtin/submodule--helper.c
 msgid "url where to clone the submodule from"
 msgstr "克隆子模组的 url 地址"
 
-#: builtin/submodule--helper.c:1890 builtin/submodule--helper.c:3383
+#: builtin/submodule--helper.c
 msgid "depth for shallow clones"
 msgstr "浅克隆的深度"
 
-#: builtin/submodule--helper.c:1893 builtin/submodule--helper.c:2731
-#: builtin/submodule--helper.c:3376
+#: builtin/submodule--helper.c
 msgid "force cloning progress"
 msgstr "强制显示克隆进度"
 
-#: builtin/submodule--helper.c:1895 builtin/submodule--helper.c:2733
+#: builtin/submodule--helper.c
 msgid "disallow cloning into non-empty directory"
 msgstr "不允许克隆到一个非空目录"
 
-#: builtin/submodule--helper.c:1903
+#: builtin/submodule--helper.c
 msgid ""
 "git submodule--helper clone [--prefix=<path>] [--quiet] [--reference "
 "<repository>] [--name <name>] [--depth <depth>] [--single-branch] [--filter "
@@ -23129,178 +15040,178 @@ msgstr ""
 "[--name <名字>] [--depth <深度>] [--single-branch] [--filter <过滤器规格>] --"
 "url <url> --path <路径>"
 
-#: builtin/submodule--helper.c:1943
+#: builtin/submodule--helper.c
 #, c-format
 msgid "Invalid update mode '%s' for submodule path '%s'"
 msgstr "子模组路径 '%2$s' 的更新模式 '%1$s' 无效"
 
-#: builtin/submodule--helper.c:1947
+#: builtin/submodule--helper.c
 #, c-format
 msgid "Invalid update mode '%s' configured for submodule path '%s'"
 msgstr "为子模组路径 '%2$s' 配置的更新模式 '%1$s' 无效"
 
-#: builtin/submodule--helper.c:2041
+#: builtin/submodule--helper.c
 #, c-format
 msgid "Submodule path '%s' not initialized"
 msgstr "子模组路径 '%s' 尚未初始化"
 
-#: builtin/submodule--helper.c:2045
+#: builtin/submodule--helper.c
 msgid "Maybe you want to use 'update --init'?"
 msgstr "也许您想要执行 'update --init'？"
 
-#: builtin/submodule--helper.c:2075
+#: builtin/submodule--helper.c
 #, c-format
 msgid "Skipping unmerged submodule %s"
 msgstr "略过未合并的子模组 %s"
 
-#: builtin/submodule--helper.c:2104
+#: builtin/submodule--helper.c
 #, c-format
 msgid "Skipping submodule '%s'"
 msgstr "略过子模组 '%s'"
 
-#: builtin/submodule--helper.c:2257
+#: builtin/submodule--helper.c
 #, c-format
 msgid "Failed to clone '%s'. Retry scheduled"
 msgstr "克隆 '%s' 失败。按计划重试"
 
-#: builtin/submodule--helper.c:2268
+#: builtin/submodule--helper.c
 #, c-format
 msgid "Failed to clone '%s' a second time, aborting"
 msgstr "第二次尝试克隆 '%s' 失败，退出"
 
-#: builtin/submodule--helper.c:2371
+#: builtin/submodule--helper.c
 #, c-format
 msgid "Unable to checkout '%s' in submodule path '%s'"
 msgstr "无法在子模组路径 '%2$s' 中检出 '%1$s'"
 
-#: builtin/submodule--helper.c:2375
+#: builtin/submodule--helper.c
 #, c-format
 msgid "Unable to rebase '%s' in submodule path '%s'"
 msgstr "无法在子模组路径 '%2$s' 中变基 '%1$s'"
 
-#: builtin/submodule--helper.c:2379
+#: builtin/submodule--helper.c
 #, c-format
 msgid "Unable to merge '%s' in submodule path '%s'"
 msgstr "无法在子模组路径 '%2$s' 中合并 '%1$s'"
 
-#: builtin/submodule--helper.c:2383
+#: builtin/submodule--helper.c
 #, c-format
 msgid "Execution of '%s %s' failed in submodule path '%s'"
 msgstr "在子模组路径 '%3$s' 中执行 '%1$s %2$s' 失败"
 
-#: builtin/submodule--helper.c:2402
+#: builtin/submodule--helper.c
 #, c-format
 msgid "Submodule path '%s': checked out '%s'\n"
 msgstr "子模组路径 '%s'：检出 '%s'\n"
 
-#: builtin/submodule--helper.c:2406
+#: builtin/submodule--helper.c
 #, c-format
 msgid "Submodule path '%s': rebased into '%s'\n"
 msgstr "子模组路径 '%s'：变基至 '%s'\n"
 
-#: builtin/submodule--helper.c:2410
+#: builtin/submodule--helper.c
 #, c-format
 msgid "Submodule path '%s': merged in '%s'\n"
 msgstr "子模组路径 '%s'：合并入 '%s'\n"
 
-#: builtin/submodule--helper.c:2414
+#: builtin/submodule--helper.c
 #, c-format
 msgid "Submodule path '%s': '%s %s'\n"
 msgstr "子模组路径 '%s'：'%s %s'\n"
 
-#: builtin/submodule--helper.c:2438
+#: builtin/submodule--helper.c
 #, c-format
 msgid "Unable to fetch in submodule path '%s'; trying to directly fetch %s:"
 msgstr "无法在子模组路径 '%s' 中获取；尝试直接获取 %s："
 
-#: builtin/submodule--helper.c:2447
+#: builtin/submodule--helper.c
 #, 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:2481
+#: builtin/submodule--helper.c
 #, 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:2499
+#: builtin/submodule--helper.c
 #, c-format
 msgid "could not get a repository handle for submodule '%s'"
 msgstr "无法获得子模组 '%s' 的仓库句柄"
 
-#: builtin/submodule--helper.c:2588
+#: builtin/submodule--helper.c
 #, c-format
 msgid "Unable to find current revision in submodule path '%s'"
 msgstr "无法在子模组路径 '%s' 中找到当前版本"
 
-#: builtin/submodule--helper.c:2599
+#: builtin/submodule--helper.c
 #, c-format
 msgid "Unable to fetch in submodule path '%s'"
 msgstr "无法在子模组路径 '%s' 中获取"
 
-#: builtin/submodule--helper.c:2604
+#: builtin/submodule--helper.c
 #, c-format
 msgid "Unable to find %s revision in submodule path '%s'"
 msgstr "无法在子模组路径 '%2$s' 中找到当前版本 %1$s"
 
-#: builtin/submodule--helper.c:2640
+#: builtin/submodule--helper.c
 #, c-format
 msgid "Failed to recurse into submodule path '%s'"
 msgstr "无法递归进入子模组路径 '%s'"
 
-#: builtin/submodule--helper.c:2699
+#: builtin/submodule--helper.c
 msgid "force checkout updates"
 msgstr "强制检出更新"
 
-#: builtin/submodule--helper.c:2701
+#: builtin/submodule--helper.c
 msgid "initialize uninitialized submodules before update"
 msgstr "在更新前初始化尚未初始化的子模组"
 
-#: builtin/submodule--helper.c:2703
+#: builtin/submodule--helper.c
 msgid "use SHA-1 of submodule's remote tracking branch"
 msgstr "使用子模组远程追踪分支的 SHA-1"
 
-#: builtin/submodule--helper.c:2705
+#: builtin/submodule--helper.c
 msgid "traverse submodules recursively"
 msgstr "递归遍历子模组"
 
-#: builtin/submodule--helper.c:2707
+#: builtin/submodule--helper.c
 msgid "don't fetch new objects from the remote site"
 msgstr "不要从远程地址获取新对象"
 
-#: builtin/submodule--helper.c:2710 builtin/submodule--helper.c:2892
+#: builtin/submodule--helper.c
 msgid "path into the working tree"
 msgstr "到工作区的路径"
 
-#: builtin/submodule--helper.c:2713
+#: builtin/submodule--helper.c
 msgid "path into the working tree, across nested submodule boundaries"
 msgstr "工作区中的路径，递归嵌套子模组"
 
-#: builtin/submodule--helper.c:2717
+#: builtin/submodule--helper.c
 msgid "rebase, merge, checkout or none"
 msgstr "rebase、merge、checkout 或 none"
 
-#: builtin/submodule--helper.c:2723
+#: builtin/submodule--helper.c
 msgid "create a shallow clone truncated to the specified number of revisions"
 msgstr "创建一个指定深度的浅克隆"
 
-#: builtin/submodule--helper.c:2726
+#: builtin/submodule--helper.c
 msgid "parallel jobs"
 msgstr "并发任务"
 
-#: builtin/submodule--helper.c:2728
+#: builtin/submodule--helper.c
 msgid "whether the initial clone should follow the shallow recommendation"
 msgstr "初始克隆是否应该遵守推荐的浅克隆选项"
 
-#: builtin/submodule--helper.c:2729
+#: builtin/submodule--helper.c
 msgid "don't print cloning progress"
 msgstr "不要输出克隆进度"
 
-#: builtin/submodule--helper.c:2741
+#: builtin/submodule--helper.c
 msgid ""
 "git submodule [--quiet] update [--init [--filter=<filter-spec>]] [--remote] "
 "[-N|--no-fetch] [-f|--force] [--checkout|--merge|--rebase] [--[no-]recommend-"
@@ -23312,82 +15223,81 @@ msgstr ""
 "shallow] [--reference <仓库>] [--recursive] [--[no-]single-branch] [--] [<路"
 "径>...]"
 
-#: builtin/submodule--helper.c:2767
+#: builtin/submodule--helper.c
 msgid "bad value for update parameter"
 msgstr "update 参数取值错误"
 
-#: builtin/submodule--helper.c:2893
+#: builtin/submodule--helper.c
 msgid "recurse into submodules"
 msgstr "在子模组中递归"
 
-#: builtin/submodule--helper.c:2899
+#: builtin/submodule--helper.c
 msgid "git submodule--helper absorb-git-dirs [<options>] [<path>...]"
 msgstr "git submodule--helper absorb-git-dirs [<选项>] [<路径>...]"
 
-#: builtin/submodule--helper.c:2955
+#: builtin/submodule--helper.c
 msgid "check if it is safe to write to the .gitmodules file"
 msgstr "检查写入 .gitmodules 文件是否安全"
 
-#: builtin/submodule--helper.c:2958
+#: builtin/submodule--helper.c
 msgid "unset the config in the .gitmodules file"
 msgstr "取消 .gitmodules 文件中的设置"
 
-#: builtin/submodule--helper.c:2963
+#: builtin/submodule--helper.c
 msgid "git submodule--helper config <name> [<value>]"
 msgstr "git submodule--helper config <名称> [<值>]"
 
-#: builtin/submodule--helper.c:2964
+#: builtin/submodule--helper.c
 msgid "git submodule--helper config --unset <name>"
 msgstr "git submodule--helper config --unset <名称>"
 
-#: builtin/submodule--helper.c:2984 builtin/submodule--helper.c:3238
-#: builtin/submodule--helper.c:3395
+#: builtin/submodule--helper.c
 msgid "please make sure that the .gitmodules file is in the working tree"
 msgstr "请确认 .gitmodules 文件在工作区里"
 
-#: builtin/submodule--helper.c:3000
+#: builtin/submodule--helper.c
 msgid "suppress output for setting url of a submodule"
 msgstr "抑制设置子模组 URL 的输出"
 
-#: builtin/submodule--helper.c:3004
+#: builtin/submodule--helper.c
 msgid "git submodule--helper set-url [--quiet] <path> <newurl>"
 msgstr "git submodule--helper set-url [--quiet] <路径> <新地址>"
 
-#: builtin/submodule--helper.c:3037
+#: builtin/submodule--helper.c
 msgid "set the default tracking branch to master"
 msgstr "设置默认跟踪分支为 master"
 
-#: builtin/submodule--helper.c:3039
+#: builtin/submodule--helper.c
 msgid "set the default tracking branch"
 msgstr "设置默认跟踪分支"
 
-#: builtin/submodule--helper.c:3043
+#: builtin/submodule--helper.c
 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:3044
+#: builtin/submodule--helper.c
 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:3051
+#: builtin/submodule--helper.c
 msgid "--branch or --default required"
 msgstr "需要 --branch 或 --default"
 
-#: builtin/submodule--helper.c:3072 builtin/submodule--helper.c:3375
+#: builtin/submodule--helper.c
 msgid "print only error messages"
 msgstr "只打印错误消息"
 
-#: builtin/submodule--helper.c:3073
+#: builtin/submodule--helper.c
 msgid "force creation"
 msgstr "强制创建"
 
-#: builtin/submodule--helper.c:3081
+#: builtin/submodule--helper.c
 msgid "show whether the branch would be created"
 msgstr "显示是否将要创建分支"
 
-#: builtin/submodule--helper.c:3085
+#: builtin/submodule--helper.c
 msgid ""
 "git submodule--helper create-branch [-f|--force] [--create-reflog] [-q|--"
 "quiet] [-t|--track] [-n|--dry-run] <name> <start-oid> <start-name>"
@@ -23395,27 +15305,27 @@ msgstr ""
 "git submodule--helper create-branch [-f|--force] [--create-reflog] [-q|--"
 "quiet] [-t|--track] [-n|--dry-run] <名称> <起始对象 ID> <起始名称>"
 
-#: builtin/submodule--helper.c:3097
+#: builtin/submodule--helper.c
 #, c-format
 msgid "creating branch '%s'"
 msgstr "正在创建分支 '%s'"
 
-#: builtin/submodule--helper.c:3155
+#: builtin/submodule--helper.c
 #, c-format
 msgid "Adding existing repo at '%s' to the index\n"
 msgstr "向索引中添加位于 '%s' 的已存在的仓库\n"
 
-#: builtin/submodule--helper.c:3158
+#: builtin/submodule--helper.c
 #, c-format
 msgid "'%s' already exists and is not a valid git repo"
 msgstr "'%s' 已存在并且不是一个有效的 git 仓库"
 
-#: builtin/submodule--helper.c:3171
+#: builtin/submodule--helper.c
 #, c-format
 msgid "A git directory for '%s' is found locally with remote(s):\n"
 msgstr "发现一个本地 git 目录 '%s' 及其远程仓库：\n"
 
-#: builtin/submodule--helper.c:3178
+#: builtin/submodule--helper.c
 #, c-format
 msgid ""
 "If you want to reuse this local git directory instead of cloning again from\n"
@@ -23430,112 +15340,116 @@ msgstr ""
 "使用 '--force' 选项。如果本地 git 目录不是正确的仓库，或者如果您不确定这里\n"
 "的含义，使用 '--name' 选项指定另外的名称。"
 
-#: builtin/submodule--helper.c:3190
+#: builtin/submodule--helper.c
 #, c-format
 msgid "Reactivating local git directory for submodule '%s'\n"
 msgstr "为子模组 '%s' 重新激活本地 git 目录\n"
 
-#: builtin/submodule--helper.c:3227
+#: builtin/submodule--helper.c
 #, c-format
 msgid "unable to checkout submodule '%s'"
 msgstr "无法检出子模组 '%s'"
 
-#: builtin/submodule--helper.c:3266
+#: builtin/submodule--helper.c
 #, c-format
 msgid "Failed to add submodule '%s'"
 msgstr "无法添加子模组 '%s'"
 
-#: builtin/submodule--helper.c:3270 builtin/submodule--helper.c:3275
-#: builtin/submodule--helper.c:3283
+#: builtin/submodule--helper.c
 #, c-format
 msgid "Failed to register submodule '%s'"
 msgstr "无法注册子模组 '%s'"
 
-#: builtin/submodule--helper.c:3339
+#: builtin/submodule--helper.c
 #, c-format
 msgid "'%s' already exists in the index"
 msgstr "'%s' 已经存在于索引中"
 
-#: builtin/submodule--helper.c:3342
+#: builtin/submodule--helper.c
 #, c-format
 msgid "'%s' already exists in the index and is not a submodule"
 msgstr "'%s' 已经存在于索引中且不是一个子模组"
 
-#: builtin/submodule--helper.c:3372
+#: builtin/submodule--helper.c read-cache.c
+#, c-format
+msgid "'%s' does not have a commit checked out"
+msgstr "'%s' 没有检出一个提交"
+
+#: builtin/submodule--helper.c
 msgid "branch of repository to add as submodule"
 msgstr "要添加为子模组的仓库的分支"
 
-#: builtin/submodule--helper.c:3373
+#: builtin/submodule--helper.c
 msgid "allow adding an otherwise ignored submodule path"
 msgstr "允许添加一个被忽略的子模组路径"
 
-#: builtin/submodule--helper.c:3379
+#: builtin/submodule--helper.c
 msgid "borrow the objects from reference repositories"
 msgstr "从引用仓库中借用对象"
 
-#: builtin/submodule--helper.c:3381
+#: builtin/submodule--helper.c
 msgid ""
-"sets the submodule’s name to the given string instead of defaulting to its "
+"sets the submodule's name to the given string instead of defaulting to its "
 "path"
 msgstr "将子模组的名称设置为给定的字符串，而非默认为其路径"
 
-#: builtin/submodule--helper.c:3388
+#: builtin/submodule--helper.c
 msgid "git submodule--helper add [<options>] [--] <repository> [<path>]"
 msgstr "git submodule--helper add [<选项>] [--] <仓库> [<路径>]"
 
-#: builtin/submodule--helper.c:3416
+#: builtin/submodule--helper.c
 msgid "Relative path can only be used from the toplevel of the working tree"
 msgstr "只能在工作区的顶级目录中使用相对路径"
 
-#: builtin/submodule--helper.c:3425
+#: builtin/submodule--helper.c
 #, c-format
 msgid "repo URL: '%s' must be absolute or begin with ./|../"
 msgstr "仓库 URL：'%s' 必须是绝对路径或以 ./|../ 起始"
 
-#: builtin/submodule--helper.c:3460
+#: builtin/submodule--helper.c
 #, c-format
 msgid "'%s' is not a valid submodule name"
 msgstr "'%s' 不是一个有效的子模组名称"
 
-#: builtin/submodule--helper.c:3520 git.c:453 git.c:729
+#: builtin/submodule--helper.c git.c
 #, c-format
 msgid "%s doesn't support --super-prefix"
 msgstr "%s 不支持 --super-prefix"
 
-#: builtin/submodule--helper.c:3526
+#: builtin/submodule--helper.c
 #, c-format
 msgid "'%s' is not a valid submodule--helper subcommand"
 msgstr "'%s' 不是一个有效的 submodule--helper 子命令"
 
-#: builtin/symbolic-ref.c:8
+#: builtin/symbolic-ref.c
 msgid "git symbolic-ref [<options>] <name> [<ref>]"
 msgstr "git symbolic-ref [<选项>] <名称> [<引用>]"
 
-#: builtin/symbolic-ref.c:9
+#: builtin/symbolic-ref.c
 msgid "git symbolic-ref -d [-q] <name>"
 msgstr "git symbolic-ref -d [-q] <名称>"
 
-#: builtin/symbolic-ref.c:42
+#: builtin/symbolic-ref.c
 msgid "suppress error message for non-symbolic (detached) refs"
 msgstr "不显示非符号（分离的）引用的错误信息"
 
-#: builtin/symbolic-ref.c:43
+#: builtin/symbolic-ref.c
 msgid "delete symbolic ref"
 msgstr "删除符号引用"
 
-#: builtin/symbolic-ref.c:44
+#: builtin/symbolic-ref.c
 msgid "shorten ref output"
 msgstr "缩短引用输出"
 
-#: builtin/symbolic-ref.c:45 builtin/update-ref.c:505
+#: builtin/symbolic-ref.c builtin/update-ref.c
 msgid "reason"
 msgstr "原因"
 
-#: builtin/symbolic-ref.c:45 builtin/update-ref.c:505
+#: builtin/symbolic-ref.c builtin/update-ref.c
 msgid "reason of the update"
 msgstr "更新的原因"
 
-#: builtin/tag.c:26
+#: builtin/tag.c
 msgid ""
 "git tag [-a | -s | -u <key-id>] [-f] [-m <msg> | -F <file>]\n"
 "        <tagname> [<head>]"
@@ -23543,11 +15457,11 @@ msgstr ""
 "git tag [-a | -s | -u <key-id>] [-f] [-m <消息> | -F <文件>]\n"
 "        <标签名> [<头>]"
 
-#: builtin/tag.c:28
+#: builtin/tag.c
 msgid "git tag -d <tagname>..."
 msgstr "git tag -d <标签名>..."
 
-#: builtin/tag.c:29
+#: builtin/tag.c
 msgid ""
 "git tag -l [-n[<num>]] [--contains <commit>] [--no-contains <commit>] [--"
 "points-at <object>]\n"
@@ -23558,21 +15472,21 @@ msgstr ""
 "at <对象>]\n"
 "        [--format=<格式>] [--merged <提交>] [--no-merged <提交>] [<模式>...]"
 
-#: builtin/tag.c:31
+#: builtin/tag.c
 msgid "git tag -v [--format=<format>] <tagname>..."
 msgstr "git tag -v [--format=<格式>] <标签名>..."
 
-#: builtin/tag.c:101
+#: builtin/tag.c
 #, c-format
 msgid "tag '%s' not found."
 msgstr "未发现标签 '%s'。"
 
-#: builtin/tag.c:136
+#: builtin/tag.c
 #, c-format
 msgid "Deleted tag '%s' (was %s)\n"
 msgstr "已删除标签 '%s'（曾为 %s）\n"
 
-#: builtin/tag.c:171
+#: builtin/tag.c
 #, c-format
 msgid ""
 "\n"
@@ -23585,7 +15499,7 @@ msgstr ""
 "  %s\n"
 "以 '%c' 开头的行将被忽略。\n"
 
-#: builtin/tag.c:175
+#: builtin/tag.c
 #, c-format
 msgid ""
 "\n"
@@ -23599,11 +15513,11 @@ msgstr ""
 "  %s\n"
 "以 '%c' 开头的行将被保留，如果您愿意也可以删除它们。\n"
 
-#: builtin/tag.c:241
+#: builtin/tag.c
 msgid "unable to sign the tag"
 msgstr "无法签署标签"
 
-#: builtin/tag.c:259
+#: builtin/tag.c
 #, c-format
 msgid ""
 "You have created a nested tag. The object referred to by your new tag is\n"
@@ -23616,326 +15530,331 @@ msgstr ""
 "\n"
 "\tgit tag -f %s %s^{}"
 
-#: builtin/tag.c:275
+#: builtin/tag.c
 msgid "bad object type."
 msgstr "坏的对象类型。"
 
-#: builtin/tag.c:326
+#: builtin/tag.c
 msgid "no tag message?"
 msgstr "无标签说明？"
 
-#: builtin/tag.c:333
+#: builtin/tag.c
 #, c-format
 msgid "The tag message has been left in %s\n"
 msgstr "标签说明被保留在 %s\n"
 
-#: builtin/tag.c:445
+#: builtin/tag.c
 msgid "list tag names"
 msgstr "列出标签名称"
 
-#: builtin/tag.c:447
+#: builtin/tag.c
 msgid "print <n> lines of each tag message"
 msgstr "每个标签信息打印 <n> 行"
 
-#: builtin/tag.c:449
+#: builtin/tag.c
 msgid "delete tags"
 msgstr "删除标签"
 
-#: builtin/tag.c:450
+#: builtin/tag.c
 msgid "verify tags"
 msgstr "验证标签"
 
-#: builtin/tag.c:452
+#: builtin/tag.c
 msgid "Tag creation options"
 msgstr "标签创建选项"
 
-#: builtin/tag.c:454
+#: builtin/tag.c
 msgid "annotated tag, needs a message"
 msgstr "附注标签，需要一个说明"
 
-#: builtin/tag.c:456
+#: builtin/tag.c
 msgid "tag message"
 msgstr "标签说明"
 
-#: builtin/tag.c:458
+#: builtin/tag.c
 msgid "force edit of tag message"
 msgstr "强制编辑标签说明"
 
-#: builtin/tag.c:459
+#: builtin/tag.c
 msgid "annotated and GPG-signed tag"
 msgstr "附注并附加 GPG 签名的标签"
 
-#: builtin/tag.c:462
+#: builtin/tag.c
 msgid "use another key to sign the tag"
 msgstr "使用另外的私钥签名该标签"
 
-#: builtin/tag.c:463
+#: builtin/tag.c
 msgid "replace the tag if exists"
 msgstr "如果存在，替换现有的标签"
 
-#: builtin/tag.c:464 builtin/update-ref.c:511
+#: builtin/tag.c builtin/update-ref.c
 msgid "create a reflog"
 msgstr "创建引用日志"
 
-#: builtin/tag.c:466
+#: builtin/tag.c
 msgid "Tag listing options"
 msgstr "标签列表选项"
 
-#: builtin/tag.c:467
+#: builtin/tag.c
 msgid "show tag list in columns"
 msgstr "以列的方式显示标签列表"
 
-#: builtin/tag.c:468 builtin/tag.c:470
+#: builtin/tag.c
 msgid "print only tags that contain the commit"
 msgstr "只打印包含该提交的标签"
 
-#: builtin/tag.c:469 builtin/tag.c:471
+#: builtin/tag.c
 msgid "print only tags that don't contain the commit"
 msgstr "只打印不包含该提交的标签"
 
-#: builtin/tag.c:472
+#: builtin/tag.c
 msgid "print only tags that are merged"
 msgstr "只打印已经合并的标签"
 
-#: builtin/tag.c:473
+#: builtin/tag.c
 msgid "print only tags that are not merged"
 msgstr "只打印尚未合并的标签"
 
-#: builtin/tag.c:477
+#: builtin/tag.c
 msgid "print only tags of the object"
 msgstr "只打印指向该对象的标签"
 
-#: builtin/tag.c:559
+#: builtin/tag.c
 #, c-format
 msgid "the '%s' option is only allowed in list mode"
 msgstr "'%s' 选项只允许用在列表显示模式"
 
-#: builtin/tag.c:598
+#: builtin/tag.c
 #, c-format
 msgid "'%s' is not a valid tag name."
 msgstr "'%s' 不是一个有效的标签名称。"
 
-#: builtin/tag.c:603
+#: builtin/tag.c
 #, c-format
 msgid "tag '%s' already exists"
 msgstr "标签 '%s' 已存在"
 
-#: builtin/tag.c:634
+#: builtin/tag.c sequencer.c
+#, c-format
+msgid "Invalid cleanup mode %s"
+msgstr "无效的清理模式 %s"
+
+#: builtin/tag.c
 #, c-format
 msgid "Updated tag '%s' (was %s)\n"
 msgstr "已更新标签 '%s'（曾为 %s）\n"
 
-#: builtin/unpack-objects.c:95
+#: builtin/unpack-objects.c
 msgid "pack exceeds maximum allowed size"
 msgstr "包超过了最大允许大小"
 
-#: builtin/unpack-objects.c:504
+#: builtin/unpack-objects.c
 msgid "Unpacking objects"
 msgstr "展开对象中"
 
-#: builtin/update-index.c:84
+#: builtin/update-index.c
 #, c-format
 msgid "failed to create directory %s"
 msgstr "无法创建目录 %s"
 
-#: builtin/update-index.c:106
+#: builtin/update-index.c
 #, c-format
 msgid "failed to delete file %s"
 msgstr "无法删除文件 %s"
 
-#: builtin/update-index.c:113 builtin/update-index.c:219
+#: builtin/update-index.c
 #, c-format
 msgid "failed to delete directory %s"
 msgstr "无法删除目录 %s"
 
-#: builtin/update-index.c:138
+#: builtin/update-index.c
 #, c-format
 msgid "Testing mtime in '%s' "
 msgstr "在 '%s' 中测试 mtime "
 
-#: builtin/update-index.c:152
+#: builtin/update-index.c
 msgid "directory stat info does not change after adding a new file"
 msgstr "添加一个新文件后，目录的状态信息未改变"
 
-#: builtin/update-index.c:165
+#: builtin/update-index.c
 msgid "directory stat info does not change after adding a new directory"
 msgstr "添加一个新目录后，目录的状态信息未改变"
 
-#: builtin/update-index.c:178
+#: builtin/update-index.c
 msgid "directory stat info changes after updating a file"
 msgstr "更新一个文件后，目录的状态信息被修改"
 
-#: builtin/update-index.c:189
+#: builtin/update-index.c
 msgid "directory stat info changes after adding a file inside subdirectory"
 msgstr "在子目录中添加文件后，目录的状态信息被修改"
 
-#: builtin/update-index.c:200
+#: builtin/update-index.c
 msgid "directory stat info does not change after deleting a file"
 msgstr "删除一个文件后，目录的状态信息未改变"
 
-#: builtin/update-index.c:213
+#: builtin/update-index.c
 msgid "directory stat info does not change after deleting a directory"
 msgstr "删除一个目录后，目录的状态信息未改变"
 
-#: builtin/update-index.c:220
+#: builtin/update-index.c
 msgid " OK"
 msgstr " OK"
 
-#: builtin/update-index.c:589
+#: builtin/update-index.c
 msgid "git update-index [<options>] [--] [<file>...]"
 msgstr "git update-index [<选项>] [--] [<文件>...]"
 
-#: builtin/update-index.c:993
+#: builtin/update-index.c
 msgid "continue refresh even when index needs update"
 msgstr "当索引需要更新时继续刷新"
 
-#: builtin/update-index.c:996
+#: builtin/update-index.c
 msgid "refresh: ignore submodules"
 msgstr "刷新：忽略子模组"
 
-#: builtin/update-index.c:999
+#: builtin/update-index.c
 msgid "do not ignore new files"
 msgstr "不忽略新的文件"
 
-#: builtin/update-index.c:1001
+#: builtin/update-index.c
 msgid "let files replace directories and vice-versa"
 msgstr "让文件替换目录（反之亦然）"
 
-#: builtin/update-index.c:1003
+#: builtin/update-index.c
 msgid "notice files missing from worktree"
 msgstr "通知文件从工作区丢失"
 
-#: builtin/update-index.c:1005
+#: builtin/update-index.c
 msgid "refresh even if index contains unmerged entries"
 msgstr "即使索引区包含未合并的条目也执行刷新"
 
-#: builtin/update-index.c:1008
+#: builtin/update-index.c
 msgid "refresh stat information"
 msgstr "刷新统计信息"
 
-#: builtin/update-index.c:1012
+#: builtin/update-index.c
 msgid "like --refresh, but ignore assume-unchanged setting"
 msgstr "类似于 --refresh，但是忽略 assume-unchanged 设置"
 
-#: builtin/update-index.c:1016
+#: builtin/update-index.c
 msgid "<mode>,<object>,<path>"
 msgstr "<存取模式>,<对象>,<路径>"
 
-#: builtin/update-index.c:1017
+#: builtin/update-index.c
 msgid "add the specified entry to the index"
 msgstr "添加指定的条目到索引区"
 
-#: builtin/update-index.c:1027
+#: builtin/update-index.c
 msgid "mark files as \"not changing\""
 msgstr "把文件标记为 \"没有变更\""
 
-#: builtin/update-index.c:1030
+#: builtin/update-index.c
 msgid "clear assumed-unchanged bit"
 msgstr "清除 assumed-unchanged 位"
 
-#: builtin/update-index.c:1033
+#: builtin/update-index.c
 msgid "mark files as \"index-only\""
 msgstr "把文件标记为 \"仅索引\""
 
-#: builtin/update-index.c:1036
+#: builtin/update-index.c
 msgid "clear skip-worktree bit"
 msgstr "清除 skip-worktree 位"
 
-#: builtin/update-index.c:1039
+#: builtin/update-index.c
 msgid "do not touch index-only entries"
 msgstr "不要触碰仅索引条目"
 
-#: builtin/update-index.c:1041
+#: builtin/update-index.c
 msgid "add to index only; do not add content to object database"
 msgstr "只添加到索引区；不添加对象到对象库"
 
-#: builtin/update-index.c:1043
+#: builtin/update-index.c
 msgid "remove named paths even if present in worktree"
 msgstr "即使存在工作区里，也删除路径"
 
-#: builtin/update-index.c:1045
+#: builtin/update-index.c
 msgid "with --stdin: input lines are terminated by null bytes"
 msgstr "携带 --stdin：输入的行以 null 字符终止"
 
-#: builtin/update-index.c:1047
+#: builtin/update-index.c
 msgid "read list of paths to be updated from standard input"
 msgstr "从标准输入中读取需要更新的路径列表"
 
-#: builtin/update-index.c:1051
+#: builtin/update-index.c
 msgid "add entries from standard input to the index"
 msgstr "从标准输入添加条目到索引区"
 
-#: builtin/update-index.c:1055
+#: builtin/update-index.c
 msgid "repopulate stages #2 and #3 for the listed paths"
 msgstr "为指定文件重新生成第2和第3暂存区"
 
-#: builtin/update-index.c:1059
+#: builtin/update-index.c
 msgid "only update entries that differ from HEAD"
 msgstr "只更新与 HEAD 不同的条目"
 
-#: builtin/update-index.c:1063
+#: builtin/update-index.c
 msgid "ignore files missing from worktree"
 msgstr "忽略工作区丢失的文件"
 
-#: builtin/update-index.c:1066
+#: builtin/update-index.c
 msgid "report actions to standard output"
 msgstr "在标准输出显示操作"
 
-#: builtin/update-index.c:1068
+#: builtin/update-index.c
 msgid "(for porcelains) forget saved unresolved conflicts"
 msgstr "(for porcelains) 忘记保存的未解决的冲突"
 
-#: builtin/update-index.c:1072
+#: builtin/update-index.c
 msgid "write index in this format"
 msgstr "以这种格式写入索引区"
 
-#: builtin/update-index.c:1074
+#: builtin/update-index.c
 msgid "enable or disable split index"
 msgstr "启用或禁用索引拆分"
 
-#: builtin/update-index.c:1076
+#: builtin/update-index.c
 msgid "enable/disable untracked cache"
 msgstr "启用/禁用对未跟踪文件的缓存"
 
-#: builtin/update-index.c:1078
+#: builtin/update-index.c
 msgid "test if the filesystem supports untracked cache"
 msgstr "测试文件系统是否支持未跟踪文件缓存"
 
-#: builtin/update-index.c:1080
+#: builtin/update-index.c
 msgid "enable untracked cache without testing the filesystem"
 msgstr "无需检测文件系统，启用对未跟踪文件的缓存"
 
-#: builtin/update-index.c:1082
+#: builtin/update-index.c
 msgid "write out the index even if is not flagged as changed"
 msgstr "即使没有被标记为已更改，也要写出索引"
 
-#: builtin/update-index.c:1084
+#: builtin/update-index.c
 msgid "enable or disable file system monitor"
 msgstr "启用或禁用文件系统监控"
 
-#: builtin/update-index.c:1086
+#: builtin/update-index.c
 msgid "mark files as fsmonitor valid"
 msgstr "标记文件为 fsmonitor 有效"
 
-#: builtin/update-index.c:1089
+#: builtin/update-index.c
 msgid "clear fsmonitor valid bit"
 msgstr "清除 fsmonitor 有效位"
 
-#: builtin/update-index.c:1195
+#: builtin/update-index.c
 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:1204
+#: builtin/update-index.c
 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:1216
+#: builtin/update-index.c
 msgid ""
 "core.untrackedCache is set to true; remove or change it, if you really want "
 "to disable the untracked cache"
@@ -23943,11 +15862,11 @@ msgstr ""
 "core.untrackedCache 被设置为 true。如果您确实要禁用未跟踪文件缓存，请删除或修"
 "改它。"
 
-#: builtin/update-index.c:1220
+#: builtin/update-index.c
 msgid "Untracked cache disabled"
 msgstr "缓存未跟踪文件被禁用"
 
-#: builtin/update-index.c:1228
+#: builtin/update-index.c
 msgid ""
 "core.untrackedCache is set to false; remove or change it, if you really want "
 "to enable the untracked cache"
@@ -23955,168 +15874,168 @@ msgstr ""
 "core.untrackedCache 被设置为 false。如果您确实要启用未跟踪文件缓存，请删除或"
 "修改它。"
 
-#: builtin/update-index.c:1232
+#: builtin/update-index.c
 #, c-format
 msgid "Untracked cache enabled for '%s'"
 msgstr "缓存未跟踪文件在 '%s' 启用"
 
-#: builtin/update-index.c:1241
+#: builtin/update-index.c
 msgid "core.fsmonitor is unset; set it if you really want to enable fsmonitor"
 msgstr "core.fsmonitor 未设置；如果想要启用 fsmonitor 请设置该选项"
 
-#: builtin/update-index.c:1246
+#: builtin/update-index.c
 msgid "fsmonitor enabled"
 msgstr "fsmonitor 被启用"
 
-#: builtin/update-index.c:1250
+#: builtin/update-index.c
 msgid ""
 "core.fsmonitor is set; remove it if you really want to disable fsmonitor"
 msgstr "core.fsmonitor 已设置；如果想要禁用 fsmonitor 请移除该选项"
 
-#: builtin/update-index.c:1254
+#: builtin/update-index.c
 msgid "fsmonitor disabled"
 msgstr "fsmonitor 被禁用"
 
-#: builtin/update-ref.c:10
+#: builtin/update-ref.c
 msgid "git update-ref [<options>] -d <refname> [<old-val>]"
 msgstr "git update-ref [<选项>] -d <引用名> [<旧值>]"
 
-#: builtin/update-ref.c:11
+#: builtin/update-ref.c
 msgid "git update-ref [<options>]    <refname> <new-val> [<old-val>]"
 msgstr "git update-ref [<选项>]    <引用名> <新值> [<旧值>]"
 
-#: builtin/update-ref.c:12
+#: builtin/update-ref.c
 msgid "git update-ref [<options>] --stdin [-z]"
 msgstr "git update-ref [<选项>] --stdin [-z]"
 
-#: builtin/update-ref.c:506
+#: builtin/update-ref.c
 msgid "delete the reference"
 msgstr "删除引用"
 
-#: builtin/update-ref.c:508
+#: builtin/update-ref.c
 msgid "update <refname> not the one it points to"
 msgstr "更新 <引用名> 本身而不是它指向的引用"
 
-#: builtin/update-ref.c:509
+#: builtin/update-ref.c
 msgid "stdin has NUL-terminated arguments"
 msgstr "标准输入有以 NUL 字符终止的参数"
 
-#: builtin/update-ref.c:510
+#: builtin/update-ref.c
 msgid "read updates from stdin"
 msgstr "从标准输入读取更新"
 
-#: builtin/update-server-info.c:15
+#: builtin/update-server-info.c
 msgid "update the info files from scratch"
 msgstr "从头开始更新文件信息"
 
-#: builtin/upload-pack.c:11
+#: builtin/upload-pack.c
 msgid "git upload-pack [<options>] <dir>"
 msgstr "git upload-pack [<选项>] <目录>"
 
-#: builtin/upload-pack.c:24 t/helper/test-serve-v2.c:17
+#: builtin/upload-pack.c t/helper/test-serve-v2.c
 msgid "quit after a single request/response exchange"
 msgstr "在一次单独的请求/响应之后退出"
 
-#: builtin/upload-pack.c:26
+#: builtin/upload-pack.c
 msgid "serve up the info/refs for git-http-backend"
 msgstr "为 git-http-backend 提供 info/refs"
 
-#: builtin/upload-pack.c:29
+#: builtin/upload-pack.c
 msgid "do not try <directory>/.git/ if <directory> is no Git directory"
 msgstr "如果 <目录> 不是一个 Git 目录，不要尝试 <目录>/.git/"
 
-#: builtin/upload-pack.c:31
+#: builtin/upload-pack.c
 msgid "interrupt transfer after <n> seconds of inactivity"
 msgstr "不活动 <n> 秒钟后终止传输"
 
-#: builtin/verify-commit.c:19
+#: builtin/verify-commit.c
 msgid "git verify-commit [-v | --verbose] <commit>..."
 msgstr "git verify-commit [-v | --verbose] <提交>..."
 
-#: builtin/verify-commit.c:68
+#: builtin/verify-commit.c
 msgid "print commit contents"
 msgstr "打印提交内容"
 
-#: builtin/verify-commit.c:69 builtin/verify-tag.c:37
+#: builtin/verify-commit.c builtin/verify-tag.c
 msgid "print raw gpg status output"
 msgstr "打印原始 gpg 状态输出"
 
-#: builtin/verify-pack.c:59
+#: builtin/verify-pack.c
 msgid "git verify-pack [-v | --verbose] [-s | --stat-only] <pack>..."
 msgstr "git verify-pack [-v | --verbose] [-s | --stat-only] <包>..."
 
-#: builtin/verify-pack.c:70
+#: builtin/verify-pack.c
 msgid "verbose"
 msgstr "冗长输出"
 
-#: builtin/verify-pack.c:72
+#: builtin/verify-pack.c
 msgid "show statistics only"
 msgstr "只显示统计"
 
-#: builtin/verify-tag.c:18
+#: builtin/verify-tag.c
 msgid "git verify-tag [-v | --verbose] [--format=<format>] <tag>..."
 msgstr "git verify-tag [-v | --verbose] [--format=<格式>] <标签>..."
 
-#: builtin/verify-tag.c:36
+#: builtin/verify-tag.c
 msgid "print tag contents"
 msgstr "打印标签内容"
 
-#: builtin/worktree.c:19
+#: builtin/worktree.c
 msgid "git worktree add [<options>] <path> [<commit-ish>]"
 msgstr "git worktree add [<选项>] <路径> [<提交>]"
 
-#: builtin/worktree.c:20
+#: builtin/worktree.c
 msgid "git worktree list [<options>]"
 msgstr "git worktree list [<选项>]"
 
-#: builtin/worktree.c:21
+#: builtin/worktree.c
 msgid "git worktree lock [<options>] <path>"
 msgstr "git worktree lock [<选项>] <路径>"
 
-#: builtin/worktree.c:22
+#: builtin/worktree.c
 msgid "git worktree move <worktree> <new-path>"
 msgstr "git worktree move <工作区> <新路径>"
 
-#: builtin/worktree.c:23
+#: builtin/worktree.c
 msgid "git worktree prune [<options>]"
 msgstr "git worktree prune [<选项>]"
 
-#: builtin/worktree.c:24
+#: builtin/worktree.c
 msgid "git worktree remove [<options>] <worktree>"
 msgstr "git worktree remove [<选项>] <工作区>"
 
-#: builtin/worktree.c:25
+#: builtin/worktree.c
 msgid "git worktree repair [<path>...]"
 msgstr "git worktree repair [<路径>...]"
 
-#: builtin/worktree.c:26
+#: builtin/worktree.c
 msgid "git worktree unlock <path>"
 msgstr "git worktree unlock <路径>"
 
-#: builtin/worktree.c:76
+#: builtin/worktree.c
 #, c-format
 msgid "Removing %s/%s: %s"
 msgstr "删除 %s/%s: %s"
 
-#: builtin/worktree.c:149
+#: builtin/worktree.c
 msgid "report pruned working trees"
 msgstr "报告清除的工作区"
 
-#: builtin/worktree.c:151
+#: builtin/worktree.c
 msgid "expire working trees older than <time>"
 msgstr "将早于 <时间> 的工作区过期"
 
-#: builtin/worktree.c:221
+#: builtin/worktree.c
 #, c-format
 msgid "'%s' already exists"
 msgstr "'%s' 已经存在"
 
-#: builtin/worktree.c:230
+#: builtin/worktree.c
 #, c-format
 msgid "unusable worktree destination '%s'"
 msgstr "无法使用的工作区目标 '%s'"
 
-#: builtin/worktree.c:235
+#: builtin/worktree.c
 #, c-format
 msgid ""
 "'%s' is a missing but locked worktree;\n"
@@ -24125,7 +16044,7 @@ msgstr ""
 "'%s' 是一个丢失但锁定的工作区，\n"
 "使用 '%s -f -f' 覆盖，或用 'unlock' 和 'prune' 或 'remove' 清除"
 
-#: builtin/worktree.c:237
+#: builtin/worktree.c
 #, c-format
 msgid ""
 "'%s' is a missing but already registered worktree;\n"
@@ -24134,146 +16053,150 @@ msgstr ""
 "'%s' 是一个丢失但已经注册的工作区，\n"
 "使用 '%s -f' 覆盖，或用 'prune' 或 'remove' 清除"
 
-#: builtin/worktree.c:248
+#: builtin/worktree.c
 #, c-format
 msgid "failed to copy '%s' to '%s'; sparse-checkout may not work correctly"
 msgstr "无法将 '%s' 复制至 '%s'；稀疏检出可能无法正确工作"
 
-#: builtin/worktree.c:268
+#: builtin/worktree.c
 #, c-format
 msgid "failed to copy worktree config from '%s' to '%s'"
 msgstr "无法把工作树配置从 '%s' 拷贝到 '%s'"
 
-#: builtin/worktree.c:280 builtin/worktree.c:285
+#: builtin/worktree.c
 #, c-format
 msgid "failed to unset '%s' in '%s'"
 msgstr "无法在 '%2$s' 中取消配置 '%1$s'"
 
-#: builtin/worktree.c:356
+#: builtin/worktree.c
 #, c-format
 msgid "could not create directory of '%s'"
 msgstr "不能创建目录 '%s'"
 
-#: builtin/worktree.c:378
+#: builtin/worktree.c
 msgid "initializing"
 msgstr "初始化"
 
-#: builtin/worktree.c:492 builtin/worktree.c:498
+#: builtin/worktree.c
 #, c-format
 msgid "Preparing worktree (new branch '%s')"
 msgstr "准备工作区（新分支 '%s'）"
 
-#: builtin/worktree.c:494
+#: builtin/worktree.c
 #, c-format
 msgid "Preparing worktree (resetting branch '%s'; was at %s)"
 msgstr "准备工作区（重置分支 '%s'，之前为 %s）"
 
-#: builtin/worktree.c:503
+#: builtin/worktree.c
 #, c-format
 msgid "Preparing worktree (checking out '%s')"
 msgstr "准备工作区（检出 '%s'）"
 
-#: builtin/worktree.c:509
+#: builtin/worktree.c
 #, c-format
 msgid "Preparing worktree (detached HEAD %s)"
 msgstr "准备工作区（分离头指针 %s）"
 
-#: builtin/worktree.c:554
+#: builtin/worktree.c
 msgid "checkout <branch> even if already checked out in other worktree"
 msgstr "检出 <分支>，即使已经被检出到其它工作区"
 
-#: builtin/worktree.c:557
+#: builtin/worktree.c
 msgid "create a new branch"
 msgstr "创建一个新分支"
 
-#: builtin/worktree.c:559
+#: builtin/worktree.c
 msgid "create or reset a branch"
 msgstr "创建或重置一个分支"
 
-#: builtin/worktree.c:561
+#: builtin/worktree.c
 msgid "populate the new working tree"
 msgstr "生成新的工作区"
 
-#: builtin/worktree.c:562
+#: builtin/worktree.c
 msgid "keep the new working tree locked"
 msgstr "锁定新工作区"
 
-#: builtin/worktree.c:564 builtin/worktree.c:809
+#: builtin/worktree.c
 msgid "reason for locking"
 msgstr "锁定原因"
 
-#: builtin/worktree.c:567
+#: builtin/worktree.c
 msgid "set up tracking mode (see git-branch(1))"
 msgstr "设置跟踪模式（参见 git-branch(1)）"
 
-#: builtin/worktree.c:570
+#: builtin/worktree.c
 msgid "try to match the new branch name with a remote-tracking branch"
 msgstr "尝试为新分支名匹配一个远程跟踪分支"
 
-#: builtin/worktree.c:584
+#: builtin/worktree.c diff.c parse-options.c
+#, c-format
+msgid "options '%s', '%s', and '%s' cannot be used together"
+msgstr "选项 '%s'、'%s' 和 '%s' 不能同时使用"
+
+#: builtin/worktree.c
 msgid "added with --lock"
 msgstr "由 --lock 添加"
 
-#: builtin/worktree.c:646
+#: builtin/worktree.c
 msgid "--[no-]track can only be used if a new branch is created"
 msgstr "只能在创建新分支时使用选项 --[no-]track "
 
-#: builtin/worktree.c:766
+#: builtin/worktree.c
 msgid "show extended annotations and reasons, if available"
 msgstr "显示扩展的注释和原因（如果有）"
 
-#: builtin/worktree.c:768
+#: builtin/worktree.c
 msgid "add 'prunable' annotation to worktrees older than <time>"
 msgstr "向早于 <时间> 的工作区添添加“可修剪”注释"
 
-#: builtin/worktree.c:770
+#: builtin/worktree.c
 msgid "terminate records with a NUL character"
 msgstr "使用 NUL 字符终结记录"
 
-#: builtin/worktree.c:821 builtin/worktree.c:854 builtin/worktree.c:928
-#: builtin/worktree.c:1052
+#: builtin/worktree.c
 #, c-format
 msgid "'%s' is not a working tree"
 msgstr "'%s' 不是一个工作区"
 
-#: builtin/worktree.c:823 builtin/worktree.c:856
+#: builtin/worktree.c
 msgid "The main working tree cannot be locked or unlocked"
 msgstr "主工作区无法被加锁或解锁"
 
-#: builtin/worktree.c:828
+#: builtin/worktree.c
 #, c-format
 msgid "'%s' is already locked, reason: %s"
 msgstr "'%s' 已被锁定，原因：%s"
 
-#: builtin/worktree.c:830
+#: builtin/worktree.c
 #, c-format
 msgid "'%s' is already locked"
 msgstr "'%s' 已被锁定"
 
-#: builtin/worktree.c:858
+#: builtin/worktree.c
 #, c-format
 msgid "'%s' is not locked"
 msgstr "'%s' 未被锁定"
 
-#: builtin/worktree.c:899
+#: builtin/worktree.c
 msgid "working trees containing submodules cannot be moved or removed"
 msgstr "不能移动或删除包含子模组的工作区"
 
-#: builtin/worktree.c:907
+#: builtin/worktree.c
 msgid "force move even if worktree is dirty or locked"
 msgstr "强制移动，即使工作区是脏的或已锁定"
 
-#: builtin/worktree.c:930 builtin/worktree.c:1054
+#: builtin/worktree.c
 #, c-format
 msgid "'%s' is a main working tree"
 msgstr "'%s' 是一个主工作区"
 
-#: builtin/worktree.c:935
+#: builtin/worktree.c
 #, c-format
 msgid "could not figure out destination name from '%s'"
 msgstr "无法从 '%s' 算出目标名称"
 
-#: builtin/worktree.c:948
+#: builtin/worktree.c
 #, c-format
 msgid ""
 "cannot move a locked working tree, lock reason: %s\n"
@@ -24282,7 +16205,7 @@ msgstr ""
 "无法移动一个锁定的工作区，锁定原因：%s\n"
 "使用 'move -f -f' 覆盖或先解锁"
 
-#: builtin/worktree.c:950
+#: builtin/worktree.c
 msgid ""
 "cannot move a locked working tree;\n"
 "use 'move -f -f' to override or unlock first"
@@ -24290,36 +16213,36 @@ msgstr ""
 "无法移动一个锁定的工作区，\n"
 "使用 'move -f -f' 覆盖或先解锁"
 
-#: builtin/worktree.c:953
+#: builtin/worktree.c
 #, c-format
 msgid "validation failed, cannot move working tree: %s"
 msgstr "验证失败，无法移动工作区：%s"
 
-#: builtin/worktree.c:958
+#: builtin/worktree.c
 #, c-format
 msgid "failed to move '%s' to '%s'"
 msgstr "无法移动 '%s' 到 '%s'"
 
-#: builtin/worktree.c:1004
+#: builtin/worktree.c
 #, c-format
 msgid "failed to run 'git status' on '%s'"
 msgstr "无法在 '%s' 中执行 'git status'"
 
-#: builtin/worktree.c:1008
+#: builtin/worktree.c
 #, c-format
 msgid "'%s' contains modified or untracked files, use --force to delete it"
 msgstr "'%s' 包含修改或未跟踪的文件，使用 --force 删除"
 
-#: builtin/worktree.c:1013
+#: builtin/worktree.c
 #, c-format
 msgid "failed to run 'git status' on '%s', code %d"
 msgstr "无法在 '%s' 中执行 'git status'，退出码 %d"
 
-#: builtin/worktree.c:1036
+#: builtin/worktree.c
 msgid "force removal even if worktree is dirty or locked"
 msgstr "强制删除，即使工作区是脏的或已锁定"
 
-#: builtin/worktree.c:1059
+#: builtin/worktree.c
 #, c-format
 msgid ""
 "cannot remove a locked working tree, lock reason: %s\n"
@@ -24328,7 +16251,7 @@ msgstr ""
 "无法删除一个锁定的工作区，锁定原因：%s\n"
 "使用 'remove -f -f' 覆盖或先解锁"
 
-#: builtin/worktree.c:1061
+#: builtin/worktree.c
 msgid ""
 "cannot remove a locked working tree;\n"
 "use 'remove -f -f' to override or unlock first"
@@ -24336,1503 +16259,9845 @@ msgstr ""
 "无法删除一个锁定的工作区，\n"
 "使用 'remove -f -f' 覆盖或先解锁"
 
-#: builtin/worktree.c:1064
+#: builtin/worktree.c
 #, c-format
 msgid "validation failed, cannot remove working tree: %s"
 msgstr "验证失败，无法删除工作区：%s"
 
-#: builtin/worktree.c:1088
+#: builtin/worktree.c
 #, c-format
 msgid "repair: %s: %s"
 msgstr "修理：%s：%s"
 
-#: builtin/worktree.c:1091
+#: builtin/worktree.c
 #, c-format
 msgid "error: %s: %s"
 msgstr "错误：%s：%s"
 
-#: builtin/write-tree.c:15
+#: builtin/write-tree.c
 msgid "git write-tree [--missing-ok] [--prefix=<prefix>/]"
 msgstr "git write-tree [--missing-ok] [--prefix=<前缀>/]"
 
-#: builtin/write-tree.c:28
+#: builtin/write-tree.c
 msgid "<prefix>/"
 msgstr "<前缀>/"
 
-#: builtin/write-tree.c:29
+#: builtin/write-tree.c
 msgid "write tree object for a subdirectory <prefix>"
 msgstr "将 <前缀> 子目录内容写到一个树对象"
 
-#: builtin/write-tree.c:31
+#: builtin/write-tree.c
 msgid "only useful for debugging"
 msgstr "只对调试有用"
 
-#: git.c:28
-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"
-"           [--git-dir=<path>] [--work-tree=<path>] [--namespace=<name>]\n"
-"           [--super-prefix=<path>] [--config-env=<name>=<envvar>]\n"
-"           <command> [<args>]"
-msgstr ""
-"git [--version] [--help] [-C <路径>] [-c <名称>=<取值>]\n"
-"           [--exec-path[=<路径>]] [--html-path] [--man-path] [--info-path]\n"
-"           [-p | --paginate | -P | --no-pager] [--no-replace-objects] [--"
-"bare]\n"
-"           [--git-dir=<路径>] [--work-tree=<路径>] [--namespace=<名称>]\n"
-"           [--super-prefix=<路径>] [--config-env=<名称>=<环境变量>]\n"
-"           <命令> [<参数>]"
-
-#: git.c:36
-msgid ""
-"'git help -a' and 'git help -g' list available subcommands and some\n"
-"concept guides. See 'git help <command>' or 'git help <concept>'\n"
-"to read about a specific subcommand or concept.\n"
-"See 'git help git' for an overview of the system."
-msgstr ""
-"命令 'git help -a' 和 'git help -g' 显示可用的子命令和一些概念帮助。\n"
-"查看 'git help <命令>' 或 'git help <概念>' 以获取给定子命令或概念的\n"
-"帮助。\n"
-"有关系统的概述，查看 'git help git'。"
-
-#: git.c:188 git.c:216 git.c:300
-#, c-format
-msgid "no directory given for '%s' option\n"
-msgstr "没有为 '%s' 选项提供目录\n"
-
-#: git.c:202
+#: bundle.c
 #, c-format
-msgid "no namespace given for --namespace\n"
-msgstr "没有为 --namespace 提供命名空间\n"
-
-#: git.c:230
-#, c-format
-msgid "no prefix given for --super-prefix\n"
-msgstr "没有为 --super-prefix 提供前缀\n"
-
-#: git.c:252
-#, c-format
-msgid "-c expects a configuration string\n"
-msgstr "应为 -c 提供一个配置字符串\n"
-
-#: git.c:260
-#, c-format
-msgid "no config key given for --config-env\n"
-msgstr "没有为 --config-env 提供配置名称\n"
-
-#: git.c:326
-#, c-format
-msgid "unknown option: %s\n"
-msgstr "未知选项：%s\n"
-
-#: git.c:375
-#, c-format
-msgid "while expanding alias '%s': '%s'"
-msgstr "在扩展别名 '%s' 时：'%s'"
-
-#: git.c:384
-#, c-format
-msgid ""
-"alias '%s' changes environment variables.\n"
-"You can use '!git' in the alias to do this"
-msgstr ""
-"别名 '%s' 修改环境变量。您可以使用在别名中\n"
-"使用 '!git'"
-
-#: git.c:391
-#, c-format
-msgid "empty alias for %s"
-msgstr "%s 的空别名"
-
-#: git.c:394
-#, c-format
-msgid "recursive alias: %s"
-msgstr "递归的别名：%s"
-
-#: git.c:480
-msgid "write failure on standard output"
-msgstr "在标准输出写入失败"
-
-#: git.c:482
-msgid "unknown write failure on standard output"
-msgstr "到标准输出的未知写入错误"
-
-#: git.c:484
-msgid "close failed on standard output"
-msgstr "标准输出关闭失败"
-
-#: git.c:838
-#, c-format
-msgid "alias loop detected: expansion of '%s' does not terminate:%s"
-msgstr "检测到别名循环：'%s'的扩展未终止：%s"
-
-#: git.c:888
-#, c-format
-msgid "cannot handle %s as a builtin"
-msgstr "不能作为内置命令处理 %s"
-
-#: git.c:901
-#, c-format
-msgid ""
-"usage: %s\n"
-"\n"
-msgstr ""
-"用法：%s\n"
-"\n"
-
-#: git.c:921
-#, c-format
-msgid "expansion of alias '%s' failed; '%s' is not a git command\n"
-msgstr "展开别名命令 '%s' 失败，'%s' 不是一个 git 命令\n"
-
-#: git.c:933
-#, c-format
-msgid "failed to run command '%s': %s\n"
-msgstr "无法运行命令 '%s'：%s\n"
-
-#: http-fetch.c:128
-#, c-format
-msgid "argument to --packfile must be a valid hash (got '%s')"
-msgstr "--packfile 的参数必须是有效的哈希值（得到 '%s'）"
-
-#: http-fetch.c:138
-msgid "not a git repository"
-msgstr "不是 git 仓库"
-
-#: t/helper/test-fast-rebase.c:141
-msgid "unhandled options"
-msgstr "未处理的选项"
-
-#: t/helper/test-fast-rebase.c:146
-msgid "error preparing revisions"
-msgstr "准备版本时错误"
-
-#: t/helper/test-reach.c:154
-#, c-format
-msgid "commit %s is not marked reachable"
-msgstr "提交 %s 没有标记为可达"
-
-#: t/helper/test-reach.c:164
-msgid "too many commits marked reachable"
-msgstr "太多提交标记为可达"
-
-#: t/helper/test-serve-v2.c:7
-msgid "test-tool serve-v2 [<options>]"
-msgstr "test-tool serve-v2 [<选项>]"
-
-#: t/helper/test-serve-v2.c:19
-msgid "exit immediately after advertising capabilities"
-msgstr "通告能力之后立即退出"
-
-#: 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:582
-msgid "test-helper simple-ipc run-daemon   [<name>] [<threads>]"
-msgstr "test-helper simple-ipc run-daemon   [<名字>] [<线程>]"
-
-#: 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:584
-msgid "test-helper simple-ipc stop-daemon  [<name>] [<max-wait>]"
-msgstr "test-helper simple-ipc stop-daemon  [<名字>] [<最大等待>]"
-
-#: 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:586
-msgid "test-helper simple-ipc sendbytes    [<name>] [<bytecount>] [<byte>]"
-msgstr "test-helper simple-ipc sendbytes    [<名字>] [<字节数>] [<字节>]"
-
-#: t/helper/test-simple-ipc.c:587
-msgid ""
-"test-helper simple-ipc multiple     [<name>] [<threads>] [<bytecount>] "
-"[<batchsize>]"
-msgstr ""
-"test-helper simple-ipc multiple     [<名字>] [<线程>] [<字节计数>] [<批处理大"
-"小>]"
-
-#: t/helper/test-simple-ipc.c:595
-msgid "name or pathname of unix domain socket"
-msgstr "unix 域套接字的名称或路径名"
-
-#: t/helper/test-simple-ipc.c:597
-msgid "named-pipe name"
-msgstr "命名管道的名字"
-
-#: t/helper/test-simple-ipc.c:599
-msgid "number of threads in server thread pool"
-msgstr "服务器线程池中的线程数"
-
-#: t/helper/test-simple-ipc.c:600
-msgid "seconds to wait for daemon to start or stop"
-msgstr "等待守护进程启动或停止的秒数"
-
-#: t/helper/test-simple-ipc.c:602
-msgid "number of bytes"
-msgstr "字节数目"
-
-#: t/helper/test-simple-ipc.c:603
-msgid "number of requests per thread"
-msgstr "每个线程的请求数"
-
-#: t/helper/test-simple-ipc.c:605
-msgid "byte"
-msgstr "字节"
-
-#: t/helper/test-simple-ipc.c:605
-msgid "ballast character"
-msgstr "ballast character"
-
-#: t/helper/test-simple-ipc.c:606
-msgid "token"
-msgstr "令牌"
-
-#: t/helper/test-simple-ipc.c:606
-msgid "command token to send to the server"
-msgstr "发送到服务器的命令令牌"
-
-#: http.c:350
-#, c-format
-msgid "negative value for http.postbuffer; defaulting to %d"
-msgstr "http.postbuffer 为负值，默认为 %d"
-
-#: http.c:371
-msgid "Delegation control is not supported with cURL < 7.22.0"
-msgstr "不支持委托控制，因为 cURL < 7.22.0"
-
-#: http.c:380
-msgid "Public key pinning not supported with cURL < 7.39.0"
-msgstr "不支持公钥文件锁定，因为 cURL < 7.39.0"
-
-#: http.c:812
-msgid "CURLSSLOPT_NO_REVOKE not supported with cURL < 7.44.0"
-msgstr "不支持 CURLSSLOPT_NO_REVOKE，因为 cURL < 7.44.0"
-
-#: http.c:1016
-#, c-format
-msgid "Unsupported SSL backend '%s'. Supported SSL backends:"
-msgstr "不支持的 SSL 后端 '%s'。支持的 SSL 后端："
-
-#: 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:1027
-#, c-format
-msgid "Could not set SSL backend to '%s': already set"
-msgstr "无法将 SSL 后端设置为 '%s'：已经设置"
-
-#: http.c:1876
-#, c-format
-msgid ""
-"unable to update url base from redirection:\n"
-"  asked for: %s\n"
-"   redirect: %s"
-msgstr ""
-"不能更新重定向的 url base：\n"
-"     请求：%s\n"
-"   重定向：%s"
-
-#: remote-curl.c:184
-#, c-format
-msgid "invalid quoting in push-option value: '%s'"
-msgstr "在 push-option 取值中无效的引号：'%s'"
-
-#: remote-curl.c:308
-#, c-format
-msgid "%sinfo/refs not valid: is this a git repository?"
-msgstr "%sinfo/refs 无效：这是 git 仓库么？"
-
-#: remote-curl.c:409
-msgid "invalid server response; expected service, got flush packet"
-msgstr "无效的服务端响应。预期服务，得到 flush 包"
-
-#: remote-curl.c:440
-#, c-format
-msgid "invalid server response; got '%s'"
-msgstr "无效的服务端响应，得到 '%s'"
-
-#: remote-curl.c:500
-#, c-format
-msgid "repository '%s' not found"
-msgstr "仓库 '%s' 未找到"
-
-#: remote-curl.c:504
-#, c-format
-msgid "Authentication failed for '%s'"
-msgstr "'%s' 鉴权失败"
-
-#: remote-curl.c:508
-#, c-format
-msgid "unable to access '%s' with http.pinnedPubkey configuration: %s"
-msgstr "无法以 http.pinnedPubkey 设置访问 '%s'：%s"
-
-#: remote-curl.c:512
-#, c-format
-msgid "unable to access '%s': %s"
-msgstr "无法访问 '%s'：%s"
-
-#: remote-curl.c:518
-#, c-format
-msgid "redirecting to %s"
-msgstr "重定向到 %s"
-
-#: remote-curl.c:649
-msgid "shouldn't have EOF when not gentle on EOF"
-msgstr "当没有设置温和处理文件结束符（EOF）时，不应该有文件结束符"
-
-#: remote-curl.c:661
-msgid "remote server sent unexpected response end packet"
-msgstr "远程服务器发送意外的响应结束数据包"
-
-#: remote-curl.c:730
-msgid "unable to rewind rpc post data - try increasing http.postBuffer"
-msgstr "无法倒回 rpc post 数据 - 尝试增加 http.postBuffer"
+msgid "unrecognized bundle hash algorithm: %s"
+msgstr "未能识别的归档包哈希算法：%s"
 
-#: remote-curl.c:759
+#: bundle.c
 #, c-format
-msgid "remote-curl: bad line length character: %.4s"
-msgstr "remote-curl：错误的行宽字符：%.4s"
-
-#: remote-curl.c:761
-msgid "remote-curl: unexpected response end packet"
-msgstr "remote-curl：意外响应结束包"
+msgid "unknown capability '%s'"
+msgstr "未知能力 '%s'"
 
-#: remote-curl.c:837
+#: bundle.c
 #, c-format
-msgid "RPC failed; %s"
-msgstr "RPC 失败。%s"
-
-#: remote-curl.c:877
-msgid "cannot handle pushes this big"
-msgstr "不能处理这么大的推送"
+msgid "'%s' does not look like a v2 or v3 bundle file"
+msgstr "'%s' 不像是一个 v2 或 v3 版本的归档包文件"
 
-#: remote-curl.c:990
+#: bundle.c
 #, c-format
-msgid "cannot deflate request; zlib deflate error %d"
-msgstr "不能压缩请求，zlib 压缩错误 %d"
+msgid "unrecognized header: %s%s (%d)"
+msgstr "未能识别的包头：%s%s (%d)"
 
-#: remote-curl.c:994
-#, c-format
-msgid "cannot deflate request; zlib end error %d"
-msgstr "不能压缩请求，zlib 结束错误 %d"
+#: bundle.c
+msgid "Repository lacks these prerequisite commits:"
+msgstr "仓库中缺少这些必备的提交："
 
-#: remote-curl.c:1044
-#, c-format
-msgid "%d bytes of length header were received"
-msgstr "收到了 %d 字节长度的头信息"
+#: bundle.c
+msgid "need a repository to verify a bundle"
+msgstr "需要一个仓库来校验一个归档包"
 
-#: remote-curl.c:1046
+#: bundle.c
 #, c-format
-msgid "%d bytes of body are still expected"
-msgstr "预期仍然需要 %d 个字节的正文"
-
-#: remote-curl.c:1135
-msgid "dumb http transport does not support shallow capabilities"
-msgstr "哑 http 传输不支持浅克隆能力"
-
-#: remote-curl.c:1150
-msgid "fetch failed."
-msgstr "获取失败。"
-
-#: remote-curl.c:1198
-msgid "cannot fetch by sha1 over smart http"
-msgstr "无法通过智能 HTTP 获取 sha1"
+msgid "The bundle contains this ref:"
+msgid_plural "The bundle contains these %<PRIuMAX> refs:"
+msgstr[0] "这个归档包中含有这个引用："
+msgstr[1] "这个归档包中含有 %<PRIuMAX> 个引用："
 
-#: remote-curl.c:1242 remote-curl.c:1248
-#, c-format
-msgid "protocol error: expected sha/ref, got '%s'"
-msgstr "协议错误：期望 sha/ref，却得到 '%s'"
+#: bundle.c
+msgid "The bundle records a complete history."
+msgstr "这个归档包记录一个完整历史。"
 
-#: remote-curl.c:1260 remote-curl.c:1378
+#: bundle.c
 #, c-format
-msgid "http transport does not support %s"
-msgstr "http 传输协议不支持 %s"
-
-#: remote-curl.c:1296
-msgid "git-http-push failed"
-msgstr "git-http-push 失败"
-
-#: remote-curl.c:1485
-msgid "remote-curl: usage: git remote-curl <remote> [<url>]"
-msgstr "remote-curl：用法：git remote-curl <远程> [<url>]"
-
-#: remote-curl.c:1517
-msgid "remote-curl: error reading command stream from git"
-msgstr "remote-curl：错误读取来自 git 的命令流"
-
-#: remote-curl.c:1524
-msgid "remote-curl: fetch attempted without a local repo"
-msgstr "remote-curl：尝试没有本地仓库下获取"
+msgid "The bundle requires this ref:"
+msgid_plural "The bundle requires these %<PRIuMAX> refs:"
+msgstr[0] "这个归档包需要这个引用："
+msgstr[1] "这个归档包需要 %<PRIuMAX> 个引用："
 
-#: remote-curl.c:1565
-#, c-format
-msgid "remote-curl: unknown command '%s' from git"
-msgstr "remote-curl：未知的来自 git 的命令 '%s'"
+#: bundle.c
+msgid "unable to dup bundle descriptor"
+msgstr "无法复制归档包描述符"
 
-#: contrib/scalar/scalar.c:49
-msgid "need a working directory"
-msgstr "需要一个工作目录"
+#: bundle.c
+msgid "Could not spawn pack-objects"
+msgstr "不能生成 pack-objects 进程"
 
-#: contrib/scalar/scalar.c:86
-msgid "could not find enlistment root"
-msgstr "无法找到登记根"
+#: bundle.c
+msgid "pack-objects died"
+msgstr "pack-objects 终止"
 
-#: contrib/scalar/scalar.c:89 contrib/scalar/scalar.c:350
-#: contrib/scalar/scalar.c:435 contrib/scalar/scalar.c:578
+#: bundle.c
 #, c-format
-msgid "could not switch to '%s'"
-msgstr "无法切换到 '%s'"
+msgid "ref '%s' is excluded by the rev-list options"
+msgstr "引用 '%s' 被 rev-list 选项排除"
 
-#: contrib/scalar/scalar.c:179
+#: bundle.c
 #, c-format
-msgid "could not configure %s=%s"
-msgstr "无法配置 %s=%s"
-
-#: contrib/scalar/scalar.c:197
-msgid "could not configure log.excludeDecoration"
-msgstr "无法配置 log.excludeDecoration"
-
-#: contrib/scalar/scalar.c:218
-msgid "Scalar enlistments require a worktree"
-msgstr "Scalar 登记需要一个工作树"
+msgid "unsupported bundle version %d"
+msgstr "不支持的归档包版本 %d"
 
-#: contrib/scalar/scalar.c:310
+#: bundle.c
 #, c-format
-msgid "remote HEAD is not a branch: '%.*s'"
-msgstr "远程 HEAD 不是一个分支：'%.*s'"
-
-#: contrib/scalar/scalar.c:316
-msgid "failed to get default branch name from remote; using local default"
-msgstr "无法从远程获取默认分支名称；使用本地默认值"
-
-#: contrib/scalar/scalar.c:329
-msgid "failed to get default branch name"
-msgstr "无法获取默认分支名称"
-
-#: contrib/scalar/scalar.c:340
-msgid "failed to unregister repository"
-msgstr "无法取消注册仓库"
-
-#: contrib/scalar/scalar.c:355
-msgid "failed to delete enlistment directory"
-msgstr "无法删除登记目录"
-
-#: contrib/scalar/scalar.c:375
-msgid "branch to checkout after clone"
-msgstr "克隆后要检出的分支"
-
-#: contrib/scalar/scalar.c:377
-msgid "when cloning, create full working directory"
-msgstr "在克隆时，创建完整的工作目录"
-
-#: contrib/scalar/scalar.c:379
-msgid "only download metadata for the branch that will be checked out"
-msgstr "只下载要检出的分支的元信息"
-
-#: contrib/scalar/scalar.c:384
-msgid "scalar clone [<options>] [--] <repo> [<dir>]"
-msgstr "scalar clone [<选项>] [--] <仓库> [<目录>]"
+msgid "cannot write bundle version %d with algorithm %s"
+msgstr "不能写入，归档包版本 %d 不支持算法 %s"
 
-#: contrib/scalar/scalar.c:409
-#, c-format
-msgid "cannot deduce worktree name from '%s'"
-msgstr "无法从 '%s' 猜测工作区名称"
+#: bundle.c
+msgid "Refusing to create empty bundle."
+msgstr "不能创建空的归档包。"
 
-#: contrib/scalar/scalar.c:418
+#: bundle.c
 #, c-format
-msgid "directory '%s' exists already"
-msgstr "目录 '%s' 已存在"
+msgid "cannot create '%s'"
+msgstr "不能创建 '%s'"
 
-#: contrib/scalar/scalar.c:445
-#, c-format
-msgid "failed to get default branch for '%s'"
-msgstr "无法获取 '%s' 的默认分支"
+#: bundle.c
+msgid "index-pack died"
+msgstr "index-pack 终止"
 
-#: contrib/scalar/scalar.c:456
-#, c-format
-msgid "could not configure remote in '%s'"
-msgstr "无法在 '%s' 中配置远程"
+#: chunk-format.c
+msgid "terminating chunk id appears earlier than expected"
+msgstr "终止块 ID 比预期更早出现"
 
-#: contrib/scalar/scalar.c:465
+#: chunk-format.c
 #, c-format
-msgid "could not configure '%s'"
-msgstr "无法配置 '%s'"
-
-#: contrib/scalar/scalar.c:468
-msgid "partial clone failed; attempting full clone"
-msgstr "部分克隆失败；尝试完整克隆"
-
-#: contrib/scalar/scalar.c:472
-msgid "could not configure for full clone"
-msgstr "无法配置完整克隆"
-
-#: contrib/scalar/scalar.c:504
-msgid "`scalar list` does not take arguments"
-msgstr "`scalar list` 不带参数"
-
-#: contrib/scalar/scalar.c:517
-msgid "scalar register [<enlistment>]"
-msgstr "scalar register [<登记>]"
-
-#: contrib/scalar/scalar.c:544
-msgid "reconfigure all registered enlistments"
-msgstr "重新配置所有注册的登记"
-
-#: contrib/scalar/scalar.c:548
-msgid "scalar reconfigure [--all | <enlistment>]"
-msgstr "scalar reconfigure [--all | <登记>]"
-
-#: contrib/scalar/scalar.c:566
-msgid "--all or <enlistment>, but not both"
-msgstr "--all 或者 <登记>，而不是两个一起"
+msgid "improper chunk offset(s) %<PRIx64> and %<PRIx64>"
+msgstr "不正确的块偏移 %<PRIx64> 和 %<PRIx64>"
 
-#: contrib/scalar/scalar.c:581
+#: chunk-format.c
 #, c-format
-msgid "git repository gone in '%s'"
-msgstr "在 '%s' 的 git 仓库已消失"
-
-#: contrib/scalar/scalar.c:621
-msgid ""
-"scalar run <task> [<enlistment>]\n"
-"Tasks:\n"
-msgstr ""
-"scalar run <任务> [<登记>]\n"
-"任务：\n"
+msgid "duplicate chunk ID %<PRIx32> found"
+msgstr "发现重复的块ID %<PRIx32>"
 
-#: contrib/scalar/scalar.c:639
+#: chunk-format.c
 #, c-format
-msgid "no such task: '%s'"
-msgstr "没有此任务：'%s'"
-
-#: contrib/scalar/scalar.c:689
-msgid "scalar unregister [<enlistment>]"
-msgstr "scalar unregister [<登记>]"
-
-#: contrib/scalar/scalar.c:736
-msgid "scalar delete <enlistment>"
-msgstr "scalar delete <登记>"
-
-#: contrib/scalar/scalar.c:751
-msgid "refusing to delete current working directory"
-msgstr "拒绝删除当前工作目录"
-
-#: contrib/scalar/scalar.c:766
-msgid "include Git version"
-msgstr "包括 Git 的版本"
-
-#: contrib/scalar/scalar.c:768
-msgid "include Git's build options"
-msgstr "包括 Git 的构建选项"
-
-#: contrib/scalar/scalar.c:772
-msgid "scalar verbose [-v | --verbose] [--build-options]"
-msgstr "scalar verbose [-v | --verbose] [--build-options]"
+msgid "final chunk has non-zero id %<PRIx32>"
+msgstr "最终块有非零 ID %<PRIx32>"
 
-#: contrib/scalar/scalar.c:813
-msgid "-C requires a <directory>"
-msgstr "-C 需要 <目录>"
+#: chunk-format.c
+msgid "invalid hash version"
+msgstr "无效的哈希版本"
 
-#: contrib/scalar/scalar.c:815
+#: color.c
 #, c-format
-msgid "could not change to '%s'"
-msgstr "无法变更到 '%s'"
-
-#: contrib/scalar/scalar.c:821
-msgid "-c requires a <key>=<value> argument"
-msgstr "-c 需要 <键>=<值> 参数"
-
-#: contrib/scalar/scalar.c:839
-msgid ""
-"scalar [-C <directory>] [-c <key>=<value>] <command> [<options>]\n"
-"\n"
-"Commands:\n"
-msgstr ""
-"scalar [-C <目录>] [-c <键>=<值>] <命令> [<选项>]\n"
-"\n"
-"命令：\n"
-
-#: compat/compiler.h:26
-msgid "no compiler information available\n"
-msgstr "编译器信息不可用\n"
-
-#: compat/compiler.h:38
-msgid "no libc information available\n"
-msgstr "libc 信息不可用\n"
-
-#: list-objects-filter-options.h:126
-msgid "args"
-msgstr "参数"
-
-#: list-objects-filter-options.h:127
-msgid "object filtering"
-msgstr "对象过滤"
-
-#: parse-options.h:188
-msgid "expiry-date"
-msgstr "到期时间"
-
-#: parse-options.h:202
-msgid "no-op (backward compatibility)"
-msgstr "空操作（向后兼容）"
-
-#: parse-options.h:341
-msgid "be more verbose"
-msgstr "更加详细"
-
-#: parse-options.h:343
-msgid "be more quiet"
-msgstr "更加安静"
-
-#: parse-options.h:349
-msgid "use <n> digits to display object names"
-msgstr "用 <n> 位数字显示对象名"
-
-#: parse-options.h:368
-msgid "how to strip spaces and #comments from message"
-msgstr "设置如何删除提交说明里的空格和#注释"
-
-#: parse-options.h:369
-msgid "read pathspec from file"
-msgstr "从文件读取路径表达式"
-
-#: parse-options.h:370
-msgid ""
-"with --pathspec-from-file, pathspec elements are separated with NUL character"
-msgstr "使用 --pathspec-from-file，路径表达式用空字符分隔"
-
-#: ref-filter.h:98
-msgid "key"
-msgstr "key"
-
-#: ref-filter.h:98
-msgid "field name to sort on"
-msgstr "排序的字段名"
-
-#: rerere.h:44
-msgid "update the index with reused conflict resolution if possible"
-msgstr "如果可能，重用冲突解决更新索引"
+msgid "invalid color value: %.*s"
+msgstr "无效的颜色值：%.*s"
 
-#: command-list.h:50
+#: command-list.h
 msgid "Add file contents to the index"
 msgstr "添加文件内容至索引"
 
-#: command-list.h:51
+#: command-list.h
 msgid "Apply a series of patches from a mailbox"
 msgstr "应用邮箱格式的系列补丁"
 
-#: command-list.h:52
+#: command-list.h
 msgid "Annotate file lines with commit information"
 msgstr "使用提交信息注释文件行"
 
-#: command-list.h:53
+#: command-list.h
 msgid "Apply a patch to files and/or to the index"
 msgstr "应用一个补丁到文件和/或索引区"
 
-#: command-list.h:54
+#: command-list.h
 msgid "Import a GNU Arch repository into Git"
 msgstr "将一个 GNU Arch 仓库导入到 Git"
 
-#: command-list.h:55
+#: command-list.h
 msgid "Create an archive of files from a named tree"
 msgstr "基于一个指定的树创建文件存档"
 
-#: command-list.h:56
+#: command-list.h
 msgid "Use binary search to find the commit that introduced a bug"
 msgstr "通过二分查找定位引入 bug 的提交"
 
-#: command-list.h:57
+#: command-list.h
 msgid "Show what revision and author last modified each line of a file"
 msgstr "显示文件每一行最后修改的版本和修改者"
 
-#: command-list.h:58
+#: command-list.h
 msgid "List, create, or delete branches"
 msgstr "列出、创建或删除分支"
 
-#: command-list.h:59
+#: command-list.h
 msgid "Collect information for user to file a bug report"
 msgstr "收集信息以供用户提交错误报告"
 
-#: command-list.h:60
+#: command-list.h
 msgid "Move objects and refs by archive"
 msgstr "通过归档移动对象和引用"
 
-#: command-list.h:61
+#: command-list.h
 msgid "Provide content or type and size information for repository objects"
 msgstr "提供仓库对象的内容、类型或大小"
 
-#: command-list.h:62
+#: command-list.h
 msgid "Display gitattributes information"
 msgstr "显示 gitattributes 信息"
 
-#: command-list.h:63
+#: command-list.h
 msgid "Debug gitignore / exclude files"
 msgstr "调试 gitignore / exclude 文件"
 
-#: command-list.h:64
+#: command-list.h
 msgid "Show canonical names and email addresses of contacts"
 msgstr "显示联系人的规范名称和电子邮件"
 
-#: command-list.h:65
+#: command-list.h
 msgid "Ensures that a reference name is well formed"
 msgstr "确保引用名称格式正确"
 
-#: command-list.h:66
+#: command-list.h
 msgid "Switch branches or restore working tree files"
 msgstr "切换分支或恢复工作区文件"
 
-#: command-list.h:67
+#: command-list.h
 msgid "Copy files from the index to the working tree"
 msgstr "从索引拷贝文件到工作区"
 
-#: command-list.h:68
+#: command-list.h
 msgid "Find commits yet to be applied to upstream"
 msgstr "查找尚未应用到上游的提交"
 
-#: command-list.h:69
+#: command-list.h
 msgid "Apply the changes introduced by some existing commits"
 msgstr "应用一些现存提交引入的修改"
 
-#: command-list.h:70
+#: command-list.h
 msgid "Graphical alternative to git-commit"
 msgstr "git-commit 的图形替代界面"
 
-#: command-list.h:71
+#: command-list.h
 msgid "Remove untracked files from the working tree"
 msgstr "从工作区中删除未跟踪文件"
 
-#: command-list.h:72
+#: command-list.h
 msgid "Clone a repository into a new directory"
 msgstr "克隆仓库到一个新目录"
 
-#: command-list.h:73
+#: command-list.h
 msgid "Display data in columns"
 msgstr "以列的方式显示数据"
 
-#: command-list.h:74
+#: command-list.h
 msgid "Record changes to the repository"
 msgstr "记录变更到仓库"
 
-#: command-list.h:75
+#: command-list.h
 msgid "Write and verify Git commit-graph files"
 msgstr "写入和校验 Git 提交图文件"
 
-#: command-list.h:76
+#: command-list.h
 msgid "Create a new commit object"
 msgstr "创建一个新的提交对象"
 
-#: command-list.h:77
+#: command-list.h
 msgid "Get and set repository or global options"
 msgstr "获取和设置仓库或者全局选项"
 
-#: command-list.h:78
+#: command-list.h
 msgid "Count unpacked number of objects and their disk consumption"
 msgstr "计算未打包对象的数量和磁盘空间占用"
 
-#: command-list.h:79
+#: command-list.h
 msgid "Retrieve and store user credentials"
 msgstr "检索和存储用户密码"
 
-#: command-list.h:80
+#: command-list.h
 msgid "Helper to temporarily store passwords in memory"
 msgstr "在内存中临时存储密码的助手"
 
-#: command-list.h:81
+#: command-list.h
 msgid "Helper to store credentials on disk"
 msgstr "在磁盘存储密码的助手"
 
-#: command-list.h:82
+#: command-list.h
 msgid "Export a single commit to a CVS checkout"
 msgstr "将一个提交导出到 CVS 检出中"
 
-#: command-list.h:83
+#: command-list.h
 msgid "Salvage your data out of another SCM people love to hate"
 msgstr "从另外一个人们爱恨的配置管理系统中拯救您的数据"
 
-#: command-list.h:84
+#: command-list.h
 msgid "A CVS server emulator for Git"
 msgstr "Git 的一个 CVS 服务模拟器"
 
-#: command-list.h:85
+#: command-list.h
 msgid "A really simple server for Git repositories"
 msgstr "一个非常简单的 Git 仓库服务器"
 
-#: command-list.h:86
+#: command-list.h
 msgid "Give an object a human readable name based on an available ref"
 msgstr "基于一个现存的引用为一个对象起一个可读的名称"
 
-#: command-list.h:87
+#: command-list.h
 msgid "Show changes between commits, commit and working tree, etc"
 msgstr "显示提交之间、提交和工作区之间等的差异"
 
-#: command-list.h:88
+#: command-list.h
 msgid "Compares files in the working tree and the index"
 msgstr "比较工作区和索引区中的文件"
 
-#: command-list.h:89
+#: command-list.h
 msgid "Compare a tree to the working tree or index"
 msgstr "将一个树和工作区或索引做比较"
 
-#: command-list.h:90
+#: command-list.h
 msgid "Compares the content and mode of blobs found via two tree objects"
 msgstr "比较两个树对象的文件内容和模式"
 
-#: command-list.h:91
+#: command-list.h
 msgid "Show changes using common diff tools"
 msgstr "使用常见的差异工具显示更改"
 
-#: command-list.h:92
+#: command-list.h
 msgid "Git data exporter"
 msgstr "Git 数据导出器"
 
-#: command-list.h:93
+#: command-list.h
 msgid "Backend for fast Git data importers"
 msgstr "Git 快速数据导入器后端"
 
-#: command-list.h:94
+#: command-list.h
 msgid "Download objects and refs from another repository"
 msgstr "从另外一个仓库下载对象和引用"
 
-#: command-list.h:95
+#: command-list.h
 msgid "Receive missing objects from another repository"
 msgstr "从另一个仓库获取缺失的对象"
 
-#: command-list.h:96
+#: command-list.h
 msgid "Rewrite branches"
 msgstr "重写分支"
 
-#: command-list.h:97
+#: command-list.h
 msgid "Produce a merge commit message"
 msgstr "生成一个合并提交信息"
 
-#: command-list.h:98
+#: command-list.h
 msgid "Output information on each ref"
 msgstr "对每一个引用输出信息 "
 
-#: command-list.h:99
+#: command-list.h
 msgid "Run a Git command on a list of repositories"
 msgstr "在一个仓库列表上运行 Git 命令"
 
-#: command-list.h:100
+#: command-list.h
 msgid "Prepare patches for e-mail submission"
 msgstr "准备电子邮件提交的补丁"
 
-#: command-list.h:101
+#: command-list.h
 msgid "Verifies the connectivity and validity of the objects in the database"
 msgstr "验证仓库中对象的连通性和有效性"
 
-#: command-list.h:102
+#: command-list.h
 msgid "Cleanup unnecessary files and optimize the local repository"
 msgstr "清除不必要的文件和优化本地仓库"
 
-#: command-list.h:103
+#: command-list.h
 msgid "Extract commit ID from an archive created using git-archive"
 msgstr "从 git-archive 创建的归档文件中提取提交 ID"
 
-#: command-list.h:104
+#: command-list.h
 msgid "Print lines matching a pattern"
 msgstr "输出和模式匹配的行"
 
-#: command-list.h:105
+#: command-list.h
 msgid "A portable graphical interface to Git"
 msgstr "一个便携的 Git 图形客户端"
 
-#: command-list.h:106
+#: command-list.h
 msgid "Compute object ID and optionally creates a blob from a file"
 msgstr "从一个文件计算对象 ID，并可以创建 blob 数据对象"
 
-#: command-list.h:107
+#: command-list.h
 msgid "Display help information about Git"
 msgstr "显示 Git 的帮助信息"
 
-#: command-list.h:108
+#: command-list.h
 msgid "Run git hooks"
 msgstr "运行 git 钩子"
 
-#: command-list.h:109
+#: command-list.h
 msgid "Server side implementation of Git over HTTP"
 msgstr "Git HTTP 协议的服务端实现"
 
-#: command-list.h:110
+#: command-list.h
 msgid "Download from a remote Git repository via HTTP"
 msgstr "通过 HTTP 从远程 Git 仓库下载"
 
-#: command-list.h:111
+#: command-list.h
 msgid "Push objects over HTTP/DAV to another repository"
 msgstr "通过 HTTP/DAV 推送对象另一个仓库"
 
-#: command-list.h:112
+#: command-list.h
 msgid "Send a collection of patches from stdin to an IMAP folder"
 msgstr "从标准输入将一组补丁发送到IMAP文件夹"
 
-#: command-list.h:113
+#: command-list.h
 msgid "Build pack index file for an existing packed archive"
 msgstr "从一个现存的包存档文件创建包索引"
 
-#: command-list.h:114
+#: command-list.h
 msgid "Create an empty Git repository or reinitialize an existing one"
 msgstr "创建一个空的 Git 仓库或重新初始化一个已存在的仓库"
 
-#: command-list.h:115
+#: command-list.h
 msgid "Instantly browse your working repository in gitweb"
 msgstr "在 gitweb 中即时浏览您的工作仓库"
 
-#: command-list.h:116
+#: command-list.h
 msgid "Add or parse structured information in commit messages"
 msgstr "添加或解析提交说明中的结构化信息"
 
-#: command-list.h:117
+#: command-list.h
 msgid "Show commit logs"
 msgstr "显示提交日志"
 
-#: command-list.h:118
+#: command-list.h
 msgid "Show information about files in the index and the working tree"
 msgstr "显示索引和工作区中文件的信息"
 
-#: command-list.h:119
+#: command-list.h
 msgid "List references in a remote repository"
 msgstr "显示一个远程仓库的引用"
 
-#: command-list.h:120
+#: command-list.h
 msgid "List the contents of a tree object"
 msgstr "显示一个树对象的内容"
 
-#: command-list.h:121
+#: command-list.h
 msgid "Extracts patch and authorship from a single e-mail message"
 msgstr "从单个电子邮件中提取补丁和作者身份"
 
-#: command-list.h:122
+#: command-list.h
 msgid "Simple UNIX mbox splitter program"
 msgstr "简单的 UNIX mbox 邮箱切分程序"
 
-#: command-list.h:123
+#: command-list.h
 msgid "Run tasks to optimize Git repository data"
 msgstr "运行任务以优化仓库数据"
 
-#: command-list.h:124
+#: command-list.h
 msgid "Join two or more development histories together"
 msgstr "合并两个或更多开发历史"
 
-#: command-list.h:125
+#: command-list.h
 msgid "Find as good common ancestors as possible for a merge"
 msgstr "为了合并查找尽可能好的公共祖先提交"
 
-#: command-list.h:126
+#: command-list.h
 msgid "Run a three-way file merge"
 msgstr "运行一个三路文件合并"
 
-#: command-list.h:127
+#: command-list.h
 msgid "Run a merge for files needing merging"
 msgstr "对于需要合并的文件执行合并"
 
-#: command-list.h:128
+#: command-list.h
 msgid "The standard helper program to use with git-merge-index"
 msgstr "与 git-merge-index 一起使用的标准向导程序"
 
-#: command-list.h:129
+#: command-list.h
 msgid "Show three-way merge without touching index"
 msgstr "在不动索引的情况下显示三路合并"
 
-#: command-list.h:130
+#: command-list.h
 msgid "Run merge conflict resolution tools to resolve merge conflicts"
 msgstr "运行合并冲突解决工具以解决合并冲突"
 
-#: command-list.h:131
+#: command-list.h
 msgid "Creates a tag object with extra validation"
 msgstr "创建一个有额外验证的标签对象"
 
-#: command-list.h:132
+#: command-list.h
 msgid "Build a tree-object from ls-tree formatted text"
 msgstr "基于 ls-tree 的格式化文本创建一个树对象"
 
-#: command-list.h:133
+#: command-list.h
 msgid "Write and verify multi-pack-indexes"
 msgstr "写入和校验多包索引"
 
-#: command-list.h:134
+#: command-list.h
 msgid "Move or rename a file, a directory, or a symlink"
 msgstr "移动或重命名一个文件、目录或符号链接"
 
 # 查找给定版本的符号名称
-#: command-list.h:135
+#: command-list.h
 msgid "Find symbolic names for given revs"
 msgstr "查找给定版本的符号名称"
 
-#: command-list.h:136
+#: command-list.h
 msgid "Add or inspect object notes"
 msgstr "添加或检查对象注释"
 
-#: command-list.h:137
+#: command-list.h
 msgid "Import from and submit to Perforce repositories"
 msgstr "导入和提交到 Perforce 仓库中"
 
-#: command-list.h:138
+#: command-list.h
 msgid "Create a packed archive of objects"
 msgstr "创建对象的存档包"
 
-#: command-list.h:139
+#: command-list.h
 msgid "Find redundant pack files"
 msgstr "查找冗余的包文件"
 
-#: command-list.h:140
+#: command-list.h
 msgid "Pack heads and tags for efficient repository access"
 msgstr "打包头和标签以实现高效的仓库访问"
 
-#: command-list.h:141
+#: command-list.h
 msgid "Compute unique ID for a patch"
 msgstr "计算一个补丁的唯一 ID"
 
-#: command-list.h:142
+#: command-list.h
 msgid "Prune all unreachable objects from the object database"
 msgstr "删除对象库中所有不可达对象"
 
-#: command-list.h:143
+#: command-list.h
 msgid "Remove extra objects that are already in pack files"
 msgstr "删除已经在包文件中的多余对象"
 
-#: command-list.h:144
+#: command-list.h
 msgid "Fetch from and integrate with another repository or a local branch"
 msgstr "获取并整合另外的仓库或一个本地分支"
 
-#: command-list.h:145
+#: command-list.h
 msgid "Update remote refs along with associated objects"
 msgstr "更新远程引用和相关的对象"
 
-#: command-list.h:146
+#: command-list.h
 msgid "Applies a quilt patchset onto the current branch"
 msgstr "将一个 quilt 补丁集应用到当前分支。"
 
-#: command-list.h:147
+#: command-list.h
 msgid "Compare two commit ranges (e.g. two versions of a branch)"
 msgstr "比较两个提交范围（如一个分支的两个版本）"
 
-#: command-list.h:148
+#: command-list.h
 msgid "Reads tree information into the index"
 msgstr "将树信息读取到索引"
 
-#: command-list.h:149
+#: command-list.h
 msgid "Reapply commits on top of another base tip"
 msgstr "在另一个分支上重新应用提交"
 
-#: command-list.h:150
+#: command-list.h
 msgid "Receive what is pushed into the repository"
 msgstr "接收推送到仓库中的对象"
 
-#: command-list.h:151
+#: command-list.h
 msgid "Manage reflog information"
 msgstr "管理 reflog 信息"
 
-#: command-list.h:152
+#: command-list.h
 msgid "Manage set of tracked repositories"
 msgstr "管理已跟踪仓库"
 
-#: command-list.h:153
+#: command-list.h
 msgid "Pack unpacked objects in a repository"
 msgstr "打包仓库中未打包对象"
 
-#: command-list.h:154
+#: command-list.h
 msgid "Create, list, delete refs to replace objects"
 msgstr "创建、列出、删除对象替换引用"
 
-#: command-list.h:155
+#: command-list.h
 msgid "Generates a summary of pending changes"
 msgstr "生成待定更改的摘要"
 
-#: command-list.h:156
+#: command-list.h
 msgid "Reuse recorded resolution of conflicted merges"
 msgstr "重用冲突合并的解决方案记录"
 
-#: command-list.h:157
+#: command-list.h
 msgid "Reset current HEAD to the specified state"
 msgstr "重置当前 HEAD 到指定状态"
 
-#: command-list.h:158
+#: command-list.h
 msgid "Restore working tree files"
 msgstr "恢复工作区文件"
 
-#: command-list.h:159
+#: command-list.h
 msgid "Lists commit objects in reverse chronological order"
 msgstr "按时间顺序列出提交对象"
 
-#: command-list.h:160
+#: command-list.h
 msgid "Pick out and massage parameters"
 msgstr "选出并处理参数"
 
-#: command-list.h:161
+#: command-list.h
 msgid "Revert some existing commits"
 msgstr "回退一些现存提交"
 
-#: command-list.h:162
+#: command-list.h
 msgid "Remove files from the working tree and from the index"
 msgstr "从工作区和索引中删除文件"
 
-#: command-list.h:163
+#: command-list.h
 msgid "Send a collection of patches as emails"
 msgstr "通过电子邮件发送一组补丁"
 
-#: command-list.h:164
+#: command-list.h
 msgid "Push objects over Git protocol to another repository"
 msgstr "使用 Git 协议推送对象到另一个仓库"
 
-#: command-list.h:165
+#: command-list.h
 msgid "Git's i18n setup code for shell scripts"
 msgstr "为 shell 脚本准备的 Git 国际化设置代码"
 
-#: command-list.h:166
+#: command-list.h
 msgid "Common Git shell script setup code"
 msgstr "常用的 Git shell 脚本设置代码"
 
-#: command-list.h:167
+#: command-list.h
 msgid "Restricted login shell for Git-only SSH access"
 msgstr "只允许 Git SSH 访问的受限登录shell"
 
-#: command-list.h:168
+#: command-list.h
 msgid "Summarize 'git log' output"
 msgstr "'git log' 输出摘要"
 
-#: command-list.h:169
+#: command-list.h
 msgid "Show various types of objects"
 msgstr "显示各种类型的对象"
 
-#: command-list.h:170
+#: command-list.h
 msgid "Show branches and their commits"
 msgstr "显示分支和提交"
 
-#: command-list.h:171
+#: command-list.h
 msgid "Show packed archive index"
 msgstr "显示打包归档索引"
 
-#: command-list.h:172
+#: command-list.h
 msgid "List references in a local repository"
 msgstr "显示本地仓库中的引用"
 
 #  译者：中文字符串拼接，可删除前导空格
-#: command-list.h:173
+#: command-list.h
 msgid "Reduce your working tree to a subset of tracked files"
 msgstr "将您的工作树缩减至已追踪文件的子集"
 
-#: command-list.h:174
+#: command-list.h
 msgid "Add file contents to the staging area"
 msgstr "将文件内容添加到暂存区"
 
-#: command-list.h:175
+#: command-list.h
 msgid "Stash the changes in a dirty working directory away"
 msgstr "贮藏脏工作区中的修改"
 
-#: command-list.h:176
+#: command-list.h
 msgid "Show the working tree status"
 msgstr "显示工作区状态"
 
-#: command-list.h:177
+#: command-list.h
 msgid "Remove unnecessary whitespace"
 msgstr "删除不必要的空白字符"
 
-#: command-list.h:178
+#: command-list.h
 msgid "Initialize, update or inspect submodules"
 msgstr "初始化、更新或检查子模组"
 
-#: command-list.h:179
+#: command-list.h
 msgid "Bidirectional operation between a Subversion repository and Git"
 msgstr "Subersion 仓库和 Git 之间的双向操作"
 
-#: command-list.h:180
+#: command-list.h
 msgid "Switch branches"
 msgstr "切换分支"
 
-#: command-list.h:181
+#: command-list.h
 msgid "Read, modify and delete symbolic refs"
 msgstr "读取、修改和删除符号引用"
 
-#: command-list.h:182
+#: command-list.h
 msgid "Create, list, delete or verify a tag object signed with GPG"
 msgstr "创建、列出、删除或校验一个 GPG 签名的标签对象"
 
-#: command-list.h:183
+#: command-list.h
 msgid "Creates a temporary file with a blob's contents"
 msgstr "用 blob 数据对象的内容创建一个临时文件"
 
-#: command-list.h:184
+#: command-list.h
 msgid "Unpack objects from a packed archive"
 msgstr "从打包文件中解压缩对象"
 
-#: command-list.h:185
+#: command-list.h
 msgid "Register file contents in the working tree to the index"
 msgstr "将工作区的文件内容注册到索引"
 
-#: command-list.h:186
+#: command-list.h
 msgid "Update the object name stored in a ref safely"
 msgstr "安全地更新存储于引用中的对象名称"
 
-#: command-list.h:187
+#: command-list.h
 msgid "Update auxiliary info file to help dumb servers"
 msgstr "更新辅助信息文件以帮助哑协议服务"
 
-#: command-list.h:188
+#: command-list.h
 msgid "Send archive back to git-archive"
 msgstr "将存档发送回 git-archive"
 
-#: command-list.h:189
+#: command-list.h
 msgid "Send objects packed back to git-fetch-pack"
 msgstr "将对象压缩包发送回 git-fetch-pack"
 
-#: command-list.h:190
+#: command-list.h
 msgid "Show a Git logical variable"
 msgstr "显示一个Git逻辑变量"
 
-#: command-list.h:191
+#: command-list.h
 msgid "Check the GPG signature of commits"
 msgstr "检查 GPG 提交签名"
 
-#: command-list.h:192
+#: command-list.h
 msgid "Validate packed Git archive files"
 msgstr "校验打包的Git存仓文件"
 
-#: command-list.h:193
+#: command-list.h
 msgid "Check the GPG signature of tags"
 msgstr "检查标签的 GPG 签名"
 
-#: command-list.h:194
+#: command-list.h
 msgid "Show logs with difference each commit introduces"
 msgstr "显示每一个提交引入的差异日志"
 
-#: command-list.h:195
+#: command-list.h
 msgid "Manage multiple working trees"
 msgstr "管理多个工作区"
 
-#: command-list.h:196
+#: command-list.h
 msgid "Create a tree object from the current index"
 msgstr "从当前索引创建一个树对象"
 
-#: command-list.h:197
+#: command-list.h
 msgid "Defining attributes per path"
 msgstr "定义路径的属性"
 
-#: command-list.h:198
+#: command-list.h
 msgid "Git command-line interface and conventions"
 msgstr "Git 命令行界面和约定"
 
-#: command-list.h:199
+#: command-list.h
 msgid "A Git core tutorial for developers"
 msgstr "面向开发人员的 Git 核心教程"
 
-#: command-list.h:200
+#: command-list.h
 msgid "Providing usernames and passwords to Git"
 msgstr "为 Git 提供用户名和口令"
 
-#: command-list.h:201
+#: command-list.h
 msgid "Git for CVS users"
 msgstr "适合 CVS 用户的 Git 帮助"
 
-#: command-list.h:202
+#: command-list.h
 msgid "Tweaking diff output"
 msgstr "调整差异输出"
 
-#: command-list.h:203
+#: command-list.h
 msgid "A useful minimum set of commands for Everyday Git"
 msgstr "每一天 Git 的一组有用的最小命令集合"
 
-#: command-list.h:204
+#: command-list.h
 msgid "Frequently asked questions about using Git"
 msgstr "关于使用 Git 的常见问题"
 
-#: command-list.h:205
+#: command-list.h
 msgid "A Git Glossary"
 msgstr "Git 词汇表"
 
-#: command-list.h:206
+#: command-list.h
 msgid "Hooks used by Git"
 msgstr "Git 使用的钩子"
 
-#: command-list.h:207
+#: command-list.h
 msgid "Specifies intentionally untracked files to ignore"
 msgstr "忽略指定的未跟踪文件"
 
-#: command-list.h:208
+#: command-list.h
 msgid "The Git repository browser"
 msgstr "Git 仓库浏览器"
 
-#: command-list.h:209
+#: command-list.h
 msgid "Map author/committer names and/or E-Mail addresses"
 msgstr "映射作者/提交者的名称和/或邮件地址"
 
-#: command-list.h:210
+#: command-list.h
 msgid "Defining submodule properties"
 msgstr "定义子模组属性"
 
-#: command-list.h:211
+#: command-list.h
 msgid "Git namespaces"
 msgstr "Git 名字空间"
 
-#: command-list.h:212
+#: command-list.h
 msgid "Helper programs to interact with remote repositories"
 msgstr "与远程仓库交互的助手程序"
 
-#: command-list.h:213
+#: command-list.h
 msgid "Git Repository Layout"
 msgstr "Git 仓库布局"
 
-#: command-list.h:214
+#: command-list.h
 msgid "Specifying revisions and ranges for Git"
 msgstr "指定 Git 的版本和版本范围"
 
-#: command-list.h:215
+#: command-list.h
 msgid "Mounting one repository inside another"
 msgstr "将一个仓库安装到另外一个仓库中"
 
-#: command-list.h:216
+#: command-list.h
 msgid "A tutorial introduction to Git"
 msgstr "Git 入门教程"
 
-#: command-list.h:217
+#: command-list.h
 msgid "A tutorial introduction to Git: part two"
 msgstr "Git 入门教程：第二部分"
 
-#: command-list.h:218
+#: command-list.h
 msgid "Git web interface (web frontend to Git repositories)"
 msgstr "Git web 界面（Git 仓库的 web 前端）"
 
-#: command-list.h:219
+#: command-list.h
 msgid "An overview of recommended workflows with Git"
 msgstr "Git 推荐的工作流概览"
 
-#: git-merge-octopus.sh:46
+#: commit-graph.c
+msgid "commit-graph file is too small"
+msgstr "提交图形文件太小"
+
+#: commit-graph.c
+#, c-format
+msgid "commit-graph signature %X does not match signature %X"
+msgstr "提交图形签名 %X 和签名 %X 不匹配"
+
+#: commit-graph.c
+#, c-format
+msgid "commit-graph version %X does not match version %X"
+msgstr "提交图形版本 %X 和版本 %X 不匹配"
+
+#: commit-graph.c
+#, c-format
+msgid "commit-graph hash version %X does not match version %X"
+msgstr "提交图形哈希版本 %X 和版本 %X 不匹配"
+
+#: commit-graph.c
+#, c-format
+msgid "commit-graph file is too small to hold %u chunks"
+msgstr "提交图形文件太小，容不下 %u 个块"
+
+#: commit-graph.c
+msgid "commit-graph has no base graphs chunk"
+msgstr "提交图形没有基础图形块"
+
+#: commit-graph.c
+msgid "commit-graph chain does not match"
+msgstr "提交图形链不匹配"
+
+#: commit-graph.c
+#, c-format
+msgid "invalid commit-graph chain: line '%s' not a hash"
+msgstr "无效的提交图形链：行 '%s' 不是一个哈希值"
+
+#: commit-graph.c
+msgid "unable to find all commit-graph files"
+msgstr "无法找到所有提交图形文件"
+
+#: commit-graph.c
+msgid "invalid commit position. commit-graph is likely corrupt"
+msgstr "无效的提交位置。提交图形可能已损坏"
+
+#: commit-graph.c
+#, c-format
+msgid "could not find commit %s"
+msgstr "无法找到提交 %s"
+
+#: commit-graph.c
+msgid "commit-graph requires overflow generation data but has none"
+msgstr "提交图需要溢出世代数据，但是没有"
+
+#: commit-graph.c
+msgid "Loading known commits in commit graph"
+msgstr "正在加载提交图中的已知提交"
+
+#: commit-graph.c
+msgid "Expanding reachable commits in commit graph"
+msgstr "正在扩展提交图中的可达提交"
+
+#: commit-graph.c
+msgid "Clearing commit marks in commit graph"
+msgstr "正在清除提交图中的提交标记"
+
+#: commit-graph.c
+msgid "Computing commit graph topological levels"
+msgstr "正在计算提交图拓扑级别"
+
+#: commit-graph.c
+msgid "Computing commit graph generation numbers"
+msgstr "正在计算提交图世代数字"
+
+#: commit-graph.c
+msgid "Computing commit changed paths Bloom filters"
+msgstr "计算提交变更路径的布隆过滤器"
+
+#: commit-graph.c
+msgid "Collecting referenced commits"
+msgstr "正在收集引用的提交"
+
+#: commit-graph.c
+#, c-format
+msgid "Finding commits for commit graph in %<PRIuMAX> pack"
+msgid_plural "Finding commits for commit graph in %<PRIuMAX> packs"
+msgstr[0] "正在 %<PRIuMAX> 个包中查找提交图的提交"
+msgstr[1] "正在 %<PRIuMAX> 个包中查找提交图的提交"
+
+#: commit-graph.c
+#, c-format
+msgid "error adding pack %s"
+msgstr "添加包 %s 出错"
+
+#: commit-graph.c
+#, c-format
+msgid "error opening index for %s"
+msgstr "为 %s 打开索引出错"
+
+#: commit-graph.c
+msgid "Finding commits for commit graph among packed objects"
+msgstr "正在打包对象中查找提交图的提交"
+
+#: commit-graph.c
+msgid "Finding extra edges in commit graph"
+msgstr "正在查找提交图中额外的边"
+
+#: commit-graph.c
+msgid "failed to write correct number of base graph ids"
+msgstr "无法写入正确数量的基础图形 ID"
+
+#: commit-graph.c
+msgid "unable to create temporary graph layer"
+msgstr "无法创建临时图层"
+
+#: commit-graph.c
+#, c-format
+msgid "unable to adjust shared permissions for '%s'"
+msgstr "无法为 '%s' 调整共享权限"
+
+#: commit-graph.c
+#, 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
+msgid "unable to open commit-graph chain file"
+msgstr "无法打开提交图形链文件"
+
+#: commit-graph.c
+msgid "failed to rename base commit-graph file"
+msgstr "无法重命名基础提交图形文件"
+
+#: commit-graph.c
+msgid "failed to rename temporary commit-graph file"
+msgstr "无法重命名临时提交图形文件"
+
+#: commit-graph.c
+msgid "Scanning merged commits"
+msgstr "正在扫描合并提交"
+
+#: commit-graph.c
+msgid "Merging commit-graph"
+msgstr "正在合并提交图形"
+
+#: commit-graph.c
+msgid "attempting to write a commit-graph, but 'core.commitGraph' is disabled"
+msgstr "正尝试写提交图，但是 'core.commitGraph' 被禁用"
+
+#: commit-graph.c
+msgid "too many commits to write graph"
+msgstr "提交太多不能画图"
+
+#: commit-graph.c
+msgid "the commit-graph file has incorrect checksum and is likely corrupt"
+msgstr "提交图文件的校验码错误，可能已经损坏"
+
+#: commit-graph.c
+#, c-format
+msgid "commit-graph has incorrect OID order: %s then %s"
+msgstr "提交图形的对象 ID 顺序不正确：%s 然后 %s"
+
+#: commit-graph.c
+#, c-format
+msgid "commit-graph has incorrect fanout value: fanout[%d] = %u != %u"
+msgstr "提交图形有不正确的扇出值：fanout[%d] = %u != %u"
+
+#: commit-graph.c
+#, c-format
+msgid "failed to parse commit %s from commit-graph"
+msgstr "无法从提交图形中解析提交 %s"
+
+#: commit-graph.c
+msgid "Verifying commits in commit graph"
+msgstr "正在校验提交图中的提交"
+
+#: commit-graph.c
+#, c-format
+msgid "failed to parse commit %s from object database for commit-graph"
+msgstr "无法从提交图形的对象库中解析提交 %s"
+
+#: commit-graph.c
+#, c-format
+msgid "root tree OID for commit %s in commit-graph is %s != %s"
+msgstr "提交图形中的提交 %s 的根树对象 ID 是 %s != %s"
+
+#: commit-graph.c
+#, c-format
+msgid "commit-graph parent list for commit %s is too long"
+msgstr "提交 %s 的提交图形父提交列表太长了"
+
+#: commit-graph.c
+#, c-format
+msgid "commit-graph parent for %s is %s != %s"
+msgstr "%s 的提交图形父提交是 %s != %s"
+
+#: commit-graph.c
+#, c-format
+msgid "commit-graph parent list for commit %s terminates early"
+msgstr "提交 %s 的提交图形父提交列表过早终止"
+
+#: commit-graph.c
+#, c-format
+msgid ""
+"commit-graph has generation number zero for commit %s, but non-zero elsewhere"
+msgstr "提交图形中提交 %s 的世代号是零，但其它地方非零"
+
+#: commit-graph.c
+#, c-format
+msgid ""
+"commit-graph has non-zero generation number for commit %s, but zero elsewhere"
+msgstr "提交图形中提交 %s 的世代号非零，但其它地方是零"
+
+#: commit-graph.c
+#, c-format
+msgid "commit-graph generation for commit %s is %<PRIuMAX> < %<PRIuMAX>"
+msgstr "提交图形中的提交 %s 的世代号是 %<PRIuMAX> < %<PRIuMAX>"
+
+#: commit-graph.c
+#, c-format
+msgid "commit date for commit %s in commit-graph is %<PRIuMAX> != %<PRIuMAX>"
+msgstr "提交图形中提交 %s 的提交日期是 %<PRIuMAX> != %<PRIuMAX>"
+
+#: commit.c
+#, c-format
+msgid "%s %s is not a commit!"
+msgstr "%s %s 不是一个提交！"
+
+#: commit.c
+msgid ""
+"Support for <GIT_DIR>/info/grafts is deprecated\n"
+"and will be removed in a future Git version.\n"
+"\n"
+"Please use \"git replace --convert-graft-file\"\n"
+"to convert the grafts into replace refs.\n"
+"\n"
+"Turn this message off by running\n"
+"\"git config advice.graftFileDeprecated false\""
+msgstr ""
+"对 <GIT_DIR>/info/grafts 的支持已过时，并将在\n"
+"未来的Git版本中被移除。\n"
+"\n"
+"请使用 \"git replace --convert-graft-file\" 将\n"
+"grafts 转换为替换引用。\n"
+"\n"
+"设置 \"git config advice.graftFileDeprecated false\"\n"
+"可关闭本消息"
+
+#: commit.c
+#, c-format
+msgid "Commit %s has an untrusted GPG signature, allegedly by %s."
+msgstr "提交 %s 有一个非可信的声称来自 %s 的 GPG 签名。"
+
+#: commit.c
+#, c-format
+msgid "Commit %s has a bad GPG signature allegedly by %s."
+msgstr "提交 %s 有一个错误的声称来自 %s 的 GPG 签名。"
+
+#: commit.c
+#, c-format
+msgid "Commit %s does not have a GPG signature."
+msgstr "提交 %s 没有 GPG 签名。"
+
+#: commit.c
+#, c-format
+msgid "Commit %s has a good GPG signature by %s\n"
+msgstr "提交 %s 有一个来自 %s 的好的 GPG 签名。\n"
+
+#: commit.c
+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"
+"variable i18n.commitEncoding to the encoding your project uses.\n"
+msgstr ""
+"警告：提交说明不符合 UTF-8 字符编码。\n"
+"您可以通过修补提交来改正提交说明，或者将配置变量 i18n.commitEncoding\n"
+"设置为您项目所用的字符编码。\n"
+
+#: compat/compiler.h
+msgid "no compiler information available\n"
+msgstr "编译器信息不可用\n"
+
+#: compat/compiler.h
+msgid "no libc information available\n"
+msgstr "libc 信息不可用\n"
+
+#: compat/fsmonitor/fsm-health-win32.c
+#, c-format
+msgid "[GLE %ld] health thread could not open '%ls'"
+msgstr "[GLE %ld] 健康监测线程不能打开 '%ls'"
+
+#: compat/fsmonitor/fsm-health-win32.c
+#, c-format
+msgid "[GLE %ld] health thread getting BHFI for '%ls'"
+msgstr "[GLE %ld] 健康监测线程正在获取 '%ls' 的 BHFI"
+
+#: compat/fsmonitor/fsm-health-win32.c compat/fsmonitor/fsm-listen-win32.c
+#, c-format
+msgid "could not convert to wide characters: '%s'"
+msgstr "不能转换至宽字符：'%s'"
+
+#: compat/fsmonitor/fsm-health-win32.c
+#, c-format
+msgid "BHFI changed '%ls'"
+msgstr "BHFI 已改变 '%ls'"
+
+#: compat/fsmonitor/fsm-health-win32.c
+#, c-format
+msgid "unhandled case in 'has_worktree_moved': %d"
+msgstr "'has_worktree_moved' 中未处理的情况：%d"
+
+#: compat/fsmonitor/fsm-health-win32.c
+#, c-format
+msgid "health thread wait failed [GLE %ld]"
+msgstr "健康监测线程等待失败 [GLE %ld]"
+
+#: compat/fsmonitor/fsm-listen-darwin.c
+msgid "Unable to create FSEventStream."
+msgstr "无法创建 FSEventStream。"
+
+#: compat/fsmonitor/fsm-listen-darwin.c
+msgid "Failed to start the FSEventStream"
+msgstr "无法启动 FSEventStream"
+
+#: compat/fsmonitor/fsm-listen-win32.c
+#, c-format
+msgid "[GLE %ld] could not convert path to UTF-8: '%.*ls'"
+msgstr "[GLE %ld] 无法将路径转换至 UTF-8：'%.*ls'"
+
+#: compat/fsmonitor/fsm-listen-win32.c
+#, c-format
+msgid "[GLE %ld] could not watch '%s'"
+msgstr "[GLE %ld] 无法监视 '%s'"
+
+#: compat/fsmonitor/fsm-listen-win32.c
+#, c-format
+msgid "[GLE %ld] could not get longname of '%s'"
+msgstr "[GLE %ld] 无法获取 '%s' 的长名称"
+
+#: compat/fsmonitor/fsm-listen-win32.c
+#, c-format
+msgid "ReadDirectoryChangedW failed on '%s' [GLE %ld]"
+msgstr "ReadDirectoryChangedW 失败于 '%s' [GLE %ld]"
+
+#: compat/fsmonitor/fsm-listen-win32.c
+#, c-format
+msgid "GetOverlappedResult failed on '%s' [GLE %ld]"
+msgstr "GetOverlappedResult 失败于 '%s' [GLE %ld]"
+
+#: compat/fsmonitor/fsm-listen-win32.c
+#, c-format
+msgid "could not read directory changes [GLE %ld]"
+msgstr "无法获取目录变更 [GLE %ld]"
+
+#: compat/mingw.c
+#, c-format
+msgid "failed to copy SID (%ld)"
+msgstr "无法拷贝 SID (%ld)"
+
+#: compat/mingw.c
+#, c-format
+msgid "failed to get owner for '%s' (%ld)"
+msgstr "无法获取 '%s' 的所有者 (%ld)"
+
+#: compat/obstack.c
+msgid "memory exhausted"
+msgstr "内存耗尽"
+
+#: compat/regex/regcomp.c
+msgid "Success"
+msgstr "成功"
+
+#: compat/regex/regcomp.c
+msgid "No match"
+msgstr "无匹配"
+
+#: compat/regex/regcomp.c
+msgid "Invalid regular expression"
+msgstr "无效的正则表达式"
+
+#: compat/regex/regcomp.c
+msgid "Invalid collation character"
+msgstr "无效的集合字符"
+
+#: compat/regex/regcomp.c
+msgid "Invalid character class name"
+msgstr "无效的字符类名"
+
+#: compat/regex/regcomp.c
+msgid "Trailing backslash"
+msgstr "末尾的反斜杠"
+
+#: compat/regex/regcomp.c
+msgid "Invalid back reference"
+msgstr "无效的反向索引"
+
+#: compat/regex/regcomp.c
+msgid "Unmatched [ or [^"
+msgstr "未匹配的 [ 或 [^"
+
+#: compat/regex/regcomp.c
+msgid "Unmatched ( or \\("
+msgstr "未匹配的 ( 或 \\("
+
+#: compat/regex/regcomp.c
+msgid "Unmatched \\{"
+msgstr "未匹配的 \\{"
+
+#: compat/regex/regcomp.c
+msgid "Invalid content of \\{\\}"
+msgstr "\\{\\} 的内容非法"
+
+#: compat/regex/regcomp.c
+msgid "Invalid range end"
+msgstr "无效的范围结尾"
+
+#: compat/regex/regcomp.c
+msgid "Memory exhausted"
+msgstr "内存耗尽"
+
+#: compat/regex/regcomp.c
+msgid "Invalid preceding regular expression"
+msgstr "非法的前置正则表达式"
+
+#: compat/regex/regcomp.c
+msgid "Premature end of regular expression"
+msgstr "正则表达式过早结束"
+
+#: compat/regex/regcomp.c
+msgid "Regular expression too big"
+msgstr "正则表达式太大"
+
+#: compat/regex/regcomp.c
+msgid "Unmatched ) or \\)"
+msgstr "未匹配的 ) 或 \\)"
+
+#: compat/regex/regcomp.c
+msgid "No previous regular expression"
+msgstr "没有上一个正则表达式"
+
+#: compat/simple-ipc/ipc-unix-socket.c compat/simple-ipc/ipc-win32.c
+msgid "could not send IPC command"
+msgstr "无法发送 IPC 命令"
+
+#: compat/simple-ipc/ipc-unix-socket.c compat/simple-ipc/ipc-win32.c
+msgid "could not read IPC response"
+msgstr "无法读取 IPC 响应"
+
+#: compat/simple-ipc/ipc-unix-socket.c
+#, c-format
+msgid "could not start accept_thread '%s'"
+msgstr "无法启动 accept_thread '%s'"
+
+#: compat/simple-ipc/ipc-unix-socket.c
+#, c-format
+msgid "could not start worker[0] for '%s'"
+msgstr "无法启动 '%s' 的 worker[0]"
+
+#: compat/simple-ipc/ipc-win32.c
+#, c-format
+msgid "ConnectNamedPipe failed for '%s' (%lu)"
+msgstr "ConnectNamedPipe 失败于 '%s' (%lu)"
+
+#: compat/simple-ipc/ipc-win32.c
+#, c-format
+msgid "could not create fd from pipe for '%s'"
+msgstr "无法为 '%s' 从管道创建 fd"
+
+#: compat/simple-ipc/ipc-win32.c
+#, c-format
+msgid "could not start thread[0] for '%s'"
+msgstr "无法为 '%s' 启动 thread[0]"
+
+#: compat/simple-ipc/ipc-win32.c
+#, c-format
+msgid "wait for hEvent failed for '%s'"
+msgstr "为 '%s' 等待 hEvent 失败"
+
+#: compat/terminal.c
+msgid "cannot resume in the background, please use 'fg' to resume"
+msgstr "无法从后台中恢复，请使用 'fg' 来恢复"
+
+#: compat/terminal.c
+msgid "cannot restore terminal settings"
+msgstr "无法恢复终端设置"
+
+#: config.c
+#, c-format
+msgid ""
+"exceeded maximum include depth (%d) while including\n"
+"\t%s\n"
+"from\n"
+"\t%s\n"
+"This might be due to circular includes."
+msgstr ""
+"超过了最大包含深度（%1$d），当从\n"
+"\t%3$s\n"
+"包含\n"
+"\t%2$s\n"
+"这可能是因为循环包含。"
+
+#: config.c
+#, c-format
+msgid "could not expand include path '%s'"
+msgstr "无法扩展包含路径 '%s'"
+
+#: config.c
+msgid "relative config includes must come from files"
+msgstr "相对路径的配置文件引用必须来自于文件"
+
+#: config.c
+msgid "relative config include conditionals must come from files"
+msgstr "相对路径的配置文件条件引用必须来自于文件"
+
+#: config.c
+msgid ""
+"remote URLs cannot be configured in file directly or indirectly included by "
+"includeIf.hasconfig:remote.*.url"
+msgstr ""
+"远程 URL 不能在文件中配置，不管直接地还是通过 includeIf.hasconfig:remote.*."
+"url 间接地包含。"
+
+#: config.c
+#, c-format
+msgid "invalid config format: %s"
+msgstr "无效的配置格式：%s"
+
+#: config.c
+#, c-format
+msgid "missing environment variable name for configuration '%.*s'"
+msgstr "配置 '%.*s' 缺少环境变量名称"
+
+#: config.c
+#, c-format
+msgid "missing environment variable '%s' for configuration '%.*s'"
+msgstr "缺少环境变量 '%s' 于配置 '%.*s' "
+
+#: config.c
+#, c-format
+msgid "key does not contain a section: %s"
+msgstr "键名没有包含一个小节名称：%s"
+
+#: config.c
+#, c-format
+msgid "key does not contain variable name: %s"
+msgstr "键名没有包含变量名：%s"
+
+#: config.c sequencer.c
+#, c-format
+msgid "invalid key: %s"
+msgstr "无效键名：%s"
+
+#: config.c
+#, c-format
+msgid "invalid key (newline): %s"
+msgstr "无效键名（有换行符）：%s"
+
+#: config.c
+msgid "empty config key"
+msgstr "空的配置键名"
+
+#: config.c
+#, c-format
+msgid "bogus config parameter: %s"
+msgstr "伪配置参数：%s"
+
+#: config.c
+#, c-format
+msgid "bogus format in %s"
+msgstr "%s 中格式错误"
+
+#: config.c
+#, c-format
+msgid "bogus count in %s"
+msgstr "%s 中错误计数"
+
+#: config.c
+#, c-format
+msgid "too many entries in %s"
+msgstr "%s 中太多的条目"
+
+#: config.c
+#, c-format
+msgid "missing config key %s"
+msgstr "缺失配置键名 %s"
+
+#: config.c
+#, c-format
+msgid "missing config value %s"
+msgstr "缺失配置取值 %s"
+
+#: config.c
+#, c-format
+msgid "bad config line %d in blob %s"
+msgstr "数据对象 %2$s 中错误的配置行 %1$d"
+
+#: config.c
+#, c-format
+msgid "bad config line %d in file %s"
+msgstr "文件 %2$s 中错误的配置行 %1$d"
+
+#: config.c
+#, c-format
+msgid "bad config line %d in standard input"
+msgstr "标准输入中错误的配置行 %d"
+
+#: config.c
+#, c-format
+msgid "bad config line %d in submodule-blob %s"
+msgstr "子模组数据对象 %2$s 中错误的配置行 %1$d"
+
+#: config.c
+#, c-format
+msgid "bad config line %d in command line %s"
+msgstr "命令行 %2$s 中错误的配置行 %1$d"
+
+#: config.c
+#, c-format
+msgid "bad config line %d in %s"
+msgstr "在 %2$s 中错误的配置行 %1$d"
+
+#: config.c
+msgid "out of range"
+msgstr "超出范围"
+
+#: config.c
+msgid "invalid unit"
+msgstr "无效的单位"
+
+#: config.c
+#, c-format
+msgid "bad numeric config value '%s' for '%s': %s"
+msgstr "配置变量 '%2$s' 的数字取值 '%1$s' 设置错误：%3$s"
+
+#: config.c
+#, 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
+#, 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
+#, c-format
+msgid "bad numeric config value '%s' for '%s' in standard input: %s"
+msgstr "标准输入中配置变量 '%2$s' 错误的取值 '%1$s'：%3$s"
+
+#: config.c
+#, 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
+#, 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
+#, c-format
+msgid "bad numeric config value '%s' for '%s' in %s: %s"
+msgstr "在 %3$s 中配置变量 '%2$s' 错误的取值 '%1$s'：%4$s"
+
+#: config.c
+#, c-format
+msgid "invalid value for variable %s"
+msgstr "变量 %s 的值无效"
+
+#: config.c
+#, c-format
+msgid "ignoring unknown core.fsync component '%s'"
+msgstr "忽略未知的 core.fsync 组件 '%s'"
+
+#: config.c
+#, c-format
+msgid "bad boolean config value '%s' for '%s'"
+msgstr "'%2$s' 的错误的布尔取值 '%1$s'"
+
+#: config.c
+#, c-format
+msgid "failed to expand user dir in: '%s'"
+msgstr "无法扩展用户目录：'%s'"
+
+#: config.c
+#, c-format
+msgid "'%s' for '%s' is not a valid timestamp"
+msgstr "'%2$s' 的值 '%1$s' 不是一个有效的时间戳"
+
+#: config.c
+#, c-format
+msgid "abbrev length out of range: %d"
+msgstr "缩写长度超出范围：%d"
+
+#: config.c
+#, c-format
+msgid "bad zlib compression level %d"
+msgstr "错误的 zlib 压缩级别 %d"
+
+#: config.c
+msgid "core.commentChar should only be one character"
+msgstr "core.commentChar 应该是一个字符"
+
+#: config.c
+#, c-format
+msgid "ignoring unknown core.fsyncMethod value '%s'"
+msgstr "忽略未知的 core.fsyncMethod 值 '%s'"
+
+#: config.c
+msgid "core.fsyncObjectFiles is deprecated; use core.fsync instead"
+msgstr "core.fsyncObjectFiles 已经被弃用；取而代之使用 core.fsync"
+
+#: config.c
+#, c-format
+msgid "invalid mode for object creation: %s"
+msgstr "无效的对象创建模式：%s"
+
+#: config.c
+#, c-format
+msgid "malformed value for %s"
+msgstr "%s 的取值格式错误"
+
+#: config.c
+#, c-format
+msgid "malformed value for %s: %s"
+msgstr "%s 的取值格式错误：%s"
+
+#: config.c
+msgid "must be one of nothing, matching, simple, upstream or current"
+msgstr "必须是其中之一：nothing、matching、simple、upstream 或 current"
+
+#: config.c
+#, c-format
+msgid "unable to load config blob object '%s'"
+msgstr "无法从数据对象 '%s' 加载配置"
+
+#: config.c
+#, c-format
+msgid "reference '%s' does not point to a blob"
+msgstr "引用 '%s' 没有指向一个数据对象"
+
+#: config.c
+#, c-format
+msgid "unable to resolve config blob '%s'"
+msgstr "不能解析配置对象 '%s'"
+
+#: config.c
+#, c-format
+msgid "failed to parse %s"
+msgstr "无法解析 %s"
+
+#: config.c
+msgid "unable to parse command-line config"
+msgstr "无法解析命令行中的配置"
+
+#: config.c
+msgid "unknown error occurred while reading the configuration files"
+msgstr "在读取配置文件时遇到未知错误"
+
+#: config.c
+#, c-format
+msgid "Invalid %s: '%s'"
+msgstr "无效 %s：'%s'"
+
+#: config.c
+#, c-format
+msgid "splitIndex.maxPercentChange value '%d' should be between 0 and 100"
+msgstr "splitIndex.maxPercentChange 的取值 '%d' 应该介于 0 和 100 之间"
+
+#: config.c
+#, c-format
+msgid "unable to parse '%s' from command-line config"
+msgstr "无法解析命令行配置中的 '%s'"
+
+#: config.c
+#, c-format
+msgid "bad config variable '%s' in file '%s' at line %d"
+msgstr "在文件 '%2$s' 的第 %3$d 行发现错误的配置变量 '%1$s'"
+
+#: config.c
+#, c-format
+msgid "invalid section name '%s'"
+msgstr "无效的小节名称 '%s'"
+
+#: config.c
+#, c-format
+msgid "%s has multiple values"
+msgstr "%s 有多个取值"
+
+#: config.c
+#, c-format
+msgid "failed to write new configuration file %s"
+msgstr "无法写入新的配置文件 %s"
+
+#: config.c
+#, c-format
+msgid "could not lock config file %s"
+msgstr "不能锁定配置文件 %s"
+
+#: config.c
+#, c-format
+msgid "opening %s"
+msgstr "打开 %s"
+
+#: config.c
+#, c-format
+msgid "invalid config file %s"
+msgstr "无效的配置文件 %s"
+
+#: config.c
+#, c-format
+msgid "fstat on %s failed"
+msgstr "对 %s 调用 fstat 失败"
+
+#: config.c
+#, c-format
+msgid "unable to mmap '%s'%s"
+msgstr "不能 mmap '%s'%s"
+
+#: config.c
+#, c-format
+msgid "chmod on %s failed"
+msgstr "对 %s 调用 chmod 失败"
+
+#: config.c
+#, c-format
+msgid "could not write config file %s"
+msgstr "不能写入配置文件 %s"
+
+#: config.c
+#, c-format
+msgid "could not set '%s' to '%s'"
+msgstr "不能设置 '%s' 为 '%s'"
+
+#: config.c
+#, c-format
+msgid "invalid section name: %s"
+msgstr "无效的小节名称：%s"
+
+#: config.c
+#, c-format
+msgid "missing value for '%s'"
+msgstr "%s 的取值缺失"
+
+#: connect.c
+msgid "the remote end hung up upon initial contact"
+msgstr "远端在初始连接时即挂断"
+
+#: connect.c
+msgid ""
+"Could not read from remote repository.\n"
+"\n"
+"Please make sure you have the correct access rights\n"
+"and the repository exists."
+msgstr ""
+"无法读取远程仓库。\n"
+"\n"
+"请确认您有正确的访问权限并且仓库存在。"
+
+#: connect.c
+#, c-format
+msgid "server doesn't support '%s'"
+msgstr "服务器不支持 '%s'"
+
+#: connect.c
+#, c-format
+msgid "server doesn't support feature '%s'"
+msgstr "服务器不支持特性 '%s'"
+
+#: connect.c
+msgid "expected flush after capabilities"
+msgstr "在能力之后应为一个 flush 包"
+
+#: connect.c
+#, c-format
+msgid "ignoring capabilities after first line '%s'"
+msgstr "忽略第一行 '%s' 之后的能力字段"
+
+#: connect.c
+msgid "protocol error: unexpected capabilities^{}"
+msgstr "协议错误：意外的 capabilities^{}"
+
+#: connect.c
+#, c-format
+msgid "protocol error: expected shallow sha-1, got '%s'"
+msgstr "协议错误：预期浅克隆 sha-1，却得到 '%s'"
+
+#: connect.c
+msgid "repository on the other end cannot be shallow"
+msgstr "另一端的仓库不能是浅克隆仓库"
+
+#: connect.c
+msgid "invalid packet"
+msgstr "无效数据包"
+
+#: connect.c
+#, c-format
+msgid "protocol error: unexpected '%s'"
+msgstr "协议错误：意外的 '%s'"
+
+#: connect.c
+#, c-format
+msgid "unknown object format '%s' specified by server"
+msgstr "服务器给出未知的对象格式 '%s'"
+
+#: connect.c
+#, c-format
+msgid "invalid ls-refs response: %s"
+msgstr "无效的 ls-refs 响应：%s"
+
+#: connect.c
+msgid "expected flush after ref listing"
+msgstr "在引用列表之后应该有一个 flush 包"
+
+#: connect.c
+msgid "expected response end packet after ref listing"
+msgstr "在引用列表之后应该有响应结束包"
+
+#: connect.c
+#, c-format
+msgid "protocol '%s' is not supported"
+msgstr "不支持 '%s' 协议"
+
+#: connect.c
+msgid "unable to set SO_KEEPALIVE on socket"
+msgstr "无法为 socket 设置 SO_KEEPALIVE"
+
+#: connect.c
+#, c-format
+msgid "Looking up %s ... "
+msgstr "查找 %s ..."
+
+#: connect.c
+#, 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
+#, c-format
+msgid ""
+"done.\n"
+"Connecting to %s (port %s) ... "
+msgstr ""
+"完成。\n"
+"连接到 %s（端口 %s）... "
+
+#: connect.c
+#, c-format
+msgid ""
+"unable to connect to %s:\n"
+"%s"
+msgstr ""
+"无法连接到 %s：\n"
+"%s"
+
+#. TRANSLATORS: this is the end of "Connecting to %s (port %s) ... "
+#: connect.c
+msgid "done."
+msgstr "完成。"
+
+#: connect.c
+#, c-format
+msgid "unable to look up %s (%s)"
+msgstr "无法查找 %s（%s）"
+
+#: connect.c
+#, c-format
+msgid "unknown port %s"
+msgstr "未知端口 %s"
+
+#: connect.c
+#, c-format
+msgid "strange hostname '%s' blocked"
+msgstr "已阻止奇怪的主机名 '%s'"
+
+#: connect.c
+#, c-format
+msgid "strange port '%s' blocked"
+msgstr "已阻止奇怪的端口号 '%s'"
+
+#: connect.c
+#, c-format
+msgid "cannot start proxy %s"
+msgstr "不能启动代理 %s"
+
+#: connect.c
+msgid "no path specified; see 'git help pull' for valid url syntax"
+msgstr "未指定路径，执行 'git help pull' 查看有效的 url 语法"
+
+#: connect.c
+msgid "newline is forbidden in git:// hosts and repo paths"
+msgstr "在 git:// 主机和仓库路径中禁止使用换行符"
+
+#: connect.c
+msgid "ssh variant 'simple' does not support -4"
+msgstr "ssh 变体 'simple' 不支持 -4"
+
+#: connect.c
+msgid "ssh variant 'simple' does not support -6"
+msgstr "ssh 变体 'simple' 不支持 -6"
+
+#: connect.c
+msgid "ssh variant 'simple' does not support setting port"
+msgstr "ssh 变体 'simple' 不支持设置端口"
+
+#: connect.c
+#, c-format
+msgid "strange pathname '%s' blocked"
+msgstr "已阻止奇怪的路径名 '%s'"
+
+#: connect.c
+msgid "unable to fork"
+msgstr "无法 fork"
+
+#: connected.c
+msgid "Could not run 'git rev-list'"
+msgstr "不能执行 'git rev-list'"
+
+#: connected.c
+msgid "failed write to rev-list"
+msgstr "写入 rev-list 失败"
+
+#: connected.c
+msgid "failed to close rev-list's stdin"
+msgstr "无法关闭 rev-list 的标准输入"
+
+#: contrib/scalar/scalar.c worktree.c
+#, c-format
+msgid "'%s' does not exist"
+msgstr "'%s' 不存在"
+
+#: contrib/scalar/scalar.c
+msgid "need a working directory"
+msgstr "需要一个工作目录"
+
+#: contrib/scalar/scalar.c
+msgid "could not find enlistment root"
+msgstr "无法找到登记根"
+
+#: contrib/scalar/scalar.c
+#, c-format
+msgid "could not switch to '%s'"
+msgstr "无法切换到 '%s'"
+
+#: contrib/scalar/scalar.c
+#, c-format
+msgid "could not configure %s=%s"
+msgstr "无法配置 %s=%s"
+
+#: contrib/scalar/scalar.c
+msgid "could not configure log.excludeDecoration"
+msgstr "无法配置 log.excludeDecoration"
+
+#: contrib/scalar/scalar.c
+msgid "Scalar enlistments require a worktree"
+msgstr "Scalar 登记需要一个工作树"
+
+#: contrib/scalar/scalar.c dir.c
+#, c-format
+msgid "could not open directory '%s'"
+msgstr "不能打开目录 '%s'"
+
+#: contrib/scalar/scalar.c
+#, c-format
+msgid "skipping '%s', which is neither file nor directory"
+msgstr "跳过 '%s'，既不是文件又不是目录"
+
+#: contrib/scalar/scalar.c
+#, c-format
+msgid "could not determine free disk size for '%s'"
+msgstr "不能确定 '%s' 的空余磁盘空间"
+
+#: contrib/scalar/scalar.c
+#, c-format
+msgid "could not get info for '%s'"
+msgstr "不能获得 '%s' 的信息"
+
+#: contrib/scalar/scalar.c
+#, c-format
+msgid "remote HEAD is not a branch: '%.*s'"
+msgstr "远程 HEAD 不是一个分支：'%.*s'"
+
+#: contrib/scalar/scalar.c
+msgid "failed to get default branch name from remote; using local default"
+msgstr "无法从远程获取默认分支名称；使用本地默认值"
+
+#: contrib/scalar/scalar.c
+msgid "failed to get default branch name"
+msgstr "无法获取默认分支名称"
+
+#: contrib/scalar/scalar.c
+msgid "failed to unregister repository"
+msgstr "无法取消注册仓库"
+
+#: contrib/scalar/scalar.c
+msgid "failed to delete enlistment directory"
+msgstr "无法删除登记目录"
+
+#: contrib/scalar/scalar.c
+msgid "branch to checkout after clone"
+msgstr "克隆后要检出的分支"
+
+#: contrib/scalar/scalar.c
+msgid "when cloning, create full working directory"
+msgstr "在克隆时，创建完整的工作目录"
+
+#: contrib/scalar/scalar.c
+msgid "only download metadata for the branch that will be checked out"
+msgstr "只下载要检出的分支的元信息"
+
+#: contrib/scalar/scalar.c
+msgid "scalar clone [<options>] [--] <repo> [<dir>]"
+msgstr "scalar clone [<选项>] [--] <仓库> [<目录>]"
+
+#: contrib/scalar/scalar.c
+#, c-format
+msgid "cannot deduce worktree name from '%s'"
+msgstr "无法从 '%s' 猜测工作区名称"
+
+#: contrib/scalar/scalar.c
+#, c-format
+msgid "directory '%s' exists already"
+msgstr "目录 '%s' 已存在"
+
+#: contrib/scalar/scalar.c
+#, c-format
+msgid "failed to get default branch for '%s'"
+msgstr "无法获取 '%s' 的默认分支"
+
+#: contrib/scalar/scalar.c
+#, c-format
+msgid "could not configure remote in '%s'"
+msgstr "无法在 '%s' 中配置远程"
+
+#: contrib/scalar/scalar.c
+#, c-format
+msgid "could not configure '%s'"
+msgstr "无法配置 '%s'"
+
+#: contrib/scalar/scalar.c
+msgid "partial clone failed; attempting full clone"
+msgstr "部分克隆失败；尝试完整克隆"
+
+#: contrib/scalar/scalar.c
+msgid "could not configure for full clone"
+msgstr "无法配置完整克隆"
+
+#: contrib/scalar/scalar.c
+msgid "scalar diagnose [<enlistment>]"
+msgstr "scalar diagnose [<登记>]"
+
+#: contrib/scalar/scalar.c
+#, c-format
+msgid "could not create directory for '%s'"
+msgstr "不能为 '%s' 创建目录"
+
+#: contrib/scalar/scalar.c
+msgid "could not duplicate stdout"
+msgstr "不能复制标准输出"
+
+#: contrib/scalar/scalar.c
+msgid "failed to write archive"
+msgstr "无法写入归档"
+
+#: contrib/scalar/scalar.c
+msgid "`scalar list` does not take arguments"
+msgstr "`scalar list` 不带参数"
+
+#: contrib/scalar/scalar.c
+msgid "scalar register [<enlistment>]"
+msgstr "scalar register [<登记>]"
+
+#: contrib/scalar/scalar.c
+msgid "reconfigure all registered enlistments"
+msgstr "重新配置所有注册的登记"
+
+#: contrib/scalar/scalar.c
+msgid "scalar reconfigure [--all | <enlistment>]"
+msgstr "scalar reconfigure [--all | <登记>]"
+
+#: contrib/scalar/scalar.c
+msgid "--all or <enlistment>, but not both"
+msgstr "--all 或者 <登记>，而不是两个一起"
+
+#: contrib/scalar/scalar.c
+#, c-format
+msgid "git repository gone in '%s'"
+msgstr "在 '%s' 的 git 仓库已消失"
+
+#: contrib/scalar/scalar.c
+msgid ""
+"scalar run <task> [<enlistment>]\n"
+"Tasks:\n"
+msgstr ""
+"scalar run <任务> [<登记>]\n"
+"任务：\n"
+
+#: contrib/scalar/scalar.c
+#, c-format
+msgid "no such task: '%s'"
+msgstr "没有此任务：'%s'"
+
+#: contrib/scalar/scalar.c
+msgid "scalar unregister [<enlistment>]"
+msgstr "scalar unregister [<登记>]"
+
+#: contrib/scalar/scalar.c
+msgid "scalar delete <enlistment>"
+msgstr "scalar delete <登记>"
+
+#: contrib/scalar/scalar.c
+msgid "refusing to delete current working directory"
+msgstr "拒绝删除当前工作目录"
+
+#: contrib/scalar/scalar.c
+msgid "include Git version"
+msgstr "包括 Git 的版本"
+
+#: contrib/scalar/scalar.c
+msgid "include Git's build options"
+msgstr "包括 Git 的构建选项"
+
+#: contrib/scalar/scalar.c
+msgid "scalar verbose [-v | --verbose] [--build-options]"
+msgstr "scalar verbose [-v | --verbose] [--build-options]"
+
+#: contrib/scalar/scalar.c
+msgid "-C requires a <directory>"
+msgstr "-C 需要 <目录>"
+
+#: contrib/scalar/scalar.c
+#, c-format
+msgid "could not change to '%s'"
+msgstr "无法变更到 '%s'"
+
+#: contrib/scalar/scalar.c
+msgid "-c requires a <key>=<value> argument"
+msgstr "-c 需要 <键>=<值> 参数"
+
+#: contrib/scalar/scalar.c
+msgid ""
+"scalar [-C <directory>] [-c <key>=<value>] <command> [<options>]\n"
+"\n"
+"Commands:\n"
+msgstr ""
+"scalar [-C <目录>] [-c <键>=<值>] <命令> [<选项>]\n"
+"\n"
+"命令：\n"
+
+#: convert.c
+#, c-format
+msgid "illegal crlf_action %d"
+msgstr "非法的 crlf_action %d"
+
+#: convert.c
+#, c-format
+msgid "CRLF would be replaced by LF in %s"
+msgstr "%s 中的 CRLF 将被 LF 替换"
+
+#: convert.c
+#, c-format
+msgid ""
+"in the working copy of '%s', CRLF will be replaced by LF the next time Git "
+"touches it"
+msgstr "在 '%s' 的工作拷贝中，下次 Git 接触时 CRLF 将被 LF 替换"
+
+#: convert.c
+#, c-format
+msgid "LF would be replaced by CRLF in %s"
+msgstr "文件 %s 中的 LF 将被 CRLF 替换"
+
+#: convert.c
+#, c-format
+msgid ""
+"in the working copy of '%s', LF will be replaced by CRLF the next time Git "
+"touches it"
+msgstr "在 '%s' 的工作拷贝中，下次 Git 接触时 LF 将被 CRLF 替换"
+
+#: convert.c
+#, c-format
+msgid "BOM is prohibited in '%s' if encoded as %s"
+msgstr "如果使用 %2$s 编码，禁止在 '%1$s' 中使用 BOM"
+
+#: convert.c
+#, c-format
+msgid ""
+"The file '%s' contains a byte order mark (BOM). Please use UTF-%.*s as "
+"working-tree-encoding."
+msgstr ""
+"文件 '%s' 包含一个字节顺序标记（BOM）。请使用 UTF-%.*s 作为工作区编码。"
+
+#: convert.c
+#, c-format
+msgid "BOM is required in '%s' if encoded as %s"
+msgstr "如果编码为 %2$s，需要在 '%1$s' 中使用 BOM"
+
+#: convert.c
+#, 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."
+msgstr ""
+"文件 '%s' 缺失一个字节顺序标记（BOM）。请使用 UTF-%sBE or UTF-%sLE（取决于字"
+"节序）作为工作区编码。"
+
+#: convert.c
+#, c-format
+msgid "failed to encode '%s' from %s to %s"
+msgstr "无法对 '%s' 进行从 %s 到 %s 的编码"
+
+#: convert.c
+#, c-format
+msgid "encoding '%s' from %s to %s and back is not the same"
+msgstr "将'%s' 的编码从 %s 到 %s 来回转换不一致"
+
+#: convert.c
+#, c-format
+msgid "cannot fork to run external filter '%s'"
+msgstr "不能 fork 以执行外部过滤器 '%s'"
+
+#: convert.c
+#, c-format
+msgid "cannot feed the input to external filter '%s'"
+msgstr "不能将输入传递给外部过滤器 '%s'"
+
+#: convert.c
+#, c-format
+msgid "external filter '%s' failed %d"
+msgstr "外部过滤器 '%s' 失败码 %d"
+
+#: convert.c
+#, c-format
+msgid "read from external filter '%s' failed"
+msgstr "从外部过滤器 '%s' 读取失败"
+
+#: convert.c
+#, c-format
+msgid "external filter '%s' failed"
+msgstr "外部过滤器 '%s' 失败"
+
+#: convert.c
+msgid "unexpected filter type"
+msgstr "意外的过滤类型"
+
+#: convert.c
+msgid "path name too long for external filter"
+msgstr "外部过滤器的路径名太长"
+
+#: convert.c
+#, c-format
+msgid ""
+"external filter '%s' is not available anymore although not all paths have "
+"been filtered"
+msgstr "外部过滤器 '%s' 不再可用，但并非所有路径都已过滤"
+
+#: convert.c
+msgid "true/false are no valid working-tree-encodings"
+msgstr "true/false 不是有效的工作区编码"
+
+#: convert.c
+#, c-format
+msgid "%s: clean filter '%s' failed"
+msgstr "%s：clean 过滤器 '%s' 失败"
+
+#: convert.c
+#, c-format
+msgid "%s: smudge filter %s failed"
+msgstr "%s：smudge 过滤器 %s 失败"
+
+#: credential.c
+#, c-format
+msgid "skipping credential lookup for key: credential.%s"
+msgstr "跳过凭据查询：credential.%s"
+
+#: credential.c
+msgid "refusing to work with credential missing host field"
+msgstr "拒绝使用缺少主机字段的凭据"
+
+#: credential.c
+msgid "refusing to work with credential missing protocol field"
+msgstr "拒绝使用缺少协议字段的凭据"
+
+#: credential.c
+#, c-format
+msgid "url contains a newline in its %s component: %s"
+msgstr "URL 的 %s 组件中包含换行符：%s"
+
+#: credential.c
+#, c-format
+msgid "url has no scheme: %s"
+msgstr "URL 没有 scheme：%s"
+
+#: credential.c
+#, c-format
+msgid "credential url cannot be parsed: %s"
+msgstr "不能解析凭据 URL：%s"
+
+#: date.c
+msgid "in the future"
+msgstr "在将来"
+
+#: date.c
+#, c-format
+msgid "%<PRIuMAX> second ago"
+msgid_plural "%<PRIuMAX> seconds ago"
+msgstr[0] "%<PRIuMAX> 秒钟前"
+msgstr[1] "%<PRIuMAX> 秒钟前"
+
+#: date.c
+#, c-format
+msgid "%<PRIuMAX> minute ago"
+msgid_plural "%<PRIuMAX> minutes ago"
+msgstr[0] "%<PRIuMAX> 分钟前"
+msgstr[1] "%<PRIuMAX> 分钟前"
+
+#: date.c
+#, c-format
+msgid "%<PRIuMAX> hour ago"
+msgid_plural "%<PRIuMAX> hours ago"
+msgstr[0] "%<PRIuMAX> 小时前"
+msgstr[1] "%<PRIuMAX> 小时前"
+
+#: date.c
+#, c-format
+msgid "%<PRIuMAX> day ago"
+msgid_plural "%<PRIuMAX> days ago"
+msgstr[0] "%<PRIuMAX> 天前"
+msgstr[1] "%<PRIuMAX> 天前"
+
+#: date.c
+#, c-format
+msgid "%<PRIuMAX> week ago"
+msgid_plural "%<PRIuMAX> weeks ago"
+msgstr[0] "%<PRIuMAX> 周前"
+msgstr[1] "%<PRIuMAX> 周前"
+
+#: date.c
+#, c-format
+msgid "%<PRIuMAX> month ago"
+msgid_plural "%<PRIuMAX> months ago"
+msgstr[0] "%<PRIuMAX> 个月前"
+msgstr[1] "%<PRIuMAX> 个月前"
+
+#: date.c
+#, c-format
+msgid "%<PRIuMAX> year"
+msgid_plural "%<PRIuMAX> years"
+msgstr[0] "%<PRIuMAX> 年"
+msgstr[1] "%<PRIuMAX> 年"
+
+#. TRANSLATORS: "%s" is "<n> years"
+#: date.c
+#, c-format
+msgid "%s, %<PRIuMAX> month ago"
+msgid_plural "%s, %<PRIuMAX> months ago"
+msgstr[0] "%s %<PRIuMAX> 个月前"
+msgstr[1] "%s %<PRIuMAX> 个月前"
+
+#: date.c
+#, c-format
+msgid "%<PRIuMAX> year ago"
+msgid_plural "%<PRIuMAX> years ago"
+msgstr[0] "%<PRIuMAX> 年前"
+msgstr[1] "%<PRIuMAX> 年前"
+
+#: delta-islands.c
+msgid "Propagating island marks"
+msgstr "正在传播数据岛标记"
+
+#: delta-islands.c
+#, c-format
+msgid "bad tree object %s"
+msgstr "坏的树对象 %s"
+
+#: delta-islands.c
+#, c-format
+msgid "failed to load island regex for '%s': %s"
+msgstr "未能加载 '%s' 的数据岛正则表达式：%s"
+
+#: delta-islands.c
+#, c-format
+msgid "island regex from config has too many capture groups (max=%d)"
+msgstr "来自 config 的数据岛正则表达式有太多的捕获组（最多 %d 个）"
+
+#: delta-islands.c
+#, c-format
+msgid "Marked %d islands, done.\n"
+msgstr "已标记 %d 个数据岛，结束。\n"
+
+#: diff-lib.c
+msgid "--merge-base does not work with ranges"
+msgstr "--merge-base 不适用于范围"
+
+#: diff-lib.c
+msgid "--merge-base only works with commits"
+msgstr "--merge-base 仅适用于提交"
+
+#: diff-lib.c
+msgid "unable to get HEAD"
+msgstr "不能解析 HEAD"
+
+#: diff-lib.c
+msgid "no merge base found"
+msgstr "未找到合并基线"
+
+#: diff-lib.c
+msgid "multiple merge bases found"
+msgstr "找到了多条合并基线"
+
+#: diff-no-index.c
+msgid "git diff --no-index [<options>] <path> <path>"
+msgstr "git diff --no-index [<选项>] <路径> <路径>"
+
+#: diff-no-index.c
+msgid ""
+"Not a git repository. Use --no-index to compare two paths outside a working "
+"tree"
+msgstr "不是 git 仓库。使用 --no-index 比较工作区之外的两个路径"
+
+#  译者：注意保持前导空格
+#: diff.c
+#, c-format
+msgid "  Failed to parse dirstat cut-off percentage '%s'\n"
+msgstr "  无法解析 dirstat 截止（cut-off）百分比 '%s'\n"
+
+#  译者：注意保持前导空格
+#: diff.c
+#, c-format
+msgid "  Unknown dirstat parameter '%s'\n"
+msgstr "  未知的 dirstat 参数 '%s'\n"
+
+#: diff.c
+msgid ""
+"color moved setting must be one of 'no', 'default', 'blocks', 'zebra', "
+"'dimmed-zebra', 'plain'"
+msgstr ""
+"移动的颜色设置必须是 'no'、'default'、'blocks'、'zebra'、'dimmed-zebra' 或 "
+"'plain'"
+
+#: diff.c
+#, 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 ""
+"未知的 color-moved-ws 模式 '%s'，可能的取值有 'ignore-space-change'、'ignore-"
+"space-at-eol'、'ignore-all-space'、'allow-indentation-change'"
+
+#: diff.c
+msgid ""
+"color-moved-ws: allow-indentation-change cannot be combined with other "
+"whitespace modes"
+msgstr "color-moved-ws：allow-indentation-change 不能与其它空白字符模式共用"
+
+#: diff.c
+#, c-format
+msgid "Unknown value for 'diff.submodule' config variable: '%s'"
+msgstr "配置变量 'diff.submodule' 未知的取值：'%s'"
+
+#: diff.c
+#, c-format
+msgid ""
+"Found errors in 'diff.dirstat' config variable:\n"
+"%s"
+msgstr ""
+"发现配置变量 'diff.dirstat' 中的错误：\n"
+"%s"
+
+#: diff.c
+#, c-format
+msgid "external diff died, stopping at %s"
+msgstr "外部 diff 退出，停止在 %s"
+
+#: diff.c parse-options.c
+#, c-format
+msgid "options '%s', '%s', '%s', and '%s' cannot be used together"
+msgstr "选项 '%s'、'%s'、'%s' 和 '%s' 不能同时使用"
+
+#: diff.c
+#, c-format
+msgid "options '%s' and '%s' cannot be used together, use '%s' with '%s'"
+msgstr "选项 '%1$s'、'%2$s' 不能同时使用，与 '%4$s' 一起使用 '%3$s'"
+
+#: diff.c
+#, c-format
+msgid ""
+"options '%s' and '%s' cannot be used together, use '%s' with '%s' and '%s'"
+msgstr "选项 '%1$s'、'%2$s' 不能同时使用，与 '%4$s' 和 '%5$s' 一起使用 '%3$s'"
+
+#: diff.c
+msgid "--follow requires exactly one pathspec"
+msgstr "--follow 明确要求只跟一个路径规格"
+
+#: diff.c
+#, c-format
+msgid "invalid --stat value: %s"
+msgstr "无效的 --stat 值：%s"
+
+#: diff.c parse-options.c
+#, c-format
+msgid "%s expects a numerical value"
+msgstr "%s 期望一个数字值"
+
+#: diff.c
+#, c-format
+msgid ""
+"Failed to parse --dirstat/-X option parameter:\n"
+"%s"
+msgstr ""
+"无法解析 --dirstat/-X 选项的参数：\n"
+"%s"
+
+#: diff.c
+#, c-format
+msgid "unknown change class '%c' in --diff-filter=%s"
+msgstr "--diff-filter=%2$s 中未知的变更类 '%1$c'"
+
+#: diff.c
+#, c-format
+msgid "unknown value after ws-error-highlight=%.*s"
+msgstr "ws-error-highlight=%.*s 之后未知的值"
+
+#: diff.c
+#, c-format
+msgid "unable to resolve '%s'"
+msgstr "不能解析 '%s'"
+
+#: diff.c
+#, c-format
+msgid "%s expects <n>/<m> form"
+msgstr "%s 期望 <n>/<m> 格式"
+
+#: diff.c
+#, c-format
+msgid "%s expects a character, got '%s'"
+msgstr "%s 期望一个字符，得到 '%s'"
+
+#: diff.c
+#, c-format
+msgid "bad --color-moved argument: %s"
+msgstr "坏的 --color-moved 参数：%s"
+
+#: diff.c
+#, c-format
+msgid "invalid mode '%s' in --color-moved-ws"
+msgstr "--color-moved-ws 中的无效模式 '%s' "
+
+#: diff.c
+msgid ""
+"option diff-algorithm accepts \"myers\", \"minimal\", \"patience\" and "
+"\"histogram\""
+msgstr ""
+"diff-algorithm 选项有 \"myers\"、\"minimal\"、\"patience\" 和 \"histogram\""
+
+#: diff.c
+#, c-format
+msgid "invalid argument to %s"
+msgstr "%s 的参数无效"
+
+#: diff.c
+#, c-format
+msgid "invalid regex given to -I: '%s'"
+msgstr "选项 -I 的正则表达式无效：'%s'"
+
+#: diff.c
+#, c-format
+msgid "failed to parse --submodule option parameter: '%s'"
+msgstr "无法解析 --submodule 选项的参数：'%s'"
+
+#: diff.c
+#, c-format
+msgid "bad --word-diff argument: %s"
+msgstr "坏的 --word-diff 参数：%s"
+
+#: diff.c
+msgid "Diff output format options"
+msgstr "差异输出格式化选项"
+
+#: diff.c
+msgid "generate patch"
+msgstr "生成补丁"
+
+#: diff.c
+msgid "<n>"
+msgstr "<n>"
+
+#: diff.c
+msgid "generate diffs with <n> lines context"
+msgstr "生成含 <n> 行上下文的差异"
+
+#: diff.c
+msgid "generate the diff in raw format"
+msgstr "生成原始格式的差异"
+
+#: diff.c
+msgid "synonym for '-p --raw'"
+msgstr "和 '-p --raw' 同义"
+
+#: diff.c
+msgid "synonym for '-p --stat'"
+msgstr "和 '-p --stat' 同义"
+
+#: diff.c
+msgid "machine friendly --stat"
+msgstr "机器友好的 --stat"
+
+#: diff.c
+msgid "output only the last line of --stat"
+msgstr "只输出 --stat 的最后一行"
+
+#: diff.c
+msgid "<param1,param2>..."
+msgstr "<参数1,参数2>..."
+
+#: diff.c
+msgid ""
+"output the distribution of relative amount of changes for each sub-directory"
+msgstr "输出每个子目录相对变更的分布"
+
+#: diff.c
+msgid "synonym for --dirstat=cumulative"
+msgstr "和 --dirstat=cumulative 同义"
+
+#: diff.c
+msgid "synonym for --dirstat=files,param1,param2..."
+msgstr "是 --dirstat=files,param1,param2... 的同义词"
+
+#: diff.c
+msgid "warn if changes introduce conflict markers or whitespace errors"
+msgstr "如果变更中引入冲突定界符或空白错误，给出警告"
+
+#: diff.c
+msgid "condensed summary such as creations, renames and mode changes"
+msgstr "精简摘要，例如创建、重命名和模式变更"
+
+#: diff.c
+msgid "show only names of changed files"
+msgstr "只显示变更文件的文件名"
+
+#: diff.c
+msgid "show only names and status of changed files"
+msgstr "只显示变更文件的文件名和状态"
+
+#: diff.c
+msgid "<width>[,<name-width>[,<count>]]"
+msgstr "<宽度>[,<文件名宽度>[,<次数>]]"
+
+#: diff.c
+msgid "generate diffstat"
+msgstr "生成差异统计（diffstat）"
+
+#: diff.c
+msgid "<width>"
+msgstr "<宽度>"
+
+#: diff.c
+msgid "generate diffstat with a given width"
+msgstr "使用给定的长度生成差异统计"
+
+#: diff.c
+msgid "generate diffstat with a given name width"
+msgstr "使用给定的文件名长度生成差异统计"
+
+#: diff.c
+msgid "generate diffstat with a given graph width"
+msgstr "使用给定的图形长度生成差异统计"
+
+#: diff.c
+msgid "<count>"
+msgstr "<次数>"
+
+#: diff.c
+msgid "generate diffstat with limited lines"
+msgstr "生成有限行数的差异统计"
+
+#: diff.c
+msgid "generate compact summary in diffstat"
+msgstr "生成差异统计的简洁摘要"
+
+#: diff.c
+msgid "output a binary diff that can be applied"
+msgstr "输出一个可以应用的二进制差异"
+
+#: diff.c
+msgid "show full pre- and post-image object names on the \"index\" lines"
+msgstr "在 \"index\" 行显示完整的前后对象名称"
+
+#: diff.c
+msgid "show colored diff"
+msgstr "显示带颜色的差异"
+
+#: diff.c
+msgid "<kind>"
+msgstr "<类型>"
+
+#: diff.c
+msgid ""
+"highlight whitespace errors in the 'context', 'old' or 'new' lines in the "
+"diff"
+msgstr "对于差异中的上下文、旧的和新的行，加亮显示错误的空白字符"
+
+#: diff.c
+msgid ""
+"do not munge pathnames and use NULs as output field terminators in --raw or "
+"--numstat"
+msgstr ""
+"在 --raw 或者 --numstat 中，不对路径字符转码并使用 NUL 字符做为输出字段的分隔"
+"符"
+
+#: diff.c
+msgid "<prefix>"
+msgstr "<前缀>"
+
+#: diff.c
+msgid "show the given source prefix instead of \"a/\""
+msgstr "显示给定的源前缀取代 \"a/\""
+
+#: diff.c
+msgid "show the given destination prefix instead of \"b/\""
+msgstr "显示给定的目标前缀取代 \"b/\""
+
+#: diff.c
+msgid "prepend an additional prefix to every line of output"
+msgstr "输出的每一行附加前缀"
+
+#: diff.c
+msgid "do not show any source or destination prefix"
+msgstr "不显示任何源和目标前缀"
+
+#: diff.c
+msgid "show context between diff hunks up to the specified number of lines"
+msgstr "显示指定行数的差异块间的上下文"
+
+#: diff.c
+msgid "<char>"
+msgstr "<字符>"
+
+#: diff.c
+msgid "specify the character to indicate a new line instead of '+'"
+msgstr "指定一个字符取代 '+' 来表示新的一行"
+
+#: diff.c
+msgid "specify the character to indicate an old line instead of '-'"
+msgstr "指定一个字符取代 '-' 来表示旧的一行"
+
+#: diff.c
+msgid "specify the character to indicate a context instead of ' '"
+msgstr "指定一个字符取代 ' ' 来表示一行上下文"
+
+#: diff.c
+msgid "Diff rename options"
+msgstr "差异重命名选项"
+
+#: diff.c
+msgid "<n>[/<m>]"
+msgstr "<n>[/<m>]"
+
+#: diff.c
+msgid "break complete rewrite changes into pairs of delete and create"
+msgstr "将完全重写的变更打破为成对的删除和创建"
+
+#: diff.c
+msgid "detect renames"
+msgstr "检测重命名"
+
+#: diff.c
+msgid "omit the preimage for deletes"
+msgstr "省略删除操作的差异输出"
+
+#: diff.c
+msgid "detect copies"
+msgstr "检测拷贝"
+
+#: diff.c
+msgid "use unmodified files as source to find copies"
+msgstr "使用未修改的文件做为发现拷贝的源"
+
+#: diff.c
+msgid "disable rename detection"
+msgstr "禁用重命名探测"
+
+#: diff.c
+msgid "use empty blobs as rename source"
+msgstr "使用空的数据对象做为重命名的源"
+
+#: diff.c
+msgid "continue listing the history of a file beyond renames"
+msgstr "继续列出文件重命名以外的历史记录"
+
+#: diff.c
+msgid ""
+"prevent rename/copy detection if the number of rename/copy targets exceeds "
+"given limit"
+msgstr "如果重命名/拷贝目标超过给定的限制，禁止重命名/拷贝检测"
+
+#: diff.c
+msgid "Diff algorithm options"
+msgstr "差异算法选项"
+
+#: diff.c
+msgid "produce the smallest possible diff"
+msgstr "生成尽可能小的差异"
+
+#: diff.c
+msgid "ignore whitespace when comparing lines"
+msgstr "行比较时忽略空白字符"
+
+#: diff.c
+msgid "ignore changes in amount of whitespace"
+msgstr "忽略空白字符的变更"
+
+#: diff.c
+msgid "ignore changes in whitespace at EOL"
+msgstr "忽略行尾的空白字符变更"
+
+#: diff.c
+msgid "ignore carrier-return at the end of line"
+msgstr "忽略行尾的回车符（CR）"
+
+#: diff.c
+msgid "ignore changes whose lines are all blank"
+msgstr "忽略整行都是空白的变更"
+
+#: diff.c
+msgid "<regex>"
+msgstr "<正则>"
+
+#: diff.c
+msgid "ignore changes whose all lines match <regex>"
+msgstr "忽略所有行都和正则表达式匹配的变更"
+
+#: diff.c
+msgid "heuristic to shift diff hunk boundaries for easy reading"
+msgstr "启发式转换差异边界以便阅读"
+
+#: diff.c
+msgid "generate diff using the \"patience diff\" algorithm"
+msgstr "使用 \"patience diff\" 算法生成差异"
+
+#: diff.c
+msgid "generate diff using the \"histogram diff\" algorithm"
+msgstr "使用 \"histogram diff\" 算法生成差异"
+
+#: diff.c
+msgid "<algorithm>"
+msgstr "<算法>"
+
+#: diff.c
+msgid "choose a diff algorithm"
+msgstr "选择一个差异算法"
+
+#: diff.c
+msgid "<text>"
+msgstr "<文本>"
+
+#: diff.c
+msgid "generate diff using the \"anchored diff\" algorithm"
+msgstr "使用 \"anchored diff\" 算法生成差异"
+
+#: diff.c
+msgid "<mode>"
+msgstr "<模式>"
+
+#: diff.c
+msgid "show word diff, using <mode> to delimit changed words"
+msgstr "显示单词差异，使用 <模式> 分隔变更的单词"
+
+#: diff.c
+msgid "use <regex> to decide what a word is"
+msgstr "使用 <正则表达式> 确定何为一个词"
+
+#: diff.c
+msgid "equivalent to --word-diff=color --word-diff-regex=<regex>"
+msgstr "相当于 --word-diff=color --word-diff-regex=<正则>"
+
+#: diff.c
+msgid "moved lines of code are colored differently"
+msgstr "移动的代码行用不同方式着色"
+
+#: diff.c
+msgid "how white spaces are ignored in --color-moved"
+msgstr "在 --color-moved 下如何忽略空白字符"
+
+#: diff.c
+msgid "Other diff options"
+msgstr "其它差异选项"
+
+#: diff.c
+msgid "when run from subdir, exclude changes outside and show relative paths"
+msgstr "当从子目录运行，排除目录之外的变更并显示相对路径"
+
+#: diff.c
+msgid "treat all files as text"
+msgstr "把所有文件当做文本处理"
+
+#: diff.c
+msgid "swap two inputs, reverse the diff"
+msgstr "交换两个输入，反转差异"
+
+#: diff.c
+msgid "exit with 1 if there were differences, 0 otherwise"
+msgstr "有差异时退出码为 1，否则为 0"
+
+#: diff.c
+msgid "disable all output of the program"
+msgstr "禁用本程序的所有输出"
+
+#: diff.c
+msgid "allow an external diff helper to be executed"
+msgstr "允许执行一个外置的差异助手"
+
+#: diff.c
+msgid "run external text conversion filters when comparing binary files"
+msgstr "当比较二进制文件时，运行外部的文本转换过滤器"
+
+#: diff.c
+msgid "<when>"
+msgstr "<何时>"
+
+#: diff.c
+msgid "ignore changes to submodules in the diff generation"
+msgstr "在生成差异时，忽略子模组的更改"
+
+#: diff.c
+msgid "<format>"
+msgstr "<格式>"
+
+#: diff.c
+msgid "specify how differences in submodules are shown"
+msgstr "指定子模组的差异如何显示"
+
+#: diff.c
+msgid "hide 'git add -N' entries from the index"
+msgstr "隐藏索引中 'git add -N' 条目"
+
+#: diff.c
+msgid "treat 'git add -N' entries as real in the index"
+msgstr "将索引中 'git add -N' 条目当做真实的"
+
+#: diff.c
+msgid "<string>"
+msgstr "<字符串>"
+
+#: diff.c
+msgid ""
+"look for differences that change the number of occurrences of the specified "
+"string"
+msgstr "查找改变了指定字符串出现次数的差异"
+
+#: diff.c
+msgid ""
+"look for differences that change the number of occurrences of the specified "
+"regex"
+msgstr "查找改变指定正则匹配出现次数的差异"
+
+#: diff.c
+msgid "show all changes in the changeset with -S or -G"
+msgstr "显示使用 -S 或 -G 的变更集的所有变更"
+
+#: diff.c
+msgid "treat <string> in -S as extended POSIX regular expression"
+msgstr "将 -S 的 <string> 当做扩展的 POSIX 正则表达式"
+
+#: diff.c
+msgid "control the order in which files appear in the output"
+msgstr "控制输出中的文件显示顺序"
+
+#: diff.c
+msgid "<path>"
+msgstr "<路径>"
+
+#: diff.c
+msgid "show the change in the specified path first"
+msgstr "先显示指定路径的变更"
+
+#: diff.c
+msgid "skip the output to the specified path"
+msgstr "跳过指定路径的输出"
+
+#: diff.c
+msgid "<object-id>"
+msgstr "<对象 ID>"
+
+#: diff.c
+msgid ""
+"look for differences that change the number of occurrences of the specified "
+"object"
+msgstr "查找改变指定对象出现次数的差异"
+
+#: diff.c
+msgid "[(A|C|D|M|R|T|U|X|B)...[*]]"
+msgstr "[(A|C|D|M|R|T|U|X|B)...[*]]"
+
+#: diff.c
+msgid "select files by diff type"
+msgstr "通过差异类型选择文件"
+
+#: diff.c
+msgid "<file>"
+msgstr "<文件>"
+
+#: diff.c
+msgid "output to a specific file"
+msgstr "输出到指定的文件"
+
+#: diff.c
+msgid "exhaustive rename detection was skipped due to too many files."
+msgstr "由于文件太多，跳过详尽的重命名检查。"
+
+#: diff.c
+msgid "only found copies from modified paths due to too many files."
+msgstr "由于文件太多，只在修改的路径中找到了拷贝。"
+
+#: diff.c
+#, c-format
+msgid ""
+"you may want to set your %s variable to at least %d and retry the command."
+msgstr "您可能想要将变量 %s 设置为至少 %d 并再次执行此命令。"
+
+#: diffcore-order.c
+#, c-format
+msgid "failed to read orderfile '%s'"
+msgstr "无法读取排序文件 '%s'"
+
+#: diffcore-rename.c
+msgid "Performing inexact rename detection"
+msgstr "正在进行非精确的重命名探测"
+
+#: diffcore-rotate.c
+#, c-format
+msgid "No such path '%s' in the diff"
+msgstr "在差异中无此路径 '%s'"
+
+#: dir.c
+#, c-format
+msgid "pathspec '%s' did not match any file(s) known to git"
+msgstr "路径规格 '%s' 未匹配任何 git 已知文件"
+
+#: dir.c
+#, c-format
+msgid "unrecognized pattern: '%s'"
+msgstr "未识别的模式：'%s'"
+
+#: dir.c
+#, c-format
+msgid "unrecognized negative pattern: '%s'"
+msgstr "未识别的反向模式：'%s'"
+
+#: dir.c
+#, c-format
+msgid "your sparse-checkout file may have issues: pattern '%s' is repeated"
+msgstr "您的 sparse-checkout 文件可能有问题：重复的模式 '%s'"
+
+#: dir.c
+msgid "disabling cone pattern matching"
+msgstr "停用锥形模式匹配"
+
+#: dir.c
+#, c-format
+msgid "cannot use %s as an exclude file"
+msgstr "不能将 %s 用作排除文件"
+
+#: dir.c
+msgid "failed to get kernel name and information"
+msgstr "无法获得内核名称和信息"
+
+#: dir.c
+msgid "untracked cache is disabled on this system or location"
+msgstr "缓存未跟踪文件在本系统或位置中被禁用"
+
+#: dir.c
+msgid ""
+"No directory name could be guessed.\n"
+"Please specify a directory on the command line"
+msgstr ""
+"无法猜到目录名。\n"
+"请在命令行指定一个目录"
+
+#: dir.c
+#, c-format
+msgid "index file corrupt in repo %s"
+msgstr "仓库 %s 中的索引文件损坏"
+
+#: dir.c
+#, c-format
+msgid "could not create directories for %s"
+msgstr "不能为 %s 创建目录"
+
+#: dir.c
+#, c-format
+msgid "could not migrate git directory from '%s' to '%s'"
+msgstr "不能从 '%s' 迁移 git 目录到 '%s'"
+
+#: editor.c
+#, c-format
+msgid "hint: Waiting for your editor to close the file...%c"
+msgstr "提示：等待您的编辑器关闭文件...%c"
+
+#: entry.c
+msgid "Filtering content"
+msgstr "过滤内容"
+
+#: entry.c
+#, c-format
+msgid "could not stat file '%s'"
+msgstr "不能对文件 '%s' 调用 stat"
+
+#: environment.c
+#, c-format
+msgid "bad git namespace path \"%s\""
+msgstr "错误的 git 名字空间路径 \"%s\""
+
+#: exec-cmd.c
+#, c-format
+msgid "too many args to run %s"
+msgstr "执行 %s 的参数太多"
+
+#: fetch-pack.c
+msgid "git fetch-pack: expected shallow list"
+msgstr "git fetch-pack：应为 shallow 列表"
+
+#: fetch-pack.c
+msgid "git fetch-pack: expected a flush packet after shallow list"
+msgstr "git fetch-pack：在浅克隆列表之后期望一个 flush 包"
+
+#: fetch-pack.c
+msgid "git fetch-pack: expected ACK/NAK, got a flush packet"
+msgstr "git fetch-pack：期望 ACK/NAK，却得到 flush 包"
+
+#: fetch-pack.c
+#, c-format
+msgid "git fetch-pack: expected ACK/NAK, got '%s'"
+msgstr "git fetch-pack：应为 ACK/NAK，却得到 '%s'"
+
+#: fetch-pack.c
+msgid "unable to write to remote"
+msgstr "无法写到远程"
+
+#: fetch-pack.c
+#, c-format
+msgid "invalid shallow line: %s"
+msgstr "无效的 shallow 信息：%s"
+
+#: fetch-pack.c
+#, c-format
+msgid "invalid unshallow line: %s"
+msgstr "无效的 unshallow 信息：%s"
+
+#: fetch-pack.c
+#, c-format
+msgid "object not found: %s"
+msgstr "对象未找到：%s"
+
+#: fetch-pack.c
+#, c-format
+msgid "error in object: %s"
+msgstr "对象中出错：%s"
+
+#: fetch-pack.c
+#, c-format
+msgid "no shallow found: %s"
+msgstr "未发现 shallow：%s"
+
+#: fetch-pack.c
+#, c-format
+msgid "expected shallow/unshallow, got %s"
+msgstr "应为 shallow/unshallow，却得到 %s"
+
+#: fetch-pack.c
+#, c-format
+msgid "got %s %d %s"
+msgstr "得到 %s %d %s"
+
+#: fetch-pack.c
+#, c-format
+msgid "invalid commit %s"
+msgstr "无效提交 %s"
+
+#: fetch-pack.c
+msgid "giving up"
+msgstr "放弃"
+
+#: fetch-pack.c progress.h
+msgid "done"
+msgstr "完成"
+
+#: fetch-pack.c
+#, c-format
+msgid "got %s (%d) %s"
+msgstr "得到 %s (%d) %s"
+
+#: fetch-pack.c
+#, c-format
+msgid "Marking %s as complete"
+msgstr "标记 %s 为完成"
+
+#: fetch-pack.c
+#, c-format
+msgid "already have %s (%s)"
+msgstr "已经有 %s（%s）"
+
+#: fetch-pack.c
+msgid "fetch-pack: unable to fork off sideband demultiplexer"
+msgstr "fetch-pack：无法派生 sideband 多路输出"
+
+#: fetch-pack.c
+msgid "protocol error: bad pack header"
+msgstr "协议错误：坏的包头"
+
+#: fetch-pack.c
+#, c-format
+msgid "fetch-pack: unable to fork off %s"
+msgstr "fetch-pack：无法派生进程 %s"
+
+#: fetch-pack.c
+msgid "fetch-pack: invalid index-pack output"
+msgstr "fetch-pack：无效的 index-pack 输出"
+
+#: fetch-pack.c
+#, c-format
+msgid "%s failed"
+msgstr "%s 失败"
+
+#: fetch-pack.c
+msgid "error in sideband demultiplexer"
+msgstr "sideband 多路输出出错"
+
+#: fetch-pack.c
+#, c-format
+msgid "Server version is %.*s"
+msgstr "服务器版本 %.*s"
+
+#: fetch-pack.c
+#, c-format
+msgid "Server supports %s"
+msgstr "服务器支持 %s"
+
+#: fetch-pack.c
+msgid "Server does not support shallow clients"
+msgstr "服务器不支持浅客户端"
+
+#: fetch-pack.c
+msgid "Server does not support --shallow-since"
+msgstr "服务器不支持 --shallow-since"
+
+#: fetch-pack.c
+msgid "Server does not support --shallow-exclude"
+msgstr "服务器不支持 --shallow-exclude"
+
+#: fetch-pack.c
+msgid "Server does not support --deepen"
+msgstr "服务器不支持 --deepen"
+
+#: fetch-pack.c
+msgid "Server does not support this repository's object format"
+msgstr "服务器不支持这个仓库的对象格式"
+
+#: fetch-pack.c
+msgid "no common commits"
+msgstr "没有共同的提交"
+
+#: fetch-pack.c
+msgid "git fetch-pack: fetch failed."
+msgstr "git fetch-pack：获取失败。"
+
+#: fetch-pack.c
+#, c-format
+msgid "mismatched algorithms: client %s; server %s"
+msgstr "不匹配的算法：客户端 %s，服务端 %s"
+
+#: fetch-pack.c
+#, c-format
+msgid "the server does not support algorithm '%s'"
+msgstr "服务器不支持算法 '%s'"
+
+#: fetch-pack.c
+msgid "Server does not support shallow requests"
+msgstr "服务器不支持浅克隆请求"
+
+#: fetch-pack.c
+msgid "Server supports filter"
+msgstr "服务器支持 filter"
+
+#: fetch-pack.c
+msgid "unable to write request to remote"
+msgstr "无法将请求写到远程"
+
+#: fetch-pack.c
+#, c-format
+msgid "expected '%s', received '%s'"
+msgstr "预期 '%s'，得到 '%s'"
+
+#: fetch-pack.c
+#, c-format
+msgid "expected '%s'"
+msgstr "预期 '%s'"
+
+#: fetch-pack.c
+#, c-format
+msgid "unexpected acknowledgment line: '%s'"
+msgstr "意外的确认行：'%s'"
+
+#: fetch-pack.c
+#, c-format
+msgid "error processing acks: %d"
+msgstr "处理 ack 出错：%d"
+
+#. TRANSLATORS: The parameter will be 'ready', a protocol
+#. keyword.
+#.
+#: fetch-pack.c
+#, c-format
+msgid "expected packfile to be sent after '%s'"
+msgstr "预期在 '%s' 之后发送 packfile"
+
+#. TRANSLATORS: The parameter will be 'ready', a protocol
+#. keyword.
+#.
+#: fetch-pack.c
+#, c-format
+msgid "expected no other sections to be sent after no '%s'"
+msgstr "在没有 '%s' 后不应该发送其它小节"
+
+#: fetch-pack.c
+#, c-format
+msgid "error processing shallow info: %d"
+msgstr "处理浅克隆信息出错：%d"
+
+#: fetch-pack.c
+#, c-format
+msgid "expected wanted-ref, got '%s'"
+msgstr "预期 wanted-ref，得到 '%s'"
+
+#: fetch-pack.c
+#, c-format
+msgid "unexpected wanted-ref: '%s'"
+msgstr "意外的 wanted-ref：'%s'"
+
+#: fetch-pack.c
+#, c-format
+msgid "error processing wanted refs: %d"
+msgstr "处理要获取的引用出错：%d"
+
+#: fetch-pack.c
+msgid "git fetch-pack: expected response end packet"
+msgstr "git fetch-pack：预期响应结束包"
+
+#: fetch-pack.c
+msgid "no matching remote head"
+msgstr "没有匹配的远程分支"
+
+#: fetch-pack.c
+msgid "unexpected 'ready' from remote"
+msgstr "来自远程的意外的 'ready'"
+
+#: fetch-pack.c
+#, c-format
+msgid "no such remote ref %s"
+msgstr "没有这样的远程引用 %s"
+
+#: fetch-pack.c
+#, c-format
+msgid "Server does not allow request for unadvertised object %s"
+msgstr "服务器不允许请求未公开的对象 %s"
+
+#: fsmonitor-ipc.c
+#, c-format
+msgid "fsmonitor_ipc__send_query: invalid path '%s'"
+msgstr "fsmonitor_ipc__send_query: 无效路径 '%s'"
+
+#: fsmonitor-ipc.c
+#, c-format
+msgid "fsmonitor_ipc__send_query: unspecified error on '%s'"
+msgstr "fsmonitor_ipc__send_query: 未知错误于 '%s'"
+
+#: fsmonitor-ipc.c
+msgid "fsmonitor--daemon is not running"
+msgstr "fsmonitor--daemon 没有运行"
+
+#: fsmonitor-ipc.c
+#, c-format
+msgid "could not send '%s' command to fsmonitor--daemon"
+msgstr "无法发送 '%s' 命令至 fsmonitor--daemon"
+
+#: fsmonitor-settings.c
+#, c-format
+msgid "bare repository '%s' is incompatible with fsmonitor"
+msgstr "纯仓库 '%s' 与 fsmonitor 不兼容"
+
+#: fsmonitor-settings.c
+#, c-format
+msgid "repository '%s' is incompatible with fsmonitor due to errors"
+msgstr "因为错误，仓库 '%s' 与 fsmonitor 不兼容"
+
+#: fsmonitor-settings.c
+#, c-format
+msgid "remote repository '%s' is incompatible with fsmonitor"
+msgstr "远程仓库 '%s' 与 fsmonitor 不兼容"
+
+#: fsmonitor-settings.c
+#, c-format
+msgid "virtual repository '%s' is incompatible with fsmonitor"
+msgstr "虚拟仓库 '%s' 与 fsmonitor 不兼容"
+
+#: fsmonitor-settings.c
+#, c-format
+msgid ""
+"repository '%s' is incompatible with fsmonitor due to lack of Unix sockets"
+msgstr "因为缺少 Unix 套接字，仓库 '%s' 与 fsmonitor 不兼容"
+
+#: git.c
+msgid ""
+"git [-v | --version] [-h | --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"
+"           [--git-dir=<path>] [--work-tree=<path>] [--namespace=<name>]\n"
+"           [--super-prefix=<path>] [--config-env=<name>=<envvar>]\n"
+"           <command> [<args>]"
+msgstr ""
+"git [-v | --version] [--help] [-C <路径>] [-c <名称>=<取值>]\n"
+"           [--exec-path[=<路径>]] [--html-path] [--man-path] [--info-path]\n"
+"           [-p | --paginate | -P | --no-pager] [--no-replace-objects] [--"
+"bare]\n"
+"           [--git-dir=<路径>] [--work-tree=<路径>] [--namespace=<名称>]\n"
+"           [--super-prefix=<路径>] [--config-env=<名称>=<环境变量>]\n"
+"           <命令> [<参数>]"
+
+#: git.c
+msgid ""
+"'git help -a' and 'git help -g' list available subcommands and some\n"
+"concept guides. See 'git help <command>' or 'git help <concept>'\n"
+"to read about a specific subcommand or concept.\n"
+"See 'git help git' for an overview of the system."
+msgstr ""
+"命令 'git help -a' 和 'git help -g' 显示可用的子命令和一些概念帮助。\n"
+"查看 'git help <命令>' 或 'git help <概念>' 以获取给定子命令或概念的\n"
+"帮助。\n"
+"有关系统的概述，查看 'git help git'。"
+
+#: git.c help.c
+#, c-format
+msgid "unsupported command listing type '%s'"
+msgstr "不支持的命令列表类型 '%s'"
+
+#: git.c
+#, c-format
+msgid "no directory given for '%s' option\n"
+msgstr "没有为 '%s' 选项提供目录\n"
+
+#: git.c
+#, c-format
+msgid "no namespace given for --namespace\n"
+msgstr "没有为 --namespace 提供命名空间\n"
+
+#: git.c
+#, c-format
+msgid "no prefix given for --super-prefix\n"
+msgstr "没有为 --super-prefix 提供前缀\n"
+
+#: git.c
+#, c-format
+msgid "-c expects a configuration string\n"
+msgstr "应为 -c 提供一个配置字符串\n"
+
+#: git.c
+#, c-format
+msgid "no config key given for --config-env\n"
+msgstr "没有为 --config-env 提供配置名称\n"
+
+#: git.c
+#, c-format
+msgid "unknown option: %s\n"
+msgstr "未知选项：%s\n"
+
+#: git.c
+#, c-format
+msgid "while expanding alias '%s': '%s'"
+msgstr "在扩展别名 '%s' 时：'%s'"
+
+#: git.c
+#, c-format
+msgid ""
+"alias '%s' changes environment variables.\n"
+"You can use '!git' in the alias to do this"
+msgstr ""
+"别名 '%s' 修改环境变量。您可以使用在别名中\n"
+"使用 '!git'"
+
+#: git.c
+#, c-format
+msgid "empty alias for %s"
+msgstr "%s 的空别名"
+
+#: git.c
+#, c-format
+msgid "recursive alias: %s"
+msgstr "递归的别名：%s"
+
+#: git.c
+msgid "write failure on standard output"
+msgstr "在标准输出写入失败"
+
+#: git.c
+msgid "unknown write failure on standard output"
+msgstr "到标准输出的未知写入错误"
+
+#: git.c
+msgid "close failed on standard output"
+msgstr "标准输出关闭失败"
+
+#: git.c
+#, c-format
+msgid "alias loop detected: expansion of '%s' does not terminate:%s"
+msgstr "检测到别名循环：'%s'的扩展未终止：%s"
+
+#: git.c
+#, c-format
+msgid "cannot handle %s as a builtin"
+msgstr "不能作为内置命令处理 %s"
+
+#: git.c
+#, c-format
+msgid ""
+"usage: %s\n"
+"\n"
+msgstr ""
+"用法：%s\n"
+"\n"
+
+#: git.c
+#, c-format
+msgid "expansion of alias '%s' failed; '%s' is not a git command\n"
+msgstr "展开别名命令 '%s' 失败，'%s' 不是一个 git 命令\n"
+
+#: git.c
+#, c-format
+msgid "failed to run command '%s': %s\n"
+msgstr "无法运行命令 '%s'：%s\n"
+
+#: gpg-interface.c
+msgid "could not create temporary file"
+msgstr "不能创建临时文件"
+
+#: gpg-interface.c
+#, c-format
+msgid "failed writing detached signature to '%s'"
+msgstr "无法将分离式签名写入 '%s'"
+
+#: gpg-interface.c
+msgid ""
+"gpg.ssh.allowedSignersFile needs to be configured and exist for ssh "
+"signature verification"
+msgstr "ssh 签名验证需要 gpg.ssh.allowedSignersFile 被设置且存在"
+
+#: gpg-interface.c
+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
+#, c-format
+msgid "ssh signing revocation file configured but not found: %s"
+msgstr "设置了 ssh 签名吊销文件但无法找到：%s"
+
+#: gpg-interface.c
+#, c-format
+msgid "bad/incompatible signature '%s'"
+msgstr "坏的/不兼容的签名 '%s‘"
+
+#: gpg-interface.c
+#, c-format
+msgid "failed to get the ssh fingerprint for key '%s'"
+msgstr "无法得到密钥 '%s' 的 ssh 指纹"
+
+#: gpg-interface.c
+msgid ""
+"either user.signingkey or gpg.ssh.defaultKeyCommand needs to be configured"
+msgstr "需要配置 user.signingkey 或者 gpg.ssh.defaultKeyCommand 其中之一"
+
+#: gpg-interface.c
+#, c-format
+msgid "gpg.ssh.defaultKeyCommand succeeded but returned no keys: %s %s"
+msgstr "gpg.ssh.defaultKeyCommand 成功，但没有返回密钥：%s %s"
+
+#: gpg-interface.c
+#, c-format
+msgid "gpg.ssh.defaultKeyCommand failed: %s %s"
+msgstr "gpg.ssh.defaultKeyCommand 失败：%s %s"
+
+#: gpg-interface.c
+msgid "gpg failed to sign the data"
+msgstr "gpg 无法为数据签名"
+
+#: gpg-interface.c
+msgid "user.signingKey needs to be set for ssh signing"
+msgstr "ssh 签名需要设置 user.signingKey"
+
+#: gpg-interface.c
+#, c-format
+msgid "failed writing ssh signing key to '%s'"
+msgstr "无法将 ssh 签名密钥写入 '%s'"
+
+#: gpg-interface.c
+#, c-format
+msgid "failed writing ssh signing key buffer to '%s'"
+msgstr "无法将 ssh 签名密钥缓冲区写入 '%s'"
+
+#: gpg-interface.c
+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
+#, c-format
+msgid "failed reading ssh signing data buffer from '%s'"
+msgstr "无法从 '%s' 读入 ssh 签名数据"
+
+#: graph.c
+#, c-format
+msgid "ignored invalid color '%.*s' in log.graphColors"
+msgstr "忽略 log.graphColors 中无效的颜色 '%.*s'"
+
+#: grep.c
+msgid ""
+"given pattern contains NULL byte (via -f <file>). This is only supported "
+"with -P under PCRE v2"
+msgstr ""
+"给定的模式包含 NULL 字符（通过 -f <文件> 参数）。只有 PCRE v2 下的 -P 支持此"
+"功能"
+
+#: grep.c
+#, c-format
+msgid "'%s': unable to read %s"
+msgstr "'%s'：无法读取 %s"
+
+#: grep.c
+#, c-format
+msgid "'%s': short read"
+msgstr "'%s'：读取不完整"
+
+#: help.c
+msgid "start a working area (see also: git help tutorial)"
+msgstr "开始一个工作区（参见：git help tutorial）"
+
+#: help.c
+msgid "work on the current change (see also: git help everyday)"
+msgstr "在当前变更上工作（参见：git help everyday）"
+
+#: help.c
+msgid "examine the history and state (see also: git help revisions)"
+msgstr "检查历史和状态（参见：git help revisions）"
+
+#: help.c
+msgid "grow, mark and tweak your common history"
+msgstr "扩展、标记和调校您的历史记录"
+
+#: help.c
+msgid "collaborate (see also: git help workflows)"
+msgstr "协同（参见：git help workflows）"
+
+#: help.c
+msgid "Main Porcelain Commands"
+msgstr "主要的上层命令"
+
+#: help.c
+msgid "Ancillary Commands / Manipulators"
+msgstr "辅助命令/操作者"
+
+#: help.c
+msgid "Ancillary Commands / Interrogators"
+msgstr "辅助命令/询问者"
+
+#: help.c
+msgid "Interacting with Others"
+msgstr "与其它系统交互"
+
+#: help.c
+msgid "Low-level Commands / Manipulators"
+msgstr "低级命令/操作者"
+
+#: help.c
+msgid "Low-level Commands / Interrogators"
+msgstr "低级命令/询问者"
+
+#: help.c
+msgid "Low-level Commands / Syncing Repositories"
+msgstr "低级命令/同步仓库"
+
+#: help.c
+msgid "Low-level Commands / Internal Helpers"
+msgstr "低级命令/内部助手"
+
+#: help.c
+#, c-format
+msgid "available git commands in '%s'"
+msgstr "在 '%s' 下可用的 git 命令"
+
+#: help.c
+msgid "git commands available from elsewhere on your $PATH"
+msgstr "在 $PATH 路径中的其他地方可用的 git 命令"
+
+#: help.c
+msgid "These are common Git commands used in various situations:"
+msgstr "这些是各种场合常见的 Git 命令："
+
+#: help.c
+msgid "The Git concept guides are:"
+msgstr "Git 概念向导有："
+
+#: help.c
+msgid "External commands"
+msgstr "外部命令"
+
+#: help.c
+msgid "Command aliases"
+msgstr "命令别名"
+
+#: help.c
+msgid "See 'git help <command>' to read about a specific subcommand"
+msgstr "执行　'git help <command>' 来了解特定子命令"
+
+#: help.c
+#, c-format
+msgid ""
+"'%s' appears to be a git command, but we were not\n"
+"able to execute it. Maybe git-%s is broken?"
+msgstr ""
+"'%s' 像是一个 git 命令，但却无法运行。\n"
+"可能是 git-%s 受损？"
+
+#: help.c
+#, c-format
+msgid "git: '%s' is not a git command. See 'git --help'."
+msgstr "git：'%s' 不是一个 git 命令。参见 'git --help'。"
+
+#: help.c
+msgid "Uh oh. Your system reports no Git commands at all."
+msgstr "唉呀，您的系统中未发现 Git 命令。"
+
+#: help.c
+#, c-format
+msgid "WARNING: You called a Git command named '%s', which does not exist."
+msgstr "警告：您运行了一个并不存在的 Git 命令 '%s'。"
+
+#: help.c
+#, c-format
+msgid "Continuing under the assumption that you meant '%s'."
+msgstr "假定您想要的是 '%s' 并继续。"
+
+#: help.c
+#, c-format
+msgid "Run '%s' instead [y/N]? "
+msgstr "取而代之运行 '%s' [y/N]？"
+
+#: help.c
+#, c-format
+msgid "Continuing in %0.1f seconds, assuming that you meant '%s'."
+msgstr "假定您想要的是 '%2$s'，在 %1$0.1f 秒钟后继续。"
+
+#: help.c
+msgid ""
+"\n"
+"The most similar command is"
+msgid_plural ""
+"\n"
+"The most similar commands are"
+msgstr[0] ""
+"\n"
+"最相似的命令是"
+msgstr[1] ""
+"\n"
+"最相似的命令是"
+
+#: help.c
+msgid "git version [<options>]"
+msgstr "git version [<选项>]"
+
+#: help.c
+#, c-format
+msgid "%s: %s - %s"
+msgstr "%s：%s - %s"
+
+#: help.c
+msgid ""
+"\n"
+"Did you mean this?"
+msgid_plural ""
+"\n"
+"Did you mean one of these?"
+msgstr[0] ""
+"\n"
+"您指的是这个么？"
+msgstr[1] ""
+"\n"
+"您指的是这其中的某一个么？"
+
+#: hook.c
+#, 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` 来关闭这条警告。"
+
+#: hook.c
+#, c-format
+msgid "Couldn't start hook '%s'\n"
+msgstr "不能启动钩子 '%s'\n"
+
+#: http-fetch.c
+#, c-format
+msgid "argument to --packfile must be a valid hash (got '%s')"
+msgstr "--packfile 的参数必须是有效的哈希值（得到 '%s'）"
+
+#: http-fetch.c
+msgid "not a git repository"
+msgstr "不是 git 仓库"
+
+#: http.c
+#, c-format
+msgid "negative value for http.postBuffer; defaulting to %d"
+msgstr "http.postBuffer 为负值，默认为 %d"
+
+#: http.c
+msgid "Delegation control is not supported with cURL < 7.22.0"
+msgstr "不支持委托控制，因为 cURL < 7.22.0"
+
+#: http.c
+msgid "Public key pinning not supported with cURL < 7.39.0"
+msgstr "不支持公钥文件锁定，因为 cURL < 7.39.0"
+
+#: http.c
+msgid "CURLSSLOPT_NO_REVOKE not supported with cURL < 7.44.0"
+msgstr "不支持 CURLSSLOPT_NO_REVOKE，因为 cURL < 7.44.0"
+
+#: http.c
+#, c-format
+msgid "Unsupported SSL backend '%s'. Supported SSL backends:"
+msgstr "不支持的 SSL 后端 '%s'。支持的 SSL 后端："
+
+#: http.c
+#, c-format
+msgid "Could not set SSL backend to '%s': cURL was built without SSL backends"
+msgstr "无法设置 SSL 后端为 '%s'：cURL: cURL 没有使用 SSL 后端构建"
+
+#: http.c
+#, c-format
+msgid "Could not set SSL backend to '%s': already set"
+msgstr "无法将 SSL 后端设置为 '%s'：已经设置"
+
+#: http.c
+#, c-format
+msgid ""
+"unable to update url base from redirection:\n"
+"  asked for: %s\n"
+"   redirect: %s"
+msgstr ""
+"不能更新重定向的 url base：\n"
+"     请求：%s\n"
+"   重定向：%s"
+
+#: ident.c
+msgid "Author identity unknown\n"
+msgstr "作者身份未知\n"
+
+#: ident.c
+msgid "Committer identity unknown\n"
+msgstr "提交者身份未知\n"
+
+#: ident.c
+msgid ""
+"\n"
+"*** Please tell me who you are.\n"
+"\n"
+"Run\n"
+"\n"
+"  git config --global user.email \"you@example.com\"\n"
+"  git config --global user.name \"Your Name\"\n"
+"\n"
+"to set your account's default identity.\n"
+"Omit --global to set the identity only in this repository.\n"
+"\n"
+msgstr ""
+"\n"
+"*** 请告诉我您是谁。\n"
+"\n"
+"运行\n"
+"\n"
+"  git config --global user.email \"you@example.com\"\n"
+"  git config --global user.name \"Your Name\"\n"
+"\n"
+"来设置您账号的缺省身份标识。\n"
+"如果仅在本仓库设置身份标识，则省略 --global 参数。\n"
+
+#: ident.c
+msgid "no email was given and auto-detection is disabled"
+msgstr "未提供邮件地址且自动探测被禁用"
+
+#: ident.c
+#, c-format
+msgid "unable to auto-detect email address (got '%s')"
+msgstr "无法自动探测邮件地址（得到 '%s'）"
+
+#: ident.c
+msgid "no name was given and auto-detection is disabled"
+msgstr "未提供姓名且自动探测被禁用"
+
+#: ident.c
+#, c-format
+msgid "unable to auto-detect name (got '%s')"
+msgstr "无法自动探测姓名（得到 '%s'）"
+
+#: ident.c
+#, c-format
+msgid "empty ident name (for <%s>) not allowed"
+msgstr "不允许空的姓名（对于 <%s>）"
+
+#: ident.c
+#, c-format
+msgid "name consists only of disallowed characters: %s"
+msgstr "姓名中仅包含禁用字符：%s"
+
+#: list-objects-filter-options.c
+msgid "expected 'tree:<depth>'"
+msgstr "期望 'tree:<深度>'"
+
+#: list-objects-filter-options.c
+msgid "sparse:path filters support has been dropped"
+msgstr "sparse:path 过滤器支持已被删除"
+
+#: list-objects-filter-options.c
+#, c-format
+msgid "'%s' for 'object:type=<type>' is not a valid object type"
+msgstr "'object:type=<type>' 的值 '%s' 不是有效的对象类型"
+
+#: list-objects-filter-options.c
+#, c-format
+msgid "invalid filter-spec '%s'"
+msgstr "无效的过滤器表达式 '%s'"
+
+#: list-objects-filter-options.c
+#, c-format
+msgid "must escape char in sub-filter-spec: '%c'"
+msgstr "必须对 sub-filter-spec 中的字符进行转义：'%c'"
+
+#: list-objects-filter-options.c
+msgid "expected something after combine:"
+msgstr "期望在组合后有一些东西："
+
+#: list-objects-filter-options.c
+msgid "multiple filter-specs cannot be combined"
+msgstr "不能混用多种过滤规格"
+
+#: list-objects-filter-options.c
+msgid "unable to upgrade repository format to support partial clone"
+msgstr "无法升级仓库格式以支持部分克隆"
+
+#: list-objects-filter-options.h
+msgid "args"
+msgstr "参数"
+
+#: list-objects-filter-options.h
+msgid "object filtering"
+msgstr "对象过滤"
+
+#: list-objects-filter.c
+#, c-format
+msgid "unable to access sparse blob in '%s'"
+msgstr "不能访问 '%s' 中的稀疏数据对象"
+
+#: list-objects-filter.c
+#, c-format
+msgid "unable to parse sparse filter data in %s"
+msgstr "无法解析 %s 中的稀疏过滤器数据"
+
+#: list-objects.c
+#, c-format
+msgid "entry '%s' in tree %s has tree mode, but is not a tree"
+msgstr "树 %2$s 中的条目 '%1$s' 具有树的模式，但不是一个树对象"
+
+#: list-objects.c
+#, c-format
+msgid "entry '%s' in tree %s has blob mode, but is not a blob"
+msgstr "树 %2$s 中的条目 '%1$s' 具有数据对象的模式，但不是一个数据对象"
+
+#: list-objects.c
+#, c-format
+msgid "unable to load root tree for commit %s"
+msgstr "无法为提交 %s 加载根树"
+
+#: lockfile.c
+#, c-format
+msgid ""
+"Unable to create '%s.lock': %s.\n"
+"\n"
+"Another git process seems to be running in this repository, e.g.\n"
+"an editor opened by 'git commit'. Please make sure all processes\n"
+"are terminated then try again. If it still fails, a git process\n"
+"may have crashed in this repository earlier:\n"
+"remove the file manually to continue."
+msgstr ""
+"无法创建 '%s.lock'：%s。\n"
+"\n"
+"似乎另外一个 git 进程在这个仓库中运行，例如：'git commit' 命令打\n"
+"开了一个编辑器。请确认所有进程都已经关闭然后重试。如果仍然报错，\n"
+"可能之前有一个 git 进程在这个仓库中异常退出：\n"
+"手动删除这个文件再继续。"
+
+#: lockfile.c
+#, c-format
+msgid "Unable to create '%s.lock': %s"
+msgstr "不能创建 '%s.lock'：%s"
+
+#: ls-refs.c
+#, c-format
+msgid "unexpected line: '%s'"
+msgstr "意外的行：'%s'"
+
+#: ls-refs.c
+msgid "expected flush after ls-refs arguments"
+msgstr "在 ls-refs 参数后应该有一个 flush 包"
+
+#: mailinfo.c
+msgid "quoted CRLF detected"
+msgstr "检测到被引用的 CRLF"
+
+#: merge-ort-wrappers.c merge-recursive.c
+#, c-format
+msgid ""
+"Your local changes to the following files would be overwritten by merge:\n"
+"  %s"
+msgstr ""
+"您对下列文件的本地修改将被合并操作覆盖：\n"
+"  %s"
+
+#: merge-ort.c merge-recursive.c
+#, c-format
+msgid "Failed to merge submodule %s (not checked out)"
+msgstr "无法合并子模组 %s （没有检出）"
+
+#: merge-ort.c merge-recursive.c
+#, c-format
+msgid "Failed to merge submodule %s (commits not present)"
+msgstr "无法合并子模组 %s（提交不存在）"
+
+#: merge-ort.c merge-recursive.c
+#, c-format
+msgid "Failed to merge submodule %s (commits don't follow merge-base)"
+msgstr "无法合并子模组 %s （提交未跟随合并基线）"
+
+#: merge-ort.c
+#, c-format
+msgid "Note: Fast-forwarding submodule %s to %s"
+msgstr "注意：快进子模组 %s 到 %s"
+
+#: merge-ort.c
+#, c-format
+msgid "Failed to merge submodule %s"
+msgstr "无法合并子模组 %s"
+
+#: merge-ort.c
+#, c-format
+msgid ""
+"Failed to merge submodule %s, but a possible merge resolution exists:\n"
+"%s\n"
+msgstr ""
+"无法合并子模组 %s，但是存在一个可能的合并方案：\n"
+"%s\n"
+
+#: merge-ort.c merge-recursive.c
+#, c-format
+msgid ""
+"If this is correct simply add it to the index for example\n"
+"by using:\n"
+"\n"
+"  git update-index --cacheinfo 160000 %s \"%s\"\n"
+"\n"
+"which will accept this suggestion.\n"
+msgstr ""
+"如果这个正确，将其添加到索引，例如使用命令：\n"
+"\n"
+"  git update-index --cacheinfo 160000 %s \"%s\"\n"
+"\n"
+"以接受此建议。\n"
+
+#: merge-ort.c
+#, c-format
+msgid ""
+"Failed to merge submodule %s, but multiple possible merges exist:\n"
+"%s"
+msgstr ""
+"无法合并子模组 %s，但是存在多个可能的合并：\n"
+"%s"
+
+#: merge-ort.c merge-recursive.c
+msgid "Failed to execute internal merge"
+msgstr "无法执行内部合并"
+
+#: merge-ort.c merge-recursive.c
+#, c-format
+msgid "Unable to add %s to database"
+msgstr "不能添加 %s 至对象库"
+
+#: merge-ort.c merge-recursive.c
+#, c-format
+msgid "Auto-merging %s"
+msgstr "自动合并 %s"
+
+#: merge-ort.c merge-recursive.c
+#, 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 ""
+"冲突（隐式目录重命名）：处于隐式目录重命名的现存文件/目录 %s，将以下路径放"
+"在：%s。"
+
+#: merge-ort.c merge-recursive.c
+#, 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 ""
+"冲突（隐式目录重命名）：无法映射一个以上路径到 %s，隐式目录重命名尝试将这些路"
+"径放置于此：%s"
+
+#: merge-ort.c
+#, c-format
+msgid ""
+"CONFLICT (directory rename split): Unclear where to rename %s to; it was "
+"renamed to multiple other directories, with no destination getting a "
+"majority of the files."
+msgstr ""
+"冲突（分割的目录重命名）：不清楚重命名 %s 到哪里，因为它被重命名到多个其他目"
+"录中，没有一个目标目录中包含多数文件。"
+
+#: merge-ort.c merge-recursive.c
+#, c-format
+msgid ""
+"WARNING: Avoiding applying %s -> %s rename to %s, because %s itself was "
+"renamed."
+msgstr "警告：避免应用 %s -> %s 的重命名到 %s，因为 %s 本身已被重命名。"
+
+#: merge-ort.c merge-recursive.c
+#, c-format
+msgid ""
+"Path updated: %s added in %s inside a directory that was renamed in %s; "
+"moving it to %s."
+msgstr ""
+"路径已更新：%s 添加到 %s，位于一个被重命名到 %s 的目录中，将其移动到 %s。"
+
+#: merge-ort.c merge-recursive.c
+#, c-format
+msgid ""
+"Path updated: %s renamed to %s in %s, inside a directory that was renamed in "
+"%s; moving it to %s."
+msgstr ""
+"路径已更新：%1$s 重命名为 %3$s 中的 %2$s，而该目录被重命名到 %4$s 中，将其移"
+"动到 %5$s。"
+
+#: merge-ort.c merge-recursive.c
+#, 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 ""
+"冲突（文件位置）：%s 添加到 %s，位于一个被重命名为 %s 的目录中，建议将其移动"
+"到 %s。"
+
+#: merge-ort.c merge-recursive.c
+#, 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 ""
+"冲突（文件位置）：%1$s 重命名为 %3$s 中的 %2$s，而该目录被重命名到 %4$s 中，"
+"建议将其移动到 %5$s。"
+
+#: merge-ort.c
+#, 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
+#, 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."
+msgstr ""
+"冲突（重命名卷入冲突）：重命名 %s -> %s 有内容冲突并且和另外一个路径碰撞，这"
+"可能导致嵌套的冲突标签。"
+
+#: merge-ort.c
+#, 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 merge-recursive.c
+#, c-format
+msgid "cannot read object %s"
+msgstr "不能读取对象 %s"
+
+#: merge-ort.c merge-recursive.c
+#, c-format
+msgid "object %s is not a blob"
+msgstr "对象 %s 不是一个数据对象"
+
+#: merge-ort.c
+#, 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
+#, c-format
+msgid ""
+"CONFLICT (distinct types): %s had different types on each side; renamed both "
+"of them so each can be recorded somewhere."
+msgstr ""
+"冲突（不同类型）：%s 在两侧有不同的类型，将两者都重命名以便它们能记录在不同位"
+"置。"
+
+#: merge-ort.c
+#, c-format
+msgid ""
+"CONFLICT (distinct types): %s had different types on each side; renamed one "
+"of them so each can be recorded somewhere."
+msgstr ""
+"冲突（不同类型）：%s 在两侧有不同的类型，将其中之一重命名以便它们能记录在不同"
+"位置。"
+
+#: merge-ort.c merge-recursive.c
+msgid "content"
+msgstr "内容"
+
+#: merge-ort.c merge-recursive.c
+msgid "add/add"
+msgstr "添加/添加"
+
+#: merge-ort.c merge-recursive.c
+msgid "submodule"
+msgstr "子模组"
+
+#: merge-ort.c merge-recursive.c
+#, c-format
+msgid "CONFLICT (%s): Merge conflict in %s"
+msgstr "冲突（%s）：合并冲突于 %s"
+
+#: merge-ort.c
+#, c-format
+msgid ""
+"CONFLICT (modify/delete): %s deleted in %s and modified in %s.  Version %s "
+"of %s left in tree."
+msgstr ""
+"冲突（修改/删除）：%1$s 在 %2$s 中被删除，在 %3$s 中被修改。%5$s 的 %4$s 版本"
+"在树中被保留。"
+
+#: merge-ort.c
+#, c-format
+msgid ""
+"Note: %s not up to date and in way of checking out conflicted version; old "
+"copy renamed to %s"
+msgstr "注意：%s 不是最新的，并且与要检出的版本冲突。旧副本重命名为 %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
+#, c-format
+msgid "collecting merge info failed for trees %s, %s, %s"
+msgstr "无法收集树 %s、%s、%s 的合并信息"
+
+#: merge-recursive.c
+msgid "(bad commit)\n"
+msgstr "（坏提交）\n"
+
+#: merge-recursive.c
+#, c-format
+msgid "add_cacheinfo failed for path '%s'; merge aborting."
+msgstr "add_cacheinfo 对路径 '%s' 执行失败，合并终止。"
+
+#: merge-recursive.c
+#, c-format
+msgid "add_cacheinfo failed to refresh for path '%s'; merge aborting."
+msgstr "add_cacheinfo 无法刷新路径 '%s'，合并终止。"
+
+#: merge-recursive.c
+#, c-format
+msgid "failed to create path '%s'%s"
+msgstr "无法创建路径 '%s'%s"
+
+#: merge-recursive.c
+#, c-format
+msgid "Removing %s to make room for subdirectory\n"
+msgstr "删除 %s 以便为子目录留出空间\n"
+
+#: merge-recursive.c
+msgid ": perhaps a D/F conflict?"
+msgstr "：可能是一个目录/文件冲突？"
+
+#: merge-recursive.c
+#, c-format
+msgid "refusing to lose untracked file at '%s'"
+msgstr "拒绝丢弃 '%s' 中的未跟踪文件"
+
+#: merge-recursive.c
+#, c-format
+msgid "blob expected for %s '%s'"
+msgstr "%s '%s' 应为数据对象"
+
+#: merge-recursive.c
+#, c-format
+msgid "failed to open '%s': %s"
+msgstr "无法打开 '%s'：%s"
+
+#: merge-recursive.c
+#, c-format
+msgid "failed to symlink '%s': %s"
+msgstr "无法创建符号链接 '%s'：%s"
+
+#: merge-recursive.c
+#, c-format
+msgid "do not know what to do with %06o %s '%s'"
+msgstr "不知道如何处理 %06o %s '%s'"
+
+#: merge-recursive.c
+#, c-format
+msgid "Fast-forwarding submodule %s to the following commit:"
+msgstr "子模组 %s 快进到如下提交："
+
+#: merge-recursive.c
+#, c-format
+msgid "Fast-forwarding submodule %s"
+msgstr "快进子模组 %s"
+
+#: merge-recursive.c
+#, c-format
+msgid "Failed to merge submodule %s (merge following commits not found)"
+msgstr "无法合并子模组 %s （没发现合并跟随的提交）"
+
+#: merge-recursive.c
+#, c-format
+msgid "Failed to merge submodule %s (not fast-forward)"
+msgstr "无法合并子模组 %s（非快进）"
+
+#: merge-recursive.c
+msgid "Found a possible merge resolution for the submodule:\n"
+msgstr "找到子模组的一个可能的合并方案：\n"
+
+#: merge-recursive.c
+#, c-format
+msgid "Failed to merge submodule %s (multiple merges found)"
+msgstr "无法合并子模组 %s （发现多个合并）"
+
+#: merge-recursive.c
+#, c-format
+msgid "Error: Refusing to lose untracked file at %s; writing to %s instead."
+msgstr "错误：拒绝丢失未跟踪文件 '%s'，而是写入 %s。"
+
+#: merge-recursive.c
+#, c-format
+msgid ""
+"CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s left "
+"in tree."
+msgstr ""
+"冲突（%1$s/删除）：%2$s 在 %3$s 中被删除，在 %5$s 中被 %4$s。%7$s 的 %6$s 版"
+"本被保留。"
+
+#: merge-recursive.c
+#, c-format
+msgid ""
+"CONFLICT (%s/delete): %s deleted in %s and %s to %s in %s. Version %s of %s "
+"left in tree."
+msgstr ""
+"冲突（%1$s/删除）：%2$s 在 %3$s 中被删除，在 %6$s 中的 %5$s 被 %4$s。%8$s 的 "
+"%7$s 版本被保留。"
+
+#: merge-recursive.c
+#, c-format
+msgid ""
+"CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s left "
+"in tree at %s."
+msgstr ""
+"冲突（%1$s/删除）：%2$s 在 %3$s 中被删除，在 %5$s 中被 %4$s。%7$s 的 %6$s 版"
+"本保留在 %8$s 中。"
+
+#: merge-recursive.c
+#, 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 ""
+"冲突（%1$s/删除）：%2$s 在 %3$s 中被删除，在 %6$s 中的 %5$s 被 %4$s。%8$s 的 "
+"%7$s 版本保留在 %9$s 中。"
+
+#: merge-recursive.c
+msgid "rename"
+msgstr "重命名"
+
+#: merge-recursive.c
+msgid "renamed"
+msgstr "重命名"
+
+#: merge-recursive.c
+#, c-format
+msgid "Refusing to lose dirty file at %s"
+msgstr "拒绝丢失脏文件 '%s'"
+
+#: merge-recursive.c
+#, c-format
+msgid "Refusing to lose untracked file at %s, even though it's in the way."
+msgstr "拒绝在 '%s' 处失去未跟踪文件，即使它存在于重命名中。"
+
+#: merge-recursive.c
+#, 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
+#, c-format
+msgid "%s is a directory in %s adding as %s instead"
+msgstr "%s 是 %s 中的一个目录而以 %s 为名被添加"
+
+#: merge-recursive.c
+#, c-format
+msgid "Refusing to lose untracked file at %s; adding as %s instead"
+msgstr "拒绝丢失未跟踪文件 '%s'，而是添加为 %s"
+
+#: merge-recursive.c
+#, c-format
+msgid ""
+"CONFLICT (rename/rename): Rename \"%s\"->\"%s\" in branch \"%s\" rename "
+"\"%s\"->\"%s\" in \"%s\"%s"
+msgstr ""
+"冲突（重命名/重命名）：在分支 \"%3$s\" 中重命名 \"%1$s\"->\"%2$s\"，在分支 "
+"\"%6$s\" 中重命名 \"%4$s\"->\"%5$s\"%7$s"
+
+#: merge-recursive.c
+msgid " (left unresolved)"
+msgstr "（留下未解决）"
+
+#: merge-recursive.c
+#, 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
+#, c-format
+msgid ""
+"CONFLICT (directory rename split): Unclear where to place %s because "
+"directory %s was renamed to multiple other directories, with no destination "
+"getting a majority of the files."
+msgstr ""
+"冲突（分割的目录重命名）：不清楚 %s 应该放在哪里，因为目录 %s 被重命名到多个"
+"其它目录，没有目录包含大部分文件。"
+
+#: merge-recursive.c
+#, c-format
+msgid ""
+"CONFLICT (rename/rename): Rename directory %s->%s in %s. Rename directory %s-"
+">%s in %s"
+msgstr ""
+"冲突（重命名/重命名）：在 %3$s 中重命名目录 %1$s->%2$s，在 %6$s 中重命名目录 "
+"%4$s->%5$s"
+
+#: merge-recursive.c
+msgid "modify"
+msgstr "修改"
+
+#: merge-recursive.c
+msgid "modified"
+msgstr "修改"
+
+#: merge-recursive.c
+#, c-format
+msgid "Skipped %s (merged same as existing)"
+msgstr "略过 %s（已经做过相同合并）"
+
+#: merge-recursive.c
+#, c-format
+msgid "Adding as %s instead"
+msgstr "而是以 %s 为名添加"
+
+#: merge-recursive.c
+#, c-format
+msgid "Removing %s"
+msgstr "删除 %s"
+
+#: merge-recursive.c
+msgid "file/directory"
+msgstr "文件/目录"
+
+#: merge-recursive.c
+msgid "directory/file"
+msgstr "目录/文件"
+
+#: merge-recursive.c
+#, 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
+#, c-format
+msgid "Adding %s"
+msgstr "添加 %s"
+
+#: merge-recursive.c
+#, c-format
+msgid "CONFLICT (add/add): Merge conflict in %s"
+msgstr "冲突（add/add）：合并冲突于 %s"
+
+#: merge-recursive.c
+#, c-format
+msgid "merging of trees %s and %s failed"
+msgstr "无法合并树 %s 和 %s"
+
+#: merge-recursive.c
+msgid "Merging:"
+msgstr "合并："
+
+#: merge-recursive.c
+#, c-format
+msgid "found %u common ancestor:"
+msgid_plural "found %u common ancestors:"
+msgstr[0] "发现 %u 个共同祖先："
+msgstr[1] "发现 %u 个共同祖先："
+
+#: merge-recursive.c
+msgid "merge returned no commit"
+msgstr "合并未返回提交"
+
+#: merge-recursive.c
+#, c-format
+msgid "Could not parse object '%s'"
+msgstr "不能解析对象 '%s'"
+
+#: merge.c
+msgid "failed to read the cache"
+msgstr "无法读取缓存"
+
+#: midx.c
+msgid "multi-pack-index OID fanout is of the wrong size"
+msgstr "多包索引的对象ID扇出表大小错误"
+
+#: midx.c
+#, c-format
+msgid "multi-pack-index file %s is too small"
+msgstr "多包索引文件 %s 太小"
+
+#: midx.c
+#, c-format
+msgid "multi-pack-index signature 0x%08x does not match signature 0x%08x"
+msgstr "多包索引签名 0x%08x 和签名 0x%08x 不匹配"
+
+#: midx.c
+#, c-format
+msgid "multi-pack-index version %d not recognized"
+msgstr "multi-pack-index 版本 %d 不能被识别"
+
+#: midx.c
+#, c-format
+msgid "multi-pack-index hash version %u does not match version %u"
+msgstr "多包索引哈希版本 %u 和版本 %u 不匹配"
+
+#: midx.c
+msgid "multi-pack-index missing required pack-name chunk"
+msgstr "多包索引缺少必需的包名块"
+
+#: midx.c
+msgid "multi-pack-index missing required OID fanout chunk"
+msgstr "多包索引缺少必需的对象 ID 扇出块"
+
+#: midx.c
+msgid "multi-pack-index missing required OID lookup chunk"
+msgstr "多包索引缺少必需的对象 ID 查询块"
+
+#: midx.c
+msgid "multi-pack-index missing required object offsets chunk"
+msgstr "多包索引缺少必需的对象偏移块"
+
+#: midx.c
+#, c-format
+msgid "multi-pack-index pack names out of order: '%s' before '%s'"
+msgstr "多包索引包名无序：'%s' 在 '%s' 之前"
+
+#: midx.c
+#, c-format
+msgid "bad pack-int-id: %u (%u total packs)"
+msgstr "错的 pack-int-id：%u（共有 %u 个包）"
+
+#: midx.c
+msgid "multi-pack-index stores a 64-bit offset, but off_t is too small"
+msgstr "多包索引存储一个64位偏移，但是 off_t 太小"
+
+#: midx.c
+#, c-format
+msgid "failed to add packfile '%s'"
+msgstr "无法添加包文件 '%s'"
+
+#: midx.c
+#, c-format
+msgid "failed to open pack-index '%s'"
+msgstr "无法打开包索引 '%s'"
+
+#: midx.c
+#, c-format
+msgid "failed to locate object %d in packfile"
+msgstr "无法在包文件中定位对象 %d"
+
+#: midx.c
+msgid "cannot store reverse index file"
+msgstr "无法存储反向索引文件"
+
+#: midx.c
+#, c-format
+msgid "could not parse line: %s"
+msgstr "不能解析行：%s"
+
+#: midx.c
+#, c-format
+msgid "malformed line: %s"
+msgstr "格式错误的行：%s"
+
+#: midx.c
+msgid "ignoring existing multi-pack-index; checksum mismatch"
+msgstr "忽略已存在的多包索引，校验码不匹配"
+
+#: midx.c
+msgid "could not load pack"
+msgstr "不能载入包"
+
+#: midx.c
+#, c-format
+msgid "could not open index for %s"
+msgstr "不能打开 %s 的索引"
+
+#: midx.c
+msgid "Adding packfiles to multi-pack-index"
+msgstr "添加包文件到多包索引"
+
+#: midx.c
+#, c-format
+msgid "unknown preferred pack: '%s'"
+msgstr "未知的首选包：'%s'"
+
+#: midx.c
+#, c-format
+msgid "cannot select preferred pack %s with no objects"
+msgstr "不能选择没有对象的首选包 %s"
+
+#: midx.c
+#, c-format
+msgid "did not see pack-file %s to drop"
+msgstr "没有看到要丢弃的包文件 %s"
+
+#: midx.c
+#, c-format
+msgid "preferred pack '%s' is expired"
+msgstr "首选包 '%s' 已过期"
+
+#: midx.c
+msgid "no pack files to index."
+msgstr "没有要索引的包文件。"
+
+#: midx.c
+msgid "refusing to write multi-pack .bitmap without any objects"
+msgstr "拒绝写入没有任何对象的多包位图 .bitmap"
+
+#: midx.c
+msgid "could not write multi-pack bitmap"
+msgstr "无法写入多包位图"
+
+#: midx.c
+msgid "could not write multi-pack-index"
+msgstr "无法写入多包索引"
+
+#: midx.c
+#, c-format
+msgid "failed to clear multi-pack-index at %s"
+msgstr "无法清理位于 %s 的多包索引"
+
+#: midx.c
+msgid "multi-pack-index file exists, but failed to parse"
+msgstr "多包索引文件存在，但无法解析"
+
+#: midx.c
+msgid "incorrect checksum"
+msgstr "不正确的校验码"
+
+#: midx.c
+msgid "Looking for referenced packfiles"
+msgstr "正在查找引用的包文件"
+
+#: midx.c
+#, c-format
+msgid ""
+"oid fanout out of order: fanout[%d] = %<PRIx32> > %<PRIx32> = fanout[%d]"
+msgstr "对象 ID 扇出无序：fanout[%d] = %<PRIx32> > %<PRIx32> = fanout[%d]"
+
+#: midx.c
+msgid "the midx contains no oid"
+msgstr "midx 不包含 oid"
+
+#: midx.c
+msgid "Verifying OID order in multi-pack-index"
+msgstr "校验多包索引中的 OID 顺序"
+
+#: midx.c
+#, c-format
+msgid "oid lookup out of order: oid[%d] = %s >= %s = oid[%d]"
+msgstr "对象 ID 查询无序：oid[%d] = %s >= %s = oid[%d]"
+
+#: midx.c
+msgid "Sorting objects by packfile"
+msgstr "通过包文件为对象排序"
+
+#: midx.c
+msgid "Verifying object offsets"
+msgstr "校验对象偏移"
+
+#: midx.c
+#, c-format
+msgid "failed to load pack entry for oid[%d] = %s"
+msgstr "无法为 oid[%d] = %s 加载包条目"
+
+#: midx.c
+#, c-format
+msgid "failed to load pack-index for packfile %s"
+msgstr "无法为包文件 %s 加载包索引"
+
+#: midx.c
+#, c-format
+msgid "incorrect object offset for oid[%d] = %s: %<PRIx64> != %<PRIx64>"
+msgstr "oid[%d] = %s 错误的对象偏移：%<PRIx64> != %<PRIx64>"
+
+#: midx.c
+msgid "Counting referenced objects"
+msgstr "正在对引用对象计数"
+
+#: midx.c
+msgid "Finding and deleting unreferenced packfiles"
+msgstr "正在查找和删除未引用的包文件"
+
+#: midx.c
+msgid "could not start pack-objects"
+msgstr "不能开始 pack-objects"
+
+#: midx.c
+msgid "could not finish pack-objects"
+msgstr "不能结束 pack-objects"
+
+#: name-hash.c
+#, c-format
+msgid "unable to create lazy_dir thread: %s"
+msgstr "不能创建 lazy_dir 线程：%s"
+
+#: name-hash.c
+#, c-format
+msgid "unable to create lazy_name thread: %s"
+msgstr "不能创建 lazy_name 线程：%s"
+
+#: name-hash.c
+#, c-format
+msgid "unable to join lazy_name thread: %s"
+msgstr "不能加入 lazy_name 线程：%s"
+
+#: notes-merge.c
+#, 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."
+msgstr ""
+"您的前一次注释合并尚未结束（存在 %s）。\n"
+"在开始一个新的注释合并之前，请使用 'git notes merge --commit' 或者 'git "
+"notes merge --abort' 来提交/终止前一次合并。"
+
+#: notes-merge.c
+#, c-format
+msgid "You have not concluded your notes merge (%s exists)."
+msgstr "您尚未结束注释合并（存在 %s）。"
+
+#: notes-utils.c
+msgid "Cannot commit uninitialized/unreferenced notes tree"
+msgstr "不能提交未初始化/未引用的注解树"
+
+#: notes-utils.c
+#, c-format
+msgid "Bad notes.rewriteMode value: '%s'"
+msgstr "坏的 notes.rewriteMode 值：'%s'"
+
+#: notes-utils.c
+#, c-format
+msgid "Refusing to rewrite notes in %s (outside of refs/notes/)"
+msgstr "拒绝向 %s（在 refs/notes/ 之外）写入注解"
+
+#. TRANSLATORS: The first %s is the name of
+#. the environment variable, the second %s is
+#. its value.
+#.
+#: notes-utils.c
+#, c-format
+msgid "Bad %s value: '%s'"
+msgstr "坏的 %s 值：'%s'"
+
+#: object-file.c
+#, c-format
+msgid "object directory %s does not exist; check .git/objects/info/alternates"
+msgstr "对象目录 %s 不存在，检查 .git/objects/info/alternates"
+
+#: object-file.c
+#, c-format
+msgid "unable to normalize alternate object path: %s"
+msgstr "无法规范化备用对象路径：%s"
+
+#: object-file.c
+#, c-format
+msgid "%s: ignoring alternate object stores, nesting too deep"
+msgstr "%s：忽略备用对象库，嵌套太深"
+
+#: object-file.c
+#, c-format
+msgid "unable to normalize object directory: %s"
+msgstr "无法规范化对象目录: %s"
+
+#: object-file.c
+msgid "unable to fdopen alternates lockfile"
+msgstr "无法 fdopen 替换锁文件"
+
+#: object-file.c
+msgid "unable to read alternates file"
+msgstr "无法读取替代文件"
+
+#: object-file.c
+msgid "unable to move new alternates file into place"
+msgstr "无法将新的替代文件移动到位"
+
+#: object-file.c
+#, c-format
+msgid "path '%s' does not exist"
+msgstr "路径 '%s' 不存在"
+
+#: object-file.c
+#, c-format
+msgid "reference repository '%s' as a linked checkout is not supported yet."
+msgstr "尚不支持将参考仓库 '%s' 作为一个链接检出。"
+
+#: object-file.c
+#, c-format
+msgid "reference repository '%s' is not a local repository."
+msgstr "参考仓库 '%s' 不是一个本地仓库。"
+
+#: object-file.c
+#, c-format
+msgid "reference repository '%s' is shallow"
+msgstr "参考仓库 '%s' 是一个浅克隆"
+
+#: object-file.c
+#, c-format
+msgid "reference repository '%s' is grafted"
+msgstr "参考仓库 '%s' 已被移植"
+
+#: object-file.c
+#, c-format
+msgid "could not find object directory matching %s"
+msgstr "无法找到和 %s 匹配的对象目录"
+
+#: object-file.c
+#, c-format
+msgid "invalid line while parsing alternate refs: %s"
+msgstr "解析备用引用时无效的行：%s"
+
+#: object-file.c
+#, c-format
+msgid "attempting to mmap %<PRIuMAX> over limit %<PRIuMAX>"
+msgstr "尝试 mmap %<PRIuMAX>，超过了最大值 %<PRIuMAX>"
+
+#: object-file.c
+#, c-format
+msgid "mmap failed%s"
+msgstr "mmap 失败%s"
+
+#: object-file.c
+#, c-format
+msgid "object file %s is empty"
+msgstr "对象文件 %s 为空"
+
+#: object-file.c
+#, c-format
+msgid "corrupt loose object '%s'"
+msgstr "损坏的松散对象 '%s'"
+
+#: object-file.c
+#, c-format
+msgid "garbage at end of loose object '%s'"
+msgstr "松散对象 '%s' 后面有垃圾数据"
+
+#: object-file.c
+#, c-format
+msgid "unable to parse %s header"
+msgstr "无法解析 %s 头部"
+
+#: object-file.c
+msgid "invalid object type"
+msgstr "无效的对象类型"
+
+#: object-file.c
+#, c-format
+msgid "unable to unpack %s header"
+msgstr "无法解开 %s 头部"
+
+#: object-file.c
+#, c-format
+msgid "header for %s too long, exceeds %d bytes"
+msgstr "%s 的头部太长，超出了 %d 字节"
+
+#: object-file.c
+#, c-format
+msgid "failed to read object %s"
+msgstr "无法读取对象 %s"
+
+#: object-file.c
+#, c-format
+msgid "replacement %s not found for %s"
+msgstr "找不到 %2$s 的替代 %1$s"
+
+#: object-file.c
+#, c-format
+msgid "loose object %s (stored in %s) is corrupt"
+msgstr "松散对象 %s（保存在 %s）已损坏"
+
+#: object-file.c
+#, c-format
+msgid "packed object %s (stored in %s) is corrupt"
+msgstr "打包对象 %s（保存在 %s）已损坏"
+
+#: object-file.c
+#, c-format
+msgid "unable to write file %s"
+msgstr "无法写文件 %s"
+
+#: object-file.c
+#, c-format
+msgid "unable to set permission to '%s'"
+msgstr "无法为 '%s' 设置权限"
+
+#: object-file.c
+msgid "file write error"
+msgstr "文件写错误"
+
+#: object-file.c
+msgid "error when closing loose object file"
+msgstr "关闭松散对象文件时出错"
+
+#: object-file.c
+#, c-format
+msgid "insufficient permission for adding an object to repository database %s"
+msgstr "权限不足，无法在仓库对象库 %s 中添加对象"
+
+#: object-file.c
+msgid "unable to create temporary file"
+msgstr "无法创建临时文件"
+
+#: object-file.c
+msgid "unable to write loose object file"
+msgstr "不能写松散对象文件"
+
+#: object-file.c
+#, c-format
+msgid "unable to deflate new object %s (%d)"
+msgstr "不能压缩新对象 %s（%d）"
+
+#: object-file.c
+#, c-format
+msgid "deflateEnd on object %s failed (%d)"
+msgstr "在对象 %s 上调用 deflateEnd 失败（%d）"
+
+#: object-file.c
+#, c-format
+msgid "confused by unstable object source data for %s"
+msgstr "被 %s 的不稳定对象源数据搞糊涂了"
+
+#: object-file.c
+#, c-format
+msgid "cannot read object for %s"
+msgstr "不能读取对象 %s"
+
+#: object-file.c
+msgid "corrupt commit"
+msgstr "损坏的提交"
+
+#: object-file.c
+msgid "corrupt tag"
+msgstr "损坏的标签"
+
+#: object-file.c
+#, c-format
+msgid "read error while indexing %s"
+msgstr "索引 %s 时读取错误"
+
+#: object-file.c
+#, c-format
+msgid "short read while indexing %s"
+msgstr "索引 %s 时读入不完整"
+
+#: object-file.c
+#, c-format
+msgid "%s: failed to insert into database"
+msgstr "%s：无法插入数据库"
+
+#: object-file.c
+#, c-format
+msgid "%s: unsupported file type"
+msgstr "%s：不支持的文件类型"
+
+#: object-file.c
+#, c-format
+msgid "%s is not a valid '%s' object"
+msgstr "%s 不是一个有效的 '%s' 对象"
+
+#: object-file.c
+#, c-format
+msgid "unable to open %s"
+msgstr "不能打开 %s"
+
+#: object-file.c
+#, c-format
+msgid "hash mismatch for %s (expected %s)"
+msgstr "%s 的哈希值不匹配（预期 %s）"
+
+#: object-file.c
+#, c-format
+msgid "unable to mmap %s"
+msgstr "不能 mmap %s"
+
+#: object-file.c
+#, c-format
+msgid "unable to unpack header of %s"
+msgstr "无法解压缩 %s 的头部"
+
+#: object-file.c
+#, c-format
+msgid "unable to parse header of %s"
+msgstr "无法解析 %s 的头部"
+
+#: object-file.c
+#, c-format
+msgid "unable to unpack contents of %s"
+msgstr "无法解压缩 %s 的内容"
+
+#. TRANSLATORS: This is a line of ambiguous object
+#. output shown when we cannot look up or parse the
+#. object in question. E.g. "deadbeef [bad object]".
+#.
+#: object-name.c
+#, c-format
+msgid "%s [bad object]"
+msgstr "%s [坏的对象]"
+
+#. TRANSLATORS: This is a line of ambiguous commit
+#. object output. E.g.:
+#. *
+#.    "deadbeef commit 2021-01-01 - Some Commit Message"
+#.
+#: object-name.c
+#, c-format
+msgid "%s commit %s - %s"
+msgstr "%s 提交 %s - %s"
+
+#. TRANSLATORS: This is a line of ambiguous
+#. tag object output. E.g.:
+#. *
+#.    "deadbeef tag 2022-01-01 - Some Tag Message"
+#. *
+#. The second argument is the YYYY-MM-DD found
+#. in the tag.
+#. *
+#. The third argument is the "tag" string
+#. from object.c.
+#.
+#: object-name.c
+#, c-format
+msgid "%s tag %s - %s"
+msgstr "%s 标签 %s - %s"
+
+#. TRANSLATORS: This is a line of ambiguous
+#. tag object output where we couldn't parse
+#. the tag itself. E.g.:
+#. *
+#.    "deadbeef [bad tag, could not parse it]"
+#.
+#: object-name.c
+#, c-format
+msgid "%s [bad tag, could not parse it]"
+msgstr "%s [坏的标签，无法解析]"
+
+#. TRANSLATORS: This is a line of ambiguous <type>
+#. object output. E.g. "deadbeef tree".
+#.
+#: object-name.c
+#, c-format
+msgid "%s tree"
+msgstr "%s 树"
+
+#. TRANSLATORS: This is a line of ambiguous <type>
+#. object output. E.g. "deadbeef blob".
+#.
+#: object-name.c
+#, c-format
+msgid "%s blob"
+msgstr "%s 数据对象"
+
+#: object-name.c
+#, c-format
+msgid "short object ID %s is ambiguous"
+msgstr "短对象ID %s 存在歧义"
+
+#. TRANSLATORS: The argument is the list of ambiguous
+#. objects composed in show_ambiguous_object(). See
+#. its "TRANSLATORS" comments for details.
+#.
+#: object-name.c
+#, c-format
+msgid ""
+"The candidates are:\n"
+"%s"
+msgstr ""
+"候选者有：\n"
+"%s"
+
+#: object-name.c
+msgid ""
+"Git normally never creates a ref that ends with 40 hex characters\n"
+"because it will be ignored when you just specify 40-hex. These refs\n"
+"may be created by mistake. For example,\n"
+"\n"
+"  git switch -c $br $(git rev-parse ...)\n"
+"\n"
+"where \"$br\" is somehow empty and a 40-hex ref is created. Please\n"
+"examine these refs and maybe delete them. Turn this message off by\n"
+"running \"git config advice.objectNameWarning false\""
+msgstr ""
+"Git 通常不会创建一个以40个十六进制字符结尾的引用，因为当您只提供40\n"
+"个十六进制字符时将被忽略。这些引用可能被错误地创建。例如：\n"
+"\n"
+"  git switch -c $br $(git rev-parse ...)\n"
+"\n"
+"当 \"$br\" 某种原因空白时，一个40位十六进制的引用将被创建。请检查这些\n"
+"引用，可能需要删除它们。运行 \"git config advice.objectNameWarning\n"
+"false\" 命令关闭本消息通知。"
+
+#: object-name.c
+#, c-format
+msgid "log for '%.*s' only goes back to %s"
+msgstr "'%.*s' 的日志仅能回到 %s"
+
+#: object-name.c
+#, c-format
+msgid "log for '%.*s' only has %d entries"
+msgstr "'%.*s' 的日志仅有 %d 个条目"
+
+#: object-name.c
+#, c-format
+msgid "path '%s' exists on disk, but not in '%.*s'"
+msgstr "路径 '%s' 在磁盘上，但是不在 '%.*s' 中"
+
+#: object-name.c
+#, c-format
+msgid ""
+"path '%s' exists, but not '%s'\n"
+"hint: Did you mean '%.*s:%s' aka '%.*s:./%s'?"
+msgstr ""
+"路径 '%s' 存在，而 '%s' 不存在\n"
+"提示：您的意思是 '%.*s:%s' 亦即 '%.*s:./%s'？"
+
+#: object-name.c
+#, c-format
+msgid "path '%s' does not exist in '%.*s'"
+msgstr "路径 '%s' 不在 '%.*s' 中"
+
+#: object-name.c
+#, c-format
+msgid ""
+"path '%s' is in the index, but not at stage %d\n"
+"hint: Did you mean ':%d:%s'?"
+msgstr ""
+"路径 '%s' 在索引中，但不在暂存区 %d 中\n"
+"提示：您的意思是 ':%d:%s'？"
+
+#: object-name.c
+#, c-format
+msgid ""
+"path '%s' is in the index, but not '%s'\n"
+"hint: Did you mean ':%d:%s' aka ':%d:./%s'?"
+msgstr ""
+"路径 '%s' 在索引中，但 '%s' 不在\n"
+"提示：您的意思是 ':%d:%s' 亦即 ':%d:./%s'？"
+
+#: object-name.c
+#, c-format
+msgid "path '%s' exists on disk, but not in the index"
+msgstr "路径 '%s' 在磁盘上，但不在索引里"
+
+#: object-name.c
+#, c-format
+msgid "path '%s' does not exist (neither on disk nor in the index)"
+msgstr "路径 '%s' 不存在（既不在磁盘上，也不在索引中）"
+
+#: object-name.c
+msgid "relative path syntax can't be used outside working tree"
+msgstr "不能在工作区之外使用相对路径语法"
+
+#: object-name.c
+#, c-format
+msgid "<object>:<path> required, only <object> '%s' given"
+msgstr "需要 <对象>:<路径>，只给出了 <对象> '%s'"
+
+#: object-name.c
+#, c-format
+msgid "invalid object name '%.*s'."
+msgstr "无效的对象名 '%.*s'。"
+
+#: object.c
+#, c-format
+msgid "invalid object type \"%s\""
+msgstr "无效的对象类型 \"%s\""
+
+#: object.c
+#, c-format
+msgid "object %s is a %s, not a %s"
+msgstr "对象 %s 是一个 %s，不是一个 %s"
+
+#: object.c
+#, c-format
+msgid "object %s has unknown type id %d"
+msgstr "对象 %s 有未知的类型 id %d"
+
+#: object.c
+#, c-format
+msgid "unable to parse object: %s"
+msgstr "不能解析对象：%s"
+
+#: object.c
+#, c-format
+msgid "hash mismatch %s"
+msgstr "哈希值与 %s 不匹配"
+
+#: pack-bitmap.c
+msgid "multi-pack bitmap is missing required reverse index"
+msgstr "多包位图缺少必需的反向索引"
+
+#: pack-bitmap.c
+#, c-format
+msgid "could not open pack %s"
+msgstr "不能打开包 %s"
+
+#: pack-bitmap.c
+#, c-format
+msgid "preferred pack (%s) is invalid"
+msgstr "首选包 (%s) 无效"
+
+#: pack-bitmap.c
+#, c-format
+msgid "could not find %s in pack %s at offset %<PRIuMAX>"
+msgstr "在包 %2$s 偏移 %3$<PRIuMAX> 中无法找到 %1$s"
+
+#: pack-mtimes.c
+#, c-format
+msgid "mtimes file %s is too small"
+msgstr "mtimes 文件 %s 太小"
+
+#: pack-mtimes.c
+#, c-format
+msgid "mtimes file %s has unknown signature"
+msgstr "mtimes 文件 %s 有未知的签名"
+
+#: pack-mtimes.c
+#, c-format
+msgid "mtimes file %s has unsupported version %<PRIu32>"
+msgstr "mtimes 文件 %s 不支持的版本 %<PRIu32>"
+
+#: pack-mtimes.c
+#, c-format
+msgid "mtimes file %s has unsupported hash id %<PRIu32>"
+msgstr "mtimes 文件 %s 有不支持的哈希 ID %<PRIu32>"
+
+#: pack-mtimes.c
+#, c-format
+msgid "mtimes file %s is corrupt"
+msgstr "mtimes 文件 %s 损坏"
+
+#: pack-revindex.c
+#, c-format
+msgid "reverse-index file %s is too small"
+msgstr "反向索引文件 %s 太小"
+
+#: pack-revindex.c
+#, c-format
+msgid "reverse-index file %s is corrupt"
+msgstr "反向索引文件 %s 损坏"
+
+#: pack-revindex.c
+#, c-format
+msgid "reverse-index file %s has unknown signature"
+msgstr "反向索引文件 %s 有错误的签名"
+
+#: pack-revindex.c
+#, c-format
+msgid "reverse-index file %s has unsupported version %<PRIu32>"
+msgstr "反向索引文件 %s 不支持的版本 %<PRIu32>"
+
+#: pack-revindex.c
+#, c-format
+msgid "reverse-index file %s has unsupported hash id %<PRIu32>"
+msgstr "反向索引文件 %s 有不支持的哈希 ID %<PRIu32>"
+
+#: pack-write.c
+msgid "cannot both write and verify reverse index"
+msgstr "无法同时写入和校验反向索引"
+
+#: pack-write.c
+#, c-format
+msgid "could not stat: %s"
+msgstr "不能调用 stat：%s"
+
+#: pack-write.c
+#, c-format
+msgid "failed to make %s readable"
+msgstr "无法设置 %s 为可读"
+
+#: pack-write.c
+#, c-format
+msgid "could not write '%s' promisor file"
+msgstr "无法写入 '%s' 承诺者文件"
+
+#: packfile.c
+msgid "offset before end of packfile (broken .idx?)"
+msgstr "偏移量在包文件结束之前（损坏的 .idx？）"
+
+#: packfile.c
+#, c-format
+msgid "packfile %s cannot be mapped%s"
+msgstr "包文件 %s 不能被映射%s"
+
+#: packfile.c
+#, c-format
+msgid "offset before start of pack index for %s (corrupt index?)"
+msgstr "偏移量在 %s 的包索引开始之前（损坏的索引？）"
+
+#: packfile.c
+#, c-format
+msgid "offset beyond end of pack index for %s (truncated index?)"
+msgstr "偏移量越过了 %s 的包索引的结尾（被截断的索引？）"
+
+#: parse-options-cb.c
+#, c-format
+msgid "malformed expiration date '%s'"
+msgstr "格式错误的到期时间：'%s'"
+
+#: parse-options-cb.c
+#, c-format
+msgid "option `%s' expects \"always\", \"auto\", or \"never\""
+msgstr "选项 `%s' 期望 \"always\"、\"auto\" 或 \"never\""
+
+#: parse-options-cb.c
+#, c-format
+msgid "malformed object name '%s'"
+msgstr "格式错误的对象名 '%s'"
+
+#: parse-options-cb.c
+#, c-format
+msgid "option `%s' expects \"%s\" or \"%s\""
+msgstr "选项 `%s' 期望 \"%s\" 或 \"%s\""
+
+#: parse-options.c
+#, c-format
+msgid "%s requires a value"
+msgstr "%s 需要一个值"
+
+#: parse-options.c
+#, c-format
+msgid "%s is incompatible with %s"
+msgstr "%s 与 %s 不兼容"
+
+#: parse-options.c
+#, c-format
+msgid "%s : incompatible with something else"
+msgstr "%s：和其它的不兼容"
+
+#: parse-options.c
+#, c-format
+msgid "%s takes no value"
+msgstr "%s 不取值"
+
+#: parse-options.c
+#, c-format
+msgid "%s isn't available"
+msgstr "%s 不可用"
+
+#: parse-options.c
+#, 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
+#, c-format
+msgid "ambiguous option: %s (could be --%s%s or --%s%s)"
+msgstr "有歧义的选项：%s（可以是 --%s%s 或 --%s%s）"
+
+#: parse-options.c
+#, c-format
+msgid "did you mean `--%s` (with two dashes)?"
+msgstr "您的意思是 `--%s`（有两个短线）？"
+
+#: parse-options.c
+#, c-format
+msgid "alias of --%s"
+msgstr "--%s 的别名"
+
+#: parse-options.c
+#, c-format
+msgid "unknown option `%s'"
+msgstr "未知选项 `%s'"
+
+#: parse-options.c
+#, c-format
+msgid "unknown switch `%c'"
+msgstr "未知开关 `%c'"
+
+#: parse-options.c
+#, c-format
+msgid "unknown non-ascii option in string: `%s'"
+msgstr "字符串中未知的非 ascii 字符选项：`%s'"
+
+#: parse-options.c
+msgid "..."
+msgstr "..."
+
+#: parse-options.c
+#, c-format
+msgid "usage: %s"
+msgstr "用法：%s"
+
+#. TRANSLATORS: the colon here should align with the
+#. one in "usage: %s" translation.
+#.
+#: parse-options.c
+#, 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
+#, c-format
+msgid "%*s%s"
+msgstr "%*s%s"
+
+#  译者：为保证在输出中对齐，注意调整句中空格！
+#: parse-options.c
+#, c-format
+msgid "    %s"
+msgstr "    %s"
+
+#: parse-options.c
+msgid "-NUM"
+msgstr "-数字"
+
+#: parse-options.h
+msgid "expiry-date"
+msgstr "到期时间"
+
+#: parse-options.h
+msgid "no-op (backward compatibility)"
+msgstr "空操作（向后兼容）"
+
+#: parse-options.h
+msgid "be more verbose"
+msgstr "更加详细"
+
+#: parse-options.h
+msgid "be more quiet"
+msgstr "更加安静"
+
+#: parse-options.h
+msgid "use <n> digits to display object names"
+msgstr "用 <n> 位数字显示对象名"
+
+#: parse-options.h
+msgid "how to strip spaces and #comments from message"
+msgstr "设置如何删除提交说明里的空格和#注释"
+
+#: parse-options.h
+msgid "read pathspec from file"
+msgstr "从文件读取路径表达式"
+
+#: parse-options.h
+msgid ""
+"with --pathspec-from-file, pathspec elements are separated with NUL character"
+msgstr "使用 --pathspec-from-file，路径表达式用空字符分隔"
+
+#: path.c
+#, c-format
+msgid "Could not make %s writable by group"
+msgstr "不能设置 %s 为组可写"
+
+#: pathspec.c
+msgid "Escape character '\\' not allowed as last character in attr value"
+msgstr "转义字符 '\\' 不能作为属性值的最后一个字符"
+
+#: pathspec.c
+msgid "Only one 'attr:' specification is allowed."
+msgstr "只允许一个 'attr:' 规格。"
+
+#: pathspec.c
+msgid "attr spec must not be empty"
+msgstr "属性规格不能为空"
+
+#: pathspec.c
+#, c-format
+msgid "invalid attribute name %s"
+msgstr "无效的属性名 %s"
+
+#: pathspec.c
+msgid "global 'glob' and 'noglob' pathspec settings are incompatible"
+msgstr "全局的 'glob' 和 'noglob' 路径规格设置不兼容"
+
+#: pathspec.c
+msgid ""
+"global 'literal' pathspec setting is incompatible with all other global "
+"pathspec settings"
+msgstr "全局的 'literal' 路径规格设置和其它的全局路径规格设置不兼容"
+
+#: pathspec.c
+msgid "invalid parameter for pathspec magic 'prefix'"
+msgstr "路径规格包含无效的神奇前缀"
+
+#: pathspec.c
+#, c-format
+msgid "Invalid pathspec magic '%.*s' in '%s'"
+msgstr "在路径规格 '%3$s' 中无效的神奇前缀 '%2$.*1$s'"
+
+#: pathspec.c
+#, c-format
+msgid "Missing ')' at the end of pathspec magic in '%s'"
+msgstr "路径规格 '%s' 的神奇前缀结尾少了一个 ')'"
+
+#: pathspec.c
+#, c-format
+msgid "Unimplemented pathspec magic '%c' in '%s'"
+msgstr "路径规格 '%2$s' 中包含未实现的神奇前缀 '%1$c'"
+
+#: pathspec.c
+#, c-format
+msgid "%s: 'literal' and 'glob' are incompatible"
+msgstr "%s：'literal' 和 'glob' 不兼容"
+
+#: pathspec.c
+#, c-format
+msgid "%s: '%s' is outside repository at '%s'"
+msgstr "%s：'%s' 在位于 '%s' 的仓库之外"
+
+#: pathspec.c
+#, c-format
+msgid "'%s' (mnemonic: '%c')"
+msgstr "'%s'（助记符：'%c'）"
+
+#: pathspec.c
+#, c-format
+msgid "%s: pathspec magic not supported by this command: %s"
+msgstr "%s：路径规格神奇前缀不被此命令支持：%s"
+
+#: pathspec.c
+#, c-format
+msgid "pathspec '%s' is beyond a symbolic link"
+msgstr "路径规格 '%s' 位于符号链接中"
+
+#: pathspec.c
+#, c-format
+msgid "line is badly quoted: %s"
+msgstr "行被错误地引用：%s"
+
+#: pkt-line.c
+msgid "unable to write flush packet"
+msgstr "无法写 flush 包"
+
+#: pkt-line.c
+msgid "unable to write delim packet"
+msgstr "无法写 delim 包"
+
+#: pkt-line.c
+msgid "unable to write response end packet"
+msgstr "无法写入响应结束数据包"
+
+#: pkt-line.c
+msgid "flush packet write failed"
+msgstr "flush 包写错误"
+
+#: pkt-line.c
+msgid "protocol error: impossibly long line"
+msgstr "协议错误：不可能的长行"
+
+#: pkt-line.c
+msgid "packet write with format failed"
+msgstr "格式化包写入错误"
+
+#: pkt-line.c
+msgid "packet write failed - data exceeds max packet size"
+msgstr "写数据包失败：数据超过了包的最大长度"
+
+#: pkt-line.c
+#, c-format
+msgid "packet write failed: %s"
+msgstr "数据包写入失败：%s"
+
+#: pkt-line.c
+msgid "read error"
+msgstr "读取错误"
+
+#: pkt-line.c
+msgid "the remote end hung up unexpectedly"
+msgstr "远端意外挂断了"
+
+#: pkt-line.c
+#, c-format
+msgid "protocol error: bad line length character: %.4s"
+msgstr "协议错误：错误的行长度字符串：%.4s"
+
+#: pkt-line.c
+#, c-format
+msgid "protocol error: bad line length %d"
+msgstr "协议错误：错误的行长度 %d"
+
+#: pkt-line.c sideband.c
+#, c-format
+msgid "remote error: %s"
+msgstr "远程错误：%s"
+
+#: preload-index.c
+msgid "Refreshing index"
+msgstr "正在刷新索引"
+
+#: preload-index.c
+#, c-format
+msgid "unable to create threaded lstat: %s"
+msgstr "无法创建线程 lstat：%s"
+
+#: pretty.c
+msgid "unable to parse --pretty format"
+msgstr "不能解析 --pretty 格式"
+
+#: promisor-remote.c
+msgid "promisor-remote: unable to fork off fetch subprocess"
+msgstr "promisor-remote：无法派生 fetch 子进程"
+
+#: promisor-remote.c
+msgid "promisor-remote: could not write to fetch subprocess"
+msgstr "promisor-remote：无法向 fetch 子进程写入"
+
+#: promisor-remote.c
+msgid "promisor-remote: could not close stdin to fetch subprocess"
+msgstr "promisor-remote：无法关闭至 fetch 子进程的标准输入"
+
+#: promisor-remote.c
+#, c-format
+msgid "promisor remote name cannot begin with '/': %s"
+msgstr "promisor 远程名称不能以 '/' 开始：%s"
+
+#: protocol-caps.c
+msgid "object-info: expected flush after arguments"
+msgstr "object-info：在参数之后应有一个 flush"
+
+#: prune-packed.c
+msgid "Removing duplicate objects"
+msgstr "正在删除重复对象"
+
+#: range-diff.c
+msgid "could not start `log`"
+msgstr "不能启动 `log`"
+
+#: range-diff.c
+msgid "could not read `log` output"
+msgstr "不能读取 `log` 的输出"
+
+#: range-diff.c sequencer.c
+#, c-format
+msgid "could not parse commit '%s'"
+msgstr "不能解析提交 '%s'"
+
+#: range-diff.c
+#, c-format
+msgid ""
+"could not parse first line of `log` output: did not start with 'commit ': "
+"'%s'"
+msgstr "无法解析 `log` 输出的首行：不是以 'commit ' 开头：'%s'"
+
+#: range-diff.c
+#, c-format
+msgid "could not parse git header '%.*s'"
+msgstr "无法解析 git 头 '%.*s'"
+
+#: range-diff.c
+msgid "failed to generate diff"
+msgstr "无法生成 diff"
+
+#: range-diff.c
+#, c-format
+msgid "could not parse log for '%s'"
+msgstr "不能解析 '%s' 的日志"
+
+#: read-cache.c
+#, c-format
+msgid "will not add file alias '%s' ('%s' already exists in index)"
+msgstr "将不会添加文件别名 '%s'（'%s' 已经存在于索引中）"
+
+#: read-cache.c
+msgid "cannot create an empty blob in the object database"
+msgstr "不能在对象数据库中创建空的数据对象"
+
+#: read-cache.c
+#, c-format
+msgid "%s: can only add regular files, symbolic links or git-directories"
+msgstr "%s：只能添加常规文件、符号链接或 git 目录"
+
+#: read-cache.c
+#, c-format
+msgid "unable to index file '%s'"
+msgstr "无法索引文件 '%s'"
+
+#: read-cache.c
+#, c-format
+msgid "unable to add '%s' to index"
+msgstr "无法在索引中添加 '%s'"
+
+#: read-cache.c
+#, c-format
+msgid "unable to stat '%s'"
+msgstr "无法对 %s 执行 stat"
+
+#: read-cache.c
+#, c-format
+msgid "'%s' appears as both a file and as a directory"
+msgstr "'%s' 看起来既是文件又是目录"
+
+#: read-cache.c
+msgid "Refresh index"
+msgstr "刷新索引"
+
+#: read-cache.c
+#, c-format
+msgid ""
+"index.version set, but the value is invalid.\n"
+"Using version %i"
+msgstr ""
+"设置了 index.version，但是取值无效。\n"
+"使用版本 %i"
+
+#: read-cache.c
+#, c-format
+msgid ""
+"GIT_INDEX_VERSION set, but the value is invalid.\n"
+"Using version %i"
+msgstr ""
+"设置了 GIT_INDEX_VERSION，但是取值无效。\n"
+"使用版本 %i"
+
+#: read-cache.c
+#, c-format
+msgid "bad signature 0x%08x"
+msgstr "坏的签名 0x%08x"
+
+#: read-cache.c
+#, c-format
+msgid "bad index version %d"
+msgstr "坏的索引版本 %d"
+
+#: read-cache.c
+msgid "bad index file sha1 signature"
+msgstr "坏的索引文件 sha1 签名"
+
+#: read-cache.c
+#, c-format
+msgid "index uses %.4s extension, which we do not understand"
+msgstr "索引使用不被支持的 %.4s 扩展"
+
+#: read-cache.c
+#, c-format
+msgid "ignoring %.4s extension"
+msgstr "忽略 %.4s 扩展"
+
+#: read-cache.c
+#, c-format
+msgid "unknown index entry format 0x%08x"
+msgstr "未知的索引条目格式 0x%08x"
+
+#: read-cache.c
+#, c-format
+msgid "malformed name field in the index, near path '%s'"
+msgstr "索引中靠近路径 '%s' 有错误的名称字段"
+
+#: read-cache.c
+msgid "unordered stage entries in index"
+msgstr "索引中有未排序的暂存条目"
+
+#: read-cache.c
+#, c-format
+msgid "multiple stage entries for merged file '%s'"
+msgstr "合并文件 '%s' 有多个暂存条目"
+
+#: read-cache.c
+#, c-format
+msgid "unordered stage entries for '%s'"
+msgstr "'%s' 的未排序暂存条目"
+
+#: read-cache.c
+#, c-format
+msgid "unable to create load_cache_entries thread: %s"
+msgstr "无法创建 load_cache_entries 线程：%s"
+
+#: read-cache.c
+#, c-format
+msgid "unable to join load_cache_entries thread: %s"
+msgstr "无法加入 load_cache_entries 线程：%s"
+
+#: read-cache.c
+#, c-format
+msgid "%s: index file open failed"
+msgstr "%s：打开索引文件失败"
+
+#: read-cache.c
+#, c-format
+msgid "%s: cannot stat the open index"
+msgstr "%s：不能对打开的索引执行 stat 操作"
+
+#: read-cache.c
+#, c-format
+msgid "%s: index file smaller than expected"
+msgstr "%s：索引文件比预期的小"
+
+#: read-cache.c
+#, c-format
+msgid "%s: unable to map index file%s"
+msgstr "%s：无法映射索引文件%s"
+
+#: read-cache.c
+#, c-format
+msgid "unable to create load_index_extensions thread: %s"
+msgstr "无法创建 load_index_extensions 线程：%s"
+
+#: read-cache.c
+#, c-format
+msgid "unable to join load_index_extensions thread: %s"
+msgstr "无法加入 load_index_extensions 线程：%s"
+
+#: read-cache.c
+#, c-format
+msgid "could not freshen shared index '%s'"
+msgstr "无法刷新共享索引 '%s'"
+
+#: read-cache.c
+#, c-format
+msgid "broken index, expect %s in %s, got %s"
+msgstr "损坏的索引，期望在 %2$s 中的 %1$s，得到 %3$s"
+
+#: read-cache.c
+msgid "cannot write split index for a sparse index"
+msgstr "无法为稀疏索引写入拆分索引"
+
+#: read-cache.c
+msgid "failed to convert to a sparse-index"
+msgstr "无法转换为稀疏索引"
+
+#: read-cache.c
+#, c-format
+msgid "could not stat '%s'"
+msgstr "不能对 '%s' 调用 stat"
+
+#: read-cache.c
+#, c-format
+msgid "unable to open git dir: %s"
+msgstr "不能打开 git 目录：%s"
+
+#: read-cache.c
+#, c-format
+msgid "unable to unlink: %s"
+msgstr "无法删除：%s"
+
+#: read-cache.c
+#, c-format
+msgid "cannot fix permission bits on '%s'"
+msgstr "不能修复 '%s' 的权限位"
+
+#: read-cache.c
+#, c-format
+msgid "%s: cannot drop to stage #0"
+msgstr "%s：不能落到暂存区 #0"
+
+#: rebase-interactive.c
+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 ""
+"您可以用 'git rebase --edit-todo' 修正，然后执行 'git rebase --continue'。\n"
+"或者您可以用 'git rebase --abort' 终止变基。\n"
+
+#: rebase-interactive.c
+#, c-format
+msgid ""
+"unrecognized setting %s for option rebase.missingCommitsCheck. Ignoring."
+msgstr "选项 rebase.missingCommitsCheck 的值 %s 无法识别。已忽略。"
+
+#: rebase-interactive.c
+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 [-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"
+"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 <提交> = 使用提交，但停止以便在 shell 中修补提交\n"
+"s, squash <提交> = 使用提交，但挤压到前一个提交\n"
+"f, fixup [-C | -c] <提交> = 类似于 \"squash\"，但只保留前一个提交\n"
+"                   的提交说明，除非使用了 -C 参数，此情况下则只\n"
+"                   保留本提交说明。使用 -c 和 -C 类似，但会打开\n"
+"                   编辑器修改提交说明\n"
+"x, exec <命令> = 使用 shell 运行命令（此行剩余部分）\n"
+"b, break = 在此处停止（使用 'git rebase --continue' 继续变基）\n"
+"d, drop <提交> = 删除提交\n"
+"l, label <label> = 为当前 HEAD 打上标记\n"
+"t, reset <label> = 重置 HEAD 到该标记\n"
+"m, merge [-C <commit> | -c <commit>] <label> [# <oneline>]\n"
+".       创建一个合并提交，并使用原始的合并提交说明（如果没有指定\n"
+".       原始提交，使用注释部分的 oneline 作为提交说明）。使用\n"
+".       -c <提交> 可以编辑提交说明。\n"
+"\n"
+"可以对这些行重新排序，将从上至下执行。\n"
+
+#: rebase-interactive.c
+#, c-format
+msgid "Rebase %s onto %s (%d command)"
+msgid_plural "Rebase %s onto %s (%d commands)"
+msgstr[0] "变基 %s 到 %s（%d 个提交）"
+msgstr[1] "变基 %s 到 %s（%d 个提交）"
+
+#: rebase-interactive.c
+msgid ""
+"\n"
+"Do not remove any line. Use 'drop' explicitly to remove a commit.\n"
+msgstr ""
+"\n"
+"不要删除任意一行。使用 'drop' 显式地删除一个提交。\n"
+
+#: rebase-interactive.c
+msgid ""
+"\n"
+"If you remove a line here THAT COMMIT WILL BE LOST.\n"
+msgstr ""
+"\n"
+"如果您在这里删除一行，对应的提交将会丢失。\n"
+
+#: rebase-interactive.c
+msgid ""
+"\n"
+"You are editing the todo file of an ongoing interactive rebase.\n"
+"To continue rebase after editing, run:\n"
+"    git rebase --continue\n"
+"\n"
+msgstr ""
+"\n"
+"您正在修改进行中的交互式变基待办列表。若要在编辑结束后继续变基，\n"
+"请执行：\n"
+"    git rebase --continue\n"
+"\n"
+
+#: rebase-interactive.c
+msgid ""
+"\n"
+"However, if you remove everything, the rebase will be aborted.\n"
+"\n"
+msgstr ""
+"\n"
+"然而，如果您删除全部内容，变基操作将会终止。\n"
+"\n"
+
+#: rebase-interactive.c
+#, c-format
+msgid "could not write '%s'."
+msgstr "不能写入 '%s'。"
+
+#: rebase-interactive.c
+#, c-format
+msgid ""
+"Warning: some commits may have been dropped accidentally.\n"
+"Dropped commits (newer to older):\n"
+msgstr ""
+"警告：一些提交可能被意外丢弃。\n"
+"丢弃的提交（从新到旧）：\n"
+
+#: rebase-interactive.c
+#, c-format
+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"
+"The possible behaviours are: ignore, warn, error.\n"
+"\n"
+msgstr ""
+"为避免这条信息，使用 \"drop\" 指令显式地删除一个提交。\n"
+"\n"
+"使用 'git config rebase.missingCommitsCheck' 来修改警告级别。\n"
+"可选值有：ignore、warn、error。\n"
+"\n"
+
+#: rebase.c
+#, c-format
+msgid "%s: 'preserve' superseded by 'merges'"
+msgstr "%s：'preserve' 被 'merges' 取代"
+
+#: ref-filter.c wt-status.c
+msgid "gone"
+msgstr "丢失"
+
+#: ref-filter.c
+#, c-format
+msgid "ahead %d"
+msgstr "领先 %d"
+
+#: ref-filter.c
+#, c-format
+msgid "behind %d"
+msgstr "落后 %d"
+
+#: ref-filter.c
+#, c-format
+msgid "ahead %d, behind %d"
+msgstr "领先 %d，落后 %d"
+
+#: ref-filter.c
+#, c-format
+msgid "expected format: %%(color:<color>)"
+msgstr "期望的格式：%%(color:<颜色>)"
+
+#: ref-filter.c
+#, c-format
+msgid "unrecognized color: %%(color:%s)"
+msgstr "未能识别的颜色：%%(color:%s)"
+
+#: ref-filter.c
+#, c-format
+msgid "Integer value expected refname:lstrip=%s"
+msgstr "期望整数值 refname:lstrip=%s"
+
+#: ref-filter.c
+#, c-format
+msgid "Integer value expected refname:rstrip=%s"
+msgstr "期望整数值 refname:rstrip=%s"
+
+#: ref-filter.c
+#, c-format
+msgid "unrecognized %%(%s) argument: %s"
+msgstr "未能识别的 %%(%s) 参数：%s"
+
+#: ref-filter.c
+#, c-format
+msgid "%%(objecttype) does not take arguments"
+msgstr "%%(objecttype) 不带参数"
+
+#: ref-filter.c
+#, c-format
+msgid "%%(deltabase) does not take arguments"
+msgstr "%%(deltabase) 不带参数"
+
+#: ref-filter.c
+#, c-format
+msgid "%%(body) does not take arguments"
+msgstr "%%(body) 不带参数"
+
+#: ref-filter.c
+#, c-format
+msgid "expected %%(trailers:key=<value>)"
+msgstr "预期 %%(trailers:key=<值>)"
+
+#: ref-filter.c
+#, c-format
+msgid "unknown %%(trailers) argument: %s"
+msgstr "未知的 %%(trailers) 参数：%s"
+
+#: ref-filter.c
+#, c-format
+msgid "positive value expected contents:lines=%s"
+msgstr "期望一个正数 contents:lines=%s"
+
+#: ref-filter.c
+#, c-format
+msgid "positive value expected '%s' in %%(%s)"
+msgstr "期望 %%(%2$s) 中的 '%1$s' 是一个正数"
+
+#: ref-filter.c
+#, c-format
+msgid "unrecognized email option: %s"
+msgstr "未识别的邮件选项：%s"
+
+#: ref-filter.c
+#, c-format
+msgid "expected format: %%(align:<width>,<position>)"
+msgstr "期望的格式：%%(align:<宽度>,<位置>)"
+
+#: ref-filter.c
+#, c-format
+msgid "unrecognized position:%s"
+msgstr "未能识别的位置：%s"
+
+#: ref-filter.c
+#, c-format
+msgid "unrecognized width:%s"
+msgstr "未能识别的宽度：%s"
+
+#: ref-filter.c
+#, c-format
+msgid "positive width expected with the %%(align) atom"
+msgstr "元素 %%(align) 需要一个正数的宽度"
+
+#: ref-filter.c
+#, c-format
+msgid "%%(rest) does not take arguments"
+msgstr "%%(rest) 不带参数"
+
+#: ref-filter.c
+#, c-format
+msgid "malformed field name: %.*s"
+msgstr "格式错误的字段名：%.*s"
+
+#: ref-filter.c
+#, c-format
+msgid "unknown field name: %.*s"
+msgstr "未知的字段名：%.*s"
+
+#: ref-filter.c
+#, c-format
+msgid ""
+"not a git repository, but the field '%.*s' requires access to object data"
+msgstr "不是 git 仓库，但是字段 '%.*s' 需要访问对象数据"
+
+#: ref-filter.c
+#, c-format
+msgid "format: %%(%s) atom used without a %%(%s) atom"
+msgstr "格式：在没有 %%(%2$s) 元素的情况下使用了 %%(%1$s) 元素"
+
+#: ref-filter.c
+#, c-format
+msgid "format: %%(then) atom used more than once"
+msgstr "格式：%%(then) 元素用了多次"
+
+#: ref-filter.c
+#, c-format
+msgid "format: %%(then) atom used after %%(else)"
+msgstr "格式：%%(then) 元素用在了 %%(else) 之后"
+
+#: ref-filter.c
+#, c-format
+msgid "format: %%(else) atom used more than once"
+msgstr "格式：%%(else) 元素用了多次"
+
+#: ref-filter.c
+#, c-format
+msgid "format: %%(end) atom used without corresponding atom"
+msgstr "格式：使用了 %%(end) 元素却没有它的对应元素"
+
+#: ref-filter.c
+#, c-format
+msgid "malformed format string %s"
+msgstr "错误的格式化字符串 %s"
+
+#: ref-filter.c
+#, c-format
+msgid "this command reject atom %%(%.*s)"
+msgstr "这个命令拒绝元素 %%(%.*s)"
+
+#: ref-filter.c
+#, c-format
+msgid "--format=%.*s cannot be used with --python, --shell, --tcl"
+msgstr "--format=%.*s 不能和 --python、--shell、--tcl 同时使用"
+
+#: ref-filter.c
+#, c-format
+msgid "(no branch, rebasing %s)"
+msgstr "（非分支，正变基 %s）"
+
+#: ref-filter.c
+#, c-format
+msgid "(no branch, rebasing detached HEAD %s)"
+msgstr "（非分支，正变基分离头指针 %s）"
+
+#: ref-filter.c
+#, c-format
+msgid "(no branch, bisect started on %s)"
+msgstr "（非分支，二分查找开始于 %s）"
+
+#: ref-filter.c
+#, c-format
+msgid "(HEAD detached at %s)"
+msgstr "（头指针在 %s 分离）"
+
+#: ref-filter.c
+#, c-format
+msgid "(HEAD detached from %s)"
+msgstr "（头指针自 %s 分离）"
+
+#: ref-filter.c
+msgid "(no branch)"
+msgstr "（非分支）"
+
+#: ref-filter.c
+#, c-format
+msgid "missing object %s for %s"
+msgstr "缺失 %2$s 的对象 %1$s"
+
+#: ref-filter.c
+#, c-format
+msgid "parse_object_buffer failed on %s for %s"
+msgstr "parse_object_buffer 失败于 %2$s 的 %1$s"
+
+#: ref-filter.c
+#, c-format
+msgid "malformed object at '%s'"
+msgstr "格式错误的对象 '%s'"
+
+#: ref-filter.c
+#, c-format
+msgid "ignoring ref with broken name %s"
+msgstr "忽略带有错误名称 %s 的引用"
+
+#: ref-filter.c refs.c
+#, c-format
+msgid "ignoring broken ref %s"
+msgstr "忽略损坏的引用 %s"
+
+#: ref-filter.c
+#, c-format
+msgid "format: %%(end) atom missing"
+msgstr "格式：缺少 %%(end) 元素"
+
+#: ref-filter.c
+#, c-format
+msgid "malformed object name %s"
+msgstr "格式错误的对象名 %s"
+
+#: ref-filter.c
+#, c-format
+msgid "option `%s' must point to a commit"
+msgstr "选项 `%s' 必须指向一个提交"
+
+#: ref-filter.h
+msgid "key"
+msgstr "key"
+
+#: ref-filter.h
+msgid "field name to sort on"
+msgstr "排序的字段名"
+
+#: reflog.c
+#, c-format
+msgid "not a reflog: %s"
+msgstr "不是一个引用日志：%s"
+
+#: reflog.c
+#, c-format
+msgid "no reflog for '%s'"
+msgstr "没有 '%s' 的引用日志"
+
+#: refs.c
+#, c-format
+msgid "%s does not point to a valid object!"
+msgstr "%s 没有指向一个有效的对象！"
+
+#: refs.c
+#, 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"
+"of your new repositories, which will suppress this warning, call:\n"
+"\n"
+"\tgit config --global init.defaultBranch <name>\n"
+"\n"
+"Names commonly chosen instead of 'master' are 'main', 'trunk' and\n"
+"'development'. The just-created branch can be renamed via this command:\n"
+"\n"
+"\tgit branch -m <name>\n"
+msgstr ""
+"使用 '%s' 作为初始分支的名称。这个默认分支名称可能会更改。要在新仓库中\n"
+"配置使用初始分支名，并消除这条警告，请执行：\n"
+"\n"
+"\tgit config --global init.defaultBranch <名称>\n"
+"\n"
+"除了 'master' 之外，通常选定的名字有 'main'、'trunk' 和 'development'。\n"
+"可以通过以下命令重命名刚创建的分支：\n"
+"\n"
+"\tgit branch -m <name>\n"
+
+#: refs.c
+#, c-format
+msgid "could not retrieve `%s`"
+msgstr "无法获取 `%s`"
+
+#: refs.c
+#, c-format
+msgid "invalid branch name: %s = %s"
+msgstr "无效的分支名：%s = %s"
+
+#: refs.c
+#, c-format
+msgid "ignoring dangling symref %s"
+msgstr "忽略悬空符号引用 %s"
+
+#: refs.c
+#, c-format
+msgid "log for ref %s has gap after %s"
+msgstr "引用 %s 的日志在 %s 之后有缺口"
+
+#: refs.c
+#, c-format
+msgid "log for ref %s unexpectedly ended on %s"
+msgstr "引用 %s 的日志意外终止于 %s "
+
+#: refs.c
+#, c-format
+msgid "log for %s is empty"
+msgstr "%s 的日志为空"
+
+#: refs.c
+#, c-format
+msgid "refusing to update ref with bad name '%s'"
+msgstr "拒绝更新有错误名称 '%s' 的引用"
+
+#: refs.c
+#, c-format
+msgid "update_ref failed for ref '%s': %s"
+msgstr "对引用 '%s' 执行 update_ref 失败：%s"
+
+#: refs.c
+#, c-format
+msgid "multiple updates for ref '%s' not allowed"
+msgstr "不允许对引用 '%s' 多次更新"
+
+#: refs.c
+msgid "ref updates forbidden inside quarantine environment"
+msgstr "在隔离环境中禁止更新引用"
+
+#: refs.c
+msgid "ref updates aborted by hook"
+msgstr "引用更新被钩子中止"
+
+#: refs.c
+#, c-format
+msgid "'%s' exists; cannot create '%s'"
+msgstr "'%s' 已存在，无法创建 '%s'"
+
+#: refs.c
+#, c-format
+msgid "cannot process '%s' and '%s' at the same time"
+msgstr "无法同时处理 '%s' 和 '%s'"
+
+#: refs/files-backend.c
+#, c-format
+msgid "could not remove reference %s"
+msgstr "无法删除引用 %s"
+
+#: refs/files-backend.c refs/packed-backend.c
+#, c-format
+msgid "could not delete reference %s: %s"
+msgstr "无法删除引用 %s：%s"
+
+#: refs/files-backend.c refs/packed-backend.c
+#, c-format
+msgid "could not delete references: %s"
+msgstr "无法删除引用：%s"
+
+#: refspec.c
+#, c-format
+msgid "invalid refspec '%s'"
+msgstr "无效的引用规格：'%s'"
+
+#: remote-curl.c
+#, c-format
+msgid "invalid quoting in push-option value: '%s'"
+msgstr "在 push-option 取值中无效的引号：'%s'"
+
+#: remote-curl.c
+#, c-format
+msgid "%sinfo/refs not valid: is this a git repository?"
+msgstr "%sinfo/refs 无效：这是 git 仓库么？"
+
+#: remote-curl.c
+msgid "invalid server response; expected service, got flush packet"
+msgstr "无效的服务端响应。预期服务，得到 flush 包"
+
+#: remote-curl.c
+#, c-format
+msgid "invalid server response; got '%s'"
+msgstr "无效的服务端响应，得到 '%s'"
+
+#: remote-curl.c
+#, c-format
+msgid "repository '%s' not found"
+msgstr "仓库 '%s' 未找到"
+
+#: remote-curl.c
+#, c-format
+msgid "Authentication failed for '%s'"
+msgstr "'%s' 鉴权失败"
+
+#: remote-curl.c
+#, c-format
+msgid "unable to access '%s' with http.pinnedPubkey configuration: %s"
+msgstr "无法以 http.pinnedPubkey 设置访问 '%s'：%s"
+
+#: remote-curl.c
+#, c-format
+msgid "unable to access '%s': %s"
+msgstr "无法访问 '%s'：%s"
+
+#: remote-curl.c
+#, c-format
+msgid "redirecting to %s"
+msgstr "重定向到 %s"
+
+#: remote-curl.c
+msgid "shouldn't have EOF when not gentle on EOF"
+msgstr "当没有设置温和处理文件结束符（EOF）时，不应该有文件结束符"
+
+#: remote-curl.c
+msgid "remote server sent unexpected response end packet"
+msgstr "远程服务器发送意外的响应结束数据包"
+
+#: remote-curl.c
+msgid "unable to rewind rpc post data - try increasing http.postBuffer"
+msgstr "无法倒回 rpc post 数据 - 尝试增加 http.postBuffer"
+
+#: remote-curl.c
+#, c-format
+msgid "remote-curl: bad line length character: %.4s"
+msgstr "remote-curl：错误的行宽字符：%.4s"
+
+#: remote-curl.c
+msgid "remote-curl: unexpected response end packet"
+msgstr "remote-curl：意外响应结束包"
+
+#: remote-curl.c
+#, c-format
+msgid "RPC failed; %s"
+msgstr "RPC 失败。%s"
+
+#: remote-curl.c
+msgid "cannot handle pushes this big"
+msgstr "不能处理这么大的推送"
+
+#: remote-curl.c
+#, c-format
+msgid "cannot deflate request; zlib deflate error %d"
+msgstr "不能压缩请求，zlib 压缩错误 %d"
+
+#: remote-curl.c
+#, c-format
+msgid "cannot deflate request; zlib end error %d"
+msgstr "不能压缩请求，zlib 结束错误 %d"
+
+#: remote-curl.c
+#, c-format
+msgid "%d bytes of length header were received"
+msgstr "收到了 %d 字节长度的头信息"
+
+#: remote-curl.c
+#, c-format
+msgid "%d bytes of body are still expected"
+msgstr "预期仍然需要 %d 个字节的正文"
+
+#: remote-curl.c
+msgid "dumb http transport does not support shallow capabilities"
+msgstr "哑 http 传输不支持浅克隆能力"
+
+#: remote-curl.c
+msgid "fetch failed."
+msgstr "获取失败。"
+
+#: remote-curl.c
+msgid "cannot fetch by sha1 over smart http"
+msgstr "无法通过智能 HTTP 获取 sha1"
+
+#: remote-curl.c
+#, c-format
+msgid "protocol error: expected sha/ref, got '%s'"
+msgstr "协议错误：期望 sha/ref，却得到 '%s'"
+
+#: remote-curl.c
+#, c-format
+msgid "http transport does not support %s"
+msgstr "http 传输协议不支持 %s"
+
+#: remote-curl.c
+msgid "git-http-push failed"
+msgstr "git-http-push 失败"
+
+#: remote-curl.c
+msgid "remote-curl: usage: git remote-curl <remote> [<url>]"
+msgstr "remote-curl：用法：git remote-curl <远程> [<url>]"
+
+#: remote-curl.c
+msgid "remote-curl: error reading command stream from git"
+msgstr "remote-curl：错误读取来自 git 的命令流"
+
+#: remote-curl.c
+msgid "remote-curl: fetch attempted without a local repo"
+msgstr "remote-curl：尝试没有本地仓库下获取"
+
+#: remote-curl.c
+#, c-format
+msgid "remote-curl: unknown command '%s' from git"
+msgstr "remote-curl：未知的来自 git 的命令 '%s'"
+
+#: remote.c
+#, c-format
+msgid "config remote shorthand cannot begin with '/': %s"
+msgstr "配置的远程短名称不能以 '/' 开始：%s"
+
+#: remote.c
+msgid "more than one receivepack given, using the first"
+msgstr "提供了一个以上的 receivepack，使用第一个"
+
+#: remote.c
+msgid "more than one uploadpack given, using the first"
+msgstr "提供了一个以上的 uploadpack，使用第一个"
+
+#: remote.c
+#, c-format
+msgid "unrecognized value transfer.credentialsInUrl: '%s'"
+msgstr "无法识别的 transfer.credentialsInUrl 值：'%s'"
+
+#: remote.c
+#, c-format
+msgid "URL '%s' uses plaintext credentials"
+msgstr "URL '%s' 使用明文认证信息"
+
+#: remote.c
+#, c-format
+msgid "Cannot fetch both %s and %s to %s"
+msgstr "不能同时获取 %s 和 %s 至 %s"
+
+#: remote.c
+#, c-format
+msgid "%s usually tracks %s, not %s"
+msgstr "%s 通常跟踪 %s，而非 %s"
+
+#: remote.c
+#, c-format
+msgid "%s tracks both %s and %s"
+msgstr "%s 同时跟踪 %s 和 %s"
+
+#: remote.c
+#, c-format
+msgid "key '%s' of pattern had no '*'"
+msgstr "模式的键 '%s' 没有 '*'"
+
+#: remote.c
+#, c-format
+msgid "value '%s' of pattern has no '*'"
+msgstr "模式的值 '%s' 没有 '*'"
+
+#: remote.c
+#, c-format
+msgid "src refspec %s does not match any"
+msgstr "源引用规格 %s 没有匹配"
+
+#: remote.c
+#, c-format
+msgid "src refspec %s matches more than one"
+msgstr "源引用规格 %s 匹配超过一个"
+
+#. TRANSLATORS: "matches '%s'%" is the <dst> part of "git push
+#. <remote> <src>:<dst>" push, and "being pushed ('%s')" is
+#. the <src>.
+#.
+#: remote.c
+#, c-format
+msgid ""
+"The destination you provided is not a full refname (i.e.,\n"
+"starting with \"refs/\"). We tried to guess what you meant by:\n"
+"\n"
+"- Looking for a ref that matches '%s' on the remote side.\n"
+"- Checking if the <src> being pushed ('%s')\n"
+"  is a ref in \"refs/{heads,tags}/\". If so we add a corresponding\n"
+"  refs/{heads,tags}/ prefix on the remote side.\n"
+"\n"
+"Neither worked, so we gave up. You must fully qualify the ref."
+msgstr ""
+"您提供的目标不是一个完整的引用名称（即以 \"refs/\" 开头）。我们\n"
+"试着猜测您的想法：\n"
+"\n"
+"- 在远端查询和 '%s' 匹配的引用。\n"
+"- 检查要推送的 <src>（'%s'）是不是在 \"refs/{heads,tags}/\" 中的\n"
+"  引用。如果是，我们会在对应的远端添加 refs/{heads,tags}/ 前缀。\n"
+"\n"
+"都不行，所以我们已放弃。您必须给出完整的引用。"
+
+#: remote.c
+#, c-format
+msgid ""
+"The <src> part of the refspec is a commit object.\n"
+"Did you mean to create a new branch by pushing to\n"
+"'%s:refs/heads/%s'?"
+msgstr ""
+"引用规格的 <src> 是一个提交对象。您是想创建一个新的分支而向\n"
+"'%s:refs/heads/%s' 推送么？"
+
+#: remote.c
+#, c-format
+msgid ""
+"The <src> part of the refspec is a tag object.\n"
+"Did you mean to create a new tag by pushing to\n"
+"'%s:refs/tags/%s'?"
+msgstr ""
+"引用规格的 <src> 是一个标签对象。您是想创建一个新的标签而向\n"
+"'%s:refs/tags/%s' 推送么？"
+
+#: remote.c
+#, c-format
+msgid ""
+"The <src> part of the refspec is a tree object.\n"
+"Did you mean to tag a new tree by pushing to\n"
+"'%s:refs/tags/%s'?"
+msgstr ""
+"引用规格的 <src> 是一个树对象。您是想为这个树对象创建标签而向\n"
+"'%s:refs/tags/%s' 推送么？"
+
+#: remote.c
+#, c-format
+msgid ""
+"The <src> part of the refspec is a blob object.\n"
+"Did you mean to tag a new blob by pushing to\n"
+"'%s:refs/tags/%s'?"
+msgstr ""
+"引用规格的 <src> 是一个数据对象。您是想为这个数据对象创建标签而向\n"
+"'%s:refs/tags/%s' 推送么？"
+
+#: remote.c
+#, c-format
+msgid "%s cannot be resolved to branch"
+msgstr "%s 无法被解析为分支"
+
+#: remote.c
+#, c-format
+msgid "unable to delete '%s': remote ref does not exist"
+msgstr "无法删除 '%s'：远程引用不存在"
+
+#: remote.c
+#, c-format
+msgid "dst refspec %s matches more than one"
+msgstr "目标引用规格 %s 匹配超过一个"
+
+#: remote.c
+#, c-format
+msgid "dst ref %s receives from more than one src"
+msgstr "目标引用 %s 接收超过一个源"
+
+#: remote.c
+msgid "HEAD does not point to a branch"
+msgstr "HEAD 没有指向一个分支"
+
+#: remote.c
+#, c-format
+msgid "no such branch: '%s'"
+msgstr "没有此分支：'%s'"
+
+#: remote.c
+#, c-format
+msgid "no upstream configured for branch '%s'"
+msgstr "尚未给分支 '%s' 设置上游"
+
+#: remote.c
+#, c-format
+msgid "upstream branch '%s' not stored as a remote-tracking branch"
+msgstr "上游分支 '%s' 没有存储为一个远程跟踪分支"
+
+#: remote.c
+#, c-format
+msgid "push destination '%s' on remote '%s' has no local tracking branch"
+msgstr "推送目标 '%s' 至远程 '%s' 没有本地跟踪分支"
+
+#: remote.c
+#, c-format
+msgid "branch '%s' has no remote for pushing"
+msgstr "分支 '%s' 没有设置要推送的远程服务器"
+
+#: remote.c
+#, c-format
+msgid "push refspecs for '%s' do not include '%s'"
+msgstr "向 '%s' 推送引用规格未包含 '%s'"
+
+#: remote.c
+msgid "push has no destination (push.default is 'nothing')"
+msgstr "推送无目标（push.default 是 'nothing'）"
+
+#: remote.c
+msgid "cannot resolve 'simple' push to a single destination"
+msgstr "无法解析 'simple' 推送至一个单独的目标"
+
+#: remote.c
+#, c-format
+msgid "couldn't find remote ref %s"
+msgstr "无法找到远程引用 %s"
+
+#: remote.c
+#, c-format
+msgid "* Ignoring funny ref '%s' locally"
+msgstr "* 在本地忽略可笑的引用 '%s'"
+
+#: remote.c
+#, c-format
+msgid "Your branch is based on '%s', but the upstream is gone.\n"
+msgstr "您的分支基于 '%s'，但此上游分支已经不存在。\n"
+
+#: remote.c
+msgid "  (use \"git branch --unset-upstream\" to fixup)\n"
+msgstr "  （使用 \"git branch --unset-upstream\" 来修复）\n"
+
+#: remote.c
+#, c-format
+msgid "Your branch is up to date with '%s'.\n"
+msgstr "您的分支与上游分支 '%s' 一致。\n"
+
+#: remote.c
+#, c-format
+msgid "Your branch and '%s' refer to different commits.\n"
+msgstr "您的分支和 '%s' 指向不同的提交。\n"
+
+#: remote.c
+#, c-format
+msgid "  (use \"%s\" for details)\n"
+msgstr "  （使用 \"%s\" 查看详情）\n"
+
+#: remote.c
+#, c-format
+msgid "Your branch is ahead of '%s' by %d commit.\n"
+msgid_plural "Your branch is ahead of '%s' by %d commits.\n"
+msgstr[0] "您的分支领先 '%s' 共 %d 个提交。\n"
+msgstr[1] "您的分支领先 '%s' 共 %d 个提交。\n"
+
+#: remote.c
+msgid "  (use \"git push\" to publish your local commits)\n"
+msgstr "  （使用 \"git push\" 来发布您的本地提交）\n"
+
+#: remote.c
+#, c-format
+msgid "Your branch is behind '%s' by %d commit, and can be fast-forwarded.\n"
+msgid_plural ""
+"Your branch is behind '%s' by %d commits, and can be fast-forwarded.\n"
+msgstr[0] "您的分支落后 '%s' 共 %d 个提交，并且可以快进。\n"
+msgstr[1] "您的分支落后 '%s' 共 %d 个提交，并且可以快进。\n"
+
+#  译者：注意保持前导空格
+#: remote.c
+msgid "  (use \"git pull\" to update your local branch)\n"
+msgstr "  （使用 \"git pull\" 来更新您的本地分支）\n"
+
+#: remote.c
+#, c-format
+msgid ""
+"Your branch and '%s' have diverged,\n"
+"and have %d and %d different commit each, respectively.\n"
+msgid_plural ""
+"Your branch and '%s' have diverged,\n"
+"and have %d and %d different commits each, respectively.\n"
+msgstr[0] ""
+"您的分支和 '%s' 出现了偏离，\n"
+"并且分别有 %d 和 %d 处不同的提交。\n"
+msgstr[1] ""
+"您的分支和 '%s' 出现了偏离，\n"
+"并且分别有 %d 和 %d 处不同的提交。\n"
+
+#  译者：注意保持前导空格
+#: remote.c
+msgid "  (use \"git pull\" to merge the remote branch into yours)\n"
+msgstr "  （使用 \"git pull\" 来合并远程分支）\n"
+
+#: remote.c
+#, c-format
+msgid "cannot parse expected object name '%s'"
+msgstr "无法解析期望的对象名 '%s'"
+
+#: remote.c
+#, c-format
+msgid "cannot strip one component off url '%s'"
+msgstr "无法从 url '%s' 剥离一个组件"
+
+#: replace-object.c
+#, c-format
+msgid "bad replace ref name: %s"
+msgstr "错误的替换引用名称：%s"
+
+#: replace-object.c
+#, c-format
+msgid "duplicate replace ref: %s"
+msgstr "重复的替换引用：%s"
+
+#: replace-object.c
+#, c-format
+msgid "replace depth too high for object %s"
+msgstr "对象 %s 的替换层级太深"
+
+#: rerere.c
+msgid "corrupt MERGE_RR"
+msgstr "损坏的 MERGE_RR"
+
+#: rerere.c
+msgid "unable to write rerere record"
+msgstr "无法写入 rerere 记录"
+
+#: rerere.c
+#, c-format
+msgid "there were errors while writing '%s' (%s)"
+msgstr "写入 '%s' (%s) 时出错"
+
+#: rerere.c
+#, c-format
+msgid "could not parse conflict hunks in '%s'"
+msgstr "不能解析 '%s' 中的冲突块"
+
+#: rerere.c
+#, c-format
+msgid "failed utime() on '%s'"
+msgstr "在 '%s' 上调用 utime() 失败"
+
+#: rerere.c
+#, c-format
+msgid "writing '%s' failed"
+msgstr "写入 '%s' 失败"
+
+#: rerere.c
+#, c-format
+msgid "Staged '%s' using previous resolution."
+msgstr "使用之前的解决方案暂存 '%s'。"
+
+#: rerere.c
+#, c-format
+msgid "Recorded resolution for '%s'."
+msgstr "已记录 '%s' 的解决方案。"
+
+#: rerere.c
+#, c-format
+msgid "Resolved '%s' using previous resolution."
+msgstr "使用之前的解决方案解决 '%s'。"
+
+#: rerere.c
+#, c-format
+msgid "cannot unlink stray '%s'"
+msgstr "不能删除 stray '%s'"
+
+#: rerere.c
+#, c-format
+msgid "Recorded preimage for '%s'"
+msgstr "为 '%s' 记录 preimage"
+
+#: rerere.c
+#, c-format
+msgid "failed to update conflicted state in '%s'"
+msgstr "无法更新 '%s' 中的冲突状态"
+
+#: rerere.c
+#, c-format
+msgid "no remembered resolution for '%s'"
+msgstr "没有为 '%s' 记忆的解决方案"
+
+#: rerere.c
+#, c-format
+msgid "cannot unlink '%s'"
+msgstr "不能删除 '%s'"
+
+#: rerere.c
+#, c-format
+msgid "Updated preimage for '%s'"
+msgstr "已为 '%s' 更新 preimage"
+
+#: rerere.c
+#, c-format
+msgid "Forgot resolution for '%s'\n"
+msgstr "忘记 '%s' 的解决方案\n"
+
+#: rerere.c
+msgid "unable to open rr-cache directory"
+msgstr "不能打开 rr-cache 目录"
+
+#: rerere.h
+msgid "update the index with reused conflict resolution if possible"
+msgstr "如果可能，重用冲突解决更新索引"
+
+#: reset.c
+msgid "could not determine HEAD revision"
+msgstr "不能确定 HEAD 版本"
+
+#: reset.c sequencer.c
+#, c-format
+msgid "failed to find tree of %s"
+msgstr "无法找到 %s 指向的树"
+
+#: revision.c
+msgid "--unpacked=<packfile> no longer supported"
+msgstr "不再支持 --unpacked=<packfile>"
+
+#: revision.c
+msgid "your current branch appears to be broken"
+msgstr "您的当前分支好像被损坏"
+
+#: revision.c
+#, c-format
+msgid "your current branch '%s' does not have any commits yet"
+msgstr "您的当前分支 '%s' 尚无任何提交"
+
+#: revision.c
+msgid "object filtering requires --objects"
+msgstr "对象过滤需要 --objects"
+
+#: revision.c
+msgid "-L does not yet support diff formats besides -p and -s"
+msgstr "-L 尚不支持 -p 和 -s 之外的差异格式"
+
+#: run-command.c
+#, c-format
+msgid "cannot create async thread: %s"
+msgstr "不能创建 async 线程：%s"
+
+#: send-pack.c
+msgid "unexpected flush packet while reading remote unpack status"
+msgstr "读取远程解包状态时收到意外的 flush 包"
+
+#: send-pack.c
+#, c-format
+msgid "unable to parse remote unpack status: %s"
+msgstr "不能解析远程解包状态：%s"
+
+#: send-pack.c
+#, c-format
+msgid "remote unpack failed: %s"
+msgstr "远程解包失败：%s"
+
+#: send-pack.c
+msgid "failed to sign the push certificate"
+msgstr "无法为推送证书签名"
+
+#: send-pack.c
+msgid "send-pack: unable to fork off fetch subprocess"
+msgstr "send-pack：无法派生 fetch 子进程"
+
+#: send-pack.c
+msgid "push negotiation failed; proceeding anyway with push"
+msgstr "推送协商失败，但还是继续推送"
+
+#: send-pack.c
+msgid "the receiving end does not support this repository's hash algorithm"
+msgstr "接收端不支持这个仓库的哈希算法"
+
+#: send-pack.c
+msgid "the receiving end does not support --signed push"
+msgstr "接收端不支持签名推送（--signed）"
+
+#: send-pack.c
+msgid ""
+"not sending a push certificate since the receiving end does not support --"
+"signed push"
+msgstr "未发送推送证书，因为接收端不支持签名推送（--signed）"
+
+#: send-pack.c
+msgid "the receiving end does not support --atomic push"
+msgstr "接收端不支持原子推送（--atomic）"
+
+#: send-pack.c
+msgid "the receiving end does not support push options"
+msgstr "接收端不支持推送选项"
+
+#: sequencer.c
+#, c-format
+msgid "invalid commit message cleanup mode '%s'"
+msgstr "无效的提交信息清理模式 '%s'"
+
+#: sequencer.c
+#, c-format
+msgid "could not delete '%s'"
+msgstr "无法删除 '%s'"
+
+#: sequencer.c
+msgid "revert"
+msgstr "还原"
+
+#: sequencer.c
+msgid "cherry-pick"
+msgstr "拣选"
+
+#: sequencer.c
+msgid "rebase"
+msgstr "变基"
+
+#: sequencer.c
+#, c-format
+msgid "unknown action: %d"
+msgstr "未知动作：%d"
+
+#: sequencer.c
+msgid ""
+"after resolving the conflicts, mark the corrected paths\n"
+"with 'git add <paths>' or 'git rm <paths>'"
+msgstr ""
+"冲突解决完毕后，用 'git add <路径>' 或 'git rm <路径>'\n"
+"命令标记修正后的文件"
+
+#: sequencer.c
+msgid ""
+"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/rm <路径规格>\" 标记它们，\n"
+"然后执行 \"git cherry-pick --continue\"。您也可以执行\n"
+"\"git cherry-pick --skip\" 命令跳过这个提交。如果想要终止执行并回到\n"
+"执行 \"git cherry-pick\" 之前的状态，执行 \"git cherry-pick --abort\"。"
+
+#: sequencer.c
+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
+#, c-format
+msgid "could not lock '%s'"
+msgstr "不能锁定 '%s'"
+
+#: sequencer.c strbuf.c wrapper.c
+#, c-format
+msgid "could not write to '%s'"
+msgstr "不能写入 '%s'"
+
+#: sequencer.c
+#, c-format
+msgid "could not write eol to '%s'"
+msgstr "不能将换行符写入 '%s'"
+
+#: sequencer.c
+#, c-format
+msgid "failed to finalize '%s'"
+msgstr "无法完成 '%s'"
+
+#: sequencer.c
+#, c-format
+msgid "your local changes would be overwritten by %s."
+msgstr "您的本地修改将被%s覆盖。"
+
+#: sequencer.c
+msgid "commit your changes or stash them to proceed."
+msgstr "提交您的修改或贮藏后再继续。"
+
+#: sequencer.c
+#, c-format
+msgid "%s: fast-forward"
+msgstr "%s：快进"
+
+#. TRANSLATORS: %s will be "revert", "cherry-pick" or
+#. "rebase".
+#.
+#: sequencer.c
+#, c-format
+msgid "%s: Unable to write new index file"
+msgstr "%s：无法写入新索引文件"
+
+#: sequencer.c
+msgid "unable to update cache tree"
+msgstr "不能更新缓存树"
+
+#: sequencer.c
+msgid "could not resolve HEAD commit"
+msgstr "不能解析 HEAD 提交"
+
+#: sequencer.c
+#, c-format
+msgid "no key present in '%.*s'"
+msgstr "在 '%.*s' 中没有 key"
+
+#: sequencer.c
+#, c-format
+msgid "unable to dequote value of '%s'"
+msgstr "无法为 '%s' 的值去引号"
+
+#: sequencer.c
+msgid "'GIT_AUTHOR_NAME' already given"
+msgstr "已经给出 'GIT_AUTHOR_NAME'"
+
+#: sequencer.c
+msgid "'GIT_AUTHOR_EMAIL' already given"
+msgstr "已经给出 'GIT_AUTHOR_EMAIL'"
+
+#: sequencer.c
+msgid "'GIT_AUTHOR_DATE' already given"
+msgstr "已经给出 'GIT_AUTHOR_DATE'"
+
+#: sequencer.c
+#, c-format
+msgid "unknown variable '%s'"
+msgstr "未知变量 '%s'"
+
+#: sequencer.c
+msgid "missing 'GIT_AUTHOR_NAME'"
+msgstr "缺少 'GIT_AUTHOR_NAME'"
+
+#: sequencer.c
+msgid "missing 'GIT_AUTHOR_EMAIL'"
+msgstr "缺少 'GIT_AUTHOR_EMAIL'"
+
+#: sequencer.c
+msgid "missing 'GIT_AUTHOR_DATE'"
+msgstr "缺少 'GIT_AUTHOR_DATE'"
+
+#: sequencer.c
+#, c-format
+msgid ""
+"you have staged changes in your working tree\n"
+"If these changes are meant to be squashed into the previous commit, run:\n"
+"\n"
+"  git commit --amend %s\n"
+"\n"
+"If they are meant to go into a new commit, run:\n"
+"\n"
+"  git commit %s\n"
+"\n"
+"In both cases, once you're done, continue with:\n"
+"\n"
+"  git rebase --continue\n"
+msgstr ""
+"您的工作区中存在已暂存的修改\n"
+"如果这些修改需要被挤压到前一个提交，执行：\n"
+"\n"
+"  git commit --amend %s\n"
+"\n"
+"如果这些修改要形成一个新提交，执行：\n"
+"\n"
+"  git commit %s\n"
+"\n"
+"无论哪种情况，当您完成提交，继续执行：\n"
+"\n"
+"  git rebase --continue\n"
+
+#: sequencer.c
+msgid "'prepare-commit-msg' hook failed"
+msgstr "'prepare-commit-msg' 钩子失败"
+
+#: sequencer.c
+msgid ""
+"Your name and email address were configured automatically based\n"
+"on your username and hostname. Please check that they are accurate.\n"
+"You can suppress this message by setting them explicitly. Run the\n"
+"following command and follow the instructions in your editor to edit\n"
+"your configuration file:\n"
+"\n"
+"    git config --global --edit\n"
+"\n"
+"After doing this, you may fix the identity used for this commit with:\n"
+"\n"
+"    git commit --amend --reset-author\n"
+msgstr ""
+"您的姓名和邮件地址基于登录名和主机名进行了自动设置。请检查它们正确\n"
+"与否。您可以对其进行设置以免再出现本提示信息。运行如下命令在编辑器\n"
+"中编辑您的配置文件：\n"
+"\n"
+"    git config --global --edit\n"
+"\n"
+"设置完毕后，您可以用下面的命令来修正本次提交所使用的用户身份：\n"
+"\n"
+"    git commit --amend --reset-author\n"
+
+#: sequencer.c
+msgid ""
+"Your name and email address were configured automatically based\n"
+"on your username and hostname. Please check that they are accurate.\n"
+"You can suppress this message by setting them explicitly:\n"
+"\n"
+"    git config --global user.name \"Your Name\"\n"
+"    git config --global user.email you@example.com\n"
+"\n"
+"After doing this, you may fix the identity used for this commit with:\n"
+"\n"
+"    git commit --amend --reset-author\n"
+msgstr ""
+"您的姓名和邮件地址基于登录名和主机名进行了自动设置。请检查它们正确\n"
+"与否。您可以对其进行设置以免再出现本提示信息：\n"
+"\n"
+"    git config --global user.name \"Your Name\"\n"
+"    git config --global user.email you@example.com\n"
+"\n"
+"设置完毕后，您可以用下面的命令来修正本次提交所使用的用户身份：\n"
+"\n"
+"    git commit --amend --reset-author\n"
+
+#: sequencer.c
+msgid "couldn't look up newly created commit"
+msgstr "无法找到新创建的提交"
+
+#: sequencer.c
+msgid "could not parse newly created commit"
+msgstr "不能解析新创建的提交"
+
+#: sequencer.c
+msgid "unable to resolve HEAD after creating commit"
+msgstr "创建提交后，不能解析 HEAD"
+
+#: sequencer.c
+msgid "detached HEAD"
+msgstr "分离头指针"
+
+#  译者：中文字符串拼接，可删除前导空格
+#: sequencer.c
+msgid " (root-commit)"
+msgstr "（根提交）"
+
+#: sequencer.c
+msgid "could not parse HEAD"
+msgstr "不能解析 HEAD"
+
+#: sequencer.c
+#, c-format
+msgid "HEAD %s is not a commit!"
+msgstr "HEAD %s 不是一个提交！"
+
+#: sequencer.c
+msgid "unable to parse commit author"
+msgstr "不能解析提交作者"
+
+#: sequencer.c
+#, c-format
+msgid "unable to read commit message from '%s'"
+msgstr "不能从 '%s' 读取提交说明"
+
+#: sequencer.c
+#, c-format
+msgid "invalid author identity '%s'"
+msgstr "无效的作者身份 '%s'"
+
+#: sequencer.c
+msgid "corrupt author: missing date information"
+msgstr "损坏的作者：缺失日期信息"
+
+#: sequencer.c t/helper/test-fast-rebase.c
+#, c-format
+msgid "could not update %s"
+msgstr "不能更新 %s"
+
+#: sequencer.c
+#, c-format
+msgid "could not parse commit %s"
+msgstr "不能解析提交 %s"
+
+#: sequencer.c
+#, c-format
+msgid "could not parse parent commit %s"
+msgstr "不能解析父提交 %s"
+
+#: sequencer.c
+#, c-format
+msgid "unknown command: %d"
+msgstr "未知命令：%d"
+
+#: sequencer.c
+msgid "This is the 1st commit message:"
+msgstr "这是第一个提交说明："
+
+#: sequencer.c
+#, c-format
+msgid "This is the commit message #%d:"
+msgstr "这是提交说明 #%d："
+
+#: sequencer.c
+msgid "The 1st commit message will be skipped:"
+msgstr "第一个提交说明将被跳过："
+
+#: sequencer.c
+#, c-format
+msgid "The commit message #%d will be skipped:"
+msgstr "提交说明 #%d 将被跳过："
+
+#: sequencer.c
+#, c-format
+msgid "This is a combination of %d commits."
+msgstr "这是一个 %d 个提交的组合。"
+
+#: sequencer.c
+#, c-format
+msgid "cannot write '%s'"
+msgstr "不能写 '%s'"
+
+#: sequencer.c
+msgid "need a HEAD to fixup"
+msgstr "需要一个 HEAD 来修复"
+
+#: sequencer.c
+msgid "could not read HEAD"
+msgstr "不能读取 HEAD"
+
+#: sequencer.c
+msgid "could not read HEAD's commit message"
+msgstr "不能读取 HEAD 的提交说明"
+
+#: sequencer.c
+#, c-format
+msgid "could not read commit message of %s"
+msgstr "不能读取 %s 的提交说明"
+
+#: sequencer.c
+msgid "your index file is unmerged."
+msgstr "您的索引文件未完成合并。"
+
+#: sequencer.c
+msgid "cannot fixup root commit"
+msgstr "不能修复根提交"
+
+#: sequencer.c
+#, c-format
+msgid "commit %s is a merge but no -m option was given."
+msgstr "提交 %s 是一个合并提交但未提供 -m 选项。"
+
+#: sequencer.c
+#, c-format
+msgid "commit %s does not have parent %d"
+msgstr "提交 %s 没有第 %d 个父提交"
+
+#: sequencer.c
+#, 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
+#, c-format
+msgid "%s: cannot parse parent commit %s"
+msgstr "%s：不能解析父提交 %s"
+
+#: sequencer.c
+#, c-format
+msgid "could not rename '%s' to '%s'"
+msgstr "不能将 '%s' 重命名为 '%s'"
+
+#: sequencer.c
+#, c-format
+msgid "could not revert %s... %s"
+msgstr "不能还原 %s... %s"
+
+#: sequencer.c
+#, c-format
+msgid "could not apply %s... %s"
+msgstr "不能应用 %s... %s"
+
+#: sequencer.c
+#, c-format
+msgid "dropping %s %s -- patch contents already upstream\n"
+msgstr "丢弃 %s %s -- 补丁内容已在上游\n"
+
+#: sequencer.c
+#, c-format
+msgid "git %s: failed to read the index"
+msgstr "git %s：无法读取索引"
+
+#: sequencer.c
+#, c-format
+msgid "git %s: failed to refresh the index"
+msgstr "git %s：无法刷新索引"
+
+#: sequencer.c
+#, c-format
+msgid "%s does not accept arguments: '%s'"
+msgstr "%s 不接受参数：'%s'"
+
+#: sequencer.c
+#, c-format
+msgid "missing arguments for %s"
+msgstr "缺少 %s 的参数"
+
+#: sequencer.c
+#, c-format
+msgid "could not parse '%s'"
+msgstr "无法解析 '%s'"
+
+#: sequencer.c
+#, c-format
+msgid "invalid line %d: %.*s"
+msgstr "无效行 %d：%.*s"
+
+#: sequencer.c
+#, c-format
+msgid "cannot '%s' without a previous commit"
+msgstr "没有父提交的情况下不能 '%s'"
+
+#: sequencer.c
+msgid "cancelling a cherry picking in progress"
+msgstr "正在取消一个进行中的拣选"
+
+#: sequencer.c
+msgid "cancelling a revert in progress"
+msgstr "正在取消一个进行中的还原"
+
+#: sequencer.c
+msgid "please fix this using 'git rebase --edit-todo'."
+msgstr "请用 'git rebase --edit-todo' 来修改。"
+
+#: sequencer.c
+#, c-format
+msgid "unusable instruction sheet: '%s'"
+msgstr "不可用的指令清单：'%s'"
+
+#: sequencer.c
+msgid "no commits parsed."
+msgstr "没有解析提交。"
+
+#: sequencer.c
+msgid "cannot cherry-pick during a revert."
+msgstr "不能在回退中执行拣选。"
+
+#: sequencer.c
+msgid "cannot revert during a cherry-pick."
+msgstr "不能在拣选中执行回退。"
+
+#: sequencer.c
+msgid "unusable squash-onto"
+msgstr "不可用的 squash-onto"
+
+#: sequencer.c
+#, c-format
+msgid "malformed options sheet: '%s'"
+msgstr "格式错误的选项清单：'%s'"
+
+#: sequencer.c
+msgid "empty commit set passed"
+msgstr "提供了空的提交集"
+
+#: sequencer.c
+msgid "revert is already in progress"
+msgstr "一个还原操作已在进行"
+
+#: sequencer.c
+#, c-format
+msgid "try \"git revert (--continue | %s--abort | --quit)\""
+msgstr "尝试 \"git revert (--continue | %s--abort | --quit)\""
+
+#: sequencer.c
+msgid "cherry-pick is already in progress"
+msgstr "拣选操作已在进行"
+
+#: sequencer.c
+#, c-format
+msgid "try \"git cherry-pick (--continue | %s--abort | --quit)\""
+msgstr "尝试 \"git cherry-pick (--continue | %s--abort | --quit)\""
+
+#: sequencer.c
+#, c-format
+msgid "could not create sequencer directory '%s'"
+msgstr "不能创建序列目录 '%s'"
+
+#: sequencer.c
+msgid "could not lock HEAD"
+msgstr "不能锁定 HEAD"
+
+#: sequencer.c
+msgid "no cherry-pick or revert in progress"
+msgstr "拣选或还原操作并未进行"
+
+#: sequencer.c
+msgid "cannot resolve HEAD"
+msgstr "不能解析 HEAD"
+
+#: sequencer.c
+msgid "cannot abort from a branch yet to be born"
+msgstr "不能从尚未建立的分支终止"
+
+#: sequencer.c
+#, c-format
+msgid "cannot read '%s': %s"
+msgstr "不能读取 '%s'：%s"
+
+#: sequencer.c
+msgid "unexpected end of file"
+msgstr "意外的文件结束"
+
+#: sequencer.c
+#, c-format
+msgid "stored pre-cherry-pick HEAD file '%s' is corrupt"
+msgstr "保存拣选提交前的 HEAD 文件 '%s' 损坏"
+
+#: sequencer.c
+msgid "You seem to have moved HEAD. Not rewinding, check your HEAD!"
+msgstr "您好像移动了 HEAD。未能回退，检查您的 HEAD！"
+
+#: sequencer.c
+msgid "no revert in progress"
+msgstr "没有正在进行的还原"
+
+#: sequencer.c
+msgid "no cherry-pick in progress"
+msgstr "没有正在进行的拣选"
+
+#: sequencer.c
+msgid "failed to skip the commit"
+msgstr "无法跳过这个提交"
+
+#: sequencer.c
+msgid "there is nothing to skip"
+msgstr "没有要跳过的"
+
+#: sequencer.c
+#, c-format
+msgid ""
+"have you committed already?\n"
+"try \"git %s --continue\""
+msgstr ""
+"您已经提交了么？\n"
+"试试 \"git %s --continue\""
+
+#: sequencer.c
+msgid "cannot read HEAD"
+msgstr "不能读取 HEAD"
+
+#: sequencer.c
+#, c-format
+msgid "unable to copy '%s' to '%s'"
+msgstr "无法拷贝 '%s' 至 '%s'"
+
+#: sequencer.c
+#, c-format
+msgid ""
+"You can amend the commit now, with\n"
+"\n"
+"  git commit --amend %s\n"
+"\n"
+"Once you are satisfied with your changes, run\n"
+"\n"
+"  git rebase --continue\n"
+msgstr ""
+"您现在可以修补这个提交，使用\n"
+"\n"
+"  git commit --amend %s\n"
+"\n"
+"当您对变更感到满意，执行\n"
+"\n"
+"  git rebase --continue\n"
+
+#: sequencer.c
+#, c-format
+msgid "Could not apply %s... %.*s"
+msgstr "不能应用 %s... %.*s"
+
+#: sequencer.c
+#, c-format
+msgid "Could not merge %.*s"
+msgstr "不能合并 %.*s"
+
+#: sequencer.c
+#, c-format
+msgid "Executing: %s\n"
+msgstr "正在执行：%s\n"
+
+#: sequencer.c
+#, c-format
+msgid ""
+"execution failed: %s\n"
+"%sYou can fix the problem, and then run\n"
+"\n"
+"  git rebase --continue\n"
+"\n"
+msgstr ""
+"执行失败：%s\n"
+"%s您可以改正该问题，然后运行\n"
+"\n"
+"  git rebase --continue\n"
+"\n"
+
+#: sequencer.c
+msgid "and made changes to the index and/or the working tree\n"
+msgstr "并且修改索引和/或工作区\n"
+
+#: sequencer.c
+#, c-format
+msgid ""
+"execution succeeded: %s\n"
+"but left changes to the index and/or the working tree\n"
+"Commit or stash your changes, and then run\n"
+"\n"
+"  git rebase --continue\n"
+"\n"
+msgstr ""
+"执行成功：%s\n"
+"但是在索引和/或工作区中存在变更\n"
+"提交或贮藏修改，然后运行\n"
+"\n"
+"  git rebase --continue\n"
+"\n"
+
+#: sequencer.c
+#, c-format
+msgid "illegal label name: '%.*s'"
+msgstr "非法的标签名称：'%.*s'"
+
+#: sequencer.c
+msgid "writing fake root commit"
+msgstr "写伪根提交"
+
+#: sequencer.c
+msgid "writing squash-onto"
+msgstr "写入 squash-onto"
+
+#: sequencer.c
+#, c-format
+msgid "could not resolve '%s'"
+msgstr "无法解析 '%s'"
+
+#: sequencer.c
+msgid "cannot merge without a current revision"
+msgstr "没有当前版本不能合并"
+
+#: sequencer.c
+#, c-format
+msgid "unable to parse '%.*s'"
+msgstr "无法解析 '%.*s'"
+
+#: sequencer.c
+#, c-format
+msgid "nothing to merge: '%.*s'"
+msgstr "无可用合并：'%.*s'"
+
+#: sequencer.c
+msgid "octopus merge cannot be executed on top of a [new root]"
+msgstr "章鱼合并不能在一个新的根提交上执行"
+
+#: sequencer.c
+#, c-format
+msgid "could not get commit message of '%s'"
+msgstr "不能获取 '%s' 的提交说明"
+
+#: sequencer.c
+#, c-format
+msgid "could not even attempt to merge '%.*s'"
+msgstr "甚至不能尝试合并 '%.*s'"
+
+#: sequencer.c
+msgid "merge: Unable to write new index file"
+msgstr "合并：无法写入新索引文件"
+
+#: sequencer.c
+msgid "Cannot autostash"
+msgstr "无法自动贮藏"
+
+#: sequencer.c
+#, c-format
+msgid "Unexpected stash response: '%s'"
+msgstr "意外的贮藏响应：'%s'"
+
+#: sequencer.c
+#, c-format
+msgid "Could not create directory for '%s'"
+msgstr "不能为 '%s' 创建目录"
+
+#: sequencer.c
+#, c-format
+msgid "Created autostash: %s\n"
+msgstr "创建了自动贮藏：%s\n"
+
+#: sequencer.c
+msgid "could not reset --hard"
+msgstr "无法硬性重置（reset --hard）"
+
+#: sequencer.c
+#, c-format
+msgid "Applied autostash.\n"
+msgstr "已应用自动贮藏。\n"
+
+#: sequencer.c
+#, c-format
+msgid "cannot store %s"
+msgstr "不能存储 %s"
+
+#: sequencer.c
+#, c-format
+msgid ""
+"%s\n"
+"Your changes are safe in the stash.\n"
+"You can run \"git stash pop\" or \"git stash drop\" at any time.\n"
+msgstr ""
+"%s\n"
+"您的修改在贮藏区中很安全。\n"
+"您可以在任何时候运行 \"git stash pop\" 或 \"git stash drop\"。\n"
+
+#: sequencer.c
+msgid "Applying autostash resulted in conflicts."
+msgstr "应用自动贮藏导致冲突。"
+
+#: sequencer.c
+msgid "Autostash exists; creating a new stash entry."
+msgstr "自动贮藏已经存在；正在创建一个新的贮藏条目。"
+
+#: sequencer.c
+msgid "could not detach HEAD"
+msgstr "不能分离头指针"
+
+#: sequencer.c
+#, c-format
+msgid "Stopped at HEAD\n"
+msgstr "停止在 HEAD\n"
+
+#: sequencer.c
+#, c-format
+msgid "Stopped at %s\n"
+msgstr "停止在 %s\n"
+
+#: sequencer.c
+#, c-format
+msgid ""
+"Could not execute the todo command\n"
+"\n"
+"    %.*s\n"
+"It has been rescheduled; To edit the command before continuing, please\n"
+"edit the todo list first:\n"
+"\n"
+"    git rebase --edit-todo\n"
+"    git rebase --continue\n"
+msgstr ""
+"无法执行待办命令\n"
+"\n"
+"    %.*s\n"
+"已被重新安排，在继续之前编辑命令，请先编辑待办列表：\n"
+"\n"
+"    git rebase --edit-todo\n"
+"    git rebase --continue\n"
+
+#: sequencer.c
+#, c-format
+msgid "Rebasing (%d/%d)%s"
+msgstr "正在变基（%d/%d）%s"
+
+#: sequencer.c
+#, c-format
+msgid "Stopped at %s...  %.*s\n"
+msgstr "停止在 %s... %.*s\n"
+
+#: sequencer.c
+#, c-format
+msgid "unknown command %d"
+msgstr "未知命令 %d"
+
+#: sequencer.c
+msgid "could not read orig-head"
+msgstr "不能读取 orig-head"
+
+#: sequencer.c
+msgid "could not read 'onto'"
+msgstr "不能读取 'onto'"
+
+#: sequencer.c
+#, c-format
+msgid "could not update HEAD to %s"
+msgstr "不能更新 HEAD 为 %s"
+
+#: sequencer.c
+#, c-format
+msgid "Successfully rebased and updated %s.\n"
+msgstr "成功变基并更新 %s。\n"
+
+#: sequencer.c
+msgid "cannot rebase: You have unstaged changes."
+msgstr "不能变基：您有未暂存的变更。"
+
+#: sequencer.c
+msgid "cannot amend non-existing commit"
+msgstr "不能修补不存在的提交"
+
+#: sequencer.c
+#, c-format
+msgid "invalid file: '%s'"
+msgstr "无效文件：'%s'"
+
+#: sequencer.c
+#, c-format
+msgid "invalid contents: '%s'"
+msgstr "无效内容：'%s'"
+
+#: sequencer.c
+msgid ""
+"\n"
+"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'。"
+
+#: sequencer.c
+#, c-format
+msgid "could not write file: '%s'"
+msgstr "不能写入文件：'%s'"
+
+#: sequencer.c
+msgid "could not remove CHERRY_PICK_HEAD"
+msgstr "不能删除 CHERRY_PICK_HEAD"
+
+#: sequencer.c
+msgid "could not commit staged changes."
+msgstr "不能提交暂存的修改。"
+
+#: sequencer.c
+#, c-format
+msgid "%s: can't cherry-pick a %s"
+msgstr "%s：不能拣选一个%s"
+
+#: sequencer.c
+#, c-format
+msgid "%s: bad revision"
+msgstr "%s：错误的版本"
+
+#: sequencer.c
+msgid "can't revert as initial commit"
+msgstr "不能作为初始提交回退"
+
+#: sequencer.c
+#, c-format
+msgid "skipped previously applied commit %s"
+msgstr "跳过了先前已应用的提交 %s"
+
+#: sequencer.c
+msgid "use --reapply-cherry-picks to include skipped commits"
+msgstr "使用 --reapply-cherry-picks 来包括跳过的提交"
+
+#: sequencer.c
+msgid "make_script: unhandled options"
+msgstr "make_script：有未能处理的选项"
+
+#: sequencer.c
+msgid "make_script: error preparing revisions"
+msgstr "make_script：准备版本时错误"
+
+#: sequencer.c
+msgid "nothing to do"
+msgstr "无事可做"
+
+#: sequencer.c
+msgid "could not skip unnecessary pick commands"
+msgstr "无法跳过不必要的拣选"
+
+#: sequencer.c
+msgid "the script was already rearranged."
+msgstr "脚本已经重新编排。"
+
+#: setup.c
+#, c-format
+msgid "'%s' is outside repository at '%s'"
+msgstr "'%s' 在位于 '%s' 的仓库之外"
+
+#: setup.c
+#, c-format
+msgid ""
+"%s: no such path in the working tree.\n"
+"Use 'git <command> -- <path>...' to specify paths that do not exist locally."
+msgstr ""
+"%s：工作区中无此路径。\n"
+"使用命令 'git <命令> -- <路径>...' 来指定本地不存在的路径。"
+
+#: setup.c
+#, c-format
+msgid ""
+"ambiguous argument '%s': unknown revision or path not in the working tree.\n"
+"Use '--' to separate paths from revisions, like this:\n"
+"'git <command> [<revision>...] -- [<file>...]'"
+msgstr ""
+"有歧义的参数 '%s'：未知的版本或路径不存在于工作区中。\n"
+"使用 '--' 来分隔版本和路径，例如：\n"
+"'git <命令> [<版本>...] -- [<文件>...]'"
+
+#: setup.c
+#, c-format
+msgid "option '%s' must come before non-option arguments"
+msgstr "选项 '%s' 必须在其他非选项参数之前"
+
+#: setup.c
+#, c-format
+msgid ""
+"ambiguous argument '%s': both revision and filename\n"
+"Use '--' to separate paths from revisions, like this:\n"
+"'git <command> [<revision>...] -- [<file>...]'"
+msgstr ""
+"有歧义的参数 '%s'：可同时是版本和文件\n"
+"使用 '--' 来分隔版本和路径，例如：\n"
+"'git <命令> [<版本>...] -- [<文件>...]'"
+
+#: setup.c
+msgid "unable to set up work tree using invalid config"
+msgstr "无法使用无效配置来创建工作区"
+
+#: setup.c
+#, c-format
+msgid "Expected git repo version <= %d, found %d"
+msgstr "期望 git 仓库版本 <= %d，却得到 %d"
+
+#: setup.c
+msgid "unknown repository extension found:"
+msgid_plural "unknown repository extensions found:"
+msgstr[0] "发现未知的仓库扩展："
+msgstr[1] "发现未知的仓库扩展："
+
+#: setup.c
+msgid "repo version is 0, but v1-only extension found:"
+msgid_plural "repo version is 0, but v1-only extensions found:"
+msgstr[0] "仓库的版本是 0，但是发现仅用于 v1 的扩展："
+msgstr[1] "仓库的版本是 0，但是发现仅用于 v1 的扩展："
+
+#: setup.c
+#, c-format
+msgid "error opening '%s'"
+msgstr "打开 '%s' 出错"
+
+#: setup.c
+#, c-format
+msgid "too large to be a .git file: '%s'"
+msgstr "文件太大，无法作为 .git 文件：'%s'"
+
+#: setup.c
+#, c-format
+msgid "error reading %s"
+msgstr "读取 %s 出错"
+
+#: setup.c
+#, c-format
+msgid "invalid gitfile format: %s"
+msgstr "无效的 gitfile 格式：%s"
+
+#: setup.c
+#, c-format
+msgid "no path in gitfile: %s"
+msgstr "在 gitfile 中没有路径：%s"
+
+#: setup.c
+#, c-format
+msgid "not a git repository: %s"
+msgstr "不是 git 仓库：%s"
+
+#: setup.c
+#, c-format
+msgid "'$%s' too big"
+msgstr "'$%s' 太大"
+
+#: setup.c
+#, c-format
+msgid "not a git repository: '%s'"
+msgstr "不是 git 仓库：'%s'"
+
+#: setup.c
+#, c-format
+msgid "cannot chdir to '%s'"
+msgstr "不能切换目录到 '%s'"
+
+#: setup.c
+msgid "cannot come back to cwd"
+msgstr "无法返回当前工作目录"
+
+#: setup.c
+#, c-format
+msgid "failed to stat '%*s%s%s'"
+msgstr "无法获取 '%*s%s%s' 状态（stat）"
+
+#: setup.c
+msgid "Unable to read current working directory"
+msgstr "不能读取当前工作目录"
+
+#: setup.c
+#, c-format
+msgid "cannot change to '%s'"
+msgstr "不能切换到 '%s'"
+
+#: setup.c
+#, c-format
+msgid "not a git repository (or any of the parent directories): %s"
+msgstr "不是 git 仓库（或者任何父目录）：%s"
+
+#: setup.c
+#, 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 ""
+"不是 git 仓库（或者直至挂载点 %s 的任何父目录）\n"
+"停止在文件系统边界（未设置 GIT_DISCOVERY_ACROSS_FILESYSTEM）。"
+
+#: setup.c
+#, c-format
+msgid ""
+"unsafe repository ('%s' is owned by someone else)\n"
+"To add an exception for this directory, call:\n"
+"\n"
+"\tgit config --global --add safe.directory %s"
+msgstr ""
+"仓库不安全（'%s' 的所有者是其他人）\n"
+"要为本仓库创建特例，请使用：\n"
+"\n"
+"\tgit config --global --add safe.directory %s"
+
+#: setup.c
+#, c-format
+msgid ""
+"problem with core.sharedRepository filemode value (0%.3o).\n"
+"The owner of files must always have read and write permissions."
+msgstr ""
+"参数 core.sharedRepository 的文件属性值有问题（0%.3o）。\n"
+"文件属主必须始终拥有读写权限。"
+
+#: setup.c
+msgid "fork failed"
+msgstr "fork 失败"
+
+#: setup.c
+msgid "setsid failed"
+msgstr "setsid 失败"
+
+#: sparse-index.c
+#, c-format
+msgid "index entry is a directory, but not sparse (%08x)"
+msgstr "索引条目是一个目录，但不是稀疏的 (%08x)"
+
+#: split-index.c
+msgid "cannot use split index with a sparse index"
+msgstr "拆分索引无法与稀疏索引一起使用"
+
+#. TRANSLATORS: IEC 80000-13:2008 gibibyte
+#: strbuf.c
+#, c-format
+msgid "%u.%2.2u GiB"
+msgstr "%u.%2.2u GiB"
+
+#. TRANSLATORS: IEC 80000-13:2008 gibibyte/second
+#: strbuf.c
+#, c-format
+msgid "%u.%2.2u GiB/s"
+msgstr "%u.%2.2u GiB/s"
+
+#. TRANSLATORS: IEC 80000-13:2008 mebibyte
+#: strbuf.c
+#, c-format
+msgid "%u.%2.2u MiB"
+msgstr "%u.%2.2u MiB"
+
+#. TRANSLATORS: IEC 80000-13:2008 mebibyte/second
+#: strbuf.c
+#, c-format
+msgid "%u.%2.2u MiB/s"
+msgstr "%u.%2.2u MiB/s"
+
+#. TRANSLATORS: IEC 80000-13:2008 kibibyte
+#: strbuf.c
+#, c-format
+msgid "%u.%2.2u KiB"
+msgstr "%u.%2.2u KiB"
+
+#. TRANSLATORS: IEC 80000-13:2008 kibibyte/second
+#: strbuf.c
+#, c-format
+msgid "%u.%2.2u KiB/s"
+msgstr "%u.%2.2u KiB/s"
+
+#. TRANSLATORS: IEC 80000-13:2008 byte
+#: strbuf.c
+#, c-format
+msgid "%u byte"
+msgid_plural "%u bytes"
+msgstr[0] "%u 字节"
+msgstr[1] "%u 字节"
+
+#. TRANSLATORS: IEC 80000-13:2008 byte/second
+#: strbuf.c
+#, c-format
+msgid "%u byte/s"
+msgid_plural "%u bytes/s"
+msgstr[0] "%u 字节/秒"
+msgstr[1] "%u 字节/秒"
+
+#: strbuf.c
+#, c-format
+msgid "could not edit '%s'"
+msgstr "不能编辑 '%s'"
+
+#: submodule-config.c
+#, c-format
+msgid "ignoring suspicious submodule name: %s"
+msgstr "忽略可疑的子模组名称：%s"
+
+#: submodule-config.c
+msgid "negative values not allowed for submodule.fetchJobs"
+msgstr "submodule.fetchJobs 不允许为负值"
+
+#: submodule-config.c
+#, c-format
+msgid "ignoring '%s' which may be interpreted as a command-line option: %s"
+msgstr "忽略可能被解析为命令行选项的 '%s'：%s"
+
+#: submodule-config.c
+#, c-format
+msgid "Could not update .gitmodules entry %s"
+msgstr "不能更新 .gitmodules 条目 %s"
+
+#: submodule.c
+msgid "Cannot change unmerged .gitmodules, resolve merge conflicts first"
+msgstr "无法修改未合并的 .gitmodules，先解决合并冲突"
+
+#: submodule.c
+#, c-format
+msgid "Could not find section in .gitmodules where path=%s"
+msgstr "无法在 .gitmodules 中找到 path=%s 的小节"
+
+#: submodule.c
+#, c-format
+msgid "Could not remove .gitmodules entry for %s"
+msgstr "无法移除 %s 的 .gitmodules 条目"
+
+#: submodule.c
+msgid "staging updated .gitmodules failed"
+msgstr "将更新后 .gitmodules 添加暂存区失败"
+
+#: submodule.c
+#, c-format
+msgid "in unpopulated submodule '%s'"
+msgstr "位于未检出的子模组 '%s'"
+
+#: submodule.c
+#, c-format
+msgid "Pathspec '%s' is in submodule '%.*s'"
+msgstr "路径规格 '%s' 在子模组 '%.*s' 中"
+
+#: submodule.c
+#, c-format
+msgid "bad --ignore-submodules argument: %s"
+msgstr "坏的 --ignore-submodules 参数：%s"
+
+#: submodule.c
+#, c-format
+msgid ""
+"Submodule in commit %s at path: '%s' collides with a submodule named the "
+"same. Skipping it."
+msgstr "提交 %s 中位于路径 '%s' 的子模组和同名的子模组冲突。 跳过它。"
+
+#: submodule.c
+#, c-format
+msgid "submodule entry '%s' (%s) is a %s, not a commit"
+msgstr "子模组条目 '%s'（%s）是一个 %s，不是一个提交"
+
+#: submodule.c
+#, 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
+#, c-format
+msgid "process for submodule '%s' failed"
+msgstr "处理子模组 '%s' 失败"
+
+#: submodule.c
+#, c-format
+msgid "Pushing submodule '%s'\n"
+msgstr "正在推送子模组 '%s'\n"
+
+#: submodule.c
+#, c-format
+msgid "Unable to push submodule '%s'\n"
+msgstr "无法推送子模组 '%s'\n"
+
+#: submodule.c
+#, c-format
+msgid "Fetching submodule %s%s\n"
+msgstr "正在获取子模组 %s%s\n"
+
+#: submodule.c
+#, c-format
+msgid "Could not access submodule '%s'\n"
+msgstr "无法访问子模组 '%s'\n"
+
+#: submodule.c
+#, c-format
+msgid "Could not access submodule '%s' at commit %s\n"
+msgstr "无法访问子模组 '%s' 提交 %s\n"
+
+#: submodule.c
+#, c-format
+msgid "Fetching submodule %s%s at commit %s\n"
+msgstr "正在获取子模组 %s%s 提交 %s\n"
+
+#: submodule.c
+#, c-format
+msgid ""
+"Errors during submodule fetch:\n"
+"%s"
+msgstr ""
+"获取子模组时的错误：\n"
+"%s"
+
+#: submodule.c
+#, c-format
+msgid "'%s' not recognized as a git repository"
+msgstr "无法将 '%s' 识别为 git 仓库"
+
+#: submodule.c
+#, c-format
+msgid "Could not run 'git status --porcelain=2' in submodule %s"
+msgstr "无法在子模组 %s 中执行 'git status --porcelain=2'"
+
+#: submodule.c
+#, c-format
+msgid "'git status --porcelain=2' failed in submodule %s"
+msgstr "在子模组 %s 中执行 'git status --porcelain=2' 失败"
+
+#: submodule.c
+#, c-format
+msgid "could not start 'git status' in submodule '%s'"
+msgstr "无法在子模组 '%s' 中启动 'git status'"
+
+#: submodule.c
+#, c-format
+msgid "could not run 'git status' in submodule '%s'"
+msgstr "无法在子模组 '%s' 中执行 'git status'"
+
+#: submodule.c
+#, c-format
+msgid "Could not unset core.worktree setting in submodule '%s'"
+msgstr "无法在子模组 '%s' 中取消 core.worktree 的设置"
+
+#: submodule.c
+#, c-format
+msgid "could not recurse into submodule '%s'"
+msgstr "无法递归进子模组路径 '%s'"
+
+#: submodule.c
+msgid "could not reset submodule index"
+msgstr "无法重置子模组索引"
+
+#: submodule.c
+#, c-format
+msgid "submodule '%s' has dirty index"
+msgstr "子模组 '%s' 中有脏索引"
+
+#: submodule.c
+#, c-format
+msgid "Submodule '%s' could not be updated."
+msgstr "子模组 '%s' 无法被更新。"
+
+#: submodule.c
+#, c-format
+msgid "submodule git dir '%s' is inside git dir '%.*s'"
+msgstr "子模组 git 目录 '%s' 位于 git 目录 '%.*s' 中"
+
+#: submodule.c
+#, c-format
+msgid ""
+"relocate_gitdir for submodule '%s' with more than one worktree not supported"
+msgstr "不支持对有多个工作区的子模组 '%s' 执行 relocate_gitdir"
+
+#: submodule.c
+#, c-format
+msgid "could not lookup name for submodule '%s'"
+msgstr "不能查询子模组 '%s' 的名称"
+
+#: submodule.c
+#, c-format
+msgid "refusing to move '%s' into an existing git dir"
+msgstr "禁止移动 '%s' 到现存 git 目录中"
+
+#: submodule.c
+#, c-format
+msgid ""
+"Migrating git directory of '%s%s' from\n"
+"'%s' to\n"
+"'%s'\n"
+msgstr ""
+"将 '%s%s' 的 git 目录从\n"
+"'%s' 迁移至\n"
+"'%s'\n"
+
+#: submodule.c
+msgid "could not start ls-files in .."
+msgstr "无法在 .. 中启动 ls-files"
+
+#: submodule.c
+#, c-format
+msgid "ls-tree returned unexpected return code %d"
+msgstr "ls-tree 返回未知返回值 %d"
+
+#: symlinks.c
+#, c-format
+msgid "failed to lstat '%s'"
+msgstr "无法执行 lstat '%s'"
+
+#: t/helper/test-fast-rebase.c
+msgid "unhandled options"
+msgstr "未处理的选项"
+
+#: t/helper/test-fast-rebase.c
+msgid "error preparing revisions"
+msgstr "准备版本时错误"
+
+#: t/helper/test-reach.c
+#, c-format
+msgid "commit %s is not marked reachable"
+msgstr "提交 %s 没有标记为可达"
+
+#: t/helper/test-reach.c
+msgid "too many commits marked reachable"
+msgstr "太多提交标记为可达"
+
+#: t/helper/test-serve-v2.c
+msgid "test-tool serve-v2 [<options>]"
+msgstr "test-tool serve-v2 [<选项>]"
+
+#: t/helper/test-serve-v2.c
+msgid "exit immediately after advertising capabilities"
+msgstr "通告能力之后立即退出"
+
+#: t/helper/test-simple-ipc.c
+msgid "test-helper simple-ipc is-active    [<name>] [<options>]"
+msgstr "test-helper simple-ipc is-active    [<名字>] [<选项>]"
+
+#: t/helper/test-simple-ipc.c
+msgid "test-helper simple-ipc run-daemon   [<name>] [<threads>]"
+msgstr "test-helper simple-ipc run-daemon   [<名字>] [<线程>]"
+
+#: t/helper/test-simple-ipc.c
+msgid "test-helper simple-ipc start-daemon [<name>] [<threads>] [<max-wait>]"
+msgstr "test-helper simple-ipc start-daemon [<名字>] [<线程>] [<最大等待>]"
+
+#: t/helper/test-simple-ipc.c
+msgid "test-helper simple-ipc stop-daemon  [<name>] [<max-wait>]"
+msgstr "test-helper simple-ipc stop-daemon  [<名字>] [<最大等待>]"
+
+#: t/helper/test-simple-ipc.c
+msgid "test-helper simple-ipc send         [<name>] [<token>]"
+msgstr "test-helper simple-ipc send         [<名字>] [<令牌>]"
+
+#: t/helper/test-simple-ipc.c
+msgid "test-helper simple-ipc sendbytes    [<name>] [<bytecount>] [<byte>]"
+msgstr "test-helper simple-ipc sendbytes    [<名字>] [<字节数>] [<字节>]"
+
+#: t/helper/test-simple-ipc.c
+msgid ""
+"test-helper simple-ipc multiple     [<name>] [<threads>] [<bytecount>] "
+"[<batchsize>]"
+msgstr ""
+"test-helper simple-ipc multiple     [<名字>] [<线程>] [<字节计数>] [<批处理大"
+"小>]"
+
+#: t/helper/test-simple-ipc.c
+msgid "name or pathname of unix domain socket"
+msgstr "unix 域套接字的名称或路径名"
+
+#: t/helper/test-simple-ipc.c
+msgid "named-pipe name"
+msgstr "命名管道的名字"
+
+#: t/helper/test-simple-ipc.c
+msgid "number of threads in server thread pool"
+msgstr "服务器线程池中的线程数"
+
+#: t/helper/test-simple-ipc.c
+msgid "seconds to wait for daemon to start or stop"
+msgstr "等待守护进程启动或停止的秒数"
+
+#: t/helper/test-simple-ipc.c
+msgid "number of bytes"
+msgstr "字节数目"
+
+#: t/helper/test-simple-ipc.c
+msgid "number of requests per thread"
+msgstr "每个线程的请求数"
+
+#: t/helper/test-simple-ipc.c
+msgid "byte"
+msgstr "字节"
+
+#: t/helper/test-simple-ipc.c
+msgid "ballast character"
+msgstr "ballast character"
+
+#: t/helper/test-simple-ipc.c
+msgid "token"
+msgstr "令牌"
+
+#: t/helper/test-simple-ipc.c
+msgid "command token to send to the server"
+msgstr "发送到服务器的命令令牌"
+
+#: trailer.c
+#, c-format
+msgid "running trailer command '%s' failed"
+msgstr "执行 trailer 命令 '%s' 失败"
+
+#: trailer.c
+#, c-format
+msgid "unknown value '%s' for key '%s'"
+msgstr "键 '%2$s' 的未知取值 '%1$s'"
+
+#: trailer.c
+#, c-format
+msgid "empty trailer token in trailer '%.*s'"
+msgstr "尾注 '%.*s' 的键为空"
+
+#: trailer.c
+#, c-format
+msgid "could not read input file '%s'"
+msgstr "不能读取输入文件 '%s'"
+
+#: trailer.c wrapper.c
+#, c-format
+msgid "could not stat %s"
+msgstr "不能对 %s 调用 stat"
+
+#: trailer.c
+#, c-format
+msgid "file %s is not a regular file"
+msgstr "文件 %s 不是一个正规文件"
+
+#: trailer.c
+#, c-format
+msgid "file %s is not writable by user"
+msgstr "文件 %s 用户不可写"
+
+#: trailer.c
+msgid "could not open temporary file"
+msgstr "不能打开临时文件"
+
+#: trailer.c
+#, c-format
+msgid "could not rename temporary file to %s"
+msgstr "不能重命名临时文件为 %s"
+
+#: transport-helper.c
+msgid "full write to remote helper failed"
+msgstr "完整写入远程助手失败"
+
+#: transport-helper.c
+#, c-format
+msgid "unable to find remote helper for '%s'"
+msgstr "无法为 '%s' 找到远程助手"
+
+#: transport-helper.c
+msgid "can't dup helper output fd"
+msgstr "无法复制助手输出文件句柄"
+
+#: transport-helper.c
+#, c-format
+msgid ""
+"unknown mandatory capability %s; this remote helper probably needs newer "
+"version of Git"
+msgstr "未知的强制能力 %s，该远程助手可能需要新版本的Git"
+
+#: transport-helper.c
+msgid "this remote helper should implement refspec capability"
+msgstr "远程助手需要实现 refspec 能力"
+
+#: transport-helper.c
+#, c-format
+msgid "%s unexpectedly said: '%s'"
+msgstr "%s 意外地说：'%s'"
+
+#: transport-helper.c
+#, c-format
+msgid "%s also locked %s"
+msgstr "%s 也锁定了 %s"
+
+#: transport-helper.c
+msgid "couldn't run fast-import"
+msgstr "不能执行 fast-import"
+
+#: transport-helper.c
+msgid "error while running fast-import"
+msgstr "执行 fast-import 出错"
+
+#: transport-helper.c
+#, c-format
+msgid "could not read ref %s"
+msgstr "无法读取引用 %s"
+
+#: transport-helper.c
+#, c-format
+msgid "unknown response to connect: %s"
+msgstr "连接时未知的响应：%s"
+
+#: transport-helper.c
+msgid "setting remote service path not supported by protocol"
+msgstr "协议不支持设置远程服务路径"
+
+#: transport-helper.c
+msgid "invalid remote service path"
+msgstr "无效的远程服务路径"
+
+#: transport-helper.c transport.c
+msgid "operation not supported by protocol"
+msgstr "协议不支持该操作"
+
+#: transport-helper.c
+#, c-format
+msgid "can't connect to subservice %s"
+msgstr "不能连接到子服务 %s"
+
+#: transport-helper.c transport.c
+msgid "--negotiate-only requires protocol v2"
+msgstr "--negotiate-only 需要协议 v2"
+
+#: transport-helper.c
+msgid "'option' without a matching 'ok/error' directive"
+msgstr "'option' 缺乏一个匹配的 'ok/error' 指令"
+
+#: transport-helper.c
+#, c-format
+msgid "expected ok/error, helper said '%s'"
+msgstr "预期 ok/error，助手说 '%s'"
+
+#: transport-helper.c
+#, c-format
+msgid "helper reported unexpected status of %s"
+msgstr "助手报告 %s 的意外状态"
+
+#: transport-helper.c
+#, c-format
+msgid "helper %s does not support dry-run"
+msgstr "助手 %s 不支持 dry-run"
+
+#: transport-helper.c
+#, c-format
+msgid "helper %s does not support --signed"
+msgstr "助手 %s 不支持 --signed"
+
+#: transport-helper.c
+#, c-format
+msgid "helper %s does not support --signed=if-asked"
+msgstr "助手 %s 不支持 --signed=if-asked"
+
+#: transport-helper.c
+#, c-format
+msgid "helper %s does not support --atomic"
+msgstr "助手 %s 不支持 --atomic"
+
+#: transport-helper.c
+#, c-format
+msgid "helper %s does not support --%s"
+msgstr "助手 %s 不支持 --%s"
+
+#: transport-helper.c
+#, c-format
+msgid "helper %s does not support 'push-option'"
+msgstr "助手 %s 不支持 'push-option'"
+
+#: transport-helper.c
+msgid "remote-helper doesn't support push; refspec needed"
+msgstr "remote-heper 不支持推送，需要引用规格"
+
+#: transport-helper.c
+#, c-format
+msgid "helper %s does not support 'force'"
+msgstr "助手 %s 不支持 'force'"
+
+#: transport-helper.c
+msgid "couldn't run fast-export"
+msgstr "无法执行 fast-export"
+
+#: transport-helper.c
+msgid "error while running fast-export"
+msgstr "执行 fast-export 时出错"
+
+#: transport-helper.c
+#, c-format
+msgid ""
+"No refs in common and none specified; doing nothing.\n"
+"Perhaps you should specify a branch.\n"
+msgstr ""
+"没有共同的引用并且也没有指定，什么也不会做。\n"
+"也许您应该指定一个分支。\n"
+
+#: transport-helper.c
+#, c-format
+msgid "unsupported object format '%s'"
+msgstr "不支持的对象格式 '%s'"
+
+#: transport-helper.c
+#, c-format
+msgid "malformed response in ref list: %s"
+msgstr "引用列表中格式错误的响应：%s"
+
+#: transport-helper.c
+#, c-format
+msgid "read(%s) failed"
+msgstr "读取（%s）失败"
+
+#: transport-helper.c
+#, c-format
+msgid "write(%s) failed"
+msgstr "写（%s）失败"
+
+#: transport-helper.c
+#, c-format
+msgid "%s thread failed"
+msgstr "%s 线程失败"
+
+#: transport-helper.c
+#, c-format
+msgid "%s thread failed to join: %s"
+msgstr "%s 线程等待失败：%s"
+
+#: transport-helper.c
+#, c-format
+msgid "can't start thread for copying data: %s"
+msgstr "不能启动线程来拷贝数据：%s"
+
+#: transport-helper.c
+#, c-format
+msgid "%s process failed to wait"
+msgstr "%s 进程等待失败"
+
+#: transport-helper.c
+#, c-format
+msgid "%s process failed"
+msgstr "%s 进程失败"
+
+#: transport-helper.c
+msgid "can't start thread for copying data"
+msgstr "不能启动线程来拷贝数据"
+
+#: transport.c
+#, c-format
+msgid "Would set upstream of '%s' to '%s' of '%s'\n"
+msgstr "将要设置 '%1$s' 的上游为 '%3$s' 的 '%2$s'\n"
+
+#: transport.c
+#, c-format
+msgid "could not read bundle '%s'"
+msgstr "无法读取归档包 '%s'"
+
+#: transport.c
+#, c-format
+msgid "transport: invalid depth option '%s'"
+msgstr "传输：无效的深度选项 '%s'"
+
+#: transport.c
+msgid "see protocol.version in 'git help config' for more details"
+msgstr "查看 'git help config' 中的 protocol.version 获取更多信息"
+
+#: transport.c
+msgid "server options require protocol version 2 or later"
+msgstr "服务端选项需要版本 2 协议或更高"
+
+#: transport.c
+msgid "server does not support wait-for-done"
+msgstr "服务器不支持 wait-for-done"
+
+#: transport.c
+msgid "could not parse transport.color.* config"
+msgstr "不能解析 transport.color.* 配置"
+
+#: transport.c
+msgid "support for protocol v2 not implemented yet"
+msgstr "协议 v2 的支持尚未实现"
+
+#: transport.c
+#, c-format
+msgid "unknown value for config '%s': %s"
+msgstr "配置 '%s' 的取值未知：%s"
+
+#: transport.c
+#, c-format
+msgid "transport '%s' not allowed"
+msgstr "传输 '%s' 不允许"
+
+#: transport.c
+msgid "git-over-rsync is no longer supported"
+msgstr "不再支持 git-over-rsync"
+
+#: transport.c
+#, c-format
+msgid ""
+"The following submodule paths contain changes that can\n"
+"not be found on any remote:\n"
+msgstr "下列子模组路径所包含的修改在任何远程源中都找不到：\n"
+
+#: transport.c
+#, c-format
+msgid ""
+"\n"
+"Please try\n"
+"\n"
+"\tgit push --recurse-submodules=on-demand\n"
+"\n"
+"or cd to the path and use\n"
+"\n"
+"\tgit push\n"
+"\n"
+"to push them to a remote.\n"
+"\n"
+msgstr ""
+"\n"
+"请尝试\n"
+"\n"
+"\tgit push --recurse-submodules=on-demand\n"
+"\n"
+"或者进入到子目录执行\n"
+"\n"
+"\tgit push\n"
+"\n"
+"以推送至远程。\n"
+"\n"
+
+#: transport.c
+msgid "Aborting."
+msgstr "正在终止。"
+
+#: transport.c
+msgid "failed to push all needed submodules"
+msgstr "不能推送全部需要的子模组"
+
+#: tree-walk.c
+msgid "too-short tree object"
+msgstr "太短的树对象"
+
+#: tree-walk.c
+msgid "malformed mode in tree entry"
+msgstr "树对象中的条目模式错误"
+
+#: tree-walk.c
+msgid "empty filename in tree entry"
+msgstr "树对象条目中空的文件名"
+
+#: tree-walk.c
+msgid "too-short tree file"
+msgstr "太短的树文件"
+
+#: unpack-trees.c
+#, c-format
+msgid ""
+"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 ""
+"您对下列文件的本地修改将被检出操作覆盖：\n"
+"%%s请在切换分支前提交或贮藏您的修改。"
+
+#: unpack-trees.c
+#, c-format
+msgid ""
+"Your local changes to the following files would be overwritten by checkout:\n"
+"%%s"
+msgstr ""
+"您对下列文件的本地修改将被检出操作覆盖：\n"
+"%%s"
+
+#: unpack-trees.c
+#, c-format
+msgid ""
+"Your local changes to the following files would be overwritten by merge:\n"
+"%%sPlease commit your changes or stash them before you merge."
+msgstr ""
+"您对下列文件的本地修改将被合并操作覆盖：\n"
+"%%s请在合并前提交或贮藏您的修改。"
+
+#: unpack-trees.c
+#, c-format
+msgid ""
+"Your local changes to the following files would be overwritten by merge:\n"
+"%%s"
+msgstr ""
+"您对下列文件的本地修改将被合并操作覆盖：\n"
+"%%s"
+
+#: unpack-trees.c
+#, c-format
+msgid ""
+"Your local changes to the following files would be overwritten by %s:\n"
+"%%sPlease commit your changes or stash them before you %s."
+msgstr ""
+"您对下列文件的本地修改将被 %s 覆盖：\n"
+"%%s请在 %s 之前提交或贮藏您的修改。"
+
+#: unpack-trees.c
+#, c-format
+msgid ""
+"Your local changes to the following files would be overwritten by %s:\n"
+"%%s"
+msgstr ""
+"您对下列文件的本地修改将被 %s 覆盖：\n"
+"%%s"
+
+#: unpack-trees.c
+#, c-format
+msgid ""
+"Updating the following directories would lose untracked files in them:\n"
+"%s"
+msgstr ""
+"更新如下目录将会丢失其中未跟踪的文件：\n"
+"%s"
+
+#: unpack-trees.c
+#, c-format
+msgid ""
+"Refusing to remove the current working directory:\n"
+"%s"
+msgstr ""
+"拒绝删除当前工作目录：\n"
+"%s"
+
+#: unpack-trees.c
+#, c-format
+msgid ""
+"The following untracked working tree files would be removed by checkout:\n"
+"%%sPlease move or remove them before you switch branches."
+msgstr ""
+"工作区中下列未跟踪的文件将会因为检出操作而被删除：\n"
+"%%s请在切换分支之前移动或删除。"
+
+#: unpack-trees.c
+#, c-format
+msgid ""
+"The following untracked working tree files would be removed by checkout:\n"
+"%%s"
+msgstr ""
+"工作区中下列未跟踪的文件将会因为检出操作而被删除：\n"
+"%%s"
+
+#: unpack-trees.c
+#, c-format
+msgid ""
+"The following untracked working tree files would be removed by merge:\n"
+"%%sPlease move or remove them before you merge."
+msgstr ""
+"工作区中下列未跟踪的文件将会因为合并操作而被删除：\n"
+"%%s请在合并前移动或删除。"
+
+#: unpack-trees.c
+#, c-format
+msgid ""
+"The following untracked working tree files would be removed by merge:\n"
+"%%s"
+msgstr ""
+"工作区中下列未跟踪的文件将会因为合并操作而被删除：\n"
+"%%s"
+
+#: unpack-trees.c
+#, c-format
+msgid ""
+"The following untracked working tree files would be removed by %s:\n"
+"%%sPlease move or remove them before you %s."
+msgstr ""
+"工作区中下列未跟踪的文件将会因为 %s 操作而被删除：\n"
+"%%s请在 %s 前移动或删除。"
+
+#: unpack-trees.c
+#, c-format
+msgid ""
+"The following untracked working tree files would be removed by %s:\n"
+"%%s"
+msgstr ""
+"工作区中下列未跟踪的文件将会因为 %s 操作而被删除：\n"
+"%%s"
+
+#: unpack-trees.c
+#, c-format
+msgid ""
+"The following untracked working tree files would be overwritten by "
+"checkout:\n"
+"%%sPlease move or remove them before you switch branches."
+msgstr ""
+"工作区中下列未跟踪的文件将会因为检出操作而被覆盖：\n"
+"%%s请在切换分支前移动或删除。"
+
+#: unpack-trees.c
+#, c-format
+msgid ""
+"The following untracked working tree files would be overwritten by "
+"checkout:\n"
+"%%s"
+msgstr ""
+"工作区中下列未跟踪的文件将会因为检出操作而被覆盖：\n"
+"%%s"
+
+#: unpack-trees.c
+#, c-format
+msgid ""
+"The following untracked working tree files would be overwritten by merge:\n"
+"%%sPlease move or remove them before you merge."
+msgstr ""
+"工作区中下列未跟踪的文件将会因为合并操作而被覆盖：\n"
+"%%s请在合并前移动或删除。"
+
+#: unpack-trees.c
+#, c-format
+msgid ""
+"The following untracked working tree files would be overwritten by merge:\n"
+"%%s"
+msgstr ""
+"工作区中下列未跟踪的文件将会因为合并操作而被覆盖：\n"
+"%%s"
+
+#: unpack-trees.c
+#, c-format
+msgid ""
+"The following untracked working tree files would be overwritten by %s:\n"
+"%%sPlease move or remove them before you %s."
+msgstr ""
+"工作区中下列未跟踪的文件将会因为 %s 操作而被覆盖：\n"
+"%%s请在 %s 前移动或删除。"
+
+#: unpack-trees.c
+#, c-format
+msgid ""
+"The following untracked working tree files would be overwritten by %s:\n"
+"%%s"
+msgstr ""
+"工作区中下列未跟踪的文件将会因为 %s 操作而被覆盖：\n"
+"%%s"
+
+#: unpack-trees.c
+#, c-format
+msgid "Entry '%s' overlaps with '%s'.  Cannot bind."
+msgstr "条目 '%s' 和 '%s' 重叠。无法合并。"
+
+#: unpack-trees.c
+#, c-format
+msgid ""
+"Cannot update submodule:\n"
+"%s"
+msgstr ""
+"无法更新子模组：\n"
+"%s"
+
+#: unpack-trees.c
+#, c-format
+msgid ""
+"The following paths are not up to date and were left despite sparse "
+"patterns:\n"
+"%s"
+msgstr ""
+"尽管存在稀疏检出模板，以下路径不是最新，因而保留：\n"
+"%s"
+
+#: unpack-trees.c
+#, c-format
+msgid ""
+"The following paths are unmerged and were left despite sparse patterns:\n"
+"%s"
+msgstr ""
+"尽管存在稀疏检出模板，以下路径处于未合并状态，因而保留：\n"
+"%s"
+
+#: unpack-trees.c
+#, c-format
+msgid ""
+"The following paths were already present and thus not updated despite sparse "
+"patterns:\n"
+"%s"
+msgstr ""
+"尽管存在稀疏检出模板，以下路径已经存在，因而未更新：\n"
+"%s"
+
+#: unpack-trees.c
+#, c-format
+msgid "Aborting\n"
+msgstr "正在终止\n"
+
+#: unpack-trees.c
+#, c-format
+msgid ""
+"After fixing the above paths, you may want to run `git sparse-checkout "
+"reapply`.\n"
+msgstr "在修复上述路径之后，您可能要执行 `git sparse-checkout reapply`。\n"
+
+#: unpack-trees.c
+msgid "Updating files"
+msgstr "正在更新文件"
+
+#: unpack-trees.c
+msgid ""
+"the following paths have collided (e.g. case-sensitive paths\n"
+"on a case-insensitive filesystem) and only one from the same\n"
+"colliding group is in the working tree:\n"
+msgstr ""
+"以下路径发生碰撞（如：在不区分大小写的文件系统上的区分大小写的路径），\n"
+"并且碰撞组中只有一个文件存在工作区中：\n"
+
+#: unpack-trees.c
+msgid "Updating index flags"
+msgstr "正在更新索引标志"
+
+#: unpack-trees.c
+#, c-format
+msgid "worktree and untracked commit have duplicate entries: %s"
+msgstr "工作树和未跟踪提交具有重复条目：%s"
+
+#: upload-pack.c
+msgid "expected flush after fetch arguments"
+msgstr "在 fetch 参数之后应该有一个 flush 包"
+
+#: urlmatch.c
+msgid "invalid URL scheme name or missing '://' suffix"
+msgstr "无效的 URL 方案名称或丢失 '://' 后缀"
+
+#: urlmatch.c
+#, c-format
+msgid "invalid %XX escape sequence"
+msgstr "无效的 %XX 转义序列"
+
+#: urlmatch.c
+msgid "missing host and scheme is not 'file:'"
+msgstr "缺失主机名且 URL 方案不是 'file:'"
+
+#: urlmatch.c
+msgid "a 'file:' URL may not have a port number"
+msgstr "一个 'file:' URL 不应该包含端口号"
+
+#: urlmatch.c
+msgid "invalid characters in host name"
+msgstr "主机名中包含无效的字符"
+
+#: urlmatch.c
+msgid "invalid port number"
+msgstr "无效的端口号"
+
+#: urlmatch.c
+msgid "invalid '..' path segment"
+msgstr "无效的 '..' 路径片段"
+
+#: walker.c
+msgid "Fetching objects"
+msgstr "正在获取对象"
+
+#: worktree.c
+#, c-format
+msgid "'%s' at main working tree is not the repository directory"
+msgstr "在主工作区的 '%s' 不是仓库目录"
+
+#: worktree.c
+#, c-format
+msgid "'%s' file does not contain absolute path to the working tree location"
+msgstr "文件 '%s' 不包含工作区的绝对路径"
+
+#: worktree.c
+#, c-format
+msgid "'%s' is not a .git file, error code %d"
+msgstr "'%s' 不是一个 .git 文件，错误码 %d"
+
+#: worktree.c
+#, c-format
+msgid "'%s' does not point back to '%s'"
+msgstr "'%s' 没有指回到 '%s'"
+
+#: worktree.c
+msgid "not a directory"
+msgstr "不是一个目录"
+
+#: worktree.c
+msgid ".git is not a file"
+msgstr ".git 不是一个文件"
+
+#: worktree.c
+msgid ".git file broken"
+msgstr ".git 文件损坏"
+
+#: worktree.c
+msgid ".git file incorrect"
+msgstr ".git 文件不正确"
+
+#: worktree.c
+msgid "not a valid path"
+msgstr "不是一个有效的路径"
+
+#: worktree.c
+msgid "unable to locate repository; .git is not a file"
+msgstr "无法定位仓库，.git 不是一个文件"
+
+#: worktree.c
+msgid "unable to locate repository; .git file does not reference a repository"
+msgstr "无法定位仓库，.git 文件没有指向一个仓库"
+
+#: worktree.c
+msgid "unable to locate repository; .git file broken"
+msgstr "无法定位仓库，.git 文件损坏"
+
+#: worktree.c
+msgid "gitdir unreadable"
+msgstr "gitdir 不可读"
+
+#: worktree.c
+msgid "gitdir incorrect"
+msgstr "gitdir 不正确"
+
+#: worktree.c
+msgid "not a valid directory"
+msgstr "不是一个有效的目录"
+
+#: worktree.c
+msgid "gitdir file does not exist"
+msgstr "gitdir 文件不存在"
+
+#: worktree.c
+#, c-format
+msgid "unable to read gitdir file (%s)"
+msgstr "无法读取 gitdir 文件（%s）"
+
+#: worktree.c
+#, c-format
+msgid "short read (expected %<PRIuMAX> bytes, read %<PRIuMAX>)"
+msgstr "读取过短（期望 %<PRIuMAX> 字节，读取 %<PRIuMAX>）"
+
+#: worktree.c
+msgid "invalid gitdir file"
+msgstr "无效的 gitdir 文件"
+
+#: worktree.c
+msgid "gitdir file points to non-existent location"
+msgstr "gitdir 文件指向一个不存在的位置"
+
+#: worktree.c
+#, c-format
+msgid "unable to set %s in '%s'"
+msgstr "无法在 '%2$s' 中设置 %1$s"
+
+#: worktree.c
+#, c-format
+msgid "unable to unset %s in '%s'"
+msgstr "无法在 '%2$s' 中取消设置 %1$s"
+
+#: worktree.c
+msgid "failed to set extensions.worktreeConfig setting"
+msgstr "无法设置 extensions.worktreeConfig"
+
+#: wrapper.c
+#, c-format
+msgid "could not setenv '%s'"
+msgstr "无法设置环境变量 '%s'"
+
+#: wrapper.c
+#, c-format
+msgid "unable to create '%s'"
+msgstr "无法创建 '%s'"
+
+#: wrapper.c
+#, c-format
+msgid "could not open '%s' for reading and writing"
+msgstr "无法打开 '%s' 进行读写"
+
+#: wrapper.c
+#, c-format
+msgid "unable to access '%s'"
+msgstr "不能访问 '%s'"
+
+#: wrapper.c
+msgid "unable to get current working directory"
+msgstr "不能获取当前工作目录"
+
+#: wt-status.c
+msgid "Unmerged paths:"
+msgstr "未合并的路径："
+
+#  译者：注意保持前导空格
+#: wt-status.c
+msgid "  (use \"git restore --staged <file>...\" to unstage)"
+msgstr "  （使用 \"git restore --staged <文件>...\" 以取消暂存）"
+
+#  译者：注意保持前导空格
+#: wt-status.c
+#, c-format
+msgid "  (use \"git restore --source=%s --staged <file>...\" to unstage)"
+msgstr "  （使用 \"git restore --source=%s --staged <文件>...\" 以取消暂存）"
+
+#  译者：注意保持前导空格
+#: wt-status.c
+msgid "  (use \"git rm --cached <file>...\" to unstage)"
+msgstr "  （使用 \"git rm --cached <文件>...\" 以取消暂存）"
+
+#  译者：注意保持前导空格
+#: wt-status.c
+msgid "  (use \"git add <file>...\" to mark resolution)"
+msgstr "  （使用 \"git add <文件>...\" 标记解决方案）"
+
+#  译者：注意保持前导空格
+#: wt-status.c
+msgid "  (use \"git add/rm <file>...\" as appropriate to mark resolution)"
+msgstr "  （酌情使用 \"git add/rm <文件>...\" 标记解决方案）"
+
+#  译者：注意保持前导空格
+#: wt-status.c
+msgid "  (use \"git rm <file>...\" to mark resolution)"
+msgstr "  （使用 \"git rm <文件>...\" 标记解决方案）"
+
+#: wt-status.c
+msgid "Changes to be committed:"
+msgstr "要提交的变更："
+
+#: wt-status.c
+msgid "Changes not staged for commit:"
+msgstr "尚未暂存以备提交的变更："
+
+#  译者：注意保持前导空格
+#: wt-status.c
+msgid "  (use \"git add <file>...\" to update what will be committed)"
+msgstr "  （使用 \"git add <文件>...\" 更新要提交的内容）"
+
+#  译者：注意保持前导空格
+#: wt-status.c
+msgid "  (use \"git add/rm <file>...\" to update what will be committed)"
+msgstr "  （使用 \"git add/rm <文件>...\" 更新要提交的内容）"
+
+#  译者：注意保持前导空格
+#: wt-status.c
+msgid ""
+"  (use \"git restore <file>...\" to discard changes in working directory)"
+msgstr "  （使用 \"git restore <文件>...\" 丢弃工作区的改动）"
+
+#  译者：注意保持前导空格
+#: wt-status.c
+msgid "  (commit or discard the untracked or modified content in submodules)"
+msgstr "  （提交或丢弃子模组中未跟踪或修改的内容）"
+
+#  译者：注意保持前导空格
+#: wt-status.c
+#, c-format
+msgid "  (use \"git %s <file>...\" to include in what will be committed)"
+msgstr "  （使用 \"git %s <文件>...\" 以包含要提交的内容）"
+
+#: wt-status.c
+msgid "both deleted:"
+msgstr "双方删除："
+
+#: wt-status.c
+msgid "added by us:"
+msgstr "由我们添加："
+
+#: wt-status.c
+msgid "deleted by them:"
+msgstr "由他们删除："
+
+#: wt-status.c
+msgid "added by them:"
+msgstr "由他们添加："
+
+#: wt-status.c
+msgid "deleted by us:"
+msgstr "由我们删除："
+
+#: wt-status.c
+msgid "both added:"
+msgstr "双方添加："
+
+#: wt-status.c
+msgid "both modified:"
+msgstr "双方修改："
+
+#: wt-status.c
+msgid "new file:"
+msgstr "新文件："
+
+#: wt-status.c
+msgid "copied:"
+msgstr "拷贝："
+
+#: wt-status.c
+msgid "deleted:"
+msgstr "删除："
+
+#: wt-status.c
+msgid "modified:"
+msgstr "修改："
+
+#: wt-status.c
+msgid "renamed:"
+msgstr "重命名："
+
+#: wt-status.c
+msgid "typechange:"
+msgstr "类型变更："
+
+#: wt-status.c
+msgid "unknown:"
+msgstr "未知："
+
+#: wt-status.c
+msgid "unmerged:"
+msgstr "未合并："
+
+#  译者：末尾两个字节可能被删减，如果翻译为中文标点会出现半个汉字
+#: wt-status.c
+msgid "new commits, "
+msgstr "新提交, "
+
+#  译者：末尾两个字节可能被删减，如果翻译为中文标点会出现半个汉字
+#: wt-status.c
+msgid "modified content, "
+msgstr "修改的内容, "
+
+#  译者：末尾两个字节可能被删减，如果翻译为中文标点会出现半个汉字
+#: wt-status.c
+msgid "untracked content, "
+msgstr "未跟踪的内容, "
+
+#: wt-status.c
+#, c-format
+msgid "Your stash currently has %d entry"
+msgid_plural "Your stash currently has %d entries"
+msgstr[0] "您的贮藏区当前有 %d 条记录"
+msgstr[1] "您的贮藏区当前有 %d 条记录"
+
+#: wt-status.c
+msgid "Submodules changed but not updated:"
+msgstr "子模组已修改但尚未更新："
+
+#: wt-status.c
+msgid "Submodule changes to be committed:"
+msgstr "要提交的子模组变更："
+
+#: wt-status.c
+msgid ""
+"Do not modify or remove the line above.\n"
+"Everything below it will be ignored."
+msgstr ""
+"不要改动或删除上面的一行。\n"
+"其下所有内容都将被忽略。"
+
+#: wt-status.c
+#, c-format
+msgid ""
+"\n"
+"It took %.2f seconds to compute the branch ahead/behind values.\n"
+"You can use '--no-ahead-behind' to avoid this.\n"
+msgstr ""
+"\n"
+"花了 %.2f 秒才计算出分支的领先/落后范围。\n"
+"为避免，您可以使用 '--no-ahead-behind'。\n"
+
+#: wt-status.c
+msgid "You have unmerged paths."
+msgstr "您有尚未合并的路径。"
+
+#  译者：注意保持前导空格
+#: wt-status.c
+msgid "  (fix conflicts and run \"git commit\")"
+msgstr "  （解决冲突并运行 \"git commit\"）"
+
+#  译者：注意保持前导空格
+#: wt-status.c
+msgid "  (use \"git merge --abort\" to abort the merge)"
+msgstr "  （使用 \"git merge --abort\" 终止合并）"
+
+#: wt-status.c
+msgid "All conflicts fixed but you are still merging."
+msgstr "所有冲突已解决但您仍处于合并中。"
+
+#  译者：注意保持前导空格
+#: wt-status.c
+msgid "  (use \"git commit\" to conclude merge)"
+msgstr "  （使用 \"git commit\" 结束合并）"
+
+#: wt-status.c
+msgid "You are in the middle of an am session."
+msgstr "您正处于 am 操作过程中。"
+
+#: wt-status.c
+msgid "The current patch is empty."
+msgstr "当前的补丁为空。"
+
+#  译者：注意保持前导空格
+#: wt-status.c
+msgid "  (fix conflicts and then run \"git am --continue\")"
+msgstr "  （解决冲突，然后运行 \"git am --continue\"）"
+
+#  译者：注意保持前导空格
+#: wt-status.c
+msgid "  (use \"git am --skip\" to skip this patch)"
+msgstr "  （使用 \"git am --skip\" 跳过此补丁）"
+
+#  译者：注意保持前导空格
+#: wt-status.c
+msgid ""
+"  (use \"git am --allow-empty\" to record this patch as an empty commit)"
+msgstr "  （使用 \"git am --allow-empty\" 将这个补丁记录为空提交）"
+
+#  译者：注意保持前导空格
+#: wt-status.c
+msgid "  (use \"git am --abort\" to restore the original branch)"
+msgstr "  （使用 \"git am --abort\" 恢复原有分支）"
+
+#: wt-status.c
+msgid "git-rebase-todo is missing."
+msgstr "git-rebase-todo 丢失。"
+
+#: wt-status.c
+msgid "No commands done."
+msgstr "没有命令被执行。"
+
+#: wt-status.c
+#, c-format
+msgid "Last command done (%<PRIuMAX> command done):"
+msgid_plural "Last commands done (%<PRIuMAX> commands done):"
+msgstr[0] "最后完成的命令（%<PRIuMAX> 条命令被执行）："
+msgstr[1] "最后完成的命令（%<PRIuMAX> 条命令被执行）："
+
+#: wt-status.c
+#, c-format
+msgid "  (see more in file %s)"
+msgstr "  （更多参见文件 %s）"
+
+#: wt-status.c
+msgid "No commands remaining."
+msgstr "未剩下任何命令。"
+
+#: wt-status.c
+#, c-format
+msgid "Next command to do (%<PRIuMAX> remaining command):"
+msgid_plural "Next commands to do (%<PRIuMAX> remaining commands):"
+msgstr[0] "接下来要执行的命令（剩余 %<PRIuMAX> 条命令）："
+msgstr[1] "接下来要执行的命令（剩余 %<PRIuMAX> 条命令）："
+
+#  译者：注意保持前导空格
+#: wt-status.c
+msgid "  (use \"git rebase --edit-todo\" to view and edit)"
+msgstr "  （使用 \"git rebase --edit-todo\" 来查看和编辑）"
+
+#: wt-status.c
+#, c-format
+msgid "You are currently rebasing branch '%s' on '%s'."
+msgstr "您在执行将分支 '%s' 变基到 '%s' 的操作。"
+
+#: wt-status.c
+msgid "You are currently rebasing."
+msgstr "您在执行变基操作。"
+
+#  译者：注意保持前导空格
+#: wt-status.c
+msgid "  (fix conflicts and then run \"git rebase --continue\")"
+msgstr "  （解决冲突，然后运行 \"git rebase --continue\"）"
+
+#  译者：注意保持前导空格
+#: wt-status.c
+msgid "  (use \"git rebase --skip\" to skip this patch)"
+msgstr "  （使用 \"git rebase --skip\" 跳过此补丁）"
+
+#  译者：注意保持前导空格
+#: wt-status.c
+msgid "  (use \"git rebase --abort\" to check out the original branch)"
+msgstr "  （使用 \"git rebase --abort\" 以检出原有分支）"
+
+#  译者：注意保持前导空格
+#: wt-status.c
+msgid "  (all conflicts fixed: run \"git rebase --continue\")"
+msgstr "  （所有冲突已解决：运行 \"git rebase --continue\"）"
+
+#: wt-status.c
+#, c-format
+msgid ""
+"You are currently splitting a commit while rebasing branch '%s' on '%s'."
+msgstr "您在执行将分支 '%s' 变基到 '%s' 的操作时拆分提交。"
+
+#: wt-status.c
+msgid "You are currently splitting a commit during a rebase."
+msgstr "您在执行变基操作时拆分提交。"
+
+#  译者：注意保持前导空格
+#: wt-status.c
+msgid "  (Once your working directory is clean, run \"git rebase --continue\")"
+msgstr "  （一旦您工作目录提交干净后，运行 \"git rebase --continue\"）"
+
+#: wt-status.c
+#, c-format
+msgid "You are currently editing a commit while rebasing branch '%s' on '%s'."
+msgstr "您在执行将分支 '%s' 变基到 '%s' 的操作时编辑提交。"
+
+#: wt-status.c
+msgid "You are currently editing a commit during a rebase."
+msgstr "您在执行变基操作时编辑提交。"
+
+#  译者：注意保持前导空格
+#: wt-status.c
+msgid "  (use \"git commit --amend\" to amend the current commit)"
+msgstr "  （使用 \"git commit --amend\" 修补当前提交）"
+
+#  译者：注意保持前导空格
+#: wt-status.c
+msgid ""
+"  (use \"git rebase --continue\" once you are satisfied with your changes)"
+msgstr "  （当您对您的修改满意后执行 \"git rebase --continue\"）"
+
+#: wt-status.c
+msgid "Cherry-pick currently in progress."
+msgstr "拣选操作正在进行中。"
+
+#: wt-status.c
+#, c-format
+msgid "You are currently cherry-picking commit %s."
+msgstr "您在执行拣选提交 %s 的操作。"
+
+#  译者：注意保持前导空格
+#: wt-status.c
+msgid "  (fix conflicts and run \"git cherry-pick --continue\")"
+msgstr "  （解决冲突并运行 \"git cherry-pick --continue\"）"
+
+#  译者：注意保持前导空格
+#: wt-status.c
+msgid "  (run \"git cherry-pick --continue\" to continue)"
+msgstr "  （执行 \"git cherry-pick --continue\" 以继续）"
+
+#  译者：注意保持前导空格
+#: wt-status.c
+msgid "  (all conflicts fixed: run \"git cherry-pick --continue\")"
+msgstr "  （所有冲突已解决：运行 \"git cherry-pick --continue\"）"
+
+#  译者：注意保持前导空格
+#: wt-status.c
+msgid "  (use \"git cherry-pick --skip\" to skip this patch)"
+msgstr "  （使用 \"git cherry-pick --skip\" 跳过此补丁）"
+
+#  译者：注意保持前导空格
+#: wt-status.c
+msgid "  (use \"git cherry-pick --abort\" to cancel the cherry-pick operation)"
+msgstr "  （使用 \"git cherry-pick --abort\" 以取消拣选操作）"
+
+#: wt-status.c
+msgid "Revert currently in progress."
+msgstr "还原操作正在行中。"
+
+#: wt-status.c
+#, c-format
+msgid "You are currently reverting commit %s."
+msgstr "您在执行反转提交 %s 的操作。"
+
+#  译者：注意保持前导空格
+#: wt-status.c
+msgid "  (fix conflicts and run \"git revert --continue\")"
+msgstr "  （解决冲突并执行 \"git revert --continue\"）"
+
+#  译者：注意保持前导空格
+#: wt-status.c
+msgid "  (run \"git revert --continue\" to continue)"
+msgstr "  （执行 \"git revert --continue\" 以继续）"
+
+#  译者：注意保持前导空格
+#: wt-status.c
+msgid "  (all conflicts fixed: run \"git revert --continue\")"
+msgstr "  （所有冲突已解决：执行 \"git revert --continue\"）"
+
+#  译者：注意保持前导空格
+#: wt-status.c
+msgid "  (use \"git revert --skip\" to skip this patch)"
+msgstr "  （使用 \"git revert --skip\" 跳过此补丁）"
+
+#  译者：注意保持前导空格
+#: wt-status.c
+msgid "  (use \"git revert --abort\" to cancel the revert operation)"
+msgstr "  （使用 \"git revert --abort\" 以取消反转提交操作）"
+
+#: wt-status.c
+#, c-format
+msgid "You are currently bisecting, started from branch '%s'."
+msgstr "您在执行从分支 '%s' 开始的二分查找操作。"
+
+#: wt-status.c
+msgid "You are currently bisecting."
+msgstr "您在执行二分查找操作。"
+
+#  译者：注意保持前导空格
+#: wt-status.c
+msgid "  (use \"git bisect reset\" to get back to the original branch)"
+msgstr "  （使用 \"git bisect reset\" 以回到原有分支）"
+
+#: wt-status.c
+msgid "You are in a sparse checkout."
+msgstr "您处于一个稀疏检出中。"
+
+#: wt-status.c
+#, c-format
+msgid "You are in a sparse checkout with %d%% of tracked files present."
+msgstr "您处于稀疏检出状态，包含 %d%% 的跟踪文件"
+
+#: wt-status.c
+msgid "On branch "
+msgstr "位于分支 "
+
+#: wt-status.c
+msgid "interactive rebase in progress; onto "
+msgstr "交互式变基操作正在进行中；至 "
+
+#: wt-status.c
+msgid "rebase in progress; onto "
+msgstr "变基操作正在进行中；至 "
+
+#: wt-status.c
+msgid "HEAD detached at "
+msgstr "头指针分离于 "
+
+#: wt-status.c
+msgid "HEAD detached from "
+msgstr "头指针分离自 "
+
+#: wt-status.c
+msgid "Not currently on any branch."
+msgstr "当前不在任何分支上。"
+
+#: wt-status.c
+msgid "Initial commit"
+msgstr "初始提交"
+
+#: wt-status.c
+msgid "No commits yet"
+msgstr "尚无提交"
+
+#: wt-status.c
+msgid "Untracked files"
+msgstr "未跟踪的文件"
+
+#: wt-status.c
+msgid "Ignored files"
+msgstr "忽略的文件"
+
+#: wt-status.c
+#, c-format
+msgid ""
+"It took %.2f seconds to enumerate untracked files. 'status -uno'\n"
+"may speed it up, but you have to be careful not to forget to add\n"
+"new files yourself (see 'git help status')."
+msgstr ""
+"耗费了 %.2f 秒以枚举未跟踪的文件。'status -uno' 也许能提高速度，\n"
+"但您需要小心不要忘了添加新文件（参见 'git help status'）。"
+
+#: wt-status.c
+#, c-format
+msgid "Untracked files not listed%s"
+msgstr "未跟踪的文件没有列出%s"
+
+#  译者：中文字符串拼接，可删除前导空格
+#: wt-status.c
+msgid " (use -u option to show untracked files)"
+msgstr "（使用 -u 参数显示未跟踪的文件）"
+
+#: wt-status.c
+msgid "No changes"
+msgstr "没有修改"
+
+#: wt-status.c
+#, c-format
+msgid "no changes added to commit (use \"git add\" and/or \"git commit -a\")\n"
+msgstr "修改尚未加入提交（使用 \"git add\" 和/或 \"git commit -a\"）\n"
+
+#: wt-status.c
+#, c-format
+msgid "no changes added to commit\n"
+msgstr "修改尚未加入提交\n"
+
+#: wt-status.c
+#, c-format
+msgid ""
+"nothing added to commit but untracked files present (use \"git add\" to "
+"track)\n"
+msgstr "提交为空，但是存在尚未跟踪的文件（使用 \"git add\" 建立跟踪）\n"
+
+#: wt-status.c
+#, c-format
+msgid "nothing added to commit but untracked files present\n"
+msgstr "提交为空，但是存在尚未跟踪的文件\n"
+
+#: wt-status.c
+#, c-format
+msgid "nothing to commit (create/copy files and use \"git add\" to track)\n"
+msgstr "无文件要提交（创建/拷贝文件并使用 \"git add\" 建立跟踪）\n"
+
+#: wt-status.c
+#, c-format
+msgid "nothing to commit\n"
+msgstr "无文件要提交\n"
+
+#: wt-status.c
+#, c-format
+msgid "nothing to commit (use -u to show untracked files)\n"
+msgstr "无文件要提交（使用 -u 显示未跟踪的文件）\n"
+
+#: wt-status.c
+#, c-format
+msgid "nothing to commit, working tree clean\n"
+msgstr "无文件要提交，干净的工作区\n"
+
+#: wt-status.c
+msgid "No commits yet on "
+msgstr "尚无提交在 "
+
+#: wt-status.c
+msgid "HEAD (no branch)"
+msgstr "HEAD（非分支）"
+
+#: wt-status.c
+msgid "different"
+msgstr "不同"
+
+#  译者：注意保持句尾空格
+#: wt-status.c
+msgid "behind "
+msgstr "落后 "
+
+#: wt-status.c
+msgid "ahead "
+msgstr "领先 "
+
+#. TRANSLATORS: the action is e.g. "pull with rebase"
+#: wt-status.c
+#, c-format
+msgid "cannot %s: You have unstaged changes."
+msgstr "不能%s：您有未暂存的变更。"
+
+#: wt-status.c
+msgid "additionally, your index contains uncommitted changes."
+msgstr "另外，您的索引中包含未提交的变更。"
+
+#: wt-status.c
+#, c-format
+msgid "cannot %s: Your index contains uncommitted changes."
+msgstr "不能%s：您的索引中包含未提交的变更。"
+
+#: git-merge-octopus.sh
 msgid ""
 "Error: Your local changes to the following files would be overwritten by "
 "merge"
 msgstr "错误：您对下列文件的本地修改将被合并操作覆盖"
 
-#: git-merge-octopus.sh:61
+#: git-merge-octopus.sh
 msgid "Automated merge did not work."
 msgstr "自动合并未生效。"
 
-#: git-merge-octopus.sh:62
+#: git-merge-octopus.sh
 msgid "Should not be doing an octopus."
 msgstr "不应该执行章鱼式合并。"
 
-#: git-merge-octopus.sh:73
+#: git-merge-octopus.sh
 #, sh-format
 msgid "Unable to find common commit with $pretty_name"
 msgstr "无法找到和 $pretty_name 的基线提交"
 
-#: git-merge-octopus.sh:77
+#: git-merge-octopus.sh
 #, sh-format
 msgid "Already up to date with $pretty_name"
 msgstr "已经和 $pretty_name 保持一致"
 
-#: git-merge-octopus.sh:89
+#: git-merge-octopus.sh
 #, sh-format
 msgid "Fast-forwarding to: $pretty_name"
 msgstr "快进至：$pretty_name"
 
-#: git-merge-octopus.sh:97
+#: git-merge-octopus.sh
 #, sh-format
 msgid "Trying simple merge with $pretty_name"
 msgstr "尝试和 $pretty_name 的简单合并"
 
-#: git-merge-octopus.sh:102
+#: git-merge-octopus.sh
 msgid "Simple merge did not work, trying automatic merge."
 msgstr "简单合并未生效，尝试自动合并。"
 
-#: git-sh-setup.sh:89 git-sh-setup.sh:94
+#: git-sh-setup.sh
 #, sh-format
 msgid "usage: $dashless $USAGE"
 msgstr "用法：$dashless $USAGE"
 
-#: git-sh-setup.sh:182
+#: git-sh-setup.sh
 #, sh-format
 msgid "Cannot chdir to $cdup, the toplevel of the working tree"
 msgstr "不能切换目录到 $cdup，工作区的顶级目录"
 
-#: git-sh-setup.sh:191 git-sh-setup.sh:198
+#: git-sh-setup.sh
 #, sh-format
 msgid "fatal: $program_name cannot be used without a working tree."
 msgstr "致命错误：$program_name 不能在没有工作区的情况下使用"
 
-#: git-sh-setup.sh:212
+#: git-sh-setup.sh
 msgid "Cannot rewrite branches: You have unstaged changes."
 msgstr "不能重写分支：您有未暂存的变更。"
 
-#: git-sh-setup.sh:215
+#: git-sh-setup.sh
 #, sh-format
 msgid "Cannot $action: You have unstaged changes."
 msgstr "不能 $action：您有未暂存的变更。"
 
-#: git-sh-setup.sh:226
+#: git-sh-setup.sh
 #, sh-format
 msgid "Cannot $action: Your index contains uncommitted changes."
 msgstr "不能 $action：您的索引中包含未提交的变更。"
 
-#: git-sh-setup.sh:228
+#: git-sh-setup.sh
 msgid "Additionally, your index contains uncommitted changes."
 msgstr "而且您的索引中包含未提交的变更。"
 
-#: git-sh-setup.sh:348
+#: git-sh-setup.sh
 msgid "You need to run this command from the toplevel of the working tree."
 msgstr "您需要在工作区的顶级目录中运行这个命令。"
 
-#: git-sh-setup.sh:353
+#: git-sh-setup.sh
 msgid "Unable to determine absolute path of git directory"
 msgstr "不能确定 git 目录的绝对路径"
 
 #. TRANSLATORS: you can adjust this to align "git add -i" status menu
-#: git-add--interactive.perl:212
+#: git-add--interactive.perl
 #, perl-format
 msgid "%12s %12s %s"
 msgstr "%12s %12s %s"
 
-#: git-add--interactive.perl:632
+#: git-add--interactive.perl
 #, perl-format
 msgid "touched %d path\n"
 msgid_plural "touched %d paths\n"
 msgstr[0] "触碰了 %d 个路径\n"
 msgstr[1] "触碰了 %d 个路径\n"
 
-#: git-add--interactive.perl:1056
+#: git-add--interactive.perl
 msgid ""
 "If the patch applies cleanly, the edited hunk will immediately be\n"
 "marked for staging."
 msgstr "如果补丁能干净地应用，编辑块将立即标记为暂存。"
 
-#: git-add--interactive.perl:1059
+#: git-add--interactive.perl
 msgid ""
 "If the patch applies cleanly, the edited hunk will immediately be\n"
 "marked for stashing."
 msgstr "如果补丁能干净地应用，编辑块将立即标记为贮藏。"
 
-#: git-add--interactive.perl:1062
+#: git-add--interactive.perl
 msgid ""
 "If the patch applies cleanly, the edited hunk will immediately be\n"
 "marked for unstaging."
 msgstr "如果补丁能干净地应用，编辑块将立即标记为未暂存。"
 
-#: git-add--interactive.perl:1065 git-add--interactive.perl:1074
-#: git-add--interactive.perl:1080
+#: git-add--interactive.perl
 msgid ""
 "If the patch applies cleanly, the edited hunk will immediately be\n"
 "marked for applying."
 msgstr "如果补丁能干净地应用，编辑块将立即标记为应用。"
 
-#: git-add--interactive.perl:1068 git-add--interactive.perl:1071
-#: git-add--interactive.perl:1077
+#: git-add--interactive.perl
 msgid ""
 "If the patch applies cleanly, the edited hunk will immediately be\n"
 "marked for discarding."
 msgstr "如果补丁能干净地应用，编辑块将立即标记为丢弃。"
 
-#: git-add--interactive.perl:1114
+#: git-add--interactive.perl
 #, perl-format
 msgid "failed to open hunk edit file for writing: %s"
 msgstr "无法为写入打开块编辑文件：%s"
 
-#: git-add--interactive.perl:1121
+#: git-add--interactive.perl
 #, perl-format
 msgid ""
 "---\n"
@@ -25845,12 +26110,12 @@ msgstr ""
 "要删除 '%s' 开始的行，删除它们。\n"
 "以 %s 开始的行将被删除。\n"
 
-#: git-add--interactive.perl:1143
+#: git-add--interactive.perl
 #, perl-format
 msgid "failed to open hunk edit file for reading: %s"
 msgstr "无法读取块编辑文件：%s"
 
-#: git-add--interactive.perl:1253
+#: git-add--interactive.perl
 msgid ""
 "y - stage this hunk\n"
 "n - do not stage this hunk\n"
@@ -25864,7 +26129,7 @@ msgstr ""
 "a - 暂存该块和本文件中后面的全部块\n"
 "d - 不暂存该块和本文件中后面的全部块"
 
-#: git-add--interactive.perl:1259
+#: git-add--interactive.perl
 msgid ""
 "y - stash this hunk\n"
 "n - do not stash this hunk\n"
@@ -25878,7 +26143,7 @@ msgstr ""
 "a - 贮藏该块和本文件中后面的全部块\n"
 "d - 不贮藏该块和本文件中后面的全部块"
 
-#: git-add--interactive.perl:1265
+#: git-add--interactive.perl
 msgid ""
 "y - unstage this hunk\n"
 "n - do not unstage this hunk\n"
@@ -25892,7 +26157,7 @@ msgstr ""
 "a - 不暂存该块和本文件中后面的全部块\n"
 "d - 不要不暂存该块和本文件中后面的全部块"
 
-#: git-add--interactive.perl:1271
+#: git-add--interactive.perl
 msgid ""
 "y - apply this hunk to index\n"
 "n - do not apply this hunk to index\n"
@@ -25906,7 +26171,7 @@ msgstr ""
 "a - 应用该块和本文件中后面的全部块\n"
 "d - 不要应用该块和本文件中后面的全部块"
 
-#: git-add--interactive.perl:1277 git-add--interactive.perl:1295
+#: git-add--interactive.perl
 msgid ""
 "y - discard this hunk from worktree\n"
 "n - do not discard this hunk from worktree\n"
@@ -25920,7 +26185,7 @@ msgstr ""
 "a - 丢弃该块和本文件中后面的全部块\n"
 "d - 不要丢弃该块和本文件中后面的全部块"
 
-#: git-add--interactive.perl:1283
+#: git-add--interactive.perl
 msgid ""
 "y - discard this hunk from index and worktree\n"
 "n - do not discard this hunk from index and worktree\n"
@@ -25934,7 +26199,7 @@ msgstr ""
 "a - 丢弃该块和本文件中后面的全部块\n"
 "d - 不要丢弃该块和本文件中后面的全部块"
 
-#: git-add--interactive.perl:1289
+#: git-add--interactive.perl
 msgid ""
 "y - apply this hunk to index and worktree\n"
 "n - do not apply this hunk to index and worktree\n"
@@ -25948,7 +26213,7 @@ msgstr ""
 "a - 应用该块和本文件中后面的全部块\n"
 "d - 不要应用该块和本文件中后面的全部块"
 
-#: git-add--interactive.perl:1301
+#: git-add--interactive.perl
 msgid ""
 "y - apply this hunk to worktree\n"
 "n - do not apply this hunk to worktree\n"
@@ -25962,7 +26227,7 @@ msgstr ""
 "a - 应用该块和本文件中后面的全部块\n"
 "d - 不要应用该块和本文件中后面的全部块"
 
-#: git-add--interactive.perl:1316
+#: git-add--interactive.perl
 msgid ""
 "g - select a hunk to go to\n"
 "/ - search for a hunk matching the given regex\n"
@@ -25984,90 +26249,90 @@ msgstr ""
 "e - 手动编辑当前块\n"
 "? - 显示帮助\n"
 
-#: git-add--interactive.perl:1347
+#: git-add--interactive.perl
 msgid "The selected hunks do not apply to the index!\n"
 msgstr "选中的块不能应用到索引！\n"
 
-#: git-add--interactive.perl:1362
+#: git-add--interactive.perl
 #, perl-format
 msgid "ignoring unmerged: %s\n"
 msgstr "忽略未合入的：%s\n"
 
-#: git-add--interactive.perl:1481
+#: git-add--interactive.perl
 #, perl-format
 msgid "Apply mode change to worktree [y,n,q,a,d%s,?]? "
 msgstr "将模式变更应用到工作区 [y,n,q,a,d%s,?]? "
 
-#: git-add--interactive.perl:1482
+#: git-add--interactive.perl
 #, perl-format
 msgid "Apply deletion to worktree [y,n,q,a,d%s,?]? "
 msgstr "将删除操作应用到工作区 [y,n,q,a,d%s,?]? "
 
-#: git-add--interactive.perl:1483
+#: git-add--interactive.perl
 #, perl-format
 msgid "Apply addition to worktree [y,n,q,a,d%s,?]? "
 msgstr "将添加操作应用到工作区 [y,n,q,a,d%s,?]? "
 
-#: git-add--interactive.perl:1484
+#: git-add--interactive.perl
 #, perl-format
 msgid "Apply this hunk to worktree [y,n,q,a,d%s,?]? "
 msgstr "将该块应用到工作区 [y,n,q,a,d%s,?]? "
 
-#: git-add--interactive.perl:1601
+#: git-add--interactive.perl
 msgid "No other hunks to goto\n"
 msgstr "没有其它可供跳转的块\n"
 
-#: git-add--interactive.perl:1619
+#: git-add--interactive.perl
 #, perl-format
 msgid "Invalid number: '%s'\n"
 msgstr "无效数字：'%s'\n"
 
-#: git-add--interactive.perl:1624
+#: git-add--interactive.perl
 #, perl-format
 msgid "Sorry, only %d hunk available.\n"
 msgid_plural "Sorry, only %d hunks available.\n"
 msgstr[0] "对不起，只有 %d 个可用块。\n"
 msgstr[1] "对不起，只有 %d 个可用块。\n"
 
-#: git-add--interactive.perl:1659
+#: git-add--interactive.perl
 msgid "No other hunks to search\n"
 msgstr "没有其它可供查找的块\n"
 
-#: git-add--interactive.perl:1676
+#: git-add--interactive.perl
 #, perl-format
 msgid "Malformed search regexp %s: %s\n"
 msgstr "错误的正则表达式 %s：%s\n"
 
-#: git-add--interactive.perl:1686
+#: git-add--interactive.perl
 msgid "No hunk matches the given pattern\n"
 msgstr "没有和给定模式相匹配的块\n"
 
-#: git-add--interactive.perl:1698 git-add--interactive.perl:1720
+#: git-add--interactive.perl
 msgid "No previous hunk\n"
 msgstr "没有前一个块\n"
 
-#: git-add--interactive.perl:1707 git-add--interactive.perl:1726
+#: git-add--interactive.perl
 msgid "No next hunk\n"
 msgstr "没有下一个块\n"
 
-#: git-add--interactive.perl:1732
+#: git-add--interactive.perl
 msgid "Sorry, cannot split this hunk\n"
 msgstr "对不起，不能拆分这个块\n"
 
-#: git-add--interactive.perl:1738
+#: git-add--interactive.perl
 #, perl-format
 msgid "Split into %d hunk.\n"
 msgid_plural "Split into %d hunks.\n"
 msgstr[0] "拆分为 %d 块。\n"
 msgstr[1] "拆分为 %d 块。\n"
 
-#: git-add--interactive.perl:1748
+#: git-add--interactive.perl
 msgid "Sorry, cannot edit this hunk\n"
 msgstr "对不起，不能编辑这个块\n"
 
 #. TRANSLATORS: please do not translate the command names
 #. 'status', 'update', 'revert', etc.
-#: git-add--interactive.perl:1813
+#: git-add--interactive.perl
 msgid ""
 "status        - show paths with changes\n"
 "update        - add working tree state to the staged set of changes\n"
@@ -26084,56 +26349,53 @@ msgstr ""
 "diff          - 显示 HEAD 和索引间差异\n"
 "add untracked - 添加未跟踪文件的内容至暂存列表\n"
 
-#: git-add--interactive.perl:1830 git-add--interactive.perl:1842
-#: git-add--interactive.perl:1845 git-add--interactive.perl:1852
-#: git-add--interactive.perl:1855 git-add--interactive.perl:1862
-#: git-add--interactive.perl:1866 git-add--interactive.perl:1872
+#: git-add--interactive.perl
 msgid "missing --"
 msgstr "缺失 --"
 
-#: git-add--interactive.perl:1868
+#: git-add--interactive.perl
 #, perl-format
 msgid "unknown --patch mode: %s"
 msgstr "未知的 --patch 模式：%s"
 
-#: git-add--interactive.perl:1874 git-add--interactive.perl:1880
+#: git-add--interactive.perl
 #, perl-format
 msgid "invalid argument %s, expecting --"
 msgstr "无效的参数 %s，期望是 --"
 
-#: git-send-email.perl:159
+#: git-send-email.perl
 msgid "local zone differs from GMT by a non-minute interval\n"
 msgstr "本地时间和 GMT 有不到一分钟间隔\n"
 
-#: git-send-email.perl:166 git-send-email.perl:172
+#: git-send-email.perl
 msgid "local time offset greater than or equal to 24 hours\n"
 msgstr "本地时间偏移量大于等于 24 小时\n"
 
-#: git-send-email.perl:244
+#: git-send-email.perl
 #, perl-format
 msgid "fatal: command '%s' died with exit code %d"
 msgstr "致命错误：命令 '%s' 已终止，退出代码为 %d"
 
-#: git-send-email.perl:257
+#: git-send-email.perl
 msgid "the editor exited uncleanly, aborting everything"
 msgstr "编辑器非正常退出，终止所有操作"
 
-#: git-send-email.perl:346
+#: git-send-email.perl
 #, perl-format
 msgid ""
 "'%s' contains an intermediate version of the email you were composing.\n"
 msgstr "'%s' 包含您正在编写的一个中间版本的邮件。\n"
 
-#: git-send-email.perl:351
+#: git-send-email.perl
 #, perl-format
 msgid "'%s.final' contains the composed email.\n"
 msgstr "'%s.final' 包含编辑的邮件。\n"
 
-#: git-send-email.perl:484
+#: git-send-email.perl
 msgid "--dump-aliases incompatible with other options\n"
 msgstr "--dump-aliases 和其它选项不兼容\n"
 
-#: git-send-email.perl:561
+#: git-send-email.perl
 msgid ""
 "fatal: found configuration options for 'sendmail'\n"
 "git-send-email is configured with the sendemail.* options - note the 'e'.\n"
@@ -26143,47 +26405,47 @@ msgstr ""
 "git-send-email 通过 sendemail.* 选项进行设置，注意字母 'e'。\n"
 "设置 sendemail.forbidSendmailVariables 为 false 来禁用这项检查。\n"
 
-#: git-send-email.perl:566 git-send-email.perl:782
+#: git-send-email.perl
 msgid "Cannot run git format-patch from outside a repository\n"
 msgstr "不能在仓库之外运行 git format-patch\n"
 
-#: git-send-email.perl:569
+#: git-send-email.perl
 msgid ""
 "`batch-size` and `relogin` must be specified together (via command-line or "
 "configuration option)\n"
 msgstr "`batch-size` 和 `relogin` 必须同时定义（通过命令行或者配置选项）\n"
 
-#: git-send-email.perl:582
+#: git-send-email.perl
 #, perl-format
 msgid "Unknown --suppress-cc field: '%s'\n"
 msgstr "未知的 --suppress-cc 字段：'%s'\n"
 
-#: git-send-email.perl:613
+#: git-send-email.perl
 #, perl-format
 msgid "Unknown --confirm setting: '%s'\n"
 msgstr "未知的 --confirm 设置：'%s'\n"
 
-#: git-send-email.perl:653
+#: git-send-email.perl
 #, perl-format
 msgid "warning: sendmail alias with quotes is not supported: %s\n"
 msgstr "警告：不支持带引号的 sendmail 别名：%s\n"
 
-#: git-send-email.perl:655
+#: git-send-email.perl
 #, perl-format
 msgid "warning: `:include:` not supported: %s\n"
 msgstr "警告：不支持 `:include:`：%s\n"
 
-#: git-send-email.perl:657
+#: git-send-email.perl
 #, perl-format
 msgid "warning: `/file` or `|pipe` redirection not supported: %s\n"
 msgstr "警告：不支持 `/file` 或 `|pipe` 重定向：%s\n"
 
-#: git-send-email.perl:662
+#: git-send-email.perl
 #, perl-format
 msgid "warning: sendmail line is not recognized: %s\n"
 msgstr "警告：不能识别的 sendmail 行：%s\n"
 
-#: git-send-email.perl:747
+#: git-send-email.perl
 #, perl-format
 msgid ""
 "File '%s' exists but it could also be the range of commits\n"
@@ -26198,12 +26460,12 @@ msgstr ""
 "    * 如果含义为一个文件，使用 \"./%s\"，或者\n"
 "    * 如果含义为一个范围，使用 --format-patch 选项。\n"
 
-#: git-send-email.perl:768
+#: git-send-email.perl
 #, perl-format
 msgid "Failed to opendir %s: %s"
 msgstr "无法打开目录 %s: %s"
 
-#: git-send-email.perl:803
+#: git-send-email.perl
 msgid ""
 "\n"
 "No patch files specified!\n"
@@ -26213,17 +26475,17 @@ msgstr ""
 "未指定补丁文件！\n"
 "\n"
 
-#: git-send-email.perl:816
+#: git-send-email.perl
 #, perl-format
 msgid "No subject line in %s?"
 msgstr "在 %s 中没有标题行？"
 
-#: git-send-email.perl:827
+#: git-send-email.perl
 #, perl-format
 msgid "Failed to open for writing %s: %s"
 msgstr "为写入打开 %s 失败: %s"
 
-#: git-send-email.perl:838
+#: git-send-email.perl
 msgid ""
 "Lines beginning in \"GIT:\" will be removed.\n"
 "Consider including an overall diffstat or table of contents\n"
@@ -26236,37 +26498,37 @@ msgstr ""
 "\n"
 "如果您不想发送摘要，清除内容。\n"
 
-#: git-send-email.perl:862
+#: git-send-email.perl
 #, perl-format
 msgid "Failed to open %s: %s"
 msgstr "无法打开 %s: %s"
 
-#: git-send-email.perl:879
+#: git-send-email.perl
 #, perl-format
 msgid "Failed to open %s.final: %s"
 msgstr "无法打开 %s.final: %s"
 
-#: git-send-email.perl:922
+#: git-send-email.perl
 msgid "Summary email is empty, skipping it\n"
 msgstr "摘要邮件为空，跳过\n"
 
 #. TRANSLATORS: please keep [y/N] as is.
-#: git-send-email.perl:971
+#: git-send-email.perl
 #, perl-format
 msgid "Are you sure you want to use <%s> [y/N]? "
 msgstr "您确认要使用 <%s> [y/N]？"
 
-#: git-send-email.perl:1026
+#: git-send-email.perl
 msgid ""
 "The following files are 8bit, but do not declare a Content-Transfer-"
 "Encoding.\n"
 msgstr "如下文件含 8bit 内容，但没有声明一个 Content-Transfer-Encoding。\n"
 
-#: git-send-email.perl:1031
+#: git-send-email.perl
 msgid "Which 8bit encoding should I declare [UTF-8]? "
 msgstr "要声明 8bit 为什么样的编码格式 [UTF-8]？"
 
-#: git-send-email.perl:1039
+#: git-send-email.perl
 #, perl-format
 msgid ""
 "Refusing to send because the patch\n"
@@ -26278,20 +26540,20 @@ msgstr ""
 "\t%s\n"
 "包含模版标题 '*** SUBJECT HERE ***'。如果确实想要发送，使用参数 --force。\n"
 
-#: git-send-email.perl:1058
+#: git-send-email.perl
 msgid "To whom should the emails be sent (if anyone)?"
 msgstr "邮件将要发送给谁？"
 
-#: git-send-email.perl:1076
+#: git-send-email.perl
 #, perl-format
 msgid "fatal: alias '%s' expands to itself\n"
 msgstr "致命错误：别名 '%s' 扩展为它自己\n"
 
-#: git-send-email.perl:1088
+#: git-send-email.perl
 msgid "Message-ID to be used as In-Reply-To for the first email (if any)? "
 msgstr "Message-ID 被用作第一封邮件的 In-Reply-To ？"
 
-#: git-send-email.perl:1150 git-send-email.perl:1158
+#: git-send-email.perl
 #, perl-format
 msgid "error: unable to extract a valid address from: %s\n"
 msgstr "错误：不能从 %s 中提取一个有效的邮件地址\n"
@@ -26299,16 +26561,16 @@ msgstr "错误：不能从 %s 中提取一个有效的邮件地址\n"
 #. 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:1162
+#: git-send-email.perl
 msgid "What to do with this address? ([q]uit|[d]rop|[e]dit): "
 msgstr "如何处理这个地址？([q]uit|[d]rop|[e]dit)："
 
-#: git-send-email.perl:1482
+#: git-send-email.perl
 #, perl-format
 msgid "CA path \"%s\" does not exist"
 msgstr "CA 路径 \"%s\" 不存在"
 
-#: git-send-email.perl:1565
+#: git-send-email.perl
 msgid ""
 "    The Cc list above has been expanded by additional\n"
 "    addresses found in the patch commit message. By default\n"
@@ -26333,112 +26595,112 @@ msgstr ""
 #. 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:1580
+#: git-send-email.perl
 msgid "Send this email? ([y]es|[n]o|[e]dit|[q]uit|[a]ll): "
 msgstr "发送这封邮件？([y]es|[n]o|[e]dit|[q]uit|[a]ll): "
 
-#: git-send-email.perl:1583
+#: git-send-email.perl
 msgid "Send this email reply required"
 msgstr "发送要求的邮件回复"
 
-#: git-send-email.perl:1617
+#: git-send-email.perl
 msgid "The required SMTP server is not properly defined."
 msgstr "要求的 SMTP 服务器未被正确定义。"
 
-#: git-send-email.perl:1664
+#: git-send-email.perl
 #, perl-format
 msgid "Server does not support STARTTLS! %s"
 msgstr "服务器不支持 STARTTLS！%s"
 
-#: git-send-email.perl:1669 git-send-email.perl:1673
+#: git-send-email.perl
 #, perl-format
 msgid "STARTTLS failed! %s"
 msgstr "STARTTLS 失败！%s"
 
-#: git-send-email.perl:1682
+#: git-send-email.perl
 msgid "Unable to initialize SMTP properly. Check config and use --smtp-debug."
 msgstr "无法正确地初始化 SMTP。检查配置并使用 --smtp-debug。"
 
-#: git-send-email.perl:1700
+#: git-send-email.perl
 #, perl-format
 msgid "Failed to send %s\n"
 msgstr "无法发送 %s\n"
 
-#: git-send-email.perl:1703
+#: git-send-email.perl
 #, perl-format
 msgid "Dry-Sent %s\n"
 msgstr "演习发送 %s\n"
 
-#: git-send-email.perl:1703
+#: git-send-email.perl
 #, perl-format
 msgid "Sent %s\n"
 msgstr "正发送 %s\n"
 
-#: git-send-email.perl:1705
+#: git-send-email.perl
 msgid "Dry-OK. Log says:\n"
 msgstr "演习成功。日志说：\n"
 
-#: git-send-email.perl:1705
+#: git-send-email.perl
 msgid "OK. Log says:\n"
 msgstr "OK。日志说：\n"
 
-#: git-send-email.perl:1724
+#: git-send-email.perl
 msgid "Result: "
 msgstr "结果："
 
-#: git-send-email.perl:1727
+#: git-send-email.perl
 msgid "Result: OK\n"
 msgstr "结果：OK\n"
 
-#: git-send-email.perl:1744
+#: git-send-email.perl
 #, perl-format
 msgid "can't open file %s"
 msgstr "无法打开文件 %s"
 
-#: git-send-email.perl:1792 git-send-email.perl:1812
+#: git-send-email.perl
 #, perl-format
 msgid "(mbox) Adding cc: %s from line '%s'\n"
 msgstr "(mbox) 添加 cc：%s 自行 '%s'\n"
 
-#: git-send-email.perl:1798
+#: git-send-email.perl
 #, perl-format
 msgid "(mbox) Adding to: %s from line '%s'\n"
 msgstr "(mbox) 添加 to：%s 自行 '%s'\n"
 
-#: git-send-email.perl:1855
+#: git-send-email.perl
 #, perl-format
 msgid "(non-mbox) Adding cc: %s from line '%s'\n"
 msgstr "(non-mbox) 添加 cc：%s 自行 '%s'\n"
 
-#: git-send-email.perl:1890
+#: git-send-email.perl
 #, perl-format
 msgid "(body) Adding cc: %s from line '%s'\n"
 msgstr "(body) 添加 cc: %s 自行 '%s'\n"
 
-#: git-send-email.perl:2009
+#: git-send-email.perl
 #, perl-format
 msgid "(%s) Could not execute '%s'"
 msgstr "(%s) 不能执行 '%s'"
 
-#: git-send-email.perl:2016
+#: git-send-email.perl
 #, perl-format
 msgid "(%s) Adding %s: %s from: '%s'\n"
 msgstr "(%s) 添加 %s: %s 自：'%s'\n"
 
-#: git-send-email.perl:2020
+#: git-send-email.perl
 #, perl-format
 msgid "(%s) failed to close pipe to '%s'"
 msgstr "(%s) 无法关闭管道至 '%s'"
 
-#: git-send-email.perl:2050
+#: git-send-email.perl
 msgid "cannot send message as 7bit"
 msgstr "不能以 7bit 形式发送信息"
 
-#: git-send-email.perl:2058
+#: git-send-email.perl
 msgid "invalid transfer encoding"
 msgstr "无效的传送编码"
 
-#: git-send-email.perl:2100
+#: git-send-email.perl
 #, perl-format
 msgid ""
 "fatal: %s: rejected by %s hook\n"
@@ -26449,12 +26711,12 @@ msgstr ""
 "%s\n"
 "警告：补丁未能发送\n"
 
-#: git-send-email.perl:2110 git-send-email.perl:2163 git-send-email.perl:2173
+#: git-send-email.perl
 #, perl-format
 msgid "unable to open %s: %s\n"
 msgstr "不能打开 %s：%s\n"
 
-#: git-send-email.perl:2113
+#: git-send-email.perl
 #, perl-format
 msgid ""
 "fatal: %s:%d is longer than 998 characters\n"
@@ -26463,13 +26725,13 @@ msgstr ""
 "致命错误：%s:%d 超过 998 字符\n"
 "警告：补丁未能发送\n"
 
-#: git-send-email.perl:2131
+#: git-send-email.perl
 #, 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:2135
+#: git-send-email.perl
 #, perl-format
 msgid "Do you really want to send %s? [y|N]: "
 msgstr "您真的要发送 %s？[y|N]："
diff --git a/po/zh_TW.po b/po/zh_TW.po
index caf6057332..2f7d01c303 100644
--- a/po/zh_TW.po
+++ b/po/zh_TW.po
@@ -22,8 +22,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Git\n"
 "Report-Msgid-Bugs-To: Git Mailing List <git@vger.kernel.org>\n"
-"POT-Creation-Date: 2022-04-13 14:52+0800\n"
-"PO-Revision-Date: 2022-04-14 08:04+0800\n"
+"POT-Creation-Date: 2022-06-23 21:13+0800\n"
+"PO-Revision-Date: 2022-06-23 23:02+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"
@@ -32,244 +32,234 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
-"X-Generator: Poedit 3.0.1\n"
+"X-Generator: Poedit 3.1\n"
 "X-ZhConverter: 繁化姬 dict-f4bc617e-r910 @ 2019/11/16 20:23:12 | https://"
 "zhconvert.org\n"
 
-#: add-interactive.c:382
+#: add-interactive.c
 #, c-format
 msgid "Huh (%s)?"
 msgstr "嗯（%s）？"
 
-#: add-interactive.c:535 add-interactive.c:836 reset.c:136 sequencer.c:3505
-#: sequencer.c:3970 sequencer.c:4127 builtin/rebase.c:1261
-#: builtin/rebase.c:1671
+#: add-interactive.c builtin/rebase.c reset.c sequencer.c
 msgid "could not read index"
 msgstr "無法讀取索引"
 
-#: add-interactive.c:590 git-add--interactive.perl:269
-#: git-add--interactive.perl:294
+#: add-interactive.c git-add--interactive.perl
 msgid "binary"
 msgstr "二進位"
 
-#: add-interactive.c:648 git-add--interactive.perl:278
-#: git-add--interactive.perl:332
+#: add-interactive.c git-add--interactive.perl
 msgid "nothing"
 msgstr "無"
 
-#: add-interactive.c:649 git-add--interactive.perl:314
-#: git-add--interactive.perl:329
+#: add-interactive.c git-add--interactive.perl
 msgid "unchanged"
 msgstr "未變更"
 
-#: add-interactive.c:686 git-add--interactive.perl:641
+#: add-interactive.c git-add--interactive.perl
 msgid "Update"
 msgstr "更新"
 
-#: add-interactive.c:703 add-interactive.c:891
+#: add-interactive.c
 #, c-format
 msgid "could not stage '%s'"
 msgstr "無法暫存「%s」"
 
-#: add-interactive.c:709 add-interactive.c:898 reset.c:160 sequencer.c:3709
+#: add-interactive.c builtin/stash.c reset.c sequencer.c
 msgid "could not write index"
 msgstr "無法寫入索引"
 
-#: add-interactive.c:712 git-add--interactive.perl:626
+#: add-interactive.c git-add--interactive.perl
 #, c-format, perl-format
 msgid "updated %d path\n"
 msgid_plural "updated %d paths\n"
 msgstr[0] "已更新 %d 個路徑\n"
 
-#: add-interactive.c:730 git-add--interactive.perl:676
+#: add-interactive.c git-add--interactive.perl
 #, c-format, perl-format
 msgid "note: %s is untracked now.\n"
 msgstr "注意：%s 現已不再追蹤。\n"
 
-#: add-interactive.c:735 apply.c:4133 builtin/checkout.c:311
-#: builtin/reset.c:167
+#: add-interactive.c apply.c builtin/checkout.c builtin/reset.c
 #, c-format
 msgid "make_cache_entry failed for path '%s'"
 msgstr "「%s」路徑執行 make_cache_entry 失敗"
 
-#: add-interactive.c:765 git-add--interactive.perl:653
+#: add-interactive.c git-add--interactive.perl
 msgid "Revert"
 msgstr "還原"
 
-#: add-interactive.c:781
+#: add-interactive.c
 msgid "Could not parse HEAD^{tree}"
 msgstr "不能解析 HEAD^{樹}"
 
-#: add-interactive.c:819 git-add--interactive.perl:629
+#: add-interactive.c git-add--interactive.perl
 #, c-format, perl-format
 msgid "reverted %d path\n"
 msgid_plural "reverted %d paths\n"
 msgstr[0] "還原了 %d 個路徑\n"
 
-#: add-interactive.c:870 git-add--interactive.perl:693
+#: add-interactive.c git-add--interactive.perl
 #, c-format
 msgid "No untracked files.\n"
 msgstr "沒有未追蹤的檔案。\n"
 
-#: add-interactive.c:874 git-add--interactive.perl:687
+#: add-interactive.c git-add--interactive.perl
 msgid "Add untracked"
 msgstr "新增未追蹤的"
 
-#: add-interactive.c:901 git-add--interactive.perl:623
+#: add-interactive.c git-add--interactive.perl
 #, c-format, perl-format
 msgid "added %d path\n"
 msgid_plural "added %d paths\n"
 msgstr[0] "增加了 %d 個路徑\n"
 
-#: add-interactive.c:931
+#: add-interactive.c
 #, c-format
 msgid "ignoring unmerged: %s"
 msgstr "忽略未合併：%s"
 
-#: add-interactive.c:943 add-patch.c:1758 git-add--interactive.perl:1371
+#: add-interactive.c add-patch.c git-add--interactive.perl
 #, c-format
 msgid "Only binary files changed.\n"
 msgstr "只有二進位檔案被修改。\n"
 
-#: add-interactive.c:945 add-patch.c:1756 git-add--interactive.perl:1373
+#: add-interactive.c add-patch.c git-add--interactive.perl
 #, c-format
 msgid "No changes.\n"
 msgstr "沒有修改。\n"
 
-#: add-interactive.c:949 git-add--interactive.perl:1381
+#: add-interactive.c git-add--interactive.perl
 msgid "Patch update"
 msgstr "修補檔更新"
 
-#: add-interactive.c:988 git-add--interactive.perl:1794
+#: add-interactive.c git-add--interactive.perl
 msgid "Review diff"
 msgstr "檢視 diff"
 
-#: add-interactive.c:1016
+#: add-interactive.c
 msgid "show paths with changes"
 msgstr "顯示有變更的路徑"
 
-#: add-interactive.c:1018
+#: add-interactive.c
 msgid "add working tree state to the staged set of changes"
 msgstr "加入工作區狀態至暫存列表"
 
-#: add-interactive.c:1020
+#: add-interactive.c
 msgid "revert staged set of changes back to the HEAD version"
 msgstr "還原修改的暫存集至 HEAD 版本"
 
-#: add-interactive.c:1022
+#: add-interactive.c
 msgid "pick hunks and update selectively"
 msgstr "挑選區塊並選擇性更新"
 
-#: add-interactive.c:1024
+#: add-interactive.c
 msgid "view diff between HEAD and index"
 msgstr "檢視 HEAD 及索引之間的差異"
 
-#: add-interactive.c:1026
+#: add-interactive.c
 msgid "add contents of untracked files to the staged set of changes"
 msgstr "加入未追蹤檔案的內容至暫存列表"
 
-#: add-interactive.c:1034 add-interactive.c:1083
+#: add-interactive.c
 msgid "Prompt help:"
 msgstr "提示說明："
 
-#: add-interactive.c:1036
+#: add-interactive.c
 msgid "select a single item"
 msgstr "選擇單一項目"
 
-#: add-interactive.c:1038
+#: add-interactive.c
 msgid "select a range of items"
 msgstr "選擇項目範圍"
 
-#: add-interactive.c:1040
+#: add-interactive.c
 msgid "select multiple ranges"
 msgstr "選擇多個範圍"
 
-#: add-interactive.c:1042 add-interactive.c:1087
+#: add-interactive.c
 msgid "select item based on unique prefix"
 msgstr "基於唯一前綴選擇項目"
 
-#: add-interactive.c:1044
+#: add-interactive.c
 msgid "unselect specified items"
 msgstr "取消選擇指定項目"
 
-#: add-interactive.c:1046
+#: add-interactive.c
 msgid "choose all items"
 msgstr "選擇所有項目"
 
-#: add-interactive.c:1048
+#: add-interactive.c
 msgid "(empty) finish selecting"
 msgstr "（空）完成選取"
 
-#: add-interactive.c:1085
+#: add-interactive.c
 msgid "select a numbered item"
 msgstr "選擇編號過的項目"
 
-#: add-interactive.c:1089
+#: add-interactive.c
 msgid "(empty) select nothing"
 msgstr "（空）全不選取"
 
-#: add-interactive.c:1097 builtin/clean.c:839 git-add--interactive.perl:1898
+#: add-interactive.c builtin/clean.c git-add--interactive.perl
 msgid "*** Commands ***"
 msgstr "*** 指令 ***"
 
-#: add-interactive.c:1098 builtin/clean.c:840 git-add--interactive.perl:1895
+#: add-interactive.c builtin/clean.c git-add--interactive.perl
 msgid "What now"
 msgstr "請選擇"
 
-#: add-interactive.c:1150 git-add--interactive.perl:213
+#: add-interactive.c git-add--interactive.perl
 msgid "staged"
 msgstr "快取"
 
-#: add-interactive.c:1150 git-add--interactive.perl:213
+#: add-interactive.c git-add--interactive.perl
 msgid "unstaged"
 msgstr "未快取"
 
-#: add-interactive.c:1150 apply.c:5002 apply.c:5005 builtin/am.c:2370
-#: builtin/am.c:2373 builtin/bugreport.c:107 builtin/clone.c:132
-#: builtin/fetch.c:154 builtin/merge.c:287 builtin/pull.c:194
-#: builtin/submodule--helper.c:412 builtin/submodule--helper.c:1872
-#: builtin/submodule--helper.c:1875 builtin/submodule--helper.c:2709
-#: builtin/submodule--helper.c:2712 builtin/submodule--helper.c:2891
-#: git-add--interactive.perl:213
+#: add-interactive.c apply.c builtin/am.c builtin/bugreport.c builtin/clone.c
+#: builtin/fetch.c builtin/merge.c builtin/pull.c builtin/submodule--helper.c
+#: git-add--interactive.perl
 msgid "path"
 msgstr "路徑"
 
-#: add-interactive.c:1157
+#: add-interactive.c
 msgid "could not refresh index"
 msgstr "無法重新整理索引"
 
-#: add-interactive.c:1171 builtin/clean.c:804 git-add--interactive.perl:1805
+#: add-interactive.c builtin/clean.c git-add--interactive.perl
 #, c-format
 msgid "Bye.\n"
 msgstr "再見。\n"
 
-#: add-patch.c:34 git-add--interactive.perl:1433
+#: add-patch.c git-add--interactive.perl
 #, c-format, perl-format
 msgid "Stage mode change [y,n,q,a,d%s,?]? "
 msgstr "暫存模式變更 [y,n,q,a,d%s,?]? "
 
-#: add-patch.c:35 git-add--interactive.perl:1434
+#: add-patch.c git-add--interactive.perl
 #, c-format, perl-format
 msgid "Stage deletion [y,n,q,a,d%s,?]? "
 msgstr "暫存刪除變更 [y,n,q,a,d%s,?]? "
 
-#: add-patch.c:36 git-add--interactive.perl:1435
+#: add-patch.c git-add--interactive.perl
 #, c-format, perl-format
 msgid "Stage addition [y,n,q,a,d%s,?]? "
 msgstr "暫存新增變更 [y,n,q,a,d%s,?]? "
 
-#: add-patch.c:37 git-add--interactive.perl:1436
+#: add-patch.c git-add--interactive.perl
 #, c-format, perl-format
 msgid "Stage this hunk [y,n,q,a,d%s,?]? "
 msgstr "暫存此區塊 [y,n,q,a,d%s,?]? "
 
-#: add-patch.c:39
+#: add-patch.c
 msgid ""
 "If the patch applies cleanly, the edited hunk will immediately be marked for "
 "staging."
 msgstr "如果修補檔能乾淨地套用，編輯區塊將立即標記為暫存。"
 
-#: add-patch.c:42
+#: add-patch.c
 msgid ""
 "y - stage this hunk\n"
 "n - do not stage this hunk\n"
@@ -283,33 +273,33 @@ msgstr ""
 "a - 暫存此區塊和本檔案中後面的全部區塊\n"
 "d - 不暫存此區塊和本檔案中後面的全部區塊\n"
 
-#: add-patch.c:56 git-add--interactive.perl:1439
+#: add-patch.c git-add--interactive.perl
 #, c-format, perl-format
 msgid "Stash mode change [y,n,q,a,d%s,?]? "
 msgstr "儲藏模式變更 [y,n,q,a,d%s,?]? "
 
-#: add-patch.c:57 git-add--interactive.perl:1440
+#: add-patch.c git-add--interactive.perl
 #, c-format, perl-format
 msgid "Stash deletion [y,n,q,a,d%s,?]? "
 msgstr "儲藏刪除變更 [y,n,q,a,d%s,?]? "
 
-#: add-patch.c:58 git-add--interactive.perl:1441
+#: add-patch.c git-add--interactive.perl
 #, c-format, perl-format
 msgid "Stash addition [y,n,q,a,d%s,?]? "
 msgstr "儲藏新增變更 [y,n,q,a,d%s,?]? "
 
-#: add-patch.c:59 git-add--interactive.perl:1442
+#: add-patch.c git-add--interactive.perl
 #, c-format, perl-format
 msgid "Stash this hunk [y,n,q,a,d%s,?]? "
 msgstr "儲藏此區塊 [y,n,q,a,d%s,?]? "
 
-#: add-patch.c:61
+#: add-patch.c
 msgid ""
 "If the patch applies cleanly, the edited hunk will immediately be marked for "
 "stashing."
 msgstr "如果修補檔能乾淨地套用，編輯區塊將立即標記為儲藏。"
 
-#: add-patch.c:64
+#: add-patch.c
 msgid ""
 "y - stash this hunk\n"
 "n - do not stash this hunk\n"
@@ -323,33 +313,33 @@ msgstr ""
 "a - 儲藏此區塊和本檔案中後面的全部區塊\n"
 "d - 不儲藏此區塊和本檔案中後面的全部區塊\n"
 
-#: add-patch.c:80 git-add--interactive.perl:1445
+#: add-patch.c git-add--interactive.perl
 #, c-format, perl-format
 msgid "Unstage mode change [y,n,q,a,d%s,?]? "
 msgstr "取消暫存模式變更 [y,n,q,a,d%s,?]? "
 
-#: add-patch.c:81 git-add--interactive.perl:1446
+#: add-patch.c git-add--interactive.perl
 #, c-format, perl-format
 msgid "Unstage deletion [y,n,q,a,d%s,?]? "
 msgstr "取消暫存刪除變更 [y,n,q,a,d%s,?]? "
 
-#: add-patch.c:82 git-add--interactive.perl:1447
+#: add-patch.c git-add--interactive.perl
 #, c-format, perl-format
 msgid "Unstage addition [y,n,q,a,d%s,?]? "
 msgstr "取消暫存新增變更 [y,n,q,a,d%s,?]? "
 
-#: add-patch.c:83 git-add--interactive.perl:1448
+#: add-patch.c git-add--interactive.perl
 #, c-format, perl-format
 msgid "Unstage this hunk [y,n,q,a,d%s,?]? "
 msgstr "取消暫存此區塊 [y,n,q,a,d%s,?]? "
 
-#: add-patch.c:85
+#: add-patch.c
 msgid ""
 "If the patch applies cleanly, the edited hunk will immediately be marked for "
 "unstaging."
 msgstr "如果修補檔能乾淨地套用，編輯區塊將立即標記為未暫存。"
 
-#: add-patch.c:88
+#: add-patch.c
 msgid ""
 "y - unstage this hunk\n"
 "n - do not unstage this hunk\n"
@@ -363,33 +353,33 @@ msgstr ""
 "a - 不暫存此區塊和本檔案中後面的全部區塊\n"
 "d - 不要不暫存此區塊和本檔案中後面的全部區塊\n"
 
-#: add-patch.c:103 git-add--interactive.perl:1451
+#: add-patch.c git-add--interactive.perl
 #, c-format, perl-format
 msgid "Apply mode change to index [y,n,q,a,d%s,?]? "
 msgstr "將模式變更套用到索引 [y,n,q,a,d%s,?]? "
 
-#: add-patch.c:104 git-add--interactive.perl:1452
+#: add-patch.c git-add--interactive.perl
 #, c-format, perl-format
 msgid "Apply deletion to index [y,n,q,a,d%s,?]? "
 msgstr "將刪除變更套用到索引 [y,n,q,a,d%s,?]? "
 
-#: add-patch.c:105 git-add--interactive.perl:1453
+#: add-patch.c git-add--interactive.perl
 #, c-format, perl-format
 msgid "Apply addition to index [y,n,q,a,d%s,?]? "
 msgstr "套用新增變更至索引 [y,n,q,a,d%s,?]? "
 
-#: add-patch.c:106 git-add--interactive.perl:1454
+#: add-patch.c git-add--interactive.perl
 #, c-format, perl-format
 msgid "Apply this hunk to index [y,n,q,a,d%s,?]? "
 msgstr "將此區塊套用到索引 [y,n,q,a,d%s,?]? "
 
-#: add-patch.c:108 add-patch.c:176 add-patch.c:221
+#: add-patch.c
 msgid ""
 "If the patch applies cleanly, the edited hunk will immediately be marked for "
 "applying."
 msgstr "如果修補檔能乾淨地套用，編輯區塊將立即標記為套用。"
 
-#: add-patch.c:111
+#: add-patch.c
 msgid ""
 "y - apply this hunk to index\n"
 "n - do not apply this hunk to index\n"
@@ -403,37 +393,33 @@ msgstr ""
 "a - 套用此區塊和本檔案中後面的全部區塊\n"
 "d - 不要套用此區塊和本檔案中後面的全部區塊\n"
 
-#: add-patch.c:126 git-add--interactive.perl:1457
-#: git-add--interactive.perl:1475
+#: add-patch.c git-add--interactive.perl
 #, c-format, perl-format
 msgid "Discard mode change from worktree [y,n,q,a,d%s,?]? "
 msgstr "從工作區中捨棄模式變更 [y,n,q,a,d%s,?]? "
 
-#: add-patch.c:127 git-add--interactive.perl:1458
-#: git-add--interactive.perl:1476
+#: add-patch.c git-add--interactive.perl
 #, c-format, perl-format
 msgid "Discard deletion from worktree [y,n,q,a,d%s,?]? "
 msgstr "從工作區中捨棄刪除變更 [y,n,q,a,d%s,?]? "
 
-#: add-patch.c:128 git-add--interactive.perl:1459
-#: git-add--interactive.perl:1477
+#: add-patch.c git-add--interactive.perl
 #, c-format, perl-format
 msgid "Discard addition from worktree [y,n,q,a,d%s,?]? "
 msgstr "放棄工作目錄的新增變更 [y,n,q,a,d%s,?]? "
 
-#: add-patch.c:129 git-add--interactive.perl:1460
-#: git-add--interactive.perl:1478
+#: add-patch.c git-add--interactive.perl
 #, c-format, perl-format
 msgid "Discard this hunk from worktree [y,n,q,a,d%s,?]? "
 msgstr "從工作區中捨棄此區塊 [y,n,q,a,d%s,?]? "
 
-#: add-patch.c:131 add-patch.c:154 add-patch.c:199
+#: add-patch.c
 msgid ""
 "If the patch applies cleanly, the edited hunk will immediately be marked for "
 "discarding."
 msgstr "如果修補檔能乾淨地套用，編輯區塊將立即標記為捨棄。"
 
-#: add-patch.c:134 add-patch.c:202
+#: add-patch.c
 msgid ""
 "y - discard this hunk from worktree\n"
 "n - do not discard this hunk from worktree\n"
@@ -447,27 +433,27 @@ msgstr ""
 "a - 捨棄此區塊和本檔案中後面的全部區塊\n"
 "d - 不要捨棄此區塊和本檔案中後面的全部區塊\n"
 
-#: add-patch.c:149 add-patch.c:194 git-add--interactive.perl:1463
+#: add-patch.c git-add--interactive.perl
 #, c-format, perl-format
 msgid "Discard mode change from index and worktree [y,n,q,a,d%s,?]? "
 msgstr "從索引和工作區中捨棄模式變更 [y,n,q,a,d%s,?]? "
 
-#: add-patch.c:150 add-patch.c:195 git-add--interactive.perl:1464
+#: add-patch.c git-add--interactive.perl
 #, c-format, perl-format
 msgid "Discard deletion from index and worktree [y,n,q,a,d%s,?]? "
 msgstr "從索引和工作區中捨棄刪除 [y,n,q,a,d%s,?]? "
 
-#: add-patch.c:151 add-patch.c:196 git-add--interactive.perl:1465
+#: add-patch.c git-add--interactive.perl
 #, c-format, perl-format
 msgid "Discard addition from index and worktree [y,n,q,a,d%s,?]? "
 msgstr "放棄索引及工作目錄的新增變更 [y,n,q,a,d%s,?]? "
 
-#: add-patch.c:152 add-patch.c:197 git-add--interactive.perl:1466
+#: add-patch.c git-add--interactive.perl
 #, c-format, perl-format
 msgid "Discard this hunk from index and worktree [y,n,q,a,d%s,?]? "
 msgstr "從索引和工作區中捨棄此區塊 [y,n,q,a,d%s,?]? "
 
-#: add-patch.c:157
+#: add-patch.c
 msgid ""
 "y - discard this hunk from index and worktree\n"
 "n - do not discard this hunk from index and worktree\n"
@@ -481,27 +467,27 @@ msgstr ""
 "a - 捨棄此區塊和本檔案中後面的全部區塊\n"
 "d - 不要捨棄此區塊和本檔案中後面的全部區塊\n"
 
-#: add-patch.c:171 add-patch.c:216 git-add--interactive.perl:1469
+#: add-patch.c git-add--interactive.perl
 #, c-format, perl-format
 msgid "Apply mode change to index and worktree [y,n,q,a,d%s,?]? "
 msgstr "將模式變更套用到索引和工作區 [y,n,q,a,d%s,?]? "
 
-#: add-patch.c:172 add-patch.c:217 git-add--interactive.perl:1470
+#: add-patch.c git-add--interactive.perl
 #, c-format, perl-format
 msgid "Apply deletion to index and worktree [y,n,q,a,d%s,?]? "
 msgstr "將刪除變更套用到索引和工作區 [y,n,q,a,d%s,?]? "
 
-#: add-patch.c:173 add-patch.c:218 git-add--interactive.perl:1471
+#: add-patch.c git-add--interactive.perl
 #, c-format, perl-format
 msgid "Apply addition to index and worktree [y,n,q,a,d%s,?]? "
 msgstr "套用索引及工作目錄的新增變更 [y,n,q,a,d%s,?]? "
 
-#: add-patch.c:174 add-patch.c:219 git-add--interactive.perl:1472
+#: add-patch.c git-add--interactive.perl
 #, c-format, perl-format
 msgid "Apply this hunk to index and worktree [y,n,q,a,d%s,?]? "
 msgstr "將此區塊套用到索引和工作區 [y,n,q,a,d%s,?]? "
 
-#: add-patch.c:179
+#: add-patch.c
 msgid ""
 "y - apply this hunk to index and worktree\n"
 "n - do not apply this hunk to index and worktree\n"
@@ -515,7 +501,7 @@ msgstr ""
 "a - 套用此區塊和本檔案中後面的全部區塊\n"
 "d - 不要套用此區塊和本檔案中後面的全部區塊\n"
 
-#: add-patch.c:224
+#: add-patch.c
 msgid ""
 "y - apply this hunk to worktree\n"
 "n - do not apply this hunk to worktree\n"
@@ -529,34 +515,34 @@ msgstr ""
 "a - 套用此區塊和本檔案中後面的全部區塊\n"
 "d - 不要套用此區塊和本檔案中後面的全部區塊\n"
 
-#: add-patch.c:343
+#: add-patch.c
 #, c-format
 msgid "could not parse hunk header '%.*s'"
 msgstr "無法解析區塊標頭 '%.*s'"
 
-#: add-patch.c:362 add-patch.c:366
+#: add-patch.c
 #, c-format
 msgid "could not parse colored hunk header '%.*s'"
 msgstr "無法解析上色過的區塊標頭 '%.*s'"
 
-#: add-patch.c:431
+#: add-patch.c
 msgid "could not parse diff"
 msgstr "無法解析差異 (diff)"
 
-#: add-patch.c:450
+#: add-patch.c
 msgid "could not parse colored diff"
 msgstr "無法解析上色過的差異 (diff)"
 
-#: add-patch.c:464
+#: add-patch.c
 #, c-format
 msgid "failed to run '%s'"
 msgstr "無法執行 '%s'"
 
-#: add-patch.c:618
+#: add-patch.c
 msgid "mismatched output from interactive.diffFilter"
 msgstr "interactive.diffFilter 的輸出不符"
 
-#: add-patch.c:619
+#: add-patch.c
 msgid ""
 "Your filter must maintain a one-to-one correspondence\n"
 "between its input and output lines."
@@ -564,7 +550,7 @@ msgstr ""
 "您的過濾器必須在其輸入及輸出行\n"
 "維持一對一的對應關係。"
 
-#: add-patch.c:797
+#: add-patch.c
 #, c-format
 msgid ""
 "expected context line #%d in\n"
@@ -573,7 +559,7 @@ msgstr ""
 "應有上下文行 #%d 於\n"
 "%.*s"
 
-#: add-patch.c:812
+#: add-patch.c
 #, c-format
 msgid ""
 "hunks do not overlap:\n"
@@ -586,11 +572,11 @@ msgstr ""
 "\t不以下述結尾：\n"
 "%.*s"
 
-#: add-patch.c:1088 git-add--interactive.perl:1115
+#: add-patch.c git-add--interactive.perl
 msgid "Manual hunk edit mode -- see bottom for a quick guide.\n"
 msgstr "手動區塊編輯模式 -- 檢視底部的快速指南。\n"
 
-#: add-patch.c:1092
+#: add-patch.c
 #, c-format
 msgid ""
 "---\n"
@@ -604,7 +590,7 @@ msgstr ""
 "以 %c 開始的行將被刪除。\n"
 
 #. TRANSLATORS: 'it' refers to the patch mentioned in the previous messages.
-#: add-patch.c:1106 git-add--interactive.perl:1129
+#: add-patch.c git-add--interactive.perl
 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"
@@ -614,11 +600,11 @@ msgstr ""
 "若刪掉此區塊的全部內容，則會中止\n"
 "本次編輯，區塊則不會被修改。\n"
 
-#: add-patch.c:1139
+#: add-patch.c
 msgid "could not parse hunk header"
 msgstr "無法解析區塊標頭"
 
-#: add-patch.c:1184
+#: add-patch.c
 msgid "'git apply --cached' failed"
 msgstr "「git apply --cached」失敗"
 
@@ -634,24 +620,24 @@ msgstr "「git apply --cached」失敗"
 #. 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:1253 git-add--interactive.perl:1244
+#: add-patch.c git-add--interactive.perl
 msgid ""
 "Your edited hunk does not apply. Edit again (saying \"no\" discards!) [y/n]? "
 msgstr "未套用編輯區塊。是否重新編輯（輸入 “no” 捨棄！） [y/n]? "
 
-#: add-patch.c:1296
+#: add-patch.c
 msgid "The selected hunks do not apply to the index!"
 msgstr "選取的區塊不會套用進索引！"
 
-#: add-patch.c:1297 git-add--interactive.perl:1348
+#: add-patch.c git-add--interactive.perl
 msgid "Apply them to the worktree anyway? "
 msgstr "無論如何都要套用到工作區嗎？ "
 
-#: add-patch.c:1304 git-add--interactive.perl:1351
+#: add-patch.c git-add--interactive.perl
 msgid "Nothing was applied.\n"
 msgstr "未套用。\n"
 
-#: add-patch.c:1361
+#: add-patch.c
 msgid ""
 "j - leave this hunk undecided, see next undecided hunk\n"
 "J - leave this hunk undecided, see next hunk\n"
@@ -673,72 +659,72 @@ msgstr ""
 "e - 手動編輯目前區塊\n"
 "? - 顯示說明\n"
 
-#: add-patch.c:1523 add-patch.c:1533
+#: add-patch.c
 msgid "No previous hunk"
 msgstr "沒有上一個區塊"
 
-#: add-patch.c:1528 add-patch.c:1538
+#: add-patch.c
 msgid "No next hunk"
 msgstr "沒有下一個區塊"
 
-#: add-patch.c:1544
+#: add-patch.c
 msgid "No other hunks to goto"
 msgstr "沒有其它可供跳轉的區塊"
 
-#: add-patch.c:1555 git-add--interactive.perl:1608
+#: add-patch.c git-add--interactive.perl
 msgid "go to which hunk (<ret> to see more)? "
 msgstr "要跳轉到哪個區塊（<Enter> 檢視更多）？ "
 
-#: add-patch.c:1556 git-add--interactive.perl:1610
+#: add-patch.c git-add--interactive.perl
 msgid "go to which hunk? "
 msgstr "跳轉到哪個區塊？ "
 
-#: add-patch.c:1567
+#: add-patch.c
 #, c-format
 msgid "Invalid number: '%s'"
 msgstr "無效數字：'%s'"
 
-#: add-patch.c:1572
+#: add-patch.c
 #, c-format
 msgid "Sorry, only %d hunk available."
 msgid_plural "Sorry, only %d hunks available."
 msgstr[0] "對不起，只有 %d 個可用區塊。"
 
-#: add-patch.c:1581
+#: add-patch.c
 msgid "No other hunks to search"
 msgstr "沒有其它可供尋找的區塊"
 
-#: add-patch.c:1587 git-add--interactive.perl:1663
+#: add-patch.c git-add--interactive.perl
 msgid "search for regex? "
 msgstr "使用常規表示式搜尋？ "
 
-#: add-patch.c:1602
+#: add-patch.c
 #, c-format
 msgid "Malformed search regexp %s: %s"
 msgstr "錯誤的常規表示式 %s：%s"
 
-#: add-patch.c:1619
+#: add-patch.c
 msgid "No hunk matches the given pattern"
 msgstr "沒有和提供模式相符合的區塊"
 
-#: add-patch.c:1626
+#: add-patch.c
 msgid "Sorry, cannot split this hunk"
 msgstr "對不起，不能分割這個區塊"
 
-#: add-patch.c:1630
+#: add-patch.c
 #, c-format
 msgid "Split into %d hunks."
 msgstr "分割為 %d 個區塊。"
 
-#: add-patch.c:1634
+#: add-patch.c
 msgid "Sorry, cannot edit this hunk"
 msgstr "對不起，不能編輯這個區塊"
 
-#: add-patch.c:1686
+#: add-patch.c
 msgid "'git apply' failed"
 msgstr "'git apply' 失敗"
 
-#: advice.c:81
+#: advice.c
 #, c-format
 msgid ""
 "\n"
@@ -747,37 +733,37 @@ msgstr ""
 "\n"
 "請使用「git config advice.%s false」來停用此訊息"
 
-#: advice.c:97
+#: advice.c
 #, c-format
 msgid "%shint: %.*s%s\n"
 msgstr "%s提示：%.*s%s\n"
 
-#: advice.c:181
+#: advice.c
 msgid "Cherry-picking is not possible because you have unmerged files."
 msgstr "無法揀選，因為您有未合併的檔案。"
 
-#: advice.c:183
+#: advice.c
 msgid "Committing is not possible because you have unmerged files."
 msgstr "無法提交，因為您有未合併的檔案。"
 
-#: advice.c:185
+#: advice.c
 msgid "Merging is not possible because you have unmerged files."
 msgstr "無法合併，因為您有未合併的檔案。"
 
-#: advice.c:187
+#: advice.c
 msgid "Pulling is not possible because you have unmerged files."
 msgstr "無法拉取，因為您有未合併的檔案。"
 
-#: advice.c:189
+#: advice.c
 msgid "Reverting is not possible because you have unmerged files."
 msgstr "無法還原提交，因為您有未合併的檔案。"
 
-#: advice.c:191
+#: advice.c
 #, c-format
 msgid "It is not possible to %s because you have unmerged files."
 msgstr "無法 %s，因為您有未合併的檔案。"
 
-#: advice.c:199
+#: advice.c
 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,27 +771,27 @@ msgstr ""
 "請在工作區改正檔案，然後酌情使用 'git add/rm <檔案>' 指令標記\n"
 "解決方案並提交。"
 
-#: advice.c:207
+#: advice.c
 msgid "Exiting because of an unresolved conflict."
 msgstr "因為存在未解決的衝突而離開。"
 
-#: advice.c:212 builtin/merge.c:1388
+#: advice.c builtin/merge.c
 msgid "You have not concluded your merge (MERGE_HEAD exists)."
 msgstr "您尚未結束您的合併（存在 MERGE_HEAD）。"
 
-#: advice.c:214
+#: advice.c
 msgid "Please, commit your changes before merging."
 msgstr "請在合併前先提交您的修改。"
 
-#: advice.c:215
+#: advice.c
 msgid "Exiting because of unfinished merge."
 msgstr "因為存在未完成的合併而離開。"
 
-#: advice.c:220
+#: advice.c
 msgid "Not possible to fast-forward, aborting."
 msgstr "無法快轉，終止。"
 
-#: advice.c:230
+#: advice.c
 #, c-format
 msgid ""
 "The following paths and/or pathspecs matched paths that exist\n"
@@ -816,7 +802,7 @@ msgstr ""
 "符合稀疏簽出定義外且存在的路徑，\n"
 "所以不會在索引中更新：\n"
 
-#: advice.c:237
+#: advice.c
 msgid ""
 "If you intend to update such entries, try one of the following:\n"
 "* Use the --sparse option.\n"
@@ -826,7 +812,7 @@ msgstr ""
 "* 使用 --sparse 選項。\n"
 "* 停用或修改稀疏規則。"
 
-#: advice.c:245
+#: advice.c
 #, c-format
 msgid ""
 "Note: switching to '%s'.\n"
@@ -866,101 +852,87 @@ msgstr ""
 "將組態變數 advice.detachedHead 設定為 false，即可關閉本建議\n"
 "\n"
 
-#: alias.c:50
+#: alias.c
 msgid "cmdline ends with \\"
 msgstr "指令列以 \\ 結尾"
 
-#: alias.c:51
+#: alias.c
 msgid "unclosed quote"
 msgstr "未閉合的引號"
 
-#: apply.c:70
+#: apply.c
 #, c-format
 msgid "unrecognized whitespace option '%s'"
 msgstr "無法識別的空白字元選項 '%s'"
 
-#: apply.c:86
+#: apply.c
 #, c-format
 msgid "unrecognized whitespace ignore option '%s'"
 msgstr "無法識別的空白字元忽略選項 '%s'"
 
-#: apply.c:138 archive.c:584 parse-options.c:1122 range-diff.c:555
-#: revision.c:2314 revision.c:2318 revision.c:2327 revision.c:2332
-#: revision.c:2560 revision.c:2895 revision.c:2899 revision.c:2907
-#: revision.c:2910 revision.c:2912 builtin/add.c:507 builtin/add.c:509
-#: builtin/add.c:515 builtin/add.c:527 builtin/branch.c:755
-#: builtin/checkout.c:472 builtin/checkout.c:475 builtin/checkout.c:1663
-#: builtin/checkout.c:1773 builtin/checkout.c:1776 builtin/clone.c:921
-#: builtin/commit.c:359 builtin/commit.c:362 builtin/commit.c:1200
-#: builtin/commit.c:1256 builtin/commit.c:1273 builtin/describe.c:593
-#: builtin/diff-tree.c:155 builtin/difftool.c:733 builtin/fast-export.c:1245
-#: builtin/fetch.c:2141 builtin/fetch.c:2162 builtin/fetch.c:2167
-#: builtin/help.c:602 builtin/index-pack.c:1858 builtin/init-db.c:560
-#: builtin/log.c:1968 builtin/log.c:1970 builtin/ls-files.c:778
-#: builtin/merge-base.c:163 builtin/merge-base.c:169 builtin/merge.c:1409
-#: builtin/merge.c:1411 builtin/pack-objects.c:4098 builtin/push.c:592
-#: builtin/push.c:630 builtin/push.c:636 builtin/push.c:641
-#: builtin/rebase.c:1221 builtin/rebase.c:1223 builtin/rebase.c:1227
-#: builtin/repack.c:688 builtin/repack.c:719 builtin/reset.c:433
-#: builtin/reset.c:469 builtin/rev-list.c:537 builtin/show-branch.c:711
-#: builtin/stash.c:1696 builtin/stash.c:1699 builtin/submodule--helper.c:1328
-#: builtin/submodule--helper.c:3054 builtin/tag.c:527 builtin/tag.c:573
-#: builtin/worktree.c:779
+#: apply.c archive.c builtin/add.c builtin/branch.c builtin/checkout.c
+#: builtin/clone.c builtin/commit.c builtin/describe.c builtin/diff-tree.c
+#: builtin/difftool.c builtin/fast-export.c builtin/fetch.c builtin/help.c
+#: builtin/index-pack.c builtin/init-db.c builtin/log.c builtin/ls-files.c
+#: builtin/merge-base.c builtin/merge.c builtin/pack-objects.c builtin/push.c
+#: builtin/rebase.c builtin/repack.c builtin/reset.c builtin/rev-list.c
+#: builtin/show-branch.c builtin/stash.c builtin/submodule--helper.c
+#: builtin/tag.c builtin/worktree.c parse-options.c range-diff.c revision.c
 #, c-format
 msgid "options '%s' and '%s' cannot be used together"
 msgstr "不能同時使用 '%s' 和 '%s' 選項"
 
-#: apply.c:141 apply.c:152 apply.c:155
+#: apply.c
 #, c-format
 msgid "'%s' outside a repository"
 msgstr "'%s' 在版本庫之外"
 
-#: apply.c:807
+#: apply.c
 #, c-format
 msgid "Cannot prepare timestamp regexp %s"
 msgstr "無法準備時間戳常規表示式 %s"
 
-#: apply.c:816
+#: apply.c
 #, c-format
 msgid "regexec returned %d for input: %s"
 msgstr "regexec 返回 %d，輸入為：%s"
 
-#: apply.c:890
+#: apply.c
 #, c-format
 msgid "unable to find filename in patch at line %d"
 msgstr "不能在修補檔的第 %d 行找到檔案名"
 
-#: apply.c:928
+#: apply.c
 #, c-format
 msgid "git apply: bad git-diff - expected /dev/null, got %s on line %d"
 msgstr "git apply：錯誤的 git-diff - 應為 /dev/null，但在第 %2$d 行得到 %1$s"
 
-#: apply.c:934
+#: apply.c
 #, c-format
 msgid "git apply: bad git-diff - inconsistent new filename on line %d"
 msgstr "git apply：錯誤的 git-diff - 第 %d 行上新檔案名不一致"
 
-#: apply.c:935
+#: apply.c
 #, c-format
 msgid "git apply: bad git-diff - inconsistent old filename on line %d"
 msgstr "git apply：錯誤的 git-diff - 第 %d 行上舊檔案名不一致"
 
-#: apply.c:940
+#: apply.c
 #, c-format
 msgid "git apply: bad git-diff - expected /dev/null on line %d"
 msgstr "git apply：錯誤的 git-diff - 第 %d 行處應為 /dev/null"
 
-#: apply.c:969
+#: apply.c
 #, c-format
 msgid "invalid mode on line %d: %s"
 msgstr "第 %d 行包含無效檔案模式：%s"
 
-#: apply.c:1288
+#: apply.c
 #, c-format
 msgid "inconsistent header lines %d and %d"
 msgstr "不一致的檔案頭，%d 行和 %d 行"
 
-#: apply.c:1378
+#: apply.c
 #, c-format
 msgid ""
 "git diff header lacks filename information when removing %d leading pathname "
@@ -970,91 +942,91 @@ msgid_plural ""
 "components (line %d)"
 msgstr[0] "當移除 %d 個前導路徑後 git diff 頭缺乏檔案名訊息（第 %d 行）"
 
-#: apply.c:1391
+#: apply.c
 #, c-format
 msgid "git diff header lacks filename information (line %d)"
 msgstr "git diff 的標頭訊息中缺乏檔案名訊息（第 %d 行）"
 
-#: apply.c:1487
+#: apply.c
 #, c-format
 msgid "recount: unexpected line: %.*s"
 msgstr "recount：意外的行：%.*s"
 
-#: apply.c:1556
+#: apply.c
 #, c-format
 msgid "patch fragment without header at line %d: %.*s"
 msgstr "第 %d 行的修補檔區塊沒有標頭訊息：%.*s"
 
-#: apply.c:1759
+#: apply.c
 msgid "new file depends on old contents"
 msgstr "新檔案依賴舊內容"
 
-#: apply.c:1761
+#: apply.c
 msgid "deleted file still has contents"
 msgstr "刪除的檔案仍有內容"
 
-#: apply.c:1795
+#: apply.c
 #, c-format
 msgid "corrupt patch at line %d"
 msgstr "修補檔在第 %d 行發現損壞"
 
-#: apply.c:1832
+#: apply.c
 #, c-format
 msgid "new file %s depends on old contents"
 msgstr "新檔案 %s 依賴舊內容"
 
-#: apply.c:1834
+#: apply.c
 #, c-format
 msgid "deleted file %s still has contents"
 msgstr "刪除的檔案 %s 仍有內容"
 
-#: apply.c:1837
+#: apply.c
 #, c-format
 msgid "** warning: file %s becomes empty but is not deleted"
 msgstr "** 警告：檔案 %s 成為空檔案但並未刪除"
 
-#: apply.c:1985
+#: apply.c
 #, c-format
 msgid "corrupt binary patch at line %d: %.*s"
 msgstr "二進位修補檔在第 %d 行損壞：%.*s"
 
-#: apply.c:2022
+#: apply.c
 #, c-format
 msgid "unrecognized binary patch at line %d"
 msgstr "無法識別的二進位修補檔位於第 %d 行"
 
-#: apply.c:2184
+#: apply.c
 #, c-format
 msgid "patch with only garbage at line %d"
 msgstr "修補檔案的第 %d 行只有垃圾資料"
 
-#: apply.c:2270
+#: apply.c
 #, c-format
 msgid "unable to read symlink %s"
 msgstr "無法讀取符號連結 %s"
 
-#: apply.c:2274
+#: apply.c
 #, c-format
 msgid "unable to open or read %s"
 msgstr "不能開啟或讀取 %s"
 
-#: apply.c:2943
+#: apply.c
 #, c-format
 msgid "invalid start of line: '%c'"
 msgstr "無效的行首字元：'%c'"
 
-#: apply.c:3064
+#: apply.c
 #, 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:3076
+#: apply.c
 #, c-format
 msgid "Context reduced to (%ld/%ld) to apply fragment at %d"
 msgstr "上下文減少到（%ld/%ld）以在第 %d 行套用修補檔區塊"
 
-#: apply.c:3082
+#: apply.c
 #, c-format
 msgid ""
 "while searching for:\n"
@@ -1063,641 +1035,646 @@ msgstr ""
 "當查詢：\n"
 "%.*s"
 
-#: apply.c:3104
+#: apply.c
 #, c-format
 msgid "missing binary patch data for '%s'"
 msgstr "缺少 '%s' 的二進位修補檔資料"
 
-#: apply.c:3112
+#: apply.c
 #, c-format
 msgid "cannot reverse-apply a binary patch without the reverse hunk to '%s'"
 msgstr "不能反向套用一個缺少到 '%s' 的反向資料區塊的二進位修補檔"
 
-#: apply.c:3159
+#: apply.c
 #, c-format
 msgid "cannot apply binary patch to '%s' without full index line"
 msgstr "不能在 '%s' 上套用沒有完整索引行的二進位修補檔"
 
-#: apply.c:3170
+#: apply.c
 #, c-format
 msgid ""
 "the patch applies to '%s' (%s), which does not match the current contents."
 msgstr "修補檔套用到 '%s'（%s），但是和目前內容不符合。"
 
-#: apply.c:3178
+#: apply.c
 #, c-format
 msgid "the patch applies to an empty '%s' but it is not empty"
 msgstr "修補檔套用到空檔案 '%s'，但其並非空檔案"
 
-#: apply.c:3196
+#: apply.c
 #, c-format
 msgid "the necessary postimage %s for '%s' cannot be read"
 msgstr "無法讀取 '%2$s' 必需的目標檔案 %1$s"
 
-#: apply.c:3209
+#: apply.c
 #, c-format
 msgid "binary patch does not apply to '%s'"
 msgstr "二進位修補檔未套用到 '%s'"
 
-#: apply.c:3216
+#: apply.c
 #, c-format
 msgid "binary patch to '%s' creates incorrect result (expecting %s, got %s)"
 msgstr "到 '%s' 的二進位修補檔產生了不正確的結果（應為 %s，卻為 %s）"
 
-#: apply.c:3237
+#: apply.c
 #, c-format
 msgid "patch failed: %s:%ld"
 msgstr "打修補檔失敗：%s:%ld"
 
-#: apply.c:3360
+#: apply.c
 #, c-format
 msgid "cannot checkout %s"
 msgstr "不能簽出 %s"
 
-#: apply.c:3412 apply.c:3423 apply.c:3469 midx.c:105 pack-revindex.c:214
-#: setup.c:310
+#: apply.c midx.c pack-mtimes.c pack-revindex.c setup.c
 #, c-format
 msgid "failed to read %s"
 msgstr "無法讀取 %s"
 
-#: apply.c:3420
+#: apply.c
 #, c-format
 msgid "reading from '%s' beyond a symbolic link"
 msgstr "讀取位於符號連結中的 '%s'"
 
-#: apply.c:3449 apply.c:3721
+#: apply.c
 #, c-format
 msgid "path %s has been renamed/deleted"
 msgstr "路徑 %s 已經被重新命名/刪除"
 
-#: apply.c:3559 apply.c:3736
+#: apply.c
 #, c-format
 msgid "%s: does not exist in index"
 msgstr "%s：不存在於索引中"
 
-#: apply.c:3568 apply.c:3744 apply.c:3960
+#: apply.c
 #, c-format
 msgid "%s: does not match index"
 msgstr "%s：和索引不符合"
 
-#: apply.c:3605
+#: apply.c
 msgid "repository lacks the necessary blob to perform 3-way merge."
 msgstr "版本庫缺少用來進行三方合併所需要的資料物件。"
 
-#: apply.c:3608
+#: apply.c
 #, c-format
 msgid "Performing three-way merge...\n"
 msgstr "正在進行三方合併⋯⋯\n"
 
-#: apply.c:3624 apply.c:3628
+#: apply.c
 #, c-format
 msgid "cannot read the current contents of '%s'"
 msgstr "無法讀取 '%s' 的目前內容"
 
-#: apply.c:3640
+#: apply.c
 #, c-format
 msgid "Failed to perform three-way merge...\n"
 msgstr "無法進行三方合併⋯⋯\n"
 
-#: apply.c:3654
+#: apply.c
 #, c-format
 msgid "Applied patch to '%s' with conflicts.\n"
 msgstr "套用修補檔到 '%s' 存在衝突。\n"
 
-#: apply.c:3659
+#: apply.c
 #, c-format
 msgid "Applied patch to '%s' cleanly.\n"
 msgstr "成功套用修補檔到 '%s'。\n"
 
-#: apply.c:3676
+#: apply.c
 #, c-format
 msgid "Falling back to direct application...\n"
 msgstr "回復至直接套用模式⋯⋯\n"
 
-#: apply.c:3688
+#: apply.c
 msgid "removal patch leaves file contents"
 msgstr "移除修補檔仍留下了檔案內容"
 
-#: apply.c:3761
+#: apply.c
 #, c-format
 msgid "%s: wrong type"
 msgstr "%s：錯誤類型"
 
-#: apply.c:3763
+#: apply.c
 #, c-format
 msgid "%s has type %o, expected %o"
 msgstr "%s 的類型是 %o，應為 %o"
 
-#: apply.c:3900 apply.c:3902 read-cache.c:903 read-cache.c:932
-#: read-cache.c:1399
+#: apply.c read-cache.c
 #, c-format
 msgid "invalid path '%s'"
 msgstr "無效路徑 '%s'"
 
-#: apply.c:3958
+#: apply.c
 #, c-format
 msgid "%s: already exists in index"
 msgstr "%s：已經存在於索引中"
 
-#: apply.c:3962
+#: apply.c
 #, c-format
 msgid "%s: already exists in working directory"
 msgstr "%s：已經存在於工作區中"
 
-#: apply.c:3982
+#: apply.c
 #, c-format
 msgid "new mode (%o) of %s does not match old mode (%o)"
 msgstr "%2$s 的新模式（%1$o）和舊模式（%3$o）不符合"
 
-#: apply.c:3987
+#: apply.c
 #, 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:4007
+#: apply.c
 #, c-format
 msgid "affected file '%s' is beyond a symbolic link"
 msgstr "受影響的檔案 '%s' 位於符號連結中"
 
-#: apply.c:4011
+#: apply.c
 #, c-format
 msgid "%s: patch does not apply"
 msgstr "%s：修補檔未套用"
 
-#: apply.c:4026
+#: apply.c
 #, c-format
 msgid "Checking patch %s..."
 msgstr "正在檢查修補檔 %s..."
 
-#: apply.c:4118
+#: apply.c
 #, c-format
 msgid "sha1 information is lacking or useless for submodule %s"
 msgstr "子模組 %s 的 sha1 訊息缺少或無效"
 
-#: apply.c:4125
+#: apply.c
 #, c-format
 msgid "mode change for %s, which is not in current HEAD"
 msgstr "%s 的模式變更，但它不在目前 HEAD 中"
 
-#: apply.c:4128
+#: apply.c
 #, c-format
 msgid "sha1 information is lacking or useless (%s)."
 msgstr "sha1 訊息缺少或無效（%s）。"
 
-#: apply.c:4137
+#: apply.c
 #, c-format
 msgid "could not add %s to temporary index"
 msgstr "不能在暫時索引中新增 %s"
 
-#: apply.c:4147
+#: apply.c
 #, c-format
 msgid "could not write temporary index to %s"
 msgstr "不能把暫時索引寫入到 %s"
 
-#: apply.c:4285
+#: apply.c
 #, c-format
 msgid "unable to remove %s from index"
 msgstr "不能從索引中移除 %s"
 
-#: apply.c:4319
+#: apply.c
 #, c-format
 msgid "corrupt patch for submodule %s"
 msgstr "子模組 %s 損壞的修補檔"
 
-#: apply.c:4325
+#: apply.c
 #, c-format
 msgid "unable to stat newly created file '%s'"
 msgstr "不能對建立檔案 '%s' 呼叫 stat"
 
-#: apply.c:4333
+#: apply.c
 #, c-format
 msgid "unable to create backing store for newly created file %s"
 msgstr "不能為建立檔案 %s 建立後端儲存"
 
-#: apply.c:4339 apply.c:4484
+#: apply.c
 #, c-format
 msgid "unable to add cache entry for %s"
 msgstr "無法為 %s 新增快取條目"
 
-#: apply.c:4382 builtin/bisect--helper.c:540 builtin/gc.c:2258
-#: builtin/gc.c:2293
+#: apply.c builtin/bisect--helper.c builtin/gc.c
 #, c-format
 msgid "failed to write to '%s'"
 msgstr "寫入 '%s' 失敗"
 
-#: apply.c:4386
+#: apply.c
 #, c-format
 msgid "closing file '%s'"
 msgstr "關閉檔案 '%s'"
 
-#: apply.c:4456
+#: apply.c
 #, c-format
 msgid "unable to write file '%s' mode %o"
 msgstr "不能寫入檔案 '%s' 權限 %o"
 
-#: apply.c:4554
+#: apply.c
 #, c-format
 msgid "Applied patch %s cleanly."
 msgstr "成功套用修補檔 %s。"
 
-#: apply.c:4562
+#: apply.c
 msgid "internal error"
 msgstr "內部錯誤"
 
-#: apply.c:4565
+#: apply.c
 #, c-format
 msgid "Applying patch %%s with %d reject..."
 msgid_plural "Applying patch %%s with %d rejects..."
 msgstr[0] "套用 %%s 個修補檔，其中 %d 個被拒絕..."
 
-#: apply.c:4576
+#: apply.c
 #, c-format
 msgid "truncating .rej filename to %.*s.rej"
 msgstr "截短 .rej 檔案名為 %.*s.rej"
 
-#: apply.c:4584
+#: apply.c
 #, c-format
 msgid "cannot open %s"
 msgstr "不能開啟 %s"
 
-#: apply.c:4598
+#: apply.c
 #, c-format
 msgid "Hunk #%d applied cleanly."
 msgstr "成功套用第 #%d 個區塊。"
 
-#: apply.c:4602
+#: apply.c
 #, c-format
 msgid "Rejected hunk #%d."
 msgstr "拒絕第 #%d 個區塊。"
 
-#: apply.c:4731
+#: apply.c
 #, c-format
 msgid "Skipped patch '%s'."
 msgstr "略過修補檔 '%s'。"
 
-#: apply.c:4740
+#: apply.c
 msgid "No valid patches in input (allow with \"--allow-empty\")"
 msgstr "輸入中沒有有效的修補檔內容（傳入「--allow-empty」允許）"
 
-#: apply.c:4761
+#: apply.c
 msgid "unable to read index file"
 msgstr "無法讀取索引檔案"
 
-#: apply.c:4918
+#: apply.c
 #, c-format
 msgid "can't open patch '%s': %s"
 msgstr "不能開啟修補檔 '%s'：%s"
 
-#: apply.c:4945
+#: apply.c
 #, c-format
 msgid "squelched %d whitespace error"
 msgid_plural "squelched %d whitespace errors"
 msgstr[0] "抑制下仍有 %d 個空白字元誤用"
 
-#: apply.c:4951 apply.c:4966
+#: apply.c
 #, c-format
 msgid "%d line adds whitespace errors."
 msgid_plural "%d lines add whitespace errors."
 msgstr[0] "%d 行新增了空白字元誤用。"
 
-#: apply.c:4959
+#: apply.c
 #, c-format
 msgid "%d line applied after fixing whitespace errors."
 msgid_plural "%d lines applied after fixing whitespace errors."
 msgstr[0] "修復空白錯誤後，套用了 %d 行。"
 
-#: apply.c:4975 builtin/add.c:690 builtin/mv.c:338 builtin/rm.c:430
+#: apply.c builtin/add.c builtin/mv.c builtin/rm.c
 msgid "Unable to write new index file"
 msgstr "無法寫入新索引檔案"
 
-#: apply.c:5003
+#: apply.c
 msgid "don't apply changes matching the given path"
 msgstr "不要套用符合提供路徑的變更"
 
-#: apply.c:5006
+#: apply.c
 msgid "apply changes matching the given path"
 msgstr "套用符合提供路徑的變更"
 
-#: apply.c:5008 builtin/am.c:2379
+#: apply.c builtin/am.c
 msgid "num"
 msgstr "數字"
 
-#: apply.c:5009
+#: apply.c
 msgid "remove <num> leading slashes from traditional diff paths"
 msgstr "從傳統的 diff 路徑中移除指定數量的前導斜線"
 
-#: apply.c:5012
+#: apply.c
 msgid "ignore additions made by the patch"
 msgstr "忽略修補檔中的新增的檔案"
 
-#: apply.c:5014
+#: apply.c
 msgid "instead of applying the patch, output diffstat for the input"
 msgstr "不套用修補檔，而是顯示輸入的差異統計（diffstat）"
 
-#: apply.c:5018
+#: apply.c
 msgid "show number of added and deleted lines in decimal notation"
 msgstr "以十進位數顯示新增和刪除的行數"
 
-#: apply.c:5020
+#: apply.c
 msgid "instead of applying the patch, output a summary for the input"
 msgstr "不套用修補檔，而是顯示輸入的概要"
 
-#: apply.c:5022
+#: apply.c
 msgid "instead of applying the patch, see if the patch is applicable"
 msgstr "不套用修補檔，而是檢視修補檔是否可套用"
 
-#: apply.c:5024
+#: apply.c
 msgid "make sure the patch is applicable to the current index"
 msgstr "確認修補檔可以套用到目前索引"
 
-#: apply.c:5026
+#: apply.c
 msgid "mark new files with `git add --intent-to-add`"
 msgstr "使用指令 `git add --intent-to-add` 標記新增檔案"
 
-#: apply.c:5028
+#: apply.c
 msgid "apply a patch without touching the working tree"
 msgstr "套用修補檔而不修改工作區"
 
-#: apply.c:5030
+#: apply.c
 msgid "accept a patch that touches outside the working area"
 msgstr "接受修改工作區之外檔案的修補檔"
 
-#: apply.c:5033
+#: apply.c
 msgid "also apply the patch (use with --stat/--summary/--check)"
 msgstr "還套用此修補檔（與 --stat/--summary/--check 選項同時使用）"
 
-#: apply.c:5035
+#: apply.c
 msgid "attempt three-way merge, fall back on normal patch if that fails"
 msgstr "嘗試三方合併。如果失敗，則回到正常修補檔 (patch) 模式"
 
-#: apply.c:5037
+#: apply.c
 msgid "build a temporary index based on embedded index information"
 msgstr "建立一個暫時索引基於嵌入的索引訊息"
 
-#: apply.c:5040 builtin/checkout-index.c:230
+#: apply.c builtin/checkout-index.c
 msgid "paths are separated with NUL character"
 msgstr "路徑以 NUL 字元分隔"
 
-#: apply.c:5042
+#: apply.c
 msgid "ensure at least <n> lines of context match"
 msgstr "確保至少符合 <n> 行上下文"
 
-#: apply.c:5043 builtin/am.c:2355 builtin/am.c:2358
-#: builtin/interpret-trailers.c:98 builtin/interpret-trailers.c:100
-#: builtin/interpret-trailers.c:102 builtin/pack-objects.c:3983
-#: builtin/rebase.c:1079
+#: apply.c builtin/am.c builtin/interpret-trailers.c builtin/pack-objects.c
+#: builtin/rebase.c
 msgid "action"
 msgstr "動作"
 
-#: apply.c:5044
+#: apply.c
 msgid "detect new or modified lines that have whitespace errors"
 msgstr "檢查新增和修改的行中間的空白字元濫用"
 
-#: apply.c:5047 apply.c:5050
+#: apply.c
 msgid "ignore changes in whitespace when finding context"
 msgstr "尋找上下文時忽略空白字元的變更"
 
-#: apply.c:5053
+#: apply.c
 msgid "apply the patch in reverse"
 msgstr "反向套用修補檔"
 
-#: apply.c:5055
+#: apply.c
 msgid "don't expect at least one line of context"
 msgstr "無需至少一行上下文"
 
-#: apply.c:5057
+#: apply.c
 msgid "leave the rejected hunks in corresponding *.rej files"
 msgstr "將拒絕的修補檔區塊儲存在對應的 *.rej 檔案中"
 
-#: apply.c:5059
+#: apply.c
 msgid "allow overlapping hunks"
 msgstr "允許重疊的修補檔區塊"
 
-#: apply.c:5062
+#: apply.c
 msgid "tolerate incorrectly detected missing new-line at the end of file"
 msgstr "允許不正確的檔案末尾換行符號"
 
-#: apply.c:5065
+#: apply.c
 msgid "do not trust the line counts in the hunk headers"
 msgstr "不信任修補檔區塊的標頭訊息中的行號"
 
-#: apply.c:5067 builtin/am.c:2367
+#: apply.c builtin/am.c
 msgid "root"
 msgstr "根目錄"
 
-#: apply.c:5068
+#: apply.c
 msgid "prepend <root> to all filenames"
 msgstr "為所有檔案名前新增 <根目錄>"
 
-#: apply.c:5071
+#: apply.c
 msgid "don't return error for empty patches"
 msgstr "遇到空白修補檔時不回傳錯誤"
 
-#: archive-tar.c:125 archive-zip.c:346
+#: archive-tar.c archive-zip.c
 #, c-format
 msgid "cannot stream blob %s"
 msgstr "不能開啟資料物件 %s"
 
-#: archive-tar.c:265 archive-zip.c:359
+#: archive-tar.c archive-zip.c
 #, c-format
 msgid "unsupported file mode: 0%o (SHA1: %s)"
 msgstr "不支援的檔案模式：0%o (SHA1: %s)"
 
-#: archive-tar.c:447
+#: archive-tar.c
 #, c-format
 msgid "unable to start '%s' filter"
 msgstr "無法啟動 '%s' 過濾器"
 
-#: archive-tar.c:450
+#: archive-tar.c
 msgid "unable to redirect descriptor"
 msgstr "無法重定向描述符"
 
-#: archive-tar.c:457
+#: archive-tar.c
 #, c-format
 msgid "'%s' filter reported error"
 msgstr "'%s' 過濾器報告了錯誤"
 
-#: archive-zip.c:319
+#: archive-zip.c
 #, c-format
 msgid "path is not valid UTF-8: %s"
 msgstr "路徑不是有效的 UTF-8：%s"
 
-#: archive-zip.c:323
+#: archive-zip.c
 #, c-format
 msgid "path too long (%d chars, SHA1: %s): %s"
 msgstr "路徑太長（%d 字元，SHA1：%s）：%s"
 
-#: archive-zip.c:470 builtin/pack-objects.c:363 builtin/pack-objects.c:366
+#: archive-zip.c builtin/pack-objects.c
 #, c-format
 msgid "deflate error (%d)"
 msgstr "壓縮錯誤 (%d)"
 
-#: archive-zip.c:604
+#: archive-zip.c
 #, c-format
 msgid "timestamp too large for this system: %<PRIuMAX>"
 msgstr "對於本系統時間戳太大：%<PRIuMAX>"
 
-#: archive.c:14
+#: archive.c
 msgid "git archive [<options>] <tree-ish> [<path>...]"
 msgstr "git archive [<選項>] <樹或提交> [<路徑>...]"
 
-#: archive.c:16
+#: archive.c
 msgid ""
 "git archive --remote <repo> [--exec <cmd>] [<options>] <tree-ish> [<path>...]"
 msgstr ""
 "git archive --remote <版本庫> [--exec <命令>] [<選項>] <樹或提交> [<路徑>...]"
 
-#: archive.c:17
+#: archive.c
 msgid "git archive --remote <repo> [--exec <cmd>] --list"
 msgstr "git archive --remote <版本庫> [--exec <命令>] --list"
 
-#: archive.c:188 archive.c:341 builtin/gc.c:497 builtin/notes.c:238
-#: builtin/tag.c:579
+#: archive.c builtin/gc.c builtin/notes.c builtin/tag.c
 #, c-format
 msgid "cannot read '%s'"
 msgstr "不能讀取 '%s'"
 
-#: archive.c:426 builtin/add.c:214 builtin/add.c:657 builtin/rm.c:334
+#: archive.c builtin/add.c builtin/rm.c
 #, c-format
 msgid "pathspec '%s' did not match any files"
 msgstr "路徑規格 '%s' 未符合任何檔案"
 
-#: archive.c:450
+#: archive.c
 #, c-format
 msgid "no such ref: %.*s"
 msgstr "無此引用：%.*s"
 
-#: archive.c:456
+#: archive.c
 #, c-format
 msgid "not a valid object name: %s"
 msgstr "不是一個有效的物件名：%s"
 
-#: archive.c:469
+#: archive.c
 #, c-format
 msgid "not a tree object: %s"
 msgstr "不是一個樹狀物件：%s"
 
-#: archive.c:481
+#: archive.c
 msgid "current working directory is untracked"
 msgstr "目前工作目錄未被追蹤"
 
-#: archive.c:522
+#: archive.c
 #, c-format
 msgid "File not found: %s"
 msgstr "找不到檔案：%s"
 
-#: archive.c:524
+#: archive.c
 #, c-format
 msgid "Not a regular file: %s"
 msgstr "不是一般檔案：%s"
 
-#: archive.c:551
+#: archive.c
+#, c-format
+msgid "unclosed quote: '%s'"
+msgstr "未閉合的引號：「%s」"
+
+#: archive.c
+#, c-format
+msgid "missing colon: '%s'"
+msgstr "缺少冒號：「%s」"
+
+#: archive.c
+#, c-format
+msgid "empty file name: '%s'"
+msgstr "檔案名稱空白：「%s」"
+
+#: archive.c
 msgid "fmt"
 msgstr "格式"
 
-#: archive.c:551
+#: archive.c
 msgid "archive format"
 msgstr "歸檔格式"
 
-#: archive.c:552 builtin/log.c:1809
+#: archive.c builtin/log.c
 msgid "prefix"
 msgstr "前綴"
 
-#: archive.c:553
+#: archive.c
 msgid "prepend prefix to each pathname in the archive"
 msgstr "為歸檔中每個路徑名加上前綴"
 
-#: archive.c:554 archive.c:557 builtin/blame.c:881 builtin/blame.c:885
-#: builtin/blame.c:886 builtin/commit-tree.c:115 builtin/config.c:135
-#: builtin/fast-export.c:1181 builtin/fast-export.c:1183
-#: builtin/fast-export.c:1187 builtin/grep.c:936 builtin/hash-object.c:104
-#: builtin/ls-files.c:654 builtin/ls-files.c:657 builtin/notes.c:410
-#: builtin/notes.c:576 builtin/read-tree.c:115 parse-options.h:195
+#: archive.c builtin/blame.c builtin/commit-tree.c builtin/config.c
+#: builtin/fast-export.c builtin/grep.c builtin/hash-object.c
+#: builtin/ls-files.c builtin/notes.c builtin/read-tree.c parse-options.h
 msgid "file"
 msgstr "檔案"
 
-#: archive.c:555
+#: archive.c
 msgid "add untracked file to archive"
 msgstr "將未追蹤檔案加入歸檔"
 
-#: archive.c:558 builtin/archive.c:88
+#: archive.c
+msgid "path:content"
+msgstr "路徑:內容"
+
+#: archive.c builtin/archive.c
 msgid "write the archive to this file"
 msgstr "歸檔寫入此檔案"
 
-#: archive.c:560
+#: archive.c
 msgid "read .gitattributes in working directory"
 msgstr "讀取工作區中的 .gitattributes"
 
-#: archive.c:561
+#: archive.c
 msgid "report archived files on stderr"
 msgstr "在標準錯誤上報告歸檔檔案"
 
-#: archive.c:563
+#: archive.c
 msgid "set compression level"
 msgstr "設定壓縮級別"
 
-#: archive.c:566
+#: archive.c
 msgid "list supported archive formats"
 msgstr "列出支援的歸檔格式"
 
-#: archive.c:568 builtin/archive.c:89 builtin/clone.c:122 builtin/clone.c:125
-#: builtin/submodule--helper.c:1884 builtin/submodule--helper.c:2718
+#: archive.c builtin/archive.c builtin/clone.c builtin/submodule--helper.c
 msgid "repo"
 msgstr "版本庫"
 
-#: archive.c:569 builtin/archive.c:90
+#: archive.c builtin/archive.c
 msgid "retrieve the archive from remote repository <repo>"
 msgstr "從遠端版本庫（<版本庫>）擷取歸檔檔案"
 
-#: archive.c:570 builtin/archive.c:91 builtin/difftool.c:708
-#: builtin/notes.c:496
+#: archive.c builtin/archive.c builtin/difftool.c builtin/notes.c
 msgid "command"
 msgstr "指令"
 
-#: archive.c:571 builtin/archive.c:92
+#: archive.c builtin/archive.c
 msgid "path to the remote git-upload-archive command"
 msgstr "遠端 git-upload-archive 指令的路徑"
 
-#: archive.c:578
+#: archive.c
 msgid "Unexpected option --remote"
 msgstr "未知參數 --remote"
 
-#: archive.c:580 fetch-pack.c:300 revision.c:2914 builtin/add.c:530
-#: builtin/add.c:562 builtin/checkout.c:1782 builtin/clone.c:1099
-#: builtin/clone.c:1102 builtin/commit.c:371 builtin/fast-export.c:1230
-#: builtin/index-pack.c:1854 builtin/log.c:2140 builtin/reset.c:442
-#: builtin/reset.c:500 builtin/rm.c:281 builtin/stash.c:1708
-#: builtin/worktree.c:580 builtin/worktree.c:781 http-fetch.c:144
-#: http-fetch.c:153
+#: archive.c builtin/add.c builtin/checkout.c builtin/clone.c builtin/commit.c
+#: builtin/fast-export.c builtin/index-pack.c builtin/log.c builtin/reset.c
+#: builtin/rm.c builtin/stash.c builtin/worktree.c fetch-pack.c http-fetch.c
+#: revision.c
 #, c-format
 msgid "the option '%s' requires '%s'"
 msgstr "「%s」選項需要「%s」"
 
-#: archive.c:582
+#: archive.c
 msgid "Unexpected option --output"
 msgstr "未知參數 --output"
 
-#: archive.c:606
+#: archive.c
 #, c-format
 msgid "Unknown archive format '%s'"
 msgstr "未知歸檔格式 '%s'"
 
-#: archive.c:615
+#: archive.c
 #, c-format
 msgid "Argument not supported for format '%s': -%d"
 msgstr "參數不支援此格式 '%s'：-%d"
 
-#: attr.c:202
+#: attr.c
 #, c-format
 msgid "%.*s is not a valid attribute name"
 msgstr "%.*s 不是一個有效的屬性名"
 
-#: attr.c:363
+#: attr.c
 #, c-format
 msgid "%s not allowed: %s:%d"
 msgstr "不允許 %s：%s:%d"
 
-#: attr.c:403
+#: attr.c
 msgid ""
 "Negative patterns are ignored in git attributes\n"
 "Use '\\!' for literal leading exclamation."
@@ -1705,22 +1682,22 @@ msgstr ""
 "反向模式在 git attributes 中被忽略\n"
 "當字串確定要以驚嘆號開始時，使用 '\\!'。"
 
-#: bisect.c:488
+#: bisect.c
 #, c-format
 msgid "Badly quoted content in file '%s': %s"
 msgstr "檔案 '%s' 包含錯誤的引用格式：%s"
 
-#: bisect.c:698
+#: bisect.c
 #, c-format
 msgid "We cannot bisect more!\n"
 msgstr "我們無法進行更多的二分搜尋！\n"
 
-#: bisect.c:765
+#: bisect.c
 #, c-format
 msgid "Not a valid commit name %s"
 msgstr "不是一個有效的提交名 %s"
 
-#: bisect.c:790
+#: bisect.c
 #, c-format
 msgid ""
 "The merge base %s is bad.\n"
@@ -1729,7 +1706,7 @@ msgstr ""
 "合併基礎 %s 是壞的。\n"
 "這意味著介於 %s 和 [%s] 之間的 bug 已經被修復。\n"
 
-#: bisect.c:795
+#: bisect.c
 #, c-format
 msgid ""
 "The merge base %s is new.\n"
@@ -1738,7 +1715,7 @@ msgstr ""
 "合併基礎 %s 是新的。\n"
 "介於 %s 和 [%s] 之間的屬性已經被修改。\n"
 
-#: bisect.c:800
+#: bisect.c
 #, c-format
 msgid ""
 "The merge base %s is %s.\n"
@@ -1747,7 +1724,7 @@ msgstr ""
 "合併基礎 %s 是 %s。\n"
 "這意味著第一個 '%s' 提交位於 %s 和 [%s] 之間。\n"
 
-#: bisect.c:808
+#: bisect.c
 #, c-format
 msgid ""
 "Some %s revs are not ancestors of the %s rev.\n"
@@ -1758,7 +1735,7 @@ msgstr ""
 "這種情況下 git 二分搜尋無法正常工作。\n"
 "您可能弄錯了 %s 和 %s 版本？\n"
 
-#: bisect.c:821
+#: bisect.c
 #, c-format
 msgid ""
 "the merge base between %s and [%s] must be skipped.\n"
@@ -1769,36 +1746,36 @@ msgstr ""
 "所以我們無法確認第一個 %s 提交是否介於 %s 和 %s 之間。\n"
 "我們仍舊繼續。"
 
-#: bisect.c:860
+#: bisect.c
 #, c-format
 msgid "Bisecting: a merge base must be tested\n"
 msgstr "二分搜尋中：合併基礎必須是經過測試的\n"
 
-#: bisect.c:910
+#: bisect.c
 #, c-format
 msgid "a %s revision is needed"
 msgstr "需要一個 %s 版本"
 
-#: bisect.c:940
+#: bisect.c
 #, c-format
 msgid "could not create file '%s'"
 msgstr "不能建立檔案 '%s'"
 
-#: bisect.c:986 builtin/merge.c:155
+#: bisect.c builtin/merge.c
 #, c-format
 msgid "could not read file '%s'"
 msgstr "不能讀取檔案 '%s'"
 
-#: bisect.c:1026
+#: bisect.c
 msgid "reading bisect refs failed"
 msgstr "讀取二分搜尋引用失敗"
 
-#: bisect.c:1056
+#: bisect.c
 #, c-format
 msgid "%s was both %s and %s\n"
 msgstr "%s 同時為 %s 和 %s\n"
 
-#: bisect.c:1065
+#: bisect.c
 #, c-format
 msgid ""
 "No testable commit found.\n"
@@ -1807,7 +1784,7 @@ msgstr ""
 "沒找到能夠測試的提交。\n"
 "可能是執行傳入的路徑引數是錯誤的？\n"
 
-#: bisect.c:1094
+#: bisect.c
 #, c-format
 msgid "(roughly %d step)"
 msgid_plural "(roughly %d steps)"
@@ -1816,79 +1793,76 @@ msgstr[0] "（大概 %d 步）"
 #. TRANSLATORS: the last %s will be replaced with "(roughly %d
 #. steps)" translation.
 #.
-#: bisect.c:1100
+#: bisect.c
 #, 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"
 msgstr[0] "二分搜尋中：在此之後，還剩 %d 個版本待測試 %s\n"
 
-#: blame.c:2773
+#: blame.c
 msgid "--contents and --reverse do not blend well."
 msgstr "--contents 和 --reverse 不能混用。"
 
-#: blame.c:2787
+#: blame.c
 msgid "cannot use --contents with final commit object name"
 msgstr "不能將 --contents 和最終的提交物件名共用"
 
-#: blame.c:2808
+#: blame.c
 msgid "--reverse and --first-parent together require specified latest commit"
 msgstr "--reverse 和 --first-parent 共用，需要指定最新的提交"
 
-#: blame.c:2817 bundle.c:231 midx.c:1058 ref-filter.c:2371 remote.c:2157
-#: sequencer.c:2348 sequencer.c:4872 submodule.c:913 builtin/commit.c:1118
-#: builtin/log.c:437 builtin/log.c:1055 builtin/log.c:1663 builtin/log.c:2096
-#: builtin/log.c:2387 builtin/merge.c:431 builtin/pack-objects.c:3381
-#: builtin/pack-objects.c:3781 builtin/pack-objects.c:3796
-#: builtin/shortlog.c:255
+#: blame.c builtin/commit.c builtin/log.c builtin/merge.c
+#: builtin/pack-objects.c builtin/shortlog.c bundle.c midx.c ref-filter.c
+#: remote.c sequencer.c submodule.c
 msgid "revision walk setup failed"
 msgstr "版本遍歷設定失敗"
 
-#: blame.c:2835
+#: blame.c
 msgid ""
 "--reverse --first-parent together require range along first-parent chain"
 msgstr "--reverse 和 --first-parent 共用，需要第一祖先鏈上的提交範圍"
 
-#: blame.c:2846
+#: blame.c
 #, c-format
 msgid "no such path %s in %s"
 msgstr "在 %2$s 中無此路徑 %1$s"
 
-#: blame.c:2857
+#: blame.c
 #, c-format
 msgid "cannot read blob %s for path %s"
 msgstr "不能為路徑 %2$s 讀取資料物件 %1$s"
 
-#: branch.c:93
+#: branch.c
 msgid ""
 "cannot inherit upstream tracking configuration of multiple refs when "
 "rebasing is requested"
 msgstr "請求重定基底時，無法繼承多個參照的上游追蹤設定"
 
-#: branch.c:104
+#: branch.c
 #, c-format
 msgid "not setting branch '%s' as its own upstream"
 msgstr "未將「%s」分支設定為其自己的上游"
 
-#: branch.c:160
+#: branch.c
 #, c-format
 msgid "branch '%s' set up to track '%s' by rebasing."
 msgstr "已將「%s」分支設定為透過重定基底追蹤「%s」。"
 
-#: branch.c:161
+#: branch.c
 #, c-format
 msgid "branch '%s' set up to track '%s'."
 msgstr "已將「%s」分支設定為追蹤「%s」。"
 
-#: branch.c:164
+#: branch.c
 #, c-format
 msgid "branch '%s' set up to track:"
 msgstr "「%s」分支已設定追蹤："
 
-#: branch.c:176
+#: branch.c
 msgid "unable to write upstream branch configuration"
 msgstr "無法寫入上游分支設定"
 
-#: branch.c:178
+#: branch.c
 msgid ""
 "\n"
 "After fixing the error cause you may try to fix up\n"
@@ -1898,17 +1872,17 @@ msgstr ""
 "修正錯誤後，您可以執行下述命令\n"
 "命令修正遠端追蹤資訊："
 
-#: branch.c:219
+#: branch.c
 #, c-format
 msgid "asked to inherit tracking from '%s', but no remote is set"
 msgstr "請求繼承「%s」的追蹤設定，但未設定遠端"
 
-#: branch.c:225
+#: branch.c
 #, c-format
 msgid "asked to inherit tracking from '%s', but no merge configuration is set"
 msgstr "請求繼承「%s」的追蹤設定，但未設定合併設定"
 
-#: branch.c:277
+#: branch.c
 #, c-format
 msgid "not tracking: ambiguous information for ref '%s'"
 msgstr "未追蹤：「%s」引用有歧義"
@@ -1923,7 +1897,7 @@ msgstr "未追蹤：「%s」引用有歧義"
 #. you'll probably want to swap the "%s" and leading " " space
 #. around.
 #.
-#: branch.c:289 object-name.c:464
+#: branch.c object-name.c
 #, c-format
 msgid "  %s\n"
 msgstr "  %s\n"
@@ -1931,7 +1905,7 @@ msgstr "  %s\n"
 #. TRANSLATORS: The second argument is a \n-delimited list of
 #. duplicate refspecs, composed above.
 #.
-#: branch.c:295
+#: branch.c
 #, c-format
 msgid ""
 "There are multiple remotes whose fetch refspecs map to the remote\n"
@@ -1950,32 +1924,32 @@ msgstr ""
 "若要支援設定追蹤分支，請確定不同遠端的抓取引用規格\n"
 "映射到不同的追蹤命名空間。"
 
-#: branch.c:344
+#: branch.c
 #, c-format
 msgid "'%s' is not a valid branch name"
 msgstr "「%s」不是一個有效的分支名稱"
 
-#: branch.c:364
+#: branch.c
 #, c-format
 msgid "a branch named '%s' already exists"
 msgstr "已有同名「%s」分支"
 
-#: branch.c:370
+#: branch.c
 #, c-format
 msgid "cannot force update the branch '%s' checked out at '%s'"
 msgstr "無法強制更新在「%2$s」簽出的「%1$s」分支"
 
-#: branch.c:393
+#: branch.c
 #, c-format
 msgid "cannot set up tracking information; starting point '%s' is not a branch"
 msgstr "無法設定追蹤資訊：起始點「%s」不是分支"
 
-#: branch.c:395
+#: branch.c
 #, c-format
 msgid "the requested upstream branch '%s' does not exist"
 msgstr "請求的上游分支 '%s' 不存在"
 
-#: branch.c:397
+#: branch.c
 msgid ""
 "\n"
 "If you are planning on basing your work on an upstream\n"
@@ -1994,28 +1968,27 @@ msgstr ""
 "且建立兩個分支間的追蹤關係，\n"
 "您可能需要使用「git push -u」推送分支並設定和上游的關聯。"
 
-#: branch.c:445 builtin/replace.c:321 builtin/replace.c:377
-#: builtin/replace.c:423 builtin/replace.c:453
+#: branch.c builtin/replace.c
 #, c-format
 msgid "not a valid object name: '%s'"
 msgstr "不是一個有效的物件名：'%s'"
 
-#: branch.c:465
+#: branch.c
 #, c-format
 msgid "ambiguous object name: '%s'"
 msgstr "物件名稱有歧義：「%s」"
 
-#: branch.c:470
+#: branch.c
 #, c-format
 msgid "not a valid branch point: '%s'"
 msgstr "無效的分支點：「%s」"
 
-#: branch.c:658
+#: branch.c
 #, c-format
 msgid "submodule '%s': unable to find submodule"
 msgstr "「%s」子模組：找不到子模組"
 
-#: branch.c:661
+#: branch.c
 #, c-format
 msgid ""
 "You may try updating the submodules using 'git checkout %s && git submodule "
@@ -2024,8502 +1997,151 @@ msgstr ""
 "您可以嘗試使用「git checkout %s && git submodule update --init」命令更新子模"
 "組"
 
-#: branch.c:672 branch.c:698
+#: branch.c
 #, c-format
 msgid "submodule '%s': cannot create branch '%s'"
 msgstr "「%s」子模組：無法建立「%s」分支"
 
-#: branch.c:730
+#: branch.c
 #, c-format
 msgid "'%s' is already checked out at '%s'"
 msgstr "'%s' 已經簽出到 '%s'"
 
-#: branch.c:755
+#: branch.c
 #, c-format
 msgid "HEAD of working tree %s is not updated"
 msgstr "工作區 %s 的 HEAD 指向沒有被更新"
 
-#: bundle.c:45
-#, c-format
-msgid "unrecognized bundle hash algorithm: %s"
-msgstr "無法識別的套件雜湊演算法：%s"
-
-#: bundle.c:53
-#, c-format
-msgid "unknown capability '%s'"
-msgstr "未知功能 '%s'"
-
-#: bundle.c:79
-#, c-format
-msgid "'%s' does not look like a v2 or v3 bundle file"
-msgstr "'%s' 不像是一個 v2 或 v3 版本的套件檔案"
-
-#: bundle.c:118
-#, c-format
-msgid "unrecognized header: %s%s (%d)"
-msgstr "無法識別的包頭：%s%s (%d)"
-
-#: bundle.c:145 rerere.c:464 rerere.c:675 sequencer.c:2616 sequencer.c:3402
-#: builtin/commit.c:865
-#, c-format
-msgid "could not open '%s'"
-msgstr "不能開啟 '%s'"
-
-#: bundle.c:203
-msgid "Repository lacks these prerequisite commits:"
-msgstr "版本庫中缺少這些必備的提交："
-
-#: bundle.c:206
-msgid "need a repository to verify a bundle"
-msgstr "需要版本庫驗證套件"
-
-#: bundle.c:264
-#, c-format
-msgid "The bundle contains this ref:"
-msgid_plural "The bundle contains these %<PRIuMAX> refs:"
-msgstr[0] "這個套件含有這 %<PRIuMAX> 個引用："
-
-#: bundle.c:272
-msgid "The bundle records a complete history."
-msgstr "這個套件記錄完整歷史紀錄。"
-
-#: bundle.c:274
-#, c-format
-msgid "The bundle requires this ref:"
-msgid_plural "The bundle requires these %<PRIuMAX> refs:"
-msgstr[0] "這個套件需要這 %<PRIuMAX> 個引用："
-
-#: bundle.c:350
-msgid "unable to dup bundle descriptor"
-msgstr "無法複製套件描述符"
-
-#: bundle.c:357
-msgid "Could not spawn pack-objects"
-msgstr "不能生成 pack-objects 進程"
-
-#: bundle.c:368
-msgid "pack-objects died"
-msgstr "pack-objects 終止"
-
-#: bundle.c:417
-#, c-format
-msgid "ref '%s' is excluded by the rev-list options"
-msgstr "引用 '%s' 被 rev-list 選項排除"
-
-#: bundle.c:533 builtin/log.c:211 builtin/log.c:1975 builtin/shortlog.c:400
-#, c-format
-msgid "unrecognized argument: %s"
-msgstr "無法識別的參數：%s"
-
-#: bundle.c:548
-#, c-format
-msgid "unsupported bundle version %d"
-msgstr "不支援的套件版本 %d"
-
-#: bundle.c:550
-#, c-format
-msgid "cannot write bundle version %d with algorithm %s"
-msgstr "無法寫入 %2$s 演算法的套件版本 %1$d"
-
-#: bundle.c:600
-msgid "Refusing to create empty bundle."
-msgstr "不能建立空套件。"
-
-#: bundle.c:610
-#, c-format
-msgid "cannot create '%s'"
-msgstr "不能建立 '%s'"
-
-#: bundle.c:639
-msgid "index-pack died"
-msgstr "index-pack 終止"
-
-#: chunk-format.c:117
-msgid "terminating chunk id appears earlier than expected"
-msgstr "終止區塊 id 出現的時間早於預期"
-
-#: chunk-format.c:126
-#, c-format
-msgid "improper chunk offset(s) %<PRIx64> and %<PRIx64>"
-msgstr "不正確的區塊偏移 %<PRIx64> 及 %<PRIx64>"
-
-#: chunk-format.c:133
-#, c-format
-msgid "duplicate chunk ID %<PRIx32> found"
-msgstr "找到重複的區塊 ID %<PRIx32>"
-
-#: chunk-format.c:147
-#, c-format
-msgid "final chunk has non-zero id %<PRIx32>"
-msgstr "最終區塊有非零 ID %<PRIx32>"
-
-#: color.c:354
-#, c-format
-msgid "invalid color value: %.*s"
-msgstr "無效的顏色值：%.*s"
-
-#: commit-graph.c:204 midx.c:52
-msgid "invalid hash version"
-msgstr "無效的雜湊版本"
-
-#: commit-graph.c:262
-msgid "commit-graph file is too small"
-msgstr "提交圖形檔案太小"
-
-#: commit-graph.c:355
-#, c-format
-msgid "commit-graph signature %X does not match signature %X"
-msgstr "提交圖形簽名 %X 和簽名 %X 不符合"
-
-#: commit-graph.c:362
-#, c-format
-msgid "commit-graph version %X does not match version %X"
-msgstr "提交圖形版本 %X 和版本 %X 不符合"
-
-#: commit-graph.c:369
-#, c-format
-msgid "commit-graph hash version %X does not match version %X"
-msgstr "提交圖形雜湊版本 %X 和版本 %X 不符合"
-
-#: commit-graph.c:386
-#, c-format
-msgid "commit-graph file is too small to hold %u chunks"
-msgstr "commit-graph 檔案不夠放置 %u 個區塊"
-
-#: commit-graph.c:485
-msgid "commit-graph has no base graphs chunk"
-msgstr "提交圖形沒有基礎圖形區塊"
-
-#: commit-graph.c:495
-msgid "commit-graph chain does not match"
-msgstr "提交圖形鏈不符合"
-
-#: commit-graph.c:543
-#, c-format
-msgid "invalid commit-graph chain: line '%s' not a hash"
-msgstr "無效的提交圖形鏈：行 '%s' 不是一個雜湊值"
-
-#: commit-graph.c:567
-msgid "unable to find all commit-graph files"
-msgstr "無法找到所有提交圖形檔案"
-
-#: commit-graph.c:752 commit-graph.c:789
-msgid "invalid commit position. commit-graph is likely corrupt"
-msgstr "無效的提交位置。提交圖形可能已損壞"
-
-#: commit-graph.c:773
-#, c-format
-msgid "could not find commit %s"
-msgstr "無法找到提交 %s"
-
-#: commit-graph.c:806
-msgid "commit-graph requires overflow generation data but has none"
-msgstr "提交圖需要比目前更多的世代資料，但沒有相關資料"
-
-#: commit-graph.c:1111 builtin/am.c:1370 builtin/checkout.c:775
-#: builtin/clone.c:705
-#, c-format
-msgid "unable to parse commit %s"
-msgstr "不能解析提交 %s"
-
-#: commit-graph.c:1373 builtin/pack-objects.c:3078
-#, c-format
-msgid "unable to get type of object %s"
-msgstr "無法獲得物件 %s 類型"
-
-#: commit-graph.c:1404
-msgid "Loading known commits in commit graph"
-msgstr "正在載入提交圖中的已知提交"
-
-#: commit-graph.c:1421
-msgid "Expanding reachable commits in commit graph"
-msgstr "正在展開提交圖中的可以取得的提交"
-
-#: commit-graph.c:1441
-msgid "Clearing commit marks in commit graph"
-msgstr "正在清除提交圖中的提交標記"
-
-#: commit-graph.c:1460
-msgid "Computing commit graph topological levels"
-msgstr "正在計算提交圖拓樸級別"
-
-#: commit-graph.c:1513
-msgid "Computing commit graph generation numbers"
-msgstr "正在計算提交圖世代數字"
-
-#: commit-graph.c:1598
-msgid "Computing commit changed paths Bloom filters"
-msgstr "正在計算提交變更路徑的布隆過濾器"
-
-#: commit-graph.c:1675
-msgid "Collecting referenced commits"
-msgstr "正在收集引用提交"
-
-#: commit-graph.c:1701
-#, c-format
-msgid "Finding commits for commit graph in %<PRIuMAX> pack"
-msgid_plural "Finding commits for commit graph in %<PRIuMAX> packs"
-msgstr[0] "正在從 %<PRIuMAX> 個包中尋找提交圖的提交"
-
-#: commit-graph.c:1714
-#, c-format
-msgid "error adding pack %s"
-msgstr "新增包 %s 發生錯誤"
-
-#: commit-graph.c:1718
-#, c-format
-msgid "error opening index for %s"
-msgstr "為 %s 開啟索引發生錯誤"
-
-#: commit-graph.c:1756
-msgid "Finding commits for commit graph among packed objects"
-msgstr "正在打包物件中尋找提交圖的提交"
-
-#: commit-graph.c:1774
-msgid "Finding extra edges in commit graph"
-msgstr "正在尋找提交圖中額外的邊"
-
-#: commit-graph.c:1823
-msgid "failed to write correct number of base graph ids"
-msgstr "無法寫入正確數量的基礎圖形 ID"
-
-#: commit-graph.c:1854 midx.c:1168 builtin/sparse-checkout.c:475
-#, c-format
-msgid "unable to create leading directories of %s"
-msgstr "不能為 %s 建立先導目錄"
-
-#: commit-graph.c:1868
-msgid "unable to create temporary graph layer"
-msgstr "無法建立暫時的圖形層"
-
-#: commit-graph.c:1873
-#, c-format
-msgid "unable to adjust shared permissions for '%s'"
-msgstr "無法調整「%s」的共用權限"
-
-#: commit-graph.c:1930
-#, 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:1967
-msgid "unable to open commit-graph chain file"
-msgstr "無法開啟提交圖形鏈檔案"
-
-#: commit-graph.c:1983
-msgid "failed to rename base commit-graph file"
-msgstr "無法重新命名基礎提交圖形檔案"
-
-#: commit-graph.c:2004
-msgid "failed to rename temporary commit-graph file"
-msgstr "無法重新命名暫時提交圖形檔案"
-
-#: commit-graph.c:2137
-msgid "Scanning merged commits"
-msgstr "正在掃描合併提交"
-
-#: commit-graph.c:2181
-msgid "Merging commit-graph"
-msgstr "正在合併提交圖形"
-
-#: commit-graph.c:2289
-msgid "attempting to write a commit-graph, but 'core.commitGraph' is disabled"
-msgstr "嘗試寫入提交圖形，但 “core.commitGraph” 已被停用"
-
-#: commit-graph.c:2396
-msgid "too many commits to write graph"
-msgstr "提交太多不能畫圖"
-
-#: commit-graph.c:2494
-msgid "the commit-graph file has incorrect checksum and is likely corrupt"
-msgstr "提交圖檔案的總和檢查碼錯誤，可能已經損壞"
-
-#: commit-graph.c:2504
-#, c-format
-msgid "commit-graph has incorrect OID order: %s then %s"
-msgstr "提交圖形的物件 ID 順序不正確：%s 然後 %s"
-
-#: commit-graph.c:2514 commit-graph.c:2529
-#, c-format
-msgid "commit-graph has incorrect fanout value: fanout[%d] = %u != %u"
-msgstr "提交圖形有不正確的扇出值：fanout[%d] = %u != %u"
-
-#: commit-graph.c:2521
-#, c-format
-msgid "failed to parse commit %s from commit-graph"
-msgstr "無法從提交圖形中解析提交 %s"
-
-#: commit-graph.c:2539
-msgid "Verifying commits in commit graph"
-msgstr "正在驗證提交圖中的提交"
-
-#: commit-graph.c:2554
-#, c-format
-msgid "failed to parse commit %s from object database for commit-graph"
-msgstr "無法從提交圖形的物件庫中解析提交 %s"
-
-#: commit-graph.c:2561
-#, c-format
-msgid "root tree OID for commit %s in commit-graph is %s != %s"
-msgstr "提交圖形中的提交 %s 的根樹狀物件 ID 是 %s != %s"
-
-#: commit-graph.c:2571
-#, c-format
-msgid "commit-graph parent list for commit %s is too long"
-msgstr "提交 %s 的提交圖形父提交列表太長了"
-
-#: commit-graph.c:2580
-#, c-format
-msgid "commit-graph parent for %s is %s != %s"
-msgstr "%s 的提交圖形父提交是 %s != %s"
-
-#: commit-graph.c:2594
-#, c-format
-msgid "commit-graph parent list for commit %s terminates early"
-msgstr "提交 %s 的提交圖形父提交列表過早終止"
-
-#: commit-graph.c:2599
-#, c-format
-msgid ""
-"commit-graph has generation number zero for commit %s, but non-zero elsewhere"
-msgstr "提交圖形中提交 %s 的世代號是零，但其它地方非零"
-
-#: commit-graph.c:2603
-#, c-format
-msgid ""
-"commit-graph has non-zero generation number for commit %s, but zero elsewhere"
-msgstr "提交圖形中提交 %s 的世代號非零，但其它地方是零"
-
-#: commit-graph.c:2620
-#, c-format
-msgid "commit-graph generation for commit %s is %<PRIuMAX> < %<PRIuMAX>"
-msgstr "提交 %s 的提交圖形處於 %<PRIuMAX> < %<PRIuMAX> 世代"
-
-#: commit-graph.c:2626
-#, c-format
-msgid "commit date for commit %s in commit-graph is %<PRIuMAX> != %<PRIuMAX>"
-msgstr "提交圖形中提交 %s 的提交日期是 %<PRIuMAX> != %<PRIuMAX>"
-
-#: commit.c:54 sequencer.c:3105 builtin/am.c:400 builtin/am.c:445
-#: builtin/am.c:450 builtin/am.c:1449 builtin/am.c:2124 builtin/replace.c:456
-#, c-format
-msgid "could not parse %s"
-msgstr "不能解析 %s"
-
-#: commit.c:56
-#, c-format
-msgid "%s %s is not a commit!"
-msgstr "%s %s 不是一個提交！"
-
-#: commit.c:197
-msgid ""
-"Support for <GIT_DIR>/info/grafts is deprecated\n"
-"and will be removed in a future Git version.\n"
-"\n"
-"Please use \"git replace --convert-graft-file\"\n"
-"to convert the grafts into replace refs.\n"
-"\n"
-"Turn this message off by running\n"
-"\"git config advice.graftFileDeprecated false\""
-msgstr ""
-"對 <GIT_DIR>/info/grafts 的支援已被棄用，並將在\n"
-"未來的Git版本中被移除。\n"
-"\n"
-"請使用 \"git replace --convert-graft-file\" 將\n"
-"grafts 轉換為取代引用。\n"
-"\n"
-"設定 \"git config advice.graftFileDeprecated false\"\n"
-"可關閉本消息"
-
-#: commit.c:1252
-#, c-format
-msgid "Commit %s has an untrusted GPG signature, allegedly by %s."
-msgstr "提交 %s 有一個非可信的聲稱來自 %s 的 GPG 簽名。"
-
-#: commit.c:1256
-#, c-format
-msgid "Commit %s has a bad GPG signature allegedly by %s."
-msgstr "提交 %s 有一個錯誤的聲稱來自 %s 的 GPG 簽名。"
-
-#: commit.c:1259
-#, c-format
-msgid "Commit %s does not have a GPG signature."
-msgstr "提交 %s 沒有 GPG 簽名。"
-
-#: commit.c:1262
-#, c-format
-msgid "Commit %s has a good GPG signature by %s\n"
-msgstr "提交 %s 有一個來自 %s 的好的 GPG 簽名。\n"
-
-#: commit.c:1516
-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"
-"variable i18n.commitencoding to the encoding your project uses.\n"
-msgstr ""
-"警告：提交說明不符合 UTF-8 字元編碼。\n"
-"您可以透過修補提交來改正提交說明，或者將設定變數 i18n.commitencoding\n"
-"設定為您項目所用的字元編碼。\n"
-
-#: compat/obstack.c:406 compat/obstack.c:408
-msgid "memory exhausted"
-msgstr "記憶體耗盡"
-
-#: compat/terminal.c:167
-msgid "cannot resume in the background, please use 'fg' to resume"
-msgstr "無法在背景繼續；請使用 “fg” 繼續"
-
-#: compat/terminal.c:168
-msgid "cannot restore terminal settings"
-msgstr "無法復原終端機設定"
-
-#: config.c:143
-#, c-format
-msgid ""
-"exceeded maximum include depth (%d) while including\n"
-"\t%s\n"
-"from\n"
-"\t%s\n"
-"This might be due to circular includes."
-msgstr ""
-"超過了最大包含深度（%1$d），當從\n"
-"\t%3$s\n"
-"包含\n"
-"\t%2$s\n"
-"這可能是因為循環包含。"
-
-#: config.c:159
-#, c-format
-msgid "could not expand include path '%s'"
-msgstr "無法展開包含路徑 '%s'"
-
-#: config.c:170
-msgid "relative config includes must come from files"
-msgstr "相對路徑的設定檔案引用必須來自於檔案"
-
-#: config.c:219
-msgid "relative config include conditionals must come from files"
-msgstr "相對路徑的設定檔案條件引用必須來自於檔案"
-
-#: config.c:364
-msgid ""
-"remote URLs cannot be configured in file directly or indirectly included by "
-"includeIf.hasconfig:remote.*.url"
-msgstr ""
-"無法在檔案設定遠端 URL，無論是直接或間接透過 includeIf.hasconfig:remote.*."
-"url 引入"
-
-#: config.c:508
-#, c-format
-msgid "invalid config format: %s"
-msgstr "無效的設定檔格式：%s"
-
-#: config.c:512
-#, c-format
-msgid "missing environment variable name for configuration '%.*s'"
-msgstr "缺少「%.*s」組態設定的環境變數名稱"
-
-#: config.c:517
-#, c-format
-msgid "missing environment variable '%s' for configuration '%.*s'"
-msgstr "缺少環境變數「%s」（於「%.*s」組態設定）"
-
-#: config.c:553
-#, c-format
-msgid "key does not contain a section: %s"
-msgstr "鍵名沒有包含一個小節名稱：%s"
-
-#: config.c:558
-#, c-format
-msgid "key does not contain variable name: %s"
-msgstr "鍵名沒有包含變數名：%s"
-
-#: config.c:580 sequencer.c:2802
-#, c-format
-msgid "invalid key: %s"
-msgstr "無效鍵名：%s"
-
-#: config.c:585
-#, c-format
-msgid "invalid key (newline): %s"
-msgstr "無效鍵名（有換行符號）：%s"
-
-#: config.c:605
-msgid "empty config key"
-msgstr "空白設定鍵"
-
-#: config.c:623 config.c:635
-#, c-format
-msgid "bogus config parameter: %s"
-msgstr "偽設定參數：%s"
-
-#: config.c:649 config.c:666 config.c:673 config.c:682
-#, c-format
-msgid "bogus format in %s"
-msgstr "%s 中格式錯誤"
-
-#: config.c:716
-#, c-format
-msgid "bogus count in %s"
-msgstr "%s 中有偽計數"
-
-#: config.c:720
-#, c-format
-msgid "too many entries in %s"
-msgstr "%s 中的項目過多"
-
-#: config.c:730
-#, c-format
-msgid "missing config key %s"
-msgstr "缺少 %s 設定鍵"
-
-#: config.c:738
-#, c-format
-msgid "missing config value %s"
-msgstr "缺少 %s 設定值"
-
-#: config.c:1089
-#, c-format
-msgid "bad config line %d in blob %s"
-msgstr "資料物件 %2$s 中錯誤的設定行 %1$d"
-
-#: config.c:1093
-#, c-format
-msgid "bad config line %d in file %s"
-msgstr "檔案 %2$s 中錯誤的設定行 %1$d"
-
-#: config.c:1097
-#, c-format
-msgid "bad config line %d in standard input"
-msgstr "標準輸入中錯誤的設定行 %d"
-
-#: config.c:1101
-#, c-format
-msgid "bad config line %d in submodule-blob %s"
-msgstr "子模組資料物件 %2$s 中錯誤的設定行 %1$d"
-
-#: config.c:1105
-#, c-format
-msgid "bad config line %d in command line %s"
-msgstr "指令列 %2$s 中錯誤的設定行 %1$d"
-
-#: config.c:1109
-#, c-format
-msgid "bad config line %d in %s"
-msgstr "在 %2$s 中錯誤的設定行 %1$d"
-
-#: config.c:1246
-msgid "out of range"
-msgstr "超出範圍"
-
-#: config.c:1246
-msgid "invalid unit"
-msgstr "無效的單位"
-
-#: config.c:1247
-#, c-format
-msgid "bad numeric config value '%s' for '%s': %s"
-msgstr "設定變數 '%2$s' 的數字取值 '%1$s' 設定錯誤：%3$s"
-
-#: config.c:1257
-#, 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:1260
-#, 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:1263
-#, c-format
-msgid "bad numeric config value '%s' for '%s' in standard input: %s"
-msgstr "標準輸入中設定變數 '%2$s' 錯誤的取值 '%1$s'：%3$s"
-
-#: config.c:1266
-#, 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:1269
-#, 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:1272
-#, c-format
-msgid "bad numeric config value '%s' for '%s' in %s: %s"
-msgstr "在 %3$s 中設定變數 '%2$s' 錯誤的取值 '%1$s'：%4$s"
-
-#: config.c:1368
-#, c-format
-msgid "invalid value for variable %s"
-msgstr "%s 變數的值無效"
-
-#: config.c:1389
-#, c-format
-msgid "ignoring unknown core.fsync component '%s'"
-msgstr "忽略未知的 core.fsync 組件「%s」"
-
-#: config.c:1425
-#, c-format
-msgid "bad boolean config value '%s' for '%s'"
-msgstr "「%2$s」的「%1$s」布林設定值無效"
-
-#: config.c:1443
-#, c-format
-msgid "failed to expand user dir in: '%s'"
-msgstr "無法展開使用者目錄於：’%s’"
-
-#: config.c:1452
-#, c-format
-msgid "'%s' for '%s' is not a valid timestamp"
-msgstr "'%2$s' 的值 '%1$s' 不是一個有效的時間戳"
-
-#: config.c:1545
-#, c-format
-msgid "abbrev length out of range: %d"
-msgstr "縮寫長度超出範圍：%d"
-
-#: config.c:1559 config.c:1570
-#, c-format
-msgid "bad zlib compression level %d"
-msgstr "錯誤的 zlib 壓縮級別 %d"
-
-#: config.c:1660
-msgid "core.commentChar should only be one character"
-msgstr "core.commentChar 應該是一個字元"
-
-#: config.c:1692
-#, c-format
-msgid "ignoring unknown core.fsyncMethod value '%s'"
-msgstr "忽略未知的 core.fsyncMethod 值「%s」"
-
-#: config.c:1698
-msgid "core.fsyncObjectFiles is deprecated; use core.fsync instead"
-msgstr "core.fsyncObjectFiles 已被取代。請改用 core.fsync"
-
-#: config.c:1714
-#, c-format
-msgid "invalid mode for object creation: %s"
-msgstr "無效的物件建立模式：%s"
-
-#: config.c:1800
-#, c-format
-msgid "malformed value for %s"
-msgstr "%s 的取值格式錯誤"
-
-#: config.c:1826
-#, c-format
-msgid "malformed value for %s: %s"
-msgstr "%s 的取值格式錯誤：%s"
-
-#: config.c:1827
-msgid "must be one of nothing, matching, simple, upstream or current"
-msgstr "必須是其中之一：nothing、matching、simple、upstream 或 current"
-
-#: config.c:1888 builtin/pack-objects.c:4078
-#, c-format
-msgid "bad pack compression level %d"
-msgstr "錯誤的打包壓縮級別 %d"
-
-#: config.c:2014
-#, c-format
-msgid "unable to load config blob object '%s'"
-msgstr "無法從資料物件 '%s' 載入設定"
-
-#: config.c:2017
-#, c-format
-msgid "reference '%s' does not point to a blob"
-msgstr "引用 '%s' 沒有指向一個資料物件"
-
-#: config.c:2035
-#, c-format
-msgid "unable to resolve config blob '%s'"
-msgstr "不能解析設定物件 '%s'"
-
-#: config.c:2080
-#, c-format
-msgid "failed to parse %s"
-msgstr "解析 %s 失敗"
-
-#: config.c:2136
-msgid "unable to parse command-line config"
-msgstr "無法解析指令列中的設定"
-
-#: config.c:2512
-msgid "unknown error occurred while reading the configuration files"
-msgstr "在讀取設定檔案時遇到未知錯誤"
-
-#: config.c:2686
-#, c-format
-msgid "Invalid %s: '%s'"
-msgstr "無效 %s：'%s'"
-
-#: config.c:2731
-#, c-format
-msgid "splitIndex.maxPercentChange value '%d' should be between 0 and 100"
-msgstr "splitIndex.maxPercentChange 的取值 '%d' 應該介於 0 和 100 之間"
-
-#: config.c:2763
-#, c-format
-msgid "unable to parse '%s' from command-line config"
-msgstr "無法解析指令列設定中的 '%s'"
-
-#: config.c:2765
-#, c-format
-msgid "bad config variable '%s' in file '%s' at line %d"
-msgstr "在檔案 '%2$s' 的第 %3$d 行發現錯誤的設定變數 '%1$s'"
-
-#: config.c:2850
-#, c-format
-msgid "invalid section name '%s'"
-msgstr "無效的小節名稱 '%s'"
-
-#: config.c:2882
-#, c-format
-msgid "%s has multiple values"
-msgstr "%s 有多個取值"
-
-#: config.c:2911
-#, c-format
-msgid "failed to write new configuration file %s"
-msgstr "寫入新的設定檔案 %s 失敗"
-
-#: config.c:3177 config.c:3518
-#, c-format
-msgid "could not lock config file %s"
-msgstr "不能鎖定設定檔案 %s"
-
-#: config.c:3188
-#, c-format
-msgid "opening %s"
-msgstr "開啟 %s"
-
-#: config.c:3225 builtin/config.c:361
-#, c-format
-msgid "invalid pattern: %s"
-msgstr "無效模式：%s"
-
-#: config.c:3250
-#, c-format
-msgid "invalid config file %s"
-msgstr "無效的設定檔案 %s"
-
-#: config.c:3263 config.c:3531
-#, c-format
-msgid "fstat on %s failed"
-msgstr "對 %s 呼叫 fstat 失敗"
-
-#: config.c:3274
-#, c-format
-msgid "unable to mmap '%s'%s"
-msgstr "無法 mmap '%s'%s"
-
-#: config.c:3284 config.c:3536
-#, c-format
-msgid "chmod on %s failed"
-msgstr "對 %s 呼叫 chmod 失敗"
-
-#: config.c:3369 config.c:3633
-#, c-format
-msgid "could not write config file %s"
-msgstr "不能寫入設定檔案 %s"
-
-#: config.c:3403
-#, c-format
-msgid "could not set '%s' to '%s'"
-msgstr "不能設定 '%s' 為 '%s'"
-
-#: config.c:3405 builtin/remote.c:666 builtin/remote.c:885 builtin/remote.c:893
-#, c-format
-msgid "could not unset '%s'"
-msgstr "不能取消設定 '%s'"
-
-#: config.c:3509
-#, c-format
-msgid "invalid section name: %s"
-msgstr "無效的小節名稱：%s"
-
-#: config.c:3676
-#, c-format
-msgid "missing value for '%s'"
-msgstr "%s 的取值缺少"
-
-#: connect.c:61
-msgid "the remote end hung up upon initial contact"
-msgstr "遠端在初始連線時即掛斷"
-
-#: connect.c:63
-msgid ""
-"Could not read from remote repository.\n"
-"\n"
-"Please make sure you have the correct access rights\n"
-"and the repository exists."
-msgstr ""
-"無法讀取遠端版本庫。\n"
-"\n"
-"請確認您有正確的存取權限並且版本庫存在。"
-
-#: connect.c:81
-#, c-format
-msgid "server doesn't support '%s'"
-msgstr "伺服器不支援 '%s'"
-
-#: connect.c:118
-#, c-format
-msgid "server doesn't support feature '%s'"
-msgstr "伺服器不支援特性 '%s'"
-
-#: connect.c:129
-msgid "expected flush after capabilities"
-msgstr "在能力之後應為一個 flush 包"
-
-#: connect.c:265
-#, c-format
-msgid "ignoring capabilities after first line '%s'"
-msgstr "忽略第一行 '%s' 之後的能力欄位"
-
-#: connect.c:286
-msgid "protocol error: unexpected capabilities^{}"
-msgstr "協定錯誤：意外的 capabilities^{}"
-
-#: connect.c:308
-#, c-format
-msgid "protocol error: expected shallow sha-1, got '%s'"
-msgstr "協定錯誤：預期淺複製 sha-1，卻得到 '%s'"
-
-#: connect.c:310
-msgid "repository on the other end cannot be shallow"
-msgstr "另一端的版本庫不能是淺複製版本庫"
-
-#: connect.c:349
-msgid "invalid packet"
-msgstr "無效封包"
-
-#: connect.c:369
-#, c-format
-msgid "protocol error: unexpected '%s'"
-msgstr "協定錯誤：意外的 '%s'"
-
-#: connect.c:499
-#, c-format
-msgid "unknown object format '%s' specified by server"
-msgstr "伺服器指定的「%s」物件格式無效"
-
-#: connect.c:528
-#, c-format
-msgid "invalid ls-refs response: %s"
-msgstr "無效的 ls-refs 回應：%s"
-
-#: connect.c:532
-msgid "expected flush after ref listing"
-msgstr "在引用列表之後應該有一個 flush 包"
-
-#: connect.c:535
-msgid "expected response end packet after ref listing"
-msgstr "在引用列表後預期要有回應結束封包"
-
-#: connect.c:670
-#, c-format
-msgid "protocol '%s' is not supported"
-msgstr "不支援 '%s' 協定"
-
-#: connect.c:721
-msgid "unable to set SO_KEEPALIVE on socket"
-msgstr "無法為 socket 設定 SO_KEEPALIVE"
-
-#: connect.c:761 connect.c:824
-#, c-format
-msgid "Looking up %s ... "
-msgstr "尋找 %s ... "
-
-#: 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:769 connect.c:840
-#, c-format
-msgid ""
-"done.\n"
-"Connecting to %s (port %s) ... "
-msgstr ""
-"完成。\n"
-"連線到 %s（埠 %s）... "
-
-#: connect.c:791 connect.c:868
-#, c-format
-msgid ""
-"unable to connect to %s:\n"
-"%s"
-msgstr ""
-"無法連線到 %s：\n"
-"%s"
-
-#. TRANSLATORS: this is the end of "Connecting to %s (port %s) ... "
-#: connect.c:797 connect.c:874
-msgid "done."
-msgstr "完成。"
-
-#: connect.c:828
-#, c-format
-msgid "unable to look up %s (%s)"
-msgstr "無法尋找 %s（%s）"
-
-#: connect.c:834
-#, c-format
-msgid "unknown port %s"
-msgstr "未知埠 %s"
-
-#: connect.c:971 connect.c:1303
-#, c-format
-msgid "strange hostname '%s' blocked"
-msgstr "已阻止奇怪的主機名稱 '%s'"
-
-#: connect.c:973
-#, c-format
-msgid "strange port '%s' blocked"
-msgstr "已阻止奇怪的埠號 '%s'"
-
-#: connect.c:983
-#, c-format
-msgid "cannot start proxy %s"
-msgstr "不能啟動代理 %s"
-
-#: connect.c:1054
-msgid "no path specified; see 'git help pull' for valid url syntax"
-msgstr "未指定路徑，執行 'git help pull' 檢視有效的 url 語法"
-
-#: connect.c:1194
-msgid "newline is forbidden in git:// hosts and repo paths"
-msgstr "git:// 主機名稱和版本庫路徑中不能有換行"
-
-#: connect.c:1251
-msgid "ssh variant 'simple' does not support -4"
-msgstr "ssh 變體 'simple' 不支援 -4"
-
-#: connect.c:1263
-msgid "ssh variant 'simple' does not support -6"
-msgstr "ssh 變體 'simple' 不支援 -6"
-
-#: connect.c:1280
-msgid "ssh variant 'simple' does not support setting port"
-msgstr "ssh 變體 'simple' 不支援設定埠"
-
-#: connect.c:1392
-#, c-format
-msgid "strange pathname '%s' blocked"
-msgstr "已阻止奇怪的路徑名 '%s'"
-
-#: connect.c:1440
-msgid "unable to fork"
-msgstr "無法 fork"
-
-#: connected.c:109 builtin/fsck.c:189 builtin/prune.c:57
-msgid "Checking connectivity"
-msgstr "正在檢查連通性"
-
-#: connected.c:122
-msgid "Could not run 'git rev-list'"
-msgstr "不能執行 'git rev-list'"
-
-#: connected.c:146
-msgid "failed write to rev-list"
-msgstr "寫入 rev-list 失敗"
-
-#: connected.c:151
-msgid "failed to close rev-list's stdin"
-msgstr "關閉 rev-list 的標準輸入失敗"
-
-#: convert.c:183
-#, c-format
-msgid "illegal crlf_action %d"
-msgstr "非法的 crlf_action %d"
-
-#: convert.c:196
-#, c-format
-msgid "CRLF would be replaced by LF in %s"
-msgstr "%s 中的 CRLF 將被 LF 取代"
-
-#: convert.c:198
-#, c-format
-msgid ""
-"CRLF will be replaced by LF in %s.\n"
-"The file will have its original line endings in your working directory"
-msgstr ""
-"%s 中的 CRLF 將被 LF 取代。\n"
-"在工作區中該檔案仍保持原有的換行符號"
-
-#: convert.c:206
-#, c-format
-msgid "LF would be replaced by CRLF in %s"
-msgstr "檔案 %s 中的 LF 將被 CRLF 取代"
-
-#: convert.c:208
-#, c-format
-msgid ""
-"LF will be replaced by CRLF in %s.\n"
-"The file will have its original line endings in your working directory"
-msgstr ""
-"%s 中的 LF 將被 CRLF 取代。\n"
-"在工作區中該檔案仍保持原有的換行符號"
-
-#: convert.c:273
-#, c-format
-msgid "BOM is prohibited in '%s' if encoded as %s"
-msgstr "如果使用 %2$s 編碼，禁止在 '%1$s' 中使用 BOM"
-
-#: convert.c:280
-#, c-format
-msgid ""
-"The file '%s' contains a byte order mark (BOM). Please use UTF-%.*s as "
-"working-tree-encoding."
-msgstr "檔案 '%s' 包含位元組順序標記（BOM）。請使用 UTF-%.*s 作為工作區編碼。"
-
-#: convert.c:293
-#, c-format
-msgid "BOM is required in '%s' if encoded as %s"
-msgstr "如果編碼為 %2$s，需要在 '%1$s' 中使用 BOM"
-
-#: 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."
-msgstr ""
-"檔案 '%s' 缺少一個位元組順序標記（BOM）。請使用 UTF-%sBE or UTF-%sLE（取決於"
-"字節序）作為工作區編碼。"
-
-#: convert.c:408 convert.c:479
-#, c-format
-msgid "failed to encode '%s' from %s to %s"
-msgstr "無法對 '%s' 進行從 %s 到 %s 的編碼"
-
-#: convert.c:451
-#, c-format
-msgid "encoding '%s' from %s to %s and back is not the same"
-msgstr "將'%s' 的編碼從 %s 到 %s 來迴轉換不一致"
-
-#: convert.c:654
-#, c-format
-msgid "cannot fork to run external filter '%s'"
-msgstr "不能 fork 以執行外部過濾器 '%s'"
-
-#: convert.c:674
-#, c-format
-msgid "cannot feed the input to external filter '%s'"
-msgstr "不能將輸入傳遞給外部過濾器 '%s'"
-
-#: convert.c:681
-#, c-format
-msgid "external filter '%s' failed %d"
-msgstr "外部過濾器 '%s' 失敗碼 %d"
-
-#: convert.c:716 convert.c:719
-#, c-format
-msgid "read from external filter '%s' failed"
-msgstr "從外部過濾器 '%s' 讀取失敗"
-
-#: convert.c:722 convert.c:777
-#, c-format
-msgid "external filter '%s' failed"
-msgstr "外部過濾器 '%s' 失敗"
-
-#: convert.c:826
-msgid "unexpected filter type"
-msgstr "意外的過濾類型"
-
-#: convert.c:837
-msgid "path name too long for external filter"
-msgstr "外部過濾器的路徑名太長"
-
-#: convert.c:935
-#, c-format
-msgid ""
-"external filter '%s' is not available anymore although not all paths have "
-"been filtered"
-msgstr "外部過濾器 '%s' 不再可用，但並非所有路徑都已過濾"
-
-#: convert.c:1236
-msgid "true/false are no valid working-tree-encodings"
-msgstr "true/false 不是有效的工作區編碼"
-
-#: convert.c:1416 convert.c:1449
-#, c-format
-msgid "%s: clean filter '%s' failed"
-msgstr "%s：clean 過濾器 '%s' 失敗"
-
-#: convert.c:1492
-#, c-format
-msgid "%s: smudge filter %s failed"
-msgstr "%s：smudge 過濾器 %s 失敗"
-
-#: credential.c:96
-#, c-format
-msgid "skipping credential lookup for key: credential.%s"
-msgstr "略過鍵的憑證查詢：credential.%s"
-
-#: credential.c:112
-msgid "refusing to work with credential missing host field"
-msgstr "拒絕使用缺少主機欄位的憑證"
-
-#: credential.c:114
-msgid "refusing to work with credential missing protocol field"
-msgstr "拒絕使用缺少通訊協定欄位的憑證"
-
-#: credential.c:396
-#, c-format
-msgid "url contains a newline in its %s component: %s"
-msgstr "URL 的 %s 部分有換行：%s"
-
-#: credential.c:440
-#, c-format
-msgid "url has no scheme: %s"
-msgstr "URL 沒有 Scheme：%s"
-
-#: credential.c:513
-#, c-format
-msgid "credential url cannot be parsed: %s"
-msgstr "無法解析憑證 URL：%s"
-
-#: date.c:139
-msgid "in the future"
-msgstr "在將來"
-
-#: date.c:145
-#, c-format
-msgid "%<PRIuMAX> second ago"
-msgid_plural "%<PRIuMAX> seconds ago"
-msgstr[0] "%<PRIuMAX> 秒鐘前"
-
-#: date.c:152
-#, c-format
-msgid "%<PRIuMAX> minute ago"
-msgid_plural "%<PRIuMAX> minutes ago"
-msgstr[0] "%<PRIuMAX> 分鐘前"
-
-#: date.c:159
-#, c-format
-msgid "%<PRIuMAX> hour ago"
-msgid_plural "%<PRIuMAX> hours ago"
-msgstr[0] "%<PRIuMAX> 小時前"
-
-#: date.c:166
-#, c-format
-msgid "%<PRIuMAX> day ago"
-msgid_plural "%<PRIuMAX> days ago"
-msgstr[0] "%<PRIuMAX> 天前"
-
-#: date.c:172
-#, c-format
-msgid "%<PRIuMAX> week ago"
-msgid_plural "%<PRIuMAX> weeks ago"
-msgstr[0] "%<PRIuMAX> 周前"
-
-#: date.c:179
-#, c-format
-msgid "%<PRIuMAX> month ago"
-msgid_plural "%<PRIuMAX> months ago"
-msgstr[0] "%<PRIuMAX> 個月前"
-
-#: date.c:190
-#, c-format
-msgid "%<PRIuMAX> year"
-msgid_plural "%<PRIuMAX> years"
-msgstr[0] "%<PRIuMAX> 年"
-
-#. TRANSLATORS: "%s" is "<n> years"
-#: date.c:193
-#, c-format
-msgid "%s, %<PRIuMAX> month ago"
-msgid_plural "%s, %<PRIuMAX> months ago"
-msgstr[0] "%s %<PRIuMAX> 個月前"
-
-#: date.c:198 date.c:203
-#, c-format
-msgid "%<PRIuMAX> year ago"
-msgid_plural "%<PRIuMAX> years ago"
-msgstr[0] "%<PRIuMAX> 年前"
-
-#: delta-islands.c:272
-msgid "Propagating island marks"
-msgstr "正在傳播資料島標記"
-
-#: delta-islands.c:290
-#, c-format
-msgid "bad tree object %s"
-msgstr "壞的樹狀物件 %s"
-
-#: delta-islands.c:334
-#, c-format
-msgid "failed to load island regex for '%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 個）"
-
-#: delta-islands.c:467
-#, c-format
-msgid "Marked %d islands, done.\n"
-msgstr "已標記 %d 個資料島，結束。\n"
-
-#: diff-merges.c:81 gpg-interface.c:719 gpg-interface.c:734 ls-refs.c:37
-#: parallel-checkout.c:42 sequencer.c:2805 setup.c:563 builtin/am.c:203
-#: builtin/am.c:2243 builtin/am.c:2287 builtin/blame.c:724 builtin/blame.c:742
-#: builtin/fetch.c:792 builtin/pack-objects.c:3515 builtin/pull.c:45
-#: builtin/pull.c:47 builtin/pull.c:321
-#, c-format
-msgid "invalid value for '%s': '%s'"
-msgstr "「%s」的值無效：「%s」"
-
-#: diff-lib.c:561
-msgid "--merge-base does not work with ranges"
-msgstr "--merge-base 跟範圍無法搭配運作"
-
-#: diff-lib.c:563
-msgid "--merge-base only works with commits"
-msgstr "--merge-base 只能跟提交搭配才能運作"
-
-#: diff-lib.c:580
-msgid "unable to get HEAD"
-msgstr "不能取得 HEAD"
-
-#: diff-lib.c:587
-msgid "no merge base found"
-msgstr "找不到合併基底"
-
-#: diff-lib.c:589
-msgid "multiple merge bases found"
-msgstr "找到多個合併基底"
-
-#: diff-no-index.c:237
-msgid "git diff --no-index [<options>] <path> <path>"
-msgstr "git diff --no-index [<選項>] <路徑> <路徑>"
-
-#: diff-no-index.c:262
-msgid ""
-"Not a git repository. Use --no-index to compare two paths outside a working "
-"tree"
-msgstr "不是一個 git 版本庫。使用 --no-index 比較工作區之外的兩個路徑"
-
-#  譯者：請維持前導空格
-#: diff.c:159
-#, c-format
-msgid "  Failed to parse dirstat cut-off percentage '%s'\n"
-msgstr "  無法解析 dirstat 截止（cut-off）百分比 '%s'\n"
-
-#  譯者：請維持前導空格
-#: diff.c:164
-#, c-format
-msgid "  Unknown dirstat parameter '%s'\n"
-msgstr "  未知的 dirstat 參數 '%s'\n"
-
-#: diff.c:300
-msgid ""
-"color moved setting must be one of 'no', 'default', 'blocks', 'zebra', "
-"'dimmed-zebra', 'plain'"
-msgstr ""
-"移動的顏色設定必須是 'no'、'default'、'blocks'、'zebra'、'dimmed-"
-"zebra'、'plain'"
-
-#: diff.c:328
-#, 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 ""
-"未知的 color-moved-ws 模式 '%s'，可能的取值有 'ignore-space-change'、'ignore-"
-"space-at-eol'、'ignore-all-space'、'allow-indentation-change'"
-
-#: diff.c:336
-msgid ""
-"color-moved-ws: allow-indentation-change cannot be combined with other "
-"whitespace modes"
-msgstr "color-moved-ws：allow-indentation-change 不能與其它空白字元模式共用"
-
-#: diff.c:413
-#, c-format
-msgid "Unknown value for 'diff.submodule' config variable: '%s'"
-msgstr "設定變數 'diff.submodule' 未知的取值：'%s'"
-
-#: diff.c:473
-#, c-format
-msgid ""
-"Found errors in 'diff.dirstat' config variable:\n"
-"%s"
-msgstr ""
-"發現設定變數 'diff.dirstat' 中的錯誤：\n"
-"%s"
-
-#: diff.c:4282
-#, c-format
-msgid "external diff died, stopping at %s"
-msgstr "外部 diff 離開，停止在 %s"
-
-#: diff.c:4677 parse-options.c:1114
-#, c-format
-msgid "options '%s', '%s', '%s', and '%s' cannot be used together"
-msgstr "「%s」、「%s」、「%s」和「%s」選項不得同時使用"
-
-#: diff.c:4681 parse-options.c:1118 builtin/worktree.c:578
-#, c-format
-msgid "options '%s', '%s', and '%s' cannot be used together"
-msgstr "「%s」、「%s」和「%s」選項不得同時使用"
-
-#: diff.c:4685
-#, c-format
-msgid "options '%s' and '%s' cannot be used together, use '%s' with '%s'"
-msgstr "「%s」和「%s」選項不得同時使用，請使用「%s」搭配「%s」"
-
-#: diff.c:4689
-#, c-format
-msgid ""
-"options '%s' and '%s' cannot be used together, use '%s' with '%s' and '%s'"
-msgstr "「%s」和「%s」選項不得同時使用，請使用「%s」搭配「%s」、「%s」"
-
-#: diff.c:4769
-msgid "--follow requires exactly one pathspec"
-msgstr "--follow 明確要求只跟一個路徑規格"
-
-#: diff.c:4823
-#, c-format
-msgid "invalid --stat value: %s"
-msgstr "無效的 --stat 值：%s"
-
-#: diff.c:4828 diff.c:4833 diff.c:4838 diff.c:4843 diff.c:5319
-#: parse-options.c:217 parse-options.c:221
-#, c-format
-msgid "%s expects a numerical value"
-msgstr "%s 期望一個數字值"
-
-#: diff.c:4860
-#, c-format
-msgid ""
-"Failed to parse --dirstat/-X option parameter:\n"
-"%s"
-msgstr ""
-"無法解析 --dirstat/-X 選項的參數：\n"
-"%s"
-
-#: diff.c:4893
-#, c-format
-msgid "unknown change class '%c' in --diff-filter=%s"
-msgstr "--diff-filter=%2$s 中未知的變更類 '%1$c'"
-
-#: diff.c:4917
-#, c-format
-msgid "unknown value after ws-error-highlight=%.*s"
-msgstr "ws-error-highlight=%.*s 之後未知的值"
-
-#: diff.c:4931
-#, c-format
-msgid "unable to resolve '%s'"
-msgstr "不能解析 '%s'"
-
-#: diff.c:4981 diff.c:4987
-#, c-format
-msgid "%s expects <n>/<m> form"
-msgstr "%s 期望 <n>/<m> 格式"
-
-#: diff.c:4999
-#, c-format
-msgid "%s expects a character, got '%s'"
-msgstr "%s 期望一個字元，得到 '%s'"
-
-#: diff.c:5020
-#, c-format
-msgid "bad --color-moved argument: %s"
-msgstr "壞的 --color-moved 參數：%s"
-
-#: diff.c:5039
-#, c-format
-msgid "invalid mode '%s' in --color-moved-ws"
-msgstr "--color-moved-ws 中的無效模式 '%s'"
-
-#: diff.c:5079
-msgid ""
-"option diff-algorithm accepts \"myers\", \"minimal\", \"patience\" and "
-"\"histogram\""
-msgstr ""
-"diff-algorithm 選項有 \"myers\"、\"minimal\"、\"patience\" 和 \"histogram\""
-
-#: diff.c:5115 diff.c:5135
-#, c-format
-msgid "invalid argument to %s"
-msgstr "%s 的參數無效"
-
-#: diff.c:5239
-#, c-format
-msgid "invalid regex given to -I: '%s'"
-msgstr "傳入 -I 的常規表示式無效：「%s」"
-
-#: diff.c:5288
-#, c-format
-msgid "failed to parse --submodule option parameter: '%s'"
-msgstr "無法解析 --submodule 選項的參數：'%s'"
-
-#: diff.c:5344
-#, c-format
-msgid "bad --word-diff argument: %s"
-msgstr "壞的 --word-diff 參數：%s"
-
-#: diff.c:5380
-msgid "Diff output format options"
-msgstr "差異輸出格式化選項"
-
-#: diff.c:5382 diff.c:5388
-msgid "generate patch"
-msgstr "生成修補檔"
-
-#: diff.c:5385 builtin/log.c:180
-msgid "suppress diff output"
-msgstr "不顯示差異輸出"
-
-#: diff.c:5390 diff.c:5504 diff.c:5511
-msgid "<n>"
-msgstr "<n>"
-
-#: diff.c:5391 diff.c:5394
-msgid "generate diffs with <n> lines context"
-msgstr "生成含 <n> 行上下文的差異"
-
-#: diff.c:5396
-msgid "generate the diff in raw format"
-msgstr "生成原始格式的差異"
-
-#: diff.c:5399
-msgid "synonym for '-p --raw'"
-msgstr "和 '-p --raw' 同義"
-
-#: diff.c:5403
-msgid "synonym for '-p --stat'"
-msgstr "和 '-p --stat' 同義"
-
-#: diff.c:5407
-msgid "machine friendly --stat"
-msgstr "機器友好的 --stat"
-
-#: diff.c:5410
-msgid "output only the last line of --stat"
-msgstr "只輸出 --stat 的最後一行"
-
-#: diff.c:5412 diff.c:5420
-msgid "<param1,param2>..."
-msgstr "<參數1,參數2>..."
-
-#: diff.c:5413
-msgid ""
-"output the distribution of relative amount of changes for each sub-directory"
-msgstr "輸出每個子目錄相對變更的分布"
-
-#: diff.c:5417
-msgid "synonym for --dirstat=cumulative"
-msgstr "和 --dirstat=cumulative 同義"
-
-#: diff.c:5421
-msgid "synonym for --dirstat=files,param1,param2..."
-msgstr "是 --dirstat=files,param1,param2... 的同義詞"
-
-#: diff.c:5425
-msgid "warn if changes introduce conflict markers or whitespace errors"
-msgstr "如果變更中引入衝突定界符或空白錯誤，給出警告"
-
-#: diff.c:5428
-msgid "condensed summary such as creations, renames and mode changes"
-msgstr "精簡摘要，例如建立、重新命名和模式變更"
-
-#: diff.c:5431
-msgid "show only names of changed files"
-msgstr "只顯示變更檔案的檔案名"
-
-#: diff.c:5434
-msgid "show only names and status of changed files"
-msgstr "只顯示變更檔案的檔案名和狀態"
-
-#: diff.c:5436
-msgid "<width>[,<name-width>[,<count>]]"
-msgstr "<寬度>[,<檔案名寬度>[,<次數>]]"
-
-#: diff.c:5437
-msgid "generate diffstat"
-msgstr "生成差異統計（diffstat）"
-
-#: diff.c:5439 diff.c:5442 diff.c:5445
-msgid "<width>"
-msgstr "<寬度>"
-
-#: diff.c:5440
-msgid "generate diffstat with a given width"
-msgstr "使用提供的長度生成差異統計"
-
-#: diff.c:5443
-msgid "generate diffstat with a given name width"
-msgstr "使用提供的檔案名長度生成差異統計"
-
-#: diff.c:5446
-msgid "generate diffstat with a given graph width"
-msgstr "使用提供的圖形長度生成差異統計"
-
-#: diff.c:5448
-msgid "<count>"
-msgstr "<次數>"
-
-#: diff.c:5449
-msgid "generate diffstat with limited lines"
-msgstr "生成有限行數的差異統計"
-
-#: diff.c:5452
-msgid "generate compact summary in diffstat"
-msgstr "生成差異統計的簡潔摘要"
-
-#: diff.c:5455
-msgid "output a binary diff that can be applied"
-msgstr "輸出一個可以套用的二進位差異"
-
-#: diff.c:5458
-msgid "show full pre- and post-image object names on the \"index\" lines"
-msgstr "在 \"index\" 行顯示完整的前後物件名稱"
-
-#: diff.c:5460
-msgid "show colored diff"
-msgstr "顯示帶顏色的差異"
-
-#: diff.c:5461
-msgid "<kind>"
-msgstr "<類型>"
-
-#: diff.c:5462
-msgid ""
-"highlight whitespace errors in the 'context', 'old' or 'new' lines in the "
-"diff"
-msgstr "對於差異中的上下文、舊的和新的行，加亮顯示錯誤的空白字元"
-
-#: diff.c:5465
-msgid ""
-"do not munge pathnames and use NULs as output field terminators in --raw or "
-"--numstat"
-msgstr ""
-"在 --raw 或者 --numstat 中，不對路徑字元轉檔並使用 NUL 字元做為輸出欄位的分隔"
-"符"
-
-#: diff.c:5468 diff.c:5471 diff.c:5474 diff.c:5583
-msgid "<prefix>"
-msgstr "<前綴>"
-
-#: diff.c:5469
-msgid "show the given source prefix instead of \"a/\""
-msgstr "顯示提供的來源前綴，而非 \"a/\""
-
-#: diff.c:5472
-msgid "show the given destination prefix instead of \"b/\""
-msgstr "顯示提供的目的地前綴取代 \"b/\""
-
-#: diff.c:5475
-msgid "prepend an additional prefix to every line of output"
-msgstr "輸出的每一行附加前綴"
-
-#: diff.c:5478
-msgid "do not show any source or destination prefix"
-msgstr "不顯示任何來源和目的地前綴"
-
-#: diff.c:5481
-msgid "show context between diff hunks up to the specified number of lines"
-msgstr "顯示指定行數的差異區塊間的上下文"
-
-#: diff.c:5485 diff.c:5490 diff.c:5495
-msgid "<char>"
-msgstr "<字元>"
-
-#: diff.c:5486
-msgid "specify the character to indicate a new line instead of '+'"
-msgstr "指定一個字元取代 '+' 來表示新的一行"
-
-#: diff.c:5491
-msgid "specify the character to indicate an old line instead of '-'"
-msgstr "指定一個字元取代 '-' 來表示舊的一行"
-
-#: diff.c:5496
-msgid "specify the character to indicate a context instead of ' '"
-msgstr "指定一個字元取代 ' ' 來表示一行上下文"
-
-#: diff.c:5499
-msgid "Diff rename options"
-msgstr "差異重新命名選項"
-
-#: diff.c:5500
-msgid "<n>[/<m>]"
-msgstr "<n>[/<m>]"
-
-#: diff.c:5501
-msgid "break complete rewrite changes into pairs of delete and create"
-msgstr "將完全重寫的變更打破為成對的刪除和建立"
-
-#: diff.c:5505
-msgid "detect renames"
-msgstr "檢測重新命名"
-
-#: diff.c:5509
-msgid "omit the preimage for deletes"
-msgstr "省略刪除變更的差異輸出"
-
-#: diff.c:5512
-msgid "detect copies"
-msgstr "檢測複製"
-
-#: diff.c:5516
-msgid "use unmodified files as source to find copies"
-msgstr "使用未修改的檔案做為發現拷貝的來源"
-
-#: diff.c:5518
-msgid "disable rename detection"
-msgstr "停用重新命名偵測"
-
-#: diff.c:5521
-msgid "use empty blobs as rename source"
-msgstr "使用空的資料物件做為重新命名的來源"
-
-#: diff.c:5523
-msgid "continue listing the history of a file beyond renames"
-msgstr "繼續列出檔案重新命名以外的歷史記錄"
-
-#: diff.c:5526
-msgid ""
-"prevent rename/copy detection if the number of rename/copy targets exceeds "
-"given limit"
-msgstr "如果重新命名/複製目標超過提供的限制，禁止重新命名/複製檢測"
-
-#: diff.c:5528
-msgid "Diff algorithm options"
-msgstr "差異演算法選項"
-
-#: diff.c:5530
-msgid "produce the smallest possible diff"
-msgstr "生成儘可能小的差異"
-
-#: diff.c:5533
-msgid "ignore whitespace when comparing lines"
-msgstr "行比較時忽略空白字元"
-
-#: diff.c:5536
-msgid "ignore changes in amount of whitespace"
-msgstr "忽略空白字元的變更"
-
-#: diff.c:5539
-msgid "ignore changes in whitespace at EOL"
-msgstr "忽略行尾的空白字元變更"
-
-#: diff.c:5542
-msgid "ignore carrier-return at the end of line"
-msgstr "忽略行尾的Enter符（CR）"
-
-#: diff.c:5545
-msgid "ignore changes whose lines are all blank"
-msgstr "忽略整行都是空白的變更"
-
-#: diff.c:5547 diff.c:5569 diff.c:5572 diff.c:5617
-msgid "<regex>"
-msgstr "<正則>"
-
-#: diff.c:5548
-msgid "ignore changes whose all lines match <regex>"
-msgstr "忽略整行符合 <regex> 的變更"
-
-#: diff.c:5551
-msgid "heuristic to shift diff hunk boundaries for easy reading"
-msgstr "啟發式轉換差異邊界以便閱讀"
-
-#: diff.c:5554
-msgid "generate diff using the \"patience diff\" algorithm"
-msgstr "使用 \"patience diff\" 演算法生成差異"
-
-#: diff.c:5558
-msgid "generate diff using the \"histogram diff\" algorithm"
-msgstr "使用 \"histogram diff\" 演算法生成差異"
-
-#: diff.c:5560
-msgid "<algorithm>"
-msgstr "<演算法>"
-
-#: diff.c:5561
-msgid "choose a diff algorithm"
-msgstr "選擇一個差異演算法"
-
-#: diff.c:5563
-msgid "<text>"
-msgstr "<文字>"
-
-#: diff.c:5564
-msgid "generate diff using the \"anchored diff\" algorithm"
-msgstr "使用 \"anchored diff\" 演算法生成差異"
-
-#: diff.c:5566 diff.c:5575 diff.c:5578
-msgid "<mode>"
-msgstr "<模式>"
-
-#: diff.c:5567
-msgid "show word diff, using <mode> to delimit changed words"
-msgstr "顯示單詞差異，使用 <模式> 分隔變更的單詞"
-
-#: diff.c:5570
-msgid "use <regex> to decide what a word is"
-msgstr "使用 <常規表示式> 確定何為一個詞"
-
-#: diff.c:5573
-msgid "equivalent to --word-diff=color --word-diff-regex=<regex>"
-msgstr "相當於 --word-diff=color --word-diff-regex=<正則>"
-
-#: diff.c:5576
-msgid "moved lines of code are colored differently"
-msgstr "移動的程式碼行用不同方式著色"
-
-#: diff.c:5579
-msgid "how white spaces are ignored in --color-moved"
-msgstr "在 --color-moved 下如何忽略空白字元"
-
-#: diff.c:5582
-msgid "Other diff options"
-msgstr "其它差異選項"
-
-#: diff.c:5584
-msgid "when run from subdir, exclude changes outside and show relative paths"
-msgstr "當從子目錄執行，排除目錄之外的變更並顯示相對路徑"
-
-#: diff.c:5588
-msgid "treat all files as text"
-msgstr "把所有檔案當做文字處理"
-
-#: diff.c:5590
-msgid "swap two inputs, reverse the diff"
-msgstr "交換兩個輸入，反轉差異"
-
-#: diff.c:5592
-msgid "exit with 1 if there were differences, 0 otherwise"
-msgstr "有差異時離開碼為 1，否則為 0"
-
-#: diff.c:5594
-msgid "disable all output of the program"
-msgstr "停用本程式的所有輸出"
-
-#: diff.c:5596
-msgid "allow an external diff helper to be executed"
-msgstr "允許執行一個外部的差異協助工具"
-
-#: diff.c:5598
-msgid "run external text conversion filters when comparing binary files"
-msgstr "當比較二進位檔案時，執行外部的文字轉換過濾器"
-
-#: diff.c:5600
-msgid "<when>"
-msgstr "<何時>"
-
-#: diff.c:5601
-msgid "ignore changes to submodules in the diff generation"
-msgstr "在生成差異時，忽略子模組的更改"
-
-#: diff.c:5604
-msgid "<format>"
-msgstr "<格式>"
-
-#: diff.c:5605
-msgid "specify how differences in submodules are shown"
-msgstr "指定子模組的差異如何顯示"
-
-#: diff.c:5609
-msgid "hide 'git add -N' entries from the index"
-msgstr "隱藏索引中 'git add -N' 條目"
-
-#: diff.c:5612
-msgid "treat 'git add -N' entries as real in the index"
-msgstr "將索引中 'git add -N' 條目當做真實的"
-
-#: diff.c:5614
-msgid "<string>"
-msgstr "<字串>"
-
-#: diff.c:5615
-msgid ""
-"look for differences that change the number of occurrences of the specified "
-"string"
-msgstr "尋找改變了指定字串出現次數的差異"
-
-#: diff.c:5618
-msgid ""
-"look for differences that change the number of occurrences of the specified "
-"regex"
-msgstr "尋找改變指定正則符合出現次數的差異"
-
-#: diff.c:5621
-msgid "show all changes in the changeset with -S or -G"
-msgstr "顯示使用 -S 或 -G 的變更集的所有變更"
-
-#: diff.c:5624
-msgid "treat <string> in -S as extended POSIX regular expression"
-msgstr "將 -S 的 <string> 當做延伸 POSIX 常規表示式"
-
-#: diff.c:5627
-msgid "control the order in which files appear in the output"
-msgstr "控制輸出中的檔案顯示順序"
-
-#: diff.c:5628 diff.c:5631
-msgid "<path>"
-msgstr "<路徑>"
-
-#: diff.c:5629
-msgid "show the change in the specified path first"
-msgstr "先顯示指定路徑的變更"
-
-#: diff.c:5632
-msgid "skip the output to the specified path"
-msgstr "略過輸出至指定路徑"
-
-#: diff.c:5634
-msgid "<object-id>"
-msgstr "<物件 ID>"
-
-#: diff.c:5635
-msgid ""
-"look for differences that change the number of occurrences of the specified "
-"object"
-msgstr "尋找改變指定物件出現次數的差異"
-
-#: diff.c:5637
-msgid "[(A|C|D|M|R|T|U|X|B)...[*]]"
-msgstr "[(A|C|D|M|R|T|U|X|B)...[*]]"
-
-#: diff.c:5638
-msgid "select files by diff type"
-msgstr "透過差異類型選擇檔案"
-
-#: diff.c:5640
-msgid "<file>"
-msgstr "<檔案>"
-
-#: diff.c:5641
-msgid "output to a specific file"
-msgstr "輸出至指定檔案"
-
-#: diff.c:6321
-msgid "exhaustive rename detection was skipped due to too many files."
-msgstr "因為檔案太多，已略過詳細重新命名偵測。"
-
-#: diff.c:6324
-msgid "only found copies from modified paths due to too many files."
-msgstr "因為檔案太多，只在修改的路徑中尋找複製。"
-
-#: diff.c:6327
-#, c-format
-msgid ""
-"you may want to set your %s variable to at least %d and retry the command."
-msgstr "您可能想要將變數 %s 設定為至少 %d 並再次執行此指令。"
-
-#: diffcore-order.c:24
-#, c-format
-msgid "failed to read orderfile '%s'"
-msgstr "讀取排序檔案 '%s' 失敗"
-
-#: diffcore-rename.c:1564
-msgid "Performing inexact rename detection"
-msgstr "正在進行非精確的重新命名偵測"
-
-#: diffcore-rotate.c:29
-#, c-format
-msgid "No such path '%s' in the diff"
-msgstr "diff 中沒有「%s」路徑"
-
-#: dir.c:593
-#, c-format
-msgid "pathspec '%s' did not match any file(s) known to git"
-msgstr "路徑規格 '%s' 未符合任何 git 已知檔案"
-
-#: dir.c:733 dir.c:762 dir.c:775
-#, c-format
-msgid "unrecognized pattern: '%s'"
-msgstr "無法識別樣式：「%s」"
-
-#: dir.c:790 dir.c:804
-#, c-format
-msgid "unrecognized negative pattern: '%s'"
-msgstr "無法識別反向模式：「%s」"
-
-#: dir.c:820
-#, c-format
-msgid "your sparse-checkout file may have issues: pattern '%s' is repeated"
-msgstr "您的稀疏簽出檔案可能有問題：「%s」樣式重複"
-
-#: dir.c:828
-msgid "disabling cone pattern matching"
-msgstr "停用 cone 樣式符合模式"
-
-#: dir.c:1212
-#, c-format
-msgid "cannot use %s as an exclude file"
-msgstr "不能將 %s 用作排除檔案"
-
-#: dir.c:2419
-#, c-format
-msgid "could not open directory '%s'"
-msgstr "不能開啟目錄 '%s'"
-
-#: dir.c:2721
-msgid "failed to get kernel name and information"
-msgstr "無法獲得核心名稱和訊息"
-
-#: dir.c:2846
-msgid "untracked cache is disabled on this system or location"
-msgstr "快取未追蹤檔案在本系統或位置中被停用"
-
-#: dir.c:3119
-msgid ""
-"No directory name could be guessed.\n"
-"Please specify a directory on the command line"
-msgstr ""
-"無法猜到目錄名。\n"
-"請在指令列指定一個目錄"
-
-#: dir.c:3807
-#, c-format
-msgid "index file corrupt in repo %s"
-msgstr "版本庫 %s 中的索引檔案損壞"
-
-#: dir.c:3854 dir.c:3859
-#, c-format
-msgid "could not create directories for %s"
-msgstr "不能為 %s 建立目錄"
-
-#: dir.c:3888
-#, c-format
-msgid "could not migrate git directory from '%s' to '%s'"
-msgstr "不能從 '%s' 遷移 git 目錄到 '%s'"
-
-#: editor.c:74
-#, c-format
-msgid "hint: Waiting for your editor to close the file...%c"
-msgstr "提示：等待您的編輯器關閉檔案...%c"
-
-#: entry.c:179
-msgid "Filtering content"
-msgstr "過濾內容"
-
-#: entry.c:500
-#, c-format
-msgid "could not stat file '%s'"
-msgstr "不能對檔案 '%s' 呼叫 stat"
-
-#: environment.c:147
-#, c-format
-msgid "bad git namespace path \"%s\""
-msgstr "錯誤的 git 名字空間路徑 \"%s\""
-
-#: exec-cmd.c:363
-#, c-format
-msgid "too many args to run %s"
-msgstr "執行 %s 的參數太多"
-
-#: fetch-pack.c:194
-msgid "git fetch-pack: expected shallow list"
-msgstr "git fetch-pack：應為 shallow 列表"
-
-#: fetch-pack.c:197
-msgid "git fetch-pack: expected a flush packet after shallow list"
-msgstr "git fetch-pack：在淺複製列表之後期望一個 flush 包"
-
-#: fetch-pack.c:208
-msgid "git fetch-pack: expected ACK/NAK, got a flush packet"
-msgstr "git fetch-pack：期望 ACK/NAK，卻得到 flush 包"
-
-#: fetch-pack.c:228
-#, c-format
-msgid "git fetch-pack: expected ACK/NAK, got '%s'"
-msgstr "git fetch-pack：應為 ACK/NAK，卻得到 '%s'"
-
-#: fetch-pack.c:239
-msgid "unable to write to remote"
-msgstr "無法寫到遠端"
-
-#: fetch-pack.c:397 fetch-pack.c:1460
-#, c-format
-msgid "invalid shallow line: %s"
-msgstr "無效的 shallow 訊息：%s"
-
-#: fetch-pack.c:403 fetch-pack.c:1466
-#, c-format
-msgid "invalid unshallow line: %s"
-msgstr "無效的 unshallow 訊息：%s"
-
-#: fetch-pack.c:405 fetch-pack.c:1468
-#, c-format
-msgid "object not found: %s"
-msgstr "物件未找到：%s"
-
-#: fetch-pack.c:408 fetch-pack.c:1471
-#, c-format
-msgid "error in object: %s"
-msgstr "物件中發生錯誤：%s"
-
-#: fetch-pack.c:410 fetch-pack.c:1473
-#, c-format
-msgid "no shallow found: %s"
-msgstr "未發現 shallow：%s"
-
-#: fetch-pack.c:413 fetch-pack.c:1477
-#, c-format
-msgid "expected shallow/unshallow, got %s"
-msgstr "應為 shallow/unshallow，卻得到 %s"
-
-#: fetch-pack.c:453
-#, c-format
-msgid "got %s %d %s"
-msgstr "得到 %s %d %s"
-
-#: fetch-pack.c:470
-#, c-format
-msgid "invalid commit %s"
-msgstr "無效提交 %s"
-
-#: fetch-pack.c:501
-msgid "giving up"
-msgstr "放棄"
-
-#: fetch-pack.c:514 progress.h:25
-msgid "done"
-msgstr "完成"
-
-#: fetch-pack.c:526
-#, c-format
-msgid "got %s (%d) %s"
-msgstr "得到 %s (%d) %s"
-
-#: fetch-pack.c:562
-#, c-format
-msgid "Marking %s as complete"
-msgstr "標記 %s 為完成"
-
-#: fetch-pack.c:784
-#, c-format
-msgid "already have %s (%s)"
-msgstr "已經有 %s（%s）"
-
-#: fetch-pack.c:870
-msgid "fetch-pack: unable to fork off sideband demultiplexer"
-msgstr "fetch-pack：無法衍生 sideband 多路輸出"
-
-#: fetch-pack.c:878
-msgid "protocol error: bad pack header"
-msgstr "協定錯誤：壞的包頭"
-
-#: fetch-pack.c:974
-#, c-format
-msgid "fetch-pack: unable to fork off %s"
-msgstr "fetch-pack：無法 fork %s 處理程序"
-
-#: fetch-pack.c:980
-msgid "fetch-pack: invalid index-pack output"
-msgstr "fetch-pack：無效的 index-pack 輸出"
-
-#: fetch-pack.c:997
-#, c-format
-msgid "%s failed"
-msgstr "%s 失敗"
-
-#: fetch-pack.c:999
-msgid "error in sideband demultiplexer"
-msgstr "sideband 多路輸出發生錯誤"
-
-#: fetch-pack.c:1048
-#, c-format
-msgid "Server version is %.*s"
-msgstr "伺服器版本 %.*s"
-
-#: fetch-pack.c:1056 fetch-pack.c:1062 fetch-pack.c:1065 fetch-pack.c:1071
-#: fetch-pack.c:1075 fetch-pack.c:1079 fetch-pack.c:1083 fetch-pack.c:1087
-#: fetch-pack.c:1091 fetch-pack.c:1095 fetch-pack.c:1099 fetch-pack.c:1103
-#: fetch-pack.c:1109 fetch-pack.c:1115 fetch-pack.c:1120 fetch-pack.c:1125
-#, c-format
-msgid "Server supports %s"
-msgstr "伺服器支援 %s"
-
-#: fetch-pack.c:1058
-msgid "Server does not support shallow clients"
-msgstr "伺服器不支援 shallow 用戶端"
-
-#: fetch-pack.c:1118
-msgid "Server does not support --shallow-since"
-msgstr "伺服器不支援 --shallow-since"
-
-#: fetch-pack.c:1123
-msgid "Server does not support --shallow-exclude"
-msgstr "伺服器不支援 --shallow-exclude"
-
-#: fetch-pack.c:1127
-msgid "Server does not support --deepen"
-msgstr "伺服器不支援 --deepen"
-
-#: fetch-pack.c:1129
-msgid "Server does not support this repository's object format"
-msgstr "伺服器不支援此版本庫的物件格式"
-
-#: fetch-pack.c:1142
-msgid "no common commits"
-msgstr "沒有共同的提交"
-
-#: fetch-pack.c:1151 fetch-pack.c:1506 builtin/clone.c:1166
-msgid "source repository is shallow, reject to clone."
-msgstr "來源版本庫是淺版本庫 (shallow)。拒絕複製。"
-
-#: fetch-pack.c:1157 fetch-pack.c:1705
-msgid "git fetch-pack: fetch failed."
-msgstr "git fetch-pack：取得失敗。"
-
-#: fetch-pack.c:1271
-#, c-format
-msgid "mismatched algorithms: client %s; server %s"
-msgstr "算法不一致：用戶端 %s；伺服器 %s"
-
-#: fetch-pack.c:1275
-#, c-format
-msgid "the server does not support algorithm '%s'"
-msgstr "伺服器不支援「%s」算法"
-
-#: fetch-pack.c:1308
-msgid "Server does not support shallow requests"
-msgstr "伺服器不支援 shallow 請求"
-
-#: fetch-pack.c:1315
-msgid "Server supports filter"
-msgstr "伺服器支援 filter"
-
-#: fetch-pack.c:1358 fetch-pack.c:2087
-msgid "unable to write request to remote"
-msgstr "無法將請求寫到遠端"
-
-#: fetch-pack.c:1376
-#, c-format
-msgid "error reading section header '%s'"
-msgstr "讀取節標題 '%s' 發生錯誤"
-
-#: fetch-pack.c:1382
-#, c-format
-msgid "expected '%s', received '%s'"
-msgstr "預期 '%s'，得到 '%s'"
-
-#: fetch-pack.c:1416
-#, c-format
-msgid "unexpected acknowledgment line: '%s'"
-msgstr "意外的確認行：'%s'"
-
-#: fetch-pack.c:1421
-#, c-format
-msgid "error processing acks: %d"
-msgstr "處理 ack 發生錯誤：%d"
-
-#. TRANSLATORS: The parameter will be 'ready', a protocol
-#. keyword.
-#.
-#: fetch-pack.c:1435
-#, c-format
-msgid "expected packfile to be sent after '%s'"
-msgstr "預期在 「%s」後傳送 packfile"
-
-#. TRANSLATORS: The parameter will be 'ready', a protocol
-#. keyword.
-#.
-#: fetch-pack.c:1441
-#, c-format
-msgid "expected no other sections to be sent after no '%s'"
-msgstr "預期在沒有「%s」後不傳送其他區段"
-
-#: fetch-pack.c:1482
-#, c-format
-msgid "error processing shallow info: %d"
-msgstr "處理淺複製訊息發生錯誤：%d"
-
-#: fetch-pack.c:1531
-#, c-format
-msgid "expected wanted-ref, got '%s'"
-msgstr "預期 wanted-ref，得到 '%s'"
-
-#: fetch-pack.c:1536
-#, c-format
-msgid "unexpected wanted-ref: '%s'"
-msgstr "意外的 wanted-ref：'%s'"
-
-#: fetch-pack.c:1541
-#, c-format
-msgid "error processing wanted refs: %d"
-msgstr "處理要取得的引用發生錯誤：%d"
-
-#: fetch-pack.c:1571
-msgid "git fetch-pack: expected response end packet"
-msgstr "git fetch-pack: 預期要有回應結束封包"
-
-#: fetch-pack.c:1983
-msgid "no matching remote head"
-msgstr "沒有符合的遠端分支"
-
-#: fetch-pack.c:2006 builtin/clone.c:587
-msgid "remote did not send all necessary objects"
-msgstr "遠端沒有傳送所有必需的物件"
-
-#: fetch-pack.c:2109
-msgid "unexpected 'ready' from remote"
-msgstr "從遠端收到非預期的 ‘ready’"
-
-#: fetch-pack.c:2132
-#, c-format
-msgid "no such remote ref %s"
-msgstr "沒有這樣的遠端引用 %s"
-
-#: fetch-pack.c:2135
-#, c-format
-msgid "Server does not allow request for unadvertised object %s"
-msgstr "伺服器不允許請求未公開的物件 %s"
-
-#: fsmonitor-ipc.c:119
-#, c-format
-msgid "fsmonitor_ipc__send_query: invalid path '%s'"
-msgstr "fsmonitor_ipc__send_query：路徑「%s」無效"
-
-#: fsmonitor-ipc.c:125
-#, c-format
-msgid "fsmonitor_ipc__send_query: unspecified error on '%s'"
-msgstr "fsmonitor_ipc__send_query：「%s」上有未指定的錯誤"
-
-#: fsmonitor-ipc.c:155
-msgid "fsmonitor--daemon is not running"
-msgstr "fsmonitor--daemon 未在運作"
-
-#: fsmonitor-ipc.c:164
-#, c-format
-msgid "could not send '%s' command to fsmonitor--daemon"
-msgstr "無法將「%s」命令傳送到 fsmonitor--daemon"
-
-#: gpg-interface.c:329 gpg-interface.c:456 gpg-interface.c:995
-#: gpg-interface.c:1011
-msgid "could not create temporary file"
-msgstr "不能建立暫存檔"
-
-#: gpg-interface.c:332 gpg-interface.c:459
-#, c-format
-msgid "failed writing detached signature to '%s'"
-msgstr "無法將分離式簽名寫入 '%s'"
-
-#: gpg-interface.c:450
-msgid ""
-"gpg.ssh.allowedSignersFile needs to be configured and exist for ssh "
-"signature verification"
-msgstr "SSH 簽名驗證需要設定 gpg.ssh.allowedSignersFile，簽名檔案也要存在"
-
-#: gpg-interface.c:479
-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:550
-#, c-format
-msgid "ssh signing revocation file configured but not found: %s"
-msgstr "有設定 SSH 簽名廢止檔案，但找不到檔案本體：%s"
-
-#: gpg-interface.c:638
-#, c-format
-msgid "bad/incompatible signature '%s'"
-msgstr "簽名「%s」損壞或者不相容"
-
-#: gpg-interface.c:815 gpg-interface.c:820
-#, c-format
-msgid "failed to get the ssh fingerprint for key '%s'"
-msgstr "無法取得「%s」金鑰的 SSH 指紋"
-
-#: gpg-interface.c:843
-msgid ""
-"either user.signingkey or gpg.ssh.defaultKeyCommand needs to be configured"
-msgstr "需要設定 user.signingkey 或 gpg.ssh.defaultKeyCommand 任一"
-
-#: gpg-interface.c:865
-#, c-format
-msgid "gpg.ssh.defaultKeyCommand succeeded but returned no keys: %s %s"
-msgstr "gpg.ssh.defaultKeyCommand 執行成功，但沒回傳按鍵：%s %s"
-
-#: gpg-interface.c:871
-#, c-format
-msgid "gpg.ssh.defaultKeyCommand failed: %s %s"
-msgstr "gpg.ssh.defaultKeyCommand 執行失敗：%s %s"
-
-#: gpg-interface.c:966
-msgid "gpg failed to sign the data"
-msgstr "gpg 無法為資料簽名"
-
-#: gpg-interface.c:988
-msgid "user.signingkey needs to be set for ssh signing"
-msgstr "需要設定 user.signingkey 才能進行 SSH 簽名"
-
-#: gpg-interface.c:999
-#, c-format
-msgid "failed writing ssh signing key to '%s'"
-msgstr "無法將 SSH 簽名金鑰寫入「%s」"
-
-#: gpg-interface.c:1017
-#, c-format
-msgid "failed writing ssh signing key buffer to '%s'"
-msgstr "無法將 SSH 簽名金鑰緩衝區寫入「%s」"
-
-#: gpg-interface.c:1035
-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:1047
-#, 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:446
-msgid ""
-"given pattern contains NULL byte (via -f <file>). This is only supported "
-"with -P under PCRE v2"
-msgstr ""
-"提供的模式包含 NULL 字元（通過 -f <檔案> 參數）。只有 PCRE v2 下的 -P 支援此"
-"功能"
-
-#: grep.c:1859
-#, c-format
-msgid "'%s': unable to read %s"
-msgstr "'%s'：無法讀取 %s"
-
-#: grep.c:1876 setup.c:178 builtin/clone.c:308 builtin/diff.c:90
-#: builtin/rm.c:136
-#, c-format
-msgid "failed to stat '%s'"
-msgstr "對 '%s' 呼叫 stat 失敗"
-
-#: grep.c:1887
-#, c-format
-msgid "'%s': short read"
-msgstr "'%s'：讀取不完整"
-
-#: help.c:25
-msgid "start a working area (see also: git help tutorial)"
-msgstr "開始一個工作區（參見：git help tutorial）"
-
-#: help.c:26
-msgid "work on the current change (see also: git help everyday)"
-msgstr "在目前變更上工作（參見：git help everyday）"
-
-#: help.c:27
-msgid "examine the history and state (see also: git help revisions)"
-msgstr "檢查歷史和狀態（參見：git help revisions）"
-
-#: help.c:28
-msgid "grow, mark and tweak your common history"
-msgstr "擴展、標記和調校您的歷史記錄"
-
-#: help.c:29
-msgid "collaborate (see also: git help workflows)"
-msgstr "協同（參見：git help workflows）"
-
-#: help.c:33
-msgid "Main Porcelain Commands"
-msgstr "主要的上層指令"
-
-#: help.c:34
-msgid "Ancillary Commands / Manipulators"
-msgstr "輔助指令/動作者"
-
-#: help.c:35
-msgid "Ancillary Commands / Interrogators"
-msgstr "輔助指令/詢問者"
-
-#: help.c:36
-msgid "Interacting with Others"
-msgstr "與其它系統互動"
-
-#: help.c:37
-msgid "Low-level Commands / Manipulators"
-msgstr "低級指令/動作者"
-
-#: help.c:38
-msgid "Low-level Commands / Interrogators"
-msgstr "低級指令/詢問者"
-
-#: help.c:39
-msgid "Low-level Commands / Syncing Repositories"
-msgstr "低級指令 / 同步版本庫"
-
-#: help.c:40
-msgid "Low-level Commands / Internal Helpers"
-msgstr "低級指令/內部協助工具"
-
-#: help.c:316
-#, c-format
-msgid "available git commands in '%s'"
-msgstr "在 '%s' 下可用的 git 指令"
-
-#: help.c:323
-msgid "git commands available from elsewhere on your $PATH"
-msgstr "在 $PATH 路徑中的其他地方可用的 git 指令"
-
-#: help.c:332
-msgid "These are common Git commands used in various situations:"
-msgstr "這些是各種場合常見的 Git 指令："
-
-#: help.c:382 git.c:100
-#, c-format
-msgid "unsupported command listing type '%s'"
-msgstr "不支援的指令列表類型 '%s'"
-
-#: help.c:422
-msgid "The Git concept guides are:"
-msgstr "Git 概念嚮導有："
-
-#: help.c:446
-msgid "External commands"
-msgstr "外部指令"
-
-#: help.c:468
-msgid "Command aliases"
-msgstr "指令別名"
-
-#: help.c:486
-msgid "See 'git help <command>' to read about a specific subcommand"
-msgstr "執行　'git help <command>' 來檢視特定子指令"
-
-#: help.c:563
-#, c-format
-msgid ""
-"'%s' appears to be a git command, but we were not\n"
-"able to execute it. Maybe git-%s is broken?"
-msgstr ""
-"'%s' 像是一個 git 指令，但卻無法執行。\n"
-"可能是 git-%s 受損？"
-
-#: help.c:585 help.c:682
-#, c-format
-msgid "git: '%s' is not a git command. See 'git --help'."
-msgstr "git：'%s' 不是一個 git 指令。參見 'git --help'。"
-
-#: help.c:633
-msgid "Uh oh. Your system reports no Git commands at all."
-msgstr "唉呀，您的系統中未發現 Git 指令。"
-
-#: help.c:655
-#, c-format
-msgid "WARNING: You called a Git command named '%s', which does not exist."
-msgstr "警告：您執行了一個並不存在的 Git 指令 '%s'。"
-
-#: help.c:660
-#, c-format
-msgid "Continuing under the assumption that you meant '%s'."
-msgstr "假定你想要的是 '%s' 並繼續。"
-
-#: help.c:666
-#, c-format
-msgid "Run '%s' instead [y/N]? "
-msgstr "改執行「%s」[y/N]？ "
-
-#: help.c:674
-#, c-format
-msgid "Continuing in %0.1f seconds, assuming that you meant '%s'."
-msgstr "假定你想要的是 '%2$s'，在 %1$0.1f 秒鐘後繼續。"
-
-#: help.c:686
-msgid ""
-"\n"
-"The most similar command is"
-msgid_plural ""
-"\n"
-"The most similar commands are"
-msgstr[0] ""
-"\n"
-"最類似的指令有"
-
-#: help.c:729
-msgid "git version [<options>]"
-msgstr "git version [<選項>]"
-
-#: help.c:784
-#, c-format
-msgid "%s: %s - %s"
-msgstr "%s：%s - %s"
-
-#: help.c:788
-msgid ""
-"\n"
-"Did you mean this?"
-msgid_plural ""
-"\n"
-"Did you mean one of these?"
-msgstr[0] ""
-"\n"
-"您指的是這個嗎？"
-
-#: hook.c:28
-#, 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` 來關閉這條警告。"
-
-#: hook.c:87
-#, c-format
-msgid "Couldn't start hook '%s'\n"
-msgstr "無法啟動「%s」掛鉤\n"
-
-#: ident.c:354
-msgid "Author identity unknown\n"
-msgstr "作者身分未知\n"
-
-#: ident.c:357
-msgid "Committer identity unknown\n"
-msgstr "提交者身分未知\n"
-
-#: ident.c:363
-msgid ""
-"\n"
-"*** Please tell me who you are.\n"
-"\n"
-"Run\n"
-"\n"
-"  git config --global user.email \"you@example.com\"\n"
-"  git config --global user.name \"Your Name\"\n"
-"\n"
-"to set your account's default identity.\n"
-"Omit --global to set the identity only in this repository.\n"
-"\n"
-msgstr ""
-"\n"
-"*** 請告訴我你是誰。\n"
-"\n"
-"執行\n"
-"\n"
-"  git config --global user.email \"you@example.com\"\n"
-"  git config --global user.name \"Your Name\"\n"
-"\n"
-"來設定您帳號的預設身份標記。\n"
-"若只要在這個版本庫設定身份標記，請省略 --global 參數。\n"
-"\n"
-
-#: ident.c:398
-msgid "no email was given and auto-detection is disabled"
-msgstr "未提供信件位址且自動偵測被停用"
-
-#: ident.c:403
-#, c-format
-msgid "unable to auto-detect email address (got '%s')"
-msgstr "無法自動偵測信件位址（得到 '%s'）"
-
-#: ident.c:420
-msgid "no name was given and auto-detection is disabled"
-msgstr "未提供姓名且自動偵測被停用"
-
-#: ident.c:426
-#, c-format
-msgid "unable to auto-detect name (got '%s')"
-msgstr "無法自動偵測姓名（得到 '%s'）"
-
-#: ident.c:434
-#, c-format
-msgid "empty ident name (for <%s>) not allowed"
-msgstr "不允許空的姓名（對於 <%s>）"
-
-#: ident.c:440
-#, c-format
-msgid "name consists only of disallowed characters: %s"
-msgstr "姓名中僅包含停用字元：%s"
-
-#: ident.c:455 builtin/commit.c:649
-#, c-format
-msgid "invalid date format: %s"
-msgstr "無效的日期格式：%s"
-
-#: list-objects-filter-options.c:68
-msgid "expected 'tree:<depth>'"
-msgstr "期望 'tree:<深度>'"
-
-#: list-objects-filter-options.c:83
-msgid "sparse:path filters support has been dropped"
-msgstr "sparse:path 過濾器支援已被刪除"
-
-#: list-objects-filter-options.c:90
-#, c-format
-msgid "'%s' for 'object:type=<type>' is not a valid object type"
-msgstr "“object:type=<type>” 的 “%s” 不是有效的物件格式"
-
-#: list-objects-filter-options.c:109
-#, c-format
-msgid "invalid filter-spec '%s'"
-msgstr "無效的過濾器規格 '%s'"
-
-#: list-objects-filter-options.c:125
-#, c-format
-msgid "must escape char in sub-filter-spec: '%c'"
-msgstr "必須對 sub-filter-spec 中的字元進行轉義：'%c'"
-
-#: list-objects-filter-options.c:167
-msgid "expected something after combine:"
-msgstr "期望在組合後有一些東西："
-
-#: list-objects-filter-options.c:249
-msgid "multiple filter-specs cannot be combined"
-msgstr "不能混用多種過濾規格"
-
-#: list-objects-filter-options.c:365
-msgid "unable to upgrade repository format to support partial clone"
-msgstr "無法升級版本庫格式，以致不支援部分複製"
-
-#: list-objects-filter.c:532
-#, c-format
-msgid "unable to access sparse blob in '%s'"
-msgstr "不能存取 '%s' 中的稀疏資料物件"
-
-#: list-objects-filter.c:535
-#, c-format
-msgid "unable to parse sparse filter data in %s"
-msgstr "無法解析 %s 中的稀疏過濾器資料"
-
-#: list-objects.c:144
-#, c-format
-msgid "entry '%s' in tree %s has tree mode, but is not a tree"
-msgstr "樹 %2$s 中的條目 '%1$s' 具有樹的屬性，但不是一個樹狀物件"
-
-#: list-objects.c:157
-#, c-format
-msgid "entry '%s' in tree %s has blob mode, but is not a blob"
-msgstr "樹 %2$s 中的條目 '%1$s' 具有資料物件的屬性，但不是一個資料物件"
-
-#: list-objects.c:415
-#, c-format
-msgid "unable to load root tree for commit %s"
-msgstr "無法為提交 %s 載入根樹"
-
-#: lockfile.c:152
-#, c-format
-msgid ""
-"Unable to create '%s.lock': %s.\n"
-"\n"
-"Another git process seems to be running in this repository, e.g.\n"
-"an editor opened by 'git commit'. Please make sure all processes\n"
-"are terminated then try again. If it still fails, a git process\n"
-"may have crashed in this repository earlier:\n"
-"remove the file manually to continue."
-msgstr ""
-"無法建立 '%s.lock'：%s。\n"
-"\n"
-"這個版本庫似乎有另一個 git 處理程序在執行，\n"
-"例如「git commit」命令開啟的編輯器。\n"
-"請確認所有處理程序都已經終止後再重試一次。如果錯誤沒有消失，\n"
-"有可能是之前在這個版本庫執行的 git 處理程序當掉了。\n"
-"如果是這樣，請自行刪除這個檔案再繼續。"
-
-#: lockfile.c:160
-#, c-format
-msgid "Unable to create '%s.lock': %s"
-msgstr "不能建立 '%s.lock'：%s"
-
-#: ls-refs.c:175
-#, c-format
-msgid "unexpected line: '%s'"
-msgstr "遇到非預期橫列：「%s」"
-
-#: ls-refs.c:179
-msgid "expected flush after ls-refs arguments"
-msgstr "在 ls-refs 引數之後應該有一個 flush 包"
-
-#: mailinfo.c:1050
-msgid "quoted CRLF detected"
-msgstr "偵測到由可列印字元 (quoted) 所組成的 CRLF"
-
-#: mailinfo.c:1254 builtin/am.c:185 builtin/mailinfo.c:46
-#, c-format
-msgid "bad action '%s' for '%s'"
-msgstr "「%s」動作對「%s」無效"
-
-#: merge-ort.c:1630 merge-recursive.c:1214
-#, c-format
-msgid "Failed to merge submodule %s (not checked out)"
-msgstr "無法合併子模組 %s （沒有簽出）"
-
-#: merge-ort.c:1639 merge-recursive.c:1221
-#, c-format
-msgid "Failed to merge submodule %s (commits not present)"
-msgstr "無法合併子模組 %s（提交不存在）"
-
-#: merge-ort.c:1648 merge-recursive.c:1228
-#, c-format
-msgid "Failed to merge submodule %s (commits don't follow merge-base)"
-msgstr "無法合併子模組 %s （提交未跟隨合併基礎）"
-
-#: merge-ort.c:1658 merge-ort.c:1666
-#, c-format
-msgid "Note: Fast-forwarding submodule %s to %s"
-msgstr "注意：正在將 %s 子模組快轉到 %s"
-
-#: merge-ort.c:1688
-#, c-format
-msgid "Failed to merge submodule %s"
-msgstr "無法合併 %s 子模組"
-
-#: merge-ort.c:1695
-#, c-format
-msgid ""
-"Failed to merge submodule %s, but a possible merge resolution exists:\n"
-"%s\n"
-msgstr ""
-"無法合併 %s 子模組，但有找到一個可行的合併方案：\n"
-"%s\n"
-
-#: merge-ort.c:1699 merge-recursive.c:1284
-#, c-format
-msgid ""
-"If this is correct simply add it to the index for example\n"
-"by using:\n"
-"\n"
-"  git update-index --cacheinfo 160000 %s \"%s\"\n"
-"\n"
-"which will accept this suggestion.\n"
-msgstr ""
-"正確的話，就能直接加進索引，例如執行下述命令：\n"
-"\n"
-"  git update-index --cacheinfo 160000 %s \"%s\"\n"
-"\n"
-"接受本建議。\n"
-
-#: merge-ort.c:1712
-#, c-format
-msgid ""
-"Failed to merge submodule %s, but multiple possible merges exist:\n"
-"%s"
-msgstr ""
-"無法合併 %s 子模組，但有找到幾個可行的合併方案：\n"
-"%s"
-
-#: merge-ort.c:1937 merge-recursive.c:1375
-msgid "Failed to execute internal merge"
-msgstr "無法執行內部合併"
-
-#: merge-ort.c:1942 merge-recursive.c:1380
-#, c-format
-msgid "Unable to add %s to database"
-msgstr "不能新增 %s 至物件庫"
-
-#: merge-ort.c:1949 merge-recursive.c:1413
-#, c-format
-msgid "Auto-merging %s"
-msgstr "自動合併 %s"
-
-#: merge-ort.c:2088 merge-recursive.c:2135
-#, 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 ""
-"衝突（隱式目錄重新命名）：處於隱式目錄重新命名的現存檔案/目錄 %s，將以下路徑"
-"放在：%s。"
-
-#: merge-ort.c:2098 merge-recursive.c:2145
-#, 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 ""
-"衝突（隱式目錄重新命名）：無法映射一個以上路徑到 %s，隱式目錄重新命名嘗試將這"
-"些路徑放置於此：%s"
-
-#: merge-ort.c:2156
-#, c-format
-msgid ""
-"CONFLICT (directory rename split): Unclear where to rename %s to; it was "
-"renamed to multiple other directories, with no destination getting a "
-"majority of the files."
-msgstr ""
-"衝突（分割的目錄重新命名）：未知 %s 重新命名的位置。它被重新命名為多個其他目"
-"錄，但沒有目的地取得過半檔案。"
-
-#: merge-ort.c:2310 merge-recursive.c:2481
-#, c-format
-msgid ""
-"WARNING: Avoiding applying %s -> %s rename to %s, because %s itself was "
-"renamed."
-msgstr "警告：避免套用 %s -> %s 的重新命名到 %s，因為 %s 本身已被重新命名。"
-
-#: merge-ort.c:2450 merge-recursive.c:3264
-#, c-format
-msgid ""
-"Path updated: %s added in %s inside a directory that was renamed in %s; "
-"moving it to %s."
-msgstr ""
-"路徑已更新：%s 新增到 %s，位於一個被重新命名到 %s 的目錄中，將其移動到 %s。"
-
-#: merge-ort.c:2457 merge-recursive.c:3271
-#, c-format
-msgid ""
-"Path updated: %s renamed to %s in %s, inside a directory that was renamed in "
-"%s; moving it to %s."
-msgstr ""
-"路徑已更新：%1$s 重新命名為 %3$s 中的 %2$s，而該目錄被重新命名到 %4$s 中，將"
-"其移動到 %5$s。"
-
-#: merge-ort.c:2470 merge-recursive.c:3267
-#, 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 ""
-"衝突（檔案位置）：%s 新增到 %s，位於一個被重新命名為 %s 的目錄中，建議將其移"
-"動到 %s。"
-
-#: merge-ort.c:2478 merge-recursive.c:3274
-#, 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 ""
-"衝突（檔案位置）：%1$s 重新命名為 %3$s 中的 %2$s，而該目錄被重新命名到 %4$s "
-"中，建議將其移動到 %5$s。"
-
-#: merge-ort.c:2634
-#, 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:2729
-#, 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."
-msgstr ""
-"衝突（重新命名陷入相撞）：%s -> %s 這個重新命名有內容衝突並與其他路徑相撞，可"
-"能會因此出現巢狀衝突標記。"
-
-#: merge-ort.c:2748 merge-ort.c:2772
-#, 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:3261 merge-recursive.c:3025
-#, c-format
-msgid "cannot read object %s"
-msgstr "不能讀取物件 %s"
-
-#: merge-ort.c:3264 merge-recursive.c:3028
-#, c-format
-msgid "object %s is not a blob"
-msgstr "物件 %s 不是一個資料物件"
-
-#: merge-ort.c:3693
-#, 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:3770
-#, c-format
-msgid ""
-"CONFLICT (distinct types): %s had different types on each side; renamed both "
-"of them so each can be recorded somewhere."
-msgstr ""
-"衝突（類型有異）：兩方的 %s 類型皆不同。已經重新命名這兩個來源，這樣就可以分"
-"別記錄這兩方檔案。"
-
-#: merge-ort.c:3777
-#, c-format
-msgid ""
-"CONFLICT (distinct types): %s had different types on each side; renamed one "
-"of them so each can be recorded somewhere."
-msgstr ""
-"衝突（類型有異）：兩方的 %s 類型皆不同。已經重新命名其中一個來源，這樣就可以"
-"分別記錄這兩方檔案。"
-
-#: merge-ort.c:3866 merge-recursive.c:3104
-msgid "content"
-msgstr "內容"
-
-#: merge-ort.c:3868 merge-recursive.c:3108
-msgid "add/add"
-msgstr "新增/新增"
-
-#: merge-ort.c:3870 merge-recursive.c:3153
-msgid "submodule"
-msgstr "子模組"
-
-#: merge-ort.c:3872 merge-recursive.c:3154
-#, c-format
-msgid "CONFLICT (%s): Merge conflict in %s"
-msgstr "衝突（%s）：合併衝突於 %s"
-
-#: merge-ort.c:3916
-#, c-format
-msgid ""
-"CONFLICT (modify/delete): %s deleted in %s and modified in %s.  Version %s "
-"of %s left in tree."
-msgstr ""
-"衝突（修改/刪除）：%1$s 已在 %2$s 刪除和在 %3$s 修改。%5$s 的 %4$s 版本留在樹"
-"上。"
-
-#: merge-ort.c:4212
-#, c-format
-msgid ""
-"Note: %s not up to date and in way of checking out conflicted version; old "
-"copy renamed to %s"
-msgstr "註：%s 不是最新且干擾到簽出衝突版本。已將舊拷貝重新命名至 %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:4586
-#, c-format
-msgid "collecting merge info failed for trees %s, %s, %s"
-msgstr "%s, %s, %s 樹的合併資訊收集失敗"
-
-#: merge-ort-wrappers.c:13 merge-recursive.c:3723
-#, c-format
-msgid ""
-"Your local changes to the following files would be overwritten by merge:\n"
-"  %s"
-msgstr ""
-"您對下列檔案的本機修改將被合併動作覆蓋：\n"
-"  %s"
-
-#: merge-ort-wrappers.c:33 merge-recursive.c:3485 builtin/merge.c:405
-msgid "Already up to date."
-msgstr "已經是最新的。"
-
-#: merge-recursive.c:353
-msgid "(bad commit)\n"
-msgstr "（壞提交）\n"
-
-#: merge-recursive.c:381
-#, c-format
-msgid "add_cacheinfo failed for path '%s'; merge aborting."
-msgstr "add_cacheinfo 對路徑 '%s' 執行失敗，合併終止。"
-
-#: merge-recursive.c:390
-#, c-format
-msgid "add_cacheinfo failed to refresh for path '%s'; merge aborting."
-msgstr "add_cacheinfo 無法重新整理路徑 '%s'，合併終止。"
-
-#: merge-recursive.c:881
-#, c-format
-msgid "failed to create path '%s'%s"
-msgstr "建立路徑 '%s'%s 失敗"
-
-#: merge-recursive.c:892
-#, c-format
-msgid "Removing %s to make room for subdirectory\n"
-msgstr "刪除 %s 以便為子目錄留出空間\n"
-
-#: merge-recursive.c:906 merge-recursive.c:925
-msgid ": perhaps a D/F conflict?"
-msgstr "：可能是一個目錄/檔案衝突？"
-
-#: merge-recursive.c:915
-#, c-format
-msgid "refusing to lose untracked file at '%s'"
-msgstr "拒絕捨棄 '%s' 中的未追蹤檔案"
-
-#: merge-recursive.c:956 builtin/cat-file.c:47
-#, c-format
-msgid "cannot read object %s '%s'"
-msgstr "不能讀取物件 %s '%s'"
-
-#: merge-recursive.c:961
-#, c-format
-msgid "blob expected for %s '%s'"
-msgstr "%s '%s' 應為資料物件"
-
-#: merge-recursive.c:986
-#, c-format
-msgid "failed to open '%s': %s"
-msgstr "開啟 '%s' 失敗：%s"
-
-#: merge-recursive.c:997
-#, c-format
-msgid "failed to symlink '%s': %s"
-msgstr "建立符號連結 '%s' 失敗：%s"
-
-#: merge-recursive.c:1002
-#, c-format
-msgid "do not know what to do with %06o %s '%s'"
-msgstr "不知道如何處理 %06o %s '%s'"
-
-#: merge-recursive.c:1236 merge-recursive.c:1249
-#, c-format
-msgid "Fast-forwarding submodule %s to the following commit:"
-msgstr "子模組 %s 快轉到如下提交："
-
-#: merge-recursive.c:1239 merge-recursive.c:1252
-#, c-format
-msgid "Fast-forwarding submodule %s"
-msgstr "快轉子模組 %s"
-
-#: merge-recursive.c:1276
-#, c-format
-msgid "Failed to merge submodule %s (merge following commits not found)"
-msgstr "無法合併子模組 %s （沒發現合併跟隨的提交）"
-
-#: merge-recursive.c:1280
-#, c-format
-msgid "Failed to merge submodule %s (not fast-forward)"
-msgstr "無法合併子模組 %s（非快轉）"
-
-#: merge-recursive.c:1281
-msgid "Found a possible merge resolution for the submodule:\n"
-msgstr "找到子模組的一個可能的合併方案：\n"
-
-#: merge-recursive.c:1293
-#, c-format
-msgid "Failed to merge submodule %s (multiple merges found)"
-msgstr "無法合併子模組 %s （發現多個合併）"
-
-#: merge-recursive.c:1437
-#, c-format
-msgid "Error: Refusing to lose untracked file at %s; writing to %s instead."
-msgstr "錯誤：拒絕遺失未追蹤檔案 '%s'，而是寫入 %s。"
-
-#: merge-recursive.c:1509
-#, c-format
-msgid ""
-"CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s left "
-"in tree."
-msgstr ""
-"衝突（%1$s/刪除）：%2$s 在 %3$s 中被刪除，在 %5$s 中被 %4$s。%7$s 的 %6$s 版"
-"本被保留。"
-
-#: merge-recursive.c:1514
-#, c-format
-msgid ""
-"CONFLICT (%s/delete): %s deleted in %s and %s to %s in %s. Version %s of %s "
-"left in tree."
-msgstr ""
-"衝突（%1$s/刪除）：%2$s 在 %3$s 中被刪除，在 %6$s 中的 %5$s 被 %4$s。%8$s 的 "
-"%7$s 版本被保留。"
-
-#: merge-recursive.c:1521
-#, c-format
-msgid ""
-"CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s left "
-"in tree at %s."
-msgstr ""
-"衝突（%1$s/刪除）：%2$s 在 %3$s 中被刪除，在 %5$s 中被 %4$s。%7$s 的 %6$s 版"
-"本保留在 %8$s 中。"
-
-#: merge-recursive.c:1526
-#, 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 ""
-"衝突（%1$s/刪除）：%2$s 在 %3$s 中被刪除，在 %6$s 中的 %5$s 被 %4$s。%8$s 的 "
-"%7$s 版本保留在 %9$s 中。"
-
-#: merge-recursive.c:1561
-msgid "rename"
-msgstr "重新命名"
-
-#: merge-recursive.c:1561
-msgid "renamed"
-msgstr "重新命名"
-
-#: merge-recursive.c:1612 merge-recursive.c:2518 merge-recursive.c:3181
-#, c-format
-msgid "Refusing to lose dirty file at %s"
-msgstr "拒絕遺失髒檔案 '%s'"
-
-#: merge-recursive.c:1622
-#, c-format
-msgid "Refusing to lose untracked file at %s, even though it's in the way."
-msgstr "拒絕在 '%s' 處失去未追蹤檔案，即使它存在於重新命名中。"
-
-#: merge-recursive.c:1680
-#, 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:1711
-#, c-format
-msgid "%s is a directory in %s adding as %s instead"
-msgstr "%s 是 %s 中的一個目錄而已 %s 為名被新增"
-
-#: merge-recursive.c:1716
-#, c-format
-msgid "Refusing to lose untracked file at %s; adding as %s instead"
-msgstr "拒絕遺失未追蹤檔案 '%s'，而是新增為 %s"
-
-#: merge-recursive.c:1743
-#, c-format
-msgid ""
-"CONFLICT (rename/rename): Rename \"%s\"->\"%s\" in branch \"%s\" rename \"%s"
-"\"->\"%s\" in \"%s\"%s"
-msgstr ""
-"衝突（重新命名/重新命名）：在分支 \"%3$s\" 中重新命名 \"%1$s\"->\"%2$s\"，在"
-"分支 \"%6$s\" 中重新命名 \"%4$s\"->\"%5$s\"%7$s"
-
-#: merge-recursive.c:1748
-msgid " (left unresolved)"
-msgstr " （留下未解決）"
-
-#: merge-recursive.c:1840
-#, 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:2103
-#, c-format
-msgid ""
-"CONFLICT (directory rename split): Unclear where to place %s because "
-"directory %s was renamed to multiple other directories, with no destination "
-"getting a majority of the files."
-msgstr ""
-"衝突（分割的目錄重新命名）：不清楚 %s 應該放在哪裡，因為目錄 %s 被重新命名到"
-"多個其它目錄，沒有目錄包含大部分檔案。"
-
-#: merge-recursive.c:2237
-#, c-format
-msgid ""
-"CONFLICT (rename/rename): Rename directory %s->%s in %s. Rename directory %s-"
-">%s in %s"
-msgstr ""
-"衝突（重新命名/重新命名）：在 %3$s 中重新命名目錄 %1$s->%2$s，在 %6$s 中重新"
-"命名目錄 %4$s->%5$s"
-
-#: merge-recursive.c:3092
-msgid "modify"
-msgstr "修改"
-
-#: merge-recursive.c:3092
-msgid "modified"
-msgstr "修改"
-
-#: merge-recursive.c:3131
-#, c-format
-msgid "Skipped %s (merged same as existing)"
-msgstr "略過 %s（已經做過相同合併）"
-
-#: merge-recursive.c:3184
-#, c-format
-msgid "Adding as %s instead"
-msgstr "而是以 %s 為名新增"
-
-#: merge-recursive.c:3388
-#, c-format
-msgid "Removing %s"
-msgstr "刪除 %s"
-
-#: merge-recursive.c:3411
-msgid "file/directory"
-msgstr "檔案/目錄"
-
-#: merge-recursive.c:3416
-msgid "directory/file"
-msgstr "目錄/檔案"
-
-#: merge-recursive.c:3423
-#, 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:3432
-#, c-format
-msgid "Adding %s"
-msgstr "新增 %s"
-
-#: merge-recursive.c:3441
-#, c-format
-msgid "CONFLICT (add/add): Merge conflict in %s"
-msgstr "衝突（add/add）：合併衝突於 %s"
-
-#: merge-recursive.c:3494
-#, c-format
-msgid "merging of trees %s and %s failed"
-msgstr "無法合併樹 %s 和 %s"
-
-#: merge-recursive.c:3588
-msgid "Merging:"
-msgstr "合併："
-
-#: merge-recursive.c:3601
-#, c-format
-msgid "found %u common ancestor:"
-msgid_plural "found %u common ancestors:"
-msgstr[0] "發現 %u 個共同祖先："
-
-#: merge-recursive.c:3651
-msgid "merge returned no commit"
-msgstr "合併未返回提交"
-
-#: merge-recursive.c:3823
-#, c-format
-msgid "Could not parse object '%s'"
-msgstr "不能解析物件 '%s'"
-
-#: merge-recursive.c:3841 builtin/merge.c:720 builtin/merge.c:912
-#: builtin/stash.c:489
-msgid "Unable to write index."
-msgstr "不能寫入索引。"
-
-#: merge.c:41
-msgid "failed to read the cache"
-msgstr "讀取快取失敗"
-
-#: merge.c:102 rerere.c:705 builtin/am.c:1989 builtin/am.c:2023
-#: builtin/checkout.c:603 builtin/checkout.c:865 builtin/clone.c:714
-#: builtin/stash.c:269
-msgid "unable to write new index file"
-msgstr "無法寫新的索引檔案"
-
-#: midx.c:79
-msgid "multi-pack-index OID fanout is of the wrong size"
-msgstr "多包索引的物件 ID fanout 大小錯誤"
-
-#: midx.c:112
-#, c-format
-msgid "multi-pack-index file %s is too small"
-msgstr "多包索引檔案 %s 太小"
-
-#: midx.c:128
-#, c-format
-msgid "multi-pack-index signature 0x%08x does not match signature 0x%08x"
-msgstr "多包索引簽名 0x%08x 和簽名 0x%08x 不符合"
-
-#: midx.c:133
-#, c-format
-msgid "multi-pack-index version %d not recognized"
-msgstr "multi-pack-index 版本 %d 不能被識別"
-
-#: midx.c:138
-#, c-format
-msgid "multi-pack-index hash version %u does not match version %u"
-msgstr "multi-pack-index 雜湊版本 %u 與版本 %u 不符合"
-
-#: midx.c:155
-msgid "multi-pack-index missing required pack-name chunk"
-msgstr "多包索引缺少必需的包名區塊"
-
-#: midx.c:157
-msgid "multi-pack-index missing required OID fanout chunk"
-msgstr "多包索引缺少必需的物件 ID fanout 區塊"
-
-#: midx.c:159
-msgid "multi-pack-index missing required OID lookup chunk"
-msgstr "多包索引缺少必需的物件 ID 查詢區塊"
-
-#: midx.c:161
-msgid "multi-pack-index missing required object offsets chunk"
-msgstr "多包索引缺少必需的物件位移區塊"
-
-#: midx.c:180
-#, c-format
-msgid "multi-pack-index pack names out of order: '%s' before '%s'"
-msgstr "多包索引包名無序：'%s' 在 '%s' 之前"
-
-#: midx.c:228
-#, c-format
-msgid "bad pack-int-id: %u (%u total packs)"
-msgstr "錯的 pack-int-id：%u（共有 %u 個包）"
-
-#: midx.c:278
-msgid "multi-pack-index stores a 64-bit offset, but off_t is too small"
-msgstr "多包索引儲存一個64位位移，但是 off_t 太小"
-
-#: midx.c:509
-#, c-format
-msgid "failed to add packfile '%s'"
-msgstr "新增 packfile '%s' 失敗"
-
-#: midx.c:515
-#, c-format
-msgid "failed to open pack-index '%s'"
-msgstr "開啟包索引 '%s' 失敗"
-
-#: midx.c:583
-#, c-format
-msgid "failed to locate object %d in packfile"
-msgstr "在 packfile 中定位物件 %d 失敗"
-
-#: midx.c:911
-msgid "cannot store reverse index file"
-msgstr "無法儲存倒排索引檔案"
-
-#: midx.c:1009
-#, c-format
-msgid "could not parse line: %s"
-msgstr "無法解析橫列：%s"
-
-#: midx.c:1011
-#, c-format
-msgid "malformed line: %s"
-msgstr "橫列格式錯誤：%s"
-
-#: midx.c:1181
-msgid "ignoring existing multi-pack-index; checksum mismatch"
-msgstr "忽略現有的多包索引：總和檢查碼不符"
-
-#: midx.c:1206
-msgid "could not load pack"
-msgstr "無法載入包"
-
-#: midx.c:1212
-#, c-format
-msgid "could not open index for %s"
-msgstr "無法開啟 %s 的索引"
-
-#: midx.c:1223
-msgid "Adding packfiles to multi-pack-index"
-msgstr "正在新增 packfile 至多包索引"
-
-#: midx.c:1266
-#, c-format
-msgid "unknown preferred pack: '%s'"
-msgstr "未知偏好包：「%s」"
-
-#: midx.c:1311
-#, c-format
-msgid "cannot select preferred pack %s with no objects"
-msgstr "無法選取偏好，沒有物件的 %s 包"
-
-#: midx.c:1343
-#, c-format
-msgid "did not see pack-file %s to drop"
-msgstr "沒有看到要捨棄的包檔案 %s"
-
-#: midx.c:1389
-#, c-format
-msgid "preferred pack '%s' is expired"
-msgstr "偏好包「%s」已經過期"
-
-#: midx.c:1402
-msgid "no pack files to index."
-msgstr "沒有要索引的 pack 檔案。"
-
-#: midx.c:1409
-msgid "refusing to write multi-pack .bitmap without any objects"
-msgstr "拒絕寫入無任何物件的多包 .bitmap"
-
-#: midx.c:1451
-msgid "could not write multi-pack bitmap"
-msgstr "無法寫入多包位圖"
-
-#: midx.c:1461
-msgid "could not write multi-pack-index"
-msgstr "無法寫入多包索引"
-
-#: midx.c:1520 builtin/clean.c:37
-#, c-format
-msgid "failed to remove %s"
-msgstr "刪除 %s 失敗"
-
-#: midx.c:1553
-#, c-format
-msgid "failed to clear multi-pack-index at %s"
-msgstr "清理位於 %s 的多包索引失敗"
-
-#: midx.c:1616
-msgid "multi-pack-index file exists, but failed to parse"
-msgstr "有 multi-pack-index 檔案，但無法解析"
-
-#: midx.c:1624
-msgid "incorrect checksum"
-msgstr "總和檢查碼不正確"
-
-#: midx.c:1627
-msgid "Looking for referenced packfiles"
-msgstr "正在尋找引用的 packfile"
-
-#: midx.c:1642
-#, c-format
-msgid ""
-"oid fanout out of order: fanout[%d] = %<PRIx32> > %<PRIx32> = fanout[%d]"
-msgstr "物件 ID 扇出無序：fanout[%d] = %<PRIx32> > %<PRIx32> = fanout[%d]"
-
-#: midx.c:1647
-msgid "the midx contains no oid"
-msgstr "midx 沒有 oid"
-
-#: midx.c:1656
-msgid "Verifying OID order in multi-pack-index"
-msgstr "正在驗證多包索引中的物件 ID 順序"
-
-#: midx.c:1665
-#, c-format
-msgid "oid lookup out of order: oid[%d] = %s >= %s = oid[%d]"
-msgstr "物件 ID 查詢無序：oid[%d] = %s >= %s = oid[%d]"
-
-#: midx.c:1685
-msgid "Sorting objects by packfile"
-msgstr "透過 packfile 為物件排序"
-
-#: midx.c:1692
-msgid "Verifying object offsets"
-msgstr "正在驗證物件位移"
-
-#: midx.c:1708
-#, c-format
-msgid "failed to load pack entry for oid[%d] = %s"
-msgstr "為 oid[%d] = %s 載入包條目失敗"
-
-#: midx.c:1714
-#, c-format
-msgid "failed to load pack-index for packfile %s"
-msgstr "為 packfile %s 載入包索引失敗"
-
-#: midx.c:1723
-#, c-format
-msgid "incorrect object offset for oid[%d] = %s: %<PRIx64> != %<PRIx64>"
-msgstr "oid[%d] = %s 錯誤的物件位移：%<PRIx64> != %<PRIx64>"
-
-#: midx.c:1750
-msgid "Counting referenced objects"
-msgstr "正在計算引用物件"
-
-#: midx.c:1760
-msgid "Finding and deleting unreferenced packfiles"
-msgstr "正在尋找並刪除沒有引用的 packfile"
-
-#: midx.c:1952
-msgid "could not start pack-objects"
-msgstr "不能開始 pack-objects"
-
-#: midx.c:1972
-msgid "could not finish pack-objects"
-msgstr "不能結束 pack-objects"
-
-#: name-hash.c:542
-#, c-format
-msgid "unable to create lazy_dir thread: %s"
-msgstr "不能建立 lazy_dir 執行緒：%s"
-
-#: name-hash.c:564
-#, c-format
-msgid "unable to create lazy_name thread: %s"
-msgstr "不能建立 lazy_name 執行緒：%s"
-
-#: name-hash.c:570
-#, c-format
-msgid "unable to join lazy_name thread: %s"
-msgstr "不能加入 lazy_name 執行緒：%s"
-
-#: notes-merge.c:276
-#, 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."
-msgstr ""
-"您的前一次備註合併尚未結束（存在 %s）。\n"
-"在開始一個新的備註合併之前，請使用 'git notes merge --commit' 或者 'git "
-"notes merge --abort' 來提交/終止前一次合併。"
-
-#: notes-merge.c:283
-#, c-format
-msgid "You have not concluded your notes merge (%s exists)."
-msgstr "您尚未結束備註合併（存在 %s）。"
-
-#: notes-utils.c:46
-msgid "Cannot commit uninitialized/unreferenced notes tree"
-msgstr "不能提交未初始化/未引用的註解樹"
-
-#: notes-utils.c:105
-#, c-format
-msgid "Bad notes.rewriteMode value: '%s'"
-msgstr "壞的 notes.rewriteMode 值：'%s'"
-
-#: notes-utils.c:115
-#, c-format
-msgid "Refusing to rewrite notes in %s (outside of refs/notes/)"
-msgstr "拒絕向 %s（在 refs/notes/ 之外）寫入註解"
-
-#. TRANSLATORS: The first %s is the name of
-#. the environment variable, the second %s is
-#. its value.
-#.
-#: notes-utils.c:145
-#, c-format
-msgid "Bad %s value: '%s'"
-msgstr "壞的 %s 值：'%s'"
-
-#: object-file.c:457
-#, c-format
-msgid "object directory %s does not exist; check .git/objects/info/alternates"
-msgstr "物件目錄 %s 不存在，檢查 .git/objects/info/alternates"
-
-#: object-file.c:515
-#, c-format
-msgid "unable to normalize alternate object path: %s"
-msgstr "無法規範化備用物件路徑：%s"
-
-#: object-file.c:589
-#, c-format
-msgid "%s: ignoring alternate object stores, nesting too deep"
-msgstr "%s：忽略備用物件庫，嵌套太深"
-
-#: object-file.c:596
-#, c-format
-msgid "unable to normalize object directory: %s"
-msgstr "無法規範化物件目錄: %s"
-
-#: object-file.c:639
-msgid "unable to fdopen alternates lockfile"
-msgstr "無法 fdopen 取代鎖檔案"
-
-#: object-file.c:657
-msgid "unable to read alternates file"
-msgstr "無法讀取替代檔案"
-
-#: object-file.c:664
-msgid "unable to move new alternates file into place"
-msgstr "無法將新的替代檔案移動到位"
-
-#: object-file.c:742
-#, c-format
-msgid "path '%s' does not exist"
-msgstr "路徑 '%s' 不存在"
-
-#: object-file.c:763
-#, c-format
-msgid "reference repository '%s' as a linked checkout is not supported yet."
-msgstr "尚不支援將引用版本庫 '%s' 作為一個連結簽出。"
-
-#: object-file.c:769
-#, c-format
-msgid "reference repository '%s' is not a local repository."
-msgstr "引用版本庫 '%s' 不是一個本機版本庫。"
-
-#: object-file.c:775
-#, c-format
-msgid "reference repository '%s' is shallow"
-msgstr "引用版本庫 '%s' 是一個淺複製"
-
-#: object-file.c:783
-#, c-format
-msgid "reference repository '%s' is grafted"
-msgstr "引用版本庫 '%s' 已被移植"
-
-#: object-file.c:814
-#, c-format
-msgid "could not find object directory matching %s"
-msgstr "找不到符合 %s 的物件目錄"
-
-#: object-file.c:864
-#, c-format
-msgid "invalid line while parsing alternate refs: %s"
-msgstr "解析備用引用時無效的行：%s"
-
-#: object-file.c:1014
-#, c-format
-msgid "attempting to mmap %<PRIuMAX> over limit %<PRIuMAX>"
-msgstr "嘗試 mmap %<PRIuMAX>，超過了最大值 %<PRIuMAX>"
-
-#: object-file.c:1049
-#, c-format
-msgid "mmap failed%s"
-msgstr "mmap 失敗%s"
-
-#: object-file.c:1230
-#, c-format
-msgid "object file %s is empty"
-msgstr "物件檔案 %s 為空"
-
-#: object-file.c:1349 object-file.c:2588
-#, c-format
-msgid "corrupt loose object '%s'"
-msgstr "損壞的鬆散物件 '%s'"
-
-#: object-file.c:1351 object-file.c:2592
-#, c-format
-msgid "garbage at end of loose object '%s'"
-msgstr "鬆散物件 '%s' 後面有垃圾資料"
-
-#: object-file.c:1473
-#, c-format
-msgid "unable to parse %s header"
-msgstr "無法解析 %s 頭部"
-
-#: object-file.c:1475
-msgid "invalid object type"
-msgstr "無效的物件類型"
-
-#: object-file.c:1486
-#, c-format
-msgid "unable to unpack %s header"
-msgstr "無法解開 %s 頭部"
-
-#: object-file.c:1490
-#, c-format
-msgid "header for %s too long, exceeds %d bytes"
-msgstr "%s 的標頭過長，超出 %d 位元組"
-
-#: object-file.c:1720
-#, c-format
-msgid "failed to read object %s"
-msgstr "讀取物件 %s 失敗"
-
-#: object-file.c:1724
-#, c-format
-msgid "replacement %s not found for %s"
-msgstr "找不到 %2$s 的替代 %1$s"
-
-#: object-file.c:1728
-#, c-format
-msgid "loose object %s (stored in %s) is corrupt"
-msgstr "鬆散物件 %s（儲存在 %s）已損壞"
-
-#: object-file.c:1732
-#, c-format
-msgid "packed object %s (stored in %s) is corrupt"
-msgstr "打包物件 %s（儲存在 %s）已損壞"
-
-#: object-file.c:1855
-#, c-format
-msgid "unable to write file %s"
-msgstr "無法寫檔案 %s"
-
-#: object-file.c:1862
-#, c-format
-msgid "unable to set permission to '%s'"
-msgstr "無法為 '%s' 設定權限"
-
-#: object-file.c:1869
-msgid "file write error"
-msgstr "檔案寫錯誤"
-
-#: object-file.c:1904
-msgid "error when closing loose object file"
-msgstr "關閉鬆散物件檔案時發生錯誤"
-
-#: object-file.c:1971
-#, c-format
-msgid "insufficient permission for adding an object to repository database %s"
-msgstr "權限不足，無法在版本庫物件庫 %s 中新增物件"
-
-#: object-file.c:1973
-msgid "unable to create temporary file"
-msgstr "無法建立暫存檔"
-
-#: object-file.c:1997
-msgid "unable to write loose object file"
-msgstr "不能寫鬆散物件檔案"
-
-#: object-file.c:2003
-#, c-format
-msgid "unable to deflate new object %s (%d)"
-msgstr "不能壓縮新物件 %s（%d）"
-
-#: object-file.c:2007
-#, c-format
-msgid "deflateEnd on object %s failed (%d)"
-msgstr "在物件 %s 上呼叫 deflateEnd 失敗（%d）"
-
-#: object-file.c:2011
-#, c-format
-msgid "confused by unstable object source data for %s"
-msgstr "被 %s 的不穩定物件來源資料混淆"
-
-#: object-file.c:2022 builtin/pack-objects.c:1251
-#, c-format
-msgid "failed utime() on %s"
-msgstr "在 %s 上呼叫 utime() 失敗"
-
-#: object-file.c:2100
-#, c-format
-msgid "cannot read object for %s"
-msgstr "不能讀取物件 %s"
-
-#: object-file.c:2151
-msgid "corrupt commit"
-msgstr "損壞的提交"
-
-#: object-file.c:2159
-msgid "corrupt tag"
-msgstr "損壞的標籤"
-
-#: object-file.c:2259
-#, c-format
-msgid "read error while indexing %s"
-msgstr "索引 %s 時讀取錯誤"
-
-#: object-file.c:2262
-#, c-format
-msgid "short read while indexing %s"
-msgstr "索引 %s 時讀入不完整"
-
-#: object-file.c:2335 object-file.c:2345
-#, c-format
-msgid "%s: failed to insert into database"
-msgstr "%s：插入資料庫失敗"
-
-#: object-file.c:2351
-#, c-format
-msgid "%s: unsupported file type"
-msgstr "%s：不支援的檔案類型"
-
-#: object-file.c:2375 builtin/fetch.c:1494
-#, c-format
-msgid "%s is not a valid object"
-msgstr "%s 不是一個有效的物件"
-
-#: object-file.c:2377
-#, c-format
-msgid "%s is not a valid '%s' object"
-msgstr "%s 不是一個有效的 '%s' 物件"
-
-#: object-file.c:2404
-#, c-format
-msgid "unable to open %s"
-msgstr "不能開啟 %s"
-
-#: object-file.c:2599
-#, c-format
-msgid "hash mismatch for %s (expected %s)"
-msgstr "%s 的雜湊值不符合（預期 %s）"
-
-#: object-file.c:2622
-#, c-format
-msgid "unable to mmap %s"
-msgstr "不能 mmap %s"
-
-#: object-file.c:2628
-#, c-format
-msgid "unable to unpack header of %s"
-msgstr "無法解壓縮 %s 的頭部"
-
-#: object-file.c:2633
-#, c-format
-msgid "unable to parse header of %s"
-msgstr "無法解析 %s 的頭部"
-
-#: object-file.c:2644
-#, c-format
-msgid "unable to unpack contents of %s"
-msgstr "無法解壓縮 %s 的內容"
-
-#. TRANSLATORS: This is a line of ambiguous object
-#. output shown when we cannot look up or parse the
-#. object in question. E.g. "deadbeef [bad object]".
-#.
-#: object-name.c:382
-#, c-format
-msgid "%s [bad object]"
-msgstr "%s [無效物件]"
-
-#. TRANSLATORS: This is a line of ambiguous commit
-#. object output. E.g.:
-#. *
-#. "deadbeef commit 2021-01-01 - Some Commit Message"
-#.
-#: object-name.c:407
-#, c-format
-msgid "%s commit %s - %s"
-msgstr "%s 提交 %s - %s"
-
-#. TRANSLATORS: This is a line of ambiguous
-#. tag object output. E.g.:
-#. *
-#. "deadbeef tag 2022-01-01 - Some Tag Message"
-#. *
-#. The second argument is the YYYY-MM-DD found
-#. in the tag.
-#. *
-#. The third argument is the "tag" string
-#. from object.c.
-#.
-#: object-name.c:428
-#, c-format
-msgid "%s tag %s - %s"
-msgstr "%s 標籤 %s - %s"
-
-#. TRANSLATORS: This is a line of ambiguous
-#. tag object output where we couldn't parse
-#. the tag itself. E.g.:
-#. *
-#. "deadbeef [bad tag, could not parse it]"
-#.
-#: object-name.c:439
-#, c-format
-msgid "%s [bad tag, could not parse it]"
-msgstr "%s [無效標籤，無法解析]"
-
-#. TRANSLATORS: This is a line of ambiguous <type>
-#. object output. E.g. "deadbeef tree".
-#.
-#: object-name.c:447
-#, c-format
-msgid "%s tree"
-msgstr "%s 樹"
-
-#. TRANSLATORS: This is a line of ambiguous <type>
-#. object output. E.g. "deadbeef blob".
-#.
-#: object-name.c:453
-#, c-format
-msgid "%s blob"
-msgstr "%s blob"
-
-#: object-name.c:569
-#, c-format
-msgid "short object ID %s is ambiguous"
-msgstr "短物件 ID %s 存在歧義"
-
-#. TRANSLATORS: The argument is the list of ambiguous
-#. objects composed in show_ambiguous_object(). See
-#. its "TRANSLATORS" comments for details.
-#.
-#: object-name.c:591
-#, c-format
-msgid ""
-"The candidates are:\n"
-"%s"
-msgstr ""
-"候選物件有：\n"
-"%s"
-
-#: object-name.c:888
-msgid ""
-"Git normally never creates a ref that ends with 40 hex characters\n"
-"because it will be ignored when you just specify 40-hex. These refs\n"
-"may be created by mistake. For example,\n"
-"\n"
-"  git switch -c $br $(git rev-parse ...)\n"
-"\n"
-"where \"$br\" is somehow empty and a 40-hex ref is created. Please\n"
-"examine these refs and maybe delete them. Turn this message off by\n"
-"running \"git config advice.objectNameWarning false\""
-msgstr ""
-"Git 通常不會建立以 40 個十六進位字元結尾的引用，\n"
-"因為當您只提供 40 個十六進位字元時，其將被忽略。\n"
-"這些引用可能被意外建立。例如：\n"
-"\n"
-"  git switch -c $br $(git rev-parse ...)\n"
-"\n"
-"當「$br」因為某些原因空白時，會建立出 40 位十六進位的引用。\n"
-"請檢查這些引用，並視需要刪除。執行\n"
-"「git config advice.objectNameWarning false」命令以關閉本訊息通知"
-
-#: object-name.c:1008
-#, c-format
-msgid "log for '%.*s' only goes back to %s"
-msgstr "'%.*s' 的日誌只能回到 %s"
-
-#: object-name.c:1016
-#, c-format
-msgid "log for '%.*s' only has %d entries"
-msgstr "'%.*s' 的日誌只有 %d 個項目"
-
-#: object-name.c:1794
-#, c-format
-msgid "path '%s' exists on disk, but not in '%.*s'"
-msgstr "磁碟上存在 '%s' 路徑，但不存在於 '%.*s'"
-
-#: object-name.c:1800
-#, c-format
-msgid ""
-"path '%s' exists, but not '%s'\n"
-"hint: Did you mean '%.*s:%s' aka '%.*s:./%s'?"
-msgstr ""
-"'%s' 路徑存在，但不是 '%s'\n"
-"提示：你在說 '%.*s:%s'，即 '%.*s:./%s' 嗎？"
-
-#: object-name.c:1809
-#, c-format
-msgid "path '%s' does not exist in '%.*s'"
-msgstr "'%s' 路徑不存在於 '%.*s'"
-
-#: object-name.c:1837
-#, c-format
-msgid ""
-"path '%s' is in the index, but not at stage %d\n"
-"hint: Did you mean ':%d:%s'?"
-msgstr ""
-"'%s' 路徑在索引，但不在 %d 暫存區\n"
-"提示：你在說 ':%d:%s' 嗎？"
-
-#: object-name.c:1853
-#, c-format
-msgid ""
-"path '%s' is in the index, but not '%s'\n"
-"hint: Did you mean ':%d:%s' aka ':%d:./%s'?"
-msgstr ""
-"'%s' 路徑在索引，但不是 '%s'\n"
-"提示：你在說 ':%d:%s'，即 ':%d:%s' 嗎？"
-
-#: object-name.c:1861
-#, c-format
-msgid "path '%s' exists on disk, but not in the index"
-msgstr "磁碟上存在 '%s' 路徑，但不在索引中"
-
-#: object-name.c:1863
-#, c-format
-msgid "path '%s' does not exist (neither on disk nor in the index)"
-msgstr "'%s' 路徑不存在 (既不存在磁碟，也不存在索引)"
-
-#: object-name.c:1876
-msgid "relative path syntax can't be used outside working tree"
-msgstr "相對路徑與法不能用在工作區外"
-
-#: object-name.c:1901
-#, c-format
-msgid "<object>:<path> required, only <object> '%s' given"
-msgstr "需要指定 <object>:<path>，卻只指定 <object>「%s」"
-
-#: object-name.c:2014
-#, c-format
-msgid "invalid object name '%.*s'."
-msgstr "'%.*s' 物件名稱無效。"
-
-#: object.c:53
-#, c-format
-msgid "invalid object type \"%s\""
-msgstr "無效的物件類型 \"%s\""
-
-#: object.c:173
-#, c-format
-msgid "object %s is a %s, not a %s"
-msgstr "物件 %s 是一個 %s，不是一個 %s"
-
-#: object.c:250
-#, c-format
-msgid "object %s has unknown type id %d"
-msgstr "物件 %s 有未知的類型 id %d"
-
-#: object.c:263
-#, c-format
-msgid "unable to parse object: %s"
-msgstr "不能解析物件：%s"
-
-#: object.c:283 object.c:294
-#, c-format
-msgid "hash mismatch %s"
-msgstr "雜湊值與 %s 不符合"
-
-#: pack-bitmap.c:353
-msgid "multi-pack bitmap is missing required reverse index"
-msgstr "多包位圖缺少需要的反向索引"
-
-#: pack-bitmap.c:433
-msgid "load_reverse_index: could not open pack"
-msgstr "load_reverse_index：無法開啟包"
-
-#: pack-bitmap.c:1072 pack-bitmap.c:1078 builtin/pack-objects.c:2432
-#, c-format
-msgid "unable to get size of %s"
-msgstr "不能得到 %s 的大小"
-
-#: pack-bitmap.c:1937
-#, c-format
-msgid "could not find %s in pack %s at offset %<PRIuMAX>"
-msgstr "找不到 %2$s 包，偏移位置 %3$<PRIuMAX> 的 %1$s"
-
-#: pack-bitmap.c:1973 builtin/rev-list.c:91
-#, c-format
-msgid "unable to get disk usage of %s"
-msgstr "無法取得 %s 的磁碟用量"
-
-#: pack-revindex.c:221
-#, c-format
-msgid "reverse-index file %s is too small"
-msgstr "%s 倒排索引檔案過小"
-
-#: pack-revindex.c:226
-#, c-format
-msgid "reverse-index file %s is corrupt"
-msgstr "%s 倒排索引檔案損壞"
-
-#: pack-revindex.c:234
-#, c-format
-msgid "reverse-index file %s has unknown signature"
-msgstr "%s 倒排索引檔案有未知簽章"
-
-#: pack-revindex.c:238
-#, c-format
-msgid "reverse-index file %s has unsupported version %<PRIu32>"
-msgstr "倒排索引檔案 %s 有不支援的版本 %<PRIu32>"
-
-#: pack-revindex.c:243
-#, c-format
-msgid "reverse-index file %s has unsupported hash id %<PRIu32>"
-msgstr "倒排索引檔案 %s 有不支援的雜湊 ID %<PRIu32>"
-
-#: pack-write.c:251
-msgid "cannot both write and verify reverse index"
-msgstr "無法同時寫入和驗證倒排索引"
-
-#: pack-write.c:270
-#, c-format
-msgid "could not stat: %s"
-msgstr "無法 stat：%s"
-
-#: pack-write.c:282
-#, c-format
-msgid "failed to make %s readable"
-msgstr "無法讓 %s 能夠寫入"
-
-#: pack-write.c:521
-#, c-format
-msgid "could not write '%s' promisor file"
-msgstr "無法寫入「%s」promisor 檔案"
-
-#: packfile.c:627
-msgid "offset before end of packfile (broken .idx?)"
-msgstr "位移量在 packfile 結束之前（損壞的 .idx？）"
-
-#: packfile.c:657
-#, c-format
-msgid "packfile %s cannot be mapped%s"
-msgstr "包檔案 %s 無法映射%s"
-
-#: packfile.c:1924
-#, c-format
-msgid "offset before start of pack index for %s (corrupt index?)"
-msgstr "位移量在 %s 的包索引開始之前（損壞的索引？）"
-
-#: packfile.c:1928
-#, c-format
-msgid "offset beyond end of pack index for %s (truncated index?)"
-msgstr "位移量越過了 %s 的包索引的結尾（被截斷的索引？）"
-
-#: parse-options-cb.c:21 parse-options-cb.c:25 builtin/commit-graph.c:175
-#, c-format
-msgid "option `%s' expects a numerical value"
-msgstr "選項 `%s' 期望一個數字值"
-
-#: parse-options-cb.c:42
-#, c-format
-msgid "malformed expiration date '%s'"
-msgstr "格式錯誤的到期時間：'%s'"
-
-#: parse-options-cb.c:55
-#, c-format
-msgid "option `%s' expects \"always\", \"auto\", or \"never\""
-msgstr "選項 `%s' 期望 \"always\"、\"auto\" 或 \"never\""
-
-#: parse-options-cb.c:133 parse-options-cb.c:150
-#, c-format
-msgid "malformed object name '%s'"
-msgstr "格式錯誤的物件名 '%s'"
-
-#: parse-options-cb.c:307
-#, c-format
-msgid "option `%s' expects \"%s\" or \"%s\""
-msgstr "選項「%s」期望「%s」或「%s」"
-
-#: parse-options.c:58
-#, c-format
-msgid "%s requires a value"
-msgstr "%s 需要一個值"
-
-#: parse-options.c:93
-#, c-format
-msgid "%s is incompatible with %s"
-msgstr "%s 與 %s 不相容"
-
-#: parse-options.c:98
-#, c-format
-msgid "%s : incompatible with something else"
-msgstr "%s：和其它的不相容"
-
-#: parse-options.c:112 parse-options.c:116
-#, c-format
-msgid "%s takes no value"
-msgstr "%s 不取值"
-
-#: parse-options.c:114
-#, c-format
-msgid "%s isn't available"
-msgstr "%s 不可用"
-
-#: 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:393
-#, c-format
-msgid "ambiguous option: %s (could be --%s%s or --%s%s)"
-msgstr "有歧義的選項：%s（可以是 --%s%s 或 --%s%s）"
-
-#: parse-options.c:428 parse-options.c:436
-#, c-format
-msgid "did you mean `--%s` (with two dashes)?"
-msgstr "你的意思是 `--%s`（有兩個短線）嗎？"
-
-#: parse-options.c:678 parse-options.c:1054
-#, c-format
-msgid "alias of --%s"
-msgstr "--%s 的別名"
-
-#: parse-options.c:892
-#, c-format
-msgid "unknown option `%s'"
-msgstr "未知選項 `%s'"
-
-#: parse-options.c:894
-#, c-format
-msgid "unknown switch `%c'"
-msgstr "未知開關 `%c'"
-
-#: parse-options.c:896
-#, c-format
-msgid "unknown non-ascii option in string: `%s'"
-msgstr "字串中未知的非 ascii 字元選項：`%s'"
-
-#: parse-options.c:920
-msgid "..."
-msgstr "..."
-
-#: parse-options.c:934
-#, c-format
-msgid "usage: %s"
-msgstr "用法：%s"
-
-#. TRANSLATORS: the colon here should align with the
-#. one in "usage: %s" translation.
-#.
-#: parse-options.c:949
-#, 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:970
-#, c-format
-msgid "%*s%s"
-msgstr "%*s%s"
-
-#  譯者：為保證在輸出中對齊，注意調整句中空格！
-#: parse-options.c:993
-#, c-format
-msgid "    %s"
-msgstr "    %s"
-
-#: parse-options.c:1040
-msgid "-NUM"
-msgstr "-數字"
-
-#: path.c:922
-#, c-format
-msgid "Could not make %s writable by group"
-msgstr "不能設定 %s 為組可寫"
-
-#: pathspec.c:150
-msgid "Escape character '\\' not allowed as last character in attr value"
-msgstr "跳脫字元 '\\' 不能作為屬性值的最後一個字元"
-
-#: pathspec.c:168
-msgid "Only one 'attr:' specification is allowed."
-msgstr "只允許一個 'attr:' 規格。"
-
-#: pathspec.c:171
-msgid "attr spec must not be empty"
-msgstr "屬性規格不能為空"
-
-#: pathspec.c:214
-#, c-format
-msgid "invalid attribute name %s"
-msgstr "無效的屬性名 %s"
-
-#: pathspec.c:279
-msgid "global 'glob' and 'noglob' pathspec settings are incompatible"
-msgstr "全域的 'glob' 和 'noglob' 路徑規格設定不相容"
-
-#: pathspec.c:286
-msgid ""
-"global 'literal' pathspec setting is incompatible with all other global "
-"pathspec settings"
-msgstr "全域的 'literal' 路徑規格設定和其它的全域路徑規格設定不相容"
-
-#: pathspec.c:326
-msgid "invalid parameter for pathspec magic 'prefix'"
-msgstr "路徑規格包含無效的神奇前綴"
-
-#: pathspec.c:347
-#, c-format
-msgid "Invalid pathspec magic '%.*s' in '%s'"
-msgstr "在路徑規格 '%3$s' 中無效的神奇前綴 '%2$.*1$s'"
-
-#: pathspec.c:352
-#, c-format
-msgid "Missing ')' at the end of pathspec magic in '%s'"
-msgstr "路徑規格 '%s' 的神奇前綴結尾少了一個 ')'"
-
-#: pathspec.c:390
-#, c-format
-msgid "Unimplemented pathspec magic '%c' in '%s'"
-msgstr "路徑規格 '%2$s' 中包含未實現的神奇前綴 '%1$c'"
-
-#: pathspec.c:449
-#, c-format
-msgid "%s: 'literal' and 'glob' are incompatible"
-msgstr "%s：'literal' 和 'glob' 不相容"
-
-#: pathspec.c:465
-#, c-format
-msgid "%s: '%s' is outside repository at '%s'"
-msgstr "%s：'%s' 在位於 '%s' 的版本庫之外"
-
-#: pathspec.c:541
-#, c-format
-msgid "'%s' (mnemonic: '%c')"
-msgstr "'%s'（助記符：'%c'）"
-
-#: pathspec.c:551
-#, c-format
-msgid "%s: pathspec magic not supported by this command: %s"
-msgstr "%s：路徑規格神奇前綴不被此指令支援：%s"
-
-#: pathspec.c:618
-#, c-format
-msgid "pathspec '%s' is beyond a symbolic link"
-msgstr "路徑規格 '%s' 位於符號連結中"
-
-#: pathspec.c:663
-#, c-format
-msgid "line is badly quoted: %s"
-msgstr "某行不應該被括號括住：%s"
-
-#: pkt-line.c:92
-msgid "unable to write flush packet"
-msgstr "無法寫 flush 包"
-
-#: pkt-line.c:99
-msgid "unable to write delim packet"
-msgstr "無法寫 delim 包"
-
-#: pkt-line.c:106
-msgid "unable to write response end packet"
-msgstr "無法寫入回應結尾封包"
-
-#: pkt-line.c:113
-msgid "flush packet write failed"
-msgstr "flush 包寫錯誤"
-
-#: pkt-line.c:153
-msgid "protocol error: impossibly long line"
-msgstr "協定錯誤：不可能的長行"
-
-#: pkt-line.c:169 pkt-line.c:171
-msgid "packet write with format failed"
-msgstr "格式化包寫入錯誤"
-
-#: pkt-line.c:204 pkt-line.c:252
-msgid "packet write failed - data exceeds max packet size"
-msgstr "寫封包失敗：資料超過了包的最大長度"
-
-#: pkt-line.c:222
-#, c-format
-msgid "packet write failed: %s"
-msgstr "封包寫入失敗：%s"
-
-#: pkt-line.c:349 pkt-line.c:350
-msgid "read error"
-msgstr "讀取錯誤"
-
-#: pkt-line.c:360 pkt-line.c:361
-msgid "the remote end hung up unexpectedly"
-msgstr "遠端意外掛斷了"
-
-#: pkt-line.c:417 pkt-line.c:419
-#, c-format
-msgid "protocol error: bad line length character: %.4s"
-msgstr "協定錯誤：錯誤的行長度字串：%.4s"
-
-#: pkt-line.c:434 pkt-line.c:436 pkt-line.c:442 pkt-line.c:444
-#, c-format
-msgid "protocol error: bad line length %d"
-msgstr "協定錯誤：錯誤的行長度 %d"
-
-#: pkt-line.c:472 sideband.c:165
-#, c-format
-msgid "remote error: %s"
-msgstr "遠端錯誤：%s"
-
-#: preload-index.c:125
-msgid "Refreshing index"
-msgstr "正在重新整理索引"
-
-#: preload-index.c:144
-#, c-format
-msgid "unable to create threaded lstat: %s"
-msgstr "無法建立執行緒 lstat：%s"
-
-#: pretty.c:1051
-msgid "unable to parse --pretty format"
-msgstr "不能解析 --pretty 格式"
-
-#: promisor-remote.c:31
-msgid "promisor-remote: unable to fork off fetch subprocess"
-msgstr "promisor-remote: 無法 fork fetch 子處理程序"
-
-#: promisor-remote.c:38 promisor-remote.c:40
-msgid "promisor-remote: could not write to fetch subprocess"
-msgstr "promisor-remote: 無法寫入 fetch 子處理程序"
-
-#: promisor-remote.c:44
-msgid "promisor-remote: could not close stdin to fetch subprocess"
-msgstr "promisor-remote: 無法關閉 fetch 子處理程序的 stdin"
-
-#: promisor-remote.c:54
-#, c-format
-msgid "promisor remote name cannot begin with '/': %s"
-msgstr "promisor 遠端名稱不能以 '/' 開始：%s"
-
-#: protocol-caps.c:103
-msgid "object-info: expected flush after arguments"
-msgstr "object-info：引數後預期要有 flush"
-
-#: prune-packed.c:35
-msgid "Removing duplicate objects"
-msgstr "正在刪除重複物件"
-
-#: range-diff.c:68
-msgid "could not start `log`"
-msgstr "不能啟動 `log`"
-
-#: range-diff.c:70
-msgid "could not read `log` output"
-msgstr "不能讀取 `log` 的輸出"
-
-#: range-diff.c:98 sequencer.c:5575
-#, c-format
-msgid "could not parse commit '%s'"
-msgstr "不能解析提交 '%s'"
-
-#: range-diff.c:109
-#, c-format
-msgid ""
-"could not parse first line of `log` output: did not start with 'commit ': "
-"'%s'"
-msgstr "無法解析第一行「log」輸出：開頭不是「commit」：「%s」"
-
-#: range-diff.c:132
-#, c-format
-msgid "could not parse git header '%.*s'"
-msgstr "無法解析 git 頭 '%.*s'"
-
-#: range-diff.c:300
-msgid "failed to generate diff"
-msgstr "生成 diff 失敗"
-
-#: range-diff.c:558 range-diff.c:560
-#, c-format
-msgid "could not parse log for '%s'"
-msgstr "不能解析 '%s' 的日誌"
-
-#: read-cache.c:737
-#, c-format
-msgid "will not add file alias '%s' ('%s' already exists in index)"
-msgstr "將不會新增檔案別名 '%s'（'%s' 已經存在於索引中）"
-
-#: read-cache.c:753
-msgid "cannot create an empty blob in the object database"
-msgstr "不能在物件資料庫中建立空的資料物件"
-
-#: read-cache.c:775
-#, c-format
-msgid "%s: can only add regular files, symbolic links or git-directories"
-msgstr "%s：只能新增一般檔案、符號連結或 git 目錄"
-
-#: read-cache.c:780 builtin/submodule--helper.c:3359
-#, c-format
-msgid "'%s' does not have a commit checked out"
-msgstr "'%s' 沒有簽出一個提交"
-
-#: read-cache.c:832
-#, c-format
-msgid "unable to index file '%s'"
-msgstr "無法索引檔案 '%s'"
-
-#: read-cache.c:851
-#, c-format
-msgid "unable to add '%s' to index"
-msgstr "無法在索引中新增 '%s'"
-
-#: read-cache.c:862
-#, c-format
-msgid "unable to stat '%s'"
-msgstr "無法對 %s 執行 stat"
-
-#: read-cache.c:1404
-#, c-format
-msgid "'%s' appears as both a file and as a directory"
-msgstr "'%s' 看起來既是檔案又是目錄"
-
-#: read-cache.c:1619
-msgid "Refresh index"
-msgstr "重新整理索引"
-
-#: read-cache.c:1751
-#, c-format
-msgid ""
-"index.version set, but the value is invalid.\n"
-"Using version %i"
-msgstr ""
-"設定了 index.version，但是取值無效。\n"
-"使用版本 %i"
-
-#: read-cache.c:1761
-#, c-format
-msgid ""
-"GIT_INDEX_VERSION set, but the value is invalid.\n"
-"Using version %i"
-msgstr ""
-"設定了 GIT_INDEX_VERSION，但是取值無效。\n"
-"使用版本 %i"
-
-#: read-cache.c:1817
-#, c-format
-msgid "bad signature 0x%08x"
-msgstr "壞的簽名 0x%08x"
-
-#: read-cache.c:1820
-#, c-format
-msgid "bad index version %d"
-msgstr "壞的索引版本 %d"
-
-#: read-cache.c:1829
-msgid "bad index file sha1 signature"
-msgstr "壞的索引檔案 sha1 簽名"
-
-#: read-cache.c:1863
-#, c-format
-msgid "index uses %.4s extension, which we do not understand"
-msgstr "索引使用不被支援的 %.4s 副檔名"
-
-#
-#: read-cache.c:1865
-#, c-format
-msgid "ignoring %.4s extension"
-msgstr "忽略 %.4s 副檔名"
-
-#: read-cache.c:1902
-#, c-format
-msgid "unknown index entry format 0x%08x"
-msgstr "未知的索引條目格式 0x%08x"
-
-#: read-cache.c:1918
-#, c-format
-msgid "malformed name field in the index, near path '%s'"
-msgstr "索引中靠近路徑 '%s' 有錯誤的名稱欄位"
-
-#: read-cache.c:1975
-msgid "unordered stage entries in index"
-msgstr "索引中有未排序的暫存條目"
-
-#: read-cache.c:1978
-#, c-format
-msgid "multiple stage entries for merged file '%s'"
-msgstr "合併檔案 '%s' 有多個暫存條目"
-
-#: read-cache.c:1981
-#, c-format
-msgid "unordered stage entries for '%s'"
-msgstr "'%s' 的未排序暫存條目"
-
-#: read-cache.c:2096 read-cache.c:2402 rerere.c:549 rerere.c:583 rerere.c:1096
-#: submodule.c:1831 builtin/add.c:586 builtin/check-ignore.c:183
-#: builtin/checkout.c:532 builtin/checkout.c:724 builtin/clean.c:1016
-#: builtin/commit.c:379 builtin/diff-tree.c:122 builtin/grep.c:521
-#: builtin/mv.c:148 builtin/reset.c:506 builtin/rm.c:293
-#: builtin/submodule--helper.c:335 builtin/submodule--helper.c:3319
-msgid "index file corrupt"
-msgstr "索引檔案損壞"
-
-#: read-cache.c:2240
-#, c-format
-msgid "unable to create load_cache_entries thread: %s"
-msgstr "無法建立 load_cache_entries 執行緒：%s"
-
-#: read-cache.c:2253
-#, c-format
-msgid "unable to join load_cache_entries thread: %s"
-msgstr "無法加入 load_cache_entries 執行緒：%s"
-
-#: read-cache.c:2286
-#, c-format
-msgid "%s: index file open failed"
-msgstr "%s：開啟索引檔案失敗"
-
-#: read-cache.c:2290
-#, c-format
-msgid "%s: cannot stat the open index"
-msgstr "%s：不能對開啟的索引執行 stat 動作"
-
-#: read-cache.c:2294
-#, c-format
-msgid "%s: index file smaller than expected"
-msgstr "%s：索引檔案比預期的小"
-
-#: read-cache.c:2298
-#, c-format
-msgid "%s: unable to map index file%s"
-msgstr "%s：無法 map 索引檔案%s"
-
-#: read-cache.c:2341
-#, c-format
-msgid "unable to create load_index_extensions thread: %s"
-msgstr "無法建立 load_index_extensions 執行緒：%s"
-
-#: read-cache.c:2368
-#, c-format
-msgid "unable to join load_index_extensions thread: %s"
-msgstr "無法加入 load_index_extensions 執行緒：%s"
-
-#: read-cache.c:2414
-#, c-format
-msgid "could not freshen shared index '%s'"
-msgstr "無法重新整理共享索引 '%s'"
-
-#: read-cache.c:2473
-#, c-format
-msgid "broken index, expect %s in %s, got %s"
-msgstr "損壞的索引，期望在 %2$s 中的 %1$s，得到 %3$s"
-
-#: read-cache.c:3032
-msgid "cannot write split index for a sparse index"
-msgstr "無法寫入稀疏索引的索引分割"
-
-#: read-cache.c:3114 strbuf.c:1192 wrapper.c:717 builtin/merge.c:1156
-#, c-format
-msgid "could not close '%s'"
-msgstr "不能關閉 '%s'"
-
-#: read-cache.c:3157
-msgid "failed to convert to a sparse-index"
-msgstr "無法轉換成稀疏索引"
-
-#: read-cache.c:3228
-#, c-format
-msgid "could not stat '%s'"
-msgstr "不能對 '%s' 呼叫 stat"
-
-#: read-cache.c:3241
-#, c-format
-msgid "unable to open git dir: %s"
-msgstr "不能開啟 git 目錄：%s"
-
-#: read-cache.c:3253
-#, c-format
-msgid "unable to unlink: %s"
-msgstr "無法刪除：%s"
-
-#: read-cache.c:3282
-#, c-format
-msgid "cannot fix permission bits on '%s'"
-msgstr "不能修復 '%s' 的權限位"
-
-#: read-cache.c:3439
-#, c-format
-msgid "%s: cannot drop to stage #0"
-msgstr "%s：不能落到暫存區 #0"
-
-#: rebase-interactive.c:11
-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 ""
-"您可以用 'git rebase --edit-todo' 修正，然後執行 'git rebase --continue'。\n"
-"或者您可以用 'git rebase --abort' 終止重定基底。\n"
-
-#: rebase-interactive.c:33
-#, c-format
-msgid ""
-"unrecognized setting %s for option rebase.missingCommitsCheck. Ignoring."
-msgstr "選項 rebase.missingCommitsCheck 的值 %s 無法識別。已忽略。"
-
-#: rebase-interactive.c:42
-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 [-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"
-"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 <提交> = 使用提交，但不直接修補 (amend) \n"
-"s, squash <提交> = 使用提交，但融合至上個提交\n"
-"f, fixup [-C | -c] <提交> = 跟 “squash” 相似，但除非傳入「-C」\n"
-"                   否則只保留上一個提交的日誌訊息。傳入 -C 表示只保留這個\n"
-"                   提交的訊息；傳入 -c 與 -C 功能相同，但會開啟編輯器\n"
-"x, exec <命令> = 使用 shell 執行指令（這一行的剩餘部分）\n"
-"b, break = 在這停止（使用 'git rebase --continue' 繼續重定基底）\n"
-"d, drop <提交> = 移除提交\n"
-"l, label <標籤> = 為目前 HEAD 打上指定名字標籤\n"
-"t, reset <標籤> = 重設 HEAD 到指定標籤\n"
-"m, merge [-C <commit> | -c <commit>] <label> [# <oneline>]\n"
-".       建立一個合併提交，並使用原始的合併提交說明（如果沒有指定\n"
-".       原始提交，使用備註部分的 oneline 作為提交說明）。使用\n"
-".       -c <commit> 可以編輯提交說明。\n"
-"\n"
-"可以對這些行重新排序，會從上至下執行。\n"
-
-#: rebase-interactive.c:66
-#, c-format
-msgid "Rebase %s onto %s (%d command)"
-msgid_plural "Rebase %s onto %s (%d commands)"
-msgstr[0] "重定基底 %s 到 %s（%d 個提交）"
-
-#: rebase-interactive.c:75
-msgid ""
-"\n"
-"Do not remove any line. Use 'drop' explicitly to remove a commit.\n"
-msgstr ""
-"\n"
-"不要刪除任意一行。使用 'drop' 顯式地刪除一個提交。\n"
-
-#: rebase-interactive.c:78
-msgid ""
-"\n"
-"If you remove a line here THAT COMMIT WILL BE LOST.\n"
-msgstr ""
-"\n"
-"如果您在這裡刪除一行，對應的提交將會遺失。\n"
-
-#: rebase-interactive.c:84
-msgid ""
-"\n"
-"You are editing the todo file of an ongoing interactive rebase.\n"
-"To continue rebase after editing, run:\n"
-"    git rebase --continue\n"
-"\n"
-msgstr ""
-"\n"
-"您正在修改進行中的互動式重定基底待辦列表。若要在編輯結束後繼續重定基底，\n"
-"請執行：\n"
-"    git rebase --continue\n"
-"\n"
-
-#: rebase-interactive.c:89
-msgid ""
-"\n"
-"However, if you remove everything, the rebase will be aborted.\n"
-"\n"
-msgstr ""
-"\n"
-"然而，如果您刪除全部內容，重定基底動作將會終止。\n"
-"\n"
-
-#: rebase-interactive.c:113 rerere.c:469 rerere.c:677 sequencer.c:3879
-#: sequencer.c:3905 sequencer.c:5681 builtin/fsck.c:328 builtin/gc.c:1791
-#: builtin/rebase.c:191
-#, c-format
-msgid "could not write '%s'"
-msgstr "不能寫入 '%s'"
-
-#: rebase-interactive.c:119
-#, c-format
-msgid "could not write '%s'."
-msgstr "不能寫入 '%s'。"
-
-#: rebase-interactive.c:196
-#, c-format
-msgid ""
-"Warning: some commits may have been dropped accidentally.\n"
-"Dropped commits (newer to older):\n"
-msgstr ""
-"警告：一些提交可能被意外捨棄。\n"
-"捨棄的提交（從新到舊）：\n"
-
-#: rebase-interactive.c:203
-#, c-format
-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"
-"The possible behaviours are: ignore, warn, error.\n"
-"\n"
-msgstr ""
-"為避免這條訊息，使用 \"drop\" 指令顯式地刪除一個提交。\n"
-"\n"
-"使用 'git config rebase.missingCommitsCheck' 來修改警告級別。\n"
-"可選值有：ignore、warn、error。\n"
-"\n"
-
-#: rebase.c:29
-#, c-format
-msgid "%s: 'preserve' superseded by 'merges'"
-msgstr "%s：「preserve」已經改成「merges」"
-
-#: ref-filter.c:42 wt-status.c:2057
-msgid "gone"
-msgstr "遺失"
-
-#: ref-filter.c:43
-#, c-format
-msgid "ahead %d"
-msgstr "領先 %d"
-
-#: ref-filter.c:44
-#, c-format
-msgid "behind %d"
-msgstr "落後 %d"
-
-#: ref-filter.c:45
-#, c-format
-msgid "ahead %d, behind %d"
-msgstr "領先 %d，落後 %d"
-
-#: ref-filter.c:235
-#, c-format
-msgid "expected format: %%(color:<color>)"
-msgstr "期望的格式：%%(color:<顏色>)"
-
-#: ref-filter.c:237
-#, c-format
-msgid "unrecognized color: %%(color:%s)"
-msgstr "無法識別的顏色：%%(color:%s)"
-
-#: ref-filter.c:259
-#, c-format
-msgid "Integer value expected refname:lstrip=%s"
-msgstr "期望整數值 refname:lstrip=%s"
-
-#: ref-filter.c:263
-#, c-format
-msgid "Integer value expected refname:rstrip=%s"
-msgstr "期望整數值 refname:rstrip=%s"
-
-#: ref-filter.c:265 ref-filter.c:344 ref-filter.c:377 ref-filter.c:431
-#: ref-filter.c:443 ref-filter.c:462 ref-filter.c:534 ref-filter.c:560
-#, c-format
-msgid "unrecognized %%(%s) argument: %s"
-msgstr "無法識別的 %%(%s) 參數：%s"
-
-#: ref-filter.c:320
-#, c-format
-msgid "%%(objecttype) does not take arguments"
-msgstr "%%(objecttype) 不帶參數"
-
-#: ref-filter.c:352
-#, c-format
-msgid "%%(deltabase) does not take arguments"
-msgstr "%%(deltabase) 不帶參數"
-
-#: ref-filter.c:364
-#, c-format
-msgid "%%(body) does not take arguments"
-msgstr "%%(body) 不帶參數"
-
-#: ref-filter.c:396
-#, c-format
-msgid "expected %%(trailers:key=<value>)"
-msgstr "預期是 %%(trailers:key=<value>)"
-
-#: ref-filter.c:398
-#, c-format
-msgid "unknown %%(trailers) argument: %s"
-msgstr "未知的 %%(trailers) 參數：%s"
-
-#: ref-filter.c:429
-#, c-format
-msgid "positive value expected contents:lines=%s"
-msgstr "期望一個正數 contents:lines=%s"
-
-#: ref-filter.c:458
-#, c-format
-msgid "positive value expected '%s' in %%(%s)"
-msgstr "%%(%2$s) 中的 '%1$s' 預期是正數值"
-
-#: ref-filter.c:476
-#, c-format
-msgid "unrecognized email option: %s"
-msgstr "無法識別的 email 選項：%s"
-
-#: ref-filter.c:506
-#, c-format
-msgid "expected format: %%(align:<width>,<position>)"
-msgstr "期望的格式：%%(align:<寬度>,<位置>)"
-
-#: ref-filter.c:518
-#, c-format
-msgid "unrecognized position:%s"
-msgstr "無法識別的位置：%s"
-
-#: ref-filter.c:525
-#, c-format
-msgid "unrecognized width:%s"
-msgstr "無法識別的寬度：%s"
-
-#: ref-filter.c:542
-#, c-format
-msgid "positive width expected with the %%(align) atom"
-msgstr "元素 %%(align) 需要一個正數的寬度"
-
-#: 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:707
-#, c-format
-msgid "unknown field name: %.*s"
-msgstr "未知的欄位名：%.*s"
-
-#: 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:844 ref-filter.c:910 ref-filter.c:946 ref-filter.c:948
-#, c-format
-msgid "format: %%(%s) atom used without a %%(%s) atom"
-msgstr "format：使用 %%(%s) 元素卻缺少 %%(%s) 元素"
-
-#: ref-filter.c:912
-#, c-format
-msgid "format: %%(then) atom used more than once"
-msgstr "格式：%%(then) 元素用了多次"
-
-#: ref-filter.c:914
-#, c-format
-msgid "format: %%(then) atom used after %%(else)"
-msgstr "格式：%%(then) 元素用在了 %%(else) 之後"
-
-#: ref-filter.c:950
-#, c-format
-msgid "format: %%(else) atom used more than once"
-msgstr "格式：%%(else) 元素用了多次"
-
-#: ref-filter.c:965
-#, c-format
-msgid "format: %%(end) atom used without corresponding atom"
-msgstr "格式：使用了 %%(end) 元素卻沒有它的對應元素"
-
-#: ref-filter.c:1027
-#, c-format
-msgid "malformed format string %s"
-msgstr "錯誤的格式化字串 %s"
-
-#: 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:1707
-#, c-format
-msgid "(no branch, rebasing %s)"
-msgstr "（無分支，重定 %s 的基底）"
-
-#: ref-filter.c:1710
-#, c-format
-msgid "(no branch, rebasing detached HEAD %s)"
-msgstr "（無分支，重定 %s 分離開頭指標的基底）"
-
-#: ref-filter.c:1713
-#, c-format
-msgid "(no branch, bisect started on %s)"
-msgstr "（無分支，二分搜尋從 %s 開始）"
-
-#: ref-filter.c:1717
-#, c-format
-msgid "(HEAD detached at %s)"
-msgstr "（開頭指標分離於 %s）"
-
-#: ref-filter.c:1720
-#, c-format
-msgid "(HEAD detached from %s)"
-msgstr "（開頭指標分離自 %s）"
-
-#: ref-filter.c:1723
-msgid "(no branch)"
-msgstr "（無分支）"
-
-#: ref-filter.c:1755 ref-filter.c:1973
-#, c-format
-msgid "missing object %s for %s"
-msgstr "缺少 %2$s 的物件 %1$s"
-
-#: ref-filter.c:1765
-#, c-format
-msgid "parse_object_buffer failed on %s for %s"
-msgstr "parse_object_buffer 失敗於 %2$s 的 %1$s"
-
-#: ref-filter.c:2156
-#, c-format
-msgid "malformed object at '%s'"
-msgstr "格式錯誤的物件 '%s'"
-
-#: ref-filter.c:2246
-#, c-format
-msgid "ignoring ref with broken name %s"
-msgstr "忽略帶有錯誤名稱 %s 的引用"
-
-#: ref-filter.c:2251 refs.c:672
-#, c-format
-msgid "ignoring broken ref %s"
-msgstr "忽略損壞的引用 %s"
-
-#: ref-filter.c:2630
-#, c-format
-msgid "format: %%(end) atom missing"
-msgstr "格式：缺少 %%(end) 元素"
-
-#: ref-filter.c:2741
-#, c-format
-msgid "malformed object name %s"
-msgstr "格式錯誤的物件名 %s"
-
-#: ref-filter.c:2746
-#, c-format
-msgid "option `%s' must point to a commit"
-msgstr "選項 `%s' 必須指向一個提交"
-
-#: reflog.c:407
-#, c-format
-msgid "not a reflog: %s"
-msgstr "不是引用日誌：%s"
-
-#: reflog.c:410
-#, c-format
-msgid "no reflog for '%s'"
-msgstr "沒有 '%s' 的引用日誌"
-
-#: refs.c:262
-#, c-format
-msgid "%s does not point to a valid object!"
-msgstr "%s 沒有指向一個有效的物件！"
-
-#: refs.c:561
-#, 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"
-"of your new repositories, which will suppress this warning, call:\n"
-"\n"
-"\tgit config --global init.defaultBranch <name>\n"
-"\n"
-"Names commonly chosen instead of 'master' are 'main', 'trunk' and\n"
-"'development'. The just-created branch can be renamed via this command:\n"
-"\n"
-"\tgit branch -m <name>\n"
-msgstr ""
-"將「%s」設定為初始分支的名稱。這個預設分支名稱可以變更。\n"
-"如果要設定所有新版本庫要使用的初始分支名稱，\n"
-"請呼叫（會隱藏這個警告）：\n"
-"\n"
-"\tgit config --global init.defaultBranch <name>\n"
-"\n"
-"除了 “master” 外，常用的分支名稱有 “main”, “trunk” 以及\n"
-"“development”。剛建立的分支可以用這個命令重新命名：\n"
-"\n"
-"\tgit branch -m <name>\n"
-
-#: refs.c:583
-#, c-format
-msgid "could not retrieve `%s`"
-msgstr "無法擷取「%s」"
-
-#: refs.c:593
-#, c-format
-msgid "invalid branch name: %s = %s"
-msgstr "分支名稱無效：%s = %s"
-
-#: refs.c:670
-#, c-format
-msgid "ignoring dangling symref %s"
-msgstr "忽略懸空符號引用 %s"
-
-#: refs.c:919
-#, c-format
-msgid "log for ref %s has gap after %s"
-msgstr "引用 %s 的日誌在 %s 之後有缺口"
-
-#: refs.c:926
-#, c-format
-msgid "log for ref %s unexpectedly ended on %s"
-msgstr "引用 %s 的日誌意外終止於 %s"
-
-#: refs.c:991
-#, c-format
-msgid "log for %s is empty"
-msgstr "%s 的日誌為空"
-
-#: refs.c:1086
-#, c-format
-msgid "refusing to update ref with bad name '%s'"
-msgstr "拒絕更新有錯誤名稱 '%s' 的引用"
-
-#: refs.c:1164
-#, c-format
-msgid "update_ref failed for ref '%s': %s"
-msgstr "對引用 '%s' 執行 update_ref 失敗：%s"
-
-#: refs.c:2059
-#, c-format
-msgid "multiple updates for ref '%s' not allowed"
-msgstr "不允許對引用 '%s' 多次更新"
-
-#: refs.c:2145
-msgid "ref updates forbidden inside quarantine environment"
-msgstr "在隔離環境中禁止更新引用"
-
-#: refs.c:2156
-msgid "ref updates aborted by hook"
-msgstr "引用更新被掛鉤拒絕"
-
-#: refs.c:2264 refs.c:2294
-#, c-format
-msgid "'%s' exists; cannot create '%s'"
-msgstr "'%s' 已存在，無法建立 '%s'"
-
-#: refs.c:2270 refs.c:2305
-#, c-format
-msgid "cannot process '%s' and '%s' at the same time"
-msgstr "無法同時處理 '%s' 和 '%s'"
-
-#: refs/files-backend.c:1295
-#, c-format
-msgid "could not remove reference %s"
-msgstr "無法刪除引用 %s"
-
-#: refs/files-backend.c:1310 refs/packed-backend.c:1565
-#: refs/packed-backend.c:1575
-#, c-format
-msgid "could not delete reference %s: %s"
-msgstr "無法刪除引用 %s：%s"
-
-#: refs/files-backend.c:1313 refs/packed-backend.c:1578
-#, c-format
-msgid "could not delete references: %s"
-msgstr "無法刪除引用：%s"
-
-#: refspec.c:170
-#, c-format
-msgid "invalid refspec '%s'"
-msgstr "無效的引用規格：「%s」"
-
-#: remote.c:402
-#, c-format
-msgid "config remote shorthand cannot begin with '/': %s"
-msgstr "設定的遠端短名稱不能以 '/' 開始：%s"
-
-#: remote.c:450
-msgid "more than one receivepack given, using the first"
-msgstr "提供了一個以上的 receivepack，使用第一個"
-
-#: remote.c:458
-msgid "more than one uploadpack given, using the first"
-msgstr "提供了一個以上的 uploadpack，使用第一個"
-
-#: remote.c:698
-#, c-format
-msgid "Cannot fetch both %s and %s to %s"
-msgstr "不能同時取得 %s 和 %s 至 %s"
-
-#: remote.c:702
-#, c-format
-msgid "%s usually tracks %s, not %s"
-msgstr "%s 通常追蹤 %s，而非 %s"
-
-#: remote.c:706
-#, c-format
-msgid "%s tracks both %s and %s"
-msgstr "%s 同時追蹤 %s 和 %s"
-
-#: remote.c:774
-#, c-format
-msgid "key '%s' of pattern had no '*'"
-msgstr "模式的鍵 '%s' 沒有 '*'"
-
-#: remote.c:784
-#, c-format
-msgid "value '%s' of pattern has no '*'"
-msgstr "模式的值 '%s' 沒有 '*'"
-
-#: remote.c:1191
-#, c-format
-msgid "src refspec %s does not match any"
-msgstr "來源引用規格 %s 沒有符合項目"
-
-#: remote.c:1196
-#, c-format
-msgid "src refspec %s matches more than one"
-msgstr "來源引用規格 %s 符合超過一個"
-
-#. TRANSLATORS: "matches '%s'%" is the <dst> part of "git push
-#. <remote> <src>:<dst>" push, and "being pushed ('%s')" is
-#. the <src>.
-#.
-#: remote.c:1211
-#, c-format
-msgid ""
-"The destination you provided is not a full refname (i.e.,\n"
-"starting with \"refs/\"). We tried to guess what you meant by:\n"
-"\n"
-"- Looking for a ref that matches '%s' on the remote side.\n"
-"- Checking if the <src> being pushed ('%s')\n"
-"  is a ref in \"refs/{heads,tags}/\". If so we add a corresponding\n"
-"  refs/{heads,tags}/ prefix on the remote side.\n"
-"\n"
-"Neither worked, so we gave up. You must fully qualify the ref."
-msgstr ""
-"您提供的目的地不是完整的引用名稱（即以「refs/」開頭）。\n"
-"我們覺得您可能想要：\n"
-"\n"
-"- 在遠端查詢符合「%s」的引用。\n"
-"- 檢查要推送的 <src>（'%s'）是不是在「refs/{heads,tags}/」中的引用。\n"
-"  如果是，我們會在對應的遠端新增 refs/{heads,tags}/ 前綴。\n"
-"\n"
-"由於這些猜測都不正確，我們放棄了。您必須給出完整引用。"
-
-#: remote.c:1231
-#, c-format
-msgid ""
-"The <src> part of the refspec is a commit object.\n"
-"Did you mean to create a new branch by pushing to\n"
-"'%s:refs/heads/%s'?"
-msgstr ""
-"引用規格的 <src> 是個提交物件。\n"
-"您是想透過推送至「%s:refs/heads/%s」\n"
-"來建立新分支嗎？"
-
-#: remote.c:1236
-#, c-format
-msgid ""
-"The <src> part of the refspec is a tag object.\n"
-"Did you mean to create a new tag by pushing to\n"
-"'%s:refs/tags/%s'?"
-msgstr ""
-"引用規格的 <src> 是個標籤物件。\n"
-"您是想透過推送至「%s:refs/tags/%s」\n"
-"來建立新標籤嗎？"
-
-#: remote.c:1241
-#, c-format
-msgid ""
-"The <src> part of the refspec is a tree object.\n"
-"Did you mean to tag a new tree by pushing to\n"
-"'%s:refs/tags/%s'?"
-msgstr ""
-"引用規格的 <src> 是個樹狀物件。\n"
-"您是想透過推送至「%s:refs/tags/%s」\n"
-"為新樹狀物件貼上標籤嗎？"
-
-#: remote.c:1246
-#, c-format
-msgid ""
-"The <src> part of the refspec is a blob object.\n"
-"Did you mean to tag a new blob by pushing to\n"
-"'%s:refs/tags/%s'?"
-msgstr ""
-"引用規格的 <src> 是個資料 (blob) 物件。\n"
-"您是想透過推送至「%s:refs/tags/%s」\n"
-"為新資料物件貼上標籤嗎？"
-
-#: remote.c:1282
-#, c-format
-msgid "%s cannot be resolved to branch"
-msgstr "%s 無法被解析為分支"
-
-#: remote.c:1293
-#, c-format
-msgid "unable to delete '%s': remote ref does not exist"
-msgstr "無法刪除 '%s'：遠端引用不存在"
-
-#: remote.c:1305
-#, c-format
-msgid "dst refspec %s matches more than one"
-msgstr "目的地引用規格 %s 符合超過一個"
-
-#: remote.c:1312
-#, c-format
-msgid "dst ref %s receives from more than one src"
-msgstr "目的地引用 %s 接收超過一個來源"
-
-#: remote.c:1833 remote.c:1940
-msgid "HEAD does not point to a branch"
-msgstr "HEAD 沒有指向一個分支"
-
-#: remote.c:1842
-#, c-format
-msgid "no such branch: '%s'"
-msgstr "沒有此分支：'%s'"
-
-#: remote.c:1845
-#, c-format
-msgid "no upstream configured for branch '%s'"
-msgstr "尚未給分支 '%s' 設定上游"
-
-#: remote.c:1851
-#, c-format
-msgid "upstream branch '%s' not stored as a remote-tracking branch"
-msgstr "上游分支 '%s' 沒有儲存為一個遠端追蹤分支"
-
-#: remote.c:1866
-#, c-format
-msgid "push destination '%s' on remote '%s' has no local tracking branch"
-msgstr "推送目的地 '%s' 至遠端 '%s' 沒有本機追蹤分支"
-
-#: remote.c:1881
-#, c-format
-msgid "branch '%s' has no remote for pushing"
-msgstr "分支 '%s' 沒有設定要推送的遠端伺服器"
-
-#: remote.c:1891
-#, c-format
-msgid "push refspecs for '%s' do not include '%s'"
-msgstr "向 '%s' 推送引用規格未包含 '%s'"
-
-#: remote.c:1904
-msgid "push has no destination (push.default is 'nothing')"
-msgstr "推送沒有目的地（push.default 是 'nothing'）"
-
-#: remote.c:1926
-msgid "cannot resolve 'simple' push to a single destination"
-msgstr "無法解析 'simple' 推送至單獨目的地"
-
-#: remote.c:2059
-#, c-format
-msgid "couldn't find remote ref %s"
-msgstr "無法找到遠端引用 %s"
-
-#: remote.c:2072
-#, c-format
-msgid "* Ignoring funny ref '%s' locally"
-msgstr "* 在本機忽略可笑的引用 '%s'"
-
-#: remote.c:2235
-#, c-format
-msgid "Your branch is based on '%s', but the upstream is gone.\n"
-msgstr "您的分支基於 '%s'，但此上游分支已經不存在。\n"
-
-#: remote.c:2239
-msgid "  (use \"git branch --unset-upstream\" to fixup)\n"
-msgstr "  （使用 \"git branch --unset-upstream\" 來修復）\n"
-
-#: remote.c:2242
-#, c-format
-msgid "Your branch is up to date with '%s'.\n"
-msgstr "您的分支與上游分支 '%s' 一致。\n"
-
-#: remote.c:2246
-#, c-format
-msgid "Your branch and '%s' refer to different commits.\n"
-msgstr "您的分支和 '%s' 指向不同的提交。\n"
-
-#: remote.c:2249
-#, c-format
-msgid "  (use \"%s\" for details)\n"
-msgstr "  （使用 \"%s\" 檢視詳情）\n"
-
-#: remote.c:2253
-#, c-format
-msgid "Your branch is ahead of '%s' by %d commit.\n"
-msgid_plural "Your branch is ahead of '%s' by %d commits.\n"
-msgstr[0] "您的分支領先 '%s' 共 %d 個提交。\n"
-
-#: remote.c:2259
-msgid "  (use \"git push\" to publish your local commits)\n"
-msgstr "  （使用 \"git push\" 來發布您的本機提交）\n"
-
-#: remote.c:2262
-#, c-format
-msgid "Your branch is behind '%s' by %d commit, and can be fast-forwarded.\n"
-msgid_plural ""
-"Your branch is behind '%s' by %d commits, and can be fast-forwarded.\n"
-msgstr[0] "您的分支落後 '%s' 共 %d 個提交，並且可以快轉。\n"
-
-#  譯者：請維持前導空格
-#: remote.c:2270
-msgid "  (use \"git pull\" to update your local branch)\n"
-msgstr "  （使用 \"git pull\" 來更新您的本機分支）\n"
-
-#: remote.c:2273
-#, c-format
-msgid ""
-"Your branch and '%s' have diverged,\n"
-"and have %d and %d different commit each, respectively.\n"
-msgid_plural ""
-"Your branch and '%s' have diverged,\n"
-"and have %d and %d different commits each, respectively.\n"
-msgstr[0] ""
-"您的分支和 '%s' 出現了偏離，\n"
-"並且分別有 %d 和 %d 處不同的提交。\n"
-
-#  譯者：請維持前導空格
-#: remote.c:2283
-msgid "  (use \"git pull\" to merge the remote branch into yours)\n"
-msgstr "  （使用 \"git pull\" 來合併遠端分支）\n"
-
-#: remote.c:2475
-#, c-format
-msgid "cannot parse expected object name '%s'"
-msgstr "無法解析期望的物件名 '%s'"
-
-#: replace-object.c:21
-#, c-format
-msgid "bad replace ref name: %s"
-msgstr "錯誤的取代引用名稱：%s"
-
-#: replace-object.c:30
-#, c-format
-msgid "duplicate replace ref: %s"
-msgstr "重複的取代引用：%s"
-
-#: replace-object.c:82
-#, c-format
-msgid "replace depth too high for object %s"
-msgstr "物件 %s 的取代層級太深"
-
-#: rerere.c:201 rerere.c:210 rerere.c:213
-msgid "corrupt MERGE_RR"
-msgstr "損壞的 MERGE_RR"
-
-#: rerere.c:248 rerere.c:253
-msgid "unable to write rerere record"
-msgstr "無法寫入 rerere 記錄"
-
-#: rerere.c:479
-#, c-format
-msgid "there were errors while writing '%s' (%s)"
-msgstr "寫入 '%s' (%s) 時發生錯誤"
-
-#: rerere.c:482 builtin/gc.c:2263 builtin/gc.c:2298
-#, c-format
-msgid "failed to flush '%s'"
-msgstr "排清 '%s' 失敗"
-
-#: rerere.c:487 rerere.c:1024
-#, c-format
-msgid "could not parse conflict hunks in '%s'"
-msgstr "不能解析 '%s' 中的衝突區塊"
-
-#: rerere.c:669
-#, c-format
-msgid "failed utime() on '%s'"
-msgstr "在 '%s' 上呼叫 utime() 失敗"
-
-#: rerere.c:679
-#, c-format
-msgid "writing '%s' failed"
-msgstr "寫入 '%s' 失敗"
-
-#: rerere.c:699
-#, c-format
-msgid "Staged '%s' using previous resolution."
-msgstr "使用之前的解決方案暫存 '%s'。"
-
-#: rerere.c:738
-#, c-format
-msgid "Recorded resolution for '%s'."
-msgstr "已記錄 '%s' 的解決方案。"
-
-#: rerere.c:773
-#, c-format
-msgid "Resolved '%s' using previous resolution."
-msgstr "使用之前的解決方案解決 '%s'。"
-
-#: rerere.c:788
-#, c-format
-msgid "cannot unlink stray '%s'"
-msgstr "不能刪除 stray '%s'"
-
-#: rerere.c:792
-#, c-format
-msgid "Recorded preimage for '%s'"
-msgstr "為 '%s' 記錄 preimage"
-
-#: rerere.c:866 submodule.c:2290 builtin/log.c:2042
-#: builtin/submodule--helper.c:1786 builtin/submodule--helper.c:1833
-#, c-format
-msgid "could not create directory '%s'"
-msgstr "不能建立目錄 '%s'"
-
-#: rerere.c:1042
-#, c-format
-msgid "failed to update conflicted state in '%s'"
-msgstr "更新 '%s' 中的衝突狀態失敗"
-
-#: rerere.c:1053 rerere.c:1060
-#, c-format
-msgid "no remembered resolution for '%s'"
-msgstr "沒有為 '%s' 記憶的解決方案"
-
-#: rerere.c:1062
-#, c-format
-msgid "cannot unlink '%s'"
-msgstr "不能刪除 '%s'"
-
-#: rerere.c:1072
-#, c-format
-msgid "Updated preimage for '%s'"
-msgstr "已為 '%s' 更新 preimage"
-
-#: rerere.c:1081
-#, c-format
-msgid "Forgot resolution for '%s'\n"
-msgstr "忘記 '%s' 的解決方案\n"
-
-#: rerere.c:1192
-msgid "unable to open rr-cache directory"
-msgstr "不能開啟 rr-cache 目錄"
-
-#: reset.c:112
-msgid "could not determine HEAD revision"
-msgstr "不能確定 HEAD 版本"
-
-#: reset.c:141 reset.c:147 sequencer.c:3696
-#, c-format
-msgid "failed to find tree of %s"
-msgstr "無法找到 %s 指向的樹"
-
-#: revision.c:2358
-msgid "--unpacked=<packfile> no longer supported"
-msgstr "--unpacked=<packfile> 已不受支援"
-
-#: revision.c:2712
-msgid "your current branch appears to be broken"
-msgstr "您的目前分支好像被損壞"
-
-#: revision.c:2715
-#, c-format
-msgid "your current branch '%s' does not have any commits yet"
-msgstr "您的目前分支 '%s' 尚無任何提交"
-
-#: revision.c:2901
-msgid "object filtering requires --objects"
-msgstr "物件過濾需要 --objects"
-
-#: revision.c:2918
-msgid "-L does not yet support diff formats besides -p and -s"
-msgstr "-L 尚不支援 -p 和 -s 之外的差異格式"
-
-#: run-command.c:1262
-#, c-format
-msgid "cannot create async thread: %s"
-msgstr "不能建立 async 執行緒：%s"
-
-#: send-pack.c:150
-msgid "unexpected flush packet while reading remote unpack status"
-msgstr "讀取遠端解包狀態時收到意外的 flush 包"
-
-#: send-pack.c:152
-#, c-format
-msgid "unable to parse remote unpack status: %s"
-msgstr "不能解析遠端解包狀態：%s"
-
-#: send-pack.c:154
-#, c-format
-msgid "remote unpack failed: %s"
-msgstr "遠端解包失敗：%s"
-
-#: send-pack.c:378
-msgid "failed to sign the push certificate"
-msgstr "為推送證書籤名失敗"
-
-#: send-pack.c:435
-msgid "send-pack: unable to fork off fetch subprocess"
-msgstr "send-pack：無法 fork 一個 fetch 子處理程序"
-
-#: send-pack.c:457
-msgid "push negotiation failed; proceeding anyway with push"
-msgstr "push 協商失敗。繼續使用 push 處理"
-
-#: send-pack.c:528
-msgid "the receiving end does not support this repository's hash algorithm"
-msgstr "接收端不支援此版本庫的雜湊算法"
-
-#: send-pack.c:537
-msgid "the receiving end does not support --signed push"
-msgstr "接收端不支援 --signed 推送"
-
-#: send-pack.c:539
-msgid ""
-"not sending a push certificate since the receiving end does not support --"
-"signed push"
-msgstr "未傳送推送證書，因為接收端不支援 --signed 推送"
-
-#: send-pack.c:546
-msgid "the receiving end does not support --atomic push"
-msgstr "接收端不支援 --atomic 推送"
-
-#: send-pack.c:551
-msgid "the receiving end does not support push options"
-msgstr "接收端不支援推送選項"
-
-#: sequencer.c:197
-#, c-format
-msgid "invalid commit message cleanup mode '%s'"
-msgstr "無效的提交說明清理模式 '%s'"
-
-#: sequencer.c:325
-#, c-format
-msgid "could not delete '%s'"
-msgstr "無法刪除 '%s'"
-
-#: sequencer.c:345 sequencer.c:4724 builtin/rebase.c:564 builtin/rebase.c:1326
-#: builtin/rm.c:409
-#, c-format
-msgid "could not remove '%s'"
-msgstr "無法刪除 '%s'"
-
-#: sequencer.c:355
-msgid "revert"
-msgstr "復原"
-
-#: sequencer.c:357
-msgid "cherry-pick"
-msgstr "摘取"
-
-#: sequencer.c:359
-msgid "rebase"
-msgstr "rebase"
-
-#: sequencer.c:361
-#, c-format
-msgid "unknown action: %d"
-msgstr "未知動作：%d"
-
-#: sequencer.c:420
-msgid ""
-"after resolving the conflicts, mark the corrected paths\n"
-"with 'git add <paths>' or 'git rm <paths>'"
-msgstr ""
-"衝突解決完畢後，用 'git add <路徑>' 或 'git rm <路徑>'\n"
-"指令標記修正後的檔案"
-
-#: sequencer.c:423
-msgid ""
-"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/rm <pathspec>\" 標記路徑，再執行\n"
-"\"git cherry-pick --continue\"。\n"
-"亦可以使用 \"git cherry-pick --skip\" 略過提交。\n"
-"若要取消並返回 \"git cherry-pick\" 前的狀態，\n"
-"請執行 \"git cherry-pick --abort\"。"
-
-#: 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:3288
-#, c-format
-msgid "could not lock '%s'"
-msgstr "不能鎖定 '%s'"
-
-#: sequencer.c:450 sequencer.c:3087 sequencer.c:3292 sequencer.c:3306
-#: sequencer.c:3557 sequencer.c:5591 strbuf.c:1189 wrapper.c:715
-#, c-format
-msgid "could not write to '%s'"
-msgstr "不能寫入 '%s'"
-
-#: sequencer.c:455
-#, c-format
-msgid "could not write eol to '%s'"
-msgstr "不能將換行符號寫入 '%s'"
-
-#: sequencer.c:460 sequencer.c:3092 sequencer.c:3294 sequencer.c:3308
-#: sequencer.c:3565
-#, c-format
-msgid "failed to finalize '%s'"
-msgstr "無法完成 '%s'"
-
-#: sequencer.c:473 sequencer.c:1930 sequencer.c:3112 sequencer.c:3547
-#: sequencer.c:3675 builtin/am.c:290 builtin/commit.c:837 builtin/merge.c:1154
-#, c-format
-msgid "could not read '%s'"
-msgstr "不能讀取 '%s'"
-
-#: sequencer.c:499
-#, c-format
-msgid "your local changes would be overwritten by %s."
-msgstr "您的本機修改將被%s覆蓋。"
-
-#: sequencer.c:503
-msgid "commit your changes or stash them to proceed."
-msgstr "提交您的修改或儲藏後再繼續。"
-
-#: sequencer.c:535
-#, c-format
-msgid "%s: fast-forward"
-msgstr "%s：快轉"
-
-#: sequencer.c:574 builtin/tag.c:615
-#, c-format
-msgid "Invalid cleanup mode %s"
-msgstr "無效的清理模式 %s"
-
-#. TRANSLATORS: %s will be "revert", "cherry-pick" or
-#. "rebase".
-#.
-#: sequencer.c:685
-#, c-format
-msgid "%s: Unable to write new index file"
-msgstr "%s：無法寫入新索引檔案"
-
-#: sequencer.c:699
-msgid "unable to update cache tree"
-msgstr "不能更新快取樹"
-
-#: sequencer.c:713
-msgid "could not resolve HEAD commit"
-msgstr "不能解析 HEAD 提交"
-
-#: sequencer.c:793
-#, c-format
-msgid "no key present in '%.*s'"
-msgstr "在 '%.*s' 中沒有 key"
-
-#: sequencer.c:804
-#, c-format
-msgid "unable to dequote value of '%s'"
-msgstr "無法為 '%s' 的值去引號"
-
-#: sequencer.c:841 wrapper.c:219 wrapper.c:389 builtin/am.c:757
-#: builtin/am.c:849 builtin/rebase.c:699
-#, c-format
-msgid "could not open '%s' for reading"
-msgstr "無法開啟 '%s' 進行讀取"
-
-#: sequencer.c:851
-msgid "'GIT_AUTHOR_NAME' already given"
-msgstr "已經給出 'GIT_AUTHOR_NAME'"
-
-#: sequencer.c:856
-msgid "'GIT_AUTHOR_EMAIL' already given"
-msgstr "已經給出 'GIT_AUTHOR_EMAIL'"
-
-#: sequencer.c:861
-msgid "'GIT_AUTHOR_DATE' already given"
-msgstr "已經給出 'GIT_AUTHOR_DATE'"
-
-#: sequencer.c:865
-#, c-format
-msgid "unknown variable '%s'"
-msgstr "未知變數 '%s'"
-
-#: sequencer.c:870
-msgid "missing 'GIT_AUTHOR_NAME'"
-msgstr "缺少 'GIT_AUTHOR_NAME'"
-
-#: sequencer.c:872
-msgid "missing 'GIT_AUTHOR_EMAIL'"
-msgstr "缺少 'GIT_AUTHOR_EMAIL'"
-
-#: sequencer.c:874
-msgid "missing 'GIT_AUTHOR_DATE'"
-msgstr "缺少 'GIT_AUTHOR_DATE'"
-
-#: sequencer.c:939
-#, c-format
-msgid ""
-"you have staged changes in your working tree\n"
-"If these changes are meant to be squashed into the previous commit, run:\n"
-"\n"
-"  git commit --amend %s\n"
-"\n"
-"If they are meant to go into a new commit, run:\n"
-"\n"
-"  git commit %s\n"
-"\n"
-"In both cases, once you're done, continue with:\n"
-"\n"
-"  git rebase --continue\n"
-msgstr ""
-"您的工作區中存在已暫存的修改\n"
-"如果這些修改需要被併入前一個提交，執行：\n"
-"\n"
-"  git commit --amend %s\n"
-"\n"
-"如果這些修改要形成一個新提交，執行：\n"
-"\n"
-"  git commit %s\n"
-"\n"
-"無論哪種情況，當您完成提交，繼續執行：\n"
-"\n"
-"  git rebase --continue\n"
-
-#: sequencer.c:1225
-msgid "'prepare-commit-msg' hook failed"
-msgstr "'prepare-commit-msg' 掛鉤失敗"
-
-#: sequencer.c:1231
-msgid ""
-"Your name and email address were configured automatically based\n"
-"on your username and hostname. Please check that they are accurate.\n"
-"You can suppress this message by setting them explicitly. Run the\n"
-"following command and follow the instructions in your editor to edit\n"
-"your configuration file:\n"
-"\n"
-"    git config --global --edit\n"
-"\n"
-"After doing this, you may fix the identity used for this commit with:\n"
-"\n"
-"    git commit --amend --reset-author\n"
-msgstr ""
-"您的姓名和信件位址皆根據您的使用者名稱和主機名稱自動設定。\n"
-"請檢查是否正確。您可以自行設定，這樣便不會再出現這個提示訊息。\n"
-"執行如下指令，在編輯器中遵循指引編輯您的設定檔案：\n"
-"\n"
-"    git config --global --edit\n"
-"\n"
-"設定完畢後，您可以使用下述指令，修正這個提交的提交者身份：\n"
-"\n"
-"    git commit --amend --reset-author\n"
-
-#: sequencer.c:1244
-msgid ""
-"Your name and email address were configured automatically based\n"
-"on your username and hostname. Please check that they are accurate.\n"
-"You can suppress this message by setting them explicitly:\n"
-"\n"
-"    git config --global user.name \"Your Name\"\n"
-"    git config --global user.email you@example.com\n"
-"\n"
-"After doing this, you may fix the identity used for this commit with:\n"
-"\n"
-"    git commit --amend --reset-author\n"
-msgstr ""
-"您的姓名和信件位址皆根據您的使用者名稱和主機名稱自動設定。\n"
-"請檢查是否正確。您可以自行設定，這樣便不會再出現這個提示訊息：\n"
-"\n"
-"    git config --global user.name \"Your Name\"\n"
-"    git config --global user.email you@example.com\n"
-"\n"
-"設定完畢後，您可以使用下述指令，修正這個提交使用的提交者身份：\n"
-"\n"
-"    git commit --amend --reset-author\n"
-
-#: sequencer.c:1287
-msgid "couldn't look up newly created commit"
-msgstr "無法找到新建立的提交"
-
-#: sequencer.c:1289
-msgid "could not parse newly created commit"
-msgstr "不能解析新建立的提交"
-
-#: sequencer.c:1336
-msgid "unable to resolve HEAD after creating commit"
-msgstr "建立提交後，不能解析 HEAD"
-
-#: sequencer.c:1338
-msgid "detached HEAD"
-msgstr "分離 HEAD"
-
-#  譯者：中文字串拼接，可刪除前導空格
-#: sequencer.c:1342
-msgid " (root-commit)"
-msgstr " (根提交)"
-
-#: sequencer.c:1363
-msgid "could not parse HEAD"
-msgstr "不能解析 HEAD"
-
-#: sequencer.c:1365
-#, c-format
-msgid "HEAD %s is not a commit!"
-msgstr "HEAD %s 不是一個提交！"
-
-#: sequencer.c:1369 sequencer.c:1447 builtin/commit.c:1707
-msgid "could not parse HEAD commit"
-msgstr "不能解析 HEAD 提交"
-
-#: sequencer.c:1425 sequencer.c:2310
-msgid "unable to parse commit author"
-msgstr "不能解析提交作者"
-
-#: sequencer.c:1436 builtin/am.c:1644 builtin/merge.c:710
-msgid "git write-tree failed to write a tree"
-msgstr "git write-tree 無法寫入樹狀物件"
-
-#: sequencer.c:1469 sequencer.c:1589
-#, c-format
-msgid "unable to read commit message from '%s'"
-msgstr "不能從 '%s' 讀取提交說明"
-
-#: sequencer.c:1500 sequencer.c:1532
-#, c-format
-msgid "invalid author identity '%s'"
-msgstr "無效的作者身分 '%s'"
-
-#: sequencer.c:1506
-msgid "corrupt author: missing date information"
-msgstr "作者資訊損壞：缺少日期資訊"
-
-#: sequencer.c:1545 builtin/am.c:1671 builtin/commit.c:1821 builtin/merge.c:921
-#: builtin/merge.c:946 t/helper/test-fast-rebase.c:78
-msgid "failed to write commit object"
-msgstr "寫提交物件失敗"
-
-#: sequencer.c:1572 sequencer.c:4496 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:1621
-#, c-format
-msgid "could not parse commit %s"
-msgstr "不能解析提交 %s"
-
-#: sequencer.c:1626
-#, c-format
-msgid "could not parse parent commit %s"
-msgstr "不能解析父提交 %s"
-
-#: sequencer.c:1709 sequencer.c:1990
-#, c-format
-msgid "unknown command: %d"
-msgstr "未知指令：%d"
-
-#: sequencer.c:1751
-msgid "This is the 1st commit message:"
-msgstr "這是第一個提交說明："
-
-#: sequencer.c:1752
-#, c-format
-msgid "This is the commit message #%d:"
-msgstr "這是提交說明 #%d："
-
-#: sequencer.c:1753
-msgid "The 1st commit message will be skipped:"
-msgstr "略過第 1 個提交說明："
-
-#: sequencer.c:1754
-#, c-format
-msgid "The commit message #%d will be skipped:"
-msgstr "略過第 %d 個提交說明："
-
-#: sequencer.c:1755
-#, c-format
-msgid "This is a combination of %d commits."
-msgstr "這是整合 %d 個提交的集合提交。"
-
-#: sequencer.c:1902 sequencer.c:1959
-#, c-format
-msgid "cannot write '%s'"
-msgstr "不能寫 '%s'"
-
-#: sequencer.c:1949
-msgid "need a HEAD to fixup"
-msgstr "需要一個 HEAD 來修復"
-
-#: sequencer.c:1951 sequencer.c:3592
-msgid "could not read HEAD"
-msgstr "不能讀取 HEAD"
-
-#: sequencer.c:1953
-msgid "could not read HEAD's commit message"
-msgstr "不能讀取 HEAD 的提交說明"
-
-#: sequencer.c:1977
-#, c-format
-msgid "could not read commit message of %s"
-msgstr "不能讀取 %s 的提交說明"
-
-#: sequencer.c:2087
-msgid "your index file is unmerged."
-msgstr "您的索引檔案未完成合併。"
-
-#: sequencer.c:2094
-msgid "cannot fixup root commit"
-msgstr "不能修復根提交"
-
-#: sequencer.c:2113
-#, c-format
-msgid "commit %s is a merge but no -m option was given."
-msgstr "提交 %s 是一個合併提交但未提供 -m 選項。"
-
-#: sequencer.c:2121 sequencer.c:2129
-#, c-format
-msgid "commit %s does not have parent %d"
-msgstr "提交 %s 沒有第 %d 個父提交"
-
-#: sequencer.c:2135
-#, 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:2154
-#, c-format
-msgid "%s: cannot parse parent commit %s"
-msgstr "%s：不能解析父提交 %s"
-
-#: sequencer.c:2220
-#, c-format
-msgid "could not rename '%s' to '%s'"
-msgstr "不能將 '%s' 重新命名為 '%s'"
-
-#: sequencer.c:2280
-#, c-format
-msgid "could not revert %s... %s"
-msgstr "不能還原 %s... %s"
-
-#: sequencer.c:2281
-#, c-format
-msgid "could not apply %s... %s"
-msgstr "不能套用 %s... %s"
-
-#: sequencer.c:2302
-#, c-format
-msgid "dropping %s %s -- patch contents already upstream\n"
-msgstr "拋棄 %s %s -- 修補檔的內容已在上游\n"
-
-#: sequencer.c:2360
-#, c-format
-msgid "git %s: failed to read the index"
-msgstr "git %s：無法讀取索引"
-
-#: sequencer.c:2368
-#, c-format
-msgid "git %s: failed to refresh the index"
-msgstr "git %s：無法重新整理索引"
-
-#: sequencer.c:2448
-#, c-format
-msgid "%s does not accept arguments: '%s'"
-msgstr "%s 不接受參數：'%s'"
-
-#: sequencer.c:2457
-#, c-format
-msgid "missing arguments for %s"
-msgstr "缺少 %s 的參數"
-
-#: sequencer.c:2500
-#, c-format
-msgid "could not parse '%s'"
-msgstr "無法解析 '%s'"
-
-#: sequencer.c:2561
-#, c-format
-msgid "invalid line %d: %.*s"
-msgstr "無效行 %d：%.*s"
-
-#: sequencer.c:2572
-#, c-format
-msgid "cannot '%s' without a previous commit"
-msgstr "沒有父提交的情況下不能 '%s'"
-
-#: sequencer.c:2620 builtin/rebase.c:185
-#, c-format
-msgid "could not read '%s'."
-msgstr "不能讀取 '%s'。"
-
-#: sequencer.c:2658
-msgid "cancelling a cherry picking in progress"
-msgstr "正在取消一個進行中的揀選"
-
-#: sequencer.c:2667
-msgid "cancelling a revert in progress"
-msgstr "正在取消一個進行中的還原"
-
-#: sequencer.c:2707
-msgid "please fix this using 'git rebase --edit-todo'."
-msgstr "請用 'git rebase --edit-todo' 來修改。"
-
-#: sequencer.c:2709
-#, c-format
-msgid "unusable instruction sheet: '%s'"
-msgstr "不可用的指令清單：'%s'"
-
-#: sequencer.c:2714
-msgid "no commits parsed."
-msgstr "沒有解析提交。"
-
-#: sequencer.c:2725
-msgid "cannot cherry-pick during a revert."
-msgstr "不能在還原提交中執行揀選。"
-
-#: sequencer.c:2727
-msgid "cannot revert during a cherry-pick."
-msgstr "不能在揀選中執行還原提交。"
-
-#: sequencer.c:2914
-msgid "unusable squash-onto"
-msgstr "不可用的 squash-onto"
-
-#: sequencer.c:2934
-#, c-format
-msgid "malformed options sheet: '%s'"
-msgstr "格式錯誤的選項清單：'%s'"
-
-#: sequencer.c:3029 sequencer.c:4875
-msgid "empty commit set passed"
-msgstr "提供了空的提交集"
-
-#: sequencer.c:3046
-msgid "revert is already in progress"
-msgstr "一個還原動作已在進行"
-
-#: sequencer.c:3048
-#, c-format
-msgid "try \"git revert (--continue | %s--abort | --quit)\""
-msgstr "嘗試 \"git revert (--continue | %s--abort | --quit)\""
-
-#: sequencer.c:3051
-msgid "cherry-pick is already in progress"
-msgstr "揀選動作已在進行"
-
-#: sequencer.c:3053
-#, c-format
-msgid "try \"git cherry-pick (--continue | %s--abort | --quit)\""
-msgstr "嘗試 \"git cherry-pick (--continue | %s--abort | --quit)\""
-
-#: sequencer.c:3067
-#, c-format
-msgid "could not create sequencer directory '%s'"
-msgstr "不能建立序列目錄 '%s'"
-
-#: sequencer.c:3082
-msgid "could not lock HEAD"
-msgstr "不能鎖定 HEAD"
-
-#: sequencer.c:3142 sequencer.c:4585
-msgid "no cherry-pick or revert in progress"
-msgstr "揀選或還原動作並未進行"
-
-#: sequencer.c:3144 sequencer.c:3155
-msgid "cannot resolve HEAD"
-msgstr "不能解析 HEAD"
-
-#: sequencer.c:3146 sequencer.c:3190
-msgid "cannot abort from a branch yet to be born"
-msgstr "不能從尚未建立的分支終止"
-
-#: sequencer.c:3176 builtin/fetch.c:1030 builtin/fetch.c:1457
-#: builtin/grep.c:774
-#, c-format
-msgid "cannot open '%s'"
-msgstr "不能開啟 '%s'"
-
-#: sequencer.c:3178
-#, c-format
-msgid "cannot read '%s': %s"
-msgstr "不能讀取 '%s'：%s"
-
-#: sequencer.c:3179
-msgid "unexpected end of file"
-msgstr "意外的檔案結束"
-
-#: sequencer.c:3185
-#, c-format
-msgid "stored pre-cherry-pick HEAD file '%s' is corrupt"
-msgstr "儲存揀選提交前的 HEAD 檔案 '%s' 損壞"
-
-#: sequencer.c:3196
-msgid "You seem to have moved HEAD. Not rewinding, check your HEAD!"
-msgstr "您好像移動了 HEAD。未能還原，檢查您的 HEAD！"
-
-#: sequencer.c:3237
-msgid "no revert in progress"
-msgstr "沒有正在進行的還原"
-
-#: sequencer.c:3246
-msgid "no cherry-pick in progress"
-msgstr "沒有正在進行的揀選"
-
-#: sequencer.c:3256
-msgid "failed to skip the commit"
-msgstr "無法略過這個提交"
-
-#: sequencer.c:3263
-msgid "there is nothing to skip"
-msgstr "沒有要略過的"
-
-#: sequencer.c:3266
-#, c-format
-msgid ""
-"have you committed already?\n"
-"try \"git %s --continue\""
-msgstr ""
-"您已經提交了嗎？\n"
-"試試 \"git %s --continue\""
-
-#: sequencer.c:3428 sequencer.c:4476
-msgid "cannot read HEAD"
-msgstr "不能讀取 HEAD"
-
-#: sequencer.c:3445
-#, c-format
-msgid "unable to copy '%s' to '%s'"
-msgstr "無法複製 '%s' 至 '%s'"
-
-#: sequencer.c:3453
-#, c-format
-msgid ""
-"You can amend the commit now, with\n"
-"\n"
-"  git commit --amend %s\n"
-"\n"
-"Once you are satisfied with your changes, run\n"
-"\n"
-"  git rebase --continue\n"
-msgstr ""
-"您現在可以修補這個提交，使用\n"
-"\n"
-"  git commit --amend %s\n"
-"\n"
-"當您對變更感到滿意，執行\n"
-"\n"
-"  git rebase --continue\n"
-
-#: sequencer.c:3463
-#, c-format
-msgid "Could not apply %s... %.*s"
-msgstr "不能套用 %s... %.*s"
-
-#: sequencer.c:3470
-#, c-format
-msgid "Could not merge %.*s"
-msgstr "不能合併 %.*s"
-
-#: sequencer.c:3484 sequencer.c:3488 builtin/difftool.c:633
-#, c-format
-msgid "could not copy '%s' to '%s'"
-msgstr "不能複製 '%s' 至 '%s'"
-
-#: sequencer.c:3499
-#, c-format
-msgid "Executing: %s\n"
-msgstr "執行：%s\n"
-
-#  譯者：請維持前導空格
-#: sequencer.c:3510
-#, c-format
-msgid ""
-"execution failed: %s\n"
-"%sYou can fix the problem, and then run\n"
-"\n"
-"  git rebase --continue\n"
-"\n"
-msgstr ""
-"執行失敗：%s\n"
-"%s您可以改正該問題，然後執行\n"
-"\n"
-"  git rebase --continue\n"
-"\n"
-
-#: sequencer.c:3516
-msgid "and made changes to the index and/or the working tree\n"
-msgstr "並且修改索引和/或工作區\n"
-
-#: sequencer.c:3522
-#, c-format
-msgid ""
-"execution succeeded: %s\n"
-"but left changes to the index and/or the working tree\n"
-"Commit or stash your changes, and then run\n"
-"\n"
-"  git rebase --continue\n"
-"\n"
-msgstr ""
-"執行成功：%s\n"
-"但是在索引和/或工作區中存在變更\n"
-"提交或儲藏修改，然後執行\n"
-"\n"
-"  git rebase --continue\n"
-"\n"
-
-#: sequencer.c:3582
-#, c-format
-msgid "illegal label name: '%.*s'"
-msgstr "非法的標籤名稱：'%.*s'"
-
-#: sequencer.c:3655
-msgid "writing fake root commit"
-msgstr "寫偽根提交"
-
-#: sequencer.c:3660
-msgid "writing squash-onto"
-msgstr "寫入 squash-onto"
-
-#: sequencer.c:3739
-#, c-format
-msgid "could not resolve '%s'"
-msgstr "無法解析 '%s'"
-
-#: sequencer.c:3771
-msgid "cannot merge without a current revision"
-msgstr "沒有目前版本不能合併"
-
-#: sequencer.c:3793
-#, c-format
-msgid "unable to parse '%.*s'"
-msgstr "無法解析 '%.*s'"
-
-#: sequencer.c:3802
-#, c-format
-msgid "nothing to merge: '%.*s'"
-msgstr "無可用合併：'%.*s'"
-
-#: sequencer.c:3814
-msgid "octopus merge cannot be executed on top of a [new root]"
-msgstr "章魚合並不能在一個新的根提交上執行"
-
-#: sequencer.c:3869
-#, c-format
-msgid "could not get commit message of '%s'"
-msgstr "不能取得 '%s' 的提交說明"
-
-#: sequencer.c:4013
-#, c-format
-msgid "could not even attempt to merge '%.*s'"
-msgstr "甚至不能嘗試合併 '%.*s'"
-
-#: sequencer.c:4029
-msgid "merge: Unable to write new index file"
-msgstr "合併：無法寫入新索引檔案"
-
-#: sequencer.c:4110
-msgid "Cannot autostash"
-msgstr "無法 autostash"
-
-#: sequencer.c:4113
-#, c-format
-msgid "Unexpected stash response: '%s'"
-msgstr "意外的 stash 回應：'%s'"
-
-#: sequencer.c:4119
-#, c-format
-msgid "Could not create directory for '%s'"
-msgstr "不能為 '%s' 建立目錄"
-
-#: sequencer.c:4122
-#, c-format
-msgid "Created autostash: %s\n"
-msgstr "建立了 autostash：%s\n"
-
-#: sequencer.c:4124
-msgid "could not reset --hard"
-msgstr "無法 reset --hard"
-
-#: sequencer.c:4148
-#, c-format
-msgid "Applied autostash.\n"
-msgstr "已套用 autostash。\n"
-
-#: sequencer.c:4160
-#, c-format
-msgid "cannot store %s"
-msgstr "不能儲存 %s"
-
-#: sequencer.c:4163
-#, c-format
-msgid ""
-"%s\n"
-"Your changes are safe in the stash.\n"
-"You can run \"git stash pop\" or \"git stash drop\" at any time.\n"
-msgstr ""
-"%s\n"
-"您的修改安全地儲存在儲藏區中。\n"
-"您可以在任何時候執行 \"git stash pop\" 或 \"git stash drop\"。\n"
-
-#: sequencer.c:4168
-msgid "Applying autostash resulted in conflicts."
-msgstr "因套用自動儲藏而導致衝突。"
-
-#: sequencer.c:4169
-msgid "Autostash exists; creating a new stash entry."
-msgstr "已有自動儲藏；建立新儲藏項目。"
-
-#: sequencer.c:4225
-msgid "could not detach HEAD"
-msgstr "不能分離開頭指標"
-
-#: sequencer.c:4240
-#, c-format
-msgid "Stopped at HEAD\n"
-msgstr "停止在 HEAD\n"
-
-#: sequencer.c:4242
-#, c-format
-msgid "Stopped at %s\n"
-msgstr "停止在 %s\n"
-
-#: sequencer.c:4274
-#, c-format
-msgid ""
-"Could not execute the todo command\n"
-"\n"
-"    %.*s\n"
-"It has been rescheduled; To edit the command before continuing, please\n"
-"edit the todo list first:\n"
-"\n"
-"    git rebase --edit-todo\n"
-"    git rebase --continue\n"
-msgstr ""
-"無法執行待辦指令\n"
-"\n"
-"    %.*s\n"
-"已被重新安排，在繼續之前編輯指令，請先編輯待辦列表：\n"
-"\n"
-"    git rebase --edit-todo\n"
-"    git rebase --continue\n"
-
-#: sequencer.c:4320
-#, c-format
-msgid "Rebasing (%d/%d)%s"
-msgstr "正在重定基底 (%d/%d)%s"
-
-#: sequencer.c:4366
-#, c-format
-msgid "Stopped at %s...  %.*s\n"
-msgstr "停止在 %s... %.*s\n"
-
-#: sequencer.c:4436
-#, c-format
-msgid "unknown command %d"
-msgstr "未知指令 %d"
-
-#: sequencer.c:4484
-msgid "could not read orig-head"
-msgstr "不能讀取 orig-head"
-
-#: sequencer.c:4489
-msgid "could not read 'onto'"
-msgstr "不能讀取 'onto'"
-
-#: sequencer.c:4503
-#, c-format
-msgid "could not update HEAD to %s"
-msgstr "不能更新 HEAD 為 %s"
-
-#: sequencer.c:4563
-#, c-format
-msgid "Successfully rebased and updated %s.\n"
-msgstr "成功重定基底並更新 %s。\n"
-
-#: sequencer.c:4615
-msgid "cannot rebase: You have unstaged changes."
-msgstr "不能重定基底：您有未暫存的變更。"
-
-#: sequencer.c:4624
-msgid "cannot amend non-existing commit"
-msgstr "不能修補不存在的提交"
-
-#: sequencer.c:4626
-#, c-format
-msgid "invalid file: '%s'"
-msgstr "無效檔案：'%s'"
-
-#: sequencer.c:4628
-#, c-format
-msgid "invalid contents: '%s'"
-msgstr "無效內容：'%s'"
-
-#: sequencer.c:4631
-msgid ""
-"\n"
-"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'。"
-
-#: sequencer.c:4667 sequencer.c:4706
-#, c-format
-msgid "could not write file: '%s'"
-msgstr "不能寫入檔案：'%s'"
-
-#: sequencer.c:4722
-msgid "could not remove CHERRY_PICK_HEAD"
-msgstr "不能刪除 CHERRY_PICK_HEAD"
-
-#: sequencer.c:4732
-msgid "could not commit staged changes."
-msgstr "不能提交暫存的修改。"
-
-#: sequencer.c:4852
-#, c-format
-msgid "%s: can't cherry-pick a %s"
-msgstr "%s：不能揀選一個%s"
-
-#: sequencer.c:4856
-#, c-format
-msgid "%s: bad revision"
-msgstr "%s：錯誤的版本"
-
-#: sequencer.c:4891
-msgid "can't revert as initial commit"
-msgstr "不能作為初始提交還原提交"
-
-#: sequencer.c:5162 sequencer.c:5391
-#, c-format
-msgid "skipped previously applied commit %s"
-msgstr "已略過先前套用的 %s 提交"
-
-#: sequencer.c:5232 sequencer.c:5407
-msgid "use --reapply-cherry-picks to include skipped commits"
-msgstr "使用 --reapply-cherry-picks 以包含略過提交"
-
-#: sequencer.c:5378
-msgid "make_script: unhandled options"
-msgstr "make_script：有未能處理的選項"
-
-#: sequencer.c:5381
-msgid "make_script: error preparing revisions"
-msgstr "make_script：準備版本時錯誤"
-
-#: sequencer.c:5639 sequencer.c:5656
-msgid "nothing to do"
-msgstr "無事可做"
-
-#: sequencer.c:5675
-msgid "could not skip unnecessary pick commands"
-msgstr "無法略過不必要的揀選"
-
-#: sequencer.c:5775
-msgid "the script was already rearranged."
-msgstr "腳本已經重新編排。"
-
-#: setup.c:135
-#, c-format
-msgid "'%s' is outside repository at '%s'"
-msgstr "'%s' 在位於 '%s' 的版本庫之外"
-
-#: setup.c:187
-#, c-format
-msgid ""
-"%s: no such path in the working tree.\n"
-"Use 'git <command> -- <path>...' to specify paths that do not exist locally."
-msgstr ""
-"%s：工作區中無此路徑。\n"
-"使用指令 'git <命令> -- <路徑>...' 來指定本機不存在的路徑。"
-
-#: setup.c:200
-#, c-format
-msgid ""
-"ambiguous argument '%s': unknown revision or path not in the working tree.\n"
-"Use '--' to separate paths from revisions, like this:\n"
-"'git <command> [<revision>...] -- [<file>...]'"
-msgstr ""
-"有歧義的參數 '%s'：未知的版本或路徑不存在於工作區中。\n"
-"使用 '--' 來分隔版本和路徑，例如：\n"
-"'git <命令> [<版本>...] -- [<檔案>...]'"
-
-#: setup.c:266
-#, c-format
-msgid "option '%s' must come before non-option arguments"
-msgstr "選項 '%s' 必須在其他非選項參數之前"
-
-#: setup.c:285
-#, c-format
-msgid ""
-"ambiguous argument '%s': both revision and filename\n"
-"Use '--' to separate paths from revisions, like this:\n"
-"'git <command> [<revision>...] -- [<file>...]'"
-msgstr ""
-"有歧義的參數 '%s'：可同時是版本和檔案\n"
-"使用 '--' 來分隔版本和路徑，例如：\n"
-"'git <命令> [<版本>...] -- [<檔案>...]'"
-
-#: setup.c:421
-msgid "unable to set up work tree using invalid config"
-msgstr "無法使用無效設定來建立工作區"
-
-#: setup.c:425 builtin/rev-parse.c:895
-msgid "this operation must be run in a work tree"
-msgstr "該動作必須在一個工作區中執行"
-
-#: setup.c:724
-#, c-format
-msgid "Expected git repo version <= %d, found %d"
-msgstr "期望 git 版本庫版本 <= %d，卻得到 %d"
-
-#: setup.c:732
-msgid "unknown repository extension found:"
-msgid_plural "unknown repository extensions found:"
-msgstr[0] "找到未知的儲存庫擴充元件："
-
-#: setup.c:746
-msgid "repo version is 0, but v1-only extension found:"
-msgid_plural "repo version is 0, but v1-only extensions found:"
-msgstr[0] "repo 版本是 0 (v0)，但找到只支援 v1 的擴充元件："
-
-#: setup.c:767
-#, c-format
-msgid "error opening '%s'"
-msgstr "開啟 '%s' 發生錯誤"
-
-#: setup.c:769
-#, c-format
-msgid "too large to be a .git file: '%s'"
-msgstr "檔案太大，無法作為 .git 檔案：'%s'"
-
-#: setup.c:771
-#, c-format
-msgid "error reading %s"
-msgstr "讀取 %s 發生錯誤"
-
-#: setup.c:773
-#, c-format
-msgid "invalid gitfile format: %s"
-msgstr "無效的 gitfile 格式：%s"
-
-#: setup.c:775
-#, c-format
-msgid "no path in gitfile: %s"
-msgstr "在 gitfile 中沒有路徑：%s"
-
-#: setup.c:777
-#, c-format
-msgid "not a git repository: %s"
-msgstr "不是一個 git 版本庫：%s"
-
-#: setup.c:879
-#, c-format
-msgid "'$%s' too big"
-msgstr "'$%s' 太大"
-
-#: setup.c:893
-#, c-format
-msgid "not a git repository: '%s'"
-msgstr "不是一個 git 版本庫：'%s'"
-
-#: setup.c:922 setup.c:924 setup.c:955
-#, c-format
-msgid "cannot chdir to '%s'"
-msgstr "不能切換目錄到 '%s'"
-
-#: setup.c:927 setup.c:983 setup.c:993 setup.c:1032 setup.c:1040
-msgid "cannot come back to cwd"
-msgstr "無法返回目前工作目錄"
-
-#: setup.c:1054
-#, c-format
-msgid "failed to stat '%*s%s%s'"
-msgstr "取得 '%*s%s%s' 狀態（stat）失敗"
-
-#: setup.c:1338
-msgid "Unable to read current working directory"
-msgstr "不能讀取目前工作目錄"
-
-#: setup.c:1347 setup.c:1353
-#, c-format
-msgid "cannot change to '%s'"
-msgstr "不能切換到 '%s'"
-
-#: setup.c:1358
-#, c-format
-msgid "not a git repository (or any of the parent directories): %s"
-msgstr "不是一個 git 版本庫（或者任何父目錄）：%s"
-
-#: setup.c:1364
-#, 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 ""
-"不是一個 git 版本庫（或者直至掛載點 %s 的任何父目錄）\n"
-"停止在檔案系統邊界（未設定 GIT_DISCOVERY_ACROSS_FILESYSTEM）。"
-
-#: setup.c:1374
-#, c-format
-msgid ""
-"unsafe repository ('%s' is owned by someone else)\n"
-"To add an exception for this directory, call:\n"
-"\n"
-"\tgit config --global --add safe.directory %s"
-msgstr ""
-"不安全版本庫（「%s」由其他人所有）\n"
-"若要放行本目錄，請呼叫：\n"
-"\n"
-"\tgit config --global --add safe.directory %s"
-
-#: setup.c:1502
-#, c-format
-msgid ""
-"problem with core.sharedRepository filemode value (0%.3o).\n"
-"The owner of files must always have read and write permissions."
-msgstr ""
-"參數 core.sharedRepository 的檔案屬性值有問題（0%.3o）。\n"
-"檔案所有者必須始終擁有讀寫權限。"
-
-#: setup.c:1564
-msgid "fork failed"
-msgstr "fork 失敗"
-
-#: setup.c:1569
-msgid "setsid failed"
-msgstr "setsid 失敗"
-
-#: sparse-index.c:285
-#, c-format
-msgid "index entry is a directory, but not sparse (%08x)"
-msgstr "索引項目是資料夾，但不是稀疏資料夾（%08x）"
-
-#: split-index.c:9
-msgid "cannot use split index with a sparse index"
-msgstr "無法在稀疏索引使用索引分割"
-
-#. TRANSLATORS: IEC 80000-13:2008 gibibyte
-#: strbuf.c:851
-#, c-format
-msgid "%u.%2.2u GiB"
-msgstr "%u.%2.2u GiB"
-
-#. TRANSLATORS: IEC 80000-13:2008 gibibyte/second
-#: strbuf.c:853
-#, c-format
-msgid "%u.%2.2u GiB/s"
-msgstr "%u.%2.2u GiB/s"
-
-#. TRANSLATORS: IEC 80000-13:2008 mebibyte
-#: strbuf.c:861
-#, c-format
-msgid "%u.%2.2u MiB"
-msgstr "%u.%2.2u MiB"
-
-#. TRANSLATORS: IEC 80000-13:2008 mebibyte/second
-#: strbuf.c:863
-#, c-format
-msgid "%u.%2.2u MiB/s"
-msgstr "%u.%2.2u MiB/s"
-
-#. TRANSLATORS: IEC 80000-13:2008 kibibyte
-#: strbuf.c:870
-#, c-format
-msgid "%u.%2.2u KiB"
-msgstr "%u.%2.2u KiB"
-
-#. TRANSLATORS: IEC 80000-13:2008 kibibyte/second
-#: strbuf.c:872
-#, c-format
-msgid "%u.%2.2u KiB/s"
-msgstr "%u.%2.2u KiB/s"
-
-#. TRANSLATORS: IEC 80000-13:2008 byte
-#: strbuf.c:878
-#, c-format
-msgid "%u byte"
-msgid_plural "%u bytes"
-msgstr[0] "%u 位元組"
-
-#. TRANSLATORS: IEC 80000-13:2008 byte/second
-#: strbuf.c:880
-#, c-format
-msgid "%u byte/s"
-msgid_plural "%u bytes/s"
-msgstr[0] "%u 位元組/秒"
-
-#: strbuf.c:1187 wrapper.c:217 wrapper.c:387 builtin/am.c:766
-#: builtin/rebase.c:653
-#, c-format
-msgid "could not open '%s' for writing"
-msgstr "無法開啟 '%s' 進行寫入"
-
-#: strbuf.c:1196
-#, c-format
-msgid "could not edit '%s'"
-msgstr "無法編輯 '%s'"
-
-#: submodule-config.c:238
-#, c-format
-msgid "ignoring suspicious submodule name: %s"
-msgstr "忽略可疑的子模組名稱：%s"
-
-#: submodule-config.c:305
-msgid "negative values not allowed for submodule.fetchjobs"
-msgstr "submodule.fetchjobs 不允許為負值"
-
-#: submodule-config.c:403
-#, c-format
-msgid "ignoring '%s' which may be interpreted as a command-line option: %s"
-msgstr "忽略可能被解析為指令列選項的 '%s'：%s"
-
-#: submodule-config.c:500 builtin/push.c:489 builtin/send-pack.c:148
-#, c-format
-msgid "invalid value for '%s'"
-msgstr "「%s」的值無效"
-
-#: submodule-config.c:828
-#, c-format
-msgid "Could not update .gitmodules entry %s"
-msgstr "不能更新 .gitmodules 條目 %s"
-
-#: submodule.c:115 submodule.c:144
-msgid "Cannot change unmerged .gitmodules, resolve merge conflicts first"
-msgstr "無法修改未合併的 .gitmodules，先解決合併衝突"
-
-#: submodule.c:119 submodule.c:148
-#, c-format
-msgid "Could not find section in .gitmodules where path=%s"
-msgstr "無法在 .gitmodules 中找到 path=%s 的小節"
-
-#: submodule.c:155
-#, c-format
-msgid "Could not remove .gitmodules entry for %s"
-msgstr "無法移除 %s 的 .gitmodules 條目"
-
-#: submodule.c:166
-msgid "staging updated .gitmodules failed"
-msgstr "將更新後 .gitmodules 新增暫存區失敗"
-
-#: submodule.c:346
-#, c-format
-msgid "in unpopulated submodule '%s'"
-msgstr "位於未簽出的子模組 '%s'"
-
-#: submodule.c:377
-#, c-format
-msgid "Pathspec '%s' is in submodule '%.*s'"
-msgstr "路徑規格 '%s' 在子模組 '%.*s' 中"
-
-#: submodule.c:454
-#, c-format
-msgid "bad --ignore-submodules argument: %s"
-msgstr "無效 --ignore-submodules 參數：%s"
-
-#: submodule.c:866
-#, c-format
-msgid ""
-"Submodule in commit %s at path: '%s' collides with a submodule named the "
-"same. Skipping it."
-msgstr "%s 提交位於路徑：'%s' 的子模組與同名的子模組衝突。略過。"
-
-#: submodule.c:987
-#, c-format
-msgid "submodule entry '%s' (%s) is a %s, not a commit"
-msgstr "子模組條目 '%s'（%s）是一個 %s，不是一個提交"
-
-#: submodule.c:1069
-#, 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:1192
-#, c-format
-msgid "process for submodule '%s' failed"
-msgstr "處理 '%s' 子模組失敗"
-
-#: submodule.c:1221 builtin/branch.c:714 builtin/submodule--helper.c:2827
-msgid "Failed to resolve HEAD as a valid ref."
-msgstr "無法將 HEAD 解析為有效引用。"
-
-#: submodule.c:1232
-#, c-format
-msgid "Pushing submodule '%s'\n"
-msgstr "正在推送 '%s' 子模組\n"
-
-#: submodule.c:1235
-#, c-format
-msgid "Unable to push submodule '%s'\n"
-msgstr "無法推送 '%s' 子模組\n"
-
-#: submodule.c:1567
-#, c-format
-msgid "Fetching submodule %s%s\n"
-msgstr "正在抓取 %s%s 子模組\n"
-
-#: submodule.c:1589
-#, c-format
-msgid "Could not access submodule '%s'\n"
-msgstr "無法存取子模組 '%s'\n"
-
-#: submodule.c:1618
-#, c-format
-msgid "Could not access submodule '%s' at commit %s\n"
-msgstr "無法存取 %2$s 提交的子模組「%1$s」\n"
-
-#: submodule.c:1629
-#, c-format
-msgid "Fetching submodule %s%s at commit %s\n"
-msgstr "正在抓取 %3$s 提交的 %1$s%2$s 子模組\n"
-
-#: submodule.c:1849
-#, c-format
-msgid ""
-"Errors during submodule fetch:\n"
-"%s"
-msgstr ""
-"抓取子模組時發生錯誤：\n"
-"%s"
-
-#: submodule.c:1874
-#, c-format
-msgid "'%s' not recognized as a git repository"
-msgstr "無法將 '%s' 識別為一個 git 版本庫"
-
-#: submodule.c:1891
-#, c-format
-msgid "Could not run 'git status --porcelain=2' in submodule %s"
-msgstr "無法在 %s 子模組執行 'git status --porcelain=2'"
-
-#: submodule.c:1932
-#, c-format
-msgid "'git status --porcelain=2' failed in submodule %s"
-msgstr "%s 子模組執行 'git status --porcelain=2' 失敗"
-
-#: submodule.c:2007
-#, c-format
-msgid "could not start 'git status' in submodule '%s'"
-msgstr "無法在子模組 '%s' 中啟動 'git status'"
-
-#: submodule.c:2020
-#, c-format
-msgid "could not run 'git status' in submodule '%s'"
-msgstr "無法在子模組 '%s' 中執行 'git status'"
-
-#: submodule.c:2037
-#, c-format
-msgid "Could not unset core.worktree setting in submodule '%s'"
-msgstr "無法在子模組 '%s' 中取消 core.worktree 的設定"
-
-#: submodule.c:2064 submodule.c:2379
-#, c-format
-msgid "could not recurse into submodule '%s'"
-msgstr "無法遞迴子模組路徑 '%s'"
-
-#: submodule.c:2086
-msgid "could not reset submodule index"
-msgstr "無法重設子模組的索引"
-
-#: submodule.c:2128
-#, c-format
-msgid "submodule '%s' has dirty index"
-msgstr "子模組 '%s' 中有髒索引"
-
-#: submodule.c:2182
-#, c-format
-msgid "Submodule '%s' could not be updated."
-msgstr "子模組 '%s' 無法被更新。"
-
-#: submodule.c:2250
-#, c-format
-msgid "submodule git dir '%s' is inside git dir '%.*s'"
-msgstr "「%s」子模組 git 目錄在「%.*s」git 路徑中"
-
-#: submodule.c:2271
-#, c-format
-msgid ""
-"relocate_gitdir for submodule '%s' with more than one worktree not supported"
-msgstr "不支援對有多個工作區的子模組 '%s' 執行 relocate_gitdir"
-
-#: submodule.c:2283 submodule.c:2343
-#, c-format
-msgid "could not lookup name for submodule '%s'"
-msgstr "不能查詢子模組 '%s' 的名稱"
-
-#: submodule.c:2287
-#, c-format
-msgid "refusing to move '%s' into an existing git dir"
-msgstr "拒絕移動「%s」至現存 git 目錄"
-
-#: submodule.c:2293
-#, c-format
-msgid ""
-"Migrating git directory of '%s%s' from\n"
-"'%s' to\n"
-"'%s'\n"
-msgstr ""
-"將 '%s%s' 的 git 目錄從\n"
-"'%s' 遷移至\n"
-"'%s'\n"
-
-#: submodule.c:2424
-msgid "could not start ls-files in .."
-msgstr "無法在 .. 中啟動 ls-files"
-
-#: submodule.c:2464
-#, c-format
-msgid "ls-tree returned unexpected return code %d"
-msgstr "ls-tree 返回未知返回值 %d"
-
-#: symlinks.c:244
-#, c-format
-msgid "failed to lstat '%s'"
-msgstr "無法 lstat “%s”"
-
-#: trailer.c:244
-#, c-format
-msgid "running trailer command '%s' failed"
-msgstr "執行 trailer 指令 '%s' 失敗"
-
-#: 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 "鍵 '%2$s' 的未知取值 '%1$s'"
-
-#: trailer.c:547 trailer.c:552 trailer.c:557 builtin/remote.c:300
-#: builtin/remote.c:328
-#, c-format
-msgid "more than one %s"
-msgstr "多於一個 %s"
-
-#: trailer.c:743
-#, c-format
-msgid "empty trailer token in trailer '%.*s'"
-msgstr "簽名 '%.*s' 的鍵為空"
-
-#: trailer.c:763
-#, c-format
-msgid "could not read input file '%s'"
-msgstr "不能讀取輸入檔案 '%s'"
-
-#: trailer.c:766 builtin/mktag.c:88 imap-send.c:1563
-msgid "could not read from stdin"
-msgstr "不能自標準輸入讀取"
-
-#: trailer.c:1024 wrapper.c:760
-#, c-format
-msgid "could not stat %s"
-msgstr "不能對 %s 呼叫 stat"
-
-#: trailer.c:1026
-#, c-format
-msgid "file %s is not a regular file"
-msgstr "檔案 %s 不是一個正規檔案"
-
-#: trailer.c:1028
-#, c-format
-msgid "file %s is not writable by user"
-msgstr "檔案 %s 使用者不可寫"
-
-#: trailer.c:1040
-msgid "could not open temporary file"
-msgstr "不能開啟暫存檔"
-
-#: trailer.c:1080
-#, c-format
-msgid "could not rename temporary file to %s"
-msgstr "不能重新命名暫存檔為 %s"
-
-#: transport-helper.c:62 transport-helper.c:91
-msgid "full write to remote helper failed"
-msgstr "完整寫入遠端協助工具失敗"
-
-#: transport-helper.c:145
-#, c-format
-msgid "unable to find remote helper for '%s'"
-msgstr "無法為 '%s' 找到遠端協助工具"
-
-#: transport-helper.c:161 transport-helper.c:575
-msgid "can't dup helper output fd"
-msgstr "無法複製協助工具輸出檔案句柄"
-
-#: transport-helper.c:214
-#, c-format
-msgid ""
-"unknown mandatory capability %s; this remote helper probably needs newer "
-"version of Git"
-msgstr "未知的強制能力 %s，該遠端協助工具可能需要新版本的Git"
-
-#: transport-helper.c:220
-msgid "this remote helper should implement refspec capability"
-msgstr "遠端協助工具需要實現 refspec 引用規格能力"
-
-#: transport-helper.c:287 transport-helper.c:429
-#, c-format
-msgid "%s unexpectedly said: '%s'"
-msgstr "%s 意外地說：'%s'"
-
-#: transport-helper.c:417
-#, c-format
-msgid "%s also locked %s"
-msgstr "%s 也鎖定了 %s"
-
-#: transport-helper.c:497
-msgid "couldn't run fast-import"
-msgstr "不能執行 fast-import"
-
-#: transport-helper.c:520
-msgid "error while running fast-import"
-msgstr "執行 fast-import 發生錯誤"
-
-#: transport-helper.c:549 transport-helper.c:1254
-#, c-format
-msgid "could not read ref %s"
-msgstr "無法讀取引用 %s"
-
-#: transport-helper.c:594
-#, c-format
-msgid "unknown response to connect: %s"
-msgstr "連線時未知的回應：%s"
-
-#: transport-helper.c:616
-msgid "setting remote service path not supported by protocol"
-msgstr "協定不支援設定遠端服務路徑"
-
-#: transport-helper.c:618
-msgid "invalid remote service path"
-msgstr "無效的遠端服務路徑"
-
-#: transport-helper.c:661 transport.c:1496
-msgid "operation not supported by protocol"
-msgstr "協定不支援該動作"
-
-#: transport-helper.c:664
-#, c-format
-msgid "can't connect to subservice %s"
-msgstr "不能連線到子服務 %s"
-
-#: transport-helper.c:693 transport.c:415
-msgid "--negotiate-only requires protocol v2"
-msgstr "--negotiate-only 需要 v2 版協定"
-
-#: transport-helper.c:758
-msgid "'option' without a matching 'ok/error' directive"
-msgstr "'option' 缺少對應的 'ok/error' 指令"
-
-#: transport-helper.c:801
-#, c-format
-msgid "expected ok/error, helper said '%s'"
-msgstr "預期 ok/error，協助工具說 '%s'"
-
-#: transport-helper.c:862
-#, c-format
-msgid "helper reported unexpected status of %s"
-msgstr "協助工具報告 %s 的意外狀態"
-
-#: transport-helper.c:945
-#, c-format
-msgid "helper %s does not support dry-run"
-msgstr "協助工具 %s 不支援 dry-run"
-
-#: transport-helper.c:948
-#, c-format
-msgid "helper %s does not support --signed"
-msgstr "協助工具 %s 不支援 --signed"
-
-#: transport-helper.c:951
-#, c-format
-msgid "helper %s does not support --signed=if-asked"
-msgstr "協助工具 %s 不支援 --signed=if-asked"
-
-#: transport-helper.c:956
-#, c-format
-msgid "helper %s does not support --atomic"
-msgstr "協助工具 %s 不支援 --atomic"
-
-#: transport-helper.c:960
-#, c-format
-msgid "helper %s does not support --%s"
-msgstr "協助工具 %s 不支援 --%s"
-
-#: transport-helper.c:967
-#, c-format
-msgid "helper %s does not support 'push-option'"
-msgstr "協助工具 %s 不支援 'push-option'"
-
-#: transport-helper.c:1067
-msgid "remote-helper doesn't support push; refspec needed"
-msgstr "remote-heper 不支援 push，需要引用規格"
-
-#: transport-helper.c:1072
-#, c-format
-msgid "helper %s does not support 'force'"
-msgstr "協助工具 %s 不支援 'force'"
-
-#: transport-helper.c:1119
-msgid "couldn't run fast-export"
-msgstr "無法執行 fast-export"
-
-#: transport-helper.c:1124
-msgid "error while running fast-export"
-msgstr "執行 fast-export 時發生錯誤"
-
-#: transport-helper.c:1149
-#, c-format
-msgid ""
-"No refs in common and none specified; doing nothing.\n"
-"Perhaps you should specify a branch.\n"
-msgstr ""
-"沒有共同的引用並且也沒有指定，什麼也不會做。\n"
-"您或許得指定一個分支。\n"
-
-#: transport-helper.c:1231
-#, c-format
-msgid "unsupported object format '%s'"
-msgstr "不支援的物件格式「%s」"
-
-#: transport-helper.c:1240
-#, c-format
-msgid "malformed response in ref list: %s"
-msgstr "引用列表中格式錯誤的回應：%s"
-
-#: transport-helper.c:1392
-#, c-format
-msgid "read(%s) failed"
-msgstr "讀取（%s）失敗"
-
-#: transport-helper.c:1419
-#, c-format
-msgid "write(%s) failed"
-msgstr "寫（%s）失敗"
-
-#: transport-helper.c:1468
-#, c-format
-msgid "%s thread failed"
-msgstr "%s 執行緒失敗"
-
-#: transport-helper.c:1472
-#, c-format
-msgid "%s thread failed to join: %s"
-msgstr "%s 執行緒等待失敗：%s"
-
-#: transport-helper.c:1491 transport-helper.c:1495
-#, c-format
-msgid "can't start thread for copying data: %s"
-msgstr "不能啟動執行緒來複製資料：%s"
-
-#: transport-helper.c:1532
-#, c-format
-msgid "%s process failed to wait"
-msgstr "%s 進程等待失敗"
-
-#: transport-helper.c:1536
-#, c-format
-msgid "%s process failed"
-msgstr "%s 進程失敗"
-
-#: transport-helper.c:1554 transport-helper.c:1563
-msgid "can't start thread for copying data"
-msgstr "不能啟動執行緒來複製資料"
-
-#: transport.c:116
-#, c-format
-msgid "Would set upstream of '%s' to '%s' of '%s'\n"
-msgstr "將要設定 '%1$s' 的上游為 '%3$s' 的 '%2$s'\n"
-
-#: transport.c:138
-#, c-format
-msgid "could not read bundle '%s'"
-msgstr "無法讀取「%s」套件"
-
-#: transport.c:234
-#, c-format
-msgid "transport: invalid depth option '%s'"
-msgstr "傳輸：無效的深度選項 '%s'"
-
-#: transport.c:289
-msgid "see protocol.version in 'git help config' for more details"
-msgstr "檢視 'git help config' 中的 protocol.version 取得更多訊息"
-
-#: transport.c:290
-msgid "server options require protocol version 2 or later"
-msgstr "服務端選項需要版本 2 協定或更高"
-
-#: transport.c:418
-msgid "server does not support wait-for-done"
-msgstr "伺服器不支援「等待完成」(wait-for-done) 功能"
-
-#: transport.c:770
-msgid "could not parse transport.color.* config"
-msgstr "不能解析 transport.color.* 設定"
-
-#: transport.c:845
-msgid "support for protocol v2 not implemented yet"
-msgstr "協定 v2 的支援尚未實現"
-
-#: transport.c:978
-#, c-format
-msgid "unknown value for config '%s': %s"
-msgstr "設定 '%s' 的取值未知：%s"
-
-#: transport.c:1044
-#, c-format
-msgid "transport '%s' not allowed"
-msgstr "傳輸 '%s' 不允許"
-
-#: transport.c:1093
-msgid "git-over-rsync is no longer supported"
-msgstr "不再支援 git-over-rsync"
-
-#: transport.c:1196
-#, c-format
-msgid ""
-"The following submodule paths contain changes that can\n"
-"not be found on any remote:\n"
-msgstr "下列子模組路徑所包含的修改在任何遠端來源中都找不到：\n"
-
-#: transport.c:1200
-#, c-format
-msgid ""
-"\n"
-"Please try\n"
-"\n"
-"\tgit push --recurse-submodules=on-demand\n"
-"\n"
-"or cd to the path and use\n"
-"\n"
-"\tgit push\n"
-"\n"
-"to push them to a remote.\n"
-"\n"
-msgstr ""
-"\n"
-"請嘗試\n"
-"\n"
-"\tgit push --recurse-submodules=on-demand\n"
-"\n"
-"或者進入到子目錄執行\n"
-"\n"
-"\tgit push\n"
-"\n"
-"以推送至遠端。\n"
-"\n"
-
-#: transport.c:1208
-msgid "Aborting."
-msgstr "正在終止。"
-
-#: transport.c:1354
-msgid "failed to push all needed submodules"
-msgstr "不能推送全部需要的子模組"
-
-#: tree-walk.c:33
-msgid "too-short tree object"
-msgstr "太短的樹狀物件"
-
-#: tree-walk.c:39
-msgid "malformed mode in tree entry"
-msgstr "樹狀物件中的條目模式錯誤"
-
-#: tree-walk.c:43
-msgid "empty filename in tree entry"
-msgstr "樹狀物件條目中空的檔案名"
-
-#: tree-walk.c:118
-msgid "too-short tree file"
-msgstr "太短的樹檔案"
-
-#: unpack-trees.c:118
-#, c-format
-msgid ""
-"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 ""
-"您對下列檔案的本機修改將被簽出動作覆蓋：\n"
-"%%s請在切換分支前提交或儲藏您的修改。"
-
-#: unpack-trees.c:120
-#, c-format
-msgid ""
-"Your local changes to the following files would be overwritten by checkout:\n"
-"%%s"
-msgstr ""
-"您對下列檔案的本機修改將被簽出動作覆蓋：\n"
-"%%s"
-
-#: unpack-trees.c:123
-#, c-format
-msgid ""
-"Your local changes to the following files would be overwritten by merge:\n"
-"%%sPlease commit your changes or stash them before you merge."
-msgstr ""
-"您對下列檔案的本機修改將被合併動作覆蓋：\n"
-"%%s請在合併前提交或儲藏您的修改。"
-
-#: unpack-trees.c:125
-#, c-format
-msgid ""
-"Your local changes to the following files would be overwritten by merge:\n"
-"%%s"
-msgstr ""
-"您對下列檔案的本機修改將被合併動作覆蓋：\n"
-"%%s"
-
-#: unpack-trees.c:128
-#, c-format
-msgid ""
-"Your local changes to the following files would be overwritten by %s:\n"
-"%%sPlease commit your changes or stash them before you %s."
-msgstr ""
-"您對下列檔案的本機修改將被 %s 覆蓋：\n"
-"%%s請在 %s 之前提交或儲藏您的修改。"
-
-#: unpack-trees.c:130
-#, c-format
-msgid ""
-"Your local changes to the following files would be overwritten by %s:\n"
-"%%s"
-msgstr ""
-"您對下列檔案的本機修改將被 %s 覆蓋：\n"
-"%%s"
-
-#: unpack-trees.c:135
-#, c-format
-msgid ""
-"Updating the following directories would lose untracked files in them:\n"
-"%s"
-msgstr ""
-"更新如下目錄將會遺失其中未追蹤的檔案：\n"
-"%s"
-
-#: unpack-trees.c:138
-#, c-format
-msgid ""
-"Refusing to remove the current working directory:\n"
-"%s"
-msgstr ""
-"拒絕移除目前工作目錄：\n"
-"%s"
-
-#: unpack-trees.c:142
-#, c-format
-msgid ""
-"The following untracked working tree files would be removed by checkout:\n"
-"%%sPlease move or remove them before you switch branches."
-msgstr ""
-"工作區中下列未追蹤的檔案將會因為簽出動作而被刪除：\n"
-"%%s請在切換分支之前移動或刪除。"
-
-#: unpack-trees.c:144
-#, c-format
-msgid ""
-"The following untracked working tree files would be removed by checkout:\n"
-"%%s"
-msgstr ""
-"工作區中下列未追蹤的檔案將會因為簽出動作而被刪除：\n"
-"%%s"
-
-#: unpack-trees.c:147
-#, c-format
-msgid ""
-"The following untracked working tree files would be removed by merge:\n"
-"%%sPlease move or remove them before you merge."
-msgstr ""
-"工作區中下列未追蹤的檔案將會因為合併動作而被刪除：\n"
-"%%s請在合併前移動或刪除。"
-
-#: unpack-trees.c:149
-#, c-format
-msgid ""
-"The following untracked working tree files would be removed by merge:\n"
-"%%s"
-msgstr ""
-"工作區中下列未追蹤的檔案將會因為合併動作而被刪除：\n"
-"%%s"
-
-#: unpack-trees.c:152
-#, c-format
-msgid ""
-"The following untracked working tree files would be removed by %s:\n"
-"%%sPlease move or remove them before you %s."
-msgstr ""
-"工作區中下列未追蹤的檔案將會因為 %s 動作而被刪除：\n"
-"%%s請在 %s 前移動或刪除。"
-
-#: unpack-trees.c:154
-#, c-format
-msgid ""
-"The following untracked working tree files would be removed by %s:\n"
-"%%s"
-msgstr ""
-"工作區中下列未追蹤的檔案將會因為 %s 動作而被刪除：\n"
-"%%s"
-
-#: unpack-trees.c:160
-#, c-format
-msgid ""
-"The following untracked working tree files would be overwritten by "
-"checkout:\n"
-"%%sPlease move or remove them before you switch branches."
-msgstr ""
-"工作區中下列未追蹤的檔案將會因為簽出動作而被覆蓋：\n"
-"%%s請在切換分支前移動或刪除。"
-
-#: unpack-trees.c:162
-#, c-format
-msgid ""
-"The following untracked working tree files would be overwritten by "
-"checkout:\n"
-"%%s"
-msgstr ""
-"工作區中下列未追蹤的檔案將會因為簽出動作而被覆蓋：\n"
-"%%s"
-
-#: unpack-trees.c:165
-#, c-format
-msgid ""
-"The following untracked working tree files would be overwritten by merge:\n"
-"%%sPlease move or remove them before you merge."
-msgstr ""
-"工作區中下列未追蹤的檔案將會因為合併動作而被覆蓋：\n"
-"%%s請在合併前移動或刪除。"
-
-#: unpack-trees.c:167
-#, c-format
-msgid ""
-"The following untracked working tree files would be overwritten by merge:\n"
-"%%s"
-msgstr ""
-"工作區中下列未追蹤的檔案將會因為合併動作而被覆蓋：\n"
-"%%s"
-
-#: unpack-trees.c:170
-#, c-format
-msgid ""
-"The following untracked working tree files would be overwritten by %s:\n"
-"%%sPlease move or remove them before you %s."
-msgstr ""
-"工作區中下列未追蹤的檔案將會因為 %s 動作而被覆蓋：\n"
-"%%s請在 %s 前移動或刪除。"
-
-#: unpack-trees.c:172
-#, c-format
-msgid ""
-"The following untracked working tree files would be overwritten by %s:\n"
-"%%s"
-msgstr ""
-"工作區中下列未追蹤的檔案將會因為 %s 動作而被覆蓋：\n"
-"%%s"
-
-#: unpack-trees.c:180
-#, c-format
-msgid "Entry '%s' overlaps with '%s'.  Cannot bind."
-msgstr "條目 '%s' 和 '%s' 重疊。無法合併。"
-
-#: unpack-trees.c:183
-#, c-format
-msgid ""
-"Cannot update submodule:\n"
-"%s"
-msgstr ""
-"無法更新子模組：\n"
-"%s"
-
-#: unpack-trees.c:186
-#, c-format
-msgid ""
-"The following paths are not up to date and were left despite sparse "
-"patterns:\n"
-"%s"
-msgstr ""
-"即使有稀疏簽出樣板，以下路徑不是最新且保留下來：\n"
-"%s"
-
-#: unpack-trees.c:188
-#, c-format
-msgid ""
-"The following paths are unmerged and were left despite sparse patterns:\n"
-"%s"
-msgstr ""
-"即使有稀疏簽出樣板，以下路徑未合併且保留下來：\n"
-"%s"
-
-#: unpack-trees.c:190
-#, c-format
-msgid ""
-"The following paths were already present and thus not updated despite sparse "
-"patterns:\n"
-"%s"
-msgstr ""
-"即使有稀疏簽出樣板，以下路徑已經存在而因此未更新：\n"
-"%s"
-
-#: unpack-trees.c:270
-#, c-format
-msgid "Aborting\n"
-msgstr "正在終止\n"
-
-#: unpack-trees.c:297
-#, c-format
-msgid ""
-"After fixing the above paths, you may want to run `git sparse-checkout "
-"reapply`.\n"
-msgstr "修正以上路徑後，您可能想要執行「git sparse-checkout reapply」。\n"
-
-#: unpack-trees.c:358
-msgid "Updating files"
-msgstr "正在更新檔案"
-
-#: unpack-trees.c:390
-msgid ""
-"the following paths have collided (e.g. case-sensitive paths\n"
-"on a case-insensitive filesystem) and only one from the same\n"
-"colliding group is in the working tree:\n"
-msgstr ""
-"以下路徑發生碰撞（如：在不區分大小寫的檔案系統上的區分大小寫的路徑），\n"
-"並且碰撞組中只有一個檔案存在工作區中：\n"
-
-#: unpack-trees.c:1664
-msgid "Updating index flags"
-msgstr "正在更新索引旗標"
-
-#: unpack-trees.c:2925
-#, c-format
-msgid "worktree and untracked commit have duplicate entries: %s"
-msgstr "工作區和未追蹤提交有重複項目：%s"
-
-#: upload-pack.c:1579
-msgid "expected flush after fetch arguments"
-msgstr "在 fetch 引數應為一個 flush 包"
-
-#: urlmatch.c:163
-msgid "invalid URL scheme name or missing '://' suffix"
-msgstr "無效的 URL 方案名稱或遺失 '://' 後綴"
-
-#: urlmatch.c:187 urlmatch.c:346 urlmatch.c:405
-#, c-format
-msgid "invalid %XX escape sequence"
-msgstr "無效的 %XX 轉義序列"
-
-#: urlmatch.c:215
-msgid "missing host and scheme is not 'file:'"
-msgstr "缺少主機名稱且 URL 方案不是 'file:'"
-
-#: urlmatch.c:232
-msgid "a 'file:' URL may not have a port number"
-msgstr "一個 'file:' URL 不應該包含埠號"
-
-#: urlmatch.c:247
-msgid "invalid characters in host name"
-msgstr "主機名稱中包含無效的字元"
-
-#: urlmatch.c:292 urlmatch.c:303
-msgid "invalid port number"
-msgstr "無效的埠號"
-
-#: urlmatch.c:371
-msgid "invalid '..' path segment"
-msgstr "無效的 '..' 路徑區塊"
-
-#: walker.c:170
-msgid "Fetching objects"
-msgstr "正在抓取物件"
-
-#: worktree.c:237 builtin/am.c:2210 builtin/bisect--helper.c:156
-#, c-format
-msgid "failed to read '%s'"
-msgstr "讀取 '%s' 失敗"
-
-#: worktree.c:304
-#, c-format
-msgid "'%s' at main working tree is not the repository directory"
-msgstr "在主工作區的 '%s' 不是版本庫目錄"
-
-#: worktree.c:315
-#, c-format
-msgid "'%s' file does not contain absolute path to the working tree location"
-msgstr "檔案 '%s' 不包含工作區的絕對路徑"
-
-#: worktree.c:327
-#, c-format
-msgid "'%s' does not exist"
-msgstr "'%s' 不存在"
-
-#: worktree.c:333
-#, c-format
-msgid "'%s' is not a .git file, error code %d"
-msgstr "'%s' 不是一個 .git 檔案，錯誤碼 %d"
-
-#: worktree.c:342
-#, c-format
-msgid "'%s' does not point back to '%s'"
-msgstr "'%s' 沒有指回到 '%s'"
-
-#: worktree.c:600
-msgid "not a directory"
-msgstr "不是目錄"
-
-#: worktree.c:609
-msgid ".git is not a file"
-msgstr ".git 不是檔案"
-
-#: worktree.c:611
-msgid ".git file broken"
-msgstr ".git 檔案損毀"
-
-#: worktree.c:613
-msgid ".git file incorrect"
-msgstr ".git 檔案不正確"
-
-#: worktree.c:719
-msgid "not a valid path"
-msgstr "非有效路徑"
-
-#: worktree.c:725
-msgid "unable to locate repository; .git is not a file"
-msgstr "無法定位版本庫；.git 不是檔案"
-
-#: worktree.c:729
-msgid "unable to locate repository; .git file does not reference a repository"
-msgstr "無法定位版本庫：.git 檔案未指向版本庫"
-
-#: worktree.c:733
-msgid "unable to locate repository; .git file broken"
-msgstr "無法定位版本庫；.git 檔案損壞"
-
-#: worktree.c:739
-msgid "gitdir unreadable"
-msgstr "無法讀取 gitdir"
-
-#: worktree.c:743
-msgid "gitdir incorrect"
-msgstr "不正確的 gitdir"
-
-#: worktree.c:768
-msgid "not a valid directory"
-msgstr "非有效目錄"
-
-#: worktree.c:774
-msgid "gitdir file does not exist"
-msgstr "找不到 gitdir 檔案"
-
-#: worktree.c:779 worktree.c:788
-#, c-format
-msgid "unable to read gitdir file (%s)"
-msgstr "無法讀取 gitdir 檔案 (%s)"
-
-#: worktree.c:798
-#, c-format
-msgid "short read (expected %<PRIuMAX> bytes, read %<PRIuMAX>)"
-msgstr "讀取過短（預期有 %<PRIuMAX> 位元組，只讀到 %<PRIuMAX>）"
-
-#: worktree.c:806
-msgid "invalid gitdir file"
-msgstr "gitdir 檔案無效"
-
-#: worktree.c:814
-msgid "gitdir file points to non-existent location"
-msgstr "gitdir 檔案指向的位置不存在"
-
-#: worktree.c:830
-#, c-format
-msgid "unable to set %s in '%s'"
-msgstr "無法在「%2$s」設定 %1$s"
-
-#: worktree.c:832
-#, c-format
-msgid "unable to unset %s in '%s'"
-msgstr "無法取消在「%2$s」設定的 %1$s"
-
-#: worktree.c:852
-msgid "failed to set extensions.worktreeConfig setting"
-msgstr "無法設定 extensions.worktreeConfig 設定"
-
-#: wrapper.c:161
-#, c-format
-msgid "could not setenv '%s'"
-msgstr "無法 setenv '%s'"
-
-#: wrapper.c:213
-#, c-format
-msgid "unable to create '%s'"
-msgstr "不能建立 '%s'"
-
-#: wrapper.c:215 wrapper.c:385
-#, c-format
-msgid "could not open '%s' for reading and writing"
-msgstr "無法開啟 '%s' 進行讀寫"
-
-#: wrapper.c:416 wrapper.c:683
-#, c-format
-msgid "unable to access '%s'"
-msgstr "不能存取 '%s'"
-
-#: wrapper.c:691
-msgid "unable to get current working directory"
-msgstr "不能取得目前工作目錄"
-
-#: wt-status.c:158
-msgid "Unmerged paths:"
-msgstr "未合併的路徑："
-
-#  譯者：請維持前導空格
-#: wt-status.c:187 wt-status.c:219
-msgid "  (use \"git restore --staged <file>...\" to unstage)"
-msgstr "  （使用 \"git restore --staged <檔案>...\" 以取消暫存）"
-
-#  譯者：請維持前導空格
-#: wt-status.c:190 wt-status.c:222
-#, c-format
-msgid "  (use \"git restore --source=%s --staged <file>...\" to unstage)"
-msgstr "  （使用 \"git restore --source=%s --staged <檔案>...\" 以取消暫存）"
-
-#  譯者：請維持前導空格
-#: wt-status.c:193 wt-status.c:225
-msgid "  (use \"git rm --cached <file>...\" to unstage)"
-msgstr "  （使用 \"git rm --cached <檔案>...\" 以取消暫存）"
-
-#  譯者：請維持前導空格
-#: wt-status.c:197
-msgid "  (use \"git add <file>...\" to mark resolution)"
-msgstr "  （使用 \"git add <檔案>...\" 標記解決方案）"
-
-#  譯者：請維持前導空格
-#: wt-status.c:199 wt-status.c:203
-msgid "  (use \"git add/rm <file>...\" as appropriate to mark resolution)"
-msgstr "  （酌情使用 \"git add/rm <檔案>...\" 標記解決方案）"
-
-#  譯者：請維持前導空格
-#: wt-status.c:201
-msgid "  (use \"git rm <file>...\" to mark resolution)"
-msgstr "  （使用 \"git rm <檔案>...\" 標記解決方案）"
-
-#: wt-status.c:211 wt-status.c:1140
-msgid "Changes to be committed:"
-msgstr "要提交的變更："
-
-#: wt-status.c:234 wt-status.c:1149
-msgid "Changes not staged for commit:"
-msgstr "尚未暫存以備提交的變更："
-
-#  譯者：請維持前導空格
-#: wt-status.c:238
-msgid "  (use \"git add <file>...\" to update what will be committed)"
-msgstr "  （使用 \"git add <檔案>...\" 更新要提交的內容）"
-
-#  譯者：請維持前導空格
-#: wt-status.c:240
-msgid "  (use \"git add/rm <file>...\" to update what will be committed)"
-msgstr "  （使用 \"git add/rm <檔案>...\" 更新要提交的內容）"
-
-#  譯者：請維持前導空格
-#: wt-status.c:241
-msgid ""
-"  (use \"git restore <file>...\" to discard changes in working directory)"
-msgstr "  （使用 \"git restore <檔案>...\" 捨棄工作區的改動）"
-
-#  譯者：請維持前導空格
-#: wt-status.c:243
-msgid "  (commit or discard the untracked or modified content in submodules)"
-msgstr "  （提交或捨棄子模組中未追蹤或修改的內容）"
-
-#  譯者：請維持前導空格
-#: wt-status.c:254
-#, c-format
-msgid "  (use \"git %s <file>...\" to include in what will be committed)"
-msgstr "  （使用 \"git %s <檔案>...\" 以包含要提交的內容）"
-
-#: wt-status.c:266
-msgid "both deleted:"
-msgstr "雙方刪除："
-
-#: wt-status.c:268
-msgid "added by us:"
-msgstr "由我們新增："
-
-#: wt-status.c:270
-msgid "deleted by them:"
-msgstr "由他們刪除："
-
-#: wt-status.c:272
-msgid "added by them:"
-msgstr "由他們新增："
-
-#: wt-status.c:274
-msgid "deleted by us:"
-msgstr "由我們刪除："
-
-#: wt-status.c:276
-msgid "both added:"
-msgstr "雙方新增："
-
-#: wt-status.c:278
-msgid "both modified:"
-msgstr "雙方修改："
-
-#: wt-status.c:288
-msgid "new file:"
-msgstr "新檔案："
-
-#: wt-status.c:290
-msgid "copied:"
-msgstr "複製："
-
-#: wt-status.c:292
-msgid "deleted:"
-msgstr "刪除："
-
-#: wt-status.c:294
-msgid "modified:"
-msgstr "修改："
-
-#: wt-status.c:296
-msgid "renamed:"
-msgstr "重新命名："
-
-#: wt-status.c:298
-msgid "typechange:"
-msgstr "類型變更："
-
-#: wt-status.c:300
-msgid "unknown:"
-msgstr "未知："
-
-#: wt-status.c:302
-msgid "unmerged:"
-msgstr "未合併："
-
-#  譯者：末尾兩個位元組可能被刪減，如果翻譯為中文標點會出現半個漢字
-#: wt-status.c:382
-msgid "new commits, "
-msgstr "新提交, "
-
-#  譯者：末尾兩個位元組可能被刪減，如果翻譯為中文標點會出現半個漢字
-#: wt-status.c:384
-msgid "modified content, "
-msgstr "修改的內容, "
-
-#  譯者：末尾兩個位元組可能被刪減，如果翻譯為中文標點會出現半個漢字
-#: wt-status.c:386
-msgid "untracked content, "
-msgstr "未追蹤的內容, "
-
-#: wt-status.c:973
-#, c-format
-msgid "Your stash currently has %d entry"
-msgid_plural "Your stash currently has %d entries"
-msgstr[0] "您的儲藏區目前有 %d 條紀錄"
-
-#: wt-status.c:1004
-msgid "Submodules changed but not updated:"
-msgstr "子模組已修改但尚未更新："
-
-#: wt-status.c:1006
-msgid "Submodule changes to be committed:"
-msgstr "要提交的子模組變更："
-
-#: wt-status.c:1088
-msgid ""
-"Do not modify or remove the line above.\n"
-"Everything below it will be ignored."
-msgstr ""
-"不要改動或刪除上面的一行。\n"
-"其下所有內容都將被忽略。"
-
-#: wt-status.c:1180
-#, c-format
-msgid ""
-"\n"
-"It took %.2f seconds to compute the branch ahead/behind values.\n"
-"You can use '--no-ahead-behind' to avoid this.\n"
-msgstr ""
-"\n"
-"花了 %.2f 秒才計算出分支的領先/落後範圍。\n"
-"為避免，您可以使用 '--no-ahead-behind'。\n"
-
-#: wt-status.c:1210
-msgid "You have unmerged paths."
-msgstr "您有尚未合併的路徑。"
-
-#  譯者：請維持前導空格
-#: wt-status.c:1213
-msgid "  (fix conflicts and run \"git commit\")"
-msgstr "  （解決衝突並執行 \"git commit\"）"
-
-#  譯者：請維持前導空格
-#: wt-status.c:1215
-msgid "  (use \"git merge --abort\" to abort the merge)"
-msgstr "  （使用 \"git merge --abort\" 終止合併）"
-
-#: wt-status.c:1219
-msgid "All conflicts fixed but you are still merging."
-msgstr "所有衝突已解決但您仍處於合併中。"
-
-#  譯者：請維持前導空格
-#: wt-status.c:1222
-msgid "  (use \"git commit\" to conclude merge)"
-msgstr "  （使用 \"git commit\" 結束合併）"
-
-#: wt-status.c:1233
-msgid "You are in the middle of an am session."
-msgstr "您正處於 am 動作過程中。"
-
-#: wt-status.c:1236
-msgid "The current patch is empty."
-msgstr "目前的修補檔為空。"
-
-#  譯者：請維持前導空格
-#: wt-status.c:1241
-msgid "  (fix conflicts and then run \"git am --continue\")"
-msgstr "  （解決衝突，然後執行 \"git am --continue\"）"
-
-#  譯者：請維持前導空格
-#: wt-status.c:1243
-msgid "  (use \"git am --skip\" to skip this patch)"
-msgstr "  （使用 \"git am --skip\" 略過此修補檔）"
-
-#  譯者：請維持前導空格
-#: wt-status.c:1246
-msgid ""
-"  (use \"git am --allow-empty\" to record this patch as an empty commit)"
-msgstr "  （使用 \"git am --allow-empty\" 將目前修補檔錄製為空白提交）"
-
-#  譯者：請維持前導空格
-#: wt-status.c:1248
-msgid "  (use \"git am --abort\" to restore the original branch)"
-msgstr "  （使用 \"git am --abort\" 復原原有分支）"
-
-#: wt-status.c:1381
-msgid "git-rebase-todo is missing."
-msgstr "git-rebase-todo 遺失。"
-
-#: wt-status.c:1383
-msgid "No commands done."
-msgstr "沒有指令被執行。"
-
-#: wt-status.c:1386
-#, c-format
-msgid "Last command done (%<PRIuMAX> command done):"
-msgid_plural "Last commands done (%<PRIuMAX> commands done):"
-msgstr[0] "上次完成的命令（完成 %<PRIuMAX> 條指令）："
-
-#: wt-status.c:1397
-#, c-format
-msgid "  (see more in file %s)"
-msgstr "  （更多參見檔案 %s）"
-
-#: wt-status.c:1402
-msgid "No commands remaining."
-msgstr "未剩下任何指令。"
-
-#: wt-status.c:1405
-#, c-format
-msgid "Next command to do (%<PRIuMAX> remaining command):"
-msgid_plural "Next commands to do (%<PRIuMAX> remaining commands):"
-msgstr[0] "接下來要執行的命令（剩餘 %<PRIuMAX> 條命令）："
-
-#  譯者：請維持前導空格
-#: wt-status.c:1413
-msgid "  (use \"git rebase --edit-todo\" to view and edit)"
-msgstr "  （使用 \"git rebase --edit-todo\" 來檢視和編輯）"
-
-#: wt-status.c:1425
-#, c-format
-msgid "You are currently rebasing branch '%s' on '%s'."
-msgstr "您在執行將分支 '%s' 重定基底到 '%s' 的動作。"
-
-#: wt-status.c:1430
-msgid "You are currently rebasing."
-msgstr "您在執行重定基底動作。"
-
-#  譯者：請維持前導空格
-#: wt-status.c:1443
-msgid "  (fix conflicts and then run \"git rebase --continue\")"
-msgstr "  （解決衝突，然後執行 \"git rebase --continue\"）"
-
-#  譯者：請維持前導空格
-#: wt-status.c:1445
-msgid "  (use \"git rebase --skip\" to skip this patch)"
-msgstr "  （使用 \"git rebase --skip\" 略過此修補檔）"
-
-#  譯者：請維持前導空格
-#: wt-status.c:1447
-msgid "  (use \"git rebase --abort\" to check out the original branch)"
-msgstr "  （使用 \"git rebase --abort\" 以簽出原有分支）"
-
-#  譯者：請維持前導空格
-#: wt-status.c:1454
-msgid "  (all conflicts fixed: run \"git rebase --continue\")"
-msgstr "  （所有衝突已解決：執行 \"git rebase --continue\"）"
-
-#: wt-status.c:1458
-#, c-format
-msgid ""
-"You are currently splitting a commit while rebasing branch '%s' on '%s'."
-msgstr "您在執行將分支 '%s' 重定基底到 '%s' 的動作時分割提交。"
-
-#: wt-status.c:1463
-msgid "You are currently splitting a commit during a rebase."
-msgstr "您在執行重定基底動作時分割提交。"
-
-#  譯者：請維持前導空格
-#: wt-status.c:1466
-msgid "  (Once your working directory is clean, run \"git rebase --continue\")"
-msgstr "  （一旦您工作目錄提交乾淨後，執行 \"git rebase --continue\"）"
-
-#: wt-status.c:1470
-#, c-format
-msgid "You are currently editing a commit while rebasing branch '%s' on '%s'."
-msgstr "您在執行將分支 '%s' 重定基底到 '%s' 的動作時編輯提交。"
-
-#: wt-status.c:1475
-msgid "You are currently editing a commit during a rebase."
-msgstr "您在執行重定基底動作時編輯提交。"
-
-#  譯者：請維持前導空格
-#: wt-status.c:1478
-msgid "  (use \"git commit --amend\" to amend the current commit)"
-msgstr "  （使用 \"git commit --amend\" 修補目前提交）"
-
-#  譯者：請維持前導空格
-#: wt-status.c:1480
-msgid ""
-"  (use \"git rebase --continue\" once you are satisfied with your changes)"
-msgstr "  （當您對您的修改滿意後執行 \"git rebase --continue\"）"
-
-#: wt-status.c:1491
-msgid "Cherry-pick currently in progress."
-msgstr "揀選動作正在進行中。"
-
-#: wt-status.c:1494
-#, c-format
-msgid "You are currently cherry-picking commit %s."
-msgstr "您在執行揀選提交 %s 的動作。"
-
-#  譯者：請維持前導空格
-#: wt-status.c:1501
-msgid "  (fix conflicts and run \"git cherry-pick --continue\")"
-msgstr "  （解決衝突並執行 \"git cherry-pick --continue\"）"
-
-#  譯者：請維持前導空格
-#: wt-status.c:1504
-msgid "  (run \"git cherry-pick --continue\" to continue)"
-msgstr "  （執行 \"git cherry-pick --continue\" 以繼續）"
-
-#  譯者：請維持前導空格
-#: wt-status.c:1507
-msgid "  (all conflicts fixed: run \"git cherry-pick --continue\")"
-msgstr "  （所有衝突已解決：執行 \"git cherry-pick --continue\"）"
-
-#  譯者：請維持前導空格
-#: wt-status.c:1509
-msgid "  (use \"git cherry-pick --skip\" to skip this patch)"
-msgstr "  （使用 \"git cherry-pick --skip\" 略過此修補檔）"
-
-#  譯者：請維持前導空格
-#: wt-status.c:1511
-msgid "  (use \"git cherry-pick --abort\" to cancel the cherry-pick operation)"
-msgstr "  （使用 \"git cherry-pick --abort\" 以取消揀選動作）"
-
-#: wt-status.c:1521
-msgid "Revert currently in progress."
-msgstr "還原動作正在進行中。"
-
-#: wt-status.c:1524
-#, c-format
-msgid "You are currently reverting commit %s."
-msgstr "您在執行反轉提交 %s 的動作。"
-
-#  譯者：請維持前導空格
-#: wt-status.c:1530
-msgid "  (fix conflicts and run \"git revert --continue\")"
-msgstr "  （解決衝突並執行 \"git revert --continue\"）"
-
-#  譯者：請維持前導空格
-#: wt-status.c:1533
-msgid "  (run \"git revert --continue\" to continue)"
-msgstr "  （執行 \"git revert --continue\" 以繼續）"
-
-#  譯者：請維持前導空格
-#: wt-status.c:1536
-msgid "  (all conflicts fixed: run \"git revert --continue\")"
-msgstr "  （所有衝突已解決：執行 \"git revert --continue\"）"
-
-#  譯者：請維持前導空格
-#: wt-status.c:1538
-msgid "  (use \"git revert --skip\" to skip this patch)"
-msgstr "  （使用 \"git revert --skip\" 略過此修補檔）"
-
-#  譯者：請維持前導空格
-#: wt-status.c:1540
-msgid "  (use \"git revert --abort\" to cancel the revert operation)"
-msgstr "  （使用 \"git revert --abort\" 以取消反轉提交動作）"
-
-#: wt-status.c:1550
-#, c-format
-msgid "You are currently bisecting, started from branch '%s'."
-msgstr "您在執行從分支 '%s' 開始的二分搜尋動作。"
-
-#: wt-status.c:1554
-msgid "You are currently bisecting."
-msgstr "您在執行二分搜尋動作。"
-
-#  譯者：請維持前導空格
-#: wt-status.c:1557
-msgid "  (use \"git bisect reset\" to get back to the original branch)"
-msgstr "  （使用 \"git bisect reset\" 簽出原有分支）"
-
-#: wt-status.c:1568
-msgid "You are in a sparse checkout."
-msgstr "您正在稀疏簽出的工作區中。"
-
-#: wt-status.c:1571
-#, c-format
-msgid "You are in a sparse checkout with %d%% of tracked files present."
-msgstr "您處於稀疏簽出狀態，包含 %d%% 的追蹤檔案。"
-
-#: wt-status.c:1815
-msgid "On branch "
-msgstr "位於分支 "
-
-#: wt-status.c:1822
-msgid "interactive rebase in progress; onto "
-msgstr "互動式重定基底動作正在進行中；至 "
-
-#: wt-status.c:1824
-msgid "rebase in progress; onto "
-msgstr "重定基底動作正在進行中；至 "
-
-#: wt-status.c:1829
-msgid "HEAD detached at "
-msgstr "開頭指標分離於 "
-
-#: wt-status.c:1831
-msgid "HEAD detached from "
-msgstr "開頭指標分離自 "
-
-#: wt-status.c:1834
-msgid "Not currently on any branch."
-msgstr "目前不在任何分支上。"
-
-#: wt-status.c:1851
-msgid "Initial commit"
-msgstr "初始提交"
-
-#: wt-status.c:1852
-msgid "No commits yet"
-msgstr "尚無提交"
-
-#: wt-status.c:1866
-msgid "Untracked files"
-msgstr "未追蹤的檔案"
-
-#: wt-status.c:1868
-msgid "Ignored files"
-msgstr "忽略的檔案"
-
-#: wt-status.c:1872
-#, c-format
-msgid ""
-"It took %.2f seconds to enumerate untracked files. 'status -uno'\n"
-"may speed it up, but you have to be careful not to forget to add\n"
-"new files yourself (see 'git help status')."
-msgstr ""
-"耗費了 %.2f 秒以枚舉未追蹤的檔案。'status -uno' 也許能提高速度，\n"
-"但您需要小心不要忘了新增新檔案（參見 'git help status'）。"
-
-#: wt-status.c:1878
-#, c-format
-msgid "Untracked files not listed%s"
-msgstr "未追蹤的檔案沒有列出%s"
-
-#  譯者：中文字串拼接，可刪除前導空格
-#: wt-status.c:1880
-msgid " (use -u option to show untracked files)"
-msgstr " （使用 -u 參數顯示未追蹤的檔案）"
-
-#: wt-status.c:1886
-msgid "No changes"
-msgstr "沒有修改"
-
-#: wt-status.c:1891
-#, c-format
-msgid "no changes added to commit (use \"git add\" and/or \"git commit -a\")\n"
-msgstr "修改尚未加入提交（使用 \"git add\" 和/或 \"git commit -a\"）\n"
-
-#: wt-status.c:1895
-#, c-format
-msgid "no changes added to commit\n"
-msgstr "修改尚未加入提交\n"
-
-#: wt-status.c:1899
-#, c-format
-msgid ""
-"nothing added to commit but untracked files present (use \"git add\" to "
-"track)\n"
-msgstr "提交為空，但是存在尚未追蹤的檔案（使用 \"git add\" 建立追蹤）\n"
-
-#: wt-status.c:1903
-#, c-format
-msgid "nothing added to commit but untracked files present\n"
-msgstr "提交為空，但是存在尚未追蹤的檔案\n"
-
-#  譯者：中文字串拼接，可刪除前導空格
-#: wt-status.c:1907
-#, c-format
-msgid "nothing to commit (create/copy files and use \"git add\" to track)\n"
-msgstr "無檔案要提交（建立/複製檔案並使用 \"git add\" 建立追蹤）\n"
-
-#: wt-status.c:1911 wt-status.c:1917
-#, c-format
-msgid "nothing to commit\n"
-msgstr "無檔案要提交\n"
-
-#  譯者：中文字串拼接，可刪除前導空格
-#: wt-status.c:1914
-#, c-format
-msgid "nothing to commit (use -u to show untracked files)\n"
-msgstr "無檔案要提交（使用 -u 顯示未追蹤的檔案）\n"
-
-#  譯者：中文字串拼接，可刪除前導空格
-#: wt-status.c:1919
-#, c-format
-msgid "nothing to commit, working tree clean\n"
-msgstr "沒有要提交的檔案，工作區為乾淨狀態\n"
-
-#: wt-status.c:2024
-msgid "No commits yet on "
-msgstr "尚無提交在 "
-
-#: wt-status.c:2028
-msgid "HEAD (no branch)"
-msgstr "HEAD（非分支）"
-
-#: wt-status.c:2059
-msgid "different"
-msgstr "不同"
-
-#  譯者：請維持句尾空格
-#: wt-status.c:2061 wt-status.c:2069
-msgid "behind "
-msgstr "落後 "
-
-#: wt-status.c:2064 wt-status.c:2067
-msgid "ahead "
-msgstr "領先 "
-
-#. TRANSLATORS: the action is e.g. "pull with rebase"
-#: wt-status.c:2605
-#, c-format
-msgid "cannot %s: You have unstaged changes."
-msgstr "不能%s：您有未暫存的變更。"
-
-#: wt-status.c:2611
-msgid "additionally, your index contains uncommitted changes."
-msgstr "另外，您的索引中包含未提交的變更。"
-
-#: wt-status.c:2613
-#, c-format
-msgid "cannot %s: Your index contains uncommitted changes."
-msgstr "不能%s：您的索引中包含未提交的變更。"
-
-#: compat/simple-ipc/ipc-unix-socket.c:205
-msgid "could not send IPC command"
-msgstr "無法傳送 IPC 命令"
-
-#: compat/simple-ipc/ipc-unix-socket.c:212
-msgid "could not read IPC response"
-msgstr "無法讀取 IPC 回應"
-
-#: compat/simple-ipc/ipc-unix-socket.c:892
-#, c-format
-msgid "could not start accept_thread '%s'"
-msgstr "無法啟動 accept_thread “%s”"
-
-#: compat/simple-ipc/ipc-unix-socket.c:904
-#, c-format
-msgid "could not start worker[0] for '%s'"
-msgstr "無法啟動「%s」的 worker[0]"
-
-#: compat/precompose_utf8.c:58 builtin/clone.c:353
-#, c-format
-msgid "failed to unlink '%s'"
-msgstr "刪除 '%s' 失敗"
-
-#: compat/fsmonitor/fsm-listen-darwin.c:355
-msgid "Unable to create FSEventStream."
-msgstr "無法建立 FSEventStream。"
-
-#: compat/fsmonitor/fsm-listen-darwin.c:403
-msgid "Failed to start the FSEventStream"
-msgstr "無法啟動 FSEventStream"
-
-#: builtin/add.c:26
+#: builtin/add.c
 msgid "git add [<options>] [--] <pathspec>..."
 msgstr "git add [<選項>] [--] <路徑規格>..."
 
-#: builtin/add.c:63
+#: builtin/add.c
 #, c-format
 msgid "cannot chmod %cx '%s'"
 msgstr "無法 chmod %cx ‘%s’"
 
-#: builtin/add.c:105
+#: builtin/add.c
 #, c-format
 msgid "unexpected diff status %c"
 msgstr "意外的差異狀態 %c"
 
-#: builtin/add.c:110 builtin/commit.c:299
+#: builtin/add.c builtin/commit.c
 msgid "updating files failed"
 msgstr "更新檔案失敗"
 
-#: builtin/add.c:120
+#: builtin/add.c
 #, c-format
 msgid "remove '%s'\n"
 msgstr "刪除 '%s'\n"
 
-#: builtin/add.c:204
+#: builtin/add.c
 msgid "Unstaged changes after refreshing the index:"
 msgstr "重新整理索引之後尚未被暫存的變更："
 
-#: builtin/add.c:312 builtin/rev-parse.c:993
+#: builtin/add.c builtin/rev-parse.c
 msgid "Could not read the index"
 msgstr "不能讀取索引"
 
-#: builtin/add.c:325
+#: builtin/add.c
 msgid "Could not write patch"
 msgstr "不能生成修補檔"
 
-#: builtin/add.c:328
+#: builtin/add.c
 msgid "editing patch failed"
 msgstr "編輯修補檔失敗"
 
-#: builtin/add.c:331
+#: builtin/add.c
 #, c-format
 msgid "Could not stat '%s'"
 msgstr "不能對 '%s' 呼叫 stat"
 
-#: builtin/add.c:333
+#: builtin/add.c
 msgid "Empty patch. Aborted."
 msgstr "空修補檔。異常終止。"
 
-#: builtin/add.c:339
+#: builtin/add.c
 #, c-format
 msgid "Could not apply '%s'"
 msgstr "不能套用 '%s'"
 
-#: builtin/add.c:347
+#: builtin/add.c
 msgid "The following paths are ignored by one of your .gitignore files:\n"
 msgstr "下列路徑根據您的一個 .gitignore 檔案而被忽略：\n"
 
-#: builtin/add.c:367 builtin/clean.c:927 builtin/fetch.c:175 builtin/mv.c:124
-#: builtin/prune-packed.c:14 builtin/pull.c:208 builtin/push.c:550
-#: builtin/remote.c:1454 builtin/rm.c:244 builtin/send-pack.c:194
+#: builtin/add.c builtin/clean.c builtin/fetch.c builtin/mv.c
+#: builtin/prune-packed.c builtin/pull.c builtin/push.c builtin/remote.c
+#: builtin/rm.c builtin/send-pack.c
 msgid "dry run"
 msgstr "測試執行"
 
-#: builtin/add.c:368 builtin/check-ignore.c:22 builtin/commit.c:1483
-#: builtin/count-objects.c:98 builtin/fsck.c:789 builtin/log.c:2338
-#: builtin/mv.c:123 builtin/read-tree.c:120
+#: builtin/add.c builtin/check-ignore.c builtin/commit.c
+#: builtin/count-objects.c builtin/fsck.c builtin/log.c builtin/mv.c
+#: builtin/read-tree.c
 msgid "be verbose"
 msgstr "詳細輸出"
 
-#: builtin/add.c:370
+#: builtin/add.c
 msgid "interactive picking"
 msgstr "互動式揀選"
 
-#: builtin/add.c:371 builtin/checkout.c:1599 builtin/reset.c:417
+#: builtin/add.c builtin/checkout.c builtin/reset.c
 msgid "select hunks interactively"
 msgstr "互動式挑選資料區塊"
 
-#: builtin/add.c:372
+#: builtin/add.c
 msgid "edit current diff and apply"
 msgstr "編輯目前差異並套用"
 
-#: builtin/add.c:373
+#: builtin/add.c
 msgid "allow adding otherwise ignored files"
 msgstr "允許新增忽略的檔案"
 
-#: builtin/add.c:374
+#: builtin/add.c
 msgid "update tracked files"
 msgstr "更新已追蹤的檔案"
 
-#: builtin/add.c:375
+#: builtin/add.c
 msgid "renormalize EOL of tracked files (implies -u)"
 msgstr "對已追蹤檔案（隱含 -u）重新歸一換行符號"
 
-#: builtin/add.c:376
+#: builtin/add.c
 msgid "record only the fact that the path will be added later"
 msgstr "只記錄，該路徑稍後再新增"
 
-#: builtin/add.c:377
+#: builtin/add.c
 msgid "add changes from all tracked and untracked files"
 msgstr "新增所有改變的已追蹤檔案和未追蹤檔案"
 
-#: builtin/add.c:380
+#: builtin/add.c
 msgid "ignore paths removed in the working tree (same as --no-all)"
 msgstr "忽略工作區中移除的路徑（和 --no-all 相同）"
 
-#: builtin/add.c:382
+#: builtin/add.c
 msgid "don't add, only refresh the index"
 msgstr "不新增，只重新整理索引"
 
-#: builtin/add.c:383
+#: builtin/add.c
 msgid "just skip files which cannot be added because of errors"
 msgstr "略過因發生錯誤不能新增的檔案"
 
-#: builtin/add.c:384
+#: builtin/add.c
 msgid "check if - even missing - files are ignored in dry run"
 msgstr "檢查在測試執行模式下檔案（即使不存在）是否被忽略"
 
-#: builtin/add.c:385 builtin/mv.c:128 builtin/rm.c:251
+#: builtin/add.c builtin/mv.c builtin/rm.c
 msgid "allow updating entries outside of the sparse-checkout cone"
 msgstr "允許更新稀疏簽出 cone 外的項目"
 
-#: builtin/add.c:387 builtin/update-index.c:1023
+#: builtin/add.c builtin/update-index.c
 msgid "override the executable bit of the listed files"
 msgstr "覆蓋列表裡檔案的可執行位"
 
-#: builtin/add.c:389
+#: builtin/add.c
 msgid "warn when adding an embedded repository"
 msgstr "建立一個嵌入式版本庫時給予警告"
 
-#: builtin/add.c:407
+#: builtin/add.c
 #, c-format
 msgid ""
 "You've added another git repository inside your current repository.\n"
@@ -10548,12 +2170,12 @@ msgstr ""
 "\n"
 "參見 \"git help submodule\" 取得更多訊息。"
 
-#: builtin/add.c:436
+#: builtin/add.c
 #, c-format
 msgid "adding embedded git repository: %s"
 msgstr "正在新增嵌入式 git 版本庫：%s"
 
-#: builtin/add.c:456
+#: builtin/add.c
 msgid ""
 "Use -f if you really want to add them.\n"
 "Turn this message off by running\n"
@@ -10563,27 +2185,27 @@ msgstr ""
 "如要關閉此訊息，請執行\n"
 "\"git config advice.addIgnoredFile false\""
 
-#: builtin/add.c:471
+#: builtin/add.c
 msgid "adding files failed"
 msgstr "新增檔案失敗"
 
-#: builtin/add.c:534
+#: builtin/add.c
 #, c-format
 msgid "--chmod param '%s' must be either -x or +x"
 msgstr "參數 --chmod 取值 '%s' 必須是 -x 或 +x"
 
-#: builtin/add.c:555 builtin/checkout.c:1770 builtin/commit.c:365
-#: builtin/reset.c:436 builtin/rm.c:275 builtin/stash.c:1702
+#: builtin/add.c builtin/checkout.c builtin/commit.c builtin/reset.c
+#: builtin/rm.c builtin/stash.c
 #, c-format
 msgid "'%s' and pathspec arguments cannot be used together"
 msgstr "「%s」和路徑規格引數不得同時使用"
 
-#: builtin/add.c:566
+#: builtin/add.c
 #, c-format
 msgid "Nothing specified, nothing added.\n"
 msgstr "沒有指定檔案，也沒有檔案被新增。\n"
 
-#: builtin/add.c:568
+#: builtin/add.c
 msgid ""
 "Maybe you wanted to say 'git add .'?\n"
 "Turn this message off by running\n"
@@ -10593,106 +2215,150 @@ msgstr ""
 "如要關閉此訊息，請執行\n"
 "\"git config advice.addEmptyPathspec false\""
 
-#: builtin/am.c:393
+#: builtin/add.c builtin/check-ignore.c builtin/checkout.c builtin/clean.c
+#: builtin/commit.c builtin/diff-tree.c builtin/grep.c builtin/mv.c
+#: builtin/reset.c builtin/rm.c builtin/submodule--helper.c read-cache.c
+#: rerere.c submodule.c
+msgid "index file corrupt"
+msgstr "索引檔案損壞"
+
+#: builtin/am.c builtin/mailinfo.c mailinfo.c
+#, c-format
+msgid "bad action '%s' for '%s'"
+msgstr "「%s」動作對「%s」無效"
+
+#: builtin/am.c builtin/blame.c builtin/fetch.c builtin/pack-objects.c
+#: builtin/pull.c diff-merges.c gpg-interface.c ls-refs.c parallel-checkout.c
+#: sequencer.c setup.c
+#, c-format
+msgid "invalid value for '%s': '%s'"
+msgstr "「%s」的值無效：「%s」"
+
+#: builtin/am.c builtin/commit.c builtin/merge.c sequencer.c
+#, c-format
+msgid "could not read '%s'"
+msgstr "不能讀取 '%s'"
+
+#: builtin/am.c
 msgid "could not parse author script"
 msgstr "不能解析作者腳本"
 
-#: builtin/am.c:483
+#: builtin/am.c builtin/replace.c commit.c sequencer.c
+#, c-format
+msgid "could not parse %s"
+msgstr "不能解析 %s"
+
+#: builtin/am.c
 #, c-format
 msgid "'%s' was deleted by the applypatch-msg hook"
 msgstr "'%s' 被 applypatch-msg 掛鉤刪除"
 
-#: builtin/am.c:525
+#: builtin/am.c
 #, c-format
 msgid "Malformed input line: '%s'."
 msgstr "非法的輸入行：'%s'。"
 
-#: builtin/am.c:563
+#: builtin/am.c
 #, c-format
 msgid "Failed to copy notes from '%s' to '%s'"
 msgstr "從 '%s' 複製註解到 '%s' 時失敗"
 
-#: builtin/am.c:589
+#: builtin/am.c
 msgid "fseek failed"
 msgstr "fseek 失敗"
 
-#: builtin/am.c:777
+#: builtin/am.c builtin/rebase.c sequencer.c wrapper.c
+#, c-format
+msgid "could not open '%s' for reading"
+msgstr "無法開啟 '%s' 進行讀取"
+
+#: builtin/am.c builtin/rebase.c strbuf.c wrapper.c
+#, c-format
+msgid "could not open '%s' for writing"
+msgstr "無法開啟 '%s' 進行寫入"
+
+#: builtin/am.c
 #, c-format
 msgid "could not parse patch '%s'"
 msgstr "無法解析修補檔 '%s'"
 
-#: builtin/am.c:842
+#: builtin/am.c
 msgid "Only one StGIT patch series can be applied at once"
 msgstr "一次只能有一個 StGIT 修補檔佇列被套用"
 
-#: builtin/am.c:890
+#: builtin/am.c
 msgid "invalid timestamp"
 msgstr "無效的時間戳"
 
-#: builtin/am.c:895 builtin/am.c:907
+#: builtin/am.c
 msgid "invalid Date line"
 msgstr "無效的日期行"
 
-#: builtin/am.c:902
+#: builtin/am.c
 msgid "invalid timezone offset"
 msgstr "無效的時區位移值"
 
-#: builtin/am.c:995
+#: builtin/am.c
 msgid "Patch format detection failed."
 msgstr "修補檔格式偵測失敗。"
 
-#: builtin/am.c:1000 builtin/clone.c:306
+#: builtin/am.c builtin/clone.c
 #, c-format
 msgid "failed to create directory '%s'"
 msgstr "建立目錄 '%s' 失敗"
 
-#: builtin/am.c:1005
+#: builtin/am.c
 msgid "Failed to split patches."
 msgstr "分割修補檔失敗。"
 
-#: builtin/am.c:1154
+#: builtin/am.c
 #, c-format
 msgid "When you have resolved this problem, run \"%s --continue\"."
 msgstr "當您解決這一問題，執行 \"%s --continue\"。"
 
-#: builtin/am.c:1155
+#: builtin/am.c
 #, c-format
 msgid "If you prefer to skip this patch, run \"%s --skip\" instead."
 msgstr "如果您想要略過這一修補檔，則執行 \"%s --skip\"。"
 
-#: builtin/am.c:1160
+#: builtin/am.c
 #, c-format
 msgid "To record the empty patch as an empty commit, run \"%s --allow-empty\"."
 msgstr "若要將空白修補檔錄製為空白提交，請執行「%s --allow-empty」。"
 
-#: builtin/am.c:1162
+#: builtin/am.c
 #, c-format
 msgid "To restore the original branch and stop patching, run \"%s --abort\"."
 msgstr "若要復原至原始分支並停止修補動作，執行 \"%s --abort\"。"
 
-#: builtin/am.c:1257
+#: builtin/am.c
 msgid "Patch sent with format=flowed; space at the end of lines might be lost."
 msgstr "修補檔使用 format=flowed 格式傳送，行尾的空格可能會遺失。"
 
-#: builtin/am.c:1345
+#: builtin/am.c
 #, c-format
 msgid "missing author line in commit %s"
 msgstr "在提交 %s 中缺少作者行"
 
-#: builtin/am.c:1348
+#: builtin/am.c
 #, c-format
 msgid "invalid ident line: %.*s"
 msgstr "無效的身份標記：%.*s"
 
-#: builtin/am.c:1567
+#: builtin/am.c builtin/checkout.c builtin/clone.c commit-graph.c
+#, c-format
+msgid "unable to parse commit %s"
+msgstr "不能解析提交 %s"
+
+#: builtin/am.c
 msgid "Repository lacks necessary blobs to fall back on 3-way merge."
 msgstr "版本庫缺乏必要的資料物件以進行三方合併。"
 
-#: builtin/am.c:1569
+#: builtin/am.c
 msgid "Using index info to reconstruct a base tree..."
 msgstr "使用索引來重建一個（三方合併的）基礎目錄樹..."
 
-#: builtin/am.c:1588
+#: builtin/am.c
 msgid ""
 "Did you hand edit your patch?\n"
 "It does not apply to blobs recorded in its index."
@@ -10700,24 +2366,33 @@ msgstr ""
 "您是否曾手動編輯過您的修補檔？\n"
 "無法套用修補檔到索引中的資料物件上。"
 
-#: builtin/am.c:1594
+#: builtin/am.c
 msgid "Falling back to patching base and 3-way merge..."
 msgstr "回落到基礎版本上修補及進行三方合併..."
 
-#: builtin/am.c:1620
+#: builtin/am.c
 msgid "Failed to merge in the changes."
 msgstr "無法合併變更。"
 
-#: builtin/am.c:1652
+#: builtin/am.c builtin/merge.c sequencer.c
+msgid "git write-tree failed to write a tree"
+msgstr "git write-tree 無法寫入樹狀物件"
+
+#: builtin/am.c
 msgid "applying to an empty history"
 msgstr "正套用到一個空歷史上"
 
-#: builtin/am.c:1704 builtin/am.c:1708
+#: builtin/am.c builtin/commit.c builtin/merge.c sequencer.c
+#: t/helper/test-fast-rebase.c
+msgid "failed to write commit object"
+msgstr "寫提交物件失敗"
+
+#: builtin/am.c
 #, c-format
 msgid "cannot resume: %s does not exist."
 msgstr "無法繼續：%s 不存在。"
 
-#: builtin/am.c:1726
+#: builtin/am.c
 msgid "Commit Body is:"
 msgstr "提交內容為："
 
@@ -10726,57 +2401,57 @@ msgstr "提交內容為："
 #. in your translation. The program will only accept English
 #. input at this point.
 #.
-#: builtin/am.c:1736
+#: builtin/am.c
 #, 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:1782 builtin/commit.c:410
+#: builtin/am.c builtin/commit.c
 msgid "unable to write index file"
 msgstr "無法寫入索引檔案"
 
-#: builtin/am.c:1786
+#: builtin/am.c
 #, c-format
 msgid "Dirty index: cannot apply patches (dirty: %s)"
 msgstr "髒索引：不能套用修補檔（髒檔案：%s）"
 
-#: builtin/am.c:1828
+#: builtin/am.c
 #, c-format
 msgid "Skipping: %.*s"
 msgstr "略過：%.*s"
 
-#: builtin/am.c:1833
+#: builtin/am.c
 #, c-format
 msgid "Creating an empty commit: %.*s"
 msgstr "建立空白提交：%.*s"
 
-#: builtin/am.c:1837
+#: builtin/am.c
 msgid "Patch is empty."
 msgstr "修補檔為空。"
 
-#: builtin/am.c:1848 builtin/am.c:1917
+#: builtin/am.c
 #, c-format
 msgid "Applying: %.*s"
 msgstr "套用：%.*s"
 
-#: builtin/am.c:1865
+#: builtin/am.c
 msgid "No changes -- Patch already applied."
 msgstr "沒有變更——修補檔已經套用過。"
 
-#: builtin/am.c:1871
+#: builtin/am.c
 #, c-format
 msgid "Patch failed at %s %.*s"
 msgstr "打修補檔失敗於 %s %.*s"
 
-#: builtin/am.c:1875
+#: builtin/am.c
 msgid "Use 'git am --show-current-patch=diff' to see the failed patch"
 msgstr "用 'git am --show-current-patch=diff' 命令檢視失敗的修補檔"
 
-#: builtin/am.c:1921
+#: builtin/am.c
 msgid "No changes - recorded it as an empty commit."
 msgstr "沒有變更 － 將其錄製為空白提交。"
 
-#: builtin/am.c:1923
+#: builtin/am.c
 msgid ""
 "No changes - did you forget to use 'git add'?\n"
 "If there is nothing left to stage, chances are that something else\n"
@@ -10786,7 +2461,7 @@ msgstr ""
 "如果沒有什麼要新增到暫存區的，則很可能是其它提交已經引入了相同的變更。\n"
 "您也許想要略過這個修補檔。"
 
-#: builtin/am.c:1931
+#: builtin/am.c
 msgid ""
 "You still have unmerged paths in your index.\n"
 "You should 'git add' each file with resolved conflicts to mark them as "
@@ -10797,174 +2472,175 @@ msgstr ""
 "您應該對已經衝突解決的每一個檔案執行 'git add' 來標記已經完成。 \n"
 "你可以對 \"由他們刪除\" 的檔案執行 `git rm` 指令。"
 
-#: builtin/am.c:2039 builtin/am.c:2043 builtin/am.c:2055 builtin/reset.c:455
-#: builtin/reset.c:463
+#: builtin/am.c builtin/checkout.c builtin/clone.c builtin/stash.c merge.c
+#: rerere.c
+msgid "unable to write new index file"
+msgstr "無法寫新的索引檔案"
+
+#: builtin/am.c builtin/reset.c
 #, c-format
 msgid "Could not parse object '%s'."
 msgstr "不能解析物件 '%s'。"
 
-#: builtin/am.c:2091 builtin/am.c:2167
+#: builtin/am.c
 msgid "failed to clean index"
 msgstr "清空索引失敗"
 
-#: builtin/am.c:2135
+#: builtin/am.c
 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:2292
+#: builtin/am.c builtin/bisect--helper.c worktree.c
+#, c-format
+msgid "failed to read '%s'"
+msgstr "讀取 '%s' 失敗"
+
+#: builtin/am.c
 #, c-format
 msgid "options '%s=%s' and '%s=%s' cannot be used together"
 msgstr "「%s=%s」和「%s=%s」選項不得同時使用"
 
-#: builtin/am.c:2323
+#: builtin/am.c
 msgid "git am [<options>] [(<mbox> | <Maildir>)...]"
 msgstr "git am [<選項>] [(<mbox> | <Maildir>)...]"
 
-#: builtin/am.c:2324
+#: builtin/am.c
 msgid "git am [<options>] (--continue | --skip | --abort)"
 msgstr "git am [<選項>] (--continue | --skip | --abort)"
 
-#: builtin/am.c:2330
+#: builtin/am.c
 msgid "run interactively"
 msgstr "以互動式方式執行"
 
-#: builtin/am.c:2332
+#: builtin/am.c
 msgid "historical option -- no-op"
 msgstr "老的參數 —— 無作用"
 
-#: builtin/am.c:2334
+#: builtin/am.c
 msgid "allow fall back on 3way merging if needed"
 msgstr "如果必要，允許使用三方合併"
 
-#: builtin/am.c:2335 builtin/init-db.c:547 builtin/prune-packed.c:16
-#: builtin/repack.c:646 builtin/stash.c:946
+#: builtin/am.c builtin/init-db.c builtin/prune-packed.c builtin/repack.c
+#: builtin/stash.c
 msgid "be quiet"
 msgstr "靜默模式"
 
-#: builtin/am.c:2337
+#: builtin/am.c
 msgid "add a Signed-off-by trailer to the commit message"
 msgstr "在提交說明結尾加入 Signed-off-by"
 
-#: builtin/am.c:2340
+#: builtin/am.c
 msgid "recode into utf8 (default)"
 msgstr "使用 utf8 字元集（預設）"
 
-#: builtin/am.c:2342
+#: builtin/am.c
 msgid "pass -k flag to git-mailinfo"
 msgstr "向 git-mailinfo 傳遞 -k 參數"
 
-#: builtin/am.c:2344
+#: builtin/am.c
 msgid "pass -b flag to git-mailinfo"
 msgstr "向 git-mailinfo 傳遞 -b 參數"
 
-#: builtin/am.c:2346
+#: builtin/am.c
 msgid "pass -m flag to git-mailinfo"
 msgstr "向 git-mailinfo 傳遞 -m 參數"
 
-#: builtin/am.c:2348
+#: builtin/am.c
 msgid "pass --keep-cr flag to git-mailsplit for mbox format"
 msgstr "針對 mbox 格式，向 git-mailsplit 傳遞 --keep-cr 參數"
 
-#: builtin/am.c:2351
+#: builtin/am.c
 msgid "do not pass --keep-cr flag to git-mailsplit independent of am.keepcr"
 msgstr "不向 git-mailsplit 傳遞 --keep-cr 參數，覆蓋 am.keepcr 的設定"
 
-#: builtin/am.c:2354
+#: builtin/am.c
 msgid "strip everything before a scissors line"
 msgstr "捨棄裁切線前的所有內容"
 
-#: builtin/am.c:2356
+#: builtin/am.c
 msgid "pass it through git-mailinfo"
 msgstr "透過 git-mailinfo 傳遞"
 
-#: builtin/am.c:2359 builtin/am.c:2362 builtin/am.c:2365 builtin/am.c:2368
-#: builtin/am.c:2371 builtin/am.c:2374 builtin/am.c:2377 builtin/am.c:2380
-#: builtin/am.c:2386
+#: builtin/am.c
 msgid "pass it through git-apply"
 msgstr "傳遞給 git-apply"
 
-#: builtin/am.c:2376 builtin/commit.c:1514 builtin/fmt-merge-msg.c:18
-#: builtin/fmt-merge-msg.c:21 builtin/grep.c:920 builtin/merge.c:263
-#: builtin/pull.c:142 builtin/pull.c:204 builtin/pull.c:221
-#: builtin/rebase.c:1074 builtin/repack.c:657 builtin/repack.c:661
-#: builtin/repack.c:663 builtin/show-branch.c:650 builtin/show-ref.c:172
-#: builtin/tag.c:446 parse-options.h:159 parse-options.h:180
-#: parse-options.h:348
+#: builtin/am.c builtin/commit.c builtin/fmt-merge-msg.c builtin/grep.c
+#: builtin/merge.c builtin/pull.c builtin/rebase.c builtin/repack.c
+#: builtin/show-branch.c builtin/show-ref.c builtin/tag.c parse-options.h
 msgid "n"
 msgstr "n"
 
-#: builtin/am.c:2382 builtin/branch.c:695 builtin/bugreport.c:109
-#: builtin/cat-file.c:848 builtin/cat-file.c:852 builtin/cat-file.c:856
-#: builtin/for-each-ref.c:41 builtin/ls-tree.c:357 builtin/replace.c:555
-#: builtin/tag.c:480 builtin/verify-tag.c:38
+#: builtin/am.c builtin/branch.c builtin/bugreport.c builtin/cat-file.c
+#: builtin/for-each-ref.c builtin/ls-tree.c builtin/replace.c builtin/tag.c
+#: builtin/verify-tag.c
 msgid "format"
 msgstr "格式"
 
-#: builtin/am.c:2383
+#: builtin/am.c
 msgid "format the patch(es) are in"
 msgstr "修補檔的格式"
 
-#: builtin/am.c:2389
+#: builtin/am.c
 msgid "override error message when patch failure occurs"
 msgstr "打修補檔失敗時顯示的錯誤訊息"
 
-#: builtin/am.c:2391
+#: builtin/am.c
 msgid "continue applying patches after resolving a conflict"
 msgstr "衝突解決後繼續套用修補檔"
 
-#: builtin/am.c:2394
+#: builtin/am.c
 msgid "synonyms for --continue"
 msgstr "和 --continue 同義"
 
-#: builtin/am.c:2397
+#: builtin/am.c
 msgid "skip the current patch"
 msgstr "略過目前修補檔"
 
-#: builtin/am.c:2400
+#: builtin/am.c
 msgid "restore the original branch and abort the patching operation"
 msgstr "還原原始分支並中止修補動作"
 
-#: builtin/am.c:2403
+#: builtin/am.c
 msgid "abort the patching operation but keep HEAD where it is"
 msgstr "終止修補動作但保持 HEAD 不變"
 
-#: builtin/am.c:2407
+#: builtin/am.c
 msgid "show the patch being applied"
 msgstr "顯示正在套用的修補檔"
 
-#: builtin/am.c:2411
+#: builtin/am.c
 msgid "record the empty patch as an empty commit"
 msgstr "將空白修補檔錄製為空白提交"
 
-#: builtin/am.c:2415
+#: builtin/am.c
 msgid "lie about committer date"
 msgstr "將作者日期作為提交日期"
 
-#: builtin/am.c:2417
+#: builtin/am.c
 msgid "use current timestamp for author date"
 msgstr "用目前時間作為作者日期"
 
-#: builtin/am.c:2419 builtin/commit-tree.c:118 builtin/commit.c:1642
-#: builtin/merge.c:302 builtin/pull.c:179 builtin/rebase.c:1127
-#: builtin/revert.c:117 builtin/tag.c:461
+#: builtin/am.c builtin/commit-tree.c builtin/commit.c builtin/merge.c
+#: builtin/pull.c builtin/rebase.c builtin/revert.c builtin/tag.c
 msgid "key-id"
 msgstr "key-id"
 
-#: builtin/am.c:2420 builtin/rebase.c:1128
+#: builtin/am.c builtin/rebase.c
 msgid "GPG-sign commits"
 msgstr "使用 GPG 簽名提交"
 
-#: builtin/am.c:2423
+#: builtin/am.c
 msgid "how to handle empty patches"
 msgstr "空白修補檔的處理方式"
 
-#: builtin/am.c:2426
+#: builtin/am.c
 msgid "(internal use for git-rebase)"
 msgstr "（內部使用，用於 git-rebase）"
 
-#: builtin/am.c:2444
+#: builtin/am.c
 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."
@@ -10972,16 +2648,16 @@ msgstr ""
 "參數 -b/--binary 已經很長時間不做任何實質動作了，並且將被移除。\n"
 "請不要再使用它了。"
 
-#: builtin/am.c:2451
+#: builtin/am.c
 msgid "failed to read the index"
 msgstr "讀取索引失敗"
 
-#: builtin/am.c:2466
+#: builtin/am.c
 #, c-format
 msgid "previous rebase directory %s still exists but mbox given."
 msgstr "之前的重定基底目錄 %s 仍然存在，但卻提供了 mbox。"
 
-#: builtin/am.c:2490
+#: builtin/am.c
 #, c-format
 msgid ""
 "Stray %s directory found.\n"
@@ -10990,48 +2666,48 @@ msgstr ""
 "發現了錯誤的 %s 目錄。\n"
 "使用 \"git am --abort\" 刪除它。"
 
-#: builtin/am.c:2496
+#: builtin/am.c
 msgid "Resolve operation not in progress, we are not resuming."
 msgstr "解決動作未進行，我們不會繼續。"
 
-#: builtin/am.c:2506
+#: builtin/am.c
 msgid "interactive mode requires patches on the command line"
 msgstr "互動式模式需要指令列上提供修補檔"
 
-#: builtin/apply.c:8
+#: builtin/apply.c
 msgid "git apply [<options>] [<patch>...]"
 msgstr "git apply [<選項>] [<修補檔>...]"
 
-#: builtin/archive.c:18
+#: builtin/archive.c contrib/scalar/scalar.c
 msgid "could not redirect output"
 msgstr "不能重定向輸出"
 
-#: builtin/archive.c:35
+#: builtin/archive.c
 msgid "git archive: Remote with no URL"
 msgstr "git archive：未提供遠端 URL"
 
-#: builtin/archive.c:59
+#: builtin/archive.c
 msgid "git archive: expected ACK/NAK, got a flush packet"
 msgstr "git archive：期望是 ACK/NAK，卻得到 flush 包"
 
-#: builtin/archive.c:62
+#: builtin/archive.c
 #, c-format
 msgid "git archive: NACK %s"
 msgstr "git archive：NACK %s"
 
-#: builtin/archive.c:63
+#: builtin/archive.c
 msgid "git archive: protocol error"
 msgstr "git archive：協定錯誤"
 
-#: builtin/archive.c:67
+#: builtin/archive.c
 msgid "git archive: expected a flush"
 msgstr "git archive：應有一個 flush 包"
 
-#: builtin/bisect--helper.c:24
+#: builtin/bisect--helper.c
 msgid "git bisect--helper --bisect-reset [<commit>]"
 msgstr "git bisect--helper --bisect-reset [<提交>]"
 
-#: builtin/bisect--helper.c:26
+#: builtin/bisect--helper.c
 msgid ""
 "git bisect--helper --bisect-start [--term-{new,bad}=<term> --term-{old,good}"
 "=<term>] [--no-checkout] [--first-parent] [<bad> [<good>...]] [--] "
@@ -11040,97 +2716,97 @@ msgstr ""
 "git bisect--helper --bisect-start [--term-{new,bad}=<術語> --term-{old,good}"
 "=<術語>] [--no-checkout] [--first-parent] [<壞> [<好>...]] [--] [<路徑>...]"
 
-#: builtin/bisect--helper.c:29
+#: builtin/bisect--helper.c
 msgid "git bisect--helper --bisect-state (bad|new) [<rev>]"
 msgstr "git bisect--helper --bisect-state (bad|new) [<修訂版>]"
 
-#: builtin/bisect--helper.c:30
+#: builtin/bisect--helper.c
 msgid "git bisect--helper --bisect-state (good|old) [<rev>...]"
 msgstr "git bisect--helper --bisect-state (good|old) [<修訂版>...]"
 
-#: builtin/bisect--helper.c:31
+#: builtin/bisect--helper.c
 msgid "git bisect--helper --bisect-replay <filename>"
 msgstr "git bisect--helper --bisect-replay <檔名>"
 
-#: builtin/bisect--helper.c:32
+#: builtin/bisect--helper.c
 msgid "git bisect--helper --bisect-skip [(<rev>|<range>)...]"
 msgstr "git bisect--helper --bisect-skip [(<修訂版>|<範圍>)...]"
 
-#: builtin/bisect--helper.c:34
+#: builtin/bisect--helper.c
 msgid "git bisect--helper --bisect-run <cmd>..."
 msgstr "git bisect--helper --bisect-run <cmd>..."
 
-#: builtin/bisect--helper.c:109
+#: builtin/bisect--helper.c
 #, c-format
 msgid "cannot open file '%s' in mode '%s'"
 msgstr "無法以 '%2$s' 模式開啟 '%1$s' 檔案"
 
-#: builtin/bisect--helper.c:116
+#: builtin/bisect--helper.c
 #, c-format
 msgid "could not write to file '%s'"
 msgstr "無法寫入 '%s' 檔案"
 
-#: builtin/bisect--helper.c:154
+#: builtin/bisect--helper.c
 #, c-format
 msgid "cannot open file '%s' for reading"
 msgstr "無法開啟「%s」檔案進行讀取"
 
-#: builtin/bisect--helper.c:170
+#: builtin/bisect--helper.c
 #, c-format
 msgid "'%s' is not a valid term"
 msgstr "'%s' 不是一個有效的術語"
 
-#: builtin/bisect--helper.c:174
+#: builtin/bisect--helper.c
 #, c-format
 msgid "can't use the builtin command '%s' as a term"
 msgstr "不能使用內建指令 '%s' 作為術語"
 
-#: builtin/bisect--helper.c:184
+#: builtin/bisect--helper.c
 #, c-format
 msgid "can't change the meaning of the term '%s'"
 msgstr "不能修改術語 '%s' 的含義"
 
-#: builtin/bisect--helper.c:194
+#: builtin/bisect--helper.c
 msgid "please use two different terms"
 msgstr "請使用兩個不同的術語"
 
-#: builtin/bisect--helper.c:210
+#: builtin/bisect--helper.c
 #, c-format
 msgid "We are not bisecting.\n"
 msgstr "我們沒有在二分搜尋。\n"
 
-#: builtin/bisect--helper.c:218
+#: builtin/bisect--helper.c
 #, c-format
 msgid "'%s' is not a valid commit"
 msgstr "'%s' 不是一個有效的提交"
 
-#: builtin/bisect--helper.c:227
+#: builtin/bisect--helper.c
 #, 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:271
+#: builtin/bisect--helper.c
 #, c-format
 msgid "Bad bisect_write argument: %s"
 msgstr "壞的 bisect_write 參數：%s"
 
-#: builtin/bisect--helper.c:276
+#: builtin/bisect--helper.c
 #, c-format
 msgid "couldn't get the oid of the rev '%s'"
 msgstr "無法取得版本 '%s' 的物件 ID"
 
-#: builtin/bisect--helper.c:288
+#: builtin/bisect--helper.c
 #, c-format
 msgid "couldn't open the file '%s'"
 msgstr "無法開啟檔案 '%s'"
 
-#: builtin/bisect--helper.c:314
+#: builtin/bisect--helper.c
 #, c-format
 msgid "Invalid command: you're currently in a %s/%s bisect"
 msgstr "無效的指令：您目前正處於一個 %s/%s 二分搜尋中"
 
-#: builtin/bisect--helper.c:341
+#: builtin/bisect--helper.c
 #, c-format
 msgid ""
 "You need to give me at least one %s and %s revision.\n"
@@ -11139,7 +2815,7 @@ msgstr ""
 "您需要給我至少一個 %s 和一個 %s 版本。\n"
 "為此您可以用 \"git bisect %s\" 和 \"git bisect %s\"。"
 
-#: builtin/bisect--helper.c:345
+#: builtin/bisect--helper.c
 #, c-format
 msgid ""
 "You need to start by \"git bisect start\".\n"
@@ -11150,7 +2826,7 @@ msgstr ""
 "然後需要提供我至少一個 %s 和一個 %s 版本。\n"
 "為此您可以用 \"git bisect %s\" 和 \"git bisect %s\" 指令。"
 
-#: builtin/bisect--helper.c:365
+#: builtin/bisect--helper.c
 #, c-format
 msgid "bisecting only with a %s commit"
 msgstr "在只有一個 %s 提交的情況下二分搜尋"
@@ -11160,22 +2836,36 @@ msgstr "在只有一個 %s 提交的情況下二分搜尋"
 #. translation. The program will only accept English input
 #. at this point.
 #.
-#: builtin/bisect--helper.c:373
+#: builtin/bisect--helper.c
 msgid "Are you sure [Y/n]? "
 msgstr "您確認嗎[Y/n]？ "
 
-#: builtin/bisect--helper.c:434
+#: builtin/bisect--helper.c
+msgid "status: waiting for both good and bad commits\n"
+msgstr "狀態：正在等待好和壞的提交\n"
+
+#: builtin/bisect--helper.c
+#, c-format
+msgid "status: waiting for bad commit, %d good commit known\n"
+msgid_plural "status: waiting for bad commit, %d good commits known\n"
+msgstr[0] "狀態：正在等待壞的提交，已知有 %d 個好的提交\n"
+
+#: builtin/bisect--helper.c
+msgid "status: waiting for good commit(s), bad commit known\n"
+msgstr "狀態：正在等待好的提交，已知有壞的提交\n"
+
+#: builtin/bisect--helper.c
 msgid "no terms defined"
 msgstr "未定義術語"
 
-#: builtin/bisect--helper.c:437
+#: builtin/bisect--helper.c
 #, 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:447
+#: builtin/bisect--helper.c
 #, c-format
 msgid ""
 "invalid argument %s for 'git bisect terms'.\n"
@@ -11184,52 +2874,52 @@ msgstr ""
 "指令 'git bisect terms' 的參數 %s 無效。\n"
 "支援的選項有：--term-good|--term-old 和 --term-bad|--term-new。"
 
-#: builtin/bisect--helper.c:514 builtin/bisect--helper.c:1038
+#: builtin/bisect--helper.c
 msgid "revision walk setup failed\n"
 msgstr "版本遍歷設定失敗\n"
 
-#: builtin/bisect--helper.c:536
+#: builtin/bisect--helper.c
 #, c-format
 msgid "could not open '%s' for appending"
 msgstr "無法開啟 '%s' 進行附加"
 
-#: builtin/bisect--helper.c:655 builtin/bisect--helper.c:668
+#: builtin/bisect--helper.c
 msgid "'' is not a valid term"
 msgstr "'' 不是一個有效的術語"
 
-#: builtin/bisect--helper.c:678
+#: builtin/bisect--helper.c
 #, c-format
 msgid "unrecognized option: '%s'"
 msgstr "未識別的選項：'%s'"
 
-#: builtin/bisect--helper.c:682
+#: builtin/bisect--helper.c
 #, c-format
 msgid "'%s' does not appear to be a valid revision"
 msgstr "'%s' 看起來不是一個有效的版本"
 
-#: builtin/bisect--helper.c:713
+#: builtin/bisect--helper.c
 msgid "bad HEAD - I need a HEAD"
 msgstr "壞的 HEAD - 我需要一個 HEAD"
 
-#: builtin/bisect--helper.c:728
+#: builtin/bisect--helper.c
 #, c-format
 msgid "checking out '%s' failed. Try 'git bisect start <valid-branch>'."
 msgstr "簽出 '%s' 失敗。嘗試 'git bisect start <有效分支>'。"
 
-#: builtin/bisect--helper.c:749
+#: builtin/bisect--helper.c
 msgid "won't bisect on cg-seek'ed tree"
 msgstr "不會在做了 cg-seek 的樹上做二分搜尋"
 
-#: builtin/bisect--helper.c:752
+#: builtin/bisect--helper.c
 msgid "bad HEAD - strange symbolic ref"
 msgstr "壞的 HEAD - 奇怪的符號引用"
 
-#: builtin/bisect--helper.c:772
+#: builtin/bisect--helper.c
 #, c-format
 msgid "invalid ref: '%s'"
 msgstr "無效的引用：'%s'"
 
-#: builtin/bisect--helper.c:830
+#: builtin/bisect--helper.c
 msgid "You need to start by \"git bisect start\"\n"
 msgstr "您需要執行 \"git bisect start\" 來開始\n"
 
@@ -11238,87 +2928,87 @@ msgstr "您需要執行 \"git bisect start\" 來開始\n"
 #. translation. The program will only accept English input
 #. at this point.
 #.
-#: builtin/bisect--helper.c:841
+#: builtin/bisect--helper.c
 msgid "Do you want me to do it for you [Y/n]? "
 msgstr "您想讓我為您這樣做嗎[Y/n]？ "
 
-#: builtin/bisect--helper.c:859
+#: builtin/bisect--helper.c
 msgid "Please call `--bisect-state` with at least one argument"
 msgstr "要呼叫 `--bisect-state`，請傳入一個以上的引數"
 
-#: builtin/bisect--helper.c:872
+#: builtin/bisect--helper.c
 #, c-format
 msgid "'git bisect %s' can take only one argument."
 msgstr "'git bisect %s' 只能有一個參數。"
 
-#: builtin/bisect--helper.c:884 builtin/bisect--helper.c:897
+#: builtin/bisect--helper.c
 #, c-format
 msgid "Bad rev input: %s"
 msgstr "<修訂版> 輸入格式錯誤：%s"
 
-#: builtin/bisect--helper.c:904
+#: builtin/bisect--helper.c
 #, c-format
 msgid "Bad rev input (not a commit): %s"
 msgstr "修訂版輸入有誤（不是提交）：%s"
 
-#: builtin/bisect--helper.c:936
+#: builtin/bisect--helper.c
 msgid "We are not bisecting."
 msgstr "我們沒有在二分搜尋。"
 
-#: builtin/bisect--helper.c:986
+#: builtin/bisect--helper.c
 #, c-format
 msgid "'%s'?? what are you talking about?"
 msgstr "「%s」？？您在說什麼？"
 
-#: builtin/bisect--helper.c:998
+#: builtin/bisect--helper.c
 #, c-format
 msgid "cannot read file '%s' for replaying"
 msgstr "無法讀取「%s」檔案來重放"
 
-#: builtin/bisect--helper.c:1120 builtin/bisect--helper.c:1152
+#: builtin/bisect--helper.c
 #, c-format
 msgid "running %s\n"
 msgstr "正在執行 %s\n"
 
-#: builtin/bisect--helper.c:1145 builtin/bisect--helper.c:1335
+#: builtin/bisect--helper.c
 msgid "bisect run failed: no command provided."
 msgstr "二分搜尋執行失敗：沒有提供指令。"
 
-#: builtin/bisect--helper.c:1166
+#: builtin/bisect--helper.c
 #, c-format
 msgid "unable to verify '%s' on good revision"
 msgstr "無法在正確修訂版上驗證「%s」"
 
-#: builtin/bisect--helper.c:1172
+#: builtin/bisect--helper.c
 #, c-format
 msgid "bogus exit code %d for good revision"
 msgstr "正確修訂版回傳偽造的錯誤代碼 %d"
 
-#: builtin/bisect--helper.c:1180
+#: builtin/bisect--helper.c
 #, 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:1195
+#: builtin/bisect--helper.c
 #, c-format
 msgid "cannot open file '%s' for writing"
 msgstr "無法開啟「%s」檔案進行寫入"
 
-#: builtin/bisect--helper.c:1213
+#: builtin/bisect--helper.c
 msgid "bisect run cannot continue any more"
 msgstr "二分搜尋不能繼續執行"
 
-#: builtin/bisect--helper.c:1215
+#: builtin/bisect--helper.c
 #, c-format
 msgid "bisect run success"
 msgstr "二分搜尋執行成功"
 
-#: builtin/bisect--helper.c:1218
+#: builtin/bisect--helper.c
 #, c-format
 msgid "bisect found first bad commit"
 msgstr "二分搜尋發現到第一個有問題的提交"
 
-#: builtin/bisect--helper.c:1221
+#: builtin/bisect--helper.c
 #, c-format
 msgid ""
 "bisect run failed: 'git bisect--helper --bisect-state %s' exited with error "
@@ -11326,218 +3016,215 @@ msgid ""
 msgstr ""
 "二分搜尋執行失敗：'git bisect--helper --bisect-state %s' 以錯誤代碼 %d 離開"
 
-#: builtin/bisect--helper.c:1253
+#: builtin/bisect--helper.c
 msgid "reset the bisection state"
 msgstr "清除二分搜尋狀態"
 
-#: builtin/bisect--helper.c:1255
+#: builtin/bisect--helper.c
 msgid "check whether bad or good terms exist"
 msgstr "檢查壞的或好的術語是否存在"
 
-#: builtin/bisect--helper.c:1257
+#: builtin/bisect--helper.c
 msgid "print out the bisect terms"
 msgstr "列印二分搜尋術語"
 
-#: builtin/bisect--helper.c:1259
+#: builtin/bisect--helper.c
 msgid "start the bisect session"
 msgstr "啟動二分搜尋過程"
 
-#: builtin/bisect--helper.c:1261
+#: builtin/bisect--helper.c
 msgid "find the next bisection commit"
 msgstr "尋找下一個二分搜尋提交"
 
-#: builtin/bisect--helper.c:1263
+#: builtin/bisect--helper.c
 msgid "mark the state of ref (or refs)"
 msgstr "標記 ref (或 refs) 的狀態"
 
-#: builtin/bisect--helper.c:1265
+#: builtin/bisect--helper.c
 msgid "list the bisection steps so far"
 msgstr "列出迄今的二分搜尋步驟"
 
-#: builtin/bisect--helper.c:1267
+#: builtin/bisect--helper.c
 msgid "replay the bisection process from the given file"
 msgstr "從指定檔案重放二分搜尋過程"
 
-#: builtin/bisect--helper.c:1269
+#: builtin/bisect--helper.c
 msgid "skip some commits for checkout"
 msgstr "略過要簽出的部分提交"
 
-#: builtin/bisect--helper.c:1271
+#: builtin/bisect--helper.c
 msgid "visualize the bisection"
 msgstr "視覺化二分搜尋過程"
 
-#: builtin/bisect--helper.c:1273
+#: builtin/bisect--helper.c
 msgid "use <cmd>... to automatically bisect"
 msgstr "使用 <cmd>... 自動進行二分搜尋"
 
-#: builtin/bisect--helper.c:1275
+#: builtin/bisect--helper.c
 msgid "no log for BISECT_WRITE"
 msgstr "BISECT_WRITE 無日誌"
 
-#: builtin/bisect--helper.c:1290
+#: builtin/bisect--helper.c
 msgid "--bisect-reset requires either no argument or a commit"
 msgstr "--bisect-reset 無需參數或者需要一個提交"
 
-#: builtin/bisect--helper.c:1295
+#: builtin/bisect--helper.c
 msgid "--bisect-terms requires 0 or 1 argument"
 msgstr "--bisect-terms 需要 0 或 1 個參數"
 
-#: builtin/bisect--helper.c:1304
+#: builtin/bisect--helper.c
 msgid "--bisect-next requires 0 arguments"
 msgstr "--bisect-next 需要 0 個引數"
 
-#: builtin/bisect--helper.c:1315
+#: builtin/bisect--helper.c
 msgid "--bisect-log requires 0 arguments"
 msgstr "--bisect-log 需要 0 個引數"
 
-#: builtin/bisect--helper.c:1320
+#: builtin/bisect--helper.c
 msgid "no logfile given"
 msgstr "未提供日誌檔案"
 
-#: builtin/blame.c:32
+#: builtin/blame.c
 msgid "git blame [<options>] [<rev-opts>] [<rev>] [--] <file>"
 msgstr "git blame [<選項>] [<版本選項>] [<版本>] [--] <檔案>"
 
-#: builtin/blame.c:37
+#: builtin/blame.c
 msgid "<rev-opts> are documented in git-rev-list(1)"
 msgstr "<版本選項> 的檔案記錄在 git-rev-list(1) 中"
 
-#: builtin/blame.c:406
+#: builtin/blame.c
 #, c-format
 msgid "expecting a color: %s"
 msgstr "期望一個顏色：%s"
 
-#: builtin/blame.c:413
+#: builtin/blame.c
 msgid "must end with a color"
 msgstr "必須以一個顏色結尾"
 
-#: builtin/blame.c:842
+#: builtin/blame.c
 #, c-format
 msgid "cannot find revision %s to ignore"
 msgstr "不能找到要忽略的版本 %s"
 
-#: builtin/blame.c:864
+#: builtin/blame.c
 msgid "show blame entries as we find them, incrementally"
 msgstr "增量式顯示發現的 blame 條目"
 
-#: builtin/blame.c:865
+#: builtin/blame.c
 msgid "do not show object names of boundary commits (Default: off)"
 msgstr "不要顯示邊界提交的物件名稱（預設值: off）"
 
-#: builtin/blame.c:866
+#: builtin/blame.c
 msgid "do not treat root commits as boundaries (Default: off)"
 msgstr "不將根提交看作邊界（預設值：off）"
 
-#: builtin/blame.c:867
+#: builtin/blame.c
 msgid "show work cost statistics"
 msgstr "顯示工作量統計"
 
-#: builtin/blame.c:868 builtin/checkout.c:1554 builtin/clone.c:98
-#: builtin/commit-graph.c:75 builtin/commit-graph.c:228 builtin/fetch.c:181
-#: builtin/merge.c:301 builtin/multi-pack-index.c:103
-#: builtin/multi-pack-index.c:154 builtin/multi-pack-index.c:180
-#: builtin/multi-pack-index.c:208 builtin/pull.c:120 builtin/push.c:566
-#: builtin/remote.c:683 builtin/send-pack.c:202
+#: builtin/blame.c builtin/checkout.c builtin/clone.c builtin/commit-graph.c
+#: builtin/fetch.c builtin/merge.c builtin/multi-pack-index.c builtin/pull.c
+#: builtin/push.c builtin/remote.c builtin/send-pack.c
 msgid "force progress reporting"
 msgstr "強制顯示進度報告"
 
-#: builtin/blame.c:869
+#: builtin/blame.c
 msgid "show output score for blame entries"
 msgstr "顯示判斷 blame 條目位移的得分診斷訊息"
 
-#: builtin/blame.c:870
+#: builtin/blame.c
 msgid "show original filename (Default: auto)"
 msgstr "顯示原始檔案名稱（預設值：auto）"
 
-#: builtin/blame.c:871
+#: builtin/blame.c
 msgid "show original linenumber (Default: off)"
 msgstr "顯示原始檔案名稱（預設值：off）"
 
-#: builtin/blame.c:872
+#: builtin/blame.c
 msgid "show in a format designed for machine consumption"
 msgstr "顯示成適合機器讀取的格式"
 
-#: builtin/blame.c:873
+#: builtin/blame.c
 msgid "show porcelain format with per-line commit information"
 msgstr "顯示每一列適合機器的提交說明"
 
-#: builtin/blame.c:874
+#: builtin/blame.c
 msgid "use the same output mode as git-annotate (Default: off)"
 msgstr "使用和 git-annotate 相同的輸出模式（預設值：off）"
 
-#: builtin/blame.c:875
+#: builtin/blame.c
 msgid "show raw timestamp (Default: off)"
 msgstr "顯示原始時間戳（預設值：off）"
 
-#: builtin/blame.c:876
+#: builtin/blame.c
 msgid "show long commit SHA1 (Default: off)"
 msgstr "顯示較長的 SHA1 提交編號（預設值：off）"
 
-#: builtin/blame.c:877
+#: builtin/blame.c
 msgid "suppress author name and timestamp (Default: off)"
 msgstr "隱藏作者名字及時間戳（預設值：off）"
 
-#: builtin/blame.c:878
+#: builtin/blame.c
 msgid "show author email instead of name (Default: off)"
 msgstr "顯示作者信箱而非名稱（預設值：off）"
 
-#: builtin/blame.c:879
+#: builtin/blame.c
 msgid "ignore whitespace differences"
 msgstr "忽略空白差異"
 
-#: builtin/blame.c:880 builtin/log.c:1857
+#: builtin/blame.c builtin/log.c
 msgid "rev"
 msgstr "版本"
 
-#: builtin/blame.c:880
+#: builtin/blame.c
 msgid "ignore <rev> when blaming"
 msgstr "在執行 blame 動作時忽略 <修訂版>"
 
-#: builtin/blame.c:881
+#: builtin/blame.c
 msgid "ignore revisions from <file>"
 msgstr "忽略 <檔案> 中的修訂版"
 
-#: builtin/blame.c:882
+#: builtin/blame.c
 msgid "color redundant metadata from previous line differently"
 msgstr "使用顏色間隔輸出與前一行不同的重複中介資料"
 
-#: builtin/blame.c:883
+#: builtin/blame.c
 msgid "color lines by age"
 msgstr "依據時間著色"
 
-#: builtin/blame.c:884
+#: builtin/blame.c
 msgid "spend extra cycles to find better match"
 msgstr "循環更多次以找到更佳符合"
 
-#: builtin/blame.c:885
+#: builtin/blame.c
 msgid "use revisions from <file> instead of calling git-rev-list"
 msgstr "使用來自 <檔案> 的修訂集而不是呼叫 git-rev-list"
 
-#: builtin/blame.c:886
+#: builtin/blame.c
 msgid "use <file>'s contents as the final image"
 msgstr "將 <檔案> 的內容當成是最終 image"
 
-#: builtin/blame.c:887 builtin/blame.c:888
+#: builtin/blame.c
 msgid "score"
 msgstr "得分"
 
-#: builtin/blame.c:887
+#: builtin/blame.c
 msgid "find line copies within and across files"
 msgstr "找到檔案內及跨檔案的複製列"
 
-#: builtin/blame.c:888
+#: builtin/blame.c
 msgid "find line movements within and across files"
 msgstr "找到檔案內及跨檔案的移動列"
 
-#: builtin/blame.c:889
+#: builtin/blame.c
 msgid "range"
 msgstr "range"
 
-#: builtin/blame.c:890
+#: builtin/blame.c
 msgid "process only line range <start>,<end> or function :<funcname>"
 msgstr "只處理範圍在 <開始>,<結尾> 的列，或是 :<函數名稱> 函數"
 
-#: builtin/blame.c:949
+#: builtin/blame.c
 msgid "--progress can't be used with --incremental or porcelain formats"
 msgstr "--progress 不能跟 --incremental 或 porcelain 格式同時使用"
 
@@ -11549,56 +3236,56 @@ msgstr "--progress 不能跟 --incremental 或 porcelain 格式同時使用"
 #. your language may need more or fewer display
 #. columns.
 #.
-#: builtin/blame.c:1000
+#: builtin/blame.c
 msgid "4 years, 11 months ago"
 msgstr "4 年 11 個月前"
 
-#: builtin/blame.c:1116
+#: builtin/blame.c
 #, c-format
 msgid "file %s has only %lu line"
 msgid_plural "file %s has only %lu lines"
 msgstr[0] "檔案 %s 只有 %lu 行"
 
-#: builtin/blame.c:1161
+#: builtin/blame.c
 msgid "Blaming lines"
 msgstr "追蹤程式碼行"
 
-#: builtin/branch.c:29
+#: builtin/branch.c
 msgid "git branch [<options>] [-r | -a] [--merged] [--no-merged]"
 msgstr "git branch [<選項>] [-r | -a] [--merged] [--no-merged]"
 
-#: builtin/branch.c:30
+#: builtin/branch.c
 msgid ""
 "git branch [<options>] [-f] [--recurse-submodules] <branch-name> [<start-"
 "point>]"
 msgstr "git branch [<選項>] [-f] [--recurse-submodules] <分支名> [<起始點>]"
 
-#: builtin/branch.c:31
+#: builtin/branch.c
 msgid "git branch [<options>] [-l] [<pattern>...]"
 msgstr "git branch [<選項>] [-l] [<模式>...]"
 
-#: builtin/branch.c:32
+#: builtin/branch.c
 msgid "git branch [<options>] [-r] (-d | -D) <branch-name>..."
 msgstr "git branch [<選項>] [-r] (-d | -D) <分支名>..."
 
-#: builtin/branch.c:33
+#: builtin/branch.c
 msgid "git branch [<options>] (-m | -M) [<old-branch>] <new-branch>"
 msgstr "git branch [<選項>] (-m | -M) [<舊分支>] <新分支>"
 
-#: builtin/branch.c:34
+#: builtin/branch.c
 msgid "git branch [<options>] (-c | -C) [<old-branch>] <new-branch>"
 msgstr "git branch [<選項>] (-c | -C) [<老分支>] <新分支>"
 
-#: builtin/branch.c:35
+#: builtin/branch.c
 msgid "git branch [<options>] [-r | -a] [--points-at]"
 msgstr "git branch [<選項>] [-r | -a] [--points-at]"
 
-#: builtin/branch.c:36
+#: builtin/branch.c
 msgid "git branch [<options>] [-r | -a] [--format]"
 msgstr "git branch [<選項>] [-r | -a] [--format]"
 
 #  譯者：保持原換行格式，在輸出時 %s 的替代內容會讓字串變長
-#: builtin/branch.c:165
+#: builtin/branch.c
 #, c-format
 msgid ""
 "deleting branch '%s' that has been merged to\n"
@@ -11608,7 +3295,7 @@ msgstr ""
 "         '%s'，但未合併到 HEAD。"
 
 #  譯者：保持原換行格式，在輸出時 %s 的替代內容會讓字串變長
-#: builtin/branch.c:169
+#: builtin/branch.c
 #, c-format
 msgid ""
 "not deleting branch '%s' that is not yet merged to\n"
@@ -11617,12 +3304,12 @@ msgstr ""
 "並未刪除分支 '%s'， 雖然它已經合併到 HEAD，\n"
 "         然而卻尚未被合併到分支 '%s' 。"
 
-#: builtin/branch.c:183
+#: builtin/branch.c
 #, c-format
 msgid "Couldn't look up commit object for '%s'"
 msgstr "無法查詢 '%s' 指向的提交物件"
 
-#: builtin/branch.c:187
+#: builtin/branch.c
 #, c-format
 msgid ""
 "The branch '%s' is not fully merged.\n"
@@ -11631,111 +3318,111 @@ msgstr ""
 "分支 '%s' 沒有完全合併。\n"
 "如果您確認要刪除它，執行 'git branch -D %s'。"
 
-#: builtin/branch.c:200
+#: builtin/branch.c
 msgid "Update of config-file failed"
 msgstr "更新設定檔案失敗"
 
-#: builtin/branch.c:235
+#: builtin/branch.c
 msgid "cannot use -a with -d"
 msgstr "不能將 -a 和 -d 同時使用"
 
-#: builtin/branch.c:242
+#: builtin/branch.c
 msgid "Couldn't look up commit object for HEAD"
 msgstr "無法查詢 HEAD 指向的提交物件"
 
-#: builtin/branch.c:259
+#: builtin/branch.c
 #, c-format
 msgid "Cannot delete branch '%s' checked out at '%s'"
 msgstr "無法刪除在「%2$s」簽出的「%1$s」分支"
 
-#: builtin/branch.c:274
+#: builtin/branch.c
 #, c-format
 msgid "remote-tracking branch '%s' not found."
 msgstr "未能找到遠端追蹤分支 '%s'。"
 
-#: builtin/branch.c:275
+#: builtin/branch.c
 #, c-format
 msgid "branch '%s' not found."
 msgstr "分支 '%s' 未發現。"
 
-#: builtin/branch.c:306
+#: builtin/branch.c
 #, c-format
 msgid "Deleted remote-tracking branch %s (was %s).\n"
 msgstr "已刪除遠端追蹤分支 %s（曾為 %s）。\n"
 
-#: builtin/branch.c:307
+#: builtin/branch.c
 #, c-format
 msgid "Deleted branch %s (was %s).\n"
 msgstr "已刪除分支 %s（曾為 %s）。\n"
 
-#: builtin/branch.c:457 builtin/tag.c:64
+#: builtin/branch.c builtin/tag.c
 msgid "unable to parse format string"
 msgstr "不能解析格式化字串"
 
-#: builtin/branch.c:488
+#: builtin/branch.c
 msgid "could not resolve HEAD"
 msgstr "不能解析 HEAD 提交"
 
-#: builtin/branch.c:494
+#: builtin/branch.c
 #, c-format
 msgid "HEAD (%s) points outside of refs/heads/"
 msgstr "HEAD (%s) 指向 refs/heads/ 之外"
 
-#: builtin/branch.c:509
+#: builtin/branch.c
 #, c-format
 msgid "Branch %s is being rebased at %s"
 msgstr "分支 %s 正被重定基底到 %s"
 
-#: builtin/branch.c:513
+#: builtin/branch.c
 #, c-format
 msgid "Branch %s is being bisected at %s"
 msgstr "分支 %s 正被二分搜尋於 %s"
 
-#: builtin/branch.c:530
+#: builtin/branch.c
 msgid "cannot copy the current branch while not on any."
 msgstr "無法複製目前分支因為不處於任何分支上。"
 
-#: builtin/branch.c:532
+#: builtin/branch.c
 msgid "cannot rename the current branch while not on any."
 msgstr "無法重新命名目前分支因為不處於任何分支上。"
 
-#: builtin/branch.c:543
+#: builtin/branch.c
 #, c-format
 msgid "Invalid branch name: '%s'"
 msgstr "無效的分支名：'%s'"
 
-#: builtin/branch.c:572
+#: builtin/branch.c
 msgid "Branch rename failed"
 msgstr "分支重新命名失敗"
 
-#: builtin/branch.c:574
+#: builtin/branch.c
 msgid "Branch copy failed"
 msgstr "分支複製失敗"
 
-#: builtin/branch.c:578
+#: builtin/branch.c
 #, c-format
 msgid "Created a copy of a misnamed branch '%s'"
 msgstr "已為錯誤命名的分支 '%s' 建立了一個副本"
 
-#: builtin/branch.c:581
+#: builtin/branch.c
 #, c-format
 msgid "Renamed a misnamed branch '%s' away"
 msgstr "已將錯誤命名的分支 '%s' 重新命名"
 
-#: builtin/branch.c:587
+#: builtin/branch.c
 #, c-format
 msgid "Branch renamed to %s, but HEAD is not updated!"
 msgstr "分支重新命名為 %s，但 HEAD 沒有更新！"
 
-#: builtin/branch.c:596
+#: builtin/branch.c
 msgid "Branch is renamed, but update of config-file failed"
 msgstr "分支被重新命名，但更新設定檔案失敗"
 
-#: builtin/branch.c:598
+#: builtin/branch.c
 msgid "Branch is copied, but update of config-file failed"
 msgstr "分支已複製，但更新設定檔案失敗"
 
-#: builtin/branch.c:614
+#: builtin/branch.c
 #, c-format
 msgid ""
 "Please edit the description for the branch\n"
@@ -11746,221 +3433,222 @@ msgstr ""
 "  %s\n"
 "以 '%c' 開頭的行將被過濾。\n"
 
-#: builtin/branch.c:651
+#: builtin/branch.c
 msgid "Generic options"
 msgstr "通用選項"
 
-#: builtin/branch.c:653
+#: builtin/branch.c
 msgid "show hash and subject, give twice for upstream branch"
 msgstr "顯示雜湊值和主題，若參數出現兩次則顯示上游分支"
 
-#: builtin/branch.c:654
+#: builtin/branch.c
 msgid "suppress informational messages"
 msgstr "不顯示訊息"
 
-#: builtin/branch.c:656 builtin/checkout.c:1571
-#: builtin/submodule--helper.c:3077
+#: builtin/branch.c builtin/checkout.c builtin/submodule--helper.c
 msgid "set branch tracking configuration"
 msgstr "設定分支追蹤設定"
 
-#: builtin/branch.c:659
+#: builtin/branch.c
 msgid "do not use"
 msgstr "不要使用"
 
-#: builtin/branch.c:661
+#: builtin/branch.c
 msgid "upstream"
 msgstr "上游"
 
-#: builtin/branch.c:661
+#: builtin/branch.c
 msgid "change the upstream info"
 msgstr "改變上游訊息"
 
-#: builtin/branch.c:662
+#: builtin/branch.c
 msgid "unset the upstream info"
 msgstr "取消上游資訊設定"
 
-#: builtin/branch.c:663
+#: builtin/branch.c
 msgid "use colored output"
 msgstr "使用彩色輸出"
 
-#: builtin/branch.c:664
+#: builtin/branch.c
 msgid "act on remote-tracking branches"
 msgstr "作用於遠端追蹤分支"
 
-#: builtin/branch.c:666 builtin/branch.c:668
+#: builtin/branch.c
 msgid "print only branches that contain the commit"
 msgstr "只列印包含該提交的分支"
 
-#: builtin/branch.c:667 builtin/branch.c:669
+#: builtin/branch.c
 msgid "print only branches that don't contain the commit"
 msgstr "只列印不包含該提交的分支"
 
-#: builtin/branch.c:672
+#: builtin/branch.c
 msgid "Specific git-branch actions:"
 msgstr "具體的 git-branch 動作："
 
-#: builtin/branch.c:673
+#: builtin/branch.c
 msgid "list both remote-tracking and local branches"
 msgstr "列出遠端追蹤及本機分支"
 
-#: builtin/branch.c:675
+#: builtin/branch.c
 msgid "delete fully merged branch"
 msgstr "刪除完全合併的分支"
 
-#: builtin/branch.c:676
+#: builtin/branch.c
 msgid "delete branch (even if not merged)"
 msgstr "刪除分支（即使沒有合併）"
 
-#: builtin/branch.c:677
+#: builtin/branch.c
 msgid "move/rename a branch and its reflog"
 msgstr "移動/重新命名一個分支，以及它的引用日誌"
 
-#: builtin/branch.c:678
+#: builtin/branch.c
 msgid "move/rename a branch, even if target exists"
 msgstr "移動/重新命名一個分支，即使目標已存在"
 
-#: builtin/branch.c:679
+#: builtin/branch.c
 msgid "copy a branch and its reflog"
 msgstr "複製分支及其引用日誌"
 
-#: builtin/branch.c:680
+#: builtin/branch.c
 msgid "copy a branch, even if target exists"
 msgstr "複製一個分支，即使目標已存在"
 
-#: builtin/branch.c:681
+#: builtin/branch.c
 msgid "list branch names"
 msgstr "列出分支名"
 
-#: builtin/branch.c:682
+#: builtin/branch.c
 msgid "show current branch name"
 msgstr "顯示目前分支名"
 
-#: builtin/branch.c:683 builtin/submodule--helper.c:3075
+#: builtin/branch.c builtin/submodule--helper.c
 msgid "create the branch's reflog"
 msgstr "建立分支的引用日誌"
 
-#: builtin/branch.c:685
+#: builtin/branch.c
 msgid "edit the description for the branch"
 msgstr "標記分支的描述"
 
-#: builtin/branch.c:686
+#: builtin/branch.c
 msgid "force creation, move/rename, deletion"
 msgstr "強制建立、移動/重新命名、刪除"
 
-#: builtin/branch.c:687
+#: builtin/branch.c
 msgid "print only branches that are merged"
 msgstr "只列印已經合併的分支"
 
-#: builtin/branch.c:688
+#: builtin/branch.c
 msgid "print only branches that are not merged"
 msgstr "只列印尚未合併的分支"
 
-#: builtin/branch.c:689
+#: builtin/branch.c
 msgid "list branches in columns"
 msgstr "以列的方式顯示分支"
 
-#: builtin/branch.c:691 builtin/for-each-ref.c:45 builtin/notes.c:413
-#: builtin/notes.c:416 builtin/notes.c:579 builtin/notes.c:582
-#: builtin/tag.c:476
+#: builtin/branch.c builtin/for-each-ref.c builtin/notes.c builtin/tag.c
 msgid "object"
 msgstr "物件"
 
-#: builtin/branch.c:692
+#: builtin/branch.c
 msgid "print only branches of the object"
 msgstr "只列印指向該物件的分支"
 
-#: builtin/branch.c:693 builtin/for-each-ref.c:51 builtin/tag.c:483
+#: builtin/branch.c builtin/for-each-ref.c builtin/tag.c
 msgid "sorting and filtering are case insensitive"
 msgstr "排序和過濾屬於大小寫不敏感"
 
-#: builtin/branch.c:694 builtin/ls-files.c:667
+#: builtin/branch.c builtin/ls-files.c
 msgid "recurse through submodules"
 msgstr "在子模組中遞迴"
 
-#: builtin/branch.c:695 builtin/for-each-ref.c:41 builtin/ls-tree.c:358
-#: builtin/tag.c:481 builtin/verify-tag.c:38
+#: builtin/branch.c builtin/for-each-ref.c builtin/ls-tree.c builtin/tag.c
+#: builtin/verify-tag.c
 msgid "format to use for the output"
 msgstr "輸出格式"
 
-#: builtin/branch.c:718 builtin/clone.c:684
+#: builtin/branch.c builtin/submodule--helper.c submodule.c
+msgid "Failed to resolve HEAD as a valid ref."
+msgstr "無法將 HEAD 解析為有效引用。"
+
+#: builtin/branch.c builtin/clone.c
 msgid "HEAD not found below refs/heads!"
 msgstr "HEAD 沒有位於 /refs/heads 之下！"
 
-#: builtin/branch.c:739
+#: builtin/branch.c
 msgid ""
 "branch with --recurse-submodules can only be used if submodule."
 "propagateBranches is enabled"
 msgstr ""
 "有 --recurse-submodules 的分支只能在啟用 submodule.propagateBranches 時使用"
 
-#: builtin/branch.c:741
+#: builtin/branch.c
 msgid "--recurse-submodules can only be used to create branches"
 msgstr "--recurse-submodules 只能用來建立分支"
 
-#: builtin/branch.c:770 builtin/branch.c:826 builtin/branch.c:835
+#: builtin/branch.c
 msgid "branch name required"
 msgstr "必須提供分支名"
 
-#: builtin/branch.c:802
+#: builtin/branch.c
 msgid "Cannot give description to detached HEAD"
 msgstr "不能向分離開頭指標提供描述"
 
-#: builtin/branch.c:807
+#: builtin/branch.c
 msgid "cannot edit description of more than one branch"
 msgstr "不能為一個以上的分支編輯描述"
 
-#: builtin/branch.c:814
+#: builtin/branch.c
 #, c-format
 msgid "No commit on branch '%s' yet."
 msgstr "分支 '%s' 尚無提交。"
 
-#: builtin/branch.c:817
+#: builtin/branch.c
 #, c-format
 msgid "No branch named '%s'."
 msgstr "沒有分支 '%s'。"
 
-#: builtin/branch.c:832
+#: builtin/branch.c
 msgid "too many branches for a copy operation"
 msgstr "為複製動作提供了太多的分支名"
 
-#: builtin/branch.c:841
+#: builtin/branch.c
 msgid "too many arguments for a rename operation"
 msgstr "為重新命名動作提供了太多的參數"
 
-#: builtin/branch.c:846
+#: builtin/branch.c
 msgid "too many arguments to set new upstream"
 msgstr "為設定新上游提供了太多的參數"
 
-#: builtin/branch.c:850
+#: builtin/branch.c
 #, 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:853 builtin/branch.c:873
+#: builtin/branch.c
 #, c-format
 msgid "no such branch '%s'"
 msgstr "沒有此分支 '%s'"
 
-#: builtin/branch.c:857
+#: builtin/branch.c
 #, c-format
 msgid "branch '%s' does not exist"
 msgstr "分支 '%s' 不存在"
 
-#: builtin/branch.c:867
+#: builtin/branch.c
 msgid "too many arguments to unset upstream"
 msgstr "為取消上游設定動作提供了太多的參數"
 
-#: builtin/branch.c:871
+#: builtin/branch.c
 msgid "could not unset upstream of HEAD when it does not point to any branch."
 msgstr "在 HEAD 的上游未指向任何分支時無法取消設定。"
 
-#: builtin/branch.c:877
+#: builtin/branch.c
 #, c-format
 msgid "Branch '%s' has no upstream information"
 msgstr "分支 '%s' 沒有上游訊息"
 
-#: builtin/branch.c:890
+#: builtin/branch.c
 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>?"
@@ -11968,39 +3656,39 @@ msgstr ""
 "'git branch' 的 -a 和 -r 選項不帶一個分支名。\n"
 "您是否想要使用：-a|-r --list <模式>？"
 
-#: builtin/branch.c:894
+#: builtin/branch.c
 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:16
+#: builtin/bugreport.c
 msgid "git version:\n"
 msgstr "git 版本：\n"
 
-#: builtin/bugreport.c:22
+#: builtin/bugreport.c
 #, c-format
 msgid "uname() failed with error '%s' (%d)\n"
 msgstr "uname() 失敗，錯誤：「%s」(%d)\n"
 
-#: builtin/bugreport.c:32
+#: builtin/bugreport.c
 msgid "compiler info: "
 msgstr "編譯器資訊： "
 
-#: builtin/bugreport.c:35
+#: builtin/bugreport.c
 msgid "libc info: "
 msgstr "libc 資訊： "
 
-#: builtin/bugreport.c:49
+#: builtin/bugreport.c
 msgid "not run from a git repository - no hooks to show\n"
 msgstr "不是從 git 版本庫執行 - 沒有可顯示的掛鉤\n"
 
-#: builtin/bugreport.c:62
+#: builtin/bugreport.c
 msgid "git bugreport [-o|--output-directory <file>] [-s|--suffix <format>]"
 msgstr "git bugreport [-o|--output-directory <檔案>] [-s|--suffix <格式>]"
 
-#: builtin/bugreport.c:69
+#: builtin/bugreport.c
 msgid ""
 "Thank you for filling out a Git bug report!\n"
 "Please answer the following questions to help us understand your issue.\n"
@@ -12034,144 +3722,149 @@ msgstr ""
 "請檢閱臭蟲報告下方的剩餘部分。\n"
 "您可刪除任何您不想分享的地方。\n"
 
-#: builtin/bugreport.c:108
+#: builtin/bugreport.c
 msgid "specify a destination for the bugreport file"
 msgstr "請指定 bugreport 檔案的目的地"
 
-#: builtin/bugreport.c:110
+#: builtin/bugreport.c
 msgid "specify a strftime format suffix for the filename"
 msgstr "請指定檔案名稱的 strftime 格式後綴"
 
-#: builtin/bugreport.c:132
+#: builtin/bugreport.c
 #, c-format
 msgid "could not create leading directories for '%s'"
 msgstr "無法建立 '%s' 的前置目錄"
 
-#: builtin/bugreport.c:139
+#: builtin/bugreport.c
 msgid "System Info"
 msgstr "系統資訊"
 
-#: builtin/bugreport.c:142
+#: builtin/bugreport.c
 msgid "Enabled Hooks"
 msgstr "啟用的掛鉤"
 
-#: builtin/bugreport.c:149
+#: builtin/bugreport.c
 #, c-format
 msgid "unable to write to %s"
 msgstr "無法寫入 %s"
 
-#: builtin/bugreport.c:159
+#: builtin/bugreport.c
 #, c-format
 msgid "Created new report at '%s'.\n"
 msgstr "已在「%s」建立新報告。\n"
 
-#: builtin/bundle.c:15 builtin/bundle.c:23
+#: builtin/bundle.c
 msgid "git bundle create [<options>] <file> <git-rev-list args>"
 msgstr "git bundle create [<選項>] <檔案> <git-rev-list 參數>"
 
-#: builtin/bundle.c:16 builtin/bundle.c:28
+#: builtin/bundle.c
 msgid "git bundle verify [<options>] <file>"
 msgstr "git bundle verify [<選項>] <檔案>"
 
-#: builtin/bundle.c:17 builtin/bundle.c:33
+#: builtin/bundle.c
 msgid "git bundle list-heads <file> [<refname>...]"
 msgstr "git bundle list-heads <檔案> [<引用名稱>...]"
 
-#: builtin/bundle.c:18 builtin/bundle.c:38
+#: builtin/bundle.c
 msgid "git bundle unbundle <file> [<refname>...]"
 msgstr "git bundle unbundle <檔案> [<引用名稱>...]"
 
-#: builtin/bundle.c:65 builtin/pack-objects.c:3899
+#: builtin/bundle.c builtin/pack-objects.c
 msgid "do not show progress meter"
 msgstr "不顯示進度表"
 
-#: builtin/bundle.c:67 builtin/bundle.c:168 builtin/pack-objects.c:3901
+#: builtin/bundle.c builtin/pack-objects.c
 msgid "show progress meter"
 msgstr "顯示進度表"
 
-#: builtin/bundle.c:69 builtin/pack-objects.c:3903
+#: builtin/bundle.c builtin/pack-objects.c
 msgid "show progress meter during object writing phase"
 msgstr "在物件寫入階段顯示進度表"
 
-#: builtin/bundle.c:72 builtin/pack-objects.c:3906
+#: builtin/bundle.c builtin/pack-objects.c
 msgid "similar to --all-progress when progress meter is shown"
 msgstr "當進度表顯示時類似於 --all-progress"
 
-#: builtin/bundle.c:74
+#: builtin/bundle.c
 msgid "specify bundle format version"
 msgstr "指定套件的格式版本"
 
-#: builtin/bundle.c:94
+#: builtin/bundle.c
 msgid "Need a repository to create a bundle."
 msgstr "需要版本庫來建立套件。"
 
-#: builtin/bundle.c:108
+#: builtin/bundle.c
 msgid "do not show bundle details"
 msgstr "不顯示套件詳細資訊"
 
-#: builtin/bundle.c:127
+#: builtin/bundle.c
 #, c-format
 msgid "%s is okay\n"
 msgstr "%s 可以\n"
 
-#: builtin/bundle.c:183
+#: builtin/bundle.c
 msgid "Need a repository to unbundle."
 msgstr "需要版本庫才能拆分套件。"
 
-#: builtin/bundle.c:186
+#: builtin/bundle.c
 msgid "Unbundling objects"
 msgstr "正在解包物件"
 
-#: builtin/bundle.c:220 builtin/remote.c:1758
+#: builtin/bundle.c builtin/remote.c
 #, c-format
 msgid "Unknown subcommand: %s"
 msgstr "未知子指令：%s"
 
-#: builtin/cat-file.c:568
+#: builtin/cat-file.c merge-recursive.c
+#, c-format
+msgid "cannot read object %s '%s'"
+msgstr "不能讀取物件 %s '%s'"
+
+#: builtin/cat-file.c
 msgid "flush is only for --buffer mode"
 msgstr "排清功能只能用於 --buffer 模式"
 
-#: builtin/cat-file.c:612
+#: builtin/cat-file.c
 msgid "empty command in input"
 msgstr "輸入中沒有命令"
 
-#: builtin/cat-file.c:614
+#: builtin/cat-file.c
 #, c-format
 msgid "whitespace before command: '%s'"
 msgstr "命令前空格：「%s」"
 
-#: builtin/cat-file.c:623
+#: builtin/cat-file.c
 #, c-format
 msgid "%s requires arguments"
 msgstr "%s 需要引數"
 
-#: builtin/cat-file.c:628
+#: builtin/cat-file.c
 #, c-format
 msgid "%s takes no arguments"
 msgstr "%s 不取引數"
 
-#: builtin/cat-file.c:636
+#: builtin/cat-file.c
 #, c-format
 msgid "unknown command: '%s'"
 msgstr "未知命令：「%s」"
 
-#: builtin/cat-file.c:795
+#: builtin/cat-file.c
 msgid "only one batch option may be specified"
 msgstr "只能指定一個批次處理選項"
 
-#: builtin/cat-file.c:824
+#: builtin/cat-file.c
 msgid "git cat-file <type> <object>"
 msgstr "git cat-file <type> <object>"
 
-#: builtin/cat-file.c:825
+#: builtin/cat-file.c
 msgid "git cat-file (-e | -p) <object>"
 msgstr "git cat-file (-e | -p) <object>"
 
-#: builtin/cat-file.c:826
+#: builtin/cat-file.c
 msgid "git cat-file (-t | -s) [--allow-unknown-type] <object>"
 msgstr "git cat-file (-t | -s) [--allow-unknown-type] <object>"
 
-#: builtin/cat-file.c:827
+#: builtin/cat-file.c
 msgid ""
 "git cat-file (--batch | --batch-check | --batch-command) [--batch-all-"
 "objects]\n"
@@ -12183,7 +3876,7 @@ msgstr ""
 "             [--buffer] [--follow-symlinks] [--unordered]\n"
 "             [--textconv | --filters]"
 
-#: builtin/cat-file.c:830
+#: builtin/cat-file.c
 msgid ""
 "git cat-file (--textconv | --filters)\n"
 "             [<rev>:<path|tree-ish> | --path=<path|tree-ish> <rev>]"
@@ -12191,376 +3884,368 @@ msgstr ""
 "git cat-file (--textconv | --filters)\n"
 "             [<rev>:<path|tree-ish> | --path=<path|tree-ish> <rev>]"
 
-#: builtin/cat-file.c:836
+#: builtin/cat-file.c
 msgid "Check object existence or emit object contents"
 msgstr "檢查物件的存在狀態，或輸出物件內容"
 
-#: builtin/cat-file.c:838
+#: builtin/cat-file.c
 msgid "check if <object> exists"
 msgstr "檢查 <object> 是否存在"
 
-#: builtin/cat-file.c:839
+#: builtin/cat-file.c
 msgid "pretty-print <object> content"
 msgstr "美化輸出 <object> 的內容"
 
-#: builtin/cat-file.c:841
+#: builtin/cat-file.c
 msgid "Emit [broken] object attributes"
 msgstr "輸出 [損壞的] 物件屬性"
 
-#: builtin/cat-file.c:842
+#: builtin/cat-file.c
 msgid "show object type (one of 'blob', 'tree', 'commit', 'tag', ...)"
 msgstr "顯示物件類型（可以是 “blob”、“tree”、“commit”、“tag” 等其中一個）"
 
-#: builtin/cat-file.c:843
+#: builtin/cat-file.c
 msgid "show object size"
 msgstr "顯示物件大小"
 
-#: builtin/cat-file.c:845
+#: builtin/cat-file.c
 msgid "allow -s and -t to work with broken/corrupt objects"
 msgstr "允許 -s 和 -t 對損壞的物件生效"
 
-#: builtin/cat-file.c:847
+#: builtin/cat-file.c
 msgid "Batch objects requested on stdin (or --batch-all-objects)"
 msgstr "批次處理 stdin 上請求的物件（或 --batch-all-objects）"
 
-#: builtin/cat-file.c:849
+#: builtin/cat-file.c
 msgid "show full <object> or <rev> contents"
 msgstr "顯示完整的 <object> 或 <rev> 內容"
 
-#: builtin/cat-file.c:853
+#: builtin/cat-file.c
 msgid "like --batch, but don't emit <contents>"
 msgstr "類似 --batch 但不輸出 <contents>"
 
-#: builtin/cat-file.c:857
+#: builtin/cat-file.c
 msgid "read commands from stdin"
 msgstr "從標準輸入讀取命令"
 
-#: builtin/cat-file.c:861
+#: builtin/cat-file.c
 msgid "with --batch[-check]: ignores stdin, batches all known objects"
 msgstr "傳入 --batch[-check]：忽略標準輸入，批次處理所有已知物件"
 
-#: builtin/cat-file.c:863
+#: builtin/cat-file.c
 msgid "Change or optimize batch output"
 msgstr "變更或最佳化批次處理的輸出"
 
-#: builtin/cat-file.c:864
+#: builtin/cat-file.c
 msgid "buffer --batch output"
 msgstr "緩衝 --batch 的輸出"
 
-#: builtin/cat-file.c:866
+#: builtin/cat-file.c
 msgid "follow in-tree symlinks"
 msgstr "追蹤樹中的符號連結"
 
-#: builtin/cat-file.c:868
+#: builtin/cat-file.c
 msgid "do not order objects before emitting them"
 msgstr "不要在輸出物件前排序"
 
-#: builtin/cat-file.c:870
+#: builtin/cat-file.c
 msgid ""
 "Emit object (blob or tree) with conversion or filter (stand-alone, or with "
 "batch)"
 msgstr "轉換或過濾後輸出物件（blob 或樹）（單獨或批次處理）"
 
-#: builtin/cat-file.c:872
+#: builtin/cat-file.c
 msgid "run textconv on object's content"
 msgstr "在物件內容執行 textconv"
 
-#: builtin/cat-file.c:874
+#: builtin/cat-file.c
 msgid "run filters on object's content"
 msgstr "在物件內容執行過濾器"
 
-#: builtin/cat-file.c:875
+#: builtin/cat-file.c
 msgid "blob|tree"
 msgstr "blob|tree"
 
-#: builtin/cat-file.c:876
+#: builtin/cat-file.c
 msgid "use a <path> for (--textconv | --filters); Not with 'batch'"
 msgstr "請在 (--textconv | --filters) 使用 <path>，而非 “batch”"
 
-#: builtin/cat-file.c:894
+#: builtin/cat-file.c
 #, c-format
 msgid "'%s=<%s>' needs '%s' or '%s'"
 msgstr "「%s=<%s>」需要「%s」或「%s」"
 
-#: builtin/cat-file.c:896
+#: builtin/cat-file.c
 msgid "path|tree-ish"
 msgstr "path|tree-ish"
 
-#: builtin/cat-file.c:903 builtin/cat-file.c:906 builtin/cat-file.c:909
+#: builtin/cat-file.c
 #, c-format
 msgid "'%s' requires a batch mode"
 msgstr "「%s」需要批次處理模式"
 
-#: builtin/cat-file.c:921
+#: builtin/cat-file.c
 #, c-format
 msgid "'-%c' is incompatible with batch mode"
 msgstr "「-%c」與批次處理模式不相容"
 
-#: builtin/cat-file.c:924
+#: builtin/cat-file.c
 msgid "batch modes take no arguments"
 msgstr "批次處理模式不取引數"
 
-#: builtin/cat-file.c:932 builtin/cat-file.c:935
+#: builtin/cat-file.c
 #, c-format
 msgid "<rev> required with '%s'"
 msgstr "<rev> 需要搭配「%s」"
 
-#: builtin/cat-file.c:938
+#: builtin/cat-file.c
 #, c-format
 msgid "<object> required with '-%c'"
 msgstr "<object> 需要搭配「-%c」"
 
-#: builtin/cat-file.c:943 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:965
-#: builtin/notes.c:987 builtin/prune-packed.c:25 builtin/receive-pack.c:2489
-#: builtin/tag.c:592
+#: builtin/cat-file.c builtin/notes.c builtin/prune-packed.c
+#: builtin/receive-pack.c builtin/tag.c
 msgid "too many arguments"
 msgstr "太多參數"
 
-#: builtin/cat-file.c:947
+#: builtin/cat-file.c
 #, c-format
 msgid "only two arguments allowed in <type> <object> mode, not %d"
 msgstr "只允許在 <type> <object> 模式傳入兩個引數，但傳了 %d 個"
 
-#: builtin/check-attr.c:13
+#: builtin/check-attr.c
 msgid "git check-attr [-a | --all | <attr>...] [--] <pathname>..."
 msgstr "git check-attr [-a | --all | <屬性>...] [--] <路徑名>..."
 
-#: builtin/check-attr.c:14
+#: builtin/check-attr.c
 msgid "git check-attr --stdin [-z] [-a | --all | <attr>...]"
 msgstr "git check-attr --stdin [-z] [-a | --all | <屬性>...]"
 
-#: builtin/check-attr.c:21
+#: builtin/check-attr.c
 msgid "report all attributes set on file"
 msgstr "報告設定在檔案上的所有屬性"
 
-#: builtin/check-attr.c:22
+#: builtin/check-attr.c
 msgid "use .gitattributes only from the index"
 msgstr "只使用索引中的 .gitattributes"
 
-#: builtin/check-attr.c:23 builtin/check-ignore.c:25 builtin/hash-object.c:101
+#: builtin/check-attr.c builtin/check-ignore.c builtin/hash-object.c
 msgid "read file names from stdin"
 msgstr "從標準輸入讀出檔案名"
 
-#: builtin/check-attr.c:25 builtin/check-ignore.c:27
+#: builtin/check-attr.c builtin/check-ignore.c
 msgid "terminate input and output records by a NUL character"
 msgstr "輸入和輸出的紀錄使用 NUL 字元終結"
 
-#: builtin/check-ignore.c:21 builtin/checkout.c:1550 builtin/gc.c:550
-#: builtin/worktree.c:565
+#: builtin/check-ignore.c builtin/checkout.c builtin/gc.c builtin/worktree.c
 msgid "suppress progress reporting"
 msgstr "不顯示進度報告"
 
-#: builtin/check-ignore.c:29
+#: builtin/check-ignore.c
 msgid "show non-matching input paths"
 msgstr "顯示未符合的輸入路徑"
 
-#: builtin/check-ignore.c:31
+#: builtin/check-ignore.c
 msgid "ignore index when checking"
 msgstr "檢查時忽略索引"
 
-#: builtin/check-ignore.c:165
+#: builtin/check-ignore.c
 msgid "cannot specify pathnames with --stdin"
 msgstr "不能同時指定路徑及 --stdin 參數"
 
-#: builtin/check-ignore.c:168
+#: builtin/check-ignore.c
 msgid "-z only makes sense with --stdin"
 msgstr "-z 需要和 --stdin 參數共用才有意義"
 
-#: builtin/check-ignore.c:170
+#: builtin/check-ignore.c
 msgid "no path specified"
 msgstr "未指定路徑"
 
-#: builtin/check-ignore.c:174
+#: builtin/check-ignore.c
 msgid "--quiet is only valid with a single pathname"
 msgstr "參數 --quiet 只在提供一個路徑名時有效"
 
-#: builtin/check-ignore.c:176
+#: builtin/check-ignore.c
 msgid "cannot have both --quiet and --verbose"
 msgstr "不能同時提供 --quiet 和 --verbose 參數"
 
-#: builtin/check-ignore.c:179
+#: builtin/check-ignore.c
 msgid "--non-matching is only valid with --verbose"
 msgstr "--non-matching 選項只在使用 --verbose 時有效"
 
-#: builtin/check-mailmap.c:9
+#: builtin/check-mailmap.c
 msgid "git check-mailmap [<options>] <contact>..."
 msgstr "git check-mailmap [<選項>] <聯繫位址>..."
 
-#: builtin/check-mailmap.c:14
+#: builtin/check-mailmap.c
 msgid "also read contacts from stdin"
 msgstr "還從標準輸入讀取聯繫位址"
 
-#: builtin/check-mailmap.c:25
+#: builtin/check-mailmap.c
 #, c-format
 msgid "unable to parse contact: %s"
 msgstr "不能解析聯繫位址：%s"
 
-#: builtin/check-mailmap.c:48
+#: builtin/check-mailmap.c
 msgid "no contacts specified"
 msgstr "未指定聯繫位址"
 
-#: builtin/checkout--worker.c:110
+#: builtin/checkout--worker.c
 msgid "git checkout--worker [<options>]"
 msgstr "git checkout--worker [<選項>]"
 
-#: builtin/checkout--worker.c:118 builtin/checkout-index.c:235
-#: builtin/column.c:31 builtin/column.c:32 builtin/submodule--helper.c:1878
-#: builtin/submodule--helper.c:1881 builtin/submodule--helper.c:1889
-#: builtin/submodule--helper.c:2716 builtin/worktree.c:563
-#: builtin/worktree.c:808
+#: builtin/checkout--worker.c builtin/checkout-index.c builtin/column.c
+#: builtin/submodule--helper.c builtin/worktree.c
 msgid "string"
 msgstr "字串"
 
-#: builtin/checkout--worker.c:119 builtin/checkout-index.c:236
+#: builtin/checkout--worker.c builtin/checkout-index.c
 msgid "when creating files, prepend <string>"
 msgstr "在建立檔案時，在前面加上 <字串>"
 
-#: builtin/checkout-index.c:184
+#: builtin/checkout-index.c
 msgid "git checkout-index [<options>] [--] [<file>...]"
 msgstr "git checkout-index [<選項>] [--] [<檔案>...]"
 
-#: builtin/checkout-index.c:201
+#: builtin/checkout-index.c
 msgid "stage should be between 1 and 3 or all"
 msgstr "索引值應該取值 1 到 3 或者 all"
 
-#: builtin/checkout-index.c:219
+#: builtin/checkout-index.c
 msgid "check out all files in the index"
 msgstr "簽出索引區的所有檔案"
 
-#: builtin/checkout-index.c:221
+#: builtin/checkout-index.c
 msgid "do not skip files with skip-worktree set"
 msgstr "設定 skip-worktree 時不略過檔案"
 
-#: builtin/checkout-index.c:222
+#: builtin/checkout-index.c
 msgid "force overwrite of existing files"
 msgstr "強制覆蓋現有的檔案"
 
-#: builtin/checkout-index.c:224
+#: builtin/checkout-index.c
 msgid "no warning for existing files and files not in index"
 msgstr "存在或不在索引中的檔案都沒有警告"
 
-#: builtin/checkout-index.c:226
+#: builtin/checkout-index.c
 msgid "don't checkout new files"
 msgstr "不簽出新檔案"
 
-#: builtin/checkout-index.c:228
+#: builtin/checkout-index.c
 msgid "update stat information in the index file"
 msgstr "更新索引中檔案的狀態訊息"
 
-#: builtin/checkout-index.c:232
+#: builtin/checkout-index.c
 msgid "read list of paths from the standard input"
 msgstr "從標準輸入讀取路徑列表"
 
-#: builtin/checkout-index.c:234
+#: builtin/checkout-index.c
 msgid "write the content to temporary files"
 msgstr "將內容寫入暫存檔"
 
-#: builtin/checkout-index.c:238
+#: builtin/checkout-index.c
 msgid "copy out the files from named stage"
 msgstr "從指定暫存區中拷出檔案"
 
-#: builtin/checkout.c:34
+#: builtin/checkout.c
 msgid "git checkout [<options>] <branch>"
 msgstr "git checkout [<選項>] <分支>"
 
-#: builtin/checkout.c:35
+#: builtin/checkout.c
 msgid "git checkout [<options>] [<branch>] -- <file>..."
 msgstr "git checkout [<選項>] [<分支>] -- <檔案>..."
 
-#: builtin/checkout.c:40
+#: builtin/checkout.c
 msgid "git switch [<options>] [<branch>]"
 msgstr "git switch [<選項>] [<分支>]"
 
-#: builtin/checkout.c:45
+#: builtin/checkout.c
 msgid "git restore [<options>] [--source=<branch>] <file>..."
 msgstr "git restore [<選項>] [--source=<分支>] <檔案>..."
 
-#: builtin/checkout.c:199 builtin/checkout.c:238
+#: builtin/checkout.c
 #, c-format
 msgid "path '%s' does not have our version"
 msgstr "路徑 '%s' 沒有我們的版本"
 
-#: builtin/checkout.c:201 builtin/checkout.c:240
+#: builtin/checkout.c
 #, c-format
 msgid "path '%s' does not have their version"
 msgstr "路徑 '%s' 沒有他們的版本"
 
-#: builtin/checkout.c:217
+#: builtin/checkout.c
 #, c-format
 msgid "path '%s' does not have all necessary versions"
 msgstr "路徑 '%s' 沒有全部必需的版本"
 
-#: builtin/checkout.c:271
+#: builtin/checkout.c
 #, c-format
 msgid "path '%s' does not have necessary versions"
 msgstr "路徑 '%s' 沒有必需的版本"
 
-#: builtin/checkout.c:291
+#: builtin/checkout.c
 #, c-format
 msgid "path '%s': cannot merge"
 msgstr "path '%s'：無法合併"
 
-#: builtin/checkout.c:307
+#: builtin/checkout.c
 #, c-format
 msgid "Unable to add merge result for '%s'"
 msgstr "無法為 '%s' 新增合併結果"
 
-#: builtin/checkout.c:424
+#: builtin/checkout.c
 #, c-format
 msgid "Recreated %d merge conflict"
 msgid_plural "Recreated %d merge conflicts"
 msgstr[0] "重新建立了 %d 個合併衝突"
 
-#: builtin/checkout.c:429
+#: builtin/checkout.c
 #, c-format
 msgid "Updated %d path from %s"
 msgid_plural "Updated %d paths from %s"
 msgstr[0] "從 %2$s 更新了 %1$d 個路徑"
 
-#: builtin/checkout.c:436
+#: builtin/checkout.c
 #, c-format
 msgid "Updated %d path from the index"
 msgid_plural "Updated %d paths from the index"
 msgstr[0] "從索引區更新了 %d 個路徑"
 
-#: builtin/checkout.c:459 builtin/checkout.c:462 builtin/checkout.c:465
-#: builtin/checkout.c:469
+#: builtin/checkout.c
 #, c-format
 msgid "'%s' cannot be used with updating paths"
 msgstr "'%s' 不能在更新路徑時使用"
 
-#: builtin/checkout.c:479
+#: builtin/checkout.c
 #, c-format
 msgid "Cannot update paths and switch to branch '%s' at the same time."
 msgstr "不能同時更新路徑並切換到分支'%s'。"
 
-#: builtin/checkout.c:483
+#: builtin/checkout.c
 #, c-format
 msgid "neither '%s' or '%s' is specified"
 msgstr "'%s' 或 '%s' 都沒有指定"
 
-#: builtin/checkout.c:487
+#: builtin/checkout.c
 #, c-format
 msgid "'%s' must be used when '%s' is not specified"
 msgstr "未指定 '%2$s' 時，必須使用 '%1$s'"
 
-#: builtin/checkout.c:492 builtin/checkout.c:497
+#: builtin/checkout.c
 #, c-format
 msgid "'%s' or '%s' cannot be used with %s"
 msgstr "'%s' 或 '%s' 不能和 %s 一起使用"
 
-#: builtin/checkout.c:571 builtin/checkout.c:578
+#: builtin/checkout.c
 #, c-format
 msgid "path '%s' is unmerged"
 msgstr "路徑 '%s' 未合併"
 
-#: builtin/checkout.c:753
+#: builtin/checkout.c
 msgid "you need to resolve your current index first"
 msgstr "您需要先解決目前索引的衝突"
 
-#: builtin/checkout.c:809
+#: builtin/checkout.c
 #, c-format
 msgid ""
 "cannot continue with staged changes in the following files:\n"
@@ -12569,51 +4254,51 @@ msgstr ""
 "不能繼續，下列檔案有暫存的修改：\n"
 "%s"
 
-#: builtin/checkout.c:902
+#: builtin/checkout.c
 #, c-format
 msgid "Can not do reflog for '%s': %s\n"
 msgstr "不能對 '%s' 執行 reflog 動作：%s\n"
 
-#: builtin/checkout.c:947
+#: builtin/checkout.c
 msgid "HEAD is now at"
 msgstr "HEAD 目前位於"
 
-#: builtin/checkout.c:951 builtin/clone.c:615 t/helper/test-fast-rebase.c:203
+#: builtin/checkout.c builtin/clone.c t/helper/test-fast-rebase.c
 msgid "unable to update HEAD"
 msgstr "不能更新 HEAD"
 
-#: builtin/checkout.c:955
+#: builtin/checkout.c
 #, c-format
 msgid "Reset branch '%s'\n"
 msgstr "重設分支 '%s'\n"
 
-#: builtin/checkout.c:958
+#: builtin/checkout.c
 #, c-format
 msgid "Already on '%s'\n"
 msgstr "已經位於 '%s'\n"
 
-#: builtin/checkout.c:962
+#: builtin/checkout.c
 #, c-format
 msgid "Switched to and reset branch '%s'\n"
 msgstr "切換並重設分支 '%s'\n"
 
-#: builtin/checkout.c:964 builtin/checkout.c:1398
+#: builtin/checkout.c
 #, c-format
 msgid "Switched to a new branch '%s'\n"
 msgstr "切換到一個新分支 '%s'\n"
 
-#: builtin/checkout.c:966
+#: builtin/checkout.c
 #, c-format
 msgid "Switched to branch '%s'\n"
 msgstr "切換到分支 '%s'\n"
 
 #  譯者：請維持前導空格
-#: builtin/checkout.c:1017
+#: builtin/checkout.c
 #, c-format
 msgid " ... and %d more.\n"
 msgstr " ... 及其它 %d 個。\n"
 
-#: builtin/checkout.c:1023
+#: builtin/checkout.c
 #, c-format
 msgid ""
 "Warning: you are leaving %d commit behind, not connected to\n"
@@ -12630,7 +4315,7 @@ msgstr[0] ""
 "\n"
 "%s\n"
 
-#: builtin/checkout.c:1042
+#: builtin/checkout.c
 #, c-format
 msgid ""
 "If you want to keep it by creating a new branch, this may be a good time\n"
@@ -12651,19 +4336,19 @@ msgstr[0] ""
 " git branch <新分支名> %s\n"
 "\n"
 
-#: builtin/checkout.c:1077
+#: builtin/checkout.c
 msgid "internal error in revision walk"
 msgstr "在版本遍歷時遇到內部錯誤"
 
-#: builtin/checkout.c:1081
+#: builtin/checkout.c
 msgid "Previous HEAD position was"
 msgstr "之前的 HEAD 位置是"
 
-#: builtin/checkout.c:1124 builtin/checkout.c:1393
+#: builtin/checkout.c
 msgid "You are on a branch yet to be born"
 msgstr "您位於一個尚未初始化的分支"
 
-#: builtin/checkout.c:1206
+#: builtin/checkout.c
 #, c-format
 msgid ""
 "'%s' could be both a local file and a tracking branch.\n"
@@ -12672,7 +4357,7 @@ msgstr ""
 "'%s' 既可以是一個本機檔案，也可以是一個追蹤分支。\n"
 "請使用 --（和可選的 --no-guess）來消除歧義"
 
-#: builtin/checkout.c:1213
+#: builtin/checkout.c
 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"
@@ -12691,56 +4376,56 @@ msgstr ""
 "如果您總是喜歡使用模糊的簡短分支名 <name>，而不喜歡如 'origin' 的遠端\n"
 "版本庫名，可以在設定中設定 checkout.defaultRemote=origin。"
 
-#: builtin/checkout.c:1223
+#: builtin/checkout.c
 #, c-format
 msgid "'%s' matched multiple (%d) remote tracking branches"
 msgstr "'%s' 符合多個 (%d) 遠端追蹤分支"
 
-#: builtin/checkout.c:1289
+#: builtin/checkout.c
 msgid "only one reference expected"
 msgstr "預期只有一個引用"
 
-#: builtin/checkout.c:1306
+#: builtin/checkout.c
 #, c-format
 msgid "only one reference expected, %d given."
 msgstr "應只有一個引用，卻提供了 %d 個。"
 
-#: builtin/checkout.c:1352 builtin/worktree.c:338 builtin/worktree.c:508
+#: builtin/checkout.c builtin/worktree.c
 #, c-format
 msgid "invalid reference: %s"
 msgstr "無效引用：%s"
 
-#: builtin/checkout.c:1365 builtin/checkout.c:1744
+#: builtin/checkout.c
 #, c-format
 msgid "reference is not a tree: %s"
 msgstr "引用不是一個樹：%s"
 
-#: builtin/checkout.c:1413
+#: builtin/checkout.c
 #, c-format
 msgid "a branch is expected, got tag '%s'"
 msgstr "期望一個分支，得到標籤 '%s'"
 
-#: builtin/checkout.c:1415
+#: builtin/checkout.c
 #, c-format
 msgid "a branch is expected, got remote branch '%s'"
 msgstr "期望一個分支，得到遠端分支 '%s'"
 
-#: builtin/checkout.c:1417 builtin/checkout.c:1426
+#: builtin/checkout.c
 #, c-format
 msgid "a branch is expected, got '%s'"
 msgstr "期望一個分支，得到 '%s'"
 
-#: builtin/checkout.c:1420
+#: builtin/checkout.c
 #, c-format
 msgid "a branch is expected, got commit '%s'"
 msgstr "期望一個分支，得到提交 '%s'"
 
-#: builtin/checkout.c:1429
+#: builtin/checkout.c
 msgid ""
 "If you want to detach HEAD at the commit, try again with the --detach option."
 msgstr "若您想要分離提交的 HEAD，請傳入 --detach 選項重試。"
 
-#: builtin/checkout.c:1442
+#: builtin/checkout.c
 msgid ""
 "cannot switch branch while merging\n"
 "Consider \"git merge --quit\" or \"git worktree add\"."
@@ -12748,7 +4433,7 @@ msgstr ""
 "不能在合併時切換分支\n"
 "考慮使用 \"git merge --quit\" 或 \"git worktree add\"。"
 
-#: builtin/checkout.c:1446
+#: builtin/checkout.c
 msgid ""
 "cannot switch branch in the middle of an am session\n"
 "Consider \"git am --quit\" or \"git worktree add\"."
@@ -12756,7 +4441,7 @@ msgstr ""
 "不能在 am 工作階段期間切換分支\n"
 "考慮使用 \"git am --quit\" 或 \"git worktree add\"。"
 
-#: builtin/checkout.c:1450
+#: builtin/checkout.c
 msgid ""
 "cannot switch branch while rebasing\n"
 "Consider \"git rebase --quit\" or \"git worktree add\"."
@@ -12764,7 +4449,7 @@ msgstr ""
 "不能在重定基底時切換分支\n"
 "考慮使用 \"git rebase --quit\" 或 \"git worktree add\"。"
 
-#: builtin/checkout.c:1454
+#: builtin/checkout.c
 msgid ""
 "cannot switch branch while cherry-picking\n"
 "Consider \"git cherry-pick --quit\" or \"git worktree add\"."
@@ -12772,7 +4457,7 @@ msgstr ""
 "不能在揀選時切換分支\n"
 "考慮使用 \"git cherry-pick --quit\" 或 \"git worktree add\"。"
 
-#: builtin/checkout.c:1458
+#: builtin/checkout.c
 msgid ""
 "cannot switch branch while reverting\n"
 "Consider \"git revert --quit\" or \"git worktree add\"."
@@ -12780,235 +4465,236 @@ msgstr ""
 "不能在還原時切換分支\n"
 "考慮使用 \"git revert --quit\" 或 \"git worktree add\"。"
 
-#: builtin/checkout.c:1462
+#: builtin/checkout.c
 msgid "you are switching branch while bisecting"
 msgstr "您在執行二分搜尋時切換分支"
 
-#: builtin/checkout.c:1469
+#: builtin/checkout.c
 msgid "paths cannot be used with switching branches"
 msgstr "路徑不能和切換分支同時使用"
 
-#: builtin/checkout.c:1472 builtin/checkout.c:1476 builtin/checkout.c:1480
+#: builtin/checkout.c
 #, c-format
 msgid "'%s' cannot be used with switching branches"
 msgstr "'%s' 不能和切換分支同時使用"
 
-#: builtin/checkout.c:1484 builtin/checkout.c:1487 builtin/checkout.c:1490
-#: builtin/checkout.c:1495 builtin/checkout.c:1500
+#: builtin/checkout.c
 #, c-format
 msgid "'%s' cannot be used with '%s'"
 msgstr "'%s' 不能和 '%s' 同時使用"
 
-#: builtin/checkout.c:1497
+#: builtin/checkout.c
 #, c-format
 msgid "'%s' cannot take <start-point>"
 msgstr "'%s' 不帶 <起始點>"
 
-#: builtin/checkout.c:1505
+#: builtin/checkout.c
 #, c-format
 msgid "Cannot switch branch to a non-commit '%s'"
 msgstr "不能切換分支到一個非提交 '%s'"
 
-#: builtin/checkout.c:1512
+#: builtin/checkout.c
 msgid "missing branch or commit argument"
 msgstr "缺少分支或提交參數"
 
-#: builtin/checkout.c:1555
+#: builtin/checkout.c
 msgid "perform a 3-way merge with the new branch"
 msgstr "和新的分支執行三方合併"
 
-#: builtin/checkout.c:1556 builtin/log.c:1844 parse-options.h:354
+#: builtin/checkout.c builtin/log.c parse-options.h
 msgid "style"
 msgstr "風格"
 
-#: builtin/checkout.c:1557
+#: builtin/checkout.c
 msgid "conflict style (merge, diff3, or zdiff3)"
 msgstr "衝突輸出風格（merge、diff3 或 zdiff3）"
 
-#: builtin/checkout.c:1569 builtin/worktree.c:560
+#: builtin/checkout.c builtin/worktree.c
 msgid "detach HEAD at named commit"
 msgstr "HEAD 從指定的提交分離"
 
-#: builtin/checkout.c:1574
+#: builtin/checkout.c
 msgid "force checkout (throw away local modifications)"
 msgstr "強制簽出（捨棄本機修改）"
 
-#: builtin/checkout.c:1576
+#: builtin/checkout.c
 msgid "new-branch"
 msgstr "新分支"
 
-#: builtin/checkout.c:1576
+#: builtin/checkout.c
 msgid "new unparented branch"
 msgstr "新的沒有父提交的分支"
 
-#: builtin/checkout.c:1578 builtin/merge.c:305
+#: builtin/checkout.c builtin/merge.c
 msgid "update ignored files (default)"
 msgstr "更新忽略的檔案（預設）"
 
-#: builtin/checkout.c:1581
+#: builtin/checkout.c
 msgid "do not check if another worktree is holding the given ref"
 msgstr "不檢查指定的引用是否被其他工作區所占用"
 
-#: builtin/checkout.c:1594
+#: builtin/checkout.c
 msgid "checkout our version for unmerged files"
 msgstr "對尚未合併的檔案簽出我們的版本"
 
-#: builtin/checkout.c:1597
+#: builtin/checkout.c
 msgid "checkout their version for unmerged files"
 msgstr "對尚未合併的檔案簽出他們的版本"
 
-#: builtin/checkout.c:1601
+#: builtin/checkout.c
 msgid "do not limit pathspecs to sparse entries only"
 msgstr "對路徑不做稀疏簽出的限制"
 
-#: builtin/checkout.c:1659
+#: builtin/checkout.c
 #, c-format
 msgid "options '-%c', '-%c', and '%s' cannot be used together"
 msgstr "「-%c」、「-%c」和「%s」選項不得同時使用"
 
-#: builtin/checkout.c:1700
+#: builtin/checkout.c
 msgid "--track needs a branch name"
 msgstr "--track 需要一個分支名"
 
-#: builtin/checkout.c:1705
+#: builtin/checkout.c
 #, c-format
 msgid "missing branch name; try -%c"
 msgstr "缺少分支名稱，請嘗試 -%c"
 
-#: builtin/checkout.c:1737
+#: builtin/checkout.c
 #, c-format
 msgid "could not resolve %s"
 msgstr "無法解析 %s"
 
-#: builtin/checkout.c:1753
+#: builtin/checkout.c
 msgid "invalid path specification"
 msgstr "無效的路徑規格"
 
-#: builtin/checkout.c:1760
+#: builtin/checkout.c
 #, c-format
 msgid "'%s' is not a commit and a branch '%s' cannot be created from it"
 msgstr "'%s' 不是一個提交，不能基於它建立分支 '%s'"
 
-#: builtin/checkout.c:1764
+#: builtin/checkout.c
 #, c-format
 msgid "git checkout: --detach does not take a path argument '%s'"
 msgstr "git checkout：--detach 不能接收路徑參數 '%s'"
 
-#: builtin/checkout.c:1789
+#: builtin/checkout.c
 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:1794
+#: builtin/checkout.c
 msgid "you must specify path(s) to restore"
 msgstr "您必須指定一個要復原的路徑"
 
-#: builtin/checkout.c:1819 builtin/checkout.c:1821 builtin/checkout.c:1873
-#: builtin/checkout.c:1875 builtin/clone.c:130 builtin/remote.c:171
-#: builtin/remote.c:173 builtin/submodule--helper.c:3038
-#: builtin/submodule--helper.c:3371 builtin/worktree.c:556
-#: builtin/worktree.c:558
+#: builtin/checkout.c builtin/clone.c builtin/remote.c
+#: builtin/submodule--helper.c builtin/worktree.c
 msgid "branch"
 msgstr "分支"
 
-#: builtin/checkout.c:1820
+#: builtin/checkout.c
 msgid "create and checkout a new branch"
 msgstr "建立並簽出一個新的分支"
 
-#: builtin/checkout.c:1822
+#: builtin/checkout.c
 msgid "create/reset and checkout a branch"
 msgstr "建立/重設並簽出一個分支"
 
-#: builtin/checkout.c:1823
+#: builtin/checkout.c
 msgid "create reflog for new branch"
 msgstr "為新的分支建立引用日誌"
 
-#: builtin/checkout.c:1825
+#: builtin/checkout.c
 msgid "second guess 'git checkout <no-such-branch>' (default)"
 msgstr "二次猜測 'git checkout <無此分支>'（預設）"
 
-#: builtin/checkout.c:1826
+#: builtin/checkout.c
 msgid "use overlay mode (default)"
 msgstr "使用疊加模式（預設）"
 
-#: builtin/checkout.c:1874
+#: builtin/checkout.c
 msgid "create and switch to a new branch"
 msgstr "建立並切換一個新分支"
 
-#: builtin/checkout.c:1876
+#: builtin/checkout.c
 msgid "create/reset and switch to a branch"
 msgstr "建立/重設並切換一個分支"
 
-#: builtin/checkout.c:1878
+#: builtin/checkout.c
 msgid "second guess 'git switch <no-such-branch>'"
 msgstr "二次猜測 'git switch <無此分支>'"
 
-#: builtin/checkout.c:1880
+#: builtin/checkout.c
 msgid "throw away local modifications"
 msgstr "捨棄本機修改"
 
-#: builtin/checkout.c:1916
+#: builtin/checkout.c
 msgid "which tree-ish to checkout from"
 msgstr "要簽出哪一個樹"
 
-#: builtin/checkout.c:1918
+#: builtin/checkout.c
 msgid "restore the index"
 msgstr "復原索引"
 
-#: builtin/checkout.c:1920
+#: builtin/checkout.c
 msgid "restore the working tree (default)"
 msgstr "復原工作區（預設）"
 
-#: builtin/checkout.c:1922
+#: builtin/checkout.c
 msgid "ignore unmerged entries"
 msgstr "忽略未合併條目"
 
-#: builtin/checkout.c:1923
+#: builtin/checkout.c
 msgid "use overlay mode"
 msgstr "使用疊加模式"
 
-#: builtin/clean.c:29
+#: builtin/clean.c
 msgid ""
 "git clean [-d] [-f] [-i] [-n] [-q] [-e <pattern>] [-x | -X] [--] <paths>..."
 msgstr ""
 "git clean [-d] [-f] [-i] [-n] [-q] [-e <模式>] [-x | -X] [--] <路徑>..."
 
-#: builtin/clean.c:33
+#: builtin/clean.c
 #, c-format
 msgid "Removing %s\n"
 msgstr "正刪除 %s\n"
 
-#: builtin/clean.c:34
+#: builtin/clean.c
 #, c-format
 msgid "Would remove %s\n"
 msgstr "將刪除 %s\n"
 
-#: builtin/clean.c:35
+#: builtin/clean.c
 #, c-format
 msgid "Skipping repository %s\n"
 msgstr "忽略版本庫 %s\n"
 
-#: builtin/clean.c:36
+#: builtin/clean.c
 #, c-format
 msgid "Would skip repository %s\n"
 msgstr "將忽略版本庫 %s\n"
 
-#: builtin/clean.c:38
+#: builtin/clean.c midx.c
+#, c-format
+msgid "failed to remove %s"
+msgstr "刪除 %s 失敗"
+
+#: builtin/clean.c
 #, c-format
 msgid "could not lstat %s\n"
 msgstr "不能對 %s 呼叫 lstat\n"
 
-#: builtin/clean.c:39
+#: builtin/clean.c
 msgid "Refusing to remove current working directory\n"
 msgstr "拒絕移除目前工作目錄\n"
 
-#: builtin/clean.c:40
+#: builtin/clean.c
 msgid "Would refuse to remove current working directory\n"
 msgstr "會拒絕移除目前的工作目錄\n"
 
-#: builtin/clean.c:326 git-add--interactive.perl:593
+#: builtin/clean.c git-add--interactive.perl
 #, c-format
 msgid ""
 "Prompt help:\n"
@@ -13021,7 +4707,7 @@ msgstr ""
 "foo        - 透過唯一前綴選擇一個選項\n"
 "           - （空）什麼也不選擇\n"
 
-#: builtin/clean.c:330 git-add--interactive.perl:602
+#: builtin/clean.c git-add--interactive.perl
 #, c-format
 msgid ""
 "Prompt help:\n"
@@ -13042,33 +4728,32 @@ msgstr ""
 "*          - 選擇所有選項\n"
 "           - （空）結束選擇\n"
 
-#: builtin/clean.c:545 git-add--interactive.perl:568
-#: git-add--interactive.perl:573
+#: builtin/clean.c git-add--interactive.perl
 #, c-format, perl-format
 msgid "Huh (%s)?\n"
 msgstr "嗯（%s）？\n"
 
-#: builtin/clean.c:685
+#: builtin/clean.c
 #, c-format
 msgid "Input ignore patterns>> "
 msgstr "輸入範本以排除條目>> "
 
-#: builtin/clean.c:719
+#: builtin/clean.c
 #, c-format
 msgid "WARNING: Cannot find items matched by: %s"
 msgstr "警告：無法找到和 %s 符合的條目"
 
-#: builtin/clean.c:740
+#: builtin/clean.c
 msgid "Select items to delete"
 msgstr "選擇要刪除的條目"
 
 #. TRANSLATORS: Make sure to keep [y/N] as is
-#: builtin/clean.c:781
+#: builtin/clean.c
 #, c-format
 msgid "Remove %s [y/N]? "
 msgstr "移除 %s [y/N]？ "
 
-#: builtin/clean.c:812
+#: builtin/clean.c
 msgid ""
 "clean               - start cleaning\n"
 "filter by pattern   - exclude items from deletion\n"
@@ -13086,274 +4771,272 @@ msgstr ""
 "help                - 顯示本協助\n"
 "?                   - 顯示如何在提示符下選擇的協助"
 
-#: builtin/clean.c:848
+#: builtin/clean.c
 msgid "Would remove the following item:"
 msgid_plural "Would remove the following items:"
 msgstr[0] "將刪除如下條目："
 
-#: builtin/clean.c:864
+#: builtin/clean.c
 msgid "No more files to clean, exiting."
 msgstr "沒有要清理的檔案，離開。"
 
-#: builtin/clean.c:926
+#: builtin/clean.c
 msgid "do not print names of files removed"
 msgstr "不列印刪除檔案的名稱"
 
-#: builtin/clean.c:928
+#: builtin/clean.c
 msgid "force"
 msgstr "強制"
 
-#: builtin/clean.c:929
+#: builtin/clean.c
 msgid "interactive cleaning"
 msgstr "互動式清除"
 
-#: builtin/clean.c:931
+#: builtin/clean.c
 msgid "remove whole directories"
 msgstr "刪除整個目錄"
 
-#: builtin/clean.c:932 builtin/describe.c:565 builtin/describe.c:567
-#: builtin/grep.c:938 builtin/log.c:185 builtin/log.c:187
-#: builtin/ls-files.c:651 builtin/name-rev.c:585 builtin/name-rev.c:587
-#: builtin/show-ref.c:179
+#: builtin/clean.c builtin/describe.c builtin/grep.c builtin/log.c
+#: builtin/ls-files.c builtin/name-rev.c builtin/show-ref.c
 msgid "pattern"
 msgstr "模式"
 
-#: builtin/clean.c:933
+#: builtin/clean.c
 msgid "add <pattern> to ignore rules"
 msgstr "新增 <模式> 到忽略規則"
 
-#: builtin/clean.c:934
+#: builtin/clean.c
 msgid "remove ignored files, too"
 msgstr "也刪除忽略的檔案"
 
-#: builtin/clean.c:936
+#: builtin/clean.c
 msgid "remove only ignored files"
 msgstr "只刪除忽略的檔案"
 
-#: builtin/clean.c:951
+#: builtin/clean.c
 msgid ""
 "clean.requireForce set to true and neither -i, -n, nor -f given; refusing to "
 "clean"
 msgstr ""
 "clean.requireForce 設定為 true 且未提供 -i、-n 或 -f 選項，拒絕執行清理動作"
 
-#: builtin/clean.c:954
+#: builtin/clean.c
 msgid ""
 "clean.requireForce defaults to true and neither -i, -n, nor -f given; "
 "refusing to clean"
 msgstr ""
 "clean.requireForce 預設為 true 且未提供 -i、-n 或 -f 選項，拒絕執行清理動作"
 
-#: builtin/clean.c:966
+#: builtin/clean.c
 msgid "-x and -X cannot be used together"
 msgstr "-x 和 -X 不能同時使用"
 
-#: builtin/clone.c:47
+#: builtin/clone.c
 msgid "git clone [<options>] [--] <repo> [<dir>]"
 msgstr "git clone [<選項>] [--] <版本庫> [<路徑>]"
 
-#: builtin/clone.c:100
+#: builtin/clone.c
 msgid "don't clone shallow repository"
 msgstr "不要複製淺版本庫"
 
-#: builtin/clone.c:102
+#: builtin/clone.c
 msgid "don't create a checkout"
 msgstr "不建立一個簽出"
 
-#: builtin/clone.c:103 builtin/clone.c:105 builtin/init-db.c:542
+#: builtin/clone.c builtin/init-db.c
 msgid "create a bare repository"
 msgstr "建立一個純版本庫"
 
-#: builtin/clone.c:107
+#: builtin/clone.c
 msgid "create a mirror repository (implies bare)"
 msgstr "建立一個鏡像版本庫（也是純版本庫）"
 
-#: builtin/clone.c:109
+#: builtin/clone.c
 msgid "to clone from a local repository"
 msgstr "從本機版本庫複製"
 
-#: builtin/clone.c:111
+#: builtin/clone.c
 msgid "don't use local hardlinks, always copy"
 msgstr "不使用本機硬連結，始終複製"
 
-#: builtin/clone.c:113
+#: builtin/clone.c
 msgid "setup as shared repository"
 msgstr "設定為共享版本庫"
 
-#: builtin/clone.c:115
+#: builtin/clone.c
 msgid "pathspec"
 msgstr "路徑規格"
 
-#: builtin/clone.c:115
+#: builtin/clone.c
 msgid "initialize submodules in the clone"
 msgstr "在複製時初始化子模組"
 
-#: builtin/clone.c:119
+#: builtin/clone.c
 msgid "number of submodules cloned in parallel"
 msgstr "並行複製的子模組數"
 
-#: builtin/clone.c:120 builtin/init-db.c:539
+#: builtin/clone.c builtin/init-db.c
 msgid "template-directory"
 msgstr "範本目錄"
 
-#: builtin/clone.c:121 builtin/init-db.c:540
+#: builtin/clone.c builtin/init-db.c
 msgid "directory from which templates will be used"
 msgstr "範本目錄將被使用"
 
-#: builtin/clone.c:123 builtin/clone.c:125 builtin/submodule--helper.c:1885
-#: builtin/submodule--helper.c:2719 builtin/submodule--helper.c:3378
+#: builtin/clone.c builtin/submodule--helper.c
 msgid "reference repository"
 msgstr "引用版本庫"
 
-#: builtin/clone.c:127 builtin/submodule--helper.c:1887
-#: builtin/submodule--helper.c:2721
+#: builtin/clone.c builtin/submodule--helper.c
 msgid "use --reference only while cloning"
 msgstr "僅在複製時參考 --reference 指向的本機版本庫"
 
-#: builtin/clone.c:128 builtin/column.c:27 builtin/fmt-merge-msg.c:27
-#: builtin/init-db.c:550 builtin/merge-file.c:48 builtin/merge.c:290
-#: builtin/pack-objects.c:3967 builtin/repack.c:669
-#: builtin/submodule--helper.c:3380 t/helper/test-simple-ipc.c:595
-#: t/helper/test-simple-ipc.c:597
+#: builtin/clone.c builtin/column.c builtin/fmt-merge-msg.c builtin/init-db.c
+#: builtin/merge-file.c builtin/merge.c builtin/pack-objects.c builtin/repack.c
+#: builtin/submodule--helper.c t/helper/test-simple-ipc.c
 msgid "name"
 msgstr "名稱"
 
-#: builtin/clone.c:129
+#: builtin/clone.c
 msgid "use <name> instead of 'origin' to track upstream"
 msgstr "使用 <名稱> 而不是 'origin' 去追蹤上游"
 
-#: builtin/clone.c:131
+#: builtin/clone.c
 msgid "checkout <branch> instead of the remote's HEAD"
 msgstr "簽出 <分支> 而不是遠端 HEAD"
 
-#: builtin/clone.c:133
+#: builtin/clone.c
 msgid "path to git-upload-pack on the remote"
 msgstr "遠端 git-upload-pack 路徑"
 
-#: builtin/clone.c:134 builtin/fetch.c:182 builtin/grep.c:877
-#: builtin/pull.c:212
+#: builtin/clone.c builtin/fetch.c builtin/grep.c builtin/pull.c
 msgid "depth"
 msgstr "深度"
 
-#: builtin/clone.c:135
+#: builtin/clone.c
 msgid "create a shallow clone of that depth"
 msgstr "建立一個指定深度的淺複製"
 
-#: builtin/clone.c:136 builtin/fetch.c:184 builtin/pack-objects.c:3956
-#: builtin/pull.c:215
+#: builtin/clone.c builtin/fetch.c builtin/pack-objects.c builtin/pull.c
 msgid "time"
 msgstr "時間"
 
-#: builtin/clone.c:137
+#: builtin/clone.c
 msgid "create a shallow clone since a specific time"
 msgstr "建立從指定時間到現在的淺複製"
 
-#: builtin/clone.c:138 builtin/fetch.c:186 builtin/fetch.c:212
-#: builtin/pull.c:218 builtin/pull.c:243 builtin/rebase.c:1050
+#: builtin/clone.c builtin/fetch.c builtin/pull.c builtin/rebase.c
 msgid "revision"
 msgstr "修訂版"
 
-#: builtin/clone.c:139 builtin/fetch.c:187 builtin/pull.c:219
+#: builtin/clone.c builtin/fetch.c builtin/pull.c
 msgid "deepen history of shallow clone, excluding rev"
 msgstr "取得更多淺複製的過去歷史記錄，除了特定版本"
 
-#: builtin/clone.c:141 builtin/submodule--helper.c:1897
-#: builtin/submodule--helper.c:2735
+#: builtin/clone.c builtin/submodule--helper.c
 msgid "clone only one branch, HEAD or --branch"
 msgstr "只複製一個分支、HEAD 或 --branch"
 
-#: builtin/clone.c:143
+#: builtin/clone.c
 msgid "don't clone any tags, and make later fetches not to follow them"
 msgstr "不要複製任何標籤，之後取得也不要追蹤這些標籤"
 
-#: builtin/clone.c:145
+#: builtin/clone.c
 msgid "any cloned submodules will be shallow"
 msgstr "子模組將以淺下載模式複製"
 
-#: builtin/clone.c:146 builtin/init-db.c:548
+#: builtin/clone.c builtin/init-db.c
 msgid "gitdir"
 msgstr "git目錄"
 
-#: builtin/clone.c:147 builtin/init-db.c:549
+#: builtin/clone.c builtin/init-db.c
 msgid "separate git dir from working tree"
 msgstr "git目錄和工作區分離"
 
-#: builtin/clone.c:148
+#: builtin/clone.c
 msgid "key=value"
 msgstr "key=value"
 
-#: builtin/clone.c:149
+#: builtin/clone.c
 msgid "set config inside the new repository"
 msgstr "在新版本庫中設定設定訊息"
 
-#: builtin/clone.c:151 builtin/fetch.c:207 builtin/ls-remote.c:77
-#: builtin/pull.c:234 builtin/push.c:575 builtin/send-pack.c:200
+#: builtin/clone.c builtin/fetch.c builtin/ls-remote.c builtin/pull.c
+#: builtin/push.c builtin/send-pack.c
 msgid "server-specific"
 msgstr "server-specific"
 
-#: builtin/clone.c:151 builtin/fetch.c:207 builtin/ls-remote.c:77
-#: builtin/pull.c:235 builtin/push.c:575 builtin/send-pack.c:201
+#: builtin/clone.c builtin/fetch.c builtin/ls-remote.c builtin/pull.c
+#: builtin/push.c builtin/send-pack.c
 msgid "option to transmit"
 msgstr "傳輸選項"
 
-#: builtin/clone.c:152 builtin/fetch.c:208 builtin/pull.c:238
-#: builtin/push.c:576
+#: builtin/clone.c builtin/fetch.c builtin/pull.c builtin/push.c
 msgid "use IPv4 addresses only"
 msgstr "只使用 IPv4 位址"
 
-#: builtin/clone.c:154 builtin/fetch.c:210 builtin/pull.c:241
-#: builtin/push.c:578
+#: builtin/clone.c builtin/fetch.c builtin/pull.c builtin/push.c
 msgid "use IPv6 addresses only"
 msgstr "只使用 IPv6 位址"
 
-#: builtin/clone.c:158
+#: builtin/clone.c
 msgid "apply partial clone filters to submodules"
 msgstr "將部分複製過濾器套用至子模組"
 
-#: builtin/clone.c:160
+#: builtin/clone.c
 msgid "any cloned submodules will use their remote-tracking branch"
 msgstr "任何複製的子模組都將使用它們的遠端追蹤分支"
 
-#: builtin/clone.c:162
+#: builtin/clone.c
 msgid "initialize sparse-checkout file to include only files at root"
 msgstr "初始化稀疏簽出檔案，只包含根目錄中的檔案"
 
-#: builtin/clone.c:237
+#: builtin/clone.c
 #, c-format
 msgid "info: Could not add alternate for '%s': %s\n"
 msgstr "info: 不能為 '%s' 新增一個備用：%s\n"
 
-#: builtin/clone.c:310
+#: builtin/clone.c builtin/diff.c builtin/rm.c grep.c setup.c
+#, c-format
+msgid "failed to stat '%s'"
+msgstr "對 '%s' 呼叫 stat 失敗"
+
+#: builtin/clone.c
 #, c-format
 msgid "%s exists and is not a directory"
 msgstr "%s 存在且不是一個目錄"
 
-#: builtin/clone.c:328
+#: builtin/clone.c
 #, c-format
 msgid "failed to start iterator over '%s'"
 msgstr "無法在 '%s' 上啟動疊代器"
 
-#: builtin/clone.c:359
+#: builtin/clone.c compat/precompose_utf8.c
+#, c-format
+msgid "failed to unlink '%s'"
+msgstr "刪除 '%s' 失敗"
+
+#: builtin/clone.c
 #, c-format
 msgid "failed to create link '%s'"
 msgstr "建立連結 '%s' 失敗"
 
-#: builtin/clone.c:363
+#: builtin/clone.c
 #, c-format
 msgid "failed to copy file to '%s'"
 msgstr "複製檔案至 '%s' 失敗"
 
-#: builtin/clone.c:368
+#: builtin/clone.c
 #, c-format
 msgid "failed to iterate over '%s'"
 msgstr "無法在 '%s' 上疊代"
 
-#: builtin/clone.c:395
+#: builtin/clone.c
 #, c-format
 msgid "done.\n"
 msgstr "完成。\n"
 
-#: builtin/clone.c:409
+#: builtin/clone.c
 msgid ""
 "Clone succeeded, but checkout failed.\n"
 "You can inspect what was checked out with 'git status'\n"
@@ -13363,191 +5046,198 @@ msgstr ""
 "您可以透過 'git status' 檢查哪些已被簽出，然後使用指令\n"
 "'git restore --source=HEAD :/' 重試\n"
 
-#: builtin/clone.c:486
+#: builtin/clone.c
 #, c-format
 msgid "Could not find remote branch %s to clone."
 msgstr "找不到要複製的遠端分支 %s。"
 
-#: builtin/clone.c:603
+#: builtin/clone.c fetch-pack.c
+msgid "remote did not send all necessary objects"
+msgstr "遠端沒有傳送所有必需的物件"
+
+#: builtin/clone.c
 #, c-format
 msgid "unable to update %s"
 msgstr "不能更新 %s"
 
-#: builtin/clone.c:651
+#: builtin/clone.c
 msgid "failed to initialize sparse-checkout"
 msgstr "無法初始化稀疏簽出"
 
-#: builtin/clone.c:674
+#: builtin/clone.c
 msgid "remote HEAD refers to nonexistent ref, unable to checkout.\n"
 msgstr "遠端 HEAD 指向一個不存在的引用，無法簽出。\n"
 
-#: builtin/clone.c:709
+#: builtin/clone.c
 msgid "unable to checkout working tree"
 msgstr "不能簽出工作區"
 
-#: builtin/clone.c:793
+#: builtin/clone.c
 msgid "unable to write parameters to config file"
 msgstr "無法將參數寫入設定檔案"
 
-#: builtin/clone.c:856
+#: builtin/clone.c
 msgid "cannot repack to clean up"
 msgstr "無法執行 repack 來清理"
 
-#: builtin/clone.c:858
+#: builtin/clone.c
 msgid "cannot unlink temporary alternates file"
 msgstr "無法刪除暫時的 alternates 檔案"
 
-#: builtin/clone.c:901
+#: builtin/clone.c
 msgid "Too many arguments."
 msgstr "太多參數。"
 
-#: builtin/clone.c:905 contrib/scalar/scalar.c:413
+#: builtin/clone.c contrib/scalar/scalar.c
 msgid "You must specify a repository to clone."
 msgstr "您必須指定要複製的版本庫。"
 
-#: builtin/clone.c:918
+#: builtin/clone.c
 #, c-format
 msgid "options '%s' and '%s %s' cannot be used together"
 msgstr "「%s」和「%s %s」選項不得同時使用"
 
-#: builtin/clone.c:935
+#: builtin/clone.c
 #, c-format
 msgid "repository '%s' does not exist"
 msgstr "版本庫 '%s' 不存在"
 
-#: builtin/clone.c:939 builtin/fetch.c:2176
+#: builtin/clone.c builtin/fetch.c
 #, c-format
 msgid "depth %s is not a positive number"
 msgstr "深度 %s 不是一個正數"
 
-#: builtin/clone.c:949
+#: builtin/clone.c
 #, c-format
 msgid "destination path '%s' already exists and is not an empty directory."
 msgstr "目的地路徑 '%s' 已經存在，並且不是一個空目錄。"
 
-#: builtin/clone.c:955
+#: builtin/clone.c
 #, c-format
 msgid "repository path '%s' already exists and is not an empty directory."
 msgstr "版本庫路徑 '%s' 已經存在，並且不是一個空目錄。"
 
-#: builtin/clone.c:969
+#: builtin/clone.c
 #, c-format
 msgid "working tree '%s' already exists."
 msgstr "工作區 '%s' 已經存在。"
 
-#: builtin/clone.c:984 builtin/clone.c:1005 builtin/difftool.c:256
-#: builtin/log.c:2037 builtin/worktree.c:350 builtin/worktree.c:382
+#: builtin/clone.c builtin/difftool.c builtin/log.c builtin/worktree.c
 #, c-format
 msgid "could not create leading directories of '%s'"
 msgstr "不能為 '%s' 建立先導目錄"
 
-#: builtin/clone.c:989
+#: builtin/clone.c
 #, c-format
 msgid "could not create work tree dir '%s'"
 msgstr "不能建立工作區目錄 '%s'"
 
-#: builtin/clone.c:1009
+#: builtin/clone.c
 #, c-format
 msgid "Cloning into bare repository '%s'...\n"
 msgstr "複製到純版本庫 '%s'...\n"
 
-#: builtin/clone.c:1011
+#: builtin/clone.c
 #, c-format
 msgid "Cloning into '%s'...\n"
 msgstr "正複製到 '%s'...\n"
 
-#: builtin/clone.c:1040
+#: builtin/clone.c
 msgid ""
 "clone --recursive is not compatible with both --reference and --reference-if-"
 "able"
 msgstr "clone --recursive 與 --reference 和 --reference-if-able 不相容"
 
-#: builtin/clone.c:1116 builtin/remote.c:201 builtin/remote.c:721
+#: builtin/clone.c builtin/remote.c
 #, c-format
 msgid "'%s' is not a valid remote name"
 msgstr "'%s' 不是一個有效的遠端名稱"
 
-#: builtin/clone.c:1157
+#: builtin/clone.c
 msgid "--depth is ignored in local clones; use file:// instead."
 msgstr "本機複製會忽略 --depth。請改用 file:// 通訊協定。"
 
-#: builtin/clone.c:1159
+#: builtin/clone.c
 msgid "--shallow-since is ignored in local clones; use file:// instead."
 msgstr "本機複製會忽略 --shallow-since。請改用 file:// 協定。"
 
-#: builtin/clone.c:1161
+#: builtin/clone.c
 msgid "--shallow-exclude is ignored in local clones; use file:// instead."
 msgstr "本機複製會忽略 --shallow-exclude。請改用 file:// 協定。"
 
-#: builtin/clone.c:1163
+#: builtin/clone.c
 msgid "--filter is ignored in local clones; use file:// instead."
 msgstr "本機複製會忽略 --filter。請改用 file:// 協定。"
 
-#: builtin/clone.c:1168
+#: builtin/clone.c fetch-pack.c
+msgid "source repository is shallow, reject to clone."
+msgstr "來源版本庫是淺版本庫 (shallow)。拒絕複製。"
+
+#: builtin/clone.c
 msgid "source repository is shallow, ignoring --local"
 msgstr "來源版本庫是淺複製，忽略 --local"
 
-#: builtin/clone.c:1173
+#: builtin/clone.c
 msgid "--local is ignored"
 msgstr "--local 被忽略"
 
-#: builtin/clone.c:1185
+#: builtin/clone.c
 msgid "cannot clone from filtered bundle"
 msgstr "無法從過濾後的套件複製"
 
-#: builtin/clone.c:1265 builtin/clone.c:1324
+#: builtin/clone.c
 msgid "remote transport reported error"
 msgstr "遠端傳輸回報錯誤"
 
-#: builtin/clone.c:1277 builtin/clone.c:1289
+#: builtin/clone.c
 #, c-format
 msgid "Remote branch %s not found in upstream %s"
 msgstr "遠端分支 %s 在上游 %s 未發現"
 
-#: builtin/clone.c:1292
+#: builtin/clone.c
 msgid "You appear to have cloned an empty repository."
 msgstr "您複製的版本庫似乎是空的。"
 
-#: builtin/column.c:10
+#: builtin/column.c
 msgid "git column [<options>]"
 msgstr "git column [<選項>]"
 
-#: builtin/column.c:27
+#: builtin/column.c
 msgid "lookup config vars"
 msgstr "尋找設定變數"
 
-#: builtin/column.c:28 builtin/column.c:29
+#: builtin/column.c
 msgid "layout to use"
 msgstr "要使用的配置"
 
-#: builtin/column.c:30
+#: builtin/column.c
 msgid "maximum width"
 msgstr "最大寬度"
 
-#: builtin/column.c:31
+#: builtin/column.c
 msgid "padding space on left border"
 msgstr "左邊框的填充空間"
 
-#: builtin/column.c:32
+#: builtin/column.c
 msgid "padding space on right border"
 msgstr "右邊框的填充空間"
 
-#: builtin/column.c:33
+#: builtin/column.c
 msgid "padding space between columns"
 msgstr "兩直行之間的填充空間"
 
-#: builtin/column.c:51
+#: builtin/column.c
 msgid "--command must be the first argument"
 msgstr "--command 必須是第一個參數"
 
-#: builtin/commit-graph.c:13
+#: builtin/commit-graph.c
 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:16
+#: builtin/commit-graph.c
 msgid ""
 "git commit-graph write [--object-dir <objdir>] [--append] [--"
 "split[=<strategy>]] [--reachable|--stdin-packs|--stdin-commits] [--changed-"
@@ -13557,92 +5247,97 @@ msgstr ""
 "split[=<strategy>]] [--reachable|--stdin-packs|--stdin-commits] [--changed-"
 "paths] [--[no-]max-new-filters <n>] [--[no-]progress] <split options>"
 
-#: builtin/commit-graph.c:51 builtin/fetch.c:196 builtin/log.c:1813
+#: builtin/commit-graph.c builtin/fetch.c builtin/log.c
 msgid "dir"
 msgstr "目錄"
 
-#: builtin/commit-graph.c:52
+#: builtin/commit-graph.c
 msgid "the object directory to store the graph"
 msgstr "儲存圖形的物件目錄"
 
-#: builtin/commit-graph.c:73
+#: builtin/commit-graph.c
 msgid "if the commit-graph is split, only verify the tip file"
 msgstr "如果提交圖形被分割，只驗證頭一個檔案"
 
-#: builtin/commit-graph.c:100
+#: builtin/commit-graph.c
 #, c-format
 msgid "Could not open commit-graph '%s'"
 msgstr "無法開啟提交圖形 '%s'"
 
-#: builtin/commit-graph.c:137
+#: builtin/commit-graph.c
 #, c-format
 msgid "unrecognized --split argument, %s"
 msgstr "無法識別的 --split 參數，%s"
 
-#: builtin/commit-graph.c:150
+#: builtin/commit-graph.c
 #, c-format
 msgid "unexpected non-hex object ID: %s"
 msgstr "非期望的非十六進位物件 ID：%s"
 
-#: builtin/commit-graph.c:155
+#: builtin/commit-graph.c
 #, c-format
 msgid "invalid object: %s"
 msgstr "物件無效：%s"
 
-#: builtin/commit-graph.c:205
+#: builtin/commit-graph.c parse-options-cb.c
+#, c-format
+msgid "option `%s' expects a numerical value"
+msgstr "選項 `%s' 期望一個數字值"
+
+#: builtin/commit-graph.c
 msgid "start walk at all refs"
 msgstr "開始遍歷所有引用"
 
-#: builtin/commit-graph.c:207
+#: builtin/commit-graph.c
 msgid "scan pack-indexes listed by stdin for commits"
 msgstr "從標準輸入中的包索引檔案列表中掃描提交"
 
-#: builtin/commit-graph.c:209
+#: builtin/commit-graph.c
 msgid "start walk at commits listed by stdin"
 msgstr "從標準輸入中的提交開始掃描"
 
-#: builtin/commit-graph.c:211
+#: builtin/commit-graph.c
 msgid "include all commits already in the commit-graph file"
 msgstr "包含 commit-graph 檔案中已有所有提交"
 
-#: builtin/commit-graph.c:213
+#: builtin/commit-graph.c
 msgid "enable computation for changed paths"
 msgstr "啟用已變更路徑的計算"
 
-#: builtin/commit-graph.c:215
+#: builtin/commit-graph.c
 msgid "allow writing an incremental commit-graph file"
 msgstr "允許寫一個增量提交圖形檔案"
 
-#: builtin/commit-graph.c:219
+#: builtin/commit-graph.c
 msgid "maximum number of commits in a non-base split commit-graph"
 msgstr "在非基本分割提交圖形中的最大提交數"
 
-#: builtin/commit-graph.c:221
+#: builtin/commit-graph.c
 msgid "maximum ratio between two levels of a split commit-graph"
 msgstr "一個分割提交圖形的兩個級別之間的最大比率"
 
-#: builtin/commit-graph.c:223
+#: builtin/commit-graph.c
 msgid "only expire files older than a given date-time"
 msgstr "只將舊於指定日期與時間的檔案設為過期"
 
-#: builtin/commit-graph.c:225
+#: builtin/commit-graph.c
 msgid "maximum number of changed-path Bloom filters to compute"
 msgstr "變更路徑的布隆過濾器要計算的最大量"
 
-#: builtin/commit-graph.c:251
+#: builtin/commit-graph.c
 msgid "use at most one of --reachable, --stdin-commits, or --stdin-packs"
 msgstr "不能同時使用 --reachable、--stdin-commits 或 --stdin-packs"
 
-#: builtin/commit-graph.c:282
+#: builtin/commit-graph.c
 msgid "Collecting commits from input"
 msgstr "正在從輸入收集提交"
 
-#: builtin/commit-graph.c:328 builtin/multi-pack-index.c:259
+#: builtin/commit-graph.c builtin/multi-pack-index.c
 #, c-format
 msgid "unrecognized subcommand: %s"
 msgstr "未識別的子指令：%s"
 
-#: builtin/commit-tree.c:18
+#: builtin/commit-tree.c
 msgid ""
 "git commit-tree [(-p <parent>)...] [-S[<keyid>]] [(-m <message>)...] [(-F "
 "<file>)...] <tree>"
@@ -13650,70 +5345,69 @@ msgstr ""
 "git commit-tree [(-p <父提交>)...] [-S[<keyid>]] [(-m <消息>)...] [(-F <檔案"
 ">)...] <樹>"
 
-#: builtin/commit-tree.c:31
+#: builtin/commit-tree.c
 #, c-format
 msgid "duplicate parent %s ignored"
 msgstr "忽略重複的父提交 %s"
 
-#: builtin/commit-tree.c:56 builtin/commit-tree.c:134 builtin/log.c:590
+#: builtin/commit-tree.c builtin/log.c
 #, c-format
 msgid "not a valid object name %s"
 msgstr "不是一個有效的物件名 %s"
 
-#: builtin/commit-tree.c:94
+#: builtin/commit-tree.c
 #, c-format
 msgid "git commit-tree: failed to read '%s'"
 msgstr "git commit-tree：無法讀取 '%s'"
 
-#: builtin/commit-tree.c:96
+#: builtin/commit-tree.c
 #, c-format
 msgid "git commit-tree: failed to close '%s'"
 msgstr "git commit-tree：無法關閉 '%s'"
 
-#: builtin/commit-tree.c:109
+#: builtin/commit-tree.c
 msgid "parent"
 msgstr "父提交"
 
-#: builtin/commit-tree.c:110
+#: builtin/commit-tree.c
 msgid "id of a parent commit object"
 msgstr "父提交物件 ID"
 
-#: builtin/commit-tree.c:112 builtin/commit.c:1626 builtin/merge.c:284
-#: builtin/notes.c:407 builtin/notes.c:573 builtin/stash.c:1666
-#: builtin/tag.c:455
+#: builtin/commit-tree.c builtin/commit.c builtin/merge.c builtin/notes.c
+#: builtin/stash.c builtin/tag.c
 msgid "message"
 msgstr "訊息"
 
-#: builtin/commit-tree.c:113 builtin/commit.c:1626
+#: builtin/commit-tree.c builtin/commit.c
 msgid "commit message"
 msgstr "提交說明"
 
-#: builtin/commit-tree.c:116
+#: builtin/commit-tree.c
 msgid "read commit log message from file"
 msgstr "從檔案中讀取提交說明"
 
-#: builtin/commit-tree.c:119 builtin/commit.c:1643 builtin/merge.c:303
-#: builtin/pull.c:180 builtin/revert.c:118
+#: builtin/commit-tree.c builtin/commit.c builtin/merge.c builtin/pull.c
+#: builtin/revert.c
 msgid "GPG sign commit"
 msgstr "GPG 提交簽名"
 
-#: builtin/commit-tree.c:131
+#: builtin/commit-tree.c
 msgid "must give exactly one tree"
 msgstr "必須精確地提供一個樹"
 
-#: builtin/commit-tree.c:138
+#: builtin/commit-tree.c
 msgid "git commit-tree: failed to read"
 msgstr "git commit-tree：讀取失敗"
 
-#: builtin/commit.c:43
+#: builtin/commit.c
 msgid "git commit [<options>] [--] <pathspec>..."
 msgstr "git commit [<選項>] [--] <路徑規格>..."
 
-#: builtin/commit.c:48
+#: builtin/commit.c
 msgid "git status [<options>] [--] <pathspec>..."
 msgstr "git status [<選項>] [--] <路徑規格>..."
 
-#: builtin/commit.c:53
+#: builtin/commit.c
 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"
@@ -13722,7 +5416,7 @@ msgstr ""
 "您要修補最近的提交，但這麼做會讓它成為空提交。您可以重複您的指令並帶上\n"
 "--allow-empty 選項，或者您可用指令 \"git reset HEAD^\" 整個刪除該提交。\n"
 
-#: builtin/commit.c:58
+#: builtin/commit.c
 msgid ""
 "The previous cherry-pick is now empty, possibly due to conflict resolution.\n"
 "If you wish to commit it anyway, use:\n"
@@ -13736,15 +5430,15 @@ msgstr ""
 "    git commit --allow-empty\n"
 "\n"
 
-#: builtin/commit.c:65
+#: builtin/commit.c
 msgid "Otherwise, please use 'git rebase --skip'\n"
 msgstr "否則，請使用 'git rebase --skip'\n"
 
-#: builtin/commit.c:68
+#: builtin/commit.c
 msgid "Otherwise, please use 'git cherry-pick --skip'\n"
 msgstr "否則，請使用 'git cherry-pick --skip'\n"
 
-#: builtin/commit.c:71
+#: builtin/commit.c
 msgid ""
 "and then use:\n"
 "\n"
@@ -13765,111 +5459,121 @@ msgstr ""
 "    git cherry-pick --skip\n"
 "\n"
 
-#: builtin/commit.c:326
+#: builtin/commit.c
 msgid "failed to unpack HEAD tree object"
 msgstr "解包 HEAD 樹狀物件失敗"
 
-#: builtin/commit.c:376
+#: builtin/commit.c
 msgid "No paths with --include/--only does not make sense."
 msgstr "參數 --include/--only 不跟路徑沒有意義。"
 
-#: builtin/commit.c:388
+#: builtin/commit.c
 msgid "unable to create temporary index"
 msgstr "不能建立暫時索引"
 
-#: builtin/commit.c:397
+#: builtin/commit.c
 msgid "interactive add failed"
 msgstr "互動式新增失敗"
 
-#: builtin/commit.c:412
+#: builtin/commit.c
 msgid "unable to update temporary index"
 msgstr "無法更新暫時索引"
 
-#: builtin/commit.c:414
+#: builtin/commit.c
 msgid "Failed to update main cache tree"
 msgstr "不能更新樹的主快取"
 
-#: builtin/commit.c:439 builtin/commit.c:462 builtin/commit.c:510
+#: builtin/commit.c
 msgid "unable to write new_index file"
 msgstr "無法寫 new_index 檔案"
 
-#: builtin/commit.c:491
+#: builtin/commit.c
 msgid "cannot do a partial commit during a merge."
 msgstr "在合併過程中不能做部分提交。"
 
-#: builtin/commit.c:493
+#: builtin/commit.c
 msgid "cannot do a partial commit during a cherry-pick."
 msgstr "在揀選過程中不能做部分提交。"
 
-#: builtin/commit.c:495
+#: builtin/commit.c
 msgid "cannot do a partial commit during a rebase."
 msgstr "在重定基底過程中不能做部分提交。"
 
-#: builtin/commit.c:503
+#: builtin/commit.c
 msgid "cannot read the index"
 msgstr "無法讀取索引"
 
-#: builtin/commit.c:522
+#: builtin/commit.c
 msgid "unable to write temporary index file"
 msgstr "無法寫暫時索引檔案"
 
-#: builtin/commit.c:620
+#: builtin/commit.c
 #, c-format
 msgid "commit '%s' lacks author header"
 msgstr "提交 '%s' 缺少作者訊息"
 
-#: builtin/commit.c:622
+#: builtin/commit.c
 #, c-format
 msgid "commit '%s' has malformed author line"
 msgstr "提交 '%s' 有格式錯誤的作者訊息"
 
-#: builtin/commit.c:641
+#: builtin/commit.c
 msgid "malformed --author parameter"
 msgstr "格式錯誤的 --author 參數"
 
-#: builtin/commit.c:694
+#: builtin/commit.c ident.c
+#, c-format
+msgid "invalid date format: %s"
+msgstr "無效的日期格式：%s"
+
+#: builtin/commit.c
 msgid ""
 "unable to select a comment character that is not used\n"
 "in the current commit message"
 msgstr "無法選擇一個未被目前提交說明使用的備註字元"
 
-#: builtin/commit.c:750 builtin/commit.c:784 builtin/commit.c:1170
+#: builtin/commit.c
 #, c-format
 msgid "could not lookup commit %s"
 msgstr "不能查詢提交 %s"
 
-#: builtin/commit.c:762 builtin/shortlog.c:417
+#: builtin/commit.c builtin/shortlog.c
 #, c-format
 msgid "(reading log message from standard input)\n"
 msgstr "（正從標準輸入中讀取日誌訊息）\n"
 
-#: builtin/commit.c:764
+#: builtin/commit.c
 msgid "could not read log from standard input"
 msgstr "不能從標準輸入中讀取日誌訊息"
 
-#: builtin/commit.c:768
+#: builtin/commit.c
 #, c-format
 msgid "could not read log file '%s'"
 msgstr "不能讀取日誌檔案 '%s'"
 
-#: builtin/commit.c:805
+#: builtin/commit.c
 #, c-format
 msgid "options '%s' and '%s:%s' cannot be used together"
 msgstr "「%s」和「%s:%s」選項不得同時使用"
 
-#: builtin/commit.c:817 builtin/commit.c:833
+#: builtin/commit.c
 msgid "could not read SQUASH_MSG"
 msgstr "不能讀取 SQUASH_MSG"
 
-#: builtin/commit.c:824
+#: builtin/commit.c
 msgid "could not read MERGE_MSG"
 msgstr "不能讀取 MERGE_MSG"
 
-#: builtin/commit.c:884
+#: builtin/commit.c bundle.c rerere.c sequencer.c
+#, c-format
+msgid "could not open '%s'"
+msgstr "不能開啟 '%s'"
+
+#: builtin/commit.c
 msgid "could not write commit template"
 msgstr "不能寫提交範本"
 
-#: builtin/commit.c:897
+#: builtin/commit.c
 #, c-format
 msgid ""
 "Please enter the commit message for your changes. Lines starting\n"
@@ -13878,7 +5582,7 @@ msgstr ""
 "請輸入描述您變更的提交訊息。\n"
 "開頭是「%c」的行皆會忽略。\n"
 
-#: builtin/commit.c:899
+#: builtin/commit.c
 #, c-format
 msgid ""
 "Please enter the commit message for your changes. Lines starting\n"
@@ -13887,7 +5591,7 @@ msgstr ""
 "請輸入描述您變更的提交訊息。開頭是「%c」\n"
 "的行皆會忽略。提交訊息空白則取消本次提交作業。\n"
 
-#: builtin/commit.c:903
+#: builtin/commit.c
 #, c-format
 msgid ""
 "Please enter the commit message for your changes. Lines starting\n"
@@ -13896,7 +5600,7 @@ msgstr ""
 "請輸入描述您變更的提交訊息。會保留開頭是「%c」\n"
 "的行，但也可以自己移除掉這些行。\n"
 
-#: builtin/commit.c:907
+#: builtin/commit.c
 #, c-format
 msgid ""
 "Please enter the commit message for your changes. Lines starting\n"
@@ -13907,7 +5611,7 @@ msgstr ""
 "「%c」的行，但也可以自己移除掉這些行。\n"
 "提交訊息空白則取消本次提交作業。\n"
 
-#: builtin/commit.c:919
+#: builtin/commit.c
 msgid ""
 "\n"
 "It looks like you may be committing a merge.\n"
@@ -13921,7 +5625,7 @@ msgstr ""
 "\tgit update-ref -d MERGE_HEAD\n"
 "後重試。\n"
 
-#: builtin/commit.c:924
+#: builtin/commit.c
 msgid ""
 "\n"
 "It looks like you may be committing a cherry-pick.\n"
@@ -13936,147 +5640,144 @@ msgstr ""
 "後重試。\n"
 
 #  譯者：為保證在輸出中對齊，注意調整句中空格！
-#: builtin/commit.c:951
+#: builtin/commit.c
 #, c-format
 msgid "%sAuthor:    %.*s <%.*s>"
 msgstr "%s作者：  %.*s <%.*s>"
 
 #  譯者：為保證在輸出中對齊，注意調整句中空格！
-#: builtin/commit.c:959
+#: builtin/commit.c
 #, c-format
 msgid "%sDate:      %s"
 msgstr "%s日期：  %s"
 
 #  譯者：為保證在輸出中對齊，注意調整句中空格！
-#: builtin/commit.c:966
+#: builtin/commit.c
 #, c-format
 msgid "%sCommitter: %.*s <%.*s>"
 msgstr "%s提交者：%.*s <%.*s>"
 
-#: builtin/commit.c:984
+#: builtin/commit.c
 msgid "Cannot read index"
 msgstr "無法讀取索引"
 
-#: builtin/commit.c:1029
+#: builtin/commit.c
 msgid "unable to pass trailers to --trailers"
 msgstr "無法將尾部署名傳遞至 --trailers"
 
-#: builtin/commit.c:1069
+#: builtin/commit.c
 msgid "Error building trees"
 msgstr "無法建立樹狀物件"
 
-#: builtin/commit.c:1083 builtin/tag.c:317
+#: builtin/commit.c builtin/tag.c
 #, c-format
 msgid "Please supply the message using either -m or -F option.\n"
 msgstr "請使用 -m 或 -F 選項提供提交說明。\n"
 
-#: builtin/commit.c:1128
+#: builtin/commit.c
 #, c-format
 msgid "--author '%s' is not 'Name <email>' and matches no existing author"
 msgstr "--author '%s' 不是 '姓名 <信箱>' 格式，且未能在現有作者中找到符合"
 
-#: builtin/commit.c:1142
+#: builtin/commit.c
 #, c-format
 msgid "Invalid ignored mode '%s'"
 msgstr "無效的忽略模式 '%s'"
 
-#: builtin/commit.c:1160 builtin/commit.c:1450
+#: builtin/commit.c
 #, c-format
 msgid "Invalid untracked files mode '%s'"
 msgstr "無效的未追蹤檔案參數 '%s'"
 
-#: builtin/commit.c:1231
+#: builtin/commit.c
 msgid "You are in the middle of a merge -- cannot reword."
 msgstr "正在合併中——不能重新輸入。"
 
-#: builtin/commit.c:1233
+#: builtin/commit.c
 msgid "You are in the middle of a cherry-pick -- cannot reword."
 msgstr "正在揀選中——不能重新輸入。"
 
-#: builtin/commit.c:1236
+#: builtin/commit.c
 #, c-format
 msgid "reword option of '%s' and path '%s' cannot be used together"
 msgstr "「%s」的改寫選項和「%s」路徑不得同時使用"
 
-#: builtin/commit.c:1238
+#: builtin/commit.c
 #, c-format
 msgid "reword option of '%s' and '%s' cannot be used together"
 msgstr "「%s」的改寫選項和「%s」不得同時使用"
 
-#: builtin/commit.c:1263
+#: builtin/commit.c
 msgid "You have nothing to amend."
 msgstr "您沒有可修補的提交。"
 
-#: builtin/commit.c:1266
+#: builtin/commit.c
 msgid "You are in the middle of a merge -- cannot amend."
 msgstr "您正處於一個合併過程中 -- 無法修補提交。"
 
-#: builtin/commit.c:1268
+#: builtin/commit.c
 msgid "You are in the middle of a cherry-pick -- cannot amend."
 msgstr "您正處於一個揀選過程中 -- 無法修補提交。"
 
-#: builtin/commit.c:1270
+#: builtin/commit.c
 msgid "You are in the middle of a rebase -- cannot amend."
 msgstr "您正處於重定基底的過程中 -- 無法修訂。"
 
-#: builtin/commit.c:1290
+#: builtin/commit.c
 msgid "--reset-author can be used only with -C, -c or --amend."
 msgstr "--reset-author 只能和 -C、-c 或 --amend 同時使用。"
 
-#: builtin/commit.c:1337
+#: builtin/commit.c
 #, c-format
 msgid "unknown option: --fixup=%s:%s"
 msgstr "未知選項：--fixup=%s:%s"
 
-#: builtin/commit.c:1354
+#: builtin/commit.c
 #, c-format
 msgid "paths '%s ...' with -a does not make sense"
 msgstr "路徑 '%s ...' 和 -a 選項同時使用沒有意義"
 
-#: builtin/commit.c:1485 builtin/commit.c:1654
+#: builtin/commit.c
 msgid "show status concisely"
 msgstr "以簡潔的格式顯示狀態"
 
-#: builtin/commit.c:1487 builtin/commit.c:1656
+#: builtin/commit.c
 msgid "show branch information"
 msgstr "顯示分支訊息"
 
-#: builtin/commit.c:1489
+#: builtin/commit.c
 msgid "show stash information"
 msgstr "顯示儲藏區訊息"
 
-#: builtin/commit.c:1491 builtin/commit.c:1658
+#: builtin/commit.c
 msgid "compute full ahead/behind values"
 msgstr "計算完整的領先/落後值"
 
-#: builtin/commit.c:1493
+#: builtin/commit.c
 msgid "version"
 msgstr "版本"
 
-#: builtin/commit.c:1493 builtin/commit.c:1660 builtin/push.c:551
-#: builtin/worktree.c:765
+#: builtin/commit.c builtin/push.c builtin/worktree.c
 msgid "machine-readable output"
 msgstr "機器可讀的輸出"
 
-#: builtin/commit.c:1496 builtin/commit.c:1662
+#: builtin/commit.c
 msgid "show status in long format (default)"
 msgstr "以長格式顯示狀態（預設）"
 
-#: builtin/commit.c:1499 builtin/commit.c:1665
+#: builtin/commit.c
 msgid "terminate entries with NUL"
 msgstr "條目以 NUL 字元結尾"
 
-#: builtin/commit.c:1501 builtin/commit.c:1505 builtin/commit.c:1668
-#: builtin/fast-export.c:1172 builtin/fast-export.c:1175
-#: builtin/fast-export.c:1178 builtin/rebase.c:1139 parse-options.h:368
+#: builtin/commit.c builtin/fast-export.c builtin/rebase.c parse-options.h
 msgid "mode"
 msgstr "模式"
 
-#: builtin/commit.c:1502 builtin/commit.c:1668
+#: builtin/commit.c
 msgid "show untracked files, optional modes: all, normal, no. (Default: all)"
 msgstr "顯示未追蹤的檔案，「模式」的可選參數：all、normal、no。（預設值：all）"
 
-#: builtin/commit.c:1506
+#: builtin/commit.c
 msgid ""
 "show ignored files, optional modes: traditional, matching, no. (Default: "
 "traditional)"
@@ -14084,201 +5785,204 @@ msgstr ""
 "顯示已忽略的檔案，可選模式：traditional、matching、no。（預設值："
 "traditional）"
 
-#: builtin/commit.c:1508 parse-options.h:197
+#: builtin/commit.c parse-options.h
 msgid "when"
 msgstr "何時"
 
-#: builtin/commit.c:1509
+#: builtin/commit.c
 msgid ""
 "ignore changes to submodules, optional when: all, dirty, untracked. "
 "(Default: all)"
 msgstr ""
 "忽略子模組的更改，「何時」的可選參數：all、dirty、untracked。（預設值：all）"
 
-#: builtin/commit.c:1511
+#: builtin/commit.c
 msgid "list untracked files in columns"
 msgstr "以列的方式顯示未追蹤的檔案"
 
-#: builtin/commit.c:1512
+#: builtin/commit.c
 msgid "do not detect renames"
 msgstr "不檢測重新命名"
 
-#: builtin/commit.c:1514
+#: builtin/commit.c
 msgid "detect renames, optionally set similarity index"
 msgstr "檢測重新命名，可以設定索引相似度"
 
-#: builtin/commit.c:1537
+#: builtin/commit.c
 msgid "Unsupported combination of ignored and untracked-files arguments"
 msgstr "不支援已忽略和未追蹤檔案參數的組合"
 
-#: builtin/commit.c:1619
+#: builtin/commit.c
 msgid "suppress summary after successful commit"
 msgstr "提交成功後不顯示概述訊息"
 
-#: builtin/commit.c:1620
+#: builtin/commit.c
 msgid "show diff in commit message template"
 msgstr "在提交說明範本裡顯示差異"
 
-#: builtin/commit.c:1622
+#: builtin/commit.c
 msgid "Commit message options"
 msgstr "提交說明選項"
 
-#: builtin/commit.c:1623 builtin/merge.c:288 builtin/tag.c:457
+#: builtin/commit.c builtin/merge.c builtin/tag.c
 msgid "read message from file"
 msgstr "從檔案中讀取提交說明"
 
-#: builtin/commit.c:1624
+#: builtin/commit.c
 msgid "author"
 msgstr "作者"
 
-#: builtin/commit.c:1624
+#: builtin/commit.c
 msgid "override author for commit"
 msgstr "提交時覆蓋作者"
 
-#: builtin/commit.c:1625 builtin/gc.c:551
+#: builtin/commit.c builtin/gc.c
 msgid "date"
 msgstr "日期"
 
-#: builtin/commit.c:1625
+#: builtin/commit.c
 msgid "override date for commit"
 msgstr "提交時覆蓋日期"
 
-#: builtin/commit.c:1627 builtin/commit.c:1628 builtin/commit.c:1634
-#: parse-options.h:360 ref-filter.h:89
+#: builtin/commit.c parse-options.h ref-filter.h
 msgid "commit"
 msgstr "提交"
 
-#: builtin/commit.c:1627
+#: builtin/commit.c
 msgid "reuse and edit message from specified commit"
 msgstr "重用並編輯指定提交的提交說明"
 
-#: builtin/commit.c:1628
+#: builtin/commit.c
 msgid "reuse message from specified commit"
 msgstr "重用指定提交的提交說明"
 
 #. TRANSLATORS: Leave "[(amend|reword):]" as-is,
 #. and only translate <commit>.
 #.
-#: builtin/commit.c:1633
+#: builtin/commit.c
 msgid "[(amend|reword):]commit"
 msgstr "[(amend|reword):]commit"
 
-#: builtin/commit.c:1633
+#: builtin/commit.c
 msgid ""
 "use autosquash formatted message to fixup or amend/reword specified commit"
 msgstr "使用 autosquash 格式化後的說明來 fixup 或是 amend/reword 指定提交"
 
-#: builtin/commit.c:1634
+#: builtin/commit.c
 msgid "use autosquash formatted message to squash specified commit"
 msgstr "使用 autosquash 格式的提交說明用以壓縮至指定的提交"
 
-#: builtin/commit.c:1635
+#: builtin/commit.c
 msgid "the commit is authored by me now (used with -C/-c/--amend)"
 msgstr "現在將該提交的作者改為我（和 -C/-c/--amend 參數共用）"
 
-#: builtin/commit.c:1636 builtin/interpret-trailers.c:111
+#: builtin/commit.c builtin/interpret-trailers.c
 msgid "trailer"
 msgstr "尾部署名"
 
-#: builtin/commit.c:1636
+#: builtin/commit.c
 msgid "add custom trailer(s)"
 msgstr "加入自訂尾部署名"
 
-#: builtin/commit.c:1637 builtin/log.c:1788 builtin/merge.c:306
-#: builtin/pull.c:146 builtin/revert.c:110
+#: builtin/commit.c builtin/log.c builtin/merge.c builtin/pull.c
+#: builtin/revert.c
 msgid "add a Signed-off-by trailer"
 msgstr "在結尾加入 Signed-off-by"
 
-#: builtin/commit.c:1638
+#: builtin/commit.c
 msgid "use specified template file"
 msgstr "使用指定的範本檔案"
 
-#: builtin/commit.c:1639
+#: builtin/commit.c
 msgid "force edit of commit"
 msgstr "強制編輯提交"
 
-#: builtin/commit.c:1641
+#: builtin/commit.c
 msgid "include status in commit message template"
 msgstr "在提交說明範本裡包含狀態訊息"
 
-#: builtin/commit.c:1646
+#: builtin/commit.c
 msgid "Commit contents options"
 msgstr "提交內容選項"
 
-#: builtin/commit.c:1647
+#: builtin/commit.c
 msgid "commit all changed files"
 msgstr "提交所有改動的檔案"
 
-#: builtin/commit.c:1648
+#: builtin/commit.c
 msgid "add specified files to index for commit"
 msgstr "新增指定的檔案到索引區等待提交"
 
-#: builtin/commit.c:1649
+#: builtin/commit.c
 msgid "interactively add files"
 msgstr "互動式新增檔案"
 
-#: builtin/commit.c:1650
+#: builtin/commit.c
 msgid "interactively add changes"
 msgstr "互動式新增變更"
 
-#: builtin/commit.c:1651
+#: builtin/commit.c
 msgid "commit only specified files"
 msgstr "只提交指定的檔案"
 
-#: builtin/commit.c:1652
+#: builtin/commit.c
 msgid "bypass pre-commit and commit-msg hooks"
 msgstr "繞過 pre-commit 和 commit-msg 掛鉤"
 
-#: builtin/commit.c:1653
+#: builtin/commit.c
 msgid "show what would be committed"
 msgstr "顯示將要提交的內容"
 
-#: builtin/commit.c:1666
+#: builtin/commit.c
 msgid "amend previous commit"
 msgstr "修改先前的提交"
 
-#: builtin/commit.c:1667
+#: builtin/commit.c
 msgid "bypass post-rewrite hook"
 msgstr "繞過 post-rewrite 掛鉤"
 
-#: builtin/commit.c:1674
+#: builtin/commit.c
 msgid "ok to record an empty change"
 msgstr "允許一個空提交"
 
-#: builtin/commit.c:1676
+#: builtin/commit.c
 msgid "ok to record a change with an empty message"
 msgstr "允許空的提交說明"
 
-#: builtin/commit.c:1752
+#: builtin/commit.c sequencer.c
+msgid "could not parse HEAD commit"
+msgstr "不能解析 HEAD 提交"
+
+#: builtin/commit.c
 #, c-format
 msgid "Corrupt MERGE_HEAD file (%s)"
 msgstr "損壞的 MERGE_HEAD 檔案（%s）"
 
-#: builtin/commit.c:1759
+#: builtin/commit.c
 msgid "could not read MERGE_MODE"
 msgstr "不能讀取 MERGE_MODE"
 
-#: builtin/commit.c:1780
+#: builtin/commit.c
 #, c-format
 msgid "could not read commit message: %s"
 msgstr "不能讀取提交說明：%s"
 
-#: builtin/commit.c:1787
+#: builtin/commit.c
 #, c-format
 msgid "Aborting commit due to empty commit message.\n"
 msgstr "終止提交因為提交說明為空。\n"
 
-#: builtin/commit.c:1792
+#: builtin/commit.c
 #, c-format
 msgid "Aborting commit; you did not edit the message.\n"
 msgstr "終止提交；您未更改來自範本的提交說明。\n"
 
-#: builtin/commit.c:1803
+#: builtin/commit.c
 #, c-format
 msgid "Aborting commit due to empty commit message body.\n"
 msgstr "提交說明內文空白，中止提交作業。\n"
 
-#: builtin/commit.c:1839
+#: builtin/commit.c
 msgid ""
 "repository has been updated, but unable to write\n"
 "new_index file. Check that disk is not full and quota is\n"
@@ -14287,227 +5991,232 @@ msgstr ""
 "版本庫已更新，但無法寫 new_index 檔案。檢查是否磁碟已滿或\n"
 "磁碟配額已耗盡，然後執行 \"git restore --staged :/\" 復原。"
 
-#: builtin/config.c:11
+#: builtin/config.c
 msgid "git config [<options>]"
 msgstr "git config [<選項>]"
 
-#: builtin/config.c:109 builtin/env--helper.c:27
+#: builtin/config.c builtin/env--helper.c
 #, c-format
 msgid "unrecognized --type argument, %s"
 msgstr "無法識別的 --type 參數，%s"
 
-#: builtin/config.c:121
+#: builtin/config.c
 msgid "only one type at a time"
 msgstr "一次只能一個類型"
 
-#: builtin/config.c:130
+#: builtin/config.c
 msgid "Config file location"
 msgstr "設定檔案位置"
 
-#: builtin/config.c:131
+#: builtin/config.c
 msgid "use global config file"
 msgstr "使用全域設定檔案"
 
-#: builtin/config.c:132
+#: builtin/config.c
 msgid "use system config file"
 msgstr "使用系統級設定檔案"
 
-#: builtin/config.c:133
+#: builtin/config.c
 msgid "use repository config file"
 msgstr "使用版本庫級設定檔案"
 
-#: builtin/config.c:134
+#: builtin/config.c
 msgid "use per-worktree config file"
 msgstr "使用工作區級別的設定檔案"
 
-#: builtin/config.c:135
+#: builtin/config.c
 msgid "use given config file"
 msgstr "使用指定的設定檔案"
 
-#: builtin/config.c:136
+#: builtin/config.c
 msgid "blob-id"
 msgstr "資料物件 ID"
 
-#: builtin/config.c:136
+#: builtin/config.c
 msgid "read config from given blob object"
 msgstr "從提供的資料物件讀取設定"
 
-#: builtin/config.c:137
+#: builtin/config.c
 msgid "Action"
 msgstr "動作"
 
-#: builtin/config.c:138
+#: builtin/config.c
 msgid "get value: name [value-pattern]"
 msgstr "取得值：name [value-pattern]"
 
-#: builtin/config.c:139
+#: builtin/config.c
 msgid "get all values: key [value-pattern]"
 msgstr "取得所有值：key [value-pattern]"
 
-#: builtin/config.c:140
+#: builtin/config.c
 msgid "get values for regexp: name-regex [value-pattern]"
 msgstr "根據常規表示式取得值：name-regex [value-pattern]"
 
-#: builtin/config.c:141
+#: builtin/config.c
 msgid "get value specific for the URL: section[.var] URL"
 msgstr "獲得 URL 取值：section[.var] URL"
 
-#: builtin/config.c:142
+#: builtin/config.c
 msgid "replace all matching variables: name value [value-pattern]"
 msgstr "取代所有符合的變數：name value [value-pattern]"
 
-#: builtin/config.c:143
+#: builtin/config.c
 msgid "add a new variable: name value"
 msgstr "新增一個新的變數：name value"
 
-#: builtin/config.c:144
+#: builtin/config.c
 msgid "remove a variable: name [value-pattern]"
 msgstr "移除一個變數：name [value-pattern]"
 
-#: builtin/config.c:145
+#: builtin/config.c
 msgid "remove all matches: name [value-pattern]"
 msgstr "移除所有符合項目：name [value-pattern]"
 
-#: builtin/config.c:146
+#: builtin/config.c
 msgid "rename section: old-name new-name"
 msgstr "重新命名小節：old-name new-name"
 
-#: builtin/config.c:147
+#: builtin/config.c
 msgid "remove a section: name"
 msgstr "刪除一個小節：name"
 
-#: builtin/config.c:148
+#: builtin/config.c
 msgid "list all"
 msgstr "全部列出"
 
-#: builtin/config.c:149
+#: builtin/config.c
 msgid "use string equality when comparing values to 'value-pattern'"
 msgstr "比較「value-pattern」的值時，使用字串相等比較"
 
-#: builtin/config.c:150
+#: builtin/config.c
 msgid "open an editor"
 msgstr "開啟一個編輯器"
 
-#: builtin/config.c:151
+#: builtin/config.c
 msgid "find the color configured: slot [default]"
 msgstr "獲得設定的顏色：設定 [預設]"
 
-#: builtin/config.c:152
+#: builtin/config.c
 msgid "find the color setting: slot [stdout-is-tty]"
 msgstr "獲得顏色設定：設定 [stdout-is-tty]"
 
-#: builtin/config.c:153
+#: builtin/config.c
 msgid "Type"
 msgstr "類型"
 
-#: builtin/config.c:154 builtin/env--helper.c:42 builtin/hash-object.c:97
+#: builtin/config.c builtin/env--helper.c builtin/hash-object.c
 msgid "type"
 msgstr "類型"
 
-#: builtin/config.c:154 builtin/env--helper.c:43
+#: builtin/config.c builtin/env--helper.c
 msgid "value is given this type"
 msgstr "取值為該類型"
 
-#: builtin/config.c:155
+#: builtin/config.c
 msgid "value is \"true\" or \"false\""
 msgstr "值是 \"true\" 或 \"false\""
 
-#: builtin/config.c:156
+#: builtin/config.c
 msgid "value is decimal number"
 msgstr "值是十進位數"
 
-#: builtin/config.c:157
+#: builtin/config.c
 msgid "value is --bool or --int"
 msgstr "值是 --bool or --int"
 
-#: builtin/config.c:158
+#: builtin/config.c
 msgid "value is --bool or string"
 msgstr "值是 --bool 或 string"
 
-#: builtin/config.c:159
+#: builtin/config.c
 msgid "value is a path (file or directory name)"
 msgstr "值是一個路徑（檔案或目錄名）"
 
-#: builtin/config.c:160
+#: builtin/config.c
 msgid "value is an expiry date"
 msgstr "值是一個到期日期"
 
-#: builtin/config.c:161
+#: builtin/config.c
 msgid "Other"
 msgstr "其它"
 
-#: builtin/config.c:162
+#: builtin/config.c
 msgid "terminate values with NUL byte"
 msgstr "終止值是 NUL 位元組"
 
-#: builtin/config.c:163
+#: builtin/config.c
 msgid "show variable names only"
 msgstr "只顯示變數名"
 
-#: builtin/config.c:164
+#: builtin/config.c
 msgid "respect include directives on lookup"
 msgstr "查詢時參照 include 指令遞迴尋找"
 
-#: builtin/config.c:165
+#: builtin/config.c
 msgid "show origin of config (file, standard input, blob, command line)"
 msgstr "顯示設定的來源（檔案、標準輸入、資料物件，或指令列）"
 
-#: builtin/config.c:166
+#: builtin/config.c
 msgid "show scope of config (worktree, local, global, system, command)"
 msgstr ""
 "顯示設定檔的作用域 (工作區 worktree、本機 local、全域 global、系統 system、指"
 "令 command)"
 
-#: builtin/config.c:167 builtin/env--helper.c:45
+#: builtin/config.c builtin/env--helper.c
 msgid "value"
 msgstr "取值"
 
-#: builtin/config.c:167
+#: builtin/config.c
 msgid "with --get, use default value when missing entry"
 msgstr "使用 --get 但未指定參數時所使用的預設值"
 
-#: builtin/config.c:181
+#: builtin/config.c
 #, c-format
 msgid "wrong number of arguments, should be %d"
 msgstr "錯誤的參數個數，應該為 %d 個"
 
-#: builtin/config.c:183
+#: builtin/config.c
 #, c-format
 msgid "wrong number of arguments, should be from %d to %d"
 msgstr "錯誤的參數個數，應該為從 %d 個到 %d 個"
 
-#: builtin/config.c:339
+#: builtin/config.c
 #, c-format
 msgid "invalid key pattern: %s"
 msgstr "無效鍵名模式：%s"
 
-#: builtin/config.c:377
+#: builtin/config.c config.c
+#, c-format
+msgid "invalid pattern: %s"
+msgstr "無效模式：%s"
+
+#: builtin/config.c
 #, c-format
 msgid "failed to format default config value: %s"
 msgstr "格式化預設設定值失敗：%s"
 
-#: builtin/config.c:441
+#: builtin/config.c
 #, c-format
 msgid "cannot parse color '%s'"
 msgstr "無法解析顏色 '%s'"
 
-#: builtin/config.c:483
+#: builtin/config.c
 msgid "unable to parse default color value"
 msgstr "無法解析預設顏色值"
 
-#: builtin/config.c:536 builtin/config.c:833
+#: builtin/config.c
 msgid "not in a git directory"
 msgstr "不在 git 版本庫中"
 
-#: builtin/config.c:539
+#: builtin/config.c
 msgid "writing to stdin is not supported"
 msgstr "不支援寫到標準輸入"
 
-#: builtin/config.c:542
+#: builtin/config.c
 msgid "writing config blobs is not supported"
 msgstr "不支援寫到設定資料物件"
 
-#: builtin/config.c:627
+#: builtin/config.c
 #, c-format
 msgid ""
 "# This is Git's per-user configuration file.\n"
@@ -14522,27 +6231,27 @@ msgstr ""
 "#\tname = %s\n"
 "#\temail = %s\n"
 
-#: builtin/config.c:652
+#: builtin/config.c
 msgid "only one config file at a time"
 msgstr "一次只能有一個設定檔案"
 
-#: builtin/config.c:658
+#: builtin/config.c
 msgid "--local can only be used inside a git repository"
 msgstr "--local 只能在一個版本庫內使用"
 
-#: builtin/config.c:660
+#: builtin/config.c
 msgid "--blob can only be used inside a git repository"
 msgstr "--blob 只能在一個版本庫內使用"
 
-#: builtin/config.c:662
+#: builtin/config.c
 msgid "--worktree can only be used inside a git repository"
 msgstr "--worktree 只能在 git 版本庫中使用"
 
-#: builtin/config.c:684
+#: builtin/config.c
 msgid "$HOME not set"
 msgstr "$HOME 未設定"
 
-#: builtin/config.c:708
+#: builtin/config.c
 msgid ""
 "--worktree cannot be used with multiple working trees unless the config\n"
 "extension worktreeConfig is enabled. Please read \"CONFIGURATION FILE\"\n"
@@ -14551,55 +6260,55 @@ msgstr ""
 "不能和多個工作區一起使用 --worktree，除非啟用 worktreeConfig 設定擴充部分。\n"
 "詳情請閱讀「git help worktree」的「CONFIGURATION FILE」小節"
 
-#: builtin/config.c:743
+#: builtin/config.c
 msgid "--get-color and variable type are incoherent"
 msgstr "--get-color 和變數類型不相容"
 
-#: builtin/config.c:748
+#: builtin/config.c
 msgid "only one action at a time"
 msgstr "一次只能有一個動作"
 
-#: builtin/config.c:761
+#: builtin/config.c
 msgid "--name-only is only applicable to --list or --get-regexp"
 msgstr "--name-only 僅適用於 --list 或 --get-regexp"
 
-#: builtin/config.c:767
+#: builtin/config.c
 msgid ""
 "--show-origin is only applicable to --get, --get-all, --get-regexp, and --"
 "list"
 msgstr "--show-origin 僅適用於 --get、--get-all、--get-regexp 和 --list"
 
-#: builtin/config.c:773
+#: builtin/config.c
 msgid "--default is only applicable to --get"
 msgstr "--default 僅適用於 --get"
 
-#: builtin/config.c:806
+#: builtin/config.c
 msgid "--fixed-value only applies with 'value-pattern'"
 msgstr "--fixed-value 僅套用至 'value-pattern'"
 
-#: builtin/config.c:822
+#: builtin/config.c
 #, c-format
 msgid "unable to read config file '%s'"
 msgstr "無法讀取設定檔案 '%s'"
 
-#: builtin/config.c:825
+#: builtin/config.c
 msgid "error processing config file(s)"
 msgstr "處理設定檔案發生錯誤"
 
-#: builtin/config.c:835
+#: builtin/config.c
 msgid "editing stdin is not supported"
 msgstr "不支援編輯標準輸入"
 
-#: builtin/config.c:837
+#: builtin/config.c
 msgid "editing blobs is not supported"
 msgstr "不支援編輯資料物件"
 
-#: builtin/config.c:851
+#: builtin/config.c
 #, c-format
 msgid "cannot create configuration file %s"
 msgstr "不能建立設定檔案 %s"
 
-#: builtin/config.c:864
+#: builtin/config.c
 #, c-format
 msgid ""
 "cannot overwrite multiple values with a single value\n"
@@ -14608,16 +6317,16 @@ msgstr ""
 "無法用一個值覆蓋多個值\n"
 "       使用一個常規表示式、--add 或 --replace-all 來修改 %s。"
 
-#: builtin/config.c:943 builtin/config.c:954
+#: builtin/config.c
 #, c-format
 msgid "no such section: %s"
 msgstr "無此小節：%s"
 
-#: builtin/count-objects.c:100
+#: builtin/count-objects.c
 msgid "print sizes in human readable format"
 msgstr "以使用者可讀的格式顯示大小"
 
-#: builtin/credential-cache--daemon.c:227
+#: builtin/credential-cache--daemon.c
 #, c-format
 msgid ""
 "The permissions on your socket directory are too loose; other\n"
@@ -14630,69 +6339,69 @@ msgstr ""
 "\n"
 "\tchmod 0700 %s"
 
-#: builtin/credential-cache--daemon.c:276
+#: builtin/credential-cache--daemon.c
 msgid "print debugging messages to stderr"
 msgstr "除錯訊息輸出到標準錯誤"
 
-#: builtin/credential-cache--daemon.c:316
+#: builtin/credential-cache--daemon.c
 msgid "credential-cache--daemon unavailable; no unix socket support"
 msgstr "credential-cache--daemon 無法使用；缺少 unix socket 支援"
 
-#: builtin/credential-cache.c:180
+#: builtin/credential-cache.c
 msgid "credential-cache unavailable; no unix socket support"
 msgstr "credential-cache 無法使用；缺少 unix socket 支援"
 
-#: builtin/credential-store.c:66
+#: builtin/credential-store.c
 #, c-format
 msgid "unable to get credential storage lock in %d ms"
 msgstr "無法在 %d 毫秒內取得憑證儲存空間的鎖"
 
-#: builtin/describe.c:26
+#: builtin/describe.c
 msgid "git describe [<options>] [<commit-ish>...]"
 msgstr "git describe [<選項>] [<提交號>...]"
 
-#: builtin/describe.c:27
+#: builtin/describe.c
 msgid "git describe [<options>] --dirty"
 msgstr "git describe [<選項>] --dirty"
 
-#: builtin/describe.c:63
+#: builtin/describe.c
 msgid "head"
 msgstr "HEAD"
 
-#: builtin/describe.c:63
+#: builtin/describe.c
 msgid "lightweight"
 msgstr "輕量級的"
 
-#: builtin/describe.c:63
+#: builtin/describe.c
 msgid "annotated"
 msgstr "附註的"
 
-#: builtin/describe.c:277
+#: builtin/describe.c
 #, c-format
 msgid "annotated tag %s not available"
 msgstr "附註標籤 %s 無效"
 
-#: builtin/describe.c:281
+#: builtin/describe.c
 #, c-format
 msgid "tag '%s' is externally known as '%s'"
 msgstr "「%s」標籤在外部被認為是「%s」"
 
-#: builtin/describe.c:328
+#: builtin/describe.c
 #, c-format
 msgid "no tag exactly matches '%s'"
 msgstr "沒有標籤準確符合 '%s'"
 
-#: builtin/describe.c:330
+#: builtin/describe.c
 #, c-format
 msgid "No exact match on refs or tags, searching to describe\n"
 msgstr "沒有精確符合到引用或標籤，繼續搜尋進行描述\n"
 
-#: builtin/describe.c:397
+#: builtin/describe.c
 #, c-format
 msgid "finished search at %s\n"
 msgstr "完成搜尋 %s\n"
 
-#: builtin/describe.c:424
+#: builtin/describe.c
 #, c-format
 msgid ""
 "No annotated tags can describe '%s'.\n"
@@ -14701,7 +6410,7 @@ msgstr ""
 "沒有附註標籤能描述 '%s'。\n"
 "然而，存在未附註標籤：嘗試 --tags。"
 
-#: builtin/describe.c:428
+#: builtin/describe.c
 #, c-format
 msgid ""
 "No tags can describe '%s'.\n"
@@ -14710,12 +6419,12 @@ msgstr ""
 "沒有標籤能描述 '%s'。\n"
 "嘗試 --always，或者建立一些標籤。"
 
-#: builtin/describe.c:458
+#: builtin/describe.c
 #, c-format
 msgid "traversed %lu commits\n"
 msgstr "已遍歷 %lu 個提交\n"
 
-#: builtin/describe.c:461
+#: builtin/describe.c
 #, c-format
 msgid ""
 "more than %i tags found; listed %i most recent\n"
@@ -14724,149 +6433,149 @@ msgstr ""
 "發現多於 %i 個標籤，列出最近的 %i 個\n"
 "在 %s 放棄搜尋\n"
 
-#: builtin/describe.c:529
+#: builtin/describe.c
 #, c-format
 msgid "describe %s\n"
 msgstr "描述 %s\n"
 
-#: builtin/describe.c:532
+#: builtin/describe.c
 #, c-format
 msgid "Not a valid object name %s"
 msgstr "不是一個有效的物件名 %s"
 
-#: builtin/describe.c:540
+#: builtin/describe.c
 #, c-format
 msgid "%s is neither a commit nor blob"
 msgstr "%s 既不是提交也不是資料物件"
 
-#: builtin/describe.c:554
+#: builtin/describe.c
 msgid "find the tag that comes after the commit"
 msgstr "尋找該提交之後的標籤"
 
-#: builtin/describe.c:555
+#: builtin/describe.c
 msgid "debug search strategy on stderr"
 msgstr "在標準錯誤上除錯搜尋策略"
 
-#: builtin/describe.c:556
+#: builtin/describe.c
 msgid "use any ref"
 msgstr "使用任意引用"
 
-#: builtin/describe.c:557
+#: builtin/describe.c
 msgid "use any tag, even unannotated"
 msgstr "使用任意標籤，即使未附帶備註"
 
-#: builtin/describe.c:558
+#: builtin/describe.c
 msgid "always use long format"
 msgstr "始終使用長提交號格式"
 
-#: builtin/describe.c:559
+#: builtin/describe.c
 msgid "only follow first parent"
 msgstr "只跟隨第一個父提交"
 
-#: builtin/describe.c:562
+#: builtin/describe.c
 msgid "only output exact matches"
 msgstr "只輸出精確符合"
 
-#: builtin/describe.c:564
+#: builtin/describe.c
 msgid "consider <n> most recent tags (default: 10)"
 msgstr "考慮最近 <n> 個標籤（預設值：10）"
 
-#: builtin/describe.c:566
+#: builtin/describe.c
 msgid "only consider tags matching <pattern>"
 msgstr "只考慮符合 <模式> 的標籤"
 
-#: builtin/describe.c:568
+#: builtin/describe.c
 msgid "do not consider tags matching <pattern>"
 msgstr "不考慮符合 <模式> 的標籤"
 
-#: builtin/describe.c:570 builtin/name-rev.c:595
+#: builtin/describe.c builtin/name-rev.c
 msgid "show abbreviated commit object as fallback"
 msgstr "顯示簡寫的提交號作為後備"
 
-#: builtin/describe.c:571 builtin/describe.c:574
+#: builtin/describe.c
 msgid "mark"
 msgstr "標記"
 
-#: builtin/describe.c:572
+#: builtin/describe.c
 msgid "append <mark> on dirty working tree (default: \"-dirty\")"
 msgstr "對於髒工作區，追加 <標記>（預設值：”-dirty\"）"
 
-#: builtin/describe.c:575
+#: builtin/describe.c
 msgid "append <mark> on broken working tree (default: \"-broken\")"
 msgstr "對於損壞的工作區，追加 <標記>（預設值：”-broken\"）"
 
-#: builtin/describe.c:622
+#: builtin/describe.c
 msgid "No names found, cannot describe anything."
 msgstr "沒有發現名稱，無法描述任何東西。"
 
-#: builtin/describe.c:673 builtin/describe.c:675
+#: builtin/describe.c
 #, c-format
 msgid "option '%s' and commit-ishes cannot be used together"
 msgstr "「%s」選項和提交號不得同時使用"
 
-#: builtin/diff-tree.c:157
+#: builtin/diff-tree.c
 msgid "--merge-base only works with two commits"
 msgstr "--merge-base 只對 2 個以上的提交有用"
 
-#: builtin/diff.c:92
+#: builtin/diff.c
 #, c-format
 msgid "'%s': not a regular file or symlink"
 msgstr "'%s'：不是一個正規檔案或符號連結"
 
-#: builtin/diff.c:259
+#: builtin/diff.c
 #, c-format
 msgid "invalid option: %s"
 msgstr "無效選項：%s"
 
-#: builtin/diff.c:376
+#: builtin/diff.c
 #, c-format
 msgid "%s...%s: no merge base"
 msgstr "%s...%s: 無合併基底"
 
-#: builtin/diff.c:491
+#: builtin/diff.c
 msgid "Not a git repository"
 msgstr "不是一個 git 版本庫"
 
-#: builtin/diff.c:537 builtin/grep.c:700
+#: builtin/diff.c builtin/grep.c
 #, c-format
 msgid "invalid object '%s' given."
 msgstr "提供了無效物件 '%s'。"
 
-#: builtin/diff.c:548
+#: builtin/diff.c
 #, c-format
 msgid "more than two blobs given: '%s'"
 msgstr "提供了超過兩個資料物件：'%s'"
 
-#: builtin/diff.c:553
+#: builtin/diff.c
 #, c-format
 msgid "unhandled object '%s' given."
 msgstr "無法處理的物件 '%s'。"
 
-#: builtin/diff.c:587
+#: builtin/diff.c
 #, c-format
 msgid "%s...%s: multiple merge bases, using %s"
 msgstr "%s...%s：多個合併基底，使用 %s"
 
-#: builtin/difftool.c:31
+#: builtin/difftool.c
 msgid "git difftool [<options>] [<commit> [<commit>]] [--] [<path>...]"
 msgstr "git difftool [<選項>] [<提交> [<提交>]] [--] [<路徑>...]"
 
-#: builtin/difftool.c:287
+#: builtin/difftool.c
 #, c-format
 msgid "could not read symlink %s"
 msgstr "無法讀取符號連結 %s"
 
-#: builtin/difftool.c:289
+#: builtin/difftool.c
 #, c-format
 msgid "could not read symlink file %s"
 msgstr "無法讀取符號連結檔案 %s"
 
-#: builtin/difftool.c:297
+#: builtin/difftool.c
 #, c-format
 msgid "could not read object %s for symlink %s"
 msgstr "無法讀取符號連結 %2$s 指向的物件 %1$s"
 
-#: builtin/difftool.c:421
+#: builtin/difftool.c
 msgid ""
 "combined diff formats ('-c' and '--cc') are not supported in\n"
 "directory diff mode ('-d' and '--dir-diff')."
@@ -14874,444 +6583,452 @@ msgstr ""
 "不支援在目錄比較模式（'-d' 和 '--dir-diff'）中\n"
 "採用組合差異格式（'-c' 和 '--cc'）。"
 
-#: builtin/difftool.c:626
+#: builtin/difftool.c
 #, c-format
 msgid "both files modified: '%s' and '%s'."
 msgstr "兩個檔案都被修改：'%s' 和 '%s'。"
 
-#: builtin/difftool.c:628
+#: builtin/difftool.c
 msgid "working tree file has been left."
 msgstr "工作區檔案被留了下來。"
 
-#: builtin/difftool.c:639
+#: builtin/difftool.c sequencer.c
+#, c-format
+msgid "could not copy '%s' to '%s'"
+msgstr "不能複製 '%s' 至 '%s'"
+
+#: builtin/difftool.c
 #, c-format
 msgid "temporary files exist in '%s'."
 msgstr "暫存檔存在於 '%s'。"
 
-#: builtin/difftool.c:640
+#: builtin/difftool.c
 msgid "you may want to cleanup or recover these."
 msgstr "您可能想要清理或者復原它們。"
 
-#: builtin/difftool.c:645
+#: builtin/difftool.c
 #, c-format
 msgid "failed: %d"
 msgstr "失敗：%d"
 
-#: builtin/difftool.c:690
+#: builtin/difftool.c
 msgid "use `diff.guitool` instead of `diff.tool`"
 msgstr "使用 `diff.guitool` 代替 `diff.tool`"
 
-#: builtin/difftool.c:692
+#: builtin/difftool.c
 msgid "perform a full-directory diff"
 msgstr "執行一個全目錄差異比較"
 
-#: builtin/difftool.c:694
+#: builtin/difftool.c
 msgid "do not prompt before launching a diff tool"
 msgstr "啟動差異比較工具之前不提示"
 
-#: builtin/difftool.c:699
+#: builtin/difftool.c
 msgid "use symlinks in dir-diff mode"
 msgstr "在 dir-diff 模式中使用符號連結"
 
-#: builtin/difftool.c:700
+#: builtin/difftool.c
 msgid "tool"
 msgstr "工具"
 
-#: builtin/difftool.c:701
+#: builtin/difftool.c
 msgid "use the specified diff tool"
 msgstr "使用指定的差異比較工具"
 
-#: builtin/difftool.c:703
+#: builtin/difftool.c
 msgid "print a list of diff tools that may be used with `--tool`"
 msgstr "顯示可以用在 `--tool` 參數後的差異工具列表"
 
-#: builtin/difftool.c:706
+#: builtin/difftool.c
 msgid ""
 "make 'git-difftool' exit when an invoked diff tool returns a non-zero exit "
 "code"
 msgstr "當執行 diff 工具返回非零離開碼時，使 'git-difftool' 離開"
 
-#: builtin/difftool.c:709
+#: builtin/difftool.c
 msgid "specify a custom command for viewing diffs"
 msgstr "指定一個用於檢視差異的自訂指令"
 
-#: builtin/difftool.c:710
+#: builtin/difftool.c
 msgid "passed to `diff`"
 msgstr "傳遞給 `diff`"
 
-#: builtin/difftool.c:726
+#: builtin/difftool.c
 msgid "difftool requires worktree or --no-index"
 msgstr "difftool 要求工作區或者 --no-index"
 
-#: builtin/difftool.c:745
+#: builtin/difftool.c
 msgid "no <tool> given for --tool=<tool>"
 msgstr "沒有為 --tool=<工具> 參數提供 <工具>"
 
-#: builtin/difftool.c:752
+#: builtin/difftool.c
 msgid "no <cmd> given for --extcmd=<cmd>"
 msgstr "沒有為 --extcmd=<命令> 參數提供 <命令>"
 
-#: builtin/env--helper.c:6
+#: builtin/env--helper.c
 msgid "git env--helper --type=[bool|ulong] <options> <env-var>"
 msgstr "git env--helper --type=[bool|ulong] <選項> <環境變數>"
 
-#: builtin/env--helper.c:46
+#: builtin/env--helper.c
 msgid "default for git_env_*(...) to fall back on"
 msgstr "git_env_*(...) 的預設值"
 
-#: builtin/env--helper.c:48
+#: builtin/env--helper.c
 msgid "be quiet only use git_env_*() value as exit code"
 msgstr "安靜模式，只使用 git_env_*() 的值作為離開碼"
 
-#: builtin/env--helper.c:67
+#: builtin/env--helper.c
 #, c-format
 msgid "option `--default' expects a boolean value with `--type=bool`, not `%s`"
 msgstr "選項「--default」預期收到「--type=bool」的布林值，而非「%s」"
 
-#: builtin/env--helper.c:82
+#: builtin/env--helper.c
 #, c-format
 msgid ""
 "option `--default' expects an unsigned long value with `--type=ulong`, not `"
 "%s`"
 msgstr "選項「--default」預期收到「--type=ulong」的無號 long 數值，而非「%s」"
 
-#: builtin/fast-export.c:29
+#: builtin/fast-export.c
 msgid "git fast-export [<rev-list-opts>]"
 msgstr "git fast-export [<rev-list-opts>]"
 
-#: builtin/fast-export.c:843
+#: builtin/fast-export.c
 msgid "Error: Cannot export nested tags unless --mark-tags is specified."
 msgstr "錯誤：除非指定 --mark-tags，否則無法匯出嵌套標籤。"
 
-#: builtin/fast-export.c:1152
+#: builtin/fast-export.c
 msgid "--anonymize-map token cannot be empty"
 msgstr "--anonymize-map 的鍵不能空白"
 
-#: builtin/fast-export.c:1171
+#: builtin/fast-export.c
 msgid "show progress after <n> objects"
 msgstr "在 <n> 個物件之後顯示進度"
 
-#: builtin/fast-export.c:1173
+#: builtin/fast-export.c
 msgid "select handling of signed tags"
 msgstr "選擇如何處理簽名標籤"
 
-#: builtin/fast-export.c:1176
+#: builtin/fast-export.c
 msgid "select handling of tags that tag filtered objects"
 msgstr "選擇當標籤指向被過濾物件時該標籤的處理方式"
 
-#: builtin/fast-export.c:1179
+#: builtin/fast-export.c
 msgid "select handling of commit messages in an alternate encoding"
 msgstr "選擇使用備用編碼處理提交說明"
 
-#: builtin/fast-export.c:1182
+#: builtin/fast-export.c
 msgid "dump marks to this file"
 msgstr "把標記傾印到這個檔案"
 
-#: builtin/fast-export.c:1184
+#: builtin/fast-export.c
 msgid "import marks from this file"
 msgstr "從這個檔案匯入標記"
 
-#: builtin/fast-export.c:1188
+#: builtin/fast-export.c
 msgid "import marks from this file if it exists"
 msgstr "如果這個檔案存在，則從檔案匯入標記"
 
-#: builtin/fast-export.c:1190
+#: builtin/fast-export.c
 msgid "fake a tagger when tags lack one"
 msgstr "當標籤缺少標記者欄位時假裝有一個"
 
-#: builtin/fast-export.c:1192
+#: builtin/fast-export.c
 msgid "output full tree for each commit"
 msgstr "每次提交都輸出整棵樹"
 
-#: builtin/fast-export.c:1194
+#: builtin/fast-export.c
 msgid "use the done feature to terminate the stream"
 msgstr "使用 done 功能終止串流"
 
-#: builtin/fast-export.c:1195
+#: builtin/fast-export.c
 msgid "skip output of blob data"
 msgstr "略過資料物件資料的輸出"
 
-#: builtin/fast-export.c:1196 builtin/log.c:1860
+#: builtin/fast-export.c builtin/log.c
 msgid "refspec"
 msgstr "引用規格"
 
-#: builtin/fast-export.c:1197
+#: builtin/fast-export.c
 msgid "apply refspec to exported refs"
 msgstr "對匯出的引用套用引用規格"
 
-#: builtin/fast-export.c:1198
+#: builtin/fast-export.c
 msgid "anonymize output"
 msgstr "匿名輸出"
 
-#: builtin/fast-export.c:1199
+#: builtin/fast-export.c
 msgid "from:to"
 msgstr "from:to"
 
-#: builtin/fast-export.c:1200
+#: builtin/fast-export.c
 msgid "convert <from> to <to> in anonymized output"
 msgstr "在匿名輸出中將 <from> 轉換為 <to>"
 
-#: builtin/fast-export.c:1203
+#: builtin/fast-export.c
 msgid "reference parents which are not in fast-export stream by object id"
 msgstr "依物件 ID 引用不在 fast-export 串流中的父物件"
 
-#: builtin/fast-export.c:1205
+#: builtin/fast-export.c
 msgid "show original object ids of blobs/commits"
 msgstr "顯示資料物件及提交的原始物件 ID"
 
-#: builtin/fast-export.c:1207
+#: builtin/fast-export.c
 msgid "label tags with mark ids"
 msgstr "為包含標記 ID 的標籤打上標記"
 
-#: builtin/fast-import.c:3097
+#: builtin/fast-import.c
 #, c-format
 msgid "Missing from marks for submodule '%s'"
 msgstr "「%s」子模組缺少 from 標記"
 
-#: builtin/fast-import.c:3099
+#: builtin/fast-import.c
 #, c-format
 msgid "Missing to marks for submodule '%s'"
 msgstr "「%s」子模組缺少 to 標記"
 
-#: builtin/fast-import.c:3234
+#: builtin/fast-import.c
 #, c-format
 msgid "Expected 'mark' command, got %s"
 msgstr "預期 'mark' 指令，得到 %s"
 
-#: builtin/fast-import.c:3239
+#: builtin/fast-import.c
 #, c-format
 msgid "Expected 'to' command, got %s"
 msgstr "預期 'to' 指令，得到 %s"
 
-#: builtin/fast-import.c:3331
+#: builtin/fast-import.c
 msgid "Expected format name:filename for submodule rewrite option"
 msgstr "期望子模組 rewrite 選項的格式是 name:filename"
 
-#: builtin/fast-import.c:3386
+#: builtin/fast-import.c
 #, c-format
 msgid "feature '%s' forbidden in input without --allow-unsafe-features"
 msgstr "沒有 --allow-unsafe-features 時，禁止在輸入中使用 '%s' 功能"
 
-#: builtin/fetch-pack.c:246
+#: builtin/fetch-pack.c
 #, c-format
 msgid "Lockfile created but not reported: %s"
 msgstr "已建立鎖定檔案，但尚未回報：%s"
 
-#: builtin/fetch.c:36
+#: builtin/fetch.c
 msgid "git fetch [<options>] [<repository> [<refspec>...]]"
 msgstr "git fetch [<選項>] [<版本庫> [<引用規格>...]]"
 
-#: builtin/fetch.c:37
+#: builtin/fetch.c
 msgid "git fetch [<options>] <group>"
 msgstr "git fetch [<選項>] <組>"
 
-#: builtin/fetch.c:38
+#: builtin/fetch.c
 msgid "git fetch --multiple [<options>] [(<repository> | <group>)...]"
 msgstr "git fetch --multiple [<選項>] [(<版本庫> | <組>)...]"
 
-#: builtin/fetch.c:39
+#: builtin/fetch.c
 msgid "git fetch --all [<options>]"
 msgstr "git fetch --all [<選項>]"
 
-#: builtin/fetch.c:124
+#: builtin/fetch.c
 msgid "fetch.parallel cannot be negative"
 msgstr "fetch.parallel 不能為負數"
 
-#: builtin/fetch.c:147 builtin/pull.c:189
+#: builtin/fetch.c builtin/pull.c
 msgid "fetch from all remotes"
 msgstr "從所有的遠端抓取"
 
-#: builtin/fetch.c:149 builtin/pull.c:249
+#: builtin/fetch.c builtin/pull.c
 msgid "set upstream for git pull/fetch"
 msgstr "為 git pull/fetch 設定上游"
 
-#: builtin/fetch.c:151 builtin/pull.c:192
+#: builtin/fetch.c builtin/pull.c
 msgid "append to .git/FETCH_HEAD instead of overwriting"
 msgstr "追加到 .git/FETCH_HEAD 而不是覆蓋它"
 
-#: builtin/fetch.c:153
+#: builtin/fetch.c
 msgid "use atomic transaction to update references"
 msgstr "使用 atomic 事務更新引用"
 
-#: builtin/fetch.c:155 builtin/pull.c:195
+#: builtin/fetch.c builtin/pull.c
 msgid "path to upload pack on remote end"
 msgstr "上傳包到遠端的路徑"
 
-#: builtin/fetch.c:156
+#: builtin/fetch.c
 msgid "force overwrite of local reference"
 msgstr "強制覆蓋本機引用"
 
-#: builtin/fetch.c:158
+#: builtin/fetch.c
 msgid "fetch from multiple remotes"
 msgstr "從多個遠端抓取"
 
-#: builtin/fetch.c:160 builtin/pull.c:199
+#: builtin/fetch.c builtin/pull.c
 msgid "fetch all tags and associated objects"
 msgstr "抓取所有的標籤和關聯物件"
 
-#: builtin/fetch.c:162
+#: builtin/fetch.c
 msgid "do not fetch all tags (--no-tags)"
 msgstr "不抓取任何標籤(--no-tags)"
 
-#: builtin/fetch.c:164
+#: builtin/fetch.c
 msgid "number of submodules fetched in parallel"
 msgstr "並行取得的子模組數量"
 
-#: builtin/fetch.c:166
+#: builtin/fetch.c
 msgid "modify the refspec to place all refs within refs/prefetch/"
 msgstr "修改引用規格 (refspec) 以便將所有引用 (refs) 放置在 refs/prefetch/ 中"
 
-#: builtin/fetch.c:168 builtin/pull.c:202
+#: builtin/fetch.c builtin/pull.c
 msgid "prune remote-tracking branches no longer on remote"
 msgstr "清除遠端已經不存在的分支的追蹤分支"
 
-#: builtin/fetch.c:170
+#: builtin/fetch.c
 msgid "prune local tags no longer on remote and clobber changed tags"
 msgstr "清除遠端不存在的本機標籤，並且取代變更標籤"
 
 #  譯者：可選值，不能翻譯
-#: builtin/fetch.c:171 builtin/fetch.c:199 builtin/pull.c:123
+#: builtin/fetch.c builtin/pull.c
 msgid "on-demand"
 msgstr "on-demand"
 
-#: builtin/fetch.c:172
+#: builtin/fetch.c
 msgid "control recursive fetching of submodules"
 msgstr "控制子模組的遞迴抓取"
 
-#: builtin/fetch.c:177
+#: builtin/fetch.c
 msgid "write fetched references to the FETCH_HEAD file"
 msgstr "將取得的引用寫入 FETCH_HEAD 檔案"
 
-#: builtin/fetch.c:178 builtin/pull.c:210
+#: builtin/fetch.c builtin/pull.c
 msgid "keep downloaded pack"
 msgstr "保持下載包"
 
-#: builtin/fetch.c:180
+#: builtin/fetch.c
 msgid "allow updating of HEAD ref"
 msgstr "允許更新 HEAD 引用"
 
-#: builtin/fetch.c:183 builtin/fetch.c:189 builtin/pull.c:213
-#: builtin/pull.c:222
+#: builtin/fetch.c builtin/pull.c
 msgid "deepen history of shallow clone"
 msgstr "取得淺複製的更多過去歷史記錄"
 
-#: builtin/fetch.c:185 builtin/pull.c:216
+#: builtin/fetch.c builtin/pull.c
 msgid "deepen history of shallow repository based on time"
 msgstr "基於時間來深化淺複製的歷史"
 
-#: builtin/fetch.c:191 builtin/pull.c:225
+#: builtin/fetch.c builtin/pull.c
 msgid "convert to a complete repository"
 msgstr "轉換為一個完整的版本庫"
 
-#: builtin/fetch.c:194
+#: builtin/fetch.c
 msgid "re-fetch without negotiating common commits"
 msgstr "重新抓取而不協商共同提交"
 
-#: builtin/fetch.c:197
+#: builtin/fetch.c
 msgid "prepend this to submodule path output"
 msgstr "在子模組路徑輸出的前面加上此目錄"
 
-#: builtin/fetch.c:200
+#: builtin/fetch.c
 msgid ""
 "default for recursive fetching of submodules (lower priority than config "
 "files)"
 msgstr "遞迴取得子模組的預設值（比設定檔案優先度低）"
 
-#: builtin/fetch.c:204 builtin/pull.c:228
+#: builtin/fetch.c builtin/pull.c
 msgid "accept refs that update .git/shallow"
 msgstr "接受更新 .git/shallow 的引用"
 
-#: builtin/fetch.c:205 builtin/pull.c:230
+#: builtin/fetch.c builtin/pull.c
 msgid "refmap"
 msgstr "引用映射"
 
-#: builtin/fetch.c:206 builtin/pull.c:231
+#: builtin/fetch.c builtin/pull.c
 msgid "specify fetch refmap"
 msgstr "指定取得動作的引用映射"
 
-#: builtin/fetch.c:213 builtin/pull.c:244
+#: builtin/fetch.c builtin/pull.c
 msgid "report that we have only objects reachable from this object"
 msgstr "報告我們只擁有從該物件開始可以取得的物件"
 
-#: builtin/fetch.c:215
+#: builtin/fetch.c
 msgid "do not fetch a packfile; instead, print ancestors of negotiation tips"
-msgstr "不取得包檔案，而是輸出協商的祖先提交"
+msgstr "不取得 packfile，而是輸出協商的祖先提交"
 
-#: builtin/fetch.c:218 builtin/fetch.c:220
+#: builtin/fetch.c
 msgid "run 'maintenance --auto' after fetching"
 msgstr "取得 (fetch) 後執行 'maintenance --auto'"
 
-#: builtin/fetch.c:222 builtin/pull.c:247
+#: builtin/fetch.c builtin/pull.c
 msgid "check for forced-updates on all updated branches"
 msgstr "在所有更新分支上檢查強制更新"
 
-#: builtin/fetch.c:224
+#: builtin/fetch.c
 msgid "write the commit-graph after fetching"
 msgstr "抓取後寫入分支圖"
 
-#: builtin/fetch.c:226
+#: builtin/fetch.c
 msgid "accept refspecs from stdin"
 msgstr "從標準輸入中接受引用規格"
 
-#: builtin/fetch.c:618
+#: builtin/fetch.c
 msgid "couldn't find remote ref HEAD"
 msgstr "找不到遠端 HEAD 引用"
 
-#: builtin/fetch.c:893
+#: builtin/fetch.c
 #, c-format
 msgid "object %s not found"
 msgstr "物件 %s 未發現"
 
-#: builtin/fetch.c:897
+#: builtin/fetch.c
 msgid "[up to date]"
 msgstr "[最新]"
 
-#: builtin/fetch.c:909 builtin/fetch.c:927 builtin/fetch.c:999
+#: builtin/fetch.c
 msgid "[rejected]"
 msgstr "[已拒絕]"
 
-#: builtin/fetch.c:911
+#: builtin/fetch.c
 msgid "can't fetch in current branch"
 msgstr "目前分支下不能執行取得動作"
 
-#: builtin/fetch.c:912
+#: builtin/fetch.c
 msgid "checked out in another worktree"
 msgstr "已在其他工作區簽出"
 
-#: builtin/fetch.c:922
+#: builtin/fetch.c
 msgid "[tag update]"
 msgstr "[標籤更新]"
 
-#: builtin/fetch.c:923 builtin/fetch.c:960 builtin/fetch.c:982
-#: builtin/fetch.c:994
+#: builtin/fetch.c
 msgid "unable to update local ref"
 msgstr "不能更新本機引用"
 
-#: builtin/fetch.c:927
+#: builtin/fetch.c
 msgid "would clobber existing tag"
 msgstr "會破壞現有的標籤"
 
-#: builtin/fetch.c:949
+#: builtin/fetch.c
 msgid "[new tag]"
 msgstr "[新標籤]"
 
-#: builtin/fetch.c:952
+#: builtin/fetch.c
 msgid "[new branch]"
 msgstr "[新分支]"
 
-#: builtin/fetch.c:955
+#: builtin/fetch.c
 msgid "[new ref]"
 msgstr "[新引用]"
 
-#: builtin/fetch.c:994
+#: builtin/fetch.c
 msgid "forced update"
 msgstr "強制更新"
 
-#: builtin/fetch.c:999
+#: builtin/fetch.c
 msgid "non-fast-forward"
 msgstr "非快轉"
 
-#: builtin/fetch.c:1102
+#: builtin/fetch.c builtin/grep.c sequencer.c
+#, c-format
+msgid "cannot open '%s'"
+msgstr "不能開啟 '%s'"
+
+#: builtin/fetch.c
 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"
@@ -15321,7 +7038,7 @@ msgstr ""
 "要重新啟用，請使用「--show-forced-updates」選項，或執行\n"
 "「git config fetch.showForcedUpdates true」"
 
-#: builtin/fetch.c:1106
+#: builtin/fetch.c
 #, c-format
 msgid ""
 "it took %.2f seconds to check forced updates; you can use\n"
@@ -15332,22 +7049,22 @@ msgstr ""
 "花了 %.2f 秒檢查強制更新。您可以使用「--no-show-forced-updates」\n"
 "或執行「git config fetch.showForcedUpdates false」避免此項檢查\n"
 
-#: builtin/fetch.c:1136
+#: builtin/fetch.c
 #, c-format
 msgid "%s did not send all necessary objects\n"
 msgstr "%s 未傳送所有必需的物件\n"
 
-#: builtin/fetch.c:1156
+#: builtin/fetch.c
 #, c-format
 msgid "rejected %s because shallow roots are not allowed to be updated"
 msgstr "已拒絕 %s，不允許更新淺複製"
 
-#: builtin/fetch.c:1259 builtin/fetch.c:1418
+#: builtin/fetch.c
 #, c-format
 msgid "From %.*s\n"
 msgstr "來自 %.*s\n"
 
-#: builtin/fetch.c:1269
+#: builtin/fetch.c
 #, c-format
 msgid ""
 "some local refs could not be updated; try running\n"
@@ -15357,50 +7074,55 @@ msgstr ""
 " 'git remote prune %s' 來刪除舊的、有衝突的分支"
 
 #  譯者：請維持前導空格
-#: builtin/fetch.c:1377
+#: builtin/fetch.c
 #, c-format
 msgid "   (%s will become dangling)"
 msgstr "   （%s 將成為懸空狀態）"
 
 #  譯者：請維持前導空格
-#: builtin/fetch.c:1378
+#: builtin/fetch.c
 #, c-format
 msgid "   (%s has become dangling)"
 msgstr "   （%s 已成為懸空狀態）"
 
-#: builtin/fetch.c:1421
+#: builtin/fetch.c
 msgid "[deleted]"
 msgstr "[已刪除]"
 
-#: builtin/fetch.c:1422 builtin/remote.c:1153
+#: builtin/fetch.c builtin/remote.c
 msgid "(none)"
 msgstr "（無）"
 
-#: builtin/fetch.c:1446
+#: builtin/fetch.c
 #, c-format
 msgid "refusing to fetch into branch '%s' checked out at '%s'"
 msgstr "拒絕取得在「%2$s」簽出的「%1$s」分支"
 
-#: builtin/fetch.c:1466
+#: builtin/fetch.c
 #, c-format
 msgid "option \"%s\" value \"%s\" is not valid for %s"
 msgstr "選項「%s」的值「%s」對 %s 無效"
 
-#: builtin/fetch.c:1469
+#: builtin/fetch.c
 #, c-format
 msgid "option \"%s\" is ignored for %s\n"
 msgstr "選項「%s」被 %s 忽略\n"
 
-#: builtin/fetch.c:1496
+#: builtin/fetch.c object-file.c
+#, c-format
+msgid "%s is not a valid object"
+msgstr "%s 不是一個有效的物件"
+
+#: builtin/fetch.c
 #, c-format
 msgid "the object %s does not exist"
 msgstr "%s 物件不存在"
 
-#: builtin/fetch.c:1748
+#: builtin/fetch.c
 msgid "multiple branches detected, incompatible with --set-upstream"
 msgstr "檢測到多分支，和 --set-upstream 不相容"
 
-#: builtin/fetch.c:1760
+#: builtin/fetch.c
 #, c-format
 msgid ""
 "could not set upstream of HEAD to '%s' from '%s' when it does not point to "
@@ -15408,19 +7130,19 @@ msgid ""
 msgstr ""
 "無法將 HEAD 的上游從「%2$s」設定為「%1$s」，因為 HEAD 沒有指向任何分支。"
 
-#: builtin/fetch.c:1773
+#: builtin/fetch.c
 msgid "not setting upstream for a remote remote-tracking branch"
 msgstr "沒有為一個遠端追蹤分支設定上游"
 
-#: builtin/fetch.c:1775
+#: builtin/fetch.c
 msgid "not setting upstream for a remote tag"
 msgstr "沒有為一個遠端標籤設定上游"
 
-#: builtin/fetch.c:1777
+#: builtin/fetch.c
 msgid "unknown branch type"
 msgstr "未知的分支類型"
 
-#: builtin/fetch.c:1779
+#: builtin/fetch.c
 msgid ""
 "no source branch found;\n"
 "you need to specify exactly one branch with the --set-upstream option"
@@ -15428,22 +7150,22 @@ msgstr ""
 "找不到來源分支。\n"
 "您得使用 --set-upstream 選項明確指定一個分支"
 
-#: builtin/fetch.c:1904 builtin/fetch.c:1967
+#: builtin/fetch.c
 #, c-format
 msgid "Fetching %s\n"
 msgstr "正在取得 %s\n"
 
-#: builtin/fetch.c:1914 builtin/fetch.c:1969
+#: builtin/fetch.c
 #, c-format
 msgid "could not fetch %s"
 msgstr "不能取得 %s"
 
-#: builtin/fetch.c:1926
+#: builtin/fetch.c
 #, c-format
 msgid "could not fetch '%s' (exit code: %d)\n"
 msgstr "無法取得 '%s'（離開碼：%d）\n"
 
-#: builtin/fetch.c:2030
+#: builtin/fetch.c
 msgid ""
 "no remote repository specified; please specify either a URL or a\n"
 "remote name from which new revisions should be fetched"
@@ -15451,192 +7173,192 @@ msgstr ""
 "未指定遠端版本庫。請指定用以取得新修訂版本之\n"
 "來源 URL 或者遠端版本庫名稱"
 
-#: builtin/fetch.c:2066
+#: builtin/fetch.c
 msgid "you need to specify a tag name"
 msgstr "您需要指定標籤名稱"
 
-#: builtin/fetch.c:2156
+#: builtin/fetch.c
 msgid "--negotiate-only needs one or more --negotiation-tip=*"
 msgstr "--negotiate-only 需要一或多個 --negotiation-tip=*"
 
-#: builtin/fetch.c:2160
+#: builtin/fetch.c
 msgid "negative depth in --deepen is not supported"
 msgstr "--deepen 不支援負數深度"
 
-#: builtin/fetch.c:2169
+#: builtin/fetch.c
 msgid "--unshallow on a complete repository does not make sense"
 msgstr "對於一個完整的版本庫，參數 --unshallow 沒有意義"
 
-#: builtin/fetch.c:2186
+#: builtin/fetch.c
 msgid "fetch --all does not take a repository argument"
 msgstr "fetch --all 不能帶一個版本庫參數"
 
-#: builtin/fetch.c:2188
+#: builtin/fetch.c
 msgid "fetch --all does not make sense with refspecs"
 msgstr "fetch --all 帶引用規格沒有任何意義"
 
-#: builtin/fetch.c:2197
+#: builtin/fetch.c
 #, c-format
 msgid "no such remote or remote group: %s"
 msgstr "無此遠端或遠端群組：%s"
 
-#: builtin/fetch.c:2205
+#: builtin/fetch.c
 msgid "fetching a group and specifying refspecs does not make sense"
 msgstr "取得群組並指定引用規格無意義"
 
-#: builtin/fetch.c:2221
+#: builtin/fetch.c
 msgid "must supply remote when using --negotiate-only"
 msgstr "使用 --negotiate-only 時必須提供遠端"
 
-#: builtin/fetch.c:2226
+#: builtin/fetch.c
 msgid "protocol does not support --negotiate-only, exiting"
 msgstr "通訊協定不支援 --negotiate-only。結束"
 
-#: builtin/fetch.c:2246
+#: builtin/fetch.c
 msgid ""
 "--filter can only be used with the remote configured in extensions."
 "partialclone"
 msgstr "只可以將 --filter 用於在 extensions.partialclone 中設定的遠端版本庫"
 
-#: builtin/fetch.c:2250
+#: builtin/fetch.c
 msgid "--atomic can only be used when fetching from one remote"
 msgstr "--atomic 只能在擷取 (fetch) 一個遠端時使用"
 
-#: builtin/fetch.c:2254
+#: builtin/fetch.c
 msgid "--stdin can only be used when fetching from one remote"
 msgstr "--stdin 只能在取得一個遠端時使用"
 
-#: builtin/fmt-merge-msg.c:7
+#: builtin/fmt-merge-msg.c
 msgid ""
 "git fmt-merge-msg [-m <message>] [--log[=<n>] | --no-log] [--file <file>]"
 msgstr "git fmt-merge-msg [-m <說明>] [--log[=<n>] | --no-log] [--file <檔案>]"
 
-#: builtin/fmt-merge-msg.c:19
+#: builtin/fmt-merge-msg.c
 msgid "populate log with at most <n> entries from shortlog"
 msgstr "向提交說明中最多複製指定條目（合併而來的提交）的簡短說明"
 
-#: builtin/fmt-merge-msg.c:22
+#: builtin/fmt-merge-msg.c
 msgid "alias for --log (deprecated)"
 msgstr "參數 --log 的別名（已棄用）"
 
-#: builtin/fmt-merge-msg.c:25
+#: builtin/fmt-merge-msg.c
 msgid "text"
 msgstr "文字"
 
-#: builtin/fmt-merge-msg.c:26
+#: builtin/fmt-merge-msg.c
 msgid "use <text> as start of message"
 msgstr "使用 <文字> 作為提交說明的開始"
 
-#: builtin/fmt-merge-msg.c:28
+#: builtin/fmt-merge-msg.c
 msgid "use <name> instead of the real target branch"
 msgstr "使用 <名稱> 而非實際目的地分支"
 
-#: builtin/fmt-merge-msg.c:29
+#: builtin/fmt-merge-msg.c
 msgid "file to read from"
 msgstr "從檔案中讀取"
 
-#: builtin/for-each-ref.c:10
+#: builtin/for-each-ref.c
 msgid "git for-each-ref [<options>] [<pattern>]"
 msgstr "git for-each-ref [<選項>] [<模式>]"
 
-#: builtin/for-each-ref.c:11
+#: builtin/for-each-ref.c
 msgid "git for-each-ref [--points-at <object>]"
 msgstr "git for-each-ref [--points-at <物件>]"
 
-#: builtin/for-each-ref.c:12
+#: builtin/for-each-ref.c
 msgid "git for-each-ref [--merged [<commit>]] [--no-merged [<commit>]]"
 msgstr "git for-each-ref [--merged [<提交>]] [--no-merged [<提交>]]"
 
-#: builtin/for-each-ref.c:13
+#: builtin/for-each-ref.c
 msgid "git for-each-ref [--contains [<commit>]] [--no-contains [<commit>]]"
 msgstr "git for-each-ref [--contains [<提交>]] [--no-contains [<提交>]]"
 
-#: builtin/for-each-ref.c:31
+#: builtin/for-each-ref.c
 msgid "quote placeholders suitably for shells"
 msgstr "引用占位符適用於 shells"
 
-#: builtin/for-each-ref.c:33
+#: builtin/for-each-ref.c
 msgid "quote placeholders suitably for perl"
 msgstr "引用占位符適用於 perl"
 
-#: builtin/for-each-ref.c:35
+#: builtin/for-each-ref.c
 msgid "quote placeholders suitably for python"
 msgstr "引用占位符適用於 python"
 
-#: builtin/for-each-ref.c:37
+#: builtin/for-each-ref.c
 msgid "quote placeholders suitably for Tcl"
 msgstr "引用占位符適用於 Tcl"
 
-#: builtin/for-each-ref.c:40
+#: builtin/for-each-ref.c
 msgid "show only <n> matched refs"
 msgstr "只顯示 <n> 個符合的引用"
 
-#: builtin/for-each-ref.c:42 builtin/tag.c:482
+#: builtin/for-each-ref.c builtin/tag.c
 msgid "respect format colors"
 msgstr "遵照格式中的顏色輸出"
 
-#: builtin/for-each-ref.c:45
+#: builtin/for-each-ref.c
 msgid "print only refs which points at the given object"
 msgstr "只列印指向提供物件的引用"
 
-#: builtin/for-each-ref.c:47
+#: builtin/for-each-ref.c
 msgid "print only refs that are merged"
 msgstr "只列印已經合併的引用"
 
-#: builtin/for-each-ref.c:48
+#: builtin/for-each-ref.c
 msgid "print only refs that are not merged"
 msgstr "只列印沒有合併的引用"
 
-#: builtin/for-each-ref.c:49
+#: builtin/for-each-ref.c
 msgid "print only refs which contain the commit"
 msgstr "只列印包含該提交的引用"
 
-#: builtin/for-each-ref.c:50
+#: builtin/for-each-ref.c
 msgid "print only refs which don't contain the commit"
 msgstr "只列印不包含該提交的引用"
 
-#: builtin/for-each-repo.c:9
+#: builtin/for-each-repo.c
 msgid "git for-each-repo --config=<config> <command-args>"
 msgstr "git for-each-repo --config=<設定> <命令引數>"
 
-#: builtin/for-each-repo.c:34
+#: builtin/for-each-repo.c
 msgid "config"
 msgstr "config"
 
-#: builtin/for-each-repo.c:35
+#: builtin/for-each-repo.c
 msgid "config key storing a list of repository paths"
 msgstr "儲存版本庫路徑清單的設定鍵"
 
-#: builtin/for-each-repo.c:43
+#: builtin/for-each-repo.c
 msgid "missing --config=<config>"
 msgstr "缺少 --config=<設定>"
 
-#: builtin/fsck.c:69 builtin/fsck.c:128 builtin/fsck.c:129
+#: builtin/fsck.c
 msgid "unknown"
 msgstr "未知"
 
 #. TRANSLATORS: e.g. error in tree 01bfda: <more explanation>
-#: builtin/fsck.c:78 builtin/fsck.c:100
+#: builtin/fsck.c
 #, c-format
 msgid "error in %s %s: %s"
 msgstr "%s %s 錯誤：%s"
 
 #. TRANSLATORS: e.g. warning in tree 01bfda: <more explanation>
-#: builtin/fsck.c:94
+#: builtin/fsck.c
 #, c-format
 msgid "warning in %s %s: %s"
 msgstr "%s %s 警告：%s"
 
-#: builtin/fsck.c:124 builtin/fsck.c:127
+#: builtin/fsck.c
 #, c-format
 msgid "broken link from %7s %s"
 msgstr "來自 %7s %s 的損壞的連結"
 
-#: builtin/fsck.c:136
+#: builtin/fsck.c
 msgid "wrong object type in link"
 msgstr "連結中錯誤的物件類型"
 
-#: builtin/fsck.c:152
+#: builtin/fsck.c
 #, c-format
 msgid ""
 "broken link from %7s %s\n"
@@ -15645,357 +7367,380 @@ msgstr ""
 "損壞的連結來自於 %7s %s\n"
 "              到 %7s %s"
 
-#: builtin/fsck.c:264
+#: builtin/fsck.c builtin/prune.c connected.c
+msgid "Checking connectivity"
+msgstr "正在檢查連通性"
+
+#: builtin/fsck.c
 #, c-format
 msgid "missing %s %s"
 msgstr "缺少 %s %s"
 
-#: builtin/fsck.c:291
+#: builtin/fsck.c
 #, c-format
 msgid "unreachable %s %s"
 msgstr "無法取得 %s %s"
 
-#: builtin/fsck.c:311
+#: builtin/fsck.c
 #, c-format
 msgid "dangling %s %s"
 msgstr "懸空 %s %s"
 
-#: builtin/fsck.c:321
+#: builtin/fsck.c
 msgid "could not create lost-found"
 msgstr "不能建立 lost-found"
 
-#: builtin/fsck.c:332
+#: builtin/fsck.c builtin/gc.c builtin/rebase.c rebase-interactive.c rerere.c
+#: sequencer.c
+#, c-format
+msgid "could not write '%s'"
+msgstr "不能寫入 '%s'"
+
+#: builtin/fsck.c
 #, c-format
 msgid "could not finish '%s'"
 msgstr "不能完成 '%s'"
 
-#: builtin/fsck.c:349
+#: builtin/fsck.c
 #, c-format
 msgid "Checking %s"
 msgstr "正在檢查 %s"
 
-#: builtin/fsck.c:387
+#: builtin/fsck.c
 #, c-format
 msgid "Checking connectivity (%d objects)"
 msgstr "正在檢查連通性（%d 個物件）"
 
-#: builtin/fsck.c:406
+#: builtin/fsck.c
 #, c-format
 msgid "Checking %s %s"
 msgstr "正在檢查 %s %s"
 
-#: builtin/fsck.c:411
+#: builtin/fsck.c
 msgid "broken links"
 msgstr "損壞的連結"
 
-#: builtin/fsck.c:420
+#: builtin/fsck.c
 #, c-format
 msgid "root %s"
 msgstr "根 %s"
 
-#: builtin/fsck.c:428
+#: builtin/fsck.c
 #, c-format
 msgid "tagged %s %s (%s) in %s"
 msgstr "已標記 %s %s (%s) 於 %s"
 
-#: builtin/fsck.c:457
+#: builtin/fsck.c
 #, c-format
 msgid "%s: object corrupt or missing"
 msgstr "%s：物件損壞或遺失"
 
-#: builtin/fsck.c:482
+#: builtin/fsck.c
 #, c-format
 msgid "%s: invalid reflog entry %s"
 msgstr "%s：無效的引用日誌條目 %s"
 
-#: builtin/fsck.c:496
+#: builtin/fsck.c
 #, c-format
 msgid "Checking reflog %s->%s"
 msgstr "正在檢查引用日誌 %s->%s"
 
-#: builtin/fsck.c:530
+#: builtin/fsck.c
 #, c-format
 msgid "%s: invalid sha1 pointer %s"
 msgstr "%s：無效的 sha1 指標 %s"
 
-#: builtin/fsck.c:537
+#: builtin/fsck.c
 #, c-format
 msgid "%s: not a commit"
 msgstr "%s：不是一個提交"
 
-#: builtin/fsck.c:591
+#: builtin/fsck.c
 msgid "notice: No default references"
 msgstr "注意：無預設引用"
 
-#: builtin/fsck.c:621
+#: builtin/fsck.c
 #, c-format
 msgid "%s: hash-path mismatch, found at: %s"
 msgstr "%s：雜湊路徑 (hash-path) 不符，找到的位置：%s"
 
-#: builtin/fsck.c:624
+#: builtin/fsck.c
 #, c-format
 msgid "%s: object corrupt or missing: %s"
 msgstr "%s：物件損壞或遺失：%s"
 
-#: builtin/fsck.c:628
+#: builtin/fsck.c
 #, c-format
 msgid "%s: object is of unknown type '%s': %s"
 msgstr "%s：物件屬於「%s」未知類型：%s"
 
-#: builtin/fsck.c:645
+#: builtin/fsck.c
 #, c-format
 msgid "%s: object could not be parsed: %s"
 msgstr "%s：不能解析物件：%s"
 
-#: builtin/fsck.c:665
+#: builtin/fsck.c
 #, c-format
 msgid "bad sha1 file: %s"
 msgstr "壞的 sha1 檔案：%s"
 
-#: builtin/fsck.c:686
+#: builtin/fsck.c
 msgid "Checking object directory"
 msgstr "正在檢查物件目錄"
 
-#: builtin/fsck.c:689
+#: builtin/fsck.c
 msgid "Checking object directories"
 msgstr "正在檢查物件目錄"
 
-#: builtin/fsck.c:705
+#: builtin/fsck.c
 #, c-format
 msgid "Checking %s link"
 msgstr "正在檢查 %s 連結"
 
-#: builtin/fsck.c:710 builtin/index-pack.c:862
+#: builtin/fsck.c builtin/index-pack.c
 #, c-format
 msgid "invalid %s"
 msgstr "無效的 %s"
 
-#: builtin/fsck.c:717
+#: builtin/fsck.c
 #, c-format
 msgid "%s points to something strange (%s)"
 msgstr "%s 指向奇怪的東西（%s）"
 
-#: builtin/fsck.c:723
+#: builtin/fsck.c
 #, c-format
 msgid "%s: detached HEAD points at nothing"
 msgstr "%s：分離開頭指標的指向不存在"
 
-#: builtin/fsck.c:727
+#: builtin/fsck.c
 #, c-format
 msgid "notice: %s points to an unborn branch (%s)"
 msgstr "注意：%s 指向一個尚未誕生的分支（%s）"
 
-#: builtin/fsck.c:739
+#: builtin/fsck.c
 msgid "Checking cache tree"
 msgstr "正在檢查快取樹"
 
-#: builtin/fsck.c:744
+#: builtin/fsck.c
 #, c-format
 msgid "%s: invalid sha1 pointer in cache-tree"
 msgstr "%s：cache-tree 中無效的 sha1 指標"
 
-#: builtin/fsck.c:753
+#: builtin/fsck.c
 msgid "non-tree in cache-tree"
 msgstr "cache-tree 中非樹狀物件"
 
-#: builtin/fsck.c:784
+#: builtin/fsck.c
 msgid "git fsck [<options>] [<object>...]"
 msgstr "git fsck [<選項>] [<物件>...]"
 
-#: builtin/fsck.c:790
+#: builtin/fsck.c
 msgid "show unreachable objects"
 msgstr "顯示無法取得的物件"
 
-#: builtin/fsck.c:791
+#: builtin/fsck.c
 msgid "show dangling objects"
 msgstr "顯示懸空的物件"
 
-#: builtin/fsck.c:792
+#: builtin/fsck.c
 msgid "report tags"
 msgstr "報告標籤"
 
-#: builtin/fsck.c:793
+#: builtin/fsck.c
 msgid "report root nodes"
 msgstr "報告根節點"
 
-#: builtin/fsck.c:794
+#: builtin/fsck.c
 msgid "make index objects head nodes"
 msgstr "將索引亦作為檢查的頭節點"
 
-#: builtin/fsck.c:795
+#: builtin/fsck.c
 msgid "make reflogs head nodes (default)"
 msgstr "將引用日誌作為檢查的 HEAD 節點（預設）"
 
-#: builtin/fsck.c:796
+#: builtin/fsck.c
 msgid "also consider packs and alternate objects"
 msgstr "也考慮包和備用物件"
 
-#: builtin/fsck.c:797
+#: builtin/fsck.c
 msgid "check only connectivity"
 msgstr "僅檢查連通性"
 
-#: builtin/fsck.c:798 builtin/mktag.c:75
+#: builtin/fsck.c builtin/mktag.c
 msgid "enable more strict checking"
 msgstr "啟用更嚴格的檢查"
 
-#: builtin/fsck.c:800
+#: builtin/fsck.c
 msgid "write dangling objects in .git/lost-found"
 msgstr "將懸空物件寫入 .git/lost-found 中"
 
-#: builtin/fsck.c:801 builtin/prune.c:146
+#: builtin/fsck.c builtin/prune.c
 msgid "show progress"
 msgstr "顯示進度"
 
-#: builtin/fsck.c:802
+#: builtin/fsck.c
 msgid "show verbose names for reachable objects"
 msgstr "顯示可以取得物件的詳細名稱"
 
-#: builtin/fsck.c:862 builtin/index-pack.c:261
+#: builtin/fsck.c builtin/index-pack.c
 msgid "Checking objects"
 msgstr "正在檢查物件"
 
-#: builtin/fsck.c:890
+#: builtin/fsck.c
 #, c-format
 msgid "%s: object missing"
 msgstr "%s：物件缺少"
 
-#: builtin/fsck.c:901
+#: builtin/fsck.c
 #, c-format
 msgid "invalid parameter: expected sha1, got '%s'"
 msgstr "無效的參數：期望 sha1，得到 '%s'"
 
-#: builtin/fsmonitor--daemon.c:13
+#: builtin/fsmonitor--daemon.c
 msgid "git fsmonitor--daemon start [<options>]"
 msgstr "git fsmonitor--daemon start [<options>]"
 
-#: builtin/fsmonitor--daemon.c:14
+#: builtin/fsmonitor--daemon.c
 msgid "git fsmonitor--daemon run [<options>]"
 msgstr "git fsmonitor--daemon run [<options>]"
 
-#: builtin/fsmonitor--daemon.c:15
+#: builtin/fsmonitor--daemon.c
 msgid "git fsmonitor--daemon stop"
 msgstr "git fsmonitor--daemon stop"
 
-#: builtin/fsmonitor--daemon.c:16
+#: builtin/fsmonitor--daemon.c
 msgid "git fsmonitor--daemon status"
 msgstr "git fsmonitor--daemon status"
 
-#: builtin/fsmonitor--daemon.c:38 builtin/fsmonitor--daemon.c:47
+#: builtin/fsmonitor--daemon.c
 #, c-format
 msgid "value of '%s' out of range: %d"
 msgstr "「%s」的數值超出範圍：%d"
 
-#: builtin/fsmonitor--daemon.c:57
+#: builtin/fsmonitor--daemon.c
 #, c-format
 msgid "value of '%s' not bool or int: %d"
 msgstr "「%s」的數值不是布林值或整數：%d"
 
-#: builtin/fsmonitor--daemon.c:99
+#: builtin/fsmonitor--daemon.c
 #, c-format
 msgid "fsmonitor-daemon is watching '%s'\n"
 msgstr "fsmonitor-daemon 正在監控「%s」\n"
 
-#: builtin/fsmonitor--daemon.c:104
+#: builtin/fsmonitor--daemon.c
 #, c-format
 msgid "fsmonitor-daemon is not watching '%s'\n"
 msgstr "fsmonitor-daemon 未在監控「%s」\n"
 
-#: builtin/fsmonitor--daemon.c:170
+#: builtin/fsmonitor--daemon.c
 #, c-format
 msgid "could not create fsmonitor cookie '%s'"
 msgstr "無法建立 fsmonitor cookie「%s」"
 
-#: builtin/fsmonitor--daemon.c:753
+#: builtin/fsmonitor--daemon.c
 #, c-format
 msgid "fsmonitor: cookie_result '%d' != SEEN"
 msgstr "fsmonitor：cookie_result '%d' != SEEN"
 
-#: builtin/fsmonitor--daemon.c:1187
+#: builtin/fsmonitor--daemon.c
 #, c-format
 msgid "could not start IPC thread pool on '%s'"
 msgstr "無法在「%s」啟動 IPC 執行緒集區"
 
-#: builtin/fsmonitor--daemon.c:1199
+#: builtin/fsmonitor--daemon.c
 msgid "could not start fsmonitor listener thread"
 msgstr "無法啟動 fsmonitor 監聽執行緒"
 
-#: builtin/fsmonitor--daemon.c:1297
+#: builtin/fsmonitor--daemon.c
+msgid "could not start fsmonitor health thread"
+msgstr "無法啟動 fsmonitor 健康監聽執行緒"
+
+#: builtin/fsmonitor--daemon.c
 msgid "could not initialize listener thread"
 msgstr "無法初始化監聽執行緒"
 
-#: builtin/fsmonitor--daemon.c:1328 builtin/fsmonitor--daemon.c:1383
+#: builtin/fsmonitor--daemon.c
+msgid "could not initialize health thread"
+msgstr "無法初始化健康監聽執行緒"
+
+#: builtin/fsmonitor--daemon.c
+#, c-format
+msgid "could not cd home '%s'"
+msgstr "無法 cd home '%s'"
+
+#: builtin/fsmonitor--daemon.c
 #, c-format
 msgid "fsmonitor--daemon is already running '%s'"
 msgstr "fsmonitor--daemon 已在執行「%s」"
 
-#: builtin/fsmonitor--daemon.c:1332
+#: builtin/fsmonitor--daemon.c
 #, c-format
 msgid "running fsmonitor-daemon in '%s'\n"
 msgstr "正在「%s」執行 fsmonitor-daemon\n"
 
-#: builtin/fsmonitor--daemon.c:1387
+#: builtin/fsmonitor--daemon.c
 #, c-format
 msgid "starting fsmonitor-daemon in '%s'\n"
 msgstr "正在「%s」啟動 fsmonitor-daemon\n"
 
-#: builtin/fsmonitor--daemon.c:1413
+#: builtin/fsmonitor--daemon.c
 msgid "daemon failed to start"
 msgstr "無法啟動守護程式"
 
-#: builtin/fsmonitor--daemon.c:1416
+#: builtin/fsmonitor--daemon.c
 msgid "daemon not online yet"
 msgstr "守護程式尚未上線"
 
-#: builtin/fsmonitor--daemon.c:1419
+#: builtin/fsmonitor--daemon.c
 msgid "daemon terminated"
 msgstr "守護程式已終止"
 
-#: builtin/fsmonitor--daemon.c:1429
+#: builtin/fsmonitor--daemon.c
 msgid "detach from console"
 msgstr "從主控台分離"
 
-#: builtin/fsmonitor--daemon.c:1432
+#: builtin/fsmonitor--daemon.c
 msgid "use <n> ipc worker threads"
 msgstr "使用 <n> 個 IPC 工作執行緒"
 
-#: builtin/fsmonitor--daemon.c:1435
+#: builtin/fsmonitor--daemon.c
 msgid "max seconds to wait for background daemon startup"
 msgstr "要等待背景守護程式啟動的最長秒數"
 
-#: builtin/fsmonitor--daemon.c:1449
+#: builtin/fsmonitor--daemon.c
 #, c-format
 msgid "invalid 'ipc-threads' value (%d)"
 msgstr "無效的「ipc-threads」數值（%d）"
 
-#: builtin/fsmonitor--daemon.c:1464
+#: builtin/fsmonitor--daemon.c
 #, c-format
 msgid "Unhandled subcommand '%s'"
 msgstr "未處理的子命令「%s」"
 
-#: builtin/fsmonitor--daemon.c:1477
+#: builtin/fsmonitor--daemon.c
 msgid "fsmonitor--daemon not supported on this platform"
 msgstr "fsmonitor--daemon 不支援本平台"
 
-#: builtin/gc.c:39
+#: builtin/gc.c
 msgid "git gc [<options>]"
 msgstr "git gc [<選項>]"
 
-#: builtin/gc.c:93
+#: builtin/gc.c
 #, c-format
 msgid "Failed to fstat %s: %s"
 msgstr "對 %s 呼叫 fstat 失敗：%s"
 
-#: builtin/gc.c:129
+#: builtin/gc.c
 #, c-format
 msgid "failed to parse '%s' value '%s'"
 msgstr "無法解析 '%s' 值 '%s'"
 
-#: builtin/gc.c:488 builtin/init-db.c:57
+#: builtin/gc.c builtin/init-db.c
 #, c-format
 msgid "cannot stat '%s'"
 msgstr "不能對 '%s' 呼叫 stat"
 
-#: builtin/gc.c:504
+#: builtin/gc.c
 #, c-format
 msgid ""
 "The last gc run reported the following. Please correct the root cause\n"
@@ -16009,272 +7754,280 @@ msgstr ""
 "\n"
 "%s"
 
-#: builtin/gc.c:552
+#: builtin/gc.c
 msgid "prune unreferenced objects"
 msgstr "清除未引用的物件"
 
-#: builtin/gc.c:554
+#: builtin/gc.c
+msgid "pack unreferenced objects separately"
+msgstr "獨立封裝無參照物件"
+
+#: builtin/gc.c
 msgid "be more thorough (increased runtime)"
 msgstr "更徹底（增加執行時間）"
 
-#: builtin/gc.c:555
+#: builtin/gc.c
 msgid "enable auto-gc mode"
 msgstr "啟用自動垃圾回收模式"
 
-#: builtin/gc.c:558
+#: builtin/gc.c
 msgid "force running gc even if there may be another gc running"
 msgstr "強制執行 gc 即使另外一個 gc 正在執行"
 
-#: builtin/gc.c:561
+#: builtin/gc.c
 msgid "repack all other packs except the largest pack"
-msgstr "除了最大的包之外，對所有其它包檔案重新打包"
+msgstr "除了最大的包之外，對所有其它包重新打包"
 
-#: builtin/gc.c:577
+#: builtin/gc.c
 #, c-format
-msgid "failed to parse gc.logexpiry value %s"
-msgstr "解析 gc.logexpiry 的值 %s 失敗"
+msgid "failed to parse gc.logExpiry value %s"
+msgstr "無法解析 gc.logExpiry 的值 %s"
 
-#: builtin/gc.c:588
+#: builtin/gc.c
 #, c-format
 msgid "failed to parse prune expiry value %s"
 msgstr "解析清除期限值 %s 失敗"
 
-#: builtin/gc.c:608
+#: builtin/gc.c
 #, c-format
 msgid "Auto packing the repository in background for optimum performance.\n"
 msgstr "自動在後台執行版本庫打包以求最佳性能。\n"
 
-#: builtin/gc.c:610
+#: builtin/gc.c
 #, c-format
 msgid "Auto packing the repository for optimum performance.\n"
 msgstr "自動打包版本庫以求最佳性能。\n"
 
-#: builtin/gc.c:611
+#: builtin/gc.c
 #, c-format
 msgid "See \"git help gc\" for manual housekeeping.\n"
 msgstr "手動維護參見 \"git help gc\"。\n"
 
-#: builtin/gc.c:652
+#: builtin/gc.c
 #, c-format
 msgid ""
 "gc is already running on machine '%s' pid %<PRIuMAX> (use --force if not)"
 msgstr "gc 已在「%s」機器 pid %<PRIuMAX> 執行（如果不是，使用 --force）"
 
-#: builtin/gc.c:707
+#: builtin/gc.c
 msgid ""
 "There are too many unreachable loose objects; run 'git prune' to remove them."
 msgstr "有太多無法取得的鬆散物件，執行「git prune」刪除它們。"
 
-#: builtin/gc.c:717
+#: builtin/gc.c
 msgid ""
 "git maintenance run [--auto] [--[no-]quiet] [--task=<task>] [--schedule]"
 msgstr ""
 "git maintenance run [--auto] [--[no-]quiet] [--task=<作業>] [--schedule]"
 
-#: builtin/gc.c:747
+#: builtin/gc.c
 msgid "--no-schedule is not allowed"
 msgstr "不允許 --no-schedule"
 
-#: builtin/gc.c:752
+#: builtin/gc.c
 #, c-format
 msgid "unrecognized --schedule argument '%s'"
 msgstr "無法識別的 --schedule 引數 '%s'"
 
-#: builtin/gc.c:870
+#: builtin/gc.c
 msgid "failed to write commit-graph"
 msgstr "無法寫入提交圖形"
 
-#: builtin/gc.c:906
+#: builtin/gc.c
 msgid "failed to prefetch remotes"
 msgstr "無法預先取得遠端"
 
-#: builtin/gc.c:1022
+#: builtin/gc.c
 msgid "failed to start 'git pack-objects' process"
 msgstr "無法啟動 ‘git pack-objects’ 處理程序"
 
-#: builtin/gc.c:1039
+#: builtin/gc.c
 msgid "failed to finish 'git pack-objects' process"
 msgstr "無法完成 ‘git pack-objects’ 處理程序"
 
-#: builtin/gc.c:1090
+#: builtin/gc.c
 msgid "failed to write multi-pack-index"
 msgstr "無法寫入多包索引"
 
-#: builtin/gc.c:1106
+#: builtin/gc.c
 msgid "'git multi-pack-index expire' failed"
 msgstr "'git multi-pack-index expire' 失敗"
 
-#: builtin/gc.c:1165
+#: builtin/gc.c
 msgid "'git multi-pack-index repack' failed"
 msgstr "'git multi-pack-index repack' 失敗"
 
-#: builtin/gc.c:1174
+#: builtin/gc.c
 msgid ""
 "skipping incremental-repack task because core.multiPackIndex is disabled"
 msgstr "略過增量重新打包工作，因為 core.multiPackIndex 已被停用"
 
-#: builtin/gc.c:1278
+#: builtin/gc.c
 #, c-format
 msgid "lock file '%s' exists, skipping maintenance"
 msgstr "已存在 '%s' 鎖定檔案，略過維護"
 
-#: builtin/gc.c:1308
+#: builtin/gc.c
 #, c-format
 msgid "task '%s' failed"
 msgstr "作業 '%s' 失敗"
 
-#: builtin/gc.c:1390
+#: builtin/gc.c
 #, c-format
 msgid "'%s' is not a valid task"
 msgstr "'%s' 非有效作業"
 
-#: builtin/gc.c:1395
+#: builtin/gc.c
 #, c-format
 msgid "task '%s' cannot be selected multiple times"
 msgstr "不能多次選取 '%s' 作業"
 
-#: builtin/gc.c:1410
+#: builtin/gc.c
 msgid "run tasks based on the state of the repository"
 msgstr "基於版本庫狀態執行作業"
 
-#: builtin/gc.c:1411
+#: builtin/gc.c
 msgid "frequency"
 msgstr "frequency"
 
-#: builtin/gc.c:1412
+#: builtin/gc.c
 msgid "run tasks based on frequency"
 msgstr "依據頻率執行工作"
 
-#: builtin/gc.c:1415
+#: builtin/gc.c
 msgid "do not report progress or other information over stderr"
 msgstr "不要在 stderr 輸出進度或其他資訊"
 
-#: builtin/gc.c:1416
+#: builtin/gc.c
 msgid "task"
 msgstr "作業"
 
-#: builtin/gc.c:1417
+#: builtin/gc.c
 msgid "run a specific task"
 msgstr "執行指定作業"
 
-#: builtin/gc.c:1434
+#: builtin/gc.c
 msgid "use at most one of --auto and --schedule=<frequency>"
 msgstr "--auto 和 --schedule=<頻率> 請任選一"
 
-#: builtin/gc.c:1477
+#: builtin/gc.c
 msgid "failed to run 'git config'"
 msgstr "無法執行 ‘git config’"
 
-#: builtin/gc.c:1629
+#: builtin/gc.c
 #, c-format
 msgid "failed to expand path '%s'"
 msgstr "無法展開「%s」路徑"
 
-#: builtin/gc.c:1656 builtin/gc.c:1694
+#: builtin/gc.c
 msgid "failed to start launchctl"
 msgstr "無法啟動 launchctl"
 
-#: builtin/gc.c:1769 builtin/gc.c:2237
+#: builtin/gc.c
 #, c-format
 msgid "failed to create directories for '%s'"
 msgstr "無法建立「%s」的目錄"
 
-#: builtin/gc.c:1796
+#: builtin/gc.c
 #, c-format
 msgid "failed to bootstrap service %s"
 msgstr "無法啟動載入 %s 服務"
 
-#: builtin/gc.c:1889
+#: builtin/gc.c
 msgid "failed to create temp xml file"
 msgstr "無法建立暫存 XML 檔案"
 
-#: builtin/gc.c:1979
+#: builtin/gc.c
 msgid "failed to start schtasks"
 msgstr "無法啟動 schtasks"
 
-#: builtin/gc.c:2063
+#: builtin/gc.c
 msgid "failed to run 'crontab -l'; your system might not support 'cron'"
 msgstr "無法執行 “crontab -l”；您的系統可能不支援 “cron”"
 
-#: builtin/gc.c:2080
+#: builtin/gc.c
 msgid "failed to run 'crontab'; your system might not support 'cron'"
 msgstr "無法執行 “crontab”；您的系統可能不支援 “cron”"
 
-#: builtin/gc.c:2084
+#: builtin/gc.c
 msgid "failed to open stdin of 'crontab'"
 msgstr "無法開啟 ‘crontab’ 的標準輸入"
 
-#: builtin/gc.c:2126
+#: builtin/gc.c
 msgid "'crontab' died"
 msgstr "“crontab” 結束運作"
 
-#: builtin/gc.c:2191
+#: builtin/gc.c
 msgid "failed to start systemctl"
 msgstr "無法啟動 systemctl"
 
-#: builtin/gc.c:2201
+#: builtin/gc.c
 msgid "failed to run systemctl"
 msgstr "無法執行 systemctl"
 
-#: builtin/gc.c:2210 builtin/gc.c:2215 builtin/worktree.c:63
-#: builtin/worktree.c:1024
+#: builtin/gc.c builtin/worktree.c
 #, c-format
 msgid "failed to delete '%s'"
 msgstr "刪除 '%s' 失敗"
 
-#: builtin/gc.c:2395
+#: builtin/gc.c rerere.c
+#, c-format
+msgid "failed to flush '%s'"
+msgstr "排清 '%s' 失敗"
+
+#: builtin/gc.c
 #, c-format
 msgid "unrecognized --scheduler argument '%s'"
 msgstr "無法識別的 --scheduler 引數 '%s'"
 
-#: builtin/gc.c:2420
+#: builtin/gc.c
 msgid "neither systemd timers nor crontab are available"
 msgstr "不支援 systemd 計時器或 crontab"
 
-#: builtin/gc.c:2435
+#: builtin/gc.c
 #, c-format
 msgid "%s scheduler is not available"
 msgstr "無法使用 %s 排程器"
 
-#: builtin/gc.c:2449
+#: builtin/gc.c
 msgid "another process is scheduling background maintenance"
 msgstr "其他處理程序正在排定背景維護工作"
 
-#: builtin/gc.c:2471
+#: builtin/gc.c
 msgid "git maintenance start [--scheduler=<scheduler>]"
 msgstr "git maintenance start [--scheduler=<scheduler>]"
 
-#: builtin/gc.c:2480
+#: builtin/gc.c
 msgid "scheduler"
 msgstr "scheduler"
 
-#: builtin/gc.c:2481
+#: builtin/gc.c
 msgid "scheduler to trigger git maintenance run"
 msgstr "要觸發 git maintenance run 的排程器"
 
-#: builtin/gc.c:2495
+#: builtin/gc.c
 msgid "failed to add repo to global config"
 msgstr "無法將版本庫加至全域設定"
 
-#: builtin/gc.c:2504
+#: builtin/gc.c
 msgid "git maintenance <subcommand> [<options>]"
 msgstr "git maintenance <子命令> [<選項>]"
 
-#: builtin/gc.c:2523
+#: builtin/gc.c
 #, c-format
 msgid "invalid subcommand: %s"
 msgstr "無效子命令：%s"
 
-#: builtin/grep.c:32
+#: builtin/grep.c
 msgid "git grep [<options>] [-e] <pattern> [<rev>...] [[--] <path>...]"
 msgstr "git grep [<選項>] [-e] <模式> [<版本>...] [[--] <路徑>...]"
 
-#: builtin/grep.c:241
+#: builtin/grep.c
 #, c-format
 msgid "grep: failed to create thread: %s"
 msgstr "grep：無法建立執行緒：%s"
 
-#: builtin/grep.c:295
+#: builtin/grep.c
 #, c-format
 msgid "invalid number of threads specified (%d) for %s"
 msgstr "為 %2$s 設定的執行緒數 (%1$d) 無效"
@@ -16283,255 +8036,254 @@ msgstr "為 %2$s 設定的執行緒數 (%1$d) 無效"
 #. variable for tweaking threads, currently
 #. grep.threads
 #.
-#: builtin/grep.c:303 builtin/index-pack.c:1587 builtin/index-pack.c:1791
-#: builtin/pack-objects.c:3150
+#: builtin/grep.c builtin/index-pack.c builtin/pack-objects.c
 #, c-format
 msgid "no threads support, ignoring %s"
 msgstr "沒有執行緒支援，忽略 %s"
 
-#: builtin/grep.c:490 builtin/grep.c:619 builtin/grep.c:659
+#: builtin/grep.c
 #, c-format
 msgid "unable to read tree (%s)"
 msgstr "無法讀取樹（%s）"
 
-#: builtin/grep.c:674
+#: builtin/grep.c
 #, c-format
 msgid "unable to grep from object of type %s"
 msgstr "無法抓取來自於 %s 類型的物件"
 
-#: builtin/grep.c:754
+#: builtin/grep.c
 #, c-format
 msgid "switch `%c' expects a numerical value"
 msgstr "開關 `%c' 期望一個數字值"
 
-#: builtin/grep.c:852
+#: builtin/grep.c
 msgid "search in index instead of in the work tree"
 msgstr "在索引區搜尋而不是在工作區"
 
-#: builtin/grep.c:854
+#: builtin/grep.c
 msgid "find in contents not managed by git"
 msgstr "在未被 git 管理的內容中尋找"
 
 #  譯者：中文字串拼接，可刪除前導空格
-#: builtin/grep.c:856
+#: builtin/grep.c
 msgid "search in both tracked and untracked files"
 msgstr "在追蹤和未追蹤的檔案中搜尋"
 
-#: builtin/grep.c:858
+#: builtin/grep.c
 msgid "ignore files specified via '.gitignore'"
 msgstr "忽略 '.gitignore' 包含的檔案"
 
-#: builtin/grep.c:860
+#: builtin/grep.c
 msgid "recursively search in each submodule"
 msgstr "在每一個子模組中遞迴搜尋"
 
-#: builtin/grep.c:863
+#: builtin/grep.c
 msgid "show non-matching lines"
 msgstr "顯示未符合的行"
 
-#: builtin/grep.c:865
+#: builtin/grep.c
 msgid "case insensitive matching"
 msgstr "不區分大小寫符合"
 
-#: builtin/grep.c:867
+#: builtin/grep.c
 msgid "match patterns only at word boundaries"
 msgstr "只在單詞邊界符合模式"
 
-#: builtin/grep.c:869
+#: builtin/grep.c
 msgid "process binary files as text"
 msgstr "把二進位檔案當做文字處理"
 
-#: builtin/grep.c:871
+#: builtin/grep.c
 msgid "don't match patterns in binary files"
 msgstr "不在二進位檔案中符合模式"
 
-#: builtin/grep.c:874
+#: builtin/grep.c
 msgid "process binary files with textconv filters"
 msgstr "用 textconv 過濾器處理二進位檔案"
 
-#: builtin/grep.c:876
+#: builtin/grep.c
 msgid "search in subdirectories (default)"
 msgstr "在子目錄中尋找（預設）"
 
-#: builtin/grep.c:878
+#: builtin/grep.c
 msgid "descend at most <depth> levels"
 msgstr "最多以指定的深度向下尋找"
 
-#: builtin/grep.c:882
+#: builtin/grep.c
 msgid "use extended POSIX regular expressions"
 msgstr "使用延伸的 POSIX 常規表示式"
 
-#: builtin/grep.c:885
+#: builtin/grep.c
 msgid "use basic POSIX regular expressions (default)"
 msgstr "使用基本的 POSIX 常規表示式（預設）"
 
-#: builtin/grep.c:888
+#: builtin/grep.c
 msgid "interpret patterns as fixed strings"
 msgstr "把模式解析為固定的字串"
 
-#: builtin/grep.c:891
+#: builtin/grep.c
 msgid "use Perl-compatible regular expressions"
 msgstr "使用 Perl 相容的常規表示式"
 
-#: builtin/grep.c:894
+#: builtin/grep.c
 msgid "show line numbers"
 msgstr "顯示行號"
 
-#: builtin/grep.c:895
+#: builtin/grep.c
 msgid "show column number of first match"
 msgstr "顯示第一個符合的列號"
 
-#: builtin/grep.c:896
+#: builtin/grep.c
 msgid "don't show filenames"
 msgstr "不顯示檔案名"
 
-#: builtin/grep.c:897
+#: builtin/grep.c
 msgid "show filenames"
 msgstr "顯示檔案名"
 
-#: builtin/grep.c:899
+#: builtin/grep.c
 msgid "show filenames relative to top directory"
 msgstr "顯示相對於頂級目錄的檔案名"
 
-#: builtin/grep.c:901
+#: builtin/grep.c
 msgid "show only filenames instead of matching lines"
 msgstr "只顯示檔案名而不顯示符合的行"
 
-#: builtin/grep.c:903
+#: builtin/grep.c
 msgid "synonym for --files-with-matches"
 msgstr "和 --files-with-matches 同義"
 
-#: builtin/grep.c:906
+#: builtin/grep.c
 msgid "show only the names of files without match"
 msgstr "只顯示未符合的檔案名"
 
-#: builtin/grep.c:908
+#: builtin/grep.c
 msgid "print NUL after filenames"
 msgstr "在檔案名後輸出 NUL 字元"
 
-#: builtin/grep.c:911
+#: builtin/grep.c
 msgid "show only matching parts of a line"
 msgstr "只顯示行中的符合的部分"
 
-#: builtin/grep.c:913
+#: builtin/grep.c
 msgid "show the number of matches instead of matching lines"
 msgstr "顯示總符合行數，而不顯示符合的行"
 
-#: builtin/grep.c:914
+#: builtin/grep.c
 msgid "highlight matches"
 msgstr "高亮顯示符合項"
 
-#: builtin/grep.c:916
+#: builtin/grep.c
 msgid "print empty line between matches from different files"
 msgstr "在不同檔案的符合項之間列印空行"
 
-#: builtin/grep.c:918
+#: builtin/grep.c
 msgid "show filename only once above matches from same file"
 msgstr "只在同一檔案的符合項的上面顯示一次檔案名"
 
-#: builtin/grep.c:921
+#: builtin/grep.c
 msgid "show <n> context lines before and after matches"
 msgstr "顯示符合項前後的 <n> 行上下文"
 
-#: builtin/grep.c:924
+#: builtin/grep.c
 msgid "show <n> context lines before matches"
 msgstr "顯示符合項前 <n> 行上下文"
 
-#: builtin/grep.c:926
+#: builtin/grep.c
 msgid "show <n> context lines after matches"
 msgstr "顯示符合項後 <n> 行上下文"
 
-#: builtin/grep.c:928
+#: builtin/grep.c
 msgid "use <n> worker threads"
 msgstr "使用 <n> 個工作執行緒"
 
-#: builtin/grep.c:929
+#: builtin/grep.c
 msgid "shortcut for -C NUM"
 msgstr "快捷鍵 -C 數字"
 
-#: builtin/grep.c:932
+#: builtin/grep.c
 msgid "show a line with the function name before matches"
 msgstr "在符合的前面顯示一行函數名"
 
-#: builtin/grep.c:934
+#: builtin/grep.c
 msgid "show the surrounding function"
 msgstr "顯示所在函數的前後內容"
 
-#: builtin/grep.c:937
+#: builtin/grep.c
 msgid "read patterns from file"
 msgstr "從檔案讀取模式"
 
-#: builtin/grep.c:939
+#: builtin/grep.c
 msgid "match <pattern>"
 msgstr "符合 <模式>"
 
-#: builtin/grep.c:941
+#: builtin/grep.c
 msgid "combine patterns specified with -e"
 msgstr "組合用 -e 參數設定的模式"
 
-#: builtin/grep.c:953
+#: builtin/grep.c
 msgid "indicate hit with exit status without output"
 msgstr "不輸出，而用離開碼標記命中狀態"
 
-#: builtin/grep.c:955
+#: builtin/grep.c
 msgid "show only matches from files that match all patterns"
 msgstr "只顯示符合所有模式的檔案中的符合"
 
-#: builtin/grep.c:958
+#: builtin/grep.c
 msgid "pager"
 msgstr "分頁"
 
-#: builtin/grep.c:958
+#: builtin/grep.c
 msgid "show matching files in the pager"
 msgstr "分頁顯示符合的檔案"
 
-#: builtin/grep.c:962
+#: builtin/grep.c
 msgid "allow calling of grep(1) (ignored by this build)"
 msgstr "允許呼叫 grep(1)（本次組建忽略）"
 
-#: builtin/grep.c:1028
+#: builtin/grep.c
 msgid "no pattern given"
 msgstr "未提供符合模式"
 
-#: builtin/grep.c:1064
+#: builtin/grep.c
 msgid "--no-index or --untracked cannot be used with revs"
 msgstr "--no-index 或 --untracked 不能和版本同時使用"
 
-#: builtin/grep.c:1072
+#: builtin/grep.c
 #, c-format
 msgid "unable to resolve revision: %s"
 msgstr "不能解析版本：%s"
 
-#: builtin/grep.c:1102
+#: builtin/grep.c
 msgid "--untracked not supported with --recurse-submodules"
 msgstr "--untracked 不支援與 --recurse-submodules 一起使用"
 
-#: builtin/grep.c:1106
+#: builtin/grep.c
 msgid "invalid option combination, ignoring --threads"
 msgstr "無效的選項組合，忽略 --threads"
 
-#: builtin/grep.c:1109 builtin/pack-objects.c:4084
+#: builtin/grep.c builtin/pack-objects.c
 msgid "no threads support, ignoring --threads"
 msgstr "沒有執行緒支援，忽略 --threads"
 
-#: builtin/grep.c:1112 builtin/index-pack.c:1584 builtin/pack-objects.c:3147
+#: builtin/grep.c builtin/index-pack.c builtin/pack-objects.c
 #, c-format
 msgid "invalid number of threads specified (%d)"
 msgstr "指定的執行緒數無效（%d）"
 
-#: builtin/grep.c:1146
+#: builtin/grep.c
 msgid "--open-files-in-pager only works on the worktree"
 msgstr "--open-files-in-pager 僅用於工作區"
 
-#: builtin/grep.c:1179
+#: builtin/grep.c
 msgid "--[no-]exclude-standard cannot be used for tracked contents"
 msgstr "--[no-]exclude-standard 不能用於已追蹤內容"
 
-#: builtin/grep.c:1187
+#: builtin/grep.c
 msgid "both --cached and trees are given"
 msgstr "同時給出了 --cached 和樹狀物件"
 
-#: builtin/hash-object.c:83
+#: builtin/hash-object.c
 msgid ""
 "git hash-object [-t <type>] [-w] [--path=<file> | --no-filters] [--stdin] "
 "[--] <file>..."
@@ -16539,99 +8291,99 @@ msgstr ""
 "git hash-object [-t <類型>] [-w] [--path=<檔案> | --no-filters] [--stdin] "
 "[--] <檔案>..."
 
-#: builtin/hash-object.c:97
+#: builtin/hash-object.c
 msgid "object type"
 msgstr "物件類型"
 
-#: builtin/hash-object.c:98
+#: builtin/hash-object.c
 msgid "write the object into the object database"
 msgstr "將物件寫入物件資料庫"
 
-#: builtin/hash-object.c:100
+#: builtin/hash-object.c
 msgid "read the object from stdin"
 msgstr "從標準輸入讀取物件"
 
-#: builtin/hash-object.c:102
+#: builtin/hash-object.c
 msgid "store file as is without filters"
 msgstr "原樣儲存檔案不使用過濾器"
 
-#: builtin/hash-object.c:103
+#: builtin/hash-object.c
 msgid ""
 "just hash any random garbage to create corrupt objects for debugging Git"
 msgstr "允許對任意隨機垃圾資料做散列來建立損壞的物件以便除錯 Git"
 
-#: builtin/hash-object.c:104
+#: builtin/hash-object.c
 msgid "process file as it were from this path"
 msgstr "處理檔案並假設其來自於此路徑"
 
-#: builtin/help.c:57
+#: builtin/help.c
 msgid "print all available commands"
 msgstr "列印所有可用的指令"
 
-#: builtin/help.c:60
+#: builtin/help.c
 msgid "show external commands in --all"
 msgstr "在 --all 顯示外部命令"
 
-#: builtin/help.c:61
+#: builtin/help.c
 msgid "show aliases in --all"
 msgstr "在 --all 顯示別名"
 
-#: builtin/help.c:62
+#: builtin/help.c
 msgid "exclude guides"
 msgstr "排除嚮導"
 
-#: builtin/help.c:63
+#: builtin/help.c
 msgid "show man page"
 msgstr "顯示 man 手冊"
 
-#: builtin/help.c:64
+#: builtin/help.c
 msgid "show manual in web browser"
 msgstr "在 web 瀏覽器中顯示手冊"
 
-#: builtin/help.c:66
+#: builtin/help.c
 msgid "show info page"
 msgstr "顯示 info 手冊"
 
-#: builtin/help.c:68
+#: builtin/help.c
 msgid "print command description"
 msgstr "列印指令描述"
 
-#: builtin/help.c:70
+#: builtin/help.c
 msgid "print list of useful guides"
 msgstr "顯示有用的指南列表"
 
-#: builtin/help.c:72
+#: builtin/help.c
 msgid "print all configuration variable names"
 msgstr "列印所有設定變數名稱"
 
-#: builtin/help.c:84
+#: builtin/help.c
 msgid "git help [[-i|--info] [-m|--man] [-w|--web]] [<command>]"
 msgstr "git help [[-i|--info] [-m|--man] [-w|--web]] [<command>]"
 
-#: builtin/help.c:201
+#: builtin/help.c
 #, c-format
 msgid "unrecognized help format '%s'"
 msgstr "無法識別的協助格式 '%s'"
 
-#: builtin/help.c:227
+#: builtin/help.c
 msgid "Failed to start emacsclient."
 msgstr "無法啟動 emacsclient。"
 
-#: builtin/help.c:240
+#: builtin/help.c
 msgid "Failed to parse emacsclient version."
 msgstr "無法解析 emacsclient 版本。"
 
-#: builtin/help.c:248
+#: builtin/help.c
 #, c-format
 msgid "emacsclient version '%d' too old (< 22)."
 msgstr "emacsclient 版本 '%d' 太老（< 22）。"
 
-#: builtin/help.c:266 builtin/help.c:288 builtin/help.c:298 builtin/help.c:306
+#: builtin/help.c
 #, c-format
 msgid "failed to exec '%s'"
 msgstr "執行 '%s' 失敗"
 
-#: builtin/help.c:344
+#: builtin/help.c
 #, c-format
 msgid ""
 "'%s': path for unsupported man viewer.\n"
@@ -16640,7 +8392,7 @@ msgstr ""
 "'%s'：不支援的 man 手冊檢視器的路徑。\n"
 "請使用 'man.<工具>.cmd'。"
 
-#: builtin/help.c:356
+#: builtin/help.c
 #, c-format
 msgid ""
 "'%s': cmd for supported man viewer.\n"
@@ -16649,416 +8401,413 @@ msgstr ""
 "'%s': 支援的 man 手冊檢視器指令。\n"
 "請使用 'man.<工具>.path'。"
 
-#: builtin/help.c:471
+#: builtin/help.c
 #, c-format
 msgid "'%s': unknown man viewer."
 msgstr "'%s'：未知的 man 檢視器。"
 
-#: builtin/help.c:487
+#: builtin/help.c
 msgid "no man viewer handled the request"
 msgstr "沒有 man 檢視器處理此請求"
 
-#: builtin/help.c:494
+#: builtin/help.c
 msgid "no info viewer handled the request"
 msgstr "沒有 info 檢視器處理此請求"
 
-#: builtin/help.c:555 builtin/help.c:566 git.c:348
+#: builtin/help.c git.c
 #, c-format
 msgid "'%s' is aliased to '%s'"
 msgstr "'%s' 是 '%s' 的別名"
 
-#: builtin/help.c:569 git.c:380
+#: builtin/help.c git.c
 #, c-format
 msgid "bad alias.%s string: %s"
 msgstr "壞的 alias.%s 字串：%s"
 
-#: builtin/help.c:611
+#: builtin/help.c
 #, c-format
 msgid "the '%s' option doesn't take any non-option arguments"
 msgstr "「%s」選項不取非選項的引數"
 
-#: builtin/help.c:631
+#: builtin/help.c
 msgid ""
 "the '--no-[external-commands|aliases]' options can only be used with '--all'"
 msgstr "「--no-[external-commands|aliases]」選項只能與「--all」一起使用"
 
-#: builtin/help.c:643 builtin/help.c:671
+#: builtin/help.c
 #, c-format
 msgid "usage: %s%s"
 msgstr "用法：%s%s"
 
-#: builtin/help.c:666
+#: builtin/help.c
 msgid "'git help config' for more information"
 msgstr "'git help config' 取得更多訊息"
 
-#: builtin/hook.c:10
+#: builtin/hook.c
 msgid "git hook run [--ignore-missing] <hook-name> [-- <hook-args>]"
 msgstr "git hook run [--ignore-missing] <hook-name> [-- <hook-args>]"
 
-#: builtin/hook.c:30
+#: builtin/hook.c
 msgid "silently ignore missing requested <hook-name>"
 msgstr "靜默忽略不存在而請求的 <hook-name>"
 
-#: builtin/index-pack.c:221
+#: builtin/index-pack.c
 #, c-format
 msgid "object type mismatch at %s"
 msgstr "%s 的物件類型不符合"
 
-#: builtin/index-pack.c:241
+#: builtin/index-pack.c
 #, c-format
 msgid "did not receive expected object %s"
 msgstr "未能取得預期的物件 %s"
 
-#: builtin/index-pack.c:244
+#: builtin/index-pack.c
 #, c-format
 msgid "object %s: expected type %s, found %s"
 msgstr "物件 %s：應為類型 %s，卻是 %s"
 
-#: builtin/index-pack.c:294
+#: builtin/index-pack.c
 #, c-format
 msgid "cannot fill %d byte"
 msgid_plural "cannot fill %d bytes"
 msgstr[0] "無法填充 %d 位元組"
 
-#: builtin/index-pack.c:304
+#: builtin/index-pack.c
 msgid "early EOF"
 msgstr "過早的檔案結束符（EOF）"
 
-#: builtin/index-pack.c:305
+#: builtin/index-pack.c
 msgid "read error on input"
 msgstr "輸入上的讀錯誤"
 
-#: builtin/index-pack.c:317
+#: builtin/index-pack.c
 msgid "used more bytes than were available"
 msgstr "用掉了超過可用的位元組"
 
-#: builtin/index-pack.c:324 builtin/pack-objects.c:754
+#: builtin/index-pack.c builtin/pack-objects.c
 msgid "pack too large for current definition of off_t"
 msgstr "包太大超過了目前 off_t 的定義"
 
-#: builtin/index-pack.c:329
+#: builtin/index-pack.c
 #, c-format
 msgid "pack exceeds maximum allowed size (%s)"
 msgstr "包超過了最大允許大小 (%s)"
 
-#: builtin/index-pack.c:362
+#: builtin/index-pack.c
 msgid "pack signature mismatch"
 msgstr "包簽名不符合"
 
-#: builtin/index-pack.c:364
+#: builtin/index-pack.c
 #, c-format
 msgid "pack version %<PRIu32> unsupported"
 msgstr "不支援包版本 %<PRIu32>"
 
-#: builtin/index-pack.c:380
+#: builtin/index-pack.c
 #, c-format
 msgid "pack has bad object at offset %<PRIuMAX>: %s"
 msgstr "包中有錯誤的物件位於位移量 %<PRIuMAX>：%s"
 
-#: builtin/index-pack.c:485
+#: builtin/index-pack.c
 #, c-format
 msgid "inflate returned %d"
 msgstr "解壓縮返回 %d"
 
-#: builtin/index-pack.c:534
+#: builtin/index-pack.c
 msgid "offset value overflow for delta base object"
 msgstr "位移值覆蓋了 delta 基準物件"
 
-#: builtin/index-pack.c:542
+#: builtin/index-pack.c
 msgid "delta base offset is out of bound"
 msgstr "delta 基準位移越界"
 
-#: builtin/index-pack.c:550
+#: builtin/index-pack.c
 #, c-format
 msgid "unknown object type %d"
 msgstr "未知物件類型 %d"
 
-#: builtin/index-pack.c:581
+#: builtin/index-pack.c
 msgid "cannot pread pack file"
 msgstr "無法讀取包檔案"
 
-#: builtin/index-pack.c:583
+#: builtin/index-pack.c
 #, 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:609
+#: builtin/index-pack.c
 msgid "serious inflate inconsistency"
 msgstr "解壓縮嚴重的不一致"
 
-#: builtin/index-pack.c:754 builtin/index-pack.c:760 builtin/index-pack.c:784
-#: builtin/index-pack.c:823 builtin/index-pack.c:832
+#: builtin/index-pack.c
 #, c-format
 msgid "SHA1 COLLISION FOUND WITH %s !"
 msgstr "發現 %s 出現 SHA1 衝突！"
 
-#: builtin/index-pack.c:757 builtin/pack-objects.c:290
-#: builtin/pack-objects.c:350 builtin/pack-objects.c:456
+#: builtin/index-pack.c builtin/pack-objects.c
 #, c-format
 msgid "unable to read %s"
 msgstr "不能讀 %s"
 
-#: builtin/index-pack.c:821
+#: builtin/index-pack.c
 #, c-format
 msgid "cannot read existing object info %s"
 msgstr "不能讀取現存物件訊息 %s"
 
-#: builtin/index-pack.c:829
+#: builtin/index-pack.c
 #, c-format
 msgid "cannot read existing object %s"
 msgstr "不能讀取現存物件 %s"
 
-#: builtin/index-pack.c:843
+#: builtin/index-pack.c
 #, c-format
 msgid "invalid blob object %s"
 msgstr "無效的資料物件 %s"
 
-#: builtin/index-pack.c:846 builtin/index-pack.c:865
+#: builtin/index-pack.c
 msgid "fsck error in packed object"
 msgstr "對打包物件 fsck 檢查發生錯誤"
 
-#: builtin/index-pack.c:867
+#: builtin/index-pack.c
 #, c-format
 msgid "Not all child objects of %s are reachable"
 msgstr "%s 的所有子物件並非都可以取得"
 
-#: builtin/index-pack.c:928 builtin/index-pack.c:975
+#: builtin/index-pack.c
 msgid "failed to apply delta"
 msgstr "套用 delta 失敗"
 
-#: builtin/index-pack.c:1161
+#: builtin/index-pack.c
 msgid "Receiving objects"
 msgstr "接收物件中"
 
-#: builtin/index-pack.c:1161
+#: builtin/index-pack.c
 msgid "Indexing objects"
 msgstr "索引物件中"
 
-#: builtin/index-pack.c:1195
+#: builtin/index-pack.c
 msgid "pack is corrupted (SHA1 mismatch)"
 msgstr "包衝突（SHA1 不符合）"
 
-#: builtin/index-pack.c:1200
+#: builtin/index-pack.c
 msgid "cannot fstat packfile"
 msgstr "不能對 packfile 呼叫 fstat"
 
-#: builtin/index-pack.c:1203
+#: builtin/index-pack.c
 msgid "pack has junk at the end"
 msgstr "包的結尾有垃圾資料"
 
-#: builtin/index-pack.c:1215
+#: builtin/index-pack.c
 msgid "confusion beyond insanity in parse_pack_objects()"
 msgstr "parse_pack_objects() 中遇到不可理喻的問題"
 
-#: builtin/index-pack.c:1238
+#: builtin/index-pack.c
 msgid "Resolving deltas"
 msgstr "處理 delta 中"
 
-#: builtin/index-pack.c:1249 builtin/pack-objects.c:2913
+#: builtin/index-pack.c builtin/pack-objects.c
 #, c-format
 msgid "unable to create thread: %s"
 msgstr "不能建立執行緒：%s"
 
-#: builtin/index-pack.c:1282
+#: builtin/index-pack.c
 msgid "confusion beyond insanity"
 msgstr "不可理喻"
 
-#: builtin/index-pack.c:1288
+#: builtin/index-pack.c
 #, c-format
 msgid "completed with %d local object"
 msgid_plural "completed with %d local objects"
 msgstr[0] "完成 %d 個本機物件"
 
-#: builtin/index-pack.c:1300
+#: builtin/index-pack.c
 #, c-format
 msgid "Unexpected tail checksum for %s (disk corruption?)"
 msgstr "對 %s 的尾部總和檢查出現意外（磁碟損壞？）"
 
-#: builtin/index-pack.c:1304
+#: builtin/index-pack.c
 #, c-format
 msgid "pack has %d unresolved delta"
 msgid_plural "pack has %d unresolved deltas"
 msgstr[0] "包有 %d 個未解決的 delta"
 
-#: builtin/index-pack.c:1328
+#: builtin/index-pack.c
 #, c-format
 msgid "unable to deflate appended object (%d)"
 msgstr "不能壓縮附加物件（%d）"
 
-#: builtin/index-pack.c:1423
+#: builtin/index-pack.c
 #, c-format
 msgid "local object %s is corrupt"
 msgstr "本機物件 %s 已損壞"
 
-#: builtin/index-pack.c:1445
+#: builtin/index-pack.c
 #, c-format
 msgid "packfile name '%s' does not end with '.%s'"
 msgstr "packfile 名稱「%s」的結尾不是「.%s」"
 
-#: builtin/index-pack.c:1469
+#: builtin/index-pack.c
 #, c-format
 msgid "cannot write %s file '%s'"
 msgstr "無法寫入 %s 檔案 '%s'"
 
-#: builtin/index-pack.c:1477
+#: builtin/index-pack.c
 #, c-format
 msgid "cannot close written %s file '%s'"
 msgstr "無法關閉已寫入的 %s 檔案 '%s'"
 
-#: builtin/index-pack.c:1494
+#: builtin/index-pack.c
 #, c-format
 msgid "unable to rename temporary '*.%s' file to '%s'"
 msgstr "無法將「*.%s」暫存檔的檔名更改為「%s」"
 
-#: builtin/index-pack.c:1519
+#: builtin/index-pack.c
 msgid "error while closing pack file"
 msgstr "關閉包檔案時發生錯誤"
 
-#: builtin/index-pack.c:1578 builtin/pack-objects.c:3158
+#: builtin/index-pack.c builtin/pack-objects.c
 #, c-format
-msgid "bad pack.indexversion=%<PRIu32>"
-msgstr "壞的 pack.indexversion=%<PRIu32>"
+msgid "bad pack.indexVersion=%<PRIu32>"
+msgstr "無效的 pack.indexVersion=%<PRIu32>"
 
-#: builtin/index-pack.c:1648
+#: builtin/index-pack.c
 #, c-format
 msgid "Cannot open existing pack file '%s'"
 msgstr "無法開啟現有包檔案 '%s'"
 
-#: builtin/index-pack.c:1650
+#: builtin/index-pack.c
 #, c-format
 msgid "Cannot open existing pack idx file for '%s'"
 msgstr "無法為 %s 開啟包索引檔案"
 
-#: builtin/index-pack.c:1698
+#: builtin/index-pack.c
 #, c-format
 msgid "non delta: %d object"
 msgid_plural "non delta: %d objects"
 msgstr[0] "非 delta：%d 個物件"
 
-#: builtin/index-pack.c:1705
+#: builtin/index-pack.c
 #, 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
 msgid "Cannot come back to cwd"
 msgstr "無法返回目前工作目錄"
 
-#: builtin/index-pack.c:1802 builtin/index-pack.c:1805
-#: builtin/index-pack.c:1825 builtin/index-pack.c:1829
+#: builtin/index-pack.c
 #, c-format
 msgid "bad %s"
 msgstr "錯誤選項 %s"
 
-#: builtin/index-pack.c:1835 builtin/init-db.c:379 builtin/init-db.c:614
+#: builtin/index-pack.c builtin/init-db.c
 #, c-format
 msgid "unknown hash algorithm '%s'"
 msgstr "未知的「%s」雜湊算法"
 
-#: builtin/index-pack.c:1856
+#: builtin/index-pack.c
 msgid "--stdin requires a git repository"
 msgstr "--stdin 需要一個 git 版本庫"
 
-#: builtin/index-pack.c:1873
+#: builtin/index-pack.c
 msgid "--verify with no packfile name given"
 msgstr "--verify 沒有提供 packfile 名稱參數"
 
-#: builtin/index-pack.c:1939 builtin/unpack-objects.c:584
+#: builtin/index-pack.c builtin/unpack-objects.c
 msgid "fsck error in pack objects"
 msgstr "在打包物件中 fsck 檢查發生錯誤"
 
-#: builtin/init-db.c:63
+#: builtin/init-db.c
 #, c-format
 msgid "cannot stat template '%s'"
 msgstr "不能對範本 '%s' 呼叫 stat"
 
-#: builtin/init-db.c:68
+#: builtin/init-db.c
 #, c-format
 msgid "cannot opendir '%s'"
 msgstr "不能開啟目錄 '%s'"
 
-#: builtin/init-db.c:80
+#: builtin/init-db.c
 #, c-format
 msgid "cannot readlink '%s'"
 msgstr "不能讀取連結 '%s'"
 
-#: builtin/init-db.c:82
+#: builtin/init-db.c
 #, c-format
 msgid "cannot symlink '%s' '%s'"
 msgstr "不能自 '%s' 到 '%s' 建立符號連結"
 
-#: builtin/init-db.c:88
+#: builtin/init-db.c
 #, c-format
 msgid "cannot copy '%s' to '%s'"
 msgstr "不能複製 '%s' 至 '%s'"
 
-#: builtin/init-db.c:92
+#: builtin/init-db.c
 #, c-format
 msgid "ignoring template %s"
 msgstr "忽略範本 %s"
 
-#: builtin/init-db.c:123
+#: builtin/init-db.c
 #, c-format
 msgid "templates not found in %s"
 msgstr "沒有在 %s 中找到範本"
 
-#: builtin/init-db.c:138
+#: builtin/init-db.c
 #, c-format
 msgid "not copying templates from '%s': %s"
 msgstr "沒有從 '%s' 複製範本：%s"
 
-#: builtin/init-db.c:263
+#: builtin/init-db.c
 #, c-format
 msgid "invalid initial branch name: '%s'"
 msgstr "無效的初始分支名稱：'%s'"
 
-#: builtin/init-db.c:354
+#: builtin/init-db.c
 #, c-format
 msgid "unable to handle file type %d"
 msgstr "不能處理 %d 類型的檔案"
 
-#: builtin/init-db.c:357
+#: builtin/init-db.c
 #, c-format
 msgid "unable to move %s to %s"
 msgstr "不能移動 %s 至 %s"
 
-#: builtin/init-db.c:373
+#: builtin/init-db.c
 msgid "attempt to reinitialize repository with different hash"
 msgstr "嘗試以不同的雜湊值重新初始化版本庫"
 
-#: builtin/init-db.c:397 builtin/init-db.c:400
+#: builtin/init-db.c
 #, c-format
 msgid "%s already exists"
 msgstr "%s 已經存在"
 
-#: builtin/init-db.c:432
+#: builtin/init-db.c
 #, c-format
 msgid "re-init: ignored --initial-branch=%s"
 msgstr "re-init: 忽略 --initial-branch=%s"
 
-#: builtin/init-db.c:463
+#: builtin/init-db.c
 #, c-format
 msgid "Reinitialized existing shared Git repository in %s%s\n"
 msgstr "重新初始化已存在的共享 Git 版本庫於 %s%s\n"
 
-#: builtin/init-db.c:464
+#: builtin/init-db.c
 #, c-format
 msgid "Reinitialized existing Git repository in %s%s\n"
 msgstr "重新初始化已存在的 Git 版本庫於 %s%s\n"
 
-#: builtin/init-db.c:468
+#: builtin/init-db.c
 #, c-format
 msgid "Initialized empty shared Git repository in %s%s\n"
 msgstr "已初始化空的共享 Git 版本庫於 %s%s\n"
 
-#: builtin/init-db.c:469
+#: builtin/init-db.c
 #, c-format
 msgid "Initialized empty Git repository in %s%s\n"
 msgstr "已初始化空的 Git 版本庫於 %s%s\n"
 
-#: builtin/init-db.c:518
+#: builtin/init-db.c
 msgid ""
 "git init [-q | --quiet] [--bare] [--template=<template-directory>] [--"
 "shared[=<permissions>]] [<directory>]"
@@ -17066,53 +8815,53 @@ msgstr ""
 "git init [-q | --quiet] [--bare] [--template=<範本目錄>] [--shared[=<權限>]] "
 "[<目錄>]"
 
-#: builtin/init-db.c:544
+#: builtin/init-db.c
 msgid "permissions"
 msgstr "權限"
 
-#: builtin/init-db.c:545
+#: builtin/init-db.c
 msgid "specify that the git repository is to be shared amongst several users"
 msgstr "指定 git 版本庫是多個使用者之間共享的"
 
-#: builtin/init-db.c:551
+#: builtin/init-db.c
 msgid "override the name of the initial branch"
 msgstr "覆蓋初始分支的名稱"
 
-#: builtin/init-db.c:552 builtin/verify-pack.c:74
+#: builtin/init-db.c builtin/verify-pack.c
 msgid "hash"
 msgstr "雜湊"
 
-#: builtin/init-db.c:553 builtin/show-index.c:22 builtin/verify-pack.c:75
+#: builtin/init-db.c builtin/show-index.c builtin/verify-pack.c
 msgid "specify the hash algorithm to use"
 msgstr "指定要使用的雜湊算法"
 
-#: builtin/init-db.c:591 builtin/init-db.c:596
+#: builtin/init-db.c
 #, c-format
 msgid "cannot mkdir %s"
 msgstr "不能建立目錄 %s"
 
-#: builtin/init-db.c:600 builtin/init-db.c:655
+#: builtin/init-db.c
 #, c-format
 msgid "cannot chdir to %s"
 msgstr "不能切換目錄到 %s"
 
-#: builtin/init-db.c:627
+#: builtin/init-db.c
 #, c-format
 msgid ""
 "%s (or --work-tree=<directory>) not allowed without specifying %s (or --git-"
 "dir=<directory>)"
 msgstr "不允許 %s（或 --work-tree=<目錄>）而沒有指定 %s（或 --git-dir=<目錄>）"
 
-#: builtin/init-db.c:679
+#: builtin/init-db.c
 #, c-format
 msgid "Cannot access work tree '%s'"
 msgstr "不能存取工作區 '%s'"
 
-#: builtin/init-db.c:684
+#: builtin/init-db.c
 msgid "--separate-git-dir incompatible with bare repository"
 msgstr "--separate-git-dir 與純版本庫不相容"
 
-#: builtin/interpret-trailers.c:16
+#: builtin/interpret-trailers.c
 msgid ""
 "git interpret-trailers [--in-place] [--trim-empty] [(--trailer "
 "<token>[(=|:)<value>])...] [<file>...]"
@@ -17120,184 +8869,192 @@ msgstr ""
 "git interpret-trailers [--in-place] [--trim-empty] [(--trailer <鍵>[(=|:)<值"
 ">])...] [<檔案>...]"
 
-#: builtin/interpret-trailers.c:95
+#: builtin/interpret-trailers.c
 msgid "edit files in place"
 msgstr "在原位編輯檔案"
 
-#: builtin/interpret-trailers.c:96
+#: builtin/interpret-trailers.c
 msgid "trim empty trailers"
 msgstr "刪除空的尾部署名"
 
-#: builtin/interpret-trailers.c:99
+#: builtin/interpret-trailers.c
 msgid "where to place the new trailer"
 msgstr "在哪裡放置新的尾部署名"
 
-#: builtin/interpret-trailers.c:101
+#: builtin/interpret-trailers.c
 msgid "action if trailer already exists"
 msgstr "當尾部署名已經存在時所採取的動作"
 
-#: builtin/interpret-trailers.c:103
+#: builtin/interpret-trailers.c
 msgid "action if trailer is missing"
 msgstr "當尾部署名缺少時所採取的動作"
 
-#: builtin/interpret-trailers.c:105
+#: builtin/interpret-trailers.c
 msgid "output only the trailers"
 msgstr "只輸出尾部署名"
 
-#: builtin/interpret-trailers.c:106
+#: builtin/interpret-trailers.c
 msgid "do not apply config rules"
 msgstr "不要套用組態設定規則"
 
-#: builtin/interpret-trailers.c:107
+#: builtin/interpret-trailers.c
 msgid "join whitespace-continued values"
 msgstr "連線空白折行的值"
 
-#: builtin/interpret-trailers.c:108
+#: builtin/interpret-trailers.c
 msgid "set parsing options"
 msgstr "設定解析選項"
 
-#: builtin/interpret-trailers.c:110
+#: builtin/interpret-trailers.c
 msgid "do not treat --- specially"
 msgstr "不要對 --- 特殊處理"
 
-#: builtin/interpret-trailers.c:112
+#: builtin/interpret-trailers.c
 msgid "trailer(s) to add"
 msgstr "要新增的尾部署名"
 
-#: builtin/interpret-trailers.c:123
+#: builtin/interpret-trailers.c
 msgid "--trailer with --only-input does not make sense"
 msgstr "--trailer 和 --only-input 同時使用沒有意義"
 
-#: builtin/interpret-trailers.c:133
+#: builtin/interpret-trailers.c
 msgid "no input file given for in-place editing"
 msgstr "沒有給出要原位編輯的檔案"
 
-#: builtin/log.c:60
+#: builtin/log.c
 msgid "git log [<options>] [<revision-range>] [[--] <path>...]"
 msgstr "git log [<選項>] [<版本範圍>] [[--] <路徑>...]"
 
-#: builtin/log.c:61
+#: builtin/log.c
 msgid "git show [<options>] <object>..."
 msgstr "git show [<選項>] <物件>..."
 
-#: builtin/log.c:114
+#: builtin/log.c
 #, c-format
 msgid "invalid --decorate option: %s"
 msgstr "無效的 --decorate 選項：%s"
 
-#: builtin/log.c:181
+#: builtin/log.c diff.c
+msgid "suppress diff output"
+msgstr "不顯示差異輸出"
+
+#: builtin/log.c
 msgid "show source"
 msgstr "顯示來源"
 
-#: builtin/log.c:182
+#: builtin/log.c
 msgid "use mail map file"
 msgstr "使用信件映射檔案"
 
-#: builtin/log.c:185
+#: builtin/log.c
 msgid "only decorate refs that match <pattern>"
 msgstr "只修飾與 <模式> 符合的引用"
 
-#: builtin/log.c:187
+#: builtin/log.c
 msgid "do not decorate refs that match <pattern>"
 msgstr "不修飾和 <模式> 符合的引用"
 
-#: builtin/log.c:188
+#: builtin/log.c
 msgid "decorate options"
 msgstr "修飾選項"
 
-#: builtin/log.c:191
+#: builtin/log.c
 msgid ""
 "trace the evolution of line range <start>,<end> or function :<funcname> in "
 "<file>"
 msgstr "追蹤 <開始>,<結束> 範圍中橫列或 <檔案> 中> :<函數名稱> 的變化史"
 
-#: builtin/log.c:214
+#: builtin/log.c builtin/shortlog.c bundle.c
+#, c-format
+msgid "unrecognized argument: %s"
+msgstr "無法識別的參數：%s"
+
+#: builtin/log.c
 msgid "-L<range>:<file> cannot be used with pathspec"
 msgstr "-L<範圍>:<檔案> 和 pathspec 不能同時使用"
 
-#: builtin/log.c:322
+#: builtin/log.c
 #, c-format
 msgid "Final output: %d %s\n"
 msgstr "最終輸出：%d %s\n"
 
-#: builtin/log.c:429
+#: builtin/log.c
 msgid "unable to create temporary object directory"
 msgstr "無法建立暫存物件目錄"
 
-#: builtin/log.c:599
+#: builtin/log.c
 #, c-format
 msgid "git show %s: bad file"
 msgstr "git show %s: 損壞的檔案"
 
-#: builtin/log.c:614 builtin/log.c:706
+#: builtin/log.c
 #, c-format
 msgid "could not read object %s"
 msgstr "不能讀取物件 %s"
 
-#: builtin/log.c:731
+#: builtin/log.c
 #, c-format
 msgid "unknown type: %d"
 msgstr "未知類型：%d"
 
-#: builtin/log.c:880
+#: builtin/log.c
 #, c-format
 msgid "%s: invalid cover from description mode"
 msgstr "%s：從描述產生附函的模式無效"
 
-#: builtin/log.c:887
+#: builtin/log.c
 msgid "format.headers without value"
 msgstr "format.headers 沒有值"
 
-#: builtin/log.c:1016
+#: builtin/log.c
 #, c-format
 msgid "cannot open patch file %s"
 msgstr "無法開啟修補檔案 %s"
 
-#: builtin/log.c:1033
+#: builtin/log.c
 msgid "need exactly one range"
 msgstr "只需要一個範圍"
 
-#: builtin/log.c:1043
+#: builtin/log.c
 msgid "not a range"
 msgstr "不是一個範圍"
 
-#: builtin/log.c:1207
+#: builtin/log.c
 msgid "cover letter needs email format"
 msgstr "附函需要信件位址格式"
 
-#: builtin/log.c:1213
+#: builtin/log.c
 msgid "failed to create cover-letter file"
 msgstr "無法建立附函檔案"
 
-#: builtin/log.c:1300
+#: builtin/log.c
 #, c-format
 msgid "insane in-reply-to: %s"
 msgstr "不正常的 in-reply-to：%s"
 
-#: builtin/log.c:1327
+#: builtin/log.c
 msgid "git format-patch [<options>] [<since> | <revision-range>]"
 msgstr "git format-patch [<選項>] [<從> | <版本範圍>]"
 
-#: builtin/log.c:1385
+#: builtin/log.c
 msgid "two output directories?"
 msgstr "兩個輸出目錄？"
 
-#: builtin/log.c:1536 builtin/log.c:2369 builtin/log.c:2371 builtin/log.c:2383
+#: builtin/log.c
 #, c-format
 msgid "unknown commit %s"
 msgstr "未知提交 %s"
 
-#: builtin/log.c:1547 builtin/replace.c:58 builtin/replace.c:207
-#: builtin/replace.c:210
+#: builtin/log.c builtin/replace.c
 #, c-format
 msgid "failed to resolve '%s' as a valid ref"
 msgstr "無法將 '%s' 解析為一個有效引用"
 
-#: builtin/log.c:1556
+#: builtin/log.c
 msgid "could not find exact merge base"
 msgstr "不能找到準確的合併基礎"
 
-#: builtin/log.c:1566
+#: builtin/log.c
 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"
@@ -17307,394 +9064,399 @@ msgstr ""
 "git branch --set-upstream-to 來追蹤一個遠端分支。或者你可以透過\n"
 "參數 --base=<基礎提交> 手動指定一個基礎提交"
 
-#: builtin/log.c:1589
+#: builtin/log.c
 msgid "failed to find exact merge base"
 msgstr "無法找到準確的合併基礎"
 
-#: builtin/log.c:1606
+#: builtin/log.c
 msgid "base commit should be the ancestor of revision list"
 msgstr "基礎提交應該是版本列表的祖先"
 
-#: builtin/log.c:1616
+#: builtin/log.c
 msgid "base commit shouldn't be in revision list"
 msgstr "基礎提交不應該出現在版本列表中"
 
-#: builtin/log.c:1674
+#: builtin/log.c
 msgid "cannot get patch id"
 msgstr "無法得到修補檔 id"
 
-#: builtin/log.c:1737
+#: builtin/log.c
 msgid "failed to infer range-diff origin of current series"
 msgstr "無法推斷目前系列的 range-diff 起點"
 
-#: builtin/log.c:1739
+#: builtin/log.c
 #, c-format
 msgid "using '%s' as range-diff origin of current series"
 msgstr "將 '%s' 當作目前系列的 range-diff 起點"
 
-#: builtin/log.c:1783
+#: builtin/log.c
 msgid "use [PATCH n/m] even with a single patch"
 msgstr "使用 [PATCH n/m]，即使只有一個修補檔"
 
-#: builtin/log.c:1786
+#: builtin/log.c
 msgid "use [PATCH] even with multiple patches"
 msgstr "使用 [PATCH]，即使有多個修補檔"
 
-#: builtin/log.c:1790
+#: builtin/log.c
 msgid "print patches to standard out"
 msgstr "列印修補檔到標準輸出"
 
-#: builtin/log.c:1792
+#: builtin/log.c
 msgid "generate a cover letter"
 msgstr "生成一封附函"
 
-#: builtin/log.c:1794
+#: builtin/log.c
 msgid "use simple number sequence for output file names"
 msgstr "使用簡單的數字序列作為輸出檔案名"
 
-#: builtin/log.c:1795
+#: builtin/log.c
 msgid "sfx"
 msgstr "後綴"
 
-#: builtin/log.c:1796
+#: builtin/log.c
 msgid "use <sfx> instead of '.patch'"
 msgstr "使用 <後綴> 代替 '.patch'"
 
-#: builtin/log.c:1798
+#: builtin/log.c
 msgid "start numbering patches at <n> instead of 1"
 msgstr "修補檔以 <n> 開始編號，而不是1"
 
-#: builtin/log.c:1799
+#: builtin/log.c
 msgid "reroll-count"
 msgstr "reroll-count"
 
-#: builtin/log.c:1800
+#: builtin/log.c
 msgid "mark the series as Nth re-roll"
 msgstr "標記修補檔系列是第幾次重製"
 
-#: builtin/log.c:1802
+#: builtin/log.c
 msgid "max length of output filename"
 msgstr "輸出檔名的最大長度"
 
-#: builtin/log.c:1804
+#: builtin/log.c
 msgid "use [RFC PATCH] instead of [PATCH]"
 msgstr "使用 [RFC PATCH] 代替 [PATCH]"
 
-#: builtin/log.c:1807
+#: builtin/log.c
 msgid "cover-from-description-mode"
 msgstr "從描述產生附函的模式"
 
-#: builtin/log.c:1808
+#: builtin/log.c
 msgid "generate parts of a cover letter based on a branch's description"
 msgstr "基於分支描述產生部分附函"
 
-#: builtin/log.c:1810
+#: builtin/log.c
 msgid "use [<prefix>] instead of [PATCH]"
 msgstr "使用 [<前綴>] 代替 [PATCH]"
 
-#: builtin/log.c:1813
+#: builtin/log.c
 msgid "store resulting files in <dir>"
 msgstr "把結果檔案儲存在 <目錄>"
 
-#: builtin/log.c:1816
+#: builtin/log.c
 msgid "don't strip/add [PATCH]"
 msgstr "不刪除/新增 [PATCH]"
 
-#: builtin/log.c:1819
+#: builtin/log.c
 msgid "don't output binary diffs"
 msgstr "不輸出二進位差異"
 
-#: builtin/log.c:1821
+#: builtin/log.c
 msgid "output all-zero hash in From header"
 msgstr "在 From 標頭訊息中輸出全為零的雜湊值"
 
-#: builtin/log.c:1823
+#: builtin/log.c
 msgid "don't include a patch matching a commit upstream"
 msgstr "不包含已在上游提交中的修補檔"
 
-#: builtin/log.c:1825
+#: builtin/log.c
 msgid "show patch format instead of default (patch + stat)"
 msgstr "顯示純修補檔格式而非預設的（修補檔+狀態）"
 
-#: builtin/log.c:1827
+#: builtin/log.c
 msgid "Messaging"
 msgstr "信件傳送"
 
-#: builtin/log.c:1828
+#: builtin/log.c
 msgid "header"
 msgstr "header"
 
-#: builtin/log.c:1829
+#: builtin/log.c
 msgid "add email header"
 msgstr "新增信件頭"
 
-#: builtin/log.c:1830 builtin/log.c:1831
+#: builtin/log.c
 msgid "email"
 msgstr "信件位址"
 
-#: builtin/log.c:1830
+#: builtin/log.c
 msgid "add To: header"
 msgstr "新增收件人"
 
-#: builtin/log.c:1831
+#: builtin/log.c
 msgid "add Cc: header"
 msgstr "新增抄送"
 
-#: builtin/log.c:1832
+#: builtin/log.c
 msgid "ident"
 msgstr "標記"
 
-#: builtin/log.c:1833
+#: builtin/log.c
 msgid "set From address to <ident> (or committer ident if absent)"
 msgstr "將 From 位址設定為 <標記>（如若不提供，則用提交者 ID 做為位址）"
 
-#: builtin/log.c:1835
+#: builtin/log.c
 msgid "message-id"
 msgstr "信件標記"
 
-#: builtin/log.c:1836
+#: builtin/log.c
 msgid "make first mail a reply to <message-id>"
 msgstr "使第一封信件作為對 <信件標記> 的回覆"
 
-#: builtin/log.c:1837 builtin/log.c:1840
+#: builtin/log.c
 msgid "boundary"
 msgstr "邊界"
 
-#: builtin/log.c:1838
+#: builtin/log.c
 msgid "attach the patch"
 msgstr "附件方式新增修補檔"
 
-#: builtin/log.c:1841
+#: builtin/log.c
 msgid "inline the patch"
 msgstr "內聯顯示修補檔"
 
-#: builtin/log.c:1845
+#: builtin/log.c
 msgid "enable message threading, styles: shallow, deep"
 msgstr "啟用信件線索，風格：淺，深"
 
-#: builtin/log.c:1847
+#: builtin/log.c
 msgid "signature"
 msgstr "簽名"
 
-#: builtin/log.c:1848
+#: builtin/log.c
 msgid "add a signature"
 msgstr "新增一個簽名"
 
-#: builtin/log.c:1849
+#: builtin/log.c
 msgid "base-commit"
 msgstr "基礎提交"
 
-#: builtin/log.c:1850
+#: builtin/log.c
 msgid "add prerequisite tree info to the patch series"
 msgstr "為修補檔列表新增前置樹訊息"
 
-#: builtin/log.c:1853
+#: builtin/log.c
 msgid "add a signature from a file"
 msgstr "從檔案新增一個簽名"
 
-#: builtin/log.c:1854
+#: builtin/log.c
 msgid "don't print the patch filenames"
 msgstr "不要列印修補檔檔案名"
 
-#: builtin/log.c:1856
+#: builtin/log.c
 msgid "show progress while generating patches"
 msgstr "在生成修補檔時顯示進度"
 
-#: builtin/log.c:1858
+#: builtin/log.c
 msgid "show changes against <rev> in cover letter or single patch"
 msgstr "在附函或單個修補檔中顯示和 <rev> 的差異"
 
-#: builtin/log.c:1861
+#: builtin/log.c
 msgid "show changes against <refspec> in cover letter or single patch"
 msgstr "在附函或單個修補檔中顯示和 <refspec> 的差異"
 
-#: builtin/log.c:1863 builtin/range-diff.c:28
+#: builtin/log.c builtin/range-diff.c
 msgid "percentage by which creation is weighted"
 msgstr "建立權重的百分比"
 
-#: builtin/log.c:1953
+#: builtin/log.c
 #, c-format
 msgid "invalid ident line: %s"
 msgstr "包含無效的身份標記：%s"
 
-#: builtin/log.c:1978
+#: builtin/log.c
 msgid "--name-only does not make sense"
 msgstr "--name-only 無意義"
 
-#: builtin/log.c:1980
+#: builtin/log.c
 msgid "--name-status does not make sense"
 msgstr "--name-status 無意義"
 
-#: builtin/log.c:1982
+#: builtin/log.c
 msgid "--check does not make sense"
 msgstr "--check 無意義"
 
-#: builtin/log.c:1984
+#: builtin/log.c
 msgid "--remerge-diff does not make sense"
 msgstr "--remerge-diff 無意義"
 
-#: builtin/log.c:2129
+#: builtin/log.c builtin/submodule--helper.c rerere.c submodule.c
+#, c-format
+msgid "could not create directory '%s'"
+msgstr "不能建立目錄 '%s'"
+
+#: builtin/log.c
 msgid "--interdiff requires --cover-letter or single patch"
 msgstr "--interdiff 需要 --cover-letter 或單一修補檔"
 
-#: builtin/log.c:2133
+#: builtin/log.c
 msgid "Interdiff:"
 msgstr "版本間差異："
 
-#: builtin/log.c:2134
+#: builtin/log.c
 #, c-format
 msgid "Interdiff against v%d:"
 msgstr "對 v%d 的版本差異："
 
-#: builtin/log.c:2144
+#: builtin/log.c
 msgid "--range-diff requires --cover-letter or single patch"
 msgstr "--range-diff 需要 --cover-letter 或單一修補檔"
 
-#: builtin/log.c:2152
+#: builtin/log.c
 msgid "Range-diff:"
 msgstr "範圍差異："
 
-#: builtin/log.c:2153
+#: builtin/log.c
 #, c-format
 msgid "Range-diff against v%d:"
 msgstr "對 v%d 的範圍差異："
 
-#: builtin/log.c:2164
+#: builtin/log.c
 #, c-format
 msgid "unable to read signature file '%s'"
 msgstr "無法讀取簽名檔案 '%s'"
 
-#: builtin/log.c:2200
+#: builtin/log.c
 msgid "Generating patches"
 msgstr "生成修補檔"
 
-#: builtin/log.c:2244
+#: builtin/log.c
 msgid "failed to create output files"
 msgstr "無法建立輸出檔案"
 
-#: builtin/log.c:2304
+#: builtin/log.c
 msgid "git cherry [-v] [<upstream> [<head> [<limit>]]]"
 msgstr "git cherry [-v] [<上游> [<頭> [<限制>]]]"
 
-#: builtin/log.c:2358
+#: builtin/log.c
 #, c-format
 msgid ""
 "Could not find a tracked remote branch, please specify <upstream> manually.\n"
 msgstr "不能找到追蹤的遠端分支，請手動指定 <上游>。\n"
 
-#: builtin/ls-files.c:564
+#: builtin/ls-files.c
 msgid "git ls-files [<options>] [<file>...]"
 msgstr "git ls-files [<選項>] [<檔案>...]"
 
-#: builtin/ls-files.c:618
+#: builtin/ls-files.c
 msgid "separate paths with the NUL character"
 msgstr "用 NUL 字元分隔路徑"
 
-#: builtin/ls-files.c:620
+#: builtin/ls-files.c
 msgid "identify the file status with tags"
 msgstr "用標籤標記檔案的狀態"
 
-#: builtin/ls-files.c:622
+#: builtin/ls-files.c
 msgid "use lowercase letters for 'assume unchanged' files"
 msgstr "使用小寫字母表示 '假設未改變的' 檔案"
 
-#: builtin/ls-files.c:624
+#: builtin/ls-files.c
 msgid "use lowercase letters for 'fsmonitor clean' files"
 msgstr "使用小寫字母表示 'fsmonitor clean' 檔案"
 
-#: builtin/ls-files.c:626
+#: builtin/ls-files.c
 msgid "show cached files in the output (default)"
 msgstr "顯示快取的檔案（預設）"
 
-#: builtin/ls-files.c:628
+#: builtin/ls-files.c
 msgid "show deleted files in the output"
 msgstr "顯示已刪除的檔案"
 
-#: builtin/ls-files.c:630
+#: builtin/ls-files.c
 msgid "show modified files in the output"
 msgstr "顯示已修改的檔案"
 
-#: builtin/ls-files.c:632
+#: builtin/ls-files.c
 msgid "show other files in the output"
 msgstr "顯示其它檔案"
 
-#: builtin/ls-files.c:634
+#: builtin/ls-files.c
 msgid "show ignored files in the output"
 msgstr "顯示忽略的檔案"
 
-#: builtin/ls-files.c:637
+#: builtin/ls-files.c
 msgid "show staged contents' object name in the output"
 msgstr "顯示暫存區內容的物件名稱"
 
-#: builtin/ls-files.c:639
+#: builtin/ls-files.c
 msgid "show files on the filesystem that need to be removed"
 msgstr "顯示檔案系統需要刪除的檔案"
 
-#: builtin/ls-files.c:641
+#: builtin/ls-files.c
 msgid "show 'other' directories' names only"
 msgstr "只顯示「其他」目錄的名稱"
 
-#: builtin/ls-files.c:643
+#: builtin/ls-files.c
 msgid "show line endings of files"
 msgstr "顯示檔案換行符號格式"
 
-#: builtin/ls-files.c:645
+#: builtin/ls-files.c
 msgid "don't show empty directories"
 msgstr "不顯示空目錄"
 
-#: builtin/ls-files.c:648
+#: builtin/ls-files.c
 msgid "show unmerged files in the output"
 msgstr "顯示未合併的檔案"
 
-#: builtin/ls-files.c:650
+#: builtin/ls-files.c
 msgid "show resolve-undo information"
 msgstr "顯示 resolve-undo 訊息"
 
-#: builtin/ls-files.c:652
+#: builtin/ls-files.c
 msgid "skip files matching pattern"
 msgstr "符合排除檔案的模式"
 
-#: builtin/ls-files.c:655
+#: builtin/ls-files.c
 msgid "read exclude patterns from <file>"
 msgstr "從 <檔案> 讀取排除模式 (pattern)"
 
-#: builtin/ls-files.c:658
+#: builtin/ls-files.c
 msgid "read additional per-directory exclude patterns in <file>"
 msgstr "從 <檔案> 讀取額外的每個目錄的排除模式"
 
-#: builtin/ls-files.c:660
+#: builtin/ls-files.c
 msgid "add the standard git exclusions"
 msgstr "新增標準的 git 排除"
 
-#: builtin/ls-files.c:664
+#: builtin/ls-files.c
 msgid "make the output relative to the project top directory"
 msgstr "顯示相對於頂級目錄的檔案名"
 
-#: builtin/ls-files.c:669
+#: builtin/ls-files.c
 msgid "if any <file> is not in the index, treat this as an error"
 msgstr "如果任何 <檔案> 都不在索引區，視為錯誤"
 
-#: builtin/ls-files.c:670
+#: builtin/ls-files.c
 msgid "tree-ish"
 msgstr "樹或提交"
 
-#: builtin/ls-files.c:671
+#: builtin/ls-files.c
 msgid "pretend that paths removed since <tree-ish> are still present"
 msgstr "假裝自從 <樹或提交> 之後刪除的路徑仍然存在"
 
-#: builtin/ls-files.c:673
+#: builtin/ls-files.c
 msgid "show debugging data"
 msgstr "顯示除錯資料"
 
-#: builtin/ls-files.c:675
+#: builtin/ls-files.c
 msgid "suppress duplicate entries"
 msgstr "不顯示重複項目"
 
-#: builtin/ls-files.c:677
+#: builtin/ls-files.c
 msgid "show sparse directories in the presence of a sparse index"
 msgstr "在稀疏索引存在時顯示稀疏目錄"
 
-#: builtin/ls-remote.c:9
+#: builtin/ls-remote.c
 msgid ""
 "git ls-remote [--heads] [--tags] [--refs] [--upload-pack=<exec>]\n"
 "              [-q | --quiet] [--exit-code] [--get-url]\n"
@@ -17704,205 +9466,205 @@ msgstr ""
 "              [-q | --quiet] [--exit-code] [--get-url]\n"
 "              [--symref] [<版本庫> [<引用>...]]"
 
-#: builtin/ls-remote.c:60
+#: builtin/ls-remote.c
 msgid "do not print remote URL"
 msgstr "不列印遠端 URL"
 
-#: builtin/ls-remote.c:61 builtin/ls-remote.c:63 builtin/rebase.c:1131
+#: builtin/ls-remote.c builtin/rebase.c
 msgid "exec"
 msgstr "exec"
 
-#: builtin/ls-remote.c:62 builtin/ls-remote.c:64
+#: builtin/ls-remote.c
 msgid "path of git-upload-pack on the remote host"
 msgstr "遠端主機上的 git-upload-pack 路徑"
 
-#: builtin/ls-remote.c:66
+#: builtin/ls-remote.c
 msgid "limit to tags"
 msgstr "僅限於標籤"
 
-#: builtin/ls-remote.c:67
+#: builtin/ls-remote.c
 msgid "limit to heads"
 msgstr "僅限於分支"
 
-#: builtin/ls-remote.c:68
+#: builtin/ls-remote.c
 msgid "do not show peeled tags"
 msgstr "不顯示已解析的標籤"
 
-#: builtin/ls-remote.c:70
+#: builtin/ls-remote.c
 msgid "take url.<base>.insteadOf into account"
 msgstr "參考 url.<base>.insteadOf 設定"
 
-#: builtin/ls-remote.c:73
+#: builtin/ls-remote.c
 msgid "exit with exit code 2 if no matching refs are found"
 msgstr "若未找到符合的引用則以離開碼2離開"
 
-#: builtin/ls-remote.c:76
+#: builtin/ls-remote.c
 msgid "show underlying ref in addition to the object pointed by it"
 msgstr "除了顯示指向的物件外，顯示指向的引用名"
 
-#: builtin/ls-tree.c:36
+#: builtin/ls-tree.c
 msgid "git ls-tree [<options>] <tree-ish> [<path>...]"
 msgstr "git ls-tree [<選項>] <樹或提交> [<路徑>...]"
 
-#: builtin/ls-tree.c:54
+#: builtin/ls-tree.c
 #, c-format
 msgid "could not get object info about '%s'"
 msgstr "無法取得「%s」相關的物件資訊"
 
-#: builtin/ls-tree.c:79
+#: builtin/ls-tree.c
 #, c-format
 msgid "bad ls-tree format: element '%s' does not start with '('"
 msgstr "無效的 ls-tree 格式：「%s」元素的開頭不是「(」"
 
-#: builtin/ls-tree.c:83
+#: builtin/ls-tree.c
 #, c-format
 msgid "bad ls-tree format: element '%s' does not end in ')'"
 msgstr "無效的 ls-tree 格式：「%s」元素的結尾不是「)」"
 
-#: builtin/ls-tree.c:109
+#: builtin/ls-tree.c
 #, c-format
 msgid "bad ls-tree format: %%%.*s"
 msgstr "無效的 ls-tree 格式：%%%.*s"
 
-#: builtin/ls-tree.c:336
+#: builtin/ls-tree.c
 msgid "only show trees"
 msgstr "只顯示樹"
 
-#: builtin/ls-tree.c:338
+#: builtin/ls-tree.c
 msgid "recurse into subtrees"
 msgstr "遞迴到子樹"
 
-#: builtin/ls-tree.c:340
+#: builtin/ls-tree.c
 msgid "show trees when recursing"
 msgstr "當遞迴時顯示樹"
 
-#: builtin/ls-tree.c:343
+#: builtin/ls-tree.c
 msgid "terminate entries with NUL byte"
 msgstr "條目以 NUL 字元終止"
 
-#: builtin/ls-tree.c:344
+#: builtin/ls-tree.c
 msgid "include object size"
 msgstr "包括物件大小"
 
-#: builtin/ls-tree.c:346 builtin/ls-tree.c:348
+#: builtin/ls-tree.c
 msgid "list only filenames"
 msgstr "只列出檔案名"
 
-#: builtin/ls-tree.c:350
+#: builtin/ls-tree.c
 msgid "list only objects"
 msgstr "只列出物件"
 
-#: builtin/ls-tree.c:353
+#: builtin/ls-tree.c
 msgid "use full path names"
 msgstr "使用檔案的全路徑"
 
-#: builtin/ls-tree.c:355
+#: builtin/ls-tree.c
 msgid "list entire tree; not just current directory (implies --full-name)"
 msgstr "列出整個樹；不僅僅目前目錄（隱含 --full-name）"
 
-#: builtin/ls-tree.c:391
+#: builtin/ls-tree.c
 msgid "--format can't be combined with other format-altering options"
 msgstr "--format 不能與其他修改格式的選項結合使用"
 
 #. TRANSLATORS: keep <> in "<" mail ">" info.
-#: builtin/mailinfo.c:14
+#: builtin/mailinfo.c
 msgid "git mailinfo [<options>] <msg> <patch> < mail >info"
 msgstr "git mailinfo [<選項>] <訊息> <修補檔> < mail >info"
 
-#: builtin/mailinfo.c:58
+#: builtin/mailinfo.c
 msgid "keep subject"
 msgstr "保留主旨"
 
-#: builtin/mailinfo.c:60
+#: builtin/mailinfo.c
 msgid "keep non patch brackets in subject"
 msgstr "保留主旨中不是 PATCH 的方括號"
 
-#: builtin/mailinfo.c:62
+#: builtin/mailinfo.c
 msgid "copy Message-ID to the end of commit message"
 msgstr "複製 Message-ID 至提交說明末尾"
 
-#: builtin/mailinfo.c:64
+#: builtin/mailinfo.c
 msgid "re-code metadata to i18n.commitEncoding"
 msgstr "重新將中介資料編碼為 i18n.commitEncoding 的設定值"
 
-#: builtin/mailinfo.c:67
+#: builtin/mailinfo.c
 msgid "disable charset re-coding of metadata"
 msgstr "停用中介資料的字元重新編碼功能"
 
-#: builtin/mailinfo.c:69
+#: builtin/mailinfo.c
 msgid "encoding"
 msgstr "編碼"
 
-#: builtin/mailinfo.c:70
+#: builtin/mailinfo.c
 msgid "re-code metadata to this encoding"
 msgstr "重新將中介資料編碼為這個編碼方式"
 
-#: builtin/mailinfo.c:72
+#: builtin/mailinfo.c
 msgid "use scissors"
 msgstr "使用剪刀標記"
 
-#: builtin/mailinfo.c:73
+#: builtin/mailinfo.c
 msgid "<action>"
 msgstr "<動作>"
 
-#: builtin/mailinfo.c:74
+#: builtin/mailinfo.c
 msgid "action when quoted CR is found"
 msgstr "當找到可列印 CR 字元時所要採取的行為"
 
-#: builtin/mailinfo.c:77
+#: builtin/mailinfo.c
 msgid "use headers in message's body"
 msgstr "在訊息內文中使用標頭"
 
-#: builtin/mailsplit.c:227
+#: builtin/mailsplit.c
 msgid "reading patches from stdin/tty..."
 msgstr "正在從標準輸入或 tty 讀取修補檔內容⋯⋯"
 
-#: builtin/mailsplit.c:242
+#: builtin/mailsplit.c
 #, c-format
 msgid "empty mbox: '%s'"
 msgstr "空的 mbox：'%s'"
 
-#: builtin/merge-base.c:32
+#: builtin/merge-base.c
 msgid "git merge-base [-a | --all] <commit> <commit>..."
 msgstr "git merge-base [-a | --all] <提交> <提交>..."
 
-#: builtin/merge-base.c:33
+#: builtin/merge-base.c
 msgid "git merge-base [-a | --all] --octopus <commit>..."
 msgstr "git merge-base [-a | --all] --octopus <提交>..."
 
-#: builtin/merge-base.c:34
+#: builtin/merge-base.c
 msgid "git merge-base --independent <commit>..."
 msgstr "git merge-base --independent <提交>..."
 
-#: builtin/merge-base.c:35
+#: builtin/merge-base.c
 msgid "git merge-base --is-ancestor <commit> <commit>"
 msgstr "git merge-base --is-ancestor <提交> <提交>"
 
-#: builtin/merge-base.c:36
+#: builtin/merge-base.c
 msgid "git merge-base --fork-point <ref> [<commit>]"
 msgstr "git merge-base --fork-point <引用> [<提交>]"
 
-#: builtin/merge-base.c:144
+#: builtin/merge-base.c
 msgid "output all common ancestors"
 msgstr "輸出所有共同的祖先"
 
-#: builtin/merge-base.c:146
+#: builtin/merge-base.c
 msgid "find ancestors for a single n-way merge"
 msgstr "尋找一個多路合併的祖先提交"
 
-#: builtin/merge-base.c:148
+#: builtin/merge-base.c
 msgid "list revs not reachable from others"
 msgstr "顯示不能被其他存取到的版本"
 
-#: builtin/merge-base.c:150
+#: builtin/merge-base.c
 msgid "is the first one ancestor of the other?"
 msgstr "第一個是其他的祖先提交嗎？"
 
-#: builtin/merge-base.c:152
+#: builtin/merge-base.c
 msgid "find where <commit> forked from reflog of <ref>"
 msgstr "根據 <引用> 的引用日誌尋找 <提交> 的衍生處"
 
-#: builtin/merge-file.c:9
+#: builtin/merge-file.c
 msgid ""
 "git merge-file [<options>] [-L <name1> [-L <orig> [-L <name2>]]] <file1> "
 "<orig-file> <file2>"
@@ -17910,253 +9672,261 @@ msgstr ""
 "git merge-file [<選項>] [-L <檔案1> [-L <初始> [-L <名字2>]]] <檔案1> <初始文"
 "件> <檔案2>"
 
-#: builtin/merge-file.c:35
+#: builtin/merge-file.c
 msgid "send results to standard output"
 msgstr "將結果傳送到標準輸出"
 
-#: builtin/merge-file.c:36
+#: builtin/merge-file.c
 msgid "use a diff3 based merge"
 msgstr "使用基於 diff3 的合併"
 
-#: builtin/merge-file.c:37
+#: builtin/merge-file.c
 msgid "use a zealous diff3 based merge"
 msgstr "使用基於 zealous diff3 的合併"
 
-#: builtin/merge-file.c:39
+#: builtin/merge-file.c
 msgid "for conflicts, use our version"
 msgstr "如果衝突，使用我們的版本"
 
-#: builtin/merge-file.c:41
+#: builtin/merge-file.c
 msgid "for conflicts, use their version"
 msgstr "如果衝突，使用他們的版本"
 
-#: builtin/merge-file.c:43
+#: builtin/merge-file.c
 msgid "for conflicts, use a union version"
 msgstr "如果衝突，使用聯合版本"
 
-#: builtin/merge-file.c:46
+#: builtin/merge-file.c
 msgid "for conflicts, use this marker size"
 msgstr "如果衝突，使用指定長度的標記"
 
-#: builtin/merge-file.c:47
+#: builtin/merge-file.c
 msgid "do not warn about conflicts"
 msgstr "不要警告衝突"
 
-#: builtin/merge-file.c:49
+#: builtin/merge-file.c
 msgid "set labels for file1/orig-file/file2"
 msgstr "為 檔案1/初始檔案/檔案2 設定標籤"
 
-#: builtin/merge-recursive.c:47
+#: builtin/merge-recursive.c
 #, c-format
 msgid "unknown option %s"
 msgstr "未知選項 %s"
 
-#: builtin/merge-recursive.c:53
+#: builtin/merge-recursive.c
 #, c-format
 msgid "could not parse object '%s'"
 msgstr "不能解析物件 '%s'"
 
-#: builtin/merge-recursive.c:57
+#: builtin/merge-recursive.c
 #, c-format
 msgid "cannot handle more than %d base. Ignoring %s."
 msgid_plural "cannot handle more than %d bases. Ignoring %s."
 msgstr[0] "無法處理 %d 條以上的基礎。忽略 %s。"
 
-#: builtin/merge-recursive.c:65
+#: builtin/merge-recursive.c
 msgid "not handling anything other than two heads merge."
 msgstr "不能處理兩個頭合併之外的任何動作。"
 
-#: builtin/merge-recursive.c:74 builtin/merge-recursive.c:76
+#: builtin/merge-recursive.c
 #, c-format
 msgid "could not resolve ref '%s'"
 msgstr "無法解析引用 '%s'"
 
-#: builtin/merge-recursive.c:82
+#: builtin/merge-recursive.c
 #, c-format
 msgid "Merging %s with %s\n"
 msgstr "合併 %s 和 %s\n"
 
-#: builtin/merge.c:59
+#: builtin/merge.c
 msgid "git merge [<options>] [<commit>...]"
 msgstr "git merge [<選項>] [<提交>...]"
 
-#: builtin/merge.c:125
+#: builtin/merge.c
 msgid "switch `m' requires a value"
 msgstr "開關 `m' 需要一個值"
 
-#: builtin/merge.c:148
+#: builtin/merge.c
 #, c-format
 msgid "option `%s' requires a value"
 msgstr "選項 `%s' 需要一個值"
 
-#: builtin/merge.c:201
+#: builtin/merge.c
 #, c-format
 msgid "Could not find merge strategy '%s'.\n"
 msgstr "不能找到合併策略 '%s'。\n"
 
-#: builtin/merge.c:202
+#: builtin/merge.c
 #, c-format
 msgid "Available strategies are:"
 msgstr "可用的策略有："
 
-#: builtin/merge.c:207
+#: builtin/merge.c
 #, c-format
 msgid "Available custom strategies are:"
 msgstr "可用的自訂策略有："
 
-#: builtin/merge.c:258 builtin/pull.c:134
+#: builtin/merge.c builtin/pull.c
 msgid "do not show a diffstat at the end of the merge"
 msgstr "在合併的最後不顯示差異統計"
 
-#: builtin/merge.c:261 builtin/pull.c:137
+#: builtin/merge.c builtin/pull.c
 msgid "show a diffstat at the end of the merge"
 msgstr "在合併的最後顯示差異統計"
 
-#: builtin/merge.c:262 builtin/pull.c:140
+#: builtin/merge.c builtin/pull.c
 msgid "(synonym to --stat)"
 msgstr "（和 --stat 同義）"
 
-#: builtin/merge.c:264 builtin/pull.c:143
+#: builtin/merge.c builtin/pull.c
 msgid "add (at most <n>) entries from shortlog to merge commit message"
 msgstr "在合併提交說明中新增（最多 <n> 條）精簡提交記錄"
 
-#: builtin/merge.c:267 builtin/pull.c:149
+#: builtin/merge.c builtin/pull.c
 msgid "create a single commit instead of doing a merge"
 msgstr "建立一個單獨的提交而不是做一次合併"
 
-#: builtin/merge.c:269 builtin/pull.c:152
+#: builtin/merge.c builtin/pull.c
 msgid "perform a commit if the merge succeeds (default)"
 msgstr "如果合併成功，執行一次提交（預設）"
 
-#: builtin/merge.c:271 builtin/pull.c:155
+#: builtin/merge.c builtin/pull.c
 msgid "edit message before committing"
 msgstr "在提交前編輯提交說明"
 
-#: builtin/merge.c:273
+#: builtin/merge.c
 msgid "allow fast-forward (default)"
 msgstr "允許快轉（預設）"
 
-#: builtin/merge.c:275 builtin/pull.c:162
+#: builtin/merge.c builtin/pull.c
 msgid "abort if fast-forward is not possible"
 msgstr "如果不能快轉就放棄合併"
 
-#: builtin/merge.c:279 builtin/pull.c:168
+#: builtin/merge.c builtin/pull.c
 msgid "verify that the named commit has a valid GPG signature"
 msgstr "驗證指定的提交是否包含一個有效的 GPG 簽名"
 
-#: builtin/merge.c:280 builtin/notes.c:785 builtin/pull.c:172
-#: builtin/rebase.c:1145 builtin/revert.c:114
+#: builtin/merge.c builtin/notes.c builtin/pull.c builtin/rebase.c
+#: builtin/revert.c
 msgid "strategy"
 msgstr "策略"
 
-#: builtin/merge.c:281 builtin/pull.c:173
+#: builtin/merge.c builtin/pull.c
 msgid "merge strategy to use"
 msgstr "要使用的合併策略"
 
-#: builtin/merge.c:282 builtin/pull.c:176
+#: builtin/merge.c builtin/pull.c
 msgid "option=value"
 msgstr "option=value"
 
-#: builtin/merge.c:283 builtin/pull.c:177
+#: builtin/merge.c builtin/pull.c
 msgid "option for selected merge strategy"
 msgstr "所選的合併策略的選項"
 
-#: builtin/merge.c:285
+#: builtin/merge.c
 msgid "merge commit message (for a non-fast-forward merge)"
 msgstr "合併的提交說明（針對非快轉式合併）"
 
-#: builtin/merge.c:291
+#: builtin/merge.c
 msgid "use <name> instead of the real target"
 msgstr "使用 <名稱> 而非實際目的地"
 
-#: builtin/merge.c:294
+#: builtin/merge.c
 msgid "abort the current in-progress merge"
 msgstr "放棄目前正在進行的合併"
 
 #
-#: builtin/merge.c:296
+#: builtin/merge.c
 msgid "--abort but leave index and working tree alone"
 msgstr "--abort，但是保留索引和工作區"
 
-#: builtin/merge.c:298
+#: builtin/merge.c
 msgid "continue the current in-progress merge"
 msgstr "繼續目前正在進行的合併"
 
-#: builtin/merge.c:300 builtin/pull.c:184
+#: builtin/merge.c builtin/pull.c
 msgid "allow merging unrelated histories"
 msgstr "允許合並不相關的歷史"
 
-#: builtin/merge.c:307
+#: builtin/merge.c
 msgid "bypass pre-merge-commit and commit-msg hooks"
 msgstr "繞過 pre-merge-commit 和 commit-msg 掛鉤"
 
-#: builtin/merge.c:323
+#: builtin/merge.c
 msgid "could not run stash."
 msgstr "不能執行儲藏。"
 
-#: builtin/merge.c:328
+#: builtin/merge.c
 msgid "stash failed"
 msgstr "儲藏失敗"
 
-#: builtin/merge.c:333
+#: builtin/merge.c
 #, c-format
 msgid "not a valid object: %s"
 msgstr "不是一個有效物件：%s"
 
-#: builtin/merge.c:355 builtin/merge.c:372
+#: builtin/merge.c
 msgid "read-tree failed"
 msgstr "讀取樹失敗"
 
 #  譯者：請維持前導空格
-#: builtin/merge.c:403
+#: builtin/merge.c
 msgid "Already up to date. (nothing to squash)"
 msgstr "已經是最新的。（無需壓縮 (squash)）"
 
-#: builtin/merge.c:417
+#: builtin/merge.c merge-ort-wrappers.c merge-recursive.c
+msgid "Already up to date."
+msgstr "已經是最新的。"
+
+#: builtin/merge.c
 #, c-format
 msgid "Squash commit -- not updating HEAD\n"
 msgstr "壓縮提交 -- 未更新 HEAD\n"
 
-#: builtin/merge.c:467
+#: builtin/merge.c
 #, c-format
 msgid "No merge message -- not updating HEAD\n"
 msgstr "無合併訊息 -- 未更新 HEAD\n"
 
-#: builtin/merge.c:517
+#: builtin/merge.c
 #, c-format
 msgid "'%s' does not point to a commit"
 msgstr "'%s' 沒有指向一個提交"
 
-#: builtin/merge.c:605
+#: builtin/merge.c
 #, c-format
 msgid "Bad branch.%s.mergeoptions string: %s"
 msgstr "壞的 branch.%s.mergeoptions 字串：%s"
 
-#: builtin/merge.c:732
+#: builtin/merge.c builtin/stash.c merge-recursive.c
+msgid "Unable to write index."
+msgstr "不能寫入索引。"
+
+#: builtin/merge.c
 msgid "Not handling anything other than two heads merge."
 msgstr "未處理兩個頭合併之外的任何動作。"
 
-#: builtin/merge.c:745
+#: builtin/merge.c
 #, c-format
 msgid "unknown strategy option: -X%s"
 msgstr "未知的策略選項：-X%s"
 
-#: builtin/merge.c:764 t/helper/test-fast-rebase.c:223
+#: builtin/merge.c t/helper/test-fast-rebase.c
 #, c-format
 msgid "unable to write %s"
 msgstr "不能寫 %s"
 
-#: builtin/merge.c:816
+#: builtin/merge.c
 #, c-format
 msgid "Could not read from '%s'"
 msgstr "不能從 '%s' 讀取"
 
-#: builtin/merge.c:825
+#: builtin/merge.c
 #, c-format
 msgid "Not committing merge; use 'git commit' to complete the merge.\n"
 msgstr "未提交合並，使用 'git commit' 完成此次合併。\n"
 
-#: builtin/merge.c:831
+#: builtin/merge.c
 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"
@@ -18166,83 +9936,88 @@ msgstr ""
 "合併到主題分支。\n"
 "\n"
 
-#: builtin/merge.c:836
+#: builtin/merge.c
 msgid "An empty message aborts the commit.\n"
 msgstr "空的提交說明會終止提交。\n"
 
-#: builtin/merge.c:839
+#: builtin/merge.c
 #, 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:900
+#: builtin/merge.c
 msgid "Empty commit message."
 msgstr "空提交說明。"
 
-#: builtin/merge.c:915
+#: builtin/merge.c
 #, c-format
 msgid "Wonderful.\n"
 msgstr "太棒了。\n"
 
-#: builtin/merge.c:976
+#: builtin/merge.c
 #, c-format
 msgid "Automatic merge failed; fix conflicts and then commit the result.\n"
 msgstr "自動合併失敗，修正衝突然後提交修正的結果。\n"
 
-#: builtin/merge.c:1015
+#: builtin/merge.c
 msgid "No current branch."
 msgstr "沒有目前分支。"
 
-#: builtin/merge.c:1017
+#: builtin/merge.c
 msgid "No remote for the current branch."
 msgstr "目前分支沒有對應的遠端版本庫。"
 
-#: builtin/merge.c:1019
+#: builtin/merge.c
 msgid "No default upstream defined for the current branch."
 msgstr "目前分支沒有定義預設的上游分支。"
 
-#: builtin/merge.c:1024
+#: builtin/merge.c
 #, c-format
 msgid "No remote-tracking branch for %s from %s"
 msgstr "對於 %s 沒有來自 %s 的遠端追蹤分支"
 
-#: builtin/merge.c:1081
+#: builtin/merge.c
 #, c-format
 msgid "Bad value '%s' in environment '%s'"
 msgstr "環境 '%2$s' 中存在壞的取值 '%1$s'"
 
-#: builtin/merge.c:1183
+#: builtin/merge.c read-cache.c strbuf.c wrapper.c
+#, c-format
+msgid "could not close '%s'"
+msgstr "不能關閉 '%s'"
+
+#: builtin/merge.c
 #, c-format
 msgid "not something we can merge in %s: %s"
 msgstr "不能在 %s 中合併：%s"
 
-#: builtin/merge.c:1217
+#: builtin/merge.c
 msgid "not something we can merge"
 msgstr "不能合併"
 
-#: builtin/merge.c:1330
+#: builtin/merge.c
 msgid "--abort expects no arguments"
 msgstr "--abort 不帶參數"
 
-#: builtin/merge.c:1334
+#: builtin/merge.c
 msgid "There is no merge to abort (MERGE_HEAD missing)."
 msgstr "沒有要終止的合併（MERGE_HEAD 遺失）。"
 
-#: builtin/merge.c:1352
+#: builtin/merge.c
 msgid "--quit expects no arguments"
 msgstr "--quit 不帶參數"
 
-#: builtin/merge.c:1365
+#: builtin/merge.c
 msgid "--continue expects no arguments"
 msgstr "--continue 不帶參數"
 
-#: builtin/merge.c:1369
+#: builtin/merge.c
 msgid "There is no merge in progress (MERGE_HEAD missing)."
 msgstr "沒有進行中的合併（MERGE_HEAD 遺失）。"
 
-#: builtin/merge.c:1385
+#: builtin/merge.c
 msgid ""
 "You have not concluded your merge (MERGE_HEAD exists).\n"
 "Please, commit your changes before you merge."
@@ -18250,7 +10025,7 @@ msgstr ""
 "您尚未結束您的合併（存在 MERGE_HEAD）。\n"
 "請在合併前先提交您的修改。"
 
-#: builtin/merge.c:1392
+#: builtin/merge.c
 msgid ""
 "You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists).\n"
 "Please, commit your changes before you merge."
@@ -18258,130 +10033,134 @@ msgstr ""
 "您尚未結束您的揀選（存在 CHERRY_PICK_HEAD）。\n"
 "請在合併前先提交您的修改。"
 
-#: builtin/merge.c:1395
+#: builtin/merge.c
 msgid "You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists)."
 msgstr "您尚未結束您的揀選（存在 CHERRY_PICK_HEAD）。"
 
-#: builtin/merge.c:1427
+#: builtin/merge.c
 msgid "No commit specified and merge.defaultToUpstream not set."
 msgstr "未指定提交並且 merge.defaultToUpstream 未設定。"
 
-#: builtin/merge.c:1444
+#: builtin/merge.c
 msgid "Squash commit into empty head not supported yet"
 msgstr "尚不支援到空分支的壓縮提交"
 
-#: builtin/merge.c:1446
+#: builtin/merge.c
 msgid "Non-fast-forward commit does not make sense into an empty head"
 msgstr "到空分支的非快轉式提交沒有意義"
 
-#: builtin/merge.c:1451
+#: builtin/merge.c
 #, c-format
 msgid "%s - not something we can merge"
 msgstr "%s - 不能被合併"
 
-#: builtin/merge.c:1453
+#: builtin/merge.c
 msgid "Can merge only exactly one commit into empty head"
 msgstr "只能將一個提交合並到空分支上"
 
-#: builtin/merge.c:1540
+#: builtin/merge.c
 msgid "refusing to merge unrelated histories"
 msgstr "拒絕合併無關的歷史"
 
-#: builtin/merge.c:1559
+#: builtin/merge.c
 #, c-format
 msgid "Updating %s..%s\n"
 msgstr "更新 %s..%s\n"
 
-#: builtin/merge.c:1606
+#: builtin/merge.c
 #, c-format
 msgid "Trying really trivial in-index merge...\n"
 msgstr "嘗試非常小的索引內合併...\n"
 
-#: builtin/merge.c:1613
+#: builtin/merge.c
 #, c-format
 msgid "Nope.\n"
 msgstr "無。\n"
 
-#: builtin/merge.c:1671 builtin/merge.c:1737
+#: builtin/merge.c
 #, c-format
 msgid "Rewinding the tree to pristine...\n"
 msgstr "將樹回滾至原始狀態...\n"
 
-#: builtin/merge.c:1675
+#: builtin/merge.c
 #, c-format
 msgid "Trying merge strategy %s...\n"
 msgstr "嘗試合併策略 %s...\n"
 
-#: builtin/merge.c:1727
+#: builtin/merge.c
 #, c-format
 msgid "No merge strategy handled the merge.\n"
 msgstr "沒有合併策略處理此合併。\n"
 
-#: builtin/merge.c:1729
+#: builtin/merge.c
 #, c-format
 msgid "Merge with strategy %s failed.\n"
 msgstr "使用策略 %s 合併失敗。\n"
 
-#: builtin/merge.c:1739
+#: builtin/merge.c
 #, c-format
 msgid "Using the %s strategy to prepare resolving by hand.\n"
 msgstr "使用 %s 策略，準備自行解決。\n"
 
-#: builtin/merge.c:1753
+#: builtin/merge.c
 #, c-format
 msgid "Automatic merge went well; stopped before committing as requested\n"
 msgstr "自動合併進展順利，按要求在提交前停止\n"
 
-#: builtin/mktag.c:27
+#: builtin/mktag.c
 #, c-format
 msgid "warning: tag input does not pass fsck: %s"
 msgstr "警告：標籤輸入未通過 fsck：%s"
 
-#: builtin/mktag.c:38
+#: builtin/mktag.c
 #, c-format
 msgid "error: tag input does not pass fsck: %s"
 msgstr "錯誤：標籤輸入未通過 fsck：%s"
 
-#: builtin/mktag.c:41
+#: builtin/mktag.c
 #, c-format
 msgid "%d (FSCK_IGNORE?) should never trigger this callback"
 msgstr "%d (FSCK_IGNORE?) 不應觸發這個回呼函式"
 
-#: builtin/mktag.c:56
+#: builtin/mktag.c
 #, c-format
 msgid "could not read tagged object '%s'"
 msgstr "無法讀取有標籤的物件「%s」"
 
-#: builtin/mktag.c:59
+#: builtin/mktag.c
 #, c-format
 msgid "object '%s' tagged as '%s', but is a '%s' type"
 msgstr "「%s」已標為「%s」，但卻是「%s」類型"
 
-#: builtin/mktag.c:97
+#: builtin/mktag.c imap-send.c trailer.c
+msgid "could not read from stdin"
+msgstr "不能自標準輸入讀取"
+
+#: builtin/mktag.c
 msgid "tag on stdin did not pass our strict fsck check"
 msgstr "stdin 上的標籤未通過我們的嚴格 fsck 檢查"
 
-#: builtin/mktag.c:100
+#: builtin/mktag.c
 msgid "tag on stdin did not refer to a valid object"
 msgstr "標準輸入上的標籤指向的不是有效物件"
 
-#: builtin/mktag.c:103 builtin/tag.c:243
+#: builtin/mktag.c builtin/tag.c
 msgid "unable to write tag file"
 msgstr "無法寫標籤檔案"
 
-#: builtin/mktree.c:154
+#: builtin/mktree.c
 msgid "input is NUL terminated"
 msgstr "輸入以 NUL 字元終止"
 
-#: builtin/mktree.c:155 builtin/write-tree.c:26
+#: builtin/mktree.c builtin/write-tree.c
 msgid "allow missing objects"
 msgstr "允許遺失的物件"
 
-#: builtin/mktree.c:156
+#: builtin/mktree.c
 msgid "allow creation of more than one tree"
 msgstr "允許建立一個以上的樹"
 
-#: builtin/multi-pack-index.c:10
+#: builtin/multi-pack-index.c
 msgid ""
 "git multi-pack-index [<options>] write [--preferred-pack=<pack>][--refs-"
 "snapshot=<path>]"
@@ -18389,197 +10168,201 @@ msgstr ""
 "git multi-pack-index [<選項>] write [--preferred-pack=<包>] [--refs-"
 "snapshot=<路徑>]"
 
-#: builtin/multi-pack-index.c:14
+#: builtin/multi-pack-index.c
 msgid "git multi-pack-index [<options>] verify"
 msgstr "git multi-pack-index [<選項>] verify"
 
-#: builtin/multi-pack-index.c:17
+#: builtin/multi-pack-index.c
 msgid "git multi-pack-index [<options>] expire"
 msgstr "git multi-pack-index [<選項>] expire"
 
-#: builtin/multi-pack-index.c:20
+#: builtin/multi-pack-index.c
 msgid "git multi-pack-index [<options>] repack [--batch-size=<size>]"
 msgstr "git multi-pack-index [<選項>] repack [--batch-size=<大小>]"
 
-#: builtin/multi-pack-index.c:57
+#: builtin/multi-pack-index.c
+msgid "directory"
+msgstr "目錄"
+
+#: builtin/multi-pack-index.c
 msgid "object directory containing set of packfile and pack-index pairs"
 msgstr "包含成對 packfile 和包索引的物件目錄"
 
-#: builtin/multi-pack-index.c:98
+#: builtin/multi-pack-index.c
 msgid "preferred-pack"
 msgstr "偏好包"
 
-#: builtin/multi-pack-index.c:99
+#: builtin/multi-pack-index.c
 msgid "pack for reuse when computing a multi-pack bitmap"
 msgstr "計算多包位圖時要重複使用的包"
 
-#: builtin/multi-pack-index.c:100
+#: builtin/multi-pack-index.c
 msgid "write multi-pack bitmap"
 msgstr "寫入多包位圖"
 
-#: builtin/multi-pack-index.c:105
+#: builtin/multi-pack-index.c
 msgid "write multi-pack index containing only given indexes"
 msgstr "寫入只包含指定索引的多包索引"
 
-#: builtin/multi-pack-index.c:107
+#: builtin/multi-pack-index.c
 msgid "refs snapshot for selecting bitmap commits"
 msgstr "用來選取位圖提交的引用快照"
 
-#: builtin/multi-pack-index.c:206
+#: builtin/multi-pack-index.c
 msgid ""
 "during repack, collect pack-files of smaller size into a batch that is "
 "larger than this size"
 msgstr "在 repack 期間，將較小尺寸的包檔案收集到大於此大小的批次中"
 
-#: builtin/mv.c:18
+#: builtin/mv.c
 msgid "git mv [<options>] <source>... <destination>"
 msgstr "git mv [<選項>] <來源>... <目的地>"
 
-#: builtin/mv.c:83
+#: builtin/mv.c
 #, c-format
 msgid "Directory %s is in index and no submodule?"
 msgstr "目錄 %s 在索引中並且不是子模組？"
 
-#: builtin/mv.c:85
+#: builtin/mv.c
 msgid "Please stage your changes to .gitmodules or stash them to proceed"
 msgstr "請將您的修改暫存到 .gitmodules 中或儲藏後再繼續"
 
-#: builtin/mv.c:103
+#: builtin/mv.c
 #, c-format
 msgid "%.*s is in index"
 msgstr "%.*s 在索引中"
 
-#: builtin/mv.c:125
+#: builtin/mv.c
 msgid "force move/rename even if target exists"
 msgstr "強制移動/重指令，即使目標存在"
 
-#: builtin/mv.c:127
+#: builtin/mv.c
 msgid "skip move/rename errors"
 msgstr "略過移動/重新命名錯誤"
 
-#: builtin/mv.c:172
+#: builtin/mv.c
 #, c-format
 msgid "destination '%s' is not a directory"
 msgstr "目的地「%s」不是目錄"
 
-#: builtin/mv.c:184
+#: builtin/mv.c
 #, c-format
 msgid "Checking rename of '%s' to '%s'\n"
 msgstr "檢查 '%s' 到 '%s' 的重新命名\n"
 
-#: builtin/mv.c:190
+#: builtin/mv.c
 msgid "bad source"
 msgstr "來源損壞"
 
-#: builtin/mv.c:193
+#: builtin/mv.c
 msgid "can not move directory into itself"
 msgstr "不能將目錄移動到自身"
 
-#: builtin/mv.c:196
+#: builtin/mv.c
 msgid "cannot move directory over file"
 msgstr "不能將目錄移動到檔案"
 
-#: builtin/mv.c:205
+#: builtin/mv.c
 msgid "source directory is empty"
 msgstr "來源目錄空白"
 
-#: builtin/mv.c:231
+#: builtin/mv.c
 msgid "not under version control"
 msgstr "不在版本控制之下"
 
-#: builtin/mv.c:233
+#: builtin/mv.c
 msgid "conflicted"
 msgstr "衝突"
 
-#: builtin/mv.c:236
+#: builtin/mv.c
 msgid "destination exists"
 msgstr "目的地已存在"
 
-#: builtin/mv.c:244
+#: builtin/mv.c
 #, c-format
 msgid "overwriting '%s'"
 msgstr "覆蓋 '%s'"
 
-#: builtin/mv.c:247
+#: builtin/mv.c
 msgid "Cannot overwrite"
 msgstr "不能覆蓋"
 
-#: builtin/mv.c:250
+#: builtin/mv.c
 msgid "multiple sources for the same target"
 msgstr "同一目標具有多個來源"
 
-#: builtin/mv.c:252
+#: builtin/mv.c
 msgid "destination directory does not exist"
 msgstr "找不到目的地目錄"
 
-#: builtin/mv.c:280
+#: builtin/mv.c
 #, c-format
 msgid "%s, source=%s, destination=%s"
 msgstr "%s，來源=%s，目的地=%s"
 
-#: builtin/mv.c:308
+#: builtin/mv.c
 #, c-format
 msgid "Renaming %s to %s\n"
 msgstr "重新命名 %s 至 %s\n"
 
-#: builtin/mv.c:314 builtin/remote.c:812 builtin/repack.c:861
+#: builtin/mv.c builtin/remote.c builtin/repack.c
 #, c-format
 msgid "renaming '%s' failed"
 msgstr "重新命名 '%s' 失敗"
 
-#: builtin/name-rev.c:524
+#: builtin/name-rev.c
 msgid "git name-rev [<options>] <commit>..."
 msgstr "git name-rev [<選項>] <提交>..."
 
-#: builtin/name-rev.c:525
+#: builtin/name-rev.c
 msgid "git name-rev [<options>] --all"
 msgstr "git name-rev [<選項>] --all"
 
-#: builtin/name-rev.c:526
+#: builtin/name-rev.c
 msgid "git name-rev [<options>] --annotate-stdin"
 msgstr "git name-rev [<options>] --annotate-stdin"
 
-#: builtin/name-rev.c:583
+#: builtin/name-rev.c
 msgid "print only ref-based names (no object names)"
 msgstr "只輸出基於引用的名稱 (沒有物件名稱)"
 
-#: builtin/name-rev.c:584
+#: builtin/name-rev.c
 msgid "only use tags to name the commits"
 msgstr "只使用標籤來命名提交"
 
-#: builtin/name-rev.c:586
+#: builtin/name-rev.c
 msgid "only use refs matching <pattern>"
 msgstr "只使用和 <模式> 相符合的引用"
 
-#: builtin/name-rev.c:588
+#: builtin/name-rev.c
 msgid "ignore refs matching <pattern>"
 msgstr "忽略和 <模式> 相符合的引用"
 
-#: builtin/name-rev.c:590
+#: builtin/name-rev.c
 msgid "list all commits reachable from all refs"
 msgstr "列出可以從所有引用存取的提交"
 
-#: builtin/name-rev.c:591
-msgid "deprecated: use annotate-stdin instead"
-msgstr "已取代：請改用 annotate-stdin"
+#: builtin/name-rev.c
+msgid "deprecated: use --annotate-stdin instead"
+msgstr "已廢棄：請改用 --annotate-stdin"
 
-#: builtin/name-rev.c:592
+#: builtin/name-rev.c
 msgid "annotate text from stdin"
 msgstr "註解從標準輸入收到的文字"
 
-#: builtin/name-rev.c:593
+#: builtin/name-rev.c
 msgid "allow to print `undefined` names (default)"
 msgstr "允許列印 `未定義` 的名稱（預設）"
 
-#: builtin/name-rev.c:599
+#: builtin/name-rev.c
 msgid "dereference tags in the input (internal use)"
 msgstr "反向解析輸入中的標籤（內部使用）"
 
-#: builtin/notes.c:28
+#: builtin/notes.c
 msgid "git notes [--ref <notes-ref>] [list [<object>]]"
 msgstr "git notes [--ref <註解引用>] [list [<物件>]]"
 
-#: builtin/notes.c:29
+#: builtin/notes.c
 msgid ""
 "git notes [--ref <notes-ref>] add [-f] [--allow-empty] [-m <msg> | -F <file> "
 "| (-c | -C) <object>] [<object>]"
@@ -18587,11 +10370,11 @@ msgstr ""
 "git notes [--ref <註解引用>] add [-f] [--allow-empty] [-m <說明> | -F <檔案> "
 "| (-c | -C) <物件>] [<物件>]"
 
-#: builtin/notes.c:30
+#: builtin/notes.c
 msgid "git notes [--ref <notes-ref>] copy [-f] <from-object> <to-object>"
 msgstr "git notes [--ref <註解引用>] copy [-f] <來源物件> <目標物件>"
 
-#: builtin/notes.c:31
+#: builtin/notes.c
 msgid ""
 "git notes [--ref <notes-ref>] append [--allow-empty] [-m <msg> | -F <file> | "
 "(-c | -C) <object>] [<object>]"
@@ -18599,138 +10382,136 @@ msgstr ""
 "git notes [--ref <註解引用>] append [--allow-empty] [-m <說明> | -F <檔案> | "
 "(-c | -C) <物件>] [<物件>]"
 
-#: builtin/notes.c:32
+#: builtin/notes.c
 msgid "git notes [--ref <notes-ref>] edit [--allow-empty] [<object>]"
 msgstr "git notes [--ref <註解引用>] edit [--allow-empty] [<物件>]"
 
-#: builtin/notes.c:33
+#: builtin/notes.c
 msgid "git notes [--ref <notes-ref>] show [<object>]"
 msgstr "git notes [--ref <註解引用>] show [<物件>]"
 
-#: builtin/notes.c:34
+#: builtin/notes.c
 msgid ""
 "git notes [--ref <notes-ref>] merge [-v | -q] [-s <strategy>] <notes-ref>"
 msgstr "git notes [--ref <註解引用>] merge [-v | -q] [-s <策略> ] <註解引用>"
 
-#: builtin/notes.c:37
+#: builtin/notes.c
 msgid "git notes [--ref <notes-ref>] remove [<object>...]"
 msgstr "git notes [--ref <註解引用>] remove [<物件>...]"
 
-#: builtin/notes.c:38
+#: builtin/notes.c
 msgid "git notes [--ref <notes-ref>] prune [-n] [-v]"
 msgstr "git notes [--ref <註解引用>] prune [-n] [-v]"
 
-#: builtin/notes.c:39
+#: builtin/notes.c
 msgid "git notes [--ref <notes-ref>] get-ref"
 msgstr "git notes [--ref <註解引用>] get-ref"
 
-#: builtin/notes.c:44
+#: builtin/notes.c
 msgid "git notes [list [<object>]]"
 msgstr "git notes [list [<物件>]]"
 
-#: builtin/notes.c:49
+#: builtin/notes.c
 msgid "git notes add [<options>] [<object>]"
 msgstr "git notes add [<選項>] [<物件>]"
 
-#: builtin/notes.c:54
+#: builtin/notes.c
 msgid "git notes copy [<options>] <from-object> <to-object>"
 msgstr "git notes copy [<選項>] <來源物件> <目標物件>"
 
-#: builtin/notes.c:55
+#: builtin/notes.c
 msgid "git notes copy --stdin [<from-object> <to-object>]..."
 msgstr "git notes copy --stdin [<來源物件> <目標物件>]..."
 
-#: builtin/notes.c:60
+#: builtin/notes.c
 msgid "git notes append [<options>] [<object>]"
 msgstr "git notes append [<選項>] [<物件>]"
 
-#: builtin/notes.c:65
+#: builtin/notes.c
 msgid "git notes edit [<object>]"
 msgstr "git notes edit [<物件>]"
 
-#: builtin/notes.c:70
+#: builtin/notes.c
 msgid "git notes show [<object>]"
 msgstr "git notes show [<物件>]"
 
-#: builtin/notes.c:75
+#: builtin/notes.c
 msgid "git notes merge [<options>] <notes-ref>"
 msgstr "git notes merge [<選項>] <註解引用>"
 
-#: builtin/notes.c:76
+#: builtin/notes.c
 msgid "git notes merge --commit [<options>]"
 msgstr "git notes merge --commit [<選項>]"
 
-#: builtin/notes.c:77
+#: builtin/notes.c
 msgid "git notes merge --abort [<options>]"
 msgstr "git notes merge --abort [<選項>]"
 
-#: builtin/notes.c:82
+#: builtin/notes.c
 msgid "git notes remove [<object>]"
 msgstr "git notes remove [<物件>]"
 
-#: builtin/notes.c:87
+#: builtin/notes.c
 msgid "git notes prune [<options>]"
 msgstr "git notes prune [<選項>]"
 
-#: builtin/notes.c:97
+#: builtin/notes.c
 msgid "Write/edit the notes for the following object:"
 msgstr "為下面的物件寫/編輯說明："
 
-#: builtin/notes.c:149
+#: builtin/notes.c
 #, c-format
 msgid "unable to start 'show' for object '%s'"
 msgstr "不能為物件 '%s' 開始 'show'"
 
-#: builtin/notes.c:153
+#: builtin/notes.c
 msgid "could not read 'show' output"
 msgstr "不能讀取 'show' 的輸出"
 
-#: builtin/notes.c:161
+#: builtin/notes.c
 #, c-format
 msgid "failed to finish 'show' for object '%s'"
 msgstr "無法為物件 '%s' 完成 'show'"
 
-#: builtin/notes.c:194
+#: builtin/notes.c
 msgid "please supply the note contents using either -m or -F option"
 msgstr "請透過 -m 或 -F 選項為註解提供內容"
 
-#: builtin/notes.c:203
+#: builtin/notes.c
 msgid "unable to write note object"
 msgstr "不能寫註解物件"
 
-#: builtin/notes.c:206
+#: builtin/notes.c
 #, c-format
 msgid "the note contents have been left in %s"
 msgstr "註解內容被留在 %s 中"
 
-#: builtin/notes.c:240 builtin/tag.c:582
+#: builtin/notes.c builtin/tag.c
 #, c-format
 msgid "could not open or read '%s'"
 msgstr "不能開啟或讀取 '%s'"
 
-#: 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
+#: builtin/notes.c
 #, c-format
 msgid "failed to resolve '%s' as a valid ref."
 msgstr "無法解析 '%s' 為一個有效引用。"
 
-#: builtin/notes.c:263
+#: builtin/notes.c
 #, c-format
 msgid "failed to read object '%s'."
 msgstr "讀取物件 '%s' 失敗。"
 
-#: builtin/notes.c:266
+#: builtin/notes.c
 #, c-format
 msgid "cannot read note data from non-blob object '%s'."
 msgstr "不能從非資料物件 '%s' 中讀取註解資料。"
 
-#: builtin/notes.c:307
+#: builtin/notes.c
 #, c-format
 msgid "malformed input line: '%s'."
 msgstr "格式錯誤的輸入行：'%s'。"
 
-#: builtin/notes.c:322
+#: builtin/notes.c
 #, c-format
 msgid "failed to copy notes from '%s' to '%s'"
 msgstr "從 '%s' 複製註解到 '%s' 時失敗"
@@ -18738,82 +10519,82 @@ msgstr "從 '%s' 複製註解到 '%s' 時失敗"
 #. TRANSLATORS: the first %s will be replaced by a git
 #. notes command: 'add', 'merge', 'remove', etc.
 #.
-#: builtin/notes.c:354
+#: builtin/notes.c
 #, c-format
 msgid "refusing to %s notes in %s (outside of refs/notes/)"
 msgstr "拒絕向 %2$s（在 refs/notes/ 之外）%1$s註解"
 
-#: builtin/notes.c:387 builtin/notes.c:676
+#: builtin/notes.c
 #, c-format
 msgid "no note found for object %s."
 msgstr "未發現物件 %s 的註解。"
 
-#: builtin/notes.c:408 builtin/notes.c:574
+#: builtin/notes.c
 msgid "note contents as a string"
 msgstr "註解內容作為一個字串"
 
-#: builtin/notes.c:411 builtin/notes.c:577
+#: builtin/notes.c
 msgid "note contents in a file"
 msgstr "註解內容到一個檔案中"
 
-#: builtin/notes.c:414 builtin/notes.c:580
+#: builtin/notes.c
 msgid "reuse and edit specified note object"
 msgstr "重用和編輯指定的註解物件"
 
-#: builtin/notes.c:417 builtin/notes.c:583
+#: builtin/notes.c
 msgid "reuse specified note object"
 msgstr "重用指定的註解物件"
 
-#: builtin/notes.c:420 builtin/notes.c:586
+#: builtin/notes.c
 msgid "allow storing empty note"
 msgstr "允許儲存空白備註"
 
-#: builtin/notes.c:421 builtin/notes.c:494
+#: builtin/notes.c
 msgid "replace existing notes"
 msgstr "取代已存在的註解"
 
-#: builtin/notes.c:446
+#: builtin/notes.c
 #, c-format
 msgid ""
 "Cannot add notes. Found existing notes for object %s. Use '-f' to overwrite "
 "existing notes"
 msgstr "不能新增註解。發現物件 %s 已存在註解。使用 '-f' 覆蓋現存註解"
 
-#: builtin/notes.c:461 builtin/notes.c:542
+#: builtin/notes.c
 #, c-format
 msgid "Overwriting existing notes for object %s\n"
 msgstr "覆蓋物件 %s 現存註解\n"
 
-#: builtin/notes.c:473 builtin/notes.c:635 builtin/notes.c:904
+#: builtin/notes.c
 #, c-format
 msgid "Removing note for object %s\n"
 msgstr "刪除物件 %s 的註解\n"
 
-#: builtin/notes.c:495
+#: builtin/notes.c
 msgid "read objects from stdin"
 msgstr "從標準輸入讀取物件"
 
-#: builtin/notes.c:497
+#: builtin/notes.c
 msgid "load rewriting config for <command> (implies --stdin)"
 msgstr "重新載入 <命令> 的設定（隱含 --stdin）"
 
-#: builtin/notes.c:515
+#: builtin/notes.c
 msgid "too few arguments"
 msgstr "太少參數"
 
-#: builtin/notes.c:536
+#: builtin/notes.c
 #, c-format
 msgid ""
 "Cannot copy notes. Found existing notes for object %s. Use '-f' to overwrite "
 "existing notes"
 msgstr "不能複製註解。發現物件 %s 已存在註解。使用 '-f' 覆蓋現存註解"
 
-#: builtin/notes.c:548
+#: builtin/notes.c
 #, c-format
 msgid "missing notes on source object %s. Cannot copy."
 msgstr "來源物件 %s 缺少註解。不能複製。"
 
-#: builtin/notes.c:601
+#: builtin/notes.c
 #, c-format
 msgid ""
 "The -m/-F/-c/-C options have been deprecated for the 'edit' subcommand.\n"
@@ -18822,97 +10603,97 @@ msgstr ""
 "子指令 'edit' 的選項 -m/-F/-c/-C 已棄用。\n"
 "請換用 'git notes add -f -m/-F/-c/-C'。\n"
 
-#: builtin/notes.c:696
+#: builtin/notes.c
 msgid "failed to delete ref NOTES_MERGE_PARTIAL"
 msgstr "刪除引用 NOTES_MERGE_PARTIAL 失敗"
 
-#: builtin/notes.c:698
+#: builtin/notes.c
 msgid "failed to delete ref NOTES_MERGE_REF"
 msgstr "刪除引用 NOTES_MERGE_REF 失敗"
 
-#: builtin/notes.c:700
+#: builtin/notes.c
 msgid "failed to remove 'git notes merge' worktree"
 msgstr "刪除 'git notes merge' 工作區失敗"
 
-#: builtin/notes.c:720
+#: builtin/notes.c
 msgid "failed to read ref NOTES_MERGE_PARTIAL"
 msgstr "讀取引用 NOTES_MERGE_PARTIAL 失敗"
 
-#: builtin/notes.c:722
+#: builtin/notes.c
 msgid "could not find commit from NOTES_MERGE_PARTIAL."
 msgstr "無法從 NOTES_MERGE_PARTIAL 中找到提交。"
 
-#: builtin/notes.c:724
+#: builtin/notes.c
 msgid "could not parse commit from NOTES_MERGE_PARTIAL."
 msgstr "無法從 NOTES_MERGE_PARTIAL 中解析提交。"
 
-#: builtin/notes.c:737
+#: builtin/notes.c
 msgid "failed to resolve NOTES_MERGE_REF"
 msgstr "解析 NOTES_MERGE_REF 失敗"
 
-#: builtin/notes.c:740
+#: builtin/notes.c
 msgid "failed to finalize notes merge"
 msgstr "無法完成註解合併"
 
-#: builtin/notes.c:766
+#: builtin/notes.c
 #, c-format
 msgid "unknown notes merge strategy %s"
 msgstr "未知的註解合併策略 %s"
 
-#: builtin/notes.c:782
+#: builtin/notes.c
 msgid "General options"
 msgstr "通用選項"
 
-#: builtin/notes.c:784
+#: builtin/notes.c
 msgid "Merge options"
 msgstr "合併選項"
 
-#: builtin/notes.c:786
+#: builtin/notes.c
 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:788
+#: builtin/notes.c
 msgid "Committing unmerged notes"
 msgstr "提交未合併的註解"
 
-#: builtin/notes.c:790
+#: builtin/notes.c
 msgid "finalize notes merge by committing unmerged notes"
 msgstr "透過提交未合併的註解來完成註解合併"
 
-#: builtin/notes.c:792
+#: builtin/notes.c
 msgid "Aborting notes merge resolution"
 msgstr "中止註解合併的方案"
 
-#: builtin/notes.c:794
+#: builtin/notes.c
 msgid "abort notes merge"
 msgstr "中止註解合併"
 
-#: builtin/notes.c:805
+#: builtin/notes.c
 msgid "cannot mix --commit, --abort or -s/--strategy"
 msgstr "不能混用 --commit、--abort 或 -s/--strategy"
 
-#: builtin/notes.c:810
+#: builtin/notes.c
 msgid "must specify a notes ref to merge"
 msgstr "必須指定一個註解引用來合併"
 
-#: builtin/notes.c:834
+#: builtin/notes.c
 #, c-format
 msgid "unknown -s/--strategy: %s"
 msgstr "未知的 -s/--strategy：%s"
 
-#: builtin/notes.c:874
+#: builtin/notes.c
 #, c-format
 msgid "a notes merge into %s is already in-progress at %s"
 msgstr "位於 %2$s 的一個到 %1$s 中的註解合併正在執行中"
 
-#: builtin/notes.c:878
+#: builtin/notes.c
 #, c-format
 msgid "failed to store link to current notes ref (%s)"
 msgstr "無法儲存連結到目前的註解引用（%s）"
 
-#: builtin/notes.c:880
+#: builtin/notes.c
 #, c-format
 msgid ""
 "Automatic notes merge failed. Fix conflicts in %s and commit the result with "
@@ -18922,56 +10703,56 @@ msgstr ""
 "自動合併說明失敗。修改 %s 中的衝突並且使用指令 'git notes merge --commit' 提"
 "交結果，或者使用指令 'git notes merge --abort' 終止合併。\n"
 
-#: builtin/notes.c:899 builtin/tag.c:595
+#: builtin/notes.c builtin/tag.c
 #, c-format
 msgid "Failed to resolve '%s' as a valid ref."
 msgstr "無法解析 '%s' 為一個有效引用。"
 
-#: builtin/notes.c:902
+#: builtin/notes.c
 #, c-format
 msgid "Object %s has no note\n"
 msgstr "物件 %s 沒有註解\n"
 
-#: builtin/notes.c:914
+#: builtin/notes.c
 msgid "attempt to remove non-existent note is not an error"
 msgstr "嘗試刪除不存在的註解不是一個錯誤"
 
-#: builtin/notes.c:917
+#: builtin/notes.c
 msgid "read object names from the standard input"
 msgstr "從標準輸入讀取物件名稱"
 
-#: builtin/notes.c:956 builtin/prune.c:144 builtin/worktree.c:148
+#: builtin/notes.c builtin/prune.c builtin/worktree.c
 msgid "do not remove, show only"
 msgstr "不刪除，只顯示"
 
-#: builtin/notes.c:957
+#: builtin/notes.c
 msgid "report pruned notes"
 msgstr "回報剪除的註解"
 
-#: builtin/notes.c:1000
+#: builtin/notes.c
 msgid "notes-ref"
 msgstr "註解引用"
 
-#: builtin/notes.c:1001
+#: builtin/notes.c
 msgid "use notes from <notes-ref>"
 msgstr "從 <註解引用> 使用註解"
 
-#: builtin/notes.c:1036 builtin/stash.c:1802
+#: builtin/notes.c builtin/stash.c
 #, c-format
 msgid "unknown subcommand: %s"
 msgstr "未知子指令：%s"
 
-#: builtin/pack-objects.c:182
+#: builtin/pack-objects.c
 msgid ""
 "git pack-objects --stdout [<options>...] [< <ref-list> | < <object-list>]"
 msgstr "git pack-objects --stdout [<選項>...] [< <引用列表> | < <物件列表>]"
 
-#: builtin/pack-objects.c:183
+#: builtin/pack-objects.c
 msgid ""
 "git pack-objects [<options>...] <base-name> [< <ref-list> | < <object-list>]"
 msgstr "git pack-objects [<選項>...] <前綴名稱> [< <引用列表> | < <物件列表>]"
 
-#: builtin/pack-objects.c:570
+#: builtin/pack-objects.c
 #, c-format
 msgid ""
 "write_reuse_object: could not locate %s, expected at offset %<PRIuMAX> in "
@@ -18979,110 +10760,124 @@ msgid ""
 msgstr ""
 "write_reuse_object：無法定位 %1$s，預期在 %3$s 包中的 %2$<PRIuMAX> 偏移量"
 
-#: builtin/pack-objects.c:578
+#: builtin/pack-objects.c
 #, c-format
 msgid "bad packed object CRC for %s"
 msgstr "%s 錯的包物件 CRC"
 
-#: builtin/pack-objects.c:589
+#: builtin/pack-objects.c
 #, c-format
 msgid "corrupt packed object for %s"
 msgstr "%s 損壞的包物件"
 
-#: builtin/pack-objects.c:720
+#: builtin/pack-objects.c
 #, c-format
 msgid "recursive delta detected for object %s"
 msgstr "發現物件 %s 遞迴 delta"
 
-#: builtin/pack-objects.c:939
+#: builtin/pack-objects.c
 #, c-format
 msgid "ordered %u objects, expected %<PRIu32>"
 msgstr "排序了 %u 個物件，預期 %<PRIu32> 個"
 
-#: builtin/pack-objects.c:1034
+#: builtin/pack-objects.c
 #, c-format
 msgid "expected object at offset %<PRIuMAX> in pack %s"
 msgstr "預期 %2$s 包中的偏移 %1$<PRIuMAX> 有物件"
 
-#: builtin/pack-objects.c:1158
+#: builtin/pack-objects.c
 msgid "disabling bitmap writing, packs are split due to pack.packSizeLimit"
 msgstr "停用 bitmap 寫入，因為 pack.packSizeLimit 設定使得包被切分為多個"
 
-#: builtin/pack-objects.c:1171
+#: builtin/pack-objects.c
 msgid "Writing objects"
 msgstr "寫入物件中"
 
-#: builtin/pack-objects.c:1243 builtin/update-index.c:90
+#: builtin/pack-objects.c builtin/update-index.c
 #, c-format
 msgid "failed to stat %s"
 msgstr "對 %s 呼叫 stat 失敗"
 
-#: builtin/pack-objects.c:1276
+#: builtin/pack-objects.c object-file.c
+#, c-format
+msgid "failed utime() on %s"
+msgstr "在 %s 上呼叫 utime() 失敗"
+
+#: builtin/pack-objects.c
 msgid "failed to write bitmap index"
 msgstr "無法寫入位圖索引"
 
-#: builtin/pack-objects.c:1302
+#: builtin/pack-objects.c
 #, c-format
 msgid "wrote %<PRIu32> objects while expecting %<PRIu32>"
 msgstr "寫入 %<PRIu32> 個物件而預期 %<PRIu32> 個"
 
-#: builtin/pack-objects.c:1544
+#: builtin/pack-objects.c
 msgid "disabling bitmap writing, as some objects are not being packed"
 msgstr "停用 bitmap 寫入，因為一些物件將不會被打包"
 
-#: builtin/pack-objects.c:1992
+#: builtin/pack-objects.c
 #, c-format
 msgid "delta base offset overflow in pack for %s"
 msgstr "%s 壓縮中 delta 基準位移越界"
 
-#: builtin/pack-objects.c:2001
+#: builtin/pack-objects.c
 #, c-format
 msgid "delta base offset out of bound for %s"
 msgstr "%s 的 delta 基準位移越界"
 
-#: builtin/pack-objects.c:2282
+#: builtin/pack-objects.c
 msgid "Counting objects"
 msgstr "物件計數中"
 
-#: builtin/pack-objects.c:2447
+#: builtin/pack-objects.c pack-bitmap.c
+#, c-format
+msgid "unable to get size of %s"
+msgstr "不能得到 %s 的大小"
+
+#: builtin/pack-objects.c
 #, c-format
 msgid "unable to parse object header of %s"
 msgstr "無法解析物件 %s 標頭訊息"
 
-#: builtin/pack-objects.c:2517 builtin/pack-objects.c:2533
-#: builtin/pack-objects.c:2543
+#: builtin/pack-objects.c
 #, c-format
 msgid "object %s cannot be read"
 msgstr "物件 %s 無法讀取"
 
-#: builtin/pack-objects.c:2520 builtin/pack-objects.c:2547
+#: builtin/pack-objects.c
 #, c-format
 msgid "object %s inconsistent object length (%<PRIuMAX> vs %<PRIuMAX>)"
 msgstr "物件 %s 不一致的物件長度（%<PRIuMAX> vs %<PRIuMAX>）"
 
-#: builtin/pack-objects.c:2557
+#: builtin/pack-objects.c
 msgid "suboptimal pack - out of memory"
 msgstr "次優（suboptimal）打包 - 記憶體不足"
 
-#: builtin/pack-objects.c:2872
+#: builtin/pack-objects.c
 #, c-format
 msgid "Delta compression using up to %d threads"
 msgstr "使用 %d 個執行緒進行壓縮"
 
-#: builtin/pack-objects.c:3011
+#: builtin/pack-objects.c
 #, c-format
 msgid "unable to pack objects reachable from tag %s"
 msgstr "無法為標籤 %s 壓縮物件"
 
-#: builtin/pack-objects.c:3097
+#: builtin/pack-objects.c commit-graph.c
+#, c-format
+msgid "unable to get type of object %s"
+msgstr "無法獲得物件 %s 類型"
+
+#: builtin/pack-objects.c
 msgid "Compressing objects"
 msgstr "壓縮物件中"
 
-#: builtin/pack-objects.c:3103
+#: builtin/pack-objects.c
 msgid "inconsistency with delta count"
 msgstr "不一致的差異計數"
 
-#: builtin/pack-objects.c:3182
+#: builtin/pack-objects.c
 #, c-format
 msgid ""
 "value of uploadpack.blobpackfileuri must be of the form '<object-hash> <pack-"
@@ -19091,24 +10886,40 @@ msgstr ""
 "uploadpack.blobpackfileuri 的值格式必須為 '<object-hash> <pack-hash> "
 "<uri>' (收到 '%s')"
 
-#: builtin/pack-objects.c:3185
+#: builtin/pack-objects.c
 #, c-format
 msgid ""
 "object already configured in another uploadpack.blobpackfileuri (got '%s')"
 msgstr "物件已經在其他 uploadpack.blobpackfileuri 設定過 (收到 '%s')"
 
-#: builtin/pack-objects.c:3220
+#: builtin/pack-objects.c
 #, c-format
 msgid "could not get type of object %s in pack %s"
 msgstr "無法取得 %2$s 包中 %1$s 物件的類型"
 
-#: builtin/pack-objects.c:3348 builtin/pack-objects.c:3359
-#: builtin/pack-objects.c:3373
+#: builtin/pack-objects.c
 #, c-format
 msgid "could not find pack '%s'"
 msgstr "找不到「%s」包"
 
-#: builtin/pack-objects.c:3416
+#: builtin/pack-objects.c
+#, c-format
+msgid "packfile %s cannot be accessed"
+msgstr "無法存取封包檔案 %s"
+
+#: builtin/pack-objects.c
+msgid "Enumerating cruft objects"
+msgstr "正在枚舉廢棄物件"
+
+#: builtin/pack-objects.c
+msgid "unable to add cruft objects"
+msgstr "無法加入廢棄物件"
+
+#: builtin/pack-objects.c
+msgid "Traversing cruft objects"
+msgstr "正在遍歷廢棄物件"
+
+#: builtin/pack-objects.c
 #, c-format
 msgid ""
 "expected edge object ID, got garbage:\n"
@@ -19117,7 +10928,7 @@ msgstr ""
 "預期邊界物件（edge object）ID，卻得到垃圾資料：\n"
 " %s"
 
-#: builtin/pack-objects.c:3422
+#: builtin/pack-objects.c
 #, c-format
 msgid ""
 "expected object ID, got garbage:\n"
@@ -19126,238 +10937,267 @@ msgstr ""
 "預期物件 ID，卻得到垃圾資料：\n"
 " %s"
 
-#: builtin/pack-objects.c:3540 builtin/pack-objects.c:3627
+#: builtin/pack-objects.c reachable.c
+msgid "could not load cruft pack .mtimes"
+msgstr "無法載入廢棄封包 .mtimes"
+
+#: builtin/pack-objects.c
 msgid "cannot open pack index"
 msgstr "無法開啟包檔案索引"
 
-#: builtin/pack-objects.c:3549
+#: builtin/pack-objects.c
 #, c-format
 msgid "loose object at %s could not be examined"
 msgstr "無法檢查 %s 處的鬆散物件"
 
-#: builtin/pack-objects.c:3635
+#: builtin/pack-objects.c
 msgid "unable to force loose object"
 msgstr "無法強制鬆散物件"
 
-#: builtin/pack-objects.c:3763
+#: builtin/pack-objects.c
 #, c-format
 msgid "not a rev '%s'"
 msgstr "不是一個版本 '%s'"
 
-#: builtin/pack-objects.c:3766 builtin/rev-parse.c:1061
+#: builtin/pack-objects.c builtin/rev-parse.c
 #, c-format
 msgid "bad revision '%s'"
 msgstr "壞的版本 '%s'"
 
-#: builtin/pack-objects.c:3794
+#: builtin/pack-objects.c
 msgid "unable to add recent objects"
 msgstr "無法新增最近的物件"
 
-#: builtin/pack-objects.c:3847
+#: builtin/pack-objects.c
 #, c-format
 msgid "unsupported index version %s"
 msgstr "不支援的索引版本 %s"
 
-#: builtin/pack-objects.c:3851
+#: builtin/pack-objects.c
 #, c-format
 msgid "bad index version '%s'"
 msgstr "壞的索引版本 '%s'"
 
-#: builtin/pack-objects.c:3907
+#: builtin/pack-objects.c
 msgid "<version>[,<offset>]"
 msgstr "<版本>[,<位移>]"
 
-#: builtin/pack-objects.c:3908
+#: builtin/pack-objects.c
 msgid "write the pack index file in the specified idx format version"
 msgstr "用指定的 idx 格式版本來寫包索引檔案"
 
-#: builtin/pack-objects.c:3911
+#: builtin/pack-objects.c
 msgid "maximum size of each output pack file"
 msgstr "每個輸出包的最大尺寸"
 
-#: builtin/pack-objects.c:3913
+#: builtin/pack-objects.c
 msgid "ignore borrowed objects from alternate object store"
 msgstr "忽略從備用物件儲存裡借用物件"
 
-#: builtin/pack-objects.c:3915
+#: builtin/pack-objects.c
 msgid "ignore packed objects"
 msgstr "忽略包物件"
 
-#: builtin/pack-objects.c:3917
+#: builtin/pack-objects.c
 msgid "limit pack window by objects"
 msgstr "限制打包視窗的物件數"
 
-#: builtin/pack-objects.c:3919
+#: builtin/pack-objects.c
 msgid "limit pack window by memory in addition to object limit"
 msgstr "除物件數量限制外設定打包視窗的記憶體限制"
 
-#: builtin/pack-objects.c:3921
+#: builtin/pack-objects.c
 msgid "maximum length of delta chain allowed in the resulting pack"
 msgstr "打包允許的 delta 鏈的最大長度"
 
-#: builtin/pack-objects.c:3923
+#: builtin/pack-objects.c
 msgid "reuse existing deltas"
 msgstr "重用已存在的 deltas"
 
-#: builtin/pack-objects.c:3925
+#: builtin/pack-objects.c
 msgid "reuse existing objects"
 msgstr "重用已存在的物件"
 
-#: builtin/pack-objects.c:3927
+#: builtin/pack-objects.c
 msgid "use OFS_DELTA objects"
 msgstr "使用 OFS_DELTA 物件"
 
-#: builtin/pack-objects.c:3929
+#: builtin/pack-objects.c
 msgid "use threads when searching for best delta matches"
 msgstr "使用執行緒查詢最佳 delta 符合"
 
-#: builtin/pack-objects.c:3931
+#: builtin/pack-objects.c
 msgid "do not create an empty pack output"
 msgstr "不建立空的包輸出"
 
-#: builtin/pack-objects.c:3933
+#: builtin/pack-objects.c
 msgid "read revision arguments from standard input"
 msgstr "從標準輸入讀取版本號參數"
 
-#: builtin/pack-objects.c:3935
+#: builtin/pack-objects.c
 msgid "limit the objects to those that are not yet packed"
 msgstr "限制那些尚未打包的物件"
 
-#: builtin/pack-objects.c:3938
+#: builtin/pack-objects.c
 msgid "include objects reachable from any reference"
 msgstr "包括可以從任何引用存取到的物件"
 
-#: builtin/pack-objects.c:3941
+#: builtin/pack-objects.c
 msgid "include objects referred by reflog entries"
 msgstr "包括被引用日誌引用到的物件"
 
-#: builtin/pack-objects.c:3944
+#: builtin/pack-objects.c
 msgid "include objects referred to by the index"
 msgstr "包括被索引引用到的物件"
 
-#: builtin/pack-objects.c:3947
+#: builtin/pack-objects.c
 msgid "read packs from stdin"
 msgstr "從標準輸入中讀取包"
 
-#: builtin/pack-objects.c:3949
+#: builtin/pack-objects.c
 msgid "output pack to stdout"
 msgstr "輸出包到標準輸出"
 
-#: builtin/pack-objects.c:3951
+#: builtin/pack-objects.c
 msgid "include tag objects that refer to objects to be packed"
 msgstr "包括那些引用了待打包物件的標籤物件"
 
-#: builtin/pack-objects.c:3953
+#: builtin/pack-objects.c
 msgid "keep unreachable objects"
 msgstr "維持無法取得的物件"
 
-#: builtin/pack-objects.c:3955
+#: builtin/pack-objects.c
 msgid "pack loose unreachable objects"
 msgstr "打包鬆散的無法取得物件"
 
-#: builtin/pack-objects.c:3957
+#: builtin/pack-objects.c
 msgid "unpack unreachable objects newer than <time>"
 msgstr "將比提供 <時間> 新的無法存取的物件解包"
 
-#: builtin/pack-objects.c:3960
+#: builtin/pack-objects.c
+msgid "create a cruft pack"
+msgstr "建立廢棄封包"
+
+#: builtin/pack-objects.c
+msgid "expire cruft objects older than <time>"
+msgstr "將早於 <time> 的廢棄物件設為過期"
+
+#: builtin/pack-objects.c
 msgid "use the sparse reachability algorithm"
 msgstr "使用稀疏可以取得性演算法"
 
-#: builtin/pack-objects.c:3962
+#: builtin/pack-objects.c
 msgid "create thin packs"
 msgstr "建立精簡包"
 
-#: builtin/pack-objects.c:3964
+#: builtin/pack-objects.c
 msgid "create packs suitable for shallow fetches"
 msgstr "建立適合淺複製版本庫取得的包"
 
-#: builtin/pack-objects.c:3966
+#: builtin/pack-objects.c
 msgid "ignore packs that have companion .keep file"
 msgstr "忽略配有 .keep 檔案的包"
 
-#: builtin/pack-objects.c:3968
+#: builtin/pack-objects.c
 msgid "ignore this pack"
 msgstr "忽略該 pack"
 
-#: builtin/pack-objects.c:3970
+#: builtin/pack-objects.c
 msgid "pack compression level"
 msgstr "打包壓縮級別"
 
-#: builtin/pack-objects.c:3972
+#: builtin/pack-objects.c
 msgid "do not hide commits by grafts"
 msgstr "顯示被移植隱藏的提交"
 
-#: builtin/pack-objects.c:3974
+#: builtin/pack-objects.c
 msgid "use a bitmap index if available to speed up counting objects"
 msgstr "使用 bitmap 索引（如果有的話）以提高物件計數時的速度"
 
-#: builtin/pack-objects.c:3976
+#: builtin/pack-objects.c
 msgid "write a bitmap index together with the pack index"
 msgstr "在建立包索引的同時建立 bitmap 索引"
 
-#: builtin/pack-objects.c:3980
+#: builtin/pack-objects.c
 msgid "write a bitmap index if possible"
 msgstr "如果可能，寫 bitmap 索引"
 
-#: builtin/pack-objects.c:3984
+#: builtin/pack-objects.c
 msgid "handling for missing objects"
 msgstr "處理遺失的物件"
 
-#: builtin/pack-objects.c:3987
+#: builtin/pack-objects.c
 msgid "do not pack objects in promisor packfiles"
 msgstr "不要打包 promisor packfile 中的物件"
 
-#: builtin/pack-objects.c:3989
+#: builtin/pack-objects.c
 msgid "respect islands during delta compression"
 msgstr "在差異壓縮時尊重資料島"
 
-#: builtin/pack-objects.c:3991
+#: builtin/pack-objects.c
 msgid "protocol"
 msgstr "通訊協定"
 
-#: builtin/pack-objects.c:3992
+#: builtin/pack-objects.c
 msgid "exclude any configured uploadpack.blobpackfileuri with this protocol"
 msgstr "排除任何設定過，使用此通訊協定的 uploadpack.blobpackfileuri"
 
-#: builtin/pack-objects.c:4027
+#: builtin/pack-objects.c
 #, c-format
 msgid "delta chain depth %d is too deep, forcing %d"
 msgstr "增量鏈深度 %d 太深了，強制為 %d"
 
-#: builtin/pack-objects.c:4032
+#: builtin/pack-objects.c
 #, c-format
 msgid "pack.deltaCacheLimit is too high, forcing %d"
 msgstr "設定 pack.deltaCacheLimit 太高了，強制為 %d"
 
-#: builtin/pack-objects.c:4088
+#: builtin/pack-objects.c config.c
+#, c-format
+msgid "bad pack compression level %d"
+msgstr "錯誤的打包壓縮級別 %d"
+
+#: builtin/pack-objects.c
 msgid "--max-pack-size cannot be used to build a pack for transfer"
 msgstr "不能使用 --max-pack-size 來組建傳輸用的包檔案"
 
-#: builtin/pack-objects.c:4090
+#: builtin/pack-objects.c
 msgid "minimum pack size limit is 1 MiB"
 msgstr "最小的包檔案大小是 1 MiB"
 
-#: builtin/pack-objects.c:4095
+#: builtin/pack-objects.c
 msgid "--thin cannot be used to build an indexable pack"
 msgstr "--thin 不能用於建立一個可索引包"
 
-#: builtin/pack-objects.c:4104
+#: builtin/pack-objects.c
 msgid "cannot use --filter without --stdout"
 msgstr "不能在沒有 --stdout 的情況下使用 --filter"
 
-#: builtin/pack-objects.c:4106
+#: builtin/pack-objects.c
 msgid "cannot use --filter with --stdin-packs"
 msgstr "無法將 --filter 及 --stdin-packs 結合使用"
 
-#: builtin/pack-objects.c:4110
+#: builtin/pack-objects.c
 msgid "cannot use internal rev list with --stdin-packs"
 msgstr "無法將內部版本清單與 --stdin-packs 結合使用"
 
-#: builtin/pack-objects.c:4169
+#: builtin/pack-objects.c
+msgid "cannot use internal rev list with --cruft"
+msgstr "無法透過 --cruft 使用內部修訂清單"
+
+#: builtin/pack-objects.c
+msgid "cannot use --stdin-packs with --cruft"
+msgstr "無法將 --stdin-packs 與 --cruft 組合使用"
+
+#: builtin/pack-objects.c
+msgid "cannot use --max-pack-size with --cruft"
+msgstr "無法將 --max-pack-size 與 --cruft 組合使用"
+
+#: builtin/pack-objects.c
 msgid "Enumerating objects"
 msgstr "枚舉物件"
 
-#: builtin/pack-objects.c:4210
+#: builtin/pack-objects.c
 #, c-format
 msgid ""
 "Total %<PRIu32> (delta %<PRIu32>), reused %<PRIu32> (delta %<PRIu32>), pack-"
@@ -19366,7 +11206,7 @@ msgstr ""
 "總共 %<PRIu32> (差異 %<PRIu32>)，復用 %<PRIu32> (差異 %<PRIu32>)，重用包 "
 "%<PRIu32>"
 
-#: builtin/pack-redundant.c:601
+#: builtin/pack-redundant.c
 msgid ""
 "'git pack-redundant' is nominated for removal.\n"
 "If you still use this command, please add an extra\n"
@@ -19380,96 +11220,96 @@ msgstr ""
 "<git@vger.kernel.org> 讓我們知道您還在使用。\n"
 "感謝。\n"
 
-#: builtin/pack-refs.c:8
+#: builtin/pack-refs.c
 msgid "git pack-refs [<options>]"
 msgstr "git pack-refs [<選項>]"
 
-#: builtin/pack-refs.c:16
+#: builtin/pack-refs.c
 msgid "pack everything"
 msgstr "打包一切"
 
-#: builtin/pack-refs.c:17
+#: builtin/pack-refs.c
 msgid "prune loose refs (default)"
 msgstr "剪除鬆散引用（預設）"
 
-#: builtin/prune.c:14
+#: builtin/prune.c
 msgid "git prune [-n] [-v] [--progress] [--expire <time>] [--] [<head>...]"
 msgstr "git prune [-n] [-v] [--progress] [--expire <時間>] [--] [<head>...]"
 
-#: builtin/prune.c:145
+#: builtin/prune.c
 msgid "report pruned objects"
 msgstr "回報剪除的物件"
 
-#: builtin/prune.c:148
+#: builtin/prune.c
 msgid "expire objects older than <time>"
 msgstr "使早於提供時間的物件過期"
 
-#: builtin/prune.c:150
+#: builtin/prune.c
 msgid "limit traversal to objects outside promisor packfiles"
 msgstr "限制遍歷 promisor packfile 以外的物件"
 
-#: builtin/prune.c:163
+#: builtin/prune.c
 msgid "cannot prune in a precious-objects repo"
 msgstr "不能在珍品版本庫中執行剪除動作"
 
-#: builtin/pull.c:67
+#: builtin/pull.c
 msgid "git pull [<options>] [<repository> [<refspec>...]]"
 msgstr "git pull [<選項>] [<版本庫> [<引用規格>...]]"
 
-#: builtin/pull.c:124
+#: builtin/pull.c
 msgid "control for recursive fetching of submodules"
 msgstr "控制子模組的遞迴取得"
 
-#: builtin/pull.c:128
+#: builtin/pull.c
 msgid "Options related to merging"
 msgstr "和合併相關的選項"
 
-#: builtin/pull.c:131
+#: builtin/pull.c
 msgid "incorporate changes by rebasing rather than merging"
 msgstr "使用重定基底動作取代合併動作以套用修改"
 
-#: builtin/pull.c:159 builtin/revert.c:126
+#: builtin/pull.c builtin/revert.c
 msgid "allow fast-forward"
 msgstr "允許快轉式"
 
-#: builtin/pull.c:165
+#: builtin/pull.c
 msgid "control use of pre-merge-commit and commit-msg hooks"
 msgstr "控制 pre-merge-commit 和 commit-msg 掛鉤的使用"
 
-#: builtin/pull.c:171 parse-options.h:371
+#: builtin/pull.c parse-options.h
 msgid "automatically stash/stash pop before and after"
 msgstr "在動作前後執行自動儲藏和彈出儲藏"
 
-#: builtin/pull.c:187
+#: builtin/pull.c
 msgid "Options related to fetching"
 msgstr "和取得相關的參數"
 
-#: builtin/pull.c:197
+#: builtin/pull.c
 msgid "force overwrite of local branch"
 msgstr "強制覆蓋本機分支"
 
-#: builtin/pull.c:205
+#: builtin/pull.c
 msgid "number of submodules pulled in parallel"
 msgstr "並行拉取的子模組數量"
 
-#: builtin/pull.c:449
+#: builtin/pull.c
 msgid ""
 "There is no candidate for rebasing against among the refs that you just "
 "fetched."
 msgstr "在您剛剛取得到的引用中沒有重定基底動作的候選。"
 
-#: builtin/pull.c:451
+#: builtin/pull.c
 msgid ""
 "There are no candidates for merging among the refs that you just fetched."
 msgstr "在您剛剛取得到的引用中沒有合併動作的候選。"
 
-#: builtin/pull.c:452
+#: builtin/pull.c
 msgid ""
 "Generally this means that you provided a wildcard refspec which had no\n"
 "matches on the remote end."
 msgstr "這通常表示您有提供萬用字元引用規格，但遠端沒有符合項目。"
 
-#: builtin/pull.c:455
+#: builtin/pull.c
 #, c-format
 msgid ""
 "You asked to pull from the remote '%s', but did not specify\n"
@@ -19479,42 +11319,40 @@ msgstr ""
 "您要求從遠端 '%s' 拉取，但是未指定一個分支。因為這不是目前\n"
 "分支預設的遠端版本庫，您必須在指令列中指定一個分支名。"
 
-#: builtin/pull.c:460 builtin/rebase.c:978
+#: builtin/pull.c builtin/rebase.c
 msgid "You are not currently on a branch."
 msgstr "您目前不在一個分支上。"
 
-#: builtin/pull.c:462 builtin/pull.c:477
+#: builtin/pull.c
 msgid "Please specify which branch you want to rebase against."
 msgstr "請指定您要重定基底到哪一個分支。"
 
-#: builtin/pull.c:464 builtin/pull.c:479
+#: builtin/pull.c
 msgid "Please specify which branch you want to merge with."
 msgstr "請指定您要合併哪一個分支。"
 
-#: builtin/pull.c:465 builtin/pull.c:480
+#: builtin/pull.c
 msgid "See git-pull(1) for details."
 msgstr "詳見 git-pull(1)。"
 
-#: builtin/pull.c:467 builtin/pull.c:473 builtin/pull.c:482
-#: builtin/rebase.c:984
+#: builtin/pull.c builtin/rebase.c
 msgid "<remote>"
 msgstr "<遠端>"
 
-#: builtin/pull.c:467 builtin/pull.c:482 builtin/pull.c:487
-#: contrib/scalar/scalar.c:374
+#: builtin/pull.c contrib/scalar/scalar.c
 msgid "<branch>"
 msgstr "<分支>"
 
-#: builtin/pull.c:475 builtin/rebase.c:976
+#: builtin/pull.c builtin/rebase.c
 msgid "There is no tracking information for the current branch."
 msgstr "目前分支沒有追蹤訊息。"
 
-#: builtin/pull.c:484
+#: builtin/pull.c
 msgid ""
 "If you wish to set tracking information for this branch you can do so with:"
 msgstr "如果您想要為此分支建立追蹤訊息，您可以執行："
 
-#: builtin/pull.c:489
+#: builtin/pull.c
 #, c-format
 msgid ""
 "Your configuration specifies to merge with the ref '%s'\n"
@@ -19523,16 +11361,16 @@ msgstr ""
 "您的設定中指定要合併遠端的引用 '%s'，\n"
 "但是沒有取得到這個引用。"
 
-#: builtin/pull.c:600
+#: builtin/pull.c
 #, c-format
 msgid "unable to access commit %s"
 msgstr "無法存取提交 %s"
 
-#: builtin/pull.c:908
+#: builtin/pull.c
 msgid "ignoring --verify-signatures for rebase"
 msgstr "為重定基底動作忽略 --verify-signatures"
 
-#: builtin/pull.c:969
+#: builtin/pull.c
 msgid ""
 "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"
@@ -19561,19 +11399,19 @@ msgstr ""
 "pull 命令時傳遞 --rebase、--no-rebase 或 --ff-only 覆蓋\n"
 "設定的預設值。\n"
 
-#: builtin/pull.c:1047
+#: builtin/pull.c
 msgid "Updating an unborn branch with changes added to the index."
 msgstr "更新尚未誕生的分支，變更新增至索引。"
 
-#: builtin/pull.c:1051
+#: builtin/pull.c
 msgid "pull with rebase"
 msgstr "重定基底式拉取"
 
-#: builtin/pull.c:1052
+#: builtin/pull.c
 msgid "please commit or stash them."
 msgstr "請提交或儲藏它們。"
 
-#: builtin/pull.c:1077
+#: builtin/pull.c
 #, c-format
 msgid ""
 "fetch updated the current branch head.\n"
@@ -19583,7 +11421,7 @@ msgstr ""
 "fetch 更新了目前的分支。快轉您的工作區\n"
 "至提交 %s。"
 
-#: builtin/pull.c:1083
+#: builtin/pull.c
 #, c-format
 msgid ""
 "Cannot fast-forward your working tree.\n"
@@ -19600,47 +11438,59 @@ msgstr ""
 "$ git reset --hard\n"
 "復原之前的狀態。"
 
-#: builtin/pull.c:1098
+#: builtin/pull.c
 msgid "Cannot merge multiple branches into empty head."
 msgstr "無法將多個分支合併到空分支。"
 
-#: builtin/pull.c:1103
+#: builtin/pull.c
 msgid "Cannot rebase onto multiple branches."
 msgstr "無法重定基底到多個分支。"
 
-#: builtin/pull.c:1105
+#: builtin/pull.c
 msgid "Cannot fast-forward to multiple branches."
 msgstr "無法快轉至多個分支。"
 
-#: builtin/pull.c:1120
+#: builtin/pull.c
 msgid "Need to specify how to reconcile divergent branches."
 msgstr "需要指定如何調和偏離的分支。"
 
-#: builtin/pull.c:1134
+#: builtin/pull.c
 msgid "cannot rebase with locally recorded submodule modifications"
 msgstr "本機子模組中有修改，無法重定基底"
 
-#: builtin/push.c:19
+#: builtin/push.c
 msgid "git push [<options>] [<repository> [<refspec>...]]"
 msgstr "git push [<選項>] [<版本庫> [<引用規格>...]]"
 
-#: builtin/push.c:111
+#: builtin/push.c
 msgid "tag shorthand without <tag>"
 msgstr "標籤後面未提供 <標籤> 參數"
 
-#: builtin/push.c:119
+#: builtin/push.c
 msgid "--delete only accepts plain target ref names"
 msgstr "--delete 只接受簡單的目標引用名"
 
-#: builtin/push.c:164
+#: builtin/push.c
 msgid ""
 "\n"
-"To choose either option permanently, see push.default in 'git help config'."
+"To choose either option permanently, see push.default in 'git help config'.\n"
 msgstr ""
 "\n"
-"為了永久地選擇任一選項，參見 'git help config' 中的 push.default。"
+"若要永久選擇某個選項，請參閱 “git help config” 中的 push.default。\n"
 
-#: builtin/push.c:167
+#: builtin/push.c
+msgid ""
+"\n"
+"To avoid automatically configuring upstream branches when their name\n"
+"doesn't match the local branch, see option 'simple' of branch."
+"autoSetupMerge\n"
+"in 'git help config'.\n"
+msgstr ""
+"\n"
+"為了避免自動在上游分支的名稱與本機不符時，設定上游的分支，請參閱\n"
+"“git help config” 中 branch.autoSetupMerge 的 “simple” 選項。\n"
+
+#: builtin/push.c
 #, c-format
 msgid ""
 "The upstream branch of your current branch does not match\n"
@@ -19652,19 +11502,19 @@ msgid ""
 "To push to the branch of the same name on the remote, use\n"
 "\n"
 "    git push %s HEAD\n"
-"%s"
+"%s%s"
 msgstr ""
-"您目前分支的上游分支和您目前分支名不符合，為推送到遠端的上游分支，\n"
-"使用\n"
+"您目前分支的上游分支，和您目前分支的名稱不符。如要推送到遠端的\n"
+"上游分支，請使用\n"
 "\n"
 "    git push %s HEAD:%s\n"
 "\n"
-"為推送至遠端同名分支，使用\n"
+"為推送至遠端上的同名分支，請使用\n"
 "\n"
 "    git push %s HEAD\n"
-"%s"
+"%s%s"
 
-#: builtin/push.c:182
+#: builtin/push.c
 #, c-format
 msgid ""
 "You are not currently on a branch.\n"
@@ -19678,30 +11528,42 @@ msgstr ""
 "\n"
 "    git push %s HEAD:<遠端分支名字>\n"
 
-#: builtin/push.c:191
+#: builtin/push.c
+msgid ""
+"\n"
+"To have this happen automatically for branches without a tracking\n"
+"upstream, see 'push.autoSetupRemote' in 'git help config'.\n"
+msgstr ""
+"\n"
+"若要使沒有追蹤上游的分支自動配置，請參閱 “git help config” 中的\n"
+"“push.autoSetupRemote”。\n"
+
+#: builtin/push.c
 #, c-format
 msgid ""
 "The current branch %s has no upstream branch.\n"
 "To push the current branch and set the remote as upstream, use\n"
 "\n"
 "    git push --set-upstream %s %s\n"
+"%s"
 msgstr ""
-"目前分支 %s 沒有對應的上游分支。\n"
-"為推送目前分支並建立與遠端上游的追蹤，使用\n"
+"目前分支 %s 沒有上游分支。\n"
+"若要推送目前的分支，並將遠端設為上游，請使用\n"
 "\n"
 "    git push --set-upstream %s %s\n"
+"%s"
 
-#: builtin/push.c:199
+#: builtin/push.c
 #, c-format
 msgid "The current branch %s has multiple upstream branches, refusing to push."
 msgstr "目前分支 %s 有多個上游分支，拒絕推送。"
 
-#: builtin/push.c:217
+#: builtin/push.c
 msgid ""
 "You didn't specify any refspecs to push, and push.default is \"nothing\"."
 msgstr "您沒有為推送指定任何引用規格，並且 push.default 為 \"nothing\"。"
 
-#: builtin/push.c:243
+#: builtin/push.c
 #, c-format
 msgid ""
 "You are pushing to remote '%s', which is not the upstream of\n"
@@ -19711,7 +11573,7 @@ msgstr ""
 "您正推送至遠端 '%s'（其並非目前分支 '%s' 的上游），\n"
 "而沒有告訴我要推送什麼、更新哪個遠端分支。"
 
-#: builtin/push.c:258
+#: builtin/push.c
 msgid ""
 "Updates were rejected because the tip of your current branch is behind\n"
 "its remote counterpart. Integrate the remote changes (e.g.\n"
@@ -19722,7 +11584,7 @@ msgstr ""
 "再次推送前，先與遠端變更合併（如 'git pull ...'）。詳見\n"
 "'git push --help' 中的 'Note about fast-forwards' 小節。"
 
-#: builtin/push.c:264
+#: builtin/push.c
 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"
@@ -19733,7 +11595,7 @@ msgstr ""
 "簽出該分支並整合遠端變更（如 'git pull ...'），然後再推送。詳見\n"
 "'git push --help' 中的 'Note about fast-forwards' 小節。"
 
-#: builtin/push.c:270
+#: builtin/push.c
 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"
@@ -19746,11 +11608,11 @@ msgstr ""
 "（如 'git pull ...'）。\n"
 "詳見 'git push --help' 中的 'Note about fast-forwards' 小節。"
 
-#: builtin/push.c:277
+#: builtin/push.c
 msgid "Updates were rejected because the tag already exists in the remote."
 msgstr "更新被拒絕，因為該標籤在遠端已經存在。"
 
-#: builtin/push.c:280
+#: builtin/push.c
 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"
@@ -19759,7 +11621,7 @@ msgstr ""
 "如果不使用 '--force' 參數，您不能更新一個指向非提交物件的遠端引用，\n"
 "也不能更新遠端引用讓其指向一個非提交物件。\n"
 
-#: builtin/push.c:285
+#: builtin/push.c
 msgid ""
 "Updates were rejected because the tip of the remote-tracking\n"
 "branch has been updated since the last checkout. You may want\n"
@@ -19770,99 +11632,103 @@ msgstr ""
 "您可能會希望先將這些變更整合至本地（例如：‘git pull …’)\n"
 "最後才強制更新。\n"
 
-#: builtin/push.c:355
+#: builtin/push.c
 #, c-format
 msgid "Pushing to %s\n"
 msgstr "推送到 %s\n"
 
-#: builtin/push.c:362
+#: builtin/push.c
 #, c-format
 msgid "failed to push some refs to '%s'"
 msgstr "推送一些引用到 '%s' 失敗"
 
-#: builtin/push.c:544 builtin/submodule--helper.c:3377
+#: builtin/push.c builtin/send-pack.c submodule-config.c
+#, c-format
+msgid "invalid value for '%s'"
+msgstr "「%s」的值無效"
+
+#: builtin/push.c builtin/submodule--helper.c
 msgid "repository"
 msgstr "版本庫"
 
-#: builtin/push.c:545 builtin/send-pack.c:193
+#: builtin/push.c builtin/send-pack.c
 msgid "push all refs"
 msgstr "推送所有引用"
 
-#: builtin/push.c:546 builtin/send-pack.c:195
+#: builtin/push.c builtin/send-pack.c
 msgid "mirror all refs"
 msgstr "鏡像所有引用"
 
-#: builtin/push.c:548
+#: builtin/push.c
 msgid "delete refs"
 msgstr "刪除引用"
 
-#: builtin/push.c:549
+#: builtin/push.c
 msgid "push tags (can't be used with --all or --mirror)"
 msgstr "推送標籤（不能使用 --all or --mirror）"
 
-#: builtin/push.c:552 builtin/send-pack.c:196
+#: builtin/push.c builtin/send-pack.c
 msgid "force updates"
 msgstr "強制更新"
 
-#: builtin/push.c:553 builtin/send-pack.c:208
+#: builtin/push.c builtin/send-pack.c
 msgid "<refname>:<expect>"
 msgstr "<引用名>:<期望值>"
 
-#: builtin/push.c:554 builtin/send-pack.c:209
+#: builtin/push.c builtin/send-pack.c
 msgid "require old value of ref to be at this value"
 msgstr "要求引用舊的取值為設定值"
 
-#: builtin/push.c:557 builtin/send-pack.c:212
+#: builtin/push.c builtin/send-pack.c
 msgid "require remote updates to be integrated locally"
 msgstr "需要將遠端更新整合進本地"
 
-#: builtin/push.c:560
+#: builtin/push.c
 msgid "control recursive pushing of submodules"
 msgstr "控制子模組的遞迴推送"
 
-#: builtin/push.c:561 builtin/send-pack.c:203
+#: builtin/push.c builtin/send-pack.c
 msgid "use thin pack"
 msgstr "使用精簡打包"
 
-#: builtin/push.c:562 builtin/push.c:563 builtin/send-pack.c:190
-#: builtin/send-pack.c:191
+#: builtin/push.c builtin/send-pack.c
 msgid "receive pack program"
 msgstr "接收包程式"
 
-#: builtin/push.c:564
+#: builtin/push.c
 msgid "set upstream for git pull/status"
 msgstr "設定 git pull/status 的上游"
 
-#: builtin/push.c:567
+#: builtin/push.c
 msgid "prune locally removed refs"
 msgstr "剪除本機刪除的引用"
 
-#: builtin/push.c:569
+#: builtin/push.c
 msgid "bypass pre-push hook"
 msgstr "繞過 pre-push 掛鉤"
 
-#: builtin/push.c:570
+#: builtin/push.c
 msgid "push missing but relevant tags"
 msgstr "推送缺少但有關的標籤"
 
-#: builtin/push.c:572 builtin/send-pack.c:197
+#: builtin/push.c builtin/send-pack.c
 msgid "GPG sign the push"
 msgstr "用 GPG 為推送簽名"
 
-#: builtin/push.c:574 builtin/send-pack.c:204
+#: builtin/push.c builtin/send-pack.c
 msgid "request atomic transaction on remote side"
 msgstr "需要遠端支援 atomic 事務"
 
-#: builtin/push.c:594
+#: builtin/push.c
 msgid "--delete doesn't make sense without any refs"
 msgstr "--delete 未接任何引用沒有意義"
 
-#: builtin/push.c:614
+#: builtin/push.c
 #, c-format
 msgid "bad repository '%s'"
 msgstr "壞的版本庫 '%s'"
 
-#: builtin/push.c:615
+#: builtin/push.c
 msgid ""
 "No configured push destination.\n"
 "Either specify the URL from the command-line or configure a remote "
@@ -19883,64 +11749,64 @@ msgstr ""
 "\n"
 "    git push <名稱>\n"
 
-#: builtin/push.c:632
+#: builtin/push.c
 msgid "--all can't be combined with refspecs"
 msgstr "--all 不能和引用規格同時使用"
 
-#: builtin/push.c:638
+#: builtin/push.c
 msgid "--mirror can't be combined with refspecs"
 msgstr "--mirror 不能和引用規格同時使用"
 
-#: builtin/push.c:648
+#: builtin/push.c
 msgid "push options must not have new line characters"
 msgstr "推送選項不能有換行符號"
 
-#: builtin/range-diff.c:9
+#: builtin/range-diff.c
 msgid "git range-diff [<options>] <old-base>..<old-tip> <new-base>..<new-tip>"
 msgstr "git range-diff [<選項>] <old-base>..<old-tip> <new-base>..<new-tip>"
 
-#: builtin/range-diff.c:10
+#: builtin/range-diff.c
 msgid "git range-diff [<options>] <old-tip>...<new-tip>"
 msgstr "git range-diff [<選項>] <old-tip>...<new-tip>"
 
-#: builtin/range-diff.c:11
+#: builtin/range-diff.c
 msgid "git range-diff [<options>] <base> <old-tip> <new-tip>"
 msgstr "git range-diff [<選項>] <base> <old-tip> <new-tip>"
 
-#: builtin/range-diff.c:30
+#: builtin/range-diff.c
 msgid "use simple diff colors"
 msgstr "使用簡單差異顏色"
 
-#: builtin/range-diff.c:32
+#: builtin/range-diff.c
 msgid "notes"
 msgstr "註解"
 
-#: builtin/range-diff.c:32
+#: builtin/range-diff.c
 msgid "passed to 'git log'"
 msgstr "傳遞給 'git log'"
 
-#: builtin/range-diff.c:35
+#: builtin/range-diff.c
 msgid "only emit output related to the first range"
 msgstr "只發出跟第一個範圍相關的輸出"
 
-#: builtin/range-diff.c:37
+#: builtin/range-diff.c
 msgid "only emit output related to the second range"
 msgstr "只發出跟第二個範圍相關的輸出"
 
-#: builtin/range-diff.c:60 builtin/range-diff.c:64
+#: builtin/range-diff.c
 #, c-format
 msgid "not a commit range: '%s'"
 msgstr "不是提交範圍：「%s」"
 
-#: builtin/range-diff.c:74
+#: builtin/range-diff.c
 msgid "single arg format must be symmetric range"
 msgstr "單個參數格式必須是對稱範圍（即包含...）"
 
-#: builtin/range-diff.c:89
+#: builtin/range-diff.c
 msgid "need two commit ranges"
 msgstr "需要兩個提交範圍"
 
-#: builtin/read-tree.c:41
+#: builtin/read-tree.c
 msgid ""
 "git read-tree [(-m [--trivial] [--aggressive] | --reset | --prefix=<prefix>) "
 "[-u | -i]] [--no-sparse-checkout] [--index-output=<file>] (--empty | <tree-"
@@ -19950,79 +11816,79 @@ msgstr ""
 "u | -i]] [--no-sparse-checkout] [--index-output=<檔案>] (--empty | <樹狀物件"
 "1> [<樹狀物件2> [<樹狀物件3>]])"
 
-#: builtin/read-tree.c:116
+#: builtin/read-tree.c
 msgid "write resulting index to <file>"
 msgstr "將索引結果寫入 <檔案>"
 
-#: builtin/read-tree.c:119
+#: builtin/read-tree.c
 msgid "only empty the index"
 msgstr "只是清空索引"
 
-#: builtin/read-tree.c:121
+#: builtin/read-tree.c
 msgid "Merging"
 msgstr "合併"
 
-#: builtin/read-tree.c:123
+#: builtin/read-tree.c
 msgid "perform a merge in addition to a read"
 msgstr "讀取之餘再執行一個合併"
 
-#: builtin/read-tree.c:125
+#: builtin/read-tree.c
 msgid "3-way merge if no file level merging required"
 msgstr "如果沒有檔案級合併需要，執行三方合併"
 
-#: builtin/read-tree.c:127
+#: builtin/read-tree.c
 msgid "3-way merge in presence of adds and removes"
 msgstr "存在新增和刪除時，也執行三方合併"
 
-#: builtin/read-tree.c:129
+#: builtin/read-tree.c
 msgid "same as -m, but discard unmerged entries"
 msgstr "類似於 -m，但捨棄未合併的條目"
 
-#: builtin/read-tree.c:130
+#: builtin/read-tree.c
 msgid "<subdirectory>/"
 msgstr "<子目錄>/"
 
-#: builtin/read-tree.c:131
+#: builtin/read-tree.c
 msgid "read the tree into the index under <subdirectory>/"
 msgstr "讀取樹狀物件到索引的 <子目錄>/ 下"
 
-#: builtin/read-tree.c:134
+#: builtin/read-tree.c
 msgid "update working tree with merge result"
 msgstr "用合併的結果更新工作區"
 
-#: builtin/read-tree.c:136
+#: builtin/read-tree.c
 msgid "gitignore"
 msgstr "gitignore"
 
-#: builtin/read-tree.c:137
+#: builtin/read-tree.c
 msgid "allow explicitly ignored files to be overwritten"
 msgstr "允許忽略檔案中設定的檔案可以被覆蓋"
 
-#: builtin/read-tree.c:140
+#: builtin/read-tree.c
 msgid "don't check the working tree after merging"
 msgstr "合併後不檢查工作區"
 
-#: builtin/read-tree.c:141
+#: builtin/read-tree.c
 msgid "don't update the index or the work tree"
 msgstr "不更新索引區和工作區"
 
-#: builtin/read-tree.c:143
+#: builtin/read-tree.c
 msgid "skip applying sparse checkout filter"
 msgstr "略過套用稀疏簽出過濾器"
 
-#: builtin/read-tree.c:145
+#: builtin/read-tree.c
 msgid "debug unpack-trees"
 msgstr "除錯 unpack-trees"
 
-#: builtin/read-tree.c:149
+#: builtin/read-tree.c
 msgid "suppress feedback messages"
 msgstr "抑制回饋訊息"
 
-#: builtin/read-tree.c:190
+#: builtin/read-tree.c
 msgid "You need to resolve your current index first"
 msgstr "您需要先解決目前索引的衝突"
 
-#: builtin/rebase.c:36
+#: builtin/rebase.c
 msgid ""
 "git rebase [-i] [options] [--exec <cmd>] [--onto <newbase> | --keep-base] "
 "[<upstream> [<branch>]]"
@@ -20030,50 +11896,60 @@ msgstr ""
 "git rebase [-i] [options] [--exec <命令>] [--onto <新基礎> | --keep-base] [<"
 "上游> [<分支>]]"
 
-#: builtin/rebase.c:38
+#: builtin/rebase.c
 msgid ""
 "git rebase [-i] [options] [--exec <cmd>] [--onto <newbase>] --root [<branch>]"
 msgstr ""
 "git rebase [-i] [選項] [--exec <命令>] [--onto <新基礎>] --root [<分支>]"
 
-#: builtin/rebase.c:231
+#: builtin/rebase.c sequencer.c
+#, c-format
+msgid "could not read '%s'."
+msgstr "不能讀取 '%s'。"
+
+#: builtin/rebase.c
 #, c-format
 msgid "could not create temporary %s"
 msgstr "無法建立暫時的 %s"
 
-#: builtin/rebase.c:237
+#: builtin/rebase.c
 msgid "could not mark as interactive"
 msgstr "無法標記為互動式"
 
-#: builtin/rebase.c:290
+#: builtin/rebase.c
 msgid "could not generate todo list"
 msgstr "無法生成待辦列表"
 
-#: builtin/rebase.c:332
+#: builtin/rebase.c
 msgid "a base commit must be provided with --upstream or --onto"
 msgstr "使用 --upstream 或 --onto 必須提供一個基礎提交"
 
-#: builtin/rebase.c:391
+#: builtin/rebase.c
 #, c-format
 msgid "%s requires the merge backend"
 msgstr "%s 需要合併後端"
 
-#: builtin/rebase.c:433
+#: builtin/rebase.c
 #, c-format
 msgid "could not get 'onto': '%s'"
 msgstr "無法取得 'onto'：'%s'"
 
-#: builtin/rebase.c:450
+#: builtin/rebase.c
 #, c-format
 msgid "invalid orig-head: '%s'"
 msgstr "無效的原始 head：'%s'"
 
-#: builtin/rebase.c:475
+#: builtin/rebase.c
 #, c-format
 msgid "ignoring invalid allow_rerere_autoupdate: '%s'"
 msgstr "忽略無效的 allow_rerere_autoupdate：'%s'"
 
-#: builtin/rebase.c:600
+#: builtin/rebase.c builtin/rm.c sequencer.c
+#, c-format
+msgid "could not remove '%s'"
+msgstr "無法刪除 '%s'"
+
+#: builtin/rebase.c
 msgid ""
 "Resolve all conflicts manually, mark them as resolved with\n"
 "\"git add/rm <conflicted_files>\", then run \"git rebase --continue\".\n"
@@ -20086,7 +11962,7 @@ msgstr ""
 "\"git rebase --skip\" 指令略過這個提交。如果想要終止執行並回到\n"
 "\"git rebase\" 執行之前的狀態，執行 \"git rebase --abort\"。"
 
-#: builtin/rebase.c:685
+#: builtin/rebase.c
 #, c-format
 msgid ""
 "\n"
@@ -20104,19 +11980,19 @@ msgstr ""
 "\n"
 "因此 git 無法對其重定基底。"
 
-#: builtin/rebase.c:836
+#: builtin/rebase.c
 #, c-format
 msgid "could not switch to %s"
 msgstr "無法切換到 %s"
 
-#: builtin/rebase.c:952
+#: builtin/rebase.c
 #, c-format
 msgid ""
 "unrecognized empty type '%s'; valid values are \"drop\", \"keep\", and \"ask"
 "\"."
 msgstr "無法識別的 '%s' 空類型；有效的數值有 \"drop\"、\"keep\" 跟 \"ask\"。"
 
-#: builtin/rebase.c:970
+#: builtin/rebase.c
 #, c-format
 msgid ""
 "%s\n"
@@ -20133,7 +12009,7 @@ msgstr ""
 "    git rebase '<branch>'\n"
 "\n"
 
-#: builtin/rebase.c:986
+#: builtin/rebase.c
 #, c-format
 msgid ""
 "If you wish to set tracking information for this branch you can do so with:\n"
@@ -20146,180 +12022,196 @@ msgstr ""
 "    git branch --set-upstream-to=%s/<branch> %s\n"
 "\n"
 
-#: builtin/rebase.c:1016
+#: builtin/rebase.c
 msgid "exec commands cannot contain newlines"
 msgstr "exec 指令不能包含換行符號"
 
-#: builtin/rebase.c:1020
+#: builtin/rebase.c
 msgid "empty exec command"
 msgstr "空的 exec 指令"
 
-#: builtin/rebase.c:1051
+#: builtin/rebase.c
 msgid "rebase onto given branch instead of upstream"
 msgstr "重定基底到提供的分支而非上游"
 
-#: builtin/rebase.c:1053
+#: builtin/rebase.c
 msgid "use the merge-base of upstream and branch as the current base"
 msgstr "使用上游和分支的合併基礎做為目前基礎"
 
-#: builtin/rebase.c:1055
+#: builtin/rebase.c
 msgid "allow pre-rebase hook to run"
 msgstr "允許執行 pre-rebase 掛鉤"
 
-#: builtin/rebase.c:1057
+#: builtin/rebase.c
 msgid "be quiet. implies --no-stat"
 msgstr "安靜。暗示 --no-stat"
 
-#: builtin/rebase.c:1060
+#: builtin/rebase.c
 msgid "display a diffstat of what changed upstream"
 msgstr "顯示上游變化的差異統計"
 
-#: builtin/rebase.c:1063
+#: builtin/rebase.c
 msgid "do not show diffstat of what changed upstream"
 msgstr "不顯示上游變化的差異統計"
 
-#: builtin/rebase.c:1066
+#: builtin/rebase.c
 msgid "add a Signed-off-by trailer to each commit"
 msgstr "在每個提交結尾加入 Signed-off-by"
 
-#: builtin/rebase.c:1069
+#: builtin/rebase.c
 msgid "make committer date match author date"
 msgstr "使提交日期與製作日期相符合"
 
-#: builtin/rebase.c:1071
+#: builtin/rebase.c
 msgid "ignore author date and use current date"
 msgstr "忽略製作日期而使用日前日期"
 
-#: builtin/rebase.c:1073
+#: builtin/rebase.c
 msgid "synonym of --reset-author-date"
 msgstr "和 --reset-author-date 同義"
 
-#: builtin/rebase.c:1075 builtin/rebase.c:1079
+#: builtin/rebase.c
 msgid "passed to 'git apply'"
 msgstr "傳遞給 'git apply'"
 
-#: builtin/rebase.c:1077
+#: builtin/rebase.c
 msgid "ignore changes in whitespace"
 msgstr "忽略空白字元中的變更"
 
-#: builtin/rebase.c:1081 builtin/rebase.c:1084
+#: builtin/rebase.c
 msgid "cherry-pick all commits, even if unchanged"
 msgstr "揀選所有提交，即使未修改"
 
-#: builtin/rebase.c:1086
+#: builtin/rebase.c
 msgid "continue"
 msgstr "繼續"
 
-#: builtin/rebase.c:1089
+#: builtin/rebase.c
 msgid "skip current patch and continue"
 msgstr "略過目前修補檔並繼續"
 
 #  譯者：請維持前導空格
-#: builtin/rebase.c:1091
+#: builtin/rebase.c
 msgid "abort and check out the original branch"
 msgstr "終止並簽出原有分支"
 
-#: builtin/rebase.c:1094
+#: builtin/rebase.c
 msgid "abort but keep HEAD where it is"
 msgstr "終止但保持 HEAD 不變"
 
-#: builtin/rebase.c:1095
+#: builtin/rebase.c
 msgid "edit the todo list during an interactive rebase"
 msgstr "在互動式重定基底中編輯待辦列表"
 
-#: builtin/rebase.c:1098
+#: builtin/rebase.c
 msgid "show the patch file being applied or merged"
 msgstr "顯示正在套用或合併的修補檔案"
 
-#: builtin/rebase.c:1101
+#: builtin/rebase.c
 msgid "use apply strategies to rebase"
 msgstr "使用套用策略進行重定基底"
 
-#: builtin/rebase.c:1105
+#: builtin/rebase.c
 msgid "use merging strategies to rebase"
 msgstr "使用合併策略進行重定基底"
 
-#: builtin/rebase.c:1109
+#: builtin/rebase.c
 msgid "let the user edit the list of commits to rebase"
 msgstr "讓使用者編輯要重定基底的提交列表"
 
-#: builtin/rebase.c:1113
-msgid "(DEPRECATED) try to recreate merges instead of ignoring them"
-msgstr "（已棄用）嘗試重建合併提交而非忽略它們"
+#: builtin/rebase.c
+msgid "(REMOVED) was: try to recreate merges instead of ignoring them"
+msgstr "（已移除）曾為：嘗試重新建立，而非忽略合併"
 
-#: builtin/rebase.c:1118
+#: builtin/rebase.c
 msgid "how to handle commits that become empty"
 msgstr "處理空白提交的方式"
 
-#: builtin/rebase.c:1121
+#: builtin/rebase.c
 msgid "keep commits which start empty"
 msgstr "保留開頭是空白的提交"
 
-#: builtin/rebase.c:1125
+#: builtin/rebase.c
 msgid "move commits that begin with squash!/fixup! under -i"
 msgstr "在 -i 互動模式下，移動以 squash!/fixup! 開頭的提交"
 
-#: builtin/rebase.c:1132
+#: builtin/rebase.c
 msgid "add exec lines after each commit of the editable list"
 msgstr "可編輯列表的每一個提交下面增加一行 exec"
 
-#: builtin/rebase.c:1136
+#: builtin/rebase.c
 msgid "allow rebasing commits with empty messages"
 msgstr "允許針對空提交說明的提交重定基底"
 
-#: builtin/rebase.c:1140
+#: builtin/rebase.c
 msgid "try to rebase merges instead of skipping them"
 msgstr "嘗試對合併提交重定基底而不是忽略它們"
 
-#: builtin/rebase.c:1143
+#: builtin/rebase.c
 msgid "use 'merge-base --fork-point' to refine upstream"
 msgstr "使用 'merge-base --fork-point' 來最佳化上游"
 
-#: builtin/rebase.c:1145
+#: builtin/rebase.c
 msgid "use the given merge strategy"
 msgstr "使用提供的合併策略"
 
-#: builtin/rebase.c:1147 builtin/revert.c:115
+#: builtin/rebase.c builtin/revert.c
 msgid "option"
 msgstr "選項"
 
-#: builtin/rebase.c:1148
+#: builtin/rebase.c
 msgid "pass the argument through to the merge strategy"
 msgstr "將參數傳遞給合併策略"
 
-#: builtin/rebase.c:1151
+#: builtin/rebase.c
 msgid "rebase all reachable commits up to the root(s)"
 msgstr "將所有可以取得的提交重定基底到根提交"
 
-#: builtin/rebase.c:1154
+#: builtin/rebase.c
 msgid "automatically re-schedule any `exec` that fails"
 msgstr "自動重新安排任何失敗的 `exec`"
 
-#: builtin/rebase.c:1156
+#: builtin/rebase.c
 msgid "apply all changes, even those already present upstream"
 msgstr "即使已提供上游，仍套用所有變更"
 
-#: builtin/rebase.c:1177
+#: builtin/rebase.c
 msgid "It looks like 'git am' is in progress. Cannot rebase."
 msgstr "看起來 'git am' 正在執行中。無法重定基底。"
 
-#: builtin/rebase.c:1208
-msgid "--preserve-merges was replaced by --rebase-merges"
-msgstr "--preserve-merges 已經被 --rebase-merges 取代"
+#: builtin/rebase.c
+msgid ""
+"`rebase --preserve-merges` (-p) is no longer supported.\n"
+"Use `git rebase --abort` to terminate current rebase.\n"
+"Or downgrade to v2.33, or earlier, to complete the rebase."
+msgstr ""
+"`rebase --preserve-merges` (-p) 已不受支援。\n"
+"請使用 `git rebase --abort` 終止目前的重定基底動作。\n"
+"或者是降級到 v2.33 或更早版本，以完成本重定基底動作。"
 
-#: builtin/rebase.c:1230
+#: builtin/rebase.c
+msgid ""
+"--preserve-merges was replaced by --rebase-merges\n"
+"Note: Your `pull.rebase` configuration may also be set to 'preserve',\n"
+"which is no longer supported; use 'merges' instead"
+msgstr ""
+"--preserve-merges 已被 --rebase-merges 取代\n"
+"註：您的 `pull.rebase` 設定可能也被設定為不受支援的 “preserve”；\n"
+"請改用 “merges”"
+
+#: builtin/rebase.c
 msgid "No rebase in progress?"
 msgstr "沒有正在進行的重定基底？"
 
-#: builtin/rebase.c:1234
+#: builtin/rebase.c
 msgid "The --edit-todo action can only be used during interactive rebase."
 msgstr "動作 --edit-todo 只能用在互動式重定基底過程中。"
 
-#: builtin/rebase.c:1257 t/helper/test-fast-rebase.c:122
+#: builtin/rebase.c t/helper/test-fast-rebase.c
 msgid "Cannot read HEAD"
 msgstr "不能讀取 HEAD"
 
-#: builtin/rebase.c:1269
+#: builtin/rebase.c
 msgid ""
 "You must edit all merge conflicts and then\n"
 "mark them as resolved using git add"
@@ -20327,16 +12219,16 @@ msgstr ""
 "您必須編輯所有的合併衝突，然後透過 git add\n"
 "指令將它們標記為已解決"
 
-#: builtin/rebase.c:1287
+#: builtin/rebase.c
 msgid "could not discard worktree changes"
 msgstr "無法捨棄工作區變更"
 
-#: builtin/rebase.c:1308
+#: builtin/rebase.c
 #, c-format
 msgid "could not move back to %s"
 msgstr "無法移回 %s"
 
-#: builtin/rebase.c:1354
+#: builtin/rebase.c
 #, c-format
 msgid ""
 "It seems that there is already a %s directory, and\n"
@@ -20355,126 +12247,125 @@ msgstr ""
 "\t%s\n"
 "然後再重新執行。 為避免遺失重要資料，我已經停止目前動作。\n"
 
-#: builtin/rebase.c:1382
+#: builtin/rebase.c
 msgid "switch `C' expects a numerical value"
 msgstr "開關 `C' 期望一個數字值"
 
-#: builtin/rebase.c:1424
+#: builtin/rebase.c
 #, c-format
 msgid "Unknown mode: %s"
 msgstr "未知模式：%s"
 
-#: builtin/rebase.c:1463
+#: builtin/rebase.c
 msgid "--strategy requires --merge or --interactive"
 msgstr "--strategy 需要 --merge 或 --interactive"
 
-#: builtin/rebase.c:1492
+#: builtin/rebase.c
 msgid "apply options and merge options cannot be used together"
 msgstr "套用選項與合併選項不得同時使用"
 
-#: builtin/rebase.c:1505
+#: builtin/rebase.c
 #, c-format
 msgid "Unknown rebase backend: %s"
 msgstr "未知 rebase 後端：%s"
 
-#: builtin/rebase.c:1534
+#: builtin/rebase.c
 msgid "--reschedule-failed-exec requires --exec or --interactive"
 msgstr "--reschedule-failed-exec 需要 --exec 或 --interactive"
 
-#: builtin/rebase.c:1565
+#: builtin/rebase.c
 #, c-format
 msgid "invalid upstream '%s'"
 msgstr "無效的上游 '%s'"
 
-#: builtin/rebase.c:1571
+#: builtin/rebase.c
 msgid "Could not create new root commit"
 msgstr "不能建立新的根提交"
 
-#: builtin/rebase.c:1597
+#: builtin/rebase.c
+#, c-format
+msgid "no such branch/commit '%s'"
+msgstr "沒有此分支/提交 '%s'"
+
+#: builtin/rebase.c builtin/submodule--helper.c
+#, c-format
+msgid "No such ref: %s"
+msgstr "沒有這樣的引用：%s"
+
+#: builtin/rebase.c
+msgid "Could not resolve HEAD to a revision"
+msgstr "無法將 HEAD 解析為一個版本"
+
+#: builtin/rebase.c
 #, c-format
 msgid "'%s': need exactly one merge base with branch"
 msgstr "'%s'：只需要與分支的一個合併基礎"
 
-#: builtin/rebase.c:1600
+#: builtin/rebase.c
 #, c-format
 msgid "'%s': need exactly one merge base"
 msgstr "'%s'：只需要一個合併基礎"
 
-#: builtin/rebase.c:1609
+#: builtin/rebase.c
 #, c-format
 msgid "Does not point to a valid commit '%s'"
 msgstr "沒有指向一個有效的提交 '%s'"
 
-#: builtin/rebase.c:1636
-#, c-format
-msgid "no such branch/commit '%s'"
-msgstr "沒有此分支/提交 '%s'"
-
-#: builtin/rebase.c:1647 builtin/submodule--helper.c:43
-#: builtin/submodule--helper.c:2477
-#, c-format
-msgid "No such ref: %s"
-msgstr "沒有這樣的引用：%s"
-
-#: builtin/rebase.c:1658
-msgid "Could not resolve HEAD to a revision"
-msgstr "無法將 HEAD 解析為一個版本"
-
-#: builtin/rebase.c:1679
+#: builtin/rebase.c
 msgid "Please commit or stash them."
 msgstr "請提交或儲藏修改。"
 
-#: builtin/rebase.c:1714
+#: builtin/rebase.c
 msgid "HEAD is up to date."
 msgstr "HEAD 是最新的。"
 
-#: builtin/rebase.c:1716
+#: builtin/rebase.c
 #, c-format
 msgid "Current branch %s is up to date.\n"
 msgstr "目前分支 %s 是最新的。\n"
 
-#: builtin/rebase.c:1724
+#: builtin/rebase.c
 msgid "HEAD is up to date, rebase forced."
 msgstr "HEAD 是最新的，強制重定基底。"
 
-#: builtin/rebase.c:1726
+#: builtin/rebase.c
 #, c-format
 msgid "Current branch %s is up to date, rebase forced.\n"
 msgstr "目前分支 %s 是最新的，強制重定基底。\n"
 
-#: builtin/rebase.c:1734
+#: builtin/rebase.c
 msgid "The pre-rebase hook refused to rebase."
 msgstr "pre-rebase 掛鉤拒絕了重定基底動作。"
 
-#: builtin/rebase.c:1741
+#: builtin/rebase.c
 #, c-format
 msgid "Changes to %s:\n"
 msgstr "到 %s 的變更：\n"
 
-#: builtin/rebase.c:1744
+#: builtin/rebase.c
 #, c-format
 msgid "Changes from %s to %s:\n"
 msgstr "從 %s 到 %s 的變更：\n"
 
-#: builtin/rebase.c:1769
+#: builtin/rebase.c
 #, c-format
 msgid "First, rewinding head to replay your work on top of it...\n"
 msgstr "首先，還原開頭指標以便在其上重放您的工作...\n"
 
-#: builtin/rebase.c:1781
+#: builtin/rebase.c
 msgid "Could not detach HEAD"
 msgstr "無法分離開頭指標"
 
-#: builtin/rebase.c:1790
+#: builtin/rebase.c
 #, c-format
 msgid "Fast-forwarded %s to %s.\n"
 msgstr "快轉 %s 到 %s。\n"
 
-#: builtin/receive-pack.c:35
+#: builtin/receive-pack.c
 msgid "git receive-pack <git-dir>"
 msgstr "git receive-pack <版本庫目錄>"
 
-#: builtin/receive-pack.c:1263
+#: builtin/receive-pack.c
 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"
@@ -20500,7 +12391,7 @@ msgstr ""
 "若要封鎖此訊息且保持預設行為，設定 'receive.denyCurrentBranch'\n"
 "設定變數為 'refuse'。"
 
-#: builtin/receive-pack.c:1283
+#: builtin/receive-pack.c
 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"
@@ -20519,19 +12410,19 @@ msgstr ""
 "\n"
 "若要封鎖此訊息，您可以設定它為 'refuse'。"
 
-#: builtin/receive-pack.c:2476
+#: builtin/receive-pack.c
 msgid "quiet"
 msgstr "靜默模式"
 
-#: builtin/receive-pack.c:2491
+#: builtin/receive-pack.c
 msgid "you must specify a directory"
 msgstr "您必須指定目錄"
 
-#: builtin/reflog.c:9
+#: builtin/reflog.c
 msgid "git reflog [show] [<log-options>] [<ref>]"
 msgstr "git reflog [show] [<log-options>] [<ref>]"
 
-#: builtin/reflog.c:12
+#: builtin/reflog.c
 msgid ""
 "git reflog expire [--expire=<time>] [--expire-unreachable=<time>]\n"
 "                  [--rewrite] [--updateref] [--stale-fix]\n"
@@ -20543,7 +12434,7 @@ msgstr ""
 "                  [--dry-run | -n] [--verbose] [--all [--single-worktree] | "
 "<refs>...]"
 
-#: builtin/reflog.c:17
+#: builtin/reflog.c
 msgid ""
 "git reflog delete [--rewrite] [--updateref]\n"
 "                  [--dry-run | -n] [--verbose] <ref>@{<specifier>}..."
@@ -20551,78 +12442,78 @@ msgstr ""
 "git reflog delete [--rewrite] [--updateref]\n"
 "                  [--dry-run | -n] [--verbose] <ref>@{<specifier>}..."
 
-#: builtin/reflog.c:21
+#: builtin/reflog.c
 msgid "git reflog exists <ref>"
 msgstr "git reflog exists <引用>"
 
-#: builtin/reflog.c:197 builtin/reflog.c:211
+#: builtin/reflog.c
 #, c-format
 msgid "invalid timestamp '%s' given to '--%s'"
 msgstr "傳入「--%s」的時間戳「%s」無效"
 
-#: builtin/reflog.c:240 builtin/reflog.c:359
+#: builtin/reflog.c
 msgid "do not actually prune any entries"
 msgstr "不實際剪除任何項目"
 
-#: builtin/reflog.c:243 builtin/reflog.c:362
+#: builtin/reflog.c
 msgid ""
 "rewrite the old SHA1 with the new SHA1 of the entry that now precedes it"
 msgstr "將舊的 SHA1 重寫為現在比它早的新 SHA1"
 
-#: builtin/reflog.c:246 builtin/reflog.c:365
+#: builtin/reflog.c
 msgid "update the reference to the value of the top reflog entry"
 msgstr "更新引用至首個引用日誌項目的值"
 
-#: builtin/reflog.c:248 builtin/reflog.c:367
+#: builtin/reflog.c
 msgid "print extra information on screen"
 msgstr "在螢幕上輸出額外資訊"
 
-#: builtin/reflog.c:249 builtin/reflog.c:253
+#: builtin/reflog.c
 msgid "timestamp"
 msgstr "時間戳"
 
-#: builtin/reflog.c:250
+#: builtin/reflog.c
 msgid "prune entries older than the specified time"
 msgstr "剪除舊於指定時間的項目"
 
-#: builtin/reflog.c:254
+#: builtin/reflog.c
 msgid ""
 "prune entries older than <time> that are not reachable from the current tip "
 "of the branch"
 msgstr "剪除早於 <time> 且不能從分支目前開頭到達的項目"
 
-#: builtin/reflog.c:258
+#: builtin/reflog.c
 msgid "prune any reflog entries that point to broken commits"
 msgstr "剪除任何指向損壞提交的引用日誌項目"
 
-#: builtin/reflog.c:259
+#: builtin/reflog.c
 msgid "process the reflogs of all references"
 msgstr "處理所有引用的 reflog"
 
-#: builtin/reflog.c:261
+#: builtin/reflog.c
 msgid "limits processing to reflogs from the current worktree only"
 msgstr "限制只處理目前工作區的引用日誌"
 
-#: builtin/reflog.c:294
+#: builtin/reflog.c
 #, c-format
 msgid "Marking reachable objects..."
 msgstr "正在標記可以取得物件..."
 
-#: builtin/reflog.c:338
+#: builtin/reflog.c
 #, c-format
 msgid "%s points nowhere!"
 msgstr "%s 指向不存在！"
 
-#: builtin/reflog.c:374
+#: builtin/reflog.c
 msgid "no reflog specified to delete"
 msgstr "未指定要刪除的引用日誌"
 
-#: builtin/reflog.c:396
+#: builtin/reflog.c
 #, c-format
 msgid "invalid ref format: %s"
 msgstr "無效的引用格式：%s"
 
-#: builtin/remote.c:19
+#: builtin/remote.c
 msgid ""
 "git remote add [-t <branch>] [-m <master>] [-f] [--tags | --no-tags] [--"
 "mirror=<fetch|push>] <name> <url>"
@@ -20630,86 +12521,86 @@ msgstr ""
 "git remote add [-t <分支>] [-m <master>] [-f] [--tags | --no-tags] [--"
 "mirror=<fetch|push>] <名稱> <位址>"
 
-#: builtin/remote.c:20 builtin/remote.c:40
+#: builtin/remote.c
 msgid "git remote rename [--[no-]progress] <old> <new>"
 msgstr "git remote rename [--[no-]progress] <old> <new>"
 
-#: builtin/remote.c:21 builtin/remote.c:45
+#: builtin/remote.c
 msgid "git remote remove <name>"
 msgstr "git remote remove <名稱>"
 
-#: builtin/remote.c:22 builtin/remote.c:50
+#: builtin/remote.c
 msgid "git remote set-head <name> (-a | --auto | -d | --delete | <branch>)"
 msgstr "git remote set-head <名稱> (-a | --auto | -d | --delete | <分支>)"
 
-#: builtin/remote.c:23
+#: builtin/remote.c
 msgid "git remote [-v | --verbose] show [-n] <name>"
 msgstr "git remote [-v | --verbose] show [-n] <名稱>"
 
-#: builtin/remote.c:24
+#: builtin/remote.c
 msgid "git remote prune [-n | --dry-run] <name>"
 msgstr "git remote prune [-n | --dry-run] <名稱>"
 
-#: builtin/remote.c:25
+#: builtin/remote.c
 msgid ""
 "git remote [-v | --verbose] update [-p | --prune] [(<group> | <remote>)...]"
 msgstr "git remote [-v | --verbose] update [-p | --prune] [(<組> | <遠端>)...]"
 
-#: builtin/remote.c:26
+#: builtin/remote.c
 msgid "git remote set-branches [--add] <name> <branch>..."
 msgstr "git remote set-branches [--add] <名稱> <分支>..."
 
-#: builtin/remote.c:27 builtin/remote.c:76
+#: builtin/remote.c
 msgid "git remote get-url [--push] [--all] <name>"
 msgstr "git remote get-url [--push] [--all] <名稱>"
 
-#: builtin/remote.c:28 builtin/remote.c:81
+#: builtin/remote.c
 msgid "git remote set-url [--push] <name> <newurl> [<oldurl>]"
 msgstr "git remote set-url [--push] <名稱> <新的位址> [<舊的位址>]"
 
-#: builtin/remote.c:29 builtin/remote.c:82
+#: builtin/remote.c
 msgid "git remote set-url --add <name> <newurl>"
 msgstr "git remote set-url --add <名稱> <新的位址>"
 
-#: builtin/remote.c:30 builtin/remote.c:83
+#: builtin/remote.c
 msgid "git remote set-url --delete <name> <url>"
 msgstr "git remote set-url --delete <名稱> <位址>"
 
-#: builtin/remote.c:35
+#: builtin/remote.c
 msgid "git remote add [<options>] <name> <url>"
 msgstr "git remote add [<選項>] <名稱> <位址>"
 
-#: builtin/remote.c:55
+#: builtin/remote.c
 msgid "git remote set-branches <name> <branch>..."
 msgstr "git remote set-branches <名稱> <分支>..."
 
-#: builtin/remote.c:56
+#: builtin/remote.c
 msgid "git remote set-branches --add <name> <branch>..."
 msgstr "git remote set-branches --add <名稱> <分支>..."
 
-#: builtin/remote.c:61
+#: builtin/remote.c
 msgid "git remote show [<options>] <name>"
 msgstr "git remote show [<選項>] <名稱>"
 
-#: builtin/remote.c:66
+#: builtin/remote.c
 msgid "git remote prune [<options>] <name>"
 msgstr "git remote prune [<選項>] <名稱>"
 
-#: builtin/remote.c:71
+#: builtin/remote.c
 msgid "git remote update [<options>] [<group> | <remote>]..."
 msgstr "git remote update [<選項>] [<組> | <遠端>]..."
 
-#: builtin/remote.c:100
+#: builtin/remote.c
 #, c-format
 msgid "Updating %s"
 msgstr "更新 %s 中"
 
-#: builtin/remote.c:102
+#: builtin/remote.c
 #, c-format
 msgid "Could not fetch %s"
 msgstr "不能取得 %s"
 
-#: builtin/remote.c:132
+#: builtin/remote.c
 msgid ""
 "--mirror is dangerous and deprecated; please\n"
 "\t use --mirror=fetch or --mirror=push instead"
@@ -20717,77 +12608,87 @@ msgstr ""
 "--mirror 選項危險且過時，請使用 --mirror=fetch\n"
 "\t 或 --mirror=push"
 
-#: builtin/remote.c:149
+#: builtin/remote.c
 #, c-format
 msgid "unknown mirror argument: %s"
 msgstr "未知的鏡像參數：%s"
 
-#: builtin/remote.c:165
+#: builtin/remote.c
 msgid "fetch the remote branches"
 msgstr "抓取遠端的分支"
 
-#: builtin/remote.c:167
+#: builtin/remote.c
 msgid "import all tags and associated objects when fetching"
 msgstr "抓取時匯入所有的標籤和關聯物件"
 
-#: builtin/remote.c:170
+#: builtin/remote.c
 msgid "or do not fetch any tag at all (--no-tags)"
 msgstr "或不抓取任何標籤（--no-tags）"
 
-#: builtin/remote.c:172
+#: builtin/remote.c
 msgid "branch(es) to track"
 msgstr "追蹤的分支"
 
-#: builtin/remote.c:173
+#: builtin/remote.c
 msgid "master branch"
 msgstr "master 分支"
 
-#: builtin/remote.c:175
+#: builtin/remote.c
 msgid "set up remote as a mirror to push to or fetch from"
 msgstr "把遠端設定為用以推送或抓取的鏡像"
 
-#: builtin/remote.c:187
+#: builtin/remote.c
 msgid "specifying a master branch makes no sense with --mirror"
 msgstr "指定一個 master 分支並使用 --mirror 選項沒有意義"
 
-#: builtin/remote.c:189
+#: builtin/remote.c
 msgid "specifying branches to track makes sense only with fetch mirrors"
 msgstr "指定要追蹤的分支只在與取得鏡像同時使用才有意義"
 
-#: builtin/remote.c:196 builtin/remote.c:716
+#: builtin/remote.c
 #, c-format
 msgid "remote %s already exists."
 msgstr "遠端 %s 已經存在。"
 
-#: builtin/remote.c:241
+#: builtin/remote.c
 #, c-format
 msgid "Could not setup master '%s'"
 msgstr "無法設定 master '%s'"
 
-#: builtin/remote.c:323
+#: builtin/remote.c trailer.c
+#, c-format
+msgid "more than one %s"
+msgstr "多於一個 %s"
+
+#: builtin/remote.c
 #, c-format
 msgid "unhandled branch.%s.rebase=%s; assuming 'true'"
 msgstr "branch.%s.rebase=%s 未處理。假設成 'true'"
 
-#: builtin/remote.c:367
+#: builtin/remote.c
 #, c-format
 msgid "Could not get fetch map for refspec %s"
 msgstr "無法得到引用規格 %s 的取得列表"
 
-#: builtin/remote.c:461 builtin/remote.c:469
+#: builtin/remote.c
 msgid "(matching)"
 msgstr "（符合）"
 
-#: builtin/remote.c:473
+#: builtin/remote.c
 msgid "(delete)"
 msgstr "（刪除）"
 
-#: builtin/remote.c:664
+#: builtin/remote.c
 #, c-format
 msgid "could not set '%s'"
 msgstr "無法設定 '%s'"
 
-#: builtin/remote.c:669
+#: builtin/remote.c config.c
+#, c-format
+msgid "could not unset '%s'"
+msgstr "不能取消設定 '%s'"
+
+#: builtin/remote.c
 #, c-format
 msgid ""
 "The %s configuration remote.pushDefault in:\n"
@@ -20798,17 +12699,17 @@ msgstr ""
 "\t%s:%d\n"
 "現命名成不存在的遠端分支 '%s'"
 
-#: builtin/remote.c:707 builtin/remote.c:866 builtin/remote.c:973
+#: builtin/remote.c
 #, c-format
 msgid "No such remote: '%s'"
 msgstr "沒有此遠端版本庫：'%s'"
 
-#: builtin/remote.c:726
+#: builtin/remote.c
 #, c-format
 msgid "Could not rename config section '%s' to '%s'"
 msgstr "不能重新命名設定小節 '%s' 到 '%s'"
 
-#: builtin/remote.c:746
+#: builtin/remote.c
 #, c-format
 msgid ""
 "Not updating non-default fetch refspec\n"
@@ -20819,21 +12720,21 @@ msgstr ""
 "\t%s\n"
 "\t如果必要請手動更新設定。"
 
-#: builtin/remote.c:783
+#: builtin/remote.c
 msgid "Renaming remote references"
 msgstr "正在重新命名遠端引用"
 
-#: builtin/remote.c:794
+#: builtin/remote.c
 #, c-format
 msgid "deleting '%s' failed"
 msgstr "刪除 '%s' 失敗"
 
-#: builtin/remote.c:832
+#: builtin/remote.c
 #, c-format
 msgid "creating '%s' failed"
 msgstr "建立 '%s' 失敗"
 
-#: builtin/remote.c:912
+#: builtin/remote.c
 msgid ""
 "Note: A branch outside the refs/remotes/ hierarchy was not removed;\n"
 "to delete it, use:"
@@ -20842,118 +12743,118 @@ msgid_plural ""
 "to delete them, use:"
 msgstr[0] "注意：ref/remotes 層級之外的一個分支未被移除。要刪除它，使用："
 
-#: builtin/remote.c:926
+#: builtin/remote.c
 #, c-format
 msgid "Could not remove config section '%s'"
 msgstr "不能移除設定小節 '%s'"
 
-#: builtin/remote.c:1034
+#: builtin/remote.c
 #, c-format
 msgid " new (next fetch will store in remotes/%s)"
 msgstr " 新的（下一次取得將儲存於 remotes/%s）"
 
-#: builtin/remote.c:1037
+#: builtin/remote.c
 msgid " tracked"
 msgstr " 已追蹤"
 
-#: builtin/remote.c:1039
+#: builtin/remote.c
 msgid " stale (use 'git remote prune' to remove)"
 msgstr " 過時（使用 'git remote prune' 移除）"
 
-#: builtin/remote.c:1041
+#: builtin/remote.c
 msgid " ???"
 msgstr " ???"
 
-#: builtin/remote.c:1082
+#: builtin/remote.c
 #, c-format
 msgid "invalid branch.%s.merge; cannot rebase onto > 1 branch"
 msgstr "無效的 branch.%s.merge，不能重定基底到一個以上的分支"
 
-#: builtin/remote.c:1091
+#: builtin/remote.c
 #, c-format
 msgid "rebases interactively onto remote %s"
 msgstr "互動式重定基底到遠端 %s"
 
-#: builtin/remote.c:1093
+#: builtin/remote.c
 #, c-format
 msgid "rebases interactively (with merges) onto remote %s"
 msgstr "互動式重定基底（含合併提交）到遠端 %s"
 
-#: builtin/remote.c:1096
+#: builtin/remote.c
 #, c-format
 msgid "rebases onto remote %s"
 msgstr "重定基底到遠端 %s"
 
-#: builtin/remote.c:1100
+#: builtin/remote.c
 #, c-format
 msgid " merges with remote %s"
 msgstr " 與遠端 %s 合併"
 
-#: builtin/remote.c:1103
+#: builtin/remote.c
 #, c-format
 msgid "merges with remote %s"
 msgstr "與遠端 %s 合併"
 
-#: builtin/remote.c:1106
+#: builtin/remote.c
 #, c-format
 msgid "%-*s    and with remote %s\n"
 msgstr "%-*s    以及和遠端 %s\n"
 
-#: builtin/remote.c:1149
+#: builtin/remote.c
 msgid "create"
 msgstr "建立"
 
-#: builtin/remote.c:1152
+#: builtin/remote.c
 msgid "delete"
 msgstr "刪除"
 
-#: builtin/remote.c:1156
+#: builtin/remote.c
 msgid "up to date"
 msgstr "最新"
 
-#: builtin/remote.c:1159
+#: builtin/remote.c
 msgid "fast-forwardable"
 msgstr "可快轉"
 
-#: builtin/remote.c:1162
+#: builtin/remote.c
 msgid "local out of date"
 msgstr "本機已過時"
 
-#: builtin/remote.c:1169
+#: builtin/remote.c
 #, c-format
 msgid "    %-*s forces to %-*s (%s)"
 msgstr "    %-*s 強制推送至 %-*s (%s)"
 
-#: builtin/remote.c:1172
+#: builtin/remote.c
 #, c-format
 msgid "    %-*s pushes to %-*s (%s)"
 msgstr "    %-*s 推送至 %-*s (%s)"
 
-#: builtin/remote.c:1176
+#: builtin/remote.c
 #, c-format
 msgid "    %-*s forces to %s"
 msgstr "    %-*s 強制推送至 %s"
 
-#: builtin/remote.c:1179
+#: builtin/remote.c
 #, c-format
 msgid "    %-*s pushes to %s"
 msgstr "    %-*s 推送至 %s"
 
-#: builtin/remote.c:1247
+#: builtin/remote.c
 msgid "do not query remotes"
 msgstr "不查詢遠端"
 
-#: builtin/remote.c:1268
+#: builtin/remote.c
 #, c-format
 msgid "* remote %s"
 msgstr "* 遠端 %s"
 
-#: builtin/remote.c:1269
+#: builtin/remote.c
 #, c-format
 msgid "  Fetch URL: %s"
 msgstr "  取得位址：%s"
 
-#: builtin/remote.c:1270 builtin/remote.c:1286 builtin/remote.c:1423
+#: builtin/remote.c
 msgid "(no URL)"
 msgstr "(無 URL)"
 
@@ -20961,359 +12862,372 @@ msgstr "(無 URL)"
 #. with the one in " Fetch URL: %s"
 #. translation.
 #.
-#: builtin/remote.c:1284 builtin/remote.c:1286
+#: builtin/remote.c
 #, c-format
 msgid "  Push  URL: %s"
 msgstr "  推送位址：%s"
 
-#: builtin/remote.c:1288 builtin/remote.c:1290 builtin/remote.c:1292
+#: builtin/remote.c
 #, c-format
 msgid "  HEAD branch: %s"
 msgstr "  HEAD 分支：%s"
 
 #  譯者：中文字串拼接，可刪除前導空格
-#: builtin/remote.c:1288
+#: builtin/remote.c
 msgid "(not queried)"
 msgstr "（未查詢）"
 
-#: builtin/remote.c:1290
+#: builtin/remote.c
 msgid "(unknown)"
 msgstr "（未知）"
 
-#: builtin/remote.c:1294
+#: builtin/remote.c
 #, c-format
 msgid ""
 "  HEAD branch (remote HEAD is ambiguous, may be one of the following):\n"
 msgstr "  HEAD 分支（遠端 HEAD 模糊，可能是下列中的一個）：\n"
 
-#: builtin/remote.c:1306
+#: builtin/remote.c
 #, c-format
 msgid "  Remote branch:%s"
 msgid_plural "  Remote branches:%s"
 msgstr[0] "  遠端分支：%s"
 
 #  譯者：中文字串拼接，可刪除前導空格
-#: builtin/remote.c:1309 builtin/remote.c:1335
+#: builtin/remote.c
 msgid " (status not queried)"
 msgstr " （狀態未查詢）"
 
-#: builtin/remote.c:1318
+#: builtin/remote.c
 msgid "  Local branch configured for 'git pull':"
 msgid_plural "  Local branches configured for 'git pull':"
 msgstr[0] "  為 'git pull' 設定的本機分支："
 
-#: builtin/remote.c:1326
+#: builtin/remote.c
 msgid "  Local refs will be mirrored by 'git push'"
 msgstr "  本機引用將在 'git push' 時被鏡像"
 
-#: builtin/remote.c:1332
+#: builtin/remote.c
 #, 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:1353
+#: builtin/remote.c
 msgid "set refs/remotes/<name>/HEAD according to remote"
 msgstr "根據遠端設定 refs/remotes/<名稱>/HEAD"
 
-#: builtin/remote.c:1355
+#: builtin/remote.c
 msgid "delete refs/remotes/<name>/HEAD"
 msgstr "刪除 refs/remotes/<名稱>/HEAD"
 
-#: builtin/remote.c:1369
+#: builtin/remote.c
 msgid "Cannot determine remote HEAD"
 msgstr "無法確定遠端 HEAD"
 
-#: builtin/remote.c:1371
+#: builtin/remote.c
 msgid "Multiple remote HEAD branches. Please choose one explicitly with:"
 msgstr "多個遠端 HEAD 分支。請明確地選擇一個用指令："
 
-#: builtin/remote.c:1381
+#: builtin/remote.c
 #, c-format
 msgid "Could not delete %s"
 msgstr "無法刪除 %s"
 
-#: builtin/remote.c:1389
+#: builtin/remote.c
 #, c-format
 msgid "Not a valid ref: %s"
 msgstr "不是一個有效引用：%s"
 
-#: builtin/remote.c:1391
+#: builtin/remote.c
 #, c-format
 msgid "Could not setup %s"
 msgstr "不能設定 %s"
 
 #  譯者：請維持前導空格
-#: builtin/remote.c:1409
+#: builtin/remote.c
 #, c-format
 msgid " %s will become dangling!"
 msgstr " %s 將成為懸空狀態！"
 
 #  譯者：請維持前導空格
-#: builtin/remote.c:1410
+#: builtin/remote.c
 #, c-format
 msgid " %s has become dangling!"
 msgstr " %s 已成為懸空狀態！"
 
-#: builtin/remote.c:1419
+#: builtin/remote.c
 #, c-format
 msgid "Pruning %s"
 msgstr "修剪 %s"
 
-#: builtin/remote.c:1420
+#: builtin/remote.c
 #, c-format
 msgid "URL: %s"
 msgstr "URL：%s"
 
-#: builtin/remote.c:1436
+#: builtin/remote.c
 #, c-format
 msgid " * [would prune] %s"
 msgstr " * [將剪除] %s"
 
-#: builtin/remote.c:1439
+#: builtin/remote.c
 #, c-format
 msgid " * [pruned] %s"
 msgstr " * [已剪除] %s"
 
-#: builtin/remote.c:1484
+#: builtin/remote.c
 msgid "prune remotes after fetching"
 msgstr "抓取後剪除遠端"
 
-#: builtin/remote.c:1548 builtin/remote.c:1604 builtin/remote.c:1674
+#: builtin/remote.c
 #, c-format
 msgid "No such remote '%s'"
 msgstr "沒有此遠端 '%s'"
 
-#: builtin/remote.c:1566
+#: builtin/remote.c
 msgid "add branch"
 msgstr "新增分支"
 
-#: builtin/remote.c:1573
+#: builtin/remote.c
 msgid "no remote specified"
 msgstr "未指定遠端"
 
-#: builtin/remote.c:1590
+#: builtin/remote.c
 msgid "query push URLs rather than fetch URLs"
 msgstr "查詢推送 URL 位址，而非取得 URL 位址"
 
-#: builtin/remote.c:1592
+#: builtin/remote.c
 msgid "return all URLs"
 msgstr "返回所有 URL 位址"
 
-#: builtin/remote.c:1622
+#: builtin/remote.c
 #, c-format
 msgid "no URLs configured for remote '%s'"
 msgstr "沒有給遠端版本庫 '%s' 設定 URL"
 
-#: builtin/remote.c:1648
+#: builtin/remote.c
 msgid "manipulate push URLs"
 msgstr "動作推送 URLS"
 
-#: builtin/remote.c:1650
+#: builtin/remote.c
 msgid "add URL"
 msgstr "新增 URL"
 
-#: builtin/remote.c:1652
+#: builtin/remote.c
 msgid "delete URLs"
 msgstr "刪除 URL"
 
-#: builtin/remote.c:1659
+#: builtin/remote.c
 msgid "--add --delete doesn't make sense"
 msgstr "--add --delete 無意義"
 
-#: builtin/remote.c:1700
+#: builtin/remote.c
 #, c-format
 msgid "Invalid old URL pattern: %s"
 msgstr "無效的舊 URL 符合範本：%s"
 
-#: builtin/remote.c:1708
+#: builtin/remote.c
 #, c-format
 msgid "No such URL found: %s"
 msgstr "未找到此 URL：%s"
 
-#: builtin/remote.c:1710
+#: builtin/remote.c
 msgid "Will not delete all non-push URLs"
 msgstr "將不會刪除所有非推送 URL 位址"
 
-#: builtin/remote.c:1727
+#: builtin/remote.c
 msgid "be verbose; must be placed before a subcommand"
 msgstr "詳細輸出；必須置於子指令之前"
 
-#: builtin/repack.c:29
+#: builtin/repack.c
 msgid "git repack [<options>]"
 msgstr "git repack [<選項>]"
 
-#: builtin/repack.c:34
+#: builtin/repack.c
 msgid ""
 "Incremental repacks are incompatible with bitmap indexes.  Use\n"
-"--no-write-bitmap-index or disable the pack.writebitmaps configuration."
+"--no-write-bitmap-index or disable the pack.writeBitmaps configuration."
 msgstr ""
-"增量 repack 和 bitmap 索引不相容。  使用 --no-write-bitmap-index\n"
-"或停用 pack.writebitmaps 設定。"
+"增量 repack 和 bitmap 索引不相容。請使用 --no-write-bitmap-index\n"
+"或停用 pack.writeBitmaps 設定。"
 
-#: builtin/repack.c:206
+#: builtin/repack.c
 msgid "could not start pack-objects to repack promisor objects"
 msgstr "無法開始 pack-objects 來重新打包 promisor 物件"
 
-#: builtin/repack.c:280 builtin/repack.c:824
+#: builtin/repack.c
 msgid "repack: Expecting full hex object ID lines only from pack-objects."
 msgstr "repack：期望來自 pack-objects 的完整十六進位物件 ID。"
 
-#: builtin/repack.c:304
+#: builtin/repack.c
 msgid "could not finish pack-objects to repack promisor objects"
 msgstr "無法完成 pack-objects 來重新打包 promisor 物件"
 
-#: builtin/repack.c:319
+#: builtin/repack.c
 #, c-format
 msgid "cannot open index for %s"
 msgstr "無法開啟 %s 的索引"
 
-#: builtin/repack.c:378
+#: builtin/repack.c
 #, c-format
 msgid "pack %s too large to consider in geometric progression"
 msgstr "%s 包太大，以致不能在等比數列中考慮"
 
-#: builtin/repack.c:411 builtin/repack.c:418 builtin/repack.c:423
+#: builtin/repack.c
 #, c-format
 msgid "pack %s too large to roll up"
 msgstr "%s 包太大，以致不能縮合"
 
-#: builtin/repack.c:503
+#: builtin/repack.c
 #, c-format
 msgid "could not open tempfile %s for writing"
 msgstr "無法開啟 '%s' 暫存檔進行寫入"
 
-#: builtin/repack.c:521
+#: builtin/repack.c
 msgid "could not close refs snapshot tempfile"
 msgstr "無法關閉 refs 的快照暫存檔"
 
-#: builtin/repack.c:634
+#: builtin/repack.c
 msgid "pack everything in a single pack"
 msgstr "所有內容打包到一個包檔案中"
 
-#: builtin/repack.c:636
+#: builtin/repack.c
 msgid "same as -a, and turn unreachable objects loose"
 msgstr "和 -a 相同，並將無法取得的物件設為鬆散物件"
 
-#: builtin/repack.c:639
+#: builtin/repack.c
+msgid "same as -a, pack unreachable cruft objects separately"
+msgstr "和 -a 相同，會獨立封裝無法存取的廢棄物件"
+
+#: builtin/repack.c
+msgid "approxidate"
+msgstr "近似日期"
+
+#: builtin/repack.c
+msgid "with -C, expire objects older than this"
+msgstr "搭配 -C 會將早於此的物件設為過期"
+
+#: builtin/repack.c
 msgid "remove redundant packs, and run git-prune-packed"
 msgstr "刪除多餘的包，然後執行 git-prune-packed"
 
-#: builtin/repack.c:641
+#: builtin/repack.c
 msgid "pass --no-reuse-delta to git-pack-objects"
 msgstr "向 git-pack-objects 傳遞參數 --no-reuse-delta"
 
-#: builtin/repack.c:643
+#: builtin/repack.c
 msgid "pass --no-reuse-object to git-pack-objects"
 msgstr "向 git-pack-objects 傳遞參數 --no-reuse-object"
 
-#: builtin/repack.c:645
+#: builtin/repack.c
 msgid "do not run git-update-server-info"
 msgstr "不執行 git-update-server-info"
 
-#: builtin/repack.c:648
+#: builtin/repack.c
 msgid "pass --local to git-pack-objects"
 msgstr "向 git-pack-objects 傳遞參數 --local"
 
-#: builtin/repack.c:650
+#: builtin/repack.c
 msgid "write bitmap index"
 msgstr "寫 bitmap 索引"
 
-#: builtin/repack.c:652
+#: builtin/repack.c
 msgid "pass --delta-islands to git-pack-objects"
 msgstr "向 git-pack-objects 傳遞參數 --delta-islands"
 
-#: builtin/repack.c:653
-msgid "approxidate"
-msgstr "近似日期"
-
-#: builtin/repack.c:654
+#: builtin/repack.c
 msgid "with -A, do not loosen objects older than this"
 msgstr "使用 -A，不要將早於提供時間的物件過期"
 
-#: builtin/repack.c:656
+#: builtin/repack.c
 msgid "with -a, repack unreachable objects"
 msgstr "使用 -a ，重新對無法取得物件打包"
 
-#: builtin/repack.c:658
+#: builtin/repack.c
 msgid "size of the window used for delta compression"
 msgstr "用於增量壓縮的視窗值"
 
-#: builtin/repack.c:659 builtin/repack.c:665
+#: builtin/repack.c
 msgid "bytes"
 msgstr "位元組"
 
-#: builtin/repack.c:660
+#: builtin/repack.c
 msgid "same as the above, but limit memory size instead of entries count"
 msgstr "和上面的相似，但限制記憶體大小而非條目數"
 
-#: builtin/repack.c:662
+#: builtin/repack.c
 msgid "limits the maximum delta depth"
 msgstr "限制最大增量深度"
 
-#: builtin/repack.c:664
+#: builtin/repack.c
 msgid "limits the maximum number of threads"
 msgstr "限制最大執行緒數"
 
-#: builtin/repack.c:666
+#: builtin/repack.c
 msgid "maximum size of each packfile"
 msgstr "每個 packfile 的最大尺寸"
 
-#: builtin/repack.c:668
+#: builtin/repack.c
 msgid "repack objects in packs marked with .keep"
 msgstr "對標記為 .keep 的包中的物件重新打包"
 
-#: builtin/repack.c:670
+#: builtin/repack.c
 msgid "do not repack this pack"
-msgstr "不要對該包檔案重新打包"
+msgstr "不要對該封包重新打包"
 
-#: builtin/repack.c:672
+#: builtin/repack.c
 msgid "find a geometric progression with factor <N>"
 msgstr "尋找因數是 <N> 的等比數列"
 
-#: builtin/repack.c:674
+#: builtin/repack.c
 msgid "write a multi-pack index of the resulting packs"
 msgstr "寫入結果包的多包索引"
 
-#: builtin/repack.c:684
+#: builtin/repack.c
 msgid "cannot delete packs in a precious-objects repo"
-msgstr "不能刪除珍品版本庫中的打包檔案"
+msgstr "不能刪除珍品版本庫中的封包"
 
-#: builtin/repack.c:833
+#: builtin/repack.c
 msgid "Nothing new to pack."
 msgstr "沒有新的要打包。"
 
-#: builtin/repack.c:863
+#: builtin/repack.c
+#, c-format
+msgid "pack prefix %s does not begin with objdir %s"
+msgstr "封包前綴 %s 不以 objdir %s 開頭"
+
+#: builtin/repack.c
 #, c-format
 msgid "missing required file: %s"
 msgstr "缺少必要檔案：%s"
 
-#: builtin/repack.c:865
+#: builtin/repack.c
 #, c-format
 msgid "could not unlink: %s"
 msgstr "無法取消連結：%s"
 
-#: builtin/replace.c:22
+#: builtin/replace.c
 msgid "git replace [-f] <object> <replacement>"
 msgstr "git replace [-f] <物件> <取代物>"
 
-#: builtin/replace.c:23
+#: builtin/replace.c
 msgid "git replace [-f] --edit <object>"
 msgstr "git replace [-f] --edit <物件>"
 
-#: builtin/replace.c:24
+#: builtin/replace.c
 msgid "git replace [-f] --graft <commit> [<parent>...]"
 msgstr "git replace [-f] --graft <提交> [<父提交>...]"
 
-#: builtin/replace.c:26
+#: builtin/replace.c
 msgid "git replace -d <object>..."
 msgstr "git replace -d <物件>..."
 
-#: builtin/replace.c:27
+#: builtin/replace.c
 msgid "git replace [--format=<format>] [-l [<pattern>]]"
 msgstr "git replace [--format=<格式>] [-l [<模式>]]"
 
-#: builtin/replace.c:90
+#: builtin/replace.c
 #, c-format
 msgid ""
 "invalid replace format '%s'\n"
@@ -21322,27 +13236,27 @@ msgstr ""
 "無效的取代格式 '%s'\n"
 "有效的格式有 'short'、'medium' 和 'long'"
 
-#: builtin/replace.c:125
+#: builtin/replace.c
 #, c-format
 msgid "replace ref '%s' not found"
 msgstr "未發現取代引用 '%s'"
 
-#: builtin/replace.c:141
+#: builtin/replace.c
 #, c-format
 msgid "Deleted replace ref '%s'"
 msgstr "已刪除取代引用 '%s'"
 
-#: builtin/replace.c:153
+#: builtin/replace.c
 #, c-format
 msgid "'%s' is not a valid ref name"
 msgstr "'%s' 不是一個有效的引用名"
 
-#: builtin/replace.c:158
+#: builtin/replace.c
 #, c-format
 msgid "replace ref '%s' already exists"
 msgstr "取代引用 '%s' 已經存在"
 
-#: builtin/replace.c:178
+#: builtin/replace.c
 #, c-format
 msgid ""
 "Objects must be of the same type.\n"
@@ -21353,106 +13267,106 @@ msgstr ""
 "'%s' 指向 '%s' 類型的取代物件\n"
 "而 '%s' 指向 '%s' 類型的取代物件。"
 
-#: builtin/replace.c:229
+#: builtin/replace.c
 #, c-format
 msgid "unable to open %s for writing"
 msgstr "無法為寫入開啟 %s"
 
-#: builtin/replace.c:242
+#: builtin/replace.c
 msgid "cat-file reported failure"
 msgstr "cat-file 報告失敗"
 
-#: builtin/replace.c:258
+#: builtin/replace.c
 #, c-format
 msgid "unable to open %s for reading"
 msgstr "無法為讀取開啟 %s"
 
-#: builtin/replace.c:271
+#: builtin/replace.c
 msgid "unable to spawn mktree"
 msgstr "無法啟動 mktree"
 
-#: builtin/replace.c:275
+#: builtin/replace.c
 msgid "unable to read from mktree"
 msgstr "無法從 mktree 讀取"
 
-#: builtin/replace.c:284
+#: builtin/replace.c
 msgid "mktree reported failure"
 msgstr "mktree 報告失敗"
 
-#: builtin/replace.c:288
+#: builtin/replace.c
 msgid "mktree did not return an object name"
 msgstr "mktree 沒有返回一個物件名"
 
-#: builtin/replace.c:297
+#: builtin/replace.c
 #, c-format
 msgid "unable to fstat %s"
 msgstr "無法對 %s 執行 fstat"
 
-#: builtin/replace.c:302
+#: builtin/replace.c
 msgid "unable to write object to database"
 msgstr "無法向資料庫寫入物件"
 
-#: builtin/replace.c:325
+#: builtin/replace.c
 #, c-format
 msgid "unable to get object type for %s"
 msgstr "無法得到 %s 的物件類型"
 
-#: builtin/replace.c:341
+#: builtin/replace.c
 msgid "editing object file failed"
 msgstr "編輯物件檔案失敗"
 
-#: builtin/replace.c:350
+#: builtin/replace.c
 #, c-format
 msgid "new object is the same as the old one: '%s'"
 msgstr "新物件和舊物件相同：'%s'"
 
-#: builtin/replace.c:383
+#: builtin/replace.c
 #, c-format
 msgid "could not parse %s as a commit"
 msgstr "無法將 %s 解析為一個提交"
 
-#: builtin/replace.c:415
+#: builtin/replace.c
 #, c-format
 msgid "bad mergetag in commit '%s'"
 msgstr "提交 '%s' 中含有損壞的合併標籤"
 
-#: builtin/replace.c:417
+#: builtin/replace.c
 #, c-format
 msgid "malformed mergetag in commit '%s'"
 msgstr "提交 '%s' 中含有格式錯誤的合併標籤"
 
-#: builtin/replace.c:429
+#: builtin/replace.c
 #, c-format
 msgid ""
 "original commit '%s' contains mergetag '%s' that is discarded; use --edit "
 "instead of --graft"
 msgstr "原始提交 '%s' 包含已經捨棄的合併標籤 '%s'，使用 --edit 代替 --graft"
 
-#: builtin/replace.c:468
+#: builtin/replace.c
 #, c-format
 msgid "the original commit '%s' has a gpg signature"
 msgstr "原始提交 '%s' 中有一個 gpg 簽名"
 
-#: builtin/replace.c:469
+#: builtin/replace.c
 msgid "the signature will be removed in the replacement commit!"
 msgstr "在取代的提交中簽名將被移除！"
 
-#: builtin/replace.c:479
+#: builtin/replace.c
 #, c-format
 msgid "could not write replacement commit for: '%s'"
 msgstr "不能為 '%s' 寫取代提交"
 
-#: builtin/replace.c:487
+#: builtin/replace.c
 #, c-format
 msgid "graft for '%s' unnecessary"
 msgstr "對 '%s' 移植沒有必要"
 
-#: builtin/replace.c:491
+#: builtin/replace.c
 #, c-format
 msgid "new commit is the same as the old one: '%s'"
 msgstr "新提交和舊的一樣：'%s'"
 
-#: builtin/replace.c:526
+#: builtin/replace.c
 #, c-format
 msgid ""
 "could not convert the following graft(s):\n"
@@ -21461,214 +13375,213 @@ msgstr ""
 "不能轉換下列移植：\n"
 "%s"
 
-#: builtin/replace.c:547
+#: builtin/replace.c
 msgid "list replace refs"
 msgstr "列出取代的引用"
 
-#: builtin/replace.c:548
+#: builtin/replace.c
 msgid "delete replace refs"
 msgstr "刪除取代的引用"
 
-#: builtin/replace.c:549
+#: builtin/replace.c
 msgid "edit existing object"
 msgstr "編輯現存的物件"
 
-#: builtin/replace.c:550
+#: builtin/replace.c
 msgid "change a commit's parents"
 msgstr "修改一個提交的父提交"
 
-#: builtin/replace.c:551
+#: builtin/replace.c
 msgid "convert existing graft file"
 msgstr "轉換現存的移植檔案"
 
-#: builtin/replace.c:552
+#: builtin/replace.c
 msgid "replace the ref if it exists"
 msgstr "如果存在則取代引用"
 
-#: builtin/replace.c:554
+#: builtin/replace.c
 msgid "do not pretty-print contents for --edit"
 msgstr "不要為 --edit 動作美觀顯示內容"
 
-#: builtin/replace.c:555
+#: builtin/replace.c
 msgid "use this format"
 msgstr "使用此格式"
 
-#: builtin/replace.c:568
+#: builtin/replace.c
 msgid "--format cannot be used when not listing"
 msgstr "不列出時不能使用 --format"
 
-#: builtin/replace.c:576
+#: builtin/replace.c
 msgid "-f only makes sense when writing a replacement"
 msgstr "只有寫一個取代時 -f 才有意義"
 
-#: builtin/replace.c:580
+#: builtin/replace.c
 msgid "--raw only makes sense with --edit"
 msgstr "--raw 只有和 --edit 共用才有意義"
 
-#: builtin/replace.c:586
+#: builtin/replace.c
 msgid "-d needs at least one argument"
 msgstr "-d 需要至少一個參數"
 
-#: builtin/replace.c:592
+#: builtin/replace.c
 msgid "bad number of arguments"
 msgstr "錯誤的參數個數"
 
-#: builtin/replace.c:598
+#: builtin/replace.c
 msgid "-e needs exactly one argument"
 msgstr "-e 需要且僅需要一個參數"
 
-#: builtin/replace.c:604
+#: builtin/replace.c
 msgid "-g needs at least one argument"
 msgstr "-g 需要至少一個參數"
 
-#: builtin/replace.c:610
+#: builtin/replace.c
 msgid "--convert-graft-file takes no argument"
 msgstr "--convert-graft-file 不帶參數"
 
-#: builtin/replace.c:616
+#: builtin/replace.c
 msgid "only one pattern can be given with -l"
 msgstr "只能為 -l 提供一個模式"
 
-#: builtin/rerere.c:13
+#: builtin/rerere.c
 msgid "git rerere [clear | forget <path>... | status | remaining | diff | gc]"
 msgstr "git rerere [clear | forget <路徑>... | status | remaining | diff | gc]"
 
-#: builtin/rerere.c:58
+#: builtin/rerere.c
 msgid "register clean resolutions in index"
 msgstr "在索引中註冊乾淨的解決方案"
 
-#: builtin/rerere.c:77
+#: builtin/rerere.c
 msgid "'git rerere forget' without paths is deprecated"
 msgstr "沒有路徑的 'git rerere forget' 已經過時"
 
-#: builtin/rerere.c:111
+#: builtin/rerere.c
 #, c-format
 msgid "unable to generate diff for '%s'"
 msgstr "無法為 '%s' 生成差異"
 
-#: builtin/reset.c:33
+#: builtin/reset.c
 msgid ""
 "git reset [--mixed | --soft | --hard | --merge | --keep] [-q] [<commit>]"
 msgstr "git reset [--mixed | --soft | --hard | --merge | --keep] [-q] [<提交>]"
 
-#: builtin/reset.c:34
+#: builtin/reset.c
 msgid "git reset [-q] [<tree-ish>] [--] <pathspec>..."
 msgstr "git reset [-q] [<樹或提交>] [--] <路徑規格>..."
 
-#: builtin/reset.c:35
+#: builtin/reset.c
 msgid ""
 "git reset [-q] [--pathspec-from-file [--pathspec-file-nul]] [<tree-ish>]"
 msgstr ""
 "git reset [-q] [--pathspec-from-file [--pathspec-file-nul]] [<樹或提交>]"
 
-#: builtin/reset.c:36
+#: builtin/reset.c
 msgid "git reset --patch [<tree-ish>] [--] [<pathspec>...]"
 msgstr "git reset --patch [<樹或提交>] [--] [<路徑規格>...]"
 
-#: builtin/reset.c:42
+#: builtin/reset.c
 msgid "mixed"
 msgstr "混雜"
 
-#: builtin/reset.c:42
+#: builtin/reset.c
 msgid "soft"
 msgstr "軟性"
 
-#: builtin/reset.c:42
+#: builtin/reset.c
 msgid "hard"
 msgstr "硬性"
 
-#: builtin/reset.c:42
+#: builtin/reset.c
 msgid "merge"
 msgstr "合併"
 
-#: builtin/reset.c:42
+#: builtin/reset.c
 msgid "keep"
 msgstr "保持"
 
-#: builtin/reset.c:90
+#: builtin/reset.c
 msgid "You do not have a valid HEAD."
 msgstr "您沒有一個有效的 HEAD。"
 
-#: builtin/reset.c:92
+#: builtin/reset.c
 msgid "Failed to find tree of HEAD."
 msgstr "無法找到 HEAD 指向的樹。"
 
-#: builtin/reset.c:98
+#: builtin/reset.c
 #, c-format
 msgid "Failed to find tree of %s."
 msgstr "無法找到 %s 指向的樹。"
 
-#: builtin/reset.c:123
+#: builtin/reset.c
 #, c-format
 msgid "HEAD is now at %s"
 msgstr "HEAD 現在位於 %s"
 
 #  譯者：漢字之間無空格，故刪除%s前後空格
-#: builtin/reset.c:304
+#: builtin/reset.c
 #, c-format
 msgid "Cannot do a %s reset in the middle of a merge."
 msgstr "在合併過程中不能做%s重設動作。"
 
-#: builtin/reset.c:402 builtin/stash.c:606 builtin/stash.c:669
-#: builtin/stash.c:693
+#: builtin/reset.c builtin/stash.c
 msgid "be quiet, only report errors"
 msgstr "安靜模式，只報告錯誤"
 
-#: builtin/reset.c:404
+#: builtin/reset.c
 msgid "skip refreshing the index after reset"
 msgstr "重設後略過重新整理索引的步驟"
 
-#: builtin/reset.c:406
+#: builtin/reset.c
 msgid "reset HEAD and index"
 msgstr "重設 HEAD 和索引"
 
-#: builtin/reset.c:407
+#: builtin/reset.c
 msgid "reset only HEAD"
 msgstr "只重設 HEAD"
 
-#: builtin/reset.c:409 builtin/reset.c:411
+#: builtin/reset.c
 msgid "reset HEAD, index and working tree"
 msgstr "重設 HEAD、索引和工作區"
 
-#: builtin/reset.c:413
+#: builtin/reset.c
 msgid "reset HEAD but keep local changes"
 msgstr "重設 HEAD 但儲存本機變更"
 
-#: builtin/reset.c:419
+#: builtin/reset.c
 msgid "record only the fact that removed paths will be added later"
 msgstr "將刪除的路徑標記為稍後新增"
 
-#: builtin/reset.c:452
+#: builtin/reset.c
 #, c-format
 msgid "Failed to resolve '%s' as a valid revision."
 msgstr "無法將 '%s' 解析為一個有效的版本。"
 
-#: builtin/reset.c:460
+#: builtin/reset.c
 #, c-format
 msgid "Failed to resolve '%s' as a valid tree."
 msgstr "無法將 '%s' 解析為一個有效的樹狀物件。"
 
-#: builtin/reset.c:479
+#: builtin/reset.c
 msgid "--mixed with paths is deprecated; use 'git reset -- <paths>' instead."
 msgstr "--mixed 帶路徑已棄用，而是用 'git reset -- <路徑>'。"
 
 #  譯者：漢字之間無空格，故刪除%s前後空格
-#: builtin/reset.c:481
+#: builtin/reset.c
 #, c-format
 msgid "Cannot do %s reset with paths."
 msgstr "不能帶路徑進行%s重設。"
 
 #  譯者：漢字之間無空格，故刪除%s前後空格
-#: builtin/reset.c:496
+#: builtin/reset.c
 #, c-format
 msgid "%s reset is not allowed in a bare repository"
 msgstr "不能對純版本庫進行%s重設"
 
-#: builtin/reset.c:527
+#: builtin/reset.c
 msgid "Unstaged changes after reset:"
 msgstr "重設後取消暫存的變更："
 
-#: builtin/reset.c:530
+#: builtin/reset.c
 #, c-format
 msgid ""
 "It took %.2f seconds to refresh the index after reset.  You can use\n"
@@ -21677,53 +13590,58 @@ msgstr ""
 "重設後花費 %.2f 秒重新整理索引。\n"
 "您可以使用「--no-refresh」避開本步驟。"
 
-#: builtin/reset.c:547
+#: builtin/reset.c
 #, c-format
 msgid "Could not reset index file to revision '%s'."
 msgstr "不能重設索引檔案至版本 '%s'。"
 
-#: builtin/reset.c:552
+#: builtin/reset.c
 msgid "Could not write new index file."
 msgstr "不能寫入新的索引檔案。"
 
-#: builtin/rev-list.c:659
+#: builtin/rev-list.c pack-bitmap.c
+#, c-format
+msgid "unable to get disk usage of %s"
+msgstr "無法取得 %s 的磁碟用量"
+
+#: builtin/rev-list.c
 msgid "rev-list does not support display of notes"
 msgstr "rev-list 不支援顯示註解"
 
-#: builtin/rev-list.c:664
+#: builtin/rev-list.c
 #, c-format
 msgid "marked counting and '%s' cannot be used together"
 msgstr "標記計數 (marked counting) 與「%s」不得同時使用"
 
-#: builtin/rev-parse.c:409
+#: builtin/rev-parse.c
 msgid "git rev-parse --parseopt [<options>] -- [<args>...]"
 msgstr "git rev-parse --parseopt [<選項>] -- [<參數>...]"
 
-#: builtin/rev-parse.c:414
+#: builtin/rev-parse.c
 msgid "keep the `--` passed as an arg"
 msgstr "保持 `--` 作為一個參數傳遞"
 
-#: builtin/rev-parse.c:416
+#: builtin/rev-parse.c
 msgid "stop parsing after the first non-option argument"
 msgstr "遇到第一個非選項參數後停止解析"
 
-#: builtin/rev-parse.c:419
+#: builtin/rev-parse.c
 msgid "output in stuck long form"
 msgstr "以固定長格式輸出"
 
-#: builtin/rev-parse.c:438
+#: builtin/rev-parse.c
 msgid "premature end of input"
 msgstr "輸入過早到達結尾"
 
-#: builtin/rev-parse.c:442
+#: builtin/rev-parse.c
 msgid "no usage string given before the `--' separator"
 msgstr "「--」分隔符號前未提供用法字串"
 
-#: builtin/rev-parse.c:548
+#: builtin/rev-parse.c
 msgid "Needed a single revision"
 msgstr "需要一個修訂版本"
 
-#: builtin/rev-parse.c:552
+#: builtin/rev-parse.c
 msgid ""
 "git rev-parse --parseopt [<options>] -- [<args>...]\n"
 "   or: git rev-parse --sq-quote [<arg>...]\n"
@@ -21737,145 +13655,153 @@ msgstr ""
 "\n"
 "初次使用時執行 \"git rev-parse --parseopt -h\" 來獲得更多訊息。"
 
-#: builtin/rev-parse.c:712
+#: builtin/rev-parse.c
 msgid "--resolve-git-dir requires an argument"
 msgstr "--resolve-git-dir 需要 1 個引數"
 
-#: builtin/rev-parse.c:715
+#: builtin/rev-parse.c
 #, c-format
 msgid "not a gitdir '%s'"
 msgstr "'%s' 不是 git 目錄"
 
-#: builtin/rev-parse.c:739
+#: builtin/rev-parse.c
 msgid "--git-path requires an argument"
 msgstr "--git-path 需要 1 個引數"
 
-#: builtin/rev-parse.c:749
+#: builtin/rev-parse.c
 msgid "-n requires an argument"
 msgstr "-n 需要 1 個引數"
 
-#: builtin/rev-parse.c:763
+#: builtin/rev-parse.c
 msgid "--path-format requires an argument"
 msgstr "--path-format 需要 1 個引數"
 
-#: builtin/rev-parse.c:769
+#: builtin/rev-parse.c
 #, c-format
 msgid "unknown argument to --path-format: %s"
 msgstr "傳入 --path-format 的引數未知：%s"
 
-#: builtin/rev-parse.c:776
+#: builtin/rev-parse.c
 msgid "--default requires an argument"
 msgstr "--default 需要 1 個引數"
 
-#: builtin/rev-parse.c:782
+#: builtin/rev-parse.c
 msgid "--prefix requires an argument"
 msgstr "--prefix 需要 1 個引數"
 
-#: builtin/rev-parse.c:851
+#: builtin/rev-parse.c
 #, c-format
 msgid "unknown mode for --abbrev-ref: %s"
 msgstr "--abbrev-ref 的模式未知：%s"
 
-#: builtin/rev-parse.c:1023
+#: builtin/rev-parse.c setup.c
+msgid "this operation must be run in a work tree"
+msgstr "該動作必須在一個工作區中執行"
+
+#: builtin/rev-parse.c
 #, c-format
 msgid "unknown mode for --show-object-format: %s"
 msgstr "--show-object-format 的模式未知：%s"
 
-#: builtin/revert.c:24
+#: builtin/revert.c
 msgid "git revert [<options>] <commit-ish>..."
 msgstr "git revert [<選項>] <提交號>..."
 
-#: builtin/revert.c:25
+#: builtin/revert.c
 msgid "git revert <subcommand>"
 msgstr "git revert <子指令>"
 
-#: builtin/revert.c:30
+#: builtin/revert.c
 msgid "git cherry-pick [<options>] <commit-ish>..."
 msgstr "git cherry-pick [<選項>] <提交號>..."
 
-#: builtin/revert.c:31
+#: builtin/revert.c
 msgid "git cherry-pick <subcommand>"
 msgstr "git cherry-pick <子指令>"
 
-#: builtin/revert.c:72
+#: builtin/revert.c
 #, c-format
 msgid "option `%s' expects a number greater than zero"
 msgstr "選項 `%s' 期望一個大於零的數字"
 
-#: builtin/revert.c:92
+#: builtin/revert.c
 #, c-format
 msgid "%s: %s cannot be used with %s"
 msgstr "%s：%s 不能和 %s 同時使用"
 
-#: builtin/revert.c:102
+#: builtin/revert.c
 msgid "end revert or cherry-pick sequence"
 msgstr "終止反轉或揀選動作"
 
-#: builtin/revert.c:103
+#: builtin/revert.c
 msgid "resume revert or cherry-pick sequence"
 msgstr "繼續反轉或揀選動作"
 
-#: builtin/revert.c:104
+#: builtin/revert.c
 msgid "cancel revert or cherry-pick sequence"
 msgstr "取消反轉或揀選動作"
 
-#: builtin/revert.c:105
+#: builtin/revert.c
 msgid "skip current commit and continue"
 msgstr "略過目前提交並繼續"
 
-#: builtin/revert.c:107
+#: builtin/revert.c
 msgid "don't automatically commit"
 msgstr "不要自動提交"
 
-#: builtin/revert.c:108
+#: builtin/revert.c
 msgid "edit the commit message"
 msgstr "編輯提交說明"
 
-#: builtin/revert.c:111
+#: builtin/revert.c
 msgid "parent-number"
 msgstr "父編號"
 
-#: builtin/revert.c:112
+#: builtin/revert.c
 msgid "select mainline parent"
 msgstr "選擇主幹父提交編號"
 
-#: builtin/revert.c:114
+#: builtin/revert.c
 msgid "merge strategy"
 msgstr "合併策略"
 
-#: builtin/revert.c:116
+#: builtin/revert.c
 msgid "option for merge strategy"
 msgstr "合併策略的選項"
 
-#: builtin/revert.c:125
+#: builtin/revert.c
 msgid "append commit name"
 msgstr "追加提交名稱"
 
-#: builtin/revert.c:127
+#: builtin/revert.c
 msgid "preserve initially empty commits"
 msgstr "保留初始化的空提交"
 
-#: builtin/revert.c:128
+#: builtin/revert.c
 msgid "allow commits with empty messages"
 msgstr "允許提交說明為空"
 
-#: builtin/revert.c:129
+#: builtin/revert.c
 msgid "keep redundant, empty commits"
 msgstr "保持多餘的、空的提交"
 
-#: builtin/revert.c:241
+#: builtin/revert.c
+msgid "use the 'reference' format to refer to commits"
+msgstr "請使用 “reference” 格式參考提交"
+
+#: builtin/revert.c
 msgid "revert failed"
 msgstr "還原失敗"
 
-#: builtin/revert.c:254
+#: builtin/revert.c
 msgid "cherry-pick failed"
 msgstr "揀選失敗"
 
-#: builtin/rm.c:20
+#: builtin/rm.c
 msgid "git rm [<options>] [--] <file>..."
 msgstr "git rm [<選項>] [--] <檔案>..."
 
-#: builtin/rm.c:208
+#: builtin/rm.c
 msgid ""
 "the following file has staged content different from both the\n"
 "file and the HEAD:"
@@ -21884,7 +13810,7 @@ msgid_plural ""
 "file and the HEAD:"
 msgstr[0] "如下檔案其暫存的內容和工作區及 HEAD 中的都不一樣："
 
-#: builtin/rm.c:213
+#: builtin/rm.c
 msgid ""
 "\n"
 "(use -f to force removal)"
@@ -21892,12 +13818,12 @@ msgstr ""
 "\n"
 "（使用 -f 強制刪除）"
 
-#: builtin/rm.c:217
+#: builtin/rm.c
 msgid "the following file has changes staged in the index:"
 msgid_plural "the following files have changes staged in the index:"
 msgstr[0] "下列檔案有暫存在索引的變更："
 
-#: builtin/rm.c:221 builtin/rm.c:230
+#: builtin/rm.c
 msgid ""
 "\n"
 "(use --cached to keep the file, or -f to force removal)"
@@ -21905,50 +13831,50 @@ msgstr ""
 "\n"
 "（使用 --cached 保留本機檔案，或用 -f 強制刪除）"
 
-#: builtin/rm.c:227
+#: builtin/rm.c
 msgid "the following file has local modifications:"
 msgid_plural "the following files have local modifications:"
 msgstr[0] "如下檔案有本機修改："
 
-#: builtin/rm.c:245
+#: builtin/rm.c
 msgid "do not list removed files"
 msgstr "不列出刪除的檔案"
 
-#: builtin/rm.c:246
+#: builtin/rm.c
 msgid "only remove from the index"
 msgstr "只從索引區刪除"
 
-#: builtin/rm.c:247
+#: builtin/rm.c
 msgid "override the up-to-date check"
 msgstr "忽略檔案更新狀態檢查"
 
-#: builtin/rm.c:248
+#: builtin/rm.c
 msgid "allow recursive removal"
 msgstr "允許遞迴刪除"
 
-#: builtin/rm.c:250
+#: builtin/rm.c
 msgid "exit with a zero status even if nothing matched"
 msgstr "即使沒有符合，也以零狀態離開"
 
-#: builtin/rm.c:285
+#: builtin/rm.c
 msgid "No pathspec was given. Which files should I remove?"
 msgstr "沒有提供路徑規格。我該移除哪個檔案？"
 
-#: builtin/rm.c:315
+#: builtin/rm.c
 msgid "please stage your changes to .gitmodules or stash them to proceed"
 msgstr "請將您的修改暫存到 .gitmodules 中或儲藏後再繼續"
 
-#: builtin/rm.c:337
+#: builtin/rm.c
 #, c-format
 msgid "not removing '%s' recursively without -r"
 msgstr "未提供 -r 選項不會遞迴刪除 '%s'"
 
-#: builtin/rm.c:385
+#: builtin/rm.c
 #, c-format
 msgid "git rm: unable to remove %s"
 msgstr "git rm：不能刪除 %s"
 
-#: builtin/send-pack.c:20
+#: builtin/send-pack.c
 msgid ""
 "git send-pack [--mirror] [--dry-run] [--force]\n"
 "              [--receive-pack=<git-receive-pack>]\n"
@@ -21960,80 +13886,80 @@ msgstr ""
 "              [--verbose] [--thin] [--atomic]\n"
 "              [<主機>:]<目錄> (--all | <引用>...)"
 
-#: builtin/send-pack.c:192
+#: builtin/send-pack.c
 msgid "remote name"
 msgstr "遠端名稱"
 
-#: builtin/send-pack.c:205
+#: builtin/send-pack.c
 msgid "use stateless RPC protocol"
 msgstr "使用無狀態的 RPC 協定"
 
-#: builtin/send-pack.c:206
+#: builtin/send-pack.c
 msgid "read refs from stdin"
 msgstr "從標準輸入讀取引用"
 
-#: builtin/send-pack.c:207
+#: builtin/send-pack.c
 msgid "print status from remote helper"
 msgstr "列印來自遠端 helper 的狀態"
 
-#: builtin/shortlog.c:16
+#: builtin/shortlog.c
 msgid "git shortlog [<options>] [<revision-range>] [[--] <path>...]"
 msgstr "git shortlog [<選項>] [<版本範圍>] [[--] <路徑>...]"
 
-#: builtin/shortlog.c:17
+#: builtin/shortlog.c
 msgid "git log --pretty=short | git shortlog [<options>]"
 msgstr "git log --pretty=short | git shortlog [<選項>]"
 
-#: builtin/shortlog.c:123
+#: builtin/shortlog.c
 msgid "using multiple --group options with stdin is not supported"
 msgstr "不支援在標準輸入使用多個 --group 選項"
 
-#: builtin/shortlog.c:133
+#: builtin/shortlog.c
 msgid "using --group=trailer with stdin is not supported"
 msgstr "不支援在標準輸入使用 --group=trailer"
 
-#: builtin/shortlog.c:323
+#: builtin/shortlog.c
 #, c-format
 msgid "unknown group type: %s"
 msgstr "未知群組類型：%s"
 
-#: builtin/shortlog.c:351
+#: builtin/shortlog.c
 msgid "group by committer rather than author"
 msgstr "依提交者而非作者分組"
 
-#: builtin/shortlog.c:354
+#: builtin/shortlog.c
 msgid "sort output according to the number of commits per author"
 msgstr "根據每個作者的提交數量排序"
 
-#: builtin/shortlog.c:356
+#: builtin/shortlog.c
 msgid "suppress commit descriptions, only provides commit count"
 msgstr "隱藏提交說明，只提供提交數量"
 
-#: builtin/shortlog.c:358
+#: builtin/shortlog.c
 msgid "show the email address of each author"
 msgstr "顯示每個作者的電子信件位址"
 
-#: builtin/shortlog.c:359
+#: builtin/shortlog.c
 msgid "<w>[,<i1>[,<i2>]]"
 msgstr "<w>[,<i1>[,<i2>]]"
 
-#: builtin/shortlog.c:360
+#: builtin/shortlog.c
 msgid "linewrap output"
 msgstr "折行輸出"
 
-#: builtin/shortlog.c:362
+#: builtin/shortlog.c
 msgid "field"
 msgstr "欄位"
 
-#: builtin/shortlog.c:363
+#: builtin/shortlog.c
 msgid "group by field"
 msgstr "依欄位分組"
 
-#: builtin/shortlog.c:395
+#: builtin/shortlog.c
 msgid "too many arguments given outside repository"
 msgstr "版本庫外執行提供了太多的參數"
 
-#: builtin/show-branch.c:14
+#: builtin/show-branch.c
 msgid ""
 "git show-branch [-a | --all] [-r | --remotes] [--topo-order | --date-order]\n"
 "                [--current] [--color[=<when>] | --no-color] [--sparse]\n"
@@ -22046,129 +13972,129 @@ msgstr ""
 "                [--no-name | --sha1-name] [--topics] [(<版本> | <萬用字元"
 ">)...]"
 
-#: builtin/show-branch.c:18
+#: builtin/show-branch.c
 msgid "git show-branch (-g | --reflog)[=<n>[,<base>]] [--list] [<ref>]"
 msgstr "git show-branch (-g | --reflog)[=<n>[,<起始點>]] [--list] [<引用>]"
 
-#: builtin/show-branch.c:396
+#: builtin/show-branch.c
 #, c-format
 msgid "ignoring %s; cannot handle more than %d ref"
 msgid_plural "ignoring %s; cannot handle more than %d refs"
 msgstr[0] "忽略 %s，無法處理 %d 個以上的引用"
 
-#: builtin/show-branch.c:548
+#: builtin/show-branch.c
 #, c-format
 msgid "no matching refs with %s"
 msgstr "沒有和 %s 符合的引用"
 
-#: builtin/show-branch.c:645
+#: builtin/show-branch.c
 msgid "show remote-tracking and local branches"
 msgstr "顯示遠端追蹤的和本機的分支"
 
-#: builtin/show-branch.c:647
+#: builtin/show-branch.c
 msgid "show remote-tracking branches"
 msgstr "顯示遠端追蹤的分支"
 
-#: builtin/show-branch.c:649
+#: builtin/show-branch.c
 msgid "color '*!+-' corresponding to the branch"
 msgstr "著色 '*!+-' 到相應的分支"
 
-#: builtin/show-branch.c:651
+#: builtin/show-branch.c
 msgid "show <n> more commits after the common ancestor"
 msgstr "顯示共同祖先後的 <n> 個提交"
 
-#: builtin/show-branch.c:653
+#: builtin/show-branch.c
 msgid "synonym to more=-1"
 msgstr "和 more=-1 同義"
 
-#: builtin/show-branch.c:654
+#: builtin/show-branch.c
 msgid "suppress naming strings"
 msgstr "不顯示字串命名"
 
-#: builtin/show-branch.c:656
+#: builtin/show-branch.c
 msgid "include the current branch"
 msgstr "包括目前分支"
 
-#: builtin/show-branch.c:658
+#: builtin/show-branch.c
 msgid "name commits with their object names"
 msgstr "以物件名字命名提交"
 
-#: builtin/show-branch.c:660
+#: builtin/show-branch.c
 msgid "show possible merge bases"
 msgstr "顯示可能合併的基礎"
 
-#: builtin/show-branch.c:662
+#: builtin/show-branch.c
 msgid "show refs unreachable from any other ref"
 msgstr "顯示沒有任何引用的的引用"
 
-#: builtin/show-branch.c:664
+#: builtin/show-branch.c
 msgid "show commits in topological order"
 msgstr "以拓撲順序顯示提交"
 
-#: builtin/show-branch.c:667
+#: builtin/show-branch.c
 msgid "show only commits not on the first branch"
 msgstr "只顯示不在第一個分支上的提交"
 
-#: builtin/show-branch.c:669
+#: builtin/show-branch.c
 msgid "show merges reachable from only one tip"
 msgstr "顯示僅一個分支可存取的合併提交"
 
-#: builtin/show-branch.c:671
+#: builtin/show-branch.c
 msgid "topologically sort, maintaining date order where possible"
 msgstr "拓撲方式排序，並儘可能地保持日期順序"
 
-#: builtin/show-branch.c:674
+#: builtin/show-branch.c
 msgid "<n>[,<base>]"
 msgstr "<n>[,<base>]"
 
-#: builtin/show-branch.c:675
+#: builtin/show-branch.c
 msgid "show <n> most recent ref-log entries starting at base"
 msgstr "顯示從起始點開始的 <n> 條最近的引用日誌記錄"
 
-#: builtin/show-branch.c:735
+#: builtin/show-branch.c
 msgid "no branches given, and HEAD is not valid"
 msgstr "未提供分支，且 HEAD 無效"
 
-#: builtin/show-branch.c:738
+#: builtin/show-branch.c
 msgid "--reflog option needs one branch name"
 msgstr "選項 --reflog 需要一個分支名"
 
-#: builtin/show-branch.c:741
+#: builtin/show-branch.c
 #, 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
 #, c-format
 msgid "no such ref %s"
 msgstr "無此引用 %s"
 
-#: builtin/show-branch.c:831
+#: builtin/show-branch.c
 #, 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
 #, c-format
 msgid "'%s' is not a valid ref."
 msgstr "'%s' 不是一個有效的引用。"
 
-#: builtin/show-branch.c:838
+#: builtin/show-branch.c
 #, c-format
 msgid "cannot find commit %s (%s)"
 msgstr "不能找到提交 %s（%s）"
 
-#: builtin/show-index.c:21
+#: builtin/show-index.c
 msgid "hash-algorithm"
 msgstr "雜湊算法"
 
-#: builtin/show-index.c:31
+#: builtin/show-index.c
 msgid "Unknown hash algorithm"
 msgstr "未知的雜湊算法"
 
-#: builtin/show-ref.c:12
+#: builtin/show-ref.c
 msgid ""
 "git show-ref [-q | --quiet] [--verify] [--head] [-d | --dereference] [-s | --"
 "hash[=<n>]] [--abbrev[=<n>]] [--tags] [--heads] [--] [<pattern>...]"
@@ -22176,126 +14102,129 @@ msgstr ""
 "git show-ref [-q | --quiet] [--verify] [--head] [-d | --dereference] [-s | --"
 "hash[=<n>]] [--abbrev[=<n>]] [--tags] [--heads] [--] [<模式>...]"
 
-#: builtin/show-ref.c:13
+#: builtin/show-ref.c
 msgid "git show-ref --exclude-existing[=<pattern>]"
 msgstr "git show-ref --exclude-existing[=<模式>]"
 
-#: builtin/show-ref.c:162
+#: builtin/show-ref.c
 msgid "only show tags (can be combined with heads)"
 msgstr "只顯示標籤（可以和頭共用）"
 
-#: builtin/show-ref.c:163
+#: builtin/show-ref.c
 msgid "only show heads (can be combined with tags)"
 msgstr "只顯示頭（可以和標籤共用）"
 
-#: builtin/show-ref.c:164
+#: builtin/show-ref.c
 msgid "stricter reference checking, requires exact ref path"
 msgstr "更嚴格的引用檢測，需要精確的引用路徑"
 
-#: builtin/show-ref.c:167 builtin/show-ref.c:169
+#: builtin/show-ref.c
 msgid "show the HEAD reference, even if it would be filtered out"
 msgstr "顯示 HEAD 引用，即使被過濾掉"
 
-#: builtin/show-ref.c:171
+#: builtin/show-ref.c
 msgid "dereference tags into object IDs"
 msgstr "轉換標籤到物件 ID"
 
-#: builtin/show-ref.c:173
+#: builtin/show-ref.c
 msgid "only show SHA1 hash using <n> digits"
 msgstr "只顯示使用 <n> 個數字的 SHA1 雜湊"
 
-#: builtin/show-ref.c:177
+#: builtin/show-ref.c
 msgid "do not print results to stdout (useful with --verify)"
 msgstr "不列印結果到標準輸出（例如與 --verify 參數共用）"
 
-#: builtin/show-ref.c:179
+#: builtin/show-ref.c
 msgid "show refs from stdin that aren't in local repository"
 msgstr "顯示從標準輸入中讀入的不在本機版本庫中的引用"
 
-#: builtin/sparse-checkout.c:23
+#: builtin/sparse-checkout.c
 msgid "git sparse-checkout (init|list|set|add|reapply|disable) <options>"
 msgstr "git sparse-checkout (init|list|set|add|reapply|disable) <選項>"
 
-#: builtin/sparse-checkout.c:61
+#: builtin/sparse-checkout.c
 msgid "this worktree is not sparse"
 msgstr "這不是稀疏工作區"
 
-#: builtin/sparse-checkout.c:76
+#: builtin/sparse-checkout.c
 msgid "this worktree is not sparse (sparse-checkout file may not exist)"
 msgstr "這不是稀疏工作區（sparse-checkout 檔案可能不存在）"
 
-#: builtin/sparse-checkout.c:177
+#: builtin/sparse-checkout.c
 #, c-format
 msgid ""
 "directory '%s' contains untracked files, but is not in the sparse-checkout "
 "cone"
 msgstr "「%s」目錄有未追蹤的檔案，但不在稀疏提交的 cone 中"
 
-#: builtin/sparse-checkout.c:185
+#: builtin/sparse-checkout.c
 #, c-format
 msgid "failed to remove directory '%s'"
 msgstr "無法移除 '%s' 目錄"
 
-#: builtin/sparse-checkout.c:327
+#: builtin/sparse-checkout.c
 msgid "failed to create directory for sparse-checkout file"
 msgstr "無法建立稀疏簽出檔案的目錄"
 
-#: builtin/sparse-checkout.c:366
+#: builtin/sparse-checkout.c
 msgid "failed to initialize worktree config"
 msgstr "無法初始化工作區組態"
 
-#: builtin/sparse-checkout.c:411
+#: builtin/sparse-checkout.c
 msgid "failed to modify sparse-index config"
 msgstr "無法修改稀疏索引設定"
 
-#: builtin/sparse-checkout.c:441 builtin/sparse-checkout.c:793
-#: builtin/sparse-checkout.c:847
+#: builtin/sparse-checkout.c
 msgid "initialize the sparse-checkout in cone mode"
 msgstr "以 cone 模式初始化稀疏簽出"
 
-#: builtin/sparse-checkout.c:443 builtin/sparse-checkout.c:795
-#: builtin/sparse-checkout.c:849
+#: builtin/sparse-checkout.c
 msgid "toggle the use of a sparse index"
 msgstr "切換是否使用稀疏索引"
 
-#: builtin/sparse-checkout.c:479
+#: builtin/sparse-checkout.c commit-graph.c midx.c
+#, c-format
+msgid "unable to create leading directories of %s"
+msgstr "不能為 %s 建立先導目錄"
+
+#: builtin/sparse-checkout.c
 #, c-format
 msgid "failed to open '%s'"
 msgstr "無法開啟「%s」"
 
-#: builtin/sparse-checkout.c:531
+#: builtin/sparse-checkout.c
 #, c-format
 msgid "could not normalize path %s"
 msgstr "無法標準化路徑 %s"
 
-#: builtin/sparse-checkout.c:560
+#: builtin/sparse-checkout.c
 #, c-format
 msgid "unable to unquote C-style string '%s'"
 msgstr "無法去掉 '%s' C 樣式字串的引號"
 
-#: builtin/sparse-checkout.c:615 builtin/sparse-checkout.c:643
+#: builtin/sparse-checkout.c
 msgid "unable to load existing sparse-checkout patterns"
 msgstr "無法載入現存的稀疏簽出樣式"
 
-#: builtin/sparse-checkout.c:619
+#: builtin/sparse-checkout.c
 msgid "existing sparse-checkout patterns do not use cone mode"
 msgstr "現有的稀疏簽出樣式不使用 cone 模式"
 
-#: builtin/sparse-checkout.c:707
+#: builtin/sparse-checkout.c
 msgid "please run from the toplevel directory in non-cone mode"
 msgstr "請從上層目錄，以非 cone 模式執行"
 
-#: builtin/sparse-checkout.c:712
+#: builtin/sparse-checkout.c
 msgid "specify directories rather than patterns (no leading slash)"
 msgstr "指定目錄而非模式（沒有前置斜線）"
 
-#: builtin/sparse-checkout.c:714
+#: builtin/sparse-checkout.c
 msgid ""
 "specify directories rather than patterns.  If your directory starts with a "
 "'!', pass --skip-checks"
 msgstr "指定目錄而非模式。若您的目錄是以「!」開頭，請傳入 --skip-checks"
 
-#: builtin/sparse-checkout.c:716
+#: builtin/sparse-checkout.c
 msgid ""
 "specify directories rather than patterns.  If your directory really has any "
 "of '*?[]\\' in it, pass --skip-checks"
@@ -22303,14 +14232,14 @@ msgstr ""
 "指定目錄而非模式。若您的目錄名稱真的包含「*?[]\\」其中一個，請傳入 --skip-"
 "checks"
 
-#: builtin/sparse-checkout.c:732
+#: builtin/sparse-checkout.c
 #, c-format
 msgid ""
 "'%s' is not a directory; to treat it as a directory anyway, rerun with --"
 "skip-checks"
 msgstr "「%s」不是目錄。若要仍將其視作目錄，請重新傳入 --skip-checks 執行"
 
-#: builtin/sparse-checkout.c:734
+#: builtin/sparse-checkout.c
 #, c-format
 msgid ""
 "pass a leading slash before paths such as '%s' if you want a single file "
@@ -22319,24 +14248,24 @@ msgstr ""
 "若您想要單一檔案，請在目錄前打上斜線，如「%s」（見 git-sparse-checkout 手冊"
 "〈NON-CONE PROBLEMS〉一節）。"
 
-#: builtin/sparse-checkout.c:739
+#: builtin/sparse-checkout.c
 msgid "git sparse-checkout add [--skip-checks] (--stdin | <patterns>)"
 msgstr "git sparse-checkout add [--skip-checks] (--stdin | <patterns>)"
 
-#: builtin/sparse-checkout.c:752 builtin/sparse-checkout.c:797
+#: builtin/sparse-checkout.c
 msgid ""
 "skip some sanity checks on the given paths that might give false positives"
 msgstr "在可能給出誤判結果的指定目錄，略過某些完整性檢查"
 
-#: builtin/sparse-checkout.c:755 builtin/sparse-checkout.c:800
+#: builtin/sparse-checkout.c
 msgid "read patterns from standard in"
 msgstr "從標準輸入讀取樣式"
 
-#: builtin/sparse-checkout.c:760
+#: builtin/sparse-checkout.c
 msgid "no sparse-checkout to add to"
 msgstr "沒有要加入之稀疏簽出"
 
-#: builtin/sparse-checkout.c:775
+#: builtin/sparse-checkout.c
 msgid ""
 "git sparse-checkout set [--[no-]cone] [--[no-]sparse-index] [--skip-checks] "
 "(--stdin | <patterns>)"
@@ -22344,35 +14273,35 @@ msgstr ""
 "git sparse-checkout set [--[no-]cone] [--[no-]sparse-index] [--skip-checks] "
 "(--stdin | <patterns>)"
 
-#: builtin/sparse-checkout.c:854
+#: builtin/sparse-checkout.c
 msgid "must be in a sparse-checkout to reapply sparsity patterns"
 msgstr "必須在稀疏提交才能重新套用稀疏樣式 (sparsity pattern)"
 
-#: builtin/sparse-checkout.c:914
+#: builtin/sparse-checkout.c
 msgid "error while refreshing working directory"
 msgstr "重新整理工作目錄時發生錯誤"
 
-#: builtin/stash.c:24 builtin/stash.c:40
+#: builtin/stash.c
 msgid "git stash list [<options>]"
 msgstr "git stash list [<選項>]"
 
-#: builtin/stash.c:25 builtin/stash.c:45
+#: builtin/stash.c
 msgid "git stash show [<options>] [<stash>]"
 msgstr "git stash show [<選項>] [<stash>]"
 
-#: builtin/stash.c:26 builtin/stash.c:50
+#: builtin/stash.c
 msgid "git stash drop [-q|--quiet] [<stash>]"
 msgstr "git stash drop [-q|--quiet] [<stash>]"
 
-#: builtin/stash.c:27
+#: builtin/stash.c
 msgid "git stash ( pop | apply ) [--index] [-q|--quiet] [<stash>]"
 msgstr "git stash ( pop | apply ) [--index] [-q|--quiet] [<stash>]"
 
-#: builtin/stash.c:28 builtin/stash.c:65
+#: builtin/stash.c
 msgid "git stash branch <branchname> [<stash>]"
 msgstr "git stash branch <分支名> [<stash>]"
 
-#: builtin/stash.c:30
+#: builtin/stash.c
 msgid ""
 "git stash [push [-p|--patch] [-S|--staged] [-k|--[no-]keep-index] [-q|--"
 "quiet]\n"
@@ -22386,7 +14315,7 @@ msgstr ""
 "          [--pathspec-from-file=<檔案> [--pathspec-file-nul]]\n"
 "          [--] [<路徑規格>...]]"
 
-#: builtin/stash.c:34
+#: builtin/stash.c
 msgid ""
 "git stash save [-p|--patch] [-S|--staged] [-k|--[no-]keep-index] [-q|--"
 "quiet]\n"
@@ -22396,19 +14325,19 @@ msgstr ""
 "quiet]\n"
 "          [-u|--include-untracked] [-a|--all] [<訊息>]"
 
-#: builtin/stash.c:55
+#: builtin/stash.c
 msgid "git stash pop [--index] [-q|--quiet] [<stash>]"
 msgstr "git stash pop [--index] [-q|--quiet] [<stash>]"
 
-#: builtin/stash.c:60
+#: builtin/stash.c
 msgid "git stash apply [--index] [-q|--quiet] [<stash>]"
 msgstr "git stash apply [--index] [-q|--quiet] [<stash>]"
 
-#: builtin/stash.c:75
+#: builtin/stash.c
 msgid "git stash store [-m|--message <message>] [-q|--quiet] <commit>"
 msgstr "git stash store [-m|--message <消息>] [-q|--quiet] <提交>"
 
-#: builtin/stash.c:80
+#: builtin/stash.c
 msgid ""
 "git stash [push [-p|--patch] [-k|--[no-]keep-index] [-q|--quiet]\n"
 "          [-u|--include-untracked] [-a|--all] [-m|--message <message>]\n"
@@ -22418,7 +14347,7 @@ msgstr ""
 "          [-u|--include-untracked] [-a|--all] [-m|--message <消息>]\n"
 "          [--] [<路徑規格>...]]"
 
-#: builtin/stash.c:87
+#: builtin/stash.c
 msgid ""
 "git stash save [-p|--patch] [-k|--[no-]keep-index] [-q|--quiet]\n"
 "               [-u|--include-untracked] [-a|--all] [<message>]"
@@ -22426,30 +14355,30 @@ msgstr ""
 "git stash save [-p|--patch] [-k|--[no-]keep-index] [-q|--quiet]\n"
 "               [-u|--include-untracked] [-a|--all] [<消息>]"
 
-#: builtin/stash.c:130
+#: builtin/stash.c
 #, c-format
 msgid "'%s' is not a stash-like commit"
 msgstr "'%s' 不像是一個儲藏提交"
 
-#: builtin/stash.c:150
+#: builtin/stash.c
 #, c-format
 msgid "Too many revisions specified:%s"
 msgstr "指定了太多的版本：%s"
 
-#: builtin/stash.c:164
+#: builtin/stash.c
 msgid "No stash entries found."
 msgstr "未發現儲藏條目。"
 
-#: builtin/stash.c:178
+#: builtin/stash.c
 #, c-format
 msgid "%s is not a valid reference"
 msgstr "%s 不是一個有效的引用名"
 
-#: builtin/stash.c:227
+#: builtin/stash.c
 msgid "git stash clear with arguments is unimplemented"
 msgstr "尚未實作傳入參數的 git stash clear"
 
-#: builtin/stash.c:447
+#: builtin/stash.c
 #, c-format
 msgid ""
 "WARNING: Untracked file in way of tracked file!  Renaming\n"
@@ -22460,226 +14389,220 @@ msgstr ""
 "            %s -> %s\n"
 "         以騰出空間留給追蹤檔案。\n"
 
-#: builtin/stash.c:508
+#: builtin/stash.c
 msgid "cannot apply a stash in the middle of a merge"
 msgstr "無法在合併過程套用儲藏"
 
-#: builtin/stash.c:519
+#: builtin/stash.c
 #, c-format
 msgid "could not generate diff %s^!."
 msgstr "無法生成差異 %s^!."
 
-#: builtin/stash.c:526
+#: builtin/stash.c
 msgid "conflicts in index. Try without --index."
 msgstr "索引中有衝突。請試試看不用 --index。"
 
-#: builtin/stash.c:532
+#: builtin/stash.c
 msgid "could not save index tree"
 msgstr "不能儲存索引樹"
 
-#: builtin/stash.c:552
+#: builtin/stash.c
 #, c-format
 msgid "Merging %s with %s"
 msgstr "正在合併 %s 和 %s"
 
-#: builtin/stash.c:562
+#: builtin/stash.c
 msgid "Index was not unstashed."
 msgstr "索引未從儲藏中復原。"
 
-#: builtin/stash.c:576
+#: builtin/stash.c
 msgid "could not restore untracked files from stash"
 msgstr "無法從儲藏條目中復原未追蹤檔案"
 
-#: builtin/stash.c:608 builtin/stash.c:695
+#: builtin/stash.c
 msgid "attempt to recreate the index"
 msgstr "嘗試重建索引"
 
-#: builtin/stash.c:641
+#: builtin/stash.c
 #, c-format
 msgid "Dropped %s (%s)"
 msgstr "捨棄了 %s（%s）"
 
-#: builtin/stash.c:644
+#: builtin/stash.c
 #, c-format
 msgid "%s: Could not drop stash entry"
 msgstr "%s：無法捨棄儲藏條目"
 
-#: builtin/stash.c:657
+#: builtin/stash.c
 #, c-format
 msgid "'%s' is not a stash reference"
 msgstr "'%s' 不是一個儲藏引用"
 
-#: builtin/stash.c:707
+#: builtin/stash.c
 msgid "The stash entry is kept in case you need it again."
 msgstr "儲藏條目被保留以備您再次需要。"
 
-#: builtin/stash.c:730
+#: builtin/stash.c
 msgid "No branch name specified"
 msgstr "未指定分支名"
 
-#: builtin/stash.c:809
+#: builtin/stash.c
 msgid "failed to parse tree"
 msgstr "無法解析樹"
 
-#: builtin/stash.c:820
+#: builtin/stash.c
 msgid "failed to unpack trees"
 msgstr "無法解包樹"
 
-#: builtin/stash.c:840
+#: builtin/stash.c
 msgid "include untracked files in the stash"
 msgstr "在儲藏區包含未追蹤檔案"
 
-#: builtin/stash.c:843
+#: builtin/stash.c
 msgid "only show untracked files in the stash"
 msgstr "只在儲藏區顯示未追蹤檔案"
 
-#: builtin/stash.c:930 builtin/stash.c:967
+#: builtin/stash.c
 #, c-format
 msgid "Cannot update %s with %s"
 msgstr "無法用 %2$s 更新 %1$s"
 
-#: builtin/stash.c:948 builtin/stash.c:1667 builtin/stash.c:1739
+#: builtin/stash.c
 msgid "stash message"
 msgstr "儲藏說明"
 
-#: builtin/stash.c:958
+#: builtin/stash.c
 msgid "\"git stash store\" requires one <commit> argument"
 msgstr "\"git stash store\" 需要一個 <提交> 參數"
 
-#: builtin/stash.c:1143
+#: builtin/stash.c
 msgid "No staged changes"
 msgstr "無暫存變更"
 
-#: builtin/stash.c:1204
+#: builtin/stash.c
 msgid "No changes selected"
 msgstr "沒有選擇變更"
 
-#: builtin/stash.c:1304
+#: builtin/stash.c
 msgid "You do not have the initial commit yet"
 msgstr "您尚未建立初始提交"
 
-#: builtin/stash.c:1331
+#: builtin/stash.c
 msgid "Cannot save the current index state"
 msgstr "無法儲存目前索引狀態"
 
-#: builtin/stash.c:1340
+#: builtin/stash.c
 msgid "Cannot save the untracked files"
 msgstr "無法儲存未追蹤檔案"
 
-#: builtin/stash.c:1351 builtin/stash.c:1370
+#: builtin/stash.c
 msgid "Cannot save the current worktree state"
 msgstr "無法儲存目前工作區狀態"
 
-#: builtin/stash.c:1361
+#: builtin/stash.c
 msgid "Cannot save the current staged state"
 msgstr "無法儲存目前暫存狀態"
 
-#: builtin/stash.c:1398
+#: builtin/stash.c
 msgid "Cannot record working tree state"
 msgstr "不能記錄工作區狀態"
 
-#: builtin/stash.c:1447
+#: builtin/stash.c
 msgid "Can't use --patch and --include-untracked or --all at the same time"
 msgstr "不能同時使用參數 --patch 和 --include-untracked 或 --all"
 
-#: builtin/stash.c:1458
+#: builtin/stash.c
 msgid "Can't use --staged and --include-untracked or --all at the same time"
 msgstr "--staged 和 --include-untracked 或 --all 不得同時使用"
 
-#: builtin/stash.c:1476
+#: builtin/stash.c
 msgid "Did you forget to 'git add'?"
 msgstr "您是否忘了執行 'git add'？"
 
-#: builtin/stash.c:1491
+#: builtin/stash.c
 msgid "No local changes to save"
 msgstr "沒有要儲存的本機修改"
 
-#: builtin/stash.c:1498
+#: builtin/stash.c
 msgid "Cannot initialize stash"
 msgstr "無法初始化儲藏"
 
-#: builtin/stash.c:1513
+#: builtin/stash.c
 msgid "Cannot save the current status"
 msgstr "無法儲存目前狀態"
 
-#: builtin/stash.c:1518
+#: builtin/stash.c
 #, c-format
 msgid "Saved working directory and index state %s"
 msgstr "儲存工作目錄和索引狀態 %s"
 
-#: builtin/stash.c:1615
+#: builtin/stash.c
 msgid "Cannot remove worktree changes"
 msgstr "無法刪除工作區變更"
 
-#: builtin/stash.c:1656 builtin/stash.c:1728
+#: builtin/stash.c
 msgid "keep index"
 msgstr "保持索引"
 
-#: builtin/stash.c:1658 builtin/stash.c:1730
+#: builtin/stash.c
 msgid "stash staged changes only"
 msgstr "只儲藏暫存變更"
 
-#: builtin/stash.c:1660 builtin/stash.c:1732
+#: builtin/stash.c
 msgid "stash in patch mode"
 msgstr "以修補檔模式儲藏"
 
-#: builtin/stash.c:1661 builtin/stash.c:1733
+#: builtin/stash.c
 msgid "quiet mode"
 msgstr "靜默模式"
 
-#: builtin/stash.c:1663 builtin/stash.c:1735
+#: builtin/stash.c
 msgid "include untracked files in stash"
 msgstr "儲藏中包含未追蹤檔案"
 
-#: builtin/stash.c:1665 builtin/stash.c:1737
+#: builtin/stash.c
 msgid "include ignore files"
 msgstr "包含忽略的檔案"
 
-#: builtin/stripspace.c:37
+#: builtin/stripspace.c
 msgid "skip and remove all lines starting with comment character"
 msgstr "略過和移除所有的備註行"
 
-#: builtin/stripspace.c:40
+#: builtin/stripspace.c
 msgid "prepend comment character and space to each line"
 msgstr "為每一行的行首新增備註符和空格"
 
-#: builtin/submodule--helper.c:50 builtin/submodule--helper.c:2486
+#: builtin/submodule--helper.c
 #, c-format
 msgid "Expecting a full ref name, got %s"
 msgstr "期望一個完整的引用名稱，卻得到 %s"
 
-#: builtin/submodule--helper.c:103
-#, c-format
-msgid "cannot strip one component off url '%s'"
-msgstr "無法從 url '%s' 剝離一個元件"
-
-#: builtin/submodule--helper.c:213
+#: builtin/submodule--helper.c
 #, c-format
 msgid ""
 "could not look up configuration '%s'. Assuming this repository is its own "
 "authoritative upstream."
 msgstr "無法找到設定 '%s'。假定這個版本庫是其自身的官方上游。"
 
-#: builtin/submodule--helper.c:413 builtin/submodule--helper.c:1873
+#: builtin/submodule--helper.c
 msgid "alternative anchor for relative paths"
 msgstr "相對路徑的替代錨記（anchor）"
 
-#: builtin/submodule--helper.c:418
+#: builtin/submodule--helper.c
 msgid "git submodule--helper list [--prefix=<path>] [<path>...]"
 msgstr "git submodule--helper list [--prefix=<路徑>] [<路徑>...]"
 
-#: builtin/submodule--helper.c:476 builtin/submodule--helper.c:617
-#: builtin/submodule--helper.c:640
+#: builtin/submodule--helper.c
 #, c-format
 msgid "No url found for submodule path '%s' in .gitmodules"
 msgstr "在 .gitmodules 中未找到子模組 '%s' 的 url"
 
-#: builtin/submodule--helper.c:528
+#: builtin/submodule--helper.c
 #, c-format
 msgid "Entering '%s'\n"
 msgstr "進入 '%s'\n"
 
-#: builtin/submodule--helper.c:531
+#: builtin/submodule--helper.c
 #, c-format
 msgid ""
 "run_command returned non-zero status for %s\n"
@@ -22688,7 +14611,7 @@ msgstr ""
 "對 %s 執行 run_command 返回非零值。\n"
 "."
 
-#: builtin/submodule--helper.c:553
+#: builtin/submodule--helper.c
 #, c-format
 msgid ""
 "run_command returned non-zero status while recursing in the nested "
@@ -22698,158 +14621,157 @@ msgstr ""
 "在遞迴 %s 的子模組執行 run_command 時返回非零值。\n"
 "."
 
-#: builtin/submodule--helper.c:569
+#: builtin/submodule--helper.c
 msgid "suppress output of entering each submodule command"
 msgstr "隱藏每個子模組進入命令的輸出"
 
-#: builtin/submodule--helper.c:571 builtin/submodule--helper.c:876
-#: builtin/submodule--helper.c:1458
+#: builtin/submodule--helper.c
 msgid "recurse into nested submodules"
 msgstr "遞迴進入嵌套子模組中"
 
-#: builtin/submodule--helper.c:576
+#: builtin/submodule--helper.c
 msgid "git submodule--helper foreach [--quiet] [--recursive] [--] <command>"
 msgstr "git submodule--helper foreach [--quiet] [--recursive] [--] <命令>"
 
-#: builtin/submodule--helper.c:654
+#: builtin/submodule--helper.c
 #, c-format
 msgid "Failed to register url for submodule path '%s'"
 msgstr "無法為子模組 '%s' 註冊 url"
 
-#: builtin/submodule--helper.c:658
+#: builtin/submodule--helper.c
 #, c-format
 msgid "Submodule '%s' (%s) registered for path '%s'\n"
 msgstr "子模組 '%s'（%s）已對路徑 '%s' 註冊\n"
 
-#: builtin/submodule--helper.c:668
+#: builtin/submodule--helper.c
 #, c-format
 msgid "warning: command update mode suggested for submodule '%s'\n"
 msgstr "警告：建議子模組 '%s' 使用指令更新模式\n"
 
-#: builtin/submodule--helper.c:675
+#: builtin/submodule--helper.c
 #, c-format
 msgid "Failed to register update mode for submodule path '%s'"
 msgstr "無法為子模組 '%s' 註冊更新模式"
 
-#: builtin/submodule--helper.c:697
+#: builtin/submodule--helper.c
 msgid "suppress output for initializing a submodule"
 msgstr "隱藏初始化子模組的輸出"
 
-#: builtin/submodule--helper.c:702
+#: builtin/submodule--helper.c
 msgid "git submodule--helper init [<options>] [<path>]"
 msgstr "git submodule--helper init [<選項>] [<路徑>]"
 
-#: builtin/submodule--helper.c:775 builtin/submodule--helper.c:910
+#: builtin/submodule--helper.c
 #, c-format
 msgid "no submodule mapping found in .gitmodules for path '%s'"
 msgstr "在 .gitmodules 中沒有發現路徑 '%s' 的子模組映射"
 
-#: builtin/submodule--helper.c:823
+#: builtin/submodule--helper.c
 #, c-format
 msgid "could not resolve HEAD ref inside the submodule '%s'"
 msgstr "無法解析子模組 '%s' 的 HEAD 引用"
 
-#: builtin/submodule--helper.c:850 builtin/submodule--helper.c:1428
+#: builtin/submodule--helper.c
 #, c-format
 msgid "failed to recurse into submodule '%s'"
 msgstr "遞迴子模組 '%s' 失敗"
 
-#: builtin/submodule--helper.c:874 builtin/submodule--helper.c:1595
+#: builtin/submodule--helper.c
 msgid "suppress submodule status output"
 msgstr "隱藏子模組的狀態輸出"
 
-#: builtin/submodule--helper.c:875
+#: builtin/submodule--helper.c
 msgid ""
 "use commit stored in the index instead of the one stored in the submodule "
 "HEAD"
 msgstr "使用儲存在索引中的提交，而非儲存在子模組 HEAD 中的提交"
 
-#: builtin/submodule--helper.c:881
+#: builtin/submodule--helper.c
 msgid "git submodule status [--quiet] [--cached] [--recursive] [<path>...]"
 msgstr "git submodule status [--quiet] [--cached] [--recursive] [<路徑>...]"
 
-#: builtin/submodule--helper.c:905
+#: builtin/submodule--helper.c
 msgid "git submodule--helper name <path>"
 msgstr "git submodule--helper name <路徑>"
 
-#: builtin/submodule--helper.c:977
+#: builtin/submodule--helper.c
 #, c-format
 msgid "* %s %s(blob)->%s(submodule)"
 msgstr "* %s %s(blob)->%s(submodule)"
 
-#: builtin/submodule--helper.c:980
+#: builtin/submodule--helper.c
 #, c-format
 msgid "* %s %s(submodule)->%s(blob)"
 msgstr "* %s %s(submodule)->%s(blob)"
 
-#: builtin/submodule--helper.c:993
+#: builtin/submodule--helper.c
 #, c-format
 msgid "%s"
 msgstr "%s"
 
-#: builtin/submodule--helper.c:1043
+#: builtin/submodule--helper.c
 #, c-format
 msgid "couldn't hash object from '%s'"
 msgstr "無法雜湊來自 '%s' 的物件"
 
-#: builtin/submodule--helper.c:1047
+#: builtin/submodule--helper.c
 #, c-format
 msgid "unexpected mode %o\n"
 msgstr "非預期的模式 %o\n"
 
-#: builtin/submodule--helper.c:1288
+#: builtin/submodule--helper.c
 msgid "use the commit stored in the index instead of the submodule HEAD"
 msgstr "使用儲存在索引中的提交而非子模組 HEAD"
 
-#: builtin/submodule--helper.c:1290
+#: builtin/submodule--helper.c
 msgid "compare the commit in the index with that in the submodule HEAD"
 msgstr "比較索引中提交與子模組 HEAD 提交的差異"
 
-#: builtin/submodule--helper.c:1292
+#: builtin/submodule--helper.c
 msgid "skip submodules with 'ignore_config' value set to 'all'"
 msgstr "'ignore_config' 值設為 'all' 時略過子模組"
 
-#: builtin/submodule--helper.c:1294
+#: builtin/submodule--helper.c
 msgid "limit the summary size"
 msgstr "限制摘要大小"
 
-#: builtin/submodule--helper.c:1299
+#: builtin/submodule--helper.c
 msgid "git submodule--helper summary [<options>] [<commit>] [--] [<path>]"
 msgstr "git submodule--helper summary [<選項>] [<提交>] [--] [<路徑>]"
 
-#: builtin/submodule--helper.c:1323
+#: builtin/submodule--helper.c
 msgid "could not fetch a revision for HEAD"
 msgstr "無法取得 HEAD 的版本"
 
-#: builtin/submodule--helper.c:1384
+#: builtin/submodule--helper.c
 #, c-format
 msgid "Synchronizing submodule url for '%s'\n"
 msgstr "為 '%s' 同步子模組 url\n"
 
-#: builtin/submodule--helper.c:1390
+#: builtin/submodule--helper.c
 #, c-format
 msgid "failed to register url for submodule path '%s'"
 msgstr "無法為子模組路徑 '%s' 註冊 url"
 
-#: builtin/submodule--helper.c:1399
+#: builtin/submodule--helper.c
 #, c-format
 msgid "failed to get the default remote for submodule '%s'"
 msgstr "無法得到子模組 '%s' 的預設遠端關聯"
 
-#: builtin/submodule--helper.c:1409
+#: builtin/submodule--helper.c
 #, c-format
 msgid "failed to update remote for submodule '%s'"
 msgstr "無法為子模組 '%s' 更新遠端關聯"
 
-#: builtin/submodule--helper.c:1456
+#: builtin/submodule--helper.c
 msgid "suppress output of synchronizing submodule url"
 msgstr "隱藏子模組 URL 同步的輸出"
 
-#: builtin/submodule--helper.c:1463
+#: builtin/submodule--helper.c
 msgid "git submodule--helper sync [--quiet] [--recursive] [<path>]"
 msgstr "git submodule--helper sync [--quiet] [--recursive] [<路徑>]"
 
-#: builtin/submodule--helper.c:1513
+#: builtin/submodule--helper.c
 #, c-format
 msgid ""
 "Submodule work tree '%s' contains a .git directory. This will be replaced "
@@ -22857,52 +14779,52 @@ msgid ""
 msgstr ""
 "子模組工作區「%s」內有 .git 目錄。使用 absorbgitdirs 會將其替換為 .git 檔案。"
 
-#: builtin/submodule--helper.c:1530
+#: builtin/submodule--helper.c
 #, c-format
 msgid ""
 "Submodule work tree '%s' contains local modifications; use '-f' to discard "
 "them"
 msgstr "子模組工作區 '%s' 包含本機修改；使用 '-f' 捨棄它們"
 
-#: builtin/submodule--helper.c:1538
+#: builtin/submodule--helper.c
 #, c-format
 msgid "Cleared directory '%s'\n"
 msgstr "已清除目錄 '%s'\n"
 
-#: builtin/submodule--helper.c:1540
+#: builtin/submodule--helper.c
 #, c-format
 msgid "Could not remove submodule work tree '%s'\n"
 msgstr "無法移除子模組工作區 '%s'\n"
 
-#: builtin/submodule--helper.c:1551
+#: builtin/submodule--helper.c
 #, c-format
 msgid "could not create empty submodule directory %s"
 msgstr "不能建立空的子模組目錄 %s"
 
-#: builtin/submodule--helper.c:1567
+#: builtin/submodule--helper.c
 #, c-format
 msgid "Submodule '%s' (%s) unregistered for path '%s'\n"
 msgstr "子模組 '%s'（%s）未對路徑 '%s' 註冊\n"
 
-#: builtin/submodule--helper.c:1596
+#: builtin/submodule--helper.c
 msgid "remove submodule working trees even if they contain local changes"
 msgstr "即使有本機變更仍移除子模組的工作區"
 
-#: builtin/submodule--helper.c:1597
+#: builtin/submodule--helper.c
 msgid "unregister all submodules"
 msgstr "取消註冊所有子模組"
 
-#: builtin/submodule--helper.c:1602
+#: builtin/submodule--helper.c
 msgid ""
 "git submodule deinit [--quiet] [-f | --force] [--all | [--] [<path>...]]"
 msgstr ""
 "git submodule deinit [--quiet] [-f | --force] [--all | [--] [<路徑>...]]"
 
-#: builtin/submodule--helper.c:1616
+#: builtin/submodule--helper.c
 msgid "Use '--all' if you really want to deinitialize all submodules"
 msgstr "如果您確定想要對所有子模組執行取消初始化，請使用 '--all'"
 
-#: builtin/submodule--helper.c:1665
+#: builtin/submodule--helper.c
 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"
@@ -22914,71 +14836,66 @@ msgstr ""
 "以允許 Git 不用備用版本庫複製，亦可使用等效的 '--reference-if-able'\n"
 "而非 '--reference' 複製。"
 
-#: builtin/submodule--helper.c:1710 builtin/submodule--helper.c:1713
+#: builtin/submodule--helper.c
 #, c-format
 msgid "submodule '%s' cannot add alternate: %s"
 msgstr "子模組 '%s' 不能新增版本庫備選：%s"
 
-#: builtin/submodule--helper.c:1749
+#: builtin/submodule--helper.c
 #, c-format
 msgid "Value '%s' for submodule.alternateErrorStrategy is not recognized"
 msgstr "不能識別 submodule.alternateErrorStrategy 的取值 '%s'"
 
-#: builtin/submodule--helper.c:1756
+#: builtin/submodule--helper.c
 #, c-format
 msgid "Value '%s' for submodule.alternateLocation is not recognized"
 msgstr "不能識別 submodule.alternateLocation 的取值 '%s'"
 
-#: builtin/submodule--helper.c:1781
+#: builtin/submodule--helper.c
 #, c-format
 msgid "refusing to create/use '%s' in another submodule's git dir"
 msgstr "拒絕在其他子模組的 git 路徑建立／使用「%s」"
 
-#: builtin/submodule--helper.c:1826
+#: builtin/submodule--helper.c
 #, c-format
 msgid "clone of '%s' into submodule path '%s' failed"
 msgstr "無法複製 '%s' 到子模組路徑 '%s'"
 
-#: builtin/submodule--helper.c:1831
+#: builtin/submodule--helper.c
 #, c-format
 msgid "directory not empty: '%s'"
 msgstr "目錄不是空的：「%s」"
 
-#: builtin/submodule--helper.c:1843
+#: builtin/submodule--helper.c
 #, c-format
 msgid "could not get submodule directory for '%s'"
 msgstr "無法得到 '%s' 的子模組目錄"
 
-#: builtin/submodule--helper.c:1876
+#: builtin/submodule--helper.c
 msgid "where the new submodule will be cloned to"
 msgstr "新的子模組將要複製的路徑"
 
-#: builtin/submodule--helper.c:1879
+#: builtin/submodule--helper.c
 msgid "name of the new submodule"
 msgstr "新子模組的名稱"
 
-#: builtin/submodule--helper.c:1882
+#: builtin/submodule--helper.c
 msgid "url where to clone the submodule from"
 msgstr "複製子模組的 url 位址"
 
-#: builtin/submodule--helper.c:1890 builtin/submodule--helper.c:3383
+#: builtin/submodule--helper.c
 msgid "depth for shallow clones"
 msgstr "淺複製的深度"
 
-#: builtin/submodule--helper.c:1893 builtin/submodule--helper.c:2731
-#: builtin/submodule--helper.c:3376
+#: builtin/submodule--helper.c
 msgid "force cloning progress"
 msgstr "強制顯示複製進度"
 
-#: builtin/submodule--helper.c:1895 builtin/submodule--helper.c:2733
+#: builtin/submodule--helper.c
 msgid "disallow cloning into non-empty directory"
 msgstr "不允許複製至非空白目錄"
 
-#: builtin/submodule--helper.c:1903
-#| msgid ""
-#| "git submodule--helper clone [--prefix=<path>] [--quiet] [--reference "
-#| "<repository>] [--name <name>] [--depth <depth>] [--single-branch] [--"
-#| "filter <filter-spec>]--url <url> --path <path>"
+#: builtin/submodule--helper.c
 msgid ""
 "git submodule--helper clone [--prefix=<path>] [--quiet] [--reference "
 "<repository>] [--name <name>] [--depth <depth>] [--single-branch] [--filter "
@@ -22988,178 +14905,178 @@ msgstr ""
 "<repository>] [--name <name>] [--depth <depth>] [--single-branch] [--filter "
 "<filter-spec>] --url <url> --path <path>"
 
-#: builtin/submodule--helper.c:1943
+#: builtin/submodule--helper.c
 #, c-format
 msgid "Invalid update mode '%s' for submodule path '%s'"
 msgstr "子模組 '%2$s' 的更新模式 '%1$s' 無效"
 
-#: builtin/submodule--helper.c:1947
+#: builtin/submodule--helper.c
 #, c-format
 msgid "Invalid update mode '%s' configured for submodule path '%s'"
 msgstr "為子模組 '%2$s' 設定的更新模式 '%1$s' 無效"
 
-#: builtin/submodule--helper.c:2041
+#: builtin/submodule--helper.c
 #, c-format
 msgid "Submodule path '%s' not initialized"
 msgstr "子模組 '%s' 尚未初始化"
 
-#: builtin/submodule--helper.c:2045
+#: builtin/submodule--helper.c
 msgid "Maybe you want to use 'update --init'?"
 msgstr "也許您想要執行 'update --init'？"
 
-#: builtin/submodule--helper.c:2075
+#: builtin/submodule--helper.c
 #, c-format
 msgid "Skipping unmerged submodule %s"
 msgstr "略過未合併的子模組 %s"
 
-#: builtin/submodule--helper.c:2104
+#: builtin/submodule--helper.c
 #, c-format
 msgid "Skipping submodule '%s'"
 msgstr "略過子模組 '%s'"
 
-#: builtin/submodule--helper.c:2257
+#: builtin/submodule--helper.c
 #, c-format
 msgid "Failed to clone '%s'. Retry scheduled"
 msgstr "複製 '%s' 失敗。已排程重試作業"
 
-#: builtin/submodule--helper.c:2268
+#: builtin/submodule--helper.c
 #, c-format
 msgid "Failed to clone '%s' a second time, aborting"
 msgstr "第二次嘗試複製 '%s' 失敗，中止作業"
 
-#: builtin/submodule--helper.c:2371
+#: builtin/submodule--helper.c
 #, c-format
 msgid "Unable to checkout '%s' in submodule path '%s'"
 msgstr "無法在「%2$s」子模組路徑簽出「%1$s」"
 
-#: builtin/submodule--helper.c:2375
+#: builtin/submodule--helper.c
 #, c-format
 msgid "Unable to rebase '%s' in submodule path '%s'"
 msgstr "無法在「%2$s」子模組路徑重定「%1$s」的基底"
 
-#: builtin/submodule--helper.c:2379
+#: builtin/submodule--helper.c
 #, c-format
 msgid "Unable to merge '%s' in submodule path '%s'"
 msgstr "無法在「%2$s」子模組路徑合併「%1$s」"
 
-#: builtin/submodule--helper.c:2383
+#: builtin/submodule--helper.c
 #, c-format
 msgid "Execution of '%s %s' failed in submodule path '%s'"
 msgstr "「%s %s」在「%s」子模組路徑執行失敗"
 
-#: builtin/submodule--helper.c:2402
+#: builtin/submodule--helper.c
 #, c-format
 msgid "Submodule path '%s': checked out '%s'\n"
 msgstr "子模組路徑「%s」：已簽出「%s」\n"
 
-#: builtin/submodule--helper.c:2406
+#: builtin/submodule--helper.c
 #, c-format
 msgid "Submodule path '%s': rebased into '%s'\n"
 msgstr "子模組路徑「%s」：已重定基底至「%s」\n"
 
-#: builtin/submodule--helper.c:2410
+#: builtin/submodule--helper.c
 #, c-format
 msgid "Submodule path '%s': merged in '%s'\n"
 msgstr "子模組路徑「%s」：已在「%s」合併\n"
 
-#: builtin/submodule--helper.c:2414
+#: builtin/submodule--helper.c
 #, c-format
 msgid "Submodule path '%s': '%s %s'\n"
 msgstr "子模組路徑「%s」：「%s %s」\n"
 
-#: builtin/submodule--helper.c:2438
+#: builtin/submodule--helper.c
 #, c-format
 msgid "Unable to fetch in submodule path '%s'; trying to directly fetch %s:"
 msgstr "無法在子模組路徑 「%s」中取得。嘗試直接取得 %s："
 
-#: builtin/submodule--helper.c:2447
+#: builtin/submodule--helper.c
 #, 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:2481
+#: builtin/submodule--helper.c
 #, 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:2499
+#: builtin/submodule--helper.c
 #, c-format
 msgid "could not get a repository handle for submodule '%s'"
 msgstr "無法獲得子模組 '%s' 的版本庫句柄"
 
-#: builtin/submodule--helper.c:2588
+#: builtin/submodule--helper.c
 #, c-format
 msgid "Unable to find current revision in submodule path '%s'"
 msgstr "無法在子模組路徑「%s」中尋找目前的修訂版本"
 
-#: builtin/submodule--helper.c:2599
+#: builtin/submodule--helper.c
 #, c-format
 msgid "Unable to fetch in submodule path '%s'"
 msgstr "無法在子模組路徑「%s」中抓取"
 
-#: builtin/submodule--helper.c:2604
+#: builtin/submodule--helper.c
 #, c-format
 msgid "Unable to find %s revision in submodule path '%s'"
 msgstr "無法在子模組路徑「%s」中尋找 %s 修訂版本"
 
-#: builtin/submodule--helper.c:2640
+#: builtin/submodule--helper.c
 #, c-format
 msgid "Failed to recurse into submodule path '%s'"
 msgstr "無法遞迴子模組路徑「%s」"
 
-#: builtin/submodule--helper.c:2699
+#: builtin/submodule--helper.c
 msgid "force checkout updates"
 msgstr "強制簽出更新"
 
-#: builtin/submodule--helper.c:2701
+#: builtin/submodule--helper.c
 msgid "initialize uninitialized submodules before update"
 msgstr "在更新前，初始化尚未進行初始化的子模組"
 
-#: builtin/submodule--helper.c:2703
+#: builtin/submodule--helper.c
 msgid "use SHA-1 of submodule's remote tracking branch"
 msgstr "使用子模組遠端追蹤分支的 SHA-1"
 
-#: builtin/submodule--helper.c:2705
+#: builtin/submodule--helper.c
 msgid "traverse submodules recursively"
 msgstr "遞迴遍歷子模組"
 
-#: builtin/submodule--helper.c:2707
+#: builtin/submodule--helper.c
 msgid "don't fetch new objects from the remote site"
 msgstr "不從遠端站台取得新物件"
 
-#: builtin/submodule--helper.c:2710 builtin/submodule--helper.c:2892
+#: builtin/submodule--helper.c
 msgid "path into the working tree"
 msgstr "到工作區的路徑"
 
-#: builtin/submodule--helper.c:2713
+#: builtin/submodule--helper.c
 msgid "path into the working tree, across nested submodule boundaries"
 msgstr "工作區中的路徑，遞迴嵌套子模組"
 
-#: builtin/submodule--helper.c:2717
+#: builtin/submodule--helper.c
 msgid "rebase, merge, checkout or none"
 msgstr "rebase、merge、checkout 或 none"
 
-#: builtin/submodule--helper.c:2723
+#: builtin/submodule--helper.c
 msgid "create a shallow clone truncated to the specified number of revisions"
 msgstr "建立一個縮減至指定版本數的淺複製"
 
-#: builtin/submodule--helper.c:2726
+#: builtin/submodule--helper.c
 msgid "parallel jobs"
 msgstr "並行任務"
 
-#: builtin/submodule--helper.c:2728
+#: builtin/submodule--helper.c
 msgid "whether the initial clone should follow the shallow recommendation"
 msgstr "初始複製是否應該遵循建議的淺複製選項"
 
-#: builtin/submodule--helper.c:2729
+#: builtin/submodule--helper.c
 msgid "don't print cloning progress"
 msgstr "不要輸出複製進度"
 
-#: builtin/submodule--helper.c:2741
+#: builtin/submodule--helper.c
 msgid ""
 "git submodule [--quiet] update [--init [--filter=<filter-spec>]] [--remote] "
 "[-N|--no-fetch] [-f|--force] [--checkout|--merge|--rebase] [--[no-]recommend-"
@@ -23171,85 +15088,81 @@ msgstr ""
 "shallow] [--reference <repository>] [--recursive] [--[no-]single-branch] "
 "[--] [<path>...]"
 
-#: builtin/submodule--helper.c:2767
+#: builtin/submodule--helper.c
 msgid "bad value for update parameter"
 msgstr "update 參數取值錯誤"
 
-#: builtin/submodule--helper.c:2893
+#: builtin/submodule--helper.c
 msgid "recurse into submodules"
 msgstr "在子模組中遞迴"
 
-#: builtin/submodule--helper.c:2899
+#: builtin/submodule--helper.c
 msgid "git submodule--helper absorb-git-dirs [<options>] [<path>...]"
 msgstr "git submodule--helper absorb-git-dirs [<選項>] [<路徑>...]"
 
-#: builtin/submodule--helper.c:2955
+#: builtin/submodule--helper.c
 msgid "check if it is safe to write to the .gitmodules file"
 msgstr "檢查寫入 .gitmodules 檔案是否安全"
 
-#: builtin/submodule--helper.c:2958
+#: builtin/submodule--helper.c
 msgid "unset the config in the .gitmodules file"
 msgstr "取消 .gitmodules 檔案中的設定"
 
-#: builtin/submodule--helper.c:2963
+#: builtin/submodule--helper.c
 msgid "git submodule--helper config <name> [<value>]"
 msgstr "git submodule--helper config <名稱> [<值>]"
 
-#: builtin/submodule--helper.c:2964
+#: builtin/submodule--helper.c
 msgid "git submodule--helper config --unset <name>"
 msgstr "git submodule--helper config --unset <名稱>"
 
-#: builtin/submodule--helper.c:2984 builtin/submodule--helper.c:3238
-#: builtin/submodule--helper.c:3395
+#: builtin/submodule--helper.c
 msgid "please make sure that the .gitmodules file is in the working tree"
 msgstr "請確認 .gitmodules 檔案在工作區裡"
 
-#: builtin/submodule--helper.c:3000
+#: builtin/submodule--helper.c
 msgid "suppress output for setting url of a submodule"
 msgstr "隱藏子模組設定 URL 的輸出"
 
-#: builtin/submodule--helper.c:3004
+#: builtin/submodule--helper.c
 msgid "git submodule--helper set-url [--quiet] <path> <newurl>"
 msgstr "git submodule--helper set-url [--quiet] <路徑> <新 URL>"
 
-#: builtin/submodule--helper.c:3037
+#: builtin/submodule--helper.c
 msgid "set the default tracking branch to master"
 msgstr "將預設的追蹤分支設為 master"
 
-#: builtin/submodule--helper.c:3039
+#: builtin/submodule--helper.c
 msgid "set the default tracking branch"
 msgstr "設定預設追蹤分支"
 
-#: builtin/submodule--helper.c:3043
+#: builtin/submodule--helper.c
 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:3044
+#: builtin/submodule--helper.c
 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:3051
+#: builtin/submodule--helper.c
 msgid "--branch or --default required"
 msgstr "需要 --branch 或 --default"
 
-#: builtin/submodule--helper.c:3072 builtin/submodule--helper.c:3375
+#: builtin/submodule--helper.c
 msgid "print only error messages"
 msgstr "只輸出錯誤訊息"
 
-#: builtin/submodule--helper.c:3073
+#: builtin/submodule--helper.c
 msgid "force creation"
 msgstr "強制建立"
 
-#: builtin/submodule--helper.c:3081
+#: builtin/submodule--helper.c
 msgid "show whether the branch would be created"
 msgstr "顯示分支是否會被建立"
 
-#: builtin/submodule--helper.c:3085
-#| msgid ""
-#| "git submodule--helper create-branch [-f|--force] [--create-reflog] [-q|--"
-#| "quiet] [-t|--track] [-n|--dry-run] <name> <start_oid> <start_name>"
+#: builtin/submodule--helper.c
 msgid ""
 "git submodule--helper create-branch [-f|--force] [--create-reflog] [-q|--"
 "quiet] [-t|--track] [-n|--dry-run] <name> <start-oid> <start-name>"
@@ -23257,27 +15170,27 @@ msgstr ""
 "git submodule--helper create-branch [-f|--force] [--create-reflog] [-q|--"
 "quiet] [-t|--track] [-n|--dry-run] <name> <start-oid> <start-name>"
 
-#: builtin/submodule--helper.c:3097
+#: builtin/submodule--helper.c
 #, c-format
 msgid "creating branch '%s'"
 msgstr "建立分支「%s」"
 
-#: builtin/submodule--helper.c:3155
+#: builtin/submodule--helper.c
 #, c-format
 msgid "Adding existing repo at '%s' to the index\n"
 msgstr "正在將位於 '%s' 的現有版本庫加入至索引\n"
 
-#: builtin/submodule--helper.c:3158
+#: builtin/submodule--helper.c
 #, c-format
 msgid "'%s' already exists and is not a valid git repo"
 msgstr "「%s」已存在，且不是有效的 git 版本庫"
 
-#: builtin/submodule--helper.c:3171
+#: builtin/submodule--helper.c
 #, c-format
 msgid "A git directory for '%s' is found locally with remote(s):\n"
 msgstr "在本機找到「%s」Git 目錄，與其對應的遠端版本庫：\n"
 
-#: builtin/submodule--helper.c:3178
+#: builtin/submodule--helper.c
 #, c-format
 msgid ""
 "If you want to reuse this local git directory instead of cloning again from\n"
@@ -23292,112 +15205,116 @@ msgstr ""
 "請使用 '--force' 選項。如果本機 git 目錄不是正確的版本庫\n"
 "假如您不太懂意思，請使用 '--name' 選項輸入其他名稱。"
 
-#: builtin/submodule--helper.c:3190
+#: builtin/submodule--helper.c
 #, c-format
 msgid "Reactivating local git directory for submodule '%s'\n"
 msgstr "正在重新啟用「%s」子模組的本機 Git 目錄\n"
 
-#: builtin/submodule--helper.c:3227
+#: builtin/submodule--helper.c
 #, c-format
 msgid "unable to checkout submodule '%s'"
 msgstr "無法簽出「%s」子模組"
 
-#: builtin/submodule--helper.c:3266
+#: builtin/submodule--helper.c
 #, c-format
 msgid "Failed to add submodule '%s'"
 msgstr "無法加入子模組「%s」"
 
-#: builtin/submodule--helper.c:3270 builtin/submodule--helper.c:3275
-#: builtin/submodule--helper.c:3283
+#: builtin/submodule--helper.c
 #, c-format
 msgid "Failed to register submodule '%s'"
 msgstr "無法註冊子模組「%s」"
 
-#: builtin/submodule--helper.c:3339
+#: builtin/submodule--helper.c
 #, c-format
 msgid "'%s' already exists in the index"
 msgstr "「%s」已在索引中"
 
-#: builtin/submodule--helper.c:3342
+#: builtin/submodule--helper.c
 #, c-format
 msgid "'%s' already exists in the index and is not a submodule"
 msgstr "「%s」已在索引中，且不是子模組"
 
-#: builtin/submodule--helper.c:3372
+#: builtin/submodule--helper.c read-cache.c
+#, c-format
+msgid "'%s' does not have a commit checked out"
+msgstr "'%s' 沒有簽出一個提交"
+
+#: builtin/submodule--helper.c
 msgid "branch of repository to add as submodule"
 msgstr "要加入為子模組的版本庫分支"
 
-#: builtin/submodule--helper.c:3373
+#: builtin/submodule--helper.c
 msgid "allow adding an otherwise ignored submodule path"
 msgstr "允許加入忽略的子模組路徑"
 
-#: builtin/submodule--helper.c:3379
+#: builtin/submodule--helper.c
 msgid "borrow the objects from reference repositories"
 msgstr "從引用的版本庫借用物件"
 
-#: builtin/submodule--helper.c:3381
+#: builtin/submodule--helper.c
 msgid ""
-"sets the submodule’s name to the given string instead of defaulting to its "
+"sets the submodule's name to the given string instead of defaulting to its "
 "path"
-msgstr "將子模組名稱設定為指定字串，而非預設的路徑名稱"
+msgstr "將子模組的名稱設為指定字串，而非預設為其路徑"
 
-#: builtin/submodule--helper.c:3388
+#: builtin/submodule--helper.c
 msgid "git submodule--helper add [<options>] [--] <repository> [<path>]"
 msgstr "git submodule--helper add [<選項>] [--] <版本庫> [<路徑>]"
 
-#: builtin/submodule--helper.c:3416
+#: builtin/submodule--helper.c
 msgid "Relative path can only be used from the toplevel of the working tree"
 msgstr "只能在工作區的頂級目錄中使用相對路徑"
 
-#: builtin/submodule--helper.c:3425
+#: builtin/submodule--helper.c
 #, c-format
 msgid "repo URL: '%s' must be absolute or begin with ./|../"
 msgstr "版本庫 URL：「%s」必須是絕對路徑，或開頭是 ./|../"
 
-#: builtin/submodule--helper.c:3460
+#: builtin/submodule--helper.c
 #, c-format
 msgid "'%s' is not a valid submodule name"
 msgstr "「%s」不是有效的子模組名稱"
 
-#: builtin/submodule--helper.c:3520 git.c:453 git.c:729
+#: builtin/submodule--helper.c git.c
 #, c-format
 msgid "%s doesn't support --super-prefix"
 msgstr "%s 不支援 --super-prefix"
 
-#: builtin/submodule--helper.c:3526
+#: builtin/submodule--helper.c
 #, c-format
 msgid "'%s' is not a valid submodule--helper subcommand"
 msgstr "'%s' 不是一個有效的 submodule--helper 子指令"
 
-#: builtin/symbolic-ref.c:8
+#: builtin/symbolic-ref.c
 msgid "git symbolic-ref [<options>] <name> [<ref>]"
 msgstr "git symbolic-ref [<選項>] <名稱> [<引用>]"
 
-#: builtin/symbolic-ref.c:9
+#: builtin/symbolic-ref.c
 msgid "git symbolic-ref -d [-q] <name>"
 msgstr "git symbolic-ref -d [-q] <名稱>"
 
-#: builtin/symbolic-ref.c:42
+#: builtin/symbolic-ref.c
 msgid "suppress error message for non-symbolic (detached) refs"
 msgstr "不顯示非符號（分離的）引用的錯誤訊息"
 
-#: builtin/symbolic-ref.c:43
+#: builtin/symbolic-ref.c
 msgid "delete symbolic ref"
 msgstr "刪除符號引用"
 
-#: builtin/symbolic-ref.c:44
+#: builtin/symbolic-ref.c
 msgid "shorten ref output"
 msgstr "縮短引用輸出"
 
-#: builtin/symbolic-ref.c:45 builtin/update-ref.c:505
+#: builtin/symbolic-ref.c builtin/update-ref.c
 msgid "reason"
 msgstr "原因"
 
-#: builtin/symbolic-ref.c:45 builtin/update-ref.c:505
+#: builtin/symbolic-ref.c builtin/update-ref.c
 msgid "reason of the update"
 msgstr "更新的原因"
 
-#: builtin/tag.c:26
+#: builtin/tag.c
 msgid ""
 "git tag [-a | -s | -u <key-id>] [-f] [-m <msg> | -F <file>]\n"
 "        <tagname> [<head>]"
@@ -23405,11 +15322,11 @@ msgstr ""
 "git tag [-a | -s | -u <key-id>] [-f] [-m <消息> | -F <檔案>]\n"
 "        <標籤名> [<head>]"
 
-#: builtin/tag.c:28
+#: builtin/tag.c
 msgid "git tag -d <tagname>..."
 msgstr "git tag -d <標籤名>..."
 
-#: builtin/tag.c:29
+#: builtin/tag.c
 msgid ""
 "git tag -l [-n[<num>]] [--contains <commit>] [--no-contains <commit>] [--"
 "points-at <object>]\n"
@@ -23420,21 +15337,21 @@ msgstr ""
 "at <物件>]\n"
 "        [--format=<格式>] [--merged <提交>] [--no-merged <提交>] [<模式>...]"
 
-#: builtin/tag.c:31
+#: builtin/tag.c
 msgid "git tag -v [--format=<format>] <tagname>..."
 msgstr "git tag -v [--format=<格式>] <標籤名>..."
 
-#: builtin/tag.c:101
+#: builtin/tag.c
 #, c-format
 msgid "tag '%s' not found."
 msgstr "未發現標籤 '%s'。"
 
-#: builtin/tag.c:136
+#: builtin/tag.c
 #, c-format
 msgid "Deleted tag '%s' (was %s)\n"
 msgstr "已刪除標籤 '%s'（曾為 %s）\n"
 
-#: builtin/tag.c:171
+#: builtin/tag.c
 #, c-format
 msgid ""
 "\n"
@@ -23447,7 +15364,7 @@ msgstr ""
 "  %s\n"
 "以 '%c' 開頭的行將被忽略。\n"
 
-#: builtin/tag.c:175
+#: builtin/tag.c
 #, c-format
 msgid ""
 "\n"
@@ -23461,11 +15378,11 @@ msgstr ""
 "  %s\n"
 "以 '%c' 開頭的行將被保留，如果您願意也可以刪除它們。\n"
 
-#: builtin/tag.c:241
+#: builtin/tag.c
 msgid "unable to sign the tag"
 msgstr "無法簽署標籤"
 
-#: builtin/tag.c:259
+#: builtin/tag.c
 #, c-format
 msgid ""
 "You have created a nested tag. The object referred to by your new tag is\n"
@@ -23478,324 +15395,329 @@ msgstr ""
 "\n"
 "\tgit tag -f %s %s^{}"
 
-#: builtin/tag.c:275
+#: builtin/tag.c
 msgid "bad object type."
 msgstr "壞的物件類型。"
 
-#: builtin/tag.c:326
+#: builtin/tag.c
 msgid "no tag message?"
 msgstr "無標籤說明？"
 
-#: builtin/tag.c:333
+#: builtin/tag.c
 #, c-format
 msgid "The tag message has been left in %s\n"
 msgstr "標籤說明被保留在 %s\n"
 
-#: builtin/tag.c:445
+#: builtin/tag.c
 msgid "list tag names"
 msgstr "列出標籤名稱"
 
-#: builtin/tag.c:447
+#: builtin/tag.c
 msgid "print <n> lines of each tag message"
 msgstr "每個標籤訊息列印 <n> 行"
 
-#: builtin/tag.c:449
+#: builtin/tag.c
 msgid "delete tags"
 msgstr "刪除標籤"
 
-#: builtin/tag.c:450
+#: builtin/tag.c
 msgid "verify tags"
 msgstr "驗證標籤"
 
-#: builtin/tag.c:452
+#: builtin/tag.c
 msgid "Tag creation options"
 msgstr "標籤建立選項"
 
-#: builtin/tag.c:454
+#: builtin/tag.c
 msgid "annotated tag, needs a message"
 msgstr "附註標籤，需要一個說明"
 
-#: builtin/tag.c:456
+#: builtin/tag.c
 msgid "tag message"
 msgstr "標籤說明"
 
-#: builtin/tag.c:458
+#: builtin/tag.c
 msgid "force edit of tag message"
 msgstr "強制編輯標籤說明"
 
-#: builtin/tag.c:459
+#: builtin/tag.c
 msgid "annotated and GPG-signed tag"
 msgstr "附註並附加 GPG 簽名的標籤"
 
-#: builtin/tag.c:462
+#: builtin/tag.c
 msgid "use another key to sign the tag"
 msgstr "使用另外的私鑰簽名該標籤"
 
-#: builtin/tag.c:463
+#: builtin/tag.c
 msgid "replace the tag if exists"
 msgstr "如果存在，取代現有的標籤"
 
-#: builtin/tag.c:464 builtin/update-ref.c:511
+#: builtin/tag.c builtin/update-ref.c
 msgid "create a reflog"
 msgstr "建立引用日誌"
 
-#: builtin/tag.c:466
+#: builtin/tag.c
 msgid "Tag listing options"
 msgstr "標籤列表選項"
 
-#: builtin/tag.c:467
+#: builtin/tag.c
 msgid "show tag list in columns"
 msgstr "以列的方式顯示標籤列表"
 
-#: builtin/tag.c:468 builtin/tag.c:470
+#: builtin/tag.c
 msgid "print only tags that contain the commit"
 msgstr "只列印包含該提交的標籤"
 
-#: builtin/tag.c:469 builtin/tag.c:471
+#: builtin/tag.c
 msgid "print only tags that don't contain the commit"
 msgstr "只列印不包含該提交的標籤"
 
-#: builtin/tag.c:472
+#: builtin/tag.c
 msgid "print only tags that are merged"
 msgstr "只列印已經合併的標籤"
 
-#: builtin/tag.c:473
+#: builtin/tag.c
 msgid "print only tags that are not merged"
 msgstr "只列印尚未合併的標籤"
 
-#: builtin/tag.c:477
+#: builtin/tag.c
 msgid "print only tags of the object"
 msgstr "只列印指向該物件的標籤"
 
-#: builtin/tag.c:559
+#: builtin/tag.c
 #, c-format
 msgid "the '%s' option is only allowed in list mode"
 msgstr "「%s」選項只能在列表顯示模式使用"
 
-#: builtin/tag.c:598
+#: builtin/tag.c
 #, c-format
 msgid "'%s' is not a valid tag name."
 msgstr "'%s' 不是一個有效的標籤名稱。"
 
-#: builtin/tag.c:603
+#: builtin/tag.c
 #, c-format
 msgid "tag '%s' already exists"
 msgstr "標籤 '%s' 已存在"
 
-#: builtin/tag.c:634
+#: builtin/tag.c sequencer.c
+#, c-format
+msgid "Invalid cleanup mode %s"
+msgstr "無效的清理模式 %s"
+
+#: builtin/tag.c
 #, c-format
 msgid "Updated tag '%s' (was %s)\n"
 msgstr "已更新標籤 '%s'（曾為 %s）\n"
 
-#: builtin/unpack-objects.c:95
+#: builtin/unpack-objects.c
 msgid "pack exceeds maximum allowed size"
 msgstr "包超過了最大允許值"
 
-#: builtin/unpack-objects.c:504
+#: builtin/unpack-objects.c
 msgid "Unpacking objects"
 msgstr "展開物件中"
 
-#: builtin/update-index.c:84
+#: builtin/update-index.c
 #, c-format
 msgid "failed to create directory %s"
 msgstr "建立目錄 %s 失敗"
 
-#: builtin/update-index.c:106
+#: builtin/update-index.c
 #, c-format
 msgid "failed to delete file %s"
 msgstr "刪除檔案 %s 失敗"
 
-#: builtin/update-index.c:113 builtin/update-index.c:219
+#: builtin/update-index.c
 #, c-format
 msgid "failed to delete directory %s"
 msgstr "刪除目錄 %s 失敗"
 
-#: builtin/update-index.c:138
+#: builtin/update-index.c
 #, c-format
 msgid "Testing mtime in '%s' "
 msgstr "在 '%s' 中測試 mtime "
 
-#: builtin/update-index.c:152
+#: builtin/update-index.c
 msgid "directory stat info does not change after adding a new file"
 msgstr "新增一個新檔案後，目錄的狀態訊息未改變"
 
-#: builtin/update-index.c:165
+#: builtin/update-index.c
 msgid "directory stat info does not change after adding a new directory"
 msgstr "新增一個新目錄後，目錄的狀態訊息未改變"
 
-#: builtin/update-index.c:178
+#: builtin/update-index.c
 msgid "directory stat info changes after updating a file"
 msgstr "更新一個檔案後，目錄的狀態訊息被修改"
 
-#: builtin/update-index.c:189
+#: builtin/update-index.c
 msgid "directory stat info changes after adding a file inside subdirectory"
 msgstr "在子目錄中新增檔案後，目錄的狀態訊息被修改"
 
-#: builtin/update-index.c:200
+#: builtin/update-index.c
 msgid "directory stat info does not change after deleting a file"
 msgstr "刪除一個檔案後，目錄的狀態訊息未改變"
 
-#: builtin/update-index.c:213
+#: builtin/update-index.c
 msgid "directory stat info does not change after deleting a directory"
 msgstr "刪除一個目錄後，目錄的狀態訊息未改變"
 
-#: builtin/update-index.c:220
+#: builtin/update-index.c
 msgid " OK"
 msgstr " OK"
 
-#: builtin/update-index.c:589
+#: builtin/update-index.c
 msgid "git update-index [<options>] [--] [<file>...]"
 msgstr "git update-index [<選項>] [--] [<檔案>...]"
 
-#: builtin/update-index.c:993
+#: builtin/update-index.c
 msgid "continue refresh even when index needs update"
 msgstr "當索引需要更新時繼續重新整理"
 
-#: builtin/update-index.c:996
+#: builtin/update-index.c
 msgid "refresh: ignore submodules"
 msgstr "重新整理：忽略子模組"
 
-#: builtin/update-index.c:999
+#: builtin/update-index.c
 msgid "do not ignore new files"
 msgstr "不忽略新的檔案"
 
-#: builtin/update-index.c:1001
+#: builtin/update-index.c
 msgid "let files replace directories and vice-versa"
 msgstr "讓檔案取代目錄（反之亦然）"
 
-#: builtin/update-index.c:1003
+#: builtin/update-index.c
 msgid "notice files missing from worktree"
 msgstr "通知檔案從工作區遺失"
 
-#: builtin/update-index.c:1005
+#: builtin/update-index.c
 msgid "refresh even if index contains unmerged entries"
 msgstr "即使索引區包含未合併的條目也執行重新整理"
 
-#: builtin/update-index.c:1008
+#: builtin/update-index.c
 msgid "refresh stat information"
 msgstr "重新整理統計訊息"
 
-#: builtin/update-index.c:1012
+#: builtin/update-index.c
 msgid "like --refresh, but ignore assume-unchanged setting"
 msgstr "類似於 --refresh，但是忽略 assume-unchanged 設定"
 
-#: builtin/update-index.c:1016
+#: builtin/update-index.c
 msgid "<mode>,<object>,<path>"
 msgstr "<存取模式>,<物件>,<路徑>"
 
-#: builtin/update-index.c:1017
+#: builtin/update-index.c
 msgid "add the specified entry to the index"
 msgstr "新增指定的條目到索引區"
 
-#: builtin/update-index.c:1027
+#: builtin/update-index.c
 msgid "mark files as \"not changing\""
 msgstr "把檔案標記為 \"沒有變更\""
 
-#: builtin/update-index.c:1030
+#: builtin/update-index.c
 msgid "clear assumed-unchanged bit"
 msgstr "清除 assumed-unchanged 位"
 
-#: builtin/update-index.c:1033
+#: builtin/update-index.c
 msgid "mark files as \"index-only\""
 msgstr "把檔案標記為 \"僅索引\""
 
-#: builtin/update-index.c:1036
+#: builtin/update-index.c
 msgid "clear skip-worktree bit"
 msgstr "清除 skip-worktree 位"
 
-#: builtin/update-index.c:1039
+#: builtin/update-index.c
 msgid "do not touch index-only entries"
 msgstr "不要建立只有索引的項目"
 
-#: builtin/update-index.c:1041
+#: builtin/update-index.c
 msgid "add to index only; do not add content to object database"
 msgstr "只新增到索引區；不新增物件到物件庫"
 
-#: builtin/update-index.c:1043
+#: builtin/update-index.c
 msgid "remove named paths even if present in worktree"
 msgstr "即使存在工作區裡，也刪除路徑"
 
-#: builtin/update-index.c:1045
+#: builtin/update-index.c
 msgid "with --stdin: input lines are terminated by null bytes"
 msgstr "攜帶 --stdin：輸入的行以 null 字元終止"
 
-#: builtin/update-index.c:1047
+#: builtin/update-index.c
 msgid "read list of paths to be updated from standard input"
 msgstr "從標準輸入中讀取需要更新的路徑列表"
 
-#: builtin/update-index.c:1051
+#: builtin/update-index.c
 msgid "add entries from standard input to the index"
 msgstr "從標準輸入新增條目到索引區"
 
-#: builtin/update-index.c:1055
+#: builtin/update-index.c
 msgid "repopulate stages #2 and #3 for the listed paths"
 msgstr "為指定檔案重新生成第2和第3暫存區"
 
-#: builtin/update-index.c:1059
+#: builtin/update-index.c
 msgid "only update entries that differ from HEAD"
 msgstr "只更新與 HEAD 不同的條目"
 
-#: builtin/update-index.c:1063
+#: builtin/update-index.c
 msgid "ignore files missing from worktree"
 msgstr "忽略工作區遺失的檔案"
 
-#: builtin/update-index.c:1066
+#: builtin/update-index.c
 msgid "report actions to standard output"
 msgstr "在標準輸出顯示動作"
 
-#: builtin/update-index.c:1068
+#: builtin/update-index.c
 msgid "(for porcelains) forget saved unresolved conflicts"
 msgstr "(for porcelains) 忘記儲存的未解決的衝突"
 
-#: builtin/update-index.c:1072
+#: builtin/update-index.c
 msgid "write index in this format"
 msgstr "以這種格式寫入索引區"
 
-#: builtin/update-index.c:1074
+#: builtin/update-index.c
 msgid "enable or disable split index"
 msgstr "啟用或停用索引分割"
 
-#: builtin/update-index.c:1076
+#: builtin/update-index.c
 msgid "enable/disable untracked cache"
 msgstr "啟用/停用對未追蹤檔案的快取"
 
-#: builtin/update-index.c:1078
+#: builtin/update-index.c
 msgid "test if the filesystem supports untracked cache"
 msgstr "測試檔案系統是否支援未追蹤檔案快取"
 
-#: builtin/update-index.c:1080
+#: builtin/update-index.c
 msgid "enable untracked cache without testing the filesystem"
 msgstr "無需檢測檔案系統，啟用對未追蹤檔案的快取"
 
-#: builtin/update-index.c:1082
+#: builtin/update-index.c
 msgid "write out the index even if is not flagged as changed"
 msgstr "即使沒有被標記為已更改，也要寫出索引"
 
-#: builtin/update-index.c:1084
+#: builtin/update-index.c
 msgid "enable or disable file system monitor"
 msgstr "啟用或停用檔案系統監控"
 
-#: builtin/update-index.c:1086
+#: builtin/update-index.c
 msgid "mark files as fsmonitor valid"
 msgstr "標記檔案為 fsmonitor 有效"
 
-#: builtin/update-index.c:1089
+#: builtin/update-index.c
 msgid "clear fsmonitor valid bit"
 msgstr "清除 fsmonitor 有效位"
 
-#: builtin/update-index.c:1195
+#: builtin/update-index.c
 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:1204
+#: builtin/update-index.c
 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:1216
+#: builtin/update-index.c
 msgid ""
 "core.untrackedCache is set to true; remove or change it, if you really want "
 "to disable the untracked cache"
@@ -23803,11 +15725,11 @@ msgstr ""
 "core.untrackedCache 被設定為 true。如果您確定要停用未追蹤檔案的快取，請移除或"
 "修改"
 
-#: builtin/update-index.c:1220
+#: builtin/update-index.c
 msgid "Untracked cache disabled"
 msgstr "快取未追蹤檔案被停用"
 
-#: builtin/update-index.c:1228
+#: builtin/update-index.c
 msgid ""
 "core.untrackedCache is set to false; remove or change it, if you really want "
 "to enable the untracked cache"
@@ -23815,168 +15737,168 @@ msgstr ""
 "core.untrackedCache 被設定為 false。如果您確定要啟用未追蹤檔案快取，請移除或"
 "修改"
 
-#: builtin/update-index.c:1232
+#: builtin/update-index.c
 #, c-format
 msgid "Untracked cache enabled for '%s'"
 msgstr "快取未追蹤檔案在 '%s' 啟用"
 
-#: builtin/update-index.c:1241
+#: builtin/update-index.c
 msgid "core.fsmonitor is unset; set it if you really want to enable fsmonitor"
 msgstr "core.fsmonitor 未設定；如果想要啟用 fsmonitor 請設定該選項"
 
-#: builtin/update-index.c:1246
+#: builtin/update-index.c
 msgid "fsmonitor enabled"
 msgstr "fsmonitor 被啟用"
 
-#: builtin/update-index.c:1250
+#: builtin/update-index.c
 msgid ""
 "core.fsmonitor is set; remove it if you really want to disable fsmonitor"
 msgstr "core.fsmonitor 已設定；如果想要停用 fsmonitor 請移除該選項"
 
-#: builtin/update-index.c:1254
+#: builtin/update-index.c
 msgid "fsmonitor disabled"
 msgstr "fsmonitor 被停用"
 
-#: builtin/update-ref.c:10
+#: builtin/update-ref.c
 msgid "git update-ref [<options>] -d <refname> [<old-val>]"
 msgstr "git update-ref [<選項>] -d <引用名> [<舊值>]"
 
-#: builtin/update-ref.c:11
+#: builtin/update-ref.c
 msgid "git update-ref [<options>]    <refname> <new-val> [<old-val>]"
 msgstr "git update-ref [<選項>]    <引用名> <新值> [<舊值>]"
 
-#: builtin/update-ref.c:12
+#: builtin/update-ref.c
 msgid "git update-ref [<options>] --stdin [-z]"
 msgstr "git update-ref [<選項>] --stdin [-z]"
 
-#: builtin/update-ref.c:506
+#: builtin/update-ref.c
 msgid "delete the reference"
 msgstr "刪除引用"
 
-#: builtin/update-ref.c:508
+#: builtin/update-ref.c
 msgid "update <refname> not the one it points to"
 msgstr "更新 <引用名> 本身而不是它指向的引用"
 
-#: builtin/update-ref.c:509
+#: builtin/update-ref.c
 msgid "stdin has NUL-terminated arguments"
 msgstr "標準輸入有以 NUL 字元終止的參數"
 
-#: builtin/update-ref.c:510
+#: builtin/update-ref.c
 msgid "read updates from stdin"
 msgstr "從標準輸入讀取更新"
 
-#: builtin/update-server-info.c:15
+#: builtin/update-server-info.c
 msgid "update the info files from scratch"
 msgstr "從頭開始更新檔案訊息"
 
-#: builtin/upload-pack.c:11
+#: builtin/upload-pack.c
 msgid "git upload-pack [<options>] <dir>"
 msgstr "git upload-pack [<選項>] <目錄>"
 
-#: builtin/upload-pack.c:24 t/helper/test-serve-v2.c:17
+#: builtin/upload-pack.c t/helper/test-serve-v2.c
 msgid "quit after a single request/response exchange"
 msgstr "在一次單獨的請求/回應之後離開"
 
-#: builtin/upload-pack.c:26
+#: builtin/upload-pack.c
 msgid "serve up the info/refs for git-http-backend"
 msgstr "為 git-http-backend 提供 info/refs"
 
-#: builtin/upload-pack.c:29
+#: builtin/upload-pack.c
 msgid "do not try <directory>/.git/ if <directory> is no Git directory"
 msgstr "如果 <目錄> 不是一個 Git 目錄，不要嘗試 <目錄>/.git/"
 
-#: builtin/upload-pack.c:31
+#: builtin/upload-pack.c
 msgid "interrupt transfer after <n> seconds of inactivity"
 msgstr "不活動 <n> 秒鐘後終止傳輸"
 
-#: builtin/verify-commit.c:19
+#: builtin/verify-commit.c
 msgid "git verify-commit [-v | --verbose] <commit>..."
 msgstr "git verify-commit [-v | --verbose] <提交>..."
 
-#: builtin/verify-commit.c:68
+#: builtin/verify-commit.c
 msgid "print commit contents"
 msgstr "列印提交內容"
 
-#: builtin/verify-commit.c:69 builtin/verify-tag.c:37
+#: builtin/verify-commit.c builtin/verify-tag.c
 msgid "print raw gpg status output"
 msgstr "列印原始 gpg 狀態輸出"
 
-#: builtin/verify-pack.c:59
+#: builtin/verify-pack.c
 msgid "git verify-pack [-v | --verbose] [-s | --stat-only] <pack>..."
 msgstr "git verify-pack [-v | --verbose] [-s | --stat-only] <包>..."
 
-#: builtin/verify-pack.c:70
+#: builtin/verify-pack.c
 msgid "verbose"
 msgstr "詳細輸出"
 
-#: builtin/verify-pack.c:72
+#: builtin/verify-pack.c
 msgid "show statistics only"
 msgstr "只顯示統計"
 
-#: builtin/verify-tag.c:18
+#: builtin/verify-tag.c
 msgid "git verify-tag [-v | --verbose] [--format=<format>] <tag>..."
 msgstr "git verify-tag [-v | --verbose] [--format=<格式>] <標籤>..."
 
-#: builtin/verify-tag.c:36
+#: builtin/verify-tag.c
 msgid "print tag contents"
 msgstr "列印標籤內容"
 
-#: builtin/worktree.c:19
+#: builtin/worktree.c
 msgid "git worktree add [<options>] <path> [<commit-ish>]"
 msgstr "git worktree add [<選項>] <路徑> [<提交>]"
 
-#: builtin/worktree.c:20
+#: builtin/worktree.c
 msgid "git worktree list [<options>]"
 msgstr "git worktree list [<選項>]"
 
-#: builtin/worktree.c:21
+#: builtin/worktree.c
 msgid "git worktree lock [<options>] <path>"
 msgstr "git worktree lock [<選項>] <路徑>"
 
-#: builtin/worktree.c:22
+#: builtin/worktree.c
 msgid "git worktree move <worktree> <new-path>"
 msgstr "git worktree move <工作區> <新路徑>"
 
-#: builtin/worktree.c:23
+#: builtin/worktree.c
 msgid "git worktree prune [<options>]"
 msgstr "git worktree prune [<選項>]"
 
-#: builtin/worktree.c:24
+#: builtin/worktree.c
 msgid "git worktree remove [<options>] <worktree>"
 msgstr "git worktree remove [<選項>] <工作區>"
 
-#: builtin/worktree.c:25
+#: builtin/worktree.c
 msgid "git worktree repair [<path>...]"
 msgstr "git worktree repair [<路徑>...]"
 
-#: builtin/worktree.c:26
+#: builtin/worktree.c
 msgid "git worktree unlock <path>"
 msgstr "git worktree unlock <路徑>"
 
-#: builtin/worktree.c:76
+#: builtin/worktree.c
 #, c-format
 msgid "Removing %s/%s: %s"
 msgstr "移除 %s/%s: %s"
 
-#: builtin/worktree.c:149
+#: builtin/worktree.c
 msgid "report pruned working trees"
 msgstr "報告剪除的工作區"
 
-#: builtin/worktree.c:151
+#: builtin/worktree.c
 msgid "expire working trees older than <time>"
 msgstr "將早於 <時間> 的工作區過期"
 
-#: builtin/worktree.c:221
+#: builtin/worktree.c
 #, c-format
 msgid "'%s' already exists"
 msgstr "'%s' 已經存在"
 
-#: builtin/worktree.c:230
+#: builtin/worktree.c
 #, c-format
 msgid "unusable worktree destination '%s'"
 msgstr "無法使用的工作目錄目的地「%s」"
 
-#: builtin/worktree.c:235
+#: builtin/worktree.c
 #, c-format
 msgid ""
 "'%s' is a missing but locked worktree;\n"
@@ -23985,7 +15907,7 @@ msgstr ""
 "「%s」是個遺失但被鎖定的工作區；\n"
 "使用「%s -f -f」覆蓋，或「unlock」和「prune」或「remove」清除"
 
-#: builtin/worktree.c:237
+#: builtin/worktree.c
 #, c-format
 msgid ""
 "'%s' is a missing but already registered worktree;\n"
@@ -23994,146 +15916,150 @@ msgstr ""
 "「%s」是個遺失但已註冊的工作區；\n"
 "使用「%s -f」覆蓋，或「prune」或「remove」清除"
 
-#: builtin/worktree.c:248
+#: builtin/worktree.c
 #, c-format
 msgid "failed to copy '%s' to '%s'; sparse-checkout may not work correctly"
 msgstr "無法將「%s」複製到「%s」；稀疏簽出可能無法正常運作"
 
-#: builtin/worktree.c:268
+#: builtin/worktree.c
 #, c-format
 msgid "failed to copy worktree config from '%s' to '%s'"
 msgstr "無法將工作區組態從「%s」複製到「%s」"
 
-#: builtin/worktree.c:280 builtin/worktree.c:285
+#: builtin/worktree.c
 #, c-format
 msgid "failed to unset '%s' in '%s'"
 msgstr "無法取消「%2$s」中「%1$s」的設定"
 
-#: builtin/worktree.c:356
+#: builtin/worktree.c
 #, c-format
 msgid "could not create directory of '%s'"
 msgstr "不能建立目錄 '%s'"
 
-#: builtin/worktree.c:378
+#: builtin/worktree.c
 msgid "initializing"
 msgstr "正在初始化"
 
-#: builtin/worktree.c:492 builtin/worktree.c:498
+#: builtin/worktree.c
 #, c-format
 msgid "Preparing worktree (new branch '%s')"
 msgstr "準備工作區（新分支 '%s'）"
 
-#: builtin/worktree.c:494
+#: builtin/worktree.c
 #, c-format
 msgid "Preparing worktree (resetting branch '%s'; was at %s)"
 msgstr "準備工作區（重設分支 '%s'，之前為 %s）"
 
-#: builtin/worktree.c:503
+#: builtin/worktree.c
 #, c-format
 msgid "Preparing worktree (checking out '%s')"
 msgstr "準備工作區（簽出 '%s'）"
 
-#: builtin/worktree.c:509
+#: builtin/worktree.c
 #, c-format
 msgid "Preparing worktree (detached HEAD %s)"
 msgstr "準備工作區（分離開頭指標 %s）"
 
-#: builtin/worktree.c:554
+#: builtin/worktree.c
 msgid "checkout <branch> even if already checked out in other worktree"
 msgstr "簽出 <分支>，即使已經被簽出到其它工作區"
 
-#: builtin/worktree.c:557
+#: builtin/worktree.c
 msgid "create a new branch"
 msgstr "建立一個新分支"
 
-#: builtin/worktree.c:559
+#: builtin/worktree.c
 msgid "create or reset a branch"
 msgstr "建立或重設一個分支"
 
-#: builtin/worktree.c:561
+#: builtin/worktree.c
 msgid "populate the new working tree"
 msgstr "生成新的工作區"
 
-#: builtin/worktree.c:562
+#: builtin/worktree.c
 msgid "keep the new working tree locked"
 msgstr "鎖定新工作區"
 
-#: builtin/worktree.c:564 builtin/worktree.c:809
+#: builtin/worktree.c
 msgid "reason for locking"
 msgstr "鎖定原因"
 
-#: builtin/worktree.c:567
+#: builtin/worktree.c
 msgid "set up tracking mode (see git-branch(1))"
 msgstr "設定追蹤模式（參見 git-branch(1)）"
 
-#: builtin/worktree.c:570
+#: builtin/worktree.c
 msgid "try to match the new branch name with a remote-tracking branch"
 msgstr "嘗試為新分支名符合一個遠端追蹤分支"
 
-#: builtin/worktree.c:584
+#: builtin/worktree.c diff.c parse-options.c
+#, c-format
+msgid "options '%s', '%s', and '%s' cannot be used together"
+msgstr "「%s」、「%s」和「%s」選項不得同時使用"
+
+#: builtin/worktree.c
 msgid "added with --lock"
 msgstr "已使用 --lock 加入"
 
-#: builtin/worktree.c:646
+#: builtin/worktree.c
 msgid "--[no-]track can only be used if a new branch is created"
 msgstr "只能在建立新分支時使用 --[no-]track 選項"
 
-#: builtin/worktree.c:766
+#: builtin/worktree.c
 msgid "show extended annotations and reasons, if available"
 msgstr "如果有則顯示延伸的註釋和原因"
 
-#: builtin/worktree.c:768
+#: builtin/worktree.c
 msgid "add 'prunable' annotation to worktrees older than <time>"
 msgstr "對舊於 <時間> 的工作區加上 ‘prunable’ 標示"
 
-#: builtin/worktree.c:770
+#: builtin/worktree.c
 msgid "terminate records with a NUL character"
 msgstr "以一個 NUL 字元終止記錄"
 
-#: builtin/worktree.c:821 builtin/worktree.c:854 builtin/worktree.c:928
-#: builtin/worktree.c:1052
+#: builtin/worktree.c
 #, c-format
 msgid "'%s' is not a working tree"
 msgstr "'%s' 不是一個工作區"
 
-#: builtin/worktree.c:823 builtin/worktree.c:856
+#: builtin/worktree.c
 msgid "The main working tree cannot be locked or unlocked"
 msgstr "主工作區無法被加鎖或解鎖"
 
-#: builtin/worktree.c:828
+#: builtin/worktree.c
 #, c-format
 msgid "'%s' is already locked, reason: %s"
 msgstr "'%s' 已被鎖定，原因：%s"
 
-#: builtin/worktree.c:830
+#: builtin/worktree.c
 #, c-format
 msgid "'%s' is already locked"
 msgstr "'%s' 已被鎖定"
 
-#: builtin/worktree.c:858
+#: builtin/worktree.c
 #, c-format
 msgid "'%s' is not locked"
 msgstr "'%s' 未被鎖定"
 
-#: builtin/worktree.c:899
+#: builtin/worktree.c
 msgid "working trees containing submodules cannot be moved or removed"
 msgstr "不能移動或刪除包含子模組的工作區"
 
-#: builtin/worktree.c:907
+#: builtin/worktree.c
 msgid "force move even if worktree is dirty or locked"
 msgstr "強制移動，即使工作區是髒的或已鎖定"
 
-#: builtin/worktree.c:930 builtin/worktree.c:1054
+#: builtin/worktree.c
 #, c-format
 msgid "'%s' is a main working tree"
 msgstr "'%s' 是一個主工作區"
 
-#: builtin/worktree.c:935
+#: builtin/worktree.c
 #, c-format
 msgid "could not figure out destination name from '%s'"
 msgstr "無法從 '%s' 算出目的地名稱"
 
-#: builtin/worktree.c:948
+#: builtin/worktree.c
 #, c-format
 msgid ""
 "cannot move a locked working tree, lock reason: %s\n"
@@ -24142,7 +16068,7 @@ msgstr ""
 "無法移動一個鎖定的工作區，鎖定原因：%s\n"
 "使用 'move -f -f' 覆蓋或先解鎖"
 
-#: builtin/worktree.c:950
+#: builtin/worktree.c
 msgid ""
 "cannot move a locked working tree;\n"
 "use 'move -f -f' to override or unlock first"
@@ -24150,36 +16076,36 @@ msgstr ""
 "無法移動一個鎖定的工作區，\n"
 "使用 'move -f -f' 覆蓋或先解鎖"
 
-#: builtin/worktree.c:953
+#: builtin/worktree.c
 #, c-format
 msgid "validation failed, cannot move working tree: %s"
 msgstr "驗證失敗，無法移動工作區：%s"
 
-#: builtin/worktree.c:958
+#: builtin/worktree.c
 #, c-format
 msgid "failed to move '%s' to '%s'"
 msgstr "移動 '%s' 到 '%s' 失敗"
 
-#: builtin/worktree.c:1004
+#: builtin/worktree.c
 #, c-format
 msgid "failed to run 'git status' on '%s'"
 msgstr "在 '%s' 中執行 'git status' 失敗"
 
-#: builtin/worktree.c:1008
+#: builtin/worktree.c
 #, c-format
 msgid "'%s' contains modified or untracked files, use --force to delete it"
 msgstr "'%s' 包含修改或未追蹤的檔案，使用 --force 刪除"
 
-#: builtin/worktree.c:1013
+#: builtin/worktree.c
 #, c-format
 msgid "failed to run 'git status' on '%s', code %d"
 msgstr "在 '%s' 中執行 'git status' 失敗，離開碼 %d"
 
-#: builtin/worktree.c:1036
+#: builtin/worktree.c
 msgid "force removal even if worktree is dirty or locked"
 msgstr "強制刪除，即使工作區是髒的或已鎖定"
 
-#: builtin/worktree.c:1059
+#: builtin/worktree.c
 #, c-format
 msgid ""
 "cannot remove a locked working tree, lock reason: %s\n"
@@ -24188,7 +16114,7 @@ msgstr ""
 "無法刪除一個鎖定的工作區，鎖定原因：%s\n"
 "使用 'remove -f -f' 覆蓋或先解鎖"
 
-#: builtin/worktree.c:1061
+#: builtin/worktree.c
 msgid ""
 "cannot remove a locked working tree;\n"
 "use 'remove -f -f' to override or unlock first"
@@ -24196,1502 +16122,9829 @@ msgstr ""
 "無法刪除一個鎖定的工作區，\n"
 "使用 'remove -f -f' 覆蓋或先解鎖"
 
-#: builtin/worktree.c:1064
+#: builtin/worktree.c
 #, c-format
 msgid "validation failed, cannot remove working tree: %s"
 msgstr "驗證失敗，無法刪除工作區：%s"
 
-#: builtin/worktree.c:1088
+#: builtin/worktree.c
 #, c-format
 msgid "repair: %s: %s"
 msgstr "修復：%s：%s"
 
-#: builtin/worktree.c:1091
+#: builtin/worktree.c
 #, c-format
 msgid "error: %s: %s"
 msgstr "錯誤：%s：%s"
 
-#: builtin/write-tree.c:15
+#: builtin/write-tree.c
 msgid "git write-tree [--missing-ok] [--prefix=<prefix>/]"
 msgstr "git write-tree [--missing-ok] [--prefix=<前綴>/]"
 
-#: builtin/write-tree.c:28
+#: builtin/write-tree.c
 msgid "<prefix>/"
 msgstr "<前綴>/"
 
-#: builtin/write-tree.c:29
+#: builtin/write-tree.c
 msgid "write tree object for a subdirectory <prefix>"
 msgstr "將 <前綴> 子目錄內容寫到一個樹狀物件"
 
-#: builtin/write-tree.c:31
+#: builtin/write-tree.c
 msgid "only useful for debugging"
 msgstr "只對除錯有用"
 
-#: git.c:28
-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"
-"           [--git-dir=<path>] [--work-tree=<path>] [--namespace=<name>]\n"
-"           [--super-prefix=<path>] [--config-env=<name>=<envvar>]\n"
-"           <command> [<args>]"
-msgstr ""
-"git [--version] [--help] [-C <路徑>] [-c <名稱>=<數值>]\n"
-"           [--exec-path[=<路徑>]] [--html-path] [--man-path] [--info-path]\n"
-"           [-p | --paginate | -P | --no-pager] [--no-replace-objects] [--"
-"bare]\n"
-"           [--git-dir=<路徑>] [--work-tree=<路徑>] [--namespace=<名稱>]\n"
-"           [--super-prefix=<路徑>] [--config-env=<名稱>=<環境變數>]\n"
-"           <命令> [<引數>]"
-
-#: git.c:36
-msgid ""
-"'git help -a' and 'git help -g' list available subcommands and some\n"
-"concept guides. See 'git help <command>' or 'git help <concept>'\n"
-"to read about a specific subcommand or concept.\n"
-"See 'git help git' for an overview of the system."
-msgstr ""
-"指令 'git help -a' 和 'git help -g' 顯示可用的子指令和一些概念說明。\n"
-"檢視 'git help <命令>' 或 'git help <概念>' 以取得提供子指令或概念\n"
-"說明。\n"
-"有關系統概述，檢視 'git help git'。"
-
-#: git.c:188 git.c:216 git.c:300
-#, c-format
-msgid "no directory given for '%s' option\n"
-msgstr "未傳入目錄至「%s」選項\n"
-
-#: git.c:202
-#, c-format
-msgid "no namespace given for --namespace\n"
-msgstr "沒有為 --namespace 提供命名空間\n"
-
-#: git.c:230
-#, c-format
-msgid "no prefix given for --super-prefix\n"
-msgstr "沒有為 --super-prefix 提供前綴\n"
-
-#: git.c:252
-#, c-format
-msgid "-c expects a configuration string\n"
-msgstr "應為 -c 提供一個設定字串\n"
-
-#: git.c:260
-#, c-format
-msgid "no config key given for --config-env\n"
-msgstr "未傳入設定鍵至 --config-env\n"
-
-#: git.c:326
-#, c-format
-msgid "unknown option: %s\n"
-msgstr "未知選項：%s\n"
-
-#: git.c:375
-#, c-format
-msgid "while expanding alias '%s': '%s'"
-msgstr "在展開別名 '%s' 時：'%s'"
-
-#: git.c:384
-#, c-format
-msgid ""
-"alias '%s' changes environment variables.\n"
-"You can use '!git' in the alias to do this"
-msgstr ""
-"別名 '%s' 修改環境變數。您可以使用在別名中\n"
-"使用 '!git'"
-
-#: git.c:391
-#, c-format
-msgid "empty alias for %s"
-msgstr "%s 的空別名"
-
-#: git.c:394
-#, c-format
-msgid "recursive alias: %s"
-msgstr "遞迴的別名：%s"
-
-#: git.c:480
-msgid "write failure on standard output"
-msgstr "在標準輸出寫入失敗"
-
-#: git.c:482
-msgid "unknown write failure on standard output"
-msgstr "到標準輸出的未知寫入錯誤"
-
-#: git.c:484
-msgid "close failed on standard output"
-msgstr "標準輸出關閉失敗"
-
-#: git.c:838
-#, c-format
-msgid "alias loop detected: expansion of '%s' does not terminate:%s"
-msgstr "偵測到別名循環：展開後的「%s」無窮無盡：%s"
-
-#: git.c:888
-#, c-format
-msgid "cannot handle %s as a builtin"
-msgstr "不能作為內建指令處理 %s"
-
-#: git.c:901
-#, c-format
-msgid ""
-"usage: %s\n"
-"\n"
-msgstr ""
-"用法：%s\n"
-"\n"
-
-#: git.c:921
-#, c-format
-msgid "expansion of alias '%s' failed; '%s' is not a git command\n"
-msgstr "展開別名指令 '%s' 失敗，'%s' 不是一個 git 指令\n"
-
-#: git.c:933
-#, c-format
-msgid "failed to run command '%s': %s\n"
-msgstr "執行指令 '%s' 失敗：%s\n"
-
-#: http-fetch.c:128
-#, c-format
-msgid "argument to --packfile must be a valid hash (got '%s')"
-msgstr "傳入 --packfile 的參數必須是有效的雜湊 (收到 '%s')"
-
-#: http-fetch.c:138
-msgid "not a git repository"
-msgstr "不是一個 git 版本庫"
-
-#: t/helper/test-fast-rebase.c:141
-msgid "unhandled options"
-msgstr "未處理選項"
-
-#: t/helper/test-fast-rebase.c:146
-msgid "error preparing revisions"
-msgstr "準備修訂版本時發生錯誤"
-
-#: t/helper/test-reach.c:154
-#, c-format
-msgid "commit %s is not marked reachable"
-msgstr "提交 %s 沒有標記為可以取得"
-
-#: t/helper/test-reach.c:164
-msgid "too many commits marked reachable"
-msgstr "太多提交標記為可以取得"
-
-#: t/helper/test-serve-v2.c:7
-msgid "test-tool serve-v2 [<options>]"
-msgstr "test-tool serve-v2 [<選項>]"
-
-#: t/helper/test-serve-v2.c:19
-msgid "exit immediately after advertising capabilities"
-msgstr "對能力廣告之後立即離開"
-
-#: 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: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: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: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:585
-msgid "test-helper simple-ipc send         [<name>] [<token>]"
-msgstr "test-helper simple-ipc send         [<name>] [<token>]"
-
-#: 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:587
-msgid ""
-"test-helper simple-ipc multiple     [<name>] [<threads>] [<bytecount>] "
-"[<batchsize>]"
-msgstr ""
-"test-helper simple-ipc multiple     [<name>] [<threads>] [<bytecount>] "
-"[<batchsize>]"
-
-#: t/helper/test-simple-ipc.c:595
-msgid "name or pathname of unix domain socket"
-msgstr "Unix 網域通訊端的名稱或路徑名稱"
-
-#: t/helper/test-simple-ipc.c:597
-msgid "named-pipe name"
-msgstr "有命名管道的名稱"
-
-#: t/helper/test-simple-ipc.c:599
-msgid "number of threads in server thread pool"
-msgstr "伺服器執行緒集區的執行緒數量"
-
-#: t/helper/test-simple-ipc.c:600
-msgid "seconds to wait for daemon to start or stop"
-msgstr "要等待守護程式啟動或停止多久（秒）"
-
-#: t/helper/test-simple-ipc.c:602
-msgid "number of bytes"
-msgstr "位元組數"
-
-#: t/helper/test-simple-ipc.c:603
-msgid "number of requests per thread"
-msgstr "每個執行緒的請求數"
-
-#: t/helper/test-simple-ipc.c:605
-msgid "byte"
-msgstr "位元組"
-
-#: t/helper/test-simple-ipc.c:605
-msgid "ballast character"
-msgstr "穩定 (ballast) 字元"
-
-#: t/helper/test-simple-ipc.c:606
-msgid "token"
-msgstr "代符"
-
-#: t/helper/test-simple-ipc.c:606
-msgid "command token to send to the server"
-msgstr "要傳送至伺服器的命令代符"
-
-#: http.c:350
-#, c-format
-msgid "negative value for http.postbuffer; defaulting to %d"
-msgstr "http.postbuffer 為負值，預設為 %d"
-
-#: http.c:371
-msgid "Delegation control is not supported with cURL < 7.22.0"
-msgstr "不支援委託控制，因為 cURL < 7.22.0"
-
-#: http.c:380
-msgid "Public key pinning not supported with cURL < 7.39.0"
-msgstr "不支援公鑰檔案鎖定，因為 cURL < 7.39.0"
-
-#: http.c:812
-msgid "CURLSSLOPT_NO_REVOKE not supported with cURL < 7.44.0"
-msgstr "不支援 CURLSSLOPT_NO_REVOKE，因為 cURL < 7.44.0"
-
-#: http.c:1016
-#, c-format
-msgid "Unsupported SSL backend '%s'. Supported SSL backends:"
-msgstr "不支援的 SSL 後端 '%s'。支援的 SSL 後端："
-
-#: 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:1027
-#, c-format
-msgid "Could not set SSL backend to '%s': already set"
-msgstr "無法將 SSL 後端設定為 '%s'：已經設定"
-
-#: http.c:1876
-#, c-format
-msgid ""
-"unable to update url base from redirection:\n"
-"  asked for: %s\n"
-"   redirect: %s"
-msgstr ""
-"不能更新重定向的 url base：\n"
-"     請求：%s\n"
-"   重定向：%s"
-
-#: remote-curl.c:184
-#, c-format
-msgid "invalid quoting in push-option value: '%s'"
-msgstr "在 push-option 取值中無效的引號：'%s'"
-
-#: remote-curl.c:308
-#, c-format
-msgid "%sinfo/refs not valid: is this a git repository?"
-msgstr "%sinfo/refs 無效：這是一個 git 版本庫嗎？"
-
-#: remote-curl.c:409
-msgid "invalid server response; expected service, got flush packet"
-msgstr "無效的服務端回應。預期服務，得到 flush 包"
-
-#: remote-curl.c:440
-#, c-format
-msgid "invalid server response; got '%s'"
-msgstr "無效的服務端回應，得到 '%s'"
-
-#: remote-curl.c:500
-#, c-format
-msgid "repository '%s' not found"
-msgstr "版本庫 '%s' 未找到"
-
-#: remote-curl.c:504
-#, c-format
-msgid "Authentication failed for '%s'"
-msgstr "'%s' 身份驗證失敗"
-
-#: remote-curl.c:508
-#, c-format
-msgid "unable to access '%s' with http.pinnedPubkey configuration: %s"
-msgstr "無法依 http.pinnedPubkey 之設定存取「%s」：%s"
-
-#: remote-curl.c:512
-#, c-format
-msgid "unable to access '%s': %s"
-msgstr "無法存取 '%s'：%s"
-
-#: remote-curl.c:518
+#: bundle.c
 #, c-format
-msgid "redirecting to %s"
-msgstr "重定向到 %s"
-
-#: remote-curl.c:649
-msgid "shouldn't have EOF when not gentle on EOF"
-msgstr "當沒有設定溫和處理檔案結束符（EOF）時，不應該有檔案結束符"
-
-#: remote-curl.c:661
-msgid "remote server sent unexpected response end packet"
-msgstr "遠端伺服器傳送了非預期的回應結束封包"
-
-#: remote-curl.c:730
-msgid "unable to rewind rpc post data - try increasing http.postBuffer"
-msgstr "無法還原 rpc post 資料 - 嘗試增加 http.postBuffer"
+msgid "unrecognized bundle hash algorithm: %s"
+msgstr "無法識別的套件雜湊演算法：%s"
 
-#: remote-curl.c:759
+#: bundle.c
 #, c-format
-msgid "remote-curl: bad line length character: %.4s"
-msgstr "remote-curl: 錯誤的行長度字串：%.4s"
-
-#: remote-curl.c:761
-msgid "remote-curl: unexpected response end packet"
-msgstr "remote-curl: 非預期的回應結束封包"
+msgid "unknown capability '%s'"
+msgstr "未知功能 '%s'"
 
-#: remote-curl.c:837
+#: bundle.c
 #, c-format
-msgid "RPC failed; %s"
-msgstr "RPC 失敗。%s"
-
-#: remote-curl.c:877
-msgid "cannot handle pushes this big"
-msgstr "不能處理這麼大的推送"
+msgid "'%s' does not look like a v2 or v3 bundle file"
+msgstr "'%s' 不像是一個 v2 或 v3 版本的套件檔案"
 
-#: remote-curl.c:990
+#: bundle.c
 #, c-format
-msgid "cannot deflate request; zlib deflate error %d"
-msgstr "不能壓縮請求，zlib 壓縮錯誤 %d"
+msgid "unrecognized header: %s%s (%d)"
+msgstr "無法識別的包頭：%s%s (%d)"
 
-#: remote-curl.c:994
-#, c-format
-msgid "cannot deflate request; zlib end error %d"
-msgstr "不能壓縮請求，zlib 結束錯誤 %d"
+#: bundle.c
+msgid "Repository lacks these prerequisite commits:"
+msgstr "版本庫中缺少這些必備的提交："
 
-#: remote-curl.c:1044
-#, c-format
-msgid "%d bytes of length header were received"
-msgstr "收到了 %d 位元組長度的標頭"
+#: bundle.c
+msgid "need a repository to verify a bundle"
+msgstr "需要版本庫驗證套件"
 
-#: remote-curl.c:1046
+#: bundle.c
 #, c-format
-msgid "%d bytes of body are still expected"
-msgstr "預期仍要有 %d 位元組的本文 (body)"
-
-#: remote-curl.c:1135
-msgid "dumb http transport does not support shallow capabilities"
-msgstr "啞 http 傳輸不支援 shallow 能力"
-
-#: remote-curl.c:1150
-msgid "fetch failed."
-msgstr "取得失敗。"
-
-#: remote-curl.c:1198
-msgid "cannot fetch by sha1 over smart http"
-msgstr "無法透過智慧 HTTP 取得 sha1"
+msgid "The bundle contains this ref:"
+msgid_plural "The bundle contains these %<PRIuMAX> refs:"
+msgstr[0] "這個套件含有這 %<PRIuMAX> 個引用："
 
-#: remote-curl.c:1242 remote-curl.c:1248
-#, c-format
-msgid "protocol error: expected sha/ref, got '%s'"
-msgstr "協定錯誤：期望 sha/ref，卻得到 '%s'"
+#: bundle.c
+msgid "The bundle records a complete history."
+msgstr "這個套件記錄完整歷史紀錄。"
 
-#: remote-curl.c:1260 remote-curl.c:1378
+#: bundle.c
 #, c-format
-msgid "http transport does not support %s"
-msgstr "http 傳輸協定不支援 %s"
-
-#: remote-curl.c:1296
-msgid "git-http-push failed"
-msgstr "git-http-push 失敗"
-
-#: remote-curl.c:1485
-msgid "remote-curl: usage: git remote-curl <remote> [<url>]"
-msgstr "remote-curl：用法：git remote-curl <遠端> [<url>]"
-
-#: remote-curl.c:1517
-msgid "remote-curl: error reading command stream from git"
-msgstr "remote-curl：錯誤讀取來自 git 的指令流"
-
-#: remote-curl.c:1524
-msgid "remote-curl: fetch attempted without a local repo"
-msgstr "remote-curl：嘗試沒有本機版本庫下取得"
+msgid "The bundle requires this ref:"
+msgid_plural "The bundle requires these %<PRIuMAX> refs:"
+msgstr[0] "這個套件需要這 %<PRIuMAX> 個引用："
 
-#: remote-curl.c:1565
-#, c-format
-msgid "remote-curl: unknown command '%s' from git"
-msgstr "remote-curl：未知的來自 git 的指令 '%s'"
+#: bundle.c
+msgid "unable to dup bundle descriptor"
+msgstr "無法複製套件描述符"
 
-#: contrib/scalar/scalar.c:49
-msgid "need a working directory"
-msgstr "需要工作目錄"
+#: bundle.c
+msgid "Could not spawn pack-objects"
+msgstr "不能生成 pack-objects 進程"
 
-#: contrib/scalar/scalar.c:86
-msgid "could not find enlistment root"
-msgstr "找不到編列名單的根目錄"
+#: bundle.c
+msgid "pack-objects died"
+msgstr "pack-objects 終止"
 
-#: contrib/scalar/scalar.c:89 contrib/scalar/scalar.c:350
-#: contrib/scalar/scalar.c:435 contrib/scalar/scalar.c:578
+#: bundle.c
 #, c-format
-msgid "could not switch to '%s'"
-msgstr "無法切換至「%s」"
+msgid "ref '%s' is excluded by the rev-list options"
+msgstr "引用 '%s' 被 rev-list 選項排除"
 
-#: contrib/scalar/scalar.c:179
+#: bundle.c
 #, c-format
-msgid "could not configure %s=%s"
-msgstr "無法設定 %s=%s"
-
-#: contrib/scalar/scalar.c:197
-msgid "could not configure log.excludeDecoration"
-msgstr "無法設定 log.excludeDecoration"
-
-#: contrib/scalar/scalar.c:218
-msgid "Scalar enlistments require a worktree"
-msgstr "純量編列名單需要工作目錄"
+msgid "unsupported bundle version %d"
+msgstr "不支援的套件版本 %d"
 
-#: contrib/scalar/scalar.c:310
+#: bundle.c
 #, c-format
-msgid "remote HEAD is not a branch: '%.*s'"
-msgstr "遠端 HEAD 不是分支：「%.*s」"
-
-#: contrib/scalar/scalar.c:316
-msgid "failed to get default branch name from remote; using local default"
-msgstr "無法從遠端取得預設分支名稱。改用本機預設名稱"
-
-#: contrib/scalar/scalar.c:329
-msgid "failed to get default branch name"
-msgstr "無法取得預設分支名稱"
-
-#: contrib/scalar/scalar.c:340
-msgid "failed to unregister repository"
-msgstr "無法取消註冊版本庫"
-
-#: contrib/scalar/scalar.c:355
-msgid "failed to delete enlistment directory"
-msgstr "無法刪除編列名單目錄"
-
-#: contrib/scalar/scalar.c:375
-msgid "branch to checkout after clone"
-msgstr "複製後要簽出的分支"
-
-#: contrib/scalar/scalar.c:377
-msgid "when cloning, create full working directory"
-msgstr "複製時建立完整的工作目錄"
-
-#: contrib/scalar/scalar.c:379
-msgid "only download metadata for the branch that will be checked out"
-msgstr "只下載會簽出的分支中介資料"
-
-#: contrib/scalar/scalar.c:384
-msgid "scalar clone [<options>] [--] <repo> [<dir>]"
-msgstr "scalar clone [<options>] [--] <repo> [<dir>]"
+msgid "cannot write bundle version %d with algorithm %s"
+msgstr "無法寫入 %2$s 演算法的套件版本 %1$d"
 
-#: contrib/scalar/scalar.c:409
-#, c-format
-msgid "cannot deduce worktree name from '%s'"
-msgstr "無法從「%s」推論工作區名稱"
+#: bundle.c
+msgid "Refusing to create empty bundle."
+msgstr "不能建立空套件。"
 
-#: contrib/scalar/scalar.c:418
+#: bundle.c
 #, c-format
-msgid "directory '%s' exists already"
-msgstr "「%s」目錄已經存在"
+msgid "cannot create '%s'"
+msgstr "不能建立 '%s'"
 
-#: contrib/scalar/scalar.c:445
-#, c-format
-msgid "failed to get default branch for '%s'"
-msgstr "無法取得「%s」的預設分支"
+#: bundle.c
+msgid "index-pack died"
+msgstr "index-pack 終止"
 
-#: contrib/scalar/scalar.c:456
-#, c-format
-msgid "could not configure remote in '%s'"
-msgstr "無法設定「%s」中的遠端"
+#: chunk-format.c
+msgid "terminating chunk id appears earlier than expected"
+msgstr "終止區塊 id 出現的時間早於預期"
 
-#: contrib/scalar/scalar.c:465
+#: chunk-format.c
 #, c-format
-msgid "could not configure '%s'"
-msgstr "無法設定「%s」"
-
-#: contrib/scalar/scalar.c:468
-msgid "partial clone failed; attempting full clone"
-msgstr "部分複製失敗。嘗試完整複製"
-
-#: contrib/scalar/scalar.c:472
-msgid "could not configure for full clone"
-msgstr "無法設定完整複製"
-
-#: contrib/scalar/scalar.c:504
-msgid "`scalar list` does not take arguments"
-msgstr "`scalar list` 未取引數"
-
-#: contrib/scalar/scalar.c:517
-msgid "scalar register [<enlistment>]"
-msgstr "scalar register [<enlistment>]"
-
-#: contrib/scalar/scalar.c:544
-msgid "reconfigure all registered enlistments"
-msgstr "重新設定所有註冊的編列名單"
-
-#: contrib/scalar/scalar.c:548
-msgid "scalar reconfigure [--all | <enlistment>]"
-msgstr "scalar reconfigure [--all | <enlistment>]"
-
-#: contrib/scalar/scalar.c:566
-msgid "--all or <enlistment>, but not both"
-msgstr "--all 或 <enlistment> 但不能傳入兩者"
+msgid "improper chunk offset(s) %<PRIx64> and %<PRIx64>"
+msgstr "不正確的區塊偏移 %<PRIx64> 及 %<PRIx64>"
 
-#: contrib/scalar/scalar.c:581
+#: chunk-format.c
 #, c-format
-msgid "git repository gone in '%s'"
-msgstr "git 版本庫在「%s」遺失"
-
-#: contrib/scalar/scalar.c:621
-msgid ""
-"scalar run <task> [<enlistment>]\n"
-"Tasks:\n"
-msgstr ""
-"scalar run <task> [<enlistment>]\n"
-"作業：\n"
+msgid "duplicate chunk ID %<PRIx32> found"
+msgstr "找到重複的區塊 ID %<PRIx32>"
 
-#: contrib/scalar/scalar.c:639
+#: chunk-format.c
 #, c-format
-msgid "no such task: '%s'"
-msgstr "無此作業：「%s」"
-
-#: contrib/scalar/scalar.c:689
-msgid "scalar unregister [<enlistment>]"
-msgstr "scalar unregister [<enlistment>]"
-
-#: contrib/scalar/scalar.c:736
-msgid "scalar delete <enlistment>"
-msgstr "scalar delete <enlistment>"
-
-#: contrib/scalar/scalar.c:751
-msgid "refusing to delete current working directory"
-msgstr "拒絕刪除目前工作目錄"
-
-#: contrib/scalar/scalar.c:766
-msgid "include Git version"
-msgstr "包含 Git 版本"
-
-#: contrib/scalar/scalar.c:768
-msgid "include Git's build options"
-msgstr "包含 Git 組建選項"
-
-#: contrib/scalar/scalar.c:772
-msgid "scalar verbose [-v | --verbose] [--build-options]"
-msgstr "scalar verbose [-v | --verbose] [--build-options]"
+msgid "final chunk has non-zero id %<PRIx32>"
+msgstr "最終區塊有非零 ID %<PRIx32>"
 
-#: contrib/scalar/scalar.c:813
-msgid "-C requires a <directory>"
-msgstr "-C 需要 <directory>"
+#: chunk-format.c
+msgid "invalid hash version"
+msgstr "無效的雜湊版本"
 
-#: contrib/scalar/scalar.c:815
+#: color.c
 #, c-format
-msgid "could not change to '%s'"
-msgstr "無法更改為「%s」"
-
-#: contrib/scalar/scalar.c:821
-msgid "-c requires a <key>=<value> argument"
-msgstr "-c 需要 <key>=<value> 引數"
-
-#: contrib/scalar/scalar.c:839
-msgid ""
-"scalar [-C <directory>] [-c <key>=<value>] <command> [<options>]\n"
-"\n"
-"Commands:\n"
-msgstr ""
-"scalar [-C <directory>] [-c <key>=<value>] <command> [<options>]\n"
-"\n"
-"命令：\n"
-
-#: compat/compiler.h:26
-msgid "no compiler information available\n"
-msgstr "沒有可用的編譯器資訊\n"
-
-#: compat/compiler.h:38
-msgid "no libc information available\n"
-msgstr "沒有可用的 libc 資訊\n"
-
-#: list-objects-filter-options.h:126
-msgid "args"
-msgstr "參數"
-
-#: list-objects-filter-options.h:127
-msgid "object filtering"
-msgstr "物件過濾"
-
-#: parse-options.h:188
-msgid "expiry-date"
-msgstr "到期時間"
-
-#: parse-options.h:202
-msgid "no-op (backward compatibility)"
-msgstr "空動作（向後相容）"
-
-#: parse-options.h:341
-msgid "be more verbose"
-msgstr "更加詳細"
-
-#: parse-options.h:343
-msgid "be more quiet"
-msgstr "更加安靜"
-
-#: parse-options.h:349
-msgid "use <n> digits to display object names"
-msgstr "用 <n> 位數字顯示物件名稱"
-
-#: parse-options.h:368
-msgid "how to strip spaces and #comments from message"
-msgstr "設定如何刪除提交說明裡的空格和 #備註"
-
-#: parse-options.h:369
-msgid "read pathspec from file"
-msgstr "從檔案讀取 <路徑規格>"
-
-#: parse-options.h:370
-msgid ""
-"with --pathspec-from-file, pathspec elements are separated with NUL character"
-msgstr "如使用 --pathspec-from-file，則 <路徑規格> 元件會使用 NUL 字元分隔"
-
-#: ref-filter.h:98
-msgid "key"
-msgstr "key"
-
-#: ref-filter.h:98
-msgid "field name to sort on"
-msgstr "排序的欄位名"
-
-#: rerere.h:44
-msgid "update the index with reused conflict resolution if possible"
-msgstr "如果可能，重用衝突解決更新索引"
+msgid "invalid color value: %.*s"
+msgstr "無效的顏色值：%.*s"
 
-#: command-list.h:50
+#: command-list.h
 msgid "Add file contents to the index"
 msgstr "新增檔案內容至索引"
 
-#: command-list.h:51
+#: command-list.h
 msgid "Apply a series of patches from a mailbox"
 msgstr "套用信箱格式的系列修補檔"
 
-#: command-list.h:52
+#: command-list.h
 msgid "Annotate file lines with commit information"
 msgstr "使用提交說明備註檔案行"
 
-#: command-list.h:53
+#: command-list.h
 msgid "Apply a patch to files and/or to the index"
 msgstr "套用一個修補檔到檔案和/或索引區"
 
-#: command-list.h:54
+#: command-list.h
 msgid "Import a GNU Arch repository into Git"
 msgstr "將一個 GNU Arch 版本庫匯入到 Git"
 
-#: command-list.h:55
+#: command-list.h
 msgid "Create an archive of files from a named tree"
 msgstr "基於命名過的樹建立檔案封存"
 
-#: command-list.h:56
+#: command-list.h
 msgid "Use binary search to find the commit that introduced a bug"
 msgstr "透過二分搜尋定位引入 bug 的提交"
 
-#: command-list.h:57
+#: command-list.h
 msgid "Show what revision and author last modified each line of a file"
 msgstr "顯示檔案每一行最後修改的版本和修改者"
 
-#: command-list.h:58
+#: command-list.h
 msgid "List, create, or delete branches"
 msgstr "列出、建立或刪除分支"
 
-#: command-list.h:59
+#: command-list.h
 msgid "Collect information for user to file a bug report"
 msgstr "幫使用者收集要遞送臭蟲報告的資訊"
 
-#: command-list.h:60
+#: command-list.h
 msgid "Move objects and refs by archive"
 msgstr "透過歸檔移動物件和引用"
 
-#: command-list.h:61
+#: command-list.h
 msgid "Provide content or type and size information for repository objects"
 msgstr "提供版本庫物件的內容、類型或大小"
 
-#: command-list.h:62
+#: command-list.h
 msgid "Display gitattributes information"
 msgstr "顯示 gitattributes 訊息"
 
-#: command-list.h:63
+#: command-list.h
 msgid "Debug gitignore / exclude files"
 msgstr "除錯 gitignore / exclude 檔案"
 
-#: command-list.h:64
+#: command-list.h
 msgid "Show canonical names and email addresses of contacts"
 msgstr "顯示聯絡人的規範名稱和電子信件"
 
-#: command-list.h:65
+#: command-list.h
 msgid "Ensures that a reference name is well formed"
 msgstr "確保引用名稱格式正確"
 
-#: command-list.h:66
+#: command-list.h
 msgid "Switch branches or restore working tree files"
 msgstr "切換分支或復原工作區檔案"
 
-#: command-list.h:67
+#: command-list.h
 msgid "Copy files from the index to the working tree"
 msgstr "從索引複製檔案到工作區"
 
-#: command-list.h:68
+#: command-list.h
 msgid "Find commits yet to be applied to upstream"
 msgstr "尋找尚未套用到上游的提交"
 
-#: command-list.h:69
+#: command-list.h
 msgid "Apply the changes introduced by some existing commits"
 msgstr "套用一些現存提交引入的修改"
 
-#: command-list.h:70
+#: command-list.h
 msgid "Graphical alternative to git-commit"
 msgstr "git-commit 的圖形替代介面"
 
-#: command-list.h:71
+#: command-list.h
 msgid "Remove untracked files from the working tree"
 msgstr "從工作區中刪除未追蹤檔案"
 
-#: command-list.h:72
+#: command-list.h
 msgid "Clone a repository into a new directory"
 msgstr "複製版本庫至新目錄"
 
-#: command-list.h:73
+#: command-list.h
 msgid "Display data in columns"
 msgstr "以列的方式顯示資料"
 
-#: command-list.h:74
+#: command-list.h
 msgid "Record changes to the repository"
 msgstr "記錄變更到版本庫"
 
-#: command-list.h:75
+#: command-list.h
 msgid "Write and verify Git commit-graph files"
 msgstr "寫入和驗證 Git 提交圖檔案"
 
-#: command-list.h:76
+#: command-list.h
 msgid "Create a new commit object"
 msgstr "建立一個新的提交物件"
 
-#: command-list.h:77
+#: command-list.h
 msgid "Get and set repository or global options"
 msgstr "取得和設定版本庫或者全域選項"
 
-#: command-list.h:78
+#: command-list.h
 msgid "Count unpacked number of objects and their disk consumption"
 msgstr "計算未打包物件的數量和磁碟空間占用"
 
-#: command-list.h:79
+#: command-list.h
 msgid "Retrieve and store user credentials"
 msgstr "檢索和儲存使用者密碼"
 
-#: command-list.h:80
+#: command-list.h
 msgid "Helper to temporarily store passwords in memory"
 msgstr "在記憶體中暫時儲存密碼的協助工具"
 
-#: command-list.h:81
+#: command-list.h
 msgid "Helper to store credentials on disk"
 msgstr "在磁碟儲存密碼的協助工具"
 
-#: command-list.h:82
+#: command-list.h
 msgid "Export a single commit to a CVS checkout"
 msgstr "將一個提交匯出到 CVS 簽出中"
 
-#: command-list.h:83
+#: command-list.h
 msgid "Salvage your data out of another SCM people love to hate"
 msgstr "從另外一個人們愛恨的設定管理系統中拯救你的資料"
 
-#: command-list.h:84
+#: command-list.h
 msgid "A CVS server emulator for Git"
 msgstr "Git 的一個 CVS 服務模擬器"
 
-#: command-list.h:85
+#: command-list.h
 msgid "A really simple server for Git repositories"
 msgstr "一個非常簡單的 Git 版本庫伺服器"
 
-#: command-list.h:86
+#: command-list.h
 msgid "Give an object a human readable name based on an available ref"
 msgstr "基於一個現存的引用為一個物件起一個可讀的名稱"
 
-#: command-list.h:87
+#: command-list.h
 msgid "Show changes between commits, commit and working tree, etc"
 msgstr "顯示提交之間、提交和工作區之間等的差異"
 
-#: command-list.h:88
+#: command-list.h
 msgid "Compares files in the working tree and the index"
 msgstr "比較工作區和索引區中的檔案"
 
-#: command-list.h:89
+#: command-list.h
 msgid "Compare a tree to the working tree or index"
 msgstr "將一個樹和工作區或索引做比較"
 
-#: command-list.h:90
+#: command-list.h
 msgid "Compares the content and mode of blobs found via two tree objects"
 msgstr "比較兩個樹狀物件的檔案內容和模式"
 
-#: command-list.h:91
+#: command-list.h
 msgid "Show changes using common diff tools"
 msgstr "使用常見的差異工具顯示更改"
 
-#: command-list.h:92
+#: command-list.h
 msgid "Git data exporter"
 msgstr "Git 資料匯出器"
 
-#: command-list.h:93
+#: command-list.h
 msgid "Backend for fast Git data importers"
 msgstr "Git 快速資料匯入器後端"
 
-#: command-list.h:94
+#: command-list.h
 msgid "Download objects and refs from another repository"
 msgstr "從另外一個版本庫下載物件和引用"
 
-#: command-list.h:95
+#: command-list.h
 msgid "Receive missing objects from another repository"
 msgstr "從另一個版本庫取得缺少的物件"
 
-#: command-list.h:96
+#: command-list.h
 msgid "Rewrite branches"
 msgstr "重寫分支"
 
-#: command-list.h:97
+#: command-list.h
 msgid "Produce a merge commit message"
 msgstr "生成一個合併提交說明"
 
-#: command-list.h:98
+#: command-list.h
 msgid "Output information on each ref"
 msgstr "對每一個引用輸出訊息"
 
-#: command-list.h:99
+#: command-list.h
 msgid "Run a Git command on a list of repositories"
 msgstr "在列表中的版本庫中執行 Git 命令"
 
-#: command-list.h:100
+#: command-list.h
 msgid "Prepare patches for e-mail submission"
 msgstr "準備電子信件提交的修補檔"
 
-#: command-list.h:101
+#: command-list.h
 msgid "Verifies the connectivity and validity of the objects in the database"
 msgstr "驗證版本庫中物件的連通性和有效性"
 
-#: command-list.h:102
+#: command-list.h
 msgid "Cleanup unnecessary files and optimize the local repository"
 msgstr "清除不必要的檔案和最佳化本機版本庫"
 
-#: command-list.h:103
+#: command-list.h
 msgid "Extract commit ID from an archive created using git-archive"
 msgstr "從 git-archive 建立的歸檔檔案中擷取提交 ID"
 
-#: command-list.h:104
+#: command-list.h
 msgid "Print lines matching a pattern"
 msgstr "輸出和模式符合的行"
 
-#: command-list.h:105
+#: command-list.h
 msgid "A portable graphical interface to Git"
 msgstr "一個便攜的 Git 圖形用戶端"
 
-#: command-list.h:106
+#: command-list.h
 msgid "Compute object ID and optionally creates a blob from a file"
 msgstr "從一個檔案計算物件 ID，並可以建立 blob 資料物件"
 
-#: command-list.h:107
+#: command-list.h
 msgid "Display help information about Git"
 msgstr "顯示 Git 的說明訊息"
 
-#: command-list.h:108
+#: command-list.h
 msgid "Run git hooks"
 msgstr "執行 git 掛鉤"
 
-#: command-list.h:109
+#: command-list.h
 msgid "Server side implementation of Git over HTTP"
 msgstr "Git HTTP 協定的服務端實現"
 
-#: command-list.h:110
+#: command-list.h
 msgid "Download from a remote Git repository via HTTP"
 msgstr "通過 HTTP 從遠端 Git 版本庫下載"
 
-#: command-list.h:111
+#: command-list.h
 msgid "Push objects over HTTP/DAV to another repository"
 msgstr "通過 HTTP/DAV 推送物件另一個版本庫"
 
-#: command-list.h:112
+#: command-list.h
 msgid "Send a collection of patches from stdin to an IMAP folder"
 msgstr "從標準輸入將一組修補檔傳送到IMAP資料夾"
 
-#: command-list.h:113
+#: command-list.h
 msgid "Build pack index file for an existing packed archive"
 msgstr "從一個現存的包存檔檔案建立包索引"
 
-#: command-list.h:114
+#: command-list.h
 msgid "Create an empty Git repository or reinitialize an existing one"
 msgstr "建立一個空的 Git 版本庫或重新初始化一個已存在的版本庫"
 
-#: command-list.h:115
+#: command-list.h
 msgid "Instantly browse your working repository in gitweb"
 msgstr "在 gitweb 中即時瀏覽您的工作版本庫"
 
-#: command-list.h:116
+#: command-list.h
 msgid "Add or parse structured information in commit messages"
 msgstr "新增或解析提交說明中的結構化訊息"
 
-#: command-list.h:117
+#: command-list.h
 msgid "Show commit logs"
 msgstr "顯示提交日誌"
 
-#: command-list.h:118
+#: command-list.h
 msgid "Show information about files in the index and the working tree"
 msgstr "顯示索引和工作區中檔案的訊息"
 
-#: command-list.h:119
+#: command-list.h
 msgid "List references in a remote repository"
 msgstr "顯示一個遠端版本庫的引用"
 
-#: command-list.h:120
+#: command-list.h
 msgid "List the contents of a tree object"
 msgstr "顯示一個樹狀物件的內容"
 
-#: command-list.h:121
+#: command-list.h
 msgid "Extracts patch and authorship from a single e-mail message"
 msgstr "從單個電子信件中擷取修補檔和作者身份"
 
-#: command-list.h:122
+#: command-list.h
 msgid "Simple UNIX mbox splitter program"
 msgstr "簡單的 UNIX mbox 信箱切分程式"
 
-#: command-list.h:123
+#: command-list.h
 msgid "Run tasks to optimize Git repository data"
 msgstr "執行用來最佳化 Git 版本庫資料的作業"
 
-#: command-list.h:124
+#: command-list.h
 msgid "Join two or more development histories together"
 msgstr "合併兩個或更多開發歷史"
 
-#: command-list.h:125
+#: command-list.h
 msgid "Find as good common ancestors as possible for a merge"
 msgstr "為了合併尋找儘可能好的公共祖先提交"
 
-#: command-list.h:126
+#: command-list.h
 msgid "Run a three-way file merge"
 msgstr "執行一個三路檔案合併"
 
-#: command-list.h:127
+#: command-list.h
 msgid "Run a merge for files needing merging"
 msgstr "對於需要合併的檔案執行合併"
 
-#: command-list.h:128
+#: command-list.h
 msgid "The standard helper program to use with git-merge-index"
 msgstr "與 git-merge-index 一起使用的標準嚮導程式"
 
-#: command-list.h:129
+#: command-list.h
 msgid "Show three-way merge without touching index"
 msgstr "顯示三路合併而不動索引"
 
-#: command-list.h:130
+#: command-list.h
 msgid "Run merge conflict resolution tools to resolve merge conflicts"
 msgstr "執行合併衝突解決工具以解決合併衝突"
 
-#: command-list.h:131
+#: command-list.h
 msgid "Creates a tag object with extra validation"
 msgstr "建立有額外驗證的標籤物件"
 
-#: command-list.h:132
+#: command-list.h
 msgid "Build a tree-object from ls-tree formatted text"
 msgstr "基於 ls-tree 的格式化文字建立一個樹狀物件"
 
-#: command-list.h:133
+#: command-list.h
 msgid "Write and verify multi-pack-indexes"
 msgstr "寫入和驗證多包索引"
 
-#: command-list.h:134
+#: command-list.h
 msgid "Move or rename a file, a directory, or a symlink"
 msgstr "移動或重新命名一個檔案、目錄或符號連結"
 
 # 尋找提供版本的符號名稱
-#: command-list.h:135
+#: command-list.h
 msgid "Find symbolic names for given revs"
 msgstr "尋找提供版本的符號名稱"
 
-#: command-list.h:136
+#: command-list.h
 msgid "Add or inspect object notes"
 msgstr "新增或檢查物件備註"
 
-#: command-list.h:137
+#: command-list.h
 msgid "Import from and submit to Perforce repositories"
 msgstr "匯入和提交到 Perforce 版本庫中"
 
-#: command-list.h:138
+#: command-list.h
 msgid "Create a packed archive of objects"
 msgstr "建立物件的存檔包"
 
-#: command-list.h:139
+#: command-list.h
 msgid "Find redundant pack files"
 msgstr "尋找冗餘的包檔案"
 
-#: command-list.h:140
+#: command-list.h
 msgid "Pack heads and tags for efficient repository access"
 msgstr "打包頭和標籤以實現高效的版本庫存取"
 
-#: command-list.h:141
+#: command-list.h
 msgid "Compute unique ID for a patch"
 msgstr "計算一個修補檔的唯一 ID"
 
-#: command-list.h:142
+#: command-list.h
 msgid "Prune all unreachable objects from the object database"
 msgstr "剪除物件庫中所有無法取得的物件"
 
-#: command-list.h:143
+#: command-list.h
 msgid "Remove extra objects that are already in pack files"
 msgstr "刪除已經在包檔案中的多餘物件"
 
-#: command-list.h:144
+#: command-list.h
 msgid "Fetch from and integrate with another repository or a local branch"
 msgstr "取得並整合另外的版本庫或一個本機分支"
 
-#: command-list.h:145
+#: command-list.h
 msgid "Update remote refs along with associated objects"
 msgstr "更新遠端引用和相關的物件"
 
-#: command-list.h:146
+#: command-list.h
 msgid "Applies a quilt patchset onto the current branch"
 msgstr "將一個 quilt 修補檔集合套用到目前分支"
 
-#: command-list.h:147
+#: command-list.h
 msgid "Compare two commit ranges (e.g. two versions of a branch)"
 msgstr "比較兩個提交範圍（如一個分支的兩個版本）"
 
-#: command-list.h:148
+#: command-list.h
 msgid "Reads tree information into the index"
 msgstr "將樹訊息讀取到索引"
 
-#: command-list.h:149
+#: command-list.h
 msgid "Reapply commits on top of another base tip"
 msgstr "在另一個分支上重新套用提交"
 
-#: command-list.h:150
+#: command-list.h
 msgid "Receive what is pushed into the repository"
 msgstr "接收推送到版本庫中的物件"
 
-#: command-list.h:151
+#: command-list.h
 msgid "Manage reflog information"
 msgstr "管理 reflog 訊息"
 
-#: command-list.h:152
+#: command-list.h
 msgid "Manage set of tracked repositories"
 msgstr "管理已追蹤版本庫"
 
-#: command-list.h:153
+#: command-list.h
 msgid "Pack unpacked objects in a repository"
 msgstr "打包版本庫中未打包物件"
 
-#: command-list.h:154
+#: command-list.h
 msgid "Create, list, delete refs to replace objects"
 msgstr "建立、列出、刪除物件取代引用"
 
-#: command-list.h:155
+#: command-list.h
 msgid "Generates a summary of pending changes"
 msgstr "生成待定更改的摘要"
 
-#: command-list.h:156
+#: command-list.h
 msgid "Reuse recorded resolution of conflicted merges"
 msgstr "重用衝突合併的解決方案記錄"
 
-#: command-list.h:157
+#: command-list.h
 msgid "Reset current HEAD to the specified state"
 msgstr "重設目前 HEAD 到指定狀態"
 
-#: command-list.h:158
+#: command-list.h
 msgid "Restore working tree files"
 msgstr "復原工作區檔案"
 
-#: command-list.h:159
+#: command-list.h
 msgid "Lists commit objects in reverse chronological order"
 msgstr "按時間順序列出提交物件"
 
-#: command-list.h:160
+#: command-list.h
 msgid "Pick out and massage parameters"
 msgstr "選出並處理參數"
 
-#: command-list.h:161
+#: command-list.h
 msgid "Revert some existing commits"
 msgstr "還原一些現存提交"
 
-#: command-list.h:162
+#: command-list.h
 msgid "Remove files from the working tree and from the index"
 msgstr "從工作區和索引中刪除檔案"
 
-#: command-list.h:163
+#: command-list.h
 msgid "Send a collection of patches as emails"
 msgstr "透過電子信件傳送一組修補檔"
 
-#: command-list.h:164
+#: command-list.h
 msgid "Push objects over Git protocol to another repository"
 msgstr "使用 Git 協定推送物件到另一個版本庫"
 
-#: command-list.h:165
+#: command-list.h
 msgid "Git's i18n setup code for shell scripts"
 msgstr "為 shell 腳本準備的 Git 國際化設定程式碼"
 
-#: command-list.h:166
+#: command-list.h
 msgid "Common Git shell script setup code"
 msgstr "常用的 Git shell 腳本設定程式碼"
 
-#: command-list.h:167
+#: command-list.h
 msgid "Restricted login shell for Git-only SSH access"
 msgstr "只允許 Git SSH 存取的受限登入shell"
 
-#: command-list.h:168
+#: command-list.h
 msgid "Summarize 'git log' output"
 msgstr "'git log' 輸出摘要"
 
-#: command-list.h:169
+#: command-list.h
 msgid "Show various types of objects"
 msgstr "顯示各種類型的物件"
 
-#: command-list.h:170
+#: command-list.h
 msgid "Show branches and their commits"
 msgstr "顯示分支和提交"
 
-#: command-list.h:171
+#: command-list.h
 msgid "Show packed archive index"
 msgstr "顯示打包歸檔索引"
 
-#: command-list.h:172
+#: command-list.h
 msgid "List references in a local repository"
 msgstr "顯示本機版本庫中的引用"
 
 #  譯者：中文字串拼接，可刪除前導空格
-#: command-list.h:173
+#: command-list.h
 msgid "Reduce your working tree to a subset of tracked files"
 msgstr "將工作區限縮至只包含追蹤檔案的子集"
 
-#: command-list.h:174
+#: command-list.h
 msgid "Add file contents to the staging area"
 msgstr "將檔案內容新增到索引"
 
-#: command-list.h:175
+#: command-list.h
 msgid "Stash the changes in a dirty working directory away"
 msgstr "儲藏髒工作區中的修改"
 
-#: command-list.h:176
+#: command-list.h
 msgid "Show the working tree status"
 msgstr "顯示工作區狀態"
 
-#: command-list.h:177
+#: command-list.h
 msgid "Remove unnecessary whitespace"
 msgstr "刪除不必要的空白字元"
 
-#: command-list.h:178
+#: command-list.h
 msgid "Initialize, update or inspect submodules"
 msgstr "初始化、更新或檢查子模組"
 
-#: command-list.h:179
+#: command-list.h
 msgid "Bidirectional operation between a Subversion repository and Git"
 msgstr "Subversion 版本庫和 Git 之間的雙向動作"
 
-#: command-list.h:180
+#: command-list.h
 msgid "Switch branches"
 msgstr "切換分支"
 
-#: command-list.h:181
+#: command-list.h
 msgid "Read, modify and delete symbolic refs"
 msgstr "讀取、修改和刪除符號引用"
 
-#: command-list.h:182
+#: command-list.h
 msgid "Create, list, delete or verify a tag object signed with GPG"
 msgstr "建立、列出、刪除或驗證一個 GPG 簽名的標籤物件"
 
-#: command-list.h:183
+#: command-list.h
 msgid "Creates a temporary file with a blob's contents"
 msgstr "用資料物件的內容建立暫存檔"
 
-#: command-list.h:184
+#: command-list.h
 msgid "Unpack objects from a packed archive"
 msgstr "從打包檔案中解壓縮物件"
 
-#: command-list.h:185
+#: command-list.h
 msgid "Register file contents in the working tree to the index"
 msgstr "將工作區的檔案內容註冊到索引"
 
-#: command-list.h:186
+#: command-list.h
 msgid "Update the object name stored in a ref safely"
 msgstr "安全地更新儲存於引用中的物件名稱"
 
-#: command-list.h:187
+#: command-list.h
 msgid "Update auxiliary info file to help dumb servers"
 msgstr "更新輔助訊息檔案以協助啞協定服務"
 
-#: command-list.h:188
+#: command-list.h
 msgid "Send archive back to git-archive"
 msgstr "將存檔傳送回 git-archive"
 
-#: command-list.h:189
+#: command-list.h
 msgid "Send objects packed back to git-fetch-pack"
 msgstr "將物件壓縮包傳送回 git-fetch-pack"
 
-#: command-list.h:190
+#: command-list.h
 msgid "Show a Git logical variable"
 msgstr "顯示 Git 邏輯變數"
 
-#: command-list.h:191
+#: command-list.h
 msgid "Check the GPG signature of commits"
 msgstr "檢查 GPG 提交簽名"
 
-#: command-list.h:192
+#: command-list.h
 msgid "Validate packed Git archive files"
 msgstr "驗證打包的 Git 封存檔案"
 
-#: command-list.h:193
+#: command-list.h
 msgid "Check the GPG signature of tags"
 msgstr "檢查標籤的 GPG 簽名"
 
-#: command-list.h:194
+#: command-list.h
 msgid "Show logs with difference each commit introduces"
 msgstr "顯示每一個提交引入的差異日誌"
 
-#: command-list.h:195
+#: command-list.h
 msgid "Manage multiple working trees"
 msgstr "管理多個工作區"
 
-#: command-list.h:196
+#: command-list.h
 msgid "Create a tree object from the current index"
 msgstr "從目前索引建立一個樹狀物件"
 
-#: command-list.h:197
+#: command-list.h
 msgid "Defining attributes per path"
 msgstr "定義路徑的屬性"
 
-#: command-list.h:198
+#: command-list.h
 msgid "Git command-line interface and conventions"
 msgstr "Git 指令列介面和約定"
 
-#: command-list.h:199
+#: command-list.h
 msgid "A Git core tutorial for developers"
 msgstr "面向開發人員的 Git 核心教學"
 
-#: command-list.h:200
+#: command-list.h
 msgid "Providing usernames and passwords to Git"
 msgstr "將使用者名稱及密碼提供給 Git"
 
-#: command-list.h:201
+#: command-list.h
 msgid "Git for CVS users"
 msgstr "適合 CVS 使用者的 Git 協助"
 
-#: command-list.h:202
+#: command-list.h
 msgid "Tweaking diff output"
 msgstr "調整差異輸出"
 
-#: command-list.h:203
+#: command-list.h
 msgid "A useful minimum set of commands for Everyday Git"
 msgstr "每一天 Git 的一組有用的最小指令集合"
 
-#: command-list.h:204
+#: command-list.h
 msgid "Frequently asked questions about using Git"
 msgstr "Git 使用的常見問題"
 
-#: command-list.h:205
+#: command-list.h
 msgid "A Git Glossary"
 msgstr "Git 詞彙表"
 
-#: command-list.h:206
+#: command-list.h
 msgid "Hooks used by Git"
 msgstr "Git 使用的掛鉤"
 
-#: command-list.h:207
+#: command-list.h
 msgid "Specifies intentionally untracked files to ignore"
 msgstr "忽略指定的未追蹤檔案"
 
-#: command-list.h:208
+#: command-list.h
 msgid "The Git repository browser"
 msgstr "Git 版本庫瀏覽器"
 
-#: command-list.h:209
+#: command-list.h
 msgid "Map author/committer names and/or E-Mail addresses"
 msgstr "映射作者或提交者的名稱和（或）電子信箱地址"
 
-#: command-list.h:210
+#: command-list.h
 msgid "Defining submodule properties"
 msgstr "定義子模組屬性"
 
-#: command-list.h:211
+#: command-list.h
 msgid "Git namespaces"
 msgstr "Git 名字空間"
 
-#: command-list.h:212
+#: command-list.h
 msgid "Helper programs to interact with remote repositories"
 msgstr "用來與遠端版本庫互動的協助工具"
 
-#: command-list.h:213
+#: command-list.h
 msgid "Git Repository Layout"
 msgstr "Git 版本庫配置"
 
-#: command-list.h:214
+#: command-list.h
 msgid "Specifying revisions and ranges for Git"
 msgstr "指定 Git 的版本和版本範圍"
 
-#: command-list.h:215
+#: command-list.h
 msgid "Mounting one repository inside another"
 msgstr "在某個版本庫掛載某個版本庫"
 
-#: command-list.h:216
+#: command-list.h
 msgid "A tutorial introduction to Git"
 msgstr "一個 Git 教學"
 
-#: command-list.h:217
+#: command-list.h
 msgid "A tutorial introduction to Git: part two"
 msgstr "一個 Git 教學：第二部分"
 
-#: command-list.h:218
+#: command-list.h
 msgid "Git web interface (web frontend to Git repositories)"
 msgstr "Git web 介面（Git 版本庫的 web 前端）"
 
-#: command-list.h:219
+#: command-list.h
 msgid "An overview of recommended workflows with Git"
 msgstr "Git 推薦的工作流概覽"
 
-#: git-merge-octopus.sh:46
+#: commit-graph.c
+msgid "commit-graph file is too small"
+msgstr "提交圖形檔案太小"
+
+#: commit-graph.c
+#, c-format
+msgid "commit-graph signature %X does not match signature %X"
+msgstr "提交圖形簽名 %X 和簽名 %X 不符合"
+
+#: commit-graph.c
+#, c-format
+msgid "commit-graph version %X does not match version %X"
+msgstr "提交圖形版本 %X 和版本 %X 不符合"
+
+#: commit-graph.c
+#, c-format
+msgid "commit-graph hash version %X does not match version %X"
+msgstr "提交圖形雜湊版本 %X 和版本 %X 不符合"
+
+#: commit-graph.c
+#, c-format
+msgid "commit-graph file is too small to hold %u chunks"
+msgstr "commit-graph 檔案不夠放置 %u 個區塊"
+
+#: commit-graph.c
+msgid "commit-graph has no base graphs chunk"
+msgstr "提交圖形沒有基礎圖形區塊"
+
+#: commit-graph.c
+msgid "commit-graph chain does not match"
+msgstr "提交圖形鏈不符合"
+
+#: commit-graph.c
+#, c-format
+msgid "invalid commit-graph chain: line '%s' not a hash"
+msgstr "無效的提交圖形鏈：行 '%s' 不是一個雜湊值"
+
+#: commit-graph.c
+msgid "unable to find all commit-graph files"
+msgstr "無法找到所有提交圖形檔案"
+
+#: commit-graph.c
+msgid "invalid commit position. commit-graph is likely corrupt"
+msgstr "無效的提交位置。提交圖形可能已損壞"
+
+#: commit-graph.c
+#, c-format
+msgid "could not find commit %s"
+msgstr "無法找到提交 %s"
+
+#: commit-graph.c
+msgid "commit-graph requires overflow generation data but has none"
+msgstr "提交圖需要比目前更多的世代資料，但沒有相關資料"
+
+#: commit-graph.c
+msgid "Loading known commits in commit graph"
+msgstr "正在載入提交圖中的已知提交"
+
+#: commit-graph.c
+msgid "Expanding reachable commits in commit graph"
+msgstr "正在展開提交圖中的可以取得的提交"
+
+#: commit-graph.c
+msgid "Clearing commit marks in commit graph"
+msgstr "正在清除提交圖中的提交標記"
+
+#: commit-graph.c
+msgid "Computing commit graph topological levels"
+msgstr "正在計算提交圖拓樸級別"
+
+#: commit-graph.c
+msgid "Computing commit graph generation numbers"
+msgstr "正在計算提交圖世代數字"
+
+#: commit-graph.c
+msgid "Computing commit changed paths Bloom filters"
+msgstr "正在計算提交變更路徑的布隆過濾器"
+
+#: commit-graph.c
+msgid "Collecting referenced commits"
+msgstr "正在收集引用提交"
+
+#: commit-graph.c
+#, c-format
+msgid "Finding commits for commit graph in %<PRIuMAX> pack"
+msgid_plural "Finding commits for commit graph in %<PRIuMAX> packs"
+msgstr[0] "正在從 %<PRIuMAX> 個包中尋找提交圖的提交"
+
+#: commit-graph.c
+#, c-format
+msgid "error adding pack %s"
+msgstr "新增包 %s 發生錯誤"
+
+#: commit-graph.c
+#, c-format
+msgid "error opening index for %s"
+msgstr "為 %s 開啟索引發生錯誤"
+
+#: commit-graph.c
+msgid "Finding commits for commit graph among packed objects"
+msgstr "正在打包物件中尋找提交圖的提交"
+
+#: commit-graph.c
+msgid "Finding extra edges in commit graph"
+msgstr "正在尋找提交圖中額外的邊"
+
+#: commit-graph.c
+msgid "failed to write correct number of base graph ids"
+msgstr "無法寫入正確數量的基礎圖形 ID"
+
+#: commit-graph.c
+msgid "unable to create temporary graph layer"
+msgstr "無法建立暫時的圖形層"
+
+#: commit-graph.c
+#, c-format
+msgid "unable to adjust shared permissions for '%s'"
+msgstr "無法調整「%s」的共用權限"
+
+#: commit-graph.c
+#, 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
+msgid "unable to open commit-graph chain file"
+msgstr "無法開啟提交圖形鏈檔案"
+
+#: commit-graph.c
+msgid "failed to rename base commit-graph file"
+msgstr "無法重新命名基礎提交圖形檔案"
+
+#: commit-graph.c
+msgid "failed to rename temporary commit-graph file"
+msgstr "無法重新命名暫時提交圖形檔案"
+
+#: commit-graph.c
+msgid "Scanning merged commits"
+msgstr "正在掃描合併提交"
+
+#: commit-graph.c
+msgid "Merging commit-graph"
+msgstr "正在合併提交圖形"
+
+#: commit-graph.c
+msgid "attempting to write a commit-graph, but 'core.commitGraph' is disabled"
+msgstr "嘗試寫入提交圖形，但 “core.commitGraph” 已被停用"
+
+#: commit-graph.c
+msgid "too many commits to write graph"
+msgstr "提交太多不能畫圖"
+
+#: commit-graph.c
+msgid "the commit-graph file has incorrect checksum and is likely corrupt"
+msgstr "提交圖檔案的總和檢查碼錯誤，可能已經損壞"
+
+#: commit-graph.c
+#, c-format
+msgid "commit-graph has incorrect OID order: %s then %s"
+msgstr "提交圖形的物件 ID 順序不正確：%s 然後 %s"
+
+#: commit-graph.c
+#, c-format
+msgid "commit-graph has incorrect fanout value: fanout[%d] = %u != %u"
+msgstr "提交圖形有不正確的扇出值：fanout[%d] = %u != %u"
+
+#: commit-graph.c
+#, c-format
+msgid "failed to parse commit %s from commit-graph"
+msgstr "無法從提交圖形中解析提交 %s"
+
+#: commit-graph.c
+msgid "Verifying commits in commit graph"
+msgstr "正在驗證提交圖中的提交"
+
+#: commit-graph.c
+#, c-format
+msgid "failed to parse commit %s from object database for commit-graph"
+msgstr "無法從提交圖形的物件庫中解析提交 %s"
+
+#: commit-graph.c
+#, c-format
+msgid "root tree OID for commit %s in commit-graph is %s != %s"
+msgstr "提交圖形中的提交 %s 的根樹狀物件 ID 是 %s != %s"
+
+#: commit-graph.c
+#, c-format
+msgid "commit-graph parent list for commit %s is too long"
+msgstr "提交 %s 的提交圖形父提交列表太長了"
+
+#: commit-graph.c
+#, c-format
+msgid "commit-graph parent for %s is %s != %s"
+msgstr "%s 的提交圖形父提交是 %s != %s"
+
+#: commit-graph.c
+#, c-format
+msgid "commit-graph parent list for commit %s terminates early"
+msgstr "提交 %s 的提交圖形父提交列表過早終止"
+
+#: commit-graph.c
+#, c-format
+msgid ""
+"commit-graph has generation number zero for commit %s, but non-zero elsewhere"
+msgstr "提交圖形中提交 %s 的世代號是零，但其它地方非零"
+
+#: commit-graph.c
+#, c-format
+msgid ""
+"commit-graph has non-zero generation number for commit %s, but zero elsewhere"
+msgstr "提交圖形中提交 %s 的世代號非零，但其它地方是零"
+
+#: commit-graph.c
+#, c-format
+msgid "commit-graph generation for commit %s is %<PRIuMAX> < %<PRIuMAX>"
+msgstr "提交 %s 的提交圖形處於 %<PRIuMAX> < %<PRIuMAX> 世代"
+
+#: commit-graph.c
+#, c-format
+msgid "commit date for commit %s in commit-graph is %<PRIuMAX> != %<PRIuMAX>"
+msgstr "提交圖形中提交 %s 的提交日期是 %<PRIuMAX> != %<PRIuMAX>"
+
+#: commit.c
+#, c-format
+msgid "%s %s is not a commit!"
+msgstr "%s %s 不是一個提交！"
+
+#: commit.c
+msgid ""
+"Support for <GIT_DIR>/info/grafts is deprecated\n"
+"and will be removed in a future Git version.\n"
+"\n"
+"Please use \"git replace --convert-graft-file\"\n"
+"to convert the grafts into replace refs.\n"
+"\n"
+"Turn this message off by running\n"
+"\"git config advice.graftFileDeprecated false\""
+msgstr ""
+"對 <GIT_DIR>/info/grafts 的支援已被棄用，並將在\n"
+"未來的Git版本中被移除。\n"
+"\n"
+"請使用 \"git replace --convert-graft-file\" 將\n"
+"grafts 轉換為取代引用。\n"
+"\n"
+"設定 \"git config advice.graftFileDeprecated false\"\n"
+"可關閉本消息"
+
+#: commit.c
+#, c-format
+msgid "Commit %s has an untrusted GPG signature, allegedly by %s."
+msgstr "提交 %s 有一個非可信的聲稱來自 %s 的 GPG 簽名。"
+
+#: commit.c
+#, c-format
+msgid "Commit %s has a bad GPG signature allegedly by %s."
+msgstr "提交 %s 有一個錯誤的聲稱來自 %s 的 GPG 簽名。"
+
+#: commit.c
+#, c-format
+msgid "Commit %s does not have a GPG signature."
+msgstr "提交 %s 沒有 GPG 簽名。"
+
+#: commit.c
+#, c-format
+msgid "Commit %s has a good GPG signature by %s\n"
+msgstr "提交 %s 有一個來自 %s 的好的 GPG 簽名。\n"
+
+#: commit.c
+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"
+"variable i18n.commitEncoding to the encoding your project uses.\n"
+msgstr ""
+"警告：提交說明不符合 UTF-8。\n"
+"您能會想在修正訊息後修補提交，或者是將組態變數 i18n.commitencoding\n"
+"設為您專案使用的的編碼方式。\n"
+
+#: compat/compiler.h
+msgid "no compiler information available\n"
+msgstr "沒有可用的編譯器資訊\n"
+
+#: compat/compiler.h
+msgid "no libc information available\n"
+msgstr "沒有可用的 libc 資訊\n"
+
+#: compat/fsmonitor/fsm-health-win32.c
+#, c-format
+msgid "[GLE %ld] health thread could not open '%ls'"
+msgstr "[GLE %ld] 健康監聽執行緒無法開啟 “%ls”"
+
+#: compat/fsmonitor/fsm-health-win32.c
+#, c-format
+msgid "[GLE %ld] health thread getting BHFI for '%ls'"
+msgstr "[GLE %ld] 健康監聽執行緒取得 “%ls” 的 BHFI"
+
+#: compat/fsmonitor/fsm-health-win32.c compat/fsmonitor/fsm-listen-win32.c
+#, c-format
+msgid "could not convert to wide characters: '%s'"
+msgstr "無法轉換至較寬字元：“%s”"
+
+#: compat/fsmonitor/fsm-health-win32.c
+#, c-format
+msgid "BHFI changed '%ls'"
+msgstr "BHFI 更改了 “%ls”"
+
+#: compat/fsmonitor/fsm-health-win32.c
+#, c-format
+msgid "unhandled case in 'has_worktree_moved': %d"
+msgstr "“has_worktree_moved” 中有未處置的情況：%d"
+
+#: compat/fsmonitor/fsm-health-win32.c
+#, c-format
+msgid "health thread wait failed [GLE %ld]"
+msgstr "健康監聽執行緒等待失敗 [GLE %ld]"
+
+#: compat/fsmonitor/fsm-listen-darwin.c
+msgid "Unable to create FSEventStream."
+msgstr "無法建立 FSEventStream。"
+
+#: compat/fsmonitor/fsm-listen-darwin.c
+msgid "Failed to start the FSEventStream"
+msgstr "無法啟動 FSEventStream"
+
+#: compat/fsmonitor/fsm-listen-win32.c
+#, c-format
+msgid "[GLE %ld] could not convert path to UTF-8: '%.*ls'"
+msgstr "[GLE %ld] 無法將路徑轉換為 UTF-8：「%.*ls」"
+
+#: compat/fsmonitor/fsm-listen-win32.c
+#, c-format
+msgid "[GLE %ld] could not watch '%s'"
+msgstr "[GLE %ld] 無法監聽 “%s”"
+
+#: compat/fsmonitor/fsm-listen-win32.c
+#, c-format
+msgid "[GLE %ld] could not get longname of '%s'"
+msgstr "[GLE %ld] 無法取得 “%s” 的 longname"
+
+#: compat/fsmonitor/fsm-listen-win32.c
+#, c-format
+msgid "ReadDirectoryChangedW failed on '%s' [GLE %ld]"
+msgstr "在 “%s” 上呼叫 ReadDirectoryChangedW 失敗 [GLE %ld]"
+
+#: compat/fsmonitor/fsm-listen-win32.c
+#, c-format
+msgid "GetOverlappedResult failed on '%s' [GLE %ld]"
+msgstr "在 “%s” 上呼叫 GetOverlappedResult 失敗 [GLE %ld]"
+
+#: compat/fsmonitor/fsm-listen-win32.c
+#, c-format
+msgid "could not read directory changes [GLE %ld]"
+msgstr "無法讀取目錄變化 [GLE %ld]"
+
+#: compat/mingw.c
+#, c-format
+msgid "failed to copy SID (%ld)"
+msgstr "無法複製 SID (%ld)"
+
+#: compat/mingw.c
+#, c-format
+msgid "failed to get owner for '%s' (%ld)"
+msgstr "無法取得 “%s” 的所有者 (%ld)"
+
+#: compat/obstack.c
+msgid "memory exhausted"
+msgstr "記憶體耗盡"
+
+#: compat/regex/regcomp.c
+msgid "Success"
+msgstr "成功"
+
+#: compat/regex/regcomp.c
+msgid "No match"
+msgstr "無符合"
+
+#: compat/regex/regcomp.c
+msgid "Invalid regular expression"
+msgstr "無效的常規表示式"
+
+#: compat/regex/regcomp.c
+msgid "Invalid collation character"
+msgstr "無效的定序字元"
+
+#: compat/regex/regcomp.c
+msgid "Invalid character class name"
+msgstr "字元類別名稱無效"
+
+#: compat/regex/regcomp.c
+msgid "Trailing backslash"
+msgstr "結尾反斜線"
+
+#: compat/regex/regcomp.c
+msgid "Invalid back reference"
+msgstr "反向引用無效"
+
+#: compat/regex/regcomp.c
+msgid "Unmatched [ or [^"
+msgstr "沒有對應的 [ 或 [^"
+
+#: compat/regex/regcomp.c
+msgid "Unmatched ( or \\("
+msgstr "沒有對應的 ( 或 \\("
+
+#: compat/regex/regcomp.c
+msgid "Unmatched \\{"
+msgstr "沒有對應的 \\{"
+
+#: compat/regex/regcomp.c
+msgid "Invalid content of \\{\\}"
+msgstr "\\{\\} 的內容無效"
+
+#: compat/regex/regcomp.c
+msgid "Invalid range end"
+msgstr "範圍結尾無效"
+
+#: compat/regex/regcomp.c
+msgid "Memory exhausted"
+msgstr "記憶體耗盡"
+
+#: compat/regex/regcomp.c
+msgid "Invalid preceding regular expression"
+msgstr "無效的前置常規表示式"
+
+#: compat/regex/regcomp.c
+msgid "Premature end of regular expression"
+msgstr "常規表示式太早結束"
+
+#: compat/regex/regcomp.c
+msgid "Regular expression too big"
+msgstr "常規表示式太長"
+
+#: compat/regex/regcomp.c
+msgid "Unmatched ) or \\)"
+msgstr "沒有對應的 ) 或 \\)"
+
+#: compat/regex/regcomp.c
+msgid "No previous regular expression"
+msgstr "沒有先前的常規表示式"
+
+#: compat/simple-ipc/ipc-unix-socket.c compat/simple-ipc/ipc-win32.c
+msgid "could not send IPC command"
+msgstr "無法傳送 IPC 命令"
+
+#: compat/simple-ipc/ipc-unix-socket.c compat/simple-ipc/ipc-win32.c
+msgid "could not read IPC response"
+msgstr "無法讀取 IPC 回應"
+
+#: compat/simple-ipc/ipc-unix-socket.c
+#, c-format
+msgid "could not start accept_thread '%s'"
+msgstr "無法啟動 accept_thread “%s”"
+
+#: compat/simple-ipc/ipc-unix-socket.c
+#, c-format
+msgid "could not start worker[0] for '%s'"
+msgstr "無法啟動「%s」的 worker[0]"
+
+#: compat/simple-ipc/ipc-win32.c
+#, c-format
+msgid "ConnectNamedPipe failed for '%s' (%lu)"
+msgstr "對 “%s” 進行 ConnectNamedPipe 失敗 (%lu)"
+
+#: compat/simple-ipc/ipc-win32.c
+#, c-format
+msgid "could not create fd from pipe for '%s'"
+msgstr "無法為 “%s” 從管道建立 fd"
+
+#: compat/simple-ipc/ipc-win32.c
+#, c-format
+msgid "could not start thread[0] for '%s'"
+msgstr "無法為 “%s” 啟動 thread[0]"
+
+#: compat/simple-ipc/ipc-win32.c
+#, c-format
+msgid "wait for hEvent failed for '%s'"
+msgstr "等待 “%s” 的 hEvent 失敗"
+
+#: compat/terminal.c
+msgid "cannot resume in the background, please use 'fg' to resume"
+msgstr "無法在背景繼續；請使用 “fg” 繼續"
+
+#: compat/terminal.c
+msgid "cannot restore terminal settings"
+msgstr "無法復原終端機設定"
+
+#: config.c
+#, c-format
+msgid ""
+"exceeded maximum include depth (%d) while including\n"
+"\t%s\n"
+"from\n"
+"\t%s\n"
+"This might be due to circular includes."
+msgstr ""
+"超過了最大包含深度（%1$d），當從\n"
+"\t%3$s\n"
+"包含\n"
+"\t%2$s\n"
+"這可能是因為循環包含。"
+
+#: config.c
+#, c-format
+msgid "could not expand include path '%s'"
+msgstr "無法展開包含路徑 '%s'"
+
+#: config.c
+msgid "relative config includes must come from files"
+msgstr "相對路徑的設定檔案引用必須來自於檔案"
+
+#: config.c
+msgid "relative config include conditionals must come from files"
+msgstr "相對路徑的設定檔案條件引用必須來自於檔案"
+
+#: config.c
+msgid ""
+"remote URLs cannot be configured in file directly or indirectly included by "
+"includeIf.hasconfig:remote.*.url"
+msgstr ""
+"無法在檔案設定遠端 URL，無論是直接或間接透過 includeIf.hasconfig:remote.*."
+"url 引入"
+
+#: config.c
+#, c-format
+msgid "invalid config format: %s"
+msgstr "無效的設定檔格式：%s"
+
+#: config.c
+#, c-format
+msgid "missing environment variable name for configuration '%.*s'"
+msgstr "缺少「%.*s」組態設定的環境變數名稱"
+
+#: config.c
+#, c-format
+msgid "missing environment variable '%s' for configuration '%.*s'"
+msgstr "缺少環境變數「%s」（於「%.*s」組態設定）"
+
+#: config.c
+#, c-format
+msgid "key does not contain a section: %s"
+msgstr "鍵名沒有包含一個小節名稱：%s"
+
+#: config.c
+#, c-format
+msgid "key does not contain variable name: %s"
+msgstr "鍵名沒有包含變數名：%s"
+
+#: config.c sequencer.c
+#, c-format
+msgid "invalid key: %s"
+msgstr "無效鍵名：%s"
+
+#: config.c
+#, c-format
+msgid "invalid key (newline): %s"
+msgstr "無效鍵名（有換行符號）：%s"
+
+#: config.c
+msgid "empty config key"
+msgstr "空白設定鍵"
+
+#: config.c
+#, c-format
+msgid "bogus config parameter: %s"
+msgstr "偽設定參數：%s"
+
+#: config.c
+#, c-format
+msgid "bogus format in %s"
+msgstr "%s 中格式錯誤"
+
+#: config.c
+#, c-format
+msgid "bogus count in %s"
+msgstr "%s 中有偽計數"
+
+#: config.c
+#, c-format
+msgid "too many entries in %s"
+msgstr "%s 中的項目過多"
+
+#: config.c
+#, c-format
+msgid "missing config key %s"
+msgstr "缺少 %s 設定鍵"
+
+#: config.c
+#, c-format
+msgid "missing config value %s"
+msgstr "缺少 %s 設定值"
+
+#: config.c
+#, c-format
+msgid "bad config line %d in blob %s"
+msgstr "資料物件 %2$s 中錯誤的設定行 %1$d"
+
+#: config.c
+#, c-format
+msgid "bad config line %d in file %s"
+msgstr "檔案 %2$s 中錯誤的設定行 %1$d"
+
+#: config.c
+#, c-format
+msgid "bad config line %d in standard input"
+msgstr "標準輸入中錯誤的設定行 %d"
+
+#: config.c
+#, c-format
+msgid "bad config line %d in submodule-blob %s"
+msgstr "子模組資料物件 %2$s 中錯誤的設定行 %1$d"
+
+#: config.c
+#, c-format
+msgid "bad config line %d in command line %s"
+msgstr "指令列 %2$s 中錯誤的設定行 %1$d"
+
+#: config.c
+#, c-format
+msgid "bad config line %d in %s"
+msgstr "在 %2$s 中錯誤的設定行 %1$d"
+
+#: config.c
+msgid "out of range"
+msgstr "超出範圍"
+
+#: config.c
+msgid "invalid unit"
+msgstr "無效的單位"
+
+#: config.c
+#, c-format
+msgid "bad numeric config value '%s' for '%s': %s"
+msgstr "設定變數 '%2$s' 的數字取值 '%1$s' 設定錯誤：%3$s"
+
+#: config.c
+#, 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
+#, 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
+#, c-format
+msgid "bad numeric config value '%s' for '%s' in standard input: %s"
+msgstr "標準輸入中設定變數 '%2$s' 錯誤的取值 '%1$s'：%3$s"
+
+#: config.c
+#, 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
+#, 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
+#, c-format
+msgid "bad numeric config value '%s' for '%s' in %s: %s"
+msgstr "在 %3$s 中設定變數 '%2$s' 錯誤的取值 '%1$s'：%4$s"
+
+#: config.c
+#, c-format
+msgid "invalid value for variable %s"
+msgstr "%s 變數的值無效"
+
+#: config.c
+#, c-format
+msgid "ignoring unknown core.fsync component '%s'"
+msgstr "忽略未知的 core.fsync 組件「%s」"
+
+#: config.c
+#, c-format
+msgid "bad boolean config value '%s' for '%s'"
+msgstr "「%2$s」的「%1$s」布林設定值無效"
+
+#: config.c
+#, c-format
+msgid "failed to expand user dir in: '%s'"
+msgstr "無法展開使用者目錄於：’%s’"
+
+#: config.c
+#, c-format
+msgid "'%s' for '%s' is not a valid timestamp"
+msgstr "'%2$s' 的值 '%1$s' 不是一個有效的時間戳"
+
+#: config.c
+#, c-format
+msgid "abbrev length out of range: %d"
+msgstr "縮寫長度超出範圍：%d"
+
+#: config.c
+#, c-format
+msgid "bad zlib compression level %d"
+msgstr "錯誤的 zlib 壓縮級別 %d"
+
+#: config.c
+msgid "core.commentChar should only be one character"
+msgstr "core.commentChar 應該是一個字元"
+
+#: config.c
+#, c-format
+msgid "ignoring unknown core.fsyncMethod value '%s'"
+msgstr "忽略未知的 core.fsyncMethod 值「%s」"
+
+#: config.c
+msgid "core.fsyncObjectFiles is deprecated; use core.fsync instead"
+msgstr "core.fsyncObjectFiles 已被取代。請改用 core.fsync"
+
+#: config.c
+#, c-format
+msgid "invalid mode for object creation: %s"
+msgstr "無效的物件建立模式：%s"
+
+#: config.c
+#, c-format
+msgid "malformed value for %s"
+msgstr "%s 的取值格式錯誤"
+
+#: config.c
+#, c-format
+msgid "malformed value for %s: %s"
+msgstr "%s 的取值格式錯誤：%s"
+
+#: config.c
+msgid "must be one of nothing, matching, simple, upstream or current"
+msgstr "必須是其中之一：nothing、matching、simple、upstream 或 current"
+
+#: config.c
+#, c-format
+msgid "unable to load config blob object '%s'"
+msgstr "無法從資料物件 '%s' 載入設定"
+
+#: config.c
+#, c-format
+msgid "reference '%s' does not point to a blob"
+msgstr "引用 '%s' 沒有指向一個資料物件"
+
+#: config.c
+#, c-format
+msgid "unable to resolve config blob '%s'"
+msgstr "不能解析設定物件 '%s'"
+
+#: config.c
+#, c-format
+msgid "failed to parse %s"
+msgstr "解析 %s 失敗"
+
+#: config.c
+msgid "unable to parse command-line config"
+msgstr "無法解析指令列中的設定"
+
+#: config.c
+msgid "unknown error occurred while reading the configuration files"
+msgstr "在讀取設定檔案時遇到未知錯誤"
+
+#: config.c
+#, c-format
+msgid "Invalid %s: '%s'"
+msgstr "無效 %s：'%s'"
+
+#: config.c
+#, c-format
+msgid "splitIndex.maxPercentChange value '%d' should be between 0 and 100"
+msgstr "splitIndex.maxPercentChange 的取值 '%d' 應該介於 0 和 100 之間"
+
+#: config.c
+#, c-format
+msgid "unable to parse '%s' from command-line config"
+msgstr "無法解析指令列設定中的 '%s'"
+
+#: config.c
+#, c-format
+msgid "bad config variable '%s' in file '%s' at line %d"
+msgstr "在檔案 '%2$s' 的第 %3$d 行發現錯誤的設定變數 '%1$s'"
+
+#: config.c
+#, c-format
+msgid "invalid section name '%s'"
+msgstr "無效的小節名稱 '%s'"
+
+#: config.c
+#, c-format
+msgid "%s has multiple values"
+msgstr "%s 有多個取值"
+
+#: config.c
+#, c-format
+msgid "failed to write new configuration file %s"
+msgstr "寫入新的設定檔案 %s 失敗"
+
+#: config.c
+#, c-format
+msgid "could not lock config file %s"
+msgstr "不能鎖定設定檔案 %s"
+
+#: config.c
+#, c-format
+msgid "opening %s"
+msgstr "開啟 %s"
+
+#: config.c
+#, c-format
+msgid "invalid config file %s"
+msgstr "無效的設定檔案 %s"
+
+#: config.c
+#, c-format
+msgid "fstat on %s failed"
+msgstr "對 %s 呼叫 fstat 失敗"
+
+#: config.c
+#, c-format
+msgid "unable to mmap '%s'%s"
+msgstr "無法 mmap '%s'%s"
+
+#: config.c
+#, c-format
+msgid "chmod on %s failed"
+msgstr "對 %s 呼叫 chmod 失敗"
+
+#: config.c
+#, c-format
+msgid "could not write config file %s"
+msgstr "不能寫入設定檔案 %s"
+
+#: config.c
+#, c-format
+msgid "could not set '%s' to '%s'"
+msgstr "不能設定 '%s' 為 '%s'"
+
+#: config.c
+#, c-format
+msgid "invalid section name: %s"
+msgstr "無效的小節名稱：%s"
+
+#: config.c
+#, c-format
+msgid "missing value for '%s'"
+msgstr "%s 的取值缺少"
+
+#: connect.c
+msgid "the remote end hung up upon initial contact"
+msgstr "遠端在初始連線時即掛斷"
+
+#: connect.c
+msgid ""
+"Could not read from remote repository.\n"
+"\n"
+"Please make sure you have the correct access rights\n"
+"and the repository exists."
+msgstr ""
+"無法讀取遠端版本庫。\n"
+"\n"
+"請確認您有正確的存取權限並且版本庫存在。"
+
+#: connect.c
+#, c-format
+msgid "server doesn't support '%s'"
+msgstr "伺服器不支援 '%s'"
+
+#: connect.c
+#, c-format
+msgid "server doesn't support feature '%s'"
+msgstr "伺服器不支援特性 '%s'"
+
+#: connect.c
+msgid "expected flush after capabilities"
+msgstr "在能力之後應為一個 flush 包"
+
+#: connect.c
+#, c-format
+msgid "ignoring capabilities after first line '%s'"
+msgstr "忽略第一行 '%s' 之後的能力欄位"
+
+#: connect.c
+msgid "protocol error: unexpected capabilities^{}"
+msgstr "協定錯誤：意外的 capabilities^{}"
+
+#: connect.c
+#, c-format
+msgid "protocol error: expected shallow sha-1, got '%s'"
+msgstr "協定錯誤：預期淺複製 sha-1，卻得到 '%s'"
+
+#: connect.c
+msgid "repository on the other end cannot be shallow"
+msgstr "另一端的版本庫不能是淺複製版本庫"
+
+#: connect.c
+msgid "invalid packet"
+msgstr "無效封包"
+
+#: connect.c
+#, c-format
+msgid "protocol error: unexpected '%s'"
+msgstr "協定錯誤：意外的 '%s'"
+
+#: connect.c
+#, c-format
+msgid "unknown object format '%s' specified by server"
+msgstr "伺服器指定的「%s」物件格式無效"
+
+#: connect.c
+#, c-format
+msgid "invalid ls-refs response: %s"
+msgstr "無效的 ls-refs 回應：%s"
+
+#: connect.c
+msgid "expected flush after ref listing"
+msgstr "在引用列表之後應該有一個 flush 包"
+
+#: connect.c
+msgid "expected response end packet after ref listing"
+msgstr "在引用列表後預期要有回應結束封包"
+
+#: connect.c
+#, c-format
+msgid "protocol '%s' is not supported"
+msgstr "不支援 '%s' 協定"
+
+#: connect.c
+msgid "unable to set SO_KEEPALIVE on socket"
+msgstr "無法為 socket 設定 SO_KEEPALIVE"
+
+#: connect.c
+#, c-format
+msgid "Looking up %s ... "
+msgstr "尋找 %s ... "
+
+#: connect.c
+#, 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
+#, c-format
+msgid ""
+"done.\n"
+"Connecting to %s (port %s) ... "
+msgstr ""
+"完成。\n"
+"連線到 %s（埠 %s）... "
+
+#: connect.c
+#, c-format
+msgid ""
+"unable to connect to %s:\n"
+"%s"
+msgstr ""
+"無法連線到 %s：\n"
+"%s"
+
+#. TRANSLATORS: this is the end of "Connecting to %s (port %s) ... "
+#: connect.c
+msgid "done."
+msgstr "完成。"
+
+#: connect.c
+#, c-format
+msgid "unable to look up %s (%s)"
+msgstr "無法尋找 %s（%s）"
+
+#: connect.c
+#, c-format
+msgid "unknown port %s"
+msgstr "未知埠 %s"
+
+#: connect.c
+#, c-format
+msgid "strange hostname '%s' blocked"
+msgstr "已阻止奇怪的主機名稱 '%s'"
+
+#: connect.c
+#, c-format
+msgid "strange port '%s' blocked"
+msgstr "已阻止奇怪的埠號 '%s'"
+
+#: connect.c
+#, c-format
+msgid "cannot start proxy %s"
+msgstr "不能啟動代理 %s"
+
+#: connect.c
+msgid "no path specified; see 'git help pull' for valid url syntax"
+msgstr "未指定路徑，執行 'git help pull' 檢視有效的 url 語法"
+
+#: connect.c
+msgid "newline is forbidden in git:// hosts and repo paths"
+msgstr "git:// 主機名稱和版本庫路徑中不能有換行"
+
+#: connect.c
+msgid "ssh variant 'simple' does not support -4"
+msgstr "ssh 變體 'simple' 不支援 -4"
+
+#: connect.c
+msgid "ssh variant 'simple' does not support -6"
+msgstr "ssh 變體 'simple' 不支援 -6"
+
+#: connect.c
+msgid "ssh variant 'simple' does not support setting port"
+msgstr "ssh 變體 'simple' 不支援設定埠"
+
+#: connect.c
+#, c-format
+msgid "strange pathname '%s' blocked"
+msgstr "已阻止奇怪的路徑名 '%s'"
+
+#: connect.c
+msgid "unable to fork"
+msgstr "無法 fork"
+
+#: connected.c
+msgid "Could not run 'git rev-list'"
+msgstr "不能執行 'git rev-list'"
+
+#: connected.c
+msgid "failed write to rev-list"
+msgstr "寫入 rev-list 失敗"
+
+#: connected.c
+msgid "failed to close rev-list's stdin"
+msgstr "關閉 rev-list 的標準輸入失敗"
+
+#: contrib/scalar/scalar.c worktree.c
+#, c-format
+msgid "'%s' does not exist"
+msgstr "'%s' 不存在"
+
+#: contrib/scalar/scalar.c
+msgid "need a working directory"
+msgstr "需要工作目錄"
+
+#: contrib/scalar/scalar.c
+msgid "could not find enlistment root"
+msgstr "找不到編列名單的根目錄"
+
+#: contrib/scalar/scalar.c
+#, c-format
+msgid "could not switch to '%s'"
+msgstr "無法切換至「%s」"
+
+#: contrib/scalar/scalar.c
+#, c-format
+msgid "could not configure %s=%s"
+msgstr "無法設定 %s=%s"
+
+#: contrib/scalar/scalar.c
+msgid "could not configure log.excludeDecoration"
+msgstr "無法設定 log.excludeDecoration"
+
+#: contrib/scalar/scalar.c
+msgid "Scalar enlistments require a worktree"
+msgstr "純量編列名單需要工作目錄"
+
+#: contrib/scalar/scalar.c dir.c
+#, c-format
+msgid "could not open directory '%s'"
+msgstr "不能開啟目錄 '%s'"
+
+#: contrib/scalar/scalar.c
+#, c-format
+msgid "skipping '%s', which is neither file nor directory"
+msgstr "略過 “%s”，其非檔案或目錄"
+
+#: contrib/scalar/scalar.c
+#, c-format
+msgid "could not determine free disk size for '%s'"
+msgstr "無法判斷 “%s” 的剩餘磁碟大小"
+
+#: contrib/scalar/scalar.c
+#, c-format
+msgid "could not get info for '%s'"
+msgstr "無法取得 “%s” 的資訊"
+
+#: contrib/scalar/scalar.c
+#, c-format
+msgid "remote HEAD is not a branch: '%.*s'"
+msgstr "遠端 HEAD 不是分支：「%.*s」"
+
+#: contrib/scalar/scalar.c
+msgid "failed to get default branch name from remote; using local default"
+msgstr "無法從遠端取得預設分支名稱。改用本機預設名稱"
+
+#: contrib/scalar/scalar.c
+msgid "failed to get default branch name"
+msgstr "無法取得預設分支名稱"
+
+#: contrib/scalar/scalar.c
+msgid "failed to unregister repository"
+msgstr "無法取消註冊版本庫"
+
+#: contrib/scalar/scalar.c
+msgid "failed to delete enlistment directory"
+msgstr "無法刪除編列名單目錄"
+
+#: contrib/scalar/scalar.c
+msgid "branch to checkout after clone"
+msgstr "複製後要簽出的分支"
+
+#: contrib/scalar/scalar.c
+msgid "when cloning, create full working directory"
+msgstr "複製時建立完整的工作目錄"
+
+#: contrib/scalar/scalar.c
+msgid "only download metadata for the branch that will be checked out"
+msgstr "只下載會簽出的分支中介資料"
+
+#: contrib/scalar/scalar.c
+msgid "scalar clone [<options>] [--] <repo> [<dir>]"
+msgstr "scalar clone [<options>] [--] <repo> [<dir>]"
+
+#: contrib/scalar/scalar.c
+#, c-format
+msgid "cannot deduce worktree name from '%s'"
+msgstr "無法從「%s」推論工作區名稱"
+
+#: contrib/scalar/scalar.c
+#, c-format
+msgid "directory '%s' exists already"
+msgstr "「%s」目錄已經存在"
+
+#: contrib/scalar/scalar.c
+#, c-format
+msgid "failed to get default branch for '%s'"
+msgstr "無法取得「%s」的預設分支"
+
+#: contrib/scalar/scalar.c
+#, c-format
+msgid "could not configure remote in '%s'"
+msgstr "無法設定「%s」中的遠端"
+
+#: contrib/scalar/scalar.c
+#, c-format
+msgid "could not configure '%s'"
+msgstr "無法設定「%s」"
+
+#: contrib/scalar/scalar.c
+msgid "partial clone failed; attempting full clone"
+msgstr "部分複製失敗。嘗試完整複製"
+
+#: contrib/scalar/scalar.c
+msgid "could not configure for full clone"
+msgstr "無法設定完整複製"
+
+#: contrib/scalar/scalar.c
+msgid "scalar diagnose [<enlistment>]"
+msgstr "scalar diagnose [<enlistment>]"
+
+#: contrib/scalar/scalar.c
+#, c-format
+msgid "could not create directory for '%s'"
+msgstr "無法建立 “%s” 的目錄"
+
+#: contrib/scalar/scalar.c
+msgid "could not duplicate stdout"
+msgstr "無法複製 stdout"
+
+#: contrib/scalar/scalar.c
+msgid "failed to write archive"
+msgstr "無法寫入封存"
+
+#: contrib/scalar/scalar.c
+msgid "`scalar list` does not take arguments"
+msgstr "`scalar list` 未取引數"
+
+#: contrib/scalar/scalar.c
+msgid "scalar register [<enlistment>]"
+msgstr "scalar register [<enlistment>]"
+
+#: contrib/scalar/scalar.c
+msgid "reconfigure all registered enlistments"
+msgstr "重新設定所有註冊的編列名單"
+
+#: contrib/scalar/scalar.c
+msgid "scalar reconfigure [--all | <enlistment>]"
+msgstr "scalar reconfigure [--all | <enlistment>]"
+
+#: contrib/scalar/scalar.c
+msgid "--all or <enlistment>, but not both"
+msgstr "--all 或 <enlistment> 但不能傳入兩者"
+
+#: contrib/scalar/scalar.c
+#, c-format
+msgid "git repository gone in '%s'"
+msgstr "git 版本庫在「%s」遺失"
+
+#: contrib/scalar/scalar.c
+msgid ""
+"scalar run <task> [<enlistment>]\n"
+"Tasks:\n"
+msgstr ""
+"scalar run <task> [<enlistment>]\n"
+"作業：\n"
+
+#: contrib/scalar/scalar.c
+#, c-format
+msgid "no such task: '%s'"
+msgstr "無此作業：「%s」"
+
+#: contrib/scalar/scalar.c
+msgid "scalar unregister [<enlistment>]"
+msgstr "scalar unregister [<enlistment>]"
+
+#: contrib/scalar/scalar.c
+msgid "scalar delete <enlistment>"
+msgstr "scalar delete <enlistment>"
+
+#: contrib/scalar/scalar.c
+msgid "refusing to delete current working directory"
+msgstr "拒絕刪除目前工作目錄"
+
+#: contrib/scalar/scalar.c
+msgid "include Git version"
+msgstr "包含 Git 版本"
+
+#: contrib/scalar/scalar.c
+msgid "include Git's build options"
+msgstr "包含 Git 組建選項"
+
+#: contrib/scalar/scalar.c
+msgid "scalar verbose [-v | --verbose] [--build-options]"
+msgstr "scalar verbose [-v | --verbose] [--build-options]"
+
+#: contrib/scalar/scalar.c
+msgid "-C requires a <directory>"
+msgstr "-C 需要 <directory>"
+
+#: contrib/scalar/scalar.c
+#, c-format
+msgid "could not change to '%s'"
+msgstr "無法更改為「%s」"
+
+#: contrib/scalar/scalar.c
+msgid "-c requires a <key>=<value> argument"
+msgstr "-c 需要 <key>=<value> 引數"
+
+#: contrib/scalar/scalar.c
+msgid ""
+"scalar [-C <directory>] [-c <key>=<value>] <command> [<options>]\n"
+"\n"
+"Commands:\n"
+msgstr ""
+"scalar [-C <directory>] [-c <key>=<value>] <command> [<options>]\n"
+"\n"
+"命令：\n"
+
+#: convert.c
+#, c-format
+msgid "illegal crlf_action %d"
+msgstr "非法的 crlf_action %d"
+
+#: convert.c
+#, c-format
+msgid "CRLF would be replaced by LF in %s"
+msgstr "%s 中的 CRLF 將被 LF 取代"
+
+#: convert.c
+#, c-format
+msgid ""
+"in the working copy of '%s', CRLF will be replaced by LF the next time Git "
+"touches it"
+msgstr "在 “%s” 的工作複本中，下次 Git 接觸到時會用 LF 取代 CRLF"
+
+#: convert.c
+#, c-format
+msgid "LF would be replaced by CRLF in %s"
+msgstr "檔案 %s 中的 LF 將被 CRLF 取代"
+
+#: convert.c
+#, c-format
+msgid ""
+"in the working copy of '%s', LF will be replaced by CRLF the next time Git "
+"touches it"
+msgstr "在 “%s” 的工作複本中，下次 Git 接觸到時會用 CRLF 取代 LF"
+
+#: convert.c
+#, c-format
+msgid "BOM is prohibited in '%s' if encoded as %s"
+msgstr "如果使用 %2$s 編碼，禁止在 '%1$s' 中使用 BOM"
+
+#: convert.c
+#, c-format
+msgid ""
+"The file '%s' contains a byte order mark (BOM). Please use UTF-%.*s as "
+"working-tree-encoding."
+msgstr "檔案 '%s' 包含位元組順序標記（BOM）。請使用 UTF-%.*s 作為工作區編碼。"
+
+#: convert.c
+#, c-format
+msgid "BOM is required in '%s' if encoded as %s"
+msgstr "如果編碼為 %2$s，需要在 '%1$s' 中使用 BOM"
+
+#: convert.c
+#, 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."
+msgstr ""
+"檔案 '%s' 缺少一個位元組順序標記（BOM）。請使用 UTF-%sBE or UTF-%sLE（取決於"
+"字節序）作為工作區編碼。"
+
+#: convert.c
+#, c-format
+msgid "failed to encode '%s' from %s to %s"
+msgstr "無法對 '%s' 進行從 %s 到 %s 的編碼"
+
+#: convert.c
+#, c-format
+msgid "encoding '%s' from %s to %s and back is not the same"
+msgstr "將'%s' 的編碼從 %s 到 %s 來迴轉換不一致"
+
+#: convert.c
+#, c-format
+msgid "cannot fork to run external filter '%s'"
+msgstr "不能 fork 以執行外部過濾器 '%s'"
+
+#: convert.c
+#, c-format
+msgid "cannot feed the input to external filter '%s'"
+msgstr "不能將輸入傳遞給外部過濾器 '%s'"
+
+#: convert.c
+#, c-format
+msgid "external filter '%s' failed %d"
+msgstr "外部過濾器 '%s' 失敗碼 %d"
+
+#: convert.c
+#, c-format
+msgid "read from external filter '%s' failed"
+msgstr "從外部過濾器 '%s' 讀取失敗"
+
+#: convert.c
+#, c-format
+msgid "external filter '%s' failed"
+msgstr "外部過濾器 '%s' 失敗"
+
+#: convert.c
+msgid "unexpected filter type"
+msgstr "意外的過濾類型"
+
+#: convert.c
+msgid "path name too long for external filter"
+msgstr "外部過濾器的路徑名太長"
+
+#: convert.c
+#, c-format
+msgid ""
+"external filter '%s' is not available anymore although not all paths have "
+"been filtered"
+msgstr "外部過濾器 '%s' 不再可用，但並非所有路徑都已過濾"
+
+#: convert.c
+msgid "true/false are no valid working-tree-encodings"
+msgstr "true/false 不是有效的工作區編碼"
+
+#: convert.c
+#, c-format
+msgid "%s: clean filter '%s' failed"
+msgstr "%s：clean 過濾器 '%s' 失敗"
+
+#: convert.c
+#, c-format
+msgid "%s: smudge filter %s failed"
+msgstr "%s：smudge 過濾器 %s 失敗"
+
+#: credential.c
+#, c-format
+msgid "skipping credential lookup for key: credential.%s"
+msgstr "略過鍵的憑證查詢：credential.%s"
+
+#: credential.c
+msgid "refusing to work with credential missing host field"
+msgstr "拒絕使用缺少主機欄位的憑證"
+
+#: credential.c
+msgid "refusing to work with credential missing protocol field"
+msgstr "拒絕使用缺少通訊協定欄位的憑證"
+
+#: credential.c
+#, c-format
+msgid "url contains a newline in its %s component: %s"
+msgstr "URL 的 %s 部分有換行：%s"
+
+#: credential.c
+#, c-format
+msgid "url has no scheme: %s"
+msgstr "URL 沒有 Scheme：%s"
+
+#: credential.c
+#, c-format
+msgid "credential url cannot be parsed: %s"
+msgstr "無法解析憑證 URL：%s"
+
+#: date.c
+msgid "in the future"
+msgstr "在將來"
+
+#: date.c
+#, c-format
+msgid "%<PRIuMAX> second ago"
+msgid_plural "%<PRIuMAX> seconds ago"
+msgstr[0] "%<PRIuMAX> 秒鐘前"
+
+#: date.c
+#, c-format
+msgid "%<PRIuMAX> minute ago"
+msgid_plural "%<PRIuMAX> minutes ago"
+msgstr[0] "%<PRIuMAX> 分鐘前"
+
+#: date.c
+#, c-format
+msgid "%<PRIuMAX> hour ago"
+msgid_plural "%<PRIuMAX> hours ago"
+msgstr[0] "%<PRIuMAX> 小時前"
+
+#: date.c
+#, c-format
+msgid "%<PRIuMAX> day ago"
+msgid_plural "%<PRIuMAX> days ago"
+msgstr[0] "%<PRIuMAX> 天前"
+
+#: date.c
+#, c-format
+msgid "%<PRIuMAX> week ago"
+msgid_plural "%<PRIuMAX> weeks ago"
+msgstr[0] "%<PRIuMAX> 周前"
+
+#: date.c
+#, c-format
+msgid "%<PRIuMAX> month ago"
+msgid_plural "%<PRIuMAX> months ago"
+msgstr[0] "%<PRIuMAX> 個月前"
+
+#: date.c
+#, c-format
+msgid "%<PRIuMAX> year"
+msgid_plural "%<PRIuMAX> years"
+msgstr[0] "%<PRIuMAX> 年"
+
+#. TRANSLATORS: "%s" is "<n> years"
+#: date.c
+#, c-format
+msgid "%s, %<PRIuMAX> month ago"
+msgid_plural "%s, %<PRIuMAX> months ago"
+msgstr[0] "%s %<PRIuMAX> 個月前"
+
+#: date.c
+#, c-format
+msgid "%<PRIuMAX> year ago"
+msgid_plural "%<PRIuMAX> years ago"
+msgstr[0] "%<PRIuMAX> 年前"
+
+#: delta-islands.c
+msgid "Propagating island marks"
+msgstr "正在傳播資料島標記"
+
+#: delta-islands.c
+#, c-format
+msgid "bad tree object %s"
+msgstr "壞的樹狀物件 %s"
+
+#: delta-islands.c
+#, c-format
+msgid "failed to load island regex for '%s': %s"
+msgstr "未能載入 '%s' 的資料島常規表示式：%s"
+
+#: delta-islands.c
+#, c-format
+msgid "island regex from config has too many capture groups (max=%d)"
+msgstr "來自 config 的資料島常規表示式有太多的擷取群組（最多 %d 個）"
+
+#: delta-islands.c
+#, c-format
+msgid "Marked %d islands, done.\n"
+msgstr "已標記 %d 個資料島，結束。\n"
+
+#: diff-lib.c
+msgid "--merge-base does not work with ranges"
+msgstr "--merge-base 跟範圍無法搭配運作"
+
+#: diff-lib.c
+msgid "--merge-base only works with commits"
+msgstr "--merge-base 只能跟提交搭配才能運作"
+
+#: diff-lib.c
+msgid "unable to get HEAD"
+msgstr "不能取得 HEAD"
+
+#: diff-lib.c
+msgid "no merge base found"
+msgstr "找不到合併基底"
+
+#: diff-lib.c
+msgid "multiple merge bases found"
+msgstr "找到多個合併基底"
+
+#: diff-no-index.c
+msgid "git diff --no-index [<options>] <path> <path>"
+msgstr "git diff --no-index [<選項>] <路徑> <路徑>"
+
+#: diff-no-index.c
+msgid ""
+"Not a git repository. Use --no-index to compare two paths outside a working "
+"tree"
+msgstr "不是一個 git 版本庫。使用 --no-index 比較工作區之外的兩個路徑"
+
+#  譯者：請維持前導空格
+#: diff.c
+#, c-format
+msgid "  Failed to parse dirstat cut-off percentage '%s'\n"
+msgstr "  無法解析 dirstat 截止（cut-off）百分比 '%s'\n"
+
+#  譯者：請維持前導空格
+#: diff.c
+#, c-format
+msgid "  Unknown dirstat parameter '%s'\n"
+msgstr "  未知的 dirstat 參數 '%s'\n"
+
+#: diff.c
+msgid ""
+"color moved setting must be one of 'no', 'default', 'blocks', 'zebra', "
+"'dimmed-zebra', 'plain'"
+msgstr ""
+"移動的顏色設定必須是 'no'、'default'、'blocks'、'zebra'、'dimmed-"
+"zebra'、'plain'"
+
+#: diff.c
+#, 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 ""
+"未知的 color-moved-ws 模式 '%s'，可能的取值有 'ignore-space-change'、'ignore-"
+"space-at-eol'、'ignore-all-space'、'allow-indentation-change'"
+
+#: diff.c
+msgid ""
+"color-moved-ws: allow-indentation-change cannot be combined with other "
+"whitespace modes"
+msgstr "color-moved-ws：allow-indentation-change 不能與其它空白字元模式共用"
+
+#: diff.c
+#, c-format
+msgid "Unknown value for 'diff.submodule' config variable: '%s'"
+msgstr "設定變數 'diff.submodule' 未知的取值：'%s'"
+
+#: diff.c
+#, c-format
+msgid ""
+"Found errors in 'diff.dirstat' config variable:\n"
+"%s"
+msgstr ""
+"發現設定變數 'diff.dirstat' 中的錯誤：\n"
+"%s"
+
+#: diff.c
+#, c-format
+msgid "external diff died, stopping at %s"
+msgstr "外部 diff 離開，停止在 %s"
+
+#: diff.c parse-options.c
+#, c-format
+msgid "options '%s', '%s', '%s', and '%s' cannot be used together"
+msgstr "「%s」、「%s」、「%s」和「%s」選項不得同時使用"
+
+#: diff.c
+#, c-format
+msgid "options '%s' and '%s' cannot be used together, use '%s' with '%s'"
+msgstr "「%s」和「%s」選項不得同時使用，請使用「%s」搭配「%s」"
+
+#: diff.c
+#, c-format
+msgid ""
+"options '%s' and '%s' cannot be used together, use '%s' with '%s' and '%s'"
+msgstr "「%s」和「%s」選項不得同時使用，請使用「%s」搭配「%s」、「%s」"
+
+#: diff.c
+msgid "--follow requires exactly one pathspec"
+msgstr "--follow 明確要求只跟一個路徑規格"
+
+#: diff.c
+#, c-format
+msgid "invalid --stat value: %s"
+msgstr "無效的 --stat 值：%s"
+
+#: diff.c parse-options.c
+#, c-format
+msgid "%s expects a numerical value"
+msgstr "%s 期望一個數字值"
+
+#: diff.c
+#, c-format
+msgid ""
+"Failed to parse --dirstat/-X option parameter:\n"
+"%s"
+msgstr ""
+"無法解析 --dirstat/-X 選項的參數：\n"
+"%s"
+
+#: diff.c
+#, c-format
+msgid "unknown change class '%c' in --diff-filter=%s"
+msgstr "--diff-filter=%2$s 中未知的變更類 '%1$c'"
+
+#: diff.c
+#, c-format
+msgid "unknown value after ws-error-highlight=%.*s"
+msgstr "ws-error-highlight=%.*s 之後未知的值"
+
+#: diff.c
+#, c-format
+msgid "unable to resolve '%s'"
+msgstr "不能解析 '%s'"
+
+#: diff.c
+#, c-format
+msgid "%s expects <n>/<m> form"
+msgstr "%s 期望 <n>/<m> 格式"
+
+#: diff.c
+#, c-format
+msgid "%s expects a character, got '%s'"
+msgstr "%s 期望一個字元，得到 '%s'"
+
+#: diff.c
+#, c-format
+msgid "bad --color-moved argument: %s"
+msgstr "壞的 --color-moved 參數：%s"
+
+#: diff.c
+#, c-format
+msgid "invalid mode '%s' in --color-moved-ws"
+msgstr "--color-moved-ws 中的無效模式 '%s'"
+
+#: diff.c
+msgid ""
+"option diff-algorithm accepts \"myers\", \"minimal\", \"patience\" and "
+"\"histogram\""
+msgstr ""
+"diff-algorithm 選項有 \"myers\"、\"minimal\"、\"patience\" 和 \"histogram\""
+
+#: diff.c
+#, c-format
+msgid "invalid argument to %s"
+msgstr "%s 的參數無效"
+
+#: diff.c
+#, c-format
+msgid "invalid regex given to -I: '%s'"
+msgstr "傳入 -I 的常規表示式無效：「%s」"
+
+#: diff.c
+#, c-format
+msgid "failed to parse --submodule option parameter: '%s'"
+msgstr "無法解析 --submodule 選項的參數：'%s'"
+
+#: diff.c
+#, c-format
+msgid "bad --word-diff argument: %s"
+msgstr "壞的 --word-diff 參數：%s"
+
+#: diff.c
+msgid "Diff output format options"
+msgstr "差異輸出格式化選項"
+
+#: diff.c
+msgid "generate patch"
+msgstr "生成修補檔"
+
+#: diff.c
+msgid "<n>"
+msgstr "<n>"
+
+#: diff.c
+msgid "generate diffs with <n> lines context"
+msgstr "生成含 <n> 行上下文的差異"
+
+#: diff.c
+msgid "generate the diff in raw format"
+msgstr "生成原始格式的差異"
+
+#: diff.c
+msgid "synonym for '-p --raw'"
+msgstr "和 '-p --raw' 同義"
+
+#: diff.c
+msgid "synonym for '-p --stat'"
+msgstr "和 '-p --stat' 同義"
+
+#: diff.c
+msgid "machine friendly --stat"
+msgstr "機器友好的 --stat"
+
+#: diff.c
+msgid "output only the last line of --stat"
+msgstr "只輸出 --stat 的最後一行"
+
+#: diff.c
+msgid "<param1,param2>..."
+msgstr "<參數1,參數2>..."
+
+#: diff.c
+msgid ""
+"output the distribution of relative amount of changes for each sub-directory"
+msgstr "輸出每個子目錄相對變更的分布"
+
+#: diff.c
+msgid "synonym for --dirstat=cumulative"
+msgstr "和 --dirstat=cumulative 同義"
+
+#: diff.c
+msgid "synonym for --dirstat=files,param1,param2..."
+msgstr "是 --dirstat=files,param1,param2... 的同義詞"
+
+#: diff.c
+msgid "warn if changes introduce conflict markers or whitespace errors"
+msgstr "如果變更中引入衝突定界符或空白錯誤，給出警告"
+
+#: diff.c
+msgid "condensed summary such as creations, renames and mode changes"
+msgstr "精簡摘要，例如建立、重新命名和模式變更"
+
+#: diff.c
+msgid "show only names of changed files"
+msgstr "只顯示變更檔案的檔案名"
+
+#: diff.c
+msgid "show only names and status of changed files"
+msgstr "只顯示變更檔案的檔案名和狀態"
+
+#: diff.c
+msgid "<width>[,<name-width>[,<count>]]"
+msgstr "<寬度>[,<檔案名寬度>[,<次數>]]"
+
+#: diff.c
+msgid "generate diffstat"
+msgstr "生成差異統計（diffstat）"
+
+#: diff.c
+msgid "<width>"
+msgstr "<寬度>"
+
+#: diff.c
+msgid "generate diffstat with a given width"
+msgstr "使用提供的長度生成差異統計"
+
+#: diff.c
+msgid "generate diffstat with a given name width"
+msgstr "使用提供的檔案名長度生成差異統計"
+
+#: diff.c
+msgid "generate diffstat with a given graph width"
+msgstr "使用提供的圖形長度生成差異統計"
+
+#: diff.c
+msgid "<count>"
+msgstr "<次數>"
+
+#: diff.c
+msgid "generate diffstat with limited lines"
+msgstr "生成有限行數的差異統計"
+
+#: diff.c
+msgid "generate compact summary in diffstat"
+msgstr "生成差異統計的簡潔摘要"
+
+#: diff.c
+msgid "output a binary diff that can be applied"
+msgstr "輸出一個可以套用的二進位差異"
+
+#: diff.c
+msgid "show full pre- and post-image object names on the \"index\" lines"
+msgstr "在 \"index\" 行顯示完整的前後物件名稱"
+
+#: diff.c
+msgid "show colored diff"
+msgstr "顯示帶顏色的差異"
+
+#: diff.c
+msgid "<kind>"
+msgstr "<類型>"
+
+#: diff.c
+msgid ""
+"highlight whitespace errors in the 'context', 'old' or 'new' lines in the "
+"diff"
+msgstr "對於差異中的上下文、舊的和新的行，加亮顯示錯誤的空白字元"
+
+#: diff.c
+msgid ""
+"do not munge pathnames and use NULs as output field terminators in --raw or "
+"--numstat"
+msgstr ""
+"在 --raw 或者 --numstat 中，不對路徑字元轉檔並使用 NUL 字元做為輸出欄位的分隔"
+"符"
+
+#: diff.c
+msgid "<prefix>"
+msgstr "<前綴>"
+
+#: diff.c
+msgid "show the given source prefix instead of \"a/\""
+msgstr "顯示提供的來源前綴，而非 \"a/\""
+
+#: diff.c
+msgid "show the given destination prefix instead of \"b/\""
+msgstr "顯示提供的目的地前綴取代 \"b/\""
+
+#: diff.c
+msgid "prepend an additional prefix to every line of output"
+msgstr "輸出的每一行附加前綴"
+
+#: diff.c
+msgid "do not show any source or destination prefix"
+msgstr "不顯示任何來源和目的地前綴"
+
+#: diff.c
+msgid "show context between diff hunks up to the specified number of lines"
+msgstr "顯示指定行數的差異區塊間的上下文"
+
+#: diff.c
+msgid "<char>"
+msgstr "<字元>"
+
+#: diff.c
+msgid "specify the character to indicate a new line instead of '+'"
+msgstr "指定一個字元取代 '+' 來表示新的一行"
+
+#: diff.c
+msgid "specify the character to indicate an old line instead of '-'"
+msgstr "指定一個字元取代 '-' 來表示舊的一行"
+
+#: diff.c
+msgid "specify the character to indicate a context instead of ' '"
+msgstr "指定一個字元取代 ' ' 來表示一行上下文"
+
+#: diff.c
+msgid "Diff rename options"
+msgstr "差異重新命名選項"
+
+#: diff.c
+msgid "<n>[/<m>]"
+msgstr "<n>[/<m>]"
+
+#: diff.c
+msgid "break complete rewrite changes into pairs of delete and create"
+msgstr "將完全重寫的變更打破為成對的刪除和建立"
+
+#: diff.c
+msgid "detect renames"
+msgstr "檢測重新命名"
+
+#: diff.c
+msgid "omit the preimage for deletes"
+msgstr "省略刪除變更的差異輸出"
+
+#: diff.c
+msgid "detect copies"
+msgstr "檢測複製"
+
+#: diff.c
+msgid "use unmodified files as source to find copies"
+msgstr "使用未修改的檔案做為發現拷貝的來源"
+
+#: diff.c
+msgid "disable rename detection"
+msgstr "停用重新命名偵測"
+
+#: diff.c
+msgid "use empty blobs as rename source"
+msgstr "使用空的資料物件做為重新命名的來源"
+
+#: diff.c
+msgid "continue listing the history of a file beyond renames"
+msgstr "繼續列出檔案重新命名以外的歷史記錄"
+
+#: diff.c
+msgid ""
+"prevent rename/copy detection if the number of rename/copy targets exceeds "
+"given limit"
+msgstr "如果重新命名/複製目標超過提供的限制，禁止重新命名/複製檢測"
+
+#: diff.c
+msgid "Diff algorithm options"
+msgstr "差異演算法選項"
+
+#: diff.c
+msgid "produce the smallest possible diff"
+msgstr "生成儘可能小的差異"
+
+#: diff.c
+msgid "ignore whitespace when comparing lines"
+msgstr "行比較時忽略空白字元"
+
+#: diff.c
+msgid "ignore changes in amount of whitespace"
+msgstr "忽略空白字元的變更"
+
+#: diff.c
+msgid "ignore changes in whitespace at EOL"
+msgstr "忽略行尾的空白字元變更"
+
+#: diff.c
+msgid "ignore carrier-return at the end of line"
+msgstr "忽略行尾的Enter符（CR）"
+
+#: diff.c
+msgid "ignore changes whose lines are all blank"
+msgstr "忽略整行都是空白的變更"
+
+#: diff.c
+msgid "<regex>"
+msgstr "<正則>"
+
+#: diff.c
+msgid "ignore changes whose all lines match <regex>"
+msgstr "忽略整行符合 <regex> 的變更"
+
+#: diff.c
+msgid "heuristic to shift diff hunk boundaries for easy reading"
+msgstr "啟發式轉換差異邊界以便閱讀"
+
+#: diff.c
+msgid "generate diff using the \"patience diff\" algorithm"
+msgstr "使用 \"patience diff\" 演算法生成差異"
+
+#: diff.c
+msgid "generate diff using the \"histogram diff\" algorithm"
+msgstr "使用 \"histogram diff\" 演算法生成差異"
+
+#: diff.c
+msgid "<algorithm>"
+msgstr "<演算法>"
+
+#: diff.c
+msgid "choose a diff algorithm"
+msgstr "選擇一個差異演算法"
+
+#: diff.c
+msgid "<text>"
+msgstr "<文字>"
+
+#: diff.c
+msgid "generate diff using the \"anchored diff\" algorithm"
+msgstr "使用 \"anchored diff\" 演算法生成差異"
+
+#: diff.c
+msgid "<mode>"
+msgstr "<模式>"
+
+#: diff.c
+msgid "show word diff, using <mode> to delimit changed words"
+msgstr "顯示單詞差異，使用 <模式> 分隔變更的單詞"
+
+#: diff.c
+msgid "use <regex> to decide what a word is"
+msgstr "使用 <常規表示式> 確定何為一個詞"
+
+#: diff.c
+msgid "equivalent to --word-diff=color --word-diff-regex=<regex>"
+msgstr "相當於 --word-diff=color --word-diff-regex=<正則>"
+
+#: diff.c
+msgid "moved lines of code are colored differently"
+msgstr "移動的程式碼行用不同方式著色"
+
+#: diff.c
+msgid "how white spaces are ignored in --color-moved"
+msgstr "在 --color-moved 下如何忽略空白字元"
+
+#: diff.c
+msgid "Other diff options"
+msgstr "其它差異選項"
+
+#: diff.c
+msgid "when run from subdir, exclude changes outside and show relative paths"
+msgstr "當從子目錄執行，排除目錄之外的變更並顯示相對路徑"
+
+#: diff.c
+msgid "treat all files as text"
+msgstr "把所有檔案當做文字處理"
+
+#: diff.c
+msgid "swap two inputs, reverse the diff"
+msgstr "交換兩個輸入，反轉差異"
+
+#: diff.c
+msgid "exit with 1 if there were differences, 0 otherwise"
+msgstr "有差異時離開碼為 1，否則為 0"
+
+#: diff.c
+msgid "disable all output of the program"
+msgstr "停用本程式的所有輸出"
+
+#: diff.c
+msgid "allow an external diff helper to be executed"
+msgstr "允許執行一個外部的差異協助工具"
+
+#: diff.c
+msgid "run external text conversion filters when comparing binary files"
+msgstr "當比較二進位檔案時，執行外部的文字轉換過濾器"
+
+#: diff.c
+msgid "<when>"
+msgstr "<何時>"
+
+#: diff.c
+msgid "ignore changes to submodules in the diff generation"
+msgstr "在生成差異時，忽略子模組的更改"
+
+#: diff.c
+msgid "<format>"
+msgstr "<格式>"
+
+#: diff.c
+msgid "specify how differences in submodules are shown"
+msgstr "指定子模組的差異如何顯示"
+
+#: diff.c
+msgid "hide 'git add -N' entries from the index"
+msgstr "隱藏索引中 'git add -N' 條目"
+
+#: diff.c
+msgid "treat 'git add -N' entries as real in the index"
+msgstr "將索引中 'git add -N' 條目當做真實的"
+
+#: diff.c
+msgid "<string>"
+msgstr "<字串>"
+
+#: diff.c
+msgid ""
+"look for differences that change the number of occurrences of the specified "
+"string"
+msgstr "尋找改變了指定字串出現次數的差異"
+
+#: diff.c
+msgid ""
+"look for differences that change the number of occurrences of the specified "
+"regex"
+msgstr "尋找改變指定正則符合出現次數的差異"
+
+#: diff.c
+msgid "show all changes in the changeset with -S or -G"
+msgstr "顯示使用 -S 或 -G 的變更集的所有變更"
+
+#: diff.c
+msgid "treat <string> in -S as extended POSIX regular expression"
+msgstr "將 -S 的 <string> 當做延伸 POSIX 常規表示式"
+
+#: diff.c
+msgid "control the order in which files appear in the output"
+msgstr "控制輸出中的檔案顯示順序"
+
+#: diff.c
+msgid "<path>"
+msgstr "<路徑>"
+
+#: diff.c
+msgid "show the change in the specified path first"
+msgstr "先顯示指定路徑的變更"
+
+#: diff.c
+msgid "skip the output to the specified path"
+msgstr "略過輸出至指定路徑"
+
+#: diff.c
+msgid "<object-id>"
+msgstr "<物件 ID>"
+
+#: diff.c
+msgid ""
+"look for differences that change the number of occurrences of the specified "
+"object"
+msgstr "尋找改變指定物件出現次數的差異"
+
+#: diff.c
+msgid "[(A|C|D|M|R|T|U|X|B)...[*]]"
+msgstr "[(A|C|D|M|R|T|U|X|B)...[*]]"
+
+#: diff.c
+msgid "select files by diff type"
+msgstr "透過差異類型選擇檔案"
+
+#: diff.c
+msgid "<file>"
+msgstr "<檔案>"
+
+#: diff.c
+msgid "output to a specific file"
+msgstr "輸出至指定檔案"
+
+#: diff.c
+msgid "exhaustive rename detection was skipped due to too many files."
+msgstr "因為檔案太多，已略過詳細重新命名偵測。"
+
+#: diff.c
+msgid "only found copies from modified paths due to too many files."
+msgstr "因為檔案太多，只在修改的路徑中尋找複製。"
+
+#: diff.c
+#, c-format
+msgid ""
+"you may want to set your %s variable to at least %d and retry the command."
+msgstr "您可能想要將變數 %s 設定為至少 %d 並再次執行此指令。"
+
+#: diffcore-order.c
+#, c-format
+msgid "failed to read orderfile '%s'"
+msgstr "讀取排序檔案 '%s' 失敗"
+
+#: diffcore-rename.c
+msgid "Performing inexact rename detection"
+msgstr "正在進行非精確的重新命名偵測"
+
+#: diffcore-rotate.c
+#, c-format
+msgid "No such path '%s' in the diff"
+msgstr "diff 中沒有「%s」路徑"
+
+#: dir.c
+#, c-format
+msgid "pathspec '%s' did not match any file(s) known to git"
+msgstr "路徑規格 '%s' 未符合任何 git 已知檔案"
+
+#: dir.c
+#, c-format
+msgid "unrecognized pattern: '%s'"
+msgstr "無法識別樣式：「%s」"
+
+#: dir.c
+#, c-format
+msgid "unrecognized negative pattern: '%s'"
+msgstr "無法識別反向模式：「%s」"
+
+#: dir.c
+#, c-format
+msgid "your sparse-checkout file may have issues: pattern '%s' is repeated"
+msgstr "您的稀疏簽出檔案可能有問題：「%s」樣式重複"
+
+#: dir.c
+msgid "disabling cone pattern matching"
+msgstr "停用 cone 樣式符合模式"
+
+#: dir.c
+#, c-format
+msgid "cannot use %s as an exclude file"
+msgstr "不能將 %s 用作排除檔案"
+
+#: dir.c
+msgid "failed to get kernel name and information"
+msgstr "無法獲得核心名稱和訊息"
+
+#: dir.c
+msgid "untracked cache is disabled on this system or location"
+msgstr "快取未追蹤檔案在本系統或位置中被停用"
+
+#: dir.c
+msgid ""
+"No directory name could be guessed.\n"
+"Please specify a directory on the command line"
+msgstr ""
+"無法猜到目錄名。\n"
+"請在指令列指定一個目錄"
+
+#: dir.c
+#, c-format
+msgid "index file corrupt in repo %s"
+msgstr "版本庫 %s 中的索引檔案損壞"
+
+#: dir.c
+#, c-format
+msgid "could not create directories for %s"
+msgstr "不能為 %s 建立目錄"
+
+#: dir.c
+#, c-format
+msgid "could not migrate git directory from '%s' to '%s'"
+msgstr "不能從 '%s' 遷移 git 目錄到 '%s'"
+
+#: editor.c
+#, c-format
+msgid "hint: Waiting for your editor to close the file...%c"
+msgstr "提示：等待您的編輯器關閉檔案...%c"
+
+#: entry.c
+msgid "Filtering content"
+msgstr "過濾內容"
+
+#: entry.c
+#, c-format
+msgid "could not stat file '%s'"
+msgstr "不能對檔案 '%s' 呼叫 stat"
+
+#: environment.c
+#, c-format
+msgid "bad git namespace path \"%s\""
+msgstr "錯誤的 git 名字空間路徑 \"%s\""
+
+#: exec-cmd.c
+#, c-format
+msgid "too many args to run %s"
+msgstr "執行 %s 的參數太多"
+
+#: fetch-pack.c
+msgid "git fetch-pack: expected shallow list"
+msgstr "git fetch-pack：應為 shallow 列表"
+
+#: fetch-pack.c
+msgid "git fetch-pack: expected a flush packet after shallow list"
+msgstr "git fetch-pack：在淺複製列表之後期望一個 flush 包"
+
+#: fetch-pack.c
+msgid "git fetch-pack: expected ACK/NAK, got a flush packet"
+msgstr "git fetch-pack：期望 ACK/NAK，卻得到 flush 包"
+
+#: fetch-pack.c
+#, c-format
+msgid "git fetch-pack: expected ACK/NAK, got '%s'"
+msgstr "git fetch-pack：應為 ACK/NAK，卻得到 '%s'"
+
+#: fetch-pack.c
+msgid "unable to write to remote"
+msgstr "無法寫到遠端"
+
+#: fetch-pack.c
+#, c-format
+msgid "invalid shallow line: %s"
+msgstr "無效的 shallow 訊息：%s"
+
+#: fetch-pack.c
+#, c-format
+msgid "invalid unshallow line: %s"
+msgstr "無效的 unshallow 訊息：%s"
+
+#: fetch-pack.c
+#, c-format
+msgid "object not found: %s"
+msgstr "物件未找到：%s"
+
+#: fetch-pack.c
+#, c-format
+msgid "error in object: %s"
+msgstr "物件中發生錯誤：%s"
+
+#: fetch-pack.c
+#, c-format
+msgid "no shallow found: %s"
+msgstr "未發現 shallow：%s"
+
+#: fetch-pack.c
+#, c-format
+msgid "expected shallow/unshallow, got %s"
+msgstr "應為 shallow/unshallow，卻得到 %s"
+
+#: fetch-pack.c
+#, c-format
+msgid "got %s %d %s"
+msgstr "得到 %s %d %s"
+
+#: fetch-pack.c
+#, c-format
+msgid "invalid commit %s"
+msgstr "無效提交 %s"
+
+#: fetch-pack.c
+msgid "giving up"
+msgstr "放棄"
+
+#: fetch-pack.c progress.h
+msgid "done"
+msgstr "完成"
+
+#: fetch-pack.c
+#, c-format
+msgid "got %s (%d) %s"
+msgstr "得到 %s (%d) %s"
+
+#: fetch-pack.c
+#, c-format
+msgid "Marking %s as complete"
+msgstr "標記 %s 為完成"
+
+#: fetch-pack.c
+#, c-format
+msgid "already have %s (%s)"
+msgstr "已經有 %s（%s）"
+
+#: fetch-pack.c
+msgid "fetch-pack: unable to fork off sideband demultiplexer"
+msgstr "fetch-pack：無法衍生 sideband 多路輸出"
+
+#: fetch-pack.c
+msgid "protocol error: bad pack header"
+msgstr "協定錯誤：壞的包頭"
+
+#: fetch-pack.c
+#, c-format
+msgid "fetch-pack: unable to fork off %s"
+msgstr "fetch-pack：無法 fork %s 處理程序"
+
+#: fetch-pack.c
+msgid "fetch-pack: invalid index-pack output"
+msgstr "fetch-pack：無效的 index-pack 輸出"
+
+#: fetch-pack.c
+#, c-format
+msgid "%s failed"
+msgstr "%s 失敗"
+
+#: fetch-pack.c
+msgid "error in sideband demultiplexer"
+msgstr "sideband 多路輸出發生錯誤"
+
+#: fetch-pack.c
+#, c-format
+msgid "Server version is %.*s"
+msgstr "伺服器版本 %.*s"
+
+#: fetch-pack.c
+#, c-format
+msgid "Server supports %s"
+msgstr "伺服器支援 %s"
+
+#: fetch-pack.c
+msgid "Server does not support shallow clients"
+msgstr "伺服器不支援 shallow 用戶端"
+
+#: fetch-pack.c
+msgid "Server does not support --shallow-since"
+msgstr "伺服器不支援 --shallow-since"
+
+#: fetch-pack.c
+msgid "Server does not support --shallow-exclude"
+msgstr "伺服器不支援 --shallow-exclude"
+
+#: fetch-pack.c
+msgid "Server does not support --deepen"
+msgstr "伺服器不支援 --deepen"
+
+#: fetch-pack.c
+msgid "Server does not support this repository's object format"
+msgstr "伺服器不支援此版本庫的物件格式"
+
+#: fetch-pack.c
+msgid "no common commits"
+msgstr "沒有共同的提交"
+
+#: fetch-pack.c
+msgid "git fetch-pack: fetch failed."
+msgstr "git fetch-pack：取得失敗。"
+
+#: fetch-pack.c
+#, c-format
+msgid "mismatched algorithms: client %s; server %s"
+msgstr "算法不一致：用戶端 %s；伺服器 %s"
+
+#: fetch-pack.c
+#, c-format
+msgid "the server does not support algorithm '%s'"
+msgstr "伺服器不支援「%s」算法"
+
+#: fetch-pack.c
+msgid "Server does not support shallow requests"
+msgstr "伺服器不支援 shallow 請求"
+
+#: fetch-pack.c
+msgid "Server supports filter"
+msgstr "伺服器支援 filter"
+
+#: fetch-pack.c
+msgid "unable to write request to remote"
+msgstr "無法將請求寫到遠端"
+
+#: fetch-pack.c
+#, c-format
+msgid "expected '%s', received '%s'"
+msgstr "預期 '%s'，得到 '%s'"
+
+#: fetch-pack.c
+#, c-format
+msgid "expected '%s'"
+msgstr "預期 “%s”"
+
+#: fetch-pack.c
+#, c-format
+msgid "unexpected acknowledgment line: '%s'"
+msgstr "意外的確認行：'%s'"
+
+#: fetch-pack.c
+#, c-format
+msgid "error processing acks: %d"
+msgstr "處理 ack 發生錯誤：%d"
+
+#. TRANSLATORS: The parameter will be 'ready', a protocol
+#. keyword.
+#.
+#: fetch-pack.c
+#, c-format
+msgid "expected packfile to be sent after '%s'"
+msgstr "預期在 「%s」後傳送 packfile"
+
+#. TRANSLATORS: The parameter will be 'ready', a protocol
+#. keyword.
+#.
+#: fetch-pack.c
+#, c-format
+msgid "expected no other sections to be sent after no '%s'"
+msgstr "預期在沒有「%s」後不傳送其他區段"
+
+#: fetch-pack.c
+#, c-format
+msgid "error processing shallow info: %d"
+msgstr "處理淺複製訊息發生錯誤：%d"
+
+#: fetch-pack.c
+#, c-format
+msgid "expected wanted-ref, got '%s'"
+msgstr "預期 wanted-ref，得到 '%s'"
+
+#: fetch-pack.c
+#, c-format
+msgid "unexpected wanted-ref: '%s'"
+msgstr "意外的 wanted-ref：'%s'"
+
+#: fetch-pack.c
+#, c-format
+msgid "error processing wanted refs: %d"
+msgstr "處理要取得的引用發生錯誤：%d"
+
+#: fetch-pack.c
+msgid "git fetch-pack: expected response end packet"
+msgstr "git fetch-pack: 預期要有回應結束封包"
+
+#: fetch-pack.c
+msgid "no matching remote head"
+msgstr "沒有符合的遠端分支"
+
+#: fetch-pack.c
+msgid "unexpected 'ready' from remote"
+msgstr "從遠端收到非預期的 ‘ready’"
+
+#: fetch-pack.c
+#, c-format
+msgid "no such remote ref %s"
+msgstr "沒有這樣的遠端引用 %s"
+
+#: fetch-pack.c
+#, c-format
+msgid "Server does not allow request for unadvertised object %s"
+msgstr "伺服器不允許請求未公開的物件 %s"
+
+#: fsmonitor-ipc.c
+#, c-format
+msgid "fsmonitor_ipc__send_query: invalid path '%s'"
+msgstr "fsmonitor_ipc__send_query：路徑「%s」無效"
+
+#: fsmonitor-ipc.c
+#, c-format
+msgid "fsmonitor_ipc__send_query: unspecified error on '%s'"
+msgstr "fsmonitor_ipc__send_query：「%s」上有未指定的錯誤"
+
+#: fsmonitor-ipc.c
+msgid "fsmonitor--daemon is not running"
+msgstr "fsmonitor--daemon 未在運作"
+
+#: fsmonitor-ipc.c
+#, c-format
+msgid "could not send '%s' command to fsmonitor--daemon"
+msgstr "無法將「%s」命令傳送到 fsmonitor--daemon"
+
+#: fsmonitor-settings.c
+#, c-format
+msgid "bare repository '%s' is incompatible with fsmonitor"
+msgstr "純版本庫 “%s” 與 fsmonitor 不相容"
+
+#: fsmonitor-settings.c
+#, c-format
+msgid "repository '%s' is incompatible with fsmonitor due to errors"
+msgstr "版本庫 “%s” 因錯誤而與 fsmonitor 不相容"
+
+#: fsmonitor-settings.c
+#, c-format
+msgid "remote repository '%s' is incompatible with fsmonitor"
+msgstr "遠端版本庫 “%s” 與 fsmonitor 不相容"
+
+#: fsmonitor-settings.c
+#, c-format
+msgid "virtual repository '%s' is incompatible with fsmonitor"
+msgstr "虛擬版本庫 “%s” 與 fsmonitor 不相容"
+
+#: fsmonitor-settings.c
+#, c-format
+msgid ""
+"repository '%s' is incompatible with fsmonitor due to lack of Unix sockets"
+msgstr "版本庫 “%s” 因缺少 Unix 通訊端而與 fsmonitor 不相容"
+
+#: git.c
+msgid ""
+"git [-v | --version] [-h | --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"
+"           [--git-dir=<path>] [--work-tree=<path>] [--namespace=<name>]\n"
+"           [--super-prefix=<path>] [--config-env=<name>=<envvar>]\n"
+"           <command> [<args>]"
+msgstr ""
+"git [-v | --version] [-h | --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"
+"           [--git-dir=<path>] [--work-tree=<path>] [--namespace=<name>]\n"
+"           [--super-prefix=<path>] [--config-env=<name>=<envvar>]\n"
+"           <command> [<args>]"
+
+#: git.c
+msgid ""
+"'git help -a' and 'git help -g' list available subcommands and some\n"
+"concept guides. See 'git help <command>' or 'git help <concept>'\n"
+"to read about a specific subcommand or concept.\n"
+"See 'git help git' for an overview of the system."
+msgstr ""
+"指令 'git help -a' 和 'git help -g' 顯示可用的子指令和一些概念說明。\n"
+"檢視 'git help <命令>' 或 'git help <概念>' 以取得提供子指令或概念\n"
+"說明。\n"
+"有關系統概述，檢視 'git help git'。"
+
+#: git.c help.c
+#, c-format
+msgid "unsupported command listing type '%s'"
+msgstr "不支援的指令列表類型 '%s'"
+
+#: git.c
+#, c-format
+msgid "no directory given for '%s' option\n"
+msgstr "未傳入目錄至「%s」選項\n"
+
+#: git.c
+#, c-format
+msgid "no namespace given for --namespace\n"
+msgstr "沒有為 --namespace 提供命名空間\n"
+
+#: git.c
+#, c-format
+msgid "no prefix given for --super-prefix\n"
+msgstr "沒有為 --super-prefix 提供前綴\n"
+
+#: git.c
+#, c-format
+msgid "-c expects a configuration string\n"
+msgstr "應為 -c 提供一個設定字串\n"
+
+#: git.c
+#, c-format
+msgid "no config key given for --config-env\n"
+msgstr "未傳入設定鍵至 --config-env\n"
+
+#: git.c
+#, c-format
+msgid "unknown option: %s\n"
+msgstr "未知選項：%s\n"
+
+#: git.c
+#, c-format
+msgid "while expanding alias '%s': '%s'"
+msgstr "在展開別名 '%s' 時：'%s'"
+
+#: git.c
+#, c-format
+msgid ""
+"alias '%s' changes environment variables.\n"
+"You can use '!git' in the alias to do this"
+msgstr ""
+"別名 '%s' 修改環境變數。您可以使用在別名中\n"
+"使用 '!git'"
+
+#: git.c
+#, c-format
+msgid "empty alias for %s"
+msgstr "%s 的空別名"
+
+#: git.c
+#, c-format
+msgid "recursive alias: %s"
+msgstr "遞迴的別名：%s"
+
+#: git.c
+msgid "write failure on standard output"
+msgstr "在標準輸出寫入失敗"
+
+#: git.c
+msgid "unknown write failure on standard output"
+msgstr "到標準輸出的未知寫入錯誤"
+
+#: git.c
+msgid "close failed on standard output"
+msgstr "標準輸出關閉失敗"
+
+#: git.c
+#, c-format
+msgid "alias loop detected: expansion of '%s' does not terminate:%s"
+msgstr "偵測到別名循環：展開後的「%s」無窮無盡：%s"
+
+#: git.c
+#, c-format
+msgid "cannot handle %s as a builtin"
+msgstr "不能作為內建指令處理 %s"
+
+#: git.c
+#, c-format
+msgid ""
+"usage: %s\n"
+"\n"
+msgstr ""
+"用法：%s\n"
+"\n"
+
+#: git.c
+#, c-format
+msgid "expansion of alias '%s' failed; '%s' is not a git command\n"
+msgstr "展開別名指令 '%s' 失敗，'%s' 不是一個 git 指令\n"
+
+#: git.c
+#, c-format
+msgid "failed to run command '%s': %s\n"
+msgstr "執行指令 '%s' 失敗：%s\n"
+
+#: gpg-interface.c
+msgid "could not create temporary file"
+msgstr "不能建立暫存檔"
+
+#: gpg-interface.c
+#, c-format
+msgid "failed writing detached signature to '%s'"
+msgstr "無法將分離式簽名寫入 '%s'"
+
+#: gpg-interface.c
+msgid ""
+"gpg.ssh.allowedSignersFile needs to be configured and exist for ssh "
+"signature verification"
+msgstr "SSH 簽名驗證需要設定 gpg.ssh.allowedSignersFile，簽名檔案也要存在"
+
+#: gpg-interface.c
+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
+#, c-format
+msgid "ssh signing revocation file configured but not found: %s"
+msgstr "有設定 SSH 簽名廢止檔案，但找不到檔案本體：%s"
+
+#: gpg-interface.c
+#, c-format
+msgid "bad/incompatible signature '%s'"
+msgstr "簽名「%s」損壞或者不相容"
+
+#: gpg-interface.c
+#, c-format
+msgid "failed to get the ssh fingerprint for key '%s'"
+msgstr "無法取得「%s」金鑰的 SSH 指紋"
+
+#: gpg-interface.c
+msgid ""
+"either user.signingkey or gpg.ssh.defaultKeyCommand needs to be configured"
+msgstr "需要設定 user.signingkey 或 gpg.ssh.defaultKeyCommand 任一"
+
+#: gpg-interface.c
+#, c-format
+msgid "gpg.ssh.defaultKeyCommand succeeded but returned no keys: %s %s"
+msgstr "gpg.ssh.defaultKeyCommand 執行成功，但沒回傳按鍵：%s %s"
+
+#: gpg-interface.c
+#, c-format
+msgid "gpg.ssh.defaultKeyCommand failed: %s %s"
+msgstr "gpg.ssh.defaultKeyCommand 執行失敗：%s %s"
+
+#: gpg-interface.c
+msgid "gpg failed to sign the data"
+msgstr "gpg 無法為資料簽名"
+
+#: gpg-interface.c
+msgid "user.signingKey needs to be set for ssh signing"
+msgstr "需要設定 user.signingKey 才能進行 SSH 簽名"
+
+#: gpg-interface.c
+#, c-format
+msgid "failed writing ssh signing key to '%s'"
+msgstr "無法將 SSH 簽名金鑰寫入「%s」"
+
+#: gpg-interface.c
+#, c-format
+msgid "failed writing ssh signing key buffer to '%s'"
+msgstr "無法將 SSH 簽名金鑰緩衝區寫入「%s」"
+
+#: gpg-interface.c
+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
+#, c-format
+msgid "failed reading ssh signing data buffer from '%s'"
+msgstr "無法從「%s」讀取 SSH 簽名資料緩衝區"
+
+#: graph.c
+#, c-format
+msgid "ignored invalid color '%.*s' in log.graphColors"
+msgstr "已忽略 log.graphColors 中無效的 “%.*s” 色彩"
+
+#: grep.c
+msgid ""
+"given pattern contains NULL byte (via -f <file>). This is only supported "
+"with -P under PCRE v2"
+msgstr ""
+"提供的模式包含 NULL 字元（通過 -f <檔案> 參數）。只有 PCRE v2 下的 -P 支援此"
+"功能"
+
+#: grep.c
+#, c-format
+msgid "'%s': unable to read %s"
+msgstr "'%s'：無法讀取 %s"
+
+#: grep.c
+#, c-format
+msgid "'%s': short read"
+msgstr "'%s'：讀取不完整"
+
+#: help.c
+msgid "start a working area (see also: git help tutorial)"
+msgstr "開始一個工作區（參見：git help tutorial）"
+
+#: help.c
+msgid "work on the current change (see also: git help everyday)"
+msgstr "在目前變更上工作（參見：git help everyday）"
+
+#: help.c
+msgid "examine the history and state (see also: git help revisions)"
+msgstr "檢查歷史和狀態（參見：git help revisions）"
+
+#: help.c
+msgid "grow, mark and tweak your common history"
+msgstr "擴展、標記和調校您的歷史記錄"
+
+#: help.c
+msgid "collaborate (see also: git help workflows)"
+msgstr "協同（參見：git help workflows）"
+
+#: help.c
+msgid "Main Porcelain Commands"
+msgstr "主要的上層指令"
+
+#: help.c
+msgid "Ancillary Commands / Manipulators"
+msgstr "輔助指令/動作者"
+
+#: help.c
+msgid "Ancillary Commands / Interrogators"
+msgstr "輔助指令/詢問者"
+
+#: help.c
+msgid "Interacting with Others"
+msgstr "與其它系統互動"
+
+#: help.c
+msgid "Low-level Commands / Manipulators"
+msgstr "低級指令/動作者"
+
+#: help.c
+msgid "Low-level Commands / Interrogators"
+msgstr "低級指令/詢問者"
+
+#: help.c
+msgid "Low-level Commands / Syncing Repositories"
+msgstr "低級指令 / 同步版本庫"
+
+#: help.c
+msgid "Low-level Commands / Internal Helpers"
+msgstr "低級指令/內部協助工具"
+
+#: help.c
+#, c-format
+msgid "available git commands in '%s'"
+msgstr "在 '%s' 下可用的 git 指令"
+
+#: help.c
+msgid "git commands available from elsewhere on your $PATH"
+msgstr "在 $PATH 路徑中的其他地方可用的 git 指令"
+
+#: help.c
+msgid "These are common Git commands used in various situations:"
+msgstr "這些是各種場合常見的 Git 指令："
+
+#: help.c
+msgid "The Git concept guides are:"
+msgstr "Git 概念嚮導有："
+
+#: help.c
+msgid "External commands"
+msgstr "外部指令"
+
+#: help.c
+msgid "Command aliases"
+msgstr "指令別名"
+
+#: help.c
+msgid "See 'git help <command>' to read about a specific subcommand"
+msgstr "執行　'git help <command>' 來檢視特定子指令"
+
+#: help.c
+#, c-format
+msgid ""
+"'%s' appears to be a git command, but we were not\n"
+"able to execute it. Maybe git-%s is broken?"
+msgstr ""
+"'%s' 像是一個 git 指令，但卻無法執行。\n"
+"可能是 git-%s 受損？"
+
+#: help.c
+#, c-format
+msgid "git: '%s' is not a git command. See 'git --help'."
+msgstr "git：'%s' 不是一個 git 指令。參見 'git --help'。"
+
+#: help.c
+msgid "Uh oh. Your system reports no Git commands at all."
+msgstr "唉呀，您的系統中未發現 Git 指令。"
+
+#: help.c
+#, c-format
+msgid "WARNING: You called a Git command named '%s', which does not exist."
+msgstr "警告：您執行了一個並不存在的 Git 指令 '%s'。"
+
+#: help.c
+#, c-format
+msgid "Continuing under the assumption that you meant '%s'."
+msgstr "假定你想要的是 '%s' 並繼續。"
+
+#: help.c
+#, c-format
+msgid "Run '%s' instead [y/N]? "
+msgstr "改執行「%s」[y/N]？ "
+
+#: help.c
+#, c-format
+msgid "Continuing in %0.1f seconds, assuming that you meant '%s'."
+msgstr "假定你想要的是 '%2$s'，在 %1$0.1f 秒鐘後繼續。"
+
+#: help.c
+msgid ""
+"\n"
+"The most similar command is"
+msgid_plural ""
+"\n"
+"The most similar commands are"
+msgstr[0] ""
+"\n"
+"最類似的指令有"
+
+#: help.c
+msgid "git version [<options>]"
+msgstr "git version [<選項>]"
+
+#: help.c
+#, c-format
+msgid "%s: %s - %s"
+msgstr "%s：%s - %s"
+
+#: help.c
+msgid ""
+"\n"
+"Did you mean this?"
+msgid_plural ""
+"\n"
+"Did you mean one of these?"
+msgstr[0] ""
+"\n"
+"您指的是這個嗎？"
+
+#: hook.c
+#, 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` 來關閉這條警告。"
+
+#: hook.c
+#, c-format
+msgid "Couldn't start hook '%s'\n"
+msgstr "無法啟動「%s」掛鉤\n"
+
+#: http-fetch.c
+#, c-format
+msgid "argument to --packfile must be a valid hash (got '%s')"
+msgstr "傳入 --packfile 的參數必須是有效的雜湊 (收到 '%s')"
+
+#: http-fetch.c
+msgid "not a git repository"
+msgstr "不是一個 git 版本庫"
+
+#: http.c
+#, c-format
+msgid "negative value for http.postBuffer; defaulting to %d"
+msgstr "http.postBuffer 為負值，預設為 %d"
+
+#: http.c
+msgid "Delegation control is not supported with cURL < 7.22.0"
+msgstr "不支援委託控制，因為 cURL < 7.22.0"
+
+#: http.c
+msgid "Public key pinning not supported with cURL < 7.39.0"
+msgstr "不支援公鑰檔案鎖定，因為 cURL < 7.39.0"
+
+#: http.c
+msgid "CURLSSLOPT_NO_REVOKE not supported with cURL < 7.44.0"
+msgstr "不支援 CURLSSLOPT_NO_REVOKE，因為 cURL < 7.44.0"
+
+#: http.c
+#, c-format
+msgid "Unsupported SSL backend '%s'. Supported SSL backends:"
+msgstr "不支援的 SSL 後端 '%s'。支援的 SSL 後端："
+
+#: http.c
+#, c-format
+msgid "Could not set SSL backend to '%s': cURL was built without SSL backends"
+msgstr "無法將 SSL 後端設定為 '%s'：組建 cURL 時未加入 SSL 後端"
+
+#: http.c
+#, c-format
+msgid "Could not set SSL backend to '%s': already set"
+msgstr "無法將 SSL 後端設定為 '%s'：已經設定"
+
+#: http.c
+#, c-format
+msgid ""
+"unable to update url base from redirection:\n"
+"  asked for: %s\n"
+"   redirect: %s"
+msgstr ""
+"不能更新重定向的 url base：\n"
+"     請求：%s\n"
+"   重定向：%s"
+
+#: ident.c
+msgid "Author identity unknown\n"
+msgstr "作者身分未知\n"
+
+#: ident.c
+msgid "Committer identity unknown\n"
+msgstr "提交者身分未知\n"
+
+#: ident.c
+msgid ""
+"\n"
+"*** Please tell me who you are.\n"
+"\n"
+"Run\n"
+"\n"
+"  git config --global user.email \"you@example.com\"\n"
+"  git config --global user.name \"Your Name\"\n"
+"\n"
+"to set your account's default identity.\n"
+"Omit --global to set the identity only in this repository.\n"
+"\n"
+msgstr ""
+"\n"
+"*** 請告訴我你是誰。\n"
+"\n"
+"執行\n"
+"\n"
+"  git config --global user.email \"you@example.com\"\n"
+"  git config --global user.name \"Your Name\"\n"
+"\n"
+"來設定您帳號的預設身份標記。\n"
+"若只要在這個版本庫設定身份標記，請省略 --global 參數。\n"
+"\n"
+
+#: ident.c
+msgid "no email was given and auto-detection is disabled"
+msgstr "未提供信件位址且自動偵測被停用"
+
+#: ident.c
+#, c-format
+msgid "unable to auto-detect email address (got '%s')"
+msgstr "無法自動偵測信件位址（得到 '%s'）"
+
+#: ident.c
+msgid "no name was given and auto-detection is disabled"
+msgstr "未提供姓名且自動偵測被停用"
+
+#: ident.c
+#, c-format
+msgid "unable to auto-detect name (got '%s')"
+msgstr "無法自動偵測姓名（得到 '%s'）"
+
+#: ident.c
+#, c-format
+msgid "empty ident name (for <%s>) not allowed"
+msgstr "不允許空的姓名（對於 <%s>）"
+
+#: ident.c
+#, c-format
+msgid "name consists only of disallowed characters: %s"
+msgstr "姓名中僅包含停用字元：%s"
+
+#: list-objects-filter-options.c
+msgid "expected 'tree:<depth>'"
+msgstr "期望 'tree:<深度>'"
+
+#: list-objects-filter-options.c
+msgid "sparse:path filters support has been dropped"
+msgstr "sparse:path 過濾器支援已被刪除"
+
+#: list-objects-filter-options.c
+#, c-format
+msgid "'%s' for 'object:type=<type>' is not a valid object type"
+msgstr "“object:type=<type>” 的 “%s” 不是有效的物件格式"
+
+#: list-objects-filter-options.c
+#, c-format
+msgid "invalid filter-spec '%s'"
+msgstr "無效的過濾器規格 '%s'"
+
+#: list-objects-filter-options.c
+#, c-format
+msgid "must escape char in sub-filter-spec: '%c'"
+msgstr "必須對 sub-filter-spec 中的字元進行轉義：'%c'"
+
+#: list-objects-filter-options.c
+msgid "expected something after combine:"
+msgstr "期望在組合後有一些東西："
+
+#: list-objects-filter-options.c
+msgid "multiple filter-specs cannot be combined"
+msgstr "不能混用多種過濾規格"
+
+#: list-objects-filter-options.c
+msgid "unable to upgrade repository format to support partial clone"
+msgstr "無法升級版本庫格式，以致不支援部分複製"
+
+#: list-objects-filter-options.h
+msgid "args"
+msgstr "參數"
+
+#: list-objects-filter-options.h
+msgid "object filtering"
+msgstr "物件過濾"
+
+#: list-objects-filter.c
+#, c-format
+msgid "unable to access sparse blob in '%s'"
+msgstr "不能存取 '%s' 中的稀疏資料物件"
+
+#: list-objects-filter.c
+#, c-format
+msgid "unable to parse sparse filter data in %s"
+msgstr "無法解析 %s 中的稀疏過濾器資料"
+
+#: list-objects.c
+#, c-format
+msgid "entry '%s' in tree %s has tree mode, but is not a tree"
+msgstr "樹 %2$s 中的條目 '%1$s' 具有樹的屬性，但不是一個樹狀物件"
+
+#: list-objects.c
+#, c-format
+msgid "entry '%s' in tree %s has blob mode, but is not a blob"
+msgstr "樹 %2$s 中的條目 '%1$s' 具有資料物件的屬性，但不是一個資料物件"
+
+#: list-objects.c
+#, c-format
+msgid "unable to load root tree for commit %s"
+msgstr "無法為提交 %s 載入根樹"
+
+#: lockfile.c
+#, c-format
+msgid ""
+"Unable to create '%s.lock': %s.\n"
+"\n"
+"Another git process seems to be running in this repository, e.g.\n"
+"an editor opened by 'git commit'. Please make sure all processes\n"
+"are terminated then try again. If it still fails, a git process\n"
+"may have crashed in this repository earlier:\n"
+"remove the file manually to continue."
+msgstr ""
+"無法建立 '%s.lock'：%s。\n"
+"\n"
+"這個版本庫似乎有另一個 git 處理程序在執行，\n"
+"例如「git commit」命令開啟的編輯器。\n"
+"請確認所有處理程序都已經終止後再重試一次。如果錯誤沒有消失，\n"
+"有可能是之前在這個版本庫執行的 git 處理程序當掉了。\n"
+"如果是這樣，請自行刪除這個檔案再繼續。"
+
+#: lockfile.c
+#, c-format
+msgid "Unable to create '%s.lock': %s"
+msgstr "不能建立 '%s.lock'：%s"
+
+#: ls-refs.c
+#, c-format
+msgid "unexpected line: '%s'"
+msgstr "遇到非預期橫列：「%s」"
+
+#: ls-refs.c
+msgid "expected flush after ls-refs arguments"
+msgstr "在 ls-refs 引數之後應該有一個 flush 包"
+
+#: mailinfo.c
+msgid "quoted CRLF detected"
+msgstr "偵測到由可列印字元 (quoted) 所組成的 CRLF"
+
+#: merge-ort-wrappers.c merge-recursive.c
+#, c-format
+msgid ""
+"Your local changes to the following files would be overwritten by merge:\n"
+"  %s"
+msgstr ""
+"您對下列檔案的本機修改將被合併動作覆蓋：\n"
+"  %s"
+
+#: merge-ort.c merge-recursive.c
+#, c-format
+msgid "Failed to merge submodule %s (not checked out)"
+msgstr "無法合併子模組 %s （沒有簽出）"
+
+#: merge-ort.c merge-recursive.c
+#, c-format
+msgid "Failed to merge submodule %s (commits not present)"
+msgstr "無法合併子模組 %s（提交不存在）"
+
+#: merge-ort.c merge-recursive.c
+#, c-format
+msgid "Failed to merge submodule %s (commits don't follow merge-base)"
+msgstr "無法合併子模組 %s （提交未跟隨合併基礎）"
+
+#: merge-ort.c
+#, c-format
+msgid "Note: Fast-forwarding submodule %s to %s"
+msgstr "注意：正在將 %s 子模組快轉到 %s"
+
+#: merge-ort.c
+#, c-format
+msgid "Failed to merge submodule %s"
+msgstr "無法合併 %s 子模組"
+
+#: merge-ort.c
+#, c-format
+msgid ""
+"Failed to merge submodule %s, but a possible merge resolution exists:\n"
+"%s\n"
+msgstr ""
+"無法合併 %s 子模組，但有找到一個可行的合併方案：\n"
+"%s\n"
+
+#: merge-ort.c merge-recursive.c
+#, c-format
+msgid ""
+"If this is correct simply add it to the index for example\n"
+"by using:\n"
+"\n"
+"  git update-index --cacheinfo 160000 %s \"%s\"\n"
+"\n"
+"which will accept this suggestion.\n"
+msgstr ""
+"正確的話，就能直接加進索引，例如執行下述命令：\n"
+"\n"
+"  git update-index --cacheinfo 160000 %s \"%s\"\n"
+"\n"
+"接受本建議。\n"
+
+#: merge-ort.c
+#, c-format
+msgid ""
+"Failed to merge submodule %s, but multiple possible merges exist:\n"
+"%s"
+msgstr ""
+"無法合併 %s 子模組，但有找到幾個可行的合併方案：\n"
+"%s"
+
+#: merge-ort.c merge-recursive.c
+msgid "Failed to execute internal merge"
+msgstr "無法執行內部合併"
+
+#: merge-ort.c merge-recursive.c
+#, c-format
+msgid "Unable to add %s to database"
+msgstr "不能新增 %s 至物件庫"
+
+#: merge-ort.c merge-recursive.c
+#, c-format
+msgid "Auto-merging %s"
+msgstr "自動合併 %s"
+
+#: merge-ort.c merge-recursive.c
+#, 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 ""
+"衝突（隱式目錄重新命名）：處於隱式目錄重新命名的現存檔案/目錄 %s，將以下路徑"
+"放在：%s。"
+
+#: merge-ort.c merge-recursive.c
+#, 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 ""
+"衝突（隱式目錄重新命名）：無法映射一個以上路徑到 %s，隱式目錄重新命名嘗試將這"
+"些路徑放置於此：%s"
+
+#: merge-ort.c
+#, c-format
+msgid ""
+"CONFLICT (directory rename split): Unclear where to rename %s to; it was "
+"renamed to multiple other directories, with no destination getting a "
+"majority of the files."
+msgstr ""
+"衝突（分割的目錄重新命名）：未知 %s 重新命名的位置。它被重新命名為多個其他目"
+"錄，但沒有目的地取得過半檔案。"
+
+#: merge-ort.c merge-recursive.c
+#, c-format
+msgid ""
+"WARNING: Avoiding applying %s -> %s rename to %s, because %s itself was "
+"renamed."
+msgstr "警告：避免套用 %s -> %s 的重新命名到 %s，因為 %s 本身已被重新命名。"
+
+#: merge-ort.c merge-recursive.c
+#, c-format
+msgid ""
+"Path updated: %s added in %s inside a directory that was renamed in %s; "
+"moving it to %s."
+msgstr ""
+"路徑已更新：%s 新增到 %s，位於一個被重新命名到 %s 的目錄中，將其移動到 %s。"
+
+#: merge-ort.c merge-recursive.c
+#, c-format
+msgid ""
+"Path updated: %s renamed to %s in %s, inside a directory that was renamed in "
+"%s; moving it to %s."
+msgstr ""
+"路徑已更新：%1$s 重新命名為 %3$s 中的 %2$s，而該目錄被重新命名到 %4$s 中，將"
+"其移動到 %5$s。"
+
+#: merge-ort.c merge-recursive.c
+#, 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 ""
+"衝突（檔案位置）：%s 新增到 %s，位於一個被重新命名為 %s 的目錄中，建議將其移"
+"動到 %s。"
+
+#: merge-ort.c merge-recursive.c
+#, 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 ""
+"衝突（檔案位置）：%1$s 重新命名為 %3$s 中的 %2$s，而該目錄被重新命名到 %4$s "
+"中，建議將其移動到 %5$s。"
+
+#: merge-ort.c
+#, 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
+#, 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."
+msgstr ""
+"衝突（重新命名陷入相撞）：%s -> %s 這個重新命名有內容衝突並與其他路徑相撞，可"
+"能會因此出現巢狀衝突標記。"
+
+#: merge-ort.c
+#, 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 merge-recursive.c
+#, c-format
+msgid "cannot read object %s"
+msgstr "不能讀取物件 %s"
+
+#: merge-ort.c merge-recursive.c
+#, c-format
+msgid "object %s is not a blob"
+msgstr "物件 %s 不是一個資料物件"
+
+#: merge-ort.c
+#, 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
+#, c-format
+msgid ""
+"CONFLICT (distinct types): %s had different types on each side; renamed both "
+"of them so each can be recorded somewhere."
+msgstr ""
+"衝突（類型有異）：兩方的 %s 類型皆不同。已經重新命名這兩個來源，這樣就可以分"
+"別記錄這兩方檔案。"
+
+#: merge-ort.c
+#, c-format
+msgid ""
+"CONFLICT (distinct types): %s had different types on each side; renamed one "
+"of them so each can be recorded somewhere."
+msgstr ""
+"衝突（類型有異）：兩方的 %s 類型皆不同。已經重新命名其中一個來源，這樣就可以"
+"分別記錄這兩方檔案。"
+
+#: merge-ort.c merge-recursive.c
+msgid "content"
+msgstr "內容"
+
+#: merge-ort.c merge-recursive.c
+msgid "add/add"
+msgstr "新增/新增"
+
+#: merge-ort.c merge-recursive.c
+msgid "submodule"
+msgstr "子模組"
+
+#: merge-ort.c merge-recursive.c
+#, c-format
+msgid "CONFLICT (%s): Merge conflict in %s"
+msgstr "衝突（%s）：合併衝突於 %s"
+
+#: merge-ort.c
+#, c-format
+msgid ""
+"CONFLICT (modify/delete): %s deleted in %s and modified in %s.  Version %s "
+"of %s left in tree."
+msgstr ""
+"衝突（修改/刪除）：%1$s 已在 %2$s 刪除和在 %3$s 修改。%5$s 的 %4$s 版本留在樹"
+"上。"
+
+#: merge-ort.c
+#, c-format
+msgid ""
+"Note: %s not up to date and in way of checking out conflicted version; old "
+"copy renamed to %s"
+msgstr "註：%s 不是最新且干擾到簽出衝突版本。已將舊拷貝重新命名至 %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
+#, c-format
+msgid "collecting merge info failed for trees %s, %s, %s"
+msgstr "%s, %s, %s 樹的合併資訊收集失敗"
+
+#: merge-recursive.c
+msgid "(bad commit)\n"
+msgstr "（壞提交）\n"
+
+#: merge-recursive.c
+#, c-format
+msgid "add_cacheinfo failed for path '%s'; merge aborting."
+msgstr "add_cacheinfo 對路徑 '%s' 執行失敗，合併終止。"
+
+#: merge-recursive.c
+#, c-format
+msgid "add_cacheinfo failed to refresh for path '%s'; merge aborting."
+msgstr "add_cacheinfo 無法重新整理路徑 '%s'，合併終止。"
+
+#: merge-recursive.c
+#, c-format
+msgid "failed to create path '%s'%s"
+msgstr "建立路徑 '%s'%s 失敗"
+
+#: merge-recursive.c
+#, c-format
+msgid "Removing %s to make room for subdirectory\n"
+msgstr "刪除 %s 以便為子目錄留出空間\n"
+
+#: merge-recursive.c
+msgid ": perhaps a D/F conflict?"
+msgstr "：可能是一個目錄/檔案衝突？"
+
+#: merge-recursive.c
+#, c-format
+msgid "refusing to lose untracked file at '%s'"
+msgstr "拒絕捨棄 '%s' 中的未追蹤檔案"
+
+#: merge-recursive.c
+#, c-format
+msgid "blob expected for %s '%s'"
+msgstr "%s '%s' 應為資料物件"
+
+#: merge-recursive.c
+#, c-format
+msgid "failed to open '%s': %s"
+msgstr "開啟 '%s' 失敗：%s"
+
+#: merge-recursive.c
+#, c-format
+msgid "failed to symlink '%s': %s"
+msgstr "建立符號連結 '%s' 失敗：%s"
+
+#: merge-recursive.c
+#, c-format
+msgid "do not know what to do with %06o %s '%s'"
+msgstr "不知道如何處理 %06o %s '%s'"
+
+#: merge-recursive.c
+#, c-format
+msgid "Fast-forwarding submodule %s to the following commit:"
+msgstr "子模組 %s 快轉到如下提交："
+
+#: merge-recursive.c
+#, c-format
+msgid "Fast-forwarding submodule %s"
+msgstr "快轉子模組 %s"
+
+#: merge-recursive.c
+#, c-format
+msgid "Failed to merge submodule %s (merge following commits not found)"
+msgstr "無法合併子模組 %s （沒發現合併跟隨的提交）"
+
+#: merge-recursive.c
+#, c-format
+msgid "Failed to merge submodule %s (not fast-forward)"
+msgstr "無法合併子模組 %s（非快轉）"
+
+#: merge-recursive.c
+msgid "Found a possible merge resolution for the submodule:\n"
+msgstr "找到子模組的一個可能的合併方案：\n"
+
+#: merge-recursive.c
+#, c-format
+msgid "Failed to merge submodule %s (multiple merges found)"
+msgstr "無法合併子模組 %s （發現多個合併）"
+
+#: merge-recursive.c
+#, c-format
+msgid "Error: Refusing to lose untracked file at %s; writing to %s instead."
+msgstr "錯誤：拒絕遺失未追蹤檔案 '%s'，而是寫入 %s。"
+
+#: merge-recursive.c
+#, c-format
+msgid ""
+"CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s left "
+"in tree."
+msgstr ""
+"衝突（%1$s/刪除）：%2$s 在 %3$s 中被刪除，在 %5$s 中被 %4$s。%7$s 的 %6$s 版"
+"本被保留。"
+
+#: merge-recursive.c
+#, c-format
+msgid ""
+"CONFLICT (%s/delete): %s deleted in %s and %s to %s in %s. Version %s of %s "
+"left in tree."
+msgstr ""
+"衝突（%1$s/刪除）：%2$s 在 %3$s 中被刪除，在 %6$s 中的 %5$s 被 %4$s。%8$s 的 "
+"%7$s 版本被保留。"
+
+#: merge-recursive.c
+#, c-format
+msgid ""
+"CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s left "
+"in tree at %s."
+msgstr ""
+"衝突（%1$s/刪除）：%2$s 在 %3$s 中被刪除，在 %5$s 中被 %4$s。%7$s 的 %6$s 版"
+"本保留在 %8$s 中。"
+
+#: merge-recursive.c
+#, 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 ""
+"衝突（%1$s/刪除）：%2$s 在 %3$s 中被刪除，在 %6$s 中的 %5$s 被 %4$s。%8$s 的 "
+"%7$s 版本保留在 %9$s 中。"
+
+#: merge-recursive.c
+msgid "rename"
+msgstr "重新命名"
+
+#: merge-recursive.c
+msgid "renamed"
+msgstr "重新命名"
+
+#: merge-recursive.c
+#, c-format
+msgid "Refusing to lose dirty file at %s"
+msgstr "拒絕遺失髒檔案 '%s'"
+
+#: merge-recursive.c
+#, c-format
+msgid "Refusing to lose untracked file at %s, even though it's in the way."
+msgstr "拒絕在 '%s' 處失去未追蹤檔案，即使它存在於重新命名中。"
+
+#: merge-recursive.c
+#, 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
+#, c-format
+msgid "%s is a directory in %s adding as %s instead"
+msgstr "%s 是 %s 中的一個目錄而已 %s 為名被新增"
+
+#: merge-recursive.c
+#, c-format
+msgid "Refusing to lose untracked file at %s; adding as %s instead"
+msgstr "拒絕遺失未追蹤檔案 '%s'，而是新增為 %s"
+
+#: merge-recursive.c
+#, c-format
+msgid ""
+"CONFLICT (rename/rename): Rename \"%s\"->\"%s\" in branch \"%s\" rename \"%s"
+"\"->\"%s\" in \"%s\"%s"
+msgstr ""
+"衝突（重新命名/重新命名）：在分支 \"%3$s\" 中重新命名 \"%1$s\"->\"%2$s\"，在"
+"分支 \"%6$s\" 中重新命名 \"%4$s\"->\"%5$s\"%7$s"
+
+#: merge-recursive.c
+msgid " (left unresolved)"
+msgstr " （留下未解決）"
+
+#: merge-recursive.c
+#, 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
+#, c-format
+msgid ""
+"CONFLICT (directory rename split): Unclear where to place %s because "
+"directory %s was renamed to multiple other directories, with no destination "
+"getting a majority of the files."
+msgstr ""
+"衝突（分割的目錄重新命名）：不清楚 %s 應該放在哪裡，因為目錄 %s 被重新命名到"
+"多個其它目錄，沒有目錄包含大部分檔案。"
+
+#: merge-recursive.c
+#, c-format
+msgid ""
+"CONFLICT (rename/rename): Rename directory %s->%s in %s. Rename directory %s-"
+">%s in %s"
+msgstr ""
+"衝突（重新命名/重新命名）：在 %3$s 中重新命名目錄 %1$s->%2$s，在 %6$s 中重新"
+"命名目錄 %4$s->%5$s"
+
+#: merge-recursive.c
+msgid "modify"
+msgstr "修改"
+
+#: merge-recursive.c
+msgid "modified"
+msgstr "修改"
+
+#: merge-recursive.c
+#, c-format
+msgid "Skipped %s (merged same as existing)"
+msgstr "略過 %s（已經做過相同合併）"
+
+#: merge-recursive.c
+#, c-format
+msgid "Adding as %s instead"
+msgstr "而是以 %s 為名新增"
+
+#: merge-recursive.c
+#, c-format
+msgid "Removing %s"
+msgstr "刪除 %s"
+
+#: merge-recursive.c
+msgid "file/directory"
+msgstr "檔案/目錄"
+
+#: merge-recursive.c
+msgid "directory/file"
+msgstr "目錄/檔案"
+
+#: merge-recursive.c
+#, 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
+#, c-format
+msgid "Adding %s"
+msgstr "新增 %s"
+
+#: merge-recursive.c
+#, c-format
+msgid "CONFLICT (add/add): Merge conflict in %s"
+msgstr "衝突（add/add）：合併衝突於 %s"
+
+#: merge-recursive.c
+#, c-format
+msgid "merging of trees %s and %s failed"
+msgstr "無法合併樹 %s 和 %s"
+
+#: merge-recursive.c
+msgid "Merging:"
+msgstr "合併："
+
+#: merge-recursive.c
+#, c-format
+msgid "found %u common ancestor:"
+msgid_plural "found %u common ancestors:"
+msgstr[0] "發現 %u 個共同祖先："
+
+#: merge-recursive.c
+msgid "merge returned no commit"
+msgstr "合併未返回提交"
+
+#: merge-recursive.c
+#, c-format
+msgid "Could not parse object '%s'"
+msgstr "不能解析物件 '%s'"
+
+#: merge.c
+msgid "failed to read the cache"
+msgstr "讀取快取失敗"
+
+#: midx.c
+msgid "multi-pack-index OID fanout is of the wrong size"
+msgstr "多包索引的物件 ID fanout 大小錯誤"
+
+#: midx.c
+#, c-format
+msgid "multi-pack-index file %s is too small"
+msgstr "多包索引檔案 %s 太小"
+
+#: midx.c
+#, c-format
+msgid "multi-pack-index signature 0x%08x does not match signature 0x%08x"
+msgstr "多包索引簽名 0x%08x 和簽名 0x%08x 不符合"
+
+#: midx.c
+#, c-format
+msgid "multi-pack-index version %d not recognized"
+msgstr "multi-pack-index 版本 %d 不能被識別"
+
+#: midx.c
+#, c-format
+msgid "multi-pack-index hash version %u does not match version %u"
+msgstr "multi-pack-index 雜湊版本 %u 與版本 %u 不符合"
+
+#: midx.c
+msgid "multi-pack-index missing required pack-name chunk"
+msgstr "多包索引缺少必需的包名區塊"
+
+#: midx.c
+msgid "multi-pack-index missing required OID fanout chunk"
+msgstr "多包索引缺少必需的物件 ID fanout 區塊"
+
+#: midx.c
+msgid "multi-pack-index missing required OID lookup chunk"
+msgstr "多包索引缺少必需的物件 ID 查詢區塊"
+
+#: midx.c
+msgid "multi-pack-index missing required object offsets chunk"
+msgstr "多包索引缺少必需的物件位移區塊"
+
+#: midx.c
+#, c-format
+msgid "multi-pack-index pack names out of order: '%s' before '%s'"
+msgstr "多包索引包名無序：'%s' 在 '%s' 之前"
+
+#: midx.c
+#, c-format
+msgid "bad pack-int-id: %u (%u total packs)"
+msgstr "錯的 pack-int-id：%u（共有 %u 個包）"
+
+#: midx.c
+msgid "multi-pack-index stores a 64-bit offset, but off_t is too small"
+msgstr "多包索引儲存一個64位位移，但是 off_t 太小"
+
+#: midx.c
+#, c-format
+msgid "failed to add packfile '%s'"
+msgstr "新增 packfile '%s' 失敗"
+
+#: midx.c
+#, c-format
+msgid "failed to open pack-index '%s'"
+msgstr "開啟包索引 '%s' 失敗"
+
+#: midx.c
+#, c-format
+msgid "failed to locate object %d in packfile"
+msgstr "在 packfile 中定位物件 %d 失敗"
+
+#: midx.c
+msgid "cannot store reverse index file"
+msgstr "無法儲存倒排索引檔案"
+
+#: midx.c
+#, c-format
+msgid "could not parse line: %s"
+msgstr "無法解析橫列：%s"
+
+#: midx.c
+#, c-format
+msgid "malformed line: %s"
+msgstr "橫列格式錯誤：%s"
+
+#: midx.c
+msgid "ignoring existing multi-pack-index; checksum mismatch"
+msgstr "忽略現有的多包索引：總和檢查碼不符"
+
+#: midx.c
+msgid "could not load pack"
+msgstr "無法載入包"
+
+#: midx.c
+#, c-format
+msgid "could not open index for %s"
+msgstr "無法開啟 %s 的索引"
+
+#: midx.c
+msgid "Adding packfiles to multi-pack-index"
+msgstr "正在新增 packfile 至多包索引"
+
+#: midx.c
+#, c-format
+msgid "unknown preferred pack: '%s'"
+msgstr "未知偏好包：「%s」"
+
+#: midx.c
+#, c-format
+msgid "cannot select preferred pack %s with no objects"
+msgstr "無法選取偏好，沒有物件的 %s 包"
+
+#: midx.c
+#, c-format
+msgid "did not see pack-file %s to drop"
+msgstr "沒有看到要捨棄的 packfile %s"
+
+#: midx.c
+#, c-format
+msgid "preferred pack '%s' is expired"
+msgstr "偏好包「%s」已經過期"
+
+#: midx.c
+msgid "no pack files to index."
+msgstr "沒有要索引的 pack 檔案。"
+
+#: midx.c
+msgid "refusing to write multi-pack .bitmap without any objects"
+msgstr "拒絕寫入無任何物件的多包 .bitmap"
+
+#: midx.c
+msgid "could not write multi-pack bitmap"
+msgstr "無法寫入多包位圖"
+
+#: midx.c
+msgid "could not write multi-pack-index"
+msgstr "無法寫入多包索引"
+
+#: midx.c
+#, c-format
+msgid "failed to clear multi-pack-index at %s"
+msgstr "清理位於 %s 的多包索引失敗"
+
+#: midx.c
+msgid "multi-pack-index file exists, but failed to parse"
+msgstr "有 multi-pack-index 檔案，但無法解析"
+
+#: midx.c
+msgid "incorrect checksum"
+msgstr "總和檢查碼不正確"
+
+#: midx.c
+msgid "Looking for referenced packfiles"
+msgstr "正在尋找引用的 packfile"
+
+#: midx.c
+#, c-format
+msgid ""
+"oid fanout out of order: fanout[%d] = %<PRIx32> > %<PRIx32> = fanout[%d]"
+msgstr "物件 ID 扇出無序：fanout[%d] = %<PRIx32> > %<PRIx32> = fanout[%d]"
+
+#: midx.c
+msgid "the midx contains no oid"
+msgstr "midx 沒有 oid"
+
+#: midx.c
+msgid "Verifying OID order in multi-pack-index"
+msgstr "正在驗證多包索引中的物件 ID 順序"
+
+#: midx.c
+#, c-format
+msgid "oid lookup out of order: oid[%d] = %s >= %s = oid[%d]"
+msgstr "物件 ID 查詢無序：oid[%d] = %s >= %s = oid[%d]"
+
+#: midx.c
+msgid "Sorting objects by packfile"
+msgstr "透過 packfile 為物件排序"
+
+#: midx.c
+msgid "Verifying object offsets"
+msgstr "正在驗證物件位移"
+
+#: midx.c
+#, c-format
+msgid "failed to load pack entry for oid[%d] = %s"
+msgstr "為 oid[%d] = %s 載入包條目失敗"
+
+#: midx.c
+#, c-format
+msgid "failed to load pack-index for packfile %s"
+msgstr "為 packfile %s 載入包索引失敗"
+
+#: midx.c
+#, c-format
+msgid "incorrect object offset for oid[%d] = %s: %<PRIx64> != %<PRIx64>"
+msgstr "oid[%d] = %s 錯誤的物件位移：%<PRIx64> != %<PRIx64>"
+
+#: midx.c
+msgid "Counting referenced objects"
+msgstr "正在計算引用物件"
+
+#: midx.c
+msgid "Finding and deleting unreferenced packfiles"
+msgstr "正在尋找並刪除沒有引用的 packfile"
+
+#: midx.c
+msgid "could not start pack-objects"
+msgstr "不能開始 pack-objects"
+
+#: midx.c
+msgid "could not finish pack-objects"
+msgstr "不能結束 pack-objects"
+
+#: name-hash.c
+#, c-format
+msgid "unable to create lazy_dir thread: %s"
+msgstr "不能建立 lazy_dir 執行緒：%s"
+
+#: name-hash.c
+#, c-format
+msgid "unable to create lazy_name thread: %s"
+msgstr "不能建立 lazy_name 執行緒：%s"
+
+#: name-hash.c
+#, c-format
+msgid "unable to join lazy_name thread: %s"
+msgstr "不能加入 lazy_name 執行緒：%s"
+
+#: notes-merge.c
+#, 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."
+msgstr ""
+"您的前一次備註合併尚未結束（存在 %s）。\n"
+"在開始一個新的備註合併之前，請使用 'git notes merge --commit' 或者 'git "
+"notes merge --abort' 來提交/終止前一次合併。"
+
+#: notes-merge.c
+#, c-format
+msgid "You have not concluded your notes merge (%s exists)."
+msgstr "您尚未結束備註合併（存在 %s）。"
+
+#: notes-utils.c
+msgid "Cannot commit uninitialized/unreferenced notes tree"
+msgstr "不能提交未初始化/未引用的註解樹"
+
+#: notes-utils.c
+#, c-format
+msgid "Bad notes.rewriteMode value: '%s'"
+msgstr "壞的 notes.rewriteMode 值：'%s'"
+
+#: notes-utils.c
+#, c-format
+msgid "Refusing to rewrite notes in %s (outside of refs/notes/)"
+msgstr "拒絕向 %s（在 refs/notes/ 之外）寫入註解"
+
+#. TRANSLATORS: The first %s is the name of
+#. the environment variable, the second %s is
+#. its value.
+#.
+#: notes-utils.c
+#, c-format
+msgid "Bad %s value: '%s'"
+msgstr "壞的 %s 值：'%s'"
+
+#: object-file.c
+#, c-format
+msgid "object directory %s does not exist; check .git/objects/info/alternates"
+msgstr "物件目錄 %s 不存在，檢查 .git/objects/info/alternates"
+
+#: object-file.c
+#, c-format
+msgid "unable to normalize alternate object path: %s"
+msgstr "無法規範化備用物件路徑：%s"
+
+#: object-file.c
+#, c-format
+msgid "%s: ignoring alternate object stores, nesting too deep"
+msgstr "%s：忽略備用物件庫，嵌套太深"
+
+#: object-file.c
+#, c-format
+msgid "unable to normalize object directory: %s"
+msgstr "無法規範化物件目錄: %s"
+
+#: object-file.c
+msgid "unable to fdopen alternates lockfile"
+msgstr "無法 fdopen 取代鎖檔案"
+
+#: object-file.c
+msgid "unable to read alternates file"
+msgstr "無法讀取替代檔案"
+
+#: object-file.c
+msgid "unable to move new alternates file into place"
+msgstr "無法將新的替代檔案移動到位"
+
+#: object-file.c
+#, c-format
+msgid "path '%s' does not exist"
+msgstr "路徑 '%s' 不存在"
+
+#: object-file.c
+#, c-format
+msgid "reference repository '%s' as a linked checkout is not supported yet."
+msgstr "尚不支援將引用版本庫 '%s' 作為一個連結簽出。"
+
+#: object-file.c
+#, c-format
+msgid "reference repository '%s' is not a local repository."
+msgstr "引用版本庫 '%s' 不是一個本機版本庫。"
+
+#: object-file.c
+#, c-format
+msgid "reference repository '%s' is shallow"
+msgstr "引用版本庫 '%s' 是一個淺複製"
+
+#: object-file.c
+#, c-format
+msgid "reference repository '%s' is grafted"
+msgstr "引用版本庫 '%s' 已被移植"
+
+#: object-file.c
+#, c-format
+msgid "could not find object directory matching %s"
+msgstr "找不到符合 %s 的物件目錄"
+
+#: object-file.c
+#, c-format
+msgid "invalid line while parsing alternate refs: %s"
+msgstr "解析備用引用時無效的行：%s"
+
+#: object-file.c
+#, c-format
+msgid "attempting to mmap %<PRIuMAX> over limit %<PRIuMAX>"
+msgstr "嘗試 mmap %<PRIuMAX>，超過了最大值 %<PRIuMAX>"
+
+#: object-file.c
+#, c-format
+msgid "mmap failed%s"
+msgstr "mmap 失敗%s"
+
+#: object-file.c
+#, c-format
+msgid "object file %s is empty"
+msgstr "物件檔案 %s 為空"
+
+#: object-file.c
+#, c-format
+msgid "corrupt loose object '%s'"
+msgstr "損壞的鬆散物件 '%s'"
+
+#: object-file.c
+#, c-format
+msgid "garbage at end of loose object '%s'"
+msgstr "鬆散物件 '%s' 後面有垃圾資料"
+
+#: object-file.c
+#, c-format
+msgid "unable to parse %s header"
+msgstr "無法解析 %s 頭部"
+
+#: object-file.c
+msgid "invalid object type"
+msgstr "無效的物件類型"
+
+#: object-file.c
+#, c-format
+msgid "unable to unpack %s header"
+msgstr "無法解開 %s 頭部"
+
+#: object-file.c
+#, c-format
+msgid "header for %s too long, exceeds %d bytes"
+msgstr "%s 的標頭過長，超出 %d 位元組"
+
+#: object-file.c
+#, c-format
+msgid "failed to read object %s"
+msgstr "讀取物件 %s 失敗"
+
+#: object-file.c
+#, c-format
+msgid "replacement %s not found for %s"
+msgstr "找不到 %2$s 的替代 %1$s"
+
+#: object-file.c
+#, c-format
+msgid "loose object %s (stored in %s) is corrupt"
+msgstr "鬆散物件 %s（儲存在 %s）已損壞"
+
+#: object-file.c
+#, c-format
+msgid "packed object %s (stored in %s) is corrupt"
+msgstr "打包物件 %s（儲存在 %s）已損壞"
+
+#: object-file.c
+#, c-format
+msgid "unable to write file %s"
+msgstr "無法寫檔案 %s"
+
+#: object-file.c
+#, c-format
+msgid "unable to set permission to '%s'"
+msgstr "無法為 '%s' 設定權限"
+
+#: object-file.c
+msgid "file write error"
+msgstr "檔案寫錯誤"
+
+#: object-file.c
+msgid "error when closing loose object file"
+msgstr "關閉鬆散物件檔案時發生錯誤"
+
+#: object-file.c
+#, c-format
+msgid "insufficient permission for adding an object to repository database %s"
+msgstr "權限不足，無法在版本庫物件庫 %s 中新增物件"
+
+#: object-file.c
+msgid "unable to create temporary file"
+msgstr "無法建立暫存檔"
+
+#: object-file.c
+msgid "unable to write loose object file"
+msgstr "不能寫鬆散物件檔案"
+
+#: object-file.c
+#, c-format
+msgid "unable to deflate new object %s (%d)"
+msgstr "不能壓縮新物件 %s（%d）"
+
+#: object-file.c
+#, c-format
+msgid "deflateEnd on object %s failed (%d)"
+msgstr "在物件 %s 上呼叫 deflateEnd 失敗（%d）"
+
+#: object-file.c
+#, c-format
+msgid "confused by unstable object source data for %s"
+msgstr "被 %s 的不穩定物件來源資料混淆"
+
+#: object-file.c
+#, c-format
+msgid "cannot read object for %s"
+msgstr "不能讀取物件 %s"
+
+#: object-file.c
+msgid "corrupt commit"
+msgstr "損壞的提交"
+
+#: object-file.c
+msgid "corrupt tag"
+msgstr "損壞的標籤"
+
+#: object-file.c
+#, c-format
+msgid "read error while indexing %s"
+msgstr "索引 %s 時讀取錯誤"
+
+#: object-file.c
+#, c-format
+msgid "short read while indexing %s"
+msgstr "索引 %s 時讀入不完整"
+
+#: object-file.c
+#, c-format
+msgid "%s: failed to insert into database"
+msgstr "%s：插入資料庫失敗"
+
+#: object-file.c
+#, c-format
+msgid "%s: unsupported file type"
+msgstr "%s：不支援的檔案類型"
+
+#: object-file.c
+#, c-format
+msgid "%s is not a valid '%s' object"
+msgstr "%s 不是一個有效的 '%s' 物件"
+
+#: object-file.c
+#, c-format
+msgid "unable to open %s"
+msgstr "不能開啟 %s"
+
+#: object-file.c
+#, c-format
+msgid "hash mismatch for %s (expected %s)"
+msgstr "%s 的雜湊值不符合（預期 %s）"
+
+#: object-file.c
+#, c-format
+msgid "unable to mmap %s"
+msgstr "不能 mmap %s"
+
+#: object-file.c
+#, c-format
+msgid "unable to unpack header of %s"
+msgstr "無法解壓縮 %s 的頭部"
+
+#: object-file.c
+#, c-format
+msgid "unable to parse header of %s"
+msgstr "無法解析 %s 的頭部"
+
+#: object-file.c
+#, c-format
+msgid "unable to unpack contents of %s"
+msgstr "無法解壓縮 %s 的內容"
+
+#. TRANSLATORS: This is a line of ambiguous object
+#. output shown when we cannot look up or parse the
+#. object in question. E.g. "deadbeef [bad object]".
+#.
+#: object-name.c
+#, c-format
+msgid "%s [bad object]"
+msgstr "%s [無效物件]"
+
+#. TRANSLATORS: This is a line of ambiguous commit
+#. object output. E.g.:
+#. *
+#. "deadbeef commit 2021-01-01 - Some Commit Message"
+#.
+#: object-name.c
+#, c-format
+msgid "%s commit %s - %s"
+msgstr "%s 提交 %s - %s"
+
+#. TRANSLATORS: This is a line of ambiguous
+#. tag object output. E.g.:
+#. *
+#. "deadbeef tag 2022-01-01 - Some Tag Message"
+#. *
+#. The second argument is the YYYY-MM-DD found
+#. in the tag.
+#. *
+#. The third argument is the "tag" string
+#. from object.c.
+#.
+#: object-name.c
+#, c-format
+msgid "%s tag %s - %s"
+msgstr "%s 標籤 %s - %s"
+
+#. TRANSLATORS: This is a line of ambiguous
+#. tag object output where we couldn't parse
+#. the tag itself. E.g.:
+#. *
+#. "deadbeef [bad tag, could not parse it]"
+#.
+#: object-name.c
+#, c-format
+msgid "%s [bad tag, could not parse it]"
+msgstr "%s [無效標籤，無法解析]"
+
+#. TRANSLATORS: This is a line of ambiguous <type>
+#. object output. E.g. "deadbeef tree".
+#.
+#: object-name.c
+#, c-format
+msgid "%s tree"
+msgstr "%s 樹"
+
+#. TRANSLATORS: This is a line of ambiguous <type>
+#. object output. E.g. "deadbeef blob".
+#.
+#: object-name.c
+#, c-format
+msgid "%s blob"
+msgstr "%s blob"
+
+#: object-name.c
+#, c-format
+msgid "short object ID %s is ambiguous"
+msgstr "短物件 ID %s 存在歧義"
+
+#. TRANSLATORS: The argument is the list of ambiguous
+#. objects composed in show_ambiguous_object(). See
+#. its "TRANSLATORS" comments for details.
+#.
+#: object-name.c
+#, c-format
+msgid ""
+"The candidates are:\n"
+"%s"
+msgstr ""
+"候選物件有：\n"
+"%s"
+
+#: object-name.c
+msgid ""
+"Git normally never creates a ref that ends with 40 hex characters\n"
+"because it will be ignored when you just specify 40-hex. These refs\n"
+"may be created by mistake. For example,\n"
+"\n"
+"  git switch -c $br $(git rev-parse ...)\n"
+"\n"
+"where \"$br\" is somehow empty and a 40-hex ref is created. Please\n"
+"examine these refs and maybe delete them. Turn this message off by\n"
+"running \"git config advice.objectNameWarning false\""
+msgstr ""
+"Git 通常不會建立以 40 個十六進位字元結尾的引用，\n"
+"因為當您只提供 40 個十六進位字元時，其將被忽略。\n"
+"這些引用可能被意外建立。例如：\n"
+"\n"
+"  git switch -c $br $(git rev-parse ...)\n"
+"\n"
+"當「$br」因為某些原因空白時，會建立出 40 位十六進位的引用。\n"
+"請檢查這些引用，並視需要刪除。執行\n"
+"「git config advice.objectNameWarning false」命令以關閉本訊息通知"
+
+#: object-name.c
+#, c-format
+msgid "log for '%.*s' only goes back to %s"
+msgstr "'%.*s' 的日誌只能回到 %s"
+
+#: object-name.c
+#, c-format
+msgid "log for '%.*s' only has %d entries"
+msgstr "'%.*s' 的日誌只有 %d 個項目"
+
+#: object-name.c
+#, c-format
+msgid "path '%s' exists on disk, but not in '%.*s'"
+msgstr "磁碟上存在 '%s' 路徑，但不存在於 '%.*s'"
+
+#: object-name.c
+#, c-format
+msgid ""
+"path '%s' exists, but not '%s'\n"
+"hint: Did you mean '%.*s:%s' aka '%.*s:./%s'?"
+msgstr ""
+"'%s' 路徑存在，但不是 '%s'\n"
+"提示：你在說 '%.*s:%s'，即 '%.*s:./%s' 嗎？"
+
+#: object-name.c
+#, c-format
+msgid "path '%s' does not exist in '%.*s'"
+msgstr "'%s' 路徑不存在於 '%.*s'"
+
+#: object-name.c
+#, c-format
+msgid ""
+"path '%s' is in the index, but not at stage %d\n"
+"hint: Did you mean ':%d:%s'?"
+msgstr ""
+"'%s' 路徑在索引，但不在 %d 暫存區\n"
+"提示：你在說 ':%d:%s' 嗎？"
+
+#: object-name.c
+#, c-format
+msgid ""
+"path '%s' is in the index, but not '%s'\n"
+"hint: Did you mean ':%d:%s' aka ':%d:./%s'?"
+msgstr ""
+"'%s' 路徑在索引，但不是 '%s'\n"
+"提示：你在說 ':%d:%s'，即 ':%d:%s' 嗎？"
+
+#: object-name.c
+#, c-format
+msgid "path '%s' exists on disk, but not in the index"
+msgstr "磁碟上存在 '%s' 路徑，但不在索引中"
+
+#: object-name.c
+#, c-format
+msgid "path '%s' does not exist (neither on disk nor in the index)"
+msgstr "'%s' 路徑不存在 (既不存在磁碟，也不存在索引)"
+
+#: object-name.c
+msgid "relative path syntax can't be used outside working tree"
+msgstr "相對路徑與法不能用在工作區外"
+
+#: object-name.c
+#, c-format
+msgid "<object>:<path> required, only <object> '%s' given"
+msgstr "需要指定 <object>:<path>，卻只指定 <object>「%s」"
+
+#: object-name.c
+#, c-format
+msgid "invalid object name '%.*s'."
+msgstr "'%.*s' 物件名稱無效。"
+
+#: object.c
+#, c-format
+msgid "invalid object type \"%s\""
+msgstr "無效的物件類型 \"%s\""
+
+#: object.c
+#, c-format
+msgid "object %s is a %s, not a %s"
+msgstr "物件 %s 是一個 %s，不是一個 %s"
+
+#: object.c
+#, c-format
+msgid "object %s has unknown type id %d"
+msgstr "物件 %s 有未知的類型 id %d"
+
+#: object.c
+#, c-format
+msgid "unable to parse object: %s"
+msgstr "不能解析物件：%s"
+
+#: object.c
+#, c-format
+msgid "hash mismatch %s"
+msgstr "雜湊值與 %s 不符合"
+
+#: pack-bitmap.c
+msgid "multi-pack bitmap is missing required reverse index"
+msgstr "多包位圖缺少需要的反向索引"
+
+#: pack-bitmap.c
+#, c-format
+msgid "could not open pack %s"
+msgstr "無法開啟封包 %s"
+
+#: pack-bitmap.c
+#, c-format
+msgid "preferred pack (%s) is invalid"
+msgstr "偏好的封包 (%s) 無效"
+
+#: pack-bitmap.c
+#, c-format
+msgid "could not find %s in pack %s at offset %<PRIuMAX>"
+msgstr "找不到 %2$s 包，偏移位置 %3$<PRIuMAX> 的 %1$s"
+
+#: pack-mtimes.c
+#, c-format
+msgid "mtimes file %s is too small"
+msgstr "mtimes 檔案 %s 太小"
+
+#: pack-mtimes.c
+#, c-format
+msgid "mtimes file %s has unknown signature"
+msgstr "mtimes 檔案 %s 有無效簽章"
+
+#: pack-mtimes.c
+#, c-format
+msgid "mtimes file %s has unsupported version %<PRIu32>"
+msgstr "mtimes 檔案 %s 有不支援的版本 %<PRIu32>"
+
+#: pack-mtimes.c
+#, c-format
+msgid "mtimes file %s has unsupported hash id %<PRIu32>"
+msgstr "mtimes 檔案 %s 有不支援的 hash ID %<PRIu32>"
+
+#: pack-mtimes.c
+#, c-format
+msgid "mtimes file %s is corrupt"
+msgstr "mtimes 檔案 %s 損壞"
+
+#: pack-revindex.c
+#, c-format
+msgid "reverse-index file %s is too small"
+msgstr "%s 倒排索引檔案過小"
+
+#: pack-revindex.c
+#, c-format
+msgid "reverse-index file %s is corrupt"
+msgstr "%s 倒排索引檔案損壞"
+
+#: pack-revindex.c
+#, c-format
+msgid "reverse-index file %s has unknown signature"
+msgstr "%s 倒排索引檔案有未知簽章"
+
+#: pack-revindex.c
+#, c-format
+msgid "reverse-index file %s has unsupported version %<PRIu32>"
+msgstr "倒排索引檔案 %s 有不支援的版本 %<PRIu32>"
+
+#: pack-revindex.c
+#, c-format
+msgid "reverse-index file %s has unsupported hash id %<PRIu32>"
+msgstr "倒排索引檔案 %s 有不支援的雜湊 ID %<PRIu32>"
+
+#: pack-write.c
+msgid "cannot both write and verify reverse index"
+msgstr "無法同時寫入和驗證倒排索引"
+
+#: pack-write.c
+#, c-format
+msgid "could not stat: %s"
+msgstr "無法 stat：%s"
+
+#: pack-write.c
+#, c-format
+msgid "failed to make %s readable"
+msgstr "無法讓 %s 能夠寫入"
+
+#: pack-write.c
+#, c-format
+msgid "could not write '%s' promisor file"
+msgstr "無法寫入「%s」promisor 檔案"
+
+#: packfile.c
+msgid "offset before end of packfile (broken .idx?)"
+msgstr "位移量在 packfile 結束之前（損壞的 .idx？）"
+
+#: packfile.c
+#, c-format
+msgid "packfile %s cannot be mapped%s"
+msgstr "packfile %s 無法映射%s"
+
+#: packfile.c
+#, c-format
+msgid "offset before start of pack index for %s (corrupt index?)"
+msgstr "位移量在 %s 的包索引開始之前（損壞的索引？）"
+
+#: packfile.c
+#, c-format
+msgid "offset beyond end of pack index for %s (truncated index?)"
+msgstr "位移量越過了 %s 的包索引的結尾（被截斷的索引？）"
+
+#: parse-options-cb.c
+#, c-format
+msgid "malformed expiration date '%s'"
+msgstr "格式錯誤的到期時間：'%s'"
+
+#: parse-options-cb.c
+#, c-format
+msgid "option `%s' expects \"always\", \"auto\", or \"never\""
+msgstr "選項 `%s' 期望 \"always\"、\"auto\" 或 \"never\""
+
+#: parse-options-cb.c
+#, c-format
+msgid "malformed object name '%s'"
+msgstr "格式錯誤的物件名 '%s'"
+
+#: parse-options-cb.c
+#, c-format
+msgid "option `%s' expects \"%s\" or \"%s\""
+msgstr "選項「%s」期望「%s」或「%s」"
+
+#: parse-options.c
+#, c-format
+msgid "%s requires a value"
+msgstr "%s 需要一個值"
+
+#: parse-options.c
+#, c-format
+msgid "%s is incompatible with %s"
+msgstr "%s 與 %s 不相容"
+
+#: parse-options.c
+#, c-format
+msgid "%s : incompatible with something else"
+msgstr "%s：和其它的不相容"
+
+#: parse-options.c
+#, c-format
+msgid "%s takes no value"
+msgstr "%s 不取值"
+
+#: parse-options.c
+#, c-format
+msgid "%s isn't available"
+msgstr "%s 不可用"
+
+#: parse-options.c
+#, 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
+#, c-format
+msgid "ambiguous option: %s (could be --%s%s or --%s%s)"
+msgstr "有歧義的選項：%s（可以是 --%s%s 或 --%s%s）"
+
+#: parse-options.c
+#, c-format
+msgid "did you mean `--%s` (with two dashes)?"
+msgstr "你的意思是 `--%s`（有兩個短線）嗎？"
+
+#: parse-options.c
+#, c-format
+msgid "alias of --%s"
+msgstr "--%s 的別名"
+
+#: parse-options.c
+#, c-format
+msgid "unknown option `%s'"
+msgstr "未知選項 `%s'"
+
+#: parse-options.c
+#, c-format
+msgid "unknown switch `%c'"
+msgstr "未知開關 `%c'"
+
+#: parse-options.c
+#, c-format
+msgid "unknown non-ascii option in string: `%s'"
+msgstr "字串中未知的非 ascii 字元選項：`%s'"
+
+#: parse-options.c
+msgid "..."
+msgstr "..."
+
+#: parse-options.c
+#, c-format
+msgid "usage: %s"
+msgstr "用法：%s"
+
+#. TRANSLATORS: the colon here should align with the
+#. one in "usage: %s" translation.
+#.
+#: parse-options.c
+#, 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
+#, c-format
+msgid "%*s%s"
+msgstr "%*s%s"
+
+#  譯者：為保證在輸出中對齊，注意調整句中空格！
+#: parse-options.c
+#, c-format
+msgid "    %s"
+msgstr "    %s"
+
+#: parse-options.c
+msgid "-NUM"
+msgstr "-數字"
+
+#: parse-options.h
+msgid "expiry-date"
+msgstr "到期時間"
+
+#: parse-options.h
+msgid "no-op (backward compatibility)"
+msgstr "空動作（向後相容）"
+
+#: parse-options.h
+msgid "be more verbose"
+msgstr "更加詳細"
+
+#: parse-options.h
+msgid "be more quiet"
+msgstr "更加安靜"
+
+#: parse-options.h
+msgid "use <n> digits to display object names"
+msgstr "用 <n> 位數字顯示物件名稱"
+
+#: parse-options.h
+msgid "how to strip spaces and #comments from message"
+msgstr "設定如何刪除提交說明裡的空格和 #備註"
+
+#: parse-options.h
+msgid "read pathspec from file"
+msgstr "從檔案讀取 <路徑規格>"
+
+#: parse-options.h
+msgid ""
+"with --pathspec-from-file, pathspec elements are separated with NUL character"
+msgstr "如使用 --pathspec-from-file，則 <路徑規格> 元件會使用 NUL 字元分隔"
+
+#: path.c
+#, c-format
+msgid "Could not make %s writable by group"
+msgstr "不能設定 %s 為組可寫"
+
+#: pathspec.c
+msgid "Escape character '\\' not allowed as last character in attr value"
+msgstr "跳脫字元 '\\' 不能作為屬性值的最後一個字元"
+
+#: pathspec.c
+msgid "Only one 'attr:' specification is allowed."
+msgstr "只允許一個 'attr:' 規格。"
+
+#: pathspec.c
+msgid "attr spec must not be empty"
+msgstr "屬性規格不能為空"
+
+#: pathspec.c
+#, c-format
+msgid "invalid attribute name %s"
+msgstr "無效的屬性名 %s"
+
+#: pathspec.c
+msgid "global 'glob' and 'noglob' pathspec settings are incompatible"
+msgstr "全域的 'glob' 和 'noglob' 路徑規格設定不相容"
+
+#: pathspec.c
+msgid ""
+"global 'literal' pathspec setting is incompatible with all other global "
+"pathspec settings"
+msgstr "全域的 'literal' 路徑規格設定和其它的全域路徑規格設定不相容"
+
+#: pathspec.c
+msgid "invalid parameter for pathspec magic 'prefix'"
+msgstr "路徑規格包含無效的神奇前綴"
+
+#: pathspec.c
+#, c-format
+msgid "Invalid pathspec magic '%.*s' in '%s'"
+msgstr "在路徑規格 '%3$s' 中無效的神奇前綴 '%2$.*1$s'"
+
+#: pathspec.c
+#, c-format
+msgid "Missing ')' at the end of pathspec magic in '%s'"
+msgstr "路徑規格 '%s' 的神奇前綴結尾少了一個 ')'"
+
+#: pathspec.c
+#, c-format
+msgid "Unimplemented pathspec magic '%c' in '%s'"
+msgstr "路徑規格 '%2$s' 中包含未實現的神奇前綴 '%1$c'"
+
+#: pathspec.c
+#, c-format
+msgid "%s: 'literal' and 'glob' are incompatible"
+msgstr "%s：'literal' 和 'glob' 不相容"
+
+#: pathspec.c
+#, c-format
+msgid "%s: '%s' is outside repository at '%s'"
+msgstr "%s：'%s' 在位於 '%s' 的版本庫之外"
+
+#: pathspec.c
+#, c-format
+msgid "'%s' (mnemonic: '%c')"
+msgstr "'%s'（助記符：'%c'）"
+
+#: pathspec.c
+#, c-format
+msgid "%s: pathspec magic not supported by this command: %s"
+msgstr "%s：路徑規格神奇前綴不被此指令支援：%s"
+
+#: pathspec.c
+#, c-format
+msgid "pathspec '%s' is beyond a symbolic link"
+msgstr "路徑規格 '%s' 位於符號連結中"
+
+#: pathspec.c
+#, c-format
+msgid "line is badly quoted: %s"
+msgstr "某行不應該被括號括住：%s"
+
+#: pkt-line.c
+msgid "unable to write flush packet"
+msgstr "無法寫 flush 包"
+
+#: pkt-line.c
+msgid "unable to write delim packet"
+msgstr "無法寫 delim 包"
+
+#: pkt-line.c
+msgid "unable to write response end packet"
+msgstr "無法寫入回應結尾封包"
+
+#: pkt-line.c
+msgid "flush packet write failed"
+msgstr "flush 包寫錯誤"
+
+#: pkt-line.c
+msgid "protocol error: impossibly long line"
+msgstr "協定錯誤：不可能的長行"
+
+#: pkt-line.c
+msgid "packet write with format failed"
+msgstr "格式化包寫入錯誤"
+
+#: pkt-line.c
+msgid "packet write failed - data exceeds max packet size"
+msgstr "寫封包失敗：資料超過了包的最大長度"
+
+#: pkt-line.c
+#, c-format
+msgid "packet write failed: %s"
+msgstr "封包寫入失敗：%s"
+
+#: pkt-line.c
+msgid "read error"
+msgstr "讀取錯誤"
+
+#: pkt-line.c
+msgid "the remote end hung up unexpectedly"
+msgstr "遠端意外掛斷了"
+
+#: pkt-line.c
+#, c-format
+msgid "protocol error: bad line length character: %.4s"
+msgstr "協定錯誤：錯誤的行長度字串：%.4s"
+
+#: pkt-line.c
+#, c-format
+msgid "protocol error: bad line length %d"
+msgstr "協定錯誤：錯誤的行長度 %d"
+
+#: pkt-line.c sideband.c
+#, c-format
+msgid "remote error: %s"
+msgstr "遠端錯誤：%s"
+
+#: preload-index.c
+msgid "Refreshing index"
+msgstr "正在重新整理索引"
+
+#: preload-index.c
+#, c-format
+msgid "unable to create threaded lstat: %s"
+msgstr "無法建立執行緒 lstat：%s"
+
+#: pretty.c
+msgid "unable to parse --pretty format"
+msgstr "不能解析 --pretty 格式"
+
+#: promisor-remote.c
+msgid "promisor-remote: unable to fork off fetch subprocess"
+msgstr "promisor-remote: 無法 fork fetch 子處理程序"
+
+#: promisor-remote.c
+msgid "promisor-remote: could not write to fetch subprocess"
+msgstr "promisor-remote: 無法寫入 fetch 子處理程序"
+
+#: promisor-remote.c
+msgid "promisor-remote: could not close stdin to fetch subprocess"
+msgstr "promisor-remote: 無法關閉 fetch 子處理程序的 stdin"
+
+#: promisor-remote.c
+#, c-format
+msgid "promisor remote name cannot begin with '/': %s"
+msgstr "promisor 遠端名稱不能以 '/' 開始：%s"
+
+#: protocol-caps.c
+msgid "object-info: expected flush after arguments"
+msgstr "object-info：引數後預期要有 flush"
+
+#: prune-packed.c
+msgid "Removing duplicate objects"
+msgstr "正在刪除重複物件"
+
+#: range-diff.c
+msgid "could not start `log`"
+msgstr "不能啟動 `log`"
+
+#: range-diff.c
+msgid "could not read `log` output"
+msgstr "不能讀取 `log` 的輸出"
+
+#: range-diff.c sequencer.c
+#, c-format
+msgid "could not parse commit '%s'"
+msgstr "不能解析提交 '%s'"
+
+#: range-diff.c
+#, c-format
+msgid ""
+"could not parse first line of `log` output: did not start with 'commit ': "
+"'%s'"
+msgstr "無法解析第一行「log」輸出：開頭不是「commit」：「%s」"
+
+#: range-diff.c
+#, c-format
+msgid "could not parse git header '%.*s'"
+msgstr "無法解析 git 頭 '%.*s'"
+
+#: range-diff.c
+msgid "failed to generate diff"
+msgstr "生成 diff 失敗"
+
+#: range-diff.c
+#, c-format
+msgid "could not parse log for '%s'"
+msgstr "不能解析 '%s' 的日誌"
+
+#: read-cache.c
+#, c-format
+msgid "will not add file alias '%s' ('%s' already exists in index)"
+msgstr "將不會新增檔案別名 '%s'（'%s' 已經存在於索引中）"
+
+#: read-cache.c
+msgid "cannot create an empty blob in the object database"
+msgstr "不能在物件資料庫中建立空的資料物件"
+
+#: read-cache.c
+#, c-format
+msgid "%s: can only add regular files, symbolic links or git-directories"
+msgstr "%s：只能新增一般檔案、符號連結或 git 目錄"
+
+#: read-cache.c
+#, c-format
+msgid "unable to index file '%s'"
+msgstr "無法索引檔案 '%s'"
+
+#: read-cache.c
+#, c-format
+msgid "unable to add '%s' to index"
+msgstr "無法在索引中新增 '%s'"
+
+#: read-cache.c
+#, c-format
+msgid "unable to stat '%s'"
+msgstr "無法對 %s 執行 stat"
+
+#: read-cache.c
+#, c-format
+msgid "'%s' appears as both a file and as a directory"
+msgstr "'%s' 看起來既是檔案又是目錄"
+
+#: read-cache.c
+msgid "Refresh index"
+msgstr "重新整理索引"
+
+#: read-cache.c
+#, c-format
+msgid ""
+"index.version set, but the value is invalid.\n"
+"Using version %i"
+msgstr ""
+"設定了 index.version，但是取值無效。\n"
+"使用版本 %i"
+
+#: read-cache.c
+#, c-format
+msgid ""
+"GIT_INDEX_VERSION set, but the value is invalid.\n"
+"Using version %i"
+msgstr ""
+"設定了 GIT_INDEX_VERSION，但是取值無效。\n"
+"使用版本 %i"
+
+#: read-cache.c
+#, c-format
+msgid "bad signature 0x%08x"
+msgstr "壞的簽名 0x%08x"
+
+#: read-cache.c
+#, c-format
+msgid "bad index version %d"
+msgstr "壞的索引版本 %d"
+
+#: read-cache.c
+msgid "bad index file sha1 signature"
+msgstr "壞的索引檔案 sha1 簽名"
+
+#: read-cache.c
+#, c-format
+msgid "index uses %.4s extension, which we do not understand"
+msgstr "索引使用不被支援的 %.4s 副檔名"
+
+#
+#: read-cache.c
+#, c-format
+msgid "ignoring %.4s extension"
+msgstr "忽略 %.4s 副檔名"
+
+#: read-cache.c
+#, c-format
+msgid "unknown index entry format 0x%08x"
+msgstr "未知的索引條目格式 0x%08x"
+
+#: read-cache.c
+#, c-format
+msgid "malformed name field in the index, near path '%s'"
+msgstr "索引中靠近路徑 '%s' 有錯誤的名稱欄位"
+
+#: read-cache.c
+msgid "unordered stage entries in index"
+msgstr "索引中有未排序的暫存條目"
+
+#: read-cache.c
+#, c-format
+msgid "multiple stage entries for merged file '%s'"
+msgstr "合併檔案 '%s' 有多個暫存條目"
+
+#: read-cache.c
+#, c-format
+msgid "unordered stage entries for '%s'"
+msgstr "'%s' 的未排序暫存條目"
+
+#: read-cache.c
+#, c-format
+msgid "unable to create load_cache_entries thread: %s"
+msgstr "無法建立 load_cache_entries 執行緒：%s"
+
+#: read-cache.c
+#, c-format
+msgid "unable to join load_cache_entries thread: %s"
+msgstr "無法加入 load_cache_entries 執行緒：%s"
+
+#: read-cache.c
+#, c-format
+msgid "%s: index file open failed"
+msgstr "%s：開啟索引檔案失敗"
+
+#: read-cache.c
+#, c-format
+msgid "%s: cannot stat the open index"
+msgstr "%s：不能對開啟的索引執行 stat 動作"
+
+#: read-cache.c
+#, c-format
+msgid "%s: index file smaller than expected"
+msgstr "%s：索引檔案比預期的小"
+
+#: read-cache.c
+#, c-format
+msgid "%s: unable to map index file%s"
+msgstr "%s：無法 map 索引檔案%s"
+
+#: read-cache.c
+#, c-format
+msgid "unable to create load_index_extensions thread: %s"
+msgstr "無法建立 load_index_extensions 執行緒：%s"
+
+#: read-cache.c
+#, c-format
+msgid "unable to join load_index_extensions thread: %s"
+msgstr "無法加入 load_index_extensions 執行緒：%s"
+
+#: read-cache.c
+#, c-format
+msgid "could not freshen shared index '%s'"
+msgstr "無法重新整理共享索引 '%s'"
+
+#: read-cache.c
+#, c-format
+msgid "broken index, expect %s in %s, got %s"
+msgstr "損壞的索引，期望在 %2$s 中的 %1$s，得到 %3$s"
+
+#: read-cache.c
+msgid "cannot write split index for a sparse index"
+msgstr "無法寫入稀疏索引的索引分割"
+
+#: read-cache.c
+msgid "failed to convert to a sparse-index"
+msgstr "無法轉換成稀疏索引"
+
+#: read-cache.c
+#, c-format
+msgid "could not stat '%s'"
+msgstr "不能對 '%s' 呼叫 stat"
+
+#: read-cache.c
+#, c-format
+msgid "unable to open git dir: %s"
+msgstr "不能開啟 git 目錄：%s"
+
+#: read-cache.c
+#, c-format
+msgid "unable to unlink: %s"
+msgstr "無法刪除：%s"
+
+#: read-cache.c
+#, c-format
+msgid "cannot fix permission bits on '%s'"
+msgstr "不能修復 '%s' 的權限位"
+
+#: read-cache.c
+#, c-format
+msgid "%s: cannot drop to stage #0"
+msgstr "%s：不能落到暫存區 #0"
+
+#: rebase-interactive.c
+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 ""
+"您可以用 'git rebase --edit-todo' 修正，然後執行 'git rebase --continue'。\n"
+"或者您可以用 'git rebase --abort' 終止重定基底。\n"
+
+#: rebase-interactive.c
+#, c-format
+msgid ""
+"unrecognized setting %s for option rebase.missingCommitsCheck. Ignoring."
+msgstr "選項 rebase.missingCommitsCheck 的值 %s 無法識別。已忽略。"
+
+#: rebase-interactive.c
+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 [-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"
+"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 <提交> = 使用提交，但不直接修補 (amend) \n"
+"s, squash <提交> = 使用提交，但融合至上個提交\n"
+"f, fixup [-C | -c] <提交> = 跟 “squash” 相似，但除非傳入「-C」\n"
+"                   否則只保留上一個提交的日誌訊息。傳入 -C 表示只保留這個\n"
+"                   提交的訊息；傳入 -c 與 -C 功能相同，但會開啟編輯器\n"
+"x, exec <命令> = 使用 shell 執行指令（這一行的剩餘部分）\n"
+"b, break = 在這停止（使用 'git rebase --continue' 繼續重定基底）\n"
+"d, drop <提交> = 移除提交\n"
+"l, label <標籤> = 為目前 HEAD 打上指定名字標籤\n"
+"t, reset <標籤> = 重設 HEAD 到指定標籤\n"
+"m, merge [-C <commit> | -c <commit>] <label> [# <oneline>]\n"
+".       建立一個合併提交，並使用原始的合併提交說明（如果沒有指定\n"
+".       原始提交，使用備註部分的 oneline 作為提交說明）。使用\n"
+".       -c <commit> 可以編輯提交說明。\n"
+"\n"
+"可以對這些行重新排序，會從上至下執行。\n"
+
+#: rebase-interactive.c
+#, c-format
+msgid "Rebase %s onto %s (%d command)"
+msgid_plural "Rebase %s onto %s (%d commands)"
+msgstr[0] "重定基底 %s 到 %s（%d 個提交）"
+
+#: rebase-interactive.c
+msgid ""
+"\n"
+"Do not remove any line. Use 'drop' explicitly to remove a commit.\n"
+msgstr ""
+"\n"
+"不要刪除任意一行。使用 'drop' 顯式地刪除一個提交。\n"
+
+#: rebase-interactive.c
+msgid ""
+"\n"
+"If you remove a line here THAT COMMIT WILL BE LOST.\n"
+msgstr ""
+"\n"
+"如果您在這裡刪除一行，對應的提交將會遺失。\n"
+
+#: rebase-interactive.c
+msgid ""
+"\n"
+"You are editing the todo file of an ongoing interactive rebase.\n"
+"To continue rebase after editing, run:\n"
+"    git rebase --continue\n"
+"\n"
+msgstr ""
+"\n"
+"您正在修改進行中的互動式重定基底待辦列表。若要在編輯結束後繼續重定基底，\n"
+"請執行：\n"
+"    git rebase --continue\n"
+"\n"
+
+#: rebase-interactive.c
+msgid ""
+"\n"
+"However, if you remove everything, the rebase will be aborted.\n"
+"\n"
+msgstr ""
+"\n"
+"然而，如果您刪除全部內容，重定基底動作將會終止。\n"
+"\n"
+
+#: rebase-interactive.c
+#, c-format
+msgid "could not write '%s'."
+msgstr "不能寫入 '%s'。"
+
+#: rebase-interactive.c
+#, c-format
+msgid ""
+"Warning: some commits may have been dropped accidentally.\n"
+"Dropped commits (newer to older):\n"
+msgstr ""
+"警告：一些提交可能被意外捨棄。\n"
+"捨棄的提交（從新到舊）：\n"
+
+#: rebase-interactive.c
+#, c-format
+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"
+"The possible behaviours are: ignore, warn, error.\n"
+"\n"
+msgstr ""
+"為避免這條訊息，使用 \"drop\" 指令顯式地刪除一個提交。\n"
+"\n"
+"使用 'git config rebase.missingCommitsCheck' 來修改警告級別。\n"
+"可選值有：ignore、warn、error。\n"
+"\n"
+
+#: rebase.c
+#, c-format
+msgid "%s: 'preserve' superseded by 'merges'"
+msgstr "%s：「preserve」已經改成「merges」"
+
+#: ref-filter.c wt-status.c
+msgid "gone"
+msgstr "遺失"
+
+#: ref-filter.c
+#, c-format
+msgid "ahead %d"
+msgstr "領先 %d"
+
+#: ref-filter.c
+#, c-format
+msgid "behind %d"
+msgstr "落後 %d"
+
+#: ref-filter.c
+#, c-format
+msgid "ahead %d, behind %d"
+msgstr "領先 %d，落後 %d"
+
+#: ref-filter.c
+#, c-format
+msgid "expected format: %%(color:<color>)"
+msgstr "期望的格式：%%(color:<顏色>)"
+
+#: ref-filter.c
+#, c-format
+msgid "unrecognized color: %%(color:%s)"
+msgstr "無法識別的顏色：%%(color:%s)"
+
+#: ref-filter.c
+#, c-format
+msgid "Integer value expected refname:lstrip=%s"
+msgstr "期望整數值 refname:lstrip=%s"
+
+#: ref-filter.c
+#, c-format
+msgid "Integer value expected refname:rstrip=%s"
+msgstr "期望整數值 refname:rstrip=%s"
+
+#: ref-filter.c
+#, c-format
+msgid "unrecognized %%(%s) argument: %s"
+msgstr "無法識別的 %%(%s) 參數：%s"
+
+#: ref-filter.c
+#, c-format
+msgid "%%(objecttype) does not take arguments"
+msgstr "%%(objecttype) 不帶參數"
+
+#: ref-filter.c
+#, c-format
+msgid "%%(deltabase) does not take arguments"
+msgstr "%%(deltabase) 不帶參數"
+
+#: ref-filter.c
+#, c-format
+msgid "%%(body) does not take arguments"
+msgstr "%%(body) 不帶參數"
+
+#: ref-filter.c
+#, c-format
+msgid "expected %%(trailers:key=<value>)"
+msgstr "預期是 %%(trailers:key=<value>)"
+
+#: ref-filter.c
+#, c-format
+msgid "unknown %%(trailers) argument: %s"
+msgstr "未知的 %%(trailers) 參數：%s"
+
+#: ref-filter.c
+#, c-format
+msgid "positive value expected contents:lines=%s"
+msgstr "期望一個正數 contents:lines=%s"
+
+#: ref-filter.c
+#, c-format
+msgid "positive value expected '%s' in %%(%s)"
+msgstr "%%(%2$s) 中的 '%1$s' 預期是正數值"
+
+#: ref-filter.c
+#, c-format
+msgid "unrecognized email option: %s"
+msgstr "無法識別的 email 選項：%s"
+
+#: ref-filter.c
+#, c-format
+msgid "expected format: %%(align:<width>,<position>)"
+msgstr "期望的格式：%%(align:<寬度>,<位置>)"
+
+#: ref-filter.c
+#, c-format
+msgid "unrecognized position:%s"
+msgstr "無法識別的位置：%s"
+
+#: ref-filter.c
+#, c-format
+msgid "unrecognized width:%s"
+msgstr "無法識別的寬度：%s"
+
+#: ref-filter.c
+#, c-format
+msgid "positive width expected with the %%(align) atom"
+msgstr "元素 %%(align) 需要一個正數的寬度"
+
+#: ref-filter.c
+#, c-format
+msgid "%%(rest) does not take arguments"
+msgstr "%%(rest) 未取引數"
+
+#: ref-filter.c
+#, c-format
+msgid "malformed field name: %.*s"
+msgstr "格式錯誤的欄位名：%.*s"
+
+#: ref-filter.c
+#, c-format
+msgid "unknown field name: %.*s"
+msgstr "未知的欄位名：%.*s"
+
+#: ref-filter.c
+#, c-format
+msgid ""
+"not a git repository, but the field '%.*s' requires access to object data"
+msgstr "不是一個 git 版本庫，但是欄位 '%.*s' 需要存取物件資料"
+
+#: ref-filter.c
+#, c-format
+msgid "format: %%(%s) atom used without a %%(%s) atom"
+msgstr "format：使用 %%(%s) 元素卻缺少 %%(%s) 元素"
+
+#: ref-filter.c
+#, c-format
+msgid "format: %%(then) atom used more than once"
+msgstr "格式：%%(then) 元素用了多次"
+
+#: ref-filter.c
+#, c-format
+msgid "format: %%(then) atom used after %%(else)"
+msgstr "格式：%%(then) 元素用在了 %%(else) 之後"
+
+#: ref-filter.c
+#, c-format
+msgid "format: %%(else) atom used more than once"
+msgstr "格式：%%(else) 元素用了多次"
+
+#: ref-filter.c
+#, c-format
+msgid "format: %%(end) atom used without corresponding atom"
+msgstr "格式：使用了 %%(end) 元素卻沒有它的對應元素"
+
+#: ref-filter.c
+#, c-format
+msgid "malformed format string %s"
+msgstr "錯誤的格式化字串 %s"
+
+#: ref-filter.c
+#, c-format
+msgid "this command reject atom %%(%.*s)"
+msgstr "本命令拒絕 atom %%(%.*s)"
+
+#: ref-filter.c
+#, c-format
+msgid "--format=%.*s cannot be used with --python, --shell, --tcl"
+msgstr "--format=%.*s 不能和 --python、--shell、--tcl 一起使用"
+
+#: ref-filter.c
+#, c-format
+msgid "(no branch, rebasing %s)"
+msgstr "（無分支，重定 %s 的基底）"
+
+#: ref-filter.c
+#, c-format
+msgid "(no branch, rebasing detached HEAD %s)"
+msgstr "（無分支，重定 %s 分離開頭指標的基底）"
+
+#: ref-filter.c
+#, c-format
+msgid "(no branch, bisect started on %s)"
+msgstr "（無分支，二分搜尋從 %s 開始）"
+
+#: ref-filter.c
+#, c-format
+msgid "(HEAD detached at %s)"
+msgstr "（開頭指標分離於 %s）"
+
+#: ref-filter.c
+#, c-format
+msgid "(HEAD detached from %s)"
+msgstr "（開頭指標分離自 %s）"
+
+#: ref-filter.c
+msgid "(no branch)"
+msgstr "（無分支）"
+
+#: ref-filter.c
+#, c-format
+msgid "missing object %s for %s"
+msgstr "缺少 %2$s 的物件 %1$s"
+
+#: ref-filter.c
+#, c-format
+msgid "parse_object_buffer failed on %s for %s"
+msgstr "parse_object_buffer 失敗於 %2$s 的 %1$s"
+
+#: ref-filter.c
+#, c-format
+msgid "malformed object at '%s'"
+msgstr "格式錯誤的物件 '%s'"
+
+#: ref-filter.c
+#, c-format
+msgid "ignoring ref with broken name %s"
+msgstr "忽略帶有錯誤名稱 %s 的引用"
+
+#: ref-filter.c refs.c
+#, c-format
+msgid "ignoring broken ref %s"
+msgstr "忽略損壞的引用 %s"
+
+#: ref-filter.c
+#, c-format
+msgid "format: %%(end) atom missing"
+msgstr "格式：缺少 %%(end) 元素"
+
+#: ref-filter.c
+#, c-format
+msgid "malformed object name %s"
+msgstr "格式錯誤的物件名 %s"
+
+#: ref-filter.c
+#, c-format
+msgid "option `%s' must point to a commit"
+msgstr "選項 `%s' 必須指向一個提交"
+
+#: ref-filter.h
+msgid "key"
+msgstr "key"
+
+#: ref-filter.h
+msgid "field name to sort on"
+msgstr "排序的欄位名"
+
+#: reflog.c
+#, c-format
+msgid "not a reflog: %s"
+msgstr "不是引用日誌：%s"
+
+#: reflog.c
+#, c-format
+msgid "no reflog for '%s'"
+msgstr "沒有 '%s' 的引用日誌"
+
+#: refs.c
+#, c-format
+msgid "%s does not point to a valid object!"
+msgstr "%s 沒有指向一個有效的物件！"
+
+#: refs.c
+#, 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"
+"of your new repositories, which will suppress this warning, call:\n"
+"\n"
+"\tgit config --global init.defaultBranch <name>\n"
+"\n"
+"Names commonly chosen instead of 'master' are 'main', 'trunk' and\n"
+"'development'. The just-created branch can be renamed via this command:\n"
+"\n"
+"\tgit branch -m <name>\n"
+msgstr ""
+"將「%s」設定為初始分支的名稱。這個預設分支名稱可以變更。\n"
+"如果要設定所有新版本庫要使用的初始分支名稱，\n"
+"請呼叫（會隱藏這個警告）：\n"
+"\n"
+"\tgit config --global init.defaultBranch <name>\n"
+"\n"
+"除了 “master” 外，常用的分支名稱有 “main”, “trunk” 以及\n"
+"“development”。剛建立的分支可以用這個命令重新命名：\n"
+"\n"
+"\tgit branch -m <name>\n"
+
+#: refs.c
+#, c-format
+msgid "could not retrieve `%s`"
+msgstr "無法擷取「%s」"
+
+#: refs.c
+#, c-format
+msgid "invalid branch name: %s = %s"
+msgstr "分支名稱無效：%s = %s"
+
+#: refs.c
+#, c-format
+msgid "ignoring dangling symref %s"
+msgstr "忽略懸空符號引用 %s"
+
+#: refs.c
+#, c-format
+msgid "log for ref %s has gap after %s"
+msgstr "引用 %s 的日誌在 %s 之後有缺口"
+
+#: refs.c
+#, c-format
+msgid "log for ref %s unexpectedly ended on %s"
+msgstr "引用 %s 的日誌意外終止於 %s"
+
+#: refs.c
+#, c-format
+msgid "log for %s is empty"
+msgstr "%s 的日誌為空"
+
+#: refs.c
+#, c-format
+msgid "refusing to update ref with bad name '%s'"
+msgstr "拒絕更新有錯誤名稱 '%s' 的引用"
+
+#: refs.c
+#, c-format
+msgid "update_ref failed for ref '%s': %s"
+msgstr "對引用 '%s' 執行 update_ref 失敗：%s"
+
+#: refs.c
+#, c-format
+msgid "multiple updates for ref '%s' not allowed"
+msgstr "不允許對引用 '%s' 多次更新"
+
+#: refs.c
+msgid "ref updates forbidden inside quarantine environment"
+msgstr "在隔離環境中禁止更新引用"
+
+#: refs.c
+msgid "ref updates aborted by hook"
+msgstr "引用更新被掛鉤拒絕"
+
+#: refs.c
+#, c-format
+msgid "'%s' exists; cannot create '%s'"
+msgstr "'%s' 已存在，無法建立 '%s'"
+
+#: refs.c
+#, c-format
+msgid "cannot process '%s' and '%s' at the same time"
+msgstr "無法同時處理 '%s' 和 '%s'"
+
+#: refs/files-backend.c
+#, c-format
+msgid "could not remove reference %s"
+msgstr "無法刪除引用 %s"
+
+#: refs/files-backend.c refs/packed-backend.c
+#, c-format
+msgid "could not delete reference %s: %s"
+msgstr "無法刪除引用 %s：%s"
+
+#: refs/files-backend.c refs/packed-backend.c
+#, c-format
+msgid "could not delete references: %s"
+msgstr "無法刪除引用：%s"
+
+#: refspec.c
+#, c-format
+msgid "invalid refspec '%s'"
+msgstr "無效的引用規格：「%s」"
+
+#: remote-curl.c
+#, c-format
+msgid "invalid quoting in push-option value: '%s'"
+msgstr "在 push-option 取值中無效的引號：'%s'"
+
+#: remote-curl.c
+#, c-format
+msgid "%sinfo/refs not valid: is this a git repository?"
+msgstr "%sinfo/refs 無效：這是一個 git 版本庫嗎？"
+
+#: remote-curl.c
+msgid "invalid server response; expected service, got flush packet"
+msgstr "無效的服務端回應。預期服務，得到 flush 包"
+
+#: remote-curl.c
+#, c-format
+msgid "invalid server response; got '%s'"
+msgstr "無效的服務端回應，得到 '%s'"
+
+#: remote-curl.c
+#, c-format
+msgid "repository '%s' not found"
+msgstr "版本庫 '%s' 未找到"
+
+#: remote-curl.c
+#, c-format
+msgid "Authentication failed for '%s'"
+msgstr "'%s' 身份驗證失敗"
+
+#: remote-curl.c
+#, c-format
+msgid "unable to access '%s' with http.pinnedPubkey configuration: %s"
+msgstr "無法依 http.pinnedPubkey 之設定存取「%s」：%s"
+
+#: remote-curl.c
+#, c-format
+msgid "unable to access '%s': %s"
+msgstr "無法存取 '%s'：%s"
+
+#: remote-curl.c
+#, c-format
+msgid "redirecting to %s"
+msgstr "重定向到 %s"
+
+#: remote-curl.c
+msgid "shouldn't have EOF when not gentle on EOF"
+msgstr "當沒有設定溫和處理檔案結束符（EOF）時，不應該有檔案結束符"
+
+#: remote-curl.c
+msgid "remote server sent unexpected response end packet"
+msgstr "遠端伺服器傳送了非預期的回應結束封包"
+
+#: remote-curl.c
+msgid "unable to rewind rpc post data - try increasing http.postBuffer"
+msgstr "無法還原 rpc post 資料 - 嘗試增加 http.postBuffer"
+
+#: remote-curl.c
+#, c-format
+msgid "remote-curl: bad line length character: %.4s"
+msgstr "remote-curl: 錯誤的行長度字串：%.4s"
+
+#: remote-curl.c
+msgid "remote-curl: unexpected response end packet"
+msgstr "remote-curl: 非預期的回應結束封包"
+
+#: remote-curl.c
+#, c-format
+msgid "RPC failed; %s"
+msgstr "RPC 失敗。%s"
+
+#: remote-curl.c
+msgid "cannot handle pushes this big"
+msgstr "不能處理這麼大的推送"
+
+#: remote-curl.c
+#, c-format
+msgid "cannot deflate request; zlib deflate error %d"
+msgstr "不能壓縮請求，zlib 壓縮錯誤 %d"
+
+#: remote-curl.c
+#, c-format
+msgid "cannot deflate request; zlib end error %d"
+msgstr "不能壓縮請求，zlib 結束錯誤 %d"
+
+#: remote-curl.c
+#, c-format
+msgid "%d bytes of length header were received"
+msgstr "收到了 %d 位元組長度的標頭"
+
+#: remote-curl.c
+#, c-format
+msgid "%d bytes of body are still expected"
+msgstr "預期仍要有 %d 位元組的本文 (body)"
+
+#: remote-curl.c
+msgid "dumb http transport does not support shallow capabilities"
+msgstr "啞 http 傳輸不支援 shallow 能力"
+
+#: remote-curl.c
+msgid "fetch failed."
+msgstr "取得失敗。"
+
+#: remote-curl.c
+msgid "cannot fetch by sha1 over smart http"
+msgstr "無法透過智慧 HTTP 取得 sha1"
+
+#: remote-curl.c
+#, c-format
+msgid "protocol error: expected sha/ref, got '%s'"
+msgstr "協定錯誤：期望 sha/ref，卻得到 '%s'"
+
+#: remote-curl.c
+#, c-format
+msgid "http transport does not support %s"
+msgstr "http 傳輸協定不支援 %s"
+
+#: remote-curl.c
+msgid "git-http-push failed"
+msgstr "git-http-push 失敗"
+
+#: remote-curl.c
+msgid "remote-curl: usage: git remote-curl <remote> [<url>]"
+msgstr "remote-curl：用法：git remote-curl <遠端> [<url>]"
+
+#: remote-curl.c
+msgid "remote-curl: error reading command stream from git"
+msgstr "remote-curl：錯誤讀取來自 git 的指令流"
+
+#: remote-curl.c
+msgid "remote-curl: fetch attempted without a local repo"
+msgstr "remote-curl：嘗試沒有本機版本庫下取得"
+
+#: remote-curl.c
+#, c-format
+msgid "remote-curl: unknown command '%s' from git"
+msgstr "remote-curl：未知的來自 git 的指令 '%s'"
+
+#: remote.c
+#, c-format
+msgid "config remote shorthand cannot begin with '/': %s"
+msgstr "設定的遠端短名稱不能以 '/' 開始：%s"
+
+#: remote.c
+msgid "more than one receivepack given, using the first"
+msgstr "提供了一個以上的 receivepack，使用第一個"
+
+#: remote.c
+msgid "more than one uploadpack given, using the first"
+msgstr "提供了一個以上的 uploadpack，使用第一個"
+
+#: remote.c
+#, c-format
+msgid "unrecognized value transfer.credentialsInUrl: '%s'"
+msgstr "數值 transfer.credentialsInUrl 無法識別：“%s”"
+
+#: remote.c
+#, c-format
+msgid "URL '%s' uses plaintext credentials"
+msgstr "URL “%s” 使用明文憑證"
+
+#: remote.c
+#, c-format
+msgid "Cannot fetch both %s and %s to %s"
+msgstr "不能同時取得 %s 和 %s 至 %s"
+
+#: remote.c
+#, c-format
+msgid "%s usually tracks %s, not %s"
+msgstr "%s 通常追蹤 %s，而非 %s"
+
+#: remote.c
+#, c-format
+msgid "%s tracks both %s and %s"
+msgstr "%s 同時追蹤 %s 和 %s"
+
+#: remote.c
+#, c-format
+msgid "key '%s' of pattern had no '*'"
+msgstr "模式的鍵 '%s' 沒有 '*'"
+
+#: remote.c
+#, c-format
+msgid "value '%s' of pattern has no '*'"
+msgstr "模式的值 '%s' 沒有 '*'"
+
+#: remote.c
+#, c-format
+msgid "src refspec %s does not match any"
+msgstr "來源引用規格 %s 沒有符合項目"
+
+#: remote.c
+#, c-format
+msgid "src refspec %s matches more than one"
+msgstr "來源引用規格 %s 符合超過一個"
+
+#. TRANSLATORS: "matches '%s'%" is the <dst> part of "git push
+#. <remote> <src>:<dst>" push, and "being pushed ('%s')" is
+#. the <src>.
+#.
+#: remote.c
+#, c-format
+msgid ""
+"The destination you provided is not a full refname (i.e.,\n"
+"starting with \"refs/\"). We tried to guess what you meant by:\n"
+"\n"
+"- Looking for a ref that matches '%s' on the remote side.\n"
+"- Checking if the <src> being pushed ('%s')\n"
+"  is a ref in \"refs/{heads,tags}/\". If so we add a corresponding\n"
+"  refs/{heads,tags}/ prefix on the remote side.\n"
+"\n"
+"Neither worked, so we gave up. You must fully qualify the ref."
+msgstr ""
+"您提供的目的地不是完整的引用名稱（即以「refs/」開頭）。\n"
+"我們覺得您可能想要：\n"
+"\n"
+"- 在遠端查詢符合「%s」的引用。\n"
+"- 檢查要推送的 <src>（'%s'）是不是在「refs/{heads,tags}/」中的引用。\n"
+"  如果是，我們會在對應的遠端新增 refs/{heads,tags}/ 前綴。\n"
+"\n"
+"由於這些猜測都不正確，我們放棄了。您必須給出完整引用。"
+
+#: remote.c
+#, c-format
+msgid ""
+"The <src> part of the refspec is a commit object.\n"
+"Did you mean to create a new branch by pushing to\n"
+"'%s:refs/heads/%s'?"
+msgstr ""
+"引用規格的 <src> 是個提交物件。\n"
+"您是想透過推送至「%s:refs/heads/%s」\n"
+"來建立新分支嗎？"
+
+#: remote.c
+#, c-format
+msgid ""
+"The <src> part of the refspec is a tag object.\n"
+"Did you mean to create a new tag by pushing to\n"
+"'%s:refs/tags/%s'?"
+msgstr ""
+"引用規格的 <src> 是個標籤物件。\n"
+"您是想透過推送至「%s:refs/tags/%s」\n"
+"來建立新標籤嗎？"
+
+#: remote.c
+#, c-format
+msgid ""
+"The <src> part of the refspec is a tree object.\n"
+"Did you mean to tag a new tree by pushing to\n"
+"'%s:refs/tags/%s'?"
+msgstr ""
+"引用規格的 <src> 是個樹狀物件。\n"
+"您是想透過推送至「%s:refs/tags/%s」\n"
+"為新樹狀物件貼上標籤嗎？"
+
+#: remote.c
+#, c-format
+msgid ""
+"The <src> part of the refspec is a blob object.\n"
+"Did you mean to tag a new blob by pushing to\n"
+"'%s:refs/tags/%s'?"
+msgstr ""
+"引用規格的 <src> 是個資料 (blob) 物件。\n"
+"您是想透過推送至「%s:refs/tags/%s」\n"
+"為新資料物件貼上標籤嗎？"
+
+#: remote.c
+#, c-format
+msgid "%s cannot be resolved to branch"
+msgstr "%s 無法被解析為分支"
+
+#: remote.c
+#, c-format
+msgid "unable to delete '%s': remote ref does not exist"
+msgstr "無法刪除 '%s'：遠端引用不存在"
+
+#: remote.c
+#, c-format
+msgid "dst refspec %s matches more than one"
+msgstr "目的地引用規格 %s 符合超過一個"
+
+#: remote.c
+#, c-format
+msgid "dst ref %s receives from more than one src"
+msgstr "目的地引用 %s 接收超過一個來源"
+
+#: remote.c
+msgid "HEAD does not point to a branch"
+msgstr "HEAD 沒有指向一個分支"
+
+#: remote.c
+#, c-format
+msgid "no such branch: '%s'"
+msgstr "沒有此分支：'%s'"
+
+#: remote.c
+#, c-format
+msgid "no upstream configured for branch '%s'"
+msgstr "尚未給分支 '%s' 設定上游"
+
+#: remote.c
+#, c-format
+msgid "upstream branch '%s' not stored as a remote-tracking branch"
+msgstr "上游分支 '%s' 沒有儲存為一個遠端追蹤分支"
+
+#: remote.c
+#, c-format
+msgid "push destination '%s' on remote '%s' has no local tracking branch"
+msgstr "推送目的地 '%s' 至遠端 '%s' 沒有本機追蹤分支"
+
+#: remote.c
+#, c-format
+msgid "branch '%s' has no remote for pushing"
+msgstr "分支 '%s' 沒有設定要推送的遠端伺服器"
+
+#: remote.c
+#, c-format
+msgid "push refspecs for '%s' do not include '%s'"
+msgstr "向 '%s' 推送引用規格未包含 '%s'"
+
+#: remote.c
+msgid "push has no destination (push.default is 'nothing')"
+msgstr "推送沒有目的地（push.default 是 'nothing'）"
+
+#: remote.c
+msgid "cannot resolve 'simple' push to a single destination"
+msgstr "無法解析 'simple' 推送至單獨目的地"
+
+#: remote.c
+#, c-format
+msgid "couldn't find remote ref %s"
+msgstr "無法找到遠端引用 %s"
+
+#: remote.c
+#, c-format
+msgid "* Ignoring funny ref '%s' locally"
+msgstr "* 在本機忽略可笑的引用 '%s'"
+
+#: remote.c
+#, c-format
+msgid "Your branch is based on '%s', but the upstream is gone.\n"
+msgstr "您的分支基於 '%s'，但此上游分支已經不存在。\n"
+
+#: remote.c
+msgid "  (use \"git branch --unset-upstream\" to fixup)\n"
+msgstr "  （使用 \"git branch --unset-upstream\" 來修復）\n"
+
+#: remote.c
+#, c-format
+msgid "Your branch is up to date with '%s'.\n"
+msgstr "您的分支與上游分支 '%s' 一致。\n"
+
+#: remote.c
+#, c-format
+msgid "Your branch and '%s' refer to different commits.\n"
+msgstr "您的分支和 '%s' 指向不同的提交。\n"
+
+#: remote.c
+#, c-format
+msgid "  (use \"%s\" for details)\n"
+msgstr "  （使用 \"%s\" 檢視詳情）\n"
+
+#: remote.c
+#, c-format
+msgid "Your branch is ahead of '%s' by %d commit.\n"
+msgid_plural "Your branch is ahead of '%s' by %d commits.\n"
+msgstr[0] "您的分支領先 '%s' 共 %d 個提交。\n"
+
+#: remote.c
+msgid "  (use \"git push\" to publish your local commits)\n"
+msgstr "  （使用 \"git push\" 來發布您的本機提交）\n"
+
+#: remote.c
+#, c-format
+msgid "Your branch is behind '%s' by %d commit, and can be fast-forwarded.\n"
+msgid_plural ""
+"Your branch is behind '%s' by %d commits, and can be fast-forwarded.\n"
+msgstr[0] "您的分支落後 '%s' 共 %d 個提交，並且可以快轉。\n"
+
+#  譯者：請維持前導空格
+#: remote.c
+msgid "  (use \"git pull\" to update your local branch)\n"
+msgstr "  （使用 \"git pull\" 來更新您的本機分支）\n"
+
+#: remote.c
+#, c-format
+msgid ""
+"Your branch and '%s' have diverged,\n"
+"and have %d and %d different commit each, respectively.\n"
+msgid_plural ""
+"Your branch and '%s' have diverged,\n"
+"and have %d and %d different commits each, respectively.\n"
+msgstr[0] ""
+"您的分支和 '%s' 出現了偏離，\n"
+"並且分別有 %d 和 %d 處不同的提交。\n"
+
+#  譯者：請維持前導空格
+#: remote.c
+msgid "  (use \"git pull\" to merge the remote branch into yours)\n"
+msgstr "  （使用 \"git pull\" 來合併遠端分支）\n"
+
+#: remote.c
+#, c-format
+msgid "cannot parse expected object name '%s'"
+msgstr "無法解析期望的物件名 '%s'"
+
+#: remote.c
+#, c-format
+msgid "cannot strip one component off url '%s'"
+msgstr "無法從 url '%s' 剝離一個元件"
+
+#: replace-object.c
+#, c-format
+msgid "bad replace ref name: %s"
+msgstr "錯誤的取代引用名稱：%s"
+
+#: replace-object.c
+#, c-format
+msgid "duplicate replace ref: %s"
+msgstr "重複的取代引用：%s"
+
+#: replace-object.c
+#, c-format
+msgid "replace depth too high for object %s"
+msgstr "物件 %s 的取代層級太深"
+
+#: rerere.c
+msgid "corrupt MERGE_RR"
+msgstr "損壞的 MERGE_RR"
+
+#: rerere.c
+msgid "unable to write rerere record"
+msgstr "無法寫入 rerere 記錄"
+
+#: rerere.c
+#, c-format
+msgid "there were errors while writing '%s' (%s)"
+msgstr "寫入 '%s' (%s) 時發生錯誤"
+
+#: rerere.c
+#, c-format
+msgid "could not parse conflict hunks in '%s'"
+msgstr "不能解析 '%s' 中的衝突區塊"
+
+#: rerere.c
+#, c-format
+msgid "failed utime() on '%s'"
+msgstr "在 '%s' 上呼叫 utime() 失敗"
+
+#: rerere.c
+#, c-format
+msgid "writing '%s' failed"
+msgstr "寫入 '%s' 失敗"
+
+#: rerere.c
+#, c-format
+msgid "Staged '%s' using previous resolution."
+msgstr "使用之前的解決方案暫存 '%s'。"
+
+#: rerere.c
+#, c-format
+msgid "Recorded resolution for '%s'."
+msgstr "已記錄 '%s' 的解決方案。"
+
+#: rerere.c
+#, c-format
+msgid "Resolved '%s' using previous resolution."
+msgstr "使用之前的解決方案解決 '%s'。"
+
+#: rerere.c
+#, c-format
+msgid "cannot unlink stray '%s'"
+msgstr "不能刪除 stray '%s'"
+
+#: rerere.c
+#, c-format
+msgid "Recorded preimage for '%s'"
+msgstr "為 '%s' 記錄 preimage"
+
+#: rerere.c
+#, c-format
+msgid "failed to update conflicted state in '%s'"
+msgstr "更新 '%s' 中的衝突狀態失敗"
+
+#: rerere.c
+#, c-format
+msgid "no remembered resolution for '%s'"
+msgstr "沒有為 '%s' 記憶的解決方案"
+
+#: rerere.c
+#, c-format
+msgid "cannot unlink '%s'"
+msgstr "不能刪除 '%s'"
+
+#: rerere.c
+#, c-format
+msgid "Updated preimage for '%s'"
+msgstr "已為 '%s' 更新 preimage"
+
+#: rerere.c
+#, c-format
+msgid "Forgot resolution for '%s'\n"
+msgstr "忘記 '%s' 的解決方案\n"
+
+#: rerere.c
+msgid "unable to open rr-cache directory"
+msgstr "不能開啟 rr-cache 目錄"
+
+#: rerere.h
+msgid "update the index with reused conflict resolution if possible"
+msgstr "如果可能，重用衝突解決更新索引"
+
+#: reset.c
+msgid "could not determine HEAD revision"
+msgstr "不能確定 HEAD 版本"
+
+#: reset.c sequencer.c
+#, c-format
+msgid "failed to find tree of %s"
+msgstr "無法找到 %s 指向的樹"
+
+#: revision.c
+msgid "--unpacked=<packfile> no longer supported"
+msgstr "--unpacked=<packfile> 已不受支援"
+
+#: revision.c
+msgid "your current branch appears to be broken"
+msgstr "您的目前分支好像被損壞"
+
+#: revision.c
+#, c-format
+msgid "your current branch '%s' does not have any commits yet"
+msgstr "您的目前分支 '%s' 尚無任何提交"
+
+#: revision.c
+msgid "object filtering requires --objects"
+msgstr "物件過濾需要 --objects"
+
+#: revision.c
+msgid "-L does not yet support diff formats besides -p and -s"
+msgstr "-L 尚不支援 -p 和 -s 之外的差異格式"
+
+#: run-command.c
+#, c-format
+msgid "cannot create async thread: %s"
+msgstr "不能建立 async 執行緒：%s"
+
+#: send-pack.c
+msgid "unexpected flush packet while reading remote unpack status"
+msgstr "讀取遠端解包狀態時收到意外的 flush 包"
+
+#: send-pack.c
+#, c-format
+msgid "unable to parse remote unpack status: %s"
+msgstr "不能解析遠端解包狀態：%s"
+
+#: send-pack.c
+#, c-format
+msgid "remote unpack failed: %s"
+msgstr "遠端解包失敗：%s"
+
+#: send-pack.c
+msgid "failed to sign the push certificate"
+msgstr "為推送證書籤名失敗"
+
+#: send-pack.c
+msgid "send-pack: unable to fork off fetch subprocess"
+msgstr "send-pack：無法 fork 一個 fetch 子處理程序"
+
+#: send-pack.c
+msgid "push negotiation failed; proceeding anyway with push"
+msgstr "push 協商失敗。繼續使用 push 處理"
+
+#: send-pack.c
+msgid "the receiving end does not support this repository's hash algorithm"
+msgstr "接收端不支援此版本庫的雜湊算法"
+
+#: send-pack.c
+msgid "the receiving end does not support --signed push"
+msgstr "接收端不支援 --signed 推送"
+
+#: send-pack.c
+msgid ""
+"not sending a push certificate since the receiving end does not support --"
+"signed push"
+msgstr "未傳送推送證書，因為接收端不支援 --signed 推送"
+
+#: send-pack.c
+msgid "the receiving end does not support --atomic push"
+msgstr "接收端不支援 --atomic 推送"
+
+#: send-pack.c
+msgid "the receiving end does not support push options"
+msgstr "接收端不支援推送選項"
+
+#: sequencer.c
+#, c-format
+msgid "invalid commit message cleanup mode '%s'"
+msgstr "無效的提交說明清理模式 '%s'"
+
+#: sequencer.c
+#, c-format
+msgid "could not delete '%s'"
+msgstr "無法刪除 '%s'"
+
+#: sequencer.c
+msgid "revert"
+msgstr "復原"
+
+#: sequencer.c
+msgid "cherry-pick"
+msgstr "摘取"
+
+#: sequencer.c
+msgid "rebase"
+msgstr "rebase"
+
+#: sequencer.c
+#, c-format
+msgid "unknown action: %d"
+msgstr "未知動作：%d"
+
+#: sequencer.c
+msgid ""
+"after resolving the conflicts, mark the corrected paths\n"
+"with 'git add <paths>' or 'git rm <paths>'"
+msgstr ""
+"衝突解決完畢後，用 'git add <路徑>' 或 'git rm <路徑>'\n"
+"指令標記修正後的檔案"
+
+#: sequencer.c
+msgid ""
+"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/rm <pathspec>\" 標記路徑，再執行\n"
+"\"git cherry-pick --continue\"。\n"
+"亦可以使用 \"git cherry-pick --skip\" 略過提交。\n"
+"若要取消並返回 \"git cherry-pick\" 前的狀態，\n"
+"請執行 \"git cherry-pick --abort\"。"
+
+#: sequencer.c
+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
+#, c-format
+msgid "could not lock '%s'"
+msgstr "不能鎖定 '%s'"
+
+#: sequencer.c strbuf.c wrapper.c
+#, c-format
+msgid "could not write to '%s'"
+msgstr "不能寫入 '%s'"
+
+#: sequencer.c
+#, c-format
+msgid "could not write eol to '%s'"
+msgstr "不能將換行符號寫入 '%s'"
+
+#: sequencer.c
+#, c-format
+msgid "failed to finalize '%s'"
+msgstr "無法完成 '%s'"
+
+#: sequencer.c
+#, c-format
+msgid "your local changes would be overwritten by %s."
+msgstr "您的本機修改將被%s覆蓋。"
+
+#: sequencer.c
+msgid "commit your changes or stash them to proceed."
+msgstr "提交您的修改或儲藏後再繼續。"
+
+#: sequencer.c
+#, c-format
+msgid "%s: fast-forward"
+msgstr "%s：快轉"
+
+#. TRANSLATORS: %s will be "revert", "cherry-pick" or
+#. "rebase".
+#.
+#: sequencer.c
+#, c-format
+msgid "%s: Unable to write new index file"
+msgstr "%s：無法寫入新索引檔案"
+
+#: sequencer.c
+msgid "unable to update cache tree"
+msgstr "不能更新快取樹"
+
+#: sequencer.c
+msgid "could not resolve HEAD commit"
+msgstr "不能解析 HEAD 提交"
+
+#: sequencer.c
+#, c-format
+msgid "no key present in '%.*s'"
+msgstr "在 '%.*s' 中沒有 key"
+
+#: sequencer.c
+#, c-format
+msgid "unable to dequote value of '%s'"
+msgstr "無法為 '%s' 的值去引號"
+
+#: sequencer.c
+msgid "'GIT_AUTHOR_NAME' already given"
+msgstr "已經給出 'GIT_AUTHOR_NAME'"
+
+#: sequencer.c
+msgid "'GIT_AUTHOR_EMAIL' already given"
+msgstr "已經給出 'GIT_AUTHOR_EMAIL'"
+
+#: sequencer.c
+msgid "'GIT_AUTHOR_DATE' already given"
+msgstr "已經給出 'GIT_AUTHOR_DATE'"
+
+#: sequencer.c
+#, c-format
+msgid "unknown variable '%s'"
+msgstr "未知變數 '%s'"
+
+#: sequencer.c
+msgid "missing 'GIT_AUTHOR_NAME'"
+msgstr "缺少 'GIT_AUTHOR_NAME'"
+
+#: sequencer.c
+msgid "missing 'GIT_AUTHOR_EMAIL'"
+msgstr "缺少 'GIT_AUTHOR_EMAIL'"
+
+#: sequencer.c
+msgid "missing 'GIT_AUTHOR_DATE'"
+msgstr "缺少 'GIT_AUTHOR_DATE'"
+
+#: sequencer.c
+#, c-format
+msgid ""
+"you have staged changes in your working tree\n"
+"If these changes are meant to be squashed into the previous commit, run:\n"
+"\n"
+"  git commit --amend %s\n"
+"\n"
+"If they are meant to go into a new commit, run:\n"
+"\n"
+"  git commit %s\n"
+"\n"
+"In both cases, once you're done, continue with:\n"
+"\n"
+"  git rebase --continue\n"
+msgstr ""
+"您的工作區中存在已暫存的修改\n"
+"如果這些修改需要被併入前一個提交，執行：\n"
+"\n"
+"  git commit --amend %s\n"
+"\n"
+"如果這些修改要形成一個新提交，執行：\n"
+"\n"
+"  git commit %s\n"
+"\n"
+"無論哪種情況，當您完成提交，繼續執行：\n"
+"\n"
+"  git rebase --continue\n"
+
+#: sequencer.c
+msgid "'prepare-commit-msg' hook failed"
+msgstr "'prepare-commit-msg' 掛鉤失敗"
+
+#: sequencer.c
+msgid ""
+"Your name and email address were configured automatically based\n"
+"on your username and hostname. Please check that they are accurate.\n"
+"You can suppress this message by setting them explicitly. Run the\n"
+"following command and follow the instructions in your editor to edit\n"
+"your configuration file:\n"
+"\n"
+"    git config --global --edit\n"
+"\n"
+"After doing this, you may fix the identity used for this commit with:\n"
+"\n"
+"    git commit --amend --reset-author\n"
+msgstr ""
+"您的姓名和信件位址皆根據您的使用者名稱和主機名稱自動設定。\n"
+"請檢查是否正確。您可以自行設定，這樣便不會再出現這個提示訊息。\n"
+"執行如下指令，在編輯器中遵循指引編輯您的設定檔案：\n"
+"\n"
+"    git config --global --edit\n"
+"\n"
+"設定完畢後，您可以使用下述指令，修正這個提交的提交者身份：\n"
+"\n"
+"    git commit --amend --reset-author\n"
+
+#: sequencer.c
+msgid ""
+"Your name and email address were configured automatically based\n"
+"on your username and hostname. Please check that they are accurate.\n"
+"You can suppress this message by setting them explicitly:\n"
+"\n"
+"    git config --global user.name \"Your Name\"\n"
+"    git config --global user.email you@example.com\n"
+"\n"
+"After doing this, you may fix the identity used for this commit with:\n"
+"\n"
+"    git commit --amend --reset-author\n"
+msgstr ""
+"您的姓名和信件位址皆根據您的使用者名稱和主機名稱自動設定。\n"
+"請檢查是否正確。您可以自行設定，這樣便不會再出現這個提示訊息：\n"
+"\n"
+"    git config --global user.name \"Your Name\"\n"
+"    git config --global user.email you@example.com\n"
+"\n"
+"設定完畢後，您可以使用下述指令，修正這個提交使用的提交者身份：\n"
+"\n"
+"    git commit --amend --reset-author\n"
+
+#: sequencer.c
+msgid "couldn't look up newly created commit"
+msgstr "無法找到新建立的提交"
+
+#: sequencer.c
+msgid "could not parse newly created commit"
+msgstr "不能解析新建立的提交"
+
+#: sequencer.c
+msgid "unable to resolve HEAD after creating commit"
+msgstr "建立提交後，不能解析 HEAD"
+
+#: sequencer.c
+msgid "detached HEAD"
+msgstr "分離 HEAD"
+
+#  譯者：中文字串拼接，可刪除前導空格
+#: sequencer.c
+msgid " (root-commit)"
+msgstr " (根提交)"
+
+#: sequencer.c
+msgid "could not parse HEAD"
+msgstr "不能解析 HEAD"
+
+#: sequencer.c
+#, c-format
+msgid "HEAD %s is not a commit!"
+msgstr "HEAD %s 不是一個提交！"
+
+#: sequencer.c
+msgid "unable to parse commit author"
+msgstr "不能解析提交作者"
+
+#: sequencer.c
+#, c-format
+msgid "unable to read commit message from '%s'"
+msgstr "不能從 '%s' 讀取提交說明"
+
+#: sequencer.c
+#, c-format
+msgid "invalid author identity '%s'"
+msgstr "無效的作者身分 '%s'"
+
+#: sequencer.c
+msgid "corrupt author: missing date information"
+msgstr "作者資訊損壞：缺少日期資訊"
+
+#: sequencer.c t/helper/test-fast-rebase.c
+#, c-format
+msgid "could not update %s"
+msgstr "不能更新 %s"
+
+#: sequencer.c
+#, c-format
+msgid "could not parse commit %s"
+msgstr "不能解析提交 %s"
+
+#: sequencer.c
+#, c-format
+msgid "could not parse parent commit %s"
+msgstr "不能解析父提交 %s"
+
+#: sequencer.c
+#, c-format
+msgid "unknown command: %d"
+msgstr "未知指令：%d"
+
+#: sequencer.c
+msgid "This is the 1st commit message:"
+msgstr "這是第一個提交說明："
+
+#: sequencer.c
+#, c-format
+msgid "This is the commit message #%d:"
+msgstr "這是提交說明 #%d："
+
+#: sequencer.c
+msgid "The 1st commit message will be skipped:"
+msgstr "略過第 1 個提交說明："
+
+#: sequencer.c
+#, c-format
+msgid "The commit message #%d will be skipped:"
+msgstr "略過第 %d 個提交說明："
+
+#: sequencer.c
+#, c-format
+msgid "This is a combination of %d commits."
+msgstr "這是整合 %d 個提交的集合提交。"
+
+#: sequencer.c
+#, c-format
+msgid "cannot write '%s'"
+msgstr "不能寫 '%s'"
+
+#: sequencer.c
+msgid "need a HEAD to fixup"
+msgstr "需要一個 HEAD 來修復"
+
+#: sequencer.c
+msgid "could not read HEAD"
+msgstr "不能讀取 HEAD"
+
+#: sequencer.c
+msgid "could not read HEAD's commit message"
+msgstr "不能讀取 HEAD 的提交說明"
+
+#: sequencer.c
+#, c-format
+msgid "could not read commit message of %s"
+msgstr "不能讀取 %s 的提交說明"
+
+#: sequencer.c
+msgid "your index file is unmerged."
+msgstr "您的索引檔案未完成合併。"
+
+#: sequencer.c
+msgid "cannot fixup root commit"
+msgstr "不能修復根提交"
+
+#: sequencer.c
+#, c-format
+msgid "commit %s is a merge but no -m option was given."
+msgstr "提交 %s 是一個合併提交但未提供 -m 選項。"
+
+#: sequencer.c
+#, c-format
+msgid "commit %s does not have parent %d"
+msgstr "提交 %s 沒有第 %d 個父提交"
+
+#: sequencer.c
+#, 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
+#, c-format
+msgid "%s: cannot parse parent commit %s"
+msgstr "%s：不能解析父提交 %s"
+
+#: sequencer.c
+#, c-format
+msgid "could not rename '%s' to '%s'"
+msgstr "不能將 '%s' 重新命名為 '%s'"
+
+#: sequencer.c
+#, c-format
+msgid "could not revert %s... %s"
+msgstr "不能還原 %s... %s"
+
+#: sequencer.c
+#, c-format
+msgid "could not apply %s... %s"
+msgstr "不能套用 %s... %s"
+
+#: sequencer.c
+#, c-format
+msgid "dropping %s %s -- patch contents already upstream\n"
+msgstr "拋棄 %s %s -- 修補檔的內容已在上游\n"
+
+#: sequencer.c
+#, c-format
+msgid "git %s: failed to read the index"
+msgstr "git %s：無法讀取索引"
+
+#: sequencer.c
+#, c-format
+msgid "git %s: failed to refresh the index"
+msgstr "git %s：無法重新整理索引"
+
+#: sequencer.c
+#, c-format
+msgid "%s does not accept arguments: '%s'"
+msgstr "%s 不接受參數：'%s'"
+
+#: sequencer.c
+#, c-format
+msgid "missing arguments for %s"
+msgstr "缺少 %s 的參數"
+
+#: sequencer.c
+#, c-format
+msgid "could not parse '%s'"
+msgstr "無法解析 '%s'"
+
+#: sequencer.c
+#, c-format
+msgid "invalid line %d: %.*s"
+msgstr "無效行 %d：%.*s"
+
+#: sequencer.c
+#, c-format
+msgid "cannot '%s' without a previous commit"
+msgstr "沒有父提交的情況下不能 '%s'"
+
+#: sequencer.c
+msgid "cancelling a cherry picking in progress"
+msgstr "正在取消一個進行中的揀選"
+
+#: sequencer.c
+msgid "cancelling a revert in progress"
+msgstr "正在取消一個進行中的還原"
+
+#: sequencer.c
+msgid "please fix this using 'git rebase --edit-todo'."
+msgstr "請用 'git rebase --edit-todo' 來修改。"
+
+#: sequencer.c
+#, c-format
+msgid "unusable instruction sheet: '%s'"
+msgstr "不可用的指令清單：'%s'"
+
+#: sequencer.c
+msgid "no commits parsed."
+msgstr "沒有解析提交。"
+
+#: sequencer.c
+msgid "cannot cherry-pick during a revert."
+msgstr "不能在還原提交中執行揀選。"
+
+#: sequencer.c
+msgid "cannot revert during a cherry-pick."
+msgstr "不能在揀選中執行還原提交。"
+
+#: sequencer.c
+msgid "unusable squash-onto"
+msgstr "不可用的 squash-onto"
+
+#: sequencer.c
+#, c-format
+msgid "malformed options sheet: '%s'"
+msgstr "格式錯誤的選項清單：'%s'"
+
+#: sequencer.c
+msgid "empty commit set passed"
+msgstr "提供了空的提交集"
+
+#: sequencer.c
+msgid "revert is already in progress"
+msgstr "一個還原動作已在進行"
+
+#: sequencer.c
+#, c-format
+msgid "try \"git revert (--continue | %s--abort | --quit)\""
+msgstr "嘗試 \"git revert (--continue | %s--abort | --quit)\""
+
+#: sequencer.c
+msgid "cherry-pick is already in progress"
+msgstr "揀選動作已在進行"
+
+#: sequencer.c
+#, c-format
+msgid "try \"git cherry-pick (--continue | %s--abort | --quit)\""
+msgstr "嘗試 \"git cherry-pick (--continue | %s--abort | --quit)\""
+
+#: sequencer.c
+#, c-format
+msgid "could not create sequencer directory '%s'"
+msgstr "不能建立序列目錄 '%s'"
+
+#: sequencer.c
+msgid "could not lock HEAD"
+msgstr "不能鎖定 HEAD"
+
+#: sequencer.c
+msgid "no cherry-pick or revert in progress"
+msgstr "揀選或還原動作並未進行"
+
+#: sequencer.c
+msgid "cannot resolve HEAD"
+msgstr "不能解析 HEAD"
+
+#: sequencer.c
+msgid "cannot abort from a branch yet to be born"
+msgstr "不能從尚未建立的分支終止"
+
+#: sequencer.c
+#, c-format
+msgid "cannot read '%s': %s"
+msgstr "不能讀取 '%s'：%s"
+
+#: sequencer.c
+msgid "unexpected end of file"
+msgstr "意外的檔案結束"
+
+#: sequencer.c
+#, c-format
+msgid "stored pre-cherry-pick HEAD file '%s' is corrupt"
+msgstr "儲存揀選提交前的 HEAD 檔案 '%s' 損壞"
+
+#: sequencer.c
+msgid "You seem to have moved HEAD. Not rewinding, check your HEAD!"
+msgstr "您好像移動了 HEAD。未能還原，檢查您的 HEAD！"
+
+#: sequencer.c
+msgid "no revert in progress"
+msgstr "沒有正在進行的還原"
+
+#: sequencer.c
+msgid "no cherry-pick in progress"
+msgstr "沒有正在進行的揀選"
+
+#: sequencer.c
+msgid "failed to skip the commit"
+msgstr "無法略過這個提交"
+
+#: sequencer.c
+msgid "there is nothing to skip"
+msgstr "沒有要略過的"
+
+#: sequencer.c
+#, c-format
+msgid ""
+"have you committed already?\n"
+"try \"git %s --continue\""
+msgstr ""
+"您已經提交了嗎？\n"
+"試試 \"git %s --continue\""
+
+#: sequencer.c
+msgid "cannot read HEAD"
+msgstr "不能讀取 HEAD"
+
+#: sequencer.c
+#, c-format
+msgid "unable to copy '%s' to '%s'"
+msgstr "無法複製 '%s' 至 '%s'"
+
+#: sequencer.c
+#, c-format
+msgid ""
+"You can amend the commit now, with\n"
+"\n"
+"  git commit --amend %s\n"
+"\n"
+"Once you are satisfied with your changes, run\n"
+"\n"
+"  git rebase --continue\n"
+msgstr ""
+"您現在可以修補這個提交，使用\n"
+"\n"
+"  git commit --amend %s\n"
+"\n"
+"當您對變更感到滿意，執行\n"
+"\n"
+"  git rebase --continue\n"
+
+#: sequencer.c
+#, c-format
+msgid "Could not apply %s... %.*s"
+msgstr "不能套用 %s... %.*s"
+
+#: sequencer.c
+#, c-format
+msgid "Could not merge %.*s"
+msgstr "不能合併 %.*s"
+
+#: sequencer.c
+#, c-format
+msgid "Executing: %s\n"
+msgstr "執行：%s\n"
+
+#  譯者：請維持前導空格
+#: sequencer.c
+#, c-format
+msgid ""
+"execution failed: %s\n"
+"%sYou can fix the problem, and then run\n"
+"\n"
+"  git rebase --continue\n"
+"\n"
+msgstr ""
+"執行失敗：%s\n"
+"%s您可以改正該問題，然後執行\n"
+"\n"
+"  git rebase --continue\n"
+"\n"
+
+#: sequencer.c
+msgid "and made changes to the index and/or the working tree\n"
+msgstr "並且修改索引和/或工作區\n"
+
+#: sequencer.c
+#, c-format
+msgid ""
+"execution succeeded: %s\n"
+"but left changes to the index and/or the working tree\n"
+"Commit or stash your changes, and then run\n"
+"\n"
+"  git rebase --continue\n"
+"\n"
+msgstr ""
+"執行成功：%s\n"
+"但是在索引和/或工作區中存在變更\n"
+"提交或儲藏修改，然後執行\n"
+"\n"
+"  git rebase --continue\n"
+"\n"
+
+#: sequencer.c
+#, c-format
+msgid "illegal label name: '%.*s'"
+msgstr "非法的標籤名稱：'%.*s'"
+
+#: sequencer.c
+msgid "writing fake root commit"
+msgstr "寫偽根提交"
+
+#: sequencer.c
+msgid "writing squash-onto"
+msgstr "寫入 squash-onto"
+
+#: sequencer.c
+#, c-format
+msgid "could not resolve '%s'"
+msgstr "無法解析 '%s'"
+
+#: sequencer.c
+msgid "cannot merge without a current revision"
+msgstr "沒有目前版本不能合併"
+
+#: sequencer.c
+#, c-format
+msgid "unable to parse '%.*s'"
+msgstr "無法解析 '%.*s'"
+
+#: sequencer.c
+#, c-format
+msgid "nothing to merge: '%.*s'"
+msgstr "無可用合併：'%.*s'"
+
+#: sequencer.c
+msgid "octopus merge cannot be executed on top of a [new root]"
+msgstr "章魚合並不能在一個新的根提交上執行"
+
+#: sequencer.c
+#, c-format
+msgid "could not get commit message of '%s'"
+msgstr "不能取得 '%s' 的提交說明"
+
+#: sequencer.c
+#, c-format
+msgid "could not even attempt to merge '%.*s'"
+msgstr "甚至不能嘗試合併 '%.*s'"
+
+#: sequencer.c
+msgid "merge: Unable to write new index file"
+msgstr "合併：無法寫入新索引檔案"
+
+#: sequencer.c
+msgid "Cannot autostash"
+msgstr "無法 autostash"
+
+#: sequencer.c
+#, c-format
+msgid "Unexpected stash response: '%s'"
+msgstr "意外的 stash 回應：'%s'"
+
+#: sequencer.c
+#, c-format
+msgid "Could not create directory for '%s'"
+msgstr "不能為 '%s' 建立目錄"
+
+#: sequencer.c
+#, c-format
+msgid "Created autostash: %s\n"
+msgstr "建立了 autostash：%s\n"
+
+#: sequencer.c
+msgid "could not reset --hard"
+msgstr "無法 reset --hard"
+
+#: sequencer.c
+#, c-format
+msgid "Applied autostash.\n"
+msgstr "已套用 autostash。\n"
+
+#: sequencer.c
+#, c-format
+msgid "cannot store %s"
+msgstr "不能儲存 %s"
+
+#: sequencer.c
+#, c-format
+msgid ""
+"%s\n"
+"Your changes are safe in the stash.\n"
+"You can run \"git stash pop\" or \"git stash drop\" at any time.\n"
+msgstr ""
+"%s\n"
+"您的修改安全地儲存在儲藏區中。\n"
+"您可以在任何時候執行 \"git stash pop\" 或 \"git stash drop\"。\n"
+
+#: sequencer.c
+msgid "Applying autostash resulted in conflicts."
+msgstr "因套用自動儲藏而導致衝突。"
+
+#: sequencer.c
+msgid "Autostash exists; creating a new stash entry."
+msgstr "已有自動儲藏；建立新儲藏項目。"
+
+#: sequencer.c
+msgid "could not detach HEAD"
+msgstr "不能分離開頭指標"
+
+#: sequencer.c
+#, c-format
+msgid "Stopped at HEAD\n"
+msgstr "停止在 HEAD\n"
+
+#: sequencer.c
+#, c-format
+msgid "Stopped at %s\n"
+msgstr "停止在 %s\n"
+
+#: sequencer.c
+#, c-format
+msgid ""
+"Could not execute the todo command\n"
+"\n"
+"    %.*s\n"
+"It has been rescheduled; To edit the command before continuing, please\n"
+"edit the todo list first:\n"
+"\n"
+"    git rebase --edit-todo\n"
+"    git rebase --continue\n"
+msgstr ""
+"無法執行待辦指令\n"
+"\n"
+"    %.*s\n"
+"已被重新安排，在繼續之前編輯指令，請先編輯待辦列表：\n"
+"\n"
+"    git rebase --edit-todo\n"
+"    git rebase --continue\n"
+
+#: sequencer.c
+#, c-format
+msgid "Rebasing (%d/%d)%s"
+msgstr "正在重定基底 (%d/%d)%s"
+
+#: sequencer.c
+#, c-format
+msgid "Stopped at %s...  %.*s\n"
+msgstr "停止在 %s... %.*s\n"
+
+#: sequencer.c
+#, c-format
+msgid "unknown command %d"
+msgstr "未知指令 %d"
+
+#: sequencer.c
+msgid "could not read orig-head"
+msgstr "不能讀取 orig-head"
+
+#: sequencer.c
+msgid "could not read 'onto'"
+msgstr "不能讀取 'onto'"
+
+#: sequencer.c
+#, c-format
+msgid "could not update HEAD to %s"
+msgstr "不能更新 HEAD 為 %s"
+
+#: sequencer.c
+#, c-format
+msgid "Successfully rebased and updated %s.\n"
+msgstr "成功重定基底並更新 %s。\n"
+
+#: sequencer.c
+msgid "cannot rebase: You have unstaged changes."
+msgstr "不能重定基底：您有未暫存的變更。"
+
+#: sequencer.c
+msgid "cannot amend non-existing commit"
+msgstr "不能修補不存在的提交"
+
+#: sequencer.c
+#, c-format
+msgid "invalid file: '%s'"
+msgstr "無效檔案：'%s'"
+
+#: sequencer.c
+#, c-format
+msgid "invalid contents: '%s'"
+msgstr "無效內容：'%s'"
+
+#: sequencer.c
+msgid ""
+"\n"
+"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'。"
+
+#: sequencer.c
+#, c-format
+msgid "could not write file: '%s'"
+msgstr "不能寫入檔案：'%s'"
+
+#: sequencer.c
+msgid "could not remove CHERRY_PICK_HEAD"
+msgstr "不能刪除 CHERRY_PICK_HEAD"
+
+#: sequencer.c
+msgid "could not commit staged changes."
+msgstr "不能提交暫存的修改。"
+
+#: sequencer.c
+#, c-format
+msgid "%s: can't cherry-pick a %s"
+msgstr "%s：不能揀選一個%s"
+
+#: sequencer.c
+#, c-format
+msgid "%s: bad revision"
+msgstr "%s：錯誤的版本"
+
+#: sequencer.c
+msgid "can't revert as initial commit"
+msgstr "不能作為初始提交還原提交"
+
+#: sequencer.c
+#, c-format
+msgid "skipped previously applied commit %s"
+msgstr "已略過先前套用的 %s 提交"
+
+#: sequencer.c
+msgid "use --reapply-cherry-picks to include skipped commits"
+msgstr "使用 --reapply-cherry-picks 以包含略過提交"
+
+#: sequencer.c
+msgid "make_script: unhandled options"
+msgstr "make_script：有未能處理的選項"
+
+#: sequencer.c
+msgid "make_script: error preparing revisions"
+msgstr "make_script：準備版本時錯誤"
+
+#: sequencer.c
+msgid "nothing to do"
+msgstr "無事可做"
+
+#: sequencer.c
+msgid "could not skip unnecessary pick commands"
+msgstr "無法略過不必要的揀選"
+
+#: sequencer.c
+msgid "the script was already rearranged."
+msgstr "腳本已經重新編排。"
+
+#: setup.c
+#, c-format
+msgid "'%s' is outside repository at '%s'"
+msgstr "'%s' 在位於 '%s' 的版本庫之外"
+
+#: setup.c
+#, c-format
+msgid ""
+"%s: no such path in the working tree.\n"
+"Use 'git <command> -- <path>...' to specify paths that do not exist locally."
+msgstr ""
+"%s：工作區中無此路徑。\n"
+"使用指令 'git <命令> -- <路徑>...' 來指定本機不存在的路徑。"
+
+#: setup.c
+#, c-format
+msgid ""
+"ambiguous argument '%s': unknown revision or path not in the working tree.\n"
+"Use '--' to separate paths from revisions, like this:\n"
+"'git <command> [<revision>...] -- [<file>...]'"
+msgstr ""
+"有歧義的參數 '%s'：未知的版本或路徑不存在於工作區中。\n"
+"使用 '--' 來分隔版本和路徑，例如：\n"
+"'git <命令> [<版本>...] -- [<檔案>...]'"
+
+#: setup.c
+#, c-format
+msgid "option '%s' must come before non-option arguments"
+msgstr "選項 '%s' 必須在其他非選項參數之前"
+
+#: setup.c
+#, c-format
+msgid ""
+"ambiguous argument '%s': both revision and filename\n"
+"Use '--' to separate paths from revisions, like this:\n"
+"'git <command> [<revision>...] -- [<file>...]'"
+msgstr ""
+"有歧義的參數 '%s'：可同時是版本和檔案\n"
+"使用 '--' 來分隔版本和路徑，例如：\n"
+"'git <命令> [<版本>...] -- [<檔案>...]'"
+
+#: setup.c
+msgid "unable to set up work tree using invalid config"
+msgstr "無法使用無效設定來建立工作區"
+
+#: setup.c
+#, c-format
+msgid "Expected git repo version <= %d, found %d"
+msgstr "期望 git 版本庫版本 <= %d，卻得到 %d"
+
+#: setup.c
+msgid "unknown repository extension found:"
+msgid_plural "unknown repository extensions found:"
+msgstr[0] "找到未知的儲存庫擴充元件："
+
+#: setup.c
+msgid "repo version is 0, but v1-only extension found:"
+msgid_plural "repo version is 0, but v1-only extensions found:"
+msgstr[0] "repo 版本是 0 (v0)，但找到只支援 v1 的擴充元件："
+
+#: setup.c
+#, c-format
+msgid "error opening '%s'"
+msgstr "開啟 '%s' 發生錯誤"
+
+#: setup.c
+#, c-format
+msgid "too large to be a .git file: '%s'"
+msgstr "檔案太大，無法作為 .git 檔案：'%s'"
+
+#: setup.c
+#, c-format
+msgid "error reading %s"
+msgstr "讀取 %s 發生錯誤"
+
+#: setup.c
+#, c-format
+msgid "invalid gitfile format: %s"
+msgstr "無效的 gitfile 格式：%s"
+
+#: setup.c
+#, c-format
+msgid "no path in gitfile: %s"
+msgstr "在 gitfile 中沒有路徑：%s"
+
+#: setup.c
+#, c-format
+msgid "not a git repository: %s"
+msgstr "不是一個 git 版本庫：%s"
+
+#: setup.c
+#, c-format
+msgid "'$%s' too big"
+msgstr "'$%s' 太大"
+
+#: setup.c
+#, c-format
+msgid "not a git repository: '%s'"
+msgstr "不是一個 git 版本庫：'%s'"
+
+#: setup.c
+#, c-format
+msgid "cannot chdir to '%s'"
+msgstr "不能切換目錄到 '%s'"
+
+#: setup.c
+msgid "cannot come back to cwd"
+msgstr "無法返回目前工作目錄"
+
+#: setup.c
+#, c-format
+msgid "failed to stat '%*s%s%s'"
+msgstr "取得 '%*s%s%s' 狀態（stat）失敗"
+
+#: setup.c
+msgid "Unable to read current working directory"
+msgstr "不能讀取目前工作目錄"
+
+#: setup.c
+#, c-format
+msgid "cannot change to '%s'"
+msgstr "不能切換到 '%s'"
+
+#: setup.c
+#, c-format
+msgid "not a git repository (or any of the parent directories): %s"
+msgstr "不是一個 git 版本庫（或者任何父目錄）：%s"
+
+#: setup.c
+#, 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 ""
+"不是一個 git 版本庫（或者直至掛載點 %s 的任何父目錄）\n"
+"停止在檔案系統邊界（未設定 GIT_DISCOVERY_ACROSS_FILESYSTEM）。"
+
+#: setup.c
+#, c-format
+msgid ""
+"unsafe repository ('%s' is owned by someone else)\n"
+"To add an exception for this directory, call:\n"
+"\n"
+"\tgit config --global --add safe.directory %s"
+msgstr ""
+"不安全版本庫（「%s」由其他人所有）\n"
+"若要放行本目錄，請呼叫：\n"
+"\n"
+"\tgit config --global --add safe.directory %s"
+
+#: setup.c
+#, c-format
+msgid ""
+"problem with core.sharedRepository filemode value (0%.3o).\n"
+"The owner of files must always have read and write permissions."
+msgstr ""
+"參數 core.sharedRepository 的檔案屬性值有問題（0%.3o）。\n"
+"檔案所有者必須始終擁有讀寫權限。"
+
+#: setup.c
+msgid "fork failed"
+msgstr "fork 失敗"
+
+#: setup.c
+msgid "setsid failed"
+msgstr "setsid 失敗"
+
+#: sparse-index.c
+#, c-format
+msgid "index entry is a directory, but not sparse (%08x)"
+msgstr "索引項目是資料夾，但不是稀疏資料夾（%08x）"
+
+#: split-index.c
+msgid "cannot use split index with a sparse index"
+msgstr "無法在稀疏索引使用索引分割"
+
+#. TRANSLATORS: IEC 80000-13:2008 gibibyte
+#: strbuf.c
+#, c-format
+msgid "%u.%2.2u GiB"
+msgstr "%u.%2.2u GiB"
+
+#. TRANSLATORS: IEC 80000-13:2008 gibibyte/second
+#: strbuf.c
+#, c-format
+msgid "%u.%2.2u GiB/s"
+msgstr "%u.%2.2u GiB/s"
+
+#. TRANSLATORS: IEC 80000-13:2008 mebibyte
+#: strbuf.c
+#, c-format
+msgid "%u.%2.2u MiB"
+msgstr "%u.%2.2u MiB"
+
+#. TRANSLATORS: IEC 80000-13:2008 mebibyte/second
+#: strbuf.c
+#, c-format
+msgid "%u.%2.2u MiB/s"
+msgstr "%u.%2.2u MiB/s"
+
+#. TRANSLATORS: IEC 80000-13:2008 kibibyte
+#: strbuf.c
+#, c-format
+msgid "%u.%2.2u KiB"
+msgstr "%u.%2.2u KiB"
+
+#. TRANSLATORS: IEC 80000-13:2008 kibibyte/second
+#: strbuf.c
+#, c-format
+msgid "%u.%2.2u KiB/s"
+msgstr "%u.%2.2u KiB/s"
+
+#. TRANSLATORS: IEC 80000-13:2008 byte
+#: strbuf.c
+#, c-format
+msgid "%u byte"
+msgid_plural "%u bytes"
+msgstr[0] "%u 位元組"
+
+#. TRANSLATORS: IEC 80000-13:2008 byte/second
+#: strbuf.c
+#, c-format
+msgid "%u byte/s"
+msgid_plural "%u bytes/s"
+msgstr[0] "%u 位元組/秒"
+
+#: strbuf.c
+#, c-format
+msgid "could not edit '%s'"
+msgstr "無法編輯 '%s'"
+
+#: submodule-config.c
+#, c-format
+msgid "ignoring suspicious submodule name: %s"
+msgstr "忽略可疑的子模組名稱：%s"
+
+#: submodule-config.c
+msgid "negative values not allowed for submodule.fetchJobs"
+msgstr "submodule.fetchJobs 不允許為負值"
+
+#: submodule-config.c
+#, c-format
+msgid "ignoring '%s' which may be interpreted as a command-line option: %s"
+msgstr "忽略可能被解析為指令列選項的 '%s'：%s"
+
+#: submodule-config.c
+#, c-format
+msgid "Could not update .gitmodules entry %s"
+msgstr "不能更新 .gitmodules 條目 %s"
+
+#: submodule.c
+msgid "Cannot change unmerged .gitmodules, resolve merge conflicts first"
+msgstr "無法修改未合併的 .gitmodules，先解決合併衝突"
+
+#: submodule.c
+#, c-format
+msgid "Could not find section in .gitmodules where path=%s"
+msgstr "無法在 .gitmodules 中找到 path=%s 的小節"
+
+#: submodule.c
+#, c-format
+msgid "Could not remove .gitmodules entry for %s"
+msgstr "無法移除 %s 的 .gitmodules 條目"
+
+#: submodule.c
+msgid "staging updated .gitmodules failed"
+msgstr "將更新後 .gitmodules 新增暫存區失敗"
+
+#: submodule.c
+#, c-format
+msgid "in unpopulated submodule '%s'"
+msgstr "位於未簽出的子模組 '%s'"
+
+#: submodule.c
+#, c-format
+msgid "Pathspec '%s' is in submodule '%.*s'"
+msgstr "路徑規格 '%s' 在子模組 '%.*s' 中"
+
+#: submodule.c
+#, c-format
+msgid "bad --ignore-submodules argument: %s"
+msgstr "無效 --ignore-submodules 參數：%s"
+
+#: submodule.c
+#, c-format
+msgid ""
+"Submodule in commit %s at path: '%s' collides with a submodule named the "
+"same. Skipping it."
+msgstr "%s 提交位於路徑：'%s' 的子模組與同名的子模組衝突。略過。"
+
+#: submodule.c
+#, c-format
+msgid "submodule entry '%s' (%s) is a %s, not a commit"
+msgstr "子模組條目 '%s'（%s）是一個 %s，不是一個提交"
+
+#: submodule.c
+#, 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
+#, c-format
+msgid "process for submodule '%s' failed"
+msgstr "處理 '%s' 子模組失敗"
+
+#: submodule.c
+#, c-format
+msgid "Pushing submodule '%s'\n"
+msgstr "正在推送 '%s' 子模組\n"
+
+#: submodule.c
+#, c-format
+msgid "Unable to push submodule '%s'\n"
+msgstr "無法推送 '%s' 子模組\n"
+
+#: submodule.c
+#, c-format
+msgid "Fetching submodule %s%s\n"
+msgstr "正在抓取 %s%s 子模組\n"
+
+#: submodule.c
+#, c-format
+msgid "Could not access submodule '%s'\n"
+msgstr "無法存取子模組 '%s'\n"
+
+#: submodule.c
+#, c-format
+msgid "Could not access submodule '%s' at commit %s\n"
+msgstr "無法存取 %2$s 提交的子模組「%1$s」\n"
+
+#: submodule.c
+#, c-format
+msgid "Fetching submodule %s%s at commit %s\n"
+msgstr "正在抓取 %3$s 提交的 %1$s%2$s 子模組\n"
+
+#: submodule.c
+#, c-format
+msgid ""
+"Errors during submodule fetch:\n"
+"%s"
+msgstr ""
+"抓取子模組時發生錯誤：\n"
+"%s"
+
+#: submodule.c
+#, c-format
+msgid "'%s' not recognized as a git repository"
+msgstr "無法將 '%s' 識別為一個 git 版本庫"
+
+#: submodule.c
+#, c-format
+msgid "Could not run 'git status --porcelain=2' in submodule %s"
+msgstr "無法在 %s 子模組執行 'git status --porcelain=2'"
+
+#: submodule.c
+#, c-format
+msgid "'git status --porcelain=2' failed in submodule %s"
+msgstr "%s 子模組執行 'git status --porcelain=2' 失敗"
+
+#: submodule.c
+#, c-format
+msgid "could not start 'git status' in submodule '%s'"
+msgstr "無法在子模組 '%s' 中啟動 'git status'"
+
+#: submodule.c
+#, c-format
+msgid "could not run 'git status' in submodule '%s'"
+msgstr "無法在子模組 '%s' 中執行 'git status'"
+
+#: submodule.c
+#, c-format
+msgid "Could not unset core.worktree setting in submodule '%s'"
+msgstr "無法在子模組 '%s' 中取消 core.worktree 的設定"
+
+#: submodule.c
+#, c-format
+msgid "could not recurse into submodule '%s'"
+msgstr "無法遞迴子模組路徑 '%s'"
+
+#: submodule.c
+msgid "could not reset submodule index"
+msgstr "無法重設子模組的索引"
+
+#: submodule.c
+#, c-format
+msgid "submodule '%s' has dirty index"
+msgstr "子模組 '%s' 中有髒索引"
+
+#: submodule.c
+#, c-format
+msgid "Submodule '%s' could not be updated."
+msgstr "子模組 '%s' 無法被更新。"
+
+#: submodule.c
+#, c-format
+msgid "submodule git dir '%s' is inside git dir '%.*s'"
+msgstr "「%s」子模組 git 目錄在「%.*s」git 路徑中"
+
+#: submodule.c
+#, c-format
+msgid ""
+"relocate_gitdir for submodule '%s' with more than one worktree not supported"
+msgstr "不支援對有多個工作區的子模組 '%s' 執行 relocate_gitdir"
+
+#: submodule.c
+#, c-format
+msgid "could not lookup name for submodule '%s'"
+msgstr "不能查詢子模組 '%s' 的名稱"
+
+#: submodule.c
+#, c-format
+msgid "refusing to move '%s' into an existing git dir"
+msgstr "拒絕移動「%s」至現存 git 目錄"
+
+#: submodule.c
+#, c-format
+msgid ""
+"Migrating git directory of '%s%s' from\n"
+"'%s' to\n"
+"'%s'\n"
+msgstr ""
+"將 '%s%s' 的 git 目錄從\n"
+"'%s' 遷移至\n"
+"'%s'\n"
+
+#: submodule.c
+msgid "could not start ls-files in .."
+msgstr "無法在 .. 中啟動 ls-files"
+
+#: submodule.c
+#, c-format
+msgid "ls-tree returned unexpected return code %d"
+msgstr "ls-tree 返回未知返回值 %d"
+
+#: symlinks.c
+#, c-format
+msgid "failed to lstat '%s'"
+msgstr "無法 lstat “%s”"
+
+#: t/helper/test-fast-rebase.c
+msgid "unhandled options"
+msgstr "未處理選項"
+
+#: t/helper/test-fast-rebase.c
+msgid "error preparing revisions"
+msgstr "準備修訂版本時發生錯誤"
+
+#: t/helper/test-reach.c
+#, c-format
+msgid "commit %s is not marked reachable"
+msgstr "提交 %s 沒有標記為可以取得"
+
+#: t/helper/test-reach.c
+msgid "too many commits marked reachable"
+msgstr "太多提交標記為可以取得"
+
+#: t/helper/test-serve-v2.c
+msgid "test-tool serve-v2 [<options>]"
+msgstr "test-tool serve-v2 [<選項>]"
+
+#: t/helper/test-serve-v2.c
+msgid "exit immediately after advertising capabilities"
+msgstr "對能力廣告之後立即離開"
+
+#: t/helper/test-simple-ipc.c
+msgid "test-helper simple-ipc is-active    [<name>] [<options>]"
+msgstr "test-helper simple-ipc is-active    [<name>] [<options>]"
+
+#: t/helper/test-simple-ipc.c
+msgid "test-helper simple-ipc run-daemon   [<name>] [<threads>]"
+msgstr "test-helper simple-ipc run-daemon   [<name>] [<threads>]"
+
+#: t/helper/test-simple-ipc.c
+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
+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
+msgid "test-helper simple-ipc send         [<name>] [<token>]"
+msgstr "test-helper simple-ipc send         [<name>] [<token>]"
+
+#: t/helper/test-simple-ipc.c
+msgid "test-helper simple-ipc sendbytes    [<name>] [<bytecount>] [<byte>]"
+msgstr "test-helper simple-ipc sendbytes    [<name>] [<bytecount>] [<byte>]"
+
+#: t/helper/test-simple-ipc.c
+msgid ""
+"test-helper simple-ipc multiple     [<name>] [<threads>] [<bytecount>] "
+"[<batchsize>]"
+msgstr ""
+"test-helper simple-ipc multiple     [<name>] [<threads>] [<bytecount>] "
+"[<batchsize>]"
+
+#: t/helper/test-simple-ipc.c
+msgid "name or pathname of unix domain socket"
+msgstr "Unix 網域通訊端的名稱或路徑名稱"
+
+#: t/helper/test-simple-ipc.c
+msgid "named-pipe name"
+msgstr "有命名管道的名稱"
+
+#: t/helper/test-simple-ipc.c
+msgid "number of threads in server thread pool"
+msgstr "伺服器執行緒集區的執行緒數量"
+
+#: t/helper/test-simple-ipc.c
+msgid "seconds to wait for daemon to start or stop"
+msgstr "要等待守護程式啟動或停止多久（秒）"
+
+#: t/helper/test-simple-ipc.c
+msgid "number of bytes"
+msgstr "位元組數"
+
+#: t/helper/test-simple-ipc.c
+msgid "number of requests per thread"
+msgstr "每個執行緒的請求數"
+
+#: t/helper/test-simple-ipc.c
+msgid "byte"
+msgstr "位元組"
+
+#: t/helper/test-simple-ipc.c
+msgid "ballast character"
+msgstr "穩定 (ballast) 字元"
+
+#: t/helper/test-simple-ipc.c
+msgid "token"
+msgstr "代符"
+
+#: t/helper/test-simple-ipc.c
+msgid "command token to send to the server"
+msgstr "要傳送至伺服器的命令代符"
+
+#: trailer.c
+#, c-format
+msgid "running trailer command '%s' failed"
+msgstr "執行 trailer 指令 '%s' 失敗"
+
+#: trailer.c
+#, c-format
+msgid "unknown value '%s' for key '%s'"
+msgstr "鍵 '%2$s' 的未知取值 '%1$s'"
+
+#: trailer.c
+#, c-format
+msgid "empty trailer token in trailer '%.*s'"
+msgstr "簽名 '%.*s' 的鍵為空"
+
+#: trailer.c
+#, c-format
+msgid "could not read input file '%s'"
+msgstr "不能讀取輸入檔案 '%s'"
+
+#: trailer.c wrapper.c
+#, c-format
+msgid "could not stat %s"
+msgstr "不能對 %s 呼叫 stat"
+
+#: trailer.c
+#, c-format
+msgid "file %s is not a regular file"
+msgstr "檔案 %s 不是一個正規檔案"
+
+#: trailer.c
+#, c-format
+msgid "file %s is not writable by user"
+msgstr "檔案 %s 使用者不可寫"
+
+#: trailer.c
+msgid "could not open temporary file"
+msgstr "不能開啟暫存檔"
+
+#: trailer.c
+#, c-format
+msgid "could not rename temporary file to %s"
+msgstr "不能重新命名暫存檔為 %s"
+
+#: transport-helper.c
+msgid "full write to remote helper failed"
+msgstr "完整寫入遠端協助工具失敗"
+
+#: transport-helper.c
+#, c-format
+msgid "unable to find remote helper for '%s'"
+msgstr "無法為 '%s' 找到遠端協助工具"
+
+#: transport-helper.c
+msgid "can't dup helper output fd"
+msgstr "無法複製協助工具輸出檔案句柄"
+
+#: transport-helper.c
+#, c-format
+msgid ""
+"unknown mandatory capability %s; this remote helper probably needs newer "
+"version of Git"
+msgstr "未知的強制能力 %s，該遠端協助工具可能需要新版本的Git"
+
+#: transport-helper.c
+msgid "this remote helper should implement refspec capability"
+msgstr "遠端協助工具需要實現 refspec 引用規格能力"
+
+#: transport-helper.c
+#, c-format
+msgid "%s unexpectedly said: '%s'"
+msgstr "%s 意外地說：'%s'"
+
+#: transport-helper.c
+#, c-format
+msgid "%s also locked %s"
+msgstr "%s 也鎖定了 %s"
+
+#: transport-helper.c
+msgid "couldn't run fast-import"
+msgstr "不能執行 fast-import"
+
+#: transport-helper.c
+msgid "error while running fast-import"
+msgstr "執行 fast-import 發生錯誤"
+
+#: transport-helper.c
+#, c-format
+msgid "could not read ref %s"
+msgstr "無法讀取引用 %s"
+
+#: transport-helper.c
+#, c-format
+msgid "unknown response to connect: %s"
+msgstr "連線時未知的回應：%s"
+
+#: transport-helper.c
+msgid "setting remote service path not supported by protocol"
+msgstr "協定不支援設定遠端服務路徑"
+
+#: transport-helper.c
+msgid "invalid remote service path"
+msgstr "無效的遠端服務路徑"
+
+#: transport-helper.c transport.c
+msgid "operation not supported by protocol"
+msgstr "協定不支援該動作"
+
+#: transport-helper.c
+#, c-format
+msgid "can't connect to subservice %s"
+msgstr "不能連線到子服務 %s"
+
+#: transport-helper.c transport.c
+msgid "--negotiate-only requires protocol v2"
+msgstr "--negotiate-only 需要 v2 版協定"
+
+#: transport-helper.c
+msgid "'option' without a matching 'ok/error' directive"
+msgstr "'option' 缺少對應的 'ok/error' 指令"
+
+#: transport-helper.c
+#, c-format
+msgid "expected ok/error, helper said '%s'"
+msgstr "預期 ok/error，協助工具說 '%s'"
+
+#: transport-helper.c
+#, c-format
+msgid "helper reported unexpected status of %s"
+msgstr "協助工具報告 %s 的意外狀態"
+
+#: transport-helper.c
+#, c-format
+msgid "helper %s does not support dry-run"
+msgstr "協助工具 %s 不支援 dry-run"
+
+#: transport-helper.c
+#, c-format
+msgid "helper %s does not support --signed"
+msgstr "協助工具 %s 不支援 --signed"
+
+#: transport-helper.c
+#, c-format
+msgid "helper %s does not support --signed=if-asked"
+msgstr "協助工具 %s 不支援 --signed=if-asked"
+
+#: transport-helper.c
+#, c-format
+msgid "helper %s does not support --atomic"
+msgstr "協助工具 %s 不支援 --atomic"
+
+#: transport-helper.c
+#, c-format
+msgid "helper %s does not support --%s"
+msgstr "協助工具 %s 不支援 --%s"
+
+#: transport-helper.c
+#, c-format
+msgid "helper %s does not support 'push-option'"
+msgstr "協助工具 %s 不支援 'push-option'"
+
+#: transport-helper.c
+msgid "remote-helper doesn't support push; refspec needed"
+msgstr "remote-heper 不支援 push，需要引用規格"
+
+#: transport-helper.c
+#, c-format
+msgid "helper %s does not support 'force'"
+msgstr "協助工具 %s 不支援 'force'"
+
+#: transport-helper.c
+msgid "couldn't run fast-export"
+msgstr "無法執行 fast-export"
+
+#: transport-helper.c
+msgid "error while running fast-export"
+msgstr "執行 fast-export 時發生錯誤"
+
+#: transport-helper.c
+#, c-format
+msgid ""
+"No refs in common and none specified; doing nothing.\n"
+"Perhaps you should specify a branch.\n"
+msgstr ""
+"沒有共同的引用並且也沒有指定，什麼也不會做。\n"
+"您或許得指定一個分支。\n"
+
+#: transport-helper.c
+#, c-format
+msgid "unsupported object format '%s'"
+msgstr "不支援的物件格式「%s」"
+
+#: transport-helper.c
+#, c-format
+msgid "malformed response in ref list: %s"
+msgstr "引用列表中格式錯誤的回應：%s"
+
+#: transport-helper.c
+#, c-format
+msgid "read(%s) failed"
+msgstr "讀取（%s）失敗"
+
+#: transport-helper.c
+#, c-format
+msgid "write(%s) failed"
+msgstr "寫（%s）失敗"
+
+#: transport-helper.c
+#, c-format
+msgid "%s thread failed"
+msgstr "%s 執行緒失敗"
+
+#: transport-helper.c
+#, c-format
+msgid "%s thread failed to join: %s"
+msgstr "%s 執行緒等待失敗：%s"
+
+#: transport-helper.c
+#, c-format
+msgid "can't start thread for copying data: %s"
+msgstr "不能啟動執行緒來複製資料：%s"
+
+#: transport-helper.c
+#, c-format
+msgid "%s process failed to wait"
+msgstr "%s 進程等待失敗"
+
+#: transport-helper.c
+#, c-format
+msgid "%s process failed"
+msgstr "%s 進程失敗"
+
+#: transport-helper.c
+msgid "can't start thread for copying data"
+msgstr "不能啟動執行緒來複製資料"
+
+#: transport.c
+#, c-format
+msgid "Would set upstream of '%s' to '%s' of '%s'\n"
+msgstr "將要設定 '%1$s' 的上游為 '%3$s' 的 '%2$s'\n"
+
+#: transport.c
+#, c-format
+msgid "could not read bundle '%s'"
+msgstr "無法讀取「%s」套件"
+
+#: transport.c
+#, c-format
+msgid "transport: invalid depth option '%s'"
+msgstr "傳輸：無效的深度選項 '%s'"
+
+#: transport.c
+msgid "see protocol.version in 'git help config' for more details"
+msgstr "檢視 'git help config' 中的 protocol.version 取得更多訊息"
+
+#: transport.c
+msgid "server options require protocol version 2 or later"
+msgstr "服務端選項需要版本 2 協定或更高"
+
+#: transport.c
+msgid "server does not support wait-for-done"
+msgstr "伺服器不支援「等待完成」(wait-for-done) 功能"
+
+#: transport.c
+msgid "could not parse transport.color.* config"
+msgstr "不能解析 transport.color.* 設定"
+
+#: transport.c
+msgid "support for protocol v2 not implemented yet"
+msgstr "協定 v2 的支援尚未實現"
+
+#: transport.c
+#, c-format
+msgid "unknown value for config '%s': %s"
+msgstr "設定 '%s' 的取值未知：%s"
+
+#: transport.c
+#, c-format
+msgid "transport '%s' not allowed"
+msgstr "傳輸 '%s' 不允許"
+
+#: transport.c
+msgid "git-over-rsync is no longer supported"
+msgstr "不再支援 git-over-rsync"
+
+#: transport.c
+#, c-format
+msgid ""
+"The following submodule paths contain changes that can\n"
+"not be found on any remote:\n"
+msgstr "下列子模組路徑所包含的修改在任何遠端來源中都找不到：\n"
+
+#: transport.c
+#, c-format
+msgid ""
+"\n"
+"Please try\n"
+"\n"
+"\tgit push --recurse-submodules=on-demand\n"
+"\n"
+"or cd to the path and use\n"
+"\n"
+"\tgit push\n"
+"\n"
+"to push them to a remote.\n"
+"\n"
+msgstr ""
+"\n"
+"請嘗試\n"
+"\n"
+"\tgit push --recurse-submodules=on-demand\n"
+"\n"
+"或者進入到子目錄執行\n"
+"\n"
+"\tgit push\n"
+"\n"
+"以推送至遠端。\n"
+"\n"
+
+#: transport.c
+msgid "Aborting."
+msgstr "正在終止。"
+
+#: transport.c
+msgid "failed to push all needed submodules"
+msgstr "不能推送全部需要的子模組"
+
+#: tree-walk.c
+msgid "too-short tree object"
+msgstr "太短的樹狀物件"
+
+#: tree-walk.c
+msgid "malformed mode in tree entry"
+msgstr "樹狀物件中的條目模式錯誤"
+
+#: tree-walk.c
+msgid "empty filename in tree entry"
+msgstr "樹狀物件條目中空的檔案名"
+
+#: tree-walk.c
+msgid "too-short tree file"
+msgstr "太短的樹檔案"
+
+#: unpack-trees.c
+#, c-format
+msgid ""
+"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 ""
+"您對下列檔案的本機修改將被簽出動作覆蓋：\n"
+"%%s請在切換分支前提交或儲藏您的修改。"
+
+#: unpack-trees.c
+#, c-format
+msgid ""
+"Your local changes to the following files would be overwritten by checkout:\n"
+"%%s"
+msgstr ""
+"您對下列檔案的本機修改將被簽出動作覆蓋：\n"
+"%%s"
+
+#: unpack-trees.c
+#, c-format
+msgid ""
+"Your local changes to the following files would be overwritten by merge:\n"
+"%%sPlease commit your changes or stash them before you merge."
+msgstr ""
+"您對下列檔案的本機修改將被合併動作覆蓋：\n"
+"%%s請在合併前提交或儲藏您的修改。"
+
+#: unpack-trees.c
+#, c-format
+msgid ""
+"Your local changes to the following files would be overwritten by merge:\n"
+"%%s"
+msgstr ""
+"您對下列檔案的本機修改將被合併動作覆蓋：\n"
+"%%s"
+
+#: unpack-trees.c
+#, c-format
+msgid ""
+"Your local changes to the following files would be overwritten by %s:\n"
+"%%sPlease commit your changes or stash them before you %s."
+msgstr ""
+"您對下列檔案的本機修改將被 %s 覆蓋：\n"
+"%%s請在 %s 之前提交或儲藏您的修改。"
+
+#: unpack-trees.c
+#, c-format
+msgid ""
+"Your local changes to the following files would be overwritten by %s:\n"
+"%%s"
+msgstr ""
+"您對下列檔案的本機修改將被 %s 覆蓋：\n"
+"%%s"
+
+#: unpack-trees.c
+#, c-format
+msgid ""
+"Updating the following directories would lose untracked files in them:\n"
+"%s"
+msgstr ""
+"更新如下目錄將會遺失其中未追蹤的檔案：\n"
+"%s"
+
+#: unpack-trees.c
+#, c-format
+msgid ""
+"Refusing to remove the current working directory:\n"
+"%s"
+msgstr ""
+"拒絕移除目前工作目錄：\n"
+"%s"
+
+#: unpack-trees.c
+#, c-format
+msgid ""
+"The following untracked working tree files would be removed by checkout:\n"
+"%%sPlease move or remove them before you switch branches."
+msgstr ""
+"工作區中下列未追蹤的檔案將會因為簽出動作而被刪除：\n"
+"%%s請在切換分支之前移動或刪除。"
+
+#: unpack-trees.c
+#, c-format
+msgid ""
+"The following untracked working tree files would be removed by checkout:\n"
+"%%s"
+msgstr ""
+"工作區中下列未追蹤的檔案將會因為簽出動作而被刪除：\n"
+"%%s"
+
+#: unpack-trees.c
+#, c-format
+msgid ""
+"The following untracked working tree files would be removed by merge:\n"
+"%%sPlease move or remove them before you merge."
+msgstr ""
+"工作區中下列未追蹤的檔案將會因為合併動作而被刪除：\n"
+"%%s請在合併前移動或刪除。"
+
+#: unpack-trees.c
+#, c-format
+msgid ""
+"The following untracked working tree files would be removed by merge:\n"
+"%%s"
+msgstr ""
+"工作區中下列未追蹤的檔案將會因為合併動作而被刪除：\n"
+"%%s"
+
+#: unpack-trees.c
+#, c-format
+msgid ""
+"The following untracked working tree files would be removed by %s:\n"
+"%%sPlease move or remove them before you %s."
+msgstr ""
+"工作區中下列未追蹤的檔案將會因為 %s 動作而被刪除：\n"
+"%%s請在 %s 前移動或刪除。"
+
+#: unpack-trees.c
+#, c-format
+msgid ""
+"The following untracked working tree files would be removed by %s:\n"
+"%%s"
+msgstr ""
+"工作區中下列未追蹤的檔案將會因為 %s 動作而被刪除：\n"
+"%%s"
+
+#: unpack-trees.c
+#, c-format
+msgid ""
+"The following untracked working tree files would be overwritten by "
+"checkout:\n"
+"%%sPlease move or remove them before you switch branches."
+msgstr ""
+"工作區中下列未追蹤的檔案將會因為簽出動作而被覆蓋：\n"
+"%%s請在切換分支前移動或刪除。"
+
+#: unpack-trees.c
+#, c-format
+msgid ""
+"The following untracked working tree files would be overwritten by "
+"checkout:\n"
+"%%s"
+msgstr ""
+"工作區中下列未追蹤的檔案將會因為簽出動作而被覆蓋：\n"
+"%%s"
+
+#: unpack-trees.c
+#, c-format
+msgid ""
+"The following untracked working tree files would be overwritten by merge:\n"
+"%%sPlease move or remove them before you merge."
+msgstr ""
+"工作區中下列未追蹤的檔案將會因為合併動作而被覆蓋：\n"
+"%%s請在合併前移動或刪除。"
+
+#: unpack-trees.c
+#, c-format
+msgid ""
+"The following untracked working tree files would be overwritten by merge:\n"
+"%%s"
+msgstr ""
+"工作區中下列未追蹤的檔案將會因為合併動作而被覆蓋：\n"
+"%%s"
+
+#: unpack-trees.c
+#, c-format
+msgid ""
+"The following untracked working tree files would be overwritten by %s:\n"
+"%%sPlease move or remove them before you %s."
+msgstr ""
+"工作區中下列未追蹤的檔案將會因為 %s 動作而被覆蓋：\n"
+"%%s請在 %s 前移動或刪除。"
+
+#: unpack-trees.c
+#, c-format
+msgid ""
+"The following untracked working tree files would be overwritten by %s:\n"
+"%%s"
+msgstr ""
+"工作區中下列未追蹤的檔案將會因為 %s 動作而被覆蓋：\n"
+"%%s"
+
+#: unpack-trees.c
+#, c-format
+msgid "Entry '%s' overlaps with '%s'.  Cannot bind."
+msgstr "條目 '%s' 和 '%s' 重疊。無法合併。"
+
+#: unpack-trees.c
+#, c-format
+msgid ""
+"Cannot update submodule:\n"
+"%s"
+msgstr ""
+"無法更新子模組：\n"
+"%s"
+
+#: unpack-trees.c
+#, c-format
+msgid ""
+"The following paths are not up to date and were left despite sparse "
+"patterns:\n"
+"%s"
+msgstr ""
+"即使有稀疏簽出樣板，以下路徑不是最新且保留下來：\n"
+"%s"
+
+#: unpack-trees.c
+#, c-format
+msgid ""
+"The following paths are unmerged and were left despite sparse patterns:\n"
+"%s"
+msgstr ""
+"即使有稀疏簽出樣板，以下路徑未合併且保留下來：\n"
+"%s"
+
+#: unpack-trees.c
+#, c-format
+msgid ""
+"The following paths were already present and thus not updated despite sparse "
+"patterns:\n"
+"%s"
+msgstr ""
+"即使有稀疏簽出樣板，以下路徑已經存在而因此未更新：\n"
+"%s"
+
+#: unpack-trees.c
+#, c-format
+msgid "Aborting\n"
+msgstr "正在終止\n"
+
+#: unpack-trees.c
+#, c-format
+msgid ""
+"After fixing the above paths, you may want to run `git sparse-checkout "
+"reapply`.\n"
+msgstr "修正以上路徑後，您可能想要執行「git sparse-checkout reapply」。\n"
+
+#: unpack-trees.c
+msgid "Updating files"
+msgstr "正在更新檔案"
+
+#: unpack-trees.c
+msgid ""
+"the following paths have collided (e.g. case-sensitive paths\n"
+"on a case-insensitive filesystem) and only one from the same\n"
+"colliding group is in the working tree:\n"
+msgstr ""
+"以下路徑發生碰撞（如：在不區分大小寫的檔案系統上的區分大小寫的路徑），\n"
+"並且碰撞組中只有一個檔案存在工作區中：\n"
+
+#: unpack-trees.c
+msgid "Updating index flags"
+msgstr "正在更新索引旗標"
+
+#: unpack-trees.c
+#, c-format
+msgid "worktree and untracked commit have duplicate entries: %s"
+msgstr "工作區和未追蹤提交有重複項目：%s"
+
+#: upload-pack.c
+msgid "expected flush after fetch arguments"
+msgstr "在 fetch 引數應為一個 flush 包"
+
+#: urlmatch.c
+msgid "invalid URL scheme name or missing '://' suffix"
+msgstr "無效的 URL 方案名稱或遺失 '://' 後綴"
+
+#: urlmatch.c
+#, c-format
+msgid "invalid %XX escape sequence"
+msgstr "無效的 %XX 轉義序列"
+
+#: urlmatch.c
+msgid "missing host and scheme is not 'file:'"
+msgstr "缺少主機名稱且 URL 方案不是 'file:'"
+
+#: urlmatch.c
+msgid "a 'file:' URL may not have a port number"
+msgstr "一個 'file:' URL 不應該包含埠號"
+
+#: urlmatch.c
+msgid "invalid characters in host name"
+msgstr "主機名稱中包含無效的字元"
+
+#: urlmatch.c
+msgid "invalid port number"
+msgstr "無效的埠號"
+
+#: urlmatch.c
+msgid "invalid '..' path segment"
+msgstr "無效的 '..' 路徑區塊"
+
+#: walker.c
+msgid "Fetching objects"
+msgstr "正在抓取物件"
+
+#: worktree.c
+#, c-format
+msgid "'%s' at main working tree is not the repository directory"
+msgstr "在主工作區的 '%s' 不是版本庫目錄"
+
+#: worktree.c
+#, c-format
+msgid "'%s' file does not contain absolute path to the working tree location"
+msgstr "檔案 '%s' 不包含工作區的絕對路徑"
+
+#: worktree.c
+#, c-format
+msgid "'%s' is not a .git file, error code %d"
+msgstr "'%s' 不是一個 .git 檔案，錯誤碼 %d"
+
+#: worktree.c
+#, c-format
+msgid "'%s' does not point back to '%s'"
+msgstr "'%s' 沒有指回到 '%s'"
+
+#: worktree.c
+msgid "not a directory"
+msgstr "不是目錄"
+
+#: worktree.c
+msgid ".git is not a file"
+msgstr ".git 不是檔案"
+
+#: worktree.c
+msgid ".git file broken"
+msgstr ".git 檔案損毀"
+
+#: worktree.c
+msgid ".git file incorrect"
+msgstr ".git 檔案不正確"
+
+#: worktree.c
+msgid "not a valid path"
+msgstr "非有效路徑"
+
+#: worktree.c
+msgid "unable to locate repository; .git is not a file"
+msgstr "無法定位版本庫；.git 不是檔案"
+
+#: worktree.c
+msgid "unable to locate repository; .git file does not reference a repository"
+msgstr "無法定位版本庫：.git 檔案未指向版本庫"
+
+#: worktree.c
+msgid "unable to locate repository; .git file broken"
+msgstr "無法定位版本庫；.git 檔案損壞"
+
+#: worktree.c
+msgid "gitdir unreadable"
+msgstr "無法讀取 gitdir"
+
+#: worktree.c
+msgid "gitdir incorrect"
+msgstr "不正確的 gitdir"
+
+#: worktree.c
+msgid "not a valid directory"
+msgstr "非有效目錄"
+
+#: worktree.c
+msgid "gitdir file does not exist"
+msgstr "找不到 gitdir 檔案"
+
+#: worktree.c
+#, c-format
+msgid "unable to read gitdir file (%s)"
+msgstr "無法讀取 gitdir 檔案 (%s)"
+
+#: worktree.c
+#, c-format
+msgid "short read (expected %<PRIuMAX> bytes, read %<PRIuMAX>)"
+msgstr "讀取過短（預期有 %<PRIuMAX> 位元組，只讀到 %<PRIuMAX>）"
+
+#: worktree.c
+msgid "invalid gitdir file"
+msgstr "gitdir 檔案無效"
+
+#: worktree.c
+msgid "gitdir file points to non-existent location"
+msgstr "gitdir 檔案指向的位置不存在"
+
+#: worktree.c
+#, c-format
+msgid "unable to set %s in '%s'"
+msgstr "無法在「%2$s」設定 %1$s"
+
+#: worktree.c
+#, c-format
+msgid "unable to unset %s in '%s'"
+msgstr "無法取消在「%2$s」設定的 %1$s"
+
+#: worktree.c
+msgid "failed to set extensions.worktreeConfig setting"
+msgstr "無法設定 extensions.worktreeConfig 設定"
+
+#: wrapper.c
+#, c-format
+msgid "could not setenv '%s'"
+msgstr "無法 setenv '%s'"
+
+#: wrapper.c
+#, c-format
+msgid "unable to create '%s'"
+msgstr "不能建立 '%s'"
+
+#: wrapper.c
+#, c-format
+msgid "could not open '%s' for reading and writing"
+msgstr "無法開啟 '%s' 進行讀寫"
+
+#: wrapper.c
+#, c-format
+msgid "unable to access '%s'"
+msgstr "不能存取 '%s'"
+
+#: wrapper.c
+msgid "unable to get current working directory"
+msgstr "不能取得目前工作目錄"
+
+#: wt-status.c
+msgid "Unmerged paths:"
+msgstr "未合併的路徑："
+
+#  譯者：請維持前導空格
+#: wt-status.c
+msgid "  (use \"git restore --staged <file>...\" to unstage)"
+msgstr "  （使用 \"git restore --staged <檔案>...\" 以取消暫存）"
+
+#  譯者：請維持前導空格
+#: wt-status.c
+#, c-format
+msgid "  (use \"git restore --source=%s --staged <file>...\" to unstage)"
+msgstr "  （使用 \"git restore --source=%s --staged <檔案>...\" 以取消暫存）"
+
+#  譯者：請維持前導空格
+#: wt-status.c
+msgid "  (use \"git rm --cached <file>...\" to unstage)"
+msgstr "  （使用 \"git rm --cached <檔案>...\" 以取消暫存）"
+
+#  譯者：請維持前導空格
+#: wt-status.c
+msgid "  (use \"git add <file>...\" to mark resolution)"
+msgstr "  （使用 \"git add <檔案>...\" 標記解決方案）"
+
+#  譯者：請維持前導空格
+#: wt-status.c
+msgid "  (use \"git add/rm <file>...\" as appropriate to mark resolution)"
+msgstr "  （酌情使用 \"git add/rm <檔案>...\" 標記解決方案）"
+
+#  譯者：請維持前導空格
+#: wt-status.c
+msgid "  (use \"git rm <file>...\" to mark resolution)"
+msgstr "  （使用 \"git rm <檔案>...\" 標記解決方案）"
+
+#: wt-status.c
+msgid "Changes to be committed:"
+msgstr "要提交的變更："
+
+#: wt-status.c
+msgid "Changes not staged for commit:"
+msgstr "尚未暫存以備提交的變更："
+
+#  譯者：請維持前導空格
+#: wt-status.c
+msgid "  (use \"git add <file>...\" to update what will be committed)"
+msgstr "  （使用 \"git add <檔案>...\" 更新要提交的內容）"
+
+#  譯者：請維持前導空格
+#: wt-status.c
+msgid "  (use \"git add/rm <file>...\" to update what will be committed)"
+msgstr "  （使用 \"git add/rm <檔案>...\" 更新要提交的內容）"
+
+#  譯者：請維持前導空格
+#: wt-status.c
+msgid ""
+"  (use \"git restore <file>...\" to discard changes in working directory)"
+msgstr "  （使用 \"git restore <檔案>...\" 捨棄工作區的改動）"
+
+#  譯者：請維持前導空格
+#: wt-status.c
+msgid "  (commit or discard the untracked or modified content in submodules)"
+msgstr "  （提交或捨棄子模組中未追蹤或修改的內容）"
+
+#  譯者：請維持前導空格
+#: wt-status.c
+#, c-format
+msgid "  (use \"git %s <file>...\" to include in what will be committed)"
+msgstr "  （使用 \"git %s <檔案>...\" 以包含要提交的內容）"
+
+#: wt-status.c
+msgid "both deleted:"
+msgstr "雙方刪除："
+
+#: wt-status.c
+msgid "added by us:"
+msgstr "由我們新增："
+
+#: wt-status.c
+msgid "deleted by them:"
+msgstr "由他們刪除："
+
+#: wt-status.c
+msgid "added by them:"
+msgstr "由他們新增："
+
+#: wt-status.c
+msgid "deleted by us:"
+msgstr "由我們刪除："
+
+#: wt-status.c
+msgid "both added:"
+msgstr "雙方新增："
+
+#: wt-status.c
+msgid "both modified:"
+msgstr "雙方修改："
+
+#: wt-status.c
+msgid "new file:"
+msgstr "新檔案："
+
+#: wt-status.c
+msgid "copied:"
+msgstr "複製："
+
+#: wt-status.c
+msgid "deleted:"
+msgstr "刪除："
+
+#: wt-status.c
+msgid "modified:"
+msgstr "修改："
+
+#: wt-status.c
+msgid "renamed:"
+msgstr "重新命名："
+
+#: wt-status.c
+msgid "typechange:"
+msgstr "類型變更："
+
+#: wt-status.c
+msgid "unknown:"
+msgstr "未知："
+
+#: wt-status.c
+msgid "unmerged:"
+msgstr "未合併："
+
+#  譯者：末尾兩個位元組可能被刪減，如果翻譯為中文標點會出現半個漢字
+#: wt-status.c
+msgid "new commits, "
+msgstr "新提交, "
+
+#  譯者：末尾兩個位元組可能被刪減，如果翻譯為中文標點會出現半個漢字
+#: wt-status.c
+msgid "modified content, "
+msgstr "修改的內容, "
+
+#  譯者：末尾兩個位元組可能被刪減，如果翻譯為中文標點會出現半個漢字
+#: wt-status.c
+msgid "untracked content, "
+msgstr "未追蹤的內容, "
+
+#: wt-status.c
+#, c-format
+msgid "Your stash currently has %d entry"
+msgid_plural "Your stash currently has %d entries"
+msgstr[0] "您的儲藏區目前有 %d 條紀錄"
+
+#: wt-status.c
+msgid "Submodules changed but not updated:"
+msgstr "子模組已修改但尚未更新："
+
+#: wt-status.c
+msgid "Submodule changes to be committed:"
+msgstr "要提交的子模組變更："
+
+#: wt-status.c
+msgid ""
+"Do not modify or remove the line above.\n"
+"Everything below it will be ignored."
+msgstr ""
+"不要改動或刪除上面的一行。\n"
+"其下所有內容都將被忽略。"
+
+#: wt-status.c
+#, c-format
+msgid ""
+"\n"
+"It took %.2f seconds to compute the branch ahead/behind values.\n"
+"You can use '--no-ahead-behind' to avoid this.\n"
+msgstr ""
+"\n"
+"花了 %.2f 秒才計算出分支的領先/落後範圍。\n"
+"為避免，您可以使用 '--no-ahead-behind'。\n"
+
+#: wt-status.c
+msgid "You have unmerged paths."
+msgstr "您有尚未合併的路徑。"
+
+#  譯者：請維持前導空格
+#: wt-status.c
+msgid "  (fix conflicts and run \"git commit\")"
+msgstr "  （解決衝突並執行 \"git commit\"）"
+
+#  譯者：請維持前導空格
+#: wt-status.c
+msgid "  (use \"git merge --abort\" to abort the merge)"
+msgstr "  （使用 \"git merge --abort\" 終止合併）"
+
+#: wt-status.c
+msgid "All conflicts fixed but you are still merging."
+msgstr "所有衝突已解決但您仍處於合併中。"
+
+#  譯者：請維持前導空格
+#: wt-status.c
+msgid "  (use \"git commit\" to conclude merge)"
+msgstr "  （使用 \"git commit\" 結束合併）"
+
+#: wt-status.c
+msgid "You are in the middle of an am session."
+msgstr "您正處於 am 動作過程中。"
+
+#: wt-status.c
+msgid "The current patch is empty."
+msgstr "目前的修補檔為空。"
+
+#  譯者：請維持前導空格
+#: wt-status.c
+msgid "  (fix conflicts and then run \"git am --continue\")"
+msgstr "  （解決衝突，然後執行 \"git am --continue\"）"
+
+#  譯者：請維持前導空格
+#: wt-status.c
+msgid "  (use \"git am --skip\" to skip this patch)"
+msgstr "  （使用 \"git am --skip\" 略過此修補檔）"
+
+#  譯者：請維持前導空格
+#: wt-status.c
+msgid ""
+"  (use \"git am --allow-empty\" to record this patch as an empty commit)"
+msgstr "  （使用 \"git am --allow-empty\" 將目前修補檔錄製為空白提交）"
+
+#  譯者：請維持前導空格
+#: wt-status.c
+msgid "  (use \"git am --abort\" to restore the original branch)"
+msgstr "  （使用 \"git am --abort\" 復原原有分支）"
+
+#: wt-status.c
+msgid "git-rebase-todo is missing."
+msgstr "git-rebase-todo 遺失。"
+
+#: wt-status.c
+msgid "No commands done."
+msgstr "沒有指令被執行。"
+
+#: wt-status.c
+#, c-format
+msgid "Last command done (%<PRIuMAX> command done):"
+msgid_plural "Last commands done (%<PRIuMAX> commands done):"
+msgstr[0] "上次完成的命令（完成 %<PRIuMAX> 條指令）："
+
+#: wt-status.c
+#, c-format
+msgid "  (see more in file %s)"
+msgstr "  （更多參見檔案 %s）"
+
+#: wt-status.c
+msgid "No commands remaining."
+msgstr "未剩下任何指令。"
+
+#: wt-status.c
+#, c-format
+msgid "Next command to do (%<PRIuMAX> remaining command):"
+msgid_plural "Next commands to do (%<PRIuMAX> remaining commands):"
+msgstr[0] "接下來要執行的命令（剩餘 %<PRIuMAX> 條命令）："
+
+#  譯者：請維持前導空格
+#: wt-status.c
+msgid "  (use \"git rebase --edit-todo\" to view and edit)"
+msgstr "  （使用 \"git rebase --edit-todo\" 來檢視和編輯）"
+
+#: wt-status.c
+#, c-format
+msgid "You are currently rebasing branch '%s' on '%s'."
+msgstr "您在執行將分支 '%s' 重定基底到 '%s' 的動作。"
+
+#: wt-status.c
+msgid "You are currently rebasing."
+msgstr "您在執行重定基底動作。"
+
+#  譯者：請維持前導空格
+#: wt-status.c
+msgid "  (fix conflicts and then run \"git rebase --continue\")"
+msgstr "  （解決衝突，然後執行 \"git rebase --continue\"）"
+
+#  譯者：請維持前導空格
+#: wt-status.c
+msgid "  (use \"git rebase --skip\" to skip this patch)"
+msgstr "  （使用 \"git rebase --skip\" 略過此修補檔）"
+
+#  譯者：請維持前導空格
+#: wt-status.c
+msgid "  (use \"git rebase --abort\" to check out the original branch)"
+msgstr "  （使用 \"git rebase --abort\" 以簽出原有分支）"
+
+#  譯者：請維持前導空格
+#: wt-status.c
+msgid "  (all conflicts fixed: run \"git rebase --continue\")"
+msgstr "  （所有衝突已解決：執行 \"git rebase --continue\"）"
+
+#: wt-status.c
+#, c-format
+msgid ""
+"You are currently splitting a commit while rebasing branch '%s' on '%s'."
+msgstr "您在執行將分支 '%s' 重定基底到 '%s' 的動作時分割提交。"
+
+#: wt-status.c
+msgid "You are currently splitting a commit during a rebase."
+msgstr "您在執行重定基底動作時分割提交。"
+
+#  譯者：請維持前導空格
+#: wt-status.c
+msgid "  (Once your working directory is clean, run \"git rebase --continue\")"
+msgstr "  （一旦您工作目錄提交乾淨後，執行 \"git rebase --continue\"）"
+
+#: wt-status.c
+#, c-format
+msgid "You are currently editing a commit while rebasing branch '%s' on '%s'."
+msgstr "您在執行將分支 '%s' 重定基底到 '%s' 的動作時編輯提交。"
+
+#: wt-status.c
+msgid "You are currently editing a commit during a rebase."
+msgstr "您在執行重定基底動作時編輯提交。"
+
+#  譯者：請維持前導空格
+#: wt-status.c
+msgid "  (use \"git commit --amend\" to amend the current commit)"
+msgstr "  （使用 \"git commit --amend\" 修補目前提交）"
+
+#  譯者：請維持前導空格
+#: wt-status.c
+msgid ""
+"  (use \"git rebase --continue\" once you are satisfied with your changes)"
+msgstr "  （當您對您的修改滿意後執行 \"git rebase --continue\"）"
+
+#: wt-status.c
+msgid "Cherry-pick currently in progress."
+msgstr "揀選動作正在進行中。"
+
+#: wt-status.c
+#, c-format
+msgid "You are currently cherry-picking commit %s."
+msgstr "您在執行揀選提交 %s 的動作。"
+
+#  譯者：請維持前導空格
+#: wt-status.c
+msgid "  (fix conflicts and run \"git cherry-pick --continue\")"
+msgstr "  （解決衝突並執行 \"git cherry-pick --continue\"）"
+
+#  譯者：請維持前導空格
+#: wt-status.c
+msgid "  (run \"git cherry-pick --continue\" to continue)"
+msgstr "  （執行 \"git cherry-pick --continue\" 以繼續）"
+
+#  譯者：請維持前導空格
+#: wt-status.c
+msgid "  (all conflicts fixed: run \"git cherry-pick --continue\")"
+msgstr "  （所有衝突已解決：執行 \"git cherry-pick --continue\"）"
+
+#  譯者：請維持前導空格
+#: wt-status.c
+msgid "  (use \"git cherry-pick --skip\" to skip this patch)"
+msgstr "  （使用 \"git cherry-pick --skip\" 略過此修補檔）"
+
+#  譯者：請維持前導空格
+#: wt-status.c
+msgid "  (use \"git cherry-pick --abort\" to cancel the cherry-pick operation)"
+msgstr "  （使用 \"git cherry-pick --abort\" 以取消揀選動作）"
+
+#: wt-status.c
+msgid "Revert currently in progress."
+msgstr "還原動作正在進行中。"
+
+#: wt-status.c
+#, c-format
+msgid "You are currently reverting commit %s."
+msgstr "您在執行反轉提交 %s 的動作。"
+
+#  譯者：請維持前導空格
+#: wt-status.c
+msgid "  (fix conflicts and run \"git revert --continue\")"
+msgstr "  （解決衝突並執行 \"git revert --continue\"）"
+
+#  譯者：請維持前導空格
+#: wt-status.c
+msgid "  (run \"git revert --continue\" to continue)"
+msgstr "  （執行 \"git revert --continue\" 以繼續）"
+
+#  譯者：請維持前導空格
+#: wt-status.c
+msgid "  (all conflicts fixed: run \"git revert --continue\")"
+msgstr "  （所有衝突已解決：執行 \"git revert --continue\"）"
+
+#  譯者：請維持前導空格
+#: wt-status.c
+msgid "  (use \"git revert --skip\" to skip this patch)"
+msgstr "  （使用 \"git revert --skip\" 略過此修補檔）"
+
+#  譯者：請維持前導空格
+#: wt-status.c
+msgid "  (use \"git revert --abort\" to cancel the revert operation)"
+msgstr "  （使用 \"git revert --abort\" 以取消反轉提交動作）"
+
+#: wt-status.c
+#, c-format
+msgid "You are currently bisecting, started from branch '%s'."
+msgstr "您在執行從分支 '%s' 開始的二分搜尋動作。"
+
+#: wt-status.c
+msgid "You are currently bisecting."
+msgstr "您在執行二分搜尋動作。"
+
+#  譯者：請維持前導空格
+#: wt-status.c
+msgid "  (use \"git bisect reset\" to get back to the original branch)"
+msgstr "  （使用 \"git bisect reset\" 簽出原有分支）"
+
+#: wt-status.c
+msgid "You are in a sparse checkout."
+msgstr "您正在稀疏簽出的工作區中。"
+
+#: wt-status.c
+#, c-format
+msgid "You are in a sparse checkout with %d%% of tracked files present."
+msgstr "您處於稀疏簽出狀態，包含 %d%% 的追蹤檔案。"
+
+#: wt-status.c
+msgid "On branch "
+msgstr "位於分支 "
+
+#: wt-status.c
+msgid "interactive rebase in progress; onto "
+msgstr "互動式重定基底動作正在進行中；至 "
+
+#: wt-status.c
+msgid "rebase in progress; onto "
+msgstr "重定基底動作正在進行中；至 "
+
+#: wt-status.c
+msgid "HEAD detached at "
+msgstr "開頭指標分離於 "
+
+#: wt-status.c
+msgid "HEAD detached from "
+msgstr "開頭指標分離自 "
+
+#: wt-status.c
+msgid "Not currently on any branch."
+msgstr "目前不在任何分支上。"
+
+#: wt-status.c
+msgid "Initial commit"
+msgstr "初始提交"
+
+#: wt-status.c
+msgid "No commits yet"
+msgstr "尚無提交"
+
+#: wt-status.c
+msgid "Untracked files"
+msgstr "未追蹤的檔案"
+
+#: wt-status.c
+msgid "Ignored files"
+msgstr "忽略的檔案"
+
+#: wt-status.c
+#, c-format
+msgid ""
+"It took %.2f seconds to enumerate untracked files. 'status -uno'\n"
+"may speed it up, but you have to be careful not to forget to add\n"
+"new files yourself (see 'git help status')."
+msgstr ""
+"耗費了 %.2f 秒以枚舉未追蹤的檔案。'status -uno' 也許能提高速度，\n"
+"但您需要小心不要忘了新增新檔案（參見 'git help status'）。"
+
+#: wt-status.c
+#, c-format
+msgid "Untracked files not listed%s"
+msgstr "未追蹤的檔案沒有列出%s"
+
+#  譯者：中文字串拼接，可刪除前導空格
+#: wt-status.c
+msgid " (use -u option to show untracked files)"
+msgstr " （使用 -u 參數顯示未追蹤的檔案）"
+
+#: wt-status.c
+msgid "No changes"
+msgstr "沒有修改"
+
+#: wt-status.c
+#, c-format
+msgid "no changes added to commit (use \"git add\" and/or \"git commit -a\")\n"
+msgstr "修改尚未加入提交（使用 \"git add\" 和/或 \"git commit -a\"）\n"
+
+#: wt-status.c
+#, c-format
+msgid "no changes added to commit\n"
+msgstr "修改尚未加入提交\n"
+
+#: wt-status.c
+#, c-format
+msgid ""
+"nothing added to commit but untracked files present (use \"git add\" to "
+"track)\n"
+msgstr "提交為空，但是存在尚未追蹤的檔案（使用 \"git add\" 建立追蹤）\n"
+
+#: wt-status.c
+#, c-format
+msgid "nothing added to commit but untracked files present\n"
+msgstr "提交為空，但是存在尚未追蹤的檔案\n"
+
+#  譯者：中文字串拼接，可刪除前導空格
+#: wt-status.c
+#, c-format
+msgid "nothing to commit (create/copy files and use \"git add\" to track)\n"
+msgstr "無檔案要提交（建立/複製檔案並使用 \"git add\" 建立追蹤）\n"
+
+#: wt-status.c
+#, c-format
+msgid "nothing to commit\n"
+msgstr "無檔案要提交\n"
+
+#  譯者：中文字串拼接，可刪除前導空格
+#: wt-status.c
+#, c-format
+msgid "nothing to commit (use -u to show untracked files)\n"
+msgstr "無檔案要提交（使用 -u 顯示未追蹤的檔案）\n"
+
+#  譯者：中文字串拼接，可刪除前導空格
+#: wt-status.c
+#, c-format
+msgid "nothing to commit, working tree clean\n"
+msgstr "沒有要提交的檔案，工作區為乾淨狀態\n"
+
+#: wt-status.c
+msgid "No commits yet on "
+msgstr "尚無提交在 "
+
+#: wt-status.c
+msgid "HEAD (no branch)"
+msgstr "HEAD（非分支）"
+
+#: wt-status.c
+msgid "different"
+msgstr "不同"
+
+#  譯者：請維持句尾空格
+#: wt-status.c
+msgid "behind "
+msgstr "落後 "
+
+#: wt-status.c
+msgid "ahead "
+msgstr "領先 "
+
+#. TRANSLATORS: the action is e.g. "pull with rebase"
+#: wt-status.c
+#, c-format
+msgid "cannot %s: You have unstaged changes."
+msgstr "不能%s：您有未暫存的變更。"
+
+#: wt-status.c
+msgid "additionally, your index contains uncommitted changes."
+msgstr "另外，您的索引中包含未提交的變更。"
+
+#: wt-status.c
+#, c-format
+msgid "cannot %s: Your index contains uncommitted changes."
+msgstr "不能%s：您的索引中包含未提交的變更。"
+
+#: git-merge-octopus.sh
 msgid ""
 "Error: Your local changes to the following files would be overwritten by "
 "merge"
 msgstr "錯誤：您對下列檔案的本機修改將被合併動作覆蓋"
 
-#: git-merge-octopus.sh:61
+#: git-merge-octopus.sh
 msgid "Automated merge did not work."
 msgstr "自動合併未生效。"
 
-#: git-merge-octopus.sh:62
+#: git-merge-octopus.sh
 msgid "Should not be doing an octopus."
 msgstr "不應該執行章魚式合併。"
 
-#: git-merge-octopus.sh:73
+#: git-merge-octopus.sh
 #, sh-format
 msgid "Unable to find common commit with $pretty_name"
 msgstr "無法找到和 $pretty_name 的基礎提交"
 
-#: git-merge-octopus.sh:77
+#: git-merge-octopus.sh
 #, sh-format
 msgid "Already up to date with $pretty_name"
 msgstr "已經和 $pretty_name 保持一致"
 
-#: git-merge-octopus.sh:89
+#: git-merge-octopus.sh
 #, sh-format
 msgid "Fast-forwarding to: $pretty_name"
 msgstr "快轉至：$pretty_name"
 
-#: git-merge-octopus.sh:97
+#: git-merge-octopus.sh
 #, sh-format
 msgid "Trying simple merge with $pretty_name"
 msgstr "嘗試和 $pretty_name 的簡單合併"
 
-#: git-merge-octopus.sh:102
+#: git-merge-octopus.sh
 msgid "Simple merge did not work, trying automatic merge."
 msgstr "簡單合併未生效，嘗試自動合併。"
 
-#: git-sh-setup.sh:89 git-sh-setup.sh:94
+#: git-sh-setup.sh
 #, sh-format
 msgid "usage: $dashless $USAGE"
 msgstr "用法：$dashless $USAGE"
 
-#: git-sh-setup.sh:182
+#: git-sh-setup.sh
 #, sh-format
 msgid "Cannot chdir to $cdup, the toplevel of the working tree"
 msgstr "不能切換目錄到 $cdup，工作區的頂級目錄"
 
-#: git-sh-setup.sh:191 git-sh-setup.sh:198
+#: git-sh-setup.sh
 #, sh-format
 msgid "fatal: $program_name cannot be used without a working tree."
 msgstr "致命錯誤：$program_name 不能在沒有工作區的情況下使用。"
 
-#: git-sh-setup.sh:212
+#: git-sh-setup.sh
 msgid "Cannot rewrite branches: You have unstaged changes."
 msgstr "不能重寫分支：您有未暫存的變更。"
 
-#: git-sh-setup.sh:215
+#: git-sh-setup.sh
 #, sh-format
 msgid "Cannot $action: You have unstaged changes."
 msgstr "不能 $action：您有未暫存的變更。"
 
-#: git-sh-setup.sh:226
+#: git-sh-setup.sh
 #, sh-format
 msgid "Cannot $action: Your index contains uncommitted changes."
 msgstr "不能 $action：您的索引中包含未提交的變更。"
 
-#: git-sh-setup.sh:228
+#: git-sh-setup.sh
 msgid "Additionally, your index contains uncommitted changes."
 msgstr "而且您的索引中包含未提交的變更。"
 
-#: git-sh-setup.sh:348
+#: git-sh-setup.sh
 msgid "You need to run this command from the toplevel of the working tree."
 msgstr "您需要在工作區的頂級目錄中執行這個指令。"
 
-#: git-sh-setup.sh:353
+#: git-sh-setup.sh
 msgid "Unable to determine absolute path of git directory"
 msgstr "不能確定 git 目錄的絕對路徑"
 
 #. TRANSLATORS: you can adjust this to align "git add -i" status menu
-#: git-add--interactive.perl:212
+#: git-add--interactive.perl
 #, perl-format
 msgid "%12s %12s %s"
 msgstr "%12s %12s %s"
 
-#: git-add--interactive.perl:632
+#: git-add--interactive.perl
 #, perl-format
 msgid "touched %d path\n"
 msgid_plural "touched %d paths\n"
 msgstr[0] "建立了 %d 個路徑\n"
 
-#: git-add--interactive.perl:1056
+#: git-add--interactive.perl
 msgid ""
 "If the patch applies cleanly, the edited hunk will immediately be\n"
 "marked for staging."
 msgstr "如果修補檔能乾淨地套用，編輯區塊將立即標記為暫存。"
 
-#: git-add--interactive.perl:1059
+#: git-add--interactive.perl
 msgid ""
 "If the patch applies cleanly, the edited hunk will immediately be\n"
 "marked for stashing."
 msgstr "如果修補檔能乾淨地套用，編輯區塊將立即標記為儲藏。"
 
-#: git-add--interactive.perl:1062
+#: git-add--interactive.perl
 msgid ""
 "If the patch applies cleanly, the edited hunk will immediately be\n"
 "marked for unstaging."
 msgstr "如果修補檔能乾淨地套用，編輯區塊將立即標記為未暫存。"
 
-#: git-add--interactive.perl:1065 git-add--interactive.perl:1074
-#: git-add--interactive.perl:1080
+#: git-add--interactive.perl
 msgid ""
 "If the patch applies cleanly, the edited hunk will immediately be\n"
 "marked for applying."
 msgstr "如果修補檔能乾淨地套用，編輯區塊將立即標記為套用。"
 
-#: git-add--interactive.perl:1068 git-add--interactive.perl:1071
-#: git-add--interactive.perl:1077
+#: git-add--interactive.perl
 msgid ""
 "If the patch applies cleanly, the edited hunk will immediately be\n"
 "marked for discarding."
 msgstr "如果修補檔能乾淨地套用，編輯塊將立即標記為捨棄。"
 
-#: git-add--interactive.perl:1114
+#: git-add--interactive.perl
 #, perl-format
 msgid "failed to open hunk edit file for writing: %s"
 msgstr "為寫入開啟區塊編輯檔案失敗：%s"
 
-#: git-add--interactive.perl:1121
+#: git-add--interactive.perl
 #, perl-format
 msgid ""
 "---\n"
@@ -25704,12 +25957,12 @@ msgstr ""
 "要刪除 '%s' 開始的行，刪除它們。\n"
 "以 %s 開始的行將被刪除。\n"
 
-#: git-add--interactive.perl:1143
+#: git-add--interactive.perl
 #, perl-format
 msgid "failed to open hunk edit file for reading: %s"
 msgstr "無法讀取區塊編輯檔案：%s"
 
-#: git-add--interactive.perl:1253
+#: git-add--interactive.perl
 msgid ""
 "y - stage this hunk\n"
 "n - do not stage this hunk\n"
@@ -25723,7 +25976,7 @@ msgstr ""
 "a - 暫存此區塊和本檔案中後面的全部區塊\n"
 "d - 不暫存此區塊和本檔案中後面的全部區塊"
 
-#: git-add--interactive.perl:1259
+#: git-add--interactive.perl
 msgid ""
 "y - stash this hunk\n"
 "n - do not stash this hunk\n"
@@ -25737,7 +25990,7 @@ msgstr ""
 "a - 儲藏此區塊和本檔案中後面的全部區塊\n"
 "d - 不儲藏此區塊和本檔案中後面的全部區塊"
 
-#: git-add--interactive.perl:1265
+#: git-add--interactive.perl
 msgid ""
 "y - unstage this hunk\n"
 "n - do not unstage this hunk\n"
@@ -25751,7 +26004,7 @@ msgstr ""
 "a - 不暫存此區塊和本檔案中後面的全部區塊\n"
 "d - 不要不暫存此區塊和本檔案中後面的全部區塊"
 
-#: git-add--interactive.perl:1271
+#: git-add--interactive.perl
 msgid ""
 "y - apply this hunk to index\n"
 "n - do not apply this hunk to index\n"
@@ -25765,7 +26018,7 @@ msgstr ""
 "a - 套用此區塊和本檔案中後面的全部區塊\n"
 "d - 不要套用此區塊和本檔案中後面的全部區塊"
 
-#: git-add--interactive.perl:1277 git-add--interactive.perl:1295
+#: git-add--interactive.perl
 msgid ""
 "y - discard this hunk from worktree\n"
 "n - do not discard this hunk from worktree\n"
@@ -25779,7 +26032,7 @@ msgstr ""
 "a - 捨棄此區塊和本檔案中後面的全部區塊\n"
 "d - 不要捨棄此區塊和本檔案中後面的全部區塊"
 
-#: git-add--interactive.perl:1283
+#: git-add--interactive.perl
 msgid ""
 "y - discard this hunk from index and worktree\n"
 "n - do not discard this hunk from index and worktree\n"
@@ -25793,7 +26046,7 @@ msgstr ""
 "a - 捨棄此區塊和本檔案中後面的全部區塊\n"
 "d - 不要捨棄此區塊和本檔案中後面的全部區塊"
 
-#: git-add--interactive.perl:1289
+#: git-add--interactive.perl
 msgid ""
 "y - apply this hunk to index and worktree\n"
 "n - do not apply this hunk to index and worktree\n"
@@ -25807,7 +26060,7 @@ msgstr ""
 "a - 套用此區塊和本檔案中後面的全部區塊\n"
 "d - 不要套用此區塊和本檔案中後面的全部區塊"
 
-#: git-add--interactive.perl:1301
+#: git-add--interactive.perl
 msgid ""
 "y - apply this hunk to worktree\n"
 "n - do not apply this hunk to worktree\n"
@@ -25821,7 +26074,7 @@ msgstr ""
 "a - 套用此區塊和本檔案中後面的全部區塊\n"
 "d - 不要套用此區塊和本檔案中後面的全部區塊"
 
-#: git-add--interactive.perl:1316
+#: git-add--interactive.perl
 msgid ""
 "g - select a hunk to go to\n"
 "/ - search for a hunk matching the given regex\n"
@@ -25843,88 +26096,88 @@ msgstr ""
 "e - 手動編輯目前區塊\n"
 "? - 顯示說明\n"
 
-#: git-add--interactive.perl:1347
+#: git-add--interactive.perl
 msgid "The selected hunks do not apply to the index!\n"
 msgstr "選取區塊不能套用到索引！\n"
 
-#: git-add--interactive.perl:1362
+#: git-add--interactive.perl
 #, perl-format
 msgid "ignoring unmerged: %s\n"
 msgstr "忽略未套用的：%s\n"
 
-#: git-add--interactive.perl:1481
+#: git-add--interactive.perl
 #, perl-format
 msgid "Apply mode change to worktree [y,n,q,a,d%s,?]? "
 msgstr "將模式變更套用到工作區 [y,n,q,a,d%s,?]? "
 
-#: git-add--interactive.perl:1482
+#: git-add--interactive.perl
 #, perl-format
 msgid "Apply deletion to worktree [y,n,q,a,d%s,?]? "
 msgstr "將刪除變更套用到工作區 [y,n,q,a,d%s,?]? "
 
-#: git-add--interactive.perl:1483
+#: git-add--interactive.perl
 #, perl-format
 msgid "Apply addition to worktree [y,n,q,a,d%s,?]? "
 msgstr "將新增變更套用到工作區 [y,n,q,a,d%s,?]? "
 
-#: git-add--interactive.perl:1484
+#: git-add--interactive.perl
 #, perl-format
 msgid "Apply this hunk to worktree [y,n,q,a,d%s,?]? "
 msgstr "將此區塊套用到工作區 [y,n,q,a,d%s,?]? "
 
-#: git-add--interactive.perl:1601
+#: git-add--interactive.perl
 msgid "No other hunks to goto\n"
 msgstr "沒有其它可供跳轉的區塊\n"
 
-#: git-add--interactive.perl:1619
+#: git-add--interactive.perl
 #, perl-format
 msgid "Invalid number: '%s'\n"
 msgstr "無效數字：'%s'\n"
 
-#: git-add--interactive.perl:1624
+#: git-add--interactive.perl
 #, perl-format
 msgid "Sorry, only %d hunk available.\n"
 msgid_plural "Sorry, only %d hunks available.\n"
 msgstr[0] "對不起，只有 %d 個可用區塊。\n"
 
-#: git-add--interactive.perl:1659
+#: git-add--interactive.perl
 msgid "No other hunks to search\n"
 msgstr "沒有其它可供尋找的區塊\n"
 
-#: git-add--interactive.perl:1676
+#: git-add--interactive.perl
 #, perl-format
 msgid "Malformed search regexp %s: %s\n"
 msgstr "錯誤的常規表示式 %s：%s\n"
 
-#: git-add--interactive.perl:1686
+#: git-add--interactive.perl
 msgid "No hunk matches the given pattern\n"
 msgstr "沒有和提供模式相符合的區塊\n"
 
-#: git-add--interactive.perl:1698 git-add--interactive.perl:1720
+#: git-add--interactive.perl
 msgid "No previous hunk\n"
 msgstr "沒有上一個區塊\n"
 
-#: git-add--interactive.perl:1707 git-add--interactive.perl:1726
+#: git-add--interactive.perl
 msgid "No next hunk\n"
 msgstr "沒有下一個區塊\n"
 
-#: git-add--interactive.perl:1732
+#: git-add--interactive.perl
 msgid "Sorry, cannot split this hunk\n"
 msgstr "對不起，不能分割這個區塊\n"
 
-#: git-add--interactive.perl:1738
+#: git-add--interactive.perl
 #, perl-format
 msgid "Split into %d hunk.\n"
 msgid_plural "Split into %d hunks.\n"
 msgstr[0] "分割為 %d 塊。\n"
 
-#: git-add--interactive.perl:1748
+#: git-add--interactive.perl
 msgid "Sorry, cannot edit this hunk\n"
 msgstr "對不起，不能編輯這個區塊\n"
 
 #. TRANSLATORS: please do not translate the command names
 #. 'status', 'update', 'revert', etc.
-#: git-add--interactive.perl:1813
+#: git-add--interactive.perl
 msgid ""
 "status        - show paths with changes\n"
 "update        - add working tree state to the staged set of changes\n"
@@ -25941,56 +26194,53 @@ msgstr ""
 "diff          - 顯示 HEAD 和索引間差異\n"
 "add untracked - 新增未追蹤檔案的內容至暫存列表\n"
 
-#: git-add--interactive.perl:1830 git-add--interactive.perl:1842
-#: git-add--interactive.perl:1845 git-add--interactive.perl:1852
-#: git-add--interactive.perl:1855 git-add--interactive.perl:1862
-#: git-add--interactive.perl:1866 git-add--interactive.perl:1872
+#: git-add--interactive.perl
 msgid "missing --"
 msgstr "缺少 --"
 
-#: git-add--interactive.perl:1868
+#: git-add--interactive.perl
 #, perl-format
 msgid "unknown --patch mode: %s"
 msgstr "未知的 --patch 模式：%s"
 
-#: git-add--interactive.perl:1874 git-add--interactive.perl:1880
+#: git-add--interactive.perl
 #, perl-format
 msgid "invalid argument %s, expecting --"
 msgstr "無效的參數 %s，期望是 --"
 
-#: git-send-email.perl:159
+#: git-send-email.perl
 msgid "local zone differs from GMT by a non-minute interval\n"
 msgstr "本機時間和 GMT 有不到一分鐘間隔\n"
 
-#: git-send-email.perl:166 git-send-email.perl:172
+#: git-send-email.perl
 msgid "local time offset greater than or equal to 24 hours\n"
 msgstr "本機時間位移量大於等於 24 小時\n"
 
-#: git-send-email.perl:244
+#: git-send-email.perl
 #, perl-format
 msgid "fatal: command '%s' died with exit code %d"
 msgstr "致命錯誤：命令「%s」中止，結束碼：%d"
 
-#: git-send-email.perl:257
+#: git-send-email.perl
 msgid "the editor exited uncleanly, aborting everything"
 msgstr "編輯器非正常離開，終止所有動作"
 
-#: git-send-email.perl:346
+#: git-send-email.perl
 #, perl-format
 msgid ""
 "'%s' contains an intermediate version of the email you were composing.\n"
 msgstr "'%s' 包含您正在編寫的一個中間版本的信件。\n"
 
-#: git-send-email.perl:351
+#: git-send-email.perl
 #, perl-format
 msgid "'%s.final' contains the composed email.\n"
 msgstr "'%s.final' 包含編輯的信件。\n"
 
-#: git-send-email.perl:484
+#: git-send-email.perl
 msgid "--dump-aliases incompatible with other options\n"
 msgstr "--dump-aliases 和其它選項不相容\n"
 
-#: git-send-email.perl:561
+#: git-send-email.perl
 msgid ""
 "fatal: found configuration options for 'sendmail'\n"
 "git-send-email is configured with the sendemail.* options - note the 'e'.\n"
@@ -26000,47 +26250,47 @@ msgstr ""
 "git-send-email 已經以 sendemail.* 選項設定 - 注意裡面的 'e'。\n"
 "請將 sendemail.forbidSendmailVariables 設為 false 停用此檢查。\n"
 
-#: git-send-email.perl:566 git-send-email.perl:782
+#: git-send-email.perl
 msgid "Cannot run git format-patch from outside a repository\n"
 msgstr "不能在版本庫之外執行 git format-patch\n"
 
-#: git-send-email.perl:569
+#: git-send-email.perl
 msgid ""
 "`batch-size` and `relogin` must be specified together (via command-line or "
 "configuration option)\n"
 msgstr "`batch-size` 和 `relogin` 必須同時定義（透過指令列或者設定選項）\n"
 
-#: git-send-email.perl:582
+#: git-send-email.perl
 #, perl-format
 msgid "Unknown --suppress-cc field: '%s'\n"
 msgstr "未知的 --suppress-cc 欄位：'%s'\n"
 
-#: git-send-email.perl:613
+#: git-send-email.perl
 #, perl-format
 msgid "Unknown --confirm setting: '%s'\n"
 msgstr "未知的 --confirm 設定：'%s'\n"
 
-#: git-send-email.perl:653
+#: git-send-email.perl
 #, perl-format
 msgid "warning: sendmail alias with quotes is not supported: %s\n"
 msgstr "警告：不支援帶引號的 sendmail 別名：%s\n"
 
-#: git-send-email.perl:655
+#: git-send-email.perl
 #, perl-format
 msgid "warning: `:include:` not supported: %s\n"
 msgstr "警告：不支援 `:include:`：%s\n"
 
-#: git-send-email.perl:657
+#: git-send-email.perl
 #, perl-format
 msgid "warning: `/file` or `|pipe` redirection not supported: %s\n"
 msgstr "警告：不支援 `/file` 或 `|pipe` 重定向：%s\n"
 
-#: git-send-email.perl:662
+#: git-send-email.perl
 #, perl-format
 msgid "warning: sendmail line is not recognized: %s\n"
 msgstr "警告：不能識別的 sendmail 行：%s\n"
 
-#: git-send-email.perl:747
+#: git-send-email.perl
 #, perl-format
 msgid ""
 "File '%s' exists but it could also be the range of commits\n"
@@ -26055,12 +26305,12 @@ msgstr ""
 "    * 如果含義為一個檔案，使用 \"./%s\"，或者\n"
 "    * 如果含義為一個範圍，使用 --format-patch 選項。\n"
 
-#: git-send-email.perl:768
+#: git-send-email.perl
 #, perl-format
 msgid "Failed to opendir %s: %s"
 msgstr "無法開啟目錄 %s: %s"
 
-#: git-send-email.perl:803
+#: git-send-email.perl
 msgid ""
 "\n"
 "No patch files specified!\n"
@@ -26070,17 +26320,17 @@ msgstr ""
 "未指定修補檔案！\n"
 "\n"
 
-#: git-send-email.perl:816
+#: git-send-email.perl
 #, perl-format
 msgid "No subject line in %s?"
 msgstr "在 %s 中沒有標題行？"
 
-#: git-send-email.perl:827
+#: git-send-email.perl
 #, perl-format
 msgid "Failed to open for writing %s: %s"
 msgstr "為寫入開啟 %s 失敗: %s"
 
-#: git-send-email.perl:838
+#: git-send-email.perl
 msgid ""
 "Lines beginning in \"GIT:\" will be removed.\n"
 "Consider including an overall diffstat or table of contents\n"
@@ -26093,37 +26343,37 @@ msgstr ""
 "\n"
 "如果您不想傳送摘要，清除內容。\n"
 
-#: git-send-email.perl:862
+#: git-send-email.perl
 #, perl-format
 msgid "Failed to open %s: %s"
 msgstr "無法開啟 %s: %s"
 
-#: git-send-email.perl:879
+#: git-send-email.perl
 #, perl-format
 msgid "Failed to open %s.final: %s"
 msgstr "無法開啟 %s.final: %s"
 
-#: git-send-email.perl:922
+#: git-send-email.perl
 msgid "Summary email is empty, skipping it\n"
 msgstr "摘要信件為空，略過\n"
 
 #. TRANSLATORS: please keep [y/N] as is.
-#: git-send-email.perl:971
+#: git-send-email.perl
 #, perl-format
 msgid "Are you sure you want to use <%s> [y/N]? "
 msgstr "您是否要使用 <%s> [y/N]？ "
 
-#: git-send-email.perl:1026
+#: git-send-email.perl
 msgid ""
 "The following files are 8bit, but do not declare a Content-Transfer-"
 "Encoding.\n"
 msgstr "如下檔案含 8bit 內容，但沒有聲明一個 Content-Transfer-Encoding。\n"
 
-#: git-send-email.perl:1031
+#: git-send-email.perl
 msgid "Which 8bit encoding should I declare [UTF-8]? "
 msgstr "要宣告 8bit 為什麼樣的編碼格式 [UTF-8]？ "
 
-#: git-send-email.perl:1039
+#: git-send-email.perl
 #, perl-format
 msgid ""
 "Refusing to send because the patch\n"
@@ -26135,20 +26385,20 @@ msgstr ""
 "\t%s\n"
 "包含範本標題 '*** SUBJECT HERE ***'。如果確定想要傳送，使用參數 --force。\n"
 
-#: git-send-email.perl:1058
+#: git-send-email.perl
 msgid "To whom should the emails be sent (if anyone)?"
 msgstr "信件將要傳送給誰？"
 
-#: git-send-email.perl:1076
+#: git-send-email.perl
 #, perl-format
 msgid "fatal: alias '%s' expands to itself\n"
 msgstr "致命錯誤：別名 '%s' 展開後還是自己\n"
 
-#: git-send-email.perl:1088
+#: git-send-email.perl
 msgid "Message-ID to be used as In-Reply-To for the first email (if any)? "
 msgstr "（如果有）Message-ID 是否要被用作第一封信件的 In-Reply-To ？ "
 
-#: git-send-email.perl:1150 git-send-email.perl:1158
+#: git-send-email.perl
 #, perl-format
 msgid "error: unable to extract a valid address from: %s\n"
 msgstr "錯誤：不能從 %s 中擷取一個有效的信件位址\n"
@@ -26156,16 +26406,16 @@ msgstr "錯誤：不能從 %s 中擷取一個有效的信件位址\n"
 #. 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:1162
+#: git-send-email.perl
 msgid "What to do with this address? ([q]uit|[d]rop|[e]dit): "
 msgstr "如何處理這個位址？([q]uit|[d]rop|[e]dit)： "
 
-#: git-send-email.perl:1482
+#: git-send-email.perl
 #, perl-format
 msgid "CA path \"%s\" does not exist"
 msgstr "CA 路徑 \"%s\" 不存在"
 
-#: git-send-email.perl:1565
+#: git-send-email.perl
 msgid ""
 "    The Cc list above has been expanded by additional\n"
 "    addresses found in the patch commit message. By default\n"
@@ -26190,112 +26440,112 @@ msgstr ""
 #. 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:1580
+#: git-send-email.perl
 msgid "Send this email? ([y]es|[n]o|[e]dit|[q]uit|[a]ll): "
 msgstr "傳送這封信件？([y]es|[n]o|[e]dit|[q]uit|[a]ll): "
 
-#: git-send-email.perl:1583
+#: git-send-email.perl
 msgid "Send this email reply required"
 msgstr "傳送要求的信件回復"
 
-#: git-send-email.perl:1617
+#: git-send-email.perl
 msgid "The required SMTP server is not properly defined."
 msgstr "要求的 SMTP 伺服器未被正確定義。"
 
-#: git-send-email.perl:1664
+#: git-send-email.perl
 #, perl-format
 msgid "Server does not support STARTTLS! %s"
 msgstr "伺服器不支援 STARTTLS！%s"
 
-#: git-send-email.perl:1669 git-send-email.perl:1673
+#: git-send-email.perl
 #, perl-format
 msgid "STARTTLS failed! %s"
 msgstr "STARTTLS 失敗！%s"
 
-#: git-send-email.perl:1682
+#: git-send-email.perl
 msgid "Unable to initialize SMTP properly. Check config and use --smtp-debug."
 msgstr "無法正確地初始化 SMTP。檢查設定並使用 --smtp-debug。"
 
-#: git-send-email.perl:1700
+#: git-send-email.perl
 #, perl-format
 msgid "Failed to send %s\n"
 msgstr "無法傳送 %s\n"
 
-#: git-send-email.perl:1703
+#: git-send-email.perl
 #, perl-format
 msgid "Dry-Sent %s\n"
 msgstr "測試執行傳送 %s\n"
 
-#: git-send-email.perl:1703
+#: git-send-email.perl
 #, perl-format
 msgid "Sent %s\n"
 msgstr "正傳送 %s\n"
 
-#: git-send-email.perl:1705
+#: git-send-email.perl
 msgid "Dry-OK. Log says:\n"
 msgstr "測試執行成功。日誌說：\n"
 
-#: git-send-email.perl:1705
+#: git-send-email.perl
 msgid "OK. Log says:\n"
 msgstr "OK。日誌說：\n"
 
-#: git-send-email.perl:1724
+#: git-send-email.perl
 msgid "Result: "
 msgstr "結果： "
 
-#: git-send-email.perl:1727
+#: git-send-email.perl
 msgid "Result: OK\n"
 msgstr "結果：OK\n"
 
-#: git-send-email.perl:1744
+#: git-send-email.perl
 #, perl-format
 msgid "can't open file %s"
 msgstr "無法開啟檔案 %s"
 
-#: git-send-email.perl:1792 git-send-email.perl:1812
+#: git-send-email.perl
 #, perl-format
 msgid "(mbox) Adding cc: %s from line '%s'\n"
 msgstr "(mbox) 新增 cc：%s 自行 '%s'\n"
 
-#: git-send-email.perl:1798
+#: git-send-email.perl
 #, perl-format
 msgid "(mbox) Adding to: %s from line '%s'\n"
 msgstr "(mbox) 新增 to：%s 自行 '%s'\n"
 
-#: git-send-email.perl:1855
+#: git-send-email.perl
 #, perl-format
 msgid "(non-mbox) Adding cc: %s from line '%s'\n"
 msgstr "(non-mbox) 新增 cc：%s 自行 '%s'\n"
 
-#: git-send-email.perl:1890
+#: git-send-email.perl
 #, perl-format
 msgid "(body) Adding cc: %s from line '%s'\n"
 msgstr "(body) 新增 cc: %s 自行 '%s'\n"
 
-#: git-send-email.perl:2009
+#: git-send-email.perl
 #, perl-format
 msgid "(%s) Could not execute '%s'"
 msgstr "(%s) 不能執行 '%s'"
 
-#: git-send-email.perl:2016
+#: git-send-email.perl
 #, perl-format
 msgid "(%s) Adding %s: %s from: '%s'\n"
 msgstr "(%s) 新增 %s: %s 自：'%s'\n"
 
-#: git-send-email.perl:2020
+#: git-send-email.perl
 #, perl-format
 msgid "(%s) failed to close pipe to '%s'"
 msgstr "(%s) 無法關閉管道至 '%s'"
 
-#: git-send-email.perl:2050
+#: git-send-email.perl
 msgid "cannot send message as 7bit"
 msgstr "不能以 7bit 形式傳送訊息"
 
-#: git-send-email.perl:2058
+#: git-send-email.perl
 msgid "invalid transfer encoding"
 msgstr "無效的傳送編碼"
 
-#: git-send-email.perl:2100
+#: git-send-email.perl
 #, perl-format
 msgid ""
 "fatal: %s: rejected by %s hook\n"
@@ -26306,12 +26556,12 @@ msgstr ""
 "%s\n"
 "警告：修補檔未能傳送\n"
 
-#: git-send-email.perl:2110 git-send-email.perl:2163 git-send-email.perl:2173
+#: git-send-email.perl
 #, perl-format
 msgid "unable to open %s: %s\n"
 msgstr "不能開啟 %s：%s\n"
 
-#: git-send-email.perl:2113
+#: git-send-email.perl
 #, perl-format
 msgid ""
 "fatal: %s:%d is longer than 998 characters\n"
@@ -26320,1222 +26570,13 @@ msgstr ""
 "致命錯誤：%s:%d 的字元數超過 998\n"
 "警告：修補檔未能傳送\n"
 
-#: git-send-email.perl:2131
+#: git-send-email.perl
 #, 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:2135
+#: git-send-email.perl
 #, perl-format
 msgid "Do you really want to send %s? [y|N]: "
 msgstr "您真的要傳送 %s？[y|N]： "
-
-#, perl-format
-#~ msgid "fatal: %s: rejected by %s hook\n"
-#~ msgstr "致命錯誤：%s：被 %s 掛勾拒絕\n"
-
-#~ msgid "git archive --list"
-#~ msgstr "git archive --list"
-
-#, c-format
-#~ msgid "unknown value for --diff-merges: %s"
-#~ msgstr "--diff-merges 的值無效：%s"
-
-#, c-format
-#~ msgid "invalid value '%s' for lsrefs.unborn"
-#~ msgstr "lsrefs.unborn 的值「%s」無效"
-
-#~ msgid "backend for `git stash -p`"
-#~ msgstr "`git stash -p` 的後端"
-
-#, c-format
-#~ msgid "Invalid value for --empty: %s"
-#~ msgstr "傳入 --empty 的值無效：%s"
-
-#, c-format
-#~ msgid "Invalid value for --patch-format: %s"
-#~ msgstr "無效的 --patch-format 值：%s"
-
-#, c-format
-#~ msgid "Invalid value for --show-current-patch: %s"
-#~ msgstr "無效的 --show-current-patch 值：%s"
-
-#~ msgid ""
-#~ "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-new]"
-
-#~ msgid "git bisect--helper --bisect-next"
-#~ msgstr "git bisect--helper --bisect-next"
-
-#~ msgid "git bisect--helper --bisect-visualize"
-#~ msgstr "git bisect--helper --bisect-visualize"
-
-#, c-format
-#~ msgid "invalid color '%s' in color.blame.repeatedLines"
-#~ msgstr "設定 color.blame.repeatedLines 中的無效顏色 '%s'"
-
-#~ msgid "invalid value for blame.coloring"
-#~ msgstr "設定 blame.coloring 中的無效取值"
-
-#~ 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 | <類型> | --textconv | --filters) [--path=<路徑>] <物件>"
-
-#~ msgid "show object type"
-#~ msgstr "顯示物件類型"
-
-#~ msgid "exit with zero when there's no error"
-#~ msgstr "當沒有錯誤時離開並返回零"
-
-#~ msgid "show info and content of objects fed from the standard input"
-#~ msgstr "顯示從標準輸入提供的物件的訊息和內容"
-
-#~ msgid "show info about objects fed from the standard input"
-#~ msgstr "顯示從標準輸入提供的物件的訊息"
-
-#~ msgid "follow in-tree symlinks (used with --batch or --batch-check)"
-#~ msgstr "跟隨樹內符號連結（和 --batch 或 --batch-check 共用）"
-
-#~ msgid "show all objects with --batch or --batch-check"
-#~ msgstr "使用 --batch 或 --batch-check 參數顯示所有物件"
-
-#~ msgid "do not order --batch-all-objects output"
-#~ msgstr "不要對 --batch-all-objects 的輸出排序"
-
-#~ msgid "set up tracking mode (see git-pull(1))"
-#~ msgstr "設定追蹤模式（參見 git-pull(1)）"
-
-#~ msgid "Using both --reset-author and --author does not make sense"
-#~ msgstr "同時使用 --reset-author 和 --author 沒有意義"
-
-#~ msgid "Options --squash and --fixup cannot be used together"
-#~ msgstr "選項 --squash 和 --fixup 不能同時使用"
-
-#~ msgid "Only one of -c/-C/-F/--fixup can be used."
-#~ msgstr "只能用一個 -c/-C/-F/--fixup 選項。"
-
-#~ msgid "Option -m cannot be combined with -c/-C/-F."
-#~ msgstr "選項 -m 不能和 -c/-C/-F 同時使用。"
-
-#~ msgid ""
-#~ "Only one of --include/--only/--all/--interactive/--patch can be used."
-#~ msgstr "只能用一個 --include/--only/--all/--interactive/--patch 選項。"
-
-#~ msgid "git count-objects [-v] [-H | --human-readable]"
-#~ msgstr "git count-objects [-v] [-H | --human-readable]"
-
-#, c-format
-#~ msgid "configuration fetch.output contains invalid value %s"
-#~ msgstr "設定變數 fetch.output 包含無效值 %s"
-
-#~ msgid "--cached or --untracked cannot be used with --no-index"
-#~ msgstr "--cached 或 --untracked 不能與 --no-index 同時使用"
-
-#~ msgid "--untracked cannot be used with --cached"
-#~ msgstr "--untracked 不能與 --cached 一起使用"
-
-#~ msgid "git hash-object  --stdin-paths"
-#~ msgstr "git hash-object  --stdin-paths"
-
-#~ msgid "git help [-g|--guides]"
-#~ msgstr "git help [-g|--guides]"
-
-#~ msgid "git help [-c|--config]"
-#~ msgstr "git help [-c|--config]"
-
-#~ msgid "git mktag"
-#~ msgstr "git mktag"
-
-#~ msgid "git mktree [-z] [--missing] [--batch]"
-#~ msgstr "git mktree [-z] [--missing] [--batch]"
-
-#~ msgid "read from stdin"
-#~ msgstr "從標準輸入讀取"
-
-#~ msgid "git notes merge --commit [-v | -q]"
-#~ msgstr "git notes merge --commit [-v | -q]"
-
-#~ msgid "git notes merge --abort [-v | -q]"
-#~ msgstr "git notes merge --abort [-v | -q]"
-
-#~ msgid "git notes get-ref"
-#~ msgstr "git notes get-ref"
-
-#~ msgid "invalid value for --missing"
-#~ msgstr "選項 --missing 的值無效"
-
-#~ msgid "git prune-packed [-n | --dry-run] [-q | --quiet]"
-#~ msgstr "git prune-packed [-n | --dry-run] [-q | --quiet]"
-
-#, c-format
-#~ msgid "Invalid value for %s: %s"
-#~ msgstr "%s 的值無效：%s"
-
-#, c-format
-#~ msgid "Invalid value for pull.ff: %s"
-#~ msgstr "pull.ff 的取值無效：%s"
-
-#~ msgid "git rebase --continue | --abort | --skip | --edit-todo"
-#~ msgstr "git rebase --continue | --abort | --skip | --edit-todo"
-
-#, c-format
-#~ msgid "'%s' is not a valid timestamp"
-#~ msgstr "'%s' 不是一個有效的時間戳"
-
-#~ msgid "git reflog [ show | expire | delete | exists ]"
-#~ msgstr "git reflog [ show | expire | delete | exists ]"
-
-#~ msgid "git remote [-v | --verbose]"
-#~ msgstr "git remote [-v | --verbose]"
-
-#~ msgid "git replace [-f] --convert-graft-file"
-#~ msgstr "git replace [-f] --convert-graft-file"
-
-#, c-format
-#~ msgid ""
-#~ "\n"
-#~ "It 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"
-#~ msgstr ""
-#~ "\n"
-#~ "重設後，枚舉未暫存變更花費了 %.2f 秒。 您可以使用 '--quiet' 避免此情況。\n"
-#~ "將設定變數 reset.quiet 設定為 true 可使其成為預設值。\n"
-
-#~ msgid "git sparse-checkout list"
-#~ msgstr "git sparse-checkout list"
-
-#~ msgid "unable to upgrade repository format to enable worktreeConfig"
-#~ msgstr "無法升級版本庫格式，以致無法啟用 worktreeConfig"
-
-#~ msgid "git sparse-checkout init [--cone] [--[no-]sparse-index]"
-#~ msgstr "git sparse-checkout init [--cone] [--[no-]sparse-index]"
-
-#~ msgid "git sparse-checkout reapply [--[no-]cone] [--[no-]sparse-index]"
-#~ msgstr "git sparse-checkout reapply [--[no-]cone] [--[no-]sparse-index]"
-
-#~ msgid "git sparse-checkout disable"
-#~ msgstr "git sparse-checkout disable"
-
-#~ msgid ""
-#~ "the stash.useBuiltin support has been removed!\n"
-#~ "See its entry in 'git help config' for details."
-#~ msgstr ""
-#~ "對 stash.useBuiltin 的支援已被刪除！\n"
-#~ "詳見「git help config」中的條目。"
-
-#~ msgid "git stripspace [-s | --strip-comments]"
-#~ msgstr "git stripspace [-s | --strip-comments]"
-
-#~ msgid "git stripspace [-c | --comment-lines]"
-#~ msgstr "git stripspace [-c | --comment-lines]"
-
-#~ msgid "submodule--helper print-default-remote takes no arguments"
-#~ msgstr "submodule--helper print-default-remote 不帶參數"
-
-#~ msgid "git submodule--helper update-clone [--prefix=<path>] [<path>...]"
-#~ msgstr "git submodule--helper update-clone [--prefix=<路徑>] [<路徑>...]"
-
-#~ msgid "suppress output for update by rebase or merge"
-#~ msgstr "隱藏 rebase 或 merge 觸發之更新的輸出"
-
-#~ msgid "overrides update mode in case the repository is a fresh clone"
-#~ msgstr "如果版本庫是剛複製的，就覆蓋更新模式"
-
-#~ msgid "depth for shallow fetch"
-#~ msgstr "淺 fetch 的深度"
-
-#~ msgid "sha1"
-#~ msgstr "sha1"
-
-#~ msgid "SHA1 expected by superproject"
-#~ msgstr "上層專案預期應是 SHA1"
-
-#~ msgid "subsha1"
-#~ msgstr "subsha1"
-
-#~ msgid "SHA1 of submodule's HEAD"
-#~ msgstr "子模組 HEAD 的 SHA1"
-
-#~ msgid "git submodule--helper run-update-procedure [<options>] <path>"
-#~ msgstr "git submodule--helper run-update-procedure [<選項>] [<路徑>]"
-
-#~ msgid "git submodule--helper config --check-writeable"
-#~ msgstr "git submodule--helper config --check-writeable"
-
-#~ msgid "git update-server-info [--force]"
-#~ msgstr "git update-server-info [--force]"
-
-#~ msgid "Initialize and modify the sparse-checkout"
-#~ msgstr "初始化並修改稀疏簽出"
-
-#, sh-format
-#~ msgid ""
-#~ "Unable to find current ${remote_name}/${branch} revision in submodule "
-#~ "path '$sm_path'"
-#~ msgstr "無法在子模組路徑 '$sm_path' 中找到目前版本 ${remote_name}/${branch}"
-
-#, sh-format
-#~ msgid "Failed to recurse into submodule path '$displaypath'"
-#~ msgstr "無法遞迴進子模組路徑 '$displaypath'"
-
-#~ msgid "--index outside a repository"
-#~ msgstr "--index 在版本庫之外"
-
-#~ msgid "--cached outside a repository"
-#~ msgstr "--cached 在版本庫之外"
-
-#~ msgid "unrecognized input"
-#~ msgstr "無法識別的輸入"
-
-#, c-format
-#~ msgid "cannot read %s"
-#~ msgstr "不能讀取 %s"
-
-#~ msgid "Option --exec can only be used together with --remote"
-#~ msgstr "選項 --exec 只能和 --remote 同時使用"
-
-#, c-format
-#~ msgid ""
-#~ "Branch '%s' set up to track remote branch '%s' from '%s' by rebasing."
-#~ msgstr "分支 '%1$s' 設定為使用重定基底來追蹤來自 '%3$s' 的遠端分支 '%2$s'。"
-
-#, c-format
-#~ msgid "Branch '%s' set up to track remote branch '%s' from '%s'."
-#~ msgstr "分支 '%1$s' 設定為追蹤來自 '%3$s' 的遠端分支 '%2$s'。"
-
-#, c-format
-#~ msgid "Branch '%s' set up to track local branch '%s' by rebasing."
-#~ msgstr "分支 '%s' 設定為使用重定基底來追蹤本機分支 '%s'。"
-
-#, c-format
-#~ msgid "Branch '%s' set up to track local branch '%s'."
-#~ msgstr "分支 '%s' 設定為追蹤本機分支 '%s'。"
-
-#, c-format
-#~ msgid "Branch '%s' set up to track remote ref '%s' by rebasing."
-#~ msgstr "分支 '%s' 設定為使用重定基底來追蹤遠端引用 '%s'。"
-
-#, c-format
-#~ msgid "Branch '%s' set up to track remote ref '%s'."
-#~ msgstr "分支 '%s' 設定為追蹤遠端引用 '%s'。"
-
-#~ msgid "Cannot force update the current branch."
-#~ msgstr "無法強制更新目前分支。"
-
-#, c-format
-#~ msgid "Not a valid object name: '%s'."
-#~ msgstr "不是一個有效的物件名：'%s'。"
-
-#~ msgid "--name-only, --name-status, --check and -s are mutually exclusive"
-#~ msgstr "--name-only、--name-status、--check 和 -s 是互斥的"
-
-#~ msgid "-G, -S and --find-object are mutually exclusive"
-#~ msgstr "-G、-S 和 --find-object 是互斥的"
-
-#~ msgid ""
-#~ "-G and --pickaxe-regex are mutually exclusive, use --pickaxe-regex with -S"
-#~ msgstr "-G 和 --pickaxe-regex 互斥。請使用 --pickaxe-regex 搭配 -S"
-
-#~ 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"
-
-#~ msgid "--stateless-rpc requires multi_ack_detailed"
-#~ msgstr "--stateless-rpc 需要 multi_ack_detailed"
-
-#~ msgid "--left-only and --right-only are mutually exclusive"
-#~ msgstr "--left-only 和 --right-only 互斥"
-
-#, c-format
-#~ msgid "unrecognized %%(objectsize) argument: %s"
-#~ msgstr "無法識別的 %%(objectsize) 參數：%s"
-
-#, c-format
-#~ msgid "unrecognized %%(subject) argument: %s"
-#~ msgstr "無法識別的 %%(subject) 引數：%s"
-
-#, c-format
-#~ msgid "unrecognized %%(contents) argument: %s"
-#~ msgstr "無法識別的 %%(contents) 參數：%s"
-
-#, c-format
-#~ msgid "unrecognized %%(raw) argument: %s"
-#~ msgstr "無法識別的 %%(raw) 引數：%s"
-
-#, c-format
-#~ msgid "unrecognized argument '%s' in %%(%s)"
-#~ msgstr "無法識別 %%(%2$s) 中的 '%1$s' 參數"
-
-#, c-format
-#~ msgid "unrecognized %%(align) argument: %s"
-#~ msgstr "無法識別的 %%(align) 參數：%s"
-
-#, c-format
-#~ msgid "unrecognized %%(if) argument: %s"
-#~ msgstr "無法識別的 %%(if) 參數：%s"
-
-#, c-format
-#~ msgid "format: %%(if) atom used without a %%(then) atom"
-#~ msgstr "格式：使用了 %%(if) 元素而沒有 %%(then) 元素"
-
-#, c-format
-#~ msgid "format: %%(then) atom used without an %%(if) atom"
-#~ msgstr "格式：使用了 %%(then) 元素而沒有 %%(if) 元素"
-
-#, c-format
-#~ msgid "format: %%(else) atom used without a %%(then) atom"
-#~ msgstr "格式：使用了 %%(else) 元素而沒有 %%(then) 元素"
-
-#~ msgid "--unsorted-input is incompatible with --no-walk"
-#~ msgstr "--unsorted-input 與 --no-walk 不相容"
-
-#~ msgid "--no-walk is incompatible with --unsorted-input"
-#~ msgstr "--no-walk 與 --unsorted-input 不相容"
-
-#~ msgid "--dry-run is incompatible with --interactive/--patch"
-#~ msgstr "--dry-run 和 --interactive/--patch 不相容"
-
-#~ msgid "--pathspec-from-file is incompatible with --interactive/--patch"
-#~ msgstr "--pathspec-from-file 與 --interactive/--patch 不相容"
-
-#~ msgid "--pathspec-from-file is incompatible with --edit"
-#~ msgstr "--pathspec-from-file 與 --edit 不相容"
-
-#~ msgid "-A and -u are mutually incompatible"
-#~ msgstr "-A 和 -u 選項互斥"
-
-#~ msgid "Option --ignore-missing can only be used together with --dry-run"
-#~ msgstr "選項 --ignore-missing 只能和 --dry-run 同時使用"
-
-#~ msgid "--pathspec-from-file is incompatible with pathspec arguments"
-#~ msgstr "--pathspec-from-file 與 <路徑規格> 參數不相容"
-
-#~ msgid "--pathspec-file-nul requires --pathspec-from-file"
-#~ msgstr "--pathspec-file-nul 需要 --pathspec-from-file"
-
-#, c-format
-#~ msgid "--show-current-patch=%s is incompatible with --show-current-patch=%s"
-#~ msgstr "--show-current-patch=%s 與 --show-current-patch=%s 不相容"
-
-#~ msgid "--column and --verbose are incompatible"
-#~ msgstr "--column 和 --verbose 不相容"
-
-#, c-format
-#~ msgid "'%s' cannot be used with %s"
-#~ msgstr "'%s' 不能和 %s 同時使用"
-
-#~ msgid "set upstream info for new branch"
-#~ msgstr "為新的分支設定上游訊息"
-
-#, c-format
-#~ msgid "-%c, -%c and --orphan are mutually exclusive"
-#~ msgstr "-%c、-%c 和 --orphan 是互斥的"
-
-#~ msgid "-p and --overlay are mutually exclusive"
-#~ msgstr "-p 和 --overlay 互斥"
-
-#~ msgid "--pathspec-from-file is incompatible with --detach"
-#~ msgstr "--pathspec-from-file 與 --detach 不相容"
-
-#~ msgid "--pathspec-from-file is incompatible with --patch"
-#~ msgstr "--pathspec-from-file 與 --patch 不相容"
-
-#, c-format
-#~ msgid "--bare and --origin %s options are incompatible."
-#~ msgstr "--bare 和 --origin %s 選項不相容。"
-
-#~ msgid "--bare and --separate-git-dir are incompatible."
-#~ msgstr "--bare 和 --separate-git-dir 選項不相容。"
-
-#~ msgid "--pathspec-from-file with -a does not make sense"
-#~ msgstr "--pathspec-from-file 和 -a 同時使用沒有意義"
-
-#, c-format
-#~ msgid "cannot combine -m with --fixup:%s"
-#~ msgstr "-m 和 --fixup:%s 不可結合使用"
-
-#~ msgid "--long and -z are incompatible"
-#~ msgstr "--long 和 -z 選項不相容"
-
-#, c-format
-#~ msgid "cannot combine reword option of --fixup with path '%s'"
-#~ msgstr "不能將「%s」路徑與 --fixup 的 reword 選項結合"
-
-#~ msgid ""
-#~ "reword option of --fixup is mutually exclusive with --patch/--"
-#~ "interactive/--all/--include/--only"
-#~ msgstr ""
-#~ "--fixup 的 reword 選項與 --patch/--interactive/--all/--include/--only 互斥"
-
-#~ msgid "--long is incompatible with --abbrev=0"
-#~ msgstr "--long 與 --abbrev=0 不相容"
-
-#~ msgid "--dirty is incompatible with commit-ishes"
-#~ msgstr "--dirty 與提交號不相容"
-
-#~ msgid "--broken is incompatible with commit-ishes"
-#~ msgstr "--broken 與提交號不相容"
-
-#~ msgid "--stdin and --merge-base are mutually exclusive"
-#~ msgstr "--stdin 和 --merge-base 互斥"
-
-#~ msgid "--dir-diff is incompatible with --no-index"
-#~ msgstr "--dir-diff 和 --no-index 不相容"
-
-#~ msgid "--gui, --tool and --extcmd are mutually exclusive"
-#~ msgstr "--gui、--tool 和 --extcmd 互斥"
-
-#~ msgid "--anonymize-map without --anonymize does not make sense"
-#~ msgstr "缺少 --anonymize 的 --anonymize-map 沒有意義"
-
-#~ msgid "Cannot pass both --import-marks and --import-marks-if-exists"
-#~ msgstr "不能同時傳遞參數 --import-marks 和 --import-marks-if-exists"
-
-#, c-format
-#~ msgid "Refusing to fetch into current branch %s of non-bare repository"
-#~ msgstr "拒絕取得到非純版本庫的目前分支 %s"
-
-#~ msgid "--deepen and --depth are mutually exclusive"
-#~ msgstr "--deepen 和 --depth 是互斥的"
-
-#~ msgid "--depth and --unshallow cannot be used together"
-#~ msgstr "--depth 和 --unshallow 不能同時使用"
-
-#~ msgid "--fix-thin cannot be used without --stdin"
-#~ msgstr "--fix-thin 不能和 --stdin 同時使用"
-
-#~ msgid "--object-format cannot be used with --stdin"
-#~ msgstr "--object-format 不能和 --stdin 同時使用"
-
-#~ msgid "--separate-git-dir and --bare are mutually exclusive"
-#~ msgstr "--separate-git-dir 和 --bare 互斥"
-
-#~ msgid "-n and -k are mutually exclusive"
-#~ msgstr "-n 和 -k 互斥"
-
-#~ msgid "--subject-prefix/--rfc and -k are mutually exclusive"
-#~ msgstr "--subject-prefix/--rfc 和 -k 互斥"
-
-#~ msgid "--stdout, --output, and --output-directory are mutually exclusive"
-#~ msgstr "--stdout、--output 和 --output-directory 互斥"
-
-#~ msgid "--creation-factor requires --range-diff"
-#~ msgstr "--creation-factor 需要 --range-diff"
-
-#~ msgid "You cannot combine --squash with --no-ff."
-#~ msgstr "您不能將 --squash 和 --no-ff 組合使用。"
-
-#~ msgid "You cannot combine --squash with --commit."
-#~ msgstr "您不能將 --squash 和 --commit 組合使用。"
-
-#~ msgid "--keep-unreachable and --unpack-unreachable are incompatible"
-#~ msgstr "--keep-unreachable 和 --unpack-unreachable 不相容"
-
-#~ msgid "--delete is incompatible with --all, --mirror and --tags"
-#~ msgstr "--delete 與 --all、--mirror 及 --tags 不相容"
-
-#~ msgid "--all and --tags are incompatible"
-#~ msgstr "--all 和 --tags 不相容"
-
-#~ msgid "--mirror and --tags are incompatible"
-#~ msgstr "--mirror 和 --tags 不相容"
-
-#~ msgid "--all and --mirror are incompatible"
-#~ msgstr "--all 和 --mirror 不相容"
-
-#~ msgid "cannot combine '--keep-base' with '--onto'"
-#~ msgstr "不能將 '--keep-base' 和 '--onto' 組合使用"
-
-#~ msgid "cannot combine '--keep-base' with '--root'"
-#~ msgstr "不能將 '--keep-base' 和 '--root' 組合使用"
-
-#~ msgid "cannot combine '--root' with '--fork-point'"
-#~ msgstr "不能將 '--root' 和 '--fork-point' 結合使用"
-
-#~ msgid "cannot combine apply options with merge options"
-#~ msgstr "不能將 apply 套用選項與 merge 合併選項一起使用"
-
-#~ msgid "--keep-unreachable and -A are incompatible"
-#~ msgstr "--keep-unreachable 和 -A 不相容"
-
-#~ msgid "--geometric is incompatible with -A, -a"
-#~ msgstr "--geometric 與 -A, -a 不相容"
-
-#~ msgid "--patch is incompatible with --{hard,mixed,soft}"
-#~ msgstr "--patch 與 --{hard、mixed、soft} 選項不相容"
-
-#~ msgid "-N can only be used with --mixed"
-#~ msgstr "-N 只能和 --mixed 同時使用"
-
-#~ msgid "cannot combine --exclude-promisor-objects and --missing"
-#~ msgstr "不能同時使用 --exclude-promisor-objects 和 --missing 選項"
-
-#~ msgid "marked counting is incompatible with --objects"
-#~ msgstr "--objects 不相容標記計數 (marked counting)"
-
-#~ msgid ""
-#~ "--reflog is incompatible with --all, --remotes, --independent or --merge-"
-#~ "base"
-#~ msgstr "--reflog 和 --all、--remotes、--independent 或 --merge-base 不相容"
-
-#~ msgid "git sparse-checkout reapply"
-#~ msgstr "git sparse-checkout reapply"
-
-#~ msgid "--cached and --files are mutually exclusive"
-#~ msgstr "--cached 和 --files 互斥"
-
-#~ msgid "--branch and --default are mutually exclusive"
-#~ msgstr "--branch 與 --default 互斥"
-
-#~ msgid "--column and -n are incompatible"
-#~ msgstr "--column 和 -n 不相容"
-
-#~ msgid "--contains option is only allowed in list mode"
-#~ msgstr "--contains 選項只允許用在列表顯示模式"
-
-#~ msgid "--no-contains option is only allowed in list mode"
-#~ msgstr "--no-contains 選項只允許用在列表顯示模式"
-
-#~ msgid "--points-at option is only allowed in list mode"
-#~ msgstr "--points-at 選項只允許用在列表顯示模式"
-
-#~ msgid "--merged and --no-merged options are only allowed in list mode"
-#~ msgstr "--merged 和 --no-merged 選項只允許用在列表顯示模式"
-
-#~ msgid "only one -F or -m option is allowed."
-#~ msgstr "只允許一個 -F 或 -m 選項。"
-
-#~ msgid "-b, -B, and --detach are mutually exclusive"
-#~ msgstr "-b、-B 和 --detach 是互斥的"
-
-#~ msgid "--reason requires --lock"
-#~ msgstr "--reason 需要 --lock"
-
-#~ msgid "--verbose and --porcelain are mutually exclusive"
-#~ msgstr "--verbose 和 --porcelain 互斥"
-
-#, c-format
-#~ msgid "no directory given for --git-dir\n"
-#~ msgstr "沒有為 --git-dir 提供目錄\n"
-
-#, c-format
-#~ msgid "no directory given for --work-tree\n"
-#~ msgstr "沒有為 --work-tree 提供目錄\n"
-
-#~ msgid "--packfile requires --index-pack-args"
-#~ msgstr "--packfile 需要 --index-pack-args"
-
-#~ msgid "--index-pack-args can only be used with --packfile"
-#~ msgstr "--index-pack-args 只能與 --packfile 一起使用"
-
-#~ 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 "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 "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 spawn daemon in the background"
-#~ msgstr "無法在背景啟動 (spawn) 守護程式"
-
-#~ msgid "waitpid failed"
-#~ msgstr "waitpid 失敗"
-
-#~ 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 "無法寫入無狀態的分隔符號封包"
-
-#~ 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 "遠端伺服器傳送了無狀態的分隔符號"
-
-#~ msgid "--cached and --3way cannot be used together."
-#~ msgstr "--cached 和 --3way 不能同時使用。"
-
-#~ msgid "both"
-#~ msgstr "雙方"
-
-#~ msgid "one"
-#~ msgstr "一方"
-
-#~ msgid "Already up to date!"
-#~ msgstr "已經是最新的！"
-
-#~ msgid "Already up to date. Yeeah!"
-#~ msgstr "已經是最新的。耶！"
-
-#~ msgid "--batch-size option is only for 'repack' subcommand"
-#~ msgstr "--batch-size 選項僅用於 'repack' 子指令"
-
-#~ msgid "Percentage by which creation is weighted"
-#~ msgstr "建立權重的百分比"
-
-#~ msgid ""
-#~ "the rebase.useBuiltin support has been removed!\n"
-#~ "See its entry in 'git help config' for details."
-#~ msgstr ""
-#~ "對 rebase.useBuiltin 的支援已被刪除！\n"
-#~ "詳見 'git help config' 中的條目。"
-
-#~ msgid "%s: patch contains a line longer than 998 characters"
-#~ msgstr "%s：修補檔包含一個超過 998 字元的行"
-
-#~ msgid "repository contains replace objects; skipping commit-graph"
-#~ msgstr "版本庫有取代物件；跳過提交圖形"
-
-#~ msgid "repository contains (deprecated) grafts; skipping commit-graph"
-#~ msgstr "版本庫有（廢棄的）移植項目；跳過提交圖形"
-
-#~ msgid "repository is shallow; skipping commit-graph"
-#~ msgstr "版本庫是淺複製；忽略提交圖形"
-
-#~ msgid "commit-graph improper chunk offset %08x%08x"
-#~ msgstr "提交圖形不正確的區塊位移 %08x%08x"
-
-#~ msgid "commit-graph chunk id %08x appears multiple times"
-#~ msgstr "提交圖形區塊 id %08x 出現了多次"
-
-#~ msgid "invalid chunk offset (too large)"
-#~ msgstr "無效的區塊位移（太大）"
-
-#~ msgid "Writing chunks to multi-pack-index"
-#~ msgstr "寫入區塊至多包索引"
-
-#~ msgid "rev-list died"
-#~ msgstr "rev-list 終止"
-
-#~ msgid ""
-#~ "git bisect--helper --bisect-write [--no-log] <state> <revision> "
-#~ "<good_term> <bad_term>"
-#~ msgstr ""
-#~ "git bisect--helper --bisect-write [--no-log] <狀態> <版本> <好-術語> <壞-"
-#~ "術語>"
-
-#~ msgid ""
-#~ "git bisect--helper --bisect-check-and-set-terms <command> <good_term> "
-#~ "<bad_term>"
-#~ msgstr ""
-#~ "git bisect--helper --bisect-check-and-set-terms <指令> <好-術語> <壞-術語>"
-
-#~ msgid "git bisect--helper --bisect-auto-next"
-#~ msgstr "git bisect--helper --bisect-auto-next"
-
-#~ msgid "write out the bisection state in BISECT_LOG"
-#~ msgstr "將二分尋找的狀態寫入 BISECT_LOG"
-
-#~ msgid "check and set terms in a bisection state"
-#~ msgstr "在一個二分尋找狀態中檢查和設定術語"
-
-#~ msgid ""
-#~ "verify the next bisection state then checkout the next bisection commit"
-#~ msgstr "驗證下一個二分尋找狀態後，檢出下一個二分尋找提交"
-
-#~ msgid "--bisect-write requires either 4 or 5 arguments"
-#~ msgstr "--bisect-write 需要 4 或 5 個參數"
-
-#~ msgid "--check-and-set-terms requires 3 arguments"
-#~ msgstr "--check-and-set-terms 需要 3 個參數"
-
-#~ msgid "--bisect-auto-next requires 0 arguments"
-#~ msgstr "--bisect-auto-next 需要 0 個引數"
-
-#~ msgid "Force progress reporting"
-#~ msgstr "強制進度顯示"
-
-#~ msgid "Error deleting remote-tracking branch '%s'"
-#~ msgstr "無法刪除遠端追蹤分支 '%s'"
-
-#~ msgid "show parse tree for grep expression"
-#~ msgstr "顯示 grep 表達式的解析樹"
-
-#~ msgid "too many parameters"
-#~ msgstr "參數太多"
-
-#~ msgid "too few parameters"
-#~ msgstr "參數太少"
-
-#~ msgid "Recurse into nested submodules"
-#~ msgstr "遞迴進入嵌套子模組中"
-
-#~ msgid "too many params"
-#~ msgstr "太多參數"
-
-#~ msgid "Bad rev input: $arg"
-#~ msgstr "壞的輸入版本：$arg"
diff --git a/preload-index.c b/preload-index.c
index e5529a5863..100f7a374d 100644
--- a/preload-index.c
+++ b/preload-index.c
@@ -151,6 +151,12 @@ void preload_index(struct index_state *index,
 	}
 	stop_progress(&pd.progress);
 
+	if (pathspec) {
+		/* earlier we made deep copies for each thread to work with */
+		for (i = 0; i < threads; i++)
+			clear_pathspec(&data[i].pathspec);
+	}
+
 	trace_performance_leave("preload index");
 
 	trace2_data_intmax("index", NULL, "preload/sum_lstat", t2_sum_lstat);
diff --git a/prio-queue.c b/prio-queue.c
index d3f488cb05..d31b48e725 100644
--- a/prio-queue.c
+++ b/prio-queue.c
@@ -19,7 +19,7 @@ void prio_queue_reverse(struct prio_queue *queue)
 {
 	int i, j;
 
-	if (queue->compare != NULL)
+	if (queue->compare)
 		BUG("prio_queue_reverse() on non-LIFO queue");
 	for (i = 0; i < (j = (queue->nr - 1) - i); i++)
 		swap(queue, i, j);
diff --git a/promisor-remote.c b/promisor-remote.c
index db2ebdc66e..68f46f5ec7 100644
--- a/promisor-remote.c
+++ b/promisor-remote.c
@@ -22,7 +22,7 @@ static int fetch_objects(struct repository *repo,
 	child.git_cmd = 1;
 	child.in = -1;
 	if (repo != the_repository)
-		prepare_other_repo_env(&child.env_array, repo->gitdir);
+		prepare_other_repo_env(&child.env, repo->gitdir);
 	strvec_pushl(&child.args, "-c", "fetch.negotiationAlgorithm=noop",
 		     "fetch", remote_name, "--no-tags",
 		     "--no-write-fetch-head", "--recurse-submodules=no",
@@ -84,7 +84,7 @@ static void promisor_remote_move_to_tail(struct promisor_remote_config *config,
 					 struct promisor_remote *r,
 					 struct promisor_remote *previous)
 {
-	if (r->next == NULL)
+	if (!r->next)
 		return;
 
 	if (previous)
@@ -146,7 +146,7 @@ static void promisor_remote_init(struct repository *r)
 	if (r->promisor_remote_config)
 		return;
 	config = r->promisor_remote_config =
-		xcalloc(sizeof(*r->promisor_remote_config), 1);
+		xcalloc(1, sizeof(*r->promisor_remote_config));
 	config->promisors_tail = &config->promisors;
 
 	repo_config(r, promisor_remote_config, config);
diff --git a/range-diff.c b/range-diff.c
index b72eb9fdbe..f63b3ffc20 100644
--- a/range-diff.c
+++ b/range-diff.c
@@ -44,7 +44,7 @@ static int read_patches(const char *range, struct string_list *list,
 
 	strvec_pushl(&cp.args, "log", "--no-color", "-p", "--no-merges",
 		     "--reverse", "--date-order", "--decorate=no",
-		     "--no-prefix",
+		     "--no-prefix", "--submodule=short",
 		     /*
 		      * Choose indicators that are not used anywhere
 		      * else in diffs, but still look reasonable
@@ -596,6 +596,6 @@ int is_range_diff_range(const char *arg)
 	}
 
 	free(copy);
-	object_array_clear(&revs.pending);
+	release_revisions(&revs);
 	return negative > 0 && positive > 0;
 }
diff --git a/reachable.c b/reachable.c
index b9f4ad886e..aba63ebeb3 100644
--- a/reachable.c
+++ b/reachable.c
@@ -13,6 +13,7 @@
 #include "worktree.h"
 #include "object-store.h"
 #include "pack-bitmap.h"
+#include "pack-mtimes.h"
 
 struct connectivity_progress {
 	struct progress *progress;
@@ -60,9 +61,13 @@ static void mark_commit(struct commit *c, void *data)
 struct recent_data {
 	struct rev_info *revs;
 	timestamp_t timestamp;
+	report_recent_object_fn *cb;
+	int ignore_in_core_kept_packs;
 };
 
 static void add_recent_object(const struct object_id *oid,
+			      struct packed_git *pack,
+			      off_t offset,
 			      timestamp_t mtime,
 			      struct recent_data *data)
 {
@@ -103,13 +108,29 @@ static void add_recent_object(const struct object_id *oid,
 		die("unable to lookup %s", oid_to_hex(oid));
 
 	add_pending_object(data->revs, obj, "");
+	if (data->cb)
+		data->cb(obj, pack, offset, mtime);
+}
+
+static int want_recent_object(struct recent_data *data,
+			      const struct object_id *oid)
+{
+	if (data->ignore_in_core_kept_packs &&
+	    has_object_kept_pack(oid, IN_CORE_KEEP_PACKS))
+		return 0;
+	return 1;
 }
 
 static int add_recent_loose(const struct object_id *oid,
 			    const char *path, void *data)
 {
 	struct stat st;
-	struct object *obj = lookup_object(the_repository, oid);
+	struct object *obj;
+
+	if (!want_recent_object(data, oid))
+		return 0;
+
+	obj = lookup_object(the_repository, oid);
 
 	if (obj && obj->flags & SEEN)
 		return 0;
@@ -126,7 +147,7 @@ static int add_recent_loose(const struct object_id *oid,
 		return error_errno("unable to stat %s", oid_to_hex(oid));
 	}
 
-	add_recent_object(oid, st.st_mtime, data);
+	add_recent_object(oid, NULL, 0, st.st_mtime, data);
 	return 0;
 }
 
@@ -134,29 +155,49 @@ static int add_recent_packed(const struct object_id *oid,
 			     struct packed_git *p, uint32_t pos,
 			     void *data)
 {
-	struct object *obj = lookup_object(the_repository, oid);
+	struct object *obj;
+	timestamp_t mtime = p->mtime;
+
+	if (!want_recent_object(data, oid))
+		return 0;
+
+	obj = lookup_object(the_repository, oid);
 
 	if (obj && obj->flags & SEEN)
 		return 0;
-	add_recent_object(oid, p->mtime, data);
+	if (p->is_cruft) {
+		if (load_pack_mtimes(p) < 0)
+			die(_("could not load cruft pack .mtimes"));
+		mtime = nth_packed_mtime(p, pos);
+	}
+	add_recent_object(oid, p, nth_packed_object_offset(p, pos), mtime, data);
 	return 0;
 }
 
 int add_unseen_recent_objects_to_traversal(struct rev_info *revs,
-					   timestamp_t timestamp)
+					   timestamp_t timestamp,
+					   report_recent_object_fn *cb,
+					   int ignore_in_core_kept_packs)
 {
 	struct recent_data data;
+	enum for_each_object_flags flags;
 	int r;
 
 	data.revs = revs;
 	data.timestamp = timestamp;
+	data.cb = cb;
+	data.ignore_in_core_kept_packs = ignore_in_core_kept_packs;
 
 	r = for_each_loose_object(add_recent_loose, &data,
 				  FOR_EACH_OBJECT_LOCAL_ONLY);
 	if (r)
 		return r;
-	return for_each_packed_object(add_recent_packed, &data,
-				      FOR_EACH_OBJECT_LOCAL_ONLY);
+
+	flags = FOR_EACH_OBJECT_LOCAL_ONLY | FOR_EACH_OBJECT_PACK_ORDER;
+	if (ignore_in_core_kept_packs)
+		flags |= FOR_EACH_OBJECT_SKIP_IN_CORE_KEPT_PACKS;
+
+	return for_each_packed_object(add_recent_packed, &data, flags);
 }
 
 static int mark_object_seen(const struct object_id *oid,
@@ -217,7 +258,8 @@ void mark_reachable_objects(struct rev_info *revs, int mark_reflog,
 
 	if (mark_recent) {
 		revs->ignore_missing_links = 1;
-		if (add_unseen_recent_objects_to_traversal(revs, mark_recent))
+		if (add_unseen_recent_objects_to_traversal(revs, mark_recent,
+							   NULL, 0))
 			die("unable to mark recent objects");
 		if (prepare_revision_walk(revs))
 			die("revision walk setup failed");
diff --git a/reachable.h b/reachable.h
index 5df932ad8f..020a887b99 100644
--- a/reachable.h
+++ b/reachable.h
@@ -3,9 +3,16 @@
 
 struct progress;
 struct rev_info;
+struct object;
+struct packed_git;
+
+typedef void report_recent_object_fn(const struct object *, struct packed_git *,
+				     off_t, time_t);
 
 int add_unseen_recent_objects_to_traversal(struct rev_info *revs,
-					   timestamp_t timestamp);
+					   timestamp_t timestamp,
+					   report_recent_object_fn cb,
+					   int ignore_in_core_kept_packs);
 void mark_reachable_objects(struct rev_info *revs, int mark_reflog,
 			    timestamp_t mark_recent, struct progress *);
 
diff --git a/read-cache.c b/read-cache.c
index 4df97e185e..b09128b188 100644
--- a/read-cache.c
+++ b/read-cache.c
@@ -112,7 +112,7 @@ static const char *alternate_index_output;
 static void set_index_entry(struct index_state *istate, int nr, struct cache_entry *ce)
 {
 	if (S_ISSPARSEDIR(ce->ce_mode))
-		istate->sparse_index = 1;
+		istate->sparse_index = INDEX_COLLAPSED;
 
 	istate->cache[nr] = ce;
 	add_name_hash(istate, ce);
@@ -620,6 +620,11 @@ int index_name_pos(struct index_state *istate, const char *name, int namelen)
 	return index_name_stage_pos(istate, name, namelen, 0, EXPAND_SPARSE);
 }
 
+int index_name_pos_sparse(struct index_state *istate, const char *name, int namelen)
+{
+	return index_name_stage_pos(istate, name, namelen, 0, NO_EXPAND_SPARSE);
+}
+
 int index_entry_exists(struct index_state *istate, const char *name, int namelen)
 {
 	return index_name_stage_pos(istate, name, namelen, 0, NO_EXPAND_SPARSE) >= 0;
@@ -1856,7 +1861,7 @@ static int read_index_extension(struct index_state *istate,
 		break;
 	case CACHE_EXT_SPARSE_DIRECTORIES:
 		/* no content, only an indicator */
-		istate->sparse_index = 1;
+		istate->sparse_index = INDEX_COLLAPSED;
 		break;
 	default:
 		if (*ext < 'A' || 'Z' < *ext)
@@ -1944,8 +1949,6 @@ static struct cache_entry *create_from_disk(struct mem_pool *ce_mem_pool,
 	ce->ce_namelen = len;
 	ce->index = 0;
 	oidread(&ce->oid, ondisk->data);
-	memcpy(ce->name, name, len);
-	ce->name[len] = '\0';
 
 	if (expand_name_field) {
 		if (copy_len)
@@ -2260,6 +2263,20 @@ static unsigned long load_cache_entries_threaded(struct index_state *istate, con
 	return consumed;
 }
 
+static void set_new_index_sparsity(struct index_state *istate)
+{
+	/*
+	 * If the index's repo exists, mark it sparse according to
+	 * repo settings.
+	 */
+	if (istate->repo) {
+		prepare_repo_settings(istate->repo);
+		if (!istate->repo->settings.command_requires_full_index &&
+		    is_sparse_index_allowed(istate, 0))
+			istate->sparse_index = 1;
+	}
+}
+
 /* remember to discard_cache() before reading a different cache! */
 int do_read_index(struct index_state *istate, const char *path, int must_exist)
 {
@@ -2281,8 +2298,12 @@ int do_read_index(struct index_state *istate, const char *path, int must_exist)
 	istate->timestamp.nsec = 0;
 	fd = open(path, O_RDONLY);
 	if (fd < 0) {
-		if (!must_exist && errno == ENOENT)
+		if (!must_exist && errno == ENOENT) {
+			if (!istate->repo)
+				istate->repo = the_repository;
+			set_new_index_sparsity(istate);
 			return 0;
+		}
 		die_errno(_("%s: index file open failed"), path);
 	}
 
@@ -2459,15 +2480,15 @@ int read_index_from(struct index_state *istate, const char *path,
 				   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);
+		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);
+		free(base_path2);
 	}
 	if (!oideq(&split_index->base_oid, &split_index->base->oid))
 		die(_("broken index, expect %s in %s, got %s"),
@@ -3149,7 +3170,7 @@ static int do_write_locked_index(struct index_state *istate, struct lock_file *l
 				 unsigned flags)
 {
 	int ret;
-	int was_full = !istate->sparse_index;
+	int was_full = istate->sparse_index == INDEX_EXPANDED;
 
 	ret = convert_to_sparse(istate, 0);
 
diff --git a/ref-filter.c b/ref-filter.c
index 7838bd22b8..d3c90e5dbe 100644
--- a/ref-filter.c
+++ b/ref-filter.c
@@ -1261,7 +1261,7 @@ static void grab_date(const char *buf, struct atom_value *v, const char *atomnam
 	 * ":" means no format is specified, and use the default.
 	 */
 	formatp = strchr(atomname, ':');
-	if (formatp != NULL) {
+	if (formatp) {
 		formatp++;
 		parse_date_format(formatp, &date_mode);
 	}
@@ -1509,7 +1509,7 @@ static void fill_missing_values(struct atom_value *val)
 	int i;
 	for (i = 0; i < used_atom_cnt; i++) {
 		struct atom_value *v = &val[i];
-		if (v->s == NULL)
+		if (!v->s)
 			v->s = xstrdup("");
 	}
 }
@@ -1619,7 +1619,7 @@ static const char *rstrip_ref_components(const char *refname, int len)
 
 	while (remaining-- > 0) {
 		char *p = strrchr(start, '/');
-		if (p == NULL) {
+		if (!p) {
 			free((char *)to_free);
 			return xstrdup("");
 		} else
@@ -2392,6 +2392,7 @@ static void reach_filter(struct ref_array *array,
 		clear_commit_marks(merge_commit, ALL_REV_FLAGS);
 	}
 
+	release_revisions(&revs);
 	free(to_clear);
 }
 
diff --git a/reflog-walk.c b/reflog-walk.c
index 8ac4b284b6..7aa6595a51 100644
--- a/reflog-walk.c
+++ b/reflog-walk.c
@@ -8,7 +8,7 @@
 
 struct complete_reflogs {
 	char *ref;
-	const char *short_ref;
+	char *short_ref;
 	struct reflog_info {
 		struct object_id ooid, noid;
 		char *email;
@@ -51,9 +51,16 @@ static void free_complete_reflog(struct complete_reflogs *array)
 	}
 	free(array->items);
 	free(array->ref);
+	free(array->short_ref);
 	free(array);
 }
 
+static void complete_reflogs_clear(void *util, const char *str)
+{
+	struct complete_reflogs *array = util;
+	free_complete_reflog(array);
+}
+
 static struct complete_reflogs *read_complete_reflog(const char *ref)
 {
 	struct complete_reflogs *reflogs =
@@ -116,6 +123,21 @@ void init_reflog_walk(struct reflog_walk_info **info)
 	(*info)->complete_reflogs.strdup_strings = 1;
 }
 
+void reflog_walk_info_release(struct reflog_walk_info *info)
+{
+	size_t i;
+
+	if (!info)
+		return;
+
+	for (i = 0; i < info->nr; i++)
+		free(info->logs[i]);
+	string_list_clear_func(&info->complete_reflogs,
+			       complete_reflogs_clear);
+	free(info->logs);
+	free(info);
+}
+
 int add_reflog_for_walk(struct reflog_walk_info *info,
 		struct commit *commit, const char *name)
 {
diff --git a/reflog-walk.h b/reflog-walk.h
index e9e00ffd47..8076f10d9f 100644
--- a/reflog-walk.h
+++ b/reflog-walk.h
@@ -8,6 +8,7 @@ struct reflog_walk_info;
 struct date_mode;
 
 void init_reflog_walk(struct reflog_walk_info **info);
+void reflog_walk_info_release(struct reflog_walk_info *info);
 int add_reflog_for_walk(struct reflog_walk_info *info,
 			struct commit *commit, const char *name);
 void show_reflog_message(struct reflog_walk_info *info, int,
diff --git a/refs.c b/refs.c
index 9db66e9955..90bcb27168 100644
--- a/refs.c
+++ b/refs.c
@@ -1109,8 +1109,10 @@ int ref_transaction_create(struct ref_transaction *transaction,
 			   unsigned int flags, const char *msg,
 			   struct strbuf *err)
 {
-	if (!new_oid || is_null_oid(new_oid))
-		BUG("create called without valid new_oid");
+	if (!new_oid || is_null_oid(new_oid)) {
+		strbuf_addf(err, "'%s' has a null OID", refname);
+		return 1;
+	}
 	return ref_transaction_update(transaction, refname, new_oid,
 				      null_oid(), flags, msg, err);
 }
diff --git a/refs/ref-cache.c b/refs/ref-cache.c
index 3080ef944d..32afd8a40b 100644
--- a/refs/ref-cache.c
+++ b/refs/ref-cache.c
@@ -134,7 +134,7 @@ int search_ref_dir(struct ref_dir *dir, const char *refname, size_t len)
 	r = bsearch(&key, dir->entries, dir->nr, sizeof(*dir->entries),
 		    ref_entry_cmp_sslice);
 
-	if (r == NULL)
+	if (!r)
 		return -1;
 
 	return r - dir->entries;
diff --git a/reftable/blocksource.c b/reftable/blocksource.c
index 2605371c28..8331b34e82 100644
--- a/reftable/blocksource.c
+++ b/reftable/blocksource.c
@@ -15,7 +15,8 @@ https://developers.google.com/open-source/licenses/bsd
 
 static void strbuf_return_block(void *b, struct reftable_block *dest)
 {
-	memset(dest->data, 0xff, dest->len);
+	if (dest->len)
+		memset(dest->data, 0xff, dest->len);
 	reftable_free(dest->data);
 }
 
@@ -56,7 +57,8 @@ void block_source_from_strbuf(struct reftable_block_source *bs,
 
 static void malloc_return_block(void *b, struct reftable_block *dest)
 {
-	memset(dest->data, 0xff, dest->len);
+	if (dest->len)
+		memset(dest->data, 0xff, dest->len);
 	reftable_free(dest->data);
 }
 
@@ -85,7 +87,8 @@ static uint64_t file_size(void *b)
 
 static void file_return_block(void *b, struct reftable_block *dest)
 {
-	memset(dest->data, 0xff, dest->len);
+	if (dest->len)
+		memset(dest->data, 0xff, dest->len);
 	reftable_free(dest->data);
 }
 
diff --git a/reftable/stack_test.c b/reftable/stack_test.c
index 19fe4e2008..d0b717510f 100644
--- a/reftable/stack_test.c
+++ b/reftable/stack_test.c
@@ -35,7 +35,7 @@ static int count_dir_entries(const char *dirname)
 	DIR *dir = opendir(dirname);
 	int len = 0;
 	struct dirent *d;
-	if (dir == NULL)
+	if (!dir)
 		return 0;
 
 	while ((d = readdir(dir))) {
diff --git a/reftable/tree.c b/reftable/tree.c
index 82db7995dd..b8899e060a 100644
--- a/reftable/tree.c
+++ b/reftable/tree.c
@@ -16,7 +16,7 @@ struct tree_node *tree_search(void *key, struct tree_node **rootp,
 			      int insert)
 {
 	int res;
-	if (*rootp == NULL) {
+	if (!*rootp) {
 		if (!insert) {
 			return NULL;
 		} else {
@@ -50,7 +50,7 @@ void infix_walk(struct tree_node *t, void (*action)(void *arg, void *key),
 
 void tree_free(struct tree_node *t)
 {
-	if (t == NULL) {
+	if (!t) {
 		return;
 	}
 	if (t->left) {
diff --git a/reftable/writer.c b/reftable/writer.c
index 427f1317c6..2e322a5683 100644
--- a/reftable/writer.c
+++ b/reftable/writer.c
@@ -183,7 +183,7 @@ static void writer_index_hash(struct reftable_writer *w, struct strbuf *hash)
 	struct tree_node *node = tree_search(&want, &w->obj_index_tree,
 					     &obj_index_tree_node_compare, 0);
 	struct obj_index_tree_node *key = NULL;
-	if (node == NULL) {
+	if (!node) {
 		struct obj_index_tree_node empty = OBJ_INDEX_TREE_NODE_INIT;
 		key = reftable_malloc(sizeof(struct obj_index_tree_node));
 		*key = empty;
@@ -222,7 +222,7 @@ static int writer_add_record(struct reftable_writer *w,
 
 	strbuf_reset(&w->last_key);
 	strbuf_addbuf(&w->last_key, &key);
-	if (w->block_writer == NULL) {
+	if (!w->block_writer) {
 		writer_reinit_block_writer(w, reftable_record_type(rec));
 	}
 
@@ -263,7 +263,7 @@ int reftable_writer_add_ref(struct reftable_writer *w,
 	};
 	int err = 0;
 
-	if (ref->refname == NULL)
+	if (!ref->refname)
 		return REFTABLE_API_ERROR;
 	if (ref->update_index < w->min_update_index ||
 	    ref->update_index > w->max_update_index)
@@ -336,7 +336,7 @@ int reftable_writer_add_log(struct reftable_writer *w,
 	if (log->value_type == REFTABLE_LOG_DELETION)
 		return reftable_writer_add_log_verbatim(w, log);
 
-	if (log->refname == NULL)
+	if (!log->refname)
 		return REFTABLE_API_ERROR;
 
 	input_log_message = log->value.update.message;
@@ -545,7 +545,7 @@ static int writer_finish_public_section(struct reftable_writer *w)
 	uint8_t typ = 0;
 	int err = 0;
 
-	if (w->block_writer == NULL)
+	if (!w->block_writer)
 		return 0;
 
 	typ = block_writer_type(w->block_writer);
@@ -694,7 +694,7 @@ static int writer_flush_nonempty_block(struct reftable_writer *w)
 
 static int writer_flush_block(struct reftable_writer *w)
 {
-	if (w->block_writer == NULL)
+	if (!w->block_writer)
 		return 0;
 	if (w->block_writer->entries == 0)
 		return 0;
diff --git a/remote.c b/remote.c
index 42a4e7106e..b19e3a2f01 100644
--- a/remote.c
+++ b/remote.c
@@ -1,6 +1,7 @@
 #include "cache.h"
 #include "config.h"
 #include "remote.h"
+#include "urlmatch.h"
 #include "refs.h"
 #include "refspec.h"
 #include "object-store.h"
@@ -14,6 +15,7 @@
 #include "strvec.h"
 #include "commit-reach.h"
 #include "advice.h"
+#include "connect.h"
 
 enum map_direction { FROM_SRC, FROM_DST };
 
@@ -144,14 +146,12 @@ static void remote_clear(struct remote *remote)
 	free((char *)remote->name);
 	free((char *)remote->foreign_vcs);
 
-	for (i = 0; i < remote->url_nr; i++) {
+	for (i = 0; i < remote->url_nr; i++)
 		free((char *)remote->url[i]);
-	}
-	FREE_AND_NULL(remote->pushurl);
+	FREE_AND_NULL(remote->url);
 
-	for (i = 0; i < remote->pushurl_nr; i++) {
+	for (i = 0; i < remote->pushurl_nr; i++)
 		free((char *)remote->pushurl[i]);
-	}
 	FREE_AND_NULL(remote->pushurl);
 	free((char *)remote->receivepack);
 	free((char *)remote->uploadpack);
@@ -195,9 +195,6 @@ static struct branch *find_branch(struct remote_state *remote_state,
 	struct branches_hash_key lookup;
 	struct hashmap_entry lookup_entry, *e;
 
-	if (!len)
-		len = strlen(name);
-
 	lookup.str = name;
 	lookup.len = len;
 	hashmap_entry_init(&lookup_entry, memhash(name, len));
@@ -214,7 +211,8 @@ static void die_on_missing_branch(struct repository *repo,
 {
 	/* branch == NULL is always valid because it represents detached HEAD. */
 	if (branch &&
-	    branch != find_branch(repo->remote_state, branch->name, 0))
+	    branch != find_branch(repo->remote_state, branch->name,
+				  strlen(branch->name)))
 		die("branch %s was not found in the repository", branch->name);
 }
 
@@ -354,8 +352,12 @@ static int handle_config(const char *key, const char *value, void *cb)
 	struct remote_state *remote_state = cb;
 
 	if (parse_config_key(key, "branch", &name, &namelen, &subkey) >= 0) {
+		/* There is no subsection. */
 		if (!name)
 			return 0;
+		/* There is a subsection, but it is empty. */
+		if (!namelen)
+			return -1;
 		branch = make_branch(remote_state, name, namelen);
 		if (!strcmp(subkey, "remote")) {
 			return git_config_string(&branch->remote_name, key, value);
@@ -543,6 +545,8 @@ static const char *remotes_remote_for_branch(struct remote_state *remote_state,
 	}
 	if (explicit)
 		*explicit = 0;
+	if (remote_state->remotes_nr == 1)
+		return remote_state->remotes[0]->name;
 	return "origin";
 }
 
@@ -612,6 +616,50 @@ const char *remote_ref_for_branch(struct branch *branch, int for_push)
 	return NULL;
 }
 
+static void validate_remote_url(struct remote *remote)
+{
+	int i;
+	const char *value;
+	struct strbuf redacted = STRBUF_INIT;
+	int warn_not_die;
+
+	if (git_config_get_string_tmp("transfer.credentialsinurl", &value))
+		return;
+
+	if (!strcmp("warn", value))
+		warn_not_die = 1;
+	else if (!strcmp("die", value))
+		warn_not_die = 0;
+	else if (!strcmp("allow", value))
+		return;
+	else
+		die(_("unrecognized value transfer.credentialsInUrl: '%s'"), value);
+
+	for (i = 0; i < remote->url_nr; i++) {
+		struct url_info url_info = { 0 };
+
+		if (!url_normalize(remote->url[i], &url_info) ||
+		    !url_info.passwd_off)
+			goto loop_cleanup;
+
+		strbuf_reset(&redacted);
+		strbuf_add(&redacted, url_info.url, url_info.passwd_off);
+		strbuf_addstr(&redacted, "<redacted>");
+		strbuf_addstr(&redacted,
+			      url_info.url + url_info.passwd_off + url_info.passwd_len);
+
+		if (warn_not_die)
+			warning(_("URL '%s' uses plaintext credentials"), redacted.buf);
+		else
+			die(_("URL '%s' uses plaintext credentials"), redacted.buf);
+
+loop_cleanup:
+		free(url_info.url);
+	}
+
+	strbuf_release(&redacted);
+}
+
 static struct remote *
 remotes_remote_get_1(struct remote_state *remote_state, const char *name,
 		     const char *(*get_default)(struct remote_state *,
@@ -637,6 +685,9 @@ remotes_remote_get_1(struct remote_state *remote_state, const char *name,
 		add_url_alias(remote_state, ret, name);
 	if (!valid_remote(ret))
 		return NULL;
+
+	validate_remote_url(ret);
+
 	return ret;
 }
 
@@ -2172,6 +2223,7 @@ static int stat_branch_pair(const char *branch_name, const char *base,
 	clear_commit_marks(theirs, ALL_REV_FLAGS);
 
 	strvec_clear(&argv);
+	release_revisions(&revs);
 	return 1;
 }
 
@@ -2717,9 +2769,8 @@ void remote_state_clear(struct remote_state *remote_state)
 {
 	int i;
 
-	for (i = 0; i < remote_state->remotes_nr; i++) {
+	for (i = 0; i < remote_state->remotes_nr; i++)
 		remote_clear(remote_state->remotes[i]);
-	}
 	FREE_AND_NULL(remote_state->remotes);
 	remote_state->remotes_alloc = 0;
 	remote_state->remotes_nr = 0;
@@ -2727,3 +2778,101 @@ void remote_state_clear(struct remote_state *remote_state)
 	hashmap_clear_and_free(&remote_state->remotes_hash, struct remote, ent);
 	hashmap_clear_and_free(&remote_state->branches_hash, struct remote, ent);
 }
+
+/*
+ * Returns 1 if it was the last chop before ':'.
+ */
+static int chop_last_dir(char **remoteurl, int is_relative)
+{
+	char *rfind = find_last_dir_sep(*remoteurl);
+	if (rfind) {
+		*rfind = '\0';
+		return 0;
+	}
+
+	rfind = strrchr(*remoteurl, ':');
+	if (rfind) {
+		*rfind = '\0';
+		return 1;
+	}
+
+	if (is_relative || !strcmp(".", *remoteurl))
+		die(_("cannot strip one component off url '%s'"),
+			*remoteurl);
+
+	free(*remoteurl);
+	*remoteurl = xstrdup(".");
+	return 0;
+}
+
+char *relative_url(const char *remote_url, const char *url,
+		   const char *up_path)
+{
+	int is_relative = 0;
+	int colonsep = 0;
+	char *out;
+	char *remoteurl;
+	struct strbuf sb = STRBUF_INIT;
+	size_t len;
+
+	if (!url_is_local_not_ssh(url) || is_absolute_path(url))
+		return xstrdup(url);
+
+	len = strlen(remote_url);
+	if (!len)
+		BUG("invalid empty remote_url");
+
+	remoteurl = xstrdup(remote_url);
+	if (is_dir_sep(remoteurl[len-1]))
+		remoteurl[len-1] = '\0';
+
+	if (!url_is_local_not_ssh(remoteurl) || is_absolute_path(remoteurl))
+		is_relative = 0;
+	else {
+		is_relative = 1;
+		/*
+		 * Prepend a './' to ensure all relative
+		 * remoteurls start with './' or '../'
+		 */
+		if (!starts_with_dot_slash_native(remoteurl) &&
+		    !starts_with_dot_dot_slash_native(remoteurl)) {
+			strbuf_reset(&sb);
+			strbuf_addf(&sb, "./%s", remoteurl);
+			free(remoteurl);
+			remoteurl = strbuf_detach(&sb, NULL);
+		}
+	}
+	/*
+	 * When the url starts with '../', remove that and the
+	 * last directory in remoteurl.
+	 */
+	while (*url) {
+		if (starts_with_dot_dot_slash_native(url)) {
+			url += 3;
+			colonsep |= chop_last_dir(&remoteurl, is_relative);
+		} else if (starts_with_dot_slash_native(url))
+			url += 2;
+		else
+			break;
+	}
+	strbuf_reset(&sb);
+	strbuf_addf(&sb, "%s%s%s", remoteurl, colonsep ? ":" : "/", url);
+	if (ends_with(url, "/"))
+		strbuf_setlen(&sb, sb.len - 1);
+	free(remoteurl);
+
+	if (starts_with_dot_slash_native(sb.buf))
+		out = xstrdup(sb.buf + 2);
+	else
+		out = xstrdup(sb.buf);
+
+	if (!up_path || !is_relative) {
+		strbuf_release(&sb);
+		return out;
+	}
+
+	strbuf_reset(&sb);
+	strbuf_addf(&sb, "%s%s", up_path, out);
+	free(out);
+	return strbuf_detach(&sb, NULL);
+}
diff --git a/remote.h b/remote.h
index 4a1209ae2c..dd4402436f 100644
--- a/remote.h
+++ b/remote.h
@@ -409,4 +409,36 @@ int parseopt_push_cas_option(const struct option *, const char *arg, int unset);
 int is_empty_cas(const struct push_cas_option *);
 void apply_push_cas(struct push_cas_option *, struct remote *, struct ref *);
 
+/*
+ * The `url` argument is the URL that navigates to the submodule origin
+ * repo. When relative, this URL is relative to the superproject origin
+ * URL repo. The `up_path` argument, if specified, is the relative
+ * path that navigates from the submodule working tree to the superproject
+ * working tree. Returns the origin URL of the submodule.
+ *
+ * Return either an absolute URL or filesystem path (if the superproject
+ * origin URL is an absolute URL or filesystem path, respectively) or a
+ * relative file system path (if the superproject origin URL is a relative
+ * file system path).
+ *
+ * When the output is a relative file system path, the path is either
+ * relative to the submodule working tree, if up_path is specified, or to
+ * the superproject working tree otherwise.
+ *
+ * NEEDSWORK: This works incorrectly on the domain and protocol part.
+ * remote_url      url              outcome          expectation
+ * http://a.com/b  ../c             http://a.com/c   as is
+ * http://a.com/b/ ../c             http://a.com/c   same as previous line, but
+ *                                                   ignore trailing slash in url
+ * http://a.com/b  ../../c          http://c         error out
+ * http://a.com/b  ../../../c       http:/c          error out
+ * http://a.com/b  ../../../../c    http:c           error out
+ * http://a.com/b  ../../../../../c    .:c           error out
+ * http://a.com/b  http://d.org/e   http://d.org/e   as is
+ * NEEDSWORK: Given how chop_last_dir() works, this function is broken
+ * when a local part has a colon in its path component, too.
+ */
+char *relative_url(const char *remote_url, const char *url,
+		   const char *up_path);
+
 #endif
diff --git a/rerere.c b/rerere.c
index d26627c593..876ab435da 100644
--- a/rerere.c
+++ b/rerere.c
@@ -591,7 +591,7 @@ int rerere_remaining(struct repository *r, struct string_list *merge_rr)
 		else if (conflict_type == RESOLVED) {
 			struct string_list_item *it;
 			it = string_list_lookup(merge_rr, (const char *)e->name);
-			if (it != NULL) {
+			if (it) {
 				free_rerere_id(it);
 				it->util = RERERE_RESOLVED;
 			}
diff --git a/revision.c b/revision.c
index 7d435f8048..0c6e26cd9c 100644
--- a/revision.c
+++ b/revision.c
@@ -33,6 +33,7 @@
 #include "bloom.h"
 #include "json-writer.h"
 #include "list-objects-filter-options.h"
+#include "resolve-undo.h"
 
 volatile show_early_output_fn_t show_early_output;
 
@@ -606,6 +607,10 @@ static struct commit *one_relevant_parent(const struct rev_info *revs,
  *
  *   2. We saw anything except REV_TREE_NEW.
  */
+#define REV_TREE_SAME		0
+#define REV_TREE_NEW		1	/* Only new files */
+#define REV_TREE_OLD		2	/* Only files removed */
+#define REV_TREE_DIFFERENT	3	/* Mixed changes */
 static int tree_difference = REV_TREE_SAME;
 
 static void file_add_remove(struct diff_options *options,
@@ -1440,6 +1445,9 @@ static int limit_list(struct rev_info *revs)
 		if (revs->min_age != -1 && (commit->date > revs->min_age) &&
 		    !revs->line_level_traverse)
 			continue;
+		if (revs->max_age_as_filter != -1 &&
+			(commit->date < revs->max_age_as_filter) && !revs->line_level_traverse)
+			continue;
 		date = commit->date;
 		p = &commit_list_insert(commit, p)->next;
 
@@ -1456,10 +1464,9 @@ static int limit_list(struct rev_info *revs)
 	if (revs->left_only || revs->right_only)
 		limit_left_right(newlist, revs);
 
-	if (bottom) {
+	if (bottom)
 		limit_to_ancestry(bottom, newlist);
-		free_commit_list(bottom);
-	}
+	free_commit_list(bottom);
 
 	/*
 	 * Check if any commits have become TREESAME by some of their parents
@@ -1690,6 +1697,39 @@ static void add_cache_tree(struct cache_tree *it, struct rev_info *revs,
 
 }
 
+static void add_resolve_undo_to_pending(struct index_state *istate, struct rev_info *revs)
+{
+	struct string_list_item *item;
+	struct string_list *resolve_undo = istate->resolve_undo;
+
+	if (!resolve_undo)
+		return;
+
+	for_each_string_list_item(item, resolve_undo) {
+		const char *path = item->string;
+		struct resolve_undo_info *ru = item->util;
+		int i;
+
+		if (!ru)
+			continue;
+		for (i = 0; i < 3; i++) {
+			struct blob *blob;
+
+			if (!ru->mode[i] || !S_ISREG(ru->mode[i]))
+				continue;
+
+			blob = lookup_blob(revs->repo, &ru->oid[i]);
+			if (!blob) {
+				warning(_("resolve-undo records `%s` which is missing"),
+					oid_to_hex(&ru->oid[i]));
+				continue;
+			}
+			add_pending_object_with_path(revs, &blob->object, "",
+						     ru->mode[i], path);
+		}
+	}
+}
+
 static void do_add_index_objects_to_pending(struct rev_info *revs,
 					    struct index_state *istate,
 					    unsigned int flags)
@@ -1718,6 +1758,8 @@ static void do_add_index_objects_to_pending(struct rev_info *revs,
 		add_cache_tree(istate->cache_tree, revs, &path, flags);
 		strbuf_release(&path);
 	}
+
+	add_resolve_undo_to_pending(istate, revs);
 }
 
 void add_index_objects_to_pending(struct rev_info *revs, unsigned int flags)
@@ -1838,6 +1880,7 @@ void repo_init_revisions(struct repository *r,
 	revs->dense = 1;
 	revs->prefix = prefix;
 	revs->max_age = -1;
+	revs->max_age_as_filter = -1;
 	revs->min_age = -1;
 	revs->skip_count = -1;
 	revs->max_count = -1;
@@ -2218,6 +2261,9 @@ static int handle_revision_opt(struct rev_info *revs, int argc, const char **arg
 	} else if ((argcount = parse_long_opt("since", argv, &optarg))) {
 		revs->max_age = approxidate(optarg);
 		return argcount;
+	} else if ((argcount = parse_long_opt("since-as-filter", argv, &optarg))) {
+		revs->max_age_as_filter = approxidate(optarg);
+		return argcount;
 	} else if ((argcount = parse_long_opt("after", argv, &optarg))) {
 		revs->max_age = approxidate(optarg);
 		return argcount;
@@ -2833,7 +2879,7 @@ int setup_revisions(int argc, const char **argv, struct rev_info *revs, struct s
 	}
 	strvec_clear(&prune_data);
 
-	if (revs->def == NULL)
+	if (!revs->def)
 		revs->def = opt ? opt->def : NULL;
 	if (opt && opt->tweak)
 		opt->tweak(revs, opt);
@@ -2923,6 +2969,42 @@ int setup_revisions(int argc, const char **argv, struct rev_info *revs, struct s
 	return left;
 }
 
+static void release_revisions_cmdline(struct rev_cmdline_info *cmdline)
+{
+	unsigned int i;
+
+	for (i = 0; i < cmdline->nr; i++)
+		free((char *)cmdline->rev[i].name);
+	free(cmdline->rev);
+}
+
+static void release_revisions_mailmap(struct string_list *mailmap)
+{
+	if (!mailmap)
+		return;
+	clear_mailmap(mailmap);
+	free(mailmap);
+}
+
+static void release_revisions_topo_walk_info(struct topo_walk_info *info);
+
+void release_revisions(struct rev_info *revs)
+{
+	free_commit_list(revs->commits);
+	object_array_clear(&revs->pending);
+	object_array_clear(&revs->boundary_commits);
+	release_revisions_cmdline(&revs->cmdline);
+	list_objects_filter_release(&revs->filter);
+	clear_pathspec(&revs->prune_data);
+	date_mode_release(&revs->date_mode);
+	release_revisions_mailmap(revs->mailmap);
+	free_grep_patterns(&revs->grep_filter);
+	/* TODO (need to handle "no_free"): diff_free(&revs->diffopt) */
+	diff_free(&revs->pruning);
+	reflog_walk_info_release(revs->reflog_info);
+	release_revisions_topo_walk_info(revs->topo_walk_info);
+}
+
 static void add_child(struct rev_info *revs, struct commit *parent, struct commit *child)
 {
 	struct commit_list *l = xcalloc(1, sizeof(*l));
@@ -3433,17 +3515,22 @@ static void compute_indegrees_to_depth(struct rev_info *revs,
 		indegree_walk_step(revs);
 }
 
-static void reset_topo_walk(struct rev_info *revs)
+static void release_revisions_topo_walk_info(struct topo_walk_info *info)
 {
-	struct topo_walk_info *info = revs->topo_walk_info;
-
+	if (!info)
+		return;
 	clear_prio_queue(&info->explore_queue);
 	clear_prio_queue(&info->indegree_queue);
 	clear_prio_queue(&info->topo_queue);
 	clear_indegree_slab(&info->indegree);
 	clear_author_date_slab(&info->author_date);
+	free(info);
+}
 
-	FREE_AND_NULL(revs->topo_walk_info);
+static void reset_topo_walk(struct rev_info *revs)
+{
+	release_revisions_topo_walk_info(revs->topo_walk_info);
+	revs->topo_walk_info = NULL;
 }
 
 static void init_topo_walk(struct rev_info *revs)
@@ -3652,7 +3739,7 @@ static enum rewrite_result rewrite_one_1(struct rev_info *revs,
 			return rewrite_one_ok;
 		if (!p->parents)
 			return rewrite_one_noparents;
-		if ((p = one_relevant_parent(revs, p->parents)) == NULL)
+		if (!(p = one_relevant_parent(revs, p->parents)))
 			return rewrite_one_ok;
 		*pp = p;
 	}
@@ -3862,6 +3949,9 @@ enum commit_action get_commit_action(struct rev_info *revs, struct commit *commi
 	if (revs->min_age != -1 &&
 	    comparison_date(revs, commit) > revs->min_age)
 			return commit_ignore;
+	if (revs->max_age_as_filter != -1 &&
+	    comparison_date(revs, commit) < revs->max_age_as_filter)
+			return commit_ignore;
 	if (revs->min_parents || (revs->max_parents >= 0)) {
 		int n = commit_list_count(commit->parents);
 		if ((n < revs->min_parents) ||
@@ -4080,10 +4170,8 @@ static void create_boundary_commit_list(struct rev_info *revs)
 	 * boundary commits anyway.  (This is what the code has always
 	 * done.)
 	 */
-	if (revs->commits) {
-		free_commit_list(revs->commits);
-		revs->commits = NULL;
-	}
+	free_commit_list(revs->commits);
+	revs->commits = NULL;
 
 	/*
 	 * Put all of the actual boundary commits from revs->boundary_commits
@@ -4220,10 +4308,8 @@ struct commit *get_revision(struct rev_info *revs)
 		graph_update(revs->graph, c);
 	if (!c) {
 		free_saved_parents(revs);
-		if (revs->previous_parents) {
-			free_commit_list(revs->previous_parents);
-			revs->previous_parents = NULL;
-		}
+		free_commit_list(revs->previous_parents);
+		revs->previous_parents = NULL;
 	}
 	return c;
 }
diff --git a/revision.h b/revision.h
index 5bc59c7bfe..e576845cdd 100644
--- a/revision.h
+++ b/revision.h
@@ -263,6 +263,7 @@ struct rev_info {
 	int skip_count;
 	int max_count;
 	timestamp_t max_age;
+	timestamp_t max_age_as_filter;
 	timestamp_t min_age;
 	int min_parents;
 	int max_parents;
@@ -329,31 +330,24 @@ struct rev_info {
 	struct tmp_objdir *remerge_objdir;
 };
 
-int ref_excluded(struct string_list *, const char *path);
-void clear_ref_exclusion(struct string_list **);
-void add_ref_exclusion(struct string_list **, const char *exclude);
-
-
-#define REV_TREE_SAME		0
-#define REV_TREE_NEW		1	/* Only new files */
-#define REV_TREE_OLD		2	/* Only files removed */
-#define REV_TREE_DIFFERENT	3	/* Mixed changes */
-
-/* revision.c */
-typedef void (*show_early_output_fn_t)(struct rev_info *, struct commit_list *);
-extern volatile show_early_output_fn_t show_early_output;
-
-struct setup_revision_opt {
-	const char *def;
-	void (*tweak)(struct rev_info *, struct setup_revision_opt *);
-	unsigned int	assume_dashdash:1,
-			allow_exclude_promisor_objects:1;
-	unsigned revarg_opt;
-};
-
-#ifndef NO_THE_REPOSITORY_COMPATIBILITY_MACROS
-#define init_revisions(revs, prefix) repo_init_revisions(the_repository, revs, prefix)
-#endif
+/**
+ * Initialize the "struct rev_info" structure with a macro.
+ *
+ * This will not fully initialize a "struct rev_info", the
+ * repo_init_revisions() function needs to be called before
+ * setup_revisions() and any revision walking takes place.
+ *
+ * Use REV_INFO_INIT to make the "struct rev_info" safe for passing to
+ * release_revisions() when it's inconvenient (e.g. due to a "goto
+ * cleanup" pattern) to arrange for repo_init_revisions() to be called
+ * before release_revisions() is called.
+ *
+ * Initializing with this REV_INFO_INIT is redundant to invoking
+ * repo_init_revisions(). If repo_init_revisions() is guaranteed to be
+ * called before release_revisions() the "struct rev_info" can be left
+ * uninitialized.
+ */
+#define REV_INFO_INIT { 0 }
 
 /**
  * Initialize a rev_info structure with default values. The third parameter may
@@ -366,6 +360,9 @@ struct setup_revision_opt {
 void repo_init_revisions(struct repository *r,
 			 struct rev_info *revs,
 			 const char *prefix);
+#ifndef NO_THE_REPOSITORY_COMPATIBILITY_MACROS
+#define init_revisions(revs, prefix) repo_init_revisions(the_repository, revs, prefix)
+#endif
 
 /**
  * Parse revision information, filling in the `rev_info` structure, and
@@ -374,9 +371,22 @@ void repo_init_revisions(struct repository *r,
  * head of the argument list. The last parameter is used in case no
  * parameter given by the first two arguments.
  */
+struct setup_revision_opt {
+	const char *def;
+	void (*tweak)(struct rev_info *, struct setup_revision_opt *);
+	unsigned int	assume_dashdash:1,
+			allow_exclude_promisor_objects:1;
+	unsigned revarg_opt;
+};
 int setup_revisions(int argc, const char **argv, struct rev_info *revs,
 		    struct setup_revision_opt *);
 
+/**
+ * Free data allocated in a "struct rev_info" after it's been
+ * initialized with repo_init_revisions() or REV_INFO_INIT.
+ */
+void release_revisions(struct rev_info *revs);
+
 void parse_revision_opt(struct rev_info *revs, struct parse_opt_ctx_t *ctx,
 			const struct option *options,
 			const char * const usagestr[]);
@@ -418,6 +428,14 @@ void mark_trees_uninteresting_sparse(struct repository *r, struct oidset *trees)
 void show_object_with_name(FILE *, struct object *, const char *);
 
 /**
+ * Helpers to check if a "struct string_list" item matches with
+ * wildmatch().
+ */
+int ref_excluded(struct string_list *, const char *path);
+void clear_ref_exclusion(struct string_list **);
+void add_ref_exclusion(struct string_list **, const char *exclude);
+
+/**
  * This function can be used if you want to add commit objects as revision
  * information. You can use the `UNINTERESTING` object flag to indicate if
  * you want to include or exclude the given commit (and commits reachable
@@ -472,4 +490,10 @@ int rewrite_parents(struct rev_info *revs,
  */
 struct commit_list *get_saved_parents(struct rev_info *revs, const struct commit *commit);
 
+/**
+ * Global for the (undocumented) "--early-output" flag for "git log".
+ */
+typedef void (*show_early_output_fn_t)(struct rev_info *, struct commit_list *);
+extern volatile show_early_output_fn_t show_early_output;
+
 #endif
diff --git a/run-command.c b/run-command.c
index a8501e38ce..5ec3a46dcc 100644
--- a/run-command.c
+++ b/run-command.c
@@ -10,6 +10,7 @@
 #include "config.h"
 #include "packfile.h"
 #include "hook.h"
+#include "compat/nonblock.h"
 
 void child_process_init(struct child_process *child)
 {
@@ -20,7 +21,7 @@ void child_process_init(struct child_process *child)
 void child_process_clear(struct child_process *child)
 {
 	strvec_clear(&child->args);
-	strvec_clear(&child->env_array);
+	strvec_clear(&child->env);
 }
 
 struct child_to_clean {
@@ -646,7 +647,7 @@ static void trace_run_command(const struct child_process *cp)
 		sq_quote_buf_pretty(&buf, cp->dir);
 		strbuf_addch(&buf, ';');
 	}
-	trace_add_env(&buf, cp->env_array.v);
+	trace_add_env(&buf, cp->env.v);
 	if (cp->git_cmd)
 		strbuf_addstr(&buf, " git");
 	sq_quote_argv_pretty(&buf, cp->args.v);
@@ -751,7 +752,7 @@ fail_pipe:
 		set_cloexec(null_fd);
 	}
 
-	childenv = prep_childenv(cmd->env_array.v);
+	childenv = prep_childenv(cmd->env.v);
 	atfork_prepare(&as);
 
 	/*
@@ -914,8 +915,9 @@ end_of_spawn:
 	else if (cmd->use_shell)
 		cmd->args.v = prepare_shell_cmd(&nargv, sargv);
 
-	cmd->pid = mingw_spawnvpe(cmd->args.v[0], cmd->args.v, (char**) cmd->env_array.v,
-			cmd->dir, fhin, fhout, fherr);
+	cmd->pid = mingw_spawnvpe(cmd->args.v[0], cmd->args.v,
+				  (char**) cmd->env.v,
+				  cmd->dir, fhin, fhout, fherr);
 	failed_errno = errno;
 	if (cmd->pid < 0 && (!cmd->silent_exec_failure || errno != ENOENT))
 		error_errno("cannot spawn %s", cmd->args.v[0]);
@@ -983,7 +985,8 @@ int finish_command(struct child_process *cmd)
 int finish_command_in_signal(struct child_process *cmd)
 {
 	int ret = wait_or_whine(cmd->pid, cmd->args.v[0], 1);
-	trace2_child_exit(cmd, ret);
+	if (ret != -1)
+		trace2_child_exit(cmd, ret);
 	return ret;
 }
 
@@ -1031,7 +1034,7 @@ int run_command_v_opt_cd_env_tr2(const char **argv, int opt, const char *dir,
 	cmd.close_object_store = opt & RUN_CLOSE_OBJECT_STORE ? 1 : 0;
 	cmd.dir = dir;
 	if (env)
-		strvec_pushv(&cmd.env_array, (const char **)env);
+		strvec_pushv(&cmd.env, (const char **)env);
 	cmd.trace2_child_class = tr2_class;
 	return run_command(&cmd);
 }
@@ -1362,12 +1365,25 @@ static int pump_io_round(struct io_pump *slots, int nr, struct pollfd *pfd)
 			continue;
 
 		if (io->type == POLLOUT) {
-			ssize_t len = xwrite(io->fd,
-					     io->u.out.buf, io->u.out.len);
+			ssize_t len;
+
+			/*
+			 * Don't use xwrite() here. It loops forever on EAGAIN,
+			 * and we're in our own poll() loop here.
+			 *
+			 * Note that we lose xwrite()'s handling of MAX_IO_SIZE
+			 * and EINTR, so we have to implement those ourselves.
+			 */
+			len = write(io->fd, io->u.out.buf,
+				    io->u.out.len <= MAX_IO_SIZE ?
+				    io->u.out.len : MAX_IO_SIZE);
 			if (len < 0) {
-				io->error = errno;
-				close(io->fd);
-				io->fd = -1;
+				if (errno != EINTR && errno != EAGAIN &&
+				    errno != ENOSPC) {
+					io->error = errno;
+					close(io->fd);
+					io->fd = -1;
+				}
 			} else {
 				io->u.out.buf += len;
 				io->u.out.len -= len;
@@ -1436,6 +1452,15 @@ int pipe_command(struct child_process *cmd,
 		return -1;
 
 	if (in) {
+		if (enable_pipe_nonblock(cmd->in) < 0) {
+			error_errno("unable to make pipe non-blocking");
+			close(cmd->in);
+			if (out)
+				close(cmd->out);
+			if (err)
+				close(cmd->err);
+			return -1;
+		}
 		io[nr].fd = cmd->in;
 		io[nr].type = POLLOUT;
 		io[nr].u.out.buf = in;
@@ -1471,6 +1496,7 @@ enum child_state {
 	GIT_CP_WAIT_CLEANUP,
 };
 
+int run_processes_parallel_ungroup;
 struct parallel_processes {
 	void *data;
 
@@ -1494,6 +1520,7 @@ struct parallel_processes {
 	struct pollfd *pfd;
 
 	unsigned shutdown : 1;
+	unsigned ungroup : 1;
 
 	int output_owner;
 	struct strbuf buffered_output; /* of finished children */
@@ -1537,7 +1564,7 @@ static void pp_init(struct parallel_processes *pp,
 		    get_next_task_fn get_next_task,
 		    start_failure_fn start_failure,
 		    task_finished_fn task_finished,
-		    void *data)
+		    void *data, int ungroup)
 {
 	int i;
 
@@ -1559,15 +1586,21 @@ static void pp_init(struct parallel_processes *pp,
 	pp->nr_processes = 0;
 	pp->output_owner = 0;
 	pp->shutdown = 0;
+	pp->ungroup = ungroup;
 	CALLOC_ARRAY(pp->children, n);
-	CALLOC_ARRAY(pp->pfd, n);
+	if (pp->ungroup)
+		pp->pfd = NULL;
+	else
+		CALLOC_ARRAY(pp->pfd, n);
 	strbuf_init(&pp->buffered_output, 0);
 
 	for (i = 0; i < n; i++) {
 		strbuf_init(&pp->children[i].err, 0);
 		child_process_init(&pp->children[i].process);
-		pp->pfd[i].events = POLLIN | POLLHUP;
-		pp->pfd[i].fd = -1;
+		if (pp->pfd) {
+			pp->pfd[i].events = POLLIN | POLLHUP;
+			pp->pfd[i].fd = -1;
+		}
 	}
 
 	pp_for_signal = pp;
@@ -1615,24 +1648,31 @@ static int pp_start_one(struct parallel_processes *pp)
 		BUG("bookkeeping is hard");
 
 	code = pp->get_next_task(&pp->children[i].process,
-				 &pp->children[i].err,
+				 pp->ungroup ? NULL : &pp->children[i].err,
 				 pp->data,
 				 &pp->children[i].data);
 	if (!code) {
-		strbuf_addbuf(&pp->buffered_output, &pp->children[i].err);
-		strbuf_reset(&pp->children[i].err);
+		if (!pp->ungroup) {
+			strbuf_addbuf(&pp->buffered_output, &pp->children[i].err);
+			strbuf_reset(&pp->children[i].err);
+		}
 		return 1;
 	}
-	pp->children[i].process.err = -1;
-	pp->children[i].process.stdout_to_stderr = 1;
+	if (!pp->ungroup) {
+		pp->children[i].process.err = -1;
+		pp->children[i].process.stdout_to_stderr = 1;
+	}
 	pp->children[i].process.no_stdin = 1;
 
 	if (start_command(&pp->children[i].process)) {
-		code = pp->start_failure(&pp->children[i].err,
+		code = pp->start_failure(pp->ungroup ? NULL :
+					 &pp->children[i].err,
 					 pp->data,
 					 pp->children[i].data);
-		strbuf_addbuf(&pp->buffered_output, &pp->children[i].err);
-		strbuf_reset(&pp->children[i].err);
+		if (!pp->ungroup) {
+			strbuf_addbuf(&pp->buffered_output, &pp->children[i].err);
+			strbuf_reset(&pp->children[i].err);
+		}
 		if (code)
 			pp->shutdown = 1;
 		return code;
@@ -1640,7 +1680,8 @@ static int pp_start_one(struct parallel_processes *pp)
 
 	pp->nr_processes++;
 	pp->children[i].state = GIT_CP_WORKING;
-	pp->pfd[i].fd = pp->children[i].process.err;
+	if (pp->pfd)
+		pp->pfd[i].fd = pp->children[i].process.err;
 	return 0;
 }
 
@@ -1674,6 +1715,7 @@ static void pp_buffer_stderr(struct parallel_processes *pp, int output_timeout)
 static void pp_output(struct parallel_processes *pp)
 {
 	int i = pp->output_owner;
+
 	if (pp->children[i].state == GIT_CP_WORKING &&
 	    pp->children[i].err.len) {
 		strbuf_write(&pp->children[i].err, stderr);
@@ -1696,7 +1738,7 @@ static int pp_collect_finished(struct parallel_processes *pp)
 
 		code = finish_command(&pp->children[i].process);
 
-		code = pp->task_finished(code,
+		code = pp->task_finished(code, pp->ungroup ? NULL :
 					 &pp->children[i].err, pp->data,
 					 pp->children[i].data);
 
@@ -1707,10 +1749,13 @@ static int pp_collect_finished(struct parallel_processes *pp)
 
 		pp->nr_processes--;
 		pp->children[i].state = GIT_CP_FREE;
-		pp->pfd[i].fd = -1;
+		if (pp->pfd)
+			pp->pfd[i].fd = -1;
 		child_process_init(&pp->children[i].process);
 
-		if (i != pp->output_owner) {
+		if (pp->ungroup) {
+			; /* no strbuf_*() work to do here */
+		} else if (i != pp->output_owner) {
 			strbuf_addbuf(&pp->buffered_output, &pp->children[i].err);
 			strbuf_reset(&pp->children[i].err);
 		} else {
@@ -1747,9 +1792,14 @@ int run_processes_parallel(int n,
 	int i, code;
 	int output_timeout = 100;
 	int spawn_cap = 4;
+	int ungroup = run_processes_parallel_ungroup;
 	struct parallel_processes pp;
 
-	pp_init(&pp, n, get_next_task, start_failure, task_finished, pp_cb);
+	/* unset for the next API user */
+	run_processes_parallel_ungroup = 0;
+
+	pp_init(&pp, n, get_next_task, start_failure, task_finished, pp_cb,
+		ungroup);
 	while (1) {
 		for (i = 0;
 		    i < spawn_cap && !pp.shutdown &&
@@ -1766,8 +1816,15 @@ int run_processes_parallel(int n,
 		}
 		if (!pp.nr_processes)
 			break;
-		pp_buffer_stderr(&pp, output_timeout);
-		pp_output(&pp);
+		if (ungroup) {
+			int i;
+
+			for (i = 0; i < pp.max_processes; i++)
+				pp.children[i].state = GIT_CP_WAIT_CLEANUP;
+		} else {
+			pp_buffer_stderr(&pp, output_timeout);
+			pp_output(&pp);
+		}
 		code = pp_collect_finished(&pp);
 		if (code) {
 			pp.shutdown = 1;
@@ -1815,16 +1872,16 @@ int run_auto_maintenance(int quiet)
 	return run_command(&maint);
 }
 
-void prepare_other_repo_env(struct strvec *env_array, const char *new_git_dir)
+void prepare_other_repo_env(struct strvec *env, const char *new_git_dir)
 {
 	const char * const *var;
 
 	for (var = local_repo_env; *var; var++) {
 		if (strcmp(*var, CONFIG_DATA_ENVIRONMENT) &&
 		    strcmp(*var, CONFIG_COUNT_ENVIRONMENT))
-			strvec_push(env_array, *var);
+			strvec_push(env, *var);
 	}
-	strvec_pushf(env_array, "%s=%s", GIT_DIR_ENVIRONMENT, new_git_dir);
+	strvec_pushf(env, "%s=%s", GIT_DIR_ENVIRONMENT, new_git_dir);
 }
 
 enum start_bg_result start_bg_command(struct child_process *cmd,
diff --git a/run-command.h b/run-command.h
index 07bed6c31b..0e85e5846a 100644
--- a/run-command.h
+++ b/run-command.h
@@ -58,7 +58,7 @@ struct child_process {
 	struct strvec args;
 
 	/**
-	 * Like .args the .env_array is a `struct strvec'.
+	 * Like .args the .env is a `struct strvec'.
 	 *
 	 * To modify the environment of the sub-process, specify an array of
 	 * environment settings. Each string in the array manipulates the
@@ -70,10 +70,10 @@ struct child_process {
 	 * - If the string does not contain '=', it names an environment
 	 *   variable that will be removed from the child process's environment.
 	 *
-	 * The memory in .env_array will be cleaned up automatically during
+	 * The memory in .env will be cleaned up automatically during
 	 * `finish_command` (or during `start_command` when it is unsuccessful).
 	 */
-	struct strvec env_array;
+	struct strvec env;
 	pid_t pid;
 
 	int trace2_child_id;
@@ -142,12 +142,11 @@ struct child_process {
 	unsigned clean_on_exit:1;
 	unsigned wait_after_clean:1;
 	void (*clean_on_exit_handler)(struct child_process *process);
-	void *clean_on_exit_handler_cbdata;
 };
 
 #define CHILD_PROCESS_INIT { \
 	.args = STRVEC_INIT, \
-	.env_array = STRVEC_INIT, \
+	.env = STRVEC_INIT, \
 }
 
 /**
@@ -406,6 +405,9 @@ void check_pipe(int err);
  * pp_cb is the callback cookie as passed to run_processes_parallel.
  * You can store a child process specific callback cookie in pp_task_cb.
  *
+ * See run_processes_parallel() below for a discussion of the "struct
+ * strbuf *out" parameter.
+ *
  * Even after returning 0 to indicate that there are no more processes,
  * this function will be called again until there are no more running
  * child processes.
@@ -424,9 +426,8 @@ typedef int (*get_next_task_fn)(struct child_process *cp,
  * This callback is called whenever there are problems starting
  * a new process.
  *
- * You must not write to stdout or stderr in this function. Add your
- * message to the strbuf out instead, which will be printed without
- * messing up the output of the other parallel processes.
+ * See run_processes_parallel() below for a discussion of the "struct
+ * strbuf *out" parameter.
  *
  * pp_cb is the callback cookie as passed into run_processes_parallel,
  * pp_task_cb is the callback cookie as passed into get_next_task_fn.
@@ -442,9 +443,8 @@ typedef int (*start_failure_fn)(struct strbuf *out,
 /**
  * This callback is called on every child process that finished processing.
  *
- * You must not write to stdout or stderr in this function. Add your
- * message to the strbuf out instead, which will be printed without
- * messing up the output of the other parallel processes.
+ * See run_processes_parallel() below for a discussion of the "struct
+ * strbuf *out" parameter.
  *
  * pp_cb is the callback cookie as passed into run_processes_parallel,
  * pp_task_cb is the callback cookie as passed into get_next_task_fn.
@@ -465,11 +465,26 @@ typedef int (*task_finished_fn)(int result,
  *
  * The children started via this function run in parallel. Their output
  * (both stdout and stderr) is routed to stderr in a manner that output
- * from different tasks does not interleave.
+ * from different tasks does not interleave (but see "ungroup" below).
  *
  * start_failure_fn and task_finished_fn can be NULL to omit any
  * special handling.
+ *
+ * If the "ungroup" option isn't specified, the API will set the
+ * "stdout_to_stderr" parameter in "struct child_process" and provide
+ * the callbacks with a "struct strbuf *out" parameter to write output
+ * to. In this case the callbacks must not write to stdout or
+ * stderr as such output will mess up the output of the other parallel
+ * processes. If "ungroup" option is specified callbacks will get a
+ * NULL "struct strbuf *out" parameter, and are responsible for
+ * emitting their own output, including dealing with any race
+ * conditions due to writing in parallel to stdout and stderr.
+ * The "ungroup" option can be enabled by setting the global
+ * "run_processes_parallel_ungroup" to "1" before invoking
+ * run_processes_parallel(), it will be set back to "0" as soon as the
+ * API reads that setting.
  */
+extern int run_processes_parallel_ungroup;
 int run_processes_parallel(int n,
 			   get_next_task_fn,
 			   start_failure_fn,
@@ -480,14 +495,14 @@ int run_processes_parallel_tr2(int n, get_next_task_fn, start_failure_fn,
 			       const char *tr2_category, const char *tr2_label);
 
 /**
- * Convenience function which prepares env_array for a command to be run in a
- * new repo. This adds all GIT_* environment variables to env_array with the
+ * Convenience function which prepares env for a command to be run in a
+ * new repo. This adds all GIT_* environment variables to env with the
  * exception of GIT_CONFIG_PARAMETERS and GIT_CONFIG_COUNT (which cause the
  * corresponding environment variables to be unset in the subprocess) and adds
  * an environment variable pointing to new_git_dir. See local_repo_env in
  * cache.h for more information.
  */
-void prepare_other_repo_env(struct strvec *env_array, const char *new_git_dir);
+void prepare_other_repo_env(struct strvec *env, const char *new_git_dir);
 
 /**
  * Possible return values for start_bg_command().
diff --git a/sequencer.c b/sequencer.c
index 8c3ed3532a..61a8e0020d 100644
--- a/sequencer.c
+++ b/sequencer.c
@@ -221,6 +221,9 @@ static int git_sequencer_config(const char *k, const char *v, void *cb)
 		return ret;
 	}
 
+	if (opts->action == REPLAY_REVERT && !strcmp(k, "revert.reference"))
+		opts->commit_use_reference = git_config_bool(k, v);
+
 	status = git_gpg_config(k, v, NULL);
 	if (status)
 		return status;
@@ -919,7 +922,7 @@ static char *get_author(const char *message)
 	return NULL;
 }
 
-static const char *author_date_from_env_array(const struct strvec *env)
+static const char *author_date_from_env(const struct strvec *env)
 {
 	int i;
 	const char *date;
@@ -1000,7 +1003,7 @@ static int run_git_commit(const char *defmsg,
 	if (is_rebase_i(opts) &&
 	    ((opts->committer_date_is_author_date && !opts->ignore_date) ||
 	     !(!defmsg && (flags & AMEND_MSG))) &&
-	    read_env_script(&cmd.env_array)) {
+	    read_env_script(&cmd.env)) {
 		const char *gpg_opt = gpg_sign_opt_quoted(opts);
 
 		return error(_(staged_changes_advice),
@@ -1008,12 +1011,12 @@ static int run_git_commit(const char *defmsg,
 	}
 
 	if (opts->committer_date_is_author_date)
-		strvec_pushf(&cmd.env_array, "GIT_COMMITTER_DATE=%s",
+		strvec_pushf(&cmd.env, "GIT_COMMITTER_DATE=%s",
 			     opts->ignore_date ?
 			     "" :
-			     author_date_from_env_array(&cmd.env_array));
+			     author_date_from_env(&cmd.env));
 	if (opts->ignore_date)
-		strvec_push(&cmd.env_array, "GIT_AUTHOR_DATE=");
+		strvec_push(&cmd.env, "GIT_AUTHOR_DATE=");
 
 	strvec_push(&cmd.args, "commit");
 
@@ -1346,6 +1349,7 @@ void print_commit_summary(struct repository *r,
 		log_tree_commit(&rev, commit);
 	}
 
+	release_revisions(&rev);
 	strbuf_release(&format);
 }
 
@@ -2058,6 +2062,20 @@ static int should_edit(struct replay_opts *opts) {
 	return opts->edit;
 }
 
+static void refer_to_commit(struct replay_opts *opts,
+			    struct strbuf *msgbuf, struct commit *commit)
+{
+	if (opts->commit_use_reference) {
+		struct pretty_print_context ctx = {
+			.abbrev = DEFAULT_ABBREV,
+			.date_mode.type = DATE_SHORT,
+		};
+		format_commit_message(commit, "%h (%s, %ad)", msgbuf, &ctx);
+	} else {
+		strbuf_addstr(msgbuf, oid_to_hex(&commit->object.oid));
+	}
+}
+
 static int do_pick_commit(struct repository *r,
 			  struct todo_item *item,
 			  struct replay_opts *opts,
@@ -2166,14 +2184,20 @@ static int do_pick_commit(struct repository *r,
 		base_label = msg.label;
 		next = parent;
 		next_label = msg.parent_label;
-		strbuf_addstr(&msgbuf, "Revert \"");
-		strbuf_addstr(&msgbuf, msg.subject);
-		strbuf_addstr(&msgbuf, "\"\n\nThis reverts commit ");
-		strbuf_addstr(&msgbuf, oid_to_hex(&commit->object.oid));
+		if (opts->commit_use_reference) {
+			strbuf_addstr(&msgbuf,
+				"# *** SAY WHY WE ARE REVERTING ON THE TITLE LINE ***");
+		} else {
+			strbuf_addstr(&msgbuf, "Revert \"");
+			strbuf_addstr(&msgbuf, msg.subject);
+			strbuf_addstr(&msgbuf, "\"");
+		}
+		strbuf_addstr(&msgbuf, "\n\nThis reverts commit ");
+		refer_to_commit(opts, &msgbuf, commit);
 
 		if (commit->parents && commit->parents->next) {
 			strbuf_addstr(&msgbuf, ", reversing\nchanges made to ");
-			strbuf_addstr(&msgbuf, oid_to_hex(&parent->object.oid));
+			refer_to_commit(opts, &msgbuf, parent);
 		}
 		strbuf_addstr(&msgbuf, ".\n");
 	} else {
@@ -3414,6 +3438,7 @@ static int make_patch(struct repository *r,
 		unuse_commit_buffer(commit, commit_buffer);
 	}
 	strbuf_release(&buf);
+	release_revisions(&log_tree_opt);
 
 	return res;
 }
@@ -3911,7 +3936,7 @@ static int do_merge(struct repository *r,
 		/* Octopus merge */
 		struct child_process cmd = CHILD_PROCESS_INIT;
 
-		if (read_env_script(&cmd.env_array)) {
+		if (read_env_script(&cmd.env)) {
 			const char *gpg_opt = gpg_sign_opt_quoted(opts);
 
 			ret = error(_(staged_changes_advice), gpg_opt, gpg_opt);
@@ -3919,12 +3944,12 @@ static int do_merge(struct repository *r,
 		}
 
 		if (opts->committer_date_is_author_date)
-			strvec_pushf(&cmd.env_array, "GIT_COMMITTER_DATE=%s",
+			strvec_pushf(&cmd.env, "GIT_COMMITTER_DATE=%s",
 				     opts->ignore_date ?
 				     "" :
-				     author_date_from_env_array(&cmd.env_array));
+				     author_date_from_env(&cmd.env));
 		if (opts->ignore_date)
-			strvec_push(&cmd.env_array, "GIT_AUTHOR_DATE=");
+			strvec_push(&cmd.env, "GIT_AUTHOR_DATE=");
 
 		cmd.git_cmd = 1;
 		strvec_push(&cmd.args, "merge");
@@ -4524,6 +4549,7 @@ cleanup_head_ref:
 					      &log_tree_opt.diffopt);
 				log_tree_diff_flush(&log_tree_opt);
 			}
+			release_revisions(&log_tree_opt);
 		}
 		flush_rewritten_pending();
 		if (!stat(rebase_path_rewritten_list(), &st) &&
@@ -5350,6 +5376,7 @@ int sequencer_make_script(struct repository *r, struct strbuf *out, int argc,
 	int rebase_merges = flags & TODO_LIST_REBASE_MERGES;
 	int reapply_cherry_picks = flags & TODO_LIST_REAPPLY_CHERRY_PICKS;
 	int skipped_commit = 0;
+	int ret = 0;
 
 	repo_init_revisions(r, &revs, NULL);
 	revs.verbose_header = 1;
@@ -5373,14 +5400,20 @@ int sequencer_make_script(struct repository *r, struct strbuf *out, int argc,
 	pp.fmt = revs.commit_format;
 	pp.output_encoding = get_log_output_encoding();
 
-	if (setup_revisions(argc, argv, &revs, NULL) > 1)
-		return error(_("make_script: unhandled options"));
+	if (setup_revisions(argc, argv, &revs, NULL) > 1) {
+		ret = error(_("make_script: unhandled options"));
+		goto cleanup;
+	}
 
-	if (prepare_revision_walk(&revs) < 0)
-		return error(_("make_script: error preparing revisions"));
+	if (prepare_revision_walk(&revs) < 0) {
+		ret = error(_("make_script: error preparing revisions"));
+		goto cleanup;
+	}
 
-	if (rebase_merges)
-		return make_script_with_merges(&pp, &revs, out, flags);
+	if (rebase_merges) {
+		ret = make_script_with_merges(&pp, &revs, out, flags);
+		goto cleanup;
+	}
 
 	while ((commit = get_revision(&revs))) {
 		int is_empty = is_original_commit_empty(commit);
@@ -5404,7 +5437,9 @@ int sequencer_make_script(struct repository *r, struct strbuf *out, int argc,
 	if (skipped_commit)
 		advise_if_enabled(ADVICE_SKIPPED_CHERRY_PICKS,
 				  _("use --reapply-cherry-picks to include skipped commits"));
-	return 0;
+cleanup:
+	release_revisions(&revs);
+	return ret;
 }
 
 /*
diff --git a/sequencer.h b/sequencer.h
index da64473636..698599fe4e 100644
--- a/sequencer.h
+++ b/sequencer.h
@@ -49,6 +49,7 @@ struct replay_opts {
 	int reschedule_failed_exec;
 	int committer_date_is_author_date;
 	int ignore_date;
+	int commit_use_reference;
 
 	int mainline;
 
diff --git a/serve.c b/serve.c
index b3fe9b5126..733347f602 100644
--- a/serve.c
+++ b/serve.c
@@ -3,7 +3,6 @@
 #include "config.h"
 #include "pkt-line.h"
 #include "version.h"
-#include "strvec.h"
 #include "ls-refs.h"
 #include "protocol-caps.h"
 #include "serve.h"
diff --git a/setup.c b/setup.c
index ca6a5ddb91..640f6ea4d0 100644
--- a/setup.c
+++ b/setup.c
@@ -459,7 +459,16 @@ static void setup_original_cwd(void)
 	 */
 
 	/* Normalize the directory */
-	strbuf_realpath(&tmp, tmp_original_cwd, 1);
+	if (!strbuf_realpath(&tmp, tmp_original_cwd, 0)) {
+		trace2_data_string("setup", the_repository,
+				   "realpath-path", tmp_original_cwd);
+		trace2_data_string("setup", the_repository,
+				   "realpath-failure", strerror(errno));
+		free((char*)tmp_original_cwd);
+		tmp_original_cwd = NULL;
+		return;
+	}
+
 	free((char*)tmp_original_cwd);
 	tmp_original_cwd = NULL;
 	startup_info->original_cwd = strbuf_detach(&tmp, NULL);
@@ -1129,16 +1138,17 @@ static int safe_directory_cb(const char *key, const char *value, void *d)
  * added, for bare ones their git directory.
  */
 static int ensure_valid_ownership(const char *gitfile,
-				const char *worktree, const char *gitdir)
+				  const char *worktree, const char *gitdir,
+				  struct strbuf *report)
 {
 	struct safe_directory_data data = {
 		.path = worktree ? worktree : gitdir
 	};
 
 	if (!git_env_bool("GIT_TEST_ASSUME_DIFFERENT_OWNER", 0) &&
-	   (!gitfile || is_path_owned_by_current_user(gitfile)) &&
-	   (!worktree || is_path_owned_by_current_user(worktree)) &&
-	   (!gitdir || is_path_owned_by_current_user(gitdir)))
+	    (!gitfile || is_path_owned_by_current_user(gitfile, report)) &&
+	    (!worktree || is_path_owned_by_current_user(worktree, report)) &&
+	    (!gitdir || is_path_owned_by_current_user(gitdir, report)))
 		return 1;
 
 	/*
@@ -1178,6 +1188,7 @@ enum discovery_result {
  */
 static enum discovery_result setup_git_directory_gently_1(struct strbuf *dir,
 							  struct strbuf *gitdir,
+							  struct strbuf *report,
 							  int die_on_error)
 {
 	const char *env_ceiling_dirs = getenv(CEILING_DIRECTORIES_ENVIRONMENT);
@@ -1262,10 +1273,11 @@ static enum discovery_result setup_git_directory_gently_1(struct strbuf *dir,
 		strbuf_setlen(dir, offset);
 		if (gitdirenv) {
 			enum discovery_result ret;
+			const char *gitdir_candidate =
+				gitdir_path ? gitdir_path : gitdirenv;
 
-			if (ensure_valid_ownership(gitfile,
-						 dir->buf,
-				 (gitdir_path ? gitdir_path : gitdirenv))) {
+			if (ensure_valid_ownership(gitfile, dir->buf,
+						   gitdir_candidate, report)) {
 				strbuf_addstr(gitdir, gitdirenv);
 				ret = GIT_DIR_DISCOVERED;
 			} else
@@ -1288,7 +1300,7 @@ static enum discovery_result setup_git_directory_gently_1(struct strbuf *dir,
 		}
 
 		if (is_git_directory(dir->buf)) {
-			if (!ensure_valid_ownership(NULL, NULL, dir->buf))
+			if (!ensure_valid_ownership(NULL, NULL, dir->buf, report))
 				return GIT_DIR_INVALID_OWNERSHIP;
 			strbuf_addstr(gitdir, ".");
 			return GIT_DIR_BARE;
@@ -1321,7 +1333,7 @@ int discover_git_directory(struct strbuf *commondir,
 		return -1;
 
 	cwd_len = dir.len;
-	if (setup_git_directory_gently_1(&dir, gitdir, 0) <= 0) {
+	if (setup_git_directory_gently_1(&dir, gitdir, NULL, 0) <= 0) {
 		strbuf_release(&dir);
 		return -1;
 	}
@@ -1368,7 +1380,7 @@ int discover_git_directory(struct strbuf *commondir,
 const char *setup_git_directory_gently(int *nongit_ok)
 {
 	static struct strbuf cwd = STRBUF_INIT;
-	struct strbuf dir = STRBUF_INIT, gitdir = STRBUF_INIT;
+	struct strbuf dir = STRBUF_INIT, gitdir = STRBUF_INIT, report = STRBUF_INIT;
 	const char *prefix = NULL;
 	struct repository_format repo_fmt = REPOSITORY_FORMAT_INIT;
 
@@ -1393,7 +1405,7 @@ const char *setup_git_directory_gently(int *nongit_ok)
 		die_errno(_("Unable to read current working directory"));
 	strbuf_addbuf(&dir, &cwd);
 
-	switch (setup_git_directory_gently_1(&dir, &gitdir, 1)) {
+	switch (setup_git_directory_gently_1(&dir, &gitdir, &report, 1)) {
 	case GIT_DIR_EXPLICIT:
 		prefix = setup_explicit_git_dir(gitdir.buf, &cwd, &repo_fmt, nongit_ok);
 		break;
@@ -1425,12 +1437,14 @@ const char *setup_git_directory_gently(int *nongit_ok)
 		if (!nongit_ok) {
 			struct strbuf quoted = STRBUF_INIT;
 
+			strbuf_complete(&report, '\n');
 			sq_quote_buf_pretty(&quoted, dir.buf);
 			die(_("detected dubious ownership in repository at '%s'\n"
+			      "%s"
 			      "To add an exception for this directory, call:\n"
 			      "\n"
 			      "\tgit config --global --add safe.directory %s"),
-			    dir.buf, quoted.buf);
+			    dir.buf, report.buf, quoted.buf);
 		}
 		*nongit_ok = 1;
 		break;
@@ -1442,7 +1456,7 @@ const char *setup_git_directory_gently(int *nongit_ok)
 		 * find a repository.
 		 */
 	default:
-		BUG("unhandled setup_git_directory_1() result");
+		BUG("unhandled setup_git_directory_gently_1() result");
 	}
 
 	/*
@@ -1509,6 +1523,7 @@ const char *setup_git_directory_gently(int *nongit_ok)
 
 	strbuf_release(&dir);
 	strbuf_release(&gitdir);
+	strbuf_release(&report);
 	clear_repository_format(&repo_fmt);
 
 	return prefix;
@@ -1519,7 +1534,7 @@ int git_config_perm(const char *var, const char *value)
 	int i;
 	char *endptr;
 
-	if (value == NULL)
+	if (!value)
 		return PERM_GROUP;
 
 	if (!strcmp(value, "umask"))
diff --git a/sh-i18n--envsubst.c b/sh-i18n--envsubst.c
index 6cd307ac2c..133496bd4d 100644
--- a/sh-i18n--envsubst.c
+++ b/sh-i18n--envsubst.c
@@ -397,7 +397,7 @@ subst_from_stdin (void)
 		  /* Substitute the variable's value from the environment.  */
 		  const char *env_value = getenv (buffer);
 
-		  if (env_value != NULL)
+		  if (env_value)
 		    fputs (env_value, stdout);
 		}
 	      else
diff --git a/shallow.c b/shallow.c
index e158be58b0..8cb768ee5f 100644
--- a/shallow.c
+++ b/shallow.c
@@ -97,6 +97,13 @@ int commit_shallow_file(struct repository *r, struct shallow_lock *lk)
 {
 	int res = commit_lock_file(&lk->lock);
 	reset_repository_shallow(r);
+
+	/*
+	 * Update in-memory data structures with the new shallow information,
+	 * including unparsing all commits that now have grafts.
+	 */
+	is_repository_shallow(r);
+
 	return res;
 }
 
@@ -262,6 +269,7 @@ struct commit_list *get_shallow_commits_by_rev_list(int ac, const char **av,
 		if ((o->flags & both_flags) == both_flags)
 			o->flags &= ~not_shallow_flag;
 	}
+	release_revisions(&revs);
 	return result;
 }
 
@@ -560,7 +568,7 @@ static void paint_down(struct paint_info *info, const struct object_id *oid,
 		else
 			c->object.flags |= SEEN;
 
-		if (*refs == NULL)
+		if (!*refs)
 			*refs = bitmap;
 		else {
 			memcpy(tmp, *refs, bitmap_size);
diff --git a/shared.mak b/shared.mak
index 50d4596f0d..4330192e9c 100644
--- a/shared.mak
+++ b/shared.mak
@@ -62,7 +62,9 @@ ifndef V
 	QUIET_BUILT_IN = @echo '   ' BUILTIN $@;
 	QUIET_LNCP     = @echo '   ' LN/CP $@;
 	QUIET_XGETTEXT = @echo '   ' XGETTEXT $@;
+	QUIET_MSGINIT  = @echo '   ' MSGINIT $@;
 	QUIET_MSGFMT   = @echo '   ' MSGFMT $@;
+	QUIET_MSGMERGE = @echo '   ' MSGMERGE $@;
 	QUIET_GCOV     = @echo '   ' GCOV $@;
 	QUIET_SP       = @echo '   ' SP $<;
 	QUIET_HDR      = @echo '   ' HDR $(<:hcc=h);
diff --git a/sparse-index.c b/sparse-index.c
index 8636af72de..e4a54ce194 100644
--- a/sparse-index.c
+++ b/sparse-index.c
@@ -9,6 +9,11 @@
 #include "dir.h"
 #include "fsmonitor.h"
 
+struct modify_index_context {
+	struct index_state *write;
+	struct pattern_list *pl;
+};
+
 static struct cache_entry *construct_sparse_dir_entry(
 				struct index_state *istate,
 				const char *sparse_dir,
@@ -118,7 +123,7 @@ static int index_has_unmerged_entries(struct index_state *istate)
 	return 0;
 }
 
-static int is_sparse_index_allowed(struct index_state *istate, int flags)
+int is_sparse_index_allowed(struct index_state *istate, int flags)
 {
 	if (!core_apply_sparse_checkout || !core_sparse_checkout_cone)
 		return 0;
@@ -173,7 +178,7 @@ int convert_to_sparse(struct index_state *istate, int flags)
 	 * If the index is already sparse, empty, or otherwise
 	 * cannot be converted to sparse, do not convert.
 	 */
-	if (istate->sparse_index || !istate->cache_nr ||
+	if (istate->sparse_index == INDEX_COLLAPSED || !istate->cache_nr ||
 	    !is_sparse_index_allowed(istate, flags))
 		return 0;
 
@@ -214,7 +219,7 @@ int convert_to_sparse(struct index_state *istate, int flags)
 	FREE_AND_NULL(istate->fsmonitor_dirty);
 	FREE_AND_NULL(istate->fsmonitor_last_update);
 
-	istate->sparse_index = 1;
+	istate->sparse_index = INDEX_COLLAPSED;
 	trace2_region_leave("index", "convert_to_sparse", istate->repo);
 	return 0;
 }
@@ -231,56 +236,148 @@ static int add_path_to_index(const struct object_id *oid,
 			     struct strbuf *base, const char *path,
 			     unsigned int mode, void *context)
 {
-	struct index_state *istate = (struct index_state *)context;
+	struct modify_index_context *ctx = (struct modify_index_context *)context;
 	struct cache_entry *ce;
 	size_t len = base->len;
 
-	if (S_ISDIR(mode))
-		return READ_TREE_RECURSIVE;
+	if (S_ISDIR(mode)) {
+		int dtype;
+		size_t baselen = base->len;
+		if (!ctx->pl)
+			return READ_TREE_RECURSIVE;
+
+		/*
+		 * Have we expanded to a point outside of the sparse-checkout?
+		 *
+		 * Artificially pad the path name with a slash "/" to
+		 * indicate it as a directory, and add an arbitrary file
+		 * name ("-") so we can consider base->buf as a file name
+		 * to match against the cone-mode patterns.
+		 *
+		 * If we compared just "path", then we would expand more
+		 * than we should. Since every file at root is always
+		 * included, we would expand every directory at root at
+		 * least one level deep instead of using sparse directory
+		 * entries.
+		 */
+		strbuf_addstr(base, path);
+		strbuf_add(base, "/-", 2);
+
+		if (path_matches_pattern_list(base->buf, base->len,
+					      NULL, &dtype,
+					      ctx->pl, ctx->write)) {
+			strbuf_setlen(base, baselen);
+			return READ_TREE_RECURSIVE;
+		}
 
-	strbuf_addstr(base, path);
+		/*
+		 * The path "{base}{path}/" is a sparse directory. Create the correct
+		 * name for inserting the entry into the index.
+		 */
+		strbuf_setlen(base, base->len - 1);
+	} else {
+		strbuf_addstr(base, path);
+	}
 
-	ce = make_cache_entry(istate, mode, oid, base->buf, 0, 0);
+	ce = make_cache_entry(ctx->write, mode, oid, base->buf, 0, 0);
 	ce->ce_flags |= CE_SKIP_WORKTREE | CE_EXTENDED;
-	set_index_entry(istate, istate->cache_nr++, ce);
+	set_index_entry(ctx->write, ctx->write->cache_nr++, ce);
 
 	strbuf_setlen(base, len);
 	return 0;
 }
 
-void ensure_full_index(struct index_state *istate)
+void expand_index(struct index_state *istate, struct pattern_list *pl)
 {
 	int i;
 	struct index_state *full;
 	struct strbuf base = STRBUF_INIT;
+	const char *tr_region;
+	struct modify_index_context ctx;
 
-	if (!istate || !istate->sparse_index)
+	/*
+	 * If the index is already full, then keep it full. We will convert
+	 * it to a sparse index on write, if possible.
+	 */
+	if (!istate || istate->sparse_index == INDEX_EXPANDED)
 		return;
 
+	/*
+	 * If our index is sparse, but our new pattern set does not use
+	 * cone mode patterns, then we need to expand the index before we
+	 * continue. A NULL pattern set indicates a full expansion to a
+	 * full index.
+	 */
+	if (pl && !pl->use_cone_patterns) {
+		pl = NULL;
+	} else {
+		/*
+		 * We might contract file entries into sparse-directory
+		 * entries, and for that we will need the cache tree to
+		 * be recomputed.
+		 */
+		cache_tree_free(&istate->cache_tree);
+
+		/*
+		 * If there is a problem creating the cache tree, then we
+		 * need to expand to a full index since we cannot satisfy
+		 * the current request as a sparse index.
+		 */
+		if (cache_tree_update(istate, 0))
+			pl = NULL;
+	}
+
 	if (!istate->repo)
 		istate->repo = the_repository;
 
-	trace2_region_enter("index", "ensure_full_index", istate->repo);
+	/*
+	 * A NULL pattern set indicates we are expanding a full index, so
+	 * we use a special region name that indicates the full expansion.
+	 * This is used by test cases, but also helps to differentiate the
+	 * two cases.
+	 */
+	tr_region = pl ? "expand_index" : "ensure_full_index";
+	trace2_region_enter("index", tr_region, istate->repo);
 
 	/* initialize basics of new index */
 	full = xcalloc(1, sizeof(struct index_state));
 	memcpy(full, istate, sizeof(struct index_state));
 
+	/*
+	 * This slightly-misnamed 'full' index might still be sparse if we
+	 * are only modifying the list of sparse directories. This hinges
+	 * on whether we have a non-NULL pattern list.
+	 */
+	full->sparse_index = pl ? INDEX_PARTIALLY_SPARSE : INDEX_EXPANDED;
+
 	/* then change the necessary things */
-	full->sparse_index = 0;
 	full->cache_alloc = (3 * istate->cache_alloc) / 2;
 	full->cache_nr = 0;
 	ALLOC_ARRAY(full->cache, full->cache_alloc);
 
+	ctx.write = full;
+	ctx.pl = pl;
+
 	for (i = 0; i < istate->cache_nr; i++) {
 		struct cache_entry *ce = istate->cache[i];
 		struct tree *tree;
 		struct pathspec ps;
+		int dtype;
 
 		if (!S_ISSPARSEDIR(ce->ce_mode)) {
 			set_index_entry(full, full->cache_nr++, ce);
 			continue;
 		}
+
+		/* We now have a sparse directory entry. Should we expand? */
+		if (pl &&
+		    path_matches_pattern_list(ce->name, ce->ce_namelen,
+					      NULL, &dtype,
+					      pl, istate) == NOT_MATCHED) {
+			set_index_entry(full, full->cache_nr++, ce);
+			continue;
+		}
+
 		if (!(ce->ce_flags & CE_SKIP_WORKTREE))
 			warning(_("index entry is a directory, but not sparse (%08x)"),
 				ce->ce_flags);
@@ -297,7 +394,7 @@ void ensure_full_index(struct index_state *istate)
 		strbuf_add(&base, ce->name, strlen(ce->name));
 
 		read_tree_at(istate->repo, tree, &base, &ps,
-			     add_path_to_index, full);
+			     add_path_to_index, &ctx);
 
 		/* free directory entries. full entries are re-used */
 		discard_cache_entry(ce);
@@ -306,7 +403,7 @@ void ensure_full_index(struct index_state *istate)
 	/* Copy back into original index. */
 	memcpy(&istate->name_hash, &full->name_hash, sizeof(full->name_hash));
 	memcpy(&istate->dir_hash, &full->dir_hash, sizeof(full->dir_hash));
-	istate->sparse_index = 0;
+	istate->sparse_index = pl ? INDEX_PARTIALLY_SPARSE : INDEX_EXPANDED;
 	free(istate->cache);
 	istate->cache = full->cache;
 	istate->cache_nr = full->cache_nr;
@@ -322,7 +419,12 @@ void ensure_full_index(struct index_state *istate)
 	cache_tree_free(&istate->cache_tree);
 	cache_tree_update(istate, 0);
 
-	trace2_region_leave("index", "ensure_full_index", istate->repo);
+	trace2_region_leave("index", tr_region, istate->repo);
+}
+
+void ensure_full_index(struct index_state *istate)
+{
+	expand_index(istate, NULL);
 }
 
 void ensure_correct_sparsity(struct index_state *istate)
diff --git a/sparse-index.h b/sparse-index.h
index 633d4fb7e3..59a92d819e 100644
--- a/sparse-index.h
+++ b/sparse-index.h
@@ -3,6 +3,7 @@
 
 struct index_state;
 #define SPARSE_INDEX_MEMORY_ONLY (1 << 0)
+int is_sparse_index_allowed(struct index_state *istate, int flags);
 int convert_to_sparse(struct index_state *istate, int flags);
 void ensure_correct_sparsity(struct index_state *istate);
 void clear_skip_worktree_from_present_files(struct index_state *istate);
@@ -23,4 +24,17 @@ void expand_to_path(struct index_state *istate,
 struct repository;
 int set_sparse_index_config(struct repository *repo, int enable);
 
+struct pattern_list;
+
+/**
+ * Scan the given index and compare its entries to the given pattern list.
+ * If the index is sparse and the pattern list uses cone mode patterns,
+ * then modify the index to contain the all of the file entries within that
+ * new pattern list. This expands sparse directories only as far as needed.
+ *
+ * If the pattern list is NULL or does not use cone mode patterns, then the
+ * index is expanded to a full index.
+ */
+void expand_index(struct index_state *istate, struct pattern_list *pl);
+
 #endif
diff --git a/submodule-config.c b/submodule-config.c
index 29668b0620..c2ac7e7bf3 100644
--- a/submodule-config.c
+++ b/submodule-config.c
@@ -204,17 +204,17 @@ int check_submodule_name(const char *name)
 		return -1;
 
 	/*
-	 * Look for '..' as a path component. Check both '/' and '\\' as
+	 * Look for '..' as a path component. Check is_xplatform_dir_sep() as
 	 * separators rather than is_dir_sep(), because we want the name rules
 	 * to be consistent across platforms.
 	 */
 	goto in_component; /* always start inside component */
 	while (*name) {
 		char c = *name++;
-		if (c == '/' || c == '\\') {
+		if (is_xplatform_dir_sep(c)) {
 in_component:
 			if (name[0] == '.' && name[1] == '.' &&
-			    (!name[2] || name[2] == '/' || name[2] == '\\'))
+			    (!name[2] || is_xplatform_dir_sep(name[2])))
 				return -1;
 		}
 	}
@@ -302,7 +302,7 @@ int parse_submodule_fetchjobs(const char *var, const char *value)
 {
 	int fetchjobs = git_config_int(var, value);
 	if (fetchjobs < 0)
-		die(_("negative values not allowed for submodule.fetchjobs"));
+		die(_("negative values not allowed for submodule.fetchJobs"));
 	return fetchjobs;
 }
 
@@ -756,7 +756,10 @@ static void traverse_tree_submodules(struct repository *r,
 
 		if (S_ISGITLINK(name_entry->mode) &&
 		    is_tree_submodule_active(r, root_tree, tree_path)) {
-			st_entry = xmalloc(sizeof(*st_entry));
+			ALLOC_GROW(out->entries, out->entry_nr + 1,
+				   out->entry_alloc);
+			st_entry = &out->entries[out->entry_nr++];
+
 			st_entry->name_entry = xmalloc(sizeof(*st_entry->name_entry));
 			*st_entry->name_entry = *name_entry;
 			st_entry->submodule =
@@ -766,9 +769,6 @@ static void traverse_tree_submodules(struct repository *r,
 						root_tree))
 				FREE_AND_NULL(st_entry->repo);
 
-			ALLOC_GROW(out->entries, out->entry_nr + 1,
-				   out->entry_alloc);
-			out->entries[out->entry_nr++] = *st_entry;
 		} else if (S_ISDIR(name_entry->mode))
 			traverse_tree_submodules(r, root_tree, tree_path,
 						 &name_entry->oid, out);
diff --git a/submodule-config.h b/submodule-config.h
index fa229a8b97..28a8ca6bf4 100644
--- a/submodule-config.h
+++ b/submodule-config.h
@@ -38,7 +38,7 @@ struct submodule {
 	const char *path;
 	const char *name;
 	const char *url;
-	int fetch_recurse;
+	enum submodule_recurse_mode fetch_recurse;
 	const char *ignore;
 	const char *branch;
 	struct submodule_update_strategy update_strategy;
diff --git a/submodule.c b/submodule.c
index 86c8f0f89d..4e299f578f 100644
--- a/submodule.c
+++ b/submodule.c
@@ -619,7 +619,7 @@ void show_submodule_diff_summary(struct diff_options *o, const char *path,
 		struct object_id *one, struct object_id *two,
 		unsigned dirty_submodule)
 {
-	struct rev_info rev;
+	struct rev_info rev = REV_INFO_INIT;
 	struct commit *left = NULL, *right = NULL;
 	struct commit_list *merge_bases = NULL;
 	struct repository *sub;
@@ -645,8 +645,8 @@ void show_submodule_diff_summary(struct diff_options *o, const char *path,
 	print_submodule_diff_summary(sub, &rev, o);
 
 out:
-	if (merge_bases)
-		free_commit_list(merge_bases);
+	free_commit_list(merge_bases);
+	release_revisions(&rev);
 	clear_commit_marks(left, ~0);
 	clear_commit_marks(right, ~0);
 	if (sub) {
@@ -711,15 +711,15 @@ void show_submodule_inline_diff(struct diff_options *o, const char *path,
 	if (!(dirty_submodule & DIRTY_SUBMODULE_MODIFIED))
 		strvec_push(&cp.args, oid_to_hex(new_oid));
 
-	prepare_submodule_repo_env(&cp.env_array);
+	prepare_submodule_repo_env(&cp.env);
 
 	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 "=.");
+		strvec_push(&cp.env, GIT_DIR_ENVIRONMENT "=.");
+		strvec_push(&cp.env, GIT_WORK_TREE_ENVIRONMENT "=.");
 	}
 
 	if (start_command(&cp)) {
@@ -735,8 +735,7 @@ void show_submodule_inline_diff(struct diff_options *o, const char *path,
 
 done:
 	strbuf_release(&sb);
-	if (merge_bases)
-		free_commit_list(merge_bases);
+	free_commit_list(merge_bases);
 	if (left)
 		clear_commit_marks(left, ~0);
 	if (right)
@@ -925,9 +924,11 @@ static void collect_changed_submodules(struct repository *r,
 		diff_rev.diffopt.format_callback_data = &data;
 		diff_rev.dense_combined_merges = 1;
 		diff_tree_combined_merge(commit, &diff_rev);
+		release_revisions(&diff_rev);
 	}
 
 	reset_revision_walk();
+	release_revisions(&rev);
 }
 
 static void free_submodules_data(struct string_list *submodules)
@@ -1019,7 +1020,7 @@ static int submodule_has_commits(struct repository *r,
 		oid_array_for_each_unique(commits, append_oid_to_argv, &cp.args);
 		strvec_pushl(&cp.args, "--not", "--all", NULL);
 
-		prepare_submodule_repo_env(&cp.env_array);
+		prepare_submodule_repo_env(&cp.env);
 		cp.git_cmd = 1;
 		cp.no_stdin = 1;
 		cp.dir = path;
@@ -1060,7 +1061,7 @@ static int submodule_needs_pushing(struct repository *r,
 		oid_array_for_each_unique(commits, append_oid_to_argv, &cp.args);
 		strvec_pushl(&cp.args, "--not", "--remotes", "-n", "1" , NULL);
 
-		prepare_submodule_repo_env(&cp.env_array);
+		prepare_submodule_repo_env(&cp.env);
 		cp.git_cmd = 1;
 		cp.no_stdin = 1;
 		cp.out = -1;
@@ -1146,7 +1147,7 @@ static int push_submodule(const char *path,
 				strvec_push(&cp.args, rs->raw[i]);
 		}
 
-		prepare_submodule_repo_env(&cp.env_array);
+		prepare_submodule_repo_env(&cp.env);
 		cp.git_cmd = 1;
 		cp.no_stdin = 1;
 		cp.dir = path;
@@ -1177,7 +1178,7 @@ static void submodule_push_check(const char *path, const char *head,
 	for (i = 0; i < rs->raw_nr; i++)
 		strvec_push(&cp.args, rs->raw[i]);
 
-	prepare_submodule_repo_env(&cp.env_array);
+	prepare_submodule_repo_env(&cp.env);
 	cp.git_cmd = 1;
 	cp.no_stdin = 1;
 	cp.no_stdout = 1;
@@ -1678,7 +1679,7 @@ static int get_next_submodule(struct child_process *cp, struct strbuf *err,
 
 		child_process_init(cp);
 		cp->dir = task->repo->gitdir;
-		prepare_submodule_repo_env_in_gitdir(&cp->env_array);
+		prepare_submodule_repo_env_in_gitdir(&cp->env);
 		cp->git_cmd = 1;
 		strvec_init(&cp->args);
 		if (task->git_args.nr)
@@ -1708,7 +1709,7 @@ static int get_next_submodule(struct child_process *cp, struct strbuf *err,
 			    spf->prefix, task->sub->path);
 
 		child_process_init(cp);
-		prepare_submodule_repo_env_in_gitdir(&cp->env_array);
+		prepare_submodule_repo_env_in_gitdir(&cp->env);
 		cp->git_cmd = 1;
 		cp->dir = task->repo->gitdir;
 
@@ -1882,7 +1883,7 @@ unsigned is_submodule_modified(const char *path, int ignore_untracked)
 	if (ignore_untracked)
 		strvec_push(&cp.args, "-uno");
 
-	prepare_submodule_repo_env(&cp.env_array);
+	prepare_submodule_repo_env(&cp.env);
 	cp.git_cmd = 1;
 	cp.no_stdin = 1;
 	cp.out = -1;
@@ -1954,7 +1955,7 @@ int submodule_uses_gitfile(const char *path)
 		     "submodule", "foreach", "--quiet",	"--recursive",
 		     "test -f .git", NULL);
 
-	prepare_submodule_repo_env(&cp.env_array);
+	prepare_submodule_repo_env(&cp.env);
 	cp.git_cmd = 1;
 	cp.no_stdin = 1;
 	cp.no_stderr = 1;
@@ -1997,7 +1998,7 @@ int bad_to_remove_submodule(const char *path, unsigned flags)
 	if (!(flags & SUBMODULE_REMOVAL_IGNORE_IGNORED_UNTRACKED))
 		strvec_push(&cp.args, "--ignored");
 
-	prepare_submodule_repo_env(&cp.env_array);
+	prepare_submodule_repo_env(&cp.env);
 	cp.git_cmd = 1;
 	cp.no_stdin = 1;
 	cp.out = -1;
@@ -2052,7 +2053,7 @@ static int submodule_has_dirty_index(const struct submodule *sub)
 {
 	struct child_process cp = CHILD_PROCESS_INIT;
 
-	prepare_submodule_repo_env(&cp.env_array);
+	prepare_submodule_repo_env(&cp.env);
 
 	cp.git_cmd = 1;
 	strvec_pushl(&cp.args, "diff-index", "--quiet",
@@ -2069,7 +2070,7 @@ static int submodule_has_dirty_index(const struct submodule *sub)
 static void submodule_reset_index(const char *path)
 {
 	struct child_process cp = CHILD_PROCESS_INIT;
-	prepare_submodule_repo_env(&cp.env_array);
+	prepare_submodule_repo_env(&cp.env);
 
 	cp.git_cmd = 1;
 	cp.no_stdin = 1;
@@ -2153,7 +2154,7 @@ int submodule_move_head(const char *path,
 		}
 	}
 
-	prepare_submodule_repo_env(&cp.env_array);
+	prepare_submodule_repo_env(&cp.env);
 
 	cp.git_cmd = 1;
 	cp.no_stdin = 1;
@@ -2191,7 +2192,7 @@ int submodule_move_head(const char *path,
 			cp.no_stdin = 1;
 			cp.dir = path;
 
-			prepare_submodule_repo_env(&cp.env_array);
+			prepare_submodule_repo_env(&cp.env);
 			strvec_pushl(&cp.args, "update-ref", "HEAD",
 				     "--no-deref", new_head, NULL);
 
@@ -2374,7 +2375,7 @@ void absorb_git_dir_into_superproject(const char *path,
 		strvec_pushl(&cp.args, "--super-prefix", sb.buf,
 			     "submodule--helper",
 			     "absorb-git-dirs", NULL);
-		prepare_submodule_repo_env(&cp.env_array);
+		prepare_submodule_repo_env(&cp.env);
 		if (run_command(&cp))
 			die(_("could not recurse into submodule '%s'"), path);
 
@@ -2407,8 +2408,8 @@ int get_superproject_working_tree(struct strbuf *buf)
 	subpath = relative_path(cwd, one_up.buf, &sb);
 	strbuf_release(&one_up);
 
-	prepare_submodule_repo_env(&cp.env_array);
-	strvec_pop(&cp.env_array);
+	prepare_submodule_repo_env(&cp.env);
+	strvec_pop(&cp.env);
 
 	strvec_pushl(&cp.args, "--literal-pathspecs", "-C", "..",
 		     "ls-files", "-z", "--stage", "--full-name", "--",
diff --git a/submodule.h b/submodule.h
index 40c1445237..bfaa9da186 100644
--- a/submodule.h
+++ b/submodule.h
@@ -13,7 +13,7 @@ struct repository;
 struct string_list;
 struct strbuf;
 
-enum {
+enum submodule_recurse_mode {
 	RECURSE_SUBMODULES_ONLY = -5,
 	RECURSE_SUBMODULES_CHECK = -4,
 	RECURSE_SUBMODULES_ERROR = -3,
@@ -158,11 +158,11 @@ int submodule_move_head(const char *path,
 void submodule_unset_core_worktree(const struct submodule *sub);
 
 /*
- * Prepare the "env_array" parameter of a "struct child_process" for executing
+ * Prepare the "env" parameter of a "struct child_process" for executing
  * a submodule by clearing any repo-specific environment variables, but
  * retaining any config in the environment.
  */
-void prepare_submodule_repo_env(struct strvec *out);
+void prepare_submodule_repo_env(struct strvec *env);
 
 #define ABSORB_GITDIR_RECURSE_SUBMODULES (1<<0)
 void absorb_git_dir_into_superproject(const char *path,
diff --git a/t/README b/t/README
index 9ffea1d314..4f9981cf5e 100644
--- a/t/README
+++ b/t/README
@@ -419,7 +419,7 @@ the --sparse command-line argument.
 GIT_TEST_PRELOAD_INDEX=<boolean> exercises the preload-index code path
 by overriding the minimum number of cache entries required per thread.
 
-GIT_TEST_ADD_I_USE_BUILTIN=<boolean>, when true, enables the
+GIT_TEST_ADD_I_USE_BUILTIN=<boolean>, when false, disables the
 built-in version of git add -i. See 'add.interactive.useBuiltin' in
 git-config(1).
 
@@ -547,6 +547,61 @@ This test harness library does the following things:
    consistently when command line arguments --verbose (or -v),
    --debug (or -d), and --immediate (or -i) is given.
 
+Recommended style
+-----------------
+Here are some recommented styles when writing test case.
+
+ - Keep test title the same line with test helper function itself.
+
+   Take test_expect_success helper for example, write it like:
+
+  test_expect_success 'test title' '
+      ... test body ...
+  '
+
+   Instead of:
+
+  test_expect_success \
+      'test title' \
+      '... test body ...'
+
+
+ - End the line with a single quote.
+
+ - Indent the body of here-document, and use "<<-" instead of "<<"
+   to strip leading TABs used for indentation:
+
+  test_expect_success 'test something' '
+      cat >expect <<-\EOF &&
+      one
+      two
+      three
+      EOF
+      test_something > actual &&
+      test_cmp expect actual
+  '
+
+   Instead of:
+
+  test_expect_success 'test something' '
+      cat >expect <<\EOF &&
+  one
+  two
+  three
+  EOF
+      test_something > actual &&
+      test_cmp expect actual
+  '
+
+ - Quote or escape the EOF delimiter that begins a here-document if
+   there is no parameter and other expansion in it, to signal readers
+   that they can skim it more casually:
+
+  cmd <<-\EOF
+  literal here-document text without any expansion
+  EOF
+
+
 Do's & don'ts
 -------------
 
diff --git a/t/annotate-tests.sh b/t/annotate-tests.sh
index 09e86f9ba0..cc01d89150 100644
--- a/t/annotate-tests.sh
+++ b/t/annotate-tests.sh
@@ -56,6 +56,10 @@ check_count () {
 	' "$@" <actual
 }
 
+get_progress_result () {
+	tr '\015' '\012' | tail -n 1
+}
+
 test_expect_success 'setup A lines' '
 	echo "1A quick brown fox jumps over the" >file &&
 	echo "lazy dog" >>file &&
@@ -604,3 +608,39 @@ test_expect_success 'blame -L X,-N (non-numeric N)' '
 test_expect_success 'blame -L ,^/RE/' '
 	test_must_fail $PROG -L1,^/99/ file
 '
+
+test_expect_success 'blame progress on a full file' '
+	cat >expect <<-\EOF &&
+	Blaming lines: 100% (10/10), done.
+	EOF
+
+	GIT_PROGRESS_DELAY=0 \
+	git blame --progress hello.c 2>stderr &&
+
+	get_progress_result <stderr >actual &&
+	test_cmp expect actual
+'
+
+test_expect_success 'blame progress on a single range' '
+	cat >expect <<-\EOF &&
+	Blaming lines: 100% (4/4), done.
+	EOF
+
+	GIT_PROGRESS_DELAY=0 \
+	git blame --progress -L 3,6 hello.c 2>stderr &&
+
+	get_progress_result <stderr >actual &&
+	test_cmp expect actual
+'
+
+test_expect_success 'blame progress on multiple ranges' '
+	cat >expect <<-\EOF &&
+	Blaming lines: 100% (7/7), done.
+	EOF
+
+	GIT_PROGRESS_DELAY=0 \
+	git blame --progress -L 3,6 -L 8,10 hello.c 2>stderr &&
+
+	get_progress_result <stderr >actual &&
+	test_cmp expect actual
+'
diff --git a/t/helper/test-fast-rebase.c b/t/helper/test-fast-rebase.c
index fc2d460904..4e5553e202 100644
--- a/t/helper/test-fast-rebase.c
+++ b/t/helper/test-fast-rebase.c
@@ -99,6 +99,7 @@ int cmd__fast_rebase(int argc, const char **argv)
 	struct merge_result result;
 	struct strbuf reflog_msg = STRBUF_INIT;
 	struct strbuf branch_name = STRBUF_INIT;
+	int ret = 0;
 
 	/*
 	 * test-tool stuff doesn't set up the git directory by default; need to
@@ -137,13 +138,17 @@ int cmd__fast_rebase(int argc, const char **argv)
 	revs.topo_order = 1;
 	strvec_pushl(&rev_walk_args, "", argv[4], "--not", argv[3], NULL);
 
-	if (setup_revisions(rev_walk_args.nr, rev_walk_args.v, &revs, NULL) > 1)
-		return error(_("unhandled options"));
+	if (setup_revisions(rev_walk_args.nr, rev_walk_args.v, &revs, NULL) > 1) {
+		ret = error(_("unhandled options"));
+		goto cleanup;
+	}
 
 	strvec_clear(&rev_walk_args);
 
-	if (prepare_revision_walk(&revs) < 0)
-		return error(_("error preparing revisions"));
+	if (prepare_revision_walk(&revs) < 0) {
+		ret = error(_("error preparing revisions"));
+		goto cleanup;
+	}
 
 	init_merge_options(&merge_opt, the_repository);
 	memset(&result, 0, sizeof(result));
@@ -201,8 +206,6 @@ int cmd__fast_rebase(int argc, const char **argv)
 		}
 		if (create_symref("HEAD", branch_name.buf, reflog_msg.buf) < 0)
 			die(_("unable to update HEAD"));
-		strbuf_release(&reflog_msg);
-		strbuf_release(&branch_name);
 
 		prime_cache_tree(the_repository, the_repository->index,
 				 result.tree);
@@ -221,5 +224,11 @@ int cmd__fast_rebase(int argc, const char **argv)
 	if (write_locked_index(&the_index, &lock,
 			       COMMIT_LOCK | SKIP_IF_UNCHANGED))
 		die(_("unable to write %s"), get_index_file());
-	return (result.clean == 0);
+
+	ret = (result.clean == 0);
+cleanup:
+	strbuf_release(&reflog_msg);
+	strbuf_release(&branch_name);
+	release_revisions(&revs);
+	return ret;
 }
diff --git a/t/helper/test-fsmonitor-client.c b/t/helper/test-fsmonitor-client.c
index 3062c8a3c2..54a4856c48 100644
--- a/t/helper/test-fsmonitor-client.c
+++ b/t/helper/test-fsmonitor-client.c
@@ -7,6 +7,8 @@
 #include "cache.h"
 #include "parse-options.h"
 #include "fsmonitor-ipc.h"
+#include "thread-utils.h"
+#include "trace2.h"
 
 #ifndef HAVE_FSMONITOR_DAEMON_BACKEND
 int cmd__fsmonitor_client(int argc, const char **argv)
@@ -79,20 +81,121 @@ static int do_send_flush(void)
 	return 0;
 }
 
+struct hammer_thread_data
+{
+	pthread_t pthread_id;
+	int thread_nr;
+
+	int nr_requests;
+	const char *token;
+
+	int sum_successful;
+	int sum_errors;
+};
+
+static void *hammer_thread_proc(void *_hammer_thread_data)
+{
+	struct hammer_thread_data *data = _hammer_thread_data;
+	struct strbuf answer = STRBUF_INIT;
+	int k;
+	int ret;
+
+	trace2_thread_start("hammer");
+
+	for (k = 0; k < data->nr_requests; k++) {
+		strbuf_reset(&answer);
+
+		ret = fsmonitor_ipc__send_query(data->token, &answer);
+		if (ret < 0)
+			data->sum_errors++;
+		else
+			data->sum_successful++;
+	}
+
+	strbuf_release(&answer);
+	trace2_thread_exit();
+	return NULL;
+}
+
+/*
+ * Start a pool of client threads that will each send a series of
+ * commands to the daemon.
+ *
+ * The goal is to overload the daemon with a sustained series of
+ * concurrent requests.
+ */
+static int do_hammer(const char *token, int nr_threads, int nr_requests)
+{
+	struct hammer_thread_data *data = NULL;
+	int k;
+	int sum_join_errors = 0;
+	int sum_commands = 0;
+	int sum_errors = 0;
+
+	if (!token || !*token)
+		token = get_token_from_index();
+	if (nr_threads < 1)
+		nr_threads = 1;
+	if (nr_requests < 1)
+		nr_requests = 1;
+
+	CALLOC_ARRAY(data, nr_threads);
+
+	for (k = 0; k < nr_threads; k++) {
+		struct hammer_thread_data *p = &data[k];
+		p->thread_nr = k;
+		p->nr_requests = nr_requests;
+		p->token = token;
+
+		if (pthread_create(&p->pthread_id, NULL, hammer_thread_proc, p)) {
+			warning("failed to create thread[%d] skipping remainder", k);
+			nr_threads = k;
+			break;
+		}
+	}
+
+	for (k = 0; k < nr_threads; k++) {
+		struct hammer_thread_data *p = &data[k];
+
+		if (pthread_join(p->pthread_id, NULL))
+			sum_join_errors++;
+		sum_commands += p->sum_successful;
+		sum_errors += p->sum_errors;
+	}
+
+	fprintf(stderr, "HAMMER: [threads %d][requests %d] [ok %d][err %d][join %d]\n",
+		nr_threads, nr_requests, sum_commands, sum_errors, sum_join_errors);
+
+	free(data);
+
+	/*
+	 * Return an error if any of the _send_query requests failed.
+	 * We don't care about thread create/join errors.
+	 */
+	return sum_errors > 0;
+}
+
 int cmd__fsmonitor_client(int argc, const char **argv)
 {
 	const char *subcmd;
 	const char *token = NULL;
+	int nr_threads = 1;
+	int nr_requests = 1;
 
 	const char * const fsmonitor_client_usage[] = {
 		"test-tool fsmonitor-client query [<token>]",
 		"test-tool fsmonitor-client flush",
+		"test-tool fsmonitor-client hammer [<token>] [<threads>] [<requests>]",
 		NULL,
 	};
 
 	struct option options[] = {
 		OPT_STRING(0, "token", &token, "token",
 			   "command token to send to the server"),
+
+		OPT_INTEGER(0, "threads", &nr_threads, "number of client threads"),
+		OPT_INTEGER(0, "requests", &nr_requests, "number of requests per thread"),
+
 		OPT_END()
 	};
 
@@ -111,6 +214,9 @@ int cmd__fsmonitor_client(int argc, const char **argv)
 	if (!strcmp(subcmd, "flush"))
 		return !!do_send_flush();
 
+	if (!strcmp(subcmd, "hammer"))
+		return !!do_hammer(token, nr_threads, nr_requests);
+
 	die("Unhandled subcommand: '%s'", subcmd);
 }
 #endif
diff --git a/t/helper/test-hexdump.c b/t/helper/test-hexdump.c
new file mode 100644
index 0000000000..811e89c1bc
--- /dev/null
+++ b/t/helper/test-hexdump.c
@@ -0,0 +1,30 @@
+#include "test-tool.h"
+#include "git-compat-util.h"
+
+/*
+ * Read stdin and print a hexdump to stdout.
+ */
+int cmd__hexdump(int argc, const char **argv)
+{
+	char buf[1024];
+	ssize_t i, len;
+	int have_data = 0;
+
+	for (;;) {
+		len = xread(0, buf, sizeof(buf));
+		if (len < 0)
+			die_errno("failure reading stdin");
+		if (!len)
+			break;
+
+		have_data = 1;
+
+		for (i = 0; i < len; i++)
+			printf("%02x ", (unsigned char)buf[i]);
+	}
+
+	if (have_data)
+		putchar('\n');
+
+	return 0;
+}
diff --git a/t/helper/test-pack-mtimes.c b/t/helper/test-pack-mtimes.c
new file mode 100644
index 0000000000..f7b79daf4c
--- /dev/null
+++ b/t/helper/test-pack-mtimes.c
@@ -0,0 +1,56 @@
+#include "git-compat-util.h"
+#include "test-tool.h"
+#include "strbuf.h"
+#include "object-store.h"
+#include "packfile.h"
+#include "pack-mtimes.h"
+
+static void dump_mtimes(struct packed_git *p)
+{
+	uint32_t i;
+	if (load_pack_mtimes(p) < 0)
+		die("could not load pack .mtimes");
+
+	for (i = 0; i < p->num_objects; i++) {
+		struct object_id oid;
+		if (nth_packed_object_id(&oid, p, i) < 0)
+			die("could not load object id at position %"PRIu32, i);
+
+		printf("%s %"PRIu32"\n",
+		       oid_to_hex(&oid), nth_packed_mtime(p, i));
+	}
+}
+
+static const char *pack_mtimes_usage = "\n"
+"  test-tool pack-mtimes <pack-name.mtimes>";
+
+int cmd__pack_mtimes(int argc, const char **argv)
+{
+	struct strbuf buf = STRBUF_INIT;
+	struct packed_git *p;
+
+	setup_git_directory();
+
+	if (argc != 2)
+		usage(pack_mtimes_usage);
+
+	for (p = get_all_packs(the_repository); p; p = p->next) {
+		strbuf_addstr(&buf, basename(p->pack_name));
+		strbuf_strip_suffix(&buf, ".pack");
+		strbuf_addstr(&buf, ".mtimes");
+
+		if (!strcmp(buf.buf, argv[1]))
+			break;
+
+		strbuf_reset(&buf);
+	}
+
+	strbuf_release(&buf);
+
+	if (!p)
+		die("could not find pack '%s'", argv[1]);
+
+	dump_mtimes(p);
+
+	return 0;
+}
diff --git a/t/helper/test-revision-walking.c b/t/helper/test-revision-walking.c
index 625b2dbf82..4a45d5bac2 100644
--- a/t/helper/test-revision-walking.c
+++ b/t/helper/test-revision-walking.c
@@ -43,6 +43,7 @@ static int run_revision_walk(void)
 	}
 
 	reset_revision_walk();
+	release_revisions(&rev);
 	return got_revision;
 }
 
diff --git a/t/helper/test-run-command.c b/t/helper/test-run-command.c
index f3b90aa834..c9283b47af 100644
--- a/t/helper/test-run-command.c
+++ b/t/helper/test-run-command.c
@@ -31,7 +31,11 @@ static int parallel_next(struct child_process *cp,
 		return 0;
 
 	strvec_pushv(&cp->args, d->args.v);
-	strbuf_addstr(err, "preloaded output of a child\n");
+	if (err)
+		strbuf_addstr(err, "preloaded output of a child\n");
+	else
+		fprintf(stderr, "preloaded output of a child\n");
+
 	number_callbacks++;
 	return 1;
 }
@@ -41,7 +45,10 @@ static int no_job(struct child_process *cp,
 		  void *cb,
 		  void **task_cb)
 {
-	strbuf_addstr(err, "no further jobs available\n");
+	if (err)
+		strbuf_addstr(err, "no further jobs available\n");
+	else
+		fprintf(stderr, "no further jobs available\n");
 	return 0;
 }
 
@@ -50,7 +57,10 @@ static int task_finished(int result,
 			 void *pp_cb,
 			 void *pp_task_cb)
 {
-	strbuf_addstr(err, "asking for a quick stop\n");
+	if (err)
+		strbuf_addstr(err, "asking for a quick stop\n");
+	else
+		fprintf(stderr, "asking for a quick stop\n");
 	return 1;
 }
 
@@ -390,7 +400,7 @@ int cmd__run_command(int argc, const char **argv)
 	while (!strcmp(argv[1], "env")) {
 		if (!argv[2])
 			die("env specifier without a value");
-		strvec_push(&proc.env_array, argv[2]);
+		strvec_push(&proc.env, argv[2]);
 		argv += 2;
 		argc -= 2;
 	}
@@ -407,6 +417,12 @@ int cmd__run_command(int argc, const char **argv)
 	if (!strcmp(argv[1], "run-command"))
 		exit(run_command(&proc));
 
+	if (!strcmp(argv[1], "--ungroup")) {
+		argv += 1;
+		argc -= 1;
+		run_processes_parallel_ungroup = 1;
+	}
+
 	jobs = atoi(argv[2]);
 	strvec_clear(&proc.args);
 	strvec_pushv(&proc.args, (const char **)argv + 3);
diff --git a/t/helper/test-tool.c b/t/helper/test-tool.c
index 0424f7adf5..318fdbab0c 100644
--- a/t/helper/test-tool.c
+++ b/t/helper/test-tool.c
@@ -38,6 +38,7 @@ static struct test_cmd cmds[] = {
 	{ "getcwd", cmd__getcwd },
 	{ "hashmap", cmd__hashmap },
 	{ "hash-speed", cmd__hash_speed },
+	{ "hexdump", cmd__hexdump },
 	{ "index-version", cmd__index_version },
 	{ "json-writer", cmd__json_writer },
 	{ "lazy-init-name-hash", cmd__lazy_init_name_hash },
@@ -48,6 +49,7 @@ static struct test_cmd cmds[] = {
 	{ "oidmap", cmd__oidmap },
 	{ "oidtree", cmd__oidtree },
 	{ "online-cpus", cmd__online_cpus },
+	{ "pack-mtimes", cmd__pack_mtimes },
 	{ "parse-options", cmd__parse_options },
 	{ "parse-pathspec-file", cmd__parse_pathspec_file },
 	{ "partial-clone", cmd__partial_clone },
diff --git a/t/helper/test-tool.h b/t/helper/test-tool.h
index c876e8246f..bb79927163 100644
--- a/t/helper/test-tool.h
+++ b/t/helper/test-tool.h
@@ -29,6 +29,7 @@ int cmd__genzeros(int argc, const char **argv);
 int cmd__getcwd(int argc, const char **argv);
 int cmd__hashmap(int argc, const char **argv);
 int cmd__hash_speed(int argc, const char **argv);
+int cmd__hexdump(int argc, const char **argv);
 int cmd__index_version(int argc, const char **argv);
 int cmd__json_writer(int argc, const char **argv);
 int cmd__lazy_init_name_hash(int argc, const char **argv);
@@ -38,6 +39,7 @@ int cmd__mktemp(int argc, const char **argv);
 int cmd__oidmap(int argc, const char **argv);
 int cmd__oidtree(int argc, const char **argv);
 int cmd__online_cpus(int argc, const char **argv);
+int cmd__pack_mtimes(int argc, const char **argv);
 int cmd__parse_options(int argc, const char **argv);
 int cmd__parse_pathspec_file(int argc, const char** argv);
 int cmd__partial_clone(int argc, const char **argv);
diff --git a/t/helper/test-trace2.c b/t/helper/test-trace2.c
index 59b124bb5f..a714130ece 100644
--- a/t/helper/test-trace2.c
+++ b/t/helper/test-trace2.c
@@ -198,7 +198,7 @@ static int ut_006data(int argc, const char **argv)
 	return 0;
 }
 
-static int ut_007bug(int argc, const char **argv)
+static int ut_007BUG(int argc, const char **argv)
 {
 	/*
 	 * Exercise BUG() to ensure that the message is printed to trace2.
@@ -206,6 +206,28 @@ static int ut_007bug(int argc, const char **argv)
 	BUG("the bug message");
 }
 
+static int ut_008bug(int argc, const char **argv)
+{
+	bug("a bug message");
+	bug("another bug message");
+	BUG_if_bug("an explicit BUG_if_bug() following bug() call(s) is nice, but not required");
+	return 0;
+}
+
+static int ut_009bug_BUG(int argc, const char **argv)
+{
+	bug("a bug message");
+	bug("another bug message");
+	/* The BUG_if_bug(...) isn't here, but we'll spot bug() calls on exit()! */
+	return 0;
+}
+
+static int ut_010bug_BUG(int argc, const char **argv)
+{
+	bug("a %s message", "bug");
+	BUG("a %s message", "BUG");
+}
+
 /*
  * Usage:
  *     test-tool trace2 <ut_name_1> <ut_usage_1>
@@ -222,7 +244,10 @@ static struct unit_test ut_table[] = {
 	{ ut_004child,    "004child",  "[<child_command_line>]" },
 	{ ut_005exec,     "005exec",   "<git_command_args>" },
 	{ ut_006data,     "006data",   "[<category> <key> <value>]+" },
-	{ ut_007bug,      "007bug",    "" },
+	{ ut_007BUG,      "007bug",    "" },
+	{ ut_008bug,      "008bug",    "" },
+	{ ut_009bug_BUG,  "009bug_BUG","" },
+	{ ut_010bug_BUG,  "010bug_BUG","" },
 };
 /* clang-format on */
 
diff --git a/t/lib-git-p4.sh b/t/lib-git-p4.sh
index 5aff2abe8b..2a5b8738ea 100644
--- a/t/lib-git-p4.sh
+++ b/t/lib-git-p4.sh
@@ -142,10 +142,11 @@ start_p4d () {
 
 p4_add_user () {
 	name=$1 &&
+	fullname="${2:-Dr. $1}"
 	p4 user -f -i <<-EOF
 	User: $name
 	Email: $name@example.com
-	FullName: Dr. $name
+	FullName: $fullname
 	EOF
 }
 
diff --git a/t/lib-git-svn.sh b/t/lib-git-svn.sh
index 2fde2353fd..ea28971e8e 100644
--- a/t/lib-git-svn.sh
+++ b/t/lib-git-svn.sh
@@ -1,3 +1,7 @@
+if test -z "$TEST_FAILS_SANITIZE_LEAK"
+then
+	TEST_PASSES_SANITIZE_LEAK=true
+fi
 . ./test-lib.sh
 
 if test -n "$NO_SVN_TESTS"
diff --git a/t/lib-httpd.sh b/t/lib-httpd.sh
index 782891908d..1f6b9b08d1 100644
--- a/t/lib-httpd.sh
+++ b/t/lib-httpd.sh
@@ -29,7 +29,7 @@
 # Copyright (c) 2008 Clemens Buchacher <drizzd@aon.at>
 #
 
-if test -n "$NO_CURL"
+if ! test_have_prereq LIBCURL
 then
 	skip_all='skipping test, git built without http support'
 	test_done
diff --git a/t/lib-parallel-checkout.sh b/t/lib-parallel-checkout.sh
index 83b279a846..acaee9cbb6 100644
--- a/t/lib-parallel-checkout.sh
+++ b/t/lib-parallel-checkout.sh
@@ -25,7 +25,11 @@ test_checkout_workers () {
 
 	local trace_file=trace-test-checkout-workers &&
 	rm -f "$trace_file" &&
-	GIT_TRACE2="$(pwd)/$trace_file" "$@" 2>&8 &&
+	(
+		GIT_TRACE2="$(pwd)/$trace_file" &&
+		export GIT_TRACE2 &&
+		"$@" 2>&8
+	) &&
 
 	local workers="$(grep "child_start\[..*\] git checkout--worker" "$trace_file" | wc -l)" &&
 	test $workers -eq $expected_workers &&
diff --git a/t/lib-proto-disable.sh b/t/lib-proto-disable.sh
index 83babe57d9..890622be81 100644
--- a/t/lib-proto-disable.sh
+++ b/t/lib-proto-disable.sh
@@ -1,7 +1,7 @@
 # Test routines for checking protocol disabling.
 
-# Test clone/fetch/push with GIT_ALLOW_PROTOCOL whitelist
-test_whitelist () {
+# Test clone/fetch/push with GIT_ALLOW_PROTOCOL environment variable
+test_allow_var () {
 	desc=$1
 	proto=$2
 	url=$3
@@ -183,7 +183,7 @@ test_config () {
 #   $2 - machine-readable name of the protocol
 #   $3 - the URL to try cloning
 test_proto () {
-	test_whitelist "$@"
+	test_allow_var "$@"
 
 	test_config "$@"
 }
diff --git a/t/lib-t3100.sh b/t/lib-t3100.sh
new file mode 100644
index 0000000000..eabb5fd803
--- /dev/null
+++ b/t/lib-t3100.sh
@@ -0,0 +1,10 @@
+#!/bin/sh
+
+setup_basic_ls_tree_data () {
+	mkdir dir &&
+	test_commit dir/sub-file &&
+	test_commit top-file &&
+	git clone . submodule &&
+	git submodule add ./submodule &&
+	git commit -m"add submodule"
+}
diff --git a/t/lib-unicode-nfc-nfd.sh b/t/lib-unicode-nfc-nfd.sh
new file mode 100755
index 0000000000..22232247ef
--- /dev/null
+++ b/t/lib-unicode-nfc-nfd.sh
@@ -0,0 +1,162 @@
+# Help detect how Unicode NFC and NFD are handled on the filesystem.
+
+# A simple character that has a NFD form.
+#
+# NFC:       U+00e9 LATIN SMALL LETTER E WITH ACUTE
+# UTF8(NFC): \xc3 \xa9
+#
+# NFD:       U+0065 LATIN SMALL LETTER E
+#            U+0301 COMBINING ACUTE ACCENT
+# UTF8(NFD): \x65  +  \xcc \x81
+#
+utf8_nfc=$(printf "\xc3\xa9")
+utf8_nfd=$(printf "\x65\xcc\x81")
+
+# Is the OS or the filesystem "Unicode composition sensitive"?
+#
+# That is, does the OS or the filesystem allow files to exist with
+# both the NFC and NFD spellings?  Or, does the OS/FS lie to us and
+# tell us that the NFC and NFD forms are equivalent.
+#
+# This is or may be independent of what type of filesystem we have,
+# since it might be handled by the OS at a layer above the FS.
+# Testing shows on MacOS using APFS, HFS+, and FAT32 reports a
+# collision, for example.
+#
+# This does not tell us how the Unicode pathname will be spelled
+# on disk, but rather only that the two spelling "collide".  We
+# will examine the actual on disk spelling in a later prereq.
+#
+test_lazy_prereq UNICODE_COMPOSITION_SENSITIVE '
+	mkdir trial_${utf8_nfc} &&
+	mkdir trial_${utf8_nfd}
+'
+
+# Is the spelling of an NFC pathname preserved on disk?
+#
+# On MacOS with HFS+ and FAT32, NFC paths are converted into NFD
+# and on APFS, NFC paths are preserved.  As we have established
+# above, this is independent of "composition sensitivity".
+#
+test_lazy_prereq UNICODE_NFC_PRESERVED '
+	mkdir c_${utf8_nfc} &&
+	ls | test-tool hexdump >dump &&
+	grep "63 5f c3 a9" dump
+'
+
+# Is the spelling of an NFD pathname preserved on disk?
+#
+test_lazy_prereq UNICODE_NFD_PRESERVED '
+	mkdir d_${utf8_nfd} &&
+	ls | test-tool hexdump >dump &&
+	grep "64 5f 65 cc 81" dump
+'
+
+# The following _DOUBLE_ forms are more for my curiosity,
+# but there may be quirks lurking when there are multiple
+# combining characters in non-canonical order.
+
+# Unicode also allows multiple combining characters
+# that can be decomposed in pieces.
+#
+# NFC:        U+1f67 GREEK SMALL LETTER OMEGA WITH DASIA AND PERISPOMENI
+# UTF8(NFC):  \xe1 \xbd \xa7
+#
+# NFD1:       U+1f61 GREEK SMALL LETTER OMEGA WITH DASIA
+#             U+0342 COMBINING GREEK PERISPOMENI
+# UTF8(NFD1): \xe1 \xbd \xa1  +  \xcd \x82
+#
+# But U+1f61 decomposes into
+# NFD2:       U+03c9 GREEK SMALL LETTER OMEGA
+#             U+0314 COMBINING REVERSED COMMA ABOVE
+# UTF8(NFD2): \xcf \x89  +  \xcc \x94
+#
+# Yielding:   \xcf \x89  +  \xcc \x94  +  \xcd \x82
+#
+# Note that I've used the canonical ordering of the
+# combinining characters.  It is also possible to
+# swap them.  My testing shows that that non-standard
+# ordering also causes a collision in mkdir.  However,
+# the resulting names don't draw correctly on the
+# terminal (implying that the on-disk format also has
+# them out of order).
+#
+greek_nfc=$(printf "\xe1\xbd\xa7")
+greek_nfd1=$(printf "\xe1\xbd\xa1\xcd\x82")
+greek_nfd2=$(printf "\xcf\x89\xcc\x94\xcd\x82")
+
+# See if a double decomposition also collides.
+#
+test_lazy_prereq UNICODE_DOUBLE_COMPOSITION_SENSITIVE '
+	mkdir trial_${greek_nfc} &&
+	mkdir trial_${greek_nfd2}
+'
+
+# See if the NFC spelling appears on the disk.
+#
+test_lazy_prereq UNICODE_DOUBLE_NFC_PRESERVED '
+	mkdir c_${greek_nfc} &&
+	ls | test-tool hexdump >dump &&
+	grep "63 5f e1 bd a7" dump
+'
+
+# See if the NFD spelling appears on the disk.
+#
+test_lazy_prereq UNICODE_DOUBLE_NFD_PRESERVED '
+	mkdir d_${greek_nfd2} &&
+	ls | test-tool hexdump >dump &&
+	grep "64 5f cf 89 cc 94 cd 82" dump
+'
+
+# The following is for debugging. I found it useful when
+# trying to understand the various (OS, FS) quirks WRT
+# Unicode and how composition/decomposition is handled.
+# For example, when trying to understand how (macOS, APFS)
+# and (macOS, HFS) and (macOS, FAT32) compare.
+#
+# It is rather noisy, so it is disabled by default.
+#
+if test "$unicode_debug" = "true"
+then
+	if test_have_prereq UNICODE_COMPOSITION_SENSITIVE
+	then
+		echo NFC and NFD are distinct on this OS/filesystem.
+	else
+		echo NFC and NFD are aliases on this OS/filesystem.
+	fi
+
+	if test_have_prereq UNICODE_NFC_PRESERVED
+	then
+		echo NFC maintains original spelling.
+	else
+		echo NFC is modified.
+	fi
+
+	if test_have_prereq UNICODE_NFD_PRESERVED
+	then
+		echo NFD maintains original spelling.
+	else
+		echo NFD is modified.
+	fi
+
+	if test_have_prereq UNICODE_DOUBLE_COMPOSITION_SENSITIVE
+	then
+		echo DOUBLE NFC and NFD are distinct on this OS/filesystem.
+	else
+		echo DOUBLE NFC and NFD are aliases on this OS/filesystem.
+	fi
+
+	if test_have_prereq UNICODE_DOUBLE_NFC_PRESERVED
+	then
+		echo Double NFC maintains original spelling.
+	else
+		echo Double NFC is modified.
+	fi
+
+	if test_have_prereq UNICODE_DOUBLE_NFD_PRESERVED
+	then
+		echo Double NFD maintains original spelling.
+	else
+		echo Double NFD is modified.
+	fi
+fi
diff --git a/t/lib-unique-files.sh b/t/lib-unique-files.sh
new file mode 100644
index 0000000000..a14080fe79
--- /dev/null
+++ b/t/lib-unique-files.sh
@@ -0,0 +1,34 @@
+# Helper to create files with unique contents
+
+# Create multiple files with unique contents within this test run. Takes the
+# number of directories, the number of files in each directory, and the base
+# directory.
+#
+# test_create_unique_files 2 3 my_dir -- Creates 2 directories with 3 files
+#					 each in my_dir, all with contents
+#					 different from previous invocations
+#					 of this command in this run.
+
+test_create_unique_files () {
+	test "$#" -ne 3 && BUG "3 param"
+
+	local dirs="$1" &&
+	local files="$2" &&
+	local basedir="$3" &&
+	local counter="0" &&
+	local i &&
+	local j &&
+	test_tick &&
+	local basedata="$basedir$test_tick" &&
+	rm -rf "$basedir" &&
+	for i in $(test_seq $dirs)
+	do
+		local dir="$basedir/dir$i" &&
+		mkdir -p "$dir" &&
+		for j in $(test_seq $files)
+		do
+			counter=$((counter + 1)) &&
+			echo "$basedata.$counter">"$dir/file$j.txt"
+		done
+	done
+}
diff --git a/t/perf/p0008-odb-fsync.sh b/t/perf/p0008-odb-fsync.sh
new file mode 100755
index 0000000000..b3a90f30eb
--- /dev/null
+++ b/t/perf/p0008-odb-fsync.sh
@@ -0,0 +1,82 @@
+#!/bin/sh
+#
+# This test measures the performance of adding new files to the object
+# database. The test was originally added to measure the effect of the
+# core.fsyncMethod=batch mode, which is why we are testing different values of
+# that setting explicitly and creating a lot of unique objects.
+
+test_description="Tests performance of adding things to the object database"
+
+. ./perf-lib.sh
+
+. $TEST_DIRECTORY/lib-unique-files.sh
+
+test_perf_fresh_repo
+test_checkout_worktree
+
+dir_count=10
+files_per_dir=50
+total_files=$((dir_count * files_per_dir))
+
+populate_files () {
+	test_create_unique_files $dir_count $files_per_dir files
+}
+
+setup_repo () {
+	(rm -rf .git || 1) &&
+	git init &&
+	test_commit first &&
+	populate_files
+}
+
+test_perf_fsync_cfgs () {
+	local method &&
+	local cfg &&
+	for method in none fsync batch writeout-only
+	do
+		case $method in
+		none)
+			cfg="-c core.fsync=none"
+			;;
+		*)
+			cfg="-c core.fsync=loose-object -c core.fsyncMethod=$method"
+		esac &&
+
+		# Set GIT_TEST_FSYNC=1 explicitly since fsync is normally
+		# disabled by t/test-lib.sh.
+		if ! test_perf "$1 (fsyncMethod=$method)" \
+						--setup "$2" \
+						"GIT_TEST_FSYNC=1 git $cfg $3"
+		then
+			break
+		fi
+	done
+}
+
+test_perf_fsync_cfgs "add $total_files files" \
+	"setup_repo" \
+	"add -- files"
+
+test_perf_fsync_cfgs "stash $total_files files" \
+	"setup_repo" \
+	"stash push -u -- files"
+
+test_perf_fsync_cfgs "unpack $total_files files" \
+	"
+	setup_repo &&
+	git -c core.fsync=none add -- files &&
+	git -c core.fsync=none commit -q -m second &&
+	echo HEAD | git pack-objects -q --stdout --revs >test_pack.pack &&
+	setup_repo
+	" \
+	"unpack-objects -q <test_pack.pack"
+
+test_perf_fsync_cfgs "commit $total_files files" \
+	"
+	setup_repo &&
+	git -c core.fsync=none add -- files &&
+	populate_files
+	" \
+	"commit -q -a -m test"
+
+test_done
diff --git a/t/perf/p2000-sparse-operations.sh b/t/perf/p2000-sparse-operations.sh
index 382716cfca..c181110a43 100755
--- a/t/perf/p2000-sparse-operations.sh
+++ b/t/perf/p2000-sparse-operations.sh
@@ -106,10 +106,13 @@ test_perf_on_all () {
 }
 
 test_perf_on_all git status
+test_perf_on_all 'git stash && git stash pop'
+test_perf_on_all 'echo >>new && git stash -u && git stash pop'
 test_perf_on_all git add -A
 test_perf_on_all git add .
 test_perf_on_all git commit -a -m A
 test_perf_on_all git checkout -f -
+test_perf_on_all "git sparse-checkout add f2/f3/f1 && git sparse-checkout set $SPARSE_CONE"
 test_perf_on_all git reset
 test_perf_on_all git reset --hard
 test_perf_on_all git reset -- does-not-exist
diff --git a/t/perf/p4220-log-grep-engines.sh b/t/perf/p4220-log-grep-engines.sh
index 2bc47ded4d..03fbfbb85d 100755
--- a/t/perf/p4220-log-grep-engines.sh
+++ b/t/perf/p4220-log-grep-engines.sh
@@ -36,7 +36,8 @@ do
 		else
 			prereq=""
 		fi
-		test_perf $prereq "$engine log$GIT_PERF_4220_LOG_OPTS --grep='$pattern'" "
+		test_perf "$engine log$GIT_PERF_4220_LOG_OPTS --grep='$pattern'" \
+			--prereq "$prereq" "
 			git -c grep.patternType=$engine log --pretty=format:%h$GIT_PERF_4220_LOG_OPTS --grep='$pattern' >'out.$engine' || :
 		"
 	done
diff --git a/t/perf/p4221-log-grep-engines-fixed.sh b/t/perf/p4221-log-grep-engines-fixed.sh
index 060971265a..0a6d6dfc21 100755
--- a/t/perf/p4221-log-grep-engines-fixed.sh
+++ b/t/perf/p4221-log-grep-engines-fixed.sh
@@ -26,7 +26,8 @@ do
 		else
 			prereq=""
 		fi
-		test_perf $prereq "$engine log$GIT_PERF_4221_LOG_OPTS --grep='$pattern'" "
+		test_perf "$engine log$GIT_PERF_4221_LOG_OPTS --grep='$pattern'" \
+			--prereq "$prereq" "
 			git -c grep.patternType=$engine log --pretty=format:%h$GIT_PERF_4221_LOG_OPTS --grep='$pattern' >'out.$engine' || :
 		"
 	done
diff --git a/t/perf/p5302-pack-index.sh b/t/perf/p5302-pack-index.sh
index c16f6a3ff6..14c601bbf8 100755
--- a/t/perf/p5302-pack-index.sh
+++ b/t/perf/p5302-pack-index.sh
@@ -26,9 +26,8 @@ test_expect_success 'set up thread-counting tests' '
 	done
 '
 
-test_perf PERF_EXTRA 'index-pack 0 threads' '
-	rm -rf repo.git &&
-	git init --bare repo.git &&
+test_perf 'index-pack 0 threads' --prereq PERF_EXTRA \
+	--setup 'rm -rf repo.git && git init --bare repo.git' '
 	GIT_DIR=repo.git git index-pack --threads=1 --stdin < $PACK
 '
 
@@ -36,17 +35,15 @@ for t in $threads
 do
 	THREADS=$t
 	export THREADS
-	test_perf PERF_EXTRA "index-pack $t threads" '
-		rm -rf repo.git &&
-		git init --bare repo.git &&
+	test_perf "index-pack $t threads" --prereq PERF_EXTRA \
+		--setup 'rm -rf repo.git && git init --bare repo.git' '
 		GIT_DIR=repo.git GIT_FORCE_THREADS=1 \
 		git index-pack --threads=$THREADS --stdin <$PACK
 	'
 done
 
-test_perf 'index-pack default number of threads' '
-	rm -rf repo.git &&
-	git init --bare repo.git &&
+test_perf 'index-pack default number of threads' \
+	--setup 'rm -rf repo.git && git init --bare repo.git' '
 	GIT_DIR=repo.git git index-pack --stdin < $PACK
 '
 
diff --git a/t/perf/p7519-fsmonitor.sh b/t/perf/p7519-fsmonitor.sh
index 0b9129ca7b..b1cb23880f 100755
--- a/t/perf/p7519-fsmonitor.sh
+++ b/t/perf/p7519-fsmonitor.sh
@@ -60,18 +60,6 @@ then
 	esac
 fi
 
-if test -n "$GIT_PERF_7519_DROP_CACHE"
-then
-	# When using GIT_PERF_7519_DROP_CACHE, GIT_PERF_REPEAT_COUNT must be 1 to
-	# generate valid results. Otherwise the caching that happens for the nth
-	# run will negate the validity of the comparisons.
-	if test "$GIT_PERF_REPEAT_COUNT" -ne 1
-	then
-		echo "warning: Setting GIT_PERF_REPEAT_COUNT=1" >&2
-		GIT_PERF_REPEAT_COUNT=1
-	fi
-fi
-
 trace_start () {
 	if test -n "$GIT_PERF_7519_TRACE"
 	then
@@ -175,10 +163,10 @@ setup_for_fsmonitor_hook () {
 
 test_perf_w_drop_caches () {
 	if test -n "$GIT_PERF_7519_DROP_CACHE"; then
-		test-tool drop-caches
+		test_perf "$1" --setup "test-tool drop-caches" "$2"
+	else
+		test_perf "$@"
 	fi
-
-	test_perf "$@"
 }
 
 test_fsmonitor_suite () {
diff --git a/t/perf/p7527-builtin-fsmonitor.sh b/t/perf/p7527-builtin-fsmonitor.sh
new file mode 100755
index 0000000000..9338b9ea00
--- /dev/null
+++ b/t/perf/p7527-builtin-fsmonitor.sh
@@ -0,0 +1,257 @@
+#!/bin/sh
+
+test_description="Perf test for the builtin FSMonitor"
+
+. ./perf-lib.sh
+
+if ! test_have_prereq FSMONITOR_DAEMON
+then
+	skip_all="fsmonitor--daemon is not supported on this platform"
+	test_done
+fi
+
+test_lazy_prereq UNTRACKED_CACHE '
+	{ git update-index --test-untracked-cache; ret=$?; } &&
+	test $ret -ne 1
+'
+
+# Lie to perf-lib and ask for a new empty repo and avoid
+# the complaints about GIT_PERF_REPO not being big enough
+# the perf hit when GIT_PERF_LARGE_REPO is copied into
+# the trash directory.
+#
+# NEEDSWORK: It would be nice if perf-lib had an option to
+# "borrow" an existing large repo (especially for gigantic
+# monorepos) and use it in-place.  For now, fake it here.
+#
+test_perf_fresh_repo
+
+
+# Use a generated synthetic monorepo.  If it doesn't exist, we will
+# generate it.  If it does exist, we will put it in a known state
+# before we start our timings.
+#
+PARAM_D=5
+PARAM_W=10
+PARAM_F=9
+
+PARAMS="$PARAM_D"."$PARAM_W"."$PARAM_F"
+
+BALLAST_BR=p0006-ballast
+export BALLAST_BR
+
+TMP_BR=tmp_br
+export TMP_BR
+
+REPO=../repos/gen-many-files-"$PARAMS".git
+export REPO
+
+if ! test -d $REPO
+then
+	(cd ../repos; ./many-files.sh -d $PARAM_D -w $PARAM_W -f $PARAM_F)
+fi
+
+
+enable_uc () {
+	git -C $REPO config core.untrackedcache true
+	git -C $REPO update-index --untracked-cache
+	git -C $REPO status >/dev/null 2>&1
+}
+
+disable_uc () {
+	git -C $REPO config core.untrackedcache false
+	git -C $REPO update-index --no-untracked-cache
+	git -C $REPO status >/dev/null 2>&1
+}
+
+start_fsm () {
+	git -C $REPO fsmonitor--daemon start
+	git -C $REPO fsmonitor--daemon status
+	git -C $REPO config core.fsmonitor true
+	git -C $REPO update-index --fsmonitor
+	git -C $REPO status >/dev/null 2>&1
+}
+
+stop_fsm () {
+	git -C $REPO config --unset core.fsmonitor
+	git -C $REPO update-index --no-fsmonitor
+	test_might_fail git -C $REPO fsmonitor--daemon stop 2>/dev/null
+	git -C $REPO status >/dev/null 2>&1
+}
+
+
+# Ensure that FSMonitor is turned off on the borrowed repo.
+#
+test_expect_success "Setup borrowed repo (fsm+uc)" "
+	stop_fsm &&
+	disable_uc
+"
+
+# Also ensure that it starts in a known state.
+#
+# Because we assume that $GIT_PERF_REPEAT_COUNT > 1, we are not going to time
+# the ballast checkout, since only the first invocation does any work and the
+# subsequent ones just print "already on branch" and quit, so the reported
+# time is not useful.
+#
+# Create a temp branch and do all work relative to it so that we don't
+# accidentially alter the real ballast branch.
+#
+test_expect_success "Setup borrowed repo (temp ballast branch)" "
+	test_might_fail git -C $REPO checkout $BALLAST_BR &&
+	test_might_fail git -C $REPO reset --hard &&
+	git -C $REPO clean -d -f &&
+	test_might_fail git -C $REPO branch -D $TMP_BR &&
+	git -C $REPO branch $TMP_BR $BALLAST_BR &&
+	git -C $REPO checkout $TMP_BR
+"
+
+
+echo Data >data.txt
+
+# NEEDSWORK: We assume that $GIT_PERF_REPEAT_COUNT > 1.  With
+# FSMonitor enabled, we can get a skewed view of status times, since
+# the index MAY (or may not) be updated after the first invocation
+# which will update the FSMonitor Token, so the subsequent invocations
+# may get a smaller response from the daemon.
+#
+do_status () {
+	msg=$1
+
+	test_perf "$msg" "
+		git -C $REPO status >/dev/null 2>&1
+	"
+}
+
+do_matrix () {
+	uc=$1
+	fsm=$2
+
+	t="[uc $uc][fsm $fsm]"
+	MATRIX_BR="$TMP_BR-$uc-$fsm"
+
+	test_expect_success "$t Setup matrix branch" "
+		git -C $REPO clean -d -f &&
+		git -C $REPO checkout $TMP_BR &&
+		test_might_fail git -C $REPO branch -D $MATRIX_BR &&
+		git -C $REPO branch $MATRIX_BR $TMP_BR &&
+		git -C $REPO checkout $MATRIX_BR
+	"
+
+	if test $uc = true
+	then
+		enable_uc
+	else
+		disable_uc
+	fi
+
+	if test $fsm = true
+	then
+		start_fsm
+	else
+		stop_fsm
+	fi
+
+	do_status "$t status after checkout"
+
+	# Modify many files in the matrix branch.
+	# Stage them.
+	# Commit them.
+	# Rollback.
+	#
+	test_expect_success "$t modify tracked files" "
+		find $REPO -name file1 -exec cp data.txt {} \\;
+	"
+
+	do_status "$t status after big change"
+
+	# Don't bother timing the "add" because _REPEAT_COUNT
+	# issue described above.
+	#
+	test_expect_success "$t add all" "
+		git -C $REPO add -A
+	"
+
+	do_status "$t status after add all"
+
+	test_expect_success "$t add dot" "
+		git -C $REPO add .
+	"
+
+	do_status "$t status after add dot"
+
+	test_expect_success "$t commit staged" "
+		git -C $REPO commit -a -m data
+	"
+
+	do_status "$t status after commit"
+
+	test_expect_success "$t reset HEAD~1 hard" "
+		git -C $REPO reset --hard HEAD~1 >/dev/null 2>&1
+	"
+
+	do_status "$t status after reset hard"
+
+	# Create some untracked files.
+	#
+	test_expect_success "$t create untracked files" "
+		cp -R $REPO/ballast/dir1 $REPO/ballast/xxx1
+	"
+
+	do_status "$t status after create untracked files"
+
+	# Remove the new untracked files.
+	#
+	test_expect_success "$t clean -df" "
+		git -C $REPO clean -d -f
+	"
+
+	do_status "$t status after clean"
+
+	if test $fsm = true
+	then
+		stop_fsm
+	fi
+}
+
+# Begin testing each case in the matrix that we care about.
+#
+uc_values="false"
+test_have_prereq UNTRACKED_CACHE && uc_values="false true"
+
+fsm_values="false true"
+
+for uc_val in $uc_values
+do
+	for fsm_val in $fsm_values
+	do
+		do_matrix $uc_val $fsm_val
+	done
+done
+
+cleanup () {
+	uc=$1
+	fsm=$2
+
+	MATRIX_BR="$TMP_BR-$uc-$fsm"
+
+	test_might_fail git -C $REPO branch -D $MATRIX_BR
+}
+
+
+# We're borrowing this repo.  We should leave it in a clean state.
+#
+test_expect_success "Cleanup temp and matrix branches" "
+	git -C $REPO clean -d -f &&
+	test_might_fail git -C $REPO checkout $BALLAST_BR &&
+	test_might_fail git -C $REPO branch -D $TMP_BR &&
+	for uc_val in $uc_values
+	do
+		for fsm_val in $fsm_values
+		do
+			cleanup $uc_val $fsm_val
+		done
+	done
+"
+
+test_done
diff --git a/t/perf/p7820-grep-engines.sh b/t/perf/p7820-grep-engines.sh
index 8b09c5bf32..9bfb86842a 100755
--- a/t/perf/p7820-grep-engines.sh
+++ b/t/perf/p7820-grep-engines.sh
@@ -49,13 +49,15 @@ do
 		fi
 		if ! test_have_prereq PERF_GREP_ENGINES_THREADS
 		then
-			test_perf $prereq "$engine grep$GIT_PERF_7820_GREP_OPTS '$pattern'" "
+			test_perf "$engine grep$GIT_PERF_7820_GREP_OPTS '$pattern'" \
+				--prereq "$prereq" "
 				git -c grep.patternType=$engine grep$GIT_PERF_7820_GREP_OPTS -- '$pattern' >'out.$engine' || :
 			"
 		else
 			for threads in $GIT_PERF_GREP_THREADS
 			do
-				test_perf PTHREADS,$prereq "$engine grep$GIT_PERF_7820_GREP_OPTS '$pattern' with $threads threads" "
+				test_perf "$engine grep$GIT_PERF_7820_GREP_OPTS '$pattern' with $threads threads"
+					--prereq PTHREADS,$prereq "
 					git -c grep.patternType=$engine -c grep.threads=$threads grep$GIT_PERF_7820_GREP_OPTS -- '$pattern' >'out.$engine.$threads' || :
 				"
 			done
diff --git a/t/perf/perf-lib.sh b/t/perf/perf-lib.sh
index 932105cd12..27c2801792 100644
--- a/t/perf/perf-lib.sh
+++ b/t/perf/perf-lib.sh
@@ -189,19 +189,39 @@ exit $ret' >&3 2>&4
 }
 
 test_wrapper_ () {
-	test_wrapper_func_=$1; shift
+	local test_wrapper_func_="$1"; shift
+	local test_title_="$1"; shift
 	test_start_
-	test "$#" = 3 && { test_prereq=$1; shift; } || test_prereq=
-	test "$#" = 2 ||
-	BUG "not 2 or 3 parameters to test-expect-success"
+	test_prereq=
+	test_perf_setup_=
+	while test $# != 0
+	do
+		case $1 in
+		--prereq)
+			test_prereq=$2
+			shift
+			;;
+		--setup)
+			test_perf_setup_=$2
+			shift
+			;;
+		*)
+			break
+			;;
+		esac
+		shift
+	done
+	test "$#" = 1 || BUG "test_wrapper_ needs 2 positional parameters"
 	export test_prereq
-	if ! test_skip "$@"
+	export test_perf_setup_
+
+	if ! test_skip "$test_title_" "$@"
 	then
 		base=$(basename "$0" .sh)
 		echo "$test_count" >>"$perf_results_dir"/$base.subtests
-		echo "$1" >"$perf_results_dir"/$base.$test_count.descr
+		echo "$test_title_" >"$perf_results_dir"/$base.$test_count.descr
 		base="$perf_results_dir"/"$PERF_RESULTS_PREFIX$(basename "$0" .sh)"."$test_count"
-		"$test_wrapper_func_" "$@"
+		"$test_wrapper_func_" "$test_title_" "$@"
 	fi
 
 	test_finish_
@@ -214,6 +234,16 @@ test_perf_ () {
 		echo "perf $test_count - $1:"
 	fi
 	for i in $(test_seq 1 $GIT_PERF_REPEAT_COUNT); do
+		if test -n "$test_perf_setup_"
+		then
+			say >&3 "setup: $test_perf_setup_"
+			if ! test_eval_ $test_perf_setup_
+			then
+				test_failure_ "$test_perf_setup_"
+				break
+			fi
+
+		fi
 		say >&3 "running: $2"
 		if test_run_perf_ "$2"
 		then
@@ -237,11 +267,24 @@ test_perf_ () {
 	rm test_time.*
 }
 
+# Usage: test_perf 'title' [options] 'perf-test'
+#	Run the performance test script specified in perf-test with
+#	optional prerequisite and setup steps.
+# Options:
+#	--prereq prerequisites: Skip the test if prequisites aren't met
+#	--setup "setup-steps": Run setup steps prior to each measured iteration
+#
 test_perf () {
 	test_wrapper_ test_perf_ "$@"
 }
 
 test_size_ () {
+	if test -n "$test_perf_setup_"
+	then
+		say >&3 "setup: $test_perf_setup_"
+		test_eval_ $test_perf_setup_
+	fi
+
 	say >&3 "running: $2"
 	if test_eval_ "$2" 3>"$base".result; then
 		test_ok_ "$1"
@@ -250,6 +293,14 @@ test_size_ () {
 	fi
 }
 
+# Usage: test_size 'title' [options] 'size-test'
+#	Run the size test script specified in size-test with optional
+#	prerequisites and setup steps. Returns the numeric value
+#	returned by size-test.
+# Options:
+#	--prereq prerequisites: Skip the test if prequisites aren't met
+#	--setup "setup-steps": Run setup steps prior to the size measurement
+
 test_size () {
 	test_wrapper_ test_size_ "$@"
 }
diff --git a/t/t0012-help.sh b/t/t0012-help.sh
index 6c3e1f7159..6c33a43690 100755
--- a/t/t0012-help.sh
+++ b/t/t0012-help.sh
@@ -181,7 +181,7 @@ for cmd in git "git help"
 do
 	test_expect_success "'$cmd' section spacing" '
 		test_section_spacing_trailer git help <<-\EOF &&
-		usage: git [--version] [--help] [-C <path>] [-c <name>=<value>]
+		usage: git [-v | --version] [-h | --help] [-C <path>] [-c <name>=<value>]
 
 		These are common Git commands used in various situations:
 
diff --git a/t/t0021-conversion.sh b/t/t0021-conversion.sh
index bad37abad2..1c840348bd 100755
--- a/t/t0021-conversion.sh
+++ b/t/t0021-conversion.sh
@@ -1132,4 +1132,26 @@ do
 	'
 done
 
+test_expect_success PERL 'delayed checkout correctly reports the number of updated entries' '
+	rm -rf repo &&
+	git init repo &&
+	(
+		cd repo &&
+		git config filter.delay.process "../rot13-filter.pl delayed.log clean smudge delay" &&
+		git config filter.delay.required true &&
+
+		echo "*.a filter=delay" >.gitattributes &&
+		echo a >test-delay10.a &&
+		echo a >test-delay11.a &&
+		git add . &&
+		git commit -m files &&
+
+		rm *.a &&
+		git checkout . 2>err &&
+		grep "IN: smudge test-delay10.a .* \\[DELAYED\\]" delayed.log &&
+		grep "IN: smudge test-delay11.a .* \\[DELAYED\\]" delayed.log &&
+		grep "Updated 2 paths from the index" err
+	)
+'
+
 test_done
diff --git a/t/t0027-auto-crlf.sh b/t/t0027-auto-crlf.sh
index 0feb41a23f..7f80f46393 100755
--- a/t/t0027-auto-crlf.sh
+++ b/t/t0027-auto-crlf.sh
@@ -77,12 +77,12 @@ create_NNO_MIX_files () {
 
 check_warning () {
 	case "$1" in
-	LF_CRLF) echo "warning: LF will be replaced by CRLF" >"$2".expect ;;
-	CRLF_LF) echo "warning: CRLF will be replaced by LF" >"$2".expect ;;
-	'')	                                                 >"$2".expect ;;
+	LF_CRLF) echo "LF will be replaced by CRLF" >"$2".expect ;;
+	CRLF_LF) echo "CRLF will be replaced by LF" >"$2".expect ;;
+	'')	                                    >"$2".expect ;;
 	*) echo >&2 "Illegal 1": "$1" ; return false ;;
 	esac
-	grep "will be replaced by" "$2" | sed -e "s/\(.*\) in [^ ]*$/\1/" | uniq  >"$2".actual
+	sed -e "s/^.* \([^ ]* will be replaced by [^ ]*\) .*$/\1/" "$2" | uniq  >"$2".actual
 	test_cmp "$2".expect "$2".actual
 }
 
diff --git a/t/t0033-safe-directory.sh b/t/t0033-safe-directory.sh
index 239d93f4d2..3908597d42 100755
--- a/t/t0033-safe-directory.sh
+++ b/t/t0033-safe-directory.sh
@@ -9,13 +9,41 @@ export GIT_TEST_ASSUME_DIFFERENT_OWNER
 
 expect_rejected_dir () {
 	test_must_fail git status 2>err &&
-	grep "safe.directory" err
+	grep "dubious ownership" err
 }
 
 test_expect_success 'safe.directory is not set' '
 	expect_rejected_dir
 '
 
+test_expect_success 'ignoring safe.directory on the command line' '
+	test_must_fail git -c safe.directory="$(pwd)" status 2>err &&
+	grep "dubious ownership" err
+'
+
+test_expect_success 'ignoring safe.directory in the environment' '
+	test_must_fail env GIT_CONFIG_COUNT=1 \
+		GIT_CONFIG_KEY_0="safe.directory" \
+		GIT_CONFIG_VALUE_0="$(pwd)" \
+		git status 2>err &&
+	grep "dubious ownership" err
+'
+
+test_expect_success 'ignoring safe.directory in GIT_CONFIG_PARAMETERS' '
+	test_must_fail env \
+		GIT_CONFIG_PARAMETERS="${SQ}safe.directory${SQ}=${SQ}$(pwd)${SQ}" \
+		git status 2>err &&
+	grep "dubious ownership" err
+'
+
+test_expect_success 'ignoring safe.directory in repo config' '
+	(
+		unset GIT_TEST_ASSUME_DIFFERENT_OWNER &&
+		git config safe.directory "$(pwd)"
+	) &&
+	expect_rejected_dir
+'
+
 test_expect_success 'safe.directory does not match' '
 	git config --global safe.directory bogus &&
 	expect_rejected_dir
diff --git a/t/t0056-git-C.sh b/t/t0056-git-C.sh
index 2630e756da..752aa8c945 100755
--- a/t/t0056-git-C.sh
+++ b/t/t0056-git-C.sh
@@ -2,6 +2,7 @@
 
 test_description='"-C <path>" option and its effects on other path-related options'
 
+TEST_PASSES_SANITIZE_LEAK=true
 . ./test-lib.sh
 
 test_expect_success '"git -C <path>" runs git from the directory <path>' '
diff --git a/t/t0061-run-command.sh b/t/t0061-run-command.sh
index ee281909bc..7b5423eebd 100755
--- a/t/t0061-run-command.sh
+++ b/t/t0061-run-command.sh
@@ -134,16 +134,34 @@ test_expect_success 'run_command runs in parallel with more jobs available than
 	test_cmp expect actual
 '
 
+test_expect_success 'run_command runs ungrouped in parallel with more jobs available than tasks' '
+	test-tool run-command --ungroup run-command-parallel 5 sh -c "printf \"%s\n%s\n\" Hello World" >out 2>err &&
+	test_line_count = 8 out &&
+	test_line_count = 4 err
+'
+
 test_expect_success 'run_command runs in parallel with as many jobs as tasks' '
 	test-tool run-command run-command-parallel 4 sh -c "printf \"%s\n%s\n\" Hello World" 2>actual &&
 	test_cmp expect actual
 '
 
+test_expect_success 'run_command runs ungrouped in parallel with as many jobs as tasks' '
+	test-tool run-command --ungroup run-command-parallel 4 sh -c "printf \"%s\n%s\n\" Hello World" >out 2>err &&
+	test_line_count = 8 out &&
+	test_line_count = 4 err
+'
+
 test_expect_success 'run_command runs in parallel with more tasks than jobs available' '
 	test-tool run-command run-command-parallel 3 sh -c "printf \"%s\n%s\n\" Hello World" 2>actual &&
 	test_cmp expect actual
 '
 
+test_expect_success 'run_command runs ungrouped in parallel with more tasks than jobs available' '
+	test-tool run-command --ungroup run-command-parallel 3 sh -c "printf \"%s\n%s\n\" Hello World" >out 2>err &&
+	test_line_count = 8 out &&
+	test_line_count = 4 err
+'
+
 cat >expect <<-EOF
 preloaded output of a child
 asking for a quick stop
@@ -158,6 +176,12 @@ test_expect_success 'run_command is asked to abort gracefully' '
 	test_cmp expect actual
 '
 
+test_expect_success 'run_command is asked to abort gracefully (ungroup)' '
+	test-tool run-command --ungroup run-command-abort 3 false >out 2>err &&
+	test_must_be_empty out &&
+	test_line_count = 6 err
+'
+
 cat >expect <<-EOF
 no further jobs available
 EOF
@@ -167,6 +191,12 @@ test_expect_success 'run_command outputs ' '
 	test_cmp expect actual
 '
 
+test_expect_success 'run_command outputs (ungroup) ' '
+	test-tool run-command --ungroup run-command-no-jobs 3 sh -c "printf \"%s\n%s\n\" Hello World" >out 2>err &&
+	test_must_be_empty out &&
+	test_cmp expect err
+'
+
 test_trace () {
 	expect="$1"
 	shift
diff --git a/t/t0062-revision-walking.sh b/t/t0062-revision-walking.sh
index 8e215867b8..b9480c8178 100755
--- a/t/t0062-revision-walking.sh
+++ b/t/t0062-revision-walking.sh
@@ -5,6 +5,7 @@
 
 test_description='Test revision walking api'
 
+TEST_PASSES_SANITIZE_LEAK=true
 . ./test-lib.sh
 
 cat >run_twice_expected <<-EOF
diff --git a/t/t0100-previous.sh b/t/t0100-previous.sh
index 69beb59f62..a16cc3d298 100755
--- a/t/t0100-previous.sh
+++ b/t/t0100-previous.sh
@@ -5,6 +5,7 @@ test_description='previous branch syntax @{-n}'
 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 'branch -d @{-1}' '
diff --git a/t/t0101-at-syntax.sh b/t/t0101-at-syntax.sh
index a1998b558f..878aadd64c 100755
--- a/t/t0101-at-syntax.sh
+++ b/t/t0101-at-syntax.sh
@@ -1,6 +1,8 @@
 #!/bin/sh
 
 test_description='various @{whatever} syntax tests'
+
+TEST_PASSES_SANITIZE_LEAK=true
 . ./test-lib.sh
 
 test_expect_success 'setup' '
diff --git a/t/t0210-trace2-normal.sh b/t/t0210-trace2-normal.sh
index 37c359bd5a..80e76a4695 100755
--- a/t/t0210-trace2-normal.sh
+++ b/t/t0210-trace2-normal.sh
@@ -168,6 +168,82 @@ test_expect_success 'BUG messages are written to trace2' '
 	test_cmp expect actual
 '
 
+test_expect_success 'bug messages with BUG_if_bug() are written to trace2' '
+	test_when_finished "rm trace.normal actual expect" &&
+	test_expect_code 99 env GIT_TRACE2="$(pwd)/trace.normal" \
+		test-tool trace2 008bug 2>err &&
+	cat >expect <<-\EOF &&
+	a bug message
+	another bug message
+	an explicit BUG_if_bug() following bug() call(s) is nice, but not required
+	EOF
+	sed "s/^.*: //" <err >actual &&
+	test_cmp expect actual &&
+
+	perl "$TEST_DIRECTORY/t0210/scrub_normal.perl" <trace.normal >actual &&
+	cat >expect <<-EOF &&
+		version $V
+		start _EXE_ trace2 008bug
+		cmd_name trace2 (trace2)
+		error a bug message
+		error another bug message
+		error an explicit BUG_if_bug() following bug() call(s) is nice, but not required
+		exit elapsed:_TIME_ code:99
+		atexit elapsed:_TIME_ code:99
+	EOF
+	test_cmp expect actual
+'
+
+test_expect_success 'bug messages without explicit BUG_if_bug() are written to trace2' '
+	test_when_finished "rm trace.normal actual expect" &&
+	test_expect_code 99 env GIT_TRACE2="$(pwd)/trace.normal" \
+		test-tool trace2 009bug_BUG 2>err &&
+	cat >expect <<-\EOF &&
+	a bug message
+	another bug message
+	had bug() call(s) in this process without explicit BUG_if_bug()
+	EOF
+	sed "s/^.*: //" <err >actual &&
+	test_cmp expect actual &&
+
+	perl "$TEST_DIRECTORY/t0210/scrub_normal.perl" <trace.normal >actual &&
+	cat >expect <<-EOF &&
+		version $V
+		start _EXE_ trace2 009bug_BUG
+		cmd_name trace2 (trace2)
+		error a bug message
+		error another bug message
+		error on exit(): had bug() call(s) in this process without explicit BUG_if_bug()
+		exit elapsed:_TIME_ code:99
+		atexit elapsed:_TIME_ code:99
+	EOF
+	test_cmp expect actual
+'
+
+test_expect_success 'bug messages followed by BUG() are written to trace2' '
+	test_when_finished "rm trace.normal actual expect" &&
+	test_expect_code 99 env GIT_TRACE2="$(pwd)/trace.normal" \
+		test-tool trace2 010bug_BUG 2>err &&
+	cat >expect <<-\EOF &&
+	a bug message
+	a BUG message
+	EOF
+	sed "s/^.*: //" <err >actual &&
+	test_cmp expect actual &&
+
+	perl "$TEST_DIRECTORY/t0210/scrub_normal.perl" <trace.normal >actual &&
+	cat >expect <<-EOF &&
+		version $V
+		start _EXE_ trace2 010bug_BUG
+		cmd_name trace2 (trace2)
+		error a bug message
+		error a BUG message
+		exit elapsed:_TIME_ code:99
+		atexit elapsed:_TIME_ code:99
+	EOF
+	test_cmp expect actual
+'
+
 sane_unset GIT_TRACE2_BRIEF
 
 # Now test without environment variables and get all Trace2 settings
diff --git a/t/t1001-read-tree-m-2way.sh b/t/t1001-read-tree-m-2way.sh
index 0710b1fb1e..516a6112fd 100755
--- a/t/t1001-read-tree-m-2way.sh
+++ b/t/t1001-read-tree-m-2way.sh
@@ -21,6 +21,7 @@ In the test, these paths are used:
 	yomin   - not in H or M
 '
 
+TEST_PASSES_SANITIZE_LEAK=true
 . ./test-lib.sh
 . "$TEST_DIRECTORY"/lib-read-tree.sh
 
diff --git a/t/t1002-read-tree-m-u-2way.sh b/t/t1002-read-tree-m-u-2way.sh
index 46cbd5514a..bd5313caec 100755
--- a/t/t1002-read-tree-m-u-2way.sh
+++ b/t/t1002-read-tree-m-u-2way.sh
@@ -9,6 +9,7 @@ This is identical to t1001, but uses -u to update the work tree as well.
 
 '
 
+TEST_PASSES_SANITIZE_LEAK=true
 . ./test-lib.sh
 . "$TEST_DIRECTORY"/lib-read-tree.sh
 
diff --git a/t/t1011-read-tree-sparse-checkout.sh b/t/t1011-read-tree-sparse-checkout.sh
index dd957be1b7..63a553d7b3 100755
--- a/t/t1011-read-tree-sparse-checkout.sh
+++ b/t/t1011-read-tree-sparse-checkout.sh
@@ -57,8 +57,8 @@ test_expect_success 'read-tree with .git/info/sparse-checkout but disabled' '
 	read_tree_u_must_succeed -m -u HEAD &&
 	git ls-files -t >result &&
 	test_cmp expected.swt result &&
-	test -f init.t &&
-	test -f sub/added
+	test_path_is_file init.t &&
+	test_path_is_file sub/added
 '
 
 test_expect_success 'read-tree --no-sparse-checkout with empty .git/info/sparse-checkout and enabled' '
@@ -67,8 +67,8 @@ test_expect_success 'read-tree --no-sparse-checkout with empty .git/info/sparse-
 	read_tree_u_must_succeed --no-sparse-checkout -m -u HEAD &&
 	git ls-files -t >result &&
 	test_cmp expected.swt result &&
-	test -f init.t &&
-	test -f sub/added
+	test_path_is_file init.t &&
+	test_path_is_file sub/added
 '
 
 test_expect_success 'read-tree with empty .git/info/sparse-checkout' '
@@ -85,8 +85,8 @@ test_expect_success 'read-tree with empty .git/info/sparse-checkout' '
 	S subsub/added
 	EOF
 	test_cmp expected.swt result &&
-	! test -f init.t &&
-	! test -f sub/added
+	test_path_is_missing init.t &&
+	test_path_is_missing sub/added
 '
 
 test_expect_success 'match directories with trailing slash' '
@@ -101,8 +101,8 @@ test_expect_success 'match directories with trailing slash' '
 	read_tree_u_must_succeed -m -u HEAD &&
 	git ls-files -t > result &&
 	test_cmp expected.swt-noinit result &&
-	test ! -f init.t &&
-	test -f sub/added
+	test_path_is_missing init.t &&
+	test_path_is_file sub/added
 '
 
 test_expect_success 'match directories without trailing slash' '
@@ -110,8 +110,8 @@ test_expect_success 'match directories without trailing slash' '
 	read_tree_u_must_succeed -m -u HEAD &&
 	git ls-files -t >result &&
 	test_cmp expected.swt-noinit result &&
-	test ! -f init.t &&
-	test -f sub/added
+	test_path_is_missing init.t &&
+	test_path_is_file sub/added
 '
 
 test_expect_success 'match directories with negated patterns' '
@@ -129,9 +129,9 @@ EOF
 	git read-tree -m -u HEAD &&
 	git ls-files -t >result &&
 	test_cmp expected.swt-negation result &&
-	test ! -f init.t &&
-	test ! -f sub/added &&
-	test -f sub/addedtoo
+	test_path_is_missing init.t &&
+	test_path_is_missing sub/added &&
+	test_path_is_file sub/addedtoo
 '
 
 test_expect_success 'match directories with negated patterns (2)' '
@@ -150,9 +150,9 @@ EOF
 	git read-tree -m -u HEAD &&
 	git ls-files -t >result &&
 	test_cmp expected.swt-negation2 result &&
-	test -f init.t &&
-	test -f sub/added &&
-	test ! -f sub/addedtoo
+	test_path_is_file init.t &&
+	test_path_is_file sub/added &&
+	test_path_is_missing sub/addedtoo
 '
 
 test_expect_success 'match directory pattern' '
@@ -160,8 +160,8 @@ test_expect_success 'match directory pattern' '
 	read_tree_u_must_succeed -m -u HEAD &&
 	git ls-files -t >result &&
 	test_cmp expected.swt-noinit result &&
-	test ! -f init.t &&
-	test -f sub/added
+	test_path_is_missing init.t &&
+	test_path_is_file sub/added
 '
 
 test_expect_success 'checkout area changes' '
@@ -176,15 +176,15 @@ test_expect_success 'checkout area changes' '
 	read_tree_u_must_succeed -m -u HEAD &&
 	git ls-files -t >result &&
 	test_cmp expected.swt-nosub result &&
-	test -f init.t &&
-	test ! -f sub/added
+	test_path_is_file init.t &&
+	test_path_is_missing sub/added
 '
 
 test_expect_success 'read-tree updates worktree, absent case' '
 	echo sub/added >.git/info/sparse-checkout &&
 	git checkout -f top &&
 	read_tree_u_must_succeed -m -u HEAD^ &&
-	test ! -f init.t
+	test_path_is_missing init.t
 '
 
 test_expect_success 'read-tree will not throw away dirty changes, non-sparse' '
@@ -229,7 +229,7 @@ test_expect_success 'read-tree adds to worktree, absent case' '
 	echo init.t >.git/info/sparse-checkout &&
 	git checkout -f removed &&
 	read_tree_u_must_succeed -u -m HEAD^ &&
-	test ! -f sub/added
+	test_path_is_missing sub/added
 '
 
 test_expect_success 'read-tree adds to worktree, dirty case' '
@@ -248,7 +248,7 @@ test_expect_success 'index removal and worktree narrowing at the same time' '
 	echo init.t >.git/info/sparse-checkout &&
 	git checkout removed &&
 	git ls-files sub/added >result &&
-	test ! -f sub/added &&
+	test_path_is_missing sub/added &&
 	test_must_be_empty result
 '
 
diff --git a/t/t1060-object-corruption.sh b/t/t1060-object-corruption.sh
index bc89371f53..5b8e47e346 100755
--- a/t/t1060-object-corruption.sh
+++ b/t/t1060-object-corruption.sh
@@ -1,6 +1,8 @@
 #!/bin/sh
 
 test_description='see how we handle various forms of corruption'
+
+TEST_PASSES_SANITIZE_LEAK=true
 . ./test-lib.sh
 
 # convert "1234abcd" to ".git/objects/12/34abcd"
diff --git a/t/t1091-sparse-checkout-builtin.sh b/t/t1091-sparse-checkout-builtin.sh
index 7931d51ea9..b563d6c263 100755
--- a/t/t1091-sparse-checkout-builtin.sh
+++ b/t/t1091-sparse-checkout-builtin.sh
@@ -72,7 +72,7 @@ test_expect_success 'git sparse-checkout list (populated)' '
 '
 
 test_expect_success 'git sparse-checkout init' '
-	git -C repo sparse-checkout init &&
+	git -C repo sparse-checkout init --no-cone &&
 	cat >expect <<-\EOF &&
 	/*
 	!/*/
@@ -111,6 +111,7 @@ test_expect_success 'init with existing sparse-checkout' '
 
 test_expect_success 'clone --sparse' '
 	git clone --sparse "file://$(pwd)/repo" clone &&
+	git -C clone sparse-checkout reapply --no-cone &&
 	git -C clone sparse-checkout list >actual &&
 	cat >expect <<-\EOF &&
 	/*
@@ -124,7 +125,7 @@ test_expect_success 'switching to cone mode with non-cone mode patterns' '
 	git init bad-patterns &&
 	(
 		cd bad-patterns &&
-		git sparse-checkout init &&
+		git sparse-checkout init --no-cone &&
 		git sparse-checkout add dir &&
 		git config --worktree core.sparseCheckoutCone true &&
 		test_must_fail git sparse-checkout add dir 2>err &&
@@ -402,7 +403,7 @@ test_expect_success 'revert to old sparse-checkout on empty update' '
 		git sparse-checkout set nothing 2>err &&
 		test_i18ngrep ! "Sparse checkout leaves no entry on working directory" err &&
 		test_i18ngrep ! ".git/index.lock" err &&
-		git sparse-checkout set file
+		git sparse-checkout set --no-cone file
 	)
 '
 
@@ -424,7 +425,7 @@ test_expect_success 'sparse-checkout (init|set|disable) warns with dirty status'
 	git clone repo dirty &&
 	echo dirty >dirty/folder1/a &&
 
-	git -C dirty sparse-checkout init 2>err &&
+	git -C dirty sparse-checkout init --no-cone 2>err &&
 	test_i18ngrep "warning.*The following paths are not up to date" err &&
 
 	git -C dirty sparse-checkout set /folder2/* /deep/deeper1/* 2>err &&
@@ -435,7 +436,7 @@ test_expect_success 'sparse-checkout (init|set|disable) warns with dirty status'
 	test_must_be_empty err &&
 
 	git -C dirty reset --hard &&
-	git -C dirty sparse-checkout init &&
+	git -C dirty sparse-checkout init --no-cone &&
 	git -C dirty sparse-checkout set /folder2/* /deep/deeper1/* &&
 	test_path_is_missing dirty/folder1/a &&
 	git -C dirty sparse-checkout disable &&
@@ -451,7 +452,7 @@ test_expect_success 'sparse-checkout (init|set|disable) warns with unmerged stat
 	EOF
 	git -C unmerged update-index --index-info <input &&
 
-	git -C unmerged sparse-checkout init 2>err &&
+	git -C unmerged sparse-checkout init --no-cone 2>err &&
 	test_i18ngrep "warning.*The following paths are unmerged" err &&
 
 	git -C unmerged sparse-checkout set /folder2/* /deep/deeper1/* 2>err &&
@@ -462,7 +463,7 @@ test_expect_success 'sparse-checkout (init|set|disable) warns with unmerged stat
 	test_i18ngrep "warning.*The following paths are unmerged" err &&
 
 	git -C unmerged reset --hard &&
-	git -C unmerged sparse-checkout init &&
+	git -C unmerged sparse-checkout init --no-cone &&
 	git -C unmerged sparse-checkout set /folder2/* /deep/deeper1/* &&
 	git -C unmerged sparse-checkout disable
 '
diff --git a/t/t1092-sparse-checkout-compatibility.sh b/t/t1092-sparse-checkout-compatibility.sh
index de0bdbdee1..aee93c82c5 100755
--- a/t/t1092-sparse-checkout-compatibility.sh
+++ b/t/t1092-sparse-checkout-compatibility.sh
@@ -205,36 +205,68 @@ test_sparse_unstaged () {
 	done
 }
 
-test_expect_success 'sparse-index contents' '
-	init_repos &&
-
+# Usage: test_sprase_checkout_set "<c1> ... <cN>" "<s1> ... <sM>"
+# Verifies that "git sparse-checkout set <c1> ... <cN>" succeeds and
+# leaves the sparse index in a state where <s1> ... <sM> are sparse
+# directories (and <c1> ... <cN> are not).
+test_sparse_checkout_set () {
+	CONE_DIRS=$1 &&
+	SPARSE_DIRS=$2 &&
+	git -C sparse-index sparse-checkout set --skip-checks $CONE_DIRS &&
 	git -C sparse-index ls-files --sparse --stage >cache &&
-	for dir in folder1 folder2 x
+
+	# Check that the directories outside of the sparse-checkout cone
+	# have sparse directory entries.
+	for dir in $SPARSE_DIRS
 	do
 		TREE=$(git -C sparse-index rev-parse HEAD:$dir) &&
 		grep "040000 $TREE 0	$dir/" cache \
 			|| return 1
 	done &&
 
-	git -C sparse-index sparse-checkout set folder1 &&
-
-	git -C sparse-index ls-files --sparse --stage >cache &&
-	for dir in deep folder2 x
+	# Check that the directories in the sparse-checkout cone
+	# are not sparse directory entries.
+	for dir in $CONE_DIRS
 	do
-		TREE=$(git -C sparse-index rev-parse HEAD:$dir) &&
-		grep "040000 $TREE 0	$dir/" cache \
+		# Allow TREE to not exist because
+		# $dir does not exist at HEAD.
+		TREE=$(git -C sparse-index rev-parse HEAD:$dir) ||
+		! grep "040000 $TREE 0	$dir/" cache \
 			|| return 1
-	done &&
+	done
+}
 
-	git -C sparse-index sparse-checkout set deep/deeper1 &&
+test_expect_success 'sparse-index contents' '
+	init_repos &&
 
-	git -C sparse-index ls-files --sparse --stage >cache &&
-	for dir in deep/deeper2 folder1 folder2 x
-	do
-		TREE=$(git -C sparse-index rev-parse HEAD:$dir) &&
-		grep "040000 $TREE 0	$dir/" cache \
-			|| return 1
-	done &&
+	# Remove deep, add three other directories.
+	test_sparse_checkout_set \
+		"folder1 folder2 x" \
+		"before deep" &&
+
+	# Remove folder1, add deep
+	test_sparse_checkout_set \
+		"deep folder2 x" \
+		"before folder1" &&
+
+	# Replace deep with deep/deeper2 (dropping deep/deeper1)
+	# Add folder1
+	test_sparse_checkout_set \
+		"deep/deeper2 folder1 folder2 x" \
+		"before deep/deeper1" &&
+
+	# Replace deep/deeper2 with deep/deeper1
+	# Replace folder1 with folder1/0/0
+	# Replace folder2 with non-existent folder2/2/3
+	# Add non-existent "bogus"
+	test_sparse_checkout_set \
+		"bogus deep/deeper1 folder1/0/0 folder2/2/3 x" \
+		"before deep/deeper2 folder2/0" &&
+
+	# Drop down to only files at root
+	test_sparse_checkout_set \
+		"" \
+		"before deep folder1 folder2 x" &&
 
 	# Disabling the sparse-index replaces tree entries with full ones
 	git -C sparse-index sparse-checkout init --no-sparse-index &&
@@ -340,6 +372,14 @@ test_expect_success 'deep changes during checkout' '
 	test_all_match git checkout base
 '
 
+test_expect_success 'checkout with modified sparse directory' '
+	init_repos &&
+
+	test_all_match git checkout rename-in-to-out -- . &&
+	test_sparse_match git sparse-checkout reapply &&
+	test_all_match git checkout base
+'
+
 test_expect_success 'add outside sparse cone' '
 	init_repos &&
 
@@ -655,6 +695,23 @@ test_expect_success 'reset with wildcard pathspec' '
 	test_all_match git ls-files -s -- folder1
 '
 
+test_expect_success 'reset hard with removed sparse dir' '
+	init_repos &&
+
+	run_on_all git rm -r --sparse folder1 &&
+	test_all_match git status --porcelain=v2 &&
+
+	test_all_match git reset --hard &&
+	test_all_match git status --porcelain=v2 &&
+
+	cat >expect <<-\EOF &&
+	folder1/
+	EOF
+
+	git -C sparse-index ls-files --sparse folder1 >out &&
+	test_cmp expect out
+'
+
 test_expect_success 'update-index modify outside sparse definition' '
 	init_repos &&
 
@@ -1034,6 +1091,55 @@ test_expect_success 'cherry-pick with conflicts' '
 	test_all_match test_must_fail git cherry-pick to-cherry-pick
 '
 
+test_expect_success 'stash' '
+	init_repos &&
+
+	write_script edit-contents <<-\EOF &&
+	echo text >>$1
+	EOF
+
+	# Stash a sparse directory (folder1)
+	test_all_match git checkout -b test-branch rename-base &&
+	test_all_match git reset --soft rename-out-to-out &&
+	test_all_match git stash &&
+	test_all_match git status --porcelain=v2 &&
+
+	# Apply the sparse directory stash without reinstating the index
+	test_all_match git stash apply -q &&
+	test_all_match git status --porcelain=v2 &&
+
+	# Reset to state where stash can be applied
+	test_sparse_match git sparse-checkout reapply &&
+	test_all_match git reset --hard rename-out-to-out &&
+
+	# Apply the sparse directory stash *with* reinstating the index
+	test_all_match git stash apply --index -q &&
+	test_all_match git status --porcelain=v2 &&
+
+	# Reset to state where we will get a conflict applying the stash
+	test_sparse_match git sparse-checkout reapply &&
+	test_all_match git reset --hard update-folder1 &&
+
+	# Apply the sparse directory stash with conflicts
+	test_all_match test_must_fail git stash apply --index -q &&
+	test_all_match test_must_fail git stash apply -q &&
+	test_all_match git status --porcelain=v2 &&
+
+	# Reset to base branch
+	test_sparse_match git sparse-checkout reapply &&
+	test_all_match git reset --hard base &&
+
+	# Stash & unstash an untracked file outside of the sparse checkout
+	# definition.
+	run_on_sparse mkdir -p folder1 &&
+	run_on_all ../edit-contents folder1/new &&
+	test_all_match git stash -u &&
+	test_all_match git status --porcelain=v2 &&
+
+	test_all_match git stash pop -q &&
+	test_all_match git status --porcelain=v2
+'
+
 test_expect_success 'checkout-index inside sparse definition' '
 	init_repos &&
 
@@ -1151,6 +1257,33 @@ test_expect_success 'clean' '
 	test_sparse_match test_path_is_dir folder1
 '
 
+for builtin in show rev-parse
+do
+	test_expect_success "$builtin (cached blobs/trees)" "
+		init_repos &&
+
+		test_all_match git $builtin :a &&
+		test_all_match git $builtin :deep/a &&
+		test_sparse_match git $builtin :folder1/a &&
+
+		# The error message differs depending on whether
+		# the directory exists in the worktree.
+		test_all_match test_must_fail git $builtin :deep/ &&
+		test_must_fail git -C full-checkout $builtin :folder1/ &&
+		test_sparse_match test_must_fail git $builtin :folder1/ &&
+
+		# Change the sparse cone for an extra case:
+		run_on_sparse git sparse-checkout set deep/deeper1 &&
+
+		# deep/deeper2 is a sparse directory in the sparse index.
+		test_sparse_match test_must_fail git $builtin :deep/deeper2/ &&
+
+		# deep/deeper2/deepest is not in the sparse index, but
+		# will trigger an index expansion.
+		test_sparse_match test_must_fail git $builtin :deep/deeper2/deepest/
+	"
+done
+
 test_expect_success 'submodule handling' '
 	init_repos &&
 
@@ -1224,7 +1357,10 @@ test_expect_success 'index.sparse disabled inline uses full index' '
 
 ensure_not_expanded () {
 	rm -f trace2.txt &&
-	echo >>sparse-index/untracked.txt &&
+	if test -z "$WITHOUT_UNTRACKED_TXT"
+	then
+		echo >>sparse-index/untracked.txt
+	fi &&
 
 	if test "$1" = "!"
 	then
@@ -1328,6 +1464,30 @@ test_expect_success 'sparse-index is not expanded: merge conflict in cone' '
 	)
 '
 
+test_expect_success 'sparse-index is not expanded: stash' '
+	init_repos &&
+
+	echo >>sparse-index/a &&
+	ensure_not_expanded stash &&
+	ensure_not_expanded stash list &&
+	ensure_not_expanded stash show stash@{0} &&
+	ensure_not_expanded stash apply stash@{0} &&
+	ensure_not_expanded stash drop stash@{0} &&
+
+	echo >>sparse-index/deep/new &&
+	ensure_not_expanded stash -u &&
+	(
+		WITHOUT_UNTRACKED_TXT=1 &&
+		ensure_not_expanded stash pop
+	) &&
+
+	ensure_not_expanded stash create &&
+	oid=$(git -C sparse-index stash create) &&
+	ensure_not_expanded stash store -m "test" $oid &&
+	ensure_not_expanded reset --hard &&
+	ensure_not_expanded stash pop
+'
+
 test_expect_success 'sparse index is not expanded: diff' '
 	init_repos &&
 
@@ -1374,6 +1534,15 @@ test_expect_success 'sparse index is not expanded: diff' '
 	ensure_not_expanded diff --cached
 '
 
+test_expect_success 'sparse index is not expanded: show and rev-parse' '
+	init_repos &&
+
+	ensure_not_expanded show :a &&
+	ensure_not_expanded show :deep/a &&
+	ensure_not_expanded rev-parse :a &&
+	ensure_not_expanded rev-parse :deep/a
+'
+
 test_expect_success 'sparse index is not expanded: update-index' '
 	init_repos &&
 
@@ -1518,6 +1687,31 @@ test_expect_success 'ls-files' '
 	ensure_not_expanded ls-files --sparse
 '
 
+test_expect_success 'sparse index is not expanded: sparse-checkout' '
+	init_repos &&
+
+	ensure_not_expanded sparse-checkout set deep/deeper2 &&
+	ensure_not_expanded sparse-checkout set deep/deeper1 &&
+	ensure_not_expanded sparse-checkout set deep &&
+	ensure_not_expanded sparse-checkout add folder1 &&
+	ensure_not_expanded sparse-checkout set deep/deeper1 &&
+	ensure_not_expanded sparse-checkout set folder2 &&
+
+	# Demonstrate that the checks that "folder1/a" is a file
+	# do not cause a sparse-index expansion (since it is in the
+	# sparse-checkout cone).
+	echo >>sparse-index/folder2/a &&
+	git -C sparse-index add folder2/a &&
+
+	ensure_not_expanded sparse-checkout add folder1 &&
+
+	# Skip checks here, since deep/deeper1 is inside a sparse directory
+	# that must be expanded to check whether `deep/deeper1` is a file
+	# or not.
+	ensure_not_expanded sparse-checkout set --skip-checks deep/deeper1 &&
+	ensure_not_expanded sparse-checkout set
+'
+
 # NEEDSWORK: a sparse-checkout behaves differently from a full checkout
 # in this scenario, but it shouldn't.
 test_expect_success 'reset mixed and checkout orphan' '
diff --git a/t/t1300-config.sh b/t/t1300-config.sh
index 7dd9b325d9..c6661e61af 100755
--- a/t/t1300-config.sh
+++ b/t/t1300-config.sh
@@ -2024,8 +2024,17 @@ test_expect_success '--show-scope with --list' '
 	local	user.override=local
 	local	include.path=../include/relative.include
 	local	user.relative=include
+	local	core.repositoryformatversion=1
+	local	extensions.worktreeconfig=true
+	worktree	user.worktree=true
 	command	user.cmdline=true
 	EOF
+	git worktree add wt1 &&
+	# We need these to test for worktree scope, but outside of this
+	# test, this is just noise
+	test_config core.repositoryformatversion 1 &&
+	test_config extensions.worktreeConfig true &&
+	git config --worktree user.worktree true &&
 	git -c user.cmdline=true config --list --show-scope >output &&
 	test_cmp expect output
 '
@@ -2074,12 +2083,13 @@ test_expect_success '--show-scope with --show-origin' '
 '
 
 test_expect_success 'override global and system config' '
-	test_when_finished rm -f "$HOME"/.config/git &&
-
+	test_when_finished rm -f \"\$HOME\"/.gitconfig &&
 	cat >"$HOME"/.gitconfig <<-EOF &&
 	[home]
 		config = true
 	EOF
+
+	test_when_finished rm -rf \"\$HOME\"/.config/git &&
 	mkdir -p "$HOME"/.config/git &&
 	cat >"$HOME"/.config/git/config <<-EOF &&
 	[xdg]
diff --git a/t/t1401-symbolic-ref.sh b/t/t1401-symbolic-ref.sh
index 132a1b885a..9fb0b90f25 100755
--- a/t/t1401-symbolic-ref.sh
+++ b/t/t1401-symbolic-ref.sh
@@ -1,6 +1,8 @@
 #!/bin/sh
 
 test_description='basic symbolic-ref tests'
+
+TEST_PASSES_SANITIZE_LEAK=true
 . ./test-lib.sh
 
 # If the tests munging HEAD fail, they can break detection of
diff --git a/t/t1411-reflog-show.sh b/t/t1411-reflog-show.sh
index 975c4ea83a..da581ec19a 100755
--- a/t/t1411-reflog-show.sh
+++ b/t/t1411-reflog-show.sh
@@ -4,6 +4,7 @@ test_description='Test reflog display routines'
 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/t1412-reflog-loop.sh b/t/t1412-reflog-loop.sh
index 977603f7f1..ff30874f94 100755
--- a/t/t1412-reflog-loop.sh
+++ b/t/t1412-reflog-loop.sh
@@ -1,6 +1,8 @@
 #!/bin/sh
 
 test_description='reflog walk shows repeated commits again'
+
+TEST_PASSES_SANITIZE_LEAK=true
 . ./test-lib.sh
 
 test_expect_success 'setup commits' '
diff --git a/t/t1415-worktree-refs.sh b/t/t1415-worktree-refs.sh
index a3e6ea0808..3b531842dd 100755
--- a/t/t1415-worktree-refs.sh
+++ b/t/t1415-worktree-refs.sh
@@ -2,6 +2,7 @@
 
 test_description='per-worktree refs'
 
+TEST_PASSES_SANITIZE_LEAK=true
 . ./test-lib.sh
 
 test_expect_success 'setup' '
diff --git a/t/t1450-fsck.sh b/t/t1450-fsck.sh
index 0206d98225..922984b903 100755
--- a/t/t1450-fsck.sh
+++ b/t/t1450-fsck.sh
@@ -364,6 +364,20 @@ test_expect_success 'tree entry with type mismatch' '
 	test_i18ngrep ! "dangling blob" out
 '
 
+test_expect_success 'tree entry with bogus mode' '
+	test_when_finished "remove_object \$blob" &&
+	test_when_finished "remove_object \$tree" &&
+	blob=$(echo blob | git hash-object -w --stdin) &&
+	blob_oct=$(echo $blob | hex2oct) &&
+	tree=$(printf "100000 foo\0${blob_oct}" |
+	       git hash-object -t tree --stdin -w --literally) &&
+	git fsck 2>err &&
+	cat >expect <<-EOF &&
+	warning in tree $tree: badFilemode: contains bad file modes
+	EOF
+	test_cmp expect err
+'
+
 test_expect_success 'tag pointing to nonexistent' '
 	badoid=$(test_oid deadbeef) &&
 	cat >invalid-tag <<-EOF &&
diff --git a/t/t1800-hook.sh b/t/t1800-hook.sh
index 26ed5e11bc..64096adac7 100755
--- a/t/t1800-hook.sh
+++ b/t/t1800-hook.sh
@@ -4,6 +4,7 @@ test_description='git-hook command'
 
 TEST_PASSES_SANITIZE_LEAK=true
 . ./test-lib.sh
+. "$TEST_DIRECTORY"/lib-terminal.sh
 
 test_expect_success 'git hook usage' '
 	test_expect_code 129 git hook &&
@@ -120,4 +121,60 @@ test_expect_success 'git -c core.hooksPath=<PATH> hook run' '
 	test_cmp expect actual
 '
 
+test_hook_tty () {
+	cat >expect <<-\EOF
+	STDOUT TTY
+	STDERR TTY
+	EOF
+
+	test_when_finished "rm -rf repo" &&
+	git init repo &&
+
+	test_commit -C repo A &&
+	test_commit -C repo B &&
+	git -C repo reset --soft HEAD^ &&
+
+	test_hook -C repo pre-commit <<-EOF &&
+	test -t 1 && echo STDOUT TTY >>actual || echo STDOUT NO TTY >>actual &&
+	test -t 2 && echo STDERR TTY >>actual || echo STDERR NO TTY >>actual
+	EOF
+
+	test_terminal git -C repo "$@" &&
+	test_cmp expect repo/actual
+}
+
+test_expect_success TTY 'git hook run: stdout and stderr are connected to a TTY' '
+	test_hook_tty hook run pre-commit
+'
+
+test_expect_success TTY 'git commit: stdout and stderr are connected to a TTY' '
+	test_hook_tty commit -m"B.new"
+'
+
+test_expect_success 'git hook run a hook with a bad shebang' '
+	test_when_finished "rm -rf bad-hooks" &&
+	mkdir bad-hooks &&
+	write_script bad-hooks/test-hook "/bad/path/no/spaces" </dev/null &&
+
+	# TODO: We should emit the same (or at least a more similar)
+	# error on Windows and !Windows. See the OS-specific code in
+	# start_command()
+	if test_have_prereq !WINDOWS
+	then
+		cat >expect <<-\EOF
+		fatal: cannot run bad-hooks/test-hook: ...
+		EOF
+	else
+		cat >expect <<-\EOF
+		error: cannot spawn bad-hooks/test-hook: ...
+		EOF
+	fi &&
+	test_expect_code 1 git \
+		-c core.hooksPath=bad-hooks \
+		hook run test-hook >out 2>err &&
+	test_must_be_empty out &&
+	sed -e "s/test-hook: .*/test-hook: .../" <err >actual &&
+	test_cmp expect actual
+'
+
 test_done
diff --git a/t/t2015-checkout-unborn.sh b/t/t2015-checkout-unborn.sh
index a9721215fa..9425aae639 100755
--- a/t/t2015-checkout-unborn.sh
+++ b/t/t2015-checkout-unborn.sh
@@ -4,6 +4,7 @@ test_description='checkout from unborn branch'
 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/t2016-checkout-patch.sh b/t/t2016-checkout-patch.sh
index abfd586c32..a5822e41af 100755
--- a/t/t2016-checkout-patch.sh
+++ b/t/t2016-checkout-patch.sh
@@ -4,7 +4,13 @@ test_description='git checkout --patch'
 
 . ./lib-patch-mode.sh
 
-test_expect_success PERL 'setup' '
+if ! test_have_prereq ADD_I_USE_BUILTIN && ! test_have_prereq PERL
+then
+	skip_all='skipping interactive add tests, PERL not set'
+	test_done
+fi
+
+test_expect_success 'setup' '
 	mkdir dir &&
 	echo parent > dir/foo &&
 	echo dummy > bar &&
@@ -18,44 +24,40 @@ test_expect_success PERL 'setup' '
 
 # note: bar sorts before dir/foo, so the first 'n' is always to skip 'bar'
 
-# NEEDSWORK: Since the builtin add-p is used when $GIT_TEST_ADD_I_USE_BUILTIN
-# is given, we should replace the PERL prerequisite with an ADD_I prerequisite
-# which first checks if $GIT_TEST_ADD_I_USE_BUILTIN is defined before checking
-# PERL.
-test_expect_success PERL 'saying "n" does nothing' '
+test_expect_success 'saying "n" does nothing' '
 	set_and_save_state dir/foo work head &&
 	test_write_lines n n | git checkout -p &&
 	verify_saved_state bar &&
 	verify_saved_state dir/foo
 '
 
-test_expect_success PERL 'git checkout -p' '
+test_expect_success 'git checkout -p' '
 	test_write_lines n y | git checkout -p &&
 	verify_saved_state bar &&
 	verify_state dir/foo head head
 '
 
-test_expect_success PERL 'git checkout -p with staged changes' '
+test_expect_success 'git checkout -p with staged changes' '
 	set_state dir/foo work index &&
 	test_write_lines n y | git checkout -p &&
 	verify_saved_state bar &&
 	verify_state dir/foo index index
 '
 
-test_expect_success PERL 'git checkout -p HEAD with NO staged changes: abort' '
+test_expect_success 'git checkout -p HEAD with NO staged changes: abort' '
 	set_and_save_state dir/foo work head &&
 	test_write_lines n y n | git checkout -p HEAD &&
 	verify_saved_state bar &&
 	verify_saved_state dir/foo
 '
 
-test_expect_success PERL 'git checkout -p HEAD with NO staged changes: apply' '
+test_expect_success 'git checkout -p HEAD with NO staged changes: apply' '
 	test_write_lines n y y | git checkout -p HEAD &&
 	verify_saved_state bar &&
 	verify_state dir/foo head head
 '
 
-test_expect_success PERL 'git checkout -p HEAD with change already staged' '
+test_expect_success 'git checkout -p HEAD with change already staged' '
 	set_state dir/foo index index &&
 	# the third n is to get out in case it mistakenly does not apply
 	test_write_lines n y n | git checkout -p HEAD &&
@@ -63,21 +65,21 @@ test_expect_success PERL 'git checkout -p HEAD with change already staged' '
 	verify_state dir/foo head head
 '
 
-test_expect_success PERL 'git checkout -p HEAD^...' '
+test_expect_success 'git checkout -p HEAD^...' '
 	# the third n is to get out in case it mistakenly does not apply
 	test_write_lines n y n | git checkout -p HEAD^... &&
 	verify_saved_state bar &&
 	verify_state dir/foo parent parent
 '
 
-test_expect_success PERL 'git checkout -p HEAD^' '
+test_expect_success 'git checkout -p HEAD^' '
 	# the third n is to get out in case it mistakenly does not apply
 	test_write_lines n y n | git checkout -p HEAD^ &&
 	verify_saved_state bar &&
 	verify_state dir/foo parent parent
 '
 
-test_expect_success PERL 'git checkout -p handles deletion' '
+test_expect_success 'git checkout -p handles deletion' '
 	set_state dir/foo work index &&
 	rm dir/foo &&
 	test_write_lines n y | git checkout -p &&
@@ -90,28 +92,28 @@ test_expect_success PERL 'git checkout -p handles deletion' '
 # dir/foo.  There's always an extra 'n' to reject edits to dir/foo in
 # the failure case (and thus get out of the loop).
 
-test_expect_success PERL 'path limiting works: dir' '
+test_expect_success 'path limiting works: dir' '
 	set_state dir/foo work head &&
 	test_write_lines y n | git checkout -p dir &&
 	verify_saved_state bar &&
 	verify_state dir/foo head head
 '
 
-test_expect_success PERL 'path limiting works: -- dir' '
+test_expect_success 'path limiting works: -- dir' '
 	set_state dir/foo work head &&
 	test_write_lines y n | git checkout -p -- dir &&
 	verify_saved_state bar &&
 	verify_state dir/foo head head
 '
 
-test_expect_success PERL 'path limiting works: HEAD^ -- dir' '
+test_expect_success 'path limiting works: HEAD^ -- dir' '
 	# the third n is to get out in case it mistakenly does not apply
 	test_write_lines y n n | git checkout -p HEAD^ -- dir &&
 	verify_saved_state bar &&
 	verify_state dir/foo parent parent
 '
 
-test_expect_success PERL 'path limiting works: foo inside dir' '
+test_expect_success 'path limiting works: foo inside dir' '
 	set_state dir/foo work head &&
 	# the third n is to get out in case it mistakenly does not apply
 	test_write_lines y n n | (cd dir && git checkout -p foo) &&
@@ -119,11 +121,11 @@ test_expect_success PERL 'path limiting works: foo inside dir' '
 	verify_state dir/foo head head
 '
 
-test_expect_success PERL 'none of this moved HEAD' '
+test_expect_success 'none of this moved HEAD' '
 	verify_saved_head
 '
 
-test_expect_success PERL 'empty tree can be handled' '
+test_expect_success 'empty tree can be handled' '
 	test_when_finished "git reset --hard" &&
 	git checkout -p $(test_oid empty_tree) --
 '
diff --git a/t/t2030-unresolve-info.sh b/t/t2030-unresolve-info.sh
index f691e6d903..2d8c70b03a 100755
--- a/t/t2030-unresolve-info.sh
+++ b/t/t2030-unresolve-info.sh
@@ -194,4 +194,75 @@ test_expect_success 'rerere forget (add-add conflict)' '
 	test_i18ngrep "no remembered" actual
 '
 
+test_expect_success 'resolve-undo keeps blobs from gc' '
+	git checkout -f main &&
+
+	# First make sure we do not have any cruft left in the object store
+	git repack -a -d &&
+	git prune --expire=now &&
+	git prune-packed &&
+	git gc --prune=now &&
+	git fsck --unreachable >cruft &&
+	test_must_be_empty cruft &&
+
+	# Now add three otherwise unreferenced blob objects to the index
+	git reset --hard &&
+	B1=$(echo "resolve undo test data 1" | git hash-object -w --stdin) &&
+	B2=$(echo "resolve undo test data 2" | git hash-object -w --stdin) &&
+	B3=$(echo "resolve undo test data 3" | git hash-object -w --stdin) &&
+	git update-index --add --index-info <<-EOF &&
+	100644 $B1 1	frotz
+	100644 $B2 2	frotz
+	100644 $B3 3	frotz
+	EOF
+
+	# These three blob objects are reachable (only) from the index
+	git fsck --unreachable >cruft &&
+	test_must_be_empty cruft &&
+	# and they should be protected from GC
+	git gc --prune=now &&
+	git cat-file -e $B1 &&
+	git cat-file -e $B2 &&
+	git cat-file -e $B3 &&
+
+	# Now resolve the conflicted path
+	B0=$(echo "resolve undo test data 0" | git hash-object -w --stdin) &&
+	git update-index --add --cacheinfo 100644,$B0,frotz &&
+
+	# These three blob objects are now reachable only from the resolve-undo
+	git fsck --unreachable >cruft &&
+	test_must_be_empty cruft &&
+
+	# and they should survive GC
+	git gc --prune=now &&
+	git cat-file -e $B0 &&
+	git cat-file -e $B1 &&
+	git cat-file -e $B2 &&
+	git cat-file -e $B3 &&
+
+	# Now we switch away, which nukes resolve-undo, and
+	# blobs B0..B3 would become dangling.  fsck should
+	# notice that they are now unreachable.
+	git checkout -f side &&
+	git fsck --unreachable >cruft &&
+	sort cruft >actual &&
+	sort <<-EOF >expect &&
+	unreachable blob $B0
+	unreachable blob $B1
+	unreachable blob $B2
+	unreachable blob $B3
+	EOF
+	test_cmp expect actual &&
+
+	# And they should go away when gc runs.
+	git gc --prune=now &&
+	git fsck --unreachable >cruft &&
+	test_must_be_empty cruft &&
+
+	test_must_fail git cat-file -e $B0 &&
+	test_must_fail git cat-file -e $B1 &&
+	test_must_fail git cat-file -e $B2 &&
+	test_must_fail git cat-file -e $B3
+'
+
 test_done
diff --git a/t/t2080-parallel-checkout-basics.sh b/t/t2080-parallel-checkout-basics.sh
index 393ba3545e..526041c742 100755
--- a/t/t2080-parallel-checkout-basics.sh
+++ b/t/t2080-parallel-checkout-basics.sh
@@ -229,4 +229,52 @@ test_expect_success SYMLINKS 'parallel checkout checks for symlinks in leading d
 	)
 '
 
+# This test is here (and not in e.g. t2022-checkout-paths.sh), because we
+# check the final report including sequential, parallel, and delayed entries
+# all at the same time. So we must have finer control of the parallel checkout
+# variables.
+test_expect_success PERL '"git checkout ." report should not include failed entries' '
+	write_script rot13-filter.pl "$PERL_PATH" \
+		<"$TEST_DIRECTORY"/t0021/rot13-filter.pl &&
+
+	test_config_global filter.delay.process \
+		"\"$(pwd)/rot13-filter.pl\" --always-delay delayed.log clean smudge delay" &&
+	test_config_global filter.delay.required true &&
+	test_config_global filter.cat.clean cat  &&
+	test_config_global filter.cat.smudge cat  &&
+	test_config_global filter.cat.required true  &&
+
+	set_checkout_config 2 0 &&
+	git init failed_entries &&
+	(
+		cd failed_entries &&
+		cat >.gitattributes <<-EOF &&
+		*delay*              filter=delay
+		parallel-ineligible* filter=cat
+		EOF
+		echo a >missing-delay.a &&
+		echo a >parallel-ineligible.a &&
+		echo a >parallel-eligible.a &&
+		echo b >success-delay.b &&
+		echo b >parallel-ineligible.b &&
+		echo b >parallel-eligible.b &&
+		git add -A &&
+		git commit -m files &&
+
+		a_blob="$(git rev-parse :parallel-ineligible.a)" &&
+		rm .git/objects/$(test_oid_to_path $a_blob) &&
+		rm *.a *.b &&
+
+		test_checkout_workers 2 test_must_fail git checkout . 2>err &&
+
+		# All *.b entries should succeed and all *.a entries should fail:
+		#  - missing-delay.a: the delay filter will drop this path
+		#  - parallel-*.a: the blob will be missing
+		#
+		grep "Updated 3 paths from the index" err &&
+		test_stdout_line_count = 3 ls *.b &&
+		! ls *.a
+	)
+'
+
 test_done
diff --git a/t/t2107-update-index-basic.sh b/t/t2107-update-index-basic.sh
index a30b7ca6bc..07e6de84e6 100755
--- a/t/t2107-update-index-basic.sh
+++ b/t/t2107-update-index-basic.sh
@@ -36,9 +36,14 @@ test_expect_success '--cacheinfo does not accept blob null sha1' '
 	echo content >file &&
 	git add file &&
 	git rev-parse :file >expect &&
-	test_must_fail git update-index --cacheinfo 100644 $ZERO_OID file &&
+	test_must_fail git update-index --verbose --cacheinfo 100644 $ZERO_OID file >out &&
 	git rev-parse :file >actual &&
-	test_cmp expect actual
+	test_cmp expect actual &&
+
+	cat >expect <<-\EOF &&
+	add '\''file'\''
+	EOF
+	test_cmp expect out
 '
 
 test_expect_success '--cacheinfo does not accept gitlink null sha1' '
@@ -59,9 +64,14 @@ test_expect_success '--cacheinfo mode,sha1,path (new syntax)' '
 	git rev-parse :file >actual &&
 	test_cmp expect actual &&
 
-	git update-index --add --cacheinfo "100644,$(cat expect),elif" &&
+	git update-index --add --verbose --cacheinfo "100644,$(cat expect),elif" >out &&
 	git rev-parse :elif >actual &&
-	test_cmp expect actual
+	test_cmp expect actual &&
+
+	cat >expect <<-\EOF &&
+	add '\''elif'\''
+	EOF
+	test_cmp expect out
 '
 
 test_expect_success '.lock files cleaned up' '
@@ -74,7 +84,8 @@ test_expect_success '.lock files cleaned up' '
 	git config core.worktree ../../worktree &&
 	# --refresh triggers late setup_work_tree,
 	# active_cache_changed is zero, rollback_lock_file fails
-	git update-index --refresh &&
+	git update-index --refresh --verbose >out &&
+	test_must_be_empty out &&
 	! test -f .git/index.lock
 	)
 '
@@ -83,7 +94,15 @@ test_expect_success '--chmod=+x and chmod=-x in the same argument list' '
 	>A &&
 	>B &&
 	git add A B &&
-	git update-index --chmod=+x A --chmod=-x B &&
+	git update-index --verbose --chmod=+x A --chmod=-x B >out &&
+	cat >expect <<-\EOF &&
+	add '\''A'\''
+	chmod +x '\''A'\''
+	add '\''B'\''
+	chmod -x '\''B'\''
+	EOF
+	test_cmp expect out &&
+
 	cat >expect <<-EOF &&
 	100755 $EMPTY_BLOB 0	A
 	100644 $EMPTY_BLOB 0	B
diff --git a/t/t2200-add-update.sh b/t/t2200-add-update.sh
index 0c38f8e356..be394f1131 100755
--- a/t/t2200-add-update.sh
+++ b/t/t2200-add-update.sh
@@ -14,6 +14,7 @@ only the updates to dir/sub.
 Also tested are "git add -u" without limiting, and "git add -u"
 without contents changes, and other conditions'
 
+TEST_PASSES_SANITIZE_LEAK=true
 . ./test-lib.sh
 
 test_expect_success setup '
diff --git a/t/t2203-add-intent.sh b/t/t2203-add-intent.sh
index db7ca55998..ebf58db2d1 100755
--- a/t/t2203-add-intent.sh
+++ b/t/t2203-add-intent.sh
@@ -2,6 +2,7 @@
 
 test_description='Intent to add'
 
+TEST_PASSES_SANITIZE_LEAK=true
 . ./test-lib.sh
 
 test_expect_success 'intent to add' '
diff --git a/t/t2205-add-worktree-config.sh b/t/t2205-add-worktree-config.sh
new file mode 100755
index 0000000000..43d950de64
--- /dev/null
+++ b/t/t2205-add-worktree-config.sh
@@ -0,0 +1,265 @@
+#!/bin/sh
+
+test_description='directory traversal respects user config
+
+This test verifies the traversal of the directory tree when the traversal begins
+outside the repository.  Two instances for which this can occur are tested:
+
+	1) The user manually sets the worktree.  For this instance, the test sets
+	   the worktree two levels above the `.git` directory and checks whether we
+	   are able to add to the index those files that are in either (1) the
+	   manually configured worktree directory or (2) the standard worktree
+	   location with respect to the `.git` directory (i.e. ensuring that the
+	   encountered `.git` directory is not treated as belonging to a foreign
+	   nested repository).
+	2) The user manually sets the `git_dir` while the working directory is
+	   outside the repository.  The test checks that files inside the
+	   repository can be added to the index.
+	'
+
+. ./test-lib.sh
+
+test_expect_success '1a: setup--config worktree' '
+	mkdir test1 &&
+	(
+	cd test1 &&
+	test_create_repo repo &&
+	git --git-dir="repo/.git" config core.worktree "$(pwd)" &&
+
+	mkdir -p outside-tracked outside-untracked &&
+	mkdir -p repo/inside-tracked repo/inside-untracked &&
+	>file-tracked &&
+	>file-untracked &&
+	>outside-tracked/file &&
+	>outside-untracked/file &&
+	>repo/file-tracked &&
+	>repo/file-untracked &&
+	>repo/inside-tracked/file &&
+	>repo/inside-untracked/file &&
+
+	cat >expect-tracked-unsorted <<-EOF &&
+	../file-tracked
+	../outside-tracked/file
+	file-tracked
+	inside-tracked/file
+	EOF
+
+	cat >expect-untracked-unsorted <<-EOF &&
+	../file-untracked
+	../outside-untracked/file
+	file-untracked
+	inside-untracked/file
+	EOF
+
+	cat >expect-all-dir-unsorted <<-EOF &&
+	../file-untracked
+	../file-tracked
+	../outside-untracked/
+	../outside-tracked/
+	./
+	EOF
+
+	cat expect-tracked-unsorted expect-untracked-unsorted >expect-all-unsorted &&
+
+	cat >.gitignore <<-EOF
+	.gitignore
+	actual-*
+	expect-*
+	EOF
+	)
+'
+
+test_expect_success '1b: pre-add all' '
+	(
+	cd test1 &&
+	local parent_dir="$(pwd)" &&
+	git -C repo ls-files -o --exclude-standard "$parent_dir" >actual-all-unsorted &&
+	sort actual-all-unsorted >actual-all &&
+	sort expect-all-unsorted >expect-all &&
+	test_cmp expect-all actual-all
+	)
+'
+
+test_expect_success '1c: pre-add dir all' '
+	(
+	cd test1 &&
+	local parent_dir="$(pwd)" &&
+	git -C repo ls-files -o --directory --exclude-standard "$parent_dir" >actual-all-dir-unsorted &&
+	sort actual-all-dir-unsorted >actual-all &&
+	sort expect-all-dir-unsorted >expect-all &&
+	test_cmp expect-all actual-all
+	)
+'
+
+test_expect_success '1d: post-add tracked' '
+	(
+	cd test1 &&
+	local parent_dir="$(pwd)" &&
+	(
+		cd repo &&
+		git add file-tracked &&
+		git add inside-tracked &&
+		git add ../outside-tracked &&
+		git add "$parent_dir/file-tracked" &&
+		git ls-files "$parent_dir" >../actual-tracked-unsorted
+	) &&
+	sort actual-tracked-unsorted >actual-tracked &&
+	sort expect-tracked-unsorted >expect-tracked &&
+	test_cmp expect-tracked actual-tracked
+	)
+'
+
+test_expect_success '1e: post-add untracked' '
+	(
+	cd test1 &&
+	local parent_dir="$(pwd)" &&
+	git -C repo ls-files -o --exclude-standard "$parent_dir" >actual-untracked-unsorted &&
+	sort actual-untracked-unsorted >actual-untracked &&
+	sort expect-untracked-unsorted >expect-untracked &&
+	test_cmp expect-untracked actual-untracked
+	)
+'
+
+test_expect_success '2a: setup--set git-dir' '
+	mkdir test2 &&
+	(
+	cd test2 &&
+	test_create_repo repo &&
+	# create two foreign repositories that should remain untracked
+	test_create_repo repo-outside &&
+	test_create_repo repo/repo-inside &&
+
+	mkdir -p repo/inside-tracked repo/inside-untracked &&
+	>repo/file-tracked &&
+	>repo/file-untracked &&
+	>repo/inside-tracked/file &&
+	>repo/inside-untracked/file &&
+	>repo-outside/file &&
+	>repo/repo-inside/file &&
+
+	cat >expect-tracked-unsorted <<-EOF &&
+	repo/file-tracked
+	repo/inside-tracked/file
+	EOF
+
+	cat >expect-untracked-unsorted <<-EOF &&
+	repo/file-untracked
+	repo/inside-untracked/file
+	repo/repo-inside/
+	repo-outside/
+	EOF
+
+	cat >expect-all-dir-unsorted <<-EOF &&
+	repo/
+	repo-outside/
+	EOF
+
+	cat expect-tracked-unsorted expect-untracked-unsorted >expect-all-unsorted &&
+
+	cat >.gitignore <<-EOF
+	.gitignore
+	actual-*
+	expect-*
+	EOF
+	)
+'
+
+test_expect_success '2b: pre-add all' '
+	(
+	cd test2 &&
+	git --git-dir=repo/.git ls-files -o --exclude-standard >actual-all-unsorted &&
+	sort actual-all-unsorted >actual-all &&
+	sort expect-all-unsorted >expect-all &&
+	test_cmp expect-all actual-all
+	)
+'
+
+test_expect_success '2c: pre-add dir all' '
+	(
+	cd test2 &&
+	git --git-dir=repo/.git ls-files -o --directory --exclude-standard >actual-all-dir-unsorted &&
+	sort actual-all-dir-unsorted >actual-all &&
+	sort expect-all-dir-unsorted >expect-all &&
+	test_cmp expect-all actual-all
+	)
+'
+
+test_expect_success '2d: post-add tracked' '
+	(
+	cd test2 &&
+	git --git-dir=repo/.git add repo/file-tracked &&
+	git --git-dir=repo/.git add repo/inside-tracked &&
+	git --git-dir=repo/.git ls-files >actual-tracked-unsorted &&
+	sort actual-tracked-unsorted >actual-tracked &&
+	sort expect-tracked-unsorted >expect-tracked &&
+	test_cmp expect-tracked actual-tracked
+	)
+'
+
+test_expect_success '2e: post-add untracked' '
+	(
+	cd test2 &&
+	git --git-dir=repo/.git ls-files -o --exclude-standard >actual-untracked-unsorted &&
+	sort actual-untracked-unsorted >actual-untracked &&
+	sort expect-untracked-unsorted >expect-untracked &&
+	test_cmp expect-untracked actual-untracked
+	)
+'
+
+test_expect_success '3a: setup--add repo dir' '
+	mkdir test3 &&
+	(
+	cd test3 &&
+	test_create_repo repo &&
+
+	mkdir -p repo/inside-tracked repo/inside-ignored &&
+	>repo/file-tracked &&
+	>repo/file-ignored &&
+	>repo/inside-tracked/file &&
+	>repo/inside-ignored/file &&
+
+	cat >.gitignore <<-EOF &&
+	.gitignore
+	actual-*
+	expect-*
+	*ignored
+	EOF
+
+	cat >expect-tracked-unsorted <<-EOF &&
+	repo/file-tracked
+	repo/inside-tracked/file
+	EOF
+
+	cat >expect-ignored-unsorted <<-EOF
+	repo/file-ignored
+	repo/inside-ignored/
+	.gitignore
+	actual-ignored-unsorted
+	expect-ignored-unsorted
+	expect-tracked-unsorted
+	EOF
+	)
+'
+
+test_expect_success '3b: ignored' '
+	(
+	cd test3 &&
+	git --git-dir=repo/.git ls-files -io --directory --exclude-standard >actual-ignored-unsorted &&
+	sort actual-ignored-unsorted >actual-ignored &&
+	sort expect-ignored-unsorted >expect-ignored &&
+	test_cmp expect-ignored actual-ignored
+	)
+'
+
+test_expect_success '3c: add repo' '
+	(
+	cd test3 &&
+	git --git-dir=repo/.git add repo &&
+	git --git-dir=repo/.git ls-files >actual-tracked-unsorted &&
+	sort actual-tracked-unsorted >actual-tracked &&
+	sort expect-tracked-unsorted >expect-tracked &&
+	test_cmp expect-tracked actual-tracked
+	)
+'
+
+test_done
diff --git a/t/t3001-ls-files-others-exclude.sh b/t/t3001-ls-files-others-exclude.sh
index 48cec4e5f8..e07ac6c6dc 100755
--- a/t/t3001-ls-files-others-exclude.sh
+++ b/t/t3001-ls-files-others-exclude.sh
@@ -67,26 +67,26 @@ echo '!*.2
 
 allignores='.gitignore one/.gitignore one/two/.gitignore'
 
-test_expect_success \
-    'git ls-files --others with various exclude options.' \
-    'git ls-files --others \
+test_expect_success 'git ls-files --others with various exclude options.' '
+	git ls-files --others \
        --exclude=\*.6 \
        --exclude-per-directory=.gitignore \
        --exclude-from=.git/ignore \
-       >output &&
-     test_cmp expect output'
+	>output &&
+	test_cmp expect output
+'
 
 # Test \r\n (MSDOS-like systems)
 printf '*.1\r\n/*.3\r\n!*.6\r\n' >.gitignore
 
-test_expect_success \
-    'git ls-files --others with \r\n line endings.' \
-    'git ls-files --others \
+test_expect_success 'git ls-files --others with \r\n line endings.' '
+	git ls-files --others \
        --exclude=\*.6 \
        --exclude-per-directory=.gitignore \
        --exclude-from=.git/ignore \
-       >output &&
-     test_cmp expect output'
+	>output &&
+	test_cmp expect output
+'
 
 test_expect_success 'setup skip-worktree gitignore' '
 	git add $allignores &&
@@ -94,14 +94,14 @@ test_expect_success 'setup skip-worktree gitignore' '
 	rm $allignores
 '
 
-test_expect_success \
-    'git ls-files --others with various exclude options.' \
-    'git ls-files --others \
+test_expect_success 'git ls-files --others with various exclude options.' '
+	git ls-files --others \
        --exclude=\*.6 \
        --exclude-per-directory=.gitignore \
        --exclude-from=.git/ignore \
-       >output &&
-     test_cmp expect output'
+	>output &&
+	test_cmp expect output
+'
 
 test_expect_success !SANITIZE_LEAK 'restore gitignore' '
 	git checkout --ignore-skip-worktree-bits $allignores &&
@@ -283,12 +283,12 @@ test_expect_success 'pattern matches prefix completely' '
 '
 
 test_expect_success 'ls-files with "**" patterns' '
-	cat <<\EOF >expect &&
-a.1
-one/a.1
-one/two/a.1
-three/a.1
-EOF
+	cat <<-\EOF >expect &&
+	a.1
+	one/a.1
+	one/two/a.1
+	three/a.1
+	EOF
 	git ls-files -o -i --exclude "**/a.1" >actual &&
 	test_cmp expect actual
 '
diff --git a/t/t3002-ls-files-dashpath.sh b/t/t3002-ls-files-dashpath.sh
index 54d22a45df..4dd24550eb 100755
--- a/t/t3002-ls-files-dashpath.sh
+++ b/t/t3002-ls-files-dashpath.sh
@@ -16,56 +16,62 @@ filesystem.
 TEST_PASSES_SANITIZE_LEAK=true
 . ./test-lib.sh
 
-test_expect_success \
-	setup \
-	'echo frotz >path0 &&
+test_expect_success 'setup' '
+	echo frotz >path0 &&
 	echo frotz >./-foo &&
-	echo frotz >./--'
+	echo frotz >./--
+'
 
-test_expect_success \
-    'git ls-files without path restriction.' \
-    'git ls-files --others >output &&
-     test_cmp output - <<EOF
---
--foo
-output
-path0
-EOF
+test_expect_success 'git ls-files without path restriction.' '
+	test_when_finished "rm -f expect" &&
+	git ls-files --others >output &&
+	cat >expect <<-\EOF &&
+	--
+	-foo
+	output
+	path0
+	EOF
+	test_cmp output expect
 '
 
-test_expect_success \
-    'git ls-files with path restriction.' \
-    'git ls-files --others path0 >output &&
-	test_cmp output - <<EOF
-path0
-EOF
+test_expect_success 'git ls-files with path restriction.' '
+	test_when_finished "rm -f expect" &&
+	git ls-files --others path0 >output &&
+	cat >expect <<-\EOF &&
+	path0
+	EOF
+	test_cmp output expect
 '
 
-test_expect_success \
-    'git ls-files with path restriction with --.' \
-    'git ls-files --others -- path0 >output &&
-	test_cmp output - <<EOF
-path0
-EOF
+test_expect_success 'git ls-files with path restriction with --.' '
+	test_when_finished "rm -f expect" &&
+	git ls-files --others -- path0 >output &&
+	cat >expect <<-\EOF &&
+	path0
+	EOF
+	test_cmp output expect
 '
 
-test_expect_success \
-    'git ls-files with path restriction with -- --.' \
-    'git ls-files --others -- -- >output &&
-	test_cmp output - <<EOF
---
-EOF
+test_expect_success 'git ls-files with path restriction with -- --.' '
+	test_when_finished "rm -f expect" &&
+	git ls-files --others -- -- >output &&
+	cat >expect <<-\EOF &&
+	--
+	EOF
+	test_cmp output expect
 '
 
-test_expect_success \
-    'git ls-files with no path restriction.' \
-    'git ls-files --others -- >output &&
-	test_cmp output - <<EOF
---
--foo
-output
-path0
-EOF
+test_expect_success 'git ls-files with no path restriction.' '
+	test_when_finished "rm -f expect" &&
+	git ls-files --others -- >output &&
+	cat >expect <<-\EOF &&
+	--
+	-foo
+	output
+	path0
+	EOF
+	test_cmp output expect
+
 '
 
 test_done
diff --git a/t/t3020-ls-files-error-unmatch.sh b/t/t3020-ls-files-error-unmatch.sh
index 2cbcbc0721..133593d23c 100755
--- a/t/t3020-ls-files-error-unmatch.sh
+++ b/t/t3020-ls-files-error-unmatch.sh
@@ -19,12 +19,12 @@ test_expect_success 'setup' '
 	git commit -m "add foo bar"
 '
 
-test_expect_success \
-    'git ls-files --error-unmatch should fail with unmatched path.' \
-    'test_must_fail git ls-files --error-unmatch foo bar-does-not-match'
+test_expect_success 'git ls-files --error-unmatch should fail with unmatched path.' '
+	test_must_fail git ls-files --error-unmatch foo bar-does-not-match
+'
 
-test_expect_success \
-    'git ls-files --error-unmatch should succeed with matched paths.' \
-    'git ls-files --error-unmatch foo bar'
+test_expect_success 'git ls-files --error-unmatch should succeed with matched paths.' '
+	git ls-files --error-unmatch foo bar
+'
 
 test_done
diff --git a/t/t3060-ls-files-with-tree.sh b/t/t3060-ls-files-with-tree.sh
index b257c792a4..52f76f7b57 100755
--- a/t/t3060-ls-files-with-tree.sh
+++ b/t/t3060-ls-files-with-tree.sh
@@ -10,7 +10,7 @@ a scenario known to trigger a crash with some versions of git.
 '
 . ./test-lib.sh
 
-test_expect_success setup '
+test_expect_success 'setup' '
 
 	# The bug we are exercising requires a fair number of entries
 	# in a sub-directory so that add_index_entry will trigger a
@@ -62,9 +62,9 @@ test_expect_success 'git ls-files --with-tree should succeed from subdir' '
 	)
 '
 
-test_expect_success \
-    'git ls-files --with-tree should add entries from named tree.' \
-    'test_cmp expected output'
+test_expect_success 'git ls-files --with-tree should add entries from named tree.' '
+	test_cmp expected output
+'
 
 test_expect_success 'no duplicates in --with-tree output' '
 	git ls-files --with-tree=HEAD >actual &&
diff --git a/t/t3104-ls-tree-format.sh b/t/t3104-ls-tree-format.sh
index 0769a933d6..383896667b 100755
--- a/t/t3104-ls-tree-format.sh
+++ b/t/t3104-ls-tree-format.sh
@@ -4,6 +4,7 @@ test_description='ls-tree --format'
 
 TEST_PASSES_SANITIZE_LEAK=true
 . ./test-lib.sh
+. "$TEST_DIRECTORY"/lib-t3100.sh
 
 test_expect_success 'ls-tree --format usage' '
 	test_expect_code 129 git ls-tree --format=fmt -l HEAD &&
@@ -12,9 +13,7 @@ test_expect_success 'ls-tree --format usage' '
 '
 
 test_expect_success 'setup' '
-	mkdir dir &&
-	test_commit dir/sub-file &&
-	test_commit top-file
+	setup_basic_ls_tree_data
 '
 
 test_ls_tree_format () {
diff --git a/t/t3105-ls-tree-output.sh b/t/t3105-ls-tree-output.sh
new file mode 100755
index 0000000000..ce2391e28b
--- /dev/null
+++ b/t/t3105-ls-tree-output.sh
@@ -0,0 +1,192 @@
+#!/bin/sh
+
+test_description='ls-tree output'
+
+TEST_PASSES_SANITIZE_LEAK=true
+. ./test-lib.sh
+. "$TEST_DIRECTORY"/lib-t3100.sh
+
+test_expect_success 'ls-tree --format usage' '
+	test_expect_code 129 git ls-tree --format=fmt -l HEAD &&
+	test_expect_code 129 git ls-tree --format=fmt --name-only HEAD &&
+	test_expect_code 129 git ls-tree --format=fmt --name-status HEAD
+'
+
+test_expect_success 'setup' '
+	setup_basic_ls_tree_data
+'
+
+test_ls_tree_format_mode_output () {
+	local opts="$1" &&
+	shift &&
+	cat >expect &&
+
+	while test $# -gt 0
+	do
+		local mode="$1" &&
+		shift &&
+
+		test_expect_success "'ls-tree $opts${mode:+ $mode}' output" '
+			git ls-tree ${mode:+$mode }$opts HEAD >actual &&
+			test_cmp expect actual
+		'
+
+		case "$opts" in
+		--full-tree)
+			test_expect_success "'ls-tree $opts${mode:+ $mode}' output (via subdir, fails)" '
+				test_must_fail git -C dir ls-tree --full-name ${mode:+$mode }$opts HEAD -- ../
+			'
+			;;
+		*)
+			test_expect_success "'ls-tree $opts${mode:+ $mode}' output (via subdir)" '
+				git -C dir ls-tree --full-name ${mode:+$mode }$opts HEAD -- ../ >actual &&
+				test_cmp expect actual
+			'
+			;;
+		esac
+	done
+}
+
+# test exact output of option (none, --long, ...) and mode (none and
+# -d, -r -t) and combinations
+test_expect_success 'setup: HEAD_* variables' '
+	HEAD_gitmodules=$(git rev-parse HEAD:.gitmodules) &&
+	HEAD_dir=$(git rev-parse HEAD:dir) &&
+	HEAD_top_file=$(git rev-parse HEAD:top-file.t) &&
+	HEAD_submodule=$(git rev-parse HEAD:submodule) &&
+	HEAD_dir_sub_file=$(git rev-parse HEAD:dir/sub-file.t)
+'
+## opt =
+test_ls_tree_format_mode_output "" "" "-t" <<-EOF
+	100644 blob $HEAD_gitmodules	.gitmodules
+	040000 tree $HEAD_dir	dir
+	160000 commit $HEAD_submodule	submodule
+	100644 blob $HEAD_top_file	top-file.t
+	EOF
+test_ls_tree_format_mode_output "" "-d" <<-EOF
+	040000 tree $HEAD_dir	dir
+	160000 commit $HEAD_submodule	submodule
+	EOF
+test_ls_tree_format_mode_output "" "-r" <<-EOF
+	100644 blob $HEAD_gitmodules	.gitmodules
+	100644 blob $HEAD_dir_sub_file	dir/sub-file.t
+	160000 commit $HEAD_submodule	submodule
+	100644 blob $HEAD_top_file	top-file.t
+	EOF
+## opt = --long
+test_ls_tree_format_mode_output "--long" "" "-t" <<-EOF
+	100644 blob $HEAD_gitmodules      61	.gitmodules
+	040000 tree $HEAD_dir       -	dir
+	160000 commit $HEAD_submodule       -	submodule
+	100644 blob $HEAD_top_file       9	top-file.t
+	EOF
+test_ls_tree_format_mode_output "--long" "-d" <<-EOF
+	040000 tree $HEAD_dir       -	dir
+	160000 commit $HEAD_submodule       -	submodule
+	EOF
+test_ls_tree_format_mode_output "--long" "-r" <<-EOF
+	100644 blob $HEAD_gitmodules      61	.gitmodules
+	100644 blob $HEAD_dir_sub_file      13	dir/sub-file.t
+	160000 commit $HEAD_submodule       -	submodule
+	100644 blob $HEAD_top_file       9	top-file.t
+	EOF
+## opt = --name-only
+test_ls_tree_format_mode_output "--name-only" "" "-t" <<-EOF
+	.gitmodules
+	dir
+	submodule
+	top-file.t
+	EOF
+test_ls_tree_format_mode_output "--name-only" "-d" <<-EOF
+	dir
+	submodule
+	EOF
+test_ls_tree_format_mode_output "--name-only" "-r" <<-EOF
+	.gitmodules
+	dir/sub-file.t
+	submodule
+	top-file.t
+	EOF
+## opt = --object-only
+test_ls_tree_format_mode_output "--object-only" "" "-t" <<-EOF
+	$HEAD_gitmodules
+	$HEAD_dir
+	$HEAD_submodule
+	$HEAD_top_file
+	EOF
+test_ls_tree_format_mode_output "--object-only" "-d" <<-EOF
+	$HEAD_dir
+	$HEAD_submodule
+	EOF
+test_ls_tree_format_mode_output "--object-only" "-r" <<-EOF
+	$HEAD_gitmodules
+	$HEAD_dir_sub_file
+	$HEAD_submodule
+	$HEAD_top_file
+	EOF
+## opt = --object-only --abbrev
+test_expect_success 'setup: HEAD_short_* variables' '
+	HEAD_short_gitmodules=$(git rev-parse --short HEAD:.gitmodules) &&
+	HEAD_short_dir=$(git rev-parse --short HEAD:dir) &&
+	HEAD_short_top_file=$(git rev-parse --short HEAD:top-file.t) &&
+	HEAD_short_submodule=$(git rev-parse --short HEAD:submodule) &&
+	HEAD_short_dir_sub_file=$(git rev-parse --short HEAD:dir/sub-file.t)
+'
+test_ls_tree_format_mode_output "--object-only --abbrev" "" "-t" <<-EOF
+	$HEAD_short_gitmodules
+	$HEAD_short_dir
+	$HEAD_short_submodule
+	$HEAD_short_top_file
+	EOF
+test_ls_tree_format_mode_output "--object-only --abbrev" "-d" <<-EOF
+	$HEAD_short_dir
+	$HEAD_short_submodule
+	EOF
+test_ls_tree_format_mode_output "--object-only --abbrev" "-r" <<-EOF
+	$HEAD_short_gitmodules
+	$HEAD_short_dir_sub_file
+	$HEAD_short_submodule
+	$HEAD_short_top_file
+	EOF
+## opt = --full-name
+test_ls_tree_format_mode_output "--full-name" "" <<-EOF
+	100644 blob $HEAD_gitmodules	.gitmodules
+	040000 tree $HEAD_dir	dir
+	160000 commit $HEAD_submodule	submodule
+	100644 blob $HEAD_top_file	top-file.t
+	EOF
+test_ls_tree_format_mode_output "--full-name" "-d" <<-EOF
+	040000 tree $HEAD_dir	dir
+	160000 commit $HEAD_submodule	submodule
+	EOF
+test_ls_tree_format_mode_output "--full-name" "-r" <<-EOF
+	100644 blob $HEAD_gitmodules	.gitmodules
+	100644 blob $HEAD_dir_sub_file	dir/sub-file.t
+	160000 commit $HEAD_submodule	submodule
+	100644 blob $HEAD_top_file	top-file.t
+	EOF
+test_ls_tree_format_mode_output "--full-name" "-t" <<-EOF
+	100644 blob $HEAD_gitmodules	.gitmodules
+	040000 tree $HEAD_dir	dir
+	160000 commit $HEAD_submodule	submodule
+	100644 blob $HEAD_top_file	top-file.t
+	EOF
+## opt = --full-tree
+test_ls_tree_format_mode_output "--full-tree" "" "-t" <<-EOF
+	100644 blob $HEAD_gitmodules	.gitmodules
+	040000 tree $HEAD_dir	dir
+	160000 commit $HEAD_submodule	submodule
+	100644 blob $HEAD_top_file	top-file.t
+	EOF
+test_ls_tree_format_mode_output "--full-tree" "-d" <<-EOF
+	040000 tree $HEAD_dir	dir
+	160000 commit $HEAD_submodule	submodule
+	EOF
+test_ls_tree_format_mode_output "--full-tree" "-r" <<-EOF
+	100644 blob $HEAD_gitmodules	.gitmodules
+	100644 blob $HEAD_dir_sub_file	dir/sub-file.t
+	160000 commit $HEAD_submodule	submodule
+	100644 blob $HEAD_top_file	top-file.t
+	EOF
+
+test_done
diff --git a/t/t3200-branch.sh b/t/t3200-branch.sh
index 4f49c49fb7..88b9c56e5c 100755
--- a/t/t3200-branch.sh
+++ b/t/t3200-branch.sh
@@ -887,6 +887,41 @@ test_expect_success 'branch from tag w/--track causes failure' '
 	test_must_fail git branch --track my11 foobar
 '
 
+test_expect_success 'simple tracking works when remote branch name matches' '
+	test_when_finished "rm -rf otherserver" &&
+	git init otherserver &&
+	test_commit -C otherserver my_commit 1 &&
+	git -C otherserver branch feature &&
+	test_config branch.autosetupmerge simple &&
+	test_config remote.otherserver.url otherserver &&
+	test_config remote.otherserver.fetch refs/heads/*:refs/remotes/otherserver/* &&
+	git fetch otherserver &&
+	git branch feature otherserver/feature &&
+	test_cmp_config otherserver branch.feature.remote &&
+	test_cmp_config refs/heads/feature branch.feature.merge
+'
+
+test_expect_success 'simple tracking skips when remote branch name does not match' '
+	test_config branch.autosetupmerge simple &&
+	test_config remote.local.url . &&
+	test_config remote.local.fetch refs/heads/*:refs/remotes/local/* &&
+	git fetch local &&
+	git branch my-other local/main &&
+	test_cmp_config "" --default "" branch.my-other.remote &&
+	test_cmp_config "" --default "" branch.my-other.merge
+'
+
+test_expect_success 'simple tracking skips when remote ref is not a branch' '
+	test_config branch.autosetupmerge simple &&
+	test_config remote.localtags.url . &&
+	test_config remote.localtags.fetch refs/tags/*:refs/remotes/localtags/* &&
+	git tag mytag12 main &&
+	git fetch localtags &&
+	git branch mytag12 localtags/mytag12 &&
+	test_cmp_config "" --default "" branch.mytag12.remote &&
+	test_cmp_config "" --default "" branch.mytag12.merge
+'
+
 test_expect_success '--set-upstream-to fails on multiple branches' '
 	echo "fatal: too many arguments to set new upstream" >expect &&
 	test_must_fail git branch --set-upstream-to main a b c 2>err &&
diff --git a/t/t3206-range-diff.sh b/t/t3206-range-diff.sh
index e30bc48a29..03d4df2359 100755
--- a/t/t3206-range-diff.sh
+++ b/t/t3206-range-diff.sh
@@ -772,4 +772,55 @@ test_expect_success '--left-only/--right-only' '
 	test_cmp expect actual
 '
 
+test_expect_success 'submodule changes are shown irrespective of diff.submodule' '
+	git init sub-repo &&
+	test_commit -C sub-repo sub-first &&
+	sub_oid1=$(git -C sub-repo rev-parse HEAD) &&
+	test_commit -C sub-repo sub-second &&
+	sub_oid2=$(git -C sub-repo rev-parse HEAD) &&
+	test_commit -C sub-repo sub-third &&
+	sub_oid3=$(git -C sub-repo rev-parse HEAD) &&
+
+	git checkout -b main-sub topic &&
+	git -c protocol.file.allow=always submodule add ./sub-repo sub &&
+	git -C sub checkout --detach sub-first &&
+	git commit -m "add sub" sub &&
+	sup_oid1=$(git rev-parse --short HEAD) &&
+	git checkout -b topic-sub &&
+	git -C sub checkout sub-second &&
+	git commit -m "change sub" sub &&
+	sup_oid2=$(git rev-parse --short HEAD) &&
+	git checkout -b modified-sub main-sub &&
+	git -C sub checkout sub-third &&
+	git commit -m "change sub" sub &&
+	sup_oid3=$(git rev-parse --short HEAD) &&
+	sup_oid0=$(test_oid __) &&
+
+	test_config diff.submodule log &&
+	git range-diff topic topic-sub modified-sub >actual &&
+	cat >expect <<-EOF &&
+	1:  $sup_oid1 = 1:  $sup_oid1 add sub
+	2:  $sup_oid2 < -:  $sup_oid0 change sub
+	-:  $sup_oid0 > 2:  $sup_oid3 change sub
+	EOF
+	test_cmp expect actual &&
+	test_config diff.submodule diff &&
+	git range-diff topic topic-sub modified-sub >actual &&
+	git range-diff --creation-factor=100 topic topic-sub modified-sub >actual &&
+	cat >expect <<-EOF &&
+	1:  $sup_oid1 = 1:  $sup_oid1 add sub
+	2:  $sup_oid2 ! 2:  $sup_oid3 change sub
+	    @@ Commit message
+	      ## sub ##
+	     @@
+	     -Subproject commit $sub_oid1
+	    -+Subproject commit $sub_oid2
+	    ++Subproject commit $sub_oid3
+	EOF
+	test_cmp expect actual &&
+	test_config diff.submodule diff &&
+	git range-diff --creation-factor=100 topic topic-sub modified-sub >actual &&
+	test_cmp expect actual
+'
+
 test_done
diff --git a/t/t3302-notes-index-expensive.sh b/t/t3302-notes-index-expensive.sh
index bb5fea02a0..d0c4d38b4d 100755
--- a/t/t3302-notes-index-expensive.sh
+++ b/t/t3302-notes-index-expensive.sh
@@ -8,6 +8,7 @@ test_description='Test commit notes index (expensive!)'
 GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
 export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
 
+TEST_PASSES_SANITIZE_LEAK=true
 . ./test-lib.sh
 
 create_repo () {
diff --git a/t/t3303-notes-subtrees.sh b/t/t3303-notes-subtrees.sh
index eac193757b..bc9b791d1b 100755
--- a/t/t3303-notes-subtrees.sh
+++ b/t/t3303-notes-subtrees.sh
@@ -5,6 +5,7 @@ test_description='Test commit notes organized in subtrees'
 GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
 export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
 
+TEST_PASSES_SANITIZE_LEAK=true
 . ./test-lib.sh
 
 number_of_commits=100
diff --git a/t/t3305-notes-fanout.sh b/t/t3305-notes-fanout.sh
index 9976d787f4..64a9915761 100755
--- a/t/t3305-notes-fanout.sh
+++ b/t/t3305-notes-fanout.sh
@@ -2,6 +2,7 @@
 
 test_description='Test that adding/removing many notes triggers automatic fanout restructuring'
 
+TEST_PASSES_SANITIZE_LEAK=true
 . ./test-lib.sh
 
 path_has_fanout() {
diff --git a/t/t3408-rebase-multi-line.sh b/t/t3408-rebase-multi-line.sh
index cde3562e3a..7b4607d72f 100755
--- a/t/t3408-rebase-multi-line.sh
+++ b/t/t3408-rebase-multi-line.sh
@@ -5,6 +5,7 @@ test_description='rebasing a commit with multi-line first paragraph.'
 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/t3501-revert-cherry-pick.sh b/t/t3501-revert-cherry-pick.sh
index 8617efaaf1..1f4cfc3744 100755
--- a/t/t3501-revert-cherry-pick.sh
+++ b/t/t3501-revert-cherry-pick.sh
@@ -66,8 +66,7 @@ test_expect_success 'cherry-pick after renaming branch' '
 
 	git checkout rename2 &&
 	git cherry-pick added &&
-	test $(git rev-parse HEAD^) = $(git rev-parse rename2) &&
-	test -f opos &&
+	test_cmp_rev rename2 HEAD^ &&
 	grep "Add extra line at the end" opos &&
 	git reflog -1 | grep cherry-pick
 
@@ -77,9 +76,9 @@ test_expect_success 'revert after renaming branch' '
 
 	git checkout rename1 &&
 	git revert added &&
-	test $(git rev-parse HEAD^) = $(git rev-parse rename1) &&
-	test -f spoo &&
-	! grep "Add extra line at the end" spoo &&
+	test_cmp_rev rename1 HEAD^ &&
+	test_path_is_file spoo &&
+	test_cmp_rev initial:oops HEAD:spoo &&
 	git reflog -1 | grep revert
 
 '
@@ -159,6 +158,7 @@ test_expect_success 'cherry-pick works with dirty renamed file' '
 '
 
 test_expect_success 'advice from failed revert' '
+	test_when_finished "git reset --hard" &&
 	test_commit --no-tag "add dream" dream dream &&
 	dream_oid=$(git rev-parse --short HEAD) &&
 	cat <<-EOF >expected &&
@@ -174,4 +174,40 @@ test_expect_success 'advice from failed revert' '
 	test_must_fail git revert HEAD^ 2>actual &&
 	test_cmp expected actual
 '
+
+test_expect_success 'identification of reverted commit (default)' '
+	test_commit to-ident &&
+	test_when_finished "git reset --hard to-ident" &&
+	git checkout --detach to-ident &&
+	git revert --no-edit HEAD &&
+	git cat-file commit HEAD >actual.raw &&
+	grep "^This reverts " actual.raw >actual &&
+	echo "This reverts commit $(git rev-parse HEAD^)." >expect &&
+	test_cmp expect actual
+'
+
+test_expect_success 'identification of reverted commit (--reference)' '
+	git checkout --detach to-ident &&
+	git revert --reference --no-edit HEAD &&
+	git cat-file commit HEAD >actual.raw &&
+	grep "^This reverts " actual.raw >actual &&
+	echo "This reverts commit $(git show -s --pretty=reference HEAD^)." >expect &&
+	test_cmp expect actual
+'
+
+test_expect_success 'identification of reverted commit (revert.reference)' '
+	git checkout --detach to-ident &&
+	git -c revert.reference=true revert --no-edit HEAD &&
+	git cat-file commit HEAD >actual.raw &&
+	grep "^This reverts " actual.raw >actual &&
+	echo "This reverts commit $(git show -s --pretty=reference HEAD^)." >expect &&
+	test_cmp expect actual
+'
+
+test_expect_success 'cherry-pick is unaware of --reference (for now)' '
+	test_when_finished "git reset --hard" &&
+	test_must_fail git cherry-pick --reference HEAD 2>actual &&
+	grep "^usage: git cherry-pick" actual
+'
+
 test_done
diff --git a/t/t3602-rm-sparse-checkout.sh b/t/t3602-rm-sparse-checkout.sh
index 034ec01091..08580fd3dc 100755
--- a/t/t3602-rm-sparse-checkout.sh
+++ b/t/t3602-rm-sparse-checkout.sh
@@ -30,7 +30,7 @@ test_expect_success 'setup' "
 for opt in "" -f --dry-run
 do
 	test_expect_success "rm${opt:+ $opt} does not remove sparse entries" '
-		git sparse-checkout set a &&
+		git sparse-checkout set --no-cone a &&
 		test_must_fail git rm $opt b 2>stderr &&
 		test_cmp b_error_and_hint stderr &&
 		git ls-files --error-unmatch b
@@ -118,7 +118,7 @@ test_expect_success 'can remove files from non-sparse dir' '
 	test_commit w/f &&
 	test_commit x/y/f &&
 
-	git sparse-checkout set w !/x y/ &&
+	git sparse-checkout set --no-cone w !/x y/ &&
 	git rm w/f.t x/y/f.t 2>stderr &&
 	test_must_be_empty stderr
 '
@@ -128,7 +128,7 @@ test_expect_success 'refuse to remove non-skip-worktree file from sparse dir' '
 	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 sparse-checkout set --no-cone !/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 &&
diff --git a/t/t3700-add.sh b/t/t3700-add.sh
index b1f90ba325..8689b48589 100755
--- a/t/t3700-add.sh
+++ b/t/t3700-add.sh
@@ -8,6 +8,8 @@ test_description='Test of git add, including the -- option.'
 TEST_PASSES_SANITIZE_LEAK=true
 . ./test-lib.sh
 
+. "$TEST_DIRECTORY"/lib-unique-files.sh
+
 # Test the file mode "$1" of the file "$2" in the index.
 test_mode_in_index () {
 	case "$(git ls-files -s "$2")" in
@@ -34,6 +36,32 @@ test_expect_success \
     'Test that "git add -- -q" works' \
     'touch -- -q && git add -- -q'
 
+BATCH_CONFIGURATION='-c core.fsync=loose-object -c core.fsyncmethod=batch'
+
+test_expect_success 'git add: core.fsyncmethod=batch' "
+	test_create_unique_files 2 4 files_base_dir1 &&
+	GIT_TEST_FSYNC=1 git $BATCH_CONFIGURATION add -- ./files_base_dir1/ &&
+	git ls-files --stage files_base_dir1/ |
+	test_parse_ls_files_stage_oids >added_files_oids &&
+
+	# We created 2 subdirs with 4 files each (8 files total) above
+	test_line_count = 8 added_files_oids &&
+	git cat-file --batch-check='%(objectname)' <added_files_oids >added_files_actual &&
+	test_cmp added_files_oids added_files_actual
+"
+
+test_expect_success 'git update-index: core.fsyncmethod=batch' "
+	test_create_unique_files 2 4 files_base_dir2 &&
+	find files_base_dir2 ! -type d -print | xargs git $BATCH_CONFIGURATION update-index --add -- &&
+	git ls-files --stage files_base_dir2 |
+	test_parse_ls_files_stage_oids >added_files2_oids &&
+
+	# We created 2 subdirs with 4 files each (8 files total) above
+	test_line_count = 8 added_files2_oids &&
+	git cat-file --batch-check='%(objectname)' <added_files2_oids >added_files2_actual &&
+	test_cmp added_files2_oids added_files2_actual
+"
+
 test_expect_success \
 	'git add: Test that executable bit is not used if core.filemode=0' \
 	'git config core.filemode 0 &&
diff --git a/t/t3701-add-interactive.sh b/t/t3701-add-interactive.sh
index 94537a6b40..3b7df9bed5 100755
--- a/t/t3701-add-interactive.sh
+++ b/t/t3701-add-interactive.sh
@@ -103,6 +103,15 @@ test_expect_success 'status works (commit)' '
 	grep "+1/-0 *+2/-0 file" output
 '
 
+test_expect_success 'update can stage deletions' '
+	>to-delete &&
+	git add to-delete &&
+	rm to-delete &&
+	test_write_lines u t "" | git add -i &&
+	git ls-files to-delete >output &&
+	test_must_be_empty output
+'
+
 test_expect_success 'setup expected' '
 	cat >expected <<-\EOF
 	index 180b47c..b6f2c08 100644
@@ -538,7 +547,15 @@ test_expect_success 'split hunk "add -p (edit)"' '
 	! grep "^+15" actual
 '
 
-test_expect_failure 'split hunk "add -p (no, yes, edit)"' '
+test_expect_success 'setup ADD_I_USE_BUILTIN check' '
+	result=success &&
+	if ! test_have_prereq ADD_I_USE_BUILTIN
+	then
+		result=failure
+	fi
+'
+
+test_expect_$result 'split hunk "add -p (no, yes, edit)"' '
 	test_write_lines 5 10 20 21 30 31 40 50 60 >test &&
 	git reset &&
 	# test sequence is s(plit), n(o), y(es), e(dit)
@@ -562,7 +579,7 @@ test_expect_success 'split hunk with incomplete line at end' '
 	test_must_fail git grep --cached before
 '
 
-test_expect_failure 'edit, adding lines to the first hunk' '
+test_expect_$result 'edit, adding lines to the first hunk' '
 	test_write_lines 10 11 20 30 40 50 51 60 >test &&
 	git reset &&
 	tr _ " " >patch <<-EOF &&
@@ -749,6 +766,19 @@ test_expect_success 'detect bogus diffFilter output' '
 	force_color test_must_fail git add -p <y
 '
 
+test_expect_success 'handle very large filtered diff' '
+	git reset --hard &&
+	# The specific number here is not important, but it must
+	# be large enough that the output of "git diff --color"
+	# fills up the pipe buffer. 10,000 results in ~200k of
+	# colored output.
+	test_seq 10000 >test &&
+	test_config interactive.diffFilter cat &&
+	printf y >y &&
+	force_color git add -p >output 2>&1 <y &&
+	git diff-files --exit-code -- test
+'
+
 test_expect_success 'diff.algorithm is passed to `git diff-files`' '
 	git reset --hard &&
 
diff --git a/t/t3705-add-sparse-checkout.sh b/t/t3705-add-sparse-checkout.sh
index 95609046c6..2bade9e804 100755
--- a/t/t3705-add-sparse-checkout.sh
+++ b/t/t3705-add-sparse-checkout.sh
@@ -166,7 +166,7 @@ test_expect_success 'do not warn when pathspec matches dense entries' '
 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 init --no-cone &&
 	git sparse-checkout set a &&
 	echo >>sparse_entry &&
 
@@ -208,7 +208,7 @@ test_expect_success 'add obeys advice.updateSparsePath' '
 '
 
 test_expect_success 'add allows sparse entries with --sparse' '
-	git sparse-checkout set a &&
+	git sparse-checkout set --no-cone a &&
 	echo modified >sparse_entry &&
 	test_must_fail git add sparse_entry &&
 	test_sparse_entry_unchanged &&
diff --git a/t/t3903-stash.sh b/t/t3903-stash.sh
index 4abbc8fcca..2a4c3fd61c 100755
--- a/t/t3903-stash.sh
+++ b/t/t3903-stash.sh
@@ -9,6 +9,7 @@ GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
 export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
 
 . ./test-lib.sh
+. "$TEST_DIRECTORY"/lib-unique-files.sh
 
 test_expect_success 'usage on cmd and subcommand invalid option' '
 	test_expect_code 129 git stash --invalid-option 2>usage &&
@@ -1410,6 +1411,25 @@ test_expect_success 'stash handles skip-worktree entries nicely' '
 	git rev-parse --verify refs/stash:A.t
 '
 
+
+BATCH_CONFIGURATION='-c core.fsync=loose-object -c core.fsyncmethod=batch'
+
+test_expect_success 'stash with core.fsyncmethod=batch' "
+	test_create_unique_files 2 4 files_base_dir &&
+	GIT_TEST_FSYNC=1 git $BATCH_CONFIGURATION stash push -u -- ./files_base_dir/ &&
+
+	# The files were untracked, so use the third parent,
+	# which contains the untracked files
+	git ls-tree -r stash^3 -- ./files_base_dir/ |
+	test_parse_ls_tree_oids >stashed_files_oids &&
+
+	# We created 2 dirs with 4 files each (8 files total) above
+	test_line_count = 8 stashed_files_oids &&
+	git cat-file --batch-check='%(objectname)' <stashed_files_oids >stashed_files_actual &&
+	test_cmp stashed_files_oids stashed_files_actual
+"
+
+
 test_expect_success 'git stash succeeds despite directory/file change' '
 	test_create_repo directory_file_switch_v1 &&
 	(
diff --git a/t/t4020-diff-external.sh b/t/t4020-diff-external.sh
index 1219f8bd4c..858a5522f9 100755
--- a/t/t4020-diff-external.sh
+++ b/t/t4020-diff-external.sh
@@ -206,17 +206,17 @@ test_expect_success 'GIT_EXTERNAL_DIFF path counter/total' '
 '
 
 test_expect_success 'GIT_EXTERNAL_DIFF generates pretty paths' '
+	test_when_finished "git rm -f file.ext" &&
 	touch file.ext &&
 	git add file.ext &&
 	echo with extension > file.ext &&
 
 	cat >expect <<-EOF &&
-	file.ext file $(git rev-parse --verify HEAD:file) 100644 file.ext $(test_oid zero) 100644
+	file.ext
 	EOF
 	GIT_EXTERNAL_DIFF=echo git diff file.ext >out &&
-	cut -d" " -f1,3- <out >actual &&
-	git update-index --force-remove file.ext &&
-	rm file.ext
+	basename $(cut -d" " -f2 <out) >actual &&
+	test_cmp expect actual
 '
 
 echo "#!$SHELL_PATH" >fake-diff.sh
diff --git a/t/t4021-format-patch-numbered.sh b/t/t4021-format-patch-numbered.sh
index 9be65fd444..1219aa226d 100755
--- a/t/t4021-format-patch-numbered.sh
+++ b/t/t4021-format-patch-numbered.sh
@@ -5,6 +5,7 @@
 
 test_description='Format-patch numbering options'
 
+TEST_PASSES_SANITIZE_LEAK=true
 . ./test-lib.sh
 
 test_expect_success setup '
diff --git a/t/t4027-diff-submodule.sh b/t/t4027-diff-submodule.sh
index 295da987cc..40164ae07d 100755
--- a/t/t4027-diff-submodule.sh
+++ b/t/t4027-diff-submodule.sh
@@ -2,6 +2,7 @@
 
 test_description='difference in submodules'
 
+TEST_PASSES_SANITIZE_LEAK=true
 . ./test-lib.sh
 . "$TEST_DIRECTORY"/lib-diff.sh
 
diff --git a/t/t4028-format-patch-mime-headers.sh b/t/t4028-format-patch-mime-headers.sh
index 204ba673cb..60cb819c42 100755
--- a/t/t4028-format-patch-mime-headers.sh
+++ b/t/t4028-format-patch-mime-headers.sh
@@ -1,6 +1,8 @@
 #!/bin/sh
 
 test_description='format-patch mime headers and extra headers do not conflict'
+
+TEST_PASSES_SANITIZE_LEAK=true
 . ./test-lib.sh
 
 test_expect_success 'create commit with utf-8 body' '
diff --git a/t/t4036-format-patch-signer-mime.sh b/t/t4036-format-patch-signer-mime.sh
index 98d9713d8b..48655bcc78 100755
--- a/t/t4036-format-patch-signer-mime.sh
+++ b/t/t4036-format-patch-signer-mime.sh
@@ -2,6 +2,7 @@
 
 test_description='format-patch -s should force MIME encoding as needed'
 
+TEST_PASSES_SANITIZE_LEAK=true
 . ./test-lib.sh
 
 test_expect_success setup '
diff --git a/t/t4039-diff-assume-unchanged.sh b/t/t4039-diff-assume-unchanged.sh
index 0eb0314a8b..78090e6852 100755
--- a/t/t4039-diff-assume-unchanged.sh
+++ b/t/t4039-diff-assume-unchanged.sh
@@ -2,6 +2,7 @@
 
 test_description='diff with assume-unchanged entries'
 
+TEST_PASSES_SANITIZE_LEAK=true
 . ./test-lib.sh
 
 # external diff has been tested in t4020-diff-external.sh
diff --git a/t/t4055-diff-context.sh b/t/t4055-diff-context.sh
index 741e0803c1..73048d0a52 100755
--- a/t/t4055-diff-context.sh
+++ b/t/t4055-diff-context.sh
@@ -5,6 +5,7 @@
 
 test_description='diff.context configuration'
 
+TEST_PASSES_SANITIZE_LEAK=true
 . ./test-lib.sh
 
 test_expect_success 'setup' '
diff --git a/t/t4066-diff-emit-delay.sh b/t/t4066-diff-emit-delay.sh
index a1de63b77f..0ecb391541 100755
--- a/t/t4066-diff-emit-delay.sh
+++ b/t/t4066-diff-emit-delay.sh
@@ -4,6 +4,7 @@ test_description='test combined/stat/moved interaction'
 GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
 export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
 
+TEST_PASSES_SANITIZE_LEAK=true
 . ./test-lib.sh
 
 # This test covers a weird 3-way interaction between "--cc -p", which will run
diff --git a/t/t4122-apply-symlink-inside.sh b/t/t4122-apply-symlink-inside.sh
index aa52de401b..9696537303 100755
--- a/t/t4122-apply-symlink-inside.sh
+++ b/t/t4122-apply-symlink-inside.sh
@@ -4,6 +4,7 @@ test_description='apply to deeper directory without getting fooled with symlink'
 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/t4126-apply-empty.sh b/t/t4126-apply-empty.sh
index 33860d3829..ece9fae207 100755
--- a/t/t4126-apply-empty.sh
+++ b/t/t4126-apply-empty.sh
@@ -2,7 +2,6 @@
 
 test_description='apply empty'
 
-
 TEST_PASSES_SANITIZE_LEAK=true
 . ./test-lib.sh
 
diff --git a/t/t4128-apply-root.sh b/t/t4128-apply-root.sh
index f6db5a79dd..ed94c90204 100755
--- a/t/t4128-apply-root.sh
+++ b/t/t4128-apply-root.sh
@@ -2,6 +2,7 @@
 
 test_description='apply same filename'
 
+TEST_PASSES_SANITIZE_LEAK=true
 . ./test-lib.sh
 
 test_expect_success 'setup' '
diff --git a/t/t4200-rerere.sh b/t/t4200-rerere.sh
index 9f8c76dffb..7025cfdae5 100755
--- a/t/t4200-rerere.sh
+++ b/t/t4200-rerere.sh
@@ -365,9 +365,6 @@ test_expect_success 'set up an unresolved merge' '
 	test_might_fail git config --unset rerere.autoupdate &&
 	git reset --hard &&
 	git checkout version2 &&
-	fifth=$(git rev-parse fifth) &&
-	echo "$fifth		branch fifth of ." |
-	git fmt-merge-msg >msg &&
 	ancestor=$(git merge-base version2 fifth) &&
 	test_must_fail git merge-recursive "$ancestor" -- HEAD fifth &&
 
diff --git a/t/t4206-log-follow-harder-copies.sh b/t/t4206-log-follow-harder-copies.sh
index 4871a5dc92..33ecf82c7f 100755
--- a/t/t4206-log-follow-harder-copies.sh
+++ b/t/t4206-log-follow-harder-copies.sh
@@ -6,6 +6,8 @@
 test_description='Test --follow should always find copies hard in git log.
 
 '
+
+TEST_PASSES_SANITIZE_LEAK=true
 . ./test-lib.sh
 . "$TEST_DIRECTORY"/lib-diff.sh
 
diff --git a/t/t4207-log-decoration-colors.sh b/t/t4207-log-decoration-colors.sh
index b870942498..36ac6aff1e 100755
--- a/t/t4207-log-decoration-colors.sh
+++ b/t/t4207-log-decoration-colors.sh
@@ -8,6 +8,7 @@ test_description='Test for "git log --decorate" colors'
 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/t4212-log-corrupt.sh b/t/t4212-log-corrupt.sh
index 0244888a5a..30a219894b 100755
--- a/t/t4212-log-corrupt.sh
+++ b/t/t4212-log-corrupt.sh
@@ -2,6 +2,7 @@
 
 test_description='git log with invalid commit headers'
 
+TEST_PASSES_SANITIZE_LEAK=true
 . ./test-lib.sh
 
 test_expect_success 'setup' '
diff --git a/t/t4217-log-limit.sh b/t/t4217-log-limit.sh
new file mode 100755
index 0000000000..6e01e2629c
--- /dev/null
+++ b/t/t4217-log-limit.sh
@@ -0,0 +1,41 @@
+#!/bin/sh
+
+test_description='git log with filter options limiting the output'
+
+. ./test-lib.sh
+
+test_expect_success 'setup test' '
+	git init &&
+	echo a >file &&
+	git add file &&
+	GIT_COMMITTER_DATE="2021-02-01 00:00" git commit -m init &&
+	echo a >>file &&
+	git add file &&
+	GIT_COMMITTER_DATE="2022-02-01 00:00" git commit -m first &&
+	echo a >>file &&
+	git add file &&
+	GIT_COMMITTER_DATE="2021-03-01 00:00" git commit -m second &&
+	echo a >>file &&
+	git add file &&
+	GIT_COMMITTER_DATE="2022-03-01 00:00" git commit -m third
+'
+
+test_expect_success 'git log --since-as-filter=...' '
+	git log --since-as-filter="2022-01-01" --format=%s >actual &&
+	cat >expect <<-\EOF &&
+	third
+	first
+	EOF
+	test_cmp expect actual
+'
+
+test_expect_success 'git log --children --since-as-filter=...' '
+	git log --children --since-as-filter="2022-01-01" --format=%s >actual &&
+	cat >expect <<-\EOF &&
+	third
+	first
+	EOF
+	test_cmp expect actual
+'
+
+test_done
diff --git a/t/t5003-archive-zip.sh b/t/t5003-archive-zip.sh
index d726964307..3992d08158 100755
--- a/t/t5003-archive-zip.sh
+++ b/t/t5003-archive-zip.sh
@@ -206,6 +206,26 @@ test_expect_success 'git archive --format=zip --add-file' '
 check_zip with_untracked
 check_added with_untracked untracked untracked
 
+test_expect_success UNZIP 'git archive --format=zip --add-virtual-file' '
+	if test_have_prereq FUNNYNAMES
+	then
+		PATHNAME="pathname with : colon"
+	else
+		PATHNAME="pathname without colon"
+	fi &&
+	git archive --format=zip >with_file_with_content.zip \
+		--add-virtual-file=\""$PATHNAME"\": \
+		--add-virtual-file=hello:world $EMPTY_TREE &&
+	test_when_finished "rm -rf tmp-unpack" &&
+	mkdir tmp-unpack && (
+		cd tmp-unpack &&
+		"$GIT_UNZIP" ../with_file_with_content.zip &&
+		test_path_is_file hello &&
+		test_path_is_file "$PATHNAME" &&
+		test world = $(cat hello)
+	)
+'
+
 test_expect_success 'git archive --format=zip --add-file twice' '
 	echo untracked >untracked &&
 	git archive --format=zip --prefix=one/ --add-file=untracked \
diff --git a/t/t5300-pack-object.sh b/t/t5300-pack-object.sh
index a11d61206a..f8a0f309e2 100755
--- a/t/t5300-pack-object.sh
+++ b/t/t5300-pack-object.sh
@@ -161,22 +161,27 @@ test_expect_success 'pack-objects with bogus arguments' '
 '
 
 check_unpack () {
+	local packname="$1" &&
+	local object_list="$2" &&
+	local git_config="$3" &&
 	test_when_finished "rm -rf git2" &&
-	git init --bare git2 &&
-	git -C git2 unpack-objects -n <"$1".pack &&
-	git -C git2 unpack-objects <"$1".pack &&
-	(cd .git && find objects -type f -print) |
-	while read path
-	do
-		cmp git2/$path .git/$path || {
-			echo $path differs.
-			return 1
-		}
-	done
+	git $git_config init --bare git2 &&
+	(
+		git $git_config -C git2 unpack-objects -n <"$packname".pack &&
+		git $git_config -C git2 unpack-objects <"$packname".pack &&
+		git $git_config -C git2 cat-file --batch-check="%(objectname)"
+	) <"$object_list" >current &&
+	cmp "$object_list" current
 }
 
 test_expect_success 'unpack without delta' '
-	check_unpack test-1-${packname_1}
+	check_unpack test-1-${packname_1} obj-list
+'
+
+BATCH_CONFIGURATION='-c core.fsync=loose-object -c core.fsyncmethod=batch'
+
+test_expect_success 'unpack without delta (core.fsyncmethod=batch)' '
+	check_unpack test-1-${packname_1} obj-list "$BATCH_CONFIGURATION"
 '
 
 test_expect_success 'pack with REF_DELTA' '
@@ -185,7 +190,11 @@ test_expect_success 'pack with REF_DELTA' '
 '
 
 test_expect_success 'unpack with REF_DELTA' '
-	check_unpack test-2-${packname_2}
+	check_unpack test-2-${packname_2} obj-list
+'
+
+test_expect_success 'unpack with REF_DELTA (core.fsyncmethod=batch)' '
+       check_unpack test-2-${packname_2} obj-list "$BATCH_CONFIGURATION"
 '
 
 test_expect_success 'pack with OFS_DELTA' '
@@ -195,7 +204,11 @@ test_expect_success 'pack with OFS_DELTA' '
 '
 
 test_expect_success 'unpack with OFS_DELTA' '
-	check_unpack test-3-${packname_3}
+	check_unpack test-3-${packname_3} obj-list
+'
+
+test_expect_success 'unpack with OFS_DELTA (core.fsyncmethod=batch)' '
+       check_unpack test-3-${packname_3} obj-list "$BATCH_CONFIGURATION"
 '
 
 test_expect_success 'compare delta flavors' '
diff --git a/t/t5301-sliding-window.sh b/t/t5301-sliding-window.sh
index 76f9798ab9..3ccaaeb397 100755
--- a/t/t5301-sliding-window.sh
+++ b/t/t5301-sliding-window.sh
@@ -4,6 +4,8 @@
 #
 
 test_description='mmap sliding window tests'
+
+TEST_PASSES_SANITIZE_LEAK=true
 . ./test-lib.sh
 
 test_expect_success \
diff --git a/t/t5313-pack-bounds-checks.sh b/t/t5313-pack-bounds-checks.sh
index 535313e4dc..cc4cfaa9d3 100755
--- a/t/t5313-pack-bounds-checks.sh
+++ b/t/t5313-pack-bounds-checks.sh
@@ -1,6 +1,8 @@
 #!/bin/sh
 
 test_description='bounds-checking of access to mmapped on-disk file formats'
+
+TEST_PASSES_SANITIZE_LEAK=true
 . ./test-lib.sh
 
 clear_base () {
diff --git a/t/t5316-pack-delta-depth.sh b/t/t5316-pack-delta-depth.sh
index e9045009a1..eb4ef3dda4 100755
--- a/t/t5316-pack-delta-depth.sh
+++ b/t/t5316-pack-delta-depth.sh
@@ -1,6 +1,8 @@
 #!/bin/sh
 
 test_description='pack-objects breaks long cross-pack delta chains'
+
+TEST_PASSES_SANITIZE_LEAK=true
 . ./test-lib.sh
 
 # This mirrors a repeated push setup:
diff --git a/t/t5317-pack-objects-filter-objects.sh b/t/t5317-pack-objects-filter-objects.sh
index 33b740ce62..bb633c9b09 100755
--- a/t/t5317-pack-objects-filter-objects.sh
+++ b/t/t5317-pack-objects-filter-objects.sh
@@ -10,9 +10,6 @@ export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
 # Test blob:none filter.
 
 test_expect_success 'setup r1' '
-	echo "{print \$1}" >print_1.awk &&
-	echo "{print \$2}" >print_2.awk &&
-
 	git init r1 &&
 	for n in 1 2 3 4 5
 	do
@@ -22,10 +19,13 @@ test_expect_success 'setup r1' '
 	done
 '
 
+parse_verify_pack_blob_oid () {
+	awk '{print $1}' -
+}
+
 test_expect_success 'verify blob count in normal packfile' '
-	git -C r1 ls-files -s file.1 file.2 file.3 file.4 file.5 \
-		>ls_files_result &&
-	awk -f print_2.awk ls_files_result |
+	git -C r1 ls-files -s file.1 file.2 file.3 file.4 file.5 |
+	test_parse_ls_files_stage_oids |
 	sort >expected &&
 
 	git -C r1 pack-objects --revs --stdout >all.pack <<-EOF &&
@@ -35,7 +35,7 @@ test_expect_success 'verify blob count in normal packfile' '
 
 	git -C r1 verify-pack -v ../all.pack >verify_result &&
 	grep blob verify_result |
-	awk -f print_1.awk |
+	parse_verify_pack_blob_oid |
 	sort >observed &&
 
 	test_cmp expected observed
@@ -54,12 +54,12 @@ test_expect_success 'verify blob:none packfile has no blobs' '
 test_expect_success 'verify normal and blob:none packfiles have same commits/trees' '
 	git -C r1 verify-pack -v ../all.pack >verify_result &&
 	grep -E "commit|tree" verify_result |
-	awk -f print_1.awk |
+	parse_verify_pack_blob_oid |
 	sort >expected &&
 
 	git -C r1 verify-pack -v ../filter.pack >verify_result &&
 	grep -E "commit|tree" verify_result |
-	awk -f print_1.awk |
+	parse_verify_pack_blob_oid |
 	sort >observed &&
 
 	test_cmp expected observed
@@ -123,8 +123,8 @@ test_expect_success 'setup r2' '
 '
 
 test_expect_success 'verify blob count in normal packfile' '
-	git -C r2 ls-files -s large.1000 large.10000 >ls_files_result &&
-	awk -f print_2.awk ls_files_result |
+	git -C r2 ls-files -s large.1000 large.10000 |
+	test_parse_ls_files_stage_oids |
 	sort >expected &&
 
 	git -C r2 pack-objects --revs --stdout >all.pack <<-EOF &&
@@ -134,7 +134,7 @@ test_expect_success 'verify blob count in normal packfile' '
 
 	git -C r2 verify-pack -v ../all.pack >verify_result &&
 	grep blob verify_result |
-	awk -f print_1.awk |
+	parse_verify_pack_blob_oid |
 	sort >observed &&
 
 	test_cmp expected observed
@@ -161,8 +161,8 @@ test_expect_success 'verify blob:limit=1000' '
 '
 
 test_expect_success 'verify blob:limit=1001' '
-	git -C r2 ls-files -s large.1000 >ls_files_result &&
-	awk -f print_2.awk ls_files_result |
+	git -C r2 ls-files -s large.1000 |
+	test_parse_ls_files_stage_oids |
 	sort >expected &&
 
 	git -C r2 pack-objects --revs --stdout --filter=blob:limit=1001 >filter.pack <<-EOF &&
@@ -172,15 +172,15 @@ test_expect_success 'verify blob:limit=1001' '
 
 	git -C r2 verify-pack -v ../filter.pack >verify_result &&
 	grep blob verify_result |
-	awk -f print_1.awk |
+	parse_verify_pack_blob_oid |
 	sort >observed &&
 
 	test_cmp expected observed
 '
 
 test_expect_success 'verify blob:limit=10001' '
-	git -C r2 ls-files -s large.1000 large.10000 >ls_files_result &&
-	awk -f print_2.awk ls_files_result |
+	git -C r2 ls-files -s large.1000 large.10000 |
+	test_parse_ls_files_stage_oids |
 	sort >expected &&
 
 	git -C r2 pack-objects --revs --stdout --filter=blob:limit=10001 >filter.pack <<-EOF &&
@@ -190,15 +190,15 @@ test_expect_success 'verify blob:limit=10001' '
 
 	git -C r2 verify-pack -v ../filter.pack >verify_result &&
 	grep blob verify_result |
-	awk -f print_1.awk |
+	parse_verify_pack_blob_oid |
 	sort >observed &&
 
 	test_cmp expected observed
 '
 
 test_expect_success 'verify blob:limit=1k' '
-	git -C r2 ls-files -s large.1000 >ls_files_result &&
-	awk -f print_2.awk ls_files_result |
+	git -C r2 ls-files -s large.1000 |
+	test_parse_ls_files_stage_oids |
 	sort >expected &&
 
 	git -C r2 pack-objects --revs --stdout --filter=blob:limit=1k >filter.pack <<-EOF &&
@@ -208,15 +208,15 @@ test_expect_success 'verify blob:limit=1k' '
 
 	git -C r2 verify-pack -v ../filter.pack >verify_result &&
 	grep blob verify_result |
-	awk -f print_1.awk |
+	parse_verify_pack_blob_oid |
 	sort >observed &&
 
 	test_cmp expected observed
 '
 
 test_expect_success 'verify explicitly specifying oversized blob in input' '
-	git -C r2 ls-files -s large.1000 large.10000 >ls_files_result &&
-	awk -f print_2.awk ls_files_result |
+	git -C r2 ls-files -s large.1000 large.10000 |
+	test_parse_ls_files_stage_oids |
 	sort >expected &&
 
 	echo HEAD >objects &&
@@ -226,15 +226,15 @@ test_expect_success 'verify explicitly specifying oversized blob in input' '
 
 	git -C r2 verify-pack -v ../filter.pack >verify_result &&
 	grep blob verify_result |
-	awk -f print_1.awk |
+	parse_verify_pack_blob_oid |
 	sort >observed &&
 
 	test_cmp expected observed
 '
 
 test_expect_success 'verify blob:limit=1m' '
-	git -C r2 ls-files -s large.1000 large.10000 >ls_files_result &&
-	awk -f print_2.awk ls_files_result |
+	git -C r2 ls-files -s large.1000 large.10000 |
+	test_parse_ls_files_stage_oids |
 	sort >expected &&
 
 	git -C r2 pack-objects --revs --stdout --filter=blob:limit=1m >filter.pack <<-EOF &&
@@ -244,7 +244,7 @@ test_expect_success 'verify blob:limit=1m' '
 
 	git -C r2 verify-pack -v ../filter.pack >verify_result &&
 	grep blob verify_result |
-	awk -f print_1.awk |
+	parse_verify_pack_blob_oid |
 	sort >observed &&
 
 	test_cmp expected observed
@@ -253,12 +253,12 @@ test_expect_success 'verify blob:limit=1m' '
 test_expect_success 'verify normal and blob:limit packfiles have same commits/trees' '
 	git -C r2 verify-pack -v ../all.pack >verify_result &&
 	grep -E "commit|tree" verify_result |
-	awk -f print_1.awk |
+	parse_verify_pack_blob_oid |
 	sort >expected &&
 
 	git -C r2 verify-pack -v ../filter.pack >verify_result &&
 	grep -E "commit|tree" verify_result |
-	awk -f print_1.awk |
+	parse_verify_pack_blob_oid |
 	sort >observed &&
 
 	test_cmp expected observed
@@ -289,9 +289,8 @@ test_expect_success 'setup r3' '
 '
 
 test_expect_success 'verify blob count in normal packfile' '
-	git -C r3 ls-files -s sparse1 sparse2 dir1/sparse1 dir1/sparse2 \
-		>ls_files_result &&
-	awk -f print_2.awk ls_files_result |
+	git -C r3 ls-files -s sparse1 sparse2 dir1/sparse1 dir1/sparse2 |
+	test_parse_ls_files_stage_oids |
 	sort >expected &&
 
 	git -C r3 pack-objects --revs --stdout >all.pack <<-EOF &&
@@ -301,7 +300,7 @@ test_expect_success 'verify blob count in normal packfile' '
 
 	git -C r3 verify-pack -v ../all.pack >verify_result &&
 	grep blob verify_result |
-	awk -f print_1.awk |
+	parse_verify_pack_blob_oid |
 	sort >observed &&
 
 	test_cmp expected observed
@@ -342,9 +341,8 @@ test_expect_success 'setup r4' '
 '
 
 test_expect_success 'verify blob count in normal packfile' '
-	git -C r4 ls-files -s pattern sparse1 sparse2 dir1/sparse1 dir1/sparse2 \
-		>ls_files_result &&
-	awk -f print_2.awk ls_files_result |
+	git -C r4 ls-files -s pattern sparse1 sparse2 dir1/sparse1 dir1/sparse2 |
+	test_parse_ls_files_stage_oids |
 	sort >expected &&
 
 	git -C r4 pack-objects --revs --stdout >all.pack <<-EOF &&
@@ -354,19 +352,19 @@ test_expect_success 'verify blob count in normal packfile' '
 
 	git -C r4 verify-pack -v ../all.pack >verify_result &&
 	grep blob verify_result |
-	awk -f print_1.awk |
+	parse_verify_pack_blob_oid |
 	sort >observed &&
 
 	test_cmp expected observed
 '
 
 test_expect_success 'verify sparse:oid=OID' '
-	git -C r4 ls-files -s dir1/sparse1 dir1/sparse2 >ls_files_result &&
-	awk -f print_2.awk ls_files_result |
+	git -C r4 ls-files -s dir1/sparse1 dir1/sparse2 |
+	test_parse_ls_files_stage_oids |
 	sort >expected &&
 
 	git -C r4 ls-files -s pattern >staged &&
-	oid=$(awk -f print_2.awk staged) &&
+	oid=$(test_parse_ls_files_stage_oids <staged) &&
 	git -C r4 pack-objects --revs --stdout --filter=sparse:oid=$oid >filter.pack <<-EOF &&
 	HEAD
 	EOF
@@ -374,15 +372,15 @@ test_expect_success 'verify sparse:oid=OID' '
 
 	git -C r4 verify-pack -v ../filter.pack >verify_result &&
 	grep blob verify_result |
-	awk -f print_1.awk |
+	parse_verify_pack_blob_oid |
 	sort >observed &&
 
 	test_cmp expected observed
 '
 
 test_expect_success 'verify sparse:oid=oid-ish' '
-	git -C r4 ls-files -s dir1/sparse1 dir1/sparse2 >ls_files_result &&
-	awk -f print_2.awk ls_files_result |
+	git -C r4 ls-files -s dir1/sparse1 dir1/sparse2 |
+	test_parse_ls_files_stage_oids |
 	sort >expected &&
 
 	git -C r4 pack-objects --revs --stdout --filter=sparse:oid=main:pattern >filter.pack <<-EOF &&
@@ -392,7 +390,7 @@ test_expect_success 'verify sparse:oid=oid-ish' '
 
 	git -C r4 verify-pack -v ../filter.pack >verify_result &&
 	grep blob verify_result |
-	awk -f print_1.awk |
+	parse_verify_pack_blob_oid |
 	sort >observed &&
 
 	test_cmp expected observed
@@ -402,9 +400,8 @@ test_expect_success 'verify sparse:oid=oid-ish' '
 # This models previously omitted objects that we did not receive.
 
 test_expect_success 'setup r1 - delete loose blobs' '
-	git -C r1 ls-files -s file.1 file.2 file.3 file.4 file.5 \
-		>ls_files_result &&
-	awk -f print_2.awk ls_files_result |
+	git -C r1 ls-files -s file.1 file.2 file.3 file.4 file.5 |
+	test_parse_ls_files_stage_oids |
 	sort >expected &&
 
 	for id in `cat expected | sed "s|..|&/|"`
diff --git a/t/t5318-commit-graph.sh b/t/t5318-commit-graph.sh
index fbf0d64578..db89542dfb 100755
--- a/t/t5318-commit-graph.sh
+++ b/t/t5318-commit-graph.sh
@@ -811,4 +811,31 @@ test_expect_success 'set up and verify repo with generation data overflow chunk'
 
 graph_git_behavior 'generation data overflow chunk repo' repo left right
 
+test_expect_success 'overflow during generation version upgrade' '
+	git init overflow-v2-upgrade &&
+	(
+		cd overflow-v2-upgrade &&
+
+		# This commit will have a date at two seconds past the Epoch,
+		# and a (v1) generation number of 1, since it is a root commit.
+		#
+		# The offset will then be computed as 1-2, which will underflow
+		# to 2^31, which is greater than the v2 offset small limit of
+		# 2^31-1.
+		#
+		# This is sufficient to need a large offset table for the v2
+		# generation numbers.
+		test_commit --date "@2 +0000" base &&
+		git repack -d &&
+
+		# Test that upgrading from generation v1 to v2 correctly
+		# produces the overflow table.
+		git -c commitGraph.generationVersion=1 commit-graph write &&
+		git -c commitGraph.generationVersion=2 commit-graph write \
+			--changed-paths &&
+
+		git rev-list --all
+	)
+'
+
 test_done
diff --git a/t/t5320-delta-islands.sh b/t/t5320-delta-islands.sh
index fea92a5777..124d47603d 100755
--- a/t/t5320-delta-islands.sh
+++ b/t/t5320-delta-islands.sh
@@ -1,6 +1,8 @@
 #!/bin/sh
 
 test_description='exercise delta islands'
+
+TEST_PASSES_SANITIZE_LEAK=true
 . ./test-lib.sh
 
 # returns true iff $1 is a delta based on $2
diff --git a/t/t5322-pack-objects-sparse.sh b/t/t5322-pack-objects-sparse.sh
index d39958c066..770695c927 100755
--- a/t/t5322-pack-objects-sparse.sh
+++ b/t/t5322-pack-objects-sparse.sh
@@ -4,6 +4,7 @@ test_description='pack-objects object selection using sparse algorithm'
 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 repo' '
diff --git a/t/t5329-pack-objects-cruft.sh b/t/t5329-pack-objects-cruft.sh
new file mode 100755
index 0000000000..8968f7a08d
--- /dev/null
+++ b/t/t5329-pack-objects-cruft.sh
@@ -0,0 +1,741 @@
+#!/bin/sh
+
+test_description='cruft pack related pack-objects tests'
+. ./test-lib.sh
+
+objdir=.git/objects
+packdir=$objdir/pack
+
+basic_cruft_pack_tests () {
+	expire="$1"
+
+	test_expect_success "unreachable loose objects are packed (expire $expire)" '
+		git init repo &&
+		test_when_finished "rm -fr repo" &&
+		(
+			cd repo &&
+
+			test_commit base &&
+			git repack -Ad &&
+			test_commit loose &&
+
+			test-tool chmtime +2000 "$objdir/$(test_oid_to_path \
+				$(git rev-parse loose:loose.t))" &&
+			test-tool chmtime +1000 "$objdir/$(test_oid_to_path \
+				$(git rev-parse loose^{tree}))" &&
+
+			(
+				git rev-list --objects --no-object-names base..loose |
+				while read oid
+				do
+					path="$objdir/$(test_oid_to_path "$oid")" &&
+					printf "%s %d\n" "$oid" "$(test-tool chmtime --get "$path")"
+				done |
+				sort -k1
+			) >expect &&
+
+			keep="$(basename "$(ls $packdir/pack-*.pack)")" &&
+			cruft="$(echo $keep | git pack-objects --cruft \
+				--cruft-expiration="$expire" $packdir/pack)" &&
+			test-tool pack-mtimes "pack-$cruft.mtimes" >actual &&
+
+			test_cmp expect actual
+		)
+	'
+
+	test_expect_success "unreachable packed objects are packed (expire $expire)" '
+		git init repo &&
+		test_when_finished "rm -fr repo" &&
+		(
+			cd repo &&
+
+			test_commit packed &&
+			git repack -Ad &&
+			test_commit other &&
+
+			git rev-list --objects --no-object-names packed.. >objects &&
+			keep="$(basename "$(ls $packdir/pack-*.pack)")" &&
+			other="$(git pack-objects --delta-base-offset \
+				$packdir/pack <objects)" &&
+			git prune-packed &&
+
+			test-tool chmtime --get -100 "$packdir/pack-$other.pack" >expect &&
+
+			cruft="$(git pack-objects --cruft --cruft-expiration="$expire" $packdir/pack <<-EOF
+			$keep
+			-pack-$other.pack
+			EOF
+			)" &&
+			test-tool pack-mtimes "pack-$cruft.mtimes" >actual.raw &&
+
+			cut -d" " -f2 <actual.raw | sort -u >actual &&
+
+			test_cmp expect actual
+		)
+	'
+
+	test_expect_success "unreachable cruft objects are repacked (expire $expire)" '
+		git init repo &&
+		test_when_finished "rm -fr repo" &&
+		(
+			cd repo &&
+
+			test_commit packed &&
+			git repack -Ad &&
+			test_commit other &&
+
+			git rev-list --objects --no-object-names packed.. >objects &&
+			keep="$(basename "$(ls $packdir/pack-*.pack)")" &&
+
+			cruft_a="$(echo $keep | git pack-objects --cruft --cruft-expiration="$expire" $packdir/pack)" &&
+			git prune-packed &&
+			cruft_b="$(git pack-objects --cruft --cruft-expiration="$expire" $packdir/pack <<-EOF
+			$keep
+			-pack-$cruft_a.pack
+			EOF
+			)" &&
+
+			test-tool pack-mtimes "pack-$cruft_a.mtimes" >expect.raw &&
+			test-tool pack-mtimes "pack-$cruft_b.mtimes" >actual.raw &&
+
+			sort <expect.raw >expect &&
+			sort <actual.raw >actual &&
+
+			test_cmp expect actual
+		)
+	'
+
+	test_expect_success "multiple cruft packs (expire $expire)" '
+		git init repo &&
+		test_when_finished "rm -fr repo" &&
+		(
+			cd repo &&
+
+			test_commit reachable &&
+			git repack -Ad &&
+			keep="$(basename "$(ls $packdir/pack-*.pack)")" &&
+
+			test_commit cruft &&
+			loose="$objdir/$(test_oid_to_path $(git rev-parse cruft))" &&
+
+			# generate three copies of the cruft object in different
+			# cruft packs, each with a unique mtime:
+			#   - one expired (1000 seconds ago)
+			#   - two non-expired (one 1000 seconds in the future,
+			#     one 1500 seconds in the future)
+			test-tool chmtime =-1000 "$loose" &&
+			git pack-objects --cruft $packdir/pack-A <<-EOF &&
+			$keep
+			EOF
+			test-tool chmtime =+1000 "$loose" &&
+			git pack-objects --cruft $packdir/pack-B <<-EOF &&
+			$keep
+			-$(basename $(ls $packdir/pack-A-*.pack))
+			EOF
+			test-tool chmtime =+1500 "$loose" &&
+			git pack-objects --cruft $packdir/pack-C <<-EOF &&
+			$keep
+			-$(basename $(ls $packdir/pack-A-*.pack))
+			-$(basename $(ls $packdir/pack-B-*.pack))
+			EOF
+
+			# ensure the resulting cruft pack takes the most recent
+			# mtime among all copies
+			cruft="$(git pack-objects --cruft \
+				--cruft-expiration="$expire" \
+				$packdir/pack <<-EOF
+			$keep
+			-$(basename $(ls $packdir/pack-A-*.pack))
+			-$(basename $(ls $packdir/pack-B-*.pack))
+			-$(basename $(ls $packdir/pack-C-*.pack))
+			EOF
+			)" &&
+
+			test-tool pack-mtimes "$(basename $(ls $packdir/pack-C-*.mtimes))" >expect.raw &&
+			test-tool pack-mtimes "pack-$cruft.mtimes" >actual.raw &&
+
+			sort expect.raw >expect &&
+			sort actual.raw >actual &&
+			test_cmp expect actual
+		)
+	'
+
+	test_expect_success "cruft packs tolerate missing trees (expire $expire)" '
+		git init repo &&
+		test_when_finished "rm -fr repo" &&
+		(
+			cd repo &&
+
+			test_commit reachable &&
+			test_commit cruft &&
+
+			tree="$(git rev-parse cruft^{tree})" &&
+
+			git reset --hard reachable &&
+			git tag -d cruft &&
+			git reflog expire --all --expire=all &&
+
+			# remove the unreachable tree, but leave the commit
+			# which has it as its root tree intact
+			rm -fr "$objdir/$(test_oid_to_path "$tree")" &&
+
+			git repack -Ad &&
+			basename $(ls $packdir/pack-*.pack) >in &&
+			git pack-objects --cruft --cruft-expiration="$expire" \
+				$packdir/pack <in
+		)
+	'
+
+	test_expect_success "cruft packs tolerate missing blobs (expire $expire)" '
+		git init repo &&
+		test_when_finished "rm -fr repo" &&
+		(
+			cd repo &&
+
+			test_commit reachable &&
+			test_commit cruft &&
+
+			blob="$(git rev-parse cruft:cruft.t)" &&
+
+			git reset --hard reachable &&
+			git tag -d cruft &&
+			git reflog expire --all --expire=all &&
+
+			# remove the unreachable blob, but leave the commit (and
+			# the root tree of that commit) intact
+			rm -fr "$objdir/$(test_oid_to_path "$blob")" &&
+
+			git repack -Ad &&
+			basename $(ls $packdir/pack-*.pack) >in &&
+			git pack-objects --cruft --cruft-expiration="$expire" \
+				$packdir/pack <in
+		)
+	'
+}
+
+basic_cruft_pack_tests never
+basic_cruft_pack_tests 2.weeks.ago
+
+test_expect_success 'cruft tags rescue tagged objects' '
+	git init repo &&
+	test_when_finished "rm -fr repo" &&
+	(
+		cd repo &&
+
+		test_commit packed &&
+		git repack -Ad &&
+
+		test_commit tagged &&
+		git tag -a annotated -m tag &&
+
+		git rev-list --objects --no-object-names packed.. >objects &&
+		while read oid
+		do
+			test-tool chmtime -1000 \
+				"$objdir/$(test_oid_to_path $oid)"
+		done <objects &&
+
+		test-tool chmtime -500 \
+			"$objdir/$(test_oid_to_path $(git rev-parse annotated))" &&
+
+		keep="$(basename "$(ls $packdir/pack-*.pack)")" &&
+		cruft="$(echo $keep | git pack-objects --cruft \
+			--cruft-expiration=750.seconds.ago \
+			$packdir/pack)" &&
+		test-tool pack-mtimes "pack-$cruft.mtimes" >actual.raw &&
+		cut -f1 -d" " <actual.raw | sort >actual &&
+
+		(
+			cat objects &&
+			git rev-parse annotated
+		) >expect.raw &&
+		sort <expect.raw >expect &&
+
+		test_cmp expect actual &&
+		cat actual
+	)
+'
+
+test_expect_success 'cruft commits rescue parents, trees' '
+	git init repo &&
+	test_when_finished "rm -fr repo" &&
+	(
+		cd repo &&
+
+		test_commit packed &&
+		git repack -Ad &&
+
+		test_commit old &&
+		test_commit new &&
+
+		git rev-list --objects --no-object-names packed..new >objects &&
+		while read object
+		do
+			test-tool chmtime -1000 \
+				"$objdir/$(test_oid_to_path $object)"
+		done <objects &&
+		test-tool chmtime +500 "$objdir/$(test_oid_to_path \
+			$(git rev-parse HEAD))" &&
+
+		keep="$(basename "$(ls $packdir/pack-*.pack)")" &&
+		cruft="$(echo $keep | git pack-objects --cruft \
+			--cruft-expiration=750.seconds.ago \
+			$packdir/pack)" &&
+		test-tool pack-mtimes "pack-$cruft.mtimes" >actual.raw &&
+
+		cut -d" " -f1 <actual.raw | sort >actual &&
+		sort <objects >expect &&
+
+		test_cmp expect actual
+	)
+'
+
+test_expect_success 'cruft trees rescue sub-trees, blobs' '
+	git init repo &&
+	test_when_finished "rm -fr repo" &&
+	(
+		cd repo &&
+
+		test_commit packed &&
+		git repack -Ad &&
+
+		mkdir -p dir/sub &&
+		echo foo >foo &&
+		echo bar >dir/bar &&
+		echo baz >dir/sub/baz &&
+
+		test_tick &&
+		git add . &&
+		git commit -m "pruned" &&
+
+		test-tool chmtime -1000 "$objdir/$(test_oid_to_path $(git rev-parse HEAD))" &&
+		test-tool chmtime -1000 "$objdir/$(test_oid_to_path $(git rev-parse HEAD^{tree}))" &&
+		test-tool chmtime -1000 "$objdir/$(test_oid_to_path $(git rev-parse HEAD:foo))" &&
+		test-tool chmtime  -500 "$objdir/$(test_oid_to_path $(git rev-parse HEAD:dir))" &&
+		test-tool chmtime -1000 "$objdir/$(test_oid_to_path $(git rev-parse HEAD:dir/bar))" &&
+		test-tool chmtime -1000 "$objdir/$(test_oid_to_path $(git rev-parse HEAD:dir/sub))" &&
+		test-tool chmtime -1000 "$objdir/$(test_oid_to_path $(git rev-parse HEAD:dir/sub/baz))" &&
+
+		keep="$(basename "$(ls $packdir/pack-*.pack)")" &&
+		cruft="$(echo $keep | git pack-objects --cruft \
+			--cruft-expiration=750.seconds.ago \
+			$packdir/pack)" &&
+		test-tool pack-mtimes "pack-$cruft.mtimes" >actual.raw &&
+		cut -f1 -d" " <actual.raw | sort >actual &&
+
+		git rev-parse HEAD:dir HEAD:dir/bar HEAD:dir/sub HEAD:dir/sub/baz >expect.raw &&
+		sort <expect.raw >expect &&
+
+		test_cmp expect actual
+	)
+'
+
+test_expect_success 'expired objects are pruned' '
+	git init repo &&
+	test_when_finished "rm -fr repo" &&
+	(
+		cd repo &&
+
+		test_commit packed &&
+		git repack -Ad &&
+
+		test_commit pruned &&
+
+		git rev-list --objects --no-object-names packed..pruned >objects &&
+		while read object
+		do
+			test-tool chmtime -1000 \
+				"$objdir/$(test_oid_to_path $object)"
+		done <objects &&
+
+		keep="$(basename "$(ls $packdir/pack-*.pack)")" &&
+		cruft="$(echo $keep | git pack-objects --cruft \
+			--cruft-expiration=750.seconds.ago \
+			$packdir/pack)" &&
+
+		test-tool pack-mtimes "pack-$cruft.mtimes" >actual &&
+		test_must_be_empty actual
+	)
+'
+
+test_expect_success 'repack --cruft generates a cruft pack' '
+	git init repo &&
+	test_when_finished "rm -fr repo" &&
+	(
+		cd repo &&
+
+		test_commit reachable &&
+		git branch -M main &&
+		git checkout --orphan other &&
+		test_commit unreachable &&
+
+		git checkout main &&
+		git branch -D other &&
+		git tag -d unreachable &&
+		# objects are not cruft if they are contained in the reflogs
+		git reflog expire --all --expire=all &&
+
+		git rev-list --objects --all --no-object-names >reachable.raw &&
+		git cat-file --batch-all-objects --batch-check="%(objectname)" >objects &&
+		sort <reachable.raw >reachable &&
+		comm -13 reachable objects >unreachable &&
+
+		git repack --cruft -d &&
+
+		cruft=$(basename $(ls $packdir/pack-*.mtimes) .mtimes) &&
+		pack=$(basename $(ls $packdir/pack-*.pack | grep -v $cruft) .pack) &&
+
+		git show-index <$packdir/$pack.idx >actual.raw &&
+		cut -f2 -d" " actual.raw | sort >actual &&
+		test_cmp reachable actual &&
+
+		git show-index <$packdir/$cruft.idx >actual.raw &&
+		cut -f2 -d" " actual.raw | sort >actual &&
+		test_cmp unreachable actual
+	)
+'
+
+test_expect_success 'loose objects mtimes upsert others' '
+	git init repo &&
+	test_when_finished "rm -fr repo" &&
+	(
+		cd repo &&
+
+		test_commit reachable &&
+		git repack -Ad &&
+		git branch -M main &&
+
+		git checkout --orphan other &&
+		test_commit cruft &&
+		# incremental repack, leaving existing objects loose (so
+		# they can be "freshened")
+		git repack &&
+
+		tip="$(git rev-parse cruft)" &&
+		path="$objdir/$(test_oid_to_path "$tip")" &&
+		test-tool chmtime --get +1000 "$path" >expect &&
+
+		git checkout main &&
+		git branch -D other &&
+		git tag -d cruft &&
+		git reflog expire --all --expire=all &&
+
+		git repack --cruft -d &&
+
+		mtimes="$(basename $(ls $packdir/pack-*.mtimes))" &&
+		test-tool pack-mtimes "$mtimes" >actual.raw &&
+		grep "$tip" actual.raw | cut -d" " -f2 >actual &&
+		test_cmp expect actual
+	)
+'
+
+test_expect_success 'expiring cruft objects with git gc' '
+	git init repo &&
+	test_when_finished "rm -fr repo" &&
+	(
+		cd repo &&
+
+		test_commit reachable &&
+		git branch -M main &&
+		git checkout --orphan other &&
+		test_commit unreachable &&
+
+		git checkout main &&
+		git branch -D other &&
+		git tag -d unreachable &&
+		# objects are not cruft if they are contained in the reflogs
+		git reflog expire --all --expire=all &&
+
+		git rev-list --objects --all --no-object-names >reachable.raw &&
+		git cat-file --batch-all-objects --batch-check="%(objectname)" >objects &&
+		sort <reachable.raw >reachable &&
+		comm -13 reachable objects >unreachable &&
+
+		# Write a cruft pack containing all unreachable objects.
+		git gc --cruft --prune="01-01-1980" &&
+
+		mtimes=$(ls .git/objects/pack/pack-*.mtimes) &&
+		test_path_is_file $mtimes &&
+
+		# Prune all unreachable objects from the cruft pack.
+		git gc --cruft --prune=now &&
+
+		git cat-file --batch-all-objects --batch-check="%(objectname)" >objects &&
+
+		comm -23 unreachable objects >removed &&
+		test_cmp unreachable removed &&
+		test_path_is_missing $mtimes
+	)
+'
+
+test_expect_success 'cruft packs are not included in geometric repack' '
+	git init repo &&
+	test_when_finished "rm -fr repo" &&
+	(
+		cd repo &&
+
+		test_commit reachable &&
+		git repack -Ad &&
+		git branch -M main &&
+
+		git checkout --orphan other &&
+		test_commit cruft &&
+		git repack -d &&
+
+		git checkout main &&
+		git branch -D other &&
+		git tag -d cruft &&
+		git reflog expire --all --expire=all &&
+
+		git repack --cruft &&
+
+		find $packdir -type f | sort >before &&
+		git repack --geometric=2 -d &&
+		find $packdir -type f | sort >after &&
+
+		test_cmp before after
+	)
+'
+
+test_expect_success 'repack --geometric collects once-cruft objects' '
+	git init repo &&
+	test_when_finished "rm -fr repo" &&
+	(
+		cd repo &&
+
+		test_commit reachable &&
+		git repack -Ad &&
+		git branch -M main &&
+
+		git checkout --orphan other &&
+		git rm -rf . &&
+		test_commit --no-tag cruft &&
+		cruft="$(git rev-parse HEAD)" &&
+
+		git checkout main &&
+		git branch -D other &&
+		git reflog expire --all --expire=all &&
+
+		# Pack the objects created in the previous step into a cruft
+		# pack. Intentionally leave loose copies of those objects
+		# around so we can pick them up in a subsequent --geometric
+		# reapack.
+		git repack --cruft &&
+
+		# Now make those objects reachable, and ensure that they are
+		# packed into the new pack created via a --geometric repack.
+		git update-ref refs/heads/other $cruft &&
+
+		# Without this object, the set of unpacked objects is exactly
+		# the set of objects already in the cruft pack. Tweak that set
+		# to ensure we do not overwrite the cruft pack entirely.
+		test_commit reachable2 &&
+
+		find $packdir -name "pack-*.idx" | sort >before &&
+		git repack --geometric=2 -d &&
+		find $packdir -name "pack-*.idx" | sort >after &&
+
+		{
+			git rev-list --objects --no-object-names $cruft &&
+			git rev-list --objects --no-object-names reachable..reachable2
+		} >want.raw &&
+		sort want.raw >want &&
+
+		pack=$(comm -13 before after) &&
+		git show-index <$pack >objects.raw &&
+
+		cut -d" " -f2 objects.raw | sort >got &&
+
+		test_cmp want got
+	)
+'
+
+test_expect_success 'cruft repack with no reachable objects' '
+	git init repo &&
+	test_when_finished "rm -fr repo" &&
+	(
+		cd repo &&
+
+		test_commit base &&
+		git repack -ad &&
+
+		base="$(git rev-parse base)" &&
+
+		git for-each-ref --format="delete %(refname)" >in &&
+		git update-ref --stdin <in &&
+		git reflog expire --all --expire=all &&
+		rm -fr .git/index &&
+
+		git repack --cruft -d &&
+
+		git cat-file -t $base
+	)
+'
+
+test_expect_success 'cruft repack ignores --max-pack-size' '
+	git init max-pack-size &&
+	(
+		cd max-pack-size &&
+		test_commit base &&
+		# two cruft objects which exceed the maximum pack size
+		test-tool genrandom foo 1048576 | git hash-object --stdin -w &&
+		test-tool genrandom bar 1048576 | git hash-object --stdin -w &&
+		git repack --cruft --max-pack-size=1M &&
+		find $packdir -name "*.mtimes" >cruft &&
+		test_line_count = 1 cruft &&
+		test-tool pack-mtimes "$(basename "$(cat cruft)")" >objects &&
+		test_line_count = 2 objects
+	)
+'
+
+test_expect_success 'cruft repack ignores pack.packSizeLimit' '
+	(
+		cd max-pack-size &&
+		# repack everything back together to remove the existing cruft
+		# pack (but to keep its objects)
+		git repack -adk &&
+		git -c pack.packSizeLimit=1M repack --cruft &&
+		# ensure the same post condition is met when --max-pack-size
+		# would otherwise be inferred from the configuration
+		find $packdir -name "*.mtimes" >cruft &&
+		test_line_count = 1 cruft &&
+		test-tool pack-mtimes "$(basename "$(cat cruft)")" >objects &&
+		test_line_count = 2 objects
+	)
+'
+
+test_expect_success 'cruft repack respects repack.cruftWindow' '
+	git init repo &&
+	test_when_finished "rm -fr repo" &&
+	(
+		cd repo &&
+
+		test_commit base &&
+
+		GIT_TRACE2_EVENT=$(pwd)/event.trace \
+		git -c pack.window=1 -c repack.cruftWindow=2 repack \
+		       --cruft --window=3 &&
+
+		grep "pack-objects.*--window=2.*--cruft" event.trace
+	)
+'
+
+test_expect_success 'cruft repack respects --window by default' '
+	git init repo &&
+	test_when_finished "rm -fr repo" &&
+	(
+		cd repo &&
+
+		test_commit base &&
+
+		GIT_TRACE2_EVENT=$(pwd)/event.trace \
+		git -c pack.window=2 repack --cruft --window=3 &&
+
+		grep "pack-objects.*--window=3.*--cruft" event.trace
+	)
+'
+
+test_expect_success 'cruft repack respects --quiet' '
+	git init repo &&
+	test_when_finished "rm -fr repo" &&
+	(
+		cd repo &&
+
+		test_commit base &&
+		GIT_PROGRESS_DELAY=0 git repack --cruft --quiet 2>err &&
+		test_must_be_empty err
+	)
+'
+
+test_expect_success 'cruft --local drops unreachable objects' '
+	git init alternate &&
+	git init repo &&
+	test_when_finished "rm -fr alternate repo" &&
+
+	test_commit -C alternate base &&
+	# Pack all objects in alterate so that the cruft repack in "repo" sees
+	# the object it dropped due to `--local` as packed. Otherwise this
+	# object would not appear packed anywhere (since it is not packed in
+	# alternate and likewise not part of the cruft pack in the other repo
+	# because of `--local`).
+	git -C alternate repack -ad &&
+
+	(
+		cd repo &&
+
+		object="$(git -C ../alternate rev-parse HEAD:base.t)" &&
+		git -C ../alternate cat-file -p $object >contents &&
+
+		# Write some reachable objects and two unreachable ones: one
+		# that the alternate has and another that is unique.
+		test_commit other &&
+		git hash-object -w -t blob contents &&
+		cruft="$(echo cruft | git hash-object -w -t blob --stdin)" &&
+
+		( cd ../alternate/.git/objects && pwd ) \
+		       >.git/objects/info/alternates &&
+
+		test_path_is_file $objdir/$(test_oid_to_path $cruft) &&
+		test_path_is_file $objdir/$(test_oid_to_path $object) &&
+
+		git repack -d --cruft --local &&
+
+		test-tool pack-mtimes "$(basename $(ls $packdir/pack-*.mtimes))" \
+		       >objects &&
+		! grep $object objects &&
+		grep $cruft objects
+	)
+'
+
+test_expect_success 'MIDX bitmaps tolerate reachable cruft objects' '
+	git init repo &&
+	test_when_finished "rm -fr repo" &&
+	(
+		cd repo &&
+
+		test_commit reachable &&
+		test_commit cruft &&
+		unreachable="$(git rev-parse cruft)" &&
+
+		git reset --hard $unreachable^ &&
+		git tag -d cruft &&
+		git reflog expire --all --expire=all &&
+
+		git repack --cruft -d &&
+
+		# resurrect the unreachable object via a new commit. the
+		# new commit will get selected for a bitmap, but be
+		# missing one of its parents from the selected packs.
+		git reset --hard $unreachable &&
+		test_commit resurrect &&
+
+		git repack --write-midx --write-bitmap-index --geometric=2 -d
+	)
+'
+
+test_expect_success 'cruft objects are freshend via loose' '
+	git init repo &&
+	test_when_finished "rm -fr repo" &&
+	(
+		cd repo &&
+
+		echo "cruft" >contents &&
+		blob="$(git hash-object -w -t blob contents)" &&
+		loose="$objdir/$(test_oid_to_path $blob)" &&
+
+		test_commit base &&
+
+		git repack --cruft -d &&
+
+		test_path_is_missing "$loose" &&
+		test-tool pack-mtimes "$(basename "$(ls $packdir/pack-*.mtimes)")" >cruft &&
+		grep "$blob" cruft &&
+
+		# write the same object again
+		git hash-object -w -t blob contents &&
+
+		test_path_is_file "$loose"
+	)
+'
+
+test_done
diff --git a/t/t5330-no-lazy-fetch-with-commit-graph.sh b/t/t5330-no-lazy-fetch-with-commit-graph.sh
new file mode 100755
index 0000000000..2cc7fd7a47
--- /dev/null
+++ b/t/t5330-no-lazy-fetch-with-commit-graph.sh
@@ -0,0 +1,47 @@
+#!/bin/sh
+
+test_description='test for no lazy fetch with the commit-graph'
+
+. ./test-lib.sh
+
+test_expect_success 'setup: prepare a repository with a commit' '
+	git init with-commit &&
+	test_commit -C with-commit the-commit &&
+	oid=$(git -C with-commit rev-parse HEAD)
+'
+
+test_expect_success 'setup: prepare a repository with commit-graph contains the commit' '
+	git init with-commit-graph &&
+	echo "$(pwd)/with-commit/.git/objects" \
+		>with-commit-graph/.git/objects/info/alternates &&
+	# create a ref that points to the commit in alternates
+	git -C with-commit-graph update-ref refs/ref_to_the_commit "$oid" &&
+	# prepare some other objects to commit-graph
+	test_commit -C with-commit-graph something &&
+	git -c gc.writeCommitGraph=true -C with-commit-graph gc &&
+	test_path_is_file with-commit-graph/.git/objects/info/commit-graph
+'
+
+test_expect_success 'setup: change the alternates to what without the commit' '
+	git init --bare without-commit &&
+	git -C with-commit-graph cat-file -e $oid &&
+	echo "$(pwd)/without-commit/objects" \
+		>with-commit-graph/.git/objects/info/alternates &&
+	test_must_fail git -C with-commit-graph cat-file -e $oid
+'
+
+test_expect_success 'fetch any commit from promisor with the usage of the commit graph' '
+	# setup promisor and prepare any commit to fetch
+	git -C with-commit-graph remote add origin "$(pwd)/with-commit" &&
+	git -C with-commit-graph config remote.origin.promisor true &&
+	git -C with-commit-graph config remote.origin.partialclonefilter blob:none &&
+	test_commit -C with-commit any-commit &&
+	anycommit=$(git -C with-commit rev-parse HEAD) &&
+	GIT_TRACE="$(pwd)/trace.txt" \
+		git -C with-commit-graph fetch origin $anycommit 2>err &&
+	! grep "fatal: promisor-remote: unable to fork off fetch subprocess" err &&
+	grep "git fetch origin" trace.txt >actual &&
+	test_line_count = 1 actual
+'
+
+test_done
diff --git a/t/t5504-fetch-receive-strict.sh b/t/t5504-fetch-receive-strict.sh
index b0b795aca9..ac4099ca89 100755
--- a/t/t5504-fetch-receive-strict.sh
+++ b/t/t5504-fetch-receive-strict.sh
@@ -352,4 +352,21 @@ test_expect_success \
 	grep "Cannot demote unterminatedheader" act
 '
 
+test_expect_success 'badFilemode is not a strict error' '
+	git init --bare badmode.git &&
+	tree=$(
+		cd badmode.git &&
+		blob=$(echo blob | git hash-object -w --stdin | hex2oct) &&
+		printf "123456 foo\0${blob}" |
+		git hash-object -t tree --stdin -w --literally
+	) &&
+
+	rm -rf dst.git &&
+	git init --bare dst.git &&
+	git -C dst.git config transfer.fsckObjects true &&
+
+	git -C badmode.git push ../dst.git $tree:refs/tags/tree 2>err &&
+	grep "$tree: badFilemode" err
+'
+
 test_done
diff --git a/t/t5505-remote.sh b/t/t5505-remote.sh
index c90cf47acd..fff14e13ed 100755
--- a/t/t5505-remote.sh
+++ b/t/t5505-remote.sh
@@ -78,6 +78,40 @@ test_expect_success 'add another remote' '
 	)
 '
 
+test_expect_success 'setup bare clone for server' '
+	git clone --bare "file://$(pwd)/one" srv.bare &&
+	git -C srv.bare config --local uploadpack.allowfilter 1 &&
+	git -C srv.bare config --local uploadpack.allowanysha1inwant 1
+'
+
+test_expect_success 'filters for promisor remotes are listed by git remote -v' '
+	test_when_finished "rm -rf pc" &&
+	git clone --filter=blob:none "file://$(pwd)/srv.bare" pc &&
+	git -C pc remote -v >out &&
+	grep "srv.bare (fetch) \[blob:none\]" out &&
+
+	git -C pc config remote.origin.partialCloneFilter object:type=commit &&
+	git -C pc remote -v >out &&
+	grep "srv.bare (fetch) \[object:type=commit\]" out
+'
+
+test_expect_success 'filters should not be listed for non promisor remotes (remote -v)' '
+	test_when_finished "rm -rf pc" &&
+	git clone one pc &&
+	git -C pc remote -v >out &&
+	! grep "(fetch) \[.*\]" out
+'
+
+test_expect_success 'filters are listed by git remote -v only' '
+	test_when_finished "rm -rf pc" &&
+	git clone --filter=blob:none "file://$(pwd)/srv.bare" pc &&
+	git -C pc remote >out &&
+	! grep "\[blob:none\]" out &&
+
+	git -C pc remote show >out &&
+	! grep "\[blob:none\]" out
+'
+
 test_expect_success 'check remote-tracking' '
 	(
 		cd test &&
diff --git a/t/t5506-remote-groups.sh b/t/t5506-remote-groups.sh
index 8f150c0793..5bac03ede8 100755
--- a/t/t5506-remote-groups.sh
+++ b/t/t5506-remote-groups.sh
@@ -4,6 +4,7 @@ test_description='git remote group handling'
 GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
 export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
 
+TEST_PASSES_SANITIZE_LEAK=true
 . ./test-lib.sh
 
 mark() {
diff --git a/t/t5510-fetch.sh b/t/t5510-fetch.sh
index dea51d4a53..c0b745e33b 100755
--- a/t/t5510-fetch.sh
+++ b/t/t5510-fetch.sh
@@ -854,7 +854,11 @@ test_configured_prune_type () {
 		then
 			new_cmdline=$cmdline_setup
 		else
-			new_cmdline=$(printf "%s" "$cmdline" | perl -pe 's[origin(?!/)]["'"$remote_url"'"]g')
+			new_cmdline=$(perl -e '
+				my ($cmdline, $url) = @ARGV;
+				$cmdline =~ s[origin(?!/)][quotemeta($url)]ge;
+				print $cmdline;
+			' -- "$cmdline" "$remote_url")
 		fi
 
 		if test "$fetch_prune_tags" = 'true' ||
diff --git a/t/t5512-ls-remote.sh b/t/t5512-ls-remote.sh
index f53f58895a..20d063fb9a 100755
--- a/t/t5512-ls-remote.sh
+++ b/t/t5512-ls-remote.sh
@@ -15,6 +15,10 @@ generate_references () {
 	done
 }
 
+test_expect_success 'dies when no remote found' '
+	test_must_fail git ls-remote
+'
+
 test_expect_success setup '
 	>file &&
 	git add file &&
@@ -30,7 +34,8 @@ test_expect_success setup '
 	git show-ref -d	>refs &&
 	sed -e "s/ /	/" refs >>expected.all &&
 
-	git remote add self "$(pwd)/.git"
+	git remote add self "$(pwd)/.git" &&
+	git remote add self2 "."
 '
 
 test_expect_success 'ls-remote --tags .git' '
@@ -83,11 +88,17 @@ test_expect_success 'ls-remote --sort="-refname" --tags self' '
 	test_cmp expect actual
 '
 
-test_expect_success 'dies when no remote specified and no default remotes found' '
+test_expect_success 'dies when no remote specified, multiple remotes found, and no default specified' '
 	test_must_fail git ls-remote
 '
 
-test_expect_success 'use "origin" when no remote specified' '
+test_expect_success 'succeeds when no remote specified but only one found' '
+	test_when_finished git remote add self2 "." &&
+	git remote remove self2 &&
+	git ls-remote
+'
+
+test_expect_success 'use "origin" when no remote specified and multiple found' '
 	URL="$(pwd)/.git" &&
 	echo "From $URL" >exp_err &&
 
diff --git a/t/t5513-fetch-track.sh b/t/t5513-fetch-track.sh
index 65d1e05bd6..c46c4dbaef 100755
--- a/t/t5513-fetch-track.sh
+++ b/t/t5513-fetch-track.sh
@@ -2,6 +2,7 @@
 
 test_description='fetch follows remote-tracking branches correctly'
 
+TEST_PASSES_SANITIZE_LEAK=true
 . ./test-lib.sh
 
 test_expect_success setup '
diff --git a/t/t5515-fetch-merge-logic.sh b/t/t5515-fetch-merge-logic.sh
index 320d26796d..c100a809c5 100755
--- a/t/t5515-fetch-merge-logic.sh
+++ b/t/t5515-fetch-merge-logic.sh
@@ -14,6 +14,7 @@ export GIT_TEST_PROTOCOL_VERSION
 GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
 export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
 
+TEST_PASSES_SANITIZE_LEAK=true
 . ./test-lib.sh
 
 build_script () {
diff --git a/t/t5516-fetch-push.sh b/t/t5516-fetch-push.sh
index 6d5702fd0e..794738ed10 100755
--- a/t/t5516-fetch-push.sh
+++ b/t/t5516-fetch-push.sh
@@ -12,6 +12,7 @@ This test checks the following functionality:
 * --porcelain output format
 * hiderefs
 * reflogs
+* URL validation
 '
 
 GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
@@ -599,6 +600,26 @@ test_expect_success 'branch.*.pushremote config order is irrelevant' '
 	check_push_result two_repo $the_commit heads/main
 '
 
+test_expect_success 'push rejects empty branch name entries' '
+	mk_test one_repo heads/main &&
+	test_config remote.one.url one_repo &&
+	test_config branch..remote one &&
+	test_config branch..merge refs/heads/ &&
+	test_config branch.main.remote one &&
+	test_config branch.main.merge refs/heads/main &&
+	test_must_fail git push 2>err &&
+	grep "bad config variable .branch\.\." err
+'
+
+test_expect_success 'push ignores "branch." config without subsection' '
+	mk_test one_repo heads/main &&
+	test_config remote.one.url one_repo &&
+	test_config branch.autoSetupMerge true &&
+	test_config branch.main.remote one &&
+	test_config branch.main.merge refs/heads/main &&
+	git push
+'
+
 test_expect_success 'push with dry-run' '
 
 	mk_test testrepo heads/main &&
@@ -1814,4 +1835,35 @@ test_expect_success 'refuse to push a hidden ref, and make sure do not pollute t
 	test_dir_is_empty testrepo/.git/objects/pack
 '
 
+test_expect_success LIBCURL 'fetch warns or fails when using username:password' '
+	message="URL '\''https://username:<redacted>@localhost/'\'' uses plaintext credentials" &&
+	test_must_fail git -c transfer.credentialsInUrl=allow fetch https://username:password@localhost 2>err &&
+	! grep "$message" err &&
+
+	test_must_fail git -c transfer.credentialsInUrl=warn fetch https://username:password@localhost 2>err &&
+	grep "warning: $message" err >warnings &&
+	test_line_count = 3 warnings &&
+
+	test_must_fail git -c transfer.credentialsInUrl=die fetch https://username:password@localhost 2>err &&
+	grep "fatal: $message" err >warnings &&
+	test_line_count = 1 warnings &&
+
+	test_must_fail git -c transfer.credentialsInUrl=die fetch https://username:@localhost 2>err &&
+	grep "fatal: $message" err >warnings &&
+	test_line_count = 1 warnings
+'
+
+
+test_expect_success LIBCURL 'push warns or fails when using username:password' '
+	message="URL '\''https://username:<redacted>@localhost/'\'' uses plaintext credentials" &&
+	test_must_fail git -c transfer.credentialsInUrl=allow push https://username:password@localhost 2>err &&
+	! grep "$message" err &&
+
+	test_must_fail git -c transfer.credentialsInUrl=warn push https://username:password@localhost 2>err &&
+	grep "warning: $message" err >warnings &&
+	test_must_fail git -c transfer.credentialsInUrl=die push https://username:password@localhost 2>err &&
+	grep "fatal: $message" err >warnings &&
+	test_line_count = 1 warnings
+'
+
 test_done
diff --git a/t/t5518-fetch-exit-status.sh b/t/t5518-fetch-exit-status.sh
index 5c4ac2556e..c13120088f 100755
--- a/t/t5518-fetch-exit-status.sh
+++ b/t/t5518-fetch-exit-status.sh
@@ -8,6 +8,7 @@ test_description='fetch exit status test'
 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/t5526-fetch-submodules.sh b/t/t5526-fetch-submodules.sh
index 072c3216df..3c44f19612 100755
--- a/t/t5526-fetch-submodules.sh
+++ b/t/t5526-fetch-submodules.sh
@@ -1126,4 +1126,31 @@ test_expect_success 'fetch --recurse-submodules updates name-conflicted, unpopul
 	)
 '
 
+test_expect_success 'fetch --all with --recurse-submodules' '
+	test_when_finished "rm -fr src_clone" &&
+	git clone --recurse-submodules src src_clone &&
+	(
+		cd src_clone &&
+		git config submodule.recurse true &&
+		git config fetch.parallel 0 &&
+		git fetch --all 2>../fetch-log
+	) &&
+	grep "^Fetching submodule sub$" fetch-log >fetch-subs &&
+	test_line_count = 1 fetch-subs
+'
+
+test_expect_success 'fetch --all with --recurse-submodules with multiple' '
+	test_when_finished "rm -fr src_clone" &&
+	git clone --recurse-submodules src src_clone &&
+	(
+		cd src_clone &&
+		git remote add secondary ../src &&
+		git config submodule.recurse true &&
+		git config fetch.parallel 0 &&
+		git fetch --all 2>../fetch-log
+	) &&
+	grep "Fetching submodule sub" fetch-log >fetch-subs &&
+	test_line_count = 2 fetch-subs
+'
+
 test_done
diff --git a/t/t5528-push-default.sh b/t/t5528-push-default.sh
index f280e00eb7..284e20fefd 100755
--- a/t/t5528-push-default.sh
+++ b/t/t5528-push-default.sh
@@ -94,13 +94,88 @@ test_expect_success '"upstream" does not push when remotes do not match' '
 	test_must_fail git push parent2
 '
 
-test_expect_success 'push from/to new branch with upstream, matching and simple' '
+test_expect_success '"current" does not push when multiple remotes and none origin' '
+	git checkout main &&
+	test_config push.default current &&
+	test_commit current-multi &&
+	test_must_fail git push
+'
+
+test_expect_success '"current" pushes when remote explicitly specified' '
+	git checkout main &&
+	test_config push.default current &&
+	test_commit current-specified &&
+	git push parent1
+'
+
+test_expect_success '"current" pushes to origin when no remote specified among multiple' '
+	git checkout main &&
+	test_config remote.origin.url repo1 &&
+	test_config remote.origin.fetch "+refs/heads/*:refs/remotes/origin/*" &&
+	test_commit current-origin &&
+	test_push_success current main
+'
+
+test_expect_success '"current" pushes to single remote even when not specified' '
+	git checkout main &&
+	test_when_finished git remote add parent1 repo1 &&
+	git remote remove parent1 &&
+	test_commit current-implied &&
+	test_push_success current main repo2
+'
+
+test_expect_success 'push from/to new branch with non-defaulted remote fails with upstream, matching, current and simple ' '
 	git checkout -b new-branch &&
 	test_push_failure simple &&
 	test_push_failure matching &&
+	test_push_failure upstream &&
+	test_push_failure current
+'
+
+test_expect_success 'push from/to new branch fails with upstream and simple ' '
+	git checkout -b new-branch-1 &&
+	test_config branch.new-branch-1.remote parent1 &&
+	test_push_failure simple &&
 	test_push_failure upstream
 '
 
+# The behavior here is surprising but not entirely wrong:
+#  - the current branch is used to determine the target remote
+#  - the "matching" push default pushes matching branches, *ignoring* the
+#       current new branch as it does not have upstream tracking
+#  - the default push succeeds
+#
+# A previous test expected this to fail, but for the wrong reasons:
+# it expected a fail becaause the branch is new and cannot be pushed, but
+# in fact it was failing because of an ambiguous remote
+#
+test_expect_failure 'push from/to new branch fails with matching ' '
+	git checkout -b new-branch-2 &&
+	test_config branch.new-branch-2.remote parent1 &&
+	test_push_failure matching
+'
+
+test_expect_success 'push from/to branch with tracking fails with nothing ' '
+	git checkout -b tracked-branch &&
+	test_config branch.tracked-branch.remote parent1 &&
+	test_config branch.tracked-branch.merge refs/heads/tracked-branch &&
+	test_push_failure nothing
+'
+
+test_expect_success 'push from/to new branch succeeds with upstream if push.autoSetupRemote' '
+	git checkout -b new-branch-a &&
+	test_config push.autoSetupRemote true &&
+	test_config branch.new-branch-a.remote parent1 &&
+	test_push_success upstream new-branch-a
+'
+
+test_expect_success 'push from/to new branch succeeds with simple if push.autoSetupRemote' '
+	git checkout -b new-branch-c &&
+	test_config push.autoSetupRemote true &&
+	test_config branch.new-branch-c.remote parent1 &&
+	test_push_success simple new-branch-c
+'
+
 test_expect_success '"matching" fails if none match' '
 	git init --bare empty &&
 	test_must_fail git push empty : 2>actual &&
diff --git a/t/t5532-fetch-proxy.sh b/t/t5532-fetch-proxy.sh
index 9c2798603b..d664912799 100755
--- a/t/t5532-fetch-proxy.sh
+++ b/t/t5532-fetch-proxy.sh
@@ -1,6 +1,8 @@
 #!/bin/sh
 
 test_description='fetching via git:// using core.gitproxy'
+
+TEST_PASSES_SANITIZE_LEAK=true
 . ./test-lib.sh
 
 test_expect_success 'setup remote repo' '
diff --git a/t/t5537-fetch-shallow.sh b/t/t5537-fetch-shallow.sh
index 9573a2655e..37f7547a4c 100755
--- a/t/t5537-fetch-shallow.sh
+++ b/t/t5537-fetch-shallow.sh
@@ -166,12 +166,25 @@ test_expect_success 'fetch --update-shallow into a repo with submodules' '
 
 	git init a-submodule &&
 	test_commit -C a-submodule foo &&
+
+	test_when_finished "rm -rf repo-with-sub" &&
 	git init repo-with-sub &&
 	git -C repo-with-sub submodule add ../a-submodule a-submodule &&
 	git -C repo-with-sub commit -m "added submodule" &&
 	git -C repo-with-sub fetch --update-shallow ../shallow/.git refs/heads/*:refs/remotes/shallow/*
 '
 
+test_expect_success 'fetch --update-shallow a commit that is also a shallow point into a repo with submodules' '
+	test_when_finished "rm -rf repo-with-sub" &&
+	git init repo-with-sub &&
+	git -c protocol.file.allow=always -C repo-with-sub \
+		submodule add ../a-submodule a-submodule &&
+	git -C repo-with-sub commit -m "added submodule" &&
+
+	SHALLOW=$(cat shallow/.git/shallow) &&
+	git -C repo-with-sub fetch --update-shallow ../shallow/.git "$SHALLOW":refs/heads/a-shallow
+'
+
 test_expect_success 'fetch --update-shallow (with fetch.writeCommitGraph)' '
 	(
 	cd shallow &&
diff --git a/t/t5551-http-fetch-smart.sh b/t/t5551-http-fetch-smart.sh
index f92c79c132..b9351a732f 100755
--- a/t/t5551-http-fetch-smart.sh
+++ b/t/t5551-http-fetch-smart.sh
@@ -567,4 +567,11 @@ test_expect_success 'client falls back from v2 to v0 to match server' '
 	grep symref=HEAD:refs/heads/ trace
 '
 
+test_expect_success 'passing hostname resolution information works' '
+	BOGUS_HOST=gitbogusexamplehost.invalid &&
+	BOGUS_HTTPD_URL=$HTTPD_PROTO://$BOGUS_HOST:$LIB_HTTPD_PORT &&
+	test_must_fail git ls-remote "$BOGUS_HTTPD_URL/smart/repo.git" >/dev/null &&
+	git -c "http.curloptResolve=$BOGUS_HOST:$LIB_HTTPD_PORT:127.0.0.1" ls-remote "$BOGUS_HTTPD_URL/smart/repo.git" >/dev/null
+'
+
 test_done
diff --git a/t/t5572-pull-submodule.sh b/t/t5572-pull-submodule.sh
index 069c170572..09097eff3f 100755
--- a/t/t5572-pull-submodule.sh
+++ b/t/t5572-pull-submodule.sh
@@ -111,6 +111,32 @@ test_expect_success " --[no-]recurse-submodule and submodule.recurse" '
 	test_path_is_file super/sub/merge_strategy_4.t
 '
 
+test_expect_success "fetch.recurseSubmodules option triggers recursive fetch (but not recursive update)" '
+	test_commit -C child merge_strategy_5 &&
+	# Omit the parent commit, otherwise this passes with the
+	# default "pull" behavior.
+
+	git -C super -c fetch.recursesubmodules=true pull --no-rebase &&
+	# Check that the submodule commit was fetched
+	sub_oid=$(git -C child rev-parse HEAD) &&
+	git -C super/sub cat-file -e $sub_oid &&
+	# Check that the submodule worktree did not update
+	! test_path_is_file super/sub/merge_strategy_5.t
+'
+
+test_expect_success "fetch.recurseSubmodules takes precedence over submodule.recurse" '
+	test_commit -C child merge_strategy_6 &&
+	# Omit the parent commit, otherwise this passes with the
+	# default "pull" behavior.
+
+	git -C super -c submodule.recurse=false -c fetch.recursesubmodules=true pull --no-rebase &&
+	# Check that the submodule commit was fetched
+	sub_oid=$(git -C child rev-parse HEAD) &&
+	git -C super/sub cat-file -e $sub_oid &&
+	# Check that the submodule worktree did not update
+	! test_path_is_file super/sub/merge_strategy_6.t
+'
+
 test_expect_success 'pull --rebase --recurse-submodules (remote superproject submodule changes, local submodule changes)' '
 	# This tests the following scenario :
 	# - local submodule has new commits
diff --git a/t/t5600-clone-fail-cleanup.sh b/t/t5600-clone-fail-cleanup.sh
index 34b3df4027..c814afa565 100755
--- a/t/t5600-clone-fail-cleanup.sh
+++ b/t/t5600-clone-fail-cleanup.sh
@@ -13,6 +13,7 @@ Unless the directory already exists, in which case we clean up only what we
 wrote.
 '
 
+TEST_PASSES_SANITIZE_LEAK=true
 . ./test-lib.sh
 
 corrupt_repo () {
diff --git a/t/t5601-clone.sh b/t/t5601-clone.sh
index 16edbcb900..c4cbe1f65a 100755
--- a/t/t5601-clone.sh
+++ b/t/t5601-clone.sh
@@ -71,6 +71,29 @@ test_expect_success 'clone respects GIT_WORK_TREE' '
 
 '
 
+test_expect_success LIBCURL 'clone warns or fails when using username:password' '
+	message="URL '\''https://username:<redacted>@localhost/'\'' uses plaintext credentials" &&
+	test_must_fail git -c transfer.credentialsInUrl=allow clone https://username:password@localhost attempt1 2>err &&
+	! grep "$message" err &&
+
+	test_must_fail git -c transfer.credentialsInUrl=warn clone https://username:password@localhost attempt2 2>err &&
+	grep "warning: $message" err >warnings &&
+	test_line_count = 2 warnings &&
+
+	test_must_fail git -c transfer.credentialsInUrl=die clone https://username:password@localhost attempt3 2>err &&
+	grep "fatal: $message" err >warnings &&
+	test_line_count = 1 warnings &&
+
+	test_must_fail git -c transfer.credentialsInUrl=die clone https://username:@localhost attempt3 2>err &&
+	grep "fatal: $message" err >warnings &&
+	test_line_count = 1 warnings
+'
+
+test_expect_success LIBCURL 'clone does not detect username:password when it is https://username@domain:port/' '
+	test_must_fail git -c transfer.credentialsInUrl=warn clone https://username@localhost:8080 attempt3 2>err &&
+	! grep "uses plaintext credentials" err
+'
+
 test_expect_success 'clone from hooks' '
 
 	test_create_repo r0 &&
diff --git a/t/t5605-clone-local.sh b/t/t5605-clone-local.sh
index 7d63365f93..38b850c10e 100755
--- a/t/t5605-clone-local.sh
+++ b/t/t5605-clone-local.sh
@@ -21,7 +21,9 @@ test_expect_success 'preparing origin repository' '
 	git bundle create b2.bundle main &&
 	mkdir dir &&
 	cp b1.bundle dir/b3 &&
-	cp b1.bundle b4
+	cp b1.bundle b4 &&
+	git branch not-main main &&
+	git bundle create b5.bundle not-main
 '
 
 test_expect_success 'local clone without .git suffix' '
@@ -83,11 +85,19 @@ test_expect_success 'bundle clone from b4.bundle that does not exist' '
 	test_must_fail git clone b4.bundle bb
 '
 
-test_expect_success 'bundle clone with nonexistent HEAD' '
+test_expect_success 'bundle clone with nonexistent HEAD (match default)' '
 	git clone b2.bundle b2 &&
 	(cd b2 &&
 	git fetch &&
-	test_must_fail git rev-parse --verify refs/heads/main)
+	git rev-parse --verify refs/heads/main)
+'
+
+test_expect_success 'bundle clone with nonexistent HEAD (no match default)' '
+	git clone b5.bundle b5 &&
+	(cd b5 &&
+	git fetch &&
+	test_must_fail git rev-parse --verify refs/heads/main &&
+	test_must_fail git rev-parse --verify refs/heads/not-main)
 '
 
 test_expect_success 'clone empty repository' '
@@ -141,4 +151,13 @@ test_expect_success 'cloning locally respects "-u" for fetching refs' '
 	test_must_fail git clone --bare -u false a should_not_work.git
 '
 
+test_expect_success 'local clone from repo with corrupt refs fails gracefully' '
+	git init corrupt &&
+	test_commit -C corrupt one &&
+	echo a >corrupt/.git/refs/heads/topic &&
+
+	test_must_fail git clone corrupt working 2>err &&
+	grep "has a null OID" err
+'
+
 test_done
diff --git a/t/t5616-partial-clone.sh b/t/t5616-partial-clone.sh
index a3c9f51f76..037941b95d 100755
--- a/t/t5616-partial-clone.sh
+++ b/t/t5616-partial-clone.sh
@@ -49,6 +49,13 @@ test_expect_success 'do partial clone 1' '
 	test "$(git -C pc1 config --local remote.origin.partialclonefilter)" = "blob:none"
 '
 
+test_expect_success 'rev-list --missing=allow-promisor on partial clone' '
+	git -C pc1 rev-list --objects --missing=allow-promisor HEAD >actual &&
+	git -C pc1 rev-list --objects --missing=print HEAD >expect.raw &&
+	grep -v "^?" expect.raw >expect &&
+	test_cmp expect actual
+'
+
 test_expect_success 'verify that .promisor file contains refs fetched' '
 	ls pc1/.git/objects/pack/pack-*.promisor >promisorlist &&
 	test_line_count = 1 promisorlist &&
diff --git a/t/t5702-protocol-v2.sh b/t/t5702-protocol-v2.sh
index 00ce9aec23..5d42a355a8 100755
--- a/t/t5702-protocol-v2.sh
+++ b/t/t5702-protocol-v2.sh
@@ -250,6 +250,65 @@ test_expect_success 'bare clone propagates empty default branch' '
 	grep "refs/heads/mydefaultbranch" file_empty_child.git/HEAD
 '
 
+test_expect_success 'clone propagates unborn HEAD from non-empty repo' '
+	test_when_finished "rm -rf file_unborn_parent file_unborn_child" &&
+
+	git init file_unborn_parent &&
+	(
+		cd file_unborn_parent &&
+		git checkout -b branchwithstuff &&
+		test_commit --no-tag stuff &&
+		git symbolic-ref HEAD refs/heads/mydefaultbranch
+	) &&
+
+	GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME= \
+	git -c init.defaultBranch=main -c protocol.version=2 \
+		clone "file://$(pwd)/file_unborn_parent" \
+		file_unborn_child 2>stderr &&
+	grep "refs/heads/mydefaultbranch" file_unborn_child/.git/HEAD &&
+	grep "warning: remote HEAD refers to nonexistent ref" stderr
+'
+
+test_expect_success 'bare clone propagates unborn HEAD from non-empty repo' '
+	test_when_finished "rm -rf file_unborn_parent file_unborn_child.git" &&
+
+	git init file_unborn_parent &&
+	(
+		cd file_unborn_parent &&
+		git checkout -b branchwithstuff &&
+		test_commit --no-tag stuff &&
+		git symbolic-ref HEAD refs/heads/mydefaultbranch
+	) &&
+
+	GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME= \
+	git -c init.defaultBranch=main -c protocol.version=2 \
+		clone --bare "file://$(pwd)/file_unborn_parent" \
+		file_unborn_child.git 2>stderr &&
+	grep "refs/heads/mydefaultbranch" file_unborn_child.git/HEAD &&
+	! grep "warning:" stderr
+'
+
+test_expect_success 'defaulted HEAD uses remote branch if available' '
+	test_when_finished "rm -rf file_unborn_parent file_unborn_child" &&
+
+	git init file_unborn_parent &&
+	(
+		cd file_unborn_parent &&
+		git config lsrefs.unborn ignore &&
+		git checkout -b branchwithstuff &&
+		test_commit --no-tag stuff &&
+		git symbolic-ref HEAD refs/heads/mydefaultbranch
+	) &&
+
+	GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME= \
+	git -c init.defaultBranch=branchwithstuff -c protocol.version=2 \
+		clone "file://$(pwd)/file_unborn_parent" \
+		file_unborn_child 2>stderr &&
+	grep "refs/heads/branchwithstuff" file_unborn_child/.git/HEAD &&
+	test_path_is_file file_unborn_child/stuff.t &&
+	! grep "warning:" stderr
+'
+
 test_expect_success 'fetch with file:// using protocol v2' '
 	test_when_finished "rm -f log" &&
 
diff --git a/t/t5812-proto-disable-http.sh b/t/t5812-proto-disable-http.sh
index af8772fada..d8da5f58d1 100755
--- a/t/t5812-proto-disable-http.sh
+++ b/t/t5812-proto-disable-http.sh
@@ -16,7 +16,7 @@ test_expect_success 'create git-accessible repo' '
 
 test_proto "smart http" http "$HTTPD_URL/smart/repo.git"
 
-test_expect_success 'curl redirects respect whitelist' '
+test_expect_success 'http(s) transport respects GIT_ALLOW_PROTOCOL' '
 	test_must_fail env GIT_ALLOW_PROTOCOL=http:https \
 			   GIT_SMART_HTTP=0 \
 		git clone "$HTTPD_URL/ftp-redir/repo.git" 2>stderr &&
diff --git a/t/t5815-submodule-protos.sh b/t/t5815-submodule-protos.sh
index 06f55a1b8a..4d5956cc18 100755
--- a/t/t5815-submodule-protos.sh
+++ b/t/t5815-submodule-protos.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-test_description='test protocol whitelisting with submodules'
+test_description='test protocol filtering with submodules'
 . ./test-lib.sh
 . "$TEST_DIRECTORY"/lib-proto-disable.sh
 
@@ -36,7 +36,7 @@ test_expect_success 'update of ext not allowed' '
 	test_must_fail git -C dst submodule update ext-module
 '
 
-test_expect_success 'user can override whitelist' '
+test_expect_success 'user can filter protocols with GIT_ALLOW_PROTOCOL' '
 	GIT_ALLOW_PROTOCOL=ext git -C dst submodule update ext-module
 '
 
diff --git a/t/t5900-repo-selection.sh b/t/t5900-repo-selection.sh
index 14e59c5b3e..a84faac242 100755
--- a/t/t5900-repo-selection.sh
+++ b/t/t5900-repo-selection.sh
@@ -1,6 +1,8 @@
 #!/bin/sh
 
 test_description='selecting remote repo in ambiguous cases'
+
+TEST_PASSES_SANITIZE_LEAK=true
 . ./test-lib.sh
 
 reset() {
diff --git a/t/t6002-rev-list-bisect.sh b/t/t6002-rev-list-bisect.sh
index b95a0212ad..162cf50778 100755
--- a/t/t6002-rev-list-bisect.sh
+++ b/t/t6002-rev-list-bisect.sh
@@ -4,6 +4,7 @@
 #
 test_description='Tests git rev-list --bisect functionality'
 
+TEST_PASSES_SANITIZE_LEAK=true
 . ./test-lib.sh
 . "$TEST_DIRECTORY"/lib-t6000.sh # t6xxx specific functions
 
diff --git a/t/t6003-rev-list-topo-order.sh b/t/t6003-rev-list-topo-order.sh
index 24d1836f41..1f7d7dd20c 100755
--- a/t/t6003-rev-list-topo-order.sh
+++ b/t/t6003-rev-list-topo-order.sh
@@ -5,6 +5,7 @@
 
 test_description='Tests git rev-list --topo-order functionality'
 
+TEST_PASSES_SANITIZE_LEAK=true
 . ./test-lib.sh
 . "$TEST_DIRECTORY"/lib-t6000.sh # t6xxx specific functions
 
diff --git a/t/t6005-rev-list-count.sh b/t/t6005-rev-list-count.sh
index e960049f64..0729f800c3 100755
--- a/t/t6005-rev-list-count.sh
+++ b/t/t6005-rev-list-count.sh
@@ -2,6 +2,7 @@
 
 test_description='git rev-list --max-count and --skip test'
 
+TEST_PASSES_SANITIZE_LEAK=true
 . ./test-lib.sh
 
 test_expect_success 'setup' '
diff --git a/t/t6018-rev-list-glob.sh b/t/t6018-rev-list-glob.sh
index 24b34add83..e1abc5c2b3 100755
--- a/t/t6018-rev-list-glob.sh
+++ b/t/t6018-rev-list-glob.sh
@@ -5,6 +5,7 @@ test_description='rev-list/rev-parse --glob'
 GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
 export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
 
+TEST_PASSES_SANITIZE_LEAK=true
 . ./test-lib.sh
 
 commit () {
diff --git a/t/t6030-bisect-porcelain.sh b/t/t6030-bisect-porcelain.sh
index 5382e5d216..83931d482f 100755
--- a/t/t6030-bisect-porcelain.sh
+++ b/t/t6030-bisect-porcelain.sh
@@ -1025,4 +1025,32 @@ test_expect_success 'bisect visualize with a filename with dash and space' '
 	git bisect visualize -p -- "-hello 2"
 '
 
+test_expect_success 'bisect state output with multiple good commits' '
+	git bisect reset &&
+	git bisect start >output &&
+	grep "waiting for both good and bad commits" output &&
+	git bisect log >output &&
+	grep "waiting for both good and bad commits" output &&
+	git bisect good "$HASH1" >output &&
+	grep "waiting for bad commit, 1 good commit known" output &&
+	git bisect log >output &&
+	grep "waiting for bad commit, 1 good commit known" output &&
+	git bisect good "$HASH2" >output &&
+	grep "waiting for bad commit, 2 good commits known" output &&
+	git bisect log >output &&
+	grep "waiting for bad commit, 2 good commits known" output
+'
+
+test_expect_success 'bisect state output with bad commit' '
+	git bisect reset &&
+	git bisect start >output &&
+	grep "waiting for both good and bad commits" output &&
+	git bisect log >output &&
+	grep "waiting for both good and bad commits" output &&
+	git bisect bad "$HASH4" >output &&
+	grep -F "waiting for good commit(s), bad commit known" output &&
+	git bisect log >output &&
+	grep -F "waiting for good commit(s), bad commit known" output
+'
+
 test_done
diff --git a/t/t6100-rev-list-in-order.sh b/t/t6100-rev-list-in-order.sh
index e934bc239c..88ed7bd75a 100755
--- a/t/t6100-rev-list-in-order.sh
+++ b/t/t6100-rev-list-in-order.sh
@@ -2,6 +2,7 @@
 
 test_description='rev-list testing in-commit-order'
 
+TEST_PASSES_SANITIZE_LEAK=true
 . ./test-lib.sh
 
 test_expect_success 'setup a commit history with trees, blobs' '
diff --git a/t/t6101-rev-parse-parents.sh b/t/t6101-rev-parse-parents.sh
index c571fa5179..a3a41c7a3e 100755
--- a/t/t6101-rev-parse-parents.sh
+++ b/t/t6101-rev-parse-parents.sh
@@ -8,6 +8,7 @@ test_description='Test git rev-parse with different parent options'
 GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
 export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
 
+TEST_PASSES_SANITIZE_LEAK=true
 . ./test-lib.sh
 
 test_cmp_rev_output () {
diff --git a/t/t6110-rev-list-sparse.sh b/t/t6110-rev-list-sparse.sh
index 13c1da5352..ddefc7f24e 100755
--- a/t/t6110-rev-list-sparse.sh
+++ b/t/t6110-rev-list-sparse.sh
@@ -4,6 +4,7 @@ test_description='operations that cull histories in unusual ways'
 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/t6114-keep-packs.sh b/t/t6114-keep-packs.sh
index 9239d8aa46..44246f8a63 100755
--- a/t/t6114-keep-packs.sh
+++ b/t/t6114-keep-packs.sh
@@ -1,6 +1,8 @@
 #!/bin/sh
 
 test_description='rev-list with .keep packs'
+
+TEST_PASSES_SANITIZE_LEAK=true
 . ./test-lib.sh
 
 test_expect_success 'setup' '
diff --git a/t/t6131-pathspec-icase.sh b/t/t6131-pathspec-icase.sh
index 39fc3f6769..770cce026c 100755
--- a/t/t6131-pathspec-icase.sh
+++ b/t/t6131-pathspec-icase.sh
@@ -1,6 +1,8 @@
 #!/bin/sh
 
 test_description='test case insensitive pathspec limiting'
+
+TEST_PASSES_SANITIZE_LEAK=true
 . ./test-lib.sh
 
 if test_have_prereq CASE_INSENSITIVE_FS
diff --git a/t/t6132-pathspec-exclude.sh b/t/t6132-pathspec-exclude.sh
index 8ff1d76f79..9fdafeb1e9 100755
--- a/t/t6132-pathspec-exclude.sh
+++ b/t/t6132-pathspec-exclude.sh
@@ -195,6 +195,7 @@ test_expect_success 'multiple exclusions' '
 '
 
 test_expect_success 't_e_i() exclude case #8' '
+	test_when_finished "rm -fr case8" &&
 	git init case8 &&
 	(
 		cd case8 &&
@@ -244,4 +245,184 @@ test_expect_success 'grep --untracked PATTERN :(exclude)*FILE' '
 	test_cmp expect-grep actual-grep
 '
 
+# Depending on the command, all negative pathspec needs to subtract
+# either from the full tree, or from the current directory.
+#
+# The sample tree checked out at this point has:
+# file
+# sub/file
+# sub/file2
+# sub/sub/file
+# sub/sub/sub/file
+# sub2/file
+#
+# but there may also be some cruft that interferes with "git clean"
+# and "git add" tests.
+
+test_expect_success 'archive with all negative' '
+	git reset --hard &&
+	git clean -f &&
+	git -C sub archive --format=tar HEAD -- ":!sub/" >archive &&
+	"$TAR" tf archive >actual &&
+	cat >expect <<-\EOF &&
+	file
+	file2
+	EOF
+	test_cmp expect actual
+'
+
+test_expect_success 'add with all negative' '
+	H=$(git rev-parse HEAD) &&
+	git reset --hard $H &&
+	git clean -f &&
+	test_when_finished "git reset --hard $H" &&
+	for path in file sub/file sub/sub/file sub2/file
+	do
+		echo smudge >>"$path" || return 1
+	done &&
+	git -C sub add -- ":!sub/" &&
+	git diff --name-only --no-renames --cached >actual &&
+	cat >expect <<-\EOF &&
+	file
+	sub/file
+	sub2/file
+	EOF
+	test_cmp expect actual &&
+	git diff --name-only --no-renames >actual &&
+	echo sub/sub/file >expect &&
+	test_cmp expect actual
+'
+
+test_expect_success 'add -p with all negative' '
+	H=$(git rev-parse HEAD) &&
+	git reset --hard $H &&
+	git clean -f &&
+	test_when_finished "git reset --hard $H" &&
+	for path in file sub/file sub/sub/file sub2/file
+	do
+		echo smudge >>"$path" || return 1
+	done &&
+	yes | git -C sub add -p -- ":!sub/" &&
+	git diff --name-only --no-renames --cached >actual &&
+	cat >expect <<-\EOF &&
+	file
+	sub/file
+	sub2/file
+	EOF
+	test_cmp expect actual &&
+	git diff --name-only --no-renames >actual &&
+	echo sub/sub/file >expect &&
+	test_cmp expect actual
+'
+
+test_expect_success 'clean with all negative' '
+	H=$(git rev-parse HEAD) &&
+	git reset --hard $H &&
+	test_when_finished "git reset --hard $H && git clean -f" &&
+	git clean -f &&
+	for path in file9 sub/file9 sub/sub/file9 sub2/file9
+	do
+		echo cruft >"$path" || return 1
+	done &&
+	git -C sub clean -f -- ":!sub" &&
+	test_path_is_file file9 &&
+	test_path_is_missing sub/file9 &&
+	test_path_is_file sub/sub/file9 &&
+	test_path_is_file sub2/file9
+'
+
+test_expect_success 'commit with all negative' '
+	H=$(git rev-parse HEAD) &&
+	git reset --hard $H &&
+	test_when_finished "git reset --hard $H" &&
+	for path in file sub/file sub/sub/file sub2/file
+	do
+		echo smudge >>"$path" || return 1
+	done &&
+	git -C sub commit -m sample -- ":!sub/" &&
+	git diff --name-only --no-renames HEAD^ HEAD >actual &&
+	cat >expect <<-\EOF &&
+	file
+	sub/file
+	sub2/file
+	EOF
+	test_cmp expect actual &&
+	git diff --name-only --no-renames HEAD >actual &&
+	echo sub/sub/file >expect &&
+	test_cmp expect actual
+'
+
+test_expect_success 'reset with all negative' '
+	H=$(git rev-parse HEAD) &&
+	git reset --hard $H &&
+	test_when_finished "git reset --hard $H" &&
+	for path in file sub/file sub/sub/file sub2/file
+	do
+		echo smudge >>"$path" &&
+		git add "$path" || return 1
+	done &&
+	git -C sub reset --quiet -- ":!sub/" &&
+	git diff --name-only --no-renames --cached >actual &&
+	echo sub/sub/file >expect &&
+	test_cmp expect actual
+'
+
+test_expect_success 'grep with all negative' '
+	H=$(git rev-parse HEAD) &&
+	git reset --hard $H &&
+	test_when_finished "git reset --hard $H" &&
+	for path in file sub/file sub/sub/file sub2/file
+	do
+		echo "needle $path" >>"$path" || return 1
+	done &&
+	git -C sub grep -h needle -- ":!sub/" >actual &&
+	cat >expect <<-\EOF &&
+	needle sub/file
+	EOF
+	test_cmp expect actual
+'
+
+test_expect_success 'ls-files with all negative' '
+	git reset --hard &&
+	git -C sub ls-files -- ":!sub/" >actual &&
+	cat >expect <<-\EOF &&
+	file
+	file2
+	EOF
+	test_cmp expect actual
+'
+
+test_expect_success 'rm with all negative' '
+	git reset --hard &&
+	test_when_finished "git reset --hard" &&
+	git -C sub rm -r --cached -- ":!sub/" >actual &&
+	git diff --name-only --no-renames --diff-filter=D --cached >actual &&
+	cat >expect <<-\EOF &&
+	sub/file
+	sub/file2
+	EOF
+	test_cmp expect actual
+'
+
+test_expect_success 'stash with all negative' '
+	H=$(git rev-parse HEAD) &&
+	git reset --hard $H &&
+	test_when_finished "git reset --hard $H" &&
+	for path in file sub/file sub/sub/file sub2/file
+	do
+		echo smudge >>"$path" || return 1
+	done &&
+	git -C sub stash push -m sample -- ":!sub/" &&
+	git diff --name-only --no-renames HEAD >actual &&
+	echo sub/sub/file >expect &&
+	test_cmp expect actual &&
+	git stash show --name-only >actual &&
+	cat >expect <<-\EOF &&
+	file
+	sub/file
+	sub2/file
+	EOF
+	test_cmp expect actual
+'
+
 test_done
diff --git a/t/t6423-merge-rename-directories.sh b/t/t6423-merge-rename-directories.sh
index 479db32cd6..99baf77cbf 100755
--- a/t/t6423-merge-rename-directories.sh
+++ b/t/t6423-merge-rename-directories.sh
@@ -5199,6 +5199,111 @@ test_expect_success '12k: Directory rename with sibling causes rename-to-self' '
 	)
 '
 
+# Testcase 12l, Both sides rename a directory into the other side, both add
+#   a file which after directory renames are the same filename
+#   Commit O: sub1/file,                 sub2/other
+#   Commit A: sub3/file,                 sub2/{other, new_add_add_file_1}
+#   Commit B: sub1/{file, newfile}, sub1/sub2/{other, new_add_add_file_2}
+#
+#   In words:
+#     A: sub1/ -> sub3/, add sub2/new_add_add_file_1
+#     B: sub2/ -> sub1/sub2, add sub1/newfile, add sub1/sub2/new_add_add_file_2
+#
+#   Expected: sub3/{file, newfile, sub2/other}
+#             CONFLICT (add/add): sub1/sub2/new_add_add_file
+#
+#   Note that sub1/newfile is not extraneous.  Directory renames are only
+#   detected if they are needed, and they are only needed if the old directory
+#   had a new file added on the opposite side of history.  So sub1/newfile
+#   is needed for there to be a sub1/ -> sub3/ rename.
+
+test_setup_12l () {
+	test_create_repo 12l_$1 &&
+	(
+		cd 12l_$1 &&
+
+		mkdir sub1 sub2
+		echo file >sub1/file &&
+		echo other >sub2/other &&
+		git add sub1 sub2 &&
+		git commit -m "O" &&
+
+		git branch O &&
+		git branch A &&
+		git branch B &&
+
+		git checkout A &&
+		git mv sub1 sub3 &&
+		echo conflicting >sub2/new_add_add_file &&
+		git add sub2 &&
+		test_tick &&
+		git add -u &&
+		git commit -m "A" &&
+
+		git checkout B &&
+		echo dissimilar >sub2/new_add_add_file &&
+		echo brand >sub1/newfile &&
+		git add sub1 sub2 &&
+		git mv sub2 sub1 &&
+		test_tick &&
+		git commit -m "B"
+	)
+}
+
+test_expect_merge_algorithm failure success '12l (B into A): Rename into each other + add/add conflict' '
+	test_setup_12l BintoA &&
+	(
+		cd 12l_BintoA &&
+
+		git checkout -q A^0 &&
+
+		test_must_fail git -c merge.directoryRenames=true merge -s recursive B^0 &&
+
+		test_stdout_line_count = 5 git ls-files -s &&
+
+		git rev-parse >actual \
+			:0:sub3/file :0:sub3/newfile :0:sub3/sub2/other \
+			:2:sub1/sub2/new_add_add_file \
+			:3:sub1/sub2/new_add_add_file &&
+		git rev-parse >expect \
+			O:sub1/file  B:sub1/newfile O:sub2/other \
+			A:sub2/new_add_add_file \
+			B:sub1/sub2/new_add_add_file &&
+		test_cmp expect actual &&
+
+		git ls-files -o >actual &&
+		test_write_lines actual expect >expect &&
+		test_cmp expect actual
+	)
+'
+
+test_expect_merge_algorithm failure success '12l (A into B): Rename into each other + add/add conflict' '
+	test_setup_12l AintoB &&
+	(
+		cd 12l_AintoB &&
+
+		git checkout -q B^0 &&
+
+		test_must_fail git -c merge.directoryRenames=true merge -s recursive A^0 &&
+
+		test_stdout_line_count = 5 git ls-files -s &&
+
+		git rev-parse >actual \
+			:0:sub3/file :0:sub3/newfile :0:sub3/sub2/other \
+			:2:sub1/sub2/new_add_add_file \
+			:3:sub1/sub2/new_add_add_file &&
+		git rev-parse >expect \
+			O:sub1/file  B:sub1/newfile O:sub2/other \
+			B:sub1/sub2/new_add_add_file \
+			A:sub2/new_add_add_file &&
+		test_cmp expect actual &&
+
+		git ls-files -o >actual &&
+		test_write_lines actual expect >expect &&
+		test_cmp expect actual
+	)
+'
+
 ###########################################################################
 # SECTION 13: Checking informational and conflict messages
 #
diff --git a/t/t6424-merge-unrelated-index-changes.sh b/t/t6424-merge-unrelated-index-changes.sh
index 89dd544f38..b6e424a427 100755
--- a/t/t6424-merge-unrelated-index-changes.sh
+++ b/t/t6424-merge-unrelated-index-changes.sh
@@ -71,7 +71,9 @@ test_expect_success 'ff update' '
 	git merge E^0 &&
 
 	test_must_fail git rev-parse HEAD:random_file &&
-	test "$(git diff --name-only --cached E)" = "random_file"
+	test "$(git diff --name-only --cached E)" = "random_file" &&
+	test_path_is_file random_file &&
+	git rev-parse --verify :random_file
 '
 
 test_expect_success 'ff update, important file modified' '
@@ -83,6 +85,8 @@ test_expect_success 'ff update, important file modified' '
 	git add subdir/e &&
 
 	test_must_fail git merge E^0 &&
+	test_path_is_file subdir/e &&
+	git rev-parse --verify :subdir/e &&
 	test_path_is_missing .git/MERGE_HEAD
 '
 
@@ -93,6 +97,8 @@ test_expect_success 'resolve, trivial' '
 	touch random_file && git add random_file &&
 
 	test_must_fail git merge -s resolve C^0 &&
+	test_path_is_file random_file &&
+	git rev-parse --verify :random_file &&
 	test_path_is_missing .git/MERGE_HEAD
 '
 
@@ -103,6 +109,8 @@ test_expect_success 'resolve, non-trivial' '
 	touch random_file && git add random_file &&
 
 	test_must_fail git merge -s resolve D^0 &&
+	test_path_is_file random_file &&
+	git rev-parse --verify :random_file &&
 	test_path_is_missing .git/MERGE_HEAD
 '
 
@@ -113,6 +121,8 @@ test_expect_success 'recursive' '
 	touch random_file && git add random_file &&
 
 	test_must_fail git merge -s recursive C^0 &&
+	test_path_is_file random_file &&
+	git rev-parse --verify :random_file &&
 	test_path_is_missing .git/MERGE_HEAD
 '
 
@@ -145,9 +155,12 @@ test_expect_success 'recursive, when file has staged changes not matching HEAD n
 	mkdir subdir &&
 	test_seq 1 10 >subdir/a &&
 	git add subdir/a &&
+	git rev-parse --verify :subdir/a >expect &&
 
 	# We have staged changes; merge should error out
 	test_must_fail git merge -s recursive E^0 2>err &&
+	git rev-parse --verify :subdir/a >actual &&
+	test_cmp expect actual &&
 	test_i18ngrep "changes to the following files would be overwritten" err
 '
 
@@ -158,9 +171,12 @@ test_expect_success 'recursive, when file has staged changes matching what a mer
 	mkdir subdir &&
 	test_seq 1 11 >subdir/a &&
 	git add subdir/a &&
+	git rev-parse --verify :subdir/a >expect &&
 
 	# We have staged changes; merge should error out
 	test_must_fail git merge -s recursive E^0 2>err &&
+	git rev-parse --verify :subdir/a >actual &&
+	test_cmp expect actual &&
 	test_i18ngrep "changes to the following files would be overwritten" err
 '
 
@@ -171,7 +187,9 @@ test_expect_success 'octopus, unrelated file touched' '
 	touch random_file && git add random_file &&
 
 	test_must_fail git merge C^0 D^0 &&
-	test_path_is_missing .git/MERGE_HEAD
+	test_path_is_missing .git/MERGE_HEAD &&
+	git rev-parse --verify :random_file &&
+	test_path_exists random_file
 '
 
 test_expect_success 'octopus, related file removed' '
@@ -181,6 +199,8 @@ test_expect_success 'octopus, related file removed' '
 	git rm b &&
 
 	test_must_fail git merge C^0 D^0 &&
+	test_path_is_missing b &&
+	test_must_fail git rev-parse --verify :b &&
 	test_path_is_missing .git/MERGE_HEAD
 '
 
@@ -189,8 +209,12 @@ test_expect_success 'octopus, related file modified' '
 	git checkout B^0 &&
 
 	echo 12 >>a && git add a &&
+	git rev-parse --verify :a >expect &&
 
 	test_must_fail git merge C^0 D^0 &&
+	test_path_is_file a &&
+	git rev-parse --verify :a >actual &&
+	test_cmp expect actual &&
 	test_path_is_missing .git/MERGE_HEAD
 '
 
@@ -201,6 +225,8 @@ test_expect_success 'ours' '
 	touch random_file && git add random_file &&
 
 	test_must_fail git merge -s ours C^0 &&
+	test_path_is_file random_file &&
+	git rev-parse --verify :random_file &&
 	test_path_is_missing .git/MERGE_HEAD
 '
 
@@ -211,6 +237,8 @@ test_expect_success 'subtree' '
 	touch random_file && git add random_file &&
 
 	test_must_fail git merge -s subtree E^0 &&
+	test_path_is_file random_file &&
+	git rev-parse --verify :random_file &&
 	test_path_is_missing .git/MERGE_HEAD
 '
 
diff --git a/t/t6428-merge-conflicts-sparse.sh b/t/t6428-merge-conflicts-sparse.sh
index 142c9aaabc..064be1b629 100755
--- a/t/t6428-merge-conflicts-sparse.sh
+++ b/t/t6428-merge-conflicts-sparse.sh
@@ -87,7 +87,7 @@ test_expect_success 'conflicting entries written to worktree even if sparse' '
 		test_path_is_file numerals &&
 
 		git sparse-checkout init &&
-		git sparse-checkout set README &&
+		git sparse-checkout set --no-cone README &&
 
 		test_path_is_file README &&
 		test_path_is_missing numerals &&
@@ -123,7 +123,7 @@ test_expect_success 'present-despite-SKIP_WORKTREE handled reasonably' '
 		test_path_is_file numerals &&
 
 		git sparse-checkout init &&
-		git sparse-checkout set README &&
+		git sparse-checkout set --no-cone README &&
 
 		test_path_is_file README &&
 		test_path_is_missing numerals &&
diff --git a/t/t6429-merge-sequence-rename-caching.sh b/t/t6429-merge-sequence-rename-caching.sh
index f2bc8a7d2a..e1ce919916 100755
--- a/t/t6429-merge-sequence-rename-caching.sh
+++ b/t/t6429-merge-sequence-rename-caching.sh
@@ -760,7 +760,7 @@ test_expect_success 'avoid assuming we detected renames' '
 		test_must_fail git -c merge.renameLimit=1 rebase upstream &&
 
 		git ls-files -u >actual &&
-		! test_file_is_empty actual
+		test_line_count = 2 actual
 	)
 '
 
diff --git a/t/t7002-mv-sparse-checkout.sh b/t/t7002-mv-sparse-checkout.sh
index 1d3d2aca21..f0f7cbfcdb 100755
--- a/t/t7002-mv-sparse-checkout.sh
+++ b/t/t7002-mv-sparse-checkout.sh
@@ -27,7 +27,7 @@ test_expect_success 'setup' "
 test_expect_success 'mv refuses to move sparse-to-sparse' '
 	test_when_finished rm -f e &&
 	git reset --hard &&
-	git sparse-checkout set a &&
+	git sparse-checkout set --no-cone a &&
 	touch b &&
 	test_must_fail git mv b e 2>stderr &&
 	cat sparse_error_header >expect &&
diff --git a/t/t7008-filter-branch-null-sha1.sh b/t/t7008-filter-branch-null-sha1.sh
index 9ba9f24ad2..93fbc92b8d 100755
--- a/t/t7008-filter-branch-null-sha1.sh
+++ b/t/t7008-filter-branch-null-sha1.sh
@@ -1,6 +1,7 @@
 #!/bin/sh
 
 test_description='filter-branch removal of trees with null sha1'
+
 . ./test-lib.sh
 
 test_expect_success 'setup: base commits' '
diff --git a/t/t7011-skip-worktree-reading.sh b/t/t7011-skip-worktree-reading.sh
index 1761a2b1b9..4adac5acd5 100755
--- a/t/t7011-skip-worktree-reading.sh
+++ b/t/t7011-skip-worktree-reading.sh
@@ -5,6 +5,7 @@
 
 test_description='skip-worktree bit test'
 
+TEST_PASSES_SANITIZE_LEAK=true
 . ./test-lib.sh
 
 cat >expect.full <<EOF
diff --git a/t/t7012-skip-worktree-writing.sh b/t/t7012-skip-worktree-writing.sh
index cb9f1a6981..cd5c20fe51 100755
--- a/t/t7012-skip-worktree-writing.sh
+++ b/t/t7012-skip-worktree-writing.sh
@@ -151,7 +151,7 @@ test_expect_success 'stash restore in sparse checkout' '
 
 		git stash push &&
 
-		git sparse-checkout set subdir &&
+		git sparse-checkout set --no-cone subdir &&
 
 		# Ensure after sparse-checkout we only have expected files
 		cat >expect <<-EOF &&
diff --git a/t/t7063-status-untracked-cache.sh b/t/t7063-status-untracked-cache.sh
index ca90ee805e..c1f0d95036 100755
--- a/t/t7063-status-untracked-cache.sh
+++ b/t/t7063-status-untracked-cache.sh
@@ -190,6 +190,119 @@ test_expect_success 'untracked cache after second status' '
 	test_cmp ../dump.expect ../actual
 '
 
+cat >../status_uall.expect <<EOF &&
+A  done/one
+A  one
+A  two
+?? dthree/three
+?? dtwo/two
+?? three
+EOF
+
+# Bypassing the untracked cache here is not desirable from an
+# end-user perspective, but is expected in the current design.
+# The untracked cache data stored for a -unormal run cannot be
+# correctly used in a -uall run - it would yield incorrect output.
+test_expect_success 'untracked cache is bypassed with -uall' '
+	: >../trace.output &&
+	GIT_TRACE2_PERF="$TRASH_DIRECTORY/trace.output" \
+	git status -uall --porcelain >../actual &&
+	iuc status -uall --porcelain >../status.iuc &&
+	test_cmp ../status_uall.expect ../status.iuc &&
+	test_cmp ../status_uall.expect ../actual &&
+	get_relevant_traces ../trace.output ../trace.relevant &&
+	cat >../trace.expect <<EOF &&
+ ....path:
+EOF
+	test_cmp ../trace.expect ../trace.relevant
+'
+
+test_expect_success 'untracked cache remains after bypass' '
+	test-tool dump-untracked-cache >../actual &&
+	test_cmp ../dump.expect ../actual
+'
+
+test_expect_success 'if -uall is configured, untracked cache gets populated by default' '
+	test_config status.showuntrackedfiles all &&
+	: >../trace.output &&
+	GIT_TRACE2_PERF="$TRASH_DIRECTORY/trace.output" \
+	git status --porcelain >../actual &&
+	iuc status --porcelain >../status.iuc &&
+	test_cmp ../status_uall.expect ../status.iuc &&
+	test_cmp ../status_uall.expect ../actual &&
+	get_relevant_traces ../trace.output ../trace.relevant &&
+	cat >../trace.expect <<EOF &&
+ ....path:
+ ....node-creation:3
+ ....gitignore-invalidation:1
+ ....directory-invalidation:0
+ ....opendir:4
+EOF
+	test_cmp ../trace.expect ../trace.relevant
+'
+
+cat >../dump_uall.expect <<EOF &&
+info/exclude $EMPTY_BLOB
+core.excludesfile $ZERO_OID
+exclude_per_dir .gitignore
+flags 00000000
+/ $ZERO_OID recurse valid
+three
+/done/ $ZERO_OID recurse valid
+/dthree/ $ZERO_OID recurse valid
+three
+/dtwo/ $ZERO_OID recurse valid
+two
+EOF
+
+test_expect_success 'if -uall was configured, untracked cache is populated' '
+	test-tool dump-untracked-cache >../actual &&
+	test_cmp ../dump_uall.expect ../actual
+'
+
+test_expect_success 'if -uall is configured, untracked cache is used by default' '
+	test_config status.showuntrackedfiles all &&
+	: >../trace.output &&
+	GIT_TRACE2_PERF="$TRASH_DIRECTORY/trace.output" \
+	git status --porcelain >../actual &&
+	iuc status --porcelain >../status.iuc &&
+	test_cmp ../status_uall.expect ../status.iuc &&
+	test_cmp ../status_uall.expect ../actual &&
+	get_relevant_traces ../trace.output ../trace.relevant &&
+	cat >../trace.expect <<EOF &&
+ ....path:
+ ....node-creation:0
+ ....gitignore-invalidation:0
+ ....directory-invalidation:0
+ ....opendir:0
+EOF
+	test_cmp ../trace.expect ../trace.relevant
+'
+
+# Bypassing the untracked cache here is not desirable from an
+# end-user perspective, but is expected in the current design.
+# The untracked cache data stored for a -all run cannot be
+# correctly used in a -unormal run - it would yield incorrect
+# output.
+test_expect_success 'if -uall is configured, untracked cache is bypassed with -unormal' '
+	test_config status.showuntrackedfiles all &&
+	: >../trace.output &&
+	GIT_TRACE2_PERF="$TRASH_DIRECTORY/trace.output" \
+	git status -unormal --porcelain >../actual &&
+	iuc status -unormal --porcelain >../status.iuc &&
+	test_cmp ../status.expect ../status.iuc &&
+	test_cmp ../status.expect ../actual &&
+	get_relevant_traces ../trace.output ../trace.relevant &&
+	cat >../trace.expect <<EOF &&
+ ....path:
+EOF
+	test_cmp ../trace.expect ../trace.relevant
+'
+
+test_expect_success 'repopulate untracked cache for -unormal' '
+	git status --porcelain
+'
+
 test_expect_success 'modify in root directory, one dir invalidation' '
 	: >four &&
 	test-tool chmtime =-240 four &&
@@ -872,4 +985,9 @@ test_expect_success '"status" after file replacement should be clean with UC=fal
 	status_is_clean
 '
 
+test_expect_success 'empty repo (no index) and core.untrackedCache' '
+	git init emptyrepo &&
+	git -C emptyrepo -c core.untrackedCache=true write-tree
+'
+
 test_done
diff --git a/t/t7519-status-fsmonitor.sh b/t/t7519-status-fsmonitor.sh
index d4f9c6a837..8348e3ae7d 100755
--- a/t/t7519-status-fsmonitor.sh
+++ b/t/t7519-status-fsmonitor.sh
@@ -55,6 +55,38 @@ test_lazy_prereq UNTRACKED_CACHE '
 	test $ret -ne 1
 '
 
+# Test that we detect and disallow repos that are incompatible with FSMonitor.
+test_expect_success 'incompatible bare repo' '
+	test_when_finished "rm -rf ./bare-clone actual expect" &&
+	git init --bare bare-clone &&
+
+	test_must_fail \
+		git -C ./bare-clone -c core.fsmonitor=foo \
+			update-index --fsmonitor 2>actual &&
+	grep "bare repository .* is incompatible with fsmonitor" actual &&
+
+	test_must_fail \
+		git -C ./bare-clone -c core.fsmonitor=true \
+			update-index --fsmonitor 2>actual &&
+	grep "bare repository .* is incompatible with fsmonitor" actual
+'
+
+test_expect_success FSMONITOR_DAEMON 'run fsmonitor-daemon in bare repo' '
+	test_when_finished "rm -rf ./bare-clone actual" &&
+	git init --bare bare-clone &&
+	test_must_fail git -C ./bare-clone fsmonitor--daemon run 2>actual &&
+	grep "bare repository .* is incompatible with fsmonitor" actual
+'
+
+test_expect_success MINGW,FSMONITOR_DAEMON 'run fsmonitor-daemon in virtual repo' '
+	test_when_finished "rm -rf ./fake-virtual-clone actual" &&
+	git init fake-virtual-clone &&
+	test_must_fail git -C ./fake-virtual-clone \
+			   -c core.virtualfilesystem=true \
+			   fsmonitor--daemon run 2>actual &&
+	grep "virtual repository .* is incompatible with fsmonitor" actual
+'
+
 test_expect_success 'setup' '
 	: >tracked &&
 	: >modified &&
diff --git a/t/t7527-builtin-fsmonitor.sh b/t/t7527-builtin-fsmonitor.sh
index bd0c952a11..d419085379 100755
--- a/t/t7527-builtin-fsmonitor.sh
+++ b/t/t7527-builtin-fsmonitor.sh
@@ -124,6 +124,36 @@ test_expect_success 'implicit daemon start' '
 	test_must_fail git -C test_implicit fsmonitor--daemon status
 '
 
+# Verify that the daemon has shutdown.  Spin a few seconds to
+# make the test a little more robust during CI testing.
+#
+# We're looking for an implicit shutdown, such as when we delete or
+# rename the ".git" directory.  Our delete/rename will cause a file
+# system event that the daemon will see and the daemon will
+# auto-shutdown as soon as it sees it.  But this is racy with our `git
+# fsmonitor--daemon status` commands (and we cannot use a cookie file
+# here to help us).  So spin a little and give the daemon a chance to
+# see the event.  (This is primarily for underpowered CI build/test
+# machines (where it might take a moment to wake and reschedule the
+# daemon process) to avoid false alarms during test runs.)
+#
+IMPLICIT_TIMEOUT=5
+
+verify_implicit_shutdown () {
+	r=$1 &&
+
+	k=0 &&
+	while test "$k" -lt $IMPLICIT_TIMEOUT
+	do
+		git -C $r fsmonitor--daemon status || return 0
+
+		sleep 1
+		k=$(( $k + 1 ))
+	done &&
+
+	return 1
+}
+
 test_expect_success 'implicit daemon stop (delete .git)' '
 	test_when_finished "stop_daemon_delete_repo test_implicit_1" &&
 
@@ -142,10 +172,9 @@ test_expect_success 'implicit daemon stop (delete .git)' '
 	#     This would make the test result dependent upon whether we
 	#     were using fsmonitor on our development worktree.
 	#
-	sleep 1 &&
 	mkdir test_implicit_1/.git &&
 
-	test_must_fail git -C test_implicit_1 fsmonitor--daemon status
+	verify_implicit_shutdown test_implicit_1
 '
 
 test_expect_success 'implicit daemon stop (rename .git)' '
@@ -160,10 +189,70 @@ test_expect_success 'implicit daemon stop (rename .git)' '
 
 	# See [1] above.
 	#
-	sleep 1 &&
 	mkdir test_implicit_2/.git &&
 
-	test_must_fail git -C test_implicit_2 fsmonitor--daemon status
+	verify_implicit_shutdown test_implicit_2
+'
+
+# File systems on Windows may or may not have shortnames.
+# This is a volume-specific setting on modern systems.
+# "C:/" drives are required to have them enabled.  Other
+# hard drives default to disabled.
+#
+# This is a crude test to see if shortnames are enabled
+# on the volume containing the test directory.  It is
+# crude, but it does not require elevation like `fsutil`.
+#
+test_lazy_prereq SHORTNAMES '
+	mkdir .foo &&
+	test -d "FOO~1"
+'
+
+# Here we assume that the shortname of ".git" is "GIT~1".
+test_expect_success MINGW,SHORTNAMES 'implicit daemon stop (rename GIT~1)' '
+	test_when_finished "stop_daemon_delete_repo test_implicit_1s" &&
+
+	git init test_implicit_1s &&
+
+	start_daemon -C test_implicit_1s &&
+
+	# renaming the .git directory will implicitly stop the daemon.
+	# this moves {.git, GIT~1} to {.gitxyz, GITXYZ~1}.
+	# the rename-from FS Event will contain the shortname.
+	#
+	mv test_implicit_1s/GIT~1 test_implicit_1s/.gitxyz &&
+
+	# See [1] above.
+	# this moves {.gitxyz, GITXYZ~1} to {.git, GIT~1}.
+	mv test_implicit_1s/.gitxyz test_implicit_1s/.git &&
+
+	verify_implicit_shutdown test_implicit_1s
+'
+
+# Here we first create a file with LONGNAME of "GIT~1" before
+# we create the repo.  This will cause the shortname of ".git"
+# to be "GIT~2".
+test_expect_success MINGW,SHORTNAMES 'implicit daemon stop (rename GIT~2)' '
+	test_when_finished "stop_daemon_delete_repo test_implicit_1s2" &&
+
+	mkdir test_implicit_1s2 &&
+	echo HELLO >test_implicit_1s2/GIT~1 &&
+	git init test_implicit_1s2 &&
+
+	test_path_is_file test_implicit_1s2/GIT~1 &&
+	test_path_is_dir  test_implicit_1s2/GIT~2 &&
+
+	start_daemon -C test_implicit_1s2 &&
+
+	# renaming the .git directory will implicitly stop the daemon.
+	# the rename-from FS Event will contain the shortname.
+	#
+	mv test_implicit_1s2/GIT~2 test_implicit_1s2/.gitxyz &&
+
+	# See [1] above.
+	mv test_implicit_1s2/.gitxyz test_implicit_1s2/.git &&
+
+	verify_implicit_shutdown test_implicit_1s2
 '
 
 test_expect_success 'cannot start multiple daemons' '
@@ -209,6 +298,16 @@ test_expect_success 'setup' '
 	trace*
 	EOF
 
+	mkdir -p T1/T2/T3/T4 &&
+	echo 1 >T1/F1 &&
+	echo 1 >T1/T2/F1 &&
+	echo 1 >T1/T2/T3/F1 &&
+	echo 1 >T1/T2/T3/T4/F1 &&
+	echo 2 >T1/F2 &&
+	echo 2 >T1/T2/F2 &&
+	echo 2 >T1/T2/T3/F2 &&
+	echo 2 >T1/T2/T3/T4/F2 &&
+
 	git -c core.fsmonitor=false add . &&
 	test_tick &&
 	git -c core.fsmonitor=false commit -m initial &&
@@ -291,6 +390,19 @@ directory_to_file () {
 	echo 1 >dir1
 }
 
+move_directory_contents_deeper() {
+	mkdir T1/_new_ &&
+	mv T1/[A-Z]* T1/_new_
+}
+
+move_directory_up() {
+	mv T1/T2/T3 T1
+}
+
+move_directory() {
+	mv T1/T2/T3 T1/T2/NewT3
+}
+
 # The next few test cases confirm that our fsmonitor daemon sees each type
 # of OS filesystem notification that we care about.  At this layer we just
 # ensure we are getting the OS notifications and do not try to confirm what
@@ -595,6 +707,10 @@ do
 		matrix_try $uc_val $fsm_val file_to_directory
 		matrix_try $uc_val $fsm_val directory_to_file
 
+		matrix_try $uc_val $fsm_val move_directory_contents_deeper
+		matrix_try $uc_val $fsm_val move_directory_up
+		matrix_try $uc_val $fsm_val move_directory
+
 		if test $fsm_val = true
 		then
 			test_expect_success "Matrix[uc:$uc_val][fsm:$fsm_val] disable fsmonitor at end" '
@@ -606,4 +722,285 @@ do
 	done
 done
 
+# Test Unicode UTF-8 characters in the pathname of the working
+# directory root.  Use of "*A()" routines rather than "*W()" routines
+# on Windows can sometimes lead to odd failures.
+#
+u1=$(printf "u_c3_a6__\xC3\xA6")
+u2=$(printf "u_e2_99_ab__\xE2\x99\xAB")
+u_values="$u1 $u2"
+for u in $u_values
+do
+	test_expect_success "unicode in repo root path: $u" '
+		test_when_finished "stop_daemon_delete_repo $u" &&
+
+		git init "$u" &&
+		echo 1 >"$u"/file1 &&
+		git -C "$u" add file1 &&
+		git -C "$u" config core.fsmonitor true &&
+
+		start_daemon -C "$u" &&
+		git -C "$u" status >actual &&
+		grep "new file:   file1" actual
+	'
+done
+
+# Test fsmonitor interaction with submodules.
+#
+# If we start the daemon in the super, it will see FS events for
+# everything in the working directory cone and this includes any
+# files/directories contained *within* the submodules.
+#
+# A `git status` at top level will get events for items within the
+# submodule and ignore them, since they aren't named in the index
+# of the super repo.  This makes the fsmonitor response a little
+# noisy, but it doesn't alter the correctness of the state of the
+# super-proper.
+#
+# When we have submodules, `git status` normally does a recursive
+# status on each of the submodules and adds a summary row for any
+# dirty submodules.  (See the "S..." bits in porcelain V2 output.)
+#
+# It is therefore important that the top level status not be tricked
+# by the FSMonitor response to skip those recursive calls.  That is,
+# even if FSMonitor says that the mtime of the submodule directory
+# hasn't changed and it could be implicitly marked valid, we must
+# not take that shortcut.  We need to force the recusion into the
+# submodule so that we get a summary of the status *within* the
+# submodule.
+
+create_super () {
+	super="$1" &&
+
+	git init "$super" &&
+	echo x >"$super/file_1" &&
+	echo y >"$super/file_2" &&
+	echo z >"$super/file_3" &&
+	mkdir "$super/dir_1" &&
+	echo a >"$super/dir_1/file_11" &&
+	echo b >"$super/dir_1/file_12" &&
+	mkdir "$super/dir_1/dir_2" &&
+	echo a >"$super/dir_1/dir_2/file_21" &&
+	echo b >"$super/dir_1/dir_2/file_22" &&
+	git -C "$super" add . &&
+	git -C "$super" commit -m "initial $super commit"
+}
+
+create_sub () {
+	sub="$1" &&
+
+	git init "$sub" &&
+	echo x >"$sub/file_x" &&
+	echo y >"$sub/file_y" &&
+	echo z >"$sub/file_z" &&
+	mkdir "$sub/dir_x" &&
+	echo a >"$sub/dir_x/file_a" &&
+	echo b >"$sub/dir_x/file_b" &&
+	mkdir "$sub/dir_x/dir_y" &&
+	echo a >"$sub/dir_x/dir_y/file_a" &&
+	echo b >"$sub/dir_x/dir_y/file_b" &&
+	git -C "$sub" add . &&
+	git -C "$sub" commit -m "initial $sub commit"
+}
+
+my_match_and_clean () {
+	git -C super --no-optional-locks status --porcelain=v2 >actual.with &&
+	git -C super --no-optional-locks -c core.fsmonitor=false \
+		status --porcelain=v2 >actual.without &&
+	test_cmp actual.with actual.without &&
+
+	git -C super/dir_1/dir_2/sub reset --hard &&
+	git -C super/dir_1/dir_2/sub clean -d -f
+}
+
+test_expect_success 'submodule setup' '
+	git config --global protocol.file.allow always
+'
+
+test_expect_success 'submodule always visited' '
+	test_when_finished "git -C super fsmonitor--daemon stop; \
+			    rm -rf super; \
+			    rm -rf sub" &&
+
+	create_super super &&
+	create_sub sub &&
+
+	git -C super submodule add ../sub ./dir_1/dir_2/sub &&
+	git -C super commit -m "add sub" &&
+
+	start_daemon -C super &&
+	git -C super config core.fsmonitor true &&
+	git -C super update-index --fsmonitor &&
+	git -C super status &&
+
+	# Now run pairs of commands w/ and w/o FSMonitor while we make
+	# some dirt in the submodule and confirm matching output.
+
+	# Completely clean status.
+	my_match_and_clean &&
+
+	# .M S..U
+	echo z >super/dir_1/dir_2/sub/dir_x/dir_y/foobar_u &&
+	my_match_and_clean &&
+
+	# .M S.M.
+	echo z >super/dir_1/dir_2/sub/dir_x/dir_y/foobar_m &&
+	git -C super/dir_1/dir_2/sub add . &&
+	my_match_and_clean &&
+
+	# .M S.M.
+	echo z >>super/dir_1/dir_2/sub/dir_x/dir_y/file_a &&
+	git -C super/dir_1/dir_2/sub add . &&
+	my_match_and_clean &&
+
+	# .M SC..
+	echo z >>super/dir_1/dir_2/sub/dir_x/dir_y/file_a &&
+	git -C super/dir_1/dir_2/sub add . &&
+	git -C super/dir_1/dir_2/sub commit -m "SC.." &&
+	my_match_and_clean
+'
+
+# If a submodule has a `sub/.git/` directory (rather than a file
+# pointing to the super's `.git/modules/sub`) and `core.fsmonitor`
+# turned on in the submodule and the daemon is not yet started in
+# the submodule, and someone does a `git submodule absorbgitdirs`
+# in the super, Git will recursively invoke `git submodule--helper`
+# to do the work and this may try to read the index.  This will
+# try to start the daemon in the submodule *and* pass (either
+# directly or via inheritance) the `--super-prefix` arg to the
+# `git fsmonitor--daemon start` command inside the submodule.
+# This causes a warning because fsmonitor--daemon does take that
+# global arg (see the table in git.c)
+#
+# This causes a warning when trying to start the daemon that is
+# somewhat confusing.  It does not seem to hurt anything because
+# the fsmonitor code maps the query failure into a trivial response
+# and does the work anyway.
+#
+# It would be nice to silence the warning, however.
+
+have_t2_error_event () {
+	log=$1
+	msg="fsmonitor--daemon doesnQt support --super-prefix" &&
+
+	tr '\047' Q <$1 | grep -e "$msg"
+}
+
+test_expect_success "stray submodule super-prefix warning" '
+	test_when_finished "rm -rf super; \
+			    rm -rf sub;   \
+			    rm super-sub.trace" &&
+
+	create_super super &&
+	create_sub sub &&
+
+	# Copy rather than submodule add so that we get a .git dir.
+	cp -R ./sub ./super/dir_1/dir_2/sub &&
+
+	git -C super/dir_1/dir_2/sub config core.fsmonitor true &&
+
+	git -C super submodule add ../sub ./dir_1/dir_2/sub &&
+	git -C super commit -m "add sub" &&
+
+	test_path_is_dir super/dir_1/dir_2/sub/.git &&
+
+	GIT_TRACE2_EVENT="$PWD/super-sub.trace" \
+		git -C super submodule absorbgitdirs &&
+
+	! have_t2_error_event super-sub.trace
+'
+
+# On a case-insensitive file system, confirm that the daemon
+# notices when the .git directory is moved/renamed/deleted
+# regardless of how it is spelled in the the FS event.
+# That is, does the FS event receive the spelling of the
+# operation or does it receive the spelling preserved with
+# the file/directory.
+#
+test_expect_success CASE_INSENSITIVE_FS 'case insensitive+preserving' '
+#	test_when_finished "stop_daemon_delete_repo test_insensitive" &&
+
+	git init test_insensitive &&
+
+	start_daemon -C test_insensitive --tf "$PWD/insensitive.trace" &&
+
+	mkdir -p test_insensitive/abc/def &&
+	echo xyz >test_insensitive/ABC/DEF/xyz &&
+
+	test_path_is_dir test_insensitive/.git &&
+	test_path_is_dir test_insensitive/.GIT &&
+
+	# Rename .git using an alternate spelling to verify that that
+	# daemon detects it and automatically shuts down.
+	mv test_insensitive/.GIT test_insensitive/.FOO &&
+
+	# See [1] above.
+	mv test_insensitive/.FOO test_insensitive/.git &&
+
+	verify_implicit_shutdown test_insensitive &&
+
+	# Verify that events were reported using on-disk spellings of the
+	# directories and files that we touched.  We may or may not get a
+	# trailing slash on modified directories.
+	#
+	egrep "^event: abc/?$"       ./insensitive.trace &&
+	egrep "^event: abc/def/?$"   ./insensitive.trace &&
+	egrep "^event: abc/def/xyz$" ./insensitive.trace
+'
+
+# The variable "unicode_debug" is defined in the following library
+# script to dump information about how the (OS, FS) handles Unicode
+# composition.  Uncomment the following line if you want to enable it.
+#
+# unicode_debug=true
+
+. "$TEST_DIRECTORY/lib-unicode-nfc-nfd.sh"
+
+# See if the OS or filesystem does NFC/NFD aliasing/munging.
+#
+# The daemon should err on the side of caution and send BOTH the
+# NFC and NFD forms.  It does not know the original spelling of
+# the pathname (how the user thinks it should be spelled), so
+# emit both and let the client decide (when necessary).  This is
+# similar to "core.precomposeUnicode".
+#
+test_expect_success !UNICODE_COMPOSITION_SENSITIVE 'Unicode nfc/nfd' '
+	test_when_finished "stop_daemon_delete_repo test_unicode" &&
+
+	git init test_unicode &&
+
+	start_daemon -C test_unicode --tf "$PWD/unicode.trace" &&
+
+	# Create a directory using an NFC spelling.
+	#
+	mkdir test_unicode/nfc &&
+	mkdir test_unicode/nfc/c_${utf8_nfc} &&
+
+	# Create a directory using an NFD spelling.
+	#
+	mkdir test_unicode/nfd &&
+	mkdir test_unicode/nfd/d_${utf8_nfd} &&
+
+	git -C test_unicode fsmonitor--daemon stop &&
+
+	if test_have_prereq UNICODE_NFC_PRESERVED
+	then
+		# We should have seen NFC event from OS.
+		# We should not have synthesized an NFD event.
+		egrep    "^event: nfc/c_${utf8_nfc}/?$" ./unicode.trace &&
+		egrep -v "^event: nfc/c_${utf8_nfd}/?$" ./unicode.trace
+	else
+		# We should have seen NFD event from OS.
+		# We should have synthesized an NFC event.
+		egrep "^event: nfc/c_${utf8_nfd}/?$" ./unicode.trace &&
+		egrep "^event: nfc/c_${utf8_nfc}/?$" ./unicode.trace
+	fi &&
+
+	# We assume UNICODE_NFD_PRESERVED.
+	# We should have seen explicit NFD from OS.
+	# We should have synthesized an NFC event.
+	egrep "^event: nfd/d_${utf8_nfd}/?$" ./unicode.trace &&
+	egrep "^event: nfd/d_${utf8_nfc}/?$" ./unicode.trace
+'
+
 test_done
diff --git a/t/t7600-merge.sh b/t/t7600-merge.sh
index f0f6fda150..7c3f6ed994 100755
--- a/t/t7600-merge.sh
+++ b/t/t7600-merge.sh
@@ -255,6 +255,15 @@ test_expect_success 'merge --squash c3 with c7' '
 	test_cmp expect actual
 '
 
+test_expect_success 'merge --squash --autostash conflict does not attempt to apply autostash' '
+	git reset --hard c3 &&
+	>unrelated &&
+	git add unrelated &&
+	test_must_fail git merge --squash c7 --autostash >out 2>err &&
+	! grep "Applying autostash resulted in conflicts." err &&
+	grep "When finished, apply stashed changes with \`git stash pop\`" out
+'
+
 test_expect_success 'merge c3 with c7 with commit.cleanup = scissors' '
 	git config commit.cleanup scissors &&
 	git reset --hard c3 &&
diff --git a/t/t7609-mergetool--lib.sh b/t/t7609-mergetool--lib.sh
new file mode 100755
index 0000000000..330d6d603d
--- /dev/null
+++ b/t/t7609-mergetool--lib.sh
@@ -0,0 +1,14 @@
+#!/bin/sh
+
+test_description='git mergetool
+
+Testing basic merge tools options'
+
+. ./test-lib.sh
+
+test_expect_success 'mergetool --tool=vimdiff creates the expected layout' '
+	. "$GIT_BUILD_DIR"/mergetools/vimdiff &&
+	run_unit_tests
+'
+
+test_done
diff --git a/t/t7702-repack-cyclic-alternate.sh b/t/t7702-repack-cyclic-alternate.sh
index 93b74867ac..f3cdb98eec 100755
--- a/t/t7702-repack-cyclic-alternate.sh
+++ b/t/t7702-repack-cyclic-alternate.sh
@@ -4,6 +4,8 @@
 #
 
 test_description='repack involving cyclic alternate'
+
+TEST_PASSES_SANITIZE_LEAK=true
 . ./test-lib.sh
 
 test_expect_success setup '
diff --git a/t/t7703-repack-geometric.sh b/t/t7703-repack-geometric.sh
index bdbbcbf1ec..da87f8b2d8 100755
--- a/t/t7703-repack-geometric.sh
+++ b/t/t7703-repack-geometric.sh
@@ -7,6 +7,7 @@ test_description='git repack --geometric works correctly'
 GIT_TEST_MULTI_PACK_INDEX=0
 
 objdir=.git/objects
+packdir=$objdir/pack
 midx=$objdir/pack/multi-pack-index
 
 test_expect_success '--geometric with no packs' '
@@ -180,6 +181,34 @@ test_expect_success '--geometric ignores kept packs' '
 	)
 '
 
+test_expect_success '--geometric ignores --keep-pack packs' '
+	git init geometric &&
+	test_when_finished "rm -fr geometric" &&
+	(
+		cd geometric &&
+
+		# Create two equal-sized packs
+		test_commit kept && # 3 objects
+		git repack -d &&
+		test_commit pack && # 3 objects
+		git repack -d &&
+
+		find $objdir/pack -type f -name "*.pack" | sort >packs.before &&
+		git repack --geometric 2 -dm \
+			--keep-pack="$(basename "$(head -n 1 packs.before)")" >out &&
+		find $objdir/pack -type f -name "*.pack" | sort >packs.after &&
+
+		# Packs should not have changed (only one non-kept pack, no
+		# loose objects), but $midx should now exist.
+		grep "Nothing new to pack" out &&
+		test_path_is_file $midx &&
+
+		test_cmp packs.before packs.after &&
+
+		git fsck
+	)
+'
+
 test_expect_success '--geometric chooses largest MIDX preferred pack' '
 	git init geometric &&
 	test_when_finished "rm -fr geometric" &&
@@ -202,4 +231,50 @@ test_expect_success '--geometric chooses largest MIDX preferred pack' '
 	)
 '
 
+test_expect_success '--geometric with pack.packSizeLimit' '
+	git init pack-rewrite &&
+	test_when_finished "rm -fr pack-rewrite" &&
+	(
+		cd pack-rewrite &&
+
+		test-tool genrandom foo 1048576 >foo &&
+		test-tool genrandom bar 1048576 >bar &&
+
+		git add foo bar &&
+		test_tick &&
+		git commit -m base &&
+
+		git rev-parse HEAD:foo HEAD:bar >p1.objects &&
+		git rev-parse HEAD HEAD^{tree} >p2.objects &&
+
+		# These two packs each contain two objects, so the following
+		# `--geometric` repack will try to combine them.
+		p1="$(git pack-objects $packdir/pack <p1.objects)" &&
+		p2="$(git pack-objects $packdir/pack <p2.objects)" &&
+
+		# Remove any loose objects in packs, since we do not want extra
+		# copies around (which would mask over potential object
+		# corruption issues).
+		git prune-packed &&
+
+		# Both p1 and p2 will be rolled up, but pack-objects will write
+		# three packs:
+		#
+		#   - one containing object "foo",
+		#   - another containing object "bar",
+		#   - a final pack containing the commit and tree objects
+		#     (identical to p2 above)
+		git repack --geometric 2 -d --max-pack-size=1048576 &&
+
+		# Ensure `repack` can detect that the third pack it wrote
+		# (containing just the tree and commit objects) was identical to
+		# one that was below the geometric split, so that we can save it
+		# from deletion.
+		#
+		# If `repack` fails to do that, we will incorrectly delete p2,
+		# causing object corruption.
+		git fsck
+	)
+'
+
 test_done
diff --git a/t/t7812-grep-icase-non-ascii.sh b/t/t7812-grep-icase-non-ascii.sh
index 9047d665a1..ac7be54714 100755
--- a/t/t7812-grep-icase-non-ascii.sh
+++ b/t/t7812-grep-icase-non-ascii.sh
@@ -4,6 +4,10 @@ test_description='grep icase on non-English locales'
 
 . ./lib-gettext.sh
 
+doalarm () {
+	perl -e 'alarm shift; exec @ARGV' -- "$@"
+}
+
 test_expect_success GETTEXT_LOCALE 'setup' '
 	test_write_lines "TILRAUN: Halló Heimur!" >file &&
 	git add file &&
@@ -139,4 +143,10 @@ test_expect_success GETTEXT_LOCALE,LIBPCRE2 'PCRE v2: grep non-literal ASCII fro
 	test_cmp expected actual
 '
 
+test_expect_success GETTEXT_LOCALE,LIBPCRE2 'PCRE v2: grep avoid endless loop bug' '
+	echo " Halló" >leading-whitespace &&
+	git add leading-whitespace &&
+	doalarm 1 git grep --perl-regexp "^\s" leading-whitespace
+'
+
 test_done
diff --git a/t/t9001-send-email.sh b/t/t9001-send-email.sh
index 42694fe584..01c74b8b07 100755
--- a/t/t9001-send-email.sh
+++ b/t/t9001-send-email.sh
@@ -4,6 +4,7 @@ test_description='git send-email'
 GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
 export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
 
+TEST_PASSES_SANITIZE_LEAK=true
 . ./test-lib.sh
 
 # May be altered later in the test
diff --git a/t/t9100-git-svn-basic.sh b/t/t9100-git-svn-basic.sh
index fea41b3c36..7c5b847f58 100755
--- a/t/t9100-git-svn-basic.sh
+++ b/t/t9100-git-svn-basic.sh
@@ -8,6 +8,7 @@ test_description='git svn basic tests'
 GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
 export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
 
+TEST_FAILS_SANITIZE_LEAK=true
 . ./lib-git-svn.sh
 
 prepare_utf8_locale
diff --git a/t/t9101-git-svn-props.sh b/t/t9101-git-svn-props.sh
index 8b5681dd68..d043e80fc3 100755
--- a/t/t9101-git-svn-props.sh
+++ b/t/t9101-git-svn-props.sh
@@ -4,6 +4,8 @@
 #
 
 test_description='git svn property tests'
+
+TEST_FAILS_SANITIZE_LEAK=true
 . ./lib-git-svn.sh
 
 mkdir import
diff --git a/t/t9104-git-svn-follow-parent.sh b/t/t9104-git-svn-follow-parent.sh
index c7d8e0bf00..5cf2ef4b8b 100755
--- a/t/t9104-git-svn-follow-parent.sh
+++ b/t/t9104-git-svn-follow-parent.sh
@@ -4,6 +4,8 @@
 #
 
 test_description='git svn fetching'
+
+TEST_FAILS_SANITIZE_LEAK=true
 . ./lib-git-svn.sh
 
 test_expect_success 'initialize repo' '
diff --git a/t/t9106-git-svn-commit-diff-clobber.sh b/t/t9106-git-svn-commit-diff-clobber.sh
index aec45bca3b..3cab0b9720 100755
--- a/t/t9106-git-svn-commit-diff-clobber.sh
+++ b/t/t9106-git-svn-commit-diff-clobber.sh
@@ -2,6 +2,8 @@
 #
 # Copyright (c) 2006 Eric Wong
 test_description='git svn commit-diff clobber'
+
+TEST_FAILS_SANITIZE_LEAK=true
 . ./lib-git-svn.sh
 
 test_expect_success 'initialize repo' '
diff --git a/t/t9115-git-svn-dcommit-funky-renames.sh b/t/t9115-git-svn-dcommit-funky-renames.sh
index 743fbe1fe4..419f055721 100755
--- a/t/t9115-git-svn-dcommit-funky-renames.sh
+++ b/t/t9115-git-svn-dcommit-funky-renames.sh
@@ -5,6 +5,7 @@
 
 test_description='git svn dcommit can commit renames of files with ugly names'
 
+TEST_FAILS_SANITIZE_LEAK=true
 . ./lib-git-svn.sh
 
 test_expect_success 'load repository with strange names' '
diff --git a/t/t9116-git-svn-log.sh b/t/t9116-git-svn-log.sh
index 0a9f1ef366..d74d7b2de6 100755
--- a/t/t9116-git-svn-log.sh
+++ b/t/t9116-git-svn-log.sh
@@ -4,6 +4,7 @@
 #
 
 test_description='git svn log tests'
+
 . ./lib-git-svn.sh
 
 test_expect_success 'setup repository and import' '
diff --git a/t/t9122-git-svn-author.sh b/t/t9122-git-svn-author.sh
index 9e8fe38e7e..527ba3d293 100755
--- a/t/t9122-git-svn-author.sh
+++ b/t/t9122-git-svn-author.sh
@@ -1,6 +1,8 @@
 #!/bin/sh
 
 test_description='git svn authorship'
+
+TEST_FAILS_SANITIZE_LEAK=true
 . ./lib-git-svn.sh
 
 test_expect_success 'setup svn repository' '
diff --git a/t/t9127-git-svn-partial-rebuild.sh b/t/t9127-git-svn-partial-rebuild.sh
index 2e4789d061..97f495bd49 100755
--- a/t/t9127-git-svn-partial-rebuild.sh
+++ b/t/t9127-git-svn-partial-rebuild.sh
@@ -4,6 +4,7 @@
 #
 
 test_description='git svn partial-rebuild tests'
+
 . ./lib-git-svn.sh
 
 test_expect_success 'initialize svnrepo' '
diff --git a/t/t9129-git-svn-i18n-commitencoding.sh b/t/t9129-git-svn-i18n-commitencoding.sh
index 01e1e8a8f7..185248a4cd 100755
--- a/t/t9129-git-svn-i18n-commitencoding.sh
+++ b/t/t9129-git-svn-i18n-commitencoding.sh
@@ -4,6 +4,7 @@
 
 test_description='git svn honors i18n.commitEncoding in config'
 
+TEST_FAILS_SANITIZE_LEAK=true
 . ./lib-git-svn.sh
 
 compare_git_head_with () {
diff --git a/t/t9132-git-svn-broken-symlink.sh b/t/t9132-git-svn-broken-symlink.sh
index aeceffaf7b..4d8d0584b7 100755
--- a/t/t9132-git-svn-broken-symlink.sh
+++ b/t/t9132-git-svn-broken-symlink.sh
@@ -2,6 +2,7 @@
 
 test_description='test that git handles an svn repository with empty symlinks'
 
+TEST_FAILS_SANITIZE_LEAK=true
 . ./lib-git-svn.sh
 test_expect_success 'load svn dumpfile' '
 	svnadmin load "$rawsvnrepo" <<EOF
diff --git a/t/t9139-git-svn-non-utf8-commitencoding.sh b/t/t9139-git-svn-non-utf8-commitencoding.sh
index 22d80b0be2..b7f756b2b7 100755
--- a/t/t9139-git-svn-non-utf8-commitencoding.sh
+++ b/t/t9139-git-svn-non-utf8-commitencoding.sh
@@ -4,6 +4,7 @@
 
 test_description='git svn refuses to dcommit non-UTF8 messages'
 
+TEST_FAILS_SANITIZE_LEAK=true
 . ./lib-git-svn.sh
 
 # ISO-2022-JP can pass for valid UTF-8, so skipping that in this test
diff --git a/t/t9146-git-svn-empty-dirs.sh b/t/t9146-git-svn-empty-dirs.sh
index 80cb55fee7..79c26ed69c 100755
--- a/t/t9146-git-svn-empty-dirs.sh
+++ b/t/t9146-git-svn-empty-dirs.sh
@@ -3,6 +3,8 @@
 # Copyright (c) 2009 Eric Wong
 
 test_description='git svn creates empty directories'
+
+TEST_FAILS_SANITIZE_LEAK=true
 . ./lib-git-svn.sh
 
 test_expect_success 'initialize repo' '
diff --git a/t/t9148-git-svn-propset.sh b/t/t9148-git-svn-propset.sh
index aebb28995e..6cc76a07b3 100755
--- a/t/t9148-git-svn-propset.sh
+++ b/t/t9148-git-svn-propset.sh
@@ -5,6 +5,7 @@
 
 test_description='git svn propset tests'
 
+TEST_FAILS_SANITIZE_LEAK=true
 . ./lib-git-svn.sh
 
 test_expect_success 'setup propset via import' '
diff --git a/t/t9160-git-svn-preserve-empty-dirs.sh b/t/t9160-git-svn-preserve-empty-dirs.sh
index 36c6b1a12f..9cf7a1427a 100755
--- a/t/t9160-git-svn-preserve-empty-dirs.sh
+++ b/t/t9160-git-svn-preserve-empty-dirs.sh
@@ -9,6 +9,7 @@ This test uses git to clone a Subversion repository that contains empty
 directories, and checks that corresponding directories are created in the
 local Git repository with placeholder files.'
 
+TEST_FAILS_SANITIZE_LEAK=true
 . ./lib-git-svn.sh
 
 GIT_REPO=git-svn-repo
diff --git a/t/t9162-git-svn-dcommit-interactive.sh b/t/t9162-git-svn-dcommit-interactive.sh
index e38d9fa37b..e2aa8ed88a 100755
--- a/t/t9162-git-svn-dcommit-interactive.sh
+++ b/t/t9162-git-svn-dcommit-interactive.sh
@@ -3,6 +3,8 @@
 # Copyright (c) 2011 Frédéric Heitzmann
 
 test_description='git svn dcommit --interactive series'
+
+TEST_FAILS_SANITIZE_LEAK=true
 . ./lib-git-svn.sh
 
 test_expect_success 'initialize repo' '
diff --git a/t/t9164-git-svn-dcommit-concurrent.sh b/t/t9164-git-svn-dcommit-concurrent.sh
index 8466269bf5..1465156072 100755
--- a/t/t9164-git-svn-dcommit-concurrent.sh
+++ b/t/t9164-git-svn-dcommit-concurrent.sh
@@ -4,6 +4,8 @@
 #
 
 test_description='concurrent git svn dcommit'
+
+TEST_FAILS_SANITIZE_LEAK=true
 . ./lib-git-svn.sh
 
 
diff --git a/t/t9400-git-cvsserver-server.sh b/t/t9400-git-cvsserver-server.sh
index 210ddf09e3..379b19f2f8 100755
--- a/t/t9400-git-cvsserver-server.sh
+++ b/t/t9400-git-cvsserver-server.sh
@@ -221,7 +221,7 @@ test_expect_success 'req_Root (export-all)' \
   'cat request-anonymous | git-cvsserver --export-all pserver "$WORKDIR" >log 2>&1 &&
    sed -ne \$p log | grep "^I LOVE YOU\$"'
 
-test_expect_success 'req_Root failure (export-all w/o whitelist)' \
+test_expect_success 'req_Root failure (export-all w/o directory list)' \
   '! (cat request-anonymous | git-cvsserver --export-all pserver >log 2>&1 || false)'
 
 test_expect_success 'req_Root (everything together)' \
diff --git a/t/t9501-gitweb-standalone-http-status.sh b/t/t9501-gitweb-standalone-http-status.sh
index 32814e75df..c900231079 100755
--- a/t/t9501-gitweb-standalone-http-status.sh
+++ b/t/t9501-gitweb-standalone-http-status.sh
@@ -13,6 +13,7 @@ code and message.'
 GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
 export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
 
+TEST_PASSES_SANITIZE_LEAK=true
 . ./lib-gitweb.sh
 
 #
diff --git a/t/t9502-gitweb-standalone-parse-output.sh b/t/t9502-gitweb-standalone-parse-output.sh
index 8cb582f0e6..81d5625557 100755
--- a/t/t9502-gitweb-standalone-parse-output.sh
+++ b/t/t9502-gitweb-standalone-parse-output.sh
@@ -220,4 +220,18 @@ test_expect_success 'no http-equiv="content-type" in XHTML' '
 	no_http_equiv_content_type "p=.git;a=tree"
 '
 
+proper_doctype() {
+	gitweb_run "$@" &&
+	grep -F "<!DOCTYPE html [" gitweb.body &&
+	grep "<!ENTITY nbsp" gitweb.body &&
+	grep "<!ENTITY sdot" gitweb.body
+}
+
+test_expect_success 'Proper DOCTYPE with entity declarations' '
+	proper_doctype &&
+	proper_doctype "p=.git" &&
+	proper_doctype "p=.git;a=log" &&
+	proper_doctype "p=.git;a=tree"
+'
+
 test_done
diff --git a/t/t9800-git-p4-basic.sh b/t/t9800-git-p4-basic.sh
index 8b30062c0c..dc88d0e064 100755
--- a/t/t9800-git-p4-basic.sh
+++ b/t/t9800-git-p4-basic.sh
@@ -74,6 +74,91 @@ test_expect_success 'git p4 sync new branch' '
 	)
 '
 
+#
+# Setup as before, and then explicitly sync imported branch, using a
+# different ref format.
+#
+test_expect_success 'git p4 sync existing branch without changes' '
+	test_create_repo "$git" &&
+	test_when_finished cleanup_git &&
+	(
+		cd "$git" &&
+		test_commit head &&
+		git p4 sync --branch=depot //depot@all &&
+		git p4 sync --branch=refs/remotes/p4/depot >out &&
+		test_i18ngrep "No changes to import!" out
+	)
+'
+
+#
+# Same as before, relative branch name.
+#
+test_expect_success 'git p4 sync existing branch with relative name' '
+	test_create_repo "$git" &&
+	test_when_finished cleanup_git &&
+	(
+		cd "$git" &&
+		test_commit head &&
+		git p4 sync --branch=branch1 //depot@all &&
+		git p4 sync --branch=p4/branch1 >out &&
+		test_i18ngrep "No changes to import!" out
+	)
+'
+
+#
+# Same as before, with a nested branch path, referenced different ways.
+#
+test_expect_success 'git p4 sync existing branch with nested path' '
+	test_create_repo "$git" &&
+	test_when_finished cleanup_git &&
+	(
+		cd "$git" &&
+		test_commit head &&
+		git p4 sync --branch=p4/some/path //depot@all &&
+		git p4 sync --branch=some/path >out &&
+		test_i18ngrep "No changes to import!" out
+	)
+'
+
+#
+# Same as before, with a full ref path outside the p4/* namespace.
+#
+test_expect_success 'git p4 sync branch explicit ref without p4 in path' '
+	test_create_repo "$git" &&
+	test_when_finished cleanup_git &&
+	(
+		cd "$git" &&
+		test_commit head &&
+		git p4 sync --branch=refs/remotes/someremote/depot //depot@all &&
+		git p4 sync --branch=refs/remotes/someremote/depot >out &&
+		test_i18ngrep "No changes to import!" out
+	)
+'
+
+test_expect_success 'git p4 sync nonexistent ref' '
+	test_create_repo "$git" &&
+	test_when_finished cleanup_git &&
+	(
+		cd "$git" &&
+		test_commit head &&
+		git p4 sync --branch=depot //depot@all &&
+		test_must_fail git p4 sync --branch=depot2 2>errs &&
+		test_i18ngrep "Perhaps you never did" errs
+	)
+'
+
+test_expect_success 'git p4 sync existing non-p4-imported ref' '
+	test_create_repo "$git" &&
+	test_when_finished cleanup_git &&
+	(
+		cd "$git" &&
+		test_commit head &&
+		git p4 sync --branch=depot //depot@all &&
+		test_must_fail git p4 sync --branch=refs/heads/master 2>errs &&
+		test_i18ngrep "Perhaps you never did" errs
+	)
+'
+
 test_expect_success 'clone two dirs' '
 	(
 		cd "$cli" &&
diff --git a/t/t9801-git-p4-branch.sh b/t/t9801-git-p4-branch.sh
index 50a6f8bad5..759a14fa87 100755
--- a/t/t9801-git-p4-branch.sh
+++ b/t/t9801-git-p4-branch.sh
@@ -129,6 +129,16 @@ test_expect_success 'import depot, branch detection' '
 	)
 '
 
+test_expect_success 'sync specific detected branch' '
+	test_when_finished cleanup_git &&
+	git p4 clone --dest="$git" --detect-branches //depot@all &&
+	(
+		cd "$git" &&
+		git p4 sync --branch=depot/branch2 >out &&
+		test_i18ngrep "No changes to import!" out
+	)
+'
+
 test_expect_success 'import depot, branch detection, branchList branch definition' '
 	test_when_finished cleanup_git &&
 	test_create_repo "$git" &&
diff --git a/t/t9802-git-p4-filetype.sh b/t/t9802-git-p4-filetype.sh
index 19073c6e9f..2a6ee2a467 100755
--- a/t/t9802-git-p4-filetype.sh
+++ b/t/t9802-git-p4-filetype.sh
@@ -333,4 +333,38 @@ test_expect_success SYMLINKS 'empty symlink target' '
 	)
 '
 
+test_expect_success SYMLINKS 'utf-8 with and without BOM in text file' '
+	(
+		cd "$cli" &&
+
+		# some utf8 content
+		echo some tǣxt >utf8-nobom-test &&
+
+		# same utf8 content as before but with bom
+		echo some tǣxt | sed '\''s/^/\xef\xbb\xbf/'\'' >utf8-bom-test &&
+
+		# bom only
+		dd bs=1 count=3 if=utf8-bom-test of=utf8-bom-empty-test &&
+
+		p4 add utf8-nobom-test utf8-bom-test utf8-bom-empty-test &&
+		p4 submit -d "add utf8 test files"
+	) &&
+	test_when_finished cleanup_git &&
+
+	git p4 clone --dest="$git" //depot@all &&
+	(
+		cd "$git" &&
+		git checkout refs/remotes/p4/master &&
+
+		echo some tǣxt >utf8-nobom-check &&
+		test_cmp utf8-nobom-check utf8-nobom-test &&
+
+		echo some tǣxt | sed '\''s/^/\xef\xbb\xbf/'\'' >utf8-bom-check &&
+		test_cmp utf8-bom-check utf8-bom-test &&
+
+		dd bs=1 count=3 if=utf8-bom-check of=utf8-bom-empty-check &&
+		test_cmp utf8-bom-empty-check utf8-bom-empty-test
+	)
+'
+
 test_done
diff --git a/t/t9835-git-p4-metadata-encoding-python2.sh b/t/t9835-git-p4-metadata-encoding-python2.sh
new file mode 100755
index 0000000000..036bf79c66
--- /dev/null
+++ b/t/t9835-git-p4-metadata-encoding-python2.sh
@@ -0,0 +1,213 @@
+#!/bin/sh
+
+test_description='git p4 metadata encoding
+
+This test checks that the import process handles inconsistent text
+encoding in p4 metadata (author names, commit messages, etc) without
+failing, and produces maximally sane output in git.'
+
+. ./lib-git-p4.sh
+
+python_target_version='2'
+
+###############################
+## SECTION REPEATED IN t9836 ##
+###############################
+
+# Please note: this test calls "git-p4.py" rather than "git-p4", because the
+# latter references a specific path so we can't easily force it to run under
+# the python version we need to.
+
+python_major_version=$(python -V 2>&1 | cut -c  8)
+python_target_binary=$(which python$python_target_version)
+if ! test "$python_major_version" = "$python_target_version" && test "$python_target_binary"
+then
+	mkdir temp_python
+	PATH="$(pwd)/temp_python:$PATH" && export PATH
+	ln -s $python_target_binary temp_python/python
+fi
+
+python_major_version=$(python -V 2>&1 | cut -c  8)
+if ! test "$python_major_version" = "$python_target_version"
+then
+	skip_all="skipping python$python_target_version-specific git p4 tests; python$python_target_version not available"
+	test_done
+fi
+
+remove_user_cache () {
+	rm "$HOME/.gitp4-usercache.txt" || true
+}
+
+test_expect_success 'start p4d' '
+	start_p4d
+'
+
+test_expect_success 'init depot' '
+	(
+		cd "$cli" &&
+
+		p4_add_user "utf8_author" "ǣuthor" &&
+		P4USER=utf8_author &&
+		touch file1 &&
+		p4 add file1 &&
+		p4 submit -d "first CL has some utf-8 tǣxt" &&
+
+		p4_add_user "latin1_author" "$(echo æuthor |
+			iconv -f utf8 -t latin1)" &&
+		P4USER=latin1_author &&
+		touch file2 &&
+		p4 add file2 &&
+		p4 submit -d "$(echo second CL has some latin-1 tæxt |
+			iconv -f utf8 -t latin1)" &&
+
+		p4_add_user "cp1252_author" "$(echo æuthœr |
+			iconv -f utf8 -t cp1252)" &&
+		P4USER=cp1252_author &&
+		touch file3 &&
+		p4 add file3 &&
+		p4 submit -d "$(echo third CL has sœme cp-1252 tæxt |
+		  iconv -f utf8 -t cp1252)" &&
+
+		p4_add_user "cp850_author" "$(echo Åuthor |
+			iconv -f utf8 -t cp850)" &&
+		P4USER=cp850_author &&
+		touch file4 &&
+		p4 add file4 &&
+		p4 submit -d "$(echo fourth CL hÅs some cp850 text |
+			iconv -f utf8 -t cp850)"
+	)
+'
+
+test_expect_success 'clone non-utf8 repo with strict encoding' '
+	test_when_finished cleanup_git &&
+	test_when_finished remove_user_cache &&
+	test_must_fail git -c git-p4.metadataDecodingStrategy=strict p4.py clone --dest="$git" //depot@all 2>err &&
+	grep "Decoding perforce metadata failed!" err
+'
+
+test_expect_success 'check utf-8 contents with passthrough strategy' '
+	test_when_finished cleanup_git &&
+	test_when_finished remove_user_cache &&
+	git -c git-p4.metadataDecodingStrategy=passthrough p4.py clone --dest="$git" //depot@all &&
+	(
+		cd "$git" &&
+		git log >actual &&
+		grep "some utf-8 tǣxt" actual &&
+		grep "ǣuthor" actual
+	)
+'
+
+test_expect_success 'check latin-1 contents corrupted in git with passthrough strategy' '
+	test_when_finished cleanup_git &&
+	test_when_finished remove_user_cache &&
+	git -c git-p4.metadataDecodingStrategy=passthrough p4.py clone --dest="$git" //depot@all &&
+	(
+		cd "$git" &&
+		git log >actual &&
+		badly_encoded_in_git=$(echo "some latin-1 tæxt" | iconv -f utf8 -t latin1) &&
+		grep "$badly_encoded_in_git" actual &&
+		bad_author_in_git="$(echo æuthor | iconv -f utf8 -t latin1)" &&
+		grep "$bad_author_in_git" actual
+	)
+'
+
+test_expect_success 'check utf-8 contents with fallback strategy' '
+	test_when_finished cleanup_git &&
+	test_when_finished remove_user_cache &&
+	git -c git-p4.metadataDecodingStrategy=fallback p4.py clone --dest="$git" //depot@all &&
+	(
+		cd "$git" &&
+		git log >actual &&
+		grep "some utf-8 tǣxt" actual &&
+		grep "ǣuthor" actual
+	)
+'
+
+test_expect_success 'check latin-1 contents with fallback strategy' '
+	test_when_finished cleanup_git &&
+	test_when_finished remove_user_cache &&
+	git -c git-p4.metadataDecodingStrategy=fallback p4.py clone --dest="$git" //depot@all &&
+	(
+		cd "$git" &&
+		git log >actual &&
+		grep "some latin-1 tæxt" actual &&
+		grep "æuthor" actual
+	)
+'
+
+test_expect_success 'check cp-1252 contents with fallback strategy' '
+	test_when_finished cleanup_git &&
+	test_when_finished remove_user_cache &&
+	git -c git-p4.metadataDecodingStrategy=fallback p4.py clone --dest="$git" //depot@all &&
+	(
+		cd "$git" &&
+		git log >actual &&
+		grep "sœme cp-1252 tæxt" actual &&
+		grep "æuthœr" actual
+	)
+'
+
+test_expect_success 'check cp850 contents parsed with correct fallback' '
+	test_when_finished cleanup_git &&
+	test_when_finished remove_user_cache &&
+	git -c git-p4.metadataDecodingStrategy=fallback -c git-p4.metadataFallbackEncoding=cp850 p4.py clone --dest="$git" //depot@all &&
+	(
+		cd "$git" &&
+		git log >actual &&
+		grep "hÅs some cp850 text" actual &&
+		grep "Åuthor" actual
+	)
+'
+
+test_expect_success 'check cp850-only contents escaped when cp1252 is fallback' '
+	test_when_finished cleanup_git &&
+	test_when_finished remove_user_cache &&
+	git -c git-p4.metadataDecodingStrategy=fallback p4.py clone --dest="$git" //depot@all &&
+	(
+		cd "$git" &&
+		git log >actual &&
+		grep "h%8Fs some cp850 text" actual &&
+		grep "%8Futhor" actual
+	)
+'
+
+test_expect_success 'check cp-1252 contents on later sync after clone with fallback strategy' '
+	test_when_finished cleanup_git &&
+	test_when_finished remove_user_cache &&
+	git -c git-p4.metadataDecodingStrategy=fallback p4.py clone --dest="$git" //depot@all &&
+	(
+		cd "$cli" &&
+		P4USER=cp1252_author &&
+		touch file10 &&
+		p4 add file10 &&
+		p4 submit -d "$(echo later CL has sœme more cp-1252 tæxt |
+			iconv -f utf8 -t cp1252)"
+	) &&
+	(
+		cd "$git" &&
+
+		git p4.py sync --branch=master &&
+
+		git log p4/master >actual &&
+		grep "sœme more cp-1252 tæxt" actual &&
+		grep "æuthœr" actual
+	)
+'
+
+############################
+## / END REPEATED SECTION ##
+############################
+
+test_expect_success 'passthrough (latin-1 contents corrupted in git) is the default with python2' '
+	test_when_finished cleanup_git &&
+	test_when_finished remove_user_cache &&
+	git -c git-p4.metadataDecodingStrategy=passthrough p4.py clone --dest="$git" //depot@all &&
+	(
+		cd "$git" &&
+		git log >actual &&
+		badly_encoded_in_git=$(echo "some latin-1 tæxt" | iconv -f utf8 -t latin1) &&
+		grep "$badly_encoded_in_git" actual
+	)
+'
+
+test_done
diff --git a/t/t9836-git-p4-metadata-encoding-python3.sh b/t/t9836-git-p4-metadata-encoding-python3.sh
new file mode 100755
index 0000000000..63350dc4b5
--- /dev/null
+++ b/t/t9836-git-p4-metadata-encoding-python3.sh
@@ -0,0 +1,214 @@
+#!/bin/sh
+
+test_description='git p4 metadata encoding
+
+This test checks that the import process handles inconsistent text
+encoding in p4 metadata (author names, commit messages, etc) without
+failing, and produces maximally sane output in git.'
+
+. ./lib-git-p4.sh
+
+python_target_version='3'
+
+###############################
+## SECTION REPEATED IN t9835 ##
+###############################
+
+# Please note: this test calls "git-p4.py" rather than "git-p4", because the
+# latter references a specific path so we can't easily force it to run under
+# the python version we need to.
+
+python_major_version=$(python -V 2>&1 | cut -c  8)
+python_target_binary=$(which python$python_target_version)
+if ! test "$python_major_version" = "$python_target_version" && test "$python_target_binary"
+then
+	mkdir temp_python
+	PATH="$(pwd)/temp_python:$PATH" && export PATH
+	ln -s $python_target_binary temp_python/python
+fi
+
+python_major_version=$(python -V 2>&1 | cut -c  8)
+if ! test "$python_major_version" = "$python_target_version"
+then
+	skip_all="skipping python$python_target_version-specific git p4 tests; python$python_target_version not available"
+	test_done
+fi
+
+remove_user_cache () {
+	rm "$HOME/.gitp4-usercache.txt" || true
+}
+
+test_expect_success 'start p4d' '
+	start_p4d
+'
+
+test_expect_success 'init depot' '
+	(
+		cd "$cli" &&
+
+		p4_add_user "utf8_author" "ǣuthor" &&
+		P4USER=utf8_author &&
+		touch file1 &&
+		p4 add file1 &&
+		p4 submit -d "first CL has some utf-8 tǣxt" &&
+
+		p4_add_user "latin1_author" "$(echo æuthor |
+			iconv -f utf8 -t latin1)" &&
+		P4USER=latin1_author &&
+		touch file2 &&
+		p4 add file2 &&
+		p4 submit -d "$(echo second CL has some latin-1 tæxt |
+			iconv -f utf8 -t latin1)" &&
+
+		p4_add_user "cp1252_author" "$(echo æuthœr |
+			iconv -f utf8 -t cp1252)" &&
+		P4USER=cp1252_author &&
+		touch file3 &&
+		p4 add file3 &&
+		p4 submit -d "$(echo third CL has sœme cp-1252 tæxt |
+		  iconv -f utf8 -t cp1252)" &&
+
+		p4_add_user "cp850_author" "$(echo Åuthor |
+			iconv -f utf8 -t cp850)" &&
+		P4USER=cp850_author &&
+		touch file4 &&
+		p4 add file4 &&
+		p4 submit -d "$(echo fourth CL hÅs some cp850 text |
+			iconv -f utf8 -t cp850)"
+	)
+'
+
+test_expect_success 'clone non-utf8 repo with strict encoding' '
+	test_when_finished cleanup_git &&
+	test_when_finished remove_user_cache &&
+	test_must_fail git -c git-p4.metadataDecodingStrategy=strict p4.py clone --dest="$git" //depot@all 2>err &&
+	grep "Decoding perforce metadata failed!" err
+'
+
+test_expect_success 'check utf-8 contents with passthrough strategy' '
+	test_when_finished cleanup_git &&
+	test_when_finished remove_user_cache &&
+	git -c git-p4.metadataDecodingStrategy=passthrough p4.py clone --dest="$git" //depot@all &&
+	(
+		cd "$git" &&
+		git log >actual &&
+		grep "some utf-8 tǣxt" actual &&
+		grep "ǣuthor" actual
+	)
+'
+
+test_expect_success 'check latin-1 contents corrupted in git with passthrough strategy' '
+	test_when_finished cleanup_git &&
+	test_when_finished remove_user_cache &&
+	git -c git-p4.metadataDecodingStrategy=passthrough p4.py clone --dest="$git" //depot@all &&
+	(
+		cd "$git" &&
+		git log >actual &&
+		badly_encoded_in_git=$(echo "some latin-1 tæxt" | iconv -f utf8 -t latin1) &&
+		grep "$badly_encoded_in_git" actual &&
+		bad_author_in_git="$(echo æuthor | iconv -f utf8 -t latin1)" &&
+		grep "$bad_author_in_git" actual
+	)
+'
+
+test_expect_success 'check utf-8 contents with fallback strategy' '
+	test_when_finished cleanup_git &&
+	test_when_finished remove_user_cache &&
+	git -c git-p4.metadataDecodingStrategy=fallback p4.py clone --dest="$git" //depot@all &&
+	(
+		cd "$git" &&
+		git log >actual &&
+		grep "some utf-8 tǣxt" actual &&
+		grep "ǣuthor" actual
+	)
+'
+
+test_expect_success 'check latin-1 contents with fallback strategy' '
+	test_when_finished cleanup_git &&
+	test_when_finished remove_user_cache &&
+	git -c git-p4.metadataDecodingStrategy=fallback p4.py clone --dest="$git" //depot@all &&
+	(
+		cd "$git" &&
+		git log >actual &&
+		grep "some latin-1 tæxt" actual &&
+		grep "æuthor" actual
+	)
+'
+
+test_expect_success 'check cp-1252 contents with fallback strategy' '
+	test_when_finished cleanup_git &&
+	test_when_finished remove_user_cache &&
+	git -c git-p4.metadataDecodingStrategy=fallback p4.py clone --dest="$git" //depot@all &&
+	(
+		cd "$git" &&
+		git log >actual &&
+		grep "sœme cp-1252 tæxt" actual &&
+		grep "æuthœr" actual
+	)
+'
+
+test_expect_success 'check cp850 contents parsed with correct fallback' '
+	test_when_finished cleanup_git &&
+	test_when_finished remove_user_cache &&
+	git -c git-p4.metadataDecodingStrategy=fallback -c git-p4.metadataFallbackEncoding=cp850 p4.py clone --dest="$git" //depot@all &&
+	(
+		cd "$git" &&
+		git log >actual &&
+		grep "hÅs some cp850 text" actual &&
+		grep "Åuthor" actual
+	)
+'
+
+test_expect_success 'check cp850-only contents escaped when cp1252 is fallback' '
+	test_when_finished cleanup_git &&
+	test_when_finished remove_user_cache &&
+	git -c git-p4.metadataDecodingStrategy=fallback p4.py clone --dest="$git" //depot@all &&
+	(
+		cd "$git" &&
+		git log >actual &&
+		grep "h%8Fs some cp850 text" actual &&
+		grep "%8Futhor" actual
+	)
+'
+
+test_expect_success 'check cp-1252 contents on later sync after clone with fallback strategy' '
+	test_when_finished cleanup_git &&
+	test_when_finished remove_user_cache &&
+	git -c git-p4.metadataDecodingStrategy=fallback p4.py clone --dest="$git" //depot@all &&
+	(
+		cd "$cli" &&
+		P4USER=cp1252_author &&
+		touch file10 &&
+		p4 add file10 &&
+		p4 submit -d "$(echo later CL has sœme more cp-1252 tæxt |
+			iconv -f utf8 -t cp1252)"
+	) &&
+	(
+		cd "$git" &&
+
+		git p4.py sync --branch=master &&
+
+		git log p4/master >actual &&
+		grep "sœme more cp-1252 tæxt" actual &&
+		grep "æuthœr" actual
+	)
+'
+
+############################
+## / END REPEATED SECTION ##
+############################
+
+
+test_expect_success 'fallback (both utf-8 and cp-1252 contents handled) is the default with python3' '
+	test_when_finished cleanup_git &&
+	test_when_finished remove_user_cache &&
+	git p4.py clone --dest="$git" //depot@all &&
+	(
+		cd "$git" &&
+		git log >actual &&
+		grep "sœme cp-1252 tæxt" actual &&
+		grep "æuthœr" actual
+	)
+'
+
+test_done
diff --git a/t/t9902-completion.sh b/t/t9902-completion.sh
index 31526e6b64..43de868b80 100755
--- a/t/t9902-completion.sh
+++ b/t/t9902-completion.sh
@@ -2485,6 +2485,13 @@ test_expect_success 'git config - section' '
 	EOF
 '
 
+test_expect_success 'git config - section include, includeIf' '
+	test_completion "git config inclu" <<-\EOF
+	include.Z
+	includeIf.Z
+	EOF
+'
+
 test_expect_success 'git config - variable name' '
 	test_completion "git config log.d" <<-\EOF
 	log.date Z
@@ -2493,6 +2500,12 @@ test_expect_success 'git config - variable name' '
 	EOF
 '
 
+test_expect_success 'git config - variable name include' '
+	test_completion "git config include.p" <<-\EOF
+	include.path Z
+	EOF
+'
+
 test_expect_success 'git config - value' '
 	test_completion "git config color.pager " <<-\EOF
 	false Z
diff --git a/t/t9903-bash-prompt.sh b/t/t9903-bash-prompt.sh
index bbd513bab0..6a30f5719c 100755
--- a/t/t9903-bash-prompt.sh
+++ b/t/t9903-bash-prompt.sh
@@ -590,7 +590,7 @@ test_expect_success 'prompt - bash color pc mode - dirty status indicator - dirt
 '
 
 test_expect_success 'prompt - bash color pc mode - dirty status indicator - dirty index and worktree' '
-	printf "BEFORE: (${c_green}\${__git_ps1_branch_name}${c_clear} ${c_red}*${c_green}+${c_clear}):AFTER\\nmain" >expected &&
+	printf "BEFORE: (${c_green}\${__git_ps1_branch_name}${c_clear} ${c_red}*${c_clear}${c_green}+${c_clear}):AFTER\\nmain" >expected &&
 	echo "dirty index" >file &&
 	test_when_finished "git reset --hard" &&
 	git add -u &&
diff --git a/t/test-lib-functions.sh b/t/test-lib-functions.sh
index 93c03380d4..8c44856eae 100644
--- a/t/test-lib-functions.sh
+++ b/t/test-lib-functions.sh
@@ -651,8 +651,7 @@ test_set_prereq () {
 		# test_unset_prereq()
 		!*)
 			;;
-		# (Temporary?) whitelist of things we can't easily
-		# pretend not to support
+		# List of things we can't easily pretend to not support
 		SYMLINKS)
 			;;
 		# Inspecting whether GIT_TEST_FAIL_PREREQS is on
@@ -795,7 +794,7 @@ test_verify_prereq () {
 }
 
 test_expect_failure () {
-	test_start_
+	test_start_ "$@"
 	test "$#" = 3 && { test_prereq=$1; shift; } || test_prereq=
 	test "$#" = 2 ||
 	BUG "not 2 or 3 parameters to test-expect-failure"
@@ -803,6 +802,7 @@ test_expect_failure () {
 	export test_prereq
 	if ! test_skip "$@"
 	then
+		test -n "$test_skip_test_preamble" ||
 		say >&3 "checking known breakage of $TEST_NUMBER.$test_count '$1': $2"
 		if test_run_ "$2" expecting_failure
 		then
@@ -815,7 +815,7 @@ test_expect_failure () {
 }
 
 test_expect_success () {
-	test_start_
+	test_start_ "$@"
 	test "$#" = 3 && { test_prereq=$1; shift; } || test_prereq=
 	test "$#" = 2 ||
 	BUG "not 2 or 3 parameters to test-expect-success"
@@ -823,6 +823,7 @@ test_expect_success () {
 	export test_prereq
 	if ! test_skip "$@"
 	then
+		test -n "$test_skip_test_preamble" ||
 		say >&3 "expecting success of $TEST_NUMBER.$test_count '$1': $2"
 		if test_run_ "$2"
 		then
@@ -1782,6 +1783,16 @@ test_oid_to_path () {
 	echo "${1%$basename}/$basename"
 }
 
+# Parse oids from git ls-files --staged output
+test_parse_ls_files_stage_oids () {
+	awk '{print $2}' -
+}
+
+# Parse oids from git ls-tree output
+test_parse_ls_tree_oids () {
+	awk '{print $3}' -
+}
+
 # Choose a port number based on the test script's number and store it in
 # the given variable name, unless that variable already contains a number.
 test_set_port () {
diff --git a/t/test-lib-github-workflow-markup.sh b/t/test-lib-github-workflow-markup.sh
new file mode 100644
index 0000000000..9c5339c577
--- /dev/null
+++ b/t/test-lib-github-workflow-markup.sh
@@ -0,0 +1,56 @@
+# Library of functions to mark up test scripts' output suitable for
+# pretty-printing it in GitHub workflows.
+#
+# Copyright (c) 2022 Johannes Schindelin
+#
+# 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, see http://www.gnu.org/licenses/ .
+#
+# The idea is for `test-lib.sh` to source this file when run in GitHub
+# workflows; these functions will then override (empty) functions
+# that are are called at the appropriate times during the test runs.
+
+test_skip_test_preamble=t
+
+start_test_output () {
+	test -n "$GIT_TEST_TEE_OUTPUT_FILE" ||
+	die "--github-workflow-markup requires --verbose-log"
+	github_markup_output="${GIT_TEST_TEE_OUTPUT_FILE%.out}.markup"
+	>$github_markup_output
+	GIT_TEST_TEE_OFFSET=0
+}
+
+# No need to override start_test_case_output
+
+finalize_test_case_output () {
+	test_case_result=$1
+	shift
+	case "$test_case_result" in
+	failure)
+		echo >>$github_markup_output "::error::failed: $this_test.$test_count $1"
+		;;
+	fixed)
+		echo >>$github_markup_output "::notice::fixed: $this_test.$test_count $1"
+		;;
+	ok)
+		# Exit without printing the "ok" tests
+		return
+		;;
+	esac
+	echo >>$github_markup_output "::group::$test_case_result: $this_test.$test_count $*"
+	test-tool >>$github_markup_output path-utils skip-n-bytes \
+		"$GIT_TEST_TEE_OUTPUT_FILE" $GIT_TEST_TEE_OFFSET
+	echo >>$github_markup_output "::endgroup::"
+}
+
+# No need to override finalize_test_output
diff --git a/t/test-lib-junit.sh b/t/test-lib-junit.sh
new file mode 100644
index 0000000000..79c31c788b
--- /dev/null
+++ b/t/test-lib-junit.sh
@@ -0,0 +1,132 @@
+# Library of functions to format test scripts' output in JUnit XML
+# format, to support Git's test suite result to be presented in an
+# easily digestible way on Azure Pipelines.
+#
+# Copyright (c) 2022 Johannes Schindelin
+#
+# 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, see http://www.gnu.org/licenses/ .
+#
+# The idea is for `test-lib.sh` to source this file when the user asks
+# for JUnit XML; these functions will then override (empty) functions
+# that are are called at the appropriate times during the test runs.
+
+start_test_output () {
+	junit_xml_dir="$TEST_OUTPUT_DIRECTORY/out"
+	mkdir -p "$junit_xml_dir"
+	junit_xml_base=${1##*/}
+	junit_xml_path="$junit_xml_dir/TEST-${junit_xml_base%.sh}.xml"
+	junit_attrs="name=\"${junit_xml_base%.sh}\""
+	junit_attrs="$junit_attrs timestamp=\"$(TZ=UTC \
+		date +%Y-%m-%dT%H:%M:%S)\""
+	write_junit_xml --truncate "<testsuites>" "  <testsuite $junit_attrs>"
+	junit_suite_start=$(test-tool date getnanos)
+	if test -n "$GIT_TEST_TEE_OUTPUT_FILE"
+	then
+		GIT_TEST_TEE_OFFSET=0
+	fi
+}
+
+start_test_case_output () {
+	junit_start=$(test-tool date getnanos)
+}
+
+finalize_test_case_output () {
+	test_case_result=$1
+	shift
+	case "$test_case_result" in
+	ok)
+		set -- "$*"
+		;;
+	failure)
+		junit_insert="<failure message=\"not ok $test_count -"
+		junit_insert="$junit_insert $(xml_attr_encode --no-lf "$1")\">"
+		junit_insert="$junit_insert $(xml_attr_encode \
+			"$(if test -n "$GIT_TEST_TEE_OUTPUT_FILE"
+			   then
+				test-tool path-utils skip-n-bytes \
+					"$GIT_TEST_TEE_OUTPUT_FILE" $GIT_TEST_TEE_OFFSET
+			   else
+				printf '%s\n' "$@" | sed 1d
+			   fi)")"
+		junit_insert="$junit_insert</failure>"
+		if test -n "$GIT_TEST_TEE_OUTPUT_FILE"
+		then
+			junit_insert="$junit_insert<system-err>$(xml_attr_encode \
+				"$(cat "$GIT_TEST_TEE_OUTPUT_FILE")")</system-err>"
+		fi
+		set -- "$1" "      $junit_insert"
+		;;
+	fixed)
+		set -- "$* (breakage fixed)"
+		;;
+	broken)
+		set -- "$* (known breakage)"
+		;;
+	skip)
+		message="$(xml_attr_encode --no-lf "$skipped_reason")"
+		set -- "$1" "      <skipped message=\"$message\" />"
+		;;
+	esac
+
+	junit_attrs="name=\"$(xml_attr_encode --no-lf "$this_test.$test_count $1")\""
+	shift
+	junit_attrs="$junit_attrs classname=\"$this_test\""
+	junit_attrs="$junit_attrs time=\"$(test-tool \
+		date getnanos $junit_start)\""
+	write_junit_xml "$(printf '%s\n' \
+		"    <testcase $junit_attrs>" "$@" "    </testcase>")"
+	junit_have_testcase=t
+}
+
+finalize_test_output () {
+	if test -n "$junit_xml_path"
+	then
+		test -n "$junit_have_testcase" || {
+			junit_start=$(test-tool date getnanos)
+			write_junit_xml_testcase "all tests skipped"
+		}
+
+		# adjust the overall time
+		junit_time=$(test-tool date getnanos $junit_suite_start)
+		sed -e "s/\(<testsuite.*\) time=\"[^\"]*\"/\1/" \
+			-e "s/<testsuite [^>]*/& time=\"$junit_time\"/" \
+			-e '/^ *<\/testsuite/d' \
+			<"$junit_xml_path" >"$junit_xml_path.new"
+		mv "$junit_xml_path.new" "$junit_xml_path"
+
+		write_junit_xml "  </testsuite>" "</testsuites>"
+		write_junit_xml=
+	fi
+}
+
+write_junit_xml () {
+	case "$1" in
+	--truncate)
+		>"$junit_xml_path"
+		junit_have_testcase=
+		shift
+		;;
+	esac
+	printf '%s\n' "$@" >>"$junit_xml_path"
+}
+
+xml_attr_encode () {
+	if test "x$1" = "x--no-lf"
+	then
+		shift
+		printf '%s' "$*" | test-tool xml-encode
+	else
+		printf '%s\n' "$@" | test-tool xml-encode
+	fi
+}
diff --git a/t/test-lib.sh b/t/test-lib.sh
index 8ba5ca1534..120f11812c 100644
--- a/t/test-lib.sh
+++ b/t/test-lib.sh
@@ -57,14 +57,14 @@ fi
 #
 #	prepend_var VAR : VALUE
 prepend_var () {
-	eval "$1=$3\${$1:+${3:+$2}\$$1}"
+	eval "$1=\"$3\${$1:+${3:+$2}\$$1}\""
 }
 
 # If [AL]SAN is in effect we want to abort so that we notice
 # problems. The GIT_SAN_OPTIONS variable can be used to set common
 # defaults shared between [AL]SAN_OPTIONS.
 prepend_var GIT_SAN_OPTIONS : abort_on_error=1
-prepend_var GIT_SAN_OPTIONS : strip_path_prefix=\"$GIT_BUILD_DIR/\"
+prepend_var GIT_SAN_OPTIONS : strip_path_prefix="$GIT_BUILD_DIR/"
 
 # If we were built with ASAN, it may complain about leaks
 # of program-lifetime variables. Disable it by default to lower
@@ -137,6 +137,12 @@ mark_option_requires_arg () {
 	store_arg_to=$2
 }
 
+# These functions can be overridden e.g. to output JUnit XML
+start_test_output () { :; }
+start_test_case_output () { :; }
+finalize_test_case_output () { :; }
+finalize_test_output () { :; }
+
 parse_option () {
 	local opt="$1"
 
@@ -196,7 +202,10 @@ parse_option () {
 		tee=t
 		;;
 	--write-junit-xml)
-		write_junit_xml=t
+		. "$TEST_DIRECTORY/test-lib-junit.sh"
+		;;
+	--github-workflow-markup)
+		. "$TEST_DIRECTORY/test-lib-github-workflow-markup.sh"
 		;;
 	--stress)
 		stress=t ;;
@@ -548,14 +557,19 @@ then
 		: nothing
 	}
 else
+	_USE_GLIBC_TUNABLES=
+	if _GLIBC_VERSION=$(getconf GNU_LIBC_VERSION 2>/dev/null) &&
+	   _GLIBC_VERSION=${_GLIBC_VERSION#"glibc "} &&
+	   expr 2.34 \<= "$_GLIBC_VERSION" >/dev/null
+	then
+		_USE_GLIBC_TUNABLES=YesPlease
+	fi
 	setup_malloc_check () {
 		local g
 		local t
 		MALLOC_CHECK_=3	MALLOC_PERTURB_=165
 		export MALLOC_CHECK_ MALLOC_PERTURB_
-		if _GLIBC_VERSION=$(getconf GNU_LIBC_VERSION 2>/dev/null) &&
-		   _GLIBC_VERSION=${_GLIBC_VERSION#"glibc "} &&
-		   expr 2.34 \<= "$_GLIBC_VERSION" >/dev/null
+		if test -n "$_USE_GLIBC_TUNABLES"
 		then
 			g=
 			LD_PRELOAD="libc_malloc_debug.so.0"
@@ -664,7 +678,7 @@ exec 6<&0
 exec 7>&2
 
 _error_exit () {
-	finalize_junit_xml
+	finalize_test_output
 	GIT_EXIT_OK=t
 	exit 1
 }
@@ -774,35 +788,13 @@ trap '{ code=$?; set +x; } 2>/dev/null; exit $code' INT TERM HUP
 # the test_expect_* functions instead.
 
 test_ok_ () {
-	if test -n "$write_junit_xml"
-	then
-		write_junit_xml_testcase "$*"
-	fi
 	test_success=$(($test_success + 1))
 	say_color "" "ok $test_count - $@"
+	finalize_test_case_output ok "$@"
 }
 
 test_failure_ () {
-	if test -n "$write_junit_xml"
-	then
-		junit_insert="<failure message=\"not ok $test_count -"
-		junit_insert="$junit_insert $(xml_attr_encode "$1")\">"
-		junit_insert="$junit_insert $(xml_attr_encode \
-			"$(if test -n "$GIT_TEST_TEE_OUTPUT_FILE"
-			   then
-				test-tool path-utils skip-n-bytes \
-					"$GIT_TEST_TEE_OUTPUT_FILE" $GIT_TEST_TEE_OFFSET
-			   else
-				printf '%s\n' "$@" | sed 1d
-			   fi)")"
-		junit_insert="$junit_insert</failure>"
-		if test -n "$GIT_TEST_TEE_OUTPUT_FILE"
-		then
-			junit_insert="$junit_insert<system-err>$(xml_attr_encode \
-				"$(cat "$GIT_TEST_TEE_OUTPUT_FILE")")</system-err>"
-		fi
-		write_junit_xml_testcase "$1" "      $junit_insert"
-	fi
+	failure_label=$1
 	test_failure=$(($test_failure + 1))
 	say_color error "not ok $test_count - $1"
 	shift
@@ -812,24 +804,19 @@ test_failure_ () {
 		say_color error "1..$test_count"
 		_error_exit
 	fi
+	finalize_test_case_output failure "$failure_label" "$@"
 }
 
 test_known_broken_ok_ () {
-	if test -n "$write_junit_xml"
-	then
-		write_junit_xml_testcase "$* (breakage fixed)"
-	fi
 	test_fixed=$(($test_fixed+1))
 	say_color error "ok $test_count - $@ # TODO known breakage vanished"
+	finalize_test_case_output fixed "$@"
 }
 
 test_known_broken_failure_ () {
-	if test -n "$write_junit_xml"
-	then
-		write_junit_xml_testcase "$* (known breakage)"
-	fi
 	test_broken=$(($test_broken+1))
 	say_color warn "not ok $test_count - $@ # TODO known breakage"
+	finalize_test_case_output broken "$@"
 }
 
 test_debug () {
@@ -1104,10 +1091,7 @@ test_start_ () {
 	test_count=$(($test_count+1))
 	maybe_setup_verbose
 	maybe_setup_valgrind
-	if test -n "$write_junit_xml"
-	then
-		junit_start=$(test-tool date getnanos)
-	fi
+	start_test_case_output "$@"
 }
 
 test_finish_ () {
@@ -1158,15 +1142,10 @@ test_skip () {
 
 	case "$to_skip" in
 	t)
-		if test -n "$write_junit_xml"
-		then
-			message="$(xml_attr_encode "$skipped_reason")"
-			write_junit_xml_testcase "$1" \
-				"      <skipped message=\"$message\" />"
-		fi
 
 		say_color skip "ok $test_count # skip $1 ($skipped_reason)"
 		: true
+		finalize_test_case_output skip "$@"
 		;;
 	*)
 		false
@@ -1179,53 +1158,6 @@ test_at_end_hook_ () {
 	:
 }
 
-write_junit_xml () {
-	case "$1" in
-	--truncate)
-		>"$junit_xml_path"
-		junit_have_testcase=
-		shift
-		;;
-	esac
-	printf '%s\n' "$@" >>"$junit_xml_path"
-}
-
-xml_attr_encode () {
-	printf '%s\n' "$@" | test-tool xml-encode
-}
-
-write_junit_xml_testcase () {
-	junit_attrs="name=\"$(xml_attr_encode "$this_test.$test_count $1")\""
-	shift
-	junit_attrs="$junit_attrs classname=\"$this_test\""
-	junit_attrs="$junit_attrs time=\"$(test-tool \
-		date getnanos $junit_start)\""
-	write_junit_xml "$(printf '%s\n' \
-		"    <testcase $junit_attrs>" "$@" "    </testcase>")"
-	junit_have_testcase=t
-}
-
-finalize_junit_xml () {
-	if test -n "$write_junit_xml" && test -n "$junit_xml_path"
-	then
-		test -n "$junit_have_testcase" || {
-			junit_start=$(test-tool date getnanos)
-			write_junit_xml_testcase "all tests skipped"
-		}
-
-		# adjust the overall time
-		junit_time=$(test-tool date getnanos $junit_suite_start)
-		sed -e "s/\(<testsuite.*\) time=\"[^\"]*\"/\1/" \
-			-e "s/<testsuite [^>]*/& time=\"$junit_time\"/" \
-			-e '/^ *<\/testsuite/d' \
-			<"$junit_xml_path" >"$junit_xml_path.new"
-		mv "$junit_xml_path.new" "$junit_xml_path"
-
-		write_junit_xml "  </testsuite>" "</testsuites>"
-		write_junit_xml=
-	fi
-}
-
 test_atexit_cleanup=:
 test_atexit_handler () {
 	# In a succeeding test script 'test_atexit_handler' is invoked
@@ -1248,7 +1180,7 @@ test_done () {
 	# removed, so the commands can access pidfiles and socket files.
 	test_atexit_handler
 
-	finalize_junit_xml
+	finalize_test_output
 
 	if test -z "$HARNESS_ACTIVE"
 	then
@@ -1539,22 +1471,7 @@ fi
 # in subprocesses like git equals our $PWD (for pathname comparisons).
 cd -P "$TRASH_DIRECTORY" || exit 1
 
-if test -n "$write_junit_xml"
-then
-	junit_xml_dir="$TEST_OUTPUT_DIRECTORY/out"
-	mkdir -p "$junit_xml_dir"
-	junit_xml_base=${0##*/}
-	junit_xml_path="$junit_xml_dir/TEST-${junit_xml_base%.sh}.xml"
-	junit_attrs="name=\"${junit_xml_base%.sh}\""
-	junit_attrs="$junit_attrs timestamp=\"$(TZ=UTC \
-		date +%Y-%m-%dT%H:%M:%S)\""
-	write_junit_xml --truncate "<testsuites>" "  <testsuite $junit_attrs>"
-	junit_suite_start=$(test-tool date getnanos)
-	if test -n "$GIT_TEST_TEE_OUTPUT_FILE"
-	then
-		GIT_TEST_TEE_OFFSET=0
-	fi
-fi
+start_test_output "$0"
 
 # Convenience
 # A regexp to match 5 and 35 hexdigits
@@ -1660,6 +1577,7 @@ esac
 test_set_prereq REFFILES
 
 ( COLUMNS=1 && test $COLUMNS = 1 ) && test_set_prereq COLUMNS_CAN_BE_1
+test -z "$NO_CURL" && test_set_prereq LIBCURL
 test -z "$NO_PERL" && test_set_prereq PERL
 test -z "$NO_PTHREADS" && test_set_prereq PTHREADS
 test -z "$NO_PYTHON" && test_set_prereq PYTHON
@@ -1847,6 +1765,10 @@ test_lazy_prereq SHA1 '
 	esac
 '
 
+test_lazy_prereq ADD_I_USE_BUILTIN '
+	test_bool_env GIT_TEST_ADD_I_USE_BUILTIN true
+'
+
 # Ensure that no test accidentally triggers a Git command
 # that runs the actual maintenance scheduler, affecting a user's
 # system permanently.
diff --git a/tempfile.c b/tempfile.c
index 94aa18f3f7..2024c82691 100644
--- a/tempfile.c
+++ b/tempfile.c
@@ -56,6 +56,20 @@
 
 static VOLATILE_LIST_HEAD(tempfile_list);
 
+static void remove_template_directory(struct tempfile *tempfile,
+				      int in_signal_handler)
+{
+	if (tempfile->directorylen > 0 &&
+	    tempfile->directorylen < tempfile->filename.len &&
+	    tempfile->filename.buf[tempfile->directorylen] == '/') {
+		strbuf_setlen(&tempfile->filename, tempfile->directorylen);
+		if (in_signal_handler)
+			rmdir(tempfile->filename.buf);
+		else
+			rmdir_or_warn(tempfile->filename.buf);
+	}
+}
+
 static void remove_tempfiles(int in_signal_handler)
 {
 	pid_t me = getpid();
@@ -74,6 +88,7 @@ static void remove_tempfiles(int in_signal_handler)
 			unlink(p->filename.buf);
 		else
 			unlink_or_warn(p->filename.buf);
+		remove_template_directory(p, in_signal_handler);
 
 		p->active = 0;
 	}
@@ -100,6 +115,7 @@ static struct tempfile *new_tempfile(void)
 	tempfile->owner = 0;
 	INIT_LIST_HEAD(&tempfile->list);
 	strbuf_init(&tempfile->filename, 0);
+	tempfile->directorylen = 0;
 	return tempfile;
 }
 
@@ -198,6 +214,52 @@ struct tempfile *mks_tempfile_tsm(const char *filename_template, int suffixlen,
 	return tempfile;
 }
 
+struct tempfile *mks_tempfile_dt(const char *directory_template,
+				 const char *filename)
+{
+	struct tempfile *tempfile;
+	const char *tmpdir;
+	struct strbuf sb = STRBUF_INIT;
+	int fd;
+	size_t directorylen;
+
+	if (!ends_with(directory_template, "XXXXXX")) {
+		errno = EINVAL;
+		return NULL;
+	}
+
+	tmpdir = getenv("TMPDIR");
+	if (!tmpdir)
+		tmpdir = "/tmp";
+
+	strbuf_addf(&sb, "%s/%s", tmpdir, directory_template);
+	directorylen = sb.len;
+	if (!mkdtemp(sb.buf)) {
+		int orig_errno = errno;
+		strbuf_release(&sb);
+		errno = orig_errno;
+		return NULL;
+	}
+
+	strbuf_addf(&sb, "/%s", filename);
+	fd = open(sb.buf, O_CREAT | O_EXCL | O_RDWR, 0600);
+	if (fd < 0) {
+		int orig_errno = errno;
+		strbuf_setlen(&sb, directorylen);
+		rmdir(sb.buf);
+		strbuf_release(&sb);
+		errno = orig_errno;
+		return NULL;
+	}
+
+	tempfile = new_tempfile();
+	strbuf_swap(&tempfile->filename, &sb);
+	tempfile->directorylen = directorylen;
+	tempfile->fd = fd;
+	activate_tempfile(tempfile);
+	return tempfile;
+}
+
 struct tempfile *xmks_tempfile_m(const char *filename_template, int mode)
 {
 	struct tempfile *tempfile;
@@ -316,6 +378,7 @@ void delete_tempfile(struct tempfile **tempfile_p)
 
 	close_tempfile_gently(tempfile);
 	unlink_or_warn(tempfile->filename.buf);
+	remove_template_directory(tempfile, 0);
 	deactivate_tempfile(tempfile);
 	*tempfile_p = NULL;
 }
diff --git a/tempfile.h b/tempfile.h
index 4de3bc77d2..d7804a214a 100644
--- a/tempfile.h
+++ b/tempfile.h
@@ -82,6 +82,7 @@ struct tempfile {
 	FILE *volatile fp;
 	volatile pid_t owner;
 	struct strbuf filename;
+	size_t directorylen;
 };
 
 /*
@@ -199,6 +200,18 @@ static inline struct tempfile *xmks_tempfile(const char *filename_template)
 }
 
 /*
+ * Attempt to create a temporary directory in $TMPDIR and to create and
+ * open a file in that new directory. Derive the directory name from the
+ * template in the manner of mkdtemp(). Arrange for directory and file
+ * to be deleted if the program exits before they are deleted
+ * explicitly. On success return a tempfile whose "filename" member
+ * contains the full path of the file and its "fd" member is open for
+ * writing the file. On error return NULL and set errno appropriately.
+ */
+struct tempfile *mks_tempfile_dt(const char *directory_template,
+				 const char *filename);
+
+/*
  * Associate a stdio stream with the temporary file (which must still
  * be open). Return `NULL` (*without* deleting the file) on error. The
  * stream is closed automatically when `close_tempfile_gently()` is called or
diff --git a/templates/hooks--fsmonitor-watchman.sample b/templates/hooks--fsmonitor-watchman.sample
index 14ed0aa42d..23e856f5de 100755
--- a/templates/hooks--fsmonitor-watchman.sample
+++ b/templates/hooks--fsmonitor-watchman.sample
@@ -86,12 +86,13 @@ sub watchman_query {
 	# recency index to select candidate nodes and "fields" to limit the
 	# output to file names only. Then we're using the "expression" term to
 	# further constrain the results.
+	my $last_update_line = "";
 	if (substr($last_update_token, 0, 1) eq "c") {
 		$last_update_token = "\"$last_update_token\"";
+		$last_update_line = qq[\n"since": $last_update_token,];
 	}
 	my $query = <<"	END";
-		["query", "$git_work_tree", {
-			"since": $last_update_token,
+		["query", "$git_work_tree", {$last_update_line
 			"fields": ["name"],
 			"expression": ["not", ["dirname", ".git"]]
 		}]
diff --git a/trace2.c b/trace2.c
index e01cf77f1a..0c0a11e07d 100644
--- a/trace2.c
+++ b/trace2.c
@@ -202,17 +202,15 @@ void trace2_cmd_start_fl(const char *file, int line, const char **argv)
 					    argv);
 }
 
-int trace2_cmd_exit_fl(const char *file, int line, int code)
+void trace2_cmd_exit_fl(const char *file, int line, int code)
 {
 	struct tr2_tgt *tgt_j;
 	int j;
 	uint64_t us_now;
 	uint64_t us_elapsed_absolute;
 
-	code &= 0xff;
-
 	if (!trace2_enabled)
-		return code;
+		return;
 
 	trace_git_fsync_stats();
 	trace2_collect_process_info(TRACE2_PROCESS_INFO_EXIT);
@@ -226,8 +224,6 @@ int trace2_cmd_exit_fl(const char *file, int line, int code)
 		if (tgt_j->pfn_exit_fl)
 			tgt_j->pfn_exit_fl(file, line, us_elapsed_absolute,
 					   code);
-
-	return code;
 }
 
 void trace2_cmd_error_va_fl(const char *file, int line, const char *fmt,
diff --git a/trace2.h b/trace2.h
index 1b109f57d0..88d906ea83 100644
--- a/trace2.h
+++ b/trace2.h
@@ -101,14 +101,8 @@ void trace2_cmd_start_fl(const char *file, int line, const char **argv);
 
 /*
  * Emit an 'exit' event.
- *
- * Write the exit-code that will be passed to exit() or returned
- * from main().
- *
- * Use this prior to actually calling exit().
- * See "#define exit()" in git-compat-util.h
  */
-int trace2_cmd_exit_fl(const char *file, int line, int code);
+void trace2_cmd_exit_fl(const char *file, int line, int code);
 
 #define trace2_cmd_exit(code) (trace2_cmd_exit_fl(__FILE__, __LINE__, (code)))
 
diff --git a/trailer.c b/trailer.c
index 1b12f77d94..d419c20735 100644
--- a/trailer.c
+++ b/trailer.c
@@ -236,7 +236,7 @@ static char *apply_command(struct conf_info *conf, const char *arg)
 			strbuf_replace(&cmd, TRAILER_ARG_STRING, arg);
 		strvec_push(&cp.args, cmd.buf);
 	}
-	strvec_pushv(&cp.env_array, (const char **)local_repo_env);
+	strvec_pushv(&cp.env, (const char **)local_repo_env);
 	cp.no_stdin = 1;
 	cp.use_shell = 1;
 
@@ -1029,7 +1029,7 @@ static FILE *create_in_place_tempfile(const char *file)
 
 	/* Create temporary file in the same directory as the original */
 	tail = strrchr(file, '/');
-	if (tail != NULL)
+	if (tail)
 		strbuf_add(&filename_template, file, tail - file + 1);
 	strbuf_addstr(&filename_template, "git-interpret-trailers-XXXXXX");
 
diff --git a/transport-helper.c b/transport-helper.c
index b4dbbabb0c..322c722478 100644
--- a/transport-helper.c
+++ b/transport-helper.c
@@ -135,7 +135,7 @@ static struct child_process *get_helper(struct transport *transport)
 	helper->silent_exec_failure = 1;
 
 	if (have_git_dir())
-		strvec_pushf(&helper->env_array, "%s=%s",
+		strvec_pushf(&helper->env, "%s=%s",
 			     GIT_DIR_ENVIRONMENT, get_git_dir());
 
 	helper->trace2_child_class = helper->args.v[0]; /* "remote-<name>" */
diff --git a/transport.c b/transport.c
index d514ab9508..700e4ca23a 100644
--- a/transport.c
+++ b/transport.c
@@ -438,7 +438,7 @@ static int fetch_refs_via_pack(struct transport *transport,
 		args.self_contained_and_connected;
 	data->options.connectivity_checked = args.connectivity_checked;
 
-	if (refs == NULL)
+	if (!refs)
 		ret = -1;
 	if (report_unmatched_refs(to_fetch, nr_heads))
 		ret = -1;
@@ -940,7 +940,7 @@ static int external_specification_len(const char *url)
 	return strchr(url, ':') - url;
 }
 
-static const struct string_list *protocol_whitelist(void)
+static const struct string_list *protocol_allow_list(void)
 {
 	static int enabled = -1;
 	static struct string_list allowed = STRING_LIST_INIT_DUP;
@@ -1019,9 +1019,9 @@ static enum protocol_allow_config get_protocol_config(const char *type)
 
 int is_transport_allowed(const char *type, int from_user)
 {
-	const struct string_list *whitelist = protocol_whitelist();
-	if (whitelist)
-		return string_list_has_string(whitelist, type);
+	const struct string_list *allow_list = protocol_allow_list();
+	if (allow_list)
+		return string_list_has_string(allow_list, type);
 
 	switch (get_protocol_config(type)) {
 	case PROTOCOL_ALLOW_ALWAYS:
@@ -1275,146 +1275,152 @@ int transport_push(struct repository *r,
 		   struct refspec *rs, int flags,
 		   unsigned int *reject_reasons)
 {
+	struct ref *remote_refs = NULL;
+	struct ref *local_refs = NULL;
+	int match_flags = MATCH_REFS_NONE;
+	int verbose = (transport->verbose > 0);
+	int quiet = (transport->verbose < 0);
+	int porcelain = flags & TRANSPORT_PUSH_PORCELAIN;
+	int pretend = flags & TRANSPORT_PUSH_DRY_RUN;
+	int push_ret, err;
+	int ret = -1;
+	struct transport_ls_refs_options transport_options =
+		TRANSPORT_LS_REFS_OPTIONS_INIT;
+
 	*reject_reasons = 0;
 
 	if (transport_color_config() < 0)
-		return -1;
-
-	if (transport->vtable->push_refs) {
-		struct ref *remote_refs;
-		struct ref *local_refs = get_local_heads();
-		int match_flags = MATCH_REFS_NONE;
-		int verbose = (transport->verbose > 0);
-		int quiet = (transport->verbose < 0);
-		int porcelain = flags & TRANSPORT_PUSH_PORCELAIN;
-		int pretend = flags & TRANSPORT_PUSH_DRY_RUN;
-		int push_ret, ret, err;
-		struct transport_ls_refs_options transport_options =
-			TRANSPORT_LS_REFS_OPTIONS_INIT;
-
-		if (check_push_refs(local_refs, rs) < 0)
-			return -1;
-
-		refspec_ref_prefixes(rs, &transport_options.ref_prefixes);
-
-		trace2_region_enter("transport_push", "get_refs_list", r);
-		remote_refs = transport->vtable->get_refs_list(transport, 1,
-							       &transport_options);
-		trace2_region_leave("transport_push", "get_refs_list", r);
-
-		transport_ls_refs_options_release(&transport_options);
-
-		if (flags & TRANSPORT_PUSH_ALL)
-			match_flags |= MATCH_REFS_ALL;
-		if (flags & TRANSPORT_PUSH_MIRROR)
-			match_flags |= MATCH_REFS_MIRROR;
-		if (flags & TRANSPORT_PUSH_PRUNE)
-			match_flags |= MATCH_REFS_PRUNE;
-		if (flags & TRANSPORT_PUSH_FOLLOW_TAGS)
-			match_flags |= MATCH_REFS_FOLLOW_TAGS;
-
-		if (match_push_refs(local_refs, &remote_refs, rs, match_flags))
-			return -1;
-
-		if (transport->smart_options &&
-		    transport->smart_options->cas &&
-		    !is_empty_cas(transport->smart_options->cas))
-			apply_push_cas(transport->smart_options->cas,
-				       transport->remote, remote_refs);
-
-		set_ref_status_for_push(remote_refs,
-			flags & TRANSPORT_PUSH_MIRROR,
-			flags & TRANSPORT_PUSH_FORCE);
-
-		if (!(flags & TRANSPORT_PUSH_NO_HOOK))
-			if (run_pre_push_hook(transport, remote_refs))
-				return -1;
-
-		if ((flags & (TRANSPORT_RECURSE_SUBMODULES_ON_DEMAND |
-			      TRANSPORT_RECURSE_SUBMODULES_ONLY)) &&
-		    !is_bare_repository()) {
-			struct ref *ref = remote_refs;
-			struct oid_array commits = OID_ARRAY_INIT;
-
-			trace2_region_enter("transport_push", "push_submodules", r);
-			for (; ref; ref = ref->next)
-				if (!is_null_oid(&ref->new_oid))
-					oid_array_append(&commits,
-							  &ref->new_oid);
-
-			if (!push_unpushed_submodules(r,
-						      &commits,
-						      transport->remote,
-						      rs,
-						      transport->push_options,
-						      pretend)) {
-				oid_array_clear(&commits);
-				trace2_region_leave("transport_push", "push_submodules", r);
-				die(_("failed to push all needed submodules"));
-			}
+		goto done;
+
+	if (!transport->vtable->push_refs)
+		goto done;
+
+	local_refs = get_local_heads();
+
+	if (check_push_refs(local_refs, rs) < 0)
+		goto done;
+
+	refspec_ref_prefixes(rs, &transport_options.ref_prefixes);
+
+	trace2_region_enter("transport_push", "get_refs_list", r);
+	remote_refs = transport->vtable->get_refs_list(transport, 1,
+						       &transport_options);
+	trace2_region_leave("transport_push", "get_refs_list", r);
+
+	transport_ls_refs_options_release(&transport_options);
+
+	if (flags & TRANSPORT_PUSH_ALL)
+		match_flags |= MATCH_REFS_ALL;
+	if (flags & TRANSPORT_PUSH_MIRROR)
+		match_flags |= MATCH_REFS_MIRROR;
+	if (flags & TRANSPORT_PUSH_PRUNE)
+		match_flags |= MATCH_REFS_PRUNE;
+	if (flags & TRANSPORT_PUSH_FOLLOW_TAGS)
+		match_flags |= MATCH_REFS_FOLLOW_TAGS;
+
+	if (match_push_refs(local_refs, &remote_refs, rs, match_flags))
+		goto done;
+
+	if (transport->smart_options &&
+	    transport->smart_options->cas &&
+	    !is_empty_cas(transport->smart_options->cas))
+		apply_push_cas(transport->smart_options->cas,
+			       transport->remote, remote_refs);
+
+	set_ref_status_for_push(remote_refs,
+		flags & TRANSPORT_PUSH_MIRROR,
+		flags & TRANSPORT_PUSH_FORCE);
+
+	if (!(flags & TRANSPORT_PUSH_NO_HOOK))
+		if (run_pre_push_hook(transport, remote_refs))
+			goto done;
+
+	if ((flags & (TRANSPORT_RECURSE_SUBMODULES_ON_DEMAND |
+		      TRANSPORT_RECURSE_SUBMODULES_ONLY)) &&
+	    !is_bare_repository()) {
+		struct ref *ref = remote_refs;
+		struct oid_array commits = OID_ARRAY_INIT;
+
+		trace2_region_enter("transport_push", "push_submodules", r);
+		for (; ref; ref = ref->next)
+			if (!is_null_oid(&ref->new_oid))
+				oid_array_append(&commits,
+						  &ref->new_oid);
+
+		if (!push_unpushed_submodules(r,
+					      &commits,
+					      transport->remote,
+					      rs,
+					      transport->push_options,
+					      pretend)) {
 			oid_array_clear(&commits);
 			trace2_region_leave("transport_push", "push_submodules", r);
+			die(_("failed to push all needed submodules"));
 		}
+		oid_array_clear(&commits);
+		trace2_region_leave("transport_push", "push_submodules", r);
+	}
 
-		if (((flags & TRANSPORT_RECURSE_SUBMODULES_CHECK) ||
-		     ((flags & (TRANSPORT_RECURSE_SUBMODULES_ON_DEMAND |
-				TRANSPORT_RECURSE_SUBMODULES_ONLY)) &&
-		      !pretend)) && !is_bare_repository()) {
-			struct ref *ref = remote_refs;
-			struct string_list needs_pushing = STRING_LIST_INIT_DUP;
-			struct oid_array commits = OID_ARRAY_INIT;
-
-			trace2_region_enter("transport_push", "check_submodules", r);
-			for (; ref; ref = ref->next)
-				if (!is_null_oid(&ref->new_oid))
-					oid_array_append(&commits,
-							  &ref->new_oid);
-
-			if (find_unpushed_submodules(r,
-						     &commits,
-						     transport->remote->name,
-						     &needs_pushing)) {
-				oid_array_clear(&commits);
-				trace2_region_leave("transport_push", "check_submodules", r);
-				die_with_unpushed_submodules(&needs_pushing);
-			}
-			string_list_clear(&needs_pushing, 0);
+	if (((flags & TRANSPORT_RECURSE_SUBMODULES_CHECK) ||
+	     ((flags & (TRANSPORT_RECURSE_SUBMODULES_ON_DEMAND |
+			TRANSPORT_RECURSE_SUBMODULES_ONLY)) &&
+	      !pretend)) && !is_bare_repository()) {
+		struct ref *ref = remote_refs;
+		struct string_list needs_pushing = STRING_LIST_INIT_DUP;
+		struct oid_array commits = OID_ARRAY_INIT;
+
+		trace2_region_enter("transport_push", "check_submodules", r);
+		for (; ref; ref = ref->next)
+			if (!is_null_oid(&ref->new_oid))
+				oid_array_append(&commits,
+						  &ref->new_oid);
+
+		if (find_unpushed_submodules(r,
+					     &commits,
+					     transport->remote->name,
+					     &needs_pushing)) {
 			oid_array_clear(&commits);
 			trace2_region_leave("transport_push", "check_submodules", r);
+			die_with_unpushed_submodules(&needs_pushing);
 		}
+		string_list_clear(&needs_pushing, 0);
+		oid_array_clear(&commits);
+		trace2_region_leave("transport_push", "check_submodules", r);
+	}
 
-		if (!(flags & TRANSPORT_RECURSE_SUBMODULES_ONLY)) {
-			trace2_region_enter("transport_push", "push_refs", r);
-			push_ret = transport->vtable->push_refs(transport, remote_refs, flags);
-			trace2_region_leave("transport_push", "push_refs", r);
-		} else
-			push_ret = 0;
-		err = push_had_errors(remote_refs);
-		ret = push_ret | err;
-
-		if (!quiet || err)
-			transport_print_push_status(transport->url, remote_refs,
-					verbose | porcelain, porcelain,
-					reject_reasons);
-
-		if (flags & TRANSPORT_PUSH_SET_UPSTREAM)
-			set_upstreams(transport, remote_refs, pretend);
-
-		if (!(flags & (TRANSPORT_PUSH_DRY_RUN |
-			       TRANSPORT_RECURSE_SUBMODULES_ONLY))) {
-			struct ref *ref;
-			for (ref = remote_refs; ref; ref = ref->next)
-				transport_update_tracking_ref(transport->remote, ref, verbose);
-		}
+	if (!(flags & TRANSPORT_RECURSE_SUBMODULES_ONLY)) {
+		trace2_region_enter("transport_push", "push_refs", r);
+		push_ret = transport->vtable->push_refs(transport, remote_refs, flags);
+		trace2_region_leave("transport_push", "push_refs", r);
+	} else
+		push_ret = 0;
+	err = push_had_errors(remote_refs);
+	ret = push_ret | err;
+
+	if (!quiet || err)
+		transport_print_push_status(transport->url, remote_refs,
+				verbose | porcelain, porcelain,
+				reject_reasons);
+
+	if (flags & TRANSPORT_PUSH_SET_UPSTREAM)
+		set_upstreams(transport, remote_refs, pretend);
+
+	if (!(flags & (TRANSPORT_PUSH_DRY_RUN |
+		       TRANSPORT_RECURSE_SUBMODULES_ONLY))) {
+		struct ref *ref;
+		for (ref = remote_refs; ref; ref = ref->next)
+			transport_update_tracking_ref(transport->remote, ref, verbose);
+	}
 
-		if (porcelain && !push_ret)
-			puts("Done");
-		else if (!quiet && !ret && !transport_refs_pushed(remote_refs))
-			fprintf(stderr, "Everything up-to-date\n");
+	if (porcelain && !push_ret)
+		puts("Done");
+	else if (!quiet && !ret && !transport_refs_pushed(remote_refs))
+		fprintf(stderr, "Everything up-to-date\n");
 
-		return ret;
-	}
-	return 1;
+done:
+	free_refs(local_refs);
+	free_refs(remote_refs);
+	return ret;
 }
 
 const struct ref *transport_get_remote_refs(struct transport *transport,
diff --git a/transport.h b/transport.h
index 12bc08fc33..b5bf7b3e70 100644
--- a/transport.h
+++ b/transport.h
@@ -145,6 +145,7 @@ struct transport {
 #define TRANSPORT_PUSH_OPTIONS			(1<<14)
 #define TRANSPORT_RECURSE_SUBMODULES_ONLY	(1<<15)
 #define TRANSPORT_PUSH_FORCE_IF_INCLUDES	(1<<16)
+#define TRANSPORT_PUSH_AUTO_UPSTREAM		(1<<17)
 
 int transport_summary_width(const struct ref *refs);
 
diff --git a/tree-walk.c b/tree-walk.c
index 506234b4b8..74f4d710e8 100644
--- a/tree-walk.c
+++ b/tree-walk.c
@@ -47,17 +47,20 @@ static int decode_tree_entry(struct tree_desc *desc, const char *buf, unsigned l
 
 	/* Initialize the descriptor entry */
 	desc->entry.path = path;
-	desc->entry.mode = canon_mode(mode);
+	desc->entry.mode = (desc->flags & TREE_DESC_RAW_MODES) ? mode : canon_mode(mode);
 	desc->entry.pathlen = len - 1;
 	oidread(&desc->entry.oid, (const unsigned char *)path + len);
 
 	return 0;
 }
 
-static int init_tree_desc_internal(struct tree_desc *desc, const void *buffer, unsigned long size, struct strbuf *err)
+static int init_tree_desc_internal(struct tree_desc *desc, const void *buffer,
+				   unsigned long size, struct strbuf *err,
+				   enum tree_desc_flags flags)
 {
 	desc->buffer = buffer;
 	desc->size = size;
+	desc->flags = flags;
 	if (size)
 		return decode_tree_entry(desc, buffer, size, err);
 	return 0;
@@ -66,15 +69,16 @@ static int init_tree_desc_internal(struct tree_desc *desc, const void *buffer, u
 void init_tree_desc(struct tree_desc *desc, const void *buffer, unsigned long size)
 {
 	struct strbuf err = STRBUF_INIT;
-	if (init_tree_desc_internal(desc, buffer, size, &err))
+	if (init_tree_desc_internal(desc, buffer, size, &err, 0))
 		die("%s", err.buf);
 	strbuf_release(&err);
 }
 
-int init_tree_desc_gently(struct tree_desc *desc, const void *buffer, unsigned long size)
+int init_tree_desc_gently(struct tree_desc *desc, const void *buffer, unsigned long size,
+			  enum tree_desc_flags flags)
 {
 	struct strbuf err = STRBUF_INIT;
-	int result = init_tree_desc_internal(desc, buffer, size, &err);
+	int result = init_tree_desc_internal(desc, buffer, size, &err, flags);
 	if (result)
 		error("%s", err.buf);
 	strbuf_release(&err);
diff --git a/tree-walk.h b/tree-walk.h
index a5058469e9..6305d53150 100644
--- a/tree-walk.h
+++ b/tree-walk.h
@@ -34,6 +34,11 @@ struct tree_desc {
 
 	/* counts the number of bytes left in the `buffer`. */
 	unsigned int size;
+
+	/* option flags passed via init_tree_desc_gently() */
+	enum tree_desc_flags {
+		TREE_DESC_RAW_MODES = (1 << 0),
+	} flags;
 };
 
 /**
@@ -79,7 +84,8 @@ int update_tree_entry_gently(struct tree_desc *);
  */
 void init_tree_desc(struct tree_desc *desc, const void *buf, unsigned long size);
 
-int init_tree_desc_gently(struct tree_desc *desc, const void *buf, unsigned long size);
+int init_tree_desc_gently(struct tree_desc *desc, const void *buf, unsigned long size,
+			  enum tree_desc_flags flags);
 
 /*
  * Visit the next entry in a tree. Returns 1 when there are more entries
diff --git a/unpack-trees.c b/unpack-trees.c
index 7f528d35cc..90b92114be 100644
--- a/unpack-trees.c
+++ b/unpack-trees.c
@@ -11,6 +11,7 @@
 #include "refs.h"
 #include "attr.h"
 #include "split-index.h"
+#include "sparse-index.h"
 #include "submodule.h"
 #include "submodule-config.h"
 #include "fsmonitor.h"
@@ -18,6 +19,7 @@
 #include "promisor-remote.h"
 #include "entry.h"
 #include "parallel-checkout.h"
+#include "sparse-index.h"
 
 /*
  * Error messages expected by scripts out of plumbing commands such as
@@ -485,7 +487,7 @@ static int check_updates(struct unpack_trees_options *o,
 		errs |= run_parallel_checkout(&state, pc_workers, pc_threshold,
 					      progress, &cnt);
 	stop_progress(&progress);
-	errs |= finish_delayed_checkout(&state, NULL, o->verbose_update);
+	errs |= finish_delayed_checkout(&state, o->verbose_update);
 	git_attr_set_direction(GIT_ATTR_CHECKIN);
 
 	if (o->clone)
@@ -1068,6 +1070,67 @@ static struct cache_entry *create_ce_entry(const struct traverse_info *info,
 }
 
 /*
+ * Determine whether the path specified by 'p' should be unpacked as a new
+ * sparse directory in a sparse index. A new sparse directory 'A/':
+ * - must be outside the sparse cone.
+ * - must not already be in the index (i.e., no index entry with name 'A/'
+ *   exists).
+ * - must not have any child entries in the index (i.e., no index entry
+ *   'A/<something>' exists).
+ * If 'p' meets the above requirements, return 1; otherwise, return 0.
+ */
+static int entry_is_new_sparse_dir(const struct traverse_info *info,
+				   const struct name_entry *p)
+{
+	int res, pos;
+	struct strbuf dirpath = STRBUF_INIT;
+	struct unpack_trees_options *o = info->data;
+
+	if (!S_ISDIR(p->mode))
+		return 0;
+
+	/*
+	 * If the path is inside the sparse cone, it can't be a sparse directory.
+	 */
+	strbuf_add(&dirpath, info->traverse_path, info->pathlen);
+	strbuf_add(&dirpath, p->path, p->pathlen);
+	strbuf_addch(&dirpath, '/');
+	if (path_in_cone_mode_sparse_checkout(dirpath.buf, o->src_index)) {
+		res = 0;
+		goto cleanup;
+	}
+
+	pos = index_name_pos_sparse(o->src_index, dirpath.buf, dirpath.len);
+	if (pos >= 0) {
+		/* Path is already in the index, not a new sparse dir */
+		res = 0;
+		goto cleanup;
+	}
+
+	/* Where would this sparse dir be inserted into the index? */
+	pos = -pos - 1;
+	if (pos >= o->src_index->cache_nr) {
+		/*
+		 * Sparse dir would be inserted at the end of the index, so we
+		 * know it has no child entries.
+		 */
+		res = 1;
+		goto cleanup;
+	}
+
+	/*
+	 * If the dir has child entries in the index, the first would be at the
+	 * position the sparse directory would be inserted. If the entry at this
+	 * position is inside the dir, not a new sparse dir.
+	 */
+	res = strncmp(o->src_index->cache[pos]->name, dirpath.buf, dirpath.len);
+
+cleanup:
+	strbuf_release(&dirpath);
+	return res;
+}
+
+/*
  * Note that traverse_by_cache_tree() duplicates some logic in this function
  * without actually calling it. If you change the logic here you may need to
  * check and change there as well.
@@ -1076,21 +1139,44 @@ static int unpack_single_entry(int n, unsigned long mask,
 			       unsigned long dirmask,
 			       struct cache_entry **src,
 			       const struct name_entry *names,
-			       const struct traverse_info *info)
+			       const struct traverse_info *info,
+			       int *is_new_sparse_dir)
 {
 	int i;
 	struct unpack_trees_options *o = info->data;
 	unsigned long conflicts = info->df_conflicts | dirmask;
+	const struct name_entry *p = names;
 
-	if (mask == dirmask && !src[0])
-		return 0;
+	*is_new_sparse_dir = 0;
+	if (mask == dirmask && !src[0]) {
+		/*
+		 * If we're not in a sparse index, we can't unpack a directory
+		 * without recursing into it, so we return.
+		 */
+		if (!o->src_index->sparse_index)
+			return 0;
+
+		/* Find first entry with a real name (we could use "mask" too) */
+		while (!p->mode)
+			p++;
+
+		/*
+		 * If the directory is completely missing from the index but
+		 * would otherwise be a sparse directory, we should unpack it.
+		 * If not, we'll return and continue recursively traversing the
+		 * tree.
+		 */
+		*is_new_sparse_dir = entry_is_new_sparse_dir(info, p);
+		if (!*is_new_sparse_dir)
+			return 0;
+	}
 
 	/*
-	 * When we have a sparse directory entry for src[0],
-	 * then this isn't necessarily a directory-file conflict.
+	 * When we are unpacking a sparse directory, then this isn't necessarily
+	 * a directory-file conflict.
 	 */
-	if (mask == dirmask && src[0] &&
-	    S_ISSPARSEDIR(src[0]->ce_mode))
+	if (mask == dirmask &&
+	    (*is_new_sparse_dir || (src[0] && S_ISSPARSEDIR(src[0]->ce_mode))))
 		conflicts = 0;
 
 	/*
@@ -1350,7 +1436,7 @@ static int unpack_sparse_callback(int n, unsigned long mask, unsigned long dirma
 {
 	struct cache_entry *src[MAX_UNPACK_TREES + 1] = { NULL, };
 	struct unpack_trees_options *o = info->data;
-	int ret;
+	int ret, is_new_sparse_dir;
 
 	assert(o->merge);
 
@@ -1374,7 +1460,7 @@ static int unpack_sparse_callback(int n, unsigned long mask, unsigned long dirma
 	 * "index" tree (i.e., names[0]) and adjust 'names', 'n', 'mask', and
 	 * 'dirmask' accordingly.
 	 */
-	ret = unpack_single_entry(n - 1, mask >> 1, dirmask >> 1, src, names + 1, info);
+	ret = unpack_single_entry(n - 1, mask >> 1, dirmask >> 1, src, names + 1, info, &is_new_sparse_dir);
 
 	if (src[0])
 		discard_cache_entry(src[0]);
@@ -1392,6 +1478,7 @@ static int unpack_callback(int n, unsigned long mask, unsigned long dirmask, str
 	struct cache_entry *src[MAX_UNPACK_TREES + 1] = { NULL, };
 	struct unpack_trees_options *o = info->data;
 	const struct name_entry *p = names;
+	int is_new_sparse_dir;
 
 	/* Find first entry with a real name (we could use "mask" too) */
 	while (!p->mode)
@@ -1438,7 +1525,7 @@ static int unpack_callback(int n, unsigned long mask, unsigned long dirmask, str
 		}
 	}
 
-	if (unpack_single_entry(n, mask, dirmask, src, names, info) < 0)
+	if (unpack_single_entry(n, mask, dirmask, src, names, info, &is_new_sparse_dir))
 		return -1;
 
 	if (o->merge && src[0]) {
@@ -1476,6 +1563,7 @@ static int unpack_callback(int n, unsigned long mask, unsigned long dirmask, str
 		}
 
 		if (!is_sparse_directory_entry(src[0], names, info) &&
+		    !is_new_sparse_dir &&
 		    traverse_trees_recursive(n, dirmask, mask & ~dirmask,
 						    names, info) < 0) {
 			return -1;
@@ -1838,6 +1926,12 @@ int unpack_trees(unsigned len, struct tree_desc *t, struct unpack_trees_options
 
 	o->result.fsmonitor_last_update =
 		xstrdup_or_null(o->src_index->fsmonitor_last_update);
+	o->result.fsmonitor_has_run_once = o->src_index->fsmonitor_has_run_once;
+
+	if (!o->src_index->initialized &&
+	    !repo->settings.command_requires_full_index &&
+	    is_sparse_index_allowed(&o->result, 0))
+		o->result.sparse_index = 1;
 
 	/*
 	 * Sparse checkout loop #1: set NEW_SKIP_WORKTREE on existing entries
@@ -2018,6 +2112,9 @@ enum update_sparsity_result update_sparsity(struct unpack_trees_options *o)
 			goto skip_sparse_checkout;
 	}
 
+	/* Expand sparse directories as needed */
+	expand_index(o->src_index, o->pl);
+
 	/* Set NEW_SKIP_WORKTREE on existing entries. */
 	mark_all_ce_unused(o->src_index);
 	mark_new_skip_worktree(o->pl, o->src_index, 0,
diff --git a/usage.c b/usage.c
index b738dd178b..5a7c6c346c 100644
--- a/usage.c
+++ b/usage.c
@@ -33,7 +33,7 @@ static void vreportf(const char *prefix, const char *err, va_list params)
 
 static NORETURN void usage_builtin(const char *err, va_list params)
 {
-	vreportf("usage: ", err, params);
+	vreportf(_("usage: "), err, params);
 
 	/*
 	 * When we detect a usage error *before* the command dispatch in
@@ -58,7 +58,7 @@ static NORETURN void usage_builtin(const char *err, va_list params)
 static void die_message_builtin(const char *err, va_list params)
 {
 	trace2_cmd_error_va(err, params);
-	vreportf("fatal: ", err, params);
+	vreportf(_("fatal: "), err, params);
 }
 
 /*
@@ -78,14 +78,14 @@ static void error_builtin(const char *err, va_list params)
 {
 	trace2_cmd_error_va(err, params);
 
-	vreportf("error: ", err, params);
+	vreportf(_("error: "), err, params);
 }
 
 static void warn_builtin(const char *warn, va_list params)
 {
 	trace2_cmd_error_va(warn, params);
 
-	vreportf("warning: ", warn, params);
+	vreportf(_("warning: "), warn, params);
 }
 
 static int die_is_recursing_builtin(void)
@@ -290,18 +290,24 @@ void warning(const char *warn, ...)
 /* Only set this, ever, from t/helper/, when verifying that bugs are caught. */
 int BUG_exit_code;
 
-static NORETURN void BUG_vfl(const char *file, int line, const char *fmt, va_list params)
+static void BUG_vfl_common(const char *file, int line, const char *fmt,
+			   va_list params)
 {
 	char prefix[256];
-	va_list params_copy;
-	static int in_bug;
-
-	va_copy(params_copy, params);
 
 	/* truncation via snprintf is OK here */
 	snprintf(prefix, sizeof(prefix), "BUG: %s:%d: ", file, line);
 
 	vreportf(prefix, fmt, params);
+}
+
+static NORETURN void BUG_vfl(const char *file, int line, const char *fmt, va_list params)
+{
+	va_list params_copy;
+	static int in_bug;
+
+	va_copy(params_copy, params);
+	BUG_vfl_common(file, line, fmt, params);
 
 	if (in_bug)
 		abort();
@@ -317,11 +323,30 @@ static NORETURN void BUG_vfl(const char *file, int line, const char *fmt, va_lis
 NORETURN void BUG_fl(const char *file, int line, const char *fmt, ...)
 {
 	va_list ap;
+
+	bug_called_must_BUG = 0;
+
 	va_start(ap, fmt);
 	BUG_vfl(file, line, fmt, ap);
 	va_end(ap);
 }
 
+int bug_called_must_BUG;
+void bug_fl(const char *file, int line, const char *fmt, ...)
+{
+	va_list ap;
+
+	bug_called_must_BUG = 1;
+
+	va_start(ap, fmt);
+	BUG_vfl_common(file, line, fmt, ap);
+	va_end(ap);
+
+	va_start(ap, fmt);
+	trace2_cmd_error_va(fmt, ap);
+	va_end(ap);
+}
+
 #ifdef SUPPRESS_ANNOTATED_LEAKS
 void unleak_memory(const void *ptr, size_t len)
 {
diff --git a/wildmatch.c b/wildmatch.c
index 9e9e2a2f95..7e5a7ea1ea 100644
--- a/wildmatch.c
+++ b/wildmatch.c
@@ -113,7 +113,7 @@ static int dowild(const uchar *p, const uchar *text, unsigned int flags)
 				/* Trailing "**" matches everything.  Trailing "*" matches
 				 * only if there are no more slash characters. */
 				if (!match_slash) {
-					if (strchr((char*)text, '/') != NULL)
+					if (strchr((char *)text, '/'))
 						return WM_NOMATCH;
 				}
 				return WM_MATCH;
diff --git a/worktree.c b/worktree.c
index 90fc085f76..257ba4cf1e 100644
--- a/worktree.c
+++ b/worktree.c
@@ -483,7 +483,7 @@ int submodule_uses_worktrees(const char *path)
 		return 0;
 
 	d = readdir_skip_dot_and_dotdot(dir);
-	if (d != NULL)
+	if (d)
 		ret = 1;
 	closedir(dir);
 	return ret;
diff --git a/wrapper.c b/wrapper.c
index f512994690..f52f3e21cc 100644
--- a/wrapper.c
+++ b/wrapper.c
@@ -161,28 +161,6 @@ void xsetenv(const char *name, const char *value, int 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
- * the absence of bugs, large chunks can result in bad latencies when
- * you decide to kill the process.
- *
- * We pick 8 MiB as our default, but if the platform defines SSIZE_MAX
- * that is smaller than that, clip it to SSIZE_MAX, as a call to
- * read(2) or write(2) larger than that is allowed to fail.  As the last
- * resort, we allow a port to pass via CFLAGS e.g. "-DMAX_IO_SIZE=value"
- * to override this, if the definition of SSIZE_MAX given by the platform
- * is broken.
- */
-#ifndef MAX_IO_SIZE
-# define MAX_IO_SIZE_DEFAULT (8*1024*1024)
-# if defined(SSIZE_MAX) && (SSIZE_MAX < MAX_IO_SIZE_DEFAULT)
-#  define MAX_IO_SIZE SSIZE_MAX
-# else
-#  define MAX_IO_SIZE MAX_IO_SIZE_DEFAULT
-# endif
-#endif
-
 /**
  * xopen() is the same as open(), but it die()s if the open() fails.
  */
@@ -393,7 +371,7 @@ FILE *xfopen(const char *path, const char *mode)
 FILE *xfdopen(int fd, const char *mode)
 {
 	FILE *stream = fdopen(fd, mode);
-	if (stream == NULL)
+	if (!stream)
 		die_errno("Out of memory? fdopen failed");
 	return stream;
 }
diff --git a/wt-status.c b/wt-status.c
index d33f9272b7..867e3e417e 100644
--- a/wt-status.c
+++ b/wt-status.c
@@ -616,7 +616,7 @@ static void wt_status_collect_changes_worktree(struct wt_status *s)
 	rev.diffopt.rename_score = s->rename_score >= 0 ? s->rename_score : rev.diffopt.rename_score;
 	copy_pathspec(&rev.prune_data, &s->pathspec);
 	run_diff_files(&rev, 0);
-	clear_pathspec(&rev.prune_data);
+	release_revisions(&rev);
 }
 
 static void wt_status_collect_changes_index(struct wt_status *s)
@@ -662,8 +662,7 @@ static void wt_status_collect_changes_index(struct wt_status *s)
 
 	copy_pathspec(&rev.prune_data, &s->pathspec);
 	run_diff_index(&rev, 1);
-	object_array_clear(&rev.pending);
-	clear_pathspec(&rev.prune_data);
+	release_revisions(&rev);
 }
 
 static int add_file_to_list(const struct object_id *oid,
@@ -982,7 +981,7 @@ static void wt_longstatus_print_submodule_summary(struct wt_status *s, int uncom
 	struct strbuf summary = STRBUF_INIT;
 	char *summary_content;
 
-	strvec_pushf(&sm_summary.env_array, "GIT_INDEX_FILE=%s", s->index_file);
+	strvec_pushf(&sm_summary.env, "GIT_INDEX_FILE=%s", s->index_file);
 
 	strvec_push(&sm_summary.args, "submodule");
 	strvec_push(&sm_summary.args, "summary");
@@ -1152,6 +1151,7 @@ static void wt_longstatus_print_verbose(struct wt_status *s)
 		rev.diffopt.b_prefix = "w/";
 		run_diff_files(&rev, 0);
 	}
+	release_revisions(&rev);
 }
 
 static void wt_longstatus_print_tracking(struct wt_status *s)
@@ -2545,7 +2545,9 @@ int has_unstaged_changes(struct repository *r, int ignore_submodules)
 	rev_info.diffopt.flags.quick = 1;
 	diff_setup_done(&rev_info.diffopt);
 	result = run_diff_files(&rev_info, 0);
-	return diff_result_code(&rev_info.diffopt, result);
+	result = diff_result_code(&rev_info.diffopt, result);
+	release_revisions(&rev_info);
+	return result;
 }
 
 /**
@@ -2577,8 +2579,9 @@ int has_uncommitted_changes(struct repository *r,
 
 	diff_setup_done(&rev_info.diffopt);
 	result = run_diff_index(&rev_info, 1);
-	object_array_clear(&rev_info.pending);
-	return diff_result_code(&rev_info.diffopt, result);
+	result = diff_result_code(&rev_info.diffopt, result);
+	release_revisions(&rev_info);
+	return result;
 }
 
 /**
diff --git a/xdiff-interface.c b/xdiff-interface.c
index 2e3a5a2943..e87950de32 100644
--- a/xdiff-interface.c
+++ b/xdiff-interface.c
@@ -159,7 +159,7 @@ int read_mmfile(mmfile_t *ptr, const char *filename)
 
 	if (stat(filename, &st))
 		return error_errno("Could not stat %s", filename);
-	if ((f = fopen(filename, "rb")) == NULL)
+	if (!(f = fopen(filename, "rb")))
 		return error_errno("Could not open %s", filename);
 	sz = xsize_t(st.st_size);
 	ptr->ptr = xmalloc(sz ? sz : 1);
diff --git a/xdiff/xemit.c b/xdiff/xemit.c
index 1cbf2b9829..c4ccd68d47 100644
--- a/xdiff/xemit.c
+++ b/xdiff/xemit.c
@@ -65,7 +65,7 @@ xdchange_t *xdl_get_hunk(xdchange_t **xscr, xdemitconf_t const *xecfg)
 			*xscr = xch;
 	}
 
-	if (*xscr == NULL)
+	if (!*xscr)
 		return NULL;
 
 	lxch = *xscr;
diff --git a/xdiff/xmacros.h b/xdiff/xmacros.h
index 2809a28ca9..ae4636c247 100644
--- a/xdiff/xmacros.h
+++ b/xdiff/xmacros.h
@@ -34,7 +34,6 @@
 #define XDL_ADDBITS(v,b)	((v) + ((v) >> (b)))
 #define XDL_MASKBITS(b)		((1UL << (b)) - 1)
 #define XDL_HASHLONG(v,b)	(XDL_ADDBITS((unsigned long)(v), b) & XDL_MASKBITS(b))
-#define XDL_PTRFREE(p) do { if (p) { xdl_free(p); (p) = NULL; } } while (0)
 #define XDL_LE32_PUT(p, v) \
 do { \
 	unsigned char *__p = (unsigned char *) (p); \
diff --git a/xdiff/xprepare.c b/xdiff/xprepare.c
index 4527a4a07c..105752758f 100644
--- a/xdiff/xprepare.c
+++ b/xdiff/xprepare.c
@@ -188,7 +188,7 @@ static int xdl_prepare_ctx(unsigned int pass, mmfile_t *mf, long narec, xpparam_
 	memset(rhash, 0, hsize * sizeof(xrecord_t *));
 
 	nrec = 0;
-	if ((cur = blk = xdl_mmfile_first(mf, &bsize)) != NULL) {
+	if ((cur = blk = xdl_mmfile_first(mf, &bsize))) {
 		for (top = blk + bsize; cur < top; ) {
 			prev = cur;
 			hav = xdl_hash_record(&cur, top, xpp->flags);
diff --git a/xdiff/xutils.c b/xdiff/xutils.c
index cfa6e2220f..115b2b1640 100644
--- a/xdiff/xutils.c
+++ b/xdiff/xutils.c
@@ -122,7 +122,7 @@ long xdl_guess_lines(mmfile_t *mf, long sample) {
 	long nl = 0, size, tsize = 0;
 	char const *data, *cur, *top;
 
-	if ((cur = data = xdl_mmfile_first(mf, &size)) != NULL) {
+	if ((cur = data = xdl_mmfile_first(mf, &size))) {
 		for (top = data + size; nl < sample && cur < top; ) {
 			nl++;
 			if (!(cur = memchr(cur, '\n', top - cur)))